diff --git a/.babelrc b/.babelrc
new file mode 100644
index 00000000000..47de40687da
--- /dev/null
+++ b/.babelrc
@@ -0,0 +1,9 @@
+{
+	"presets": [
+		"es2015",
+		"stage-2"
+	],
+	"plugins": [
+		"add-module-exports"
+	]
+}
diff --git a/.codeclimate.yml b/.codeclimate.yml
new file mode 100644
index 00000000000..a11de13a5c8
--- /dev/null
+++ b/.codeclimate.yml
@@ -0,0 +1,37 @@
+engines:
+  phpcodesniffer:
+    enabled: true
+    config:
+      standard: "WordPress"
+  eslint:
+    enabled: true
+  scss-lint:
+    enabled: true
+  duplication:
+    enabled: true
+    config:
+      languages:
+      - php
+      - javascript
+ratings:
+  paths:
+    - "includes/*"
+exclude_paths:
+  - tests/*
+  - apigen/*
+  - dummy-data/*
+  - i18n/*
+  - includes/api/legacy/*
+  - includes/libraries/*
+  - includes/updates/*
+  - includes/gateways/simplify-commerce/*
+  - includes/shipping/legacy-*
+  - includes/wc-deprecated-functions.php
+  - includes/class-wc-legacy-api.php
+  - assets/js/accounting/**
+  - assets/js/jquery-*
+  - assets/js/prettyPhoto/*
+  - assets/js/round/*
+  - assets/js/select2/*
+  - assets/js/stupidtable/*
+  - assets/js/zeroclipboard/*
diff --git a/.editorconfig b/.editorconfig
index d3b0b247108..c3dfa83750f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -2,7 +2,7 @@
 # editorconfig.org
 
 # WordPress Coding Standards
-# http://make.wordpress.org/core/handbook/coding-standards/
+# https://make.wordpress.org/core/handbook/coding-standards/
 
 root = true
 
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000000..5e8686b5f3a
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,10 @@
+/.* export-ignore
+apigen* export-ignore
+CHANGELOG.txt export-ignore
+composer.* export-ignore
+Gruntfile.js export-ignore
+package.json export-ignore
+phpcs.ruleset.xml export-ignore
+phpunit.* export-ignore
+README.md export-ignore
+tests export-ignore
diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md
similarity index 83%
rename from CONTRIBUTING.md
rename to .github/CONTRIBUTING.md
index 689ae2a2296..97fcc742bbd 100644
--- a/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -6,23 +6,23 @@ When contributing please ensure you follow the guidelines below to help us keep
 
 __Please Note:__
 
-GitHub is for _bug reports and contributions only_ - if you have a support question or a request for a customization this is not the right place to post it. Use [WooThemes Support](http://support.woothemes.com) for customer support, [WordPress.org](http://wordpress.org/support/plugin/woocommerce) for community support, and for customizations we recommend one of the following services:
+GitHub is for _bug reports and contributions only_ - if you have a support question or a request for a customization this is not the right place to post it. Use [WooCommerce Support](https://support.woocommerce.com) for customer support, [WordPress.org](https://wordpress.org/support/plugin/woocommerce) for community support, and for customizations we recommend one of the following services:
 
-- [WooExperts](http://www.woothemes.com/experts/)
+- [WooExperts](https://woocommerce.com/experts/)
 - [Codeable](https://codeable.io/)
 
 ## Contributing To The Core
 
 ### Reporting Issues
 
-Reporting issues is a great way to became a contributor as it doesn't require technical skills. In fact you don't even need to know a programming language or to be able to check the code itself, you just need to make sure that everything works as expected and [submit an issue report](https://github.com/woothemes/woocommerce/issues/new) if you spot a bug. Sound like something you're up for? Go for it!
+Reporting issues is a great way to became a contributor as it doesn't require technical skills. In fact you don't even need to know a programming language or to be able to check the code itself, you just need to make sure that everything works as expected and [submit an issue report](https://github.com/woocommerce/woocommerce/issues/new) if you spot a bug. Sound like something you're up for? Go for it!
 
 #### How To Submit An Issue Report
 
 If something isn't working, congratulations you've found a bug! Help us fix it by submitting an issue report:
 
 * Make sure you have a [GitHub account](https://github.com/signup/free)
-* Search the [Existing Issues](https://github.com/woothemes/woocommerce/issues) to be sure that the one you've noticed isn't already there
+* Search the [Existing Issues](https://github.com/woocommerce/woocommerce/issues) to be sure that the one you've noticed isn't already there
 * Submit a report for your issue
   * Clearly describe the issue (including steps to reproduce it if it's a bug)
   * Make sure you fill in the earliest version that you know has the issue.
@@ -37,7 +37,7 @@ If you think something could be improved and you're able to do so, make your cha
 
 * Fork the repository on GitHub
 * Make the changes to your forked repository
-  * **Ensure you stick to the [WordPress Coding Standards](http://make.wordpress.org/core/handbook/coding-standards/php/).**
+  * **Ensure you stick to the [WordPress Coding Standards](https://make.wordpress.org/core/handbook/coding-standards/php/).**
   * Ensure you use LF line endings - no crazy Windows line endings please :)
 * When committing, reference your issue number (#1234) and include a note about the fix
 * Push the changes to your fork and submit a pull request on the master branch of the WooCommerce repository. Existing maintenance branches will be maintained by WooCommerce developers
@@ -86,14 +86,14 @@ If WooCommerce is already 100% translated for your language, join the team anywa
 
 ### Translating Video Tutorials
 
-Another valuable way to help is by translating our growing library of WooCommerce video tutorials. Check out our [Video SRTs project](https://www.transifex.com/projects/p/video-srts/) and join the team for your language. If there isn't one, please request the new language and we will add it for you.
+Another valuable way to help is by translating our growing library of WooCommerce video tutorials. Check out the [Translating  Our Videos](https://docs.woocommerce.com/document/translating-our-videos/) doc and join in!
 
 By translating video tutorials you'll be helping non-English speaking users and people affected by disabilities to get to grips with using WooCommerce for the first time, and to go on and create their businesses and make a living! That's something to be proud of and if you choose to dive into this area, we salute you.
 
 # Additional Resources
 
-* [General GitHub documentation](http://help.github.com/)
-* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
+* [General GitHub documentation](https://help.github.com/)
+* [GitHub pull request documentation](https://help.github.com/articles/about-pull-requests/)
 * [Translator Handbook](https://make.wordpress.org/polyglots/handbook/)
-* [WooCommerce Docs](http://docs.woothemes.com/)
-* [WooThemes Support](http://support.woothemes.com)
+* [WooCommerce Docs](https://docs.woocommerce.com/)
+* [WooCommerce Support](https://support.woocommerce.com)
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000000..0d1135a372b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,31 @@
+### EXPLANATION OF THE ISSUE
+
+<!-- What happens, under which versions, under what conditions, when, and what were you expecting instead. -->
+
+### STEPS TO REPRODUCE THE ISSUE
+
+<!-- 1. List steps to reproduce your issue so we can replicate. -->
+
+### SYSTEM STATUS
+
+<details>
+```
+Grab the system status report from WooCommerce > System Status and paste it here between the `details` tags.
+```
+</details>
+
+<!--
+BEFORE POSTING YOUR ISSUE
+- These comments won't show up when you submit the issue.
+- Try to add as much detail as possible. Be specific!
+- GitHub issues ARE NOT FOR SUPPORT! If you have questions, use the either:
+  - https://wordpress.org/support/plugin/woocommerce for general support
+  - https://woocommerce.com/my-account/tickets/ for premium plugin support
+- If you're requesting a new feature, explain why you'd like it to be added.
+- Search this repository (top of the page) for the issue and it has not been fixed or reported already.
+
+Before logging BUGS, ensure you:
+- Use the latest stable release of WooCommerce.
+- Disabled all plugins to ensure it's a core bug and not a plugin issue.
+- Switched to Twenty Twelve theme to ensure it's a core bug and not a theme issue.
+-->
diff --git a/.github/wiki.png b/.github/wiki.png
new file mode 100644
index 00000000000..539760052fa
Binary files /dev/null and b/.github/wiki.png differ
diff --git a/.gitignore b/.gitignore
index 2ba87075ebf..0612a52c0cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,9 +22,20 @@ Thumbs.db
 # ApiGen
 /wc-apidocs/
 
+# Behat/CLI Tests
+tests/cli/installer
+tests/cli/composer.phar
+tests/cli/composer.lock
+tests/cli/composer.json
+tests/cli/vendor
+
 # Unit tests
 /tmp
 /tests/bin/tmp
+/tests/e2e-tests/config/local-*.json
 
 # Logs
 /logs
+
+# Composer
+/vendor/
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index a98f292be23..07af2c45c90 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -4,11 +4,14 @@ filter:
   - apigen/*
   - dummy-data/*
   - i18n/*
-  - includes/api/v1/*
-  - includes/api/v2/*
+  - includes/api/legacy/*
+  - includes/legacy/*
   - includes/libraries/*
   - includes/updates/*
-  - includes/gateways/simplify-commerce/includes/*
+  - includes/gateways/simplify-commerce/*
+  - includes/shipping/legacy-*
+  - includes/wc-deprecated-functions.php
+  - includes/class-wc-legacy-api.php
 
 checks:
   php:
diff --git a/.stylelintrc b/.stylelintrc
new file mode 100644
index 00000000000..4c93dd4476d
--- /dev/null
+++ b/.stylelintrc
@@ -0,0 +1,60 @@
+{
+  "rules": {
+    "indentation": "tab",
+    "color-hex-case": "lower",
+    "color-no-invalid-hex": true,
+
+    "function-calc-no-unspaced-operator": true,
+    "function-comma-space-after": "always-single-line",
+    "function-comma-space-before": "never",
+    "function-name-case": "lower",
+    "function-url-quotes": "always",
+    "function-whitespace-after": "always",
+
+    "number-leading-zero": "always",
+    "number-no-trailing-zeros": true,
+    "length-zero-no-unit": true,
+
+    "string-no-newline": true,
+    "string-quotes": "single",
+
+    "unit-case": "lower",
+    "unit-no-unknown": true,
+    "unit-whitelist": ["px", "%", "deg", "ms", "em", "vh", "vw", "rem", "s", "ex", "pt", "cm"],
+
+    "value-list-comma-space-after": "always-single-line",
+    "value-list-comma-space-before": "never",
+
+    "shorthand-property-no-redundant-values": true,
+
+    "property-case": "lower",
+
+    "declaration-block-no-duplicate-properties": [true, { "severity": "warning" } ],
+    "declaration-block-no-ignored-properties": [true, { "severity": "warning" } ],
+    "declaration-block-trailing-semicolon": "always",
+    "declaration-block-single-line-max-declarations": 0,
+    "declaration-block-semicolon-space-before": "never",
+    "declaration-block-semicolon-space-after": "always-single-line",
+    "declaration-block-semicolon-newline-before": "never-multi-line",
+    "declaration-block-semicolon-newline-after": "always-multi-line",
+
+    "block-closing-brace-newline-after": "always",
+    "block-closing-brace-newline-before": "always-multi-line",
+    "block-no-empty": true,
+    "block-opening-brace-newline-after": "always-multi-line",
+    "block-opening-brace-space-before": "always",
+
+    "selector-attribute-brackets-space-inside": "never",
+    "selector-attribute-operator-space-after": "never",
+    "selector-attribute-operator-space-before": "never",
+    "selector-combinator-space-after": "always",
+    "selector-combinator-space-before": "always",
+    "selector-pseudo-class-case": "lower",
+    "selector-pseudo-class-parentheses-space-inside": "always",
+    "selector-pseudo-element-case": "lower",
+    "selector-pseudo-element-colon-notation": "double",
+    "selector-pseudo-element-no-unknown": true,
+    "selector-type-case": "lower",
+    "selector-no-id": [true, { "severity": "warning" } ],
+  }
+}
diff --git a/.travis.yml b/.travis.yml
index 5f81048b168..b6cd8bce848 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,30 +2,32 @@ language: php
 
 sudo: false
 
+# Test main supported versions of PHP and HHVM against latest WP. 5.2 is min supported version.
 php:
+  - 5.2
   - 5.3
-  - 5.4
-  - 5.5
   - 5.6
   - 7.0
+  - 7.1
+  - hhvm
 
 env:
-  - WP_VERSION=latest WP_MULTISITE=0
-  - WP_VERSION=4.3 WP_MULTISITE=0
-  - WP_VERSION=4.2 WP_MULTISITE=0
-  - WP_VERSION=4.1 WP_MULTISITE=0
-  - WP_VERSION=4.0 WP_MULTISITE=0
+  - WP_VERSION=latest WP_MULTISITE=0 PHP_LATEST_STABLE=7.1
 
+# Additonal tests against stable PHP (min recommended version is 5.6) and past supported versions of WP.
 matrix:
   include:
-  - php: 5.3
-    env: WP_VERSION=latest WP_MULTISITE=1
+  - php: 5.6
+    env: WP_VERSION=latest WP_MULTISITE=1 PHP_LATEST_STABLE=7.1
 
 before_script:
+  - export PATH="$HOME/.composer/vendor/bin:$PATH"
   - bash tests/bin/install.sh woocommerce_test root '' localhost $WP_VERSION
   - bash tests/bin/travis.sh before
 
-script: phpunit -c phpunit.xml.dist
+script:
+  - bash tests/bin/phpunit.sh
+  - bash tests/bin/travis.sh during
 
 after_script:
   - bash tests/bin/travis.sh after
diff --git a/.wordpress-org/banner-1544x500.png b/.wordpress-org/banner-1544x500.png
new file mode 100644
index 00000000000..d515d551fcc
Binary files /dev/null and b/.wordpress-org/banner-1544x500.png differ
diff --git a/.wordpress-org/banner-772x250.png b/.wordpress-org/banner-772x250.png
new file mode 100644
index 00000000000..aa1f423b1bd
Binary files /dev/null and b/.wordpress-org/banner-772x250.png differ
diff --git a/.wordpress-org/icon-128x128.png b/.wordpress-org/icon-128x128.png
new file mode 100644
index 00000000000..60918af4695
Binary files /dev/null and b/.wordpress-org/icon-128x128.png differ
diff --git a/.wordpress-org/icon-256x256.png b/.wordpress-org/icon-256x256.png
new file mode 100644
index 00000000000..2390aa84fff
Binary files /dev/null and b/.wordpress-org/icon-256x256.png differ
diff --git a/.wordpress-org/screenshot-1.png b/.wordpress-org/screenshot-1.png
new file mode 100644
index 00000000000..9b90d4fd05d
Binary files /dev/null and b/.wordpress-org/screenshot-1.png differ
diff --git a/.wordpress-org/screenshot-2.png b/.wordpress-org/screenshot-2.png
new file mode 100644
index 00000000000..995273936b3
Binary files /dev/null and b/.wordpress-org/screenshot-2.png differ
diff --git a/.wordpress-org/screenshot-3.png b/.wordpress-org/screenshot-3.png
new file mode 100644
index 00000000000..84c39b4c4e3
Binary files /dev/null and b/.wordpress-org/screenshot-3.png differ
diff --git a/.wordpress-org/screenshot-4.png b/.wordpress-org/screenshot-4.png
new file mode 100644
index 00000000000..9865f3351bb
Binary files /dev/null and b/.wordpress-org/screenshot-4.png differ
diff --git a/.wordpress-org/screenshot-5.png b/.wordpress-org/screenshot-5.png
new file mode 100644
index 00000000000..ed40c7f4743
Binary files /dev/null and b/.wordpress-org/screenshot-5.png differ
diff --git a/.wordpress-org/screenshot-6.png b/.wordpress-org/screenshot-6.png
new file mode 100644
index 00000000000..ba6dea591e0
Binary files /dev/null and b/.wordpress-org/screenshot-6.png differ
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index a7a57476294..c7aa5904ee1 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,12 +1,647 @@
 == Changelog ==
 
-= 2.4.12 - 9/12/2015 =
+= 3.0.5 - 2017-04-28 =
+* Fix - Tooltip display within shipping zone modals.
+* Fix - Fix missing title for actions column on mobile.
+* Fix - Allow forward slash in telephone field.
+* Fix - Sort grouped products by menu order when displaying.
+* Fix - Fix term exclusion in term count queries.
+* Fix - Filter invalid products before returning them for wc_get_products.
+* Fix - Prevent orders being their own parent (causes errors).
+* Fix - Correctly migrate legacy shipping taxes data.
+* Fix - Make sure the meta data cache is not shared among instances.
+* Fix - Correct the stock display notice when a variable product manages stock for it's children.
+* Fix - On multisite, add user to blog during checkout if not a user to prevent errors.
+* Fix - Correct sale price date handling with some timezone setups.
+* Fix - wc_attribute_taxonomy_id_by_name needs to use lowercase attribute slug to work.
+* Fix - Make changes to the buyer's company name in the shipping section of checkout persist.
+* Tweak - Add required placeholder for meta fields in backend.
+* Tweak - Don't strtolower address strings on checkout validation messages.
+* REST API - Prevent password change notification when creating a customer.
+* REST API - Removed duplicated items returned in shipping and checkout endpoints.
+* CLI - Fixed missing shipping zones route.
+* Dev - Make get_price_html handling match 2.6 and pass all values through woocommerce_get_price_html filter.
+* Dev - Legacy customer class missing get_address / get_address_2 functions.
+* Dev - Restored filter `woocommerce_checkout_customer_id` during checkout validation.
+* Dev - Adds missing `$this` argument for all `woocommerce_payment_complete_order_status` filters.
+
+= 3.0.4 - 2017-04-20 =
+* Fix - Variations were not inheriting the product image and shipping class ID.
+* Fix - Prevent rating/review counts being duplicated when duplicating products.
+* Fix - Fixed gallery navigation between images with long captions.
+* Fix - Support transparent PNG in the gallery by setting a background color.
+* Fix - Removed name/company from the shipping address Google map links.
+* Fix - Fixed the address field sorting script on the checkout.
+* Fix - Fixed the upgrade routine for grouped products so that parents are unset.
+* Fix - Fixed support for WordPress 4.7 user locale settings.
+* Fix - Fixed default option filter for product types in the product meta box.
+* Fix - Improved the css in Twenty Seventeen for dark color schemes.
+* Fix - Fixed display of refunds in sales report.
+* Fix - Updated `single-product/add-to-cart/variable.php` template version to 3.0.0 since it had changes since 2.6.
+* Fix - Fixed warnings when product attribute do not exists.
+* Fix - Used a div for comment-form-rating to prevent invalid nested markup.
+* Fix - Fixed some logic that checks if order taxes are compound.
+* Fix - Fixed SKU checks to only exclude products that are trashed.
+* Fix - Fixed display of download permissions in first email sent after checkout.
+* Fix - Hidden the backorder notification stock text when notification is disabled.
+* Fix - Fixed incorrect stock numbers in low stock emails.
+* Tweak - Removed the non-functional order total input box, and combined the recalculation buttons into one working button.
+* Tweak - Updated Guided Tour videos.
+* Tweak - Updated js-cookie.js to 2.1.4.
+* Tweak - Updated schema.org URLs to use HTTPS.
+* Tweak - Status report request timeouts.
+* REST API - Fixed an issue that prevented deleting a term if errors were thrown during creation.
+* REST API - Fixed reports endpoint when querying by date.
+* REST API - Fixed ignored order parameters when changing order status.
+* Dev - Support guest orders in `wc_get_orders` function.
+* Dev - Fixed downloadable variation filters for download URLs.
+* Dev - Added safeguards to prevent infinite loops while saving coupons, products and orders in admin.
+* Dev - Added a fallback for `queue_transactional_email` if background sending is disabled.
+* Dev - Added `has_shipping_address` helper method.
+* Dev - Introduced `woocommerce_order_item_get_formatted_meta_data` filter.
+* Dev - Made wc_add_order_item pass correct values to woocommerce_new_order_item.
+* Dev - Fixed `legacy_posted_data` access in checkout class.
+* Dev - Fixed undefined property notice in `WC_Order_Item::offsetGet`.
+* Dev - Fixed PHP 7.1 warnings when using non-float values to `wc_get_weight()`.
+* Dev - Fixed incorrect variable name in `wc_add_order_item()`.
+
+= 3.0.3 - 2017-04-13 =
+* Fix - Fixed an issue with variation tax-classes when set to 'parent'. This made taxes apply on top of the tax inclusive price in certain setups.
+* Fix - Escaped attribute translations in the `cart.php` template and bumped the template version to match.
+* Fix - Corrected the display of refund dates on the order screen.
+* Fix - Fixed the grouped product visibility check in the grouped.php template and bumped the template version to match.
+* Fix - Fixed the sale badge display for grouped products.
+* Fix - Added the `itemReviewed` structured data for product reviews to make it validate.
+* Fix - Made the `get_attribute` method work on variation objects.
+* Tweak - Turned off the deferred email sending by default which was added in 3.0. Whilst it does improve performance, there were compatibility problems on some servers. It can be enabled with a filter if desired.
+* Dev - Added backtrace information to the deprecation messages to help find problem plugins.
+
+= 3.0.2 - 2017-04-12 =
+* Fix - Removed required states for GP, GF, KW, LB, MQ, RE and YT countries.
+* Fix - Made cache in the [products] shortcode respect filters from plugins.
+* Fix - Added missing `woocommerce_cross_sells_columns` filter.
+* Fix - Fixed shortcode rendering on the shop page.
+* Fix - Fixed incorrect sale dates when bulk editing variations.
+* Fix - Fixed calls to wc_reduce_stock_levels in PayPal and Simplify gateways.
+* Fix - Exclude "location" meta when reading customer meta data.
+* Fix - Updated `emails/email-addresses.php`, `emails/email-order-details.php`, `content-single-product.php`, `checkout/form-shipping.php`, `myaccount/form-add-payment-method.php`, `myaccount/form-edit-address.php`, `myaccount/form-lost-password.php`, `myaccount/form-reset-password.php`, `myaccount/orders.php` and `myaccount/view-order.php` template version to 3.0.0 since they had changes since 2.6.
+* Fix - Fixed default behavior of variation tax classes when originally set to "parent".
+* Fix - When duplicating products, do not copy slug, append "(Copy)" to the product name, correctly copy all meta data, and prevent children of grouped products being duplicated too.
+* Fix - Removed duplicated items when outputting cross sells on the cart page.
+* Fix - Fixed output of default "add to cart" text of external products in loops.
+* Fix - Fixed backwards compatibility of guest checkout rules when being altered by plugins directly.
+* Fix - Use correct thumbnail sizes for variation images in the new gallery.
+* Fix - Fixed captions on thumbnails and main image in the new gallery.
+* Fix - Trigger wc_fragments_loaded after add to cart fragment refresh.
+* Fix - Download permissions; Convert dates to timestamp on read so UTC is preserved.
+* Fix - Fixed notices under PHP 7.1 when sorting products by name (numeric).
+* Fix - Added additional checks to ensure objects are read before using class methods to avoid errors.
+* Fix - Removed legacy suggest.js code which was causing JS error on bulk edit.
+* Fix - Fixed warnings on the "Lost password" page and when loading a product with invalid attributes.
+* Fix - Made background emailer update the queue after a successful send so duplicate mails are less likely.
+* Fix - Typo in flexslider_enabled option in new gallery script.
+* Fix - woocommerce_notify_low_stock and woocommerce_notify_no_stock options had no effect.
+* Tweak - For downloadable files, only validate file type when dealing with relative paths.
+* Tweak - Improved automatic variation name generation.
+* Dev - Added product visibility terms to system status report to help debug.
+* Dev - Introduced `woocommerce_admin_order_date_format` filter to replace missing `post_date_column_time`.
+* Dev - Introduced `woocommerce_update_customer_args` filter to prevent updates to user objects if needed.
+* REST API - Fixed saving of variations in legacy REST API v3.
+* REST API - Fixed backwards compatibility of line_items meta in legacy REST API.
+
+= 3.0.1 - 2017-04-06 =
+* Fix - Show catalog hidden products within grouped products.
+* Fix - Fade in the gallery in if no images are set or it's custom.
+* Fix - Use wc_deprecated_function in WC_Deprecated_Hooks so notices aren't output in ajax requests.
+* Fix - Added back the ability to include extra items to the System Status using the `woocommerce_system_status_environment_rows` filter.
+* Fix - Coupon category restrictions and limits for variations.
+* Fix - Allow shortcodes and HTML in variation descriptions like in 2.6.
+* Fix - Unset post date when duplicating products.
+* Fix - Show a sale price on variable products if on sale and all prices are the same.
+* Fix - Corrected download links when a product has multiple downloads.
+* Fix - Prevented potential errors if the product type was not posted for any reason on save.
+* Fix - Updated `single-product/up-sells.php`, `loop/add-to-cart.php`, `loop/rating.php`, `checkout/form-billing.php`, and `content-product.php` template version to 3.0.0.
+* Fix - Included clearfixes on billing and shipping field wrappers,
+* Fix - Fixed styling of logs table in some languages.
+* Fix - Fixed display of variation attributes on old orders.
+* Fix - Use placeholder text for external products add to cart button text if left blank.
+* Fix - Fallback to home URL if no shop page is set for system status security check for HTTPS.
+* Fix - For variations, pull tax status and sold individually from the parent since there is no UI to set this at variation level.
+* Fix - Moved cron emails to background processing to avoid multiple sends.
+* Fix - Wrapped structured data in a hidden element when added to emails.
+* Fix - Missing gateway information in queued emails.
+* Fix - Fixed a bug that caused pages to permanently reload if "Default customer location" was set to "Geolocate (with page caching support)".
+* Fix - When forcing shipping to billing, set the shipping fields in the order itself.
+* Fix - Check for invalid objects in WC_Register_WP_Admin_Settings.
+* Fix - Check for error object in wc_get_object_terms.
+* Fix - Removed slashes in shipping meta data on the order edit screen.
+* Fix - Prevented permalink rewrites for attributes with missing names.
+* Fix - Fixed saving of meta data when multiple extensions use the `save_post` action.
+* Fix - Allow search customers by ID in edit order screen.
+* Fix - Prevents session data overwriting customer data on login.
+* Fix - Fixed cross-sell column display and variation support.
+* Fix - Fixed variable product stock syncing on save.
+* Fix - Included try/catch wrapper to prevent issues with Select2.
+* Fix - Prevented a bug that deleted all variations when the product type was change from variable to simple.
+* Fix - Switched to WPDB to quicker update when syncing titles for variations.
+* Fix - Exclude deprecated properties when loading a customer object.
+* Fix - Fixed notices while trying to order again.
+* Fix - Fixed notices when `$wpdb->prefix` is empty.
+* Fix - Prevent errors when loading a product with an invalid download file types.
+* REST API - Fixed missing array declaration in CRUD controller.
+* REST API - Removed extra `exclude`, `include` and `search` parameters from taxes endpoint.
+* REST API - Fixed variation description formatting.
+* REST API - Fixed incorrect attribute check in products endpoint in Legacy REST API.
+* REST API - Allow variation image to be unset.
+
+= 3.0.0 - 2017-04-04 =
+* New gallery on single product pages with better mobile support, using PhotoSwipe and Zoom. Declare support with add_theme_support() - wc-product-gallery-zoom, wc-product-gallery-lightbox, wc-product-gallery-slider
+* Made the store notice dismissible on the frontend.
+* Variable products no longer show striked out prices in combination with ranges for clarity when on sale.
+* Prices no longer display as 'free' instead of 0, to fix issues with ranges and localization and for consistency.
+* Improved structured product data by using JSON-LD instead of inline Microdata.
+* Improved downloads list layout (template file).
+* Respect stock status and prevent the "out of stock threshold" setting affecting existing in-stock products.
+* Improved handling of shop page rewrite rules to allow subpages.
+* Redirect to login after password reset.
+* When using authorizations in PayPal Standard, automatically capture funds when the order goes processing/completed.
+* On multisite, when a user logs into a store with an account on a site, but not the current site, rather than error, add the user to the current site as a customer.
+* Show variable weights/dimensions even when parent values are not set.
+* Automatically sort tax rates rather than allow clunky manual sorting.
+* When deleting a tax rate class, remove it's tax rates.
+* Made WC_Logger pluggable via wc_get_logger function.
+* Use 'average rating' post meta for 'rating' product sorting option.
+* Show better labels in nav menus metabox.
+* Sort “Recently Viewed” products by the view order.
+* Removed internal scroll from log viewer.
+* Add reply-to to admin emails.
+* Improved the zone setup flow.
+* Made wc_get_wildcard_postcodes return the orignal postcode plus * since wildcards should match empty strings too.
+* Use all paid statuses in $customer->get_total_spent().
+* Move location of billing email field to work with password managers.
+* Option to restrict selling locations by country.
+* Added tool to clear orphaned variations in system status.
+* Remove checkbox options in system status tools and replace with constants.
+* Added security section in system status report.
+* Add image_url setting to PayPal Standard.
+* Fixed attribute registration. Attributes are non-hierarchical by default (parent is not supported).
+* Add sort parameter to checkout fields to aid with sorting per locale.
+* Merged percent and percent product coupon types (they provide the same discount).
+* Prevent payment details being cleared after update_checkout events.
+* Performance - Converted _featured and _visibility meta data to terms for faster catalog queries. Upgrade routine handles migration. Developers may need to update queries to reflect this change.
+* Includes product attributes archives links in "Additional Information" tab.
+* Select2 has been upgraded to v4.
+* Improved logging system for extensions.
+* Tax suffix is now hidden on non-taxable products.
+* Grouped products are linked from the parent rather than the children. Children can be in more than one group.
+* Removed coupon usage link in coupons admin screen.
+* Performance - Converted rating filters to visibility terms.
+* Performance - Added visibility term for outofstock products to speed those queries up also.
+* Performance - Introduced a new CRUD (create, read, update, delete) system for Products, Orders, Customers and Shipping Zones.
+* Performance - Optimised variable product sync. Upper/lower price meta is no longer stored, just the main prices, if a child has weight, and if a child has dimensions.
+* Performance - Removed WP_Query from up-sells.php and related.php and replaced with PHP foreach loop (since we already have the product IDs).
+* Performance - Removed the feature where old orders get access to new downloads on product edit. Looping potentially thousands of orders to do this is too much of a performance burden for stores and this can sometimes be unexpected behavior too. This does however updates *edited* downloads.
+* Performance - Removed 'items' column on orders screen due to loading excessive data.
+* Performance - Deferred email sending for faster checkouts. Now uses CRON.
+* API - New Rest API v2 with support for meta_data amongst other things.
+* API - Removed last order from customers part of the API due to performance concerns - use orders endpoint instead. Other order data on the endpoint is now transient cached.
+* API - Allow oAuth1.0a authentication using headers.
+* API - New Shipping Zones endpoints.
+* API - New variations endpoints.
+* API - New settings endpoints.
+* API - Payment gateways and shipping methods endpoints.
+* API - Prevented the (broken) ability to manipulate variations directly on the products endpoints.
+* CLI - New CLI which uses the REST API endpoints rather than it's own functions.
+* Localization - Improved RTL support.
+* Localization - Added a language independent permalink setting function.
+* Localization - Added inline comments for placeholder strings.
+* Localization - Added Nigerian and Pakistan Provinces to i18n/state.
+* Localization - US and Poland postcode validation.
+* To read more about this release, see our dev blog announcement here: http://wp.me/p6wtcw-Uo
+
+= 2.6.14 - 2017-02-02 =
+* Fix - Ensure product exists in wc_update_product_stock.
+* Fix - Send emails using the site language.
+* Fix - Remove tilde typo.
+* Fix - Fixed notice in get_rating_count.
+* Tweak - Define arg and return data types, added extra descriptions, and correctly cast IDs in the Rest API.
+* Tweak - Handle custom error data in WC_REST_Exception.
+* Tweak - Display conflicted product ID when using a duplicate SKU via the API.
+* Localization - Add Finnish defaults to the installer.
+
+= 2.6.13 - 2017-01-18 =
+* Fix - Demo store banner styling in 2017.
+* Fix - Removed default instructions from COD, BACS and Check gateways so displayed messages can be unset.
+* Fix - Made variation options update on first load.
+* Localization - Added Romanian locale to the installer.
+
+= 2.6.12 - 2017-01-12 =
+* Fix - Make images shown up on pageload when using ajax variations.
+* Fix - Allow variations options to be deselected in IE11.
+* Fix - Disabled-button and pagination styling in 2017.
+* Fix - PHP 7.1 compatibility issues with non-numeric math operations.
+* Fix - Fix notices in abstract class when price is empty.
+
+= 2.6.11 - 2016-12-22 =
+* Fix - Variation form compatibility with quotes in attribute values, and initial variation image fadeIn on certain configs.
+
+= 2.6.10 - 2016-12-22 =
+* Fix - Flat rate no class costs when no shipping classes exist.
+* Fix - Returned REST API coupon expiry date.
+* Fix - reviews_allowed being set to false in Rest API.
+* Fix - Sales date series for some custom ranges.
+* Fix - Missing attributes when an option is chosen by default on variations. This was the result of a Firefox 50 compatibility fix. In order to support both Firefox, Chrome, IE, and Edge we've done some refactoring of the variation add to cart scripts.
+* Tweak - Updated Geo IP API services.
+* Dev - Added support for WP VIP/VIP GO GEO IP headers.
+* Dev - API - Throw error messages when product image ID is not a valid WordPress attachment ID.
+
+= 2.6.9 - 2016-12-07 =
+* Theme - Added support for Twenty Seventeen Theme.
+* Fix - Excluded webhook delivery logs from comments count.
+* Fix - Included password strength meter in "Lost Password" page.
+* Fix - Order fee currency in admin screen.
+* Fix - Variation selection on Firefox 40.
+* Fix - Don't prevent submission when table is not found on cart.
+* Fix - Improved layered nav counts on attribute archives.
+* Fix - Fixed pagination when removing layered nav items via widget.
+* Fix - Default BE tax rate.
+* Fix - Downloads should store variation ID rather than product if set. Also fixes link on account page.
+* Fix - Use wp_list_sort instead of _usort_terms_by_ID to be compatible with 4.7.
+* Fix - Only return empty string if empty for weight and dimension functions.
+* Fix - Added correct fallbacks for logout/lost password URLs when endpoints are not defined.
+* Security - Wrapped admin tax rate table values in _escape to thwart evil CSVs an admin user could upload. Vulnerability was discovered by Fortinet’s FortiGuard Labs.
+* Dev - API - Only update categories menu order and display if defined.
+* Dev - Fixed when should deliver wp_trash_post webhooks.
+
+= 2.6.8 - 2016-11-10 =
+* Fix - REQUEST_URI was missing a trailing slash when being compared in the cache prevention functions.
+* Fix - Prevent issues when sending empty prices to PayPal.
+* Fix - Invalid email check.
+* Tweak - New extensions screen.
+
+= 2.6.7 - 2016-10-26 =
+* Fix - Use FLOOR and CEIL to get price filter values. Fixes the issue where max price is capped at 99.
+* Fix - Hide "Sales this month" information from Dashboard widget for users that don't have `view_woocommerce_reports` capability.
+* Fix - Remove notices only once on cart so subsequent notices do not remove older notices.
+* Tweak - Improve credit card fields for better mobile experience.
+
+= 2.6.6 - 2016-10-20 =
+* Fix - Conflict with Local Pickup Plus extension due to 2.7.x code in has_shipping_method().
+* Fix - Shipping method display order on frontend.
+
+= 2.6.5 - 2016-10-19 =
+* Fix - Shipping classes URL in admin.
+* Fix - Notice in reports when using custom date ranges.
+* Fix - When checking needs_shipping, ignore anything after : in the method ID.
+* Fix - Allow has_shipping_method to work with instances.
+* Fix - Potential notice in wc_add_to_cart_message().
+* Fix - Prevent notice in wpdb_table_fix if termmeta table is not used.
+* Fix - Payment method box fixes e.g. maintain previously selected payment method after update.
+* Fix - Prevent multiple password validation methods at once on my account page.
+* Fix - Ship to specific counties option had no effect.
+* Fix - Broken Webhook delivery due to use of post_date_gmt which does not exist for drafts.
+* Fix - Use method title in admin shipping dropdown.
+* Fix - Fixed downloadable variable product URL.
+* Fix - Handle object when generate_cart_id is used to prevent notices.
+* Fix - Set header link color in emails.
+* Fix - Rest of the world ID 0 zone handling when using CRUD classes.
+* Fix - Cast prices as decimal when querying prices in price filter widget.
+* Fix - API - Fix coupon description field.
+* Fix - API - ID needs to be capitalized to allow correct sorting.
+* Fix - API - Fixed undefined order ID.
+* Fix - API - Allow API to save refund reason.
+* Fix - API - Resolved encoding issues with attribute and variation slugs.
+* Fix - API - get_attributes should return term name, not slug.
+* Fix - API - Product "filter" and "sku" parameters.
+* Fix - Handle info notices in cart, not just error messages.
+* Fix - Don't remove hyphens in attribute labels.
+* Fix - Start sales on variations after they are saved, if applicable.
+* Fix - Made the text showing max variations you can link match the actual filtered value.
+* Fix - Add missing tables to wpmu_drop_tables function.
+* Fix - When syncing variation stock, ensure post is a variation.
+* Fix - Resolved some sales by date sum issues.
+* Fix - Fix cart update in IE when enter key is pressed.
+* Fix - Variation is_on_backorder when parent manages stock.
+* Fix - Fix variation script malfunctioning when show_option_none arg is set to false.
+* Fix - Fire tokenisation event on load for pay page.
+* Fix - Populate attribute dropdown when empty.
+* Fix - Fix email check on my account page.
+* Fix - Send processing email on on-hold to processing transition.
+* Fix - Incompatibility with SQLite databases.
+* Fix - KGS and ISK currency symbols.
+* Tweak - Password reset now uses WP functions.
+* Tweak - Format US 9-digit postcodes.
+
+= 2.6.4 - 2016-07-26 =
+* Fix - Security - Only allow image MIME type upload via REST APIs.
+* Fix - Shipping method title display in COD settings.
+* Fix - Order date input in Edge browser.
+* Fix - Ensure value is not null in variations to support empty show_option_none setting.
+* Fix - get_the_title does not need escape in grouped template file.
+* Fix - Ensure WC_ROUNDING_PRECISION is defined and use it as a low precision boundary in wc_get_rounding_precision().
+* Fix - Response body should be a string in webhook class.
+* Fix - Use h2 instead of h3 headings in profile screen.
+* Dev - API - Allow Allow meta_key/value filters for products.
+* Dev - CLI - Explode tags and category IDs to allow multiple comma separated values.
+* Dev - add $order arg to woocommerce_admin_order_item_class and woocommerce_admin_html_order_item_class filters.
+
+= 2.6.3 - 2016-07-19 =
+* Fix - Security - Escape captions in product-thumbnail and product-image templates (template versions have been bumped).
+* Fix - Fixed how we calculate shipping tax rates when using more than one tax class.
+* Fix - When duplicating product variations, set title, name, and guid.
+* Fix - Normalized 'read more' buttons.
+* Fix - Add to cart notices for grouped products.
+* Fix - Do not sanitize passwords in the settings API.
+* Fix - Handle shipping zone location range conversion during update (dashes to ...).
+* Fix - Always remove commas while processing flat rate costs.
+* Fix - Ensures account page layout is only applied to desktop-sized displays.
+* Fix - When getting layered nav counts, take search parameters into consideration.
+* Fix - Free shipping show/hide javascript.
+* Fix - Strip hash characters when exporting reports.
+* Fix - Use permission id to revoke access to downloads to prevent removing wrong rows.
+* Fix - When duplicating product variations, set title, name, and guid.
+* Fix - Set more appropriate default rounding precision based on currency decimal places.
+* Fix - Fix message styles for empty carts.
+* Fix - Fixed the load of the WC_Email_Customer_On_Hold_Order class.
+* Fix - Don't perform cart update on search submit.
+* Dev - API - Added support for WP REST API with custom URL prefixes.
+* Dev - API - Delete variations when deleting a variable product.
+* Dev - API - Fixed how we check for product types.
+* Dev - Added woocommerce_cart_id filter.
+* Dev - Add shortcode name param to shortcode_atts function calls.
+* Dev - Post custom data when fetching a variation via ajax.
+* Dev - Include child prices in grouped_price_html filter.
+* Dev - Allow filtering of variation stock quantity.
+* Dev - Added $_product argument to 'woocommerce_restock_refunded_item' hook.
+* Dev - Added a filter hook for the wc_ajax endpoint url.
+* Tweak - Include account page link in new customer account emails.
+* Tweak - Updated all URLs from WooThemes.com to WooCommerce.com.
+* Tweak - Cache the result of WC_Comments::wp_count_comments() in a transient (improves performance).
+
+= 2.6.2 - 2016-06-30 =
+* Fix - Set max index length on woocommerce_payment_tokenmeta table for utf8mb4 support.
+* Fix - is_available check for legacy shipping methods.
+* Fix - wc_add_to_cart_message() when non-array is passed.
+* Fix - Maximum coupon check should allow the 'maximum' value.
+* Fix - Product coupon logic to avoid applying non-applicable coupons.
+* Fix - Potential notices when leaving out 'default' field for shipping instances.
+* Fix - wp_cache_flush after term meta migration/update.
+* Fix - wc_add_to_cart_message() when non-array is passed.
+* Fix - woocommerce_redirect_single_search_result type check was incorrect.
+* Fix - Javascript show/hide of option in free shipping method.
+* Fix - Convert ellipsis to three periods when saving postcodes.
+* Fix - Prevent get_terms returning duplicates.
+* Fix - Removed non-existent country (Netherlands Antilles) from https://en.wikipedia.org/wiki/ISO_3166-1.
+* Fix - Grouped product range display when child is free.
+* Fix - Remove discount when checking free shipping min amount.
+* Fix - Prevent blocking the same element multiple times on cart page.
+* Fix - Don't sync ratings right after a new comment to prevent rating sync whilst rating meta does not exist yet.
+* Fix - Fix product RSS feeds when using shop base.
+* Fix - woocommerce_local_pickup_methods comparison by stripping instance IDs before the check.
+* Fix - During password resets, use cookie to store reset key and user login to avoid them being exposed in the URL/referer headers.
+* Dev - API - Fixed variable product stock at product level.
+* Dev - CLI - Introduces `woocommerce_cli_get_product_variable_types` filter.
+* Dev - Allow notices to be grouped on checkout after certain events.
+* Dev - API - Allows save images by ID with product variations.
+* Tweak - Made customer pay link display if order needs_payment() rather than checking pending status.
+* Tweak - Zones - Wording clarifications.
+* Tweak - Zones - Match zones with postcodes but no country.
+* Tweak - Zones - Match zones with no regions as 'everywhere'.
+* Tweak - Added view_admin_dashboard cap for disabling the admin access restriction in custom roles.
+* Tweak - Revised stock display based on feedback to hide 'in stock' message if stock management is off and only show available on backorder if notifying customer.
+* Tweak - Allow external product SKUs.
+* Tweak - PT (Portugal) and JP (Japan) postcode formats.
+* Tweak - Sort products from the `[product_category]` shortcode by menu order.
+* Tweak - Improve wc_orders_count() performance by running a query to count only posts of the given status.
+* Tweak - To allow my account page tabs to be disabled without code, you can now set the endpoint value to a blank string.
+
+= 2.6.1 - 2016-06-16 =
+* Fix - Added missing localized format for line taxes in orders screen to prevent total miscalculation in manual orders.
+* Fix - Improved the hour and time fields validation pattern on the orders screen.
+* Fix - PayPal does not allow free products, but paid shipping. Workaround by sending shipping as a line item if it is the only cost.
+* Fix - SKUs prop on products shortcode.
+* Fix - Layered nav counts when term_id does not match term_taxonomy_id (before splitting).
+* Fix - Fixed referer links from cart messages in WP 4.4.
+* Fix - Fix the showing/hiding of panels when terms do not exist by using wc_get_product_types() for retrieving product types.
+* Dev - content-product.php and content-product_cat.php contained the wrong version.
+* Dev - Show "matching zone" notice on the frontend when shipping debug mode is on.
+* Dev - Restored missing WC_Settings_API::init_form_fields() method to prevent potential errors in 3rd party gateways.
+* Dev - API - Fixed returned data from product images (changed `title` to `name`).
+* Dev - API - Fixed products schema for `grouped_products`.
+* Dev - API - Fixed products attribute options when contains `,`.
+* Tweak - Hide 'payment methods' screen if no methods support it.
+* Tweak - If shipping method count changes, reset to default.
+* Tweak - Avoid normalization of zone postcodes so wildcard matching can be performed on postcodes with spaces. E.g. SP1 *
+* Tweak - Allow max_fee in addition to min_fee in flat rate costs fields.
+* Tweak - Wrap order_schema_markup() output in hidden div in case script tag is stripped.
+
+= 2.6.0 - 2016-06-14 =
+* Feature - Introduced Shipping Zone functionality, and re-usable instance based shipping methods.
+* Feature - Tabbed "My Account" area.
+* Feature - Cart operations now use ajax (item quantities/remove, coupon apply/remove, shipping options).
+* Feature - Layered nav; filter by rating.
+* Feature - On-hold order emails.
+* Dev - All new REST API based on the WP REST API. The old WC REST API is still available, but the new one is preferred.
+* Dev - Added ability for shipping methods to store meta data to the order.
+* Dev - Added Payment Gateway Tokenization API for storing and retrieving tokens in a standardized manner.
+* Dev - Migrated custom term meta implementation to WP Term Meta.
+* Dev - Added new wc_get_orders() function to get order objects and ids instead of direct get_posts() calls.
+* Dev - Made coupon optional in cart has_discount() method.
+* Dev - Made the review template more editable.
+* Dev - Allowed product constructors to throw exceptions if invalid.
+* Dev - Wrapped currency symbols in a span to allow styling or replacement.
+* Fix - Update download permission user and email when changed.
+* Fix - Fixed shipping method unregistration.
+* Fix - Stopped create and update webhooks firing at the same time for products.
+* Fix - Allow COD to set on-hold status if the order contains downloads.
+* Fix - Force CURL to use TLS 1.2 for PayPal connections.
+* Tweak - Improved lost password flow.
+* Tweak - Show payment dates on order screen.
+* Tweak - Ignore catalog visibility on products shortcode when specifying IDs or SKUs.
+* Tweak - Added context to checkout error messages.
+* Tweak - Added SKU field to grouped products.
+* Tweak - Moved SKU field to inventory tab.
+* Tweak - Support qty display in cart messages.
+* Tweak - Hide min order amount field when not needed in shipping settings.
+* Tweak - If shipping < 999.99, use 'shipping' arg when passing values to PayPal.
+* Tweak - Show net sales on dashboard.
+* Tweak - Replaced credit card icons with SVG.
+* Tweak - Enqueue scripts on pages with checkout shortcodes.
+* Tweak - Color code the manual, system and customer notes.
+* Tweak - Layered Nav Refactoring to improve performance.
+* Tweak - Removed tag/cat classes from loops since WP does the same.
+* Tweak - Added hash check for orders so that if the cart changes before payment, a new order is made.
+* Tweak - Removed unused 'view mode' under screen options.
+* Tweak - Added 110 new currencies (including Bitcoin).
+* Tweak - New background updater for data upgrades.
+* Tweak - Blank slates in admin post screens.
+* Tweak - Added blockui when variations are being retrieved via ajax.
+* Tweak - Hide empty taxes by default (filterable).
+* Tweak - Allow failed orders to be edited.
+* Tweak - If there are no shipping methods setup, don’t prompt for shipping at checkout.
+* Tweak - Allowed country exclusion, rather than just inclusion, in ‘sell to’ setting.
+* Lots, lots more - [see the comparison here](https://github.com/woocommerce/woocommerce/compare/2.5.5...2.6.0).
+
+= 2.5.5 - 2016-03-11 =
+* Fix - Before running dbdelta, drop indexes to prevent duplicate key notices.
+* Fix - Prevent notice when unsetting terms on product edit screen.
+* Tweak - zeroclipboard fallback for firefox on system status report.
+* Tweak - Check valid product ID is provided on add_to_cart shortcode.
+
+= 2.5.4 - 2016-03-10 =
+* Fix - Fix table creation when using utf8mb4 charset.
+* Fix - Have wp_insert_post return WP_Error when creating our coupon, so the is_wp_error check can catch it.
+* Fix - Clear sale price on save if sale is no longer valid.
+* Fix - Round refund values to ensure refunds can be performed.
+* Fix - When getting coupon by code used twice, latest should be queried.
+* Fix - CLI improvements for setting up variations and deleting orders.
+* Fix - Allow big selects when getting variations to support larger queries.
+* Fix - Trigger webhook when user edits addresses on frontend.
+* Fix - Hide shipping row when calculator is disabled, and shipping costs are hidden.
+* Fix - Unset deleted attributes when updating products.
+* Tweak - Update date for paid orders during non-manual updates only.
+* Tweak - wc_get_page_permalink - if the page ID is not set, redirect home instead to prevent white screens.
+* Tweak - Remove log dir from system status report.
+* Tweak - When sorting by date, fallback to ID.
+* Tweak - Rename pay link for clarity.
+* Tweak - Provide a fallback message if copying to the clipboard fails in system status report.
+
+= 2.5.3 - 2016-03-01 =
+* Fix - Correct the 'unavailable template' call for variations so the message is displayed correctly, fixing a JS error.
+* Fix - Add 'media-models' dependency to write panel scripts.
+* Fix - Fix hide empty check in category walkers.
+* Fix - Current class fix on some servers when empty.
+* Fix - Multibyte safe trim string function.
+* Fix - Prevent a notice by stopping a loop in woocommerce_products_will_display from stomping on other variables.
+* Fix - If an attribute meta key is not set, technically its 'any', so should match. Prevents issues when meta data is missing after renaming attributes.
+* Fix - Make wc_get_product_variation_attributes ignore non variation attributes.
+* Fix - Notice when no order notes exist.
+* Fix - Removed extra tab from plain email shipping address.
+* Fix - Round shipping after tax calculation instead of before to prevent wrong taxes being calculated.
+* Fix - State input box was not reappearing when switching from a hidden input to a text input.
+* Fix - Don't duplicate rating and review counts.
+* Fix - CLI - Allow setting of a single category.
+* Fix - API - Replace term_taxonomy_id for term_id whilst creating/editing terms.
+* Fix - API - Fix parent_id and menu_order for variations.
+* Fix - Combine update post calls when update_status is ran.
+* Fix - Total number of comments in the admin panel.
+* Tweak - Show customer details for logged in users only on thanks page to prevent customer details being revealed if someone finds out the URL.
+* Tweak - Wrap status report in backticks to stop people breaking .org forums.
+* Tweak - Error handling for screen ids.
+* Tweak - Use $wpdb->replace instead of doing a select and then deciding to do an update or insert in session handler.
+* Tweak - Added check for private WooCommerce pages in status report.
+* Tweak - Transactional emails for failed -> on hold.
+* Dev - Include new triggers when removing and adding the password strength meter.
+* Dev - Allow pass objects and arrays as webhook callbacks.
+
+= 2.5.2 - 2016-02-01 =
+* Fix - Compatibility with w3 total cache inline minification.
+* Fix - Remove stock bw compat code which was preventing manage stock being disabled at variation level.
+* Fix - When calculating shipping total, force rounding.
+* Fix - Make save button clickable in tax rate table after using autocomplete field.
+* Fix - Fix passed image_size variable in email templates.
+* Fix - Don't show purchase note to admin in emails.
+* Fix - Fix 'hide empty' setting in category widget
.
+* Fix - Prevent notice in get_allowed_countries.
+* Fix - Prevent add-to-cart querystring in pagination links.
+* Tweak - Allow propagation in variation script.
+* Tweak - Product image alt text.
+* Tweak - Remove notice and add styling for add payment page.
+* Tweak - Set input margin and label display for compatibility with themes using bootstrap CSS.
+* Tweak - Add context to category term localization.
+* Tweak - Moved cart URL functions to core-functions file to make them available in admin area.
+* Tweak - Added password hint text and error messages when showing the password strength meter in forms.
+* Tweak - Added Saudi Riyal currency.
+* Tweak - Added Russian Ruble symbol.
+* Tweak - When COOKIEPATH is an empty string, set to '/' so cookies work across all pages.
+* Dev - Template - Pass $category into wc_product_cat_class() in content-product_cat.php
+
+= 2.5.1 - 2016-01-25 =
+* Fix - Remove usage of get_currentuserinfo() which is deprecated in WordPress 4.5.
+* Fix - Fix responsive product sizes when the columns class is missing.
+* Fix - Fix function exists check for woocommerce_template_loop_category_title.
+* Fix - check_version on all requests so that the installer runs after remote plugin updates.
+* Fix - Only show the "add payment method" button when needed, and check for required fields on the add payment method page.
+* Fix - Correctly block UI to prevent attribute issues in backend when adding multiple attributes in quick succession.
+* Fix - Show SKU in admin emails.
+* Fix - Don't show downloads in admin emails.
+* Fix - Fix query/missing variable in validate_user_usage_limit function.
+* Fix - Prevent endless loading on checkout when reload_checkout session variable was used.
+* Fix - Correctly display html entities in tax screen autocomplete.
+* Fix - Do sales reports based on refund line items rather than fully refunded orders to prevent double refunds being reported.
+* Fix - Qty button can be hidden for variable products sold individually.
+* Fix - Show the taxable country rather than base country in "estimated for" text during checkout.
+* Fix - Prevent select2 gaining focus on IOS7 scroll.
+* Fix - API - Fix indexes on decimal and thousand values.
+* Tweak - Clear cron jobs on uninstall
.
+* Tweak - Don't disable place order button on checkout if a weak password is used.
+* Tweak - Added password strength meter in lost password and edit accout pages.
+* Tweak - Pass $args to woocommerce_dropdown_variation_attribute_options_html hook.
+
+= 2.5.0 - 2016-01-18 =
+* Feature - New default session handler. Uses custom table to store data rather than the options table for performance and scalability reasons. https://woocommerce.wordpress.com/2015/10/07/new-session-handler-in-2-5/
+* Feature - New tax settings UI - faster, enhanced with ajax, searchable.
+* Feature - WP CLI Support. https://woocommerce.wordpress.com/2015/10/01/sneak-peek-wp-cli-support-in-woocommerce/
+* Feature - Added terms and conditions checkbox to pay page.
+* Feature - Password strength indicators.
+* Feature - Added 'pay' link to order screen.
+* Feature - Added admin order/payment failed notification.
+* Fix - Check for existence of global attribute when you get_attributes() for a product.
+* Fix - Show order by template on product search.
+* Fix - Search variation skus in backend search.
+* Tweak - For coupons with category restrictions, respect the category hierarchy.
+* Tweak - Added wc_array_cartesian function to generate variations in a logical order.
+* Tweak - Revised email settings screens to show emails in a table and avoid a long sub-nav.
+* Tweak - Default customer role capabilities.
+* Tweak - Expire mini-cart cache after 24 hours.
+* Tweak - Improved refund error messages in PayPal Standard.
+* Tweak - Removed language pack downloader in favour of translate.wordpress.org.
+* Tweak - Added onboarding wizard button to the contextual help so it can be accessed again.
+* Tweak - When a WordPress user is deleted, turn any orders they have into Guest orders.
+* Tweak - When calculating order taxes, respect tax settings and default to base country.
+* Tweak - Fade in variation images to avoid flicker during load.
+* Tweak - Display 2 averages on report (net and gross).
+* Tweak - Improve product search and use WPDB instead of several get_posts queries for performance.
+* Tweak - Use SKU for stock order notes.
+* Tweak - Added order notes for manual email sends.
+* Tweak - Sanitize shipping method labels/titles.
+* Tweak - Only display the coupon form on the checkout if a coupon hasn't been applied.
+* Tweak - Added billing address column to order screen (off for new users).
+* Tweak - Created function to disable author archives for customers.
+* Tweak - When updating cart hash, refresh all open tabs.
+* Tweak - Use new "question" mark icon font for help tips.
+* Tweak - Improved review verification status retrieval.
+* Tweak - Improve appearance when only 1 gateway is active.
+* Tweak - Aligned terms box left and added required asterisk.
+* Tweak - Removed dropdown display mode for cart shipping methods - radios are more flexible.
+* Dev - API - Added /products/shipping_classes endpoint.
+* Dev - API - Added support to POST, PUT, and DELETE categories and tags.
+* Dev - API - Added support to filter products by tag, category, shipping class, and attribute.
+* Dev - API - Added tax and tax_class endpoints.
+* Dev - Template - New star ratings. The old one was 5 separate buttons. This new one consolidates the 5 options into one element making it leaner visually and more intuitive. Works in IE9+ with a graceful degradation for IE8.
+* Dev - Template - Added `data-title` attribute to cart table.
+* Dev - Template - Product archive anchors are now hooked into templates rather than hard coded.
+* Dev - Template - Added template files for the customer details list in emails. emails/email-customer-details.php
+* Dev - Template - Revised single variation cart template. Template files now exist for variations, and the cart button will display (disabled) when no selections are made.
+* Dev - Template - Made "my orders" columns fully customizable with filters.
+* Dev - Template - Unified email template order details tables to use a single template.
+* Dev - Allow wc_clean to support arrays.
+* Dev - Added a manual update trigger for checkout.
+* Dev - Added woocommerce_is_price_filter_active filter to Query class.
+* Dev - Replaced some cart methods with dedicated functions. e.g. wc_ship_to_billing_address_only().
+* Localisation - Add Kenyan currency and symbol.
+
+= 2.4.13 - 2016-01-11 =
+* Fix - Potential redirect loop when using 'unforce ssl' setting and a https home URL.
+* Fix - Escape option names when cleaning up sessions.
+
+= 2.4.12 - 2015-12-9 =
 * Fix - 4.4 - Permission error when editing attribute terms.
 * Fix - 4.4 - Missing variation images when wp_get_attachment_image_srcset() returns false instead of a string.
 * Fix - 4.4 - Use post-thumbnail size in admin to avoid srcset.
 * Fix - Webhook status not changed after save with active object-cache.
 
-= 2.4.11 - 7/12/2015 =
+= 2.4.11 - 2015-12-7 =
 * Fix - WordPress 4.4 support.
 * Fix - Removes Switzerland from EU VAT definition
.
 * Fix - Fix auth endpoint urls.
@@ -22,13 +657,13 @@
 * Tweak - 4.4 - Support for srcset/sizes and responsive images.
 * Tweak - 4.4 - Support for Twenty Sixteen.
 
-= 2.4.10 - 10/11/2015 =
+= 2.4.10 - 2015-11-10 =
 * Fix - Geo IP - Correctly parse .dat files.
 * Fix - Geo IP - Ensure WC_Logger class exists before logging errors.
 * Fix - Geo IP - Prevent notices in ipv6 methods.
 * Tweak - Add information about credit card address for Simplify Commerce.
 
-= 2.4.9 - 09/11/2015 =
+= 2.4.9 - 2015-11-09 =
 * Fix - Check abspath exists in more files to prevent errors on direct access.
 * Fix - Hide SQL errors during ajax requests.
 * Fix - Fixed redirection loop on customizer screen.
@@ -37,9 +672,9 @@
 * Fix - Check for child themes in System Status.
 * Fix - API - Warnings when create attributes.
 * Fix - System Report: Template version check path.
-* Fix - Potential XSS within price.php fixed with escape on get_price() (would require edit/admin permissions to take advantage of). Discovered by FortiGuard Labs (http://www.fortiguard.com/). Template version has been bumped.
+* Fix - Potential XSS within price.php fixed with escape on get_price() (would require edit/admin permissions to take advantage of). Discovered by FortiGuard Labs (https://www.fortiguard.com/). Template version has been bumped.
 
-= 2.4.8 - 26/10/2015 =
+= 2.4.8 - 2015-10-26 =
 * Fix - Help tips in variations admin.
 * Fix - API - Fixed customer count method.
 * Fix - Locale switching for city field.
@@ -60,7 +695,7 @@
 * Tweak - API - Allow variable products to get retrieved by SKU.
 * Tweak - API - Allow edit variations without define the product type to variable.
 
-= 2.4.7 - 21/09/2015 =
+= 2.4.7 - 2015-09-21 =
 * Fix - Handle Switzerland in get_european_union_countries.
 * Fix - For geolocation with static cache support, ensure hash is appended during form submission.
 * Fix - To prevent discounts being applied in 'random' order (based on order added to cart), sort cart items based on subtotal during calculate_totals.
@@ -75,7 +710,7 @@
 * Fix - Added monthly cron schedule.
 * Fix - Remove use of 'input' event in checkout scripts to prevent IE11 triggering updates on placeholder change.
 * Fix - AJAX variations not being found in some cases when product version was < 2.4, but attributes were updated after sync().
-* Fix - Changed the way variable product prices get cached for greater plugin compatibility. See http://wp.me/p6wtcw-5x
+* Fix - Changed the way variable product prices get cached for greater plugin compatibility. See https://wp.me/p6wtcw-5x
 * Fix - Highlighting of reports chart.
 * Fix - Network activated plugins not showing up in system status report.
 * Fix - Tax fields showing on bulk/quick edit when disabled the tax system.
@@ -98,7 +733,7 @@
 * Template - Removed 'Payment' heading in `templates/checkout/form-pay.php`.
 * Template - Removed unnecessary clearing div in `templates/checkout/payment.php`.
 
-= 2.4.6 - 24/08/2015 =
+= 2.4.6 - 2015-08-24 =
 * Fix - menu_order notices on IIS.
 * Fix - Grouped product is_purchasable check during add to cart.
 * Fix - Subscriptions 2.0 (unreleased) compatibility.
@@ -117,7 +752,7 @@
 * Tweak - WC Setup wizard: Add spinner/loading indication between onboarding steps.
 * Tweak - Allow HTML in store notice.
 
-= 2.4.5 - 20/08/2015 =
+= 2.4.5 - 2015-08-20 =
 * Fix - Global text based attribute saving on product page.
 * Fix - save_account_details should check display name of current user.
 * Fix - Show the right 'no shipping available' message when a country does not have states.
@@ -136,7 +771,7 @@
 * Tweak - Improved download numbering in emails and order page.
 * Tweak - Allowed users to install translations for the current language during the Setup Wizard.
 
-= 2.4.4 - 14/08/2015 =
+= 2.4.4 - 2015-08-14 =
 * Fix - Ajax variation handling when 'any' attribute is set.
 * Fix - Run html_entity_decode over text attributes to fix problems with quote characters.
 * Fix - COD: remove shipping check if the cart is 100% virtual.
@@ -144,7 +779,7 @@
 * Tweak - Include attribute archives support in the breadcrumbs.
 * Tweak - woocommerce_variable_children_args hook.
 
-= 2.4.3 - 12/08/2015 =
+= 2.4.3 - 2015-08-12 =
 * Fix - Query within wc_customer_bought_product().
 * Fix - Tab hiding with some theme markup.
 * Fix - Ajax variations: stripslashes to fix attributes with quotes.
@@ -155,7 +790,7 @@
 * Tweak - When merging shipping taxes with a shipping rate taxes, ensure shipping rate taxes is not malformed.
 * Tweak - Improved refund email events and woocommerce_order_fully_refunded hook.
 
-= 2.4.2 - 11/08/2015 =
+= 2.4.2 - 2015-08-11 =
 * Fix - If all variations are out of stock, maintain pricing display.
 * Fix - Prevent double add to cart due to ajax endpoints.
 * Fix - ordering_args in product_category shortcode.
@@ -167,12 +802,12 @@
 * Tweak - Hide get_formatted_legacy notices when doing ajax.
 * Tweak - use shop_single instead of full image size for variations.
 
-= 2.4.1 - 10/08/2015 =
+= 2.4.1 - 2015-08-10 =
 * Fix - Tweaked the 2.4 upgrade routine to disable refund emails during update.
 * Fix - Notices when calling get_shipping_classes().
 * Fix - Added upgrade routine to ensure _stock_status meta exists for variations created before WooCommerce 2.2
 
-= 2.4.0 - 10/08/2015 =
+= 2.4.0 - 2015-08-10 =
 * Feature - Onboarding/setup wizard for new users to handle basic store settings and installation.
 * Feature - Improved help tabs with inline video tutorials where applicable.
 * Feature - New AJAX powered variations interface to improve edit product page loading times and posting large amounts of data.
@@ -211,14 +846,14 @@
 * Dev - API - Deprecated /product/sku endpoint from v3.
 * Dev - API - Created the /products/id/orders endpoint to fetch orders containing a specific product.
 * Localisation - Added Argentine currency and provinces.
-* [Various other small fixes and enhancements.](https://github.com/woothemes/woocommerce/issues?q=is%3Aissue+milestone%3A%222.4+Helpful+Hedgehog%22+is%3Aclosed)
+* [Various other small fixes and enhancements.](https://github.com/woocommerce/woocommerce/issues?q=is%3Aissue+milestone%3A%222.4+Helpful+Hedgehog%22+is%3Aclosed)
 
-= 2.3.13 - 07/07/2015 =
+= 2.3.13 - 2015-07-07 =
 * Fix - Improved the email settings save and tabs for 3rd party plugins.
 * Fix - Datepicker range for variations.
 
-= 2.3.12 - 06/07/2015 =
-* Fix - Fixed Google Chrome forcing to use SSL. This can cause some issues on websites behind load balancers or reverse proxies. [Read more](http://docs.woothemes.com/document/ssl-and-https/#websites-behind-load-balancers-or-reverse-proxies).
+= 2.3.12 - 2015-07-06 =
+* Fix - Fixed Google Chrome forcing to use SSL. This can cause some issues on websites behind load balancers or reverse proxies. [Read more](https://docs.woocommerce.com/document/ssl-and-https/#websites-behind-load-balancers-or-reverse-proxies).
 * Fix - Escaped shop url in empty cart template.
 * Fix - Escaped product tabs titles.
 * Fix - Removed deprecated PHP4 constructor on Widget classes.
@@ -230,7 +865,7 @@
 * Fix - Flat rate shipping costs should ignore virtual items.
 * Tweak - Keep product quantity when happens some error while add product on the cart.
 
-= 2.3.11 - 10/06/2015 =
+= 2.3.11 - 2015-06-10 =
 * Fix - Check if rating is enabled before check if rating is required to a review.
 * Fix - get_discounted_price needs to check if taxes are enabled.
 * Fix - Fixed filetype check for digital downloads.
@@ -244,7 +879,7 @@
 * Fix - API - Fixed the sanitization for downloadable files on products endpoint.
 * Tweak - woocommerce_downloadable_file_exists filter.
 
-= 2.3.10 - 01/06/2015 =
+= 2.3.10 - 2015-06-01 =
 * Fix - Fixed theme check notice for core supported themes.
 * Fix - Add RTL direction to emails.
 * Fix - Fixed product category media upload modal.
@@ -285,7 +920,7 @@
 * Tweak - Error prevention when showing customer orders on the frontend.
 * Tweak - Added PH states.
 
-= 2.3.9 - 19/05/2015 =
+= 2.3.9 - 2015-05-19 =
 * Fix - Fixed language upgrader verification.
 * Fix - Refund reporting #8010
 * Fix - Redirect after bulk editing.
@@ -298,7 +933,7 @@
 * Fix - Move action to prevent infinite recursion on login/restoring saved carts.
 * Fix - Update PrettyPhoto to 3.1.6 to resolve XSS security issue https://github.com/scaron/prettyphoto/issues/149
 
-= 2.3.8 - 20/04/2015 =
+= 2.3.8 - 2015-04-20 =
 * Fix - Ensure coupon taxes are reset when calculating totals.
 * Fix - Downloads url sanitization to work correctly with shortcodes and urls.
 * Fix - State/Country select2 issues with Internet Explorer.
@@ -324,7 +959,7 @@
 * Tweak - Only automatically cancel orders created via checkout + allow post_parent to be set.
 * Tweak - Deny all access to revisions through API.
 
-= 2.3.7 - 18/03/2015 =
+= 2.3.7 - 2015-03-18 =
 * Fix - Allow saving of empty download expiry date on orders.
 * Fix - get_total_discount() function with certain tax setups.
 * Fix - stock management for variations for Products API.
@@ -335,7 +970,7 @@
 * Tweak - Revised how discounts/discount taxes are stored for consistency. Always store ex. tax to make data retrieval easier, and to ensure totals are correct after settings changes. Backwards compatibility maintained through use of order versioning.
 * Tweak - Delete product attachments when the Products API fails.
 
-= 2.3.6 - 13/03/2015 =
+= 2.3.6 - 2015-03-13 =
 * Fix - Removal of coupons containing spaces.
 * Fix - Unclosed div in profile page.
 * Fix - Export report CSV.
@@ -350,7 +985,7 @@
 * Tweak - Use 30 days instead of year for transients to avoid bugs in memcache plugins.
 * Tweak - Add reports menu item if user can access reports but not the main WC section.
 * Tweak - Improve grouped product quantity inputs.
-* Tweak - Load the persistant cart if cart is empty.
+* Tweak - Load the persistent cart if cart is empty.
 * Tweak - Prevent cart being cleared when accessing the login page.
 * Tweak - Shipping calculator - Made state/postcode respect country locale like checkout.
 * Tweak - Move default customer location to general settings tab.
@@ -364,7 +999,7 @@
 * Tweak - Increase wc_get_weight precision.
 * Dev - API - reports/sales now also returns total refunds.
 
-= 2.3.5 - 20/02/2015 =
+= 2.3.5 - 2015-02-20 =
 * Fix - Plain text address formatting.
 * Fix - Detect shortcodes when saving URLs.
 * Fix - Unhook wc_page_endpoint_title after it is ran once (main page title).
@@ -376,7 +1011,7 @@
 * Tweak - Improve category coupon message.
 * Tweak - Don't download GeoIP Database until geolocation option is enabled in settings.
 
-= 2.3.4 - 17/02/2015 =
+= 2.3.4 - 2015-02-17 =
 * Fix - limit_usage_to_x_items option in coupons.
 * Fix - Run coupon codes through html_entity_decode.
 * Fix - Tax by code report for refunds.
@@ -404,7 +1039,7 @@
 * Tweak - Restock items AFTER refund, not before.
 * Tweak - If logged in, populate customer data from user meta.
 
-= 2.3.3 - 12/02/2015 =
+= 2.3.3 - 2015-02-12 =
 * Fix - Potential notice with preg_match wildcard search, if used incorrectly.
 * Fix - Typo in get_from_name method.
 * Fix - Fix errors during checkout when mb_convert_encoding() is not supported.
@@ -413,7 +1048,7 @@
 * Fix - Query in uninstall script.
 * Tweak - Only run the uninstaller if the "Uninstall on Delete" option is checked in system status.
 
-= 2.3.2 - 12/02/2015 =
+= 2.3.2 - 2015-02-12 =
 * Fix - Item meta removal query in order class.
 * Fix - Pass correct shipping cost to PayPal.
 * Fix - Flat rate extra costs when costs are an array.
@@ -423,7 +1058,7 @@
 * Fix - Average product rating when ratings are not required.
 * Fix - attribute_public option.
 
-= 2.3.1 - 11/02/2015 =
+= 2.3.1 - 2015-02-11 =
 * Fix - When the geolocation database cannot download, ensure the correct method is used to log the error.
 * Fix - Notice in woocommerce_form_field().
 * Fix - attribute_public notice before DB upgrade.
@@ -432,8 +1067,8 @@
 * Fix - is_available() check in local pickup.
 * Fix - Added WC version of GEOIP classes to prevent conflicts with other plugins.
 
-= 2.3.0 - 11/02/2015 =
-* Feature - Option to geo-locate the customer's inital location.
+= 2.3.0 - 2015-02-11 =
+* Feature - Option to geo-locate the customer's initial location.
 * Feature - Display taxes in store based on the customer location, rather than the shop base.
 * Feature - Made tax importer expand postcode ranges.
 * Feature - Print styles for reports.
@@ -484,16 +1119,16 @@
 * Localisation - Add Ukrainian currency and symbol.
 * Localisation - Greece regions.
 
-= 2.2.11 - 29/01/2015 =
+= 2.2.11 - 2015-01-29 =
 * Add - URL in Usage/Limit column in Coupons table to query for orders.
 * Fix - esc_url() applied to prevent potential XSS issues.
 * Fix - "Link all variations" button.
 
-= 2.2.10 - 16/12/2014 =
+= 2.2.10 - 2014-12-16 =
 * Fix - Stock status on quick and bulk edit.
 * Fix - Incorrect clearing of error messages.
 
-= 2.2.9 - 15/12/2014 =
+= 2.2.9 - 2014-12-15 =
 * Add - API - parent_id for products endpoint.
 * Fix - Processing and On-hold order links in WooCommerce Status dashboard widget.
 * Fix - Orders API when query orders with deleted products.
@@ -521,7 +1156,7 @@
 * Tweak - Added result and message keys to order_review AJAX call.
 * Tweak - Added get_cart_item to WC_Cart class.
 
-= 2.2.8 - 29/10/2014 =
+= 2.2.8 - 2014-10-29 =
 * Fix - Image crop option.
 * Fix - Display of order note date.
 * Fix - API POST/PUT products attributes values.
@@ -537,7 +1172,7 @@
 * Tweak - Use current user ID for refunds.
 * Tweak - Allow API edit_product method to update post_name (slug).
 
-= 2.2.7 - 22/10/2014 =
+= 2.2.7 - 2014-10-22 =
 * Fix - Fix refund date.
 * Fix - Fixed various notices.
 * Fix - Make updater set parent backorder status.
@@ -563,7 +1198,7 @@
 * Tweak - Update simplify commerce to use new $order->get_status().
 * Tweak - Only show integrations subnav when there are multiple integrations.
 
-= 2.2.6 - 08/10/2014 =
+= 2.2.6 - 2014-10-08 =
 * Fix - Notices in the cache helper.
 * Fix - Prevent bulk edit from breaking sale price scheduled dates.
 * Fix - Prevent address fields being empty when editing an address within an order.
@@ -573,7 +1208,7 @@
 * Tweak - Added filter for shipping tax.
 * Tweak - Product attribute shortcode should return columns css class.
 
-= 2.2.5 - 07/10/2014 =
+= 2.2.5 - 2014-10-07 =
 * Fix - Filters in admin screen for coupons and orders.
 * Fix - When bulk editing, don't allow sale price to be negative.
 * Fix - When manually adding items to an order, show tax columns.
@@ -597,7 +1232,7 @@
 * Tweak - Tweak load_plugin_textdomain to be relative - this falls back to WP_LANG_DIR automatically. Can prevent "open_basedir restriction in effect".
 * Tweak - Added acceptance marks to PayPal Standard where applicable to replace generic PayPal icon.
 
-= 2.2.4 - 18/09/2014 =
+= 2.2.4 - 2014-09-18 =
 * Fix - Prevent errors when adding 'zero-rated' tax on checkout.
 * Fix - Fixed a varation product width inheritance bug.
 * Fix - Totals in taxes by date report.
@@ -609,7 +1244,7 @@
 * Localisation - Nepal States.
 * Localisation - Mexico states.
 
-= 2.2.3 - 16/09/2014 =
+= 2.2.3 - 2014-09-16 =
 * Fix - Order status translation in admin and account page.
 * Fix - Ensure shipping address gets displayed - fixes needs_shipping_address() method.
 * Fix - Escaping of country names in tax settings.
@@ -636,17 +1271,17 @@
 * Tweak - Display of h4 in settings pages.
 * Dev - Added woocommerce_get_settings_ID filters.
 
-= 2.2.2 - 11/09/2014 =
+= 2.2.2 - 2014-09-11 =
 * Fix - Saving of variation stock when parent stock management is disabled.
 * Fix - "open_basedir restriction in effect" error caused on install when trying to create the WC logging directory.
 * Fix - For regular products, ensure stock level saves on product creation.
 
-= 2.2.1 - 10/09/2014 =
+= 2.2.1 - 2014-09-10 =
 * Fix - Small tweak to the installer to prevent errors caused by outdated plugins.
 * Fix - Mijireh Checkout update link.
 * Tweak - Small tweak to update notification to remind users to update old plugins prior to install.
 
-= 2.2.0 - 10/09/2014 =
+= 2.2.0 - 2014-09-10 =
 * Feature - Refunds system for orders.
 * Feature - New orders panel for managing line items + totals.
 * Feature - Language pack downloader. po and mo files removed from core (too heavy).
@@ -692,7 +1327,7 @@
 * Dev - Introduces the WC_Order::needs_shipping_address() method.
 * Dev - Gateways can set transaction ID for the order.
 * Dev - Gateways can do refunds via the Payment Gateway API.
-* Refactor - Changed the method in which order statuses are stored. Previously, order status was a taxonomy. This caused issues when unique term slugs differed from what we were expecting, and also added additonal overhead to order queries in reports. https://github.com/woothemes/woocommerce/issues/3064 Order status is now stored as post status - several new post statuses have been added. Order class variables are backwards compatible. The only thing to note (for devs) is that any query must use the order status instead of 'publish' when getting orders and querying by post_status. THe shop_order_status has also been removed.
+* Refactor - Changed the method in which order statuses are stored. Previously, order status was a taxonomy. This caused issues when unique term slugs differed from what we were expecting, and also added additional overhead to order queries in reports. https://github.com/woocommerce/woocommerce/issues/3064 Order status is now stored as post status - several new post statuses have been added. Order class variables are backwards compatible. The only thing to note (for devs) is that any query must use the order status instead of 'publish' when getting orders and querying by post_status. THe shop_order_status has also been removed.
 * Refactor - Update stock amounts with DB queries.
 * Refactor - Simplified attribute name sanitisation which maintains UTF8 char integrity.
 * Refactor - Country class return methods.
@@ -701,7 +1336,7 @@
 * Localisation - Address format of Taiwan.
 * Localisation - Removed language files from core to made the package lighter (see language pack downloader feature).
 
-= 2.1.12 - 01/07/2014 =
+= 2.1.12 - 2014-07-01 =
 * Fix - Total tax should be +, not -.
 * Fix - Address format in plain text emails to use line breaks, not commas.
 * Fix - order item count fix and tr class filters.
@@ -709,12 +1344,12 @@
 * Fix - Correctly clear transients, including sale transient.
 * Tweak - woocommerce_get_order_item_totals_excl_free_fees hook.
 
-= 2.1.11 - 09/06/2014 =
+= 2.1.11 - 2014-06-09 =
 * Fix - Plain text email display of customer address.
 * Fix - Saving tax rates threw notices (missing git cherry pick).
 
-= 2.1.10 - 03/06/2014 =
-* Fix - Removed unecessary localization from edit account.
+= 2.1.10 - 2014-06-03 =
+* Fix - Removed unnecessary localization from edit account.
 * Fix - Admin welcome screen css.
 * Fix - Fixed my account setting values to wrong user submitted strings.
 * Fix - Menu order terms were coming back empty.
@@ -731,7 +1366,7 @@
 * Tweak - Stronger session ID generation.
 * Dev - Add action hooks when saving tax rates.
 
-= 2.1.9 - 14/05/2014 =
+= 2.1.9 - 2014-05-14 =
 * Fix - fix case-insensitive matching for coupon posts with uppercase chars.
 * Fix - Make the welcome page RTL compatible.
 * Fix - Sanitize, but decode, flat rate shipping method ids. UTF-8 Friendly.
@@ -757,7 +1392,7 @@
 * Dev - Add $package to is_available shipping method hooks.
 * Dev - Add tool for disabling shipping rate cache for debug.
 
-= 2.1.8 - 30/04/2014 =
+= 2.1.8 - 2014-04-30 =
 * Fix - Prevent saving duplicate skus in quick edit.
 * Fix - Sorting of downloads on my account page.
 * Fix - Clear cached API reports when deleting other order transients.
@@ -777,7 +1412,7 @@
 * Tweak - Improved Abstract product constructor.
 * Tweak - Add COD instructions to emails.
 
-= 2.1.7 - 10/04/2014 =
+= 2.1.7 - 2014-04-10 =
 * Fix - Allow WC API to generate API keys for different user than the one that is making request.
 * Fix - Fix the SKU search logic so it works with other filters.
 * Fix - Correctly round shipping + shipping tax together when passes the tax inclusive total to paypal.
@@ -818,7 +1453,7 @@
 * Tweak - get_image_id method for use in email template. Shows correct variation images.
 * Tweak - added validation when save the frontend colors.
 
-= 2.1.6 - 25/03/2014 =
+= 2.1.6 - 2014-03-25 =
 * Fix - Fixed a bug where cron events are scheduled using a function name rather than a hook name.
 * Fix - Given transients not required on all pages expiration times to prevent autoloading.
 * Fix - Don't trailingslash Order Cancel URLs with a Query String.
@@ -863,7 +1498,7 @@
 * Localisation - Bangladeshi states (districts).
 * Localisation - Croatian currency symbol.
 
-= 2.1.5 - 06/03/2014 =
+= 2.1.5 - 2014-03-06 =
 * Fix - Prevent notices on new plain text email parameter for BACS and Cheque gateways
 * Fix - Fixed issue where variation prices were hidden when variation stock management wasn't set
 * Fix - Discounts fixed_product are now properly multiplied by quantity
@@ -873,7 +1508,7 @@
 * Tweak - Fallback for when add ons page is not loading
 * Tweak - Hide price suffix in admin panel lists
 
-= 2.1.4 - 05/03/2014 =
+= 2.1.4 - 2014-03-05 =
 * Fix - Prevent duplicate loading of functions files
 * Fix - Fixed breaking timeline for reports
 * Fix - Category widget ordering
@@ -899,7 +1534,7 @@
 * Tweak - Improved styles for tab views
 * Refactor - Hardened code base and fixed strict standards notices
 
-= 2.1.3 - 27/02/2014 =
+= 2.1.3 - 2014-02-27 =
 * Fix - Use correct thresholds to calculate out of stock number in dashboard widget
 * Fix - Admin screen strings sanitised to work with Chinese characters
 * Fix - REST API OAuth signature fixed when using filter params
@@ -954,7 +1589,7 @@
 * Refactor - Changed all text strings without explicit domain, to use the 'woocommerce' text domain
 * Refactor - Speed improvements in various places
 
-= 2.1.2 - 13/02/2014 =
+= 2.1.2 - 2014-02-13 =
 * Fix - Removed nl2br function from plain text email-order-items email template
 * Fix - Made static string translatable in email-order-items email template
 * Fix - Added missing third parameter to _doing_it_wrong call
@@ -977,7 +1612,7 @@
 * Refactor - Removed obsolete view order shortcode class
 * Localization - Multiple localization updates
 
-= 2.1.1 - 12/02/2014 =
+= 2.1.1 - 2014-02-12 =
 * Feature - Show notice if template files are out of date for themes including WooCommerce template files
 * Feature - Introducing supporting is_wc_endpoint_url function
 * Fix - During install, register all post types and endpoints so that the rewrite rules are correctly generated.
@@ -1001,7 +1636,7 @@
 * Refactor - Several function dockblocks improved
 * Refactor - Stripped out some unused variables
 
-= 2.1.0 - 10/02/2014 =
+= 2.1.0 - 2014-02-10 =
 * Feature - New REST API
 * Feature - Define whether prices should be shown incl. or excl. of tax, and add an optional suffix.
 * Feature - Show grouped or itemized taxes during checkout.
@@ -1013,7 +1648,7 @@
 * Feature - Customer list reports.
 * Feature - Reports - New design, export csvs, more data.
 * Feature - Ability to link past orders to a customer (before they registered).
-* Feature - Authorize option for paypal standard.
+* Feature - Authorize option for PayPal Standard.
 * Feature - Separate options for countries you can ship to and sell to.
 * Feature - BACS supports multiple account details.
 * Feature - PayPal PDT support (as alternative to IPN).
@@ -1044,7 +1679,7 @@
 * Tweak - Filterable page installer.
 * Tweak - Order details optimised for small screens.
 * Tweak - Streamlined account process - username and passwords are optional and can be automatically generated.
-* Tweak - Updated/new dummy data (including .csv files to be used with [Product CSV Import Suite](http://www.woothemes.com/products/product-csv-import-suite/)).
+* Tweak - Updated/new dummy data (including .csv files to be used with [Product CSV Import Suite](https://woocommerce.com/products/product-csv-import-suite/)).
 * Tweak - Product shortcodes columns parameter now affects layout correctly.
 * Tweak - Disabled button styles.
 * Tweak - Hooks for overriding default email inline styles.
@@ -1054,7 +1689,7 @@
 * Tweak - Make shipping methods check if taxable, so when customer is VAT excempt taxes are not included in price.
 * Tweak - Coupon in admin bar new menu #3974
 * Tweak - Shortcode tag filters + updated menu names to make white labelling easier.
-* Tweak - Removed placeholder polyfill. Use this plugin to replace functionality if required: http://wordpress.org/plugins/html5-placeholder-polyfill/
+* Tweak - Removed placeholder polyfill. Use this plugin to replace functionality if required: https://wordpress.org/plugins/html5-placeholder-polyfill/
 * Tweak - Replaced all instances of &rarr; and &larr; in frontent using wc icon font plus .wc-forward and .wc-backward utility classes.
 * Tweak - Add review form no longer opens in lightbox.
 * Tweak - Move average rating outside of hidden tab for google #3867.
@@ -1066,8 +1701,8 @@
 * Fix - Tweaked popularity sorting to work better when no sales are present.
 * Fix - Quote encoding in email subjects.
 * Fix - Added $wp_error parameter during checkout process to ensure WP_Error object is returned on error and checkout process is properly stopped.
-* Refactor - Taken out Piwik integration, use http://wordpress.org/extend/plugins/woocommerce-piwik-integration/ from now on.
-* Refactor - Taken out ShareYourCart integration, use http://wordpress.org/extend/plugins/shareyourcart/ from now on.
+* Refactor - Taken out Piwik integration, use https://wordpress.org/plugins/woocommerce-piwik-integration/ from now on.
+* Refactor - Taken out ShareYourCart integration, use https://wordpress.org/plugins/shareyourcart/ from now on.
 * Refactor - Moved woocommerce_get_formatted_product_name function into WC_Product class.
 * Refactor - Improved parameter handling in woocommerce_related_products() function.
 * Refactor - Widget classes (added abstract and combined similar widgets).
@@ -1080,13 +1715,13 @@
 * Localization - Spanish translation by Luis Giménez.
 * Localization - French, Spanish, Romanian, Danish, Korean, Czech, Arabic, Hungarian updates.
 
-= 2.0.20 - 21/11/2013 =
+= 2.0.20 - 2013-11-21 =
 * Tweaked paypal request
 * Check for WP Error when getting terms in breadcrumb file
 * Sanitize when searching in admin
 * Fix yard to cm conversion
 
-= 2.0.19 - 04/11/2013 =
+= 2.0.19 - 2013-11-04 =
 * Fix - get_item_subtotal() logic
 * Fix - Pass number of products variable to get_related for more then 5 related products
 * Fix - Email fatal error for orders with missing products
@@ -1095,7 +1730,7 @@
 * Tweak - Added wordwrap to order notes
 * Localisation - Updated Portuguese, Slovak, French, Lithuanian, Finnish
 
-= 2.0.18 - 21/10/2013 =
+= 2.0.18 - 2013-10-21 =
 * Fix - Escaped the "hide-wc-extensions-message" link in admin.
 * Fix - CSS -mox- prefix. #3953
 * Fix - Remove sorting args after main query #3969
@@ -1105,7 +1740,7 @@
 * Tweak - Show layered nav widgets on any product taxonomy page
 * Localisation - Various corrections
 
-= 2.0.17 - 17/10/2013 =
+= 2.0.17 - 2013-10-17 =
 * Fix - Add missing doctype for email header #3921
 * Fix - 2 notices on the cart/checkout related to tax #3922
 * Fix - Allowed more tags to be saved in sharethis code
@@ -1117,12 +1752,12 @@
 * Tweak - Key value pairs for order_meta (woocommerce_email_order_meta_keys)
 * Tweak - Added wc_variation_form trigger to variations javascript for 3rd party plugins
 
-= 2.0.16 - 14/10/2013 =
+= 2.0.16 - 2013-10-14 =
 * Fix - woocommerce_change_term_counts needs to always return terms. Fixes category display.
 * Fix - Attribute label display.
 * Fix - add_to_cart shortcode correct use of setup_product_data
 
-= 2.0.15 - 14/10/2013 =
+= 2.0.15 - 2013-10-14 =
 * Fix - Added missing line break in plain text email.
 * Fix - Strict standards warnings in category walkers
 * Fix - Remember which attributes get registered to minimize conflicts
@@ -1145,7 +1780,7 @@
 * Fix - Remove accents from taxonomy names + run through filters #3832
 * Tweak - Always show returning customer login box.
 
-= 2.0.14 - 05/09/2013 =
+= 2.0.14 - 2013-09-05 =
 * Tweak - Update cart performance improvements
 * Fix - Google Analytics no longer identifies users using custom vars
 * Fix - Send tax inclusive, rounded item price to Google Analytics
@@ -1159,11 +1794,11 @@
 * Fix - Refresh when creating an account to prevent nonce issues
 * Other minor fixes
 
-= 2.0.13 - 19/07/2013 =
+= 2.0.13 - 2013-07-19 =
 * Tweak - Allow users with edit rights to add draft products to cart (and nobody else)
 * Tweak - Handle pending status for paypal
 * Tweak - Only refresh fragment when cart cookie > 0
-* Tweak - Updated/new dummy data (including .csv files to be used with [Product CSV Import Suite](http://www.woothemes.com/products/product-csv-import-suite/)).
+* Tweak - Updated/new dummy data (including .csv files to be used with [Product CSV Import Suite](https://woocommerce.com/products/product-csv-import-suite/)).
 * Fix - Extra escaping on layered nav variables to prevent injection
 * Fix - Improved sanitization of option fields
 * Fix - Add fee total to cart total
@@ -1177,13 +1812,13 @@
 * Fix - Sanitized shipping calc form to fix persistent XSS issue.
 * Localisation - ES States
 
-= 2.0.12 - 17/06/2013 =
+= 2.0.12 - 2013-06-17 =
 * Tweak - Add actions for attribute create/update/delete
 * Fix - Fixed bug in cross sells loading in product data write panel
 * Fix - Fixed posting shipping method when only one is available
 * Fix - Fixed query breaking when using some product widgets
 
-= 2.0.11 - 13/06/2013 =
+= 2.0.11 - 2013-06-13 =
 * Tweak - Handling for multiselect fields on checkout, and a filter for third party handling
 * Fix - Duplicate param keys for sale_product shortcodes
 * Fix - Google Analytics tracking use get_order_number() method instead of id
@@ -1194,7 +1829,7 @@
 * Fix - Extra data sanitization in some places
 * Fix - Offer tax class option per variation to use same tax class as parent
 
-= 2.0.10 - 15/05/2013 =
+= 2.0.10 - 2013-05-15 =
 * Tweak - Searching for SKU in admin panel can also be done via lowercase 'sku:' instead of just 'SKU:'
 * Fix - Cast term_id as int in product data write panel that will resolve issues with numerical attributes
 * Fix - Correct label for RUB symbol - added a dot after it
@@ -1208,7 +1843,7 @@
 * Fix - PayPal has a 9 item limit
 * Fix - Replace deprecated wp_convert_bytes_to_hr() with size_format()
 
-= 2.0.9 - 02/05/2013 =
+= 2.0.9 - 2013-05-02 =
 * Feature - Added is_product_taxonomy() conditional.
 * Tweak - Notices during checkout for admin users if the checkout is mis-configured.
 * Tweak - Named charts on report page to make modifications easier.
@@ -1228,7 +1863,7 @@
 * Localization - Added RUB currency.
 * Other minor fixes and localisation updates.
 
-= 2.0.8 - 17/04/2013 =
+= 2.0.8 - 2013-04-17 =
 * Feature - Related products shortcode.
 * Tweak - Order item meta - skip serialized fields.
 * Tweak - Support for the city field in shipping calc (filterable).
@@ -1247,7 +1882,7 @@
 * Localization - Romanian updates by Aurel Roman
 * Localization - Finnish updates by arhipaiva
 
-= 2.0.7 - 12/04/2013 =
+= 2.0.7 - 2013-04-12 =
 * Feature - Option for GA _setDomainName.
 * Tweak - Removed rounding when option to round at subtotal is set.
 * Fix - Allow extra flat rate options even if main rate is 0.
@@ -1256,7 +1891,7 @@
 * Fix - Sanitize terms when linking all variations.
 * Fix - Sanitize coupon code names before checking/applying.
 
-= 2.0.6 - 10/04/2013 =
+= 2.0.6 - 2013-04-10 =
 * Tweak/Fix - Merge taxes by CODE so totals are displayed clearer. Also added additional function for getting merged tax totals, and to keep compatibility with themes.
 * Tweak/Fix - Recent reviews show actual review stars, and allowed get_rating_html() to be passed a rating. Also removed unused $location var.
 * Fix - Saving of meta values from paypal after payment.
@@ -1290,7 +1925,7 @@
 * Localisation - NZ States
 * Other minor fixes and localisation updates.
 
-= 2.0.5 - 26/03/2013 =
+= 2.0.5 - 2013-03-26 =
 * Tweak - Made no shipping available messages filterable via woocommerce_cart_no_shipping_available_html and woocommerce_no_shipping_available_html.
 * Tweak - disabled keyboard shortcuts in prettyPhoto.
 * Tweak - woocommerce_date_format() function.
@@ -1304,10 +1939,10 @@
 * Fix - Cancel order function now looks at post_modified instead of post_date.
 * Other minor fixes and localisation updates.
 
-= 2.0.4 - 18/03/2013 =
+= 2.0.4 - 2013-03-18 =
 * Tweak - Like my account, added order_count attribute to view order shortcode.
 * Tweak - Moved WC_Order_Item_Meta into own file.
-* Tweak - PayPal standard gateway - no longer needs sandbox fix, and notify-validate should be first in the requests.
+* Tweak - PayPal Standard gateway - no longer needs sandbox fix, and notify-validate should be first in the requests.
 * Tweak - Flat rate interface tidy up.
 * Tweak - Add order_id to woocommerce_download_product hook
 * Tweak - Disabled prettyPhoto deeplinking
@@ -1334,13 +1969,13 @@
 * Fix - Product tabs when a product type doesn't exist yet.
 * Fix - Saving of variation download paths with special chars.
 * Fix - Unset parent of children when deleting a grouped product.
-* Fix - Removed Sidebar Login Widget. Use http://wordpress.org/extend/plugins/sidebar-login/ instead. A potential security issue was found regarding logging of passwords (since GET was used instead of POST). Sidebar Login 2.5 resolves this and the widget has been removed from WC to prevent needing to maintain two (virtually identical) codebases.
+* Fix - Removed Sidebar Login Widget. Use https://wordpress.org/extend/plugins/sidebar-login/ instead. A potential security issue was found regarding logging of passwords (since GET was used instead of POST). Sidebar Login 2.5 resolves this and the widget has been removed from WC to prevent needing to maintain two (virtually identical) codebases.
 * Localization - Added indian rupees
 * Localization - Updated French translation by absoluteweb
 * Localization - Updated Brazilian translation by Claudio Sanches
 * Localization - Updated Hungarian translation by béla.
 
-= 2.0.3 - 11/03/2013 =
+= 2.0.3 - 2013-03-11 =
 * Feature - Added products by attribute shortcode, e.g. [product_attribute attribute="color" filter="blue"]
 * Tweak - Made coupon label more clear.
 * Tweak - woocommerce_cart_redirect_after_error hook.
@@ -1363,7 +1998,7 @@
 * Fix - Added legacy paypal IPN handling.
 * Localization - Finnish translation by Arhi Paivarinta.
 
-= 2.0.2 - 06/03/2013 =
+= 2.0.2 - 2013-03-06 =
 * Fix - Frontpage shop when 'orderby' is set.
 * Fix - Fix add-to-cart for grouped products which are sold individually.
 * Fix - Payment method animation on the checkout.
@@ -1375,10 +2010,10 @@
 * Fix - FROM prices now ignore blank strings for variations.
 * Fix - Ensure order contents are saved before mailing via admin interface.
 
-= 2.0.1 - 04/03/2013 =
+= 2.0.1 - 2013-03-04 =
 * Fix - Added an extra permalink flush after upgrade to save needing to do it manually.
 
-= 2.0.0 - 04/03/2013 =
+= 2.0.0 - 2013-03-04 =
 * Feature - Sucuri audited and secured.
 * Feature - Added sales by category report.
 * Feature - Added sales by coupon report (kudos Max Rice).
@@ -1401,12 +2036,12 @@
 * Feature - Allow setting the product post type slug to a static (non-translatable) text, mainly to be used for translating and WPML setups.
 * Feature - Added lost password shortcode / email notification (thanks Max Rice).
 * Feature - Simplified permalink/base settings now found in Settings > Permalinks.
-* Feature - Support more permalink structures (from http://codex.wordpress.org/Using_Permalinks)
+* Feature - Support more permalink structures (from https://codex.wordpress.org/Using_Permalinks)
 * Feature - Added option to resend order emails, checkboxes select which one.
 * Feature - New layered nav current filters widget. This lists active filters from all layered nav for de-selection.
 * Feature - Added the option to sell products individually (only allow 1 in the cart).
 * Feature - New shop page/category archive display settings, and the ability to change display per-category.
-* Feature - Allow shipping tax classes to be defined independent of items. https://github.com/woothemes/woocommerce/issues/1625
+* Feature - Allow shipping tax classes to be defined independent of items. https://github.com/woocommerce/woocommerce/issues/1625
 * Feature - Redone order item storage making them easier (and faster) to access for reporting, and querying purchases. Huge performance gains for reports. Order items are no longer serialised - they are stored in their own table with meta. Existing data can be be updated on upgrade.
 * Feature - Update weights/dimensions for variations if they differ.
 * Feature - is_order_received_page() courtesy of Lee Willis.
@@ -1417,7 +2052,7 @@
 * Feature - Filter coupons in admin by type.
 * Feature - Append view cart link on ajax buttons.
 * Feature - Revised the way coupons are stored per order and added new coupon reports on usage.
-* Feature - Updated/new dummy data (including .csv files to be used with [Product CSV Import Suite](http://www.woothemes.com/products/product-csv-import-suite/)).
+* Feature - Updated/new dummy data (including .csv files to be used with [Product CSV Import Suite](https://woocommerce.com/products/product-csv-import-suite/)).
 * Feature - Option to hold stock for unpaid orders (defaults to 60mins). When this time limit is reached, and the order is not paid for, stock is released and the order is cancelled.
 * Feature - Added set_stock() method to product class.
 * Feature - Linking to mydomain.com/product#review_form will now open the review form on load (if WooCommerce lightbox is turned on)
diff --git a/Gruntfile.js b/Gruntfile.js
index 9b68e9972f7..c1fe72644e8 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -28,10 +28,22 @@ module.exports = function( grunt ) {
 			]
 		},
 
+		// Sass linting with Stylelint.
+		stylelint: {
+			options: {
+				configFile: '.stylelintrc'
+			},
+			all: [
+				'<%= dirs.css %>/*.scss',
+				'!<%= dirs.css %>/select2.scss'
+			]
+		},
+
 		// Minify .js files.
 		uglify: {
 			options: {
-				preserveComments: 'some'
+				// Preserve comments that start with a bang.
+				preserveComments: /^!/
 			},
 			admin: {
 				files: [{
@@ -50,6 +62,7 @@ module.exports = function( grunt ) {
 					'<%= dirs.js %>/accounting/accounting.min.js': ['<%= dirs.js %>/accounting/accounting.js'],
 					'<%= dirs.js %>/jquery-blockui/jquery.blockUI.min.js': ['<%= dirs.js %>/jquery-blockui/jquery.blockUI.js'],
 					'<%= dirs.js %>/jquery-cookie/jquery.cookie.min.js': ['<%= dirs.js %>/jquery-cookie/jquery.cookie.js'],
+					'<%= dirs.js %>/js-cookie/js.cookie.min.js': ['<%= dirs.js %>/js-cookie/js.cookie.js'],
 					'<%= dirs.js %>/jquery-flot/jquery.flot.min.js': ['<%= dirs.js %>/jquery-flot/jquery.flot.js'],
 					'<%= dirs.js %>/jquery-flot/jquery.flot.pie.min.js': ['<%= dirs.js %>/jquery-flot/jquery.flot.pie.js'],
 					'<%= dirs.js %>/jquery-flot/jquery.flot.resize.min.js': ['<%= dirs.js %>/jquery-flot/jquery.flot.resize.js'],
@@ -62,6 +75,10 @@ module.exports = function( grunt ) {
 					'<%= dirs.js %>/jquery-ui-touch-punch/jquery-ui-touch-punch.min.js': ['<%= dirs.js %>/jquery-ui-touch-punch/jquery-ui-touch-punch.js'],
 					'<%= dirs.js %>/prettyPhoto/jquery.prettyPhoto.init.min.js': ['<%= dirs.js %>/prettyPhoto/jquery.prettyPhoto.init.js'],
 					'<%= dirs.js %>/prettyPhoto/jquery.prettyPhoto.min.js': ['<%= dirs.js %>/prettyPhoto/jquery.prettyPhoto.js'],
+					'<%= dirs.js %>/flexslider/jquery.flexslider.min.js': ['<%= dirs.js %>/flexslider/jquery.flexslider.js'],
+					'<%= dirs.js %>/zoom/jquery.zoom.min.js': ['<%= dirs.js %>/zoom/jquery.zoom.js'],
+					'<%= dirs.js %>/photoswipe/photoswipe.min.js': ['<%= dirs.js %>/photoswipe/photoswipe.js'],
+					'<%= dirs.js %>/photoswipe/photoswipe-ui-default.min.js': ['<%= dirs.js %>/photoswipe/photoswipe-ui-default.js'],
 					'<%= dirs.js %>/round/round.min.js': ['<%= dirs.js %>/round/round.js'],
 					'<%= dirs.js %>/select2/select2.min.js': ['<%= dirs.js %>/select2/select2.js'],
 					'<%= dirs.js %>/stupidtable/stupidtable.min.js': ['<%= dirs.js %>/stupidtable/stupidtable.js'],
@@ -111,6 +128,21 @@ module.exports = function( grunt ) {
 			}
 		},
 
+		// Generate RTL .css files
+		rtlcss: {
+			woocommerce: {
+				expand: true,
+				cwd: '<%= dirs.css %>',
+				src: [
+					'*.css',
+					'!select2.css',
+					'!*-rtl.css'
+				],
+				dest: '<%= dirs.css %>/',
+				ext: '-rtl.css'
+			}
+		},
+
 		// Minify all .css files.
 		cssmin: {
 			minify: {
@@ -122,11 +154,21 @@ module.exports = function( grunt ) {
 			}
 		},
 
+		// Concatenate select2.css onto the admin.css files.
+		concat: {
+			admin: {
+				files: {
+					'<%= dirs.css %>/admin.css' : ['<%= dirs.css %>/select2.css', '<%= dirs.css %>/admin.css'],
+					'<%= dirs.css %>/admin-rtl.css' : ['<%= dirs.css %>/select2.css', '<%= dirs.css %>/admin-rtl.css']
+				}
+			}
+		},
+
 		// Watch changes for assets.
 		watch: {
 			css: {
 				files: ['<%= dirs.css %>/*.scss'],
-				tasks: ['sass', 'cssmin']
+				tasks: ['sass', 'rtlcss', 'cssmin', 'concat']
 			},
 			js: {
 				files: [
@@ -145,7 +187,7 @@ module.exports = function( grunt ) {
 				type: 'wp-plugin',
 				domainPath: 'i18n/languages',
 				potHeaders: {
-					'report-msgid-bugs-to': 'https://github.com/woothemes/woocommerce/issues',
+					'report-msgid-bugs-to': 'https://github.com/woocommerce/woocommerce/issues',
 					'language-team': 'LANGUAGE <EMAIL@ADDRESS>'
 				}
 			},
@@ -184,11 +226,12 @@ module.exports = function( grunt ) {
 			},
 			files: {
 				src:  [
-					'**/*.php', // Include all files
-					'!apigen/**', // Exclude apigen/
+					'**/*.php',         // Include all files
+					'!apigen/**',       // Exclude apigen/
 					'!node_modules/**', // Exclude node_modules/
-					'!tests/**', // Exclude tests/
-					'!tmp/**' // Exclude tmp/
+					'!tests/**',        // Exclude tests/
+					'!vendor/**',       // Exclude vendor/
+					'!tmp/**'           // Exclude tmp/
 				],
 				expand: true
 			}
@@ -202,10 +245,16 @@ module.exports = function( grunt ) {
 			},
 			apigen: {
 				command: [
-					'apigen generate',
+					'apigen generate -q',
 					'cd apigen',
 					'php hook-docs.php'
 				].join( '&&' )
+			},
+			e2e_test: {
+				command: 'npm run --silent test:single tests/e2e-tests/' + grunt.option( 'file' )
+			},
+			e2e_tests: {
+				command: 'npm run --silent test'
 			}
 		},
 
@@ -214,19 +263,65 @@ module.exports = function( grunt ) {
 			apigen: {
 				src: [ 'wc-apidocs' ]
 			}
+		},
+
+		// PHP Code Sniffer.
+		phpcs: {
+			options: {
+				bin: 'vendor/bin/phpcs',
+				standard: './phpcs.ruleset.xml'
+			},
+			dist: {
+				src:  [
+					'**/*.php',                                                  // Include all files
+					'!apigen/**',                                                // Exclude apigen/
+					'!includes/api/legacy/**',                                   // Exclude legacy REST API
+					'!includes/gateways/simplify-commerce/includes/Simplify/**', // Exclude simplify commerce SDK
+					'!includes/libraries/**',                                    // Exclude libraries/
+					'!node_modules/**',                                          // Exclude node_modules/
+					'!tests/cli/**',                                             // Exclude tests/cli/
+					'!tmp/**',                                                   // Exclude tmp/
+					'!vendor/**'                                                 // Exclude vendor/
+				]
+			}
+		},
+
+		// Autoprefixer.
+		postcss: {
+			options: {
+				processors: [
+					require( 'autoprefixer' )({
+						browsers: [
+							'> 0.1%',
+							'ie 8',
+							'ie 9'
+						]
+					})
+				]
+			},
+			dist: {
+				src: [
+					'<%= dirs.css %>/*.css'
+				]
+			}
 		}
 	});
 
 	// Load NPM tasks to be used here
 	grunt.loadNpmTasks( 'grunt-shell' );
 	grunt.loadNpmTasks( 'grunt-wp-i18n' );
+	grunt.loadNpmTasks( 'grunt-rtlcss' );
 	grunt.loadNpmTasks( 'grunt-checktextdomain' );
 	grunt.loadNpmTasks( 'grunt-contrib-jshint' );
 	grunt.loadNpmTasks( 'grunt-contrib-uglify' );
 	grunt.loadNpmTasks( 'grunt-contrib-sass' );
 	grunt.loadNpmTasks( 'grunt-contrib-cssmin' );
+	grunt.loadNpmTasks( 'grunt-contrib-concat' );
 	grunt.loadNpmTasks( 'grunt-contrib-watch' );
 	grunt.loadNpmTasks( 'grunt-contrib-clean' );
+	grunt.loadNpmTasks( 'grunt-stylelint' );
+	grunt.loadNpmTasks( 'grunt-phpcs' );
+	grunt.loadNpmTasks( 'grunt-postcss' );
 
 	// Register tasks
 	grunt.registerTask( 'default', [
@@ -235,9 +330,18 @@ module.exports = function( grunt ) {
 		'css'
 	]);
 
+	grunt.registerTask( 'js', [
+		'jshint',
+		'uglify:admin',
+		'uglify:frontend'
+	]);
+
 	grunt.registerTask( 'css', [
 		'sass',
-		'cssmin'
+		'rtlcss',
+		'postcss',
+		'cssmin',
+		'concat'
 	]);
 
 	grunt.registerTask( 'docs', [
@@ -249,4 +353,12 @@ module.exports = function( grunt ) {
 		'default',
 		'makepot'
 	]);
+
+	grunt.registerTask( 'e2e-tests', [
+		'shell:e2e_tests'
+	]);
+
+	grunt.registerTask( 'e2e-test', [
+		'shell:e2e_test'
+	]);
 };
diff --git a/README.md b/README.md
index 493386aa4f8..57b074cb901 100644
--- a/README.md
+++ b/README.md
@@ -1,24 +1,24 @@
-# [WooCommerce](http://www.woothemes.com/woocommerce/) [![Built with Grunt](https://cdn.gruntjs.com/builtwith.png)](http://gruntjs.com/) [![Build Status](https://api.travis-ci.org/woothemes/woocommerce.svg?branch=master)](http://travis-ci.org/woothemes/woocommerce) [![Coverage Status](https://coveralls.io/repos/woothemes/woocommerce/badge.svg?branch=master&service=github)](https://coveralls.io/github/woothemes/woocommerce?branch=master)
+# [WooCommerce](https://woocommerce.com/) [![Built with Grunt](https://cdn.gruntjs.com/builtwith.png)](http://gruntjs.com/) [![Build Status](https://travis-ci.org/woocommerce/woocommerce.svg?branch=master)](https://travis-ci.org/woocommerce/woocommerce) [![Code Coverage](https://scrutinizer-ci.com/g/woocommerce/woocommerce/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/woocommerce/woocommerce/?branch=master) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/woocommerce/woocommerce/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/woocommerce/woocommerce/?branch=master) [![Code Climate](https://codeclimate.com/github/woocommerce/woocommerce/badges/gpa.svg)](https://codeclimate.com/github/woocommerce/woocommerce)
 
 Welcome to the WooCommerce repository on GitHub. Here you can browse the source, look at open issues and keep track of development. We recommend all developers to follow the [WooCommerce development blog](https://woocommerce.wordpress.com/) to stay up to date about everything happening in the project. You can also [follow @DevelopWC](https://twitter.com/DevelopWC) on Twitter for the latest development updates.
 
-If you are not a developer, please use the [WooCommerce plugin page](http://wordpress.org/plugins/woocommerce/) on WordPress.org.
+If you are not a developer, please use the [WooCommerce plugin page](https://wordpress.org/plugins/woocommerce/) on WordPress.org.
 
 ## Documentation
-* [WooCommerce Documentation](http://docs.woothemes.com/documentation/plugins/woocommerce/)
-* [WooCommerce Knowledge Base](https://support.woothemes.com/hc/en-us/categories/200146917-WooCommerce)
-* [WooCommerce Code Reference](http://docs.woothemes.com/wc-apidocs/)
-* [WooCommerce REST API Docs](http://woothemes.github.io/woocommerce-rest-api-docs/)
+* [WooCommerce Documentation](https://docs.woocommerce.com/documentation/plugins/woocommerce/)
+* [WooCommerce Code Reference](https://docs.woocommerce.com/wc-apidocs/)
+* [WooCommerce REST API Docs](https://woocommerce.github.io/woocommerce-rest-api-docs/)
+
+## Reporting Security Issues
+To disclose a security issue to our team, [please submit a report via HackerOne here](https://hackerone.com/automattic/).
 
 ## Support
-This repository is not suitable for support. Please don't use our issue tracker for support requests, but for core WooCommerce issues only. Support can take place in the appropriate channels:
+This repository is not suitable for support. Please don't use our issue tracker for support requests, but for core, WooCommerce issues only. Support can take place through the appropriate channels:
 
-* The [WooThemes premium support portal](http://support.woothemes.com/) for customers who have purchased themes or extensions.
+* The [WooCommerce premium support portal](https://woocommerce.com/my-account/create-a-ticket/) for customers who have purchased themes or extensions.
 * [Our community forum on wp.org](https://wordpress.org/support/plugin/woocommerce) which is available for all WooCommerce users.
 
 Support requests in issues on this repository will be closed on sight.
 
 ## Contributing to WooCommerce
-If you have a patch, or stumbled upon an issue with WooCommerce core, you can contribute this back to the code. Please read our [contributor guidelines](https://github.com/woothemes/woocommerce/blob/master/CONTRIBUTING.md) for more information how you can do this.
-
-If you have an idea for WooCommerce, see the [Roadmap Trello board](https://trello.com/b/YgRbpuze/woocommerce-roadmap).
+If you have a patch or have stumbled upon an issue with WooCommerce core, you can contribute this back to the code. Please read our [contributor guidelines](https://github.com/woocommerce/woocommerce/blob/master/.github/CONTRIBUTING.md) for more information how you can do this.
diff --git a/apigen.neon b/apigen.neon
index aec9743d1bc..d8a09352fd7 100644
--- a/apigen.neon
+++ b/apigen.neon
@@ -10,7 +10,7 @@ extensions: [php]
 # directories and files matching this file mask will not be parsed
 exclude:
     - includes/libraries/
-    - api/
+    - includes/api/legacy/
     - i18n/
     - node_modules/
     - wc-apidocs/
@@ -26,10 +26,10 @@ charset: [UTF-8]
 main: WC
 
 # title of generated documentation
-title: WooCommerce 2.5.x Code Reference
+title: WooCommerce 3.0.x Code Reference
 
 # base url used for sitemap (useful for public doc)
-baseUrl: http://docs.woothemes.com/wc-apidocs/
+baseUrl: https://docs.woocommerce.com/wc-apidocs/
 
 # choose ApiGen template theme
 templateTheme: default
@@ -46,7 +46,7 @@ tree: true
 # generate documentation for deprecated elements
 deprecated: true
 
-# generate list of tasks with @todo annotation
+# generate list of tasks with @ todo annotation
 todo: true
 
 # add link to ZIP archive of documentation
diff --git a/apigen/hook-docs.php b/apigen/hook-docs.php
index 5da84ac48e1..7de5461a75d 100644
--- a/apigen/hook-docs.php
+++ b/apigen/hook-docs.php
@@ -12,44 +12,46 @@ class WC_HookFinder {
 
 	private static function get_files( $pattern, $flags = 0, $path = '' ) {
 
-	    if ( ! $path && ( $dir = dirname( $pattern ) ) != '.' ) {
+		if ( ! $path && ( $dir = dirname( $pattern ) ) != '.' ) {
 
-	        if ($dir == '\\' || $dir == '/') { $dir = ''; } // End IF Statement
+			if ( '\\' == $dir || '/' == $dir ) {
+				$dir = '';
+			}
 
-	        return self::get_files(basename( $pattern ), $flags, $dir . '/' );
+			return self::get_files( basename( $pattern ), $flags, $dir . '/' );
 
-	    } // End IF Statement
+		} // End IF Statement
 
-	    $paths = glob( $path . '*', GLOB_ONLYDIR | GLOB_NOSORT );
-	    $files = glob( $path . $pattern, $flags );
+		$paths = glob( $path . '*', GLOB_ONLYDIR | GLOB_NOSORT );
+		$files = glob( $path . $pattern, $flags );
 
-	    if ( is_array( $paths ) ) {
-		    foreach ( $paths as $p ) {
-			    $found_files = array();
-		   		$retrieved_files = (array) self::get_files( $pattern, $flags, $p . '/' );
-		   		foreach ( $retrieved_files as $file ) {
-			   		if ( ! in_array( $file, self::$found_files ) )
-			   			$found_files[] = $file;
-		   		}
+		if ( is_array( $paths ) ) {
+			foreach ( $paths as $p ) {
+				$found_files = array();
+				$retrieved_files = (array) self::get_files( $pattern, $flags, $p . '/' );
+				foreach ( $retrieved_files as $file ) {
+					if ( ! in_array( $file, self::$found_files ) ) {
+						$found_files[] = $file;
+					}
+				}
 
-		   		self::$found_files = array_merge( self::$found_files, $found_files );
+				self::$found_files = array_merge( self::$found_files, $found_files );
 
-		   		if ( is_array( $files ) && is_array( $found_files ) ) {
-		   			$files = array_merge( $files, $found_files );
-		   		}
-
-		    } // End FOREACH Loop
-	    }
-	    return $files;
-    }
+				if ( is_array( $files ) && is_array( $found_files ) ) {
+					$files = array_merge( $files, $found_files );
+				}
+			} // End FOREACH Loop
+		}
+		return $files;
+	}
 
 	private static function get_hook_link( $hook, $details = array() ) {
 		if ( ! empty( $details['class'] ) ) {
-			$link = 'http://docs.woothemes.com/wc-apidocs/source-class-' . $details['class'] . '.html#' . $details['line'];
+			$link = 'http://docs.woocommerce.com/wc-apidocs/source-class-' . $details['class'] . '.html#' . $details['line'];
 		} elseif ( ! empty( $details['function'] ) ) {
-			$link = 'http://docs.woothemes.com/wc-apidocs/source-function-' . $details['function'] . '.html#' . $details['line'];
+			$link = 'http://docs.woocommerce.com/wc-apidocs/source-function-' . $details['function'] . '.html#' . $details['line'];
 		} else {
-			$link = 'https://github.com/woothemes/woocommerce/search?utf8=%E2%9C%93&q=' . $hook;
+			$link = 'https://github.com/woocommerce/woocommerce/search?utf8=%E2%9C%93&q=' . $hook;
 		}
 
 		return '<a href="' . $link . '">' . $hook . '</a>';
@@ -103,15 +105,16 @@ class WC_HookFinder {
 
 				foreach ( $tokens as $index => $token ) {
 					if ( is_array( $token ) ) {
-						if ( $token[0] == T_CLASS ) {
+						$trimmed_token_1 = trim( $token[1] );
+						if ( T_CLASS == $token[0] ) {
 							$token_type = 'class';
-						} elseif ( $token[0] == T_FUNCTION ) {
+						} elseif ( T_FUNCTION == $token[0] ) {
 							$token_type = 'function';
-						} elseif ( $token[1] === 'do_action' ) {
+						} elseif ( 'do_action' === $token[1] ) {
 							$token_type = 'action';
-						} elseif ( $token[1] === 'apply_filters' ) {
+						} elseif ( 'apply_filters' === $token[1] ) {
 							$token_type = 'filter';
-						} elseif ( $token_type && ! empty( trim( $token[1] ) ) ) {
+						} elseif ( $token_type && ! empty( $trimmed_token_1 ) ) {
 							switch ( $token_type ) {
 								case 'class' :
 									$current_class = $token[1];
@@ -122,15 +125,54 @@ class WC_HookFinder {
 								case 'filter' :
 								case 'action' :
 									$hook = trim( $token[1], "'" );
+									$loop = 0;
+
+									if ( '_' === substr( $hook, '-1', 1 ) ) {
+										$hook .= '{';
+										$open = true;
+										// Keep adding to hook until we find a comma or colon
+										while ( 1 ) {
+											$loop ++;
+											$next_hook  = trim( trim( is_string( $tokens[ $index + $loop ] ) ? $tokens[ $index + $loop ] : $tokens[ $index + $loop ][1], '"' ), "'" );
+
+											if ( in_array( $next_hook, array( '.', '{', '}', '"', "'", ' ' ) ) ) {
+												continue;
+											}
+
+											$hook_first = substr( $next_hook, 0, 1 );
+											$hook_last  = substr( $next_hook, -1, 1 );
+
+											if ( in_array( $next_hook, array( ',', ';' ) ) ) {
+												if ( $open ) {
+													$hook .= '}';
+													$open = false;
+												}
+												break;
+											}
+
+											if ( '_' === $hook_first ) {
+												$next_hook = '}' . $next_hook;
+												$open = false;
+											}
+
+											if ( '_' === $hook_last ) {
+												$next_hook .= '{';
+												$open = true;
+											}
+
+											$hook .= $next_hook;
+										}
+									}
+
 									if ( isset( self::$custom_hooks_found[ $hook ] ) ) {
 										self::$custom_hooks_found[ $hook ]['file'][] = self::$current_file;
 									} else {
-    									self::$custom_hooks_found[ $hook ] = array(
+										self::$custom_hooks_found[ $hook ] = array(
 											'line'     => $token[2],
 											'class'    => $current_class,
 											'function' => $current_function,
 											'file'     => array( self::$current_file ),
-											'type'     => $token_type
+											'type'     => $token_type,
 										);
 									}
 								break;
@@ -169,13 +211,13 @@ class WC_HookFinder {
 		echo '</div><div id="footer">';
 
 		$html   = file_get_contents( '../wc-apidocs/tree.html' );
-		$header = current( explode( '<div id="content">', $html ) );
-		$header = str_replace( '<li class="active">', '<li>', $header );
+		$header = explode( '<div id="content">', $html );
+		$header = str_replace( '<li class="active">', '<li>', current( $header ) );
 		$header = str_replace( '<li class="hooks">', '<li class="active">', $header );
 		$header = str_replace( 'Tree | ', 'Hook Reference | ', $header );
-		$footer = end( explode( '<div id="footer">', $html ) );
+		$footer = explode( '<div id="footer">', $html );
 
-		file_put_contents( '../wc-apidocs/hook-docs.html', $header . ob_get_clean() . $footer );
+		file_put_contents( '../wc-apidocs/hook-docs.html', $header . ob_get_clean() . end( $footer ) );
 		echo "Hook docs generated :)\n";
 	}
 }
diff --git a/apigen/theme-woocommerce/@layout.latte b/apigen/theme-woocommerce/@layout.latte
index 8cd34f6b7fe..136673b87b4 100644
--- a/apigen/theme-woocommerce/@layout.latte
+++ b/apigen/theme-woocommerce/@layout.latte
@@ -78,8 +78,12 @@
 						<a href="hook-docs.html" title="Hooks"><span>Hook Reference</span></a>
 					</li>
 
+					<li class="woocommerce-com-docs">
+						<a href="https://docs.woocommerce.com/"><span>WooCommerce Docs</span></a>
+					</li>
+
 					<li class="api">
-						<a href="http://woothemes.github.io/woocommerce-rest-api-docs/"><span>REST API Docs</span></a>
+						<a href="https://woocommerce.github.io/woocommerce-rest-api-docs/"><span>REST API Docs</span></a>
 					</li>
 
 					<li class="divider-vertical" n:if="$config->download"></li>
diff --git a/apigen/theme-woocommerce/js/jquery.autocomplete.js b/apigen/theme-woocommerce/js/jquery.autocomplete.js
index ecc032da664..0923c462ab9 100644
--- a/apigen/theme-woocommerce/js/jquery.autocomplete.js
+++ b/apigen/theme-woocommerce/js/jquery.autocomplete.js
@@ -675,11 +675,11 @@ $.Autocompleter.Select = function (options, input, select, config) {
 	};
 
 	function movePosition(step) {
-		if (options.scrollJumpPosition || (!options.scrollJumpPosition && !((step < 0 && active == 0) || (step > 0 && active == listItems.size() - 1)) )) {
+		if (options.scrollJumpPosition || (!options.scrollJumpPosition && !((step < 0 && active == 0) || (step > 0 && active == listItems.length - 1)) )) {
 			active += step;
 			if (active < 0) {
-				active = listItems.size() - 1;
-			} else if (active >= listItems.size()) {
+				active = listItems.length - 1;
+			} else if (active >= listItems.length) {
 				active = 0;
 			}
 		}
@@ -735,8 +735,8 @@ $.Autocompleter.Select = function (options, input, select, config) {
 			}
 		},
 		pageDown: function() {
-			if (active != listItems.size() - 1 && active + 8 > listItems.size()) {
-				moveSelect( listItems.size() - 1 - active );
+			if (active != listItems.length - 1 && active + 8 > listItems.length) {
+				moveSelect( listItems.length - 1 - active );
 			} else {
 				moveSelect(8);
 			}
diff --git a/assets/css/_animation.scss b/assets/css/_animation.scss
index 25e89301561..6d32fb10298 100644
--- a/assets/css/_animation.scss
+++ b/assets/css/_animation.scss
@@ -4,6 +4,6 @@
  */
 @include keyframes( spin ) {
 	100% {
-		@include transform( rotate(360deg) );
+		@include transform( rotate( 360deg ) );
 	}
 }
diff --git a/assets/css/_mixins.scss b/assets/css/_mixins.scss
index bf971cacbb6..2c62b211671 100644
--- a/assets/css/_mixins.scss
+++ b/assets/css/_mixins.scss
@@ -5,13 +5,13 @@
 @mixin clearfix() {
 	*zoom: 1;
 
-	&:before,
-	&:after {
-		content: " ";
+	&::before,
+	&::after {
+		content: ' ';
 		display: table;
 	}
 
-	&:after {
+	&::after {
 		clear: both;
 	}
 }
@@ -105,7 +105,7 @@
  * Deprecated
  * Vendor prefix no longer required.
  */
-@mixin transition($selector: all, $animation: ease-in-out, $duration: .2s) {
+@mixin transition($selector: all, $animation: ease-in-out, $duration: 0.2s) {
 	transition: $selector $animation $duration;
 }
 
@@ -126,10 +126,11 @@
 	box-sizing: border-box;
 }
 
-@mixin darkorlighttextshadow($a, $opacity: .8) {
+@mixin darkorlighttextshadow($a, $opacity: 0.8) {
 	@if lightness($a) >= 65% {
 		@include text_shadow(0, -1px, 0, rgba(0, 0, 0, $opacity));
-	} @else {
+	}
+	@else {
 		@include text_shadow(0, 1px, 0, rgba(255, 255, 255, $opacity));
 	}
 }
@@ -171,7 +172,7 @@
 	width: 1em;
 }
 
-@mixin icon( $glyph: "\e001" ) {
+@mixin icon( $glyph: '\e001' ) {
 	font-family: 'WooCommerce';
 	speak: none;
 	font-weight: normal;
@@ -190,7 +191,26 @@
 	content: $glyph;
 }
 
-@mixin iconbefore( $glyph: "\e001" ) {
+@mixin icon_dashicons( $glyph: '\f333' ) {
+	font-family: 'Dashicons';
+	speak: none;
+	font-weight: normal;
+	font-variant: normal;
+	text-transform: none;
+	line-height: 1;
+	-webkit-font-smoothing: antialiased;
+	margin: 0;
+	text-indent: 0;
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	text-align: center;
+	content: $glyph;
+}
+
+@mixin iconbefore( $glyph: '\e001' ) {
 	font-family: 'WooCommerce';
 	speak: none;
 	font-weight: normal;
@@ -198,12 +218,24 @@
 	text-transform: none;
 	line-height: 1;
 	-webkit-font-smoothing: antialiased;
-	margin-right: .618em;
+	margin-right: 0.618em;
 	content: $glyph;
 	text-decoration: none;
 }
 
-@mixin iconafter( $glyph: "\e001" ) {
+@mixin iconbeforedashicons( $glyph: '\f333' ) {
+	font-family: 'Dashicons';
+	speak: none;
+	font-weight: normal;
+	font-variant: normal;
+	text-transform: none;
+	line-height: 1;
+	-webkit-font-smoothing: antialiased;
+	content: $glyph;
+	text-decoration: none;
+}
+
+@mixin iconafter( $glyph: '\e001' ) {
 	font-family: 'WooCommerce';
 	speak: none;
 	font-weight: normal;
@@ -211,29 +243,28 @@
 	text-transform: none;
 	line-height: 1;
 	-webkit-font-smoothing: antialiased;
-	margin-left: .618em;
+	margin-left: 0.618em;
 	content: $glyph;
 	text-decoration: none;
 }
 
 @mixin loader() {
-	&:before {
+	&::before {
 		height: 1em;
 		width: 1em;
 		display: block;
 		position: absolute;
 		top: 50%;
 		left: 50%;
-		margin-left: -.5em;
-		margin-top: -.5em;
-		display: block;
-		content: "";
+		margin-left: -0.5em;
+		margin-top: -0.5em;
+		content: '';
 		@include animation( spin 1s ease-in-out infinite );
-		background: url(../images/icons/loader.svg) center center;
+		background: url('../images/icons/loader.svg') center center;
 		background-size: cover;
 		line-height: 1;
 		text-align: center;
 		font-size: 2em;
-		color: rgba(#000,0.75);
+		color: rgba(#000, 0.75);
 	}
 }
diff --git a/assets/css/_variables.scss b/assets/css/_variables.scss
index eb8f606e875..d62b3204baf 100644
--- a/assets/css/_variables.scss
+++ b/assets/css/_variables.scss
@@ -8,14 +8,14 @@ $red:           	#a00;
 $orange:        	#ffba00;
 $blue:          	#2ea2cc;
 
-$primary:           #a46497;                                    // Primary colour for buttons (alt)
-$primarytext:       desaturate(lighten($primary, 50%), 18%);    // Text on primary colour bg
+$primary:           #a46497;                                    // Primary color for buttons (alt)
+$primarytext:       desaturate(lighten($primary, 50%), 18%);    // Text on primary color bg
 
 $secondary:         desaturate(lighten($primary, 40%), 21%);    // Secondary buttons
-$secondarytext:     desaturate(darken($secondary, 60%), 21%);   // Text on secondary colour bg
+$secondarytext:     desaturate(darken($secondary, 60%), 21%);   // Text on secondary color bg
 
 $highlight:         adjust-hue($primary, 150deg);               // Prices, In stock labels, sales flash
-$highlightext:      desaturate(lighten($highlight, 50%), 18%);  // Text on highlight colour bg
+$highlightext:      desaturate(lighten($highlight, 50%), 18%);  // Text on highlight color bg
 
 $contentbg:         #fff;                                       // Content BG - Tabs (active state)
 $subtext:           #777;                                       // small, breadcrumbs etc
\ No newline at end of file
diff --git a/assets/css/activation-rtl.css b/assets/css/activation-rtl.css
new file mode 100644
index 00000000000..fa421fdefe6
--- /dev/null
+++ b/assets/css/activation-rtl.css
@@ -0,0 +1 @@
+div.woocommerce-message{overflow:hidden;position:relative;border-right-color:#cc99c2!important}div.woocommerce-message p{max-width:700px}.woocommerce-message a.button-primary,p.woocommerce-actions a.button-primary{background:#bb77ae;border-color:#a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;color:#fff;text-shadow:0 -1px 1px #a36597,-1px 0 1px #a36597,0 1px 1px #a36597,1px 0 1px #a36597}.woocommerce-message a.button-primary:active,.woocommerce-message a.button-primary:focus,.woocommerce-message a.button-primary:hover,p.woocommerce-actions a.button-primary:active,p.woocommerce-actions a.button-primary:focus,p.woocommerce-actions a.button-primary:hover{background:#a36597;border-color:#a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597}.woocommerce-message a.woocommerce-message-close,p.woocommerce-actions a.woocommerce-message-close{position:absolute;top:0;left:0;padding:10px 21px 10px 15px;font-size:13px;line-height:1.23076923;text-decoration:none}.woocommerce-message a.woocommerce-message-close::before,p.woocommerce-actions a.woocommerce-message-close::before{position:absolute;top:8px;right:0;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out}.woocommerce-message a.button-primary,.woocommerce-message a.button-secondary,p.woocommerce-actions a.button-primary,p.woocommerce-actions a.button-secondary{text-decoration:none!important}.woocommerce-message .twitter-share-button,p.woocommerce-actions .twitter-share-button{margin-top:-3px;margin-right:3px;vertical-align:middle}.woocommerce-about-text,p.woocommerce-actions{margin-bottom:1em!important}div.woocommerce-legacy-shipping-notice,div.woocommerce-no-shipping-methods-notice{overflow:hidden;padding:1px 12px}div.woocommerce-legacy-shipping-notice p,div.woocommerce-no-shipping-methods-notice p{position:relative;z-index:1;max-width:700px;line-height:1.5em;margin:12px 0}div.woocommerce-legacy-shipping-notice p.main,div.woocommerce-no-shipping-methods-notice p.main{font-size:1.1em}div.woocommerce-legacy-shipping-notice::before,div.woocommerce-no-shipping-methods-notice::before{content:'\e01b';font-family:WooCommerce;text-align:center;line-height:1;color:#f7f1f6;display:block;width:1em;font-size:20em;top:36px;left:12px;position:absolute}
\ No newline at end of file
diff --git a/assets/css/activation.css b/assets/css/activation.css
index 0abbbcdda13..c3c3b0b41cf 100644
--- a/assets/css/activation.css
+++ b/assets/css/activation.css
@@ -1 +1 @@
-.woocommerce-message{overflow:hidden;position:relative;border-left-color:#cc99c2!important}.woocommerce-message a.button-primary,p.woocommerce-actions a.button-primary{background:#cc99c2;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 rgba(0,0,0,.15);border-color:#b366a4;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 rgba(0,0,0,.15);color:#fff;text-shadow:0 -1px 1px #8a4f7f,1px 0 1px #8a4f7f,0 1px 1px #8a4f7f,-1px 0 1px #8a4f7f}.woocommerce-message a.button-primary:hover,p.woocommerce-actions a.button-primary:hover{background:#bb77ae;border-color:#aa559a;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 rgba(0,0,0,.15)}.woocommerce-message a.button-primary:active,p.woocommerce-actions a.button-primary:active{background:#aa559a;border-color:#aa559a}.woocommerce-message a.docs,.woocommerce-message a.skip,p.woocommerce-actions a.docs,p.woocommerce-actions a.skip{opacity:.5}.woocommerce-message a.docs:focus,.woocommerce-message a.docs:hover,.woocommerce-message a.skip:focus,.woocommerce-message a.skip:hover,p.woocommerce-actions a.docs:focus,p.woocommerce-actions a.docs:hover,p.woocommerce-actions a.skip:focus,p.woocommerce-actions a.skip:hover{opacity:1}.woocommerce-message a.button-primary,.woocommerce-message a.button-secondary,p.woocommerce-actions a.button-primary,p.woocommerce-actions a.button-secondary{text-decoration:none!important}.woocommerce-message .twitter-share-button,p.woocommerce-actions .twitter-share-button{margin-top:-3px;margin-left:3px;vertical-align:middle}.woocommerce-about-text,p.woocommerce-actions{margin-bottom:1em!important}
\ No newline at end of file
+div.woocommerce-message{overflow:hidden;position:relative;border-left-color:#cc99c2!important}div.woocommerce-message p{max-width:700px}.woocommerce-message a.button-primary,p.woocommerce-actions a.button-primary{background:#bb77ae;border-color:#a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;color:#fff;text-shadow:0 -1px 1px #a36597,1px 0 1px #a36597,0 1px 1px #a36597,-1px 0 1px #a36597}.woocommerce-message a.button-primary:active,.woocommerce-message a.button-primary:focus,.woocommerce-message a.button-primary:hover,p.woocommerce-actions a.button-primary:active,p.woocommerce-actions a.button-primary:focus,p.woocommerce-actions a.button-primary:hover{background:#a36597;border-color:#a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597}.woocommerce-message a.woocommerce-message-close,p.woocommerce-actions a.woocommerce-message-close{position:absolute;top:0;right:0;padding:10px 15px 10px 21px;font-size:13px;line-height:1.23076923;text-decoration:none}.woocommerce-message a.woocommerce-message-close::before,p.woocommerce-actions a.woocommerce-message-close::before{position:absolute;top:8px;left:0;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out}.woocommerce-message a.button-primary,.woocommerce-message a.button-secondary,p.woocommerce-actions a.button-primary,p.woocommerce-actions a.button-secondary{text-decoration:none!important}.woocommerce-message .twitter-share-button,p.woocommerce-actions .twitter-share-button{margin-top:-3px;margin-left:3px;vertical-align:middle}.woocommerce-about-text,p.woocommerce-actions{margin-bottom:1em!important}div.woocommerce-legacy-shipping-notice,div.woocommerce-no-shipping-methods-notice{overflow:hidden;padding:1px 12px}div.woocommerce-legacy-shipping-notice p,div.woocommerce-no-shipping-methods-notice p{position:relative;z-index:1;max-width:700px;line-height:1.5em;margin:12px 0}div.woocommerce-legacy-shipping-notice p.main,div.woocommerce-no-shipping-methods-notice p.main{font-size:1.1em}div.woocommerce-legacy-shipping-notice::before,div.woocommerce-no-shipping-methods-notice::before{content:'\e01b';font-family:WooCommerce;text-align:center;line-height:1;color:#f7f1f6;display:block;width:1em;font-size:20em;top:36px;right:12px;position:absolute}
\ No newline at end of file
diff --git a/assets/css/activation.scss b/assets/css/activation.scss
index e6858ecd616..3d8140534a1 100644
--- a/assets/css/activation.scss
+++ b/assets/css/activation.scss
@@ -6,46 +6,52 @@
 /**
  * Imports
  */
-@import "bourbon";
+@import 'bourbon';
 
 /**
  * Styling begins
  */
-.woocommerce-message {
+div.woocommerce-message {
 	overflow: hidden;
 	position: relative;
 	border-left-color: #cc99c2 !important;
+	p {
+		max-width: 700px;
+	}
 }
 
 p.woocommerce-actions,
 .woocommerce-message {
 	a.button-primary {
-		background: #cc99c2;
-		-webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 rgba(0,0,0,.15);
-		border-color: #b366a4;
-		box-shadow: inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 rgba(0,0,0,.15);
+		background: #bb77ae;
+		border-color: #a36597;
+		-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 #a36597;
+		box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 #a36597;
 		color: #fff;
-		text-shadow: 0px -1px 1px #8a4f7f, 1px 0px 1px #8a4f7f, 0px 1px 1px #8a4f7f, -1px 0px 1px #8a4f7f;
+		text-shadow: 0 -1px 1px #a36597, 1px 0 1px #a36597, 0 1px 1px #a36597, -1px 0 1px #a36597;
 
-		&:hover {
-			background: #bb77ae;
-			border-color: #aa559a;
-			-webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 rgba(0,0,0,.15);
-			box-shadow: inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 rgba(0,0,0,.15);
-		}
-
-		&:active {
-			background: #aa559a;
-			border-color: #aa559a;
+		&:hover, &:focus, &:active {
+			background: #a36597;
+			border-color: #a36597;
+			-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 #a36597;
+			box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 #a36597;
 		}
 	}
 
-	a.skip,
-	a.docs {
-		opacity: 0.5;
-
-		&:hover, &:focus {
-			opacity: 1;
+	a.woocommerce-message-close {
+		position: absolute;
+		top: 0;
+		right: 0;
+		padding: 10px 15px 10px 21px;
+		font-size: 13px;
+		line-height: 1.23076923;
+		text-decoration: none;
+		&::before {
+			position: absolute;
+			top: 8px;
+			left: 0;
+			-webkit-transition: all 0.1s ease-in-out;
+			transition: all 0.1s ease-in-out;
 		}
 	}
 
@@ -65,3 +71,33 @@ p.woocommerce-actions,
 .woocommerce-about-text {
 	margin-bottom: 1em !important;
 }
+
+div.woocommerce-legacy-shipping-notice,
+div.woocommerce-no-shipping-methods-notice {
+	overflow: hidden;
+	padding: 1px 12px;
+	p {
+		position: relative;
+		z-index: 1;
+		max-width: 700px;
+		line-height: 1.5em;
+		margin: 12px 0;
+
+		&.main {
+			font-size: 1.1em;
+		}
+	}
+	&::before {
+		content: '\e01b';
+		font-family: 'WooCommerce';
+		text-align: center;
+		line-height: 1;
+		color: #f7f1f6;
+		display: block;
+		width: 1em;
+		font-size: 20em;
+		top: 36px;
+		right: 12px;
+		position: absolute;
+	}
+}
diff --git a/assets/css/admin-rtl.css b/assets/css/admin-rtl.css
new file mode 100644
index 00000000000..6802925669e
--- /dev/null
+++ b/assets/css/admin-rtl.css
@@ -0,0 +1,2 @@
+.select2-container{box-sizing:border-box;display:inline-block;margin:0;position:relative;vertical-align:middle}.select2-container .select2-selection--single{box-sizing:border-box;cursor:pointer;display:block;height:28px;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--single .select2-selection__rendered{display:block;padding-left:8px;padding-right:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-selection--single .select2-selection__clear{position:relative}.select2-container[dir=rtl] .select2-selection--single .select2-selection__rendered{padding-right:8px;padding-left:20px}.select2-container .select2-selection--multiple{box-sizing:border-box;cursor:pointer;display:block;min-height:32px;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--multiple .select2-selection__rendered{display:inline-block;overflow:hidden;padding-left:8px;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-search--inline{float:left}.select2-container .select2-search--inline .select2-search__field{box-sizing:border-box;border:none;font-size:100%;margin-top:5px;padding:0}.select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-dropdown{background-color:#fff;border:1px solid #aaa;border-radius:4px;box-sizing:border-box;display:block;position:absolute;left:-100000px;width:100%;z-index:1051}.select2-results{display:block}.select2-results__options{list-style:none;margin:0;padding:0}.select2-results__option{padding:6px;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-user-select:none}.select2-results__option[aria-selected]{cursor:pointer}.select2-container--open .select2-dropdown{left:0}.select2-container--open .select2-dropdown--above{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--open .select2-dropdown--below{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-search--dropdown{display:block;padding:4px}.select2-search--dropdown .select2-search__field{padding:4px;width:100%;box-sizing:border-box}.select2-search--dropdown .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-search--dropdown.select2-search--hide{display:none}.select2-close-mask{border:0;margin:0;padding:0;display:block;position:fixed;left:0;top:0;min-height:100%;min-width:100%;height:auto;width:auto;opacity:0;z-index:99;background-color:#fff;filter:alpha(opacity=0)}.select2-hidden-accessible{border:0!important;clip:rect(0 0 0 0)!important;height:1px!important;margin:-1px!important;overflow:hidden!important;padding:0!important;position:absolute!important;width:1px!important}.select2-container--classic .select2-results>.select2-results__options,.select2-container--default .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--default .select2-selection--single{background-color:#fff;border:1px solid #aaa;border-radius:4px}.select2-container--default .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--default .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:700}.select2-container--default .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--default .select2-selection--single .select2-selection__arrow{height:26px;position:absolute;top:1px;right:1px;width:20px}.select2-container--default .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent;border-style:solid;border-width:5px 4px 0;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--default[dir=rtl] .select2-selection--single .select2-selection__clear{float:left}.select2-container--default[dir=rtl] .select2-selection--single .select2-selection__arrow{left:1px;right:auto}.select2-container--default.select2-container--disabled .select2-selection--single{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear{display:none}.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888;border-width:0 4px 5px}.select2-container--default .select2-selection--multiple{background-color:#fff;border:1px solid #aaa;border-radius:4px;cursor:text}.select2-container--default .select2-selection--multiple .select2-selection__rendered{box-sizing:border-box;list-style:none;margin:0;padding:0 5px;width:100%}.select2-container--default .select2-selection--multiple .select2-selection__rendered li{list-style:none}.select2-container--default .select2-selection--multiple .select2-selection__placeholder{color:#999;margin-top:5px;float:left}.select2-container--default .select2-selection--multiple .select2-selection__clear{cursor:pointer;float:right;font-weight:700;margin-top:5px;margin-right:10px}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{color:#999;cursor:pointer;display:inline-block;font-weight:700;margin-right:2px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover{color:#333}.select2-container--default[dir=rtl] .select2-selection--multiple .select2-search--inline,.select2-container--default[dir=rtl] .select2-selection--multiple .select2-selection__choice,.select2-container--default[dir=rtl] .select2-selection--multiple .select2-selection__placeholder{float:right}.select2-container--default[dir=rtl] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto}.select2-container--default[dir=rtl] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--default.select2-container--focus .select2-selection--multiple{border:1px solid #000;outline:0}.select2-container--default.select2-container--disabled .select2-selection--multiple{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection__choice__remove{display:none}.select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple,.select2-container--default.select2-container--open.select2-container--above .select2-selection--single{border-top-left-radius:0;border-top-right-radius:0}.select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple,.select2-container--default.select2-container--open.select2-container--below .select2-selection--single{border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--default .select2-search--dropdown .select2-search__field{border:1px solid #aaa}.select2-container--default .select2-search--inline .select2-search__field{background:0 0;border:none;outline:0;box-shadow:none;-webkit-appearance:textfield}.select2-container--default .select2-results__option[role=group]{padding:0}.select2-container--default .select2-results__option[aria-disabled=true]{color:#999}.select2-container--default .select2-results__option[aria-selected=true]{background-color:#ddd}.select2-container--default .select2-results__option .select2-results__option{padding-left:1em}.select2-container--default .select2-results__option .select2-results__option .select2-results__group{padding-left:0}.select2-container--default .select2-results__option .select2-results__option .select2-results__option{margin-left:-1em;padding-left:2em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-2em;padding-left:3em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-3em;padding-left:4em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-4em;padding-left:5em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-5em;padding-left:6em}.select2-container--default .select2-results__option--highlighted[aria-selected]{background-color:#0073aa;color:#fff}.select2-container--default .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic .select2-selection--single{background-color:#f7f7f7;border:1px solid #aaa;border-radius:4px;outline:0;background-image:-webkit-linear-gradient(top,#fff 50%,#eee 100%);background-image:linear-gradient(to bottom,#fff 50%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic .select2-selection--single:focus{border:1px solid #0073aa}.select2-container--classic .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--classic .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:700;margin-right:10px}.select2-container--classic .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--classic .select2-selection--single .select2-selection__arrow{background-color:#ddd;border:none;border-left:1px solid #aaa;border-top-right-radius:4px;border-bottom-right-radius:4px;height:26px;position:absolute;top:1px;right:1px;width:20px;background-image:-webkit-linear-gradient(top,#eee 50%,#ccc 100%);background-image:linear-gradient(to bottom,#eee 50%,#ccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0)}.select2-container--classic .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent;border-style:solid;border-width:5px 4px 0;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--classic[dir=rtl] .select2-selection--single .select2-selection__clear{float:left}.select2-container--classic[dir=rtl] .select2-selection--single .select2-selection__arrow{border:none;border-right:1px solid #aaa;border-radius:4px 0 0 4px;left:1px;right:auto}.select2-container--classic.select2-container--open .select2-selection--single{border:1px solid #0073aa}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow{background:0 0;border:none}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888;border-width:0 4px 5px}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single{border-top:none;border-top-left-radius:0;border-top-right-radius:0;background-image:-webkit-linear-gradient(top,#fff 0,#eee 50%);background-image:linear-gradient(to bottom,#fff 0,#eee 50%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0;background-image:-webkit-linear-gradient(top,#eee 50%,#fff 100%);background-image:linear-gradient(to bottom,#eee 50%,#fff 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0)}.select2-container--classic .select2-selection--multiple{background-color:#fff;border:1px solid #aaa;border-radius:4px;cursor:text;outline:0}.select2-container--classic .select2-selection--multiple:focus{border:1px solid #0073aa}.select2-container--classic .select2-selection--multiple .select2-selection__rendered{list-style:none;margin:0;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__clear{display:none}.select2-container--classic .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove{color:#888;cursor:pointer;display:inline-block;font-weight:700;margin-right:2px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover{color:#555}.select2-container--classic[dir=rtl] .select2-selection--multiple .select2-selection__choice{float:right;margin-left:5px;margin-right:auto}.select2-container--classic[dir=rtl] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--classic.select2-container--open .select2-selection--multiple{border:1px solid #0073aa}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--classic .select2-search--dropdown .select2-search__field{border:1px solid #aaa;outline:0}.select2-container--classic .select2-search--inline .select2-search__field{outline:0;box-shadow:none}.select2-container--classic .select2-dropdown{background-color:#fff;border:1px solid transparent}.select2-container--classic .select2-dropdown--above{border-bottom:none}.select2-container--classic .select2-dropdown--below{border-top:none}.select2-container--classic .select2-results__option[role=group]{padding:0}.select2-container--classic .select2-results__option[aria-disabled=true]{color:grey}.select2-container--classic .select2-results__option--highlighted[aria-selected]{background-color:#3875d7;color:#fff}.select2-container--classic .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic.select2-container--open .select2-dropdown{border-color:#0073aa}
+@charset "UTF-8";.button.wc-reload::after,.woocommerce-help-tip::after{speak:none;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased}@-webkit-keyframes spin{100%{-webkit-transform:rotate(-360deg)}}@keyframes spin{100%{-webkit-transform:rotate(-360deg);-ms-transform:rotate(-360deg);transform:rotate(-360deg)}}@font-face{font-family:star;src:url(../fonts/star.eot);src:url(../fonts/star.eot?#iefix) format("embedded-opentype"),url(../fonts/star.woff) format("woff"),url(../fonts/star.ttf) format("truetype"),url(../fonts/star.svg#star) format("svg");font-weight:400;font-style:normal}@font-face{font-family:WooCommerce;src:url(../fonts/WooCommerce.eot);src:url(../fonts/WooCommerce.eot?#iefix) format("embedded-opentype"),url(../fonts/WooCommerce.woff) format("woff"),url(../fonts/WooCommerce.ttf) format("truetype"),url(../fonts/WooCommerce.svg#WooCommerce) format("svg");font-weight:400;font-style:normal}.blockUI.blockOverlay::before{height:1em;width:1em;display:block;position:absolute;top:50%;right:50%;margin-right:-.5em;margin-top:-.5em;content:'';-webkit-animation:spin 1s ease-in-out infinite;animation:spin 1s ease-in-out infinite;background:url(../images/icons/loader.svg) center center;background-size:cover;line-height:1;text-align:center;font-size:2em;color:rgba(0,0,0,.75)}.wc_addons_wrap .addons-featured{max-width:1140px;margin:-1%}.wc_addons_wrap .addons-banner-block-item-icon,.wc_addons_wrap .addons-column-block-item-icon{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center}.wc_addons_wrap .addons-banner-block{background:#fff;box-shadow:0 0 1px rgba(0,0,0,.2);margin:2% 1% 0;max-width:1140px;padding:20px}.wc_addons_wrap .addons-banner-block img{height:62px}.wc_addons_wrap .addons-banner-block p{margin:0 0 20px}.wc_addons_wrap .addons-banner-block-items{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-justify-content:space-around;-ms-flex-pack:distribute;justify-content:space-around;margin:0 -10px}.wc_addons_wrap .addons-banner-block-item{border:1px solid #e6e6e6;border-radius:3px;-webkit-box-flex:1;-webkit-flex:1 1 200px;-ms-flex:1 1 200px;flex:1 1 200px;margin:10px;max-width:350px;min-width:200px;width:30%}.wc_addons_wrap .addons-banner-block-item-icon{background:#f7f7f7;height:143px}.wc_addons_wrap .addons-banner-block-item-content{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;height:184px;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;padding:24px}.wc_addons_wrap .addons-column-block-item,.wc_addons_wrap .addons-column-section{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;-webkit-box-orient:horizontal;-webkit-box-direction:normal}.wc_addons_wrap .addons-banner-block-item-content h3{margin-top:0}.wc_addons_wrap .addons-banner-block-item-content p{margin:0 0 auto}.wc_addons_wrap .addons-column-section{display:flex;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-justify-content:space-around;-ms-flex-pack:distribute;justify-content:space-around}.wc_addons_wrap .addons-column{-webkit-box-flex:1;-webkit-flex:1 1 200px;-ms-flex:1 1 200px;flex:1 1 200px;margin:0 1%;width:49.5%}.wc_addons_wrap .addons-column-block,.wc_addons_wrap .addons-small-dark-block,.wc_addons_wrap .addons-small-light-block{box-sizing:border-box;box-shadow:0 0 1px rgba(0,0,0,.2);margin:4% 0 0;padding:20px}.wc_addons_wrap .addons-column-block img{max-height:50px;max-width:50px}.wc_addons_wrap .addons-column-block,.wc_addons_wrap .addons-small-light-block{background:#fff}.wc_addons_wrap .addons-column-block-left{float:right}.wc_addons_wrap .addons-column-block-right{float:left}.wc_addons_wrap .addons-column-block-item{display:flex;border-top:2px solid #f9f9f9;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;margin:0 -20px;padding:20px}.wc_addons_wrap .addons-column-block-item-icon{background:#f7f7f7;border:1px solid #e6e6e6;height:100px;margin:0 0 10px 10px;width:100px}.wc_addons_wrap .addons-column-block-item-content{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-webkit-flex:1 1 200px;-ms-flex:1 1 200px;flex:1 1 200px;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;height:20%;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;min-width:200px}.wc_addons_wrap .addons-column-block-item-content h2{float:right;margin-top:8px}.wc_addons_wrap .addons-column-block-item-content a{float:left}.wc_addons_wrap .addons-column-block-item-content p{float:right}.wc_addons_wrap .addons-small-dark-block{background-color:#54687d;text-align:center}.wc_addons_wrap .addons-small-dark-items{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-justify-content:space-around;-ms-flex-pack:distribute;justify-content:space-around}.wc_addons_wrap .addons-small-dark-item{margin:0 0 20px}.wc_addons_wrap .addons-small-dark-block h1{color:#fff}.wc_addons_wrap .addons-small-dark-block p{color:#fafafa}.wc_addons_wrap .addons-small-dark-item-icon img{height:30px}.wc_addons_wrap .addons-small-dark-item a{margin:28px auto 0}.wc_addons_wrap .addons-small-light-block{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap}.wc_addons_wrap .addons-small-light-block h1{margin-top:-12px}.wc_addons_wrap .addons-small-light-block p{margin-top:0}.wc_addons_wrap .addons-small-light-block img{height:225px;margin:0 -20px 0 0}.wc_addons_wrap .addons-small-light-block-content{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-webkit-flex:1 1 100px;-ms-flex:1 1 100px;flex:1 1 100px;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-justify-content:space-around;-ms-flex-pack:distribute;justify-content:space-around}.wc_addons_wrap .addons-small-light-block-buttons{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.wc_addons_wrap .addons-small-light-block-content a{width:48%}.wc_addons_wrap .addons-button{border-radius:3px;cursor:pointer;display:block;height:37px;line-height:37px;text-align:center;text-decoration:none;width:124px}.wc_addons_wrap .addons-button-solid{background-color:#955a89;color:#fff}.wc_addons_wrap .addons-button-solid:hover{color:#fff;opacity:.8}.wc_addons_wrap .addons-button-outline-green{border:1px solid #73ae39;color:#73ae39}.wc_addons_wrap .addons-button-outline-green:hover{color:#73ae39;opacity:.8}.wc_addons_wrap .addons-button-outline-white{border:1px solid #fff;color:#fff}.wc_addons_wrap .addons-button-outline-white:hover{color:#fff;opacity:.8}.wc_addons_wrap .addons-button-installed{background:#e6e6e6;color:#3c3c3c}.wc_addons_wrap .addons-button-installed:hover{color:#3c3c3c;opacity:.8}@media only screen and (max-width:400px){.wc_addons_wrap .addons-featured{margin:-1% -5%}.wc_addons_wrap .addons-button,.wc_addons_wrap .addons-small-dark-item{width:100%}.wc_addons_wrap .addons-column-block-item-icon{background:0 0;border:none;height:75px;margin:0 0 10px 10px;width:75px}}.wc_addons_wrap .products{overflow:hidden}.wc_addons_wrap .products li{float:right;margin:0 0 1em 1em!important;padding:0;vertical-align:top;width:300px}.wc_addons_wrap .products li a{text-decoration:none;color:inherit;border:1px solid #ddd;display:block;min-height:220px;overflow:hidden;background:#f5f5f5;box-shadow:inset 0 1px 0 rgba(255,255,255,.2),inset 0 -1px 0 rgba(0,0,0,.1)}.wc_addons_wrap .products li a img{max-width:258px;max-height:24px;padding:17px 20px;display:block;margin:0;background:#fff;border-left:260px solid #fff}.wc_addons_wrap .products li a .price,.wc_addons_wrap .products li a img.extension-thumb+h3{display:none}.wc_addons_wrap .products li a h2,.wc_addons_wrap .products li a h3{margin:0!important;padding:20px!important;background:#fff}.wc_addons_wrap .products li a p{padding:20px!important;margin:0!important;border-top:1px solid #f1f1f1}.wc_addons_wrap .products li a:focus,.wc_addons_wrap .products li a:hover{background-color:#fff}.wc_addons_wrap .storefront{background:url(../images/storefront-bg.jpg) bottom right #f6f6f6;border:1px solid #ddd;padding:20px;overflow:hidden;zoom:1}.wc_addons_wrap .storefront img{width:278px;height:auto;float:right;margin:0 0 0 20px;box-shadow:0 1px 6px rgba(0,0,0,.1)}.wc_addons_wrap .storefront p{max-width:750px}.woocommerce-BlankState a.button-primary,.woocommerce-BlankState button.button-primary,.woocommerce-message a.button-primary,.woocommerce-message button.button-primary{background:#bb77ae;border-color:#a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;color:#fff;text-shadow:0 -1px 1px #a36597,-1px 0 1px #a36597,0 1px 1px #a36597,1px 0 1px #a36597;display:inline-block}.woocommerce-BlankState a.button-primary:active,.woocommerce-BlankState a.button-primary:focus,.woocommerce-BlankState a.button-primary:hover,.woocommerce-BlankState button.button-primary:active,.woocommerce-BlankState button.button-primary:focus,.woocommerce-BlankState button.button-primary:hover,.woocommerce-message a.button-primary:active,.woocommerce-message a.button-primary:focus,.woocommerce-message a.button-primary:hover,.woocommerce-message button.button-primary:active,.woocommerce-message button.button-primary:focus,.woocommerce-message button.button-primary:hover{background:#a36597;border-color:#a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597}.woocommerce-message{position:relative;border-right-color:#cc99c2!important;overflow:hidden}.woocommerce-message a.docs,.woocommerce-message a.skip{text-decoration:none!important}.woocommerce-message a.woocommerce-message-close{position:absolute;top:10px;left:10px;padding:10px 21px 10px 15px;font-size:13px;line-height:1.23076923;text-decoration:none}.woocommerce-message a.woocommerce-message-close::before{position:absolute;top:8px;right:0;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out}.woocommerce-message .twitter-share-button{margin-top:-3px;margin-right:3px;vertical-align:middle}#variable_product_options #message,#variable_product_options .notice{margin:10px}.clear{clear:both}#woocommerce-fields-bulk.inline-edit-col label,#woocommerce-fields.inline-edit-col{clear:right}.wrap.woocommerce div.error,.wrap.woocommerce div.updated{margin-top:10px}mark.amount{background:0 0;color:inherit}.simplify-commerce-banner{overflow:hidden}.simplify-commerce-banner img{float:left;padding:15px 0;margin-right:1em;width:200px}.woocommerce-help-tip{color:#666;display:inline-block;font-size:1.1em;font-style:normal;height:16px;line-height:16px;position:relative;vertical-align:middle;width:16px}.woocommerce-help-tip::after{font-family:Dashicons;font-weight:400;line-height:1;margin:0;text-indent:0;position:absolute;top:0;right:0;width:100%;height:100%;text-align:center;content:"";cursor:help}h2 .woocommerce-help-tip{margin-top:-5px;margin-right:.25em}table.wc_status_table{margin-bottom:1em}table.wc_status_table h2{font-size:14px;margin:0}table.wc_status_table tr:nth-child(2n) td,table.wc_status_table tr:nth-child(2n) th{background:#fcfcfc}table.wc_status_table th{font-weight:700;padding:9px}table.wc_status_table td:first-child{width:33%}table.wc_status_table td.help{width:1em}table.wc_status_table td{padding:9px;font-size:1.1em}table.wc_status_table td mark{background:0 0}table.wc_status_table td mark.yes{color:#7ad03a}table.wc_status_table td mark.no{color:#999}table.wc_status_table td mark.error{color:#a00}table.wc_status_table td ul{margin:0}table.wc_status_table .help_tip{cursor:help}#debug-report{display:none;margin:10px 0;padding:0;position:relative}#debug-report textarea{font-family:monospace;width:100%;margin:0;height:300px;padding:20px;border-radius:0;resize:none;font-size:12px;line-height:20px;outline:0}.wp-list-table.logs .log-level{display:inline;padding:.2em .6em .3em;font-size:80%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.2em}.wp-list-table.logs .log-level:empty{display:none}.wp-list-table.logs .log-level--alert,.wp-list-table.logs .log-level--emergency{background-color:#ff4136}.wp-list-table.logs .log-level--critical,.wp-list-table.logs .log-level--error{background-color:#ff851b}.wp-list-table.logs .log-level--notice,.wp-list-table.logs .log-level--warning{color:#222;background-color:#ffdc00}.wp-list-table.logs .log-level--info{background-color:#0074d9}.wp-list-table.logs .log-level--debug{background-color:#3d9970}@media screen and (min-width:783px){.wp-list-table.logs .column-timestamp{width:18%}.wp-list-table.logs .column-level{width:14%}.wp-list-table.logs .column-source{width:15%}}#log-viewer-select{padding:10px 0 8px;line-height:28px}#log-viewer-select h2 a{vertical-align:middle}#log-viewer{background:#fff;border:1px solid #e5e5e5;box-shadow:0 1px 1px rgba(0,0,0,.04);padding:5px 20px}#log-viewer pre{font-family:monospace;white-space:pre-wrap}.inline-edit-product.quick-edit-row .inline-edit-col-center,.inline-edit-product.quick-edit-row .inline-edit-col-right{float:left!important}#woocommerce-fields.inline-edit-col label.featured,#woocommerce-fields.inline-edit-col label.manage_stock{margin-right:10px}#woocommerce-fields.inline-edit-col .dimensions div{display:block;margin:.2em 0}#woocommerce-fields.inline-edit-col .dimensions div span.title{display:block;float:right;width:5em}#woocommerce-fields.inline-edit-col .dimensions div span.input-text-wrap{display:block;margin-right:5em}#woocommerce-fields.inline-edit-col .text{box-sizing:border-box;width:99%;float:right;margin:1px 1px 1px 1%}#woocommerce-fields.inline-edit-col .height,#woocommerce-fields.inline-edit-col .length,#woocommerce-fields.inline-edit-col .width{width:32.33%}#woocommerce-fields.inline-edit-col .height{margin-left:0}#woocommerce-fields-bulk.inline-edit-col .inline-edit-group label{clear:none;width:49%;margin:.2em 0}#woocommerce-fields-bulk.inline-edit-col .inline-edit-group.dimensions label{width:75%;max-width:75%}#woocommerce-fields-bulk.inline-edit-col .length,#woocommerce-fields-bulk.inline-edit-col .regular_price,#woocommerce-fields-bulk.inline-edit-col .sale_price,#woocommerce-fields-bulk.inline-edit-col .stock,#woocommerce-fields-bulk.inline-edit-col .weight{box-sizing:border-box;width:100%;margin-right:4.4em}#woocommerce-fields-bulk.inline-edit-col .height,#woocommerce-fields-bulk.inline-edit-col .length,#woocommerce-fields-bulk.inline-edit-col .width{box-sizing:border-box;width:25%}.column-coupon_code{line-height:2.25em}.column-coupon_code,ul.wc_coupon_list{margin:0;overflow:hidden;zoom:1;clear:both}ul.wc_coupon_list li{margin:0}ul.wc_coupon_list li.code{display:inline-block}ul.wc_coupon_list li.code::after{content:', '}ul.wc_coupon_list li.code:last-of-type::after{display:none}ul.wc_coupon_list li.code .tips{cursor:pointer}ul.wc_coupon_list_block{margin:0;padding-bottom:2px}ul.wc_coupon_list_block li{border-top:1px solid #fff;border-bottom:1px solid #ccc;line-height:2.5em;margin:0;padding:.5em 0}ul.wc_coupon_list_block li:first-child{border-top:0;padding-top:0}ul.wc_coupon_list_block li:last-child{border-bottom:0;padding-bottom:0}.button.wc-reload{text-indent:-9999px;position:relative;padding:0;height:28px;width:28px!important;display:inline-block}.button.wc-reload::after{font-family:Dashicons;font-weight:400;margin:0;text-indent:0;position:absolute;top:0;right:0;width:100%;height:100%;text-align:center;content:"";line-height:28px}#order_data h2,#order_data p.order_number{font-family:HelveticaNeue-Light,'Helvetica Neue Light','Helvetica Neue',sans-serif;font-weight:400}#woocommerce-order-data .handlediv,#woocommerce-order-data .hndle{display:none}#woocommerce-order-data .inside{display:block!important}#order_data{padding:23px 24px 12px}#order_data h2{margin:0;font-size:21px;line-height:1.2;text-shadow:-1px 1px 1px #fff;padding:0}#order_data h3{font-size:14px}#order_data h3,#order_data h4{color:#333;margin:1.33em 0 0}#order_data p{color:#777}#order_data p.order_number{margin:0;line-height:1.6em;font-size:16px}#order_data .order_data_column_container{clear:both}#order_data .order_data_column{width:32%;padding:0 0 0 2%;float:right}#order_data .order_data_column>h3 span{display:block}#order_data .order_data_column:last-child{padding-left:0}#order_data .order_data_column p{padding:0!important}#order_data .order_data_column .address strong{display:block}#order_data .order_data_column .form-field{float:right;clear:right;width:48%;padding:0;margin:9px 0 0}#order_data .order_data_column .form-field label{display:block;padding:0 0 3px}#order_data .order_data_column .form-field input,#order_data .order_data_column .form-field select,#order_data .order_data_column .form-field textarea{width:100%}#order_data .order_data_column .form-field .select2-container{width:100%!important}#order_data .order_data_column .form-field .date-picker{width:50%}#order_data .order_data_column .form-field .hour,#order_data .order_data_column .form-field .minute{width:3.5em}#order_data .order_data_column .form-field small{display:block;margin:5px 0 0;color:#999}#order_data .order_data_column ._billing_address_2_field,#order_data .order_data_column ._billing_last_name_field,#order_data .order_data_column ._billing_phone_field,#order_data .order_data_column ._billing_postcode_field,#order_data .order_data_column ._billing_state_field,#order_data .order_data_column ._shipping_address_2_field,#order_data .order_data_column ._shipping_last_name_field,#order_data .order_data_column ._shipping_postcode_field,#order_data .order_data_column ._shipping_state_field,#order_data .order_data_column .form-field.last{float:left;clear:left}#order_data .order_data_column ._billing_company_field,#order_data .order_data_column ._shipping_company_field,#order_data .order_data_column ._transaction_id_field,#order_data .order_data_column .form-field-wide{width:100%;clear:both}#order_data .order_data_column ._billing_company_field .wc-customer-search,#order_data .order_data_column ._billing_company_field .wc-enhanced-select,#order_data .order_data_column ._billing_company_field input,#order_data .order_data_column ._billing_company_field select,#order_data .order_data_column ._billing_company_field textarea,#order_data .order_data_column ._shipping_company_field .wc-customer-search,#order_data .order_data_column ._shipping_company_field .wc-enhanced-select,#order_data .order_data_column ._shipping_company_field input,#order_data .order_data_column ._shipping_company_field select,#order_data .order_data_column ._shipping_company_field textarea,#order_data .order_data_column ._transaction_id_field .wc-customer-search,#order_data .order_data_column ._transaction_id_field .wc-enhanced-select,#order_data .order_data_column ._transaction_id_field input,#order_data .order_data_column ._transaction_id_field select,#order_data .order_data_column ._transaction_id_field textarea,#order_data .order_data_column .form-field-wide .wc-customer-search,#order_data .order_data_column .form-field-wide .wc-enhanced-select,#order_data .order_data_column .form-field-wide input,#order_data .order_data_column .form-field-wide select,#order_data .order_data_column .form-field-wide textarea{width:100%}#order_data .order_data_column p.none_set{color:#999}#order_data .order_data_column div.edit_address{display:none;zoom:1;padding-left:1px}#order_data .order_data_column .wc-customer-user label a,#order_data .order_data_column .wc-order-status label a{float:left}#order_data .order_data_column a.edit_address{width:14px;height:0;padding:14px 0 0;margin:0 6px 0 0;overflow:hidden;position:relative;color:#999;border:0;float:left}#order_data .order_data_column a.edit_address:focus,#order_data .order_data_column a.edit_address:hover{color:#000}#order_data .order_data_column a.edit_address::after{position:absolute;top:0;right:0;text-align:center;vertical-align:top;line-height:14px;font-size:14px;font-weight:400;-webkit-font-smoothing:antialiased;font-family:Dashicons;content:'\f464'}#order_data .order_data_column .billing-same-as-shipping,#order_data .order_data_column .load_customer_billing,#order_data .order_data_column .load_customer_shipping{font-size:13px;display:inline-block;font-weight:400}#order_data .order_data_column .load_customer_shipping{margin-left:.3em}.order_actions{margin:0;overflow:hidden;zoom:1}.order_actions li{border-top:1px solid #fff;border-bottom:1px solid #ddd;padding:6px 0;margin:0;line-height:1.6em;float:right;width:50%;text-align:center}.order_actions li a{float:none;text-align:center;text-decoration:underline}.order_actions li.wide{width:auto;float:none;clear:both;padding:6px;text-align:right;overflow:hidden}.order_actions li #delete-action{line-height:25px;vertical-align:middle;text-align:right;float:right}.order_actions li .save_order{float:left}.order_actions li#actions{overflow:hidden}.order_actions li#actions .button{width:24px;box-sizing:border-box;float:left}.order_actions li#actions select{width:225px;box-sizing:border-box;float:right}#woocommerce-order-items .inside{margin:0;padding:0;background:#fefefe}#woocommerce-order-items .wc-order-data-row{border-bottom:1px solid #dfdfdf;padding:1.5em 2em;background:#f8f8f8;line-height:2em;text-align:left}#woocommerce-order-items .wc-order-data-row::after,#woocommerce-order-items .wc-order-data-row::before{content:' ';display:table}#woocommerce-order-items .wc-order-data-row::after{clear:both}#woocommerce-order-items .wc-order-data-row p{margin:0;line-height:2em}#woocommerce-order-items .wc-order-data-row .wc-used-coupons{text-align:right}#woocommerce-order-items .wc-order-data-row .wc-used-coupons .tips{display:inline-block}#woocommerce-order-items .wc-used-coupons{float:right;width:50%}#woocommerce-order-items .wc-order-totals{float:left;width:50%;margin:0;padding:0;text-align:left}#woocommerce-order-items .wc-order-totals .amount{font-weight:700}#woocommerce-order-items .wc-order-totals .label{vertical-align:top}#woocommerce-order-items .wc-order-totals .total{font-size:1em!important;width:10em;margin:0 .5em 0 0;box-sizing:border-box}#woocommerce-order-items .wc-order-totals .total input[type=text]{width:96%;float:left}#woocommerce-order-items .wc-order-totals .refunded-total{color:#a00}#woocommerce-order-items .refund-actions{margin-top:5px;padding-top:12px;border-top:1px solid #dfdfdf}#woocommerce-order-items .refund-actions .button{float:left;margin-right:4px}#woocommerce-order-items .refund-actions .cancel-action,#woocommerce-order-items .wc-order-item-bulk-edit .cancel-action{float:right;margin-right:0}#woocommerce-order-items .add_meta{margin-right:0!important}#woocommerce-order-items h3 small{color:#999}#woocommerce-order-items .amount{white-space:nowrap}#woocommerce-order-items .add-items .description{margin-left:10px}#woocommerce-order-items .add-items .button{float:right;margin-left:.25em}#woocommerce-order-items .add-items .button-primary{float:none;margin-left:0}#woocommerce-order-items .inside{display:block!important}#woocommerce-order-items .handlediv,#woocommerce-order-items .hndle{display:none}#woocommerce-order-items .woocommerce_order_items_wrapper{margin:0;overflow-x:auto}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items{width:100%;background:#fff}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items thead th{text-align:right;padding:1em;font-weight:400;color:#999;background:#f8f8f8;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items thead th.sortable{cursor:pointer}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items thead th:last-child{padding-left:2em}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items thead th:first-child{padding-right:2em}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items thead th .wc-arrow{float:left;position:relative;margin-left:-1em}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tbody th,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td{padding:1.5em 1em 1em;text-align:right;line-height:1.5em;vertical-align:top;border-bottom:1px solid #f8f8f8}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tbody th textarea,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td textarea{width:100%}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tbody th select,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td select{width:50%}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tbody th input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tbody th textarea,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td textarea{font-size:14px;padding:4px;color:#555}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tbody th:last-child,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td:last-child{padding-left:2em}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tbody th:first-child,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td:first-child{padding-right:2em}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tbody tr td{cursor:pointer}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tbody tr.selected{background:#f5ebf3}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tbody tr.selected td{border-color:#e6cce1;opacity:.8}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tbody tr:last-child td{border-bottom:1px solid #dfdfdf}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tbody tr:first-child td{border-top:8px solid #f8f8f8}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tbody#order_line_items tr:first-child td{border-top:none}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td.thumb{text-align:right;width:38px;padding-bottom:1.5em}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td.thumb .wc-order-item-thumbnail{width:38px;height:38px;border:2px solid #e8e8e8;background:#f8f8f8;color:#ccc;position:relative;font-size:21px;display:block;text-align:center}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td.thumb .wc-order-item-thumbnail::before{font-family:Dashicons;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;right:0;height:100%;text-align:center;content:"";width:38px;line-height:38px;display:block}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td.thumb .wc-order-item-thumbnail img{width:100%;height:100%;margin:0;padding:0;position:relative}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td.name .wc-order-item-sku,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td.name .wc-order-item-variation{display:block;margin-top:.5em;font-size:.92em!important;color:#888}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item{min-width:200px}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .center,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .variation-id{text-align:center}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class{text-align:left}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class label{white-space:nowrap;color:#999;font-size:.833em}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost label input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost label input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost label input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax label input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity label input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax label input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class label input{display:inline}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class input{width:70px;vertical-align:middle;text-align:left}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost select,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost select,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost select,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax select,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity select,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax select,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class select{width:85px;height:26px;vertical-align:middle;font-size:1em}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .split-input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .split-input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .split-input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .split-input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .split-input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .split-input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .split-input{display:inline-block;background:#fff;border:1px solid #ddd;box-shadow:inset 0 1px 2px rgba(0,0,0,.07);margin:1px 0;min-width:80px;overflow:hidden;line-height:1em;text-align:left}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .split-input div.input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .split-input div.input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .split-input div.input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .split-input div.input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .split-input div.input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .split-input div.input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .split-input div.input{width:100%;box-sizing:border-box}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .split-input div.input label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .split-input div.input label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .split-input div.input label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .split-input div.input label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .split-input div.input label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .split-input div.input label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .split-input div.input label{font-size:.75em;padding:4px 6px 0;color:#555;display:block}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .split-input div.input input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .split-input div.input input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .split-input div.input input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .split-input div.input input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .split-input div.input input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .split-input div.input input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .split-input div.input input{width:100%;box-sizing:border-box;border:0;box-shadow:none;margin:0;padding:0 6px 4px;color:#555;background:0 0}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .split-input div.input input::-webkit-input-placeholder,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .split-input div.input input::-webkit-input-placeholder,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .split-input div.input input::-webkit-input-placeholder,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .split-input div.input input::-webkit-input-placeholder,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .split-input div.input input::-webkit-input-placeholder,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .split-input div.input input::-webkit-input-placeholder,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .split-input div.input input::-webkit-input-placeholder{color:#ddd}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .split-input div.input:first-child,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .split-input div.input:first-child,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .split-input div.input:first-child,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .split-input div.input:first-child,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .split-input div.input:first-child,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .split-input div.input:first-child,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .split-input div.input:first-child{border-bottom:1px dashed #ddd;background:#fff}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .split-input div.input:first-child input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .split-input div.input:first-child label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .split-input div.input:first-child input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .split-input div.input:first-child label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .split-input div.input:first-child input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .split-input div.input:first-child label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .split-input div.input:first-child input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .split-input div.input:first-child label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .split-input div.input:first-child input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .split-input div.input:first-child label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .split-input div.input:first-child input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .split-input div.input:first-child label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .split-input div.input:first-child input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .split-input div.input:first-child label{color:#ccc}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .view,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .view,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .view,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .view,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .view,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .view,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .view{white-space:nowrap}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .edit,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .edit,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .edit,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .edit,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .edit,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .edit,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .edit{text-align:right}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .wc-order-item-discount,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .wc-order-item-refund-fields,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .wc-order-item-taxes,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost del,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost small.times,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .wc-order-item-discount,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .wc-order-item-refund-fields,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .wc-order-item-taxes,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost del,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost small.times,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .wc-order-item-discount,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .wc-order-item-refund-fields,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .wc-order-item-taxes,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost del,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost small.times,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .wc-order-item-discount,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .wc-order-item-refund-fields,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .wc-order-item-taxes,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax del,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax small.times,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .wc-order-item-discount,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .wc-order-item-refund-fields,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .wc-order-item-taxes,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity del,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity small.times,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .wc-order-item-discount,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .wc-order-item-refund-fields,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .wc-order-item-taxes,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax del,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax small.times,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .wc-order-item-discount,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .wc-order-item-refund-fields,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .wc-order-item-taxes,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class del,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class small.times{font-size:.92em!important;color:#888}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .wc-order-item-refund-fields,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .wc-order-item-taxes,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .wc-order-item-refund-fields,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .wc-order-item-taxes,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .wc-order-item-refund-fields,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .wc-order-item-taxes,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .wc-order-item-refund-fields,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .wc-order-item-taxes,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .wc-order-item-refund-fields,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .wc-order-item-taxes,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .wc-order-item-refund-fields,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .wc-order-item-taxes,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .wc-order-item-refund-fields,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .wc-order-item-taxes{margin:0}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .wc-order-item-refund-fields label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .wc-order-item-taxes label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .wc-order-item-refund-fields label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .wc-order-item-taxes label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .wc-order-item-refund-fields label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .wc-order-item-taxes label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .wc-order-item-refund-fields label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .wc-order-item-taxes label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .wc-order-item-refund-fields label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .wc-order-item-taxes label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .wc-order-item-refund-fields label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .wc-order-item-taxes label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .wc-order-item-refund-fields label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .wc-order-item-taxes label{display:block}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .wc-order-item-discount,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .wc-order-item-discount,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .wc-order-item-discount,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .wc-order-item-discount,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .wc-order-item-discount,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .wc-order-item-discount,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .wc-order-item-discount{display:block;margin-top:.5em}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost small.times,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost small.times,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost small.times,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax small.times,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity small.times,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax small.times,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class small.times{margin-left:.25em}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity{text-align:center}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity input{text-align:center;width:50px}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items span.subtotal{opacity:.5}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td.tax_class,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items th.tax_class{text-align:right}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .calculated{border-color:#ae8ca2;border-style:dotted}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.meta{width:100%}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.display_meta,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.meta{margin:.5em 0 0;font-size:.92em!important;color:#888}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tr.fee .thumb div::before,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tr.refund .thumb div::before,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tr.shipping .thumb div::before{color:#ccc;top:0;right:0;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;text-align:center;font-family:WooCommerce}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.display_meta tr th,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.meta tr th{border:0;padding:0 0 .5em 4px;line-height:1.5em;width:20%}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.display_meta tr td,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.meta tr td{padding:0 0 .5em 4px;border:0;line-height:1.5em}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.display_meta tr td input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.meta tr td input{width:100%;margin:0;position:relative;border-bottom:0;box-shadow:none}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.display_meta tr td textarea,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.meta tr td textarea{width:100%;height:4em;margin:0;box-shadow:none}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.display_meta tr td input:focus+textarea,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.meta tr td input:focus+textarea{border-top-color:#999}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.display_meta tr td p,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.meta tr td p{margin:0 0 .5em;line-height:1.5em}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.display_meta tr td p:last-child,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.meta tr td p:last-child{margin:0}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .refund_by{border-bottom:1px dotted #999}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tr.fee .thumb div{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;font-size:1.5em;line-height:1em;vertical-align:middle;margin:0}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tr.fee .thumb div::before{line-height:1;margin:0;text-indent:0;position:absolute;width:100%;height:100%;content:""}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tr.refund .thumb div{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;font-size:1.5em;line-height:1em;vertical-align:middle;margin:0}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tr.refund .thumb div::before{line-height:1;margin:0;text-indent:0;position:absolute;width:100%;height:100%;content:""}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tr.shipping .thumb div{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;font-size:1.5em;line-height:1em;vertical-align:middle;margin:0}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tr.shipping .thumb div::before{line-height:1;margin:0;text-indent:0;position:absolute;width:100%;height:100%;content:""}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tr.shipping .shipping_method,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tr.shipping .shipping_method_name{width:100%;margin:0 0 .5em}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items th.line_tax{white-space:nowrap}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td.line_tax .delete-order-tax,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items th.line_tax .delete-order-tax{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;float:left;font-size:14px;visibility:hidden;margin:3px 0 0 -18px}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td.line_tax .delete-order-tax::before,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items th.line_tax .delete-order-tax::before{font-family:Dashicons;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;right:0;width:100%;height:100%;text-align:center;content:"";color:#999}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td.line_tax .delete-order-tax:hover::before,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items th.line_tax .delete-order-tax:hover::before{color:#a00}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td.line_tax:hover .delete-order-tax,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items th.line_tax:hover .delete-order-tax{visibility:visible}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items small.refunded{display:block;color:#a00;white-space:nowrap;margin-top:.5em}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items small.refunded::before{font-family:Dashicons;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;text-indent:0;width:100%;height:100%;text-align:center;content:"";position:relative;top:auto;right:auto;margin:-1px 0 0 4px;vertical-align:middle;line-height:1em}#woocommerce-order-items .wc-order-edit-line-item{padding-right:0}#woocommerce-order-items .wc-order-edit-line-item-actions{width:44px;text-align:left;padding-right:0;vertical-align:middle}#woocommerce-order-items .wc-order-edit-line-item-actions a{color:#ccc;display:inline-block;cursor:pointer;padding:0 0 .5em;margin:0 12px 0 0;vertical-align:middle;text-decoration:none;line-height:16px;width:16px;overflow:hidden}#woocommerce-order-items .wc-order-edit-line-item-actions a::before{margin:0;padding:0;font-size:16px;width:16px;height:16px}#woocommerce-order-items .wc-order-edit-line-item-actions .delete-order-item::before,#woocommerce-order-items .wc-order-edit-line-item-actions .delete_refund::before,#woocommerce-order-items .wc-order-edit-line-item-actions .edit-order-item::before{font-family:Dashicons;-webkit-font-smoothing:antialiased;text-indent:0;top:0;right:0;height:100%;margin:0;text-align:center;position:relative;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;width:100%}#woocommerce-order-items .wc-order-edit-line-item-actions a:hover::before{color:#999}#woocommerce-order-items .wc-order-edit-line-item-actions a:first-child{margin-right:0}#woocommerce-order-items .wc-order-edit-line-item-actions .edit-order-item::before{content:""}#woocommerce-order-items .wc-order-edit-line-item-actions .delete-order-item::before,#woocommerce-order-items .wc-order-edit-line-item-actions .delete_refund::before{content:""}#woocommerce-order-items .wc-order-edit-line-item-actions .delete-order-item:hover::before,#woocommerce-order-items .wc-order-edit-line-item-actions .delete_refund:hover::before{color:#a00}#woocommerce-order-items tbody tr .wc-order-edit-line-item-actions{visibility:hidden}#woocommerce-order-items tbody tr:hover .wc-order-edit-line-item-actions{visibility:visible}#woocommerce-order-items .wc-order-totals .wc-order-edit-line-item-actions{width:1.5em;visibility:visible!important}#woocommerce-order-items .wc-order-totals .wc-order-edit-line-item-actions a{padding:0}#woocommerce-order-downloads .buttons{float:right;padding:0;margin:0;vertical-align:top}#woocommerce-order-downloads .buttons .add_item_id,#woocommerce-order-downloads .buttons .select2-container{width:400px!important;margin-left:9px;vertical-align:top;float:right}#woocommerce-order-downloads .buttons button{margin:2px 0 0}#woocommerce-order-downloads h3 small{color:#999}#poststuff #woocommerce-order-actions .inside{margin:0;padding:0}#poststuff #woocommerce-order-actions .inside ul.order_actions li{padding:6px 10px;box-sizing:border-box}#poststuff #woocommerce-order-actions .inside ul.order_actions li:last-child{border-bottom:0}#poststuff #woocommerce-order-notes .inside{margin:0;padding:0}#poststuff #woocommerce-order-notes .inside ul.order_notes li{padding:0 10px}#woocommerce_customers p.search-box{margin:6px 0 4px;float:right}#woocommerce_customers .tablenav{float:left;clear:none}#woocommerce-product-images .inside #product_images_container ul::after,.woocommerce_variable_attributes .data::after{clear:both}.widefat.customers td{vertical-align:middle;padding:4px 7px}.widefat .column-order_title{width:15%}.widefat .column-order_title time{display:block;color:#999;margin:3px 0}.widefat .column-orders,.widefat .column-paying,.widefat .column-spent{text-align:center;width:8%}.widefat .column-last_order{width:11%}.widefat .column-order_actions,.widefat .column-user_actions,.widefat .column-wc_actions{width:110px}.widefat .column-order_actions a.button,.widefat .column-user_actions a.button,.widefat .column-wc_actions a.button{float:right;margin:0 0 2px 4px;cursor:pointer;padding:3px 4px;height:auto}.widefat .column-order_actions a.button img,.widefat .column-user_actions a.button img,.widefat .column-wc_actions a.button img{display:block;width:12px;height:auto}.widefat small.meta{display:block;color:#999;font-size:inherit;margin:3px 0}.widefat .column-order_date,.widefat .column-order_total{width:9%}.widefat .column-order_status{width:45px;text-align:center}.widefat .column-order_status mark{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;background:0 0;font-size:1.4em;margin:0 auto}.widefat .column-order_status mark.cancelled::after,.widefat .column-order_status mark.completed::after,.widefat .column-order_status mark.failed::after,.widefat .column-order_status mark.on-hold::after,.widefat .column-order_status mark.pending::after,.widefat .column-order_status mark.processing::after,.widefat .column-order_status mark.refunded::after{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;right:0;width:100%;height:100%;text-align:center}.column-customer_message .note-on::after,.column-order_notes .note-on::after{speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;top:0;right:0;text-align:center;line-height:16px;font-family:WooCommerce}.widefat .column-order_status mark.pending::after{content:'\e012';color:#ffba00}.widefat .column-order_status mark.completed::after{content:'\e015';color:#2ea2cc}.widefat .column-order_status mark.on-hold::after{content:'\e033';color:#999}.widefat .column-order_status mark.failed::after{content:'\e016';color:#d0c21f}.widefat .column-order_status mark.cancelled::after{content:'\e013';color:#a00}.widefat .column-order_status mark.processing::after{content:'\e011';color:#73a724}.widefat .column-order_status mark.refunded::after{content:'\e014';color:#999}.widefat td.column-order_status{padding-top:9px}.column-customer_message .note-on{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;margin:0 auto;color:#999}.column-customer_message .note-on::after{margin:0;text-indent:0;position:absolute;width:100%;height:100%;content:""}.column-order_notes .note-on{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;margin:0 auto;color:#999}.column-order_notes .note-on::after{margin:0;text-indent:0;position:absolute;width:100%;height:100%;content:""}.order_actions .complete,.order_actions .processing,.order_actions .view{display:block;text-indent:-9999px;position:relative;padding:0!important;height:2em!important;width:2em}.order_actions .processing::after{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;right:0;width:100%;height:100%;text-align:center;content:"";line-height:1.85}.order_actions .complete::after,.order_actions .view::after{font-family:Dashicons;text-indent:0;position:absolute;width:100%;height:100%;right:0;line-height:1.85;margin:0;text-align:center;font-weight:400;top:0;speak:none;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased}.order_actions .complete::after{content:""}.order_actions .view::after{content:""}.user_actions .edit,.user_actions .link,.user_actions .refresh,.user_actions .view{display:block;text-indent:-9999px;position:relative;padding:0!important;height:2em!important;width:2em}.user_actions .edit::after,.user_actions .link::after,.user_actions .refresh::after,.user_actions .view::after{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;right:0;width:100%;height:100%;text-align:center;content:"";line-height:1.85}.user_actions .edit::after{font-family:Dashicons;content:'\f464'}.user_actions .link::after{content:'\e00d'}.user_actions .view::after{content:'\e010'}.user_actions .refresh::after{content:'\e031'}.attributes-table td,.attributes-table th{width:15%;vertical-align:top}.attributes-table .attribute-terms{width:32%}.attributes-table .attribute-actions{width:2em}.attributes-table .attribute-actions .configure-terms{display:block;text-indent:-9999px;position:relative;padding:0!important;height:2em!important;width:2em}.attributes-table .attribute-actions .configure-terms::after{speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;right:0;width:100%;height:100%;text-align:center;content:"";font-family:Dashicons;line-height:1.85}ul.order_notes{padding:2px 0 0}ul.order_notes li .note_content{padding:10px;background:#efefef;position:relative}ul.order_notes li .note_content p{margin:0;padding:0;word-wrap:break-word}ul.order_notes li p.meta{padding:10px;color:#999;margin:0;font-size:11px}ul.order_notes li p.meta .exact-date{border-bottom:1px dotted #999}ul.order_notes li a.delete_note{color:#a00}table.wp-list-table .row-actions,table.wp-list-table span.na{color:#999}ul.order_notes li .note_content::after{content:'';display:block;position:absolute;bottom:-10px;right:20px;width:0;height:0;border-width:10px 0 0 10px;border-style:solid;border-color:#efefef transparent}ul.order_notes li.customer-note .note_content{background:#a7cedc}ul.order_notes li.customer-note .note_content::after{border-color:#a7cedc transparent}ul.order_notes li.system-note .note_content{background:#d7cad2}ul.order_notes li.system-note .note_content::after{border-color:#d7cad2 transparent}.add_note{border-top:1px solid #ddd;padding:10px 10px 0}.add_note h4{margin-top:5px!important}.add_note #add_order_note{width:100%;height:50px}table.wp-list-table .column-thumb{width:52px;text-align:center;white-space:nowrap}table.wp-list-table .column-name{width:22%}table.wp-list-table .column-product_cat,table.wp-list-table .column-product_tag{width:11%!important}table.wp-list-table .column-featured,table.wp-list-table .column-product_type{width:48px;text-align:right!important}table.wp-list-table .column-customer_message,table.wp-list-table .column-order_notes{width:48px;text-align:center}table.wp-list-table .column-customer_message img,table.wp-list-table .column-order_notes img{margin:0 auto;padding-top:0!important}table.wp-list-table .manage-column.column-featured img,table.wp-list-table .manage-column.column-product_type img{padding-right:2px}table.wp-list-table .column-price .woocommerce-price-suffix{display:none}table.wp-list-table img{margin:1px 2px}table.wp-list-table td.column-thumb img{margin:0;width:auto;height:auto;max-width:40px;max-height:40px;vertical-align:middle}table.wp-list-table .column-is_in_stock{text-align:right!important}table.wp-list-table span.wc-featured,table.wp-list-table span.wc-image,table.wp-list-table span.wc-type{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;margin:0 auto}table.wp-list-table span.wc-featured::before,table.wp-list-table span.wc-image::before,table.wp-list-table span.wc-type::before{font-family:Dashicons;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;right:0;width:100%;height:100%;text-align:center;content:""}table.wp-list-table span.wc-featured::before{content:'\f155'}table.wp-list-table span.wc-featured.not-featured::before{content:'\f154'}table.wp-list-table td.column-featured span.wc-featured{font-size:1.6em;cursor:pointer}table.wp-list-table span.wc-type::before{font-family:WooCommerce;content:'\e006'}table.wp-list-table span.product-type{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;font-size:1.6em;margin:0 auto}table.wp-list-table span.product-type::before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;right:0;width:100%;height:100%;text-align:center;content:""}table.wp-list-table span.product-type.grouped::before{content:'\e002'}table.wp-list-table span.product-type.external::before{content:'\e034'}table.wp-list-table span.product-type.variable::before{content:'\e003'}table.wp-list-table span.product-type.downloadable::before{content:'\e001'}table.wp-list-table span.product-type.virtual::before{content:'\e000'}table.wp-list-table mark.instock{font-weight:700;color:#7ad03a;background:0 0;line-height:1}table.wp-list-table mark.outofstock{font-weight:700;color:#a44;background:0 0;line-height:1}table.wp-list-table .notes_head,table.wp-list-table .order-notes_head,table.wp-list-table .status_head{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;margin:0 auto}table.wp-list-table .notes_head::after,table.wp-list-table .order-notes_head::after,table.wp-list-table .status_head::after{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;right:0;width:100%;height:100%;text-align:center}table.wc_emails .wc-email-settings-table-name,table.wc_emails td.name,table.wc_gateways .wc-email-settings-table-name,table.wc_gateways td.name,table.wc_shipping .wc-email-settings-table-name,table.wc_shipping td.name{font-weight:700}table.wp-list-table .order-notes_head::after{content:'\e028'}table.wp-list-table .notes_head::after{content:'\e026'}table.wp-list-table .status_head::after{content:'\e011'}table.wp-list-table .column-order_items{width:12%}table.wp-list-table .column-order_items table.order_items{width:100%;margin:3px 0 0;padding:0;display:none}table.wp-list-table .column-order_items table.order_items td{border:0;margin:0;padding:0 0 3px}table.wp-list-table .column-order_items table.order_items td.qty{color:#999;padding-left:6px;text-align:right}mark.notice{background:#fff;color:#a00;margin:0 10px 0 0}a.export_rates,a.import_rates{float:left;margin-right:9px;margin-top:-2px;margin-bottom:0}#rates-search{float:left}#rates-search input.wc-tax-rates-search-field{padding:4px 8px;font-size:1.2em}#rates-pagination{float:left;margin-left:.5em}#rates-pagination .tablenav{margin:0}table.wc_input_table,table.wc_tax_rates{width:100%}table.wc_input_table span.tips,table.wc_tax_rates span.tips{color:#2ea2cc}table.wc_input_table th,table.wc_tax_rates th{white-space:nowrap;padding:10px}table.wc_input_table td,table.wc_tax_rates td{padding:0;border-left:1px solid #dfdfdf;border-bottom:1px solid #dfdfdf;border-top:0;background:#fff;cursor:default}table.wc_input_table td input[type=text],table.wc_input_table td input[type=number],table.wc_tax_rates td input[type=text],table.wc_tax_rates td input[type=number]{width:100%;padding:8px 10px;margin:0;border:0;outline:0;background:0 0}table.wc_input_table td input[type=text]:focus,table.wc_input_table td input[type=number]:focus,table.wc_tax_rates td input[type=text]:focus,table.wc_tax_rates td input[type=number]:focus{outline:0;box-shadow:none}table.wc_input_table td.apply_to_shipping,table.wc_input_table td.compound,table.wc_tax_rates td.apply_to_shipping,table.wc_tax_rates td.compound{padding:5px 7px;vertical-align:middle}table.wc_input_table td.apply_to_shipping input,table.wc_input_table td.compound input,table.wc_tax_rates td.apply_to_shipping input,table.wc_tax_rates td.compound input{width:auto;padding:0}table.wc_input_table td:last-child,table.wc_tax_rates td:last-child{border-left:0}table.wc_input_table tr.current td,table.wc_tax_rates tr.current td{background-color:#fefbcc}table.wc_input_table .cost,table.wc_input_table .cost input,table.wc_input_table .item_cost,table.wc_input_table .item_cost input,table.wc_tax_rates .cost,table.wc_tax_rates .cost input,table.wc_tax_rates .item_cost,table.wc_tax_rates .item_cost input{text-align:left}table.wc_input_table th.sort,table.wc_tax_rates th.sort{width:17px;padding:0 4px}table.wc_input_table td.sort,table.wc_tax_rates td.sort{padding:0 4px}table.wc_input_table .ui-sortable:not(.ui-sortable-disabled) td.sort,table.wc_tax_rates .ui-sortable:not(.ui-sortable-disabled) td.sort{cursor:move;font-size:15px;background:#f9f9f9;text-align:center;vertical-align:middle}table.wc_input_table .ui-sortable:not(.ui-sortable-disabled) td.sort::before,table.wc_tax_rates .ui-sortable:not(.ui-sortable-disabled) td.sort::before{content:'\f333';font-family:Dashicons;text-align:center;line-height:1;color:#999;display:block;width:17px;float:right;height:100%}table.wc_input_table .ui-sortable:not(.ui-sortable-disabled) td.sort:hover::before,table.wc_tax_rates .ui-sortable:not(.ui-sortable-disabled) td.sort:hover::before{color:#333}table.wc_input_table .button,table.wc_tax_rates .button{float:right;margin-left:5px}table.wc_input_table .export,table.wc_input_table .import,table.wc_tax_rates .export,table.wc_tax_rates .import{float:left;margin-left:0;margin-right:5px}table.wc_input_table span.tips,table.wc_tax_rates span.tips{padding:0 3px}table.wc_input_table .pagination,table.wc_tax_rates .pagination{float:left}table.wc_input_table .pagination .button,table.wc_tax_rates .pagination .button{margin-right:5px;margin-left:0}table.wc_input_table .pagination .current,table.wc_tax_rates .pagination .current{background:#bbb;text-shadow:none}table.wc_input_table tr:last-child td,table.wc_tax_rates tr:last-child td{border-bottom:0}table.wc_emails,table.wc_gateways,table.wc_shipping{position:relative}table.wc_emails td,table.wc_gateways td,table.wc_shipping td{vertical-align:middle;padding:7px;line-height:2em}table.wc_emails tr:nth-child(odd) td,table.wc_gateways tr:nth-child(odd) td,table.wc_shipping tr:nth-child(odd) td{background:#f9f9f9}table.wc_emails th,table.wc_gateways th,table.wc_shipping th{padding:9px 7px!important;vertical-align:middle}table.wc_emails .settings,table.wc_gateways .settings,table.wc_shipping .settings{text-align:left}table.wc_emails .default,table.wc_emails .radio,table.wc_emails .status,table.wc_gateways .default,table.wc_gateways .radio,table.wc_gateways .status,table.wc_shipping .default,table.wc_shipping .radio,table.wc_shipping .status{text-align:center}table.wc_emails .default .tips,table.wc_emails .radio .tips,table.wc_emails .status .tips,table.wc_gateways .default .tips,table.wc_gateways .radio .tips,table.wc_gateways .status .tips,table.wc_shipping .default .tips,table.wc_shipping .radio .tips,table.wc_shipping .status .tips{margin:0 auto}table.wc_emails .default input,table.wc_emails .radio input,table.wc_emails .status input,table.wc_gateways .default input,table.wc_gateways .radio input,table.wc_gateways .status input,table.wc_shipping .default input,table.wc_shipping .radio input,table.wc_shipping .status input{margin:0}table.wc_emails th.sort,table.wc_gateways th.sort,table.wc_shipping th.sort{width:28px;padding:0}table.wc_emails td.sort,table.wc_gateways td.sort,table.wc_shipping td.sort{padding:0 7px;cursor:move;font-size:15px;text-align:center;vertical-align:middle}table.wc_emails td.sort::before,table.wc_gateways td.sort::before,table.wc_shipping td.sort::before{content:'\f333';font-family:Dashicons;text-align:center;line-height:1;color:#999;display:block;width:17px;float:right;height:100%}table.wc_emails .wc-email-settings-table-name span,table.wc_gateways .wc-email-settings-table-name span,table.wc_shipping .wc-email-settings-table-name span{font-weight:400;color:#999;margin:0 4px 0 0!important}table.wc_emails .wc-email-settings-table-status,table.wc_gateways .wc-email-settings-table-status,table.wc_shipping .wc-email-settings-table-status{text-align:center;width:1em}table.wc_emails .wc-email-settings-table-status .tips,table.wc_gateways .wc-email-settings-table-status .tips,table.wc_shipping .wc-email-settings-table-status .tips{margin:0 auto}table.wc_emails .wc-email-settings-table-actions a,table.wc_gateways .wc-email-settings-table-actions a,table.wc_shipping .wc-email-settings-table-actions a{display:block;text-indent:-9999px;position:relative;padding:0!important;height:2em!important;width:2em}table.wc_emails .wc-email-settings-table-actions a::after,table.wc_gateways .wc-email-settings-table-actions a::after,table.wc_shipping .wc-email-settings-table-actions a::after{speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;right:0;width:100%;height:100%;text-align:center;content:"";font-family:Dashicons;line-height:1.85}.wc-shipping-zone-settings th{padding:24px 0 24px 24px}.wc-shipping-zone-settings td.forminp{padding:15px 10px}.wc-shipping-zone-settings td.forminp input,.wc-shipping-zone-settings td.forminp textarea{padding:8px;width:448px;max-width:100%!important}.wc-shipping-zone-settings td.forminp .wc-shipping-zone-region-select{width:448px;max-width:100%!important}.wc-shipping-zone-settings td.forminp .wc-shipping-zone-region-select .select2-choices{padding:8px 8px 4px;border-color:#DDD;min-height:0;line-height:1}.wc-shipping-zone-settings td.forminp .wc-shipping-zone-region-select .select2-choices input{padding:0}.wc-shipping-zone-settings td.forminp .wc-shipping-zone-region-select .select2-choices li{margin:0 0 4px 4px}.wc-shipping-zone-settings .wc-shipping-zone-postcodes-toggle{margin:.5em 0 0;font-size:.9em;text-decoration:underline;display:block}.wc-shipping-zone-settings .wc-shipping-zone-postcodes-toggle+.wc-shipping-zone-postcodes{display:none}.wc-shipping-zone-settings .wc-shipping-zone-postcodes textarea{margin:10px 0}.wc-shipping-zone-settings .wc-shipping-zone-postcodes .description{font-size:.9em;color:#999}.wc-shipping-zone-settings+p.submit{margin-top:0}table tr table.wc-shipping-zone-methods tr .row-actions,table tr:hover table.wc-shipping-zone-methods tr .row-actions{position:relative}table tr table.wc-shipping-zone-methods tr:hover .row-actions,table tr:hover table.wc-shipping-zone-methods tr:hover .row-actions{position:static}.wc-shipping-zones-heading .page-title-action{display:inline-block}table.wc-shipping-classes td,table.wc-shipping-classes th,table.wc-shipping-zone-methods td,table.wc-shipping-zone-methods th,table.wc-shipping-zones td,table.wc-shipping-zones th{vertical-align:top;line-height:24px;padding:1em!important;font-size:14px;background:#fff}table.wc-shipping-classes td li,table.wc-shipping-classes th li,table.wc-shipping-zone-methods td li,table.wc-shipping-zone-methods th li,table.wc-shipping-zones td li,table.wc-shipping-zones th li{line-height:24px;font-size:14px}table.wc-shipping-classes td .woocommerce-help-tip,table.wc-shipping-classes th .woocommerce-help-tip,table.wc-shipping-zone-methods td .woocommerce-help-tip,table.wc-shipping-zone-methods th .woocommerce-help-tip,table.wc-shipping-zones td .woocommerce-help-tip,table.wc-shipping-zones th .woocommerce-help-tip{margin:0!important}table.wc-shipping-classes thead th,table.wc-shipping-zone-methods thead th,table.wc-shipping-zones thead th{vertical-align:middle}table.wc-shipping-classes thead .wc-shipping-zone-sort,table.wc-shipping-zone-methods thead .wc-shipping-zone-sort,table.wc-shipping-zones thead .wc-shipping-zone-sort{text-align:center}table.wc-shipping-classes tbody td,table.wc-shipping-zone-methods tbody td,table.wc-shipping-zones tbody td{padding:1.5em 1em!important}table.wc-shipping-classes td.wc-shipping-zone-method-blank-state,table.wc-shipping-classes td.wc-shipping-zones-blank-state,table.wc-shipping-zone-methods td.wc-shipping-zone-method-blank-state,table.wc-shipping-zone-methods td.wc-shipping-zones-blank-state,table.wc-shipping-zones td.wc-shipping-zone-method-blank-state,table.wc-shipping-zones td.wc-shipping-zones-blank-state{background:#f7f1f6!important;overflow:hidden;position:relative;padding:7.5em 7.5%!important;border-bottom:2px solid #eee2ec}table.wc-shipping-classes td.wc-shipping-zone-method-blank-state.wc-shipping-zone-method-blank-state,table.wc-shipping-classes td.wc-shipping-zones-blank-state.wc-shipping-zone-method-blank-state,table.wc-shipping-zone-methods td.wc-shipping-zone-method-blank-state.wc-shipping-zone-method-blank-state,table.wc-shipping-zone-methods td.wc-shipping-zones-blank-state.wc-shipping-zone-method-blank-state,table.wc-shipping-zones td.wc-shipping-zone-method-blank-state.wc-shipping-zone-method-blank-state,table.wc-shipping-zones td.wc-shipping-zones-blank-state.wc-shipping-zone-method-blank-state{padding:2em!important}table.wc-shipping-classes td.wc-shipping-zone-method-blank-state.wc-shipping-zone-method-blank-state p,table.wc-shipping-classes td.wc-shipping-zones-blank-state.wc-shipping-zone-method-blank-state p,table.wc-shipping-zone-methods td.wc-shipping-zone-method-blank-state.wc-shipping-zone-method-blank-state p,table.wc-shipping-zone-methods td.wc-shipping-zones-blank-state.wc-shipping-zone-method-blank-state p,table.wc-shipping-zones td.wc-shipping-zone-method-blank-state.wc-shipping-zone-method-blank-state p,table.wc-shipping-zones td.wc-shipping-zones-blank-state.wc-shipping-zone-method-blank-state p{margin-bottom:0}table.wc-shipping-classes td.wc-shipping-zone-method-blank-state li,table.wc-shipping-classes td.wc-shipping-zone-method-blank-state p,table.wc-shipping-classes td.wc-shipping-zones-blank-state li,table.wc-shipping-classes td.wc-shipping-zones-blank-state p,table.wc-shipping-zone-methods td.wc-shipping-zone-method-blank-state li,table.wc-shipping-zone-methods td.wc-shipping-zone-method-blank-state p,table.wc-shipping-zone-methods td.wc-shipping-zones-blank-state li,table.wc-shipping-zone-methods td.wc-shipping-zones-blank-state p,table.wc-shipping-zones td.wc-shipping-zone-method-blank-state li,table.wc-shipping-zones td.wc-shipping-zone-method-blank-state p,table.wc-shipping-zones td.wc-shipping-zones-blank-state li,table.wc-shipping-zones td.wc-shipping-zones-blank-state p{color:#a46497;font-size:1.5em;line-height:1.5em;margin:0 0 1em;position:relative;z-index:1;text-shadow:-1px 1px 1px #fff}table.wc-shipping-classes td.wc-shipping-zone-method-blank-state li.main,table.wc-shipping-classes td.wc-shipping-zone-method-blank-state p.main,table.wc-shipping-classes td.wc-shipping-zones-blank-state li.main,table.wc-shipping-classes td.wc-shipping-zones-blank-state p.main,table.wc-shipping-zone-methods td.wc-shipping-zone-method-blank-state li.main,table.wc-shipping-zone-methods td.wc-shipping-zone-method-blank-state p.main,table.wc-shipping-zone-methods td.wc-shipping-zones-blank-state li.main,table.wc-shipping-zone-methods td.wc-shipping-zones-blank-state p.main,table.wc-shipping-zones td.wc-shipping-zone-method-blank-state li.main,table.wc-shipping-zones td.wc-shipping-zone-method-blank-state p.main,table.wc-shipping-zones td.wc-shipping-zones-blank-state li.main,table.wc-shipping-zones td.wc-shipping-zones-blank-state p.main{font-size:2em}table.wc-shipping-classes td.wc-shipping-zone-method-blank-state li,table.wc-shipping-classes td.wc-shipping-zones-blank-state li,table.wc-shipping-zone-methods td.wc-shipping-zone-method-blank-state li,table.wc-shipping-zone-methods td.wc-shipping-zones-blank-state li,table.wc-shipping-zones td.wc-shipping-zone-method-blank-state li,table.wc-shipping-zones td.wc-shipping-zones-blank-state li{margin-right:1em;list-style:circle inside}table.wc-shipping-classes td.wc-shipping-zone-method-blank-state::before,table.wc-shipping-classes td.wc-shipping-zones-blank-state::before,table.wc-shipping-zone-methods td.wc-shipping-zone-method-blank-state::before,table.wc-shipping-zone-methods td.wc-shipping-zones-blank-state::before,table.wc-shipping-zones td.wc-shipping-zone-method-blank-state::before,table.wc-shipping-zones td.wc-shipping-zones-blank-state::before{content:'\e01b';font-family:WooCommerce;text-align:center;line-height:1;color:#eee2ec;display:block;width:1em;font-size:40em;top:50%;left:-3.75%;margin-top:-.1875em;position:absolute}table.wc-shipping-classes td.wc-shipping-zone-method-blank-state .button-primary,table.wc-shipping-classes td.wc-shipping-zones-blank-state .button-primary,table.wc-shipping-zone-methods td.wc-shipping-zone-method-blank-state .button-primary,table.wc-shipping-zone-methods td.wc-shipping-zones-blank-state .button-primary,table.wc-shipping-zones td.wc-shipping-zone-method-blank-state .button-primary,table.wc-shipping-zones td.wc-shipping-zones-blank-state .button-primary{background-color:#804877;border-color:#804877;box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 0 rgba(0,0,0,.15);margin:0;opacity:1;text-shadow:0 -1px 1px #8a4f7f,-1px 0 1px #8a4f7f,0 1px 1px #8a4f7f,1px 0 1px #8a4f7f;font-size:1.5em;padding:.75em 1em;height:auto;position:relative;z-index:1}table.wc-shipping-classes .wc-shipping-class-rows tr:nth-child(odd) td,table.wc-shipping-classes .wc-shipping-zone-method-rows tr:nth-child(odd) td,table.wc-shipping-classes tbody.wc-shipping-zone-rows tr:nth-child(odd) td,table.wc-shipping-classes tr.odd td,table.wc-shipping-zone-methods .wc-shipping-class-rows tr:nth-child(odd) td,table.wc-shipping-zone-methods .wc-shipping-zone-method-rows tr:nth-child(odd) td,table.wc-shipping-zone-methods tbody.wc-shipping-zone-rows tr:nth-child(odd) td,table.wc-shipping-zone-methods tr.odd td,table.wc-shipping-zones .wc-shipping-class-rows tr:nth-child(odd) td,table.wc-shipping-zones .wc-shipping-zone-method-rows tr:nth-child(odd) td,table.wc-shipping-zones tbody.wc-shipping-zone-rows tr:nth-child(odd) td,table.wc-shipping-zones tr.odd td{background:#f9f9f9}table.wc-shipping-classes p,table.wc-shipping-classes ul,table.wc-shipping-zone-methods p,table.wc-shipping-zone-methods ul,table.wc-shipping-zones p,table.wc-shipping-zones ul{margin:0}table.wc-shipping-classes td.wc-shipping-zone-method-sort,table.wc-shipping-classes td.wc-shipping-zone-sort,table.wc-shipping-zone-methods td.wc-shipping-zone-method-sort,table.wc-shipping-zone-methods td.wc-shipping-zone-sort,table.wc-shipping-zones td.wc-shipping-zone-method-sort,table.wc-shipping-zones td.wc-shipping-zone-sort{cursor:move;font-size:15px;text-align:center}table.wc-shipping-classes td.wc-shipping-zone-method-sort::before,table.wc-shipping-classes td.wc-shipping-zone-sort::before,table.wc-shipping-zone-methods td.wc-shipping-zone-method-sort::before,table.wc-shipping-zone-methods td.wc-shipping-zone-sort::before,table.wc-shipping-zones td.wc-shipping-zone-method-sort::before,table.wc-shipping-zones td.wc-shipping-zone-sort::before{content:'\f333';font-family:Dashicons;text-align:center;color:#999;display:block;width:17px;float:right;height:100%;line-height:24px}table.wc-shipping-classes td.wc-shipping-zone-method-sort:hover::before,table.wc-shipping-classes td.wc-shipping-zone-sort:hover::before,table.wc-shipping-zone-methods td.wc-shipping-zone-method-sort:hover::before,table.wc-shipping-zone-methods td.wc-shipping-zone-sort:hover::before,table.wc-shipping-zones td.wc-shipping-zone-method-sort:hover::before,table.wc-shipping-zones td.wc-shipping-zone-sort:hover::before{color:#333}table.wc-shipping-classes td.wc-shipping-zone-worldwide,table.wc-shipping-zone-methods td.wc-shipping-zone-worldwide,table.wc-shipping-zones td.wc-shipping-zone-worldwide{text-align:center}table.wc-shipping-classes td.wc-shipping-zone-worldwide::before,table.wc-shipping-zone-methods td.wc-shipping-zone-worldwide::before,table.wc-shipping-zones td.wc-shipping-zone-worldwide::before{content:'\f319';font-family:dashicons;text-align:center;color:#999;display:block;width:17px;float:right;height:100%;line-height:24px}table.wc-shipping-classes .wc-shipping-zone-methods,table.wc-shipping-classes .wc-shipping-zone-name,table.wc-shipping-zone-methods .wc-shipping-zone-methods,table.wc-shipping-zone-methods .wc-shipping-zone-name,table.wc-shipping-zones .wc-shipping-zone-methods,table.wc-shipping-zones .wc-shipping-zone-name{width:25%}table.wc-shipping-classes .wc-shipping-class-description input,table.wc-shipping-classes .wc-shipping-class-description select,table.wc-shipping-classes .wc-shipping-class-description textarea,table.wc-shipping-classes .wc-shipping-class-name input,table.wc-shipping-classes .wc-shipping-class-name select,table.wc-shipping-classes .wc-shipping-class-name textarea,table.wc-shipping-classes .wc-shipping-class-slug input,table.wc-shipping-classes .wc-shipping-class-slug select,table.wc-shipping-classes .wc-shipping-class-slug textarea,table.wc-shipping-classes .wc-shipping-zone-name input,table.wc-shipping-classes .wc-shipping-zone-name select,table.wc-shipping-classes .wc-shipping-zone-name textarea,table.wc-shipping-classes .wc-shipping-zone-region input,table.wc-shipping-classes .wc-shipping-zone-region select,table.wc-shipping-classes .wc-shipping-zone-region textarea,table.wc-shipping-zone-methods .wc-shipping-class-description input,table.wc-shipping-zone-methods .wc-shipping-class-description select,table.wc-shipping-zone-methods .wc-shipping-class-description textarea,table.wc-shipping-zone-methods .wc-shipping-class-name input,table.wc-shipping-zone-methods .wc-shipping-class-name select,table.wc-shipping-zone-methods .wc-shipping-class-name textarea,table.wc-shipping-zone-methods .wc-shipping-class-slug input,table.wc-shipping-zone-methods .wc-shipping-class-slug select,table.wc-shipping-zone-methods .wc-shipping-class-slug textarea,table.wc-shipping-zone-methods .wc-shipping-zone-name input,table.wc-shipping-zone-methods .wc-shipping-zone-name select,table.wc-shipping-zone-methods .wc-shipping-zone-name textarea,table.wc-shipping-zone-methods .wc-shipping-zone-region input,table.wc-shipping-zone-methods .wc-shipping-zone-region select,table.wc-shipping-zone-methods .wc-shipping-zone-region textarea,table.wc-shipping-zones .wc-shipping-class-description input,table.wc-shipping-zones .wc-shipping-class-description select,table.wc-shipping-zones .wc-shipping-class-description textarea,table.wc-shipping-zones .wc-shipping-class-name input,table.wc-shipping-zones .wc-shipping-class-name select,table.wc-shipping-zones .wc-shipping-class-name textarea,table.wc-shipping-zones .wc-shipping-class-slug input,table.wc-shipping-zones .wc-shipping-class-slug select,table.wc-shipping-zones .wc-shipping-class-slug textarea,table.wc-shipping-zones .wc-shipping-zone-name input,table.wc-shipping-zones .wc-shipping-zone-name select,table.wc-shipping-zones .wc-shipping-zone-name textarea,table.wc-shipping-zones .wc-shipping-zone-region input,table.wc-shipping-zones .wc-shipping-zone-region select,table.wc-shipping-zones .wc-shipping-zone-region textarea{width:100%}table.wc-shipping-classes .wc-shipping-class-description a.wc-shipping-class-delete,table.wc-shipping-classes .wc-shipping-class-description a.wc-shipping-zone-delete,table.wc-shipping-classes .wc-shipping-class-name a.wc-shipping-class-delete,table.wc-shipping-classes .wc-shipping-class-name a.wc-shipping-zone-delete,table.wc-shipping-classes .wc-shipping-class-slug a.wc-shipping-class-delete,table.wc-shipping-classes .wc-shipping-class-slug a.wc-shipping-zone-delete,table.wc-shipping-classes .wc-shipping-zone-name a.wc-shipping-class-delete,table.wc-shipping-classes .wc-shipping-zone-name a.wc-shipping-zone-delete,table.wc-shipping-classes .wc-shipping-zone-region a.wc-shipping-class-delete,table.wc-shipping-classes .wc-shipping-zone-region a.wc-shipping-zone-delete,table.wc-shipping-zone-methods .wc-shipping-class-description a.wc-shipping-class-delete,table.wc-shipping-zone-methods .wc-shipping-class-description a.wc-shipping-zone-delete,table.wc-shipping-zone-methods .wc-shipping-class-name a.wc-shipping-class-delete,table.wc-shipping-zone-methods .wc-shipping-class-name a.wc-shipping-zone-delete,table.wc-shipping-zone-methods .wc-shipping-class-slug a.wc-shipping-class-delete,table.wc-shipping-zone-methods .wc-shipping-class-slug a.wc-shipping-zone-delete,table.wc-shipping-zone-methods .wc-shipping-zone-name a.wc-shipping-class-delete,table.wc-shipping-zone-methods .wc-shipping-zone-name a.wc-shipping-zone-delete,table.wc-shipping-zone-methods .wc-shipping-zone-region a.wc-shipping-class-delete,table.wc-shipping-zone-methods .wc-shipping-zone-region a.wc-shipping-zone-delete,table.wc-shipping-zones .wc-shipping-class-description a.wc-shipping-class-delete,table.wc-shipping-zones .wc-shipping-class-description a.wc-shipping-zone-delete,table.wc-shipping-zones .wc-shipping-class-name a.wc-shipping-class-delete,table.wc-shipping-zones .wc-shipping-class-name a.wc-shipping-zone-delete,table.wc-shipping-zones .wc-shipping-class-slug a.wc-shipping-class-delete,table.wc-shipping-zones .wc-shipping-class-slug a.wc-shipping-zone-delete,table.wc-shipping-zones .wc-shipping-zone-name a.wc-shipping-class-delete,table.wc-shipping-zones .wc-shipping-zone-name a.wc-shipping-zone-delete,table.wc-shipping-zones .wc-shipping-zone-region a.wc-shipping-class-delete,table.wc-shipping-zones .wc-shipping-zone-region a.wc-shipping-zone-delete{color:#a00}table.wc-shipping-classes .wc-shipping-class-description a.wc-shipping-class-delete:hover,table.wc-shipping-classes .wc-shipping-class-description a.wc-shipping-zone-delete:hover,table.wc-shipping-classes .wc-shipping-class-name a.wc-shipping-class-delete:hover,table.wc-shipping-classes .wc-shipping-class-name a.wc-shipping-zone-delete:hover,table.wc-shipping-classes .wc-shipping-class-slug a.wc-shipping-class-delete:hover,table.wc-shipping-classes .wc-shipping-class-slug a.wc-shipping-zone-delete:hover,table.wc-shipping-classes .wc-shipping-zone-name a.wc-shipping-class-delete:hover,table.wc-shipping-classes .wc-shipping-zone-name a.wc-shipping-zone-delete:hover,table.wc-shipping-classes .wc-shipping-zone-region a.wc-shipping-class-delete:hover,table.wc-shipping-classes .wc-shipping-zone-region a.wc-shipping-zone-delete:hover,table.wc-shipping-zone-methods .wc-shipping-class-description a.wc-shipping-class-delete:hover,table.wc-shipping-zone-methods .wc-shipping-class-description a.wc-shipping-zone-delete:hover,table.wc-shipping-zone-methods .wc-shipping-class-name a.wc-shipping-class-delete:hover,table.wc-shipping-zone-methods .wc-shipping-class-name a.wc-shipping-zone-delete:hover,table.wc-shipping-zone-methods .wc-shipping-class-slug a.wc-shipping-class-delete:hover,table.wc-shipping-zone-methods .wc-shipping-class-slug a.wc-shipping-zone-delete:hover,table.wc-shipping-zone-methods .wc-shipping-zone-name a.wc-shipping-class-delete:hover,table.wc-shipping-zone-methods .wc-shipping-zone-name a.wc-shipping-zone-delete:hover,table.wc-shipping-zone-methods .wc-shipping-zone-region a.wc-shipping-class-delete:hover,table.wc-shipping-zone-methods .wc-shipping-zone-region a.wc-shipping-zone-delete:hover,table.wc-shipping-zones .wc-shipping-class-description a.wc-shipping-class-delete:hover,table.wc-shipping-zones .wc-shipping-class-description a.wc-shipping-zone-delete:hover,table.wc-shipping-zones .wc-shipping-class-name a.wc-shipping-class-delete:hover,table.wc-shipping-zones .wc-shipping-class-name a.wc-shipping-zone-delete:hover,table.wc-shipping-zones .wc-shipping-class-slug a.wc-shipping-class-delete:hover,table.wc-shipping-zones .wc-shipping-class-slug a.wc-shipping-zone-delete:hover,table.wc-shipping-zones .wc-shipping-zone-name a.wc-shipping-class-delete:hover,table.wc-shipping-zones .wc-shipping-zone-name a.wc-shipping-zone-delete:hover,table.wc-shipping-zones .wc-shipping-zone-region a.wc-shipping-class-delete:hover,table.wc-shipping-zones .wc-shipping-zone-region a.wc-shipping-zone-delete:hover{color:red}table.wc-shipping-classes .wc-shipping-class-count,table.wc-shipping-zone-methods .wc-shipping-class-count,table.wc-shipping-zones .wc-shipping-class-count{text-align:center}table.wc-shipping-classes td.wc-shipping-zone-methods,table.wc-shipping-zone-methods td.wc-shipping-zone-methods,table.wc-shipping-zones td.wc-shipping-zone-methods{color:#555}table.wc-shipping-classes td.wc-shipping-zone-methods .method_disabled,table.wc-shipping-zone-methods td.wc-shipping-zone-methods .method_disabled,table.wc-shipping-zones td.wc-shipping-zone-methods .method_disabled{text-decoration:line-through}table.wc-shipping-classes td.wc-shipping-zone-methods ul,table.wc-shipping-zone-methods td.wc-shipping-zone-methods ul,table.wc-shipping-zones td.wc-shipping-zone-methods ul{position:relative;padding-left:32px}table.wc-shipping-classes td.wc-shipping-zone-methods ul li,table.wc-shipping-zone-methods td.wc-shipping-zone-methods ul li,table.wc-shipping-zones td.wc-shipping-zone-methods ul li{color:#555;display:inline;margin:0}table.wc-shipping-classes td.wc-shipping-zone-methods ul li::before,table.wc-shipping-zone-methods td.wc-shipping-zone-methods ul li::before,table.wc-shipping-zones td.wc-shipping-zone-methods ul li::before{content:', '}table.wc-shipping-classes td.wc-shipping-zone-methods ul li:first-child::before,table.wc-shipping-zone-methods td.wc-shipping-zone-methods ul li:first-child::before,table.wc-shipping-zones td.wc-shipping-zone-methods ul li:first-child::before{content:''}table.wc-shipping-classes td.wc-shipping-zone-methods .add_shipping_method,table.wc-shipping-zone-methods td.wc-shipping-zone-methods .add_shipping_method,table.wc-shipping-zones td.wc-shipping-zone-methods .add_shipping_method{display:block;width:24px;padding:24px 0 0;height:0;overflow:hidden;cursor:pointer}table.wc-shipping-classes td.wc-shipping-zone-methods .add_shipping_method::before,table.wc-shipping-zone-methods td.wc-shipping-zone-methods .add_shipping_method::before,table.wc-shipping-zones td.wc-shipping-zone-methods .add_shipping_method::before{speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;text-indent:0;position:absolute;top:0;right:0;width:100%;height:100%;text-align:center;font-family:Dashicons;content:'\f502';color:#999;vertical-align:middle;line-height:24px;font-size:16px;margin:0}table.wc-shipping-classes td.wc-shipping-zone-methods .add_shipping_method.disabled,table.wc-shipping-zone-methods td.wc-shipping-zone-methods .add_shipping_method.disabled,table.wc-shipping-zones td.wc-shipping-zone-methods .add_shipping_method.disabled{cursor:not-allowed}table.wc-shipping-classes td.wc-shipping-zone-methods .add_shipping_method.disabled::before,table.wc-shipping-zone-methods td.wc-shipping-zone-methods .add_shipping_method.disabled::before,table.wc-shipping-zones td.wc-shipping-zone-methods .add_shipping_method.disabled::before{color:#ccc}table.wc-shipping-classes .wc-shipping-zone-method-title,table.wc-shipping-zone-methods .wc-shipping-zone-method-title,table.wc-shipping-zones .wc-shipping-zone-method-title{width:25%}table.wc-shipping-classes .wc-shipping-zone-method-title .wc-shipping-zone-method-delete,table.wc-shipping-zone-methods .wc-shipping-zone-method-title .wc-shipping-zone-method-delete,table.wc-shipping-zones .wc-shipping-zone-method-title .wc-shipping-zone-method-delete{color:red}table.wc-shipping-classes .wc-shipping-zone-method-enabled,table.wc-shipping-zone-methods .wc-shipping-zone-method-enabled,table.wc-shipping-zones .wc-shipping-zone-method-enabled{text-align:center}table.wc-shipping-classes .wc-shipping-zone-method-enabled a,table.wc-shipping-zone-methods .wc-shipping-zone-method-enabled a,table.wc-shipping-zones .wc-shipping-zone-method-enabled a{display:inline-block}table.wc-shipping-classes .wc-shipping-zone-method-enabled .woocommerce-input-toggle,table.wc-shipping-zone-methods .wc-shipping-zone-method-enabled .woocommerce-input-toggle,table.wc-shipping-zones .wc-shipping-zone-method-enabled .woocommerce-input-toggle{margin-top:3px}table.wc-shipping-classes .wc-shipping-zone-method-type,table.wc-shipping-zone-methods .wc-shipping-zone-method-type,table.wc-shipping-zones .wc-shipping-zone-method-type{display:block}table.wc-shipping-classes tfoot input,table.wc-shipping-classes tfoot select,table.wc-shipping-zone-methods tfoot input,table.wc-shipping-zone-methods tfoot select,table.wc-shipping-zones tfoot input,table.wc-shipping-zones tfoot select{vertical-align:middle!important}table.wc-shipping-classes tfoot .button-secondary,table.wc-shipping-zone-methods tfoot .button-secondary,table.wc-shipping-zones tfoot .button-secondary{float:left}table.wc-shipping-classes .editing .wc-shipping-zone-edit,table.wc-shipping-classes .editing .wc-shipping-zone-view,table.wc-shipping-zone-methods .editing .wc-shipping-zone-edit,table.wc-shipping-zone-methods .editing .wc-shipping-zone-view,table.wc-shipping-zones .editing .wc-shipping-zone-edit,table.wc-shipping-zones .editing .wc-shipping-zone-view{display:none}.woocommerce-input-toggle{height:16px;width:32px;border:2px solid #935687;background-color:#935687;display:inline-block;text-indent:-9999px;border-radius:10em;position:relative}.woocommerce-input-toggle:before{content:"";display:block;width:16px;height:16px;background:#fff;position:absolute;top:0;left:0;border-radius:100%}.woocommerce-input-toggle.woocommerce-input-toggle--disabled{border-color:#999;background-color:#999}.woocommerce-input-toggle.woocommerce-input-toggle--disabled:before{left:auto;right:0}.wc-modal-shipping-method-settings{background:#f8f8f8;padding:1em!important}.wc-modal-shipping-method-settings form .form-table{width:100%;background:#fff;margin:0 0 1.5em}.wc-modal-shipping-method-settings form .form-table tr th{width:30%;position:relative}.wc-modal-shipping-method-settings form .form-table tr th .woocommerce-help-tip{float:left;margin:-8px 0 0 -.5em;vertical-align:middle;left:0;top:50%;position:absolute}.wc-modal-shipping-method-settings form .form-table tr td input,.wc-modal-shipping-method-settings form .form-table tr td select,.wc-modal-shipping-method-settings form .form-table tr td textarea{width:50%;min-width:250px}.wc-modal-shipping-method-settings form .form-table tr td input[type=checkbox]{width:auto;min-width:16px}.wc-modal-shipping-method-settings form .form-table tr td,.wc-modal-shipping-method-settings form .form-table tr th{vertical-align:middle;margin:0;line-height:24px;padding:1em;border-bottom:1px solid #f8f8f8}.wc-modal-shipping-method-settings form .form-table:last-of-type{margin-bottom:0}.wc-backbone-modal .wc-shipping-zone-method-selector p{margin-top:0}.wc-backbone-modal .wc-shipping-zone-method-selector .wc-shipping-zone-method-description{margin:.75em 1px 0;line-height:1.5em;color:#999;font-style:italic}.wc-backbone-modal .wc-shipping-zone-method-selector select{width:100%;cursor:pointer}img.help_tip{margin:0 9px 0 0;vertical-align:middle}.postbox img.help_tip{margin-top:0}.postbox .woocommerce-help-tip{margin:0 9px 0 0}.status-disabled,.status-enabled,.status-manual{font-size:1.4em;display:block;text-indent:-9999px;position:relative;height:1em;width:1em}.status-disabled::before,.status-enabled::before,.status-manual::before{font-family:WooCommerce;line-height:1;margin:0;position:absolute;width:100%;height:100%;text-indent:0;top:0;font-variant:normal;-webkit-font-smoothing:antialiased;font-weight:400;text-align:center;right:0;speak:none;text-transform:none}.status-manual::before{content:"";color:#999}.status-enabled::before{content:"";color:#a46497}.status-disabled::before{content:"";color:#ccc}.woocommerce h2.woo-nav-tab-wrapper{margin-bottom:1em}.woocommerce nav.woo-nav-tab-wrapper{margin:1.5em 0 1em;border-bottom:1px solid #ccc}.woocommerce .subsubsub{margin:-8px 0 0}.woocommerce .wc-admin-breadcrumb{margin-right:.5em}.woocommerce .wc-admin-breadcrumb a{color:#a46497}.woocommerce #template div{margin:0}.woocommerce #template div p .button{float:left;margin-right:10px;margin-top:-4px}.woocommerce #template div .editor textarea{margin-bottom:8px}.woocommerce textarea[disabled=disabled]{background:#dfdfdf!important}.woocommerce table.form-table{margin:0;position:relative}.woocommerce table.form-table .forminp-radio ul{margin:0}.woocommerce table.form-table .forminp-radio ul li{line-height:1.4em}.woocommerce table.form-table textarea.input-text{height:100%;min-width:150px;display:block}.woocommerce table.form-table input.regular-input{width:400px}.woocommerce table.form-table textarea.wide-input{width:100%}.woocommerce table.form-table .woocommerce-help-tip,.woocommerce table.form-table img.help_tip{padding:0;margin:-4px 5px 0 0;vertical-align:middle;cursor:help;line-height:1}.woocommerce table.form-table span.help_tip{cursor:help;color:#2ea2cc}.woocommerce table.form-table th{position:relative;padding-left:24px}.woocommerce table.form-table .select2-container{vertical-align:top;margin-bottom:3px}.woocommerce table.form-table table.widefat th{padding-left:inherit}.woocommerce table.form-table th .woocommerce-help-tip,.woocommerce table.form-table th img.help_tip{margin:2px 0 0 -24px;float:left}.woocommerce table.form-table .wp-list-table .woocommerce-help-tip{float:none}.woocommerce table.form-table fieldset{margin-top:4px}.woocommerce table.form-table fieldset .woocommerce-help-tip,.woocommerce table.form-table fieldset img.help_tip{margin:-3px 5px 0 0}.woocommerce table.form-table fieldset p.description{margin-bottom:8px}.woocommerce table.form-table fieldset:first-child{margin-top:0}.woocommerce table.form-table .iris-picker{z-index:100;display:none;position:absolute;border:1px solid #ccc;border-radius:3px;box-shadow:0 1px 3px rgba(0,0,0,.2)}.woocommerce table.form-table .iris-picker .ui-slider{border:0!important;margin:0!important;width:auto!important;height:auto!important;background:none!important}.woocommerce table.form-table .iris-picker .ui-slider .ui-slider-handle{margin-bottom:0!important}.woocommerce table.form-table .colorpickpreview{padding:3px 20px 3px 3px;border:1px solid #ddd;border-right:0;margin-left:-3px}.woocommerce table.form-table .colorpick{border-left:0}.woocommerce table.form-table .image_width_settings{vertical-align:middle}.woocommerce table.form-table .image_width_settings label{margin-right:10px}.woocommerce table.form-table .wc_emails_wrapper{padding:0 0 10px 15px}.woocommerce #tabs-wrap table a.remove{margin-right:4px}.woocommerce #tabs-wrap table p{margin:0 0 4px!important;overflow:hidden;zoom:1}.woocommerce #tabs-wrap table p a.add{float:right}#wp-excerpt-editor-container{background:#fff}#product_variation-parent #parent_id{width:100%}#postimagediv img{border:1px solid #d5d5d5;max-width:100%}#woocommerce-product-images .inside{margin:0;padding:0}#woocommerce-product-images .inside .add_product_images{padding:0 12px 12px}#woocommerce-product-images .inside #product_images_container{padding:0 9px 0 0}#woocommerce-product-images .inside #product_images_container ul{margin:0;padding:0}#woocommerce-product-images .inside #product_images_container ul::after,#woocommerce-product-images .inside #product_images_container ul::before{content:' ';display:table}#woocommerce-product-images .inside #product_images_container ul li.add,#woocommerce-product-images .inside #product_images_container ul li.image,#woocommerce-product-images .inside #product_images_container ul li.wc-metabox-sortable-placeholder{width:80px;float:right;cursor:move;border:1px solid #d5d5d5;margin:9px 0 0 9px;background:#f7f7f7;border-radius:2px;position:relative;box-sizing:border-box}#woocommerce-product-images .inside #product_images_container ul li.add img,#woocommerce-product-images .inside #product_images_container ul li.image img,#woocommerce-product-images .inside #product_images_container ul li.wc-metabox-sortable-placeholder img{width:100%;height:auto;display:block}#woocommerce-product-images .inside #product_images_container ul li.wc-metabox-sortable-placeholder{border:3px dashed #ddd;position:relative}#woocommerce-product-images .inside #product_images_container ul li.wc-metabox-sortable-placeholder::after{font-family:Dashicons;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;right:0;width:100%;height:100%;text-align:center;content:"";font-size:2.618em;line-height:72px;color:#ddd}#woocommerce-product-images .inside #product_images_container ul ul.actions{position:absolute;top:-8px;left:-8px;padding:2px;display:none}#woocommerce-product-images .inside #product_images_container ul ul.actions li{float:left;margin:0 2px 0 0}#woocommerce-product-images .inside #product_images_container ul ul.actions li a{width:1em;margin:0;height:0;display:block;overflow:hidden}#woocommerce-product-images .inside #product_images_container ul ul.actions li a.tips{cursor:pointer}#woocommerce-product-images .inside #product_images_container ul ul.actions li a.delete{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;font-size:1.4em}#woocommerce-product-images .inside #product_images_container ul ul.actions li a.delete::before{font-family:Dashicons;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;right:0;width:100%;height:100%;text-align:center;content:"";color:#999}#woocommerce-product-images .inside #product_images_container ul ul.actions li a.delete:hover::before{color:#a00}#woocommerce-product-images .inside #product_images_container ul li:hover ul.actions{display:block}#woocommerce-product-data .hndle{padding:10px}#woocommerce-product-data .hndle span{display:block;vertical-align:middle;line-height:24px}#woocommerce-product-data .hndle span span{display:inline;line-height:inherit;vertical-align:baseline}#woocommerce-product-data .hndle select{margin:0 .5em 0 0}#woocommerce-product-data .hndle label{padding-left:1em;font-size:12px;vertical-align:baseline}#woocommerce-product-data .hndle label:first-child{margin-left:1em;border-left:1px solid #dfdfdf}#woocommerce-product-data .hndle input,#woocommerce-product-data .hndle select{margin-top:-3px 0 0;vertical-align:middle}#woocommerce-product-data>.handlediv{margin-top:4px}#woocommerce-product-data .wrap{margin:0}#woocommerce-coupon-description{padding:3px 8px;font-size:1.7em;line-height:1.42em;height:auto;width:100%;outline:0;margin:10px 0;display:block}#woocommerce-coupon-description::-webkit-input-placeholder{line-height:1.42em;color:#bbb}#woocommerce-coupon-description::-moz-placeholder{line-height:1.42em;color:#bbb}#woocommerce-coupon-description:-ms-input-placeholder{line-height:1.42em;color:#bbb}#woocommerce-coupon-description:-moz-placeholder{line-height:1.42em;color:#bbb}#woocommerce-coupon-data .panel-wrap,#woocommerce-product-data .panel-wrap{background:#fff}#woocommerce-coupon-data .wc-metaboxes-wrapper,#woocommerce-coupon-data .woocommerce_options_panel,#woocommerce-product-data .wc-metaboxes-wrapper,#woocommerce-product-data .woocommerce_options_panel{float:right;width:80%}#woocommerce-coupon-data .wc-metaboxes-wrapper .wc-radios,#woocommerce-coupon-data .woocommerce_options_panel .wc-radios,#woocommerce-product-data .wc-metaboxes-wrapper .wc-radios,#woocommerce-product-data .woocommerce_options_panel .wc-radios{display:block;float:right;margin:0}#woocommerce-coupon-data .wc-metaboxes-wrapper .wc-radios li,#woocommerce-coupon-data .woocommerce_options_panel .wc-radios li,#woocommerce-product-data .wc-metaboxes-wrapper .wc-radios li,#woocommerce-product-data .woocommerce_options_panel .wc-radios li{display:block;padding:0 0 10px}#woocommerce-coupon-data .wc-metaboxes-wrapper .wc-radios li input,#woocommerce-coupon-data .woocommerce_options_panel .wc-radios li input,#woocommerce-product-data .wc-metaboxes-wrapper .wc-radios li input,#woocommerce-product-data .woocommerce_options_panel .wc-radios li input{width:auto}#woocommerce-coupon-data .panel-wrap,#woocommerce-product-data .panel-wrap,.woocommerce .panel-wrap{overflow:hidden}#woocommerce-coupon-data ul.wc-tabs,#woocommerce-product-data ul.wc-tabs,.woocommerce ul.wc-tabs{margin:0;width:20%;float:right;line-height:1em;padding:0 0 10px;position:relative;background-color:#fafafa;border-left:1px solid #eee;box-sizing:border-box}#woocommerce-coupon-data ul.wc-tabs::after,#woocommerce-product-data ul.wc-tabs::after,.woocommerce ul.wc-tabs::after{content:'';display:block;width:100%;height:9999em;position:absolute;bottom:-9999em;right:0;background-color:#fafafa;border-left:1px solid #eee}#woocommerce-coupon-data ul.wc-tabs li,#woocommerce-product-data ul.wc-tabs li,.woocommerce ul.wc-tabs li{margin:0;padding:0;display:block;position:relative}#woocommerce-coupon-data ul.wc-tabs li a,#woocommerce-product-data ul.wc-tabs li a,.woocommerce ul.wc-tabs li a{margin:0;padding:10px;display:block;box-shadow:none;text-decoration:none;line-height:20px!important;border-bottom:1px solid #eee}#woocommerce-coupon-data ul.wc-tabs li a span,#woocommerce-product-data ul.wc-tabs li a span,.woocommerce ul.wc-tabs li a span{margin-right:.618em;margin-left:.618em}#woocommerce-coupon-data ul.wc-tabs li a::before,#woocommerce-product-data ul.wc-tabs li a::before,.woocommerce ul.wc-tabs li a::before{font-family:Dashicons;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;content:"";text-decoration:none}#woocommerce-coupon-data ul.wc-tabs li.general_options a::before,#woocommerce-product-data ul.wc-tabs li.general_options a::before,.woocommerce ul.wc-tabs li.general_options a::before{content:'\f107'}#woocommerce-coupon-data ul.wc-tabs li.inventory_options a::before,#woocommerce-product-data ul.wc-tabs li.inventory_options a::before,.woocommerce ul.wc-tabs li.inventory_options a::before{content:'\f481'}#woocommerce-coupon-data ul.wc-tabs li.shipping_options a::before,#woocommerce-product-data ul.wc-tabs li.shipping_options a::before,.woocommerce ul.wc-tabs li.shipping_options a::before{font-family:WooCommerce;content:'\e01a'}#woocommerce-coupon-data ul.wc-tabs li.linked_product_options a::before,#woocommerce-product-data ul.wc-tabs li.linked_product_options a::before,.woocommerce ul.wc-tabs li.linked_product_options a::before{content:'\f103'}#woocommerce-coupon-data ul.wc-tabs li.attribute_options a::before,#woocommerce-product-data ul.wc-tabs li.attribute_options a::before,.woocommerce ul.wc-tabs li.attribute_options a::before{content:'\f175'}#woocommerce-coupon-data ul.wc-tabs li.advanced_options a::before,#woocommerce-product-data ul.wc-tabs li.advanced_options a::before,.woocommerce ul.wc-tabs li.advanced_options a::before{font-family:Dashicons;content:'\f111'}#woocommerce-coupon-data ul.wc-tabs li.variations_options a::before,#woocommerce-product-data ul.wc-tabs li.variations_options a::before,.woocommerce ul.wc-tabs li.variations_options a::before{content:'\f509'}#woocommerce-coupon-data ul.wc-tabs li.usage_restriction_options a::before,#woocommerce-product-data ul.wc-tabs li.usage_restriction_options a::before,.woocommerce ul.wc-tabs li.usage_restriction_options a::before{font-family:WooCommerce;content:'\e602'}#woocommerce-coupon-data ul.wc-tabs li.usage_limit_options a::before,#woocommerce-product-data ul.wc-tabs li.usage_limit_options a::before,.woocommerce ul.wc-tabs li.usage_limit_options a::before{font-family:WooCommerce;content:'\e601'}#woocommerce-coupon-data ul.wc-tabs li.general_coupon_data a::before,#woocommerce-product-data ul.wc-tabs li.general_coupon_data a::before,.woocommerce ul.wc-tabs li.general_coupon_data a::before{font-family:WooCommerce;content:'\e600'}#woocommerce-coupon-data ul.wc-tabs li.active a,#woocommerce-product-data ul.wc-tabs li.active a,.woocommerce ul.wc-tabs li.active a{color:#555;position:relative;background-color:#eee}.woocommerce_page_wc-settings input[type=email],.woocommerce_page_wc-settings input[type=url]{direction:rtl}.woocommerce_page_wc-settings .shippingrows th.check-column{padding-top:20px}.woocommerce_page_wc-settings .shippingrows tfoot th{padding-right:10px}.woocommerce_page_wc-settings .shippingrows .add.button::before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin-left:.618em;content:"";text-decoration:none}.woocommerce_page_wc-settings h3.wc-settings-sub-title{font-size:1.2em}#woocommerce-coupon-data .inside,#woocommerce-order-data .inside,#woocommerce-order-downloads .inside,#woocommerce-product-data .inside,#woocommerce-product-type-options .inside{margin:0;padding:0}.panel,.woocommerce_options_panel{padding:9px;color:#555}.panel .form-field .woocommerce-help-tip,.woocommerce_options_panel .form-field .woocommerce-help-tip{font-size:1.4em}.panel,.woocommerce_page_settings .woocommerce_options_panel{padding:0}#woocommerce-product-specs .inside,#woocommerce-product-type-options .panel{margin:0;padding:9px}#woocommerce-product-type-options .panel p,.woocommerce_options_panel fieldset.form-field,.woocommerce_options_panel p{margin:0 0 9px;font-size:12px;padding:5px 9px;line-height:24px}#woocommerce-product-type-options .panel p::after,.woocommerce_options_panel fieldset.form-field::after,.woocommerce_options_panel p::after{content:'.';display:block;height:0;clear:both;visibility:hidden}.woocommerce_options_panel .checkbox,.woocommerce_variable_attributes .checkbox{width:auto;margin:4px 0!important;vertical-align:middle;float:right}.woocommerce_options_panel .downloadable_files table,.woocommerce_variations .downloadable_files table{width:100%;padding:0!important}.woocommerce_options_panel .downloadable_files table th,.woocommerce_variations .downloadable_files table th{padding:7px 7px 7px 0!important}.woocommerce_options_panel .downloadable_files table th.sort,.woocommerce_variations .downloadable_files table th.sort{width:17px;padding:7px!important}.woocommerce_options_panel .downloadable_files table th .woocommerce-help-tip,.woocommerce_variations .downloadable_files table th .woocommerce-help-tip{font-size:1.1em;margin-right:0}.woocommerce_options_panel .downloadable_files table td,.woocommerce_variations .downloadable_files table td{vertical-align:middle!important;padding:4px 7px 4px 0!important;position:relative}.woocommerce_options_panel .downloadable_files table td:last-child,.woocommerce_variations .downloadable_files table td:last-child{padding-left:7px!important}.woocommerce_options_panel .downloadable_files table td input.input_text,.woocommerce_variations .downloadable_files table td input.input_text{width:100%;float:none;min-width:0;margin:1px 0}.woocommerce_options_panel .downloadable_files table td .upload_file_button,.woocommerce_variations .downloadable_files table td .upload_file_button{width:auto;float:left;cursor:pointer}.woocommerce_options_panel .downloadable_files table td .delete,.woocommerce_variations .downloadable_files table td .delete{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;font-size:1.2em}.woocommerce_options_panel .downloadable_files table td .delete::before,.woocommerce_variations .downloadable_files table td .delete::before{font-family:Dashicons;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;right:0;width:100%;height:100%;text-align:center;content:"";color:#999}.woocommerce_options_panel .downloadable_files table td .delete:hover::before,.woocommerce_variations .downloadable_files table td .delete:hover::before{color:#a00}.woocommerce_options_panel .downloadable_files table td.sort,.woocommerce_variations .downloadable_files table td.sort{width:17px;cursor:move;font-size:15px;text-align:center;background:#f9f9f9;padding-left:7px!important}.woocommerce_options_panel .downloadable_files table td.sort::before,.woocommerce_variations .downloadable_files table td.sort::before{content:'\f333';font-family:Dashicons;text-align:center;line-height:1;color:#999;display:block;width:17px;float:right;height:100%}.woocommerce_options_panel .downloadable_files table td.sort:hover::before,.woocommerce_variations .downloadable_files table td.sort:hover::before{color:#333}.woocommerce_variation h3 .sort{width:17px;height:26px;cursor:move;float:left;font-size:15px;font-weight:400;margin-left:.5em;visibility:hidden;text-align:center;vertical-align:middle}.woocommerce_variation h3 .sort::before{content:'\f333';font-family:Dashicons;text-align:center;line-height:28px;color:#999;display:block;width:17px;float:right;height:100%}.woocommerce_variation h3 .sort:hover::before{color:#777}.woocommerce_variation h3:hover .sort,.woocommerce_variation.ui-sortable-helper .sort{visibility:visible}.woocommerce_options_panel{min-height:175px;box-sizing:border-box}.woocommerce_options_panel .downloadable_files{padding:0 162px 0 9px;position:relative;margin:9px 0}.woocommerce_options_panel .downloadable_files label{position:absolute;right:0;margin:0 12px 0 0;line-height:24px}.woocommerce_options_panel p{margin:9px 0}.woocommerce_options_panel fieldset.form-field,.woocommerce_options_panel p.form-field{padding:5px 162px 5px 20px!important}.woocommerce_options_panel .sale_price_dates_fields .short:first-of-type{margin-bottom:1em}.woocommerce_options_panel .sale_price_dates_fields .short:nth-of-type(2){clear:right}.woocommerce_options_panel label,.woocommerce_options_panel legend{float:right;width:150px;padding:0;margin:0 -150px 0 0}.woocommerce_options_panel label .req,.woocommerce_options_panel legend .req{font-weight:700;font-style:normal;color:#a00}.woocommerce_options_panel .description{padding:0;margin:0 7px 0 0;clear:none;display:inline}.woocommerce_options_panel .description-block{margin-right:0;display:block}.woocommerce_options_panel input,.woocommerce_options_panel select,.woocommerce_options_panel textarea{margin:0}.woocommerce_options_panel textarea{float:right;height:3.5em;line-height:1.5em;vertical-align:top}.woocommerce_options_panel input[type=text],.woocommerce_options_panel input[type=number],.woocommerce_options_panel input[type=email],.woocommerce_options_panel input[type=password]{width:50%;float:right}.woocommerce_options_panel input.button{width:auto;margin-right:8px}.woocommerce_options_panel select{float:right}.woocommerce_options_panel .short,.woocommerce_options_panel input[type=text].short,.woocommerce_options_panel input[type=number].short,.woocommerce_options_panel input[type=email].short,.woocommerce_options_panel input[type=password].short{width:50%}.woocommerce_options_panel .sized{width:auto!important;margin-left:6px}.woocommerce_options_panel .options_group{border-top:1px solid #fff;border-bottom:1px solid #eee}.woocommerce_options_panel .options_group:first-child{border-top:0}.woocommerce_options_panel .options_group:last-child{border-bottom:0}.woocommerce_options_panel .options_group fieldset{margin:9px 0;font-size:12px;padding:5px 9px;line-height:24px}.woocommerce_options_panel .options_group fieldset label{width:auto;float:none}.woocommerce_options_panel .options_group fieldset ul{float:right;width:50%;margin:0;padding:0}.woocommerce_options_panel .options_group fieldset ul li{margin:0;width:auto}.woocommerce_options_panel .options_group fieldset ul li input{width:auto;float:none;margin-left:4px}.woocommerce_options_panel .options_group fieldset ul.wc-radios label{margin-right:0}.woocommerce_options_panel .dimensions_field .wrap{display:block;width:50%}.woocommerce_options_panel .dimensions_field .wrap input{width:30.75%;margin-left:3.8%}.woocommerce_options_panel .dimensions_field .wrap .last{margin-left:0}.woocommerce_options_panel.padded{padding:1em}#woocommerce-product-data input.dp-applied,.woocommerce_options_panel .select2-container{float:right}#grouped_product_options,#simple_product_options,#virtual_product_options{padding:12px;font-style:italic;color:#666}.wc-metaboxes-wrapper .toolbar{margin:0!important;border-top:1px solid #fff;border-bottom:1px solid #eee;padding:9px 12px!important}.wc-metaboxes-wrapper .toolbar:first-child{border-top:0}.wc-metaboxes-wrapper .toolbar:last-child{border-bottom:0}.wc-metaboxes-wrapper .toolbar .add_variation{float:left;margin-right:5px}.wc-metaboxes-wrapper .toolbar .cancel-variation-changes,.wc-metaboxes-wrapper .toolbar .save-variation-changes{float:right;margin-left:5px}.wc-metaboxes-wrapper p.toolbar{overflow:hidden;zoom:1}.wc-metaboxes-wrapper .expand-close{margin-left:2px;color:#777;font-size:12px;font-style:italic}.wc-metaboxes-wrapper .expand-close a{background:0 0;padding:0;font-size:12px;text-decoration:none}.wc-metaboxes-wrapper#product_attributes .expand-close{float:left;line-height:28px}.wc-metaboxes-wrapper .fr,.wc-metaboxes-wrapper button.add_variable_attribute{float:left;margin:0 6px 0 0}.wc-metaboxes-wrapper .wc-metaboxes{border-bottom:1px solid #eee}.wc-metaboxes-wrapper .wc-metabox-sortable-placeholder{border-color:#bbb;background-color:#f5f5f5;margin-bottom:9px;border-width:1px;border-style:dashed}.wc-metaboxes-wrapper .wc-metabox{background:#fff;border-bottom:1px solid #eee;margin:0!important}.wc-metaboxes-wrapper .wc-metabox select{font-weight:400}.wc-metaboxes-wrapper .wc-metabox:last-of-type{border-bottom:0}.wc-metaboxes-wrapper .wc-metabox .handlediv{width:27px}.wc-metaboxes-wrapper .wc-metabox .handlediv::before{content:'\f142'!important;cursor:pointer;display:inline-block;font:400 20px/1 Dashicons;line-height:.5!important;padding:8px 10px;position:relative;left:12px;top:0}.wc-metaboxes-wrapper .wc-metabox.closed{border-radius:3px}.wc-metaboxes-wrapper .wc-metabox.closed .handlediv::before{content:'\f140'!important}.wc-metaboxes-wrapper .wc-metabox.closed h3{border:0}.wc-metaboxes-wrapper .wc-metabox h3{margin:0!important;padding:.75em 1em .75em .75em!important;font-size:1em!important;overflow:hidden;zoom:1;cursor:move}.wc-metaboxes-wrapper .wc-metabox h3 a.delete,.wc-metaboxes-wrapper .wc-metabox h3 button{float:left}.wc-metaboxes-wrapper .wc-metabox h3 a.delete{color:red;font-weight:400;line-height:26px;text-decoration:none;position:relative;visibility:hidden}.wc-metaboxes-wrapper .wc-metabox h3 strong{line-height:26px;font-weight:700}.wc-metaboxes-wrapper .wc-metabox h3 select{font-family:sans-serif;max-width:20%;margin:.25em 0 .25em .25em}.wc-metaboxes-wrapper .wc-metabox h3 .handlediv{background-position:6px 5px!important;visibility:hidden;height:26px}.wc-metaboxes-wrapper .wc-metabox h3.fixed{cursor:pointer!important}.wc-metaboxes-wrapper .wc-metabox.woocommerce_variation h3{cursor:pointer;padding:.5em 1em .5em .75em!important}.wc-metaboxes-wrapper .wc-metabox.woocommerce_variation h3 .handlediv,.wc-metaboxes-wrapper .wc-metabox.woocommerce_variation h3 .sort,.wc-metaboxes-wrapper .wc-metabox.woocommerce_variation h3 a.delete{margin-top:.25em}.wc-metaboxes-wrapper .wc-metabox h3:hover .handlediv,.wc-metaboxes-wrapper .wc-metabox h3:hover a.delete,.wc-metaboxes-wrapper .wc-metabox.ui-sortable-helper .handlediv,.wc-metaboxes-wrapper .wc-metabox.ui-sortable-helper a.delete{visibility:visible}.wc-metaboxes-wrapper .wc-metabox table{width:100%;position:relative;background-color:#fdfdfd;padding:1em;border-top:1px solid #eee}.wc-metaboxes-wrapper .wc-metabox table td{text-align:right;padding:0 0 1em 6px;vertical-align:top;border:0}.wc-metaboxes-wrapper .wc-metabox table td label{text-align:right;display:block;line-height:21px}.wc-metaboxes-wrapper .wc-metabox table td input{float:right;min-width:200px}.wc-metaboxes-wrapper .wc-metabox table td input,.wc-metaboxes-wrapper .wc-metabox table td textarea{width:100%;margin:0;display:block;font-size:14px;padding:4px;color:#555}.wc-metaboxes-wrapper .wc-metabox table td .select2-container,.wc-metaboxes-wrapper .wc-metabox table td select{width:100%!important}.wc-metaboxes-wrapper .wc-metabox table td input.short{width:200px}.wc-metaboxes-wrapper .wc-metabox table td input.checkbox{width:16px;min-width:inherit;vertical-align:text-bottom;display:inline-block;float:none}.wc-metaboxes-wrapper .wc-metabox table td.attribute_name{width:200px}.wc-metaboxes-wrapper .wc-metabox table .minus,.wc-metaboxes-wrapper .wc-metabox table .plus{margin-top:6px}.wc-metaboxes-wrapper .wc-metabox table .fl{float:right}.wc-metaboxes-wrapper .wc-metabox table .fr{float:left}.variations-pagenav{float:left;line-height:24px}.variations-pagenav .displaying-num{color:#777;font-size:12px;font-style:italic}.variations-pagenav a{padding:0 10px 3px;background:rgba(0,0,0,.05);font-size:16px;font-weight:400;text-decoration:none}.variations-pagenav a.disabled,.variations-pagenav a.disabled:active,.variations-pagenav a.disabled:focus,.variations-pagenav a.disabled:hover{color:#a0a5aa;background:rgba(0,0,0,.05)}.variations-defaults{float:right}.variations-defaults select{margin:.25em 0 .25em .25em}.woocommerce_variable_attributes{background-color:#fdfdfd;border-top:1px solid #eee}.woocommerce_variable_attributes .data{padding:1em 2em}.woocommerce_variable_attributes .data::after,.woocommerce_variable_attributes .data::before{content:' ';display:table}.woocommerce_variable_attributes .upload_image_button{display:block;width:64px;height:64px;float:right;margin-left:20px;position:relative;cursor:pointer}.woocommerce_variable_attributes .upload_image_button img{width:100%;height:auto;display:none}.woocommerce_variable_attributes .upload_image_button::before{content:'\f128';font-family:Dashicons;position:absolute;top:0;right:0;left:0;bottom:0;text-align:center;line-height:64px;font-size:64px;font-weight:400;-webkit-font-smoothing:antialiased}.woocommerce_variable_attributes .upload_image_button.remove img{display:block}.woocommerce_variable_attributes .upload_image_button.remove::before{content:'\f335';display:none}.woocommerce_variable_attributes .upload_image_button.remove:hover::before{display:block}.woocommerce_variable_attributes .options{border:1px solid #eee;border-width:1px 0;padding:.25em 0}.woocommerce_variable_attributes .options label{display:inline-block;padding:4px 0 2px 1em}.woocommerce_variable_attributes .options input[type=checkbox]{margin:0 .5em 0 5px!important;vertical-align:middle}.form-row label{display:inline-block}.form-row .woocommerce-help-tip{float:left}.form-row input[type=number],.form-row input[type=text],.form-row select,.form-row textarea{width:100%;vertical-align:middle;margin:2px 0 0;padding:6px}.form-row select{height:30px;line-height:30px}.form-row.dimensions_field .wrap{clear:right;display:block}.form-row.dimensions_field input{width:33%;float:right;vertical-align:middle}.form-row.dimensions_field input:last-of-type{margin-left:0;width:34%}.form-row.form-row-first,.form-row.form-row-last{width:48%;float:left}.form-row.form-row-first{clear:both;float:right}.form-row.form-row-full{clear:both}.tips{cursor:help;text-decoration:none}img.tips{padding:5px 0 0}#tiptip_holder{display:none;z-index:8675309;position:absolute;top:0;left:0}#tiptip_holder.tip_top{padding-bottom:5px}#tiptip_holder.tip_top #tiptip_arrow_inner{margin-top:-7px;margin-right:-6px;border-top-color:#333}#tiptip_holder.tip_bottom{padding-top:5px}#tiptip_holder.tip_bottom #tiptip_arrow_inner{margin-top:-5px;margin-right:-6px;border-bottom-color:#333}#tiptip_holder.tip_right{padding-right:5px}#tiptip_holder.tip_right #tiptip_arrow_inner{margin-top:-6px;margin-right:-5px;border-left-color:#333}#tiptip_holder.tip_left{padding-left:5px}#tiptip_holder.tip_left #tiptip_arrow_inner{margin-top:-6px;margin-right:-7px;border-right-color:#333}#tiptip_content,.chart-tooltip,.wc_error_tip{color:#fff;font-size:.8em;max-width:150px;background:#333;text-align:center;border-radius:3px;padding:.618em 1em;box-shadow:0 1px 3px rgba(0,0,0,.2)}#tiptip_content code,.chart-tooltip code,.wc_error_tip code{padding:1px;background:#888}#tiptip_arrow,#tiptip_arrow_inner{position:absolute;border-color:transparent;border-style:solid;border-width:6px;height:0;width:0}#tiptip_arrow{right:50%;margin-right:-6px}.wc_error_tip{max-width:20em;line-height:1.8em;position:absolute;white-space:normal;background:#d82223;margin:1.5em -1em 0 1px;z-index:9999999}.wc_error_tip::after{content:'';display:block;border:8px solid #d82223;border-left-color:transparent;border-right-color:transparent;border-top-color:transparent;position:absolute;top:-3px;right:50%;margin:-1em -3px 0 0}img.ui-datepicker-trigger{vertical-align:middle;margin-top:-1px;cursor:pointer}.wc-metabox-content img.ui-datepicker-trigger,.woocommerce_options_panel img.ui-datepicker-trigger{float:right;margin-left:8px;margin-top:4px;margin-right:4px}#ui-datepicker-div{display:none}.woocommerce-reports-wide.woocommerce-reports-wrap,.woocommerce-reports-wrap.woocommerce-reports-wrap{margin-right:300px;padding-top:18px}.woocommerce-reports-wide.halved,.woocommerce-reports-wrap.halved{margin:0;overflow:hidden;zoom:1}.woocommerce-reports-wide .widefat td,.woocommerce-reports-wrap .widefat td{vertical-align:top;padding:7px}.woocommerce-reports-wide .widefat td .description,.woocommerce-reports-wrap .widefat td .description{margin:4px 0 0}.woocommerce-reports-wide .postbox::after,.woocommerce-reports-wrap .postbox::after{content:'.';display:block;height:0;clear:both;visibility:hidden}.woocommerce-reports-wide .postbox h3,.woocommerce-reports-wrap .postbox h3{cursor:default!important}.woocommerce-reports-wide .postbox .inside,.woocommerce-reports-wrap .postbox .inside{padding:10px;margin:0!important}.woocommerce-reports-wide .postbox div.stats_range,.woocommerce-reports-wide .postbox h3.stats_range,.woocommerce-reports-wrap .postbox div.stats_range,.woocommerce-reports-wrap .postbox h3.stats_range{border-bottom-color:#dfdfdf;margin:0;padding:0!important}.woocommerce-reports-wide .postbox div.stats_range .export_csv,.woocommerce-reports-wide .postbox h3.stats_range .export_csv,.woocommerce-reports-wrap .postbox div.stats_range .export_csv,.woocommerce-reports-wrap .postbox h3.stats_range .export_csv{float:left;line-height:26px;border-right:1px solid #dfdfdf;padding:10px;display:block;text-decoration:none}.woocommerce-reports-wide .postbox div.stats_range .export_csv::before,.woocommerce-reports-wide .postbox h3.stats_range .export_csv::before,.woocommerce-reports-wrap .postbox div.stats_range .export_csv::before,.woocommerce-reports-wrap .postbox h3.stats_range .export_csv::before{font-family:Dashicons;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;content:"";text-decoration:none;margin-left:4px}.woocommerce-reports-wide .postbox div.stats_range ul,.woocommerce-reports-wide .postbox h3.stats_range ul,.woocommerce-reports-wrap .postbox div.stats_range ul,.woocommerce-reports-wrap .postbox h3.stats_range ul{list-style:none;margin:0;padding:0;zoom:1;background:#f5f5f5;border-bottom:1px solid #ccc}.woocommerce-reports-wide .postbox div.stats_range ul::after,.woocommerce-reports-wide .postbox div.stats_range ul::before,.woocommerce-reports-wide .postbox h3.stats_range ul::after,.woocommerce-reports-wide .postbox h3.stats_range ul::before,.woocommerce-reports-wrap .postbox div.stats_range ul::after,.woocommerce-reports-wrap .postbox div.stats_range ul::before,.woocommerce-reports-wrap .postbox h3.stats_range ul::after,.woocommerce-reports-wrap .postbox h3.stats_range ul::before{content:' ';display:table}.woocommerce-reports-wide .postbox div.stats_range ul::after,.woocommerce-reports-wide .postbox h3.stats_range ul::after,.woocommerce-reports-wrap .postbox div.stats_range ul::after,.woocommerce-reports-wrap .postbox h3.stats_range ul::after{clear:both}.woocommerce-reports-wide .postbox div.stats_range ul li,.woocommerce-reports-wide .postbox h3.stats_range ul li,.woocommerce-reports-wrap .postbox div.stats_range ul li,.woocommerce-reports-wrap .postbox h3.stats_range ul li{float:right;margin:0;padding:0;line-height:26px;font-weight:700;font-size:14px}.woocommerce-reports-wide .postbox div.stats_range ul li a,.woocommerce-reports-wide .postbox h3.stats_range ul li a,.woocommerce-reports-wrap .postbox div.stats_range ul li a,.woocommerce-reports-wrap .postbox h3.stats_range ul li a{border-left:1px solid #dfdfdf;padding:10px;display:block;text-decoration:none}.woocommerce-reports-wide .postbox div.stats_range ul li.active,.woocommerce-reports-wide .postbox h3.stats_range ul li.active,.woocommerce-reports-wrap .postbox div.stats_range ul li.active,.woocommerce-reports-wrap .postbox h3.stats_range ul li.active{background:#fff;box-shadow:0 4px 0 0 #fff}.woocommerce-reports-wide .postbox div.stats_range ul li.active a,.woocommerce-reports-wide .postbox h3.stats_range ul li.active a,.woocommerce-reports-wrap .postbox div.stats_range ul li.active a,.woocommerce-reports-wrap .postbox h3.stats_range ul li.active a{color:#777}.woocommerce-reports-wide .postbox div.stats_range ul li.custom,.woocommerce-reports-wide .postbox h3.stats_range ul li.custom,.woocommerce-reports-wrap .postbox div.stats_range ul li.custom,.woocommerce-reports-wrap .postbox h3.stats_range ul li.custom{padding:9px 10px;vertical-align:middle}.woocommerce-reports-wide .postbox div.stats_range ul li.custom div,.woocommerce-reports-wide .postbox div.stats_range ul li.custom form,.woocommerce-reports-wide .postbox h3.stats_range ul li.custom div,.woocommerce-reports-wide .postbox h3.stats_range ul li.custom form,.woocommerce-reports-wrap .postbox div.stats_range ul li.custom div,.woocommerce-reports-wrap .postbox div.stats_range ul li.custom form,.woocommerce-reports-wrap .postbox h3.stats_range ul li.custom div,.woocommerce-reports-wrap .postbox h3.stats_range ul li.custom form{display:inline;margin:0}.woocommerce-reports-wide .postbox div.stats_range ul li.custom div input.range_datepicker,.woocommerce-reports-wide .postbox div.stats_range ul li.custom form input.range_datepicker,.woocommerce-reports-wide .postbox h3.stats_range ul li.custom div input.range_datepicker,.woocommerce-reports-wide .postbox h3.stats_range ul li.custom form input.range_datepicker,.woocommerce-reports-wrap .postbox div.stats_range ul li.custom div input.range_datepicker,.woocommerce-reports-wrap .postbox div.stats_range ul li.custom form input.range_datepicker,.woocommerce-reports-wrap .postbox h3.stats_range ul li.custom div input.range_datepicker,.woocommerce-reports-wrap .postbox h3.stats_range ul li.custom form input.range_datepicker{padding:0;margin:0 0 0 10px;background:0 0;border:0;color:#777;text-align:center;box-shadow:none}.woocommerce-reports-wide .postbox div.stats_range ul li.custom div input.range_datepicker.from,.woocommerce-reports-wide .postbox div.stats_range ul li.custom form input.range_datepicker.from,.woocommerce-reports-wide .postbox h3.stats_range ul li.custom div input.range_datepicker.from,.woocommerce-reports-wide .postbox h3.stats_range ul li.custom form input.range_datepicker.from,.woocommerce-reports-wrap .postbox div.stats_range ul li.custom div input.range_datepicker.from,.woocommerce-reports-wrap .postbox div.stats_range ul li.custom form input.range_datepicker.from,.woocommerce-reports-wrap .postbox h3.stats_range ul li.custom div input.range_datepicker.from,.woocommerce-reports-wrap .postbox h3.stats_range ul li.custom form input.range_datepicker.from{margin-left:0}.woocommerce-reports-wide .postbox .chart-with-sidebar,.woocommerce-reports-wrap .postbox .chart-with-sidebar{padding:12px 249px 12px 12px;margin:0!important}.woocommerce-reports-wide .postbox .chart-with-sidebar .chart-sidebar,.woocommerce-reports-wrap .postbox .chart-with-sidebar .chart-sidebar{width:225px;margin-right:-237px;float:right}.woocommerce-reports-wide .postbox .chart-widgets,.woocommerce-reports-wrap .postbox .chart-widgets{margin:0;padding:0}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget{margin:0 0 1em;background:#fafafa;border:1px solid #dfdfdf}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget::after,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget::after{content:'.';display:block;height:0;clear:both;visibility:hidden}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget h4,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget h4{background:#fff;border:1px solid #dfdfdf;border-right-width:0;border-left-width:0;padding:10px;margin:0;color:#2ea2cc;border-top-width:0;background-image:-webkit-gradient(linear,right bottom,right top,from(#ececec),to(#f9f9f9));background-image:-webkit-linear-gradient(bottom,#ececec,#f9f9f9);background-image:linear-gradient(to top,#ececec,#f9f9f9)}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget table td.count,.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget table tr.active td,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget table td.count,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget table tr.active td{background:#f5f5f5}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget h4.section_title:hover,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget h4.section_title:hover{color:#a00}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget .section_title,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget .section_title{cursor:pointer}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget .section_title span,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget .section_title span{display:block}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget .section_title span::after,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget .section_title span::after{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin-right:.618em;content:"";text-decoration:none;float:left;font-size:.9em;line-height:1.618}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget .section_title.open,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget .section_title.open{color:#333}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget .section_title.open span::after,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget .section_title.open span::after{display:none}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget .section,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget .section{border-bottom:1px solid #dfdfdf}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget .section .select2-container,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget .section .select2-container{width:100%!important}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget .section:last-of-type,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget .section:last-of-type{border-radius:0 0 3px 3px}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget table,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget table{width:100%}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget table td,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget table td{padding:7px 10px;vertical-align:top;border-top:1px solid #e5e5e5;line-height:1.4em}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget table tr:first-child td,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget table tr:first-child td{border-top:0}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget table td.name,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget table td.name{max-width:175px}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget table td.name a,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget table td.name a{word-wrap:break-word}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget table td.sparkline,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget table td.sparkline{vertical-align:middle}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget table .wc_sparkline,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget table .wc_sparkline{width:32px;height:1em;display:block;float:left}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget form,.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget p,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget form,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget p{margin:0;padding:10px}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget form .submit,.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget p .submit,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget form .submit,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget p .submit{margin-top:10px}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget #product_ids,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget #product_ids{width:100%}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget .select_all,.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget .select_none,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget .select_all,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget .select_none{float:left;color:#999;margin-right:4px;margin-top:10px}.woocommerce-reports-wide .postbox .chart-legend,.woocommerce-reports-wrap .postbox .chart-legend{list-style:none;margin:0 0 1em;padding:0;border:1px solid #dfdfdf;border-left-width:0;border-bottom-width:0;background:#fff}.woocommerce-reports-wide .postbox .chart-legend li,.woocommerce-reports-wrap .postbox .chart-legend li{border-left:5px solid #aaa;color:#aaa;padding:1em;display:block;margin:0;-webkit-transition:all ease .5s;box-shadow:inset 0 -1px 0 0 #dfdfdf}.woocommerce-reports-wide .postbox .chart-legend li strong,.woocommerce-reports-wrap .postbox .chart-legend li strong{font-size:1.618em;line-height:1.2em;color:#464646;font-weight:400;display:block;font-family:HelveticaNeue-Light,'Helvetica Neue Light','Helvetica Neue',sans-serif}.woocommerce-reports-wide .postbox .chart-legend li strong del,.woocommerce-reports-wrap .postbox .chart-legend li strong del{color:#e74c3c;font-weight:400}.woocommerce-reports-wide .postbox .chart-legend li:hover,.woocommerce-reports-wrap .postbox .chart-legend li:hover{box-shadow:inset 0 -1px 0 0 #dfdfdf,inset -300px 0 0 rgba(156,93,144,.1);border-left:5px solid #9c5d90!important;padding-right:1.5em;color:#9c5d90}.woocommerce-reports-wide .postbox .pie-chart-legend,.woocommerce-reports-wrap .postbox .pie-chart-legend{margin:12px 0 0;overflow:hidden}.woocommerce-reports-wide .postbox .pie-chart-legend li,.woocommerce-reports-wrap .postbox .pie-chart-legend li{float:right;margin:0;padding:6px 0 0;border-top:4px solid #999;text-align:center;box-sizing:border-box;width:50%}.woocommerce-reports-wide .postbox .stat,.woocommerce-reports-wrap .postbox .stat{font-size:1.5em!important;font-weight:700;text-align:center}.woocommerce-reports-wide .postbox .chart-placeholder,.woocommerce-reports-wrap .postbox .chart-placeholder{width:100%;height:650px;overflow:hidden;position:relative}.woocommerce-reports-wide .postbox .chart-prompt,.woocommerce-reports-wrap .postbox .chart-prompt{line-height:650px;margin:0;color:#999;font-size:1.2em;font-style:italic;text-align:center}.woocommerce-reports-wide .postbox .chart-container,.woocommerce-reports-wrap .postbox .chart-container{background:#fff;padding:12px;position:relative;border:1px solid #dfdfdf;border-radius:3px}.woocommerce-reports-wide .postbox .main .chart-legend,.woocommerce-reports-wrap .postbox .main .chart-legend{margin-top:12px}.woocommerce-reports-wide .postbox .main .chart-legend li,.woocommerce-reports-wrap .postbox .main .chart-legend li{border-left:0;margin:0 0 0 8px;float:right;border-top:4px solid #aaa}.woocommerce-reports-wide .woocommerce-reports-main,.woocommerce-reports-wrap .woocommerce-reports-main{float:right;min-width:100%}.woocommerce-reports-wide .woocommerce-reports-main table td,.woocommerce-reports-wrap .woocommerce-reports-main table td{padding:9px}.woocommerce-reports-wide .woocommerce-reports-sidebar,.woocommerce-reports-wrap .woocommerce-reports-sidebar{display:inline;width:281px;margin-right:-300px;clear:both;float:right}.woocommerce-reports-wide .woocommerce-reports-left,.woocommerce-reports-wrap .woocommerce-reports-left{width:49.5%;float:right}.woocommerce-reports-wide .woocommerce-reports-right,.woocommerce-reports-wrap .woocommerce-reports-right{width:49.5%;float:left}.woocommerce-reports-wide .column-wc_actions a.edit,.woocommerce-reports-wide .column-wc_actions a.view,.woocommerce-reports-wrap .column-wc_actions a.edit,.woocommerce-reports-wrap .column-wc_actions a.view{display:block;text-indent:-9999px;position:relative;padding:0!important;height:2em!important;width:2em}.woocommerce-reports-wide .column-wc_actions a.edit::after,.woocommerce-reports-wide .column-wc_actions a.view::after,.woocommerce-reports-wrap .column-wc_actions a.edit::after,.woocommerce-reports-wrap .column-wc_actions a.view::after{font-family:Dashicons;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;right:0;width:100%;height:100%;text-align:center;line-height:1.85}.woocommerce-reports-wide .column-wc_actions a.edit::after,.woocommerce-reports-wrap .column-wc_actions a.edit::after{content:'\f464'}.woocommerce-reports-wide .column-wc_actions a.view::after,.woocommerce-reports-wrap .column-wc_actions a.view::after{content:'\f177'}.woocommerce-wide-reports-wrap{padding-bottom:11px}.woocommerce-wide-reports-wrap .widefat .export-data{float:left}.woocommerce-wide-reports-wrap .widefat td,.woocommerce-wide-reports-wrap .widefat th{vertical-align:middle;padding:7px}form.report_filters div,form.report_filters input,form.report_filters label,form.report_filters p{vertical-align:middle}.chart-tooltip{position:absolute;display:none;line-height:1}table.bar_chart{width:100%}table.bar_chart thead th{text-align:right;color:#ccc;padding:6px 0}table.bar_chart tbody th{padding:6px 0;width:25%;text-align:right!important;font-weight:400!important;border-bottom:1px solid #fee}table.bar_chart tbody td{text-align:left;line-height:24px;padding:6px 0 6px 6px;border-bottom:1px solid #fee}table.bar_chart tbody td span{color:#8a4b75;display:block}table.bar_chart tbody td span.alt{color:#47a03e;margin-top:6px}table.bar_chart tbody td.bars{position:relative;text-align:right;padding:6px 0 6px 6px;border-bottom:1px solid #fee}table.bar_chart tbody td.bars a,table.bar_chart tbody td.bars span{text-decoration:none;clear:both;background:#8a4b75;float:right;display:block;line-height:24px;height:24px;border-radius:3px}.post-type-product .woocommerce-BlankState-message::before,.post-type-shop_coupon .woocommerce-BlankState-message::before,.post-type-shop_order .woocommerce-BlankState-message::before,.woocommerce-BlankState--api .woocommerce-BlankState-message::before,.woocommerce-BlankState--webhooks .woocommerce-BlankState-message::before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;right:0;width:100%;height:100%;text-align:center}table.bar_chart tbody td.bars span.alt{clear:both;background:#47a03e}table.bar_chart tbody td.bars span.alt span{margin:0;color:#c5dec2!important;text-shadow:0 1px 0 #47a03e;background:0 0}.post-type-shop_order .woocommerce-BlankState-message::before{content:""}.post-type-shop_coupon .woocommerce-BlankState-message::before{content:""}.post-type-product .woocommerce-BlankState-message::before{content:""}.woocommerce-BlankState--api .woocommerce-BlankState-message::before{content:""}.woocommerce-BlankState--webhooks .woocommerce-BlankState-message::before{content:""}.woocommerce-BlankState{text-align:center;padding:5em 0 0}.woocommerce-BlankState .woocommerce-BlankState-message{color:#aaa;margin:0 auto 1.5em;line-height:1.5em;font-size:1.2em;max-width:500px}.woocommerce-BlankState .woocommerce-BlankState-message::before{color:#ddd;text-shadow:0 -1px 1px rgba(0,0,0,.2),0 1px 0 rgba(255,255,255,.8);font-size:8em;display:block;position:relative!important;top:auto;right:auto;line-height:1em;margin:0 0 .1875em}.woocommerce-BlankState .woocommerce-BlankState-cta{font-size:1.2em;padding:.75em 1.5em;height:auto}@media only screen and (max-width:1280px){#order_data .order_data_column{width:48%}#order_data .order_data_column:first-child{width:100%}.woocommerce_options_panel .description{display:block;clear:both;margin-right:0}.woocommerce_options_panel .dimensions_field .wrap,.woocommerce_options_panel .short,.woocommerce_options_panel input[type=text].short,.woocommerce_options_panel input[type=number].short,.woocommerce_options_panel input[type=email].short,.woocommerce_options_panel input[type=password].short{width:80%}.woocommerce_options_panel .downloadable_files,.woocommerce_variations .downloadable_files{padding:0;clear:both}.woocommerce_options_panel .downloadable_files label,.woocommerce_variations .downloadable_files label{position:static}.woocommerce_options_panel .downloadable_files table,.woocommerce_variations .downloadable_files table{margin:0 12px 24px;width:94%}.woocommerce_options_panel .downloadable_files table .sort,.woocommerce_variations .downloadable_files table .sort{visibility:hidden}.woocommerce_options_panel .woocommerce_variable_attributes .downloadable_files table,.woocommerce_variations .woocommerce_variable_attributes .downloadable_files table{margin:0 0 1em;width:100%}}@media only screen and (max-width:900px){#woocommerce-coupon-data ul.coupon_data_tabs,#woocommerce-product-data .wc-tabs-back,#woocommerce-product-data ul.product_data_tabs{width:10%}#woocommerce-coupon-data .wc-metaboxes-wrapper,#woocommerce-coupon-data .woocommerce_options_panel,#woocommerce-product-data .wc-metaboxes-wrapper,#woocommerce-product-data .woocommerce_options_panel{width:90%}#woocommerce-coupon-data ul.coupon_data_tabs li a,#woocommerce-product-data ul.product_data_tabs li a{position:relative;text-indent:-999px;padding:10px}#woocommerce-coupon-data ul.coupon_data_tabs li a::before,#woocommerce-product-data ul.product_data_tabs li a::before{position:absolute;top:0;left:0;bottom:0;right:0;text-indent:0;text-align:center;line-height:40px;width:100%;height:40px}}@media only screen and (max-width:782px){#wp-excerpt-media-buttons a{font-size:16px;line-height:37px;height:39px;padding:0 15px 0 20px}#wp-excerpt-editor-tools{padding-top:20px;padding-left:15px;overflow:hidden;margin-bottom:-1px}.post-type-product .wp-list-table .is-expanded td:not(.hidden),.post-type-shop_order .wp-list-table .is-expanded td:not(.hidden){overflow:visible}#woocommerce-product-data .checkbox{width:25px}.variations-pagenav{float:none;text-align:center;font-size:18px}.variations-pagenav .displaying-num{font-size:16px}.variations-pagenav a{padding:8px 20px 11px;font-size:18px}.variations-pagenav select{padding:0 20px}.variations-defaults{float:none;text-align:center;margin-top:10px}.post-type-product .wp-list-table .column-thumb{display:none;text-align:right;padding-bottom:0}.post-type-product .wp-list-table .column-thumb::before{display:none!important}.post-type-product .wp-list-table .column-thumb img{max-width:32px}.post-type-product .wp-list-table .toggle-row{top:-28px}.post-type-shop_order .wp-list-table .column-order_status{display:none;text-align:right;padding-bottom:0}.post-type-shop_order .wp-list-table .column-order_status mark{margin:0}.post-type-shop_order .wp-list-table .column-order_status::before{display:none!important}.post-type-shop_order .wp-list-table .column-customer_message,.post-type-shop_order .wp-list-table .column-order_notes{text-align:inherit}.post-type-shop_order .wp-list-table .column-order_notes .note-on{font-size:1.3em;margin:0}.post-type-shop_order .wp-list-table .toggle-row{top:-15px}}@media only screen and (max-width:500px){.woocommerce_options_panel label,.woocommerce_options_panel legend{float:none;width:auto;display:block;margin:0}.woocommerce_options_panel fieldset.form-field,.woocommerce_options_panel p.form-field{padding:5px 20px!important}}.wc-backbone-modal *{box-sizing:border-box}.wc-backbone-modal .wc-backbone-modal-content{position:fixed;background:#fff;z-index:100000;right:50%;top:50%;-webkit-transform:translate(50%,-50%);-ms-transform:translate(50%,-50%);transform:translate(50%,-50%);width:500px}.wc-backbone-modal .wc-backbone-modal-content article{overflow:auto}.wc-backbone-modal.wc-backbone-modal-shipping-method-settings .wc-backbone-modal-content{width:75%;min-width:500px}.wc-backbone-modal .select2-container{width:100%!important}.wc-backbone-modal-backdrop{position:fixed;top:0;right:0;left:0;bottom:0;min-height:360px;background:#000;opacity:.7;z-index:99900}.wc-backbone-modal-main{padding-bottom:55px}.wc-backbone-modal-main article,.wc-backbone-modal-main header{display:block;position:relative}.wc-backbone-modal-main .wc-backbone-modal-header{height:auto;background:#fcfcfc;padding:1em 1.5em;border-bottom:1px solid #ddd}.wc-backbone-modal-main .wc-backbone-modal-header h1{margin:0;font-size:18px;font-weight:700;line-height:1.5em}.wc-backbone-modal-main .wc-backbone-modal-header .modal-close-link{cursor:pointer;color:#777;height:54px;width:54px;padding:0;position:absolute;top:0;left:0;text-align:center;border:0;border-right:1px solid #ddd;background-color:transparent;-webkit-transition:color .1s ease-in-out,background .1s ease-in-out;transition:color .1s ease-in-out,background .1s ease-in-out}.wc-backbone-modal-main .wc-backbone-modal-header .modal-close-link::before{font:400 22px/50px dashicons!important;color:#666;display:block;content:'\f335';font-weight:300}.wc-backbone-modal-main .wc-backbone-modal-header .modal-close-link:focus,.wc-backbone-modal-main .wc-backbone-modal-header .modal-close-link:hover{background:#ddd;border-color:#ccc;color:#000}.wc-backbone-modal-main .wc-backbone-modal-header .modal-close-link:focus{outline:0}.wc-backbone-modal-main article{padding:1.5em}.wc-backbone-modal-main article p{margin:1.5em 0}.wc-backbone-modal-main article p:last-child,.wc-backbone-modal-main footer .inner .button{margin-bottom:0}.wc-backbone-modal-main article p:first-child{margin-top:0}.wc-backbone-modal-main article .pagination{padding:10px 0 0;text-align:center}.wc-backbone-modal-main footer{position:absolute;right:0;left:0;bottom:0;z-index:100;padding:1em 1.5em;background:#fcfcfc;border-top:1px solid #dfdfdf;box-shadow:0 -4px 4px -4px rgba(0,0,0,.1)}.select2-container .select2-selection,.select2-dropdown{border-color:#ddd}.wc-backbone-modal-main footer .inner{float:left;line-height:23px}.select2-drop,.select2-dropdown{z-index:999999!important}.select2-results{line-height:1.5em}.select2-results .select2-results__group,.select2-results .select2-results__option{margin:0;padding:8px}.select2-dropdown--below{box-shadow:0 1px 1px rgba(0,0,0,.1)}.select2-dropdown--above{box-shadow:0 -1px 1px rgba(0,0,0,.1)}.select2-container .select2-selection__rendered.ui-sortable li{cursor:move}.select2-container .select2-search__field{min-width:150px}.select2-container .select2-selection--single{height:32px}.select2-container .select2-selection--single .select2-selection__rendered{line-height:32px;padding-left:24px}.select2-container .select2-selection--single .select2-selection__arrow{left:3px;height:30px}.select2-container .select2-selection--multiple{min-height:28px;border-radius:0;line-height:1.5}.select2-container .select2-selection--multiple li{margin:0}.select2-container .select2-selection--multiple .select2-selection__choice{padding:2px 6px}.select2-container .select2-selection__clear{color:#999;margin-top:-1px}.select2-container .select2-search--inline .select2-search__field{font-family:inherit;font-size:inherit;font-weight:inherit;padding:3px 0}.woocommerce table.form-table .select2-container{min-width:400px!important}.post-type-shop_order .tablenav .actions{overflow:visible}.post-type-shop_order .tablenav input,.post-type-shop_order .tablenav select{line-height:32px;height:32px}.post-type-shop_order .tablenav .select2-container{float:right;width:200px!important;font-size:14px;vertical-align:middle;margin:1px 1px 4px 6px}
\ No newline at end of file
diff --git a/assets/css/admin.css b/assets/css/admin.css
index dc3a041e4fa..08f8975f37f 100644
--- a/assets/css/admin.css
+++ b/assets/css/admin.css
@@ -1 +1,2 @@
-@charset "UTF-8";.chosen-container,.select2-container .select2-choice,.select2-results .select2-result-label{-webkit-user-select:none;-moz-user-select:none}@-webkit-keyframes spin{100%{-webkit-transform:rotate(360deg)}}@-moz-keyframes spin{100%{-moz-transform:rotate(360deg)}}@keyframes spin{100%{-webkit-transform:rotate(360deg);-moz-transform:rotate(360deg);-ms-transform:rotate(360deg);-o-transform:rotate(360deg);transform:rotate(360deg)}}.woocommerce-checkout .form-row .chosen-container{width:100%!important}.woocommerce-checkout .form-row .chosen-container-single .chosen-single{height:28px;line-height:29px}.woocommerce-checkout .form-row .chosen-container-single .chosen-single div b{background:url(../images/chosen-sprite.png) 0 3px no-repeat!important}.woocommerce-checkout .form-row .chosen-container-active .chosen-single-with-drop div b{background-position:-18px 4px!important}.woocommerce-checkout .form-row .chosen-container-single .chosen-search input{line-height:13px;width:100%!important;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.woocommerce-checkout .form-row .chosen-container .chosen-drop{width:100%!important;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min-resolution:144dpi){.woocommerce-checkout .form-row .chosen-container-single .chosen-single div b{background-image:url(../images/chosen-sprite@2x.png)!important;background-position:0 5px!important;background-repeat:no-repeat!important;background-size:52px 37px!important}.woocommerce-checkout .form-row .chosen-container-active .chosen-single-with-drop div b{background-position:-18px 5px!important}}.chosen-container{position:relative;display:inline-block;vertical-align:middle;font-size:13px;zoom:1;user-select:none}.chosen-container .chosen-drop{position:absolute;top:100%;left:-9999px;z-index:1010;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;width:100%;border:1px solid #aaa;border-top:0;background:#fff;box-shadow:0 4px 5px rgba(0,0,0,.15)}.chosen-container.chosen-with-drop .chosen-drop{left:0}.chosen-container a{cursor:pointer}.chosen-container-single .chosen-single{position:relative;display:block;overflow:hidden;padding:0 0 0 8px;height:26px;border:1px solid #aaa;border-radius:5px;background-color:#fff;background:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#fff),color-stop(50%,#f6f6f6),color-stop(52%,#eee),color-stop(100%,#f4f4f4));background:-webkit-linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:-moz-linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:-o-linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background-clip:padding-box;box-shadow:0 0 3px #fff inset,0 1px 1px rgba(0,0,0,.1);color:#444;text-decoration:none;white-space:nowrap;line-height:26px}.chosen-container-single .chosen-default{color:#999}.chosen-container-single .chosen-single span{display:block;overflow:hidden;margin-right:26px;text-overflow:ellipsis;white-space:nowrap}.chosen-container-single .chosen-single-with-deselect span{margin-right:38px}.chosen-container-single .chosen-single abbr{position:absolute;top:6px;right:26px;display:block;width:12px;height:12px;background:url(../images/chosen-sprite.png) -42px 1px no-repeat;font-size:1px}.chosen-container-single .chosen-single abbr:hover,.chosen-container-single.chosen-disabled .chosen-single abbr:hover{background-position:-42px -10px}.chosen-container-single .chosen-single div{position:absolute;top:0;right:0;display:block;width:18px;height:100%}.chosen-container-single .chosen-single div b{display:block;width:100%;height:100%;background:url(../images/chosen-sprite.png) 0 2px no-repeat}.chosen-container-single .chosen-search{position:relative;z-index:1010;margin:0;padding:3px 4px;white-space:nowrap}.chosen-container-single .chosen-search input[type=text]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin:1px 0;padding:4px 20px 4px 5px;width:100%;height:auto;outline:0;border:1px solid #aaa;background:url(../images/chosen-sprite.png) 100% -20px no-repeat #fff;background:url(../images/chosen-sprite.png) 100% -20px no-repeat,-webkit-gradient(linear,50% 0,50% 100%,color-stop(1%,#eee),color-stop(15%,#fff));background:url(../images/chosen-sprite.png) 100% -20px no-repeat,-webkit-linear-gradient(#eee 1%,#fff 15%);background:url(../images/chosen-sprite.png) 100% -20px no-repeat,-moz-linear-gradient(#eee 1%,#fff 15%);background:url(../images/chosen-sprite.png) 100% -20px no-repeat,-o-linear-gradient(#eee 1%,#fff 15%);background:url(../images/chosen-sprite.png) 100% -20px no-repeat,linear-gradient(#eee 1%,#fff 15%);font-size:1em;font-family:sans-serif;line-height:normal;border-radius:0}.chosen-container-single .chosen-drop{margin-top:-1px;border-radius:0 0 4px 4px;background-clip:padding-box}.chosen-container-single.chosen-container-single-nosearch .chosen-search{position:absolute;left:-9999px}.chosen-container .chosen-results{position:relative;overflow-x:hidden;overflow-y:auto;margin:0 4px 4px 0;padding:0 0 0 4px;max-height:240px;-webkit-overflow-scrolling:touch}.chosen-container .chosen-results li{display:none;margin:0;padding:5px 6px;list-style:none;line-height:15px}.chosen-container .chosen-results li.active-result{display:list-item;cursor:pointer}.chosen-container .chosen-results li.disabled-result{display:list-item;color:#ccc;cursor:default}.chosen-container .chosen-results li.highlighted{background-color:#3875d7;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#3875d7),color-stop(90%,#2a62bc));background-image:-webkit-linear-gradient(#3875d7 20%,#2a62bc 90%);background-image:-moz-linear-gradient(#3875d7 20%,#2a62bc 90%);background-image:-o-linear-gradient(#3875d7 20%,#2a62bc 90%);background-image:linear-gradient(#3875d7 20%,#2a62bc 90%);color:#fff}.chosen-container .chosen-results li.no-results{display:list-item;background:#f4f4f4}.chosen-container .chosen-results li.group-result{display:list-item;font-weight:700;cursor:default}.chosen-container .chosen-results li.group-option{padding-left:15px}.chosen-container .chosen-results li em{font-style:normal;text-decoration:underline}.chosen-container-multi .chosen-choices{position:relative;overflow:hidden;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin:0;padding:0;width:100%;height:auto!important;height:1%;border:1px solid #aaa;background-color:#fff;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(1%,#eee),color-stop(15%,#fff));background-image:-webkit-linear-gradient(#eee 1%,#fff 15%);background-image:-moz-linear-gradient(#eee 1%,#fff 15%);background-image:-o-linear-gradient(#eee 1%,#fff 15%);background-image:linear-gradient(#eee 1%,#fff 15%);cursor:text}.chosen-container-multi .chosen-choices li{float:left;list-style:none}.chosen-container-multi .chosen-choices li.search-field{margin:0;padding:0;white-space:nowrap}.chosen-container-multi .chosen-choices li.search-field input[type=text]{margin:1px 0;padding:5px;height:15px;outline:0;border:0!important;background:0 0!important;box-shadow:none;color:#666;font-size:100%;font-family:sans-serif;line-height:normal;border-radius:0}.chosen-container-multi .chosen-choices li.search-field .default{color:#999}.chosen-container-multi .chosen-choices li.search-choice{position:relative;margin:3px 0 3px 5px;padding:3px 20px 3px 5px;border:1px solid #aaa;border-radius:3px;background-color:#e4e4e4;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#f4f4f4),color-stop(50%,#f0f0f0),color-stop(52%,#e8e8e8),color-stop(100%,#eee));background-image:-webkit-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-moz-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-o-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-clip:padding-box;box-shadow:0 0 2px #fff inset,0 1px 0 rgba(0,0,0,.05);color:#333;line-height:13px;cursor:default}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close{position:absolute;top:4px;right:3px;display:block;width:12px;height:12px;background:url(../images/chosen-sprite.png) -42px 1px no-repeat;font-size:1px}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover{background-position:-42px -10px}.chosen-container-multi .chosen-choices li.search-choice-disabled{padding-right:5px;border:1px solid #ccc;background-color:#e4e4e4;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#f4f4f4),color-stop(50%,#f0f0f0),color-stop(52%,#e8e8e8),color-stop(100%,#eee));background-image:-webkit-linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-moz-linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-o-linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);color:#666}.chosen-container-multi .chosen-choices li.search-choice-focus{background:#d4d4d4}.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close{background-position:-42px -10px}.chosen-container-multi .chosen-results{margin:0;padding:0}.chosen-container-multi .chosen-drop .result-selected{display:list-item;color:#ccc;cursor:default}.chosen-container-active .chosen-single{border:1px solid #5897fb;box-shadow:0 0 5px rgba(0,0,0,.3)}.chosen-container-active.chosen-with-drop .chosen-single{border:1px solid #aaa;-moz-border-radius-bottomright:0;border-bottom-right-radius:0;-moz-border-radius-bottomleft:0;border-bottom-left-radius:0;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#eee),color-stop(80%,#fff));background-image:-webkit-linear-gradient(#eee 20%,#fff 80%);background-image:-moz-linear-gradient(#eee 20%,#fff 80%);background-image:-o-linear-gradient(#eee 20%,#fff 80%);background-image:linear-gradient(#eee 20%,#fff 80%);box-shadow:0 1px 0 #fff inset}.chosen-container-active.chosen-with-drop .chosen-single div{border-left:none;background:0 0}.chosen-container-active.chosen-with-drop .chosen-single div b{background-position:-18px 2px}.chosen-container-active .chosen-choices{border:1px solid #5897fb;box-shadow:0 0 5px rgba(0,0,0,.3)}.chosen-container-active .chosen-choices li.search-field input[type=text]{color:#111!important}.chosen-disabled{opacity:.5!important;cursor:default}.chosen-disabled .chosen-choices .search-choice .search-choice-close,.chosen-disabled .chosen-single{cursor:default}.chosen-rtl{text-align:right}.chosen-rtl .chosen-single{overflow:visible;padding:0 8px 0 0}.chosen-rtl .chosen-single span{margin-right:0;margin-left:26px;direction:rtl}.chosen-rtl .chosen-single-with-deselect span{margin-left:38px}.chosen-rtl .chosen-single div{right:auto;left:3px}.chosen-rtl .chosen-single abbr{right:auto;left:26px}.chosen-rtl .chosen-choices li{float:right}.chosen-rtl .chosen-choices li.search-field input[type=text]{direction:rtl}.chosen-rtl .chosen-choices li.search-choice{margin:3px 5px 3px 0;padding:3px 5px 3px 19px}.chosen-rtl .chosen-choices li.search-choice .search-choice-close{right:auto;left:4px}.chosen-rtl .chosen-drop,.chosen-rtl.chosen-container-single-nosearch .chosen-search{left:9999px}.chosen-rtl.chosen-container-single .chosen-results{margin:0 0 4px 4px;padding:0 4px 0 0}.chosen-rtl .chosen-results li.group-option{padding-right:15px;padding-left:0}.chosen-rtl.chosen-container-active.chosen-with-drop .chosen-single div{border-right:none}.chosen-rtl .chosen-search input[type=text]{padding:4px 5px 4px 20px;background:url(../images/chosen-sprite.png) -30px -20px no-repeat #fff;background:url(../images/chosen-sprite.png) -30px -20px no-repeat,-webkit-gradient(linear,50% 0,50% 100%,color-stop(1%,#eee),color-stop(15%,#fff));background:url(../images/chosen-sprite.png) -30px -20px no-repeat,-webkit-linear-gradient(#eee 1%,#fff 15%);background:url(../images/chosen-sprite.png) -30px -20px no-repeat,-moz-linear-gradient(#eee 1%,#fff 15%);background:url(../images/chosen-sprite.png) -30px -20px no-repeat,-o-linear-gradient(#eee 1%,#fff 15%);background:url(../images/chosen-sprite.png) -30px -20px no-repeat,linear-gradient(#eee 1%,#fff 15%);direction:rtl}.chosen-rtl.chosen-container-single .chosen-single div b{background-position:6px 2px}.chosen-rtl.chosen-container-single.chosen-with-drop .chosen-single div b{background-position:-12px 2px}@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min-resolution:144dpi){.chosen-container .chosen-results-scroll-down span,.chosen-container .chosen-results-scroll-up span,.chosen-container-multi .chosen-choices .search-choice .search-choice-close,.chosen-container-single .chosen-search input[type=text],.chosen-container-single .chosen-single abbr,.chosen-container-single .chosen-single div b,.chosen-rtl .chosen-search input[type=text]{background-image:url(../images/chosen-sprite@2x.png)!important;background-size:52px 37px!important;background-repeat:no-repeat!important}}.select2-container{margin:0;position:relative;display:block!important;zoom:1;vertical-align:middle}.select2-container,.select2-drop,.select2-search,.select2-search input{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.select2-container .select2-choice{display:block;padding:0 0 0 8px;overflow:hidden;position:relative;border:1px solid #ccc;white-space:nowrap;color:#444;text-decoration:none;border-radius:3px;background-clip:padding-box;-webkit-touch-callout:none;-ms-user-select:none;user-select:none;background-color:#fff;font-weight:400}html[dir=rtl] .select2-container .select2-choice{padding:0 8px 0 0}.select2-container.select2-drop-above .select2-choice{border-bottom-color:#ccc;border-radius:0 0 4px 4px}.select2-container.select2-allowclear .select2-choice .select2-chosen{margin-right:42px}.select2-container .select2-choice>.select2-chosen{margin-right:26px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;float:none;width:auto}html[dir=rtl] .select2-container .select2-choice>.select2-chosen{margin-left:26px;margin-right:0}.select2-container .select2-choice abbr{display:none;width:12px;height:12px;position:absolute;right:24px;top:5px;font-size:1px;text-decoration:none;border:0;background:url(../images/select2.png) right top no-repeat;cursor:pointer;outline:0}.select2-container.select2-allowclear .select2-choice abbr{display:inline-block}.select2-container .select2-choice abbr:hover{background-position:right -11px;cursor:pointer}.select2-drop-mask{border:0;margin:0;padding:0;position:fixed;left:0;top:0;min-height:100%;min-width:100%;height:auto;width:auto;opacity:0;z-index:9998;background-color:#fff;filter:alpha(opacity=0)}.select2-drop{width:100%;margin-top:-1px;position:absolute;top:100%;background:#fff;color:#000;border:1px solid #ccc;border-top:0;border-radius:0 0 3px 3px}.select2-drop.select2-drop-above{margin-top:1px;border-top:1px solid #ccc;border-bottom:0;border-radius:3px 3px 0 0}.select2-drop-active{border:1px solid #666;border-top:none}.select2-drop.select2-drop-above.select2-drop-active{border-top:1px solid #666}.select2-drop-auto-width{border-top:1px solid #ccc;width:auto}.select2-drop-auto-width .select2-search{padding-top:4px}.select2-container .select2-choice .select2-arrow{display:inline-block;width:18px;height:100%;position:absolute;right:0;top:0;border-radius:0 3px 3px 0;background-clip:padding-box}html[dir=rtl] .select2-container .select2-choice .select2-arrow{left:0;right:auto;border-radius:3px 0 0 3px}.select2-container .select2-choice .select2-arrow b{display:block;width:100%;height:100%;position:relative}.select2-container .select2-choice .select2-arrow b:after{position:absolute;display:block;content:"";top:50%;left:50%;border:4px solid transparent;border-top-color:#666;margin-left:-7px;margin-top:-2px}.select2-search{display:inline-block;width:100%;margin:0;padding-left:4px;padding-right:4px;position:relative;z-index:10000;white-space:nowrap;padding-bottom:4px}.select2-search input{width:100%;height:auto!important;padding:4px 20px 4px 5px!important;margin:0;outline:0;font-family:sans-serif;font-size:1em;border:1px solid #ccc;-webkit-box-shadow:none;box-shadow:none;background:url(../images/select2.png) 100% -22px no-repeat #fff}html[dir=rtl] .select2-search input{padding:4px 5px 4px 20px;background:url(../images/select2.png) -37px -22px no-repeat #fff}.select2-drop.select2-drop-above .select2-search input{margin-top:4px}.select2-search input.select2-active{background:url(../images/select2-spinner.gif) 100% no-repeat #fff}.select2-container-active .select2-choice,.select2-container-active .select2-choices{border:1px solid #666;outline:0}.select2-dropdown-open .select2-choice{border-bottom-color:transparent;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-dropdown-open .select2-choice .select2-arrow b:after{border-top-color:transparent;border-bottom-color:#666;margin-top:-6px}.select2-dropdown-open.select2-drop-above .select2-choice,.select2-dropdown-open.select2-drop-above .select2-choices{border:1px solid #666;border-top-color:transparent}.select2-dropdown-open .select2-choice .select2-arrow{background:0 0;border-left:none;filter:none}html[dir=rtl] .select2-dropdown-open .select2-choice .select2-arrow{border-right:none}.select2-dropdown-open .select2-choice .select2-arrow b{background-position:-18px 1px}html[dir=rtl] .select2-dropdown-open .select2-choice .select2-arrow b{background-position:-16px 1px}.select2-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.select2-results{max-height:200px;padding:4px;margin:0;position:relative;overflow-x:hidden;overflow-y:auto;-webkit-tap-highlight-color:transparent;background:#fafafa}html[dir=rtl] .select2-results{padding:0 4px 0 0;margin:4px 0 4px 4px}.select2-results ul.select2-result-sub{margin:0;padding-left:0}.select2-results li{list-style:none;display:list-item;background-image:none;margin:3px 0}.select2-results li.select2-result-with-children>.select2-result-label{font-weight:700}.select2-results .select2-result-label{padding:5px 7px;margin:0;cursor:pointer;min-height:1em;-webkit-touch-callout:none;-ms-user-select:none;user-select:none}.select2-results-dept-1 .select2-result-label{padding-left:20px}.select2-results-dept-2 .select2-result-label{padding-left:40px}.select2-results-dept-3 .select2-result-label{padding-left:60px}.select2-results-dept-4 .select2-result-label{padding-left:80px}.select2-results-dept-5 .select2-result-label{padding-left:100px}.select2-results-dept-6 .select2-result-label{padding-left:110px}.select2-results-dept-7 .select2-result-label{padding-left:120px}.select2-results .select2-highlighted{background:#f1f1f1;color:#000;border-radius:3px}.select2-results li em{background:#feffde;font-style:normal}.select2-results .select2-highlighted em{background:0 0}.select2-results .select2-highlighted ul{background:#fff;color:#000}.select2-results .select2-ajax-error,.select2-results .select2-no-results,.select2-results .select2-searching,.select2-results .select2-selection-limit{background:#f4f4f4;display:list-item;padding-left:5px}.select2-results .select2-disabled.select2-highlighted{color:#666;background:#f4f4f4;display:list-item;cursor:default}.select2-results .select2-disabled{background:#f4f4f4;display:list-item;cursor:default}.select2-results .select2-selected{display:none}.select2-more-results.select2-active{background:url(../images/select2-spinner.gif) 100% no-repeat #f4f4f4}.select2-results .select2-ajax-error{background:rgba(255,50,50,.2)}.select2-more-results{background:#f4f4f4;display:list-item}.select2-container.select2-container-disabled .select2-choice{background-color:#f4f4f4;background-image:none;border:1px solid #ddd;cursor:default}.select2-container.select2-container-disabled .select2-choice .select2-arrow{background-color:#f4f4f4;background-image:none;border-left:0}.select2-container.select2-container-disabled .select2-choice abbr{display:none}.select2-container-multi .select2-choices{height:auto!important;height:1%;margin:0;padding:0 5px 0 0;position:relative;border:1px solid #ccc;cursor:text;overflow:hidden;background-color:#fff;min-height:26px}html[dir=rtl] .select2-container-multi .select2-choices{padding:0 0 0 5px}.select2-locked{padding:3px 5px!important}.select2-container-multi.select2-container-active .select2-choices{border:1px solid #666;outline:0}.select2-container-multi .select2-choices li{float:left;list-style:none}html[dir=rtl] .select2-container-multi .select2-choices li{float:right}.select2-container-multi .select2-choices .select2-search-field{margin:0;padding:0;white-space:nowrap}.select2-container-multi .select2-choices .select2-search-field input{margin:1px 0;outline:0;border:0;-webkit-box-shadow:none;box-shadow:none;background:0 0!important}.select2-container-multi .select2-choices .select2-search-field input.select2-active{background:url(../images/select2-spinner.gif) 100% no-repeat #fff!important}.select2-default{color:#999!important}.select2-container-multi .select2-choices .select2-search-choice{padding:5px 8px 5px 24px;margin:3px 0 3px 5px;position:relative;line-height:15px;color:#333;cursor:default;border-radius:2px;background-clip:padding-box;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:#e4e4e4}html[dir=rtl] .select2-container-multi .select2-choices .select2-search-choice{margin:3px 5px 3px 0;padding:5px 24px 5px 8px}.select2-container-multi .select2-choices .select2-search-choice .select2-chosen{cursor:default}.select2-container-multi .select2-choices .select2-search-choice-focus{background:#d4d4d4}.select2-search-choice-close{display:block;width:12px;height:13px;position:absolute;right:7px;top:6px;font-size:1px;outline:0;background:url(../images/select2.png) right top no-repeat}html[dir=rtl] .select2-search-choice-close{right:auto;left:7px}.select2-container-multi .select2-search-choice-close{left:7px}html[dir=rtl] .select2-container-multi .select2-search-choice-close{left:auto;right:7px}.select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover,.select2-container-multi .select2-choices .select2-search-choice-focus .select2-search-choice-close{background-position:right -11px}.select2-container-multi.select2-container-disabled .select2-choices{background-color:#f4f4f4;background-image:none;border:1px solid #ddd;cursor:default}.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice{padding:3px 5px;border:1px solid #ddd;background-image:none;background-color:#f4f4f4}.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice .select2-search-choice-close{display:none;background:0 0}.select2-result-selectable .select2-match,.select2-result-unselectable .select2-match{text-decoration:underline}.select2-offscreen,.select2-offscreen:focus{clip:rect(0 0 0 0)!important;width:1px!important;height:1px!important;border:0!important;margin:0!important;padding:0!important;overflow:hidden!important;position:absolute!important;outline:0!important;left:0!important;top:0!important}.select2-display-none{display:none}.select2-measure-scrollbar{position:absolute;top:-10000px;left:-10000px;width:100px;height:100px;overflow:scroll}@media only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (min-resolution:2dppx){.select2-search input{background-image:url(../images/select2x2.png)!important;background-repeat:no-repeat!important;background-size:60px 40px!important;background-position:100% -21px!important}}@font-face{font-family:star;src:url(../fonts/star.eot);src:url(../fonts/star.eot?#iefix) format("embedded-opentype"),url(../fonts/star.woff) format("woff"),url(../fonts/star.ttf) format("truetype"),url(../fonts/star.svg#star) format("svg");font-weight:400;font-style:normal}@font-face{font-family:WooCommerce;src:url(../fonts/WooCommerce.eot);src:url(../fonts/WooCommerce.eot?#iefix) format("embedded-opentype"),url(../fonts/WooCommerce.woff) format("woff"),url(../fonts/WooCommerce.ttf) format("truetype"),url(../fonts/WooCommerce.svg#WooCommerce) format("svg");font-weight:400;font-style:normal}.blockUI.blockOverlay:before{height:1em;width:1em;position:absolute;top:50%;left:50%;margin-left:-.5em;margin-top:-.5em;display:block;content:"";-webkit-animation:spin 1s ease-in-out infinite;-moz-animation:spin 1s ease-in-out infinite;animation:spin 1s ease-in-out infinite;background:url(../images/icons/loader.svg) center center;background-size:cover;line-height:1;text-align:center;font-size:2em;color:rgba(0,0,0,.75)}.button.wc-reload:after,.woocommerce-help-tip:after{top:0;left:0;-webkit-font-smoothing:antialiased;text-align:center}.wc_addons_wrap .products{overflow:hidden}.wc_addons_wrap .products li{float:left;margin:0 1em 1em 0!important;padding:0;vertical-align:top;width:300px}.wc_addons_wrap .products li a{text-decoration:none;color:inherit;border:1px solid #ddd;display:block;min-height:220px;overflow:hidden;background:#f5f5f5;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2),inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.2),inset 0 -1px 0 rgba(0,0,0,.1)}.wc_addons_wrap .products li a img{max-width:258px;max-height:24px;padding:17px 20px;display:block;margin:0;background:#fff;border-right:260px solid #fff}.wc_addons_wrap .products li a .price,.wc_addons_wrap .products li a img.extension-thumb+h3{display:none}.wc_addons_wrap .products li a h3{margin:0!important;padding:20px!important;background:#fff}.wc_addons_wrap .products li a p{padding:20px!important;margin:0!important;border-top:1px solid #f1f1f1}.wc_addons_wrap .products li a:focus,.wc_addons_wrap .products li a:hover{background-color:#fff}.wc_addons_wrap .storefront{background:url(../images/storefront-bg.jpg) bottom right #f6f6f6;border:1px solid #ddd;padding:20px;overflow:hidden;zoom:1}.wc_addons_wrap .storefront img{width:278px;height:auto;float:left;margin:0 20px 0 0;box-shadow:0 1px 6px rgba(0,0,0,.1)}.wc_addons_wrap .storefront p{max-width:750px}.woocommerce-message{position:relative;border-left-color:#cc99c2!important;overflow:hidden}.woocommerce-message a.button-primary,.woocommerce-message button.button-primary{background:#bb77ae;border-color:#aa559a;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 rgba(0,0,0,.15);color:#fff;text-decoration:none!important;text-shadow:0 -1px 1px #8a4f7f,1px 0 1px #8a4f7f,0 1px 1px #8a4f7f,-1px 0 1px #8a4f7f}.woocommerce-message a.button-primary:hover,.woocommerce-message button.button-primary:hover{background:#c480b7;border-color:#aa559a;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 rgba(0,0,0,.15)}.woocommerce-message a.button-primary:active,.woocommerce-message button.button-primary:active{background:#aa559a;border-color:#873A79;-webkit-box-shadow:inset 0 2px 0 #873A79;box-shadow:inset 0 2px 0 #873A79}.woocommerce-message a.button-primary:focus,.woocommerce-message button.button-primary:focus{background:#bb77ae;border-color:#aa559a;-webkit-box-shadow:0 1px 0 #bb77ae,0 0 2px 1px #aa559a;box-shadow:0 1px 0 #bb77ae,0 0 2px 1px #aa559a}.woocommerce-message a.docs,.woocommerce-message a.skip{opacity:.5;text-decoration:none!important}.woocommerce-message .twitter-share-button{margin-top:-3px;margin-left:3px;vertical-align:middle}#variable_product_options #message,#variable_product_options .notice{margin:10px}.clear{clear:both}#woocommerce-fields-bulk.inline-edit-col label,#woocommerce-fields.inline-edit-col{clear:left}.wrap.woocommerce div.error,.wrap.woocommerce div.updated{margin-top:10px}mark.amount{background:0 0;color:inherit}.postbox,.woocommerce{input:invalid;input-border:1px solid #cc010b;input-background:#ffebe8}.simplify-commerce-banner{overflow:hidden}.simplify-commerce-banner img{float:right;padding:15px 0;margin-left:1em;width:200px}.woocommerce-help-tip{color:#666;display:inline-block;font-size:13px;font-style:normal;height:16px;line-height:16px;position:relative;vertical-align:middle;width:16px}.woocommerce-help-tip:after{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;margin:0;text-indent:0;position:absolute;width:100%;height:100%;content:"";cursor:help}table.wc_status_table{margin-bottom:1em}table.wc_status_table tr:nth-child(2n) td,table.wc_status_table tr:nth-child(2n) th{background:#fcfcfc}table.wc_status_table th{font-weight:700;padding:9px}table.wc_status_table td:first-child{width:33%}table.wc_status_table td.help{width:1em}table.wc_status_table td{padding:9px;font-size:1.1em}table.wc_status_table td mark{background:0 0}table.wc_status_table td mark.yes{color:#7ad03a}table.wc_status_table td mark.no{color:#999}table.wc_status_table td mark.error{color:#a00}table.wc_status_table td ul{margin:0}table.wc_status_table .help_tip{cursor:help}#debug-report{display:none;margin:10px 0;padding:0;position:relative}#debug-report textarea{font-family:monospace;width:100%;margin:0;height:300px;padding:20px;-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;resize:none;font-size:12px;line-height:20px;outline:0}#log-viewer-select{padding:10px 0 8px;line-height:180%}#log-viewer textarea{width:100%;resize:vertical}.inline-edit-product.quick-edit-row .inline-edit-col-center,.inline-edit-product.quick-edit-row .inline-edit-col-right{float:right!important}#woocommerce-fields.inline-edit-col label.featured,#woocommerce-fields.inline-edit-col label.manage_stock{margin-left:10px}#woocommerce-fields.inline-edit-col .dimensions div{display:block;margin:.2em 0}#woocommerce-fields.inline-edit-col .dimensions div span.title{display:block;float:left;width:5em}#woocommerce-fields.inline-edit-col .dimensions div span.input-text-wrap{display:block;margin-left:5em}#woocommerce-fields.inline-edit-col .text{box-sizing:border-box;width:99%;float:left;margin:1px 1% 1px 1px}#woocommerce-fields.inline-edit-col .height,#woocommerce-fields.inline-edit-col .length,#woocommerce-fields.inline-edit-col .width{width:32.33%}#woocommerce-fields.inline-edit-col .height{margin-right:0}#woocommerce-fields-bulk.inline-edit-col .inline-edit-group label{clear:none;width:49%;margin:.2em 0}#woocommerce-fields-bulk.inline-edit-col .inline-edit-group.dimensions label{width:75%;max-width:75%}#woocommerce-fields-bulk.inline-edit-col .length,#woocommerce-fields-bulk.inline-edit-col .regular_price,#woocommerce-fields-bulk.inline-edit-col .sale_price,#woocommerce-fields-bulk.inline-edit-col .stock,#woocommerce-fields-bulk.inline-edit-col .weight{box-sizing:border-box;width:100%;margin-left:4.4em}#woocommerce-fields-bulk.inline-edit-col .height,#woocommerce-fields-bulk.inline-edit-col .length,#woocommerce-fields-bulk.inline-edit-col .width{box-sizing:border-box;width:25%}.column-coupon_code{line-height:2.25em}.column-coupon_code,ul.wc_coupon_list{margin:0;overflow:hidden;zoom:1;clear:both}ul.wc_coupon_list li{margin:0}ul.wc_coupon_list li.code{display:inline-block}ul.wc_coupon_list li.code:after{content:", "}ul.wc_coupon_list li.code:last-of-type:after{display:none}ul.wc_coupon_list li.code .tips{cursor:pointer}ul.wc_coupon_list_block{margin:0;padding-bottom:2px}ul.wc_coupon_list_block li{border-top:1px solid #fff;border-bottom:1px solid #ccc;line-height:2.5em;margin:0;padding:.5em 0}ul.wc_coupon_list_block li:first-child{border-top:0;padding-top:0}ul.wc_coupon_list_block li:last-child{border-bottom:0;padding-bottom:0}.button.wc-reload{text-indent:-9999px;position:relative;padding:0;-webkit-border-radius:100%;border-radius:100%;height:24px;width:24px!important;display:inline-block}.button.wc-reload:after{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;margin:0;text-indent:0;position:absolute;width:100%;height:100%;content:"";line-height:22px}#order_data h2,#order_data p.order_number{font-family:HelveticaNeue-Light,"Helvetica Neue Light","Helvetica Neue",sans-serif;font-weight:400}.tablenav .actions{overflow:visible}.tablenav .select2-container{float:left;max-width:200px;font-size:14px;vertical-align:middle;margin:1px 6px 1px 1px}#woocommerce-order-data .handlediv,#woocommerce-order-data .hndle{display:none}#woocommerce-order-data .inside{display:block!important}#order_data{padding:23px 24px 12px}#order_data h2{margin:0;font-size:21px;line-height:1.2;text-shadow:1px 1px 1px #fff;padding:0}#order_data h4{color:#333;margin:1.33em 0 0}#order_data p{color:#777}#order_data p.order_number{margin:0;line-height:1.6em;font-size:16px}#order_data .order_data_column_container{clear:both}#order_data .order_data_column{width:32%;padding:0 2% 0 0;float:left}#order_data .order_data_column:last-child{padding-right:0}#order_data .order_data_column p{padding:0!important}#order_data .order_data_column .address strong{display:block}#order_data .order_data_column .form-field{float:left;width:48%;padding:0;margin:9px 0 0}#order_data .order_data_column .form-field label{display:block;padding:0 0 3px}#order_data .order_data_column .form-field input,#order_data .order_data_column .form-field select,#order_data .order_data_column .form-field textarea{width:100%}#order_data .order_data_column .form-field .select2-container{width:100%!important}#order_data .order_data_column .form-field .date-picker{width:50%}#order_data .order_data_column .form-field .hour,#order_data .order_data_column .form-field .minute{width:2.5em}#order_data .order_data_column .form-field small{display:block;margin:5px 0 0;color:#999}#order_data .order_data_column .form-field.last{float:right}#order_data .order_data_column .form-field-wide{width:100%;clear:both}#order_data .order_data_column .form-field-wide .wc-customer-search,#order_data .order_data_column .form-field-wide .wc-enhanced-select,#order_data .order_data_column .form-field-wide input,#order_data .order_data_column .form-field-wide select,#order_data .order_data_column .form-field-wide textarea{width:100%}#order_data .order_data_column p.none_set{color:#999}#order_data .order_data_column ._billing_address_1_field,#order_data .order_data_column ._billing_city_field,#order_data .order_data_column ._billing_country_field,#order_data .order_data_column ._billing_email_field,#order_data .order_data_column ._billing_first_name_field,#order_data .order_data_column ._shipping_address_1_field,#order_data .order_data_column ._shipping_city_field,#order_data .order_data_column ._shipping_country_field,#order_data .order_data_column ._shipping_first_name_field{float:left}#order_data .order_data_column ._billing_address_2_field,#order_data .order_data_column ._billing_last_name_field,#order_data .order_data_column ._billing_phone_field,#order_data .order_data_column ._billing_postcode_field,#order_data .order_data_column ._billing_state_field,#order_data .order_data_column ._shipping_address_2_field,#order_data .order_data_column ._shipping_last_name_field,#order_data .order_data_column ._shipping_postcode_field,#order_data .order_data_column ._shipping_state_field,#order_data .order_data_column .wc-customer-user label a,#order_data .order_data_column .wc-order-status label a{float:right}#order_data .order_data_column ._billing_company_field,#order_data .order_data_column ._shipping_company_field,#order_data .order_data_column ._transaction_id_field{clear:both;width:100%}#order_data .order_data_column ._billing_email_field{clear:left}#order_data .order_data_column div.edit_address{display:none;zoom:1;padding-right:1px}#order_data .order_data_column .billing-same-as-shipping,#order_data .order_data_column .load_customer_billing,#order_data .order_data_column .load_customer_shipping,#order_data .order_data_column a.edit_address{width:14px;height:0;padding:14px 0 0;margin:0 0 0 6px;overflow:hidden;position:relative;color:#999;border:0;float:right}#order_data .order_data_column .billing-same-as-shipping:focus,#order_data .order_data_column .billing-same-as-shipping:hover,#order_data .order_data_column .load_customer_billing:focus,#order_data .order_data_column .load_customer_billing:hover,#order_data .order_data_column .load_customer_shipping:focus,#order_data .order_data_column .load_customer_shipping:hover,#order_data .order_data_column a.edit_address:focus,#order_data .order_data_column a.edit_address:hover{color:#000}#order_data .order_data_column .billing-same-as-shipping:after,#order_data .order_data_column .load_customer_billing:after,#order_data .order_data_column .load_customer_shipping:after,#order_data .order_data_column a.edit_address:after{font-family:WooCommerce;position:absolute;top:0;left:0;text-align:center;vertical-align:top;line-height:14px;font-size:14px;font-weight:400;-webkit-font-smoothing:antialiased}#order_data .order_data_column .billing-same-as-shipping:after{content:"\e008"}#order_data .order_data_column .load_customer_billing:after,#order_data .order_data_column .load_customer_shipping:after{content:"\e03a"}#order_data .order_data_column a.edit_address:after{content:"\e603"}.order_actions{margin:0;overflow:hidden;zoom:1}.order_actions li{border-top:1px solid #fff;border-bottom:1px solid #ddd;padding:6px 0;margin:0;line-height:1.6em;float:left;width:50%;text-align:center}.order_actions li a{float:none;text-align:center;text-decoration:underline}.order_actions li.wide{width:auto;float:none;clear:both;padding:6px;text-align:left;overflow:hidden}.order_actions li #delete-action{line-height:25px;vertical-align:middle;text-align:left;float:left}.order_actions li .save_order{float:right}.order_actions li#actions{overflow:hidden}.order_actions li#actions .button{width:24px;box-sizing:border-box;float:right}.order_actions li#actions select{width:225px;box-sizing:border-box;float:left}#woocommerce-order-items .inside{margin:0;padding:0;background:#fefefe}#woocommerce-order-items .wc-order-data-row{border-bottom:1px solid #DFDFDF;padding:12px;background:#f8f8f8;line-height:2em;text-align:right}#woocommerce-order-items .wc-order-data-row:after,#woocommerce-order-items .wc-order-data-row:before{content:" ";display:table}#woocommerce-order-items .wc-order-data-row:after{clear:both}#woocommerce-order-items .wc-order-data-row p{margin:0;line-height:2em}#woocommerce-order-items .wc-order-data-row .wc-used-coupons{text-align:left}#woocommerce-order-items .wc-order-data-row .wc-used-coupons .tips{display:inline-block}#woocommerce-order-items .wc-order-bulk-actions{background:#fefefe;vertical-align:top;border-top:0}#woocommerce-order-items .wc-order-bulk-actions select{vertical-align:top}#woocommerce-order-items .wc-order-bulk-actions p.bulk-actions{float:left}#woocommerce-order-items .wc-order-add-item{background:#fff;vertical-align:top;border-top:none}#woocommerce-order-items .wc-order-add-item .add_item_id,#woocommerce-order-items .wc-order-add-item .select2-container{vertical-align:top}#woocommerce-order-items .wc-order-add-item .add_item_id .search-field input,#woocommerce-order-items .wc-order-add-item .select2-container .search-field input{min-width:100px}#woocommerce-order-items .wc-order-add-item .select2-container{width:400px!important;text-align:left}#woocommerce-order-items .wc-order-add-item .calculate-action,#woocommerce-order-items .wc-order-add-item .cancel-action,#woocommerce-order-items .wc-order-add-item .save-action{float:left;margin-right:2px}#woocommerce-order-items .wc-used-coupons{float:left;width:50%}#woocommerce-order-items .wc-order-totals{float:right;width:50%;margin:0;padding:0}#woocommerce-order-items .wc-order-totals .amount{font-weight:700}#woocommerce-order-items .wc-order-totals .label{vertical-align:top}#woocommerce-order-items .wc-order-totals .total{font-size:1em!important;width:10em;margin:0 0 0 .5em;box-sizing:border-box}#woocommerce-order-items .wc-order-totals .total input[type=text]{width:96%;float:right}#woocommerce-order-items .wc-order-totals .refunded-total{color:#a00}#woocommerce-order-items .refund-actions{margin-top:5px;padding-top:12px;border-top:1px solid #DFDFDF}#woocommerce-order-items .refund-actions .button{float:right;margin-left:4px}#woocommerce-order-items .refund-actions .cancel-action{float:left;margin-left:0}#woocommerce-order-items .add_meta{margin-left:0!important}#woocommerce-order-items h3 small{color:#999}#woocommerce-order-items .amount{white-space:nowrap}#woocommerce-order-items .add-items .description{margin-right:10px}.woocommerce_order_items_wrapper{margin:0;overflow:auto}.woocommerce_order_items_wrapper table.woocommerce_order_items{width:100%;background:#fff}.woocommerce_order_items_wrapper table.woocommerce_order_items thead th{background:#f8f8f8;padding:8px;font-size:11px;text-align:left;color:#555;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.woocommerce_order_items_wrapper table.woocommerce_order_items thead th:last-child{padding-right:12px}.woocommerce_order_items_wrapper table.woocommerce_order_items thead th:first-child{padding-left:12px}.woocommerce_order_items_wrapper table.woocommerce_order_items thead th.sortable{cursor:pointer}.woocommerce_order_items_wrapper table.woocommerce_order_items tbody th,.woocommerce_order_items_wrapper table.woocommerce_order_items td{padding:8px;text-align:left;line-height:26px;vertical-align:top;border-bottom:1px dotted #ececec}.woocommerce_order_items_wrapper table.woocommerce_order_items tbody th textarea,.woocommerce_order_items_wrapper table.woocommerce_order_items td textarea{width:100%}.woocommerce_order_items_wrapper table.woocommerce_order_items tbody th select,.woocommerce_order_items_wrapper table.woocommerce_order_items td select{width:50%}.woocommerce_order_items_wrapper table.woocommerce_order_items tbody th input,.woocommerce_order_items_wrapper table.woocommerce_order_items tbody th textarea,.woocommerce_order_items_wrapper table.woocommerce_order_items td input,.woocommerce_order_items_wrapper table.woocommerce_order_items td textarea{font-size:14px;padding:4px;color:#555}.woocommerce_order_items_wrapper table.woocommerce_order_items tbody th:last-child,.woocommerce_order_items_wrapper table.woocommerce_order_items td:last-child{padding-right:12px}.woocommerce_order_items_wrapper table.woocommerce_order_items tbody th:first-child,.woocommerce_order_items_wrapper table.woocommerce_order_items td:first-child{padding-left:12px}.woocommerce_order_items_wrapper table.woocommerce_order_items tbody tr:last-child td{border-bottom:1px solid #dfdfdf}.woocommerce_order_items_wrapper table.woocommerce_order_items tbody tr:first-child td{border-top:8px solid #f8f8f8}.woocommerce_order_items_wrapper table.woocommerce_order_items tbody#order_line_items tr:first-child td{border-top:none}.woocommerce_order_items_wrapper table.woocommerce_order_items td.check-column{padding:8px 8px 8px 12px;width:1%}.woocommerce_order_items_wrapper table.woocommerce_order_items .item{min-width:200px}.woocommerce_order_items_wrapper table.woocommerce_order_items .center,.woocommerce_order_items_wrapper table.woocommerce_order_items .variation-id{text-align:center}.woocommerce_order_items_wrapper table.woocommerce_order_items .cost,.woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost,.woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost,.woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax,.woocommerce_order_items_wrapper table.woocommerce_order_items .quantity,.woocommerce_order_items_wrapper table.woocommerce_order_items .tax,.woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class{text-align:right}.woocommerce_order_items_wrapper table.woocommerce_order_items .cost label,.woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost label,.woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost label,.woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax label,.woocommerce_order_items_wrapper table.woocommerce_order_items .quantity label,.woocommerce_order_items_wrapper table.woocommerce_order_items .tax label,.woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class label{white-space:nowrap;color:#999;font-size:.833em}.woocommerce_order_items_wrapper table.woocommerce_order_items .cost label input,.woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost label input,.woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost label input,.woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax label input,.woocommerce_order_items_wrapper table.woocommerce_order_items .quantity label input,.woocommerce_order_items_wrapper table.woocommerce_order_items .tax label input,.woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class label input{display:inline}.woocommerce_order_items_wrapper table.woocommerce_order_items .cost input,.woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost input,.woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost input,.woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax input,.woocommerce_order_items_wrapper table.woocommerce_order_items .quantity input,.woocommerce_order_items_wrapper table.woocommerce_order_items .tax input,.woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class input{width:70px;vertical-align:middle;text-align:right}.woocommerce_order_items_wrapper table.woocommerce_order_items .cost select,.woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost select,.woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost select,.woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax select,.woocommerce_order_items_wrapper table.woocommerce_order_items .quantity select,.woocommerce_order_items_wrapper table.woocommerce_order_items .tax select,.woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class select{width:85px;height:26px;vertical-align:middle;font-size:1em}.woocommerce_order_items_wrapper table.woocommerce_order_items .cost .split-input,.woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .split-input,.woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .split-input,.woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .split-input,.woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .split-input,.woocommerce_order_items_wrapper table.woocommerce_order_items .tax .split-input,.woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .split-input{display:block;background:#fff;border:1px solid #ddd;box-shadow:inset 0 1px 2px rgba(0,0,0,.07);margin:1px;width:70px}.woocommerce_order_items_wrapper table.woocommerce_order_items .cost .split-input input,.woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .split-input input,.woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .split-input input,.woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .split-input input,.woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .split-input input,.woocommerce_order_items_wrapper table.woocommerce_order_items .tax .split-input input,.woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .split-input input{width:100%;box-sizing:border-box;border:0;box-shadow:none;margin:0;color:#555;background:0 0}.woocommerce_order_items_wrapper table.woocommerce_order_items .cost .split-input input:last-child,.woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .split-input input:last-child,.woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .split-input input:last-child,.woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .split-input input:last-child,.woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .split-input input:last-child,.woocommerce_order_items_wrapper table.woocommerce_order_items .tax .split-input input:last-child,.woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .split-input input:last-child{color:#bbb;border-top:1px dashed #ddd}.woocommerce_order_items_wrapper table.woocommerce_order_items .cost .view,.woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .view,.woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .view,.woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .view,.woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .view,.woocommerce_order_items_wrapper table.woocommerce_order_items .tax .view,.woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .view{white-space:nowrap}.woocommerce_order_items_wrapper table.woocommerce_order_items .cost del,.woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost del,.woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost del,.woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax del,.woocommerce_order_items_wrapper table.woocommerce_order_items .quantity del,.woocommerce_order_items_wrapper table.woocommerce_order_items .tax del,.woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class del{color:#ccc}.woocommerce_order_items_wrapper table.woocommerce_order_items .quantity{text-align:center}.woocommerce_order_items_wrapper table.woocommerce_order_items .quantity input{text-align:center;width:50px}.woocommerce_order_items_wrapper table.woocommerce_order_items span.subtotal{opacity:.5}.woocommerce_order_items_wrapper table.woocommerce_order_items td.tax_class,.woocommerce_order_items_wrapper table.woocommerce_order_items th.tax_class{text-align:left}.woocommerce_order_items_wrapper table.woocommerce_order_items .calculated{border-color:#ae8ca2;border-style:dotted}.woocommerce_order_items_wrapper table.woocommerce_order_items table.meta{width:100%}.woocommerce_order_items_wrapper table.woocommerce_order_items table.display_meta,.woocommerce_order_items_wrapper table.woocommerce_order_items table.meta{margin:.5em 0 0}.woocommerce_order_items_wrapper table.woocommerce_order_items table.display_meta tr th,.woocommerce_order_items_wrapper table.woocommerce_order_items table.meta tr th{border:0;padding:0 4px .5em 0;line-height:1.5em;width:20%}.woocommerce_order_items_wrapper table.woocommerce_order_items table.display_meta tr td,.woocommerce_order_items_wrapper table.woocommerce_order_items table.meta tr td{padding:0 4px .5em 0;border:0;line-height:1.5em}.woocommerce_order_items_wrapper table.woocommerce_order_items table.display_meta tr td input,.woocommerce_order_items_wrapper table.woocommerce_order_items table.meta tr td input{width:100%;margin:0;position:relative;border-bottom:0;box-shadow:none}.woocommerce_order_items_wrapper table.woocommerce_order_items table.display_meta tr td textarea,.woocommerce_order_items_wrapper table.woocommerce_order_items table.meta tr td textarea{width:100%;height:4em;margin:0;box-shadow:none}.woocommerce_order_items_wrapper table.woocommerce_order_items table.display_meta tr td input:focus+textarea,.woocommerce_order_items_wrapper table.woocommerce_order_items table.meta tr td input:focus+textarea{border-top-color:#999}.woocommerce_order_items_wrapper table.woocommerce_order_items table.display_meta tr td p,.woocommerce_order_items_wrapper table.woocommerce_order_items table.meta tr td p{margin:0 0 .5em;line-height:1.5em}.woocommerce_order_items_wrapper table.woocommerce_order_items table.display_meta tr td p:last-child,.woocommerce_order_items_wrapper table.woocommerce_order_items table.meta tr td p:last-child{margin:0}.woocommerce_order_items_wrapper table.woocommerce_order_items .thumb{text-align:left;width:27px}.wc-order-items-editable .delete-order-item:before,.wc-order-items-editable .delete_refund:before,.wc-order-items-editable .edit-order-item:before,.woocommerce_order_items_wrapper table.woocommerce_order_items tr.fee .thumb div:before,.woocommerce_order_items_wrapper table.woocommerce_order_items tr.refund .thumb div:before,.woocommerce_order_items_wrapper table.woocommerce_order_items tr.shipping .thumb div:before{-webkit-font-smoothing:antialiased;top:0;left:0;text-align:center;font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1}.woocommerce_order_items_wrapper table.woocommerce_order_items .thumb a{display:block}.woocommerce_order_items_wrapper table.woocommerce_order_items .thumb img{padding:1px;margin:0;border:1px solid #dfdfdf;vertical-align:middle;width:21px;height:21px}.woocommerce_order_items_wrapper table.woocommerce_order_items .refund_by,ul.order_notes li p.meta .exact-date{border-bottom:1px dotted #999}.woocommerce_order_items_wrapper table.woocommerce_order_items tr.fee .thumb div{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;font-size:14px;margin:6px}.woocommerce_order_items_wrapper table.woocommerce_order_items tr.fee .thumb div:before{margin:0;text-indent:0;position:absolute;width:100%;height:100%;content:"";color:#bbb}.woocommerce_order_items_wrapper table.woocommerce_order_items tr.refund .thumb div{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;font-size:14px;margin:6px}.woocommerce_order_items_wrapper table.woocommerce_order_items tr.refund .thumb div:before{margin:0;text-indent:0;position:absolute;width:100%;height:100%;content:"";color:#bbb}.woocommerce_order_items_wrapper table.woocommerce_order_items tr.shipping .thumb div{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;font-size:14px;margin:6px}.woocommerce_order_items_wrapper table.woocommerce_order_items tr.shipping .thumb div:before{margin:0;text-indent:0;position:absolute;width:100%;height:100%;content:"";color:#bbb}.woocommerce_order_items_wrapper table.woocommerce_order_items th.line_tax{white-space:nowrap}.woocommerce_order_items_wrapper table.woocommerce_order_items td.line_tax,.woocommerce_order_items_wrapper table.woocommerce_order_items th.line_tax{padding:8px 16px 8px 8px}.woocommerce_order_items_wrapper table.woocommerce_order_items td.line_tax .delete-order-tax,.woocommerce_order_items_wrapper table.woocommerce_order_items th.line_tax .delete-order-tax{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;font-size:12px;visibility:hidden;float:right;margin:2px -16px 0 0}.woocommerce_order_items_wrapper table.woocommerce_order_items td.line_tax .delete-order-tax:before,.woocommerce_order_items_wrapper table.woocommerce_order_items th.line_tax .delete-order-tax:before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;content:"";color:#fff;background-color:#000;-webkit-border-radius:100%;border-radius:100%;border:1px solid #000;box-shadow:0 1px 2px rgba(0,0,0,.2)}.woocommerce_order_items_wrapper table.woocommerce_order_items td.line_tax .delete-order-tax:hover:before,.woocommerce_order_items_wrapper table.woocommerce_order_items th.line_tax .delete-order-tax:hover:before{border-color:#a00;background-color:#a00}.woocommerce_order_items_wrapper table.woocommerce_order_items td.line_tax:hover .delete-order-tax,.woocommerce_order_items_wrapper table.woocommerce_order_items th.line_tax:hover .delete-order-tax{visibility:visible}.woocommerce_order_items_wrapper table.woocommerce_order_items small.refunded{display:block;color:#a00;white-space:nowrap}.wc-order-items-editable .edit-order-item{text-indent:-9999px;position:relative;height:1em;width:1em;display:inline-block;margin:0 .5em 0 0}.wc-order-items-editable .edit-order-item:before{margin:0;text-indent:0;position:absolute;width:100%;height:100%;content:"";content:"\e603";color:#999}.wc-order-items-editable .edit-order-item:hover:before{color:#555}.wc-order-items-editable .delete-order-item,.wc-order-items-editable .delete_refund{text-indent:-9999px;position:relative;height:1em;width:1em;display:inline-block;margin:0}.wc-order-items-editable .delete-order-item:before,.wc-order-items-editable .delete_refund:before{margin:0;text-indent:0;position:absolute;width:100%;height:100%;content:"";content:"\e013";color:#999}.wc-order-items-editable .delete-order-item:hover:before,.wc-order-items-editable .delete_refund:hover:before{color:#a00}.wc-order-items-editable .wc-order-edit-line-item-actions{width:2.5em;text-align:right}.wc-order-items-editable .wc-order-totals .wc-order-edit-line-item-actions{width:1.5em}.wc-order-items-editable .wc-order-totals .edit-order-item{margin:0}#woocommerce-order-downloads .buttons{float:left;padding:0;margin:0;vertical-align:top}#woocommerce-order-downloads .buttons .add_item_id,#woocommerce-order-downloads .buttons .select2-container{width:400px!important;margin-right:9px;vertical-align:top;float:left}#woocommerce-order-downloads .buttons button{margin:2px 0 0}#woocommerce-order-downloads h3 small{color:#999}#poststuff #woocommerce-order-actions .inside{margin:0;padding:0}#poststuff #woocommerce-order-actions .inside ul.order_actions li{padding:6px 10px;box-sizing:border-box}#poststuff #woocommerce-order-actions .inside ul.order_actions li:last-child{border-bottom:0}#poststuff #woocommerce-order-notes .inside{margin:0;padding:0}#poststuff #woocommerce-order-notes .inside ul.order_notes li{padding:0 10px}#woocommerce_customers p.search-box{margin:6px 0 4px;float:left}#woocommerce_customers .tablenav{float:right;clear:none}.widefat.customers td{vertical-align:middle;padding:4px 7px}.widefat .column-order_title{width:15%}.widefat .column-order_title time{display:block;color:#999;margin:3px 0}.widefat .column-orders,.widefat .column-paying,.widefat .column-spent{text-align:center;width:8%}.widefat .column-last_order{width:11%}.widefat .column-order_actions,.widefat .column-user_actions,.widefat .column-wc_actions{width:110px}.widefat .column-order_actions a.button,.widefat .column-user_actions a.button,.widefat .column-wc_actions a.button{float:left;margin:0 4px 2px 0;cursor:pointer;padding:3px 4px;height:auto}.widefat .column-order_actions a.button img,.widefat .column-user_actions a.button img,.widefat .column-wc_actions a.button img{display:block;width:12px;height:auto}.widefat small.meta{display:block;color:#999;font-size:inherit;margin:3px 0}.widefat .column-order_date,.widefat .column-order_total{width:9%}.widefat .column-order_status{width:45px;text-align:center}.widefat .column-order_status mark{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;background:0 0;font-size:1.4em;margin:0 auto}.widefat .column-order_status mark.cancelled:after,.widefat .column-order_status mark.completed:after,.widefat .column-order_status mark.failed:after,.widefat .column-order_status mark.on-hold:after,.widefat .column-order_status mark.pending:after,.widefat .column-order_status mark.processing:after,.widefat .column-order_status mark.refunded:after{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center}.column-customer_message .note-on:after,.column-order_notes .note-on:after{speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;top:0;left:0;text-align:center;line-height:16px;font-family:WooCommerce}.widefat .column-order_status mark.pending:after{content:"\e012";color:#ffba00}.widefat .column-order_status mark.completed:after{content:"\e015";color:#2ea2cc}.widefat .column-order_status mark.on-hold:after{content:"\e033";color:#999}.widefat .column-order_status mark.failed:after{content:"\e016";color:#d0c21f}.widefat .column-order_status mark.cancelled:after{content:"\e013";color:#a00}.widefat .column-order_status mark.processing:after{content:"\e011";color:#73a724}.widefat .column-order_status mark.refunded:after{content:"\e014";color:#999}.widefat td.column-order_status{padding-top:9px}.column-customer_message .note-on{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;margin:0 auto;color:#999}.column-customer_message .note-on:after{margin:0;text-indent:0;position:absolute;width:100%;height:100%;content:""}.column-order_notes .note-on{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;margin:0 auto;color:#999}.column-order_notes .note-on:after{margin:0;text-indent:0;position:absolute;width:100%;height:100%;content:""}.attributes-table .attribute-actions .configure-terms:after,.order_actions .complete:after,.order_actions .processing:after,.order_actions .view:after,.user_actions .edit:after,.user_actions .link:after,.user_actions .refresh:after,.user_actions .view:after{speak:none;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;top:0;left:0;line-height:1.85;margin:0;text-align:center;font-weight:400}.order_actions .complete,.order_actions .processing,.order_actions .view{display:block;text-indent:-9999px;position:relative;padding:0!important;height:2em!important;width:2em}.order_actions .complete:after,.order_actions .processing:after,.order_actions .view:after{font-family:WooCommerce;text-indent:0;position:absolute;width:100%;height:100%}.order_actions .processing:after{content:"\e00f"}.order_actions .complete:after{content:"\e017"}.order_actions .view:after{content:"\e010"}.user_actions .edit,.user_actions .link,.user_actions .refresh,.user_actions .view{display:block;text-indent:-9999px;position:relative;padding:0!important;height:2em!important;width:2em}.user_actions .edit:after,.user_actions .link:after,.user_actions .refresh:after,.user_actions .view:after{font-family:WooCommerce;text-indent:0;position:absolute;width:100%;height:100%}.user_actions .edit:after{content:"\e603"}.user_actions .link:after{content:"\e00d"}.user_actions .view:after{content:"\e010"}.user_actions .refresh:after{content:"\e031"}.attributes-table td,.attributes-table th{width:15%;vertical-align:top}.attributes-table .attribute-terms{width:32%}.attributes-table .attribute-actions{width:2em}.attributes-table .attribute-actions .configure-terms{display:block;text-indent:-9999px;position:relative;padding:0!important;height:2em!important;width:2em}.attributes-table .attribute-actions .configure-terms:after{text-indent:0;position:absolute;width:100%;height:100%;content:"";font-family:Dashicons}ul.order_notes{padding:2px 0 0}ul.order_notes li .note_content{padding:10px;background:#efefef;position:relative}ul.order_notes li .note_content p{margin:0;padding:0;word-wrap:break-word}ul.order_notes li p.meta{padding:10px;color:#999;margin:0;font-size:11px}ul.order_notes li a.delete_note{color:#a00}table.wp-list-table .row-actions,table.wp-list-table span.na{color:#999}ul.order_notes li .note_content:after{content:"";display:block;position:absolute;bottom:-10px;left:20px;width:0;height:0;border-width:10px 10px 0 0;border-style:solid;border-color:#efefef transparent}ul.order_notes li.customer-note .note_content{background:#d7cad2}ul.order_notes li.customer-note .note_content:after{border-color:#d7cad2 transparent}.add_note{border-top:1px solid #ddd;padding:10px 10px 0}.add_note h4{margin-top:5px!important}.add_note #add_order_note{width:100%;height:50px}table.wp-list-table .column-thumb{width:52px;text-align:center;white-space:nowrap}table.wp-list-table .column-name{width:22%}table.wp-list-table .column-product_cat,table.wp-list-table .column-product_tag{width:11%!important}table.wp-list-table .column-featured,table.wp-list-table .column-product_type{width:48px;text-align:left!important}table.wp-list-table .column-customer_message,table.wp-list-table .column-order_notes{width:48px;text-align:center}table.wp-list-table .column-customer_message img,table.wp-list-table .column-order_notes img{margin:0 auto;padding-top:0!important}table.wp-list-table .manage-column.column-featured img,table.wp-list-table .manage-column.column-product_type img{padding-left:2px}table.wp-list-table .column-price .woocommerce-price-suffix{display:none}table.wp-list-table img{margin:1px 2px}table.wp-list-table td.column-thumb img{margin:0;width:auto;height:auto;max-width:40px;max-height:40px;vertical-align:middle}table.wp-list-table .column-is_in_stock{text-align:left!important}table.wp-list-table .notes_head:after,table.wp-list-table .order-notes_head:after,table.wp-list-table .status_head:after,table.wp-list-table span.product-type:before,table.wp-list-table span.wc-featured:before,table.wp-list-table span.wc-image:before,table.wp-list-table span.wc-type:before{text-align:center;line-height:1;font-family:WooCommerce;speak:none;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;top:0;left:0}table.wp-list-table span.wc-featured,table.wp-list-table span.wc-image,table.wp-list-table span.wc-type{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;margin:0 auto}table.wp-list-table span.wc-featured:before,table.wp-list-table span.wc-image:before,table.wp-list-table span.wc-type:before{font-weight:400;margin:0;text-indent:0;position:absolute;width:100%;height:100%;content:""}table.wp-list-table span.wc-featured{margin:0;cursor:pointer}table.wp-list-table span.wc-featured:before{content:"\e020"}table.wp-list-table span.wc-featured.not-featured:before{content:"\e021"}table.wp-list-table td.column-featured span.wc-featured{font-size:1.2em}table.wp-list-table span.wc-type{margin:0}table.wp-list-table span.wc-type:before{content:"\e01d"}table.wp-list-table span.product-type{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;font-size:1.2em}table.wp-list-table span.product-type:before{font-weight:400;margin:0;text-indent:0;position:absolute;width:100%;height:100%;content:""}table.wp-list-table span.product-type.grouped:before{content:"\e002"}table.wp-list-table span.product-type.external:before{content:"\e034"}table.wp-list-table span.product-type.variable:before{content:"\e003"}table.wp-list-table span.product-type.downloadable:before{content:"\e001"}table.wp-list-table span.product-type.virtual:before{content:"\e000"}table.wp-list-table mark.instock{font-weight:700;color:#7ad03a;background:0 0;line-height:1}table.wp-list-table mark.outofstock{font-weight:700;color:#a44;background:0 0;line-height:1}table.wp-list-table .notes_head,table.wp-list-table .order-notes_head,table.wp-list-table .status_head{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;margin:0 auto}table.wp-list-table .notes_head:after,table.wp-list-table .order-notes_head:after,table.wp-list-table .status_head:after{font-weight:400;margin:0;text-indent:0;position:absolute;width:100%;height:100%}table.wc_emails .wc-email-settings-table-name,table.wc_emails td.name,table.wc_gateways .wc-email-settings-table-name,table.wc_gateways td.name,table.wc_shipping .wc-email-settings-table-name,table.wc_shipping td.name{font-weight:700}table.wp-list-table .order-notes_head:after{content:"\e028"}table.wp-list-table .notes_head:after{content:"\e026"}table.wp-list-table .status_head:after{content:"\e011"}table.wp-list-table .column-order_items{width:12%}table.wp-list-table .column-order_items table.order_items{width:100%;margin:3px 0 0;padding:0;display:none}table.wp-list-table .column-order_items table.order_items td{border:0;margin:0;padding:0 0 3px}table.wp-list-table .column-order_items table.order_items td.qty{color:#999;padding-right:6px;text-align:left}mark.notice{background:#fff;color:#a00;margin:0 0 0 10px}a.export_rates,a.import_rates{float:right;margin-left:9px;margin-top:-2px;margin-bottom:0}#rates-search{float:right}#rates-search input.wc-tax-rates-search-field{padding:4px 8px;font-size:1.2em}table.wc_input_table,table.wc_tax_rates{width:100%}table.wc_input_table span.tips,table.wc_tax_rates span.tips{color:#2ea2cc}table.wc_input_table td,table.wc_tax_rates td{padding:0;border-right:1px solid #DFDFDF;border-bottom:1px solid #DFDFDF;border-top:0;background:#fff}table.wc_input_table td input[type=text],table.wc_input_table td input[type=number],table.wc_tax_rates td input[type=text],table.wc_tax_rates td input[type=number]{width:100%;padding:5px 7px;margin:0;border:0;background:0 0}table.wc_input_table td.apply_to_shipping,table.wc_input_table td.compound,table.wc_tax_rates td.apply_to_shipping,table.wc_tax_rates td.compound{padding:5px 7px;vertical-align:middle}table.wc_input_table td.apply_to_shipping input,table.wc_input_table td.compound input,table.wc_tax_rates td.apply_to_shipping input,table.wc_tax_rates td.compound input{width:auto;padding:0}table.wc_input_table td:last-child,table.wc_tax_rates td:last-child{border-right:0}table.wc_input_table tr.current td,table.wc_tax_rates tr.current td{background-color:#fefbcc}table.wc_input_table .cost,table.wc_input_table .cost input,table.wc_input_table .item_cost,table.wc_input_table .item_cost input,table.wc_tax_rates .cost,table.wc_tax_rates .cost input,table.wc_tax_rates .item_cost,table.wc_tax_rates .item_cost input{text-align:right}table.wc_input_table th.sort,table.wc_tax_rates th.sort{width:17px;padding:0 4px}table.wc_input_table td.sort,table.wc_tax_rates td.sort{padding:0 4px}table.wc_input_table .ui-sortable:not(.ui-sortable-disabled) td.sort,table.wc_tax_rates .ui-sortable:not(.ui-sortable-disabled) td.sort{cursor:move;background:#f9f9f9;text-align:center;vertical-align:middle}table.wc_input_table .ui-sortable:not(.ui-sortable-disabled) td.sort:before,table.wc_tax_rates .ui-sortable:not(.ui-sortable-disabled) td.sort:before{content:"\e032";font-family:WooCommerce;text-align:center;line-height:1;color:#999;display:block;width:17px;float:left;height:100%}table.wc_input_table .ui-sortable:not(.ui-sortable-disabled) td.sort:hover:before,table.wc_tax_rates .ui-sortable:not(.ui-sortable-disabled) td.sort:hover:before{color:#333}table.wc_input_table .button,table.wc_tax_rates .button{float:left;margin-right:5px}table.wc_input_table .export,table.wc_input_table .import,table.wc_tax_rates .export,table.wc_tax_rates .import{float:right;margin-right:0;margin-left:5px}table.wc_input_table span.tips,table.wc_tax_rates span.tips{padding:0 3px}table.wc_input_table .pagination,table.wc_tax_rates .pagination{float:right}table.wc_input_table .pagination .button,table.wc_tax_rates .pagination .button{margin-left:5px;margin-right:0}table.wc_input_table .pagination .current,table.wc_tax_rates .pagination .current{background:#bbb;text-shadow:none}table.wc_input_table tfoot th,table.wc_tax_rates tfoot th{padding-left:20px;padding-right:20px}table.wc_input_table tr:last-child td,table.wc_tax_rates tr:last-child td{border-bottom:0}table.wc_emails,table.wc_gateways,table.wc_shipping{position:relative}table.wc_emails td,table.wc_gateways td,table.wc_shipping td{vertical-align:middle;padding:7px;line-height:2em}table.wc_emails tr:nth-child(odd) td,table.wc_gateways tr:nth-child(odd) td,table.wc_shipping tr:nth-child(odd) td{background:#f9f9f9}table.wc_emails th,table.wc_gateways th,table.wc_shipping th{padding:9px 7px!important;vertical-align:middle}table.wc_emails .settings,table.wc_gateways .settings,table.wc_shipping .settings{text-align:right}table.wc_emails .default,table.wc_emails .radio,table.wc_emails .status,table.wc_gateways .default,table.wc_gateways .radio,table.wc_gateways .status,table.wc_shipping .default,table.wc_shipping .radio,table.wc_shipping .status{text-align:center}table.wc_emails .default .tips,table.wc_emails .radio .tips,table.wc_emails .status .tips,table.wc_gateways .default .tips,table.wc_gateways .radio .tips,table.wc_gateways .status .tips,table.wc_shipping .default .tips,table.wc_shipping .radio .tips,table.wc_shipping .status .tips{margin:0 auto}table.wc_emails .default input,table.wc_emails .radio input,table.wc_emails .status input,table.wc_gateways .default input,table.wc_gateways .radio input,table.wc_gateways .status input,table.wc_shipping .default input,table.wc_shipping .radio input,table.wc_shipping .status input{margin:0}table.wc_emails th.sort,table.wc_gateways th.sort,table.wc_shipping th.sort{width:28px;padding:0}table.wc_emails td.sort,table.wc_gateways td.sort,table.wc_shipping td.sort{padding:0 7px;cursor:move;text-align:center;vertical-align:middle}table.wc_emails td.sort:before,table.wc_gateways td.sort:before,table.wc_shipping td.sort:before{content:"\e032";font-family:WooCommerce;text-align:center;line-height:1;color:#ccc;display:block;width:17px;float:left;height:100%}table.wc_emails .wc-email-settings-table-name span,table.wc_gateways .wc-email-settings-table-name span,table.wc_shipping .wc-email-settings-table-name span{font-weight:400;color:#999;margin:0 0 0 4px!important}table.wc_emails .wc-email-settings-table-status,table.wc_gateways .wc-email-settings-table-status,table.wc_shipping .wc-email-settings-table-status{text-align:center;width:1em}table.wc_emails .wc-email-settings-table-status .tips,table.wc_gateways .wc-email-settings-table-status .tips,table.wc_shipping .wc-email-settings-table-status .tips{margin:0 auto}table.wc_emails .wc-email-settings-table-actions a,table.wc_gateways .wc-email-settings-table-actions a,table.wc_shipping .wc-email-settings-table-actions a{display:block;text-indent:-9999px;position:relative;padding:0!important;height:2em!important;width:2em}table.wc_emails .wc-email-settings-table-actions a:after,table.wc_gateways .wc-email-settings-table-actions a:after,table.wc_shipping .wc-email-settings-table-actions a:after{speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;content:"";font-family:Dashicons;line-height:1.85}img.help_tip{margin:0 0 0 9px;vertical-align:middle}.postbox img.help_tip{margin-top:0}.postbox .woocommerce-help-tip{margin:0 0 0 9px}.status-enabled,.status-manual{font-size:1.4em;display:block;text-indent:-9999px;position:relative;height:1em;width:1em}.status-enabled:before,.status-manual:before{line-height:1;margin:0;position:absolute;width:100%;height:100%;font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;text-indent:0;top:0;left:0;text-align:center}.status-manual:before{content:"";color:#999}.status-enabled:before{content:"";color:#a46497}.woocommerce .woo-nav-tab-wrapper{margin-bottom:16px!important}.woocommerce .subsubsub{margin:-8px 0 0}.woocommerce #template div{margin:0}.woocommerce #template div p .button{float:right;margin-left:10px;margin-top:-4px}.woocommerce #template div .editor textarea{margin-bottom:8px}.woocommerce textarea[disabled=disabled]{background:#DFDFDF!important}.woocommerce table.form-table{margin:0;position:relative}.woocommerce table.form-table .forminp-radio ul{margin:0}.woocommerce table.form-table .forminp-radio ul li{line-height:1.4em}.woocommerce table.form-table textarea.input-text{height:100%;min-width:150px;display:block}.woocommerce table.form-table input.regular-input{width:25em}.woocommerce table.form-table textarea.wide-input{width:100%}.woocommerce table.form-table .woocommerce-help-tip,.woocommerce table.form-table img.help_tip{padding:0;margin:-4px 0 0 5px;vertical-align:middle;cursor:help;line-height:1}.woocommerce table.form-table span.help_tip{cursor:help;color:#2ea2cc}.woocommerce table.form-table th{position:relative;padding-right:24px}.woocommerce table.form-table .select2-container{display:block;max-width:350px;vertical-align:top;margin-bottom:3px}.woocommerce table.form-table table.widefat th{padding-right:inherit}.woocommerce table.form-table th .woocommerce-help-tip,.woocommerce table.form-table th img.help_tip{margin:0 -24px 0 0;float:right}.woocommerce table.form-table .wp-list-table .woocommerce-help-tip{float:none}.woocommerce table.form-table fieldset{margin-top:4px}.woocommerce table.form-table fieldset .woocommerce-help-tip,.woocommerce table.form-table fieldset img.help_tip{margin:-3px 0 0 5px}.woocommerce table.form-table fieldset p.description{margin-bottom:8px}.woocommerce table.form-table fieldset:first-child{margin-top:0}.woocommerce table.form-table .iris-picker{z-index:100;display:none;position:absolute;border:1px solid #ccc;border-radius:3px;box-shadow:0 1px 3px rgba(0,0,0,.2)}.woocommerce table.form-table .iris-picker .ui-slider{border:0!important;margin:0!important;width:auto!important;height:auto!important;background:none!important}.woocommerce table.form-table .iris-picker .ui-slider .ui-slider-handle{margin-bottom:0!important}.woocommerce table.form-table .colorpickpreview{padding:3px 3px 3px 20px;border:1px solid #ddd;border-right:0}.woocommerce table.form-table .colorpick{border-left:0}.woocommerce table.form-table .image_width_settings{vertical-align:middle}.woocommerce table.form-table .image_width_settings label{margin-left:10px}.woocommerce table.form-table .wc_emails_wrapper{padding:0 15px 10px 0}.woocommerce #tabs-wrap table a.remove{margin-left:4px}.woocommerce #tabs-wrap table p{margin:0 0 4px!important;overflow:hidden;zoom:1}.woocommerce #tabs-wrap table p a.add{float:left}#wp-excerpt-editor-container{background:#fff}#product_variation-parent #parent_id{width:100%}#postimagediv img{border:1px solid #d5d5d5;max-width:100%}#woocommerce-product-images .inside{margin:0;padding:0}#woocommerce-product-images .inside .add_product_images{padding:0 12px 12px}#woocommerce-product-images .inside #product_images_container{padding:0 0 0 9px}#woocommerce-product-images .inside #product_images_container ul{margin:0;padding:0}#woocommerce-product-images .inside #product_images_container ul:after,#woocommerce-product-images .inside #product_images_container ul:before{content:" ";display:table}#woocommerce-product-images .inside #product_images_container ul:after{clear:both}#woocommerce-product-images .inside #product_images_container ul li.add,#woocommerce-product-images .inside #product_images_container ul li.image,#woocommerce-product-images .inside #product_images_container ul li.wc-metabox-sortable-placeholder{width:80px;float:left;cursor:move;border:1px solid #d5d5d5;margin:9px 9px 0 0;background:#f7f7f7;border-radius:2px;position:relative;box-sizing:border-box}#woocommerce-product-images .inside #product_images_container ul li.add img,#woocommerce-product-images .inside #product_images_container ul li.image img,#woocommerce-product-images .inside #product_images_container ul li.wc-metabox-sortable-placeholder img{width:100%;height:auto;display:block}#woocommerce-product-images .inside #product_images_container ul li.wc-metabox-sortable-placeholder{border:3px dashed #ddd;position:relative}#woocommerce-product-images .inside #product_images_container ul li.wc-metabox-sortable-placeholder:after{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;content:"";font-size:2.618em;line-height:72px;color:#ddd}#woocommerce-product-images .inside #product_images_container ul ul.actions li a.delete:before,#woocommerce-product-images .inside #product_images_container ul ul.actions li a.view:before{line-height:1;color:#fff;background-color:#000;font-family:WooCommerce;font-weight:400;font-variant:normal;-webkit-font-smoothing:antialiased;text-align:center;left:0;speak:none;text-transform:none}#woocommerce-product-images .inside #product_images_container ul ul.actions{position:absolute;top:-8px;right:-8px;padding:2px;display:none}#woocommerce-product-images .inside #product_images_container ul ul.actions li{float:right;margin:0 0 0 2px}#woocommerce-product-images .inside #product_images_container ul ul.actions li a{width:1em;margin:0;height:0;display:block;overflow:hidden}#woocommerce-product-images .inside #product_images_container ul ul.actions li a.tips{cursor:pointer}#woocommerce-product-images .inside #product_images_container ul ul.actions li a.view{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;font-size:1.4em}#woocommerce-product-images .inside #product_images_container ul ul.actions li a.view:before{margin:0;text-indent:0;position:absolute;top:0;width:100%;height:100%;content:""}#woocommerce-product-images .inside #product_images_container ul ul.actions li a.delete{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;font-size:1.4em}#woocommerce-product-images .inside #product_images_container ul ul.actions li a.delete:before{margin:0;text-indent:0;position:absolute;top:0;width:100%;height:100%;content:"";border-radius:100%;box-shadow:0 1px 2px rgba(0,0,0,.2)}#woocommerce-product-images .inside #product_images_container ul ul.actions li a.delete:hover before{background-color:#a00}#woocommerce-product-images .inside #product_images_container ul li:hover ul.actions{display:block}#woocommerce-product-data .hndle{padding:10px}#woocommerce-product-data .hndle span{display:block;vertical-align:middle;line-height:24px}#woocommerce-product-data .hndle span span{display:inline;line-height:inherit;vertical-align:baseline}#woocommerce-product-data .hndle label{padding-right:1em;font-size:12px;vertical-align:baseline}#woocommerce-product-data .hndle label:first-child{margin-right:1em;border-right:1px solid #dfdfdf}#woocommerce-product-data .hndle input,#woocommerce-product-data .hndle select{margin:-3px 0 0 .5em;vertical-align:middle}#woocommerce-product-data>.handlediv{margin-top:4px}#woocommerce-product-data .wrap{margin:0}#woocommerce-coupon-description{padding:3px 8px;font-size:1.7em;line-height:1.42em;height:auto;width:100%;outline:0;margin:10px 0;display:block}#woocommerce-coupon-description::-webkit-input-placeholder{line-height:1.42em;color:#bbb}#woocommerce-coupon-description::-moz-placeholder{line-height:1.42em;color:#bbb}#woocommerce-coupon-description:-ms-input-placeholder{line-height:1.42em;color:#bbb}#woocommerce-coupon-description:-moz-placeholder{line-height:1.42em;color:#bbb}#woocommerce-coupon-data .panel-wrap,#woocommerce-product-data .panel-wrap{background:#fff}#woocommerce-coupon-data .wc-metaboxes-wrapper,#woocommerce-coupon-data .woocommerce_options_panel,#woocommerce-product-data .wc-metaboxes-wrapper,#woocommerce-product-data .woocommerce_options_panel{float:left;width:80%}#woocommerce-coupon-data .wc-metaboxes-wrapper .wc-radios,#woocommerce-coupon-data .woocommerce_options_panel .wc-radios,#woocommerce-product-data .wc-metaboxes-wrapper .wc-radios,#woocommerce-product-data .woocommerce_options_panel .wc-radios{display:block;float:left;margin:0}#woocommerce-coupon-data .wc-metaboxes-wrapper .wc-radios li,#woocommerce-coupon-data .woocommerce_options_panel .wc-radios li,#woocommerce-product-data .wc-metaboxes-wrapper .wc-radios li,#woocommerce-product-data .woocommerce_options_panel .wc-radios li{display:block;padding:0 0 10px}#woocommerce-coupon-data .wc-metaboxes-wrapper .wc-radios li input,#woocommerce-coupon-data .woocommerce_options_panel .wc-radios li input,#woocommerce-product-data .wc-metaboxes-wrapper .wc-radios li input,#woocommerce-product-data .woocommerce_options_panel .wc-radios li input{width:auto}#woocommerce-coupon-data .panel-wrap,#woocommerce-product-data .panel-wrap,.woocommerce .panel-wrap{overflow:hidden}#woocommerce-coupon-data ul.wc-tabs,#woocommerce-product-data ul.wc-tabs,.woocommerce ul.wc-tabs{margin:0;width:20%;float:left;line-height:1em;padding:0 0 10px;position:relative;background-color:#fafafa;border-right:1px solid #eee;box-sizing:border-box}#woocommerce-coupon-data ul.wc-tabs:after,#woocommerce-product-data ul.wc-tabs:after,.woocommerce ul.wc-tabs:after{content:"";display:block;width:100%;height:9999em;position:absolute;bottom:-9999em;left:0;background-color:#fafafa;border-right:1px solid #eee}#woocommerce-coupon-data ul.wc-tabs li,#woocommerce-product-data ul.wc-tabs li,.woocommerce ul.wc-tabs li{margin:0;padding:0;display:block;position:relative}#woocommerce-coupon-data ul.wc-tabs li a,#woocommerce-product-data ul.wc-tabs li a,.woocommerce ul.wc-tabs li a{margin:0;padding:10px;display:block;box-shadow:none;text-decoration:none;line-height:20px!important;border-bottom:1px solid #eee}#woocommerce-coupon-data ul.wc-tabs li a:before,#woocommerce-product-data ul.wc-tabs li a:before,.woocommerce ul.wc-tabs li a:before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin-right:.618em;content:"";text-decoration:none}#woocommerce-coupon-data ul.wc-tabs li.general_options a:before,#woocommerce-product-data ul.wc-tabs li.general_options a:before,.woocommerce ul.wc-tabs li.general_options a:before{content:"\e006"}#woocommerce-coupon-data ul.wc-tabs li.inventory_options a:before,#woocommerce-product-data ul.wc-tabs li.inventory_options a:before,.woocommerce ul.wc-tabs li.inventory_options a:before{content:"\e02c"}#woocommerce-coupon-data ul.wc-tabs li.shipping_options a:before,#woocommerce-product-data ul.wc-tabs li.shipping_options a:before,.woocommerce ul.wc-tabs li.shipping_options a:before{content:"\e01a"}#woocommerce-coupon-data ul.wc-tabs li.linked_product_options a:before,#woocommerce-product-data ul.wc-tabs li.linked_product_options a:before,.woocommerce ul.wc-tabs li.linked_product_options a:before{content:"\e00d"}#woocommerce-coupon-data ul.wc-tabs li.attribute_options a:before,#woocommerce-product-data ul.wc-tabs li.attribute_options a:before,.woocommerce ul.wc-tabs li.attribute_options a:before{content:"\e02b"}#woocommerce-coupon-data ul.wc-tabs li.advanced_options a:before,#woocommerce-product-data ul.wc-tabs li.advanced_options a:before,.woocommerce ul.wc-tabs li.advanced_options a:before{content:"\f111";font-family:Dashicons}#woocommerce-coupon-data ul.wc-tabs li.variation_options a:before,#woocommerce-product-data ul.wc-tabs li.variation_options a:before,.woocommerce ul.wc-tabs li.variation_options a:before{content:"\e003"}#woocommerce-coupon-data ul.wc-tabs li.usage_restriction_options a:before,#woocommerce-product-data ul.wc-tabs li.usage_restriction_options a:before,.woocommerce ul.wc-tabs li.usage_restriction_options a:before{content:"\e602"}#woocommerce-coupon-data ul.wc-tabs li.usage_limit_options a:before,#woocommerce-product-data ul.wc-tabs li.usage_limit_options a:before,.woocommerce ul.wc-tabs li.usage_limit_options a:before{content:"\e601"}#woocommerce-coupon-data ul.wc-tabs li.general_coupon_data a:before,#woocommerce-product-data ul.wc-tabs li.general_coupon_data a:before,.woocommerce ul.wc-tabs li.general_coupon_data a:before{content:"\e600"}#woocommerce-coupon-data ul.wc-tabs li.active a,#woocommerce-product-data ul.wc-tabs li.active a,.woocommerce ul.wc-tabs li.active a{color:#555;position:relative;background-color:#eee}.woocommerce_page_wc-settings .shippingrows th.check-column{padding-top:20px}.woocommerce_page_wc-settings .shippingrows tfoot th{padding-left:10px}.woocommerce_page_wc-settings .shippingrows .add.button:before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin-right:.618em;content:"";text-decoration:none}.woocommerce_page_wc-settings h3.wc-settings-sub-title{font-size:1.2em}#woocommerce-coupon-data .inside,#woocommerce-order-data .inside,#woocommerce-order-downloads .inside,#woocommerce-product-data .inside,#woocommerce-product-type-options .inside{margin:0;padding:0}.panel,.woocommerce_options_panel{padding:9px;color:#555}.panel,.woocommerce_page_settings .woocommerce_options_panel{padding:0}#woocommerce-product-specs .inside,#woocommerce-product-type-options .panel{margin:0;padding:9px}#woocommerce-product-type-options .panel p,.woocommerce_options_panel fieldset.form-field,.woocommerce_options_panel p{margin:0 0 9px;font-size:12px;padding:5px 9px;line-height:24px}#woocommerce-product-type-options .panel p:after,.woocommerce_options_panel fieldset.form-field:after,.woocommerce_options_panel p:after{content:".";display:block;height:0;clear:both;visibility:hidden}.woocommerce_options_panel .checkbox,.woocommerce_variable_attributes .checkbox{width:auto;margin:3px 0;vertical-align:middle}.woocommerce_options_panel .downloadable_files table,.woocommerce_variations .downloadable_files table{width:100%;padding:0!important}.woocommerce_options_panel .downloadable_files table th,.woocommerce_variations .downloadable_files table th{padding:7px 0 7px 7px!important}.woocommerce_options_panel .downloadable_files table td,.woocommerce_variations .downloadable_files table td{vertical-align:middle!important;padding:4px 0 4px 7px!important;position:relative}.woocommerce_options_panel .downloadable_files table td:last-child,.woocommerce_variations .downloadable_files table td:last-child{padding-right:7px!important}.woocommerce_options_panel .downloadable_files table td input.input_text,.woocommerce_variations .downloadable_files table td input.input_text{width:100%;float:none;margin:1px 0;min-width:0}.woocommerce_options_panel .downloadable_files table td .upload_file_button,.woocommerce_variations .downloadable_files table td .upload_file_button{float:right;width:auto;cursor:pointer}.woocommerce_options_panel .downloadable_files table td .delete,.woocommerce_variations .downloadable_files table td .delete{display:block;text-indent:-9999px;position:relative;height:1em;width:1em}.woocommerce_options_panel .downloadable_files table td .delete:before,.woocommerce_variations .downloadable_files table td .delete:before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;content:"";content:"\e013";color:#999}.woocommerce_options_panel .downloadable_files table td .delete:hover:before,.woocommerce_variations .downloadable_files table td .delete:hover:before{color:#a00}.woocommerce_options_panel .downloadable_files table th.sort,.woocommerce_variations .downloadable_files table th.sort{width:17px;padding:0}.woocommerce_options_panel .downloadable_files table td.sort,.woocommerce_variations .downloadable_files table td.sort{padding:0 8px;cursor:move;background:#f9f9f9;text-align:center;vertical-align:middle}.woocommerce_options_panel .downloadable_files table td.sort:before,.woocommerce_variations .downloadable_files table td.sort:before{content:"\e032";font-family:WooCommerce;text-align:center;line-height:1;color:#999;display:block;width:17px;float:left;height:100%}.woocommerce_options_panel .downloadable_files table td.sort:hover:before,.woocommerce_variations .downloadable_files table td.sort:hover:before{color:#333}.woocommerce_variation h3 .sort{cursor:move;text-align:center;float:right;height:26px;width:17px;visibility:hidden;vertical-align:middle;margin-right:.5em;color:#a0a5aa}.woocommerce_variation h3 .sort:before{content:"\e032";font-family:WooCommerce;text-align:center;cursor:move;display:block;width:17px;line-height:28px}.woocommerce_variation h3 .sort:hover{color:#777}.woocommerce_variation h3:hover .sort,.woocommerce_variation.ui-sortable-helper .sort{visibility:visible}.woocommerce_options_panel{min-height:175px;box-sizing:border-box}.woocommerce_options_panel .downloadable_files{padding:0 9px 0 162px;position:relative;margin:9px 0}.woocommerce_options_panel .downloadable_files label{position:absolute;left:0;margin:0 0 0 12px;line-height:24px}.woocommerce_options_panel p{margin:9px 0}.woocommerce_options_panel fieldset.form-field,.woocommerce_options_panel p.form-field{padding:5px 20px 5px 162px!important}.woocommerce_options_panel .sale_price_dates_fields .short:first-of-type{margin-bottom:1em}.woocommerce_options_panel .sale_price_dates_fields .short:nth-of-type(2){clear:left}.woocommerce_options_panel label,.woocommerce_options_panel legend{float:left;width:150px;padding:0;margin:0 0 0 -150px}.woocommerce_options_panel label .req,.woocommerce_options_panel legend .req{font-weight:700;font-style:normal;color:#a00}.woocommerce_options_panel .description{padding:0;margin:0 0 0 7px;clear:none;display:inline}.woocommerce_options_panel .description-block{margin-left:0;display:block}.woocommerce_options_panel input,.woocommerce_options_panel select,.woocommerce_options_panel textarea{margin:0}.woocommerce_options_panel textarea{height:3.5em;line-height:1.5em;vertical-align:top}.woocommerce_options_panel input[type=text],.woocommerce_options_panel input[type=number],.woocommerce_options_panel input[type=email]{width:50%;float:left}.woocommerce_options_panel input.button{width:auto;margin-left:8px}.woocommerce_options_panel select{float:left}.woocommerce_options_panel .short,.woocommerce_options_panel input[type=text].short,.woocommerce_options_panel input[type=number].short,.woocommerce_options_panel input[type=email].short{width:50%}.woocommerce_options_panel .sized{width:auto!important;margin-right:6px}.woocommerce_options_panel .options_group{border-top:1px solid #fff;border-bottom:1px solid #eee}.woocommerce_options_panel .options_group:first-child{border-top:0}.woocommerce_options_panel .options_group:last-child{border-bottom:0}.woocommerce_options_panel .options_group fieldset{margin:9px 0;font-size:12px;padding:5px 9px;line-height:24px}.woocommerce_options_panel .options_group fieldset label{width:auto;float:none}.woocommerce_options_panel .options_group fieldset ul{float:left;width:50%;margin:0;padding:0}.woocommerce_options_panel .options_group fieldset ul li{margin:0;width:auto}.woocommerce_options_panel .options_group fieldset ul li input{width:auto;float:none;margin-right:4px}.woocommerce_options_panel .options_group fieldset ul.wc-radios label{margin-left:0}.woocommerce_options_panel .dimensions_field .wrap{display:block;width:50%}.woocommerce_options_panel .dimensions_field .wrap input{width:30.75%;margin-right:3.8%}.woocommerce_options_panel .dimensions_field .wrap .last{margin-right:0}.woocommerce_options_panel.padded{padding:1em}#woocommerce-product-data input.dp-applied,.woocommerce_options_panel .select2-container{float:left}#grouped_product_options,#simple_product_options,#virtual_product_options{padding:12px;font-style:italic;color:#666}.wc-metaboxes-wrapper .toolbar{margin:0!important;border-top:1px solid #fff;border-bottom:1px solid #eee;padding:9px 12px!important}.wc-metaboxes-wrapper .toolbar:first-child{border-top:0}.wc-metaboxes-wrapper .toolbar:last-child{border-bottom:0}.wc-metaboxes-wrapper .toolbar .add_variation{float:right;margin-left:5px}.wc-metaboxes-wrapper .toolbar .cancel-variation-changes,.wc-metaboxes-wrapper .toolbar .save-variation-changes{float:left;margin-right:5px}.wc-metaboxes-wrapper p.toolbar{overflow:hidden;zoom:1}.wc-metaboxes-wrapper .expand-close{margin-right:2px;color:#777;font-size:12px;font-style:italic}.wc-metaboxes-wrapper .expand-close a{background:0 0;padding:0;font-size:12px;text-decoration:none}.wc-metaboxes-wrapper#product_attributes .expand-close{float:right;line-height:28px}.wc-metaboxes-wrapper .fr,.wc-metaboxes-wrapper button.add_variable_attribute{float:right;margin:0 0 0 6px}.wc-metaboxes-wrapper .wc-metaboxes{border-bottom:1px solid #eee}.wc-metaboxes-wrapper .wc-metabox-sortable-placeholder{border-color:#bbb;background-color:#f5f5f5;margin-bottom:9px;border-width:1px;border-style:dashed}.wc-metaboxes-wrapper .wc-metabox{background:#fff;border-bottom:1px solid #eee;margin:0!important}.wc-metaboxes-wrapper .wc-metabox select{font-weight:400}.wc-metaboxes-wrapper .wc-metabox:last-of-type{border-bottom:0}.wc-metaboxes-wrapper .wc-metabox .handlediv{width:27px}.wc-metaboxes-wrapper .wc-metabox .handlediv:before{content:"\f142"!important;cursor:pointer;display:inline-block;font:400 20px/1 Dashicons;line-height:.5!important;padding:8px 10px;position:relative;right:12px;top:0}.wc-metaboxes-wrapper .wc-metabox.closed{border-radius:3px}.wc-metaboxes-wrapper .wc-metabox.closed .handlediv:before{content:"\f140"!important}.wc-metaboxes-wrapper .wc-metabox.closed h3{border:0}.wc-metaboxes-wrapper .wc-metabox h3{margin:0!important;padding:.75em .75em .75em 1em!important;font-size:1em!important;overflow:hidden;zoom:1;cursor:move}.wc-metaboxes-wrapper .wc-metabox h3 a.delete,.wc-metaboxes-wrapper .wc-metabox h3 button{float:right}.wc-metaboxes-wrapper .wc-metabox h3 a.delete{color:red;font-weight:400;line-height:26px;text-decoration:none;position:relative;visibility:hidden}.wc-metaboxes-wrapper .wc-metabox h3 strong{line-height:26px;font-weight:700}.wc-metaboxes-wrapper .wc-metabox h3 select{font-family:sans-serif;max-width:20%;margin:.25em .25em .25em 0}.wc-metaboxes-wrapper .wc-metabox h3 .handlediv{background-position:6px 5px!important;visibility:hidden;height:26px}.wc-metaboxes-wrapper .wc-metabox h3.fixed{cursor:pointer!important}.wc-metaboxes-wrapper .wc-metabox.woocommerce_variation h3{cursor:pointer;padding:.5em .75em .5em 1em!important}.wc-metaboxes-wrapper .wc-metabox.woocommerce_variation h3 .handlediv,.wc-metaboxes-wrapper .wc-metabox.woocommerce_variation h3 .sort,.wc-metaboxes-wrapper .wc-metabox.woocommerce_variation h3 a.delete{margin-top:.25em}.wc-metaboxes-wrapper .wc-metabox h3:hover .handlediv,.wc-metaboxes-wrapper .wc-metabox h3:hover a.delete,.wc-metaboxes-wrapper .wc-metabox.ui-sortable-helper .handlediv,.wc-metaboxes-wrapper .wc-metabox.ui-sortable-helper a.delete{visibility:visible}.wc-metaboxes-wrapper .wc-metabox table{width:100%;position:relative;background-color:#fdfdfd;padding:1em;border-top:1px solid #eee}.wc-metaboxes-wrapper .wc-metabox table td{text-align:left;padding:0 6px 1em 0;vertical-align:top;border:0}.wc-metaboxes-wrapper .wc-metabox table td label{text-align:left;display:block;line-height:21px}.wc-metaboxes-wrapper .wc-metabox table td input{float:left;min-width:200px}.wc-metaboxes-wrapper .wc-metabox table td input,.wc-metaboxes-wrapper .wc-metabox table td textarea{width:100%;margin:0;display:block;font-size:14px;padding:4px;color:#555}.wc-metaboxes-wrapper .wc-metabox table td .select2-container,.wc-metaboxes-wrapper .wc-metabox table td select{width:100%!important}.wc-metaboxes-wrapper .wc-metabox table td input.short{width:200px}.wc-metaboxes-wrapper .wc-metabox table td input.checkbox{width:16px;min-width:inherit;vertical-align:text-bottom;display:inline-block;float:none}.wc-metaboxes-wrapper .wc-metabox table td.attribute_name{width:200px}.wc-metaboxes-wrapper .wc-metabox table .minus,.wc-metaboxes-wrapper .wc-metabox table .plus{margin-top:6px}.wc-metaboxes-wrapper .wc-metabox table .fl{float:left}.wc-metaboxes-wrapper .wc-metabox table .fr{float:right}.variations-pagenav{float:right;line-height:24px}.variations-pagenav .displaying-num{color:#777;font-size:12px;font-style:italic}.variations-pagenav a{padding:0 10px 3px;background:rgba(0,0,0,.05);font-size:16px;font-weight:400;text-decoration:none}.variations-pagenav a.disabled,.variations-pagenav a.disabled:active,.variations-pagenav a.disabled:focus,.variations-pagenav a.disabled:hover{color:#A0A5AA;background:rgba(0,0,0,.05)}.variations-defaults{float:left}.variations-defaults select{margin:.25em .25em .25em 0}.woocommerce_variable_attributes{background-color:#fdfdfd;border-top:1px solid #eee}.woocommerce_variable_attributes .data{padding:1em 2em}.woocommerce_variable_attributes .data:after,.woocommerce_variable_attributes .data:before{content:" ";display:table}.woocommerce_variable_attributes .data:after{clear:both}.woocommerce_variable_attributes .upload_image_button{display:block;width:48px;height:48px;float:left;margin-right:20px;position:relative;cursor:pointer}.woocommerce_variable_attributes .upload_image_button img{width:100%;height:auto;display:none}.woocommerce_variable_attributes .upload_image_button:before{content:"\f128";font-family:Dashicons;position:absolute;top:0;left:0;right:0;bottom:0;text-align:center;line-height:48px;font-size:48px;font-weight:400;-webkit-font-smoothing:antialiased}.woocommerce_variable_attributes .upload_image_button.remove img{display:block}.woocommerce_variable_attributes .upload_image_button.remove:before{content:"\f335";display:none}.woocommerce_variable_attributes .upload_image_button.remove:hover:before{display:block}.woocommerce_variable_attributes .options{border:1px solid #eee;border-width:1px 0;padding:.25em 0}.woocommerce_variable_attributes .options label{display:inline-block;padding:4px 1em 2px 0}.woocommerce_variable_attributes .options input[type=checkbox]{margin-top:5px;margin-right:3px}.form-row label{display:block}.form-row input[type=number],.form-row input[type=text],.form-row select{width:100%}.form-row.dimensions_field input{width:25%;float:left;margin-right:1%}.form-row.dimensions_field input:last-of-type{margin-right:0}.form-row-first,.form-row-last{width:48%;float:right}.form-row-first{clear:both;float:left}.form-row-full{clear:both}.tips{cursor:help;text-decoration:none}img.tips{padding:5px 0 0}#tiptip_holder{display:none;position:absolute;top:0;left:0;z-index:9999999}#tiptip_holder.tip_top{padding-bottom:5px}#tiptip_holder.tip_top #tiptip_arrow_inner{margin-top:-7px;margin-left:-6px;border-top-color:#333}#tiptip_holder.tip_bottom{padding-top:5px}#tiptip_holder.tip_bottom #tiptip_arrow_inner{margin-top:-5px;margin-left:-6px;border-bottom-color:#333}#tiptip_holder.tip_right{padding-left:5px}#tiptip_holder.tip_right #tiptip_arrow_inner{margin-top:-6px;margin-left:-5px;border-right-color:#333}#tiptip_holder.tip_left{padding-right:5px}#tiptip_holder.tip_left #tiptip_arrow_inner{margin-top:-6px;margin-left:-7px;border-left-color:#333}#tiptip_content,.chart-tooltip,.wc_error_tip{color:#fff;font-size:.8em;max-width:150px;background:#333;text-align:center;border-radius:3px;padding:.618em 1em;box-shadow:0 1px 3px rgba(0,0,0,.2)}#tiptip_content code,.chart-tooltip code,.wc_error_tip code{padding:1px;background:#888}#tiptip_arrow,#tiptip_arrow_inner{position:absolute;border-color:transparent;border-style:solid;border-width:6px;height:0;width:0}.wc_error_tip{max-width:20em;line-height:1.8em;position:absolute;white-space:normal;background:#d82223;margin:1.5em 1px 0 -1em;z-index:9999999}.wc_error_tip:after{content:"";display:block;border:8px solid #d82223;border-right-color:transparent;border-left-color:transparent;border-top-color:transparent;position:absolute;top:-3px;left:50%;margin:-1em 0 0 -3px}img.ui-datepicker-trigger{vertical-align:middle;margin-top:-1px;cursor:pointer}.wc-metabox-content img.ui-datepicker-trigger,.woocommerce_options_panel img.ui-datepicker-trigger{float:left;margin-right:8px;margin-top:4px;margin-left:4px}#ui-datepicker-div{display:none}.woocommerce-reports-wide.woocommerce-reports-wrap,.woocommerce-reports-wrap.woocommerce-reports-wrap{margin-left:300px;padding-top:18px}.woocommerce-reports-wide.halved,.woocommerce-reports-wrap.halved{margin:0;overflow:hidden;zoom:1}.woocommerce-reports-wide .widefat td,.woocommerce-reports-wrap .widefat td{vertical-align:top;padding:7px}.woocommerce-reports-wide .widefat td .description,.woocommerce-reports-wrap .widefat td .description{margin:4px 0 0}.woocommerce-reports-wide .postbox:after,.woocommerce-reports-wrap .postbox:after{content:".";display:block;height:0;clear:both;visibility:hidden}.woocommerce-reports-wide .postbox h3,.woocommerce-reports-wrap .postbox h3{cursor:default!important}.woocommerce-reports-wide .postbox .inside,.woocommerce-reports-wrap .postbox .inside{padding:10px;margin:0!important}.woocommerce-reports-wide .postbox h3.stats_range,.woocommerce-reports-wrap .postbox h3.stats_range{border-bottom-color:#dfdfdf;margin:0;padding:0!important}.woocommerce-reports-wide .postbox h3.stats_range .export_csv,.woocommerce-reports-wrap .postbox h3.stats_range .export_csv{float:right;line-height:26px;border-left:1px solid #dfdfdf;padding:10px;display:block;text-decoration:none}.woocommerce-reports-wide .postbox h3.stats_range .export_csv:before,.woocommerce-reports-wrap .postbox h3.stats_range .export_csv:before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;content:"";text-decoration:none;margin-right:4px}.woocommerce-reports-wide .postbox h3.stats_range ul,.woocommerce-reports-wrap .postbox h3.stats_range ul{list-style:none;margin:0;padding:0;zoom:1;background:#f5f5f5}.woocommerce-reports-wide .postbox h3.stats_range ul:after,.woocommerce-reports-wide .postbox h3.stats_range ul:before,.woocommerce-reports-wrap .postbox h3.stats_range ul:after,.woocommerce-reports-wrap .postbox h3.stats_range ul:before{content:" ";display:table}.woocommerce-reports-wide .postbox h3.stats_range ul:after,.woocommerce-reports-wrap .postbox h3.stats_range ul:after{clear:both}.woocommerce-reports-wide .postbox h3.stats_range ul li,.woocommerce-reports-wrap .postbox h3.stats_range ul li{float:left;margin:0;padding:0;line-height:26px}.woocommerce-reports-wide .postbox h3.stats_range ul li a,.woocommerce-reports-wrap .postbox h3.stats_range ul li a{border-right:1px solid #dfdfdf;padding:10px;display:block;text-decoration:none}.woocommerce-reports-wide .postbox h3.stats_range ul li.active,.woocommerce-reports-wrap .postbox h3.stats_range ul li.active{background:#fff;-webkit-box-shadow:0 4px 0 0 #fff;box-shadow:0 4px 0 0 #fff}.woocommerce-reports-wide .postbox h3.stats_range ul li.active a,.woocommerce-reports-wrap .postbox h3.stats_range ul li.active a{color:#777}.woocommerce-reports-wide .postbox h3.stats_range ul li.custom,.woocommerce-reports-wrap .postbox h3.stats_range ul li.custom{padding:9px 10px;vertical-align:middle}.woocommerce-reports-wide .postbox h3.stats_range ul li.custom div,.woocommerce-reports-wide .postbox h3.stats_range ul li.custom form,.woocommerce-reports-wrap .postbox h3.stats_range ul li.custom div,.woocommerce-reports-wrap .postbox h3.stats_range ul li.custom form{display:inline;margin:0}.woocommerce-reports-wide .postbox h3.stats_range ul li.custom div input.range_datepicker,.woocommerce-reports-wide .postbox h3.stats_range ul li.custom form input.range_datepicker,.woocommerce-reports-wrap .postbox h3.stats_range ul li.custom div input.range_datepicker,.woocommerce-reports-wrap .postbox h3.stats_range ul li.custom form input.range_datepicker{padding:0;margin:0 10px 0 0;background:0 0;border:0;color:#777;text-align:center;-webkit-box-shadow:none;box-shadow:none}.woocommerce-reports-wide .postbox .chart-with-sidebar,.woocommerce-reports-wrap .postbox .chart-with-sidebar{padding:12px 12px 12px 249px;margin:0!important}.woocommerce-reports-wide .postbox .chart-with-sidebar .chart-sidebar,.woocommerce-reports-wrap .postbox .chart-with-sidebar .chart-sidebar{width:225px;margin-left:-237px;float:left}.woocommerce-reports-wide .postbox .chart-widgets,.woocommerce-reports-wrap .postbox .chart-widgets{margin:0;padding:0}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget{margin:0 0 1em;background:#fafafa;border:1px solid #dfdfdf}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget:after,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget:after{content:".";display:block;height:0;clear:both;visibility:hidden}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget h4,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget h4{background:#fff;border:1px solid #dfdfdf;border-left-width:0;border-right-width:0;padding:10px;margin:0;color:#2ea2cc;border-top-width:0;background-image:-webkit-gradient(linear,left bottom,left top,from(#ececec),to(#f9f9f9));background-image:-webkit-linear-gradient(bottom,#ececec,#f9f9f9);background-image:-moz-linear-gradient(bottom,#ececec,#f9f9f9);background-image:-o-linear-gradient(bottom,#ececec,#f9f9f9);background-image:linear-gradient(to top,#ececec,#f9f9f9)}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget table td.count,.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget table tr.active td,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget table td.count,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget table tr.active td{background:#f5f5f5}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget h4.section_title:hover,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget h4.section_title:hover{color:#a00}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget .section_title,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget .section_title{cursor:pointer}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget .section_title span,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget .section_title span{display:block}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget .section_title span:after,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget .section_title span:after{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin-left:.618em;content:"";text-decoration:none;float:right;font-size:.9em;line-height:1.618}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget .section_title.open,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget .section_title.open{color:#333}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget .section_title.open span:after,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget .section_title.open span:after{display:none}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget .section,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget .section{border-bottom:1px solid #dfdfdf}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget .section .select2-container,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget .section .select2-container{width:100%!important}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget .section:last-of-type,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget .section:last-of-type{border-radius:0 0 3px 3px}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget table,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget table{width:100%}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget table td,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget table td{padding:7px 10px;vertical-align:top;border-top:1px solid #e5e5e5;line-height:1.4em}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget table td.sparkline,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget table td.sparkline,form.report_filters div,form.report_filters input,form.report_filters label,form.report_filters p{vertical-align:middle}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget table tr:first-child td,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget table tr:first-child td{border-top:0}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget table td.name,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget table td.name{max-width:175px}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget table td.name a,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget table td.name a{word-wrap:break-word}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget table .wc_sparkline,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget table .wc_sparkline{width:32px;height:1em;display:block;float:right}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget form,.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget p,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget form,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget p{margin:0;padding:10px}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget form .submit,.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget p .submit,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget form .submit,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget p .submit{margin-top:10px}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget #product_ids,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget #product_ids{width:100%}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget .select_all,.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget .select_none,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget .select_all,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget .select_none{float:right;color:#999;margin-left:4px;margin-top:10px}.woocommerce-reports-wide .postbox .chart-legend,.woocommerce-reports-wrap .postbox .chart-legend{list-style:none;margin:0 0 1em;padding:0;border:1px solid #dfdfdf;border-right-width:0;border-bottom-width:0;background:#fff}.woocommerce-reports-wide .postbox .chart-legend li,.woocommerce-reports-wrap .postbox .chart-legend li{border-right:5px solid #aaa;color:#aaa;padding:1em;display:block;margin:0;-webkit-transition:all ease .5s;box-shadow:inset 0 -1px 0 0 #dfdfdf}.woocommerce-reports-wide .postbox .chart-legend li strong,.woocommerce-reports-wrap .postbox .chart-legend li strong{font-size:1.618em;line-height:1.2em;color:#464646;font-weight:400;display:block;font-family:HelveticaNeue-Light,"Helvetica Neue Light","Helvetica Neue",sans-serif}.woocommerce-reports-wide .postbox .chart-legend li strong del,.woocommerce-reports-wrap .postbox .chart-legend li strong del{color:#e74c3c;font-weight:400}.woocommerce-reports-wide .postbox .chart-legend li:hover,.woocommerce-reports-wrap .postbox .chart-legend li:hover{box-shadow:inset 0 -1px 0 0 #dfdfdf,inset 300px 0 0 rgba(156,93,144,.1);border-right:5px solid #9c5d90!important;padding-left:1.5em;color:#9c5d90}.woocommerce-reports-wide .postbox .pie-chart-legend,.woocommerce-reports-wrap .postbox .pie-chart-legend{margin:12px 0 0;overflow:hidden}.woocommerce-reports-wide .postbox .pie-chart-legend li,.woocommerce-reports-wrap .postbox .pie-chart-legend li{float:left;margin:0;padding:6px 0 0;border-top:4px solid #999;text-align:center;box-sizing:border-box;width:50%}.woocommerce-reports-wide .postbox .stat,.woocommerce-reports-wrap .postbox .stat{font-size:1.5em!important;font-weight:700;text-align:center}.woocommerce-reports-wide .postbox .chart-placeholder,.woocommerce-reports-wrap .postbox .chart-placeholder{width:100%;height:650px;overflow:hidden;position:relative}.woocommerce-reports-wide .postbox .chart-prompt,.woocommerce-reports-wrap .postbox .chart-prompt{line-height:650px;margin:0;color:#999;font-size:1.2em;font-style:italic;text-align:center}.woocommerce-reports-wide .postbox .chart-container,.woocommerce-reports-wrap .postbox .chart-container{background:#fff;padding:12px;position:relative;border:1px solid #dfdfdf;border-radius:3px}.woocommerce-reports-wide .postbox .main .chart-legend,.woocommerce-reports-wrap .postbox .main .chart-legend{margin-top:12px}.woocommerce-reports-wide .postbox .main .chart-legend li,.woocommerce-reports-wrap .postbox .main .chart-legend li{border-right:0;margin:0 8px 0 0;float:left;border-top:4px solid #aaa}.woocommerce-reports-wide .woocommerce-reports-main,.woocommerce-reports-wrap .woocommerce-reports-main{float:left;min-width:100%}.woocommerce-reports-wide .woocommerce-reports-main table td,.woocommerce-reports-wrap .woocommerce-reports-main table td{padding:9px}.woocommerce-reports-wide .woocommerce-reports-sidebar,.woocommerce-reports-wrap .woocommerce-reports-sidebar{display:inline;width:281px;margin-left:-300px;clear:both;float:left}.woocommerce-reports-wide .woocommerce-reports-left,.woocommerce-reports-wrap .woocommerce-reports-left{width:49.5%;float:left}.woocommerce-reports-wide .woocommerce-reports-right,.woocommerce-reports-wrap .woocommerce-reports-right{width:49.5%;float:right}.woocommerce-reports-wide .column-wc_actions a.edit,.woocommerce-reports-wide .column-wc_actions a.view,.woocommerce-reports-wrap .column-wc_actions a.edit,.woocommerce-reports-wrap .column-wc_actions a.view{display:block;text-indent:-9999px;position:relative;padding:0!important;height:2em!important;width:2em}.woocommerce-reports-wide .column-wc_actions a.edit:after,.woocommerce-reports-wide .column-wc_actions a.view:after,.woocommerce-reports-wrap .column-wc_actions a.edit:after,.woocommerce-reports-wrap .column-wc_actions a.view:after{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;line-height:1.85}.woocommerce-reports-wide .column-wc_actions a.edit:after,.woocommerce-reports-wrap .column-wc_actions a.edit:after{content:"\e01c"}.woocommerce-reports-wide .column-wc_actions a.view:after,.woocommerce-reports-wrap .column-wc_actions a.view:after{content:"\e010"}.woocommerce-wide-reports-wrap{padding-bottom:11px}.woocommerce-wide-reports-wrap .widefat .export-data{float:right}.woocommerce-wide-reports-wrap .widefat td,.woocommerce-wide-reports-wrap .widefat th{vertical-align:middle;padding:7px}.chart-tooltip{position:absolute;display:none;line-height:1}table.bar_chart{width:100%}table.bar_chart thead th{text-align:left;color:#ccc;padding:6px 0}table.bar_chart tbody th{padding:6px 0;width:25%;text-align:left!important;font-weight:400!important;border-bottom:1px solid #fee}table.bar_chart tbody td{text-align:right;line-height:24px;padding:6px 6px 6px 0;border-bottom:1px solid #fee}table.bar_chart tbody td span{color:#8a4b75;display:block}table.bar_chart tbody td span.alt{color:#47a03e;margin-top:6px}table.bar_chart tbody td.bars{position:relative;text-align:left;padding:6px 6px 6px 0;border-bottom:1px solid #fee}table.bar_chart tbody td.bars a,table.bar_chart tbody td.bars span{text-decoration:none;clear:both;background:#8a4b75;float:left;display:block;line-height:24px;height:24px;-moz-border-radius:3px;-webkit-border-radius:3px;-o-border-radius:3px;-khtml-border-radius:3px;border-radius:3px}table.bar_chart tbody td.bars span.alt{clear:both;background:#47a03e}table.bar_chart tbody td.bars span.alt span{margin:0;color:#c5dec2!important;text-shadow:0 1px 0 #47a03e;background:0 0}@media only screen and (max-width:1280px){#order_data .order_data_column{width:48%}#order_data .order_data_column:first-child{width:100%}.woocommerce_options_panel .description{display:block;clear:both;margin-left:0}.woocommerce_options_panel .dimensions_field .wrap,.woocommerce_options_panel .short,.woocommerce_options_panel input[type=email].short,.woocommerce_options_panel input[type=number].short,.woocommerce_options_panel input[type=text].short{width:80%}.woocommerce_options_panel .downloadable_files,.woocommerce_variations .downloadable_files{padding:0;clear:both}.woocommerce_options_panel .downloadable_files label,.woocommerce_variations .downloadable_files label{position:static}.woocommerce_options_panel .downloadable_files table,.woocommerce_variations .downloadable_files table{margin:0 12px 24px;width:94%}.woocommerce_options_panel .downloadable_files table .sort,.woocommerce_variations .downloadable_files table .sort{visibility:hidden}.woocommerce_options_panel .woocommerce_variable_attributes .downloadable_files table,.woocommerce_variations .woocommerce_variable_attributes .downloadable_files table{margin:0 0 1em;width:100%}}@media only screen and (max-width:900px){#woocommerce-coupon-data ul.coupon_data_tabs,#woocommerce-product-data .wc-tabs-back,#woocommerce-product-data ul.product_data_tabs{width:10%}#woocommerce-coupon-data .wc-metaboxes-wrapper,#woocommerce-coupon-data .woocommerce_options_panel,#woocommerce-product-data .wc-metaboxes-wrapper,#woocommerce-product-data .woocommerce_options_panel{width:90%}#woocommerce-coupon-data ul.coupon_data_tabs li a,#woocommerce-product-data ul.product_data_tabs li a{position:relative;text-indent:-999px;padding:10px}#woocommerce-coupon-data ul.coupon_data_tabs li a:before,#woocommerce-product-data ul.product_data_tabs li a:before{position:absolute;top:0;right:0;bottom:0;left:0;text-indent:0;text-align:center;line-height:40px;width:100%;height:40px}}@media only screen and (max-width:782px){#wp-excerpt-media-buttons a{font-size:16px;line-height:37px;height:39px;padding:0 20px 0 15px}#wp-excerpt-editor-tools{padding-top:20px;padding-right:15px;overflow:hidden;margin-bottom:-1px}.post-type-product .wp-list-table .is-expanded td:not(.hidden),.post-type-shop_order .wp-list-table .is-expanded td:not(.hidden){overflow:visible}#woocommerce-product-data .checkbox{width:25px}.variations-pagenav{float:none;text-align:center;font-size:18px}.variations-pagenav .displaying-num{font-size:16px}.variations-pagenav a{padding:8px 20px 11px;font-size:18px}.variations-pagenav select{padding:0 20px}.variations-defaults{float:none;text-align:center;margin-top:10px}.post-type-product .wp-list-table .column-thumb{display:none;text-align:left;padding-bottom:0}.post-type-product .wp-list-table .column-thumb:before{display:none!important}.post-type-product .wp-list-table .column-thumb img{max-width:32px}.post-type-product .wp-list-table .toggle-row{top:-28px}.post-type-shop_order .wp-list-table .column-order_status{display:none;text-align:left;padding-bottom:0}.post-type-shop_order .wp-list-table .column-order_status mark{margin:0}.post-type-shop_order .wp-list-table .column-order_status:before{display:none!important}.post-type-shop_order .wp-list-table .column-customer_message,.post-type-shop_order .wp-list-table .column-order_notes{text-align:inherit}.post-type-shop_order .wp-list-table .column-order_notes .note-on{font-size:1.3em;margin:0}.post-type-shop_order .wp-list-table .toggle-row{top:-15px}}@media only screen and (max-width:500px){.woocommerce_options_panel label,.woocommerce_options_panel legend{float:none;width:auto;display:block;margin:0}.woocommerce_options_panel fieldset.form-field,.woocommerce_options_panel p.form-field{padding:5px 20px!important}}.wc-backbone-modal *{box-sizing:border-box}.wc-backbone-modal .wc-backbone-modal-content{position:fixed;top:50%;left:50%;width:500px;background:#fff;z-index:100000}.wc-backbone-modal-backdrop{position:fixed;top:0;left:0;right:0;bottom:0;min-height:360px;background:#000;opacity:.7;z-index:99900}.wc-backbone-modal-main{padding-bottom:51px}.wc-backbone-modal-main article,.wc-backbone-modal-main header{display:block;position:relative}.wc-backbone-modal-main .wc-backbone-modal-header{height:50px;background:#fcfcfc;padding:0 50px 0 16px;border-bottom:1px solid #ddd}.wc-backbone-modal-main .wc-backbone-modal-header h1{margin:0;font-size:18px;font-weight:700;line-height:50px}.wc-backbone-modal-main .wc-backbone-modal-header .modal-close-link{cursor:pointer;color:#777;height:50px;width:50px;padding:0;position:absolute;top:0;right:0;text-align:center;border:0;border-left:1px solid #ddd;background-color:transparent;-webkit-transition:color .1s ease-in-out,background .1s ease-in-out;transition:color .1s ease-in-out,background .1s ease-in-out}.wc-backbone-modal-main .wc-backbone-modal-header .modal-close-link:before{font:400 22px/50px dashicons!important;color:#666;display:block;content:'\f335';font-weight:300}.wc-backbone-modal-main .wc-backbone-modal-header .modal-close-link:focus,.wc-backbone-modal-main .wc-backbone-modal-header .modal-close-link:hover{background:#ddd;border-color:#ccc;color:#000}.wc-backbone-modal-main .wc-backbone-modal-header .modal-close-link:focus{outline:0}.wc-backbone-modal-main article{padding:10px 16px}.wc-backbone-modal-main article .pagination{padding:10px 0 0;text-align:center}.wc-backbone-modal-main footer{position:absolute;left:0;right:0;bottom:0;z-index:100;padding:10px 16px;background:#fcfcfc;border-top:1px solid #dfdfdf;box-shadow:0 -4px 4px -4px rgba(0,0,0,.1)}.wc-backbone-modal-main footer .inner{float:right;line-height:23px}.wc-backbone-modal-main footer .inner .button{margin-bottom:0}.select2-drop{z-index:999999!important}.select2-container-multi .select2-choices .select2-search-field input{font-family:inherit;font-size:inherit;font-weight:inherit;padding:3px 5px}.select2-container{line-height:1.85em;font-size:14px}
\ No newline at end of file
+.select2-container{box-sizing:border-box;display:inline-block;margin:0;position:relative;vertical-align:middle}.select2-container .select2-selection--single{box-sizing:border-box;cursor:pointer;display:block;height:28px;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--single .select2-selection__rendered{display:block;padding-left:8px;padding-right:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-selection--single .select2-selection__clear{position:relative}.select2-container[dir=rtl] .select2-selection--single .select2-selection__rendered{padding-right:8px;padding-left:20px}.select2-container .select2-selection--multiple{box-sizing:border-box;cursor:pointer;display:block;min-height:32px;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--multiple .select2-selection__rendered{display:inline-block;overflow:hidden;padding-left:8px;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-search--inline{float:left}.select2-container .select2-search--inline .select2-search__field{box-sizing:border-box;border:none;font-size:100%;margin-top:5px;padding:0}.select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-dropdown{background-color:#fff;border:1px solid #aaa;border-radius:4px;box-sizing:border-box;display:block;position:absolute;left:-100000px;width:100%;z-index:1051}.select2-results{display:block}.select2-results__options{list-style:none;margin:0;padding:0}.select2-results__option{padding:6px;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-user-select:none}.select2-results__option[aria-selected]{cursor:pointer}.select2-container--open .select2-dropdown{left:0}.select2-container--open .select2-dropdown--above{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--open .select2-dropdown--below{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-search--dropdown{display:block;padding:4px}.select2-search--dropdown .select2-search__field{padding:4px;width:100%;box-sizing:border-box}.select2-search--dropdown .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-search--dropdown.select2-search--hide{display:none}.select2-close-mask{border:0;margin:0;padding:0;display:block;position:fixed;left:0;top:0;min-height:100%;min-width:100%;height:auto;width:auto;opacity:0;z-index:99;background-color:#fff;filter:alpha(opacity=0)}.select2-hidden-accessible{border:0!important;clip:rect(0 0 0 0)!important;height:1px!important;margin:-1px!important;overflow:hidden!important;padding:0!important;position:absolute!important;width:1px!important}.select2-container--classic .select2-results>.select2-results__options,.select2-container--default .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--default .select2-selection--single{background-color:#fff;border:1px solid #aaa;border-radius:4px}.select2-container--default .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--default .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:700}.select2-container--default .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--default .select2-selection--single .select2-selection__arrow{height:26px;position:absolute;top:1px;right:1px;width:20px}.select2-container--default .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent;border-style:solid;border-width:5px 4px 0;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--default[dir=rtl] .select2-selection--single .select2-selection__clear{float:left}.select2-container--default[dir=rtl] .select2-selection--single .select2-selection__arrow{left:1px;right:auto}.select2-container--default.select2-container--disabled .select2-selection--single{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear{display:none}.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888;border-width:0 4px 5px}.select2-container--default .select2-selection--multiple{background-color:#fff;border:1px solid #aaa;border-radius:4px;cursor:text}.select2-container--default .select2-selection--multiple .select2-selection__rendered{box-sizing:border-box;list-style:none;margin:0;padding:0 5px;width:100%}.select2-container--default .select2-selection--multiple .select2-selection__rendered li{list-style:none}.select2-container--default .select2-selection--multiple .select2-selection__placeholder{color:#999;margin-top:5px;float:left}.select2-container--default .select2-selection--multiple .select2-selection__clear{cursor:pointer;float:right;font-weight:700;margin-top:5px;margin-right:10px}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{color:#999;cursor:pointer;display:inline-block;font-weight:700;margin-right:2px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover{color:#333}.select2-container--default[dir=rtl] .select2-selection--multiple .select2-search--inline,.select2-container--default[dir=rtl] .select2-selection--multiple .select2-selection__choice,.select2-container--default[dir=rtl] .select2-selection--multiple .select2-selection__placeholder{float:right}.select2-container--default[dir=rtl] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto}.select2-container--default[dir=rtl] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--default.select2-container--focus .select2-selection--multiple{border:1px solid #000;outline:0}.select2-container--default.select2-container--disabled .select2-selection--multiple{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection__choice__remove{display:none}.select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple,.select2-container--default.select2-container--open.select2-container--above .select2-selection--single{border-top-left-radius:0;border-top-right-radius:0}.select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple,.select2-container--default.select2-container--open.select2-container--below .select2-selection--single{border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--default .select2-search--dropdown .select2-search__field{border:1px solid #aaa}.select2-container--default .select2-search--inline .select2-search__field{background:0 0;border:none;outline:0;box-shadow:none;-webkit-appearance:textfield}.select2-container--default .select2-results__option[role=group]{padding:0}.select2-container--default .select2-results__option[aria-disabled=true]{color:#999}.select2-container--default .select2-results__option[aria-selected=true]{background-color:#ddd}.select2-container--default .select2-results__option .select2-results__option{padding-left:1em}.select2-container--default .select2-results__option .select2-results__option .select2-results__group{padding-left:0}.select2-container--default .select2-results__option .select2-results__option .select2-results__option{margin-left:-1em;padding-left:2em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-2em;padding-left:3em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-3em;padding-left:4em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-4em;padding-left:5em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-5em;padding-left:6em}.select2-container--default .select2-results__option--highlighted[aria-selected]{background-color:#0073aa;color:#fff}.select2-container--default .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic .select2-selection--single{background-color:#f7f7f7;border:1px solid #aaa;border-radius:4px;outline:0;background-image:-webkit-linear-gradient(top,#fff 50%,#eee 100%);background-image:linear-gradient(to bottom,#fff 50%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic .select2-selection--single:focus{border:1px solid #0073aa}.select2-container--classic .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--classic .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:700;margin-right:10px}.select2-container--classic .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--classic .select2-selection--single .select2-selection__arrow{background-color:#ddd;border:none;border-left:1px solid #aaa;border-top-right-radius:4px;border-bottom-right-radius:4px;height:26px;position:absolute;top:1px;right:1px;width:20px;background-image:-webkit-linear-gradient(top,#eee 50%,#ccc 100%);background-image:linear-gradient(to bottom,#eee 50%,#ccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0)}.select2-container--classic .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent;border-style:solid;border-width:5px 4px 0;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--classic[dir=rtl] .select2-selection--single .select2-selection__clear{float:left}.select2-container--classic[dir=rtl] .select2-selection--single .select2-selection__arrow{border:none;border-right:1px solid #aaa;border-radius:4px 0 0 4px;left:1px;right:auto}.select2-container--classic.select2-container--open .select2-selection--single{border:1px solid #0073aa}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow{background:0 0;border:none}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888;border-width:0 4px 5px}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single{border-top:none;border-top-left-radius:0;border-top-right-radius:0;background-image:-webkit-linear-gradient(top,#fff 0,#eee 50%);background-image:linear-gradient(to bottom,#fff 0,#eee 50%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0;background-image:-webkit-linear-gradient(top,#eee 50%,#fff 100%);background-image:linear-gradient(to bottom,#eee 50%,#fff 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0)}.select2-container--classic .select2-selection--multiple{background-color:#fff;border:1px solid #aaa;border-radius:4px;cursor:text;outline:0}.select2-container--classic .select2-selection--multiple:focus{border:1px solid #0073aa}.select2-container--classic .select2-selection--multiple .select2-selection__rendered{list-style:none;margin:0;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__clear{display:none}.select2-container--classic .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove{color:#888;cursor:pointer;display:inline-block;font-weight:700;margin-right:2px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover{color:#555}.select2-container--classic[dir=rtl] .select2-selection--multiple .select2-selection__choice{float:right;margin-left:5px;margin-right:auto}.select2-container--classic[dir=rtl] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--classic.select2-container--open .select2-selection--multiple{border:1px solid #0073aa}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--classic .select2-search--dropdown .select2-search__field{border:1px solid #aaa;outline:0}.select2-container--classic .select2-search--inline .select2-search__field{outline:0;box-shadow:none}.select2-container--classic .select2-dropdown{background-color:#fff;border:1px solid transparent}.select2-container--classic .select2-dropdown--above{border-bottom:none}.select2-container--classic .select2-dropdown--below{border-top:none}.select2-container--classic .select2-results__option[role=group]{padding:0}.select2-container--classic .select2-results__option[aria-disabled=true]{color:grey}.select2-container--classic .select2-results__option--highlighted[aria-selected]{background-color:#3875d7;color:#fff}.select2-container--classic .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic.select2-container--open .select2-dropdown{border-color:#0073aa}
+@charset "UTF-8";.button.wc-reload::after,.woocommerce-help-tip::after{speak:none;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased}@-webkit-keyframes spin{100%{-webkit-transform:rotate(360deg)}}@keyframes spin{100%{-webkit-transform:rotate(360deg);-ms-transform:rotate(360deg);transform:rotate(360deg)}}@font-face{font-family:star;src:url(../fonts/star.eot);src:url(../fonts/star.eot?#iefix) format("embedded-opentype"),url(../fonts/star.woff) format("woff"),url(../fonts/star.ttf) format("truetype"),url(../fonts/star.svg#star) format("svg");font-weight:400;font-style:normal}@font-face{font-family:WooCommerce;src:url(../fonts/WooCommerce.eot);src:url(../fonts/WooCommerce.eot?#iefix) format("embedded-opentype"),url(../fonts/WooCommerce.woff) format("woff"),url(../fonts/WooCommerce.ttf) format("truetype"),url(../fonts/WooCommerce.svg#WooCommerce) format("svg");font-weight:400;font-style:normal}.blockUI.blockOverlay::before{height:1em;width:1em;display:block;position:absolute;top:50%;left:50%;margin-left:-.5em;margin-top:-.5em;content:'';-webkit-animation:spin 1s ease-in-out infinite;animation:spin 1s ease-in-out infinite;background:url(../images/icons/loader.svg) center center;background-size:cover;line-height:1;text-align:center;font-size:2em;color:rgba(0,0,0,.75)}.wc_addons_wrap .addons-featured{max-width:1140px;margin:-1%}.wc_addons_wrap .addons-banner-block-item-icon,.wc_addons_wrap .addons-column-block-item-icon{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center}.wc_addons_wrap .addons-banner-block{background:#fff;box-shadow:0 0 1px rgba(0,0,0,.2);margin:2% 1% 0;max-width:1140px;padding:20px}.wc_addons_wrap .addons-banner-block img{height:62px}.wc_addons_wrap .addons-banner-block p{margin:0 0 20px}.wc_addons_wrap .addons-banner-block-items{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-justify-content:space-around;-ms-flex-pack:distribute;justify-content:space-around;margin:0 -10px}.wc_addons_wrap .addons-banner-block-item{border:1px solid #e6e6e6;border-radius:3px;-webkit-box-flex:1;-webkit-flex:1 1 200px;-ms-flex:1 1 200px;flex:1 1 200px;margin:10px;max-width:350px;min-width:200px;width:30%}.wc_addons_wrap .addons-banner-block-item-icon{background:#f7f7f7;height:143px}.wc_addons_wrap .addons-banner-block-item-content{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;height:184px;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;padding:24px}.wc_addons_wrap .addons-column-block-item,.wc_addons_wrap .addons-column-section{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;-webkit-box-orient:horizontal;-webkit-box-direction:normal}.wc_addons_wrap .addons-banner-block-item-content h3{margin-top:0}.wc_addons_wrap .addons-banner-block-item-content p{margin:0 0 auto}.wc_addons_wrap .addons-column-section{display:flex;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-justify-content:space-around;-ms-flex-pack:distribute;justify-content:space-around}.wc_addons_wrap .addons-column{-webkit-box-flex:1;-webkit-flex:1 1 200px;-ms-flex:1 1 200px;flex:1 1 200px;margin:0 1%;width:49.5%}.wc_addons_wrap .addons-column-block,.wc_addons_wrap .addons-small-dark-block,.wc_addons_wrap .addons-small-light-block{box-sizing:border-box;box-shadow:0 0 1px rgba(0,0,0,.2);margin:4% 0 0;padding:20px}.wc_addons_wrap .addons-column-block img{max-height:50px;max-width:50px}.wc_addons_wrap .addons-column-block,.wc_addons_wrap .addons-small-light-block{background:#fff}.wc_addons_wrap .addons-column-block-left{float:left}.wc_addons_wrap .addons-column-block-right{float:right}.wc_addons_wrap .addons-column-block-item{display:flex;border-top:2px solid #f9f9f9;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;margin:0 -20px;padding:20px}.wc_addons_wrap .addons-column-block-item-icon{background:#f7f7f7;border:1px solid #e6e6e6;height:100px;margin:0 10px 10px 0;width:100px}.wc_addons_wrap .addons-column-block-item-content{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-webkit-flex:1 1 200px;-ms-flex:1 1 200px;flex:1 1 200px;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;height:20%;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;min-width:200px}.wc_addons_wrap .addons-column-block-item-content h2{float:left;margin-top:8px}.wc_addons_wrap .addons-column-block-item-content a{float:right}.wc_addons_wrap .addons-column-block-item-content p{float:left}.wc_addons_wrap .addons-small-dark-block{background-color:#54687d;text-align:center}.wc_addons_wrap .addons-small-dark-items{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-justify-content:space-around;-ms-flex-pack:distribute;justify-content:space-around}.wc_addons_wrap .addons-small-dark-item{margin:0 0 20px}.wc_addons_wrap .addons-small-dark-block h1{color:#fff}.wc_addons_wrap .addons-small-dark-block p{color:#fafafa}.wc_addons_wrap .addons-small-dark-item-icon img{height:30px}.wc_addons_wrap .addons-small-dark-item a{margin:28px auto 0}.wc_addons_wrap .addons-small-light-block{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap}.wc_addons_wrap .addons-small-light-block h1{margin-top:-12px}.wc_addons_wrap .addons-small-light-block p{margin-top:0}.wc_addons_wrap .addons-small-light-block img{height:225px;margin:0 0 0 -20px}.wc_addons_wrap .addons-small-light-block-content{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-webkit-flex:1 1 100px;-ms-flex:1 1 100px;flex:1 1 100px;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-justify-content:space-around;-ms-flex-pack:distribute;justify-content:space-around}.wc_addons_wrap .addons-small-light-block-buttons{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.wc_addons_wrap .addons-small-light-block-content a{width:48%}.wc_addons_wrap .addons-button{border-radius:3px;cursor:pointer;display:block;height:37px;line-height:37px;text-align:center;text-decoration:none;width:124px}.wc_addons_wrap .addons-button-solid{background-color:#955a89;color:#fff}.wc_addons_wrap .addons-button-solid:hover{color:#fff;opacity:.8}.wc_addons_wrap .addons-button-outline-green{border:1px solid #73ae39;color:#73ae39}.wc_addons_wrap .addons-button-outline-green:hover{color:#73ae39;opacity:.8}.wc_addons_wrap .addons-button-outline-white{border:1px solid #fff;color:#fff}.wc_addons_wrap .addons-button-outline-white:hover{color:#fff;opacity:.8}.wc_addons_wrap .addons-button-installed{background:#e6e6e6;color:#3c3c3c}.wc_addons_wrap .addons-button-installed:hover{color:#3c3c3c;opacity:.8}@media only screen and (max-width:400px){.wc_addons_wrap .addons-featured{margin:-1% -5%}.wc_addons_wrap .addons-button,.wc_addons_wrap .addons-small-dark-item{width:100%}.wc_addons_wrap .addons-column-block-item-icon{background:0 0;border:none;height:75px;margin:0 10px 10px 0;width:75px}}.wc_addons_wrap .products{overflow:hidden}.wc_addons_wrap .products li{float:left;margin:0 1em 1em 0!important;padding:0;vertical-align:top;width:300px}.wc_addons_wrap .products li a{text-decoration:none;color:inherit;border:1px solid #ddd;display:block;min-height:220px;overflow:hidden;background:#f5f5f5;box-shadow:inset 0 1px 0 rgba(255,255,255,.2),inset 0 -1px 0 rgba(0,0,0,.1)}.wc_addons_wrap .products li a img{max-width:258px;max-height:24px;padding:17px 20px;display:block;margin:0;background:#fff;border-right:260px solid #fff}.wc_addons_wrap .products li a .price,.wc_addons_wrap .products li a img.extension-thumb+h3{display:none}.wc_addons_wrap .products li a h2,.wc_addons_wrap .products li a h3{margin:0!important;padding:20px!important;background:#fff}.wc_addons_wrap .products li a p{padding:20px!important;margin:0!important;border-top:1px solid #f1f1f1}.wc_addons_wrap .products li a:focus,.wc_addons_wrap .products li a:hover{background-color:#fff}.wc_addons_wrap .storefront{background:url(../images/storefront-bg.jpg) bottom right #f6f6f6;border:1px solid #ddd;padding:20px;overflow:hidden;zoom:1}.wc_addons_wrap .storefront img{width:278px;height:auto;float:left;margin:0 20px 0 0;box-shadow:0 1px 6px rgba(0,0,0,.1)}.wc_addons_wrap .storefront p{max-width:750px}.woocommerce-BlankState a.button-primary,.woocommerce-BlankState button.button-primary,.woocommerce-message a.button-primary,.woocommerce-message button.button-primary{background:#bb77ae;border-color:#a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;color:#fff;text-shadow:0 -1px 1px #a36597,1px 0 1px #a36597,0 1px 1px #a36597,-1px 0 1px #a36597;display:inline-block}.woocommerce-BlankState a.button-primary:active,.woocommerce-BlankState a.button-primary:focus,.woocommerce-BlankState a.button-primary:hover,.woocommerce-BlankState button.button-primary:active,.woocommerce-BlankState button.button-primary:focus,.woocommerce-BlankState button.button-primary:hover,.woocommerce-message a.button-primary:active,.woocommerce-message a.button-primary:focus,.woocommerce-message a.button-primary:hover,.woocommerce-message button.button-primary:active,.woocommerce-message button.button-primary:focus,.woocommerce-message button.button-primary:hover{background:#a36597;border-color:#a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597}.woocommerce-message{position:relative;border-left-color:#cc99c2!important;overflow:hidden}.woocommerce-message a.docs,.woocommerce-message a.skip{text-decoration:none!important}.woocommerce-message a.woocommerce-message-close{position:absolute;top:10px;right:10px;padding:10px 15px 10px 21px;font-size:13px;line-height:1.23076923;text-decoration:none}.woocommerce-message a.woocommerce-message-close::before{position:absolute;top:8px;left:0;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out}.woocommerce-message .twitter-share-button{margin-top:-3px;margin-left:3px;vertical-align:middle}#variable_product_options #message,#variable_product_options .notice{margin:10px}.clear{clear:both}#woocommerce-fields-bulk.inline-edit-col label,#woocommerce-fields.inline-edit-col{clear:left}.wrap.woocommerce div.error,.wrap.woocommerce div.updated{margin-top:10px}mark.amount{background:0 0;color:inherit}.simplify-commerce-banner{overflow:hidden}.simplify-commerce-banner img{float:right;padding:15px 0;margin-left:1em;width:200px}.woocommerce-help-tip{color:#666;display:inline-block;font-size:1.1em;font-style:normal;height:16px;line-height:16px;position:relative;vertical-align:middle;width:16px}.woocommerce-help-tip::after{font-family:Dashicons;font-weight:400;line-height:1;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;content:"";cursor:help}h2 .woocommerce-help-tip{margin-top:-5px;margin-left:.25em}table.wc_status_table{margin-bottom:1em}table.wc_status_table h2{font-size:14px;margin:0}table.wc_status_table tr:nth-child(2n) td,table.wc_status_table tr:nth-child(2n) th{background:#fcfcfc}table.wc_status_table th{font-weight:700;padding:9px}table.wc_status_table td:first-child{width:33%}table.wc_status_table td.help{width:1em}table.wc_status_table td{padding:9px;font-size:1.1em}table.wc_status_table td mark{background:0 0}table.wc_status_table td mark.yes{color:#7ad03a}table.wc_status_table td mark.no{color:#999}table.wc_status_table td mark.error{color:#a00}table.wc_status_table td ul{margin:0}table.wc_status_table .help_tip{cursor:help}#debug-report{display:none;margin:10px 0;padding:0;position:relative}#debug-report textarea{font-family:monospace;width:100%;margin:0;height:300px;padding:20px;border-radius:0;resize:none;font-size:12px;line-height:20px;outline:0}.wp-list-table.logs .log-level{display:inline;padding:.2em .6em .3em;font-size:80%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.2em}.wp-list-table.logs .log-level:empty{display:none}.wp-list-table.logs .log-level--alert,.wp-list-table.logs .log-level--emergency{background-color:#ff4136}.wp-list-table.logs .log-level--critical,.wp-list-table.logs .log-level--error{background-color:#ff851b}.wp-list-table.logs .log-level--notice,.wp-list-table.logs .log-level--warning{color:#222;background-color:#ffdc00}.wp-list-table.logs .log-level--info{background-color:#0074d9}.wp-list-table.logs .log-level--debug{background-color:#3d9970}@media screen and (min-width:783px){.wp-list-table.logs .column-timestamp{width:18%}.wp-list-table.logs .column-level{width:14%}.wp-list-table.logs .column-source{width:15%}}#log-viewer-select{padding:10px 0 8px;line-height:28px}#log-viewer-select h2 a{vertical-align:middle}#log-viewer{background:#fff;border:1px solid #e5e5e5;box-shadow:0 1px 1px rgba(0,0,0,.04);padding:5px 20px}#log-viewer pre{font-family:monospace;white-space:pre-wrap}.inline-edit-product.quick-edit-row .inline-edit-col-center,.inline-edit-product.quick-edit-row .inline-edit-col-right{float:right!important}#woocommerce-fields.inline-edit-col label.featured,#woocommerce-fields.inline-edit-col label.manage_stock{margin-left:10px}#woocommerce-fields.inline-edit-col .dimensions div{display:block;margin:.2em 0}#woocommerce-fields.inline-edit-col .dimensions div span.title{display:block;float:left;width:5em}#woocommerce-fields.inline-edit-col .dimensions div span.input-text-wrap{display:block;margin-left:5em}#woocommerce-fields.inline-edit-col .text{box-sizing:border-box;width:99%;float:left;margin:1px 1% 1px 1px}#woocommerce-fields.inline-edit-col .height,#woocommerce-fields.inline-edit-col .length,#woocommerce-fields.inline-edit-col .width{width:32.33%}#woocommerce-fields.inline-edit-col .height{margin-right:0}#woocommerce-fields-bulk.inline-edit-col .inline-edit-group label{clear:none;width:49%;margin:.2em 0}#woocommerce-fields-bulk.inline-edit-col .inline-edit-group.dimensions label{width:75%;max-width:75%}#woocommerce-fields-bulk.inline-edit-col .length,#woocommerce-fields-bulk.inline-edit-col .regular_price,#woocommerce-fields-bulk.inline-edit-col .sale_price,#woocommerce-fields-bulk.inline-edit-col .stock,#woocommerce-fields-bulk.inline-edit-col .weight{box-sizing:border-box;width:100%;margin-left:4.4em}#woocommerce-fields-bulk.inline-edit-col .height,#woocommerce-fields-bulk.inline-edit-col .length,#woocommerce-fields-bulk.inline-edit-col .width{box-sizing:border-box;width:25%}.column-coupon_code{line-height:2.25em}.column-coupon_code,ul.wc_coupon_list{margin:0;overflow:hidden;zoom:1;clear:both}ul.wc_coupon_list li{margin:0}ul.wc_coupon_list li.code{display:inline-block}ul.wc_coupon_list li.code::after{content:', '}ul.wc_coupon_list li.code:last-of-type::after{display:none}ul.wc_coupon_list li.code .tips{cursor:pointer}ul.wc_coupon_list_block{margin:0;padding-bottom:2px}ul.wc_coupon_list_block li{border-top:1px solid #fff;border-bottom:1px solid #ccc;line-height:2.5em;margin:0;padding:.5em 0}ul.wc_coupon_list_block li:first-child{border-top:0;padding-top:0}ul.wc_coupon_list_block li:last-child{border-bottom:0;padding-bottom:0}.button.wc-reload{text-indent:-9999px;position:relative;padding:0;height:28px;width:28px!important;display:inline-block}.button.wc-reload::after{font-family:Dashicons;font-weight:400;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;content:"";line-height:28px}#order_data h2,#order_data p.order_number{font-family:HelveticaNeue-Light,'Helvetica Neue Light','Helvetica Neue',sans-serif;font-weight:400}#woocommerce-order-data .handlediv,#woocommerce-order-data .hndle{display:none}#woocommerce-order-data .inside{display:block!important}#order_data{padding:23px 24px 12px}#order_data h2{margin:0;font-size:21px;line-height:1.2;text-shadow:1px 1px 1px #fff;padding:0}#order_data h3{font-size:14px}#order_data h3,#order_data h4{color:#333;margin:1.33em 0 0}#order_data p{color:#777}#order_data p.order_number{margin:0;line-height:1.6em;font-size:16px}#order_data .order_data_column_container{clear:both}#order_data .order_data_column{width:32%;padding:0 2% 0 0;float:left}#order_data .order_data_column>h3 span{display:block}#order_data .order_data_column:last-child{padding-right:0}#order_data .order_data_column p{padding:0!important}#order_data .order_data_column .address strong{display:block}#order_data .order_data_column .form-field{float:left;clear:left;width:48%;padding:0;margin:9px 0 0}#order_data .order_data_column .form-field label{display:block;padding:0 0 3px}#order_data .order_data_column .form-field input,#order_data .order_data_column .form-field select,#order_data .order_data_column .form-field textarea{width:100%}#order_data .order_data_column .form-field .select2-container{width:100%!important}#order_data .order_data_column .form-field .date-picker{width:50%}#order_data .order_data_column .form-field .hour,#order_data .order_data_column .form-field .minute{width:3.5em}#order_data .order_data_column .form-field small{display:block;margin:5px 0 0;color:#999}#order_data .order_data_column ._billing_address_2_field,#order_data .order_data_column ._billing_last_name_field,#order_data .order_data_column ._billing_phone_field,#order_data .order_data_column ._billing_postcode_field,#order_data .order_data_column ._billing_state_field,#order_data .order_data_column ._shipping_address_2_field,#order_data .order_data_column ._shipping_last_name_field,#order_data .order_data_column ._shipping_postcode_field,#order_data .order_data_column ._shipping_state_field,#order_data .order_data_column .form-field.last{float:right;clear:right}#order_data .order_data_column ._billing_company_field,#order_data .order_data_column ._shipping_company_field,#order_data .order_data_column ._transaction_id_field,#order_data .order_data_column .form-field-wide{width:100%;clear:both}#order_data .order_data_column ._billing_company_field .wc-customer-search,#order_data .order_data_column ._billing_company_field .wc-enhanced-select,#order_data .order_data_column ._billing_company_field input,#order_data .order_data_column ._billing_company_field select,#order_data .order_data_column ._billing_company_field textarea,#order_data .order_data_column ._shipping_company_field .wc-customer-search,#order_data .order_data_column ._shipping_company_field .wc-enhanced-select,#order_data .order_data_column ._shipping_company_field input,#order_data .order_data_column ._shipping_company_field select,#order_data .order_data_column ._shipping_company_field textarea,#order_data .order_data_column ._transaction_id_field .wc-customer-search,#order_data .order_data_column ._transaction_id_field .wc-enhanced-select,#order_data .order_data_column ._transaction_id_field input,#order_data .order_data_column ._transaction_id_field select,#order_data .order_data_column ._transaction_id_field textarea,#order_data .order_data_column .form-field-wide .wc-customer-search,#order_data .order_data_column .form-field-wide .wc-enhanced-select,#order_data .order_data_column .form-field-wide input,#order_data .order_data_column .form-field-wide select,#order_data .order_data_column .form-field-wide textarea{width:100%}#order_data .order_data_column p.none_set{color:#999}#order_data .order_data_column div.edit_address{display:none;zoom:1;padding-right:1px}#order_data .order_data_column .wc-customer-user label a,#order_data .order_data_column .wc-order-status label a{float:right}#order_data .order_data_column a.edit_address{width:14px;height:0;padding:14px 0 0;margin:0 0 0 6px;overflow:hidden;position:relative;color:#999;border:0;float:right}#order_data .order_data_column a.edit_address:focus,#order_data .order_data_column a.edit_address:hover{color:#000}#order_data .order_data_column a.edit_address::after{position:absolute;top:0;left:0;text-align:center;vertical-align:top;line-height:14px;font-size:14px;font-weight:400;-webkit-font-smoothing:antialiased;font-family:Dashicons;content:'\f464'}#order_data .order_data_column .billing-same-as-shipping,#order_data .order_data_column .load_customer_billing,#order_data .order_data_column .load_customer_shipping{font-size:13px;display:inline-block;font-weight:400}#order_data .order_data_column .load_customer_shipping{margin-right:.3em}.order_actions{margin:0;overflow:hidden;zoom:1}.order_actions li{border-top:1px solid #fff;border-bottom:1px solid #ddd;padding:6px 0;margin:0;line-height:1.6em;float:left;width:50%;text-align:center}.order_actions li a{float:none;text-align:center;text-decoration:underline}.order_actions li.wide{width:auto;float:none;clear:both;padding:6px;text-align:left;overflow:hidden}.order_actions li #delete-action{line-height:25px;vertical-align:middle;text-align:left;float:left}.order_actions li .save_order{float:right}.order_actions li#actions{overflow:hidden}.order_actions li#actions .button{width:24px;box-sizing:border-box;float:right}.order_actions li#actions select{width:225px;box-sizing:border-box;float:left}#woocommerce-order-items .inside{margin:0;padding:0;background:#fefefe}#woocommerce-order-items .wc-order-data-row{border-bottom:1px solid #dfdfdf;padding:1.5em 2em;background:#f8f8f8;line-height:2em;text-align:right}#woocommerce-order-items .wc-order-data-row::after,#woocommerce-order-items .wc-order-data-row::before{content:' ';display:table}#woocommerce-order-items .wc-order-data-row::after{clear:both}#woocommerce-order-items .wc-order-data-row p{margin:0;line-height:2em}#woocommerce-order-items .wc-order-data-row .wc-used-coupons{text-align:left}#woocommerce-order-items .wc-order-data-row .wc-used-coupons .tips{display:inline-block}#woocommerce-order-items .wc-used-coupons{float:left;width:50%}#woocommerce-order-items .wc-order-totals{float:right;width:50%;margin:0;padding:0;text-align:right}#woocommerce-order-items .wc-order-totals .amount{font-weight:700}#woocommerce-order-items .wc-order-totals .label{vertical-align:top}#woocommerce-order-items .wc-order-totals .total{font-size:1em!important;width:10em;margin:0 0 0 .5em;box-sizing:border-box}#woocommerce-order-items .wc-order-totals .total input[type=text]{width:96%;float:right}#woocommerce-order-items .wc-order-totals .refunded-total{color:#a00}#woocommerce-order-items .refund-actions{margin-top:5px;padding-top:12px;border-top:1px solid #dfdfdf}#woocommerce-order-items .refund-actions .button{float:right;margin-left:4px}#woocommerce-order-items .refund-actions .cancel-action,#woocommerce-order-items .wc-order-item-bulk-edit .cancel-action{float:left;margin-left:0}#woocommerce-order-items .add_meta{margin-left:0!important}#woocommerce-order-items h3 small{color:#999}#woocommerce-order-items .amount{white-space:nowrap}#woocommerce-order-items .add-items .description{margin-right:10px}#woocommerce-order-items .add-items .button{float:left;margin-right:.25em}#woocommerce-order-items .add-items .button-primary{float:none;margin-right:0}#woocommerce-order-items .inside{display:block!important}#woocommerce-order-items .handlediv,#woocommerce-order-items .hndle{display:none}#woocommerce-order-items .woocommerce_order_items_wrapper{margin:0;overflow-x:auto}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items{width:100%;background:#fff}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items thead th{text-align:left;padding:1em;font-weight:400;color:#999;background:#f8f8f8;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items thead th.sortable{cursor:pointer}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items thead th:last-child{padding-right:2em}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items thead th:first-child{padding-left:2em}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items thead th .wc-arrow{float:right;position:relative;margin-right:-1em}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tbody th,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td{padding:1.5em 1em 1em;text-align:left;line-height:1.5em;vertical-align:top;border-bottom:1px solid #f8f8f8}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tbody th textarea,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td textarea{width:100%}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tbody th select,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td select{width:50%}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tbody th input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tbody th textarea,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td textarea{font-size:14px;padding:4px;color:#555}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tbody th:last-child,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td:last-child{padding-right:2em}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tbody th:first-child,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td:first-child{padding-left:2em}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tbody tr td{cursor:pointer}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tbody tr.selected{background:#f5ebf3}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tbody tr.selected td{border-color:#e6cce1;opacity:.8}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tbody tr:last-child td{border-bottom:1px solid #dfdfdf}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tbody tr:first-child td{border-top:8px solid #f8f8f8}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tbody#order_line_items tr:first-child td{border-top:none}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td.thumb{text-align:left;width:38px;padding-bottom:1.5em}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td.thumb .wc-order-item-thumbnail{width:38px;height:38px;border:2px solid #e8e8e8;background:#f8f8f8;color:#ccc;position:relative;font-size:21px;display:block;text-align:center}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td.thumb .wc-order-item-thumbnail::before{font-family:Dashicons;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;left:0;height:100%;text-align:center;content:"";width:38px;line-height:38px;display:block}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td.thumb .wc-order-item-thumbnail img{width:100%;height:100%;margin:0;padding:0;position:relative}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td.name .wc-order-item-sku,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td.name .wc-order-item-variation{display:block;margin-top:.5em;font-size:.92em!important;color:#888}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item{min-width:200px}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .center,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .variation-id{text-align:center}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class{text-align:right}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class label{white-space:nowrap;color:#999;font-size:.833em}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost label input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost label input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost label input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax label input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity label input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax label input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class label input{display:inline}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class input{width:70px;vertical-align:middle;text-align:right}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost select,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost select,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost select,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax select,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity select,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax select,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class select{width:85px;height:26px;vertical-align:middle;font-size:1em}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .split-input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .split-input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .split-input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .split-input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .split-input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .split-input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .split-input{display:inline-block;background:#fff;border:1px solid #ddd;box-shadow:inset 0 1px 2px rgba(0,0,0,.07);margin:1px 0;min-width:80px;overflow:hidden;line-height:1em;text-align:right}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .split-input div.input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .split-input div.input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .split-input div.input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .split-input div.input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .split-input div.input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .split-input div.input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .split-input div.input{width:100%;box-sizing:border-box}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .split-input div.input label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .split-input div.input label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .split-input div.input label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .split-input div.input label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .split-input div.input label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .split-input div.input label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .split-input div.input label{font-size:.75em;padding:4px 6px 0;color:#555;display:block}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .split-input div.input input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .split-input div.input input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .split-input div.input input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .split-input div.input input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .split-input div.input input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .split-input div.input input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .split-input div.input input{width:100%;box-sizing:border-box;border:0;box-shadow:none;margin:0;padding:0 6px 4px;color:#555;background:0 0}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .split-input div.input input::-webkit-input-placeholder,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .split-input div.input input::-webkit-input-placeholder,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .split-input div.input input::-webkit-input-placeholder,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .split-input div.input input::-webkit-input-placeholder,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .split-input div.input input::-webkit-input-placeholder,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .split-input div.input input::-webkit-input-placeholder,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .split-input div.input input::-webkit-input-placeholder{color:#ddd}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .split-input div.input:first-child,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .split-input div.input:first-child,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .split-input div.input:first-child,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .split-input div.input:first-child,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .split-input div.input:first-child,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .split-input div.input:first-child,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .split-input div.input:first-child{border-bottom:1px dashed #ddd;background:#fff}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .split-input div.input:first-child input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .split-input div.input:first-child label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .split-input div.input:first-child input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .split-input div.input:first-child label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .split-input div.input:first-child input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .split-input div.input:first-child label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .split-input div.input:first-child input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .split-input div.input:first-child label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .split-input div.input:first-child input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .split-input div.input:first-child label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .split-input div.input:first-child input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .split-input div.input:first-child label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .split-input div.input:first-child input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .split-input div.input:first-child label{color:#ccc}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .view,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .view,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .view,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .view,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .view,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .view,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .view{white-space:nowrap}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .edit,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .edit,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .edit,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .edit,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .edit,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .edit,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .edit{text-align:left}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .wc-order-item-discount,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .wc-order-item-refund-fields,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .wc-order-item-taxes,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost del,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost small.times,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .wc-order-item-discount,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .wc-order-item-refund-fields,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .wc-order-item-taxes,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost del,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost small.times,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .wc-order-item-discount,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .wc-order-item-refund-fields,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .wc-order-item-taxes,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost del,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost small.times,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .wc-order-item-discount,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .wc-order-item-refund-fields,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .wc-order-item-taxes,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax del,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax small.times,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .wc-order-item-discount,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .wc-order-item-refund-fields,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .wc-order-item-taxes,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity del,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity small.times,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .wc-order-item-discount,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .wc-order-item-refund-fields,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .wc-order-item-taxes,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax del,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax small.times,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .wc-order-item-discount,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .wc-order-item-refund-fields,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .wc-order-item-taxes,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class del,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class small.times{font-size:.92em!important;color:#888}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .wc-order-item-refund-fields,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .wc-order-item-taxes,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .wc-order-item-refund-fields,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .wc-order-item-taxes,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .wc-order-item-refund-fields,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .wc-order-item-taxes,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .wc-order-item-refund-fields,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .wc-order-item-taxes,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .wc-order-item-refund-fields,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .wc-order-item-taxes,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .wc-order-item-refund-fields,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .wc-order-item-taxes,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .wc-order-item-refund-fields,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .wc-order-item-taxes{margin:0}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .wc-order-item-refund-fields label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .wc-order-item-taxes label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .wc-order-item-refund-fields label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .wc-order-item-taxes label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .wc-order-item-refund-fields label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .wc-order-item-taxes label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .wc-order-item-refund-fields label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .wc-order-item-taxes label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .wc-order-item-refund-fields label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .wc-order-item-taxes label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .wc-order-item-refund-fields label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .wc-order-item-taxes label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .wc-order-item-refund-fields label,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .wc-order-item-taxes label{display:block}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost .wc-order-item-discount,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost .wc-order-item-discount,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost .wc-order-item-discount,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax .wc-order-item-discount,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity .wc-order-item-discount,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax .wc-order-item-discount,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class .wc-order-item-discount{display:block;margin-top:.5em}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .cost small.times,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .item_cost small.times,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_cost small.times,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .line_tax small.times,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity small.times,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax small.times,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .tax_class small.times{margin-right:.25em}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity{text-align:center}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .quantity input{text-align:center;width:50px}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items span.subtotal{opacity:.5}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td.tax_class,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items th.tax_class{text-align:left}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .calculated{border-color:#ae8ca2;border-style:dotted}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.meta{width:100%}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.display_meta,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.meta{margin:.5em 0 0;font-size:.92em!important;color:#888}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tr.fee .thumb div::before,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tr.refund .thumb div::before,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tr.shipping .thumb div::before{color:#ccc;top:0;left:0;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;text-align:center;font-family:WooCommerce}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.display_meta tr th,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.meta tr th{border:0;padding:0 4px .5em 0;line-height:1.5em;width:20%}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.display_meta tr td,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.meta tr td{padding:0 4px .5em 0;border:0;line-height:1.5em}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.display_meta tr td input,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.meta tr td input{width:100%;margin:0;position:relative;border-bottom:0;box-shadow:none}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items .refund_by,ul.order_notes li p.meta .exact-date{border-bottom:1px dotted #999}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.display_meta tr td textarea,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.meta tr td textarea{width:100%;height:4em;margin:0;box-shadow:none}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.display_meta tr td input:focus+textarea,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.meta tr td input:focus+textarea{border-top-color:#999}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.display_meta tr td p,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.meta tr td p{margin:0 0 .5em;line-height:1.5em}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.display_meta tr td p:last-child,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items table.meta tr td p:last-child{margin:0}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tr.fee .thumb div{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;font-size:1.5em;line-height:1em;vertical-align:middle;margin:0}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tr.fee .thumb div::before{line-height:1;margin:0;text-indent:0;position:absolute;width:100%;height:100%;content:""}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tr.refund .thumb div{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;font-size:1.5em;line-height:1em;vertical-align:middle;margin:0}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tr.refund .thumb div::before{line-height:1;margin:0;text-indent:0;position:absolute;width:100%;height:100%;content:""}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tr.shipping .thumb div{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;font-size:1.5em;line-height:1em;vertical-align:middle;margin:0}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tr.shipping .thumb div::before{line-height:1;margin:0;text-indent:0;position:absolute;width:100%;height:100%;content:""}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tr.shipping .shipping_method,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items tr.shipping .shipping_method_name{width:100%;margin:0 0 .5em}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items th.line_tax{white-space:nowrap}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td.line_tax .delete-order-tax,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items th.line_tax .delete-order-tax{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;float:right;font-size:14px;visibility:hidden;margin:3px -18px 0 0}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td.line_tax .delete-order-tax::before,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items th.line_tax .delete-order-tax::before{font-family:Dashicons;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;content:"";color:#999}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td.line_tax .delete-order-tax:hover::before,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items th.line_tax .delete-order-tax:hover::before{color:#a00}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items td.line_tax:hover .delete-order-tax,#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items th.line_tax:hover .delete-order-tax{visibility:visible}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items small.refunded{display:block;color:#a00;white-space:nowrap;margin-top:.5em}#woocommerce-order-items .woocommerce_order_items_wrapper table.woocommerce_order_items small.refunded::before{font-family:Dashicons;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;text-indent:0;width:100%;height:100%;text-align:center;content:"";position:relative;top:auto;left:auto;margin:-1px 4px 0 0;vertical-align:middle;line-height:1em}#woocommerce-order-items .wc-order-edit-line-item{padding-left:0}#woocommerce-order-items .wc-order-edit-line-item-actions{width:44px;text-align:right;padding-left:0;vertical-align:middle}#woocommerce-order-items .wc-order-edit-line-item-actions a{color:#ccc;display:inline-block;cursor:pointer;padding:0 0 .5em;margin:0 0 0 12px;vertical-align:middle;text-decoration:none;line-height:16px;width:16px;overflow:hidden}#woocommerce-order-items .wc-order-edit-line-item-actions a::before{margin:0;padding:0;font-size:16px;width:16px;height:16px}#woocommerce-order-items .wc-order-edit-line-item-actions .delete-order-item::before,#woocommerce-order-items .wc-order-edit-line-item-actions .delete_refund::before,#woocommerce-order-items .wc-order-edit-line-item-actions .edit-order-item::before{font-family:Dashicons;-webkit-font-smoothing:antialiased;top:0;left:0;width:100%;height:100%;margin:0;text-align:center;position:relative;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;text-indent:0}#woocommerce-order-items .wc-order-edit-line-item-actions a:hover::before{color:#999}#woocommerce-order-items .wc-order-edit-line-item-actions a:first-child{margin-left:0}#woocommerce-order-items .wc-order-edit-line-item-actions .edit-order-item::before{content:""}#woocommerce-order-items .wc-order-edit-line-item-actions .delete-order-item::before,#woocommerce-order-items .wc-order-edit-line-item-actions .delete_refund::before{content:""}#woocommerce-order-items .wc-order-edit-line-item-actions .delete-order-item:hover::before,#woocommerce-order-items .wc-order-edit-line-item-actions .delete_refund:hover::before{color:#a00}#woocommerce-order-items tbody tr .wc-order-edit-line-item-actions{visibility:hidden}#woocommerce-order-items tbody tr:hover .wc-order-edit-line-item-actions{visibility:visible}#woocommerce-order-items .wc-order-totals .wc-order-edit-line-item-actions{width:1.5em;visibility:visible!important}#woocommerce-order-items .wc-order-totals .wc-order-edit-line-item-actions a{padding:0}#woocommerce-order-downloads .buttons{float:left;padding:0;margin:0;vertical-align:top}#woocommerce-order-downloads .buttons .add_item_id,#woocommerce-order-downloads .buttons .select2-container{width:400px!important;margin-right:9px;vertical-align:top;float:left}#woocommerce-order-downloads .buttons button{margin:2px 0 0}#woocommerce-order-downloads h3 small{color:#999}#poststuff #woocommerce-order-actions .inside{margin:0;padding:0}#poststuff #woocommerce-order-actions .inside ul.order_actions li{padding:6px 10px;box-sizing:border-box}#poststuff #woocommerce-order-actions .inside ul.order_actions li:last-child{border-bottom:0}#poststuff #woocommerce-order-notes .inside{margin:0;padding:0}#poststuff #woocommerce-order-notes .inside ul.order_notes li{padding:0 10px}#woocommerce_customers p.search-box{margin:6px 0 4px;float:left}#woocommerce_customers .tablenav{float:right;clear:none}#woocommerce-product-images .inside #product_images_container ul::after,.woocommerce_variable_attributes .data::after{clear:both}.widefat.customers td{vertical-align:middle;padding:4px 7px}.widefat .column-order_title{width:15%}.widefat .column-order_title time{display:block;color:#999;margin:3px 0}.widefat .column-orders,.widefat .column-paying,.widefat .column-spent{text-align:center;width:8%}.widefat .column-last_order{width:11%}.widefat .column-order_actions,.widefat .column-user_actions,.widefat .column-wc_actions{width:110px}.widefat .column-order_actions a.button,.widefat .column-user_actions a.button,.widefat .column-wc_actions a.button{float:left;margin:0 4px 2px 0;cursor:pointer;padding:3px 4px;height:auto}.widefat .column-order_actions a.button img,.widefat .column-user_actions a.button img,.widefat .column-wc_actions a.button img{display:block;width:12px;height:auto}.widefat small.meta{display:block;color:#999;font-size:inherit;margin:3px 0}.widefat .column-order_date,.widefat .column-order_total{width:9%}.widefat .column-order_status{width:45px;text-align:center}.widefat .column-order_status mark{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;background:0 0;font-size:1.4em;margin:0 auto}.widefat .column-order_status mark.cancelled::after,.widefat .column-order_status mark.completed::after,.widefat .column-order_status mark.failed::after,.widefat .column-order_status mark.on-hold::after,.widefat .column-order_status mark.pending::after,.widefat .column-order_status mark.processing::after,.widefat .column-order_status mark.refunded::after{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center}.column-customer_message .note-on::after,.column-order_notes .note-on::after{speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;top:0;left:0;text-align:center;line-height:16px;font-family:WooCommerce}.widefat .column-order_status mark.pending::after{content:'\e012';color:#ffba00}.widefat .column-order_status mark.completed::after{content:'\e015';color:#2ea2cc}.widefat .column-order_status mark.on-hold::after{content:'\e033';color:#999}.widefat .column-order_status mark.failed::after{content:'\e016';color:#d0c21f}.widefat .column-order_status mark.cancelled::after{content:'\e013';color:#a00}.widefat .column-order_status mark.processing::after{content:'\e011';color:#73a724}.widefat .column-order_status mark.refunded::after{content:'\e014';color:#999}.widefat td.column-order_status{padding-top:9px}.column-customer_message .note-on{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;margin:0 auto;color:#999}.column-customer_message .note-on::after{margin:0;text-indent:0;position:absolute;width:100%;height:100%;content:""}.column-order_notes .note-on{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;margin:0 auto;color:#999}.column-order_notes .note-on::after{margin:0;text-indent:0;position:absolute;width:100%;height:100%;content:""}.order_actions .complete,.order_actions .processing,.order_actions .view{display:block;text-indent:-9999px;position:relative;padding:0!important;height:2em!important;width:2em}.order_actions .processing::after{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;content:"";line-height:1.85}.order_actions .complete::after,.order_actions .view::after{font-family:Dashicons;text-indent:0;position:absolute;width:100%;height:100%;left:0;line-height:1.85;margin:0;text-align:center;font-weight:400;top:0;speak:none;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased}.order_actions .complete::after{content:""}.order_actions .view::after{content:""}.user_actions .edit,.user_actions .link,.user_actions .refresh,.user_actions .view{display:block;text-indent:-9999px;position:relative;padding:0!important;height:2em!important;width:2em}.user_actions .edit::after,.user_actions .link::after,.user_actions .refresh::after,.user_actions .view::after{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;content:"";line-height:1.85}.user_actions .edit::after{font-family:Dashicons;content:'\f464'}.user_actions .link::after{content:'\e00d'}.user_actions .view::after{content:'\e010'}.user_actions .refresh::after{content:'\e031'}.attributes-table td,.attributes-table th{width:15%;vertical-align:top}.attributes-table .attribute-terms{width:32%}.attributes-table .attribute-actions{width:2em}.attributes-table .attribute-actions .configure-terms{display:block;text-indent:-9999px;position:relative;padding:0!important;height:2em!important;width:2em}.attributes-table .attribute-actions .configure-terms::after{speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;content:"";font-family:Dashicons;line-height:1.85}ul.order_notes{padding:2px 0 0}ul.order_notes li .note_content{padding:10px;background:#efefef;position:relative}ul.order_notes li .note_content p{margin:0;padding:0;word-wrap:break-word}ul.order_notes li p.meta{padding:10px;color:#999;margin:0;font-size:11px}ul.order_notes li a.delete_note{color:#a00}table.wp-list-table .row-actions,table.wp-list-table span.na{color:#999}ul.order_notes li .note_content::after{content:'';display:block;position:absolute;bottom:-10px;left:20px;width:0;height:0;border-width:10px 10px 0 0;border-style:solid;border-color:#efefef transparent}ul.order_notes li.customer-note .note_content{background:#a7cedc}ul.order_notes li.customer-note .note_content::after{border-color:#a7cedc transparent}ul.order_notes li.system-note .note_content{background:#d7cad2}ul.order_notes li.system-note .note_content::after{border-color:#d7cad2 transparent}.add_note{border-top:1px solid #ddd;padding:10px 10px 0}.add_note h4{margin-top:5px!important}.add_note #add_order_note{width:100%;height:50px}table.wp-list-table .column-thumb{width:52px;text-align:center;white-space:nowrap}table.wp-list-table .column-name{width:22%}table.wp-list-table .column-product_cat,table.wp-list-table .column-product_tag{width:11%!important}table.wp-list-table .column-featured,table.wp-list-table .column-product_type{width:48px;text-align:left!important}table.wp-list-table .column-customer_message,table.wp-list-table .column-order_notes{width:48px;text-align:center}table.wp-list-table .column-customer_message img,table.wp-list-table .column-order_notes img{margin:0 auto;padding-top:0!important}table.wp-list-table .manage-column.column-featured img,table.wp-list-table .manage-column.column-product_type img{padding-left:2px}table.wp-list-table .column-price .woocommerce-price-suffix{display:none}table.wp-list-table img{margin:1px 2px}table.wp-list-table td.column-thumb img{margin:0;width:auto;height:auto;max-width:40px;max-height:40px;vertical-align:middle}table.wp-list-table .column-is_in_stock{text-align:left!important}table.wp-list-table span.wc-featured,table.wp-list-table span.wc-image,table.wp-list-table span.wc-type{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;margin:0 auto}table.wp-list-table span.wc-featured::before,table.wp-list-table span.wc-image::before,table.wp-list-table span.wc-type::before{font-family:Dashicons;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;content:""}table.wp-list-table span.wc-featured::before{content:'\f155'}table.wp-list-table span.wc-featured.not-featured::before{content:'\f154'}table.wp-list-table td.column-featured span.wc-featured{font-size:1.6em;cursor:pointer}table.wp-list-table span.wc-type::before{font-family:WooCommerce;content:'\e006'}table.wp-list-table span.product-type{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;font-size:1.6em;margin:0 auto}table.wp-list-table span.product-type::before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;content:""}table.wp-list-table span.product-type.grouped::before{content:'\e002'}table.wp-list-table span.product-type.external::before{content:'\e034'}table.wp-list-table span.product-type.variable::before{content:'\e003'}table.wp-list-table span.product-type.downloadable::before{content:'\e001'}table.wp-list-table span.product-type.virtual::before{content:'\e000'}table.wp-list-table mark.instock{font-weight:700;color:#7ad03a;background:0 0;line-height:1}table.wp-list-table mark.outofstock{font-weight:700;color:#a44;background:0 0;line-height:1}table.wp-list-table .notes_head,table.wp-list-table .order-notes_head,table.wp-list-table .status_head{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;margin:0 auto}table.wp-list-table .notes_head::after,table.wp-list-table .order-notes_head::after,table.wp-list-table .status_head::after{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center}table.wc_emails .wc-email-settings-table-name,table.wc_emails td.name,table.wc_gateways .wc-email-settings-table-name,table.wc_gateways td.name,table.wc_shipping .wc-email-settings-table-name,table.wc_shipping td.name{font-weight:700}table.wp-list-table .order-notes_head::after{content:'\e028'}table.wp-list-table .notes_head::after{content:'\e026'}table.wp-list-table .status_head::after{content:'\e011'}table.wp-list-table .column-order_items{width:12%}table.wp-list-table .column-order_items table.order_items{width:100%;margin:3px 0 0;padding:0;display:none}table.wp-list-table .column-order_items table.order_items td{border:0;margin:0;padding:0 0 3px}table.wp-list-table .column-order_items table.order_items td.qty{color:#999;padding-right:6px;text-align:left}mark.notice{background:#fff;color:#a00;margin:0 0 0 10px}a.export_rates,a.import_rates{float:right;margin-left:9px;margin-top:-2px;margin-bottom:0}#rates-search{float:right}#rates-search input.wc-tax-rates-search-field{padding:4px 8px;font-size:1.2em}#rates-pagination{float:right;margin-right:.5em}#rates-pagination .tablenav{margin:0}table.wc_input_table,table.wc_tax_rates{width:100%}table.wc_input_table span.tips,table.wc_tax_rates span.tips{color:#2ea2cc}table.wc_input_table th,table.wc_tax_rates th{white-space:nowrap;padding:10px}table.wc_input_table td,table.wc_tax_rates td{padding:0;border-right:1px solid #dfdfdf;border-bottom:1px solid #dfdfdf;border-top:0;background:#fff;cursor:default}table.wc_input_table td input[type=text],table.wc_input_table td input[type=number],table.wc_tax_rates td input[type=text],table.wc_tax_rates td input[type=number]{width:100%;padding:8px 10px;margin:0;border:0;outline:0;background:0 0}table.wc_input_table td input[type=text]:focus,table.wc_input_table td input[type=number]:focus,table.wc_tax_rates td input[type=text]:focus,table.wc_tax_rates td input[type=number]:focus{outline:0;box-shadow:none}table.wc_input_table td.apply_to_shipping,table.wc_input_table td.compound,table.wc_tax_rates td.apply_to_shipping,table.wc_tax_rates td.compound{padding:5px 7px;vertical-align:middle}table.wc_input_table td.apply_to_shipping input,table.wc_input_table td.compound input,table.wc_tax_rates td.apply_to_shipping input,table.wc_tax_rates td.compound input{width:auto;padding:0}table.wc_input_table td:last-child,table.wc_tax_rates td:last-child{border-right:0}table.wc_input_table tr.current td,table.wc_tax_rates tr.current td{background-color:#fefbcc}table.wc_input_table .cost,table.wc_input_table .cost input,table.wc_input_table .item_cost,table.wc_input_table .item_cost input,table.wc_tax_rates .cost,table.wc_tax_rates .cost input,table.wc_tax_rates .item_cost,table.wc_tax_rates .item_cost input{text-align:right}table.wc_input_table th.sort,table.wc_tax_rates th.sort{width:17px;padding:0 4px}table.wc_input_table td.sort,table.wc_tax_rates td.sort{padding:0 4px}table.wc_input_table .ui-sortable:not(.ui-sortable-disabled) td.sort,table.wc_tax_rates .ui-sortable:not(.ui-sortable-disabled) td.sort{cursor:move;font-size:15px;background:#f9f9f9;text-align:center;vertical-align:middle}table.wc_input_table .ui-sortable:not(.ui-sortable-disabled) td.sort::before,table.wc_tax_rates .ui-sortable:not(.ui-sortable-disabled) td.sort::before{content:'\f333';font-family:Dashicons;text-align:center;line-height:1;color:#999;display:block;width:17px;float:left;height:100%}table.wc_input_table .ui-sortable:not(.ui-sortable-disabled) td.sort:hover::before,table.wc_tax_rates .ui-sortable:not(.ui-sortable-disabled) td.sort:hover::before{color:#333}table.wc_input_table .button,table.wc_tax_rates .button{float:left;margin-right:5px}table.wc_input_table .export,table.wc_input_table .import,table.wc_tax_rates .export,table.wc_tax_rates .import{float:right;margin-right:0;margin-left:5px}table.wc_input_table span.tips,table.wc_tax_rates span.tips{padding:0 3px}table.wc_input_table .pagination,table.wc_tax_rates .pagination{float:right}table.wc_input_table .pagination .button,table.wc_tax_rates .pagination .button{margin-left:5px;margin-right:0}table.wc_input_table .pagination .current,table.wc_tax_rates .pagination .current{background:#bbb;text-shadow:none}table.wc_input_table tr:last-child td,table.wc_tax_rates tr:last-child td{border-bottom:0}table.wc_emails,table.wc_gateways,table.wc_shipping{position:relative}table.wc_emails td,table.wc_gateways td,table.wc_shipping td{vertical-align:middle;padding:7px;line-height:2em}table.wc_emails tr:nth-child(odd) td,table.wc_gateways tr:nth-child(odd) td,table.wc_shipping tr:nth-child(odd) td{background:#f9f9f9}table.wc_emails th,table.wc_gateways th,table.wc_shipping th{padding:9px 7px!important;vertical-align:middle}table.wc_emails .settings,table.wc_gateways .settings,table.wc_shipping .settings{text-align:right}table.wc_emails .default,table.wc_emails .radio,table.wc_emails .status,table.wc_gateways .default,table.wc_gateways .radio,table.wc_gateways .status,table.wc_shipping .default,table.wc_shipping .radio,table.wc_shipping .status{text-align:center}table.wc_emails .default .tips,table.wc_emails .radio .tips,table.wc_emails .status .tips,table.wc_gateways .default .tips,table.wc_gateways .radio .tips,table.wc_gateways .status .tips,table.wc_shipping .default .tips,table.wc_shipping .radio .tips,table.wc_shipping .status .tips{margin:0 auto}table.wc_emails .default input,table.wc_emails .radio input,table.wc_emails .status input,table.wc_gateways .default input,table.wc_gateways .radio input,table.wc_gateways .status input,table.wc_shipping .default input,table.wc_shipping .radio input,table.wc_shipping .status input{margin:0}table.wc_emails th.sort,table.wc_gateways th.sort,table.wc_shipping th.sort{width:28px;padding:0}table.wc_emails td.sort,table.wc_gateways td.sort,table.wc_shipping td.sort{padding:0 7px;cursor:move;font-size:15px;text-align:center;vertical-align:middle}table.wc_emails td.sort::before,table.wc_gateways td.sort::before,table.wc_shipping td.sort::before{content:'\f333';font-family:Dashicons;text-align:center;line-height:1;color:#999;display:block;width:17px;float:left;height:100%}table.wc_emails .wc-email-settings-table-name span,table.wc_gateways .wc-email-settings-table-name span,table.wc_shipping .wc-email-settings-table-name span{font-weight:400;color:#999;margin:0 0 0 4px!important}table.wc_emails .wc-email-settings-table-status,table.wc_gateways .wc-email-settings-table-status,table.wc_shipping .wc-email-settings-table-status{text-align:center;width:1em}table.wc_emails .wc-email-settings-table-status .tips,table.wc_gateways .wc-email-settings-table-status .tips,table.wc_shipping .wc-email-settings-table-status .tips{margin:0 auto}table.wc_emails .wc-email-settings-table-actions a,table.wc_gateways .wc-email-settings-table-actions a,table.wc_shipping .wc-email-settings-table-actions a{display:block;text-indent:-9999px;position:relative;padding:0!important;height:2em!important;width:2em}table.wc_emails .wc-email-settings-table-actions a::after,table.wc_gateways .wc-email-settings-table-actions a::after,table.wc_shipping .wc-email-settings-table-actions a::after{speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;content:"";font-family:Dashicons;line-height:1.85}.wc-shipping-zone-settings th{padding:24px 24px 24px 0}.wc-shipping-zone-settings td.forminp{padding:15px 10px}.wc-shipping-zone-settings td.forminp input,.wc-shipping-zone-settings td.forminp textarea{padding:8px;width:448px;max-width:100%!important}.wc-shipping-zone-settings td.forminp .wc-shipping-zone-region-select{width:448px;max-width:100%!important}.wc-shipping-zone-settings td.forminp .wc-shipping-zone-region-select .select2-choices{padding:8px 8px 4px;border-color:#DDD;min-height:0;line-height:1}.wc-shipping-zone-settings td.forminp .wc-shipping-zone-region-select .select2-choices input{padding:0}.wc-shipping-zone-settings td.forminp .wc-shipping-zone-region-select .select2-choices li{margin:0 4px 4px 0}.wc-shipping-zone-settings .wc-shipping-zone-postcodes-toggle{margin:.5em 0 0;font-size:.9em;text-decoration:underline;display:block}.wc-shipping-zone-settings .wc-shipping-zone-postcodes-toggle+.wc-shipping-zone-postcodes{display:none}.wc-shipping-zone-settings .wc-shipping-zone-postcodes textarea{margin:10px 0}.wc-shipping-zone-settings .wc-shipping-zone-postcodes .description{font-size:.9em;color:#999}.wc-shipping-zone-settings+p.submit{margin-top:0}table tr table.wc-shipping-zone-methods tr .row-actions,table tr:hover table.wc-shipping-zone-methods tr .row-actions{position:relative}table tr table.wc-shipping-zone-methods tr:hover .row-actions,table tr:hover table.wc-shipping-zone-methods tr:hover .row-actions{position:static}.wc-shipping-zones-heading .page-title-action{display:inline-block}table.wc-shipping-classes td,table.wc-shipping-classes th,table.wc-shipping-zone-methods td,table.wc-shipping-zone-methods th,table.wc-shipping-zones td,table.wc-shipping-zones th{vertical-align:top;line-height:24px;padding:1em!important;font-size:14px;background:#fff}table.wc-shipping-classes td li,table.wc-shipping-classes th li,table.wc-shipping-zone-methods td li,table.wc-shipping-zone-methods th li,table.wc-shipping-zones td li,table.wc-shipping-zones th li{line-height:24px;font-size:14px}table.wc-shipping-classes td .woocommerce-help-tip,table.wc-shipping-classes th .woocommerce-help-tip,table.wc-shipping-zone-methods td .woocommerce-help-tip,table.wc-shipping-zone-methods th .woocommerce-help-tip,table.wc-shipping-zones td .woocommerce-help-tip,table.wc-shipping-zones th .woocommerce-help-tip{margin:0!important}table.wc-shipping-classes thead th,table.wc-shipping-zone-methods thead th,table.wc-shipping-zones thead th{vertical-align:middle}table.wc-shipping-classes thead .wc-shipping-zone-sort,table.wc-shipping-zone-methods thead .wc-shipping-zone-sort,table.wc-shipping-zones thead .wc-shipping-zone-sort{text-align:center}table.wc-shipping-classes tbody td,table.wc-shipping-zone-methods tbody td,table.wc-shipping-zones tbody td{padding:1.5em 1em!important}table.wc-shipping-classes td.wc-shipping-zone-method-blank-state,table.wc-shipping-classes td.wc-shipping-zones-blank-state,table.wc-shipping-zone-methods td.wc-shipping-zone-method-blank-state,table.wc-shipping-zone-methods td.wc-shipping-zones-blank-state,table.wc-shipping-zones td.wc-shipping-zone-method-blank-state,table.wc-shipping-zones td.wc-shipping-zones-blank-state{background:#f7f1f6!important;overflow:hidden;position:relative;padding:7.5em 7.5%!important;border-bottom:2px solid #eee2ec}table.wc-shipping-classes td.wc-shipping-zone-method-blank-state.wc-shipping-zone-method-blank-state,table.wc-shipping-classes td.wc-shipping-zones-blank-state.wc-shipping-zone-method-blank-state,table.wc-shipping-zone-methods td.wc-shipping-zone-method-blank-state.wc-shipping-zone-method-blank-state,table.wc-shipping-zone-methods td.wc-shipping-zones-blank-state.wc-shipping-zone-method-blank-state,table.wc-shipping-zones td.wc-shipping-zone-method-blank-state.wc-shipping-zone-method-blank-state,table.wc-shipping-zones td.wc-shipping-zones-blank-state.wc-shipping-zone-method-blank-state{padding:2em!important}table.wc-shipping-classes td.wc-shipping-zone-method-blank-state.wc-shipping-zone-method-blank-state p,table.wc-shipping-classes td.wc-shipping-zones-blank-state.wc-shipping-zone-method-blank-state p,table.wc-shipping-zone-methods td.wc-shipping-zone-method-blank-state.wc-shipping-zone-method-blank-state p,table.wc-shipping-zone-methods td.wc-shipping-zones-blank-state.wc-shipping-zone-method-blank-state p,table.wc-shipping-zones td.wc-shipping-zone-method-blank-state.wc-shipping-zone-method-blank-state p,table.wc-shipping-zones td.wc-shipping-zones-blank-state.wc-shipping-zone-method-blank-state p{margin-bottom:0}table.wc-shipping-classes td.wc-shipping-zone-method-blank-state li,table.wc-shipping-classes td.wc-shipping-zone-method-blank-state p,table.wc-shipping-classes td.wc-shipping-zones-blank-state li,table.wc-shipping-classes td.wc-shipping-zones-blank-state p,table.wc-shipping-zone-methods td.wc-shipping-zone-method-blank-state li,table.wc-shipping-zone-methods td.wc-shipping-zone-method-blank-state p,table.wc-shipping-zone-methods td.wc-shipping-zones-blank-state li,table.wc-shipping-zone-methods td.wc-shipping-zones-blank-state p,table.wc-shipping-zones td.wc-shipping-zone-method-blank-state li,table.wc-shipping-zones td.wc-shipping-zone-method-blank-state p,table.wc-shipping-zones td.wc-shipping-zones-blank-state li,table.wc-shipping-zones td.wc-shipping-zones-blank-state p{color:#a46497;font-size:1.5em;line-height:1.5em;margin:0 0 1em;position:relative;z-index:1;text-shadow:1px 1px 1px #fff}table.wc-shipping-classes td.wc-shipping-zone-method-blank-state li.main,table.wc-shipping-classes td.wc-shipping-zone-method-blank-state p.main,table.wc-shipping-classes td.wc-shipping-zones-blank-state li.main,table.wc-shipping-classes td.wc-shipping-zones-blank-state p.main,table.wc-shipping-zone-methods td.wc-shipping-zone-method-blank-state li.main,table.wc-shipping-zone-methods td.wc-shipping-zone-method-blank-state p.main,table.wc-shipping-zone-methods td.wc-shipping-zones-blank-state li.main,table.wc-shipping-zone-methods td.wc-shipping-zones-blank-state p.main,table.wc-shipping-zones td.wc-shipping-zone-method-blank-state li.main,table.wc-shipping-zones td.wc-shipping-zone-method-blank-state p.main,table.wc-shipping-zones td.wc-shipping-zones-blank-state li.main,table.wc-shipping-zones td.wc-shipping-zones-blank-state p.main{font-size:2em}table.wc-shipping-classes td.wc-shipping-zone-method-blank-state li,table.wc-shipping-classes td.wc-shipping-zones-blank-state li,table.wc-shipping-zone-methods td.wc-shipping-zone-method-blank-state li,table.wc-shipping-zone-methods td.wc-shipping-zones-blank-state li,table.wc-shipping-zones td.wc-shipping-zone-method-blank-state li,table.wc-shipping-zones td.wc-shipping-zones-blank-state li{margin-left:1em;list-style:circle inside}table.wc-shipping-classes td.wc-shipping-zone-method-blank-state::before,table.wc-shipping-classes td.wc-shipping-zones-blank-state::before,table.wc-shipping-zone-methods td.wc-shipping-zone-method-blank-state::before,table.wc-shipping-zone-methods td.wc-shipping-zones-blank-state::before,table.wc-shipping-zones td.wc-shipping-zone-method-blank-state::before,table.wc-shipping-zones td.wc-shipping-zones-blank-state::before{content:'\e01b';font-family:WooCommerce;text-align:center;line-height:1;color:#eee2ec;display:block;width:1em;font-size:40em;top:50%;right:-3.75%;margin-top:-.1875em;position:absolute}table.wc-shipping-classes td.wc-shipping-zone-method-blank-state .button-primary,table.wc-shipping-classes td.wc-shipping-zones-blank-state .button-primary,table.wc-shipping-zone-methods td.wc-shipping-zone-method-blank-state .button-primary,table.wc-shipping-zone-methods td.wc-shipping-zones-blank-state .button-primary,table.wc-shipping-zones td.wc-shipping-zone-method-blank-state .button-primary,table.wc-shipping-zones td.wc-shipping-zones-blank-state .button-primary{background-color:#804877;border-color:#804877;box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 0 rgba(0,0,0,.15);margin:0;opacity:1;text-shadow:0 -1px 1px #8a4f7f,1px 0 1px #8a4f7f,0 1px 1px #8a4f7f,-1px 0 1px #8a4f7f;font-size:1.5em;padding:.75em 1em;height:auto;position:relative;z-index:1}table.wc-shipping-classes .wc-shipping-class-rows tr:nth-child(odd) td,table.wc-shipping-classes .wc-shipping-zone-method-rows tr:nth-child(odd) td,table.wc-shipping-classes tbody.wc-shipping-zone-rows tr:nth-child(odd) td,table.wc-shipping-classes tr.odd td,table.wc-shipping-zone-methods .wc-shipping-class-rows tr:nth-child(odd) td,table.wc-shipping-zone-methods .wc-shipping-zone-method-rows tr:nth-child(odd) td,table.wc-shipping-zone-methods tbody.wc-shipping-zone-rows tr:nth-child(odd) td,table.wc-shipping-zone-methods tr.odd td,table.wc-shipping-zones .wc-shipping-class-rows tr:nth-child(odd) td,table.wc-shipping-zones .wc-shipping-zone-method-rows tr:nth-child(odd) td,table.wc-shipping-zones tbody.wc-shipping-zone-rows tr:nth-child(odd) td,table.wc-shipping-zones tr.odd td{background:#f9f9f9}table.wc-shipping-classes p,table.wc-shipping-classes ul,table.wc-shipping-zone-methods p,table.wc-shipping-zone-methods ul,table.wc-shipping-zones p,table.wc-shipping-zones ul{margin:0}table.wc-shipping-classes td.wc-shipping-zone-method-sort,table.wc-shipping-classes td.wc-shipping-zone-sort,table.wc-shipping-zone-methods td.wc-shipping-zone-method-sort,table.wc-shipping-zone-methods td.wc-shipping-zone-sort,table.wc-shipping-zones td.wc-shipping-zone-method-sort,table.wc-shipping-zones td.wc-shipping-zone-sort{cursor:move;font-size:15px;text-align:center}table.wc-shipping-classes td.wc-shipping-zone-method-sort::before,table.wc-shipping-classes td.wc-shipping-zone-sort::before,table.wc-shipping-zone-methods td.wc-shipping-zone-method-sort::before,table.wc-shipping-zone-methods td.wc-shipping-zone-sort::before,table.wc-shipping-zones td.wc-shipping-zone-method-sort::before,table.wc-shipping-zones td.wc-shipping-zone-sort::before{content:'\f333';font-family:Dashicons;text-align:center;color:#999;display:block;width:17px;float:left;height:100%;line-height:24px}table.wc-shipping-classes td.wc-shipping-zone-method-sort:hover::before,table.wc-shipping-classes td.wc-shipping-zone-sort:hover::before,table.wc-shipping-zone-methods td.wc-shipping-zone-method-sort:hover::before,table.wc-shipping-zone-methods td.wc-shipping-zone-sort:hover::before,table.wc-shipping-zones td.wc-shipping-zone-method-sort:hover::before,table.wc-shipping-zones td.wc-shipping-zone-sort:hover::before{color:#333}table.wc-shipping-classes td.wc-shipping-zone-worldwide,table.wc-shipping-zone-methods td.wc-shipping-zone-worldwide,table.wc-shipping-zones td.wc-shipping-zone-worldwide{text-align:center}table.wc-shipping-classes td.wc-shipping-zone-worldwide::before,table.wc-shipping-zone-methods td.wc-shipping-zone-worldwide::before,table.wc-shipping-zones td.wc-shipping-zone-worldwide::before{content:'\f319';font-family:dashicons;text-align:center;color:#999;display:block;width:17px;float:left;height:100%;line-height:24px}table.wc-shipping-classes .wc-shipping-zone-methods,table.wc-shipping-classes .wc-shipping-zone-name,table.wc-shipping-zone-methods .wc-shipping-zone-methods,table.wc-shipping-zone-methods .wc-shipping-zone-name,table.wc-shipping-zones .wc-shipping-zone-methods,table.wc-shipping-zones .wc-shipping-zone-name{width:25%}table.wc-shipping-classes .wc-shipping-class-description input,table.wc-shipping-classes .wc-shipping-class-description select,table.wc-shipping-classes .wc-shipping-class-description textarea,table.wc-shipping-classes .wc-shipping-class-name input,table.wc-shipping-classes .wc-shipping-class-name select,table.wc-shipping-classes .wc-shipping-class-name textarea,table.wc-shipping-classes .wc-shipping-class-slug input,table.wc-shipping-classes .wc-shipping-class-slug select,table.wc-shipping-classes .wc-shipping-class-slug textarea,table.wc-shipping-classes .wc-shipping-zone-name input,table.wc-shipping-classes .wc-shipping-zone-name select,table.wc-shipping-classes .wc-shipping-zone-name textarea,table.wc-shipping-classes .wc-shipping-zone-region input,table.wc-shipping-classes .wc-shipping-zone-region select,table.wc-shipping-classes .wc-shipping-zone-region textarea,table.wc-shipping-zone-methods .wc-shipping-class-description input,table.wc-shipping-zone-methods .wc-shipping-class-description select,table.wc-shipping-zone-methods .wc-shipping-class-description textarea,table.wc-shipping-zone-methods .wc-shipping-class-name input,table.wc-shipping-zone-methods .wc-shipping-class-name select,table.wc-shipping-zone-methods .wc-shipping-class-name textarea,table.wc-shipping-zone-methods .wc-shipping-class-slug input,table.wc-shipping-zone-methods .wc-shipping-class-slug select,table.wc-shipping-zone-methods .wc-shipping-class-slug textarea,table.wc-shipping-zone-methods .wc-shipping-zone-name input,table.wc-shipping-zone-methods .wc-shipping-zone-name select,table.wc-shipping-zone-methods .wc-shipping-zone-name textarea,table.wc-shipping-zone-methods .wc-shipping-zone-region input,table.wc-shipping-zone-methods .wc-shipping-zone-region select,table.wc-shipping-zone-methods .wc-shipping-zone-region textarea,table.wc-shipping-zones .wc-shipping-class-description input,table.wc-shipping-zones .wc-shipping-class-description select,table.wc-shipping-zones .wc-shipping-class-description textarea,table.wc-shipping-zones .wc-shipping-class-name input,table.wc-shipping-zones .wc-shipping-class-name select,table.wc-shipping-zones .wc-shipping-class-name textarea,table.wc-shipping-zones .wc-shipping-class-slug input,table.wc-shipping-zones .wc-shipping-class-slug select,table.wc-shipping-zones .wc-shipping-class-slug textarea,table.wc-shipping-zones .wc-shipping-zone-name input,table.wc-shipping-zones .wc-shipping-zone-name select,table.wc-shipping-zones .wc-shipping-zone-name textarea,table.wc-shipping-zones .wc-shipping-zone-region input,table.wc-shipping-zones .wc-shipping-zone-region select,table.wc-shipping-zones .wc-shipping-zone-region textarea{width:100%}table.wc-shipping-classes .wc-shipping-class-description a.wc-shipping-class-delete,table.wc-shipping-classes .wc-shipping-class-description a.wc-shipping-zone-delete,table.wc-shipping-classes .wc-shipping-class-name a.wc-shipping-class-delete,table.wc-shipping-classes .wc-shipping-class-name a.wc-shipping-zone-delete,table.wc-shipping-classes .wc-shipping-class-slug a.wc-shipping-class-delete,table.wc-shipping-classes .wc-shipping-class-slug a.wc-shipping-zone-delete,table.wc-shipping-classes .wc-shipping-zone-name a.wc-shipping-class-delete,table.wc-shipping-classes .wc-shipping-zone-name a.wc-shipping-zone-delete,table.wc-shipping-classes .wc-shipping-zone-region a.wc-shipping-class-delete,table.wc-shipping-classes .wc-shipping-zone-region a.wc-shipping-zone-delete,table.wc-shipping-zone-methods .wc-shipping-class-description a.wc-shipping-class-delete,table.wc-shipping-zone-methods .wc-shipping-class-description a.wc-shipping-zone-delete,table.wc-shipping-zone-methods .wc-shipping-class-name a.wc-shipping-class-delete,table.wc-shipping-zone-methods .wc-shipping-class-name a.wc-shipping-zone-delete,table.wc-shipping-zone-methods .wc-shipping-class-slug a.wc-shipping-class-delete,table.wc-shipping-zone-methods .wc-shipping-class-slug a.wc-shipping-zone-delete,table.wc-shipping-zone-methods .wc-shipping-zone-name a.wc-shipping-class-delete,table.wc-shipping-zone-methods .wc-shipping-zone-name a.wc-shipping-zone-delete,table.wc-shipping-zone-methods .wc-shipping-zone-region a.wc-shipping-class-delete,table.wc-shipping-zone-methods .wc-shipping-zone-region a.wc-shipping-zone-delete,table.wc-shipping-zones .wc-shipping-class-description a.wc-shipping-class-delete,table.wc-shipping-zones .wc-shipping-class-description a.wc-shipping-zone-delete,table.wc-shipping-zones .wc-shipping-class-name a.wc-shipping-class-delete,table.wc-shipping-zones .wc-shipping-class-name a.wc-shipping-zone-delete,table.wc-shipping-zones .wc-shipping-class-slug a.wc-shipping-class-delete,table.wc-shipping-zones .wc-shipping-class-slug a.wc-shipping-zone-delete,table.wc-shipping-zones .wc-shipping-zone-name a.wc-shipping-class-delete,table.wc-shipping-zones .wc-shipping-zone-name a.wc-shipping-zone-delete,table.wc-shipping-zones .wc-shipping-zone-region a.wc-shipping-class-delete,table.wc-shipping-zones .wc-shipping-zone-region a.wc-shipping-zone-delete{color:#a00}table.wc-shipping-classes .wc-shipping-class-description a.wc-shipping-class-delete:hover,table.wc-shipping-classes .wc-shipping-class-description a.wc-shipping-zone-delete:hover,table.wc-shipping-classes .wc-shipping-class-name a.wc-shipping-class-delete:hover,table.wc-shipping-classes .wc-shipping-class-name a.wc-shipping-zone-delete:hover,table.wc-shipping-classes .wc-shipping-class-slug a.wc-shipping-class-delete:hover,table.wc-shipping-classes .wc-shipping-class-slug a.wc-shipping-zone-delete:hover,table.wc-shipping-classes .wc-shipping-zone-name a.wc-shipping-class-delete:hover,table.wc-shipping-classes .wc-shipping-zone-name a.wc-shipping-zone-delete:hover,table.wc-shipping-classes .wc-shipping-zone-region a.wc-shipping-class-delete:hover,table.wc-shipping-classes .wc-shipping-zone-region a.wc-shipping-zone-delete:hover,table.wc-shipping-zone-methods .wc-shipping-class-description a.wc-shipping-class-delete:hover,table.wc-shipping-zone-methods .wc-shipping-class-description a.wc-shipping-zone-delete:hover,table.wc-shipping-zone-methods .wc-shipping-class-name a.wc-shipping-class-delete:hover,table.wc-shipping-zone-methods .wc-shipping-class-name a.wc-shipping-zone-delete:hover,table.wc-shipping-zone-methods .wc-shipping-class-slug a.wc-shipping-class-delete:hover,table.wc-shipping-zone-methods .wc-shipping-class-slug a.wc-shipping-zone-delete:hover,table.wc-shipping-zone-methods .wc-shipping-zone-name a.wc-shipping-class-delete:hover,table.wc-shipping-zone-methods .wc-shipping-zone-name a.wc-shipping-zone-delete:hover,table.wc-shipping-zone-methods .wc-shipping-zone-region a.wc-shipping-class-delete:hover,table.wc-shipping-zone-methods .wc-shipping-zone-region a.wc-shipping-zone-delete:hover,table.wc-shipping-zones .wc-shipping-class-description a.wc-shipping-class-delete:hover,table.wc-shipping-zones .wc-shipping-class-description a.wc-shipping-zone-delete:hover,table.wc-shipping-zones .wc-shipping-class-name a.wc-shipping-class-delete:hover,table.wc-shipping-zones .wc-shipping-class-name a.wc-shipping-zone-delete:hover,table.wc-shipping-zones .wc-shipping-class-slug a.wc-shipping-class-delete:hover,table.wc-shipping-zones .wc-shipping-class-slug a.wc-shipping-zone-delete:hover,table.wc-shipping-zones .wc-shipping-zone-name a.wc-shipping-class-delete:hover,table.wc-shipping-zones .wc-shipping-zone-name a.wc-shipping-zone-delete:hover,table.wc-shipping-zones .wc-shipping-zone-region a.wc-shipping-class-delete:hover,table.wc-shipping-zones .wc-shipping-zone-region a.wc-shipping-zone-delete:hover{color:red}table.wc-shipping-classes .wc-shipping-class-count,table.wc-shipping-zone-methods .wc-shipping-class-count,table.wc-shipping-zones .wc-shipping-class-count{text-align:center}table.wc-shipping-classes td.wc-shipping-zone-methods,table.wc-shipping-zone-methods td.wc-shipping-zone-methods,table.wc-shipping-zones td.wc-shipping-zone-methods{color:#555}table.wc-shipping-classes td.wc-shipping-zone-methods .method_disabled,table.wc-shipping-zone-methods td.wc-shipping-zone-methods .method_disabled,table.wc-shipping-zones td.wc-shipping-zone-methods .method_disabled{text-decoration:line-through}table.wc-shipping-classes td.wc-shipping-zone-methods ul,table.wc-shipping-zone-methods td.wc-shipping-zone-methods ul,table.wc-shipping-zones td.wc-shipping-zone-methods ul{position:relative;padding-right:32px}table.wc-shipping-classes td.wc-shipping-zone-methods ul li,table.wc-shipping-zone-methods td.wc-shipping-zone-methods ul li,table.wc-shipping-zones td.wc-shipping-zone-methods ul li{color:#555;display:inline;margin:0}table.wc-shipping-classes td.wc-shipping-zone-methods ul li::before,table.wc-shipping-zone-methods td.wc-shipping-zone-methods ul li::before,table.wc-shipping-zones td.wc-shipping-zone-methods ul li::before{content:', '}table.wc-shipping-classes td.wc-shipping-zone-methods ul li:first-child::before,table.wc-shipping-zone-methods td.wc-shipping-zone-methods ul li:first-child::before,table.wc-shipping-zones td.wc-shipping-zone-methods ul li:first-child::before{content:''}table.wc-shipping-classes td.wc-shipping-zone-methods .add_shipping_method,table.wc-shipping-zone-methods td.wc-shipping-zone-methods .add_shipping_method,table.wc-shipping-zones td.wc-shipping-zone-methods .add_shipping_method{display:block;width:24px;padding:24px 0 0;height:0;overflow:hidden;cursor:pointer}table.wc-shipping-classes td.wc-shipping-zone-methods .add_shipping_method::before,table.wc-shipping-zone-methods td.wc-shipping-zone-methods .add_shipping_method::before,table.wc-shipping-zones td.wc-shipping-zone-methods .add_shipping_method::before{speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;font-family:Dashicons;content:'\f502';color:#999;vertical-align:middle;line-height:24px;font-size:16px;margin:0}table.wc-shipping-classes td.wc-shipping-zone-methods .add_shipping_method.disabled,table.wc-shipping-zone-methods td.wc-shipping-zone-methods .add_shipping_method.disabled,table.wc-shipping-zones td.wc-shipping-zone-methods .add_shipping_method.disabled{cursor:not-allowed}table.wc-shipping-classes td.wc-shipping-zone-methods .add_shipping_method.disabled::before,table.wc-shipping-zone-methods td.wc-shipping-zone-methods .add_shipping_method.disabled::before,table.wc-shipping-zones td.wc-shipping-zone-methods .add_shipping_method.disabled::before{color:#ccc}table.wc-shipping-classes .wc-shipping-zone-method-title,table.wc-shipping-zone-methods .wc-shipping-zone-method-title,table.wc-shipping-zones .wc-shipping-zone-method-title{width:25%}table.wc-shipping-classes .wc-shipping-zone-method-title .wc-shipping-zone-method-delete,table.wc-shipping-zone-methods .wc-shipping-zone-method-title .wc-shipping-zone-method-delete,table.wc-shipping-zones .wc-shipping-zone-method-title .wc-shipping-zone-method-delete{color:red}table.wc-shipping-classes .wc-shipping-zone-method-enabled,table.wc-shipping-zone-methods .wc-shipping-zone-method-enabled,table.wc-shipping-zones .wc-shipping-zone-method-enabled{text-align:center}table.wc-shipping-classes .wc-shipping-zone-method-enabled a,table.wc-shipping-zone-methods .wc-shipping-zone-method-enabled a,table.wc-shipping-zones .wc-shipping-zone-method-enabled a{display:inline-block}table.wc-shipping-classes .wc-shipping-zone-method-enabled .woocommerce-input-toggle,table.wc-shipping-zone-methods .wc-shipping-zone-method-enabled .woocommerce-input-toggle,table.wc-shipping-zones .wc-shipping-zone-method-enabled .woocommerce-input-toggle{margin-top:3px}table.wc-shipping-classes .wc-shipping-zone-method-type,table.wc-shipping-zone-methods .wc-shipping-zone-method-type,table.wc-shipping-zones .wc-shipping-zone-method-type{display:block}table.wc-shipping-classes tfoot input,table.wc-shipping-classes tfoot select,table.wc-shipping-zone-methods tfoot input,table.wc-shipping-zone-methods tfoot select,table.wc-shipping-zones tfoot input,table.wc-shipping-zones tfoot select{vertical-align:middle!important}table.wc-shipping-classes tfoot .button-secondary,table.wc-shipping-zone-methods tfoot .button-secondary,table.wc-shipping-zones tfoot .button-secondary{float:right}table.wc-shipping-classes .editing .wc-shipping-zone-edit,table.wc-shipping-classes .editing .wc-shipping-zone-view,table.wc-shipping-zone-methods .editing .wc-shipping-zone-edit,table.wc-shipping-zone-methods .editing .wc-shipping-zone-view,table.wc-shipping-zones .editing .wc-shipping-zone-edit,table.wc-shipping-zones .editing .wc-shipping-zone-view{display:none}.woocommerce-input-toggle{height:16px;width:32px;border:2px solid #935687;background-color:#935687;display:inline-block;text-indent:-9999px;border-radius:10em;position:relative}.woocommerce-input-toggle:before{content:"";display:block;width:16px;height:16px;background:#fff;position:absolute;top:0;right:0;border-radius:100%}.woocommerce-input-toggle.woocommerce-input-toggle--disabled{border-color:#999;background-color:#999}.woocommerce-input-toggle.woocommerce-input-toggle--disabled:before{right:auto;left:0}.wc-modal-shipping-method-settings{background:#f8f8f8;padding:1em!important}.wc-modal-shipping-method-settings form .form-table{width:100%;background:#fff;margin:0 0 1.5em}.wc-modal-shipping-method-settings form .form-table tr th{width:30%;position:relative}.wc-modal-shipping-method-settings form .form-table tr th .woocommerce-help-tip{float:right;margin:-8px -.5em 0 0;vertical-align:middle;right:0;top:50%;position:absolute}.wc-modal-shipping-method-settings form .form-table tr td input,.wc-modal-shipping-method-settings form .form-table tr td select,.wc-modal-shipping-method-settings form .form-table tr td textarea{width:50%;min-width:250px}.wc-modal-shipping-method-settings form .form-table tr td input[type=checkbox]{width:auto;min-width:16px}.wc-modal-shipping-method-settings form .form-table tr td,.wc-modal-shipping-method-settings form .form-table tr th{vertical-align:middle;margin:0;line-height:24px;padding:1em;border-bottom:1px solid #f8f8f8}.wc-modal-shipping-method-settings form .form-table:last-of-type{margin-bottom:0}.wc-backbone-modal .wc-shipping-zone-method-selector p{margin-top:0}.wc-backbone-modal .wc-shipping-zone-method-selector .wc-shipping-zone-method-description{margin:.75em 1px 0;line-height:1.5em;color:#999;font-style:italic}.wc-backbone-modal .wc-shipping-zone-method-selector select{width:100%;cursor:pointer}img.help_tip{margin:0 0 0 9px;vertical-align:middle}.postbox img.help_tip{margin-top:0}.postbox .woocommerce-help-tip{margin:0 0 0 9px}.status-disabled,.status-enabled,.status-manual{font-size:1.4em;display:block;text-indent:-9999px;position:relative;height:1em;width:1em}.status-disabled::before,.status-enabled::before,.status-manual::before{font-family:WooCommerce;line-height:1;margin:0;position:absolute;width:100%;height:100%;text-indent:0;top:0;font-variant:normal;-webkit-font-smoothing:antialiased;font-weight:400;text-align:center;left:0;speak:none;text-transform:none}.status-manual::before{content:"";color:#999}.status-enabled::before{content:"";color:#a46497}.status-disabled::before{content:"";color:#ccc}.woocommerce h2.woo-nav-tab-wrapper{margin-bottom:1em}.woocommerce nav.woo-nav-tab-wrapper{margin:1.5em 0 1em;border-bottom:1px solid #ccc}.woocommerce .subsubsub{margin:-8px 0 0}.woocommerce .wc-admin-breadcrumb{margin-left:.5em}.woocommerce .wc-admin-breadcrumb a{color:#a46497}.woocommerce #template div{margin:0}.woocommerce #template div p .button{float:right;margin-left:10px;margin-top:-4px}.woocommerce #template div .editor textarea{margin-bottom:8px}.woocommerce textarea[disabled=disabled]{background:#dfdfdf!important}.woocommerce table.form-table{margin:0;position:relative}.woocommerce table.form-table .forminp-radio ul{margin:0}.woocommerce table.form-table .forminp-radio ul li{line-height:1.4em}.woocommerce table.form-table textarea.input-text{height:100%;min-width:150px;display:block}.woocommerce table.form-table input.regular-input{width:400px}.woocommerce table.form-table textarea.wide-input{width:100%}.woocommerce table.form-table .woocommerce-help-tip,.woocommerce table.form-table img.help_tip{padding:0;margin:-4px 0 0 5px;vertical-align:middle;cursor:help;line-height:1}.woocommerce table.form-table span.help_tip{cursor:help;color:#2ea2cc}.woocommerce table.form-table th{position:relative;padding-right:24px}.woocommerce table.form-table .select2-container{vertical-align:top;margin-bottom:3px}.woocommerce table.form-table table.widefat th{padding-right:inherit}.woocommerce table.form-table th .woocommerce-help-tip,.woocommerce table.form-table th img.help_tip{margin:2px -24px 0 0;float:right}.woocommerce table.form-table .wp-list-table .woocommerce-help-tip{float:none}.woocommerce table.form-table fieldset{margin-top:4px}.woocommerce table.form-table fieldset .woocommerce-help-tip,.woocommerce table.form-table fieldset img.help_tip{margin:-3px 0 0 5px}.woocommerce table.form-table fieldset p.description{margin-bottom:8px}.woocommerce table.form-table fieldset:first-child{margin-top:0}.woocommerce table.form-table .iris-picker{z-index:100;display:none;position:absolute;border:1px solid #ccc;border-radius:3px;box-shadow:0 1px 3px rgba(0,0,0,.2)}.woocommerce table.form-table .iris-picker .ui-slider{border:0!important;margin:0!important;width:auto!important;height:auto!important;background:none!important}.woocommerce table.form-table .iris-picker .ui-slider .ui-slider-handle{margin-bottom:0!important}.woocommerce table.form-table .colorpickpreview{padding:3px 3px 3px 20px;border:1px solid #ddd;border-right:0;margin-left:-3px}.woocommerce table.form-table .colorpick{border-left:0}.woocommerce table.form-table .image_width_settings{vertical-align:middle}.woocommerce table.form-table .image_width_settings label{margin-left:10px}.woocommerce table.form-table .wc_emails_wrapper{padding:0 15px 10px 0}.woocommerce #tabs-wrap table a.remove{margin-left:4px}.woocommerce #tabs-wrap table p{margin:0 0 4px!important;overflow:hidden;zoom:1}.woocommerce #tabs-wrap table p a.add{float:left}#wp-excerpt-editor-container{background:#fff}#product_variation-parent #parent_id{width:100%}#postimagediv img{border:1px solid #d5d5d5;max-width:100%}#woocommerce-product-images .inside{margin:0;padding:0}#woocommerce-product-images .inside .add_product_images{padding:0 12px 12px}#woocommerce-product-images .inside #product_images_container{padding:0 0 0 9px}#woocommerce-product-images .inside #product_images_container ul{margin:0;padding:0}#woocommerce-product-images .inside #product_images_container ul::after,#woocommerce-product-images .inside #product_images_container ul::before{content:' ';display:table}#woocommerce-product-images .inside #product_images_container ul li.add,#woocommerce-product-images .inside #product_images_container ul li.image,#woocommerce-product-images .inside #product_images_container ul li.wc-metabox-sortable-placeholder{width:80px;float:left;cursor:move;border:1px solid #d5d5d5;margin:9px 9px 0 0;background:#f7f7f7;border-radius:2px;position:relative;box-sizing:border-box}#woocommerce-product-images .inside #product_images_container ul li.add img,#woocommerce-product-images .inside #product_images_container ul li.image img,#woocommerce-product-images .inside #product_images_container ul li.wc-metabox-sortable-placeholder img{width:100%;height:auto;display:block}#woocommerce-product-images .inside #product_images_container ul li.wc-metabox-sortable-placeholder{border:3px dashed #ddd;position:relative}#woocommerce-product-images .inside #product_images_container ul li.wc-metabox-sortable-placeholder::after{font-family:Dashicons;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;content:"";font-size:2.618em;line-height:72px;color:#ddd}#woocommerce-product-images .inside #product_images_container ul ul.actions{position:absolute;top:-8px;right:-8px;padding:2px;display:none}#woocommerce-product-images .inside #product_images_container ul ul.actions li{float:right;margin:0 0 0 2px}#woocommerce-product-images .inside #product_images_container ul ul.actions li a{width:1em;margin:0;height:0;display:block;overflow:hidden}#woocommerce-product-images .inside #product_images_container ul ul.actions li a.tips{cursor:pointer}#woocommerce-product-images .inside #product_images_container ul ul.actions li a.delete{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;font-size:1.4em}#woocommerce-product-images .inside #product_images_container ul ul.actions li a.delete::before{font-family:Dashicons;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;content:"";color:#999}#woocommerce-product-images .inside #product_images_container ul ul.actions li a.delete:hover::before{color:#a00}#woocommerce-product-images .inside #product_images_container ul li:hover ul.actions{display:block}#woocommerce-product-data .hndle{padding:10px}#woocommerce-product-data .hndle span{display:block;vertical-align:middle;line-height:24px}#woocommerce-product-data .hndle span span{display:inline;line-height:inherit;vertical-align:baseline}#woocommerce-product-data .hndle select{margin:0 0 0 .5em}#woocommerce-product-data .hndle label{padding-right:1em;font-size:12px;vertical-align:baseline}#woocommerce-product-data .hndle label:first-child{margin-right:1em;border-right:1px solid #dfdfdf}#woocommerce-product-data .hndle input,#woocommerce-product-data .hndle select{margin-top:-3px 0 0;vertical-align:middle}#woocommerce-product-data>.handlediv{margin-top:4px}#woocommerce-product-data .wrap{margin:0}#woocommerce-coupon-description{padding:3px 8px;font-size:1.7em;line-height:1.42em;height:auto;width:100%;outline:0;margin:10px 0;display:block}#woocommerce-coupon-description::-webkit-input-placeholder{line-height:1.42em;color:#bbb}#woocommerce-coupon-description::-moz-placeholder{line-height:1.42em;color:#bbb}#woocommerce-coupon-description:-ms-input-placeholder{line-height:1.42em;color:#bbb}#woocommerce-coupon-description:-moz-placeholder{line-height:1.42em;color:#bbb}#woocommerce-coupon-data .panel-wrap,#woocommerce-product-data .panel-wrap{background:#fff}#woocommerce-coupon-data .wc-metaboxes-wrapper,#woocommerce-coupon-data .woocommerce_options_panel,#woocommerce-product-data .wc-metaboxes-wrapper,#woocommerce-product-data .woocommerce_options_panel{float:left;width:80%}#woocommerce-coupon-data .wc-metaboxes-wrapper .wc-radios,#woocommerce-coupon-data .woocommerce_options_panel .wc-radios,#woocommerce-product-data .wc-metaboxes-wrapper .wc-radios,#woocommerce-product-data .woocommerce_options_panel .wc-radios{display:block;float:left;margin:0}#woocommerce-coupon-data .wc-metaboxes-wrapper .wc-radios li,#woocommerce-coupon-data .woocommerce_options_panel .wc-radios li,#woocommerce-product-data .wc-metaboxes-wrapper .wc-radios li,#woocommerce-product-data .woocommerce_options_panel .wc-radios li{display:block;padding:0 0 10px}#woocommerce-coupon-data .wc-metaboxes-wrapper .wc-radios li input,#woocommerce-coupon-data .woocommerce_options_panel .wc-radios li input,#woocommerce-product-data .wc-metaboxes-wrapper .wc-radios li input,#woocommerce-product-data .woocommerce_options_panel .wc-radios li input{width:auto}#woocommerce-coupon-data .panel-wrap,#woocommerce-product-data .panel-wrap,.woocommerce .panel-wrap{overflow:hidden}#woocommerce-coupon-data ul.wc-tabs,#woocommerce-product-data ul.wc-tabs,.woocommerce ul.wc-tabs{margin:0;width:20%;float:left;line-height:1em;padding:0 0 10px;position:relative;background-color:#fafafa;border-right:1px solid #eee;box-sizing:border-box}#woocommerce-coupon-data ul.wc-tabs::after,#woocommerce-product-data ul.wc-tabs::after,.woocommerce ul.wc-tabs::after{content:'';display:block;width:100%;height:9999em;position:absolute;bottom:-9999em;left:0;background-color:#fafafa;border-right:1px solid #eee}#woocommerce-coupon-data ul.wc-tabs li,#woocommerce-product-data ul.wc-tabs li,.woocommerce ul.wc-tabs li{margin:0;padding:0;display:block;position:relative}#woocommerce-coupon-data ul.wc-tabs li a,#woocommerce-product-data ul.wc-tabs li a,.woocommerce ul.wc-tabs li a{margin:0;padding:10px;display:block;box-shadow:none;text-decoration:none;line-height:20px!important;border-bottom:1px solid #eee}#woocommerce-coupon-data ul.wc-tabs li a span,#woocommerce-product-data ul.wc-tabs li a span,.woocommerce ul.wc-tabs li a span{margin-left:.618em;margin-right:.618em}#woocommerce-coupon-data ul.wc-tabs li a::before,#woocommerce-product-data ul.wc-tabs li a::before,.woocommerce ul.wc-tabs li a::before{font-family:Dashicons;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;content:"";text-decoration:none}#woocommerce-coupon-data ul.wc-tabs li.general_options a::before,#woocommerce-product-data ul.wc-tabs li.general_options a::before,.woocommerce ul.wc-tabs li.general_options a::before{content:'\f107'}#woocommerce-coupon-data ul.wc-tabs li.inventory_options a::before,#woocommerce-product-data ul.wc-tabs li.inventory_options a::before,.woocommerce ul.wc-tabs li.inventory_options a::before{content:'\f481'}#woocommerce-coupon-data ul.wc-tabs li.shipping_options a::before,#woocommerce-product-data ul.wc-tabs li.shipping_options a::before,.woocommerce ul.wc-tabs li.shipping_options a::before{font-family:WooCommerce;content:'\e01a'}#woocommerce-coupon-data ul.wc-tabs li.linked_product_options a::before,#woocommerce-product-data ul.wc-tabs li.linked_product_options a::before,.woocommerce ul.wc-tabs li.linked_product_options a::before{content:'\f103'}#woocommerce-coupon-data ul.wc-tabs li.attribute_options a::before,#woocommerce-product-data ul.wc-tabs li.attribute_options a::before,.woocommerce ul.wc-tabs li.attribute_options a::before{content:'\f175'}#woocommerce-coupon-data ul.wc-tabs li.advanced_options a::before,#woocommerce-product-data ul.wc-tabs li.advanced_options a::before,.woocommerce ul.wc-tabs li.advanced_options a::before{font-family:Dashicons;content:'\f111'}#woocommerce-coupon-data ul.wc-tabs li.variations_options a::before,#woocommerce-product-data ul.wc-tabs li.variations_options a::before,.woocommerce ul.wc-tabs li.variations_options a::before{content:'\f509'}#woocommerce-coupon-data ul.wc-tabs li.usage_restriction_options a::before,#woocommerce-product-data ul.wc-tabs li.usage_restriction_options a::before,.woocommerce ul.wc-tabs li.usage_restriction_options a::before{font-family:WooCommerce;content:'\e602'}#woocommerce-coupon-data ul.wc-tabs li.usage_limit_options a::before,#woocommerce-product-data ul.wc-tabs li.usage_limit_options a::before,.woocommerce ul.wc-tabs li.usage_limit_options a::before{font-family:WooCommerce;content:'\e601'}#woocommerce-coupon-data ul.wc-tabs li.general_coupon_data a::before,#woocommerce-product-data ul.wc-tabs li.general_coupon_data a::before,.woocommerce ul.wc-tabs li.general_coupon_data a::before{font-family:WooCommerce;content:'\e600'}#woocommerce-coupon-data ul.wc-tabs li.active a,#woocommerce-product-data ul.wc-tabs li.active a,.woocommerce ul.wc-tabs li.active a{color:#555;position:relative;background-color:#eee}.woocommerce_page_wc-settings input[type=email],.woocommerce_page_wc-settings input[type=url]{direction:ltr}.woocommerce_page_wc-settings .shippingrows th.check-column{padding-top:20px}.woocommerce_page_wc-settings .shippingrows tfoot th{padding-left:10px}.woocommerce_page_wc-settings .shippingrows .add.button::before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin-right:.618em;content:"";text-decoration:none}.woocommerce_page_wc-settings h3.wc-settings-sub-title{font-size:1.2em}#woocommerce-coupon-data .inside,#woocommerce-order-data .inside,#woocommerce-order-downloads .inside,#woocommerce-product-data .inside,#woocommerce-product-type-options .inside{margin:0;padding:0}.panel,.woocommerce_options_panel{padding:9px;color:#555}.panel .form-field .woocommerce-help-tip,.woocommerce_options_panel .form-field .woocommerce-help-tip{font-size:1.4em}.panel,.woocommerce_page_settings .woocommerce_options_panel{padding:0}#woocommerce-product-specs .inside,#woocommerce-product-type-options .panel{margin:0;padding:9px}#woocommerce-product-type-options .panel p,.woocommerce_options_panel fieldset.form-field,.woocommerce_options_panel p{margin:0 0 9px;font-size:12px;padding:5px 9px;line-height:24px}#woocommerce-product-type-options .panel p::after,.woocommerce_options_panel fieldset.form-field::after,.woocommerce_options_panel p::after{content:'.';display:block;height:0;clear:both;visibility:hidden}.woocommerce_options_panel .checkbox,.woocommerce_variable_attributes .checkbox{width:auto;margin:4px 0!important;vertical-align:middle;float:left}.woocommerce_options_panel .downloadable_files table,.woocommerce_variations .downloadable_files table{width:100%;padding:0!important}.woocommerce_options_panel .downloadable_files table th,.woocommerce_variations .downloadable_files table th{padding:7px 0 7px 7px!important}.woocommerce_options_panel .downloadable_files table th.sort,.woocommerce_variations .downloadable_files table th.sort{width:17px;padding:7px!important}.woocommerce_options_panel .downloadable_files table th .woocommerce-help-tip,.woocommerce_variations .downloadable_files table th .woocommerce-help-tip{font-size:1.1em;margin-left:0}.woocommerce_options_panel .downloadable_files table td,.woocommerce_variations .downloadable_files table td{vertical-align:middle!important;padding:4px 0 4px 7px!important;position:relative}.woocommerce_options_panel .downloadable_files table td:last-child,.woocommerce_variations .downloadable_files table td:last-child{padding-right:7px!important}.woocommerce_options_panel .downloadable_files table td input.input_text,.woocommerce_variations .downloadable_files table td input.input_text{width:100%;float:none;min-width:0;margin:1px 0}.woocommerce_options_panel .downloadable_files table td .upload_file_button,.woocommerce_variations .downloadable_files table td .upload_file_button{width:auto;float:right;cursor:pointer}.woocommerce_options_panel .downloadable_files table td .delete,.woocommerce_variations .downloadable_files table td .delete{display:block;text-indent:-9999px;position:relative;height:1em;width:1em;font-size:1.2em}.woocommerce_options_panel .downloadable_files table td .delete::before,.woocommerce_variations .downloadable_files table td .delete::before{font-family:Dashicons;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;content:"";color:#999}.woocommerce_options_panel .downloadable_files table td .delete:hover::before,.woocommerce_variations .downloadable_files table td .delete:hover::before{color:#a00}.woocommerce_options_panel .downloadable_files table td.sort,.woocommerce_variations .downloadable_files table td.sort{width:17px;cursor:move;font-size:15px;text-align:center;background:#f9f9f9;padding-right:7px!important}.woocommerce_options_panel .downloadable_files table td.sort::before,.woocommerce_variations .downloadable_files table td.sort::before{content:'\f333';font-family:Dashicons;text-align:center;line-height:1;color:#999;display:block;width:17px;float:left;height:100%}.woocommerce_options_panel .downloadable_files table td.sort:hover::before,.woocommerce_variations .downloadable_files table td.sort:hover::before{color:#333}.woocommerce_variation h3 .sort{width:17px;height:26px;cursor:move;float:right;font-size:15px;font-weight:400;margin-right:.5em;visibility:hidden;text-align:center;vertical-align:middle}.woocommerce_variation h3 .sort::before{content:'\f333';font-family:Dashicons;text-align:center;line-height:28px;color:#999;display:block;width:17px;float:left;height:100%}.woocommerce_variation h3 .sort:hover::before{color:#777}.woocommerce_variation h3:hover .sort,.woocommerce_variation.ui-sortable-helper .sort{visibility:visible}.woocommerce_options_panel{min-height:175px;box-sizing:border-box}.woocommerce_options_panel .downloadable_files{padding:0 9px 0 162px;position:relative;margin:9px 0}.woocommerce_options_panel .downloadable_files label{position:absolute;left:0;margin:0 0 0 12px;line-height:24px}.woocommerce_options_panel p{margin:9px 0}.woocommerce_options_panel fieldset.form-field,.woocommerce_options_panel p.form-field{padding:5px 20px 5px 162px!important}.woocommerce_options_panel .sale_price_dates_fields .short:first-of-type{margin-bottom:1em}.woocommerce_options_panel .sale_price_dates_fields .short:nth-of-type(2){clear:left}.woocommerce_options_panel label,.woocommerce_options_panel legend{float:left;width:150px;padding:0;margin:0 0 0 -150px}.woocommerce_options_panel label .req,.woocommerce_options_panel legend .req{font-weight:700;font-style:normal;color:#a00}.woocommerce_options_panel .description{padding:0;margin:0 0 0 7px;clear:none;display:inline}.woocommerce_options_panel .description-block{margin-left:0;display:block}.woocommerce_options_panel input,.woocommerce_options_panel select,.woocommerce_options_panel textarea{margin:0}.woocommerce_options_panel textarea{float:left;height:3.5em;line-height:1.5em;vertical-align:top}.woocommerce_options_panel input[type=text],.woocommerce_options_panel input[type=number],.woocommerce_options_panel input[type=email],.woocommerce_options_panel input[type=password]{width:50%;float:left}.woocommerce_options_panel input.button{width:auto;margin-left:8px}.woocommerce_options_panel select{float:left}.woocommerce_options_panel .short,.woocommerce_options_panel input[type=text].short,.woocommerce_options_panel input[type=number].short,.woocommerce_options_panel input[type=email].short,.woocommerce_options_panel input[type=password].short{width:50%}.woocommerce_options_panel .sized{width:auto!important;margin-right:6px}.woocommerce_options_panel .options_group{border-top:1px solid #fff;border-bottom:1px solid #eee}.woocommerce_options_panel .options_group:first-child{border-top:0}.woocommerce_options_panel .options_group:last-child{border-bottom:0}.woocommerce_options_panel .options_group fieldset{margin:9px 0;font-size:12px;padding:5px 9px;line-height:24px}.woocommerce_options_panel .options_group fieldset label{width:auto;float:none}.woocommerce_options_panel .options_group fieldset ul{float:left;width:50%;margin:0;padding:0}.woocommerce_options_panel .options_group fieldset ul li{margin:0;width:auto}.woocommerce_options_panel .options_group fieldset ul li input{width:auto;float:none;margin-right:4px}.woocommerce_options_panel .options_group fieldset ul.wc-radios label{margin-left:0}.woocommerce_options_panel .dimensions_field .wrap{display:block;width:50%}.woocommerce_options_panel .dimensions_field .wrap input{width:30.75%;margin-right:3.8%}.woocommerce_options_panel .dimensions_field .wrap .last{margin-right:0}.woocommerce_options_panel.padded{padding:1em}#woocommerce-product-data input.dp-applied,.woocommerce_options_panel .select2-container{float:left}#grouped_product_options,#simple_product_options,#virtual_product_options{padding:12px;font-style:italic;color:#666}.wc-metaboxes-wrapper .toolbar{margin:0!important;border-top:1px solid #fff;border-bottom:1px solid #eee;padding:9px 12px!important}.wc-metaboxes-wrapper .toolbar:first-child{border-top:0}.wc-metaboxes-wrapper .toolbar:last-child{border-bottom:0}.wc-metaboxes-wrapper .toolbar .add_variation{float:right;margin-left:5px}.wc-metaboxes-wrapper .toolbar .cancel-variation-changes,.wc-metaboxes-wrapper .toolbar .save-variation-changes{float:left;margin-right:5px}.wc-metaboxes-wrapper p.toolbar{overflow:hidden;zoom:1}.wc-metaboxes-wrapper .expand-close{margin-right:2px;color:#777;font-size:12px;font-style:italic}.wc-metaboxes-wrapper .expand-close a{background:0 0;padding:0;font-size:12px;text-decoration:none}.wc-metaboxes-wrapper#product_attributes .expand-close{float:right;line-height:28px}.wc-metaboxes-wrapper .fr,.wc-metaboxes-wrapper button.add_variable_attribute{float:right;margin:0 0 0 6px}.wc-metaboxes-wrapper .wc-metaboxes{border-bottom:1px solid #eee}.wc-metaboxes-wrapper .wc-metabox-sortable-placeholder{border-color:#bbb;background-color:#f5f5f5;margin-bottom:9px;border-width:1px;border-style:dashed}.wc-metaboxes-wrapper .wc-metabox{background:#fff;border-bottom:1px solid #eee;margin:0!important}.wc-metaboxes-wrapper .wc-metabox select{font-weight:400}.wc-metaboxes-wrapper .wc-metabox:last-of-type{border-bottom:0}.wc-metaboxes-wrapper .wc-metabox .handlediv{width:27px}.wc-metaboxes-wrapper .wc-metabox .handlediv::before{content:'\f142'!important;cursor:pointer;display:inline-block;font:400 20px/1 Dashicons;line-height:.5!important;padding:8px 10px;position:relative;right:12px;top:0}.wc-metaboxes-wrapper .wc-metabox.closed{border-radius:3px}.wc-metaboxes-wrapper .wc-metabox.closed .handlediv::before{content:'\f140'!important}.wc-metaboxes-wrapper .wc-metabox.closed h3{border:0}.wc-metaboxes-wrapper .wc-metabox h3{margin:0!important;padding:.75em .75em .75em 1em!important;font-size:1em!important;overflow:hidden;zoom:1;cursor:move}.wc-metaboxes-wrapper .wc-metabox h3 a.delete,.wc-metaboxes-wrapper .wc-metabox h3 button{float:right}.wc-metaboxes-wrapper .wc-metabox h3 a.delete{color:red;font-weight:400;line-height:26px;text-decoration:none;position:relative;visibility:hidden}.wc-metaboxes-wrapper .wc-metabox h3 strong{line-height:26px;font-weight:700}.wc-metaboxes-wrapper .wc-metabox h3 select{font-family:sans-serif;max-width:20%;margin:.25em .25em .25em 0}.wc-metaboxes-wrapper .wc-metabox h3 .handlediv{background-position:6px 5px!important;visibility:hidden;height:26px}.wc-metaboxes-wrapper .wc-metabox h3.fixed{cursor:pointer!important}.wc-metaboxes-wrapper .wc-metabox.woocommerce_variation h3{cursor:pointer;padding:.5em .75em .5em 1em!important}.wc-metaboxes-wrapper .wc-metabox.woocommerce_variation h3 .handlediv,.wc-metaboxes-wrapper .wc-metabox.woocommerce_variation h3 .sort,.wc-metaboxes-wrapper .wc-metabox.woocommerce_variation h3 a.delete{margin-top:.25em}.wc-metaboxes-wrapper .wc-metabox h3:hover .handlediv,.wc-metaboxes-wrapper .wc-metabox h3:hover a.delete,.wc-metaboxes-wrapper .wc-metabox.ui-sortable-helper .handlediv,.wc-metaboxes-wrapper .wc-metabox.ui-sortable-helper a.delete{visibility:visible}.wc-metaboxes-wrapper .wc-metabox table{width:100%;position:relative;background-color:#fdfdfd;padding:1em;border-top:1px solid #eee}.wc-metaboxes-wrapper .wc-metabox table td{text-align:left;padding:0 6px 1em 0;vertical-align:top;border:0}.wc-metaboxes-wrapper .wc-metabox table td label{text-align:left;display:block;line-height:21px}.wc-metaboxes-wrapper .wc-metabox table td input{float:left;min-width:200px}.wc-metaboxes-wrapper .wc-metabox table td input,.wc-metaboxes-wrapper .wc-metabox table td textarea{width:100%;margin:0;display:block;font-size:14px;padding:4px;color:#555}.wc-metaboxes-wrapper .wc-metabox table td .select2-container,.wc-metaboxes-wrapper .wc-metabox table td select{width:100%!important}.wc-metaboxes-wrapper .wc-metabox table td input.short{width:200px}.wc-metaboxes-wrapper .wc-metabox table td input.checkbox{width:16px;min-width:inherit;vertical-align:text-bottom;display:inline-block;float:none}.wc-metaboxes-wrapper .wc-metabox table td.attribute_name{width:200px}.wc-metaboxes-wrapper .wc-metabox table .minus,.wc-metaboxes-wrapper .wc-metabox table .plus{margin-top:6px}.wc-metaboxes-wrapper .wc-metabox table .fl{float:left}.wc-metaboxes-wrapper .wc-metabox table .fr{float:right}.variations-pagenav{float:right;line-height:24px}.variations-pagenav .displaying-num{color:#777;font-size:12px;font-style:italic}.variations-pagenav a{padding:0 10px 3px;background:rgba(0,0,0,.05);font-size:16px;font-weight:400;text-decoration:none}.variations-pagenav a.disabled,.variations-pagenav a.disabled:active,.variations-pagenav a.disabled:focus,.variations-pagenav a.disabled:hover{color:#a0a5aa;background:rgba(0,0,0,.05)}.variations-defaults{float:left}.variations-defaults select{margin:.25em .25em .25em 0}.woocommerce_variable_attributes{background-color:#fdfdfd;border-top:1px solid #eee}.woocommerce_variable_attributes .data{padding:1em 2em}.woocommerce_variable_attributes .data::after,.woocommerce_variable_attributes .data::before{content:' ';display:table}.woocommerce_variable_attributes .upload_image_button{display:block;width:64px;height:64px;float:left;margin-right:20px;position:relative;cursor:pointer}.woocommerce_variable_attributes .upload_image_button img{width:100%;height:auto;display:none}.woocommerce_variable_attributes .upload_image_button::before{content:'\f128';font-family:Dashicons;position:absolute;top:0;left:0;right:0;bottom:0;text-align:center;line-height:64px;font-size:64px;font-weight:400;-webkit-font-smoothing:antialiased}.woocommerce_variable_attributes .upload_image_button.remove img{display:block}.woocommerce_variable_attributes .upload_image_button.remove::before{content:'\f335';display:none}.woocommerce_variable_attributes .upload_image_button.remove:hover::before{display:block}.woocommerce_variable_attributes .options{border:1px solid #eee;border-width:1px 0;padding:.25em 0}.woocommerce_variable_attributes .options label{display:inline-block;padding:4px 1em 2px 0}.woocommerce_variable_attributes .options input[type=checkbox]{margin:0 5px 0 .5em!important;vertical-align:middle}.form-row label{display:inline-block}.form-row .woocommerce-help-tip{float:right}.form-row input[type=number],.form-row input[type=text],.form-row select,.form-row textarea{width:100%;vertical-align:middle;margin:2px 0 0;padding:6px}.form-row select{height:30px;line-height:30px}.form-row.dimensions_field .wrap{clear:left;display:block}.form-row.dimensions_field input{width:33%;float:left;vertical-align:middle}.form-row.dimensions_field input:last-of-type{margin-right:0;width:34%}.form-row.form-row-first,.form-row.form-row-last{width:48%;float:right}.form-row.form-row-first{clear:both;float:left}.form-row.form-row-full{clear:both}.tips{cursor:help;text-decoration:none}img.tips{padding:5px 0 0}#tiptip_holder{display:none;z-index:8675309;position:absolute;top:0;left:0}#tiptip_holder.tip_top{padding-bottom:5px}#tiptip_holder.tip_top #tiptip_arrow_inner{margin-top:-7px;margin-left:-6px;border-top-color:#333}#tiptip_holder.tip_bottom{padding-top:5px}#tiptip_holder.tip_bottom #tiptip_arrow_inner{margin-top:-5px;margin-left:-6px;border-bottom-color:#333}#tiptip_holder.tip_right{padding-left:5px}#tiptip_holder.tip_right #tiptip_arrow_inner{margin-top:-6px;margin-left:-5px;border-right-color:#333}#tiptip_holder.tip_left{padding-right:5px}#tiptip_holder.tip_left #tiptip_arrow_inner{margin-top:-6px;margin-left:-7px;border-left-color:#333}#tiptip_content,.chart-tooltip,.wc_error_tip{color:#fff;font-size:.8em;max-width:150px;background:#333;text-align:center;border-radius:3px;padding:.618em 1em;box-shadow:0 1px 3px rgba(0,0,0,.2)}#tiptip_content code,.chart-tooltip code,.wc_error_tip code{padding:1px;background:#888}#tiptip_arrow,#tiptip_arrow_inner{position:absolute;border-color:transparent;border-style:solid;border-width:6px;height:0;width:0}.wc_error_tip{max-width:20em;line-height:1.8em;position:absolute;white-space:normal;background:#d82223;margin:1.5em 1px 0 -1em;z-index:9999999}.wc_error_tip::after{content:'';display:block;border:8px solid #d82223;border-right-color:transparent;border-left-color:transparent;border-top-color:transparent;position:absolute;top:-3px;left:50%;margin:-1em 0 0 -3px}img.ui-datepicker-trigger{vertical-align:middle;margin-top:-1px;cursor:pointer}.wc-metabox-content img.ui-datepicker-trigger,.woocommerce_options_panel img.ui-datepicker-trigger{float:left;margin-right:8px;margin-top:4px;margin-left:4px}#ui-datepicker-div{display:none}.woocommerce-reports-wide.woocommerce-reports-wrap,.woocommerce-reports-wrap.woocommerce-reports-wrap{margin-left:300px;padding-top:18px}.woocommerce-reports-wide.halved,.woocommerce-reports-wrap.halved{margin:0;overflow:hidden;zoom:1}.woocommerce-reports-wide .widefat td,.woocommerce-reports-wrap .widefat td{vertical-align:top;padding:7px}.woocommerce-reports-wide .widefat td .description,.woocommerce-reports-wrap .widefat td .description{margin:4px 0 0}.woocommerce-reports-wide .postbox::after,.woocommerce-reports-wrap .postbox::after{content:'.';display:block;height:0;clear:both;visibility:hidden}.woocommerce-reports-wide .postbox h3,.woocommerce-reports-wrap .postbox h3{cursor:default!important}.woocommerce-reports-wide .postbox .inside,.woocommerce-reports-wrap .postbox .inside{padding:10px;margin:0!important}.woocommerce-reports-wide .postbox div.stats_range,.woocommerce-reports-wide .postbox h3.stats_range,.woocommerce-reports-wrap .postbox div.stats_range,.woocommerce-reports-wrap .postbox h3.stats_range{border-bottom-color:#dfdfdf;margin:0;padding:0!important}.woocommerce-reports-wide .postbox div.stats_range .export_csv,.woocommerce-reports-wide .postbox h3.stats_range .export_csv,.woocommerce-reports-wrap .postbox div.stats_range .export_csv,.woocommerce-reports-wrap .postbox h3.stats_range .export_csv{float:right;line-height:26px;border-left:1px solid #dfdfdf;padding:10px;display:block;text-decoration:none}.woocommerce-reports-wide .postbox div.stats_range .export_csv::before,.woocommerce-reports-wide .postbox h3.stats_range .export_csv::before,.woocommerce-reports-wrap .postbox div.stats_range .export_csv::before,.woocommerce-reports-wrap .postbox h3.stats_range .export_csv::before{font-family:Dashicons;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;content:"";text-decoration:none;margin-right:4px}.woocommerce-reports-wide .postbox div.stats_range ul,.woocommerce-reports-wide .postbox h3.stats_range ul,.woocommerce-reports-wrap .postbox div.stats_range ul,.woocommerce-reports-wrap .postbox h3.stats_range ul{list-style:none;margin:0;padding:0;zoom:1;background:#f5f5f5;border-bottom:1px solid #ccc}.woocommerce-reports-wide .postbox div.stats_range ul::after,.woocommerce-reports-wide .postbox div.stats_range ul::before,.woocommerce-reports-wide .postbox h3.stats_range ul::after,.woocommerce-reports-wide .postbox h3.stats_range ul::before,.woocommerce-reports-wrap .postbox div.stats_range ul::after,.woocommerce-reports-wrap .postbox div.stats_range ul::before,.woocommerce-reports-wrap .postbox h3.stats_range ul::after,.woocommerce-reports-wrap .postbox h3.stats_range ul::before{content:' ';display:table}.woocommerce-reports-wide .postbox div.stats_range ul::after,.woocommerce-reports-wide .postbox h3.stats_range ul::after,.woocommerce-reports-wrap .postbox div.stats_range ul::after,.woocommerce-reports-wrap .postbox h3.stats_range ul::after{clear:both}.woocommerce-reports-wide .postbox div.stats_range ul li,.woocommerce-reports-wide .postbox h3.stats_range ul li,.woocommerce-reports-wrap .postbox div.stats_range ul li,.woocommerce-reports-wrap .postbox h3.stats_range ul li{float:left;margin:0;padding:0;line-height:26px;font-weight:700;font-size:14px}.woocommerce-reports-wide .postbox div.stats_range ul li a,.woocommerce-reports-wide .postbox h3.stats_range ul li a,.woocommerce-reports-wrap .postbox div.stats_range ul li a,.woocommerce-reports-wrap .postbox h3.stats_range ul li a{border-right:1px solid #dfdfdf;padding:10px;display:block;text-decoration:none}.woocommerce-reports-wide .postbox div.stats_range ul li.active,.woocommerce-reports-wide .postbox h3.stats_range ul li.active,.woocommerce-reports-wrap .postbox div.stats_range ul li.active,.woocommerce-reports-wrap .postbox h3.stats_range ul li.active{background:#fff;box-shadow:0 4px 0 0 #fff}.woocommerce-reports-wide .postbox div.stats_range ul li.active a,.woocommerce-reports-wide .postbox h3.stats_range ul li.active a,.woocommerce-reports-wrap .postbox div.stats_range ul li.active a,.woocommerce-reports-wrap .postbox h3.stats_range ul li.active a{color:#777}.woocommerce-reports-wide .postbox div.stats_range ul li.custom,.woocommerce-reports-wide .postbox h3.stats_range ul li.custom,.woocommerce-reports-wrap .postbox div.stats_range ul li.custom,.woocommerce-reports-wrap .postbox h3.stats_range ul li.custom{padding:9px 10px;vertical-align:middle}.woocommerce-reports-wide .postbox div.stats_range ul li.custom div,.woocommerce-reports-wide .postbox div.stats_range ul li.custom form,.woocommerce-reports-wide .postbox h3.stats_range ul li.custom div,.woocommerce-reports-wide .postbox h3.stats_range ul li.custom form,.woocommerce-reports-wrap .postbox div.stats_range ul li.custom div,.woocommerce-reports-wrap .postbox div.stats_range ul li.custom form,.woocommerce-reports-wrap .postbox h3.stats_range ul li.custom div,.woocommerce-reports-wrap .postbox h3.stats_range ul li.custom form{display:inline;margin:0}.woocommerce-reports-wide .postbox div.stats_range ul li.custom div input.range_datepicker,.woocommerce-reports-wide .postbox div.stats_range ul li.custom form input.range_datepicker,.woocommerce-reports-wide .postbox h3.stats_range ul li.custom div input.range_datepicker,.woocommerce-reports-wide .postbox h3.stats_range ul li.custom form input.range_datepicker,.woocommerce-reports-wrap .postbox div.stats_range ul li.custom div input.range_datepicker,.woocommerce-reports-wrap .postbox div.stats_range ul li.custom form input.range_datepicker,.woocommerce-reports-wrap .postbox h3.stats_range ul li.custom div input.range_datepicker,.woocommerce-reports-wrap .postbox h3.stats_range ul li.custom form input.range_datepicker{padding:0;margin:0 10px 0 0;background:0 0;border:0;color:#777;text-align:center;box-shadow:none}.woocommerce-reports-wide .postbox div.stats_range ul li.custom div input.range_datepicker.from,.woocommerce-reports-wide .postbox div.stats_range ul li.custom form input.range_datepicker.from,.woocommerce-reports-wide .postbox h3.stats_range ul li.custom div input.range_datepicker.from,.woocommerce-reports-wide .postbox h3.stats_range ul li.custom form input.range_datepicker.from,.woocommerce-reports-wrap .postbox div.stats_range ul li.custom div input.range_datepicker.from,.woocommerce-reports-wrap .postbox div.stats_range ul li.custom form input.range_datepicker.from,.woocommerce-reports-wrap .postbox h3.stats_range ul li.custom div input.range_datepicker.from,.woocommerce-reports-wrap .postbox h3.stats_range ul li.custom form input.range_datepicker.from{margin-right:0}.woocommerce-reports-wide .postbox .chart-with-sidebar,.woocommerce-reports-wrap .postbox .chart-with-sidebar{padding:12px 12px 12px 249px;margin:0!important}.woocommerce-reports-wide .postbox .chart-with-sidebar .chart-sidebar,.woocommerce-reports-wrap .postbox .chart-with-sidebar .chart-sidebar{width:225px;margin-left:-237px;float:left}.woocommerce-reports-wide .postbox .chart-widgets,.woocommerce-reports-wrap .postbox .chart-widgets{margin:0;padding:0}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget{margin:0 0 1em;background:#fafafa;border:1px solid #dfdfdf}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget::after,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget::after{content:'.';display:block;height:0;clear:both;visibility:hidden}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget h4,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget h4{background:#fff;border:1px solid #dfdfdf;border-left-width:0;border-right-width:0;padding:10px;margin:0;color:#2ea2cc;border-top-width:0;background-image:-webkit-gradient(linear,left bottom,left top,from(#ececec),to(#f9f9f9));background-image:-webkit-linear-gradient(bottom,#ececec,#f9f9f9);background-image:linear-gradient(to top,#ececec,#f9f9f9)}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget table td.count,.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget table tr.active td,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget table td.count,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget table tr.active td{background:#f5f5f5}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget h4.section_title:hover,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget h4.section_title:hover{color:#a00}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget .section_title,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget .section_title{cursor:pointer}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget .section_title span,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget .section_title span{display:block}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget .section_title span::after,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget .section_title span::after{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin-left:.618em;content:"";text-decoration:none;float:right;font-size:.9em;line-height:1.618}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget .section_title.open,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget .section_title.open{color:#333}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget .section_title.open span::after,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget .section_title.open span::after{display:none}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget .section,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget .section{border-bottom:1px solid #dfdfdf}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget .section .select2-container,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget .section .select2-container{width:100%!important}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget .section:last-of-type,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget .section:last-of-type{border-radius:0 0 3px 3px}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget table,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget table{width:100%}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget table td,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget table td{padding:7px 10px;vertical-align:top;border-top:1px solid #e5e5e5;line-height:1.4em}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget table tr:first-child td,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget table tr:first-child td{border-top:0}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget table td.name,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget table td.name{max-width:175px}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget table td.name a,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget table td.name a{word-wrap:break-word}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget table td.sparkline,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget table td.sparkline{vertical-align:middle}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget table .wc_sparkline,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget table .wc_sparkline{width:32px;height:1em;display:block;float:right}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget form,.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget p,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget form,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget p{margin:0;padding:10px}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget form .submit,.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget p .submit,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget form .submit,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget p .submit{margin-top:10px}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget #product_ids,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget #product_ids{width:100%}.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget .select_all,.woocommerce-reports-wide .postbox .chart-widgets li.chart-widget .select_none,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget .select_all,.woocommerce-reports-wrap .postbox .chart-widgets li.chart-widget .select_none{float:right;color:#999;margin-left:4px;margin-top:10px}.woocommerce-reports-wide .postbox .chart-legend,.woocommerce-reports-wrap .postbox .chart-legend{list-style:none;margin:0 0 1em;padding:0;border:1px solid #dfdfdf;border-right-width:0;border-bottom-width:0;background:#fff}.woocommerce-reports-wide .postbox .chart-legend li,.woocommerce-reports-wrap .postbox .chart-legend li{border-right:5px solid #aaa;color:#aaa;padding:1em;display:block;margin:0;-webkit-transition:all ease .5s;box-shadow:inset 0 -1px 0 0 #dfdfdf}.woocommerce-reports-wide .postbox .chart-legend li strong,.woocommerce-reports-wrap .postbox .chart-legend li strong{font-size:1.618em;line-height:1.2em;color:#464646;font-weight:400;display:block;font-family:HelveticaNeue-Light,'Helvetica Neue Light','Helvetica Neue',sans-serif}.woocommerce-reports-wide .postbox .chart-legend li strong del,.woocommerce-reports-wrap .postbox .chart-legend li strong del{color:#e74c3c;font-weight:400}.woocommerce-reports-wide .postbox .chart-legend li:hover,.woocommerce-reports-wrap .postbox .chart-legend li:hover{box-shadow:inset 0 -1px 0 0 #dfdfdf,inset 300px 0 0 rgba(156,93,144,.1);border-right:5px solid #9c5d90!important;padding-left:1.5em;color:#9c5d90}.woocommerce-reports-wide .postbox .pie-chart-legend,.woocommerce-reports-wrap .postbox .pie-chart-legend{margin:12px 0 0;overflow:hidden}.woocommerce-reports-wide .postbox .pie-chart-legend li,.woocommerce-reports-wrap .postbox .pie-chart-legend li{float:left;margin:0;padding:6px 0 0;border-top:4px solid #999;text-align:center;box-sizing:border-box;width:50%}.woocommerce-reports-wide .postbox .stat,.woocommerce-reports-wrap .postbox .stat{font-size:1.5em!important;font-weight:700;text-align:center}.woocommerce-reports-wide .postbox .chart-placeholder,.woocommerce-reports-wrap .postbox .chart-placeholder{width:100%;height:650px;overflow:hidden;position:relative}.woocommerce-reports-wide .postbox .chart-prompt,.woocommerce-reports-wrap .postbox .chart-prompt{line-height:650px;margin:0;color:#999;font-size:1.2em;font-style:italic;text-align:center}.woocommerce-reports-wide .postbox .chart-container,.woocommerce-reports-wrap .postbox .chart-container{background:#fff;padding:12px;position:relative;border:1px solid #dfdfdf;border-radius:3px}.woocommerce-reports-wide .postbox .main .chart-legend,.woocommerce-reports-wrap .postbox .main .chart-legend{margin-top:12px}.woocommerce-reports-wide .postbox .main .chart-legend li,.woocommerce-reports-wrap .postbox .main .chart-legend li{border-right:0;margin:0 8px 0 0;float:left;border-top:4px solid #aaa}.woocommerce-reports-wide .woocommerce-reports-main,.woocommerce-reports-wrap .woocommerce-reports-main{float:left;min-width:100%}.woocommerce-reports-wide .woocommerce-reports-main table td,.woocommerce-reports-wrap .woocommerce-reports-main table td{padding:9px}.woocommerce-reports-wide .woocommerce-reports-sidebar,.woocommerce-reports-wrap .woocommerce-reports-sidebar{display:inline;width:281px;margin-left:-300px;clear:both;float:left}.woocommerce-reports-wide .woocommerce-reports-left,.woocommerce-reports-wrap .woocommerce-reports-left{width:49.5%;float:left}.woocommerce-reports-wide .woocommerce-reports-right,.woocommerce-reports-wrap .woocommerce-reports-right{width:49.5%;float:right}.woocommerce-reports-wide .column-wc_actions a.edit,.woocommerce-reports-wide .column-wc_actions a.view,.woocommerce-reports-wrap .column-wc_actions a.edit,.woocommerce-reports-wrap .column-wc_actions a.view{display:block;text-indent:-9999px;position:relative;padding:0!important;height:2em!important;width:2em}.woocommerce-reports-wide .column-wc_actions a.edit::after,.woocommerce-reports-wide .column-wc_actions a.view::after,.woocommerce-reports-wrap .column-wc_actions a.edit::after,.woocommerce-reports-wrap .column-wc_actions a.view::after{font-family:Dashicons;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;line-height:1.85}.woocommerce-reports-wide .column-wc_actions a.edit::after,.woocommerce-reports-wrap .column-wc_actions a.edit::after{content:'\f464'}.woocommerce-reports-wide .column-wc_actions a.view::after,.woocommerce-reports-wrap .column-wc_actions a.view::after{content:'\f177'}.woocommerce-wide-reports-wrap{padding-bottom:11px}.woocommerce-wide-reports-wrap .widefat .export-data{float:right}.woocommerce-wide-reports-wrap .widefat td,.woocommerce-wide-reports-wrap .widefat th{vertical-align:middle;padding:7px}form.report_filters div,form.report_filters input,form.report_filters label,form.report_filters p{vertical-align:middle}.chart-tooltip{position:absolute;display:none;line-height:1}table.bar_chart{width:100%}table.bar_chart thead th{text-align:left;color:#ccc;padding:6px 0}table.bar_chart tbody th{padding:6px 0;width:25%;text-align:left!important;font-weight:400!important;border-bottom:1px solid #fee}table.bar_chart tbody td{text-align:right;line-height:24px;padding:6px 6px 6px 0;border-bottom:1px solid #fee}table.bar_chart tbody td span{color:#8a4b75;display:block}table.bar_chart tbody td span.alt{color:#47a03e;margin-top:6px}table.bar_chart tbody td.bars{position:relative;text-align:left;padding:6px 6px 6px 0;border-bottom:1px solid #fee}table.bar_chart tbody td.bars a,table.bar_chart tbody td.bars span{text-decoration:none;clear:both;background:#8a4b75;float:left;display:block;line-height:24px;height:24px;border-radius:3px}.post-type-product .woocommerce-BlankState-message::before,.post-type-shop_coupon .woocommerce-BlankState-message::before,.post-type-shop_order .woocommerce-BlankState-message::before,.woocommerce-BlankState--api .woocommerce-BlankState-message::before,.woocommerce-BlankState--webhooks .woocommerce-BlankState-message::before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center}table.bar_chart tbody td.bars span.alt{clear:both;background:#47a03e}table.bar_chart tbody td.bars span.alt span{margin:0;color:#c5dec2!important;text-shadow:0 1px 0 #47a03e;background:0 0}.post-type-shop_order .woocommerce-BlankState-message::before{content:""}.post-type-shop_coupon .woocommerce-BlankState-message::before{content:""}.post-type-product .woocommerce-BlankState-message::before{content:""}.woocommerce-BlankState--api .woocommerce-BlankState-message::before{content:""}.woocommerce-BlankState--webhooks .woocommerce-BlankState-message::before{content:""}.woocommerce-BlankState{text-align:center;padding:5em 0 0}.woocommerce-BlankState .woocommerce-BlankState-message{color:#aaa;margin:0 auto 1.5em;line-height:1.5em;font-size:1.2em;max-width:500px}.woocommerce-BlankState .woocommerce-BlankState-message::before{color:#ddd;text-shadow:0 -1px 1px rgba(0,0,0,.2),0 1px 0 rgba(255,255,255,.8);font-size:8em;display:block;position:relative!important;top:auto;left:auto;line-height:1em;margin:0 0 .1875em}.woocommerce-BlankState .woocommerce-BlankState-cta{font-size:1.2em;padding:.75em 1.5em;height:auto}@media only screen and (max-width:1280px){#order_data .order_data_column{width:48%}#order_data .order_data_column:first-child{width:100%}.woocommerce_options_panel .description{display:block;clear:both;margin-left:0}.woocommerce_options_panel .dimensions_field .wrap,.woocommerce_options_panel .short,.woocommerce_options_panel input[type=text].short,.woocommerce_options_panel input[type=number].short,.woocommerce_options_panel input[type=email].short,.woocommerce_options_panel input[type=password].short{width:80%}.woocommerce_options_panel .downloadable_files,.woocommerce_variations .downloadable_files{padding:0;clear:both}.woocommerce_options_panel .downloadable_files label,.woocommerce_variations .downloadable_files label{position:static}.woocommerce_options_panel .downloadable_files table,.woocommerce_variations .downloadable_files table{margin:0 12px 24px;width:94%}.woocommerce_options_panel .downloadable_files table .sort,.woocommerce_variations .downloadable_files table .sort{visibility:hidden}.woocommerce_options_panel .woocommerce_variable_attributes .downloadable_files table,.woocommerce_variations .woocommerce_variable_attributes .downloadable_files table{margin:0 0 1em;width:100%}}@media only screen and (max-width:900px){#woocommerce-coupon-data ul.coupon_data_tabs,#woocommerce-product-data .wc-tabs-back,#woocommerce-product-data ul.product_data_tabs{width:10%}#woocommerce-coupon-data .wc-metaboxes-wrapper,#woocommerce-coupon-data .woocommerce_options_panel,#woocommerce-product-data .wc-metaboxes-wrapper,#woocommerce-product-data .woocommerce_options_panel{width:90%}#woocommerce-coupon-data ul.coupon_data_tabs li a,#woocommerce-product-data ul.product_data_tabs li a{position:relative;text-indent:-999px;padding:10px}#woocommerce-coupon-data ul.coupon_data_tabs li a::before,#woocommerce-product-data ul.product_data_tabs li a::before{position:absolute;top:0;right:0;bottom:0;left:0;text-indent:0;text-align:center;line-height:40px;width:100%;height:40px}}@media only screen and (max-width:782px){#wp-excerpt-media-buttons a{font-size:16px;line-height:37px;height:39px;padding:0 20px 0 15px}#wp-excerpt-editor-tools{padding-top:20px;padding-right:15px;overflow:hidden;margin-bottom:-1px}.post-type-product .wp-list-table .is-expanded td:not(.hidden),.post-type-shop_order .wp-list-table .is-expanded td:not(.hidden){overflow:visible}#woocommerce-product-data .checkbox{width:25px}.variations-pagenav{float:none;text-align:center;font-size:18px}.variations-pagenav .displaying-num{font-size:16px}.variations-pagenav a{padding:8px 20px 11px;font-size:18px}.variations-pagenav select{padding:0 20px}.variations-defaults{float:none;text-align:center;margin-top:10px}.post-type-product .wp-list-table .column-thumb{display:none;text-align:left;padding-bottom:0}.post-type-product .wp-list-table .column-thumb::before{display:none!important}.post-type-product .wp-list-table .column-thumb img{max-width:32px}.post-type-product .wp-list-table .toggle-row{top:-28px}.post-type-shop_order .wp-list-table .column-order_status{display:none;text-align:left;padding-bottom:0}.post-type-shop_order .wp-list-table .column-order_status mark{margin:0}.post-type-shop_order .wp-list-table .column-order_status::before{display:none!important}.post-type-shop_order .wp-list-table .column-customer_message,.post-type-shop_order .wp-list-table .column-order_notes{text-align:inherit}.post-type-shop_order .wp-list-table .column-order_notes .note-on{font-size:1.3em;margin:0}.post-type-shop_order .wp-list-table .toggle-row{top:-15px}}@media only screen and (max-width:500px){.woocommerce_options_panel label,.woocommerce_options_panel legend{float:none;width:auto;display:block;margin:0}.woocommerce_options_panel fieldset.form-field,.woocommerce_options_panel p.form-field{padding:5px 20px!important}}.wc-backbone-modal *{box-sizing:border-box}.wc-backbone-modal .wc-backbone-modal-content{position:fixed;background:#fff;z-index:100000;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);width:500px}.wc-backbone-modal .wc-backbone-modal-content article{overflow:auto}.wc-backbone-modal.wc-backbone-modal-shipping-method-settings .wc-backbone-modal-content{width:75%;min-width:500px}.wc-backbone-modal .select2-container{width:100%!important}.wc-backbone-modal-backdrop{position:fixed;top:0;left:0;right:0;bottom:0;min-height:360px;background:#000;opacity:.7;z-index:99900}.wc-backbone-modal-main{padding-bottom:55px}.wc-backbone-modal-main article,.wc-backbone-modal-main header{display:block;position:relative}.wc-backbone-modal-main .wc-backbone-modal-header{height:auto;background:#fcfcfc;padding:1em 1.5em;border-bottom:1px solid #ddd}.wc-backbone-modal-main .wc-backbone-modal-header h1{margin:0;font-size:18px;font-weight:700;line-height:1.5em}.wc-backbone-modal-main .wc-backbone-modal-header .modal-close-link{cursor:pointer;color:#777;height:54px;width:54px;padding:0;position:absolute;top:0;right:0;text-align:center;border:0;border-left:1px solid #ddd;background-color:transparent;-webkit-transition:color .1s ease-in-out,background .1s ease-in-out;transition:color .1s ease-in-out,background .1s ease-in-out}.wc-backbone-modal-main .wc-backbone-modal-header .modal-close-link::before{font:400 22px/50px dashicons!important;color:#666;display:block;content:'\f335';font-weight:300}.wc-backbone-modal-main .wc-backbone-modal-header .modal-close-link:focus,.wc-backbone-modal-main .wc-backbone-modal-header .modal-close-link:hover{background:#ddd;border-color:#ccc;color:#000}.wc-backbone-modal-main .wc-backbone-modal-header .modal-close-link:focus{outline:0}.wc-backbone-modal-main article{padding:1.5em}.wc-backbone-modal-main article p{margin:1.5em 0}.wc-backbone-modal-main article p:last-child,.wc-backbone-modal-main footer .inner .button{margin-bottom:0}.wc-backbone-modal-main article p:first-child{margin-top:0}.wc-backbone-modal-main article .pagination{padding:10px 0 0;text-align:center}.wc-backbone-modal-main footer{position:absolute;left:0;right:0;bottom:0;z-index:100;padding:1em 1.5em;background:#fcfcfc;border-top:1px solid #dfdfdf;box-shadow:0 -4px 4px -4px rgba(0,0,0,.1)}.select2-container .select2-selection,.select2-dropdown{border-color:#ddd}.wc-backbone-modal-main footer .inner{float:right;line-height:23px}.select2-drop,.select2-dropdown{z-index:999999!important}.select2-results{line-height:1.5em}.select2-results .select2-results__group,.select2-results .select2-results__option{margin:0;padding:8px}.select2-dropdown--below{box-shadow:0 1px 1px rgba(0,0,0,.1)}.select2-dropdown--above{box-shadow:0 -1px 1px rgba(0,0,0,.1)}.select2-container .select2-selection__rendered.ui-sortable li{cursor:move}.select2-container .select2-search__field{min-width:150px}.select2-container .select2-selection--single{height:32px}.select2-container .select2-selection--single .select2-selection__rendered{line-height:32px;padding-right:24px}.select2-container .select2-selection--single .select2-selection__arrow{right:3px;height:30px}.select2-container .select2-selection--multiple{min-height:28px;border-radius:0;line-height:1.5}.select2-container .select2-selection--multiple li{margin:0}.select2-container .select2-selection--multiple .select2-selection__choice{padding:2px 6px}.select2-container .select2-selection__clear{color:#999;margin-top:-1px}.select2-container .select2-search--inline .select2-search__field{font-family:inherit;font-size:inherit;font-weight:inherit;padding:3px 0}.woocommerce table.form-table .select2-container{min-width:400px!important}.post-type-shop_order .tablenav .actions{overflow:visible}.post-type-shop_order .tablenav input,.post-type-shop_order .tablenav select{line-height:32px;height:32px}.post-type-shop_order .tablenav .select2-container{float:left;width:200px!important;font-size:14px;vertical-align:middle;margin:1px 6px 4px 1px}
\ No newline at end of file
diff --git a/assets/css/admin.scss b/assets/css/admin.scss
index d1d86850377..ffca00b7ced 100644
--- a/assets/css/admin.scss
+++ b/assets/css/admin.scss
@@ -7,13 +7,11 @@
 /**
  * Imports
  */
-@import "bourbon";
-@import "mixins";
-@import "variables";
-@import "animation";
-@import "chosen";
-@import "select2";
-@import "fonts";
+@import 'bourbon';
+@import 'mixins';
+@import 'variables';
+@import 'animation';
+@import 'fonts';
 
 /**
  * Styling begins
@@ -23,6 +21,292 @@
 }
 
 .wc_addons_wrap {
+
+	.addons-featured {
+		max-width: 1140px;
+		margin: -1%;
+	}
+
+	.addons-banner-block-item-icon,
+	.addons-column-block-item-icon {
+		align-items: center;
+		display: flex;
+		justify-content: center;
+	}
+
+	.addons-banner-block {
+		background: #ffffff;
+		box-shadow: 0 0 1px rgba(0, 0, 0, 0.2);
+		margin: 2% 1% 0;
+		max-width: 1140px;
+		padding: 20px;
+	}
+
+	.addons-banner-block img {
+		height: 62px;
+	}
+
+	.addons-banner-block p {
+		margin: 0 0 20px;
+	}
+
+	.addons-banner-block-items {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: wrap;
+		justify-content: space-around;
+		margin: 0 -10px 0 -10px;
+	}
+
+	.addons-banner-block-item {
+		border: 1px solid #e6e6e6;
+		border-radius: 3px;
+		flex: 1 1 200px;
+		margin: 10px;
+		max-width: 350px;
+		min-width: 200px;
+		width: 30%;
+	}
+
+	.addons-banner-block-item-icon {
+		background: #f7f7f7;
+		height: 143px;
+	}
+
+	.addons-banner-block-item-content {
+		display: flex;
+		flex-direction: column;
+		height: 184px;
+		justify-content: space-between;
+		padding: 24px;
+	}
+
+	.addons-banner-block-item-content h3 {
+		margin-top: 0;
+	}
+
+	.addons-banner-block-item-content p {
+		margin: 0 0 auto;
+	}
+
+	.addons-column-section {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: wrap;
+		justify-content: space-around;
+	}
+
+	.addons-column {
+		flex: 1 1 200px;
+		margin: 0 1%;
+		width: 49.5%;
+	}
+
+	.addons-small-light-block,
+	.addons-small-dark-block,
+	.addons-column-block {
+		box-sizing: border-box;
+		box-shadow: 0 0 1px rgba(0, 0, 0, 0.2);
+		margin: 4% 0 0;
+		padding: 20px;
+	}
+
+	.addons-column-block img {
+		max-height: 50px;
+		max-width: 50px;
+	}
+
+	.addons-small-light-block,
+	.addons-column-block {
+		background: #ffffff;
+	}
+
+	.addons-column-block-left {
+		float: left;
+	}
+
+	.addons-column-block-right {
+		float: right;
+	}
+
+	.addons-column-block-item {
+		display: flex;
+		border-top: 2px solid #f9f9f9;
+		flex-direction: row;
+		flex-wrap: wrap;
+		justify-content: space-between;
+		margin: 0 -20px;
+		padding: 20px;
+	}
+
+	.addons-column-block-item-icon {
+		background: #f7f7f7;
+		border: 1px solid #e6e6e6;
+		height: 100px;
+		margin: 0 10px 10px 0;
+		width: 100px;
+	}
+
+	.addons-column-block-item-content {
+		display: flex;
+		flex: 1 1 200px;
+		flex-wrap: wrap;
+		height: 20%;
+		justify-content: space-between;
+		min-width: 200px;
+	}
+
+	.addons-column-block-item-content h2 {
+		float: left;
+		margin-top: 8px;
+	}
+
+	.addons-column-block-item-content a {
+		float: right;
+	}
+
+	.addons-column-block-item-content p {
+		float: left;
+	}
+
+	.addons-small-dark-block {
+		background-color: #54687d;
+		text-align: center;
+	}
+
+	.addons-small-dark-items {
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-around;
+	}
+
+	.addons-small-dark-item {
+		margin: 0 0 20px;
+	}
+
+	.addons-small-dark-block h1 {
+		color: #ffffff;
+	}
+
+	.addons-small-dark-block p {
+		color: #fafafa;
+	}
+
+	.addons-small-dark-item-icon img {
+		height: 30px;
+	}
+
+	.addons-small-dark-item a {
+		margin: 28px auto 0;
+	}
+
+	.addons-small-light-block {
+		display: flex;
+		flex-wrap: wrap;
+	}
+
+	.addons-small-light-block h1 {
+		margin-top: -12px;
+	}
+
+	.addons-small-light-block p {
+		margin-top: 0;
+	}
+
+	.addons-small-light-block img {
+		height: 225px;
+		margin: 0 0 0 -20px;
+	}
+
+	.addons-small-light-block-content {
+		display: flex;
+		flex: 1 1 100px;
+		flex-direction: column;
+		justify-content: space-around;
+	}
+
+	.addons-small-light-block-buttons {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.addons-small-light-block-content a {
+		width: 48%;
+	}
+
+	.addons-button {
+		border-radius: 3px;
+		cursor: pointer;
+		display: block;
+		height: 37px;
+		line-height: 37px;
+		text-align: center;
+		text-decoration: none;
+		width: 124px;
+	}
+
+	.addons-button-solid {
+		background-color: #955a89;
+		color: #ffffff;
+	}
+
+	.addons-button-solid:hover {
+		color: #ffffff;
+		opacity: 0.8;
+	}
+
+	.addons-button-outline-green {
+		border: 1px solid #73ae39;
+		color: #73ae39;
+	}
+
+	.addons-button-outline-green:hover {
+		color: #73ae39;
+		opacity: 0.8;
+	}
+
+	.addons-button-outline-white {
+		border: 1px solid #ffffff;
+		color: #ffffff;
+	}
+
+	.addons-button-outline-white:hover {
+		color: #ffffff;
+		opacity: 0.8;
+	}
+
+	.addons-button-installed {
+		background: #e6e6e6;
+		color: #3c3c3c;
+	}
+
+	.addons-button-installed:hover {
+		color: #3c3c3c;
+		opacity: 0.8;
+	}
+
+	@media only screen and (max-width : 400px) {
+		.addons-featured {
+			margin: -1% -5%;
+		}
+
+		.addons-button {
+			width: 100%;
+		}
+
+		.addons-small-dark-item {
+			width: 100%;
+		}
+
+		.addons-column-block-item-icon {
+			background: none;
+			border: none;
+			height: 75px;
+			margin: 0 10px 10px 0;
+			width: 75px;
+		}
+	}
+
 	.products {
 		overflow: hidden;
 
@@ -41,12 +325,9 @@
 				min-height: 220px;
 				overflow: hidden;
 				background: #f5f5f5;
-				-webkit-box-shadow:
-					inset 0 1px 0 rgba(255,255,255,0.2),
-					inset 0 -1px 0 rgba(0,0,0,0.1);
 				box-shadow:
-					inset 0 1px 0 rgba(255,255,255,0.2),
-					inset 0 -1px 0 rgba(0,0,0,0.1);
+					inset 0 1px 0 rgba(255, 255, 255, 0.2),
+					inset 0 -1px 0 rgba(0, 0, 0, 0.1);
 
 				img {
 					max-width: 258px;
@@ -58,7 +339,7 @@
 					border-right: 260px solid #fff;
 				}
 
-				img.extension-thumb+h3 {
+				img.extension-thumb + h3 {
 					display: none;
 				}
 
@@ -66,7 +347,7 @@
 					display: none;
 				}
 
-				h3 {
+				h2, h3 {
 					margin: 0 !important;
 					padding: 20px !important;
 					background: #fff;
@@ -87,7 +368,7 @@
 	}
 
 	.storefront {
-		background: url(../images/storefront-bg.jpg) bottom right #f6f6f6;
+		background: url('../images/storefront-bg.jpg') bottom right #f6f6f6;
 		border: 1px solid #ddd;
 		padding: 20px;
 		overflow: hidden;
@@ -98,7 +379,7 @@
 			height: auto;
 			float: left;
 			margin: 0 20px 0 0;
-			box-shadow: 0 1px 6px rgba(0,0,0,0.1);
+			box-shadow: 0 1px 6px rgba(0, 0, 0, 0.1);
 		}
 
 		p {
@@ -107,49 +388,54 @@
 	}
 }
 
+.woocommerce-message,
+.woocommerce-BlankState {
+	a.button-primary,
+	button.button-primary {
+		background: #bb77ae;
+		border-color: #a36597;
+		-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 #a36597;
+		box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 #a36597;
+		color: #fff;
+		text-shadow: 0 -1px 1px #a36597, 1px 0 1px #a36597, 0 1px 1px #a36597, -1px 0 1px #a36597;
+		display: inline-block;
+
+		&:hover, &:focus, &:active {
+			background: #a36597;
+			border-color: #a36597;
+			-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 #a36597;
+			box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 #a36597;
+		}
+	}
+}
+
 .woocommerce-message {
 	position: relative;
 	border-left-color: #cc99c2 !important;
 	overflow: hidden;
 
-	a.button-primary,
-	button.button-primary {
-		background: #bb77ae;
-		border-color: #aa559a;
-		-webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 rgba(0,0,0,.15);
-		box-shadow: inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 rgba(0,0,0,.15);
-		color: #fff;
-		text-decoration: none !important;
-		text-shadow: 0px -1px 1px #8a4f7f, 1px 0px 1px #8a4f7f, 0px 1px 1px #8a4f7f, -1px 0px 1px #8a4f7f;
-
-		&:hover {
-			background: #c480b7;
-			border-color: #aa559a;
-			-webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 rgba(0,0,0,.15);
-			box-shadow: inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 rgba(0,0,0,.15);
-		}
-
-		&:active {
-			background: #aa559a;
-			border-color: #873A79;
-			-webkit-box-shadow: inset 0px 2px 0px #873A79;
-			box-shadow: inset 0px 2px 0px #873A79;
-		}
-
-		&:focus {
-			background: #bb77ae;
-			border-color: #aa559a;
-			-webkit-box-shadow: 0px 1px 0px #bb77ae, 0px 0px 2px 1px #aa559a;
-			box-shadow: 0px 1px 0px #bb77ae, 0px 0px 2px 1px #aa559a;
-		}
-	}
-
 	a.skip,
 	a.docs {
-		opacity: 0.5;
 		text-decoration: none !important;
 	}
 
+	a.woocommerce-message-close {
+		position: absolute;
+		top: 10px;
+		right: 10px;
+		padding: 10px 15px 10px 21px;
+		font-size: 13px;
+		line-height: 1.23076923;
+		text-decoration: none;
+		&::before {
+			position: absolute;
+			top: 8px;
+			left: 0;
+			-webkit-transition: all 0.1s ease-in-out;
+			transition: all 0.1s ease-in-out;
+		}
+	}
+
 	.twitter-share-button {
 		margin-top: -3px;
 		margin-left: 3px;
@@ -175,14 +461,6 @@ mark.amount {
 	color: inherit;
 }
 
-.postbox,
-.woocommerce {
-	input: invalid {
-		border: 1px solid #cc010b;
-		background: #ffebe8;
-	}
-}
-
 .simplify-commerce-banner {
 	overflow: hidden;
 
@@ -200,7 +478,7 @@ mark.amount {
 .woocommerce-help-tip {
 	color: #666;
 	display: inline-block;
-	font-size: 13px;
+	font-size: 1.1em;
 	font-style: normal;
 	height: 16px;
 	line-height: 16px;
@@ -208,21 +486,29 @@ mark.amount {
 	vertical-align: middle;
 	width: 16px;
 
-	&:after {
-		@include icon( "\e018" );
+	&::after {
+		@include icon_dashicons( '\f223' );
 		cursor: help;
 	}
 }
 
+h2 .woocommerce-help-tip {
+	margin-top: -5px;
+	margin-left: 0.25em;
+}
+
 table.wc_status_table {
 	margin-bottom: 1em;
 
-	tr {
-		&:nth-child(2n) {
-			th,
-			td {
-				background: #fcfcfc;
-			}
+	h2 {
+		font-size: 14px;
+		margin: 0;
+	}
+
+	tr:nth-child( 2n ) {
+		th,
+		td {
+			background: #fcfcfc;
 		}
 	}
 
@@ -291,15 +577,92 @@ table.wc_status_table {
 	}
 }
 
+
+/**
+ * DB log viewer
+ */
+.wp-list-table.logs {
+
+	.log-level {
+		display: inline;
+		padding: .2em .6em .3em;
+		font-size: 80%;
+		font-weight: bold;
+		line-height: 1;
+		color: #fff;
+		text-align: center;
+		white-space: nowrap;
+		vertical-align: baseline;
+		border-radius: .2em;
+
+		&:empty {
+			display: none;
+		}
+	}
+
+	/**
+	 * Add color to levels
+	 *
+	 * Descending severity:
+	 *   emergency, alert -> red
+	 *   critical, error  -> orange
+	 *   warning, notice  -> yellow
+	 *   info             -> blue
+	 *   debug            -> gree
+	 */
+
+	.log-level--emergency,
+	.log-level--alert {
+		background-color: #ff4136;
+	}
+	.log-level--critical,
+	.log-level--error {
+		background-color: #ff851b;
+	}
+	.log-level--warning,
+	.log-level--notice {
+		color: #222;
+		background-color: #ffdc00;
+	}
+	.log-level--info {
+		background-color: #0074d9;
+	}
+	.log-level--debug {
+		background-color: #3d9970;
+	}
+
+	// Adjust log table columns only when table is not collapsed
+	@media screen and ( min-width: 783px ) {
+		.column-timestamp {
+			width: 18%;
+		}
+		.column-level {
+			width: 14%;
+		}
+		.column-source {
+			width: 15%;
+		}
+	}
+}
+
 #log-viewer-select {
 	padding: 10px 0 8px;
-	line-height: 180%;
+	line-height: 28px;
+	h2 a {
+		vertical-align: middle;
+	}
 }
 
 #log-viewer {
-	textarea {
-		width: 100%;
-		resize: vertical;
+	background: #fff;
+	border: 1px solid #e5e5e5;
+	-webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
+	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
+	padding: 5px 20px;
+
+	pre {
+		font-family: monospace;
+		white-space: pre-wrap;
 	}
 }
 
@@ -318,21 +681,19 @@ table.wc_status_table {
 		margin-left: 10px;
 	}
 
-	.dimensions {
-		div {
+	.dimensions div {
+		display: block;
+		margin: 0.2em 0;
+
+		span.title {
 			display: block;
-			margin: .2em 0;
+			float: left;
+			width: 5em;
+		}
 
-			span.title {
-				display: block;
-				float: left;
-				width: 5em;
-			}
-
-			span.input-text-wrap {
-				display: block;
-				margin-left: 5em;
-			}
+		span.input-text-wrap {
+			display: block;
+			margin-left: 5em;
 		}
 	}
 
@@ -361,13 +722,11 @@ table.wc_status_table {
 		label {
 			clear: none;
 			width: 49%;
-			margin: .2em 0;
+			margin: 0.2em 0;
 		}
-		&.dimensions {
-			label {
-				width: 75%;
-				max-width: 75%;
-			}
+		&.dimensions label {
+			width: 75%;
+			max-width: 75%;
 		}
 	}
 
@@ -401,26 +760,22 @@ ul.wc_coupon_list,
 	clear: both;
 }
 
-ul.wc_coupon_list {
-	li {
-		margin: 0;
+ul.wc_coupon_list li {
+	margin: 0;
 
-		&.code {
-			display: inline-block;
+	&.code {
+		display: inline-block;
 
-			&:after {
-				content: ", ";
-			}
+		&::after {
+			content: ', ';
+		}
 
-			&:last-of-type {
-				&:after {
-					display: none;
-				}
-			}
+		&:last-of-type::after {
+			display: none;
+		}
 
-			.tips {
-				cursor: pointer;
-			}
+		.tips {
+			cursor: pointer;
 		}
 	}
 }
@@ -434,7 +789,7 @@ ul.wc_coupon_list_block {
 		border-bottom: 1px solid #ccc;
 		line-height: 2.5em;
 		margin: 0;
-		padding: .5em 0;
+		padding: 0.5em 0;
 	}
 
 	li:first-child {
@@ -451,28 +806,13 @@ ul.wc_coupon_list_block {
 .button.wc-reload {
 	@include ir();
 	padding: 0;
-	-webkit-border-radius: 100%;
-	border-radius: 100%;
-	height: 24px;
-	width: 24px !important;
+	height: 28px;
+	width: 28px !important;
 	display: inline-block;
 
-	&:after {
-		@include icon( "\e031" );
-		line-height: 22px;
-	}
-}
-
-.tablenav {
-	.actions {
-		overflow: visible;
-	}
-	.select2-container {
-		float: left;
-		max-width: 200px;
-		font-size: 14px;
-		vertical-align: middle;
-		margin: 1px 6px 1px 1px;
+	&::after {
+		@include icon_dashicons( '\f345' );
+		line-height: 28px;
 	}
 }
 
@@ -488,11 +828,11 @@ ul.wc_coupon_list_block {
 }
 
 #order_data {
-	padding: 23px 24px 12px 24px;
+	padding: 23px 24px 12px;
 
 	h2 {
 		margin: 0;
-		font-family: "HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",sans-serif;
+		font-family: 'HelveticaNeue-Light', 'Helvetica Neue Light', 'Helvetica Neue', sans-serif;
 		font-size: 21px;
 		font-weight: normal;
 		line-height: 1.2;
@@ -500,7 +840,11 @@ ul.wc_coupon_list_block {
 		padding: 0;
 	}
 
-	h4 {
+	h3 {
+		font-size: 14px;
+	}
+
+	h3, h4 {
 		color: #333;
 		margin: 1.33em 0 0;
 	}
@@ -511,7 +855,7 @@ ul.wc_coupon_list_block {
 
 	p.order_number {
 		margin: 0;
-		font-family: "HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",sans-serif;
+		font-family: 'HelveticaNeue-Light', 'Helvetica Neue Light', 'Helvetica Neue', sans-serif;
 		font-weight: normal;
 		line-height: 1.6em;
 		font-size: 16px;
@@ -526,6 +870,10 @@ ul.wc_coupon_list_block {
 		padding: 0 2% 0 0;
 		float: left;
 
+		> h3 span {
+			display: block;
+		}
+
 		&:last-child {
 			padding-right: 0;
 		}
@@ -534,17 +882,16 @@ ul.wc_coupon_list_block {
 			padding: 0 !important;
 		}
 
-		.address {
-			strong {
-				display: block;
-			}
+		.address strong {
+			display: block;
 		}
 
 		.form-field {
 			float: left;
+			clear: left;
 			width: 48%;
 			padding: 0;
-			margin: 9px 0 0 0;
+			margin: 9px 0 0;
 
 			label {
 				display: block;
@@ -570,21 +917,34 @@ ul.wc_coupon_list_block {
 
 			.hour,
 			.minute {
-				width: 2.5em;
+				width: 3.5em;
 			}
 
 			small {
 				display: block;
-				margin: 5px 0 0 0;
+				margin: 5px 0 0;
 				color: #999;
 			}
 		}
 
-		.form-field.last {
+		.form-field.last,
+		._billing_last_name_field,
+		._billing_address_2_field,
+		._billing_postcode_field,
+		._billing_state_field,
+		._billing_phone_field,
+		._shipping_last_name_field,
+		._shipping_address_2_field,
+		._shipping_postcode_field,
+		._shipping_state_field {
 			float: right;
+			clear: right;
 		}
 
-		.form-field-wide {
+		.form-field-wide,
+		._billing_company_field,
+		._shipping_company_field,
+		._transaction_id_field {
 			width: 100%;
 			clear: both;
 
@@ -601,41 +961,6 @@ ul.wc_coupon_list_block {
 			color: #999;
 		}
 
-		._billing_first_name_field,
-		._billing_address_1_field,
-		._billing_city_field,
-		._billing_country_field,
-		._billing_email_field,
-		._shipping_first_name_field,
-		._shipping_address_1_field,
-		._shipping_city_field,
-		._shipping_country_field {
-			float: left;
-		}
-
-		._billing_last_name_field,
-		._billing_address_2_field,
-		._billing_postcode_field,
-		._billing_state_field,
-		._billing_phone_field,
-		._shipping_last_name_field,
-		._shipping_address_2_field,
-		._shipping_postcode_field,
-		._shipping_state_field {
-			float: right;
-		}
-
-		._billing_company_field,
-		._shipping_company_field,
-		._transaction_id_field {
-			clear: both;
-			width: 100%;
-		}
-
-		._billing_email_field {
-			clear: left
-		}
-
 		div.edit_address {
 			display: none;
 			zoom: 1;
@@ -647,10 +972,11 @@ ul.wc_coupon_list_block {
 				float: right;
 			}
 		}
-		a.edit_address, .billing-same-as-shipping, .load_customer_shipping, .load_customer_billing {
+
+		a.edit_address {
 			width: 14px;
 			height: 0;
-			padding: 14px 0 0 0;
+			padding: 14px 0 0;
 			margin: 0 0 0 6px;
 			overflow: hidden;
 			position: relative;
@@ -660,7 +986,7 @@ ul.wc_coupon_list_block {
 			&:hover, &:focus {
 				color: #000;
 			}
-			&:after {
+			&::after {
 				font-family: 'WooCommerce';
 				position: absolute;
 				top: 0;
@@ -673,25 +999,21 @@ ul.wc_coupon_list_block {
 				-webkit-font-smoothing: antialiased;
 			}
 		}
-		.billing-same-as-shipping {
-			&:after {
-				content: "\e008";
-			}
-		}
-		.load_customer_shipping {
-			&:after {
-				content: "\e03a";
-			}
+		a.edit_address::after {
+			font-family: 'Dashicons';
+			content: '\f464';
 		}
+
+		.billing-same-as-shipping,
+		.load_customer_shipping,
 		.load_customer_billing {
-			&:after {
-				content: "\e03a";
-			}
+			font-size: 13px;
+			display: inline-block;
+			font-weight: normal;
 		}
-		a.edit_address {
-			&:after {
-				content: "\e603";
-			}
+
+		.load_customer_shipping {
+			margin-right: .3em;
 		}
 	}
 }
@@ -763,9 +1085,8 @@ ul.wc_coupon_list_block {
 	}
 
 	.wc-order-data-row {
-		border-bottom: 1px solid #DFDFDF;
-		background: #fff;
-		padding: 12px;
+		border-bottom: 1px solid #dfdfdf;
+		padding: 1.5em 2em;
 		background: #f8f8f8;
 		@include clearfix();
 		line-height: 2em;
@@ -785,46 +1106,6 @@ ul.wc_coupon_list_block {
 		}
 	}
 
-	.wc-order-bulk-actions {
-		background: #fefefe;
-		vertical-align: top;
-		border-top: 0;
-
-		select {
-			vertical-align: top;
-		}
-
-		p.bulk-actions {
-			float: left;
-		}
-	}
-
-	.wc-order-add-item {
-		background: #fff;
-		vertical-align: top;
-		border-top: none;
-
-		.add_item_id,
-		.select2-container {
-			vertical-align: top;
-			.search-field input {
-				min-width: 100px;
-			}
-		}
-
-		.select2-container {
-			width: 400px !important;
-			text-align: left;
-		}
-
-		.cancel-action,
-		.save-action,
-		.calculate-action {
-			float: left;
-			margin-right: 2px;
-		}
-	}
-
 	.wc-used-coupons {
 		float: left;
 		width: 50%;
@@ -835,6 +1116,7 @@ ul.wc_coupon_list_block {
 		width: 50%;
 		margin: 0;
 		padding: 0;
+		text-align: right;
 
 		.amount {
 			font-weight: 700;
@@ -847,10 +1129,10 @@ ul.wc_coupon_list_block {
 		.total {
 			font-size: 1em !important;
 			width: 10em;
-			margin: 0 0 0 .5em;
+			margin: 0 0 0 0.5em;
 			box-sizing: border-box;
 
-			input[type="text"] {
+			input[type='text'] {
 				width: 96%;
 				float: right;
 			}
@@ -864,7 +1146,7 @@ ul.wc_coupon_list_block {
 	.refund-actions {
 		margin-top: 5px;
 		padding-top: 12px;
-		border-top: 1px solid #DFDFDF;
+		border-top: 1px solid #dfdfdf;
 
 		.button {
 			float: right;
@@ -877,6 +1159,11 @@ ul.wc_coupon_list_block {
 		}
 	}
 
+	.wc-order-item-bulk-edit .cancel-action {
+		float: left;
+		margin-left: 0;
+	}
+
 	.add_meta {
 		margin-left: 0 !important;
 	}
@@ -893,393 +1180,505 @@ ul.wc_coupon_list_block {
 		.description {
 			margin-right: 10px;
 		}
+		.button {
+			float: left;
+			margin-right: 0.25em;
+		}
+		.button-primary {
+			float: none;
+			margin-right: 0;
+		}
 	}
 }
 
-.woocommerce_order_items_wrapper {
-	margin: 0;
-	overflow: auto;
+#woocommerce-order-items {
+	.inside {
+		display: block !important;
+	}
+	.hndle, .handlediv {
+		display: none;
+	}
+	.woocommerce_order_items_wrapper {
+		margin: 0;
+		overflow-x: auto;
 
-	table.woocommerce_order_items {
-		width: 100%;
-		background: #fff;
+		table.woocommerce_order_items {
+			width: 100%;
+			background: #fff;
 
-		thead th {
-			background: #f8f8f8;
-			padding: 8px;
-			font-size: 11px;
-			text-align: left;
-			color: #555;
-			-webkit-touch-callout: none;
-			-webkit-user-select: none;
-			-khtml-user-select: none;
-			-moz-user-select: none;
-			-ms-user-select: none;
-			user-select: none;
-			&:last-child {
-				padding-right: 12px;
-			}
-
-			&:first-child {
-				padding-left: 12px;
-			}
-			&.sortable {
-				cursor: pointer;
-			}
+			thead th {
+				text-align: left;
+				padding: 1em;
+				font-weight: normal;
+				color: #999;
+				background: #f8f8f8;
+				-webkit-touch-callout: none;
+				-webkit-user-select: none;
+				-khtml-user-select: none;
+				-moz-user-select: none;
+				-ms-user-select: none;
+				user-select: none;
+				&.sortable {
+					cursor: pointer;
+				}
+				&:last-child {
+					padding-right: 2em;
+				}
+				&:first-child {
+					padding-left: 2em;
+				}
+				.wc-arrow {
+					float: right;
+					position: relative;
+					margin-right: -1em;
+				}
 		}
 
-		tbody th, td {
-			padding: 8px;
-			text-align: left;
-			line-height: 26px;
-			vertical-align: top;
-			border-bottom: 1px dotted #ececec;
+			tbody th, td {
+				padding: 1.5em 1em 1em;
+				text-align: left;
+				line-height: 1.5em;
+				vertical-align: top;
+				border-bottom: 1px solid #f8f8f8;
 
-			textarea {
+				textarea {
+					width: 100%;
+				}
+
+				select {
+					width: 50%;
+				}
+
+				input, textarea {
+					font-size: 14px;
+					padding: 4px;
+					color: #555;
+				}
+				&:last-child {
+					padding-right: 2em;
+				}
+				&:first-child {
+					padding-left: 2em;
+				}
+			}
+
+			tbody tr {
+				td {
+					cursor: pointer;
+				}
+				&.selected {
+					background: #f5ebf3;
+					td {
+						border-color: #e6cce1;
+						opacity: 0.8;
+					}
+				}
+			}
+
+			tbody tr:last-child td {
+				border-bottom: 1px solid #dfdfdf;
+			}
+
+			tbody tr:first-child td {
+				border-top: 8px solid #f8f8f8;
+			}
+
+			tbody#order_line_items tr:first-child td {
+				border-top: none;
+			}
+
+			td.thumb {
+				text-align: left;
+				width: 38px;
+				padding-bottom: 1.5em;
+				.wc-order-item-thumbnail {
+					width: 38px;
+					height: 38px;
+					border: 2px solid #e8e8e8;
+					background: #f8f8f8;
+					color: #ccc;
+					position: relative;
+					font-size: 21px;
+					display: block;
+					text-align: center;
+					&::before {
+						@include icon_dashicons( '\f128' );
+						width: 38px;
+						line-height: 38px;
+						display: block;
+					}
+					img {
+						width: 100%;
+						height: 100%;
+						margin: 0;
+						padding: 0;
+						position: relative;
+					}
+				}
+			}
+			td.name {
+				.wc-order-item-sku, .wc-order-item-variation {
+					display: block;
+					margin-top: 0.5em;
+					font-size: 0.92em !important;
+					color: #888;
+				}
+			}
+
+			.item {
+				min-width: 200px;
+			}
+
+			.center,
+			.variation-id {
+				text-align: center;
+			}
+
+			.cost,
+			.tax,
+			.quantity,
+			.line_cost,
+			.line_tax,
+			.tax_class,
+			.item_cost {
+				text-align: right;
+
+				label {
+					white-space: nowrap;
+					color: #999;
+					font-size: 0.833em;
+
+					input {
+						display: inline;
+					}
+				}
+
+				input {
+					width: 70px;
+					vertical-align: middle;
+					text-align: right;
+				}
+
+				select {
+					width: 85px;
+					height: 26px;
+					vertical-align: middle;
+					font-size: 1em;
+				}
+
+				.split-input {
+					display: inline-block;
+					background: #fff;
+					border: 1px solid #ddd;
+					box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.07);
+					margin: 1px 0;
+					min-width: 80px;
+					overflow: hidden;
+					line-height: 1em;
+					text-align: right;
+
+					div.input {
+						width: 100%;
+						box-sizing: border-box;
+						label {
+							font-size: 0.75em;
+							padding: 4px 6px 0;
+							color: #555;
+							display: block;
+						}
+						input {
+							width: 100%;
+							box-sizing: border-box;
+							border: 0;
+							box-shadow: none;
+							margin: 0;
+							padding: 0 6px 4px;
+							color: #555;
+							background: transparent;
+							&::-webkit-input-placeholder {
+								color: #ddd;
+							}
+						}
+					}
+					div.input:first-child {
+						border-bottom: 1px dashed #ddd;
+						background: #fff;
+						label {
+							color: #ccc;
+						}
+						input {
+							color: #ccc;
+						}
+					}
+				}
+
+				.view {
+					white-space: nowrap;
+				}
+
+				.edit {
+					text-align: left;
+				}
+
+				small.times, del, .wc-order-item-taxes, .wc-order-item-discount, .wc-order-item-refund-fields {
+					font-size: 0.92em !important;
+					color: #888;
+				}
+
+				.wc-order-item-taxes, .wc-order-item-refund-fields {
+					margin: 0;
+					label {
+						display: block;
+					}
+				}
+
+				.wc-order-item-discount {
+					display: block;
+					margin-top: 0.5em;
+				}
+
+				small.times {
+					margin-right: 0.25em;
+				}
+			}
+
+			.quantity {
+				text-align: center;
+
+				input {
+					text-align: center;
+					width: 50px;
+				}
+			}
+
+			span.subtotal {
+				opacity: 0.5;
+			}
+
+			td.tax_class,
+			th.tax_class {
+				text-align: left;
+			}
+
+			.calculated {
+				border-color: #ae8ca2;
+				border-style: dotted;
+			}
+
+			table.meta {
 				width: 100%;
 			}
 
-			select {
-				width: 50%;
-			}
+			table.meta,
+			table.display_meta {
+				margin: 0.5em 0 0;
+				font-size: 0.92em !important;
+				color: #888;
 
-			input, textarea {
-				font-size: 14px;
-				padding: 4px;
-				color: #555;
-			}
-
-			&:last-child {
-				padding-right: 12px;
-			}
-
-			&:first-child {
-				padding-left: 12px;
-			}
-		}
-
-		tbody tr:last-child td {
-			border-bottom: 1px solid #dfdfdf;
-		}
-
-		tbody tr:first-child td {
-			border-top: 8px solid #f8f8f8;
-		}
-
-		tbody#order_line_items tr:first-child td {
-			border-top: none;
-		}
-
-		td.check-column {
-			padding: 8px 8px 8px 12px;
-			width: 1%;
-		}
-
-		.item {
-			min-width: 200px;
-		}
-
-		.center,
-		.variation-id {
-			text-align: center;
-		}
-
-		.cost,
-		.tax,
-		.quantity,
-		.line_cost,
-		.line_tax,
-		.tax_class,
-		.item_cost {
-			text-align: right;
-
-			label {
-				white-space: nowrap;
-				color: #999;
-				font-size: 0.833em;
-
-				input {
-					display: inline;
-				}
-			}
-
-			input {
-				width: 70px;
-				vertical-align: middle;
-				text-align: right;
-			}
-
-			select {
-				width: 85px;
-				height: 26px;
-				vertical-align: middle;
-				font-size: 1em;
-			}
-
-			.split-input {
-				display: block;
-				background: #fff;
-				border: 1px solid #ddd;
-				box-shadow: inset 0 1px 2px rgba(0,0,0,.07);
-				margin: 1px;
-				width: 70px;
-
-				input {
-					width: 100%;
-					box-sizing: border-box;
-					border: 0;
-					box-shadow: none;
-					margin: 0;
-					color: #555;
-					background: transparent;
-				}
-
-				input:last-child {
-					color: #bbb;
-					border-top: 1px dashed #ddd;
-				}
-			}
-
-			.view {
-				white-space: nowrap
-			}
-
-			del {
-				color: #ccc;
-			}
-		}
-
-		.quantity {
-			text-align: center;
-
-			input {
-				text-align: center;
-				width: 50px;
-			}
-		}
-
-		span.subtotal {
-			opacity: 0.5;
-		}
-
-		td.tax_class,
-		th.tax_class {
-			text-align: left;
-		}
-
-		.calculated {
-			border-color: #ae8ca2;
-			border-style: dotted;
-		}
-
-		table.meta {
-			width: 100%;
-		}
-
-		table.meta,
-		table.display_meta {
-			margin: .5em 0 0 0;
-
-			tr {
-				th {
-					border: 0;
-					padding: 0 4px .5em 0;
-					line-height: 1.5em;
-					width: 20%;
-				}
-
-				td {
-					padding: 0 4px .5em 0;
-					border: 0;
-					line-height: 1.5em;
-
-					input {
-						width: 100%;
-						margin: 0;
-						position: relative;
-						border-bottom: 0;
-						box-shadow: none;
-					}
-
-					textarea {
-						width: 100%;
-						height: 4em;
-						margin: 0;
-						box-shadow: none;
-					}
-
-					input:focus + textarea {
-						border-top-color: #999;
-					}
-
-					p {
-						margin: 0 0 .5em;
+				tr {
+					th {
+						border: 0;
+						padding: 0 4px 0.5em 0;
 						line-height: 1.5em;
+						width: 20%;
 					}
+					td {
+						padding: 0 4px 0.5em 0;
+						border: 0;
+						line-height: 1.5em;
 
-					p:last-child {
-						margin: 0;
+						input {
+							width: 100%;
+							margin: 0;
+							position: relative;
+							border-bottom: 0;
+							box-shadow: none;
+						}
+
+						textarea {
+							width: 100%;
+							height: 4em;
+							margin: 0;
+							box-shadow: none;
+						}
+
+						input:focus + textarea {
+							border-top-color: #999;
+						}
+
+						p {
+							margin: 0 0 0.5em;
+							line-height: 1.5em;
+						}
+
+						p:last-child {
+							margin: 0;
+						}
 					}
 				}
 			}
-		}
 
-		.thumb {
-			text-align: left;
-			width: 27px;
-
-			a {
-				display: block;
+			.refund_by {
+				border-bottom: 1px dotted #999;
 			}
 
-			img {
-				padding: 1px;
-				margin: 0;
-				border: 1px solid #dfdfdf;
+			tr.fee .thumb div {
+				@include ir();
+				font-size: 1.5em;
+				line-height: 1em;
 				vertical-align: middle;
-				width: 21px;
-				height: 21px;
+				margin: 0;
+
+				&::before {
+					@include icon( '\e007' );
+					color: #ccc;
+				}
 			}
-		}
 
-		.refund_by {
-			border-bottom: 1px dotted #999;
-		}
-
-		tr.fee {
-			.thumb div {
+			tr.refund .thumb div {
 				@include ir();
-				font-size: 14px;
-				margin: 6px;
+				font-size: 1.5em;
+				line-height: 1em;
+				vertical-align: middle;
+				margin: 0;
 
-				&:before {
-					@include icon( "\e007" );
-					color: #bbbbbb;
-				}
-			}
-		}
-
-		tr.refund {
-			.thumb div {
-				@include ir();
-				font-size: 14px;
-				margin: 6px;
-
-				&:before {
-					@include icon( "\e014" );
-					color: #bbbbbb;
-				}
-			}
-		}
-
-		tr.shipping {
-			.thumb div {
-				@include ir();
-				font-size: 14px;
-				margin: 6px;
-
-				&:before {
-					@include icon( "\e01a" );
-					color: #bbbbbb;
-				}
-			}
-		}
-
-		th.line_tax {
-			white-space: nowrap;
-		}
-
-		th.line_tax,
-		td.line_tax {
-			padding: 8px 16px 8px 8px;
-
-			.delete-order-tax {
-				@include ir();
-				font-size: 12px;
-				visibility: hidden;
-				float: right;
-				margin: 2px -16px 0 0;
-
-				&:before {
-					@include icon( "\e013" );
-					color: white;
-					background-color: #000;
-					-webkit-border-radius: 100%;
-					border-radius: 100%;
-					border: 1px solid #000;
-					box-shadow: 0 1px 2px rgba(0,0,0,0.2);
-				}
-
-				&:hover:before {
-					border-color: $red;
-					background-color: $red;
+				&::before {
+					@include icon( '\e014' );
+					color: #ccc;
 				}
 			}
 
-			&:hover {
+			tr.shipping {
+				.thumb div {
+					@include ir();
+					font-size: 1.5em;
+					line-height: 1em;
+					vertical-align: middle;
+					margin: 0;
+
+					&::before {
+						@include icon( '\e01a' );
+						color: #ccc;
+					}
+				}
+				.shipping_method_name,
+				.shipping_method {
+					width: 100%;
+					margin: 0 0 0.5em;
+				}
+			}
+
+			th.line_tax {
+				white-space: nowrap;
+			}
+
+			th.line_tax,
+			td.line_tax {
 				.delete-order-tax {
+					@include ir();
+					float: right;
+					font-size: 14px;
+					visibility: hidden;
+					margin: 3px -18px 0 0;
+
+					&::before {
+						@include icon_dashicons( '\f153' );
+						color: #999;
+					}
+
+					&:hover::before {
+						color: $red;
+					}
+				}
+
+				&:hover .delete-order-tax {
 					visibility: visible;
 				}
 			}
-		}
 
-		small.refunded {
-			display: block;
-			color: $red;
-			white-space: nowrap;
-		}
-	}
-}
-
-.wc-order-items-editable {
-	.edit-order-item {
-		@include ir();
-		display: inline-block;
-		margin: 0 .5em 0 0;
-
-		&:before {
-			@include icon;
-			content: "\e603";
-			color: #999;
-		}
-
-		&:hover {
-			&:before {
-				color: #555;
+			small.refunded {
+				display: block;
+				color: $red;
+				white-space: nowrap;
+				margin-top: 0.5em;
+				&::before {
+					@include icon_dashicons( '\f171' );
+					position: relative;
+					top: auto;
+					left: auto;
+					margin: -1px 4px 0 0;
+					vertical-align: middle;
+					line-height: 1em;
+				}
 			}
 		}
 	}
-
-	.delete-order-item,
-	.delete_refund {
-		@include ir();
-		display: inline-block;
-		margin: 0;
-
-		&:before {
-			@include icon;
-			content: "\e013";
-			color: #999;
+	.wc-order-edit-line-item {
+		padding-left: 0;
+	}
+	.wc-order-edit-line-item-actions {
+		width: 44px;
+		text-align: right;
+		padding-left: 0;
+		vertical-align: middle;
+		a {
+			color: #ccc;
+			display: inline-block;
+			cursor: pointer;
+			padding: 0 0 0.5em;
+			margin: 0 0 0 12px;
+			vertical-align: middle;
+			text-decoration: none;
+			line-height: 16px;
+			width: 16px;
+			overflow: hidden;
+			&::before {
+				margin: 0;
+				padding: 0;
+				font-size: 16px;
+				width: 16px;
+				height: 16px;
+			}
+			&:hover {
+				&::before {
+					color: #999;
+				}
+			}
+			&:first-child {
+				margin-left: 0;
+			}
 		}
 
-		&:hover {
-			&:before {
+		.edit-order-item::before {
+			@include icon_dashicons( '\f464' );
+			position: relative;
+		}
+
+		.delete-order-item,
+		.delete_refund {
+			&::before {
+				@include icon_dashicons( '\f158' );
+				position: relative;
+			}
+			&:hover::before {
 				color: $red;
 			}
 		}
 	}
 
-	.wc-order-edit-line-item-actions {
-		width: 2.5em;
-		text-align: right;
+	tbody tr .wc-order-edit-line-item-actions {
+		visibility: hidden;
+	}
+	tbody tr:hover .wc-order-edit-line-item-actions {
+		visibility: visible;
 	}
 
 	.wc-order-totals .wc-order-edit-line-item-actions {
 		width: 1.5em;
-	}
-
-	.wc-order-totals .edit-order-item {
-		margin: 0;
+		visibility: visible !important;
+		a {
+			padding: 0;
+		}
 	}
 }
 
@@ -1299,7 +1698,7 @@ ul.wc_coupon_list_block {
 		}
 
 		button {
-			margin: 2px 0 0 0;
+			margin: 2px 0 0;
 		}
 	}
 
@@ -1308,34 +1707,26 @@ ul.wc_coupon_list_block {
 	}
 }
 
-#poststuff #woocommerce-order-actions {
-	.inside {
-		margin: 0;
-		padding: 0;
+#poststuff #woocommerce-order-actions .inside {
+	margin: 0;
+	padding: 0;
 
-		ul.order_actions {
-			li {
-				padding: 6px 10px;
-				box-sizing: border-box;
+	ul.order_actions li {
+		padding: 6px 10px;
+		box-sizing: border-box;
 
-				&:last-child {
-					border-bottom: 0;
-				}
-			}
+		&:last-child {
+			border-bottom: 0;
 		}
 	}
 }
 
-#poststuff #woocommerce-order-notes {
-	.inside {
-		margin: 0;
-		padding: 0;
+#poststuff #woocommerce-order-notes .inside {
+	margin: 0;
+	padding: 0;
 
-		ul.order_notes {
-			li {
-				padding: 0 10px;
-			}
-		}
+	ul.order_notes li {
+		padding: 0 10px;
 	}
 }
 
@@ -1345,18 +1736,16 @@ ul.wc_coupon_list_block {
 		float: left;
 	}
 
-	.tablenav  {
+	.tablenav {
 		float: right;
 		clear: none;
 	}
 }
 
 .widefat {
-	&.customers {
-		td {
-			vertical-align: middle;
-			padding: 4px 7px;
-		}
+	&.customers td {
+		vertical-align: middle;
+		padding: 4px 7px;
 	}
 
 	.column-order_title {
@@ -1428,43 +1817,43 @@ ul.wc_coupon_list_block {
 		mark.cancelled,
 		mark.processing,
 		mark.refunded {
-			&:after {
+			&::after {
 				@include icon;
 			}
 		}
 
-		mark.pending:after {
-			content: "\e012";
+		mark.pending::after {
+			content: '\e012';
 			color: $orange;
 		}
 
-		mark.completed:after {
-			content: "\e015";
+		mark.completed::after {
+			content: '\e015';
 			color: $blue;
 		}
 
-		mark.on-hold:after {
-			content: "\e033";
+		mark.on-hold::after {
+			content: '\e033';
 			color: #999;
 		}
 
-		mark.failed:after {
-			content: "\e016";
+		mark.failed::after {
+			content: '\e016';
 			color: #d0c21f;
 		}
 
-		mark.cancelled:after {
-			content: "\e013";
+		mark.cancelled::after {
+			content: '\e013';
 			color: $red;
 		}
 
-		mark.processing:after {
-			content: "\e011";
+		mark.processing::after {
+			content: '\e011';
 			color: #73a724;
 		}
 
-		mark.refunded:after {
-			content: "\e014";
+		mark.refunded::after {
+			content: '\e014';
 			color: #999;
 		}
 	}
@@ -1474,29 +1863,25 @@ ul.wc_coupon_list_block {
 	}
 }
 
-.column-customer_message {
-	.note-on {
-		@include ir();
-		margin: 0 auto;
-		color: #999;
+.column-customer_message .note-on {
+	@include ir();
+	margin: 0 auto;
+	color: #999;
 
-		&:after {
-			@include icon( "\e026" );
-			line-height: 16px;
-		}
+	&::after {
+		@include icon( '\e026' );
+		line-height: 16px;
 	}
 }
 
-.column-order_notes {
-	.note-on {
-		@include ir();
-		margin: 0 auto;
-		color: #999;
+.column-order_notes .note-on {
+	@include ir();
+	margin: 0 auto;
+	color: #999;
 
-		&:after {
-			@include icon( "\e027" );
-			line-height: 16px;
-		}
+	&::after {
+		@include icon( '\e027' );
+		line-height: 16px;
 	}
 }
 
@@ -1508,23 +1893,21 @@ ul.wc_coupon_list_block {
 		padding: 0 !important;
 		height: 2em !important;
 		width: 2em;
-
-		&:after {
-			@include icon;
-			line-height: 1.85;
-		}
 	}
 
-	.processing:after {
-		content: "\e00f";
+	.processing::after {
+		@include icon( '\e00f' );
+		line-height: 1.85;
 	}
 
-	.complete:after {
-		content: "\e017";
+	.complete::after {
+		@include icon_dashicons( '\f147' );
+		line-height: 1.85;
 	}
 
-	.view:after {
-		content: "\e010";
+	.view::after {
+		@include icon_dashicons( '\f177' );
+		line-height: 1.85;
 	}
 }
 
@@ -1538,26 +1921,27 @@ ul.wc_coupon_list_block {
 		height: 2em !important;
 		width: 2em;
 
-		&:after {
+		&::after {
 			@include icon;
 			line-height: 1.85;
 		}
 	}
 
-	.edit:after {
-		content: "\e603";
+	.edit::after {
+		font-family: 'Dashicons';
+		content: '\f464';
 	}
 
-	.link:after {
-		content: "\e00d";
+	.link::after {
+		content: '\e00d';
 	}
 
-	.view:after {
-		content: "\e010";
+	.view::after {
+		content: '\e010';
 	}
 
-	.refresh:after {
-		content: "\e031";
+	.refresh::after {
+		content: '\e031';
 	}
 }
 
@@ -1581,8 +1965,8 @@ ul.wc_coupon_list_block {
 			height: 2em !important;
 			width: 2em;
 
-			&:after {
-				@include icon("\f111");
+			&::after {
+				@include icon('\f111');
 				font-family: 'Dashicons';
 				line-height: 1.85;
 			}
@@ -1592,7 +1976,7 @@ ul.wc_coupon_list_block {
 
 /* Order notes */
 ul.order_notes {
-	padding: 2px 0 0 0;
+	padding: 2px 0 0;
 
 	li {
 		.note_content {
@@ -1619,29 +2003,35 @@ ul.order_notes {
 		}
 
 		a.delete_note {
-			color: $red
+			color: $red;
 		}
 
-		.note_content:after {
-		  content: "";
-		  display: block;
-		  position: absolute;
-		  bottom: -10px;
-		  left: 20px;
-		  width: 0;
-		  height: 0;
-		  border-width: 10px 10px 0 0;
-		  border-style: solid;
-		  border-color: #efefef transparent;
+		.note_content::after {
+			content: '';
+			display: block;
+			position: absolute;
+			bottom: -10px;
+			left: 20px;
+			width: 0;
+			height: 0;
+			border-width: 10px 10px 0 0;
+			border-style: solid;
+			border-color: #efefef transparent;
 		}
 	}
-
 	li.customer-note {
+		.note_content {
+			background: #a7cedc;
+		}
+		.note_content::after {
+			border-color: #a7cedc transparent;
+		}
+	}
+	li.system-note {
 		.note_content {
 			background: #d7cad2;
 		}
-
-		.note_content:after {
+		.note_content::after {
 			border-color: #d7cad2 transparent;
 		}
 	}
@@ -1665,7 +2055,7 @@ table.wp-list-table {
 	.column-thumb {
 		width: 52px;
 		text-align: center;
-		white-space: nowrap
+		white-space: nowrap;
 	}
 
 	.column-name {
@@ -1698,10 +2088,8 @@ table.wp-list-table {
 		padding-left: 2px;
 	}
 
-	.column-price {
-		.woocommerce-price-suffix {
-			display: none;
-		}
+	.column-price .woocommerce-price-suffix {
+		display: none;
 	}
 
 	img {
@@ -1735,66 +2123,57 @@ table.wp-list-table {
 		@include ir();
 		margin: 0 auto;
 
-		&:before {
-			@include icon( "\e00c" );
+		&::before {
+			@include icon_dashicons( '\f128' );
 		}
 	}
 
 	span.wc-featured {
-		margin: 0;
+		&::before {
+			content: '\f155';
+		}
+		&.not-featured::before {
+			content: '\f154';
+		}
+	}
+
+	td.column-featured span.wc-featured {
+		font-size: 1.6em;
 		cursor: pointer;
-
-		&:before {
-			content: "\e020";
-		}
-
-		&.not-featured {
-			&:before {
-				content: "\e021";
-			}
-		}
 	}
 
-	td.column-featured {
-		span.wc-featured {
-			font-size: 1.2em;
-		}
-	}
-
-	span.wc-type {
-		margin: 0;
-
-		&:before {
-			content: "\e01d";
-		}
+	span.wc-type::before {
+		font-family: 'WooCommerce';
+		content: '\e006';
 	}
 
 	span.product-type {
 		@include ir();
-		font-size: 1.2em;
+		font-size: 1.6em;
+		margin: 0 auto;
 
-		&:before {
-			@include icon( "\e006" );
+		&::before {
+			@include icon( '\e006' );
 		}
 
-		&.grouped:before {
-			content: "\e002";
+		&.grouped::before {
+			content: '\e002';
 		}
 
-		&.external:before {
-			content: "\e034";
+		&.external::before {
+			content: '\e034';
 		}
 
-		&.variable:before {
-			content: "\e003";
+		&.variable::before {
+			content: '\e003';
 		}
 
-		&.downloadable:before {
-			content: "\e001";
+		&.downloadable::before {
+			content: '\e001';
 		}
 
-		&.virtual:before {
-			content: "\e000";
+		&.virtual::before {
+			content: '\e000';
 		}
 	}
 
@@ -1818,21 +2197,21 @@ table.wp-list-table {
 		@include ir();
 		margin: 0 auto;
 
-		&:after {
+		&::after {
 			@include icon;
 		}
 	}
 
-	.order-notes_head:after {
-		content: "\e028";
+	.order-notes_head::after {
+		content: '\e028';
 	}
 
-	.notes_head:after {
-		content: "\e026";
+	.notes_head::after {
+		content: '\e026';
 	}
 
-	.status_head:after {
-		content: "\e011";
+	.status_head::after {
+		content: '\e011';
 	}
 
 	.column-order_items {
@@ -1840,7 +2219,7 @@ table.wp-list-table {
 
 		table.order_items {
 			width: 100%;
-			margin: 3px 0 0 0;
+			margin: 3px 0 0;
 			padding: 0;
 			display: none;
 
@@ -1880,6 +2259,13 @@ a.import_rates {
 		font-size: 1.2em;
 	}
 }
+#rates-pagination {
+	float: right;
+	margin-right: 0.5em;
+	.tablenav {
+		margin: 0;
+	}
+}
 
 table.wc_tax_rates,
 table.wc_input_table {
@@ -1889,20 +2275,32 @@ table.wc_input_table {
 		color: $blue;
 	}
 
+	th {
+		white-space: nowrap;
+		padding: 10px;
+	}
+
 	td {
 		padding: 0;
-		border-right: 1px solid #DFDFDF;
-		border-bottom: 1px solid #DFDFDF;
+		border-right: 1px solid #dfdfdf;
+		border-bottom: 1px solid #dfdfdf;
 		border-top: 0;
 		background: #fff;
+		cursor: default;
 
-		input[type="text"],
-		input[type="number"] {
+		input[type='text'],
+		input[type='number'] {
 			width: 100%;
-			padding: 5px 7px;
+			padding: 8px 10px;
 			margin: 0;
 			border: 0;
+			outline: 0;
 			background: transparent none;
+
+			&:focus {
+				outline: 0;
+				box-shadow: none;
+			}
 		}
 
 		&.compound,
@@ -1943,30 +2341,27 @@ table.wc_input_table {
 		padding: 0 4px;
 	}
 
-	.ui-sortable:not(.ui-sortable-disabled) {
-		td.sort {
-			cursor: move;
-			background: #f9f9f9;
+	.ui-sortable:not( .ui-sortable-disabled ) td.sort {
+		cursor: move;
+		font-size: 15px;
+		background: #f9f9f9;
+		text-align: center;
+		vertical-align: middle;
+
+		&::before {
+			content: '\f333';
+			font-family: 'Dashicons';
 			text-align: center;
-			vertical-align: middle;
+			line-height: 1;
+			color: #999;
+			display: block;
+			width: 17px;
+			float: left;
+			height: 100%;
+		}
 
-			&:before {
-				content: "\e032";
-				font-family: 'WooCommerce';
-				text-align: center;
-				line-height: 1;
-				color: #999;
-				display: block;
-				width: 17px;
-				float: left;
-				height: 100%;
-			}
-
-			&:hover {
-				&:before {
-					color: #333;
-				}
-			}
+		&:hover::before {
+			color: #333;
 		}
 	}
 
@@ -2000,19 +2395,8 @@ table.wc_input_table {
 		}
 	}
 
-	tfoot {
-		th {
-			padding-left: 20px;
-			padding-right: 20px;
-		}
-	}
-
-	tr {
-		&:last-child {
-			td {
-				border-bottom: 0;
-			}
-		}
+	tr:last-child td {
+		border-bottom: 0;
 	}
 }
 
@@ -2027,10 +2411,8 @@ table.wc_shipping {
 		line-height: 2em;
 	}
 
-	tr:nth-child(odd) {
-		td {
-			background: #f9f9f9;
-		}
+	tr:nth-child( odd ) td {
+		background: #f9f9f9;
 	}
 
 	th {
@@ -2066,14 +2448,16 @@ table.wc_shipping {
 	td.sort {
 		padding: 0 7px;
 		cursor: move;
+		font-size: 15px;
 		text-align: center;
 		vertical-align: middle;
-		&:before {
-			content: "\e032";
-			font-family: 'WooCommerce';
+
+		&::before {
+			content: '\f333';
+			font-family: 'Dashicons';
 			text-align: center;
 			line-height: 1;
-			color: #ccc;
+			color: #999;
 			display: block;
 			width: 17px;
 			float: left;
@@ -2095,20 +2479,413 @@ table.wc_shipping {
 			margin: 0 auto;
 		}
 	}
-	.wc-email-settings-table-actions {
-		a {
-			@include ir();
-			padding: 0 !important;
-			height: 2em !important;
-			width: 2em;
+	.wc-email-settings-table-actions a {
+		@include ir();
+		padding: 0 !important;
+		height: 2em !important;
+		width: 2em;
 
-			&:after {
-				@include icon("\f111");
-				font-family: 'Dashicons';
-				line-height: 1.85;
+		&::after {
+			@include icon('\f111');
+			font-family: 'Dashicons';
+			line-height: 1.85;
+		}
+	}
+}
+.wc-shipping-zone-settings {
+	th {
+		padding: 24px 24px 24px 0;
+	}
+	td.forminp {
+		padding: 15px 10px;
+		input, textarea {
+			padding: 8px;
+			width: 448px;
+			max-width: 100% !important;
+		}
+		.wc-shipping-zone-region-select {
+			width: 448px;
+			max-width: 100% !important;
+			.select2-choices {
+				padding: 8px 8px 4px;
+				border-color: #DDDDDD;
+				min-height: 0;
+				line-height: 1;
+				input {
+					padding: 0;
+				}
+				li {
+					margin: 0 4px 4px 0;
+				}
 			}
 		}
 	}
+	.wc-shipping-zone-postcodes-toggle {
+		margin: 0.5em 0 0;
+		font-size: 0.9em;
+		text-decoration: underline;
+		display: block;
+	}
+	.wc-shipping-zone-postcodes-toggle + .wc-shipping-zone-postcodes {
+		display:none;
+	}
+	.wc-shipping-zone-postcodes {
+		textarea {
+			margin: 10px 0;
+		}
+		.description {
+			font-size: 0.9em;
+			color: #999;
+		}
+	}
+}
+.wc-shipping-zone-settings + p.submit {
+	margin-top: 0;
+}
+table {
+	tr, tr:hover {
+		table.wc-shipping-zone-methods {
+			tr .row-actions {
+				position: relative;
+			}
+			tr:hover .row-actions {
+				position: static;
+			}
+		}
+	}
+}
+.wc-shipping-zones-heading .page-title-action {
+	display: inline-block;
+}
+table.wc-shipping-zones, table.wc-shipping-zone-methods, table.wc-shipping-classes {
+	td, th {
+		vertical-align: top;
+		line-height: 24px;
+		padding: 1em !important;
+		font-size: 14px;
+		background: #fff;
+		li {
+			line-height: 24px;
+			font-size: 14px;
+		}
+		.woocommerce-help-tip {
+			margin: 0 !important;
+		}
+	}
+	thead {
+		th {
+			vertical-align: middle;
+		}
+		.wc-shipping-zone-sort {
+			text-align: center;
+		}
+	}
+	tbody td {
+		padding: 1.5em 1em !important;
+	}
+	td.wc-shipping-zones-blank-state, td.wc-shipping-zone-method-blank-state {
+		background: #f7f1f6 !important;
+		overflow: hidden;
+		position: relative;
+		padding: 7.5em 7.5% !important;
+		border-bottom: 2px solid #eee2ec;
+
+		&.wc-shipping-zone-method-blank-state {
+			padding: 2em !important;
+			p {
+				margin-bottom: 0;
+			}
+		}
+		p, li {
+			color: #a46497;
+			font-size: 1.5em;
+			line-height: 1.5em;
+			margin: 0 0 1em;
+			position: relative;
+			z-index: 1;
+			text-shadow: 1px 1px 1px white;
+
+			&.main {
+				font-size: 2em;
+			}
+		}
+		li {
+			margin-left: 1em;
+			list-style: circle inside;
+		}
+		&::before {
+			content: '\e01b';
+			font-family: 'WooCommerce';
+			text-align: center;
+			line-height: 1;
+			color: #eee2ec;
+			display: block;
+			width: 1em;
+			font-size: 40em;
+			top: 50%;
+			right: -3.75%;
+			margin-top: -0.1875em;
+			position: absolute;
+		}
+		.button-primary {
+			background-color: #804877;
+			border-color: #804877;
+			-webkit-box-shadow: inset 0 1px 0 rgba( 255, 255, 255, 0.2 ), 0 1px 0 rgba( 0, 0, 0, 0.15 );
+			box-shadow: inset 0 1px 0 rgba( 255, 255, 255, 0.2 ), 0 1px 0 rgba( 0, 0, 0, 0.15 );
+			margin: 0;
+			opacity: 1;
+			text-shadow: 0 -1px 1px #8a4f7f, 1px 0 1px #8a4f7f, 0 1px 1px #8a4f7f, -1px 0 1px #8a4f7f;
+			font-size: 1.5em;
+			padding: 0.75em 1em;
+			height: auto;
+			position: relative;
+			z-index: 1;
+		}
+	}
+	tbody.wc-shipping-zone-rows, .wc-shipping-zone-method-rows {
+		tr:nth-child( odd ) td {
+			background: #f9f9f9;
+		}
+	}
+	tr.odd, .wc-shipping-class-rows tr:nth-child( odd ) {
+		td {
+			background: #f9f9f9;
+		}
+	}
+	ul, p {
+		margin: 0;
+	}
+	td.wc-shipping-zone-sort, td.wc-shipping-zone-method-sort {
+		cursor: move;
+		font-size: 15px;
+		text-align: center;
+
+		&::before {
+			content: '\f333';
+			font-family: 'Dashicons';
+			text-align: center;
+			line-height: 1;
+			color: #999;
+			display: block;
+			width: 17px;
+			float: left;
+			height: 100%;
+			line-height: 24px;
+		}
+		&:hover::before {
+			color: #333;
+		}
+	}
+	td.wc-shipping-zone-worldwide {
+		text-align: center;
+		&::before {
+			content: '\f319';
+			font-family: 'dashicons';
+			text-align: center;
+			line-height: 1;
+			color: #999;
+			display: block;
+			width: 17px;
+			float: left;
+			height: 100%;
+			line-height: 24px;
+		}
+	}
+	.wc-shipping-zone-name,
+	.wc-shipping-zone-methods {
+		width: 25%;
+	}
+	.wc-shipping-class-description,
+	.wc-shipping-class-name,
+	.wc-shipping-class-slug,
+	.wc-shipping-zone-name,
+	.wc-shipping-zone-region {
+		input, select, textarea {
+			width: 100%;
+		}
+		a.wc-shipping-zone-delete, a.wc-shipping-class-delete {
+			color: #a00;
+		}
+		a.wc-shipping-zone-delete:hover, a.wc-shipping-class-delete:hover {
+			color: red;
+		}
+	}
+	.wc-shipping-class-count {
+		text-align: center;
+	}
+	td.wc-shipping-zone-methods {
+		color: #555;
+		.method_disabled {
+			text-decoration: line-through;
+		}
+		ul {
+			position: relative;
+			padding-right: 32px;
+			li {
+				color: #555;
+				display: inline;
+				margin: 0;
+			}
+			li::before {
+				content: ', ';
+			}
+			li:first-child::before {
+				content: '';
+			}
+		}
+		.add_shipping_method {
+			display: block;
+			width: 24px;
+			padding: 24px 0 0;
+			height: 0;
+			overflow: hidden;
+			cursor: pointer;
+
+			&::before {
+				@include icon;
+				font-family: 'Dashicons';
+				content: '\f502';
+				color: #999;
+				vertical-align: middle;
+				line-height: 24px;
+				font-size: 16px;
+				margin: 0;
+			}
+
+			&.disabled {
+				cursor: not-allowed;
+				&::before {
+					color: #ccc;
+				}
+			}
+		}
+	}
+	.wc-shipping-zone-method-title {
+		width: 25%;
+		.wc-shipping-zone-method-delete {
+			color: red;
+		}
+	}
+	.wc-shipping-zone-method-enabled {
+		text-align: center;
+
+		a {
+			display: inline-block;
+		}
+
+		.woocommerce-input-toggle {
+			margin-top: 3px;
+		}
+	}
+	.wc-shipping-zone-method-type {
+		display: block;
+	}
+	tfoot {
+		input, select {
+			vertical-align: middle !important;
+		}
+		.button-secondary {
+			float: right;
+		}
+	}
+	.editing {
+		.wc-shipping-zone-view, .wc-shipping-zone-edit {
+			display: none;
+		}
+	}
+}
+
+.woocommerce-input-toggle {
+	height: 16px;
+	width: 32px;
+	border: 2px solid #935687;
+	background-color: #935687;
+	display: inline-block;
+	text-indent: -9999px;
+	border-radius: 10em;
+	position: relative;
+
+	&:before {
+		content: "";
+		display: block;
+		width: 16px;
+		height: 16px;
+		background: #fff;
+		position: absolute;
+		top: 0;
+		right: 0;
+		border-radius: 100%;
+	}
+
+	&.woocommerce-input-toggle--disabled {
+		border-color: #999;
+		background-color: #999;
+
+		&:before {
+			right: auto;
+			left: 0;
+		}
+	}
+}
+
+.wc-modal-shipping-method-settings {
+	background: #f8f8f8;
+	padding: 1em !important;
+	form .form-table {
+		width: 100%;
+		background: #fff;
+		margin: 0 0 1.5em;
+		tr {
+			th {
+				width: 30%;
+				position: relative;
+				.woocommerce-help-tip {
+					float: right;
+					margin: -8px -0.5em 0 0;
+					vertical-align: middle;
+					right: 0;
+					top: 50%;
+					position: absolute;
+				}
+			}
+			td {
+				input, select, textarea {
+					width: 50%;
+					min-width: 250px;
+				}
+				input[type='checkbox'] {
+					width: auto;
+					min-width: 16px;
+				}
+			}
+			td, th {
+				vertical-align: middle;
+				margin: 0;
+				line-height: 24px;
+				padding: 1em;
+				border-bottom: 1px solid #f8f8f8;
+			}
+		}
+		&:last-of-type {
+			margin-bottom: 0;
+		}
+	}
+}
+
+.wc-backbone-modal .wc-shipping-zone-method-selector {
+	p {
+		margin-top: 0;
+	}
+	.wc-shipping-zone-method-description {
+		margin: 0.75em 1px 0;
+		line-height: 1.5em;
+		color: #999;
+		font-style: italic;
+	}
+	select {
+		width: 100%;
+		cursor: pointer;
+	}
 }
 
 img.help_tip {
@@ -2117,7 +2894,7 @@ img.help_tip {
 }
 
 .postbox img.help_tip {
-	margin-top: 0px;
+	margin-top: 0;
 }
 
 .postbox .woocommerce-help-tip {
@@ -2125,34 +2902,49 @@ img.help_tip {
 }
 
 .status-enabled,
-.status-manual {
+.status-manual,
+.status-disabled {
 	font-size: 1.4em;
 	@include ir();
 }
 
-.status-manual {
-	&:before {
-		@include icon( "\e008" );
-		color: #999;
-	}
+.status-manual::before {
+	@include icon( '\e008' );
+	color: #999;
 }
 
-.status-enabled {
-	&:before {
-		@include icon( "\e015" );
-		color: $woocommerce;
-	}
+.status-enabled::before {
+	@include icon( '\e015' );
+	color: $woocommerce;
+}
+
+.status-disabled::before {
+	@include icon( '\e013' );
+	color: #ccc;
 }
 
 .woocommerce {
-	.woo-nav-tab-wrapper {
-		margin-bottom: 16px !important;
+
+	h2.woo-nav-tab-wrapper {
+		margin-bottom: 1em;
+	}
+
+	nav.woo-nav-tab-wrapper {
+		margin: 1.5em 0 1em;
+		border-bottom: 1px solid #ccc;
 	}
 
 	.subsubsub {
 		margin: -8px 0 0;
 	}
 
+	.wc-admin-breadcrumb {
+		margin-left: 0.5em;
+		a {
+			color: #a46497;
+		}
+	}
+
 	#template div {
 		margin: 0;
 
@@ -2162,26 +2954,19 @@ img.help_tip {
 			margin-top: -4px;
 		}
 
-		.editor {
-			textarea {
-				margin-bottom: 8px;
-			}
+		.editor textarea {
+			margin-bottom: 8px;
 		}
 	}
 
-	textarea[disabled="disabled"] {
-		background: #DFDFDF !important;
+	textarea[disabled='disabled'] {
+		background: #dfdfdf !important;
 	}
 
 	table.form-table {
 		margin: 0;
 		position: relative;
 
-		.select2-container {
-			display: block;
-			max-width: 350px;
-		}
-
 		.forminp-radio ul {
 			margin: 0;
 			li {
@@ -2196,7 +2981,7 @@ img.help_tip {
 		}
 
 		input.regular-input {
-			width: 25em;
+			width: 400px;
 		}
 
 		textarea.wide-input {
@@ -2233,7 +3018,7 @@ img.help_tip {
 
 		th img.help_tip,
 		th .woocommerce-help-tip {
-			margin: 0 -24px 0 0;
+			margin: 2px -24px 0 0;
 			float: right;
 		}
 
@@ -2264,7 +3049,7 @@ img.help_tip {
 			position: absolute;
 			border: 1px solid #ccc;
 			border-radius: 3px;
-			box-shadow: 0 1px 3px rgba(0,0,0,0.2);
+			box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
 
 			.ui-slider {
 				border: 0 !important;
@@ -2283,10 +3068,14 @@ img.help_tip {
 			padding: 3px;
 			padding-left: 20px;
 			border: 1px solid #ddd;
+			/* rtl:ignore */
 			border-right: 0;
+			/* rtl:ignore */
+			margin-left: -3px;
 		}
 
 		.colorpick {
+			/* rtl:ignore */
 			border-left: 0;
 		}
 
@@ -2299,7 +3088,7 @@ img.help_tip {
 		}
 
 		.wc_emails_wrapper {
-		    padding: 0 15px 10px 0;
+			padding: 0 15px 10px 0;
 		}
 	}
 }
@@ -2326,120 +3115,102 @@ img.help_tip {
 	width: 100%;
 }
 
-#postimagediv {
-	img {
-		border: 1px solid #d5d5d5;
-		max-width: 100%;
-	}
+#postimagediv img {
+	border: 1px solid #d5d5d5;
+	max-width: 100%;
 }
 
-#woocommerce-product-images {
-	.inside {
-		margin: 0;
-		padding: 0;
+#woocommerce-product-images .inside {
+	margin: 0;
+	padding: 0;
 
-		.add_product_images {
-			padding: 0 12px 12px;
-		}
+	.add_product_images {
+		padding: 0 12px 12px;
+	}
 
-		#product_images_container {
-			padding: 0 0 0 9px;
+	#product_images_container {
+		padding: 0 0 0 9px;
 
-			ul {
-				@include clearfix();
-				margin: 0;
-				padding: 0;
+		ul {
+			@include clearfix();
+			margin: 0;
+			padding: 0;
 
-				li.image,
-				li.add,
-				li.wc-metabox-sortable-placeholder {
-					width: 80px;
-					float: left;
-					cursor: move;
-					border: 1px solid #d5d5d5;
-					margin: 9px 9px 0 0;
-					background: #f7f7f7;
-					@include border-radius(2px);
-					position: relative;
-					box-sizing: border-box;
+			li.image,
+			li.add,
+			li.wc-metabox-sortable-placeholder {
+				width: 80px;
+				float: left;
+				cursor: move;
+				border: 1px solid #d5d5d5;
+				margin: 9px 9px 0 0;
+				background: #f7f7f7;
+				@include border-radius(2px);
+				position: relative;
+				box-sizing: border-box;
 
-					img {
-						width: 100%;
-						height: auto;
-						display: block;
-					}
-				}
-
-				li.wc-metabox-sortable-placeholder {
-					border: 3px dashed #dddddd;
-					position: relative;
-
-					&:after {
-						@include icon( "\e00c" );
-						font-size: 2.618em;
-						line-height: 72px;
-						color: #ddd;
-					}
-				}
-
-				ul.actions {
-					position: absolute;
-					top: -8px;
-					right: -8px;
-					padding: 2px;
-					display: none;
-
-					li {
-						float: right;
-						margin: 0 0 0 2px;
-
-						a {
-							width: 1em;
-							height: 1em;
-							margin: 0;
-							height: 0;
-							display: block;
-							overflow: hidden;
-
-							&.tips {
-								cursor: pointer;
-							}
-						}
-
-						a.view {
-							@include ir();
-							font-size: 1.4em;
-
-							&:before {
-								@include icon( "\e00c" );
-								background-color: #000;
-								color: #fff;
-							}
-						}
-
-						a.delete {
-							@include ir();
-							font-size: 1.4em;
-
-							&:before {
-								@include icon( "\e013" );
-								color: white;
-								background-color: #000;
-								@include border-radius(100%);
-								box-shadow: 0 1px 2px rgba(0,0,0,0.2);
-							}
-
-							&:hover before {
-								background-color: $red;
-							}
-						}
-					}
-				}
-
-				li:hover ul.actions {
+				img {
+					width: 100%;
+					height: auto;
 					display: block;
 				}
 			}
+
+			li.wc-metabox-sortable-placeholder {
+				border: 3px dashed #dddddd;
+				position: relative;
+
+				&::after {
+					@include icon_dashicons( '\f161' );
+					font-size: 2.618em;
+					line-height: 72px;
+					color: #ddd;
+				}
+			}
+
+			ul.actions {
+				position: absolute;
+				top: -8px;
+				right: -8px;
+				padding: 2px;
+				display: none;
+
+				li {
+					float: right;
+					margin: 0 0 0 2px;
+
+					a {
+						width: 1em;
+						height: 1em;
+						margin: 0;
+						height: 0;
+						display: block;
+						overflow: hidden;
+
+						&.tips {
+							cursor: pointer;
+						}
+					}
+
+					a.delete {
+						@include ir();
+						font-size: 1.4em;
+
+						&::before {
+							@include icon_dashicons( '\f153' );
+							color: #999;
+						}
+
+						&:hover::before {
+							color: $red;
+						}
+					}
+				}
+			}
+
+			li:hover ul.actions {
+				display: block;
+			}
 		}
 	}
 }
@@ -2476,9 +3247,13 @@ img.help_tip {
 		}
 
 		input, select {
-			margin: -3px 0 0 .5em;
+			margin-top: -3px 0 0;
 			vertical-align: middle;
 		}
+
+		select {
+			margin-left: 0.5em;
+		}
 	}
 
 	> .handlediv {
@@ -2497,7 +3272,7 @@ img.help_tip {
 	height: auto;
 	width: 100%;
 	outline: 0;
-	margin: 10px 0 10px;
+	margin: 10px 0;
 	display: block;
 
 	&::-webkit-input-placeholder {
@@ -2540,7 +3315,7 @@ img.help_tip {
 
 			li {
 				display: block;
-				padding: 0 0 10px 0;
+				padding: 0 0 10px;
 
 				input {
 					width: auto;
@@ -2568,8 +3343,8 @@ img.help_tip {
 		border-right: 1px solid #eee;
 		box-sizing: border-box;
 
-		&:after {
-			content: "";
+		&::after {
+			content: '';
 			display: block;
 			width: 100%;
 			height: 9999em;
@@ -2595,78 +3370,65 @@ img.help_tip {
 				line-height: 20px !important;
 				border-bottom: 1px solid #eee;
 
-				&:before {
-					@include iconbefore( "\e028" );
+				span {
+					margin-left: 0.618em;
+					margin-right: 0.618em;
+				}
+
+				&::before {
+					@include iconbeforedashicons( '\f107' );
 				}
 			}
 
-			&.general_options {
-				a:before {
-					content: "\e006";
-				}
+			&.general_options a::before {
+				content: '\f107';
 			}
 
-			&.inventory_options {
-				a:before {
-					content: "\e02c";
-				}
+			&.inventory_options a::before {
+				content: '\f481';
 			}
 
-			&.shipping_options {
-				a:before {
-					content: "\e01a";
-				}
+			&.shipping_options a::before {
+				font-family: 'WooCommerce';
+				content: '\e01a';
 			}
 
-			&.linked_product_options {
-				a:before {
-					content: "\e00d";
-				}
+			&.linked_product_options a::before {
+				content: '\f103';
 			}
 
-			&.attribute_options {
-				a:before {
-					content: "\e02b";
-				}
+			&.attribute_options a::before {
+				content: '\f175';
 			}
 
-			&.advanced_options {
-				a:before {
-					content: "\f111";
-					font-family: 'Dashicons';
-				}
+			&.advanced_options a::before {
+				font-family: 'Dashicons';
+				content: '\f111';
 			}
 
-			&.variation_options {
-				a:before {
-					content: "\e003";
-				}
+			&.variations_options a::before {
+				content: '\f509';
 			}
 
-			&.usage_restriction_options {
-				a:before {
-					content: "\e602";
-				}
+			&.usage_restriction_options a::before {
+				font-family: 'WooCommerce';
+				content: '\e602';
 			}
 
-			&.usage_limit_options {
-				a:before {
-					content: "\e601";
-				}
+			&.usage_limit_options a::before {
+				font-family: 'WooCommerce';
+				content: '\e601';
 			}
 
-			&.general_coupon_data {
-				a:before {
-					content: "\e600";
-				}
+			&.general_coupon_data a::before {
+				font-family: 'WooCommerce';
+				content: '\e600';
 			}
 
-			&.active {
-				a {
-					color: #555;
-					position: relative;
-					background-color: #eee;
-				}
+			&.active a {
+				color: #555;
+				position: relative;
+				background-color: #eee;
 			}
 		}
 	}
@@ -2676,19 +3438,21 @@ img.help_tip {
  * Shipping
  */
 .woocommerce_page_wc-settings {
+	input[type=url], input[type=email] {
+		direction: ltr;
+	}
+
 	.shippingrows {
 		th.check-column {
 			padding-top: 20px;
 		}
 
-		tfoot {
-			th {
-				padding-left: 10px;
-			}
+		tfoot th {
+			padding-left: 10px;
 		}
 
-		.add.button:before {
-			@include iconbefore( "\e007" );
+		.add.button::before {
+			@include iconbefore( '\e007' );
 		}
 	}
 
@@ -2712,6 +3476,10 @@ img.help_tip {
 .panel {
 	padding: 9px;
 	color: #555;
+
+	.form-field .woocommerce-help-tip {
+		font-size: 1.4em;
+	}
 }
 
 .woocommerce_page_settings .woocommerce_options_panel,
@@ -2733,8 +3501,8 @@ img.help_tip {
 	padding: 5px 9px;
 	line-height: 24px;
 
-	&:after {
-		content: ".";
+	&::after {
+		content: '.';
 		display: block;
 		height: 0;
 		clear: both;
@@ -2745,119 +3513,123 @@ img.help_tip {
 .woocommerce_options_panel .checkbox,
 .woocommerce_variable_attributes .checkbox {
 	width: auto;
-	margin: 3px 0;
+	margin: 4px 0 !important;
 	vertical-align: middle;
+	float: left;
 }
 
 .woocommerce_variations,
 .woocommerce_options_panel {
-	.downloadable_files {
-		table {
-			width: 100%;
-			padding: 0 !important;
+	.downloadable_files table {
+		width: 100%;
+		padding: 0 !important;
 
-			th {
-				padding: 7px 0 7px 7px !important;
-			}
+		th {
+			padding: 7px 0 7px 7px !important;
 
-			td {
-				vertical-align: middle !important;
-				padding: 4px 0 4px 7px !important;
-				position: relative;
-
-				&:last-child {
-					padding-right: 7px !important;
-				}
-
-				input.input_text {
-					width: 100%;
-					float: none;
-					margin: 1px 0;
-					min-width: 0;
-				}
-
-				.upload_file_button {
-					float: right;
-					width: auto;
-					cursor: pointer;
-				}
-
-				.delete {
-					@include ir();
-
-					&:before {
-						@include icon;
-						content: "\e013";
-						color: #999;
-					}
-
-					&:hover {
-						&:before {
-							color: $red;
-						}
-					}
-				}
-			}
-
-			th.sort {
+			&.sort {
 				width: 17px;
-				padding: 0;
+				padding: 7px !important;
 			}
 
-			td.sort {
-				padding: 0 8px;
-				cursor: move;
-				background: #f9f9f9;
-				text-align: center;
-				vertical-align: middle;
+			.woocommerce-help-tip {
+				font-size: 1.1em;
+				margin-left: 0;
+			}
+		}
 
-				&:before {
-					content: "\e032";
-					font-family: 'WooCommerce';
-					text-align: center;
-					line-height: 1;
+		td {
+			vertical-align: middle !important;
+			padding: 4px 0 4px 7px !important;
+			position: relative;
+
+			&:last-child {
+				padding-right: 7px !important;
+			}
+
+			input.input_text {
+				width: 100%;
+				float: none;
+				min-width: 0;
+				margin: 1px 0;
+			}
+
+			.upload_file_button {
+				width: auto;
+				float: right;
+				cursor: pointer;
+			}
+
+			.delete {
+				@include ir();
+				font-size: 1.2em;
+
+				&::before {
+					@include icon_dashicons( '\f153' );
 					color: #999;
-					display: block;
-					width: 17px;
-					float: left;
-					height: 100%;
 				}
 
 				&:hover {
-					&:before {
-						color: #333;
+					&::before {
+						color: $red;
 					}
 				}
 			}
 		}
+
+		td.sort {
+			width: 17px;
+			cursor: move;
+			font-size: 15px;
+			text-align: center;
+			background: #f9f9f9;
+			padding-right: 7px !important;
+
+			&::before {
+				content: '\f333';
+				font-family: 'Dashicons';
+				text-align: center;
+				line-height: 1;
+				color: #999;
+				display: block;
+				width: 17px;
+				float: left;
+				height: 100%;
+			}
+
+			&:hover::before {
+				color: #333;
+			}
+		}
 	}
 }
 .woocommerce_variation {
-	h3 {
-		.sort {
-			cursor: move;
+	h3 .sort {
+		width: 17px;
+		height: 26px;
+		cursor: move;
+		float: right;
+		font-size: 15px;
+		font-weight: 400;
+		margin-right: 0.5em;
+		visibility: hidden;
+		text-align: center;
+		vertical-align: middle;
+
+		&::before {
+			content: '\f333';
+			font-family: 'Dashicons';
 			text-align: center;
-			vertical-align: middle;
-			float: right;
-			height: 26px;
+			line-height: 28px;
+			color: #999;
+			display: block;
 			width: 17px;
-			visibility: hidden;
-			vertical-align: middle;
-			margin-right: .5em;
-			color: #a0a5aa;
-			&:before {
-				content: "\e032";
-				font-family: 'WooCommerce';
-				text-align: center;
-				cursor: move;
-				line-height: 1;
-				display: block;
-				width: 17px;
-				line-height: 28px;
-			}
-			&:hover {
-				color: #777;
-			}
+			float: left;
+			height: 100%;
+		}
+
+		&:hover::before {
+			color: #777;
 		}
 	}
 	h3:hover, &.ui-sortable-helper {
@@ -2874,7 +3646,7 @@ img.help_tip {
 	.downloadable_files {
 		padding: 0 9px 0 162px;
 		position: relative;
-		margin: 9px 0 9px;
+		margin: 9px 0;
 
 		label {
 			position: absolute;
@@ -2898,7 +3670,7 @@ img.help_tip {
 			margin-bottom: 1em;
 		}
 
-		.short:nth-of-type(2) {
+		.short:nth-of-type( 2 ) {
 			clear: left;
 		}
 	}
@@ -2936,14 +3708,16 @@ img.help_tip {
 	}
 
 	textarea {
+		float: left;
 		height: 3.5em;
 		line-height: 1.5em;
 		vertical-align: top;
 	}
 
-	input[type="text"],
-	input[type="email"],
-	input[type="number"] {
+	input[type='text'],
+	input[type='email'],
+	input[type='number'],
+	input[type='password'] {
 		width: 50%;
 		float: left;
 	}
@@ -2957,9 +3731,10 @@ img.help_tip {
 		float: left;
 	}
 
-	input[type="text"].short,
-	input[type="email"].short,
-	input[type="number"].short,
+	input[type='text'].short,
+	input[type='email'].short,
+	input[type='number'].short,
+	input[type='password'].short,
 	.short {
 		width: 50%;
 	}
@@ -3010,27 +3785,23 @@ img.help_tip {
 				}
 			}
 
-			ul.wc-radios {
-				label {
-					margin-left: 0;
-				}
+			ul.wc-radios label {
+				margin-left: 0;
 			}
 		}
 	}
 
-	.dimensions_field {
-		.wrap {
-			display: block;
-			width: 50%;
+	.dimensions_field .wrap {
+		display: block;
+		width: 50%;
 
-			input {
-				width: 30.75%;
-				margin-right: 3.8%;
-			}
+		input {
+			width: 30.75%;
+			margin-right: 3.8%;
+		}
 
-			.last {
-				margin-right: 0;
-			}
+		.last {
+			margin-right: 0;
 		}
 	}
 
@@ -3103,11 +3874,9 @@ img.help_tip {
 		}
 	}
 
-	&#product_attributes {
-		.expand-close {
-			float: right;
-			line-height: 28px;
-		}
+	&#product_attributes .expand-close {
+		float: right;
+		line-height: 28px;
 	}
 
 	button.add_variable_attribute,
@@ -3144,12 +3913,12 @@ img.help_tip {
 		.handlediv {
 			width: 27px;
 
-			&:before {
-				content: "\f142" !important;
+			&::before {
+				content: '\f142' !important;
 				cursor: pointer;
 				display: inline-block;
-				font: 400 20px/1 "Dashicons";
-				line-height: .5 !important;
+				font: 400 20px/1 'Dashicons';
+				line-height: 0.5 !important;
 				padding: 8px 10px;
 				position: relative;
 				right: 12px;
@@ -3160,10 +3929,8 @@ img.help_tip {
 		&.closed {
 			@include border-radius(3px);
 
-			.handlediv {
-				&:before {
-					content: "\f140" !important;
-				}
+			.handlediv::before {
+				content: '\f140' !important;
 			}
 
 			h3 {
@@ -3173,7 +3940,7 @@ img.help_tip {
 
 		h3 {
 			margin: 0 !important;
-			padding: .75em .75em .75em 1em !important;
+			padding: 0.75em 0.75em 0.75em 1em !important;
 			font-size: 1em !important;
 			overflow: hidden;
 			zoom: 1;
@@ -3201,7 +3968,7 @@ img.help_tip {
 			select {
 				font-family: sans-serif;
 				max-width: 20%;
-				margin: .25em .25em .25em 0;
+				margin: 0.25em 0.25em 0.25em 0;
 			}
 
 			.handlediv {
@@ -3217,9 +3984,9 @@ img.help_tip {
 
 		&.woocommerce_variation h3 {
 			cursor: pointer;
-			padding: .5em .75em .5em 1em !important;
+			padding: 0.5em 0.75em 0.5em 1em !important;
 			a.delete, .handlediv, .sort {
-				margin-top: .25em;
+				margin-top: 0.25em;
 			}
 		}
 
@@ -3264,7 +4031,7 @@ img.help_tip {
 				}
 
 				select,
-				.select2-container  {
+				.select2-container {
 					width: 100% !important;
 				}
 
@@ -3312,7 +4079,7 @@ img.help_tip {
 	}
 
 	a {
-		padding: 0px 10px 3px;
+		padding: 0 10px 3px;
 		background: rgba(0, 0, 0, 0.05);
 		font-size: 16px;
 		font-weight: 400;
@@ -3323,7 +4090,7 @@ img.help_tip {
 	a.disabled:active,
 	a.disabled:focus,
 	a.disabled:hover {
-		color: #A0A5AA;
+		color: #a0a5aa;
 		background: rgba(0, 0, 0, 0.05);
 	}
 }
@@ -3331,7 +4098,7 @@ img.help_tip {
 .variations-defaults {
 	float: left;
 	select {
-		margin: .25em .25em .25em 0;
+		margin: 0.25em 0.25em 0.25em 0;
 	}
 }
 
@@ -3346,8 +4113,8 @@ img.help_tip {
 
 	.upload_image_button {
 		display: block;
-		width: 48px;
-		height: 48px;
+		width: 64px;
+		height: 64px;
 		float: left;
 		margin-right: 20px;
 		position: relative;
@@ -3359,8 +4126,8 @@ img.help_tip {
 			display: none;
 		}
 
-		&:before {
-			content: "\f128";
+		&::before {
+			content: '\f128';
 			font-family: 'Dashicons';
 			position: absolute;
 			top: 0;
@@ -3368,26 +4135,24 @@ img.help_tip {
 			right: 0;
 			bottom: 0;
 			text-align: center;
-			line-height: 48px;
-			font-size: 48px;
+			line-height: 64px;
+			font-size: 64px;
 			font-weight: 400;
 			-webkit-font-smoothing: antialiased;
 		}
 
-		&.remove{
+		&.remove {
 			img {
 				display: block;
 			}
 
-			&:before {
-				content: "\f335";
+			&::before {
+				content: '\f335';
 				display: none;
 			}
 
-			&:hover {
-				&:before {
-					display: block;
-				}
+			&:hover::before {
+				display: block;
 			}
 		}
 	}
@@ -3395,7 +4160,7 @@ img.help_tip {
 	.options {
 		border: 1px solid #eee;
 		border-width: 1px 0;
-		padding: .25em 0;
+		padding: 0.25em 0;
 
 		label {
 			display: inline-block;
@@ -3403,49 +4168,67 @@ img.help_tip {
 		}
 
 		input[type=checkbox] {
-			margin-top: 5px;
-			margin-right: 3px;
+			margin: 0 5px 0 .5em!important;
+			vertical-align: middle;
 		}
 	}
 }
 
 .form-row {
 	label {
-		display: block;
+		display: inline-block;
+	}
+
+	.woocommerce-help-tip {
+		float: right;
 	}
 
 	input[type=text],
 	input[type=number],
-	select {
+	select,
+	textarea {
 		width: 100%;
+		vertical-align: middle;
+		margin: 2px 0 0;
+		padding: 6px;
+	}
+
+	select {
+		height: 30px;
+		line-height: 30px;
 	}
 
 	&.dimensions_field {
+		.wrap {
+			clear:left;
+			display: block;
+		}
 		input {
-			width: 25%;
+			width: 33%;
 			float: left;
-			margin-right: 1%;
+			vertical-align: middle;
 
 			&:last-of-type {
 				margin-right: 0;
+				width: 34%;
 			}
 		}
 	}
-}
 
-.form-row-first,
-.form-row-last {
-	width: 48%;
-	float: right;
-}
+	&.form-row-first,
+	&.form-row-last {
+		width: 48%;
+		float: right;
+	}
 
-.form-row-first {
-	clear: both;
-	float: left;
-}
+	&.form-row-first {
+		clear: both;
+		float: left;
+	}
 
-.form-row-full {
-	clear: both;
+	&.form-row-full {
+		clear: both;
+	}
 }
 
 /**
@@ -3457,18 +4240,18 @@ img.help_tip {
 }
 
 img.tips {
-	padding: 5px 0 0 0;
+	padding: 5px 0 0;
 }
 
 #tiptip_holder {
 	display: none;
+	z-index: 8675309;
 	position: absolute;
 	top: 0;
+	/*rtl:ignore*/
 	left: 0;
-	z-index: 9999999;
-}
 
-#tiptip_holder {
+
 	&.tip_top {
 		padding-bottom: 5px;
 
@@ -3514,13 +4297,13 @@ img.tips {
 .chart-tooltip,
 .wc_error_tip {
 	color: #fff;
-	font-size: .8em;
+	font-size: 0.8em;
 	max-width: 150px;
 	background: #333;
 	text-align: center;
 	border-radius: 3px;
-	padding: .618em 1em;
-	box-shadow: 0 1px 3px rgba(0,0,0,0.2);
+	padding: 0.618em 1em;
+	box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
 
 	code {
 		padding: 1px;
@@ -3538,6 +4321,13 @@ img.tips {
 	width: 0;
 }
 
+/*rtl:raw:
+#tiptip_arrow {
+	right: 50%;
+	margin-right: -6px;
+}
+*/
+
 .wc_error_tip {
 	max-width: 20em;
 	line-height: 1.8em;
@@ -3547,8 +4337,8 @@ img.tips {
 	margin: 1.5em 1px 0 -1em;
 	z-index: 9999999;
 
-	&:after {
-		content: "";
+	&::after {
+		content: '';
 		display: block;
 		border: 8px solid #d82223;
 		border-right-color: transparent;
@@ -3567,7 +4357,7 @@ img.tips {
 img.ui-datepicker-trigger {
 	vertical-align: middle;
 	margin-top: -1px;
-	cursor: pointer
+	cursor: pointer;
 }
 
 .woocommerce_options_panel img.ui-datepicker-trigger,
@@ -3579,7 +4369,7 @@ img.ui-datepicker-trigger {
 }
 
 #ui-datepicker-div {
-	display: none
+	display: none;
 }
 
 /**
@@ -3598,19 +4388,17 @@ img.ui-datepicker-trigger {
 		zoom: 1;
 	}
 
-	.widefat {
-		td {
-			vertical-align: top;
-			padding: 7px 7px;
-			.description {
-				margin: 4px 0 0 0;
-			}
+	.widefat td {
+		vertical-align: top;
+		padding: 7px;
+		.description {
+			margin: 4px 0 0;
 		}
 	}
 
 	.postbox {
-		&:after {
-			content: ".";
+		&::after {
+			content: '.';
 			display: block;
 			height: 0;
 			clear: both;
@@ -3626,6 +4414,7 @@ img.ui-datepicker-trigger {
 			margin: 0 !important;
 		}
 
+		div.stats_range,
 		h3.stats_range {
 			border-bottom-color: #dfdfdf;
 			margin: 0;
@@ -3639,8 +4428,8 @@ img.ui-datepicker-trigger {
 				display: block;
 				text-decoration: none;
 
-				&:before {
-					@include iconbefore( "\e00a" );
+				&::before {
+					@include iconbeforedashicons( '\f346' );
 					margin-right: 4px;
 				}
 			}
@@ -3651,14 +4440,15 @@ img.ui-datepicker-trigger {
 				padding: 0;
 				zoom: 1;
 				background: #f5f5f5;
+				border-bottom: 1px solid #ccc;
 
-				&:before,
-				&:after {
-					content: " ";
+				&::before,
+				&::after {
+					content: ' ';
 					display: table;
 				}
 
-				&:after {
+				&::after {
 					clear: both;
 				}
 
@@ -3667,6 +4457,8 @@ img.ui-datepicker-trigger {
 					margin: 0;
 					padding: 0;
 					line-height: 26px;
+					font-weight: bold;
+					font-size: 14px;
 
 					a {
 						border-right: 1px solid #dfdfdf;
@@ -3703,6 +4495,10 @@ img.ui-datepicker-trigger {
 								text-align: center;
 								-webkit-box-shadow: none;
 								box-shadow: none;
+
+								&.from {
+									margin-right: 0;
+								}
 							}
 						}
 					}
@@ -3730,8 +4526,8 @@ img.ui-datepicker-trigger {
 				background: #fafafa;
 				border: 1px solid #dfdfdf;
 
-				&:after {
-					content: ".";
+				&::after {
+					content: '.';
 					display: block;
 					height: 0;
 					clear: both;
@@ -3747,11 +4543,11 @@ img.ui-datepicker-trigger {
 					margin: 0;
 					color: $blue;
 					border-top-width: 0;
-					background-image: -webkit-gradient(linear,left bottom,left top,from(#ececec),to(#f9f9f9));
-					background-image: -webkit-linear-gradient(bottom,#ececec,#f9f9f9);
-					background-image: -moz-linear-gradient(bottom,#ececec,#f9f9f9);
-					background-image: -o-linear-gradient(bottom,#ececec,#f9f9f9);
-					background-image: linear-gradient(to top,#ececec,#f9f9f9);
+					background-image: -webkit-gradient(linear, left bottom, left top, from(#ececec), to(#f9f9f9));
+					background-image: -webkit-linear-gradient(bottom, #ececec, #f9f9f9);
+					background-image: -moz-linear-gradient(bottom, #ececec, #f9f9f9);
+					background-image: -o-linear-gradient(bottom, #ececec, #f9f9f9);
+					background-image: linear-gradient(to top, #ececec, #f9f9f9);
 
 					&.section_title:hover {
 						color: $red;
@@ -3764,10 +4560,10 @@ img.ui-datepicker-trigger {
 					span {
 						display: block;
 
-						&:after {
-							@include iconafter( "\e035" );
+						&::after {
+							@include iconafter( '\e035' );
 							float: right;
-							font-size: .9em;
+							font-size: 0.9em;
 							line-height: 1.618;
 						}
 					}
@@ -3775,7 +4571,7 @@ img.ui-datepicker-trigger {
 					&.open {
 						color: #333;
 
-						span:after {
+						span::after {
 							display: none;
 						}
 					}
@@ -3874,7 +4670,7 @@ img.ui-datepicker-trigger {
 				padding: 1em;
 				display: block;
 				margin: 0;
-				-webkit-transition: all ease .5s;
+				-webkit-transition: all ease 0.5s;
 				box-shadow:
 					inset 0 -1px 0 0 #dfdfdf;
 
@@ -3884,7 +4680,7 @@ img.ui-datepicker-trigger {
 					color: #464646;
 					font-weight: normal;
 					display: block;
-					font-family: "HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",sans-serif;
+					font-family: 'HelveticaNeue-Light', 'Helvetica Neue Light', 'Helvetica Neue', sans-serif;
 
 					del {
 						color: #e74c3c;
@@ -3904,13 +4700,13 @@ img.ui-datepicker-trigger {
 		}
 
 		.pie-chart-legend {
-			margin: 12px 0 0 0;
+			margin: 12px 0 0;
 			overflow: hidden;
 
 			li {
 				float: left;
 				margin: 0;
-				padding: 6px 0 0 0;
+				padding: 6px 0 0;
 				border-top: 4px solid #999;
 				text-align: center;
 				box-sizing: border-box;
@@ -3964,10 +4760,8 @@ img.ui-datepicker-trigger {
 		float: left;
 		min-width: 100%;
 
-		table {
-			td {
-				padding: 9px;
-			}
+		table td {
+			padding: 9px;
 		}
 	}
 
@@ -3997,22 +4791,18 @@ img.ui-datepicker-trigger {
 			height: 2em !important;
 			width: 2em;
 
-			&:after {
-				@include icon;
+			&::after {
+				@include icon_dashicons;
 				line-height: 1.85;
 			}
 		}
 
-		a.edit {
-			&:after {
-				content: "\e01c";
-			}
+		a.edit::after {
+			content: '\f464';
 		}
 
-		a.view {
-			&:after {
-				content: "\e010";
-			}
+		a.view::after {
+			content: '\f177';
 		}
 	}
 }
@@ -4123,6 +4913,57 @@ table.bar_chart {
 	}
 }
 
+.post-type-shop_order .woocommerce-BlankState-message::before {
+	@include icon( '\e01d' );
+}
+
+.post-type-shop_coupon .woocommerce-BlankState-message::before {
+	@include icon( '\e600' );
+}
+
+.post-type-product .woocommerce-BlankState-message::before {
+	@include icon( '\e006' );
+}
+
+.woocommerce-BlankState--api .woocommerce-BlankState-message::before {
+	@include icon( '\e01c' );
+}
+
+.woocommerce-BlankState--webhooks .woocommerce-BlankState-message::before {
+	@include icon( '\e01b' );
+}
+
+.woocommerce-BlankState {
+	text-align: center;
+	padding: 5em 0 0;
+
+	.woocommerce-BlankState-message {
+		color: #aaa;
+		margin: 0 auto 1.5em;
+		line-height: 1.5em;
+		font-size: 1.2em;
+		max-width: 500px;
+
+		&::before {
+			color: #ddd;
+			text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.2), 0 1px 0 rgba(255, 255, 255, 0.8);
+			font-size: 8em;
+			display: block;
+			position: relative !important;
+			top: auto;
+			left: auto;
+			line-height: 1em;
+			margin: 0 0 0.1875em;
+		}
+	}
+
+	.woocommerce-BlankState-cta {
+		font-size: 1.2em;
+		padding: 0.75em 1.5em;
+		height: auto;
+	}
+}
+
 /**
  * Small screen optimisation
  */
@@ -4144,9 +4985,10 @@ table.bar_chart {
 		}
 
 		.short,
-		input[type=email].short,
-		input[type=number].short,
-		input[type=text].short,
+		input[type='text'].short,
+		input[type='email'].short,
+		input[type='number'].short,
+		input[type='password'].short,
 		.dimensions_field .wrap {
 			width: 80%;
 		}
@@ -4164,7 +5006,7 @@ table.bar_chart {
 			}
 
 			table {
-				margin: 0 12px 24px 12px;
+				margin: 0 12px 24px;
 				width: 94%;
 
 				.sort {
@@ -4173,13 +5015,9 @@ table.bar_chart {
 			}
 		}
 
-		.woocommerce_variable_attributes {
-			.downloadable_files {
-				table {
-					margin: 0 0 1em;
-					width: 100%;
-				}
-			}
+		.woocommerce_variable_attributes .downloadable_files table {
+			margin: 0 0 1em;
+			width: 100%;
 		}
 	}
 }
@@ -4208,7 +5046,7 @@ table.bar_chart {
 		text-indent: -999px;
 		padding: 10px;
 
-		&:before {
+		&::before {
 			position: absolute;
 			top: 0;
 			right: 0;
@@ -4277,7 +5115,7 @@ table.bar_chart {
 				text-align: left;
 				padding-bottom: 0;
 
-				&:before {
+				&::before {
 					display: none !important;
 				}
 
@@ -4286,12 +5124,8 @@ table.bar_chart {
 				}
 			}
 
-			.is-expanded {
-				td {
-					&:not(.hidden) {
-						overflow: visible;
-					}
-				}
+			.is-expanded td:not( .hidden ) {
+				overflow: visible;
 			}
 
 			.toggle-row {
@@ -4311,7 +5145,7 @@ table.bar_chart {
 					margin: 0;
 				}
 
-				&:before {
+				&::before {
 					display: none !important;
 				}
 			}
@@ -4321,19 +5155,13 @@ table.bar_chart {
 				text-align: inherit;
 			}
 
-			.column-order_notes {
-				.note-on {
-					font-size: 1.3em;
-					margin: 0;
-				}
+			.column-order_notes .note-on {
+				font-size: 1.3em;
+				margin: 0;
 			}
 
-			.is-expanded {
-				td {
-					&:not(.hidden) {
-						overflow: visible;
-					}
-				}
+			.is-expanded td:not(.hidden ) {
+				overflow: visible;
 			}
 
 			.toggle-row {
@@ -4354,7 +5182,7 @@ table.bar_chart {
 
 	.woocommerce_options_panel fieldset.form-field,
 	.woocommerce_options_panel p.form-field {
-		padding: 5px 20px 5px 20px !important;
+		padding: 5px 20px !important;
 	}
 }
 
@@ -4368,11 +5196,24 @@ table.bar_chart {
 
 	.wc-backbone-modal-content {
 		position: fixed;
-		top: 50%;
-		left: 50%;
-		width: 500px;
 		background: #fff;
 		z-index: 100000;
+		left: 50%;
+		top: 50%;
+		transform: translate(-50%, -50%);
+		width: 500px;
+		article {
+			overflow: auto;
+		}
+	}
+
+	&.wc-backbone-modal-shipping-method-settings .wc-backbone-modal-content {
+		width: 75%;
+		min-width: 500px;
+	}
+
+	.select2-container {
+		width: 100% !important;
 	}
 }
 
@@ -4384,12 +5225,12 @@ table.bar_chart {
 	bottom: 0;
 	min-height: 360px;
 	background: #000;
-	opacity: .7;
+	opacity: 0.7;
 	z-index: 99900;
 }
 
 .wc-backbone-modal-main {
-	padding-bottom: 51px;
+	padding-bottom: 55px;
 
 	header,
 	article {
@@ -4398,23 +5239,23 @@ table.bar_chart {
 	}
 
 	.wc-backbone-modal-header {
-		height: 50px;
+		height: auto;
 		background: #fcfcfc;
-		padding: 0 50px 0 16px;
+		padding: 1em 1.5em;
 		border-bottom: 1px solid #ddd;
 
 		h1 {
 			margin: 0;
 			font-size: 18px;
 			font-weight: 700;
-			line-height: 50px;
+			line-height: 1.5em;
 		}
 
 		.modal-close-link {
 			cursor: pointer;
 			color: #777;
-			height: 50px;
-			width: 50px;
+			height: 54px;
+			width: 54px;
 			padding: 0;
 			position: absolute;
 			top: 0;
@@ -4423,10 +5264,10 @@ table.bar_chart {
 			border: 0;
 			border-left: 1px solid #ddd;
 			background-color: transparent;
-			-webkit-transition: color .1s ease-in-out,background .1s ease-in-out;
-			transition: color .1s ease-in-out,background .1s ease-in-out;
+			-webkit-transition: color 0.1s ease-in-out, background 0.1s ease-in-out;
+			transition: color 0.1s ease-in-out, background 0.1s ease-in-out;
 
-			&:before {
+			&::before {
 				font: normal 22px/50px 'dashicons' !important;
 				color: #666;
 				display: block;
@@ -4448,8 +5289,18 @@ table.bar_chart {
 	}
 
 	article {
-		padding: 10px 16px;
+		padding: 1.5em;
 
+		p {
+			margin: 1.5em 0;
+		}
+		p:first-child {
+			margin-top: 0;
+		}
+
+		p:last-child {
+			margin-bottom: 0;
+		}
 		.pagination {
 			padding: 10px 0 0;
 			text-align: center;
@@ -4462,10 +5313,10 @@ table.bar_chart {
 		right: 0;
 		bottom: 0;
 		z-index: 100;
-		padding: 10px 16px;
+		padding: 1em 1.5em;
 		background: #fcfcfc;
 		border-top: 1px solid #dfdfdf;
-		box-shadow: 0 -4px 4px -4px rgba(0,0,0,0.1);
+		box-shadow: 0 -4px 4px -4px rgba(0, 0, 0, 0.1);
 
 		.inner {
 			float: right;
@@ -4479,18 +5330,88 @@ table.bar_chart {
 }
 
 /**
- * Select2
+ * Select2 elements.
  */
-.select2-drop {
+.select2-drop,
+.select2-dropdown {
 	z-index: 999999 !important;
 }
-.select2-container-multi .select2-choices .select2-search-field input {
-	font-family: inherit;
-	font-size: inherit;
-	font-weight: inherit;
-	padding: 3px 5px;
+.select2-results {
+	line-height: 1.5em;
+	.select2-results__option, .select2-results__group {
+		margin: 0;
+		padding: 8px;
+	}
+}
+.select2-dropdown {
+	border-color: #ddd;
+}
+.select2-dropdown--below {
+	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+}
+.select2-dropdown--above {
+	box-shadow: 0 -1px 1px rgba(0, 0, 0, 0.1);
 }
 .select2-container {
-	line-height: 1.85em;
-	font-size: 14px;
+	.select2-selection__rendered.ui-sortable li {
+		cursor: move;
+	}
+	.select2-selection {
+		border-color: #ddd;
+	}
+	.select2-search__field {
+		min-width: 150px;
+	}
+	.select2-selection--single {
+		height: 32px;
+		.select2-selection__rendered {
+			line-height: 32px;
+			padding-right: 24px;
+		}
+		.select2-selection__arrow {
+			right: 3px;
+			height: 30px;
+		}
+	}
+	.select2-selection--multiple  {
+		min-height: 28px;
+		border-radius: 0;
+		line-height: 1.5;
+		li {
+			margin: 0;
+		}
+		.select2-selection__choice {
+			padding: 2px 6px;
+		}
+	}
+	.select2-selection__clear {
+		color: #999;
+		margin-top: -1px;
+	}
+	.select2-search--inline .select2-search__field {
+		font-family: inherit;
+		font-size: inherit;
+		font-weight: inherit;
+		padding: 3px 0;
+	}
+}
+.woocommerce table.form-table .select2-container {
+	min-width: 400px !important;
+}
+.post-type-shop_order .tablenav {
+	.actions {
+		overflow: visible;
+	}
+	select,
+	input {
+		line-height: 32px;
+		height: 32px;
+	}
+	.select2-container {
+		float: left;
+		width: 200px !important;
+		font-size: 14px;
+		vertical-align: middle;
+		margin: 1px 6px 4px 1px;
+	}
 }
diff --git a/assets/css/auth-rtl.css b/assets/css/auth-rtl.css
new file mode 100644
index 00000000000..bbe60e5eefd
--- /dev/null
+++ b/assets/css/auth-rtl.css
@@ -0,0 +1 @@
+body{background:#f1f1f1;box-shadow:none;margin:100px auto 24px;padding:0}#wc-logo{border:0;margin:0 0 24px;padding:0;text-align:center}#wc-logo img{max-width:50%}.wc-auth-content{background:#fff;box-shadow:0 1px 3px rgba(0,0,0,.13);overflow:hidden;padding:24px 24px 0;zoom:1}.wc-auth-content h1,.wc-auth-content h2,.wc-auth-content h3,.wc-auth-content table{border:0;clear:none;color:#666;margin:0 0 24px;padding:0}.wc-auth-content p,.wc-auth-content ul{color:#666;font-size:1em;line-height:1.75em;margin:0 0 24px}.wc-auth-content p{padding:0}.wc-auth-content a{color:#a16696}.wc-auth-content a:focus,.wc-auth-content a:hover{color:#111}.wc-auth-content .wc-auth-login label{color:#999;display:block;margin-bottom:.5em}.wc-auth-content .wc-auth-login input{box-sizing:border-box;font-size:1.3em;padding:.5em;width:100%}.wc-auth-content .wc-auth-login .wc-auth-actions{padding:0}.wc-auth-content .wc-auth-login .wc-auth-actions .wc-auth-login-button{float:none;width:100%}.wc-auth-permissions{list-style:disc inside;padding:0}.wc-auth-permissions li{font-size:1em}.wc-auth-logged-in-as{background:#f5f5f5;border-bottom:2px solid #eee;line-height:70px;margin:0 0 24px;padding:0 0 0 1em}.wc-auth-logged-in-as p{margin:0;line-height:70px}.wc-auth-logged-in-as img{float:right;height:70px;margin:0 0 0 1em}.wc-auth-logged-in-as .wc-auth-logout{float:left}.wc-auth .wc-auth-actions{overflow:hidden;padding-right:24px}.wc-auth .wc-auth-actions .button{background:#f7f7f7;border:1px solid #d7d7d7;box-sizing:border-box;color:#777;float:left;font-size:1.25em;height:auto;line-height:1em;padding:1em 2em;text-align:center;width:50%}.wc-auth .wc-auth-actions .button:focus,.wc-auth .wc-auth-actions .button:hover{background:#fcfcfc}.wc-auth .wc-auth-actions .button-primary{background:#ad6ea1;border-color:#a16696;box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 0 rgba(0,0,0,.15);color:#fff;float:left;opacity:1;text-shadow:0 -1px 1px #8a4f7f,-1px 0 1px #8a4f7f,0 1px 1px #8a4f7f,1px 0 1px #8a4f7f}.wc-auth .wc-auth-actions .button-primary:focus,.wc-auth .wc-auth-actions .button-primary:hover{background:#b472a8;color:#fff}.wc-auth .wc-auth-actions .wc-auth-approve{float:left}.wc-auth .wc-auth-actions .wc-auth-deny{float:right;margin-right:-24px}
\ No newline at end of file
diff --git a/assets/css/auth.css b/assets/css/auth.css
index 194ca482046..e7bb5df7204 100644
--- a/assets/css/auth.css
+++ b/assets/css/auth.css
@@ -1 +1 @@
-body{background:#f1f1f1;box-shadow:none;margin:100px auto 24px;padding:0}#wc-logo{border:0;margin:0 0 24px;padding:0;text-align:center}#wc-logo img{max-width:50%}.wc-auth-content{background:#fff;box-shadow:0 1px 3px rgba(0,0,0,.13);overflow:hidden;padding:24px 24px 0;zoom:1}.wc-auth-content h1,.wc-auth-content h2,.wc-auth-content h3,.wc-auth-content table{border:0;clear:none;color:#666;margin:0 0 24px;padding:0}.wc-auth-content p,.wc-auth-content ul{color:#666;font-size:1em;line-height:1.75em;margin:0 0 24px}.wc-auth-content p{padding:0}.wc-auth-content a{color:#A16696}.wc-auth-content a:focus,.wc-auth-content a:hover{color:#111}.wc-auth-content .wc-auth-login label{color:#999;display:block;margin-bottom:.5em}.wc-auth-content .wc-auth-login input{box-sizing:border-box;font-size:1.3em;padding:.5em;width:100%}.wc-auth-content .wc-auth-login .wc-auth-actions{padding:0}.wc-auth-content .wc-auth-login .wc-auth-actions .wc-auth-login-button{float:none;width:100%}.wc-auth-permissions{list-style:disc inside;padding:0}.wc-auth-permissions li{font-size:1em}.wc-auth-logged-in-as{background:#f5f5f5;border-bottom:2px solid #eee;line-height:70px;margin:0 0 24px;padding:0 1em 0 0}.wc-auth-logged-in-as p{margin:0;line-height:70px}.wc-auth-logged-in-as img{float:left;height:70px;margin:0 1em 0 0}.wc-auth-logged-in-as .wc-auth-logout{float:right}.wc-auth .wc-auth-actions{overflow:hidden;padding-left:24px}.wc-auth .wc-auth-actions .button{background:#f7f7f7;border:1px solid #d7d7d7;box-sizing:border-box;color:#777;float:right;font-size:1.25em;height:auto;line-height:1em;padding:1em 2em;text-align:center;width:50%}.wc-auth .wc-auth-actions .button:focus,.wc-auth .wc-auth-actions .button:hover{background:#fcfcfc}.wc-auth .wc-auth-actions .button-primary{background:#ad6ea1;border-color:#a16696;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 0 rgba(0,0,0,.15);color:#fff;float:right;opacity:1;text-shadow:0 -1px 1px #8a4f7f,1px 0 1px #8a4f7f,0 1px 1px #8a4f7f,-1px 0 1px #8a4f7f}.wc-auth .wc-auth-actions .button-primary:focus,.wc-auth .wc-auth-actions .button-primary:hover{background:#B472A8;color:#fff}.wc-auth .wc-auth-actions .wc-auth-approve{float:right}.wc-auth .wc-auth-actions .wc-auth-deny{float:left;margin-left:-24px}
\ No newline at end of file
+body{background:#f1f1f1;box-shadow:none;margin:100px auto 24px;padding:0}#wc-logo{border:0;margin:0 0 24px;padding:0;text-align:center}#wc-logo img{max-width:50%}.wc-auth-content{background:#fff;box-shadow:0 1px 3px rgba(0,0,0,.13);overflow:hidden;padding:24px 24px 0;zoom:1}.wc-auth-content h1,.wc-auth-content h2,.wc-auth-content h3,.wc-auth-content table{border:0;clear:none;color:#666;margin:0 0 24px;padding:0}.wc-auth-content p,.wc-auth-content ul{color:#666;font-size:1em;line-height:1.75em;margin:0 0 24px}.wc-auth-content p{padding:0}.wc-auth-content a{color:#a16696}.wc-auth-content a:focus,.wc-auth-content a:hover{color:#111}.wc-auth-content .wc-auth-login label{color:#999;display:block;margin-bottom:.5em}.wc-auth-content .wc-auth-login input{box-sizing:border-box;font-size:1.3em;padding:.5em;width:100%}.wc-auth-content .wc-auth-login .wc-auth-actions{padding:0}.wc-auth-content .wc-auth-login .wc-auth-actions .wc-auth-login-button{float:none;width:100%}.wc-auth-permissions{list-style:disc inside;padding:0}.wc-auth-permissions li{font-size:1em}.wc-auth-logged-in-as{background:#f5f5f5;border-bottom:2px solid #eee;line-height:70px;margin:0 0 24px;padding:0 1em 0 0}.wc-auth-logged-in-as p{margin:0;line-height:70px}.wc-auth-logged-in-as img{float:left;height:70px;margin:0 1em 0 0}.wc-auth-logged-in-as .wc-auth-logout{float:right}.wc-auth .wc-auth-actions{overflow:hidden;padding-left:24px}.wc-auth .wc-auth-actions .button{background:#f7f7f7;border:1px solid #d7d7d7;box-sizing:border-box;color:#777;float:right;font-size:1.25em;height:auto;line-height:1em;padding:1em 2em;text-align:center;width:50%}.wc-auth .wc-auth-actions .button:focus,.wc-auth .wc-auth-actions .button:hover{background:#fcfcfc}.wc-auth .wc-auth-actions .button-primary{background:#ad6ea1;border-color:#a16696;box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 0 rgba(0,0,0,.15);color:#fff;float:right;opacity:1;text-shadow:0 -1px 1px #8a4f7f,1px 0 1px #8a4f7f,0 1px 1px #8a4f7f,-1px 0 1px #8a4f7f}.wc-auth .wc-auth-actions .button-primary:focus,.wc-auth .wc-auth-actions .button-primary:hover{background:#b472a8;color:#fff}.wc-auth .wc-auth-actions .wc-auth-approve{float:right}.wc-auth .wc-auth-actions .wc-auth-deny{float:left;margin-left:-24px}
\ No newline at end of file
diff --git a/assets/css/auth.scss b/assets/css/auth.scss
index 8da348a6058..999da15afc4 100644
--- a/assets/css/auth.scss
+++ b/assets/css/auth.scss
@@ -18,7 +18,7 @@ body {
 
 .wc-auth-content {
 	background: #fff;
-	box-shadow: 0 1px 3px rgba(0,0,0,0.13);
+	box-shadow: 0 1px 3px rgba(0, 0, 0, 0.13);
 	overflow: hidden;
 	padding: 24px 24px 0;
 	zoom: 1;
@@ -43,7 +43,7 @@ body {
 	}
 
 	a {
-		color: #A16696;
+		color: #a16696;
 		&:hover, &:focus {
 			color: #111;
 		}
@@ -53,13 +53,13 @@ body {
 		label {
 			color: #999;
 			display: block;
-			margin-bottom: .5em;
+			margin-bottom: 0.5em;
 		}
 
 		input {
 			box-sizing: border-box;
 			font-size: 1.3em;
-			padding: .5em;
+			padding: 0.5em;
 			width: 100%;
 		}
 
@@ -133,10 +133,10 @@ body {
 		color: #fff;
 		float: right;
 		opacity: 1;
-		text-shadow: 0px -1px 1px #8a4f7f, 1px 0px 1px #8a4f7f, 0px 1px 1px #8a4f7f, -1px 0px 1px #8a4f7f;
+		text-shadow: 0 -1px 1px #8a4f7f, 1px 0 1px #8a4f7f, 0 1px 1px #8a4f7f, -1px 0 1px #8a4f7f;
 
 		&:hover, &:focus {
-			background: #B472A8;
+			background: #b472a8;
 			color: #fff;
 		}
 	}
diff --git a/assets/css/chosen.css b/assets/css/chosen.css
deleted file mode 100644
index 5365db05a58..00000000000
--- a/assets/css/chosen.css
+++ /dev/null
@@ -1 +0,0 @@
-.woocommerce-checkout .form-row .chosen-container{width:100%!important}.woocommerce-checkout .form-row .chosen-container-single .chosen-single{height:28px;line-height:29px}.woocommerce-checkout .form-row .chosen-container-single .chosen-single div b{background:url(../images/chosen-sprite.png) 0 3px no-repeat!important}.woocommerce-checkout .form-row .chosen-container-active .chosen-single-with-drop div b{background-position:-18px 4px!important}.woocommerce-checkout .form-row .chosen-container-single .chosen-search input{line-height:13px;width:100%!important;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.woocommerce-checkout .form-row .chosen-container .chosen-drop{width:100%!important;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min-resolution:144dpi){.woocommerce-checkout .form-row .chosen-container-single .chosen-single div b{background-image:url(../images/chosen-sprite@2x.png)!important;background-position:0 5px!important;background-repeat:no-repeat!important;background-size:52px 37px!important}.woocommerce-checkout .form-row .chosen-container-active .chosen-single-with-drop div b{background-position:-18px 5px!important}}.chosen-container{position:relative;display:inline-block;vertical-align:middle;font-size:13px;zoom:1;-webkit-user-select:none;-moz-user-select:none;user-select:none}.chosen-container .chosen-drop{position:absolute;top:100%;left:-9999px;z-index:1010;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;width:100%;border:1px solid #aaa;border-top:0;background:#fff;box-shadow:0 4px 5px rgba(0,0,0,.15)}.chosen-container.chosen-with-drop .chosen-drop{left:0}.chosen-container a{cursor:pointer}.chosen-container-single .chosen-single{position:relative;display:block;overflow:hidden;padding:0 0 0 8px;height:26px;border:1px solid #aaa;border-radius:5px;background-color:#fff;background:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#fff),color-stop(50%,#f6f6f6),color-stop(52%,#eee),color-stop(100%,#f4f4f4));background:-webkit-linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:-moz-linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:-o-linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background-clip:padding-box;box-shadow:0 0 3px #fff inset,0 1px 1px rgba(0,0,0,.1);color:#444;text-decoration:none;white-space:nowrap;line-height:26px}.chosen-container-single .chosen-default{color:#999}.chosen-container-single .chosen-single span{display:block;overflow:hidden;margin-right:26px;text-overflow:ellipsis;white-space:nowrap}.chosen-container-single .chosen-single-with-deselect span{margin-right:38px}.chosen-container-single .chosen-single abbr{position:absolute;top:6px;right:26px;display:block;width:12px;height:12px;background:url(../images/chosen-sprite.png) -42px 1px no-repeat;font-size:1px}.chosen-container-single .chosen-single abbr:hover,.chosen-container-single.chosen-disabled .chosen-single abbr:hover{background-position:-42px -10px}.chosen-container-single .chosen-single div{position:absolute;top:0;right:0;display:block;width:18px;height:100%}.chosen-container-single .chosen-single div b{display:block;width:100%;height:100%;background:url(../images/chosen-sprite.png) 0 2px no-repeat}.chosen-container-single .chosen-search{position:relative;z-index:1010;margin:0;padding:3px 4px;white-space:nowrap}.chosen-container-single .chosen-search input[type=text]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin:1px 0;padding:4px 20px 4px 5px;width:100%;height:auto;outline:0;border:1px solid #aaa;background:url(../images/chosen-sprite.png) 100% -20px no-repeat #fff;background:url(../images/chosen-sprite.png) 100% -20px no-repeat,-webkit-gradient(linear,50% 0,50% 100%,color-stop(1%,#eee),color-stop(15%,#fff));background:url(../images/chosen-sprite.png) 100% -20px no-repeat,-webkit-linear-gradient(#eee 1%,#fff 15%);background:url(../images/chosen-sprite.png) 100% -20px no-repeat,-moz-linear-gradient(#eee 1%,#fff 15%);background:url(../images/chosen-sprite.png) 100% -20px no-repeat,-o-linear-gradient(#eee 1%,#fff 15%);background:url(../images/chosen-sprite.png) 100% -20px no-repeat,linear-gradient(#eee 1%,#fff 15%);font-size:1em;font-family:sans-serif;line-height:normal;border-radius:0}.chosen-container-single .chosen-drop{margin-top:-1px;border-radius:0 0 4px 4px;background-clip:padding-box}.chosen-container-single.chosen-container-single-nosearch .chosen-search{position:absolute;left:-9999px}.chosen-container .chosen-results{position:relative;overflow-x:hidden;overflow-y:auto;margin:0 4px 4px 0;padding:0 0 0 4px;max-height:240px;-webkit-overflow-scrolling:touch}.chosen-container .chosen-results li{display:none;margin:0;padding:5px 6px;list-style:none;line-height:15px}.chosen-container .chosen-results li.active-result{display:list-item;cursor:pointer}.chosen-container .chosen-results li.disabled-result{display:list-item;color:#ccc;cursor:default}.chosen-container .chosen-results li.highlighted{background-color:#3875d7;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#3875d7),color-stop(90%,#2a62bc));background-image:-webkit-linear-gradient(#3875d7 20%,#2a62bc 90%);background-image:-moz-linear-gradient(#3875d7 20%,#2a62bc 90%);background-image:-o-linear-gradient(#3875d7 20%,#2a62bc 90%);background-image:linear-gradient(#3875d7 20%,#2a62bc 90%);color:#fff}.chosen-container .chosen-results li.no-results{display:list-item;background:#f4f4f4}.chosen-container .chosen-results li.group-result{display:list-item;font-weight:700;cursor:default}.chosen-container .chosen-results li.group-option{padding-left:15px}.chosen-container .chosen-results li em{font-style:normal;text-decoration:underline}.chosen-container-multi .chosen-choices{position:relative;overflow:hidden;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin:0;padding:0;width:100%;height:auto!important;height:1%;border:1px solid #aaa;background-color:#fff;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(1%,#eee),color-stop(15%,#fff));background-image:-webkit-linear-gradient(#eee 1%,#fff 15%);background-image:-moz-linear-gradient(#eee 1%,#fff 15%);background-image:-o-linear-gradient(#eee 1%,#fff 15%);background-image:linear-gradient(#eee 1%,#fff 15%);cursor:text}.chosen-container-multi .chosen-choices li{float:left;list-style:none}.chosen-container-multi .chosen-choices li.search-field{margin:0;padding:0;white-space:nowrap}.chosen-container-multi .chosen-choices li.search-field input[type=text]{margin:1px 0;padding:5px;height:15px;outline:0;border:0!important;background:0 0!important;box-shadow:none;color:#666;font-size:100%;font-family:sans-serif;line-height:normal;border-radius:0}.chosen-container-multi .chosen-choices li.search-field .default{color:#999}.chosen-container-multi .chosen-choices li.search-choice{position:relative;margin:3px 0 3px 5px;padding:3px 20px 3px 5px;border:1px solid #aaa;border-radius:3px;background-color:#e4e4e4;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#f4f4f4),color-stop(50%,#f0f0f0),color-stop(52%,#e8e8e8),color-stop(100%,#eee));background-image:-webkit-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-moz-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-o-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-clip:padding-box;box-shadow:0 0 2px #fff inset,0 1px 0 rgba(0,0,0,.05);color:#333;line-height:13px;cursor:default}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close{position:absolute;top:4px;right:3px;display:block;width:12px;height:12px;background:url(../images/chosen-sprite.png) -42px 1px no-repeat;font-size:1px}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover{background-position:-42px -10px}.chosen-container-multi .chosen-choices li.search-choice-disabled{padding-right:5px;border:1px solid #ccc;background-color:#e4e4e4;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#f4f4f4),color-stop(50%,#f0f0f0),color-stop(52%,#e8e8e8),color-stop(100%,#eee));background-image:-webkit-linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-moz-linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-o-linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);color:#666}.chosen-container-multi .chosen-choices li.search-choice-focus{background:#d4d4d4}.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close{background-position:-42px -10px}.chosen-container-multi .chosen-results{margin:0;padding:0}.chosen-container-multi .chosen-drop .result-selected{display:list-item;color:#ccc;cursor:default}.chosen-container-active .chosen-single{border:1px solid #5897fb;box-shadow:0 0 5px rgba(0,0,0,.3)}.chosen-container-active.chosen-with-drop .chosen-single{border:1px solid #aaa;-moz-border-radius-bottomright:0;border-bottom-right-radius:0;-moz-border-radius-bottomleft:0;border-bottom-left-radius:0;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#eee),color-stop(80%,#fff));background-image:-webkit-linear-gradient(#eee 20%,#fff 80%);background-image:-moz-linear-gradient(#eee 20%,#fff 80%);background-image:-o-linear-gradient(#eee 20%,#fff 80%);background-image:linear-gradient(#eee 20%,#fff 80%);box-shadow:0 1px 0 #fff inset}.chosen-container-active.chosen-with-drop .chosen-single div{border-left:none;background:0 0}.chosen-container-active.chosen-with-drop .chosen-single div b{background-position:-18px 2px}.chosen-container-active .chosen-choices{border:1px solid #5897fb;box-shadow:0 0 5px rgba(0,0,0,.3)}.chosen-container-active .chosen-choices li.search-field input[type=text]{color:#111!important}.chosen-disabled{opacity:.5!important;cursor:default}.chosen-disabled .chosen-choices .search-choice .search-choice-close,.chosen-disabled .chosen-single{cursor:default}.chosen-rtl{text-align:right}.chosen-rtl .chosen-single{overflow:visible;padding:0 8px 0 0}.chosen-rtl .chosen-single span{margin-right:0;margin-left:26px;direction:rtl}.chosen-rtl .chosen-single-with-deselect span{margin-left:38px}.chosen-rtl .chosen-single div{right:auto;left:3px}.chosen-rtl .chosen-single abbr{right:auto;left:26px}.chosen-rtl .chosen-choices li{float:right}.chosen-rtl .chosen-choices li.search-field input[type=text]{direction:rtl}.chosen-rtl .chosen-choices li.search-choice{margin:3px 5px 3px 0;padding:3px 5px 3px 19px}.chosen-rtl .chosen-choices li.search-choice .search-choice-close{right:auto;left:4px}.chosen-rtl .chosen-drop,.chosen-rtl.chosen-container-single-nosearch .chosen-search{left:9999px}.chosen-rtl.chosen-container-single .chosen-results{margin:0 0 4px 4px;padding:0 4px 0 0}.chosen-rtl .chosen-results li.group-option{padding-right:15px;padding-left:0}.chosen-rtl.chosen-container-active.chosen-with-drop .chosen-single div{border-right:none}.chosen-rtl .chosen-search input[type=text]{padding:4px 5px 4px 20px;background:url(../images/chosen-sprite.png) -30px -20px no-repeat #fff;background:url(../images/chosen-sprite.png) -30px -20px no-repeat,-webkit-gradient(linear,50% 0,50% 100%,color-stop(1%,#eee),color-stop(15%,#fff));background:url(../images/chosen-sprite.png) -30px -20px no-repeat,-webkit-linear-gradient(#eee 1%,#fff 15%);background:url(../images/chosen-sprite.png) -30px -20px no-repeat,-moz-linear-gradient(#eee 1%,#fff 15%);background:url(../images/chosen-sprite.png) -30px -20px no-repeat,-o-linear-gradient(#eee 1%,#fff 15%);background:url(../images/chosen-sprite.png) -30px -20px no-repeat,linear-gradient(#eee 1%,#fff 15%);direction:rtl}.chosen-rtl.chosen-container-single .chosen-single div b{background-position:6px 2px}.chosen-rtl.chosen-container-single.chosen-with-drop .chosen-single div b{background-position:-12px 2px}@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min-resolution:144dpi){.chosen-container .chosen-results-scroll-down span,.chosen-container .chosen-results-scroll-up span,.chosen-container-multi .chosen-choices .search-choice .search-choice-close,.chosen-container-single .chosen-search input[type=text],.chosen-container-single .chosen-single abbr,.chosen-container-single .chosen-single div b,.chosen-rtl .chosen-search input[type=text]{background-image:url(../images/chosen-sprite@2x.png)!important;background-size:52px 37px!important;background-repeat:no-repeat!important}}
\ No newline at end of file
diff --git a/assets/css/chosen.scss b/assets/css/chosen.scss
deleted file mode 100644
index 3d01a3c6b85..00000000000
--- a/assets/css/chosen.scss
+++ /dev/null
@@ -1,474 +0,0 @@
-/* WooCommerce styles */
-.woocommerce-checkout .form-row {
-	.chosen-container {
-		width: 100% !important;
-	}
-	.chosen-container-single .chosen-single {
-		height: 28px;
-		line-height: 29px;
-	}
-	.chosen-container-single .chosen-single div b {
-		background: url('../images/chosen-sprite.png') no-repeat 0 3px !important;
-	}
-	.chosen-container-active .chosen-single-with-drop div b {
-		background-position: -18px 4px !important;
-	}
-	.chosen-container-single .chosen-search input {
-		line-height: 13px;
-		width: 100% !important;
-		-webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
-		-moz-box-sizing: border-box;    /* Firefox, other Gecko */
-		box-sizing: border-box;         /* Opera/IE 8+ */
-	}
-	.chosen-container .chosen-drop {
-		width: 100% !important;
-		-webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
-		-moz-box-sizing: border-box;    /* Firefox, other Gecko */
-		box-sizing: border-box;         /* Opera/IE 8+ */
-	}
-}
-
-@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-resolution: 144dpi) {
-	.woocommerce-checkout .form-row {
-		.chosen-container-single .chosen-single div b {
-			background-image: url('../images/chosen-sprite@2x.png') !important;
-			background-position: 0 5px !important;
-			background-repeat: no-repeat !important;
-			background-size: 52px 37px !important;
-		}
-		.chosen-container-active .chosen-single-with-drop div b {
-			background-position: -18px 5px !important;
-		}
-	}
-}
-
-/* @group Base */
-.chosen-container {
-  position: relative;
-  display: inline-block;
-  vertical-align: middle;
-  font-size: 13px;
-  zoom: 1;
-  *display: inline;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  user-select: none;
-}
-.chosen-container .chosen-drop {
-  position: absolute;
-  top: 100%;
-  left: -9999px;
-  z-index: 1010;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  width: 100%;
-  border: 1px solid #aaa;
-  border-top: 0;
-  background: #fff;
-  box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15);
-}
-.chosen-container.chosen-with-drop .chosen-drop {
-  left: 0;
-}
-.chosen-container a {
-  cursor: pointer;
-}
-
-/* @end */
-/* @group Single Chosen */
-.chosen-container-single .chosen-single {
-  position: relative;
-  display: block;
-  overflow: hidden;
-  padding: 0 0 0 8px;
-  height: 26px;
-  border: 1px solid #aaa;
-  border-radius: 5px;
-  background-color: #fff;
-  background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #ffffff), color-stop(50%, #f6f6f6), color-stop(52%, #eeeeee), color-stop(100%, #f4f4f4));
-  background: -webkit-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
-  background: -moz-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
-  background: -o-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
-  background: linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
-  background-clip: padding-box;
-  box-shadow: 0 0 3px white inset, 0 1px 1px rgba(0, 0, 0, 0.1);
-  color: #444;
-  text-decoration: none;
-  white-space: nowrap;
-  line-height: 26px;
-}
-.chosen-container-single .chosen-default {
-  color: #999;
-}
-.chosen-container-single .chosen-single span {
-  display: block;
-  overflow: hidden;
-  margin-right: 26px;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.chosen-container-single .chosen-single-with-deselect span {
-  margin-right: 38px;
-}
-.chosen-container-single .chosen-single abbr {
-  position: absolute;
-  top: 6px;
-  right: 26px;
-  display: block;
-  width: 12px;
-  height: 12px;
-  background: url('../images/chosen-sprite.png') -42px 1px no-repeat;
-  font-size: 1px;
-}
-.chosen-container-single .chosen-single abbr:hover {
-  background-position: -42px -10px;
-}
-.chosen-container-single.chosen-disabled .chosen-single abbr:hover {
-  background-position: -42px -10px;
-}
-.chosen-container-single .chosen-single div {
-  position: absolute;
-  top: 0;
-  right: 0;
-  display: block;
-  width: 18px;
-  height: 100%;
-}
-.chosen-container-single .chosen-single div b {
-  display: block;
-  width: 100%;
-  height: 100%;
-  background: url('../images/chosen-sprite.png') no-repeat 0px 2px;
-}
-.chosen-container-single .chosen-search {
-  position: relative;
-  z-index: 1010;
-  margin: 0;
-  padding: 3px 4px;
-  white-space: nowrap;
-}
-.chosen-container-single .chosen-search input[type="text"] {
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  margin: 1px 0;
-  padding: 4px 20px 4px 5px;
-  width: 100%;
-  height: auto;
-  outline: 0;
-  border: 1px solid #aaa;
-  background: white url('../images/chosen-sprite.png') no-repeat 100% -20px;
-  background: url('../images/chosen-sprite.png') no-repeat 100% -20px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(1%, #eeeeee), color-stop(15%, #ffffff));
-  background: url('../images/chosen-sprite.png') no-repeat 100% -20px, -webkit-linear-gradient(#eeeeee 1%, #ffffff 15%);
-  background: url('../images/chosen-sprite.png') no-repeat 100% -20px, -moz-linear-gradient(#eeeeee 1%, #ffffff 15%);
-  background: url('../images/chosen-sprite.png') no-repeat 100% -20px, -o-linear-gradient(#eeeeee 1%, #ffffff 15%);
-  background: url('../images/chosen-sprite.png') no-repeat 100% -20px, linear-gradient(#eeeeee 1%, #ffffff 15%);
-  font-size: 1em;
-  font-family: sans-serif;
-  line-height: normal;
-  border-radius: 0;
-}
-.chosen-container-single .chosen-drop {
-  margin-top: -1px;
-  border-radius: 0 0 4px 4px;
-  background-clip: padding-box;
-}
-.chosen-container-single.chosen-container-single-nosearch .chosen-search {
-  position: absolute;
-  left: -9999px;
-}
-
-/* @end */
-/* @group Results */
-.chosen-container .chosen-results {
-  position: relative;
-  overflow-x: hidden;
-  overflow-y: auto;
-  margin: 0 4px 4px 0;
-  padding: 0 0 0 4px;
-  max-height: 240px;
-  -webkit-overflow-scrolling: touch;
-}
-.chosen-container .chosen-results li {
-  display: none;
-  margin: 0;
-  padding: 5px 6px;
-  list-style: none;
-  line-height: 15px;
-}
-.chosen-container .chosen-results li.active-result {
-  display: list-item;
-  cursor: pointer;
-}
-.chosen-container .chosen-results li.disabled-result {
-  display: list-item;
-  color: #ccc;
-  cursor: default;
-}
-.chosen-container .chosen-results li.highlighted {
-  background-color: #3875d7;
-  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #3875d7), color-stop(90%, #2a62bc));
-  background-image: -webkit-linear-gradient(#3875d7 20%, #2a62bc 90%);
-  background-image: -moz-linear-gradient(#3875d7 20%, #2a62bc 90%);
-  background-image: -o-linear-gradient(#3875d7 20%, #2a62bc 90%);
-  background-image: linear-gradient(#3875d7 20%, #2a62bc 90%);
-  color: #fff;
-}
-.chosen-container .chosen-results li.no-results {
-  display: list-item;
-  background: #f4f4f4;
-}
-.chosen-container .chosen-results li.group-result {
-  display: list-item;
-  font-weight: bold;
-  cursor: default;
-}
-.chosen-container .chosen-results li.group-option {
-  padding-left: 15px;
-}
-.chosen-container .chosen-results li em {
-  font-style: normal;
-  text-decoration: underline;
-}
-
-/* @end */
-/* @group Multi Chosen */
-.chosen-container-multi .chosen-choices {
-  position: relative;
-  overflow: hidden;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  margin: 0;
-  padding: 0;
-  width: 100%;
-  height: auto !important;
-  height: 1%;
-  border: 1px solid #aaa;
-  background-color: #fff;
-  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(1%, #eeeeee), color-stop(15%, #ffffff));
-  background-image: -webkit-linear-gradient(#eeeeee 1%, #ffffff 15%);
-  background-image: -moz-linear-gradient(#eeeeee 1%, #ffffff 15%);
-  background-image: -o-linear-gradient(#eeeeee 1%, #ffffff 15%);
-  background-image: linear-gradient(#eeeeee 1%, #ffffff 15%);
-  cursor: text;
-}
-.chosen-container-multi .chosen-choices li {
-  float: left;
-  list-style: none;
-}
-.chosen-container-multi .chosen-choices li.search-field {
-  margin: 0;
-  padding: 0;
-  white-space: nowrap;
-}
-.chosen-container-multi .chosen-choices li.search-field input[type="text"] {
-  margin: 1px 0;
-  padding: 5px;
-  height: 15px;
-  outline: 0;
-  border: 0 !important;
-  background: transparent !important;
-  box-shadow: none;
-  color: #666;
-  font-size: 100%;
-  font-family: sans-serif;
-  line-height: normal;
-  border-radius: 0;
-}
-.chosen-container-multi .chosen-choices li.search-field .default {
-  color: #999;
-}
-.chosen-container-multi .chosen-choices li.search-choice {
-  position: relative;
-  margin: 3px 0 3px 5px;
-  padding: 3px 20px 3px 5px;
-  border: 1px solid #aaa;
-  border-radius: 3px;
-  background-color: #e4e4e4;
-  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee));
-  background-image: -webkit-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-  background-image: -moz-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-  background-image: -o-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-  background-image: linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-  background-clip: padding-box;
-  box-shadow: 0 0 2px white inset, 0 1px 0 rgba(0, 0, 0, 0.05);
-  color: #333;
-  line-height: 13px;
-  cursor: default;
-}
-.chosen-container-multi .chosen-choices li.search-choice .search-choice-close {
-  position: absolute;
-  top: 4px;
-  right: 3px;
-  display: block;
-  width: 12px;
-  height: 12px;
-  background: url('../images/chosen-sprite.png') -42px 1px no-repeat;
-  font-size: 1px;
-}
-.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover {
-  background-position: -42px -10px;
-}
-.chosen-container-multi .chosen-choices li.search-choice-disabled {
-  padding-right: 5px;
-  border: 1px solid #ccc;
-  background-color: #e4e4e4;
-  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee));
-  background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-  background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-  background-image: -o-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-  background-image: linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-  color: #666;
-}
-.chosen-container-multi .chosen-choices li.search-choice-focus {
-  background: #d4d4d4;
-}
-.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close {
-  background-position: -42px -10px;
-}
-.chosen-container-multi .chosen-results {
-  margin: 0;
-  padding: 0;
-}
-.chosen-container-multi .chosen-drop .result-selected {
-  display: list-item;
-  color: #ccc;
-  cursor: default;
-}
-
-/* @end */
-/* @group Active  */
-.chosen-container-active .chosen-single {
-  border: 1px solid #5897fb;
-  box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
-}
-.chosen-container-active.chosen-with-drop .chosen-single {
-  border: 1px solid #aaa;
-  -moz-border-radius-bottomright: 0;
-  border-bottom-right-radius: 0;
-  -moz-border-radius-bottomleft: 0;
-  border-bottom-left-radius: 0;
-  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #eeeeee), color-stop(80%, #ffffff));
-  background-image: -webkit-linear-gradient(#eeeeee 20%, #ffffff 80%);
-  background-image: -moz-linear-gradient(#eeeeee 20%, #ffffff 80%);
-  background-image: -o-linear-gradient(#eeeeee 20%, #ffffff 80%);
-  background-image: linear-gradient(#eeeeee 20%, #ffffff 80%);
-  box-shadow: 0 1px 0 #fff inset;
-}
-.chosen-container-active.chosen-with-drop .chosen-single div {
-  border-left: none;
-  background: transparent;
-}
-.chosen-container-active.chosen-with-drop .chosen-single div b {
-  background-position: -18px 2px;
-}
-.chosen-container-active .chosen-choices {
-  border: 1px solid #5897fb;
-  box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
-}
-.chosen-container-active .chosen-choices li.search-field input[type="text"] {
-  color: #111 !important;
-}
-
-/* @end */
-/* @group Disabled Support */
-.chosen-disabled {
-  opacity: 0.5 !important;
-  cursor: default;
-}
-.chosen-disabled .chosen-single {
-  cursor: default;
-}
-.chosen-disabled .chosen-choices .search-choice .search-choice-close {
-  cursor: default;
-}
-
-/* @end */
-/* @group Right to Left */
-.chosen-rtl {
-  text-align: right;
-}
-.chosen-rtl .chosen-single {
-  overflow: visible;
-  padding: 0 8px 0 0;
-}
-.chosen-rtl .chosen-single span {
-  margin-right: 0;
-  margin-left: 26px;
-  direction: rtl;
-}
-.chosen-rtl .chosen-single-with-deselect span {
-  margin-left: 38px;
-}
-.chosen-rtl .chosen-single div {
-  right: auto;
-  left: 3px;
-}
-.chosen-rtl .chosen-single abbr {
-  right: auto;
-  left: 26px;
-}
-.chosen-rtl .chosen-choices li {
-  float: right;
-}
-.chosen-rtl .chosen-choices li.search-field input[type="text"] {
-  direction: rtl;
-}
-.chosen-rtl .chosen-choices li.search-choice {
-  margin: 3px 5px 3px 0;
-  padding: 3px 5px 3px 19px;
-}
-.chosen-rtl .chosen-choices li.search-choice .search-choice-close {
-  right: auto;
-  left: 4px;
-}
-.chosen-rtl.chosen-container-single-nosearch .chosen-search,
-.chosen-rtl .chosen-drop {
-  left: 9999px;
-}
-.chosen-rtl.chosen-container-single .chosen-results {
-  margin: 0 0 4px 4px;
-  padding: 0 4px 0 0;
-}
-.chosen-rtl .chosen-results li.group-option {
-  padding-right: 15px;
-  padding-left: 0;
-}
-.chosen-rtl.chosen-container-active.chosen-with-drop .chosen-single div {
-  border-right: none;
-}
-.chosen-rtl .chosen-search input[type="text"] {
-  padding: 4px 5px 4px 20px;
-  background: white url('../images/chosen-sprite.png') no-repeat -30px -20px;
-  background: url('../images/chosen-sprite.png') no-repeat -30px -20px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(1%, #eeeeee), color-stop(15%, #ffffff));
-  background: url('../images/chosen-sprite.png') no-repeat -30px -20px, -webkit-linear-gradient(#eeeeee 1%, #ffffff 15%);
-  background: url('../images/chosen-sprite.png') no-repeat -30px -20px, -moz-linear-gradient(#eeeeee 1%, #ffffff 15%);
-  background: url('../images/chosen-sprite.png') no-repeat -30px -20px, -o-linear-gradient(#eeeeee 1%, #ffffff 15%);
-  background: url('../images/chosen-sprite.png') no-repeat -30px -20px, linear-gradient(#eeeeee 1%, #ffffff 15%);
-  direction: rtl;
-}
-.chosen-rtl.chosen-container-single .chosen-single div b {
-  background-position: 6px 2px;
-}
-.chosen-rtl.chosen-container-single.chosen-with-drop .chosen-single div b {
-  background-position: -12px 2px;
-}
-
-/* @end */
-/* @group Retina compatibility */
-@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-resolution: 144dpi) {
-  .chosen-rtl .chosen-search input[type="text"],
-  .chosen-container-single .chosen-single abbr,
-  .chosen-container-single .chosen-single div b,
-  .chosen-container-single .chosen-search input[type="text"],
-  .chosen-container-multi .chosen-choices .search-choice .search-choice-close,
-  .chosen-container .chosen-results-scroll-down span,
-  .chosen-container .chosen-results-scroll-up span {
-    background-image: url('../images/chosen-sprite@2x.png') !important;
-    background-size: 52px 37px !important;
-    background-repeat: no-repeat !important;
-  }
-}
-/* @end */
diff --git a/assets/css/dashboard-rtl.css b/assets/css/dashboard-rtl.css
new file mode 100644
index 00000000000..a1c3df704d6
--- /dev/null
+++ b/assets/css/dashboard-rtl.css
@@ -0,0 +1 @@
+@charset "UTF-8";@font-face{font-family:star;src:url(../fonts/star.eot);src:url(../fonts/star.eot?#iefix) format("embedded-opentype"),url(../fonts/star.woff) format("woff"),url(../fonts/star.ttf) format("truetype"),url(../fonts/star.svg#star) format("svg");font-weight:400;font-style:normal}@font-face{font-family:WooCommerce;src:url(../fonts/WooCommerce.eot);src:url(../fonts/WooCommerce.eot?#iefix) format("embedded-opentype"),url(../fonts/WooCommerce.woff) format("woff"),url(../fonts/WooCommerce.ttf) format("truetype"),url(../fonts/WooCommerce.svg#WooCommerce) format("svg");font-weight:400;font-style:normal}ul.woocommerce_stats{overflow:hidden;zoom:1}ul.woocommerce_stats li{width:25%;padding:0 1em;text-align:center;float:right;font-size:.8em;border-right:1px solid #fff;border-left:1px solid #ececec;box-sizing:border-box}ul.woocommerce_stats li:first-child{border-right:0}ul.woocommerce_stats li:last-child{border-left:0}#woocommerce_dashboard_status .wc_status_list li.low-in-stock,#woocommerce_dashboard_status .wc_status_list li.processing-orders{border-left:1px solid #ececec}ul.woocommerce_stats strong{font-family:Georgia,'Times New Roman','Bitstream Charter',Times,serif;font-size:4em;line-height:1.2em;font-weight:400;text-align:center;display:block}#woocommerce_dashboard_status .inside{padding:0;margin:0}#woocommerce_dashboard_status .wc_status_list{overflow:hidden;margin:0}#woocommerce_dashboard_status .wc_status_list li{width:50%;float:right;padding:0;box-sizing:border-box;margin:0;border-top:1px solid #ececec;color:#aaa}#woocommerce_dashboard_status .wc_status_list li a{display:block;color:#aaa;padding:9px 12px;-webkit-transition:all ease .5s;position:relative;font-size:12px}#woocommerce_dashboard_status .wc_status_list li a .wc_sparkline{width:4em;height:2em;display:block;float:left;position:absolute;left:0;top:50%;margin-left:12px;margin-top:-1.25em}#woocommerce_dashboard_status .wc_status_list li a strong{font-size:18px;line-height:1.2em;font-weight:400;display:block;color:#21759b}#woocommerce_dashboard_status .wc_status_list li a:hover{color:#2ea2cc}#woocommerce_dashboard_status .wc_status_list li a:hover strong,#woocommerce_dashboard_status .wc_status_list li a:hover::before{color:#2ea2cc!important}#woocommerce_dashboard_status .wc_status_list li a::before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0 0 12px 12px;text-indent:0;top:0;right:0;height:100%;text-align:center;content:"";font-size:2em;position:relative;width:auto;line-height:1.2em;color:#464646;float:right}#woocommerce_dashboard_status .wc_status_list li.best-seller-this-month,#woocommerce_dashboard_status .wc_status_list li.sales-this-month{width:100%}#woocommerce_dashboard_status .wc_status_list li:first-child{border-top:0}#woocommerce_dashboard_status .wc_status_list li.sales-this-month a::before{font-family:Dashicons;content:'\f185'}#woocommerce_dashboard_status .wc_status_list li.best-seller-this-month a::before{content:'\e006'}#woocommerce_dashboard_status .wc_status_list li.processing-orders a::before{content:'\e011';color:#7ad03a}#woocommerce_dashboard_status .wc_status_list li.on-hold-orders a::before{content:'\e033';color:#999}#woocommerce_dashboard_status .wc_status_list li.low-in-stock a::before{content:'\e016';color:#ffba00}#woocommerce_dashboard_status .wc_status_list li.out-of-stock a::before{content:'\e013';color:#a00}#woocommerce_dashboard_recent_reviews li{line-height:1.5em;margin-bottom:12px}#woocommerce_dashboard_recent_reviews h4.meta{line-height:1.4;margin:-.2em 0 0;font-weight:400;color:#999}#woocommerce_dashboard_recent_reviews blockquote{padding:0;margin:0}#woocommerce_dashboard_recent_reviews .avatar{float:right;margin:0 0 5px 10px}#woocommerce_dashboard_recent_reviews .star-rating{float:left;overflow:hidden;position:relative;height:1.5em;line-height:1.5;margin-right:.5em;width:5.4em;font-family:WooCommerce!important}#woocommerce_dashboard_recent_reviews .star-rating::before{content:'\e021\e021\e021\e021\e021';color:#b3b3b3;float:right;top:0;right:0;position:absolute;letter-spacing:.1em;letter-spacing:0\9}#woocommerce_dashboard_recent_reviews .star-rating span{overflow:hidden;float:right;top:0;right:0;position:absolute;padding-top:1.5em}#woocommerce_dashboard_recent_reviews .star-rating span::before{content:'\e020\e020\e020\e020\e020';top:0;position:absolute;right:0;letter-spacing:.1em;letter-spacing:0\9;color:#9c5d90}#dash-right-now li.product-count a::before{font-family:WooCommerce;content:'\e01d'}
\ No newline at end of file
diff --git a/assets/css/dashboard.css b/assets/css/dashboard.css
index 0fc1be88e4e..684acc4b8cd 100644
--- a/assets/css/dashboard.css
+++ b/assets/css/dashboard.css
@@ -1 +1 @@
-@charset "UTF-8";@font-face{font-family:star;src:url(../fonts/star.eot);src:url(../fonts/star.eot?#iefix) format("embedded-opentype"),url(../fonts/star.woff) format("woff"),url(../fonts/star.ttf) format("truetype"),url(../fonts/star.svg#star) format("svg");font-weight:400;font-style:normal}@font-face{font-family:WooCommerce;src:url(../fonts/WooCommerce.eot);src:url(../fonts/WooCommerce.eot?#iefix) format("embedded-opentype"),url(../fonts/WooCommerce.woff) format("woff"),url(../fonts/WooCommerce.ttf) format("truetype"),url(../fonts/WooCommerce.svg#WooCommerce) format("svg");font-weight:400;font-style:normal}ul.woocommerce_stats{overflow:hidden;zoom:1}ul.woocommerce_stats li{width:25%;padding:0 1em;float:left;font-size:.8em;border-left:1px solid #fff;border-right:1px solid #ececec;text-align:center;box-sizing:border-box}ul.woocommerce_stats li:first-child{border-left:0}ul.woocommerce_stats li:last-child{border-right:0}#woocommerce_dashboard_status .wc_status_list li.low-in-stock,#woocommerce_dashboard_status .wc_status_list li.processing-orders{border-right:1px solid #ececec}ul.woocommerce_stats strong{font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-size:4em;line-height:1.2em;font-weight:400;text-align:center;display:block}#woocommerce_dashboard_status .inside{padding:0;margin:0}#woocommerce_dashboard_status .wc_status_list{overflow:hidden;margin:0}#woocommerce_dashboard_status .wc_status_list li{width:50%;float:left;padding:0;box-sizing:border-box;margin:0;border-top:1px solid #ececec;color:#aaa}#woocommerce_dashboard_status .wc_status_list li a{display:block;color:#aaa;padding:9px 12px;-webkit-transition:all ease .5s;position:relative;font-size:12px}#woocommerce_dashboard_status .wc_status_list li a .wc_sparkline{width:4em;height:2em;display:block;float:right;position:absolute;right:0;top:50%;margin-right:12px;margin-top:-1.25em}#woocommerce_dashboard_status .wc_status_list li a strong{font-size:18px;line-height:1.2em;font-weight:400;display:block;color:#21759b}#woocommerce_dashboard_status .wc_status_list li a:hover{color:#2ea2cc}#woocommerce_dashboard_status .wc_status_list li a:hover strong,#woocommerce_dashboard_status .wc_status_list li a:hover:before{color:#2ea2cc!important}#woocommerce_dashboard_status .wc_status_list li a:before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0 12px 12px 0;text-indent:0;top:0;left:0;height:100%;text-align:center;content:"";font-size:2em;position:relative;width:auto;line-height:1.2em;color:#464646;float:left}#woocommerce_dashboard_status .wc_status_list li.best-seller-this-month,#woocommerce_dashboard_status .wc_status_list li.sales-this-month{width:100%}#woocommerce_dashboard_status .wc_status_list li:first-child{border-top:0}#woocommerce_dashboard_status .wc_status_list li.sales-this-month a:before{content:"\e01f"}#woocommerce_dashboard_status .wc_status_list li.best-seller-this-month a:before{content:"\e006"}#woocommerce_dashboard_status .wc_status_list li.processing-orders a:before{content:"\e011";color:#7ad03a}#woocommerce_dashboard_status .wc_status_list li.on-hold-orders a:before{content:"\e033";color:#999}#woocommerce_dashboard_status .wc_status_list li.low-in-stock a:before{content:"\e02c";color:#ffba00}#woocommerce_dashboard_status .wc_status_list li.out-of-stock a:before{content:"\e02c";color:#a00}#woocommerce_dashboard_recent_reviews li{line-height:1.5em;margin-bottom:12px}#woocommerce_dashboard_recent_reviews h4.meta{line-height:1.4;margin:-.2em 0 0;font-weight:400;color:#999}#woocommerce_dashboard_recent_reviews blockquote{padding:0;margin:0}#woocommerce_dashboard_recent_reviews .avatar{float:left;margin:0 10px 5px 0}#woocommerce_dashboard_recent_reviews .star-rating{float:right;overflow:hidden;position:relative;height:1.5em;line-height:1.5;margin-left:.5em;width:5.4em;font-family:WooCommerce!important}#woocommerce_dashboard_recent_reviews .star-rating:before{content:"\e021\e021\e021\e021\e021";color:#b3b3b3;float:left;top:0;left:0;position:absolute;letter-spacing:.1em;letter-spacing:0\9}#woocommerce_dashboard_recent_reviews .star-rating span{overflow:hidden;float:left;top:0;left:0;position:absolute;padding-top:1.5em}#woocommerce_dashboard_recent_reviews .star-rating span:before{content:"\e020\e020\e020\e020\e020";top:0;position:absolute;left:0;letter-spacing:.1em;letter-spacing:0\9;color:#9c5d90}#dash-right-now li.product-count a:before{font-family:WooCommerce;content:"\e01d"}
\ No newline at end of file
+@charset "UTF-8";@font-face{font-family:star;src:url(../fonts/star.eot);src:url(../fonts/star.eot?#iefix) format("embedded-opentype"),url(../fonts/star.woff) format("woff"),url(../fonts/star.ttf) format("truetype"),url(../fonts/star.svg#star) format("svg");font-weight:400;font-style:normal}@font-face{font-family:WooCommerce;src:url(../fonts/WooCommerce.eot);src:url(../fonts/WooCommerce.eot?#iefix) format("embedded-opentype"),url(../fonts/WooCommerce.woff) format("woff"),url(../fonts/WooCommerce.ttf) format("truetype"),url(../fonts/WooCommerce.svg#WooCommerce) format("svg");font-weight:400;font-style:normal}ul.woocommerce_stats{overflow:hidden;zoom:1}ul.woocommerce_stats li{width:25%;padding:0 1em;text-align:center;float:left;font-size:.8em;border-left:1px solid #fff;border-right:1px solid #ececec;box-sizing:border-box}ul.woocommerce_stats li:first-child{border-left:0}ul.woocommerce_stats li:last-child{border-right:0}#woocommerce_dashboard_status .wc_status_list li.low-in-stock,#woocommerce_dashboard_status .wc_status_list li.processing-orders{border-right:1px solid #ececec}ul.woocommerce_stats strong{font-family:Georgia,'Times New Roman','Bitstream Charter',Times,serif;font-size:4em;line-height:1.2em;font-weight:400;text-align:center;display:block}#woocommerce_dashboard_status .inside{padding:0;margin:0}#woocommerce_dashboard_status .wc_status_list{overflow:hidden;margin:0}#woocommerce_dashboard_status .wc_status_list li{width:50%;float:left;padding:0;box-sizing:border-box;margin:0;border-top:1px solid #ececec;color:#aaa}#woocommerce_dashboard_status .wc_status_list li a{display:block;color:#aaa;padding:9px 12px;-webkit-transition:all ease .5s;position:relative;font-size:12px}#woocommerce_dashboard_status .wc_status_list li a .wc_sparkline{width:4em;height:2em;display:block;float:right;position:absolute;right:0;top:50%;margin-right:12px;margin-top:-1.25em}#woocommerce_dashboard_status .wc_status_list li a strong{font-size:18px;line-height:1.2em;font-weight:400;display:block;color:#21759b}#woocommerce_dashboard_status .wc_status_list li a:hover{color:#2ea2cc}#woocommerce_dashboard_status .wc_status_list li a:hover strong,#woocommerce_dashboard_status .wc_status_list li a:hover::before{color:#2ea2cc!important}#woocommerce_dashboard_status .wc_status_list li a::before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0 12px 12px 0;text-indent:0;top:0;left:0;height:100%;text-align:center;content:"";font-size:2em;position:relative;width:auto;line-height:1.2em;color:#464646;float:left}#woocommerce_dashboard_status .wc_status_list li.best-seller-this-month,#woocommerce_dashboard_status .wc_status_list li.sales-this-month{width:100%}#woocommerce_dashboard_status .wc_status_list li:first-child{border-top:0}#woocommerce_dashboard_status .wc_status_list li.sales-this-month a::before{font-family:Dashicons;content:'\f185'}#woocommerce_dashboard_status .wc_status_list li.best-seller-this-month a::before{content:'\e006'}#woocommerce_dashboard_status .wc_status_list li.processing-orders a::before{content:'\e011';color:#7ad03a}#woocommerce_dashboard_status .wc_status_list li.on-hold-orders a::before{content:'\e033';color:#999}#woocommerce_dashboard_status .wc_status_list li.low-in-stock a::before{content:'\e016';color:#ffba00}#woocommerce_dashboard_status .wc_status_list li.out-of-stock a::before{content:'\e013';color:#a00}#woocommerce_dashboard_recent_reviews li{line-height:1.5em;margin-bottom:12px}#woocommerce_dashboard_recent_reviews h4.meta{line-height:1.4;margin:-.2em 0 0;font-weight:400;color:#999}#woocommerce_dashboard_recent_reviews blockquote{padding:0;margin:0}#woocommerce_dashboard_recent_reviews .avatar{float:left;margin:0 10px 5px 0}#woocommerce_dashboard_recent_reviews .star-rating{float:right;overflow:hidden;position:relative;height:1.5em;line-height:1.5;margin-left:.5em;width:5.4em;font-family:WooCommerce!important}#woocommerce_dashboard_recent_reviews .star-rating::before{content:'\e021\e021\e021\e021\e021';color:#b3b3b3;float:left;top:0;left:0;position:absolute;letter-spacing:.1em;letter-spacing:0\9}#woocommerce_dashboard_recent_reviews .star-rating span{overflow:hidden;float:left;top:0;left:0;position:absolute;padding-top:1.5em}#woocommerce_dashboard_recent_reviews .star-rating span::before{content:'\e020\e020\e020\e020\e020';top:0;position:absolute;left:0;letter-spacing:.1em;letter-spacing:0\9;color:#9c5d90}#dash-right-now li.product-count a::before{font-family:WooCommerce;content:'\e01d'}
\ No newline at end of file
diff --git a/assets/css/dashboard.scss b/assets/css/dashboard.scss
index dcc1f3f88e5..0ad8bf7908b 100644
--- a/assets/css/dashboard.scss
+++ b/assets/css/dashboard.scss
@@ -6,10 +6,10 @@
 /**
  * Imports
  */
-@import "bourbon";
-@import "mixins";
-@import "variables";
-@import "fonts";
+@import 'bourbon';
+@import 'mixins';
+@import 'variables';
+@import 'fonts';
 
 /**
  * Styling begins
@@ -26,7 +26,6 @@ ul.woocommerce_stats {
 		font-size: 0.8em;
 		border-left: 1px solid #fff;
 		border-right: 1px solid #ececec;
-		text-align: center;
 		box-sizing: border-box;
 	}
 
@@ -39,7 +38,7 @@ ul.woocommerce_stats {
 	}
 
 	strong {
-		font-family: Georgia,"Times New Roman","Bitstream Charter",Times,serif;
+		font-family: Georgia, 'Times New Roman', 'Bitstream Charter', Times, serif;
 		font-size: 4em;
 		line-height: 1.2em;
 		font-weight: normal;
@@ -71,7 +70,7 @@ ul.woocommerce_stats {
 				display: block;
 				color: #aaa;
 				padding: 9px 12px;
-				-webkit-transition: all ease .5s;
+				-webkit-transition: all ease 0.5s;
 				position: relative;
 				font-size: 12px;
 
@@ -84,7 +83,7 @@ ul.woocommerce_stats {
 					right: 0;
 					top: 50%;
 					margin-right: 12px;
-					margin-top: -1.25em
+					margin-top: -1.25em;
 				}
 
 				strong {
@@ -98,13 +97,13 @@ ul.woocommerce_stats {
 				&:hover {
 					color: #2ea2cc;
 
-					&:before,
+					&::before,
 					strong {
 						color: #2ea2cc !important;
 					}
 				}
 
-				&:before {
+				&::before {
 					@include icon();
 					font-size: 2em;
 					position: relative;
@@ -125,31 +124,32 @@ ul.woocommerce_stats {
 		li.sales-this-month {
 			width: 100%;
 
-			a:before {
-				content: "\e01f";
+			a::before {
+				font-family: 'Dashicons';
+				content: '\f185';
 			}
 		}
 
 		li.best-seller-this-month {
 			width: 100%;
 
-			a:before {
-				content: "\e006";
+			a::before {
+				content: '\e006';
 			}
 		}
 
 		li.processing-orders {
 			border-right: 1px solid #ececec;
 
-			a:before {
-				content: "\e011";
+			a::before {
+				content: '\e011';
 				color: $green;
 			}
 		}
 
 		li.on-hold-orders {
-			a:before {
-				content: "\e033";
+			a::before {
+				content: '\e033';
 				color: #999;
 			}
 		}
@@ -157,15 +157,15 @@ ul.woocommerce_stats {
 		li.low-in-stock {
 			border-right: 1px solid #ececec;
 
-			a:before {
-				content: "\e02c";
+			a::before {
+				content: '\e016';
 				color: $orange;
 			}
 		}
 
 		li.out-of-stock {
-			a:before {
-				content: "\e02c";
+			a::before {
+				content: '\e013';
 				color: $red;
 			}
 		}
@@ -180,7 +180,7 @@ ul.woocommerce_stats {
 
 	h4.meta {
 		line-height: 1.4;
-		margin: -.2em 0 0 0;
+		margin: -0.2em 0 0 0;
 		font-weight: normal;
 		color: #999;
 	}
@@ -201,12 +201,12 @@ ul.woocommerce_stats {
 		position: relative;
 		height: 1.5em;
 		line-height: 1.5;
-		margin-left: .5em;
+		margin-left: 0.5em;
 		width: 5.4em;
 		font-family: 'WooCommerce' !important;
 
-		&:before {
-			content: "\e021\e021\e021\e021\e021";
+		&::before {
+			content: '\e021\e021\e021\e021\e021';
 			color: darken( #ccc, 10% );
 			float: left;
 			top: 0;
@@ -225,8 +225,8 @@ ul.woocommerce_stats {
 			padding-top: 1.5em;
 		}
 
-		span:before {
-			content: "\e020\e020\e020\e020\e020";
+		span::before {
+			content: '\e020\e020\e020\e020\e020';
 			top: 0;
 			position: absolute;
 			left: 0;
@@ -237,7 +237,7 @@ ul.woocommerce_stats {
 	}
 }
 
-#dash-right-now li.product-count a:before {
+#dash-right-now li.product-count a::before {
 	font-family: 'WooCommerce';
-	content: "\e01d";
+	content: '\e01d';
 }
diff --git a/assets/css/menu-rtl.css b/assets/css/menu-rtl.css
new file mode 100644
index 00000000000..7216d0682b8
--- /dev/null
+++ b/assets/css/menu-rtl.css
@@ -0,0 +1 @@
+@charset "UTF-8";@font-face{font-family:star;src:url(../fonts/star.eot);src:url(../fonts/star.eot?#iefix) format("embedded-opentype"),url(../fonts/star.woff) format("woff"),url(../fonts/star.ttf) format("truetype"),url(../fonts/star.svg#star) format("svg");font-weight:400;font-style:normal}@font-face{font-family:WooCommerce;src:url(../fonts/WooCommerce.eot);src:url(../fonts/WooCommerce.eot?#iefix) format("embedded-opentype"),url(../fonts/WooCommerce.woff) format("woff"),url(../fonts/WooCommerce.ttf) format("truetype"),url(../fonts/WooCommerce.svg#WooCommerce) format("svg");font-weight:400;font-style:normal}#adminmenu #toplevel_page_woocommerce .menu-icon-generic div.wp-menu-image::before{font-family:WooCommerce!important;content:'\e03d'}#adminmenu #menu-posts-product .menu-icon-post div.wp-menu-image::before,#adminmenu #menu-posts-product .menu-icon-product div.wp-menu-image::before{font-family:WooCommerce!important;content:'\e006'}#adminmenu #toplevel_page_wc-reports .menu-icon-generic div.wp-menu-image::before{font-family:WooCommerce!important;content:'\e023';font-size:1.3em!important}span.mce_woocommerce_shortcodes_button{background-image:none!important;display:block;text-indent:-9999px;position:relative;height:1em;width:1em}span.mce_woocommerce_shortcodes_button::before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;right:0;width:100%;height:100%;text-align:center;content:"";font-size:.9em;line-height:1.2}#woocommerce-update .updating-message .wc_plugin_upgrade_notice{display:none}#woocommerce-update .wc_plugin_upgrade_notice{font-weight:400;color:#fff!important;background:#d54d21!important;padding:1em!important;margin:9px 0!important}#woocommerce-update .wc_plugin_upgrade_notice a{color:#fff;text-decoration:underline}#woocommerce-update .wc_plugin_upgrade_notice::before{color:#fff!important;content:'\f348';display:inline-block;font:400 18px/1 dashicons;speak:none;margin:0 -2px 0 8px;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;vertical-align:top}
\ No newline at end of file
diff --git a/assets/css/menu.css b/assets/css/menu.css
index 66229b2a71d..d0423f324ec 100644
--- a/assets/css/menu.css
+++ b/assets/css/menu.css
@@ -1 +1 @@
-@charset "UTF-8";@font-face{font-family:star;src:url(../fonts/star.eot);src:url(../fonts/star.eot?#iefix) format("embedded-opentype"),url(../fonts/star.woff) format("woff"),url(../fonts/star.ttf) format("truetype"),url(../fonts/star.svg#star) format("svg");font-weight:400;font-style:normal}@font-face{font-family:WooCommerce;src:url(../fonts/WooCommerce.eot);src:url(../fonts/WooCommerce.eot?#iefix) format("embedded-opentype"),url(../fonts/WooCommerce.woff) format("woff"),url(../fonts/WooCommerce.ttf) format("truetype"),url(../fonts/WooCommerce.svg#WooCommerce) format("svg");font-weight:400;font-style:normal}#adminmenu #toplevel_page_woocommerce .menu-icon-generic div.wp-menu-image:before{font-family:WooCommerce!important;content:"\e03d";font-size:1.3em!important}#adminmenu #menu-posts-product .menu-icon-post div.wp-menu-image:before,#adminmenu #menu-posts-product .menu-icon-product div.wp-menu-image:before{font-family:WooCommerce!important;content:"\e01d";font-size:1.3em!important}#adminmenu #toplevel_page_wc-reports .menu-icon-generic div.wp-menu-image:before{font-family:WooCommerce!important;content:"\e023";font-size:1.3em!important}span.mce_woocommerce_shortcodes_button{background-image:none!important;display:block;text-indent:-9999px;position:relative;height:1em;width:1em}span.mce_woocommerce_shortcodes_button:before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;content:"";font-size:.9em;line-height:1.2}.wc_plugin_upgrade_notice{font-weight:400;color:#fff;background:#d54d21;padding:1em;margin:9px 0}.wc_plugin_upgrade_notice a{color:#fff;text-decoration:underline}.wc_plugin_upgrade_notice:before{content:"\f348";display:inline-block;font:400 18px/1 dashicons;speak:none;margin:0 8px 0 -2px;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;vertical-align:top}
\ No newline at end of file
+@charset "UTF-8";@font-face{font-family:star;src:url(../fonts/star.eot);src:url(../fonts/star.eot?#iefix) format("embedded-opentype"),url(../fonts/star.woff) format("woff"),url(../fonts/star.ttf) format("truetype"),url(../fonts/star.svg#star) format("svg");font-weight:400;font-style:normal}@font-face{font-family:WooCommerce;src:url(../fonts/WooCommerce.eot);src:url(../fonts/WooCommerce.eot?#iefix) format("embedded-opentype"),url(../fonts/WooCommerce.woff) format("woff"),url(../fonts/WooCommerce.ttf) format("truetype"),url(../fonts/WooCommerce.svg#WooCommerce) format("svg");font-weight:400;font-style:normal}#adminmenu #toplevel_page_woocommerce .menu-icon-generic div.wp-menu-image::before{font-family:WooCommerce!important;content:'\e03d'}#adminmenu #menu-posts-product .menu-icon-post div.wp-menu-image::before,#adminmenu #menu-posts-product .menu-icon-product div.wp-menu-image::before{font-family:WooCommerce!important;content:'\e006'}#adminmenu #toplevel_page_wc-reports .menu-icon-generic div.wp-menu-image::before{font-family:WooCommerce!important;content:'\e023';font-size:1.3em!important}span.mce_woocommerce_shortcodes_button{background-image:none!important;display:block;text-indent:-9999px;position:relative;height:1em;width:1em}span.mce_woocommerce_shortcodes_button::before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;content:"";font-size:.9em;line-height:1.2}#woocommerce-update .updating-message .wc_plugin_upgrade_notice{display:none}#woocommerce-update .wc_plugin_upgrade_notice{font-weight:400;color:#fff!important;background:#d54d21!important;padding:1em!important;margin:9px 0!important}#woocommerce-update .wc_plugin_upgrade_notice a{color:#fff;text-decoration:underline}#woocommerce-update .wc_plugin_upgrade_notice::before{color:#fff!important;content:'\f348';display:inline-block;font:400 18px/1 dashicons;speak:none;margin:0 8px 0 -2px;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;vertical-align:top}
\ No newline at end of file
diff --git a/assets/css/menu.scss b/assets/css/menu.scss
index 88698982311..35f6bc51cf7 100644
--- a/assets/css/menu.scss
+++ b/assets/css/menu.scss
@@ -7,30 +7,28 @@
 /**
  * Imports
  */
-@import "bourbon";
-@import "mixins";
-@import "variables";
-@import "fonts";
+@import 'bourbon';
+@import 'mixins';
+@import 'variables';
+@import 'fonts';
 
 /**
  * Styling begins
  */
-#adminmenu #toplevel_page_woocommerce .menu-icon-generic div.wp-menu-image:before {
+#adminmenu #toplevel_page_woocommerce .menu-icon-generic div.wp-menu-image::before {
 	font-family: 'WooCommerce' !important;
-	content: "\e03d";
-	font-size: 1.3em !important;
+	content: '\e03d';
 }
 
-#adminmenu #menu-posts-product .menu-icon-post div.wp-menu-image:before,
-#adminmenu #menu-posts-product .menu-icon-product div.wp-menu-image:before {
+#adminmenu #menu-posts-product .menu-icon-post div.wp-menu-image::before,
+#adminmenu #menu-posts-product .menu-icon-product div.wp-menu-image::before {
 	font-family: 'WooCommerce' !important;
-	content: "\e01d";
-	font-size: 1.3em !important;
+	content: '\e006';
 }
 
-#adminmenu #toplevel_page_wc-reports .menu-icon-generic div.wp-menu-image:before {
+#adminmenu #toplevel_page_wc-reports .menu-icon-generic div.wp-menu-image::before {
 	font-family: 'WooCommerce' !important;
-	content: "\e023";
+	content: '\e023';
 	font-size: 1.3em !important;
 }
 
@@ -38,33 +36,41 @@ span.mce_woocommerce_shortcodes_button {
 	background-image: none !important;
 	@include ir();
 
-	&:before {
-		@include icon( "\e01d" );
-		font-size: .9em;
+	&::before {
+		@include icon( '\e01d' );
+		font-size: 0.9em;
 		line-height: 1.2;
 	}
 }
 
-.wc_plugin_upgrade_notice {
-	font-weight: normal;
-	color: #fff;
-	background: #d54d21;
-	padding: 1em;
-	margin: 9px 0;
-
-	a {
-		color: #fff;
-		text-decoration: underline;
+#woocommerce-update {
+	.updating-message {
+		.wc_plugin_upgrade_notice {
+			display: none;
+		}
 	}
+	.wc_plugin_upgrade_notice {
+		font-weight: normal;
+		color: #fff !important;
+		background: #d54d21 !important;
+		padding: 1em !important;
+		margin: 9px 0 !important;
 
-	&:before {
-		content: "\f348";
-		display: inline-block;
-		font: 400 18px/1 dashicons;
-		speak: none;
-		margin: 0 8px 0 -2px;
-		-webkit-font-smoothing: antialiased;
-		-moz-osx-font-smoothing: grayscale;
-		vertical-align: top;
+		a {
+			color: #fff;
+			text-decoration: underline;
+		}
+
+		&::before {
+			color: #fff !important;
+			content: '\f348';
+			display: inline-block;
+			font: 400 18px/1 dashicons;
+			speak: none;
+			margin: 0 8px 0 -2px;
+			-webkit-font-smoothing: antialiased;
+			-moz-osx-font-smoothing: grayscale;
+			vertical-align: top;
+		}
 	}
 }
diff --git a/assets/css/photoswipe/default-skin/default-skin.css b/assets/css/photoswipe/default-skin/default-skin.css
new file mode 100644
index 00000000000..e3fc10747e8
--- /dev/null
+++ b/assets/css/photoswipe/default-skin/default-skin.css
@@ -0,0 +1,484 @@
+/*! PhotoSwipe Default UI CSS by Dmitry Semenov | photoswipe.com | MIT license */
+/*
+
+	Contents:
+
+	1. Buttons
+	2. Share modal and links
+	3. Index indicator ("1 of X" counter)
+	4. Caption
+	5. Loading indicator
+	6. Additional styles (root element, top bar, idle state, hidden state, etc.)
+
+*/
+/*
+
+	1. Buttons
+
+ */
+/* <button> css reset */
+.pswp__button {
+  width: 44px;
+  height: 44px;
+  position: relative;
+  background: none;
+  cursor: pointer;
+  overflow: visible;
+  -webkit-appearance: none;
+  display: block;
+  border: 0;
+  padding: 0;
+  margin: 0;
+  float: right;
+  opacity: 0.75;
+  z-index: 1600;
+  -webkit-transition: opacity 0.2s;
+          transition: opacity 0.2s;
+  -webkit-box-shadow: none;
+          box-shadow: none; }
+  .pswp__button:focus,
+  .pswp__button:hover {
+    opacity: 1; }
+  .pswp__button:active {
+    outline: none;
+    opacity: 0.9; }
+  .pswp__button::-moz-focus-inner {
+    padding: 0;
+    border: 0; }
+
+/* pswp__ui--over-close class it added when mouse is over element that should close gallery */
+.pswp__ui--over-close .pswp__button--close {
+  opacity: 1; }
+
+.pswp__button,
+.pswp__button--arrow--left:before,
+.pswp__button--arrow--right:before {
+  background: url(default-skin.png) 0 0 no-repeat;
+  background-size: 264px 88px;
+  width: 44px;
+  height: 44px; }
+
+@media (-webkit-min-device-pixel-ratio: 1.1), (-webkit-min-device-pixel-ratio: 1.09375), (min-resolution: 105dpi), (min-resolution: 1.1dppx) {
+  /* Serve SVG sprite if browser supports SVG and resolution is more than 105dpi */
+  .pswp--svg .pswp__button,
+  .pswp--svg .pswp__button--arrow--left:before,
+  .pswp--svg .pswp__button--arrow--right:before {
+    background-image: url(default-skin.svg); }
+  .pswp--svg .pswp__button--arrow--left,
+  .pswp--svg .pswp__button--arrow--right {
+    background: none; } }
+
+.pswp__button--close {
+  background-position: 0 -44px; }
+
+.pswp__button--share {
+  background-position: -44px -44px; }
+
+.pswp__button--fs {
+  display: none; }
+
+.pswp--supports-fs .pswp__button--fs {
+  display: block; }
+
+.pswp--fs .pswp__button--fs {
+  background-position: -44px 0; }
+
+.pswp__button--zoom {
+  display: none;
+  background-position: -88px 0; }
+
+.pswp--zoom-allowed .pswp__button--zoom {
+  display: block; }
+
+.pswp--zoomed-in .pswp__button--zoom {
+  background-position: -132px 0; }
+
+/* no arrows on touch screens */
+.pswp--touch .pswp__button--arrow--left,
+.pswp--touch .pswp__button--arrow--right {
+  visibility: hidden; }
+
+/*
+	Arrow buttons hit area
+	(icon is added to :before pseudo-element)
+*/
+.pswp__button--arrow--left,
+.pswp__button--arrow--right {
+  background: none;
+  top: 50%;
+  margin-top: -50px;
+  width: 70px;
+  height: 100px;
+  position: absolute; }
+
+.pswp__button--arrow--left {
+  left: 0; }
+
+.pswp__button--arrow--right {
+  right: 0; }
+
+.pswp__button--arrow--left:before,
+.pswp__button--arrow--right:before {
+  content: '';
+  top: 35px;
+  background-color: rgba(0, 0, 0, 0.3);
+  height: 30px;
+  width: 32px;
+  position: absolute; }
+
+.pswp__button--arrow--left:before {
+  left: 6px;
+  background-position: -138px -44px; }
+
+.pswp__button--arrow--right:before {
+  right: 6px;
+  background-position: -94px -44px; }
+
+/*
+
+	2. Share modal/popup and links
+
+ */
+.pswp__counter,
+.pswp__share-modal {
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+      user-select: none; }
+
+.pswp__share-modal {
+  display: block;
+  background: rgba(0, 0, 0, 0.5);
+  width: 100%;
+  height: 100%;
+  top: 0;
+  left: 0;
+  padding: 10px;
+  position: absolute;
+  z-index: 1600;
+  opacity: 0;
+  -webkit-transition: opacity 0.25s ease-out;
+          transition: opacity 0.25s ease-out;
+  -webkit-backface-visibility: hidden;
+  will-change: opacity; }
+
+.pswp__share-modal--hidden {
+  display: none; }
+
+.pswp__share-tooltip {
+  z-index: 1620;
+  position: absolute;
+  background: #FFF;
+  top: 56px;
+  border-radius: 2px;
+  display: block;
+  width: auto;
+  right: 44px;
+  -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.25);
+          box-shadow: 0 2px 5px rgba(0, 0, 0, 0.25);
+  -webkit-transform: translateY(6px);
+      -ms-transform: translateY(6px);
+          transform: translateY(6px);
+  -webkit-transition: -webkit-transform 0.25s;
+          transition: transform 0.25s;
+  -webkit-backface-visibility: hidden;
+  will-change: transform; }
+  .pswp__share-tooltip a {
+    display: block;
+    padding: 8px 12px;
+    color: #000;
+    text-decoration: none;
+    font-size: 14px;
+    line-height: 18px; }
+    .pswp__share-tooltip a:hover {
+      text-decoration: none;
+      color: #000; }
+    .pswp__share-tooltip a:first-child {
+      /* round corners on the first/last list item */
+      border-radius: 2px 2px 0 0; }
+    .pswp__share-tooltip a:last-child {
+      border-radius: 0 0 2px 2px; }
+
+.pswp__share-modal--fade-in {
+  opacity: 1; }
+  .pswp__share-modal--fade-in .pswp__share-tooltip {
+    -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+            transform: translateY(0); }
+
+/* increase size of share links on touch devices */
+.pswp--touch .pswp__share-tooltip a {
+  padding: 16px 12px; }
+
+a.pswp__share--facebook:before {
+  content: '';
+  display: block;
+  width: 0;
+  height: 0;
+  position: absolute;
+  top: -12px;
+  right: 15px;
+  border: 6px solid transparent;
+  border-bottom-color: #FFF;
+  -webkit-pointer-events: none;
+  -moz-pointer-events: none;
+  pointer-events: none; }
+
+a.pswp__share--facebook:hover {
+  background: #3E5C9A;
+  color: #FFF; }
+  a.pswp__share--facebook:hover:before {
+    border-bottom-color: #3E5C9A; }
+
+a.pswp__share--twitter:hover {
+  background: #55ACEE;
+  color: #FFF; }
+
+a.pswp__share--pinterest:hover {
+  background: #CCC;
+  color: #CE272D; }
+
+a.pswp__share--download:hover {
+  background: #DDD; }
+
+/*
+
+	3. Index indicator ("1 of X" counter)
+
+ */
+.pswp__counter {
+  position: absolute;
+  left: 0;
+  top: 0;
+  height: 44px;
+  font-size: 13px;
+  line-height: 44px;
+  color: #FFF;
+  opacity: 0.75;
+  padding: 0 10px; }
+
+/*
+
+	4. Caption
+
+ */
+.pswp__caption {
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  min-height: 44px; }
+  .pswp__caption small {
+    font-size: 11px;
+    color: #BBB; }
+
+.pswp__caption__center {
+  text-align: left;
+  max-width: 420px;
+  margin: 0 auto;
+  font-size: 13px;
+  padding: 10px;
+  line-height: 20px;
+  color: #CCC; }
+
+.pswp__caption--empty {
+  display: none; }
+
+/* Fake caption element, used to calculate height of next/prev image */
+.pswp__caption--fake {
+  visibility: hidden; }
+
+/*
+
+	5. Loading indicator (preloader)
+
+	You can play with it here - http://codepen.io/dimsemenov/pen/yyBWoR
+
+ */
+.pswp__preloader {
+  width: 44px;
+  height: 44px;
+  position: absolute;
+  top: 0;
+  left: 50%;
+  margin-left: -22px;
+  opacity: 0;
+  -webkit-transition: opacity 0.25s ease-out;
+          transition: opacity 0.25s ease-out;
+  will-change: opacity;
+  direction: ltr; }
+
+.pswp__preloader__icn {
+  width: 20px;
+  height: 20px;
+  margin: 12px; }
+
+.pswp__preloader--active {
+  opacity: 1; }
+  .pswp__preloader--active .pswp__preloader__icn {
+    /* We use .gif in browsers that don't support CSS animation */
+    background: url(preloader.gif) 0 0 no-repeat; }
+
+.pswp--css_animation .pswp__preloader--active {
+  opacity: 1; }
+  .pswp--css_animation .pswp__preloader--active .pswp__preloader__icn {
+    -webkit-animation: clockwise 500ms linear infinite;
+            animation: clockwise 500ms linear infinite; }
+  .pswp--css_animation .pswp__preloader--active .pswp__preloader__donut {
+    -webkit-animation: donut-rotate 1000ms cubic-bezier(0.4, 0, 0.22, 1) infinite;
+            animation: donut-rotate 1000ms cubic-bezier(0.4, 0, 0.22, 1) infinite; }
+
+.pswp--css_animation .pswp__preloader__icn {
+  background: none;
+  opacity: 0.75;
+  width: 14px;
+  height: 14px;
+  position: absolute;
+  left: 15px;
+  top: 15px;
+  margin: 0; }
+
+.pswp--css_animation .pswp__preloader__cut {
+  /*
+			The idea of animating inner circle is based on Polymer ("material") loading indicator
+			 by Keanu Lee https://blog.keanulee.com/2014/10/20/the-tale-of-three-spinners.html
+		*/
+  position: relative;
+  width: 7px;
+  height: 14px;
+  overflow: hidden; }
+
+.pswp--css_animation .pswp__preloader__donut {
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+  width: 14px;
+  height: 14px;
+  border: 2px solid #FFF;
+  border-radius: 50%;
+  border-left-color: transparent;
+  border-bottom-color: transparent;
+  position: absolute;
+  top: 0;
+  left: 0;
+  background: none;
+  margin: 0; }
+
+@media screen and (max-width: 1024px) {
+  .pswp__preloader {
+    position: relative;
+    left: auto;
+    top: auto;
+    margin: 0;
+    float: right; } }
+
+@-webkit-keyframes clockwise {
+  0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg); }
+  100% {
+    -webkit-transform: rotate(360deg);
+            transform: rotate(360deg); } }
+
+@keyframes clockwise {
+  0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg); }
+  100% {
+    -webkit-transform: rotate(360deg);
+            transform: rotate(360deg); } }
+
+@-webkit-keyframes donut-rotate {
+  0% {
+    -webkit-transform: rotate(0);
+            transform: rotate(0); }
+  50% {
+    -webkit-transform: rotate(-140deg);
+            transform: rotate(-140deg); }
+  100% {
+    -webkit-transform: rotate(0);
+            transform: rotate(0); } }
+
+@keyframes donut-rotate {
+  0% {
+    -webkit-transform: rotate(0);
+            transform: rotate(0); }
+  50% {
+    -webkit-transform: rotate(-140deg);
+            transform: rotate(-140deg); }
+  100% {
+    -webkit-transform: rotate(0);
+            transform: rotate(0); } }
+
+/*
+
+	6. Additional styles
+
+ */
+/* root element of UI */
+.pswp__ui {
+  -webkit-font-smoothing: auto;
+  visibility: visible;
+  opacity: 1;
+  z-index: 1550; }
+
+/* top black bar with buttons and "1 of X" indicator */
+.pswp__top-bar {
+  position: absolute;
+  left: 0;
+  top: 0;
+  height: 44px;
+  width: 100%; }
+
+.pswp__caption,
+.pswp__top-bar,
+.pswp--has_mouse .pswp__button--arrow--left,
+.pswp--has_mouse .pswp__button--arrow--right {
+  -webkit-backface-visibility: hidden;
+  will-change: opacity;
+  -webkit-transition: opacity 333ms cubic-bezier(0.4, 0, 0.22, 1);
+          transition: opacity 333ms cubic-bezier(0.4, 0, 0.22, 1); }
+
+/* pswp--has_mouse class is added only when two subsequent mousemove events occur */
+.pswp--has_mouse .pswp__button--arrow--left,
+.pswp--has_mouse .pswp__button--arrow--right {
+  visibility: visible; }
+
+.pswp__top-bar,
+.pswp__caption {
+  background-color: rgba(0, 0, 0, 0.5); }
+
+/* pswp__ui--fit class is added when main image "fits" between top bar and bottom bar (caption) */
+.pswp__ui--fit .pswp__top-bar,
+.pswp__ui--fit .pswp__caption {
+  background-color: rgba(0, 0, 0, 0.3); }
+
+/* pswp__ui--idle class is added when mouse isn't moving for several seconds (JS option timeToIdle) */
+.pswp__ui--idle .pswp__top-bar {
+  opacity: 0; }
+
+.pswp__ui--idle .pswp__button--arrow--left,
+.pswp__ui--idle .pswp__button--arrow--right {
+  opacity: 0; }
+
+/*
+	pswp__ui--hidden class is added when controls are hidden
+	e.g. when user taps to toggle visibility of controls
+*/
+.pswp__ui--hidden .pswp__top-bar,
+.pswp__ui--hidden .pswp__caption,
+.pswp__ui--hidden .pswp__button--arrow--left,
+.pswp__ui--hidden .pswp__button--arrow--right {
+  /* Force paint & create composition layer for controls. */
+  opacity: 0.001; }
+
+/* pswp__ui--one-slide class is added when there is just one item in gallery */
+.pswp__ui--one-slide .pswp__button--arrow--left,
+.pswp__ui--one-slide .pswp__button--arrow--right,
+.pswp__ui--one-slide .pswp__counter {
+  display: none; }
+
+.pswp__element--disabled {
+  display: none !important; }
+
+.pswp--minimal--dark .pswp__top-bar {
+  background: none; }
diff --git a/assets/css/photoswipe/default-skin/default-skin.png b/assets/css/photoswipe/default-skin/default-skin.png
new file mode 100644
index 00000000000..441c502c92f
Binary files /dev/null and b/assets/css/photoswipe/default-skin/default-skin.png differ
diff --git a/assets/css/photoswipe/default-skin/default-skin.svg b/assets/css/photoswipe/default-skin/default-skin.svg
new file mode 100644
index 00000000000..9d5f0c6a10a
--- /dev/null
+++ b/assets/css/photoswipe/default-skin/default-skin.svg
@@ -0,0 +1 @@
+<svg width="264" height="88" viewBox="0 0 264 88" xmlns="http://www.w3.org/2000/svg"><title>default-skin 2</title><g fill="none" fill-rule="evenodd"><g><path d="M67.002 59.5v3.768c-6.307.84-9.184 5.75-10.002 9.732 2.22-2.83 5.564-5.098 10.002-5.098V71.5L73 65.585 67.002 59.5z" id="Shape" fill="#fff"/><g fill="#fff"><path d="M13 29v-5h2v3h3v2h-5zM13 15h5v2h-3v3h-2v-5zM31 15v5h-2v-3h-3v-2h5zM31 29h-5v-2h3v-3h2v5z" id="Shape"/></g><g fill="#fff"><path d="M62 24v5h-2v-3h-3v-2h5zM62 20h-5v-2h3v-3h2v5zM70 20v-5h2v3h3v2h-5zM70 24h5v2h-3v3h-2v-5z"/></g><path d="M20.586 66l-5.656-5.656 1.414-1.414L22 64.586l5.656-5.656 1.414 1.414L23.414 66l5.656 5.656-1.414 1.414L22 67.414l-5.656 5.656-1.414-1.414L20.586 66z" fill="#fff"/><path d="M111.785 65.03L110 63.5l3-3.5h-10v-2h10l-3-3.5 1.785-1.468L117 59l-5.215 6.03z" fill="#fff"/><path d="M152.215 65.03L154 63.5l-3-3.5h10v-2h-10l3-3.5-1.785-1.468L147 59l5.215 6.03z" fill="#fff"/><g><path id="Rectangle-11" fill="#fff" d="M160.957 28.543l-3.25-3.25-1.413 1.414 3.25 3.25z"/><path d="M152.5 27c3.038 0 5.5-2.462 5.5-5.5s-2.462-5.5-5.5-5.5-5.5 2.462-5.5 5.5 2.462 5.5 5.5 5.5z" id="Oval-1" stroke="#fff" stroke-width="1.5"/><path fill="#fff" d="M150 21h5v1h-5z"/></g><g><path d="M116.957 28.543l-1.414 1.414-3.25-3.25 1.414-1.414 3.25 3.25z" fill="#fff"/><path d="M108.5 27c3.038 0 5.5-2.462 5.5-5.5s-2.462-5.5-5.5-5.5-5.5 2.462-5.5 5.5 2.462 5.5 5.5 5.5z" stroke="#fff" stroke-width="1.5"/><path fill="#fff" d="M106 21h5v1h-5z"/><path fill="#fff" d="M109.043 19.008l-.085 5-1-.017.085-5z"/></g></g></g></svg>
\ No newline at end of file
diff --git a/assets/css/photoswipe/default-skin/preloader.gif b/assets/css/photoswipe/default-skin/preloader.gif
new file mode 100644
index 00000000000..b8faa697c58
Binary files /dev/null and b/assets/css/photoswipe/default-skin/preloader.gif differ
diff --git a/assets/css/photoswipe/photoswipe.css b/assets/css/photoswipe/photoswipe.css
new file mode 100644
index 00000000000..b2a3f4adf83
--- /dev/null
+++ b/assets/css/photoswipe/photoswipe.css
@@ -0,0 +1,177 @@
+/*! PhotoSwipe main CSS by Dmitry Semenov | photoswipe.com | MIT license */
+/*
+	Styles for basic PhotoSwipe functionality (sliding area, open/close transitions)
+*/
+/* pswp = photoswipe */
+.pswp {
+  display: none;
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  left: 0;
+  top: 0;
+  overflow: hidden;
+  -ms-touch-action: none;
+  touch-action: none;
+  z-index: 999999;
+  -webkit-text-size-adjust: 100%;
+  /* create separate layer, to avoid paint on window.onscroll in webkit/blink */
+  -webkit-backface-visibility: hidden;
+  outline: none; }
+  .pswp * {
+    -webkit-box-sizing: border-box;
+            box-sizing: border-box; }
+  .pswp img {
+    max-width: none; }
+
+/* style is added when JS option showHideOpacity is set to true */
+.pswp--animate_opacity {
+  /* 0.001, because opacity:0 doesn't trigger Paint action, which causes lag at start of transition */
+  opacity: 0.001;
+  will-change: opacity;
+  /* for open/close transition */
+  -webkit-transition: opacity 333ms cubic-bezier(0.4, 0, 0.22, 1);
+          transition: opacity 333ms cubic-bezier(0.4, 0, 0.22, 1); }
+
+.pswp--open {
+  display: block; }
+
+.pswp--zoom-allowed .pswp__img {
+  /* autoprefixer: off */
+  cursor: -webkit-zoom-in;
+  cursor: -moz-zoom-in;
+  cursor: zoom-in; }
+
+.pswp--zoomed-in .pswp__img {
+  /* autoprefixer: off */
+  cursor: -webkit-grab;
+  cursor: -moz-grab;
+  cursor: grab; }
+
+.pswp--dragging .pswp__img {
+  /* autoprefixer: off */
+  cursor: -webkit-grabbing;
+  cursor: -moz-grabbing;
+  cursor: grabbing; }
+
+/*
+	Background is added as a separate element.
+	As animating opacity is much faster than animating rgba() background-color.
+*/
+.pswp__bg {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: #000;
+  opacity: 0;
+  -webkit-backface-visibility: hidden;
+  will-change: opacity; }
+
+.pswp__scroll-wrap {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  overflow: hidden; }
+
+.pswp__container,
+.pswp__zoom-wrap {
+  -ms-touch-action: none;
+  touch-action: none;
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0; }
+
+/* Prevent selection and tap highlights */
+.pswp__container,
+.pswp__img {
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+      user-select: none;
+  -webkit-tap-highlight-color: transparent;
+  -webkit-touch-callout: none; }
+
+.pswp__zoom-wrap {
+  position: absolute;
+  width: 100%;
+  -webkit-transform-origin: left top;
+  -ms-transform-origin: left top;
+  transform-origin: left top;
+  /* for open/close transition */
+  -webkit-transition: -webkit-transform 333ms cubic-bezier(0.4, 0, 0.22, 1);
+          transition: transform 333ms cubic-bezier(0.4, 0, 0.22, 1); }
+
+.pswp__bg {
+  will-change: opacity;
+  /* for open/close transition */
+  -webkit-transition: opacity 333ms cubic-bezier(0.4, 0, 0.22, 1);
+          transition: opacity 333ms cubic-bezier(0.4, 0, 0.22, 1); }
+
+.pswp--animated-in .pswp__bg,
+.pswp--animated-in .pswp__zoom-wrap {
+  -webkit-transition: none;
+  transition: none; }
+
+.pswp__container,
+.pswp__zoom-wrap {
+  -webkit-backface-visibility: hidden; }
+
+.pswp__item {
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  overflow: hidden; }
+
+.pswp__img {
+  position: absolute;
+  width: auto;
+  height: auto;
+  top: 0;
+  left: 0; }
+
+/*
+	stretched thumbnail or div placeholder element (see below)
+	style is added to avoid flickering in webkit/blink when layers overlap
+*/
+.pswp__img--placeholder {
+  -webkit-backface-visibility: hidden; }
+
+/*
+	div element that matches size of large image
+	large image loads on top of it
+*/
+.pswp__img--placeholder--blank {
+  background: #222; }
+
+.pswp--ie .pswp__img {
+  width: 100% !important;
+  height: auto !important;
+  left: 0;
+  top: 0; }
+
+/*
+	Error message appears when image is not loaded
+	(JS option errorMsg controls markup)
+*/
+.pswp__error-msg {
+  position: absolute;
+  left: 0;
+  top: 50%;
+  width: 100%;
+  text-align: center;
+  font-size: 14px;
+  line-height: 16px;
+  margin-top: -8px;
+  color: #CCC; }
+
+.pswp__error-msg a {
+  color: #CCC;
+  text-decoration: underline; }
diff --git a/assets/css/prettyPhoto-rtl.css b/assets/css/prettyPhoto-rtl.css
new file mode 100644
index 00000000000..401d39c3d42
--- /dev/null
+++ b/assets/css/prettyPhoto-rtl.css
@@ -0,0 +1 @@
+@font-face{font-family:star;src:url(../fonts/star.eot);src:url(../fonts/star.eot?#iefix) format("embedded-opentype"),url(../fonts/star.woff) format("woff"),url(../fonts/star.ttf) format("truetype"),url(../fonts/star.svg#star) format("svg");font-weight:400;font-style:normal}@font-face{font-family:WooCommerce;src:url(../fonts/WooCommerce.eot);src:url(../fonts/WooCommerce.eot?#iefix) format("embedded-opentype"),url(../fonts/WooCommerce.woff) format("woff"),url(../fonts/WooCommerce.ttf) format("truetype"),url(../fonts/WooCommerce.svg#WooCommerce) format("svg");font-weight:400;font-style:normal}div.pp_woocommerce .pp_content_container{background:#fff;border-radius:3px;box-shadow:0 1px 30px rgba(0,0,0,.25);padding:20px 0}div.pp_woocommerce .pp_content_container::after,div.pp_woocommerce .pp_content_container::before{content:' ';display:table}div.pp_woocommerce .pp_content_container::after{clear:both}div.pp_woocommerce .pp_loaderIcon::before{height:1em;width:1em;display:block;position:absolute;top:50%;right:50%;margin-right:-.5em;margin-top:-.5em;content:'';-webkit-animation:spin 1s ease-in-out infinite;animation:spin 1s ease-in-out infinite;background:url(../images/icons/loader.svg) center center;background-size:cover;line-height:1;text-align:center;font-size:2em;color:rgba(0,0,0,.75)}div.pp_woocommerce div.ppt{color:#000}div.pp_woocommerce .pp_gallery ul li a{border:1px solid rgba(0,0,0,.5);background:#fff;box-shadow:0 1px 2px rgba(0,0,0,.2);border-radius:2px;display:block}div.pp_woocommerce .pp_gallery ul li a:hover,div.pp_woocommerce .pp_gallery ul li.selected a{border-color:#000}div.pp_woocommerce .pp_next::before,div.pp_woocommerce .pp_previous::before{border-radius:100%;height:1em;width:1em;text-shadow:0 1px 2px rgba(0,0,0,.5);background-color:#444;color:#fff!important;font-size:16px!important;line-height:1em;-webkit-transition:all ease-in-out .2s;transition:all ease-in-out .2s;font-family:WooCommerce;content:'\e00b';text-indent:0;display:none;position:absolute;top:50%;margin-top:-10px;text-align:center}div.pp_woocommerce .pp_arrow_next,div.pp_woocommerce .pp_arrow_previous,div.pp_woocommerce .pp_close{-webkit-transition:all ease-in-out .2s;border-radius:100%;height:1em;width:1em;text-shadow:0 1px 2px rgba(0,0,0,.5);line-height:1em;color:#fff!important}div.pp_woocommerce .pp_next::before:hover,div.pp_woocommerce .pp_previous::before:hover{background-color:#000}div.pp_woocommerce .pp_next:hover::before,div.pp_woocommerce .pp_previous:hover::before{display:block}div.pp_woocommerce .pp_previous::before{right:1em}div.pp_woocommerce .pp_next::before{left:1em;font-family:WooCommerce;content:'\e008'}div.pp_woocommerce .pp_details{margin:0;padding-top:1em}div.pp_woocommerce .pp_description,div.pp_woocommerce .pp_nav{font-size:14px}div.pp_woocommerce .pp_arrow_next,div.pp_woocommerce .pp_arrow_previous,div.pp_woocommerce .pp_nav,div.pp_woocommerce .pp_nav .pp_pause,div.pp_woocommerce .pp_nav p,div.pp_woocommerce .pp_play{margin:0}div.pp_woocommerce .pp_nav{margin-left:1em;position:relative}div.pp_woocommerce .pp_close{background-color:#444;transition:all ease-in-out .2s;top:-.5em;left:-.5em;font-size:1.618em!important}div.pp_woocommerce .pp_close:hover{background-color:#000}div.pp_woocommerce .pp_close::before{font-family:WooCommerce;content:'\e013';display:block;position:absolute;top:0;right:0;left:0;bottom:0;text-align:center;text-indent:0}div.pp_woocommerce .pp_arrow_next,div.pp_woocommerce .pp_arrow_previous{background-color:#444;font-size:16px!important;transition:all ease-in-out .2s;position:relative;margin-top:-1px}div.pp_woocommerce .pp_arrow_next:hover,div.pp_woocommerce .pp_arrow_previous:hover{background-color:#000}div.pp_woocommerce .pp_arrow_next::before,div.pp_woocommerce .pp_arrow_previous::before{font-family:WooCommerce;content:'\e00b';display:block;position:absolute;top:0;right:0;left:0;bottom:0;text-align:center;text-indent:0}div.pp_woocommerce .pp_arrow_previous{margin-left:.5em}div.pp_woocommerce .pp_arrow_next{margin-right:.5em}div.pp_woocommerce .pp_arrow_next::before{content:'\e008'}div.pp_woocommerce a.pp_contract,div.pp_woocommerce a.pp_expand{border-radius:100%;height:1em;width:1em;text-shadow:0 1px 2px rgba(0,0,0,.5);background-color:#444;color:#fff!important;line-height:1em;-webkit-transition:all ease-in-out .2s;transition:all ease-in-out .2s;left:auto;right:-.5em;top:-.5em;font-size:1.618em!important}div.pp_woocommerce a.pp_contract:hover,div.pp_woocommerce a.pp_expand:hover{background-color:#000}div.pp_woocommerce a.pp_contract::before,div.pp_woocommerce a.pp_expand::before{font-family:WooCommerce;content:'\e005';display:block;position:absolute;top:0;right:0;left:0;bottom:0;text-align:center;text-indent:0}div.pp_woocommerce a.pp_contract::before{content:'\e004'}div.pp_woocommerce #respond{margin:0;width:100%;background:0 0;border:none;padding:0}div.pp_woocommerce #respond .form-submit{margin-top:0;float:none}div.pp_woocommerce .pp_inline{padding:0!important}.rtl div.pp_woocommerce .pp_content_container{text-align:left}@media only screen and (max-width:768px){div.pp_woocommerce .pp_contract,div.pp_woocommerce .pp_description,div.pp_woocommerce .pp_expand,div.pp_woocommerce .pp_gallery,div.pp_woocommerce .pp_next,div.pp_woocommerce .pp_previous{display:none!important}div.pp_woocommerce{right:5%!important;left:5%!important;box-sizing:border-box;width:90%!important}div.pp_woocommerce .pp_arrow_next,div.pp_woocommerce .pp_arrow_previous,div.pp_woocommerce .pp_close{height:44px;width:44px;font-size:44px;line-height:44px}div.pp_woocommerce .pp_arrow_next::before,div.pp_woocommerce .pp_arrow_previous::before,div.pp_woocommerce .pp_close::before{font-size:44px}.pp_content,div.pp_woocommerce .pp_details{width:100%!important}.pp_content #pp_full_res>img{width:100%!important;height:auto!important}.currentTextHolder{line-height:3}}div.pp_pic_holder a:focus{outline:0}div.pp_overlay{background:#000;display:none;right:0;position:absolute;top:0;width:100%;z-index:9999}div.pp_pic_holder{display:none;position:absolute;width:100px;z-index:10000}.pp_top{height:20px;position:relative}* html .pp_top{padding:0 20px}.pp_top .pp_left{height:20px;right:0;position:absolute;width:20px}.pp_top .pp_middle{height:20px;right:20px;position:absolute;left:20px}* html .pp_top .pp_middle{right:0;position:static}.pp_top .pp_right{height:20px;right:auto;position:absolute;left:0;top:0;width:20px}.pp_content{height:40px;min-width:40px}* html .pp_content{width:40px}.pp_fade{display:none}.pp_content_container{position:relative;text-align:right;width:100%}.pp_content_container .pp_left{padding-right:20px}.pp_content_container .pp_right{padding-left:20px}.pp_content_container .pp_details{float:right;margin:10px 0 2px}.pp_description{display:none;margin:0}.pp_social{float:right;margin:0}.pp_social .facebook{float:right;margin-right:5px;width:55px;overflow:hidden}.pp_social .twitter{float:right}.pp_nav{clear:left;float:right;margin:3px 0 0 10px}.pp_nav p{float:right;margin:2px 4px;white-space:nowrap}.pp_nav .pp_pause,.pp_nav .pp_play{float:right;margin-left:4px;text-indent:-10000px}a.pp_arrow_next,a.pp_arrow_previous{display:block;float:right;height:15px;margin-top:3px;text-indent:-100000px;width:14px}.pp_hoverContainer{position:absolute;top:0;width:100%;z-index:2000}.pp_gallery{display:none;right:50%;margin-top:-50px;position:absolute;z-index:10000}.pp_gallery div{float:right;overflow:hidden;position:relative}.pp_gallery ul{float:right;height:35px;margin:0 5px 0 0;padding:0;position:relative;white-space:nowrap}.pp_gallery ul a{border:1px solid #000;border:1px solid rgba(0,0,0,.5);display:block;float:right;height:33px;overflow:hidden}.pp_gallery li.selected a,.pp_gallery ul a:hover{border-color:#fff}.pp_gallery ul a img{border:0}.pp_gallery li{display:block;float:right;margin:0 0 0 5px;padding:0}.pp_gallery li.default a{display:block;height:33px;width:50px}.pp_gallery li.default a img{display:none}a.pp_next,a.pp_previous{display:block;height:100%;width:49%;text-indent:-10000px}.pp_gallery .pp_arrow_next,.pp_gallery .pp_arrow_previous{margin-top:7px!important}a.pp_next{float:left}a.pp_previous{float:right}a.pp_contract,a.pp_expand{cursor:pointer;display:none;height:20px;position:absolute;left:30px;text-indent:-10000px;top:10px;width:20px;z-index:20000}a.pp_close{position:absolute;left:0;top:0;display:block;text-indent:-10000px}.pp_bottom{height:20px;position:relative}* html .pp_bottom{padding:0 20px}.pp_bottom .pp_left{height:20px;right:0;position:absolute;width:20px}.pp_bottom .pp_middle{height:20px;right:20px;position:absolute;left:20px}* html .pp_bottom .pp_middle{right:0;position:static}.pp_bottom .pp_right{height:20px;right:auto;position:absolute;left:0;top:0;width:20px}.pp_loaderIcon{display:block;height:24px;right:50%;margin:-12px -12px 0 0;position:absolute;top:50%;width:24px}#pp_full_res .pp_inline{text-align:right}div.ppt{color:#fff!important;font-weight:700;display:none;font-size:17px;margin:0 15px 5px 0;z-index:9999}
\ No newline at end of file
diff --git a/assets/css/prettyPhoto.css b/assets/css/prettyPhoto.css
index 575e9a7c0c9..5bb52104191 100644
--- a/assets/css/prettyPhoto.css
+++ b/assets/css/prettyPhoto.css
@@ -1 +1 @@
-@font-face{font-family:star;src:url(../fonts/star.eot);src:url(../fonts/star.eot?#iefix) format("embedded-opentype"),url(../fonts/star.woff) format("woff"),url(../fonts/star.ttf) format("truetype"),url(../fonts/star.svg#star) format("svg");font-weight:400;font-style:normal}@font-face{font-family:WooCommerce;src:url(../fonts/WooCommerce.eot);src:url(../fonts/WooCommerce.eot?#iefix) format("embedded-opentype"),url(../fonts/WooCommerce.woff) format("woff"),url(../fonts/WooCommerce.ttf) format("truetype"),url(../fonts/WooCommerce.svg#WooCommerce) format("svg");font-weight:400;font-style:normal}div.pp_woocommerce .pp_content_container{background:#fff;border-radius:3px;box-shadow:0 1px 30px rgba(0,0,0,.25);padding:20px 0}div.pp_woocommerce .pp_content_container:after,div.pp_woocommerce .pp_content_container:before{content:" ";display:table}div.pp_woocommerce .pp_content_container:after{clear:both}div.pp_woocommerce .pp_loaderIcon:before{height:1em;width:1em;position:absolute;top:50%;left:50%;margin-left:-.5em;margin-top:-.5em;display:block;content:"";-webkit-animation:spin 1s ease-in-out infinite;-moz-animation:spin 1s ease-in-out infinite;animation:spin 1s ease-in-out infinite;background:url(../images/icons/loader.svg) center center;background-size:cover;line-height:1;text-align:center;font-size:2em;color:rgba(0,0,0,.75)}div.pp_woocommerce div.ppt{color:#000}div.pp_woocommerce .pp_gallery ul li a{border:1px solid rgba(0,0,0,.5);background:#fff;box-shadow:0 1px 2px rgba(0,0,0,.2);border-radius:2px;display:block}div.pp_woocommerce .pp_arrow_next,div.pp_woocommerce .pp_arrow_previous,div.pp_woocommerce .pp_close,div.pp_woocommerce .pp_next:before,div.pp_woocommerce .pp_previous:before,div.pp_woocommerce a.pp_contract,div.pp_woocommerce a.pp_expand{border-radius:100%;height:1em;width:1em;text-shadow:0 1px 2px rgba(0,0,0,.5);line-height:1em;transition:all ease-in-out .2s;color:#fff!important}div.pp_woocommerce .pp_gallery ul li a:hover,div.pp_woocommerce .pp_gallery ul li.selected a{border-color:#000}div.pp_woocommerce .pp_next:before,div.pp_woocommerce .pp_previous:before{background-color:#444;font-size:16px!important;font-family:WooCommerce;content:"\e00b";text-indent:0;display:none;position:absolute;top:50%;margin-top:-10px;text-align:center}div.pp_woocommerce .pp_next:before:hover,div.pp_woocommerce .pp_previous:before:hover{background-color:#000}div.pp_woocommerce .pp_next:hover:before,div.pp_woocommerce .pp_previous:hover:before{display:block}div.pp_woocommerce .pp_previous:before{left:1em}div.pp_woocommerce .pp_next:before{right:1em;font-family:WooCommerce;content:"\e008"}div.pp_woocommerce .pp_details{margin:0;padding-top:1em}div.pp_woocommerce .pp_description,div.pp_woocommerce .pp_nav{font-size:14px}div.pp_woocommerce .pp_arrow_next,div.pp_woocommerce .pp_arrow_previous,div.pp_woocommerce .pp_nav,div.pp_woocommerce .pp_nav .pp_pause,div.pp_woocommerce .pp_nav p,div.pp_woocommerce .pp_play{margin:0}div.pp_woocommerce .pp_nav{margin-right:1em;position:relative}div.pp_woocommerce .pp_close{background-color:#444;top:-.5em;right:-.5em;font-size:1.618em!important}div.pp_woocommerce .pp_close:hover{background-color:#000}div.pp_woocommerce .pp_close:before{font-family:WooCommerce;content:"\e013";display:block;position:absolute;top:0;left:0;right:0;bottom:0;text-align:center;text-indent:0}div.pp_woocommerce .pp_arrow_next,div.pp_woocommerce .pp_arrow_previous{background-color:#444;font-size:16px!important;position:relative;margin-top:-1px}div.pp_woocommerce .pp_arrow_next:hover,div.pp_woocommerce .pp_arrow_previous:hover{background-color:#000}div.pp_woocommerce .pp_arrow_next:before,div.pp_woocommerce .pp_arrow_previous:before{font-family:WooCommerce;content:"\e00b";display:block;position:absolute;top:0;left:0;right:0;bottom:0;text-align:center;text-indent:0}div.pp_woocommerce .pp_arrow_previous{margin-right:.5em}div.pp_woocommerce .pp_arrow_next{margin-left:.5em}div.pp_woocommerce .pp_arrow_next:before{content:"\e008"}div.pp_woocommerce a.pp_contract,div.pp_woocommerce a.pp_expand{background-color:#444;right:auto;left:-.5em;top:-.5em;font-size:1.618em!important}div.pp_woocommerce a.pp_contract:hover,div.pp_woocommerce a.pp_expand:hover{background-color:#000}div.pp_woocommerce a.pp_contract:before,div.pp_woocommerce a.pp_expand:before{font-family:WooCommerce;content:"\e005";display:block;position:absolute;top:0;left:0;right:0;bottom:0;text-align:center;text-indent:0}div.pp_woocommerce a.pp_contract:before{content:"\e004"}div.pp_woocommerce #respond{margin:0;width:100%;background:0 0;border:none;padding:0}div.pp_woocommerce #respond .form-submit{margin-top:0;float:none}div.pp_woocommerce .pp_inline{padding:0!important}.rtl div.pp_woocommerce .pp_content_container{text-align:right}@media only screen and (max-width:768px){div.pp_woocommerce .pp_contract,div.pp_woocommerce .pp_description,div.pp_woocommerce .pp_expand,div.pp_woocommerce .pp_gallery,div.pp_woocommerce .pp_next,div.pp_woocommerce .pp_previous{display:none!important}div.pp_woocommerce{left:5%!important;right:5%!important;box-sizing:border-box;width:90%!important}div.pp_woocommerce .pp_arrow_next,div.pp_woocommerce .pp_arrow_previous,div.pp_woocommerce .pp_close{height:44px;width:44px;font-size:44px;line-height:44px}div.pp_woocommerce .pp_arrow_next:before,div.pp_woocommerce .pp_arrow_previous:before,div.pp_woocommerce .pp_close:before{font-size:44px}.pp_content,div.pp_woocommerce .pp_details{width:100%!important}.pp_content #pp_full_res>img{width:100%!important;height:auto!important}.currentTextHolder{line-height:3}}div.pp_pic_holder a:focus{outline:0}div.pp_overlay{background:#000;display:none;left:0;position:absolute;top:0;width:100%;z-index:9999}div.pp_pic_holder{display:none;position:absolute;width:100px;z-index:10000}.pp_top{height:20px;position:relative}* html .pp_top{padding:0 20px}.pp_top .pp_left{height:20px;left:0;position:absolute;width:20px}.pp_top .pp_middle{height:20px;left:20px;position:absolute;right:20px}* html .pp_top .pp_middle{left:0;position:static}.pp_top .pp_right{height:20px;left:auto;position:absolute;right:0;top:0;width:20px}.pp_content{height:40px;min-width:40px}* html .pp_content{width:40px}.pp_fade{display:none}.pp_content_container{position:relative;text-align:left;width:100%}.pp_content_container .pp_left{padding-left:20px}.pp_content_container .pp_right{padding-right:20px}.pp_content_container .pp_details{float:left;margin:10px 0 2px}.pp_description{display:none;margin:0}.pp_social{float:left;margin:0}.pp_social .facebook{float:left;margin-left:5px;width:55px;overflow:hidden}.pp_social .twitter{float:left}.pp_nav{clear:right;float:left;margin:3px 10px 0 0}.pp_nav p{float:left;margin:2px 4px;white-space:nowrap}.pp_nav .pp_pause,.pp_nav .pp_play{float:left;margin-right:4px;text-indent:-10000px}a.pp_arrow_next,a.pp_arrow_previous{display:block;float:left;height:15px;margin-top:3px;text-indent:-100000px;width:14px}.pp_hoverContainer{position:absolute;top:0;width:100%;z-index:2000}.pp_gallery{display:none;left:50%;margin-top:-50px;position:absolute;z-index:10000}.pp_gallery div{float:left;overflow:hidden;position:relative}.pp_gallery ul{float:left;height:35px;margin:0 0 0 5px;padding:0;position:relative;white-space:nowrap}.pp_gallery ul a{border:1px solid #000;border:1px solid rgba(0,0,0,.5);display:block;float:left;height:33px;overflow:hidden}.pp_gallery li.selected a,.pp_gallery ul a:hover{border-color:#fff}.pp_gallery ul a img{border:0}.pp_gallery li{display:block;float:left;margin:0 5px 0 0;padding:0}.pp_gallery li.default a{display:block;height:33px;width:50px}.pp_gallery li.default a img{display:none}a.pp_next,a.pp_previous{display:block;height:100%;width:49%;text-indent:-10000px}.pp_gallery .pp_arrow_next,.pp_gallery .pp_arrow_previous{margin-top:7px!important}a.pp_next{float:right}a.pp_previous{float:left}a.pp_contract,a.pp_expand{cursor:pointer;display:none;height:20px;position:absolute;right:30px;text-indent:-10000px;top:10px;width:20px;z-index:20000}a.pp_close{position:absolute;right:0;top:0;display:block;text-indent:-10000px}.pp_bottom{height:20px;position:relative}* html .pp_bottom{padding:0 20px}.pp_bottom .pp_left{height:20px;left:0;position:absolute;width:20px}.pp_bottom .pp_middle{height:20px;left:20px;position:absolute;right:20px}* html .pp_bottom .pp_middle{left:0;position:static}.pp_bottom .pp_right{height:20px;left:auto;position:absolute;right:0;top:0;width:20px}.pp_loaderIcon{display:block;height:24px;left:50%;margin:-12px 0 0 -12px;position:absolute;top:50%;width:24px}#pp_full_res .pp_inline{text-align:left}div.ppt{color:#fff!important;font-weight:700;display:none;font-size:17px;margin:0 0 5px 15px;z-index:9999}
\ No newline at end of file
+@font-face{font-family:star;src:url(../fonts/star.eot);src:url(../fonts/star.eot?#iefix) format("embedded-opentype"),url(../fonts/star.woff) format("woff"),url(../fonts/star.ttf) format("truetype"),url(../fonts/star.svg#star) format("svg");font-weight:400;font-style:normal}@font-face{font-family:WooCommerce;src:url(../fonts/WooCommerce.eot);src:url(../fonts/WooCommerce.eot?#iefix) format("embedded-opentype"),url(../fonts/WooCommerce.woff) format("woff"),url(../fonts/WooCommerce.ttf) format("truetype"),url(../fonts/WooCommerce.svg#WooCommerce) format("svg");font-weight:400;font-style:normal}div.pp_woocommerce .pp_content_container{background:#fff;border-radius:3px;box-shadow:0 1px 30px rgba(0,0,0,.25);padding:20px 0}div.pp_woocommerce .pp_content_container::after,div.pp_woocommerce .pp_content_container::before{content:' ';display:table}div.pp_woocommerce .pp_content_container::after{clear:both}div.pp_woocommerce .pp_loaderIcon::before{height:1em;width:1em;display:block;position:absolute;top:50%;left:50%;margin-left:-.5em;margin-top:-.5em;content:'';-webkit-animation:spin 1s ease-in-out infinite;animation:spin 1s ease-in-out infinite;background:url(../images/icons/loader.svg) center center;background-size:cover;line-height:1;text-align:center;font-size:2em;color:rgba(0,0,0,.75)}div.pp_woocommerce div.ppt{color:#000}div.pp_woocommerce .pp_gallery ul li a{border:1px solid rgba(0,0,0,.5);background:#fff;box-shadow:0 1px 2px rgba(0,0,0,.2);border-radius:2px;display:block}div.pp_woocommerce .pp_gallery ul li a:hover,div.pp_woocommerce .pp_gallery ul li.selected a{border-color:#000}div.pp_woocommerce .pp_next::before,div.pp_woocommerce .pp_previous::before{border-radius:100%;height:1em;width:1em;text-shadow:0 1px 2px rgba(0,0,0,.5);background-color:#444;color:#fff!important;font-size:16px!important;line-height:1em;-webkit-transition:all ease-in-out .2s;transition:all ease-in-out .2s;font-family:WooCommerce;content:'\e00b';text-indent:0;display:none;position:absolute;top:50%;margin-top:-10px;text-align:center}div.pp_woocommerce .pp_arrow_next,div.pp_woocommerce .pp_arrow_previous,div.pp_woocommerce .pp_close{-webkit-transition:all ease-in-out .2s;border-radius:100%;height:1em;width:1em;text-shadow:0 1px 2px rgba(0,0,0,.5);line-height:1em;color:#fff!important}div.pp_woocommerce .pp_next::before:hover,div.pp_woocommerce .pp_previous::before:hover{background-color:#000}div.pp_woocommerce .pp_next:hover::before,div.pp_woocommerce .pp_previous:hover::before{display:block}div.pp_woocommerce .pp_previous::before{left:1em}div.pp_woocommerce .pp_next::before{right:1em;font-family:WooCommerce;content:'\e008'}div.pp_woocommerce .pp_details{margin:0;padding-top:1em}div.pp_woocommerce .pp_description,div.pp_woocommerce .pp_nav{font-size:14px}div.pp_woocommerce .pp_arrow_next,div.pp_woocommerce .pp_arrow_previous,div.pp_woocommerce .pp_nav,div.pp_woocommerce .pp_nav .pp_pause,div.pp_woocommerce .pp_nav p,div.pp_woocommerce .pp_play{margin:0}div.pp_woocommerce .pp_nav{margin-right:1em;position:relative}div.pp_woocommerce .pp_close{background-color:#444;transition:all ease-in-out .2s;top:-.5em;right:-.5em;font-size:1.618em!important}div.pp_woocommerce .pp_close:hover{background-color:#000}div.pp_woocommerce .pp_close::before{font-family:WooCommerce;content:'\e013';display:block;position:absolute;top:0;left:0;right:0;bottom:0;text-align:center;text-indent:0}div.pp_woocommerce .pp_arrow_next,div.pp_woocommerce .pp_arrow_previous{background-color:#444;font-size:16px!important;transition:all ease-in-out .2s;position:relative;margin-top:-1px}div.pp_woocommerce .pp_arrow_next:hover,div.pp_woocommerce .pp_arrow_previous:hover{background-color:#000}div.pp_woocommerce .pp_arrow_next::before,div.pp_woocommerce .pp_arrow_previous::before{font-family:WooCommerce;content:'\e00b';display:block;position:absolute;top:0;left:0;right:0;bottom:0;text-align:center;text-indent:0}div.pp_woocommerce .pp_arrow_previous{margin-right:.5em}div.pp_woocommerce .pp_arrow_next{margin-left:.5em}div.pp_woocommerce .pp_arrow_next::before{content:'\e008'}div.pp_woocommerce a.pp_contract,div.pp_woocommerce a.pp_expand{border-radius:100%;height:1em;width:1em;text-shadow:0 1px 2px rgba(0,0,0,.5);background-color:#444;color:#fff!important;line-height:1em;-webkit-transition:all ease-in-out .2s;transition:all ease-in-out .2s;right:auto;left:-.5em;top:-.5em;font-size:1.618em!important}div.pp_woocommerce a.pp_contract:hover,div.pp_woocommerce a.pp_expand:hover{background-color:#000}div.pp_woocommerce a.pp_contract::before,div.pp_woocommerce a.pp_expand::before{font-family:WooCommerce;content:'\e005';display:block;position:absolute;top:0;left:0;right:0;bottom:0;text-align:center;text-indent:0}div.pp_woocommerce a.pp_contract::before{content:'\e004'}div.pp_woocommerce #respond{margin:0;width:100%;background:0 0;border:none;padding:0}div.pp_woocommerce #respond .form-submit{margin-top:0;float:none}div.pp_woocommerce .pp_inline{padding:0!important}.rtl div.pp_woocommerce .pp_content_container{text-align:right}@media only screen and (max-width:768px){div.pp_woocommerce .pp_contract,div.pp_woocommerce .pp_description,div.pp_woocommerce .pp_expand,div.pp_woocommerce .pp_gallery,div.pp_woocommerce .pp_next,div.pp_woocommerce .pp_previous{display:none!important}div.pp_woocommerce{left:5%!important;right:5%!important;box-sizing:border-box;width:90%!important}div.pp_woocommerce .pp_arrow_next,div.pp_woocommerce .pp_arrow_previous,div.pp_woocommerce .pp_close{height:44px;width:44px;font-size:44px;line-height:44px}div.pp_woocommerce .pp_arrow_next::before,div.pp_woocommerce .pp_arrow_previous::before,div.pp_woocommerce .pp_close::before{font-size:44px}.pp_content,div.pp_woocommerce .pp_details{width:100%!important}.pp_content #pp_full_res>img{width:100%!important;height:auto!important}.currentTextHolder{line-height:3}}div.pp_pic_holder a:focus{outline:0}div.pp_overlay{background:#000;display:none;left:0;position:absolute;top:0;width:100%;z-index:9999}div.pp_pic_holder{display:none;position:absolute;width:100px;z-index:10000}.pp_top{height:20px;position:relative}* html .pp_top{padding:0 20px}.pp_top .pp_left{height:20px;left:0;position:absolute;width:20px}.pp_top .pp_middle{height:20px;left:20px;position:absolute;right:20px}* html .pp_top .pp_middle{left:0;position:static}.pp_top .pp_right{height:20px;left:auto;position:absolute;right:0;top:0;width:20px}.pp_content{height:40px;min-width:40px}* html .pp_content{width:40px}.pp_fade{display:none}.pp_content_container{position:relative;text-align:left;width:100%}.pp_content_container .pp_left{padding-left:20px}.pp_content_container .pp_right{padding-right:20px}.pp_content_container .pp_details{float:left;margin:10px 0 2px}.pp_description{display:none;margin:0}.pp_social{float:left;margin:0}.pp_social .facebook{float:left;margin-left:5px;width:55px;overflow:hidden}.pp_social .twitter{float:left}.pp_nav{clear:right;float:left;margin:3px 10px 0 0}.pp_nav p{float:left;margin:2px 4px;white-space:nowrap}.pp_nav .pp_pause,.pp_nav .pp_play{float:left;margin-right:4px;text-indent:-10000px}a.pp_arrow_next,a.pp_arrow_previous{display:block;float:left;height:15px;margin-top:3px;text-indent:-100000px;width:14px}.pp_hoverContainer{position:absolute;top:0;width:100%;z-index:2000}.pp_gallery{display:none;left:50%;margin-top:-50px;position:absolute;z-index:10000}.pp_gallery div{float:left;overflow:hidden;position:relative}.pp_gallery ul{float:left;height:35px;margin:0 0 0 5px;padding:0;position:relative;white-space:nowrap}.pp_gallery ul a{border:1px solid #000;border:1px solid rgba(0,0,0,.5);display:block;float:left;height:33px;overflow:hidden}.pp_gallery li.selected a,.pp_gallery ul a:hover{border-color:#fff}.pp_gallery ul a img{border:0}.pp_gallery li{display:block;float:left;margin:0 5px 0 0;padding:0}.pp_gallery li.default a{display:block;height:33px;width:50px}.pp_gallery li.default a img{display:none}a.pp_next,a.pp_previous{display:block;height:100%;width:49%;text-indent:-10000px}.pp_gallery .pp_arrow_next,.pp_gallery .pp_arrow_previous{margin-top:7px!important}a.pp_next{float:right}a.pp_previous{float:left}a.pp_contract,a.pp_expand{cursor:pointer;display:none;height:20px;position:absolute;right:30px;text-indent:-10000px;top:10px;width:20px;z-index:20000}a.pp_close{position:absolute;right:0;top:0;display:block;text-indent:-10000px}.pp_bottom{height:20px;position:relative}* html .pp_bottom{padding:0 20px}.pp_bottom .pp_left{height:20px;left:0;position:absolute;width:20px}.pp_bottom .pp_middle{height:20px;left:20px;position:absolute;right:20px}* html .pp_bottom .pp_middle{left:0;position:static}.pp_bottom .pp_right{height:20px;left:auto;position:absolute;right:0;top:0;width:20px}.pp_loaderIcon{display:block;height:24px;left:50%;margin:-12px 0 0 -12px;position:absolute;top:50%;width:24px}#pp_full_res .pp_inline{text-align:left}div.ppt{color:#fff!important;font-weight:700;display:none;font-size:17px;margin:0 0 5px 15px;z-index:9999}
\ No newline at end of file
diff --git a/assets/css/prettyPhoto.scss b/assets/css/prettyPhoto.scss
index 7070f7cda50..1fdeb077f39 100644
--- a/assets/css/prettyPhoto.scss
+++ b/assets/css/prettyPhoto.scss
@@ -7,10 +7,10 @@
 /**
  * Imports
  */
-@import "bourbon";
-@import "mixins";
-@import "variables";
-@import "fonts";
+@import 'bourbon';
+@import 'mixins';
+@import 'variables';
+@import 'fonts';
 
 /**
  * Mixins
@@ -19,7 +19,7 @@
 	border-radius: 100%;
 	height: 1em;
 	width: 1em;
-	text-shadow: 0 1px 2px rgba(0,0,0,0.5);
+	text-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
 	background-color: #444;
 	color: #fff !important;
 	font-size: 16px !important;
@@ -38,7 +38,7 @@ div.pp_woocommerce {
 	.pp_content_container {
 		background: #fff;
 		border-radius: 3px;
-		box-shadow: 0 1px 30px rgba(0,0,0,0.25);
+		box-shadow: 0 1px 30px rgba(0, 0, 0, 0.25);
 		padding: 20px 0;
 		@include clearfix();
 	}
@@ -55,9 +55,9 @@ div.pp_woocommerce {
 		ul {
 			li {
 				a {
-					border: 1px solid rgba(0,0,0,0.5);
+					border: 1px solid rgba(0, 0, 0, 0.5);
 					background: #fff;
-					box-shadow: 0 1px 2px rgba(0,0,0,0.2);
+					box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
 					border-radius: 2px;
 					display: block;
 
@@ -77,10 +77,10 @@ div.pp_woocommerce {
 
 	.pp_previous,
 	.pp_next {
-		&:before {
+		&::before {
 			@include button();
 			font-family: 'WooCommerce';
-			content: "\e00b";
+			content: '\e00b';
 			text-indent: 0;
 			display: none;
 			position: absolute;
@@ -90,23 +90,23 @@ div.pp_woocommerce {
 		}
 
 		&:hover {
-			&:before {
+			&::before {
 				display: block;
 			}
 		}
 	}
 
 	.pp_previous {
-		&:before {
+		&::before {
 			left: 1em;
 		}
 	}
 
 	.pp_next {
-		&:before {
+		&::before {
 			right: 1em;
 			font-family: 'WooCommerce';
-			content: "\e008";
+			content: '\e008';
 		}
 	}
 
@@ -136,13 +136,13 @@ div.pp_woocommerce {
 
 	.pp_close {
 		@include button();
-		top: -.5em;
-		right: -.5em;
+		top: -0.5em;
+		right: -0.5em;
 		font-size: 1.618em !important;
 
-		&:before {
+		&::before {
 			font-family: 'WooCommerce';
-			content: "\e013";
+			content: '\e013';
 			display: block;
 			position: absolute;
 			top: 0;
@@ -160,9 +160,9 @@ div.pp_woocommerce {
 		position: relative;
 		margin-top: -1px;
 
-		&:before {
+		&::before {
 			font-family: 'WooCommerce';
-			content: "\e00b";
+			content: '\e00b';
 			display: block;
 			position: absolute;
 			top: 0;
@@ -175,14 +175,14 @@ div.pp_woocommerce {
 	}
 
 	.pp_arrow_previous {
-		margin-right: .5em;
+		margin-right: 0.5em;
 	}
 
 	.pp_arrow_next {
-		margin-left: .5em;
+		margin-left: 0.5em;
 
-		&:before {
-			content: "\e008";
+		&::before {
+			content: '\e008';
 		}
 	}
 
@@ -190,13 +190,13 @@ div.pp_woocommerce {
 	a.pp_contract {
 		@include button();
 		right: auto;
-		left: -.5em;
-		top: -.5em;
+		left: -0.5em;
+		top: -0.5em;
 		font-size: 1.618em !important;
 
-		&:before {
+		&::before {
 			font-family: 'WooCommerce';
-			content: "\e005";
+			content: '\e005';
 			display: block;
 			position: absolute;
 			top: 0;
@@ -209,8 +209,8 @@ div.pp_woocommerce {
 	}
 
 	a.pp_contract {
-		&:before {
-			content: "\e004";
+		&::before {
+			content: '\e004';
 		}
 	}
 
@@ -264,7 +264,7 @@ div.pp_woocommerce {
 			font-size: 44px;
 			line-height: 44px;
 
-			&:before {
+			&::before {
 				font-size: 44px;
 			}
 		}
@@ -281,12 +281,12 @@ div.pp_woocommerce {
 	.pp_content {
 		width: 100% !important;
 
-        #pp_full_res{
-			& > img{
+		#pp_full_res {
+			& > img {
 				width: 100% !important;
 				height: auto !important;
 			}
-        }
+		}
 	}
 
 	.currentTextHolder {
@@ -385,7 +385,7 @@ div.pp_pic_holder {
 
 .pp_content_container .pp_details {
 	float: left;
-	margin: 10px 0 2px 0;
+	margin: 10px 0 2px;
 }
 
 .pp_description {
@@ -401,7 +401,8 @@ div.pp_pic_holder {
 .pp_social .facebook {
 	float: left;
 	margin-left: 5px;
-	width: 55px; overflow: hidden;
+	width: 55px;
+	overflow: hidden;
 }
 
 .pp_social .twitter {
@@ -469,7 +470,7 @@ a.pp_arrow_next {
 
 .pp_gallery ul a {
 	border: 1px #000 solid;
-	border: 1px rgba(0,0,0,0.5) solid;
+	border: 1px rgba(0, 0, 0, 0.5) solid;
 	display: block;
 	float: left;
 	height: 33px;
@@ -537,7 +538,9 @@ a.pp_contract {
 }
 
 a.pp_close {
-	position: absolute; right: 0; top: 0;
+	position: absolute;
+	right: 0;
+	top: 0;
 	display: block;
 	text-indent: -10000px;
 }
diff --git a/assets/css/reports-print-rtl.css b/assets/css/reports-print-rtl.css
new file mode 100644
index 00000000000..a7cca79ddbe
--- /dev/null
+++ b/assets/css/reports-print-rtl.css
@@ -0,0 +1 @@
+*{background:0 0!important;color:#000!important;text-shadow:none!important;-webkit-filter:none!important;filter:none!important;-ms-filter:none!important;font-size:9pt!important;opacity:1;-webkit-transition:none!important}@page{margin:.5cm}#adminmenuback,#adminmenuwrap,#screen-meta-links,#wpadminbar,#wpfooter,.update-nag,.updated,.woo-nav-tab-wrapper,.woocommerce-reports-wide .button,.woocommerce-reports-wide .postbox h3.stats_range .export_csv,.woocommerce-reports-wrap .postbox h3.stats_range .export_csv{display:none}h2 .nav-tab{line-height:14px}.woocommerce-reports-wide .postbox h3.stats_range ul li a,.woocommerce-reports-wide .postbox h3.stats_range ul li.custom,.woocommerce-reports-wrap .postbox h3.stats_range ul li a,.woocommerce-reports-wrap .postbox h3.stats_range ul li.custom{padding:5px;line-height:14px}#wpcontent{margin-right:0}.woocommerce-reports-wide .postbox .chart-with-sidebar .chart-sidebar,.woocommerce-reports-wrap .postbox .chart-with-sidebar .chart-sidebar{margin-right:-130px;width:130px;display:block}.woocommerce-reports-wide .postbox .chart-with-sidebar,.woocommerce-reports-wrap .postbox .chart-with-sidebar{padding-right:130px}.chart-legend{overflow:hidden;zoom:1}.chart-legend li{padding:.25em .5em!important;box-shadow:none!important;border-bottom:1px solid gray!important}
\ No newline at end of file
diff --git a/assets/css/reports-print.css b/assets/css/reports-print.css
index 9e35158cc8c..36b9a40df77 100644
--- a/assets/css/reports-print.css
+++ b/assets/css/reports-print.css
@@ -1 +1 @@
-*{background:0 0!important;color:#000!important;text-shadow:none!important;filter:none!important;-ms-filter:none!important;font-size:9pt!important;opacity:1;-webkit-transition:none!important}@page{margin:.5cm}#adminmenuback,#adminmenuwrap,#screen-meta-links,#wpadminbar,#wpfooter,.update-nag,.updated,.woo-nav-tab-wrapper,.woocommerce-reports-wide .button,.woocommerce-reports-wide .postbox h3.stats_range .export_csv,.woocommerce-reports-wrap .postbox h3.stats_range .export_csv{display:none}h2 .nav-tab{line-height:14px}.woocommerce-reports-wide .postbox h3.stats_range ul li a,.woocommerce-reports-wide .postbox h3.stats_range ul li.custom,.woocommerce-reports-wrap .postbox h3.stats_range ul li a,.woocommerce-reports-wrap .postbox h3.stats_range ul li.custom{padding:5px;line-height:14px}#wpcontent{margin-left:0}.woocommerce-reports-wide .postbox .chart-with-sidebar .chart-sidebar,.woocommerce-reports-wrap .postbox .chart-with-sidebar .chart-sidebar{margin-left:-130px;width:130px;display:block}.woocommerce-reports-wide .postbox .chart-with-sidebar,.woocommerce-reports-wrap .postbox .chart-with-sidebar{padding-left:130px}.chart-legend{overflow:hidden;zoom:1}.chart-legend li{padding:.25em .5em!important;box-shadow:none!important;border-bottom:1px solid gray!important}
\ No newline at end of file
+*{background:0 0!important;color:#000!important;text-shadow:none!important;-webkit-filter:none!important;filter:none!important;-ms-filter:none!important;font-size:9pt!important;opacity:1;-webkit-transition:none!important}@page{margin:.5cm}#adminmenuback,#adminmenuwrap,#screen-meta-links,#wpadminbar,#wpfooter,.update-nag,.updated,.woo-nav-tab-wrapper,.woocommerce-reports-wide .button,.woocommerce-reports-wide .postbox h3.stats_range .export_csv,.woocommerce-reports-wrap .postbox h3.stats_range .export_csv{display:none}h2 .nav-tab{line-height:14px}.woocommerce-reports-wide .postbox h3.stats_range ul li a,.woocommerce-reports-wide .postbox h3.stats_range ul li.custom,.woocommerce-reports-wrap .postbox h3.stats_range ul li a,.woocommerce-reports-wrap .postbox h3.stats_range ul li.custom{padding:5px;line-height:14px}#wpcontent{margin-left:0}.woocommerce-reports-wide .postbox .chart-with-sidebar .chart-sidebar,.woocommerce-reports-wrap .postbox .chart-with-sidebar .chart-sidebar{margin-left:-130px;width:130px;display:block}.woocommerce-reports-wide .postbox .chart-with-sidebar,.woocommerce-reports-wrap .postbox .chart-with-sidebar{padding-left:130px}.chart-legend{overflow:hidden;zoom:1}.chart-legend li{padding:.25em .5em!important;box-shadow:none!important;border-bottom:1px solid gray!important}
\ No newline at end of file
diff --git a/assets/css/reports-print.scss b/assets/css/reports-print.scss
index 14b73edd53f..870656537a9 100644
--- a/assets/css/reports-print.scss
+++ b/assets/css/reports-print.scss
@@ -15,7 +15,7 @@
 }
 
 @page {
-  margin: .5cm;
+	margin: 0.5cm;
 }
 
 #adminmenuwrap,
@@ -67,7 +67,7 @@ h2 .nav-tab {
 
 .chart-legend li,
 .chart-legend li {
-	padding: .25em .5em !important;
+	padding: 0.25em 0.5em !important;
 	box-shadow: none !important;
 	border-bottom: 1px solid gray !important;
-}
\ No newline at end of file
+}
diff --git a/assets/css/select2.css b/assets/css/select2.css
index a2e25cd56b3..6f2c4cfc418 100644
--- a/assets/css/select2.css
+++ b/assets/css/select2.css
@@ -1 +1 @@
-.select2-container .select2-choice,.select2-results .select2-result-label{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-webkit-touch-callout:none}.select2-container{margin:0;position:relative;display:block!important;zoom:1;vertical-align:middle}.select2-container,.select2-drop,.select2-search,.select2-search input{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.select2-container .select2-choice{display:block;padding:0 0 0 8px;overflow:hidden;position:relative;border:1px solid #ccc;white-space:nowrap;color:#444;text-decoration:none;border-radius:3px;background-clip:padding-box;user-select:none;background-color:#fff;font-weight:400}html[dir=rtl] .select2-container .select2-choice{padding:0 8px 0 0}.select2-container.select2-drop-above .select2-choice{border-bottom-color:#ccc;border-radius:0 0 4px 4px}.select2-container.select2-allowclear .select2-choice .select2-chosen{margin-right:42px}.select2-container .select2-choice>.select2-chosen{margin-right:26px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;float:none;width:auto}html[dir=rtl] .select2-container .select2-choice>.select2-chosen{margin-left:26px;margin-right:0}.select2-container .select2-choice abbr{display:none;width:12px;height:12px;position:absolute;right:24px;top:5px;font-size:1px;text-decoration:none;border:0;background:url(../images/select2.png) right top no-repeat;cursor:pointer;outline:0}.select2-container.select2-allowclear .select2-choice abbr{display:inline-block}.select2-container .select2-choice abbr:hover{background-position:right -11px;cursor:pointer}.select2-drop-mask{border:0;margin:0;padding:0;position:fixed;left:0;top:0;min-height:100%;min-width:100%;height:auto;width:auto;opacity:0;z-index:9998;background-color:#fff;filter:alpha(opacity=0)}.select2-drop{width:100%;margin-top:-1px;position:absolute;z-index:9999;top:100%;background:#fff;color:#000;border:1px solid #ccc;border-top:0;border-radius:0 0 3px 3px}.select2-drop.select2-drop-above{margin-top:1px;border-top:1px solid #ccc;border-bottom:0;border-radius:3px 3px 0 0}.select2-drop-active{border:1px solid #666;border-top:none}.select2-drop.select2-drop-above.select2-drop-active{border-top:1px solid #666}.select2-drop-auto-width{border-top:1px solid #ccc;width:auto}.select2-drop-auto-width .select2-search{padding-top:4px}.select2-container .select2-choice .select2-arrow{display:inline-block;width:18px;height:100%;position:absolute;right:0;top:0;border-radius:0 3px 3px 0;background-clip:padding-box}html[dir=rtl] .select2-container .select2-choice .select2-arrow{left:0;right:auto;border-radius:3px 0 0 3px}.select2-container .select2-choice .select2-arrow b{display:block;width:100%;height:100%;position:relative}.select2-container .select2-choice .select2-arrow b:after{position:absolute;display:block;content:"";top:50%;left:50%;border:4px solid transparent;border-top-color:#666;margin-left:-7px;margin-top:-2px}.select2-search{display:inline-block;width:100%;margin:0;padding-left:4px;padding-right:4px;position:relative;z-index:10000;white-space:nowrap;padding-bottom:4px}.select2-search input{width:100%;height:auto!important;padding:4px 20px 4px 5px!important;margin:0;outline:0;font-family:sans-serif;font-size:1em;border:1px solid #ccc;-webkit-box-shadow:none;box-shadow:none;background:url(../images/select2.png) 100% -22px no-repeat #fff}html[dir=rtl] .select2-search input{padding:4px 5px 4px 20px;background:url(../images/select2.png) -37px -22px no-repeat #fff}.select2-drop.select2-drop-above .select2-search input{margin-top:4px}.select2-search input.select2-active{background:url(../images/select2-spinner.gif) 100% no-repeat #fff}.select2-container-active .select2-choice,.select2-container-active .select2-choices{border:1px solid #666;outline:0}.select2-dropdown-open .select2-choice{border-bottom-color:transparent;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-dropdown-open .select2-choice .select2-arrow b:after{border-top-color:transparent;border-bottom-color:#666;margin-top:-6px}.select2-dropdown-open.select2-drop-above .select2-choice,.select2-dropdown-open.select2-drop-above .select2-choices{border:1px solid #666;border-top-color:transparent}.select2-dropdown-open .select2-choice .select2-arrow{background:0 0;border-left:none;filter:none}html[dir=rtl] .select2-dropdown-open .select2-choice .select2-arrow{border-right:none}.select2-dropdown-open .select2-choice .select2-arrow b{background-position:-18px 1px}html[dir=rtl] .select2-dropdown-open .select2-choice .select2-arrow b{background-position:-16px 1px}.select2-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.select2-results{max-height:200px;padding:4px;margin:0;position:relative;overflow-x:hidden;overflow-y:auto;-webkit-tap-highlight-color:transparent;background:#fafafa}html[dir=rtl] .select2-results{padding:0 4px 0 0;margin:4px 0 4px 4px}.select2-results ul.select2-result-sub{margin:0;padding-left:0}.select2-results li{list-style:none;display:list-item;background-image:none;margin:3px 0}.select2-results li.select2-result-with-children>.select2-result-label{font-weight:700}.select2-results .select2-result-label{padding:5px 7px;margin:0;cursor:pointer;min-height:1em;user-select:none}.select2-results-dept-1 .select2-result-label{padding-left:20px}.select2-results-dept-2 .select2-result-label{padding-left:40px}.select2-results-dept-3 .select2-result-label{padding-left:60px}.select2-results-dept-4 .select2-result-label{padding-left:80px}.select2-results-dept-5 .select2-result-label{padding-left:100px}.select2-results-dept-6 .select2-result-label{padding-left:110px}.select2-results-dept-7 .select2-result-label{padding-left:120px}.select2-results .select2-highlighted{background:#f1f1f1;color:#000;border-radius:3px}.select2-results li em{background:#feffde;font-style:normal}.select2-results .select2-highlighted em{background:0 0}.select2-results .select2-highlighted ul{background:#fff;color:#000}.select2-results .select2-ajax-error,.select2-results .select2-no-results,.select2-results .select2-searching,.select2-results .select2-selection-limit{background:#f4f4f4;display:list-item;padding-left:5px}.select2-results .select2-disabled.select2-highlighted{color:#666;background:#f4f4f4;display:list-item;cursor:default}.select2-results .select2-disabled{background:#f4f4f4;display:list-item;cursor:default}.select2-results .select2-selected{display:none}.select2-more-results.select2-active{background:url(../images/select2-spinner.gif) 100% no-repeat #f4f4f4}.select2-results .select2-ajax-error{background:rgba(255,50,50,.2)}.select2-more-results{background:#f4f4f4;display:list-item}.select2-container.select2-container-disabled .select2-choice{background-color:#f4f4f4;background-image:none;border:1px solid #ddd;cursor:default}.select2-container.select2-container-disabled .select2-choice .select2-arrow{background-color:#f4f4f4;background-image:none;border-left:0}.select2-container.select2-container-disabled .select2-choice abbr{display:none}.select2-container-multi .select2-choices{height:auto!important;height:1%;margin:0;padding:0 5px 0 0;position:relative;border:1px solid #ccc;cursor:text;overflow:hidden;background-color:#fff;min-height:26px}html[dir=rtl] .select2-container-multi .select2-choices{padding:0 0 0 5px}.select2-locked{padding:3px 5px!important}.select2-container-multi.select2-container-active .select2-choices{border:1px solid #666;outline:0}.select2-container-multi .select2-choices li{float:left;list-style:none}html[dir=rtl] .select2-container-multi .select2-choices li{float:right}.select2-container-multi .select2-choices .select2-search-field{margin:0;padding:0;white-space:nowrap}.select2-container-multi .select2-choices .select2-search-field input{padding:5px;margin:1px 0;font-family:sans-serif;outline:0;border:0;-webkit-box-shadow:none;box-shadow:none;background:0 0!important}.select2-container-multi .select2-choices .select2-search-field input.select2-active{background:url(../images/select2-spinner.gif) 100% no-repeat #fff!important}.select2-default{color:#999!important}.select2-container-multi .select2-choices .select2-search-choice{padding:5px 8px 5px 24px;margin:3px 0 3px 5px;position:relative;line-height:15px;color:#333;cursor:default;border-radius:2px;background-clip:padding-box;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:#e4e4e4}html[dir=rtl] .select2-container-multi .select2-choices .select2-search-choice{margin:3px 5px 3px 0;padding:5px 24px 5px 8px}.select2-container-multi .select2-choices .select2-search-choice .select2-chosen{cursor:default}.select2-container-multi .select2-choices .select2-search-choice-focus{background:#d4d4d4}.select2-search-choice-close{display:block;width:12px;height:13px;position:absolute;right:7px;top:6px;font-size:1px;outline:0;background:url(../images/select2.png) right top no-repeat}html[dir=rtl] .select2-search-choice-close{right:auto;left:7px}.select2-container-multi .select2-search-choice-close{left:7px}html[dir=rtl] .select2-container-multi .select2-search-choice-close{left:auto;right:7px}.select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover,.select2-container-multi .select2-choices .select2-search-choice-focus .select2-search-choice-close{background-position:right -11px}.select2-container-multi.select2-container-disabled .select2-choices{background-color:#f4f4f4;background-image:none;border:1px solid #ddd;cursor:default}.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice{padding:3px 5px;border:1px solid #ddd;background-image:none;background-color:#f4f4f4}.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice .select2-search-choice-close{display:none;background:0 0}.select2-result-selectable .select2-match,.select2-result-unselectable .select2-match{text-decoration:underline}.select2-offscreen,.select2-offscreen:focus{clip:rect(0 0 0 0)!important;width:1px!important;height:1px!important;border:0!important;margin:0!important;padding:0!important;overflow:hidden!important;position:absolute!important;outline:0!important;left:0!important;top:0!important}.select2-display-none{display:none}.select2-measure-scrollbar{position:absolute;top:-10000px;left:-10000px;width:100px;height:100px;overflow:scroll}@media only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (min-resolution:2dppx){.select2-search input{background-image:url(../images/select2x2.png)!important;background-repeat:no-repeat!important;background-size:60px 40px!important;background-position:100% -21px!important}}
\ No newline at end of file
+.select2-container{box-sizing:border-box;display:inline-block;margin:0;position:relative;vertical-align:middle}.select2-container .select2-selection--single{box-sizing:border-box;cursor:pointer;display:block;height:28px;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--single .select2-selection__rendered{display:block;padding-left:8px;padding-right:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-selection--single .select2-selection__clear{position:relative}.select2-container[dir=rtl] .select2-selection--single .select2-selection__rendered{padding-right:8px;padding-left:20px}.select2-container .select2-selection--multiple{box-sizing:border-box;cursor:pointer;display:block;min-height:32px;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--multiple .select2-selection__rendered{display:inline-block;overflow:hidden;padding-left:8px;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-search--inline{float:left}.select2-container .select2-search--inline .select2-search__field{box-sizing:border-box;border:none;font-size:100%;margin-top:5px;padding:0}.select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-dropdown{background-color:#fff;border:1px solid #aaa;border-radius:4px;box-sizing:border-box;display:block;position:absolute;left:-100000px;width:100%;z-index:1051}.select2-results{display:block}.select2-results__options{list-style:none;margin:0;padding:0}.select2-results__option{padding:6px;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-user-select:none}.select2-results__option[aria-selected]{cursor:pointer}.select2-container--open .select2-dropdown{left:0}.select2-container--open .select2-dropdown--above{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--open .select2-dropdown--below{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-search--dropdown{display:block;padding:4px}.select2-search--dropdown .select2-search__field{padding:4px;width:100%;box-sizing:border-box}.select2-search--dropdown .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-search--dropdown.select2-search--hide{display:none}.select2-close-mask{border:0;margin:0;padding:0;display:block;position:fixed;left:0;top:0;min-height:100%;min-width:100%;height:auto;width:auto;opacity:0;z-index:99;background-color:#fff;filter:alpha(opacity=0)}.select2-hidden-accessible{border:0!important;clip:rect(0 0 0 0)!important;height:1px!important;margin:-1px!important;overflow:hidden!important;padding:0!important;position:absolute!important;width:1px!important}.select2-container--classic .select2-results>.select2-results__options,.select2-container--default .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--default .select2-selection--single{background-color:#fff;border:1px solid #aaa;border-radius:4px}.select2-container--default .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--default .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:700}.select2-container--default .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--default .select2-selection--single .select2-selection__arrow{height:26px;position:absolute;top:1px;right:1px;width:20px}.select2-container--default .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent;border-style:solid;border-width:5px 4px 0;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--default[dir=rtl] .select2-selection--single .select2-selection__clear{float:left}.select2-container--default[dir=rtl] .select2-selection--single .select2-selection__arrow{left:1px;right:auto}.select2-container--default.select2-container--disabled .select2-selection--single{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear{display:none}.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888;border-width:0 4px 5px}.select2-container--default .select2-selection--multiple{background-color:#fff;border:1px solid #aaa;border-radius:4px;cursor:text}.select2-container--default .select2-selection--multiple .select2-selection__rendered{box-sizing:border-box;list-style:none;margin:0;padding:0 5px;width:100%}.select2-container--default .select2-selection--multiple .select2-selection__rendered li{list-style:none}.select2-container--default .select2-selection--multiple .select2-selection__placeholder{color:#999;margin-top:5px;float:left}.select2-container--default .select2-selection--multiple .select2-selection__clear{cursor:pointer;float:right;font-weight:700;margin-top:5px;margin-right:10px}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{color:#999;cursor:pointer;display:inline-block;font-weight:700;margin-right:2px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover{color:#333}.select2-container--default[dir=rtl] .select2-selection--multiple .select2-search--inline,.select2-container--default[dir=rtl] .select2-selection--multiple .select2-selection__choice,.select2-container--default[dir=rtl] .select2-selection--multiple .select2-selection__placeholder{float:right}.select2-container--default[dir=rtl] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto}.select2-container--default[dir=rtl] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--default.select2-container--focus .select2-selection--multiple{border:1px solid #000;outline:0}.select2-container--default.select2-container--disabled .select2-selection--multiple{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection__choice__remove{display:none}.select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple,.select2-container--default.select2-container--open.select2-container--above .select2-selection--single{border-top-left-radius:0;border-top-right-radius:0}.select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple,.select2-container--default.select2-container--open.select2-container--below .select2-selection--single{border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--default .select2-search--dropdown .select2-search__field{border:1px solid #aaa}.select2-container--default .select2-search--inline .select2-search__field{background:0 0;border:none;outline:0;box-shadow:none;-webkit-appearance:textfield}.select2-container--default .select2-results__option[role=group]{padding:0}.select2-container--default .select2-results__option[aria-disabled=true]{color:#999}.select2-container--default .select2-results__option[aria-selected=true]{background-color:#ddd}.select2-container--default .select2-results__option .select2-results__option{padding-left:1em}.select2-container--default .select2-results__option .select2-results__option .select2-results__group{padding-left:0}.select2-container--default .select2-results__option .select2-results__option .select2-results__option{margin-left:-1em;padding-left:2em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-2em;padding-left:3em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-3em;padding-left:4em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-4em;padding-left:5em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-5em;padding-left:6em}.select2-container--default .select2-results__option--highlighted[aria-selected]{background-color:#0073aa;color:#fff}.select2-container--default .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic .select2-selection--single{background-color:#f7f7f7;border:1px solid #aaa;border-radius:4px;outline:0;background-image:-webkit-linear-gradient(top,#fff 50%,#eee 100%);background-image:linear-gradient(to bottom,#fff 50%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic .select2-selection--single:focus{border:1px solid #0073aa}.select2-container--classic .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--classic .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:700;margin-right:10px}.select2-container--classic .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--classic .select2-selection--single .select2-selection__arrow{background-color:#ddd;border:none;border-left:1px solid #aaa;border-top-right-radius:4px;border-bottom-right-radius:4px;height:26px;position:absolute;top:1px;right:1px;width:20px;background-image:-webkit-linear-gradient(top,#eee 50%,#ccc 100%);background-image:linear-gradient(to bottom,#eee 50%,#ccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0)}.select2-container--classic .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent;border-style:solid;border-width:5px 4px 0;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--classic[dir=rtl] .select2-selection--single .select2-selection__clear{float:left}.select2-container--classic[dir=rtl] .select2-selection--single .select2-selection__arrow{border:none;border-right:1px solid #aaa;border-radius:4px 0 0 4px;left:1px;right:auto}.select2-container--classic.select2-container--open .select2-selection--single{border:1px solid #0073aa}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow{background:0 0;border:none}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888;border-width:0 4px 5px}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single{border-top:none;border-top-left-radius:0;border-top-right-radius:0;background-image:-webkit-linear-gradient(top,#fff 0,#eee 50%);background-image:linear-gradient(to bottom,#fff 0,#eee 50%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0;background-image:-webkit-linear-gradient(top,#eee 50%,#fff 100%);background-image:linear-gradient(to bottom,#eee 50%,#fff 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0)}.select2-container--classic .select2-selection--multiple{background-color:#fff;border:1px solid #aaa;border-radius:4px;cursor:text;outline:0}.select2-container--classic .select2-selection--multiple:focus{border:1px solid #0073aa}.select2-container--classic .select2-selection--multiple .select2-selection__rendered{list-style:none;margin:0;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__clear{display:none}.select2-container--classic .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove{color:#888;cursor:pointer;display:inline-block;font-weight:700;margin-right:2px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover{color:#555}.select2-container--classic[dir=rtl] .select2-selection--multiple .select2-selection__choice{float:right;margin-left:5px;margin-right:auto}.select2-container--classic[dir=rtl] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--classic.select2-container--open .select2-selection--multiple{border:1px solid #0073aa}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--classic .select2-search--dropdown .select2-search__field{border:1px solid #aaa;outline:0}.select2-container--classic .select2-search--inline .select2-search__field{outline:0;box-shadow:none}.select2-container--classic .select2-dropdown{background-color:#fff;border:1px solid transparent}.select2-container--classic .select2-dropdown--above{border-bottom:none}.select2-container--classic .select2-dropdown--below{border-top:none}.select2-container--classic .select2-results__option[role=group]{padding:0}.select2-container--classic .select2-results__option[aria-disabled=true]{color:grey}.select2-container--classic .select2-results__option--highlighted[aria-selected]{background-color:#3875d7;color:#fff}.select2-container--classic .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic.select2-container--open .select2-dropdown{border-color:#0073aa}
\ No newline at end of file
diff --git a/assets/css/select2.scss b/assets/css/select2.scss
index 08b2abc3ff5..a716d0a60a8 100644
--- a/assets/css/select2.scss
+++ b/assets/css/select2.scss
@@ -1,656 +1,484 @@
-/*
-Version: 3.5.2 Timestamp: Sat Nov  1 14:43:36 EDT 2014
-*/
 .select2-container {
-    margin: 0;
-    position: relative;
-    display: block !important;
-    zoom: 1;
-    *display: inline;
-    vertical-align: middle;
-}
-
-.select2-container,
-.select2-drop,
-.select2-search,
-.select2-search input {
-  /*
-    Force border-box so that % widths fit the parent
-    container without overlap because of margin/padding.
-    More Info : http://www.quirksmode.org/css/box.html
-  */
-  -webkit-box-sizing: border-box; /* webkit */
-     -moz-box-sizing: border-box; /* firefox */
-          box-sizing: border-box; /* css3 */
-}
-
-.select2-container .select2-choice {
-    display: block;
-    padding: 0 0 0 8px;
-    overflow: hidden;
-    position: relative;
-
-    border: 1px solid #ccc;
-    white-space: nowrap;
-    color: #444;
-    text-decoration: none;
-
-    border-radius: 3px;
-
-    background-clip: padding-box;
-
-    -webkit-touch-callout: none;
-      -webkit-user-select: none;
-         -moz-user-select: none;
-          -ms-user-select: none;
-              user-select: none;
-
-    background-color: #fff;
-    font-weight: 400;
-}
-
-html[dir="rtl"] .select2-container .select2-choice {
-    padding: 0 8px 0 0;
-}
-
-.select2-container.select2-drop-above .select2-choice {
-    border-bottom-color: #ccc;
-
-    border-radius: 0 0 4px 4px;
-}
-
-.select2-container.select2-allowclear .select2-choice .select2-chosen {
-    margin-right: 42px;
-}
-
-.select2-container .select2-choice > .select2-chosen {
-    margin-right: 26px;
-    display: block;
-    overflow: hidden;
-
-    white-space: nowrap;
-
-    text-overflow: ellipsis;
-    float: none;
-    width: auto;
-}
-
-html[dir="rtl"] .select2-container .select2-choice > .select2-chosen {
-    margin-left: 26px;
-    margin-right: 0;
-}
-
-.select2-container .select2-choice abbr {
-    display: none;
-    width: 12px;
-    height: 12px;
-    position: absolute;
-    right: 24px;
-    top: 5px;
-
-    font-size: 1px;
-    text-decoration: none;
-
-    border: 0;
-    background: url('../images/select2.png') right top no-repeat;
+  box-sizing: border-box;
+  display: inline-block;
+  margin: 0;
+  position: relative;
+  vertical-align: middle; }
+  .select2-container .select2-selection--single {
+    box-sizing: border-box;
     cursor: pointer;
-    outline: 0;
-}
-
-.select2-container.select2-allowclear .select2-choice abbr {
-    display: inline-block;
-}
-
-.select2-container .select2-choice abbr:hover {
-    background-position: right -11px;
-    cursor: pointer;
-}
-
-.select2-drop-mask {
-    border: 0;
-    margin: 0;
-    padding: 0;
-    position: fixed;
-    left: 0;
-    top: 0;
-    min-height: 100%;
-    min-width: 100%;
-    height: auto;
-    width: auto;
-    opacity: 0;
-    z-index: 9998;
-    /* styles required for IE to work */
-    background-color: #fff;
-    filter: alpha(opacity=0);
-}
-
-.select2-drop {
-    width: 100%;
-    margin-top: -1px;
-    position: absolute;
-    z-index: 9999;
-    top: 100%;
-
-    background: #fff;
-    color: #000;
-    border: 1px solid #ccc;
-    border-top: 0;
-
-    border-radius: 0 0 3px 3px;
-}
-
-.select2-drop.select2-drop-above {
-    margin-top: 1px;
-    border-top: 1px solid #ccc;
-    border-bottom: 0;
-
-    border-radius: 3px 3px 0 0;
-
-    //-webkit-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
-    //        box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
-}
-
-.select2-drop-active {
-    border: 1px solid #666;
-    border-top: none;
-}
-
-.select2-drop.select2-drop-above.select2-drop-active {
-    border-top: 1px solid #666;
-}
-
-.select2-drop-auto-width {
-    border-top: 1px solid #ccc;
-    width: auto;
-}
-
-.select2-drop-auto-width .select2-search {
-    padding-top: 4px;
-}
-
-.select2-container .select2-choice .select2-arrow {
-    display: inline-block;
-    width: 18px;
-    height: 100%;
-    position: absolute;
-    right: 0;
-    top: 0;
-
-    border-radius: 0 3px 3px 0;
-
-    background-clip: padding-box;
-}
-
-html[dir="rtl"] .select2-container .select2-choice .select2-arrow {
-    left: 0;
-    right: auto;
-
-    border-radius: 3px 0 0 3px;
-}
-
-.select2-container .select2-choice .select2-arrow b {
     display: block;
-    width: 100%;
-    height: 100%;
-    //background: url('../images/select2.png') no-repeat 0 1px;
-    position: relative;
-
-    &:after {
-      position: absolute;
+    height: 28px;
+    user-select: none;
+    -webkit-user-select: none; }
+    .select2-container .select2-selection--single .select2-selection__rendered {
       display: block;
-      content: "";
-      top: 50%;
-      left: 50%;
-      border: 4px solid transparent;
-      border-top-color: #666;
-      margin-left: -7px;
-      margin-top: -2px;
-    }
-}
+      padding-left: 8px;
+      padding-right: 20px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap; }
+    .select2-container .select2-selection--single .select2-selection__clear {
+      position: relative; }
+  .select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered {
+    padding-right: 8px;
+    padding-left: 20px; }
+  .select2-container .select2-selection--multiple {
+    box-sizing: border-box;
+    cursor: pointer;
+    display: block;
+    min-height: 32px;
+    user-select: none;
+    -webkit-user-select: none; }
+    .select2-container .select2-selection--multiple .select2-selection__rendered {
+      display: inline-block;
+      overflow: hidden;
+      padding-left: 8px;
+      text-overflow: ellipsis;
+      white-space: nowrap; }
+  .select2-container .select2-search--inline {
+    float: left; }
+    .select2-container .select2-search--inline .select2-search__field {
+      box-sizing: border-box;
+      border: none;
+      font-size: 100%;
+      margin-top: 5px;
+      padding: 0; }
+      .select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button {
+        -webkit-appearance: none; }
 
-html[dir="rtl"] .select2-container .select2-choice .select2-arrow b {
-    //background-position: 2px 1px;
-}
+.select2-dropdown {
+  background-color: white;
+  border: 1px solid #aaa;
+  border-radius: 4px;
+  box-sizing: border-box;
+  display: block;
+  position: absolute;
+  left: -100000px;
+  width: 100%;
+  z-index: 1051; }
 
-.select2-search {
-    display: inline-block;
+.select2-results {
+  display: block; }
+
+.select2-results__options {
+  list-style: none;
+  margin: 0;
+  padding: 0; }
+
+.select2-results__option {
+  padding: 6px;
+  user-select: none;
+  -webkit-user-select: none; }
+  .select2-results__option[aria-selected] {
+    cursor: pointer; }
+
+.select2-container--open .select2-dropdown {
+  left: 0; }
+
+.select2-container--open .select2-dropdown--above {
+  border-bottom: none;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0; }
+
+.select2-container--open .select2-dropdown--below {
+  border-top: none;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0; }
+
+.select2-search--dropdown {
+  display: block;
+  padding: 4px; }
+  .select2-search--dropdown .select2-search__field {
+    padding: 4px;
     width: 100%;
-    margin: 0;
-    padding-left: 4px;
-    padding-right: 4px;
+    box-sizing: border-box; }
+    .select2-search--dropdown .select2-search__field::-webkit-search-cancel-button {
+      -webkit-appearance: none; }
+  .select2-search--dropdown.select2-search--hide {
+    display: none; }
 
-    position: relative;
-    z-index: 10000;
-
-    white-space: nowrap;
-
-    //box-shadow: 0 1px 2px rgba(0,0,0,0.2);
-    padding-bottom: 4px;
-}
-
-.select2-search input {
-    width: 100%;
-    height: auto !important;
-    padding: 4px 20px 4px 5px !important;
-    margin: 0;
-
-    outline: 0;
-    font-family: sans-serif;
-    font-size: 1em;
-
-    border: 1px solid #ccc;
-
-    -webkit-box-shadow: none;
-            box-shadow: none;
-
-    background: #fff url('../images/select2.png') no-repeat 100% -22px;
-}
-
-html[dir="rtl"] .select2-search input {
-    padding: 4px 5px 4px 20px;
-
-    background: #fff url('../images/select2.png') no-repeat -37px -22px;
-}
-
-.select2-drop.select2-drop-above .select2-search input {
-    margin-top: 4px;
-}
-
-.select2-search input.select2-active {
-    background: #fff url('../images/select2-spinner.gif') no-repeat 100%;
-}
-
-.select2-container-active .select2-choice,
-.select2-container-active .select2-choices {
-    border: 1px solid #666;
-    outline: none;
-}
-
-.select2-dropdown-open .select2-choice {
-    border-bottom-color: transparent;
-    -webkit-box-shadow: 0 1px 0 #fff inset;
-            box-shadow: 0 1px 0 #fff inset;
-
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 0;
-
-    .select2-arrow {
-      b {
-        &:after {
-          border-top-color: transparent;
-          border-bottom-color: #666;
-          margin-top: -6px;
-        }
-      }
-    }
-}
-
-.select2-dropdown-open.select2-drop-above .select2-choice,
-.select2-dropdown-open.select2-drop-above .select2-choices {
-    border: 1px solid #666;
-    border-top-color: transparent;
-}
-
-.select2-dropdown-open .select2-choice .select2-arrow {
-    background: transparent;
-    border-left: none;
-    filter: none;
-}
-html[dir="rtl"] .select2-dropdown-open .select2-choice .select2-arrow {
-    border-right: none;
-}
-
-.select2-dropdown-open .select2-choice .select2-arrow b {
-    background-position: -18px 1px;
-}
-
-html[dir="rtl"] .select2-dropdown-open .select2-choice .select2-arrow b {
-    background-position: -16px 1px;
-}
+.select2-close-mask {
+  border: 0;
+  margin: 0;
+  padding: 0;
+  display: block;
+  position: fixed;
+  left: 0;
+  top: 0;
+  min-height: 100%;
+  min-width: 100%;
+  height: auto;
+  width: auto;
+  opacity: 0;
+  z-index: 99;
+  background-color: #fff;
+  filter: alpha(opacity=0); }
 
 .select2-hidden-accessible {
-    border: 0;
-    clip: rect(0 0 0 0);
-    height: 1px;
-    margin: -1px;
-    overflow: hidden;
-    padding: 0;
-    position: absolute;
-    width: 1px;
-}
+  border: 0 !important;
+  clip: rect(0 0 0 0) !important;
+  height: 1px !important;
+  margin: -1px !important;
+  overflow: hidden !important;
+  padding: 0 !important;
+  position: absolute !important;
+  width: 1px !important; }
 
-/* results */
-.select2-results {
-    max-height: 200px;
-    padding: 4px;
-    margin: 0;
-    position: relative;
-    overflow-x: hidden;
-    overflow-y: auto;
-    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-    background: #fafafa;
-}
-
-html[dir="rtl"] .select2-results {
-    padding: 0 4px 0 0;
-    margin: 4px 0 4px 4px;
-}
-
-.select2-results ul.select2-result-sub {
-    margin: 0;
-    padding-left: 0;
-}
-
-.select2-results li {
-    list-style: none;
-    display: list-item;
-    background-image: none;
-    margin: 3px 0;
-}
-
-.select2-results li.select2-result-with-children > .select2-result-label {
-    font-weight: bold;
-}
-
-.select2-results .select2-result-label {
-    padding: 5px 7px;
-    margin: 0;
+.select2-container--default .select2-selection--single {
+  background-color: #fff;
+  border: 1px solid #aaa;
+  border-radius: 4px; }
+  .select2-container--default .select2-selection--single .select2-selection__rendered {
+    color: #444;
+    line-height: 28px; }
+  .select2-container--default .select2-selection--single .select2-selection__clear {
     cursor: pointer;
-
-    min-height: 1em;
-
-    -webkit-touch-callout: none;
-      -webkit-user-select: none;
-         -moz-user-select: none;
-          -ms-user-select: none;
-              user-select: none;
-}
-
-.select2-results-dept-1 .select2-result-label { padding-left: 20px }
-.select2-results-dept-2 .select2-result-label { padding-left: 40px }
-.select2-results-dept-3 .select2-result-label { padding-left: 60px }
-.select2-results-dept-4 .select2-result-label { padding-left: 80px }
-.select2-results-dept-5 .select2-result-label { padding-left: 100px }
-.select2-results-dept-6 .select2-result-label { padding-left: 110px }
-.select2-results-dept-7 .select2-result-label { padding-left: 120px }
-
-.select2-results .select2-highlighted {
-    background: #f1f1f1;
-    color: #000;
-    border-radius: 3px;
-}
-
-.select2-results li em {
-    background: #feffde;
-    font-style: normal;
-}
-
-.select2-results .select2-highlighted em {
-    background: transparent;
-}
-
-.select2-results .select2-highlighted ul {
-    background: #fff;
-    color: #000;
-}
-
-.select2-results .select2-no-results,
-.select2-results .select2-searching,
-.select2-results .select2-ajax-error,
-.select2-results .select2-selection-limit {
-    background: #f4f4f4;
-    display: list-item;
-    padding-left: 5px;
-}
-
-/*
-disabled look for disabled choices in the results dropdown
-*/
-.select2-results .select2-disabled.select2-highlighted {
-    color: #666;
-    background: #f4f4f4;
-    display: list-item;
-    cursor: default;
-}
-.select2-results .select2-disabled {
-  background: #f4f4f4;
-  display: list-item;
-  cursor: default;
-}
-
-.select2-results .select2-selected {
-    display: none;
-}
-
-.select2-more-results.select2-active {
-    background: #f4f4f4 url('../images/select2-spinner.gif') no-repeat 100%;
-}
-
-.select2-results .select2-ajax-error {
-    background: rgba(255, 50, 50, .2);
-}
-
-.select2-more-results {
-    background: #f4f4f4;
-    display: list-item;
-}
-
-/* disabled styles */
-
-.select2-container.select2-container-disabled .select2-choice {
-    background-color: #f4f4f4;
-    background-image: none;
-    border: 1px solid #ddd;
-    cursor: default;
-}
-
-.select2-container.select2-container-disabled .select2-choice .select2-arrow {
-    background-color: #f4f4f4;
-    background-image: none;
-    border-left: 0;
-}
-
-.select2-container.select2-container-disabled .select2-choice abbr {
-    display: none;
-}
-
-
-/* multiselect */
-
-.select2-container-multi .select2-choices {
-    height: auto !important;
-    height: 1%;
-    margin: 0;
-    padding: 0 5px 0 0;
-    position: relative;
-
-    border: 1px solid #ccc;
-    cursor: text;
-    overflow: hidden;
-
-    background-color: #fff;
-}
-
-html[dir="rtl"] .select2-container-multi .select2-choices {
-    padding: 0 0 0 5px;
-}
-
-.select2-locked {
-  padding: 3px 5px 3px 5px !important;
-}
-
-.select2-container-multi .select2-choices {
-    min-height: 26px;
-}
-
-.select2-container-multi.select2-container-active .select2-choices {
-    border: 1px solid #666;
-    outline: none;
-
-    //-webkit-box-shadow: 0 0 5px rgba(0, 0, 0, .3);
-    //        box-shadow: 0 0 5px rgba(0, 0, 0, .3);
-}
-.select2-container-multi .select2-choices li {
-    float: left;
-    list-style: none;
-}
-html[dir="rtl"] .select2-container-multi .select2-choices li
-{
     float: right;
-}
-.select2-container-multi .select2-choices .select2-search-field {
+    font-weight: bold; }
+  .select2-container--default .select2-selection--single .select2-selection__placeholder {
+    color: #999; }
+  .select2-container--default .select2-selection--single .select2-selection__arrow {
+    height: 26px;
+    position: absolute;
+    top: 1px;
+    right: 1px;
+    width: 20px; }
+    .select2-container--default .select2-selection--single .select2-selection__arrow b {
+      border-color: #888 transparent transparent transparent;
+      border-style: solid;
+      border-width: 5px 4px 0 4px;
+      height: 0;
+      left: 50%;
+      margin-left: -4px;
+      margin-top: -2px;
+      position: absolute;
+      top: 50%;
+      width: 0; }
+
+.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear {
+  float: left; }
+
+.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow {
+  left: 1px;
+  right: auto; }
+
+.select2-container--default.select2-container--disabled .select2-selection--single {
+  background-color: #eee;
+  cursor: default; }
+  .select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear {
+    display: none; }
+
+.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b {
+  border-color: transparent transparent #888 transparent;
+  border-width: 0 4px 5px 4px; }
+
+.select2-container--default .select2-selection--multiple {
+  background-color: white;
+  border: 1px solid #aaa;
+  border-radius: 4px;
+  cursor: text; }
+  .select2-container--default .select2-selection--multiple .select2-selection__rendered {
+    box-sizing: border-box;
+    list-style: none;
     margin: 0;
-    padding: 0;
-    white-space: nowrap;
-}
-
-.select2-container-multi .select2-choices .select2-search-field input {
-    padding: 5px;
-    margin: 1px 0;
-    font-family: sans-serif;
-    outline: 0;
-    border: 0;
-    -webkit-box-shadow: none;
-            box-shadow: none;
-    background: transparent !important;
-}
-
-.select2-container-multi .select2-choices .select2-search-field input.select2-active {
-    background: #fff url('../images/select2-spinner.gif') no-repeat 100% !important;
-}
-
-.select2-default {
-    color: #999 !important;
-}
-
-.select2-container-multi .select2-choices .select2-search-choice {
-    padding: 5px 8px 5px 24px;
-    margin: 3px 0 3px 5px;
-    position: relative;
-
-    line-height: 15px;
-    color: #333;
-    cursor: default;
-    border-radius: 2px;
-
-    background-clip: padding-box;
-
-    -webkit-touch-callout: none;
-      -webkit-user-select: none;
-         -moz-user-select: none;
-          -ms-user-select: none;
-              user-select: none;
-
+    padding: 0 5px;
+    width: 100%; }
+    .select2-container--default .select2-selection--multiple .select2-selection__rendered li {
+      list-style: none; }
+  .select2-container--default .select2-selection--multiple .select2-selection__placeholder {
+    color: #999;
+    margin-top: 5px;
+    float: left; }
+  .select2-container--default .select2-selection--multiple .select2-selection__clear {
+    cursor: pointer;
+    float: right;
+    font-weight: bold;
+    margin-top: 5px;
+    margin-right: 10px; }
+  .select2-container--default .select2-selection--multiple .select2-selection__choice {
     background-color: #e4e4e4;
-}
-html[dir="rtl"] .select2-container-multi .select2-choices .select2-search-choice
-{
-    margin: 3px 5px 3px 0;
-    padding: 5px 24px 5px 8px;
-}
-.select2-container-multi .select2-choices .select2-search-choice .select2-chosen {
+    border: 1px solid #aaa;
+    border-radius: 4px;
     cursor: default;
-}
-.select2-container-multi .select2-choices .select2-search-choice-focus {
-    background: #d4d4d4;
-}
+    float: left;
+    margin-right: 5px;
+    margin-top: 5px;
+    padding: 0 5px; }
+  .select2-container--default .select2-selection--multiple .select2-selection__choice__remove {
+    color: #999;
+    cursor: pointer;
+    display: inline-block;
+    font-weight: bold;
+    margin-right: 2px; }
+    .select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover {
+      color: #333; }
 
-.select2-search-choice-close {
-    display: block;
-    width: 12px;
-    height: 13px;
+.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice, .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder, .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline {
+  float: right; }
+
+.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
+  margin-left: 5px;
+  margin-right: auto; }
+
+.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove {
+  margin-left: 2px;
+  margin-right: auto; }
+
+.select2-container--default.select2-container--focus .select2-selection--multiple {
+  border: solid black 1px;
+  outline: 0; }
+
+.select2-container--default.select2-container--disabled .select2-selection--multiple {
+  background-color: #eee;
+  cursor: default; }
+
+.select2-container--default.select2-container--disabled .select2-selection__choice__remove {
+  display: none; }
+
+.select2-container--default.select2-container--open.select2-container--above .select2-selection--single, .select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple {
+  border-top-left-radius: 0;
+  border-top-right-radius: 0; }
+
+.select2-container--default.select2-container--open.select2-container--below .select2-selection--single, .select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple {
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0; }
+
+.select2-container--default .select2-search--dropdown .select2-search__field {
+  border: 1px solid #aaa; }
+
+.select2-container--default .select2-search--inline .select2-search__field {
+  background: transparent;
+  border: none;
+  outline: 0;
+  box-shadow: none;
+  -webkit-appearance: textfield; }
+
+.select2-container--default .select2-results > .select2-results__options {
+  max-height: 200px;
+  overflow-y: auto; }
+
+.select2-container--default .select2-results__option[role=group] {
+  padding: 0; }
+
+.select2-container--default .select2-results__option[aria-disabled=true] {
+  color: #999; }
+
+.select2-container--default .select2-results__option[aria-selected=true] {
+  background-color: #ddd; }
+
+.select2-container--default .select2-results__option .select2-results__option {
+  padding-left: 1em; }
+  .select2-container--default .select2-results__option .select2-results__option .select2-results__group {
+    padding-left: 0; }
+  .select2-container--default .select2-results__option .select2-results__option .select2-results__option {
+    margin-left: -1em;
+    padding-left: 2em; }
+    .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+      margin-left: -2em;
+      padding-left: 3em; }
+      .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+        margin-left: -3em;
+        padding-left: 4em; }
+        .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+          margin-left: -4em;
+          padding-left: 5em; }
+          .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+            margin-left: -5em;
+            padding-left: 6em; }
+
+.select2-container--default .select2-results__option--highlighted[aria-selected] {
+  background-color: #0073aa;
+  color: white; }
+
+.select2-container--default .select2-results__group {
+  cursor: default;
+  display: block;
+  padding: 6px; }
+
+.select2-container--classic .select2-selection--single {
+  background-color: #f7f7f7;
+  border: 1px solid #aaa;
+  border-radius: 4px;
+  outline: 0;
+  background-image: -webkit-linear-gradient(top, white 50%, #eeeeee 100%);
+  background-image: -o-linear-gradient(top, white 50%, #eeeeee 100%);
+  background-image: linear-gradient(to bottom, white 50%, #eeeeee 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0); }
+  .select2-container--classic .select2-selection--single:focus {
+    border: 1px solid #0073aa; }
+  .select2-container--classic .select2-selection--single .select2-selection__rendered {
+    color: #444;
+    line-height: 28px; }
+  .select2-container--classic .select2-selection--single .select2-selection__clear {
+    cursor: pointer;
+    float: right;
+    font-weight: bold;
+    margin-right: 10px; }
+  .select2-container--classic .select2-selection--single .select2-selection__placeholder {
+    color: #999; }
+  .select2-container--classic .select2-selection--single .select2-selection__arrow {
+    background-color: #ddd;
+    border: none;
+    border-left: 1px solid #aaa;
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 4px;
+    height: 26px;
     position: absolute;
-    right: 7px;
-    top: 6px;
+    top: 1px;
+    right: 1px;
+    width: 20px;
+    background-image: -webkit-linear-gradient(top, #eeeeee 50%, #cccccc 100%);
+    background-image: -o-linear-gradient(top, #eeeeee 50%, #cccccc 100%);
+    background-image: linear-gradient(to bottom, #eeeeee 50%, #cccccc 100%);
+    background-repeat: repeat-x;
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0); }
+    .select2-container--classic .select2-selection--single .select2-selection__arrow b {
+      border-color: #888 transparent transparent transparent;
+      border-style: solid;
+      border-width: 5px 4px 0 4px;
+      height: 0;
+      left: 50%;
+      margin-left: -4px;
+      margin-top: -2px;
+      position: absolute;
+      top: 50%;
+      width: 0; }
 
-    font-size: 1px;
-    outline: none;
-    background: url('../images/select2.png') right top no-repeat;
-}
-html[dir="rtl"] .select2-search-choice-close {
-    right: auto;
-    left: 7px;
-}
+.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__clear {
+  float: left; }
 
-.select2-container-multi .select2-search-choice-close {
-    left: 7px;
-}
+.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__arrow {
+  border: none;
+  border-right: 1px solid #aaa;
+  border-radius: 0;
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  left: 1px;
+  right: auto; }
 
-html[dir="rtl"] .select2-container-multi .select2-search-choice-close {
-    left: auto;
-    right: 7px;
-}
+.select2-container--classic.select2-container--open .select2-selection--single {
+  border: 1px solid #0073aa; }
+  .select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow {
+    background: transparent;
+    border: none; }
+    .select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b {
+      border-color: transparent transparent #888 transparent;
+      border-width: 0 4px 5px 4px; }
 
-.select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover {
-  background-position: right -11px;
-}
-.select2-container-multi .select2-choices .select2-search-choice-focus .select2-search-choice-close {
-    background-position: right -11px;
-}
+.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single {
+  border-top: none;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+  background-image: -webkit-linear-gradient(top, white 0%, #eeeeee 50%);
+  background-image: -o-linear-gradient(top, white 0%, #eeeeee 50%);
+  background-image: linear-gradient(to bottom, white 0%, #eeeeee 50%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0); }
 
-/* disabled styles */
-.select2-container-multi.select2-container-disabled .select2-choices {
-    background-color: #f4f4f4;
-    background-image: none;
-    border: 1px solid #ddd;
+.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single {
+  border-bottom: none;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
+  background-image: -webkit-linear-gradient(top, #eeeeee 50%, white 100%);
+  background-image: -o-linear-gradient(top, #eeeeee 50%, white 100%);
+  background-image: linear-gradient(to bottom, #eeeeee 50%, white 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0); }
+
+.select2-container--classic .select2-selection--multiple {
+  background-color: white;
+  border: 1px solid #aaa;
+  border-radius: 4px;
+  cursor: text;
+  outline: 0; }
+  .select2-container--classic .select2-selection--multiple:focus {
+    border: 1px solid #0073aa; }
+  .select2-container--classic .select2-selection--multiple .select2-selection__rendered {
+    list-style: none;
+    margin: 0;
+    padding: 0 5px; }
+  .select2-container--classic .select2-selection--multiple .select2-selection__clear {
+    display: none; }
+  .select2-container--classic .select2-selection--multiple .select2-selection__choice {
+    background-color: #e4e4e4;
+    border: 1px solid #aaa;
+    border-radius: 4px;
     cursor: default;
-}
+    float: left;
+    margin-right: 5px;
+    margin-top: 5px;
+    padding: 0 5px; }
+  .select2-container--classic .select2-selection--multiple .select2-selection__choice__remove {
+    color: #888;
+    cursor: pointer;
+    display: inline-block;
+    font-weight: bold;
+    margin-right: 2px; }
+    .select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover {
+      color: #555; }
 
-.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice {
-    padding: 3px 5px 3px 5px;
-    border: 1px solid #ddd;
-    background-image: none;
-    background-color: #f4f4f4;
-}
+.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
+  float: right; }
 
-.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice .select2-search-choice-close {    display: none;
-    background: none;
-}
-/* end multiselect */
+.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
+  margin-left: 5px;
+  margin-right: auto; }
 
+.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove {
+  margin-left: 2px;
+  margin-right: auto; }
 
-.select2-result-selectable .select2-match,
-.select2-result-unselectable .select2-match {
-    text-decoration: underline;
-}
+.select2-container--classic.select2-container--open .select2-selection--multiple {
+  border: 1px solid #0073aa; }
 
-.select2-offscreen, .select2-offscreen:focus {
-    clip: rect(0 0 0 0) !important;
-    width: 1px !important;
-    height: 1px !important;
-    border: 0 !important;
-    margin: 0 !important;
-    padding: 0 !important;
-    overflow: hidden !important;
-    position: absolute !important;
-    outline: 0 !important;
-    left: 0px !important;
-    top: 0px !important;
-}
+.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple {
+  border-top: none;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0; }
 
-.select2-display-none {
-    display: none;
-}
+.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple {
+  border-bottom: none;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0; }
 
-.select2-measure-scrollbar {
-    position: absolute;
-    top: -10000px;
-    left: -10000px;
-    width: 100px;
-    height: 100px;
-    overflow: scroll;
-}
+.select2-container--classic .select2-search--dropdown .select2-search__field {
+  border: 1px solid #aaa;
+  outline: 0; }
 
-/* Retina-ize icons */
+.select2-container--classic .select2-search--inline .select2-search__field {
+  outline: 0;
+  box-shadow: none; }
 
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 2dppx)  {
-    .select2-search input {
-        background-image: url('../images/select2x2.png') !important;
-        background-repeat: no-repeat !important;
-        background-size: 60px 40px !important;
-    }
+.select2-container--classic .select2-dropdown {
+  background-color: white;
+  border: 1px solid transparent; }
 
-    .select2-search input {
-        background-position: 100% -21px !important;
-    }
-}
\ No newline at end of file
+.select2-container--classic .select2-dropdown--above {
+  border-bottom: none; }
+
+.select2-container--classic .select2-dropdown--below {
+  border-top: none; }
+
+.select2-container--classic .select2-results > .select2-results__options {
+  max-height: 200px;
+  overflow-y: auto; }
+
+.select2-container--classic .select2-results__option[role=group] {
+  padding: 0; }
+
+.select2-container--classic .select2-results__option[aria-disabled=true] {
+  color: grey; }
+
+.select2-container--classic .select2-results__option--highlighted[aria-selected] {
+  background-color: #3875d7;
+  color: white; }
+
+.select2-container--classic .select2-results__group {
+  cursor: default;
+  display: block;
+  padding: 6px; }
+
+.select2-container--classic.select2-container--open .select2-dropdown {
+  border-color: #0073aa; }
diff --git a/assets/css/twenty-seventeen-rtl.css b/assets/css/twenty-seventeen-rtl.css
new file mode 100644
index 00000000000..22fc3240f59
--- /dev/null
+++ b/assets/css/twenty-seventeen-rtl.css
@@ -0,0 +1 @@
+@charset "UTF-8";.price del,ul.products li.product .button.loading{opacity:.5}.onsale,.woocommerce-loop-product__title{text-transform:uppercase;font-weight:800}@font-face{font-family:star;src:url(../fonts/star.eot);src:url(../fonts/star.eot?#iefix) format("embedded-opentype"),url(../fonts/star.woff) format("woff"),url(../fonts/star.ttf) format("truetype"),url(../fonts/star.svg#star) format("svg");font-weight:400;font-style:normal}@font-face{font-family:WooCommerce;src:url(../fonts/WooCommerce.eot);src:url(../fonts/WooCommerce.eot?#iefix) format("embedded-opentype"),url(../fonts/WooCommerce.woff) format("woff"),url(../fonts/WooCommerce.ttf) format("truetype"),url(../fonts/WooCommerce.svg#WooCommerce) format("svg");font-weight:400;font-style:normal}.woocommerce-breadcrumb{padding-bottom:2em;margin-bottom:4em;border-bottom:1px solid #eee;font-size:13px;font-size:.8125rem}.woocommerce-breadcrumb a{box-shadow:0 1px 0 #0f0f0f;-webkit-transition:box-shadow ease-in-out 130ms;transition:box-shadow ease-in-out 130ms}.woocommerce-breadcrumb a:hover{box-shadow:0 3px 0 #0f0f0f}.woocommerce-pagination{padding-top:2em;margin-top:4em;border-top:1px solid #eee;font-size:13px;font-size:.8125rem}.woocommerce-pagination ul.page-numbers{padding:0;display:block}.woocommerce-pagination .next.page-numbers,.woocommerce-pagination .prev.page-numbers,.woocommerce-pagination a.page-numbers,.woocommerce-pagination span.page-numbers{padding:.5em 1em;background:#ddd;display:inline-block;font-size:1em;float:none;line-height:1.5;border-radius:2px;-webkit-transition:background-color ease-in-out .3s;transition:background-color ease-in-out .3s}.woocommerce-pagination span.page-numbers{background-color:#fff}.woocommerce-pagination a.page-numbers:hover{background-color:#767676;color:#fff}.onsale{background-color:#fff;position:absolute;top:0;right:0;display:inline-block;padding:.5em 1em;font-size:13px;font-size:.8125rem}.required{color:#b22222}.required[title]{border-bottom:none}.woocommerce-error,.woocommerce-info,.woocommerce-message{margin-bottom:1.5em;padding:2em}.woocommerce-message{background:teal;color:#fff}.woocommerce-error{background:#b22222;color:#fff}.woocommerce-info{background:#4169e1;color:#fff}.woocommerce-error a,.woocommerce-info a,.woocommerce-message a{color:#fff;box-shadow:0 1px 0 #fff!important;-webkit-transition:box-shadow ease-in-out 130ms;transition:box-shadow ease-in-out 130ms}.woocommerce-error a:hover,.woocommerce-info a:hover,.woocommerce-message a:hover{color:#fff!important;box-shadow:0 3px 0 #fff!important}.woocommerce-store-notice{background:#4169e1;color:#fff;padding:1em;position:absolute;top:0;right:0;width:100%;z-index:999}.admin-bar .woocommerce-store-notice{top:32px}.woocommerce-store-notice__dismiss-link{float:left;color:#fff}.woocommerce-store-notice__dismiss-link:hover{text-decoration:underline;color:#fff}.woocommerce-result-count{padding:.75em 0}ul.products li.product{list-style:none}ul.products li.product .price,ul.products li.product .star-rating{display:block;margin-bottom:.75em}ul.products li.product .button{box-shadow:0 1px 0 #0f0f0f;-webkit-transition:box-shadow ease-in-out 130ms;transition:box-shadow ease-in-out 130ms}ul.products li.product .button:hover{box-shadow:0 3px 0 #0f0f0f}ul.products li.product .added_to_cart{box-shadow:0 1px 0 #0f0f0f;-webkit-transition:box-shadow ease-in-out 130ms;transition:box-shadow ease-in-out 130ms;margin-right:.5em}ul.products li.product .added_to_cart:hover{box-shadow:0 3px 0 #0f0f0f}.checkout-button,a.remove{box-shadow:none!important}.star-rating{overflow:hidden;position:relative;height:1em;line-height:1;font-size:1em;width:5.4em;font-family:star}.star-rating::before{content:'\73\73\73\73\73';float:right;top:0;right:0;position:absolute}.star-rating span{overflow:hidden;float:right;top:0;right:0;position:absolute;padding-top:1.5em}.star-rating span::before{content:'\53\53\53\53\53';top:0;position:absolute;right:0}.woocommerce-loop-product__title{font-size:13px;font-size:.8125rem;letter-spacing:.15em}a.remove{display:inline-block;width:16px;height:16px;line-height:16px;font-size:16px;text-align:center;border-radius:100%;-webkit-box-shadow:none!important;border:1px solid #000}a.remove:hover{background:#000;color:#fff!important}.wc-item-meta,dl.variation{list-style:none}.wc-item-meta .wc-item-meta-label,.wc-item-meta dt,dl.variation .wc-item-meta-label,dl.variation dt{float:right;clear:both;margin-left:.25em;display:inline-block;list-style:none}.wc-item-meta dd,dl.variation dd{margin:0}.wc-item-meta p,.wc-item-meta:last-child,dl.variation p,dl.variation:last-child{margin-bottom:0}.single-product div.product{position:relative}.single-product .single-featured-image-header{display:none}.single-product .summary{margin-bottom:3em}.single-product .summary p.price{margin-bottom:2em}.single-product .woocommerce-product-rating{margin-bottom:2em;line-height:1}.single-product .woocommerce-product-rating .star-rating{float:right;margin-left:.25em}.single-product form.cart .quantity{float:right;margin-left:.5em}.single-product form.cart input{width:5em}.single-product .woocommerce-variation-add-to-cart .button{padding-top:.72em;padding-bottom:.72em}.single-product .woocommerce-variation-add-to-cart .button.disabled{opacity:.2}table.variations label{margin:0}table.variations select{margin-left:.5em}.woocommerce-product-gallery{position:relative;margin-bottom:3em}.woocommerce-product-gallery figure{margin:0}.woocommerce-product-gallery .zoomImg{background-color:#fff}.woocommerce-product-gallery .woocommerce-product-gallery__image:nth-child(n+2){width:25%;display:inline-block}.woocommerce-product-gallery .flex-control-thumbs li{list-style:none;float:right;cursor:pointer}.woocommerce-product-gallery .flex-control-thumbs img{opacity:.5}.woocommerce-product-gallery .flex-control-thumbs img.flex-active,.woocommerce-product-gallery .flex-control-thumbs img:hover{opacity:1}.woocommerce-product-gallery img{display:block}.woocommerce-product-gallery--columns-3 .flex-control-thumbs li{width:33.3333%}.woocommerce-product-gallery--columns-4 .flex-control-thumbs li{width:25%}.woocommerce-product-gallery--columns-5 .flex-control-thumbs li{width:20%}.woocommerce-product-gallery__trigger{position:absolute;top:1em;left:1em;z-index:99}.woocommerce-tabs{margin-bottom:2em}.woocommerce-tabs li{margin-left:1em}.woocommerce-tabs li.active a{box-shadow:0 3px 0 #0f0f0f}.woocommerce-tabs a{box-shadow:0 1px 0 #0f0f0f;-webkit-transition:box-shadow ease-in-out 130ms;transition:box-shadow ease-in-out 130ms}.woocommerce-tabs a:hover{box-shadow:0 3px 0 #0f0f0f}.woocommerce-tabs #comments{padding-top:0}.woocommerce-tabs .comment-reply-title{font-size:22px;font-size:1.375rem;font-weight:300;line-height:1.4;margin:0 0 .75em;display:block}.woocommerce-tabs #reviews li.comment,.woocommerce-tabs #reviews li.review{list-style:none;margin-left:0;margin-bottom:2.5em}.woocommerce-tabs #reviews li.comment .avatar,.woocommerce-tabs #reviews li.review .avatar{max-height:36px;width:auto;float:left}.woocommerce-tabs #reviews li.comment p.meta,.woocommerce-tabs #reviews li.review p.meta{margin-bottom:.5em}.woocommerce-tabs #reviews p.stars a{position:relative;height:1em;width:1em;text-indent:-999em;display:inline-block;text-decoration:none;box-shadow:none}.woocommerce-tabs #reviews p.stars a::before{display:block;position:absolute;top:0;right:0;width:1em;height:1em;line-height:1;font-family:WooCommerce;content:'\e021';text-indent:0}.woocommerce-tabs #reviews p.stars a:hover~a::before{content:'\e021'}.woocommerce-tabs #reviews p.stars.selected a.active::before,.woocommerce-tabs #reviews p.stars:hover a::before{content:'\e020'}.woocommerce-tabs #reviews p.stars.selected a.active~a::before{content:'\e021'}.woocommerce-tabs #reviews p.stars.selected a:not(.active)::before{content:'\e020'}button.pswp__button,button.pswp__button--arrow--left::before,button.pswp__button--arrow--right::before,button.pswp__button:hover{background-color:transparent!important}button.pswp__button--close:hover{background-position:100% -44px}button.pswp__button--zoom:hover{background-position:-88px 0}.site-footer .widget .product_list_widget,.widget .product_list_widget{margin-bottom:1.5em}.site-footer .widget .product_list_widget a,.widget .product_list_widget a{display:block;box-shadow:none}.site-footer .widget .product_list_widget a:hover,.widget .product_list_widget a:hover{box-shadow:none}.site-footer .widget .product_list_widget li,.widget .product_list_widget li{padding:1.5em 0}.site-footer .widget .product_list_widget li a.remove,.widget .product_list_widget li a.remove{float:left;margin-top:2px}.site-footer .widget .product_list_widget img,.widget .product_list_widget img{display:none}.widget_shopping_cart .buttons a{display:inline-block;margin:0 0 0 .5em}.widget_layered_nav .chosen:before{content:"×";display:inline-block;width:16px;height:16px;line-height:16px;font-size:16px;text-align:center;border-radius:100%;border:1px solid #000;margin-left:.25em}.widget_price_filter .price_slider{margin-bottom:1em}.widget_price_filter .price_slider_amount{text-align:left;line-height:2.4;font-size:.8751em}.widget_price_filter .price_slider_amount .button{float:right;padding:.4em 1em}.widget_price_filter .ui-slider{position:relative;text-align:right;margin-right:.5em;margin-left:.5em}.widget_price_filter .ui-slider .ui-slider-handle{position:absolute;z-index:2;width:1em;height:1em;background-color:#000;border-radius:1em;cursor:ew-resize;outline:0;top:-.3em;margin-right:-.5em}.widget_price_filter .ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;border-radius:1em;background-color:#000}.widget_price_filter .price_slider_wrapper .ui-widget-content{border-radius:1em;background-color:#666;border:0}.widget_price_filter .ui-slider-horizontal{height:.5em}.widget_price_filter .ui-slider-horizontal .ui-slider-range{top:0;height:100%}.widget_price_filter .ui-slider-horizontal .ui-slider-range-min{right:-1px}.widget_price_filter .ui-slider-horizontal .ui-slider-range-max{left:-1px}.widget_rating_filter li{text-align:left}.widget_rating_filter li .star-rating{float:right;margin-top:.3em}.widget_product_search form{position:relative}.widget_product_search .search-field{padding-left:100px}.widget_product_search input[type=submit]{position:absolute;top:.5em;left:.5em;padding-right:1em;padding-left:1em}.woocommerce-account .woocommerce-MyAccount-navigation{float:left;width:25%;border-top:1px solid #ddd}#shipping_method li input,.woocommerce-account .woocommerce-MyAccount-content{float:right}.woocommerce-account .woocommerce-MyAccount-navigation li{list-style:none;padding:.5em 0;border-bottom:1px solid #ddd}.woocommerce-account .woocommerce-MyAccount-navigation li a{box-shadow:none}.woocommerce-account .woocommerce-MyAccount-navigation li a:hover,.woocommerce-account .woocommerce-MyAccount-navigation li.is-active a{box-shadow:0 3px 0 #0f0f0f}.woocommerce-account .woocommerce-MyAccount-navigation li:before{content:"→";display:inline-block;margin-left:.25em;color:#ddd}.woocommerce-cart-form td{padding:1em .5em}.woocommerce-cart-form img{max-width:42px;height:auto;display:block}.woocommerce-cart-form dl.variation{margin-top:0}.woocommerce-cart-form dl.variation p,.woocommerce-cart-form dl.variation:last-child{margin-bottom:0}.woocommerce-cart-form .button{padding:1.2em 2em}.woocommerce-cart-form .actions .input-text{width:130px!important;float:right;margin-left:.25em}.woocommerce-cart-form .quantity input{width:4em}#shipping_method{list-style:none;margin-top:1em}#shipping_method li{margin-bottom:.5em}.wc_payment_method .payment_box ol:last-of-type,.wc_payment_method .payment_box p:last-child,.wc_payment_method .payment_box ul:last-of-type{margin-bottom:0}#shipping_method li label{line-height:1.15}.checkout-button{display:block;padding:1em 2em;border:2px solid #000;text-align:center;font-weight:800;-webkit-box-shadow:none!important}.checkout-button:hover{box-shadow:none!important;-webkit-box-shadow:none!important;border-color:#999}.checkout-button:after{content:"→"}#ship-to-different-address label{font-weight:300;cursor:pointer}#ship-to-different-address label span{position:relative;display:block}#ship-to-different-address label span:before{content:"";display:block;height:16px;width:30px;border:2px solid #bbb;background:#bbb;border-radius:13em;box-sizing:content-box;-webkit-transition:all,ease-in-out,.3s;transition:all,ease-in-out,.3s;position:absolute;top:4px;left:0}#ship-to-different-address label span:after{content:"";display:block;width:14px;height:14px;background:#fff;position:absolute;top:7px;left:17px;border-radius:13em;-webkit-transition:all,ease-in-out,.3s;transition:all,ease-in-out,.3s}#ship-to-different-address label input[type=checkbox],.wc_payment_method input[type=radio]{display:none}#ship-to-different-address label input[type=checkbox]:checked+span:after{left:3px}#ship-to-different-address label input[type=checkbox]:checked+span:before{border-color:#000;background:#000}.woocommerce-terms-and-conditions{border:1px solid rgba(0,0,0,.2);box-shadow:inset 0 1px 2px rgba(0,0,0,.1);background:rgba(0,0,0,.05)}.woocommerce-checkout .select2-choice,.woocommerce-checkout .select2-choice:hover{box-shadow:none!important;-webkit-box-shadow:none!important}.woocommerce-checkout .select2-choice{padding:.7em .7em .7em 0}.woocommerce-checkout-review-order-table td{padding:1em .5em}.woocommerce-checkout-review-order-table dl.variation,.woocommerce-checkout-review-order-table dl.variation p{margin:0}.wc_payment_method{list-style:none;border-bottom:1px solid #ddd}.wc_payment_method .payment_box{padding:2em;background:#eee}.wc_payment_method .payment_box fieldset{padding:1.5em 1.5em 0;border:0;background:#f6f6f6}.wc_payment_method .payment_box li{list-style:none}.wc_payment_method>label:first-of-type{margin:1em 0}.wc_payment_method>label:first-of-type img{max-height:24px;max-width:200px;float:left}.wc_payment_method label{cursor:pointer}.wc_payment_method input[type=radio]+label:before{content:"";display:inline-block;width:16px;height:16px;border:2px solid #fff;box-shadow:0 0 0 2px #000;background:#fff;margin-right:4px;margin-left:.5em;border-radius:100%;-webkit-transform:translateY(2px);-ms-transform:translateY(2px);transform:translateY(2px)}.wc_payment_method input[type=radio]:checked+label:before{background:#000}.colors-dark.woocommerce-checkout .select2-container--default .select2-results .select2-results__options,.colors-dark.woocommerce-checkout .wc_payment_method .payment_box{background:#333}.colors-dark.woocommerce-checkout .select2-container--default .select2-results .select2-results__option[aria-selected=true]{color:#333}.colors-dark.woocommerce-checkout .select2-container--default .select2-selection--single{background-color:#333;border:1px solid #555}.colors-dark.woocommerce-checkout .select2-container--default .select2-selection--single .select2-selection__rendered{color:#ccc}@media screen and (min-width:48em){.has-sidebar.woocommerce-page:not(.error404) #primary{width:74%}.has-sidebar.woocommerce-page:not(.error404) #secondary{width:20%}body.page-two-column.woocommerce-account:not(.archive) #primary .entry-header,body.page-two-column.woocommerce-cart:not(.archive) #primary .entry-header,body.page-two-column.woocommerce-checkout:not(.archive) #primary .entry-header{width:16%}body.page-two-column.woocommerce-account:not(.archive) #primary .entry-content,body.page-two-column.woocommerce-cart:not(.archive) #primary .entry-content,body.page-two-column.woocommerce-checkout:not(.archive) #primary .entry-content{width:78%}}
\ No newline at end of file
diff --git a/assets/css/twenty-seventeen.css b/assets/css/twenty-seventeen.css
new file mode 100644
index 00000000000..99c49de985a
--- /dev/null
+++ b/assets/css/twenty-seventeen.css
@@ -0,0 +1 @@
+@charset "UTF-8";.price del,ul.products li.product .button.loading{opacity:.5}.onsale,.woocommerce-loop-product__title{text-transform:uppercase;font-weight:800}@font-face{font-family:star;src:url(../fonts/star.eot);src:url(../fonts/star.eot?#iefix) format("embedded-opentype"),url(../fonts/star.woff) format("woff"),url(../fonts/star.ttf) format("truetype"),url(../fonts/star.svg#star) format("svg");font-weight:400;font-style:normal}@font-face{font-family:WooCommerce;src:url(../fonts/WooCommerce.eot);src:url(../fonts/WooCommerce.eot?#iefix) format("embedded-opentype"),url(../fonts/WooCommerce.woff) format("woff"),url(../fonts/WooCommerce.ttf) format("truetype"),url(../fonts/WooCommerce.svg#WooCommerce) format("svg");font-weight:400;font-style:normal}.woocommerce-breadcrumb{padding-bottom:2em;margin-bottom:4em;border-bottom:1px solid #eee;font-size:13px;font-size:.8125rem}.woocommerce-breadcrumb a{box-shadow:0 1px 0 #0f0f0f;-webkit-transition:box-shadow ease-in-out 130ms;transition:box-shadow ease-in-out 130ms}.woocommerce-breadcrumb a:hover{box-shadow:0 3px 0 #0f0f0f}.woocommerce-pagination{padding-top:2em;margin-top:4em;border-top:1px solid #eee;font-size:13px;font-size:.8125rem}.woocommerce-pagination ul.page-numbers{padding:0;display:block}.woocommerce-pagination .next.page-numbers,.woocommerce-pagination .prev.page-numbers,.woocommerce-pagination a.page-numbers,.woocommerce-pagination span.page-numbers{padding:.5em 1em;background:#ddd;display:inline-block;font-size:1em;float:none;line-height:1.5;border-radius:2px;-webkit-transition:background-color ease-in-out .3s;transition:background-color ease-in-out .3s}.woocommerce-pagination span.page-numbers{background-color:#fff}.woocommerce-pagination a.page-numbers:hover{background-color:#767676;color:#fff}.onsale{background-color:#fff;position:absolute;top:0;left:0;display:inline-block;padding:.5em 1em;font-size:13px;font-size:.8125rem}.required{color:#b22222}.required[title]{border-bottom:none}.woocommerce-error,.woocommerce-info,.woocommerce-message{margin-bottom:1.5em;padding:2em}.woocommerce-message{background:teal;color:#fff}.woocommerce-error{background:#b22222;color:#fff}.woocommerce-info{background:#4169e1;color:#fff}.woocommerce-error a,.woocommerce-info a,.woocommerce-message a{color:#fff;box-shadow:0 1px 0 #fff!important;-webkit-transition:box-shadow ease-in-out 130ms;transition:box-shadow ease-in-out 130ms}.woocommerce-error a:hover,.woocommerce-info a:hover,.woocommerce-message a:hover{color:#fff!important;box-shadow:0 3px 0 #fff!important}.woocommerce-store-notice{background:#4169e1;color:#fff;padding:1em;position:absolute;top:0;left:0;width:100%;z-index:999}.admin-bar .woocommerce-store-notice{top:32px}.woocommerce-store-notice__dismiss-link{float:right;color:#fff}.woocommerce-store-notice__dismiss-link:hover{text-decoration:underline;color:#fff}.woocommerce-result-count{padding:.75em 0}ul.products li.product{list-style:none}ul.products li.product .price,ul.products li.product .star-rating{display:block;margin-bottom:.75em}ul.products li.product .button{box-shadow:0 1px 0 #0f0f0f;-webkit-transition:box-shadow ease-in-out 130ms;transition:box-shadow ease-in-out 130ms}ul.products li.product .button:hover{box-shadow:0 3px 0 #0f0f0f}ul.products li.product .added_to_cart{box-shadow:0 1px 0 #0f0f0f;-webkit-transition:box-shadow ease-in-out 130ms;transition:box-shadow ease-in-out 130ms;margin-left:.5em}ul.products li.product .added_to_cart:hover{box-shadow:0 3px 0 #0f0f0f}.checkout-button,a.remove{box-shadow:none!important}.star-rating{overflow:hidden;position:relative;height:1em;line-height:1;font-size:1em;width:5.4em;font-family:star}.star-rating::before{content:'\73\73\73\73\73';float:left;top:0;left:0;position:absolute}.star-rating span{overflow:hidden;float:left;top:0;left:0;position:absolute;padding-top:1.5em}.star-rating span::before{content:'\53\53\53\53\53';top:0;position:absolute;left:0}.woocommerce-loop-product__title{font-size:13px;font-size:.8125rem;letter-spacing:.15em}a.remove{display:inline-block;width:16px;height:16px;line-height:16px;font-size:16px;text-align:center;border-radius:100%;-webkit-box-shadow:none!important;border:1px solid #000}a.remove:hover{background:#000;color:#fff!important}.wc-item-meta,dl.variation{list-style:none}.wc-item-meta .wc-item-meta-label,.wc-item-meta dt,dl.variation .wc-item-meta-label,dl.variation dt{float:left;clear:both;margin-right:.25em;display:inline-block;list-style:none}.wc-item-meta dd,dl.variation dd{margin:0}.wc-item-meta p,.wc-item-meta:last-child,dl.variation p,dl.variation:last-child{margin-bottom:0}.single-product div.product{position:relative}.single-product .single-featured-image-header{display:none}.single-product .summary{margin-bottom:3em}.single-product .summary p.price{margin-bottom:2em}.single-product .woocommerce-product-rating{margin-bottom:2em;line-height:1}.single-product .woocommerce-product-rating .star-rating{float:left;margin-right:.25em}.single-product form.cart .quantity{float:left;margin-right:.5em}.single-product form.cart input{width:5em}.single-product .woocommerce-variation-add-to-cart .button{padding-top:.72em;padding-bottom:.72em}.single-product .woocommerce-variation-add-to-cart .button.disabled{opacity:.2}table.variations label{margin:0}table.variations select{margin-right:.5em}.woocommerce-product-gallery{position:relative;margin-bottom:3em}.woocommerce-product-gallery figure{margin:0}.woocommerce-product-gallery .zoomImg{background-color:#fff}.woocommerce-product-gallery .woocommerce-product-gallery__image:nth-child(n+2){width:25%;display:inline-block}.woocommerce-product-gallery .flex-control-thumbs li{list-style:none;float:left;cursor:pointer}.woocommerce-product-gallery .flex-control-thumbs img{opacity:.5}.woocommerce-product-gallery .flex-control-thumbs img.flex-active,.woocommerce-product-gallery .flex-control-thumbs img:hover{opacity:1}.woocommerce-product-gallery img{display:block}.woocommerce-product-gallery--columns-3 .flex-control-thumbs li{width:33.3333%}.woocommerce-product-gallery--columns-4 .flex-control-thumbs li{width:25%}.woocommerce-product-gallery--columns-5 .flex-control-thumbs li{width:20%}.woocommerce-product-gallery__trigger{position:absolute;top:1em;right:1em;z-index:99}.woocommerce-tabs{margin-bottom:2em}.woocommerce-tabs li{margin-right:1em}.woocommerce-tabs li.active a{box-shadow:0 3px 0 #0f0f0f}.woocommerce-tabs a{box-shadow:0 1px 0 #0f0f0f;-webkit-transition:box-shadow ease-in-out 130ms;transition:box-shadow ease-in-out 130ms}.woocommerce-tabs a:hover{box-shadow:0 3px 0 #0f0f0f}.woocommerce-tabs #comments{padding-top:0}.woocommerce-tabs .comment-reply-title{font-size:22px;font-size:1.375rem;font-weight:300;line-height:1.4;margin:0 0 .75em;display:block}.woocommerce-tabs #reviews li.comment,.woocommerce-tabs #reviews li.review{list-style:none;margin-right:0;margin-bottom:2.5em}.woocommerce-tabs #reviews li.comment .avatar,.woocommerce-tabs #reviews li.review .avatar{max-height:36px;width:auto;float:right}.woocommerce-tabs #reviews li.comment p.meta,.woocommerce-tabs #reviews li.review p.meta{margin-bottom:.5em}.woocommerce-tabs #reviews p.stars a{position:relative;height:1em;width:1em;text-indent:-999em;display:inline-block;text-decoration:none;box-shadow:none}.woocommerce-tabs #reviews p.stars a::before{display:block;position:absolute;top:0;left:0;width:1em;height:1em;line-height:1;font-family:WooCommerce;content:'\e021';text-indent:0}.woocommerce-tabs #reviews p.stars a:hover~a::before{content:'\e021'}.woocommerce-tabs #reviews p.stars.selected a.active::before,.woocommerce-tabs #reviews p.stars:hover a::before{content:'\e020'}.woocommerce-tabs #reviews p.stars.selected a.active~a::before{content:'\e021'}.woocommerce-tabs #reviews p.stars.selected a:not(.active)::before{content:'\e020'}button.pswp__button,button.pswp__button--arrow--left::before,button.pswp__button--arrow--right::before,button.pswp__button:hover{background-color:transparent!important}button.pswp__button--close:hover{background-position:0 -44px}button.pswp__button--zoom:hover{background-position:-88px 0}.site-footer .widget .product_list_widget,.widget .product_list_widget{margin-bottom:1.5em}.site-footer .widget .product_list_widget a,.widget .product_list_widget a{display:block;box-shadow:none}.site-footer .widget .product_list_widget a:hover,.widget .product_list_widget a:hover{box-shadow:none}.site-footer .widget .product_list_widget li,.widget .product_list_widget li{padding:1.5em 0}.site-footer .widget .product_list_widget li a.remove,.widget .product_list_widget li a.remove{float:right;margin-top:2px}.site-footer .widget .product_list_widget img,.widget .product_list_widget img{display:none}.widget_shopping_cart .buttons a{display:inline-block;margin:0 .5em 0 0}.widget_layered_nav .chosen:before{content:"×";display:inline-block;width:16px;height:16px;line-height:16px;font-size:16px;text-align:center;border-radius:100%;border:1px solid #000;margin-right:.25em}.widget_price_filter .price_slider{margin-bottom:1em}.widget_price_filter .price_slider_amount{text-align:right;line-height:2.4;font-size:.8751em}.widget_price_filter .price_slider_amount .button{float:left;padding:.4em 1em}.widget_price_filter .ui-slider{position:relative;text-align:left;margin-left:.5em;margin-right:.5em}.widget_price_filter .ui-slider .ui-slider-handle{position:absolute;z-index:2;width:1em;height:1em;background-color:#000;border-radius:1em;cursor:ew-resize;outline:0;top:-.3em;margin-left:-.5em}.widget_price_filter .ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;border-radius:1em;background-color:#000}.widget_price_filter .price_slider_wrapper .ui-widget-content{border-radius:1em;background-color:#666;border:0}.widget_price_filter .ui-slider-horizontal{height:.5em}.widget_price_filter .ui-slider-horizontal .ui-slider-range{top:0;height:100%}.widget_price_filter .ui-slider-horizontal .ui-slider-range-min{left:-1px}.widget_price_filter .ui-slider-horizontal .ui-slider-range-max{right:-1px}.widget_rating_filter li{text-align:right}.widget_rating_filter li .star-rating{float:left;margin-top:.3em}.widget_product_search form{position:relative}.widget_product_search .search-field{padding-right:100px}.widget_product_search input[type=submit]{position:absolute;top:.5em;right:.5em;padding-left:1em;padding-right:1em}.woocommerce-account .woocommerce-MyAccount-navigation{float:right;width:25%;border-top:1px solid #ddd}#shipping_method li input,.woocommerce-account .woocommerce-MyAccount-content{float:left}.woocommerce-account .woocommerce-MyAccount-navigation li{list-style:none;padding:.5em 0;border-bottom:1px solid #ddd}.woocommerce-account .woocommerce-MyAccount-navigation li a{box-shadow:none}.woocommerce-account .woocommerce-MyAccount-navigation li a:hover,.woocommerce-account .woocommerce-MyAccount-navigation li.is-active a{box-shadow:0 3px 0 #0f0f0f}.woocommerce-account .woocommerce-MyAccount-navigation li:before{content:"→";display:inline-block;margin-right:.25em;color:#ddd}.woocommerce-cart-form td{padding:1em .5em}.woocommerce-cart-form img{max-width:42px;height:auto;display:block}.woocommerce-cart-form dl.variation{margin-top:0}.woocommerce-cart-form dl.variation p,.woocommerce-cart-form dl.variation:last-child{margin-bottom:0}.woocommerce-cart-form .button{padding:1.2em 2em}.woocommerce-cart-form .actions .input-text{width:130px!important;float:left;margin-right:.25em}.woocommerce-cart-form .quantity input{width:4em}#shipping_method{list-style:none;margin-top:1em}#shipping_method li{margin-bottom:.5em}.wc_payment_method .payment_box ol:last-of-type,.wc_payment_method .payment_box p:last-child,.wc_payment_method .payment_box ul:last-of-type{margin-bottom:0}#shipping_method li label{line-height:1.15}.checkout-button{display:block;padding:1em 2em;border:2px solid #000;text-align:center;font-weight:800;-webkit-box-shadow:none!important}.checkout-button:hover{box-shadow:none!important;-webkit-box-shadow:none!important;border-color:#999}.checkout-button:after{content:"→"}#ship-to-different-address label{font-weight:300;cursor:pointer}#ship-to-different-address label span{position:relative;display:block}#ship-to-different-address label span:before{content:"";display:block;height:16px;width:30px;border:2px solid #bbb;background:#bbb;border-radius:13em;box-sizing:content-box;-webkit-transition:all,ease-in-out,.3s;transition:all,ease-in-out,.3s;position:absolute;top:4px;right:0}#ship-to-different-address label span:after{content:"";display:block;width:14px;height:14px;background:#fff;position:absolute;top:7px;right:17px;border-radius:13em;-webkit-transition:all,ease-in-out,.3s;transition:all,ease-in-out,.3s}#ship-to-different-address label input[type=checkbox],.wc_payment_method input[type=radio]{display:none}#ship-to-different-address label input[type=checkbox]:checked+span:after{right:3px}#ship-to-different-address label input[type=checkbox]:checked+span:before{border-color:#000;background:#000}.woocommerce-terms-and-conditions{border:1px solid rgba(0,0,0,.2);box-shadow:inset 0 1px 2px rgba(0,0,0,.1);background:rgba(0,0,0,.05)}.woocommerce-checkout .select2-choice,.woocommerce-checkout .select2-choice:hover{box-shadow:none!important;-webkit-box-shadow:none!important}.woocommerce-checkout .select2-choice{padding:.7em 0 .7em .7em}.woocommerce-checkout-review-order-table td{padding:1em .5em}.woocommerce-checkout-review-order-table dl.variation,.woocommerce-checkout-review-order-table dl.variation p{margin:0}.wc_payment_method{list-style:none;border-bottom:1px solid #ddd}.wc_payment_method .payment_box{padding:2em;background:#eee}.wc_payment_method .payment_box fieldset{padding:1.5em 1.5em 0;border:0;background:#f6f6f6}.wc_payment_method .payment_box li{list-style:none}.wc_payment_method>label:first-of-type{margin:1em 0}.wc_payment_method>label:first-of-type img{max-height:24px;max-width:200px;float:right}.wc_payment_method label{cursor:pointer}.wc_payment_method input[type=radio]+label:before{content:"";display:inline-block;width:16px;height:16px;border:2px solid #fff;box-shadow:0 0 0 2px #000;background:#fff;margin-left:4px;margin-right:.5em;border-radius:100%;-webkit-transform:translateY(2px);-ms-transform:translateY(2px);transform:translateY(2px)}.wc_payment_method input[type=radio]:checked+label:before{background:#000}.colors-dark.woocommerce-checkout .select2-container--default .select2-results .select2-results__options,.colors-dark.woocommerce-checkout .wc_payment_method .payment_box{background:#333}.colors-dark.woocommerce-checkout .select2-container--default .select2-results .select2-results__option[aria-selected=true]{color:#333}.colors-dark.woocommerce-checkout .select2-container--default .select2-selection--single{background-color:#333;border:1px solid #555}.colors-dark.woocommerce-checkout .select2-container--default .select2-selection--single .select2-selection__rendered{color:#ccc}@media screen and (min-width:48em){.has-sidebar.woocommerce-page:not(.error404) #primary{width:74%}.has-sidebar.woocommerce-page:not(.error404) #secondary{width:20%}body.page-two-column.woocommerce-account:not(.archive) #primary .entry-header,body.page-two-column.woocommerce-cart:not(.archive) #primary .entry-header,body.page-two-column.woocommerce-checkout:not(.archive) #primary .entry-header{width:16%}body.page-two-column.woocommerce-account:not(.archive) #primary .entry-content,body.page-two-column.woocommerce-cart:not(.archive) #primary .entry-content,body.page-two-column.woocommerce-checkout:not(.archive) #primary .entry-content{width:78%}}
\ No newline at end of file
diff --git a/assets/css/twenty-seventeen.scss b/assets/css/twenty-seventeen.scss
new file mode 100644
index 00000000000..c43fcec1824
--- /dev/null
+++ b/assets/css/twenty-seventeen.scss
@@ -0,0 +1,1045 @@
+/**
+ * Twenty Seventeen integration styles
+ */
+
+@import 'bourbon';
+
+/**
+ * Fonts
+ */
+@font-face {
+	font-family: 'star';
+	src: url('../fonts/star.eot');
+	src: url('../fonts/star.eot?#iefix') format('embedded-opentype'),
+		url('../fonts/star.woff') format('woff'),
+		url('../fonts/star.ttf') format('truetype'),
+		url('../fonts/star.svg#star') format('svg');
+	font-weight: normal;
+	font-style: normal;
+}
+
+@font-face {
+	font-family: 'WooCommerce';
+	src: url('../fonts/WooCommerce.eot');
+	src: url('../fonts/WooCommerce.eot?#iefix') format('embedded-opentype'),
+		url('../fonts/WooCommerce.woff') format('woff'),
+		url('../fonts/WooCommerce.ttf') format('truetype'),
+		url('../fonts/WooCommerce.svg#WooCommerce') format('svg');
+	font-weight: normal;
+	font-style: normal;
+}
+
+/**
+ * Mixins
+ */
+@mixin link() {
+	box-shadow: 0 1px 0 rgba(15, 15, 15, 1);
+	@include transition( box-shadow ease-in-out 130ms );
+
+	&:hover {
+		box-shadow: 0 3px 0 rgba(15, 15, 15, 1);
+	}
+}
+
+@mixin link_white() {
+	color: #fff;
+	box-shadow: 0 1px 0 rgba(#fff, 1) !important;
+	@include transition( box-shadow ease-in-out 130ms );
+
+	&:hover {
+		color: #fff !important;
+		box-shadow: 0 3px 0 rgba(#fff, 1) !important;
+	}
+}
+
+/**
+ * Global elements
+ */
+.woocommerce-breadcrumb {
+	padding-bottom: 2em;
+	margin-bottom: 4em;
+	border-bottom: 1px solid #eee;
+	font-size: 13px;
+	font-size: 0.8125rem;
+
+	a {
+		@include link();
+	}
+}
+
+.woocommerce-pagination {
+	padding-top: 2em;
+	margin-top: 4em;
+	border-top: 1px solid #eee;
+	font-size: 13px;
+	font-size: 0.8125rem;
+
+	ul.page-numbers {
+		padding: 0;
+		display: block;
+	}
+
+	span.page-numbers,
+	a.page-numbers,
+	.next.page-numbers,
+	.prev.page-numbers {
+		padding: 0.5em 1em;
+		background: #ddd;
+		display: inline-block;
+		font-size: 1em;
+		float: none;
+		line-height: 1.5;
+		border-radius: 2px;
+		@include transition( background-color ease-in-out .3s );
+	}
+
+	span.page-numbers {
+		background-color: #fff;
+	}
+
+	a.page-numbers:hover {
+		background-color: #767676;
+		color: #fff;
+	}
+}
+
+.onsale {
+	background-color: #fff;
+	position: absolute;
+	top: 0;
+	left: 0;
+	display: inline-block;
+	padding: .5em 1em;
+	font-size: 13px;
+	font-size: 0.8125rem;
+	text-transform: uppercase;
+	font-weight: 800;
+}
+
+.price {
+	del {
+		opacity: .5;
+	}
+}
+
+.required {
+	color: firebrick;
+
+	&[title] {
+		border-bottom: none;
+	}
+}
+
+.woocommerce-message,
+.woocommerce-error,
+.woocommerce-info {
+	margin-bottom: 1.5em;
+	padding: 2em;
+	background: #eee;
+}
+
+.woocommerce-message {
+	background: teal;
+	color: #fff;
+}
+
+.woocommerce-error {
+	background: firebrick;
+	color: #fff;
+}
+
+.woocommerce-info {
+	background: royalblue;
+	color: #fff;
+}
+
+.woocommerce-message,
+.woocommerce-error,
+.woocommerce-info {
+	a {
+		@include link_white();
+	}
+}
+
+.woocommerce-store-notice {
+	background: royalblue;
+	color: #fff;
+	padding: 1em;
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	z-index: 999;
+}
+
+.admin-bar .woocommerce-store-notice {
+	top: 32px;
+}
+
+.woocommerce-store-notice__dismiss-link {
+	float: right;
+	color: #fff;
+
+	&:hover {
+		text-decoration: underline;
+		color: #fff;
+	}
+}
+
+/**
+ * Shop page
+ */
+.woocommerce-result-count {
+	padding: .75em 0;
+}
+
+/**
+ * Products
+ */
+ul.products {
+	li.product {
+		list-style: none;
+
+		.price,
+		.star-rating {
+			display: block;
+			margin-bottom: .75em;
+		}
+
+		.button {
+			@include link();
+
+			&.loading {
+				opacity: .5;
+			}
+		}
+
+		.added_to_cart {
+			@include link();
+			margin-left: .5em;
+		}
+	}
+}
+
+.star-rating {
+	overflow: hidden;
+	position: relative;
+	height: 1em;
+	line-height: 1;
+	font-size: 1em;
+	width: 5.4em;
+	font-family: 'star';
+
+	&::before {
+		content: '\73\73\73\73\73';
+		float: left;
+		top: 0;
+		left: 0;
+		position: absolute;
+	}
+
+	span {
+		overflow: hidden;
+		float: left;
+		top: 0;
+		left: 0;
+		position: absolute;
+		padding-top: 1.5em;
+	}
+
+	span::before {
+		content: '\53\53\53\53\53';
+		top: 0;
+		position: absolute;
+		left: 0;
+	}
+}
+
+.woocommerce-loop-product__title {
+	font-size: 13px;
+	font-size: 0.8125rem;
+	text-transform: uppercase;
+	font-weight: 800;
+	letter-spacing: 0.15em;
+}
+
+a.remove {
+	display: inline-block;
+	width: 16px;
+	height: 16px;
+	line-height: 16px;
+	font-size: 16px;
+	text-align: center;
+	border-radius: 100%;
+	box-shadow: none !important;
+	-webkit-box-shadow: none !important;
+	border: 1px solid #000;
+
+	&:hover {
+		background: #000;
+		color: #fff !important;
+	}
+}
+
+dl.variation, .wc-item-meta {
+	list-style: none outside;
+
+	dt, .wc-item-meta-label {
+		float: left;
+		clear: both;
+		margin-right: .25em;
+		display: inline-block;
+		list-style: none outside;
+	}
+
+	dd {
+		margin: 0;
+	}
+
+	p,
+	&:last-child {
+		margin-bottom: 0;
+	}
+}
+
+/**
+ * Single product
+ */
+.single-product {
+	div.product {
+		position: relative;
+	}
+
+	.single-featured-image-header {
+		display: none;
+	}
+
+	.summary {
+		margin-bottom: 3em;
+
+		p.price {
+			margin-bottom: 2em;
+		}
+	}
+
+	.woocommerce-product-rating {
+		margin-bottom: 2em;
+		line-height: 1;
+
+		.star-rating {
+			float: left;
+			margin-right: .25em;
+		}
+	}
+
+	form.cart {
+		.quantity {
+			float: left;
+			margin-right: .5em;
+		}
+
+		input {
+			width: 5em;
+		}
+	}
+
+	.woocommerce-variation-add-to-cart {
+		.button {
+			padding-top: .72em;
+			padding-bottom: .72em;
+		}
+		.button.disabled {
+			opacity: 0.2;
+		}
+	}
+}
+
+table.variations {
+	label {
+		margin: 0;
+	}
+
+	select {
+		margin-right: .5em;
+	}
+}
+
+.woocommerce-product-gallery {
+	position: relative;
+	margin-bottom: 3em;
+
+	figure {
+		margin: 0;
+	}
+
+	.zoomImg {
+		background-color: #fff;
+	}
+
+	.woocommerce-product-gallery__image:nth-child(n+2) {
+		width: 25%;
+		display: inline-block;
+	}
+
+	.flex-control-thumbs {
+		li {
+			list-style: none;
+			float: left;
+			cursor: pointer;
+		}
+
+		img {
+			opacity: .5;
+
+			&:hover,
+			&.flex-active {
+				opacity: 1;
+			}
+		}
+	}
+
+	img {
+		display: block;
+	}
+}
+
+.woocommerce-product-gallery--columns-3 {
+	.flex-control-thumbs li {
+		width: 33.3333%;
+	}
+}
+
+.woocommerce-product-gallery--columns-4 {
+	.flex-control-thumbs li {
+		width: 25%;
+	}
+}
+
+.woocommerce-product-gallery--columns-5 {
+	.flex-control-thumbs li {
+		width: 20%;
+	}
+}
+
+.woocommerce-product-gallery__trigger {
+	position: absolute;
+	top: 1em;
+	right: 1em;
+	z-index: 99;
+}
+
+.woocommerce-tabs {
+	margin-bottom: 2em;
+
+	li {
+		margin-right: 1em;
+
+		&.active {
+			a {
+				box-shadow: 0 3px 0 rgba(15, 15, 15, 1);
+			}
+		}
+	}
+
+	a {
+		@include link();
+	}
+
+	#comments {
+		padding-top: 0;
+	}
+
+	.comment-reply-title {
+		font-size: 22px;
+		font-size: 1.375rem;
+		font-weight: 300;
+		line-height: 1.4;
+		margin: 0 0 0.75em;
+		display: block;
+	}
+
+	#reviews {
+		li.review,
+		li.comment {
+			list-style: none;
+			margin-right: 0;
+			margin-bottom: 2.5em;
+
+			.avatar {
+				max-height: 36px;
+				width: auto;
+				float: right;
+			}
+
+			p.meta {
+				margin-bottom: .5em;
+			}
+		}
+
+		p.stars {
+			a {
+				position: relative;
+				height: 1em;
+				width: 1em;
+				text-indent: -999em;
+				display: inline-block;
+				text-decoration: none;
+				box-shadow: none;
+
+				&::before {
+					display: block;
+					position: absolute;
+					top: 0;
+					left: 0;
+					width: 1em;
+					height: 1em;
+					line-height: 1;
+					font-family: 'WooCommerce';
+					content: '\e021';
+					text-indent: 0;
+				}
+
+				&:hover {
+					~ a::before {
+						content: '\e021';
+					}
+				}
+			}
+
+			&:hover {
+				a {
+					&::before {
+						content: '\e020';
+					}
+				}
+			}
+
+			&.selected {
+				a.active {
+					&::before {
+						content: '\e020';
+					}
+
+					~ a::before {
+						content: '\e021';
+					}
+				}
+
+				a:not( .active ) {
+					&::before {
+						content: '\e020';
+					}
+				}
+			}
+		}
+	}
+}
+
+/**
+ * Photoswipe
+ * 1. These styles are required to overwrite default theme button styles (Twenty Twelve adds gradients via background-image).
+ */
+
+button.pswp__button,
+button.pswp__button:hover,
+button.pswp__button--arrow--left::before,
+button.pswp__button--arrow--right::before {
+	background-color: transparent !important; /* 1 */
+}
+
+button.pswp__button--close:hover {
+	background-position: 0 -44px;
+}
+
+button.pswp__button--zoom:hover {
+	background-position: -88px 0;
+}
+
+/**
+ * Widgets
+ */
+.widget .product_list_widget,
+.site-footer .widget .product_list_widget {
+	margin-bottom: 1.5em;
+
+	a {
+		display: block;
+		box-shadow: none;
+
+		&:hover {
+			box-shadow: none;
+		}
+	}
+
+	li {
+		padding: 1.5em 0;
+
+		a.remove {
+			float: right;
+			margin-top: 2px;
+		}
+	}
+
+	img {
+		display: none;
+	}
+}
+
+.widget_shopping_cart {
+	.buttons {
+		a {
+			display: inline-block;
+			margin: 0 .5em 0 0;
+		}
+	}
+}
+
+.widget_layered_nav {
+	.chosen {
+		&:before {
+			content: "×";
+			display: inline-block;
+			width: 16px;
+			height: 16px;
+			line-height: 16px;
+			font-size: 16px;
+			text-align: center;
+			border-radius: 100%;
+			border: 1px solid black;
+			margin-right: .25em;
+		}
+	}
+}
+
+.widget_price_filter {
+	.price_slider {
+		margin-bottom: 1em;
+	}
+
+	.price_slider_amount {
+		text-align: right;
+		line-height: 2.4;
+		font-size: 0.8751em;
+
+		.button {
+			float: left;
+			padding: .4em 1em;
+		}
+	}
+
+	.ui-slider {
+		position: relative;
+		text-align: left;
+		margin-left: 0.5em;
+		margin-right: 0.5em;
+	}
+
+	.ui-slider .ui-slider-handle {
+		position: absolute;
+		z-index: 2;
+		width: 1em;
+		height: 1em;
+		background-color: #000;
+		border-radius: 1em;
+		cursor: ew-resize;
+		outline: none;
+		top: -0.3em;
+		margin-left: -0.5em;
+	}
+
+	.ui-slider .ui-slider-range {
+		position: absolute;
+		z-index: 1;
+		font-size: 0.7em;
+		display: block;
+		border: 0;
+		border-radius: 1em;
+		background-color: #000;
+	}
+
+	.price_slider_wrapper .ui-widget-content {
+		border-radius: 1em;
+		background-color: #666;
+		border: 0;
+	}
+
+	.ui-slider-horizontal {
+		height: 0.5em;
+	}
+
+	.ui-slider-horizontal .ui-slider-range {
+		top: 0;
+		height: 100%;
+	}
+
+	.ui-slider-horizontal .ui-slider-range-min {
+		left: -1px;
+	}
+
+	.ui-slider-horizontal .ui-slider-range-max {
+		right: -1px;
+	}
+}
+
+.widget_rating_filter {
+	li {
+		text-align: right;
+
+		.star-rating {
+			float: left;
+			margin-top: .3em;
+		}
+	}
+}
+
+.widget_product_search {
+	form {
+		position: relative;
+	}
+
+	.search-field {
+		padding-right: 100px;
+	}
+
+	input[type=submit] {
+		position: absolute;
+		top: .5em;
+		right: .5em;
+		padding-left: 1em;
+		padding-right: 1em;
+	}
+}
+
+/**
+ * Account section
+ */
+.woocommerce-account {
+	.woocommerce-MyAccount-navigation {
+		float: right;
+		width: 25%;
+		border-top: 1px solid #ddd;
+
+		li {
+			list-style: none;
+			padding: .5em 0;
+			border-bottom: 1px solid #ddd;
+
+			a {
+				box-shadow: none;
+
+				&:hover {
+					box-shadow: 0 3px 0 rgba(15, 15, 15, 1);
+				}
+			}
+
+			&:before {
+				content: "→";
+				display: inline-block;
+				margin-right: .25em;
+				color: #ddd;
+			}
+
+			&.is-active {
+				a {
+					box-shadow: 0 3px 0 rgba(15, 15, 15, 1);
+				}
+			}
+		}
+	}
+
+	.woocommerce-MyAccount-content {
+		float: left;
+	}
+}
+
+/**
+ * Cart
+ */
+.woocommerce-cart-form {
+	td {
+		padding: 1em .5em;
+	}
+
+	img {
+		max-width: 42px;
+		height: auto;
+		display: block;
+	}
+
+	dl.variation {
+		margin-top: 0;
+
+		p,
+		&:last-child {
+			margin-bottom: 0;
+		}
+	}
+
+	.button {
+		padding: 1.2em 2em;
+	}
+
+	.actions {
+		.input-text {
+			width: 130px !important;
+			float: left;
+			margin-right: .25em;
+		}
+	}
+
+	.quantity {
+		input {
+			width: 4em;
+		}
+	}
+}
+
+#shipping_method {
+	list-style: none;
+	margin-top: 1em;
+
+	li {
+		margin-bottom: .5em;
+
+		input {
+			float: left;
+		}
+
+		label {
+			line-height: 1.15;
+		}
+	}
+}
+
+.checkout-button {
+	display: block;
+	padding: 1em 2em;
+	border: 2px solid #000;
+	text-align: center;
+	font-weight: 800;
+	box-shadow: none !important;
+	-webkit-box-shadow: none !important;
+
+	&:hover {
+		box-shadow: none !important;
+		-webkit-box-shadow: none !important;
+		border-color: #999;
+	}
+
+	&:after {
+		content: "→";
+	}
+}
+
+/**
+ * Checkout
+ */
+#ship-to-different-address {
+	label {
+		font-weight: 300;
+		cursor: pointer;
+
+		span {
+			position: relative;
+			display: block;
+
+			&:before {
+				content: "";
+				display: block;
+				height: 16px;
+				width: 30px;
+				border: 2px solid #bbb;
+				background: #bbb;
+				border-radius: 13em;
+				box-sizing: content-box;
+				@include transition(all,ease-in-out,.3s);
+				position: absolute;
+				top: 4px;
+				right: 0;
+			}
+
+			&:after {
+				content: "";
+				display: block;
+				width: 14px;
+				height: 14px;
+				background: white;
+				position: absolute;
+				top: 7px;
+				right: 17px;
+				border-radius: 13em;
+				@include transition(all,ease-in-out,.3s);
+			}
+		}
+
+		input[type=checkbox] {
+			display: none;
+		}
+
+		input[type=checkbox]:checked + span:after {
+			right: 3px;
+		}
+
+		input[type=checkbox]:checked + span:before {
+			border-color: #000;
+			background: #000;
+		}
+	}
+}
+
+.woocommerce-terms-and-conditions {
+	border: 1px solid rgba(0,0,0,.2);
+	box-shadow: inset 0 1px 2px rgba(0,0,0,.1);
+	background: rgba(0,0,0,.05);
+}
+
+.woocommerce-checkout {
+	.select2-choice,
+	.select2-choice:hover {
+		box-shadow: none !important;
+		-webkit-box-shadow: none !important;
+	}
+
+	.select2-choice {
+		padding: .7em 0 .7em .7em;
+	}
+}
+
+.woocommerce-checkout-review-order-table {
+	td {
+		padding: 1em .5em;
+	}
+
+	dl.variation {
+		margin: 0;
+
+		p {
+			margin: 0;
+		}
+	}
+}
+
+.wc_payment_method {
+	list-style: none;
+	border-bottom: 1px solid #ddd;
+
+	.payment_box {
+		padding: 2em;
+		background: #eee;
+
+		ul,
+		ol {
+			&:last-of-type {
+				margin-bottom: 0;
+			}
+		}
+
+		fieldset {
+			padding: 1.5em;
+			padding-bottom: 0;
+			border: 0;
+			background: #f6f6f6;
+		}
+
+		li {
+			list-style: none;
+		}
+
+		p:last-child {
+			margin-bottom: 0;
+		}
+	}
+
+	> label:first-of-type {
+		margin: 1em 0;
+
+		img {
+			max-height: 24px;
+			max-width: 200px;
+			float: right;
+		}
+	}
+
+	label {
+		cursor: pointer;
+	}
+
+	input[type=radio] {
+		display: none;
+
+		& + label {
+			&:before {
+				content: "";
+				display: inline-block;
+				width: 16px;
+				height: 16px;
+				border: 2px solid white;
+				box-shadow: 0 0 0 2px black;
+				background: white;
+				margin-left: 4px;
+				margin-right: .5em;
+				border-radius: 100%;
+				@include transform(translateY(2px));
+			}
+		}
+
+		&:checked + label {
+			&:before {
+				background: black;
+			}
+		}
+	}
+}
+
+.colors-dark.woocommerce-checkout {
+	.wc_payment_method {
+		.payment_box {
+			background: #333;
+		}
+	}
+	.select2-container--default {
+		.select2-results {
+			.select2-results__options {
+				background:#333;
+			}
+			.select2-results__option[aria-selected="true"]{
+				color: #333;
+			}
+		}
+		.select2-selection--single {
+			background-color: #333;
+			border: 1px solid #555;
+
+			.select2-selection__rendered {
+				color: #ccc;
+			}
+		}
+	}
+}
+
+/**
+ * Layout stuff
+ */
+@media screen and (min-width: 48em) {
+	.has-sidebar.woocommerce-page:not(.error404) {
+		#primary {
+			width: 74%;
+		}
+
+		#secondary {
+			width: 20%;
+		}
+	}
+
+	body.page-two-column.woocommerce-cart:not(.archive) #primary .entry-header,
+	body.page-two-column.woocommerce-checkout:not(.archive) #primary .entry-header,
+	body.page-two-column.woocommerce-account:not(.archive) #primary .entry-header {
+		width: 16%;
+	}
+
+	body.page-two-column.woocommerce-cart:not(.archive) #primary .entry-content,
+	body.page-two-column.woocommerce-checkout:not(.archive) #primary .entry-content,
+	body.page-two-column.woocommerce-account:not(.archive) #primary .entry-content {
+		width: 78%;
+	}
+}
diff --git a/assets/css/wc-setup-rtl.css b/assets/css/wc-setup-rtl.css
new file mode 100644
index 00000000000..767a7bcb55c
--- /dev/null
+++ b/assets/css/wc-setup-rtl.css
@@ -0,0 +1 @@
+.wc-setup-content p,.wc-setup-content table{font-size:1em;line-height:1.75em;color:#666}body{margin:100px auto 24px;box-shadow:none;background:#f1f1f1;padding:0}#wc-logo{border:0;margin:0 0 24px;padding:0;text-align:center}#wc-logo img{max-width:50%}.wc-setup-content{box-shadow:0 1px 3px rgba(0,0,0,.13);padding:24px 24px 0;background:#fff;overflow:hidden;zoom:1}.wc-setup-content h1,.wc-setup-content h2,.wc-setup-content h3,.wc-setup-content table{margin:0 0 24px;border:0;padding:0;color:#666;clear:none}.wc-setup-content p{margin:0 0 24px}.wc-setup-content a{color:#a16696}.wc-setup-content a:focus,.wc-setup-content a:hover{color:#111}.wc-setup-content .form-table th{width:35%;vertical-align:top;font-weight:400}.wc-setup-content .form-table td{vertical-align:top}.wc-setup-content .form-table td input,.wc-setup-content .form-table td select{width:100%;box-sizing:border-box}.wc-setup-content .form-table td input[size]{width:auto}.wc-setup-content .form-table td .description{line-height:1.5em;display:block;margin-top:.25em;color:#999;font-style:italic}.wc-setup-content .form-table td .input-checkbox,.wc-setup-content .form-table td .input-radio{width:auto;box-sizing:inherit;padding:inherit;margin:0 0 0 .5em;box-shadow:none}.wc-setup-content .form-table .section_title td{padding:0}.wc-setup-content .form-table .section_title td h2,.wc-setup-content .form-table .section_title td p{margin:12px 0 0}.wc-setup-content .form-table td,.wc-setup-content .form-table th{padding:12px 0;margin:0;border:0}.wc-setup-content .form-table td:first-child,.wc-setup-content .form-table th:first-child{padding-left:1em}.wc-setup-content table.tax-rates{width:100%;font-size:.92em}.wc-setup-content table.tax-rates th{padding:0;text-align:center;width:auto;vertical-align:middle}.wc-setup-content table.tax-rates td{border:1px solid #f5f5f5;padding:6px;text-align:center;vertical-align:middle}.wc-setup-content table.tax-rates td input{outline:0;border:0;padding:0;box-shadow:none;text-align:center;width:100%}.wc-setup-content table.tax-rates .add,.wc-setup-content table.tax-rates .remove{padding:1em 1em 0 0;line-height:1em;width:0;height:0;display:inline-block;font-size:1em;overflow:hidden}.wc-setup-content table.tax-rates td.sort{cursor:move;color:#ccc}.wc-setup-content table.tax-rates td.sort::before{content:'\f333';font-family:dashicons}.wc-setup-content table.tax-rates td.readonly{background:#f5f5f5}.wc-setup-content table.tax-rates .add{margin:6px 0 0;position:relative}.wc-setup-content table.tax-rates .add::before{content:'\f502';font-family:dashicons;position:absolute;right:0;top:0}.wc-setup-content table.tax-rates .remove{margin:0;position:relative}.wc-setup-content table.tax-rates .remove::before{content:'\f182';font-family:dashicons;position:absolute;right:0;top:0}.wc-setup-content .wc-setup-pages{width:100%;border-top:1px solid #eee}.wc-setup-content .wc-setup-pages thead th{display:none}.wc-setup-content .wc-setup-pages .page-name{width:30%;font-weight:700}.wc-setup-content .wc-setup-pages td,.wc-setup-content .wc-setup-pages th{padding:14px 0;border-bottom:1px solid #eee}.wc-setup-content .wc-setup-pages td:first-child,.wc-setup-content .wc-setup-pages th:first-child{padding-left:9px}.wc-setup-content .wc-setup-pages th{padding-top:0}.wc-setup-content .wc-setup-pages .page-options p{color:#777;margin:6px 24px 0 0;line-height:1.75em}.wc-setup-content .wc-setup-pages .page-options p input{vertical-align:middle;margin:1px 0 0;height:1.75em;width:1.75em;line-height:1.75em}.wc-setup-content .wc-setup-pages .page-options p label{line-height:1}@media screen and (max-width:782px){.wc-setup-content .form-table tbody th{width:auto}}.wc-setup-content .twitter-share-button{float:left}.wc-setup-content .wc-setup-next-steps{overflow:hidden;margin:0 0 24px}.wc-setup-content .wc-setup-next-steps h2{margin-bottom:12px}.wc-setup-content .wc-setup-next-steps .wc-setup-next-steps-first{float:right;width:50%;box-sizing:border-box}.wc-setup-content .wc-setup-next-steps .wc-setup-next-steps-last{float:left;width:50%;box-sizing:border-box}.wc-setup-content .wc-setup-next-steps ul{padding:0 0 0 2em;list-style:none;margin:0 0 -.75em}.wc-setup-content .wc-setup-next-steps ul li a{display:block;padding:0 0 .75em}.wc-setup-content .wc-setup-next-steps ul .setup-product a{background-color:#bb77ae;border-color:#a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;text-shadow:0 -1px 1px #a36597,-1px 0 1px #a36597,0 1px 1px #a36597,1px 0 1px #a36597;font-size:1em;height:auto;line-height:1.75em;margin:0 0 .75em;opacity:1;padding:1em;text-align:center}.wc-setup-content .wc-setup-next-steps ul .setup-product a:active,.wc-setup-content .wc-setup-next-steps ul .setup-product a:focus,.wc-setup-content .wc-setup-next-steps ul .setup-product a:hover{background:#a36597;border-color:#a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597}.wc-setup-content .wc-setup-next-steps ul li a::before{color:#82878c;font:400 20px/1 dashicons;speak:none;display:inline-block;padding:0 0 0 10px;top:1px;position:relative;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important;vertical-align:top}.wc-setup-content .wc-setup-next-steps ul .learn-more a::before{content:'\f105'}.wc-setup-content .wc-setup-next-steps ul .video-walkthrough a::before{content:'\f126'}.wc-setup-content .wc-setup-next-steps ul .newsletter a::before{content:'\f465'}.wc-setup-content .updated,.wc-setup-content .woocommerce-tracker{padding:24px 24px 0;margin:0 0 24px;overflow:hidden;background:#f5f5f5}.wc-setup-content .updated p,.wc-setup-content .woocommerce-tracker p{padding:0;margin:0 0 12px}.wc-setup-content .updated p:last-child,.wc-setup-content .woocommerce-tracker p:last-child{margin:0 0 24px}.wc-setup-steps{padding:0 0 24px;margin:0;list-style:none;overflow:hidden;color:#ccc;width:100%;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:-webkit-inline-box;display:inline-flex}.wc-setup-steps li{width:20%;float:right;padding:0 0 .8em;margin:0;text-align:center;position:relative;border-bottom:4px solid #ccc;line-height:1.4em}.wc-setup-steps li::before{content:'';border:4px solid #ccc;border-radius:100%;width:4px;height:4px;position:absolute;bottom:0;right:50%;margin-right:-6px;margin-bottom:-8px;background:#fff}.wc-setup-steps li.active{border-color:#a16696;color:#a16696}.wc-setup-steps li.active::before{border-color:#a16696}.wc-setup-steps li.done{border-color:#a16696;color:#a16696}.wc-setup-steps li.done::before{border-color:#a16696;background:#a16696}.wc-setup .wc-setup-actions{overflow:hidden}.wc-setup .wc-setup-actions .button{float:left;font-size:1.25em;padding:.5em 1em;line-height:1em;margin-left:.5em;margin-bottom:2px;height:auto;border-radius:4px}.wc-setup .wc-setup-actions .button-primary{background-color:#bb77ae;border-color:#a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;text-shadow:0 -1px 1px #a36597,-1px 0 1px #a36597,0 1px 1px #a36597,1px 0 1px #a36597;float:left;margin:0;opacity:1}.wc-setup .wc-setup-actions .button-primary:active,.wc-setup .wc-setup-actions .button-primary:focus,.wc-setup .wc-setup-actions .button-primary:hover{background:#a36597;border-color:#a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597}.wc-return-to-dashboard{font-size:.85em;color:#b5b5b5;margin:1.18em 0;display:block;text-align:center}ul.wc-wizard-payment-gateways{border:1px solid #eee;border-bottom-width:2px;padding:0;margin:0 0 1em;list-style:none;border-radius:4px}ul.wc-wizard-payment-gateways li.wc-wizard-gateway{padding:1.5em 4em 1em 1em;border-top:1px solid #eee;list-style:none;cursor:pointer;color:#555;box-sizing:border-box;clear:both}ul.wc-wizard-payment-gateways li.wc-wizard-gateway:first-child{border-top:0}ul.wc-wizard-payment-gateways li.wc-wizard-gateway.featured{width:50%;float:right;clear:none;border-left:1px solid #eee;border-top:0}ul.wc-wizard-payment-gateways li.wc-wizard-gateway.featured-row-last{border-left:0}ul.wc-wizard-payment-gateways li.wc-wizard-gateway .wc-wizard-gateway-settings{display:none;margin-bottom:0;cursor:default}ul.wc-wizard-payment-gateways li.wc-wizard-gateway.checked{background:#f7f1f6}ul.wc-wizard-payment-gateways li.wc-wizard-gateway.checked .wc-wizard-gateway-settings{display:table}ul.wc-wizard-payment-gateways li.wc-wizard-gateway .wc-wizard-gateway-description{font-style:italic}ul.wc-wizard-payment-gateways li.wc-wizard-gateway .wc-wizard-gateway-description p,ul.wc-wizard-payment-gateways li.wc-wizard-gateway .wc-wizard-gateway-enable{margin:0 0 .5em}ul.wc-wizard-payment-gateways li.wc-wizard-gateway .wc-wizard-gateway-enable label{display:block;font-weight:700;vertical-align:middle}ul.wc-wizard-payment-gateways li.wc-wizard-gateway .wc-wizard-gateway-enable label img{max-height:2em;vertical-align:middle}ul.wc-wizard-payment-gateways li.wc-wizard-gateway .wc-wizard-gateway-enable label::before{content:'';background:#fff;border:2px solid #eee;display:inline-block;float:right;vertical-align:middle;width:2em;height:2em;padding:0;box-sizing:border-box;line-height:1.8em;text-align:center;margin:0 -3em 0 1em;border-radius:4px}ul.wc-wizard-payment-gateways li.wc-wizard-gateway .wc-wizard-gateway-enable input{opacity:0;width:0;position:absolute}ul.wc-wizard-payment-gateways li.wc-wizard-gateway .wc-wizard-gateway-enable input:checked+label::before{content:'\f147';font-family:dashicons;color:#fff;border-color:#a46497;background:#a46497}ul.wc-wizard-payment-gateways li.wc-wizard-gateway .wc-wizard-gateway-enable input:focus+label{outline:#ddd solid 1px}
\ No newline at end of file
diff --git a/assets/css/wc-setup.css b/assets/css/wc-setup.css
index ad882fed10b..5dd710d6750 100644
--- a/assets/css/wc-setup.css
+++ b/assets/css/wc-setup.css
@@ -1 +1 @@
-.wc-setup-content p,.wc-setup-content table{font-size:1em;line-height:1.75em;color:#666}body{margin:100px auto 24px;box-shadow:none;background:#f1f1f1;padding:0}#wc-logo{border:0;margin:0 0 24px;padding:0;text-align:center}#wc-logo img{max-width:50%}.wc-setup-content{box-shadow:0 1px 3px rgba(0,0,0,.13);padding:24px 24px 0;background:#fff;overflow:hidden;zoom:1}.wc-setup-content h1,.wc-setup-content h2,.wc-setup-content h3,.wc-setup-content table{margin:0 0 24px;border:0;padding:0;color:#666;clear:none}.wc-setup-content p{margin:0 0 24px}.wc-setup-content a{color:#a16696}.wc-setup-content a:focus,.wc-setup-content a:hover{color:#111}.wc-setup-content .form-table th{width:35%;vertical-align:top;font-weight:400}.wc-setup-content .form-table td{vertical-align:top}.wc-setup-content .form-table td input,.wc-setup-content .form-table td select{width:100%;box-sizing:border-box}.wc-setup-content .form-table td input[size]{width:auto}.wc-setup-content .form-table td .description{line-height:1.5em;display:block;margin-top:.25em;color:#999;font-style:italic}.wc-setup-content .form-table td .input-checkbox,.wc-setup-content .form-table td .input-radio{width:auto;box-sizing:inherit;padding:inherit;margin:0 .5em 0 0;box-shadow:none}.wc-setup-content .form-table .section_title td{padding:0}.wc-setup-content .form-table .section_title td h2,.wc-setup-content .form-table .section_title td p{margin:12px 0 0}.wc-setup-content .form-table td,.wc-setup-content .form-table th{padding:12px 0;margin:0;border:0}.wc-setup-content .form-table td:first-child,.wc-setup-content .form-table th:first-child{padding-right:1em}.wc-setup-content .form-table table.tax-rates{width:100%;font-size:.92em}.wc-setup-content .form-table table.tax-rates th{padding:0;text-align:center;width:auto;vertical-align:middle}.wc-setup-content .form-table table.tax-rates td{border:1px solid #eee;padding:6px;text-align:center;vertical-align:middle}.wc-setup-content .form-table table.tax-rates td input{outline:0;border:0;padding:0;box-shadow:none;text-align:center}.wc-setup-content .form-table table.tax-rates td.sort{cursor:move;color:#ccc}.wc-setup-content .form-table table.tax-rates td.sort:before{content:"\f333";font-family:dashicons}.wc-setup-content .form-table table.tax-rates .add{padding:1em 0 0 1em;line-height:1em;font-size:1em;width:0;margin:6px 0 0;height:0;overflow:hidden;position:relative;display:inline-block}.wc-setup-content .form-table table.tax-rates .add:before{content:"\f502";font-family:dashicons;position:absolute;left:0;top:0}.wc-setup-content .form-table table.tax-rates .remove{padding:1em 0 0 1em;line-height:1em;font-size:1em;width:0;margin:0;height:0;overflow:hidden;position:relative;display:inline-block}.wc-setup-content .form-table table.tax-rates .remove:before{content:"\f182";font-family:dashicons;position:absolute;left:0;top:0}.wc-setup-content .wc-setup-pages{width:100%;border-top:1px solid #eee}.wc-setup-content .wc-setup-pages thead th{display:none}.wc-setup-content .wc-setup-pages .page-name{width:30%;font-weight:700}.wc-setup-content .wc-setup-pages td,.wc-setup-content .wc-setup-pages th{padding:14px 0;border-bottom:1px solid #eee}.wc-setup-content .wc-setup-pages td:first-child,.wc-setup-content .wc-setup-pages th:first-child{padding-right:9px}.wc-setup-content .wc-setup-pages th{padding-top:0}.wc-setup-content .wc-setup-pages .page-options p{color:#777;margin:6px 0 0 24px;line-height:1.75em}.wc-setup-content .wc-setup-pages .page-options p input{vertical-align:middle;margin:1px 0 0;height:1.75em;width:1.75em;line-height:1.75em}.wc-setup-content .wc-setup-pages .page-options p label{line-height:1}@media screen and (max-width:782px){.wc-setup-content .form-table tbody th{width:auto}}.wc-setup-content .twitter-share-button{float:right}.wc-setup-content .wc-setup-next-steps{overflow:hidden;margin:0 0 24px}.wc-setup-content .wc-setup-next-steps h2{margin-bottom:12px}.wc-setup-content .wc-setup-next-steps .wc-setup-next-steps-first{float:left;width:50%;box-sizing:border-box}.wc-setup-content .wc-setup-next-steps .wc-setup-next-steps-last{float:right;width:50%;box-sizing:border-box}.wc-setup-content .wc-setup-next-steps ul{padding:0 2em 0 0;list-style:none;margin:0 0 -.75em}.wc-setup-content .wc-setup-next-steps ul li a{display:block;padding:0 0 .75em}.wc-setup-content .wc-setup-next-steps ul .setup-product a{background-color:#a16696;border-color:#a16696;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 0 rgba(0,0,0,.15);font-size:1em;height:auto;line-height:1.75em;margin:0 0 .75em;opacity:1;padding:1em;text-align:center;text-shadow:0 -1px 1px #8a4f7f,1px 0 1px #8a4f7f,0 1px 1px #8a4f7f,-1px 0 1px #8a4f7f}.wc-setup-content .wc-setup-next-steps ul li a:before{color:#82878c;font:400 20px/1 dashicons;speak:none;display:inline-block;padding:0 10px 0 0;top:1px;position:relative;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important;vertical-align:top}.wc-setup-content .wc-setup-next-steps ul .learn-more a:before{content:"\f105"}.wc-setup-content .wc-setup-next-steps ul .video-walkthrough a:before{content:"\f126"}.wc-setup-content .wc-setup-next-steps ul .sidekick a:before{content:"\f118"}.wc-setup-content .wc-setup-next-steps ul .newsletter a:before{content:"\f465"}.wc-setup-content .updated,.wc-setup-content .woocommerce-tracker{padding:24px 24px 0;margin:0 0 24px;overflow:hidden;background:#f5f5f5}.wc-setup-content .updated p,.wc-setup-content .woocommerce-tracker p{padding:0;margin:0 0 12px}.wc-setup-content .updated p:last-child,.wc-setup-content .woocommerce-tracker p:last-child{margin:0 0 24px}.wc-setup-steps{padding:0 0 24px;margin:0;list-style:none;overflow:hidden;color:#ccc;width:100%;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex}.wc-setup-steps li{width:20%;float:left;padding:0 0 .8em;margin:0;text-align:center;position:relative;border-bottom:4px solid #ccc;line-height:1.4em}.wc-setup-steps li:before{content:"";border:4px solid #ccc;border-radius:100%;width:4px;height:4px;position:absolute;bottom:0;left:50%;margin-left:-6px;margin-bottom:-8px;background:#fff}.wc-setup-steps li.active{border-color:#a16696;color:#a16696}.wc-setup-steps li.active:before{border-color:#a16696}.wc-setup-steps li.done{border-color:#a16696;color:#a16696}.wc-setup-steps li.done:before{border-color:#a16696;background:#a16696}.wc-setup .wc-setup-actions{overflow:hidden}.wc-setup .wc-setup-actions .button{float:right;font-size:1.25em;padding:.5em 1em;line-height:1em;margin-right:.5em;height:auto}.wc-setup .wc-setup-actions .button-primary{background-color:#a16696;border-color:#a16696;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 0 rgba(0,0,0,.15);float:right;margin:0;opacity:1;text-shadow:0 -1px 1px #8a4f7f,1px 0 1px #8a4f7f,0 1px 1px #8a4f7f,-1px 0 1px #8a4f7f}.wc-return-to-dashboard{font-size:.85em;color:#b5b5b5;margin:1.18em 0;display:block;text-align:center}
\ No newline at end of file
+.wc-setup-content p,.wc-setup-content table{font-size:1em;line-height:1.75em;color:#666}body{margin:100px auto 24px;box-shadow:none;background:#f1f1f1;padding:0}#wc-logo{border:0;margin:0 0 24px;padding:0;text-align:center}#wc-logo img{max-width:50%}.wc-setup-content{box-shadow:0 1px 3px rgba(0,0,0,.13);padding:24px 24px 0;background:#fff;overflow:hidden;zoom:1}.wc-setup-content h1,.wc-setup-content h2,.wc-setup-content h3,.wc-setup-content table{margin:0 0 24px;border:0;padding:0;color:#666;clear:none}.wc-setup-content p{margin:0 0 24px}.wc-setup-content a{color:#a16696}.wc-setup-content a:focus,.wc-setup-content a:hover{color:#111}.wc-setup-content .form-table th{width:35%;vertical-align:top;font-weight:400}.wc-setup-content .form-table td{vertical-align:top}.wc-setup-content .form-table td input,.wc-setup-content .form-table td select{width:100%;box-sizing:border-box}.wc-setup-content .form-table td input[size]{width:auto}.wc-setup-content .form-table td .description{line-height:1.5em;display:block;margin-top:.25em;color:#999;font-style:italic}.wc-setup-content .form-table td .input-checkbox,.wc-setup-content .form-table td .input-radio{width:auto;box-sizing:inherit;padding:inherit;margin:0 .5em 0 0;box-shadow:none}.wc-setup-content .form-table .section_title td{padding:0}.wc-setup-content .form-table .section_title td h2,.wc-setup-content .form-table .section_title td p{margin:12px 0 0}.wc-setup-content .form-table td,.wc-setup-content .form-table th{padding:12px 0;margin:0;border:0}.wc-setup-content .form-table td:first-child,.wc-setup-content .form-table th:first-child{padding-right:1em}.wc-setup-content table.tax-rates{width:100%;font-size:.92em}.wc-setup-content table.tax-rates th{padding:0;text-align:center;width:auto;vertical-align:middle}.wc-setup-content table.tax-rates td{border:1px solid #f5f5f5;padding:6px;text-align:center;vertical-align:middle}.wc-setup-content table.tax-rates td input{outline:0;border:0;padding:0;box-shadow:none;text-align:center;width:100%}.wc-setup-content table.tax-rates .add,.wc-setup-content table.tax-rates .remove{padding:1em 0 0 1em;line-height:1em;width:0;height:0;display:inline-block;font-size:1em;overflow:hidden}.wc-setup-content table.tax-rates td.sort{cursor:move;color:#ccc}.wc-setup-content table.tax-rates td.sort::before{content:'\f333';font-family:dashicons}.wc-setup-content table.tax-rates td.readonly{background:#f5f5f5}.wc-setup-content table.tax-rates .add{margin:6px 0 0;position:relative}.wc-setup-content table.tax-rates .add::before{content:'\f502';font-family:dashicons;position:absolute;left:0;top:0}.wc-setup-content table.tax-rates .remove{margin:0;position:relative}.wc-setup-content table.tax-rates .remove::before{content:'\f182';font-family:dashicons;position:absolute;left:0;top:0}.wc-setup-content .wc-setup-pages{width:100%;border-top:1px solid #eee}.wc-setup-content .wc-setup-pages thead th{display:none}.wc-setup-content .wc-setup-pages .page-name{width:30%;font-weight:700}.wc-setup-content .wc-setup-pages td,.wc-setup-content .wc-setup-pages th{padding:14px 0;border-bottom:1px solid #eee}.wc-setup-content .wc-setup-pages td:first-child,.wc-setup-content .wc-setup-pages th:first-child{padding-right:9px}.wc-setup-content .wc-setup-pages th{padding-top:0}.wc-setup-content .wc-setup-pages .page-options p{color:#777;margin:6px 0 0 24px;line-height:1.75em}.wc-setup-content .wc-setup-pages .page-options p input{vertical-align:middle;margin:1px 0 0;height:1.75em;width:1.75em;line-height:1.75em}.wc-setup-content .wc-setup-pages .page-options p label{line-height:1}@media screen and (max-width:782px){.wc-setup-content .form-table tbody th{width:auto}}.wc-setup-content .twitter-share-button{float:right}.wc-setup-content .wc-setup-next-steps{overflow:hidden;margin:0 0 24px}.wc-setup-content .wc-setup-next-steps h2{margin-bottom:12px}.wc-setup-content .wc-setup-next-steps .wc-setup-next-steps-first{float:left;width:50%;box-sizing:border-box}.wc-setup-content .wc-setup-next-steps .wc-setup-next-steps-last{float:right;width:50%;box-sizing:border-box}.wc-setup-content .wc-setup-next-steps ul{padding:0 2em 0 0;list-style:none;margin:0 0 -.75em}.wc-setup-content .wc-setup-next-steps ul li a{display:block;padding:0 0 .75em}.wc-setup-content .wc-setup-next-steps ul .setup-product a{background-color:#bb77ae;border-color:#a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;text-shadow:0 -1px 1px #a36597,1px 0 1px #a36597,0 1px 1px #a36597,-1px 0 1px #a36597;font-size:1em;height:auto;line-height:1.75em;margin:0 0 .75em;opacity:1;padding:1em;text-align:center}.wc-setup-content .wc-setup-next-steps ul .setup-product a:active,.wc-setup-content .wc-setup-next-steps ul .setup-product a:focus,.wc-setup-content .wc-setup-next-steps ul .setup-product a:hover{background:#a36597;border-color:#a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597}.wc-setup-content .wc-setup-next-steps ul li a::before{color:#82878c;font:400 20px/1 dashicons;speak:none;display:inline-block;padding:0 10px 0 0;top:1px;position:relative;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important;vertical-align:top}.wc-setup-content .wc-setup-next-steps ul .learn-more a::before{content:'\f105'}.wc-setup-content .wc-setup-next-steps ul .video-walkthrough a::before{content:'\f126'}.wc-setup-content .wc-setup-next-steps ul .newsletter a::before{content:'\f465'}.wc-setup-content .updated,.wc-setup-content .woocommerce-tracker{padding:24px 24px 0;margin:0 0 24px;overflow:hidden;background:#f5f5f5}.wc-setup-content .updated p,.wc-setup-content .woocommerce-tracker p{padding:0;margin:0 0 12px}.wc-setup-content .updated p:last-child,.wc-setup-content .woocommerce-tracker p:last-child{margin:0 0 24px}.wc-setup-steps{padding:0 0 24px;margin:0;list-style:none;overflow:hidden;color:#ccc;width:100%;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:-webkit-inline-box;display:inline-flex}.wc-setup-steps li{width:20%;float:left;padding:0 0 .8em;margin:0;text-align:center;position:relative;border-bottom:4px solid #ccc;line-height:1.4em}.wc-setup-steps li::before{content:'';border:4px solid #ccc;border-radius:100%;width:4px;height:4px;position:absolute;bottom:0;left:50%;margin-left:-6px;margin-bottom:-8px;background:#fff}.wc-setup-steps li.active{border-color:#a16696;color:#a16696}.wc-setup-steps li.active::before{border-color:#a16696}.wc-setup-steps li.done{border-color:#a16696;color:#a16696}.wc-setup-steps li.done::before{border-color:#a16696;background:#a16696}.wc-setup .wc-setup-actions{overflow:hidden}.wc-setup .wc-setup-actions .button{float:right;font-size:1.25em;padding:.5em 1em;line-height:1em;margin-right:.5em;margin-bottom:2px;height:auto;border-radius:4px}.wc-setup .wc-setup-actions .button-primary{background-color:#bb77ae;border-color:#a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;text-shadow:0 -1px 1px #a36597,1px 0 1px #a36597,0 1px 1px #a36597,-1px 0 1px #a36597;float:right;margin:0;opacity:1}.wc-setup .wc-setup-actions .button-primary:active,.wc-setup .wc-setup-actions .button-primary:focus,.wc-setup .wc-setup-actions .button-primary:hover{background:#a36597;border-color:#a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597}.wc-return-to-dashboard{font-size:.85em;color:#b5b5b5;margin:1.18em 0;display:block;text-align:center}ul.wc-wizard-payment-gateways{border:1px solid #eee;border-bottom-width:2px;padding:0;margin:0 0 1em;list-style:none;border-radius:4px}ul.wc-wizard-payment-gateways li.wc-wizard-gateway{padding:1.5em 1em 1em 4em;border-top:1px solid #eee;list-style:none;cursor:pointer;color:#555;box-sizing:border-box;clear:both}ul.wc-wizard-payment-gateways li.wc-wizard-gateway:first-child{border-top:0}ul.wc-wizard-payment-gateways li.wc-wizard-gateway.featured{width:50%;float:left;clear:none;border-right:1px solid #eee;border-top:0}ul.wc-wizard-payment-gateways li.wc-wizard-gateway.featured-row-last{border-right:0}ul.wc-wizard-payment-gateways li.wc-wizard-gateway .wc-wizard-gateway-settings{display:none;margin-bottom:0;cursor:default}ul.wc-wizard-payment-gateways li.wc-wizard-gateway.checked{background:#f7f1f6}ul.wc-wizard-payment-gateways li.wc-wizard-gateway.checked .wc-wizard-gateway-settings{display:table}ul.wc-wizard-payment-gateways li.wc-wizard-gateway .wc-wizard-gateway-description{font-style:italic}ul.wc-wizard-payment-gateways li.wc-wizard-gateway .wc-wizard-gateway-description p,ul.wc-wizard-payment-gateways li.wc-wizard-gateway .wc-wizard-gateway-enable{margin:0 0 .5em}ul.wc-wizard-payment-gateways li.wc-wizard-gateway .wc-wizard-gateway-enable label{display:block;font-weight:700;vertical-align:middle}ul.wc-wizard-payment-gateways li.wc-wizard-gateway .wc-wizard-gateway-enable label img{max-height:2em;vertical-align:middle}ul.wc-wizard-payment-gateways li.wc-wizard-gateway .wc-wizard-gateway-enable label::before{content:'';background:#fff;border:2px solid #eee;display:inline-block;float:left;vertical-align:middle;width:2em;height:2em;padding:0;box-sizing:border-box;line-height:1.8em;text-align:center;margin:0 1em 0 -3em;border-radius:4px}ul.wc-wizard-payment-gateways li.wc-wizard-gateway .wc-wizard-gateway-enable input{opacity:0;width:0;position:absolute}ul.wc-wizard-payment-gateways li.wc-wizard-gateway .wc-wizard-gateway-enable input:checked+label::before{content:'\f147';font-family:dashicons;color:#fff;border-color:#a46497;background:#a46497}ul.wc-wizard-payment-gateways li.wc-wizard-gateway .wc-wizard-gateway-enable input:focus+label{outline:#ddd solid 1px}
\ No newline at end of file
diff --git a/assets/css/wc-setup.scss b/assets/css/wc-setup.scss
index 6d0cb79ce3c..a35214bdb74 100644
--- a/assets/css/wc-setup.scss
+++ b/assets/css/wc-setup.scss
@@ -14,7 +14,7 @@ body {
 	}
 }
 .wc-setup-content {
-	box-shadow: 0 1px 3px rgba(0,0,0,0.13);
+	box-shadow: 0 1px 3px rgba(0, 0, 0, 0.13);
 	padding: 24px 24px 0;
 	background: #fff;
 	overflow: hidden;
@@ -62,7 +62,7 @@ body {
 			.description {
 				line-height: 1.5em;
 				display: block;
-				margin-top: .25em;
+				margin-top: 0.25em;
 				color: #999;
 				font-style: italic;
 			}
@@ -70,7 +70,7 @@ body {
 				width: auto;
 				box-sizing: inherit;
 				padding: inherit;
-				margin: 0 .5em 0 0;
+				margin: 0 0.5em 0 0;
 				box-shadow: none;
 			}
 		}
@@ -90,71 +90,75 @@ body {
 				padding-right: 1em;
 			}
 		}
-		table.tax-rates {
-			width: 100%;
-			font-size: .92em;
-			th {
+	}
+	table.tax-rates {
+		width: 100%;
+		font-size: 0.92em;
+		th {
+			padding: 0;
+			text-align: center;
+			width: auto;
+			vertical-align: middle;
+		}
+		td {
+			border: 1px solid #f5f5f5;
+			padding: 6px;
+			text-align: center;
+			vertical-align: middle;
+			input {
+				outline: 0;
+				border: 0;
 				padding: 0;
+				box-shadow: none;
 				text-align: center;
-				width: auto;
-				vertical-align: middle;
+				width: 100%;
 			}
-			td {
-				border: 1px solid #eee;
-				padding: 6px 6px;
-				text-align: center;
-				vertical-align: middle;
-				input {
-					outline: 0;
-					border: 0;
-					padding: 0;
-					box-shadow: none;
-					text-align: center;
-				}
-				&.sort {
-					cursor: move;
-					color: #ccc;
-					&:before {
-						content: "\f333";
-						font-family: 'dashicons';
-					}
-				}
-			}
-			.add {
-				padding: 1em 0 0 1em;
-				line-height: 1em;
-				font-size: 1em;
-				width: 0;
-				margin: 6px 0 0;
-				height: 0;
-				overflow: hidden;
-				position: relative;
-				display: inline-block;
-				&:before {
-					content: "\f502";
+			&.sort {
+				cursor: move;
+				color: #ccc;
+				&::before {
+					content: '\f333';
 					font-family: 'dashicons';
-					position: absolute;
-					left: 0;
-					top: 0;
 				}
 			}
-			.remove {
-				padding: 1em 0 0 1em;
-				line-height: 1em;
-				font-size: 1em;
-				width: 0;
-				margin: 0;
-				height: 0;
-				overflow: hidden;
-				position: relative;
-				display: inline-block;
-				&:before {
-					content: "\f182";
-					font-family: 'dashicons';
-					position: absolute;
-					left: 0;
-					top: 0;
-				}
+			&.readonly {
+				background: #f5f5f5;
+			}
+		}
+		.add {
+			padding: 1em 0 0 1em;
+			line-height: 1em;
+			font-size: 1em;
+			width: 0;
+			margin: 6px 0 0;
+			height: 0;
+			overflow: hidden;
+			position: relative;
+			display: inline-block;
+			&::before {
+				content: '\f502';
+				font-family: 'dashicons';
+				position: absolute;
+				left: 0;
+				top: 0;
+			}
+		}
+		.remove {
+			padding: 1em 0 0 1em;
+			line-height: 1em;
+			font-size: 1em;
+			width: 0;
+			margin: 0;
+			height: 0;
+			overflow: hidden;
+			position: relative;
+			display: inline-block;
+			&::before {
+				content: '\f182';
+				font-family: 'dashicons';
+				position: absolute;
+				left: 0;
+				top: 0;
 			}
 		}
 	}
@@ -185,7 +189,7 @@ body {
 				line-height: 1.75em;
 				input {
 					vertical-align: middle;
-					margin: 1px 0 0 0;
+					margin: 1px 0 0;
 					height: 1.75em;
 					width: 1.75em;
 					line-height: 1.75em;
@@ -227,28 +231,35 @@ body {
 		ul {
 			padding: 0 2em 0 0;
 			list-style: none outside;
-			margin: 0 0 -.75em;
+			margin: 0 0 -0.75em;
 			li a {
 				display: block;
-				padding: 0 0 .75em;
+				padding: 0 0 0.75em;
 			}
 			.setup-product {
 				a {
-					background-color: #a16696;
-					border-color: #a16696;
-					-webkit-box-shadow: inset 0 1px 0 rgba( 255, 255, 255, 0.2 ), 0 1px 0 rgba( 0, 0, 0, 0.15 );
-					box-shadow: inset 0 1px 0 rgba( 255, 255, 255, 0.2 ), 0 1px 0 rgba( 0, 0, 0, 0.15 );
+					background-color: #bb77ae;
+					border-color: #a36597;
+					-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 #a36597;
+					box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 #a36597;
+					text-shadow: 0 -1px 1px #a36597, 1px 0 1px #a36597, 0 1px 1px #a36597, -1px 0 1px #a36597;
 					font-size: 1em;
 					height: auto;
 					line-height: 1.75em;
-					margin: 0 0 .75em;
+					margin: 0 0 0.75em;
 					opacity: 1;
 					padding: 1em;
 					text-align: center;
-					text-shadow: 0px -1px 1px #8a4f7f, 1px 0px 1px #8a4f7f, 0px 1px 1px #8a4f7f, -1px 0px 1px #8a4f7f;
+
+					&:hover, &:focus, &:active {
+						background: #a36597;
+						border-color: #a36597;
+						-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 #a36597;
+						box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 #a36597;
+					}
 				}
 			}
-			li a:before {
+			li a::before {
 				color: #82878c;
 				font: normal 20px/1 'dashicons';
 				speak: none;
@@ -261,23 +272,20 @@ body {
 				text-decoration: none !important;
 				vertical-align: top;
 			}
-			.learn-more a:before {
-				content: "\f105";
+			.learn-more a::before {
+				content: '\f105';
 			}
-			.video-walkthrough a:before {
-				content: "\f126";
+			.video-walkthrough a::before {
+				content: '\f126';
 			}
-			.sidekick a:before {
-				content: "\f118";
-			}
-			.newsletter a:before {
-				content: "\f465";
+			.newsletter a::before {
+				content: '\f465';
 			}
 		}
 	}
 	.woocommerce-tracker, .updated {
 		padding: 24px 24px 0;
-		margin: 0 0 24px 0;
+		margin: 0 0 24px;
 		overflow: hidden;
 		background: #f5f5f5;
 		p {
@@ -285,7 +293,7 @@ body {
 			margin: 0 0 12px;
 		}
 		p:last-child {
-			margin: 0 0 24px 0;
+			margin: 0 0 24px;
 		}
 	}
 }
@@ -309,8 +317,8 @@ body {
 		border-bottom: 4px solid #ccc;
 		line-height: 1.4em;
 	}
-	li:before {
-		content: "";
+	li::before {
+		content: '';
 		border: 4px solid #ccc;
 		border-radius: 100%;
 		width: 4px;
@@ -325,14 +333,14 @@ body {
 	li.active {
 		border-color: #a16696;
 		color: #a16696;
-		&:before {
+		&::before {
 			border-color: #a16696;
 		}
 	}
 	li.done {
 		border-color: #a16696;
 		color: #a16696;
-		&:before {
+		&::before {
 			border-color: #a16696;
 			background: #a16696;
 		}
@@ -343,20 +351,29 @@ body {
 	.button {
 		float: right;
 		font-size: 1.25em;
-		padding: .5em 1em;
+		padding: 0.5em 1em;
 		line-height: 1em;
-		margin-right: .5em;
+		margin-right: 0.5em;
+		margin-bottom: 2px;
 		height: auto;
+		border-radius: 4px;
 	}
 	.button-primary {
-		background-color: #a16696;
-		border-color: #a16696;
-		-webkit-box-shadow: inset 0 1px 0 rgba( 255, 255, 255, 0.2 ), 0 1px 0 rgba( 0, 0, 0, 0.15 );
-		box-shadow: inset 0 1px 0 rgba( 255, 255, 255, 0.2 ), 0 1px 0 rgba( 0, 0, 0, 0.15 );
+		background-color: #bb77ae;
+		border-color: #a36597;
+		-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 #a36597;
+		box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 #a36597;
+		text-shadow: 0 -1px 1px #a36597, 1px 0 1px #a36597, 0 1px 1px #a36597, -1px 0 1px #a36597;
 		float: right;
 		margin: 0;
 		opacity: 1;
-		text-shadow: 0px -1px 1px #8a4f7f, 1px 0px 1px #8a4f7f, 0px 1px 1px #8a4f7f, -1px 0px 1px #8a4f7f;
+
+		&:hover, &:focus, &:active {
+			background: #a36597;
+			border-color: #a36597;
+			-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 #a36597;
+			box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 #a36597;
+		}
 	}
 }
 .wc-return-to-dashboard {
@@ -366,3 +383,108 @@ body {
 	display: block;
 	text-align: center;
 }
+
+ul.wc-wizard-payment-gateways {
+	border: 1px solid #eee;
+	border-bottom-width: 2px;
+	padding: 0;
+	margin: 0 0 1em;
+	list-style: none outside;
+	border-radius: 4px;
+
+	li.wc-wizard-gateway {
+		padding: 1.5em 1em 1em 4em;
+		border-top: 1px solid #eee;
+		list-style: none outside;
+		cursor: pointer;
+		color: #555;
+		box-sizing: border-box;
+		clear: both;
+
+		&:first-child {
+			border-top: 0;
+		}
+
+		&.featured {
+			width: 50%;
+			float: left;
+			clear: none;
+			border-right: 1px solid #eee;
+			border-top: 0;
+		}
+
+		&.featured-row-last {
+			border-right: 0;
+		}
+
+		.wc-wizard-gateway-settings {
+			display: none;
+			margin-bottom: 0;
+			cursor: default;
+		}
+
+		&.checked {
+			background: #f7f1f6;
+
+			.wc-wizard-gateway-settings {
+				display: table;
+			}
+		}
+
+		.wc-wizard-gateway-description {
+			font-style: italic;
+
+			p {
+				margin: 0 0 0.5em;
+			}
+		}
+
+		.wc-wizard-gateway-enable {
+			margin: 0 0 0.5em;
+
+			label {
+				display: block;
+				font-weight: bold;
+				vertical-align: middle;
+
+				img {
+					max-height: 2em;
+					vertical-align: middle;
+				}
+			}
+			label::before {
+				content: '';
+				background: #fff;
+				border: 2px solid #eee;
+				display: inline-block;
+				float: left;
+				vertical-align: middle;
+				width: 2em;
+				height: 2em;
+				padding: 0;
+				box-sizing: border-box;
+				line-height: 1.8em;
+				text-align: center;
+				margin: 0 1em 0 -3em;
+				border-radius: 4px;
+			}
+			input {
+				opacity: 0;
+				width: 0;
+				position: absolute;
+
+				&:checked + label::before {
+					content: '\f147';
+					font-family: 'dashicons';
+					color: #fff;
+					border-color: #a46497;
+					background: #a46497;
+				}
+
+				&:focus + label {
+					outline: 1px solid #ddd; /* focus style */
+				}
+			}
+		}
+	}
+}
diff --git a/assets/css/woocommerce-layout-rtl.css b/assets/css/woocommerce-layout-rtl.css
new file mode 100644
index 00000000000..a891d2ff9d0
--- /dev/null
+++ b/assets/css/woocommerce-layout-rtl.css
@@ -0,0 +1 @@
+.woocommerce #content div.product .woocommerce-tabs ul.tabs::after,.woocommerce #content div.product .woocommerce-tabs ul.tabs::before,.woocommerce #content div.product div.thumbnails::after,.woocommerce #content div.product div.thumbnails::before,.woocommerce .col2-set::after,.woocommerce .col2-set::before,.woocommerce div.product .woocommerce-tabs ul.tabs::after,.woocommerce div.product .woocommerce-tabs ul.tabs::before,.woocommerce div.product div.thumbnails::after,.woocommerce div.product div.thumbnails::before,.woocommerce-page #content div.product .woocommerce-tabs ul.tabs::after,.woocommerce-page #content div.product .woocommerce-tabs ul.tabs::before,.woocommerce-page #content div.product div.thumbnails::after,.woocommerce-page #content div.product div.thumbnails::before,.woocommerce-page .col2-set::after,.woocommerce-page .col2-set::before,.woocommerce-page div.product .woocommerce-tabs ul.tabs::after,.woocommerce-page div.product .woocommerce-tabs ul.tabs::before,.woocommerce-page div.product div.thumbnails::after,.woocommerce-page div.product div.thumbnails::before{content:' ';display:table}.woocommerce #content div.product .woocommerce-tabs,.woocommerce #content div.product .woocommerce-tabs ul.tabs::after,.woocommerce #content div.product div.thumbnails a.first,.woocommerce #content div.product div.thumbnails::after,.woocommerce .cart-collaterals::after,.woocommerce .col2-set::after,.woocommerce .woocommerce-pagination ul.page-numbers::after,.woocommerce div.product .woocommerce-tabs,.woocommerce div.product .woocommerce-tabs ul.tabs::after,.woocommerce div.product div.thumbnails a.first,.woocommerce div.product div.thumbnails::after,.woocommerce ul.products,.woocommerce ul.products li.first,.woocommerce ul.products::after,.woocommerce-page #content div.product .woocommerce-tabs,.woocommerce-page #content div.product .woocommerce-tabs ul.tabs::after,.woocommerce-page #content div.product div.thumbnails a.first,.woocommerce-page #content div.product div.thumbnails::after,.woocommerce-page .cart-collaterals::after,.woocommerce-page .col2-set::after,.woocommerce-page .woocommerce-pagination ul.page-numbers::after,.woocommerce-page div.product .woocommerce-tabs,.woocommerce-page div.product .woocommerce-tabs ul.tabs::after,.woocommerce-page div.product div.thumbnails a.first,.woocommerce-page div.product div.thumbnails::after,.woocommerce-page ul.products,.woocommerce-page ul.products li.first,.woocommerce-page ul.products::after{clear:both}.woocommerce .woocommerce-error .button,.woocommerce .woocommerce-info .button,.woocommerce .woocommerce-message .button,.woocommerce-page .woocommerce-error .button,.woocommerce-page .woocommerce-info .button,.woocommerce-page .woocommerce-message .button{float:left}.woocommerce .col2-set,.woocommerce-page .col2-set{width:100%}.woocommerce .col2-set .col-1,.woocommerce-page .col2-set .col-1{float:right;width:48%}.woocommerce .col2-set .col-2,.woocommerce-page .col2-set .col-2{float:left;width:48%}.woocommerce img,.woocommerce-page img{height:auto;max-width:100%}.woocommerce #content div.product div.images,.woocommerce div.product div.images,.woocommerce-page #content div.product div.images,.woocommerce-page div.product div.images{float:right;width:48%}.woocommerce #content div.product div.thumbnails a,.woocommerce div.product div.thumbnails a,.woocommerce-page #content div.product div.thumbnails a,.woocommerce-page div.product div.thumbnails a{float:right;width:30.75%;margin-left:3.8%;margin-bottom:1em}.woocommerce #content div.product div.thumbnails a.last,.woocommerce div.product div.thumbnails a.last,.woocommerce-page #content div.product div.thumbnails a.last,.woocommerce-page div.product div.thumbnails a.last{margin-left:0}.woocommerce #content div.product div.thumbnails.columns-1 a,.woocommerce div.product div.thumbnails.columns-1 a,.woocommerce-page #content div.product div.thumbnails.columns-1 a,.woocommerce-page div.product div.thumbnails.columns-1 a{width:100%;margin-left:0;float:none}.woocommerce #content div.product div.thumbnails.columns-2 a,.woocommerce div.product div.thumbnails.columns-2 a,.woocommerce-page #content div.product div.thumbnails.columns-2 a,.woocommerce-page div.product div.thumbnails.columns-2 a{width:48%}.woocommerce #content div.product div.thumbnails.columns-4 a,.woocommerce div.product div.thumbnails.columns-4 a,.woocommerce-page #content div.product div.thumbnails.columns-4 a,.woocommerce-page div.product div.thumbnails.columns-4 a{width:22.05%}.woocommerce #content div.product div.thumbnails.columns-5 a,.woocommerce div.product div.thumbnails.columns-5 a,.woocommerce-page #content div.product div.thumbnails.columns-5 a,.woocommerce-page div.product div.thumbnails.columns-5 a{width:16.9%}.woocommerce #content div.product div.summary,.woocommerce div.product div.summary,.woocommerce-page #content div.product div.summary,.woocommerce-page div.product div.summary{float:left;width:48%}.woocommerce #content div.product .woocommerce-tabs ul.tabs li,.woocommerce div.product .woocommerce-tabs ul.tabs li,.woocommerce-page #content div.product .woocommerce-tabs ul.tabs li,.woocommerce-page div.product .woocommerce-tabs ul.tabs li{display:inline-block}.woocommerce #content div.product #reviews .comment::after,.woocommerce #content div.product #reviews .comment::before,.woocommerce .woocommerce-pagination ul.page-numbers::after,.woocommerce .woocommerce-pagination ul.page-numbers::before,.woocommerce div.product #reviews .comment::after,.woocommerce div.product #reviews .comment::before,.woocommerce ul.products::after,.woocommerce ul.products::before,.woocommerce-page #content div.product #reviews .comment::after,.woocommerce-page #content div.product #reviews .comment::before,.woocommerce-page .woocommerce-pagination ul.page-numbers::after,.woocommerce-page .woocommerce-pagination ul.page-numbers::before,.woocommerce-page div.product #reviews .comment::after,.woocommerce-page div.product #reviews .comment::before,.woocommerce-page ul.products::after,.woocommerce-page ul.products::before{content:' ';display:table}.woocommerce #content div.product #reviews .comment::after,.woocommerce div.product #reviews .comment::after,.woocommerce-page #content div.product #reviews .comment::after,.woocommerce-page div.product #reviews .comment::after{clear:both}.woocommerce #content div.product #reviews .comment img,.woocommerce div.product #reviews .comment img,.woocommerce-page #content div.product #reviews .comment img,.woocommerce-page div.product #reviews .comment img{float:left;height:auto}.woocommerce ul.products li.product,.woocommerce-page ul.products li.product{float:right;margin:0 0 2.992em 3.8%;padding:0;position:relative;width:22.05%}.woocommerce ul.products li.last,.woocommerce-page ul.products li.last{margin-left:0}.woocommerce-page.columns-1 ul.products li.product,.woocommerce.columns-1 ul.products li.product{width:100%;margin-left:0}.woocommerce-page.columns-2 ul.products li.product,.woocommerce.columns-2 ul.products li.product{width:48%}.woocommerce-page.columns-3 ul.products li.product,.woocommerce.columns-3 ul.products li.product{width:30.75%}.woocommerce-page.columns-5 ul.products li.product,.woocommerce.columns-5 ul.products li.product{width:16.95%}.woocommerce-page.columns-6 ul.products li.product,.woocommerce.columns-6 ul.products li.product{width:13.5%}.woocommerce .woocommerce-result-count,.woocommerce-page .woocommerce-result-count{float:right}.woocommerce .woocommerce-ordering,.woocommerce-page .woocommerce-ordering{float:left}.woocommerce .woocommerce-pagination ul.page-numbers li,.woocommerce-page .woocommerce-pagination ul.page-numbers li{display:inline-block}.woocommerce #content table.cart img,.woocommerce table.cart img,.woocommerce-page #content table.cart img,.woocommerce-page table.cart img{height:auto}.woocommerce #content table.cart td.actions,.woocommerce table.cart td.actions,.woocommerce-page #content table.cart td.actions,.woocommerce-page table.cart td.actions{text-align:left}.woocommerce #content table.cart td.actions .input-text,.woocommerce table.cart td.actions .input-text,.woocommerce-page #content table.cart td.actions .input-text,.woocommerce-page table.cart td.actions .input-text{width:80px}.woocommerce #content table.cart td.actions .coupon,.woocommerce table.cart td.actions .coupon,.woocommerce-page #content table.cart td.actions .coupon,.woocommerce-page table.cart td.actions .coupon{float:right}.woocommerce #content table.cart td.actions .coupon label,.woocommerce table.cart td.actions .coupon label,.woocommerce-page #content table.cart td.actions .coupon label,.woocommerce-page table.cart td.actions .coupon label{display:none}.woocommerce .cart-collaterals .shipping_calculator::after,.woocommerce .cart-collaterals .shipping_calculator::before,.woocommerce .cart-collaterals::after,.woocommerce .cart-collaterals::before,.woocommerce form .form-row::after,.woocommerce form .form-row::before,.woocommerce ul.cart_list li::after,.woocommerce ul.cart_list li::before,.woocommerce ul.product_list_widget li::after,.woocommerce ul.product_list_widget li::before,.woocommerce-page .cart-collaterals .shipping_calculator::after,.woocommerce-page .cart-collaterals .shipping_calculator::before,.woocommerce-page .cart-collaterals::after,.woocommerce-page .cart-collaterals::before,.woocommerce-page form .form-row::after,.woocommerce-page form .form-row::before,.woocommerce-page ul.cart_list li::after,.woocommerce-page ul.cart_list li::before,.woocommerce-page ul.product_list_widget li::after,.woocommerce-page ul.product_list_widget li::before{display:table;content:' '}.woocommerce .cart-collaterals,.woocommerce-page .cart-collaterals{width:100%}.woocommerce .cart-collaterals .related,.woocommerce-page .cart-collaterals .related{width:30.75%;float:right}.woocommerce .cart-collaterals .cross-sells,.woocommerce-page .cart-collaterals .cross-sells{width:48%;float:right}.woocommerce .cart-collaterals .cross-sells ul.products,.woocommerce-page .cart-collaterals .cross-sells ul.products{float:none}.woocommerce .cart-collaterals .cross-sells ul.products li,.woocommerce-page .cart-collaterals .cross-sells ul.products li{width:48%}.woocommerce .cart-collaterals .shipping_calculator,.woocommerce-page .cart-collaterals .shipping_calculator{width:48%;clear:left;float:left}.woocommerce .cart-collaterals .shipping_calculator::after,.woocommerce .woocommerce-billing-fields::after,.woocommerce .woocommerce-shipping-fields::after,.woocommerce form .form-row-wide,.woocommerce form .form-row::after,.woocommerce ul.cart_list li::after,.woocommerce ul.product_list_widget li::after,.woocommerce-page .cart-collaterals .shipping_calculator::after,.woocommerce-page .woocommerce-billing-fields::after,.woocommerce-page .woocommerce-shipping-fields::after,.woocommerce-page form .form-row-wide,.woocommerce-page form .form-row::after,.woocommerce-page ul.cart_list li::after,.woocommerce-page ul.product_list_widget li::after{clear:both}.woocommerce .cart-collaterals .shipping_calculator .col2-set .col-1,.woocommerce .cart-collaterals .shipping_calculator .col2-set .col-2,.woocommerce-page .cart-collaterals .shipping_calculator .col2-set .col-1,.woocommerce-page .cart-collaterals .shipping_calculator .col2-set .col-2{width:47%}.woocommerce .cart-collaterals .cart_totals,.woocommerce-page .cart-collaterals .cart_totals{float:left;width:48%}.woocommerce ul.cart_list li img,.woocommerce ul.product_list_widget li img,.woocommerce-page ul.cart_list li img,.woocommerce-page ul.product_list_widget li img{float:left;height:auto}.woocommerce form .form-row label,.woocommerce-page form .form-row label{display:block}.woocommerce form .form-row label.checkbox,.woocommerce-page form .form-row label.checkbox{display:inline}.woocommerce form .form-row select,.woocommerce-page form .form-row select{width:100%}.woocommerce form .form-row .input-text,.woocommerce-page form .form-row .input-text{box-sizing:border-box;width:100%}.woocommerce form .form-row-first,.woocommerce form .form-row-last,.woocommerce-page form .form-row-first,.woocommerce-page form .form-row-last{width:47%;overflow:visible}.woocommerce form .form-row-first,.woocommerce-page form .form-row-first{float:right}.woocommerce form .form-row-last,.woocommerce-page form .form-row-last{float:left}.woocommerce #payment .form-row select,.woocommerce-page #payment .form-row select{width:auto}.woocommerce #payment .terms,.woocommerce #payment .wc-terms-and-conditions,.woocommerce-page #payment .terms,.woocommerce-page #payment .wc-terms-and-conditions{text-align:right;padding:0 0 0 1em;float:right}.woocommerce #payment #place_order,.woocommerce-page #payment #place_order{float:left}.woocommerce .woocommerce-billing-fields::after,.woocommerce .woocommerce-billing-fields::before,.woocommerce .woocommerce-shipping-fields::after,.woocommerce .woocommerce-shipping-fields::before,.woocommerce-page .woocommerce-billing-fields::after,.woocommerce-page .woocommerce-billing-fields::before,.woocommerce-page .woocommerce-shipping-fields::after,.woocommerce-page .woocommerce-shipping-fields::before{content:' ';display:table}.woocommerce .woocommerce-terms-and-conditions,.woocommerce-page .woocommerce-terms-and-conditions{margin-bottom:1.618em;padding:1.618em}.woocommerce .woocommerce-oembed,.woocommerce-page .woocommerce-oembed{position:relative}.woocommerce-account .woocommerce-MyAccount-navigation{float:right;width:30%}.woocommerce-account .woocommerce-MyAccount-content{float:left;width:68%}.woocommerce-page.left-sidebar #content.twentyeleven{width:58.4%;margin:0 7.6%;float:left}.woocommerce-page.right-sidebar #content.twentyeleven{margin:0 7.6%;width:58.4%;float:right}.twentyfourteen .tfwc{padding:12px 10px 0;max-width:474px;margin:0 auto}.twentyfourteen .tfwc .product .entry-summary{padding:0!important;margin:0 0 1.618em!important}.twentyfourteen .tfwc div.product.hentry.has-post-thumbnail{margin-top:0}@media screen and (min-width:673px){.twentyfourteen .tfwc{padding-left:30px;padding-right:30px}}@media screen and (min-width:1040px){.twentyfourteen .tfwc{padding-left:15px;padding-right:15px}}@media screen and (min-width:1110px){.twentyfourteen .tfwc{padding-left:30px;padding-right:30px}}@media screen and (min-width:1218px){.twentyfourteen .tfwc{margin-left:54px}.full-width .twentyfourteen .tfwc{margin-left:auto}}.twentyfifteen .t15wc{padding-right:7.6923%;padding-left:7.6923%;padding-top:7.6923%;margin-bottom:7.6923%;background:#fff;box-shadow:0 0 1px rgba(0,0,0,.15)}.twentyfifteen .t15wc .page-title{margin-right:0}@media screen and (min-width:38.75em){.twentyfifteen .t15wc{margin-left:7.6923%;margin-right:7.6923%;margin-top:8.3333%}}@media screen and (min-width:59.6875em){.twentyfifteen .t15wc{margin-right:8.3333%;margin-left:8.3333%;padding:10%}.single-product .twentyfifteen .entry-summary{padding:0!important}}.twentysixteen .site-main{margin-left:7.6923%;margin-right:7.6923%}.twentysixteen .entry-summary{margin-left:0;margin-right:0}#content .twentysixteen div.product div.images,#content .twentysixteen div.product div.summary{width:46.42857%}@media screen and (min-width:44.375em){.twentysixteen .site-main{margin-left:23.0769%}}@media screen and (min-width:56.875em){.twentysixteen .site-main{margin-left:0;margin-right:0}.no-sidebar .twentysixteen .site-main{margin-left:15%;margin-right:15%}.no-sidebar .twentysixteen .entry-summary{margin-left:0;margin-right:0}}.rtl .woocommerce .col2-set .col-1,.rtl .woocommerce-page .col2-set .col-1{float:left}.rtl .woocommerce .col2-set .col-2,.rtl .woocommerce-page .col2-set .col-2{float:right}
\ No newline at end of file
diff --git a/assets/css/woocommerce-layout.css b/assets/css/woocommerce-layout.css
index 7f9987167e9..e125913c4cc 100644
--- a/assets/css/woocommerce-layout.css
+++ b/assets/css/woocommerce-layout.css
@@ -1 +1 @@
-.woocommerce #content div.product .woocommerce-tabs ul.tabs:after,.woocommerce #content div.product .woocommerce-tabs ul.tabs:before,.woocommerce #content div.product div.thumbnails:after,.woocommerce #content div.product div.thumbnails:before,.woocommerce .col2-set:after,.woocommerce .col2-set:before,.woocommerce div.product .woocommerce-tabs ul.tabs:after,.woocommerce div.product .woocommerce-tabs ul.tabs:before,.woocommerce div.product div.thumbnails:after,.woocommerce div.product div.thumbnails:before,.woocommerce-page #content div.product .woocommerce-tabs ul.tabs:after,.woocommerce-page #content div.product .woocommerce-tabs ul.tabs:before,.woocommerce-page #content div.product div.thumbnails:after,.woocommerce-page #content div.product div.thumbnails:before,.woocommerce-page .col2-set:after,.woocommerce-page .col2-set:before,.woocommerce-page div.product .woocommerce-tabs ul.tabs:after,.woocommerce-page div.product .woocommerce-tabs ul.tabs:before,.woocommerce-page div.product div.thumbnails:after,.woocommerce-page div.product div.thumbnails:before{content:" ";display:table}.woocommerce #content div.product .woocommerce-tabs,.woocommerce #content div.product .woocommerce-tabs ul.tabs:after,.woocommerce #content div.product div.thumbnails a.first,.woocommerce #content div.product div.thumbnails:after,.woocommerce .cart-collaterals:after,.woocommerce .col2-set:after,.woocommerce .woocommerce-pagination ul.page-numbers:after,.woocommerce div.product .woocommerce-tabs,.woocommerce div.product .woocommerce-tabs ul.tabs:after,.woocommerce div.product div.thumbnails a.first,.woocommerce div.product div.thumbnails:after,.woocommerce ul.products,.woocommerce ul.products li.first,.woocommerce ul.products:after,.woocommerce-page #content div.product .woocommerce-tabs,.woocommerce-page #content div.product .woocommerce-tabs ul.tabs:after,.woocommerce-page #content div.product div.thumbnails a.first,.woocommerce-page #content div.product div.thumbnails:after,.woocommerce-page .cart-collaterals:after,.woocommerce-page .col2-set:after,.woocommerce-page .woocommerce-pagination ul.page-numbers:after,.woocommerce-page div.product .woocommerce-tabs,.woocommerce-page div.product .woocommerce-tabs ul.tabs:after,.woocommerce-page div.product div.thumbnails a.first,.woocommerce-page div.product div.thumbnails:after,.woocommerce-page ul.products,.woocommerce-page ul.products li.first,.woocommerce-page ul.products:after{clear:both}.woocommerce .col2-set,.woocommerce-page .col2-set{width:100%}.woocommerce .col2-set .col-1,.woocommerce-page .col2-set .col-1{float:left;width:48%}.woocommerce .col2-set .col-2,.woocommerce-page .col2-set .col-2{float:right;width:48%}.woocommerce img,.woocommerce-page img{height:auto;max-width:100%}.woocommerce #content div.product div.images,.woocommerce div.product div.images,.woocommerce-page #content div.product div.images,.woocommerce-page div.product div.images{float:left;width:48%}.woocommerce #content div.product div.thumbnails a,.woocommerce div.product div.thumbnails a,.woocommerce-page #content div.product div.thumbnails a,.woocommerce-page div.product div.thumbnails a{float:left;width:30.75%;margin-right:3.8%;margin-bottom:1em}.woocommerce #content div.product div.thumbnails a.last,.woocommerce div.product div.thumbnails a.last,.woocommerce-page #content div.product div.thumbnails a.last,.woocommerce-page div.product div.thumbnails a.last{margin-right:0}.woocommerce #content div.product div.thumbnails.columns-1 a,.woocommerce div.product div.thumbnails.columns-1 a,.woocommerce-page #content div.product div.thumbnails.columns-1 a,.woocommerce-page div.product div.thumbnails.columns-1 a{width:100%;margin-right:0;float:none}.woocommerce #content div.product div.thumbnails.columns-2 a,.woocommerce div.product div.thumbnails.columns-2 a,.woocommerce-page #content div.product div.thumbnails.columns-2 a,.woocommerce-page div.product div.thumbnails.columns-2 a{width:48%}.woocommerce #content div.product div.thumbnails.columns-4 a,.woocommerce div.product div.thumbnails.columns-4 a,.woocommerce-page #content div.product div.thumbnails.columns-4 a,.woocommerce-page div.product div.thumbnails.columns-4 a{width:22.05%}.woocommerce #content div.product div.thumbnails.columns-5 a,.woocommerce div.product div.thumbnails.columns-5 a,.woocommerce-page #content div.product div.thumbnails.columns-5 a,.woocommerce-page div.product div.thumbnails.columns-5 a{width:16.9%}.woocommerce #content div.product div.summary,.woocommerce div.product div.summary,.woocommerce-page #content div.product div.summary,.woocommerce-page div.product div.summary{float:right;width:48%}.woocommerce #content div.product .woocommerce-tabs ul.tabs li,.woocommerce div.product .woocommerce-tabs ul.tabs li,.woocommerce-page #content div.product .woocommerce-tabs ul.tabs li,.woocommerce-page div.product .woocommerce-tabs ul.tabs li{display:inline-block}.woocommerce #content div.product #reviews .comment:after,.woocommerce #content div.product #reviews .comment:before,.woocommerce .woocommerce-pagination ul.page-numbers:after,.woocommerce .woocommerce-pagination ul.page-numbers:before,.woocommerce div.product #reviews .comment:after,.woocommerce div.product #reviews .comment:before,.woocommerce ul.products:after,.woocommerce ul.products:before,.woocommerce-page #content div.product #reviews .comment:after,.woocommerce-page #content div.product #reviews .comment:before,.woocommerce-page .woocommerce-pagination ul.page-numbers:after,.woocommerce-page .woocommerce-pagination ul.page-numbers:before,.woocommerce-page div.product #reviews .comment:after,.woocommerce-page div.product #reviews .comment:before,.woocommerce-page ul.products:after,.woocommerce-page ul.products:before{content:" ";display:table}.woocommerce #content div.product #reviews .comment:after,.woocommerce div.product #reviews .comment:after,.woocommerce-page #content div.product #reviews .comment:after,.woocommerce-page div.product #reviews .comment:after{clear:both}.woocommerce #content div.product #reviews .comment img,.woocommerce div.product #reviews .comment img,.woocommerce-page #content div.product #reviews .comment img,.woocommerce-page div.product #reviews .comment img{float:right;height:auto}.woocommerce ul.products li.product,.woocommerce-page ul.products li.product{float:left;margin:0 3.8% 2.992em 0;padding:0;position:relative;width:22.05%}.woocommerce ul.products li.last,.woocommerce-page ul.products li.last{margin-right:0}.woocommerce-page.columns-1 ul.products li.product,.woocommerce.columns-1 ul.products li.product{width:100%;margin-right:0}.woocommerce-page.columns-2 ul.products li.product,.woocommerce.columns-2 ul.products li.product{width:48%}.woocommerce-page.columns-3 ul.products li.product,.woocommerce.columns-3 ul.products li.product{width:30.75%}.woocommerce-page.columns-5 ul.products li.product,.woocommerce.columns-5 ul.products li.product{width:16.95%}.woocommerce-page.columns-6 ul.products li.product,.woocommerce.columns-6 ul.products li.product{width:13.5%}.woocommerce .woocommerce-result-count,.woocommerce-page .woocommerce-result-count{float:left}.woocommerce .woocommerce-ordering,.woocommerce-page .woocommerce-ordering{float:right}.woocommerce .woocommerce-pagination ul.page-numbers li,.woocommerce-page .woocommerce-pagination ul.page-numbers li{display:inline-block}.woocommerce #content table.cart img,.woocommerce table.cart img,.woocommerce-page #content table.cart img,.woocommerce-page table.cart img{height:auto}.woocommerce #content table.cart td.actions,.woocommerce table.cart td.actions,.woocommerce-page #content table.cart td.actions,.woocommerce-page table.cart td.actions{text-align:right}.woocommerce #content table.cart td.actions .input-text,.woocommerce table.cart td.actions .input-text,.woocommerce-page #content table.cart td.actions .input-text,.woocommerce-page table.cart td.actions .input-text{width:80px}.woocommerce #content table.cart td.actions .coupon,.woocommerce table.cart td.actions .coupon,.woocommerce-page #content table.cart td.actions .coupon,.woocommerce-page table.cart td.actions .coupon{float:left}.woocommerce #content table.cart td.actions .coupon label,.woocommerce table.cart td.actions .coupon label,.woocommerce-page #content table.cart td.actions .coupon label,.woocommerce-page table.cart td.actions .coupon label{display:none}.woocommerce .cart-collaterals .shipping_calculator:after,.woocommerce .cart-collaterals .shipping_calculator:before,.woocommerce .cart-collaterals:after,.woocommerce .cart-collaterals:before,.woocommerce form .form-row:after,.woocommerce form .form-row:before,.woocommerce ul.cart_list li:after,.woocommerce ul.cart_list li:before,.woocommerce ul.product_list_widget li:after,.woocommerce ul.product_list_widget li:before,.woocommerce-page .cart-collaterals .shipping_calculator:after,.woocommerce-page .cart-collaterals .shipping_calculator:before,.woocommerce-page .cart-collaterals:after,.woocommerce-page .cart-collaterals:before,.woocommerce-page form .form-row:after,.woocommerce-page form .form-row:before,.woocommerce-page ul.cart_list li:after,.woocommerce-page ul.cart_list li:before,.woocommerce-page ul.product_list_widget li:after,.woocommerce-page ul.product_list_widget li:before{content:" ";display:table}.woocommerce .cart-collaterals,.woocommerce-page .cart-collaterals{width:100%}.woocommerce .cart-collaterals .related,.woocommerce-page .cart-collaterals .related{width:30.75%;float:left}.woocommerce .cart-collaterals .cross-sells,.woocommerce-page .cart-collaterals .cross-sells{width:48%;float:left}.woocommerce .cart-collaterals .cross-sells ul.products,.woocommerce-page .cart-collaterals .cross-sells ul.products{float:none}.woocommerce .cart-collaterals .cross-sells ul.products li,.woocommerce-page .cart-collaterals .cross-sells ul.products li{width:48%}.woocommerce .cart-collaterals .shipping_calculator,.woocommerce-page .cart-collaterals .shipping_calculator{width:48%;clear:right;float:right}.woocommerce .cart-collaterals .shipping_calculator:after,.woocommerce form .form-row-wide,.woocommerce form .form-row:after,.woocommerce ul.cart_list li:after,.woocommerce ul.product_list_widget li:after,.woocommerce-page .cart-collaterals .shipping_calculator:after,.woocommerce-page form .form-row-wide,.woocommerce-page form .form-row:after,.woocommerce-page ul.cart_list li:after,.woocommerce-page ul.product_list_widget li:after{clear:both}.woocommerce .cart-collaterals .shipping_calculator .col2-set .col-1,.woocommerce .cart-collaterals .shipping_calculator .col2-set .col-2,.woocommerce-page .cart-collaterals .shipping_calculator .col2-set .col-1,.woocommerce-page .cart-collaterals .shipping_calculator .col2-set .col-2{width:47%}.woocommerce .cart-collaterals .cart_totals,.woocommerce-page .cart-collaterals .cart_totals{float:right;width:48%}.woocommerce ul.cart_list li img,.woocommerce ul.product_list_widget li img,.woocommerce-page ul.cart_list li img,.woocommerce-page ul.product_list_widget li img{float:right;height:auto}.woocommerce form .form-row label,.woocommerce-page form .form-row label{display:block}.woocommerce form .form-row label.checkbox,.woocommerce-page form .form-row label.checkbox{display:inline}.woocommerce form .form-row select,.woocommerce-page form .form-row select{width:100%}.woocommerce form .form-row .input-text,.woocommerce-page form .form-row .input-text{box-sizing:border-box;width:100%}.woocommerce form .form-row-first,.woocommerce form .form-row-last,.woocommerce-page form .form-row-first,.woocommerce-page form .form-row-last{float:left;width:47%;overflow:visible}.woocommerce form .form-row-last,.woocommerce-page form .form-row-last{float:right}.woocommerce #payment .form-row select,.woocommerce-page #payment .form-row select{width:auto}.woocommerce #payment .terms,.woocommerce #payment .wc-terms-and-conditions,.woocommerce-page #payment .terms,.woocommerce-page #payment .wc-terms-and-conditions{text-align:left;padding:0 1em 0 0;float:left}.woocommerce #payment #place_order,.woocommerce-page #payment #place_order{float:right}.twentyfourteen .tfwc{padding:12px 10px 0;max-width:474px;margin:0 auto}.twentyfourteen .tfwc .product .entry-summary{padding:0!important;margin:0 0 1.618em!important}.twentyfourteen .tfwc div.product.hentry.has-post-thumbnail{margin-top:0}.twentyfourteen .tfwc .product .images img{margin-bottom:1em}@media screen and (min-width:673px){.twentyfourteen .tfwc{padding-right:30px;padding-left:30px}}@media screen and (min-width:1040px){.twentyfourteen .tfwc{padding-right:15px;padding-left:15px}}@media screen and (min-width:1110px){.twentyfourteen .tfwc{padding-right:30px;padding-left:30px}}@media screen and (min-width:1218px){.twentyfourteen .tfwc{margin-right:54px}.full-width .twentyfourteen .tfwc{margin-right:auto}}.twentyfifteen .t15wc{padding-left:7.6923%;padding-right:7.6923%;padding-top:7.6923%;margin-bottom:7.6923%;background:#fff;box-shadow:0 0 1px rgba(0,0,0,.15)}.twentyfifteen .t15wc .page-title{margin-left:0}@media screen and (min-width:38.75em){.twentyfifteen .t15wc{margin-right:7.6923%;margin-left:7.6923%;margin-top:8.3333%}}@media screen and (min-width:59.6875em){.twentyfifteen .t15wc{margin-left:8.3333%;margin-right:8.3333%;padding:10%}.single-product .twentyfifteen .entry-summary{padding:0!important}}.twentysixteen .site-main{margin-right:7.6923%;margin-left:7.6923%}.twentysixteen .entry-summary{margin-right:0;margin-left:0}#content .twentysixteen div.product div.images,#content .twentysixteen div.product div.summary{width:46.42857%}@media screen and (min-width:44.375em){.twentysixteen .site-main{margin-right:23.0769%}}@media screen and (min-width:56.875em){.twentysixteen .site-main{margin-right:0;margin-left:0}.no-sidebar .twentysixteen .site-main{margin-right:15%;margin-left:15%}.no-sidebar .twentysixteen .entry-summary{margin-right:0;margin-left:0}}
\ No newline at end of file
+.woocommerce #content div.product .woocommerce-tabs ul.tabs::after,.woocommerce #content div.product .woocommerce-tabs ul.tabs::before,.woocommerce #content div.product div.thumbnails::after,.woocommerce #content div.product div.thumbnails::before,.woocommerce .col2-set::after,.woocommerce .col2-set::before,.woocommerce div.product .woocommerce-tabs ul.tabs::after,.woocommerce div.product .woocommerce-tabs ul.tabs::before,.woocommerce div.product div.thumbnails::after,.woocommerce div.product div.thumbnails::before,.woocommerce-page #content div.product .woocommerce-tabs ul.tabs::after,.woocommerce-page #content div.product .woocommerce-tabs ul.tabs::before,.woocommerce-page #content div.product div.thumbnails::after,.woocommerce-page #content div.product div.thumbnails::before,.woocommerce-page .col2-set::after,.woocommerce-page .col2-set::before,.woocommerce-page div.product .woocommerce-tabs ul.tabs::after,.woocommerce-page div.product .woocommerce-tabs ul.tabs::before,.woocommerce-page div.product div.thumbnails::after,.woocommerce-page div.product div.thumbnails::before{content:' ';display:table}.woocommerce #content div.product .woocommerce-tabs,.woocommerce #content div.product .woocommerce-tabs ul.tabs::after,.woocommerce #content div.product div.thumbnails a.first,.woocommerce #content div.product div.thumbnails::after,.woocommerce .cart-collaterals::after,.woocommerce .col2-set::after,.woocommerce .woocommerce-pagination ul.page-numbers::after,.woocommerce div.product .woocommerce-tabs,.woocommerce div.product .woocommerce-tabs ul.tabs::after,.woocommerce div.product div.thumbnails a.first,.woocommerce div.product div.thumbnails::after,.woocommerce ul.products,.woocommerce ul.products li.first,.woocommerce ul.products::after,.woocommerce-page #content div.product .woocommerce-tabs,.woocommerce-page #content div.product .woocommerce-tabs ul.tabs::after,.woocommerce-page #content div.product div.thumbnails a.first,.woocommerce-page #content div.product div.thumbnails::after,.woocommerce-page .cart-collaterals::after,.woocommerce-page .col2-set::after,.woocommerce-page .woocommerce-pagination ul.page-numbers::after,.woocommerce-page div.product .woocommerce-tabs,.woocommerce-page div.product .woocommerce-tabs ul.tabs::after,.woocommerce-page div.product div.thumbnails a.first,.woocommerce-page div.product div.thumbnails::after,.woocommerce-page ul.products,.woocommerce-page ul.products li.first,.woocommerce-page ul.products::after{clear:both}.woocommerce .woocommerce-error .button,.woocommerce .woocommerce-info .button,.woocommerce .woocommerce-message .button,.woocommerce-page .woocommerce-error .button,.woocommerce-page .woocommerce-info .button,.woocommerce-page .woocommerce-message .button{float:right}.woocommerce .col2-set,.woocommerce-page .col2-set{width:100%}.woocommerce .col2-set .col-1,.woocommerce-page .col2-set .col-1{float:left;width:48%}.woocommerce .col2-set .col-2,.woocommerce-page .col2-set .col-2{float:right;width:48%}.woocommerce img,.woocommerce-page img{height:auto;max-width:100%}.woocommerce #content div.product div.images,.woocommerce div.product div.images,.woocommerce-page #content div.product div.images,.woocommerce-page div.product div.images{float:left;width:48%}.woocommerce #content div.product div.thumbnails a,.woocommerce div.product div.thumbnails a,.woocommerce-page #content div.product div.thumbnails a,.woocommerce-page div.product div.thumbnails a{float:left;width:30.75%;margin-right:3.8%;margin-bottom:1em}.woocommerce #content div.product div.thumbnails a.last,.woocommerce div.product div.thumbnails a.last,.woocommerce-page #content div.product div.thumbnails a.last,.woocommerce-page div.product div.thumbnails a.last{margin-right:0}.woocommerce #content div.product div.thumbnails.columns-1 a,.woocommerce div.product div.thumbnails.columns-1 a,.woocommerce-page #content div.product div.thumbnails.columns-1 a,.woocommerce-page div.product div.thumbnails.columns-1 a{width:100%;margin-right:0;float:none}.woocommerce #content div.product div.thumbnails.columns-2 a,.woocommerce div.product div.thumbnails.columns-2 a,.woocommerce-page #content div.product div.thumbnails.columns-2 a,.woocommerce-page div.product div.thumbnails.columns-2 a{width:48%}.woocommerce #content div.product div.thumbnails.columns-4 a,.woocommerce div.product div.thumbnails.columns-4 a,.woocommerce-page #content div.product div.thumbnails.columns-4 a,.woocommerce-page div.product div.thumbnails.columns-4 a{width:22.05%}.woocommerce #content div.product div.thumbnails.columns-5 a,.woocommerce div.product div.thumbnails.columns-5 a,.woocommerce-page #content div.product div.thumbnails.columns-5 a,.woocommerce-page div.product div.thumbnails.columns-5 a{width:16.9%}.woocommerce #content div.product div.summary,.woocommerce div.product div.summary,.woocommerce-page #content div.product div.summary,.woocommerce-page div.product div.summary{float:right;width:48%}.woocommerce #content div.product .woocommerce-tabs ul.tabs li,.woocommerce div.product .woocommerce-tabs ul.tabs li,.woocommerce-page #content div.product .woocommerce-tabs ul.tabs li,.woocommerce-page div.product .woocommerce-tabs ul.tabs li{display:inline-block}.woocommerce #content div.product #reviews .comment::after,.woocommerce #content div.product #reviews .comment::before,.woocommerce .woocommerce-pagination ul.page-numbers::after,.woocommerce .woocommerce-pagination ul.page-numbers::before,.woocommerce div.product #reviews .comment::after,.woocommerce div.product #reviews .comment::before,.woocommerce ul.products::after,.woocommerce ul.products::before,.woocommerce-page #content div.product #reviews .comment::after,.woocommerce-page #content div.product #reviews .comment::before,.woocommerce-page .woocommerce-pagination ul.page-numbers::after,.woocommerce-page .woocommerce-pagination ul.page-numbers::before,.woocommerce-page div.product #reviews .comment::after,.woocommerce-page div.product #reviews .comment::before,.woocommerce-page ul.products::after,.woocommerce-page ul.products::before{content:' ';display:table}.woocommerce #content div.product #reviews .comment::after,.woocommerce div.product #reviews .comment::after,.woocommerce-page #content div.product #reviews .comment::after,.woocommerce-page div.product #reviews .comment::after{clear:both}.woocommerce #content div.product #reviews .comment img,.woocommerce div.product #reviews .comment img,.woocommerce-page #content div.product #reviews .comment img,.woocommerce-page div.product #reviews .comment img{float:right;height:auto}.woocommerce ul.products li.product,.woocommerce-page ul.products li.product{float:left;margin:0 3.8% 2.992em 0;padding:0;position:relative;width:22.05%}.woocommerce ul.products li.last,.woocommerce-page ul.products li.last{margin-right:0}.woocommerce-page.columns-1 ul.products li.product,.woocommerce.columns-1 ul.products li.product{width:100%;margin-right:0}.woocommerce-page.columns-2 ul.products li.product,.woocommerce.columns-2 ul.products li.product{width:48%}.woocommerce-page.columns-3 ul.products li.product,.woocommerce.columns-3 ul.products li.product{width:30.75%}.woocommerce-page.columns-5 ul.products li.product,.woocommerce.columns-5 ul.products li.product{width:16.95%}.woocommerce-page.columns-6 ul.products li.product,.woocommerce.columns-6 ul.products li.product{width:13.5%}.woocommerce .woocommerce-result-count,.woocommerce-page .woocommerce-result-count{float:left}.woocommerce .woocommerce-ordering,.woocommerce-page .woocommerce-ordering{float:right}.woocommerce .woocommerce-pagination ul.page-numbers li,.woocommerce-page .woocommerce-pagination ul.page-numbers li{display:inline-block}.woocommerce #content table.cart img,.woocommerce table.cart img,.woocommerce-page #content table.cart img,.woocommerce-page table.cart img{height:auto}.woocommerce #content table.cart td.actions,.woocommerce table.cart td.actions,.woocommerce-page #content table.cart td.actions,.woocommerce-page table.cart td.actions{text-align:right}.woocommerce #content table.cart td.actions .input-text,.woocommerce table.cart td.actions .input-text,.woocommerce-page #content table.cart td.actions .input-text,.woocommerce-page table.cart td.actions .input-text{width:80px}.woocommerce #content table.cart td.actions .coupon,.woocommerce table.cart td.actions .coupon,.woocommerce-page #content table.cart td.actions .coupon,.woocommerce-page table.cart td.actions .coupon{float:left}.woocommerce #content table.cart td.actions .coupon label,.woocommerce table.cart td.actions .coupon label,.woocommerce-page #content table.cart td.actions .coupon label,.woocommerce-page table.cart td.actions .coupon label{display:none}.woocommerce .cart-collaterals .shipping_calculator::after,.woocommerce .cart-collaterals .shipping_calculator::before,.woocommerce .cart-collaterals::after,.woocommerce .cart-collaterals::before,.woocommerce form .form-row::after,.woocommerce form .form-row::before,.woocommerce ul.cart_list li::after,.woocommerce ul.cart_list li::before,.woocommerce ul.product_list_widget li::after,.woocommerce ul.product_list_widget li::before,.woocommerce-page .cart-collaterals .shipping_calculator::after,.woocommerce-page .cart-collaterals .shipping_calculator::before,.woocommerce-page .cart-collaterals::after,.woocommerce-page .cart-collaterals::before,.woocommerce-page form .form-row::after,.woocommerce-page form .form-row::before,.woocommerce-page ul.cart_list li::after,.woocommerce-page ul.cart_list li::before,.woocommerce-page ul.product_list_widget li::after,.woocommerce-page ul.product_list_widget li::before{display:table;content:' '}.woocommerce .cart-collaterals,.woocommerce-page .cart-collaterals{width:100%}.woocommerce .cart-collaterals .related,.woocommerce-page .cart-collaterals .related{width:30.75%;float:left}.woocommerce .cart-collaterals .cross-sells,.woocommerce-page .cart-collaterals .cross-sells{width:48%;float:left}.woocommerce .cart-collaterals .cross-sells ul.products,.woocommerce-page .cart-collaterals .cross-sells ul.products{float:none}.woocommerce .cart-collaterals .cross-sells ul.products li,.woocommerce-page .cart-collaterals .cross-sells ul.products li{width:48%}.woocommerce .cart-collaterals .shipping_calculator,.woocommerce-page .cart-collaterals .shipping_calculator{width:48%;clear:right;float:right}.woocommerce .cart-collaterals .shipping_calculator::after,.woocommerce .woocommerce-billing-fields::after,.woocommerce .woocommerce-shipping-fields::after,.woocommerce form .form-row-wide,.woocommerce form .form-row::after,.woocommerce ul.cart_list li::after,.woocommerce ul.product_list_widget li::after,.woocommerce-page .cart-collaterals .shipping_calculator::after,.woocommerce-page .woocommerce-billing-fields::after,.woocommerce-page .woocommerce-shipping-fields::after,.woocommerce-page form .form-row-wide,.woocommerce-page form .form-row::after,.woocommerce-page ul.cart_list li::after,.woocommerce-page ul.product_list_widget li::after{clear:both}.woocommerce .cart-collaterals .shipping_calculator .col2-set .col-1,.woocommerce .cart-collaterals .shipping_calculator .col2-set .col-2,.woocommerce-page .cart-collaterals .shipping_calculator .col2-set .col-1,.woocommerce-page .cart-collaterals .shipping_calculator .col2-set .col-2{width:47%}.woocommerce .cart-collaterals .cart_totals,.woocommerce-page .cart-collaterals .cart_totals{float:right;width:48%}.woocommerce ul.cart_list li img,.woocommerce ul.product_list_widget li img,.woocommerce-page ul.cart_list li img,.woocommerce-page ul.product_list_widget li img{float:right;height:auto}.woocommerce form .form-row label,.woocommerce-page form .form-row label{display:block}.woocommerce form .form-row label.checkbox,.woocommerce-page form .form-row label.checkbox{display:inline}.woocommerce form .form-row select,.woocommerce-page form .form-row select{width:100%}.woocommerce form .form-row .input-text,.woocommerce-page form .form-row .input-text{box-sizing:border-box;width:100%}.woocommerce form .form-row-first,.woocommerce form .form-row-last,.woocommerce-page form .form-row-first,.woocommerce-page form .form-row-last{width:47%;overflow:visible}.woocommerce form .form-row-first,.woocommerce-page form .form-row-first{float:left}.woocommerce form .form-row-last,.woocommerce-page form .form-row-last{float:right}.woocommerce #payment .form-row select,.woocommerce-page #payment .form-row select{width:auto}.woocommerce #payment .terms,.woocommerce #payment .wc-terms-and-conditions,.woocommerce-page #payment .terms,.woocommerce-page #payment .wc-terms-and-conditions{text-align:left;padding:0 1em 0 0;float:left}.woocommerce #payment #place_order,.woocommerce-page #payment #place_order{float:right}.woocommerce .woocommerce-billing-fields::after,.woocommerce .woocommerce-billing-fields::before,.woocommerce .woocommerce-shipping-fields::after,.woocommerce .woocommerce-shipping-fields::before,.woocommerce-page .woocommerce-billing-fields::after,.woocommerce-page .woocommerce-billing-fields::before,.woocommerce-page .woocommerce-shipping-fields::after,.woocommerce-page .woocommerce-shipping-fields::before{content:' ';display:table}.woocommerce .woocommerce-terms-and-conditions,.woocommerce-page .woocommerce-terms-and-conditions{margin-bottom:1.618em;padding:1.618em}.woocommerce .woocommerce-oembed,.woocommerce-page .woocommerce-oembed{position:relative}.woocommerce-account .woocommerce-MyAccount-navigation{float:left;width:30%}.woocommerce-account .woocommerce-MyAccount-content{float:right;width:68%}.woocommerce-page.left-sidebar #content.twentyeleven{width:58.4%;margin:0 7.6%;float:right}.woocommerce-page.right-sidebar #content.twentyeleven{margin:0 7.6%;width:58.4%;float:left}.twentyfourteen .tfwc{padding:12px 10px 0;max-width:474px;margin:0 auto}.twentyfourteen .tfwc .product .entry-summary{padding:0!important;margin:0 0 1.618em!important}.twentyfourteen .tfwc div.product.hentry.has-post-thumbnail{margin-top:0}@media screen and (min-width:673px){.twentyfourteen .tfwc{padding-right:30px;padding-left:30px}}@media screen and (min-width:1040px){.twentyfourteen .tfwc{padding-right:15px;padding-left:15px}}@media screen and (min-width:1110px){.twentyfourteen .tfwc{padding-right:30px;padding-left:30px}}@media screen and (min-width:1218px){.twentyfourteen .tfwc{margin-right:54px}.full-width .twentyfourteen .tfwc{margin-right:auto}}.twentyfifteen .t15wc{padding-left:7.6923%;padding-right:7.6923%;padding-top:7.6923%;margin-bottom:7.6923%;background:#fff;box-shadow:0 0 1px rgba(0,0,0,.15)}.twentyfifteen .t15wc .page-title{margin-left:0}@media screen and (min-width:38.75em){.twentyfifteen .t15wc{margin-right:7.6923%;margin-left:7.6923%;margin-top:8.3333%}}@media screen and (min-width:59.6875em){.twentyfifteen .t15wc{margin-left:8.3333%;margin-right:8.3333%;padding:10%}.single-product .twentyfifteen .entry-summary{padding:0!important}}.twentysixteen .site-main{margin-right:7.6923%;margin-left:7.6923%}.twentysixteen .entry-summary{margin-right:0;margin-left:0}#content .twentysixteen div.product div.images,#content .twentysixteen div.product div.summary{width:46.42857%}@media screen and (min-width:44.375em){.twentysixteen .site-main{margin-right:23.0769%}}@media screen and (min-width:56.875em){.twentysixteen .site-main{margin-right:0;margin-left:0}.no-sidebar .twentysixteen .site-main{margin-right:15%;margin-left:15%}.no-sidebar .twentysixteen .entry-summary{margin-right:0;margin-left:0}}.rtl .woocommerce .col2-set .col-1,.rtl .woocommerce-page .col2-set .col-1{float:right}.rtl .woocommerce .col2-set .col-2,.rtl .woocommerce-page .col2-set .col-2{float:left}
\ No newline at end of file
diff --git a/assets/css/woocommerce-layout.scss b/assets/css/woocommerce-layout.scss
index f1dcf437de6..01de9bc6cba 100644
--- a/assets/css/woocommerce-layout.scss
+++ b/assets/css/woocommerce-layout.scss
@@ -6,15 +6,23 @@
 /**
  * Imports
  */
-@import "bourbon";
-@import "mixins";
-@import "variables";
+@import 'bourbon';
+@import 'mixins';
+@import 'variables';
 
 /**
  * Styling begins
  */
 .woocommerce, .woocommerce-page {
 
+	.woocommerce-message,
+	.woocommerce-error,
+	.woocommerce-info {
+		.button {
+			float: right;
+		}
+	}
+
 	/**
 	 * General layout styles
 	 */
@@ -296,11 +304,18 @@
 
 		.form-row-first,
 		.form-row-last {
-			float: left;
 			width: 47%;
 			overflow: visible;
 		}
 
+		.form-row-first {
+			float: left;
+
+			/*rtl:raw:
+			float: right;
+			*/
+		}
+
 		.form-row-last {
 			float: right;
 		}
@@ -327,6 +342,56 @@
 			float: right;
 		}
 	}
+
+	.woocommerce-billing-fields,
+	.woocommerce-shipping-fields {
+		@include clearfix();
+	}
+
+	.woocommerce-terms-and-conditions {
+		margin-bottom: 1.618em;
+		padding: 1.618em;
+	}
+
+	/**
+	 * oEmbeds
+	 */
+	.woocommerce-oembed {
+		position: relative;
+	}
+}
+
+.woocommerce-account {
+	.woocommerce-MyAccount-navigation {
+		float: left;
+		width: 30%;
+	}
+
+	.woocommerce-MyAccount-content {
+		float: right;
+		width: 68%;
+	}
+}
+
+/**
+ * Twenty Eleven specific styles
+ */
+.woocommerce-page {
+	&.left-sidebar {
+		#content.twentyeleven {
+			width: 58.4%;
+			margin: 0 7.6%;
+			float: right;
+		}
+	}
+
+	&.right-sidebar {
+		#content.twentyeleven {
+			margin: 0 7.6%;
+			width: 58.4%;
+			float: left;
+		}
+	}
 }
 
 /**
@@ -346,14 +411,6 @@
 		div.product.hentry.has-post-thumbnail {
 			margin-top: 0;
 		}
-
-		.product {
-			.images {
-				img {
-					margin-bottom: 1em;
-				}
-			}
-		}
 	}
 }
 
@@ -501,3 +558,19 @@
 		}
 	}
 }
+
+/**
+ * RTL styles.
+ */
+.rtl {
+	.woocommerce, .woocommerce-page {
+		.col2-set {
+			.col-1 {
+				float: right;
+			}
+			.col-2 {
+				float: left;
+			}
+		}
+	}
+}
diff --git a/assets/css/woocommerce-rtl.css b/assets/css/woocommerce-rtl.css
new file mode 100644
index 00000000000..d7adaad50b7
--- /dev/null
+++ b/assets/css/woocommerce-rtl.css
@@ -0,0 +1 @@
+@charset "UTF-8";@-webkit-keyframes spin{100%{-webkit-transform:rotate(-360deg)}}@keyframes spin{100%{-webkit-transform:rotate(-360deg);-ms-transform:rotate(-360deg);transform:rotate(-360deg)}}@font-face{font-family:star;src:url(../fonts/star.eot);src:url(../fonts/star.eot?#iefix) format("embedded-opentype"),url(../fonts/star.woff) format("woff"),url(../fonts/star.ttf) format("truetype"),url(../fonts/star.svg#star) format("svg");font-weight:400;font-style:normal}@font-face{font-family:WooCommerce;src:url(../fonts/WooCommerce.eot);src:url(../fonts/WooCommerce.eot?#iefix) format("embedded-opentype"),url(../fonts/WooCommerce.woff) format("woff"),url(../fonts/WooCommerce.ttf) format("truetype"),url(../fonts/WooCommerce.svg#WooCommerce) format("svg");font-weight:400;font-style:normal}.woocommerce-store-notice,p.demo_store{position:absolute;top:0;right:0;left:0;margin:0;width:100%;font-size:1em;padding:1em 0;text-align:center;background-color:#a46497;color:#fff;z-index:99998;box-shadow:0 1px 1em rgba(0,0,0,.2);display:none}.woocommerce-store-notice a,p.demo_store a{color:#fff;text-decoration:underline}.admin-bar p.demo_store{top:32px}.clear{clear:both}.woocommerce .blockUI.blockOverlay{position:relative}.woocommerce .blockUI.blockOverlay::before,.woocommerce .loader::before{height:1em;width:1em;display:block;position:absolute;top:50%;right:50%;margin-right:-.5em;margin-top:-.5em;content:'';-webkit-animation:spin 1s ease-in-out infinite;animation:spin 1s ease-in-out infinite;background:url(../images/icons/loader.svg) center center;background-size:cover;line-height:1;text-align:center;font-size:2em;color:rgba(0,0,0,.75)}.woocommerce a.remove{display:block;font-size:1.5em;height:1em;width:1em;text-align:center;line-height:1;border-radius:100%;color:red!important;text-decoration:none;font-weight:700;border:0}.woocommerce a.remove:hover{color:#fff!important;background:red}.woocommerce small.note{display:block;color:#777;font-size:.857em;margin-top:10px}.woocommerce .woocommerce-breadcrumb{margin:0 0 1em;padding:0;font-size:.92em;color:#777}.woocommerce .woocommerce-breadcrumb::after,.woocommerce .woocommerce-breadcrumb::before{content:' ';display:table}.woocommerce .woocommerce-breadcrumb::after{clear:both}.woocommerce .woocommerce-breadcrumb a{color:#777}.woocommerce .quantity .qty{width:3.631em;text-align:center}.woocommerce div.product{margin-bottom:0;position:relative}.woocommerce div.product .product_title{clear:none;margin-top:0;padding:0}.woocommerce #reviews #comments .add_review::after,.woocommerce .products ul::after,.woocommerce div.product form.cart::after,.woocommerce div.product p.cart::after,.woocommerce nav.woocommerce-pagination ul,.woocommerce ul.products::after{clear:both}.woocommerce div.product p.price,.woocommerce div.product span.price{color:#77a464;font-size:1.25em}.woocommerce div.product p.price ins,.woocommerce div.product span.price ins{background:inherit;font-weight:700}.woocommerce div.product p.price del,.woocommerce div.product span.price del{opacity:.5}.woocommerce div.product p.stock{font-size:.92em}.woocommerce div.product .stock{color:#77a464}.woocommerce div.product .out-of-stock{color:red}.woocommerce div.product .woocommerce-product-rating{margin-bottom:1.618em}.woocommerce div.product div.images{margin-bottom:2em}.woocommerce div.product div.images img{display:block;width:100%;height:auto;box-shadow:none}.woocommerce div.product div.images div.thumbnails{padding-top:1em}.woocommerce div.product div.images.woocommerce-product-gallery{position:relative}.woocommerce div.product div.images .woocommerce-product-gallery__wrapper{-webkit-transition:all cubic-bezier(.795,-.035,0,1) .5s;transition:all cubic-bezier(.795,-.035,0,1) .5s}.woocommerce div.product div.images .woocommerce-product-gallery__wrapper .zoomImg{background-color:#fff}.woocommerce div.product div.images .woocommerce-product-gallery__image:nth-child(n+2){width:25%;display:inline-block}.woocommerce div.product div.images .woocommerce-product-gallery__trigger{position:absolute;top:.5em;left:.5em;font-size:2em;z-index:9;width:36px;height:36px;background:#fff;text-indent:-9999px;border-radius:100%;box-sizing:content-box}.woocommerce div.product div.images .woocommerce-product-gallery__trigger:before{content:"";display:block;width:10px;height:10px;border:2px solid #000;border-radius:100%;position:absolute;top:9px;right:9px;box-sizing:content-box}.woocommerce div.product div.images .woocommerce-product-gallery__trigger:after{content:"";display:block;width:2px;height:8px;background:#000;border-radius:6px;position:absolute;top:19px;right:22px;-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg);box-sizing:content-box}.woocommerce div.product div.images .flex-control-thumbs{overflow:hidden;zoom:1;margin:0;padding:0}.woocommerce div.product div.images .flex-control-thumbs li{width:25%;float:right;margin:0;list-style:none}.woocommerce div.product div.images .flex-control-thumbs li img{cursor:pointer;opacity:.5;margin:0}.woocommerce div.product div.images .flex-control-thumbs li img.flex-active,.woocommerce div.product div.images .flex-control-thumbs li img:hover{opacity:1}.woocommerce div.product div.summary{margin-bottom:2em}.woocommerce div.product div.social{text-align:left;margin:0 0 1em}.woocommerce div.product div.social span{margin:0 2px 0 0}.woocommerce div.product div.social span span{margin:0}.woocommerce div.product div.social span .stButton .chicklets{padding-right:16px;width:0}.woocommerce div.product div.social iframe{float:right;margin-top:3px}.woocommerce div.product .woocommerce-tabs ul.tabs{list-style:none;padding:0 1em 0 0;margin:0 0 1.618em;overflow:hidden;position:relative}.woocommerce div.product .woocommerce-tabs ul.tabs li{border:1px solid #d3ced2;background-color:#ebe9eb;display:inline-block;position:relative;z-index:0;border-radius:4px 4px 0 0;margin:0 -5px;padding:0 1em}.woocommerce div.product .woocommerce-tabs ul.tabs li a{display:inline-block;padding:.5em 0;font-weight:700;color:#515151;text-decoration:none}.woocommerce div.product form.cart::after,.woocommerce div.product form.cart::before,.woocommerce div.product p.cart::after,.woocommerce div.product p.cart::before{display:table;content:' '}.woocommerce div.product .woocommerce-tabs ul.tabs li a:hover{text-decoration:none;color:#6b6b6b}.woocommerce div.product .woocommerce-tabs ul.tabs li.active{background:#fff;z-index:2;border-bottom-color:#fff}.woocommerce div.product .woocommerce-tabs ul.tabs li.active a{color:inherit;text-shadow:inherit}.woocommerce div.product .woocommerce-tabs ul.tabs li.active::before{box-shadow:-2px 2px 0 #fff}.woocommerce div.product .woocommerce-tabs ul.tabs li.active::after{box-shadow:2px 2px 0 #fff}.woocommerce div.product .woocommerce-tabs ul.tabs li::after,.woocommerce div.product .woocommerce-tabs ul.tabs li::before{border:1px solid #d3ced2;position:absolute;bottom:-1px;width:5px;height:5px;content:' '}.woocommerce div.product .woocommerce-tabs ul.tabs li::before{right:-6px;-moz-border-bottom-left-radius:4px;border-bottom-left-radius:4px;border-width:0 0 1px 1px;box-shadow:-2px 2px 0 #ebe9eb}.woocommerce div.product .woocommerce-tabs ul.tabs li::after{left:-6px;-moz-border-bottom-right-radius:4px;border-bottom-right-radius:4px;border-width:0 1px 1px 0;box-shadow:2px 2px 0 #ebe9eb}.woocommerce div.product .woocommerce-tabs ul.tabs::before{position:absolute;content:' ';width:100%;bottom:0;right:0;border-bottom:1px solid #d3ced2;z-index:1}.woocommerce div.product .woocommerce-tabs .panel{margin:0 0 2em;padding:0}.woocommerce div.product form.cart,.woocommerce div.product p.cart{margin-bottom:2em}.woocommerce div.product form.cart div.quantity{float:right;margin:0 0 0 4px}.woocommerce div.product form.cart table{border-width:0 0 1px}.woocommerce div.product form.cart table td{padding-right:0}.woocommerce div.product form.cart table div.quantity{float:none;margin:0}.woocommerce div.product form.cart table small.stock{display:block;float:none}.woocommerce div.product form.cart .variations{margin-bottom:1em;border:0;width:100%}.woocommerce div.product form.cart .variations td,.woocommerce div.product form.cart .variations th{border:0;vertical-align:top;line-height:2em}.woocommerce div.product form.cart .variations label{font-weight:700}.woocommerce div.product form.cart .variations select{max-width:100%;min-width:75%;display:inline-block;margin-left:1em}.woocommerce div.product form.cart .variations td.label{padding-left:1em}.woocommerce div.product form.cart .woocommerce-variation-description p{margin-bottom:1em}.woocommerce div.product form.cart .reset_variations{visibility:hidden;font-size:.83em}.woocommerce div.product form.cart .wc-no-matching-variations{display:none}.woocommerce div.product form.cart .button{vertical-align:middle;float:right}.woocommerce div.product form.cart .group_table td.label{padding-left:1em;padding-right:1em}.woocommerce div.product form.cart .group_table td{vertical-align:top;padding-bottom:.5em;border:0}.woocommerce div.product form.cart .group_table td:first-child{width:4em;text-align:center}.woocommerce div.product form.cart .group_table .wc-grouped-product-add-to-cart-checkbox{display:inline-block;width:auto;margin:0 auto;-webkit-transform:scale(1.5,1.5);-ms-transform:scale(1.5,1.5);transform:scale(1.5,1.5)}.woocommerce span.onsale{min-height:3.236em;min-width:3.236em;padding:.202em;font-weight:700;position:absolute;text-align:center;line-height:3.236;top:-.5em;right:-.5em;margin:0;border-radius:100%;background-color:#77a464;color:#fff;font-size:.857em;-webkit-font-smoothing:antialiased;z-index:9}.woocommerce .products ul,.woocommerce ul.products{margin:0 0 1em;padding:0;list-style:none;clear:both}.woocommerce .products ul::after,.woocommerce .products ul::before,.woocommerce ul.products::after,.woocommerce ul.products::before{content:' ';display:table}.woocommerce .products ul li,.woocommerce ul.products li{list-style:none}.woocommerce ul.products li.product .onsale{top:0;left:0;right:auto;margin:-.5em 0 0 -.5em}.woocommerce ul.products li.product .woocommerce-loop-category__title,.woocommerce ul.products li.product .woocommerce-loop-product__title,.woocommerce ul.products li.product h3{padding:.5em 0;margin:0;font-size:1em}.woocommerce ul.products li.product a{text-decoration:none}.woocommerce ul.products li.product a img{width:100%;height:auto;display:block;margin:0 0 1em;box-shadow:none}.woocommerce ul.products li.product strong{display:block}.woocommerce ul.products li.product .star-rating{font-size:.857em}.woocommerce ul.products li.product .button{margin-top:1em}.woocommerce ul.products li.product .price{color:#77a464;display:block;font-weight:400;margin-bottom:.5em;font-size:.857em}.woocommerce ul.products li.product .price del{color:inherit;opacity:.5;display:block}.woocommerce ul.products li.product .price ins{background:0 0;font-weight:700}.woocommerce ul.products li.product .price .from{font-size:.67em;margin:-2px 0 0;text-transform:uppercase;color:rgba(132,132,132,.5)}.woocommerce .woocommerce-ordering,.woocommerce .woocommerce-result-count{margin:0 0 1em}.woocommerce .woocommerce-ordering select{vertical-align:top}.woocommerce nav.woocommerce-pagination{text-align:center}.woocommerce nav.woocommerce-pagination ul{display:inline-block;white-space:nowrap;padding:0;border:1px solid #d3ced2;border-left:0;margin:1px}.woocommerce nav.woocommerce-pagination ul li{border-left:1px solid #d3ced2;padding:0;margin:0;float:right;display:inline;overflow:hidden}.woocommerce nav.woocommerce-pagination ul li a,.woocommerce nav.woocommerce-pagination ul li span{margin:0;text-decoration:none;line-height:1;font-size:1em;font-weight:400;padding:.5em;min-width:1em;display:block}.woocommerce nav.woocommerce-pagination ul li a:focus,.woocommerce nav.woocommerce-pagination ul li a:hover,.woocommerce nav.woocommerce-pagination ul li span.current{background:#ebe9eb;color:#8a7e88}.woocommerce #respond input#submit,.woocommerce a.button,.woocommerce button.button,.woocommerce input.button{font-size:100%;margin:0;line-height:1;cursor:pointer;position:relative;text-decoration:none;overflow:visible;padding:.618em 1em;font-weight:700;border-radius:3px;right:auto;color:#515151;background-color:#ebe9eb;border:0;white-space:nowrap;display:inline-block;background-image:none;box-shadow:none;-webkit-box-shadow:none;text-shadow:none}.woocommerce #respond input#submit.loading,.woocommerce a.button.loading,.woocommerce button.button.loading,.woocommerce input.button.loading{opacity:.25;padding-left:2.618em}.woocommerce #respond input#submit.loading::after,.woocommerce a.button.loading::after,.woocommerce button.button.loading::after,.woocommerce input.button.loading::after{font-family:WooCommerce;content:'\e01c';vertical-align:top;-webkit-font-smoothing:antialiased;font-weight:400;position:absolute;top:.618em;left:1em;-webkit-animation:spin 2s linear infinite;animation:spin 2s linear infinite}.woocommerce #respond input#submit.added::after,.woocommerce a.button.added::after,.woocommerce button.button.added::after,.woocommerce input.button.added::after{font-family:WooCommerce;content:'\e017';margin-right:.53em;vertical-align:bottom}.woocommerce #respond input#submit:hover,.woocommerce a.button:hover,.woocommerce button.button:hover,.woocommerce input.button:hover{background-color:#dad8da;text-decoration:none;background-image:none;color:#515151}.woocommerce #respond input#submit.alt,.woocommerce a.button.alt,.woocommerce button.button.alt,.woocommerce input.button.alt{background-color:#a46497;color:#fff;-webkit-font-smoothing:antialiased}.woocommerce #respond input#submit.alt:hover,.woocommerce a.button.alt:hover,.woocommerce button.button.alt:hover,.woocommerce input.button.alt:hover{background-color:#935386;color:#fff}.woocommerce #respond input#submit.alt.disabled,.woocommerce #respond input#submit.alt.disabled:hover,.woocommerce #respond input#submit.alt:disabled,.woocommerce #respond input#submit.alt:disabled:hover,.woocommerce #respond input#submit.alt:disabled[disabled],.woocommerce #respond input#submit.alt:disabled[disabled]:hover,.woocommerce a.button.alt.disabled,.woocommerce a.button.alt.disabled:hover,.woocommerce a.button.alt:disabled,.woocommerce a.button.alt:disabled:hover,.woocommerce a.button.alt:disabled[disabled],.woocommerce a.button.alt:disabled[disabled]:hover,.woocommerce button.button.alt.disabled,.woocommerce button.button.alt.disabled:hover,.woocommerce button.button.alt:disabled,.woocommerce button.button.alt:disabled:hover,.woocommerce button.button.alt:disabled[disabled],.woocommerce button.button.alt:disabled[disabled]:hover,.woocommerce input.button.alt.disabled,.woocommerce input.button.alt.disabled:hover,.woocommerce input.button.alt:disabled,.woocommerce input.button.alt:disabled:hover,.woocommerce input.button.alt:disabled[disabled],.woocommerce input.button.alt:disabled[disabled]:hover{background-color:#a46497;color:#fff}.woocommerce #respond input#submit.disabled,.woocommerce #respond input#submit:disabled,.woocommerce #respond input#submit:disabled[disabled],.woocommerce a.button.disabled,.woocommerce a.button:disabled,.woocommerce a.button:disabled[disabled],.woocommerce button.button.disabled,.woocommerce button.button:disabled,.woocommerce button.button:disabled[disabled],.woocommerce input.button.disabled,.woocommerce input.button:disabled,.woocommerce input.button:disabled[disabled]{color:inherit;cursor:not-allowed;opacity:.5;padding:.618em 1em}.woocommerce #respond input#submit.disabled:hover,.woocommerce #respond input#submit:disabled:hover,.woocommerce #respond input#submit:disabled[disabled]:hover,.woocommerce a.button.disabled:hover,.woocommerce a.button:disabled:hover,.woocommerce a.button:disabled[disabled]:hover,.woocommerce button.button.disabled:hover,.woocommerce button.button:disabled:hover,.woocommerce button.button:disabled[disabled]:hover,.woocommerce input.button.disabled:hover,.woocommerce input.button:disabled:hover,.woocommerce input.button:disabled[disabled]:hover{color:inherit;background-color:#ebe9eb}.woocommerce .cart .button,.woocommerce .cart input.button{float:none}.woocommerce a.added_to_cart{padding-top:.5em;white-space:nowrap;display:inline-block}.woocommerce #reviews #comments .add_review::after,.woocommerce #reviews #comments .add_review::before,.woocommerce #reviews #comments ol.commentlist li .comment-text::after,.woocommerce #reviews #comments ol.commentlist li .comment-text::before,.woocommerce #reviews #comments ol.commentlist::after,.woocommerce #reviews #comments ol.commentlist::before{content:' ';display:table}.woocommerce #reviews h2 small{float:left;color:#777;font-size:15px;margin:10px 0 0}.woocommerce #reviews h2 small a{text-decoration:none;color:#777}.woocommerce #reviews h3{margin:0}.woocommerce #reviews #respond{margin:0;border:0;padding:0}.woocommerce #reviews #comment{height:75px}.woocommerce #reviews #comments h2{clear:none}.woocommerce #review_form #respond::after,.woocommerce #reviews #comments ol.commentlist li .comment-text::after,.woocommerce #reviews #comments ol.commentlist::after,.woocommerce .woocommerce-product-rating::after,.woocommerce ul.cart_list li dl::after,.woocommerce ul.cart_list li::after,.woocommerce ul.product_list_widget li dl::after,.woocommerce ul.product_list_widget li::after{clear:both}.woocommerce #reviews #comments ol.commentlist{margin:0;width:100%;background:0 0;list-style:none}.woocommerce #reviews #comments ol.commentlist li{padding:0;margin:0 0 20px;position:relative;background:100%;border:0}.woocommerce #reviews #comments ol.commentlist li .meta{color:#777;font-size:.75em}.woocommerce #reviews #comments ol.commentlist li img.avatar{float:right;position:absolute;top:0;right:0;padding:3px;width:32px;height:auto;background:#ebe9eb;border:1px solid #e4e1e3;margin:0;box-shadow:none}.woocommerce #reviews #comments ol.commentlist li .comment-text{margin:0 50px 0 0;border:1px solid #e4e1e3;border-radius:4px;padding:1em 1em 0}.woocommerce #reviews #comments ol.commentlist li .comment-text p{margin:0 0 1em}.woocommerce #reviews #comments ol.commentlist li .comment-text p.meta{font-size:.83em}.woocommerce #reviews #comments ol.commentlist ul.children{list-style:none;margin:20px 50px 0 0}.woocommerce #reviews #comments ol.commentlist ul.children .star-rating{display:none}.woocommerce #reviews #comments ol.commentlist #respond{border:1px solid #e4e1e3;border-radius:4px;padding:1em 1em 0;margin:20px 50px 0 0}.woocommerce #reviews #comments .commentlist>li::before{content:''}.woocommerce .star-rating{float:left;overflow:hidden;position:relative;height:1em;line-height:1;font-size:1em;width:5.4em;font-family:star}.woocommerce .star-rating::before{content:'\73\73\73\73\73';color:#d3ced2;float:right;top:0;right:0;position:absolute}.woocommerce .star-rating span{overflow:hidden;float:right;top:0;right:0;position:absolute;padding-top:1.5em}.woocommerce .star-rating span::before{content:'\53\53\53\53\53';top:0;position:absolute;right:0}.woocommerce .woocommerce-product-rating{line-height:2;display:block}.woocommerce .woocommerce-product-rating::after,.woocommerce .woocommerce-product-rating::before{content:' ';display:table}.woocommerce .woocommerce-product-rating .star-rating{margin:.5em 0 0 4px;float:right}.woocommerce .products .star-rating{display:block;margin:0 0 .5em;float:none}.woocommerce .hreview-aggregate .star-rating{margin:10px 0 0}.woocommerce #review_form #respond{position:static;margin:0;width:auto;padding:0;background:0 0;border:0}.woocommerce #review_form #respond::after,.woocommerce #review_form #respond::before{content:' ';display:table}.woocommerce p.stars a::before,.woocommerce p.stars a:hover~a::before{content:'\e021'}.woocommerce #review_form #respond p{margin:0 0 10px}.woocommerce #review_form #respond .form-submit input{right:auto}.woocommerce #review_form #respond textarea{box-sizing:border-box;width:100%}.woocommerce p.stars a{position:relative;height:1em;width:1em;text-indent:-999em;display:inline-block;text-decoration:none}.woocommerce p.stars a::before{display:block;position:absolute;top:0;right:0;width:1em;height:1em;line-height:1;font-family:WooCommerce;text-indent:0}.woocommerce table.shop_attributes td,.woocommerce table.shop_attributes th{line-height:1.5;border-bottom:1px dotted rgba(0,0,0,.1);border-top:0;margin:0}.woocommerce p.stars.selected a.active::before,.woocommerce p.stars:hover a::before{content:'\e020'}.woocommerce p.stars.selected a.active~a::before{content:'\e021'}.woocommerce p.stars.selected a:not(.active)::before{content:'\e020'}.woocommerce table.shop_attributes{border:0;border-top:1px dotted rgba(0,0,0,.1);margin-bottom:1.618em;width:100%}.woocommerce table.shop_attributes th{width:150px;font-weight:700;padding:8px}.woocommerce table.shop_attributes td{font-style:italic;padding:0}.woocommerce table.shop_attributes td p{margin:0;padding:8px 0}.woocommerce table.shop_attributes tr:nth-child(even) td,.woocommerce table.shop_attributes tr:nth-child(even) th{background:rgba(0,0,0,.025)}.woocommerce table.shop_table{border:1px solid rgba(0,0,0,.1);margin:0 0 24px -1px;text-align:right;width:100%;border-collapse:separate;border-radius:5px}.woocommerce table.shop_table th{font-weight:700;padding:9px 12px}.woocommerce table.shop_table td{border-top:1px solid rgba(0,0,0,.1);padding:6px 12px;vertical-align:middle}.woocommerce table.shop_table td small{font-weight:400}.woocommerce table.shop_table tbody:first-child tr:first-child td,.woocommerce table.shop_table tbody:first-child tr:first-child th{border-top:0}.woocommerce table.shop_table tbody th,.woocommerce table.shop_table tfoot td,.woocommerce table.shop_table tfoot th{font-weight:700;border-top:1px solid rgba(0,0,0,.1)}.woocommerce table.my_account_orders{font-size:.85em}.woocommerce table.my_account_orders td,.woocommerce table.my_account_orders th{padding:4px 8px;vertical-align:middle}.woocommerce table.my_account_orders .button{white-space:nowrap}.woocommerce table.my_account_orders .order-actions{text-align:left}.woocommerce table.my_account_orders .order-actions .button{margin:.125em .25em .125em 0}.woocommerce table.woocommerce-MyAccount-downloads td,.woocommerce table.woocommerce-MyAccount-downloads th{vertical-align:top;text-align:center}.woocommerce table.woocommerce-MyAccount-downloads td:first-child,.woocommerce table.woocommerce-MyAccount-downloads td:last-child,.woocommerce table.woocommerce-MyAccount-downloads th:first-child,.woocommerce table.woocommerce-MyAccount-downloads th:last-child{text-align:right}.woocommerce table.woocommerce-MyAccount-downloads td .woocommerce-MyAccount-downloads-file::before,.woocommerce table.woocommerce-MyAccount-downloads th .woocommerce-MyAccount-downloads-file::before{content:'\2193';display:inline-block}.woocommerce td.product-name .wc-item-meta,.woocommerce td.product-name dl.variation{list-style:none}.woocommerce td.product-name .wc-item-meta .wc-item-meta-label,.woocommerce td.product-name .wc-item-meta dt,.woocommerce td.product-name dl.variation .wc-item-meta-label,.woocommerce td.product-name dl.variation dt{float:right;clear:both;margin-left:.25em;display:inline-block;list-style:none}.woocommerce td.product-name .wc-item-meta dd,.woocommerce td.product-name dl.variation dd{margin:0}.woocommerce td.product-name .wc-item-meta p,.woocommerce td.product-name .wc-item-meta:last-child,.woocommerce td.product-name dl.variation p,.woocommerce td.product-name dl.variation:last-child{margin-bottom:0}.woocommerce td.product-name p.backorder_notification{font-size:.83em}.woocommerce td.product-quantity{min-width:80px}.woocommerce ul.cart_list,.woocommerce ul.product_list_widget{list-style:none;padding:0;margin:0}.woocommerce ul.cart_list li,.woocommerce ul.product_list_widget li{padding:4px 0;margin:0;list-style:none}.woocommerce ul.cart_list li::after,.woocommerce ul.cart_list li::before,.woocommerce ul.product_list_widget li::after,.woocommerce ul.product_list_widget li::before{content:' ';display:table}.woocommerce ul.cart_list li a,.woocommerce ul.product_list_widget li a{display:block;font-weight:700}.woocommerce ul.cart_list li img,.woocommerce ul.product_list_widget li img{float:left;margin-right:4px;width:32px;height:auto;box-shadow:none}.woocommerce ul.cart_list li dl,.woocommerce ul.product_list_widget li dl{margin:0;padding-right:1em;border-right:2px solid rgba(0,0,0,.1)}.woocommerce ul.cart_list li dl::after,.woocommerce ul.cart_list li dl::before,.woocommerce ul.product_list_widget li dl::after,.woocommerce ul.product_list_widget li dl::before{content:' ';display:table}.woocommerce ul.cart_list li dl dd,.woocommerce ul.cart_list li dl dt,.woocommerce ul.product_list_widget li dl dd,.woocommerce ul.product_list_widget li dl dt{display:inline-block;float:right;margin-bottom:1em}.woocommerce ul.cart_list li dl dt,.woocommerce ul.product_list_widget li dl dt{font-weight:700;padding:0 0 .25em;margin:0 0 0 4px;clear:right}#add_payment_method .wc-proceed-to-checkout::after,.woocommerce .widget_layered_nav ul li::after,.woocommerce .widget_rating_filter ul li::after,.woocommerce .widget_shopping_cart .buttons::after,.woocommerce ul.order_details::after,.woocommerce-account .addresses .title::after,.woocommerce-account .woocommerce::after,.woocommerce-cart .wc-proceed-to-checkout::after,.woocommerce-checkout .wc-proceed-to-checkout::after,.woocommerce-error::after,.woocommerce-info::after,.woocommerce-message::after,.woocommerce.widget_shopping_cart .buttons::after{clear:both}.woocommerce ul.cart_list li dl dd,.woocommerce ul.product_list_widget li dl dd{padding:0 0 .25em}.woocommerce ul.cart_list li dl dd p:last-child,.woocommerce ul.product_list_widget li dl dd p:last-child{margin-bottom:0}.woocommerce ul.cart_list li .star-rating,.woocommerce ul.product_list_widget li .star-rating{float:none}.woocommerce .widget_shopping_cart .total,.woocommerce.widget_shopping_cart .total{border-top:3px double #ebe9eb;padding:4px 0 0}.woocommerce .widget_shopping_cart .total strong,.woocommerce.widget_shopping_cart .total strong{min-width:40px;display:inline-block}.woocommerce .widget_shopping_cart .cart_list li,.woocommerce.widget_shopping_cart .cart_list li{padding-right:2em;position:relative;padding-top:0}.woocommerce .widget_shopping_cart .cart_list li a.remove,.woocommerce.widget_shopping_cart .cart_list li a.remove{position:absolute;top:0;right:0}.woocommerce .widget_shopping_cart .buttons::after,.woocommerce .widget_shopping_cart .buttons::before,.woocommerce.widget_shopping_cart .buttons::after,.woocommerce.widget_shopping_cart .buttons::before{content:' ';display:table}.woocommerce .widget_shopping_cart .buttons a,.woocommerce.widget_shopping_cart .buttons a{margin-left:5px;margin-bottom:5px}.woocommerce form .form-row{padding:3px;margin:0 0 6px}.woocommerce form .form-row [placeholder]:focus::-webkit-input-placeholder{-webkit-transition:opacity .5s .5s ease;transition:opacity .5s .5s ease;opacity:0}.woocommerce form .form-row label{line-height:2}.woocommerce form .form-row label.hidden{visibility:hidden}.woocommerce form .form-row label.inline{display:inline}.woocommerce form .form-row select{cursor:pointer;margin:0}.woocommerce form .form-row .required{color:red;font-weight:700;border:0}.woocommerce form .form-row .input-checkbox{display:inline;margin:-2px 0 0 8px;text-align:center;vertical-align:middle}.woocommerce form .form-row input.input-text,.woocommerce form .form-row textarea{box-sizing:border-box;width:100%;margin:0;outline:0;line-height:1}.woocommerce form .form-row textarea{height:4em;line-height:1.5;display:block;box-shadow:none}.woocommerce form .form-row .select2-container{width:100%;line-height:2em}.woocommerce form .form-row.woocommerce-invalid label{color:#a00}.woocommerce form .form-row.woocommerce-invalid .select2-container,.woocommerce form .form-row.woocommerce-invalid input.input-text,.woocommerce form .form-row.woocommerce-invalid select{border-color:#a00}.woocommerce form .form-row.woocommerce-validated .select2-container,.woocommerce form .form-row.woocommerce-validated input.input-text,.woocommerce form .form-row.woocommerce-validated select{border-color:#69bf29}.woocommerce form .form-row ::-webkit-input-placeholder{line-height:normal}.woocommerce form .form-row :-moz-placeholder{line-height:normal}.woocommerce form .form-row :-ms-input-placeholder{line-height:normal}.woocommerce form.checkout_coupon,.woocommerce form.login,.woocommerce form.register{border:1px solid #d3ced2;padding:20px;margin:2em 0;text-align:right;border-radius:5px}.woocommerce ul#shipping_method{list-style:none;margin:0;padding:0}.woocommerce ul#shipping_method li{margin:0;padding:.25em 22px .25em 0;text-indent:-22px;list-style:none}.woocommerce ul#shipping_method li input{margin:3px .5ex}.woocommerce ul#shipping_method li label{display:inline}.woocommerce .widget_layered_nav ul li::after,.woocommerce .widget_layered_nav ul li::before,.woocommerce ul.order_details::after,.woocommerce ul.order_details::before{content:' ';display:table}.woocommerce ul#shipping_method .amount{font-weight:700}.woocommerce p.woocommerce-shipping-contents{margin:0}.woocommerce ul.order_details{margin:0 0 3em;list-style:none}.woocommerce ul.order_details li{float:right;margin-left:2em;text-transform:uppercase;font-size:.715em;line-height:1;border-left:1px dashed #d3ced2;padding-left:2em;margin-right:0;padding-right:0;list-style-type:none}.woocommerce ul.order_details li strong{display:block;font-size:1.4em;text-transform:none;line-height:1.5}.woocommerce ul.order_details li:last-of-type{border:none}.woocommerce .wc-bacs-bank-details-account-name{font-weight:700}.woocommerce .widget_layered_nav ul{margin:0;padding:0;border:0;list-style:none}.woocommerce .widget_layered_nav ul li{padding:0 0 1px;list-style:none}.woocommerce .widget_layered_nav ul li.chosen a::before,.woocommerce .widget_layered_nav_filters ul li a::before{line-height:1;content:"";font-weight:400;color:#a00;font-family:WooCommerce;speak:none;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;text-decoration:none}.woocommerce .widget_layered_nav ul li a,.woocommerce .widget_layered_nav ul li span{padding:1px 0}.woocommerce .widget_layered_nav ul li.chosen a::before{margin-left:.618em}.woocommerce .widget_layered_nav_filters ul{margin:0;padding:0;border:0;list-style:none;overflow:hidden;zoom:1}.woocommerce .widget_layered_nav_filters ul li{float:right;padding:0 0 1px 1px;list-style:none}.woocommerce .widget_layered_nav_filters ul li a{text-decoration:none}.woocommerce .widget_layered_nav_filters ul li a::before{margin-left:.618em}.woocommerce .widget_price_filter .price_slider{margin-bottom:1em}.woocommerce .widget_price_filter .price_slider_amount{text-align:left;line-height:2.4;font-size:.8751em}.woocommerce .widget_price_filter .price_slider_amount .button{font-size:1.15em;float:right}.woocommerce .widget_price_filter .ui-slider{position:relative;text-align:right;margin-right:.5em;margin-left:.5em}.woocommerce .widget_price_filter .ui-slider .ui-slider-handle{position:absolute;z-index:2;width:1em;height:1em;background-color:#a46497;border-radius:1em;cursor:ew-resize;outline:0;top:-.3em;margin-left:-.5em}.woocommerce .widget_price_filter .ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;border-radius:1em;background-color:#a46497}.woocommerce .widget_price_filter .price_slider_wrapper .ui-widget-content{border-radius:1em;background-color:#602053;border:0}.woocommerce .widget_price_filter .ui-slider-horizontal{height:.5em}.woocommerce .widget_price_filter .ui-slider-horizontal .ui-slider-range{top:0;height:100%}.woocommerce .widget_price_filter .ui-slider-horizontal .ui-slider-range-min{right:-1px}.woocommerce .widget_price_filter .ui-slider-horizontal .ui-slider-range-max{left:-1px}.woocommerce .widget_rating_filter ul{margin:0;padding:0;border:0;list-style:none}.woocommerce .widget_rating_filter ul li{padding:0 0 1px;list-style:none}.woocommerce .widget_rating_filter ul li::after,.woocommerce .widget_rating_filter ul li::before{content:' ';display:table}.woocommerce .widget_rating_filter ul li a{padding:1px 0;text-decoration:none}.woocommerce .widget_rating_filter ul li .star-rating{float:none;display:inline-block}.rtl.woocommerce div.product div.images .flex-control-thumbs li,.woocommerce-error .button,.woocommerce-info .button,.woocommerce-message .button{float:left}.woocommerce .widget_rating_filter ul li.chosen a::before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin-left:.618em;content:"";text-decoration:none;color:#a00}.pswp{z-index:999999}.woocommerce img.pswp__img,.woocommerce-page img.pswp__img{max-width:none}button.pswp__button{box-shadow:none!important;background-image:url(photoswipe/default-skin/default-skin.png)!important}button.pswp__button,button.pswp__button--arrow--left::before,button.pswp__button--arrow--right::before,button.pswp__button:hover{background-color:transparent!important}button.pswp__button--arrow--left,button.pswp__button--arrow--left:hover,button.pswp__button--arrow--right,button.pswp__button--arrow--right:hover{background-image:none!important}button.pswp__button--close:hover{background-position:100% -44px}button.pswp__button--zoom:hover{background-position:-88px 0}.woocommerce-error,.woocommerce-info,.woocommerce-message{padding:1em 3.5em 1em 2em;margin:0 0 2em;position:relative;background-color:#f7f6f7;color:#515151;border-top:3px solid #a46497;list-style:none;width:auto;word-wrap:break-word}.woocommerce-error::after,.woocommerce-error::before,.woocommerce-info::after,.woocommerce-info::before,.woocommerce-message::after,.woocommerce-message::before{content:' ';display:table}.woocommerce-error::before,.woocommerce-info::before,.woocommerce-message::before{font-family:WooCommerce;content:'\e028';display:inline-block;position:absolute;top:1em;right:1.5em}.woocommerce-error li,.woocommerce-info li,.woocommerce-message li{list-style:none!important;padding-right:0!important;margin-right:0!important}.woocommerce-message{border-top-color:#8fae1b}.woocommerce-message::before{content:'\e015';color:#8fae1b}.woocommerce-info{border-top-color:#1e85be}.woocommerce-info::before{color:#1e85be}.woocommerce-error{border-top-color:#b81c23}.woocommerce-error::before{content:'\e016';color:#b81c23}.woocommerce-account .addresses .title::after,.woocommerce-account .addresses .title::before,.woocommerce-account .woocommerce::after,.woocommerce-account .woocommerce::before{content:' ';display:table}.woocommerce-account .addresses .title h3{float:right}.woocommerce-account .addresses .title .edit,.woocommerce-account ul.digital-downloads li .count{float:left}.woocommerce-account ol.commentlist.notes li.note p.meta{font-weight:700;margin-bottom:0}.woocommerce-account ol.commentlist.notes li.note .description p:last-child{margin-bottom:0}.woocommerce-account ul.digital-downloads{margin-right:0;padding-right:0}.woocommerce-account ul.digital-downloads li{list-style:none;margin-right:0;padding-right:0}.woocommerce-account ul.digital-downloads li::before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin-left:.618em;content:"";text-decoration:none}#add_payment_method table.cart .product-thumbnail,.woocommerce-cart table.cart .product-thumbnail,.woocommerce-checkout table.cart .product-thumbnail{min-width:32px}#add_payment_method table.cart img,.woocommerce-cart table.cart img,.woocommerce-checkout table.cart img{width:32px;box-shadow:none}#add_payment_method table.cart td,#add_payment_method table.cart th,.woocommerce-cart table.cart td,.woocommerce-cart table.cart th,.woocommerce-checkout table.cart td,.woocommerce-checkout table.cart th{vertical-align:middle}#add_payment_method table.cart td.actions .coupon .input-text,.woocommerce-cart table.cart td.actions .coupon .input-text,.woocommerce-checkout table.cart td.actions .coupon .input-text{float:right;box-sizing:border-box;border:1px solid #d3ced2;padding:6px 6px 5px;margin:0 0 0 4px;outline:0;line-height:1}#add_payment_method table.cart input,.woocommerce-cart table.cart input,.woocommerce-checkout table.cart input{margin:0;vertical-align:middle;line-height:1}#add_payment_method .wc-proceed-to-checkout,.woocommerce-cart .wc-proceed-to-checkout,.woocommerce-checkout .wc-proceed-to-checkout{padding:1em 0}#add_payment_method .wc-proceed-to-checkout::after,#add_payment_method .wc-proceed-to-checkout::before,.woocommerce-cart .wc-proceed-to-checkout::after,.woocommerce-cart .wc-proceed-to-checkout::before,.woocommerce-checkout .wc-proceed-to-checkout::after,.woocommerce-checkout .wc-proceed-to-checkout::before{content:' ';display:table}#add_payment_method .wc-proceed-to-checkout a.checkout-button,.woocommerce-cart .wc-proceed-to-checkout a.checkout-button,.woocommerce-checkout .wc-proceed-to-checkout a.checkout-button{display:block;text-align:center;margin-bottom:1em;font-size:1.25em;padding:1em}#add_payment_method .cart-collaterals .shipping_calculator .button,.woocommerce-cart .cart-collaterals .shipping_calculator .button,.woocommerce-checkout .cart-collaterals .shipping_calculator .button{width:100%;float:none;display:block}#add_payment_method .cart-collaterals .shipping_calculator .shipping-calculator-button::after,.woocommerce-cart .cart-collaterals .shipping_calculator .shipping-calculator-button::after,.woocommerce-checkout .cart-collaterals .shipping_calculator .shipping-calculator-button::after{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin-right:.618em;content:"";text-decoration:none}#add_payment_method #payment ul.payment_methods li:not(.woocommerce-notice)::after,#add_payment_method #payment ul.payment_methods li:not(.woocommerce-notice)::before,#add_payment_method #payment ul.payment_methods::after,#add_payment_method #payment ul.payment_methods::before,.woocommerce-cart #payment ul.payment_methods li:not(.woocommerce-notice)::after,.woocommerce-cart #payment ul.payment_methods li:not(.woocommerce-notice)::before,.woocommerce-cart #payment ul.payment_methods::after,.woocommerce-cart #payment ul.payment_methods::before,.woocommerce-checkout #payment ul.payment_methods li:not(.woocommerce-notice)::after,.woocommerce-checkout #payment ul.payment_methods li:not(.woocommerce-notice)::before,.woocommerce-checkout #payment ul.payment_methods::after,.woocommerce-checkout #payment ul.payment_methods::before{content:' ';display:table}#add_payment_method .cart-collaterals .cart_totals p small,.woocommerce-cart .cart-collaterals .cart_totals p small,.woocommerce-checkout .cart-collaterals .cart_totals p small{color:#777;font-size:.83em}#add_payment_method .cart-collaterals .cart_totals table,.woocommerce-cart .cart-collaterals .cart_totals table,.woocommerce-checkout .cart-collaterals .cart_totals table{border-collapse:separate;margin:0 0 6px;padding:0}#add_payment_method .cart-collaterals .cart_totals table tr:first-child td,#add_payment_method .cart-collaterals .cart_totals table tr:first-child th,.woocommerce-cart .cart-collaterals .cart_totals table tr:first-child td,.woocommerce-cart .cart-collaterals .cart_totals table tr:first-child th,.woocommerce-checkout .cart-collaterals .cart_totals table tr:first-child td,.woocommerce-checkout .cart-collaterals .cart_totals table tr:first-child th{border-top:0}#add_payment_method .cart-collaterals .cart_totals table th,.woocommerce-cart .cart-collaterals .cart_totals table th,.woocommerce-checkout .cart-collaterals .cart_totals table th{width:40%}#add_payment_method .cart-collaterals .cart_totals table td,#add_payment_method .cart-collaterals .cart_totals table th,.woocommerce-cart .cart-collaterals .cart_totals table td,.woocommerce-cart .cart-collaterals .cart_totals table th,.woocommerce-checkout .cart-collaterals .cart_totals table td,.woocommerce-checkout .cart-collaterals .cart_totals table th{vertical-align:top;border-right:0;border-left:0;line-height:1.5em}#add_payment_method .cart-collaterals .cart_totals table small,.woocommerce-cart .cart-collaterals .cart_totals table small,.woocommerce-checkout .cart-collaterals .cart_totals table small{color:#777}#add_payment_method .cart-collaterals .cart_totals table select,.woocommerce-cart .cart-collaterals .cart_totals table select,.woocommerce-checkout .cart-collaterals .cart_totals table select{width:100%}#add_payment_method .cart-collaterals .cart_totals .discount td,.woocommerce-cart .cart-collaterals .cart_totals .discount td,.woocommerce-checkout .cart-collaterals .cart_totals .discount td{color:#77a464}#add_payment_method .cart-collaterals .cart_totals tr td,#add_payment_method .cart-collaterals .cart_totals tr th,.woocommerce-cart .cart-collaterals .cart_totals tr td,.woocommerce-cart .cart-collaterals .cart_totals tr th,.woocommerce-checkout .cart-collaterals .cart_totals tr td,.woocommerce-checkout .cart-collaterals .cart_totals tr th{border-top:1px solid #ebe9eb}#add_payment_method .cart-collaterals .cross-sells ul.products li.product,.woocommerce-cart .cart-collaterals .cross-sells ul.products li.product,.woocommerce-checkout .cart-collaterals .cross-sells ul.products li.product{margin-top:0}#add_payment_method .checkout .col-2 h3#ship-to-different-address,.woocommerce-cart .checkout .col-2 h3#ship-to-different-address,.woocommerce-checkout .checkout .col-2 h3#ship-to-different-address{float:right;clear:none}#add_payment_method .checkout .col-2 .form-row-first,#add_payment_method .checkout .col-2 .notes,.woocommerce-cart .checkout .col-2 .form-row-first,.woocommerce-cart .checkout .col-2 .notes,.woocommerce-checkout .checkout .col-2 .form-row-first,.woocommerce-checkout .checkout .col-2 .notes{clear:right}#add_payment_method .checkout .create-account small,.woocommerce-cart .checkout .create-account small,.woocommerce-checkout .checkout .create-account small{font-size:11px;color:#777;font-weight:400}#add_payment_method .checkout div.shipping-address,.woocommerce-cart .checkout div.shipping-address,.woocommerce-checkout .checkout div.shipping-address{padding:0;clear:right;width:100%}#add_payment_method #payment ul.payment_methods li:not(.woocommerce-notice)::after,#add_payment_method #payment ul.payment_methods::after,#add_payment_method .checkout .shipping_address,.single-product .twentythirteen p.stars,.woocommerce-cart #payment ul.payment_methods li:not(.woocommerce-notice)::after,.woocommerce-cart #payment ul.payment_methods::after,.woocommerce-cart .checkout .shipping_address,.woocommerce-checkout #payment ul.payment_methods li:not(.woocommerce-notice)::after,.woocommerce-checkout #payment ul.payment_methods::after,.woocommerce-checkout .checkout .shipping_address{clear:both}#add_payment_method #payment,.woocommerce-cart #payment,.woocommerce-checkout #payment{background:#ebe9eb;border-radius:5px}#add_payment_method #payment ul.payment_methods,.woocommerce-cart #payment ul.payment_methods,.woocommerce-checkout #payment ul.payment_methods{text-align:right;padding:1em;border-bottom:1px solid #d3ced2;margin:0;list-style:none}#add_payment_method #payment ul.payment_methods li,.woocommerce-cart #payment ul.payment_methods li,.woocommerce-checkout #payment ul.payment_methods li{line-height:2;text-align:right;margin:0;font-weight:400}#add_payment_method #payment ul.payment_methods li input,.woocommerce-cart #payment ul.payment_methods li input,.woocommerce-checkout #payment ul.payment_methods li input{margin:0 0 0 1em}#add_payment_method #payment ul.payment_methods li img,.woocommerce-cart #payment ul.payment_methods li img,.woocommerce-checkout #payment ul.payment_methods li img{vertical-align:middle;margin:-2px .5em 0 0;padding:0;position:relative;box-shadow:none}#add_payment_method #payment ul.payment_methods li img+img,.woocommerce-cart #payment ul.payment_methods li img+img,.woocommerce-checkout #payment ul.payment_methods li img+img{margin-right:2px}#add_payment_method #payment div.form-row,.woocommerce-cart #payment div.form-row,.woocommerce-checkout #payment div.form-row{padding:1em}#add_payment_method #payment div.payment_box,.woocommerce-cart #payment div.payment_box,.woocommerce-checkout #payment div.payment_box{position:relative;box-sizing:border-box;width:100%;padding:1em;margin:1em 0;font-size:.92em;border-radius:2px;line-height:1.5;background-color:#dfdcde;color:#515151}#add_payment_method #payment div.payment_box input.input-text,#add_payment_method #payment div.payment_box textarea,.woocommerce-cart #payment div.payment_box input.input-text,.woocommerce-cart #payment div.payment_box textarea,.woocommerce-checkout #payment div.payment_box input.input-text,.woocommerce-checkout #payment div.payment_box textarea{border-color:#bbb3b9 #c7c1c6 #c7c1c6}#add_payment_method #payment div.payment_box ::-webkit-input-placeholder,.woocommerce-cart #payment div.payment_box ::-webkit-input-placeholder,.woocommerce-checkout #payment div.payment_box ::-webkit-input-placeholder{color:#bbb3b9}#add_payment_method #payment div.payment_box :-moz-placeholder,.woocommerce-cart #payment div.payment_box :-moz-placeholder,.woocommerce-checkout #payment div.payment_box :-moz-placeholder{color:#bbb3b9}#add_payment_method #payment div.payment_box :-ms-input-placeholder,.woocommerce-cart #payment div.payment_box :-ms-input-placeholder,.woocommerce-checkout #payment div.payment_box :-ms-input-placeholder{color:#bbb3b9}#add_payment_method #payment div.payment_box .woocommerce-SavedPaymentMethods,.woocommerce-cart #payment div.payment_box .woocommerce-SavedPaymentMethods,.woocommerce-checkout #payment div.payment_box .woocommerce-SavedPaymentMethods{list-style:none;margin:0}#add_payment_method #payment div.payment_box .woocommerce-SavedPaymentMethods .woocommerce-SavedPaymentMethods-new,#add_payment_method #payment div.payment_box .woocommerce-SavedPaymentMethods .woocommerce-SavedPaymentMethods-token,.woocommerce-cart #payment div.payment_box .woocommerce-SavedPaymentMethods .woocommerce-SavedPaymentMethods-new,.woocommerce-cart #payment div.payment_box .woocommerce-SavedPaymentMethods .woocommerce-SavedPaymentMethods-token,.woocommerce-checkout #payment div.payment_box .woocommerce-SavedPaymentMethods .woocommerce-SavedPaymentMethods-new,.woocommerce-checkout #payment div.payment_box .woocommerce-SavedPaymentMethods .woocommerce-SavedPaymentMethods-token{margin:0 0 .5em}#add_payment_method #payment div.payment_box .woocommerce-SavedPaymentMethods .woocommerce-SavedPaymentMethods-new label,#add_payment_method #payment div.payment_box .woocommerce-SavedPaymentMethods .woocommerce-SavedPaymentMethods-token label,.woocommerce-cart #payment div.payment_box .woocommerce-SavedPaymentMethods .woocommerce-SavedPaymentMethods-new label,.woocommerce-cart #payment div.payment_box .woocommerce-SavedPaymentMethods .woocommerce-SavedPaymentMethods-token label,.woocommerce-checkout #payment div.payment_box .woocommerce-SavedPaymentMethods .woocommerce-SavedPaymentMethods-new label,.woocommerce-checkout #payment div.payment_box .woocommerce-SavedPaymentMethods .woocommerce-SavedPaymentMethods-token label{cursor:pointer}#add_payment_method #payment div.payment_box .woocommerce-SavedPaymentMethods .woocommerce-SavedPaymentMethods-tokenInput,.woocommerce-cart #payment div.payment_box .woocommerce-SavedPaymentMethods .woocommerce-SavedPaymentMethods-tokenInput,.woocommerce-checkout #payment div.payment_box .woocommerce-SavedPaymentMethods .woocommerce-SavedPaymentMethods-tokenInput{vertical-align:middle;margin:-3px 0 0 1em;position:relative}#add_payment_method #payment div.payment_box .wc-credit-card-form,.woocommerce-cart #payment div.payment_box .wc-credit-card-form,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form{border:0;padding:0;margin:1em 0 0}#add_payment_method #payment div.payment_box .wc-credit-card-form-card-cvc,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-expiry,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-number,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-cvc,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-expiry,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-number,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-cvc,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-expiry,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-number{font-size:1.5em;padding:8px;background-repeat:no-repeat;background-position:left .618em center;background-size:32px 20px}#add_payment_method #payment div.payment_box .wc-credit-card-form-card-cvc.visa,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-expiry.visa,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-number.visa,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-cvc.visa,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-expiry.visa,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-number.visa,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-cvc.visa,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-expiry.visa,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-number.visa{background-image:url(../images/icons/credit-cards/visa.svg)}#add_payment_method #payment div.payment_box .wc-credit-card-form-card-cvc.mastercard,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-expiry.mastercard,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-number.mastercard,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-cvc.mastercard,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-expiry.mastercard,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-number.mastercard,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-cvc.mastercard,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-expiry.mastercard,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-number.mastercard{background-image:url(../images/icons/credit-cards/mastercard.svg)}#add_payment_method #payment div.payment_box .wc-credit-card-form-card-cvc.laser,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-expiry.laser,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-number.laser,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-cvc.laser,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-expiry.laser,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-number.laser,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-cvc.laser,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-expiry.laser,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-number.laser{background-image:url(../images/icons/credit-cards/laser.svg)}#add_payment_method #payment div.payment_box .wc-credit-card-form-card-cvc.dinersclub,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-expiry.dinersclub,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-number.dinersclub,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-cvc.dinersclub,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-expiry.dinersclub,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-number.dinersclub,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-cvc.dinersclub,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-expiry.dinersclub,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-number.dinersclub{background-image:url(../images/icons/credit-cards/diners.svg)}#add_payment_method #payment div.payment_box .wc-credit-card-form-card-cvc.maestro,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-expiry.maestro,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-number.maestro,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-cvc.maestro,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-expiry.maestro,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-number.maestro,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-cvc.maestro,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-expiry.maestro,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-number.maestro{background-image:url(../images/icons/credit-cards/maestro.svg)}#add_payment_method #payment div.payment_box .wc-credit-card-form-card-cvc.jcb,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-expiry.jcb,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-number.jcb,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-cvc.jcb,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-expiry.jcb,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-number.jcb,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-cvc.jcb,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-expiry.jcb,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-number.jcb{background-image:url(../images/icons/credit-cards/jcb.svg)}#add_payment_method #payment div.payment_box .wc-credit-card-form-card-cvc.amex,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-expiry.amex,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-number.amex,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-cvc.amex,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-expiry.amex,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-number.amex,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-cvc.amex,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-expiry.amex,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-number.amex{background-image:url(../images/icons/credit-cards/amex.svg)}#add_payment_method #payment div.payment_box .wc-credit-card-form-card-cvc.discover,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-expiry.discover,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-number.discover,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-cvc.discover,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-expiry.discover,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-number.discover,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-cvc.discover,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-expiry.discover,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-number.discover{background-image:url(../images/icons/credit-cards/discover.svg)}#add_payment_method #payment div.payment_box span.help,.woocommerce-cart #payment div.payment_box span.help,.woocommerce-checkout #payment div.payment_box span.help{font-size:.857em;color:#777;font-weight:400}#add_payment_method #payment div.payment_box .form-row,.woocommerce-cart #payment div.payment_box .form-row,.woocommerce-checkout #payment div.payment_box .form-row{margin:0 0 1em}#add_payment_method #payment div.payment_box p:last-child,.woocommerce-cart #payment div.payment_box p:last-child,.woocommerce-checkout #payment div.payment_box p:last-child{margin-bottom:0}#add_payment_method #payment div.payment_box::before,.woocommerce-cart #payment div.payment_box::before,.woocommerce-checkout #payment div.payment_box::before{content:'';display:block;border:1em solid #dfdcde;border-left-color:transparent;border-right-color:transparent;border-top-color:transparent;position:absolute;top:-.75em;right:0;margin:-1em 2em 0 0}#add_payment_method #payment .payment_method_paypal .about_paypal,.woocommerce-cart #payment .payment_method_paypal .about_paypal,.woocommerce-checkout #payment .payment_method_paypal .about_paypal{float:left;line-height:52px;font-size:.83em}#add_payment_method #payment .payment_method_paypal img,.woocommerce-cart #payment .payment_method_paypal img,.woocommerce-checkout #payment .payment_method_paypal img{max-height:52px;vertical-align:middle}.woocommerce-terms-and-conditions{border:1px solid rgba(0,0,0,.2);box-shadow:inset 0 1px 2px rgba(0,0,0,.1);background:rgba(0,0,0,.05)}.woocommerce-password-strength{text-align:center;font-weight:600;padding:3px .5em;font-size:1em}.woocommerce-password-strength.strong{background-color:#c1e1b9;border-color:#83c373}.woocommerce-password-strength.short{background-color:#f1adad;border-color:#e35b5b}.woocommerce-password-strength.bad{background-color:#fbc5a9;border-color:#f78b53}.woocommerce-password-strength.good{background-color:#ffe399;border-color:#ffc733}.woocommerce-password-hint{margin:.5em 0 0;display:block}#content.twentyeleven .woocommerce-pagination a{font-size:1em;line-height:1}.single-product .twentythirteen #reply-title,.single-product .twentythirteen #respond #commentform,.single-product .twentythirteen .entry-summary{padding:0}.twentythirteen .woocommerce-breadcrumb{padding-top:40px}.twentyfourteen ul.products li.product{margin-top:0!important}body:not(.search-results) .twentysixteen .entry-summary{color:inherit;font-size:inherit;line-height:inherit}.twentysixteen .price ins{background:inherit;color:inherit}
\ No newline at end of file
diff --git a/assets/css/woocommerce-smallscreen-rtl.css b/assets/css/woocommerce-smallscreen-rtl.css
new file mode 100644
index 00000000000..dd117c8b203
--- /dev/null
+++ b/assets/css/woocommerce-smallscreen-rtl.css
@@ -0,0 +1 @@
+.woocommerce table.shop_table_responsive tbody th,.woocommerce table.shop_table_responsive thead,.woocommerce-page table.shop_table_responsive tbody th,.woocommerce-page table.shop_table_responsive thead{display:none}.woocommerce table.shop_table_responsive tbody tr:first-child td:first-child,.woocommerce-page table.shop_table_responsive tbody tr:first-child td:first-child{border-top:0}.woocommerce table.shop_table_responsive tr,.woocommerce-page table.shop_table_responsive tr{display:block}.woocommerce table.shop_table_responsive tr td,.woocommerce-page table.shop_table_responsive tr td{display:block;text-align:left!important}.woocommerce #content table.cart .product-thumbnail,.woocommerce table.cart .product-thumbnail,.woocommerce table.my_account_orders tr td.order-actions::before,.woocommerce table.shop_table_responsive tr td.actions::before,.woocommerce table.shop_table_responsive tr td.product-remove::before,.woocommerce-page #content table.cart .product-thumbnail,.woocommerce-page table.cart .product-thumbnail,.woocommerce-page table.my_account_orders tr td.order-actions::before,.woocommerce-page table.shop_table_responsive tr td.actions::before,.woocommerce-page table.shop_table_responsive tr td.product-remove::before{display:none}.woocommerce table.shop_table_responsive tr td.order-actions,.woocommerce-page table.shop_table_responsive tr td.order-actions{text-align:right!important}.woocommerce table.shop_table_responsive tr td::before,.woocommerce-page table.shop_table_responsive tr td::before{content:attr(data-title) ": ";font-weight:700;float:right}.woocommerce table.shop_table_responsive tr:nth-child(2n) td,.woocommerce-page table.shop_table_responsive tr:nth-child(2n) td{background-color:rgba(0,0,0,.025)}.woocommerce table.my_account_orders tr td.order-actions,.woocommerce-page table.my_account_orders tr td.order-actions{text-align:right}.woocommerce table.my_account_orders tr td.order-actions .button,.woocommerce-page table.my_account_orders tr td.order-actions .button{float:none;margin:.125em 0 .125em .25em}.woocommerce .col2-set .col-1,.woocommerce .col2-set .col-2,.woocommerce-page .col2-set .col-1,.woocommerce-page .col2-set .col-2{float:none;width:100%}.woocommerce ul.products li.product,.woocommerce-page ul.products li.product,.woocommerce-page[class*=columns-] ul.products li.product,.woocommerce[class*=columns-] ul.products li.product{width:48%;float:right;clear:both;margin:0 0 2.992em}.woocommerce ul.products li.product:nth-child(2n),.woocommerce-page ul.products li.product:nth-child(2n),.woocommerce-page[class*=columns-] ul.products li.product:nth-child(2n),.woocommerce[class*=columns-] ul.products li.product:nth-child(2n){float:left;clear:none!important}.woocommerce #content div.product div.images,.woocommerce #content div.product div.summary,.woocommerce div.product div.images,.woocommerce div.product div.summary,.woocommerce-page #content div.product div.images,.woocommerce-page #content div.product div.summary,.woocommerce-page div.product div.images,.woocommerce-page div.product div.summary{float:none;width:100%}.woocommerce #content table.cart td.actions,.woocommerce table.cart td.actions,.woocommerce-page #content table.cart td.actions,.woocommerce-page table.cart td.actions{text-align:right}.woocommerce #content table.cart td.actions .coupon,.woocommerce table.cart td.actions .coupon,.woocommerce-page #content table.cart td.actions .coupon,.woocommerce-page table.cart td.actions .coupon{float:none;padding-bottom:.5em}.woocommerce #content table.cart td.actions .coupon::after,.woocommerce #content table.cart td.actions .coupon::before,.woocommerce table.cart td.actions .coupon::after,.woocommerce table.cart td.actions .coupon::before,.woocommerce-page #content table.cart td.actions .coupon::after,.woocommerce-page #content table.cart td.actions .coupon::before,.woocommerce-page table.cart td.actions .coupon::after,.woocommerce-page table.cart td.actions .coupon::before{content:' ';display:table}.woocommerce #content table.cart td.actions .coupon::after,.woocommerce table.cart td.actions .coupon::after,.woocommerce-page #content table.cart td.actions .coupon::after,.woocommerce-page table.cart td.actions .coupon::after{clear:both}.woocommerce #content table.cart td.actions .coupon .button,.woocommerce #content table.cart td.actions .coupon .input-text,.woocommerce #content table.cart td.actions .coupon input,.woocommerce table.cart td.actions .coupon .button,.woocommerce table.cart td.actions .coupon .input-text,.woocommerce table.cart td.actions .coupon input,.woocommerce-page #content table.cart td.actions .coupon .button,.woocommerce-page #content table.cart td.actions .coupon .input-text,.woocommerce-page #content table.cart td.actions .coupon input,.woocommerce-page table.cart td.actions .coupon .button,.woocommerce-page table.cart td.actions .coupon .input-text,.woocommerce-page table.cart td.actions .coupon input{width:48%;box-sizing:border-box}.woocommerce #content table.cart td.actions .coupon .button.alt,.woocommerce #content table.cart td.actions .coupon .input-text+.button,.woocommerce table.cart td.actions .coupon .button.alt,.woocommerce table.cart td.actions .coupon .input-text+.button,.woocommerce-page #content table.cart td.actions .coupon .button.alt,.woocommerce-page #content table.cart td.actions .coupon .input-text+.button,.woocommerce-page table.cart td.actions .coupon .button.alt,.woocommerce-page table.cart td.actions .coupon .input-text+.button{float:left}.woocommerce #content table.cart td.actions .button,.woocommerce table.cart td.actions .button,.woocommerce-page #content table.cart td.actions .button,.woocommerce-page table.cart td.actions .button{display:block;width:100%}.woocommerce .cart-collaterals .cart_totals,.woocommerce .cart-collaterals .cross-sells,.woocommerce .cart-collaterals .shipping_calculator,.woocommerce-page .cart-collaterals .cart_totals,.woocommerce-page .cart-collaterals .cross-sells,.woocommerce-page .cart-collaterals .shipping_calculator{width:100%;float:none;text-align:right}.woocommerce-page.woocommerce-checkout form.login .form-row,.woocommerce.woocommerce-checkout form.login .form-row{width:100%;float:none}.woocommerce #payment .terms,.woocommerce-page #payment .terms{text-align:right;padding:0}.woocommerce #payment #place_order,.woocommerce-page #payment #place_order{float:none;width:100%;box-sizing:border-box;margin-bottom:1em}.woocommerce .lost_reset_password .form-row-first,.woocommerce .lost_reset_password .form-row-last,.woocommerce-page .lost_reset_password .form-row-first,.woocommerce-page .lost_reset_password .form-row-last{width:100%;float:none;margin-left:0}.woocommerce-account .woocommerce-MyAccount-content,.woocommerce-account .woocommerce-MyAccount-navigation{float:none;width:100%}.single-product .twentythirteen .panel{padding-right:20px!important;padding-left:20px!important}
\ No newline at end of file
diff --git a/assets/css/woocommerce-smallscreen.css b/assets/css/woocommerce-smallscreen.css
index bdaffbfa3c2..854e157abb0 100644
--- a/assets/css/woocommerce-smallscreen.css
+++ b/assets/css/woocommerce-smallscreen.css
@@ -1 +1 @@
-.woocommerce table.shop_table_responsive tbody th,.woocommerce table.shop_table_responsive thead,.woocommerce-page table.shop_table_responsive tbody th,.woocommerce-page table.shop_table_responsive thead{display:none}.woocommerce table.shop_table_responsive tbody tr:first-child td:first-child,.woocommerce-page table.shop_table_responsive tbody tr:first-child td:first-child{border-top:0}.woocommerce table.shop_table_responsive tr,.woocommerce-page table.shop_table_responsive tr{display:block}.woocommerce table.shop_table_responsive tr td,.woocommerce-page table.shop_table_responsive tr td{display:block;text-align:right!important}.woocommerce #content table.cart .product-thumbnail,.woocommerce table.cart .product-thumbnail,.woocommerce table.my_account_orders tr td.order-actions:before,.woocommerce table.shop_table_responsive tr td.actions:before,.woocommerce table.shop_table_responsive tr td.product-remove:before,.woocommerce-page #content table.cart .product-thumbnail,.woocommerce-page table.cart .product-thumbnail,.woocommerce-page table.my_account_orders tr td.order-actions:before,.woocommerce-page table.shop_table_responsive tr td.actions:before,.woocommerce-page table.shop_table_responsive tr td.product-remove:before{display:none}.woocommerce table.shop_table_responsive tr td.order-actions,.woocommerce-page table.shop_table_responsive tr td.order-actions{text-align:left!important}.woocommerce table.shop_table_responsive tr td:before,.woocommerce-page table.shop_table_responsive tr td:before{content:attr(data-title) ": ";font-weight:700;float:left}.woocommerce table.shop_table_responsive tr:nth-child(2n) td,.woocommerce-page table.shop_table_responsive tr:nth-child(2n) td{background-color:rgba(0,0,0,.025)}.woocommerce table.my_account_orders tr td.order-actions,.woocommerce-page table.my_account_orders tr td.order-actions{text-align:left}.woocommerce table.my_account_orders tr td.order-actions .button,.woocommerce-page table.my_account_orders tr td.order-actions .button{float:none;margin:.125em .25em .125em 0}.woocommerce .col2-set .col-1,.woocommerce .col2-set .col-2,.woocommerce-page .col2-set .col-1,.woocommerce-page .col2-set .col-2{float:none;width:100%}.woocommerce-page[class*=columns-] ul.products li.product,.woocommerce[class*=columns-] ul.products li.product{width:48%;float:left;clear:both;margin:0 0 2.992em}.woocommerce-page[class*=columns-] ul.products li.product:nth-child(2n),.woocommerce[class*=columns-] ul.products li.product:nth-child(2n){float:right;clear:none!important}.woocommerce #content div.product div.images,.woocommerce #content div.product div.summary,.woocommerce div.product div.images,.woocommerce div.product div.summary,.woocommerce-page #content div.product div.images,.woocommerce-page #content div.product div.summary,.woocommerce-page div.product div.images,.woocommerce-page div.product div.summary{float:none;width:100%}.woocommerce #content table.cart td.actions,.woocommerce table.cart td.actions,.woocommerce-page #content table.cart td.actions,.woocommerce-page table.cart td.actions{text-align:left}.woocommerce #content table.cart td.actions .coupon,.woocommerce table.cart td.actions .coupon,.woocommerce-page #content table.cart td.actions .coupon,.woocommerce-page table.cart td.actions .coupon{float:none;padding-bottom:.5em}.woocommerce #content table.cart td.actions .coupon:after,.woocommerce #content table.cart td.actions .coupon:before,.woocommerce table.cart td.actions .coupon:after,.woocommerce table.cart td.actions .coupon:before,.woocommerce-page #content table.cart td.actions .coupon:after,.woocommerce-page #content table.cart td.actions .coupon:before,.woocommerce-page table.cart td.actions .coupon:after,.woocommerce-page table.cart td.actions .coupon:before{content:" ";display:table}.woocommerce #content table.cart td.actions .coupon:after,.woocommerce table.cart td.actions .coupon:after,.woocommerce-page #content table.cart td.actions .coupon:after,.woocommerce-page table.cart td.actions .coupon:after{clear:both}.woocommerce #content table.cart td.actions .button,.woocommerce #content table.cart td.actions .input-text,.woocommerce #content table.cart td.actions input,.woocommerce table.cart td.actions .button,.woocommerce table.cart td.actions .input-text,.woocommerce table.cart td.actions input,.woocommerce-page #content table.cart td.actions .button,.woocommerce-page #content table.cart td.actions .input-text,.woocommerce-page #content table.cart td.actions input,.woocommerce-page table.cart td.actions .button,.woocommerce-page table.cart td.actions .input-text,.woocommerce-page table.cart td.actions input{width:48%;box-sizing:border-box}.woocommerce #content table.cart td.actions .button.alt,.woocommerce #content table.cart td.actions .input-text+.button,.woocommerce table.cart td.actions .button.alt,.woocommerce table.cart td.actions .input-text+.button,.woocommerce-page #content table.cart td.actions .button.alt,.woocommerce-page #content table.cart td.actions .input-text+.button,.woocommerce-page table.cart td.actions .button.alt,.woocommerce-page table.cart td.actions .input-text+.button{float:right}.woocommerce .cart-collaterals .cart_totals,.woocommerce .cart-collaterals .cross-sells,.woocommerce .cart-collaterals .shipping_calculator,.woocommerce-page .cart-collaterals .cart_totals,.woocommerce-page .cart-collaterals .cross-sells,.woocommerce-page .cart-collaterals .shipping_calculator{width:100%;float:none;text-align:left}.woocommerce-page.woocommerce-checkout form.login .form-row,.woocommerce.woocommerce-checkout form.login .form-row{width:100%;float:none}.woocommerce #payment .terms,.woocommerce-page #payment .terms{text-align:left;padding:0}.woocommerce #payment #place_order,.woocommerce-page #payment #place_order{float:none;width:100%;box-sizing:border-box;margin-bottom:1em}.woocommerce .lost_reset_password .form-row-first,.woocommerce .lost_reset_password .form-row-last,.woocommerce-page .lost_reset_password .form-row-first,.woocommerce-page .lost_reset_password .form-row-last{width:100%;float:none;margin-right:0}.single-product .twentythirteen .panel{padding-left:20px!important;padding-right:20px!important}
\ No newline at end of file
+.woocommerce table.shop_table_responsive tbody th,.woocommerce table.shop_table_responsive thead,.woocommerce-page table.shop_table_responsive tbody th,.woocommerce-page table.shop_table_responsive thead{display:none}.woocommerce table.shop_table_responsive tbody tr:first-child td:first-child,.woocommerce-page table.shop_table_responsive tbody tr:first-child td:first-child{border-top:0}.woocommerce table.shop_table_responsive tr,.woocommerce-page table.shop_table_responsive tr{display:block}.woocommerce table.shop_table_responsive tr td,.woocommerce-page table.shop_table_responsive tr td{display:block;text-align:right!important}.woocommerce #content table.cart .product-thumbnail,.woocommerce table.cart .product-thumbnail,.woocommerce table.my_account_orders tr td.order-actions::before,.woocommerce table.shop_table_responsive tr td.actions::before,.woocommerce table.shop_table_responsive tr td.product-remove::before,.woocommerce-page #content table.cart .product-thumbnail,.woocommerce-page table.cart .product-thumbnail,.woocommerce-page table.my_account_orders tr td.order-actions::before,.woocommerce-page table.shop_table_responsive tr td.actions::before,.woocommerce-page table.shop_table_responsive tr td.product-remove::before{display:none}.woocommerce table.shop_table_responsive tr td.order-actions,.woocommerce-page table.shop_table_responsive tr td.order-actions{text-align:left!important}.woocommerce table.shop_table_responsive tr td::before,.woocommerce-page table.shop_table_responsive tr td::before{content:attr(data-title) ": ";font-weight:700;float:left}.woocommerce table.shop_table_responsive tr:nth-child(2n) td,.woocommerce-page table.shop_table_responsive tr:nth-child(2n) td{background-color:rgba(0,0,0,.025)}.woocommerce table.my_account_orders tr td.order-actions,.woocommerce-page table.my_account_orders tr td.order-actions{text-align:left}.woocommerce table.my_account_orders tr td.order-actions .button,.woocommerce-page table.my_account_orders tr td.order-actions .button{float:none;margin:.125em .25em .125em 0}.woocommerce .col2-set .col-1,.woocommerce .col2-set .col-2,.woocommerce-page .col2-set .col-1,.woocommerce-page .col2-set .col-2{float:none;width:100%}.woocommerce ul.products li.product,.woocommerce-page ul.products li.product,.woocommerce-page[class*=columns-] ul.products li.product,.woocommerce[class*=columns-] ul.products li.product{width:48%;float:left;clear:both;margin:0 0 2.992em}.woocommerce ul.products li.product:nth-child(2n),.woocommerce-page ul.products li.product:nth-child(2n),.woocommerce-page[class*=columns-] ul.products li.product:nth-child(2n),.woocommerce[class*=columns-] ul.products li.product:nth-child(2n){float:right;clear:none!important}.woocommerce #content div.product div.images,.woocommerce #content div.product div.summary,.woocommerce div.product div.images,.woocommerce div.product div.summary,.woocommerce-page #content div.product div.images,.woocommerce-page #content div.product div.summary,.woocommerce-page div.product div.images,.woocommerce-page div.product div.summary{float:none;width:100%}.woocommerce #content table.cart td.actions,.woocommerce table.cart td.actions,.woocommerce-page #content table.cart td.actions,.woocommerce-page table.cart td.actions{text-align:left}.woocommerce #content table.cart td.actions .coupon,.woocommerce table.cart td.actions .coupon,.woocommerce-page #content table.cart td.actions .coupon,.woocommerce-page table.cart td.actions .coupon{float:none;padding-bottom:.5em}.woocommerce #content table.cart td.actions .coupon::after,.woocommerce #content table.cart td.actions .coupon::before,.woocommerce table.cart td.actions .coupon::after,.woocommerce table.cart td.actions .coupon::before,.woocommerce-page #content table.cart td.actions .coupon::after,.woocommerce-page #content table.cart td.actions .coupon::before,.woocommerce-page table.cart td.actions .coupon::after,.woocommerce-page table.cart td.actions .coupon::before{content:' ';display:table}.woocommerce #content table.cart td.actions .coupon::after,.woocommerce table.cart td.actions .coupon::after,.woocommerce-page #content table.cart td.actions .coupon::after,.woocommerce-page table.cart td.actions .coupon::after{clear:both}.woocommerce #content table.cart td.actions .coupon .button,.woocommerce #content table.cart td.actions .coupon .input-text,.woocommerce #content table.cart td.actions .coupon input,.woocommerce table.cart td.actions .coupon .button,.woocommerce table.cart td.actions .coupon .input-text,.woocommerce table.cart td.actions .coupon input,.woocommerce-page #content table.cart td.actions .coupon .button,.woocommerce-page #content table.cart td.actions .coupon .input-text,.woocommerce-page #content table.cart td.actions .coupon input,.woocommerce-page table.cart td.actions .coupon .button,.woocommerce-page table.cart td.actions .coupon .input-text,.woocommerce-page table.cart td.actions .coupon input{width:48%;box-sizing:border-box}.woocommerce #content table.cart td.actions .coupon .button.alt,.woocommerce #content table.cart td.actions .coupon .input-text+.button,.woocommerce table.cart td.actions .coupon .button.alt,.woocommerce table.cart td.actions .coupon .input-text+.button,.woocommerce-page #content table.cart td.actions .coupon .button.alt,.woocommerce-page #content table.cart td.actions .coupon .input-text+.button,.woocommerce-page table.cart td.actions .coupon .button.alt,.woocommerce-page table.cart td.actions .coupon .input-text+.button{float:right}.woocommerce #content table.cart td.actions .button,.woocommerce table.cart td.actions .button,.woocommerce-page #content table.cart td.actions .button,.woocommerce-page table.cart td.actions .button{display:block;width:100%}.woocommerce .cart-collaterals .cart_totals,.woocommerce .cart-collaterals .cross-sells,.woocommerce .cart-collaterals .shipping_calculator,.woocommerce-page .cart-collaterals .cart_totals,.woocommerce-page .cart-collaterals .cross-sells,.woocommerce-page .cart-collaterals .shipping_calculator{width:100%;float:none;text-align:left}.woocommerce-page.woocommerce-checkout form.login .form-row,.woocommerce.woocommerce-checkout form.login .form-row{width:100%;float:none}.woocommerce #payment .terms,.woocommerce-page #payment .terms{text-align:left;padding:0}.woocommerce #payment #place_order,.woocommerce-page #payment #place_order{float:none;width:100%;box-sizing:border-box;margin-bottom:1em}.woocommerce .lost_reset_password .form-row-first,.woocommerce .lost_reset_password .form-row-last,.woocommerce-page .lost_reset_password .form-row-first,.woocommerce-page .lost_reset_password .form-row-last{width:100%;float:none;margin-right:0}.woocommerce-account .woocommerce-MyAccount-content,.woocommerce-account .woocommerce-MyAccount-navigation{float:none;width:100%}.single-product .twentythirteen .panel{padding-left:20px!important;padding-right:20px!important}
\ No newline at end of file
diff --git a/assets/css/woocommerce-smallscreen.scss b/assets/css/woocommerce-smallscreen.scss
index 1882ebb2b8d..50a4beb3f77 100644
--- a/assets/css/woocommerce-smallscreen.scss
+++ b/assets/css/woocommerce-smallscreen.scss
@@ -6,9 +6,9 @@
 /**
  * Imports
  */
-@import "bourbon";
-@import "mixins";
-@import "variables";
+@import 'bourbon';
+@import 'mixins';
+@import 'variables';
 
 /**
  * Style begins
@@ -41,10 +41,10 @@
 				text-align: right !important; // Important to overwrite order status inline styling
 
 				&.order-actions {
-					text-align: left !important;
+					text-align: left !important; // This must always align left on handheld
 				}
 
-				&:before {
+				&::before {
 					content: attr(data-title) ': ';
 					font-weight: 700;
 					float: left;
@@ -52,15 +52,15 @@
 
 				&.product-remove,
 				&.actions {
-					&:before {
+					&::before {
 						display: none;
 					}
 				}
 			}
 
-			&:nth-child(2n) {
+			&:nth-child( 2n ) {
 				td {
-					background-color: rgba(0,0,0,0.025);
+					background-color: rgba(0, 0, 0, 0.025);
 				}
 			}
 		}
@@ -72,13 +72,13 @@
 				&.order-actions {
 					text-align: left;
 
-					&:before {
+					&::before {
 						display: none;
 					}
 
 					.button {
 						float: none;
-						margin: .125em .25em .125em 0;
+						margin: 0.125em 0.25em 0.125em 0;
 					}
 				}
 			}
@@ -99,7 +99,7 @@
 	/**
 	 * Products
 	 */
-	&[class*="columns-"] {
+	&, &[class*='columns-'] {
 		ul.products {
 			li.product {
 				width: 48%;
@@ -107,9 +107,9 @@
 				clear: both;
 				margin: 0 0 2.992em;
 
-				&:nth-child(2n) {
+				&:nth-child( 2n ) {
 					float: right;
-					clear: none !important;
+					clear: none !important; // This should never clear.
 				}
 			}
 		}
@@ -142,19 +142,24 @@
 			.coupon {
 				float: none;
 				@include clearfix();
-				padding-bottom: .5em;
+				padding-bottom: 0.5em;
+
+				input,
+				.button,
+				.input-text {
+					width: 48%;
+					box-sizing: border-box;
+				}
+
+				.input-text + .button,
+				.button.alt {
+					float: right;
+				}
 			}
 
-			input,
-			.button,
-			.input-text {
-				width: 48%;
-				box-sizing: border-box;
-			}
-
-			.input-text + .button,
-			.button.alt {
-				float: right;
+			.button {
+				display: block;
+				width: 100%;
 			}
 		}
 	}
@@ -208,6 +213,14 @@
 	}
 }
 
+.woocommerce-account {
+	.woocommerce-MyAccount-navigation,
+	.woocommerce-MyAccount-content {
+		float: none;
+		width: 100%;
+	}
+}
+
 /**
  * Twenty Thirteen specific styles
  */
diff --git a/assets/css/woocommerce.css b/assets/css/woocommerce.css
index 8b8c9e1311c..ad3a22938cc 100644
--- a/assets/css/woocommerce.css
+++ b/assets/css/woocommerce.css
@@ -1 +1 @@
-@charset "UTF-8";.clear,.woocommerce .woocommerce-breadcrumb:after,.woocommerce .woocommerce-error:after,.woocommerce .woocommerce-info:after,.woocommerce .woocommerce-message:after{clear:both}@-webkit-keyframes spin{100%{-webkit-transform:rotate(360deg)}}@-moz-keyframes spin{100%{-moz-transform:rotate(360deg)}}@keyframes spin{100%{-webkit-transform:rotate(360deg);-moz-transform:rotate(360deg);-ms-transform:rotate(360deg);-o-transform:rotate(360deg);transform:rotate(360deg)}}@font-face{font-family:star;src:url(../fonts/star.eot);src:url(../fonts/star.eot?#iefix) format("embedded-opentype"),url(../fonts/star.woff) format("woff"),url(../fonts/star.ttf) format("truetype"),url(../fonts/star.svg#star) format("svg");font-weight:400;font-style:normal}@font-face{font-family:WooCommerce;src:url(../fonts/WooCommerce.eot);src:url(../fonts/WooCommerce.eot?#iefix) format("embedded-opentype"),url(../fonts/WooCommerce.woff) format("woff"),url(../fonts/WooCommerce.ttf) format("truetype"),url(../fonts/WooCommerce.svg#WooCommerce) format("svg");font-weight:400;font-style:normal}p.demo_store{position:fixed;top:0;left:0;right:0;margin:0;width:100%;font-size:1em;padding:1em 0;text-align:center;background-color:#a46497;color:#fff;z-index:99998;box-shadow:0 1px 1em rgba(0,0,0,.2)}p.demo_store a{color:#fff}.admin-bar p.demo_store{top:32px}.woocommerce .blockUI.blockOverlay{position:relative}.woocommerce .blockUI.blockOverlay:before,.woocommerce .loader:before{height:1em;width:1em;position:absolute;top:50%;left:50%;margin-left:-.5em;margin-top:-.5em;display:block;content:"";-webkit-animation:spin 1s ease-in-out infinite;-moz-animation:spin 1s ease-in-out infinite;animation:spin 1s ease-in-out infinite;background:url(../images/icons/loader.svg) center center;background-size:cover;line-height:1;text-align:center;font-size:2em;color:rgba(0,0,0,.75)}.woocommerce a.remove{display:block;font-size:1.5em;height:1em;width:1em;text-align:center;line-height:1;border-radius:100%;color:red!important;text-decoration:none;font-weight:700;border:0}.woocommerce a.remove:hover{color:#fff!important;background:red}.woocommerce .woocommerce-error,.woocommerce .woocommerce-info,.woocommerce .woocommerce-message{padding:1em 2em 1em 3.5em!important;margin:0 0 2em!important;position:relative;background-color:#f7f6f7;color:#515151;border-top:3px solid #a46497;list-style:none!important;width:auto;word-wrap:break-word}.woocommerce .woocommerce-error:after,.woocommerce .woocommerce-error:before,.woocommerce .woocommerce-info:after,.woocommerce .woocommerce-info:before,.woocommerce .woocommerce-message:after,.woocommerce .woocommerce-message:before{content:" ";display:table}.woocommerce .woocommerce-error:before,.woocommerce .woocommerce-info:before,.woocommerce .woocommerce-message:before{font-family:WooCommerce;content:"\e028";display:inline-block;position:absolute;top:1em;left:1.5em}.woocommerce .woocommerce-error .button,.woocommerce .woocommerce-info .button,.woocommerce .woocommerce-message .button{float:right}.woocommerce .woocommerce-error li,.woocommerce .woocommerce-info li,.woocommerce .woocommerce-message li{list-style:none!important;padding-left:0!important;margin-left:0!important}.woocommerce .woocommerce-message{border-top-color:#8fae1b}.woocommerce .woocommerce-message:before{content:"\e015";color:#8fae1b}.woocommerce .woocommerce-info{border-top-color:#1e85be}.woocommerce .woocommerce-info:before{color:#1e85be}.woocommerce .woocommerce-error{border-top-color:#b81c23}.woocommerce .woocommerce-error:before{content:"\e016";color:#b81c23}.woocommerce small.note{display:block;color:#777;font-size:.857em;margin-top:10px}.woocommerce .woocommerce-breadcrumb{margin:0 0 1em;padding:0;font-size:.92em;color:#777}.woocommerce .woocommerce-breadcrumb:after,.woocommerce .woocommerce-breadcrumb:before{content:" ";display:table}.woocommerce .woocommerce-breadcrumb a{color:#777}.woocommerce .quantity .qty{width:3.631em;text-align:center}.woocommerce div.product{margin-bottom:0;position:relative}.woocommerce div.product .product_title{clear:none;margin-top:0;padding:0}.woocommerce #reviews #comments .add_review:after,.woocommerce .products ul:after,.woocommerce div.product form.cart:after,.woocommerce div.product p.cart:after,.woocommerce nav.woocommerce-pagination ul,.woocommerce ul.products:after{clear:both}.woocommerce div.product p.price,.woocommerce div.product span.price{color:#77a464;font-size:1.25em}.woocommerce div.product p.price ins,.woocommerce div.product span.price ins{background:inherit;font-weight:700}.woocommerce div.product p.price del,.woocommerce div.product span.price del{opacity:.5}.woocommerce div.product p.stock{font-size:.92em}.woocommerce div.product .stock{color:#77a464}.woocommerce div.product .out-of-stock{color:red}.woocommerce div.product .woocommerce-product-rating{margin-bottom:1.618em}.woocommerce div.product div.images,.woocommerce div.product div.summary{margin-bottom:2em}.woocommerce div.product div.images img{display:block;width:100%;height:auto;box-shadow:none}.woocommerce div.product div.images div.thumbnails{padding-top:1em}.woocommerce div.product div.social{text-align:right;margin:0 0 1em}.woocommerce div.product div.social span{margin:0 0 0 2px}.woocommerce div.product div.social span span{margin:0}.woocommerce div.product div.social span .stButton .chicklets{padding-left:16px;width:0}.woocommerce div.product div.social iframe{float:left;margin-top:3px}.woocommerce div.product .woocommerce-tabs ul.tabs{list-style:none;padding:0 0 0 1em;margin:0 0 1.618em;overflow:hidden;position:relative}.woocommerce div.product .woocommerce-tabs ul.tabs li{border:1px solid #d3ced2;background-color:#ebe9eb;display:inline-block;position:relative;z-index:0;border-radius:4px 4px 0 0;margin:0 -5px;padding:0 1em}.woocommerce div.product .woocommerce-tabs ul.tabs li a{display:inline-block;padding:.5em 0;font-weight:700;color:#515151;text-decoration:none}.woocommerce div.product form.cart:after,.woocommerce div.product form.cart:before,.woocommerce div.product p.cart:after,.woocommerce div.product p.cart:before{display:table;content:" "}.woocommerce div.product .woocommerce-tabs ul.tabs li a:hover{text-decoration:none;color:#6b6b6b}.woocommerce div.product .woocommerce-tabs ul.tabs li.active{background:#fff;z-index:2;border-bottom-color:#fff}.woocommerce div.product .woocommerce-tabs ul.tabs li.active a{color:inherit;text-shadow:inherit}.woocommerce div.product .woocommerce-tabs ul.tabs li.active:before{box-shadow:2px 2px 0 #fff}.woocommerce div.product .woocommerce-tabs ul.tabs li.active:after{box-shadow:-2px 2px 0 #fff}.woocommerce div.product .woocommerce-tabs ul.tabs li:after,.woocommerce div.product .woocommerce-tabs ul.tabs li:before{border:1px solid #d3ced2;position:absolute;bottom:-1px;width:5px;height:5px;content:" "}.woocommerce div.product .woocommerce-tabs ul.tabs li:before{left:-6px;-webkit-border-bottom-right-radius:4px;-moz-border-bottom-right-radius:4px;border-bottom-right-radius:4px;border-width:0 1px 1px 0;box-shadow:2px 2px 0 #ebe9eb}.woocommerce div.product .woocommerce-tabs ul.tabs li:after{right:-6px;-webkit-border-bottom-left-radius:4px;-moz-border-bottom-left-radius:4px;border-bottom-left-radius:4px;border-width:0 0 1px 1px;box-shadow:-2px 2px 0 #ebe9eb}.woocommerce div.product .woocommerce-tabs ul.tabs:before{position:absolute;content:" ";width:100%;bottom:0;left:0;border-bottom:1px solid #d3ced2;z-index:1}.woocommerce div.product .woocommerce-tabs .panel{margin:0 0 2em;padding:0}.woocommerce div.product form.cart,.woocommerce div.product p.cart{margin-bottom:2em}.woocommerce div.product form.cart div.quantity{float:left;margin:0 4px 0 0}.woocommerce div.product form.cart table{border-width:0 0 1px}.woocommerce div.product form.cart table td{padding-left:0}.woocommerce div.product form.cart table div.quantity{float:none;margin:0}.woocommerce div.product form.cart table small.stock{display:block;float:none}.woocommerce div.product form.cart .variations{margin-bottom:1em;border:0;width:100%}.woocommerce div.product form.cart .variations td,.woocommerce div.product form.cart .variations th{border:0;vertical-align:top;line-height:2em}.woocommerce div.product form.cart .variations label{font-weight:700}.woocommerce div.product form.cart .variations select{max-width:100%;min-width:75%;display:inline-block;margin-right:1em}.woocommerce div.product form.cart .variations td.label{padding-right:1em}.woocommerce div.product form.cart .woocommerce-variation-description p{margin-bottom:1em}.woocommerce div.product form.cart .reset_variations{visibility:hidden;font-size:.83em}.woocommerce div.product form.cart .wc-no-matching-variations{display:none}.woocommerce div.product form.cart .button{vertical-align:middle;float:left}.woocommerce div.product form.cart .group_table td.label{padding-right:1em;padding-left:1em}.woocommerce div.product form.cart .group_table td{vertical-align:top;padding-bottom:.5em;border:0}.woocommerce span.onsale{min-height:3.236em;min-width:3.236em;padding:.202em;font-weight:700;position:absolute;text-align:center;line-height:3.236;top:-.5em;left:-.5em;margin:0;border-radius:100%;background-color:#77a464;color:#fff;font-size:.857em;-webkit-font-smoothing:antialiased}.woocommerce .products ul,.woocommerce ul.products{margin:0 0 1em;padding:0;list-style:none;clear:both}.woocommerce .products ul:after,.woocommerce .products ul:before,.woocommerce ul.products:after,.woocommerce ul.products:before{content:" ";display:table}.woocommerce .products ul li,.woocommerce ul.products li{list-style:none}.woocommerce ul.products li.product .onsale{top:0;right:0;left:auto;margin:-.5em -.5em 0 0}.woocommerce ul.products li.product h3{padding:.5em 0;margin:0;font-size:1em}.woocommerce ul.products li.product a{text-decoration:none}.woocommerce ul.products li.product a img{width:100%;height:auto;display:block;margin:0 0 1em;box-shadow:none}.woocommerce ul.products li.product strong{display:block}.woocommerce ul.products li.product .star-rating{font-size:.857em}.woocommerce ul.products li.product .button{margin-top:1em}.woocommerce ul.products li.product .price{color:#77a464;display:block;font-weight:400;margin-bottom:.5em;font-size:.857em}.woocommerce ul.products li.product .price del{color:inherit;opacity:.5;display:block}.woocommerce ul.products li.product .price ins{background:0 0;font-weight:700}.woocommerce ul.products li.product .price .from{font-size:.67em;margin:-2px 0 0;text-transform:uppercase;color:rgba(132,132,132,.5)}.woocommerce .woocommerce-ordering,.woocommerce .woocommerce-result-count{margin:0 0 1em}.woocommerce .woocommerce-ordering select{vertical-align:top}.woocommerce nav.woocommerce-pagination{text-align:center}.woocommerce nav.woocommerce-pagination ul{display:inline-block;white-space:nowrap;padding:0;border:1px solid #d3ced2;border-right:0;margin:1px}.woocommerce nav.woocommerce-pagination ul li{border-right:1px solid #d3ced2;padding:0;margin:0;float:left;display:inline;overflow:hidden}.woocommerce nav.woocommerce-pagination ul li a,.woocommerce nav.woocommerce-pagination ul li span{margin:0;text-decoration:none;line-height:1;font-size:1em;font-weight:400;padding:.5em;min-width:1em;display:block}.woocommerce nav.woocommerce-pagination ul li a:focus,.woocommerce nav.woocommerce-pagination ul li a:hover,.woocommerce nav.woocommerce-pagination ul li span.current{background:#ebe9eb;color:#8a7e88}.woocommerce #respond input#submit,.woocommerce a.button,.woocommerce button.button,.woocommerce input.button{font-size:100%;margin:0;line-height:1;cursor:pointer;position:relative;font-family:inherit;text-decoration:none;overflow:visible;padding:.618em 1em;font-weight:700;border-radius:3px;left:auto;color:#515151;background-color:#ebe9eb;border:0;white-space:nowrap;display:inline-block;background-image:none;box-shadow:none;-webkit-box-shadow:none;text-shadow:none}.woocommerce #respond input#submit.loading,.woocommerce a.button.loading,.woocommerce button.button.loading,.woocommerce input.button.loading{opacity:.25;padding-right:2.618em}.woocommerce #respond input#submit.loading:after,.woocommerce a.button.loading:after,.woocommerce button.button.loading:after,.woocommerce input.button.loading:after{font-family:WooCommerce;content:"\e01c";vertical-align:top;-webkit-font-smoothing:antialiased;font-weight:400;position:absolute;top:.618em;right:1em;-webkit-animation:spin 2s linear infinite;-moz-animation:spin 2s linear infinite;animation:spin 2s linear infinite}.woocommerce #respond input#submit.added:after,.woocommerce a.button.added:after,.woocommerce button.button.added:after,.woocommerce input.button.added:after{font-family:WooCommerce;content:"\e017";margin-left:.53em;vertical-align:bottom}.woocommerce #respond input#submit:hover,.woocommerce a.button:hover,.woocommerce button.button:hover,.woocommerce input.button:hover{background-color:#dad8da;text-decoration:none;background-image:none;color:#515151}.woocommerce #respond input#submit.alt,.woocommerce a.button.alt,.woocommerce button.button.alt,.woocommerce input.button.alt{background-color:#a46497;color:#fff;-webkit-font-smoothing:antialiased}.woocommerce #respond input#submit.alt:hover,.woocommerce a.button.alt:hover,.woocommerce button.button.alt:hover,.woocommerce input.button.alt:hover{background-color:#935386;color:#fff}.woocommerce #respond input#submit.alt.disabled,.woocommerce #respond input#submit.alt.disabled:hover,.woocommerce #respond input#submit.alt:disabled,.woocommerce #respond input#submit.alt:disabled:hover,.woocommerce #respond input#submit.alt:disabled[disabled],.woocommerce #respond input#submit.alt:disabled[disabled]:hover,.woocommerce a.button.alt.disabled,.woocommerce a.button.alt.disabled:hover,.woocommerce a.button.alt:disabled,.woocommerce a.button.alt:disabled:hover,.woocommerce a.button.alt:disabled[disabled],.woocommerce a.button.alt:disabled[disabled]:hover,.woocommerce button.button.alt.disabled,.woocommerce button.button.alt.disabled:hover,.woocommerce button.button.alt:disabled,.woocommerce button.button.alt:disabled:hover,.woocommerce button.button.alt:disabled[disabled],.woocommerce button.button.alt:disabled[disabled]:hover,.woocommerce input.button.alt.disabled,.woocommerce input.button.alt.disabled:hover,.woocommerce input.button.alt:disabled,.woocommerce input.button.alt:disabled:hover,.woocommerce input.button.alt:disabled[disabled],.woocommerce input.button.alt:disabled[disabled]:hover{background-color:#a46497;color:#fff}.woocommerce #respond input#submit.disabled,.woocommerce #respond input#submit:disabled,.woocommerce #respond input#submit:disabled[disabled],.woocommerce a.button.disabled,.woocommerce a.button:disabled,.woocommerce a.button:disabled[disabled],.woocommerce button.button.disabled,.woocommerce button.button:disabled,.woocommerce button.button:disabled[disabled],.woocommerce input.button.disabled,.woocommerce input.button:disabled,.woocommerce input.button:disabled[disabled]{color:inherit;cursor:not-allowed;opacity:.5}.woocommerce #respond input#submit.disabled:hover,.woocommerce #respond input#submit:disabled:hover,.woocommerce #respond input#submit:disabled[disabled]:hover,.woocommerce a.button.disabled:hover,.woocommerce a.button:disabled:hover,.woocommerce a.button:disabled[disabled]:hover,.woocommerce button.button.disabled:hover,.woocommerce button.button:disabled:hover,.woocommerce button.button:disabled[disabled]:hover,.woocommerce input.button.disabled:hover,.woocommerce input.button:disabled:hover,.woocommerce input.button:disabled[disabled]:hover{color:inherit;background-color:#ebe9eb}.woocommerce .cart .button,.woocommerce .cart input.button{float:none}.woocommerce a.added_to_cart{padding-top:.5em;white-space:nowrap;display:inline-block}.woocommerce #reviews #comments .add_review:after,.woocommerce #reviews #comments .add_review:before,.woocommerce #reviews #comments ol.commentlist li .comment-text:after,.woocommerce #reviews #comments ol.commentlist li .comment-text:before,.woocommerce #reviews #comments ol.commentlist:after,.woocommerce #reviews #comments ol.commentlist:before{content:" ";display:table}.woocommerce #reviews h2 small{float:right;color:#777;font-size:15px;margin:10px 0 0}.woocommerce #reviews h2 small a{text-decoration:none;color:#777}.woocommerce #reviews h3{margin:0}.woocommerce #reviews #respond{margin:0;border:0;padding:0}.woocommerce #reviews #comment{height:75px}.woocommerce #reviews #comments h2{clear:none}.woocommerce #review_form #respond:after,.woocommerce #reviews #comments ol.commentlist li .comment-text:after,.woocommerce #reviews #comments ol.commentlist:after,.woocommerce .woocommerce-product-rating:after,.woocommerce td.product-name dl.variation:after{clear:both}.woocommerce #reviews #comments ol.commentlist{margin:0;width:100%;background:0 0;list-style:none}.woocommerce #reviews #comments ol.commentlist li{padding:0;margin:0 0 20px;position:relative;background:0;border:0}.woocommerce #reviews #comments ol.commentlist li .meta{color:#777;font-size:.75em}.woocommerce #reviews #comments ol.commentlist li img.avatar{float:left;position:absolute;top:0;left:0;padding:3px;width:32px;height:auto;background:#ebe9eb;border:1px solid #e4e1e3;margin:0;box-shadow:none}.woocommerce #reviews #comments ol.commentlist li .comment-text{margin:0 0 0 50px;border:1px solid #e4e1e3;border-radius:4px;padding:1em 1em 0}.woocommerce #reviews #comments ol.commentlist li .comment-text p{margin:0 0 1em}.woocommerce #reviews #comments ol.commentlist li .comment-text p.meta{font-size:.83em}.woocommerce #reviews #comments ol.commentlist ul.children{list-style:none;margin:20px 0 0 50px}.woocommerce #reviews #comments ol.commentlist ul.children .star-rating{display:none}.woocommerce #reviews #comments ol.commentlist #respond{border:1px solid #e4e1e3;border-radius:4px;padding:1em 1em 0;margin:20px 0 0 50px}.woocommerce #reviews #comments .commentlist>li:before{content:""}.woocommerce .star-rating{float:right;overflow:hidden;position:relative;height:1em;line-height:1;font-size:1em;width:5.4em;font-family:star}.woocommerce .star-rating:before{content:"\73\73\73\73\73";color:#d3ced2;float:left;top:0;left:0;position:absolute}.woocommerce .star-rating span{overflow:hidden;float:left;top:0;left:0;position:absolute;padding-top:1.5em}.woocommerce .star-rating span:before{content:"\53\53\53\53\53";top:0;position:absolute;left:0}.woocommerce .woocommerce-product-rating{line-height:2;display:block}.woocommerce .woocommerce-product-rating:after,.woocommerce .woocommerce-product-rating:before{content:" ";display:table}.woocommerce .woocommerce-product-rating .star-rating{margin:.5em 4px 0 0;float:left}.woocommerce .products .star-rating{display:block;margin:0 0 .5em;float:none}.woocommerce .hreview-aggregate .star-rating{margin:10px 0 0}.woocommerce #review_form #respond{position:static;margin:0;width:auto;padding:0;background:0 0;border:0}.woocommerce #review_form #respond:after,.woocommerce #review_form #respond:before{content:" ";display:table}.woocommerce p.stars a:before,.woocommerce p.stars a:hover~a:before{content:"\e021"}.woocommerce #review_form #respond p{margin:0 0 10px}.woocommerce #review_form #respond .form-submit input{left:auto}.woocommerce #review_form #respond textarea{box-sizing:border-box;width:100%}.woocommerce p.stars a{position:relative;height:1em;width:1em;text-indent:-999em;display:inline-block;text-decoration:none}.woocommerce p.stars a:before{display:block;position:absolute;top:0;left:0;width:1em;height:1em;line-height:1;font-family:WooCommerce;text-indent:0}.woocommerce table.shop_attributes td,.woocommerce table.shop_attributes th{line-height:1.5;border-bottom:1px dotted rgba(0,0,0,.1);border-top:0;margin:0}.woocommerce p.stars.selected a.active:before,.woocommerce p.stars:hover a:before{content:"\e020"}.woocommerce p.stars.selected a.active~a:before{content:"\e021"}.woocommerce p.stars.selected a:not(.active):before{content:"\e020"}.woocommerce table.shop_attributes{border:0;border-top:1px dotted rgba(0,0,0,.1);margin-bottom:1.618em;width:100%}.woocommerce table.shop_attributes th{width:150px;font-weight:700;padding:8px}.woocommerce table.shop_attributes td{font-style:italic;padding:0}.woocommerce table.shop_attributes td p{margin:0;padding:8px 0}.woocommerce table.shop_attributes .alt td,.woocommerce table.shop_attributes .alt th{background:rgba(0,0,0,.025)}.woocommerce table.shop_table{border:1px solid rgba(0,0,0,.1);margin:0 -1px 24px 0;text-align:left;width:100%;border-collapse:separate;border-radius:5px}.woocommerce table.shop_table th{font-weight:700;padding:9px 12px}.woocommerce table.shop_table td{border-top:1px solid rgba(0,0,0,.1);padding:6px 12px;vertical-align:middle}.woocommerce table.shop_table td small{font-weight:400}.woocommerce table.shop_table tbody:first-child tr:first-child td,.woocommerce table.shop_table tbody:first-child tr:first-child th{border-top:0}.woocommerce table.shop_table tbody th,.woocommerce table.shop_table tfoot td,.woocommerce table.shop_table tfoot th{font-weight:700;border-top:1px solid rgba(0,0,0,.1)}.woocommerce table.my_account_orders{font-size:.85em}.woocommerce table.my_account_orders td,.woocommerce table.my_account_orders th{padding:4px 8px;vertical-align:middle}.woocommerce table.my_account_orders .button{white-space:nowrap}.woocommerce table.my_account_orders .order-actions{text-align:right}.woocommerce table.my_account_orders .order-actions .button{margin:.125em 0 .125em .25em}.woocommerce td.product-name dl.variation{margin:.25em 0}.woocommerce td.product-name dl.variation:after,.woocommerce td.product-name dl.variation:before{content:" ";display:table}.woocommerce td.product-name dl.variation dd,.woocommerce td.product-name dl.variation dt{display:inline-block;float:left;margin-bottom:1em}.woocommerce td.product-name dl.variation dt{font-weight:700;padding:0 0 .25em;margin:0 4px 0 0;clear:left}.woocommerce ul.cart_list li dl:after,.woocommerce ul.cart_list li:after,.woocommerce ul.product_list_widget li dl:after,.woocommerce ul.product_list_widget li:after{clear:both}.woocommerce td.product-name dl.variation dd{padding:0 0 .25em}.woocommerce td.product-name dl.variation dd p:last-child{margin-bottom:0}.woocommerce td.product-name p.backorder_notification{font-size:.83em}.woocommerce td.product-quantity{min-width:80px}.woocommerce ul.cart_list,.woocommerce ul.product_list_widget{list-style:none;padding:0;margin:0}.woocommerce ul.cart_list li,.woocommerce ul.product_list_widget li{padding:4px 0;margin:0;list-style:none}.woocommerce ul.cart_list li:after,.woocommerce ul.cart_list li:before,.woocommerce ul.product_list_widget li:after,.woocommerce ul.product_list_widget li:before{content:" ";display:table}.woocommerce ul.cart_list li a,.woocommerce ul.product_list_widget li a{display:block;font-weight:700}.woocommerce ul.cart_list li img,.woocommerce ul.product_list_widget li img{float:right;margin-left:4px;width:32px;height:auto;box-shadow:none}.woocommerce ul.cart_list li dl,.woocommerce ul.product_list_widget li dl{margin:0;padding-left:1em;border-left:2px solid rgba(0,0,0,.1)}.woocommerce ul.cart_list li dl:after,.woocommerce ul.cart_list li dl:before,.woocommerce ul.product_list_widget li dl:after,.woocommerce ul.product_list_widget li dl:before{content:" ";display:table}.woocommerce ul.cart_list li dl dd,.woocommerce ul.cart_list li dl dt,.woocommerce ul.product_list_widget li dl dd,.woocommerce ul.product_list_widget li dl dt{display:inline-block;float:left;margin-bottom:1em}.woocommerce ul.cart_list li dl dt,.woocommerce ul.product_list_widget li dl dt{font-weight:700;padding:0 0 .25em;margin:0 4px 0 0;clear:left}.woocommerce .order_details:after,.woocommerce .widget_layered_nav ul li:after,.woocommerce .widget_shopping_cart .buttons:after,.woocommerce-account .addresses .title:after,.woocommerce-cart .wc-proceed-to-checkout:after,.woocommerce.widget_shopping_cart .buttons:after{clear:both}.woocommerce ul.cart_list li dl dd,.woocommerce ul.product_list_widget li dl dd{padding:0 0 .25em}.woocommerce ul.cart_list li dl dd p:last-child,.woocommerce ul.product_list_widget li dl dd p:last-child{margin-bottom:0}.woocommerce ul.cart_list li .star-rating,.woocommerce ul.product_list_widget li .star-rating{float:none}.woocommerce .widget_shopping_cart .total,.woocommerce.widget_shopping_cart .total{border-top:3px double #ebe9eb;padding:4px 0 0}.woocommerce .widget_shopping_cart .total strong,.woocommerce.widget_shopping_cart .total strong{min-width:40px;display:inline-block}.woocommerce .widget_shopping_cart .cart_list li,.woocommerce.widget_shopping_cart .cart_list li{padding-left:2em;position:relative;padding-top:0}.woocommerce .widget_shopping_cart .cart_list li a.remove,.woocommerce.widget_shopping_cart .cart_list li a.remove{position:absolute;top:0;left:0}.woocommerce .widget_shopping_cart .buttons:after,.woocommerce .widget_shopping_cart .buttons:before,.woocommerce.widget_shopping_cart .buttons:after,.woocommerce.widget_shopping_cart .buttons:before{content:" ";display:table}.woocommerce form .form-row{padding:3px;margin:0 0 6px}.woocommerce form .form-row [placeholder]:focus::-webkit-input-placeholder{-webkit-transition:opacity .5s .5s ease;-moz-transition:opacity .5s .5s ease;transition:opacity .5s .5s ease;opacity:0}.woocommerce form .form-row label{line-height:2}.woocommerce form .form-row label.hidden{visibility:hidden}.woocommerce form .form-row label.inline{display:inline}.woocommerce form .form-row select{cursor:pointer;margin:0}.woocommerce form .form-row .required{color:red;font-weight:700;border:0}.woocommerce form .form-row .input-checkbox{display:inline;margin:-2px 8px 0 0;text-align:center;vertical-align:middle}.woocommerce form .form-row input.input-text,.woocommerce form .form-row textarea{box-sizing:border-box;width:100%;margin:0;outline:0;line-height:1}.woocommerce form .form-row textarea{height:4em;line-height:1.5;display:block;-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none}.woocommerce form .form-row .select2-container{width:100%;line-height:2em}.woocommerce form .form-row.woocommerce-invalid label{color:#a00}.woocommerce form .form-row.woocommerce-invalid .select2-container,.woocommerce form .form-row.woocommerce-invalid input.input-text,.woocommerce form .form-row.woocommerce-invalid select{border-color:#a00}.woocommerce form .form-row.woocommerce-validated .select2-container,.woocommerce form .form-row.woocommerce-validated input.input-text,.woocommerce form .form-row.woocommerce-validated select{border-color:#69bf29}.woocommerce form .form-row ::-webkit-input-placeholder{line-height:normal}.woocommerce form .form-row :-moz-placeholder{line-height:normal}.woocommerce form .form-row :-ms-input-placeholder{line-height:normal}.woocommerce form.checkout_coupon,.woocommerce form.login,.woocommerce form.register{border:1px solid #d3ced2;padding:20px;margin:2em 0;text-align:left;border-radius:5px}.woocommerce ul#shipping_method{list-style:none;margin:0;padding:0}.woocommerce ul#shipping_method li{margin:0;padding:.25em 0 .25em 22px;text-indent:-22px;list-style:none}.woocommerce ul#shipping_method .amount{font-weight:700}.woocommerce p.woocommerce-shipping-contents{margin:0}.woocommerce .order_details{margin:0 0 1.5em;list-style:none}.woocommerce .order_details:after,.woocommerce .order_details:before{content:" ";display:table}.woocommerce .order_details li{float:left;margin-right:2em;text-transform:uppercase;font-size:.715em;line-height:1;border-right:1px dashed #d3ced2;padding-right:2em;margin-left:0;padding-left:0}.woocommerce .order_details li strong{display:block;font-size:1.4em;text-transform:none;line-height:1.5}.woocommerce .order_details li:last-of-type{border:none}.woocommerce .widget_layered_nav ul{margin:0;padding:0;border:0;list-style:none}.woocommerce .widget_layered_nav ul li{padding:0 0 1px;list-style:none}.woocommerce .widget_layered_nav ul li:after,.woocommerce .widget_layered_nav ul li:before{content:" ";display:table}.woocommerce .widget_layered_nav ul li.chosen a:before,.woocommerce .widget_layered_nav_filters ul li a:before{font-weight:400;line-height:1;content:"";color:#a00;font-family:WooCommerce;speak:none;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;text-decoration:none}.woocommerce .widget_layered_nav ul li a,.woocommerce .widget_layered_nav ul li span{padding:1px 0}.woocommerce .widget_layered_nav ul li.chosen a:before{margin-right:.618em}.woocommerce .widget_layered_nav_filters ul{margin:0;padding:0;border:0;list-style:none;overflow:hidden;zoom:1}.woocommerce .widget_layered_nav_filters ul li{float:left;padding:0 1px 1px 0;list-style:none}.woocommerce .widget_layered_nav_filters ul li a{text-decoration:none}.woocommerce .widget_layered_nav_filters ul li a:before{margin-right:.618em}.woocommerce .widget_price_filter .price_slider{margin-bottom:1em}.woocommerce .widget_price_filter .price_slider_amount{text-align:right;line-height:2.4;font-size:.8751em}.woocommerce .widget_price_filter .price_slider_amount .button{font-size:1.15em;float:left}.woocommerce .widget_price_filter .ui-slider{position:relative;text-align:left;margin-left:.5em;margin-right:.5em}.woocommerce .widget_price_filter .ui-slider .ui-slider-handle{position:absolute;z-index:2;width:1em;height:1em;background-color:#a46497;border-radius:1em;cursor:ew-resize;outline:0;top:-.3em;margin-left:-.5em}.woocommerce .widget_price_filter .ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;border-radius:1em;background-color:#a46497}.woocommerce .widget_price_filter .price_slider_wrapper .ui-widget-content{border-radius:1em;background-color:#602053;border:0}.woocommerce .widget_price_filter .ui-slider-horizontal{height:.5em}.woocommerce .widget_price_filter .ui-slider-horizontal .ui-slider-range{top:0;height:100%}.woocommerce .widget_price_filter .ui-slider-horizontal .ui-slider-range-min{left:-1px}.woocommerce .widget_price_filter .ui-slider-horizontal .ui-slider-range-max{right:-1px}.woocommerce-account .addresses .title:after,.woocommerce-account .addresses .title:before{content:" ";display:table}.woocommerce-account .addresses .title h3{float:left}.woocommerce-account .addresses .title .edit,.woocommerce-account ul.digital-downloads li .count{float:right}.woocommerce-account ol.commentlist.notes li.note p.meta{font-weight:700;margin-bottom:0}.woocommerce-account ol.commentlist.notes li.note .description p:last-child{margin-bottom:0}.woocommerce-account ul.digital-downloads{margin-left:0;padding-left:0}.woocommerce-account ul.digital-downloads li{list-style:none;margin-left:0;padding-left:0}.woocommerce-account ul.digital-downloads li:before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin-right:.618em;content:"";text-decoration:none}.woocommerce-cart table.cart .product-thumbnail{min-width:32px}.woocommerce-cart table.cart img{width:32px;box-shadow:none}.woocommerce-cart table.cart td,.woocommerce-cart table.cart th{vertical-align:middle}.woocommerce-cart table.cart td.actions .coupon .input-text{float:left;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;border:1px solid #d3ced2;padding:6px 6px 5px;margin:0 4px 0 0;outline:0;line-height:1}.woocommerce-cart table.cart input{margin:0;vertical-align:middle;line-height:1}.woocommerce-cart .wc-proceed-to-checkout{padding:1em 0}.woocommerce-cart .wc-proceed-to-checkout:after,.woocommerce-cart .wc-proceed-to-checkout:before{content:" ";display:table}.woocommerce-cart .wc-proceed-to-checkout a.checkout-button{display:block;text-align:center;margin-bottom:1em;font-size:1.25em;padding:1em}.woocommerce-cart .cart-collaterals .shipping_calculator .button{width:100%;float:none;display:block}.woocommerce-cart .cart-collaterals .shipping_calculator .shipping-calculator-button:after{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin-left:.618em;content:"";text-decoration:none}.woocommerce-checkout #payment ul.payment_methods li:after,.woocommerce-checkout #payment ul.payment_methods li:before,.woocommerce-checkout #payment ul.payment_methods:after,.woocommerce-checkout #payment ul.payment_methods:before{content:" ";display:table}.woocommerce-cart .cart-collaterals .cart_totals p small{color:#777;font-size:.83em}.woocommerce-cart .cart-collaterals .cart_totals table{border-collapse:separate;margin:0 0 6px;padding:0}.woocommerce-cart .cart-collaterals .cart_totals table tr:first-child td,.woocommerce-cart .cart-collaterals .cart_totals table tr:first-child th{border-top:0}.woocommerce-cart .cart-collaterals .cart_totals table th{width:40%}.woocommerce-cart .cart-collaterals .cart_totals table td,.woocommerce-cart .cart-collaterals .cart_totals table th{vertical-align:top;border-left:0;border-right:0;line-height:1.5em}.woocommerce-cart .cart-collaterals .cart_totals table small{color:#777}.woocommerce-cart .cart-collaterals .cart_totals table select{width:100%}.woocommerce-cart .cart-collaterals .cart_totals .discount td{color:#77a464}.woocommerce-cart .cart-collaterals .cart_totals tr td,.woocommerce-cart .cart-collaterals .cart_totals tr th{border-top:1px solid #ebe9eb}.woocommerce-cart .cart-collaterals .cross-sells ul.products li.product{margin-top:0}.woocommerce-checkout .checkout .col-2 h3#ship-to-different-address{float:left;clear:none}.woocommerce-checkout .checkout .col-2 .form-row-first,.woocommerce-checkout .checkout .col-2 .notes{clear:left}.woocommerce-checkout .checkout .create-account small{font-size:11px;color:#777;font-weight:400}.woocommerce-checkout .checkout div.shipping-address{padding:0;clear:left;width:100%}.single-product .twentythirteen p.stars,.woocommerce-checkout #payment ul.payment_methods li:after,.woocommerce-checkout #payment ul.payment_methods:after,.woocommerce-checkout .checkout .shipping_address{clear:both}.woocommerce-checkout #payment{background:#ebe9eb;border-radius:5px}.woocommerce-checkout #payment ul.payment_methods{text-align:left;padding:1em;border-bottom:1px solid #d3ced2;margin:0;list-style:none}.woocommerce-checkout #payment ul.payment_methods li{line-height:2;text-align:left;margin:0;font-weight:400}.woocommerce-checkout #payment ul.payment_methods li input{margin:0 1em 0 0}.woocommerce-checkout #payment ul.payment_methods li img{vertical-align:middle;margin:-2px 0 0 .5em;padding:0;position:relative;box-shadow:none}.woocommerce-checkout #payment ul.payment_methods li img+img{margin-left:2px}.woocommerce-checkout #payment div.form-row{padding:1em}.woocommerce-checkout #payment div.payment_box{position:relative;box-sizing:border-box;width:100%;padding:1em;margin:1em 0;font-size:.92em;border-radius:2px;line-height:1.5;background-color:#dfdcde;color:#515151}.woocommerce-checkout #payment div.payment_box input.input-text,.woocommerce-checkout #payment div.payment_box textarea{border-color:#bbb3b9 #c7c1c6 #c7c1c6}.woocommerce-checkout #payment div.payment_box ::-webkit-input-placeholder{color:#bbb3b9}.woocommerce-checkout #payment div.payment_box :-moz-placeholder{color:#bbb3b9}.woocommerce-checkout #payment div.payment_box :-ms-input-placeholder{color:#bbb3b9}.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-cvc,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-expiry,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-number{font-size:1.5em;padding:8px;background-repeat:no-repeat;background-position:right}.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-cvc.visa,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-expiry.visa,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-number.visa{background-image:url(../images/icons/credit-cards/visa.png)}.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-cvc.mastercard,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-expiry.mastercard,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-number.mastercard{background-image:url(../images/icons/credit-cards/mastercard.png)}.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-cvc.laser,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-expiry.laser,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-number.laser{background-image:url(../images/icons/credit-cards/laser.png)}.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-cvc.dinersclub,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-expiry.dinersclub,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-number.dinersclub{background-image:url(../images/icons/credit-cards/diners.png)}.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-cvc.maestro,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-expiry.maestro,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-number.maestro{background-image:url(../images/icons/credit-cards/maestro.png)}.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-cvc.jcb,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-expiry.jcb,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-number.jcb{background-image:url(../images/icons/credit-cards/jcb.png)}.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-cvc.amex,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-expiry.amex,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-number.amex{background-image:url(../images/icons/credit-cards/amex.png)}.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-cvc.discover,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-expiry.discover,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-number.discover{background-image:url(../images/icons/credit-cards/discover.png)}.woocommerce-checkout #payment div.payment_box span.help{font-size:.857em;color:#777;font-weight:400}.woocommerce-checkout #payment div.payment_box .form-row{margin:0 0 1em}.woocommerce-checkout #payment div.payment_box p:last-child{margin-bottom:0}.woocommerce-checkout #payment div.payment_box:before{content:"";display:block;border:1em solid #dfdcde;border-right-color:transparent;border-left-color:transparent;border-top-color:transparent;position:absolute;top:-.75em;left:0;margin:-1em 0 0 2em}.woocommerce-checkout #payment .payment_method_paypal .about_paypal{float:right;line-height:52px;font-size:.83em}.woocommerce-checkout #payment .payment_method_paypal img{max-height:52px;vertical-align:middle}.woocommerce-password-strength{text-align:center;font-weight:600;padding:3px 0}.woocommerce-password-strength.strong{background-color:#c1e1b9;border-color:#83c373}.woocommerce-password-strength.short{background-color:#f1adad;border-color:#e35b5b}.woocommerce-password-strength.bad{background-color:#fbc5a9;border-color:#f78b53}.woocommerce-password-strength.good{background-color:#ffe399;border-color:#ffc733}.product.has-default-attributes.has-children>.images{opacity:0}#content.twentyeleven .woocommerce-pagination a{font-size:1em;line-height:1}.single-product .twentythirteen #reply-title,.single-product .twentythirteen #respond #commentform,.single-product .twentythirteen .entry-summary{padding:0}.twentythirteen .woocommerce-breadcrumb{padding-top:40px}.twentyfourteen ul.products li.product{margin-top:0!important}body:not(.search-results) .twentysixteen .entry-summary{color:inherit;font-size:inherit;line-height:inherit}.twentysixteen .price ins{background:inherit;color:inherit}
\ No newline at end of file
+@charset "UTF-8";@-webkit-keyframes spin{100%{-webkit-transform:rotate(360deg)}}@keyframes spin{100%{-webkit-transform:rotate(360deg);-ms-transform:rotate(360deg);transform:rotate(360deg)}}@font-face{font-family:star;src:url(../fonts/star.eot);src:url(../fonts/star.eot?#iefix) format("embedded-opentype"),url(../fonts/star.woff) format("woff"),url(../fonts/star.ttf) format("truetype"),url(../fonts/star.svg#star) format("svg");font-weight:400;font-style:normal}@font-face{font-family:WooCommerce;src:url(../fonts/WooCommerce.eot);src:url(../fonts/WooCommerce.eot?#iefix) format("embedded-opentype"),url(../fonts/WooCommerce.woff) format("woff"),url(../fonts/WooCommerce.ttf) format("truetype"),url(../fonts/WooCommerce.svg#WooCommerce) format("svg");font-weight:400;font-style:normal}.woocommerce-store-notice,p.demo_store{position:absolute;top:0;left:0;right:0;margin:0;width:100%;font-size:1em;padding:1em 0;text-align:center;background-color:#a46497;color:#fff;z-index:99998;box-shadow:0 1px 1em rgba(0,0,0,.2);display:none}.woocommerce-store-notice a,p.demo_store a{color:#fff;text-decoration:underline}.admin-bar p.demo_store{top:32px}.clear{clear:both}.woocommerce .blockUI.blockOverlay{position:relative}.woocommerce .blockUI.blockOverlay::before,.woocommerce .loader::before{height:1em;width:1em;display:block;position:absolute;top:50%;left:50%;margin-left:-.5em;margin-top:-.5em;content:'';-webkit-animation:spin 1s ease-in-out infinite;animation:spin 1s ease-in-out infinite;background:url(../images/icons/loader.svg) center center;background-size:cover;line-height:1;text-align:center;font-size:2em;color:rgba(0,0,0,.75)}.woocommerce a.remove{display:block;font-size:1.5em;height:1em;width:1em;text-align:center;line-height:1;border-radius:100%;color:red!important;text-decoration:none;font-weight:700;border:0}.woocommerce a.remove:hover{color:#fff!important;background:red}.woocommerce small.note{display:block;color:#777;font-size:.857em;margin-top:10px}.woocommerce .woocommerce-breadcrumb{margin:0 0 1em;padding:0;font-size:.92em;color:#777}.woocommerce .woocommerce-breadcrumb::after,.woocommerce .woocommerce-breadcrumb::before{content:' ';display:table}.woocommerce .woocommerce-breadcrumb::after{clear:both}.woocommerce .woocommerce-breadcrumb a{color:#777}.woocommerce .quantity .qty{width:3.631em;text-align:center}.woocommerce div.product{margin-bottom:0;position:relative}.woocommerce div.product .product_title{clear:none;margin-top:0;padding:0}.woocommerce #reviews #comments .add_review::after,.woocommerce .products ul::after,.woocommerce div.product form.cart::after,.woocommerce div.product p.cart::after,.woocommerce nav.woocommerce-pagination ul,.woocommerce ul.products::after{clear:both}.woocommerce div.product p.price,.woocommerce div.product span.price{color:#77a464;font-size:1.25em}.woocommerce div.product p.price ins,.woocommerce div.product span.price ins{background:inherit;font-weight:700}.woocommerce div.product p.price del,.woocommerce div.product span.price del{opacity:.5}.woocommerce div.product p.stock{font-size:.92em}.woocommerce div.product .stock{color:#77a464}.woocommerce div.product .out-of-stock{color:red}.woocommerce div.product .woocommerce-product-rating{margin-bottom:1.618em}.woocommerce div.product div.images{margin-bottom:2em}.woocommerce div.product div.images img{display:block;width:100%;height:auto;box-shadow:none}.woocommerce div.product div.images div.thumbnails{padding-top:1em}.woocommerce div.product div.images.woocommerce-product-gallery{position:relative}.woocommerce div.product div.images .woocommerce-product-gallery__wrapper{-webkit-transition:all cubic-bezier(.795,-.035,0,1) .5s;transition:all cubic-bezier(.795,-.035,0,1) .5s}.woocommerce div.product div.images .woocommerce-product-gallery__wrapper .zoomImg{background-color:#fff}.woocommerce div.product div.images .woocommerce-product-gallery__image:nth-child(n+2){width:25%;display:inline-block}.woocommerce div.product div.images .woocommerce-product-gallery__trigger{position:absolute;top:.5em;right:.5em;font-size:2em;z-index:9;width:36px;height:36px;background:#fff;text-indent:-9999px;border-radius:100%;box-sizing:content-box}.woocommerce div.product div.images .woocommerce-product-gallery__trigger:before{content:"";display:block;width:10px;height:10px;border:2px solid #000;border-radius:100%;position:absolute;top:9px;left:9px;box-sizing:content-box}.woocommerce div.product div.images .woocommerce-product-gallery__trigger:after{content:"";display:block;width:2px;height:8px;background:#000;border-radius:6px;position:absolute;top:19px;left:22px;-webkit-transform:rotate(-45deg);-ms-transform:rotate(-45deg);transform:rotate(-45deg);box-sizing:content-box}.woocommerce div.product div.images .flex-control-thumbs{overflow:hidden;zoom:1;margin:0;padding:0}.woocommerce div.product div.images .flex-control-thumbs li{width:25%;float:left;margin:0;list-style:none}.woocommerce div.product div.images .flex-control-thumbs li img{cursor:pointer;opacity:.5;margin:0}.woocommerce div.product div.images .flex-control-thumbs li img.flex-active,.woocommerce div.product div.images .flex-control-thumbs li img:hover{opacity:1}.woocommerce div.product div.summary{margin-bottom:2em}.woocommerce div.product div.social{text-align:right;margin:0 0 1em}.woocommerce div.product div.social span{margin:0 0 0 2px}.woocommerce div.product div.social span span{margin:0}.woocommerce div.product div.social span .stButton .chicklets{padding-left:16px;width:0}.woocommerce div.product div.social iframe{float:left;margin-top:3px}.woocommerce div.product .woocommerce-tabs ul.tabs{list-style:none;padding:0 0 0 1em;margin:0 0 1.618em;overflow:hidden;position:relative}.woocommerce div.product .woocommerce-tabs ul.tabs li{border:1px solid #d3ced2;background-color:#ebe9eb;display:inline-block;position:relative;z-index:0;border-radius:4px 4px 0 0;margin:0 -5px;padding:0 1em}.woocommerce div.product .woocommerce-tabs ul.tabs li a{display:inline-block;padding:.5em 0;font-weight:700;color:#515151;text-decoration:none}.woocommerce div.product form.cart::after,.woocommerce div.product form.cart::before,.woocommerce div.product p.cart::after,.woocommerce div.product p.cart::before{display:table;content:' '}.woocommerce div.product .woocommerce-tabs ul.tabs li a:hover{text-decoration:none;color:#6b6b6b}.woocommerce div.product .woocommerce-tabs ul.tabs li.active{background:#fff;z-index:2;border-bottom-color:#fff}.woocommerce div.product .woocommerce-tabs ul.tabs li.active a{color:inherit;text-shadow:inherit}.woocommerce div.product .woocommerce-tabs ul.tabs li.active::before{box-shadow:2px 2px 0 #fff}.woocommerce div.product .woocommerce-tabs ul.tabs li.active::after{box-shadow:-2px 2px 0 #fff}.woocommerce div.product .woocommerce-tabs ul.tabs li::after,.woocommerce div.product .woocommerce-tabs ul.tabs li::before{border:1px solid #d3ced2;position:absolute;bottom:-1px;width:5px;height:5px;content:' '}.woocommerce div.product .woocommerce-tabs ul.tabs li::before{left:-6px;-moz-border-bottom-right-radius:4px;border-bottom-right-radius:4px;border-width:0 1px 1px 0;box-shadow:2px 2px 0 #ebe9eb}.woocommerce div.product .woocommerce-tabs ul.tabs li::after{right:-6px;-moz-border-bottom-left-radius:4px;border-bottom-left-radius:4px;border-width:0 0 1px 1px;box-shadow:-2px 2px 0 #ebe9eb}.woocommerce div.product .woocommerce-tabs ul.tabs::before{position:absolute;content:' ';width:100%;bottom:0;left:0;border-bottom:1px solid #d3ced2;z-index:1}.woocommerce div.product .woocommerce-tabs .panel{margin:0 0 2em;padding:0}.woocommerce div.product form.cart,.woocommerce div.product p.cart{margin-bottom:2em}.woocommerce div.product form.cart div.quantity{float:left;margin:0 4px 0 0}.woocommerce div.product form.cart table{border-width:0 0 1px}.woocommerce div.product form.cart table td{padding-left:0}.woocommerce div.product form.cart table div.quantity{float:none;margin:0}.woocommerce div.product form.cart table small.stock{display:block;float:none}.woocommerce div.product form.cart .variations{margin-bottom:1em;border:0;width:100%}.woocommerce div.product form.cart .variations td,.woocommerce div.product form.cart .variations th{border:0;vertical-align:top;line-height:2em}.woocommerce div.product form.cart .variations label{font-weight:700}.woocommerce div.product form.cart .variations select{max-width:100%;min-width:75%;display:inline-block;margin-right:1em}.woocommerce div.product form.cart .variations td.label{padding-right:1em}.woocommerce div.product form.cart .woocommerce-variation-description p{margin-bottom:1em}.woocommerce div.product form.cart .reset_variations{visibility:hidden;font-size:.83em}.woocommerce div.product form.cart .wc-no-matching-variations{display:none}.woocommerce div.product form.cart .button{vertical-align:middle;float:left}.woocommerce div.product form.cart .group_table td.label{padding-right:1em;padding-left:1em}.woocommerce div.product form.cart .group_table td{vertical-align:top;padding-bottom:.5em;border:0}.woocommerce div.product form.cart .group_table td:first-child{width:4em;text-align:center}.woocommerce div.product form.cart .group_table .wc-grouped-product-add-to-cart-checkbox{display:inline-block;width:auto;margin:0 auto;-webkit-transform:scale(1.5,1.5);-ms-transform:scale(1.5,1.5);transform:scale(1.5,1.5)}.woocommerce span.onsale{min-height:3.236em;min-width:3.236em;padding:.202em;font-weight:700;position:absolute;text-align:center;line-height:3.236;top:-.5em;left:-.5em;margin:0;border-radius:100%;background-color:#77a464;color:#fff;font-size:.857em;-webkit-font-smoothing:antialiased;z-index:9}.woocommerce .products ul,.woocommerce ul.products{margin:0 0 1em;padding:0;list-style:none;clear:both}.woocommerce .products ul::after,.woocommerce .products ul::before,.woocommerce ul.products::after,.woocommerce ul.products::before{content:' ';display:table}.woocommerce .products ul li,.woocommerce ul.products li{list-style:none}.woocommerce ul.products li.product .onsale{top:0;right:0;left:auto;margin:-.5em -.5em 0 0}.woocommerce ul.products li.product .woocommerce-loop-category__title,.woocommerce ul.products li.product .woocommerce-loop-product__title,.woocommerce ul.products li.product h3{padding:.5em 0;margin:0;font-size:1em}.woocommerce ul.products li.product a{text-decoration:none}.woocommerce ul.products li.product a img{width:100%;height:auto;display:block;margin:0 0 1em;box-shadow:none}.woocommerce ul.products li.product strong{display:block}.woocommerce ul.products li.product .star-rating{font-size:.857em}.woocommerce ul.products li.product .button{margin-top:1em}.woocommerce ul.products li.product .price{color:#77a464;display:block;font-weight:400;margin-bottom:.5em;font-size:.857em}.woocommerce ul.products li.product .price del{color:inherit;opacity:.5;display:block}.woocommerce ul.products li.product .price ins{background:0 0;font-weight:700}.woocommerce ul.products li.product .price .from{font-size:.67em;margin:-2px 0 0;text-transform:uppercase;color:rgba(132,132,132,.5)}.woocommerce .woocommerce-ordering,.woocommerce .woocommerce-result-count{margin:0 0 1em}.woocommerce .woocommerce-ordering select{vertical-align:top}.woocommerce nav.woocommerce-pagination{text-align:center}.woocommerce nav.woocommerce-pagination ul{display:inline-block;white-space:nowrap;padding:0;border:1px solid #d3ced2;border-right:0;margin:1px}.woocommerce nav.woocommerce-pagination ul li{border-right:1px solid #d3ced2;padding:0;margin:0;float:left;display:inline;overflow:hidden}.woocommerce nav.woocommerce-pagination ul li a,.woocommerce nav.woocommerce-pagination ul li span{margin:0;text-decoration:none;line-height:1;font-size:1em;font-weight:400;padding:.5em;min-width:1em;display:block}.woocommerce nav.woocommerce-pagination ul li a:focus,.woocommerce nav.woocommerce-pagination ul li a:hover,.woocommerce nav.woocommerce-pagination ul li span.current{background:#ebe9eb;color:#8a7e88}.woocommerce #respond input#submit,.woocommerce a.button,.woocommerce button.button,.woocommerce input.button{font-size:100%;margin:0;line-height:1;cursor:pointer;position:relative;text-decoration:none;overflow:visible;padding:.618em 1em;font-weight:700;border-radius:3px;left:auto;color:#515151;background-color:#ebe9eb;border:0;white-space:nowrap;display:inline-block;background-image:none;box-shadow:none;-webkit-box-shadow:none;text-shadow:none}.woocommerce #respond input#submit.loading,.woocommerce a.button.loading,.woocommerce button.button.loading,.woocommerce input.button.loading{opacity:.25;padding-right:2.618em}.woocommerce #respond input#submit.loading::after,.woocommerce a.button.loading::after,.woocommerce button.button.loading::after,.woocommerce input.button.loading::after{font-family:WooCommerce;content:'\e01c';vertical-align:top;-webkit-font-smoothing:antialiased;font-weight:400;position:absolute;top:.618em;right:1em;-webkit-animation:spin 2s linear infinite;animation:spin 2s linear infinite}.woocommerce #respond input#submit.added::after,.woocommerce a.button.added::after,.woocommerce button.button.added::after,.woocommerce input.button.added::after{font-family:WooCommerce;content:'\e017';margin-left:.53em;vertical-align:bottom}.woocommerce #respond input#submit:hover,.woocommerce a.button:hover,.woocommerce button.button:hover,.woocommerce input.button:hover{background-color:#dad8da;text-decoration:none;background-image:none;color:#515151}.woocommerce #respond input#submit.alt,.woocommerce a.button.alt,.woocommerce button.button.alt,.woocommerce input.button.alt{background-color:#a46497;color:#fff;-webkit-font-smoothing:antialiased}.woocommerce #respond input#submit.alt:hover,.woocommerce a.button.alt:hover,.woocommerce button.button.alt:hover,.woocommerce input.button.alt:hover{background-color:#935386;color:#fff}.woocommerce #respond input#submit.alt.disabled,.woocommerce #respond input#submit.alt.disabled:hover,.woocommerce #respond input#submit.alt:disabled,.woocommerce #respond input#submit.alt:disabled:hover,.woocommerce #respond input#submit.alt:disabled[disabled],.woocommerce #respond input#submit.alt:disabled[disabled]:hover,.woocommerce a.button.alt.disabled,.woocommerce a.button.alt.disabled:hover,.woocommerce a.button.alt:disabled,.woocommerce a.button.alt:disabled:hover,.woocommerce a.button.alt:disabled[disabled],.woocommerce a.button.alt:disabled[disabled]:hover,.woocommerce button.button.alt.disabled,.woocommerce button.button.alt.disabled:hover,.woocommerce button.button.alt:disabled,.woocommerce button.button.alt:disabled:hover,.woocommerce button.button.alt:disabled[disabled],.woocommerce button.button.alt:disabled[disabled]:hover,.woocommerce input.button.alt.disabled,.woocommerce input.button.alt.disabled:hover,.woocommerce input.button.alt:disabled,.woocommerce input.button.alt:disabled:hover,.woocommerce input.button.alt:disabled[disabled],.woocommerce input.button.alt:disabled[disabled]:hover{background-color:#a46497;color:#fff}.woocommerce #respond input#submit.disabled,.woocommerce #respond input#submit:disabled,.woocommerce #respond input#submit:disabled[disabled],.woocommerce a.button.disabled,.woocommerce a.button:disabled,.woocommerce a.button:disabled[disabled],.woocommerce button.button.disabled,.woocommerce button.button:disabled,.woocommerce button.button:disabled[disabled],.woocommerce input.button.disabled,.woocommerce input.button:disabled,.woocommerce input.button:disabled[disabled]{color:inherit;cursor:not-allowed;opacity:.5;padding:.618em 1em}.woocommerce #respond input#submit.disabled:hover,.woocommerce #respond input#submit:disabled:hover,.woocommerce #respond input#submit:disabled[disabled]:hover,.woocommerce a.button.disabled:hover,.woocommerce a.button:disabled:hover,.woocommerce a.button:disabled[disabled]:hover,.woocommerce button.button.disabled:hover,.woocommerce button.button:disabled:hover,.woocommerce button.button:disabled[disabled]:hover,.woocommerce input.button.disabled:hover,.woocommerce input.button:disabled:hover,.woocommerce input.button:disabled[disabled]:hover{color:inherit;background-color:#ebe9eb}.woocommerce .cart .button,.woocommerce .cart input.button{float:none}.woocommerce a.added_to_cart{padding-top:.5em;white-space:nowrap;display:inline-block}.woocommerce #reviews #comments .add_review::after,.woocommerce #reviews #comments .add_review::before,.woocommerce #reviews #comments ol.commentlist li .comment-text::after,.woocommerce #reviews #comments ol.commentlist li .comment-text::before,.woocommerce #reviews #comments ol.commentlist::after,.woocommerce #reviews #comments ol.commentlist::before{content:' ';display:table}.woocommerce #reviews h2 small{float:right;color:#777;font-size:15px;margin:10px 0 0}.woocommerce #reviews h2 small a{text-decoration:none;color:#777}.woocommerce #reviews h3{margin:0}.woocommerce #reviews #respond{margin:0;border:0;padding:0}.woocommerce #reviews #comment{height:75px}.woocommerce #reviews #comments h2{clear:none}.woocommerce #review_form #respond::after,.woocommerce #reviews #comments ol.commentlist li .comment-text::after,.woocommerce #reviews #comments ol.commentlist::after,.woocommerce .woocommerce-product-rating::after,.woocommerce ul.cart_list li dl::after,.woocommerce ul.cart_list li::after,.woocommerce ul.product_list_widget li dl::after,.woocommerce ul.product_list_widget li::after{clear:both}.woocommerce #reviews #comments ol.commentlist{margin:0;width:100%;background:0 0;list-style:none}.woocommerce #reviews #comments ol.commentlist li{padding:0;margin:0 0 20px;position:relative;background:0;border:0}.woocommerce #reviews #comments ol.commentlist li .meta{color:#777;font-size:.75em}.woocommerce #reviews #comments ol.commentlist li img.avatar{float:left;position:absolute;top:0;left:0;padding:3px;width:32px;height:auto;background:#ebe9eb;border:1px solid #e4e1e3;margin:0;box-shadow:none}.woocommerce #reviews #comments ol.commentlist li .comment-text{margin:0 0 0 50px;border:1px solid #e4e1e3;border-radius:4px;padding:1em 1em 0}.woocommerce #reviews #comments ol.commentlist li .comment-text p{margin:0 0 1em}.woocommerce #reviews #comments ol.commentlist li .comment-text p.meta{font-size:.83em}.woocommerce #reviews #comments ol.commentlist ul.children{list-style:none;margin:20px 0 0 50px}.woocommerce #reviews #comments ol.commentlist ul.children .star-rating{display:none}.woocommerce #reviews #comments ol.commentlist #respond{border:1px solid #e4e1e3;border-radius:4px;padding:1em 1em 0;margin:20px 0 0 50px}.woocommerce #reviews #comments .commentlist>li::before{content:''}.woocommerce .star-rating{float:right;overflow:hidden;position:relative;height:1em;line-height:1;font-size:1em;width:5.4em;font-family:star}.woocommerce .star-rating::before{content:'\73\73\73\73\73';color:#d3ced2;float:left;top:0;left:0;position:absolute}.woocommerce .star-rating span{overflow:hidden;float:left;top:0;left:0;position:absolute;padding-top:1.5em}.woocommerce .star-rating span::before{content:'\53\53\53\53\53';top:0;position:absolute;left:0}.woocommerce .woocommerce-product-rating{line-height:2;display:block}.woocommerce .woocommerce-product-rating::after,.woocommerce .woocommerce-product-rating::before{content:' ';display:table}.woocommerce .woocommerce-product-rating .star-rating{margin:.5em 4px 0 0;float:left}.woocommerce .products .star-rating{display:block;margin:0 0 .5em;float:none}.woocommerce .hreview-aggregate .star-rating{margin:10px 0 0}.woocommerce #review_form #respond{position:static;margin:0;width:auto;padding:0;background:0 0;border:0}.woocommerce #review_form #respond::after,.woocommerce #review_form #respond::before{content:' ';display:table}.woocommerce p.stars a::before,.woocommerce p.stars a:hover~a::before{content:'\e021'}.woocommerce #review_form #respond p{margin:0 0 10px}.woocommerce #review_form #respond .form-submit input{left:auto}.woocommerce #review_form #respond textarea{box-sizing:border-box;width:100%}.woocommerce p.stars a{position:relative;height:1em;width:1em;text-indent:-999em;display:inline-block;text-decoration:none}.woocommerce p.stars a::before{display:block;position:absolute;top:0;left:0;width:1em;height:1em;line-height:1;font-family:WooCommerce;text-indent:0}.woocommerce table.shop_attributes td,.woocommerce table.shop_attributes th{line-height:1.5;border-bottom:1px dotted rgba(0,0,0,.1);border-top:0;margin:0}.woocommerce p.stars.selected a.active::before,.woocommerce p.stars:hover a::before{content:'\e020'}.woocommerce p.stars.selected a.active~a::before{content:'\e021'}.woocommerce p.stars.selected a:not(.active)::before{content:'\e020'}.woocommerce table.shop_attributes{border:0;border-top:1px dotted rgba(0,0,0,.1);margin-bottom:1.618em;width:100%}.woocommerce table.shop_attributes th{width:150px;font-weight:700;padding:8px}.woocommerce table.shop_attributes td{font-style:italic;padding:0}.woocommerce table.shop_attributes td p{margin:0;padding:8px 0}.woocommerce table.shop_attributes tr:nth-child(even) td,.woocommerce table.shop_attributes tr:nth-child(even) th{background:rgba(0,0,0,.025)}.woocommerce table.shop_table{border:1px solid rgba(0,0,0,.1);margin:0 -1px 24px 0;text-align:left;width:100%;border-collapse:separate;border-radius:5px}.woocommerce table.shop_table th{font-weight:700;padding:9px 12px}.woocommerce table.shop_table td{border-top:1px solid rgba(0,0,0,.1);padding:6px 12px;vertical-align:middle}.woocommerce table.shop_table td small{font-weight:400}.woocommerce table.shop_table tbody:first-child tr:first-child td,.woocommerce table.shop_table tbody:first-child tr:first-child th{border-top:0}.woocommerce table.shop_table tbody th,.woocommerce table.shop_table tfoot td,.woocommerce table.shop_table tfoot th{font-weight:700;border-top:1px solid rgba(0,0,0,.1)}.woocommerce table.my_account_orders{font-size:.85em}.woocommerce table.my_account_orders td,.woocommerce table.my_account_orders th{padding:4px 8px;vertical-align:middle}.woocommerce table.my_account_orders .button{white-space:nowrap}.woocommerce table.my_account_orders .order-actions{text-align:right}.woocommerce table.my_account_orders .order-actions .button{margin:.125em 0 .125em .25em}.woocommerce table.woocommerce-MyAccount-downloads td,.woocommerce table.woocommerce-MyAccount-downloads th{vertical-align:top;text-align:center}.woocommerce table.woocommerce-MyAccount-downloads td:first-child,.woocommerce table.woocommerce-MyAccount-downloads td:last-child,.woocommerce table.woocommerce-MyAccount-downloads th:first-child,.woocommerce table.woocommerce-MyAccount-downloads th:last-child{text-align:left}.woocommerce table.woocommerce-MyAccount-downloads td .woocommerce-MyAccount-downloads-file::before,.woocommerce table.woocommerce-MyAccount-downloads th .woocommerce-MyAccount-downloads-file::before{content:'\2193';display:inline-block}.woocommerce td.product-name .wc-item-meta,.woocommerce td.product-name dl.variation{list-style:none}.woocommerce td.product-name .wc-item-meta .wc-item-meta-label,.woocommerce td.product-name .wc-item-meta dt,.woocommerce td.product-name dl.variation .wc-item-meta-label,.woocommerce td.product-name dl.variation dt{float:left;clear:both;margin-right:.25em;display:inline-block;list-style:none}.woocommerce td.product-name .wc-item-meta dd,.woocommerce td.product-name dl.variation dd{margin:0}.woocommerce td.product-name .wc-item-meta p,.woocommerce td.product-name .wc-item-meta:last-child,.woocommerce td.product-name dl.variation p,.woocommerce td.product-name dl.variation:last-child{margin-bottom:0}.woocommerce td.product-name p.backorder_notification{font-size:.83em}.woocommerce td.product-quantity{min-width:80px}.woocommerce ul.cart_list,.woocommerce ul.product_list_widget{list-style:none;padding:0;margin:0}.woocommerce ul.cart_list li,.woocommerce ul.product_list_widget li{padding:4px 0;margin:0;list-style:none}.woocommerce ul.cart_list li::after,.woocommerce ul.cart_list li::before,.woocommerce ul.product_list_widget li::after,.woocommerce ul.product_list_widget li::before{content:' ';display:table}.woocommerce ul.cart_list li a,.woocommerce ul.product_list_widget li a{display:block;font-weight:700}.woocommerce ul.cart_list li img,.woocommerce ul.product_list_widget li img{float:right;margin-left:4px;width:32px;height:auto;box-shadow:none}.woocommerce ul.cart_list li dl,.woocommerce ul.product_list_widget li dl{margin:0;padding-left:1em;border-left:2px solid rgba(0,0,0,.1)}.woocommerce ul.cart_list li dl::after,.woocommerce ul.cart_list li dl::before,.woocommerce ul.product_list_widget li dl::after,.woocommerce ul.product_list_widget li dl::before{content:' ';display:table}.woocommerce ul.cart_list li dl dd,.woocommerce ul.cart_list li dl dt,.woocommerce ul.product_list_widget li dl dd,.woocommerce ul.product_list_widget li dl dt{display:inline-block;float:left;margin-bottom:1em}.woocommerce ul.cart_list li dl dt,.woocommerce ul.product_list_widget li dl dt{font-weight:700;padding:0 0 .25em;margin:0 4px 0 0;clear:left}#add_payment_method .wc-proceed-to-checkout::after,.woocommerce .widget_layered_nav ul li::after,.woocommerce .widget_rating_filter ul li::after,.woocommerce .widget_shopping_cart .buttons::after,.woocommerce ul.order_details::after,.woocommerce-account .addresses .title::after,.woocommerce-account .woocommerce::after,.woocommerce-cart .wc-proceed-to-checkout::after,.woocommerce-checkout .wc-proceed-to-checkout::after,.woocommerce-error::after,.woocommerce-info::after,.woocommerce-message::after,.woocommerce.widget_shopping_cart .buttons::after{clear:both}.woocommerce ul.cart_list li dl dd,.woocommerce ul.product_list_widget li dl dd{padding:0 0 .25em}.woocommerce ul.cart_list li dl dd p:last-child,.woocommerce ul.product_list_widget li dl dd p:last-child{margin-bottom:0}.woocommerce ul.cart_list li .star-rating,.woocommerce ul.product_list_widget li .star-rating{float:none}.woocommerce .widget_shopping_cart .total,.woocommerce.widget_shopping_cart .total{border-top:3px double #ebe9eb;padding:4px 0 0}.woocommerce .widget_shopping_cart .total strong,.woocommerce.widget_shopping_cart .total strong{min-width:40px;display:inline-block}.woocommerce .widget_shopping_cart .cart_list li,.woocommerce.widget_shopping_cart .cart_list li{padding-left:2em;position:relative;padding-top:0}.woocommerce .widget_shopping_cart .cart_list li a.remove,.woocommerce.widget_shopping_cart .cart_list li a.remove{position:absolute;top:0;left:0}.woocommerce .widget_shopping_cart .buttons::after,.woocommerce .widget_shopping_cart .buttons::before,.woocommerce.widget_shopping_cart .buttons::after,.woocommerce.widget_shopping_cart .buttons::before{content:' ';display:table}.woocommerce .widget_shopping_cart .buttons a,.woocommerce.widget_shopping_cart .buttons a{margin-right:5px;margin-bottom:5px}.woocommerce form .form-row{padding:3px;margin:0 0 6px}.woocommerce form .form-row [placeholder]:focus::-webkit-input-placeholder{-webkit-transition:opacity .5s .5s ease;transition:opacity .5s .5s ease;opacity:0}.woocommerce form .form-row label{line-height:2}.woocommerce form .form-row label.hidden{visibility:hidden}.woocommerce form .form-row label.inline{display:inline}.woocommerce form .form-row select{cursor:pointer;margin:0}.woocommerce form .form-row .required{color:red;font-weight:700;border:0}.woocommerce form .form-row .input-checkbox{display:inline;margin:-2px 8px 0 0;text-align:center;vertical-align:middle}.woocommerce form .form-row input.input-text,.woocommerce form .form-row textarea{box-sizing:border-box;width:100%;margin:0;outline:0;line-height:1}.woocommerce form .form-row textarea{height:4em;line-height:1.5;display:block;box-shadow:none}.woocommerce form .form-row .select2-container{width:100%;line-height:2em}.woocommerce form .form-row.woocommerce-invalid label{color:#a00}.woocommerce form .form-row.woocommerce-invalid .select2-container,.woocommerce form .form-row.woocommerce-invalid input.input-text,.woocommerce form .form-row.woocommerce-invalid select{border-color:#a00}.woocommerce form .form-row.woocommerce-validated .select2-container,.woocommerce form .form-row.woocommerce-validated input.input-text,.woocommerce form .form-row.woocommerce-validated select{border-color:#69bf29}.woocommerce form .form-row ::-webkit-input-placeholder{line-height:normal}.woocommerce form .form-row :-moz-placeholder{line-height:normal}.woocommerce form .form-row :-ms-input-placeholder{line-height:normal}.woocommerce form.checkout_coupon,.woocommerce form.login,.woocommerce form.register{border:1px solid #d3ced2;padding:20px;margin:2em 0;text-align:left;border-radius:5px}.woocommerce ul#shipping_method{list-style:none;margin:0;padding:0}.woocommerce ul#shipping_method li{margin:0;padding:.25em 0 .25em 22px;text-indent:-22px;list-style:none}.woocommerce ul#shipping_method li input{margin:3px .5ex}.woocommerce ul#shipping_method li label{display:inline}.woocommerce .widget_layered_nav ul li::after,.woocommerce .widget_layered_nav ul li::before,.woocommerce ul.order_details::after,.woocommerce ul.order_details::before{content:' ';display:table}.woocommerce ul#shipping_method .amount{font-weight:700}.woocommerce p.woocommerce-shipping-contents{margin:0}.woocommerce ul.order_details{margin:0 0 3em;list-style:none}.woocommerce ul.order_details li{float:left;margin-right:2em;text-transform:uppercase;font-size:.715em;line-height:1;border-right:1px dashed #d3ced2;padding-right:2em;margin-left:0;padding-left:0;list-style-type:none}.woocommerce ul.order_details li strong{display:block;font-size:1.4em;text-transform:none;line-height:1.5}.woocommerce ul.order_details li:last-of-type{border:none}.woocommerce .wc-bacs-bank-details-account-name{font-weight:700}.woocommerce .widget_layered_nav ul{margin:0;padding:0;border:0;list-style:none}.woocommerce .widget_layered_nav ul li{padding:0 0 1px;list-style:none}.woocommerce .widget_layered_nav ul li.chosen a::before,.woocommerce .widget_layered_nav_filters ul li a::before{line-height:1;content:"";font-weight:400;color:#a00;font-family:WooCommerce;speak:none;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;text-decoration:none}.woocommerce .widget_layered_nav ul li a,.woocommerce .widget_layered_nav ul li span{padding:1px 0}.woocommerce .widget_layered_nav ul li.chosen a::before{margin-right:.618em}.woocommerce .widget_layered_nav_filters ul{margin:0;padding:0;border:0;list-style:none;overflow:hidden;zoom:1}.woocommerce .widget_layered_nav_filters ul li{float:left;padding:0 1px 1px 0;list-style:none}.woocommerce .widget_layered_nav_filters ul li a{text-decoration:none}.woocommerce .widget_layered_nav_filters ul li a::before{margin-right:.618em}.woocommerce .widget_price_filter .price_slider{margin-bottom:1em}.woocommerce .widget_price_filter .price_slider_amount{text-align:right;line-height:2.4;font-size:.8751em}.woocommerce .widget_price_filter .price_slider_amount .button{font-size:1.15em;float:left}.woocommerce .widget_price_filter .ui-slider{position:relative;text-align:left;margin-left:.5em;margin-right:.5em}.woocommerce .widget_price_filter .ui-slider .ui-slider-handle{position:absolute;z-index:2;width:1em;height:1em;background-color:#a46497;border-radius:1em;cursor:ew-resize;outline:0;top:-.3em;margin-left:-.5em}.woocommerce .widget_price_filter .ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;border-radius:1em;background-color:#a46497}.woocommerce .widget_price_filter .price_slider_wrapper .ui-widget-content{border-radius:1em;background-color:#602053;border:0}.woocommerce .widget_price_filter .ui-slider-horizontal{height:.5em}.woocommerce .widget_price_filter .ui-slider-horizontal .ui-slider-range{top:0;height:100%}.woocommerce .widget_price_filter .ui-slider-horizontal .ui-slider-range-min{left:-1px}.woocommerce .widget_price_filter .ui-slider-horizontal .ui-slider-range-max{right:-1px}.woocommerce .widget_rating_filter ul{margin:0;padding:0;border:0;list-style:none}.woocommerce .widget_rating_filter ul li{padding:0 0 1px;list-style:none}.woocommerce .widget_rating_filter ul li::after,.woocommerce .widget_rating_filter ul li::before{content:' ';display:table}.woocommerce .widget_rating_filter ul li a{padding:1px 0;text-decoration:none}.woocommerce .widget_rating_filter ul li .star-rating{float:none;display:inline-block}.rtl.woocommerce div.product div.images .flex-control-thumbs li,.woocommerce-error .button,.woocommerce-info .button,.woocommerce-message .button{float:right}.woocommerce .widget_rating_filter ul li.chosen a::before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin-right:.618em;content:"";text-decoration:none;color:#a00}.pswp{z-index:999999}.woocommerce img.pswp__img,.woocommerce-page img.pswp__img{max-width:none}button.pswp__button{box-shadow:none!important;background-image:url(photoswipe/default-skin/default-skin.png)!important}button.pswp__button,button.pswp__button--arrow--left::before,button.pswp__button--arrow--right::before,button.pswp__button:hover{background-color:transparent!important}button.pswp__button--arrow--left,button.pswp__button--arrow--left:hover,button.pswp__button--arrow--right,button.pswp__button--arrow--right:hover{background-image:none!important}button.pswp__button--close:hover{background-position:0 -44px}button.pswp__button--zoom:hover{background-position:-88px 0}.woocommerce-error,.woocommerce-info,.woocommerce-message{padding:1em 2em 1em 3.5em;margin:0 0 2em;position:relative;background-color:#f7f6f7;color:#515151;border-top:3px solid #a46497;list-style:none;width:auto;word-wrap:break-word}.woocommerce-error::after,.woocommerce-error::before,.woocommerce-info::after,.woocommerce-info::before,.woocommerce-message::after,.woocommerce-message::before{content:' ';display:table}.woocommerce-error::before,.woocommerce-info::before,.woocommerce-message::before{font-family:WooCommerce;content:'\e028';display:inline-block;position:absolute;top:1em;left:1.5em}.woocommerce-error li,.woocommerce-info li,.woocommerce-message li{list-style:none!important;padding-left:0!important;margin-left:0!important}.woocommerce-message{border-top-color:#8fae1b}.woocommerce-message::before{content:'\e015';color:#8fae1b}.woocommerce-info{border-top-color:#1e85be}.woocommerce-info::before{color:#1e85be}.woocommerce-error{border-top-color:#b81c23}.woocommerce-error::before{content:'\e016';color:#b81c23}.woocommerce-account .addresses .title::after,.woocommerce-account .addresses .title::before,.woocommerce-account .woocommerce::after,.woocommerce-account .woocommerce::before{content:' ';display:table}.woocommerce-account .addresses .title h3{float:left}.woocommerce-account .addresses .title .edit,.woocommerce-account ul.digital-downloads li .count{float:right}.woocommerce-account ol.commentlist.notes li.note p.meta{font-weight:700;margin-bottom:0}.woocommerce-account ol.commentlist.notes li.note .description p:last-child{margin-bottom:0}.woocommerce-account ul.digital-downloads{margin-left:0;padding-left:0}.woocommerce-account ul.digital-downloads li{list-style:none;margin-left:0;padding-left:0}.woocommerce-account ul.digital-downloads li::before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin-right:.618em;content:"";text-decoration:none}#add_payment_method table.cart .product-thumbnail,.woocommerce-cart table.cart .product-thumbnail,.woocommerce-checkout table.cart .product-thumbnail{min-width:32px}#add_payment_method table.cart img,.woocommerce-cart table.cart img,.woocommerce-checkout table.cart img{width:32px;box-shadow:none}#add_payment_method table.cart td,#add_payment_method table.cart th,.woocommerce-cart table.cart td,.woocommerce-cart table.cart th,.woocommerce-checkout table.cart td,.woocommerce-checkout table.cart th{vertical-align:middle}#add_payment_method table.cart td.actions .coupon .input-text,.woocommerce-cart table.cart td.actions .coupon .input-text,.woocommerce-checkout table.cart td.actions .coupon .input-text{float:left;box-sizing:border-box;border:1px solid #d3ced2;padding:6px 6px 5px;margin:0 4px 0 0;outline:0;line-height:1}#add_payment_method table.cart input,.woocommerce-cart table.cart input,.woocommerce-checkout table.cart input{margin:0;vertical-align:middle;line-height:1}#add_payment_method .wc-proceed-to-checkout,.woocommerce-cart .wc-proceed-to-checkout,.woocommerce-checkout .wc-proceed-to-checkout{padding:1em 0}#add_payment_method .wc-proceed-to-checkout::after,#add_payment_method .wc-proceed-to-checkout::before,.woocommerce-cart .wc-proceed-to-checkout::after,.woocommerce-cart .wc-proceed-to-checkout::before,.woocommerce-checkout .wc-proceed-to-checkout::after,.woocommerce-checkout .wc-proceed-to-checkout::before{content:' ';display:table}#add_payment_method .wc-proceed-to-checkout a.checkout-button,.woocommerce-cart .wc-proceed-to-checkout a.checkout-button,.woocommerce-checkout .wc-proceed-to-checkout a.checkout-button{display:block;text-align:center;margin-bottom:1em;font-size:1.25em;padding:1em}#add_payment_method .cart-collaterals .shipping_calculator .button,.woocommerce-cart .cart-collaterals .shipping_calculator .button,.woocommerce-checkout .cart-collaterals .shipping_calculator .button{width:100%;float:none;display:block}#add_payment_method .cart-collaterals .shipping_calculator .shipping-calculator-button::after,.woocommerce-cart .cart-collaterals .shipping_calculator .shipping-calculator-button::after,.woocommerce-checkout .cart-collaterals .shipping_calculator .shipping-calculator-button::after{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;margin-left:.618em;content:"";text-decoration:none}#add_payment_method #payment ul.payment_methods li:not(.woocommerce-notice)::after,#add_payment_method #payment ul.payment_methods li:not(.woocommerce-notice)::before,#add_payment_method #payment ul.payment_methods::after,#add_payment_method #payment ul.payment_methods::before,.woocommerce-cart #payment ul.payment_methods li:not(.woocommerce-notice)::after,.woocommerce-cart #payment ul.payment_methods li:not(.woocommerce-notice)::before,.woocommerce-cart #payment ul.payment_methods::after,.woocommerce-cart #payment ul.payment_methods::before,.woocommerce-checkout #payment ul.payment_methods li:not(.woocommerce-notice)::after,.woocommerce-checkout #payment ul.payment_methods li:not(.woocommerce-notice)::before,.woocommerce-checkout #payment ul.payment_methods::after,.woocommerce-checkout #payment ul.payment_methods::before{content:' ';display:table}#add_payment_method .cart-collaterals .cart_totals p small,.woocommerce-cart .cart-collaterals .cart_totals p small,.woocommerce-checkout .cart-collaterals .cart_totals p small{color:#777;font-size:.83em}#add_payment_method .cart-collaterals .cart_totals table,.woocommerce-cart .cart-collaterals .cart_totals table,.woocommerce-checkout .cart-collaterals .cart_totals table{border-collapse:separate;margin:0 0 6px;padding:0}#add_payment_method .cart-collaterals .cart_totals table tr:first-child td,#add_payment_method .cart-collaterals .cart_totals table tr:first-child th,.woocommerce-cart .cart-collaterals .cart_totals table tr:first-child td,.woocommerce-cart .cart-collaterals .cart_totals table tr:first-child th,.woocommerce-checkout .cart-collaterals .cart_totals table tr:first-child td,.woocommerce-checkout .cart-collaterals .cart_totals table tr:first-child th{border-top:0}#add_payment_method .cart-collaterals .cart_totals table th,.woocommerce-cart .cart-collaterals .cart_totals table th,.woocommerce-checkout .cart-collaterals .cart_totals table th{width:40%}#add_payment_method .cart-collaterals .cart_totals table td,#add_payment_method .cart-collaterals .cart_totals table th,.woocommerce-cart .cart-collaterals .cart_totals table td,.woocommerce-cart .cart-collaterals .cart_totals table th,.woocommerce-checkout .cart-collaterals .cart_totals table td,.woocommerce-checkout .cart-collaterals .cart_totals table th{vertical-align:top;border-left:0;border-right:0;line-height:1.5em}#add_payment_method .cart-collaterals .cart_totals table small,.woocommerce-cart .cart-collaterals .cart_totals table small,.woocommerce-checkout .cart-collaterals .cart_totals table small{color:#777}#add_payment_method .cart-collaterals .cart_totals table select,.woocommerce-cart .cart-collaterals .cart_totals table select,.woocommerce-checkout .cart-collaterals .cart_totals table select{width:100%}#add_payment_method .cart-collaterals .cart_totals .discount td,.woocommerce-cart .cart-collaterals .cart_totals .discount td,.woocommerce-checkout .cart-collaterals .cart_totals .discount td{color:#77a464}#add_payment_method .cart-collaterals .cart_totals tr td,#add_payment_method .cart-collaterals .cart_totals tr th,.woocommerce-cart .cart-collaterals .cart_totals tr td,.woocommerce-cart .cart-collaterals .cart_totals tr th,.woocommerce-checkout .cart-collaterals .cart_totals tr td,.woocommerce-checkout .cart-collaterals .cart_totals tr th{border-top:1px solid #ebe9eb}#add_payment_method .cart-collaterals .cross-sells ul.products li.product,.woocommerce-cart .cart-collaterals .cross-sells ul.products li.product,.woocommerce-checkout .cart-collaterals .cross-sells ul.products li.product{margin-top:0}#add_payment_method .checkout .col-2 h3#ship-to-different-address,.woocommerce-cart .checkout .col-2 h3#ship-to-different-address,.woocommerce-checkout .checkout .col-2 h3#ship-to-different-address{float:left;clear:none}#add_payment_method .checkout .col-2 .form-row-first,#add_payment_method .checkout .col-2 .notes,.woocommerce-cart .checkout .col-2 .form-row-first,.woocommerce-cart .checkout .col-2 .notes,.woocommerce-checkout .checkout .col-2 .form-row-first,.woocommerce-checkout .checkout .col-2 .notes{clear:left}#add_payment_method .checkout .create-account small,.woocommerce-cart .checkout .create-account small,.woocommerce-checkout .checkout .create-account small{font-size:11px;color:#777;font-weight:400}#add_payment_method .checkout div.shipping-address,.woocommerce-cart .checkout div.shipping-address,.woocommerce-checkout .checkout div.shipping-address{padding:0;clear:left;width:100%}#add_payment_method #payment ul.payment_methods li:not(.woocommerce-notice)::after,#add_payment_method #payment ul.payment_methods::after,#add_payment_method .checkout .shipping_address,.single-product .twentythirteen p.stars,.woocommerce-cart #payment ul.payment_methods li:not(.woocommerce-notice)::after,.woocommerce-cart #payment ul.payment_methods::after,.woocommerce-cart .checkout .shipping_address,.woocommerce-checkout #payment ul.payment_methods li:not(.woocommerce-notice)::after,.woocommerce-checkout #payment ul.payment_methods::after,.woocommerce-checkout .checkout .shipping_address{clear:both}#add_payment_method #payment,.woocommerce-cart #payment,.woocommerce-checkout #payment{background:#ebe9eb;border-radius:5px}#add_payment_method #payment ul.payment_methods,.woocommerce-cart #payment ul.payment_methods,.woocommerce-checkout #payment ul.payment_methods{text-align:left;padding:1em;border-bottom:1px solid #d3ced2;margin:0;list-style:none}#add_payment_method #payment ul.payment_methods li,.woocommerce-cart #payment ul.payment_methods li,.woocommerce-checkout #payment ul.payment_methods li{line-height:2;text-align:left;margin:0;font-weight:400}#add_payment_method #payment ul.payment_methods li input,.woocommerce-cart #payment ul.payment_methods li input,.woocommerce-checkout #payment ul.payment_methods li input{margin:0 1em 0 0}#add_payment_method #payment ul.payment_methods li img,.woocommerce-cart #payment ul.payment_methods li img,.woocommerce-checkout #payment ul.payment_methods li img{vertical-align:middle;margin:-2px 0 0 .5em;padding:0;position:relative;box-shadow:none}#add_payment_method #payment ul.payment_methods li img+img,.woocommerce-cart #payment ul.payment_methods li img+img,.woocommerce-checkout #payment ul.payment_methods li img+img{margin-left:2px}#add_payment_method #payment div.form-row,.woocommerce-cart #payment div.form-row,.woocommerce-checkout #payment div.form-row{padding:1em}#add_payment_method #payment div.payment_box,.woocommerce-cart #payment div.payment_box,.woocommerce-checkout #payment div.payment_box{position:relative;box-sizing:border-box;width:100%;padding:1em;margin:1em 0;font-size:.92em;border-radius:2px;line-height:1.5;background-color:#dfdcde;color:#515151}#add_payment_method #payment div.payment_box input.input-text,#add_payment_method #payment div.payment_box textarea,.woocommerce-cart #payment div.payment_box input.input-text,.woocommerce-cart #payment div.payment_box textarea,.woocommerce-checkout #payment div.payment_box input.input-text,.woocommerce-checkout #payment div.payment_box textarea{border-color:#bbb3b9 #c7c1c6 #c7c1c6}#add_payment_method #payment div.payment_box ::-webkit-input-placeholder,.woocommerce-cart #payment div.payment_box ::-webkit-input-placeholder,.woocommerce-checkout #payment div.payment_box ::-webkit-input-placeholder{color:#bbb3b9}#add_payment_method #payment div.payment_box :-moz-placeholder,.woocommerce-cart #payment div.payment_box :-moz-placeholder,.woocommerce-checkout #payment div.payment_box :-moz-placeholder{color:#bbb3b9}#add_payment_method #payment div.payment_box :-ms-input-placeholder,.woocommerce-cart #payment div.payment_box :-ms-input-placeholder,.woocommerce-checkout #payment div.payment_box :-ms-input-placeholder{color:#bbb3b9}#add_payment_method #payment div.payment_box .woocommerce-SavedPaymentMethods,.woocommerce-cart #payment div.payment_box .woocommerce-SavedPaymentMethods,.woocommerce-checkout #payment div.payment_box .woocommerce-SavedPaymentMethods{list-style:none;margin:0}#add_payment_method #payment div.payment_box .woocommerce-SavedPaymentMethods .woocommerce-SavedPaymentMethods-new,#add_payment_method #payment div.payment_box .woocommerce-SavedPaymentMethods .woocommerce-SavedPaymentMethods-token,.woocommerce-cart #payment div.payment_box .woocommerce-SavedPaymentMethods .woocommerce-SavedPaymentMethods-new,.woocommerce-cart #payment div.payment_box .woocommerce-SavedPaymentMethods .woocommerce-SavedPaymentMethods-token,.woocommerce-checkout #payment div.payment_box .woocommerce-SavedPaymentMethods .woocommerce-SavedPaymentMethods-new,.woocommerce-checkout #payment div.payment_box .woocommerce-SavedPaymentMethods .woocommerce-SavedPaymentMethods-token{margin:0 0 .5em}#add_payment_method #payment div.payment_box .woocommerce-SavedPaymentMethods .woocommerce-SavedPaymentMethods-new label,#add_payment_method #payment div.payment_box .woocommerce-SavedPaymentMethods .woocommerce-SavedPaymentMethods-token label,.woocommerce-cart #payment div.payment_box .woocommerce-SavedPaymentMethods .woocommerce-SavedPaymentMethods-new label,.woocommerce-cart #payment div.payment_box .woocommerce-SavedPaymentMethods .woocommerce-SavedPaymentMethods-token label,.woocommerce-checkout #payment div.payment_box .woocommerce-SavedPaymentMethods .woocommerce-SavedPaymentMethods-new label,.woocommerce-checkout #payment div.payment_box .woocommerce-SavedPaymentMethods .woocommerce-SavedPaymentMethods-token label{cursor:pointer}#add_payment_method #payment div.payment_box .woocommerce-SavedPaymentMethods .woocommerce-SavedPaymentMethods-tokenInput,.woocommerce-cart #payment div.payment_box .woocommerce-SavedPaymentMethods .woocommerce-SavedPaymentMethods-tokenInput,.woocommerce-checkout #payment div.payment_box .woocommerce-SavedPaymentMethods .woocommerce-SavedPaymentMethods-tokenInput{vertical-align:middle;margin:-3px 1em 0 0;position:relative}#add_payment_method #payment div.payment_box .wc-credit-card-form,.woocommerce-cart #payment div.payment_box .wc-credit-card-form,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form{border:0;padding:0;margin:1em 0 0}#add_payment_method #payment div.payment_box .wc-credit-card-form-card-cvc,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-expiry,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-number,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-cvc,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-expiry,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-number,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-cvc,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-expiry,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-number{font-size:1.5em;padding:8px;background-repeat:no-repeat;background-position:right .618em center;background-size:32px 20px}#add_payment_method #payment div.payment_box .wc-credit-card-form-card-cvc.visa,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-expiry.visa,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-number.visa,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-cvc.visa,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-expiry.visa,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-number.visa,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-cvc.visa,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-expiry.visa,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-number.visa{background-image:url(../images/icons/credit-cards/visa.svg)}#add_payment_method #payment div.payment_box .wc-credit-card-form-card-cvc.mastercard,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-expiry.mastercard,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-number.mastercard,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-cvc.mastercard,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-expiry.mastercard,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-number.mastercard,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-cvc.mastercard,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-expiry.mastercard,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-number.mastercard{background-image:url(../images/icons/credit-cards/mastercard.svg)}#add_payment_method #payment div.payment_box .wc-credit-card-form-card-cvc.laser,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-expiry.laser,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-number.laser,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-cvc.laser,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-expiry.laser,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-number.laser,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-cvc.laser,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-expiry.laser,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-number.laser{background-image:url(../images/icons/credit-cards/laser.svg)}#add_payment_method #payment div.payment_box .wc-credit-card-form-card-cvc.dinersclub,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-expiry.dinersclub,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-number.dinersclub,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-cvc.dinersclub,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-expiry.dinersclub,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-number.dinersclub,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-cvc.dinersclub,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-expiry.dinersclub,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-number.dinersclub{background-image:url(../images/icons/credit-cards/diners.svg)}#add_payment_method #payment div.payment_box .wc-credit-card-form-card-cvc.maestro,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-expiry.maestro,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-number.maestro,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-cvc.maestro,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-expiry.maestro,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-number.maestro,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-cvc.maestro,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-expiry.maestro,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-number.maestro{background-image:url(../images/icons/credit-cards/maestro.svg)}#add_payment_method #payment div.payment_box .wc-credit-card-form-card-cvc.jcb,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-expiry.jcb,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-number.jcb,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-cvc.jcb,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-expiry.jcb,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-number.jcb,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-cvc.jcb,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-expiry.jcb,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-number.jcb{background-image:url(../images/icons/credit-cards/jcb.svg)}#add_payment_method #payment div.payment_box .wc-credit-card-form-card-cvc.amex,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-expiry.amex,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-number.amex,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-cvc.amex,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-expiry.amex,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-number.amex,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-cvc.amex,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-expiry.amex,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-number.amex{background-image:url(../images/icons/credit-cards/amex.svg)}#add_payment_method #payment div.payment_box .wc-credit-card-form-card-cvc.discover,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-expiry.discover,#add_payment_method #payment div.payment_box .wc-credit-card-form-card-number.discover,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-cvc.discover,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-expiry.discover,.woocommerce-cart #payment div.payment_box .wc-credit-card-form-card-number.discover,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-cvc.discover,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-expiry.discover,.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-card-number.discover{background-image:url(../images/icons/credit-cards/discover.svg)}#add_payment_method #payment div.payment_box span.help,.woocommerce-cart #payment div.payment_box span.help,.woocommerce-checkout #payment div.payment_box span.help{font-size:.857em;color:#777;font-weight:400}#add_payment_method #payment div.payment_box .form-row,.woocommerce-cart #payment div.payment_box .form-row,.woocommerce-checkout #payment div.payment_box .form-row{margin:0 0 1em}#add_payment_method #payment div.payment_box p:last-child,.woocommerce-cart #payment div.payment_box p:last-child,.woocommerce-checkout #payment div.payment_box p:last-child{margin-bottom:0}#add_payment_method #payment div.payment_box::before,.woocommerce-cart #payment div.payment_box::before,.woocommerce-checkout #payment div.payment_box::before{content:'';display:block;border:1em solid #dfdcde;border-right-color:transparent;border-left-color:transparent;border-top-color:transparent;position:absolute;top:-.75em;left:0;margin:-1em 0 0 2em}#add_payment_method #payment .payment_method_paypal .about_paypal,.woocommerce-cart #payment .payment_method_paypal .about_paypal,.woocommerce-checkout #payment .payment_method_paypal .about_paypal{float:right;line-height:52px;font-size:.83em}#add_payment_method #payment .payment_method_paypal img,.woocommerce-cart #payment .payment_method_paypal img,.woocommerce-checkout #payment .payment_method_paypal img{max-height:52px;vertical-align:middle}.woocommerce-terms-and-conditions{border:1px solid rgba(0,0,0,.2);box-shadow:inset 0 1px 2px rgba(0,0,0,.1);background:rgba(0,0,0,.05)}.woocommerce-password-strength{text-align:center;font-weight:600;padding:3px .5em;font-size:1em}.woocommerce-password-strength.strong{background-color:#c1e1b9;border-color:#83c373}.woocommerce-password-strength.short{background-color:#f1adad;border-color:#e35b5b}.woocommerce-password-strength.bad{background-color:#fbc5a9;border-color:#f78b53}.woocommerce-password-strength.good{background-color:#ffe399;border-color:#ffc733}.woocommerce-password-hint{margin:.5em 0 0;display:block}#content.twentyeleven .woocommerce-pagination a{font-size:1em;line-height:1}.single-product .twentythirteen #reply-title,.single-product .twentythirteen #respond #commentform,.single-product .twentythirteen .entry-summary{padding:0}.twentythirteen .woocommerce-breadcrumb{padding-top:40px}.twentyfourteen ul.products li.product{margin-top:0!important}body:not(.search-results) .twentysixteen .entry-summary{color:inherit;font-size:inherit;line-height:inherit}.twentysixteen .price ins{background:inherit;color:inherit}
\ No newline at end of file
diff --git a/assets/css/woocommerce.scss b/assets/css/woocommerce.scss
index 2fd25a29184..cdba5d8ec7b 100644
--- a/assets/css/woocommerce.scss
+++ b/assets/css/woocommerce.scss
@@ -7,17 +7,18 @@
 /**
  * Imports
  */
-@import "bourbon";
-@import "mixins";
-@import "variables";
-@import "animation";
-@import "fonts";
+@import 'bourbon';
+@import 'mixins';
+@import 'variables';
+@import 'animation';
+@import 'fonts';
 
 /**
  * Global styles
  */
-p.demo_store {
-	position: fixed;
+p.demo_store,
+.woocommerce-store-notice {
+	position: absolute;
 	top: 0;
 	left: 0;
 	right: 0;
@@ -29,16 +30,17 @@ p.demo_store {
 	background-color: $primary;
 	color: $primarytext;
 	z-index: 99998;
-	box-shadow: 0 1px 1em rgba(0,0,0,0.2);
+	box-shadow: 0 1px 1em rgba(0, 0, 0, 0.2);
+	display: none;
+
 	a {
 		color: $primarytext;
+		text-decoration: underline;
 	}
 }
 
-.admin-bar {
-	p.demo_store {
-		top: 32px;
-	}
+.admin-bar p.demo_store {
+	top: 32px;
 }
 
 /**
@@ -69,81 +71,21 @@ p.demo_store {
 		text-align: center;
 		line-height: 1;
 		border-radius: 100%;
-		color: red !important;
+		color: red !important; // Required for default theme compatibility
 		text-decoration: none;
 		font-weight: 700;
 		border: 0;
 
 		&:hover {
-			color: #fff !important;
+			color: #fff !important; // Required for default theme compatibility
 			background: red;
 		}
 	}
 
-	.woocommerce-message,
-	.woocommerce-error,
-	.woocommerce-info {
-		padding: 1em 2em 1em 3.5em !important;
-		margin: 0 0 2em !important;
-		position: relative;
-		background-color: lighten($secondary,5%);
-		color: $secondarytext;
-		border-top: 3px solid $primary;
-		list-style: none outside !important;
-		@include clearfix();
-		width: auto;
-		word-wrap: break-word;
-
-		&:before {
-			font-family: "WooCommerce";
-			content: "\e028";
-			display: inline-block;
-			position: absolute;
-			top: 1em;
-			left: 1.5em;
-		}
-
-		.button {
-			float: right;
-		}
-
-		li {
-			list-style: none outside !important;
-			padding-left: 0 !important;
-			margin-left: 0 !important;
-		}
-	}
-
-	.woocommerce-message {
-		border-top-color: #8fae1b;
-
-		&:before {
-			content: "\e015";
-			color: #8fae1b;
-		}
-	}
-
-	.woocommerce-info {
-		border-top-color: #1e85be;
-
-		&:before {
-			color: #1e85be;
-		}
-	}
-
-	.woocommerce-error {
-		border-top-color: #b81c23;
-
-		&:before {
-			content: "\e016";
-			color: #b81c23;
-		}
-	}
-
 	small.note {
 		display: block;
 		color: $subtext;
-		font-size: .857em;
+		font-size: 0.857em;
 		margin-top: 10px;
 	}
 
@@ -159,11 +101,9 @@ p.demo_store {
 		}
 	}
 
-	.quantity {
-		.qty {
-			width: 3.631em;
-			text-align: center;
-		}
+	.quantity .qty {
+		width: 3.631em;
+		text-align: center;
 	}
 
 	/**
@@ -223,6 +163,89 @@ p.demo_store {
 			div.thumbnails {
 				padding-top: 1em;
 			}
+
+			&.woocommerce-product-gallery {
+				position: relative;
+			}
+
+			.woocommerce-product-gallery__wrapper {
+				transition: all cubic-bezier(0.795, -0.035, 0.000, 1.000) .5s;
+			}
+
+			.woocommerce-product-gallery__wrapper .zoomImg {
+				background-color: #fff;
+			}
+
+			.woocommerce-product-gallery__image:nth-child(n+2) {
+				width: 25%;
+				display: inline-block;
+			}
+
+			.woocommerce-product-gallery__trigger {
+				position: absolute;
+				top: .5em;
+				right: .5em;
+				font-size: 2em;
+				z-index: 9;
+				width: 36px;
+				height: 36px;
+				background: #fff;
+				text-indent: -9999px;
+				border-radius: 100%;
+				box-sizing: content-box;
+
+				&:before {
+					content: "";
+					display: block;
+					width: 10px;
+					height: 10px;
+					border: 2px solid #000;
+					border-radius: 100%;
+					position: absolute;
+					top: 9px;
+					left: 9px;
+					box-sizing: content-box;
+				}
+
+				&:after {
+					content: "";
+					display: block;
+					width: 2px;
+					height: 8px;
+					background: #000;
+					border-radius: 6px;
+					position: absolute;
+					top: 19px;
+					left: 22px;
+					@include transform(rotate(-45deg));
+					box-sizing: content-box;
+				}
+			}
+
+			.flex-control-thumbs {
+				overflow: hidden;
+				zoom: 1;
+				margin: 0;
+				padding: 0;
+
+				li {
+					width: 25%;
+					float: left;
+					margin: 0;
+					list-style: none;
+
+					img {
+						cursor: pointer;
+						opacity: .5;
+						margin: 0;
+
+						&.flex-active,
+						&:hover {
+							opacity: 1;
+						}
+					}
+				}
+			}
 		}
 
 		div.summary {
@@ -272,7 +295,7 @@ p.demo_store {
 
 					a {
 						display: inline-block;
-						padding: .5em 0;
+						padding: 0.5em 0;
 						font-weight: 700;
 						color: $secondarytext;
 						text-decoration: none;
@@ -293,26 +316,26 @@ p.demo_store {
 							text-shadow: inherit;
 						}
 
-						&:before {
+						&::before {
 							box-shadow: 2px 2px 0 $contentbg;
 						}
 
-						&:after {
+						&::after {
 							box-shadow: -2px 2px 0 $contentbg;
 						}
 					}
 
-					&:before,
-					&:after {
+					&::before,
+					&::after {
 						border: 1px solid darken( $secondary, 10% );
 						position: absolute;
 						bottom: -1px;
 						width: 5px;
 						height: 5px;
-						content: " ";
+						content: ' ';
 					}
 
-					&:before {
+					&::before {
 						left: -6px;
 						-webkit-border-bottom-right-radius: 4px;
 						-moz-border-bottom-right-radius: 4px;
@@ -321,7 +344,7 @@ p.demo_store {
 						box-shadow: 2px 2px 0 $secondary;
 					}
 
-					&:after {
+					&::after {
 						right: -6px;
 						-webkit-border-bottom-left-radius: 4px;
 						-moz-border-bottom-left-radius: 4px;
@@ -331,9 +354,9 @@ p.demo_store {
 					}
 				}
 
-				&:before {
+				&::before {
 					position: absolute;
-					content: " ";
+					content: ' ';
 					width: 100%;
 					bottom: 0;
 					left: 0;
@@ -363,7 +386,7 @@ p.demo_store {
 			}
 
 			table {
-				border-width: 0 0 1px 0;
+				border-width: 0 0 1px;
 
 				td {
 					padding-left: 0;
@@ -408,10 +431,8 @@ p.demo_store {
 				}
 			}
 
-			.woocommerce-variation-description {
-				p {
-					margin-bottom: 1em;
-				}
+			.woocommerce-variation-description p {
+				margin-bottom: 1em;
 			}
 
 			.reset_variations {
@@ -436,9 +457,21 @@ p.demo_store {
 
 				td {
 					vertical-align: top;
-					padding-bottom: .5em;
+					padding-bottom: 0.5em;
 					border: 0;
 				}
+
+				td:first-child {
+					width: 4em;
+					text-align: center;
+				}
+
+				.wc-grouped-product-add-to-cart-checkbox {
+					display: inline-block;
+					width: auto;
+					margin: 0 auto;
+					transform:scale(1.5, 1.5);
+				}
 			}
 		}
 	}
@@ -446,20 +479,21 @@ p.demo_store {
 	span.onsale {
 		min-height: 3.236em;
 		min-width: 3.236em;
-		padding: .202em;
+		padding: 0.202em;
 		font-size: 1em;
 		font-weight: 700;
 		position: absolute;
 		text-align: center;
 		line-height: 3.236;
-		top: -.5em;
-		left: -.5em;
+		top: -0.5em;
+		left: -0.5em;
 		margin: 0;
 		border-radius: 100%;
 		background-color: $highlight;
 		color: $highlightext;
-		font-size: .857em;
+		font-size: 0.857em;
 		-webkit-font-smoothing: antialiased;
+		z-index: 9;
 	}
 
 	/**
@@ -478,69 +512,69 @@ p.demo_store {
 		}
 	}
 
-	ul.products {
-		li.product {
-			.onsale {
-				top: 0;
-				right: 0;
-				left: auto;
-				margin: -.5em -.5em 0 0;
-			}
+	ul.products li.product {
+		.onsale {
+			top: 0;
+			right: 0;
+			left: auto;
+			margin: -0.5em -0.5em 0 0;
+		}
 
-			h3 {
-				padding: .5em 0;
-				margin: 0;
-				font-size: 1em;
-			}
+		h3,
+		.woocommerce-loop-product__title,
+		.woocommerce-loop-category__title {
+			padding: 0.5em 0;
+			margin: 0;
+			font-size: 1em;
+		}
 
-			a {
-				text-decoration: none;
-			}
+		a {
+			text-decoration: none;
+		}
 
-			a img {
-				width: 100%;
-				height: auto;
-				display: block;
-				margin: 0 0 1em;
-				box-shadow: none;
-			}
+		a img {
+			width: 100%;
+			height: auto;
+			display: block;
+			margin: 0 0 1em;
+			box-shadow: none;
+		}
 
-			strong {
+		strong {
+			display: block;
+		}
+
+		.star-rating {
+			font-size: 0.857em;
+		}
+
+		.button {
+			margin-top: 1em;
+		}
+
+		.price {
+			color: $highlight;
+			display: block;
+			font-weight: normal;
+			margin-bottom: 0.5em;
+			font-size: 0.857em;
+
+			del {
+				color: inherit;
+				opacity: 0.5;
 				display: block;
 			}
 
-			.star-rating {
-				font-size: .857em;
+			ins {
+				background: none;
+				font-weight: 700;
 			}
 
-			.button {
-				margin-top: 1em;
-			}
-
-			.price {
-				color: $highlight;
-				display: block;
-				font-weight: normal;
-				margin-bottom: .5em;
-				font-size: .857em;
-
-				del {
-					color: inherit;
-					opacity: 0.5;
-					display: block;
-				}
-
-				ins {
-					background: none;
-					font-weight: 700;
-				}
-
-				.from {
-					font-size: 0.67em;
-					margin: -2px 0 0 0;
-					text-transform: uppercase;
-					color: rgba(desaturate($highlight, 75%), 0.5);
-				}
+			.from {
+				font-size: 0.67em;
+				margin: -2px 0 0 0;
+				text-transform: uppercase;
+				color: rgba(desaturate($highlight, 75%), 0.5);
 			}
 		}
 	}
@@ -585,7 +619,7 @@ p.demo_store {
 					line-height: 1;
 					font-size: 1em;
 					font-weight: normal;
-					padding: .5em;
+					padding: 0.5em;
 					min-width: 1em;
 					display: block;
 				}
@@ -612,10 +646,9 @@ p.demo_store {
 		line-height: 1;
 		cursor: pointer;
 		position: relative;
-		font-family: inherit;
 		text-decoration: none;
 		overflow: visible;
-		padding: .618em 1em;
+		padding: 0.618em 1em;
 		font-weight: 700;
 		border-radius: 3px;
 		left: auto;
@@ -633,28 +666,26 @@ p.demo_store {
 			opacity: 0.25;
 			padding-right: 2.618em;
 
-			&:after {
-				font-family: "WooCommerce";
-				content: "\e01c";
+			&::after {
+				font-family: 'WooCommerce';
+				content: '\e01c';
 				vertical-align: top;
 				-webkit-font-smoothing: antialiased;
 				font-weight: 400;
 				position: absolute;
-				top: .618em;
+				top: 0.618em;
 				right: 1em;
 				-webkit-animation: spin 2s linear infinite;
-			    -moz-animation: spin 2s linear infinite;
-			    animation: spin 2s linear infinite;
+				-moz-animation: spin 2s linear infinite;
+				animation: spin 2s linear infinite;
 			}
 		}
 
-		&.added {
-			&:after {
-				font-family: 'WooCommerce';
-				content: "\e017";
-				margin-left: .53em;
-				vertical-align: bottom;
-			}
+		&.added::after {
+			font-family: 'WooCommerce';
+			content: '\e017';
+			margin-left: 0.53em;
+			vertical-align: bottom;
 		}
 
 		&:hover {
@@ -691,6 +722,7 @@ p.demo_store {
 			color: inherit;
 			cursor: not-allowed;
 			opacity: 0.5;
+			padding: 0.618em 1em;
 
 			&:hover {
 				color: inherit;
@@ -705,7 +737,7 @@ p.demo_store {
 	}
 
 	a.added_to_cart {
-		padding-top: .5em;
+		padding-top: 0.5em;
 		white-space: nowrap;
 		display: inline-block;
 	}
@@ -718,7 +750,7 @@ p.demo_store {
 			float: right;
 			color: $subtext;
 			font-size: 15px;
-			margin: 10px 0 0 0;
+			margin: 10px 0 0;
 
 			a {
 				text-decoration: none;
@@ -817,8 +849,8 @@ p.demo_store {
 				}
 			}
 
-			.commentlist > li:before {
-				content: "";
+			.commentlist > li::before {
+				content: '';
 			}
 		}
 	}
@@ -836,8 +868,8 @@ p.demo_store {
 		width: 5.4em;
 		font-family: 'star';
 
-		&:before {
-			content: "\73\73\73\73\73";
+		&::before {
+			content: '\73\73\73\73\73';
 			color: darken( $secondary, 10% );
 			float: left;
 			top: 0;
@@ -854,8 +886,8 @@ p.demo_store {
 			padding-top: 1.5em;
 		}
 
-		span:before {
-			content: "\53\53\53\53\53";
+		span::before {
+			content: '\53\53\53\53\53';
 			top: 0;
 			position: absolute;
 			left: 0;
@@ -868,49 +900,41 @@ p.demo_store {
 		display: block;
 
 		.star-rating {
-			margin: .5em 4px 0 0;
+			margin: 0.5em 4px 0 0;
 			float: left;
 		}
 	}
 
-	.products {
-		.star-rating {
-			display: block;
-			margin: 0 0 .5em;
-			float: none;
-		}
+	.products .star-rating {
+		display: block;
+		margin: 0 0 0.5em;
+		float: none;
 	}
 
-	.hreview-aggregate {
-		.star-rating {
-			margin: 10px 0 0 0;
-		}
+	.hreview-aggregate .star-rating {
+		margin: 10px 0 0;
 	}
 
-	#review_form {
-		#respond {
-			@include clearfix();
-			position: static;
-			margin: 0;
-			width: auto;
-			padding: 0 0 0;
-			background: transparent none;
-			border: 0;
+	#review_form #respond {
+		@include clearfix();
+		position: static;
+		margin: 0;
+		width: auto;
+		padding: 0;
+		background: transparent none;
+		border: 0;
 
-			p {
-				margin: 0 0 10px;
-			}
+		p {
+			margin: 0 0 10px;
+		}
 
-			.form-submit {
-				input {
-					left: auto;
-				}
-			}
+		.form-submit input {
+			left: auto;
+		}
 
-			textarea {
-				box-sizing: border-box;
-				width: 100%;
-			}
+		textarea {
+			box-sizing: border-box;
+			width: 100%;
 		}
 	}
 
@@ -923,7 +947,7 @@ p.demo_store {
 			display: inline-block;
 			text-decoration: none;
 
-			&:before {
+			&::before {
 				display: block;
 				position: absolute;
 				top: 0;
@@ -931,41 +955,33 @@ p.demo_store {
 				width: 1em;
 				height: 1em;
 				line-height: 1;
-				font-family: "WooCommerce";
-				content: "\e021";
+				font-family: 'WooCommerce';
+				content: '\e021';
 				text-indent: 0;
 			}
 
-			&:hover {
-				~ a:before {
-					content: "\e021";
-				}
+			&:hover ~ a::before {
+				content: '\e021';
 			}
 		}
 
-		&:hover {
-			a {
-				&:before {
-					content: "\e020";
-				}
-			}
+		&:hover a::before {
+			content: '\e020';
 		}
 
 		&.selected {
 			a.active {
-				&:before {
-					content: "\e020";
+				&::before {
+					content: '\e020';
 				}
 
-				~ a:before {
-					content: "\e021";
+				~ a::before {
+					content: '\e021';
 				}
 			}
 
-			a:not(.active) {
-				&:before {
-					content: "\e020";
-				}
+			a:not( .active )::before {
+				content: '\e020';
 			}
 		}
 	}
@@ -975,7 +991,7 @@ p.demo_store {
 	 */
 	table.shop_attributes {
 		border: 0;
-		border-top: 1px dotted rgba(0,0,0,0.1);
+		border-top: 1px dotted rgba(0, 0, 0, 0.1);
 		margin-bottom: 1.618em;
 		width: 100%;
 
@@ -984,7 +1000,7 @@ p.demo_store {
 			font-weight: 700;
 			padding: 8px;
 			border-top: 0;
-			border-bottom: 1px dotted rgba(0,0,0,0.1);
+			border-bottom: 1px dotted rgba(0, 0, 0, 0.1);
 			margin: 0;
 			line-height: 1.5;
 		}
@@ -993,7 +1009,7 @@ p.demo_store {
 			font-style: italic;
 			padding: 0;
 			border-top: 0;
-			border-bottom: 1px dotted rgba(0,0,0,0.1);
+			border-bottom: 1px dotted rgba(0, 0, 0, 0.1);
 			margin: 0;
 			line-height: 1.5;
 
@@ -1003,15 +1019,15 @@ p.demo_store {
 			}
 		}
 
-		.alt td,
-		.alt th {
-			background: rgba(0,0,0,0.025);
+		tr:nth-child(even) td,
+		tr:nth-child(even) th {
+			background: rgba(0, 0, 0, 0.025);
 		}
 	}
 
 	table.shop_table {
-		border: 1px solid rgba(0,0,0,0.1);
-		margin: 0px -1px 24px 0px;
+		border: 1px solid rgba(0, 0, 0, 0.1);
+		margin: 0 -1px 24px 0;
 		text-align: left;
 		width: 100%;
 		border-collapse: separate;
@@ -1023,7 +1039,7 @@ p.demo_store {
 		}
 
 		td {
-			border-top: 1px solid rgba(0,0,0,0.1);
+			border-top: 1px solid rgba(0, 0, 0, 0.1);
 			padding: 6px 12px;
 			vertical-align: middle;
 
@@ -1032,12 +1048,10 @@ p.demo_store {
 			}
 		}
 
-		tbody:first-child {
-			tr:first-child {
-				th,
-				td {
-					border-top: 0;
-				}
+		tbody:first-child tr:first-child {
+			th,
+			td {
+				border-top: 0;
 			}
 		}
 
@@ -1045,7 +1059,7 @@ p.demo_store {
 		tfoot th,
 		tbody th {
 			font-weight: 700;
-			border-top: 1px solid rgba(0,0,0,0.1);
+			border-top: 1px solid rgba(0, 0, 0, 0.1);
 		}
 	}
 
@@ -1066,36 +1080,49 @@ p.demo_store {
 			text-align: right;
 
 			.button {
-				margin: .125em 0 .125em .25em;
+				margin: 0.125em 0 0.125em 0.25em;
+			}
+		}
+	}
+
+	table.woocommerce-MyAccount-downloads {
+		td,
+		th {
+			vertical-align: top;
+			text-align: center;
+
+			&:first-child {
+				text-align: left;
+			}
+			&:last-child {
+				text-align: left;
+			}
+			.woocommerce-MyAccount-downloads-file::before {
+				content: '\2193';
+				display: inline-block;
 			}
 		}
 	}
 
 	td.product-name {
-		dl.variation {
-			margin: .25em 0;
-			@include clearfix();
+		dl.variation, .wc-item-meta {
+			list-style: none outside;
 
-			dt,
-			dd {
-				display: inline-block;
+			dt, .wc-item-meta-label {
 				float: left;
-				margin-bottom: 1em;
-			}
-
-			dt {
-				font-weight: 700;
-				padding: 0 0 .25em 0;
-				margin: 0 4px 0 0;
-				clear: left;
+				clear: both;
+				margin-right: .25em;
+				display: inline-block;
+				list-style: none outside;
 			}
 
 			dd {
-				padding: 0 0 .25em 0;
+				margin: 0;
+			}
 
-				p:last-child {
-					margin-bottom: 0;
-				}
+			p,
+			&:last-child {
+				margin-bottom: 0;
 			}
 		}
 
@@ -1108,7 +1135,6 @@ p.demo_store {
 		min-width: 80px;
 	}
 
-
 	/**
 	 * Cart sidebar
 	 */
@@ -1140,7 +1166,7 @@ p.demo_store {
 			dl {
 				margin: 0;
 				padding-left: 1em;
-				border-left: 2px solid rgba(0,0,0,0.1);
+				border-left: 2px solid rgba(0, 0, 0, 0.1);
 				@include clearfix();
 
 				dt,
@@ -1152,13 +1178,13 @@ p.demo_store {
 
 				dt {
 					font-weight: 700;
-					padding: 0 0 .25em 0;
+					padding: 0 0 0.25em;
 					margin: 0 4px 0 0;
 					clear: left;
 				}
 
 				dd {
-					padding: 0 0 .25em 0;
+					padding: 0 0 0.25em;
 
 					p:last-child {
 						margin-bottom: 0;
@@ -1184,123 +1210,123 @@ p.demo_store {
 			}
 		}
 
-		.cart_list {
-			li {
-				padding-left: 2em;
-				position: relative;
-				padding-top: 0;
+		.cart_list li {
+			padding-left: 2em;
+			position: relative;
+			padding-top: 0;
 
-				a.remove {
-					position: absolute;
-					top: 0;
-					left: 0;
-				}
+			a.remove {
+				position: absolute;
+				top: 0;
+				left: 0;
 			}
 		}
 
 		.buttons {
 			@include clearfix();
+			a {
+				margin-right: 5px;
+				margin-bottom: 5px;
+			}
 		}
 	}
 
 	/**
 	 * Forms
 	 */
-	form {
-		.form-row {
-			padding: 3px;
-			margin: 0 0 6px;
+	form .form-row {
+		padding: 3px;
+		margin: 0 0 6px;
 
-			[placeholder]:focus::-webkit-input-placeholder {
-				-webkit-transition: opacity 0.5s 0.5s ease;
-				-moz-transition: opacity 0.5s 0.5s ease;
-				transition: opacity 0.5s 0.5s ease;
-				opacity: 0;
-			}
+		[placeholder]:focus::-webkit-input-placeholder {
+			-webkit-transition: opacity 0.5s 0.5s ease;
+			-moz-transition: opacity 0.5s 0.5s ease;
+			transition: opacity 0.5s 0.5s ease;
+			opacity: 0;
+		}
 
+		label {
+			line-height: 2;
+		}
+
+		label.hidden {
+			visibility: hidden;
+		}
+
+		label.inline {
+			display: inline;
+		}
+
+		select {
+			cursor: pointer;
+			margin: 0;
+		}
+
+		.required {
+			color: red;
+			font-weight: 700;
+			border: 0;
+		}
+
+		.input-checkbox {
+			display: inline;
+			margin: -2px 8px 0 0;
+			text-align: center;
+			vertical-align: middle;
+		}
+
+		input.input-text,
+		textarea {
+			box-sizing: border-box;
+			width: 100%;
+			margin: 0;
+			outline: 0;
+			line-height: 1;
+		}
+
+		textarea {
+			height: 4em;
+			line-height: 1.5;
+			display: block;
+			-moz-box-shadow: none;
+			-webkit-box-shadow: none;
+			box-shadow: none;
+		}
+
+		.select2-container {
+			width: 100%;
+			line-height: 2em;
+		}
+
+		&.woocommerce-invalid {
 			label {
-				line-height: 2;
+				color: $red;
 			}
-
-			label.hidden {
-				visibility: hidden;
-			}
-
-			label.inline {
-				display: inline;
-			}
-
-			select {
-				cursor: pointer;
-				margin: 0;
-			}
-
-			.required {
-				color: red;
-				font-weight: 700;
-				border: 0;
-			}
-
-			.input-checkbox {
-				display: inline;
-				margin: -2px 8px 0 0;
-				text-align: center;
-				vertical-align: middle;
-			}
-
+			.select2-container,
 			input.input-text,
-			textarea {
-				box-sizing: border-box;
-				width: 100%;
-				margin: 0;
-				outline: 0;
-				line-height: 1;
+			select {
+				border-color: $red;
 			}
+		}
 
-			textarea {
-				height: 4em;
-				line-height: 1.5;
-				display: block;
-				-moz-box-shadow: none;
-				-webkit-box-shadow: none;
-				box-shadow: none;
+		&.woocommerce-validated {
+			.select2-container,
+			input.input-text,
+			select {
+				border-color: $green - #111;
 			}
+		}
 
-			.select2-container {
-				width: 100%;
-				line-height: 2em;
-			}
+		::-webkit-input-placeholder {
+			line-height: normal;
+		}
 
-			&.woocommerce-invalid {
-				label {
-					color: $red;
-				}
-				.select2-container,
-				input.input-text,
-				select {
-					border-color: $red;
-				}
-			}
+		:-moz-placeholder {
+			line-height: normal;
+		}
 
-			&.woocommerce-validated {
-				.select2-container,
-				input.input-text,
-				select {
-					border-color: $green - #111;
-				}
-			}
-
-			::-webkit-input-placeholder {
-				line-height: normal;
-			}
-
-			:-moz-placeholder {
-				line-height: normal;
-			}
-
-			:-ms-input-placeholder {
-				line-height: normal;
-			}
+		:-ms-input-placeholder {
+			line-height: normal;
 		}
 	}
 
@@ -1309,7 +1335,7 @@ p.demo_store {
 	form.register {
 		border: 1px solid darken( $secondary, 10% );
 		padding: 20px;
-		margin: 2em 0 2em 0px;
+		margin: 2em 0;
 		text-align: left;
 		border-radius: 5px;
 	}
@@ -1321,9 +1347,15 @@ p.demo_store {
 
 		li {
 			margin: 0;
-			padding: .25em 0 .25em 22px;
+			padding: 0.25em 0 0.25em 22px;
 			text-indent: -22px;
 			list-style: none outside;
+			input {
+				margin: 3px 0.5ex;
+			}
+			label {
+				display: inline;
+			}
 		}
 
 		.amount {
@@ -1338,9 +1370,9 @@ p.demo_store {
 	/**
 	 * Order page
 	 */
-	.order_details {
+	ul.order_details {
 		@include clearfix();
-		margin: 0 0 1.5em;
+		margin: 0 0 3em;
 		list-style: none;
 
 		li {
@@ -1353,6 +1385,7 @@ p.demo_store {
 			padding-right: 2em;
 			margin-left: 0;
 			padding-left: 0;
+			list-style-type: none;
 
 			strong {
 				display: block;
@@ -1367,59 +1400,55 @@ p.demo_store {
 		}
 	}
 
+	.wc-bacs-bank-details-account-name {
+		font-weight: bold;
+	}
+
 	/**
 	 * Layered nav widget
 	 */
-	.widget_layered_nav {
-		ul {
-			margin: 0;
-			padding: 0;
-			border: 0;
-			list-style: none outside;
+	.widget_layered_nav ul {
+		margin: 0;
+		padding: 0;
+		border: 0;
+		list-style: none outside;
 
-			li {
-				@include clearfix();
-				padding: 0 0 1px;
-				list-style: none;
+		li {
+			@include clearfix();
+			padding: 0 0 1px;
+			list-style: none;
 
-				a,
-				span {
-					padding: 1px 0;
-				}
+			a,
+			span {
+				padding: 1px 0;
 			}
+		}
 
-			li.chosen {
-				a {
-					&:before {
-						@include iconbefore( "\e013" );
-						color: $red;
-					}
-				}
-			}
+		li.chosen a::before {
+			@include iconbefore( '\e013' );
+			color: $red;
 		}
 	}
 
-	.widget_layered_nav_filters {
-		ul {
-			margin: 0;
-			padding: 0;
-			border: 0;
-			list-style: none outside;
-			overflow: hidden;
-			zoom: 1;
+	.widget_layered_nav_filters ul {
+		margin: 0;
+		padding: 0;
+		border: 0;
+		list-style: none outside;
+		overflow: hidden;
+		zoom: 1;
 
-			li {
-				float: left;
-				padding: 0 1px 1px 0;
-				list-style: none;
+		li {
+			float: left;
+			padding: 0 1px 1px 0;
+			list-style: none;
 
-				a {
-					text-decoration: none;
+			a {
+				text-decoration: none;
 
-					&:before {
-						@include iconbefore( "\e013" );
-						color: $red;
-					}
+				&::before {
+					@include iconbefore( '\e013' );
+					color: $red;
 				}
 			}
 		}
@@ -1440,9 +1469,6 @@ p.demo_store {
 
 			.button {
 				font-size: 1.15em;
-			}
-
-			.button {
 				float: left;
 			}
 		}
@@ -1450,8 +1476,8 @@ p.demo_store {
 		.ui-slider {
 			position: relative;
 			text-align: left;
-			margin-left: .5em;
-			margin-right: .5em;
+			margin-left: 0.5em;
+			margin-right: 0.5em;
 		}
 
 		.ui-slider .ui-slider-handle {
@@ -1463,17 +1489,15 @@ p.demo_store {
 			border-radius: 1em;
 			cursor: ew-resize;
 			outline: none;
-			top: -.3em;
-
-			//&:last-child {
-				margin-left: -.5em;
-			//}
+			top: -0.3em;
+			/* rtl:ignore */
+			margin-left: -0.5em;
 		}
 
 		.ui-slider .ui-slider-range {
 			position: absolute;
 			z-index: 1;
-			font-size: .7em;
+			font-size: 0.7em;
 			display: block;
 			border: 0;
 			border-radius: 1em;
@@ -1487,7 +1511,7 @@ p.demo_store {
 		}
 
 		.ui-slider-horizontal {
-			height: .5em;
+			height: 0.5em;
 		}
 
 		.ui-slider-horizontal .ui-slider-range {
@@ -1503,39 +1527,175 @@ p.demo_store {
 			right: -1px;
 		}
 	}
+
+	/**
+	 * Rating Filter Widget
+	 */
+	.widget_rating_filter ul {
+		margin: 0;
+		padding: 0;
+		border: 0;
+		list-style: none outside;
+
+		li {
+			@include clearfix();
+			padding: 0 0 1px;
+			list-style: none;
+
+			a {
+				padding: 1px 0;
+				text-decoration: none;
+			}
+
+			.star-rating {
+				float: none;
+				display: inline-block;
+			}
+		}
+
+		li.chosen a::before {
+			@include iconbefore( '\e013' );
+			color: $red;
+		}
+	}
+}
+
+/**
+ * Photoswipe
+ * 1. These styles are required to overwrite default theme button styles (Twenty Twelve adds gradients via background-image).
+ * 2. For zooming on mobile.
+ */
+.pswp {
+	z-index: 999999;
+}
+
+.woocommerce img.pswp__img,
+.woocommerce-page img.pswp__img {
+	max-width: none; /* 2 */
+}
+
+button.pswp__button {
+	box-shadow: none !important;
+	background-image: url('photoswipe/default-skin/default-skin.png') !important;
+}
+
+button.pswp__button,
+button.pswp__button:hover,
+button.pswp__button--arrow--left::before,
+button.pswp__button--arrow--right::before {
+	background-color: transparent !important; /* 1 */
+}
+
+button.pswp__button--arrow--left,
+button.pswp__button--arrow--right,
+button.pswp__button--arrow--left:hover,
+button.pswp__button--arrow--right:hover {
+	background-image: none !important; /* 1 */
+}
+
+button.pswp__button--close:hover {
+	background-position: 0 -44px;
+}
+
+button.pswp__button--zoom:hover {
+	background-position: -88px 0;
+}
+
+.woocommerce-message,
+.woocommerce-error,
+.woocommerce-info {
+	padding: 1em 2em 1em 3.5em;
+	margin: 0 0 2em;
+	position: relative;
+	background-color: lighten($secondary, 5%);
+	color: $secondarytext;
+	border-top: 3px solid $primary;
+	list-style: none outside;
+	@include clearfix();
+	width: auto;
+	word-wrap: break-word;
+
+	&::before {
+		font-family: 'WooCommerce';
+		content: '\e028';
+		display: inline-block;
+		position: absolute;
+		top: 1em;
+		left: 1.5em;
+	}
+
+	.button {
+		float: right;
+	}
+
+	li {
+		list-style: none outside !important; // Required for default theme compatibility
+		padding-left: 0 !important; // Required for default theme compatibility
+		margin-left: 0 !important; // Required for default theme compatibility
+	}
+}
+
+/**
+ * Right to left styles
+ */
+.rtl.woocommerce div.product div.images .flex-control-thumbs li {
+	float: right;
+}
+
+.woocommerce-message {
+	border-top-color: #8fae1b;
+
+	&::before {
+		content: '\e015';
+		color: #8fae1b;
+	}
+}
+
+.woocommerce-info {
+	border-top-color: #1e85be;
+
+	&::before {
+		color: #1e85be;
+	}
+}
+
+.woocommerce-error {
+	border-top-color: #b81c23;
+
+	&::before {
+		content: '\e016';
+		color: #b81c23;
+	}
 }
 
 /**
  * Account page
  */
 .woocommerce-account {
-	.addresses {
-		.title {
-			@include clearfix();
+	.woocommerce {
+		@include clearfix();
+	}
 
-			h3 {
-				float: left;
-			}
+	.addresses .title {
+		@include clearfix();
 
-			.edit {
-				float: right;
-			}
+		h3 {
+			float: left;
+		}
+
+		.edit {
+			float: right;
 		}
 	}
 
-	ol.commentlist.notes {
-		li.note {
+	ol.commentlist.notes li.note {
+		p.meta {
+			font-weight: 700;
+			margin-bottom: 0;
+		}
 
-			p.meta {
-				font-weight: 700;
-				margin-bottom: 0;
-			}
-
-			.description {
-				p:last-child {
-					margin-bottom: 0;
-				}
-			}
+		.description p:last-child {
+			margin-bottom: 0;
 		}
 	}
 	ul.digital-downloads {
@@ -1547,8 +1707,8 @@ p.demo_store {
 			margin-left: 0;
 			padding-left: 0;
 
-			&:before {
-				@include iconbefore( "\e00a" );
+			&::before {
+				@include iconbefore( '\e00a' );
 			}
 
 			.count {
@@ -1559,9 +1719,11 @@ p.demo_store {
 }
 
 /**
- * Cart page
+ * Cart/checkout page
  */
-.woocommerce-cart {
+.woocommerce-cart,
+.woocommerce-checkout,
+#add_payment_method {
 	table.cart {
 		.product-thumbnail {
 			min-width: 32px;
@@ -1577,20 +1739,16 @@ p.demo_store {
 			vertical-align: middle;
 		}
 
-		td.actions {
-			.coupon {
-				.input-text {
-					float: left;
-					-webkit-box-sizing: border-box;
-					-moz-box-sizing: border-box;
-					box-sizing: border-box;
-					border: 1px solid darken( $secondary, 10% );
-					padding: 6px 6px 5px;
-					margin: 0 4px 0 0;
-					outline: 0;
-					line-height: 1;
-				}
-			}
+		td.actions .coupon .input-text {
+			float: left;
+			-webkit-box-sizing: border-box;
+			-moz-box-sizing: border-box;
+			box-sizing: border-box;
+			border: 1px solid darken( $secondary, 10% );
+			padding: 6px 6px 5px;
+			margin: 0 4px 0 0;
+			outline: 0;
+			line-height: 1;
 		}
 
 		input {
@@ -1621,19 +1779,15 @@ p.demo_store {
 				display: block;
 			}
 
-			.shipping-calculator-button {
-				&:after {
-					@include iconafter( "\e019" );
-				}
+			.shipping-calculator-button::after {
+				@include iconafter( '\e019' );
 			}
 		}
 
 		.cart_totals {
-			p {
-				small {
-					color: $subtext;
-					font-size: 0.83em;
-				}
+			p small {
+				color: $subtext;
+				font-size: 0.83em;
 			}
 
 			table {
@@ -1679,20 +1833,10 @@ p.demo_store {
 			}
 		}
 
-		.cross-sells {
-			ul.products {
-				li.product {
-					margin-top: 0;
-				}
-			}
+		.cross-sells ul.products li.product {
+			margin-top: 0;
 		}
 	}
-}
-
-/**
- * Checkout
- */
-.woocommerce-checkout {
 	.checkout {
 		.col-2 {
 			h3#ship-to-different-address {
@@ -1743,7 +1887,6 @@ p.demo_store {
 				text-align: left;
 				margin: 0;
 				font-weight: normal;
-				@include clearfix;
 
 				input {
 					margin: 0 1em 0 0;
@@ -1751,7 +1894,7 @@ p.demo_store {
 
 				img {
 					vertical-align: middle;
-					margin: -2px 0 0 .5em;
+					margin: -2px 0 0 0.5em;
 					padding: 0;
 					position: relative;
 					box-shadow: none;
@@ -1761,6 +1904,10 @@ p.demo_store {
 					margin-left: 2px;
 				}
 			}
+
+			li:not(.woocommerce-notice) {
+				@include clearfix;
+			}
 		}
 
 		div.form-row {
@@ -1772,7 +1919,7 @@ p.demo_store {
 			box-sizing: border-box;
 			width: 100%;
 			padding: 1em;
-			margin: 1em 0 1em 0;
+			margin: 1em 0;
 			font-size: 0.92em;
 			border-radius: 2px;
 			line-height: 1.5;
@@ -1796,48 +1943,71 @@ p.demo_store {
 				color: darken( $secondary, 20% );
 			}
 
+			.woocommerce-SavedPaymentMethods {
+				list-style: none outside;
+				margin: 0;
+				.woocommerce-SavedPaymentMethods-token,
+				.woocommerce-SavedPaymentMethods-new {
+					margin: 0 0 0.5em;
+					label {
+						cursor: pointer;
+					}
+				}
+				.woocommerce-SavedPaymentMethods-tokenInput {
+					vertical-align: middle;
+					margin: -3px 1em 0 0;
+					position: relative;
+				}
+			}
+
+			.wc-credit-card-form {
+				border: 0;
+				padding: 0;
+				margin: 1em 0 0;
+			}
 			.wc-credit-card-form-card-number,
 			.wc-credit-card-form-card-expiry,
 			.wc-credit-card-form-card-cvc {
 				font-size: 1.5em;
 				padding: 8px;
 				background-repeat: no-repeat;
-				background-position: right;
+				background-position: right 0.618em center;
+				background-size: 32px 20px;
 
 				&.visa {
-					background-image: url(../images/icons/credit-cards/visa.png);
+					background-image: url('../images/icons/credit-cards/visa.svg');
 				}
 
 				&.mastercard {
-					background-image: url(../images/icons/credit-cards/mastercard.png);
+					background-image: url('../images/icons/credit-cards/mastercard.svg');
 				}
 
 				&.laser {
-					background-image: url(../images/icons/credit-cards/laser.png);
+					background-image: url('../images/icons/credit-cards/laser.svg');
 				}
 
 				&.dinersclub {
-					background-image: url(../images/icons/credit-cards/diners.png);
+					background-image: url('../images/icons/credit-cards/diners.svg');
 				}
 
 				&.maestro {
-					background-image: url(../images/icons/credit-cards/maestro.png);
+					background-image: url('../images/icons/credit-cards/maestro.svg');
 				}
 
 				&.jcb {
-					background-image: url(../images/icons/credit-cards/jcb.png);
+					background-image: url('../images/icons/credit-cards/jcb.svg');
 				}
 
 				&.amex {
-					background-image: url(../images/icons/credit-cards/amex.png);
+					background-image: url('../images/icons/credit-cards/amex.svg');
 				}
 				&.discover {
-					background-image: url(../images/icons/credit-cards/discover.png);
+					background-image: url('../images/icons/credit-cards/discover.svg');
 				}
 			}
 
 			span.help {
-				font-size: .857em;
+				font-size: 0.857em;
 				color: $subtext;
 				font-weight: normal;
 			}
@@ -1850,15 +2020,15 @@ p.demo_store {
 				margin-bottom: 0;
 			}
 
-			&:before {
-				content: "";
+			&::before {
+				content: '';
 				display: block;
 				border: 1em solid darken( $secondary, 5% ); /* arrow size / color */
 				border-right-color: transparent;
 				border-left-color: transparent;
 				border-top-color: transparent;
 				position: absolute;
-				top: -.75em;
+				top: -0.75em;
 				left: 0;
 				margin: -1em 0 0 2em;
 			}
@@ -1879,13 +2049,20 @@ p.demo_store {
 	}
 }
 
+.woocommerce-terms-and-conditions {
+	border: 1px solid rgba(0,0,0,.2);
+	box-shadow: inset 0 1px 2px rgba(0,0,0,.1);
+	background: rgba(0,0,0,.05);
+}
+
 /**
- *  Password strength meter
+ * Password strength meter
  */
 .woocommerce-password-strength {
 	text-align: center;
 	font-weight: 600;
-	padding: 3px 0px 3px 0px;
+	padding: 3px 0.5em;
+	font-size: 1em;
 
 	&.strong {
 		background-color: #c1e1b9;
@@ -1908,75 +2085,55 @@ p.demo_store {
 	}
 }
 
-/* added to get around variation image flicker issue */
-.product.has-default-attributes.has-children {
-	> .images {
-		opacity: 0;
-	}
+.woocommerce-password-hint {
+	margin: 0.5em 0 0;
+	display: block;
 }
 
 /**
  * Twenty Eleven specific styles
  */
-#content.twentyeleven {
-	.woocommerce-pagination {
-		a {
-			font-size: 1em;
-			line-height: 1;
-		}
-	}
+#content.twentyeleven .woocommerce-pagination a {
+	font-size: 1em;
+	line-height: 1;
 }
 
 /**
  * Twenty Thirteen specific styles
  */
-.single-product {
-	.twentythirteen {
-		.entry-summary,
-		#reply-title,
-		#respond #commentform {
-			padding: 0;
-		}
+.single-product .twentythirteen {
+	.entry-summary,
+	#reply-title,
+	#respond #commentform {
+		padding: 0;
+	}
 
-		p.stars {
-			clear: both;
-		}
+	p.stars {
+		clear: both;
 	}
 }
 
-.twentythirteen {
-	.woocommerce-breadcrumb {
-		padding-top: 40px;
-	}
+.twentythirteen .woocommerce-breadcrumb {
+	padding-top: 40px;
 }
 
 /**
  * Twenty Fourteen specific styles
  */
-.twentyfourteen {
-	ul.products {
-		li.product {
-			margin-top: 0 !important;
-		}
-	}
+.twentyfourteen ul.products li.product {
+	margin-top: 0 !important;
 }
 
 /**
  * Twenty Sixteen specific styles
  */
-body:not(.search-results) {
-	.twentysixteen {
-		.entry-summary {
-			color: inherit;
-			font-size: inherit;
-			line-height: inherit;
-		}
-	}
+body:not( .search-results ) .twentysixteen .entry-summary {
+	color: inherit;
+	font-size: inherit;
+	line-height: inherit;
 }
 
-.twentysixteen {
-	.price ins {
-		background: inherit;
-		color: inherit;
-	}
+.twentysixteen .price ins {
+	background: inherit;
+	color: inherit;
 }
diff --git a/assets/fonts/WooCommerce.eot b/assets/fonts/WooCommerce.eot
old mode 100755
new mode 100644
index 0e20ef0451c..ead1f7d05da
Binary files a/assets/fonts/WooCommerce.eot and b/assets/fonts/WooCommerce.eot differ
diff --git a/assets/fonts/WooCommerce.svg b/assets/fonts/WooCommerce.svg
old mode 100755
new mode 100644
index 163786474a1..0d82b0f1d80
--- a/assets/fonts/WooCommerce.svg
+++ b/assets/fonts/WooCommerce.svg
@@ -6,7 +6,7 @@
 <![CDATA[
 {
 	"fontFamily": "WooCommerce",
-	"fontURL": "http://woothemes.com",
+	"fontURL": "https://woothemes.com",
 	"designer": "James Koster",
 	"designerURL": "http://jameskoster.co.uk",
 	"license": "SIL OFL",
@@ -27,13 +27,13 @@
 <font-face units-per-em="1024" ascent="960" descent="-64" />
 <missing-glyph horiz-adv-x="1024" />
 <glyph unicode="&#x20;" horiz-adv-x="512" d="" />
-<glyph unicode="&#xe000;" glyph-name="virtual" data-tags="virtual" d="M307.2 780.752v-153.6h51.248v153.6h-51.248zM230.4 780.752v-153.6h25.648v153.6h-25.648zM435.2 780.752v-153.6h128.048v153.6h-128.048zM179.2 780.752v-153.6h25.648v153.6h-25.648zM819.152 780.752v-153.6h25.648v153.6h-25.648zM742.384 780.752v-153.6h25.6v153.6h-25.6zM614.4 780.752v-153.6h51.152v153.6h-51.152zM947.136 883.152v-358.352h-870.336v358.352h870.336zM971.312 960h-895.888c-17.104 0-42.656-5.728-55.472-18.512-12.784-14.208-19.904-24.208-19.904-41.2v-382.56c0-17.088 7.12-37.040 19.904-51.248 12.832-12.784 38.384-18.464 55.456-18.464h895.904c17.088 0 21.392 5.696 34.16 18.464 12.784 14.208 18.464 34.16 18.464 51.248l0.016 382.56c0 16.992-5.696 32.672-18.464 45.456s-17.088 14.256-34.176 14.256zM308.624 122.336c0-9.952 5.728-18.464 14.256-25.6-31.28-11.344-54.064-41.2-54.064-78.224 0-45.456 35.552-82.496 81.104-82.496h375.344c45.552 0 81.104 37.040 81.104 82.496 0 37.040-22.768 68.272-55.456 78.224 9.904 10 15.648 19.904 15.648 32.672 0 91.008-72.496 164.976-162.128 164.976-52.592 0-101.024-27.040-129.424-68.224-15.6 8.512-32.672 12.784-51.152 12.784-64.016 0-115.232-52.592-115.232-116.608z" />
-<glyph unicode="&#xe001;" glyph-name="downloadable" data-tags="downloadable" d="M547.504-49.936l143.696 160.688c22.768 18.464 22.768 36.992 0 55.504h-102.4v143.6c0 15.648-15.648 35.552-36.944 35.552h-79.664c-21.344 0-36.992-14.16-36.992-31.28v-147.856h-85.264c-21.392-18.512-35.552-37.040-12.864-55.504l143.696-160.688c21.28-18.496 45.44-18.496 66.736-0.016zM307.2 780.56v-153.6h51.248v153.6h-51.248zM230.4 780.56v-153.6h25.648v153.6h-25.648zM435.2 780.56v-153.6h128.048v153.6h-128.048zM179.2 780.56v-153.6h25.648v153.6h-25.648zM819.152 780.56v-153.6h25.648v153.6h-25.648zM742.384 780.56v-153.6h25.6v153.6h-25.6zM614.4 780.56v-153.6h51.152v153.6h-51.152zM947.136 882.96v-358.352l-870.336-0.016v358.368h870.336zM971.312 959.792h-895.888c-17.088 0-42.624-5.728-55.456-18.512-12.8-14.208-19.92-24.208-19.92-41.2v-382.56c0-17.088 7.12-37.040 19.904-51.248 12.832-12.784 38.384-18.464 55.456-18.464h895.904c17.088 0 21.392 5.696 34.16 18.464 12.784 14.208 18.464 34.16 18.464 51.248l0.016 382.56c0 16.992-5.696 32.672-18.464 45.456s-17.088 14.256-34.176 14.256z" />
-<glyph unicode="&#xe002;" glyph-name="grouped" data-tags="grouped" d="M307.2 780.752v-153.6h51.248v153.6h-51.248zM230.4 780.752v-153.6h25.648v153.6h-25.648zM435.2 780.752v-153.6h128.048v153.6h-128.048zM179.2 780.752v-153.6h25.648v153.6h-25.648zM819.152 780.752v-153.6h25.648v153.6h-25.648zM742.384 780.752v-153.6h25.6v153.6h-25.6zM614.4 780.752v-153.6h51.152v153.6h-51.152zM947.136 883.152v-358.352h-870.336v358.352h870.336zM971.312 960h-895.888c-17.104 0-42.656-5.728-55.472-18.512-12.784-14.208-19.904-24.208-19.904-41.2v-382.56c0-17.088 7.12-37.040 19.904-51.248 12.832-12.784 38.384-18.464 55.456-18.464h410.992v-76.8h-358.352v-128l-52.624-0.016c-17.088 0-42.624-5.648-55.456-18.432-12.8-14.256-19.92-24.24-19.92-41.296v-177.76c0-17.040 7.12-36.992 19.904-51.2 12.832-12.784 38.384-18.512 55.456-18.512h179.152c17.088 0 21.392 5.728 34.16 18.512 12.784 14.208 18.464 34.16 18.464 51.2v177.76c0 17.040-5.696 32.72-18.464 45.504s-17.088 14.208-34.16 14.208h-75.376l0.016 76.864h307.2v-76.848h-52.592c-17.136 0-42.672-5.648-55.504-18.432-12.784-14.256-19.856-24.256-19.856-41.296v-177.76c0-17.040 7.072-36.992 19.856-51.2 12.832-12.784 38.384-18.512 55.504-18.512h179.152c17.040 0 21.392 5.728 34.16 18.512 12.784 14.208 18.432 34.16 18.432 51.2v177.76c0 17.040-5.648 32.72-18.432 45.504s-17.136 14.208-34.16 14.208h-75.376v76.864h307.2v-76.848h-52.624c-17.088 0-42.624-5.648-55.504-18.432-12.784-14.256-19.904-24.256-19.904-41.296v-177.76c0-17.040 7.12-36.992 19.904-51.2 12.864-12.784 38.432-18.512 55.504-18.512h179.152c17.088 0 21.392 5.728 34.16 18.512 12.784 14.208 18.464 34.16 18.464 51.2v177.76c0 17.040-5.696 32.72-18.464 45.504s-17.088 14.208-34.16 14.208h-75.328v128l-358.384 0.032v76.8h433.712c17.088 0 21.392 5.696 34.16 18.464 12.784 14.208 18.464 34.16 18.464 51.248l0.016 382.56c0 16.992-5.696 32.672-18.464 45.456s-17.088 14.256-34.176 14.256zM256.048 192.048v-204.848h-204.8v204.848h204.8zM972.752 192.048v-204.848h-204.752v204.848h204.752zM614.4 192.048v-204.848h-204.752v204.848h204.752z" />
-<glyph unicode="&#xe003;" glyph-name="variable" data-tags="variable" d="M307.2 729.552v-409.504h51.248l-0.016 409.504h-51.232zM230.4 729.552v-409.504h25.648v409.504h-25.648zM563.248 729.552v-409.504h51.152v409.504h-51.152zM179.2 729.552v-409.504h25.648v409.504h-25.648zM665.552 729.552v-409.504h25.648v409.504h-25.648zM486.4 729.552v-409.504h25.552v409.504h-25.552zM435.2 729.552v-409.504h25.6v409.504h-25.6zM793.552 832v-614.4h-716.752v614.4h716.752zM817.76 908.8h-742.336c-17.088 0-42.624-5.696-55.456-18.512-12.8-14.256-19.92-24.16-19.92-41.296v-638.464c0-17.088 7.12-37.040 19.904-51.2 12.832-12.832 38.384-18.512 55.456-18.512h742.336c17.040 0 21.344 5.696 34.112 18.512 12.784 14.16 18.464 34.112 18.464 51.2l0.032 638.464c0 17.136-5.696 32.72-18.464 45.552-12.784 12.768-17.088 14.256-34.128 14.256zM230.4 64h-76.8v-7.072c0-17.088 7.168-36.944 19.952-51.2 12.784-12.832 38.384-18.512 55.456-18.512h742.304c17.088 0 21.392 5.696 34.16 18.512 12.784 14.256 18.464 34.112 18.464 51.2l0.032 638.56c0 17.040-5.696 32.672-18.464 45.456s-17.088 14.256-34.16 14.256h-24.16v-691.2h-716.784z" />
+<glyph unicode="&#xe000;" glyph-name="virtual" data-tags="virtual" d="M933.926 716.642l-421.926 243.358-192.79-110.617 429.827-233.877zM709.531 593.383l-429.827 232.296-191.21-110.617 423.506-229.136zM512 441.679l-444.049 240.198v-489.877l444.049-256 444.049 256v489.877l-444.049-240.198zM420.346 171.457c-11.062-6.321-23.704-4.741-39.506 1.58l-158.025 74.272c-15.802 7.901-28.444 18.963-39.506 34.765s-15.802 31.605-15.802 47.407c0 14.222 4.741 23.704 14.222 30.025s20.543 6.321 34.765 1.58c0 3.16-1.58 6.321-1.58 9.481 0 11.062 3.16 18.963 11.062 22.123 7.901 4.741 17.383 3.16 28.444-1.58 4.741-3.16 9.481-6.321 15.802-9.481 4.741 7.901 12.642 12.642 23.704 14.222 9.481 1.58 20.543 0 33.185-6.321 17.383-7.901 31.605-22.123 44.247-39.506s18.963-36.346 18.963-53.728c0-4.741 0-9.481-3.16-15.802 14.222-7.901 25.284-18.963 34.765-34.765 9.481-14.222 14.222-30.025 14.222-44.247 1.58-14.222-4.741-25.284-15.802-30.025z" />
+<glyph unicode="&#xe001;" glyph-name="downloadable" data-tags="downloadable" d="M933.926 716.642l-421.926 243.358-192.79-110.617 429.827-233.877zM709.531 593.383l-429.827 232.296-191.21-110.617 423.506-229.136zM512 441.679l-444.049 240.198v-489.877l444.049-256 444.049 256v489.877l-444.049-240.198zM303.407 174.617l-110.617 169.086 31.605-1.58 63.21-96.395v188.049l31.605-17.383v-188.049l63.21 30.025 31.605-33.185-110.617-50.568z" />
+<glyph unicode="&#xe002;" glyph-name="grouped" data-tags="grouped" d="M512 958.42l-442.469-256v-508.84l442.469-256 442.469 256v510.42l-442.469 254.42zM791.704 433.778l-52.148-28.444-121.679 66.37 55.309 31.605 118.519-69.531zM728.494 399.012l-55.309-30.025-120.099 64.79 53.728 31.605 121.679-66.37zM512 778.272l120.099-69.531-52.148-28.444-121.679 66.37 53.728 31.605zM445.63 740.346l121.679-66.37-55.309-30.025-120.099 64.79 53.728 31.605zM352.395 503.309l120.099-69.531-52.148-28.444-121.679 66.37 53.728 31.605zM286.025 465.383l121.679-66.37-55.309-30.025-120.099 64.79 53.728 31.605zM477.235 286.815l-124.84-72.691-124.84 72.691v139.062l124.84-67.951 124.84 67.951v-139.062zM387.16 560.198v139.062l124.84-67.951 124.84 67.951v-139.062l-124.84-72.691-124.84 72.691zM798.025 286.815l-124.84-72.691-124.84 72.691v139.062l124.84-67.951 124.84 67.951v-139.062z" />
+<glyph unicode="&#xe003;" glyph-name="variable" data-tags="variable" d="M512 444.84l-406.123 221.235v-450.37l406.123-233.877 406.123 233.877v450.37zM728.494 604.444l170.667 91.654-387.16 224.395-176.988-102.716zM512 484.346l181.728 99.556-395.062 213.333-175.407-101.136zM921.284-21.333h-47.407v7.901h39.506v17.383h7.901v-25.284zM845.432-21.333h-42.667v7.901h42.667v-7.901zM772.741-21.333h-42.667v7.901h42.667v-7.901zM701.63-21.333h-42.667v7.901h42.667v-7.901zM628.938-21.333h-42.667v7.901h42.667v-7.901zM556.247-21.333h-42.667v7.901h42.667v-7.901zM483.556-21.333h-42.667v7.901h42.667v-7.901zM410.864-21.333h-42.667v7.901h42.667v-7.901zM339.753-21.333h-42.667v7.901h42.667v-7.901zM267.062-21.333h-42.667v7.901h42.667v-7.901zM194.37-21.333h-42.667v7.901h42.667v-7.901zM121.679-21.333h-20.543v31.605h7.901v-23.704h12.642v-7.901zM921.284 32.395h-7.901v42.667h7.901v-42.667zM109.037 38.716h-7.901v42.667h7.901v-42.667zM921.284 105.086h-7.901v42.667h7.901v-42.667zM109.037 109.827h-7.901v42.667h7.901v-42.667zM921.284 176.198h-7.901v42.667h7.901v-42.667zM109.037 182.519h-7.901v42.667h7.901v-42.667zM921.284 248.889h-7.901v42.667h7.901v-42.667zM109.037 255.21h-7.901v42.667h7.901v-42.667zM921.284 321.58h-7.901v42.667h7.901v-42.667zM109.037 327.901h-7.901v42.667h7.901v-42.667zM921.284 394.272h-7.901v42.667h7.901v-42.667zM109.037 400.593h-7.901v42.667h7.901v-42.667zM921.284 466.963h-7.901v42.667h7.901v-42.667zM109.037 471.704h-7.901v42.667h7.901v-42.667zM921.284 539.654h-7.901v42.667h7.901v-42.667zM109.037 544.395h-7.901v44.247h7.901v-44.247zM921.284 610.765h-7.901v42.667h7.901v-42.667zM109.037 617.086h-7.901v42.667h7.901v-42.667zM921.284 683.457h-7.901v42.667h7.901v-42.667zM109.037 689.778h-7.901v42.667h7.901v-42.667zM921.284 756.148h-7.901v42.667h7.901v-42.667zM109.037 762.469h-7.901v42.667h7.901v-42.667zM921.284 828.84h-7.901v42.667h7.901v-42.667zM109.037 835.16h-7.901v42.667h7.901v-42.667zM921.284 901.531h-7.901v12.642h-23.704v6.321h30.025v-18.963zM109.037 906.272h-7.901v14.222h36.346v-7.901h-28.444v-6.321zM862.815 914.173h-42.667v6.321h42.667v-6.321zM790.123 914.173h-42.667v6.321h42.667v-6.321zM717.432 914.173h-42.667v6.321h42.667v-6.321zM644.741 914.173h-42.667v6.321h42.667v-6.321zM573.63 914.173h-42.667v6.321h42.667v-6.321zM500.938 914.173h-42.667v6.321h42.667v-6.321zM428.247 914.173h-42.667v6.321h42.667v-6.321zM355.556 914.173h-42.667v6.321h42.667v-6.321zM282.864 914.173h-42.667v6.321h42.667v-6.321zM210.173 914.173h-42.667v6.321h42.667v-6.321zM140.642 917.333c0-19.2-15.565-34.765-34.765-34.765s-34.765 15.565-34.765 34.765c0 19.2 15.565 34.765 34.765 34.765s34.765-15.565 34.765-34.765zM140.642-21.333c0-19.2-15.565-34.765-34.765-34.765s-34.765 15.565-34.765 34.765c0 19.2 15.565 34.765 34.765 34.765s34.765-15.565 34.765-34.765zM105.877 394.272c-22.123 0-41.086 18.963-41.086 41.086s18.963 41.086 41.086 41.086c22.123 0 41.086-18.963 41.086-41.086s-18.963-41.086-41.086-41.086zM105.877 462.222c-14.222 0-26.864-12.642-26.864-26.864s12.642-26.864 26.864-26.864 26.864 12.642 26.864 26.864-12.642 26.864-26.864 26.864zM918.123 394.272c-22.123 0-41.086 18.963-41.086 41.086s18.963 41.086 41.086 41.086 41.086-18.963 41.086-41.086c0-22.123-17.383-41.086-41.086-41.086zM918.123 462.222c-14.222 0-26.864-12.642-26.864-26.864s12.642-26.864 26.864-26.864 26.864 12.642 26.864 26.864-11.062 26.864-26.864 26.864zM952.889 917.333c0-19.2-15.565-34.765-34.765-34.765s-34.765 15.565-34.765 34.765c0 19.2 15.565 34.765 34.765 34.765s34.765-15.565 34.765-34.765zM512 876.247c-22.123 0-41.086 18.963-41.086 41.086s18.963 41.086 41.086 41.086c22.123 0 41.086-18.963 41.086-41.086s-18.963-41.086-41.086-41.086zM512 944.198c-14.222 0-26.864-12.642-26.864-26.864s12.642-26.864 26.864-26.864c14.222 0 26.864 12.642 26.864 26.864s-12.642 26.864-26.864 26.864zM512-62.42c-22.123 0-41.086 18.963-41.086 41.086s18.963 41.086 41.086 41.086c22.123 0 41.086-18.963 41.086-41.086s-18.963-41.086-41.086-41.086zM512 5.531c-14.222 0-26.864-12.642-26.864-26.864s12.642-26.864 26.864-26.864c14.222 0 26.864 12.642 26.864 26.864s-12.642 26.864-26.864 26.864zM952.889-21.333c0-19.2-15.565-34.765-34.765-34.765s-34.765 15.565-34.765 34.765c0 19.2 15.565 34.765 34.765 34.765s34.765-15.565 34.765-34.765z" />
 <glyph unicode="&#xe004;" glyph-name="contract" data-tags="contract" d="M511.984-63.952c282.992 0 512 228.96 512 511.904 0 283.024-229.008 512-512 512-283.024 0-511.952-228.96-511.952-512 0-282.944 228.912-511.904 511.952-511.904zM511.984 0.032c-247.472 0-447.936 200.528-447.936 447.936 0 247.472 200.448 448.032 447.936 448.032 247.424 0 447.984-200.528 447.984-448.032-0.016-247.408-200.544-447.936-447.984-447.936zM322.096 437.44v-51.2h82.496l-89.536-96.704c-11.392-11.392-10-34.112 2.832-48.336 12.784-12.832 29.872-14.208 42.624-2.832l89.584 96.656v-76.752h51.248v179.168h-179.248zM706.144 463.088v51.152h-86.752l89.584 95.264c11.392 11.392 9.952 31.328-2.832 45.504-12.864 12.832-28.528 14.208-39.904 1.44l-88.096-93.872 0.016 79.664h-51.248v-179.152h179.232z" />
 <glyph unicode="&#xe005;" glyph-name="expand" data-tags="expand" d="M524.768 639.984v-51.2h82.496l-236.080-233.232v79.616h-51.152v-179.152h179.152v51.2h-86.72l240.304 230.416v-76.8h51.248v179.152h-179.248zM511.984-63.952c282.992 0 512 228.96 512 511.904 0 283.024-229.008 512-512 512-283.024 0-511.952-228.96-511.952-512 0-282.944 228.912-511.904 511.952-511.904zM511.984 0.032c-247.472 0-447.936 200.528-447.936 447.936 0 247.472 200.448 448.032 447.936 448.032 247.424 0 447.984-200.528 447.984-448.032-0.016-247.408-200.544-447.936-447.984-447.936z" />
-<glyph unicode="&#xe006;" glyph-name="simple" data-tags="simple" d="M947.136 806.4h-870.288v-716.8h870.304l-0.016 716.8zM971.312 883.152c17.136 0 21.344-1.44 34.16-14.208 12.784-12.784 18.512-28.48 18.512-45.504v-740.88c0-17.136-5.728-37.040-18.512-51.296-12.832-12.784-17.040-18.432-34.16-18.432l-895.856 0.032c-17.136 0-42.72 5.648-55.504 18.432-12.784 14.256-19.952 34.16-19.952 51.296l-0.016 740.832c0 17.040 7.168 27.040 19.952 41.296 12.784 12.784 38.384 18.432 55.504 18.432l895.872-0.016zM307.2 703.952h51.184v-511.888h-51.184zM230.448 703.952h25.6v-511.888h-25.6zM716.8 703.952h51.136v-511.888h-51.136zM435.2 703.952h76.8v-511.888h-76.8zM179.248 703.952h25.552v-511.888h-25.552zM819.2 703.952h25.552v-511.888h-25.552zM639.952 703.952h25.648v-511.888h-25.648zM588.8 703.952h25.6v-511.888h-25.6z" />
+<glyph unicode="&#xe006;" glyph-name="simple" data-tags="simple" d="M512 441.679l-444.049 240.198v-489.877l444.049-256 444.049 256v489.877zM749.037 615.506l184.889 101.136-421.926 243.358-192.79-110.617zM512 485.926l197.531 107.457-429.827 232.296-191.21-110.617z" />
 <glyph unicode="&#xe007;" glyph-name="plus" data-tags="plus" d="M268.88 486.464v-76.848h204.752v-204.752h76.848l-0.016 204.768h204.752v76.848l-204.752-0.016v204.752h-76.848v-204.752h-204.736zM0.048 448.048c0-283.024 228.96-512 512-512 282.944 0 511.904 228.96 511.904 512 0 282.944-228.96 511.904-511.904 511.904-283.040 0-512-228.96-512-511.904zM64.032 448.048c0 247.392 200.528 447.936 448.032 447.936 247.392 0 447.936-200.528 447.936-447.936 0-247.472-200.528-448.032-447.936-448.032-247.504 0.016-448.032 200.544-448.032 448.032z" />
 <glyph unicode="&#xe008;" glyph-name="right" data-tags="right" d="M551.856 243.168l136.48 140.816 34.16 35.552 17.040 18.512-179.152 189.152-51.2-52.688 82.496-88.144h-246.016c-28.48 0-51.248-22.72-51.248-51.2s22.768-51.2 51.248-51.2h243.184l-86.8-89.632 49.808-51.168zM512.048-63.952c282.944 0 511.904 228.96 511.904 511.904 0 283.024-228.96 512-511.904 512-283.040 0-512-228.96-512-511.984 0-282.96 228.96-511.92 512-511.92zM512.048 0.032c-247.472 0-448.032 200.528-448.032 447.936 0 247.472 200.528 448.032 448.032 448.032 247.392 0 447.936-200.528 447.936-448.032-0.016-247.408-200.544-447.936-447.936-447.936z" />
 <glyph unicode="&#xe009;" glyph-name="up" data-tags="up" d="M716.848 487.808l-140.816 136.528-35.552 34.064-18.512 17.136-189.168-179.168 52.688-51.296 88.144 82.496v-246c0-28.432 22.72-51.2 51.2-51.2s51.2 22.768 51.2 51.2v243.184l89.632-86.704 51.184 49.76zM1023.952 447.968c0 283.024-228.96 512-511.904 512-283.040-0.016-512-228.976-512-512 0-282.944 228.96-511.904 512-511.904 282.944-0.016 511.904 228.944 511.904 511.904zM959.968 447.968c0-247.392-200.528-447.936-447.936-447.936-247.472 0-448.032 200.528-448.032 447.936 0 247.472 200.528 448.032 448.032 448.032 247.408-0.032 447.936-200.56 447.936-448.032z" />
@@ -42,18 +42,18 @@
 <glyph unicode="&#xe00c;" glyph-name="image" data-tags="image" d="M844.736 115.2l-255.904 255.952-179.248-179.152-76.752 76.8-153.6-153.6 665.504-0.016zM281.632 473.6c0-42.672 34.16-76.848 76.752-76.848 42.72 0 76.848 34.16 76.848 76.848 0 42.592-34.112 76.752-76.848 76.752-42.592 0-76.752-34.16-76.752-76.752zM947.168 703.952v-691.152l-870.336 0.016v691.152l870.336-0.016zM1023.984 959.952h-1023.952v-1023.904h948.528c24.208 0 34.16 8.464 49.76 24.16 17.136 15.648 25.648 38.432 25.648 61.104v938.64z" />
 <glyph unicode="&#xe00d;" glyph-name="link" data-tags="link" d="M752.352 878.896c-52.688 51.2-137.952 51.2-190.544-1.392l-479.312-479.312c-52.576-52.592-52.576-137.856-1.392-190.544l17.040-17.040 66.832 68.224-44.064 44.064 536.16 536.192 44.064-44.064 68.224 66.832-17.008 17.040zM254.608 34.144l17.040-17.040c52.688-51.2 137.952-51.2 190.544 1.392l479.312 479.312c52.592 52.592 52.592 137.872 1.392 190.544l-17.040 17.040-66.832-68.224 44.064-44.064-536.16-536.176-44.064 44.064-68.256-66.848zM992.656 950c-12.784 12.832-32.72 12.832-45.504 1.44l-312.848-312.896c-11.392-12.784-11.392-32.672 0-45.456l22.768-22.768c12.784-11.392 32.672-11.392 45.456 0l312.912 312.832c11.392 12.784 11.392 32.72-1.44 45.504l-21.344 21.344zM366.928 325.696c-12.784 11.392-32.672 11.392-45.456 0l-312.912-312.832c-11.392-12.784-11.392-32.72 1.44-45.504l21.344-21.344c12.784-12.832 32.72-12.832 45.504-1.44l312.848 312.896c11.392 12.784 11.392 32.672 0 45.456l-22.768 22.768z" />
 <glyph unicode="&#xe00e;" glyph-name="calendar" data-tags="calendar" d="M358.384 524.8l-76.752-76.8h76.752v-230.4l-76.752 0.016v-51.152h204.752v51.152h-76.8l-0.016 307.184h-51.184zM588.832 524.8c-28.528 0-51.2-22.768-51.2-51.152v-256.048c0-28.384 22.688-51.152 51.2-51.152h102.4c28.432 0 51.2 22.768 51.2 51.152l-0.016 256.048c0 28.384-22.768 51.152-51.2 51.152h-102.384zM588.832 473.648h102.4v-256.048h-102.4v256.048zM947.168 678.4v-665.552l-870.336 0.016v665.552l870.336-0.016zM1023.984 960h-1023.952v-1024h948.528c24.208 0 34.16 8.56 49.76 24.16 17.136 15.744 25.648 38.432 25.648 61.2v938.64zM755.2 857.568c21.296 0 38.384-17.088 38.384-38.384 0-21.344-17.088-38.432-38.384-38.432-21.344 0-38.432 17.088-38.432 38.432 0.016 21.296 17.088 38.384 38.432 38.384zM243.216 857.568c21.392 0 38.432-17.088 38.432-38.384 0-21.344-17.040-38.432-38.432-38.432-21.296 0-38.432 17.088-38.432 38.432 0 21.296 17.136 38.384 38.432 38.384z" />
-<glyph unicode="&#xe00f;" glyph-name="processing" data-tags="processing" d="M0.080 448c0-49.808 39.776-89.584 91.008-89.584 49.712 0 89.584 39.776 89.584 89.584s-39.856 89.584-89.584 89.584c-51.232 0-91.008-39.776-91.008-89.584zM420.976 448c0-49.808 41.296-89.584 91.056-89.584 49.712 0 90.96 39.776 90.96 89.584s-41.248 89.584-90.96 89.584c-49.76 0-91.056-39.776-91.056-89.584zM843.344 448c0-49.808 39.824-89.584 89.632-89.584 51.2 0 90.96 39.776 90.96 89.584s-39.776 89.584-90.96 89.584c-49.808 0-89.632-39.776-89.632-89.584z" />
+<glyph unicode="&#xe00f;" glyph-name="processing" data-tags="processing" d="M153.284 294.716c-83.753 0-153.284 67.951-153.284 153.284 0 83.753 67.951 153.284 153.284 153.284 83.753 0 153.284-67.951 153.284-153.284 0-83.753-69.531-153.284-153.284-153.284zM512 294.716c-83.753 0-153.284 67.951-153.284 153.284 0 83.753 67.951 153.284 153.284 153.284 83.753 0 153.284-67.951 153.284-153.284 0-83.753-69.531-153.284-153.284-153.284zM870.716 294.716c-83.753 0-153.284 67.951-153.284 153.284 0 83.753 67.951 153.284 153.284 153.284 83.753 0 153.284-67.951 153.284-153.284 0-83.753-67.951-153.284-153.284-153.284z" />
 <glyph unicode="&#xe010;" glyph-name="view" data-tags="view" d="M305.824 428.8c0-108.096 92.448-196.24 206.144-196.24 113.84 0 206.288 88.144 206.288 196.24 0 46.944-18.512 91.056-49.808 125.136 204.8-46.944 355.536-172.080 355.536-172.080v91.056c0 0-230.4 190.544-509.136 190.544-277.328-0.016-514.8-190.544-514.8-190.544v-91.056c0 0 150.736 120.864 352.704 170.688-28.464-34.176-46.928-76.8-46.928-123.744z" />
-<glyph unicode="&#xe011;" glyph-name="status-processing" data-tags="status-processing" d="M294.432 448.048c0-21.392 17.088-38.432 38.384-38.432 21.344 0 38.432 17.040 38.432 38.432 0 21.296-17.088 38.432-38.432 38.432-21.312-0.016-38.384-17.136-38.384-38.432zM473.632 448.048c0-21.392 17.040-38.432 38.432-38.432 21.296 0 38.432 17.040 38.432 38.432 0 21.296-17.136 38.432-38.432 38.432-21.408-0.016-38.432-17.136-38.432-38.432zM652.784 448.048c0-21.392 17.136-38.432 38.432-38.432s38.432 17.040 38.432 38.432c0 21.296-17.136 38.432-38.432 38.432s-38.432-17.136-38.432-38.432zM0.048 448.048c0-283.024 228.96-512 512-512 282.944 0 511.904 228.96 511.904 512 0 282.944-228.96 511.904-511.904 511.904-283.040 0-512-228.96-512-511.904zM64.032 448.048c0 247.392 200.528 447.936 448.032 447.936 247.392 0 447.936-200.528 447.936-447.936 0-247.472-200.528-448.032-447.936-448.032-247.504 0.016-448.032 200.544-448.032 448.032z" />
-<glyph unicode="&#xe012;" glyph-name="status-pending" data-tags="status-pending" d="M473.632 716.768v-332.752h281.6v76.8h-204.768v255.952h-76.832zM0.048 448.048c0-283.024 228.96-512 512-512 282.944 0 511.904 228.96 511.904 512 0 282.944-228.96 511.904-511.904 511.904-283.040 0-512-228.96-512-511.904zM64.032 448.048c0 247.392 200.528 447.936 448.032 447.936 247.392 0 447.936-200.528 447.936-447.936 0-247.472-200.528-448.032-447.936-448.032-247.504 0.016-448.032 200.544-448.032 448.032z" />
-<glyph unicode="&#xe013;" glyph-name="status-cancelled" data-tags="status-cancelled" d="M369.728 658.048l-53.984-53.984 142.208-145.088-143.6-146.48 53.984-55.456 143.6 146.48 143.696-146.48 54.032 55.456-143.6 146.48 142.208 145.088-54.112 53.984-142.208-145.040-142.224 145.040zM156.416 820.208c-199.040-199.104-203.312-524.736-5.632-729.536 199.152-206.24 523.344-206.24 722.448 0 197.664 204.8 193.408 530.432-5.76 729.536-197.568 197.712-513.328 197.712-711.056 0zM200.528 776.096c172.080 172.128 450.8 172.128 622.864 0 173.504-174.896 176.368-460.704 4.304-638.464-173.552-179.248-457.968-179.248-631.392 0-172.096 177.76-169.216 463.568 4.224 638.464z" />
-<glyph unicode="&#xe014;" glyph-name="status-refunded" data-tags="status-refunded" d="M601.616 439.536l154.992 93.792-154.992 95.36v-65.472l-332.736 0.016v-169.248l51.152 46.944v71.104h281.6l-0.016-72.496zM448.032 435.184l-154.992-95.264 154.992-95.264v62.592h332.752v173.504l-51.152-48.384v-73.936l-281.6-0.016v76.768zM0.048 448.048c0-283.024 228.96-512 512-512 282.944 0 511.904 228.96 511.904 512 0 282.944-228.96 511.904-511.904 511.904-283.040 0-512-228.96-512-511.904zM64.032 448.048c0 247.392 200.528 447.936 448.032 447.936 247.392 0 447.936-200.528 447.936-447.936 0-247.472-200.528-448.032-447.936-448.032-247.504 0.016-448.032 200.544-448.032 448.032z" />
-<glyph unicode="&#xe015;" glyph-name="status-completed" data-tags="status-completed" d="M281.6 459.44l140.768-136.576 35.552-34.112 18.464-17.088 291.552 281.552-52.592 51.2-240.32-231.776-142.208 136.528-51.216-49.728zM0.048 448.048c0-283.024 228.96-512 511.904-512 283.024 0 512 228.96 512 512 0 282.944-228.96 511.904-512 511.904-282.944 0-511.904-228.96-511.904-511.904zM64.032 448.048c0 247.392 200.528 447.936 447.936 447.936 247.472 0 448.032-200.528 448.032-447.936 0-247.472-200.528-448.032-448.032-448.032-247.408 0.016-447.936 200.544-447.936 448.032z" />
-<glyph unicode="&#xe016;" glyph-name="status-failed" data-tags="status-failed" d="M478.752 691.216v-358.352h76.848l-0.016 358.352h-76.832zM478.752 281.664v-76.8h76.848v76.8h-76.848zM5.264 448.048c0-283.024 228.96-512 511.904-512 283.024 0 512 228.96 512 512 0 282.944-228.96 511.904-512 511.904-282.944 0-511.904-228.96-511.904-511.904zM69.248 448.048c0 247.392 200.528 447.936 447.936 447.936 247.472 0 448.032-200.528 448.032-447.936 0-247.472-200.528-448.032-448.032-448.032-247.408 0.016-447.936 200.544-447.936 448.032z" />
+<glyph unicode="&#xe011;" glyph-name="status-processing" data-tags="status-processing" d="M512 960c-282.864 0-512-229.136-512-512s229.136-512 512-512c282.864 0 512 229.136 512 512s-229.136 512-512 512zM290.765 354.765c-52.148 0-94.815 42.667-94.815 94.815s42.667 94.815 94.815 94.815c52.148 0 94.815-42.667 94.815-94.815 0-53.728-42.667-94.815-94.815-94.815zM512 354.765c-52.148 0-94.815 42.667-94.815 94.815s42.667 94.815 94.815 94.815c52.148 0 94.815-42.667 94.815-94.815 0-53.728-42.667-94.815-94.815-94.815zM733.235 354.765c-52.148 0-94.815 42.667-94.815 94.815s42.667 94.815 94.815 94.815c52.148 0 94.815-42.667 94.815-94.815 0-53.728-42.667-94.815-94.815-94.815z" />
+<glyph unicode="&#xe012;" glyph-name="status-pending" data-tags="status-pending" d="M512 960c-282.864 0-512-229.136-512-512s229.136-512 512-512c282.864 0 512 229.136 512 512s-229.136 512-512 512zM478.815 384.79v0c-3.16 3.16-7.901 6.321-14.222 11.062-12.642 12.642-18.963 28.444-18.963 47.407 0 1.58 0 3.16 1.58 6.321s1.58 6.321 1.58 6.321v0l64.79 320.79 64.79-320.79 202.272-213.333-301.827 142.222z" />
+<glyph unicode="&#xe013;" glyph-name="status-cancelled" data-tags="status-cancelled" d="M512 960c-282.864 0-512-229.136-512-512s229.136-512 512-512c282.864 0 512 229.136 512 512s-229.136 512-512 512zM798.025 244.148l-82.173-82.173-205.432 203.852-203.852-203.852-82.173 82.173 203.852 203.852-203.852 203.852 82.173 82.173 203.852-203.852 205.432 203.852 82.173-82.173-205.432-205.432 205.432-202.272z" />
+<glyph unicode="&#xe014;" glyph-name="status-refunded" data-tags="status-refunded" d="M512 960c-282.864 0-512-229.136-512-512s229.136-512 512-512c282.864 0 512 229.136 512 512s-229.136 512-512 512zM801.185 247.309h-440.889v-80.593l-159.605 120.099 159.605 120.099v-80.593h360.296v120.099l80.593 60.049v-259.16zM681.086 489.086v80.593h-360.296v-120.099l-80.593-60.049v260.741h440.889v80.593l159.605-120.099-159.605-121.679z" />
+<glyph unicode="&#xe015;" glyph-name="status-completed" data-tags="status-completed" d="M512 960c-282.864 0-512-229.136-512-512s229.136-512 512-512c282.864 0 512 229.136 512 512s-229.136 512-512 512zM478.815 174.617h-86.914l-197.531 262.321 86.914 82.173 153.284-121.679 308.148 327.111 86.914-61.63-350.815-488.296z" />
+<glyph unicode="&#xe016;" glyph-name="status-failed" data-tags="status-failed" d="M512 960c69.531 0 135.901-14.222 199.111-41.086s116.938-63.21 162.765-109.037c45.827-45.827 82.173-99.556 109.037-162.765s41.086-129.58 41.086-199.111-14.222-135.901-41.086-199.111-63.21-116.938-109.037-162.765-99.556-82.173-162.765-109.037c-63.21-26.864-129.58-41.086-199.111-41.086s-135.901 14.222-199.111 41.086-116.938 63.21-162.765 109.037c-45.827 45.827-82.173 99.556-109.037 162.765s-41.086 129.58-41.086 199.111 14.222 135.901 41.086 199.111c26.864 63.21 63.21 116.938 109.037 162.765s99.556 82.173 162.765 109.037c63.21 28.444 129.58 41.086 199.111 41.086zM584.691 361.086l22.123 412.444h-189.63l22.123-412.444h145.383zM578.37 146.173c15.802 14.222 23.704 34.765 23.704 61.63s-7.901 47.407-23.704 61.63c-15.802 14.222-37.926 22.123-67.951 22.123s-52.148-7.901-67.951-22.123c-15.802-14.222-23.704-34.765-23.704-61.63 0-25.284 7.901-45.827 23.704-61.63 15.802-14.222 39.506-22.123 67.951-22.123 30.025 0 52.148 6.321 67.951 22.123z" />
 <glyph unicode="&#xe017;" glyph-name="check" data-tags="check" d="M0.032 418.192l294.384-290.112 35.552-34.176 18.512-17.088 675.504 665.6-78.224 76.768-598.768-590.144-270.16 264.512z" />
 <glyph unicode="&#xe018;" glyph-name="query" data-tags="query" d="M550.384 348.432c91.056 15.648 140.768 76.848 140.768 176.32 0 113.84-65.472 179.2-179.152 179.2-109.536 0-172.128-59.712-179.248-166.368h51.264c7.072 78.224 46.944 115.168 128 115.168 85.312 0 127.952-42.672 127.952-128 0-71.104-28.432-110.88-89.584-123.744v8.512l-76.8-25.552v-76.752h76.8l0.016 41.216zM473.6 256.016v-76.8h76.8v76.8h-76.8zM0.016 447.968c0-282.944 228.96-511.904 512-511.904 282.944 0 511.952 228.96 511.952 511.904 0 283.024-229.008 511.984-511.952 511.984-283.040 0-512-228.96-512-511.984zM64.048 447.968c0 247.472 200.48 448 447.968 448 247.392 0 447.936-200.528 447.936-448.032 0-247.392-200.528-447.936-447.936-447.936-247.488 0.032-447.968 200.56-447.968 447.968z" />
 <glyph unicode="&#xe019;" glyph-name="truck-1" data-tags="truck-1" d="M664.16 192.048c8.56 0 14.256 1.392 19.904 5.696-9.952 2.784-18.512 7.072-24.16 12.784-12.784 14.256-19.904 34.064-19.904 51.2v510.512c0 17.040 7.12 27.040 19.904 41.2 12.832 12.864 38.384 18.56 55.456 18.56h1.392l0.016 68.288c0 16.992-5.648 32.672-18.464 45.456-12.8 12.768-17.104 14.256-34.144 14.256h-588.736c-17.104 0-42.656-5.728-55.472-18.512-12.784-14.208-19.904-24.208-19.904-41.2v-638.56c0-17.136 7.12-36.944 19.904-51.2 12.832-12.784 38.384-18.464 55.456-18.464h588.752zM716.752 268.848v486.352l230.4-51.248-0.016-435.104h-230.384zM971.312 780.752l-254.56 51.248h-1.376c-17.088 0-42.624-5.696-55.456-18.56-12.784-14.16-19.904-24.16-19.904-41.2v-510.528c0-17.136 7.12-36.944 19.904-51.2 5.648-5.696 14.208-10 24.16-12.784 10-4.304 21.392-5.696 31.28-5.696h255.952c17.088 0 21.392 5.696 34.16 18.464 12.784 14.256 18.464 34.064 18.464 51.2v459.344c0 17.088-5.696 32.672-18.464 45.552-12.768 12.768-17.072 14.16-34.16 14.16zM76.8 25.632c0-49.712 39.856-89.632 89.632-89.632 49.808 0 89.632 39.904 89.632 89.632 0 49.76-39.824 89.632-89.632 89.632-49.776-0.016-89.632-39.872-89.632-89.632zM768 25.632c0-49.712 39.776-89.632 89.584-89.632s89.584 39.904 89.584 89.632c0 49.76-39.776 89.632-89.584 89.632s-89.584-39.872-89.584-89.632z" />
-<glyph unicode="&#xe01a;" glyph-name="truck-2" data-tags="truck-2" d="M640 883.152v-110.928c0 17.040 7.12 27.040 19.904 41.2 12.832 12.864 38.384 18.56 55.456 18.56h1.392l0.016 68.304c0 16.992-5.648 32.672-18.464 45.456-12.8 12.768-17.104 14.256-34.144 14.256h-588.736c-17.104 0-42.656-5.728-55.472-18.512-12.784-14.208-19.904-24.208-19.904-41.2v-638.56c0-17.136 7.12-36.944 19.904-51.2 12.832-12.784 38.384-18.464 55.456-18.464h588.752c8.56 0 14.256 1.392 19.904 5.696 10-4.304 21.392-5.696 31.28-5.696h255.952c17.088 0 21.392 5.696 34.16 18.464 12.784 14.256 18.464 34.064 18.464 51.2l0.032 459.312c0 17.088-5.696 32.672-18.464 45.552-12.784 12.784-17.088 14.16-34.16 14.16l-254.56 51.248h-1.392c-17.088 0-42.624-5.696-55.456-18.56-12.784-14.16-19.904-24.16-19.904-41.2l-0.016-503.392h-563.2v614.304h563.2zM716.752 268.848v486.352l230.4-51.248-0.016-435.104h-230.384zM76.8 25.632c0-49.712 39.856-89.632 89.632-89.632 49.808 0 89.632 39.904 89.632 89.632 0 49.76-39.824 89.632-89.632 89.632-49.776-0.016-89.632-39.872-89.632-89.632zM768 25.632c0-49.712 39.776-89.632 89.584-89.632s89.584 39.904 89.584 89.632c0 49.76-39.776 89.632-89.584 89.632s-89.584-39.872-89.584-89.632z" />
+<glyph unicode="&#xe01a;" glyph-name="truck-2" data-tags="truck-2" d="M303.407 124.049c0-45.383-36.79-82.173-82.173-82.173s-82.173 36.79-82.173 82.173c0 45.383 36.79 82.173 82.173 82.173s82.173-36.79 82.173-82.173zM992.395 694.519h-260.741v175.407c0 17.383-14.222 31.605-31.605 31.605h-668.444c-17.383 0-31.605-14.222-31.605-31.605v-714.272c0-17.383 14.222-31.605 31.605-31.605h60.049c0 71.111 58.469 129.58 129.58 129.58s129.58-58.469 129.58-129.58h317.63c0 4.741 0 11.062 1.58 15.802 0 1.58 0 3.16 0 4.741 0 3.16 1.58 7.901 1.58 11.062 0 1.58 0 3.16 1.58 3.16 3.16 9.481 6.321 18.963 12.642 28.444 0 0 1.58 1.58 1.58 1.58 3.16 4.741 4.741 7.901 7.901 11.062 0 0 0 1.58 1.58 1.58 6.321 7.901 14.222 15.802 22.123 22.123 0 0 0 0 0 0 4.741 3.16 9.481 6.321 14.222 9.481 18.963 11.062 41.086 17.383 64.79 17.383 71.111 0 129.58-58.469 129.58-129.58h66.37c17.383 0 31.605 14.222 31.605 31.605v505.679c-1.58 22.123-15.802 36.346-33.185 36.346zM878.617 124.049c0-45.383-36.79-82.173-82.173-82.173s-82.173 36.79-82.173 82.173c0 45.383 36.79 82.173 82.173 82.173s82.173-36.79 82.173-82.173z" />
 <glyph unicode="&#xe01b;" glyph-name="globe" data-tags="globe" d="M568.896 819.232h-18.432v-81.056c11.296-12.832 16.992 5.696 25.552-15.696v-49.712c0-7.12 10-11.392 14.208-11.392 25.6 0 91.056 68.224 113.744 85.264-44.016 39.856-90.96 58.32-135.072 72.592zM473.632 819.232h-24.16c-76.752-17.136-163.6-54.064-231.84-160.736v-7.12c4.304 2.88 14.256 5.696 17.088 5.696 7.072 0 7.072-2.832 8.56-5.696v-55.408c0-12.832 34.064-103.824 49.76-108.096 8.56-2.88 17.088 1.44 22.72-4.272 17.040-19.904 22.768-49.808 36.992-68.224 21.344-28.528 54.032-59.808 82.496-71.104 9.952-7.168 29.872 4.224 38.384-11.392v-89.632c0-18.512 34.112 4.272 34.112-29.904v-9.904c-4.224-18.512-25.552 2.832-34.112-18.512v-150.736c4.272-8.512 24.16-8.512 34.112-8.512 0 0 39.856-2.88 39.856 14.208 0 19.952-22.768 11.392-28.48 12.784 22.768 26.992 44.112 56.896 69.712 81.104 36.944 34.112 46.896 72.496 61.104 100.976 5.696 12.784 14.208 32.672 14.208 36.944 0 29.872-115.168 83.888-122.256 86.752h-78.272c-24.16 11.392-51.152 36.992-66.768 63.984v56.896l5.648 7.168h39.824l5.696-7.168v-55.408c1.44-4.304 14.208-11.392 18.464-11.392 5.696 0 2.88 7.072 7.12 11.392v99.488c0 15.6 35.552 36.992 39.824 39.824h55.472c4.272 0 21.344 4.272 21.344 14.16 0 21.392-29.872-5.648-39.776 5.728v54.064c0 21.296-28.528 14.16-34.16 17.040 14.208 25.6 28.432 36.992 28.432 54.064 0 7.072-2.832 9.904-5.648 11.296-10 2.88-22.768 0-31.328 7.168-9.952 7.072-32.72 18.464-34.112 35.552v56.928zM0.048 448.048c0-283.024 228.96-512 512-512 282.944 0 511.904 228.96 511.904 512 0 282.944-228.96 511.904-511.904 511.904-283.040 0-512-228.96-512-511.904zM64.032 448.048c0 247.392 200.528 447.936 448.032 447.936 247.392 0 447.936-200.528 447.936-447.936 0-247.472-200.528-448.032-447.936-448.032-247.504 0.016-448.032 200.544-448.032 448.032z" />
 <glyph unicode="&#xe01c;" glyph-name="gear" data-tags="gear" d="M0.048 338.48c14.16-63.984 39.824-125.088 75.376-179.152 41.248 14.16 88.192 5.648 120.912-27.040 32.672-32.72 41.2-79.616 26.992-120.816 54.032-35.552 115.216-61.2 179.152-75.456 17.088 44.112 59.76 75.456 109.488 75.456 49.808 0 92.496-31.328 109.536-75.456 64.032 14.256 125.184 39.904 179.248 75.456-14.256 41.2-5.728 88.096 26.992 120.816 32.72 32.672 79.664 41.2 120.864 27.040 35.552 54.064 61.104 115.168 75.376 179.152-44.064 17.136-75.376 59.712-75.376 109.536s31.28 92.4 75.376 109.536c-14.256 63.984-39.824 125.088-75.376 179.152-41.2-14.16-88.144-5.648-120.864 27.040-32.72 32.72-41.248 79.616-26.992 120.816-54.096 35.536-115.248 61.184-179.28 75.44-17.040-44.112-59.712-75.456-109.536-75.456-49.712 0-92.4 31.328-109.488 75.456-63.936-14.256-125.136-39.904-179.152-75.456 14.208-41.2 5.696-88.096-26.992-120.816-32.72-32.672-79.664-41.2-120.912-27.040-35.52-54.080-61.184-115.184-75.344-179.168 44.064-17.136 75.376-59.712 75.376-109.536s-31.312-92.384-75.376-109.504zM153.6 448c0 197.68 160.784 358.4 358.352 358.4 197.728 0 358.4-160.736 358.4-358.4s-160.688-358.4-358.4-358.4c-197.568 0-358.352 160.736-358.352 358.4z" />
 <glyph unicode="&#xe01d;" glyph-name="cart" data-tags="cart" d="M204.848 655.616v149.312c-1.488 21.392-10 38.432-25.648 54.064-15.6 15.648-45.456 24.16-69.616 24.16h-35.552c-22.768 0-32.768-11.392-49.808-26.992-14.224-14.208-22.784-29.856-24.176-49.76h128v-531.904c0-22.72 8.56-42.672 25.552-58.272 17.088-15.696 46.944-24.16 69.712-24.16h476.384c22.72 0 32.72 11.344 49.808 26.992 14.16 14.256 22.688 29.904 24.16 49.808h-568.848v78.192c7.072-1.44 12.784-1.44 18.464-1.44h520.512c24.16 0 95.264 12.832 112.352 29.904 17.040 15.648 28.432 31.248 39.824 55.408l127.952 294.432c0 22.72-9.904 42.624-27.040 58.272-17.040 15.648-26.992 22.768-49.76 22.768h-723.808c-5.696 0-11.392 0-18.464-1.488v-75.376h742.304l-128-307.2-614.304 0.016v233.264zM614.4 76.816c0-35.552 28.48-63.984 64.032-63.984s63.984 28.432 63.984 63.984-28.432 63.984-63.984 63.984-64.032-28.432-64.032-63.984zM102.448 76.816c0-35.552 28.432-63.984 63.984-63.984s63.984 28.432 63.984 63.984-28.432 63.984-63.984 63.984-63.984-28.432-63.984-63.984z" />
@@ -78,8 +78,8 @@
 <glyph unicode="&#xe030;" glyph-name="share" data-tags="share" d="M943.632 883.184v-229.008l76.8-56.848v302.848c0 17.136-5.696 32.72-18.512 45.552-12.784 12.784-17.040 14.256-34.112 14.256h-896c-16.992 0-42.592-5.696-55.36-18.512-12.88-14.256-19.968-24.16-19.968-41.296v-894.464c0-17.040 7.072-36.944 19.952-51.2 12.784-12.784 38.384-18.464 55.36-18.464h896c17.088 0 21.344 5.696 34.112 18.464 12.832 14.256 18.512 34.16 18.512 51.2l0.016 292.944-76.8-56.848v-228.96h-870.352v870.336h870.352zM278.080 396.784h460.704v-128.016l288.72 179.2-288.72 179.184v-127.968h-358.304c-66.848 0-102.4-35.552-102.4-102.4z" />
 <glyph unicode="&#xe031;" glyph-name="refresh" data-tags="refresh" d="M922.288 332.832c2.88 8.512 4.272 17.040 5.696 25.6l-75.408 18.464c-1.392-8.512-2.88-17.088-5.696-24.16-52.544-206.24-263.024-331.376-469.264-278.736-204.8 54.032-329.872 264.48-275.904 469.28 52.688 206.224 263.12 331.36 469.312 277.344 115.168-28.48 204.752-108.096 251.696-209.104l-110.88-65.376c-2.88-14.256 4.224-28.432 18.432-31.28l199.104-51.2c14.208-2.88 28.48 4.272 31.328 18.512l51.152 199.072c2.832 14.256-4.224 28.432-18.464 31.28l-103.776-61.104c-56.896 116.56-163.552 208.976-300.064 244.528-247.488 64.048-499.232-85.344-563.216-332.768-63.968-247.472 85.312-499.184 332.816-563.104 247.424-64.080 499.104 85.312 563.136 332.752z" />
 <glyph unicode="&#xe032;" glyph-name="navigation" data-tags="navigation" d="M48.384 857.568c-26.992 0-48.336-21.36-48.336-46.96v-8.464c0-25.648 21.344-46.944 48.336-46.944h927.232c27.040 0 48.336 21.296 48.336 46.944v8.464c0 25.6-21.296 46.944-48.336 46.944l-927.232 0.016zM48.384 499.2c-26.992 0-48.336-21.344-48.336-46.944v-8.512c0-25.6 21.344-46.944 48.336-46.944h927.232c27.040 0 48.336 21.344 48.336 46.944v8.512c0 25.6-21.296 46.944-48.336 46.944h-927.232zM48.384 140.8c-26.992 0-48.336-21.28-48.336-46.928v-8.464c0-25.6 21.344-46.944 48.336-46.944l927.232-0.016c27.040 0 48.336 21.344 48.336 46.944v8.464c0 25.648-21.296 46.944-48.336 46.944l-927.232 0.016z" />
-<glyph unicode="&#xe033;" glyph-name="on-hold" data-tags="on-hold" d="M512.048 959.952c-283.024 0-512-228.96-512-511.904 0-283.024 228.96-512 512-512 282.944 0 511.904 228.96 511.904 512 0 282.944-228.96 511.904-511.904 511.904zM512.064 0.032c-247.488 0-448.032 200.528-448.032 448.032 0 247.376 200.528 447.936 448.032 447.936 247.408 0 447.936-200.528 447.936-447.936 0-247.488-200.528-448.032-447.936-448.032zM268.512 486.4v-76.784h487.008v76.784h-204.752z" />
-<glyph unicode="&#xe034;" glyph-name="external" data-tags="external" d="M307.2 780.56v-153.616h51.248v153.616h-51.248zM230.4 780.56v-153.616h25.648v153.616h-25.648zM435.2 780.56v-153.616h128.048v153.616h-128.048zM179.2 780.56v-153.616h25.648v153.616h-25.648zM819.152 780.56v-153.616h25.648v153.616h-25.648zM742.368 780.56v-153.616h25.616v153.616h-25.616zM614.4 780.56v-153.616h51.152v153.616h-51.152zM947.136 882.96v-358.352l-870.336-0.016v358.368h870.336zM971.312 959.792h-895.888c-17.088 0-42.624-5.728-55.456-18.512-12.8-14.208-19.92-24.208-19.92-41.2v-382.56c0-17.088 7.12-37.040 19.904-51.248 12.832-12.784 38.384-18.464 55.456-18.464h895.904c17.088 0 21.392 5.696 34.16 18.464 12.784 14.208 18.464 34.16 18.464 51.248l0.016 382.56c0 16.992-5.696 32.672-18.464 45.456-12.784 12.784-17.088 14.256-34.176 14.256zM707.648 157.968l-160.688 143.712c-18.464 22.752-36.992 22.752-55.52 0v-102.4l-143.6 0.016c-15.632 0-35.552-15.632-35.552-36.944v-79.664c0-21.36 14.16-36.992 31.28-36.992h147.84v-85.264c18.512-21.392 37.056-35.552 55.52-12.848l160.704 143.664c18.48 21.28 18.48 45.44 0.016 66.72z" />
+<glyph unicode="&#xe033;" glyph-name="on-hold" data-tags="on-hold" d="M512 960c-282.864 0-512-229.136-512-512s229.136-512 512-512c282.864 0 512 229.136 512 512s-229.136 512-512 512zM733.235 354.765h-442.469c-52.148 0-94.815 42.667-94.815 94.815s42.667 94.815 94.815 94.815h442.469c52.148 0 94.815-42.667 94.815-94.815s-42.667-94.815-94.815-94.815z" />
+<glyph unicode="&#xe034;" glyph-name="external" data-tags="external" d="M749.037 615.506l184.889 101.136-421.926 243.358-192.79-110.617zM512 485.926l197.531 107.457-429.827 232.296-191.21-110.617zM512 441.679l-444.049 240.198v-489.877l444.049-256 444.049 256v489.877l-444.049-240.198zM366.617 169.877c0-9.481-6.321-12.642-15.802-6.321l-142.222 82.173c-9.481 4.741-15.802 15.802-15.802 25.284v142.222c0 9.481 6.321 12.642 15.802 6.321l110.617-63.21-31.605-12.642-63.21 36.346v-110.617l110.617-63.21v47.407l31.605 12.642v-96.395zM414.025 222.025l-31.605 34.765v48.988l-88.494-37.926-22.123 34.765 96.395 41.086-64.79 37.926-15.802 41.086 126.42-72.691v-128z" />
 <glyph unicode="&#xe035;" glyph-name="expand-2" data-tags="expand-2" d="M571.664 837.952h193.632l-210.112-226.96c-26.736-26.72-23.472-80.064 6.64-113.488 29.968-30.064 70.096-33.296 100.048-6.624l210.24 226.848v-180.128h120.256v420.512h-420.704v-120.16zM452.256 386.448c-30.176 30.080-66.944 33.36-93.632 3.376l-206.736-220.32v186.976h-120.272v-420.48h420.672v120.080h-203.584l210.208 223.568c26.704 26.736 23.36 73.504-6.656 106.8z" />
 <glyph unicode="&#xe036;" glyph-name="contract-2" data-tags="contract-2" d="M66.272 303.072h193.632l-210.128-226.96c-26.736-26.72-23.472-80.064 6.656-113.472 29.968-30.080 70.080-33.312 100.032-6.624l210.24 226.848v-180.128h120.256v420.496h-420.688v-120.16zM967.616 933.84c-30.192 30.080-66.96 33.36-93.648 3.36l-206.736-220.304v186.976h-120.256v-420.48h420.672v120.064l-203.616-0.016 210.224 223.584c26.72 26.736 23.36 73.52-6.64 106.816z" />
 <glyph unicode="&#xe037;" glyph-name="phone" data-tags="phone" d="M251.488-54.704c-32.48 0-63.040 12.528-86.192 35.264l-127.744 112.304c-47.936 47.936-47.936 125.936 0 173.872l84.224 84.272c23.248 23.232 54.128 36 86.96 36 32.848 0 63.712-12.784 86.928-35.984-0.016 0.032-0.032 0.032-0.032 0.032 0.144 0 8.352-6.448 20.32-6.448 12.592 0 21.040 7.152 21.408 7.456l264.448 264.512c-0.016-0.016-0.032-0.032-0.048-0.032-0.112 0 6.464 8.256 6.464 20.32 0 7.664-2.688 13.824-4.928 17.6l-2.080 2.080c-47.936 47.936-47.936 125.936 0 173.872l84.272 84.272c23.216 23.216 54.080 36.016 86.928 36.016 32.48 0 63.040-12.512 86.192-35.264l127.76-112.304c23.248-23.232 36.032-54.112 36.032-86.944s-12.8-63.728-36.032-86.944l-647.92-647.936c-23.232-23.216-54.096-36.016-86.96-36.016zM80.624 137.2l127.632-112.208c23.136-23.12 63.392-23.104 86.512 0l647.936 647.936c11.552 11.552 17.92 26.928 17.92 43.248 0 16.016-6.128 31.136-17.28 42.608l-127.632 112.208c-23.152 23.12-63.392 23.104-86.512 0.016l-84.256-84.272c-11.552-11.552-17.936-26.912-17.936-43.248s6.368-31.696 17.936-43.248l8.048-8.768c7.76-11.312 17.056-29.952 17.072-54.576 0-37.024-21.472-60.8-23.92-63.376l-266.224-266.208c-3.216-3.056-27.008-24.496-63.984-24.496-36.992 0-60.752 21.424-63.328 23.872-12.176 12.176-27.536 18.528-43.872 18.528s-31.712-6.368-43.264-17.936l-84.24-84.24c-23.616-23.616-23.824-61.936-0.608-85.84z" />
@@ -89,9 +89,10 @@
 <glyph unicode="&#xe03b;" glyph-name="phone-fill" data-tags="phone-fill" d="M251.488-54.704c-32.48 0-63.040 12.528-86.192 35.264l-127.744 112.304c-47.936 47.936-47.936 125.936 0 173.872l84.224 84.272c23.248 23.232 54.128 36 86.96 36 32.848 0 63.712-12.784 86.928-35.984-0.016 0.032-0.032 0.032-0.032 0.032 0.144 0 8.352-6.448 20.32-6.448 12.592 0 21.040 7.152 21.408 7.456l264.448 264.512c-0.016-0.016-0.032-0.032-0.048-0.032-0.112 0 6.464 8.256 6.464 20.32 0 7.664-2.688 13.824-4.928 17.6l-2.080 2.080c-47.936 47.936-47.936 125.936 0 173.872l84.272 84.272c23.216 23.216 54.080 36.016 86.928 36.016 32.48 0 63.040-12.512 86.192-35.264l127.76-112.304c23.248-23.232 36.032-54.112 36.032-86.944s-12.8-63.728-36.032-86.944l-647.92-647.936c-23.232-23.216-54.096-36.016-86.96-36.016z" />
 <glyph unicode="&#xe03c;" glyph-name="status-fill" data-tags="status-fill" d="M5.264 448.048c0-283.024 228.96-512 511.904-512 283.024 0 512 228.96 512 512 0 282.928-228.96 511.904-512 511.904-282.944 0-511.904-228.96-511.904-511.904z" />
 <glyph unicode="&#xe03d;" glyph-name="woo" data-tags="woo" d="M612.192 533.664c0 6.896-3.136 51.6-28 51.6-37.36 0-46.704-72.256-46.704-82.624 0-3.408 3.152-58.496 28.032-58.496 34.192 0.032 46.672 72.288 46.672 89.52zM814.384 533.664c0 6.896-3.152 51.6-28.032 51.6-37.28 0-46.608-72.256-46.608-82.624 0-3.408 3.072-58.496 27.952-58.496 34.192 0.032 46.688 72.288 46.688 89.52zM141.296 959.232c-68.224 0-123.504-55.488-123.504-123.92v-650.72c0-68.432 55.296-123.92 123.504-123.92h339.808l123.504-123.936v123.936h278.048c68.224 0 123.52 55.472 123.52 123.92v650.72c0 68.432-55.296 123.92-123.52 123.92h-741.36zM668.16 537.072c0-55.088-31.088-154.88-102.64-154.88-6.208 0-18.496 3.616-25.424 6.016-32.512 11.168-50.192 49.696-52.352 66.256 0 0-3.072 17.792-3.072 40.752 0 22.992 3.072 45.328 3.072 45.328 15.552 75.728 43.552 106.736 96.448 106.736 59.072 0.032 83.968-58.528 83.968-110.208zM486.496 657.6c0-3.392-43.552-141.168-43.552-213.424v-75.712c-2.592-12.080-4.16-24.144-21.824-24.144-46.608 0-88.88 151.472-92.016 161.84-6.208-6.896-62.24-161.84-96.448-161.84-24.864 0-43.552 113.648-46.608 123.936-9.344 55.072-26.048 157.52-26.048 164.416 0 20.672 1.152 38.736 26.048 38.736 6.208 0 21.6-6.064 23.712-17.168 11.648-62.032 16.688-120.512 29.168-185.968 1.856-2.928 1.504-7.008 4.56-10.432 3.152 10.288 66.928 168.784 94.96 168.784 22.544 0 30.4-44.592 33.536-61.824 6.208-20.656 13.088-55.216 22.416-82.752 0 13.776 12.48 203.12 65.392 203.12 18.592-0.032 26.704-6.928 26.704-27.568zM870.32 537.072c0-55.088-31.088-154.88-102.64-154.88-6.192 0-18.448 3.616-25.424 6.016-32.432 11.168-50.176 49.696-52.288 66.256 0 0-3.888 17.92-3.888 40.896s3.888 45.184 3.888 45.184c15.552 75.728 43.488 106.736 96.384 106.736 59.104 0.032 83.968-58.528 83.968-110.208z" />
-<glyph unicode="&#xe600;" glyph-name="coupon" data-tags="coupon" d="M944.946 804.152v-131.514c-92.58-32.661-159.103-121.022-159.103-224.631s66.523-191.985 159.103-224.631v-131.514h-865.988v131.514c92.58 32.661 159.103 121.022 159.103 224.631s-66.523 191.985-159.103 224.631v131.514h865.988zM991.765 883.159h-959.626c-17.776 0-32.187-14.032-32.187-31.35v-244.714c87.871 0 159.103-71.232 159.103-159.103s-71.232-159.087-159.103-159.087v-244.714c0-17.318 14.411-31.35 32.187-31.35h959.626c17.776 0 32.187 14.032 32.187 31.35v244.714c-87.871 0-159.103 71.232-159.103 159.103s71.232 159.103 159.103 159.103v244.698c0 17.318-14.411 31.35-32.187 31.35v0z" />
-<glyph unicode="&#xe601;" glyph-name="limit" data-tags="limit" d="M873.967 809.999c-200.139 200.139-523.906 200.107-724.045-0.032-200.075-200.060-200.107-523.827 0.032-723.966 200.091-200.091 523.922-200.123 723.997-0.047 200.139 200.123 200.107 523.954 0.016 724.045zM828.697 131.209c-174.936-174.936-458.552-174.92-633.504 0.032-174.999 174.983-174.936 458.536-0.016 633.472 174.999 174.999 458.552 175.046 633.551 0.047 174.951-174.951 174.967-458.568-0.032-633.551zM286.603 538.596l58.338-58.338-131.688-5.072c-16.101 0-31.192-17.050-32.187-36.153-0.032-18.108 11.077-31.176 28.158-32.14l131.688 5.009-54.277-54.277 36.248-36.248 126.679 126.679-126.742 126.742-36.216-36.201zM815.819 486.326l-128.685-4.077 56.331 56.331-36.232 36.232-126.679-126.679 126.758-126.758 36.169 36.169-61.34 61.34 130.692 4.045c16.101 0 29.217 15.106 30.196 34.162-0.032 18.171-10.113 30.212-27.21 29.232zM488.259 703.972h47.404v-511.945h-47.404v511.945z" />
-<glyph unicode="&#xe602;" glyph-name="restricted" data-tags="restricted" d="M511.992 959.937c-283.016 0-511.976-228.96-511.976-511.897 0-283.032 228.96-511.992 511.976-511.992 282.937 0 511.897 228.96 511.897 511.992 0 282.937-228.96 511.897-511.897 511.897zM63.979 448.055c0 247.369 200.534 447.934 448.029 447.934 109.866 0 210.441-39.614 288.357-105.252l-631.102-631.134c-65.654 77.932-105.284 178.538-105.284 288.452zM512.024 0.011c-109.913 0-210.52 39.614-288.468 105.284l631.134 631.134c65.638-77.932 105.268-178.491 105.268-288.373 0-247.479-200.549-448.044-447.934-448.044z" />
+<glyph unicode="&#xe600;" glyph-name="coupon" data-tags="coupon" d="M992.395 884.148h-960.79c-17.383 0-31.605-14.222-31.605-31.605v-244.938c88.494 0 159.605-71.111 159.605-159.605s-71.111-159.605-159.605-159.605v-244.938c0-17.383 14.222-31.605 31.605-31.605h959.21c17.383 0 31.605 14.222 31.605 31.605v244.938c-88.494 0-159.605 71.111-159.605 159.605s71.111 159.605 159.605 159.605v244.938c1.58 17.383-12.642 31.605-30.025 31.605v0z" />
+<glyph unicode="&#xe601;" glyph-name="limit" data-tags="limit" d="M0 421.136v55.309h330.272l-110.617 110.617 26.864 55.309 192.79-192.79-192.79-192.79-26.864 55.309 110.617 110.617h-330.272zM693.728 421.136l110.617-110.617-26.864-55.309-192.79 192.79 192.79 192.79 26.864-55.309-110.617-110.617h330.272v-55.309h-330.272zM478.815 960h64.79v-1024h-64.79v1024z" />
+<glyph unicode="&#xe602;" glyph-name="restricted" data-tags="restricted" d="M512 960c-282.864 0-512-229.136-512-512s229.136-512 512-512c282.864 0 512 229.136 512 512s-229.136 512-512 512zM709.531 757.728l-505.679-505.679c-37.926 58.469-58.469 128-58.469 197.531 0 202.272 164.346 366.617 366.617 366.617 71.111-1.58 139.062-22.123 197.531-58.469zM820.148 645.531c37.926-58.469 58.469-128 58.469-197.531 0-202.272-164.346-366.617-366.617-366.617-71.111 0-139.062 20.543-197.531 58.469l505.679 505.679z" />
 <glyph unicode="&#xe603;" glyph-name="edit" data-tags="edit" d="M999.966 815.419l-120.121 120.121c-31.84 31.84-83.478 31.84-115.318 0l-678.648-678.632-85.832-320.339 320.339 85.832 0.948-0.948 678.648 678.648c31.84 31.84 31.84 83.478-0.016 115.318zM107.401 93.617l34.162 127.5 143.049-143.049-127.5-34.162-49.711 49.711zM827.891 617.176l-146.304 146.304 120.184 120.184 146.304-146.304-120.184-120.184z" />
 <glyph unicode="&#xe604;" glyph-name="ccv" data-tags="ccv" d="M688.988 466.963h169.086v-72.691h-169.086v72.691zM894.42 133.531h-820.148v420.346h434.568c15.802 33.185 36.346 63.21 61.63 86.914h-496.198v120.099h820.148v-66.37c26.864-12.642 50.568-28.444 72.691-47.407v109.037c0 22.123-9.481 39.506-25.284 55.309-15.802 14.222-25.284 22.123-47.407 22.123h-802.765c-22.123 0-50.568-7.901-66.37-22.123s-23.704-31.605-23.704-53.728v-616.296c0-22.123 7.901-42.667 23.704-56.889s44.247-22.123 66.37-22.123h804.346c22.123 0 31.605 7.901 47.407 22.123s23.704 36.346 23.704 56.889v71.111c-22.123-18.963-45.827-34.765-72.691-47.407v-31.605zM774.321 678.716c-137.481 0-248.099-110.617-248.099-248.099s110.617-248.099 248.099-248.099 248.099 110.617 248.099 248.099-112.198 248.099-248.099 248.099zM584.691 430.617c0 104.296 85.333 189.63 189.63 189.63s189.63-85.333 189.63-189.63-85.333-189.63-189.63-189.63-189.63 85.333-189.63 189.63zM224.395 466.963v-72.691h259.16c-1.58 12.642-3.16 23.704-3.16 36.346s1.58 23.704 3.16 36.346h-259.16z" />
-</font></defs></svg>
\ No newline at end of file
+<glyph unicode="&#xe900;" glyph-name="storefront" data-tags="storefront" d="M794.864 503.309c-26.864 0-52.148 11.062-71.111 28.444-18.963-17.383-42.667-28.444-71.111-28.444-26.864 0-52.148 11.062-71.111 28.444-18.963-17.383-42.667-28.444-71.111-28.444-26.864 0-52.148 11.062-71.111 28.444-18.963-17.383-42.667-28.444-71.111-28.444-26.864 0-52.148 11.062-71.111 28.444-18.963-17.383-42.667-28.444-71.111-28.444s-52.148 11.062-71.111 28.444c-17.383-15.802-41.086-26.864-66.37-28.444v-372.938c0-25.284 20.543-47.407 47.407-47.407h230.716v1.58c18.963 0 41.086 22.123 41.086 41.086h1.58v162.765c25.284-14.222 58.469-22.123 94.815-22.123s69.531 7.901 94.815 22.123v-162.765h1.58c0-18.963 22.123-41.086 41.086-41.086v-1.58h230.716c25.284 0 47.407 20.543 47.407 47.407v374.519c-22.123 3.16-41.086 12.642-56.889 26.864-15.802-17.383-41.086-28.444-67.951-28.444zM319.21 294.716c0-17.383-14.222-31.605-31.605-31.605h-67.951c-17.383 0-31.605 14.222-31.605 31.605v67.951c0 17.383 14.222 31.605 31.605 31.605h67.951c17.383 0 31.605-14.222 31.605-31.605v-67.951zM828.049 294.716c0-17.383-14.222-31.605-31.605-31.605h-67.951c-17.383 0-31.605 14.222-31.605 31.605v67.951c0 17.383 14.222 31.605 31.605 31.605h67.951c17.383 0 31.605-14.222 31.605-31.605v-67.951zM993.975 813.037h-965.531c-15.802 0-30.025-12.642-30.025-30.025v-175.407c0-47.407 39.506-86.914 86.914-86.914 28.444 0 55.309 14.222 71.111 36.346 15.802-22.123 41.086-36.346 71.111-36.346s55.309 14.222 71.111 36.346c15.802-22.123 41.086-36.346 71.111-36.346 28.444 0 55.309 14.222 71.111 36.346 15.802-22.123 41.086-36.346 71.111-36.346s55.309 14.222 71.111 36.346c15.802-22.123 41.086-36.346 71.111-36.346 28.444 0 55.309 14.222 71.111 36.346 15.802-22.123 41.086-36.346 71.111-36.346 28.444 0 55.309 14.222 71.111 36.346 15.802-22.123 41.086-36.346 71.111-36.346 47.407 0 86.914 39.506 86.914 86.914v175.407c-1.58 17.383-14.222 30.025-31.605 30.025z" />
+</font></defs></svg>
diff --git a/assets/fonts/WooCommerce.ttf b/assets/fonts/WooCommerce.ttf
old mode 100755
new mode 100644
index 4115963c3cc..342019b7d7c
Binary files a/assets/fonts/WooCommerce.ttf and b/assets/fonts/WooCommerce.ttf differ
diff --git a/assets/fonts/WooCommerce.woff b/assets/fonts/WooCommerce.woff
old mode 100755
new mode 100644
index f152a05de66..60fb3de036b
Binary files a/assets/fonts/WooCommerce.woff and b/assets/fonts/WooCommerce.woff differ
diff --git a/assets/images/chosen-sprite.png b/assets/images/chosen-sprite.png
deleted file mode 100644
index 4cb687bc231..00000000000
Binary files a/assets/images/chosen-sprite.png and /dev/null differ
diff --git a/assets/images/chosen-sprite@2x.png b/assets/images/chosen-sprite@2x.png
deleted file mode 100644
index bd61d9638f0..00000000000
Binary files a/assets/images/chosen-sprite@2x.png and /dev/null differ
diff --git a/assets/images/icons/credit-cards/amex.svg b/assets/images/icons/credit-cards/amex.svg
new file mode 100644
index 00000000000..9fe30485465
--- /dev/null
+++ b/assets/images/icons/credit-cards/amex.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="752px" height="471px" viewBox="0 0 752 471" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.1 (12005) - http://www.bohemiancoding.com/sketch -->
+    <title>Slice 1</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="amex" sketch:type="MSLayerGroup">
+            <rect id="Rectangle-1" fill="#2557D6" sketch:type="MSShapeGroup" x="1" y="0" width="750" height="471" rx="40"></rect>
+            <path d="M1.002688,221.18508 L37.026849,221.18508 L45.149579,201.67506 L63.334596,201.67506 L71.436042,221.18508 L142.31637,221.18508 L142.31637,206.26909 L148.64322,221.24866 L185.43894,221.24866 L191.76579,206.04654 L191.76579,221.18508 L367.91701,221.18508 L367.83451,189.15941 L371.2427,189.15941 C373.62924,189.24161 374.3263,189.46144 374.3263,193.38516 L374.3263,221.18508 L465.43232,221.18508 L465.43232,213.72973 C472.78082,217.6508 484.21064,221.18508 499.25086,221.18508 L537.57908,221.18508 L545.78163,201.67506 L563.96664,201.67506 L571.98828,221.18508 L645.84844,221.18508 L645.84844,202.65269 L657.0335,221.18508 L716.22061,221.18508 L716.22061,98.67789 L657.64543,98.67789 L657.64543,113.14614 L649.44288,98.67789 L589.33787,98.67789 L589.33787,113.14614 L581.80579,98.67789 L500.61839,98.67789 C487.02818,98.67789 475.08221,100.5669 465.43232,105.83121 L465.43232,98.67789 L409.40596,98.67789 L409.40596,105.83121 C403.26536,100.40529 394.89786,98.67789 385.59383,98.67789 L180.90796,98.67789 L167.17407,130.3194 L153.07037,98.67789 L88.59937,98.67789 L88.59937,113.14614 L81.516924,98.67789 L26.533518,98.67789 L0.999997,156.92445 L0.999997,221.18508 L1.002597,221.18508 L1.002688,221.18508 Z M228.39922,203.51436 L206.78472,203.51436 L206.70492,134.72064 L176.13228,203.51436 L157.62,203.51436 L126.96754,134.6597 L126.96754,203.51436 L84.084427,203.51436 L75.982981,183.92222 L32.083524,183.92222 L23.8996,203.51436 L1.000047,203.51436 L38.756241,115.67692 L70.08183,115.67692 L105.94103,198.84086 L105.94103,115.67692 L140.35289,115.67692 L167.94569,175.26406 L193.29297,115.67692 L228.39657,115.67692 L228.39657,203.51436 L228.39957,203.51436 L228.39922,203.51436 Z M68.777214,165.69287 L54.346265,130.67606 L39.997794,165.69287 L68.777214,165.69287 L68.777214,165.69287 Z M314.41947,203.51436 L243.98611,203.51436 L243.98611,115.67692 L314.41947,115.67692 L314.41947,133.96821 L265.07116,133.96821 L265.07116,149.8009 L313.23551,149.8009 L313.23551,167.80606 L265.07116,167.80606 L265.07116,185.34759 L314.41947,185.34759 L314.41947,203.51436 L314.41947,203.51436 Z M413.67528,139.33321 C413.67528,153.33782 404.28877,160.57326 398.81863,162.74575 C403.43206,164.49434 407.37237,167.58351 409.24808,170.14281 C412.22525,174.51164 412.73875,178.41416 412.73875,186.25897 L412.73875,203.51436 L391.47278,203.51436 L391.39298,192.43732 C391.39298,187.1518 391.90115,179.55074 388.0646,175.32499 C384.98366,172.23581 380.28774,171.56552 372.69714,171.56552 L350.06363,171.56552 L350.06363,203.51436 L328.98125,203.51436 L328.98125,115.67692 L377.47552,115.67692 C388.25084,115.67692 396.18999,115.9604 403.00639,119.88413 C409.67644,123.80786 413.67529,129.53581 413.67529,139.33321 L413.67528,139.33321 Z M387.02277,152.37632 C384.1254,154.12756 380.69859,154.18584 376.59333,154.18584 L350.97998,154.18584 L350.97998,134.67583 L376.94186,134.67583 C380.61611,134.67583 384.44999,134.8401 386.94029,136.26016 C389.67536,137.53981 391.36749,140.26337 391.36749,144.02548 C391.36749,147.86443 389.75784,150.95361 387.02277,152.37632 L387.02277,152.37632 Z M447.48908,203.51436 L425.97569,203.51436 L425.97569,115.67692 L447.48908,115.67692 L447.48908,203.51436 L447.48908,203.51436 Z M697.22856,203.51436 L667.35032,203.51436 L627.38585,137.58727 L627.38585,203.51436 L584.44687,203.51436 L576.24166,183.92222 L532.44331,183.92222 L524.48287,203.51436 L499.81137,203.51436 C489.56284,203.51436 476.58722,201.25709 469.23872,193.79909 C461.82903,186.3411 457.97386,176.23903 457.97386,160.26593 C457.97386,147.23895 460.27791,135.33 469.33983,125.91941 C476.15621,118.90916 486.83044,115.67692 501.35982,115.67692 L521.77174,115.67692 L521.77174,134.49809 L501.78818,134.49809 C494.0938,134.49809 489.74909,135.63733 485.564,139.70147 C481.96957,143.4 479.50322,150.39171 479.50322,159.59829 C479.50322,169.00887 481.38158,175.79393 485.30061,180.22633 C488.5465,183.70232 494.445,184.75677 499.99495,184.75677 L509.46393,184.75677 L539.17987,115.67957 L570.77152,115.67957 L606.46843,198.76138 L606.46843,115.67957 L638.5709,115.67957 L675.6327,176.85368 L675.6327,115.67957 L697.22856,115.67957 L697.22856,203.51436 L697.22856,203.51436 Z M569.07051,165.69287 L554.47993,130.67606 L539.96916,165.69287 L569.07051,165.69287 L569.07051,165.69287 Z" id="Path" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M750.95644,343.76716 C745.83485,351.22516 735.85504,355.00582 722.34464,355.00582 L681.62723,355.00582 L681.62723,336.1661 L722.17969,336.1661 C726.20248,336.1661 729.01736,335.63887 730.71215,333.99096 C732.18079,332.63183 733.2051,330.65804 733.2051,328.26036 C733.2051,325.70107 732.18079,323.66899 730.62967,322.45028 C729.09984,321.10969 726.87294,320.50033 723.20135,320.50033 C703.40402,319.83005 678.70592,321.10969 678.70592,293.30714 C678.70592,280.56363 686.83131,267.14983 708.95664,267.14983 L750.95379,267.14983 L750.95379,249.66925 L711.93382,249.66925 C700.15812,249.66925 691.60438,252.47759 685.54626,256.84375 L685.54626,249.66925 L627.83044,249.66925 C618.60091,249.66925 607.76706,251.94771 602.64279,256.84375 L602.64279,249.66925 L499.57751,249.66925 L499.57751,256.84375 C491.37496,250.95154 477.53466,249.66925 471.14663,249.66925 L403.16366,249.66925 L403.16366,256.84375 C396.67452,250.58593 382.24357,249.66925 373.44772,249.66925 L297.3633,249.66925 L279.95252,268.43213 L263.64586,249.66925 L149.99149,249.66925 L149.99149,372.26121 L261.50676,372.26121 L279.447,353.20159 L296.34697,372.26121 L365.08554,372.32211 L365.08554,343.48364 L371.84339,343.48364 C380.96384,343.62405 391.72054,343.25845 401.21079,339.17311 L401.21079,372.25852 L457.90762,372.25852 L457.90762,340.30704 L460.64268,340.30704 C464.13336,340.30704 464.47657,340.45011 464.47657,343.92344 L464.47657,372.25587 L636.71144,372.25587 C647.64639,372.25587 659.07621,369.46873 665.40571,364.41107 L665.40571,372.25587 L720.03792,372.25587 C731.40656,372.25587 742.50913,370.66889 750.95644,366.60475 L750.95644,343.76712 L750.95644,343.76716 Z M409.45301,296.61266 C409.45301,321.01872 391.16689,326.05784 372.7371,326.05784 L346.42935,326.05784 L346.42935,355.52685 L305.44855,355.52685 L279.48667,326.44199 L252.5058,355.52685 L168.9904,355.52685 L168.9904,267.66822 L253.79086,267.66822 L279.73144,296.46694 L306.55002,267.66822 L373.92106,267.66822 C390.6534,267.66822 409.45301,272.28078 409.45301,296.61266 L409.45301,296.61266 Z M241.82781,337.04655 L189.9892,337.04655 L189.9892,319.56596 L236.27785,319.56596 L236.27785,301.64028 L189.9892,301.64028 L189.9892,285.66718 L242.84947,285.66718 L265.91132,311.27077 L241.82781,337.04655 L241.82781,337.04655 Z M325.3545,347.10668 L292.9833,311.3189 L325.3545,276.6677 L325.3545,347.10668 L325.3545,347.10668 Z M373.2272,308.04117 L345.98027,308.04117 L345.98027,285.66718 L373.47197,285.66718 C381.08388,285.66718 386.36777,288.75636 386.36777,296.43956 C386.36777,304.03796 381.32865,308.04117 373.2272,308.04117 L373.2272,308.04117 Z M515.97053,267.66822 L586.34004,267.66822 L586.34004,285.83764 L536.96778,285.83764 L536.96778,301.81074 L585.1348,301.81074 L585.1348,319.73642 L536.96778,319.73642 L536.96778,337.21701 L586.34004,337.29641 L586.34004,355.52678 L515.97053,355.52678 L515.97053,267.66815 L515.97053,267.66822 Z M488.91724,314.6973 C493.61049,316.42205 497.44703,319.51387 499.24559,322.07317 C502.22276,326.36251 502.65378,330.36571 502.73891,338.10985 L502.73891,355.52685 L481.5714,355.52685 L481.5714,344.53458 C481.5714,339.24908 482.08223,331.42282 478.1632,327.33748 C475.08226,324.19002 470.38635,323.4376 462.69463,323.4376 L440.16223,323.4376 L440.16223,355.52685 L418.97609,355.52685 L418.97609,267.66822 L467.65393,267.66822 C478.32816,267.66822 486.10236,268.13716 493.02251,271.81449 C499.6766,275.8177 503.86168,281.30191 503.86168,291.3245 C503.85868,305.34765 494.46719,312.50362 488.91724,314.6973 L488.91724,314.6973 Z M476.99899,303.59022 C474.17879,305.25668 470.69077,305.39975 466.58817,305.39975 L440.97483,305.39975 L440.97483,285.66718 L466.9367,285.66718 C470.69077,285.66718 474.4475,285.74658 476.99899,287.25416 C479.7314,288.67687 481.36499,291.39779 481.36499,295.15725 C481.36499,298.91672 479.7314,301.94496 476.99899,303.59022 L476.99899,303.59022 Z M667.33539,309.1866 C671.44067,313.41766 673.64095,318.7588 673.64095,327.80112 C673.64095,346.70178 661.78278,355.5242 640.51948,355.5242 L599.45353,355.5242 L599.45353,336.68449 L640.35453,336.68449 C644.35337,336.68449 647.18954,336.15726 648.9668,334.50934 C650.41681,333.15021 651.45709,331.17643 651.45709,328.77875 C651.45709,326.21944 650.33167,324.18738 648.88433,322.96866 C647.27201,321.62807 645.04778,321.01872 641.37619,321.01872 C621.65868,320.34843 596.9659,321.62807 596.9659,293.82551 C596.9659,281.08201 605.00615,267.66822 627.11019,267.66822 L669.37872,267.66822 L669.37872,286.36752 L630.70196,286.36752 C626.86809,286.36752 624.37512,286.51059 622.25464,287.9545 C619.94527,289.37721 619.08856,291.48876 619.08856,294.2759 C619.08856,297.59028 621.04941,299.8449 623.702,300.81987 C625.92624,301.59084 628.31543,301.81603 631.9072,301.81603 L643.25722,302.12071 C654.703,302.39889 662.55967,304.37003 667.33539,309.1866 L667.33539,309.1866 Z M751,285.66718 L712.57335,285.66718 C708.7368,285.66718 706.18797,285.81025 704.04088,287.25416 C701.81665,288.67687 700.95995,290.78843 700.95995,293.57558 C700.95995,296.88994 702.83831,299.14456 705.57071,300.11953 C707.79495,300.8905 710.18415,301.1157 713.6961,301.1157 L725.12327,301.42038 C736.65419,301.70387 744.35123,303.67765 749.04448,308.49157 C749.89852,309.16186 750.41202,309.91428 751,310.6667 L751,285.66718 L751,285.66718 Z" id="path13" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/assets/images/icons/credit-cards/diners.svg b/assets/images/icons/credit-cards/diners.svg
new file mode 100644
index 00000000000..b0c78cdd712
--- /dev/null
+++ b/assets/images/icons/credit-cards/diners.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="750px" height="471px" viewBox="0 0 750 471" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.2 (12043) - http://www.bohemiancoding.com/sketch -->
+    <title>diners</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="diners" sketch:type="MSLayerGroup">
+            <rect id="rectangle" fill="#0079BE" sketch:type="MSShapeGroup" x="0" y="0" width="750" height="471" rx="40"></rect>
+            <path d="M584.933911,237.947339 C584.933911,138.53154 501.952976,69.8140806 411.038924,69.8471464 L332.79674,69.8471464 C240.793699,69.8140806 165.066089,138.552041 165.066089,237.947339 C165.066089,328.877778 240.793699,403.587432 332.79674,403.150963 L411.038924,403.150963 C501.952976,403.586771 584.933911,328.857939 584.933911,237.947339 L584.933911,237.947339 Z" id="Shape-path" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M333.280302,83.9308394 C249.210378,83.9572921 181.085889,152.238282 181.066089,236.510581 C181.085889,320.768331 249.209719,389.042708 333.280302,389.069161 C417.370025,389.042708 485.508375,320.768331 485.520254,236.510581 C485.507715,152.238282 417.370025,83.9572921 333.280302,83.9308394 L333.280302,83.9308394 Z" id="Shape-path" fill="#0079BE" sketch:type="MSShapeGroup"></path>
+            <path d="M237.066089,236.09774 C237.145288,194.917524 262.812421,159.801587 299.006443,145.847134 L299.006443,326.327183 C262.812421,312.380667 237.144628,277.283907 237.066089,236.09774 Z M368.066089,326.372814 L368.066089,145.847134 C404.273312,159.767859 429.980043,194.903637 430.046043,236.103692 C429.980043,277.316312 404.273312,312.425636 368.066089,326.372814 Z" id="Path" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/assets/images/icons/credit-cards/discover.svg b/assets/images/icons/credit-cards/discover.svg
new file mode 100644
index 00000000000..b2e4636ef1a
--- /dev/null
+++ b/assets/images/icons/credit-cards/discover.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="780px" height="501px" viewBox="0 0 780 501" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.2 (12043) - http://www.bohemiancoding.com/sketch -->
+    <title>discover</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="discover" sketch:type="MSLayerGroup">
+            <path d="M54.992188,0 C24.626565,0 -4.7369516e-15,24.629374 0,55.003906 L0,445.99609 C0,476.37636 24.618673,501 54.992188,501 L725.00781,501 C755.37344,501 780,476.37062 780,445.99609 L780,268.55664 L780,55.003906 C780,24.623637 755.38133,-4.7369516e-15 725.00781,0 L54.992188,0 L54.992188,0 Z" id="rectangle" fill="#4D4D4D" sketch:type="MSShapeGroup"></path>
+            <path d="M415.13086,161.21289 C446.07103,161.21289 471.15234,184.79287 471.15234,213.92188 L471.15234,213.95508 C471.15234,243.08408 446.07103,266.69727 415.13086,266.69727 C384.19069,266.69727 359.10938,243.08408 359.10938,213.95508 L359.10938,213.92188 C359.10938,184.79287 384.19069,161.21289 415.13086,161.21289 L415.13086,161.21289 Z M327.15234,161.89258 C335.9889,161.89258 343.40028,163.67723 352.41992,167.98242 L352.41992,190.73438 C343.87628,182.87089 336.46483,179.58008 326.66406,179.58008 C307.4002,179.58008 292.25,194.59455 292.25,213.63086 C292.25,233.70517 306.93133,247.82617 327.61914,247.82617 C336.93171,247.82617 344.20582,244.70584 352.41992,236.96875 L352.41992,259.73242 C343.07888,263.87291 335.50876,265.50781 326.66406,265.50781 C295.38621,265.50781 271.08203,242.91198 271.08203,213.77148 C271.08203,184.94507 296.03316,161.89258 327.15234,161.89258 L327.15234,161.89258 Z M230.03906,162.51953 C241.58477,162.51953 252.14952,166.24004 260.98242,173.51367 L250.23438,186.76172 C244.88362,181.11594 239.82337,178.73438 233.66992,178.73438 C224.81668,178.73437 218.36914,183.47936 218.36914,189.72266 C218.36914,195.07734 221.98883,197.91138 234.31445,202.20508 C257.67927,210.24859 264.60352,217.3809 264.60352,233.13086 C264.60352,252.32421 249.62806,265.68359 228.2832,265.68359 C212.65323,265.68359 201.29008,259.88895 191.82617,246.8125 L205.09375,234.78125 C209.82489,243.39164 217.71615,248.00391 227.51367,248.00391 C236.67693,248.00391 243.46094,242.05155 243.46094,234.01953 C243.46094,229.85606 241.40612,226.28585 237.30273,223.76172 C235.2368,222.56668 231.1447,220.78491 223.10352,218.11523 C203.81198,211.57701 197.19336,204.58834 197.19336,190.92969 C197.19336,174.70478 211.40702,162.51953 230.03906,162.51953 L230.03906,162.51953 Z M464.76172,164.24805 L487.19922,164.24805 L515.2832,230.83984 L543.72852,164.24805 L565.99609,164.24805 L520.50195,265.93359 L509.44922,265.93359 L464.76172,164.24805 L464.76172,164.24805 Z M67.414062,164.40039 L97.564453,164.40039 C130.87609,164.40039 154.09766,184.78179 154.09766,214.04102 C154.09766,228.63041 146.99364,242.73654 134.98047,252.09766 C124.87172,259.99945 113.35396,263.54297 97.40625,263.54297 L67.414062,263.54297 L67.414062,164.40039 L67.414062,164.40039 Z M163.54883,164.40039 L184.08984,164.40039 L184.08984,263.54297 L163.54883,263.54297 L163.54883,164.40039 L163.54883,164.40039 Z M575.2832,164.40039 L633.53516,164.40039 L633.53516,181.19922 L595.80859,181.19922 L595.80859,203.20508 L632.14453,203.20508 L632.14453,219.99609 L595.80859,219.99609 L595.80859,246.75781 L633.53516,246.75781 L633.53516,263.54297 L575.2832,263.54297 L575.2832,164.40039 L575.2832,164.40039 Z M647.14062,164.40039 L677.5957,164.40039 C701.28599,164.40039 714.86133,175.11052 714.86133,193.67188 C714.86133,208.85113 706.34712,218.81273 690.875,221.77734 L724.02344,263.54297 L698.76367,263.54297 L670.33398,223.71484 L667.65625,223.71484 L667.65625,263.54297 L647.14062,263.54297 L647.14062,164.40039 L647.14062,164.40039 Z M667.65625,180.01562 L667.65625,210.04102 L673.6582,210.04102 C686.77472,210.04102 693.72656,204.67918 693.72656,194.71289 C693.72656,185.06451 686.77347,180.01562 673.98242,180.01562 L667.65625,180.01562 L667.65625,180.01562 Z M87.939453,181.19922 L87.939453,246.75781 L93.451172,246.75781 C106.72432,246.75781 115.10685,244.36382 121.56055,238.87891 C128.66438,232.92288 132.9375,223.41276 132.9375,213.89844 C132.9375,204.39943 128.66438,195.17283 121.56055,189.2168 C114.77608,183.43696 106.72432,181.19922 93.451172,181.19922 L87.939453,181.19922 L87.939453,181.19922 Z" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M779.981917,288.361069 C753.932037,306.691919 558.904907,437.700579 221.228007,500.98412 L724.989727,500.98412 C755.355357,500.98412 779.981917,476.35474 779.981917,445.980209 L779.981917,288.361069 L779.981917,288.361069 Z" id="Shape-9" fill="#F47216" sketch:type="MSShapeGroup"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/assets/images/icons/credit-cards/jcb.svg b/assets/images/icons/credit-cards/jcb.svg
new file mode 100644
index 00000000000..b30f4c3cab1
--- /dev/null
+++ b/assets/images/icons/credit-cards/jcb.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="750px" height="471px" viewBox="0 0 750 471" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.1 (12005) - http://www.bohemiancoding.com/sketch -->
+    <title>Slice 1</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <linearGradient x1="0.031607858%" y1="49.9998574%" x2="99.9743153%" y2="49.9998574%" id="linearGradient-1">
+            <stop stop-color="#007B40" offset="0%"></stop>
+            <stop stop-color="#55B330" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="0.471693172%" y1="49.999826%" x2="99.9860086%" y2="49.999826%" id="linearGradient-2">
+            <stop stop-color="#1D2970" offset="0%"></stop>
+            <stop stop-color="#006DBA" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="0.113880772%" y1="50.0008964%" x2="99.9860003%" y2="50.0008964%" id="linearGradient-3">
+            <stop stop-color="#6E2B2F" offset="0%"></stop>
+            <stop stop-color="#E30138" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="jcb" sketch:type="MSLayerGroup">
+            <rect id="Rectangle-1" fill="#0E4C96" sketch:type="MSShapeGroup" x="0" y="0" width="750" height="471" rx="40"></rect>
+            <path d="M617.243183,346.766281 C617.243183,388.380887 583.514892,422.125974 541.88349,422.125974 L132.756823,422.125974 L132.756823,124.244916 C132.756823,82.6186826 166.489851,48.8744567 208.121683,48.8744567 L617.242752,48.874026 L617.242752,346.766281 L617.243183,346.766281 L617.243183,346.766281 Z" id="path3494" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M483.858874,242.044797 C495.542699,242.298285 507.296188,241.528806 518.936004,242.444883 C530.723244,244.645678 533.563915,262.487874 523.09234,268.332511 C515.950746,272.182115 507.459496,269.764696 499.713328,270.446208 L483.858874,270.446208 L483.858874,242.044797 L483.858874,242.044797 Z M525.691826,209.900487 C528.288491,219.064679 519.453903,227.292118 510.625917,226.030566 L483.858874,226.030566 C484.043758,217.388441 483.491345,208.008973 484.131053,199.821663 C494.854942,200.123386 505.679576,199.205849 516.340394,200.301853 C520.921799,201.451558 524.753935,205.217712 525.691826,209.900487 L525.691826,209.900487 Z M590.120412,73.9972254 C590.617872,91.498454 590.191471,109.92365 590.33359,127.780192 C590.299137,200.376358 590.405942,272.974174 590.278896,345.569303 C589.81042,372.776592 565.696524,396.413678 538.678749,396.956694 C511.63292,397.068451 484.584297,396.972628 457.537396,397.004497 L457.537396,287.253291 C487.007,287.099803 516.49604,287.561 545.953521,287.021594 C559.62072,286.162769 574.586027,277.145695 575.22328,262.107374 C576.833661,247.005483 562.592128,236.557185 549.071096,234.905684 C543.872773,234.770542 544.027132,233.390846 549.071096,232.788972 C561.96307,230.002483 572.090675,216.655787 568.296786,203.290229 C565.06052,189.232374 549.523839,183.79142 536.600366,183.817768 C510.248548,183.638612 483.891299,183.792359 457.537396,183.74111 C457.708585,163.252408 457.182916,142.740653 457.82271,122.267364 C459.910361,95.5513766 484.628603,73.5195319 511.269759,73.997656 C537.553166,73.9973692 563.837737,73.9982301 590.120412,73.9972254 L590.120412,73.9972254 Z" id="path3496" fill="url(#linearGradient-1)" sketch:type="MSShapeGroup"></path>
+            <path d="M159.740429,125.040498 C160.413689,97.8766592 184.628619,74.4290299 211.614797,74.0325398 C238.559493,73.9499686 265.506204,74.0209119 292.451671,73.9972254 C292.37764,164.882488 292.599905,255.773672 292.340301,346.655222 C291.302298,373.488802 267.350548,396.488661 240.661356,396.962292 C213.665015,397.060957 186.666275,396.976074 159.669012,397.004497 L159.669012,283.550875 C185.891623,289.745491 213.391138,292.382518 240.142406,288.272242 C256.134509,285.697368 273.629935,277.848026 279.044261,261.257567 C283.030122,247.066267 280.785723,232.131602 281.378027,217.566465 L281.378027,183.741541 L235.081246,183.741541 C234.873106,206.112145 235.507258,228.522447 234.746146,250.867107 C233.49785,264.601214 219.900147,273.326996 206.946428,272.861801 C190.879747,273.030535 159.04755,261.221796 159.04755,261.221796 C158.967492,219.3048 159.514314,166.814385 159.740429,125.040498 L159.740429,125.040498 Z" id="path3498" fill="url(#linearGradient-2)" sketch:type="MSShapeGroup"></path>
+            <path d="M309.719995,197.390136 C307.285788,197.90738 309.229141,189.089459 308.606298,185.743964 C308.772233,164.593637 308.260045,143.420951 308.889718,122.285827 C310.972541,95.4570827 335.881262,73.3701105 362.628748,73.997656 L441.39456,73.997656 C441.320658,164.882346 441.542493,255.77294 441.283406,346.653934 C440.244412,373.488027 416.291344,396.487102 389.602087,396.962292 C362.604605,397.061991 335.604707,396.976504 308.606298,397.004928 L308.606298,272.707624 C327.04641,287.835846 352.105738,290.192248 375.077953,290.233484 C392.39501,290.227455 409.611861,287.557865 426.428143,283.562934 L426.428143,260.790297 C407.474658,270.236609 385.194808,276.235815 364.184745,270.807966 C349.529051,267.157367 338.89089,252.996683 339.128513,237.872204 C337.43001,222.143684 346.652631,205.536885 362.110237,200.860855 C381.300923,194.852545 402.217787,199.448454 420.206344,207.258795 C424.060526,209.27695 427.97066,211.780342 426.428143,205.338044 L426.428143,187.438358 C396.343581,180.280951 364.326644,177.646405 334.099438,185.433619 C325.351193,187.901774 316.82819,191.644647 309.719995,197.390136 L309.719995,197.390136 Z" id="path3500" fill="url(#linearGradient-3)" sketch:type="MSShapeGroup"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/assets/images/icons/credit-cards/laser.svg b/assets/images/icons/credit-cards/laser.svg
new file mode 100644
index 00000000000..55250c4d103
--- /dev/null
+++ b/assets/images/icons/credit-cards/laser.svg
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="-45 62.3 750 471"
+	 style="enable-background:new -45 62.3 750 471;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#283A97;}
+	.st1{fill:#EE4799;}
+	.st2{fill:none;stroke:#EE4799;stroke-width:1.0006;stroke-miterlimit:2.6131;}
+	.st3{fill:#FFFFFF;}
+</style>
+<title>Slice 1</title>
+<desc>Created with Sketch.</desc>
+<path id="Rectangle-1" sketch:type="MSShapeGroup" class="st0" d="M-5,62.3h670c22.1,0,40,17.9,40,40v391c0,22.1-17.9,40-40,40H-5
+	c-22.1,0-40-17.9-40-40v-391C-45,80.2-27.1,62.3-5,62.3z"/>
+<g>
+	<polygon class="st0" points="160.2,477.3 500.2,477.3 500.2,118.3 160.2,118.3 	"/>
+	<polygon class="st1" points="500.3,127.6 490.2,144.7 159.7,137.1 159.7,135.4 	"/>
+	<polygon class="st1" points="489.1,146.9 478.7,163.9 165.5,156 164.7,154.8 	"/>
+	<polygon class="st1" points="477.4,166.3 467.2,183.2 177,175.3 176.3,174.2 	"/>
+	<polygon class="st1" points="465.7,185.6 455.8,202.6 189.2,194.7 188.4,193.5 	"/>
+	<polygon class="st1" points="454.5,204.8 444.4,221.9 200.7,214 199.9,212.7 	"/>
+	<polygon class="st1" points="442.8,224.3 432.7,241.2 212.7,233.3 212,232.2 	"/>
+	<polygon class="st1" points="431.3,243.5 421.2,260.6 225.1,252.7 224.3,251.4 	"/>
+	<polygon class="st1" points="419.9,262.8 409.7,279.9 236.6,272 235.8,270.7 	"/>
+	<polygon class="st1" points="408.6,282.1 398.1,299.1 248.1,291.2 247.3,290.1 	"/>
+	<polygon class="st1" points="397,301.5 386.8,318.5 260.3,310.5 259.5,309.4 	"/>
+	<polygon class="st1" points="385.5,320.8 375.2,337.8 272.3,329.9 271.5,328.7 	"/>
+	<polygon class="st1" points="374,340 363.7,357.1 284.3,349.2 283.5,347.9 	"/>
+	<polygon class="st1" points="362.5,359.5 352.3,376.3 296,368.5 295.2,367.3 	"/>
+	<polygon class="st1" points="351.1,378.7 340.7,395.8 307.5,387.9 306.7,386.6 	"/>
+	<polygon class="st1" points="339.1,398.6 328.7,416.3 317.6,407.1 317.3,405.9 	"/>
+	<path class="st1" d="M159.7,406.5h340.6H159.7z"/>
+	<line class="st2" x1="159.7" y1="406.5" x2="500.3" y2="406.5"/>
+	<path class="st1" d="M159.7,387.2h340.6H159.7z"/>
+	<line class="st2" x1="159.7" y1="387.2" x2="500.3" y2="387.2"/>
+	<path class="st1" d="M159.7,368h340.6H159.7z"/>
+	<line class="st2" x1="159.7" y1="368" x2="500.3" y2="368"/>
+	<path class="st1" d="M159.7,348.6h340.6H159.7z"/>
+	<line class="st2" x1="159.7" y1="348.6" x2="500.3" y2="348.6"/>
+	<path class="st1" d="M159.7,329.3h340.6H159.7z"/>
+	<line class="st2" x1="159.7" y1="329.3" x2="500.3" y2="329.3"/>
+	<path class="st1" d="M159.7,310h340.6H159.7z"/>
+	<line class="st2" x1="159.7" y1="310" x2="500.3" y2="310"/>
+	<path class="st1" d="M159.7,290.8h340.6H159.7z"/>
+	<line class="st2" x1="159.7" y1="290.8" x2="500.3" y2="290.8"/>
+	<path class="st1" d="M159.7,271.3h340.6H159.7z"/>
+	<line class="st2" x1="159.7" y1="271.3" x2="500.3" y2="271.3"/>
+	<path class="st1" d="M159.7,252.1h340.6H159.7z"/>
+	<line class="st2" x1="159.7" y1="252.1" x2="500.3" y2="252.1"/>
+	<path class="st1" d="M159.7,232.8h340.6H159.7z"/>
+	<line class="st2" x1="159.7" y1="232.8" x2="500.3" y2="232.8"/>
+	<path class="st1" d="M159.7,213.5h340.6H159.7z"/>
+	<line class="st2" x1="159.7" y1="213.5" x2="500.3" y2="213.5"/>
+	<path class="st1" d="M159.7,194.1h340.6H159.7z"/>
+	<line class="st2" x1="159.7" y1="194.1" x2="500.3" y2="194.1"/>
+	<path class="st1" d="M159.7,174.8h340.6H159.7z"/>
+	<line class="st2" x1="159.7" y1="174.8" x2="500.3" y2="174.8"/>
+	<path class="st1" d="M159.7,155.6h340.6H159.7z"/>
+	<line class="st2" x1="159.7" y1="155.6" x2="500.3" y2="155.6"/>
+	<path class="st3" d="M364.5,427.4v37.4h25.4l3.2-7.1c-4.6,0.2-7.9,0.3-12.6,0.3c-1.4,0-2.7,0-5.4,0v-9.3h0.6c2.7,0,5.7,0.2,8.8,0.3
+		l3.2-7.3c-1.6,0.2-1.9,0.2-4.1,0.2c-3.9,0.2-4.9,0.2-8.5,0.2v-7.7h1.3c3.2,0,7.3,0.2,12.8,0.3l3-7.3L364.5,427.4L364.5,427.4z
+		 M267.4,427.4l2.7,4l-14.4,33.5h10.4l2.4-5.7h14.8l2.4,5.7h10.9l-16.4-37.4L267.4,427.4L267.4,427.4z M280.3,452.3h-9l4.4-10.7
+		L280.3,452.3L280.3,452.3z M221.4,425h-10.6v39.8h25.6l3-7.1c-3.3,0.2-7.6,0.3-12.2,0.3c-1.6,0-2.8,0-5.8,0L221.4,425L221.4,425z
+		 M339.9,429.3c-4.1-1.9-7.7-2.7-11.4-2.7c-8.1,0-13.6,4.4-13.6,10.7c0,4,1.7,6.6,6.3,9.6l5.4,3.6c2.5,1.7,3.5,3,3.5,4.9
+		c0,2.4-2.2,3.8-5.5,3.8c-2.8,0-4.6-0.8-7.7-3.3l-2.8,6.6c4.7,2.5,7.1,3.2,11.2,3.2c9.3,0,15.2-4.6,15.2-11.7
+		c0-4.1-1.9-6.8-6.6-10.1l-5.5-4c-2.4-1.6-3-2.4-3-3.6c0-2.1,1.6-3.3,4.3-3.3c2.4,0,4.4,0.8,7.6,2.8L339.9,429.3L339.9,429.3z
+		 M415.5,427.4v37.4h10.6v-30.5h2.1h0.2c4.7,0,7.3,1.9,7.3,5.4c0,3.6-3,6-7.7,6c-0.5,0-0.8,0-1.6-0.2l12.8,19.3h11.7l-10.6-15.5
+		c4.6-2.7,6.5-5.7,6.5-10.3c0-7.9-5.5-11.7-16.7-11.7L415.5,427.4L415.5,427.4z"/>
+</g>
+</svg>
diff --git a/assets/images/icons/credit-cards/maestro.svg b/assets/images/icons/credit-cards/maestro.svg
new file mode 100644
index 00000000000..8f0494a2b3b
--- /dev/null
+++ b/assets/images/icons/credit-cards/maestro.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="750px" height="471px" viewBox="0 0 750 471" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.1 (12005) - http://www.bohemiancoding.com/sketch -->
+    <title>Slice 1</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="maestro" sketch:type="MSLayerGroup">
+            <rect id="Rectangle-1" fill="#000000" sketch:type="MSShapeGroup" x="0" y="0" width="750" height="471" rx="40"></rect>
+            <path d="M675.000003,235.50625 C675.000003,334.639584 594.650002,415.002085 495.516668,415.002085 C396.395834,415.002085 316.0375,334.639584 316.0375,235.50625 C316.0375,136.364582 396.395834,55.997915 495.516668,55.997915 C594.650002,55.997915 675.000003,136.364582 675.000003,235.50625" id="Fill-1" fill="#D9222A" sketch:type="MSShapeGroup"></path>
+            <path d="M356.870834,349.489584 C351.9125,343.477084 347.345834,337.131251 343.195834,330.481251 L406.808334,330.481251 C410.625001,324.385417 414.070834,318.039584 417.150001,311.46875 L332.858333,311.46875 C329.9875,305.31875 327.433333,298.977084 325.2625,292.46875 L424.737501,292.46875 C430.725001,274.564583 433.966668,255.41875 433.966668,235.50625 C433.966668,222.460416 432.575001,209.74375 429.937501,197.493749 L320.075,197.493749 C321.466667,191.014583 323.216667,184.677083 325.283333,178.485416 L424.725001,178.485416 C422.541667,171.977083 420.004167,165.635416 417.133334,159.481249 L332.879167,159.481249 C335.954167,152.918749 339.408333,146.577082 343.216667,140.472916 L406.787501,140.472916 C402.641667,133.843749 398.062501,127.497916 393.116667,121.481249 L356.891667,121.481249 C362.4625,114.714582 368.520834,108.364582 375.004167,102.481249 C343.15,73.5979152 300.866667,55.997915 254.487499,55.997915 C155.358332,55.997915 74.999998,136.364582 74.999998,235.50625 C74.999998,334.639584 155.358332,415.002085 254.487499,415.002085 C300.875,415.002085 343.154167,397.406251 375.004167,368.527084 C381.5,362.635417 387.562501,356.268751 393.137501,349.489584 L356.870834,349.489584" id="Fill-2" fill="#0097D0" sketch:type="MSShapeGroup"></path>
+            <path d="M651.075003,335.543751 C651.075003,332.343751 653.670836,329.747917 656.875003,329.747917 C660.075003,329.747917 662.666669,332.343751 662.666669,335.543751 C662.666669,338.747917 660.075003,341.343751 656.875003,341.343751 C653.670836,341.343751 651.075003,338.747917 651.075003,335.543751 L651.075003,335.543751 L651.075003,335.543751 Z M656.875003,339.952084 C659.308336,339.952084 661.279169,337.985417 661.279169,335.543751 C661.279169,333.110417 659.308336,331.147917 656.875003,331.147917 C654.441669,331.147917 652.466669,333.110417 652.466669,335.543751 C652.466669,337.985417 654.441669,339.952084 656.875003,339.952084 L656.875003,339.952084 L656.875003,339.952084 Z M656.087503,338.089584 L654.904169,338.089584 L654.904169,332.997917 L657.054169,332.997917 C657.500003,332.997917 657.958336,333.002084 658.354169,333.256251 C658.770836,333.539584 659.000003,334.031251 659.000003,334.527084 C659.000003,335.110417 658.662503,335.639584 658.120836,335.843751 L659.054169,338.089584 L657.737503,338.089584 L656.962503,336.081251 L656.087503,336.081251 L656.087503,338.089584 L656.087503,338.089584 Z M656.087503,335.210417 L656.745836,335.210417 C656.991669,335.210417 657.250003,335.227084 657.470836,335.110417 C657.666669,334.981251 657.770836,334.743751 657.770836,334.518751 C657.770836,334.331251 657.645836,334.102084 657.483336,334.006251 C657.270836,333.881251 656.941669,333.906251 656.720836,333.906251 L656.087503,333.906251 L656.087503,335.210417 L656.087503,335.210417 Z" id="Fill-3" fill="#000000" sketch:type="MSShapeGroup"></path>
+            <path d="M372.445834,284.00625 C364.775,286.039584 357.358334,287.03125 349.516667,287.014584 C324.5,286.989584 311.470833,275.597917 311.470833,253.814583 C311.470833,228.35625 328.058333,209.63125 350.570834,209.63125 C368.9875,209.63125 380.745834,220.13125 380.745834,236.577083 C380.745834,242.035417 379.95,247.347917 378,254.872917 L333.5125,254.872917 C331.929167,265.50625 339.7,270.177083 352.925,270.177083 C360.85,270.177083 368.016667,268.752083 375.95,265.564583 L372.445834,284.00625 L372.445834,284.00625 Z M360.483334,239.85625 C360.483334,238.247916 362.958334,226.822916 350.083334,226.572916 C342.975,226.572916 337.875,231.297916 335.8125,239.85625 L360.483334,239.85625 L360.483334,239.85625 Z" id="Fill-4" fill="#000000" sketch:type="MSShapeGroup"></path>
+            <path d="M387.516667,234.864583 C387.516667,244.26875 392.812501,250.764583 404.845834,255.602083 C414.045834,259.372917 415.495834,260.460417 415.495834,263.822917 C415.495834,268.485417 411.429167,270.627083 402.404167,270.56875 C395.625001,270.51875 389.441667,269.697917 382.141667,267.672917 L378.9125,284.827084 C385.400001,286.33125 394.500001,286.827084 402.562501,287.014584 C426.587501,287.014584 437.679168,279.147917 437.679168,262.147917 C437.679168,251.93125 433.054168,245.914583 421.645834,241.435417 C412.108334,237.627083 410.987501,236.797916 410.987501,233.352083 C410.987501,229.302083 414.766667,227.252083 422.137501,227.252083 C426.600001,227.252083 432.716668,227.664583 438.516668,228.360416 L441.775001,211.11875 C435.862501,210.29375 426.891668,209.635416 421.700001,209.635416 C396.250001,209.635416 387.441667,221.09375 387.516667,234.864583" id="Fill-5" fill="#000000" sketch:type="MSShapeGroup"></path>
+            <path d="M299.275,285.785417 L280.6125,285.785417 L281.058333,277.964583 C275.366666,284.135417 267.7875,287.00625 257.499999,287.00625 C245.324999,287.00625 236.983333,278.68125 236.983333,266.710417 C236.983333,248.514583 251.483333,238.01875 276.4125,238.01875 C278.975,238.01875 282.233333,238.210416 285.579166,238.58125 C286.270833,236.147916 286.458333,235.102083 286.458333,233.772916 C286.458333,228.79375 282.5375,226.960416 272.045833,226.960416 C261.704166,227.002083 254.724999,228.53125 248.249999,230.272916 L251.437499,213.572916 C262.633333,210.727083 269.966666,209.63125 278.2625,209.63125 C297.566666,209.63125 307.7625,217.197916 307.7625,231.427083 C307.929167,235.222916 306.604167,242.839583 305.941667,246.172917 C305.183333,251.027083 299.833333,279.147917 299.275,285.785417 L299.275,285.785417 L299.275,285.785417 Z M282.895833,252.59375 C280.529166,252.352083 279.5,252.28125 277.883333,252.28125 C265.154166,252.28125 258.7,256.06875 258.7,263.547917 C258.7,268.239583 261.85,271.18125 266.758333,271.18125 C275.904166,271.18125 282.508333,263.53125 282.895833,252.59375 L282.895833,252.59375 L282.895833,252.59375 Z" id="Fill-6" fill="#000000" sketch:type="MSShapeGroup"></path>
+            <path d="M477.004168,284.60625 C470.879168,286.285417 466.108334,287.014584 460.945834,287.014584 C449.512501,287.014584 443.270834,281.172917 443.270834,270.764583 C442.912501,267.90625 445.704168,254.70625 446.337501,251.027083 C446.970834,247.335417 456.875001,193.535416 456.875001,193.535416 L479.087501,193.535416 L475.725001,211.335416 L487.116668,211.335416 L484.020835,229.50625 L472.579168,229.50625 C472.579168,229.50625 466.300001,261.035417 466.300001,263.439583 C466.300001,267.264583 468.616668,268.927083 473.933335,268.927083 C476.479168,268.927083 478.441668,268.689583 479.962501,268.235417 L477.004168,284.60625" id="Fill-7" fill="#000000" sketch:type="MSShapeGroup"></path>
+            <path d="M576.250002,209.63125 C559.970835,209.63125 547.250002,216.33125 539.862502,227.522916 L546.275002,210.927083 C534.458335,206.589583 526.841668,212.777083 519.950002,221.577083 C519.950002,221.577083 518.795835,223.039583 517.650002,224.377083 L517.650002,211.327083 L496.791668,211.327083 C493.966668,234.35625 488.970835,257.70625 485.062501,280.772917 L484.120835,285.79375 L506.558335,285.79375 C508.683335,274.085417 510.433335,264.58125 512.175002,257.00625 C516.941668,236.21875 524.962502,229.864583 537.004168,232.672916 C534.225002,238.652083 532.700002,245.564583 532.700002,253.227083 C532.700002,271.80625 542.791668,287.014584 567.850002,287.014584 C593.137502,287.014584 611.445836,273.50625 611.445836,242.70625 C611.445836,224.127083 599.245836,209.63125 576.250002,209.63125 L576.250002,209.63125 L576.250002,209.63125 Z M569.720835,268.947917 C561.795835,269.072917 556.991669,262.422917 556.991669,252.477083 C556.991669,240.685417 564.004169,227.364583 575.266669,227.364583 C584.354169,227.364583 587.466669,234.56875 587.466669,242.24375 C587.466669,259.022917 580.591669,268.947917 569.720835,268.947917 L569.720835,268.947917 L569.720835,268.947917 Z" id="Fill-8" fill="#000000" sketch:type="MSShapeGroup"></path>
+            <path d="M226.529166,285.79375 L204.187499,285.79375 L217.466666,215.839583 L186.895832,285.79375 L166.529165,285.79375 L162.804165,216.24375 L149.483332,285.79375 L129.212498,285.79375 L146.479165,194.797916 L181.391666,194.797916 L184.304166,245.522917 L206.420832,194.797916 L244.141666,194.797916 L226.529166,285.79375" id="Fill-9" fill="#000000" sketch:type="MSShapeGroup"></path>
+            <path d="M613.150002,274.385417 C613.150002,271.189583 615.745836,268.589583 618.945836,268.589583 C622.150002,268.589583 624.741669,271.189583 624.741669,274.385417 C624.741669,277.59375 622.150002,280.189583 618.945836,280.189583 C615.745836,280.189583 613.150002,277.59375 613.150002,274.385417 L613.150002,274.385417 L613.150002,274.385417 Z M618.945836,278.797917 C621.379169,278.797917 623.354169,276.81875 623.354169,274.385417 C623.354169,271.952083 621.379169,269.98125 618.945836,269.98125 C616.512502,269.98125 614.537502,271.952083 614.537502,274.385417 C614.537502,276.81875 616.512502,278.797917 618.945836,278.797917 L618.945836,278.797917 L618.945836,278.797917 Z M618.162502,276.93125 L616.975002,276.93125 L616.975002,271.847917 L619.125002,271.847917 C619.575002,271.847917 620.033336,271.847917 620.429169,272.097917 C620.837502,272.377083 621.075002,272.864583 621.075002,273.36875 C621.075002,273.947917 620.737502,274.485417 620.191669,274.685417 L621.125002,276.93125 L619.808336,276.93125 L619.037502,274.922917 L618.162502,274.922917 L618.162502,276.93125 L618.162502,276.93125 Z M618.162502,274.04375 L618.820836,274.04375 C619.062502,274.04375 619.325002,274.060417 619.545836,273.947917 C619.741669,273.814583 619.841669,273.589583 619.841669,273.360417 C619.841669,273.164583 619.720836,272.94375 619.558336,272.847917 C619.345836,272.71875 619.016669,272.752083 618.795836,272.752083 L618.162502,272.752083 L618.162502,274.04375 L618.162502,274.04375 Z" id="Fill-10" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M378.054167,278.397917 C370.3875,280.43125 362.966667,281.427084 355.129167,281.410417 C330.1125,281.385417 317.083333,269.989583 317.083333,248.202083 C317.083333,222.752083 333.6625,204.022916 356.179167,204.022916 C374.6,204.022916 386.354167,214.51875 386.354167,230.964583 C386.354167,236.43125 385.554167,241.735417 383.612501,249.264583 L339.125,249.264583 C337.541667,259.89375 345.304167,264.572917 358.533334,264.572917 C366.458334,264.572917 373.620834,263.147917 381.5625,259.95625 L378.054167,278.397917 L378.054167,278.397917 Z M366.091667,234.247916 C366.091667,232.64375 368.5625,221.214583 355.691667,220.96875 C348.583334,220.96875 343.4875,225.697916 341.420833,234.247916 L366.091667,234.247916 L366.091667,234.247916 Z" id="Fill-11" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M393.129167,229.252083 C393.129167,238.660416 398.416667,245.152083 410.454167,249.997917 C419.658334,253.764583 421.104167,254.85625 421.104167,258.210417 C421.104167,262.877083 417.037501,265.01875 408.016667,264.960417 C401.233334,264.914583 395.050001,264.089583 387.754167,262.064583 L384.516667,279.210417 C391.008334,280.727083 400.112501,281.222917 408.170834,281.410417 C432.195834,281.410417 443.291668,273.539583 443.291668,256.539583 C443.291668,246.322917 438.662501,240.302083 427.250001,235.827083 C417.712501,232.01875 416.595834,231.189583 416.595834,227.74375 C416.595834,223.69375 420.379167,221.64375 427.741668,221.64375 C432.212501,221.64375 438.325001,222.060416 444.129168,222.75625 L447.379168,205.510416 C441.466668,204.685416 432.500001,204.027083 427.312501,204.027083 C401.854167,204.027083 393.050001,215.48125 393.129167,229.252083" id="Fill-12" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M304.8875,280.18125 L286.220833,280.18125 L286.670833,272.360417 C280.975,278.51875 273.395833,281.39375 263.1125,281.39375 C250.937499,281.39375 242.591666,273.06875 242.591666,261.10625 C242.591666,242.902083 257.087499,232.410416 282.020833,232.410416 C284.583333,232.410416 287.8375,232.602083 291.191666,232.972916 C291.883333,230.539583 292.066666,229.497916 292.066666,228.164583 C292.066666,223.18125 288.15,221.352083 277.658333,221.352083 C267.316666,221.39375 260.3375,222.927083 253.862499,224.664583 L257.045833,207.96875 C268.245833,205.11875 275.575,204.022916 283.875,204.022916 C303.179167,204.022916 313.370833,211.589583 313.370833,225.814583 C313.5375,229.614583 312.2125,237.227083 311.554167,240.56875 C310.791667,245.41875 305.441667,273.539583 304.8875,280.18125 L304.8875,280.18125 L304.8875,280.18125 Z M288.5,246.985417 C286.141666,246.739583 285.108333,246.672917 283.4875,246.672917 C270.766666,246.672917 264.308333,250.460417 264.308333,257.939583 C264.308333,262.635417 267.4625,265.572917 272.3625,265.572917 C281.516666,265.572917 288.120833,257.91875 288.5,246.985417 L288.5,246.985417 L288.5,246.985417 Z" id="Fill-13" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M482.608335,279.002083 C476.487501,280.677083 471.712501,281.410417 466.554168,281.410417 C455.120834,281.410417 448.883334,275.564583 448.883334,265.15625 C448.520834,262.302083 451.316668,249.097917 451.945834,245.41875 C452.579168,241.727083 462.483334,187.927083 462.483334,187.927083 L484.691668,187.927083 L481.337501,205.727083 L492.729168,205.727083 L489.633335,223.897916 L478.191668,223.897916 C478.191668,223.897916 471.908335,255.427083 471.908335,257.83125 C471.908335,261.65625 474.229168,263.310417 479.541668,263.310417 C482.083335,263.310417 484.050001,263.08125 485.570835,262.61875 L482.608335,279.002083" id="Fill-14" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M593.079169,236.635416 C593.079169,253.410417 586.200002,263.34375 575.325002,263.34375 C567.404169,263.45625 562.600002,256.81875 562.600002,246.86875 C562.600002,235.077083 569.608335,221.75625 580.870835,221.75625 C589.962502,221.75625 593.079169,228.96875 593.079169,236.635416 L593.079169,236.635416 L593.079169,236.635416 Z M617.058336,237.102083 C617.058336,218.522916 604.850002,204.022916 581.862502,204.022916 C555.412502,204.022916 538.312502,221.647916 538.312502,247.61875 C538.312502,266.197917 548.395835,281.410417 573.462502,281.410417 C598.750002,281.410417 617.058336,267.897917 617.058336,237.102083 L617.058336,237.102083 L617.058336,237.102083 Z" id="Fill-15" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M502.395835,205.71875 C499.575001,228.747916 494.579168,252.09375 490.675001,275.16875 L489.729168,280.189583 L512.162502,280.189583 C520.250002,235.63125 522.962502,222.935416 539.904168,227.40625 L548.054168,206.31875 C536.237502,201.98125 528.629168,208.172916 521.745835,216.977083 C522.366668,213.014583 523.537502,209.19375 523.254168,205.71875 L502.395835,205.71875" id="Fill-16" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M232.137499,280.189583 L209.799999,280.189583 L223.074999,210.23125 L192.499999,280.189583 L172.137499,280.189583 L168.412499,210.635416 L155.091665,280.189583 L134.820832,280.189583 L152.083332,189.189583 L187.004166,189.189583 L188.849999,245.522917 L213.424999,189.189583 L249.749999,189.189583 L232.137499,280.189583" id="Fill-17" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/assets/images/icons/credit-cards/mastercard.png b/assets/images/icons/credit-cards/mastercard.png
index 8a6e716e322..c626f5e1795 100644
Binary files a/assets/images/icons/credit-cards/mastercard.png and b/assets/images/icons/credit-cards/mastercard.png differ
diff --git a/assets/images/icons/credit-cards/mastercard.svg b/assets/images/icons/credit-cards/mastercard.svg
new file mode 100644
index 00000000000..8ceb0d2bfb0
--- /dev/null
+++ b/assets/images/icons/credit-cards/mastercard.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="750px" height="471px" viewBox="0 0 750 471" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
+    <title>Slice 1</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="mastercard">
+            <rect id="Rectangle-1" fill="#F4F4F4" x="0" y="0" width="750" height="471" rx="40"></rect>
+            <g id="mark" transform="translate(125.719997, 41.850862)">
+                <g id="text" transform="translate(25.142679, 328.360022)" fill="#000000">
+                    <path d="M467.715561,51.9326899 C466.502604,51.9623585 465.503405,52.3648948 464.717962,53.1403001 C463.932516,53.9157321 463.526027,54.8861098 463.498494,56.0514362 C463.526027,57.2079497 463.932516,58.1758036 464.717963,58.9550005 C465.503406,59.7342125 466.502604,60.1392726 467.715561,60.1701825 C468.900764,60.1392726 469.887352,59.7342123 470.675326,58.9550002 C471.463285,58.175803 471.872297,57.2079493 471.902362,56.0514362 C471.872927,54.8861098 471.465177,53.915732 470.679109,53.1402998 C469.893026,52.3648943 468.905178,51.9623581 467.715561,51.9326899 L467.715561,51.9326899 L467.715561,51.9326899 Z M467.715561,59.2616355 C466.791392,59.2389292 466.029277,58.9259854 465.429214,58.3228033 C464.829145,57.7196374 464.518499,56.9625159 464.497273,56.0514362 C464.518499,55.1363804 464.829146,54.379679 465.429214,53.78133 C466.029277,53.1830062 466.791392,52.8730071 467.715561,52.8513318 C468.620383,52.8730076 469.370728,53.1830066 469.966597,53.7813302 C470.562452,54.379679 470.871417,55.1363804 470.893494,56.0514362 C470.871417,56.9625161 470.562452,57.7196378 469.966597,58.3228033 C469.370728,58.925985 468.620384,59.2389287 467.715561,59.2616355 L467.715561,59.2616355 L467.715561,59.2616355 Z M467.957689,54.1232975 L466.19217,54.1232975 L466.19217,57.9492899 L467.009353,57.9492899 L467.009353,56.5158046 L467.382634,56.5158046 L468.542832,57.9492899 L469.521434,57.9492899 L468.270438,56.5057097 C468.661158,56.4567169 468.961716,56.330109 469.172113,56.1258861 C469.382498,55.9216836 469.488849,55.6613181 469.491168,55.3447885 C469.488429,54.9670796 469.355174,54.6701195 469.091404,54.4539073 C468.827621,54.237719 468.449717,54.1275158 467.957689,54.1232975 L467.957689,54.1232975 L467.957689,54.1232975 Z M467.9476,54.8400402 C468.166813,54.840262 468.338741,54.8827453 468.463383,54.9674885 C468.588015,55.0522552 468.651489,55.1780218 468.653808,55.3447882 C468.651483,55.5164129 468.588015,55.6451235 468.463383,55.73092 C468.338741,55.8167385 468.166813,55.8596412 467.9476,55.859631 L467.009353,55.859631 L467.009353,54.8400393 L467.9476,54.8400402 L467.9476,54.8400402 Z" id="path3078"></path>
+                    <path d="M9.34331724,57.5428029 L0.588175916,57.5428029 L0.588175916,16.6600045 L9.17164757,16.6600045 L9.17164757,21.6415186 C9.17164757,21.6415186 16.7107355,15.5532485 21.1885083,15.6293508 C29.8949298,15.7773317 35.093729,23.1875098 35.093729,23.1875098 C35.093729,23.1875098 39.3109893,15.6293508 48.8272918,15.6293508 C62.8997988,15.6293508 64.9642149,28.5125858 64.9642149,28.5125858 L64.9642149,57.3710273 L56.5524108,57.3710273 L56.5524108,31.9481087 C56.5524108,31.9481087 56.5825922,24.2181741 47.4539323,24.2181741 C38.0139747,24.2181741 37.1537629,31.9481087 37.1537629,31.9481087 L37.1537629,57.3710273 L28.3986215,57.3710273 L28.3986215,31.7763331 C28.3986215,31.7763331 27.5575496,23.7028366 19.6434834,23.7028366 C9.3650113,23.7028366 9.17164757,31.9481087 9.17164757,31.9481087 L9.34331724,57.5428029 L9.34331724,57.5428029 Z" id="path3006"></path>
+                    <path d="M275.596898,15.623773 C271.119122,15.5476814 263.580741,21.6355967 263.580741,21.6355967 L263.580741,16.6649268 L254.988182,16.6649268 L254.988182,57.5386115 L263.748565,57.5386115 L263.580741,31.9463783 C263.580741,31.9463783 263.77445,23.7179044 274.052923,23.7179044 C275.961824,23.7179044 277.444363,24.180569 278.61772,24.8934007 L278.61772,24.8598688 L281.470718,16.9000798 C279.749092,16.1750176 277.791223,15.6610664 275.596898,15.623773 L275.596898,15.623773 L275.596898,15.623773 Z" id="path3008"></path>
+                    <path d="M398.92774,15.623773 C394.449964,15.5476814 386.911582,21.6355967 386.911582,21.6355967 L386.911582,16.6649268 L378.319023,16.6649268 L378.319023,57.5386115 L387.079406,57.5386115 L386.911582,31.9463783 C386.911582,31.9463783 387.105291,23.7179044 397.383764,23.7179044 C399.292666,23.7179044 400.775204,24.180569 401.948561,24.8934007 L401.948561,24.8598688 L404.801559,16.9000798 C403.079933,16.1750713 401.122064,15.6611201 398.92774,15.6238267 L398.92774,15.623773 L398.92774,15.623773 Z" id="path3013"></path>
+                    <path d="M93.2735295,15.4558449 C80.1708646,15.4558449 73.2368626,27.2396859 73.2018479,37.0849763 C73.1658666,47.1762746 81.0955959,58.8148646 93.6427411,58.8148646 C100.962678,58.8148646 106.976041,53.4075817 106.976041,53.4075817 L106.960145,57.5721971 L115.577998,57.5721971 L115.577998,16.6488272 L106.929792,16.6488272 L106.929792,21.8035248 C106.929792,21.8035248 101.282654,15.4558449 93.2735725,15.4558449 L93.2735295,15.4558449 L93.2735295,15.4558449 Z M94.9517638,23.7850756 C101.991433,23.7850756 107.706344,29.9122942 107.706344,37.454418 C107.706344,44.9965418 101.991433,51.0901748 94.9517638,51.0901748 C87.9120947,51.0901748 82.2307482,44.9965418 82.2307482,37.454418 C82.2307482,29.9122942 87.9120947,23.7850756 94.9517638,23.7850756 L94.9517638,23.7850756 L94.9517638,23.7850756 Z" id="path3015"></path>
+                    <path d="M344.597578,15.4558449 C331.494913,15.4558449 324.560911,27.2396859 324.525896,37.0849763 C324.489915,47.1762746 332.419644,58.8148646 344.966789,58.8148646 C352.286726,58.8148646 358.300089,53.4075817 358.300089,53.4075817 L358.284193,57.5721971 L366.902046,57.5721971 L366.902046,16.6488272 L358.25384,16.6488272 L358.25384,21.8035248 C358.25384,21.8035248 352.606702,15.4558449 344.59762,15.4558449 L344.597578,15.4558449 L344.597578,15.4558449 Z M346.275812,23.7850756 C353.315481,23.7850756 359.030392,29.9122942 359.030392,37.454418 C359.030392,44.9965418 353.315481,51.0901748 346.275812,51.0901748 C339.236143,51.0901748 333.554796,44.9965418 333.554796,37.454418 C333.554796,29.9122942 339.236143,23.7850756 346.275812,23.7850756 L346.275812,23.7850756 L346.275812,23.7850756 Z" id="path3020"></path>
+                    <path d="M427.342249,15.4558449 C414.239584,15.4558449 407.305582,27.2396859 407.270567,37.0849763 C407.234586,47.1762746 415.164315,58.8148646 427.71146,58.8148646 C435.031397,58.8148646 441.04476,53.4075817 441.04476,53.4075817 L441.028864,57.5721971 L449.646718,57.5721971 L449.646718,0.49407462 L440.998511,0.49407462 L440.998511,21.8035248 C440.998511,21.8035248 435.351373,15.4558449 427.342292,15.4558449 L427.342249,15.4558449 L427.342249,15.4558449 Z M429.020483,23.7850756 C436.060152,23.7850756 441.775063,29.9122942 441.775063,37.454418 C441.775063,44.9965418 436.060152,51.0901748 429.020483,51.0901748 C421.980814,51.0901748 416.299467,44.9965418 416.299467,37.454418 C416.299467,29.9122942 421.980814,23.7850756 429.020483,23.7850756 L429.020483,23.7850756 L429.020483,23.7850756 Z" id="path3022"></path>
+                    <path d="M141.872122,58.9170078 C132.94558,58.9170078 124.705176,53.4201669 124.705176,53.4201669 L128.481907,47.5797641 C128.481907,47.5797641 136.278978,51.1870733 141.872122,51.1870733 C145.50613,51.1870733 151.583937,50.0128667 151.657274,46.3773348 C151.734822,42.5349478 141.442945,41.39581 141.442945,41.39581 C141.442945,41.39581 126.078536,41.1860853 126.078536,28.5125858 C126.078536,20.5421246 133.751938,15.4575752 143.588818,15.4575752 C149.272667,15.4575752 159.89741,20.4390893 159.89741,20.4390893 L155.605674,27.1383702 C155.605674,27.1383702 147.402218,23.858921 143.073802,23.7028366 C139.418806,23.5710413 135.005346,25.3221465 135.005346,28.5125858 C135.005346,37.1806926 160.584084,27.837198 160.584084,45.3466704 C160.584084,56.8338188 150.166691,58.9170078 141.872122,58.9170078 L141.872122,58.9170078 L141.872122,58.9170078 Z" id="path3024"></path>
+                    <path d="M174.802149,4.80920724 L174.802149,16.6985124 L167.182966,16.6985124 L167.182966,25.296428 L174.802149,25.296428 L174.802149,45.85082 C174.802149,45.85082 174.127827,59.7552616 189.067141,59.7552616 C193.19753,59.7552616 201.284686,56.6989713 201.284686,56.6989713 L197.827523,47.7651996 C197.827523,47.7651996 194.611468,50.5102454 190.980328,50.4184626 C184.076195,50.2440217 184.267391,45.8172343 184.267391,45.8172343 L184.267391,25.296428 L198.498817,25.296428 L198.498817,16.6985124 L184.267391,16.6985124 L184.267391,4.80920724 L174.802149,4.80920724 L174.802149,4.80920724 L174.802149,4.80920724 Z" id="path3026"></path>
+                    <path d="M226.659588,15.959629 C212.610087,15.959629 205.590417,27.5389793 205.648095,37.5887604 C205.707384,47.9238419 212.040304,59.5537479 227.498705,59.5537479 C234.115072,59.5537479 243.408366,53.7434378 243.408366,53.7434378 L239.414168,46.791217 C239.414168,46.791217 233.072548,51.2916884 227.498705,51.2916884 C216.339172,51.2916884 215.616806,40.3763659 215.616806,40.3763659 L245.489376,40.3763659 C245.489376,40.3763659 247.717985,15.959629 226.659588,15.959629 L226.659588,15.959629 L226.659588,15.959629 Z M225.38413,23.9865893 C225.715416,23.9677813 226.070568,23.9865893 226.424635,23.9865893 C236.937954,23.9865893 236.863252,33.9279292 236.863252,33.9279292 L215.616806,33.9279292 C215.616806,33.9279292 215.114206,24.5707962 225.38413,23.9865893 L225.38413,23.9865893 L225.38413,23.9865893 Z" id="path3034"></path>
+                    <path d="M315.5162,46.686 L319.52203,54.7026427 C319.52203,54.7026427 313.17302,58.8324258 306.047898,58.8324258 C291.296557,58.8324258 283.105442,47.7234997 283.105442,37.2117848 C283.105442,20.6912339 296.140698,15.8340672 304.955397,15.8340672 C312.956369,15.8340672 319.886193,20.4497077 319.886193,20.4497077 L315.394819,28.4663505 C315.394819,28.4663505 312.671859,24.2151004 304.712614,24.2151004 C296.766655,24.2151004 292.573755,31.0702185 292.573755,37.5761752 C292.573755,44.8669927 297.454114,51.0587064 304.834005,51.0587064 C310.623393,51.0587064 315.5162,46.686 315.5162,46.686 L315.5162,46.686 L315.5162,46.686 Z" id="path3037"></path>
+                </g>
+                <path d="M498.787985,236.781279 L498.787985,231.260623 L497.347484,231.260623 L495.690436,235.057252 L494.033388,231.260623 L492.592886,231.260623 L492.592886,236.781279 L493.609711,236.781279 L493.609711,232.617235 L495.163193,236.206603 L496.217678,236.206603 L497.771161,232.607814 L497.771161,236.781279 L498.787985,236.781279 L498.787985,236.781279 Z M489.664807,236.781279 L489.664807,232.202715 L491.510156,232.202715 L491.510156,231.270044 L486.812049,231.270044 L486.812049,232.202715 L488.657397,232.202715 L488.657397,236.781279 L489.664807,236.781279 L489.664807,236.781279 Z" id="path3057" fill="#F79F1A"></path>
+                <path d="M499.076678,154.709802 C499.076678,240.135159 429.999707,309.386105 344.788929,309.386105 C259.578151,309.386105 190.501159,240.135159 190.501159,154.709802 C190.501159,69.2844326 259.578151,0.0334920174 344.788929,0.0334920174 C429.999707,0.0334920174 499.076678,69.2844326 499.076678,154.709802 L499.076678,154.709802 L499.076678,154.709802 Z" id="path2997" fill="#F79F1A"></path>
+                <path d="M308.73932,154.709802 C308.73932,240.135159 239.662349,309.386105 154.451571,309.386105 C69.2407931,309.386105 0.163801275,240.135159 0.163801275,154.709802 C0.163801275,69.2844326 69.2407931,0.0334920174 154.451571,0.0334920174 C239.662349,0.0334920174 308.73932,69.2844326 308.73932,154.709802 L308.73932,154.709802 L308.73932,154.709802 Z" id="path2995" fill="#EA001B"></path>
+                <path d="M249.620562,32.9474812 C213.621326,61.2636823 190.513152,105.265345 190.513152,154.695309 C190.513152,204.125274 213.621326,248.16052 249.620562,276.476723 C285.619799,248.16052 308.727973,204.125274 308.727973,154.695309 C308.727973,105.265345 285.619799,61.2636823 249.620562,32.9474812 L249.620562,32.9474812 L249.620562,32.9474812 Z" id="path2999" fill="#FF5F01"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/assets/images/icons/credit-cards/visa.svg b/assets/images/icons/credit-cards/visa.svg
new file mode 100644
index 00000000000..115f2bfb813
--- /dev/null
+++ b/assets/images/icons/credit-cards/visa.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="750px" height="471px" viewBox="0 0 750 471" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.1 (12005) - http://www.bohemiancoding.com/sketch -->
+    <title>Slice 1</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="visa" sketch:type="MSLayerGroup">
+            <rect id="Rectangle-1" fill="#0E4595" sketch:type="MSShapeGroup" x="0" y="0" width="750" height="471" rx="40"></rect>
+            <path d="M278.1975,334.2275 L311.5585,138.4655 L364.9175,138.4655 L331.5335,334.2275 L278.1975,334.2275 L278.1975,334.2275 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M524.3075,142.6875 C513.7355,138.7215 497.1715,134.4655 476.4845,134.4655 C423.7605,134.4655 386.6205,161.0165 386.3045,199.0695 C386.0075,227.1985 412.8185,242.8905 433.0585,252.2545 C453.8275,261.8495 460.8105,267.9695 460.7115,276.5375 C460.5795,289.6595 444.1255,295.6545 428.7885,295.6545 C407.4315,295.6545 396.0855,292.6875 378.5625,285.3785 L371.6865,282.2665 L364.1975,326.0905 C376.6605,331.5545 399.7065,336.2895 423.6355,336.5345 C479.7245,336.5345 516.1365,310.2875 516.5505,269.6525 C516.7515,247.3835 502.5355,230.4355 471.7515,216.4645 C453.1005,207.4085 441.6785,201.3655 441.7995,192.1955 C441.7995,184.0585 451.4675,175.3575 472.3565,175.3575 C489.8055,175.0865 502.4445,178.8915 512.2925,182.8575 L517.0745,185.1165 L524.3075,142.6875" id="path13" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M661.6145,138.4655 L620.3835,138.4655 C607.6105,138.4655 598.0525,141.9515 592.4425,154.6995 L513.1975,334.1025 L569.2285,334.1025 C569.2285,334.1025 578.3905,309.9805 580.4625,304.6845 C586.5855,304.6845 641.0165,304.7685 648.7985,304.7685 C650.3945,311.6215 655.2905,334.1025 655.2905,334.1025 L704.8025,334.1025 L661.6145,138.4655 L661.6145,138.4655 Z M596.1975,264.8725 C600.6105,253.5935 617.4565,210.1495 617.4565,210.1495 C617.1415,210.6705 621.8365,198.8155 624.5315,191.4655 L628.1385,208.3435 C628.1385,208.3435 638.3555,255.0725 640.4905,264.8715 L596.1975,264.8715 L596.1975,264.8725 L596.1975,264.8725 Z" id="Path" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M232.9025,138.4655 L180.6625,271.9605 L175.0965,244.8315 C165.3715,213.5575 135.0715,179.6755 101.1975,162.7125 L148.9645,333.9155 L205.4195,333.8505 L289.4235,138.4655 L232.9025,138.4655" id="path16" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M131.9195,138.4655 L45.8785,138.4655 L45.1975,142.5385 C112.1365,158.7425 156.4295,197.9015 174.8155,244.9525 L156.1065,154.9925 C152.8765,142.5965 143.5085,138.8975 131.9195,138.4655" id="path18" fill="#F2AE14" sketch:type="MSShapeGroup"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/assets/images/paypal-braintree.png b/assets/images/paypal-braintree.png
new file mode 100644
index 00000000000..2eb31c6136f
Binary files /dev/null and b/assets/images/paypal-braintree.png differ
diff --git a/assets/images/paypal.png b/assets/images/paypal.png
new file mode 100644
index 00000000000..a892ac1d876
Binary files /dev/null and b/assets/images/paypal.png differ
diff --git a/assets/images/storefront.jpg b/assets/images/storefront.jpg
deleted file mode 100644
index e1a67a6f876..00000000000
Binary files a/assets/images/storefront.jpg and /dev/null differ
diff --git a/assets/images/storefront.png b/assets/images/storefront.png
new file mode 100644
index 00000000000..92e931b8907
Binary files /dev/null and b/assets/images/storefront.png differ
diff --git a/assets/images/stripe.png b/assets/images/stripe.png
new file mode 100644
index 00000000000..9d0ad7a535a
Binary files /dev/null and b/assets/images/stripe.png differ
diff --git a/assets/js/accounting/accounting.min.js b/assets/js/accounting/accounting.min.js
index 1dce44ceea0..3067cfb5e5e 100644
--- a/assets/js/accounting/accounting.min.js
+++ b/assets/js/accounting/accounting.min.js
@@ -8,4 +8,4 @@
  * Full details and documentation:
  * http://openexchangerates.github.io/accounting.js/
  */
-!function(a,b){function c(a){return!!(""===a||a&&a.charCodeAt&&a.substr)}function d(a){return l?l(a):"[object Array]"===m.call(a)}function e(a){return a&&"[object Object]"===m.call(a)}function f(a,b){var c;a=a||{},b=b||{};for(c in b)b.hasOwnProperty(c)&&null==a[c]&&(a[c]=b[c]);return a}function g(a,b,c){var d,e,f=[];if(!a)return f;if(k&&a.map===k)return a.map(b,c);for(d=0,e=a.length;e>d;d++)f[d]=b.call(c,a[d],d,a);return f}function h(a,b){return a=Math.round(Math.abs(a)),isNaN(a)?b:a}function i(a){var b=j.settings.currency.format;return"function"==typeof a&&(a=a()),c(a)&&a.match("%v")?{pos:a,neg:a.replace("-","").replace("%v","-%v"),zero:a}:a&&a.pos&&a.pos.match("%v")?a:c(b)?j.settings.currency.format={pos:b,neg:b.replace("%v","-%v"),zero:b}:b}var j={};j.version="0.4.1",j.settings={currency:{symbol:"$",format:"%s%v",decimal:".",thousand:",",precision:2,grouping:3},number:{precision:0,grouping:3,thousand:",",decimal:"."}};var k=Array.prototype.map,l=Array.isArray,m=Object.prototype.toString,n=j.unformat=j.parse=function(a,b){if(d(a))return g(a,function(a){return n(a,b)});if(a=a||0,"number"==typeof a)return a;b=b||j.settings.number.decimal;var c=new RegExp("[^0-9-"+b+"]",["g"]),e=parseFloat((""+a).replace(/\((.*)\)/,"-$1").replace(c,"").replace(b,"."));return isNaN(e)?0:e},o=j.toFixed=function(a,b){b=h(b,j.settings.number.precision);var c=Math.pow(10,b);return(Math.round(j.unformat(a)*c)/c).toFixed(b)},p=j.formatNumber=j.format=function(a,b,c,i){if(d(a))return g(a,function(a){return p(a,b,c,i)});a=n(a);var k=f(e(b)?b:{precision:b,thousand:c,decimal:i},j.settings.number),l=h(k.precision),m=0>a?"-":"",q=parseInt(o(Math.abs(a||0),l),10)+"",r=q.length>3?q.length%3:0;return m+(r?q.substr(0,r)+k.thousand:"")+q.substr(r).replace(/(\d{3})(?=\d)/g,"$1"+k.thousand)+(l?k.decimal+o(Math.abs(a),l).split(".")[1]:"")},q=j.formatMoney=function(a,b,c,k,l,m){if(d(a))return g(a,function(a){return q(a,b,c,k,l,m)});a=n(a);var o=f(e(b)?b:{symbol:b,precision:c,thousand:k,decimal:l,format:m},j.settings.currency),r=i(o.format),s=a>0?r.pos:0>a?r.neg:r.zero;return s.replace("%s",o.symbol).replace("%v",p(Math.abs(a),h(o.precision),o.thousand,o.decimal))};j.formatColumn=function(a,b,k,l,m,o){if(!a)return[];var q=f(e(b)?b:{symbol:b,precision:k,thousand:l,decimal:m,format:o},j.settings.currency),r=i(q.format),s=r.pos.indexOf("%s")<r.pos.indexOf("%v")?!0:!1,t=0,u=g(a,function(a,b){if(d(a))return j.formatColumn(a,q);a=n(a);var c=a>0?r.pos:0>a?r.neg:r.zero,e=c.replace("%s",q.symbol).replace("%v",p(Math.abs(a),h(q.precision),q.thousand,q.decimal));return e.length>t&&(t=e.length),e});return g(u,function(a,b){return c(a)&&a.length<t?s?a.replace(q.symbol,q.symbol+new Array(t-a.length+1).join(" ")):new Array(t-a.length+1).join(" ")+a:a})},"undefined"!=typeof exports?("undefined"!=typeof module&&module.exports&&(exports=module.exports=j),exports.accounting=j):"function"==typeof define&&define.amd?define([],function(){return j}):(j.noConflict=function(c){return function(){return a.accounting=c,j.noConflict=b,j}}(a.accounting),a.accounting=j)}(this);
\ No newline at end of file
+!function(a,b){function c(a){return!!(""===a||a&&a.charCodeAt&&a.substr)}function d(a){return l?l(a):"[object Array]"===m.call(a)}function e(a){return a&&"[object Object]"===m.call(a)}function f(a,b){var c;a=a||{},b=b||{};for(c in b)b.hasOwnProperty(c)&&null==a[c]&&(a[c]=b[c]);return a}function g(a,b,c){var d,e,f=[];if(!a)return f;if(k&&a.map===k)return a.map(b,c);for(d=0,e=a.length;d<e;d++)f[d]=b.call(c,a[d],d,a);return f}function h(a,b){return a=Math.round(Math.abs(a)),isNaN(a)?b:a}function i(a){var b=j.settings.currency.format;return"function"==typeof a&&(a=a()),c(a)&&a.match("%v")?{pos:a,neg:a.replace("-","").replace("%v","-%v"),zero:a}:a&&a.pos&&a.pos.match("%v")?a:c(b)?j.settings.currency.format={pos:b,neg:b.replace("%v","-%v"),zero:b}:b}var j={};j.version="0.4.1",j.settings={currency:{symbol:"$",format:"%s%v",decimal:".",thousand:",",precision:2,grouping:3},number:{precision:0,grouping:3,thousand:",",decimal:"."}};var k=Array.prototype.map,l=Array.isArray,m=Object.prototype.toString,n=j.unformat=j.parse=function(a,b){if(d(a))return g(a,function(a){return n(a,b)});if(a=a||0,"number"==typeof a)return a;b=b||j.settings.number.decimal;var c=new RegExp("[^0-9-"+b+"]",["g"]),e=parseFloat((""+a).replace(/\((.*)\)/,"-$1").replace(c,"").replace(b,"."));return isNaN(e)?0:e},o=j.toFixed=function(a,b){b=h(b,j.settings.number.precision);var c=Math.pow(10,b);return(Math.round(j.unformat(a)*c)/c).toFixed(b)},p=j.formatNumber=j.format=function(a,b,c,i){if(d(a))return g(a,function(a){return p(a,b,c,i)});a=n(a);var k=f(e(b)?b:{precision:b,thousand:c,decimal:i},j.settings.number),l=h(k.precision),m=a<0?"-":"",q=parseInt(o(Math.abs(a||0),l),10)+"",r=q.length>3?q.length%3:0;return m+(r?q.substr(0,r)+k.thousand:"")+q.substr(r).replace(/(\d{3})(?=\d)/g,"$1"+k.thousand)+(l?k.decimal+o(Math.abs(a),l).split(".")[1]:"")},q=j.formatMoney=function(a,b,c,k,l,m){if(d(a))return g(a,function(a){return q(a,b,c,k,l,m)});a=n(a);var o=f(e(b)?b:{symbol:b,precision:c,thousand:k,decimal:l,format:m},j.settings.currency),r=i(o.format),s=a>0?r.pos:a<0?r.neg:r.zero;return s.replace("%s",o.symbol).replace("%v",p(Math.abs(a),h(o.precision),o.thousand,o.decimal))};j.formatColumn=function(a,b,k,l,m,o){if(!a)return[];var q=f(e(b)?b:{symbol:b,precision:k,thousand:l,decimal:m,format:o},j.settings.currency),r=i(q.format),s=r.pos.indexOf("%s")<r.pos.indexOf("%v"),t=0,u=g(a,function(a,b){if(d(a))return j.formatColumn(a,q);a=n(a);var c=a>0?r.pos:a<0?r.neg:r.zero,e=c.replace("%s",q.symbol).replace("%v",p(Math.abs(a),h(q.precision),q.thousand,q.decimal));return e.length>t&&(t=e.length),e});return g(u,function(a,b){return c(a)&&a.length<t?s?a.replace(q.symbol,q.symbol+new Array(t-a.length+1).join(" ")):new Array(t-a.length+1).join(" ")+a:a})},"undefined"!=typeof exports?("undefined"!=typeof module&&module.exports&&(exports=module.exports=j),exports.accounting=j):"function"==typeof define&&define.amd?define([],function(){return j}):(j.noConflict=function(c){return function(){return a.accounting=c,j.noConflict=b,j}}(a.accounting),a.accounting=j)}(this);
\ No newline at end of file
diff --git a/assets/js/admin/api-keys.js b/assets/js/admin/api-keys.js
index 03782181546..9d34597c517 100644
--- a/assets/js/admin/api-keys.js
+++ b/assets/js/admin/api-keys.js
@@ -48,20 +48,35 @@
 		/**
 		 * Init TipTip
 		 */
-		initTipTip: function() {
-			$( '.copy-key', this.el ).tipTip({
-				'attribute':  'data-tip',
-				'activation': 'click',
-				'fadeIn':     50,
-				'fadeOut':    50,
-				'delay':      0
-			});
-
-			$( document.body ).on( 'copy', '.copy-key', function( e ) {
-				e.clipboardData.clearData();
-				e.clipboardData.setData( 'text/plain', $.trim( $( this ).prev( 'code' ).html() ) );
-				e.preventDefault();
-			});
+		initTipTip: function( css_class ) {
+			$( document.body )
+				.on( 'aftercopy', css_class, function( e ) {
+					if ( true === e.success['text/plain'] ) {
+						$( '#copy-error' ).text( '' );
+						$( css_class ).tipTip( {
+							'attribute':  'data-tip',
+							'activation': 'focus',
+							'fadeIn':     50,
+							'fadeOut':    50,
+							'delay':      0
+						} ).focus();
+					} else {
+						$( css_class ).parent().find( 'input' ).focus().select();
+						$( '#copy-error' ).text( woocommerce_admin_api_keys.clipboard_failed );
+					}
+				} )
+				.on( 'click', css_class, function() {
+					if ( ! document.queryCommandSupported( 'copy' ) ) {
+						$( css_class ).parent().find( 'input' ).focus().select();
+						$( '#copy-error' ).text( woocommerce_admin_api_keys.clipboard_failed );
+					}
+				} )
+				.on( 'copy', css_class, function( e ) {
+					$( '#copy-error' ).text( '' );
+					e.clipboardData.clearData();
+					e.clipboardData.setData( 'text/plain', $.trim( $( this ).prev( 'input' ).val() ) );
+					e.preventDefault();
+				} );
 		},
 
 		/**
@@ -121,7 +136,8 @@
 								consumer_secret: data.consumer_secret
 							}) );
 							self.createQRCode( data.consumer_key, data.consumer_secret );
-							self.initTipTip();
+							self.initTipTip( '.copy-key' );
+							self.initTipTip( '.copy-secret' );
 						} else {
 							$( '#key_description', self.el ).val( data.description );
 							$( '#key_user', self.el ).val( data.user_id );
diff --git a/assets/js/admin/api-keys.min.js b/assets/js/admin/api-keys.min.js
index 839d1830e95..20a37d5648e 100644
--- a/assets/js/admin/api-keys.min.js
+++ b/assets/js/admin/api-keys.min.js
@@ -1 +1 @@
-!function(a){var b=Backbone.View.extend({el:a("#key-fields"),events:{"click input#update_api_key":"saveKey"},initialize:function(){_.bindAll(this,"saveKey")},block:function(){a(this.el).block({message:null,overlayCSS:{background:"#fff",opacity:.6}})},unblock:function(){a(this.el).unblock()},initTipTip:function(){a(".copy-key",this.el).tipTip({attribute:"data-tip",activation:"click",fadeIn:50,fadeOut:50,delay:0}),a(document.body).on("copy",".copy-key",function(b){b.clipboardData.clearData(),b.clipboardData.setData("text/plain",a.trim(a(this).prev("code").html())),b.preventDefault()})},createQRCode:function(b,c){a("#keys-qrcode").qrcode({text:b+"|"+c,width:120,height:120})},saveKey:function(b){b.preventDefault();var c=this;c.block(),Backbone.ajax({method:"POST",dataType:"json",url:woocommerce_admin_api_keys.ajax_url,data:{action:"woocommerce_update_api_key",security:woocommerce_admin_api_keys.update_api_nonce,key_id:a("#key_id",c.el).val(),description:a("#key_description",c.el).val(),user:a("#key_user",c.el).val(),permissions:a("#key_permissions",c.el).val()},success:function(b){if(a(".wc-api-message",c.el).remove(),b.success){var d=b.data;if(a("h3",c.el).first().append('<div class="wc-api-message updated"><p>'+d.message+"</p></div>"),0<d.consumer_key.length&&0<d.consumer_secret.length){a("#api-keys-options",c.el).remove(),a("p.submit",c.el).empty().append(d.revoke_url);var e=wp.template("api-keys-template");a("p.submit",c.el).before(e({consumer_key:d.consumer_key,consumer_secret:d.consumer_secret})),c.createQRCode(d.consumer_key,d.consumer_secret),c.initTipTip()}else a("#key_description",c.el).val(d.description),a("#key_user",c.el).val(d.user_id),a("#key_permissions",c.el).val(d.permissions)}else a("h3",c.el).first().append('<div class="wc-api-message error"><p>'+b.data.message+"</p></div>");c.unblock()}})}});new b}(jQuery);
\ No newline at end of file
+!function(a){var b=Backbone.View.extend({el:a("#key-fields"),events:{"click input#update_api_key":"saveKey"},initialize:function(){_.bindAll(this,"saveKey")},block:function(){a(this.el).block({message:null,overlayCSS:{background:"#fff",opacity:.6}})},unblock:function(){a(this.el).unblock()},initTipTip:function(b){a(document.body).on("aftercopy",b,function(c){!0===c.success["text/plain"]?(a("#copy-error").text(""),a(b).tipTip({attribute:"data-tip",activation:"focus",fadeIn:50,fadeOut:50,delay:0}).focus()):(a(b).parent().find("input").focus().select(),a("#copy-error").text(woocommerce_admin_api_keys.clipboard_failed))}).on("click",b,function(){document.queryCommandSupported("copy")||(a(b).parent().find("input").focus().select(),a("#copy-error").text(woocommerce_admin_api_keys.clipboard_failed))}).on("copy",b,function(b){a("#copy-error").text(""),b.clipboardData.clearData(),b.clipboardData.setData("text/plain",a.trim(a(this).prev("input").val())),b.preventDefault()})},createQRCode:function(b,c){a("#keys-qrcode").qrcode({text:b+"|"+c,width:120,height:120})},saveKey:function(b){b.preventDefault();var c=this;c.block(),Backbone.ajax({method:"POST",dataType:"json",url:woocommerce_admin_api_keys.ajax_url,data:{action:"woocommerce_update_api_key",security:woocommerce_admin_api_keys.update_api_nonce,key_id:a("#key_id",c.el).val(),description:a("#key_description",c.el).val(),user:a("#key_user",c.el).val(),permissions:a("#key_permissions",c.el).val()},success:function(b){if(a(".wc-api-message",c.el).remove(),b.success){var d=b.data;if(a("h3",c.el).first().append('<div class="wc-api-message updated"><p>'+d.message+"</p></div>"),0<d.consumer_key.length&&0<d.consumer_secret.length){a("#api-keys-options",c.el).remove(),a("p.submit",c.el).empty().append(d.revoke_url);var e=wp.template("api-keys-template");a("p.submit",c.el).before(e({consumer_key:d.consumer_key,consumer_secret:d.consumer_secret})),c.createQRCode(d.consumer_key,d.consumer_secret),c.initTipTip(".copy-key"),c.initTipTip(".copy-secret")}else a("#key_description",c.el).val(d.description),a("#key_user",c.el).val(d.user_id),a("#key_permissions",c.el).val(d.permissions)}else a("h3",c.el).first().append('<div class="wc-api-message error"><p>'+b.data.message+"</p></div>");c.unblock()}})}});new b}(jQuery);
\ No newline at end of file
diff --git a/assets/js/admin/order-backbone-modal.js b/assets/js/admin/backbone-modal.js
similarity index 80%
rename from assets/js/admin/order-backbone-modal.js
rename to assets/js/admin/backbone-modal.js
index b8d8eb62260..ea5fe16baaf 100644
--- a/assets/js/admin/order-backbone-modal.js
+++ b/assets/js/admin/backbone-modal.js
@@ -53,15 +53,28 @@
 		_string: undefined,
 		events: {
 			'click .modal-close': 'closeButton',
-			'click #btn-ok':      'addButton',
+			'click #btn-ok'     : 'addButton',
 			'touchstart #btn-ok': 'addButton',
-			'keydown':            'keyboardActions'
+			'keydown'           : 'keyboardActions'
+		},
+		resizeContent: function() {
+			var $content  = $( '.wc-backbone-modal-content' ).find( 'article' );
+			var max_h     = $( window ).height() * 0.75;
+
+			$content.css({
+				'max-height': max_h + 'px'
+			});
 		},
 		initialize: function( data ) {
+			var view     = this;
 			this._target = data.target;
 			this._string = data.string;
 			_.bindAll( this, 'render' );
 			this.render();
+
+			$( window ).resize(function() {
+				view.resizeContent();
+			});
 		},
 		render: function() {
 			var template = wp.template( this._target );
@@ -74,30 +87,9 @@
 				'overflow': 'hidden'
 			}).append( this.$el );
 
-			var $content  = $( '.wc-backbone-modal-content' ).find( 'article' );
-			var content_h = ( $content.height() < 90 ) ? 90 : $content.height();
-			var max_h     = $( window ).height() - 200;
-
-			if ( max_h > 400 ) {
-				max_h = 400;
-			}
-
-			if ( content_h > max_h ) {
-				$content.css({
-					'overflow': 'auto',
-					height: max_h + 'px'
-				});
-			} else {
-				$content.css({
-					'overflow': 'visible',
-					height: ( content_h > 90 ) ? 'auto' : content_h + 'px'
-				});
-			}
-
-			$( '.wc-backbone-modal-content' ).css({
-				'margin-top': '-' + ( $( '.wc-backbone-modal-content' ).height() / 2 ) + 'px',
-				'margin-left': '-' + ( $( '.wc-backbone-modal-content' ).width() / 2 ) + 'px'
-			});
+			this.resizeContent();
+			this.$el.focus();
+			$( document.body ).trigger( 'init_tooltips' );
 
 			$( document.body ).trigger( 'wc_backbone_modal_loaded', this._target );
 		},
@@ -122,7 +114,8 @@
 			$( document.body ).trigger( 'wc_backbone_modal_before_update', this._target );
 
 			$.each( $( 'form', this.$el ).serializeArray(), function( index, item ) {
-				if ( data.hasOwnProperty( item.name ) ) {
+				if ( item.name.indexOf( '[]' ) !== -1 ) {
+					item.name = item.name.replace( '[]', '' );
 					data[ item.name ] = $.makeArray( data[ item.name ] );
 					data[ item.name ].push( item.value );
 				} else {
diff --git a/assets/js/admin/backbone-modal.min.js b/assets/js/admin/backbone-modal.min.js
new file mode 100644
index 00000000000..740c80c5c95
--- /dev/null
+++ b/assets/js/admin/backbone-modal.min.js
@@ -0,0 +1 @@
+!function(a,b,c){"use strict";a.fn.WCBackboneModal=function(b){return this.each(function(){new a.WCBackboneModal(a(this),b)})},a.WCBackboneModal=function(b,c){var d=a.extend({},a.WCBackboneModal.defaultOptions,c);d.template&&new a.WCBackboneModal.View({target:d.template,string:d.variable})},a.WCBackboneModal.defaultOptions={template:"",variable:{}},a.WCBackboneModal.View=b.View.extend({tagName:"div",id:"wc-backbone-modal-dialog",_target:void 0,_string:void 0,events:{"click .modal-close":"closeButton","click #btn-ok":"addButton","touchstart #btn-ok":"addButton",keydown:"keyboardActions"},resizeContent:function(){var b=a(".wc-backbone-modal-content").find("article"),c=.75*a(window).height();b.css({"max-height":c+"px"})},initialize:function(b){var d=this;this._target=b.target,this._string=b.string,c.bindAll(this,"render"),this.render(),a(window).resize(function(){d.resizeContent()})},render:function(){var b=wp.template(this._target);this.$el.attr("tabindex","0").append(b(this._string)),a(document.body).css({overflow:"hidden"}).append(this.$el),this.resizeContent(),this.$el.focus(),a(document.body).trigger("init_tooltips"),a(document.body).trigger("wc_backbone_modal_loaded",this._target)},closeButton:function(b){b.preventDefault(),a(document.body).trigger("wc_backbone_modal_before_remove",this._target),this.undelegateEvents(),a(document).off("focusin"),a(document.body).css({overflow:"auto"}),this.remove(),a(document.body).trigger("wc_backbone_modal_removed",this._target)},addButton:function(b){a(document.body).trigger("wc_backbone_modal_response",[this._target,this.getFormData()]),this.closeButton(b)},getFormData:function(){var b={};return a(document.body).trigger("wc_backbone_modal_before_update",this._target),a.each(a("form",this.$el).serializeArray(),function(c,d){d.name.indexOf("[]")!==-1?(d.name=d.name.replace("[]",""),b[d.name]=a.makeArray(b[d.name]),b[d.name].push(d.value)):b[d.name]=d.value}),b},keyboardActions:function(a){var b=a.keyCode||a.which;13!==b||a.target.tagName&&("input"===a.target.tagName.toLowerCase()||"textarea"===a.target.tagName.toLowerCase())||this.addButton(a),27===b&&this.closeButton(a)}})}(jQuery,Backbone,_);
\ No newline at end of file
diff --git a/assets/js/admin/meta-boxes-coupon.js b/assets/js/admin/meta-boxes-coupon.js
index fec1100539c..4e5377c3abb 100644
--- a/assets/js/admin/meta-boxes-coupon.js
+++ b/assets/js/admin/meta-boxes-coupon.js
@@ -21,7 +21,7 @@ jQuery(function( $ ) {
 			// Get value
 			var select_val = $( this ).val();
 
-			if ( select_val === 'fixed_product' || select_val === 'percent_product' ) {
+			if ( select_val !== 'fixed_cart' ) {
 				$( '.limit_usage_to_x_items_field' ).show();
 			} else {
 				$( '.limit_usage_to_x_items_field' ).hide();
diff --git a/assets/js/admin/meta-boxes-coupon.min.js b/assets/js/admin/meta-boxes-coupon.min.js
index e9de32aad06..7d39b599dfd 100644
--- a/assets/js/admin/meta-boxes-coupon.min.js
+++ b/assets/js/admin/meta-boxes-coupon.min.js
@@ -1 +1 @@
-jQuery(function(a){var b={init:function(){a("select#discount_type").on("change",this.type_options).change()},type_options:function(){var b=a(this).val();"fixed_product"===b||"percent_product"===b?a(".limit_usage_to_x_items_field").show():a(".limit_usage_to_x_items_field").hide()}};b.init()});
\ No newline at end of file
+jQuery(function(a){var b={init:function(){a("select#discount_type").on("change",this.type_options).change()},type_options:function(){var b=a(this).val();"fixed_cart"!==b?a(".limit_usage_to_x_items_field").show():a(".limit_usage_to_x_items_field").hide()}};b.init()});
\ No newline at end of file
diff --git a/assets/js/admin/meta-boxes-order.js b/assets/js/admin/meta-boxes-order.js
index f250f1b53c9..68eed9fa703 100644
--- a/assets/js/admin/meta-boxes-order.js
+++ b/assets/js/admin/meta-boxes-order.js
@@ -99,10 +99,26 @@ jQuery( function ( $ ) {
 
 		edit_address: function( e ) {
 			e.preventDefault();
-			$( this ).hide();
-			$( this ).parent().find( 'a:not(.edit_address)' ).show();
-			$( this ).closest( '.order_data_column' ).find( 'div.address' ).hide();
-			$( this ).closest( '.order_data_column' ).find( 'div.edit_address' ).show();
+
+			var $this          = $( this ),
+				$wrapper       = $this.closest( '.order_data_column' ),
+				$edit_address  = $wrapper.find( 'div.edit_address' ),
+				$address       = $wrapper.find( 'div.address' ),
+				$country_input = $edit_address.find( '.js_field-country' ),
+				$state_input   = $edit_address.find( '.js_field-state' );
+
+			$address.hide();
+			$this.parent().find( 'a' ).toggle();
+
+			if ( ! $country_input.val() ) {
+				$country_input.val( woocommerce_admin_meta_boxes_order.default_country ).change();
+			}
+
+			if ( ! $state_input.val() ) {
+				$state_input.val( woocommerce_admin_meta_boxes_order.default_state ).change();
+			}
+
+			$edit_address.show();
 		},
 
 		change_customer_user: function() {
@@ -125,10 +141,9 @@ jQuery( function ( $ ) {
 				}
 
 				var data = {
-					user_id:      user_id,
-					type_to_load: 'billing',
-					action:       'woocommerce_get_customer_details',
-					security:     woocommerce_admin_meta_boxes.get_customer_details_nonce
+					user_id : user_id,
+					action  : 'woocommerce_get_customer_details',
+					security: woocommerce_admin_meta_boxes.get_customer_details_nonce
 				};
 
 				$( this ).closest( 'div.edit_address' ).block({
@@ -144,9 +159,9 @@ jQuery( function ( $ ) {
 					data: data,
 					type: 'POST',
 					success: function( response ) {
-						if ( response ) {
-							$.each( response, function( key, data ) {
-							    $( ':input#_' + key ).val( data ).change();
+						if ( response && response.billing ) {
+							$.each( response.billing, function( key, data ) {
+								$( ':input#_billing_' + key ).val( data ).change();
 							});
 						}
 						$( 'div.edit_address' ).unblock();
@@ -169,7 +184,6 @@ jQuery( function ( $ ) {
 
 				var data = {
 					user_id:      user_id,
-					type_to_load: 'shipping',
 					action:       'woocommerce_get_customer_details',
 					security:     woocommerce_admin_meta_boxes.get_customer_details_nonce
 				};
@@ -187,9 +201,9 @@ jQuery( function ( $ ) {
 					data: data,
 					type: 'POST',
 					success: function( response ) {
-						if ( response ) {
-							$.each( response, function( key, data ) {
-							    $( ':input#_' + key ).val( data ).change();
+						if ( response && response.billing ) {
+							$.each( response.shipping, function( key, data ) {
+								$( ':input#_shipping_' + key ).val( data ).change();
 							});
 						}
 						$( 'div.edit_address' ).unblock();
@@ -226,14 +240,16 @@ jQuery( function ( $ ) {
 				.on( 'click', 'button.add-order-fee', this.add_fee )
 				.on( 'click', 'button.add-order-shipping', this.add_shipping )
 				.on( 'click', 'button.add-order-tax', this.add_tax )
-				.on( 'click', 'input.check-column', this.bulk_actions.check_column )
-				.on( 'click', '.do_bulk_action', this.bulk_actions.do_bulk_action )
-				.on( 'click', 'button.calculate-action', this.calculate_totals )
 				.on( 'click', 'button.save-action', this.save_line_items )
 				.on( 'click', 'a.delete-order-tax', this.delete_tax )
-				.on( 'click', 'button.calculate-tax-action', this.calculate_tax )
+				.on( 'click', 'button.calculate-action', this.recalculate )
 				.on( 'click', 'a.edit-order-item', this.edit_item )
 				.on( 'click', 'a.delete-order-item', this.delete_item )
+				.on( 'click', 'tr.item, tr.fee, tr.shipping, tr.refund', this.select_row )
+				.on( 'click', 'tr.item :input, tr.fee :input, tr.shipping :input, tr.refund :input, tr.item a, tr.fee a, tr.shipping a, tr.refund a', this.select_row_child )
+				.on( 'click', 'button.bulk-delete-items', this.bulk_actions.do_delete )
+				.on( 'click', 'button.bulk-increase-stock', this.bulk_actions.do_increase_stock )
+				.on( 'click', 'button.bulk-decrease-stock', this.bulk_actions.do_reduce_stock )
 
 				// Refunds
 				.on( 'click', '.delete_refund', this.refunds.delete_refund )
@@ -246,14 +262,14 @@ jQuery( function ( $ ) {
 				.on( 'change', 'input.quantity', this.quantity_changed )
 
 				// Subtotal/total
-				.on( 'keyup', '.woocommerce_order_items .split-input input:eq(0)', function() {
-					var $subtotal = $( this ).next();
-					if ( $subtotal.val() === '' || $subtotal.is( '.match-total' ) ) {
+				.on( 'keyup change', '.split-input :input', function() {
+					var $subtotal = $( this ).parent().prev().find(':input');
+					if ( $subtotal && ( $subtotal.val() === '' || $subtotal.is( '.match-total' ) ) ) {
 						$subtotal.val( $( this ).val() ).addClass( 'match-total' );
 					}
 				})
 
-				.on( 'keyup', '.woocommerce_order_items .split-input input:eq(1)', function() {
+				.on( 'keyup', '.split-input :input', function() {
 					$( this ).removeClass( 'match-total' );
 				})
 
@@ -327,21 +343,23 @@ jQuery( function ( $ ) {
 			);
 
 			// Taxes
-			$( 'td.line_tax', $row ).each(function() {
-				var line_total_tax = $( 'input.line_tax', $( this ) );
-				var unit_total_tax = accounting.unformat( line_total_tax.attr( 'data-total_tax' ), woocommerce_admin.mon_decimal_point ) / o_qty;
+			$( 'input.line_tax', $row ).each( function() {
+				var $line_total_tax    = $( this );
+				var tax_id             = $line_total_tax.data( 'tax_id' );
+				var unit_total_tax     = accounting.unformat( $line_total_tax.attr( 'data-total_tax' ), woocommerce_admin.mon_decimal_point ) / o_qty;
+				var $line_subtotal_tax = $( 'input.line_subtotal_tax[data-tax_id="' + tax_id + '"]', $row );
+				var unit_subtotal_tax  = accounting.unformat( $line_subtotal_tax.attr( 'data-subtotal_tax' ), woocommerce_admin.mon_decimal_point ) / o_qty;
+
 				if ( 0 < unit_total_tax ) {
-					line_total_tax.val(
+					$line_total_tax.val(
 						parseFloat( accounting.formatNumber( unit_total_tax * qty, woocommerce_admin_meta_boxes.rounding_precision, '' ) )
 							.toString()
 							.replace( '.', woocommerce_admin.mon_decimal_point )
 					);
 				}
 
-				var line_subtotal_tax = $( 'input.line_subtotal_tax', $( this ) );
-				var unit_subtotal_tax = accounting.unformat( line_subtotal_tax.attr( 'data-subtotal_tax' ), woocommerce_admin.mon_decimal_point ) / o_qty;
 				if ( 0 < unit_subtotal_tax ) {
-					line_subtotal_tax.val(
+					$line_subtotal_tax.val(
 						parseFloat( accounting.formatNumber( unit_subtotal_tax * qty, woocommerce_admin_meta_boxes.rounding_precision, '' ) )
 							.toString()
 							.replace( '.', woocommerce_admin.mon_decimal_point )
@@ -354,13 +372,13 @@ jQuery( function ( $ ) {
 
 		add_line_item: function() {
 			$( 'div.wc-order-add-item' ).slideDown();
-			$( 'div.wc-order-bulk-actions' ).slideUp();
+			$( 'div.wc-order-data-row-toggle' ).not( 'div.wc-order-add-item' ).slideUp();
 			return false;
 		},
 
 		refund_items: function() {
 			$( 'div.wc-order-refund-items' ).slideDown();
-			$( 'div.wc-order-bulk-actions' ).slideUp();
+			$( 'div.wc-order-data-row-toggle' ).not( 'div.wc-order-refund-items' ).slideUp();
 			$( 'div.wc-order-totals-items' ).slideUp();
 			$( '#woocommerce-order-items' ).find( 'div.refund' ).show();
 			$( '.wc-order-edit-line-item .wc-order-edit-line-item-actions' ).hide();
@@ -368,7 +386,7 @@ jQuery( function ( $ ) {
 		},
 
 		cancel: function() {
-			$( this ).closest( 'div.wc-order-data-row' ).slideUp();
+			$( 'div.wc-order-data-row-toggle' ).not( 'div.wc-order-bulk-actions' ).slideUp();
 			$( 'div.wc-order-bulk-actions' ).slideDown();
 			$( 'div.wc-order-totals-items' ).slideDown();
 			$( '#woocommerce-order-items' ).find( 'div.refund' ).hide();
@@ -394,13 +412,18 @@ jQuery( function ( $ ) {
 			wc_meta_boxes_order_items.block();
 
 			var data = {
-				action:   'woocommerce_add_order_fee',
-				order_id: woocommerce_admin_meta_boxes.post_id,
-				security: woocommerce_admin_meta_boxes.order_item_nonce
+				action   : 'woocommerce_add_order_fee',
+				order_id : woocommerce_admin_meta_boxes.post_id,
+				dataType : 'json',
+				security : woocommerce_admin_meta_boxes.order_item_nonce
 			};
 
 			$.post( woocommerce_admin_meta_boxes.ajax_url, data, function( response ) {
-				$( 'table.woocommerce_order_items tbody#order_fee_line_items' ).append( response );
+				if ( response.success ) {
+					$( 'table.woocommerce_order_items tbody#order_fee_line_items' ).append( response.data.html );
+				} else {
+					window.alert( response.data.error );
+				}
 				wc_meta_boxes_order_items.unblock();
 			});
 
@@ -411,13 +434,18 @@ jQuery( function ( $ ) {
 			wc_meta_boxes_order_items.block();
 
 			var data = {
-				action:   'woocommerce_add_order_shipping',
-				order_id: woocommerce_admin_meta_boxes.post_id,
-				security: woocommerce_admin_meta_boxes.order_item_nonce
+				action   : 'woocommerce_add_order_shipping',
+				order_id : woocommerce_admin_meta_boxes.post_id,
+				security : woocommerce_admin_meta_boxes.order_item_nonce,
+				dataType : 'json'
 			};
 
 			$.post( woocommerce_admin_meta_boxes.ajax_url, data, function( response ) {
-				$( 'table.woocommerce_order_items tbody#order_shipping_line_items' ).append( response );
+				if ( response.success ) {
+					$( 'table.woocommerce_order_items tbody#order_shipping_line_items' ).append( response.data.html );
+				} else {
+					window.alert( response.data.error );
+				}
 				wc_meta_boxes_order_items.unblock();
 			});
 
@@ -495,8 +523,8 @@ jQuery( function ( $ ) {
 			return false;
 		},
 
-		calculate_tax: function() {
-			if ( window.confirm( woocommerce_admin_meta_boxes.calc_line_taxes ) ) {
+		recalculate: function() {
+			if ( window.confirm( woocommerce_admin_meta_boxes.calc_totals ) ) {
 				wc_meta_boxes_order_items.block();
 
 				var country          = '';
@@ -546,49 +574,6 @@ jQuery( function ( $ ) {
 			return false;
 		},
 
-		calculate_totals: function() {
-			if ( window.confirm( woocommerce_admin_meta_boxes.calc_totals ) ) {
-
-				wc_meta_boxes_order_items.block();
-
-				// Get row totals
-				var line_totals    = 0;
-				var tax            = 0;
-				var shipping       = 0;
-
-				$( '.woocommerce_order_items tr.shipping input.line_total' ).each(function() {
-					var cost  = $( this ).val() || '0';
-					cost      = accounting.unformat( cost, woocommerce_admin.mon_decimal_point );
-					shipping  = shipping + parseFloat( cost );
-				});
-
-				$( '.woocommerce_order_items input.line_tax' ).each(function() {
-					var cost = $( this ).val() || '0';
-					cost     = accounting.unformat( cost, woocommerce_admin.mon_decimal_point );
-					tax      = tax + parseFloat( cost );
-				});
-
-				$( '.woocommerce_order_items tr.item, .woocommerce_order_items tr.fee' ).each(function() {
-					var line_total = $( this ).find( 'input.line_total' ).val() || '0';
-					line_totals    = line_totals + accounting.unformat( line_total.replace( ',', '.' ) );
-				});
-
-				// Tax
-				if ( 'yes' === woocommerce_admin_meta_boxes.round_at_subtotal ) {
-					tax = parseFloat( accounting.toFixed( tax, woocommerce_admin_meta_boxes.rounding_precision ) );
-				}
-
-				// Set Total
-				$( '#_order_total' )
-					.val( accounting.formatNumber( line_totals + tax + shipping, woocommerce_admin_meta_boxes.currency_format_num_decimals, '', woocommerce_admin.mon_decimal_point ) )
-					.change();
-
-				$( 'button.save-action' ).click();
-			}
-
-			return false;
-		},
-
 		save_line_items: function() {
 			var data = {
 				order_id: woocommerce_admin_meta_boxes.post_id,
@@ -666,7 +651,7 @@ jQuery( function ( $ ) {
 						line_item_totals:       JSON.stringify( line_item_totals, null, '' ),
 						line_item_tax_totals:   JSON.stringify( line_item_tax_totals, null, '' ),
 						api_refund:             $( this ).is( '.do-api-refund' ),
-						restock_refunded_items: $( '#restock_refunded_items:checked' ).size() ? 'true' : 'false',
+						restock_refunded_items: $( '#restock_refunded_items:checked' ).length ? 'true' : 'false',
 						security:               woocommerce_admin_meta_boxes.order_item_nonce
 					};
 
@@ -766,19 +751,20 @@ jQuery( function ( $ ) {
 				).change();
 
 				// Taxes
-				$( 'td.line_tax', $row ).each( function() {
-					var line_total_tax        = $( 'input.line_tax', $( this ) );
-					var refund_line_total_tax = $( 'input.refund_line_tax', $( this ) );
-					var unit_total_tax = accounting.unformat( line_total_tax.attr( 'data-total_tax' ), woocommerce_admin.mon_decimal_point ) / qty;
+				$( '.refund_line_tax', $row ).each( function() {
+					var $refund_line_total_tax = $( this );
+					var tax_id                 = $refund_line_total_tax.data( 'tax_id' );
+					var line_total_tax         = $( 'input.line_tax[data-tax_id="' + tax_id + '"]', $row );
+					var unit_total_tax         = accounting.unformat( line_total_tax.data( 'total_tax' ), woocommerce_admin.mon_decimal_point ) / qty;
 
 					if ( 0 < unit_total_tax ) {
-						refund_line_total_tax.val(
+						$refund_line_total_tax.val(
 							parseFloat( accounting.formatNumber( unit_total_tax * refund_qty, woocommerce_admin_meta_boxes.rounding_precision, '' ) )
 								.toString()
 								.replace( '.', woocommerce_admin.mon_decimal_point )
 						).change();
 					} else {
-						refund_line_total_tax.val( 0 ).change();
+						$refund_line_total_tax.val( 0 ).change();
 					}
 				});
 
@@ -802,25 +788,17 @@ jQuery( function ( $ ) {
 
 			add: function() {
 				var $button = $( this );
-				var $item = $button.closest( 'tr.item' );
-
-				var data = {
-					order_item_id: $item.attr( 'data-order_item_id' ),
-					action:        'woocommerce_add_order_item_meta',
-					security:      woocommerce_admin_meta_boxes.order_item_nonce
-				};
-
-				wc_meta_boxes_order_items.block();
-
-				$.ajax({
-					url: woocommerce_admin_meta_boxes.ajax_url,
-					data: data,
-					type: 'POST',
-					success: function( response ) {
-						$item.find('tbody.meta_items').append( response );
-						wc_meta_boxes_order_items.unblock();
-					}
-				});
+				var $item = $button.closest( 'tr.item, tr.shipping' );
+				var $items = $item.find('tbody.meta_items');
+				var index  = $items.find('tr').length + 1;
+				var $row   = '<tr data-meta_id="0">' +
+					'<td>' +
+						'<input type="text" placeholder="' + woocommerce_admin_meta_boxes_order.placeholder_name + '" name="meta_key[' + $item.attr( 'data-order_item_id' ) + '][new-' + index + ']" />' +
+						'<textarea placeholder="' + woocommerce_admin_meta_boxes_order.placeholder_value + '" name="meta_value[' + $item.attr( 'data-order_item_id' ) + '][new-' + index + ']"></textarea>' +
+					'</td>' +
+					'<td width="1%"><button class="remove_order_item_meta button">&times;</button></td>' +
+				'</tr>';
+				$items.append( $row );
 
 				return false;
 			},
@@ -828,100 +806,131 @@ jQuery( function ( $ ) {
 			remove: function() {
 				if ( window.confirm( woocommerce_admin_meta_boxes.remove_item_meta ) ) {
 					var $row = $( this ).closest( 'tr' );
-
-					var data = {
-						meta_id:  $row.attr( 'data-meta_id' ),
-						action:   'woocommerce_remove_order_item_meta',
-						security: woocommerce_admin_meta_boxes.order_item_nonce
-					};
-
-					wc_meta_boxes_order_items.block();
-
-					$.ajax({
-						url: woocommerce_admin_meta_boxes.ajax_url,
-						data: data,
-						type: 'POST',
-						success: function() {
-							$row.hide();
-							wc_meta_boxes_order_items.unblock();
-						}
-					});
+					$row.find( ':input' ).val( '' );
+					$row.hide();
 				}
 				return false;
 			}
 		},
 
-		bulk_actions: {
+		select_row: function() {
+			var $row = false;
+			if ( $( this ).is( 'tr' ) ) {
+				$row = $( this );
+			} else {
+				$row = $( this ).closest( 'tr' );
+			}
+			var $table = $( this ).closest( 'table' );
 
-			check_column: function() {
-				if ( $( this ).is( ':checked' ) ) {
-					$( '#woocommerce-order-items' ).find( '.check-column input' ).attr( 'checked', 'checked' );
-				} else {
-					$( '#woocommerce-order-items' ).find( '.check-column input' ).removeAttr( 'checked' );
-				}
-			},
+			if ( $row.is( '.selected' ) ) {
+				$row.removeClass( 'selected' );
+			} else {
+				$row.addClass( 'selected' );
+			}
 
-			do_bulk_action: function() {
-				var action        = $( this ).closest( '.bulk-actions' ).find( 'select' ).val();
-				var selected_rows = $( '#woocommerce-order-items' ).find( '.check-column input:checked' );
-				var item_ids      = [];
+			var $rows = $table.find( 'tr.selected' );
 
-				$( selected_rows ).each( function() {
-					var $item = $( this ).closest( 'tr' );
+			if ( $rows.length ) {
+				$( 'div.wc-order-item-bulk-edit' ).slideDown();
 
-					if ( $item.attr( 'data-order_item_id' ) ) {
-						item_ids.push( $item.attr( 'data-order_item_id' ) );
+				var selected_product = false;
+
+				$rows.each( function() {
+					if ( $( this ).is( 'tr.item' ) ) {
+						selected_product = true;
 					}
 				} );
 
-				if ( item_ids.length === 0 ) {
-					window.alert( woocommerce_admin_meta_boxes.i18n_select_items );
-					return;
+				if ( selected_product ) {
+					$( '.bulk-increase-stock, .bulk-decrease-stock' ).show();
+				} else {
+					$( '.bulk-increase-stock, .bulk-decrease-stock' ).hide();
 				}
+			} else {
+				$( 'div.wc-order-item-bulk-edit' ).slideUp();
+			}
+		},
 
-				if ( wc_meta_boxes_order_items.bulk_actions[ 'do_' + action ] ) {
-					wc_meta_boxes_order_items.bulk_actions[ 'do_' + action ]( selected_rows, item_ids );
-				}
+		select_row_child: function( e ) {
+			e.stopPropagation();
+		},
 
-				return false;
-			},
+		bulk_actions: {
 
-			do_delete: function( selected_rows, item_ids ) {
-				if ( window.confirm( woocommerce_admin_meta_boxes.remove_item_notice ) ) {
+			do_delete: function( e ) {
+				e.preventDefault();
+				var $table = $( 'table.woocommerce_order_items' );
+				var $rows = $table.find( 'tr.selected' );
+
+				if ( $rows.length && window.confirm( woocommerce_admin_meta_boxes.remove_item_notice ) ) {
 
 					wc_meta_boxes_order_items.block();
 
-					var data = {
-						order_item_ids: item_ids,
-						action:         'woocommerce_remove_order_item',
-						security:       woocommerce_admin_meta_boxes.order_item_nonce
-					};
+					var delete_items   = [];
+					var delete_refunds = [];
+					var deferred = [];
 
-					$.ajax({
-						url: woocommerce_admin_meta_boxes.ajax_url,
-						data: data,
-						type: 'POST',
-						success: function() {
-							$( selected_rows ).each(function() {
-								$( this ).closest( 'tr' ).remove();
-							});
-							wc_meta_boxes_order_items.unblock();
+					$.map( $rows, function( row ) {
+						var $row = $( row );
+
+						if ( $row.is( '.refund' ) ) {
+							delete_refunds.push( parseInt( $( $row ).data( 'order_refund_id' ), 10 ) );
+						} else {
+							delete_items.push( parseInt( $( $row ).data( 'order_item_id' ), 10 ) );
 						}
+						return ;
 					});
+
+					if ( delete_items.length ) {
+						deferred.push( $.ajax({
+							url : woocommerce_admin_meta_boxes.ajax_url,
+							data: {
+								order_item_ids: delete_items,
+								action:         'woocommerce_remove_order_item',
+								security:       woocommerce_admin_meta_boxes.order_item_nonce
+							},
+							type: 'POST'
+						} ) );
+					}
+
+					if ( delete_refunds.length ) {
+						deferred.push( $.ajax( {
+							url : woocommerce_admin_meta_boxes.ajax_url,
+							data: {
+								action:    'woocommerce_delete_refund',
+								refund_id: delete_refunds,
+								security:  woocommerce_admin_meta_boxes.order_item_nonce
+							},
+							type: 'POST'
+						} ) );
+					}
+
+					if ( deferred ) {
+						$.when.apply( $, deferred ).done( function() {
+							wc_meta_boxes_order_items.reload_items();
+							wc_meta_boxes_order_items.unblock();
+						} );
+					} else {
+						wc_meta_boxes_order_items.unblock();
+					}
 				}
 			},
 
-			do_increase_stock: function( selected_rows, item_ids ) {
+			do_increase_stock: function( e ) {
+				e.preventDefault();
 				wc_meta_boxes_order_items.block();
 
+				var $table = $( 'table.woocommerce_order_items' );
+				var $rows = $table.find( 'tr.selected' );
 				var quantities = {};
+				var item_ids = $.map( $rows, function( $row ) {
+					return parseInt( $( $row ).data( 'order_item_id' ), 10 );
+				});
 
-				$( selected_rows ).each(function() {
-
-					var $item = $( this ).closest( 'tr.item, tr.fee' );
-					var $qty  = $item.find( 'input.quantity' );
-
-					quantities[ $item.attr( 'data-order_item_id' ) ] = $qty.val();
+				$rows.each(function() {
+					if ( $( this ).find( 'input.quantity' ).length ) {
+						quantities[ $( this ).attr( 'data-order_item_id' ) ] = $( this ).find( 'input.quantity' ).val();
+					}
 				});
 
 				var data = {
@@ -943,17 +952,21 @@ jQuery( function ( $ ) {
 				});
 			},
 
-			do_reduce_stock: function( selected_rows, item_ids ) {
+			do_reduce_stock: function( e ) {
+				e.preventDefault();
 				wc_meta_boxes_order_items.block();
 
+				var $table = $( 'table.woocommerce_order_items' );
+				var $rows = $table.find( 'tr.selected' );
 				var quantities = {};
+				var item_ids = $.map( $rows, function( $row ) {
+					return parseInt( $( $row ).data( 'order_item_id' ), 10 );
+				});
 
-				$( selected_rows ).each(function() {
-
-					var $item = $( this ).closest( 'tr.item, tr.fee' );
-					var $qty  = $item.find( 'input.quantity' );
-
-					quantities[ $item.attr( 'data-order_item_id' ) ] = $qty.val();
+				$rows.each(function() {
+					if ( $( this ).find( 'input.quantity' ).length ) {
+						quantities[ $( this ).attr( 'data-order_item_id' ) ] = $( this ).find( 'input.quantity' ).val();
+					}
 				});
 
 				var data = {
@@ -1001,34 +1014,27 @@ jQuery( function ( $ ) {
 			},
 
 			add_item: function( add_item_ids ) {
-				add_item_ids = add_item_ids.split( ',' );
-
 				if ( add_item_ids ) {
-
-					var count = add_item_ids.length;
-
 					wc_meta_boxes_order_items.block();
 
-					$.each( add_item_ids, function( index, value ) {
+					var data = {
+						action     : 'woocommerce_add_order_item',
+						item_to_add: add_item_ids,
+						dataType   : 'json',
+						order_id   : woocommerce_admin_meta_boxes.post_id,
+						security   : woocommerce_admin_meta_boxes.order_item_nonce
+					};
 
-						var data = {
-							action:      'woocommerce_add_order_item',
-							item_to_add: value,
-							order_id:    woocommerce_admin_meta_boxes.post_id,
-							security:    woocommerce_admin_meta_boxes.order_item_nonce
-						};
-
-						$.post( woocommerce_admin_meta_boxes.ajax_url, data, function( response ) {
-							$( 'table.woocommerce_order_items tbody#order_line_items' ).append( response );
-
-							if ( !--count ) {
-								wc_meta_boxes_order.init_tiptip();
-								wc_meta_boxes_order_items.unblock();
-							}
-						});
+					$.post( woocommerce_admin_meta_boxes.ajax_url, data, function( response ) {
+						if ( response.success ) {
+							$( 'table.woocommerce_order_items tbody#order_line_items' ).append( response.data.html );
+						} else {
+							window.alert( response.data.error );
+						}
 
+						wc_meta_boxes_order.init_tiptip();
+						wc_meta_boxes_order_items.unblock();
 					});
-
 				}
 			},
 
@@ -1057,15 +1063,20 @@ jQuery( function ( $ ) {
 					};
 
 					$.ajax({
-						url:  woocommerce_admin_meta_boxes.ajax_url,
-						data: data,
-						type: 'POST',
-						success: function( response ) {
-							$( '#woocommerce-order-items' ).find( '.inside' ).empty();
-							$( '#woocommerce-order-items' ).find( '.inside' ).append( response );
-							wc_meta_boxes_order.init_tiptip();
+						url      : woocommerce_admin_meta_boxes.ajax_url,
+						data     : data,
+						dataType : 'json',
+						type     : 'POST',
+						success  : function( response ) {
+							if ( response.success ) {
+								$( '#woocommerce-order-items' ).find( '.inside' ).empty();
+								$( '#woocommerce-order-items' ).find( '.inside' ).append( response.data.html );
+								wc_meta_boxes_order.init_tiptip();
+								wc_meta_boxes_order_items.stupidtable.init();
+							} else {
+								window.alert( response.data.error );
+							}
 							wc_meta_boxes_order_items.unblock();
-							wc_meta_boxes_order_items.stupidtable.init();
 						}
 					});
 				} else {
@@ -1076,18 +1087,14 @@ jQuery( function ( $ ) {
 
 		stupidtable: {
 			init: function() {
-				$( '.woocommerce_order_items' ).stupidtable().on( 'aftertablesort', this.add_arrows );
+				$( '.woocommerce_order_items' ).stupidtable();
+				$( '.woocommerce_order_items' ).on( 'aftertablesort', this.add_arrows );
 			},
 
 			add_arrows: function( event, data ) {
 				var th    = $( this ).find( 'th' );
 				var arrow = data.direction === 'asc' ? '&uarr;' : '&darr;';
 				var index = data.column;
-
-				if ( 1 < index ) {
-					index = index - 1;
-				}
-
 				th.find( '.wc-arrow' ).remove();
 				th.eq( index ).append( '<span class="wc-arrow">' + arrow + '</span>' );
 			}
@@ -1100,7 +1107,7 @@ jQuery( function ( $ ) {
 	var wc_meta_boxes_order_notes = {
 		init: function() {
 			$( '#woocommerce-order-notes' )
-				.on( 'click', 'a.add_note', this.add_order_note )
+				.on( 'click', 'button.add_note', this.add_order_note )
 				.on( 'click', 'a.delete_note', this.delete_order_note );
 
 		},
@@ -1136,25 +1143,27 @@ jQuery( function ( $ ) {
 		},
 
 		delete_order_note: function() {
-			var note = $( this ).closest( 'li.note' );
+			if ( window.confirm( woocommerce_admin_meta_boxes.i18n_delete_note ) ) {
+				var note = $( this ).closest( 'li.note' );
 
-			$( note ).block({
-				message: null,
-				overlayCSS: {
-					background: '#fff',
-					opacity: 0.6
-				}
-			});
+				$( note ).block({
+					message: null,
+					overlayCSS: {
+						background: '#fff',
+						opacity: 0.6
+					}
+				});
 
-			var data = {
-				action:   'woocommerce_delete_order_note',
-				note_id:  $( note ).attr( 'rel' ),
-				security: woocommerce_admin_meta_boxes.delete_order_note_nonce
-			};
+				var data = {
+					action:   'woocommerce_delete_order_note',
+					note_id:  $( note ).attr( 'rel' ),
+					security: woocommerce_admin_meta_boxes.delete_order_note_nonce
+				};
 
-			$.post( woocommerce_admin_meta_boxes.ajax_url, data, function() {
-				$( note ).remove();
-			});
+				$.post( woocommerce_admin_meta_boxes.ajax_url, data, function() {
+					$( note ).remove();
+				});
+			}
 
 			return false;
 		}
@@ -1188,7 +1197,7 @@ jQuery( function ( $ ) {
 			var data = {
 				action:      'woocommerce_grant_access_to_download',
 				product_ids: products,
-				loop:        $('.order_download_permissions .wc-metabox').size(),
+				loop:        $('.order_download_permissions .wc-metabox').length,
 				order_id:    woocommerce_admin_meta_boxes.post_id,
 				security:    woocommerce_admin_meta_boxes.grant_access_nonce
 			};
@@ -1211,9 +1220,10 @@ jQuery( function ( $ ) {
 
 		revoke_access: function () {
 			if ( window.confirm( woocommerce_admin_meta_boxes.i18n_permission_revoke ) ) {
-				var el      = $( this ).parent().parent();
-				var product = $( this ).attr( 'rel' ).split( ',' )[0];
-				var file    = $( this ).attr( 'rel' ).split( ',' )[1];
+				var el            = $( this ).parent().parent();
+				var product       = $( this ).attr( 'rel' ).split( ',' )[0];
+				var file          = $( this ).attr( 'rel' ).split( ',' )[1];
+				var permission_id = $( this ).data( 'permission_id' );
 
 				if ( product > 0 ) {
 					$( el ).block({
@@ -1225,11 +1235,12 @@ jQuery( function ( $ ) {
 					});
 
 					var data = {
-						action:      'woocommerce_revoke_access_to_download',
-						product_id:  product,
-						download_id: file,
-						order_id:    woocommerce_admin_meta_boxes.post_id,
-						security:    woocommerce_admin_meta_boxes.revoke_access_nonce
+						action:        'woocommerce_revoke_access_to_download',
+						product_id:    product,
+						download_id:   file,
+						permission_id: permission_id,
+						order_id:      woocommerce_admin_meta_boxes.post_id,
+						security:      woocommerce_admin_meta_boxes.revoke_access_nonce
 					};
 
 					$.post( woocommerce_admin_meta_boxes.ajax_url, data, function() {
diff --git a/assets/js/admin/meta-boxes-order.min.js b/assets/js/admin/meta-boxes-order.min.js
index 9e5ffc6dca9..a54fdb8207f 100644
--- a/assets/js/admin/meta-boxes-order.min.js
+++ b/assets/js/admin/meta-boxes-order.min.js
@@ -1 +1 @@
-jQuery(function(a){var b={states:null,init:function(){"undefined"!=typeof woocommerce_admin_meta_boxes_order&&"undefined"!=typeof woocommerce_admin_meta_boxes_order.countries&&(this.states=a.parseJSON(woocommerce_admin_meta_boxes_order.countries.replace(/&quot;/g,'"'))),a(".js_field-country").select2().change(this.change_country),a(".js_field-country").trigger("change",[!0]),a(document.body).on("change","select.js_field-state",this.change_state),a("#woocommerce-order-actions input, #woocommerce-order-actions a").click(function(){window.onbeforeunload=""}),a("a.edit_address").click(this.edit_address),a("a.billing-same-as-shipping").on("click",this.copy_billing_to_shipping),a("a.load_customer_billing").on("click",this.load_billing),a("a.load_customer_shipping").on("click",this.load_shipping),a("#customer_user").on("change",this.change_customer_user)},change_country:function(c,d){if("undefined"==typeof d&&(d=!1),null!==b.states){var e=a(this),f=e.val(),g=e.parents("div.edit_address").find(":input.js_field-state"),h=g.parent(),i=g.attr("name"),j=g.attr("id"),k=e.data("woocommerce.stickState-"+f)?e.data("woocommerce.stickState-"+f):g.val(),l=g.attr("placeholder");if(d&&e.data("woocommerce.stickState-"+f,k),h.show().find(".select2-container").remove(),a.isEmptyObject(b.states[f]))g.replaceWith('<input type="text" class="js_field-state" name="'+i+'" id="'+j+'" value="'+k+'" placeholder="'+l+'" />');else{var m=a('<select name="'+i+'" id="'+j+'" class="js_field-state select short" placeholder="'+l+'"></select>'),n=b.states[f];m.append(a('<option value="">'+woocommerce_admin_meta_boxes_order.i18n_select_state_text+"</option>")),a.each(n,function(b){m.append(a('<option value="'+b+'">'+n[b]+"</option>"))}),m.val(k),g.replaceWith(m),m.show().select2().hide().change()}a(document.body).trigger("contry-change.woocommerce",[f,a(this).closest("div")]),a(document.body).trigger("country-change.woocommerce",[f,a(this).closest("div")])}},change_state:function(){var b=a(this),c=b.val(),d=b.parents("div.edit_address").find(":input.js_field-country"),e=d.val();d.data("woocommerce.stickState-"+e,c)},init_tiptip:function(){a("#tiptip_holder").removeAttr("style"),a("#tiptip_arrow").removeAttr("style"),a(".tips").tipTip({attribute:"data-tip",fadeIn:50,fadeOut:50,delay:200})},edit_address:function(b){b.preventDefault(),a(this).hide(),a(this).parent().find("a:not(.edit_address)").show(),a(this).closest(".order_data_column").find("div.address").hide(),a(this).closest(".order_data_column").find("div.edit_address").show()},change_customer_user:function(){a("#_billing_country").val()||(a("a.edit_address").click(),b.load_billing(!0),b.load_shipping(!0))},load_billing:function(b){if(!0===b||window.confirm(woocommerce_admin_meta_boxes.load_billing)){var c=a("#customer_user").val();if(!c)return window.alert(woocommerce_admin_meta_boxes.no_customer_selected),!1;var d={user_id:c,type_to_load:"billing",action:"woocommerce_get_customer_details",security:woocommerce_admin_meta_boxes.get_customer_details_nonce};a(this).closest("div.edit_address").block({message:null,overlayCSS:{background:"#fff",opacity:.6}}),a.ajax({url:woocommerce_admin_meta_boxes.ajax_url,data:d,type:"POST",success:function(b){b&&a.each(b,function(b,c){a(":input#_"+b).val(c).change()}),a("div.edit_address").unblock()}})}return!1},load_shipping:function(b){if(!0===b||window.confirm(woocommerce_admin_meta_boxes.load_shipping)){var c=a("#customer_user").val();if(!c)return window.alert(woocommerce_admin_meta_boxes.no_customer_selected),!1;var d={user_id:c,type_to_load:"shipping",action:"woocommerce_get_customer_details",security:woocommerce_admin_meta_boxes.get_customer_details_nonce};a(this).closest("div.edit_address").block({message:null,overlayCSS:{background:"#fff",opacity:.6}}),a.ajax({url:woocommerce_admin_meta_boxes.ajax_url,data:d,type:"POST",success:function(b){b&&a.each(b,function(b,c){a(":input#_"+b).val(c).change()}),a("div.edit_address").unblock()}})}return!1},copy_billing_to_shipping:function(){return window.confirm(woocommerce_admin_meta_boxes.copy_billing)&&a('.order_data_column :input[name^="_billing_"]').each(function(){var b=a(this).attr("name");b=b.replace("_billing_","_shipping_"),a(":input#"+b).val(a(this).val()).change()}),!1}},c={init:function(){this.stupidtable.init(),a("#woocommerce-order-items").on("click","button.add-line-item",this.add_line_item).on("click","button.refund-items",this.refund_items).on("click",".cancel-action",this.cancel).on("click","button.add-order-item",this.add_item).on("click","button.add-order-fee",this.add_fee).on("click","button.add-order-shipping",this.add_shipping).on("click","button.add-order-tax",this.add_tax).on("click","input.check-column",this.bulk_actions.check_column).on("click",".do_bulk_action",this.bulk_actions.do_bulk_action).on("click","button.calculate-action",this.calculate_totals).on("click","button.save-action",this.save_line_items).on("click","a.delete-order-tax",this.delete_tax).on("click","button.calculate-tax-action",this.calculate_tax).on("click","a.edit-order-item",this.edit_item).on("click","a.delete-order-item",this.delete_item).on("click",".delete_refund",this.refunds.delete_refund).on("click","button.do-api-refund, button.do-manual-refund",this.refunds.do_refund).on("change",".refund input.refund_line_total, .refund input.refund_line_tax",this.refunds.input_changed).on("change keyup",".wc-order-refund-items #refund_amount",this.refunds.amount_changed).on("change","input.refund_order_item_qty",this.refunds.refund_quantity_changed).on("change","input.quantity",this.quantity_changed).on("keyup",".woocommerce_order_items .split-input input:eq(0)",function(){var b=a(this).next();(""===b.val()||b.is(".match-total"))&&b.val(a(this).val()).addClass("match-total")}).on("keyup",".woocommerce_order_items .split-input input:eq(1)",function(){a(this).removeClass("match-total")}).on("click","button.add_order_item_meta",this.item_meta.add).on("click","button.remove_order_item_meta",this.item_meta.remove),a(document.body).on("wc_backbone_modal_loaded",this.backbone.init).on("wc_backbone_modal_response",this.backbone.response)},block:function(){a("#woocommerce-order-items").block({message:null,overlayCSS:{background:"#fff",opacity:.6}})},unblock:function(){a("#woocommerce-order-items").unblock()},reload_items:function(){var d={order_id:woocommerce_admin_meta_boxes.post_id,action:"woocommerce_load_order_items",security:woocommerce_admin_meta_boxes.order_item_nonce};c.block(),a.ajax({url:woocommerce_admin_meta_boxes.ajax_url,data:d,type:"POST",success:function(d){a("#woocommerce-order-items").find(".inside").empty(),a("#woocommerce-order-items").find(".inside").append(d),b.init_tiptip(),c.unblock(),c.stupidtable.init()}})},quantity_changed:function(){var b=a(this).closest("tr.item"),c=a(this).val(),d=a(this).attr("data-qty"),e=a("input.line_total",b),f=a("input.line_subtotal",b),g=accounting.unformat(e.attr("data-total"),woocommerce_admin.mon_decimal_point)/d;e.val(parseFloat(accounting.formatNumber(g*c,woocommerce_admin_meta_boxes.rounding_precision,"")).toString().replace(".",woocommerce_admin.mon_decimal_point));var h=accounting.unformat(f.attr("data-subtotal"),woocommerce_admin.mon_decimal_point)/d;f.val(parseFloat(accounting.formatNumber(h*c,woocommerce_admin_meta_boxes.rounding_precision,"")).toString().replace(".",woocommerce_admin.mon_decimal_point)),a("td.line_tax",b).each(function(){var b=a("input.line_tax",a(this)),e=accounting.unformat(b.attr("data-total_tax"),woocommerce_admin.mon_decimal_point)/d;e>0&&b.val(parseFloat(accounting.formatNumber(e*c,woocommerce_admin_meta_boxes.rounding_precision,"")).toString().replace(".",woocommerce_admin.mon_decimal_point));var f=a("input.line_subtotal_tax",a(this)),g=accounting.unformat(f.attr("data-subtotal_tax"),woocommerce_admin.mon_decimal_point)/d;g>0&&f.val(parseFloat(accounting.formatNumber(g*c,woocommerce_admin_meta_boxes.rounding_precision,"")).toString().replace(".",woocommerce_admin.mon_decimal_point))}),a(this).trigger("quantity_changed")},add_line_item:function(){return a("div.wc-order-add-item").slideDown(),a("div.wc-order-bulk-actions").slideUp(),!1},refund_items:function(){return a("div.wc-order-refund-items").slideDown(),a("div.wc-order-bulk-actions").slideUp(),a("div.wc-order-totals-items").slideUp(),a("#woocommerce-order-items").find("div.refund").show(),a(".wc-order-edit-line-item .wc-order-edit-line-item-actions").hide(),!1},cancel:function(){return a(this).closest("div.wc-order-data-row").slideUp(),a("div.wc-order-bulk-actions").slideDown(),a("div.wc-order-totals-items").slideDown(),a("#woocommerce-order-items").find("div.refund").hide(),a(".wc-order-edit-line-item .wc-order-edit-line-item-actions").show(),"true"===a(this).attr("data-reload")&&c.reload_items(),!1},add_item:function(){return a(this).WCBackboneModal({template:"wc-modal-add-products"}),!1},add_fee:function(){c.block();var b={action:"woocommerce_add_order_fee",order_id:woocommerce_admin_meta_boxes.post_id,security:woocommerce_admin_meta_boxes.order_item_nonce};return a.post(woocommerce_admin_meta_boxes.ajax_url,b,function(b){a("table.woocommerce_order_items tbody#order_fee_line_items").append(b),c.unblock()}),!1},add_shipping:function(){c.block();var b={action:"woocommerce_add_order_shipping",order_id:woocommerce_admin_meta_boxes.post_id,security:woocommerce_admin_meta_boxes.order_item_nonce};return a.post(woocommerce_admin_meta_boxes.ajax_url,b,function(b){a("table.woocommerce_order_items tbody#order_shipping_line_items").append(b),c.unblock()}),!1},add_tax:function(){return a(this).WCBackboneModal({template:"wc-modal-add-tax"}),!1},edit_item:function(){return a(this).closest("tr").find(".view").hide(),a(this).closest("tr").find(".edit").show(),a(this).hide(),a("button.add-line-item").click(),a("button.cancel-action").attr("data-reload",!0),!1},delete_item:function(){var b=window.confirm(woocommerce_admin_meta_boxes.remove_item_notice);if(b){var d=a(this).closest("tr.item, tr.fee, tr.shipping"),e=d.attr("data-order_item_id");c.block();var f={order_item_ids:e,action:"woocommerce_remove_order_item",security:woocommerce_admin_meta_boxes.order_item_nonce};a.ajax({url:woocommerce_admin_meta_boxes.ajax_url,data:f,type:"POST",success:function(){d.remove(),c.unblock()}})}return!1},delete_tax:function(){if(window.confirm(woocommerce_admin_meta_boxes.i18n_delete_tax)){c.block();var d={action:"woocommerce_remove_order_tax",rate_id:a(this).attr("data-rate_id"),order_id:woocommerce_admin_meta_boxes.post_id,security:woocommerce_admin_meta_boxes.order_item_nonce};a.ajax({url:woocommerce_admin_meta_boxes.ajax_url,data:d,type:"POST",success:function(d){a("#woocommerce-order-items").find(".inside").empty(),a("#woocommerce-order-items").find(".inside").append(d),b.init_tiptip(),c.unblock(),c.stupidtable.init()}})}return!1},calculate_tax:function(){if(window.confirm(woocommerce_admin_meta_boxes.calc_line_taxes)){c.block();var d="",e="",f="",g="";"shipping"===woocommerce_admin_meta_boxes.tax_based_on&&(d=a("#_shipping_country").val(),e=a("#_shipping_state").val(),f=a("#_shipping_postcode").val(),g=a("#_shipping_city").val()),"billing"!==woocommerce_admin_meta_boxes.tax_based_on&&d||(d=a("#_billing_country").val(),e=a("#_billing_state").val(),f=a("#_billing_postcode").val(),g=a("#_billing_city").val());var h={action:"woocommerce_calc_line_taxes",order_id:woocommerce_admin_meta_boxes.post_id,items:a("table.woocommerce_order_items :input[name], .wc-order-totals-items :input[name]").serialize(),country:d,state:e,postcode:f,city:g,security:woocommerce_admin_meta_boxes.calc_totals_nonce};a.ajax({url:woocommerce_admin_meta_boxes.ajax_url,data:h,type:"POST",success:function(d){a("#woocommerce-order-items").find(".inside").empty(),a("#woocommerce-order-items").find(".inside").append(d),b.init_tiptip(),c.unblock(),c.stupidtable.init()}})}return!1},calculate_totals:function(){if(window.confirm(woocommerce_admin_meta_boxes.calc_totals)){c.block();var b=0,d=0,e=0;a(".woocommerce_order_items tr.shipping input.line_total").each(function(){var b=a(this).val()||"0";b=accounting.unformat(b,woocommerce_admin.mon_decimal_point),e+=parseFloat(b)}),a(".woocommerce_order_items input.line_tax").each(function(){var b=a(this).val()||"0";b=accounting.unformat(b,woocommerce_admin.mon_decimal_point),d+=parseFloat(b)}),a(".woocommerce_order_items tr.item, .woocommerce_order_items tr.fee").each(function(){var c=a(this).find("input.line_total").val()||"0";b+=accounting.unformat(c.replace(",","."))}),"yes"===woocommerce_admin_meta_boxes.round_at_subtotal&&(d=parseFloat(accounting.toFixed(d,woocommerce_admin_meta_boxes.rounding_precision))),a("#_order_total").val(accounting.formatNumber(b+d+e,woocommerce_admin_meta_boxes.currency_format_num_decimals,"",woocommerce_admin.mon_decimal_point)).change(),a("button.save-action").click()}return!1},save_line_items:function(){var d={order_id:woocommerce_admin_meta_boxes.post_id,items:a("table.woocommerce_order_items :input[name], .wc-order-totals-items :input[name]").serialize(),action:"woocommerce_save_order_items",security:woocommerce_admin_meta_boxes.order_item_nonce};return c.block(),a.ajax({url:woocommerce_admin_meta_boxes.ajax_url,data:d,type:"POST",success:function(d){a("#woocommerce-order-items").find(".inside").empty(),a("#woocommerce-order-items").find(".inside").append(d),b.init_tiptip(),c.unblock(),c.stupidtable.init()}}),a(this).trigger("items_saved"),!1},refunds:{do_refund:function(){if(c.block(),window.confirm(woocommerce_admin_meta_boxes.i18n_do_refund)){var b=a("input#refund_amount").val(),d=a("input#refund_reason").val(),e={},f={},g={};a(".refund input.refund_order_item_qty").each(function(b,c){a(c).closest("tr").data("order_item_id")&&c.value&&(e[a(c).closest("tr").data("order_item_id")]=c.value)}),a(".refund input.refund_line_total").each(function(b,c){a(c).closest("tr").data("order_item_id")&&(f[a(c).closest("tr").data("order_item_id")]=accounting.unformat(c.value,woocommerce_admin.mon_decimal_point))}),a(".refund input.refund_line_tax").each(function(b,c){if(a(c).closest("tr").data("order_item_id")){var d=a(c).data("tax_id");g[a(c).closest("tr").data("order_item_id")]||(g[a(c).closest("tr").data("order_item_id")]={}),g[a(c).closest("tr").data("order_item_id")][d]=accounting.unformat(c.value,woocommerce_admin.mon_decimal_point)}});var h={action:"woocommerce_refund_line_items",order_id:woocommerce_admin_meta_boxes.post_id,refund_amount:b,refund_reason:d,line_item_qtys:JSON.stringify(e,null,""),line_item_totals:JSON.stringify(f,null,""),line_item_tax_totals:JSON.stringify(g,null,""),api_refund:a(this).is(".do-api-refund"),restock_refunded_items:a("#restock_refunded_items:checked").size()?"true":"false",security:woocommerce_admin_meta_boxes.order_item_nonce};a.post(woocommerce_admin_meta_boxes.ajax_url,h,function(a){!0===a.success?(c.reload_items(),"fully_refunded"===a.data.status&&(window.location.href=window.location.href)):(window.alert(a.data.error),c.unblock())})}else c.unblock()},delete_refund:function(){if(window.confirm(woocommerce_admin_meta_boxes.i18n_delete_refund)){var b=a(this).closest("tr.refund"),d=b.attr("data-order_refund_id");c.block();var e={action:"woocommerce_delete_refund",refund_id:d,security:woocommerce_admin_meta_boxes.order_item_nonce};a.ajax({url:woocommerce_admin_meta_boxes.ajax_url,data:e,type:"POST",success:function(){c.reload_items()}})}return!1},input_changed:function(){var b=0,c=a(".woocommerce_order_items").find("tr.item, tr.fee, tr.shipping");c.each(function(){var c=a(this),d=c.find(".refund input:not(.refund_order_item_qty)");d.each(function(c,d){b+=parseFloat(accounting.unformat(a(d).val()||0,woocommerce_admin.mon_decimal_point))})}),a("#refund_amount").val(accounting.formatNumber(b,woocommerce_admin_meta_boxes.currency_format_num_decimals,"",woocommerce_admin.mon_decimal_point)).change()},amount_changed:function(){var b=accounting.unformat(a(this).val(),woocommerce_admin.mon_decimal_point);a("button .wc-order-refund-amount .amount").text(accounting.formatMoney(b,{symbol:woocommerce_admin_meta_boxes.currency_format_symbol,decimal:woocommerce_admin_meta_boxes.currency_format_decimal_sep,thousand:woocommerce_admin_meta_boxes.currency_format_thousand_sep,precision:woocommerce_admin_meta_boxes.currency_format_num_decimals,format:woocommerce_admin_meta_boxes.currency_format}))},refund_quantity_changed:function(){var b=a(this).closest("tr.item"),c=b.find("input.quantity").val(),d=a(this).val(),e=a("input.line_total",b),f=a("input.refund_line_total",b),g=accounting.unformat(e.attr("data-total"),woocommerce_admin.mon_decimal_point)/c;f.val(parseFloat(accounting.formatNumber(g*d,woocommerce_admin_meta_boxes.rounding_precision,"")).toString().replace(".",woocommerce_admin.mon_decimal_point)).change(),a("td.line_tax",b).each(function(){var b=a("input.line_tax",a(this)),e=a("input.refund_line_tax",a(this)),f=accounting.unformat(b.attr("data-total_tax"),woocommerce_admin.mon_decimal_point)/c;f>0?e.val(parseFloat(accounting.formatNumber(f*d,woocommerce_admin_meta_boxes.rounding_precision,"")).toString().replace(".",woocommerce_admin.mon_decimal_point)).change():e.val(0).change()}),d>0?a("#restock_refunded_items").closest("tr").show():(a("#restock_refunded_items").closest("tr").hide(),a(".woocommerce_order_items input.refund_order_item_qty").each(function(){a(this).val()>0&&a("#restock_refunded_items").closest("tr").show()})),a(this).trigger("refund_quantity_changed")}},item_meta:{add:function(){var b=a(this),d=b.closest("tr.item"),e={order_item_id:d.attr("data-order_item_id"),action:"woocommerce_add_order_item_meta",security:woocommerce_admin_meta_boxes.order_item_nonce};return c.block(),a.ajax({url:woocommerce_admin_meta_boxes.ajax_url,data:e,type:"POST",success:function(a){d.find("tbody.meta_items").append(a),c.unblock()}}),!1},remove:function(){if(window.confirm(woocommerce_admin_meta_boxes.remove_item_meta)){var b=a(this).closest("tr"),d={meta_id:b.attr("data-meta_id"),action:"woocommerce_remove_order_item_meta",security:woocommerce_admin_meta_boxes.order_item_nonce};c.block(),a.ajax({url:woocommerce_admin_meta_boxes.ajax_url,data:d,type:"POST",success:function(){b.hide(),c.unblock()}})}return!1}},bulk_actions:{check_column:function(){a(this).is(":checked")?a("#woocommerce-order-items").find(".check-column input").attr("checked","checked"):a("#woocommerce-order-items").find(".check-column input").removeAttr("checked")},do_bulk_action:function(){var b=a(this).closest(".bulk-actions").find("select").val(),d=a("#woocommerce-order-items").find(".check-column input:checked"),e=[];return a(d).each(function(){var b=a(this).closest("tr");b.attr("data-order_item_id")&&e.push(b.attr("data-order_item_id"))}),0===e.length?void window.alert(woocommerce_admin_meta_boxes.i18n_select_items):(c.bulk_actions["do_"+b]&&c.bulk_actions["do_"+b](d,e),!1)},do_delete:function(b,d){if(window.confirm(woocommerce_admin_meta_boxes.remove_item_notice)){c.block();var e={order_item_ids:d,action:"woocommerce_remove_order_item",security:woocommerce_admin_meta_boxes.order_item_nonce};a.ajax({url:woocommerce_admin_meta_boxes.ajax_url,data:e,type:"POST",success:function(){a(b).each(function(){a(this).closest("tr").remove()}),c.unblock()}})}},do_increase_stock:function(b,d){c.block();var e={};a(b).each(function(){var b=a(this).closest("tr.item, tr.fee"),c=b.find("input.quantity");e[b.attr("data-order_item_id")]=c.val()});var f={order_id:woocommerce_admin_meta_boxes.post_id,order_item_ids:d,order_item_qty:e,action:"woocommerce_increase_order_item_stock",security:woocommerce_admin_meta_boxes.order_item_nonce};a.ajax({url:woocommerce_admin_meta_boxes.ajax_url,data:f,type:"POST",success:function(a){window.alert(a),c.unblock()}})},do_reduce_stock:function(b,d){c.block();var e={};a(b).each(function(){var b=a(this).closest("tr.item, tr.fee"),c=b.find("input.quantity");e[b.attr("data-order_item_id")]=c.val()});var f={order_id:woocommerce_admin_meta_boxes.post_id,order_item_ids:d,order_item_qty:e,action:"woocommerce_reduce_order_item_stock",security:woocommerce_admin_meta_boxes.order_item_nonce};a.ajax({url:woocommerce_admin_meta_boxes.ajax_url,data:f,type:"POST",success:function(a){window.alert(a),c.unblock()}})}},backbone:{init:function(b,c){"wc-modal-add-products"===c&&a(document.body).trigger("wc-enhanced-select-init")},response:function(a,b,d){if("wc-modal-add-tax"===b){var e=d.add_order_tax,f="";d.manual_tax_rate_id&&(f=d.manual_tax_rate_id),c.backbone.add_tax(e,f)}"wc-modal-add-products"===b&&c.backbone.add_item(d.add_order_items)},add_item:function(d){if(d=d.split(",")){var e=d.length;c.block(),a.each(d,function(d,f){var g={action:"woocommerce_add_order_item",item_to_add:f,order_id:woocommerce_admin_meta_boxes.post_id,security:woocommerce_admin_meta_boxes.order_item_nonce};a.post(woocommerce_admin_meta_boxes.ajax_url,g,function(d){a("table.woocommerce_order_items tbody#order_line_items").append(d),--e||(b.init_tiptip(),c.unblock())})})}},add_tax:function(d,e){if(e&&(d=e),!d)return!1;var f=a(".order-tax-id").map(function(){return a(this).val()}).get();if(-1===a.inArray(d,f)){c.block();var g={action:"woocommerce_add_order_tax",rate_id:d,order_id:woocommerce_admin_meta_boxes.post_id,security:woocommerce_admin_meta_boxes.order_item_nonce};a.ajax({url:woocommerce_admin_meta_boxes.ajax_url,data:g,type:"POST",success:function(d){a("#woocommerce-order-items").find(".inside").empty(),a("#woocommerce-order-items").find(".inside").append(d),b.init_tiptip(),c.unblock(),c.stupidtable.init()}})}else window.alert(woocommerce_admin_meta_boxes.i18n_tax_rate_already_exists)}},stupidtable:{init:function(){a(".woocommerce_order_items").stupidtable().on("aftertablesort",this.add_arrows)},add_arrows:function(b,c){var d=a(this).find("th"),e="asc"===c.direction?"&uarr;":"&darr;",f=c.column;f>1&&(f-=1),d.find(".wc-arrow").remove(),d.eq(f).append('<span class="wc-arrow">'+e+"</span>")}}},d={init:function(){a("#woocommerce-order-notes").on("click","a.add_note",this.add_order_note).on("click","a.delete_note",this.delete_order_note)},add_order_note:function(){if(a("textarea#add_order_note").val()){a("#woocommerce-order-notes").block({message:null,overlayCSS:{background:"#fff",opacity:.6}});var b={action:"woocommerce_add_order_note",post_id:woocommerce_admin_meta_boxes.post_id,note:a("textarea#add_order_note").val(),note_type:a("select#order_note_type").val(),security:woocommerce_admin_meta_boxes.add_order_note_nonce};return a.post(woocommerce_admin_meta_boxes.ajax_url,b,function(b){a("ul.order_notes").prepend(b),a("#woocommerce-order-notes").unblock(),a("#add_order_note").val("")}),!1}},delete_order_note:function(){var b=a(this).closest("li.note");a(b).block({message:null,overlayCSS:{background:"#fff",opacity:.6}});var c={action:"woocommerce_delete_order_note",note_id:a(b).attr("rel"),security:woocommerce_admin_meta_boxes.delete_order_note_nonce};return a.post(woocommerce_admin_meta_boxes.ajax_url,c,function(){a(b).remove()}),!1}},e={init:function(){a(".order_download_permissions").on("click","button.grant_access",this.grant_access).on("click","button.revoke_access",this.revoke_access)},grant_access:function(){var b=a("#grant_access_id").val();if(b){a(".order_download_permissions").block({message:null,overlayCSS:{background:"#fff",opacity:.6}});var c={action:"woocommerce_grant_access_to_download",product_ids:b,loop:a(".order_download_permissions .wc-metabox").size(),order_id:woocommerce_admin_meta_boxes.post_id,security:woocommerce_admin_meta_boxes.grant_access_nonce};return a.post(woocommerce_admin_meta_boxes.ajax_url,c,function(b){b?a(".order_download_permissions .wc-metaboxes").append(b):window.alert(woocommerce_admin_meta_boxes.i18n_download_permission_fail),a(document.body).trigger("wc-init-datepickers"),a("#grant_access_id").val("").change(),a(".order_download_permissions").unblock()}),!1}},revoke_access:function(){if(window.confirm(woocommerce_admin_meta_boxes.i18n_permission_revoke)){var b=a(this).parent().parent(),c=a(this).attr("rel").split(",")[0],d=a(this).attr("rel").split(",")[1];if(c>0){a(b).block({message:null,overlayCSS:{background:"#fff",opacity:.6}});var e={action:"woocommerce_revoke_access_to_download",product_id:c,download_id:d,order_id:woocommerce_admin_meta_boxes.post_id,security:woocommerce_admin_meta_boxes.revoke_access_nonce};a.post(woocommerce_admin_meta_boxes.ajax_url,e,function(){a(b).fadeOut("300",function(){a(b).remove()})})}else a(b).fadeOut("300",function(){a(b).remove()})}return!1}};b.init(),c.init(),d.init(),e.init()});
\ No newline at end of file
+jQuery(function(a){var b={states:null,init:function(){"undefined"!=typeof woocommerce_admin_meta_boxes_order&&"undefined"!=typeof woocommerce_admin_meta_boxes_order.countries&&(this.states=a.parseJSON(woocommerce_admin_meta_boxes_order.countries.replace(/&quot;/g,'"'))),a(".js_field-country").select2().change(this.change_country),a(".js_field-country").trigger("change",[!0]),a(document.body).on("change","select.js_field-state",this.change_state),a("#woocommerce-order-actions input, #woocommerce-order-actions a").click(function(){window.onbeforeunload=""}),a("a.edit_address").click(this.edit_address),a("a.billing-same-as-shipping").on("click",this.copy_billing_to_shipping),a("a.load_customer_billing").on("click",this.load_billing),a("a.load_customer_shipping").on("click",this.load_shipping),a("#customer_user").on("change",this.change_customer_user)},change_country:function(c,d){if("undefined"==typeof d&&(d=!1),null!==b.states){var e=a(this),f=e.val(),g=e.parents("div.edit_address").find(":input.js_field-state"),h=g.parent(),i=g.attr("name"),j=g.attr("id"),k=e.data("woocommerce.stickState-"+f)?e.data("woocommerce.stickState-"+f):g.val(),l=g.attr("placeholder");if(d&&e.data("woocommerce.stickState-"+f,k),h.show().find(".select2-container").remove(),a.isEmptyObject(b.states[f]))g.replaceWith('<input type="text" class="js_field-state" name="'+i+'" id="'+j+'" value="'+k+'" placeholder="'+l+'" />');else{var m=a('<select name="'+i+'" id="'+j+'" class="js_field-state select short" placeholder="'+l+'"></select>'),n=b.states[f];m.append(a('<option value="">'+woocommerce_admin_meta_boxes_order.i18n_select_state_text+"</option>")),a.each(n,function(b){m.append(a('<option value="'+b+'">'+n[b]+"</option>"))}),m.val(k),g.replaceWith(m),m.show().select2().hide().change()}a(document.body).trigger("contry-change.woocommerce",[f,a(this).closest("div")]),a(document.body).trigger("country-change.woocommerce",[f,a(this).closest("div")])}},change_state:function(){var b=a(this),c=b.val(),d=b.parents("div.edit_address").find(":input.js_field-country"),e=d.val();d.data("woocommerce.stickState-"+e,c)},init_tiptip:function(){a("#tiptip_holder").removeAttr("style"),a("#tiptip_arrow").removeAttr("style"),a(".tips").tipTip({attribute:"data-tip",fadeIn:50,fadeOut:50,delay:200})},edit_address:function(b){b.preventDefault();var c=a(this),d=c.closest(".order_data_column"),e=d.find("div.edit_address"),f=d.find("div.address"),g=e.find(".js_field-country"),h=e.find(".js_field-state");f.hide(),c.parent().find("a").toggle(),g.val()||g.val(woocommerce_admin_meta_boxes_order.default_country).change(),h.val()||h.val(woocommerce_admin_meta_boxes_order.default_state).change(),e.show()},change_customer_user:function(){a("#_billing_country").val()||(a("a.edit_address").click(),b.load_billing(!0),b.load_shipping(!0))},load_billing:function(b){if(!0===b||window.confirm(woocommerce_admin_meta_boxes.load_billing)){var c=a("#customer_user").val();if(!c)return window.alert(woocommerce_admin_meta_boxes.no_customer_selected),!1;var d={user_id:c,action:"woocommerce_get_customer_details",security:woocommerce_admin_meta_boxes.get_customer_details_nonce};a(this).closest("div.edit_address").block({message:null,overlayCSS:{background:"#fff",opacity:.6}}),a.ajax({url:woocommerce_admin_meta_boxes.ajax_url,data:d,type:"POST",success:function(b){b&&b.billing&&a.each(b.billing,function(b,c){a(":input#_billing_"+b).val(c).change()}),a("div.edit_address").unblock()}})}return!1},load_shipping:function(b){if(!0===b||window.confirm(woocommerce_admin_meta_boxes.load_shipping)){var c=a("#customer_user").val();if(!c)return window.alert(woocommerce_admin_meta_boxes.no_customer_selected),!1;var d={user_id:c,action:"woocommerce_get_customer_details",security:woocommerce_admin_meta_boxes.get_customer_details_nonce};a(this).closest("div.edit_address").block({message:null,overlayCSS:{background:"#fff",opacity:.6}}),a.ajax({url:woocommerce_admin_meta_boxes.ajax_url,data:d,type:"POST",success:function(b){b&&b.billing&&a.each(b.shipping,function(b,c){a(":input#_shipping_"+b).val(c).change()}),a("div.edit_address").unblock()}})}return!1},copy_billing_to_shipping:function(){return window.confirm(woocommerce_admin_meta_boxes.copy_billing)&&a('.order_data_column :input[name^="_billing_"]').each(function(){var b=a(this).attr("name");b=b.replace("_billing_","_shipping_"),a(":input#"+b).val(a(this).val()).change()}),!1}},c={init:function(){this.stupidtable.init(),a("#woocommerce-order-items").on("click","button.add-line-item",this.add_line_item).on("click","button.refund-items",this.refund_items).on("click",".cancel-action",this.cancel).on("click","button.add-order-item",this.add_item).on("click","button.add-order-fee",this.add_fee).on("click","button.add-order-shipping",this.add_shipping).on("click","button.add-order-tax",this.add_tax).on("click","button.save-action",this.save_line_items).on("click","a.delete-order-tax",this.delete_tax).on("click","button.calculate-action",this.recalculate).on("click","a.edit-order-item",this.edit_item).on("click","a.delete-order-item",this.delete_item).on("click","tr.item, tr.fee, tr.shipping, tr.refund",this.select_row).on("click","tr.item :input, tr.fee :input, tr.shipping :input, tr.refund :input, tr.item a, tr.fee a, tr.shipping a, tr.refund a",this.select_row_child).on("click","button.bulk-delete-items",this.bulk_actions.do_delete).on("click","button.bulk-increase-stock",this.bulk_actions.do_increase_stock).on("click","button.bulk-decrease-stock",this.bulk_actions.do_reduce_stock).on("click",".delete_refund",this.refunds.delete_refund).on("click","button.do-api-refund, button.do-manual-refund",this.refunds.do_refund).on("change",".refund input.refund_line_total, .refund input.refund_line_tax",this.refunds.input_changed).on("change keyup",".wc-order-refund-items #refund_amount",this.refunds.amount_changed).on("change","input.refund_order_item_qty",this.refunds.refund_quantity_changed).on("change","input.quantity",this.quantity_changed).on("keyup change",".split-input :input",function(){var b=a(this).parent().prev().find(":input");b&&(""===b.val()||b.is(".match-total"))&&b.val(a(this).val()).addClass("match-total")}).on("keyup",".split-input :input",function(){a(this).removeClass("match-total")}).on("click","button.add_order_item_meta",this.item_meta.add).on("click","button.remove_order_item_meta",this.item_meta.remove),a(document.body).on("wc_backbone_modal_loaded",this.backbone.init).on("wc_backbone_modal_response",this.backbone.response)},block:function(){a("#woocommerce-order-items").block({message:null,overlayCSS:{background:"#fff",opacity:.6}})},unblock:function(){a("#woocommerce-order-items").unblock()},reload_items:function(){var d={order_id:woocommerce_admin_meta_boxes.post_id,action:"woocommerce_load_order_items",security:woocommerce_admin_meta_boxes.order_item_nonce};c.block(),a.ajax({url:woocommerce_admin_meta_boxes.ajax_url,data:d,type:"POST",success:function(d){a("#woocommerce-order-items").find(".inside").empty(),a("#woocommerce-order-items").find(".inside").append(d),b.init_tiptip(),c.unblock(),c.stupidtable.init()}})},quantity_changed:function(){var b=a(this).closest("tr.item"),c=a(this).val(),d=a(this).attr("data-qty"),e=a("input.line_total",b),f=a("input.line_subtotal",b),g=accounting.unformat(e.attr("data-total"),woocommerce_admin.mon_decimal_point)/d;e.val(parseFloat(accounting.formatNumber(g*c,woocommerce_admin_meta_boxes.rounding_precision,"")).toString().replace(".",woocommerce_admin.mon_decimal_point));var h=accounting.unformat(f.attr("data-subtotal"),woocommerce_admin.mon_decimal_point)/d;f.val(parseFloat(accounting.formatNumber(h*c,woocommerce_admin_meta_boxes.rounding_precision,"")).toString().replace(".",woocommerce_admin.mon_decimal_point)),a("input.line_tax",b).each(function(){var e=a(this),f=e.data("tax_id"),g=accounting.unformat(e.attr("data-total_tax"),woocommerce_admin.mon_decimal_point)/d,h=a('input.line_subtotal_tax[data-tax_id="'+f+'"]',b),i=accounting.unformat(h.attr("data-subtotal_tax"),woocommerce_admin.mon_decimal_point)/d;0<g&&e.val(parseFloat(accounting.formatNumber(g*c,woocommerce_admin_meta_boxes.rounding_precision,"")).toString().replace(".",woocommerce_admin.mon_decimal_point)),0<i&&h.val(parseFloat(accounting.formatNumber(i*c,woocommerce_admin_meta_boxes.rounding_precision,"")).toString().replace(".",woocommerce_admin.mon_decimal_point))}),a(this).trigger("quantity_changed")},add_line_item:function(){return a("div.wc-order-add-item").slideDown(),a("div.wc-order-data-row-toggle").not("div.wc-order-add-item").slideUp(),!1},refund_items:function(){return a("div.wc-order-refund-items").slideDown(),a("div.wc-order-data-row-toggle").not("div.wc-order-refund-items").slideUp(),a("div.wc-order-totals-items").slideUp(),a("#woocommerce-order-items").find("div.refund").show(),a(".wc-order-edit-line-item .wc-order-edit-line-item-actions").hide(),!1},cancel:function(){return a("div.wc-order-data-row-toggle").not("div.wc-order-bulk-actions").slideUp(),a("div.wc-order-bulk-actions").slideDown(),a("div.wc-order-totals-items").slideDown(),a("#woocommerce-order-items").find("div.refund").hide(),a(".wc-order-edit-line-item .wc-order-edit-line-item-actions").show(),"true"===a(this).attr("data-reload")&&c.reload_items(),!1},add_item:function(){return a(this).WCBackboneModal({template:"wc-modal-add-products"}),!1},add_fee:function(){c.block();var b={action:"woocommerce_add_order_fee",order_id:woocommerce_admin_meta_boxes.post_id,dataType:"json",security:woocommerce_admin_meta_boxes.order_item_nonce};return a.post(woocommerce_admin_meta_boxes.ajax_url,b,function(b){b.success?a("table.woocommerce_order_items tbody#order_fee_line_items").append(b.data.html):window.alert(b.data.error),c.unblock()}),!1},add_shipping:function(){c.block();var b={action:"woocommerce_add_order_shipping",order_id:woocommerce_admin_meta_boxes.post_id,security:woocommerce_admin_meta_boxes.order_item_nonce,dataType:"json"};return a.post(woocommerce_admin_meta_boxes.ajax_url,b,function(b){b.success?a("table.woocommerce_order_items tbody#order_shipping_line_items").append(b.data.html):window.alert(b.data.error),c.unblock()}),!1},add_tax:function(){return a(this).WCBackboneModal({template:"wc-modal-add-tax"}),!1},edit_item:function(){return a(this).closest("tr").find(".view").hide(),a(this).closest("tr").find(".edit").show(),a(this).hide(),a("button.add-line-item").click(),a("button.cancel-action").attr("data-reload",!0),!1},delete_item:function(){var b=window.confirm(woocommerce_admin_meta_boxes.remove_item_notice);if(b){var d=a(this).closest("tr.item, tr.fee, tr.shipping"),e=d.attr("data-order_item_id");c.block();var f={order_item_ids:e,action:"woocommerce_remove_order_item",security:woocommerce_admin_meta_boxes.order_item_nonce};a.ajax({url:woocommerce_admin_meta_boxes.ajax_url,data:f,type:"POST",success:function(){d.remove(),c.unblock()}})}return!1},delete_tax:function(){if(window.confirm(woocommerce_admin_meta_boxes.i18n_delete_tax)){c.block();var d={action:"woocommerce_remove_order_tax",rate_id:a(this).attr("data-rate_id"),order_id:woocommerce_admin_meta_boxes.post_id,security:woocommerce_admin_meta_boxes.order_item_nonce};a.ajax({url:woocommerce_admin_meta_boxes.ajax_url,data:d,type:"POST",success:function(d){a("#woocommerce-order-items").find(".inside").empty(),a("#woocommerce-order-items").find(".inside").append(d),b.init_tiptip(),c.unblock(),c.stupidtable.init()}})}return!1},recalculate:function(){if(window.confirm(woocommerce_admin_meta_boxes.calc_totals)){c.block();var d="",e="",f="",g="";"shipping"===woocommerce_admin_meta_boxes.tax_based_on&&(d=a("#_shipping_country").val(),e=a("#_shipping_state").val(),f=a("#_shipping_postcode").val(),g=a("#_shipping_city").val()),"billing"!==woocommerce_admin_meta_boxes.tax_based_on&&d||(d=a("#_billing_country").val(),e=a("#_billing_state").val(),f=a("#_billing_postcode").val(),g=a("#_billing_city").val());var h={action:"woocommerce_calc_line_taxes",order_id:woocommerce_admin_meta_boxes.post_id,items:a("table.woocommerce_order_items :input[name], .wc-order-totals-items :input[name]").serialize(),country:d,state:e,postcode:f,city:g,security:woocommerce_admin_meta_boxes.calc_totals_nonce};a.ajax({url:woocommerce_admin_meta_boxes.ajax_url,data:h,type:"POST",success:function(d){a("#woocommerce-order-items").find(".inside").empty(),a("#woocommerce-order-items").find(".inside").append(d),b.init_tiptip(),c.unblock(),c.stupidtable.init()}})}return!1},save_line_items:function(){var d={order_id:woocommerce_admin_meta_boxes.post_id,items:a("table.woocommerce_order_items :input[name], .wc-order-totals-items :input[name]").serialize(),action:"woocommerce_save_order_items",security:woocommerce_admin_meta_boxes.order_item_nonce};return c.block(),a.ajax({url:woocommerce_admin_meta_boxes.ajax_url,data:d,type:"POST",success:function(d){a("#woocommerce-order-items").find(".inside").empty(),a("#woocommerce-order-items").find(".inside").append(d),b.init_tiptip(),c.unblock(),c.stupidtable.init()}}),a(this).trigger("items_saved"),!1},refunds:{do_refund:function(){if(c.block(),window.confirm(woocommerce_admin_meta_boxes.i18n_do_refund)){var b=a("input#refund_amount").val(),d=a("input#refund_reason").val(),e={},f={},g={};a(".refund input.refund_order_item_qty").each(function(b,c){a(c).closest("tr").data("order_item_id")&&c.value&&(e[a(c).closest("tr").data("order_item_id")]=c.value)}),a(".refund input.refund_line_total").each(function(b,c){a(c).closest("tr").data("order_item_id")&&(f[a(c).closest("tr").data("order_item_id")]=accounting.unformat(c.value,woocommerce_admin.mon_decimal_point))}),a(".refund input.refund_line_tax").each(function(b,c){if(a(c).closest("tr").data("order_item_id")){var d=a(c).data("tax_id");g[a(c).closest("tr").data("order_item_id")]||(g[a(c).closest("tr").data("order_item_id")]={}),g[a(c).closest("tr").data("order_item_id")][d]=accounting.unformat(c.value,woocommerce_admin.mon_decimal_point)}});var h={action:"woocommerce_refund_line_items",order_id:woocommerce_admin_meta_boxes.post_id,refund_amount:b,refund_reason:d,line_item_qtys:JSON.stringify(e,null,""),line_item_totals:JSON.stringify(f,null,""),line_item_tax_totals:JSON.stringify(g,null,""),api_refund:a(this).is(".do-api-refund"),restock_refunded_items:a("#restock_refunded_items:checked").length?"true":"false",security:woocommerce_admin_meta_boxes.order_item_nonce};a.post(woocommerce_admin_meta_boxes.ajax_url,h,function(a){!0===a.success?(c.reload_items(),"fully_refunded"===a.data.status&&(window.location.href=window.location.href)):(window.alert(a.data.error),c.unblock())})}else c.unblock()},delete_refund:function(){if(window.confirm(woocommerce_admin_meta_boxes.i18n_delete_refund)){var b=a(this).closest("tr.refund"),d=b.attr("data-order_refund_id");c.block();var e={action:"woocommerce_delete_refund",refund_id:d,security:woocommerce_admin_meta_boxes.order_item_nonce};a.ajax({url:woocommerce_admin_meta_boxes.ajax_url,data:e,type:"POST",success:function(){c.reload_items()}})}return!1},input_changed:function(){var b=0,c=a(".woocommerce_order_items").find("tr.item, tr.fee, tr.shipping");c.each(function(){var c=a(this),d=c.find(".refund input:not(.refund_order_item_qty)");d.each(function(c,d){b+=parseFloat(accounting.unformat(a(d).val()||0,woocommerce_admin.mon_decimal_point))})}),a("#refund_amount").val(accounting.formatNumber(b,woocommerce_admin_meta_boxes.currency_format_num_decimals,"",woocommerce_admin.mon_decimal_point)).change()},amount_changed:function(){var b=accounting.unformat(a(this).val(),woocommerce_admin.mon_decimal_point);a("button .wc-order-refund-amount .amount").text(accounting.formatMoney(b,{symbol:woocommerce_admin_meta_boxes.currency_format_symbol,decimal:woocommerce_admin_meta_boxes.currency_format_decimal_sep,thousand:woocommerce_admin_meta_boxes.currency_format_thousand_sep,precision:woocommerce_admin_meta_boxes.currency_format_num_decimals,format:woocommerce_admin_meta_boxes.currency_format}))},refund_quantity_changed:function(){var b=a(this).closest("tr.item"),c=b.find("input.quantity").val(),d=a(this).val(),e=a("input.line_total",b),f=a("input.refund_line_total",b),g=accounting.unformat(e.attr("data-total"),woocommerce_admin.mon_decimal_point)/c;f.val(parseFloat(accounting.formatNumber(g*d,woocommerce_admin_meta_boxes.rounding_precision,"")).toString().replace(".",woocommerce_admin.mon_decimal_point)).change(),a(".refund_line_tax",b).each(function(){var e=a(this),f=e.data("tax_id"),g=a('input.line_tax[data-tax_id="'+f+'"]',b),h=accounting.unformat(g.data("total_tax"),woocommerce_admin.mon_decimal_point)/c;0<h?e.val(parseFloat(accounting.formatNumber(h*d,woocommerce_admin_meta_boxes.rounding_precision,"")).toString().replace(".",woocommerce_admin.mon_decimal_point)).change():e.val(0).change()}),d>0?a("#restock_refunded_items").closest("tr").show():(a("#restock_refunded_items").closest("tr").hide(),a(".woocommerce_order_items input.refund_order_item_qty").each(function(){a(this).val()>0&&a("#restock_refunded_items").closest("tr").show()})),a(this).trigger("refund_quantity_changed")}},item_meta:{add:function(){var b=a(this),c=b.closest("tr.item, tr.shipping"),d=c.find("tbody.meta_items"),e=d.find("tr").length+1,f='<tr data-meta_id="0"><td><input type="text" placeholder="'+woocommerce_admin_meta_boxes_order.placeholder_name+'" name="meta_key['+c.attr("data-order_item_id")+"][new-"+e+']" /><textarea placeholder="'+woocommerce_admin_meta_boxes_order.placeholder_value+'" name="meta_value['+c.attr("data-order_item_id")+"][new-"+e+']"></textarea></td><td width="1%"><button class="remove_order_item_meta button">&times;</button></td></tr>';return d.append(f),!1},remove:function(){if(window.confirm(woocommerce_admin_meta_boxes.remove_item_meta)){var b=a(this).closest("tr");b.find(":input").val(""),b.hide()}return!1}},select_row:function(){var b=!1;b=a(this).is("tr")?a(this):a(this).closest("tr");var c=a(this).closest("table");b.is(".selected")?b.removeClass("selected"):b.addClass("selected");var d=c.find("tr.selected");if(d.length){a("div.wc-order-item-bulk-edit").slideDown();var e=!1;d.each(function(){a(this).is("tr.item")&&(e=!0)}),e?a(".bulk-increase-stock, .bulk-decrease-stock").show():a(".bulk-increase-stock, .bulk-decrease-stock").hide()}else a("div.wc-order-item-bulk-edit").slideUp()},select_row_child:function(a){a.stopPropagation()},bulk_actions:{do_delete:function(b){b.preventDefault();var d=a("table.woocommerce_order_items"),e=d.find("tr.selected");if(e.length&&window.confirm(woocommerce_admin_meta_boxes.remove_item_notice)){c.block();var f=[],g=[],h=[];a.map(e,function(b){var c=a(b);c.is(".refund")?g.push(parseInt(a(c).data("order_refund_id"),10)):f.push(parseInt(a(c).data("order_item_id"),10))}),f.length&&h.push(a.ajax({url:woocommerce_admin_meta_boxes.ajax_url,data:{order_item_ids:f,action:"woocommerce_remove_order_item",security:woocommerce_admin_meta_boxes.order_item_nonce},type:"POST"})),g.length&&h.push(a.ajax({url:woocommerce_admin_meta_boxes.ajax_url,data:{action:"woocommerce_delete_refund",refund_id:g,security:woocommerce_admin_meta_boxes.order_item_nonce},type:"POST"})),h?a.when.apply(a,h).done(function(){c.reload_items(),c.unblock()}):c.unblock()}},do_increase_stock:function(b){b.preventDefault(),c.block();var d=a("table.woocommerce_order_items"),e=d.find("tr.selected"),f={},g=a.map(e,function(b){return parseInt(a(b).data("order_item_id"),10)});e.each(function(){a(this).find("input.quantity").length&&(f[a(this).attr("data-order_item_id")]=a(this).find("input.quantity").val())});var h={order_id:woocommerce_admin_meta_boxes.post_id,order_item_ids:g,order_item_qty:f,action:"woocommerce_increase_order_item_stock",security:woocommerce_admin_meta_boxes.order_item_nonce};a.ajax({url:woocommerce_admin_meta_boxes.ajax_url,data:h,type:"POST",success:function(a){window.alert(a),c.unblock()}})},do_reduce_stock:function(b){b.preventDefault(),c.block();var d=a("table.woocommerce_order_items"),e=d.find("tr.selected"),f={},g=a.map(e,function(b){return parseInt(a(b).data("order_item_id"),10)});e.each(function(){a(this).find("input.quantity").length&&(f[a(this).attr("data-order_item_id")]=a(this).find("input.quantity").val())});var h={order_id:woocommerce_admin_meta_boxes.post_id,order_item_ids:g,order_item_qty:f,action:"woocommerce_reduce_order_item_stock",security:woocommerce_admin_meta_boxes.order_item_nonce};a.ajax({url:woocommerce_admin_meta_boxes.ajax_url,data:h,type:"POST",success:function(a){window.alert(a),c.unblock()}})}},backbone:{init:function(b,c){"wc-modal-add-products"===c&&a(document.body).trigger("wc-enhanced-select-init")},response:function(a,b,d){if("wc-modal-add-tax"===b){var e=d.add_order_tax,f="";d.manual_tax_rate_id&&(f=d.manual_tax_rate_id),c.backbone.add_tax(e,f)}"wc-modal-add-products"===b&&c.backbone.add_item(d.add_order_items)},add_item:function(d){if(d){c.block();var e={action:"woocommerce_add_order_item",item_to_add:d,dataType:"json",order_id:woocommerce_admin_meta_boxes.post_id,security:woocommerce_admin_meta_boxes.order_item_nonce};a.post(woocommerce_admin_meta_boxes.ajax_url,e,function(d){d.success?a("table.woocommerce_order_items tbody#order_line_items").append(d.data.html):window.alert(d.data.error),b.init_tiptip(),c.unblock()})}},add_tax:function(d,e){if(e&&(d=e),!d)return!1;var f=a(".order-tax-id").map(function(){return a(this).val()}).get();if(-1===a.inArray(d,f)){c.block();var g={action:"woocommerce_add_order_tax",rate_id:d,order_id:woocommerce_admin_meta_boxes.post_id,security:woocommerce_admin_meta_boxes.order_item_nonce};a.ajax({url:woocommerce_admin_meta_boxes.ajax_url,data:g,dataType:"json",type:"POST",success:function(d){d.success?(a("#woocommerce-order-items").find(".inside").empty(),a("#woocommerce-order-items").find(".inside").append(d.data.html),b.init_tiptip(),c.stupidtable.init()):window.alert(d.data.error),c.unblock()}})}else window.alert(woocommerce_admin_meta_boxes.i18n_tax_rate_already_exists)}},stupidtable:{init:function(){a(".woocommerce_order_items").stupidtable(),a(".woocommerce_order_items").on("aftertablesort",this.add_arrows)},add_arrows:function(b,c){var d=a(this).find("th"),e="asc"===c.direction?"&uarr;":"&darr;",f=c.column;d.find(".wc-arrow").remove(),d.eq(f).append('<span class="wc-arrow">'+e+"</span>")}}},d={init:function(){a("#woocommerce-order-notes").on("click","button.add_note",this.add_order_note).on("click","a.delete_note",this.delete_order_note)},add_order_note:function(){if(a("textarea#add_order_note").val()){a("#woocommerce-order-notes").block({message:null,overlayCSS:{background:"#fff",opacity:.6}});var b={action:"woocommerce_add_order_note",post_id:woocommerce_admin_meta_boxes.post_id,note:a("textarea#add_order_note").val(),note_type:a("select#order_note_type").val(),security:woocommerce_admin_meta_boxes.add_order_note_nonce};return a.post(woocommerce_admin_meta_boxes.ajax_url,b,function(b){a("ul.order_notes").prepend(b),a("#woocommerce-order-notes").unblock(),a("#add_order_note").val("")}),!1}},delete_order_note:function(){if(window.confirm(woocommerce_admin_meta_boxes.i18n_delete_note)){var b=a(this).closest("li.note");a(b).block({message:null,overlayCSS:{background:"#fff",opacity:.6}});var c={action:"woocommerce_delete_order_note",note_id:a(b).attr("rel"),security:woocommerce_admin_meta_boxes.delete_order_note_nonce};a.post(woocommerce_admin_meta_boxes.ajax_url,c,function(){a(b).remove()})}return!1}},e={init:function(){a(".order_download_permissions").on("click","button.grant_access",this.grant_access).on("click","button.revoke_access",this.revoke_access)},grant_access:function(){var b=a("#grant_access_id").val();if(b){a(".order_download_permissions").block({message:null,overlayCSS:{background:"#fff",opacity:.6}});var c={action:"woocommerce_grant_access_to_download",product_ids:b,loop:a(".order_download_permissions .wc-metabox").length,order_id:woocommerce_admin_meta_boxes.post_id,security:woocommerce_admin_meta_boxes.grant_access_nonce};return a.post(woocommerce_admin_meta_boxes.ajax_url,c,function(b){b?a(".order_download_permissions .wc-metaboxes").append(b):window.alert(woocommerce_admin_meta_boxes.i18n_download_permission_fail),a(document.body).trigger("wc-init-datepickers"),a("#grant_access_id").val("").change(),a(".order_download_permissions").unblock()}),!1}},revoke_access:function(){if(window.confirm(woocommerce_admin_meta_boxes.i18n_permission_revoke)){var b=a(this).parent().parent(),c=a(this).attr("rel").split(",")[0],d=a(this).attr("rel").split(",")[1],e=a(this).data("permission_id");if(c>0){a(b).block({message:null,overlayCSS:{background:"#fff",opacity:.6}});var f={action:"woocommerce_revoke_access_to_download",product_id:c,download_id:d,permission_id:e,order_id:woocommerce_admin_meta_boxes.post_id,security:woocommerce_admin_meta_boxes.revoke_access_nonce};a.post(woocommerce_admin_meta_boxes.ajax_url,f,function(){a(b).fadeOut("300",function(){a(b).remove()})})}else a(b).fadeOut("300",function(){a(b).remove()})}return!1}};b.init(),c.init(),d.init(),e.init()});
\ No newline at end of file
diff --git a/assets/js/admin/meta-boxes-product-variation.js b/assets/js/admin/meta-boxes-product-variation.js
index fff33f6b644..bc3e644583e 100644
--- a/assets/js/admin/meta-boxes-product-variation.js
+++ b/assets/js/admin/meta-boxes-product-variation.js
@@ -31,6 +31,7 @@ jQuery( function( $ ) {
 		 */
 		reload: function() {
 			wc_meta_boxes_product_variations_ajax.load_variations( 1 );
+			wc_meta_boxes_product_variations_pagenav.set_paginav( 0 );
 		},
 
 		/**
@@ -117,21 +118,19 @@ jQuery( function( $ ) {
 			});
 
 			// Datepicker fields
-			$( '.sale_price_dates_fields', wrapper ).each( function() {
-				var dates = $( this ).find( 'input' ).datepicker({
-					defaultDate:     '',
-					dateFormat:      'yy-mm-dd',
-					numberOfMonths:  1,
-					showButtonPanel: true,
-					onSelect:        function( selectedDate ) {
-						var option   = $( this ).is( '.sale_price_dates_from' ) ? 'minDate' : 'maxDate',
-							instance = $( this ).data( 'datepicker' ),
-							date     = $.datepicker.parseDate( instance.settings.dateFormat || $.datepicker._defaults.dateFormat, selectedDate, instance.settings );
+			$( '.sale_price_dates_fields', wrapper ).find( 'input' ).datepicker({
+				defaultDate:     '',
+				dateFormat:      'yy-mm-dd',
+				numberOfMonths:  1,
+				showButtonPanel: true,
+				onSelect:        function( selectedDate, instance ) {
+					var option = $( this ).is( '.sale_price_dates_from' ) ? 'minDate' : 'maxDate',
+						dates  = $( this ).closest( '.sale_price_dates_fields' ).find( 'input' ),
+						date   = $.datepicker.parseDate( instance.settings.dateFormat || $.datepicker._defaults.dateFormat, selectedDate, instance.settings );
 
-						dates.not( this ).datepicker( 'option', option, date );
-						$( this ).change();
-					}
-				});
+					dates.not( this ).datepicker( 'option', option, date );
+					$( this ).change();
+				}
 			});
 
 			// Allow sorting
@@ -554,7 +553,7 @@ jQuery( function( $ ) {
 			var data = {
 				action: 'woocommerce_add_variation',
 				post_id: woocommerce_admin_meta_boxes_variations.post_id,
-				loop: $( '.woocommerce_variation' ).size(),
+				loop: $( '.woocommerce_variation' ).length,
 				security: woocommerce_admin_meta_boxes_variations.add_variation_nonce
 			};
 
diff --git a/assets/js/admin/meta-boxes-product-variation.min.js b/assets/js/admin/meta-boxes-product-variation.min.js
index 3163ebbf7aa..6b93d6296cb 100644
--- a/assets/js/admin/meta-boxes-product-variation.min.js
+++ b/assets/js/admin/meta-boxes-product-variation.min.js
@@ -1 +1 @@
-jQuery(function(a){var b={init:function(){a("#variable_product_options").on("change","input.variable_is_downloadable",this.variable_is_downloadable).on("change","input.variable_is_virtual",this.variable_is_virtual).on("change","input.variable_manage_stock",this.variable_manage_stock).on("click","button.notice-dismiss",this.notice_dismiss).on("click","h3 .sort",this.set_menu_order).on("reload",this.reload),a("input.variable_is_downloadable, input.variable_is_virtual, input.variable_manage_stock").change(),a("#woocommerce-product-data").on("woocommerce_variations_loaded",this.variations_loaded),a(document.body).on("woocommerce_variations_added",this.variation_added)},reload:function(){d.load_variations(1)},variable_is_downloadable:function(){a(this).closest(".woocommerce_variation").find(".show_if_variation_downloadable").hide(),a(this).is(":checked")&&a(this).closest(".woocommerce_variation").find(".show_if_variation_downloadable").show()},variable_is_virtual:function(){a(this).closest(".woocommerce_variation").find(".hide_if_variation_virtual").show(),a(this).is(":checked")&&a(this).closest(".woocommerce_variation").find(".hide_if_variation_virtual").hide()},variable_manage_stock:function(){a(this).closest(".woocommerce_variation").find(".show_if_variation_manage_stock").hide(),a(this).is(":checked")&&a(this).closest(".woocommerce_variation").find(".show_if_variation_manage_stock").show()},notice_dismiss:function(){a(this).closest("div.notice").remove()},variations_loaded:function(c,d){d=d||!1;var e=a("#woocommerce-product-data");d||(a("input.variable_is_downloadable, input.variable_is_virtual, input.variable_manage_stock",e).change(),a(".woocommerce_variation",e).each(function(b,c){var d=a(c),e=a(".sale_price_dates_from",d).val(),f=a(".sale_price_dates_to",d).val();(""!==e||""!==f)&&a("a.sale_schedule",d).click()}),a(".woocommerce_variations .variation-needs-update",e).removeClass("variation-needs-update"),a("button.cancel-variation-changes, button.save-variation-changes",e).attr("disabled","disabled")),a("#tiptip_holder").removeAttr("style"),a("#tiptip_arrow").removeAttr("style"),a(".woocommerce_variations .tips, .woocommerce_variations .help_tip, .woocommerce_variations .woocommerce-help-tip",e).tipTip({attribute:"data-tip",fadeIn:50,fadeOut:50,delay:200}),a(".sale_price_dates_fields",e).each(function(){var b=a(this).find("input").datepicker({defaultDate:"",dateFormat:"yy-mm-dd",numberOfMonths:1,showButtonPanel:!0,onSelect:function(c){var d=a(this).is(".sale_price_dates_from")?"minDate":"maxDate",e=a(this).data("datepicker"),f=a.datepicker.parseDate(e.settings.dateFormat||a.datepicker._defaults.dateFormat,c,e.settings);b.not(this).datepicker("option",d,f),a(this).change()}})}),a(".woocommerce_variations",e).sortable({items:".woocommerce_variation",cursor:"move",axis:"y",handle:".sort",scrollSensitivity:40,forcePlaceholderSize:!0,helper:"clone",opacity:.65,stop:function(){b.variation_row_indexes()}}),a(document.body).trigger("wc-enhanced-select-init")},variation_added:function(a,c){1===c&&b.variations_loaded(null,!0)},set_menu_order:function(b){b.preventDefault();var c=a(this).closest(".woocommerce_variation").find(".variation_menu_order"),e=window.prompt(woocommerce_admin_meta_boxes_variations.i18n_enter_menu_order,c.val());null!=e&&(c.val(parseInt(e,10)).change(),d.save_variations())},variation_row_indexes:function(){var b=a("#variable_product_options").find(".woocommerce_variations"),c=parseInt(b.attr("data-page"),10),d=parseInt((c-1)*woocommerce_admin_meta_boxes_variations.variations_per_page,10);a(".woocommerce_variations .woocommerce_variation").each(function(b,c){a(".variation_menu_order",c).val(parseInt(a(c).index(".woocommerce_variations .woocommerce_variation"),10)+1+d).change()})}},c={variable_image_frame:null,setting_variation_image_id:null,setting_variation_image:null,wp_media_post_id:wp.media.model.settings.post.id,init:function(){a("#variable_product_options").on("click",".upload_image_button",this.add_image),a("a.add_media").on("click",this.restore_wp_media_post_id)},add_image:function(b){var d=a(this),e=d.attr("rel"),f=d.closest(".upload_image");if(c.setting_variation_image=f,c.setting_variation_image_id=e,b.preventDefault(),d.is(".remove"))a(".upload_image_id",c.setting_variation_image).val("").change(),c.setting_variation_image.find("img").eq(0).attr("src",woocommerce_admin_meta_boxes_variations.woocommerce_placeholder_img_src),c.setting_variation_image.find(".upload_image_button").removeClass("remove");else{if(c.variable_image_frame)return c.variable_image_frame.uploader.uploader.param("post_id",c.setting_variation_image_id),void c.variable_image_frame.open();wp.media.model.settings.post.id=c.setting_variation_image_id,c.variable_image_frame=wp.media.frames.variable_image=wp.media({title:woocommerce_admin_meta_boxes_variations.i18n_choose_image,button:{text:woocommerce_admin_meta_boxes_variations.i18n_set_image},states:[new wp.media.controller.Library({title:woocommerce_admin_meta_boxes_variations.i18n_choose_image,filterable:"all"})]}),c.variable_image_frame.on("select",function(){var b=c.variable_image_frame.state().get("selection").first().toJSON(),d=b.sizes&&b.sizes.thumbnail?b.sizes.thumbnail.url:b.url;a(".upload_image_id",c.setting_variation_image).val(b.id).change(),c.setting_variation_image.find(".upload_image_button").addClass("remove"),c.setting_variation_image.find("img").eq(0).attr("src",d),wp.media.model.settings.post.id=c.wp_media_post_id}),c.variable_image_frame.open()}},restore_wp_media_post_id:function(){wp.media.model.settings.post.id=c.wp_media_post_id}},d={init:function(){a("li.variations_tab a").on("click",this.initial_load),a("#variable_product_options").on("click","button.save-variation-changes",this.save_variations).on("click","button.cancel-variation-changes",this.cancel_variations).on("click",".remove_variation",this.remove_variation),a(document.body).on("change","#variable_product_options .woocommerce_variations :input",this.input_changed).on("change",".variations-defaults select",this.defaults_changed),a("form#post").on("submit",this.save_on_submit),a(".wc-metaboxes-wrapper").on("click","a.do_variation_action",this.do_variation_action)},check_for_changes:function(){var b=a("#variable_product_options").find(".woocommerce_variations .variation-needs-update");if(0<b.length){if(!window.confirm(woocommerce_admin_meta_boxes_variations.i18n_edited_variations))return b.removeClass("variation-needs-update"),!1;d.save_changes()}return!0},block:function(){a("#woocommerce-product-data").block({message:null,overlayCSS:{background:"#fff",opacity:.6}})},unblock:function(){a("#woocommerce-product-data").unblock()},initial_load:function(){0===a("#variable_product_options").find(".woocommerce_variations .woocommerce_variation").length&&e.go_to_page()},load_variations:function(b,c){b=b||1,c=c||woocommerce_admin_meta_boxes_variations.variations_per_page;var e=a("#variable_product_options").find(".woocommerce_variations");d.block(),a.ajax({url:woocommerce_admin_meta_boxes_variations.ajax_url,data:{action:"woocommerce_load_variations",security:woocommerce_admin_meta_boxes_variations.load_variations_nonce,product_id:woocommerce_admin_meta_boxes_variations.post_id,attributes:e.data("attributes"),page:b,per_page:c},type:"POST",success:function(c){e.empty().append(c).attr("data-page",b),a("#woocommerce-product-data").trigger("woocommerce_variations_loaded"),d.unblock()}})},get_variations_fields:function(b){var c=a(":input",b).serializeJSON();return a(".variations-defaults select").each(function(b,d){var e=a(d);c[e.attr("name")]=e.val()}),c},save_changes:function(b){var c=a("#variable_product_options").find(".woocommerce_variations"),e=a(".variation-needs-update",c),f={};0<e.length&&(d.block(),f=d.get_variations_fields(e),f.action="woocommerce_save_variations",f.security=woocommerce_admin_meta_boxes_variations.save_variations_nonce,f.product_id=woocommerce_admin_meta_boxes_variations.post_id,f["product-type"]=a("#product-type").val(),a.ajax({url:woocommerce_admin_meta_boxes_variations.ajax_url,data:f,type:"POST",success:function(c){e.removeClass("variation-needs-update"),a("button.cancel-variation-changes, button.save-variation-changes").attr("disabled","disabled"),a("#woocommerce-product-data").trigger("woocommerce_variations_saved"),"function"==typeof b&&b(c),d.unblock()}}))},save_variations:function(){return a("#variable_product_options").trigger("woocommerce_variations_save_variations_button"),d.save_changes(function(b){var c=a("#variable_product_options").find(".woocommerce_variations"),d=c.attr("data-page");a("#variable_product_options").find("#woocommerce_errors").remove(),b&&c.before(b),a(".variations-defaults select").each(function(){a(this).attr("data-current",a(this).val())}),e.go_to_page(d)}),!1},save_on_submit:function(b){var c=a("#variable_product_options").find(".woocommerce_variations .variation-needs-update");0<c.length&&(b.preventDefault(),a("#variable_product_options").trigger("woocommerce_variations_save_variations_on_submit"),d.save_changes(d.save_on_submit_done))},save_on_submit_done:function(){a("form#post").submit()},cancel_variations:function(){var b=parseInt(a("#variable_product_options").find(".woocommerce_variations").attr("data-page"),10);return a("#variable_product_options").find(".woocommerce_variations .variation-needs-update").removeClass("variation-needs-update"),a(".variations-defaults select").each(function(){a(this).val(a(this).attr("data-current"))}),e.go_to_page(b),!1},add_variation:function(){d.block();var b={action:"woocommerce_add_variation",post_id:woocommerce_admin_meta_boxes_variations.post_id,loop:a(".woocommerce_variation").size(),security:woocommerce_admin_meta_boxes_variations.add_variation_nonce};return a.post(woocommerce_admin_meta_boxes_variations.ajax_url,b,function(b){var c=a(b);c.addClass("variation-needs-update"),a("#variable_product_options").find(".woocommerce_variations").prepend(c),a("button.cancel-variation-changes, button.save-variation-changes").removeAttr("disabled"),a("#variable_product_options").trigger("woocommerce_variations_added",1),d.unblock()}),!1},remove_variation:function(){if(d.check_for_changes(),window.confirm(woocommerce_admin_meta_boxes_variations.i18n_remove_variation)){var b=a(this).attr("rel"),c=[],f={action:"woocommerce_remove_variations"};d.block(),b>0?(c.push(b),f.variation_ids=c,f.security=woocommerce_admin_meta_boxes_variations.delete_variations_nonce,a.post(woocommerce_admin_meta_boxes_variations.ajax_url,f,function(){var b=a("#variable_product_options").find(".woocommerce_variations"),c=parseInt(b.attr("data-page"),10),d=Math.ceil((parseInt(b.attr("data-total"),10)-1)/woocommerce_admin_meta_boxes_variations.variations_per_page),f=1;a("#woocommerce-product-data").trigger("woocommerce_variations_removed"),c===d||d>=c?f=c:c>d&&0!==d&&(f=d),e.go_to_page(f,-1)})):d.unblock()}return!1},link_all_variations:function(){if(d.check_for_changes(),window.confirm(woocommerce_admin_meta_boxes_variations.i18n_link_all_variations)){d.block();var b={action:"woocommerce_link_all_variations",post_id:woocommerce_admin_meta_boxes_variations.post_id,security:woocommerce_admin_meta_boxes_variations.link_variation_nonce};a.post(woocommerce_admin_meta_boxes_variations.ajax_url,b,function(b){var c=parseInt(b,10);1===c?window.alert(c+" "+woocommerce_admin_meta_boxes_variations.i18n_variation_added):0===c||c>1?window.alert(c+" "+woocommerce_admin_meta_boxes_variations.i18n_variations_added):window.alert(woocommerce_admin_meta_boxes_variations.i18n_no_variations_added),c>0?(e.go_to_page(1,c),a("#variable_product_options").trigger("woocommerce_variations_added",c)):d.unblock()})}return!1},input_changed:function(){a(this).closest(".woocommerce_variation").addClass("variation-needs-update"),a("button.cancel-variation-changes, button.save-variation-changes").removeAttr("disabled"),a("#variable_product_options").trigger("woocommerce_variations_input_changed")},defaults_changed:function(){a(this).closest("#variable_product_options").find(".woocommerce_variation:first").addClass("variation-needs-update"),a("button.cancel-variation-changes, button.save-variation-changes").removeAttr("disabled"),a("#variable_product_options").trigger("woocommerce_variations_defaults_changed")},do_variation_action:function(){var b,c=a("select.variation_actions").val(),f={},g=0;switch(c){case"add_variation":return void d.add_variation();case"link_all_variations":return void d.link_all_variations();case"delete_all":window.confirm(woocommerce_admin_meta_boxes_variations.i18n_delete_all_variations)&&window.confirm(woocommerce_admin_meta_boxes_variations.i18n_last_warning)&&(f.allowed=!0,g=-1*parseInt(a("#variable_product_options").find(".woocommerce_variations").attr("data-total"),10));break;case"variable_regular_price_increase":case"variable_regular_price_decrease":case"variable_sale_price_increase":case"variable_sale_price_decrease":b=window.prompt(woocommerce_admin_meta_boxes_variations.i18n_enter_a_value_fixed_or_percent),null!=b&&(b.indexOf("%")>=0?f.value=accounting.unformat(b.replace(/\%/,""),woocommerce_admin.mon_decimal_point)+"%":f.value=accounting.unformat(b,woocommerce_admin.mon_decimal_point));break;case"variable_regular_price":case"variable_sale_price":case"variable_stock":case"variable_weight":case"variable_length":case"variable_width":case"variable_height":case"variable_download_limit":case"variable_download_expiry":b=window.prompt(woocommerce_admin_meta_boxes_variations.i18n_enter_a_value),null!=b&&(f.value=b);break;case"variable_sale_schedule":f.date_from=window.prompt(woocommerce_admin_meta_boxes_variations.i18n_scheduled_sale_start),f.date_to=window.prompt(woocommerce_admin_meta_boxes_variations.i18n_scheduled_sale_end),null===f.date_from&&(f.date_from=!1),null===f.date_to&&(f.date_to=!1);break;default:a("select.variation_actions").trigger(c),f=a("select.variation_actions").triggerHandler(c+"_ajax_data",f)}"delete_all"===c&&f.allowed?a("#variable_product_options").find(".variation-needs-update").removeClass("variation-needs-update"):d.check_for_changes(),d.block(),a.ajax({url:woocommerce_admin_meta_boxes_variations.ajax_url,data:{action:"woocommerce_bulk_edit_variations",security:woocommerce_admin_meta_boxes_variations.bulk_edit_variations_nonce,product_id:woocommerce_admin_meta_boxes_variations.post_id,product_type:a("#product-type").val(),bulk_action:c,data:f},type:"POST",success:function(){e.go_to_page(1,g)}})}},e={init:function(){a(document.body).on("woocommerce_variations_added",this.update_single_quantity).on("change",".variations-pagenav .page-selector",this.page_selector).on("click",".variations-pagenav .first-page",this.first_page).on("click",".variations-pagenav .prev-page",this.prev_page).on("click",".variations-pagenav .next-page",this.next_page).on("click",".variations-pagenav .last-page",this.last_page)},update_variations_count:function(b){var c=a("#variable_product_options").find(".woocommerce_variations"),d=parseInt(c.attr("data-total"),10)+b,e=a(".variations-pagenav .displaying-num");return c.attr("data-total",d),1===d?e.text(woocommerce_admin_meta_boxes_variations.i18n_variation_count_single.replace("%qty%",d)):e.text(woocommerce_admin_meta_boxes_variations.i18n_variation_count_plural.replace("%qty%",d)),d},update_single_quantity:function(b,c){if(1===c){var d=a(".variations-pagenav");e.update_variations_count(c),d.is(":hidden")&&(a("option, optgroup",".variation_actions").show(),a(".variation_actions").val("add_variation"),a("#variable_product_options").find(".toolbar").show(),d.show(),a(".pagination-links",d).hide())}},set_paginav:function(b){var c=a("#variable_product_options").find(".woocommerce_variations"),d=e.update_variations_count(b),f=a("#variable_product_options").find(".toolbar"),g=a(".variation_actions"),h=a(".variations-pagenav"),i=a(".pagination-links",h),j=Math.ceil(d/woocommerce_admin_meta_boxes_variations.variations_per_page),k="";c.attr("data-total_pages",j),a(".total-pages",h).text(j);for(var l=1;j>=l;l++)k+='<option value="'+l+'">'+l+"</option>";a(".page-selector",h).empty().html(k),0===d?(f.not(".toolbar-top, .toolbar-buttons").hide(),h.hide(),a("option, optgroup",g).hide(),a(".variation_actions").val("add_variation"),a('option[data-global="true"]',g).show()):(f.show(),h.show(),a("option, optgroup",g).show(),a(".variation_actions").val("add_variation"),1===j?i.hide():i.show())},check_is_enabled:function(b){return!a(b).hasClass("disabled")},change_classes:function(b,c){var d=a(".variations-pagenav .first-page"),e=a(".variations-pagenav .prev-page"),f=a(".variations-pagenav .next-page"),g=a(".variations-pagenav .last-page");1===b?(d.addClass("disabled"),e.addClass("disabled")):(d.removeClass("disabled"),e.removeClass("disabled")),c===b?(f.addClass("disabled"),g.addClass("disabled")):(f.removeClass("disabled"),g.removeClass("disabled"))},set_page:function(b){a(".variations-pagenav .page-selector").val(b).first().change()},go_to_page:function(a,b){a=a||1,b=b||0,e.set_paginav(b),e.set_page(a)},page_selector:function(){var b=parseInt(a(this).val(),10),c=a("#variable_product_options").find(".woocommerce_variations");a(".variations-pagenav .page-selector").val(b),d.check_for_changes(),e.change_classes(b,parseInt(c.attr("data-total_pages"),10)),d.load_variations(b)},first_page:function(){return e.check_is_enabled(this)&&e.set_page(1),!1},prev_page:function(){if(e.check_is_enabled(this)){var b=a("#variable_product_options").find(".woocommerce_variations"),c=parseInt(b.attr("data-page"),10)-1,d=c>0?c:1;e.set_page(d)}return!1},next_page:function(){if(e.check_is_enabled(this)){var b=a("#variable_product_options").find(".woocommerce_variations"),c=parseInt(b.attr("data-total_pages"),10),d=parseInt(b.attr("data-page"),10)+1,f=c>=d?d:c;e.set_page(f)}return!1},last_page:function(){if(e.check_is_enabled(this)){var b=a("#variable_product_options").find(".woocommerce_variations").attr("data-total_pages");e.set_page(b)}return!1}};b.init(),c.init(),d.init(),e.init()});
\ No newline at end of file
+jQuery(function(a){var b={init:function(){a("#variable_product_options").on("change","input.variable_is_downloadable",this.variable_is_downloadable).on("change","input.variable_is_virtual",this.variable_is_virtual).on("change","input.variable_manage_stock",this.variable_manage_stock).on("click","button.notice-dismiss",this.notice_dismiss).on("click","h3 .sort",this.set_menu_order).on("reload",this.reload),a("input.variable_is_downloadable, input.variable_is_virtual, input.variable_manage_stock").change(),a("#woocommerce-product-data").on("woocommerce_variations_loaded",this.variations_loaded),a(document.body).on("woocommerce_variations_added",this.variation_added)},reload:function(){d.load_variations(1),e.set_paginav(0)},variable_is_downloadable:function(){a(this).closest(".woocommerce_variation").find(".show_if_variation_downloadable").hide(),a(this).is(":checked")&&a(this).closest(".woocommerce_variation").find(".show_if_variation_downloadable").show()},variable_is_virtual:function(){a(this).closest(".woocommerce_variation").find(".hide_if_variation_virtual").show(),a(this).is(":checked")&&a(this).closest(".woocommerce_variation").find(".hide_if_variation_virtual").hide()},variable_manage_stock:function(){a(this).closest(".woocommerce_variation").find(".show_if_variation_manage_stock").hide(),a(this).is(":checked")&&a(this).closest(".woocommerce_variation").find(".show_if_variation_manage_stock").show()},notice_dismiss:function(){a(this).closest("div.notice").remove()},variations_loaded:function(c,d){d=d||!1;var e=a("#woocommerce-product-data");d||(a("input.variable_is_downloadable, input.variable_is_virtual, input.variable_manage_stock",e).change(),a(".woocommerce_variation",e).each(function(b,c){var d=a(c),e=a(".sale_price_dates_from",d).val(),f=a(".sale_price_dates_to",d).val();""===e&&""===f||a("a.sale_schedule",d).click()}),a(".woocommerce_variations .variation-needs-update",e).removeClass("variation-needs-update"),a("button.cancel-variation-changes, button.save-variation-changes",e).attr("disabled","disabled")),a("#tiptip_holder").removeAttr("style"),a("#tiptip_arrow").removeAttr("style"),a(".woocommerce_variations .tips, .woocommerce_variations .help_tip, .woocommerce_variations .woocommerce-help-tip",e).tipTip({attribute:"data-tip",fadeIn:50,fadeOut:50,delay:200}),a(".sale_price_dates_fields",e).find("input").datepicker({defaultDate:"",dateFormat:"yy-mm-dd",numberOfMonths:1,showButtonPanel:!0,onSelect:function(b,c){var d=a(this).is(".sale_price_dates_from")?"minDate":"maxDate",e=a(this).closest(".sale_price_dates_fields").find("input"),f=a.datepicker.parseDate(c.settings.dateFormat||a.datepicker._defaults.dateFormat,b,c.settings);e.not(this).datepicker("option",d,f),a(this).change()}}),a(".woocommerce_variations",e).sortable({items:".woocommerce_variation",cursor:"move",axis:"y",handle:".sort",scrollSensitivity:40,forcePlaceholderSize:!0,helper:"clone",opacity:.65,stop:function(){b.variation_row_indexes()}}),a(document.body).trigger("wc-enhanced-select-init")},variation_added:function(a,c){1===c&&b.variations_loaded(null,!0)},set_menu_order:function(b){b.preventDefault();var c=a(this).closest(".woocommerce_variation").find(".variation_menu_order"),e=window.prompt(woocommerce_admin_meta_boxes_variations.i18n_enter_menu_order,c.val());null!=e&&(c.val(parseInt(e,10)).change(),d.save_variations())},variation_row_indexes:function(){var b=a("#variable_product_options").find(".woocommerce_variations"),c=parseInt(b.attr("data-page"),10),d=parseInt((c-1)*woocommerce_admin_meta_boxes_variations.variations_per_page,10);a(".woocommerce_variations .woocommerce_variation").each(function(b,c){a(".variation_menu_order",c).val(parseInt(a(c).index(".woocommerce_variations .woocommerce_variation"),10)+1+d).change()})}},c={variable_image_frame:null,setting_variation_image_id:null,setting_variation_image:null,wp_media_post_id:wp.media.model.settings.post.id,init:function(){a("#variable_product_options").on("click",".upload_image_button",this.add_image),a("a.add_media").on("click",this.restore_wp_media_post_id)},add_image:function(b){var d=a(this),e=d.attr("rel"),f=d.closest(".upload_image");if(c.setting_variation_image=f,c.setting_variation_image_id=e,b.preventDefault(),d.is(".remove"))a(".upload_image_id",c.setting_variation_image).val("").change(),c.setting_variation_image.find("img").eq(0).attr("src",woocommerce_admin_meta_boxes_variations.woocommerce_placeholder_img_src),c.setting_variation_image.find(".upload_image_button").removeClass("remove");else{if(c.variable_image_frame)return c.variable_image_frame.uploader.uploader.param("post_id",c.setting_variation_image_id),void c.variable_image_frame.open();wp.media.model.settings.post.id=c.setting_variation_image_id,c.variable_image_frame=wp.media.frames.variable_image=wp.media({title:woocommerce_admin_meta_boxes_variations.i18n_choose_image,button:{text:woocommerce_admin_meta_boxes_variations.i18n_set_image},states:[new wp.media.controller.Library({title:woocommerce_admin_meta_boxes_variations.i18n_choose_image,filterable:"all"})]}),c.variable_image_frame.on("select",function(){var b=c.variable_image_frame.state().get("selection").first().toJSON(),d=b.sizes&&b.sizes.thumbnail?b.sizes.thumbnail.url:b.url;a(".upload_image_id",c.setting_variation_image).val(b.id).change(),c.setting_variation_image.find(".upload_image_button").addClass("remove"),c.setting_variation_image.find("img").eq(0).attr("src",d),wp.media.model.settings.post.id=c.wp_media_post_id}),c.variable_image_frame.open()}},restore_wp_media_post_id:function(){wp.media.model.settings.post.id=c.wp_media_post_id}},d={init:function(){a("li.variations_tab a").on("click",this.initial_load),a("#variable_product_options").on("click","button.save-variation-changes",this.save_variations).on("click","button.cancel-variation-changes",this.cancel_variations).on("click",".remove_variation",this.remove_variation),a(document.body).on("change","#variable_product_options .woocommerce_variations :input",this.input_changed).on("change",".variations-defaults select",this.defaults_changed),a("form#post").on("submit",this.save_on_submit),a(".wc-metaboxes-wrapper").on("click","a.do_variation_action",this.do_variation_action)},check_for_changes:function(){var b=a("#variable_product_options").find(".woocommerce_variations .variation-needs-update");if(0<b.length){if(!window.confirm(woocommerce_admin_meta_boxes_variations.i18n_edited_variations))return b.removeClass("variation-needs-update"),!1;d.save_changes()}return!0},block:function(){a("#woocommerce-product-data").block({message:null,overlayCSS:{background:"#fff",opacity:.6}})},unblock:function(){a("#woocommerce-product-data").unblock()},initial_load:function(){0===a("#variable_product_options").find(".woocommerce_variations .woocommerce_variation").length&&e.go_to_page()},load_variations:function(b,c){b=b||1,c=c||woocommerce_admin_meta_boxes_variations.variations_per_page;var e=a("#variable_product_options").find(".woocommerce_variations");d.block(),a.ajax({url:woocommerce_admin_meta_boxes_variations.ajax_url,data:{action:"woocommerce_load_variations",security:woocommerce_admin_meta_boxes_variations.load_variations_nonce,product_id:woocommerce_admin_meta_boxes_variations.post_id,attributes:e.data("attributes"),page:b,per_page:c},type:"POST",success:function(c){e.empty().append(c).attr("data-page",b),a("#woocommerce-product-data").trigger("woocommerce_variations_loaded"),d.unblock()}})},get_variations_fields:function(b){var c=a(":input",b).serializeJSON();return a(".variations-defaults select").each(function(b,d){var e=a(d);c[e.attr("name")]=e.val()}),c},save_changes:function(b){var c=a("#variable_product_options").find(".woocommerce_variations"),e=a(".variation-needs-update",c),f={};0<e.length&&(d.block(),f=d.get_variations_fields(e),f.action="woocommerce_save_variations",f.security=woocommerce_admin_meta_boxes_variations.save_variations_nonce,f.product_id=woocommerce_admin_meta_boxes_variations.post_id,f["product-type"]=a("#product-type").val(),a.ajax({url:woocommerce_admin_meta_boxes_variations.ajax_url,data:f,type:"POST",success:function(c){e.removeClass("variation-needs-update"),a("button.cancel-variation-changes, button.save-variation-changes").attr("disabled","disabled"),a("#woocommerce-product-data").trigger("woocommerce_variations_saved"),"function"==typeof b&&b(c),d.unblock()}}))},save_variations:function(){return a("#variable_product_options").trigger("woocommerce_variations_save_variations_button"),d.save_changes(function(b){var c=a("#variable_product_options").find(".woocommerce_variations"),d=c.attr("data-page");a("#variable_product_options").find("#woocommerce_errors").remove(),b&&c.before(b),a(".variations-defaults select").each(function(){a(this).attr("data-current",a(this).val())}),e.go_to_page(d)}),!1},save_on_submit:function(b){var c=a("#variable_product_options").find(".woocommerce_variations .variation-needs-update");0<c.length&&(b.preventDefault(),a("#variable_product_options").trigger("woocommerce_variations_save_variations_on_submit"),d.save_changes(d.save_on_submit_done))},save_on_submit_done:function(){a("form#post").submit()},cancel_variations:function(){var b=parseInt(a("#variable_product_options").find(".woocommerce_variations").attr("data-page"),10);return a("#variable_product_options").find(".woocommerce_variations .variation-needs-update").removeClass("variation-needs-update"),a(".variations-defaults select").each(function(){a(this).val(a(this).attr("data-current"))}),e.go_to_page(b),!1},add_variation:function(){d.block();var b={action:"woocommerce_add_variation",post_id:woocommerce_admin_meta_boxes_variations.post_id,loop:a(".woocommerce_variation").length,security:woocommerce_admin_meta_boxes_variations.add_variation_nonce};return a.post(woocommerce_admin_meta_boxes_variations.ajax_url,b,function(b){var c=a(b);c.addClass("variation-needs-update"),a("#variable_product_options").find(".woocommerce_variations").prepend(c),a("button.cancel-variation-changes, button.save-variation-changes").removeAttr("disabled"),a("#variable_product_options").trigger("woocommerce_variations_added",1),d.unblock()}),!1},remove_variation:function(){if(d.check_for_changes(),window.confirm(woocommerce_admin_meta_boxes_variations.i18n_remove_variation)){var b=a(this).attr("rel"),c=[],f={action:"woocommerce_remove_variations"};d.block(),0<b?(c.push(b),f.variation_ids=c,f.security=woocommerce_admin_meta_boxes_variations.delete_variations_nonce,a.post(woocommerce_admin_meta_boxes_variations.ajax_url,f,function(){var b=a("#variable_product_options").find(".woocommerce_variations"),c=parseInt(b.attr("data-page"),10),d=Math.ceil((parseInt(b.attr("data-total"),10)-1)/woocommerce_admin_meta_boxes_variations.variations_per_page),f=1;a("#woocommerce-product-data").trigger("woocommerce_variations_removed"),c===d||c<=d?f=c:c>d&&0!==d&&(f=d),e.go_to_page(f,-1)})):d.unblock()}return!1},link_all_variations:function(){if(d.check_for_changes(),window.confirm(woocommerce_admin_meta_boxes_variations.i18n_link_all_variations)){d.block();var b={action:"woocommerce_link_all_variations",post_id:woocommerce_admin_meta_boxes_variations.post_id,security:woocommerce_admin_meta_boxes_variations.link_variation_nonce};a.post(woocommerce_admin_meta_boxes_variations.ajax_url,b,function(b){var c=parseInt(b,10);1===c?window.alert(c+" "+woocommerce_admin_meta_boxes_variations.i18n_variation_added):0===c||c>1?window.alert(c+" "+woocommerce_admin_meta_boxes_variations.i18n_variations_added):window.alert(woocommerce_admin_meta_boxes_variations.i18n_no_variations_added),c>0?(e.go_to_page(1,c),a("#variable_product_options").trigger("woocommerce_variations_added",c)):d.unblock()})}return!1},input_changed:function(){a(this).closest(".woocommerce_variation").addClass("variation-needs-update"),a("button.cancel-variation-changes, button.save-variation-changes").removeAttr("disabled"),a("#variable_product_options").trigger("woocommerce_variations_input_changed")},defaults_changed:function(){a(this).closest("#variable_product_options").find(".woocommerce_variation:first").addClass("variation-needs-update"),a("button.cancel-variation-changes, button.save-variation-changes").removeAttr("disabled"),a("#variable_product_options").trigger("woocommerce_variations_defaults_changed")},do_variation_action:function(){var b,c=a("select.variation_actions").val(),f={},g=0;switch(c){case"add_variation":return void d.add_variation();case"link_all_variations":return void d.link_all_variations();case"delete_all":window.confirm(woocommerce_admin_meta_boxes_variations.i18n_delete_all_variations)&&window.confirm(woocommerce_admin_meta_boxes_variations.i18n_last_warning)&&(f.allowed=!0,g=parseInt(a("#variable_product_options").find(".woocommerce_variations").attr("data-total"),10)*-1);break;case"variable_regular_price_increase":case"variable_regular_price_decrease":case"variable_sale_price_increase":case"variable_sale_price_decrease":b=window.prompt(woocommerce_admin_meta_boxes_variations.i18n_enter_a_value_fixed_or_percent),null!=b&&(b.indexOf("%")>=0?f.value=accounting.unformat(b.replace(/\%/,""),woocommerce_admin.mon_decimal_point)+"%":f.value=accounting.unformat(b,woocommerce_admin.mon_decimal_point));break;case"variable_regular_price":case"variable_sale_price":case"variable_stock":case"variable_weight":case"variable_length":case"variable_width":case"variable_height":case"variable_download_limit":case"variable_download_expiry":b=window.prompt(woocommerce_admin_meta_boxes_variations.i18n_enter_a_value),null!=b&&(f.value=b);break;case"variable_sale_schedule":f.date_from=window.prompt(woocommerce_admin_meta_boxes_variations.i18n_scheduled_sale_start),f.date_to=window.prompt(woocommerce_admin_meta_boxes_variations.i18n_scheduled_sale_end),null===f.date_from&&(f.date_from=!1),null===f.date_to&&(f.date_to=!1);break;default:a("select.variation_actions").trigger(c),f=a("select.variation_actions").triggerHandler(c+"_ajax_data",f)}"delete_all"===c&&f.allowed?a("#variable_product_options").find(".variation-needs-update").removeClass("variation-needs-update"):d.check_for_changes(),d.block(),a.ajax({url:woocommerce_admin_meta_boxes_variations.ajax_url,data:{action:"woocommerce_bulk_edit_variations",security:woocommerce_admin_meta_boxes_variations.bulk_edit_variations_nonce,product_id:woocommerce_admin_meta_boxes_variations.post_id,product_type:a("#product-type").val(),bulk_action:c,data:f},type:"POST",success:function(){e.go_to_page(1,g)}})}},e={init:function(){a(document.body).on("woocommerce_variations_added",this.update_single_quantity).on("change",".variations-pagenav .page-selector",this.page_selector).on("click",".variations-pagenav .first-page",this.first_page).on("click",".variations-pagenav .prev-page",this.prev_page).on("click",".variations-pagenav .next-page",this.next_page).on("click",".variations-pagenav .last-page",this.last_page)},update_variations_count:function(b){var c=a("#variable_product_options").find(".woocommerce_variations"),d=parseInt(c.attr("data-total"),10)+b,e=a(".variations-pagenav .displaying-num");return c.attr("data-total",d),1===d?e.text(woocommerce_admin_meta_boxes_variations.i18n_variation_count_single.replace("%qty%",d)):e.text(woocommerce_admin_meta_boxes_variations.i18n_variation_count_plural.replace("%qty%",d)),d},update_single_quantity:function(b,c){if(1===c){var d=a(".variations-pagenav");e.update_variations_count(c),d.is(":hidden")&&(a("option, optgroup",".variation_actions").show(),a(".variation_actions").val("add_variation"),a("#variable_product_options").find(".toolbar").show(),d.show(),a(".pagination-links",d).hide())}},set_paginav:function(b){var c=a("#variable_product_options").find(".woocommerce_variations"),d=e.update_variations_count(b),f=a("#variable_product_options").find(".toolbar"),g=a(".variation_actions"),h=a(".variations-pagenav"),i=a(".pagination-links",h),j=Math.ceil(d/woocommerce_admin_meta_boxes_variations.variations_per_page),k="";c.attr("data-total_pages",j),a(".total-pages",h).text(j);for(var l=1;l<=j;l++)k+='<option value="'+l+'">'+l+"</option>";a(".page-selector",h).empty().html(k),0===d?(f.not(".toolbar-top, .toolbar-buttons").hide(),h.hide(),a("option, optgroup",g).hide(),a(".variation_actions").val("add_variation"),a('option[data-global="true"]',g).show()):(f.show(),h.show(),a("option, optgroup",g).show(),a(".variation_actions").val("add_variation"),1===j?i.hide():i.show())},check_is_enabled:function(b){return!a(b).hasClass("disabled")},change_classes:function(b,c){var d=a(".variations-pagenav .first-page"),e=a(".variations-pagenav .prev-page"),f=a(".variations-pagenav .next-page"),g=a(".variations-pagenav .last-page");1===b?(d.addClass("disabled"),e.addClass("disabled")):(d.removeClass("disabled"),e.removeClass("disabled")),c===b?(f.addClass("disabled"),g.addClass("disabled")):(f.removeClass("disabled"),g.removeClass("disabled"))},set_page:function(b){a(".variations-pagenav .page-selector").val(b).first().change()},go_to_page:function(a,b){a=a||1,b=b||0,e.set_paginav(b),e.set_page(a)},page_selector:function(){var b=parseInt(a(this).val(),10),c=a("#variable_product_options").find(".woocommerce_variations");a(".variations-pagenav .page-selector").val(b),d.check_for_changes(),e.change_classes(b,parseInt(c.attr("data-total_pages"),10)),d.load_variations(b)},first_page:function(){return e.check_is_enabled(this)&&e.set_page(1),!1},prev_page:function(){if(e.check_is_enabled(this)){var b=a("#variable_product_options").find(".woocommerce_variations"),c=parseInt(b.attr("data-page"),10)-1,d=0<c?c:1;e.set_page(d)}return!1},next_page:function(){if(e.check_is_enabled(this)){var b=a("#variable_product_options").find(".woocommerce_variations"),c=parseInt(b.attr("data-total_pages"),10),d=parseInt(b.attr("data-page"),10)+1,f=c>=d?d:c;e.set_page(f)}return!1},last_page:function(){if(e.check_is_enabled(this)){var b=a("#variable_product_options").find(".woocommerce_variations").attr("data-total_pages");e.set_page(b)}return!1}};b.init(),c.init(),d.init(),e.init()});
\ No newline at end of file
diff --git a/assets/js/admin/meta-boxes-product.js b/assets/js/admin/meta-boxes-product.js
index 7bc6b6b7e2b..29d7ed41c38 100644
--- a/assets/js/admin/meta-boxes-product.js
+++ b/assets/js/admin/meta-boxes-product.js
@@ -18,23 +18,23 @@ jQuery( function( $ ) {
 		});
 	});
 
-	// Prevent enter submitting post form
+	// Prevent enter submitting post form.
 	$( '#upsell_product_data' ).bind( 'keypress', function( e ) {
 		if ( e.keyCode === 13 ) {
 			return false;
 		}
 	});
 
-	// Type box
+	// Type box.
 	$( '.type_box' ).appendTo( '#woocommerce-product-data .hndle span' );
 
 	$( function() {
-		// Prevent inputs in meta box headings opening/closing contents
+		// Prevent inputs in meta box headings opening/closing contents.
 		$( '#woocommerce-product-data' ).find( '.hndle' ).unbind( 'click.postboxes' );
 
-		jQuery( '#woocommerce-product-data' ).on( 'click', '.hndle', function( event ) {
+		$( '#woocommerce-product-data' ).on( 'click', '.hndle', function( event ) {
 
-			// If the user clicks on some form input inside the h3 the box should not be toggled
+			// If the user clicks on some form input inside the h3 the box should not be toggled.
 			if ( $( event.target ).filter( 'input, option, label, select' ).length ) {
 				return;
 			}
@@ -43,15 +43,15 @@ jQuery( function( $ ) {
 		});
 	});
 
-	// Catalog Visibility
-	$( '#catalog-visibility' ).find( '.edit-catalog-visibility' ).click( function () {
+	// Catalog Visibility.
+	$( '#catalog-visibility' ).find( '.edit-catalog-visibility' ).click( function() {
 		if ( $( '#catalog-visibility-select' ).is( ':hidden' ) ) {
 			$( '#catalog-visibility-select' ).slideDown( 'fast' );
 			$( this ).hide();
 		}
 		return false;
 	});
-	$( '#catalog-visibility' ).find( '.save-post-visibility' ).click( function () {
+	$( '#catalog-visibility' ).find( '.save-post-visibility' ).click( function() {
 		$( '#catalog-visibility-select' ).slideUp( 'fast' );
 		$( '#catalog-visibility' ).find( '.edit-catalog-visibility' ).show();
 
@@ -65,7 +65,7 @@ jQuery( function( $ ) {
 		$( '#catalog-visibility-display' ).text( label );
 		return false;
 	});
-	$( '#catalog-visibility' ).find( '.cancel-post-visibility' ).click( function () {
+	$( '#catalog-visibility' ).find( '.cancel-post-visibility' ).click( function() {
 		$( '#catalog-visibility-select' ).slideUp( 'fast' );
 		$( '#catalog-visibility' ).find( '.edit-catalog-visibility' ).show();
 
@@ -88,10 +88,10 @@ jQuery( function( $ ) {
 		return false;
 	});
 
-	// PRODUCT TYPE SPECIFIC OPTIONS
-	$( 'select#product-type' ).change( function () {
+	// PRODUCT TYPE SPECIFIC OPTIONS.
+	$( 'select#product-type' ).change( function() {
 
-		// Get value
+		// Get value.
 		var select_val = $( this ).val();
 
 		if ( 'variable' === select_val ) {
@@ -114,34 +114,28 @@ jQuery( function( $ ) {
 
 	}).change();
 
-	$( document.body ).on( 'woocommerce-product-type-change', function( e, select_val ) {
-		if ( 'variable' !== select_val && 0 < $( '#variable_product_options' ).find( 'input[name^=variable_sku]' ).length && $( document.body ).triggerHandler( 'woocommerce-display-product-type-alert', select_val ) !== false ) {
-			window.alert( woocommerce_admin_meta_boxes.i18n_product_type_alert );
-		}
-	});
-
 	$( 'input#_downloadable, input#_virtual' ).change( function() {
 		show_and_hide_panels();
 	});
 
 	function show_and_hide_panels() {
 		var product_type    = $( 'select#product-type' ).val();
-		var is_virtual      = $( 'input#_virtual:checked' ).size();
-		var is_downloadable = $( 'input#_downloadable:checked' ).size();
+		var is_virtual      = $( 'input#_virtual:checked' ).length;
+		var is_downloadable = $( 'input#_downloadable:checked' ).length;
 
-		// Hide/Show all with rules
+		// Hide/Show all with rules.
 		var hide_classes = '.hide_if_downloadable, .hide_if_virtual';
-		var show_classes = '.show_if_downloadable, .show_if_virtual, .show_if_external';
+		var show_classes = '.show_if_downloadable, .show_if_virtual';
 
 		$.each( woocommerce_admin_meta_boxes.product_types, function( index, value ) {
 			hide_classes = hide_classes + ', .hide_if_' + value;
 			show_classes = show_classes + ', .show_if_' + value;
-		} );
+		});
 
 		$( hide_classes ).show();
 		$( show_classes ).hide();
 
-		// Shows rules
+		// Shows rules.
 		if ( is_downloadable ) {
 			$( '.show_if_downloadable' ).show();
 		}
@@ -151,7 +145,7 @@ jQuery( function( $ ) {
 
         $( '.show_if_' + product_type ).show();
 
-		// Hide rules
+		// Hide rules.
 		if ( is_downloadable ) {
 			$( '.hide_if_downloadable' ).hide();
 		}
@@ -162,16 +156,35 @@ jQuery( function( $ ) {
 		$( '.hide_if_' + product_type ).hide();
 
 		$( 'input#_manage_stock' ).change();
+
+		// Hide empty panels/tabs after display.
+		$( '.woocommerce_options_panel' ).each( function() {
+			var $children = $( this ).children( '.options_group' );
+
+			if ( 0 === $children.length ) {
+				return;
+			}
+
+			var $invisble = $children.filter( function() {
+				return 'none' === $( this ).css( 'display' );
+			});
+
+			// Hide panel.
+			if ( $invisble.length === $children.length ) {
+				var $id = $( this ).prop( 'id' );
+				$( '.product_data_tabs' ).find( 'li a[href="#' + $id + '"]' ).parent().hide();
+			}
+		});
 	}
 
-	// Sale price schedule
+	// Sale price schedule.
 	$( '.sale_price_dates_fields' ).each( function() {
 		var $these_sale_dates = $( this );
 		var sale_schedule_set = false;
 		var $wrap = $these_sale_dates.closest( 'div, table' );
 
 		$these_sale_dates.find( 'input' ).each( function() {
-			if ( $( this ).val() !== '' ) {
+			if ( '' !== $( this ).val() ) {
 				sale_schedule_set = true;
 			}
 		});
@@ -205,7 +218,7 @@ jQuery( function( $ ) {
 		return false;
 	});
 
-	// File inputs
+	// File inputs.
 	$( '#woocommerce-product-data' ).on( 'click','.downloadable_files a.insert', function() {
 		$( this ).closest( '.downloadable_files' ).find( 'tbody' ).append( $( this ).data( 'row' ) );
 		return false;
@@ -215,7 +228,7 @@ jQuery( function( $ ) {
 		return false;
 	});
 
-	// STOCK OPTIONS
+	// STOCK OPTIONS.
 	$( 'input#_manage_stock' ).change( function() {
 		if ( $( this ).is( ':checked' ) ) {
 			$( 'div.stock_fields' ).show();
@@ -224,7 +237,7 @@ jQuery( function( $ ) {
 		}
 	}).change();
 
-	// DATE PICKER FIELDS
+	// DATE PICKER FIELDS.
 	$( '.sale_price_dates_fields' ).each( function() {
 		var dates = $( this ).find( 'input' ).datepicker({
 			defaultDate: '',
@@ -240,18 +253,18 @@ jQuery( function( $ ) {
 		});
 	});
 
-	// ATTRIBUTE TABLES
+	// ATTRIBUTE TABLES.
 
-	// Initial order
-	var woocommerce_attribute_items = $('.product_attributes').find('.woocommerce_attribute').get();
+	// Initial order.
+	var woocommerce_attribute_items = $( '.product_attributes' ).find( '.woocommerce_attribute' ).get();
 
-	woocommerce_attribute_items.sort(function(a, b) {
+	woocommerce_attribute_items.sort( function( a, b ) {
 	   var compA = parseInt( $( a ).attr( 'rel' ), 10 );
 	   var compB = parseInt( $( b ).attr( 'rel' ), 10 );
-	   return (compA < compB) ? -1 : (compA > compB) ? 1 : 0;
+	   return ( compA < compB ) ? -1 : ( compA > compB ) ? 1 : 0;
 	});
-	$( woocommerce_attribute_items ).each( function( idx, itm ) {
-		$( '.product_attributes' ).append(itm);
+	$( woocommerce_attribute_items ).each( function( index, el ) {
+		$( '.product_attributes' ).append( el );
 	});
 
 	function attribute_row_indexes() {
@@ -266,11 +279,12 @@ jQuery( function( $ ) {
 		}
 	});
 
-	// Add rows
+	// Add rows.
 	$( 'button.add_attribute' ).on( 'click', function() {
-		var size         = $( '.product_attributes .woocommerce_attribute' ).size();
+		var size         = $( '.product_attributes .woocommerce_attribute' ).length;
 		var attribute    = $( 'select.attribute_taxonomy' ).val();
-		var $wrapper     = $( this ).closest( '#product_attributes' ).find( '.product_attributes' );
+		var $wrapper     = $( this ).closest( '#product_attributes' );
+		var $attributes  = $wrapper.find( '.product_attributes' );
 		var product_type = $( 'select#product-type' ).val();
 		var data         = {
 			action:   'woocommerce_add_attribute',
@@ -288,10 +302,10 @@ jQuery( function( $ ) {
 		});
 
 		$.post( woocommerce_admin_meta_boxes.ajax_url, data, function( response ) {
-			$wrapper.append( response );
+			$attributes.append( response );
 
-			if ( product_type !== 'variable' ) {
-				$wrapper.find( '.enable_variation' ).hide();
+			if ( 'variable' !== product_type ) {
+				$attributes.find( '.enable_variation' ).hide();
 			}
 
 			$( document.body ).trigger( 'wc-enhanced-select-init' );
@@ -321,7 +335,7 @@ jQuery( function( $ ) {
 
 	$( '.product_attributes' ).on( 'click', 'button.select_no_attributes', function() {
 		$( this ).closest( 'td' ).find( 'select option' ).removeAttr( 'selected' );
-		$( this ).closest( 'td' ).find( 'select').change();
+		$( this ).closest( 'td' ).find( 'select' ).change();
 		return false;
 	});
 
@@ -330,11 +344,11 @@ jQuery( function( $ ) {
 			var $parent = $( this ).parent().parent();
 
 			if ( $parent.is( '.taxonomy' ) ) {
-				$parent.find( 'select, input[type=text]' ).val('');
+				$parent.find( 'select, input[type=text]' ).val( '' );
 				$parent.hide();
 				$( 'select.attribute_taxonomy' ).find( 'option[value="' + $parent.data( 'taxonomy' ) + '"]' ).removeAttr( 'disabled' );
 			} else {
-				$parent.find( 'select, input[type=text]' ).val('');
+				$parent.find( 'select, input[type=text]' ).val( '' );
 				$parent.hide();
 				attribute_row_indexes();
 			}
@@ -342,7 +356,7 @@ jQuery( function( $ ) {
 		return false;
 	});
 
-	// Attribute ordering
+	// Attribute ordering.
 	$( '.product_attributes' ).sortable({
 		items: '.woocommerce_attribute',
 		cursor: 'move',
@@ -362,10 +376,16 @@ jQuery( function( $ ) {
 		}
 	});
 
-	// Add a new attribute (via ajax)
+	// Add a new attribute (via ajax).
 	$( '.product_attributes' ).on( 'click', 'button.add_new_attribute', function() {
 
-		$( '.product_attributes' ).block({ message: null, overlayCSS: { background: '#fff', opacity: 0.6 } });
+		$( '.product_attributes' ).block({
+			message: null,
+			overlayCSS: {
+				background: '#fff',
+				opacity: 0.6
+			}
+		});
 
 		var $wrapper           = $( this ).closest( '.woocommerce_attribute' );
 		var attribute          = $wrapper.data( 'taxonomy' );
@@ -383,11 +403,11 @@ jQuery( function( $ ) {
 			$.post( woocommerce_admin_meta_boxes.ajax_url, data, function( response ) {
 
 				if ( response.error ) {
-					// Error
+					// Error.
 					window.alert( response.error );
 				} else if ( response.slug ) {
-					// Success
-					$wrapper.find( 'select.attribute_values' ).append( '<option value="' + response.slug + '" selected="selected">' + response.name + '</option>' );
+					// Success.
+					$wrapper.find( 'select.attribute_values' ).append( '<option value="' + response.term_id + '" selected="selected">' + response.name + '</option>' );
 					$wrapper.find( 'select.attribute_values' ).change();
 				}
 
@@ -401,7 +421,7 @@ jQuery( function( $ ) {
 		return false;
 	});
 
-	// Save attributes and update variations
+	// Save attributes and update variations.
 	$( '.save_attributes' ).on( 'click', function() {
 
 		$( '#woocommerce-product-data' ).block({
@@ -413,29 +433,30 @@ jQuery( function( $ ) {
 		});
 
 		var data = {
-			post_id:  woocommerce_admin_meta_boxes.post_id,
-			data:     $( '.product_attributes' ).find( 'input, select, textarea' ).serialize(),
-			action:   'woocommerce_save_attributes',
-			security: woocommerce_admin_meta_boxes.save_attributes_nonce
+			post_id     : woocommerce_admin_meta_boxes.post_id,
+			product_type: $( '#product-type' ).val(),
+			data        : $( '.product_attributes' ).find( 'input, select, textarea' ).serialize(),
+			action      : 'woocommerce_save_attributes',
+			security    : woocommerce_admin_meta_boxes.save_attributes_nonce
 		};
 
 		$.post( woocommerce_admin_meta_boxes.ajax_url, data, function() {
-			// Reload variations panel
+			// Reload variations panel.
 			var this_page = window.location.toString();
 			this_page = this_page.replace( 'post-new.php?', 'post.php?post=' + woocommerce_admin_meta_boxes.post_id + '&action=edit&' );
 
-			// Load variations panel
+			// Load variations panel.
 			$( '#variable_product_options' ).load( this_page + ' #variable_product_options_inner', function() {
 				$( '#variable_product_options' ).trigger( 'reload' );
 			});
 		});
 	});
 
-	// Uploading files
+	// Uploading files.
 	var downloadable_file_frame;
 	var file_path_field;
 
-	jQuery( document.body ).on( 'click', '.upload_file_button', function( event ) {
+	$( document.body ).on( 'click', '.upload_file_button', function( event ) {
 		var $el = $( this );
 
 		file_path_field = $el.closest( 'tr' ).find( 'td.file_url input' );
@@ -488,7 +509,7 @@ jQuery( function( $ ) {
 			file_path_field.val( file_path ).change();
 		});
 
-		// Set post to 0 and set our custom type
+		// Set post to 0 and set our custom type.
 		downloadable_file_frame.on( 'ready', function() {
 			downloadable_file_frame.uploader.options.uploader.params = {
 				type: 'downloadable_product'
@@ -499,8 +520,8 @@ jQuery( function( $ ) {
 		downloadable_file_frame.open();
 	});
 
-	// Download ordering
-	jQuery( '.downloadable_files tbody' ).sortable({
+	// Download ordering.
+	$( '.downloadable_files tbody' ).sortable({
 		items: 'tr',
 		cursor: 'move',
 		axis: 'y',
@@ -511,12 +532,12 @@ jQuery( function( $ ) {
 		opacity: 0.65
 	});
 
-	// Product gallery file uploads
+	// Product gallery file uploads.
 	var product_gallery_frame;
 	var $image_gallery_ids = $( '#product_image_gallery' );
 	var $product_images    = $( '#product_images_container' ).find( 'ul.product_images' );
 
-	jQuery( '.add_product_images' ).on( 'click', 'a', function( event ) {
+	$( '.add_product_images' ).on( 'click', 'a', function( event ) {
 		var $el = $( this );
 
 		event.preventDefault();
@@ -566,7 +587,7 @@ jQuery( function( $ ) {
 		product_gallery_frame.open();
 	});
 
-	// Image ordering
+	// Image ordering.
 	$product_images.sortable({
 		items: 'li.image',
 		cursor: 'move',
@@ -586,7 +607,7 @@ jQuery( function( $ ) {
 			var attachment_ids = '';
 
 			$( '#product_images_container' ).find( 'ul li.image' ).css( 'cursor', 'default' ).each( function() {
-				var attachment_id = jQuery( this ).attr( 'data-attachment_id' );
+				var attachment_id = $( this ).attr( 'data-attachment_id' );
 				attachment_ids = attachment_ids + attachment_id + ',';
 			});
 
@@ -594,20 +615,20 @@ jQuery( function( $ ) {
 		}
 	});
 
-	// Remove images
+	// Remove images.
 	$( '#product_images_container' ).on( 'click', 'a.delete', function() {
 		$( this ).closest( 'li.image' ).remove();
 
 		var attachment_ids = '';
 
 		$( '#product_images_container' ).find( 'ul li.image' ).css( 'cursor', 'default' ).each( function() {
-			var attachment_id = jQuery( this ).attr( 'data-attachment_id' );
+			var attachment_id = $( this ).attr( 'data-attachment_id' );
 			attachment_ids = attachment_ids + attachment_id + ',';
 		});
 
 		$image_gallery_ids.val( attachment_ids );
 
-		// remove any lingering tooltips
+		// Remove any lingering tooltips.
 		$( '#tiptip_holder' ).removeAttr( 'style' );
 		$( '#tiptip_arrow' ).removeAttr( 'style' );
 
diff --git a/assets/js/admin/meta-boxes-product.min.js b/assets/js/admin/meta-boxes-product.min.js
index 550cfd1d571..283b69cee9c 100644
--- a/assets/js/admin/meta-boxes-product.min.js
+++ b/assets/js/admin/meta-boxes-product.min.js
@@ -1 +1 @@
-jQuery(function(a){function b(){var b=a("select#product-type").val(),c=a("input#_virtual:checked").size(),d=a("input#_downloadable:checked").size(),e=".hide_if_downloadable, .hide_if_virtual",f=".show_if_downloadable, .show_if_virtual, .show_if_external";a.each(woocommerce_admin_meta_boxes.product_types,function(a,b){e=e+", .hide_if_"+b,f=f+", .show_if_"+b}),a(e).show(),a(f).hide(),d&&a(".show_if_downloadable").show(),c&&a(".show_if_virtual").show(),a(".show_if_"+b).show(),d&&a(".hide_if_downloadable").hide(),c&&a(".hide_if_virtual").hide(),a(".hide_if_"+b).hide(),a("input#_manage_stock").change()}function c(){a(".product_attributes .woocommerce_attribute").each(function(b,c){a(".attribute_position",c).val(parseInt(a(c).index(".product_attributes .woocommerce_attribute"),10))})}a(function(){a('[id$="-all"] > ul.categorychecklist').each(function(){var b=a(this),c=b.find(":checked").first();if(c.length){var d=b.find("input").position().top,e=c.position().top;b.closest(".tabs-panel").scrollTop(e-d+5)}})}),a("#upsell_product_data").bind("keypress",function(a){return 13===a.keyCode?!1:void 0}),a(".type_box").appendTo("#woocommerce-product-data .hndle span"),a(function(){a("#woocommerce-product-data").find(".hndle").unbind("click.postboxes"),jQuery("#woocommerce-product-data").on("click",".hndle",function(b){a(b.target).filter("input, option, label, select").length||a("#woocommerce-product-data").toggleClass("closed")})}),a("#catalog-visibility").find(".edit-catalog-visibility").click(function(){return a("#catalog-visibility-select").is(":hidden")&&(a("#catalog-visibility-select").slideDown("fast"),a(this).hide()),!1}),a("#catalog-visibility").find(".save-post-visibility").click(function(){a("#catalog-visibility-select").slideUp("fast"),a("#catalog-visibility").find(".edit-catalog-visibility").show();var b=a("input[name=_visibility]:checked").attr("data-label");return a("input[name=_featured]").is(":checked")&&(b=b+", "+woocommerce_admin_meta_boxes.featured_label,a("input[name=_featured]").attr("checked","checked")),a("#catalog-visibility-display").text(b),!1}),a("#catalog-visibility").find(".cancel-post-visibility").click(function(){a("#catalog-visibility-select").slideUp("fast"),a("#catalog-visibility").find(".edit-catalog-visibility").show();var b=a("#current_visibility").val(),c=a("#current_featured").val();a("input[name=_visibility]").removeAttr("checked"),a("input[name=_visibility][value="+b+"]").attr("checked","checked");var d=a("input[name=_visibility]:checked").attr("data-label");return"yes"===c?(d=d+", "+woocommerce_admin_meta_boxes.featured_label,a("input[name=_featured]").attr("checked","checked")):a("input[name=_featured]").removeAttr("checked"),a("#catalog-visibility-display").text(d),!1}),a("select#product-type").change(function(){var c=a(this).val();"variable"===c?(a("input#_manage_stock").change(),a("input#_downloadable").prop("checked",!1),a("input#_virtual").removeAttr("checked")):"grouped"===c?(a("input#_downloadable").prop("checked",!1),a("input#_virtual").removeAttr("checked")):"external"===c&&(a("input#_downloadable").prop("checked",!1),a("input#_virtual").removeAttr("checked")),b(),a("ul.wc-tabs li:visible").eq(0).find("a").click(),a(document.body).trigger("woocommerce-product-type-change",c,a(this))}).change(),a(document.body).on("woocommerce-product-type-change",function(b,c){"variable"!==c&&0<a("#variable_product_options").find("input[name^=variable_sku]").length&&a(document.body).triggerHandler("woocommerce-display-product-type-alert",c)!==!1&&window.alert(woocommerce_admin_meta_boxes.i18n_product_type_alert)}),a("input#_downloadable, input#_virtual").change(function(){b()}),a(".sale_price_dates_fields").each(function(){var b=a(this),c=!1,d=b.closest("div, table");b.find("input").each(function(){""!==a(this).val()&&(c=!0)}),c?(d.find(".sale_schedule").hide(),d.find(".sale_price_dates_fields").show()):(d.find(".sale_schedule").show(),d.find(".sale_price_dates_fields").hide())}),a("#woocommerce-product-data").on("click",".sale_schedule",function(){var b=a(this).closest("div, table");return a(this).hide(),b.find(".cancel_sale_schedule").show(),b.find(".sale_price_dates_fields").show(),!1}),a("#woocommerce-product-data").on("click",".cancel_sale_schedule",function(){var b=a(this).closest("div, table");return a(this).hide(),b.find(".sale_schedule").show(),b.find(".sale_price_dates_fields").hide(),b.find(".sale_price_dates_fields").find("input").val(""),!1}),a("#woocommerce-product-data").on("click",".downloadable_files a.insert",function(){return a(this).closest(".downloadable_files").find("tbody").append(a(this).data("row")),!1}),a("#woocommerce-product-data").on("click",".downloadable_files a.delete",function(){return a(this).closest("tr").remove(),!1}),a("input#_manage_stock").change(function(){a(this).is(":checked")?a("div.stock_fields").show():a("div.stock_fields").hide()}).change(),a(".sale_price_dates_fields").each(function(){var b=a(this).find("input").datepicker({defaultDate:"",dateFormat:"yy-mm-dd",numberOfMonths:1,showButtonPanel:!0,onSelect:function(c){var d=a(this).is("#_sale_price_dates_from, .sale_price_dates_from")?"minDate":"maxDate",e=a(this).data("datepicker"),f=a.datepicker.parseDate(e.settings.dateFormat||a.datepicker._defaults.dateFormat,c,e.settings);b.not(this).datepicker("option",d,f)}})});var d=a(".product_attributes").find(".woocommerce_attribute").get();d.sort(function(b,c){var d=parseInt(a(b).attr("rel"),10),e=parseInt(a(c).attr("rel"),10);return e>d?-1:d>e?1:0}),a(d).each(function(b,c){a(".product_attributes").append(c)}),a(".product_attributes .woocommerce_attribute").each(function(b,c){"none"!==a(c).css("display")&&a(c).is(".taxonomy")&&a("select.attribute_taxonomy").find('option[value="'+a(c).data("taxonomy")+'"]').attr("disabled","disabled")}),a("button.add_attribute").on("click",function(){var b=a(".product_attributes .woocommerce_attribute").size(),d=a("select.attribute_taxonomy").val(),e=a(this).closest("#product_attributes").find(".product_attributes"),f=a("select#product-type").val(),g={action:"woocommerce_add_attribute",taxonomy:d,i:b,security:woocommerce_admin_meta_boxes.add_attribute_nonce};return e.block({message:null,overlayCSS:{background:"#fff",opacity:.6}}),a.post(woocommerce_admin_meta_boxes.ajax_url,g,function(b){e.append(b),"variable"!==f&&e.find(".enable_variation").hide(),a(document.body).trigger("wc-enhanced-select-init"),c(),e.unblock(),a(document.body).trigger("woocommerce_added_attribute")}),d&&(a("select.attribute_taxonomy").find('option[value="'+d+'"]').attr("disabled","disabled"),a("select.attribute_taxonomy").val("")),!1}),a(".product_attributes").on("blur","input.attribute_name",function(){a(this).closest(".woocommerce_attribute").find("strong.attribute_name").text(a(this).val())}),a(".product_attributes").on("click","button.select_all_attributes",function(){return a(this).closest("td").find("select option").attr("selected","selected"),a(this).closest("td").find("select").change(),!1}),a(".product_attributes").on("click","button.select_no_attributes",function(){return a(this).closest("td").find("select option").removeAttr("selected"),a(this).closest("td").find("select").change(),!1}),a(".product_attributes").on("click",".remove_row",function(){if(window.confirm(woocommerce_admin_meta_boxes.remove_attribute)){var b=a(this).parent().parent();b.is(".taxonomy")?(b.find("select, input[type=text]").val(""),b.hide(),a("select.attribute_taxonomy").find('option[value="'+b.data("taxonomy")+'"]').removeAttr("disabled")):(b.find("select, input[type=text]").val(""),b.hide(),c())}return!1}),a(".product_attributes").sortable({items:".woocommerce_attribute",cursor:"move",axis:"y",handle:"h3",scrollSensitivity:40,forcePlaceholderSize:!0,helper:"clone",opacity:.65,placeholder:"wc-metabox-sortable-placeholder",start:function(a,b){b.item.css("background-color","#f6f6f6")},stop:function(a,b){b.item.removeAttr("style"),c()}}),a(".product_attributes").on("click","button.add_new_attribute",function(){a(".product_attributes").block({message:null,overlayCSS:{background:"#fff",opacity:.6}});var b=a(this).closest(".woocommerce_attribute"),c=b.data("taxonomy"),d=window.prompt(woocommerce_admin_meta_boxes.new_attribute_prompt);if(d){var e={action:"woocommerce_add_new_attribute",taxonomy:c,term:d,security:woocommerce_admin_meta_boxes.add_attribute_nonce};a.post(woocommerce_admin_meta_boxes.ajax_url,e,function(c){c.error?window.alert(c.error):c.slug&&(b.find("select.attribute_values").append('<option value="'+c.slug+'" selected="selected">'+c.name+"</option>"),b.find("select.attribute_values").change()),a(".product_attributes").unblock()})}else a(".product_attributes").unblock();return!1}),a(".save_attributes").on("click",function(){a("#woocommerce-product-data").block({message:null,overlayCSS:{background:"#fff",opacity:.6}});var b={post_id:woocommerce_admin_meta_boxes.post_id,data:a(".product_attributes").find("input, select, textarea").serialize(),action:"woocommerce_save_attributes",security:woocommerce_admin_meta_boxes.save_attributes_nonce};a.post(woocommerce_admin_meta_boxes.ajax_url,b,function(){var b=window.location.toString();b=b.replace("post-new.php?","post.php?post="+woocommerce_admin_meta_boxes.post_id+"&action=edit&"),a("#variable_product_options").load(b+" #variable_product_options_inner",function(){a("#variable_product_options").trigger("reload")})})});var e,f;jQuery(document.body).on("click",".upload_file_button",function(b){var c=a(this);if(f=c.closest("tr").find("td.file_url input"),b.preventDefault(),e)return void e.open();var d=[new wp.media.controller.Library({library:wp.media.query(),multiple:!0,title:c.data("choose"),priority:20,filterable:"uploaded"})];e=wp.media.frames.downloadable_file=wp.media({title:c.data("choose"),library:{type:""},button:{text:c.data("update")},multiple:!0,states:d}),e.on("select",function(){var a="",b=e.state().get("selection");b.map(function(b){b=b.toJSON(),b.url&&(a=b.url)}),f.val(a).change()}),e.on("ready",function(){e.uploader.options.uploader.params={type:"downloadable_product"}}),e.open()}),jQuery(".downloadable_files tbody").sortable({items:"tr",cursor:"move",axis:"y",handle:"td.sort",scrollSensitivity:40,forcePlaceholderSize:!0,helper:"clone",opacity:.65});var g,h=a("#product_image_gallery"),i=a("#product_images_container").find("ul.product_images");jQuery(".add_product_images").on("click","a",function(b){var c=a(this);return b.preventDefault(),g?void g.open():(g=wp.media.frames.product_gallery=wp.media({title:c.data("choose"),button:{text:c.data("update")},states:[new wp.media.controller.Library({title:c.data("choose"),filterable:"all",multiple:!0})]}),g.on("select",function(){var a=g.state().get("selection"),b=h.val();a.map(function(a){if(a=a.toJSON(),a.id){b=b?b+","+a.id:a.id;var d=a.sizes&&a.sizes.thumbnail?a.sizes.thumbnail.url:a.url;i.append('<li class="image" data-attachment_id="'+a.id+'"><img src="'+d+'" /><ul class="actions"><li><a href="#" class="delete" title="'+c.data("delete")+'">'+c.data("text")+"</a></li></ul></li>")}}),h.val(b)}),void g.open())}),i.sortable({items:"li.image",cursor:"move",scrollSensitivity:40,forcePlaceholderSize:!0,forceHelperSize:!1,helper:"clone",opacity:.65,placeholder:"wc-metabox-sortable-placeholder",start:function(a,b){b.item.css("background-color","#f6f6f6")},stop:function(a,b){b.item.removeAttr("style")},update:function(){var b="";a("#product_images_container").find("ul li.image").css("cursor","default").each(function(){var a=jQuery(this).attr("data-attachment_id");b=b+a+","}),h.val(b)}}),a("#product_images_container").on("click","a.delete",function(){a(this).closest("li.image").remove();var b="";return a("#product_images_container").find("ul li.image").css("cursor","default").each(function(){var a=jQuery(this).attr("data-attachment_id");b=b+a+","}),h.val(b),a("#tiptip_holder").removeAttr("style"),a("#tiptip_arrow").removeAttr("style"),!1})});
\ No newline at end of file
+jQuery(function(a){function b(){var b=a("select#product-type").val(),c=a("input#_virtual:checked").length,d=a("input#_downloadable:checked").length,e=".hide_if_downloadable, .hide_if_virtual",f=".show_if_downloadable, .show_if_virtual";a.each(woocommerce_admin_meta_boxes.product_types,function(a,b){e=e+", .hide_if_"+b,f=f+", .show_if_"+b}),a(e).show(),a(f).hide(),d&&a(".show_if_downloadable").show(),c&&a(".show_if_virtual").show(),a(".show_if_"+b).show(),d&&a(".hide_if_downloadable").hide(),c&&a(".hide_if_virtual").hide(),a(".hide_if_"+b).hide(),a("input#_manage_stock").change(),a(".woocommerce_options_panel").each(function(){var b=a(this).children(".options_group");if(0!==b.length){var c=b.filter(function(){return"none"===a(this).css("display")});if(c.length===b.length){var d=a(this).prop("id");a(".product_data_tabs").find('li a[href="#'+d+'"]').parent().hide()}}})}function c(){a(".product_attributes .woocommerce_attribute").each(function(b,c){a(".attribute_position",c).val(parseInt(a(c).index(".product_attributes .woocommerce_attribute"),10))})}a(function(){a('[id$="-all"] > ul.categorychecklist').each(function(){var b=a(this),c=b.find(":checked").first();if(c.length){var d=b.find("input").position().top,e=c.position().top;b.closest(".tabs-panel").scrollTop(e-d+5)}})}),a("#upsell_product_data").bind("keypress",function(a){if(13===a.keyCode)return!1}),a(".type_box").appendTo("#woocommerce-product-data .hndle span"),a(function(){a("#woocommerce-product-data").find(".hndle").unbind("click.postboxes"),a("#woocommerce-product-data").on("click",".hndle",function(b){a(b.target).filter("input, option, label, select").length||a("#woocommerce-product-data").toggleClass("closed")})}),a("#catalog-visibility").find(".edit-catalog-visibility").click(function(){return a("#catalog-visibility-select").is(":hidden")&&(a("#catalog-visibility-select").slideDown("fast"),a(this).hide()),!1}),a("#catalog-visibility").find(".save-post-visibility").click(function(){a("#catalog-visibility-select").slideUp("fast"),a("#catalog-visibility").find(".edit-catalog-visibility").show();var b=a("input[name=_visibility]:checked").attr("data-label");return a("input[name=_featured]").is(":checked")&&(b=b+", "+woocommerce_admin_meta_boxes.featured_label,a("input[name=_featured]").attr("checked","checked")),a("#catalog-visibility-display").text(b),!1}),a("#catalog-visibility").find(".cancel-post-visibility").click(function(){a("#catalog-visibility-select").slideUp("fast"),a("#catalog-visibility").find(".edit-catalog-visibility").show();var b=a("#current_visibility").val(),c=a("#current_featured").val();a("input[name=_visibility]").removeAttr("checked"),a("input[name=_visibility][value="+b+"]").attr("checked","checked");var d=a("input[name=_visibility]:checked").attr("data-label");return"yes"===c?(d=d+", "+woocommerce_admin_meta_boxes.featured_label,a("input[name=_featured]").attr("checked","checked")):a("input[name=_featured]").removeAttr("checked"),a("#catalog-visibility-display").text(d),!1}),a("select#product-type").change(function(){var c=a(this).val();"variable"===c?(a("input#_manage_stock").change(),a("input#_downloadable").prop("checked",!1),a("input#_virtual").removeAttr("checked")):"grouped"===c?(a("input#_downloadable").prop("checked",!1),a("input#_virtual").removeAttr("checked")):"external"===c&&(a("input#_downloadable").prop("checked",!1),a("input#_virtual").removeAttr("checked")),b(),a("ul.wc-tabs li:visible").eq(0).find("a").click(),a(document.body).trigger("woocommerce-product-type-change",c,a(this))}).change(),a("input#_downloadable, input#_virtual").change(function(){b()}),a(".sale_price_dates_fields").each(function(){var b=a(this),c=!1,d=b.closest("div, table");b.find("input").each(function(){""!==a(this).val()&&(c=!0)}),c?(d.find(".sale_schedule").hide(),d.find(".sale_price_dates_fields").show()):(d.find(".sale_schedule").show(),d.find(".sale_price_dates_fields").hide())}),a("#woocommerce-product-data").on("click",".sale_schedule",function(){var b=a(this).closest("div, table");return a(this).hide(),b.find(".cancel_sale_schedule").show(),b.find(".sale_price_dates_fields").show(),!1}),a("#woocommerce-product-data").on("click",".cancel_sale_schedule",function(){var b=a(this).closest("div, table");return a(this).hide(),b.find(".sale_schedule").show(),b.find(".sale_price_dates_fields").hide(),b.find(".sale_price_dates_fields").find("input").val(""),!1}),a("#woocommerce-product-data").on("click",".downloadable_files a.insert",function(){return a(this).closest(".downloadable_files").find("tbody").append(a(this).data("row")),!1}),a("#woocommerce-product-data").on("click",".downloadable_files a.delete",function(){return a(this).closest("tr").remove(),!1}),a("input#_manage_stock").change(function(){a(this).is(":checked")?a("div.stock_fields").show():a("div.stock_fields").hide()}).change(),a(".sale_price_dates_fields").each(function(){var b=a(this).find("input").datepicker({defaultDate:"",dateFormat:"yy-mm-dd",numberOfMonths:1,showButtonPanel:!0,onSelect:function(c){var d=a(this).is("#_sale_price_dates_from, .sale_price_dates_from")?"minDate":"maxDate",e=a(this).data("datepicker"),f=a.datepicker.parseDate(e.settings.dateFormat||a.datepicker._defaults.dateFormat,c,e.settings);b.not(this).datepicker("option",d,f)}})});var d=a(".product_attributes").find(".woocommerce_attribute").get();d.sort(function(b,c){var d=parseInt(a(b).attr("rel"),10),e=parseInt(a(c).attr("rel"),10);return d<e?-1:d>e?1:0}),a(d).each(function(b,c){a(".product_attributes").append(c)}),a(".product_attributes .woocommerce_attribute").each(function(b,c){"none"!==a(c).css("display")&&a(c).is(".taxonomy")&&a("select.attribute_taxonomy").find('option[value="'+a(c).data("taxonomy")+'"]').attr("disabled","disabled")}),a("button.add_attribute").on("click",function(){var b=a(".product_attributes .woocommerce_attribute").length,d=a("select.attribute_taxonomy").val(),e=a(this).closest("#product_attributes"),f=e.find(".product_attributes"),g=a("select#product-type").val(),h={action:"woocommerce_add_attribute",taxonomy:d,i:b,security:woocommerce_admin_meta_boxes.add_attribute_nonce};return e.block({message:null,overlayCSS:{background:"#fff",opacity:.6}}),a.post(woocommerce_admin_meta_boxes.ajax_url,h,function(b){f.append(b),"variable"!==g&&f.find(".enable_variation").hide(),a(document.body).trigger("wc-enhanced-select-init"),c(),e.unblock(),a(document.body).trigger("woocommerce_added_attribute")}),d&&(a("select.attribute_taxonomy").find('option[value="'+d+'"]').attr("disabled","disabled"),a("select.attribute_taxonomy").val("")),!1}),a(".product_attributes").on("blur","input.attribute_name",function(){a(this).closest(".woocommerce_attribute").find("strong.attribute_name").text(a(this).val())}),a(".product_attributes").on("click","button.select_all_attributes",function(){return a(this).closest("td").find("select option").attr("selected","selected"),a(this).closest("td").find("select").change(),!1}),a(".product_attributes").on("click","button.select_no_attributes",function(){return a(this).closest("td").find("select option").removeAttr("selected"),a(this).closest("td").find("select").change(),!1}),a(".product_attributes").on("click",".remove_row",function(){if(window.confirm(woocommerce_admin_meta_boxes.remove_attribute)){var b=a(this).parent().parent();b.is(".taxonomy")?(b.find("select, input[type=text]").val(""),b.hide(),a("select.attribute_taxonomy").find('option[value="'+b.data("taxonomy")+'"]').removeAttr("disabled")):(b.find("select, input[type=text]").val(""),b.hide(),c())}return!1}),a(".product_attributes").sortable({items:".woocommerce_attribute",cursor:"move",axis:"y",handle:"h3",scrollSensitivity:40,forcePlaceholderSize:!0,helper:"clone",opacity:.65,placeholder:"wc-metabox-sortable-placeholder",start:function(a,b){b.item.css("background-color","#f6f6f6")},stop:function(a,b){b.item.removeAttr("style"),c()}}),a(".product_attributes").on("click","button.add_new_attribute",function(){a(".product_attributes").block({message:null,overlayCSS:{background:"#fff",opacity:.6}});var b=a(this).closest(".woocommerce_attribute"),c=b.data("taxonomy"),d=window.prompt(woocommerce_admin_meta_boxes.new_attribute_prompt);if(d){var e={action:"woocommerce_add_new_attribute",taxonomy:c,term:d,security:woocommerce_admin_meta_boxes.add_attribute_nonce};a.post(woocommerce_admin_meta_boxes.ajax_url,e,function(c){c.error?window.alert(c.error):c.slug&&(b.find("select.attribute_values").append('<option value="'+c.term_id+'" selected="selected">'+c.name+"</option>"),b.find("select.attribute_values").change()),a(".product_attributes").unblock()})}else a(".product_attributes").unblock();return!1}),a(".save_attributes").on("click",function(){a("#woocommerce-product-data").block({message:null,overlayCSS:{background:"#fff",opacity:.6}});var b={post_id:woocommerce_admin_meta_boxes.post_id,product_type:a("#product-type").val(),data:a(".product_attributes").find("input, select, textarea").serialize(),action:"woocommerce_save_attributes",security:woocommerce_admin_meta_boxes.save_attributes_nonce};a.post(woocommerce_admin_meta_boxes.ajax_url,b,function(){var b=window.location.toString();b=b.replace("post-new.php?","post.php?post="+woocommerce_admin_meta_boxes.post_id+"&action=edit&"),a("#variable_product_options").load(b+" #variable_product_options_inner",function(){a("#variable_product_options").trigger("reload")})})});var e,f;a(document.body).on("click",".upload_file_button",function(b){var c=a(this);if(f=c.closest("tr").find("td.file_url input"),b.preventDefault(),e)return void e.open();var d=[new wp.media.controller.Library({library:wp.media.query(),multiple:!0,title:c.data("choose"),priority:20,filterable:"uploaded"})];e=wp.media.frames.downloadable_file=wp.media({title:c.data("choose"),library:{type:""},button:{text:c.data("update")},multiple:!0,states:d}),e.on("select",function(){var a="",b=e.state().get("selection");b.map(function(b){b=b.toJSON(),b.url&&(a=b.url)}),f.val(a).change()}),e.on("ready",function(){e.uploader.options.uploader.params={type:"downloadable_product"}}),e.open()}),a(".downloadable_files tbody").sortable({items:"tr",cursor:"move",axis:"y",handle:"td.sort",scrollSensitivity:40,forcePlaceholderSize:!0,helper:"clone",opacity:.65});var g,h=a("#product_image_gallery"),i=a("#product_images_container").find("ul.product_images");a(".add_product_images").on("click","a",function(b){var c=a(this);return b.preventDefault(),g?void g.open():(g=wp.media.frames.product_gallery=wp.media({title:c.data("choose"),button:{text:c.data("update")},states:[new wp.media.controller.Library({title:c.data("choose"),filterable:"all",multiple:!0})]}),g.on("select",function(){var a=g.state().get("selection"),b=h.val();a.map(function(a){if(a=a.toJSON(),a.id){b=b?b+","+a.id:a.id;var d=a.sizes&&a.sizes.thumbnail?a.sizes.thumbnail.url:a.url;i.append('<li class="image" data-attachment_id="'+a.id+'"><img src="'+d+'" /><ul class="actions"><li><a href="#" class="delete" title="'+c.data("delete")+'">'+c.data("text")+"</a></li></ul></li>")}}),h.val(b)}),void g.open())}),i.sortable({items:"li.image",cursor:"move",scrollSensitivity:40,forcePlaceholderSize:!0,forceHelperSize:!1,helper:"clone",opacity:.65,placeholder:"wc-metabox-sortable-placeholder",start:function(a,b){b.item.css("background-color","#f6f6f6")},stop:function(a,b){b.item.removeAttr("style")},update:function(){var b="";a("#product_images_container").find("ul li.image").css("cursor","default").each(function(){var c=a(this).attr("data-attachment_id");b=b+c+","}),h.val(b)}}),a("#product_images_container").on("click","a.delete",function(){a(this).closest("li.image").remove();var b="";return a("#product_images_container").find("ul li.image").css("cursor","default").each(function(){var c=a(this).attr("data-attachment_id");b=b+c+","}),h.val(b),a("#tiptip_holder").removeAttr("style"),a("#tiptip_arrow").removeAttr("style"),!1})});
\ No newline at end of file
diff --git a/assets/js/admin/meta-boxes.js b/assets/js/admin/meta-boxes.js
index bb5624a5781..39c35e4da06 100644
--- a/assets/js/admin/meta-boxes.js
+++ b/assets/js/admin/meta-boxes.js
@@ -20,7 +20,7 @@ jQuery( function ( $ ) {
 		var code = event.keyCode || event.which;
 
 		// Tab key
-		if ( code === '9' && $( '#woocommerce-coupon-description' ).size() > 0 ) {
+		if ( code === '9' && $( '#woocommerce-coupon-description' ).length > 0 ) {
 			event.stopPropagation();
 			$( '#woocommerce-coupon-description' ).focus();
 			return false;
diff --git a/assets/js/admin/meta-boxes.min.js b/assets/js/admin/meta-boxes.min.js
index cf4df08995b..69d1ef2aa6e 100644
--- a/assets/js/admin/meta-boxes.min.js
+++ b/assets/js/admin/meta-boxes.min.js
@@ -1 +1 @@
-jQuery(function(a){function b(){a("#tiptip_holder").removeAttr("style"),a("#tiptip_arrow").removeAttr("style"),a(".tips").tipTip({attribute:"data-tip",fadeIn:50,fadeOut:50,delay:200})}b(),a("#titlediv").find("#title").keyup(function(b){var c=b.keyCode||b.which;return"9"===c&&a("#woocommerce-coupon-description").size()>0?(b.stopPropagation(),a("#woocommerce-coupon-description").focus(),!1):void 0}),a(".wc-metaboxes-wrapper").on("click",".wc-metabox > h3",function(){a(this).parent(".wc-metabox").toggleClass("closed").toggleClass("open")}),a(document.body).on("wc-init-tabbed-panels",function(){a("ul.wc-tabs").show(),a("ul.wc-tabs a").click(function(b){b.preventDefault();var c=a(this).closest("div.panel-wrap");a("ul.wc-tabs li",c).removeClass("active"),a(this).parent().addClass("active"),a("div.panel",c).hide(),a(a(this).attr("href")).show()}),a("div.panel-wrap").each(function(){a(this).find("ul.wc-tabs li").eq(0).find("a").click()})}).trigger("wc-init-tabbed-panels"),a(document.body).on("wc-init-datepickers",function(){a(".date-picker-field, .date-picker").datepicker({dateFormat:"yy-mm-dd",numberOfMonths:1,showButtonPanel:!0})}).trigger("wc-init-datepickers"),a(".wc-metaboxes-wrapper").on("click",".wc-metabox h3",function(b){a(b.target).filter(":input, option, .sort").length||a(this).next(".wc-metabox-content").stop().slideToggle()}).on("click",".expand_all",function(){return a(this).closest(".wc-metaboxes-wrapper").find(".wc-metabox > .wc-metabox-content").show(),!1}).on("click",".close_all",function(){return a(this).closest(".wc-metaboxes-wrapper").find(".wc-metabox > .wc-metabox-content").hide(),!1}),a(".wc-metabox.closed").each(function(){a(this).find(".wc-metabox-content").hide()})});
\ No newline at end of file
+jQuery(function(a){function b(){a("#tiptip_holder").removeAttr("style"),a("#tiptip_arrow").removeAttr("style"),a(".tips").tipTip({attribute:"data-tip",fadeIn:50,fadeOut:50,delay:200})}b(),a("#titlediv").find("#title").keyup(function(b){var c=b.keyCode||b.which;if("9"===c&&a("#woocommerce-coupon-description").length>0)return b.stopPropagation(),a("#woocommerce-coupon-description").focus(),!1}),a(".wc-metaboxes-wrapper").on("click",".wc-metabox > h3",function(){a(this).parent(".wc-metabox").toggleClass("closed").toggleClass("open")}),a(document.body).on("wc-init-tabbed-panels",function(){a("ul.wc-tabs").show(),a("ul.wc-tabs a").click(function(b){b.preventDefault();var c=a(this).closest("div.panel-wrap");a("ul.wc-tabs li",c).removeClass("active"),a(this).parent().addClass("active"),a("div.panel",c).hide(),a(a(this).attr("href")).show()}),a("div.panel-wrap").each(function(){a(this).find("ul.wc-tabs li").eq(0).find("a").click()})}).trigger("wc-init-tabbed-panels"),a(document.body).on("wc-init-datepickers",function(){a(".date-picker-field, .date-picker").datepicker({dateFormat:"yy-mm-dd",numberOfMonths:1,showButtonPanel:!0})}).trigger("wc-init-datepickers"),a(".wc-metaboxes-wrapper").on("click",".wc-metabox h3",function(b){a(b.target).filter(":input, option, .sort").length||a(this).next(".wc-metabox-content").stop().slideToggle()}).on("click",".expand_all",function(){return a(this).closest(".wc-metaboxes-wrapper").find(".wc-metabox > .wc-metabox-content").show(),!1}).on("click",".close_all",function(){return a(this).closest(".wc-metaboxes-wrapper").find(".wc-metabox > .wc-metabox-content").hide(),!1}),a(".wc-metabox.closed").each(function(){a(this).find(".wc-metabox-content").hide()})});
\ No newline at end of file
diff --git a/assets/js/admin/order-backbone-modal.min.js b/assets/js/admin/order-backbone-modal.min.js
deleted file mode 100644
index a3721ff1122..00000000000
--- a/assets/js/admin/order-backbone-modal.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(a,b,c){"use strict";a.fn.WCBackboneModal=function(b){return this.each(function(){new a.WCBackboneModal(a(this),b)})},a.WCBackboneModal=function(b,c){var d=a.extend({},a.WCBackboneModal.defaultOptions,c);d.template&&new a.WCBackboneModal.View({target:d.template,string:d.variable})},a.WCBackboneModal.defaultOptions={template:"",variable:{}},a.WCBackboneModal.View=b.View.extend({tagName:"div",id:"wc-backbone-modal-dialog",_target:void 0,_string:void 0,events:{"click .modal-close":"closeButton","click #btn-ok":"addButton","touchstart #btn-ok":"addButton",keydown:"keyboardActions"},initialize:function(a){this._target=a.target,this._string=a.string,c.bindAll(this,"render"),this.render()},render:function(){var b=wp.template(this._target);this.$el.attr("tabindex","0").append(b(this._string)),a(document.body).css({overflow:"hidden"}).append(this.$el);var c=a(".wc-backbone-modal-content").find("article"),d=c.height()<90?90:c.height(),e=a(window).height()-200;e>400&&(e=400),d>e?c.css({overflow:"auto",height:e+"px"}):c.css({overflow:"visible",height:d>90?"auto":d+"px"}),a(".wc-backbone-modal-content").css({"margin-top":"-"+a(".wc-backbone-modal-content").height()/2+"px","margin-left":"-"+a(".wc-backbone-modal-content").width()/2+"px"}),a(document.body).trigger("wc_backbone_modal_loaded",this._target)},closeButton:function(b){b.preventDefault(),a(document.body).trigger("wc_backbone_modal_before_remove",this._target),this.undelegateEvents(),a(document).off("focusin"),a(document.body).css({overflow:"auto"}),this.remove(),a(document.body).trigger("wc_backbone_modal_removed",this._target)},addButton:function(b){a(document.body).trigger("wc_backbone_modal_response",[this._target,this.getFormData()]),this.closeButton(b)},getFormData:function(){var b={};return a(document.body).trigger("wc_backbone_modal_before_update",this._target),a.each(a("form",this.$el).serializeArray(),function(c,d){b.hasOwnProperty(d.name)?(b[d.name]=a.makeArray(b[d.name]),b[d.name].push(d.value)):b[d.name]=d.value}),b},keyboardActions:function(a){var b=a.keyCode||a.which;13!==b||a.target.tagName&&("input"===a.target.tagName.toLowerCase()||"textarea"===a.target.tagName.toLowerCase())||this.addButton(a),27===b&&this.closeButton(a)}})}(jQuery,Backbone,_);
\ No newline at end of file
diff --git a/assets/js/admin/product-ordering.js b/assets/js/admin/product-ordering.js
index f855db832eb..9c2075eb5cd 100644
--- a/assets/js/admin/product-ordering.js
+++ b/assets/js/admin/product-ordering.js
@@ -1,7 +1,7 @@
 /*global ajaxurl */
 
 /**
- * Based on Simple Page Ordering by 10up (http://wordpress.org/extend/plugins/simple-page-ordering/)
+ * Based on Simple Page Ordering by 10up (https://wordpress.org/plugins/simple-page-ordering/)
  *
  * Modified - products have no children (non hierarchical)
  */
@@ -21,17 +21,7 @@ jQuery( function( $ ) {
 			return ui;
 		},
 		start: function( event, ui ) {
-			ui.placeholder.children().each( function() {
-				var $original = ui.item.children().eq( ui.placeholder.children().index( this ) ),
-					$this = $( this );
-
-				$.each( $original[0].attributes, function( k, attr ) {
-					$this.attr( attr.name, attr.value );
-				});
-			});
-			if ( ! ui.item.hasClass( 'alternate' ) ) {
-				ui.item.css( 'background-color', '#ffffff' );
-			}
+			ui.item.css( 'background-color', '#ffffff' );
 			ui.item.children( 'td, th' ).css( 'border-bottom-width', '0' );
 			ui.item.css( 'outline', '1px solid #dfdfdf' );
 		},
diff --git a/assets/js/admin/product-ordering.min.js b/assets/js/admin/product-ordering.min.js
index 4cef2c48d92..de12cba6afa 100644
--- a/assets/js/admin/product-ordering.min.js
+++ b/assets/js/admin/product-ordering.min.js
@@ -1 +1 @@
-jQuery(function(a){a("table.widefat tbody th, table.widefat tbody td").css("cursor","move"),a("table.widefat tbody").sortable({items:"tr:not(.inline-edit-row)",cursor:"move",axis:"y",containment:"table.widefat",scrollSensitivity:40,helper:function(b,c){return c.each(function(){a(this).width(a(this).width())}),c},start:function(b,c){c.placeholder.children().each(function(){var b=c.item.children().eq(c.placeholder.children().index(this)),d=a(this);a.each(b[0].attributes,function(a,b){d.attr(b.name,b.value)})}),c.item.hasClass("alternate")||c.item.css("background-color","#ffffff"),c.item.children("td, th").css("border-bottom-width","0"),c.item.css("outline","1px solid #dfdfdf")},stop:function(a,b){b.item.removeAttr("style"),b.item.children("td,th").css("border-bottom-width","1px")},update:function(b,c){a("table.widefat tbody th, table.widefat tbody td").css("cursor","default"),a("table.widefat tbody").sortable("disable");var d=c.item.find(".check-column input").val(),e=c.item.prev().find(".check-column input").val(),f=c.item.next().find(".check-column input").val();c.item.find(".check-column input").hide().after('<img alt="processing" src="images/wpspin_light.gif" class="waiting" style="margin-left: 6px;" />'),a.post(ajaxurl,{action:"woocommerce_product_ordering",id:d,previd:e,nextid:f},function(b){a.each(b,function(b,c){a("#inline_"+b+" .menu_order").html(c)}),c.item.find(".check-column input").show().siblings("img").remove(),a("table.widefat tbody th, table.widefat tbody td").css("cursor","move"),a("table.widefat tbody").sortable("enable")}),a("table.widefat tbody tr").each(function(){var b=a("table.widefat tbody tr").index(this);b%2===0?a(this).addClass("alternate"):a(this).removeClass("alternate")})}})});
\ No newline at end of file
+jQuery(function(a){a("table.widefat tbody th, table.widefat tbody td").css("cursor","move"),a("table.widefat tbody").sortable({items:"tr:not(.inline-edit-row)",cursor:"move",axis:"y",containment:"table.widefat",scrollSensitivity:40,helper:function(b,c){return c.each(function(){a(this).width(a(this).width())}),c},start:function(a,b){b.item.css("background-color","#ffffff"),b.item.children("td, th").css("border-bottom-width","0"),b.item.css("outline","1px solid #dfdfdf")},stop:function(a,b){b.item.removeAttr("style"),b.item.children("td,th").css("border-bottom-width","1px")},update:function(b,c){a("table.widefat tbody th, table.widefat tbody td").css("cursor","default"),a("table.widefat tbody").sortable("disable");var d=c.item.find(".check-column input").val(),e=c.item.prev().find(".check-column input").val(),f=c.item.next().find(".check-column input").val();c.item.find(".check-column input").hide().after('<img alt="processing" src="images/wpspin_light.gif" class="waiting" style="margin-left: 6px;" />'),a.post(ajaxurl,{action:"woocommerce_product_ordering",id:d,previd:e,nextid:f},function(b){a.each(b,function(b,c){a("#inline_"+b+" .menu_order").html(c)}),c.item.find(".check-column input").show().siblings("img").remove(),a("table.widefat tbody th, table.widefat tbody td").css("cursor","move"),a("table.widefat tbody").sortable("enable")}),a("table.widefat tbody tr").each(function(){var b=a("table.widefat tbody tr").index(this);b%2===0?a(this).addClass("alternate"):a(this).removeClass("alternate")})}})});
\ No newline at end of file
diff --git a/assets/js/admin/quick-edit.js b/assets/js/admin/quick-edit.js
index ca1dbfaf630..21c8964ef02 100644
--- a/assets/js/admin/quick-edit.js
+++ b/assets/js/admin/quick-edit.js
@@ -1,4 +1,4 @@
-/*global ajaxurl, inlineEditPost, inlineEditL10n */
+/*global inlineEditPost, woocommerce_admin */
 jQuery(function( $ ) {
 	$( '#the-list' ).on( 'click', '.editinline', function() {
 
@@ -28,9 +28,12 @@ jQuery(function( $ ) {
 			tax_class      = $wc_inline_data.find( '.tax_class' ).text(),
 			backorders     = $wc_inline_data.find( '.backorders' ).text();
 
+		var formatted_regular_price = regular_price.replace('.', woocommerce_admin.mon_decimal_point ),
+			formatted_sale_price	= sale_price.replace('.', woocommerce_admin.mon_decimal_point );
+
 		$( 'input[name="_sku"]', '.inline-edit-row' ).val( sku );
-		$( 'input[name="_regular_price"]', '.inline-edit-row' ).val( regular_price );
-		$( 'input[name="_sale_price"]', '.inline-edit-row' ).val( sale_price );
+		$( 'input[name="_regular_price"]', '.inline-edit-row' ).val( formatted_regular_price );
+		$( 'input[name="_sale_price"]', '.inline-edit-row' ).val( formatted_sale_price );
 		$( 'input[name="_weight"]', '.inline-edit-row' ).val( weight );
 		$( 'input[name="_length"]', '.inline-edit-row' ).val( length );
 		$( 'input[name="_width"]', '.inline-edit-row' ).val( width );
@@ -101,10 +104,6 @@ jQuery(function( $ ) {
 		$( 'input.text', '.inline-edit-row' ).val( '' );
 		$( '#woocommerce-fields' ).find( 'select' ).prop( 'selectedIndex', 0 );
 		$( '#woocommerce-fields-bulk' ).find( '.inline-edit-group .change-input' ).hide();
-
-		// Autosuggest product tags on bulk edit
-		var tax = 'product_tag';
-		$( 'tr.inline-editor textarea[name="tax_input[' + tax + ']"]' ).suggest( ajaxurl + '?action=ajax-tag-search&tax=' + tax, { delay: 500, minchars: 2, multiple: true, multipleSep: inlineEditL10n.comma } );
 	});
 
 	$( '#wpbody' ).on( 'change', '#woocommerce-fields-bulk .inline-edit-group .change_to', function() {
diff --git a/assets/js/admin/quick-edit.min.js b/assets/js/admin/quick-edit.min.js
index 549395d247c..affe9fc31a9 100644
--- a/assets/js/admin/quick-edit.min.js
+++ b/assets/js/admin/quick-edit.min.js
@@ -1 +1 @@
-jQuery(function(a){a("#the-list").on("click",".editinline",function(){inlineEditPost.revert();var b=a(this).closest("tr").attr("id");b=b.replace("post-","");var c=a("#woocommerce_inline_"+b),d=c.find(".sku").text(),e=c.find(".regular_price").text(),f=c.find(".sale_price ").text(),g=c.find(".weight").text(),h=c.find(".length").text(),i=c.find(".width").text(),j=c.find(".height").text(),k=c.find(".shipping_class").text(),l=c.find(".visibility").text(),m=c.find(".stock_status").text(),n=c.find(".stock").text(),o=c.find(".featured").text(),p=c.find(".manage_stock").text(),q=c.find(".menu_order").text(),r=c.find(".tax_status").text(),s=c.find(".tax_class").text(),t=c.find(".backorders").text();a('input[name="_sku"]',".inline-edit-row").val(d),a('input[name="_regular_price"]',".inline-edit-row").val(e),a('input[name="_sale_price"]',".inline-edit-row").val(f),a('input[name="_weight"]',".inline-edit-row").val(g),a('input[name="_length"]',".inline-edit-row").val(h),a('input[name="_width"]',".inline-edit-row").val(i),a('input[name="_height"]',".inline-edit-row").val(j),a('select[name="_shipping_class"] option:selected',".inline-edit-row").attr("selected",!1).change(),a('select[name="_shipping_class"] option[value="'+k+'"]').attr("selected","selected").change(),a('input[name="_stock"]',".inline-edit-row").val(n),a('input[name="menu_order"]',".inline-edit-row").val(q),a('select[name="_tax_status"] option, select[name="_tax_class"] option, select[name="_visibility"] option, select[name="_stock_status"] option, select[name="_backorders"] option').removeAttr("selected"),a('select[name="_tax_status"] option[value="'+r+'"]',".inline-edit-row").attr("selected","selected"),a('select[name="_tax_class"] option[value="'+s+'"]',".inline-edit-row").attr("selected","selected"),a('select[name="_visibility"] option[value="'+l+'"]',".inline-edit-row").attr("selected","selected"),a('select[name="_stock_status"] option[value="'+m+'"]',".inline-edit-row").attr("selected","selected"),a('select[name="_backorders"] option[value="'+t+'"]',".inline-edit-row").attr("selected","selected"),"yes"===o?a('input[name="_featured"]',".inline-edit-row").attr("checked","checked"):a('input[name="_featured"]',".inline-edit-row").removeAttr("checked"),"yes"===p?(a(".stock_qty_field",".inline-edit-row").show().removeAttr("style"),a('input[name="_manage_stock"]',".inline-edit-row").attr("checked","checked")):(a(".stock_qty_field",".inline-edit-row").hide(),a('input[name="_manage_stock"]',".inline-edit-row").removeAttr("checked"));var u=c.find(".product_type").text(),v=c.find(".product_is_virtual").text();"simple"===u||"external"===u?a(".price_fields",".inline-edit-row").show().removeAttr("style"):a(".price_fields",".inline-edit-row").hide(),"yes"===v?a(".dimension_fields",".inline-edit-row").hide():a(".dimension_fields",".inline-edit-row").show().removeAttr("style"),"grouped"===u?a(".stock_fields",".inline-edit-row").hide():a(".stock_fields",".inline-edit-row").show().removeAttr("style")}),a("#the-list").on("change",'.inline-edit-row input[name="_manage_stock"]',function(){a(this).is(":checked")?a(".stock_qty_field",".inline-edit-row").show().removeAttr("style"):a(".stock_qty_field",".inline-edit-row").hide()}),a("#wpbody").on("click","#doaction, #doaction2",function(){a("input.text",".inline-edit-row").val(""),a("#woocommerce-fields").find("select").prop("selectedIndex",0),a("#woocommerce-fields-bulk").find(".inline-edit-group .change-input").hide();var b="product_tag";a('tr.inline-editor textarea[name="tax_input['+b+']"]').suggest(ajaxurl+"?action=ajax-tag-search&tax="+b,{delay:500,minchars:2,multiple:!0,multipleSep:inlineEditL10n.comma})}),a("#wpbody").on("change","#woocommerce-fields-bulk .inline-edit-group .change_to",function(){0<a(this).val()?a(this).closest("div").find(".change-input").show():a(this).closest("div").find(".change-input").hide()})});
\ No newline at end of file
+jQuery(function(a){a("#the-list").on("click",".editinline",function(){inlineEditPost.revert();var b=a(this).closest("tr").attr("id");b=b.replace("post-","");var c=a("#woocommerce_inline_"+b),d=c.find(".sku").text(),e=c.find(".regular_price").text(),f=c.find(".sale_price ").text(),g=c.find(".weight").text(),h=c.find(".length").text(),i=c.find(".width").text(),j=c.find(".height").text(),k=c.find(".shipping_class").text(),l=c.find(".visibility").text(),m=c.find(".stock_status").text(),n=c.find(".stock").text(),o=c.find(".featured").text(),p=c.find(".manage_stock").text(),q=c.find(".menu_order").text(),r=c.find(".tax_status").text(),s=c.find(".tax_class").text(),t=c.find(".backorders").text(),u=e.replace(".",woocommerce_admin.mon_decimal_point),v=f.replace(".",woocommerce_admin.mon_decimal_point);a('input[name="_sku"]',".inline-edit-row").val(d),a('input[name="_regular_price"]',".inline-edit-row").val(u),a('input[name="_sale_price"]',".inline-edit-row").val(v),a('input[name="_weight"]',".inline-edit-row").val(g),a('input[name="_length"]',".inline-edit-row").val(h),a('input[name="_width"]',".inline-edit-row").val(i),a('input[name="_height"]',".inline-edit-row").val(j),a('select[name="_shipping_class"] option:selected',".inline-edit-row").attr("selected",!1).change(),a('select[name="_shipping_class"] option[value="'+k+'"]').attr("selected","selected").change(),a('input[name="_stock"]',".inline-edit-row").val(n),a('input[name="menu_order"]',".inline-edit-row").val(q),a('select[name="_tax_status"] option, select[name="_tax_class"] option, select[name="_visibility"] option, select[name="_stock_status"] option, select[name="_backorders"] option').removeAttr("selected"),a('select[name="_tax_status"] option[value="'+r+'"]',".inline-edit-row").attr("selected","selected"),a('select[name="_tax_class"] option[value="'+s+'"]',".inline-edit-row").attr("selected","selected"),a('select[name="_visibility"] option[value="'+l+'"]',".inline-edit-row").attr("selected","selected"),a('select[name="_stock_status"] option[value="'+m+'"]',".inline-edit-row").attr("selected","selected"),a('select[name="_backorders"] option[value="'+t+'"]',".inline-edit-row").attr("selected","selected"),"yes"===o?a('input[name="_featured"]',".inline-edit-row").attr("checked","checked"):a('input[name="_featured"]',".inline-edit-row").removeAttr("checked"),"yes"===p?(a(".stock_qty_field",".inline-edit-row").show().removeAttr("style"),a('input[name="_manage_stock"]',".inline-edit-row").attr("checked","checked")):(a(".stock_qty_field",".inline-edit-row").hide(),a('input[name="_manage_stock"]',".inline-edit-row").removeAttr("checked"));var w=c.find(".product_type").text(),x=c.find(".product_is_virtual").text();"simple"===w||"external"===w?a(".price_fields",".inline-edit-row").show().removeAttr("style"):a(".price_fields",".inline-edit-row").hide(),"yes"===x?a(".dimension_fields",".inline-edit-row").hide():a(".dimension_fields",".inline-edit-row").show().removeAttr("style"),"grouped"===w?a(".stock_fields",".inline-edit-row").hide():a(".stock_fields",".inline-edit-row").show().removeAttr("style")}),a("#the-list").on("change",'.inline-edit-row input[name="_manage_stock"]',function(){a(this).is(":checked")?a(".stock_qty_field",".inline-edit-row").show().removeAttr("style"):a(".stock_qty_field",".inline-edit-row").hide()}),a("#wpbody").on("click","#doaction, #doaction2",function(){a("input.text",".inline-edit-row").val(""),a("#woocommerce-fields").find("select").prop("selectedIndex",0),a("#woocommerce-fields-bulk").find(".inline-edit-group .change-input").hide()}),a("#wpbody").on("change","#woocommerce-fields-bulk .inline-edit-group .change_to",function(){0<a(this).val()?a(this).closest("div").find(".change-input").show():a(this).closest("div").find(".change-input").hide()})});
\ No newline at end of file
diff --git a/assets/js/admin/reports.js b/assets/js/admin/reports.js
index b816208dfcf..0a3d1e8e0b5 100644
--- a/assets/js/admin/reports.js
+++ b/assets/js/admin/reports.js
@@ -3,7 +3,7 @@ jQuery(function( $ ) {
 	function showTooltip( x, y, contents ) {
 		$( '<div class="chart-tooltip">' + contents + '</div>' ).css( {
 			top: y - 16,
-	   		left: x + 20
+			left: x + 20
 		}).appendTo( 'body' ).fadeIn( 200 );
 	}
 
@@ -110,6 +110,7 @@ jQuery(function( $ ) {
 		defaultDate: '',
 		dateFormat: 'yy-mm-dd',
 		numberOfMonths: 1,
+		minDate: '-20Y',
 		maxDate: '+0D',
 		showButtonPanel: true,
 		showOn: 'focus',
@@ -136,26 +137,27 @@ jQuery(function( $ ) {
 		exclude_series    = exclude_series.split( ',' );
 		var xaxes_label   = $( this ).data( 'xaxes' );
 		var groupby       = $( this ) .data( 'groupby' );
+		var index_type    = $( this ).data( 'index_type' );
 		var export_format = $( this ).data( 'export' );
 		var csv_data      = 'data:application/csv;charset=utf-8,';
 		var s, series_data, d;
 
 		if ( 'table' === export_format ) {
 
-			$( this ).closest( 'div' ).find( 'thead tr,tbody tr' ).each( function() {
+			$( this ).offsetParent().find( 'thead tr,tbody tr' ).each( function() {
 				$( this ).find( 'th, td' ).each( function() {
 					var value = $( this ).text();
-					value = value.replace( '[?]', '' );
+					value = value.replace( '[?]', '' ).replace( '#', '' );
 					csv_data += '"' + value + '"' + ',';
 				});
 				csv_data = csv_data.substring( 0, csv_data.length - 1 );
 				csv_data += '\n';
 			});
 
-			$( this ).closest( 'div' ).find( 'tfoot tr' ).each( function() {
+			$( this ).offsetParent().find( 'tfoot tr' ).each( function() {
 				$( this ).find( 'th, td' ).each( function() {
 					var value = $( this ).text();
-					value = value.replace( '[?]', '' );
+					value = value.replace( '[?]', '' ).replace( '#', '' );
 					csv_data += '"' + value + '"' + ',';
 					if ( $( this ).attr( 'colspan' ) > 0 ) {
 						for ( i = 1; i < $(this).attr('colspan'); i++ ) {
@@ -175,7 +177,7 @@ jQuery(function( $ ) {
 
 			var the_series = window.main_chart.getData();
 			var series     = [];
-			csv_data      += xaxes_label + ',';
+			csv_data      += '"' + xaxes_label + '",';
 
 			$.each( the_series, function( index, value ) {
 				if ( ! exclude_series || $.inArray( index.toString(), exclude_series ) === -1 ) {
@@ -185,7 +187,7 @@ jQuery(function( $ ) {
 
 			// CSV Headers
 			for ( s = 0; s < series.length; ++s ) {
-				csv_data += series[s].label + ',';
+				csv_data += '"' + series[s].label + '",';
 			}
 
 			csv_data = csv_data.substring( 0, csv_data.length - 1 );
@@ -217,10 +219,14 @@ jQuery(function( $ ) {
 			$.each( xaxis, function( index, value ) {
 				var date = new Date( parseInt( index, 10 ) );
 
-				if ( groupby === 'day' ) {
-					csv_data += date.getUTCFullYear() + '-' + parseInt( date.getUTCMonth() + 1, 10 ) + '-' + date.getUTCDate() + ',';
+				if ( 'none' === index_type ) {
+					csv_data += '"' + index + '",';
 				} else {
-					csv_data += date.getUTCFullYear() + '-' + parseInt( date.getUTCMonth() + 1, 10 ) + ',';
+					if ( groupby === 'day' ) {
+						csv_data += '"' + date.getUTCFullYear() + '-' + parseInt( date.getUTCMonth() + 1, 10 ) + '-' + date.getUTCDate() + '",';
+					} else {
+						csv_data += '"' + date.getUTCFullYear() + '-' + parseInt( date.getUTCMonth() + 1, 10 ) + '",';
+					}
 				}
 
 				for ( var d = 0; d < value.length; ++d ) {
@@ -231,7 +237,7 @@ jQuery(function( $ ) {
 						val = val.toFixed( 2 );
 					}
 
-					csv_data += val + ',';
+					csv_data += '"' + val + '",';
 				}
 				csv_data = csv_data.substring( 0, csv_data.length - 1 );
 				csv_data += '\n';
diff --git a/assets/js/admin/reports.min.js b/assets/js/admin/reports.min.js
index 2f0b9c2c965..9cfd34c51fc 100644
--- a/assets/js/admin/reports.min.js
+++ b/assets/js/admin/reports.min.js
@@ -1 +1 @@
-jQuery(function(a){function b(b,c,d){a('<div class="chart-tooltip">'+d+"</div>").css({top:c-16,left:b+20}).appendTo("body").fadeIn(200)}var c=null,d=null;a(".chart-placeholder").bind("plothover",function(e,f,g){if(g){if((c!==g.dataIndex||d!==g.seriesIndex)&&(c=g.dataIndex,d=g.seriesIndex,a(".chart-tooltip").remove(),g.series.points.show||g.series.enable_tooltip)){var h=g.series.data[g.dataIndex][1],i="";g.series.prepend_label&&(i=i+g.series.label+": "),g.series.prepend_tooltip&&(i+=g.series.prepend_tooltip),i+=h,g.series.append_tooltip&&(i+=g.series.append_tooltip),g.series.pie.show?b(f.pageX,f.pageY,i):b(g.pageX,g.pageY,i)}}else a(".chart-tooltip").remove(),c=null}),a(".wc_sparkline.bars").each(function(){var b=a(this).data("sparkline"),c={grid:{show:!1}},d=[{data:b,color:a(this).data("color"),bars:{fillColor:a(this).data("color"),fill:!0,show:!0,lineWidth:1,barWidth:a(this).data("barwidth"),align:"center"},shadowSize:0}];a.plot(a(this),d,c)}),a(".wc_sparkline.lines").each(function(){var b=a(this).data("sparkline"),c={grid:{show:!1}},d=[{data:b,color:a(this).data("color"),lines:{fill:!1,show:!0,lineWidth:1,align:"center"},shadowSize:0}];a.plot(a(this),d,c)});var e=a(".range_datepicker").datepicker({changeMonth:!0,changeYear:!0,defaultDate:"",dateFormat:"yy-mm-dd",numberOfMonths:1,maxDate:"+0D",showButtonPanel:!0,showOn:"focus",buttonImageOnly:!0,onSelect:function(b){var c=a(this).is(".from")?"minDate":"maxDate",d=a(this).data("datepicker"),f=a.datepicker.parseDate(d.settings.dateFormat||a.datepicker._defaults.dateFormat,b,d.settings);e.not(this).datepicker("option",c,f)}}),f=document.createElement("a");"undefined"==typeof f.download&&a(".export_csv").hide(),a(".export_csv").click(function(){var b=a(this).data("exclude_series")||"";b=b.toString(),b=b.split(",");var c,d,e,f=a(this).data("xaxes"),g=a(this).data("groupby"),h=a(this).data("export"),i="data:application/csv;charset=utf-8,";if("table"===h)a(this).closest("div").find("thead tr,tbody tr").each(function(){a(this).find("th, td").each(function(){var b=a(this).text();b=b.replace("[?]",""),i+='"'+b+'",'}),i=i.substring(0,i.length-1),i+="\n"}),a(this).closest("div").find("tfoot tr").each(function(){a(this).find("th, td").each(function(){var b=a(this).text();if(b=b.replace("[?]",""),i+='"'+b+'",',a(this).attr("colspan")>0)for(m=1;m<a(this).attr("colspan");m++)i+='"",'}),i=i.substring(0,i.length-1),i+="\n"});else{if(!window.main_chart)return!1;var j=window.main_chart.getData(),k=[];for(i+=f+",",a.each(j,function(c,d){b&&-1!==a.inArray(c.toString(),b)||k.push(d)}),c=0;c<k.length;++c)i+=k[c].label+",";i=i.substring(0,i.length-1),i+="\n";var l={};for(c=0;c<k.length;++c)for(d=k[c].data,e=0;e<d.length;++e){l[d[e][0]]=[];for(var m=0;m<k.length;++m)l[d[e][0]].push(0)}for(c=0;c<k.length;++c)for(d=k[c].data,e=0;e<d.length;++e)l[d[e][0]][c]=d[e][1];a.each(l,function(a,b){var c=new Date(parseInt(a,10));i+="day"===g?c.getUTCFullYear()+"-"+parseInt(c.getUTCMonth()+1,10)+"-"+c.getUTCDate()+",":c.getUTCFullYear()+"-"+parseInt(c.getUTCMonth()+1,10)+",";for(var d=0;d<b.length;++d){var e=b[d];Math.round(e)!==e&&(e=parseFloat(e),e=e.toFixed(2)),i+=e+","}i=i.substring(0,i.length-1),i+="\n"})}return a(this).attr("href",encodeURI(i)),!0})});
\ No newline at end of file
+jQuery(function(a){function b(b,c,d){a('<div class="chart-tooltip">'+d+"</div>").css({top:c-16,left:b+20}).appendTo("body").fadeIn(200)}var c=null,d=null;a(".chart-placeholder").bind("plothover",function(e,f,g){if(g){if((c!==g.dataIndex||d!==g.seriesIndex)&&(c=g.dataIndex,d=g.seriesIndex,a(".chart-tooltip").remove(),g.series.points.show||g.series.enable_tooltip)){var h=g.series.data[g.dataIndex][1],i="";g.series.prepend_label&&(i=i+g.series.label+": "),g.series.prepend_tooltip&&(i+=g.series.prepend_tooltip),i+=h,g.series.append_tooltip&&(i+=g.series.append_tooltip),g.series.pie.show?b(f.pageX,f.pageY,i):b(g.pageX,g.pageY,i)}}else a(".chart-tooltip").remove(),c=null}),a(".wc_sparkline.bars").each(function(){var b=a(this).data("sparkline"),c={grid:{show:!1}},d=[{data:b,color:a(this).data("color"),bars:{fillColor:a(this).data("color"),fill:!0,show:!0,lineWidth:1,barWidth:a(this).data("barwidth"),align:"center"},shadowSize:0}];a.plot(a(this),d,c)}),a(".wc_sparkline.lines").each(function(){var b=a(this).data("sparkline"),c={grid:{show:!1}},d=[{data:b,color:a(this).data("color"),lines:{fill:!1,show:!0,lineWidth:1,align:"center"},shadowSize:0}];a.plot(a(this),d,c)});var e=a(".range_datepicker").datepicker({changeMonth:!0,changeYear:!0,defaultDate:"",dateFormat:"yy-mm-dd",numberOfMonths:1,minDate:"-20Y",maxDate:"+0D",showButtonPanel:!0,showOn:"focus",buttonImageOnly:!0,onSelect:function(b){var c=a(this).is(".from")?"minDate":"maxDate",d=a(this).data("datepicker"),f=a.datepicker.parseDate(d.settings.dateFormat||a.datepicker._defaults.dateFormat,b,d.settings);e.not(this).datepicker("option",c,f)}}),f=document.createElement("a");"undefined"==typeof f.download&&a(".export_csv").hide(),a(".export_csv").click(function(){var b=a(this).data("exclude_series")||"";b=b.toString(),b=b.split(",");var c,d,e,f=a(this).data("xaxes"),g=a(this).data("groupby"),h=a(this).data("index_type"),i=a(this).data("export"),j="data:application/csv;charset=utf-8,";if("table"===i)a(this).offsetParent().find("thead tr,tbody tr").each(function(){a(this).find("th, td").each(function(){var b=a(this).text();b=b.replace("[?]","").replace("#",""),j+='"'+b+'",'}),j=j.substring(0,j.length-1),j+="\n"}),a(this).offsetParent().find("tfoot tr").each(function(){a(this).find("th, td").each(function(){var b=a(this).text();if(b=b.replace("[?]","").replace("#",""),j+='"'+b+'",',a(this).attr("colspan")>0)for(n=1;n<a(this).attr("colspan");n++)j+='"",'}),j=j.substring(0,j.length-1),j+="\n"});else{if(!window.main_chart)return!1;var k=window.main_chart.getData(),l=[];for(j+='"'+f+'",',a.each(k,function(c,d){b&&a.inArray(c.toString(),b)!==-1||l.push(d)}),c=0;c<l.length;++c)j+='"'+l[c].label+'",';j=j.substring(0,j.length-1),j+="\n";var m={};for(c=0;c<l.length;++c)for(d=l[c].data,e=0;e<d.length;++e){m[d[e][0]]=[];for(var n=0;n<l.length;++n)m[d[e][0]].push(0)}for(c=0;c<l.length;++c)for(d=l[c].data,e=0;e<d.length;++e)m[d[e][0]][c]=d[e][1];a.each(m,function(a,b){var c=new Date(parseInt(a,10));j+="none"===h?'"'+a+'",':"day"===g?'"'+c.getUTCFullYear()+"-"+parseInt(c.getUTCMonth()+1,10)+"-"+c.getUTCDate()+'",':'"'+c.getUTCFullYear()+"-"+parseInt(c.getUTCMonth()+1,10)+'",';for(var d=0;d<b.length;++d){var e=b[d];Math.round(e)!==e&&(e=parseFloat(e),e=e.toFixed(2)),j+='"'+e+'",'}j=j.substring(0,j.length-1),j+="\n"})}return a(this).attr("href",encodeURI(j)),!0})});
\ No newline at end of file
diff --git a/assets/js/admin/settings-views-html-settings-tax.js b/assets/js/admin/settings-views-html-settings-tax.js
index 867e58fb7f3..495aac4e3c2 100644
--- a/assets/js/admin/settings-views-html-settings-tax.js
+++ b/assets/js/admin/settings-views-html-settings-tax.js
@@ -1,8 +1,8 @@
 /* global htmlSettingsTaxLocalizeScript, ajaxurl */
+
 /**
  * Used by woocommerce/includes/admin/settings/views/html-settings-tax.php
  */
-
 ( function( $, data, wp, ajaxurl ) {
 	$( function() {
 
@@ -39,7 +39,9 @@
 					var changes = this.changes || {};
 
 					_.each( changedRows, function( row, id ) {
-						changes[ id ] = _.extend( changes[ id ] || { tax_rate_id : id }, row );
+						changes[ id ] = _.extend( changes[ id ] || {
+							tax_rate_id : id
+						}, row );
 					} );
 
 					this.changes = changes;
@@ -82,7 +84,7 @@
 					Backbone.ajax({
 						method: 'POST',
 						dataType: 'json',
-						url: ajaxurl + '?action=woocommerce_tax_rates_save_changes',
+						url: ajaxurl + ( ajaxurl.indexOf( '?' ) > 0 ? '&' : '?' ) + 'action=woocommerce_tax_rates_save_changes',
 						data: {
 							current_class: data.current_class,
 							wc_tax_nonce: data.wc_tax_nonce,
@@ -95,6 +97,9 @@
 
 								WCTaxTableModelInstance.changes = {};
 								WCTaxTableModelInstance.trigger( 'saved:rates' );
+
+								// Reload view.
+								WCTaxTableInstance.render();
 							}
 
 							self.unblock();
@@ -114,8 +119,7 @@
 
 					this.listenTo( this.model, 'change:rates', this.setUnloadConfirmation );
 					this.listenTo( this.model, 'saved:rates', this.clearUnloadConfirmation );
-					$tbody.on( 'change', { view: this }, this.updateModelOnChange );
-					$tbody.on( 'sortupdate', { view: this }, this.updateModelOnSort );
+					$tbody.on( 'change autocompletechange', ':input', { view: this }, this.updateModelOnChange );
 					$search_field.on( 'keyup search', { view: this }, this.onSearchField );
 					$pagination.on( 'click', 'a', { view: this }, this.onPageChange );
 					$pagination.on( 'change', 'input', { view: this }, this.onPageChange );
@@ -173,13 +177,9 @@
 							current_page: this.page,
 							qty_pages:    qty_pages
 						} ) );
-					}
-
-					// Disable sorting if there is a search term filtering the items.
-					if ( $search_field.val() ) {
-						$tbody.sortable( 'disable' );
 					} else {
-						$tbody.sortable( 'enable' );
+						$pagination.empty();
+						view.page = 1;
 					}
 				},
 				updateUrl: function() {
@@ -243,6 +243,8 @@
 								return parseInt( val, 10 );
 							}
 						);
+						// Move the last page
+						view.page = view.qty_pages;
 					}
 
 					rates[ newRow.tax_rate_id ]   = newRow;
@@ -258,27 +260,13 @@
 						model   = view.model,
 						rates   = _.indexBy( model.get( 'rates' ), 'tax_rate_id' ),
 						changes = {},
-						$current, current_id, current_order, rates_to_reorder, reordered_rates;
+						$current, current_id;
 
 					event.preventDefault();
 
 					if ( $current = $tbody.children( '.current' ) ) {
 						$current.each(function(){
 							current_id    = $( this ).data('id');
-							current_order = parseInt( rates[ current_id ].tax_rate_order, 10 );
-
-							rates_to_reorder = _.filter( rates, function( rate ) {
-								if ( parseInt( rate.tax_rate_order, 10 ) > current_order ) {
-									return true;
-								}
-								return false;
-							} );
-
-							reordered_rates = _.map( rates_to_reorder, function( rate ) {
-								rate.tax_rate_order--;
-								changes[ rate.tax_rate_id ] = _.extend( changes[ rate.tax_rate_id ] || {}, { tax_rate_order : rate.tax_rate_order } );
-								return rate;
-							} );
 
 							delete rates[ current_id ];
 
@@ -368,55 +356,6 @@
 
 					model.setRateAttribute( id, attribute, val );
 				},
-				updateModelOnSort: function( event, ui ) {
-					var view         = event.data.view,
-						model        = view.model,
-						$tr          = ui.item,
-						tax_rate_id  = $tr.data( 'id' ),
-						rates        = _.indexBy( model.get( 'rates' ), 'tax_rate_id' ),
-						old_position = rates[ tax_rate_id ].tax_rate_order,
-						new_position = $tr.index() + ( ( view.page - 1 ) * view.per_page ),
-						which_way    = ( new_position > old_position ) ? 'higher' : 'lower',
-						changes      = {},
-						rates_to_reorder, reordered_rates;
-
-					rates_to_reorder = _.filter( rates, function( rate ) {
-						var order  = parseInt( rate.tax_rate_order, 10 ),
-							limits = [ old_position, new_position ];
-
-						if ( parseInt( rate.tax_rate_id, 10 ) === parseInt( tax_rate_id, 10 ) ) {
-							return true;
-						} else if ( order > _.min( limits ) && order < _.max( limits ) ) {
-							return true;
-						} else if ( 'higher' === which_way && order === _.max( limits ) ) {
-							return true;
-						} else if ( 'lower' === which_way && order === _.min( limits ) ) {
-							return true;
-						}
-						return false;
-					} );
-
-					reordered_rates = _.map( rates_to_reorder, function( rate ) {
-						var order = parseInt( rate.tax_rate_order, 10 );
-
-						if ( parseInt( rate.tax_rate_id, 10 ) === parseInt( tax_rate_id, 10 ) ) {
-							rate.tax_rate_order = new_position;
-						} else if ( 'higher' === which_way ) {
-							rate.tax_rate_order = order - 1;
-						} else if ( 'lower' === which_way ) {
-							rate.tax_rate_order = order + 1;
-						}
-
-						changes[ rate.tax_rate_id ] = _.extend( changes[ rate.tax_rate_id ] || {}, { tax_rate_order : rate.tax_rate_order } );
-
-						return rate;
-					} );
-
-					if ( reordered_rates.length ) {
-						model.logChanges( changes );
-						view.render(); // temporary, probably should get yanked.
-					}
-				},
 				sanitizePage: function( page_num ) {
 					page_num = parseInt( page_num, 10 );
 					if ( page_num < 1 ) {
@@ -432,8 +371,6 @@
 			} ),
 			WCTaxTableInstance = new WCTaxTableViewConstructor({
 				model:    WCTaxTableModelInstance,
-				// page:     data.page,  // I'd prefer to have these two specified down here in the instance,
-				// per_page: data.limit, // but it doesn't seem to recognize them in render if I do. :\
 				el:       '#rates'
 			} );
 
diff --git a/assets/js/admin/settings-views-html-settings-tax.min.js b/assets/js/admin/settings-views-html-settings-tax.min.js
index a3305d72181..39172b9bd62 100644
--- a/assets/js/admin/settings-views-html-settings-tax.min.js
+++ b/assets/js/admin/settings-views-html-settings-tax.min.js
@@ -1 +1 @@
-!function(a,b,c,d){a(function(){String.prototype.trim||(String.prototype.trim=function(){return this.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,"")});var e=c.template("wc-tax-table-row"),f=c.template("wc-tax-table-row-empty"),g=c.template("wc-tax-table-pagination"),h=a(".wc_tax_rates"),i=a("#rates"),j=a('input[name="save"]'),k=a("#rates-pagination"),l=a("#rates-search .wc-tax-rates-search-field"),m=a(".submit .button-primary[type=submit]"),n=Backbone.Model.extend({changes:{},setRateAttribute:function(a,b,c){var d=_.indexBy(this.get("rates"),"tax_rate_id"),e={};d[a][b]!==c&&(e[a]={},e[a][b]=c,d[a][b]=c),this.logChanges(e)},logChanges:function(a){var b=this.changes||{};_.each(a,function(a,c){b[c]=_.extend(b[c]||{tax_rate_id:c},a)}),this.changes=b,this.trigger("change:rates")},getFilteredRates:function(){var a=this.get("rates"),b=l.val().toLowerCase();return b.length&&(a=_.filter(a,function(a){var c=_.toArray(a).join(" ").toLowerCase();return-1!==c.indexOf(b)})),a=_.sortBy(a,function(a){return parseInt(a.tax_rate_order,10)})},block:function(){a(".wc_tax_rates").block({message:null,overlayCSS:{background:"#fff",opacity:.6}})},unblock:function(){a(".wc_tax_rates").unblock()},save:function(){var a=this;a.block(),Backbone.ajax({method:"POST",dataType:"json",url:d+"?action=woocommerce_tax_rates_save_changes",data:{current_class:b.current_class,wc_tax_nonce:b.wc_tax_nonce,changes:a.changes},success:function(b,c){"success"===c&&(p.set("rates",b.data.rates),p.trigger("change:rates"),p.changes={},p.trigger("saved:rates")),a.unblock()}})}}),o=Backbone.View.extend({rowTemplate:e,per_page:b.limit,page:b.page,initialize:function(){var c=Math.ceil(_.toArray(this.model.get("rates")).length/this.per_page);this.qty_pages=0===c?1:c,this.page=this.sanitizePage(b.page),this.listenTo(this.model,"change:rates",this.setUnloadConfirmation),this.listenTo(this.model,"saved:rates",this.clearUnloadConfirmation),i.on("change",{view:this},this.updateModelOnChange),i.on("sortupdate",{view:this},this.updateModelOnSort),l.on("keyup search",{view:this},this.onSearchField),k.on("click","a",{view:this},this.onPageChange),k.on("change","input",{view:this},this.onPageChange),a(window).on("beforeunload",{view:this},this.unloadConfirmation),m.on("click",{view:this},this.onSubmit),j.attr("disabled","disabled"),h.find(".insert").on("click",{view:this},this.onAddNewRow),h.find(".remove_tax_rates").on("click",{view:this},this.onDeleteRow),h.find(".export").on("click",{view:this},this.onExport)},render:function(){var c=this.model.getFilteredRates(),d=_.size(c),e=Math.ceil(d/this.per_page),h=0===d?0:this.per_page*(this.page-1),j=this.per_page*this.page,m=_.toArray(c).slice(h,j),n=this;this.$el.empty(),m.length?a.each(m,function(a,b){n.$el.append(n.rowTemplate(b))}):n.$el.append(f()),this.$el.find("td.country input").autocomplete({source:b.countries,minLength:2}),this.$el.find("td.state input").autocomplete({source:b.states,minLength:3}),this.$el.find("td.postcode input, td.city input").change(function(){a(this).attr("name",a(this).data("name"))}),e>1&&k.html(g({qty_rates:d,current_page:this.page,qty_pages:e})),l.val()?i.sortable("disable"):i.sortable("enable")},updateUrl:function(){if(window.history.replaceState){var a=b.base_url,c=l.val();1<this.page&&(a+="&p="+encodeURIComponent(this.page)),c.length&&(a+="&s="+encodeURIComponent(c)),window.history.replaceState({},"",a)}},onSubmit:function(a){a.data.view.model.save(),a.preventDefault()},onAddNewRow:function(a){var c,d,e,f,g,h=a.data.view,j=h.model,k=_.indexBy(j.get("rates"),"tax_rate_id"),l={},m=_.size(k),n=_.extend({},b.default_rate,{tax_rate_id:"new-"+m+"-"+Date.now(),newRow:!0});c=i.children(".current"),c.length?(d=c.last().data("id"),e=parseInt(k[d].tax_rate_order,10),n.tax_rate_order=1+e,f=_.filter(k,function(a){return parseInt(a.tax_rate_order,10)>e?!0:!1}),g=_.map(f,function(a){return a.tax_rate_order++,l[a.tax_rate_id]=_.extend(l[a.tax_rate_id]||{},{tax_rate_order:a.tax_rate_order}),a})):n.tax_rate_order=1+_.max(_.pluck(k,"tax_rate_order"),function(a){return parseInt(a,10)}),k[n.tax_rate_id]=n,l[n.tax_rate_id]=n,j.set("rates",k),j.logChanges(l),h.render()},onDeleteRow:function(c){var d,e,f,g,h,j=c.data.view,k=j.model,l=_.indexBy(k.get("rates"),"tax_rate_id"),m={};c.preventDefault(),(d=i.children(".current"))?(d.each(function(){e=a(this).data("id"),f=parseInt(l[e].tax_rate_order,10),g=_.filter(l,function(a){return parseInt(a.tax_rate_order,10)>f?!0:!1}),h=_.map(g,function(a){return a.tax_rate_order--,m[a.tax_rate_id]=_.extend(m[a.tax_rate_id]||{},{tax_rate_order:a.tax_rate_order}),a}),delete l[e],m[e]=_.extend(m[e]||{},{deleted:"deleted"})}),k.set("rates",l),k.logChanges(m),j.render()):window.alert(b.strings.no_rows_selected)},onSearchField:function(a){a.data.view.updateUrl(),a.data.view.render()},onPageChange:function(b){var c=a(b.currentTarget);b.preventDefault(),b.data.view.page=c.data("goto")?c.data("goto"):c.val(),b.data.view.render(),b.data.view.updateUrl()},onExport:function(c){var d="data:application/csv;charset=utf-8,"+b.strings.csv_data_cols.join(",")+"\n";return a.each(c.data.view.model.getFilteredRates(),function(a,c){var e="";e+=c.tax_rate_country+",",e+=c.tax_rate_state+",",e+=(c.postcode?c.postcode.join("; "):"")+",",e+=(c.city?c.city.join("; "):"")+",",e+=c.tax_rate+",",e+=c.tax_rate_name+",",e+=c.tax_rate_priority+",",e+=c.tax_rate_compound+",",e+=c.tax_rate_shipping+",",e+=b.current_class,d+=e+"\n"}),a(this).attr("href",encodeURI(d)),!0},setUnloadConfirmation:function(){this.needsUnloadConfirm=!0,j.removeAttr("disabled")},clearUnloadConfirmation:function(){this.needsUnloadConfirm=!1,j.attr("disabled","disabled")},unloadConfirmation:function(a){return a.data.view.needsUnloadConfirm?(a.returnValue=b.strings.unload_confirmation_msg,window.event.returnValue=b.strings.unload_confirmation_msg,b.strings.unload_confirmation_msg):void 0},updateModelOnChange:function(b){var c=b.data.view.model,d=a(b.target),e=d.closest("tr").data("id"),f=d.data("attribute"),g=d.val();("city"===f||"postcode"===f)&&(g=g.split(";"),g=a.map(g,function(a){return a.trim()})),("tax_rate_compound"===f||"tax_rate_shipping"===f)&&(g=d.is(":checked")?1:0),c.setRateAttribute(e,f,g)},updateModelOnSort:function(a,b){var c,d,e=a.data.view,f=e.model,g=b.item,h=g.data("id"),i=_.indexBy(f.get("rates"),"tax_rate_id"),j=i[h].tax_rate_order,k=g.index()+(e.page-1)*e.per_page,l=k>j?"higher":"lower",m={};c=_.filter(i,function(a){var b=parseInt(a.tax_rate_order,10),c=[j,k];return parseInt(a.tax_rate_id,10)===parseInt(h,10)?!0:b>_.min(c)&&b<_.max(c)?!0:"higher"===l&&b===_.max(c)?!0:"lower"===l&&b===_.min(c)?!0:!1}),d=_.map(c,function(a){var b=parseInt(a.tax_rate_order,10);return parseInt(a.tax_rate_id,10)===parseInt(h,10)?a.tax_rate_order=k:"higher"===l?a.tax_rate_order=b-1:"lower"===l&&(a.tax_rate_order=b+1),m[a.tax_rate_id]=_.extend(m[a.tax_rate_id]||{},{tax_rate_order:a.tax_rate_order}),a}),d.length&&(f.logChanges(m),e.render())},sanitizePage:function(a){return a=parseInt(a,10),1>a?a=1:a>this.qty_pages&&(a=this.qty_pages),a}}),p=new n({rates:b.rates}),q=new o({model:p,el:"#rates"});q.render()})}(jQuery,htmlSettingsTaxLocalizeScript,wp,ajaxurl);
\ No newline at end of file
+!function(a,b,c,d){a(function(){String.prototype.trim||(String.prototype.trim=function(){return this.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,"")});var e=c.template("wc-tax-table-row"),f=c.template("wc-tax-table-row-empty"),g=c.template("wc-tax-table-pagination"),h=a(".wc_tax_rates"),i=a("#rates"),j=a('input[name="save"]'),k=a("#rates-pagination"),l=a("#rates-search .wc-tax-rates-search-field"),m=a(".submit .button-primary[type=submit]"),n=Backbone.Model.extend({changes:{},setRateAttribute:function(a,b,c){var d=_.indexBy(this.get("rates"),"tax_rate_id"),e={};d[a][b]!==c&&(e[a]={},e[a][b]=c,d[a][b]=c),this.logChanges(e)},logChanges:function(a){var b=this.changes||{};_.each(a,function(a,c){b[c]=_.extend(b[c]||{tax_rate_id:c},a)}),this.changes=b,this.trigger("change:rates")},getFilteredRates:function(){var a=this.get("rates"),b=l.val().toLowerCase();return b.length&&(a=_.filter(a,function(a){var c=_.toArray(a).join(" ").toLowerCase();return-1!==c.indexOf(b)})),a=_.sortBy(a,function(a){return parseInt(a.tax_rate_order,10)})},block:function(){a(".wc_tax_rates").block({message:null,overlayCSS:{background:"#fff",opacity:.6}})},unblock:function(){a(".wc_tax_rates").unblock()},save:function(){var a=this;a.block(),Backbone.ajax({method:"POST",dataType:"json",url:d+(d.indexOf("?")>0?"&":"?")+"action=woocommerce_tax_rates_save_changes",data:{current_class:b.current_class,wc_tax_nonce:b.wc_tax_nonce,changes:a.changes},success:function(b,c){"success"===c&&(p.set("rates",b.data.rates),p.trigger("change:rates"),p.changes={},p.trigger("saved:rates"),q.render()),a.unblock()}})}}),o=Backbone.View.extend({rowTemplate:e,per_page:b.limit,page:b.page,initialize:function(){var c=Math.ceil(_.toArray(this.model.get("rates")).length/this.per_page);this.qty_pages=0===c?1:c,this.page=this.sanitizePage(b.page),this.listenTo(this.model,"change:rates",this.setUnloadConfirmation),this.listenTo(this.model,"saved:rates",this.clearUnloadConfirmation),i.on("change autocompletechange",":input",{view:this},this.updateModelOnChange),l.on("keyup search",{view:this},this.onSearchField),k.on("click","a",{view:this},this.onPageChange),k.on("change","input",{view:this},this.onPageChange),a(window).on("beforeunload",{view:this},this.unloadConfirmation),m.on("click",{view:this},this.onSubmit),j.attr("disabled","disabled"),h.find(".insert").on("click",{view:this},this.onAddNewRow),h.find(".remove_tax_rates").on("click",{view:this},this.onDeleteRow),h.find(".export").on("click",{view:this},this.onExport)},render:function(){var c=this.model.getFilteredRates(),d=_.size(c),e=Math.ceil(d/this.per_page),h=0===d?0:this.per_page*(this.page-1),i=this.per_page*this.page,j=_.toArray(c).slice(h,i),l=this;this.$el.empty(),j.length?a.each(j,function(a,b){l.$el.append(l.rowTemplate(b))}):l.$el.append(f()),this.$el.find("td.country input").autocomplete({source:b.countries,minLength:2}),this.$el.find("td.state input").autocomplete({source:b.states,minLength:3}),this.$el.find("td.postcode input, td.city input").change(function(){a(this).attr("name",a(this).data("name"))}),e>1?k.html(g({qty_rates:d,current_page:this.page,qty_pages:e})):(k.empty(),l.page=1)},updateUrl:function(){if(window.history.replaceState){var a=b.base_url,c=l.val();1<this.page&&(a+="&p="+encodeURIComponent(this.page)),c.length&&(a+="&s="+encodeURIComponent(c)),window.history.replaceState({},"",a)}},onSubmit:function(a){a.data.view.model.save(),a.preventDefault()},onAddNewRow:function(a){var c,d,e,f,g,h=a.data.view,j=h.model,k=_.indexBy(j.get("rates"),"tax_rate_id"),l={},m=_.size(k),n=_.extend({},b.default_rate,{tax_rate_id:"new-"+m+"-"+Date.now(),newRow:!0});c=i.children(".current"),c.length?(d=c.last().data("id"),e=parseInt(k[d].tax_rate_order,10),n.tax_rate_order=1+e,f=_.filter(k,function(a){return parseInt(a.tax_rate_order,10)>e}),g=_.map(f,function(a){return a.tax_rate_order++,l[a.tax_rate_id]=_.extend(l[a.tax_rate_id]||{},{tax_rate_order:a.tax_rate_order}),a})):(n.tax_rate_order=1+_.max(_.pluck(k,"tax_rate_order"),function(a){return parseInt(a,10)}),h.page=h.qty_pages),k[n.tax_rate_id]=n,l[n.tax_rate_id]=n,j.set("rates",k),j.logChanges(l),h.render()},onDeleteRow:function(c){var d,e,f=c.data.view,g=f.model,h=_.indexBy(g.get("rates"),"tax_rate_id"),j={};c.preventDefault(),(d=i.children(".current"))?(d.each(function(){e=a(this).data("id"),delete h[e],j[e]=_.extend(j[e]||{},{deleted:"deleted"})}),g.set("rates",h),g.logChanges(j),f.render()):window.alert(b.strings.no_rows_selected)},onSearchField:function(a){a.data.view.updateUrl(),a.data.view.render()},onPageChange:function(b){var c=a(b.currentTarget);b.preventDefault(),b.data.view.page=c.data("goto")?c.data("goto"):c.val(),b.data.view.render(),b.data.view.updateUrl()},onExport:function(c){var d="data:application/csv;charset=utf-8,"+b.strings.csv_data_cols.join(",")+"\n";return a.each(c.data.view.model.getFilteredRates(),function(a,c){var e="";e+=c.tax_rate_country+",",e+=c.tax_rate_state+",",e+=(c.postcode?c.postcode.join("; "):"")+",",e+=(c.city?c.city.join("; "):"")+",",e+=c.tax_rate+",",e+=c.tax_rate_name+",",e+=c.tax_rate_priority+",",e+=c.tax_rate_compound+",",e+=c.tax_rate_shipping+",",e+=b.current_class,d+=e+"\n"}),a(this).attr("href",encodeURI(d)),!0},setUnloadConfirmation:function(){this.needsUnloadConfirm=!0,j.removeAttr("disabled")},clearUnloadConfirmation:function(){this.needsUnloadConfirm=!1,j.attr("disabled","disabled")},unloadConfirmation:function(a){if(a.data.view.needsUnloadConfirm)return a.returnValue=b.strings.unload_confirmation_msg,window.event.returnValue=b.strings.unload_confirmation_msg,b.strings.unload_confirmation_msg},updateModelOnChange:function(b){var c=b.data.view.model,d=a(b.target),e=d.closest("tr").data("id"),f=d.data("attribute"),g=d.val();"city"!==f&&"postcode"!==f||(g=g.split(";"),g=a.map(g,function(a){return a.trim()})),"tax_rate_compound"!==f&&"tax_rate_shipping"!==f||(g=d.is(":checked")?1:0),c.setRateAttribute(e,f,g)},sanitizePage:function(a){return a=parseInt(a,10),a<1?a=1:a>this.qty_pages&&(a=this.qty_pages),a}}),p=new n({rates:b.rates}),q=new o({model:p,el:"#rates"});q.render()})}(jQuery,htmlSettingsTaxLocalizeScript,wp,ajaxurl);
\ No newline at end of file
diff --git a/assets/js/admin/settings.js b/assets/js/admin/settings.js
index 46791e69801..0f722f2830f 100644
--- a/assets/js/admin/settings.js
+++ b/assets/js/admin/settings.js
@@ -1,44 +1,67 @@
 /* global woocommerce_settings_params */
-jQuery( window ).load( function() {
+( function( $ ) {
 
-	// Countries
-	jQuery( 'select#woocommerce_allowed_countries, select#woocommerce_ship_to_countries' ).change( function() {
-		if ( jQuery( this ).val() === 'specific' ) {
-			jQuery( this ).parent().parent().next( 'tr' ).show();
+	// Sell Countries
+	$( 'select#woocommerce_allowed_countries' ).change( function() {
+		if ( 'specific' === $( this ).val() ) {
+			$( this ).closest('tr').next( 'tr' ).hide();
+			$( this ).closest('tr').next().next( 'tr' ).show();
+		} else if ( 'all_except' === $( this ).val() ) {
+			$( this ).closest('tr').next( 'tr' ).show();
+			$( this ).closest('tr').next().next( 'tr' ).hide();
 		} else {
-			jQuery( this ).parent().parent().next( 'tr' ).hide();
+			$( this ).closest('tr').next( 'tr' ).hide();
+			$( this ).closest('tr').next().next( 'tr' ).hide();
+		}
+	}).change();
+
+	// Ship Countries
+	$( 'select#woocommerce_ship_to_countries' ).change( function() {
+		if ( 'specific' === $( this ).val() ) {
+			$( this ).closest('tr').next( 'tr' ).show();
+		} else {
+			$( this ).closest('tr').next( 'tr' ).hide();
+		}
+	}).change();
+
+	// Stock management
+	$( 'input#woocommerce_manage_stock' ).change( function() {
+		if ( $( this ).is(':checked') ) {
+			$( this ).closest('tbody').find( '.manage_stock_field' ).closest( 'tr' ).show();
+		} else {
+			$( this ).closest('tbody').find( '.manage_stock_field' ).closest( 'tr' ).hide();
 		}
 	}).change();
 
 	// Color picker
-	jQuery( '.colorpick' ).iris({
+	$( '.colorpick' ).iris({
 		change: function( event, ui ) {
-			jQuery( this ).parent().find( '.colorpickpreview' ).css({ backgroundColor: ui.color.toString() });
+			$( this ).parent().find( '.colorpickpreview' ).css({ backgroundColor: ui.color.toString() });
 		},
 		hide: true,
 		border: true
 	}).click( function() {
-		jQuery( '.iris-picker' ).hide();
-		jQuery( this ).closest( 'td' ).find( '.iris-picker' ).show();
+		$( '.iris-picker' ).hide();
+		$( this ).closest( 'td' ).find( '.iris-picker' ).show();
 	});
 
-	jQuery( 'body' ).click( function() {
-		jQuery( '.iris-picker' ).hide();
+	$( 'body' ).click( function() {
+		$( '.iris-picker' ).hide();
 	});
 
-	jQuery( '.colorpick' ).click( function( event ) {
+	$( '.colorpick' ).click( function( event ) {
 		event.stopPropagation();
 	});
 
 	// Edit prompt
-	jQuery( function() {
+	$( function() {
 		var changed = false;
 
-		jQuery( 'input, textarea, select, checkbox' ).change( function() {
+		$( 'input, textarea, select, checkbox' ).change( function() {
 			changed = true;
 		});
 
-		jQuery( '.woo-nav-tab-wrapper a' ).click( function() {
+		$( '.woo-nav-tab-wrapper a' ).click( function() {
 			if ( changed ) {
 				window.onbeforeunload = function() {
 				    return woocommerce_settings_params.i18n_nav_warning;
@@ -48,13 +71,13 @@ jQuery( window ).load( function() {
 			}
 		});
 
-		jQuery( '.submit input' ).click( function() {
+		$( '.submit input' ).click( function() {
 			window.onbeforeunload = '';
 		});
 	});
 
 	// Sorting
-	jQuery( 'table.wc_gateways tbody, table.wc_shipping tbody' ).sortable({
+	$( 'table.wc_gateways tbody, table.wc_shipping tbody' ).sortable({
 		items: 'tr',
 		cursor: 'move',
 		axis: 'y',
@@ -62,7 +85,7 @@ jQuery( window ).load( function() {
 		scrollSensitivity: 40,
 		helper: function( event, ui ) {
 			ui.children().each( function() {
-				jQuery( this ).width( jQuery( this ).width() );
+				$( this ).width( $( this ).width() );
 			});
 			ui.css( 'left', '0' );
 			return ui;
@@ -76,15 +99,15 @@ jQuery( window ).load( function() {
 	});
 
 	// Select all/none
-	jQuery( '.woocommerce' ).on( 'click', '.select_all', function() {
-		jQuery( this ).closest( 'td' ).find( 'select option' ).attr( 'selected', 'selected' );
-		jQuery( this ).closest( 'td' ).find( 'select' ).trigger( 'change' );
+	$( '.woocommerce' ).on( 'click', '.select_all', function() {
+		$( this ).closest( 'td' ).find( 'select option' ).attr( 'selected', 'selected' );
+		$( this ).closest( 'td' ).find( 'select' ).trigger( 'change' );
 		return false;
 	});
 
-	jQuery( '.woocommerce' ).on( 'click', '.select_none', function() {
-		jQuery( this ).closest( 'td' ).find( 'select option' ).removeAttr( 'selected' );
-		jQuery( this ).closest( 'td' ).find( 'select' ).trigger( 'change' );
+	$( '.woocommerce' ).on( 'click', '.select_none', function() {
+		$( this ).closest( 'td' ).find( 'select option' ).removeAttr( 'selected' );
+		$( this ).closest( 'td' ).find( 'select' ).trigger( 'change' );
 		return false;
 	});
-});
+})( jQuery );
diff --git a/assets/js/admin/settings.min.js b/assets/js/admin/settings.min.js
index 1c85132b5d5..1f565fceb3d 100644
--- a/assets/js/admin/settings.min.js
+++ b/assets/js/admin/settings.min.js
@@ -1 +1 @@
-jQuery(window).load(function(){jQuery("select#woocommerce_allowed_countries, select#woocommerce_ship_to_countries").change(function(){"specific"===jQuery(this).val()?jQuery(this).parent().parent().next("tr").show():jQuery(this).parent().parent().next("tr").hide()}).change(),jQuery(".colorpick").iris({change:function(a,b){jQuery(this).parent().find(".colorpickpreview").css({backgroundColor:b.color.toString()})},hide:!0,border:!0}).click(function(){jQuery(".iris-picker").hide(),jQuery(this).closest("td").find(".iris-picker").show()}),jQuery("body").click(function(){jQuery(".iris-picker").hide()}),jQuery(".colorpick").click(function(a){a.stopPropagation()}),jQuery(function(){var a=!1;jQuery("input, textarea, select, checkbox").change(function(){a=!0}),jQuery(".woo-nav-tab-wrapper a").click(function(){a?window.onbeforeunload=function(){return woocommerce_settings_params.i18n_nav_warning}:window.onbeforeunload=""}),jQuery(".submit input").click(function(){window.onbeforeunload=""})}),jQuery("table.wc_gateways tbody, table.wc_shipping tbody").sortable({items:"tr",cursor:"move",axis:"y",handle:"td.sort",scrollSensitivity:40,helper:function(a,b){return b.children().each(function(){jQuery(this).width(jQuery(this).width())}),b.css("left","0"),b},start:function(a,b){b.item.css("background-color","#f6f6f6")},stop:function(a,b){b.item.removeAttr("style")}}),jQuery(".woocommerce").on("click",".select_all",function(){return jQuery(this).closest("td").find("select option").attr("selected","selected"),jQuery(this).closest("td").find("select").trigger("change"),!1}),jQuery(".woocommerce").on("click",".select_none",function(){return jQuery(this).closest("td").find("select option").removeAttr("selected"),jQuery(this).closest("td").find("select").trigger("change"),!1})});
\ No newline at end of file
+!function(a){a("select#woocommerce_allowed_countries").change(function(){"specific"===a(this).val()?(a(this).closest("tr").next("tr").hide(),a(this).closest("tr").next().next("tr").show()):"all_except"===a(this).val()?(a(this).closest("tr").next("tr").show(),a(this).closest("tr").next().next("tr").hide()):(a(this).closest("tr").next("tr").hide(),a(this).closest("tr").next().next("tr").hide())}).change(),a("select#woocommerce_ship_to_countries").change(function(){"specific"===a(this).val()?a(this).closest("tr").next("tr").show():a(this).closest("tr").next("tr").hide()}).change(),a("input#woocommerce_manage_stock").change(function(){a(this).is(":checked")?a(this).closest("tbody").find(".manage_stock_field").closest("tr").show():a(this).closest("tbody").find(".manage_stock_field").closest("tr").hide()}).change(),a(".colorpick").iris({change:function(b,c){a(this).parent().find(".colorpickpreview").css({backgroundColor:c.color.toString()})},hide:!0,border:!0}).click(function(){a(".iris-picker").hide(),a(this).closest("td").find(".iris-picker").show()}),a("body").click(function(){a(".iris-picker").hide()}),a(".colorpick").click(function(a){a.stopPropagation()}),a(function(){var b=!1;a("input, textarea, select, checkbox").change(function(){b=!0}),a(".woo-nav-tab-wrapper a").click(function(){b?window.onbeforeunload=function(){return woocommerce_settings_params.i18n_nav_warning}:window.onbeforeunload=""}),a(".submit input").click(function(){window.onbeforeunload=""})}),a("table.wc_gateways tbody, table.wc_shipping tbody").sortable({items:"tr",cursor:"move",axis:"y",handle:"td.sort",scrollSensitivity:40,helper:function(b,c){return c.children().each(function(){a(this).width(a(this).width())}),c.css("left","0"),c},start:function(a,b){b.item.css("background-color","#f6f6f6")},stop:function(a,b){b.item.removeAttr("style")}}),a(".woocommerce").on("click",".select_all",function(){return a(this).closest("td").find("select option").attr("selected","selected"),a(this).closest("td").find("select").trigger("change"),!1}),a(".woocommerce").on("click",".select_none",function(){return a(this).closest("td").find("select option").removeAttr("selected"),a(this).closest("td").find("select").trigger("change"),!1})}(jQuery);
\ No newline at end of file
diff --git a/assets/js/admin/system-status.js b/assets/js/admin/system-status.js
new file mode 100644
index 00000000000..12efd043065
--- /dev/null
+++ b/assets/js/admin/system-status.js
@@ -0,0 +1,121 @@
+/* global jQuery, woocommerce_admin_system_status */
+jQuery( function ( $ ) {
+
+	/**
+	 * Users country and state fields
+	 */
+	var wcSystemStatus = {
+		init: function() {
+			$( document.body )
+				.on( 'click', 'a.help_tip, a.woocommerce-help-tip', this.preventTipTipClick )
+				.on( 'click', 'a.debug-report', this.generateReport )
+				.on( 'copy', '#copy-for-support', this.copyReport )
+				.on( 'aftercopy', '#copy-for-support', this.afterCopyReport );
+		},
+
+		/**
+		 * Prevent anchor behavior when click on TipTip.
+		 *
+		 * @return {Bool}
+		 */
+		preventTipTipClick: function() {
+			return false;
+		},
+
+		/**
+		 * Generate system status report.
+		 *
+		 * @return {Bool}
+		 */
+		generateReport: function() {
+			var report = '';
+
+			$( '.wc_status_table thead, .wc_status_table tbody' ).each( function() {
+				if ( $( this ).is( 'thead' ) ) {
+					var label = $( this ).find( 'th:eq(0)' ).data( 'export-label' ) || $( this ).text();
+					report = report + '\n### ' + $.trim( label ) + ' ###\n\n';
+				} else {
+					$( 'tr', $( this ) ).each( function() {
+						var label       = $( this ).find( 'td:eq(0)' ).data( 'export-label' ) || $( this ).find( 'td:eq(0)' ).text();
+						var the_name    = $.trim( label ).replace( /(<([^>]+)>)/ig, '' ); // Remove HTML.
+
+						// Find value
+						var $value_html = $( this ).find( 'td:eq(2)' ).clone();
+						$value_html.find( '.private' ).remove();
+						$value_html.find( '.dashicons-yes' ).replaceWith( '&#10004;' );
+						$value_html.find( '.dashicons-no-alt, .dashicons-warning' ).replaceWith( '&#10060;' );
+
+						// Format value
+						var the_value   = $.trim( $value_html.text() );
+						var value_array = the_value.split( ', ' );
+
+						if ( value_array.length > 1 ) {
+							// If value have a list of plugins ','.
+							// Split to add new line.
+							var temp_line ='';
+							$.each( value_array, function( key, line ) {
+								temp_line = temp_line + line + '\n';
+							});
+
+							the_value = temp_line;
+						}
+
+						report = report + '' + the_name + ': ' + the_value + '\n';
+					});
+				}
+			});
+
+			try {
+				$( '#debug-report' ).slideDown();
+				$( '#debug-report' ).find( 'textarea' ).val( '`' + report + '`' ).focus().select();
+				$( this ).fadeOut();
+				return false;
+			} catch ( e ) {
+				/* jshint devel: true */
+				console.log( e );
+			}
+
+			return false;
+		},
+
+		/**
+		 * Copy for report.
+		 *
+		 * @param {Object} evt Copy event.
+		 */
+		copyReport: function( evt ) {
+			evt.clipboardData.clearData();
+			evt.clipboardData.setData( 'text/plain', $( '#debug-report' ).find( 'textarea' ).val() );
+			evt.preventDefault();
+		},
+
+		/**
+		 * Actions after copying the report.
+		 * Display a "Copied!" tip when success copied
+		 * or display an error message.
+		 *
+		 * @param {Object} evt Copy event.
+		 */
+		afterCopyReport: function( evt ) {
+			if ( true === evt.success['text/plain'] ) {
+				$( '#copy-for-support' ).tipTip({
+					'attribute':  'data-tip',
+					'activation': 'focus',
+					'fadeIn':     50,
+					'fadeOut':    50,
+					'delay':      0
+				}).focus();
+			} else {
+				$( '.copy-error' ).removeClass( 'hidden' );
+				$( '#debug-report' ).find( 'textarea' ).focus().select();
+			}
+		}
+	};
+
+	wcSystemStatus.init();
+
+	$( '#log-viewer-select' ).on( 'click', 'h2 a.page-title-action', function( evt ) {
+		evt.stopImmediatePropagation();
+		return window.confirm( woocommerce_admin_system_status.delete_log_confirmation );
+	});
+});
diff --git a/assets/js/admin/system-status.min.js b/assets/js/admin/system-status.min.js
new file mode 100644
index 00000000000..ee9e65ab63f
--- /dev/null
+++ b/assets/js/admin/system-status.min.js
@@ -0,0 +1 @@
+jQuery(function(a){var b={init:function(){a(document.body).on("click","a.help_tip, a.woocommerce-help-tip",this.preventTipTipClick).on("click","a.debug-report",this.generateReport).on("copy","#copy-for-support",this.copyReport).on("aftercopy","#copy-for-support",this.afterCopyReport)},preventTipTipClick:function(){return!1},generateReport:function(){var b="";a(".wc_status_table thead, .wc_status_table tbody").each(function(){if(a(this).is("thead")){var c=a(this).find("th:eq(0)").data("export-label")||a(this).text();b=b+"\n### "+a.trim(c)+" ###\n\n"}else a("tr",a(this)).each(function(){var c=a(this).find("td:eq(0)").data("export-label")||a(this).find("td:eq(0)").text(),d=a.trim(c).replace(/(<([^>]+)>)/gi,""),e=a(this).find("td:eq(2)").clone();e.find(".private").remove(),e.find(".dashicons-yes").replaceWith("&#10004;"),e.find(".dashicons-no-alt, .dashicons-warning").replaceWith("&#10060;");var f=a.trim(e.text()),g=f.split(", ");if(g.length>1){var h="";a.each(g,function(a,b){h=h+b+"\n"}),f=h}b=b+""+d+": "+f+"\n"})});try{return a("#debug-report").slideDown(),a("#debug-report").find("textarea").val("`"+b+"`").focus().select(),a(this).fadeOut(),!1}catch(a){console.log(a)}return!1},copyReport:function(b){b.clipboardData.clearData(),b.clipboardData.setData("text/plain",a("#debug-report").find("textarea").val()),b.preventDefault()},afterCopyReport:function(b){!0===b.success["text/plain"]?a("#copy-for-support").tipTip({attribute:"data-tip",activation:"focus",fadeIn:50,fadeOut:50,delay:0}).focus():(a(".copy-error").removeClass("hidden"),a("#debug-report").find("textarea").focus().select())}};b.init()});
\ No newline at end of file
diff --git a/assets/js/admin/wc-enhanced-select.js b/assets/js/admin/wc-enhanced-select.js
index 823ec617a5e..4634ecf6645 100644
--- a/assets/js/admin/wc-enhanced-select.js
+++ b/assets/js/admin/wc-enhanced-select.js
@@ -2,226 +2,216 @@
 jQuery( function( $ ) {
 
 	function getEnhancedSelectFormatString() {
-		var formatString = {
-			formatMatches: function( matches ) {
-				if ( 1 === matches ) {
-					return wc_enhanced_select_params.i18n_matches_1;
+		return {
+			'language': {
+				errorLoading: function() {
+					// Workaround for https://github.com/select2/select2/issues/4355 instead of i18n_ajax_error.
+					return wc_enhanced_select_params.i18n_searching;
+				},
+				inputTooLong: function( args ) {
+					var overChars = args.input.length - args.maximum;
+
+					if ( 1 === overChars ) {
+						return wc_enhanced_select_params.i18n_input_too_long_1;
+					}
+
+					return wc_enhanced_select_params.i18n_input_too_long_n.replace( '%qty%', overChars );
+				},
+				inputTooShort: function( args ) {
+					var remainingChars = args.minimum - args.input.length;
+
+					if ( 1 === remainingChars ) {
+						return wc_enhanced_select_params.i18n_input_too_short_1;
+					}
+
+					return wc_enhanced_select_params.i18n_input_too_short_n.replace( '%qty%', remainingChars );
+				},
+				loadingMore: function() {
+					return wc_enhanced_select_params.i18n_load_more;
+				},
+				maximumSelected: function( args ) {
+					if ( args.maximum === 1 ) {
+						return wc_enhanced_select_params.i18n_selection_too_long_1;
+					}
+
+					return wc_enhanced_select_params.i18n_selection_too_long_n.replace( '%qty%', args.maximum );
+				},
+				noResults: function() {
+					return wc_enhanced_select_params.i18n_no_matches;
+				},
+				searching: function() {
+					return wc_enhanced_select_params.i18n_searching;
 				}
-
-				return wc_enhanced_select_params.i18n_matches_n.replace( '%qty%', matches );
-			},
-			formatNoMatches: function() {
-				return wc_enhanced_select_params.i18n_no_matches;
-			},
-			formatAjaxError: function() {
-				return wc_enhanced_select_params.i18n_ajax_error;
-			},
-			formatInputTooShort: function( input, min ) {
-				var number = min - input.length;
-
-				if ( 1 === number ) {
-					return wc_enhanced_select_params.i18n_input_too_short_1;
-				}
-
-				return wc_enhanced_select_params.i18n_input_too_short_n.replace( '%qty%', number );
-			},
-			formatInputTooLong: function( input, max ) {
-				var number = input.length - max;
-
-				if ( 1 === number ) {
-					return wc_enhanced_select_params.i18n_input_too_long_1;
-				}
-
-				return wc_enhanced_select_params.i18n_input_too_long_n.replace( '%qty%', number );
-			},
-			formatSelectionTooBig: function( limit ) {
-				if ( 1 === limit ) {
-					return wc_enhanced_select_params.i18n_selection_too_long_1;
-				}
-
-				return wc_enhanced_select_params.i18n_selection_too_long_n.replace( '%qty%', limit );
-			},
-			formatLoadMore: function() {
-				return wc_enhanced_select_params.i18n_load_more;
-			},
-			formatSearching: function() {
-				return wc_enhanced_select_params.i18n_searching;
 			}
 		};
-
-		return formatString;
 	}
 
-	$( document.body )
+	try {
+		$( document.body )
 
-		.on( 'wc-enhanced-select-init', function() {
+			.on( 'wc-enhanced-select-init', function() {
 
-			// Regular select boxes
-			$( ':input.wc-enhanced-select, :input.chosen_select' ).filter( ':not(.enhanced)' ).each( function() {
-				var select2_args = $.extend({
-					minimumResultsForSearch: 10,
-					allowClear:  $( this ).data( 'allow_clear' ) ? true : false,
-					placeholder: $( this ).data( 'placeholder' )
-				}, getEnhancedSelectFormatString() );
+				// Regular select boxes
+				$( ':input.wc-enhanced-select, :input.chosen_select' ).filter( ':not(.enhanced)' ).each( function() {
+					var select2_args = $.extend({
+						minimumResultsForSearch: 10,
+						allowClear:  $( this ).data( 'allow_clear' ) ? true : false,
+						placeholder: $( this ).data( 'placeholder' )
+					}, getEnhancedSelectFormatString() );
 
-				$( this ).select2( select2_args ).addClass( 'enhanced' );
-			});
+					$( this ).select2( select2_args ).addClass( 'enhanced' );
+				});
 
-			$( ':input.wc-enhanced-select-nostd, :input.chosen_select_nostd' ).filter( ':not(.enhanced)' ).each( function() {
-				var select2_args = $.extend({
-					minimumResultsForSearch: 10,
-					allowClear:  true,
-					placeholder: $( this ).data( 'placeholder' )
-				}, getEnhancedSelectFormatString() );
+				$( ':input.wc-enhanced-select-nostd, :input.chosen_select_nostd' ).filter( ':not(.enhanced)' ).each( function() {
+					var select2_args = $.extend({
+						minimumResultsForSearch: 10,
+						allowClear:  true,
+						placeholder: $( this ).data( 'placeholder' )
+					}, getEnhancedSelectFormatString() );
 
-				$( this ).select2( select2_args ).addClass( 'enhanced' );
-			});
+					$( this ).select2( select2_args ).addClass( 'enhanced' );
+				});
 
-			// Ajax product search box
-			$( ':input.wc-product-search' ).filter( ':not(.enhanced)' ).each( function() {
-				var select2_args = {
-					allowClear:  $( this ).data( 'allow_clear' ) ? true : false,
-					placeholder: $( this ).data( 'placeholder' ),
-					minimumInputLength: $( this ).data( 'minimum_input_length' ) ? $( this ).data( 'minimum_input_length' ) : '3',
-					escapeMarkup: function( m ) {
-						return m;
-					},
-					ajax: {
-				        url:         wc_enhanced_select_params.ajax_url,
-				        dataType:    'json',
-				        quietMillis: 250,
-				        data: function( term ) {
-				            return {
-								term:     term,
-								action:   $( this ).data( 'action' ) || 'woocommerce_json_search_products_and_variations',
-								security: wc_enhanced_select_params.search_products_nonce,
-								exclude:  $( this ).data( 'exclude' ),
-								include:  $( this ).data( 'include' ),
-								limit:    $( this ).data( 'limit' )
-				            };
-				        },
-				        results: function( data ) {
-				        	var terms = [];
-					        if ( data ) {
-								$.each( data, function( id, text ) {
-									terms.push( { id: id, text: text } );
-								});
-							}
-				            return {
-				            	results: terms
-			            	};
-				        },
-				        cache: true
-				    }
-				};
-
-				if ( $( this ).data( 'multiple' ) === true ) {
-					select2_args.multiple = true;
-					select2_args.initSelection = function( element, callback ) {
-						var data     = $.parseJSON( element.attr( 'data-selected' ) );
-						var selected = [];
-
-						$( element.val().split( ',' ) ).each( function( i, val ) {
-							selected.push({
-								id: val,
-								text: data[ val ]
-							});
-						});
-						return callback( selected );
-					};
-					select2_args.formatSelection = function( data ) {
-						return '<div class="selected-option" data-id="' + data.id + '">' + data.text + '</div>';
-					};
-				} else {
-					select2_args.multiple = false;
-					select2_args.initSelection = function( element, callback ) {
-						var data = {
-							id: element.val(),
-							text: element.attr( 'data-selected' )
-						};
-						return callback( data );
-					};
-				}
-
-				select2_args = $.extend( select2_args, getEnhancedSelectFormatString() );
-
-				$( this ).select2( select2_args ).addClass( 'enhanced' );
-			});
-
-			// Ajax customer search boxes
-			$( ':input.wc-customer-search' ).filter( ':not(.enhanced)' ).each( function() {
-				var select2_args = {
-					allowClear:  $( this ).data( 'allow_clear' ) ? true : false,
-					placeholder: $( this ).data( 'placeholder' ),
-					minimumInputLength: $( this ).data( 'minimum_input_length' ) ? $( this ).data( 'minimum_input_length' ) : '3',
-					escapeMarkup: function( m ) {
-						return m;
-					},
-					ajax: {
-				        url:         wc_enhanced_select_params.ajax_url,
-				        dataType:    'json',
-				        quietMillis: 250,
-				        data: function( term ) {
-				            return {
-								term:     term,
-								action:   'woocommerce_json_search_customers',
-								security: wc_enhanced_select_params.search_customers_nonce
-				            };
-				        },
-				        results: function( data ) {
-				        	var terms = [];
-					        if ( data ) {
-								$.each( data, function( id, text ) {
-									terms.push({
-										id: id,
-										text: text
+				// Ajax product search box
+				$( ':input.wc-product-search' ).filter( ':not(.enhanced)' ).each( function() {
+					var select2_args = {
+						allowClear:  $( this ).data( 'allow_clear' ) ? true : false,
+						placeholder: $( this ).data( 'placeholder' ),
+						minimumInputLength: $( this ).data( 'minimum_input_length' ) ? $( this ).data( 'minimum_input_length' ) : '3',
+						escapeMarkup: function( m ) {
+							return m;
+						},
+						ajax: {
+							url:         wc_enhanced_select_params.ajax_url,
+							dataType:    'json',
+							delay:       250,
+							data:        function( params ) {
+								return {
+									term:     params.term,
+									action:   $( this ).data( 'action' ) || 'woocommerce_json_search_products_and_variations',
+									security: wc_enhanced_select_params.search_products_nonce,
+									exclude:  $( this ).data( 'exclude' ),
+									include:  $( this ).data( 'include' ),
+									limit:    $( this ).data( 'limit' )
+								};
+							},
+							processResults: function( data ) {
+								var terms = [];
+								if ( data ) {
+									$.each( data, function( id, text ) {
+										terms.push( { id: id, text: text } );
 									});
-								});
+								}
+								return {
+									results: terms
+								};
+							},
+							cache: true
+						}
+					};
+
+					select2_args = $.extend( select2_args, getEnhancedSelectFormatString() );
+
+					$( this ).select2( select2_args ).addClass( 'enhanced' );
+
+					if ( $( this ).data( 'sortable' ) ) {
+						var $select = $(this);
+						var $list   = $( this ).next( '.select2-container' ).find( 'ul.select2-selection__rendered' );
+
+						$list.sortable({
+							placeholder : 'ui-state-highlight select2-selection__choice',
+							forcePlaceholderSize: true,
+							items       : 'li:not(.select2-search__field)',
+							tolerance   : 'pointer',
+							stop: function() {
+								$( $list.find( '.select2-selection__choice' ).get().reverse() ).each( function() {
+									var id     = $( this ).data( 'data' ).id;
+									var option = $select.find( 'option[value="' + id + '"]' )[0];
+									$select.prepend( option );
+								} );
 							}
-				            return { results: terms };
-				        },
-				        cache: true
-				    }
-				};
-				if ( $( this ).data( 'multiple' ) === true ) {
-					select2_args.multiple = true;
-					select2_args.initSelection = function( element, callback ) {
-						var data     = $.parseJSON( element.attr( 'data-selected' ) );
-						var selected = [];
-
-						$( element.val().split( ',' ) ).each( function( i, val ) {
-							selected.push({
-								id: val,
-								text: data[ val ]
-							});
 						});
-						return callback( selected );
+					}
+				});
+
+				// Ajax customer search boxes
+				$( ':input.wc-customer-search' ).filter( ':not(.enhanced)' ).each( function() {
+					var select2_args = {
+						allowClear:  $( this ).data( 'allow_clear' ) ? true : false,
+						placeholder: $( this ).data( 'placeholder' ),
+						minimumInputLength: $( this ).data( 'minimum_input_length' ) ? $( this ).data( 'minimum_input_length' ) : '1',
+						escapeMarkup: function( m ) {
+							return m;
+						},
+						ajax: {
+							url:         wc_enhanced_select_params.ajax_url,
+							dataType:    'json',
+							delay:       250,
+							data:        function( params ) {
+								return {
+									term:     params.term,
+									action:   'woocommerce_json_search_customers',
+									security: wc_enhanced_select_params.search_customers_nonce,
+									exclude:  $( this ).data( 'exclude' )
+								};
+							},
+							processResults: function( data ) {
+								var terms = [];
+								if ( data ) {
+									$.each( data, function( id, text ) {
+										terms.push({
+											id: id,
+											text: text
+										});
+									});
+								}
+								return {
+									results: terms
+								};
+							},
+							cache: true
+						}
 					};
-					select2_args.formatSelection = function( data ) {
-						return '<div class="selected-option" data-id="' + data.id + '">' + data.text + '</div>';
-					};
-				} else {
-					select2_args.multiple = false;
-					select2_args.initSelection = function( element, callback ) {
-						var data = {
-							id: element.val(),
-							text: element.attr( 'data-selected' )
-						};
-						return callback( data );
-					};
-				}
 
-				select2_args = $.extend( select2_args, getEnhancedSelectFormatString() );
+					select2_args = $.extend( select2_args, getEnhancedSelectFormatString() );
 
-				$( this ).select2( select2_args ).addClass( 'enhanced' );
-			});
-		})
+					$( this ).select2( select2_args ).addClass( 'enhanced' );
 
-		// WooCommerce Backbone Modal
-		.on( 'wc_backbone_modal_before_remove', function() {
-			$( ':input.wc-enhanced-select, :input.wc-product-search, :input.wc-customer-search' ).select2( 'close' );
-		})
+					if ( $( this ).data( 'sortable' ) ) {
+						var $select = $(this);
+						var $list   = $( this ).next( '.select2-container' ).find( 'ul.select2-selection__rendered' );
 
-		.trigger( 'wc-enhanced-select-init' );
+						$list.sortable({
+							placeholder : 'ui-state-highlight select2-selection__choice',
+							forcePlaceholderSize: true,
+							items       : 'li:not(.select2-search__field)',
+							tolerance   : 'pointer',
+							stop: function() {
+								$( $list.find( '.select2-selection__choice' ).get().reverse() ).each( function() {
+									var id     = $( this ).data( 'data' ).id;
+									var option = $select.find( 'option[value="' + id + '"]' )[0];
+									$select.prepend( option );
+								} );
+							}
+						});
+					}
+				});
+			})
 
+			// WooCommerce Backbone Modal
+			.on( 'wc_backbone_modal_before_remove', function() {
+				$( '.wc-enhanced-select, :input.wc-product-search, :input.wc-customer-search' ).filter( '.select2-hidden-accessible' ).select2( 'close' );
+			})
+
+			.trigger( 'wc-enhanced-select-init' );
+
+		$( 'html' ).on( 'click', function( event ) {
+			if ( this === event.target ) {
+				$( '.wc-enhanced-select, :input.wc-product-search, :input.wc-customer-search' ).filter( '.select2-hidden-accessible' ).select2( 'close' );
+			}
+		} );
+	} catch( err ) {
+		// If select2 failed (conflict?) log the error but don't stop other scripts breaking.
+		window.console.log( err );
+	}
 });
diff --git a/assets/js/admin/wc-enhanced-select.min.js b/assets/js/admin/wc-enhanced-select.min.js
index ea1d5c0c201..6ea19077f26 100644
--- a/assets/js/admin/wc-enhanced-select.min.js
+++ b/assets/js/admin/wc-enhanced-select.min.js
@@ -1 +1 @@
-jQuery(function(a){function b(){var a={formatMatches:function(a){return 1===a?wc_enhanced_select_params.i18n_matches_1:wc_enhanced_select_params.i18n_matches_n.replace("%qty%",a)},formatNoMatches:function(){return wc_enhanced_select_params.i18n_no_matches},formatAjaxError:function(){return wc_enhanced_select_params.i18n_ajax_error},formatInputTooShort:function(a,b){var c=b-a.length;return 1===c?wc_enhanced_select_params.i18n_input_too_short_1:wc_enhanced_select_params.i18n_input_too_short_n.replace("%qty%",c)},formatInputTooLong:function(a,b){var c=a.length-b;return 1===c?wc_enhanced_select_params.i18n_input_too_long_1:wc_enhanced_select_params.i18n_input_too_long_n.replace("%qty%",c)},formatSelectionTooBig:function(a){return 1===a?wc_enhanced_select_params.i18n_selection_too_long_1:wc_enhanced_select_params.i18n_selection_too_long_n.replace("%qty%",a)},formatLoadMore:function(){return wc_enhanced_select_params.i18n_load_more},formatSearching:function(){return wc_enhanced_select_params.i18n_searching}};return a}a(document.body).on("wc-enhanced-select-init",function(){a(":input.wc-enhanced-select, :input.chosen_select").filter(":not(.enhanced)").each(function(){var c=a.extend({minimumResultsForSearch:10,allowClear:a(this).data("allow_clear")?!0:!1,placeholder:a(this).data("placeholder")},b());a(this).select2(c).addClass("enhanced")}),a(":input.wc-enhanced-select-nostd, :input.chosen_select_nostd").filter(":not(.enhanced)").each(function(){var c=a.extend({minimumResultsForSearch:10,allowClear:!0,placeholder:a(this).data("placeholder")},b());a(this).select2(c).addClass("enhanced")}),a(":input.wc-product-search").filter(":not(.enhanced)").each(function(){var c={allowClear:a(this).data("allow_clear")?!0:!1,placeholder:a(this).data("placeholder"),minimumInputLength:a(this).data("minimum_input_length")?a(this).data("minimum_input_length"):"3",escapeMarkup:function(a){return a},ajax:{url:wc_enhanced_select_params.ajax_url,dataType:"json",quietMillis:250,data:function(b){return{term:b,action:a(this).data("action")||"woocommerce_json_search_products_and_variations",security:wc_enhanced_select_params.search_products_nonce,exclude:a(this).data("exclude"),include:a(this).data("include"),limit:a(this).data("limit")}},results:function(b){var c=[];return b&&a.each(b,function(a,b){c.push({id:a,text:b})}),{results:c}},cache:!0}};a(this).data("multiple")===!0?(c.multiple=!0,c.initSelection=function(b,c){var d=a.parseJSON(b.attr("data-selected")),e=[];return a(b.val().split(",")).each(function(a,b){e.push({id:b,text:d[b]})}),c(e)},c.formatSelection=function(a){return'<div class="selected-option" data-id="'+a.id+'">'+a.text+"</div>"}):(c.multiple=!1,c.initSelection=function(a,b){var c={id:a.val(),text:a.attr("data-selected")};return b(c)}),c=a.extend(c,b()),a(this).select2(c).addClass("enhanced")}),a(":input.wc-customer-search").filter(":not(.enhanced)").each(function(){var c={allowClear:a(this).data("allow_clear")?!0:!1,placeholder:a(this).data("placeholder"),minimumInputLength:a(this).data("minimum_input_length")?a(this).data("minimum_input_length"):"3",escapeMarkup:function(a){return a},ajax:{url:wc_enhanced_select_params.ajax_url,dataType:"json",quietMillis:250,data:function(a){return{term:a,action:"woocommerce_json_search_customers",security:wc_enhanced_select_params.search_customers_nonce}},results:function(b){var c=[];return b&&a.each(b,function(a,b){c.push({id:a,text:b})}),{results:c}},cache:!0}};a(this).data("multiple")===!0?(c.multiple=!0,c.initSelection=function(b,c){var d=a.parseJSON(b.attr("data-selected")),e=[];return a(b.val().split(",")).each(function(a,b){e.push({id:b,text:d[b]})}),c(e)},c.formatSelection=function(a){return'<div class="selected-option" data-id="'+a.id+'">'+a.text+"</div>"}):(c.multiple=!1,c.initSelection=function(a,b){var c={id:a.val(),text:a.attr("data-selected")};return b(c)}),c=a.extend(c,b()),a(this).select2(c).addClass("enhanced")})}).on("wc_backbone_modal_before_remove",function(){a(":input.wc-enhanced-select, :input.wc-product-search, :input.wc-customer-search").select2("close")}).trigger("wc-enhanced-select-init")});
\ No newline at end of file
+jQuery(function(a){function b(){return{language:{errorLoading:function(){return wc_enhanced_select_params.i18n_searching},inputTooLong:function(a){var b=a.input.length-a.maximum;return 1===b?wc_enhanced_select_params.i18n_input_too_long_1:wc_enhanced_select_params.i18n_input_too_long_n.replace("%qty%",b)},inputTooShort:function(a){var b=a.minimum-a.input.length;return 1===b?wc_enhanced_select_params.i18n_input_too_short_1:wc_enhanced_select_params.i18n_input_too_short_n.replace("%qty%",b)},loadingMore:function(){return wc_enhanced_select_params.i18n_load_more},maximumSelected:function(a){return 1===a.maximum?wc_enhanced_select_params.i18n_selection_too_long_1:wc_enhanced_select_params.i18n_selection_too_long_n.replace("%qty%",a.maximum)},noResults:function(){return wc_enhanced_select_params.i18n_no_matches},searching:function(){return wc_enhanced_select_params.i18n_searching}}}}try{a(document.body).on("wc-enhanced-select-init",function(){a(":input.wc-enhanced-select, :input.chosen_select").filter(":not(.enhanced)").each(function(){var c=a.extend({minimumResultsForSearch:10,allowClear:!!a(this).data("allow_clear"),placeholder:a(this).data("placeholder")},b());a(this).select2(c).addClass("enhanced")}),a(":input.wc-enhanced-select-nostd, :input.chosen_select_nostd").filter(":not(.enhanced)").each(function(){var c=a.extend({minimumResultsForSearch:10,allowClear:!0,placeholder:a(this).data("placeholder")},b());a(this).select2(c).addClass("enhanced")}),a(":input.wc-product-search").filter(":not(.enhanced)").each(function(){var c={allowClear:!!a(this).data("allow_clear"),placeholder:a(this).data("placeholder"),minimumInputLength:a(this).data("minimum_input_length")?a(this).data("minimum_input_length"):"3",escapeMarkup:function(a){return a},ajax:{url:wc_enhanced_select_params.ajax_url,dataType:"json",delay:250,data:function(b){return{term:b.term,action:a(this).data("action")||"woocommerce_json_search_products_and_variations",security:wc_enhanced_select_params.search_products_nonce,exclude:a(this).data("exclude"),include:a(this).data("include"),limit:a(this).data("limit")}},processResults:function(b){var c=[];return b&&a.each(b,function(a,b){c.push({id:a,text:b})}),{results:c}},cache:!0}};if(c=a.extend(c,b()),a(this).select2(c).addClass("enhanced"),a(this).data("sortable")){var d=a(this),e=a(this).next(".select2-container").find("ul.select2-selection__rendered");e.sortable({placeholder:"ui-state-highlight select2-selection__choice",forcePlaceholderSize:!0,items:"li:not(.select2-search__field)",tolerance:"pointer",stop:function(){a(e.find(".select2-selection__choice").get().reverse()).each(function(){var b=a(this).data("data").id,c=d.find('option[value="'+b+'"]')[0];d.prepend(c)})}})}}),a(":input.wc-customer-search").filter(":not(.enhanced)").each(function(){var c={allowClear:!!a(this).data("allow_clear"),placeholder:a(this).data("placeholder"),minimumInputLength:a(this).data("minimum_input_length")?a(this).data("minimum_input_length"):"1",escapeMarkup:function(a){return a},ajax:{url:wc_enhanced_select_params.ajax_url,dataType:"json",delay:250,data:function(b){return{term:b.term,action:"woocommerce_json_search_customers",security:wc_enhanced_select_params.search_customers_nonce,exclude:a(this).data("exclude")}},processResults:function(b){var c=[];return b&&a.each(b,function(a,b){c.push({id:a,text:b})}),{results:c}},cache:!0}};if(c=a.extend(c,b()),a(this).select2(c).addClass("enhanced"),a(this).data("sortable")){var d=a(this),e=a(this).next(".select2-container").find("ul.select2-selection__rendered");e.sortable({placeholder:"ui-state-highlight select2-selection__choice",forcePlaceholderSize:!0,items:"li:not(.select2-search__field)",tolerance:"pointer",stop:function(){a(e.find(".select2-selection__choice").get().reverse()).each(function(){var b=a(this).data("data").id,c=d.find('option[value="'+b+'"]')[0];d.prepend(c)})}})}})}).on("wc_backbone_modal_before_remove",function(){a(".wc-enhanced-select, :input.wc-product-search, :input.wc-customer-search").filter(".select2-hidden-accessible").select2("close")}).trigger("wc-enhanced-select-init"),a("html").on("click",function(b){this===b.target&&a(".wc-enhanced-select, :input.wc-product-search, :input.wc-customer-search").filter(".select2-hidden-accessible").select2("close")})}catch(a){window.console.log(a)}});
\ No newline at end of file
diff --git a/assets/js/admin/wc-setup.js b/assets/js/admin/wc-setup.js
index 6a88f418d41..96145eaac7f 100644
--- a/assets/js/admin/wc-setup.js
+++ b/assets/js/admin/wc-setup.js
@@ -1,9 +1,9 @@
 /*global wc_setup_params */
-jQuery(function( $ ) {
+jQuery( function( $ ) {
 
 	var locale_info = $.parseJSON( wc_setup_params.locale_info );
 
-	$('select[name="store_location"]').change(function(){
+	$( 'select[name="store_location"]' ).change( function() {
 		var country_option      = $(this).val();
 		var country             = country_option.split( ':' )[0];
 		var country_locale_info = locale_info[ country ];
@@ -23,19 +23,9 @@ jQuery(function( $ ) {
 			$(':input[name="decimal_sep"]').closest('tr').show();
 			$(':input[name="num_decimals"]').closest('tr').show();
 		}
-	}).change();
+	} ).change();
 
-	$('input[name="woocommerce_calc_shipping"]').change(function(){
-		if ( $(this).is( ':checked' ) ) {
-			$(':input[name="shipping_cost_domestic"]').closest('tr').show();
-			$(':input[name="shipping_cost_international"]').closest('tr').show();
-		} else {
-			$(':input[name="shipping_cost_domestic"]').closest('tr').hide();
-			$(':input[name="shipping_cost_international"]').closest('tr').hide();
-		}
-	}).change();
-
-	$('input[name="woocommerce_calc_taxes"]').change(function(){
+	$( 'input[name="woocommerce_calc_taxes"]' ).change( function() {
 		if ( $(this).is( ':checked' ) ) {
 			$(':input[name="woocommerce_prices_include_tax"], :input[name="woocommerce_import_tax_rates"]').closest('tr').show();
 			$('tr.tax-rates').show();
@@ -43,17 +33,9 @@ jQuery(function( $ ) {
 			$(':input[name="woocommerce_prices_include_tax"], :input[name="woocommerce_import_tax_rates"]').closest('tr').hide();
 			$('tr.tax-rates').hide();
 		}
-	}).change();
+	} ).change();
 
-	$('input[name="woocommerce_import_tax_rates"]').change(function(){
-		if ( $(this).is( ':checked' ) ) {
-			$('.importing-tax-rates').show();
-		} else {
-			$('.importing-tax-rates').hide();
-		}
-	}).change();
-
-	$('.button-next').on( 'click', function() {
+	$( '.button-next' ).on( 'click', function() {
 		$('.wc-setup-content').block({
 			message: null,
 			overlayCSS: {
@@ -62,6 +44,23 @@ jQuery(function( $ ) {
 			}
 		});
 		return true;
-	});
+	} );
 
-});
+	$( '.wc-wizard-payment-gateways' ).on( 'change', '.wc-wizard-gateway-enable input', function() {
+		if ( $( this ).is( ':checked' ) ) {
+			$( this ).closest( 'li' ).addClass( 'checked' );
+		} else {
+			$( this ).closest( 'li' ).removeClass( 'checked' );
+		}
+	} );
+
+	$( '.wc-wizard-payment-gateways' ).on( 'click', 'li.wc-wizard-gateway', function() {
+		var $enabled = $( this ).find( '.wc-wizard-gateway-enable input' );
+
+		$enabled.prop( 'checked', ! $enabled.prop( 'checked' ) ).change();
+	} );
+
+	$( '.wc-wizard-payment-gateways' ).on( 'click', 'li.wc-wizard-gateway table, li.wc-wizard-gateway a', function( e ) {
+		e.stopPropagation();
+	} );
+} );
diff --git a/assets/js/admin/wc-setup.min.js b/assets/js/admin/wc-setup.min.js
index 72efc694a0f..5dcaf11b467 100644
--- a/assets/js/admin/wc-setup.min.js
+++ b/assets/js/admin/wc-setup.min.js
@@ -1 +1 @@
-jQuery(function(a){var b=a.parseJSON(wc_setup_params.locale_info);a('select[name="store_location"]').change(function(){var c=a(this).val(),d=c.split(":")[0],e=b[d],f=["thousand_sep","decimal_sep","num_decimals","currency_pos"];e?a.each(e,function(b,c){a(':input[name="'+b+'"]').val(c).change(),-1!==a.inArray(b,f)&&a(':input[name="'+b+'"]').closest("tr").hide()}):(a(':input[name="currency_pos"]').closest("tr").show(),a(':input[name="thousand_sep"]').closest("tr").show(),a(':input[name="decimal_sep"]').closest("tr").show(),a(':input[name="num_decimals"]').closest("tr").show())}).change(),a('input[name="woocommerce_calc_shipping"]').change(function(){a(this).is(":checked")?(a(':input[name="shipping_cost_domestic"]').closest("tr").show(),a(':input[name="shipping_cost_international"]').closest("tr").show()):(a(':input[name="shipping_cost_domestic"]').closest("tr").hide(),a(':input[name="shipping_cost_international"]').closest("tr").hide())}).change(),a('input[name="woocommerce_calc_taxes"]').change(function(){a(this).is(":checked")?(a(':input[name="woocommerce_prices_include_tax"], :input[name="woocommerce_import_tax_rates"]').closest("tr").show(),a("tr.tax-rates").show()):(a(':input[name="woocommerce_prices_include_tax"], :input[name="woocommerce_import_tax_rates"]').closest("tr").hide(),a("tr.tax-rates").hide())}).change(),a('input[name="woocommerce_import_tax_rates"]').change(function(){a(this).is(":checked")?a(".importing-tax-rates").show():a(".importing-tax-rates").hide()}).change(),a(".button-next").on("click",function(){return a(".wc-setup-content").block({message:null,overlayCSS:{background:"#fff",opacity:.6}}),!0})});
\ No newline at end of file
+jQuery(function(a){var b=a.parseJSON(wc_setup_params.locale_info);a('select[name="store_location"]').change(function(){var c=a(this).val(),d=c.split(":")[0],e=b[d],f=["thousand_sep","decimal_sep","num_decimals","currency_pos"];e?a.each(e,function(b,c){a(':input[name="'+b+'"]').val(c).change(),-1!==a.inArray(b,f)&&a(':input[name="'+b+'"]').closest("tr").hide()}):(a(':input[name="currency_pos"]').closest("tr").show(),a(':input[name="thousand_sep"]').closest("tr").show(),a(':input[name="decimal_sep"]').closest("tr").show(),a(':input[name="num_decimals"]').closest("tr").show())}).change(),a('input[name="woocommerce_calc_taxes"]').change(function(){a(this).is(":checked")?(a(':input[name="woocommerce_prices_include_tax"], :input[name="woocommerce_import_tax_rates"]').closest("tr").show(),a("tr.tax-rates").show()):(a(':input[name="woocommerce_prices_include_tax"], :input[name="woocommerce_import_tax_rates"]').closest("tr").hide(),a("tr.tax-rates").hide())}).change(),a(".button-next").on("click",function(){return a(".wc-setup-content").block({message:null,overlayCSS:{background:"#fff",opacity:.6}}),!0}),a(".wc-wizard-payment-gateways").on("change",".wc-wizard-gateway-enable input",function(){a(this).is(":checked")?a(this).closest("li").addClass("checked"):a(this).closest("li").removeClass("checked")}),a(".wc-wizard-payment-gateways").on("click","li.wc-wizard-gateway",function(){var b=a(this).find(".wc-wizard-gateway-enable input");b.prop("checked",!b.prop("checked")).change()}),a(".wc-wizard-payment-gateways").on("click","li.wc-wizard-gateway table, li.wc-wizard-gateway a",function(a){a.stopPropagation()})});
\ No newline at end of file
diff --git a/assets/js/admin/wc-shipping-classes.js b/assets/js/admin/wc-shipping-classes.js
new file mode 100644
index 00000000000..eefd8374b89
--- /dev/null
+++ b/assets/js/admin/wc-shipping-classes.js
@@ -0,0 +1,245 @@
+/* global shippingClassesLocalizeScript, ajaxurl */
+( function( $, data, wp, ajaxurl ) {
+	$( function() {
+		var $tbody          = $( '.wc-shipping-class-rows' ),
+			$save_button    = $( '.wc-shipping-class-save' ),
+			$row_template   = wp.template( 'wc-shipping-class-row' ),
+			$blank_template = wp.template( 'wc-shipping-class-row-blank' ),
+
+			// Backbone model
+			ShippingClass       = Backbone.Model.extend({
+				changes: {},
+				logChanges: function( changedRows ) {
+					var changes = this.changes || {};
+
+					_.each( changedRows, function( row, id ) {
+						changes[ id ] = _.extend( changes[ id ] || { term_id : id }, row );
+					} );
+
+					this.changes = changes;
+					this.trigger( 'change:classes' );
+				},
+				save: function() {
+					if ( _.size( this.changes ) ) {
+						$.post( ajaxurl + ( ajaxurl.indexOf( '?' ) > 0 ? '&' : '?' ) + 'action=woocommerce_shipping_classes_save_changes', {
+							wc_shipping_classes_nonce : data.wc_shipping_classes_nonce,
+							changes                 : this.changes
+						}, this.onSaveResponse, 'json' );
+					} else {
+						shippingClass.trigger( 'saved:classes' );
+					}
+				},
+				discardChanges: function( id ) {
+					var changes      = this.changes || {};
+
+					// Delete all changes
+					delete changes[ id ];
+
+					// No changes? Disable save button.
+					if ( 0 === _.size( this.changes ) ) {
+						shippingClassView.clearUnloadConfirmation();
+					}
+				},
+				onSaveResponse: function( response, textStatus ) {
+					if ( 'success' === textStatus ) {
+						if ( response.success ) {
+							shippingClass.set( 'classes', response.data.shipping_classes );
+							shippingClass.trigger( 'change:classes' );
+							shippingClass.changes = {};
+							shippingClass.trigger( 'saved:classes' );
+						} else if ( response.data ) {
+							window.alert( response.data );
+						} else {
+							window.alert( data.strings.save_failed );
+						}
+					}
+					shippingClassView.unblock();
+				}
+			} ),
+
+			// Backbone view
+			ShippingClassView = Backbone.View.extend({
+				rowTemplate: $row_template,
+				initialize: function() {
+					this.listenTo( this.model, 'change:classes', this.setUnloadConfirmation );
+					this.listenTo( this.model, 'saved:classes', this.clearUnloadConfirmation );
+					this.listenTo( this.model, 'saved:classes', this.render );
+					$tbody.on( 'change', { view: this }, this.updateModelOnChange );
+					$( window ).on( 'beforeunload', { view: this }, this.unloadConfirmation );
+					$save_button.on( 'click', { view: this }, this.onSubmit );
+					$( document.body ).on( 'click', '.wc-shipping-class-add', { view: this }, this.onAddNewRow );
+					$( document.body ).on( 'click', '.wc-shipping-class-save-changes', { view: this }, this.onSubmit );
+				},
+				block: function() {
+					$( this.el ).block({
+						message: null,
+						overlayCSS: {
+							background: '#fff',
+							opacity: 0.6
+						}
+					});
+				},
+				unblock: function() {
+					$( this.el ).unblock();
+				},
+				render: function() {
+					var classes       = _.indexBy( this.model.get( 'classes' ), 'term_id' ),
+						view        = this;
+
+					this.$el.empty();
+					this.unblock();
+
+					if ( _.size( classes ) ) {
+						// Sort classes
+						classes = _.sortBy( classes, function( shipping_class ) {
+							return shipping_class.name;
+						} );
+
+						// Populate $tbody with the current classes
+						$.each( classes, function( id, rowData ) {
+							view.renderRow( rowData );
+						} );
+					} else {
+						view.$el.append( $blank_template );
+					}
+				},
+				renderRow: function( rowData ) {
+					var view = this;
+					view.$el.append( view.rowTemplate( rowData ) );
+					view.initRow( rowData );
+				},
+				initRow: function( rowData ) {
+					var view = this;
+					var $tr = view.$el.find( 'tr[data-id="' + rowData.term_id + '"]');
+
+					// Support select boxes
+					$tr.find( 'select' ).each( function() {
+						var attribute = $( this ).data( 'attribute' );
+						$( this ).find( 'option[value="' + rowData[ attribute ] + '"]' ).prop( 'selected', true );
+					} );
+
+					// Make the rows function
+					$tr.find( '.view' ).show();
+					$tr.find( '.edit' ).hide();
+					$tr.find( '.wc-shipping-class-edit' ).on( 'click', { view: this }, this.onEditRow );
+					$tr.find( '.wc-shipping-class-delete' ).on( 'click', { view: this }, this.onDeleteRow );
+					$tr.find( '.editing .wc-shipping-class-edit' ).trigger('click');
+					$tr.find( '.wc-shipping-class-cancel-edit' ).on( 'click', { view: this }, this.onCancelEditRow );
+
+					// Editing?
+					if ( true === rowData.editing ) {
+						$tr.addClass( 'editing' );
+						$tr.find( '.wc-shipping-class-edit' ).trigger( 'click' );
+					}
+				},
+				onSubmit: function( event ) {
+					event.data.view.block();
+					event.data.view.model.save();
+					event.preventDefault();
+				},
+				onAddNewRow: function( event ) {
+					event.preventDefault();
+
+					var view    = event.data.view,
+						model   = view.model,
+						classes   = _.indexBy( model.get( 'classes' ), 'term_id' ),
+						changes = {},
+						size    = _.size( classes ),
+						newRow  = _.extend( {}, data.default_class, {
+							term_id: 'new-' + size + '-' + Date.now(),
+							editing: true,
+							newRow : true
+						} );
+
+					changes[ newRow.term_id ] = newRow;
+
+					model.logChanges( changes );
+					view.renderRow( newRow );
+					$( '.wc-shipping-classes-blank-state' ).remove();
+				},
+				onEditRow: function( event ) {
+					event.preventDefault();
+					$( this ).closest('tr').addClass('editing');
+					$( this ).closest('tr').find('.view').hide();
+					$( this ).closest('tr').find('.edit').show();
+					event.data.view.model.trigger( 'change:classes' );
+				},
+				onDeleteRow: function( event ) {
+					var view    = event.data.view,
+						model   = view.model,
+						classes = _.indexBy( model.get( 'classes' ), 'term_id' ),
+						changes = {},
+						term_id = $( this ).closest('tr').data('id');
+
+					event.preventDefault();
+
+					if ( classes[ term_id ] ) {
+						delete classes[ term_id ];
+						changes[ term_id ] = _.extend( changes[ term_id ] || {}, { deleted : 'deleted' } );
+						model.set( 'classes', classes );
+						model.logChanges( changes );
+					}
+
+					view.render();
+				},
+				onCancelEditRow: function( event ) {
+					var view    = event.data.view,
+						model   = view.model,
+						row     = $( this ).closest('tr'),
+						term_id = $( this ).closest('tr').data('id'),
+						classes = _.indexBy( model.get( 'classes' ), 'term_id' );
+
+					event.preventDefault();
+					model.discardChanges( term_id );
+
+					if ( classes[ term_id ] ) {
+						classes[ term_id ].editing = false;
+						row.after( view.rowTemplate( classes[ term_id ] ) );
+						view.initRow( classes[ term_id ] );
+					}
+
+					row.remove();
+				},
+				setUnloadConfirmation: function() {
+					this.needsUnloadConfirm = true;
+					$save_button.removeAttr( 'disabled' );
+				},
+				clearUnloadConfirmation: function() {
+					this.needsUnloadConfirm = false;
+					$save_button.attr( 'disabled', 'disabled' );
+				},
+				unloadConfirmation: function( event ) {
+					if ( event.data.view.needsUnloadConfirm ) {
+						event.returnValue = data.strings.unload_confirmation_msg;
+						window.event.returnValue = data.strings.unload_confirmation_msg;
+						return data.strings.unload_confirmation_msg;
+					}
+				},
+				updateModelOnChange: function( event ) {
+					var model     = event.data.view.model,
+						$target   = $( event.target ),
+						term_id   = $target.closest( 'tr' ).data( 'id' ),
+						attribute = $target.data( 'attribute' ),
+						value     = $target.val(),
+						classes   = _.indexBy( model.get( 'classes' ), 'term_id' ),
+						changes = {};
+
+					if ( ! classes[ term_id ] || classes[ term_id ][ attribute ] !== value ) {
+						changes[ term_id ] = {};
+						changes[ term_id ][ attribute ] = value;
+					}
+
+					model.logChanges( changes );
+				}
+			} ),
+			shippingClass = new ShippingClass({
+				classes: data.classes
+			} ),
+			shippingClassView = new ShippingClassView({
+				model:    shippingClass,
+				el:       $tbody
+			} );
+
+		shippingClassView.render();
+	});
+})( jQuery, shippingClassesLocalizeScript, wp, ajaxurl );
diff --git a/assets/js/admin/wc-shipping-classes.min.js b/assets/js/admin/wc-shipping-classes.min.js
new file mode 100644
index 00000000000..d083a48efc5
--- /dev/null
+++ b/assets/js/admin/wc-shipping-classes.min.js
@@ -0,0 +1 @@
+!function(a,b,c,d){a(function(){var e=a(".wc-shipping-class-rows"),f=a(".wc-shipping-class-save"),g=c.template("wc-shipping-class-row"),h=c.template("wc-shipping-class-row-blank"),i=Backbone.Model.extend({changes:{},logChanges:function(a){var b=this.changes||{};_.each(a,function(a,c){b[c]=_.extend(b[c]||{term_id:c},a)}),this.changes=b,this.trigger("change:classes")},save:function(){_.size(this.changes)?a.post(d+(d.indexOf("?")>0?"&":"?")+"action=woocommerce_shipping_classes_save_changes",{wc_shipping_classes_nonce:b.wc_shipping_classes_nonce,changes:this.changes},this.onSaveResponse,"json"):k.trigger("saved:classes")},discardChanges:function(a){var b=this.changes||{};delete b[a],0===_.size(this.changes)&&l.clearUnloadConfirmation()},onSaveResponse:function(a,c){"success"===c&&(a.success?(k.set("classes",a.data.shipping_classes),k.trigger("change:classes"),k.changes={},k.trigger("saved:classes")):a.data?window.alert(a.data):window.alert(b.strings.save_failed)),l.unblock()}}),j=Backbone.View.extend({rowTemplate:g,initialize:function(){this.listenTo(this.model,"change:classes",this.setUnloadConfirmation),this.listenTo(this.model,"saved:classes",this.clearUnloadConfirmation),this.listenTo(this.model,"saved:classes",this.render),e.on("change",{view:this},this.updateModelOnChange),a(window).on("beforeunload",{view:this},this.unloadConfirmation),f.on("click",{view:this},this.onSubmit),a(document.body).on("click",".wc-shipping-class-add",{view:this},this.onAddNewRow),a(document.body).on("click",".wc-shipping-class-save-changes",{view:this},this.onSubmit)},block:function(){a(this.el).block({message:null,overlayCSS:{background:"#fff",opacity:.6}})},unblock:function(){a(this.el).unblock()},render:function(){var b=_.indexBy(this.model.get("classes"),"term_id"),c=this;this.$el.empty(),this.unblock(),_.size(b)?(b=_.sortBy(b,function(a){return a.name}),a.each(b,function(a,b){c.renderRow(b)})):c.$el.append(h)},renderRow:function(a){var b=this;b.$el.append(b.rowTemplate(a)),b.initRow(a)},initRow:function(b){var c=this,d=c.$el.find('tr[data-id="'+b.term_id+'"]');d.find("select").each(function(){var c=a(this).data("attribute");a(this).find('option[value="'+b[c]+'"]').prop("selected",!0)}),d.find(".view").show(),d.find(".edit").hide(),d.find(".wc-shipping-class-edit").on("click",{view:this},this.onEditRow),d.find(".wc-shipping-class-delete").on("click",{view:this},this.onDeleteRow),d.find(".editing .wc-shipping-class-edit").trigger("click"),d.find(".wc-shipping-class-cancel-edit").on("click",{view:this},this.onCancelEditRow),!0===b.editing&&(d.addClass("editing"),d.find(".wc-shipping-class-edit").trigger("click"))},onSubmit:function(a){a.data.view.block(),a.data.view.model.save(),a.preventDefault()},onAddNewRow:function(c){c.preventDefault();var d=c.data.view,e=d.model,f=_.indexBy(e.get("classes"),"term_id"),g={},h=_.size(f),i=_.extend({},b.default_class,{term_id:"new-"+h+"-"+Date.now(),editing:!0,newRow:!0});g[i.term_id]=i,e.logChanges(g),d.renderRow(i),a(".wc-shipping-classes-blank-state").remove()},onEditRow:function(b){b.preventDefault(),a(this).closest("tr").addClass("editing"),a(this).closest("tr").find(".view").hide(),a(this).closest("tr").find(".edit").show(),b.data.view.model.trigger("change:classes")},onDeleteRow:function(b){var c=b.data.view,d=c.model,e=_.indexBy(d.get("classes"),"term_id"),f={},g=a(this).closest("tr").data("id");b.preventDefault(),e[g]&&(delete e[g],f[g]=_.extend(f[g]||{},{deleted:"deleted"}),d.set("classes",e),d.logChanges(f)),c.render()},onCancelEditRow:function(b){var c=b.data.view,d=c.model,e=a(this).closest("tr"),f=a(this).closest("tr").data("id"),g=_.indexBy(d.get("classes"),"term_id");b.preventDefault(),d.discardChanges(f),g[f]&&(g[f].editing=!1,e.after(c.rowTemplate(g[f])),c.initRow(g[f])),e.remove()},setUnloadConfirmation:function(){this.needsUnloadConfirm=!0,f.removeAttr("disabled")},clearUnloadConfirmation:function(){this.needsUnloadConfirm=!1,f.attr("disabled","disabled")},unloadConfirmation:function(a){if(a.data.view.needsUnloadConfirm)return a.returnValue=b.strings.unload_confirmation_msg,window.event.returnValue=b.strings.unload_confirmation_msg,b.strings.unload_confirmation_msg},updateModelOnChange:function(b){var c=b.data.view.model,d=a(b.target),e=d.closest("tr").data("id"),f=d.data("attribute"),g=d.val(),h=_.indexBy(c.get("classes"),"term_id"),i={};h[e]&&h[e][f]===g||(i[e]={},i[e][f]=g),c.logChanges(i)}}),k=new i({classes:b.classes}),l=new j({model:k,el:e});l.render()})}(jQuery,shippingClassesLocalizeScript,wp,ajaxurl);
\ No newline at end of file
diff --git a/assets/js/admin/wc-shipping-zone-methods.js b/assets/js/admin/wc-shipping-zone-methods.js
new file mode 100644
index 00000000000..c3ec5efc753
--- /dev/null
+++ b/assets/js/admin/wc-shipping-zone-methods.js
@@ -0,0 +1,394 @@
+/* global shippingZoneMethodsLocalizeScript, ajaxurl */
+( function( $, data, wp, ajaxurl ) {
+	$( function() {
+		var $table          = $( '.wc-shipping-zone-methods' ),
+			$tbody          = $( '.wc-shipping-zone-method-rows' ),
+			$save_button    = $( '.wc-shipping-zone-method-save' ),
+			$row_template   = wp.template( 'wc-shipping-zone-method-row' ),
+			$blank_template = wp.template( 'wc-shipping-zone-method-row-blank' ),
+
+			// Backbone model
+			ShippingMethod       = Backbone.Model.extend({
+				changes: {},
+				logChanges: function( changedRows ) {
+					var changes = this.changes || {};
+
+					_.each( changedRows.methods, function( row, id ) {
+						changes.methods = changes.methods || { methods : {} };
+						changes.methods[ id ] = _.extend( changes.methods[ id ] || { instance_id : id }, row );
+					} );
+
+					if ( typeof changedRows.zone_name !== 'undefined' ) {
+						changes.zone_name = changedRows.zone_name;
+					}
+
+					if ( typeof changedRows.zone_locations !== 'undefined' ) {
+						changes.zone_locations = changedRows.zone_locations;
+					}
+
+					if ( typeof changedRows.zone_postcodes !== 'undefined' ) {
+						changes.zone_postcodes = changedRows.zone_postcodes;
+					}
+
+					this.changes = changes;
+					this.trigger( 'change:methods' );
+				},
+				save: function() {
+					$.post( ajaxurl + ( ajaxurl.indexOf( '?' ) > 0 ? '&' : '?' ) + 'action=woocommerce_shipping_zone_methods_save_changes', {
+						wc_shipping_zones_nonce : data.wc_shipping_zones_nonce,
+						changes                 : this.changes,
+						zone_id                 : data.zone_id
+					}, this.onSaveResponse, 'json' );
+				},
+				onSaveResponse: function( response, textStatus ) {
+					if ( 'success' === textStatus ) {
+						if ( response.success ) {
+							if ( response.data.zone_id !== data.zone_id ) {
+								data.zone_id = response.data.zone_id;
+								if ( window.history.pushState ) {
+									window.history.pushState({}, '', 'admin.php?page=wc-settings&tab=shipping&zone_id=' + response.data.zone_id );
+								}
+							}
+							shippingMethod.set( 'methods', response.data.methods );
+							shippingMethod.trigger( 'change:methods' );
+							shippingMethod.changes = {};
+							shippingMethod.trigger( 'saved:methods' );
+						} else {
+							window.alert( data.strings.save_failed );
+						}
+					}
+				}
+			} ),
+
+			// Backbone view
+			ShippingMethodView = Backbone.View.extend({
+				rowTemplate: $row_template,
+				initialize: function() {
+					this.listenTo( this.model, 'change:methods', this.setUnloadConfirmation );
+					this.listenTo( this.model, 'saved:methods', this.clearUnloadConfirmation );
+					this.listenTo( this.model, 'saved:methods', this.render );
+					$tbody.on( 'change', { view: this }, this.updateModelOnChange );
+					$tbody.on( 'sortupdate', { view: this }, this.updateModelOnSort );
+					$( window ).on( 'beforeunload', { view: this }, this.unloadConfirmation );
+					$save_button.on( 'click', { view: this }, this.onSubmit );
+
+					$( document.body ).on( 'input change', '#zone_name, #zone_locations, #zone_postcodes', { view: this }, this.onUpdateZone );
+					$( document.body ).on( 'click', '.wc-shipping-zone-method-settings', { view: this }, this.onConfigureShippingMethod );
+					$( document.body ).on( 'click', '.wc-shipping-zone-add-method', { view: this }, this.onAddShippingMethod );
+					$( document.body ).on( 'wc_backbone_modal_response', this.onConfigureShippingMethodSubmitted );
+					$( document.body ).on( 'wc_backbone_modal_response', this.onAddShippingMethodSubmitted );
+					$( document.body ).on( 'change', '.wc-shipping-zone-method-selector select', this.onChangeShippingMethodSelector );
+					$( document.body ).on( 'click', '.wc-shipping-zone-postcodes-toggle', this.onTogglePostcodes );
+				},
+				onUpdateZone: function( event ) {
+					var view      = event.data.view,
+						model     = view.model,
+						value     = $( this ).val(),
+						$target   = $( event.target ),
+						attribute = $target.data( 'attribute' ),
+						changes   = {};
+
+					event.preventDefault();
+
+					changes[ attribute ] = value;
+					model.set( attribute, value );
+					model.logChanges( changes );
+					view.render();
+				},
+				block: function() {
+					$( this.el ).block({
+						message: null,
+						overlayCSS: {
+							background: '#fff',
+							opacity: 0.6
+						}
+					});
+				},
+				unblock: function() {
+					$( this.el ).unblock();
+				},
+				render: function() {
+					var methods     = _.indexBy( this.model.get( 'methods' ), 'instance_id' ),
+						zone_name   = this.model.get( 'zone_name' ),
+						view        = this;
+
+					// Set name.
+					$('.wc-shipping-zone-name').text( zone_name ? zone_name : data.strings.default_zone_name );
+
+					// Blank out the contents.
+					this.$el.empty();
+					this.unblock();
+
+					if ( _.size( methods ) ) {
+						// Sort methods
+						methods = _.sortBy( methods, function( method ) {
+							return parseInt( method.method_order, 10 );
+						} );
+
+						// Populate $tbody with the current methods
+						$.each( methods, function( id, rowData ) {
+							if ( 'yes' === rowData.enabled ) {
+								rowData.enabled_icon = '<span class="woocommerce-input-toggle woocommerce-input-toggle--enabled">' + data.strings.yes + '</span>';
+							} else {
+								rowData.enabled_icon = '<span class="woocommerce-input-toggle woocommerce-input-toggle--disabled">' + data.strings.no + '</span>';
+							}
+
+							view.$el.append( view.rowTemplate( rowData ) );
+
+							var $tr = view.$el.find( 'tr[data-id="' + rowData.instance_id + '"]');
+
+							if ( ! rowData.has_settings ) {
+								$tr.find( '.wc-shipping-zone-method-title a').replaceWith( $tr.find( '.wc-shipping-zone-method-title' ).text() );
+								$tr.find( '.wc-shipping-zone-method-settings' ).remove();
+							}
+						} );
+
+						// Make the rows function
+						this.$el.find( '.wc-shipping-zone-method-delete' ).on( 'click', { view: this }, this.onDeleteRow );
+						this.$el.find( '.wc-shipping-zone-method-enabled a').on( 'click', { view: this }, this.onToggleEnabled );
+					} else {
+						view.$el.append( $blank_template );
+					}
+
+					this.initTooltips();
+				},
+				initTooltips: function() {
+					$( '#tiptip_holder' ).removeAttr( 'style' );
+					$( '#tiptip_arrow' ).removeAttr( 'style' );
+					$( '.tips' ).tipTip({ 'attribute': 'data-tip', 'fadeIn': 50, 'fadeOut': 50, 'delay': 50 });
+				},
+				onSubmit: function( event ) {
+					event.data.view.block();
+					event.data.view.model.save();
+					event.preventDefault();
+				},
+				onDeleteRow: function( event ) {
+					var view    = event.data.view,
+						model   = view.model,
+						methods   = _.indexBy( model.get( 'methods' ), 'instance_id' ),
+						changes = {},
+						instance_id = $( this ).closest('tr').data('id');
+
+					event.preventDefault();
+
+					delete methods[ instance_id ];
+					changes.methods = changes.methods || { methods : {} };
+					changes.methods[ instance_id ] = _.extend( changes.methods[ instance_id ] || {}, { deleted : 'deleted' } );
+					model.set( 'methods', methods );
+					model.logChanges( changes );
+					view.render();
+				},
+				onToggleEnabled: function( event ) {
+					var view        = event.data.view,
+						$target     = $( event.target ),
+						model       = view.model,
+						methods     = _.indexBy( model.get( 'methods' ), 'instance_id' ),
+						instance_id = $target.closest( 'tr' ).data( 'id' ),
+						enabled     = $target.closest( 'tr' ).data( 'enabled' ) === 'yes' ? 'no' : 'yes',
+						changes     = {};
+
+					event.preventDefault();
+					methods[ instance_id ].enabled = enabled;
+					changes.methods = changes.methods || { methods : {} };
+					changes.methods[ instance_id ] = _.extend( changes.methods[ instance_id ] || {}, { enabled : enabled } );
+					model.set( 'methods', methods );
+					model.logChanges( changes );
+					view.render();
+				},
+				setUnloadConfirmation: function() {
+					this.needsUnloadConfirm = true;
+					$save_button.removeAttr( 'disabled' );
+				},
+				clearUnloadConfirmation: function() {
+					this.needsUnloadConfirm = false;
+					$save_button.attr( 'disabled', 'disabled' );
+				},
+				unloadConfirmation: function( event ) {
+					if ( event.data.view.needsUnloadConfirm ) {
+						event.returnValue = data.strings.unload_confirmation_msg;
+						window.event.returnValue = data.strings.unload_confirmation_msg;
+						return data.strings.unload_confirmation_msg;
+					}
+				},
+				updateModelOnChange: function( event ) {
+					var model     = event.data.view.model,
+						$target   = $( event.target ),
+						instance_id   = $target.closest( 'tr' ).data( 'id' ),
+						attribute = $target.data( 'attribute' ),
+						value     = $target.val(),
+						methods   = _.indexBy( model.get( 'methods' ), 'instance_id' ),
+						changes = {};
+
+					if ( methods[ instance_id ][ attribute ] !== value ) {
+						changes.methods[ instance_id ] = {};
+						changes.methods[ instance_id ][ attribute ] = value;
+						methods[ instance_id ][ attribute ]   = value;
+					}
+
+					model.logChanges( changes );
+				},
+				updateModelOnSort: function( event ) {
+					var view         = event.data.view,
+						model        = view.model,
+						methods        = _.indexBy( model.get( 'methods' ), 'instance_id' ),
+						changes      = {};
+
+					_.each( methods, function( method ) {
+						var old_position = parseInt( method.method_order, 10 );
+						var new_position = parseInt( $table.find( 'tr[data-id="' + method.instance_id + '"]').index() + 1, 10 );
+
+						if ( old_position !== new_position ) {
+							methods[ method.instance_id ].method_order = new_position;
+							changes.methods = changes.methods || { methods : {} };
+							changes.methods[ method.instance_id ] = _.extend( changes.methods[ method.instance_id ] || {}, { method_order : new_position } );
+						}
+					} );
+
+					if ( _.size( changes ) ) {
+						model.logChanges( changes );
+					}
+				},
+				onConfigureShippingMethod: function( event ) {
+					var instance_id = $( this ).closest( 'tr' ).data( 'id' ),
+						model       = event.data.view.model,
+						methods     = _.indexBy( model.get( 'methods' ), 'instance_id' ),
+						method      = methods[ instance_id ];
+
+					// Only load modal if supported
+					if ( ! method.settings_html ) {
+						return true;
+					}
+
+					event.preventDefault();
+
+					$( this ).WCBackboneModal({
+						template : 'wc-modal-shipping-method-settings',
+						variable : {
+							instance_id : instance_id,
+							method      : method
+						},
+						data : {
+							instance_id : instance_id,
+							method      : method
+						}
+					});
+
+					$( document.body ).trigger( 'init_tooltips' );
+				},
+				onConfigureShippingMethodSubmitted: function( event, target, posted_data ) {
+					if ( 'wc-modal-shipping-method-settings' === target ) {
+						shippingMethodView.block();
+
+						// Save method settings via ajax call
+						$.post( ajaxurl + ( ajaxurl.indexOf( '?' ) > 0 ? '&' : '?' ) + 'action=woocommerce_shipping_zone_methods_save_settings', {
+							wc_shipping_zones_nonce : data.wc_shipping_zones_nonce,
+							instance_id             : posted_data.instance_id,
+							data                    : posted_data
+						}, function( response, textStatus ) {
+							if ( 'success' === textStatus && response.success ) {
+								$( 'table.wc-shipping-zone-methods' ).parent().find( '#woocommerce_errors' ).remove();
+
+								// If there were errors, prepend the form.
+								if ( response.data.errors.length > 0 ) {
+									this.showErrors( response.data.errors );
+								}
+
+								// Method was saved. Re-render.
+								if ( _.size( shippingMethodView.model.changes ) ) {
+									shippingMethodView.model.save();
+								} else {
+									shippingMethodView.model.onSaveResponse( response, textStatus );
+								}
+							} else {
+								window.alert( data.strings.save_failed );
+								shippingMethodView.unblock();
+							}
+						}, 'json' );
+					}
+				},
+				showErrors: function( errors ) {
+					var error_html = '<div id="woocommerce_errors" class="error notice is-dismissible">';
+
+					$( errors ).each( function( index, value ) {
+						error_html = error_html + '<p>' + value + '</p>';
+					} );
+					error_html = error_html + '</div>';
+
+					$( 'table.wc-shipping-zone-methods' ).before( error_html );
+				},
+				onAddShippingMethod: function( event ) {
+					event.preventDefault();
+
+					$( this ).WCBackboneModal({
+						template : 'wc-modal-add-shipping-method',
+						variable : {
+							zone_id : data.zone_id
+						}
+					});
+
+					$( '.wc-shipping-zone-method-selector select' ).change();
+				},
+				onAddShippingMethodSubmitted: function( event, target, posted_data ) {
+					if ( 'wc-modal-add-shipping-method' === target ) {
+						shippingMethodView.block();
+
+						// Add method to zone via ajax call
+						$.post( ajaxurl + ( ajaxurl.indexOf( '?' ) > 0 ? '&' : '?' ) + 'action=woocommerce_shipping_zone_add_method', {
+							wc_shipping_zones_nonce : data.wc_shipping_zones_nonce,
+							method_id               : posted_data.add_method_id,
+							zone_id                 : data.zone_id
+						}, function( response, textStatus ) {
+							if ( 'success' === textStatus && response.success ) {
+								if ( response.data.zone_id !== data.zone_id ) {
+									data.zone_id = response.data.zone_id;
+									if ( window.history.pushState ) {
+										window.history.pushState({}, '', 'admin.php?page=wc-settings&tab=shipping&zone_id=' + response.data.zone_id );
+									}
+								}
+								// Trigger save if there are changes, or just re-render
+								if ( _.size( shippingMethodView.model.changes ) ) {
+									shippingMethodView.model.save();
+								} else {
+									shippingMethodView.model.set( 'methods', response.data.methods );
+									shippingMethodView.model.trigger( 'change:methods' );
+									shippingMethodView.model.changes = {};
+									shippingMethodView.model.trigger( 'saved:methods' );
+								}
+							}
+							shippingMethodView.unblock();
+						}, 'json' );
+					}
+				},
+				onChangeShippingMethodSelector: function() {
+					var description = $( this ).find( 'option:selected' ).data( 'description' );
+					$( this ).parent().find( '.wc-shipping-zone-method-description' ).remove();
+					$( this ).after( '<div class="wc-shipping-zone-method-description">' + description + '</div>' );
+					$( this ).closest( 'article' ).height( $( this ).parent().height() );
+				},
+				onTogglePostcodes: function( event ) {
+					event.preventDefault();
+					var $tr = $( this ).closest( 'tr');
+					$tr.find( '.wc-shipping-zone-postcodes' ).show();
+					$tr.find( '.wc-shipping-zone-postcodes-toggle' ).hide();
+				}
+			} ),
+			shippingMethod = new ShippingMethod({
+				methods: data.methods,
+				zone_name: data.zone_name
+			} ),
+			shippingMethodView = new ShippingMethodView({
+				model:    shippingMethod,
+				el:       $tbody
+			} );
+
+		shippingMethodView.render();
+
+		$tbody.sortable({
+			items: 'tr',
+			cursor: 'move',
+			axis: 'y',
+			handle: 'td.wc-shipping-zone-method-sort',
+			scrollSensitivity: 40
+		});
+	});
+})( jQuery, shippingZoneMethodsLocalizeScript, wp, ajaxurl );
diff --git a/assets/js/admin/wc-shipping-zone-methods.min.js b/assets/js/admin/wc-shipping-zone-methods.min.js
new file mode 100644
index 00000000000..375e7d8f870
--- /dev/null
+++ b/assets/js/admin/wc-shipping-zone-methods.min.js
@@ -0,0 +1 @@
+!function(a,b,c,d){a(function(){var e=a(".wc-shipping-zone-methods"),f=a(".wc-shipping-zone-method-rows"),g=a(".wc-shipping-zone-method-save"),h=c.template("wc-shipping-zone-method-row"),i=c.template("wc-shipping-zone-method-row-blank"),j=Backbone.Model.extend({changes:{},logChanges:function(a){var b=this.changes||{};_.each(a.methods,function(a,c){b.methods=b.methods||{methods:{}},b.methods[c]=_.extend(b.methods[c]||{instance_id:c},a)}),"undefined"!=typeof a.zone_name&&(b.zone_name=a.zone_name),"undefined"!=typeof a.zone_locations&&(b.zone_locations=a.zone_locations),"undefined"!=typeof a.zone_postcodes&&(b.zone_postcodes=a.zone_postcodes),this.changes=b,this.trigger("change:methods")},save:function(){a.post(d+(d.indexOf("?")>0?"&":"?")+"action=woocommerce_shipping_zone_methods_save_changes",{wc_shipping_zones_nonce:b.wc_shipping_zones_nonce,changes:this.changes,zone_id:b.zone_id},this.onSaveResponse,"json")},onSaveResponse:function(a,c){"success"===c&&(a.success?(a.data.zone_id!==b.zone_id&&(b.zone_id=a.data.zone_id,window.history.pushState&&window.history.pushState({},"","admin.php?page=wc-settings&tab=shipping&zone_id="+a.data.zone_id)),l.set("methods",a.data.methods),l.trigger("change:methods"),l.changes={},l.trigger("saved:methods")):window.alert(b.strings.save_failed))}}),k=Backbone.View.extend({rowTemplate:h,initialize:function(){this.listenTo(this.model,"change:methods",this.setUnloadConfirmation),this.listenTo(this.model,"saved:methods",this.clearUnloadConfirmation),this.listenTo(this.model,"saved:methods",this.render),f.on("change",{view:this},this.updateModelOnChange),f.on("sortupdate",{view:this},this.updateModelOnSort),a(window).on("beforeunload",{view:this},this.unloadConfirmation),g.on("click",{view:this},this.onSubmit),a(document.body).on("input change","#zone_name, #zone_locations, #zone_postcodes",{view:this},this.onUpdateZone),a(document.body).on("click",".wc-shipping-zone-method-settings",{view:this},this.onConfigureShippingMethod),a(document.body).on("click",".wc-shipping-zone-add-method",{view:this},this.onAddShippingMethod),a(document.body).on("wc_backbone_modal_response",this.onConfigureShippingMethodSubmitted),a(document.body).on("wc_backbone_modal_response",this.onAddShippingMethodSubmitted),a(document.body).on("change",".wc-shipping-zone-method-selector select",this.onChangeShippingMethodSelector),a(document.body).on("click",".wc-shipping-zone-postcodes-toggle",this.onTogglePostcodes)},onUpdateZone:function(b){var c=b.data.view,d=c.model,e=a(this).val(),f=a(b.target),g=f.data("attribute"),h={};b.preventDefault(),h[g]=e,d.set(g,e),d.logChanges(h),c.render()},block:function(){a(this.el).block({message:null,overlayCSS:{background:"#fff",opacity:.6}})},unblock:function(){a(this.el).unblock()},render:function(){var c=_.indexBy(this.model.get("methods"),"instance_id"),d=this.model.get("zone_name"),e=this;a(".wc-shipping-zone-name").text(d?d:b.strings.default_zone_name),this.$el.empty(),this.unblock(),_.size(c)?(c=_.sortBy(c,function(a){return parseInt(a.method_order,10)}),a.each(c,function(a,c){"yes"===c.enabled?c.enabled_icon='<span class="woocommerce-input-toggle woocommerce-input-toggle--enabled">'+b.strings.yes+"</span>":c.enabled_icon='<span class="woocommerce-input-toggle woocommerce-input-toggle--disabled">'+b.strings.no+"</span>",e.$el.append(e.rowTemplate(c));var d=e.$el.find('tr[data-id="'+c.instance_id+'"]');c.has_settings||(d.find(".wc-shipping-zone-method-title a").replaceWith(d.find(".wc-shipping-zone-method-title").text()),d.find(".wc-shipping-zone-method-settings").remove())}),this.$el.find(".wc-shipping-zone-method-delete").on("click",{view:this},this.onDeleteRow),this.$el.find(".wc-shipping-zone-method-enabled a").on("click",{view:this},this.onToggleEnabled)):e.$el.append(i),this.initTooltips()},initTooltips:function(){a("#tiptip_holder").removeAttr("style"),a("#tiptip_arrow").removeAttr("style"),a(".tips").tipTip({attribute:"data-tip",fadeIn:50,fadeOut:50,delay:50})},onSubmit:function(a){a.data.view.block(),a.data.view.model.save(),a.preventDefault()},onDeleteRow:function(b){var c=b.data.view,d=c.model,e=_.indexBy(d.get("methods"),"instance_id"),f={},g=a(this).closest("tr").data("id");b.preventDefault(),delete e[g],f.methods=f.methods||{methods:{}},f.methods[g]=_.extend(f.methods[g]||{},{deleted:"deleted"}),d.set("methods",e),d.logChanges(f),c.render()},onToggleEnabled:function(b){var c=b.data.view,d=a(b.target),e=c.model,f=_.indexBy(e.get("methods"),"instance_id"),g=d.closest("tr").data("id"),h="yes"===d.closest("tr").data("enabled")?"no":"yes",i={};b.preventDefault(),f[g].enabled=h,i.methods=i.methods||{methods:{}},i.methods[g]=_.extend(i.methods[g]||{},{enabled:h}),e.set("methods",f),e.logChanges(i),c.render()},setUnloadConfirmation:function(){this.needsUnloadConfirm=!0,g.removeAttr("disabled")},clearUnloadConfirmation:function(){this.needsUnloadConfirm=!1,g.attr("disabled","disabled")},unloadConfirmation:function(a){if(a.data.view.needsUnloadConfirm)return a.returnValue=b.strings.unload_confirmation_msg,window.event.returnValue=b.strings.unload_confirmation_msg,b.strings.unload_confirmation_msg},updateModelOnChange:function(b){var c=b.data.view.model,d=a(b.target),e=d.closest("tr").data("id"),f=d.data("attribute"),g=d.val(),h=_.indexBy(c.get("methods"),"instance_id"),i={};h[e][f]!==g&&(i.methods[e]={},i.methods[e][f]=g,h[e][f]=g),c.logChanges(i)},updateModelOnSort:function(a){var b=a.data.view,c=b.model,d=_.indexBy(c.get("methods"),"instance_id"),f={};_.each(d,function(a){var b=parseInt(a.method_order,10),c=parseInt(e.find('tr[data-id="'+a.instance_id+'"]').index()+1,10);b!==c&&(d[a.instance_id].method_order=c,f.methods=f.methods||{methods:{}},f.methods[a.instance_id]=_.extend(f.methods[a.instance_id]||{},{method_order:c}))}),_.size(f)&&c.logChanges(f)},onConfigureShippingMethod:function(b){var c=a(this).closest("tr").data("id"),d=b.data.view.model,e=_.indexBy(d.get("methods"),"instance_id"),f=e[c];return!f.settings_html||(b.preventDefault(),a(this).WCBackboneModal({template:"wc-modal-shipping-method-settings",variable:{instance_id:c,method:f},data:{instance_id:c,method:f}}),void a(document.body).trigger("init_tooltips"))},onConfigureShippingMethodSubmitted:function(c,e,f){"wc-modal-shipping-method-settings"===e&&(m.block(),a.post(d+(d.indexOf("?")>0?"&":"?")+"action=woocommerce_shipping_zone_methods_save_settings",{wc_shipping_zones_nonce:b.wc_shipping_zones_nonce,instance_id:f.instance_id,data:f},function(c,d){"success"===d&&c.success?(a("table.wc-shipping-zone-methods").parent().find("#woocommerce_errors").remove(),c.data.errors.length>0&&this.showErrors(c.data.errors),_.size(m.model.changes)?m.model.save():m.model.onSaveResponse(c,d)):(window.alert(b.strings.save_failed),m.unblock())},"json"))},showErrors:function(b){var c='<div id="woocommerce_errors" class="error notice is-dismissible">';a(b).each(function(a,b){c=c+"<p>"+b+"</p>"}),c+="</div>",a("table.wc-shipping-zone-methods").before(c)},onAddShippingMethod:function(c){c.preventDefault(),a(this).WCBackboneModal({template:"wc-modal-add-shipping-method",variable:{zone_id:b.zone_id}}),a(".wc-shipping-zone-method-selector select").change()},onAddShippingMethodSubmitted:function(c,e,f){"wc-modal-add-shipping-method"===e&&(m.block(),a.post(d+(d.indexOf("?")>0?"&":"?")+"action=woocommerce_shipping_zone_add_method",{wc_shipping_zones_nonce:b.wc_shipping_zones_nonce,method_id:f.add_method_id,zone_id:b.zone_id},function(a,c){"success"===c&&a.success&&(a.data.zone_id!==b.zone_id&&(b.zone_id=a.data.zone_id,window.history.pushState&&window.history.pushState({},"","admin.php?page=wc-settings&tab=shipping&zone_id="+a.data.zone_id)),_.size(m.model.changes)?m.model.save():(m.model.set("methods",a.data.methods),m.model.trigger("change:methods"),m.model.changes={},m.model.trigger("saved:methods"))),m.unblock()},"json"))},onChangeShippingMethodSelector:function(){var b=a(this).find("option:selected").data("description");a(this).parent().find(".wc-shipping-zone-method-description").remove(),a(this).after('<div class="wc-shipping-zone-method-description">'+b+"</div>"),a(this).closest("article").height(a(this).parent().height())},onTogglePostcodes:function(b){b.preventDefault();var c=a(this).closest("tr");c.find(".wc-shipping-zone-postcodes").show(),c.find(".wc-shipping-zone-postcodes-toggle").hide()}}),l=new j({methods:b.methods,zone_name:b.zone_name}),m=new k({model:l,el:f});m.render(),f.sortable({items:"tr",cursor:"move",axis:"y",handle:"td.wc-shipping-zone-method-sort",scrollSensitivity:40})})}(jQuery,shippingZoneMethodsLocalizeScript,wp,ajaxurl);
\ No newline at end of file
diff --git a/assets/js/admin/wc-shipping-zones.js b/assets/js/admin/wc-shipping-zones.js
new file mode 100644
index 00000000000..c4eaeea9e85
--- /dev/null
+++ b/assets/js/admin/wc-shipping-zones.js
@@ -0,0 +1,267 @@
+/* global shippingZonesLocalizeScript, ajaxurl */
+( function( $, data, wp, ajaxurl ) {
+	$( function() {
+		var $table          = $( '.wc-shipping-zones' ),
+			$tbody          = $( '.wc-shipping-zone-rows' ),
+			$save_button    = $( '.wc-shipping-zone-save' ),
+			$row_template   = wp.template( 'wc-shipping-zone-row' ),
+			$blank_template = wp.template( 'wc-shipping-zone-row-blank' ),
+
+			// Backbone model
+			ShippingZone       = Backbone.Model.extend({
+				changes: {},
+				logChanges: function( changedRows ) {
+					var changes = this.changes || {};
+
+					_.each( changedRows, function( row, id ) {
+						changes[ id ] = _.extend( changes[ id ] || { zone_id : id }, row );
+					} );
+
+					this.changes = changes;
+					this.trigger( 'change:zones' );
+				},
+				discardChanges: function( id ) {
+					var changes      = this.changes || {},
+						set_position = null,
+						zones        = _.indexBy( this.get( 'zones' ), 'zone_id' );
+
+					// Find current set position if it has moved since last save
+					if ( changes[ id ] && changes[ id ].zone_order !== undefined ) {
+						set_position = changes[ id ].zone_order;
+					}
+
+					// Delete all changes
+					delete changes[ id ];
+
+					// If the position was set, and this zone does exist in DB, set the position again so the changes are not lost.
+					if ( set_position !== null && zones[ id ] && zones[ id ].zone_order !== set_position ) {
+						changes[ id ] = _.extend( changes[ id ] || {}, { zone_id : id, zone_order : set_position } );
+					}
+
+					this.changes = changes;
+
+					// No changes? Disable save button.
+					if ( 0 === _.size( this.changes ) ) {
+						shippingZoneView.clearUnloadConfirmation();
+					}
+				},
+				save: function() {
+					if ( _.size( this.changes ) ) {
+						$.post( ajaxurl + ( ajaxurl.indexOf( '?' ) > 0 ? '&' : '?' ) + 'action=woocommerce_shipping_zones_save_changes', {
+							wc_shipping_zones_nonce : data.wc_shipping_zones_nonce,
+							changes                 : this.changes
+						}, this.onSaveResponse, 'json' );
+					} else {
+						shippingZone.trigger( 'saved:zones' );
+					}
+				},
+				onSaveResponse: function( response, textStatus ) {
+					if ( 'success' === textStatus ) {
+						if ( response.success ) {
+							shippingZone.set( 'zones', response.data.zones );
+							shippingZone.trigger( 'change:zones' );
+							shippingZone.changes = {};
+							shippingZone.trigger( 'saved:zones' );
+						} else {
+							window.alert( data.strings.save_failed );
+						}
+					}
+				}
+			} ),
+
+			// Backbone view
+			ShippingZoneView = Backbone.View.extend({
+				rowTemplate: $row_template,
+				initialize: function() {
+					this.listenTo( this.model, 'change:zones', this.setUnloadConfirmation );
+					this.listenTo( this.model, 'saved:zones', this.clearUnloadConfirmation );
+					this.listenTo( this.model, 'saved:zones', this.render );
+					$tbody.on( 'change', { view: this }, this.updateModelOnChange );
+					$tbody.on( 'sortupdate', { view: this }, this.updateModelOnSort );
+					$( window ).on( 'beforeunload', { view: this }, this.unloadConfirmation );
+					$( document.body ).on( 'click', '.wc-shipping-zone-add', { view: this }, this.onAddNewRow );
+				},
+				block: function() {
+					$( this.el ).block({
+						message: null,
+						overlayCSS: {
+							background: '#fff',
+							opacity: 0.6
+						}
+					});
+				},
+				unblock: function() {
+					$( this.el ).unblock();
+				},
+				render: function() {
+					var zones = _.indexBy( this.model.get( 'zones' ), 'zone_id' ),
+						view  = this;
+
+					view.$el.empty();
+					view.unblock();
+
+					if ( _.size( zones ) ) {
+						// Sort zones
+						zones = _.sortBy( zones, function( zone ) {
+							return parseInt( zone.zone_order, 10 );
+						} );
+
+						// Populate $tbody with the current zones
+						$.each( zones, function( id, rowData ) {
+							view.renderRow( rowData );
+						} );
+					} else {
+						view.$el.append( $blank_template );
+					}
+
+					view.initRows();
+				},
+				renderRow: function( rowData ) {
+					var view = this;
+					view.$el.append( view.rowTemplate( rowData ) );
+					view.initRow( rowData );
+				},
+				initRow: function( rowData ) {
+					var view = this;
+					var $tr = view.$el.find( 'tr[data-id="' + rowData.zone_id + '"]');
+
+					// List shipping methods
+					view.renderShippingMethods( rowData.zone_id, rowData.shipping_methods );
+					$tr.find( '.wc-shipping-zone-delete' ).on( 'click', { view: this }, this.onDeleteRow );
+				},
+				initRows: function() {
+					// Stripe
+					if ( 0 === ( $( 'tbody.wc-shipping-zone-rows tr' ).length % 2 ) ) {
+						$table.find( 'tbody.wc-shipping-zone-rows' ).next( 'tbody' ).find( 'tr' ).addClass( 'odd' );
+					} else {
+						$table.find( 'tbody.wc-shipping-zone-rows' ).next( 'tbody' ).find( 'tr' ).removeClass( 'odd' );
+					}
+					// Tooltips
+					$( '#tiptip_holder' ).removeAttr( 'style' );
+					$( '#tiptip_arrow' ).removeAttr( 'style' );
+					$( '.tips' ).tipTip({ 'attribute': 'data-tip', 'fadeIn': 50, 'fadeOut': 50, 'delay': 50 });
+				},
+				renderShippingMethods: function( zone_id, shipping_methods ) {
+					var $tr          = $( '.wc-shipping-zones tr[data-id="' + zone_id + '"]');
+					var $method_list = $tr.find('.wc-shipping-zone-methods ul');
+
+					$method_list.find( '.wc-shipping-zone-method' ).remove();
+
+					if ( _.size( shipping_methods ) ) {
+						shipping_methods = _.sortBy( shipping_methods, function( method ) {
+							return parseInt( method.method_order, 10 );
+						} );
+
+						_.each( shipping_methods, function( shipping_method ) {
+							var class_name = 'method_disabled';
+
+							if ( 'yes' === shipping_method.enabled ) {
+								class_name = 'method_enabled';
+							}
+
+							$method_list.append( '<li class="wc-shipping-zone-method ' + class_name + '">' + shipping_method.title + '</li>' );
+						} );
+					} else {
+						$method_list.append( '<li class="wc-shipping-zone-method">' + data.strings.no_shipping_methods_offered + '</li>' );
+					}
+				},
+				onDeleteRow: function( event ) {
+					var view    = event.data.view,
+						model   = view.model,
+						zones   = _.indexBy( model.get( 'zones' ), 'zone_id' ),
+						changes = {},
+						row     = $( this ).closest('tr'),
+						zone_id = row.data('id');
+
+					event.preventDefault();
+
+					if ( window.confirm( data.strings.delete_confirmation_msg ) ) {
+						if ( zones[ zone_id ] ) {
+							delete zones[ zone_id ];
+							changes[ zone_id ] = _.extend( changes[ zone_id ] || {}, { deleted : 'deleted' } );
+							model.set( 'zones', zones );
+							model.logChanges( changes );
+							event.data.view.block();
+							event.data.view.model.save();
+						}
+					}
+				},
+				setUnloadConfirmation: function() {
+					this.needsUnloadConfirm = true;
+					$save_button.prop( 'disabled', false );
+				},
+				clearUnloadConfirmation: function() {
+					this.needsUnloadConfirm = false;
+					$save_button.prop( 'disabled', true );
+				},
+				unloadConfirmation: function( event ) {
+					if ( event.data.view.needsUnloadConfirm ) {
+						event.returnValue = data.strings.unload_confirmation_msg;
+						window.event.returnValue = data.strings.unload_confirmation_msg;
+						return data.strings.unload_confirmation_msg;
+					}
+				},
+				updateModelOnChange: function( event ) {
+					var model     = event.data.view.model,
+						$target   = $( event.target ),
+						zone_id   = $target.closest( 'tr' ).data( 'id' ),
+						attribute = $target.data( 'attribute' ),
+						value     = $target.val(),
+						zones   = _.indexBy( model.get( 'zones' ), 'zone_id' ),
+						changes = {};
+
+					if ( ! zones[ zone_id ] || zones[ zone_id ][ attribute ] !== value ) {
+						changes[ zone_id ] = {};
+						changes[ zone_id ][ attribute ] = value;
+					}
+
+					model.logChanges( changes );
+				},
+				updateModelOnSort: function( event ) {
+					var view    = event.data.view,
+						model   = view.model,
+						zones   = _.indexBy( model.get( 'zones' ), 'zone_id' ),
+						rows    = $( 'tbody.wc-shipping-zone-rows tr' ),
+						changes = {};
+
+					// Update sorted row position
+					_.each( rows, function( row ) {
+						var zone_id = $( row ).data( 'id' ),
+							old_position = null,
+							new_position = parseInt( $( row ).index(), 10 );
+
+						if ( zones[ zone_id ] ) {
+							old_position = parseInt( zones[ zone_id ].zone_order, 10 );
+						}
+
+						if ( old_position !== new_position ) {
+							changes[ zone_id ] = _.extend( changes[ zone_id ] || {}, { zone_order : new_position } );
+						}
+					} );
+
+					if ( _.size( changes ) ) {
+						model.logChanges( changes );
+						event.data.view.block();
+						event.data.view.model.save();
+					}
+				}
+			} ),
+			shippingZone = new ShippingZone({
+				zones: data.zones
+			} ),
+			shippingZoneView = new ShippingZoneView({
+				model:    shippingZone,
+				el:       $tbody
+			} );
+
+		shippingZoneView.render();
+
+		$tbody.sortable({
+			items: 'tr',
+			cursor: 'move',
+			axis: 'y',
+			handle: 'td.wc-shipping-zone-sort',
+			scrollSensitivity: 40
+		});
+	});
+})( jQuery, shippingZonesLocalizeScript, wp, ajaxurl );
diff --git a/assets/js/admin/wc-shipping-zones.min.js b/assets/js/admin/wc-shipping-zones.min.js
new file mode 100644
index 00000000000..3bfee69d1fd
--- /dev/null
+++ b/assets/js/admin/wc-shipping-zones.min.js
@@ -0,0 +1 @@
+!function(a,b,c,d){a(function(){var e=a(".wc-shipping-zones"),f=a(".wc-shipping-zone-rows"),g=a(".wc-shipping-zone-save"),h=c.template("wc-shipping-zone-row"),i=c.template("wc-shipping-zone-row-blank"),j=Backbone.Model.extend({changes:{},logChanges:function(a){var b=this.changes||{};_.each(a,function(a,c){b[c]=_.extend(b[c]||{zone_id:c},a)}),this.changes=b,this.trigger("change:zones")},discardChanges:function(a){var b=this.changes||{},c=null,d=_.indexBy(this.get("zones"),"zone_id");b[a]&&void 0!==b[a].zone_order&&(c=b[a].zone_order),delete b[a],null!==c&&d[a]&&d[a].zone_order!==c&&(b[a]=_.extend(b[a]||{},{zone_id:a,zone_order:c})),this.changes=b,0===_.size(this.changes)&&m.clearUnloadConfirmation()},save:function(){_.size(this.changes)?a.post(d+(d.indexOf("?")>0?"&":"?")+"action=woocommerce_shipping_zones_save_changes",{wc_shipping_zones_nonce:b.wc_shipping_zones_nonce,changes:this.changes},this.onSaveResponse,"json"):l.trigger("saved:zones")},onSaveResponse:function(a,c){"success"===c&&(a.success?(l.set("zones",a.data.zones),l.trigger("change:zones"),l.changes={},l.trigger("saved:zones")):window.alert(b.strings.save_failed))}}),k=Backbone.View.extend({rowTemplate:h,initialize:function(){this.listenTo(this.model,"change:zones",this.setUnloadConfirmation),this.listenTo(this.model,"saved:zones",this.clearUnloadConfirmation),this.listenTo(this.model,"saved:zones",this.render),f.on("change",{view:this},this.updateModelOnChange),f.on("sortupdate",{view:this},this.updateModelOnSort),a(window).on("beforeunload",{view:this},this.unloadConfirmation),a(document.body).on("click",".wc-shipping-zone-add",{view:this},this.onAddNewRow)},block:function(){a(this.el).block({message:null,overlayCSS:{background:"#fff",opacity:.6}})},unblock:function(){a(this.el).unblock()},render:function(){var b=_.indexBy(this.model.get("zones"),"zone_id"),c=this;c.$el.empty(),c.unblock(),_.size(b)?(b=_.sortBy(b,function(a){return parseInt(a.zone_order,10)}),a.each(b,function(a,b){c.renderRow(b)})):c.$el.append(i),c.initRows()},renderRow:function(a){var b=this;b.$el.append(b.rowTemplate(a)),b.initRow(a)},initRow:function(a){var b=this,c=b.$el.find('tr[data-id="'+a.zone_id+'"]');b.renderShippingMethods(a.zone_id,a.shipping_methods),c.find(".wc-shipping-zone-delete").on("click",{view:this},this.onDeleteRow)},initRows:function(){0===a("tbody.wc-shipping-zone-rows tr").length%2?e.find("tbody.wc-shipping-zone-rows").next("tbody").find("tr").addClass("odd"):e.find("tbody.wc-shipping-zone-rows").next("tbody").find("tr").removeClass("odd"),a("#tiptip_holder").removeAttr("style"),a("#tiptip_arrow").removeAttr("style"),a(".tips").tipTip({attribute:"data-tip",fadeIn:50,fadeOut:50,delay:50})},renderShippingMethods:function(c,d){var e=a('.wc-shipping-zones tr[data-id="'+c+'"]'),f=e.find(".wc-shipping-zone-methods ul");f.find(".wc-shipping-zone-method").remove(),_.size(d)?(d=_.sortBy(d,function(a){return parseInt(a.method_order,10)}),_.each(d,function(a){var b="method_disabled";"yes"===a.enabled&&(b="method_enabled"),f.append('<li class="wc-shipping-zone-method '+b+'">'+a.title+"</li>")})):f.append('<li class="wc-shipping-zone-method">'+b.strings.no_shipping_methods_offered+"</li>")},onDeleteRow:function(c){var d=c.data.view,e=d.model,f=_.indexBy(e.get("zones"),"zone_id"),g={},h=a(this).closest("tr"),i=h.data("id");c.preventDefault(),window.confirm(b.strings.delete_confirmation_msg)&&f[i]&&(delete f[i],g[i]=_.extend(g[i]||{},{deleted:"deleted"}),e.set("zones",f),e.logChanges(g),c.data.view.block(),c.data.view.model.save())},setUnloadConfirmation:function(){this.needsUnloadConfirm=!0,g.prop("disabled",!1)},clearUnloadConfirmation:function(){this.needsUnloadConfirm=!1,g.prop("disabled",!0)},unloadConfirmation:function(a){if(a.data.view.needsUnloadConfirm)return a.returnValue=b.strings.unload_confirmation_msg,window.event.returnValue=b.strings.unload_confirmation_msg,b.strings.unload_confirmation_msg},updateModelOnChange:function(b){var c=b.data.view.model,d=a(b.target),e=d.closest("tr").data("id"),f=d.data("attribute"),g=d.val(),h=_.indexBy(c.get("zones"),"zone_id"),i={};h[e]&&h[e][f]===g||(i[e]={},i[e][f]=g),c.logChanges(i)},updateModelOnSort:function(b){var c=b.data.view,d=c.model,e=_.indexBy(d.get("zones"),"zone_id"),f=a("tbody.wc-shipping-zone-rows tr"),g={};_.each(f,function(b){var c=a(b).data("id"),d=null,f=parseInt(a(b).index(),10);e[c]&&(d=parseInt(e[c].zone_order,10)),d!==f&&(g[c]=_.extend(g[c]||{},{zone_order:f}))}),_.size(g)&&(d.logChanges(g),b.data.view.block(),b.data.view.model.save())}}),l=new j({zones:b.zones}),m=new k({model:l,el:f});m.render(),f.sortable({items:"tr",cursor:"move",axis:"y",handle:"td.wc-shipping-zone-sort",scrollSensitivity:40})})}(jQuery,shippingZonesLocalizeScript,wp,ajaxurl);
\ No newline at end of file
diff --git a/assets/js/admin/woocommerce_admin.js b/assets/js/admin/woocommerce_admin.js
index be14474be02..e36b7e6b846 100644
--- a/assets/js/admin/woocommerce_admin.js
+++ b/assets/js/admin/woocommerce_admin.js
@@ -7,10 +7,11 @@ jQuery( function ( $ ) {
 
 	// Field validation error tips
 	$( document.body )
+
 		.on( 'wc_add_error_tip', function( e, element, error_type ) {
 			var offset = element.position();
 
-			if ( element.parent().find( '.wc_error_tip' ).size() === 0 ) {
+			if ( element.parent().find( '.wc_error_tip' ).length === 0 ) {
 				element.after( '<div class="wc_error_tip ' + error_type + '">' + woocommerce_admin[error_type] + '</div>' );
 				element.parent().find( '.wc_error_tip' )
 					.css( 'left', offset.left + element.width() - ( element.width() / 2 ) - ( $( '.wc_error_tip' ).width() / 2 ) )
@@ -18,51 +19,78 @@ jQuery( function ( $ ) {
 					.fadeIn( '100' );
 			}
 		})
+
 		.on( 'wc_remove_error_tip', function( e, element, error_type ) {
-			element.parent().find( '.wc_error_tip.' + error_type ).remove();
+			element.parent().find( '.wc_error_tip.' + error_type ).fadeOut( '100', function() { $( this ).remove(); } );
 		})
+
 		.on( 'click', function() {
 			$( '.wc_error_tip' ).fadeOut( '100', function() { $( this ).remove(); } );
 		})
+
 		.on( 'blur', '.wc_input_decimal[type=text], .wc_input_price[type=text], .wc_input_country_iso[type=text]', function() {
 			$( '.wc_error_tip' ).fadeOut( '100', function() { $( this ).remove(); } );
 		})
-		.on( 'keyup change', '.wc_input_price[type=text]', function() {
+
+		.on( 'change', '.wc_input_price[type=text], .wc_input_decimal[type=text], .wc-order-totals #refund_amount[type=text]', function() {
+			var regex;
+
+			if ( $( this ).is( '.wc_input_price' ) || $( this ).is( '#refund_amount' ) ) {
+				regex = new RegExp( '[^\-0-9\%\\' + woocommerce_admin.mon_decimal_point + ']+', 'gi' );
+			} else {
+				regex = new RegExp( '[^\-0-9\%\\' + woocommerce_admin.decimal_point + ']+', 'gi' );
+			}
+
 			var value    = $( this ).val();
-			var regex    = new RegExp( '[^\-0-9\%\\' + woocommerce_admin.mon_decimal_point + ']+', 'gi' );
 			var newvalue = value.replace( regex, '' );
 
 			if ( value !== newvalue ) {
 				$( this ).val( newvalue );
-				$( document.body ).triggerHandler( 'wc_add_error_tip', [ $( this ), 'i18n_mon_decimal_error' ] );
-			} else {
-				$( document.body ).triggerHandler( 'wc_remove_error_tip', [ $( this ), 'i18n_mon_decimal_error' ] );
 			}
 		})
-		.on( 'keyup change', '.wc_input_decimal[type=text]', function() {
+
+		.on( 'keyup', '.wc_input_price[type=text], .wc_input_decimal[type=text], .wc_input_country_iso[type=text], .wc-order-totals #refund_amount[type=text]', function() {
+			var regex, error;
+
+			if ( $( this ).is( '.wc_input_price' ) || $( this ).is( '#refund_amount' ) ) {
+				regex = new RegExp( '[^\-0-9\%\\' + woocommerce_admin.mon_decimal_point + ']+', 'gi' );
+				error = 'i18n_mon_decimal_error';
+			} else if ( $( this ).is( '.wc_input_country_iso' ) ) {
+				regex = new RegExp( '([^A-Z])+|(.){3,}', 'im' );
+				error = 'i18n_country_iso_error';
+			} else {
+				regex = new RegExp( '[^\-0-9\%\\' + woocommerce_admin.decimal_point + ']+', 'gi' );
+				error = 'i18n_decimal_error';
+			}
+
 			var value    = $( this ).val();
-			var regex    = new RegExp( '[^\-0-9\%\\' + woocommerce_admin.decimal_point + ']+', 'gi' );
 			var newvalue = value.replace( regex, '' );
 
 			if ( value !== newvalue ) {
-				$( this ).val( newvalue );
-				$( document.body ).triggerHandler( 'wc_add_error_tip', [ $( this ), 'i18n_decimal_error' ] );
+				$( document.body ).triggerHandler( 'wc_add_error_tip', [ $( this ), error ] );
 			} else {
-				$( document.body ).triggerHandler( 'wc_remove_error_tip', [ $( this ), 'i18n_decimal_error' ] );
+				$( document.body ).triggerHandler( 'wc_remove_error_tip', [ $( this ), error ] );
 			}
 		})
-		.on( 'keyup change', '.wc_input_country_iso[type=text]', function() {
-			var value = $( this ).val();
-			var regex = new RegExp( '^([A-Z])?([A-Z])$' );
 
-			if ( ! regex.test( value ) ) {
+		.on( 'change', '#_sale_price.wc_input_price[type=text], .wc_input_price[name^=variable_sale_price]', function() {
+			var sale_price_field = $( this ), regular_price_field;
+
+			if( sale_price_field.attr( 'name' ).indexOf( 'variable' ) !== -1 ) {
+				regular_price_field = sale_price_field.parents( '.variable_pricing' ).find( '.wc_input_price[name^=variable_regular_price]' );
+			} else {
+				regular_price_field = $( '#_regular_price' );
+			}
+
+			var sale_price    = parseFloat( window.accounting.unformat( sale_price_field.val(), woocommerce_admin.mon_decimal_point ) );
+			var regular_price = parseFloat( window.accounting.unformat( regular_price_field.val(), woocommerce_admin.mon_decimal_point ) );
+
+			if ( sale_price >= regular_price ) {
 				$( this ).val( '' );
-				$( document.body ).triggerHandler( 'wc_add_error_tip', [ $( this ), 'i18n_country_iso_error' ] );
-			} else {
-				$( document.body ).triggerHandler( 'wc_remove_error_tip', [ $( this ), 'i18n_country_iso_error' ] );
 			}
 		})
-		.on( 'keyup change', '#_sale_price.wc_input_price[type=text], .wc_input_price[name^=variable_sale_price]', function() {
+
+		.on( 'keyup', '#_sale_price.wc_input_price[type=text], .wc_input_price[name^=variable_sale_price]', function() {
 			var sale_price_field = $( this ), regular_price_field;
 
 			if( sale_price_field.attr( 'name' ).indexOf( 'variable' ) !== -1 ) {
@@ -79,21 +107,26 @@ jQuery( function ( $ ) {
 			} else {
 				$( document.body ).triggerHandler( 'wc_remove_error_tip', [ $(this), 'i18_sale_less_than_regular_error' ] );
 			}
+		})
+
+		.on( 'init_tooltips', function() {
+			var tiptip_args = {
+				'attribute': 'data-tip',
+				'fadeIn': 50,
+				'fadeOut': 50,
+				'delay': 200
+			};
+
+			$( '.tips, .help_tip, .woocommerce-help-tip' ).tipTip( tiptip_args );
+
+			// Add tiptip to parent element for widefat tables
+			$( '.parent-tips' ).each( function() {
+				$( this ).closest( 'a, th' ).attr( 'data-tip', $( this ).data( 'tip' ) ).tipTip( tiptip_args ).css( 'cursor', 'help' );
+			});
 		});
 
 	// Tooltips
-	var tiptip_args = {
-		'attribute': 'data-tip',
-		'fadeIn': 50,
-		'fadeOut': 50,
-		'delay': 200
-	};
-	$( '.tips, .help_tip, .woocommerce-help-tip' ).tipTip( tiptip_args );
-
-	// Add tiptip to parent element for widefat tables
-	$( '.parent-tips' ).each( function() {
-		$( this ).closest( 'a, th' ).attr( 'data-tip', $( this ).data( 'tip' ) ).tipTip( tiptip_args ).css( 'cursor', 'help' );
-	});
+	$( document.body ).trigger( 'init_tooltips' );
 
 	// wc_input_table tables
 	$( '.wc_input_table.sortable tbody' ).sortable({
@@ -115,7 +148,7 @@ jQuery( function ( $ ) {
 
 	$( '.wc_input_table .remove_rows' ).click( function() {
 		var $tbody = $( this ).closest( '.wc_input_table' ).find( 'tbody' );
-		if ( $tbody.find( 'tr.current' ).size() > 0 ) {
+		if ( $tbody.find( 'tr.current' ).length > 0 ) {
 			var $current = $tbody.find( 'tr.current' );
 			$current.each( function() {
 				$( this ).remove();
@@ -125,15 +158,16 @@ jQuery( function ( $ ) {
 	});
 
 	var controlled = false;
-	var shifted = false;
-	var hasFocus = false;
+	var shifted    = false;
+	var hasFocus   = false;
 
 	$( document.body ).bind( 'keyup keydown', function( e ) {
-		shifted = e.shiftKey; controlled = e.ctrlKey || e.metaKey;
+		shifted    = e.shiftKey;
+		controlled = e.ctrlKey || e.metaKey;
 	});
 
 	$( '.wc_input_table' ).on( 'focus click', 'input', function( e ) {
-		var $this_table = $( this ).closest( 'table' );
+		var $this_table = $( this ).closest( 'table, tbody' );
 		var $this_row   = $( this ).closest( 'tr' );
 
 		if ( ( e.type === 'focus' && hasFocus !== $this_row.index() ) || ( e.type === 'click' && $( this ).is( ':focus' ) ) ) {
@@ -146,7 +180,7 @@ jQuery( function ( $ ) {
 				$( 'tr', $this_table ).removeClass( 'current' );
 				$this_row.addClass( 'selected_now' ).addClass( 'current' );
 
-				if ( $( 'tr.last_selected', $this_table ).size() > 0 ) {
+				if ( $( 'tr.last_selected', $this_table ).length > 0 ) {
 					if ( $this_row.index() > $( 'tr.last_selected', $this_table ).index() ) {
 						$( 'tr', $this_table ).slice( $( 'tr.last_selected', $this_table ).index(), $this_row.index() ).addClass( 'current' );
 					} else {
@@ -221,4 +255,11 @@ jQuery( function ( $ ) {
 
 	// Attribute term table
 	$( 'table.attributes-table tbody tr:nth-child(odd)' ).addClass( 'alternate' );
+
+	// Load videos when help button is clicked.
+	$( '#contextual-help-link' ).on( 'click', function() {
+		var frame = $( '#tab-panel-woocommerce_guided_tour_tab iframe' );
+
+		frame.attr( 'src', frame.data( 'src' ) );
+	});
 });
diff --git a/assets/js/admin/woocommerce_admin.min.js b/assets/js/admin/woocommerce_admin.min.js
index 73564cbb26c..fc6d848b306 100644
--- a/assets/js/admin/woocommerce_admin.min.js
+++ b/assets/js/admin/woocommerce_admin.min.js
@@ -1 +1 @@
-jQuery(function(a){a(document.body).on("wc_add_error_tip",function(b,c,d){var e=c.position();0===c.parent().find(".wc_error_tip").size()&&(c.after('<div class="wc_error_tip '+d+'">'+woocommerce_admin[d]+"</div>"),c.parent().find(".wc_error_tip").css("left",e.left+c.width()-c.width()/2-a(".wc_error_tip").width()/2).css("top",e.top+c.height()).fadeIn("100"))}).on("wc_remove_error_tip",function(a,b,c){b.parent().find(".wc_error_tip."+c).remove()}).on("click",function(){a(".wc_error_tip").fadeOut("100",function(){a(this).remove()})}).on("blur",".wc_input_decimal[type=text], .wc_input_price[type=text], .wc_input_country_iso[type=text]",function(){a(".wc_error_tip").fadeOut("100",function(){a(this).remove()})}).on("keyup change",".wc_input_price[type=text]",function(){var b=a(this).val(),c=new RegExp("[^-0-9%\\"+woocommerce_admin.mon_decimal_point+"]+","gi"),d=b.replace(c,"");b!==d?(a(this).val(d),a(document.body).triggerHandler("wc_add_error_tip",[a(this),"i18n_mon_decimal_error"])):a(document.body).triggerHandler("wc_remove_error_tip",[a(this),"i18n_mon_decimal_error"])}).on("keyup change",".wc_input_decimal[type=text]",function(){var b=a(this).val(),c=new RegExp("[^-0-9%\\"+woocommerce_admin.decimal_point+"]+","gi"),d=b.replace(c,"");b!==d?(a(this).val(d),a(document.body).triggerHandler("wc_add_error_tip",[a(this),"i18n_decimal_error"])):a(document.body).triggerHandler("wc_remove_error_tip",[a(this),"i18n_decimal_error"])}).on("keyup change",".wc_input_country_iso[type=text]",function(){var b=a(this).val(),c=new RegExp("^([A-Z])?([A-Z])$");c.test(b)?a(document.body).triggerHandler("wc_remove_error_tip",[a(this),"i18n_country_iso_error"]):(a(this).val(""),a(document.body).triggerHandler("wc_add_error_tip",[a(this),"i18n_country_iso_error"]))}).on("keyup change","#_sale_price.wc_input_price[type=text], .wc_input_price[name^=variable_sale_price]",function(){var b,c=a(this);b=-1!==c.attr("name").indexOf("variable")?c.parents(".variable_pricing").find(".wc_input_price[name^=variable_regular_price]"):a("#_regular_price");var d=parseFloat(window.accounting.unformat(c.val(),woocommerce_admin.mon_decimal_point)),e=parseFloat(window.accounting.unformat(b.val(),woocommerce_admin.mon_decimal_point));d>=e?a(document.body).triggerHandler("wc_add_error_tip",[a(this),"i18_sale_less_than_regular_error"]):a(document.body).triggerHandler("wc_remove_error_tip",[a(this),"i18_sale_less_than_regular_error"])});var b={attribute:"data-tip",fadeIn:50,fadeOut:50,delay:200};a(".tips, .help_tip, .woocommerce-help-tip").tipTip(b),a(".parent-tips").each(function(){a(this).closest("a, th").attr("data-tip",a(this).data("tip")).tipTip(b).css("cursor","help")}),a(".wc_input_table.sortable tbody").sortable({items:"tr",cursor:"move",axis:"y",scrollSensitivity:40,forcePlaceholderSize:!0,helper:"clone",opacity:.65,placeholder:"wc-metabox-sortable-placeholder",start:function(a,b){b.item.css("background-color","#f6f6f6")},stop:function(a,b){b.item.removeAttr("style")}}),a(".wc_input_table .remove_rows").click(function(){var b=a(this).closest(".wc_input_table").find("tbody");if(b.find("tr.current").size()>0){var c=b.find("tr.current");c.each(function(){a(this).remove()})}return!1});var c=!1,d=!1,e=!1;a(document.body).bind("keyup keydown",function(a){d=a.shiftKey,c=a.ctrlKey||a.metaKey}),a(".wc_input_table").on("focus click","input",function(b){var f=a(this).closest("table"),g=a(this).closest("tr");("focus"===b.type&&e!==g.index()||"click"===b.type&&a(this).is(":focus"))&&(e=g.index(),d||c?d?(a("tr",f).removeClass("current"),g.addClass("selected_now").addClass("current"),a("tr.last_selected",f).size()>0&&(g.index()>a("tr.last_selected",f).index()?a("tr",f).slice(a("tr.last_selected",f).index(),g.index()).addClass("current"):a("tr",f).slice(g.index(),a("tr.last_selected",f).index()+1).addClass("current")),a("tr",f).removeClass("last_selected"),g.addClass("last_selected")):(a("tr",f).removeClass("last_selected"),c&&a(this).closest("tr").is(".current")?g.removeClass("current"):g.addClass("current").addClass("last_selected")):(a("tr",f).removeClass("current").removeClass("last_selected"),g.addClass("current").addClass("last_selected")),a("tr",f).removeClass("selected_now"))}).on("blur","input",function(){e=!1}),a(".woocommerce_page_wc-settings .shippingrows tbody tr:even, table.attributes-table tbody tr:nth-child(odd)").addClass("alternate"),a(document.body).on("click",".show_order_items",function(){return a(this).closest("td").find("table").toggle(),!1}),a("select.availability").change(function(){"all"===a(this).val()?a(this).closest("tr").next("tr").hide():a(this).closest("tr").next("tr").show()}).change(),a(".hide_options_if_checked").each(function(){a(this).find("input:eq(0)").change(function(){a(this).is(":checked")?a(this).closest("fieldset, tr").nextUntil(".hide_options_if_checked, .show_options_if_checked",".hidden_option").hide():a(this).closest("fieldset, tr").nextUntil(".hide_options_if_checked, .show_options_if_checked",".hidden_option").show()}).change()}),a(".show_options_if_checked").each(function(){a(this).find("input:eq(0)").change(function(){a(this).is(":checked")?a(this).closest("fieldset, tr").nextUntil(".hide_options_if_checked, .show_options_if_checked",".hidden_option").show():a(this).closest("fieldset, tr").nextUntil(".hide_options_if_checked, .show_options_if_checked",".hidden_option").hide()}).change()}),a("input#woocommerce_demo_store").change(function(){a(this).is(":checked")?a("#woocommerce_demo_store_notice").closest("tr").show():a("#woocommerce_demo_store_notice").closest("tr").hide()}).change(),a("table.attributes-table tbody tr:nth-child(odd)").addClass("alternate")});
\ No newline at end of file
+jQuery(function(a){a(document.body).on("wc_add_error_tip",function(b,c,d){var e=c.position();0===c.parent().find(".wc_error_tip").length&&(c.after('<div class="wc_error_tip '+d+'">'+woocommerce_admin[d]+"</div>"),c.parent().find(".wc_error_tip").css("left",e.left+c.width()-c.width()/2-a(".wc_error_tip").width()/2).css("top",e.top+c.height()).fadeIn("100"))}).on("wc_remove_error_tip",function(b,c,d){c.parent().find(".wc_error_tip."+d).fadeOut("100",function(){a(this).remove()})}).on("click",function(){a(".wc_error_tip").fadeOut("100",function(){a(this).remove()})}).on("blur",".wc_input_decimal[type=text], .wc_input_price[type=text], .wc_input_country_iso[type=text]",function(){a(".wc_error_tip").fadeOut("100",function(){a(this).remove()})}).on("change",".wc_input_price[type=text], .wc_input_decimal[type=text], .wc-order-totals #refund_amount[type=text]",function(){var b;b=a(this).is(".wc_input_price")||a(this).is("#refund_amount")?new RegExp("[^-0-9%\\"+woocommerce_admin.mon_decimal_point+"]+","gi"):new RegExp("[^-0-9%\\"+woocommerce_admin.decimal_point+"]+","gi");var c=a(this).val(),d=c.replace(b,"");c!==d&&a(this).val(d)}).on("keyup",".wc_input_price[type=text], .wc_input_decimal[type=text], .wc_input_country_iso[type=text], .wc-order-totals #refund_amount[type=text]",function(){var b,c;a(this).is(".wc_input_price")||a(this).is("#refund_amount")?(b=new RegExp("[^-0-9%\\"+woocommerce_admin.mon_decimal_point+"]+","gi"),c="i18n_mon_decimal_error"):a(this).is(".wc_input_country_iso")?(b=new RegExp("([^A-Z])+|(.){3,}","im"),c="i18n_country_iso_error"):(b=new RegExp("[^-0-9%\\"+woocommerce_admin.decimal_point+"]+","gi"),c="i18n_decimal_error");var d=a(this).val(),e=d.replace(b,"");d!==e?a(document.body).triggerHandler("wc_add_error_tip",[a(this),c]):a(document.body).triggerHandler("wc_remove_error_tip",[a(this),c])}).on("change","#_sale_price.wc_input_price[type=text], .wc_input_price[name^=variable_sale_price]",function(){var b,c=a(this);b=c.attr("name").indexOf("variable")!==-1?c.parents(".variable_pricing").find(".wc_input_price[name^=variable_regular_price]"):a("#_regular_price");var d=parseFloat(window.accounting.unformat(c.val(),woocommerce_admin.mon_decimal_point)),e=parseFloat(window.accounting.unformat(b.val(),woocommerce_admin.mon_decimal_point));d>=e&&a(this).val("")}).on("keyup","#_sale_price.wc_input_price[type=text], .wc_input_price[name^=variable_sale_price]",function(){var b,c=a(this);b=c.attr("name").indexOf("variable")!==-1?c.parents(".variable_pricing").find(".wc_input_price[name^=variable_regular_price]"):a("#_regular_price");var d=parseFloat(window.accounting.unformat(c.val(),woocommerce_admin.mon_decimal_point)),e=parseFloat(window.accounting.unformat(b.val(),woocommerce_admin.mon_decimal_point));d>=e?a(document.body).triggerHandler("wc_add_error_tip",[a(this),"i18_sale_less_than_regular_error"]):a(document.body).triggerHandler("wc_remove_error_tip",[a(this),"i18_sale_less_than_regular_error"])}).on("init_tooltips",function(){var b={attribute:"data-tip",fadeIn:50,fadeOut:50,delay:200};a(".tips, .help_tip, .woocommerce-help-tip").tipTip(b),a(".parent-tips").each(function(){a(this).closest("a, th").attr("data-tip",a(this).data("tip")).tipTip(b).css("cursor","help")})}),a(document.body).trigger("init_tooltips"),a(".wc_input_table.sortable tbody").sortable({items:"tr",cursor:"move",axis:"y",scrollSensitivity:40,forcePlaceholderSize:!0,helper:"clone",opacity:.65,placeholder:"wc-metabox-sortable-placeholder",start:function(a,b){b.item.css("background-color","#f6f6f6")},stop:function(a,b){b.item.removeAttr("style")}}),a(".wc_input_table .remove_rows").click(function(){var b=a(this).closest(".wc_input_table").find("tbody");if(b.find("tr.current").length>0){var c=b.find("tr.current");c.each(function(){a(this).remove()})}return!1});var b=!1,c=!1,d=!1;a(document.body).bind("keyup keydown",function(a){c=a.shiftKey,b=a.ctrlKey||a.metaKey}),a(".wc_input_table").on("focus click","input",function(e){var f=a(this).closest("table, tbody"),g=a(this).closest("tr");("focus"===e.type&&d!==g.index()||"click"===e.type&&a(this).is(":focus"))&&(d=g.index(),c||b?c?(a("tr",f).removeClass("current"),g.addClass("selected_now").addClass("current"),a("tr.last_selected",f).length>0&&(g.index()>a("tr.last_selected",f).index()?a("tr",f).slice(a("tr.last_selected",f).index(),g.index()).addClass("current"):a("tr",f).slice(g.index(),a("tr.last_selected",f).index()+1).addClass("current")),a("tr",f).removeClass("last_selected"),g.addClass("last_selected")):(a("tr",f).removeClass("last_selected"),b&&a(this).closest("tr").is(".current")?g.removeClass("current"):g.addClass("current").addClass("last_selected")):(a("tr",f).removeClass("current").removeClass("last_selected"),g.addClass("current").addClass("last_selected")),a("tr",f).removeClass("selected_now"))}).on("blur","input",function(){d=!1}),a(".woocommerce_page_wc-settings .shippingrows tbody tr:even, table.attributes-table tbody tr:nth-child(odd)").addClass("alternate"),a(document.body).on("click",".show_order_items",function(){return a(this).closest("td").find("table").toggle(),!1}),a("select.availability").change(function(){"all"===a(this).val()?a(this).closest("tr").next("tr").hide():a(this).closest("tr").next("tr").show()}).change(),a(".hide_options_if_checked").each(function(){a(this).find("input:eq(0)").change(function(){a(this).is(":checked")?a(this).closest("fieldset, tr").nextUntil(".hide_options_if_checked, .show_options_if_checked",".hidden_option").hide():a(this).closest("fieldset, tr").nextUntil(".hide_options_if_checked, .show_options_if_checked",".hidden_option").show()}).change()}),a(".show_options_if_checked").each(function(){a(this).find("input:eq(0)").change(function(){a(this).is(":checked")?a(this).closest("fieldset, tr").nextUntil(".hide_options_if_checked, .show_options_if_checked",".hidden_option").show():a(this).closest("fieldset, tr").nextUntil(".hide_options_if_checked, .show_options_if_checked",".hidden_option").hide()}).change()}),a("input#woocommerce_demo_store").change(function(){a(this).is(":checked")?a("#woocommerce_demo_store_notice").closest("tr").show():a("#woocommerce_demo_store_notice").closest("tr").hide()}).change(),a("table.attributes-table tbody tr:nth-child(odd)").addClass("alternate"),a("#contextual-help-link").on("click",function(){var b=a("#tab-panel-woocommerce_guided_tour_tab iframe");b.attr("src",b.data("src"))})});
\ No newline at end of file
diff --git a/assets/js/chosen/ajax-chosen.jquery.js b/assets/js/chosen/ajax-chosen.jquery.js
deleted file mode 100644
index f823a9b103d..00000000000
--- a/assets/js/chosen/ajax-chosen.jquery.js
+++ /dev/null
@@ -1,81 +0,0 @@
-// Generated by CoffeeScript 1.3.1
-
-(function($) {
-  return $.fn.ajaxChosen = function(settings, callback) {
-    var chosenXhr, defaultOptions, options, select;
-    if (settings == null) {
-      settings = {};
-    }
-    if (callback == null) {
-      callback = function() {};
-    }
-    defaultOptions = {
-      minTermLength: 3,
-      afterTypeDelay: 500,
-      jsonTermKey: "term"
-    };
-    select = this;
-    chosenXhr = null;
-    options = $.extend({}, defaultOptions, settings);
-    this.chosen();
-    return this.each(function() {
-      return $(this).next('.chosen-container').find(".search-field > input, .chosen-search > input").bind('keyup', function() {
-        var field, msg, success, val;
-        val = $.trim($(this).attr('value'));
-        msg = val.length < options.minTermLength ? "Keep typing..." : "Looking for '" + val + "'";
-        select.next('.chosen-container').find('.no-results').text(msg);
-        if (val === $(this).data('prevVal')) {
-          return false;
-        }
-        $(this).data('prevVal', val);
-        if (this.timer) {
-          clearTimeout(this.timer);
-        }
-        if (val.length < options.minTermLength) {
-          return false;
-        }
-        field = $(this);
-        if (!(options.data != null)) {
-          options.data = {};
-        }
-        options.data[options.jsonTermKey] = val;
-        if (options.dataCallback != null) {
-          options.data = options.dataCallback(options.data);
-        }
-        success = options.success;
-        options.success = function(data) {
-          var items, selected_values;
-          if (!(data != null)) {
-            return;
-          }
-          selected_values = [];
-          select.find('option').each(function() {
-            if (!$(this).is(":selected")) {
-              return $(this).remove();
-            } else {
-              return selected_values.push($(this).val() + "-" + $(this).text());
-            }
-          });
-          items = callback(data);
-          $.each(items, function(value, text) {
-            if ($.inArray(value + "-" + text, selected_values) === -1) {
-              return $("<option />").attr('value', value).html(text).appendTo(select);
-            }
-          });
-          select.trigger("chosen:updated");
-          if (success != null) {
-            success(data);
-          }
-          field.attr('value', val);
-          return field.css('width', 'auto');
-        };
-        return this.timer = setTimeout(function() {
-          if (chosenXhr) {
-            chosenXhr.abort();
-          }
-          return chosenXhr = $.ajax(options);
-        }, options.afterTypeDelay);
-      });
-    });
-  };
-})(jQuery);
\ No newline at end of file
diff --git a/assets/js/chosen/ajax-chosen.jquery.min.js b/assets/js/chosen/ajax-chosen.jquery.min.js
deleted file mode 100644
index dddce55c047..00000000000
--- a/assets/js/chosen/ajax-chosen.jquery.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by CoffeeScript 1.3.1
-(function(e){return e.fn.ajaxChosen=function(t,n){var r,i,s,o;t==null&&(t={});n==null&&(n=function(){});i={minTermLength:3,afterTypeDelay:500,jsonTermKey:"term"};o=this;r=null;s=e.extend({},i,t);this.chosen();return this.each(function(){return e(this).next(".chosen-container").find(".search-field > input, .chosen-search > input").bind("keyup",function(){var t,i,u,a;a=e.trim(e(this).attr("value"));i=a.length<s.minTermLength?"Keep typing...":"Looking for '"+a+"'";o.next(".chosen-container").find(".no-results").text(i);if(a===e(this).data("prevVal"))return!1;e(this).data("prevVal",a);this.timer&&clearTimeout(this.timer);if(a.length<s.minTermLength)return!1;t=e(this);s.data==null&&(s.data={});s.data[s.jsonTermKey]=a;s.dataCallback!=null&&(s.data=s.dataCallback(s.data));u=s.success;s.success=function(r){var i,s;if(r==null)return;s=[];o.find("option").each(function(){return e(this).is(":selected")?s.push(e(this).val()+"-"+e(this).text()):e(this).remove()});i=n(r);e.each(i,function(t,n){if(e.inArray(t+"-"+n,s)===-1)return e("<option />").attr("value",t).html(n).appendTo(o)});o.trigger("chosen:updated");u!=null&&u(r);t.attr("value",a);return t.css("width","auto")};return this.timer=setTimeout(function(){r&&r.abort();return r=e.ajax(s)},s.afterTypeDelay)})})}})(jQuery);
\ No newline at end of file
diff --git a/assets/js/chosen/chosen-rtl.js b/assets/js/chosen/chosen-rtl.js
deleted file mode 100644
index d76d6aab456..00000000000
--- a/assets/js/chosen/chosen-rtl.js
+++ /dev/null
@@ -1,6 +0,0 @@
-jQuery(function($) {
-
-	// Fix Chosen for RTL
-	$('.chosen_select, .chosen_select_nostd, .product_attributes select.multiselect, select.country_select, select.state_select, select#dropdown_shop_coupon_type, select[name=m]').addClass('chosen-rtl');
-
-});
diff --git a/assets/js/chosen/chosen-rtl.min.js b/assets/js/chosen/chosen-rtl.min.js
deleted file mode 100644
index d3783aba8a4..00000000000
--- a/assets/js/chosen/chosen-rtl.min.js
+++ /dev/null
@@ -1 +0,0 @@
-jQuery(function(e){e(".chosen_select, .chosen_select_nostd, .product_attributes select.multiselect, select.country_select, select.state_select, select#dropdown_shop_coupon_type, select[name=m]").addClass("chosen-rtl")});
diff --git a/assets/js/chosen/chosen.jquery.js b/assets/js/chosen/chosen.jquery.js
deleted file mode 100644
index 1c9c9cd82f8..00000000000
--- a/assets/js/chosen/chosen.jquery.js
+++ /dev/null
@@ -1,1166 +0,0 @@
-// Chosen, a Select Box Enhancer for jQuery and Prototype
-// by Patrick Filler for Harvest, http://getharvest.com
-//
-// Version 1.0.0
-// Full source at https://github.com/harvesthq/chosen
-// Copyright (c) 2011 Harvest http://getharvest.com
-
-// MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md
-// This file is generated by `grunt build`, do not edit it by hand.
-(function() {
-  var $, AbstractChosen, Chosen, SelectParser, _ref,
-    __hasProp = {}.hasOwnProperty,
-    __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
-
-  SelectParser = (function() {
-    function SelectParser() {
-      this.options_index = 0;
-      this.parsed = [];
-    }
-
-    SelectParser.prototype.add_node = function(child) {
-      if (child.nodeName.toUpperCase() === "OPTGROUP") {
-        return this.add_group(child);
-      } else {
-        return this.add_option(child);
-      }
-    };
-
-    SelectParser.prototype.add_group = function(group) {
-      var group_position, option, _i, _len, _ref, _results;
-
-      group_position = this.parsed.length;
-      this.parsed.push({
-        array_index: group_position,
-        group: true,
-        label: this.escapeExpression(group.label),
-        children: 0,
-        disabled: group.disabled
-      });
-      _ref = group.childNodes;
-      _results = [];
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        option = _ref[_i];
-        _results.push(this.add_option(option, group_position, group.disabled));
-      }
-      return _results;
-    };
-
-    SelectParser.prototype.add_option = function(option, group_position, group_disabled) {
-      if (option.nodeName.toUpperCase() === "OPTION") {
-        if (option.text !== "") {
-          if (group_position != null) {
-            this.parsed[group_position].children += 1;
-          }
-          this.parsed.push({
-            array_index: this.parsed.length,
-            options_index: this.options_index,
-            value: option.value,
-            text: option.text,
-            html: option.innerHTML,
-            selected: option.selected,
-            disabled: group_disabled === true ? group_disabled : option.disabled,
-            group_array_index: group_position,
-            classes: option.className,
-            style: option.style.cssText
-          });
-        } else {
-          this.parsed.push({
-            array_index: this.parsed.length,
-            options_index: this.options_index,
-            empty: true
-          });
-        }
-        return this.options_index += 1;
-      }
-    };
-
-    SelectParser.prototype.escapeExpression = function(text) {
-      var map, unsafe_chars;
-
-      if ((text == null) || text === false) {
-        return "";
-      }
-      if (!/[\&\<\>\"\'\`]/.test(text)) {
-        return text;
-      }
-      map = {
-        "<": "&lt;",
-        ">": "&gt;",
-        '"': "&quot;",
-        "'": "&#x27;",
-        "`": "&#x60;"
-      };
-      unsafe_chars = /&(?!\w+;)|[\<\>\"\'\`]/g;
-      return text.replace(unsafe_chars, function(chr) {
-        return map[chr] || "&amp;";
-      });
-    };
-
-    return SelectParser;
-
-  })();
-
-  SelectParser.select_to_array = function(select) {
-    var child, parser, _i, _len, _ref;
-
-    parser = new SelectParser();
-    _ref = select.childNodes;
-    for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-      child = _ref[_i];
-      parser.add_node(child);
-    }
-    return parser.parsed;
-  };
-
-  AbstractChosen = (function() {
-    function AbstractChosen(form_field, options) {
-      this.form_field = form_field;
-      this.options = options != null ? options : {};
-      if (!AbstractChosen.browser_is_supported()) {
-        return;
-      }
-      this.is_multiple = this.form_field.multiple;
-      this.set_default_text();
-      this.set_default_values();
-      this.setup();
-      this.set_up_html();
-      this.register_observers();
-    }
-
-    AbstractChosen.prototype.set_default_values = function() {
-      var _this = this;
-
-      this.click_test_action = function(evt) {
-        return _this.test_active_click(evt);
-      };
-      this.activate_action = function(evt) {
-        return _this.activate_field(evt);
-      };
-      this.active_field = false;
-      this.mouse_on_container = false;
-      this.results_showing = false;
-      this.result_highlighted = null;
-      this.result_single_selected = null;
-      this.allow_single_deselect = (this.options.allow_single_deselect != null) && (this.form_field.options[0] != null) && this.form_field.options[0].text === "" ? this.options.allow_single_deselect : false;
-      this.disable_search_threshold = this.options.disable_search_threshold || 0;
-      this.disable_search = this.options.disable_search || false;
-      this.enable_split_word_search = this.options.enable_split_word_search != null ? this.options.enable_split_word_search : true;
-      this.group_search = this.options.group_search != null ? this.options.group_search : true;
-      this.search_contains = this.options.search_contains || false;
-      this.single_backstroke_delete = this.options.single_backstroke_delete != null ? this.options.single_backstroke_delete : true;
-      this.max_selected_options = this.options.max_selected_options || Infinity;
-      this.inherit_select_classes = this.options.inherit_select_classes || false;
-      this.display_selected_options = this.options.display_selected_options != null ? this.options.display_selected_options : true;
-      return this.display_disabled_options = this.options.display_disabled_options != null ? this.options.display_disabled_options : true;
-    };
-
-    AbstractChosen.prototype.set_default_text = function() {
-      if (this.form_field.getAttribute("data-placeholder")) {
-        this.default_text = this.form_field.getAttribute("data-placeholder");
-      } else if (this.is_multiple) {
-        this.default_text = this.options.placeholder_text_multiple || this.options.placeholder_text || AbstractChosen.default_multiple_text;
-      } else {
-        this.default_text = this.options.placeholder_text_single || this.options.placeholder_text || AbstractChosen.default_single_text;
-      }
-      return this.results_none_found = this.form_field.getAttribute("data-no_results_text") || this.options.no_results_text || AbstractChosen.default_no_result_text;
-    };
-
-    AbstractChosen.prototype.mouse_enter = function() {
-      return this.mouse_on_container = true;
-    };
-
-    AbstractChosen.prototype.mouse_leave = function() {
-      return this.mouse_on_container = false;
-    };
-
-    AbstractChosen.prototype.input_focus = function(evt) {
-      var _this = this;
-
-      if (this.is_multiple) {
-        if (!this.active_field) {
-          return setTimeout((function() {
-            return _this.container_mousedown();
-          }), 50);
-        }
-      } else {
-        if (!this.active_field) {
-          return this.activate_field();
-        }
-      }
-    };
-
-    AbstractChosen.prototype.input_blur = function(evt) {
-      var _this = this;
-
-      if (!this.mouse_on_container) {
-        this.active_field = false;
-        return setTimeout((function() {
-          return _this.blur_test();
-        }), 100);
-      }
-    };
-
-    AbstractChosen.prototype.results_option_build = function(options) {
-      var content, data, _i, _len, _ref;
-
-      content = '';
-      _ref = this.results_data;
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        data = _ref[_i];
-        if (data.group) {
-          content += this.result_add_group(data);
-        } else {
-          content += this.result_add_option(data);
-        }
-        if (options != null ? options.first : void 0) {
-          if (data.selected && this.is_multiple) {
-            this.choice_build(data);
-          } else if (data.selected && !this.is_multiple) {
-            this.single_set_selected_text(data.text);
-          }
-        }
-      }
-      return content;
-    };
-
-    AbstractChosen.prototype.result_add_option = function(option) {
-      var classes, style;
-
-      if (!option.search_match) {
-        return '';
-      }
-      if (!this.include_option_in_results(option)) {
-        return '';
-      }
-      classes = [];
-      if (!option.disabled && !(option.selected && this.is_multiple)) {
-        classes.push("active-result");
-      }
-      if (option.disabled && !(option.selected && this.is_multiple)) {
-        classes.push("disabled-result");
-      }
-      if (option.selected) {
-        classes.push("result-selected");
-      }
-      if (option.group_array_index != null) {
-        classes.push("group-option");
-      }
-      if (option.classes !== "") {
-        classes.push(option.classes);
-      }
-      style = option.style.cssText !== "" ? " style=\"" + option.style + "\"" : "";
-      return "<li class=\"" + (classes.join(' ')) + "\"" + style + " data-option-array-index=\"" + option.array_index + "\">" + option.search_text + "</li>";
-    };
-
-    AbstractChosen.prototype.result_add_group = function(group) {
-      if (!(group.search_match || group.group_match)) {
-        return '';
-      }
-      if (!(group.active_options > 0)) {
-        return '';
-      }
-      return "<li class=\"group-result\">" + group.search_text + "</li>";
-    };
-
-    AbstractChosen.prototype.results_update_field = function() {
-      this.set_default_text();
-      if (!this.is_multiple) {
-        this.results_reset_cleanup();
-      }
-      this.result_clear_highlight();
-      this.result_single_selected = null;
-      this.results_build();
-      if (this.results_showing) {
-        return this.winnow_results();
-      }
-    };
-
-    AbstractChosen.prototype.results_toggle = function() {
-      if (this.results_showing) {
-        return this.results_hide();
-      } else {
-        return this.results_show();
-      }
-    };
-
-    AbstractChosen.prototype.results_search = function(evt) {
-      if (this.results_showing) {
-        return this.winnow_results();
-      } else {
-        return this.results_show();
-      }
-    };
-
-    AbstractChosen.prototype.winnow_results = function() {
-      var escapedSearchText, option, regex, regexAnchor, results, results_group, searchText, startpos, text, zregex, _i, _len, _ref;
-
-      this.no_results_clear();
-      results = 0;
-      searchText = this.get_search_text();
-      escapedSearchText = searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
-      regexAnchor = this.search_contains ? "" : "^";
-      regex = new RegExp(regexAnchor + escapedSearchText, 'i');
-      zregex = new RegExp(escapedSearchText, 'i');
-      _ref = this.results_data;
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        option = _ref[_i];
-        option.search_match = false;
-        results_group = null;
-        if (this.include_option_in_results(option)) {
-          if (option.group) {
-            option.group_match = false;
-            option.active_options = 0;
-          }
-          if ((option.group_array_index != null) && this.results_data[option.group_array_index]) {
-            results_group = this.results_data[option.group_array_index];
-            if (results_group.active_options === 0 && results_group.search_match) {
-              results += 1;
-            }
-            results_group.active_options += 1;
-          }
-          if (!(option.group && !this.group_search)) {
-            option.search_text = option.group ? option.label : option.html;
-            option.search_match = this.search_string_match(option.search_text, regex);
-            if (option.search_match && !option.group) {
-              results += 1;
-            }
-            if (option.search_match) {
-              if (searchText.length) {
-                startpos = option.search_text.search(zregex);
-                text = option.search_text.substr(0, startpos + searchText.length) + '</em>' + option.search_text.substr(startpos + searchText.length);
-                option.search_text = text.substr(0, startpos) + '<em>' + text.substr(startpos);
-              }
-              if (results_group != null) {
-                results_group.group_match = true;
-              }
-            } else if ((option.group_array_index != null) && this.results_data[option.group_array_index].search_match) {
-              option.search_match = true;
-            }
-          }
-        }
-      }
-      this.result_clear_highlight();
-      if (results < 1 && searchText.length) {
-        this.update_results_content("");
-        return this.no_results(searchText);
-      } else {
-        this.update_results_content(this.results_option_build());
-        return this.winnow_results_set_highlight();
-      }
-    };
-
-    AbstractChosen.prototype.search_string_match = function(search_string, regex) {
-      var part, parts, _i, _len;
-
-      if (regex.test(search_string)) {
-        return true;
-      } else if (this.enable_split_word_search && (search_string.indexOf(" ") >= 0 || search_string.indexOf("[") === 0)) {
-        parts = search_string.replace(/\[|\]/g, "").split(" ");
-        if (parts.length) {
-          for (_i = 0, _len = parts.length; _i < _len; _i++) {
-            part = parts[_i];
-            if (regex.test(part)) {
-              return true;
-            }
-          }
-        }
-      }
-    };
-
-    AbstractChosen.prototype.choices_count = function() {
-      var option, _i, _len, _ref;
-
-      if (this.selected_option_count != null) {
-        return this.selected_option_count;
-      }
-      this.selected_option_count = 0;
-      _ref = this.form_field.options;
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        option = _ref[_i];
-        if (option.selected) {
-          this.selected_option_count += 1;
-        }
-      }
-      return this.selected_option_count;
-    };
-
-    AbstractChosen.prototype.choices_click = function(evt) {
-      evt.preventDefault();
-      if (!(this.results_showing || this.is_disabled)) {
-        return this.results_show();
-      }
-    };
-
-    AbstractChosen.prototype.keyup_checker = function(evt) {
-      var stroke, _ref;
-
-      stroke = (_ref = evt.which) != null ? _ref : evt.keyCode;
-      this.search_field_scale();
-      switch (stroke) {
-        case 8:
-          if (this.is_multiple && this.backstroke_length < 1 && this.choices_count() > 0) {
-            return this.keydown_backstroke();
-          } else if (!this.pending_backstroke) {
-            this.result_clear_highlight();
-            return this.results_search();
-          }
-          break;
-        case 13:
-          evt.preventDefault();
-          if (this.results_showing) {
-            return this.result_select(evt);
-          }
-          break;
-        case 27:
-          if (this.results_showing) {
-            this.results_hide();
-          }
-          return true;
-        case 9:
-        case 38:
-        case 40:
-        case 16:
-        case 91:
-        case 17:
-          break;
-        default:
-          return this.results_search();
-      }
-    };
-
-    AbstractChosen.prototype.container_width = function() {
-      if (this.options.width != null) {
-        return this.options.width;
-      } else {
-        return "" + this.form_field.offsetWidth + "px";
-      }
-    };
-
-    AbstractChosen.prototype.include_option_in_results = function(option) {
-      if (this.is_multiple && (!this.display_selected_options && option.selected)) {
-        return false;
-      }
-      if (!this.display_disabled_options && option.disabled) {
-        return false;
-      }
-      if (option.empty) {
-        return false;
-      }
-      return true;
-    };
-
-    AbstractChosen.browser_is_supported = function() {
-      if (window.navigator.appName === "Microsoft Internet Explorer") {
-        return document.documentMode >= 8;
-      }
-      if (/iP(od|hone)/i.test(window.navigator.userAgent)) {
-        return false;
-      }
-      if (/Android/i.test(window.navigator.userAgent)) {
-        if (/Mobile/i.test(window.navigator.userAgent)) {
-          return false;
-        }
-      }
-      return true;
-    };
-
-    AbstractChosen.default_multiple_text = "Select Some Options";
-
-    AbstractChosen.default_single_text = "Select an Option";
-
-    AbstractChosen.default_no_result_text = "No results match";
-
-    return AbstractChosen;
-
-  })();
-
-  $ = jQuery;
-
-  $.fn.extend({
-    chosen: function(options) {
-      if (!AbstractChosen.browser_is_supported()) {
-        return this;
-      }
-      return this.each(function(input_field) {
-        var $this, chosen;
-
-        $this = $(this);
-        chosen = $this.data('chosen');
-        if (options === 'destroy' && chosen) {
-          chosen.destroy();
-        } else if (!chosen) {
-          $this.data('chosen', new Chosen(this, options));
-        }
-      });
-    }
-  });
-
-  Chosen = (function(_super) {
-    __extends(Chosen, _super);
-
-    function Chosen() {
-      _ref = Chosen.__super__.constructor.apply(this, arguments);
-      return _ref;
-    }
-
-    Chosen.prototype.setup = function() {
-      this.form_field_jq = $(this.form_field);
-      this.current_selectedIndex = this.form_field.selectedIndex;
-      return this.is_rtl = this.form_field_jq.hasClass("chosen-rtl");
-    };
-
-    Chosen.prototype.set_up_html = function() {
-      var container_classes, container_props;
-
-      container_classes = ["chosen-container"];
-      container_classes.push("chosen-container-" + (this.is_multiple ? "multi" : "single"));
-      if (this.inherit_select_classes && this.form_field.className) {
-        container_classes.push(this.form_field.className);
-      }
-      if (this.is_rtl) {
-        container_classes.push("chosen-rtl");
-      }
-      container_props = {
-        'class': container_classes.join(' '),
-        'style': "width: " + (this.container_width()) + ";",
-        'title': this.form_field.title
-      };
-      if (this.form_field.id.length) {
-        container_props.id = this.form_field.id.replace(/[^\w]/g, '_') + "_chosen";
-      }
-      this.container = $("<div />", container_props);
-      if (this.is_multiple) {
-        this.container.html('<ul class="chosen-choices"><li class="search-field"><input type="text" value="' + this.default_text + '" class="default" autocomplete="off" style="width:25px;" /></li></ul><div class="chosen-drop"><ul class="chosen-results"></ul></div>');
-      } else {
-        this.container.html('<a class="chosen-single chosen-default" tabindex="-1"><span>' + this.default_text + '</span><div><b></b></div></a><div class="chosen-drop"><div class="chosen-search"><input type="text" autocomplete="off" /></div><ul class="chosen-results"></ul></div>');
-      }
-      this.form_field_jq.hide().after(this.container);
-      this.dropdown = this.container.find('div.chosen-drop').first();
-      this.search_field = this.container.find('input').first();
-      this.search_results = this.container.find('ul.chosen-results').first();
-      this.search_field_scale();
-      this.search_no_results = this.container.find('li.no-results').first();
-      if (this.is_multiple) {
-        this.search_choices = this.container.find('ul.chosen-choices').first();
-        this.search_container = this.container.find('li.search-field').first();
-      } else {
-        this.search_container = this.container.find('div.chosen-search').first();
-        this.selected_item = this.container.find('.chosen-single').first();
-      }
-      this.results_build();
-      this.set_tab_index();
-      this.set_label_behavior();
-      return this.form_field_jq.trigger("chosen:ready", {
-        chosen: this
-      });
-    };
-
-    Chosen.prototype.register_observers = function() {
-      var _this = this;
-
-      this.container.bind('mousedown.chosen', function(evt) {
-        _this.container_mousedown(evt);
-      });
-      this.container.bind('mouseup.chosen', function(evt) {
-        _this.container_mouseup(evt);
-      });
-      this.container.bind('mouseenter.chosen', function(evt) {
-        _this.mouse_enter(evt);
-      });
-      this.container.bind('mouseleave.chosen', function(evt) {
-        _this.mouse_leave(evt);
-      });
-      this.search_results.bind('mouseup.chosen', function(evt) {
-        _this.search_results_mouseup(evt);
-      });
-      this.search_results.bind('mouseover.chosen', function(evt) {
-        _this.search_results_mouseover(evt);
-      });
-      this.search_results.bind('mouseout.chosen', function(evt) {
-        _this.search_results_mouseout(evt);
-      });
-      this.search_results.bind('mousewheel.chosen DOMMouseScroll.chosen', function(evt) {
-        _this.search_results_mousewheel(evt);
-      });
-      this.form_field_jq.bind("chosen:updated.chosen", function(evt) {
-        _this.results_update_field(evt);
-      });
-      this.form_field_jq.bind("chosen:activate.chosen", function(evt) {
-        _this.activate_field(evt);
-      });
-      this.form_field_jq.bind("chosen:open.chosen", function(evt) {
-        _this.container_mousedown(evt);
-      });
-      this.search_field.bind('blur.chosen', function(evt) {
-        _this.input_blur(evt);
-      });
-      this.search_field.bind('keyup.chosen', function(evt) {
-        _this.keyup_checker(evt);
-      });
-      this.search_field.bind('keydown.chosen', function(evt) {
-        _this.keydown_checker(evt);
-      });
-      this.search_field.bind('focus.chosen', function(evt) {
-        _this.input_focus(evt);
-      });
-      if (this.is_multiple) {
-        return this.search_choices.bind('click.chosen', function(evt) {
-          _this.choices_click(evt);
-        });
-      } else {
-        return this.container.bind('click.chosen', function(evt) {
-          evt.preventDefault();
-        });
-      }
-    };
-
-    Chosen.prototype.destroy = function() {
-      $(document).unbind("click.chosen", this.click_test_action);
-      if (this.search_field[0].tabIndex) {
-        this.form_field_jq[0].tabIndex = this.search_field[0].tabIndex;
-      }
-      this.container.remove();
-      this.form_field_jq.removeData('chosen');
-      return this.form_field_jq.show();
-    };
-
-    Chosen.prototype.search_field_disabled = function() {
-      this.is_disabled = this.form_field_jq[0].disabled;
-      if (this.is_disabled) {
-        this.container.addClass('chosen-disabled');
-        this.search_field[0].disabled = true;
-        if (!this.is_multiple) {
-          this.selected_item.unbind("focus.chosen", this.activate_action);
-        }
-        return this.close_field();
-      } else {
-        this.container.removeClass('chosen-disabled');
-        this.search_field[0].disabled = false;
-        if (!this.is_multiple) {
-          return this.selected_item.bind("focus.chosen", this.activate_action);
-        }
-      }
-    };
-
-    Chosen.prototype.container_mousedown = function(evt) {
-      if (!this.is_disabled) {
-        if (evt && evt.type === "mousedown" && !this.results_showing) {
-          evt.preventDefault();
-        }
-        if (!((evt != null) && ($(evt.target)).hasClass("search-choice-close"))) {
-          if (!this.active_field) {
-            if (this.is_multiple) {
-              this.search_field.val("");
-            }
-            $(document).bind('click.chosen', this.click_test_action);
-            this.results_show();
-          } else if (!this.is_multiple && evt && (($(evt.target)[0] === this.selected_item[0]) || $(evt.target).parents("a.chosen-single").length)) {
-            evt.preventDefault();
-            this.results_toggle();
-          }
-          return this.activate_field();
-        }
-      }
-    };
-
-    Chosen.prototype.container_mouseup = function(evt) {
-      if (evt.target.nodeName === "ABBR" && !this.is_disabled) {
-        return this.results_reset(evt);
-      }
-    };
-
-    Chosen.prototype.search_results_mousewheel = function(evt) {
-      var delta, _ref1, _ref2;
-
-      delta = -((_ref1 = evt.originalEvent) != null ? _ref1.wheelDelta : void 0) || ((_ref2 = evt.originialEvent) != null ? _ref2.detail : void 0);
-      if (delta != null) {
-        evt.preventDefault();
-        if (evt.type === 'DOMMouseScroll') {
-          delta = delta * 40;
-        }
-        return this.search_results.scrollTop(delta + this.search_results.scrollTop());
-      }
-    };
-
-    Chosen.prototype.blur_test = function(evt) {
-      if (!this.active_field && this.container.hasClass("chosen-container-active")) {
-        return this.close_field();
-      }
-    };
-
-    Chosen.prototype.close_field = function() {
-      $(document).unbind("click.chosen", this.click_test_action);
-      this.active_field = false;
-      this.results_hide();
-      this.container.removeClass("chosen-container-active");
-      this.clear_backstroke();
-      this.show_search_field_default();
-      return this.search_field_scale();
-    };
-
-    Chosen.prototype.activate_field = function() {
-      this.container.addClass("chosen-container-active");
-      this.active_field = true;
-      this.search_field.val(this.search_field.val());
-      return this.search_field.focus();
-    };
-
-    Chosen.prototype.test_active_click = function(evt) {
-      if (this.container.is($(evt.target).closest('.chosen-container'))) {
-        return this.active_field = true;
-      } else {
-        return this.close_field();
-      }
-    };
-
-    Chosen.prototype.results_build = function() {
-      this.parsing = true;
-      this.selected_option_count = null;
-      this.results_data = SelectParser.select_to_array(this.form_field);
-      if (this.is_multiple) {
-        this.search_choices.find("li.search-choice").remove();
-      } else if (!this.is_multiple) {
-        this.single_set_selected_text();
-        if (this.disable_search || this.form_field.options.length <= this.disable_search_threshold) {
-          this.search_field[0].readOnly = true;
-          this.container.addClass("chosen-container-single-nosearch");
-        } else {
-          this.search_field[0].readOnly = false;
-          this.container.removeClass("chosen-container-single-nosearch");
-        }
-      }
-      this.update_results_content(this.results_option_build({
-        first: true
-      }));
-      this.search_field_disabled();
-      this.show_search_field_default();
-      this.search_field_scale();
-      return this.parsing = false;
-    };
-
-    Chosen.prototype.result_do_highlight = function(el) {
-      var high_bottom, high_top, maxHeight, visible_bottom, visible_top;
-
-      if (el.length) {
-        this.result_clear_highlight();
-        this.result_highlight = el;
-        this.result_highlight.addClass("highlighted");
-        maxHeight = parseInt(this.search_results.css("maxHeight"), 10);
-        visible_top = this.search_results.scrollTop();
-        visible_bottom = maxHeight + visible_top;
-        high_top = this.result_highlight.position().top + this.search_results.scrollTop();
-        high_bottom = high_top + this.result_highlight.outerHeight();
-        if (high_bottom >= visible_bottom) {
-          return this.search_results.scrollTop((high_bottom - maxHeight) > 0 ? high_bottom - maxHeight : 0);
-        } else if (high_top < visible_top) {
-          return this.search_results.scrollTop(high_top);
-        }
-      }
-    };
-
-    Chosen.prototype.result_clear_highlight = function() {
-      if (this.result_highlight) {
-        this.result_highlight.removeClass("highlighted");
-      }
-      return this.result_highlight = null;
-    };
-
-    Chosen.prototype.results_show = function() {
-      if (this.is_multiple && this.max_selected_options <= this.choices_count()) {
-        this.form_field_jq.trigger("chosen:maxselected", {
-          chosen: this
-        });
-        return false;
-      }
-      this.container.addClass("chosen-with-drop");
-      this.form_field_jq.trigger("chosen:showing_dropdown", {
-        chosen: this
-      });
-      this.results_showing = true;
-      this.search_field.focus();
-      this.search_field.val(this.search_field.val());
-      return this.winnow_results();
-    };
-
-    Chosen.prototype.update_results_content = function(content) {
-      return this.search_results.html(content);
-    };
-
-    Chosen.prototype.results_hide = function() {
-      if (this.results_showing) {
-        this.result_clear_highlight();
-        this.container.removeClass("chosen-with-drop");
-        this.form_field_jq.trigger("chosen:hiding_dropdown", {
-          chosen: this
-        });
-      }
-      return this.results_showing = false;
-    };
-
-    Chosen.prototype.set_tab_index = function(el) {
-      var ti;
-
-      if (this.form_field.tabIndex) {
-        ti = this.form_field.tabIndex;
-        this.form_field.tabIndex = -1;
-        return this.search_field[0].tabIndex = ti;
-      }
-    };
-
-    Chosen.prototype.set_label_behavior = function() {
-      var _this = this;
-
-      this.form_field_label = this.form_field_jq.parents("label");
-      if (!this.form_field_label.length && this.form_field.id.length) {
-        this.form_field_label = $("label[for='" + this.form_field.id + "']");
-      }
-      if (this.form_field_label.length > 0) {
-        return this.form_field_label.bind('click.chosen', function(evt) {
-          if (_this.is_multiple) {
-            return _this.container_mousedown(evt);
-          } else {
-            return _this.activate_field();
-          }
-        });
-      }
-    };
-
-    Chosen.prototype.show_search_field_default = function() {
-      if (this.is_multiple && this.choices_count() < 1 && !this.active_field) {
-        this.search_field.val(this.default_text);
-        return this.search_field.addClass("default");
-      } else {
-        this.search_field.val("");
-        return this.search_field.removeClass("default");
-      }
-    };
-
-    Chosen.prototype.search_results_mouseup = function(evt) {
-      var target;
-
-      target = $(evt.target).hasClass("active-result") ? $(evt.target) : $(evt.target).parents(".active-result").first();
-      if (target.length) {
-        this.result_highlight = target;
-        this.result_select(evt);
-        return this.search_field.focus();
-      }
-    };
-
-    Chosen.prototype.search_results_mouseover = function(evt) {
-      var target;
-
-      target = $(evt.target).hasClass("active-result") ? $(evt.target) : $(evt.target).parents(".active-result").first();
-      if (target) {
-        return this.result_do_highlight(target);
-      }
-    };
-
-    Chosen.prototype.search_results_mouseout = function(evt) {
-      if ($(evt.target).hasClass("active-result" || $(evt.target).parents('.active-result').first())) {
-        return this.result_clear_highlight();
-      }
-    };
-
-    Chosen.prototype.choice_build = function(item) {
-      var choice, close_link,
-        _this = this;
-
-      choice = $('<li />', {
-        "class": "search-choice"
-      }).html("<span>" + item.html + "</span>");
-      if (item.disabled) {
-        choice.addClass('search-choice-disabled');
-      } else {
-        close_link = $('<a />', {
-          "class": 'search-choice-close',
-          'data-option-array-index': item.array_index
-        });
-        close_link.bind('click.chosen', function(evt) {
-          return _this.choice_destroy_link_click(evt);
-        });
-        choice.append(close_link);
-      }
-      return this.search_container.before(choice);
-    };
-
-    Chosen.prototype.choice_destroy_link_click = function(evt) {
-      evt.preventDefault();
-      evt.stopPropagation();
-      if (!this.is_disabled) {
-        return this.choice_destroy($(evt.target));
-      }
-    };
-
-    Chosen.prototype.choice_destroy = function(link) {
-      if (this.result_deselect(link[0].getAttribute("data-option-array-index"))) {
-        this.show_search_field_default();
-        if (this.is_multiple && this.choices_count() > 0 && this.search_field.val().length < 1) {
-          this.results_hide();
-        }
-        link.parents('li').first().remove();
-        return this.search_field_scale();
-      }
-    };
-
-    Chosen.prototype.results_reset = function() {
-      this.form_field.options[0].selected = true;
-      this.selected_option_count = null;
-      this.single_set_selected_text();
-      this.show_search_field_default();
-      this.results_reset_cleanup();
-      this.form_field_jq.trigger("change");
-      if (this.active_field) {
-        return this.results_hide();
-      }
-    };
-
-    Chosen.prototype.results_reset_cleanup = function() {
-      this.current_selectedIndex = this.form_field.selectedIndex;
-      return this.selected_item.find("abbr").remove();
-    };
-
-    Chosen.prototype.result_select = function(evt) {
-      var high, item, selected_index;
-
-      if (this.result_highlight) {
-        high = this.result_highlight;
-        this.result_clear_highlight();
-        if (this.is_multiple && this.max_selected_options <= this.choices_count()) {
-          this.form_field_jq.trigger("chosen:maxselected", {
-            chosen: this
-          });
-          return false;
-        }
-        if (this.is_multiple) {
-          high.removeClass("active-result");
-        } else {
-          if (this.result_single_selected) {
-            this.result_single_selected.removeClass("result-selected");
-            selected_index = this.result_single_selected[0].getAttribute('data-option-array-index');
-            this.results_data[selected_index].selected = false;
-          }
-          this.result_single_selected = high;
-        }
-        high.addClass("result-selected");
-        item = this.results_data[high[0].getAttribute("data-option-array-index")];
-        item.selected = true;
-        this.form_field.options[item.options_index].selected = true;
-        this.selected_option_count = null;
-        if (this.is_multiple) {
-          this.choice_build(item);
-        } else {
-          this.single_set_selected_text(item.text);
-        }
-        if (!((evt.metaKey || evt.ctrlKey) && this.is_multiple)) {
-          this.results_hide();
-        }
-        this.search_field.val("");
-        if (this.is_multiple || this.form_field.selectedIndex !== this.current_selectedIndex) {
-          this.form_field_jq.trigger("change", {
-            'selected': this.form_field.options[item.options_index].value
-          });
-        }
-        this.current_selectedIndex = this.form_field.selectedIndex;
-        return this.search_field_scale();
-      }
-    };
-
-    Chosen.prototype.single_set_selected_text = function(text) {
-      if (text == null) {
-        text = this.default_text;
-      }
-      if (text === this.default_text) {
-        this.selected_item.addClass("chosen-default");
-      } else {
-        this.single_deselect_control_build();
-        this.selected_item.removeClass("chosen-default");
-      }
-      return this.selected_item.find("span").text(text);
-    };
-
-    Chosen.prototype.result_deselect = function(pos) {
-      var result_data;
-
-      result_data = this.results_data[pos];
-      if (!this.form_field.options[result_data.options_index].disabled) {
-        result_data.selected = false;
-        this.form_field.options[result_data.options_index].selected = false;
-        this.selected_option_count = null;
-        this.result_clear_highlight();
-        if (this.results_showing) {
-          this.winnow_results();
-        }
-        this.form_field_jq.trigger("change", {
-          deselected: this.form_field.options[result_data.options_index].value
-        });
-        this.search_field_scale();
-        return true;
-      } else {
-        return false;
-      }
-    };
-
-    Chosen.prototype.single_deselect_control_build = function() {
-      if (!this.allow_single_deselect) {
-        return;
-      }
-      if (!this.selected_item.find("abbr").length) {
-        this.selected_item.find("span").first().after("<abbr class=\"search-choice-close\"></abbr>");
-      }
-      return this.selected_item.addClass("chosen-single-with-deselect");
-    };
-
-    Chosen.prototype.get_search_text = function() {
-      if (this.search_field.val() === this.default_text) {
-        return "";
-      } else {
-        return $('<div/>').text($.trim(this.search_field.val())).html();
-      }
-    };
-
-    Chosen.prototype.winnow_results_set_highlight = function() {
-      var do_high, selected_results;
-
-      selected_results = !this.is_multiple ? this.search_results.find(".result-selected.active-result") : [];
-      do_high = selected_results.length ? selected_results.first() : this.search_results.find(".active-result").first();
-      if (do_high != null) {
-        return this.result_do_highlight(do_high);
-      }
-    };
-
-    Chosen.prototype.no_results = function(terms) {
-      var no_results_html;
-
-      no_results_html = $('<li class="no-results">' + this.results_none_found + ' "<span></span>"</li>');
-      no_results_html.find("span").first().html(terms);
-      return this.search_results.append(no_results_html);
-    };
-
-    Chosen.prototype.no_results_clear = function() {
-      return this.search_results.find(".no-results").remove();
-    };
-
-    Chosen.prototype.keydown_arrow = function() {
-      var next_sib;
-
-      if (this.results_showing && this.result_highlight) {
-        next_sib = this.result_highlight.nextAll("li.active-result").first();
-        if (next_sib) {
-          return this.result_do_highlight(next_sib);
-        }
-      } else {
-        return this.results_show();
-      }
-    };
-
-    Chosen.prototype.keyup_arrow = function() {
-      var prev_sibs;
-
-      if (!this.results_showing && !this.is_multiple) {
-        return this.results_show();
-      } else if (this.result_highlight) {
-        prev_sibs = this.result_highlight.prevAll("li.active-result");
-        if (prev_sibs.length) {
-          return this.result_do_highlight(prev_sibs.first());
-        } else {
-          if (this.choices_count() > 0) {
-            this.results_hide();
-          }
-          return this.result_clear_highlight();
-        }
-      }
-    };
-
-    Chosen.prototype.keydown_backstroke = function() {
-      var next_available_destroy;
-
-      if (this.pending_backstroke) {
-        this.choice_destroy(this.pending_backstroke.find("a").first());
-        return this.clear_backstroke();
-      } else {
-        next_available_destroy = this.search_container.siblings("li.search-choice").last();
-        if (next_available_destroy.length && !next_available_destroy.hasClass("search-choice-disabled")) {
-          this.pending_backstroke = next_available_destroy;
-          if (this.single_backstroke_delete) {
-            return this.keydown_backstroke();
-          } else {
-            return this.pending_backstroke.addClass("search-choice-focus");
-          }
-        }
-      }
-    };
-
-    Chosen.prototype.clear_backstroke = function() {
-      if (this.pending_backstroke) {
-        this.pending_backstroke.removeClass("search-choice-focus");
-      }
-      return this.pending_backstroke = null;
-    };
-
-    Chosen.prototype.keydown_checker = function(evt) {
-      var stroke, _ref1;
-
-      stroke = (_ref1 = evt.which) != null ? _ref1 : evt.keyCode;
-      this.search_field_scale();
-      if (stroke !== 8 && this.pending_backstroke) {
-        this.clear_backstroke();
-      }
-      switch (stroke) {
-        case 8:
-          this.backstroke_length = this.search_field.val().length;
-          break;
-        case 9:
-          if (this.results_showing && !this.is_multiple) {
-            this.result_select(evt);
-          }
-          this.mouse_on_container = false;
-          break;
-        case 13:
-          evt.preventDefault();
-          break;
-        case 38:
-          evt.preventDefault();
-          this.keyup_arrow();
-          break;
-        case 40:
-          evt.preventDefault();
-          this.keydown_arrow();
-          break;
-      }
-    };
-
-    Chosen.prototype.search_field_scale = function() {
-      var div, f_width, h, style, style_block, styles, w, _i, _len;
-
-      if (this.is_multiple) {
-        h = 0;
-        w = 0;
-        style_block = "position:absolute; left: -1000px; top: -1000px; display:none;";
-        styles = ['font-size', 'font-style', 'font-weight', 'font-family', 'line-height', 'text-transform', 'letter-spacing'];
-        for (_i = 0, _len = styles.length; _i < _len; _i++) {
-          style = styles[_i];
-          style_block += style + ":" + this.search_field.css(style) + ";";
-        }
-        div = $('<div />', {
-          'style': style_block
-        });
-        div.text(this.search_field.val());
-        $(document.body).append(div);
-        w = div.width() + 25;
-        div.remove();
-        f_width = this.container.outerWidth();
-        if (w > f_width - 10) {
-          w = f_width - 10;
-        }
-        return this.search_field.css({
-          'width': w + 'px'
-        });
-      }
-    };
-
-    return Chosen;
-
-  })(AbstractChosen);
-
-}).call(this);
diff --git a/assets/js/chosen/chosen.jquery.min.js b/assets/js/chosen/chosen.jquery.min.js
deleted file mode 100644
index dcd901193df..00000000000
--- a/assets/js/chosen/chosen.jquery.min.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Chosen, a Select Box Enhancer for jQuery and Prototype
-// by Patrick Filler for Harvest, http://getharvest.com
-//
-// Version 1.0.0
-// Full source at https://github.com/harvesthq/chosen
-// Copyright (c) 2011 Harvest http://getharvest.com
-// MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md
-// This file is generated by `grunt build`, do not edit it by hand.
-(function(){var e,t,n,r,i,s={}.hasOwnProperty,o=function(e,t){function r(){this.constructor=e}for(var n in t)s.call(t,n)&&(e[n]=t[n]);r.prototype=t.prototype;e.prototype=new r;e.__super__=t.prototype;return e};r=function(){function e(){this.options_index=0;this.parsed=[]}e.prototype.add_node=function(e){return e.nodeName.toUpperCase()==="OPTGROUP"?this.add_group(e):this.add_option(e)};e.prototype.add_group=function(e){var t,n,r,i,s,o;t=this.parsed.length;this.parsed.push({array_index:t,group:!0,label:this.escapeExpression(e.label),children:0,disabled:e.disabled});s=e.childNodes;o=[];for(r=0,i=s.length;r<i;r++){n=s[r];o.push(this.add_option(n,t,e.disabled))}return o};e.prototype.add_option=function(e,t,n){if(e.nodeName.toUpperCase()==="OPTION"){if(e.text!==""){t!=null&&(this.parsed[t].children+=1);this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,value:e.value,text:e.text,html:e.innerHTML,selected:e.selected,disabled:n===!0?n:e.disabled,group_array_index:t,classes:e.className,style:e.style.cssText})}else this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,empty:!0});return this.options_index+=1}};e.prototype.escapeExpression=function(e){var t,n;if(e==null||e===!1)return"";if(!/[\&\<\>\"\'\`]/.test(e))return e;t={"<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","`":"&#x60;"};n=/&(?!\w+;)|[\<\>\"\'\`]/g;return e.replace(n,function(e){return t[e]||"&amp;"})};return e}();r.select_to_array=function(e){var t,n,i,s,o;n=new r;o=e.childNodes;for(i=0,s=o.length;i<s;i++){t=o[i];n.add_node(t)}return n.parsed};t=function(){function e(t,n){this.form_field=t;this.options=n!=null?n:{};if(!e.browser_is_supported())return;this.is_multiple=this.form_field.multiple;this.set_default_text();this.set_default_values();this.setup();this.set_up_html();this.register_observers()}e.prototype.set_default_values=function(){var e=this;this.click_test_action=function(t){return e.test_active_click(t)};this.activate_action=function(t){return e.activate_field(t)};this.active_field=!1;this.mouse_on_container=!1;this.results_showing=!1;this.result_highlighted=null;this.result_single_selected=null;this.allow_single_deselect=this.options.allow_single_deselect!=null&&this.form_field.options[0]!=null&&this.form_field.options[0].text===""?this.options.allow_single_deselect:!1;this.disable_search_threshold=this.options.disable_search_threshold||0;this.disable_search=this.options.disable_search||!1;this.enable_split_word_search=this.options.enable_split_word_search!=null?this.options.enable_split_word_search:!0;this.group_search=this.options.group_search!=null?this.options.group_search:!0;this.search_contains=this.options.search_contains||!1;this.single_backstroke_delete=this.options.single_backstroke_delete!=null?this.options.single_backstroke_delete:!0;this.max_selected_options=this.options.max_selected_options||Infinity;this.inherit_select_classes=this.options.inherit_select_classes||!1;this.display_selected_options=this.options.display_selected_options!=null?this.options.display_selected_options:!0;return this.display_disabled_options=this.options.display_disabled_options!=null?this.options.display_disabled_options:!0};e.prototype.set_default_text=function(){this.form_field.getAttribute("data-placeholder")?this.default_text=this.form_field.getAttribute("data-placeholder"):this.is_multiple?this.default_text=this.options.placeholder_text_multiple||this.options.placeholder_text||e.default_multiple_text:this.default_text=this.options.placeholder_text_single||this.options.placeholder_text||e.default_single_text;return this.results_none_found=this.form_field.getAttribute("data-no_results_text")||this.options.no_results_text||e.default_no_result_text};e.prototype.mouse_enter=function(){return this.mouse_on_container=!0};e.prototype.mouse_leave=function(){return this.mouse_on_container=!1};e.prototype.input_focus=function(e){var t=this;if(this.is_multiple){if(!this.active_field)return setTimeout(function(){return t.container_mousedown()},50)}else if(!this.active_field)return this.activate_field()};e.prototype.input_blur=function(e){var t=this;if(!this.mouse_on_container){this.active_field=!1;return setTimeout(function(){return t.blur_test()},100)}};e.prototype.results_option_build=function(e){var t,n,r,i,s;t="";s=this.results_data;for(r=0,i=s.length;r<i;r++){n=s[r];n.group?t+=this.result_add_group(n):t+=this.result_add_option(n);if(e!=null?e.first:void 0)n.selected&&this.is_multiple?this.choice_build(n):n.selected&&!this.is_multiple&&this.single_set_selected_text(n.text)}return t};e.prototype.result_add_option=function(e){var t,n;if(!e.search_match)return"";if(!this.include_option_in_results(e))return"";t=[];!e.disabled&&(!e.selected||!this.is_multiple)&&t.push("active-result");e.disabled&&(!e.selected||!this.is_multiple)&&t.push("disabled-result");e.selected&&t.push("result-selected");e.group_array_index!=null&&t.push("group-option");e.classes!==""&&t.push(e.classes);n=e.style.cssText!==""?' style="'+e.style+'"':"";return'<li class="'+t.join(" ")+'"'+n+' data-option-array-index="'+e.array_index+'">'+e.search_text+"</li>"};e.prototype.result_add_group=function(e){return!e.search_match&&!e.group_match?"":e.active_options>0?'<li class="group-result">'+e.search_text+"</li>":""};e.prototype.results_update_field=function(){this.set_default_text();this.is_multiple||this.results_reset_cleanup();this.result_clear_highlight();this.result_single_selected=null;this.results_build();if(this.results_showing)return this.winnow_results()};e.prototype.results_toggle=function(){return this.results_showing?this.results_hide():this.results_show()};e.prototype.results_search=function(e){return this.results_showing?this.winnow_results():this.results_show()};e.prototype.winnow_results=function(){var e,t,n,r,i,s,o,u,a,f,l,c,h;this.no_results_clear();i=0;o=this.get_search_text();e=o.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&");r=this.search_contains?"":"^";n=new RegExp(r+e,"i");f=new RegExp(e,"i");h=this.results_data;for(l=0,c=h.length;l<c;l++){t=h[l];t.search_match=!1;s=null;if(this.include_option_in_results(t)){if(t.group){t.group_match=!1;t.active_options=0}if(t.group_array_index!=null&&this.results_data[t.group_array_index]){s=this.results_data[t.group_array_index];s.active_options===0&&s.search_match&&(i+=1);s.active_options+=1}if(!t.group||!!this.group_search){t.search_text=t.group?t.label:t.html;t.search_match=this.search_string_match(t.search_text,n);t.search_match&&!t.group&&(i+=1);if(t.search_match){if(o.length){u=t.search_text.search(f);a=t.search_text.substr(0,u+o.length)+"</em>"+t.search_text.substr(u+o.length);t.search_text=a.substr(0,u)+"<em>"+a.substr(u)}s!=null&&(s.group_match=!0)}else t.group_array_index!=null&&this.results_data[t.group_array_index].search_match&&(t.search_match=!0)}}}this.result_clear_highlight();if(i<1&&o.length){this.update_results_content("");return this.no_results(o)}this.update_results_content(this.results_option_build());return this.winnow_results_set_highlight()};e.prototype.search_string_match=function(e,t){var n,r,i,s;if(t.test(e))return!0;if(this.enable_split_word_search&&(e.indexOf(" ")>=0||e.indexOf("[")===0)){r=e.replace(/\[|\]/g,"").split(" ");if(r.length)for(i=0,s=r.length;i<s;i++){n=r[i];if(t.test(n))return!0}}};e.prototype.choices_count=function(){var e,t,n,r;if(this.selected_option_count!=null)return this.selected_option_count;this.selected_option_count=0;r=this.form_field.options;for(t=0,n=r.length;t<n;t++){e=r[t];e.selected&&(this.selected_option_count+=1)}return this.selected_option_count};e.prototype.choices_click=function(e){e.preventDefault();if(!this.results_showing&&!this.is_disabled)return this.results_show()};e.prototype.keyup_checker=function(e){var t,n;t=(n=e.which)!=null?n:e.keyCode;this.search_field_scale();switch(t){case 8:if(this.is_multiple&&this.backstroke_length<1&&this.choices_count()>0)return this.keydown_backstroke();if(!this.pending_backstroke){this.result_clear_highlight();return this.results_search()}break;case 13:e.preventDefault();if(this.results_showing)return this.result_select(e);break;case 27:this.results_showing&&this.results_hide();return!0;case 9:case 38:case 40:case 16:case 91:case 17:break;default:return this.results_search()}};e.prototype.container_width=function(){return this.options.width!=null?this.options.width:""+this.form_field.offsetWidth+"px"};e.prototype.include_option_in_results=function(e){return this.is_multiple&&!this.display_selected_options&&e.selected?!1:!this.display_disabled_options&&e.disabled?!1:e.empty?!1:!0};e.browser_is_supported=function(){return window.navigator.appName==="Microsoft Internet Explorer"?document.documentMode>=8:/iP(od|hone)/i.test(window.navigator.userAgent)?!1:/Android/i.test(window.navigator.userAgent)&&/Mobile/i.test(window.navigator.userAgent)?!1:!0};e.default_multiple_text="Select Some Options";e.default_single_text="Select an Option";e.default_no_result_text="No results match";return e}();e=jQuery;e.fn.extend({chosen:function(r){return t.browser_is_supported()?this.each(function(t){var i,s;i=e(this);s=i.data("chosen");r==="destroy"&&s?s.destroy():s||i.data("chosen",new n(this,r))}):this}});n=function(t){function n(){i=n.__super__.constructor.apply(this,arguments);return i}o(n,t);n.prototype.setup=function(){this.form_field_jq=e(this.form_field);this.current_selectedIndex=this.form_field.selectedIndex;return this.is_rtl=this.form_field_jq.hasClass("chosen-rtl")};n.prototype.set_up_html=function(){var t,n;t=["chosen-container"];t.push("chosen-container-"+(this.is_multiple?"multi":"single"));this.inherit_select_classes&&this.form_field.className&&t.push(this.form_field.className);this.is_rtl&&t.push("chosen-rtl");n={"class":t.join(" "),style:"width: "+this.container_width()+";",title:this.form_field.title};this.form_field.id.length&&(n.id=this.form_field.id.replace(/[^\w]/g,"_")+"_chosen");this.container=e("<div />",n);this.is_multiple?this.container.html('<ul class="chosen-choices"><li class="search-field"><input type="text" value="'+this.default_text+'" class="default" autocomplete="off" style="width:25px;" /></li></ul><div class="chosen-drop"><ul class="chosen-results"></ul></div>'):this.container.html('<a class="chosen-single chosen-default" tabindex="-1"><span>'+this.default_text+'</span><div><b></b></div></a><div class="chosen-drop"><div class="chosen-search"><input type="text" autocomplete="off" /></div><ul class="chosen-results"></ul></div>');this.form_field_jq.hide().after(this.container);this.dropdown=this.container.find("div.chosen-drop").first();this.search_field=this.container.find("input").first();this.search_results=this.container.find("ul.chosen-results").first();this.search_field_scale();this.search_no_results=this.container.find("li.no-results").first();if(this.is_multiple){this.search_choices=this.container.find("ul.chosen-choices").first();this.search_container=this.container.find("li.search-field").first()}else{this.search_container=this.container.find("div.chosen-search").first();this.selected_item=this.container.find(".chosen-single").first()}this.results_build();this.set_tab_index();this.set_label_behavior();return this.form_field_jq.trigger("chosen:ready",{chosen:this})};n.prototype.register_observers=function(){var e=this;this.container.bind("mousedown.chosen",function(t){e.container_mousedown(t)});this.container.bind("mouseup.chosen",function(t){e.container_mouseup(t)});this.container.bind("mouseenter.chosen",function(t){e.mouse_enter(t)});this.container.bind("mouseleave.chosen",function(t){e.mouse_leave(t)});this.search_results.bind("mouseup.chosen",function(t){e.search_results_mouseup(t)});this.search_results.bind("mouseover.chosen",function(t){e.search_results_mouseover(t)});this.search_results.bind("mouseout.chosen",function(t){e.search_results_mouseout(t)});this.search_results.bind("mousewheel.chosen DOMMouseScroll.chosen",function(t){e.search_results_mousewheel(t)});this.form_field_jq.bind("chosen:updated.chosen",function(t){e.results_update_field(t)});this.form_field_jq.bind("chosen:activate.chosen",function(t){e.activate_field(t)});this.form_field_jq.bind("chosen:open.chosen",function(t){e.container_mousedown(t)});this.search_field.bind("blur.chosen",function(t){e.input_blur(t)});this.search_field.bind("keyup.chosen",function(t){e.keyup_checker(t)});this.search_field.bind("keydown.chosen",function(t){e.keydown_checker(t)});this.search_field.bind("focus.chosen",function(t){e.input_focus(t)});return this.is_multiple?this.search_choices.bind("click.chosen",function(t){e.choices_click(t)}):this.container.bind("click.chosen",function(e){e.preventDefault()})};n.prototype.destroy=function(){e(document).unbind("click.chosen",this.click_test_action);this.search_field[0].tabIndex&&(this.form_field_jq[0].tabIndex=this.search_field[0].tabIndex);this.container.remove();this.form_field_jq.removeData("chosen");return this.form_field_jq.show()};n.prototype.search_field_disabled=function(){this.is_disabled=this.form_field_jq[0].disabled;if(this.is_disabled){this.container.addClass("chosen-disabled");this.search_field[0].disabled=!0;this.is_multiple||this.selected_item.unbind("focus.chosen",this.activate_action);return this.close_field()}this.container.removeClass("chosen-disabled");this.search_field[0].disabled=!1;if(!this.is_multiple)return this.selected_item.bind("focus.chosen",this.activate_action)};n.prototype.container_mousedown=function(t){if(!this.is_disabled){t&&t.type==="mousedown"&&!this.results_showing&&t.preventDefault();if(t==null||!e(t.target).hasClass("search-choice-close")){if(!this.active_field){this.is_multiple&&this.search_field.val("");e(document).bind("click.chosen",this.click_test_action);this.results_show()}else if(!this.is_multiple&&t&&(e(t.target)[0]===this.selected_item[0]||e(t.target).parents("a.chosen-single").length)){t.preventDefault();this.results_toggle()}return this.activate_field()}}};n.prototype.container_mouseup=function(e){if(e.target.nodeName==="ABBR"&&!this.is_disabled)return this.results_reset(e)};n.prototype.search_results_mousewheel=function(e){var t,n,r;t=-((n=e.originalEvent)!=null?n.wheelDelta:void 0)||((r=e.originialEvent)!=null?r.detail:void 0);if(t!=null){e.preventDefault();e.type==="DOMMouseScroll"&&(t*=40);return this.search_results.scrollTop(t+this.search_results.scrollTop())}};n.prototype.blur_test=function(e){if(!this.active_field&&this.container.hasClass("chosen-container-active"))return this.close_field()};n.prototype.close_field=function(){e(document).unbind("click.chosen",this.click_test_action);this.active_field=!1;this.results_hide();this.container.removeClass("chosen-container-active");this.clear_backstroke();this.show_search_field_default();return this.search_field_scale()};n.prototype.activate_field=function(){this.container.addClass("chosen-container-active");this.active_field=!0;this.search_field.val(this.search_field.val());return this.search_field.focus()};n.prototype.test_active_click=function(t){return this.container.is(e(t.target).closest(".chosen-container"))?this.active_field=!0:this.close_field()};n.prototype.results_build=function(){this.parsing=!0;this.selected_option_count=null;this.results_data=r.select_to_array(this.form_field);if(this.is_multiple)this.search_choices.find("li.search-choice").remove();else if(!this.is_multiple){this.single_set_selected_text();if(this.disable_search||this.form_field.options.length<=this.disable_search_threshold){this.search_field[0].readOnly=!0;this.container.addClass("chosen-container-single-nosearch")}else{this.search_field[0].readOnly=!1;this.container.removeClass("chosen-container-single-nosearch")}}this.update_results_content(this.results_option_build({first:!0}));this.search_field_disabled();this.show_search_field_default();this.search_field_scale();return this.parsing=!1};n.prototype.result_do_highlight=function(e){var t,n,r,i,s;if(e.length){this.result_clear_highlight();this.result_highlight=e;this.result_highlight.addClass("highlighted");r=parseInt(this.search_results.css("maxHeight"),10);s=this.search_results.scrollTop();i=r+s;n=this.result_highlight.position().top+this.search_results.scrollTop();t=n+this.result_highlight.outerHeight();if(t>=i)return this.search_results.scrollTop(t-r>0?t-r:0);if(n<s)return this.search_results.scrollTop(n)}};n.prototype.result_clear_highlight=function(){this.result_highlight&&this.result_highlight.removeClass("highlighted");return this.result_highlight=null};n.prototype.results_show=function(){if(this.is_multiple&&this.max_selected_options<=this.choices_count()){this.form_field_jq.trigger("chosen:maxselected",{chosen:this});return!1}this.container.addClass("chosen-with-drop");this.form_field_jq.trigger("chosen:showing_dropdown",{chosen:this});this.results_showing=!0;this.search_field.focus();this.search_field.val(this.search_field.val());return this.winnow_results()};n.prototype.update_results_content=function(e){return this.search_results.html(e)};n.prototype.results_hide=function(){if(this.results_showing){this.result_clear_highlight();this.container.removeClass("chosen-with-drop");this.form_field_jq.trigger("chosen:hiding_dropdown",{chosen:this})}return this.results_showing=!1};n.prototype.set_tab_index=function(e){var t;if(this.form_field.tabIndex){t=this.form_field.tabIndex;this.form_field.tabIndex=-1;return this.search_field[0].tabIndex=t}};n.prototype.set_label_behavior=function(){var t=this;this.form_field_label=this.form_field_jq.parents("label");!this.form_field_label.length&&this.form_field.id.length&&(this.form_field_label=e("label[for='"+this.form_field.id+"']"));if(this.form_field_label.length>0)return this.form_field_label.bind("click.chosen",function(e){return t.is_multiple?t.container_mousedown(e):t.activate_field()})};n.prototype.show_search_field_default=function(){if(this.is_multiple&&this.choices_count()<1&&!this.active_field){this.search_field.val(this.default_text);return this.search_field.addClass("default")}this.search_field.val("");return this.search_field.removeClass("default")};n.prototype.search_results_mouseup=function(t){var n;n=e(t.target).hasClass("active-result")?e(t.target):e(t.target).parents(".active-result").first();if(n.length){this.result_highlight=n;this.result_select(t);return this.search_field.focus()}};n.prototype.search_results_mouseover=function(t){var n;n=e(t.target).hasClass("active-result")?e(t.target):e(t.target).parents(".active-result").first();if(n)return this.result_do_highlight(n)};n.prototype.search_results_mouseout=function(t){if(e(t.target).hasClass("active-result"))return this.result_clear_highlight()};n.prototype.choice_build=function(t){var n,r,i=this;n=e("<li />",{"class":"search-choice"}).html("<span>"+t.html+"</span>");if(t.disabled)n.addClass("search-choice-disabled");else{r=e("<a />",{"class":"search-choice-close","data-option-array-index":t.array_index});r.bind("click.chosen",function(e){return i.choice_destroy_link_click(e)});n.append(r)}return this.search_container.before(n)};n.prototype.choice_destroy_link_click=function(t){t.preventDefault();t.stopPropagation();if(!this.is_disabled)return this.choice_destroy(e(t.target))};n.prototype.choice_destroy=function(e){if(this.result_deselect(e[0].getAttribute("data-option-array-index"))){this.show_search_field_default();this.is_multiple&&this.choices_count()>0&&this.search_field.val().length<1&&this.results_hide();e.parents("li").first().remove();return this.search_field_scale()}};n.prototype.results_reset=function(){this.form_field.options[0].selected=!0;this.selected_option_count=null;this.single_set_selected_text();this.show_search_field_default();this.results_reset_cleanup();this.form_field_jq.trigger("change");if(this.active_field)return this.results_hide()};n.prototype.results_reset_cleanup=function(){this.current_selectedIndex=this.form_field.selectedIndex;return this.selected_item.find("abbr").remove()};n.prototype.result_select=function(e){var t,n,r;if(this.result_highlight){t=this.result_highlight;this.result_clear_highlight();if(this.is_multiple&&this.max_selected_options<=this.choices_count()){this.form_field_jq.trigger("chosen:maxselected",{chosen:this});return!1}if(this.is_multiple)t.removeClass("active-result");else{if(this.result_single_selected){this.result_single_selected.removeClass("result-selected");r=this.result_single_selected[0].getAttribute("data-option-array-index");this.results_data[r].selected=!1}this.result_single_selected=t}t.addClass("result-selected");n=this.results_data[t[0].getAttribute("data-option-array-index")];n.selected=!0;this.form_field.options[n.options_index].selected=!0;this.selected_option_count=null;this.is_multiple?this.choice_build(n):this.single_set_selected_text(n.text);(!e.metaKey&&!e.ctrlKey||!this.is_multiple)&&this.results_hide();this.search_field.val("");(this.is_multiple||this.form_field.selectedIndex!==this.current_selectedIndex)&&this.form_field_jq.trigger("change",{selected:this.form_field.options[n.options_index].value});this.current_selectedIndex=this.form_field.selectedIndex;return this.search_field_scale()}};n.prototype.single_set_selected_text=function(e){e==null&&(e=this.default_text);if(e===this.default_text)this.selected_item.addClass("chosen-default");else{this.single_deselect_control_build();this.selected_item.removeClass("chosen-default")}return this.selected_item.find("span").text(e)};n.prototype.result_deselect=function(e){var t;t=this.results_data[e];if(!this.form_field.options[t.options_index].disabled){t.selected=!1;this.form_field.options[t.options_index].selected=!1;this.selected_option_count=null;this.result_clear_highlight();this.results_showing&&this.winnow_results();this.form_field_jq.trigger("change",{deselected:this.form_field.options[t.options_index].value});this.search_field_scale();return!0}return!1};n.prototype.single_deselect_control_build=function(){if(!this.allow_single_deselect)return;this.selected_item.find("abbr").length||this.selected_item.find("span").first().after('<abbr class="search-choice-close"></abbr>');return this.selected_item.addClass("chosen-single-with-deselect")};n.prototype.get_search_text=function(){return this.search_field.val()===this.default_text?"":e("<div/>").text(e.trim(this.search_field.val())).html()};n.prototype.winnow_results_set_highlight=function(){var e,t;t=this.is_multiple?[]:this.search_results.find(".result-selected.active-result");e=t.length?t.first():this.search_results.find(".active-result").first();if(e!=null)return this.result_do_highlight(e)};n.prototype.no_results=function(t){var n;n=e('<li class="no-results">'+this.results_none_found+' "<span></span>"</li>');n.find("span").first().html(t);return this.search_results.append(n)};n.prototype.no_results_clear=function(){return this.search_results.find(".no-results").remove()};n.prototype.keydown_arrow=function(){var e;if(!this.results_showing||!this.result_highlight)return this.results_show();e=this.result_highlight.nextAll("li.active-result").first();if(e)return this.result_do_highlight(e)};n.prototype.keyup_arrow=function(){var e;if(!this.results_showing&&!this.is_multiple)return this.results_show();if(this.result_highlight){e=this.result_highlight.prevAll("li.active-result");if(e.length)return this.result_do_highlight(e.first());this.choices_count()>0&&this.results_hide();return this.result_clear_highlight()}};n.prototype.keydown_backstroke=function(){var e;if(this.pending_backstroke){this.choice_destroy(this.pending_backstroke.find("a").first());return this.clear_backstroke()}e=this.search_container.siblings("li.search-choice").last();if(e.length&&!e.hasClass("search-choice-disabled")){this.pending_backstroke=e;return this.single_backstroke_delete?this.keydown_backstroke():this.pending_backstroke.addClass("search-choice-focus")}};n.prototype.clear_backstroke=function(){this.pending_backstroke&&this.pending_backstroke.removeClass("search-choice-focus");return this.pending_backstroke=null};n.prototype.keydown_checker=function(e){var t,n;t=(n=e.which)!=null?n:e.keyCode;this.search_field_scale();t!==8&&this.pending_backstroke&&this.clear_backstroke();switch(t){case 8:this.backstroke_length=this.search_field.val().length;break;case 9:this.results_showing&&!this.is_multiple&&this.result_select(e);this.mouse_on_container=!1;break;case 13:e.preventDefault();break;case 38:e.preventDefault();this.keyup_arrow();break;case 40:e.preventDefault();this.keydown_arrow()}};n.prototype.search_field_scale=function(){var t,n,r,i,s,o,u,a,f;if(this.is_multiple){r=0;u=0;s="position:absolute; left: -1000px; top: -1000px; display:none;";o=["font-size","font-style","font-weight","font-family","line-height","text-transform","letter-spacing"];for(a=0,f=o.length;a<f;a++){i=o[a];s+=i+":"+this.search_field.css(i)+";"}t=e("<div />",{style:s});t.text(this.search_field.val());e("body").append(t);u=t.width()+25;t.remove();n=this.container.outerWidth();u>n-10&&(u=n-10);return this.search_field.css({width:u+"px"})}};return n}(t)}).call(this);
\ No newline at end of file
diff --git a/assets/js/flexslider/jquery.flexslider.js b/assets/js/flexslider/jquery.flexslider.js
new file mode 100644
index 00000000000..5d255f25ea8
--- /dev/null
+++ b/assets/js/flexslider/jquery.flexslider.js
@@ -0,0 +1,1222 @@
+/*
+ * jQuery FlexSlider v2.6.1
+ * Copyright 2012 WooThemes
+ * Contributing Author: Tyler Smith
+ */
+;
+(function ($) {
+
+  var focused = true;
+
+  //FlexSlider: Object Instance
+  $.flexslider = function(el, options) {
+    var slider = $(el);
+
+    // making variables public
+
+    //if rtl value was not passed and html is in rtl..enable it by default.
+  	if(typeof options.rtl=='undefined' && $('html').attr('dir')=='rtl'){
+  		options.rtl=true;
+    }
+    slider.vars = $.extend({}, $.flexslider.defaults, options);
+
+    var namespace = slider.vars.namespace,
+        msGesture = window.navigator && window.navigator.msPointerEnabled && window.MSGesture,
+        touch = (( "ontouchstart" in window ) || msGesture || window.DocumentTouch && document instanceof DocumentTouch) && slider.vars.touch,
+        // depricating this idea, as devices are being released with both of these events
+        eventType = "click touchend MSPointerUp keyup",
+        watchedEvent = "",
+        watchedEventClearTimer,
+        vertical = slider.vars.direction === "vertical",
+        reverse = slider.vars.reverse,
+        carousel = (slider.vars.itemWidth > 0),
+        fade = slider.vars.animation === "fade",
+        asNav = slider.vars.asNavFor !== "",
+        methods = {};
+
+    // Store a reference to the slider object
+    $.data(el, "flexslider", slider);
+
+    // Private slider methods
+    methods = {
+      init: function() {
+        slider.animating = false;
+        // Get current slide and make sure it is a number
+        slider.currentSlide = parseInt( ( slider.vars.startAt ? slider.vars.startAt : 0), 10 );
+        if ( isNaN( slider.currentSlide ) ) { slider.currentSlide = 0; }
+        slider.animatingTo = slider.currentSlide;
+        slider.atEnd = (slider.currentSlide === 0 || slider.currentSlide === slider.last);
+        slider.containerSelector = slider.vars.selector.substr(0,slider.vars.selector.search(' '));
+        slider.slides = $(slider.vars.selector, slider);
+        slider.container = $(slider.containerSelector, slider);
+        slider.count = slider.slides.length;
+        // SYNC:
+        slider.syncExists = $(slider.vars.sync).length > 0;
+        // SLIDE:
+        if (slider.vars.animation === "slide") { slider.vars.animation = "swing"; }
+        slider.prop = (vertical) ? "top" : ( slider.vars.rtl ? "marginRight" : "marginLeft" );
+        slider.args = {};
+        // SLIDESHOW:
+        slider.manualPause = false;
+        slider.stopped = false;
+        //PAUSE WHEN INVISIBLE
+        slider.started = false;
+        slider.startTimeout = null;
+        // TOUCH/USECSS:
+        slider.transitions = !slider.vars.video && !fade && slider.vars.useCSS && (function() {
+          var obj = document.createElement('div'),
+              props = ['perspectiveProperty', 'WebkitPerspective', 'MozPerspective', 'OPerspective', 'msPerspective'];
+          for (var i in props) {
+            if ( obj.style[ props[i] ] !== undefined ) {
+              slider.pfx = props[i].replace('Perspective','').toLowerCase();
+              slider.prop = "-" + slider.pfx + "-transform";
+              return true;
+            }
+          }
+          return false;
+        }());
+        slider.ensureAnimationEnd = '';
+        // CONTROLSCONTAINER:
+        if (slider.vars.controlsContainer !== "") slider.controlsContainer = $(slider.vars.controlsContainer).length > 0 && $(slider.vars.controlsContainer);
+        // MANUAL:
+        if (slider.vars.manualControls !== "") slider.manualControls = $(slider.vars.manualControls).length > 0 && $(slider.vars.manualControls);
+
+        // CUSTOM DIRECTION NAV:
+        if (slider.vars.customDirectionNav !== "") slider.customDirectionNav = $(slider.vars.customDirectionNav).length === 2 && $(slider.vars.customDirectionNav);
+
+        // RANDOMIZE:
+        if (slider.vars.randomize) {
+          slider.slides.sort(function() { return (Math.round(Math.random())-0.5); });
+          slider.container.empty().append(slider.slides);
+        }
+
+        slider.doMath();
+
+        // INIT
+        slider.setup("init");
+
+        // CONTROLNAV:
+        if (slider.vars.controlNav) { methods.controlNav.setup(); }
+
+        // DIRECTIONNAV:
+        if (slider.vars.directionNav) { methods.directionNav.setup(); }
+
+        // KEYBOARD:
+        if (slider.vars.keyboard && ($(slider.containerSelector).length === 1 || slider.vars.multipleKeyboard)) {
+          $(document).bind('keyup', function(event) {
+            var keycode = event.keyCode;
+            if (!slider.animating && (keycode === 39 || keycode === 37)) {
+              var target = (slider.vars.rtl?
+                                ((keycode === 37) ? slider.getTarget('next') :
+                                (keycode === 39) ? slider.getTarget('prev') : false)
+                                :
+                                ((keycode === 39) ? slider.getTarget('next') :
+                                (keycode === 37) ? slider.getTarget('prev') : false)
+                                )
+                                ;
+              slider.flexAnimate(target, slider.vars.pauseOnAction);
+            }
+          });
+        }
+        // MOUSEWHEEL:
+        if (slider.vars.mousewheel) {
+          slider.bind('mousewheel', function(event, delta, deltaX, deltaY) {
+            event.preventDefault();
+            var target = (delta < 0) ? slider.getTarget('next') : slider.getTarget('prev');
+            slider.flexAnimate(target, slider.vars.pauseOnAction);
+          });
+        }
+
+        // PAUSEPLAY
+        if (slider.vars.pausePlay) { methods.pausePlay.setup(); }
+
+        //PAUSE WHEN INVISIBLE
+        if (slider.vars.slideshow && slider.vars.pauseInvisible) { methods.pauseInvisible.init(); }
+
+        // SLIDSESHOW
+        if (slider.vars.slideshow) {
+          if (slider.vars.pauseOnHover) {
+            slider.hover(function() {
+              if (!slider.manualPlay && !slider.manualPause) { slider.pause(); }
+            }, function() {
+              if (!slider.manualPause && !slider.manualPlay && !slider.stopped) { slider.play(); }
+            });
+          }
+          // initialize animation
+          //If we're visible, or we don't use PageVisibility API
+          if(!slider.vars.pauseInvisible || !methods.pauseInvisible.isHidden()) {
+            (slider.vars.initDelay > 0) ? slider.startTimeout = setTimeout(slider.play, slider.vars.initDelay) : slider.play();
+          }
+        }
+
+        // ASNAV:
+        if (asNav) { methods.asNav.setup(); }
+
+        // TOUCH
+        if (touch && slider.vars.touch) { methods.touch(); }
+
+        // FADE&&SMOOTHHEIGHT || SLIDE:
+        if (!fade || (fade && slider.vars.smoothHeight)) { $(window).bind("resize orientationchange focus", methods.resize); }
+
+        slider.find("img").attr("draggable", "false");
+
+        // API: start() Callback
+        setTimeout(function(){
+          slider.vars.start(slider);
+        }, 200);
+      },
+      asNav: {
+        setup: function() {
+          slider.asNav = true;
+          slider.animatingTo = Math.floor(slider.currentSlide/slider.move);
+          slider.currentItem = slider.currentSlide;
+          slider.slides.removeClass(namespace + "active-slide").eq(slider.currentItem).addClass(namespace + "active-slide");
+          if(!msGesture){
+              slider.slides.on(eventType, function(e){
+                e.preventDefault();
+                var $slide = $(this),
+                    target = $slide.index();
+        				var posFromX;
+                if(slider.vars.rtl){
+        					posFromX = -1*($slide.offset().right - $(slider).scrollLeft()); // Find position of slide relative to right of slider container
+        				}
+        				else
+        				{
+        					posFromX = $slide.offset().left - $(slider).scrollLeft(); // Find position of slide relative to left of slider container
+        				}
+                if( posFromX <= 0 && $slide.hasClass( namespace + 'active-slide' ) ) {
+                  slider.flexAnimate(slider.getTarget("prev"), true);
+                } else if (!$(slider.vars.asNavFor).data('flexslider').animating && !$slide.hasClass(namespace + "active-slide")) {
+                  slider.direction = (slider.currentItem < target) ? "next" : "prev";
+                  slider.flexAnimate(target, slider.vars.pauseOnAction, false, true, true);
+                }
+              });
+          }else{
+              el._slider = slider;
+              slider.slides.each(function (){
+                  var that = this;
+                  that._gesture = new MSGesture();
+                  that._gesture.target = that;
+                  that.addEventListener("MSPointerDown", function (e){
+                      e.preventDefault();
+                      if(e.currentTarget._gesture) {
+                        e.currentTarget._gesture.addPointer(e.pointerId);
+                      }
+                  }, false);
+                  that.addEventListener("MSGestureTap", function (e){
+                      e.preventDefault();
+                      var $slide = $(this),
+                          target = $slide.index();
+                      if (!$(slider.vars.asNavFor).data('flexslider').animating && !$slide.hasClass('active')) {
+                          slider.direction = (slider.currentItem < target) ? "next" : "prev";
+                          slider.flexAnimate(target, slider.vars.pauseOnAction, false, true, true);
+                      }
+                  });
+              });
+          }
+        }
+      },
+      controlNav: {
+        setup: function() {
+          if (!slider.manualControls) {
+            methods.controlNav.setupPaging();
+          } else { // MANUALCONTROLS:
+            methods.controlNav.setupManual();
+          }
+        },
+        setupPaging: function() {
+          var type = (slider.vars.controlNav === "thumbnails") ? 'control-thumbs' : 'control-paging',
+              j = 1,
+              item,
+              slide;
+
+          slider.controlNavScaffold = $('<ol class="'+ namespace + 'control-nav ' + namespace + type + '"></ol>');
+
+          if (slider.pagingCount > 1) {
+            for (var i = 0; i < slider.pagingCount; i++) {
+              slide = slider.slides.eq(i);
+              if ( undefined === slide.attr( 'data-thumb-alt' ) ) { slide.attr( 'data-thumb-alt', '' ); }
+              var altText = ( '' !== slide.attr( 'data-thumb-alt' ) ) ? altText = ' alt="' + slide.attr( 'data-thumb-alt' ) + '"' : '';
+              item = (slider.vars.controlNav === "thumbnails") ? '<img src="' + slide.attr( 'data-thumb' ) + '"' + altText + '/>' : '<a href="#">' + j + '</a>';
+              if ( 'thumbnails' === slider.vars.controlNav && true === slider.vars.thumbCaptions ) {
+                var captn = slide.attr( 'data-thumbcaption' );
+                if ( '' !== captn && undefined !== captn ) { item += '<span class="' + namespace + 'caption">' + captn + '</span>'; }
+              }
+              slider.controlNavScaffold.append('<li>' + item + '</li>');
+              j++;
+            }
+          }
+
+          // CONTROLSCONTAINER:
+          (slider.controlsContainer) ? $(slider.controlsContainer).append(slider.controlNavScaffold) : slider.append(slider.controlNavScaffold);
+          methods.controlNav.set();
+
+          methods.controlNav.active();
+
+          slider.controlNavScaffold.delegate('a, img', eventType, function(event) {
+            event.preventDefault();
+
+            if (watchedEvent === "" || watchedEvent === event.type) {
+              var $this = $(this),
+                  target = slider.controlNav.index($this);
+
+              if (!$this.hasClass(namespace + 'active')) {
+                slider.direction = (target > slider.currentSlide) ? "next" : "prev";
+                slider.flexAnimate(target, slider.vars.pauseOnAction);
+              }
+            }
+
+            // setup flags to prevent event duplication
+            if (watchedEvent === "") {
+              watchedEvent = event.type;
+            }
+            methods.setToClearWatchedEvent();
+
+          });
+        },
+        setupManual: function() {
+          slider.controlNav = slider.manualControls;
+          methods.controlNav.active();
+
+          slider.controlNav.bind(eventType, function(event) {
+            event.preventDefault();
+
+            if (watchedEvent === "" || watchedEvent === event.type) {
+              var $this = $(this),
+                  target = slider.controlNav.index($this);
+
+              if (!$this.hasClass(namespace + 'active')) {
+                (target > slider.currentSlide) ? slider.direction = "next" : slider.direction = "prev";
+                slider.flexAnimate(target, slider.vars.pauseOnAction);
+              }
+            }
+
+            // setup flags to prevent event duplication
+            if (watchedEvent === "") {
+              watchedEvent = event.type;
+            }
+            methods.setToClearWatchedEvent();
+          });
+        },
+        set: function() {
+          var selector = (slider.vars.controlNav === "thumbnails") ? 'img' : 'a';
+          slider.controlNav = $('.' + namespace + 'control-nav li ' + selector, (slider.controlsContainer) ? slider.controlsContainer : slider);
+        },
+        active: function() {
+          slider.controlNav.removeClass(namespace + "active").eq(slider.animatingTo).addClass(namespace + "active");
+        },
+        update: function(action, pos) {
+          if (slider.pagingCount > 1 && action === "add") {
+            slider.controlNavScaffold.append($('<li><a href="#">' + slider.count + '</a></li>'));
+          } else if (slider.pagingCount === 1) {
+            slider.controlNavScaffold.find('li').remove();
+          } else {
+            slider.controlNav.eq(pos).closest('li').remove();
+          }
+          methods.controlNav.set();
+          (slider.pagingCount > 1 && slider.pagingCount !== slider.controlNav.length) ? slider.update(pos, action) : methods.controlNav.active();
+        }
+      },
+      directionNav: {
+        setup: function() {
+          var directionNavScaffold = $('<ul class="' + namespace + 'direction-nav"><li class="' + namespace + 'nav-prev"><a class="' + namespace + 'prev" href="#">' + slider.vars.prevText + '</a></li><li class="' + namespace + 'nav-next"><a class="' + namespace + 'next" href="#">' + slider.vars.nextText + '</a></li></ul>');
+
+          // CUSTOM DIRECTION NAV:
+          if (slider.customDirectionNav) {
+            slider.directionNav = slider.customDirectionNav;
+          // CONTROLSCONTAINER:
+          } else if (slider.controlsContainer) {
+            $(slider.controlsContainer).append(directionNavScaffold);
+            slider.directionNav = $('.' + namespace + 'direction-nav li a', slider.controlsContainer);
+          } else {
+            slider.append(directionNavScaffold);
+            slider.directionNav = $('.' + namespace + 'direction-nav li a', slider);
+          }
+
+          methods.directionNav.update();
+
+          slider.directionNav.bind(eventType, function(event) {
+            event.preventDefault();
+            var target;
+
+            if (watchedEvent === "" || watchedEvent === event.type) {
+              target = ($(this).hasClass(namespace + 'next')) ? slider.getTarget('next') : slider.getTarget('prev');
+              slider.flexAnimate(target, slider.vars.pauseOnAction);
+            }
+
+            // setup flags to prevent event duplication
+            if (watchedEvent === "") {
+              watchedEvent = event.type;
+            }
+            methods.setToClearWatchedEvent();
+          });
+        },
+        update: function() {
+          var disabledClass = namespace + 'disabled';
+          if (slider.pagingCount === 1) {
+            slider.directionNav.addClass(disabledClass).attr('tabindex', '-1');
+          } else if (!slider.vars.animationLoop) {
+            if (slider.animatingTo === 0) {
+              slider.directionNav.removeClass(disabledClass).filter('.' + namespace + "prev").addClass(disabledClass).attr('tabindex', '-1');
+            } else if (slider.animatingTo === slider.last) {
+              slider.directionNav.removeClass(disabledClass).filter('.' + namespace + "next").addClass(disabledClass).attr('tabindex', '-1');
+            } else {
+              slider.directionNav.removeClass(disabledClass).removeAttr('tabindex');
+            }
+          } else {
+            slider.directionNav.removeClass(disabledClass).removeAttr('tabindex');
+          }
+        }
+      },
+      pausePlay: {
+        setup: function() {
+          var pausePlayScaffold = $('<div class="' + namespace + 'pauseplay"><a href="#"></a></div>');
+
+          // CONTROLSCONTAINER:
+          if (slider.controlsContainer) {
+            slider.controlsContainer.append(pausePlayScaffold);
+            slider.pausePlay = $('.' + namespace + 'pauseplay a', slider.controlsContainer);
+          } else {
+            slider.append(pausePlayScaffold);
+            slider.pausePlay = $('.' + namespace + 'pauseplay a', slider);
+          }
+
+          methods.pausePlay.update((slider.vars.slideshow) ? namespace + 'pause' : namespace + 'play');
+
+          slider.pausePlay.bind(eventType, function(event) {
+            event.preventDefault();
+
+            if (watchedEvent === "" || watchedEvent === event.type) {
+              if ($(this).hasClass(namespace + 'pause')) {
+                slider.manualPause = true;
+                slider.manualPlay = false;
+                slider.pause();
+              } else {
+                slider.manualPause = false;
+                slider.manualPlay = true;
+                slider.play();
+              }
+            }
+
+            // setup flags to prevent event duplication
+            if (watchedEvent === "") {
+              watchedEvent = event.type;
+            }
+            methods.setToClearWatchedEvent();
+          });
+        },
+        update: function(state) {
+          (state === "play") ? slider.pausePlay.removeClass(namespace + 'pause').addClass(namespace + 'play').html(slider.vars.playText) : slider.pausePlay.removeClass(namespace + 'play').addClass(namespace + 'pause').html(slider.vars.pauseText);
+        }
+      },
+      touch: function() {
+        var startX,
+          startY,
+          offset,
+          cwidth,
+          dx,
+          startT,
+          onTouchStart,
+          onTouchMove,
+          onTouchEnd,
+          scrolling = false,
+          localX = 0,
+          localY = 0,
+          accDx = 0;
+
+        if(!msGesture){
+            onTouchStart = function(e) {
+              if (slider.animating) {
+                e.preventDefault();
+              } else if ( ( window.navigator.msPointerEnabled ) || e.touches.length === 1 ) {
+                slider.pause();
+                // CAROUSEL:
+                cwidth = (vertical) ? slider.h : slider. w;
+                startT = Number(new Date());
+                // CAROUSEL:
+
+                // Local vars for X and Y points.
+                localX = e.touches[0].pageX;
+                localY = e.touches[0].pageY;
+
+                offset = (carousel && reverse && slider.animatingTo === slider.last) ? 0 :
+                         (carousel && reverse) ? slider.limit - (((slider.itemW + slider.vars.itemMargin) * slider.move) * slider.animatingTo) :
+                         (carousel && slider.currentSlide === slider.last) ? slider.limit :
+                         (carousel) ? ((slider.itemW + slider.vars.itemMargin) * slider.move) * slider.currentSlide :
+                         (reverse) ? (slider.last - slider.currentSlide + slider.cloneOffset) * cwidth : (slider.currentSlide + slider.cloneOffset) * cwidth;
+                startX = (vertical) ? localY : localX;
+                startY = (vertical) ? localX : localY;
+                el.addEventListener('touchmove', onTouchMove, false);
+                el.addEventListener('touchend', onTouchEnd, false);
+              }
+            };
+
+            onTouchMove = function(e) {
+              // Local vars for X and Y points.
+
+              localX = e.touches[0].pageX;
+              localY = e.touches[0].pageY;
+
+              dx = (vertical) ? startX - localY : (slider.vars.rtl?-1:1)*(startX - localX);
+              scrolling = (vertical) ? (Math.abs(dx) < Math.abs(localX - startY)) : (Math.abs(dx) < Math.abs(localY - startY));
+              var fxms = 500;
+
+              if ( ! scrolling || Number( new Date() ) - startT > fxms ) {
+                e.preventDefault();
+                if (!fade && slider.transitions) {
+                  if (!slider.vars.animationLoop) {
+                    dx = dx/((slider.currentSlide === 0 && dx < 0 || slider.currentSlide === slider.last && dx > 0) ? (Math.abs(dx)/cwidth+2) : 1);
+                  }
+                  slider.setProps(offset + dx, "setTouch");
+                }
+              }
+            };
+
+            onTouchEnd = function(e) {
+              // finish the touch by undoing the touch session
+              el.removeEventListener('touchmove', onTouchMove, false);
+
+              if (slider.animatingTo === slider.currentSlide && !scrolling && !(dx === null)) {
+                var updateDx = (reverse) ? -dx : dx,
+                    target = (updateDx > 0) ? slider.getTarget('next') : slider.getTarget('prev');
+
+                if (slider.canAdvance(target) && (Number(new Date()) - startT < 550 && Math.abs(updateDx) > 50 || Math.abs(updateDx) > cwidth/2)) {
+                  slider.flexAnimate(target, slider.vars.pauseOnAction);
+                } else {
+                  if (!fade) { slider.flexAnimate(slider.currentSlide, slider.vars.pauseOnAction, true); }
+                }
+              }
+              el.removeEventListener('touchend', onTouchEnd, false);
+
+              startX = null;
+              startY = null;
+              dx = null;
+              offset = null;
+            };
+
+            el.addEventListener('touchstart', onTouchStart, false);
+        }else{
+            el.style.msTouchAction = "none";
+            el._gesture = new MSGesture();
+            el._gesture.target = el;
+            el.addEventListener("MSPointerDown", onMSPointerDown, false);
+            el._slider = slider;
+            el.addEventListener("MSGestureChange", onMSGestureChange, false);
+            el.addEventListener("MSGestureEnd", onMSGestureEnd, false);
+
+            function onMSPointerDown(e){
+                e.stopPropagation();
+                if (slider.animating) {
+                    e.preventDefault();
+                }else{
+                    slider.pause();
+                    el._gesture.addPointer(e.pointerId);
+                    accDx = 0;
+                    cwidth = (vertical) ? slider.h : slider. w;
+                    startT = Number(new Date());
+                    // CAROUSEL:
+
+                    offset = (carousel && reverse && slider.animatingTo === slider.last) ? 0 :
+                        (carousel && reverse) ? slider.limit - (((slider.itemW + slider.vars.itemMargin) * slider.move) * slider.animatingTo) :
+                            (carousel && slider.currentSlide === slider.last) ? slider.limit :
+                                (carousel) ? ((slider.itemW + slider.vars.itemMargin) * slider.move) * slider.currentSlide :
+                                    (reverse) ? (slider.last - slider.currentSlide + slider.cloneOffset) * cwidth : (slider.currentSlide + slider.cloneOffset) * cwidth;
+                }
+            }
+
+            function onMSGestureChange(e) {
+                e.stopPropagation();
+                var slider = e.target._slider;
+                if(!slider){
+                    return;
+                }
+                var transX = -e.translationX,
+                    transY = -e.translationY;
+
+                //Accumulate translations.
+                accDx = accDx + ((vertical) ? transY : transX);
+                dx = (slider.vars.rtl?-1:1)*accDx;
+                scrolling = (vertical) ? (Math.abs(accDx) < Math.abs(-transX)) : (Math.abs(accDx) < Math.abs(-transY));
+
+                if(e.detail === e.MSGESTURE_FLAG_INERTIA){
+                    setImmediate(function (){
+                        el._gesture.stop();
+                    });
+
+                    return;
+                }
+
+                if (!scrolling || Number(new Date()) - startT > 500) {
+                    e.preventDefault();
+                    if (!fade && slider.transitions) {
+                        if (!slider.vars.animationLoop) {
+                            dx = accDx / ((slider.currentSlide === 0 && accDx < 0 || slider.currentSlide === slider.last && accDx > 0) ? (Math.abs(accDx) / cwidth + 2) : 1);
+                        }
+                        slider.setProps(offset + dx, "setTouch");
+                    }
+                }
+            }
+
+            function onMSGestureEnd(e) {
+                e.stopPropagation();
+                var slider = e.target._slider;
+                if(!slider){
+                    return;
+                }
+                if (slider.animatingTo === slider.currentSlide && !scrolling && !(dx === null)) {
+                    var updateDx = (reverse) ? -dx : dx,
+                        target = (updateDx > 0) ? slider.getTarget('next') : slider.getTarget('prev');
+
+                    if (slider.canAdvance(target) && (Number(new Date()) - startT < 550 && Math.abs(updateDx) > 50 || Math.abs(updateDx) > cwidth/2)) {
+                        slider.flexAnimate(target, slider.vars.pauseOnAction);
+                    } else {
+                        if (!fade) { slider.flexAnimate(slider.currentSlide, slider.vars.pauseOnAction, true); }
+                    }
+                }
+
+                startX = null;
+                startY = null;
+                dx = null;
+                offset = null;
+                accDx = 0;
+            }
+        }
+      },
+      resize: function() {
+        if (!slider.animating && slider.is(':visible')) {
+          if (!carousel) { slider.doMath(); }
+
+          if (fade) {
+            // SMOOTH HEIGHT:
+            methods.smoothHeight();
+          } else if (carousel) { //CAROUSEL:
+            slider.slides.width(slider.computedW);
+            slider.update(slider.pagingCount);
+            slider.setProps();
+          }
+          else if (vertical) { //VERTICAL:
+            slider.viewport.height(slider.h);
+            slider.setProps(slider.h, "setTotal");
+          } else {
+            // SMOOTH HEIGHT:
+            if (slider.vars.smoothHeight) { methods.smoothHeight(); }
+            slider.newSlides.width(slider.computedW);
+            slider.setProps(slider.computedW, "setTotal");
+          }
+        }
+      },
+      smoothHeight: function(dur) {
+        if (!vertical || fade) {
+          var $obj = (fade) ? slider : slider.viewport;
+          (dur) ? $obj.animate({"height": slider.slides.eq(slider.animatingTo).innerHeight()}, dur) : $obj.innerHeight(slider.slides.eq(slider.animatingTo).innerHeight());
+        }
+      },
+      sync: function(action) {
+        var $obj = $(slider.vars.sync).data("flexslider"),
+            target = slider.animatingTo;
+
+        switch (action) {
+          case "animate": $obj.flexAnimate(target, slider.vars.pauseOnAction, false, true); break;
+          case "play": if (!$obj.playing && !$obj.asNav) { $obj.play(); } break;
+          case "pause": $obj.pause(); break;
+        }
+      },
+      uniqueID: function($clone) {
+        // Append _clone to current level and children elements with id attributes
+        $clone.filter( '[id]' ).add($clone.find( '[id]' )).each(function() {
+          var $this = $(this);
+          $this.attr( 'id', $this.attr( 'id' ) + '_clone' );
+        });
+        return $clone;
+      },
+      pauseInvisible: {
+        visProp: null,
+        init: function() {
+          var visProp = methods.pauseInvisible.getHiddenProp();
+          if (visProp) {
+            var evtname = visProp.replace(/[H|h]idden/,'') + 'visibilitychange';
+            document.addEventListener(evtname, function() {
+              if (methods.pauseInvisible.isHidden()) {
+                if(slider.startTimeout) {
+                  clearTimeout(slider.startTimeout); //If clock is ticking, stop timer and prevent from starting while invisible
+                } else {
+                  slider.pause(); //Or just pause
+                }
+              }
+              else {
+                if(slider.started) {
+                  slider.play(); //Initiated before, just play
+                } else {
+                  if (slider.vars.initDelay > 0) {
+                    setTimeout(slider.play, slider.vars.initDelay);
+                  } else {
+                    slider.play(); //Didn't init before: simply init or wait for it
+                  }
+                }
+              }
+            });
+          }
+        },
+        isHidden: function() {
+          var prop = methods.pauseInvisible.getHiddenProp();
+          if (!prop) {
+            return false;
+          }
+          return document[prop];
+        },
+        getHiddenProp: function() {
+          var prefixes = ['webkit','moz','ms','o'];
+          // if 'hidden' is natively supported just return it
+          if ('hidden' in document) {
+            return 'hidden';
+          }
+          // otherwise loop over all the known prefixes until we find one
+          for ( var i = 0; i < prefixes.length; i++ ) {
+              if ((prefixes[i] + 'Hidden') in document) {
+                return prefixes[i] + 'Hidden';
+              }
+          }
+          // otherwise it's not supported
+          return null;
+        }
+      },
+      setToClearWatchedEvent: function() {
+        clearTimeout(watchedEventClearTimer);
+        watchedEventClearTimer = setTimeout(function() {
+          watchedEvent = "";
+        }, 3000);
+      }
+    };
+
+    // public methods
+    slider.flexAnimate = function(target, pause, override, withSync, fromNav) {
+      if (!slider.vars.animationLoop && target !== slider.currentSlide) {
+        slider.direction = (target > slider.currentSlide) ? "next" : "prev";
+      }
+
+      if (asNav && slider.pagingCount === 1) slider.direction = (slider.currentItem < target) ? "next" : "prev";
+
+      if (!slider.animating && (slider.canAdvance(target, fromNav) || override) && slider.is(":visible")) {
+        if (asNav && withSync) {
+          var master = $(slider.vars.asNavFor).data('flexslider');
+          slider.atEnd = target === 0 || target === slider.count - 1;
+          master.flexAnimate(target, true, false, true, fromNav);
+          slider.direction = (slider.currentItem < target) ? "next" : "prev";
+          master.direction = slider.direction;
+
+          if (Math.ceil((target + 1)/slider.visible) - 1 !== slider.currentSlide && target !== 0) {
+            slider.currentItem = target;
+            slider.slides.removeClass(namespace + "active-slide").eq(target).addClass(namespace + "active-slide");
+            target = Math.floor(target/slider.visible);
+          } else {
+            slider.currentItem = target;
+            slider.slides.removeClass(namespace + "active-slide").eq(target).addClass(namespace + "active-slide");
+            return false;
+          }
+        }
+
+        slider.animating = true;
+        slider.animatingTo = target;
+
+        // SLIDESHOW:
+        if (pause) { slider.pause(); }
+
+        // API: before() animation Callback
+        slider.vars.before(slider);
+
+        // SYNC:
+        if (slider.syncExists && !fromNav) { methods.sync("animate"); }
+
+        // CONTROLNAV
+        if (slider.vars.controlNav) { methods.controlNav.active(); }
+
+        // !CAROUSEL:
+        // CANDIDATE: slide active class (for add/remove slide)
+        if (!carousel) { slider.slides.removeClass(namespace + 'active-slide').eq(target).addClass(namespace + 'active-slide'); }
+
+        // INFINITE LOOP:
+        // CANDIDATE: atEnd
+        slider.atEnd = target === 0 || target === slider.last;
+
+        // DIRECTIONNAV:
+        if (slider.vars.directionNav) { methods.directionNav.update(); }
+
+        if (target === slider.last) {
+          // API: end() of cycle Callback
+          slider.vars.end(slider);
+          // SLIDESHOW && !INFINITE LOOP:
+          if (!slider.vars.animationLoop) { slider.pause(); }
+        }
+
+        // SLIDE:
+        if (!fade) {
+          var dimension = (vertical) ? slider.slides.filter(':first').height() : slider.computedW,
+              margin, slideString, calcNext;
+
+          // INFINITE LOOP / REVERSE:
+          if (carousel) {
+            margin = slider.vars.itemMargin;
+            calcNext = ((slider.itemW + margin) * slider.move) * slider.animatingTo;
+            slideString = (calcNext > slider.limit && slider.visible !== 1) ? slider.limit : calcNext;
+          } else if (slider.currentSlide === 0 && target === slider.count - 1 && slider.vars.animationLoop && slider.direction !== "next") {
+            slideString = (reverse) ? (slider.count + slider.cloneOffset) * dimension : 0;
+          } else if (slider.currentSlide === slider.last && target === 0 && slider.vars.animationLoop && slider.direction !== "prev") {
+            slideString = (reverse) ? 0 : (slider.count + 1) * dimension;
+          } else {
+            slideString = (reverse) ? ((slider.count - 1) - target + slider.cloneOffset) * dimension : (target + slider.cloneOffset) * dimension;
+          }
+          slider.setProps(slideString, "", slider.vars.animationSpeed);
+          if (slider.transitions) {
+            if (!slider.vars.animationLoop || !slider.atEnd) {
+              slider.animating = false;
+              slider.currentSlide = slider.animatingTo;
+            }
+
+            // Unbind previous transitionEnd events and re-bind new transitionEnd event
+            slider.container.unbind("webkitTransitionEnd transitionend");
+            slider.container.bind("webkitTransitionEnd transitionend", function() {
+              clearTimeout(slider.ensureAnimationEnd);
+              slider.wrapup(dimension);
+            });
+
+            // Insurance for the ever-so-fickle transitionEnd event
+            clearTimeout(slider.ensureAnimationEnd);
+            slider.ensureAnimationEnd = setTimeout(function() {
+              slider.wrapup(dimension);
+            }, slider.vars.animationSpeed + 100);
+
+          } else {
+            slider.container.animate(slider.args, slider.vars.animationSpeed, slider.vars.easing, function(){
+              slider.wrapup(dimension);
+            });
+          }
+        } else { // FADE:
+          if (!touch) {
+            //slider.slides.eq(slider.currentSlide).fadeOut(slider.vars.animationSpeed, slider.vars.easing);
+            //slider.slides.eq(target).fadeIn(slider.vars.animationSpeed, slider.vars.easing, slider.wrapup);
+
+            slider.slides.eq(slider.currentSlide).css({"zIndex": 1}).animate({"opacity": 0}, slider.vars.animationSpeed, slider.vars.easing);
+            slider.slides.eq(target).css({"zIndex": 2}).animate({"opacity": 1}, slider.vars.animationSpeed, slider.vars.easing, slider.wrapup);
+
+          } else {
+            slider.slides.eq(slider.currentSlide).css({ "opacity": 0, "zIndex": 1 });
+            slider.slides.eq(target).css({ "opacity": 1, "zIndex": 2 });
+            slider.wrapup(dimension);
+          }
+        }
+        // SMOOTH HEIGHT:
+        if (slider.vars.smoothHeight) { methods.smoothHeight(slider.vars.animationSpeed); }
+      }
+    };
+    slider.wrapup = function(dimension) {
+      // SLIDE:
+      if (!fade && !carousel) {
+        if (slider.currentSlide === 0 && slider.animatingTo === slider.last && slider.vars.animationLoop) {
+          slider.setProps(dimension, "jumpEnd");
+        } else if (slider.currentSlide === slider.last && slider.animatingTo === 0 && slider.vars.animationLoop) {
+          slider.setProps(dimension, "jumpStart");
+        }
+      }
+      slider.animating = false;
+      slider.currentSlide = slider.animatingTo;
+      // API: after() animation Callback
+      slider.vars.after(slider);
+    };
+
+    // SLIDESHOW:
+    slider.animateSlides = function() {
+      if (!slider.animating && focused ) { slider.flexAnimate(slider.getTarget("next")); }
+    };
+    // SLIDESHOW:
+    slider.pause = function() {
+      clearInterval(slider.animatedSlides);
+      slider.animatedSlides = null;
+      slider.playing = false;
+      // PAUSEPLAY:
+      if (slider.vars.pausePlay) { methods.pausePlay.update("play"); }
+      // SYNC:
+      if (slider.syncExists) { methods.sync("pause"); }
+    };
+    // SLIDESHOW:
+    slider.play = function() {
+      if (slider.playing) { clearInterval(slider.animatedSlides); }
+      slider.animatedSlides = slider.animatedSlides || setInterval(slider.animateSlides, slider.vars.slideshowSpeed);
+      slider.started = slider.playing = true;
+      // PAUSEPLAY:
+      if (slider.vars.pausePlay) { methods.pausePlay.update("pause"); }
+      // SYNC:
+      if (slider.syncExists) { methods.sync("play"); }
+    };
+    // STOP:
+    slider.stop = function () {
+      slider.pause();
+      slider.stopped = true;
+    };
+    slider.canAdvance = function(target, fromNav) {
+      // ASNAV:
+      var last = (asNav) ? slider.pagingCount - 1 : slider.last;
+      return (fromNav) ? true :
+             (asNav && slider.currentItem === slider.count - 1 && target === 0 && slider.direction === "prev") ? true :
+             (asNav && slider.currentItem === 0 && target === slider.pagingCount - 1 && slider.direction !== "next") ? false :
+             (target === slider.currentSlide && !asNav) ? false :
+             (slider.vars.animationLoop) ? true :
+             (slider.atEnd && slider.currentSlide === 0 && target === last && slider.direction !== "next") ? false :
+             (slider.atEnd && slider.currentSlide === last && target === 0 && slider.direction === "next") ? false :
+             true;
+    };
+    slider.getTarget = function(dir) {
+      slider.direction = dir;
+      if (dir === "next") {
+        return (slider.currentSlide === slider.last) ? 0 : slider.currentSlide + 1;
+      } else {
+        return (slider.currentSlide === 0) ? slider.last : slider.currentSlide - 1;
+      }
+    };
+
+    // SLIDE:
+    slider.setProps = function(pos, special, dur) {
+      var target = (function() {
+        var posCheck = (pos) ? pos : ((slider.itemW + slider.vars.itemMargin) * slider.move) * slider.animatingTo,
+            posCalc = (function() {
+              if (carousel) {
+                return (special === "setTouch") ? pos :
+                       (reverse && slider.animatingTo === slider.last) ? 0 :
+                       (reverse) ? slider.limit - (((slider.itemW + slider.vars.itemMargin) * slider.move) * slider.animatingTo) :
+                       (slider.animatingTo === slider.last) ? slider.limit : posCheck;
+              } else {
+                switch (special) {
+                  case "setTotal": return (reverse) ? ((slider.count - 1) - slider.currentSlide + slider.cloneOffset) * pos : (slider.currentSlide + slider.cloneOffset) * pos;
+                  case "setTouch": return (reverse) ? pos : pos;
+                  case "jumpEnd": return (reverse) ? pos : slider.count * pos;
+                  case "jumpStart": return (reverse) ? slider.count * pos : pos;
+                  default: return pos;
+                }
+              }
+            }());
+
+            return (posCalc * -1) + "px";
+          }());
+
+      if (slider.transitions) {
+        target = (vertical) ? "translate3d(0," + target + ",0)" : "translate3d(" + ((slider.vars.rtl?-1:1)*parseInt(target)+'px') + ",0,0)";
+        dur = (dur !== undefined) ? (dur/1000) + "s" : "0s";
+        slider.container.css("-" + slider.pfx + "-transition-duration", dur);
+         slider.container.css("transition-duration", dur);
+      }
+
+      slider.args[slider.prop] = target;
+      if (slider.transitions || dur === undefined) { slider.container.css(slider.args); }
+
+      slider.container.css('transform',target);
+    };
+
+    slider.setup = function(type) {
+      // SLIDE:
+      if (!fade) {
+        var sliderOffset, arr;
+
+        if (type === "init") {
+          slider.viewport = $('<div class="' + namespace + 'viewport"></div>').css({"overflow": "hidden", "position": "relative"}).appendTo(slider).append(slider.container);
+          // INFINITE LOOP:
+          slider.cloneCount = 0;
+          slider.cloneOffset = 0;
+          // REVERSE:
+          if (reverse) {
+            arr = $.makeArray(slider.slides).reverse();
+            slider.slides = $(arr);
+            slider.container.empty().append(slider.slides);
+          }
+        }
+        // INFINITE LOOP && !CAROUSEL:
+        if (slider.vars.animationLoop && !carousel) {
+          slider.cloneCount = 2;
+          slider.cloneOffset = 1;
+          // clear out old clones
+          if (type !== "init") { slider.container.find('.clone').remove(); }
+          slider.container.append(methods.uniqueID(slider.slides.first().clone().addClass('clone')).attr('aria-hidden', 'true'))
+                          .prepend(methods.uniqueID(slider.slides.last().clone().addClass('clone')).attr('aria-hidden', 'true'));
+        }
+        slider.newSlides = $(slider.vars.selector, slider);
+
+        sliderOffset = (reverse) ? slider.count - 1 - slider.currentSlide + slider.cloneOffset : slider.currentSlide + slider.cloneOffset;
+        // VERTICAL:
+        if (vertical && !carousel) {
+          slider.container.height((slider.count + slider.cloneCount) * 200 + "%").css("position", "absolute").width("100%");
+          setTimeout(function(){
+            slider.newSlides.css({"display": "block"});
+            slider.doMath();
+            slider.viewport.height(slider.h);
+            slider.setProps(sliderOffset * slider.h, "init");
+          }, (type === "init") ? 100 : 0);
+        } else {
+          slider.container.width((slider.count + slider.cloneCount) * 200 + "%");
+          slider.setProps(sliderOffset * slider.computedW, "init");
+          setTimeout(function(){
+            slider.doMath();
+          if(slider.vars.rtl){
+              slider.newSlides.css({"width": slider.computedW, "marginLeft" : slider.computedM, "float": "right", "display": "block"});
+           }
+            else{
+              slider.newSlides.css({"width": slider.computedW, "marginRight" : slider.computedM, "float": "left", "display": "block"});
+            }
+            // SMOOTH HEIGHT:
+            if (slider.vars.smoothHeight) { methods.smoothHeight(); }
+          }, (type === "init") ? 100 : 0);
+        }
+      } else { // FADE:
+        if(slider.vars.rtl){
+          slider.slides.css({"width": "100%", "float": 'right', "marginLeft": "-100%", "position": "relative"});
+        }
+        else{
+          slider.slides.css({"width": "100%", "float": 'left', "marginRight": "-100%", "position": "relative"});
+        }
+        if (type === "init") {
+          if (!touch) {
+            //slider.slides.eq(slider.currentSlide).fadeIn(slider.vars.animationSpeed, slider.vars.easing);
+            if (slider.vars.fadeFirstSlide == false) {
+              slider.slides.css({ "opacity": 0, "display": "block", "zIndex": 1 }).eq(slider.currentSlide).css({"zIndex": 2}).css({"opacity": 1});
+            } else {
+              slider.slides.css({ "opacity": 0, "display": "block", "zIndex": 1 }).eq(slider.currentSlide).css({"zIndex": 2}).animate({"opacity": 1},slider.vars.animationSpeed,slider.vars.easing);
+            }
+          } else {
+            slider.slides.css({ "opacity": 0, "display": "block", "webkitTransition": "opacity " + slider.vars.animationSpeed / 1000 + "s ease", "zIndex": 1 }).eq(slider.currentSlide).css({ "opacity": 1, "zIndex": 2});
+          }
+        }
+        // SMOOTH HEIGHT:
+        if (slider.vars.smoothHeight) { methods.smoothHeight(); }
+      }
+      // !CAROUSEL:
+      // CANDIDATE: active slide
+      if (!carousel) { slider.slides.removeClass(namespace + "active-slide").eq(slider.currentSlide).addClass(namespace + "active-slide"); }
+
+      //FlexSlider: init() Callback
+      slider.vars.init(slider);
+    };
+
+    slider.doMath = function() {
+      var slide = slider.slides.first(),
+          slideMargin = slider.vars.itemMargin,
+          minItems = slider.vars.minItems,
+          maxItems = slider.vars.maxItems;
+
+      slider.w = (slider.viewport===undefined) ? slider.width() : slider.viewport.width();
+      slider.h = slide.height();
+      slider.boxPadding = slide.outerWidth() - slide.width();
+
+      // CAROUSEL:
+      if (carousel) {
+        slider.itemT = slider.vars.itemWidth + slideMargin;
+        slider.itemM = slideMargin;
+        slider.minW = (minItems) ? minItems * slider.itemT : slider.w;
+        slider.maxW = (maxItems) ? (maxItems * slider.itemT) - slideMargin : slider.w;
+        slider.itemW = (slider.minW > slider.w) ? (slider.w - (slideMargin * (minItems - 1)))/minItems :
+                       (slider.maxW < slider.w) ? (slider.w - (slideMargin * (maxItems - 1)))/maxItems :
+                       (slider.vars.itemWidth > slider.w) ? slider.w : slider.vars.itemWidth;
+
+        slider.visible = Math.floor(slider.w/(slider.itemW));
+        slider.move = (slider.vars.move > 0 && slider.vars.move < slider.visible ) ? slider.vars.move : slider.visible;
+        slider.pagingCount = Math.ceil(((slider.count - slider.visible)/slider.move) + 1);
+        slider.last =  slider.pagingCount - 1;
+        slider.limit = (slider.pagingCount === 1) ? 0 :
+                       (slider.vars.itemWidth > slider.w) ? (slider.itemW * (slider.count - 1)) + (slideMargin * (slider.count - 1)) : ((slider.itemW + slideMargin) * slider.count) - slider.w - slideMargin;
+      } else {
+        slider.itemW = slider.w;
+        slider.itemM = slideMargin;
+        slider.pagingCount = slider.count;
+        slider.last = slider.count - 1;
+      }
+      slider.computedW = slider.itemW - slider.boxPadding;
+      slider.computedM = slider.itemM;
+    };
+
+    slider.update = function(pos, action) {
+      slider.doMath();
+
+      // update currentSlide and slider.animatingTo if necessary
+      if (!carousel) {
+        if (pos < slider.currentSlide) {
+          slider.currentSlide += 1;
+        } else if (pos <= slider.currentSlide && pos !== 0) {
+          slider.currentSlide -= 1;
+        }
+        slider.animatingTo = slider.currentSlide;
+      }
+
+      // update controlNav
+      if (slider.vars.controlNav && !slider.manualControls) {
+        if ((action === "add" && !carousel) || slider.pagingCount > slider.controlNav.length) {
+          methods.controlNav.update("add");
+        } else if ((action === "remove" && !carousel) || slider.pagingCount < slider.controlNav.length) {
+          if (carousel && slider.currentSlide > slider.last) {
+            slider.currentSlide -= 1;
+            slider.animatingTo -= 1;
+          }
+          methods.controlNav.update("remove", slider.last);
+        }
+      }
+      // update directionNav
+      if (slider.vars.directionNav) { methods.directionNav.update(); }
+
+    };
+
+    slider.addSlide = function(obj, pos) {
+      var $obj = $(obj);
+
+      slider.count += 1;
+      slider.last = slider.count - 1;
+
+      // append new slide
+      if (vertical && reverse) {
+        (pos !== undefined) ? slider.slides.eq(slider.count - pos).after($obj) : slider.container.prepend($obj);
+      } else {
+        (pos !== undefined) ? slider.slides.eq(pos).before($obj) : slider.container.append($obj);
+      }
+
+      // update currentSlide, animatingTo, controlNav, and directionNav
+      slider.update(pos, "add");
+
+      // update slider.slides
+      slider.slides = $(slider.vars.selector + ':not(.clone)', slider);
+      // re-setup the slider to accomdate new slide
+      slider.setup();
+
+      //FlexSlider: added() Callback
+      slider.vars.added(slider);
+    };
+    slider.removeSlide = function(obj) {
+      var pos = (isNaN(obj)) ? slider.slides.index($(obj)) : obj;
+
+      // update count
+      slider.count -= 1;
+      slider.last = slider.count - 1;
+
+      // remove slide
+      if (isNaN(obj)) {
+        $(obj, slider.slides).remove();
+      } else {
+        (vertical && reverse) ? slider.slides.eq(slider.last).remove() : slider.slides.eq(obj).remove();
+      }
+
+      // update currentSlide, animatingTo, controlNav, and directionNav
+      slider.doMath();
+      slider.update(pos, "remove");
+
+      // update slider.slides
+      slider.slides = $(slider.vars.selector + ':not(.clone)', slider);
+      // re-setup the slider to accomdate new slide
+      slider.setup();
+
+      // FlexSlider: removed() Callback
+      slider.vars.removed(slider);
+    };
+
+    //FlexSlider: Initialize
+    methods.init();
+  };
+
+  // Ensure the slider isn't focussed if the window loses focus.
+  $( window ).blur( function ( e ) {
+    focused = false;
+  }).focus( function ( e ) {
+    focused = true;
+  });
+
+  //FlexSlider: Default Settings
+  $.flexslider.defaults = {
+    namespace: "flex-",             //{NEW} String: Prefix string attached to the class of every element generated by the plugin
+    selector: ".slides > li",       //{NEW} Selector: Must match a simple pattern. '{container} > {slide}' -- Ignore pattern at your own peril
+    animation: "fade",              //String: Select your animation type, "fade" or "slide"
+    easing: "swing",                //{NEW} String: Determines the easing method used in jQuery transitions. jQuery easing plugin is supported!
+    direction: "horizontal",        //String: Select the sliding direction, "horizontal" or "vertical"
+    reverse: false,                 //{NEW} Boolean: Reverse the animation direction
+    animationLoop: true,            //Boolean: Should the animation loop? If false, directionNav will received "disable" classes at either end
+    smoothHeight: false,            //{NEW} Boolean: Allow height of the slider to animate smoothly in horizontal mode
+    startAt: 0,                     //Integer: The slide that the slider should start on. Array notation (0 = first slide)
+    slideshow: true,                //Boolean: Animate slider automatically
+    slideshowSpeed: 7000,           //Integer: Set the speed of the slideshow cycling, in milliseconds
+    animationSpeed: 600,            //Integer: Set the speed of animations, in milliseconds
+    initDelay: 0,                   //{NEW} Integer: Set an initialization delay, in milliseconds
+    randomize: false,               //Boolean: Randomize slide order
+    fadeFirstSlide: true,           //Boolean: Fade in the first slide when animation type is "fade"
+    thumbCaptions: false,           //Boolean: Whether or not to put captions on thumbnails when using the "thumbnails" controlNav.
+
+    // Usability features
+    pauseOnAction: true,            //Boolean: Pause the slideshow when interacting with control elements, highly recommended.
+    pauseOnHover: false,            //Boolean: Pause the slideshow when hovering over slider, then resume when no longer hovering
+    pauseInvisible: true,   		//{NEW} Boolean: Pause the slideshow when tab is invisible, resume when visible. Provides better UX, lower CPU usage.
+    useCSS: true,                   //{NEW} Boolean: Slider will use CSS3 transitions if available
+    touch: true,                    //{NEW} Boolean: Allow touch swipe navigation of the slider on touch-enabled devices
+    video: false,                   //{NEW} Boolean: If using video in the slider, will prevent CSS3 3D Transforms to avoid graphical glitches
+
+    // Primary Controls
+    controlNav: true,               //Boolean: Create navigation for paging control of each slide? Note: Leave true for manualControls usage
+    directionNav: true,             //Boolean: Create navigation for previous/next navigation? (true/false)
+    prevText: "Previous",           //String: Set the text for the "previous" directionNav item
+    nextText: "Next",               //String: Set the text for the "next" directionNav item
+
+    // Secondary Navigation
+    keyboard: true,                 //Boolean: Allow slider navigating via keyboard left/right keys
+    multipleKeyboard: false,        //{NEW} Boolean: Allow keyboard navigation to affect multiple sliders. Default behavior cuts out keyboard navigation with more than one slider present.
+    mousewheel: false,              //{UPDATED} Boolean: Requires jquery.mousewheel.js (https://github.com/brandonaaron/jquery-mousewheel) - Allows slider navigating via mousewheel
+    pausePlay: false,               //Boolean: Create pause/play dynamic element
+    pauseText: "Pause",             //String: Set the text for the "pause" pausePlay item
+    playText: "Play",               //String: Set the text for the "play" pausePlay item
+
+    // Special properties
+    controlsContainer: "",          //{UPDATED} jQuery Object/Selector: Declare which container the navigation elements should be appended too. Default container is the FlexSlider element. Example use would be $(".flexslider-container"). Property is ignored if given element is not found.
+    manualControls: "",             //{UPDATED} jQuery Object/Selector: Declare custom control navigation. Examples would be $(".flex-control-nav li") or "#tabs-nav li img", etc. The number of elements in your controlNav should match the number of slides/tabs.
+    customDirectionNav: "",         //{NEW} jQuery Object/Selector: Custom prev / next button. Must be two jQuery elements. In order to make the events work they have to have the classes "prev" and "next" (plus namespace)
+    sync: "",                       //{NEW} Selector: Mirror the actions performed on this slider with another slider. Use with care.
+    asNavFor: "",                   //{NEW} Selector: Internal property exposed for turning the slider into a thumbnail navigation for another slider
+
+    // Carousel Options
+    itemWidth: 0,                   //{NEW} Integer: Box-model width of individual carousel items, including horizontal borders and padding.
+    itemMargin: 0,                  //{NEW} Integer: Margin between carousel items.
+    minItems: 1,                    //{NEW} Integer: Minimum number of carousel items that should be visible. Items will resize fluidly when below this.
+    maxItems: 0,                    //{NEW} Integer: Maxmimum number of carousel items that should be visible. Items will resize fluidly when above this limit.
+    move: 0,                        //{NEW} Integer: Number of carousel items that should move on animation. If 0, slider will move all visible items.
+    allowOneSlide: true,           //{NEW} Boolean: Whether or not to allow a slider comprised of a single slide
+
+    // Callback API
+    start: function(){},            //Callback: function(slider) - Fires when the slider loads the first slide
+    before: function(){},           //Callback: function(slider) - Fires asynchronously with each slider animation
+    after: function(){},            //Callback: function(slider) - Fires after each slider animation completes
+    end: function(){},              //Callback: function(slider) - Fires when the slider reaches the last slide (asynchronous)
+    added: function(){},            //{NEW} Callback: function(slider) - Fires after a slide is added
+    removed: function(){},           //{NEW} Callback: function(slider) - Fires after a slide is removed
+    init: function() {},             //{NEW} Callback: function(slider) - Fires after the slider is initially setup
+	rtl: false             //{NEW} Boolean: Whether or not to enable RTL mode
+  };
+
+  //FlexSlider: Plugin Function
+  $.fn.flexslider = function(options) {
+    if (options === undefined) { options = {}; }
+
+    if (typeof options === "object") {
+      return this.each(function() {
+        var $this = $(this),
+            selector = (options.selector) ? options.selector : ".slides > li",
+            $slides = $this.find(selector);
+
+      if ( ( $slides.length === 1 && options.allowOneSlide === false ) || $slides.length === 0 ) {
+          $slides.fadeIn(400);
+          if (options.start) { options.start($this); }
+        } else if ($this.data('flexslider') === undefined) {
+          new $.flexslider(this, options);
+        }
+      });
+    } else {
+      // Helper strings to quickly perform functions on the slider
+      var $slider = $(this).data('flexslider');
+      switch (options) {
+        case "play": $slider.play(); break;
+        case "pause": $slider.pause(); break;
+        case "stop": $slider.stop(); break;
+        case "next": $slider.flexAnimate($slider.getTarget("next"), true); break;
+        case "prev":
+        case "previous": $slider.flexAnimate($slider.getTarget("prev"), true); break;
+        default: if (typeof options === "number") { $slider.flexAnimate(options, true); }
+      }
+    }
+  };
+})(jQuery);
diff --git a/assets/js/flexslider/jquery.flexslider.min.js b/assets/js/flexslider/jquery.flexslider.min.js
new file mode 100644
index 00000000000..0bf5b305a77
--- /dev/null
+++ b/assets/js/flexslider/jquery.flexslider.min.js
@@ -0,0 +1 @@
+!function(a){var b=!0;a.flexslider=function(c,d){var e=a(c);"undefined"==typeof d.rtl&&"rtl"==a("html").attr("dir")&&(d.rtl=!0),e.vars=a.extend({},a.flexslider.defaults,d);var f,g=e.vars.namespace,h=window.navigator&&window.navigator.msPointerEnabled&&window.MSGesture,i=("ontouchstart"in window||h||window.DocumentTouch&&document instanceof DocumentTouch)&&e.vars.touch,j="click touchend MSPointerUp keyup",k="",l="vertical"===e.vars.direction,m=e.vars.reverse,n=e.vars.itemWidth>0,o="fade"===e.vars.animation,p=""!==e.vars.asNavFor,q={};a.data(c,"flexslider",e),q={init:function(){e.animating=!1,e.currentSlide=parseInt(e.vars.startAt?e.vars.startAt:0,10),isNaN(e.currentSlide)&&(e.currentSlide=0),e.animatingTo=e.currentSlide,e.atEnd=0===e.currentSlide||e.currentSlide===e.last,e.containerSelector=e.vars.selector.substr(0,e.vars.selector.search(" ")),e.slides=a(e.vars.selector,e),e.container=a(e.containerSelector,e),e.count=e.slides.length,e.syncExists=a(e.vars.sync).length>0,"slide"===e.vars.animation&&(e.vars.animation="swing"),e.prop=l?"top":e.vars.rtl?"marginRight":"marginLeft",e.args={},e.manualPause=!1,e.stopped=!1,e.started=!1,e.startTimeout=null,e.transitions=!e.vars.video&&!o&&e.vars.useCSS&&function(){var a=document.createElement("div"),b=["perspectiveProperty","WebkitPerspective","MozPerspective","OPerspective","msPerspective"];for(var c in b)if(void 0!==a.style[b[c]])return e.pfx=b[c].replace("Perspective","").toLowerCase(),e.prop="-"+e.pfx+"-transform",!0;return!1}(),e.ensureAnimationEnd="",""!==e.vars.controlsContainer&&(e.controlsContainer=a(e.vars.controlsContainer).length>0&&a(e.vars.controlsContainer)),""!==e.vars.manualControls&&(e.manualControls=a(e.vars.manualControls).length>0&&a(e.vars.manualControls)),""!==e.vars.customDirectionNav&&(e.customDirectionNav=2===a(e.vars.customDirectionNav).length&&a(e.vars.customDirectionNav)),e.vars.randomize&&(e.slides.sort(function(){return Math.round(Math.random())-.5}),e.container.empty().append(e.slides)),e.doMath(),e.setup("init"),e.vars.controlNav&&q.controlNav.setup(),e.vars.directionNav&&q.directionNav.setup(),e.vars.keyboard&&(1===a(e.containerSelector).length||e.vars.multipleKeyboard)&&a(document).bind("keyup",function(a){var b=a.keyCode;if(!e.animating&&(39===b||37===b)){var c=e.vars.rtl?37===b?e.getTarget("next"):39===b&&e.getTarget("prev"):39===b?e.getTarget("next"):37===b&&e.getTarget("prev");e.flexAnimate(c,e.vars.pauseOnAction)}}),e.vars.mousewheel&&e.bind("mousewheel",function(a,b,c,d){a.preventDefault();var f=b<0?e.getTarget("next"):e.getTarget("prev");e.flexAnimate(f,e.vars.pauseOnAction)}),e.vars.pausePlay&&q.pausePlay.setup(),e.vars.slideshow&&e.vars.pauseInvisible&&q.pauseInvisible.init(),e.vars.slideshow&&(e.vars.pauseOnHover&&e.hover(function(){e.manualPlay||e.manualPause||e.pause()},function(){e.manualPause||e.manualPlay||e.stopped||e.play()}),e.vars.pauseInvisible&&q.pauseInvisible.isHidden()||(e.vars.initDelay>0?e.startTimeout=setTimeout(e.play,e.vars.initDelay):e.play())),p&&q.asNav.setup(),i&&e.vars.touch&&q.touch(),(!o||o&&e.vars.smoothHeight)&&a(window).bind("resize orientationchange focus",q.resize),e.find("img").attr("draggable","false"),setTimeout(function(){e.vars.start(e)},200)},asNav:{setup:function(){e.asNav=!0,e.animatingTo=Math.floor(e.currentSlide/e.move),e.currentItem=e.currentSlide,e.slides.removeClass(g+"active-slide").eq(e.currentItem).addClass(g+"active-slide"),h?(c._slider=e,e.slides.each(function(){var b=this;b._gesture=new MSGesture,b._gesture.target=b,b.addEventListener("MSPointerDown",function(a){a.preventDefault(),a.currentTarget._gesture&&a.currentTarget._gesture.addPointer(a.pointerId)},!1),b.addEventListener("MSGestureTap",function(b){b.preventDefault();var c=a(this),d=c.index();a(e.vars.asNavFor).data("flexslider").animating||c.hasClass("active")||(e.direction=e.currentItem<d?"next":"prev",e.flexAnimate(d,e.vars.pauseOnAction,!1,!0,!0))})})):e.slides.on(j,function(b){b.preventDefault();var c,d=a(this),f=d.index();c=e.vars.rtl?-1*(d.offset().right-a(e).scrollLeft()):d.offset().left-a(e).scrollLeft(),c<=0&&d.hasClass(g+"active-slide")?e.flexAnimate(e.getTarget("prev"),!0):a(e.vars.asNavFor).data("flexslider").animating||d.hasClass(g+"active-slide")||(e.direction=e.currentItem<f?"next":"prev",e.flexAnimate(f,e.vars.pauseOnAction,!1,!0,!0))})}},controlNav:{setup:function(){e.manualControls?q.controlNav.setupManual():q.controlNav.setupPaging()},setupPaging:function(){var b,c,d="thumbnails"===e.vars.controlNav?"control-thumbs":"control-paging",f=1;if(e.controlNavScaffold=a('<ol class="'+g+"control-nav "+g+d+'"></ol>'),e.pagingCount>1)for(var h=0;h<e.pagingCount;h++){c=e.slides.eq(h),void 0===c.attr("data-thumb-alt")&&c.attr("data-thumb-alt","");var i=""!==c.attr("data-thumb-alt")?i=' alt="'+c.attr("data-thumb-alt")+'"':"";if(b="thumbnails"===e.vars.controlNav?'<img src="'+c.attr("data-thumb")+'"'+i+"/>":'<a href="#">'+f+"</a>","thumbnails"===e.vars.controlNav&&!0===e.vars.thumbCaptions){var l=c.attr("data-thumbcaption");""!==l&&void 0!==l&&(b+='<span class="'+g+'caption">'+l+"</span>")}e.controlNavScaffold.append("<li>"+b+"</li>"),f++}e.controlsContainer?a(e.controlsContainer).append(e.controlNavScaffold):e.append(e.controlNavScaffold),q.controlNav.set(),q.controlNav.active(),e.controlNavScaffold.delegate("a, img",j,function(b){if(b.preventDefault(),""===k||k===b.type){var c=a(this),d=e.controlNav.index(c);c.hasClass(g+"active")||(e.direction=d>e.currentSlide?"next":"prev",e.flexAnimate(d,e.vars.pauseOnAction))}""===k&&(k=b.type),q.setToClearWatchedEvent()})},setupManual:function(){e.controlNav=e.manualControls,q.controlNav.active(),e.controlNav.bind(j,function(b){if(b.preventDefault(),""===k||k===b.type){var c=a(this),d=e.controlNav.index(c);c.hasClass(g+"active")||(d>e.currentSlide?e.direction="next":e.direction="prev",e.flexAnimate(d,e.vars.pauseOnAction))}""===k&&(k=b.type),q.setToClearWatchedEvent()})},set:function(){var b="thumbnails"===e.vars.controlNav?"img":"a";e.controlNav=a("."+g+"control-nav li "+b,e.controlsContainer?e.controlsContainer:e)},active:function(){e.controlNav.removeClass(g+"active").eq(e.animatingTo).addClass(g+"active")},update:function(b,c){e.pagingCount>1&&"add"===b?e.controlNavScaffold.append(a('<li><a href="#">'+e.count+"</a></li>")):1===e.pagingCount?e.controlNavScaffold.find("li").remove():e.controlNav.eq(c).closest("li").remove(),q.controlNav.set(),e.pagingCount>1&&e.pagingCount!==e.controlNav.length?e.update(c,b):q.controlNav.active()}},directionNav:{setup:function(){var b=a('<ul class="'+g+'direction-nav"><li class="'+g+'nav-prev"><a class="'+g+'prev" href="#">'+e.vars.prevText+'</a></li><li class="'+g+'nav-next"><a class="'+g+'next" href="#">'+e.vars.nextText+"</a></li></ul>");e.customDirectionNav?e.directionNav=e.customDirectionNav:e.controlsContainer?(a(e.controlsContainer).append(b),e.directionNav=a("."+g+"direction-nav li a",e.controlsContainer)):(e.append(b),e.directionNav=a("."+g+"direction-nav li a",e)),q.directionNav.update(),e.directionNav.bind(j,function(b){b.preventDefault();var c;""!==k&&k!==b.type||(c=a(this).hasClass(g+"next")?e.getTarget("next"):e.getTarget("prev"),e.flexAnimate(c,e.vars.pauseOnAction)),""===k&&(k=b.type),q.setToClearWatchedEvent()})},update:function(){var a=g+"disabled";1===e.pagingCount?e.directionNav.addClass(a).attr("tabindex","-1"):e.vars.animationLoop?e.directionNav.removeClass(a).removeAttr("tabindex"):0===e.animatingTo?e.directionNav.removeClass(a).filter("."+g+"prev").addClass(a).attr("tabindex","-1"):e.animatingTo===e.last?e.directionNav.removeClass(a).filter("."+g+"next").addClass(a).attr("tabindex","-1"):e.directionNav.removeClass(a).removeAttr("tabindex")}},pausePlay:{setup:function(){var b=a('<div class="'+g+'pauseplay"><a href="#"></a></div>');e.controlsContainer?(e.controlsContainer.append(b),e.pausePlay=a("."+g+"pauseplay a",e.controlsContainer)):(e.append(b),e.pausePlay=a("."+g+"pauseplay a",e)),q.pausePlay.update(e.vars.slideshow?g+"pause":g+"play"),e.pausePlay.bind(j,function(b){b.preventDefault(),""!==k&&k!==b.type||(a(this).hasClass(g+"pause")?(e.manualPause=!0,e.manualPlay=!1,e.pause()):(e.manualPause=!1,e.manualPlay=!0,e.play())),""===k&&(k=b.type),q.setToClearWatchedEvent()})},update:function(a){"play"===a?e.pausePlay.removeClass(g+"pause").addClass(g+"play").html(e.vars.playText):e.pausePlay.removeClass(g+"play").addClass(g+"pause").html(e.vars.pauseText)}},touch:function(){function a(a){a.stopPropagation(),e.animating?a.preventDefault():(e.pause(),c._gesture.addPointer(a.pointerId),w=0,j=l?e.h:e.w,p=Number(new Date),i=n&&m&&e.animatingTo===e.last?0:n&&m?e.limit-(e.itemW+e.vars.itemMargin)*e.move*e.animatingTo:n&&e.currentSlide===e.last?e.limit:n?(e.itemW+e.vars.itemMargin)*e.move*e.currentSlide:m?(e.last-e.currentSlide+e.cloneOffset)*j:(e.currentSlide+e.cloneOffset)*j)}function b(a){a.stopPropagation();var b=a.target._slider;if(b){var d=-a.translationX,e=-a.translationY;return w+=l?e:d,k=(b.vars.rtl?-1:1)*w,t=l?Math.abs(w)<Math.abs(-d):Math.abs(w)<Math.abs(-e),a.detail===a.MSGESTURE_FLAG_INERTIA?void setImmediate(function(){c._gesture.stop()}):void((!t||Number(new Date)-p>500)&&(a.preventDefault(),!o&&b.transitions&&(b.vars.animationLoop||(k=w/(0===b.currentSlide&&w<0||b.currentSlide===b.last&&w>0?Math.abs(w)/j+2:1)),b.setProps(i+k,"setTouch"))))}}function d(a){a.stopPropagation();var b=a.target._slider;if(b){if(b.animatingTo===b.currentSlide&&!t&&null!==k){var c=m?-k:k,d=c>0?b.getTarget("next"):b.getTarget("prev");b.canAdvance(d)&&(Number(new Date)-p<550&&Math.abs(c)>50||Math.abs(c)>j/2)?b.flexAnimate(d,b.vars.pauseOnAction):o||b.flexAnimate(b.currentSlide,b.vars.pauseOnAction,!0)}f=null,g=null,k=null,i=null,w=0}}var f,g,i,j,k,p,q,r,s,t=!1,u=0,v=0,w=0;h?(c.style.msTouchAction="none",c._gesture=new MSGesture,c._gesture.target=c,c.addEventListener("MSPointerDown",a,!1),c._slider=e,c.addEventListener("MSGestureChange",b,!1),c.addEventListener("MSGestureEnd",d,!1)):(q=function(a){e.animating?a.preventDefault():(window.navigator.msPointerEnabled||1===a.touches.length)&&(e.pause(),j=l?e.h:e.w,p=Number(new Date),u=a.touches[0].pageX,v=a.touches[0].pageY,i=n&&m&&e.animatingTo===e.last?0:n&&m?e.limit-(e.itemW+e.vars.itemMargin)*e.move*e.animatingTo:n&&e.currentSlide===e.last?e.limit:n?(e.itemW+e.vars.itemMargin)*e.move*e.currentSlide:m?(e.last-e.currentSlide+e.cloneOffset)*j:(e.currentSlide+e.cloneOffset)*j,f=l?v:u,g=l?u:v,c.addEventListener("touchmove",r,!1),c.addEventListener("touchend",s,!1))},r=function(a){u=a.touches[0].pageX,v=a.touches[0].pageY,k=l?f-v:(e.vars.rtl?-1:1)*(f-u),t=l?Math.abs(k)<Math.abs(u-g):Math.abs(k)<Math.abs(v-g);var b=500;(!t||Number(new Date)-p>b)&&(a.preventDefault(),!o&&e.transitions&&(e.vars.animationLoop||(k/=0===e.currentSlide&&k<0||e.currentSlide===e.last&&k>0?Math.abs(k)/j+2:1),e.setProps(i+k,"setTouch")))},s=function(a){if(c.removeEventListener("touchmove",r,!1),e.animatingTo===e.currentSlide&&!t&&null!==k){var b=m?-k:k,d=b>0?e.getTarget("next"):e.getTarget("prev");e.canAdvance(d)&&(Number(new Date)-p<550&&Math.abs(b)>50||Math.abs(b)>j/2)?e.flexAnimate(d,e.vars.pauseOnAction):o||e.flexAnimate(e.currentSlide,e.vars.pauseOnAction,!0)}c.removeEventListener("touchend",s,!1),f=null,g=null,k=null,i=null},c.addEventListener("touchstart",q,!1))},resize:function(){!e.animating&&e.is(":visible")&&(n||e.doMath(),o?q.smoothHeight():n?(e.slides.width(e.computedW),e.update(e.pagingCount),e.setProps()):l?(e.viewport.height(e.h),e.setProps(e.h,"setTotal")):(e.vars.smoothHeight&&q.smoothHeight(),e.newSlides.width(e.computedW),e.setProps(e.computedW,"setTotal")))},smoothHeight:function(a){if(!l||o){var b=o?e:e.viewport;a?b.animate({height:e.slides.eq(e.animatingTo).innerHeight()},a):b.innerHeight(e.slides.eq(e.animatingTo).innerHeight())}},sync:function(b){var c=a(e.vars.sync).data("flexslider"),d=e.animatingTo;switch(b){case"animate":c.flexAnimate(d,e.vars.pauseOnAction,!1,!0);break;case"play":c.playing||c.asNav||c.play();break;case"pause":c.pause()}},uniqueID:function(b){return b.filter("[id]").add(b.find("[id]")).each(function(){var b=a(this);b.attr("id",b.attr("id")+"_clone")}),b},pauseInvisible:{visProp:null,init:function(){var a=q.pauseInvisible.getHiddenProp();if(a){var b=a.replace(/[H|h]idden/,"")+"visibilitychange";document.addEventListener(b,function(){q.pauseInvisible.isHidden()?e.startTimeout?clearTimeout(e.startTimeout):e.pause():e.started?e.play():e.vars.initDelay>0?setTimeout(e.play,e.vars.initDelay):e.play()})}},isHidden:function(){var a=q.pauseInvisible.getHiddenProp();return!!a&&document[a]},getHiddenProp:function(){var a=["webkit","moz","ms","o"];if("hidden"in document)return"hidden";for(var b=0;b<a.length;b++)if(a[b]+"Hidden"in document)return a[b]+"Hidden";return null}},setToClearWatchedEvent:function(){clearTimeout(f),f=setTimeout(function(){k=""},3e3)}},e.flexAnimate=function(b,c,d,f,h){if(e.vars.animationLoop||b===e.currentSlide||(e.direction=b>e.currentSlide?"next":"prev"),p&&1===e.pagingCount&&(e.direction=e.currentItem<b?"next":"prev"),!e.animating&&(e.canAdvance(b,h)||d)&&e.is(":visible")){if(p&&f){var j=a(e.vars.asNavFor).data("flexslider");if(e.atEnd=0===b||b===e.count-1,j.flexAnimate(b,!0,!1,!0,h),e.direction=e.currentItem<b?"next":"prev",j.direction=e.direction,Math.ceil((b+1)/e.visible)-1===e.currentSlide||0===b)return e.currentItem=b,e.slides.removeClass(g+"active-slide").eq(b).addClass(g+"active-slide"),!1;e.currentItem=b,e.slides.removeClass(g+"active-slide").eq(b).addClass(g+"active-slide"),b=Math.floor(b/e.visible)}if(e.animating=!0,e.animatingTo=b,c&&e.pause(),e.vars.before(e),e.syncExists&&!h&&q.sync("animate"),e.vars.controlNav&&q.controlNav.active(),n||e.slides.removeClass(g+"active-slide").eq(b).addClass(g+"active-slide"),e.atEnd=0===b||b===e.last,e.vars.directionNav&&q.directionNav.update(),b===e.last&&(e.vars.end(e),e.vars.animationLoop||e.pause()),o)i?(e.slides.eq(e.currentSlide).css({opacity:0,zIndex:1}),e.slides.eq(b).css({opacity:1,zIndex:2}),e.wrapup(t)):(e.slides.eq(e.currentSlide).css({zIndex:1}).animate({opacity:0},e.vars.animationSpeed,e.vars.easing),e.slides.eq(b).css({zIndex:2}).animate({opacity:1},e.vars.animationSpeed,e.vars.easing,e.wrapup));else{var k,r,s,t=l?e.slides.filter(":first").height():e.computedW;n?(k=e.vars.itemMargin,s=(e.itemW+k)*e.move*e.animatingTo,r=s>e.limit&&1!==e.visible?e.limit:s):r=0===e.currentSlide&&b===e.count-1&&e.vars.animationLoop&&"next"!==e.direction?m?(e.count+e.cloneOffset)*t:0:e.currentSlide===e.last&&0===b&&e.vars.animationLoop&&"prev"!==e.direction?m?0:(e.count+1)*t:m?(e.count-1-b+e.cloneOffset)*t:(b+e.cloneOffset)*t,e.setProps(r,"",e.vars.animationSpeed),e.transitions?(e.vars.animationLoop&&e.atEnd||(e.animating=!1,e.currentSlide=e.animatingTo),e.container.unbind("webkitTransitionEnd transitionend"),e.container.bind("webkitTransitionEnd transitionend",function(){clearTimeout(e.ensureAnimationEnd),e.wrapup(t)}),clearTimeout(e.ensureAnimationEnd),e.ensureAnimationEnd=setTimeout(function(){e.wrapup(t)},e.vars.animationSpeed+100)):e.container.animate(e.args,e.vars.animationSpeed,e.vars.easing,function(){e.wrapup(t)})}e.vars.smoothHeight&&q.smoothHeight(e.vars.animationSpeed)}},e.wrapup=function(a){o||n||(0===e.currentSlide&&e.animatingTo===e.last&&e.vars.animationLoop?e.setProps(a,"jumpEnd"):e.currentSlide===e.last&&0===e.animatingTo&&e.vars.animationLoop&&e.setProps(a,"jumpStart")),e.animating=!1,e.currentSlide=e.animatingTo,e.vars.after(e)},e.animateSlides=function(){!e.animating&&b&&e.flexAnimate(e.getTarget("next"))},e.pause=function(){clearInterval(e.animatedSlides),e.animatedSlides=null,e.playing=!1,e.vars.pausePlay&&q.pausePlay.update("play"),e.syncExists&&q.sync("pause")},e.play=function(){e.playing&&clearInterval(e.animatedSlides),e.animatedSlides=e.animatedSlides||setInterval(e.animateSlides,e.vars.slideshowSpeed),e.started=e.playing=!0,e.vars.pausePlay&&q.pausePlay.update("pause"),e.syncExists&&q.sync("play")},e.stop=function(){e.pause(),e.stopped=!0},e.canAdvance=function(a,b){var c=p?e.pagingCount-1:e.last;return!!b||(!(!p||e.currentItem!==e.count-1||0!==a||"prev"!==e.direction)||(!p||0!==e.currentItem||a!==e.pagingCount-1||"next"===e.direction)&&(!(a===e.currentSlide&&!p)&&(!!e.vars.animationLoop||(!e.atEnd||0!==e.currentSlide||a!==c||"next"===e.direction)&&(!e.atEnd||e.currentSlide!==c||0!==a||"next"!==e.direction))))},e.getTarget=function(a){return e.direction=a,"next"===a?e.currentSlide===e.last?0:e.currentSlide+1:0===e.currentSlide?e.last:e.currentSlide-1},e.setProps=function(a,b,c){var d=function(){var c=a?a:(e.itemW+e.vars.itemMargin)*e.move*e.animatingTo,d=function(){if(n)return"setTouch"===b?a:m&&e.animatingTo===e.last?0:m?e.limit-(e.itemW+e.vars.itemMargin)*e.move*e.animatingTo:e.animatingTo===e.last?e.limit:c;switch(b){case"setTotal":return m?(e.count-1-e.currentSlide+e.cloneOffset)*a:(e.currentSlide+e.cloneOffset)*a;case"setTouch":return m?a:a;case"jumpEnd":return m?a:e.count*a;case"jumpStart":return m?e.count*a:a;default:return a}}();return d*-1+"px"}();e.transitions&&(d=l?"translate3d(0,"+d+",0)":"translate3d("+((e.vars.rtl?-1:1)*parseInt(d)+"px")+",0,0)",c=void 0!==c?c/1e3+"s":"0s",e.container.css("-"+e.pfx+"-transition-duration",c),e.container.css("transition-duration",c)),e.args[e.prop]=d,(e.transitions||void 0===c)&&e.container.css(e.args),e.container.css("transform",d)},e.setup=function(b){if(o)e.vars.rtl?e.slides.css({width:"100%",float:"right",marginLeft:"-100%",position:"relative"}):e.slides.css({width:"100%",float:"left",marginRight:"-100%",position:"relative"}),"init"===b&&(i?e.slides.css({opacity:0,display:"block",webkitTransition:"opacity "+e.vars.animationSpeed/1e3+"s ease",zIndex:1}).eq(e.currentSlide).css({opacity:1,zIndex:2}):0==e.vars.fadeFirstSlide?e.slides.css({opacity:0,display:"block",zIndex:1}).eq(e.currentSlide).css({zIndex:2}).css({opacity:1}):e.slides.css({opacity:0,display:"block",zIndex:1}).eq(e.currentSlide).css({zIndex:2}).animate({opacity:1},e.vars.animationSpeed,e.vars.easing)),e.vars.smoothHeight&&q.smoothHeight();else{var c,d;"init"===b&&(e.viewport=a('<div class="'+g+'viewport"></div>').css({overflow:"hidden",position:"relative"}).appendTo(e).append(e.container),e.cloneCount=0,e.cloneOffset=0,m&&(d=a.makeArray(e.slides).reverse(),e.slides=a(d),e.container.empty().append(e.slides))),e.vars.animationLoop&&!n&&(e.cloneCount=2,e.cloneOffset=1,"init"!==b&&e.container.find(".clone").remove(),e.container.append(q.uniqueID(e.slides.first().clone().addClass("clone")).attr("aria-hidden","true")).prepend(q.uniqueID(e.slides.last().clone().addClass("clone")).attr("aria-hidden","true"))),e.newSlides=a(e.vars.selector,e),c=m?e.count-1-e.currentSlide+e.cloneOffset:e.currentSlide+e.cloneOffset,l&&!n?(e.container.height(200*(e.count+e.cloneCount)+"%").css("position","absolute").width("100%"),setTimeout(function(){e.newSlides.css({display:"block"}),e.doMath(),e.viewport.height(e.h),e.setProps(c*e.h,"init")},"init"===b?100:0)):(e.container.width(200*(e.count+e.cloneCount)+"%"),e.setProps(c*e.computedW,"init"),setTimeout(function(){e.doMath(),e.vars.rtl?e.newSlides.css({width:e.computedW,marginLeft:e.computedM,float:"right",display:"block"}):e.newSlides.css({width:e.computedW,marginRight:e.computedM,float:"left",display:"block"}),e.vars.smoothHeight&&q.smoothHeight()},"init"===b?100:0))}n||e.slides.removeClass(g+"active-slide").eq(e.currentSlide).addClass(g+"active-slide"),e.vars.init(e)},e.doMath=function(){var a=e.slides.first(),b=e.vars.itemMargin,c=e.vars.minItems,d=e.vars.maxItems;e.w=void 0===e.viewport?e.width():e.viewport.width(),e.h=a.height(),e.boxPadding=a.outerWidth()-a.width(),n?(e.itemT=e.vars.itemWidth+b,e.itemM=b,e.minW=c?c*e.itemT:e.w,e.maxW=d?d*e.itemT-b:e.w,e.itemW=e.minW>e.w?(e.w-b*(c-1))/c:e.maxW<e.w?(e.w-b*(d-1))/d:e.vars.itemWidth>e.w?e.w:e.vars.itemWidth,e.visible=Math.floor(e.w/e.itemW),e.move=e.vars.move>0&&e.vars.move<e.visible?e.vars.move:e.visible,e.pagingCount=Math.ceil((e.count-e.visible)/e.move+1),e.last=e.pagingCount-1,e.limit=1===e.pagingCount?0:e.vars.itemWidth>e.w?e.itemW*(e.count-1)+b*(e.count-1):(e.itemW+b)*e.count-e.w-b):(e.itemW=e.w,e.itemM=b,e.pagingCount=e.count,e.last=e.count-1),e.computedW=e.itemW-e.boxPadding,e.computedM=e.itemM},e.update=function(a,b){e.doMath(),n||(a<e.currentSlide?e.currentSlide+=1:a<=e.currentSlide&&0!==a&&(e.currentSlide-=1),e.animatingTo=e.currentSlide),e.vars.controlNav&&!e.manualControls&&("add"===b&&!n||e.pagingCount>e.controlNav.length?q.controlNav.update("add"):("remove"===b&&!n||e.pagingCount<e.controlNav.length)&&(n&&e.currentSlide>e.last&&(e.currentSlide-=1,e.animatingTo-=1),q.controlNav.update("remove",e.last))),e.vars.directionNav&&q.directionNav.update()},e.addSlide=function(b,c){var d=a(b);e.count+=1,e.last=e.count-1,l&&m?void 0!==c?e.slides.eq(e.count-c).after(d):e.container.prepend(d):void 0!==c?e.slides.eq(c).before(d):e.container.append(d),e.update(c,"add"),e.slides=a(e.vars.selector+":not(.clone)",e),e.setup(),e.vars.added(e)},e.removeSlide=function(b){var c=isNaN(b)?e.slides.index(a(b)):b;e.count-=1,e.last=e.count-1,isNaN(b)?a(b,e.slides).remove():l&&m?e.slides.eq(e.last).remove():e.slides.eq(b).remove(),e.doMath(),e.update(c,"remove"),e.slides=a(e.vars.selector+":not(.clone)",e),e.setup(),e.vars.removed(e)},q.init()},a(window).blur(function(a){b=!1}).focus(function(a){b=!0}),a.flexslider.defaults={namespace:"flex-",selector:".slides > li",animation:"fade",easing:"swing",direction:"horizontal",reverse:!1,animationLoop:!0,smoothHeight:!1,startAt:0,slideshow:!0,slideshowSpeed:7e3,animationSpeed:600,initDelay:0,randomize:!1,fadeFirstSlide:!0,thumbCaptions:!1,pauseOnAction:!0,pauseOnHover:!1,pauseInvisible:!0,useCSS:!0,touch:!0,video:!1,controlNav:!0,directionNav:!0,prevText:"Previous",nextText:"Next",keyboard:!0,multipleKeyboard:!1,mousewheel:!1,pausePlay:!1,pauseText:"Pause",playText:"Play",controlsContainer:"",manualControls:"",customDirectionNav:"",sync:"",asNavFor:"",itemWidth:0,itemMargin:0,minItems:1,maxItems:0,move:0,allowOneSlide:!0,start:function(){},before:function(){},after:function(){},end:function(){},added:function(){},removed:function(){},init:function(){},rtl:!1},a.fn.flexslider=function(b){if(void 0===b&&(b={}),"object"==typeof b)return this.each(function(){var c=a(this),d=b.selector?b.selector:".slides > li",e=c.find(d);1===e.length&&b.allowOneSlide===!1||0===e.length?(e.fadeIn(400),b.start&&b.start(c)):void 0===c.data("flexslider")&&new a.flexslider(this,b)});var c=a(this).data("flexslider");switch(b){case"play":c.play();break;case"pause":c.pause();break;case"stop":c.stop();break;case"next":c.flexAnimate(c.getTarget("next"),!0);break;case"prev":case"previous":c.flexAnimate(c.getTarget("prev"),!0);break;default:"number"==typeof b&&c.flexAnimate(b,!0)}}}(jQuery);
\ No newline at end of file
diff --git a/assets/js/frontend/add-payment-method.min.js b/assets/js/frontend/add-payment-method.min.js
index 0cb8d8de885..b77e5d7b04b 100644
--- a/assets/js/frontend/add-payment-method.min.js
+++ b/assets/js/frontend/add-payment-method.min.js
@@ -1 +1 @@
-jQuery(function(a){return"undefined"==typeof woocommerce_params?!1:(a("#add_payment_method").on("click init_add_payment_method",".payment_methods input.input-radio",function(){if(a(".payment_methods input.input-radio").length>1){var b=a("div.payment_box."+a(this).attr("ID"));a(this).is(":checked")&&!b.is(":visible")&&(a("div.payment_box").filter(":visible").slideUp(250),a(this).is(":checked")&&a("div.payment_box."+a(this).attr("ID")).slideDown(250))}else a("div.payment_box").show()}).find("input[name=payment_method]:checked").click(),a("#add_payment_method").submit(function(){a("#add_payment_method").block({message:null,overlayCSS:{background:"#fff",opacity:.6}})}),void a(document.body).trigger("init_add_payment_method"))});
\ No newline at end of file
+jQuery(function(a){return"undefined"!=typeof woocommerce_params&&(a("#add_payment_method").on("click init_add_payment_method",".payment_methods input.input-radio",function(){if(a(".payment_methods input.input-radio").length>1){var b=a("div.payment_box."+a(this).attr("ID"));a(this).is(":checked")&&!b.is(":visible")&&(a("div.payment_box").filter(":visible").slideUp(250),a(this).is(":checked")&&a("div.payment_box."+a(this).attr("ID")).slideDown(250))}else a("div.payment_box").show()}).find("input[name=payment_method]:checked").click(),a("#add_payment_method").submit(function(){a("#add_payment_method").block({message:null,overlayCSS:{background:"#fff",opacity:.6}})}),void a(document.body).trigger("init_add_payment_method"))});
\ No newline at end of file
diff --git a/assets/js/frontend/add-to-cart-variation.js b/assets/js/frontend/add-to-cart-variation.js
index c9e1cd30795..6436b7056f8 100644
--- a/assets/js/frontend/add-to-cart-variation.js
+++ b/assets/js/frontend/add-to-cart-variation.js
@@ -1,377 +1,608 @@
 /*global wc_add_to_cart_variation_params, wc_cart_fragments_params */
-/*!
- * Variations Plugin
- */
 ;(function ( $, window, document, undefined ) {
+	/**
+	 * VariationForm class which handles variation forms and attributes.
+	 */
+	var VariationForm = function( $form ) {
+		this.$form                = $form;
+		this.$attributeFields     = $form.find( '.variations select' );
+		this.$singleVariation     = $form.find( '.single_variation' ),
+		this.$singleVariationWrap = $form.find( '.single_variation_wrap' );
+		this.$resetVariations     = $form.find( '.reset_variations' );
+		this.$product             = $form.closest( '.product' );
+		this.variationData        = $form.data( 'product_variations' );
+		this.useAjax              = false === this.variationData;
+		this.xhr                  = false;
 
-	$.fn.wc_variation_form = function() {
-		var $form                  = this,
-			$single_variation      = $form.find( '.single_variation' ),
-			$product               = $form.closest( '.product' ),
-			$product_id            = parseInt( $form.data( 'product_id' ), 10 ),
-			$product_variations    = $form.data( 'product_variations' ),
-			$use_ajax              = $product_variations === false,
-			$xhr                   = false,
-			$reset_variations      = $form.find( '.reset_variations' ),
-			template               = wp.template( 'variation-template' ),
-			unavailable_template   = wp.template( 'unavailable-variation-template' ),
-			$single_variation_wrap = $form.find( '.single_variation_wrap' );
+		// Initial state.
+		this.$singleVariationWrap.show();
+		this.$form.unbind( 'check_variations update_variation_values found_variation' );
+		this.$resetVariations.unbind( 'click' );
+		this.$attributeFields.unbind( 'change ' );
 
-		// Always visible since 2.5.0
-		$single_variation_wrap.show();
+		// Methods.
+		this.getChosenAttributes    = this.getChosenAttributes.bind( this );
+		this.findMatchingVariations = this.findMatchingVariations.bind( this );
+		this.isMatch                = this.isMatch.bind( this );
+		this.toggleResetLink        = this.toggleResetLink.bind( this );
 
-		// Unbind any existing events
-		$form.unbind( 'check_variations update_variation_values found_variation' );
-		$form.find( '.reset_variations' ).unbind( 'click' );
-		$form.find( '.variations select' ).unbind( 'change focusin' );
+		// Events.
+		$form.on( 'click', '.reset_variations', { variationForm: this }, this.onReset );
+		$form.on( 'reload_product_variations', { variationForm: this }, this.onReload );
+		$form.on( 'hide_variation', { variationForm: this }, this.onHide );
+		$form.on( 'show_variation', { variationForm: this }, this.onShow );
+		$form.on( 'click', '.single_add_to_cart_button', { variationForm: this }, this.onAddToCart );
+		$form.on( 'reset_data', { variationForm: this }, this.onResetDisplayedVariation );
+		$form.on( 'reset_image', { variationForm: this }, this.onResetImage );
+		$form.on( 'change', '.variations select', { variationForm: this }, this.onChange );
+		$form.on( 'found_variation', { variationForm: this }, this.onFoundVariation );
+		$form.on( 'check_variations', { variationForm: this }, this.onFindVariation );
+		$form.on( 'update_variation_values', { variationForm: this }, this.onUpdateAttributes );
 
-		// Bind new events to form
-		$form
+		// Check variations once init.
+		$form.trigger( 'check_variations' );
+		$form.trigger( 'wc_variation_form' );
+	};
 
-		// On clicking the reset variation button
-		.on( 'click', '.reset_variations', function() {
-			$form.find( '.variations select' ).val( '' ).change();
-			$form.trigger( 'reset_data' );
-			return false;
-		} )
+	/**
+	 * Reset all fields.
+	 */
+	VariationForm.prototype.onReset = function( event ) {
+		event.preventDefault();
+		event.data.variationForm.$attributeFields.val( '' ).change();
+		event.data.variationForm.$form.trigger( 'reset_data' );
+	};
 
-		// When the variation is hidden
-		.on( 'hide_variation', function() {
-			$form.find( '.single_add_to_cart_button' ).attr( 'disabled', 'disabled' ).attr( 'title', wc_add_to_cart_variation_params.i18n_make_a_selection_text );
-			return false;
-		} )
+	/**
+	 * Reload variation data from the DOM.
+	 */
+	VariationForm.prototype.onReload = function( event ) {
+		var form           = event.data.variationForm;
+		form.variationData = form.$form.data( 'product_variations' );
+		form.useAjax       = false === form.variationData;
+		form.$form.trigger( 'check_variations' );
+	};
 
-		// When the variation is revealed
-		.on( 'show_variation', function( event, variation, purchasable ) {
-			if ( purchasable ) {
-				$form.find( '.single_add_to_cart_button' ).removeAttr( 'disabled' ).removeAttr( 'title' );
-			} else {
-				$form.find( '.single_add_to_cart_button' ).attr( 'disabled', 'disabled' ).attr( 'title', wc_add_to_cart_variation_params.i18n_unavailable_text );
+	/**
+	 * When a variation is hidden.
+	 */
+	VariationForm.prototype.onHide = function( event ) {
+		event.preventDefault();
+		event.data.variationForm.$form.find( '.single_add_to_cart_button' ).removeClass( 'wc-variation-is-unavailable' ).addClass( 'disabled wc-variation-selection-needed' );
+		event.data.variationForm.$form.find( '.woocommerce-variation-add-to-cart' ).removeClass( 'woocommerce-variation-add-to-cart-enabled' ).addClass( 'woocommerce-variation-add-to-cart-disabled' );
+	};
+
+	/**
+	 * When a variation is shown.
+	 */
+	VariationForm.prototype.onShow = function( event, variation, purchasable ) {
+		event.preventDefault();
+		if ( purchasable ) {
+			event.data.variationForm.$form.find( '.single_add_to_cart_button' ).removeClass( 'disabled wc-variation-selection-needed wc-variation-is-unavailable' );
+			event.data.variationForm.$form.find( '.woocommerce-variation-add-to-cart' ).removeClass( 'woocommerce-variation-add-to-cart-disabled' ).addClass( 'woocommerce-variation-add-to-cart-enabled' );
+		} else {
+			event.data.variationForm.$form.find( '.single_add_to_cart_button' ).removeClass( 'wc-variation-selection-needed' ).addClass( 'disabled wc-variation-is-unavailable' );
+			event.data.variationForm.$form.find( '.woocommerce-variation-add-to-cart' ).removeClass( 'woocommerce-variation-add-to-cart-enabled' ).addClass( 'woocommerce-variation-add-to-cart-disabled' );
+		}
+	};
+
+	/**
+	 * When the cart button is pressed.
+	 */
+	VariationForm.prototype.onAddToCart = function( event ) {
+		if ( $( this ).is('.disabled') ) {
+			event.preventDefault();
+
+			if ( $( this ).is('.wc-variation-is-unavailable') ) {
+				window.alert( wc_add_to_cart_variation_params.i18n_unavailable_text );
+			} else if ( $( this ).is('.wc-variation-selection-needed') ) {
+				window.alert( wc_add_to_cart_variation_params.i18n_make_a_selection_text );
 			}
-			return false;
-		} )
+		}
+	};
 
-		// Reload product variations data
-		.on( 'reload_product_variations', function() {
-			$product_variations = $form.data( 'product_variations' );
-			$use_ajax           = $product_variations === false;
-		} )
+	/**
+	 * When displayed variation data is reset.
+	 */
+	VariationForm.prototype.onResetDisplayedVariation = function( event ) {
+		var form = event.data.variationForm;
+		form.$product.find( '.product_meta' ).find( '.sku' ).wc_reset_content();
+		form.$product.find( '.product_weight' ).wc_reset_content();
+		form.$product.find( '.product_dimensions' ).wc_reset_content();
+		form.$form.trigger( 'reset_image' );
+		form.$singleVariation.slideUp( 200 ).trigger( 'hide_variation' );
+	};
 
-		// Reset product data
-		.on( 'reset_data', function() {
-			$('.sku').wc_reset_content();
-			$('.product_weight').wc_reset_content();
-			$('.product_dimensions').wc_reset_content();
-			$form.trigger( 'reset_image' );
-			$single_variation.slideUp( 200 ).trigger( 'hide_variation' );
-		} )
+	/**
+	 * When the product image is reset.
+	 */
+	VariationForm.prototype.onResetImage = function( event ) {
+		event.data.variationForm.$form.wc_variations_image_update( false );
+	};
 
-		// Reset product image
-		.on( 'reset_image', function() {
-			$form.wc_variations_image_update( false );
-		} )
+	/**
+	 * Looks for matching variations for current selected attributes.
+	 */
+	VariationForm.prototype.onFindVariation = function( event ) {
+		var form              = event.data.variationForm,
+			attributes        = form.getChosenAttributes(),
+			currentAttributes = attributes.data;
 
-		// On changing an attribute
-		.on( 'change', '.variations select', function() {
-			$form.find( 'input[name="variation_id"], input.variation_id' ).val( '' ).change();
-			$form.find( '.wc-no-matching-variations' ).remove();
-
-			if ( $use_ajax ) {
-				if ( $xhr ) {
-					$xhr.abort();
+		if ( attributes.count === attributes.chosenCount ) {
+			if ( form.useAjax ) {
+				if ( form.xhr ) {
+					form.xhr.abort();
 				}
-
-				var all_attributes_chosen  = true;
-				var some_attributes_chosen = false;
-				var data                   = {};
-
-				$form.find( '.variations select' ).each( function() {
-					var attribute_name = $( this ).data( 'attribute_name' ) || $( this ).attr( 'name' );
-
-					if ( $( this ).val().length === 0 ) {
-						all_attributes_chosen = false;
-					} else {
-						some_attributes_chosen = true;
-					}
-
-					data[ attribute_name ] = $( this ).val();
-				});
-
-				if ( all_attributes_chosen ) {
-					// Get a matchihng variation via ajax
-					data.product_id = $product_id;
-
-					$xhr = $.ajax( {
-						url: wc_cart_fragments_params.wc_ajax_url.toString().replace( '%%endpoint%%', 'get_variation' ),
-						type: 'POST',
-						data: data,
-						success: function( variation ) {
-							if ( variation ) {
-								$form.trigger( 'found_variation', [ variation ] );
-							} else {
-								$form.trigger( 'reset_data' );
-								$form.find( '.single_variation' ).after( '<p class="wc-no-matching-variations woocommerce-info">' + wc_add_to_cart_variation_params.i18n_no_matching_variations_text + '</p>' );
-								$form.find( '.wc-no-matching-variations' ).slideDown( 200 );
-							}
+				form.$form.block( { message: null, overlayCSS: { background: '#fff', opacity: 0.6 } } );
+				currentAttributes.product_id  = parseInt( form.$form.data( 'product_id' ), 10 );
+				currentAttributes.custom_data = form.$form.data( 'custom_data' );
+				form.xhr                      = $.ajax( {
+					url: wc_cart_fragments_params.wc_ajax_url.toString().replace( '%%endpoint%%', 'get_variation' ),
+					type: 'POST',
+					data: currentAttributes,
+					success: function( variation ) {
+						if ( variation ) {
+							form.$form.trigger( 'found_variation', [ variation ] );
+						} else {
+							form.$form.trigger( 'reset_data' );
+							form.$form.find( '.single_variation' ).after( '<p class="wc-no-matching-variations woocommerce-info">' + wc_add_to_cart_variation_params.i18n_no_matching_variations_text + '</p>' );
+							form.$form.find( '.wc-no-matching-variations' ).slideDown( 200 );
 						}
-					} );
-				} else {
-					$form.trigger( 'reset_data' );
-				}
-				if ( some_attributes_chosen ) {
-					if ( $reset_variations.css( 'visibility' ) === 'hidden' ) {
-						$reset_variations.css( 'visibility', 'visible' ).hide().fadeIn();
+					},
+					complete: function() {
+						form.$form.unblock();
 					}
-				} else {
-					$reset_variations.css( 'visibility', 'hidden' );
-				}
+				} );
 			} else {
-				$form.trigger( 'woocommerce_variation_select_change' );
-				$form.trigger( 'check_variations', [ '', false ] );
-				$( this ).blur();
-			}
+				form.$form.trigger( 'update_variation_values' );
 
-			// added to get around variation image flicker issue
-			$( '.product.has-default-attributes > .images' ).fadeTo( 200, 1 );
-
-			// Custom event for when variation selection has been changed
-			$form.trigger( 'woocommerce_variation_has_changed' );
-		} )
-
-		// Upon gaining focus
-		.on( 'focusin touchstart', '.variations select', function() {
-			$( this ).find( 'option:selected' ).attr( 'selected', 'selected' );
-
-			if ( ! $use_ajax ) {
-				$form.trigger( 'woocommerce_variation_select_focusin' );
-				$form.trigger( 'check_variations', [ $( this ).data( 'attribute_name' ) || $( this ).attr( 'name' ), true ] );
-			}
-		} )
-
-		// Show single variation details (price, stock, image)
-		.on( 'found_variation', function( event, variation ) {
-			var $sku        = $product.find( '.product_meta' ).find( '.sku' ),
-				$weight     = $product.find( '.product_weight' ),
-				$dimensions = $product.find( '.product_dimensions' ),
-				$qty        = $single_variation_wrap.find( '.quantity' ),
-				purchasable = true;
-
-			// Display SKU
-			if ( variation.sku ) {
-				$sku.wc_set_content( variation.sku );
-			} else {
-				$sku.wc_reset_content();
-			}
-
-			// Display weight
-			if ( variation.weight ) {
-				$weight.wc_set_content( variation.weight );
-			} else {
-				$weight.wc_reset_content();
-			}
-
-			// Display dimensions
-			if ( variation.dimensions ) {
-				$dimensions.wc_set_content( variation.dimensions );
-			} else {
-				$dimensions.wc_reset_content();
-			}
-
-			// Show images
-			$form.wc_variations_image_update( variation );
-
-			// Output correct templates
-			if ( ! variation.variation_is_visible ) {
-				$single_variation.html( unavailable_template );
-				$form.find( 'input[name="variation_id"], input.variation_id' ).val( '' ).change();
-			} else {
-				$single_variation.html( template( {
-					variation:    variation
-				} ) );
-				$form.find( 'input[name="variation_id"], input.variation_id' ).val( variation.variation_id ).change();
-			}
-
-			// Hide or show qty input
-			if ( variation.is_sold_individually === 'yes' ) {
-				$qty.find( 'input.qty' ).val( '1' ).attr( 'min', '1' ).attr( 'max', '' );
-				$qty.hide();
-			} else {
-				$qty.find( 'input.qty' ).attr( 'min', variation.min_qty ).attr( 'max', variation.max_qty );
-				$qty.show();
-			}
-
-			// Enable or disable the add to cart button
-			if ( ! variation.is_purchasable || ! variation.is_in_stock || ! variation.variation_is_visible ) {
-				purchasable = false;
-			}
-
-			// Reveal
-			if ( $.trim( $single_variation.text() ) ) {
-				$single_variation.slideDown( 200 ).trigger( 'show_variation', [ variation, purchasable ] );
-			} else {
-				$single_variation.show().trigger( 'show_variation', [ variation, purchasable ] );
-			}
-		})
-
-		// Check variations
-		.on( 'check_variations', function( event, exclude, focus ) {
-			if ( $use_ajax ) {
-				return;
-			}
-
-			var all_attributes_chosen  = true,
-				some_attributes_chosen = false,
-				current_settings       = {},
-				$form                  = $( this ),
-				$reset_variations      = $form.find( '.reset_variations' );
-
-			$form.find( '.variations select' ).each( function() {
-				var attribute_name = $( this ).data( 'attribute_name' ) || $( this ).attr( 'name' );
-
-				if ( $( this ).val().length === 0 ) {
-					all_attributes_chosen = false;
-				} else {
-					some_attributes_chosen = true;
-				}
-
-				if ( exclude && attribute_name === exclude ) {
-					all_attributes_chosen = false;
-					current_settings[ attribute_name ] = '';
-				} else {
-					// Add to settings array
-					current_settings[ attribute_name ] = $( this ).val();
-				}
-			});
-
-			var matching_variations = wc_variation_form_matcher.find_matching_variations( $product_variations, current_settings );
-
-			if ( all_attributes_chosen ) {
-
-				var variation = matching_variations.shift();
+				var matching_variations = form.findMatchingVariations( form.variationData, currentAttributes ),
+					variation           = matching_variations.shift();
 
 				if ( variation ) {
-					$form.trigger( 'found_variation', [ variation ] );
+					form.$form.trigger( 'found_variation', [ variation ] );
 				} else {
-					// Nothing found - reset fields
-					$form.find( '.variations select' ).val( '' );
-
-					if ( ! focus ) {
-						$form.trigger( 'reset_data' );
-					}
-
-					window.alert( wc_add_to_cart_variation_params.i18n_no_matching_variations_text );
-				}
-
-			} else {
-
-				$form.trigger( 'update_variation_values', [ matching_variations ] );
-
-				if ( ! focus ) {
-					$form.trigger( 'reset_data' );
-				}
-
-				if ( ! exclude ) {
-					$single_variation.slideUp( 200 ).trigger( 'hide_variation' );
+					form.$form.trigger( 'reset_data' );
+					form.$form.find( '.single_variation' ).after( '<p class="wc-no-matching-variations woocommerce-info">' + wc_add_to_cart_variation_params.i18n_no_matching_variations_text + '</p>' );
+					form.$form.find( '.wc-no-matching-variations' ).slideDown( 200 );
 				}
 			}
-			if ( some_attributes_chosen ) {
-				if ( $reset_variations.css( 'visibility' ) === 'hidden' ) {
-					$reset_variations.css( 'visibility', 'visible' ).hide().fadeIn();
-				}
-			} else {
-				$reset_variations.css( 'visibility', 'hidden' );
+		} else {
+			form.$form.trigger( 'update_variation_values' );
+			form.$form.trigger( 'reset_data' );
+		}
+
+		// Show reset link.
+		form.toggleResetLink( attributes.chosenCount > 0 );
+	};
+
+	/**
+	 * Triggered when a variation has been found which matches all attributes.
+	 */
+	VariationForm.prototype.onFoundVariation = function( event, variation ) {
+		var form           = event.data.variationForm,
+			$sku           = form.$product.find( '.product_meta' ).find( '.sku' ),
+			$weight        = form.$product.find( '.product_weight' ),
+			$dimensions    = form.$product.find( '.product_dimensions' ),
+			$qty           = form.$singleVariationWrap.find( '.quantity' ),
+			purchasable    = true,
+			variation_id   = '',
+			template       = false,
+			$template_html = '';
+
+		if ( variation.sku ) {
+			$sku.wc_set_content( variation.sku );
+		} else {
+			$sku.wc_reset_content();
+		}
+
+		if ( variation.weight ) {
+			$weight.wc_set_content( variation.weight );
+		} else {
+			$weight.wc_reset_content();
+		}
+
+		if ( variation.dimensions ) {
+			$dimensions.wc_set_content( variation.dimensions );
+		} else {
+			$dimensions.wc_reset_content();
+		}
+
+		form.$form.wc_variations_image_update( variation );
+
+		if ( ! variation.variation_is_visible ) {
+			template = wp.template( 'unavailable-variation-template' );
+		} else {
+			template     = wp.template( 'variation-template' );
+			variation_id = variation.variation_id;
+		}
+
+		$template_html = template( {
+			variation: variation
+		} );
+		$template_html = $template_html.replace( '/*<![CDATA[*/', '' );
+		$template_html = $template_html.replace( '/*]]>*/', '' );
+
+		form.$singleVariation.html( $template_html );
+		form.$form.find( 'input[name="variation_id"], input.variation_id' ).val( variation.variation_id ).change();
+
+		// Hide or show qty input
+		if ( variation.is_sold_individually === 'yes' ) {
+			$qty.find( 'input.qty' ).val( '1' ).attr( 'min', '1' ).attr( 'max', '' );
+			$qty.hide();
+		} else {
+			$qty.find( 'input.qty' ).attr( 'min', variation.min_qty ).attr( 'max', variation.max_qty );
+			$qty.show();
+		}
+
+		// Enable or disable the add to cart button
+		if ( ! variation.is_purchasable || ! variation.is_in_stock || ! variation.variation_is_visible ) {
+			purchasable = false;
+		}
+
+		// Reveal
+		if ( $.trim( form.$singleVariation.text() ) ) {
+			form.$singleVariation.slideDown( 200 ).trigger( 'show_variation', [ variation, purchasable ] );
+		} else {
+			form.$singleVariation.show().trigger( 'show_variation', [ variation, purchasable ] );
+		}
+	};
+
+	/**
+	 * Triggered when an attribute field changes.
+	 */
+	VariationForm.prototype.onChange = function( event ) {
+		var form = event.data.variationForm;
+
+		form.$form.find( 'input[name="variation_id"], input.variation_id' ).val( '' ).change();
+		form.$form.find( '.wc-no-matching-variations' ).remove();
+
+		if ( form.useAjax ) {
+			form.$form.trigger( 'check_variations' );
+		} else {
+			form.$form.trigger( 'woocommerce_variation_select_change' );
+			form.$form.trigger( 'check_variations' );
+			$( this ).blur();
+		}
+
+		// Custom event for when variation selection has been changed
+		form.$form.trigger( 'woocommerce_variation_has_changed' );
+	};
+
+	/**
+	 * Escape quotes in a string.
+	 * @param {string} string
+	 * @return {string}
+	 */
+	VariationForm.prototype.addSlashes = function( string ) {
+		string = string.replace( /'/g, '\\\'' );
+		string = string.replace( /"/g, '\\\"' );
+		return string;
+	};
+
+	/**
+	 * Updates attributes in the DOM to show valid values.
+	 */
+	VariationForm.prototype.onUpdateAttributes = function( event ) {
+		var form              = event.data.variationForm,
+			attributes        = form.getChosenAttributes(),
+			currentAttributes = attributes.data;
+
+		if ( form.useAjax ) {
+			return;
+		}
+
+		// Loop through selects and disable/enable options based on selections.
+		form.$attributeFields.each( function( index, el ) {
+			var current_attr_select     = $( el ),
+				current_attr_name       = current_attr_select.data( 'attribute_name' ) || current_attr_select.attr( 'name' ),
+				show_option_none        = $( el ).data( 'show_option_none' ),
+				option_gt_filter        = ':gt(0)',
+				attached_options_count  = 0,
+				new_attr_select         = $( '<select/>' ),
+				selected_attr_val       = current_attr_select.val() || '',
+				selected_attr_val_valid = true;
+
+			// Reference options set at first.
+			if ( ! current_attr_select.data( 'attribute_html' ) ) {
+				var refSelect = current_attr_select.clone();
+
+				refSelect.find( 'option' ).removeAttr( 'disabled attached' ).removeAttr( 'selected' );
+
+				current_attr_select.data( 'attribute_options', refSelect.find( 'option' + option_gt_filter ).get() ); // Legacy data attribute.
+				current_attr_select.data( 'attribute_html', refSelect.html() );
 			}
-		} )
 
-		// Disable option fields that are unavaiable for current set of attributes
-		.on( 'update_variation_values', function( event, variations ) {
-			if ( $use_ajax ) {
-				return;
-			}
-			// Loop through selects and disable/enable options based on selections
-			$form.find( '.variations select' ).each( function( index, el ) {
+			new_attr_select.html( current_attr_select.data( 'attribute_html' ) );
 
-				var current_attr_name, current_attr_select = $( el );
+			// The attribute of this select field should not be taken into account when calculating its matching variations:
+			// The constraints of this attribute are shaped by the values of the other attributes.
+			var checkAttributes = $.extend( true, {}, currentAttributes );
 
-				// Reset options
-				if ( ! current_attr_select.data( 'attribute_options' ) ) {
-					current_attr_select.data( 'attribute_options', current_attr_select.find( 'option:gt(0)' ).get() );
-				}
+			checkAttributes[ current_attr_name ] = '';
 
-				current_attr_select.find( 'option:gt(0)' ).remove();
-				current_attr_select.append( current_attr_select.data( 'attribute_options' ) );
-				current_attr_select.find( 'option:gt(0)' ).removeClass( 'attached' );
-				current_attr_select.find( 'option:gt(0)' ).removeClass( 'enabled' );
-				current_attr_select.find( 'option:gt(0)' ).removeAttr( 'disabled' );
+			var variations = form.findMatchingVariations( form.variationData, checkAttributes );
 
-				// Get name from data-attribute_name, or from input name if it doesn't exist
-				if ( typeof( current_attr_select.data( 'attribute_name' ) ) !== 'undefined' ) {
-					current_attr_name = current_attr_select.data( 'attribute_name' );
-				} else {
-					current_attr_name = current_attr_select.attr( 'name' );
-				}
+			// Loop through variations.
+			for ( var num in variations ) {
+				if ( typeof( variations[ num ] ) !== 'undefined' ) {
+					var variationAttributes = variations[ num ].attributes;
 
-				// Loop through variations
-				for ( var num in variations ) {
+					for ( var attr_name in variationAttributes ) {
+						if ( variationAttributes.hasOwnProperty( attr_name ) ) {
+							var attr_val         = variationAttributes[ attr_name ],
+								variation_active = '';
 
-					if ( typeof( variations[ num ] ) !== 'undefined' ) {
+							if ( attr_name === current_attr_name ) {
+								if ( variations[ num ].variation_is_active ) {
+									variation_active = 'enabled';
+								}
 
-						var attributes = variations[ num ].attributes;
+								if ( attr_val ) {
+									// Decode entities and add slashes.
+									attr_val = $( '<div/>' ).html( attr_val ).text();
 
-						for ( var attr_name in attributes ) {
-							if ( attributes.hasOwnProperty( attr_name ) ) {
-								var attr_val = attributes[ attr_name ];
-
-								if ( attr_name === current_attr_name ) {
-
-									var variation_active = '';
-
-									if ( variations[ num ].variation_is_active ) {
-										variation_active = 'enabled';
-									}
-
-									if ( attr_val ) {
-
-										// Decode entities
-										attr_val = $( '<div/>' ).html( attr_val ).text();
-
-										// Add slashes
-										attr_val = attr_val.replace( /'/g, '\\\'' );
-										attr_val = attr_val.replace( /"/g, '\\\"' );
-
-										// Compare the meerkat
-										current_attr_select.find( 'option[value="' + attr_val + '"]' ).addClass( 'attached ' + variation_active );
-
-									} else {
-
-										current_attr_select.find( 'option:gt(0)' ).addClass( 'attached ' + variation_active );
-
-									}
+									// Attach.
+									new_attr_select.find( 'option[value="' + form.addSlashes( attr_val ) + '"]' ).addClass( 'attached ' + variation_active );
+								} else {
+									// Attach all apart from placeholder.
+									new_attr_select.find( 'option:gt(0)' ).addClass( 'attached ' + variation_active );
 								}
 							}
 						}
 					}
 				}
+			}
 
-				// Detach unattached
-				current_attr_select.find( 'option:gt(0):not(.attached)' ).remove();
+			// Count available options.
+			attached_options_count = new_attr_select.find( 'option.attached' ).length;
 
-				// Grey out disabled
-				current_attr_select.find( 'option:gt(0):not(.enabled)' ).attr( 'disabled', 'disabled' );
+			// Check if current selection is in attached options.
+			if ( selected_attr_val && ( attached_options_count === 0 || new_attr_select.find( 'option.attached.enabled[value="' + form.addSlashes( selected_attr_val ) + '"]' ).length === 0 ) ) {
+				selected_attr_val_valid = false;
+			}
 
-			});
+			// Detach the placeholder if:
+			// - Valid options exist.
+			// - The current selection is non-empty.
+			// - The current selection is valid.
+			// - Placeholders are not set to be permanently visible.
+			if ( attached_options_count > 0 && selected_attr_val && selected_attr_val_valid && ( 'no' === show_option_none ) ) {
+				new_attr_select.find( 'option:first' ).remove();
+				option_gt_filter = '';
+			}
 
-			// Custom event for when variations have been updated
-			$form.trigger( 'woocommerce_update_variation_values' );
+			// Detach unattached.
+			new_attr_select.find( 'option' + option_gt_filter + ':not(.attached)' ).remove();
+
+			// Finally, copy to DOM and set value.
+			current_attr_select.html( new_attr_select.html() );
+			current_attr_select.find( 'option' + option_gt_filter + ':not(.enabled)' ).prop( 'disabled', true );
+
+			// Choose selected value.
+			if ( selected_attr_val ) {
+				// If the previously selected value is no longer available, fall back to the placeholder (it's going to be there).
+				if ( selected_attr_val_valid ) {
+					current_attr_select.val( selected_attr_val );
+				} else {
+					current_attr_select.val( '' ).change();
+				}
+			} else {
+				current_attr_select.val( '' ); // No change event to prevent infinite loop.
+			}
 		});
 
-		$form.trigger( 'wc_variation_form' );
-
-		return $form;
+		// Custom event for when variations have been updated.
+		form.$form.trigger( 'woocommerce_update_variation_values' );
 	};
 
+	/**
+	 * Get chosen attributes from form.
+	 * @return array
+	 */
+	VariationForm.prototype.getChosenAttributes = function() {
+		var data   = {};
+		var count  = 0;
+		var chosen = 0;
+
+		this.$attributeFields.each( function() {
+			var attribute_name = $( this ).data( 'attribute_name' ) || $( this ).attr( 'name' );
+			var value          = $( this ).val() || '';
+
+			if ( value.length > 0 ) {
+				chosen ++;
+			}
+
+			count ++;
+			data[ attribute_name ] = value;
+		});
+
+		return {
+			'count'      : count,
+			'chosenCount': chosen,
+			'data'       : data
+		};
+	};
+
+	/**
+	 * Find matching variations for attributes.
+	 */
+	VariationForm.prototype.findMatchingVariations = function( variations, attributes ) {
+		var matching = [];
+		for ( var i = 0; i < variations.length; i++ ) {
+			var variation = variations[i];
+
+			if ( this.isMatch( variation.attributes, attributes ) ) {
+				matching.push( variation );
+			}
+		}
+		return matching;
+	};
+
+	/**
+	 * See if attributes match.
+	 * @return {Boolean}
+	 */
+	VariationForm.prototype.isMatch = function( variation_attributes, attributes ) {
+		var match = true;
+		for ( var attr_name in variation_attributes ) {
+			if ( variation_attributes.hasOwnProperty( attr_name ) ) {
+				var val1 = variation_attributes[ attr_name ];
+				var val2 = attributes[ attr_name ];
+				if ( val1 !== undefined && val2 !== undefined && val1.length !== 0 && val2.length !== 0 && val1 !== val2 ) {
+					match = false;
+				}
+			}
+		}
+		return match;
+	};
+
+	/**
+	 * Show or hide the reset link.
+	 */
+	VariationForm.prototype.toggleResetLink = function( on ) {
+		if ( on ) {
+			if ( this.$resetVariations.css( 'visibility' ) === 'hidden' ) {
+				this.$resetVariations.css( 'visibility', 'visible' ).hide().fadeIn();
+			}
+		} else {
+			this.$resetVariations.css( 'visibility', 'hidden' );
+		}
+	};
+
+	/**
+	 * Function to call wc_variation_form on jquery selector.
+	 */
+	$.fn.wc_variation_form = function() {
+		new VariationForm( this );
+		return this;
+	};
+
+	/**
+	 * Stores the default text for an element so it can be reset later
+	 */
+	$.fn.wc_set_content = function( content ) {
+		if ( undefined === this.attr( 'data-o_content' ) ) {
+			this.attr( 'data-o_content', this.text() );
+		}
+		this.text( content );
+	};
+
+	/**
+	 * Stores the default text for an element so it can be reset later
+	 */
+	$.fn.wc_reset_content = function() {
+		if ( undefined !== this.attr( 'data-o_content' ) ) {
+			this.text( this.attr( 'data-o_content' ) );
+		}
+	};
+
+	/**
+	 * Stores a default attribute for an element so it can be reset later
+	 */
+	$.fn.wc_set_variation_attr = function( attr, value ) {
+		if ( undefined === this.attr( 'data-o_' + attr ) ) {
+			this.attr( 'data-o_' + attr, ( ! this.attr( attr ) ) ? '' : this.attr( attr ) );
+		}
+		if ( false === value ) {
+			this.removeAttr( attr );
+		} else {
+			this.attr( attr, value );
+		}
+	};
+
+	/**
+	 * Reset a default attribute for an element so it can be reset later
+	 */
+	$.fn.wc_reset_variation_attr = function( attr ) {
+		if ( undefined !== this.attr( 'data-o_' + attr ) ) {
+			this.attr( attr, this.attr( 'data-o_' + attr ) );
+		}
+	};
+
+	/**
+	 * Reset the slide position if the variation has a different image than the current one
+	 */
+	$.fn.wc_maybe_trigger_slide_position_reset = function( variation ) {
+		var $form                = $( this ),
+			$product             = $form.closest( '.product' ),
+			$product_gallery     = $product.find( '.images' ),
+			reset_slide_position = false,
+			new_image_id = ( variation && variation.image_id ) ? variation.image_id : '';
+
+		if ( $form.attr( 'current-image' ) !== new_image_id ) {
+			reset_slide_position = true;
+		}
+
+		$form.attr( 'current-image', new_image_id );
+
+		if ( reset_slide_position ) {
+			$product_gallery.trigger( 'woocommerce_gallery_reset_slide_position' );
+		}
+	};
+
+	/**
+	 * Sets product images for the chosen variation
+	 */
+	$.fn.wc_variations_image_update = function( variation ) {
+		var $form             = this,
+			$product          = $form.closest( '.product' ),
+			$product_gallery  = $product.find( '.images' ),
+			$gallery_img      = $product.find( '.flex-control-nav li:eq(0) img' ),
+			$product_img_wrap = $product_gallery.find( '.woocommerce-product-gallery__image, .woocommerce-product-gallery__image--placeholder' ).eq( 0 ),
+			$product_img      = $product_img_wrap.find( '.wp-post-image' ),
+			$product_link     = $product_img_wrap.find( 'a' ).eq( 0 );
+
+		if ( variation && variation.image && variation.image.src && variation.image.src.length > 1 ) {
+			$product_img.wc_set_variation_attr( 'src', variation.image.src );
+			$product_img.wc_set_variation_attr( 'height', variation.image.src_h );
+			$product_img.wc_set_variation_attr( 'width', variation.image.src_w );
+			$product_img.wc_set_variation_attr( 'srcset', variation.image.srcset );
+			$product_img.wc_set_variation_attr( 'sizes', variation.image.sizes );
+			$product_img.wc_set_variation_attr( 'title', variation.image.title );
+			$product_img.wc_set_variation_attr( 'alt', variation.image.alt );
+			$product_img.wc_set_variation_attr( 'data-src', variation.image.full_src );
+			$product_img.wc_set_variation_attr( 'data-large_image', variation.image.full_src );
+			$product_img.wc_set_variation_attr( 'data-large_image_width', variation.image.full_src_w );
+			$product_img.wc_set_variation_attr( 'data-large_image_height', variation.image.full_src_h );
+			$product_img_wrap.wc_set_variation_attr( 'data-thumb', variation.image.src );
+			$gallery_img.wc_set_variation_attr( 'src', variation.image.thumb_src );
+			$product_link.wc_set_variation_attr( 'href', variation.image.full_src );
+		} else {
+			$product_img.wc_reset_variation_attr( 'src' );
+			$product_img.wc_reset_variation_attr( 'width' );
+			$product_img.wc_reset_variation_attr( 'height' );
+			$product_img.wc_reset_variation_attr( 'srcset' );
+			$product_img.wc_reset_variation_attr( 'sizes' );
+			$product_img.wc_reset_variation_attr( 'title' );
+			$product_img.wc_reset_variation_attr( 'alt' );
+			$product_img.wc_reset_variation_attr( 'data-src' );
+			$product_img.wc_reset_variation_attr( 'data-large_image' );
+			$product_img.wc_reset_variation_attr( 'data-large_image_width' );
+			$product_img.wc_reset_variation_attr( 'data-large_image_height' );
+			$product_img_wrap.wc_reset_variation_attr( 'data-thumb' );
+			$gallery_img.wc_reset_variation_attr( 'src' );
+			$product_link.wc_reset_variation_attr( 'href' );
+		}
+
+		window.setTimeout( function() {
+			$product_gallery.trigger( 'woocommerce_gallery_init_zoom' );
+			$form.wc_maybe_trigger_slide_position_reset( variation );
+			$( window ).trigger( 'resize' );
+		}, 10 );
+	};
+
+	$(function() {
+		if ( typeof wc_add_to_cart_variation_params !== 'undefined' ) {
+			$( '.variations_form' ).each( function() {
+				$( this ).wc_variation_form();
+			});
+		}
+	});
+
 	/**
 	 * Matches inline variation objects to chosen attributes
+	 * @deprecated 2.6.9
 	 * @type {Object}
 	 */
 	var wc_variation_form_matcher = {
@@ -401,78 +632,4 @@
 		}
 	};
 
-	/**
-	 * Stores the default text for an element so it can be reset later
-	 */
-	$.fn.wc_set_content = function( content ) {
-		if ( undefined === this.attr( 'data-o_content' ) ) {
-			this.attr( 'data-o_content', this.text() );
-		}
-		this.text( content );
-	};
-
-	/**
-	 * Stores the default text for an element so it can be reset later
-	 */
-	$.fn.wc_reset_content = function() {
-		if ( undefined !== this.attr( 'data-o_content' ) ) {
-			this.text( this.attr( 'data-o_content' ) );
-		}
-	};
-
-	/**
-	 * Stores a default attribute for an element so it can be reset later
-	 */
-	$.fn.wc_set_variation_attr = function( attr, value ) {
-		if ( undefined === this.attr( 'data-o_' + attr ) ) {
-			this.attr( 'data-o_' + attr, ( ! this.attr( attr ) ) ? '' : this.attr( attr ) );
-		}
-		this.attr( attr, value );
-	};
-
-	/**
-	 * Reset a default attribute for an element so it can be reset later
-	 */
-	$.fn.wc_reset_variation_attr = function( attr ) {
-		if ( undefined !== this.attr( 'data-o_' + attr ) ) {
-			this.attr( attr, this.attr( 'data-o_' + attr ) );
-		}
-	};
-
-	/**
-	 * Sets product images for the chosen variation
-	 */
-	$.fn.wc_variations_image_update = function( variation ) {
-		var $form             = this,
-			$product          = $form.closest('.product'),
-			$product_img      = $product.find( 'div.images img:eq(0)' ),
-			$product_link     = $product.find( 'div.images a.zoom:eq(0)' );
-
-		if ( variation && variation.image_src && variation.image_src.length > 1 ) {
-			$product_img.wc_set_variation_attr( 'src', variation.image_src );
-			$product_img.wc_set_variation_attr( 'title', variation.image_title );
-			$product_img.wc_set_variation_attr( 'alt', variation.image_title );
-			$product_img.wc_set_variation_attr( 'srcset', variation.image_srcset );
-			$product_img.wc_set_variation_attr( 'sizes', variation.image_sizes );
-			$product_link.wc_set_variation_attr( 'href', variation.image_link );
-			$product_link.wc_set_variation_attr( 'title', variation.image_caption );
-		} else {
-			$product_img.wc_reset_variation_attr( 'src' );
-			$product_img.wc_reset_variation_attr( 'title' );
-			$product_img.wc_reset_variation_attr( 'alt' );
-			$product_img.wc_reset_variation_attr( 'srcset' );
-			$product_img.wc_reset_variation_attr( 'sizes' );
-			$product_link.wc_reset_variation_attr( 'href' );
-			$product_link.wc_reset_variation_attr( 'title' );
-		}
-	};
-
-	$( function() {
-		if ( typeof wc_add_to_cart_variation_params !== 'undefined' ) {
-			$( '.variations_form' ).each( function() {
-				$( this ).wc_variation_form().find('.variations select:eq(0)').change();
-			});
-		}
-	});
-
 })( jQuery, window, document );
diff --git a/assets/js/frontend/add-to-cart-variation.min.js b/assets/js/frontend/add-to-cart-variation.min.js
index 670af940209..bae2fa0e973 100644
--- a/assets/js/frontend/add-to-cart-variation.min.js
+++ b/assets/js/frontend/add-to-cart-variation.min.js
@@ -1,4 +1 @@
-/*!
- * Variations Plugin
- */
-!function(a,b,c,d){a.fn.wc_variation_form=function(){var c=this,d=c.find(".single_variation"),f=c.closest(".product"),g=parseInt(c.data("product_id"),10),h=c.data("product_variations"),i=h===!1,j=!1,k=c.find(".reset_variations"),l=wp.template("variation-template"),m=wp.template("unavailable-variation-template"),n=c.find(".single_variation_wrap");return n.show(),c.unbind("check_variations update_variation_values found_variation"),c.find(".reset_variations").unbind("click"),c.find(".variations select").unbind("change focusin"),c.on("click",".reset_variations",function(){return c.find(".variations select").val("").change(),c.trigger("reset_data"),!1}).on("hide_variation",function(){return c.find(".single_add_to_cart_button").attr("disabled","disabled").attr("title",wc_add_to_cart_variation_params.i18n_make_a_selection_text),!1}).on("show_variation",function(a,b,d){return d?c.find(".single_add_to_cart_button").removeAttr("disabled").removeAttr("title"):c.find(".single_add_to_cart_button").attr("disabled","disabled").attr("title",wc_add_to_cart_variation_params.i18n_unavailable_text),!1}).on("reload_product_variations",function(){h=c.data("product_variations"),i=h===!1}).on("reset_data",function(){a(".sku").wc_reset_content(),a(".product_weight").wc_reset_content(),a(".product_dimensions").wc_reset_content(),c.trigger("reset_image"),d.slideUp(200).trigger("hide_variation")}).on("reset_image",function(){c.wc_variations_image_update(!1)}).on("change",".variations select",function(){if(c.find('input[name="variation_id"], input.variation_id').val("").change(),c.find(".wc-no-matching-variations").remove(),i){j&&j.abort();var b=!0,d=!1,e={};c.find(".variations select").each(function(){var c=a(this).data("attribute_name")||a(this).attr("name");0===a(this).val().length?b=!1:d=!0,e[c]=a(this).val()}),b?(e.product_id=g,j=a.ajax({url:wc_cart_fragments_params.wc_ajax_url.toString().replace("%%endpoint%%","get_variation"),type:"POST",data:e,success:function(a){a?c.trigger("found_variation",[a]):(c.trigger("reset_data"),c.find(".single_variation").after('<p class="wc-no-matching-variations woocommerce-info">'+wc_add_to_cart_variation_params.i18n_no_matching_variations_text+"</p>"),c.find(".wc-no-matching-variations").slideDown(200))}})):c.trigger("reset_data"),d?"hidden"===k.css("visibility")&&k.css("visibility","visible").hide().fadeIn():k.css("visibility","hidden")}else c.trigger("woocommerce_variation_select_change"),c.trigger("check_variations",["",!1]),a(this).blur();a(".product.has-default-attributes > .images").fadeTo(200,1),c.trigger("woocommerce_variation_has_changed")}).on("focusin touchstart",".variations select",function(){a(this).find("option:selected").attr("selected","selected"),i||(c.trigger("woocommerce_variation_select_focusin"),c.trigger("check_variations",[a(this).data("attribute_name")||a(this).attr("name"),!0]))}).on("found_variation",function(b,e){var g=f.find(".product_meta").find(".sku"),h=f.find(".product_weight"),i=f.find(".product_dimensions"),j=n.find(".quantity"),k=!0;e.sku?g.wc_set_content(e.sku):g.wc_reset_content(),e.weight?h.wc_set_content(e.weight):h.wc_reset_content(),e.dimensions?i.wc_set_content(e.dimensions):i.wc_reset_content(),c.wc_variations_image_update(e),e.variation_is_visible?(d.html(l({variation:e})),c.find('input[name="variation_id"], input.variation_id').val(e.variation_id).change()):(d.html(m),c.find('input[name="variation_id"], input.variation_id').val("").change()),"yes"===e.is_sold_individually?(j.find("input.qty").val("1").attr("min","1").attr("max",""),j.hide()):(j.find("input.qty").attr("min",e.min_qty).attr("max",e.max_qty),j.show()),e.is_purchasable&&e.is_in_stock&&e.variation_is_visible||(k=!1),a.trim(d.text())?d.slideDown(200).trigger("show_variation",[e,k]):d.show().trigger("show_variation",[e,k])}).on("check_variations",function(c,f,g){if(!i){var j=!0,k=!1,l={},m=a(this),n=m.find(".reset_variations");m.find(".variations select").each(function(){var b=a(this).data("attribute_name")||a(this).attr("name");0===a(this).val().length?j=!1:k=!0,f&&b===f?(j=!1,l[b]=""):l[b]=a(this).val()});var o=e.find_matching_variations(h,l);if(j){var p=o.shift();p?m.trigger("found_variation",[p]):(m.find(".variations select").val(""),g||m.trigger("reset_data"),b.alert(wc_add_to_cart_variation_params.i18n_no_matching_variations_text))}else m.trigger("update_variation_values",[o]),g||m.trigger("reset_data"),f||d.slideUp(200).trigger("hide_variation");k?"hidden"===n.css("visibility")&&n.css("visibility","visible").hide().fadeIn():n.css("visibility","hidden")}}).on("update_variation_values",function(b,d){i||(c.find(".variations select").each(function(b,c){var e,f=a(c);f.data("attribute_options")||f.data("attribute_options",f.find("option:gt(0)").get()),f.find("option:gt(0)").remove(),f.append(f.data("attribute_options")),f.find("option:gt(0)").removeClass("attached"),f.find("option:gt(0)").removeClass("enabled"),f.find("option:gt(0)").removeAttr("disabled"),e="undefined"!=typeof f.data("attribute_name")?f.data("attribute_name"):f.attr("name");for(var g in d)if("undefined"!=typeof d[g]){var h=d[g].attributes;for(var i in h)if(h.hasOwnProperty(i)){var j=h[i];if(i===e){var k="";d[g].variation_is_active&&(k="enabled"),j?(j=a("<div/>").html(j).text(),j=j.replace(/'/g,"\\'"),j=j.replace(/"/g,'\\"'),f.find('option[value="'+j+'"]').addClass("attached "+k)):f.find("option:gt(0)").addClass("attached "+k)}}}f.find("option:gt(0):not(.attached)").remove(),f.find("option:gt(0):not(.enabled)").attr("disabled","disabled")}),c.trigger("woocommerce_update_variation_values"))}),c.trigger("wc_variation_form"),c};var e={find_matching_variations:function(a,b){for(var c=[],d=0;d<a.length;d++){var f=a[d];e.variations_match(f.attributes,b)&&c.push(f)}return c},variations_match:function(a,b){var c=!0;for(var e in a)if(a.hasOwnProperty(e)){var f=a[e],g=b[e];f!==d&&g!==d&&0!==f.length&&0!==g.length&&f!==g&&(c=!1)}return c}};a.fn.wc_set_content=function(a){d===this.attr("data-o_content")&&this.attr("data-o_content",this.text()),this.text(a)},a.fn.wc_reset_content=function(){d!==this.attr("data-o_content")&&this.text(this.attr("data-o_content"))},a.fn.wc_set_variation_attr=function(a,b){d===this.attr("data-o_"+a)&&this.attr("data-o_"+a,this.attr(a)?this.attr(a):""),this.attr(a,b)},a.fn.wc_reset_variation_attr=function(a){d!==this.attr("data-o_"+a)&&this.attr(a,this.attr("data-o_"+a))},a.fn.wc_variations_image_update=function(a){var b=this,c=b.closest(".product"),d=c.find("div.images img:eq(0)"),e=c.find("div.images a.zoom:eq(0)");a&&a.image_src&&a.image_src.length>1?(d.wc_set_variation_attr("src",a.image_src),d.wc_set_variation_attr("title",a.image_title),d.wc_set_variation_attr("alt",a.image_title),d.wc_set_variation_attr("srcset",a.image_srcset),d.wc_set_variation_attr("sizes",a.image_sizes),e.wc_set_variation_attr("href",a.image_link),e.wc_set_variation_attr("title",a.image_caption)):(d.wc_reset_variation_attr("src"),d.wc_reset_variation_attr("title"),d.wc_reset_variation_attr("alt"),d.wc_reset_variation_attr("srcset"),d.wc_reset_variation_attr("sizes"),e.wc_reset_variation_attr("href"),e.wc_reset_variation_attr("title"))},a(function(){"undefined"!=typeof wc_add_to_cart_variation_params&&a(".variations_form").each(function(){a(this).wc_variation_form().find(".variations select:eq(0)").change()})})}(jQuery,window,document);
\ No newline at end of file
+!function(a,b,c,d){var e=function(a){this.$form=a,this.$attributeFields=a.find(".variations select"),this.$singleVariation=a.find(".single_variation"),this.$singleVariationWrap=a.find(".single_variation_wrap"),this.$resetVariations=a.find(".reset_variations"),this.$product=a.closest(".product"),this.variationData=a.data("product_variations"),this.useAjax=!1===this.variationData,this.xhr=!1,this.$singleVariationWrap.show(),this.$form.unbind("check_variations update_variation_values found_variation"),this.$resetVariations.unbind("click"),this.$attributeFields.unbind("change "),this.getChosenAttributes=this.getChosenAttributes.bind(this),this.findMatchingVariations=this.findMatchingVariations.bind(this),this.isMatch=this.isMatch.bind(this),this.toggleResetLink=this.toggleResetLink.bind(this),a.on("click",".reset_variations",{variationForm:this},this.onReset),a.on("reload_product_variations",{variationForm:this},this.onReload),a.on("hide_variation",{variationForm:this},this.onHide),a.on("show_variation",{variationForm:this},this.onShow),a.on("click",".single_add_to_cart_button",{variationForm:this},this.onAddToCart),a.on("reset_data",{variationForm:this},this.onResetDisplayedVariation),a.on("reset_image",{variationForm:this},this.onResetImage),a.on("change",".variations select",{variationForm:this},this.onChange),a.on("found_variation",{variationForm:this},this.onFoundVariation),a.on("check_variations",{variationForm:this},this.onFindVariation),a.on("update_variation_values",{variationForm:this},this.onUpdateAttributes),a.trigger("check_variations"),a.trigger("wc_variation_form")};e.prototype.onReset=function(a){a.preventDefault(),a.data.variationForm.$attributeFields.val("").change(),a.data.variationForm.$form.trigger("reset_data")},e.prototype.onReload=function(a){var b=a.data.variationForm;b.variationData=b.$form.data("product_variations"),b.useAjax=!1===b.variationData,b.$form.trigger("check_variations")},e.prototype.onHide=function(a){a.preventDefault(),a.data.variationForm.$form.find(".single_add_to_cart_button").removeClass("wc-variation-is-unavailable").addClass("disabled wc-variation-selection-needed"),a.data.variationForm.$form.find(".woocommerce-variation-add-to-cart").removeClass("woocommerce-variation-add-to-cart-enabled").addClass("woocommerce-variation-add-to-cart-disabled")},e.prototype.onShow=function(a,b,c){a.preventDefault(),c?(a.data.variationForm.$form.find(".single_add_to_cart_button").removeClass("disabled wc-variation-selection-needed wc-variation-is-unavailable"),a.data.variationForm.$form.find(".woocommerce-variation-add-to-cart").removeClass("woocommerce-variation-add-to-cart-disabled").addClass("woocommerce-variation-add-to-cart-enabled")):(a.data.variationForm.$form.find(".single_add_to_cart_button").removeClass("wc-variation-selection-needed").addClass("disabled wc-variation-is-unavailable"),a.data.variationForm.$form.find(".woocommerce-variation-add-to-cart").removeClass("woocommerce-variation-add-to-cart-enabled").addClass("woocommerce-variation-add-to-cart-disabled"))},e.prototype.onAddToCart=function(c){a(this).is(".disabled")&&(c.preventDefault(),a(this).is(".wc-variation-is-unavailable")?b.alert(wc_add_to_cart_variation_params.i18n_unavailable_text):a(this).is(".wc-variation-selection-needed")&&b.alert(wc_add_to_cart_variation_params.i18n_make_a_selection_text))},e.prototype.onResetDisplayedVariation=function(a){var b=a.data.variationForm;b.$product.find(".product_meta").find(".sku").wc_reset_content(),b.$product.find(".product_weight").wc_reset_content(),b.$product.find(".product_dimensions").wc_reset_content(),b.$form.trigger("reset_image"),b.$singleVariation.slideUp(200).trigger("hide_variation")},e.prototype.onResetImage=function(a){a.data.variationForm.$form.wc_variations_image_update(!1)},e.prototype.onFindVariation=function(b){var c=b.data.variationForm,d=c.getChosenAttributes(),e=d.data;if(d.count===d.chosenCount)if(c.useAjax)c.xhr&&c.xhr.abort(),c.$form.block({message:null,overlayCSS:{background:"#fff",opacity:.6}}),e.product_id=parseInt(c.$form.data("product_id"),10),e.custom_data=c.$form.data("custom_data"),c.xhr=a.ajax({url:wc_cart_fragments_params.wc_ajax_url.toString().replace("%%endpoint%%","get_variation"),type:"POST",data:e,success:function(a){a?c.$form.trigger("found_variation",[a]):(c.$form.trigger("reset_data"),c.$form.find(".single_variation").after('<p class="wc-no-matching-variations woocommerce-info">'+wc_add_to_cart_variation_params.i18n_no_matching_variations_text+"</p>"),c.$form.find(".wc-no-matching-variations").slideDown(200))},complete:function(){c.$form.unblock()}});else{c.$form.trigger("update_variation_values");var f=c.findMatchingVariations(c.variationData,e),g=f.shift();g?c.$form.trigger("found_variation",[g]):(c.$form.trigger("reset_data"),c.$form.find(".single_variation").after('<p class="wc-no-matching-variations woocommerce-info">'+wc_add_to_cart_variation_params.i18n_no_matching_variations_text+"</p>"),c.$form.find(".wc-no-matching-variations").slideDown(200))}else c.$form.trigger("update_variation_values"),c.$form.trigger("reset_data");c.toggleResetLink(d.chosenCount>0)},e.prototype.onFoundVariation=function(b,c){var d=b.data.variationForm,e=d.$product.find(".product_meta").find(".sku"),f=d.$product.find(".product_weight"),g=d.$product.find(".product_dimensions"),h=d.$singleVariationWrap.find(".quantity"),i=!0,j="",k=!1,l="";c.sku?e.wc_set_content(c.sku):e.wc_reset_content(),c.weight?f.wc_set_content(c.weight):f.wc_reset_content(),c.dimensions?g.wc_set_content(c.dimensions):g.wc_reset_content(),d.$form.wc_variations_image_update(c),c.variation_is_visible?(k=wp.template("variation-template"),j=c.variation_id):k=wp.template("unavailable-variation-template"),l=k({variation:c}),l=l.replace("/*<![CDATA[*/",""),l=l.replace("/*]]>*/",""),d.$singleVariation.html(l),d.$form.find('input[name="variation_id"], input.variation_id').val(c.variation_id).change(),"yes"===c.is_sold_individually?(h.find("input.qty").val("1").attr("min","1").attr("max",""),h.hide()):(h.find("input.qty").attr("min",c.min_qty).attr("max",c.max_qty),h.show()),c.is_purchasable&&c.is_in_stock&&c.variation_is_visible||(i=!1),a.trim(d.$singleVariation.text())?d.$singleVariation.slideDown(200).trigger("show_variation",[c,i]):d.$singleVariation.show().trigger("show_variation",[c,i])},e.prototype.onChange=function(b){var c=b.data.variationForm;c.$form.find('input[name="variation_id"], input.variation_id').val("").change(),c.$form.find(".wc-no-matching-variations").remove(),c.useAjax?c.$form.trigger("check_variations"):(c.$form.trigger("woocommerce_variation_select_change"),c.$form.trigger("check_variations"),a(this).blur()),c.$form.trigger("woocommerce_variation_has_changed")},e.prototype.addSlashes=function(a){return a=a.replace(/'/g,"\\'"),a=a.replace(/"/g,'\\"')},e.prototype.onUpdateAttributes=function(b){var c=b.data.variationForm,d=c.getChosenAttributes(),e=d.data;c.useAjax||(c.$attributeFields.each(function(b,d){var f=a(d),g=f.data("attribute_name")||f.attr("name"),h=a(d).data("show_option_none"),i=":gt(0)",j=0,k=a("<select/>"),l=f.val()||"",m=!0;if(!f.data("attribute_html")){var n=f.clone();n.find("option").removeAttr("disabled attached").removeAttr("selected"),f.data("attribute_options",n.find("option"+i).get()),f.data("attribute_html",n.html())}k.html(f.data("attribute_html"));var o=a.extend(!0,{},e);o[g]="";var p=c.findMatchingVariations(c.variationData,o);for(var q in p)if("undefined"!=typeof p[q]){var r=p[q].attributes;for(var s in r)if(r.hasOwnProperty(s)){var t=r[s],u="";s===g&&(p[q].variation_is_active&&(u="enabled"),t?(t=a("<div/>").html(t).text(),k.find('option[value="'+c.addSlashes(t)+'"]').addClass("attached "+u)):k.find("option:gt(0)").addClass("attached "+u))}}j=k.find("option.attached").length,!l||0!==j&&0!==k.find('option.attached.enabled[value="'+c.addSlashes(l)+'"]').length||(m=!1),j>0&&l&&m&&"no"===h&&(k.find("option:first").remove(),i=""),k.find("option"+i+":not(.attached)").remove(),f.html(k.html()),f.find("option"+i+":not(.enabled)").prop("disabled",!0),l?m?f.val(l):f.val("").change():f.val("")}),c.$form.trigger("woocommerce_update_variation_values"))},e.prototype.getChosenAttributes=function(){var b={},c=0,d=0;return this.$attributeFields.each(function(){var e=a(this).data("attribute_name")||a(this).attr("name"),f=a(this).val()||"";f.length>0&&d++,c++,b[e]=f}),{count:c,chosenCount:d,data:b}},e.prototype.findMatchingVariations=function(a,b){for(var c=[],d=0;d<a.length;d++){var e=a[d];this.isMatch(e.attributes,b)&&c.push(e)}return c},e.prototype.isMatch=function(a,b){var c=!0;for(var e in a)if(a.hasOwnProperty(e)){var f=a[e],g=b[e];f!==d&&g!==d&&0!==f.length&&0!==g.length&&f!==g&&(c=!1)}return c},e.prototype.toggleResetLink=function(a){a?"hidden"===this.$resetVariations.css("visibility")&&this.$resetVariations.css("visibility","visible").hide().fadeIn():this.$resetVariations.css("visibility","hidden")},a.fn.wc_variation_form=function(){return new e(this),this},a.fn.wc_set_content=function(a){d===this.attr("data-o_content")&&this.attr("data-o_content",this.text()),this.text(a)},a.fn.wc_reset_content=function(){d!==this.attr("data-o_content")&&this.text(this.attr("data-o_content"))},a.fn.wc_set_variation_attr=function(a,b){d===this.attr("data-o_"+a)&&this.attr("data-o_"+a,this.attr(a)?this.attr(a):""),!1===b?this.removeAttr(a):this.attr(a,b)},a.fn.wc_reset_variation_attr=function(a){d!==this.attr("data-o_"+a)&&this.attr(a,this.attr("data-o_"+a))},a.fn.wc_maybe_trigger_slide_position_reset=function(b){var c=a(this),d=c.closest(".product"),e=d.find(".images"),f=!1,g=b&&b.image_id?b.image_id:"";c.attr("current-image")!==g&&(f=!0),c.attr("current-image",g),f&&e.trigger("woocommerce_gallery_reset_slide_position")},a.fn.wc_variations_image_update=function(c){var d=this,e=d.closest(".product"),f=e.find(".images"),g=e.find(".flex-control-nav li:eq(0) img"),h=f.find(".woocommerce-product-gallery__image, .woocommerce-product-gallery__image--placeholder").eq(0),i=h.find(".wp-post-image"),j=h.find("a").eq(0);c&&c.image&&c.image.src&&c.image.src.length>1?(i.wc_set_variation_attr("src",c.image.src),i.wc_set_variation_attr("height",c.image.src_h),i.wc_set_variation_attr("width",c.image.src_w),i.wc_set_variation_attr("srcset",c.image.srcset),i.wc_set_variation_attr("sizes",c.image.sizes),i.wc_set_variation_attr("title",c.image.title),i.wc_set_variation_attr("alt",c.image.alt),i.wc_set_variation_attr("data-src",c.image.full_src),i.wc_set_variation_attr("data-large_image",c.image.full_src),i.wc_set_variation_attr("data-large_image_width",c.image.full_src_w),i.wc_set_variation_attr("data-large_image_height",c.image.full_src_h),h.wc_set_variation_attr("data-thumb",c.image.src),g.wc_set_variation_attr("src",c.image.thumb_src),j.wc_set_variation_attr("href",c.image.full_src)):(i.wc_reset_variation_attr("src"),i.wc_reset_variation_attr("width"),i.wc_reset_variation_attr("height"),i.wc_reset_variation_attr("srcset"),i.wc_reset_variation_attr("sizes"),i.wc_reset_variation_attr("title"),i.wc_reset_variation_attr("alt"),i.wc_reset_variation_attr("data-src"),i.wc_reset_variation_attr("data-large_image"),i.wc_reset_variation_attr("data-large_image_width"),i.wc_reset_variation_attr("data-large_image_height"),h.wc_reset_variation_attr("data-thumb"),g.wc_reset_variation_attr("src"),j.wc_reset_variation_attr("href")),b.setTimeout(function(){f.trigger("woocommerce_gallery_init_zoom"),d.wc_maybe_trigger_slide_position_reset(c),a(b).trigger("resize")},10)},a(function(){"undefined"!=typeof wc_add_to_cart_variation_params&&a(".variations_form").each(function(){a(this).wc_variation_form()})})}(jQuery,window,document);
\ No newline at end of file
diff --git a/assets/js/frontend/add-to-cart.js b/assets/js/frontend/add-to-cart.js
index 542ab06f8f2..0fc7fe4a58b 100644
--- a/assets/js/frontend/add-to-cart.js
+++ b/assets/js/frontend/add-to-cart.js
@@ -1,15 +1,17 @@
-/*global wc_add_to_cart_params */
+/* global wc_add_to_cart_params */
+/*!
+ * WooCommerce Add to Cart JS
+ */
 jQuery( function( $ ) {
 
-	// wc_add_to_cart_params is required to continue, ensure the object exists
 	if ( typeof wc_add_to_cart_params === 'undefined' ) {
 		return false;
 	}
 
-	// Ajax add to cart
+	// Ajax add to cart.
 	$( document ).on( 'click', '.add_to_cart_button', function() {
 
-		// AJAX add to cart request
+		// AJAX add to cart request.
 		var $thisbutton = $( this );
 
 		if ( $thisbutton.is( '.ajax_add_to_cart' ) ) {
@@ -24,23 +26,19 @@ jQuery( function( $ ) {
 			var data = {};
 
 			$.each( $thisbutton.data(), function( key, value ) {
-				data[key] = value;
+				data[ key ] = value;
 			});
 
-			// Trigger event
+			// Trigger event.
 			$( document.body ).trigger( 'adding_to_cart', [ $thisbutton, data ] );
 
-			// Ajax action
+			// Ajax action.
 			$.post( wc_add_to_cart_params.wc_ajax_url.toString().replace( '%%endpoint%%', 'add_to_cart' ), data, function( response ) {
 
 				if ( ! response ) {
 					return;
 				}
 
-				var this_page = window.location.toString();
-
-				this_page = this_page.replace( 'add-to-cart', 'added-to-cart' );
-
 				if ( response.error && response.product_url ) {
 					window.location = response.product_url;
 					return;
@@ -54,59 +52,9 @@ jQuery( function( $ ) {
 
 				} else {
 
-					$thisbutton.removeClass( 'loading' );
-
-					var fragments = response.fragments;
-					var cart_hash = response.cart_hash;
-
-					// Block fragments class
-					if ( fragments ) {
-						$.each( fragments, function( key ) {
-							$( key ).addClass( 'updating' );
-						});
-					}
-
-					// Block widgets and fragments
-					$( '.shop_table.cart, .updating, .cart_totals' ).fadeTo( '400', '0.6' ).block({
-						message: null,
-						overlayCSS: {
-							opacity: 0.6
-						}
-					});
-
-					// Changes button classes
-					$thisbutton.addClass( 'added' );
-
-					// View cart text
-					if ( ! wc_add_to_cart_params.is_cart && $thisbutton.parent().find( '.added_to_cart' ).size() === 0 ) {
-						$thisbutton.after( ' <a href="' + wc_add_to_cart_params.cart_url + '" class="added_to_cart wc-forward" title="' +
-							wc_add_to_cart_params.i18n_view_cart + '">' + wc_add_to_cart_params.i18n_view_cart + '</a>' );
-					}
-
-					// Replace fragments
-					if ( fragments ) {
-						$.each( fragments, function( key, value ) {
-							$( key ).replaceWith( value );
-						});
-					}
-
-					// Unblock
-					$( '.widget_shopping_cart, .updating' ).stop( true ).css( 'opacity', '1' ).unblock();
-
-					// Cart page elements
-					$( '.shop_table.cart' ).load( this_page + ' .shop_table.cart:eq(0) > *', function() {
-
-						$( '.shop_table.cart' ).stop( true ).css( 'opacity', '1' ).unblock();
-
-						$( document.body ).trigger( 'cart_page_refreshed' );
-					});
-
-					$( '.cart_totals' ).load( this_page + ' .cart_totals:eq(0) > *', function() {
-						$( '.cart_totals' ).stop( true ).css( 'opacity', '1' ).unblock();
-					});
-
 					// Trigger event so themes can refresh other areas
-					$( document.body ).trigger( 'added_to_cart', [ fragments, cart_hash, $thisbutton ] );
+					$( document.body ).trigger( 'added_to_cart', [ response.fragments, response.cart_hash, $thisbutton ] );
+
 				}
 			});
 
@@ -117,4 +65,66 @@ jQuery( function( $ ) {
 		return true;
 	});
 
+	// On "added_to_cart"
+	$( document.body ).on( 'added_to_cart', function( event, fragments, cart_hash, $button ) {
+		var page = window.location.toString().replace( 'add-to-cart', 'added-to-cart' );
+		$button = typeof $button === 'undefined' ? false : $button;
+
+		if ( $button ) {
+			$button.removeClass( 'loading' );
+		}
+
+		// Block fragments class.
+		if ( fragments ) {
+			$.each( fragments, function( key ) {
+				$( key ).addClass( 'updating' );
+			});
+		}
+
+		// Block widgets and fragments.
+		$( '.shop_table.cart, .updating, .cart_totals' )
+			.fadeTo( '400', '0.6' )
+			.block({
+				message: null,
+				overlayCSS: {
+					opacity: 0.6
+				}
+			});
+
+		if ( $button ) {
+			// Changes button classes.
+			$button.addClass( 'added' );
+
+			// View cart text.
+			if ( ! wc_add_to_cart_params.is_cart && $button.parent().find( '.added_to_cart' ).length === 0 ) {
+				$button.after( ' <a href="' + wc_add_to_cart_params.cart_url + '" class="added_to_cart wc-forward" title="' +
+					wc_add_to_cart_params.i18n_view_cart + '">' + wc_add_to_cart_params.i18n_view_cart + '</a>' );
+			}
+		}
+
+		// Replace fragments.
+		if ( fragments ) {
+			$.each( fragments, function( key, value ) {
+				$( key ).replaceWith( value );
+			});
+
+			$( document.body ).trigger( 'wc_fragments_loaded' );
+		}
+
+		// Unblock.
+		$( '.widget_shopping_cart, .updating' ).stop( true ).css( 'opacity', '1' ).unblock();
+
+		// Cart page elements.
+		$( '.shop_table.cart' ).load( page + ' .shop_table.cart:eq(0) > *', function() {
+			$( '.shop_table.cart' ).stop( true ).css( 'opacity', '1' ).unblock();
+
+			$( document.body ).trigger( 'cart_page_refreshed' );
+		});
+
+		$( '.cart_totals' ).load( page + ' .cart_totals:eq(0) > *', function() {
+			$( '.cart_totals' ).stop( true ).css( 'opacity', '1' ).unblock();
+		});
+
+	});
+
 });
diff --git a/assets/js/frontend/add-to-cart.min.js b/assets/js/frontend/add-to-cart.min.js
index 2646cffe658..0a0e3b95111 100644
--- a/assets/js/frontend/add-to-cart.min.js
+++ b/assets/js/frontend/add-to-cart.min.js
@@ -1 +1,4 @@
-jQuery(function(a){return"undefined"==typeof wc_add_to_cart_params?!1:void a(document).on("click",".add_to_cart_button",function(){var b=a(this);if(b.is(".ajax_add_to_cart")){if(!b.attr("data-product_id"))return!0;b.removeClass("added"),b.addClass("loading");var c={};return a.each(b.data(),function(a,b){c[a]=b}),a(document.body).trigger("adding_to_cart",[b,c]),a.post(wc_add_to_cart_params.wc_ajax_url.toString().replace("%%endpoint%%","add_to_cart"),c,function(c){if(c){var d=window.location.toString();if(d=d.replace("add-to-cart","added-to-cart"),c.error&&c.product_url)return void(window.location=c.product_url);if("yes"===wc_add_to_cart_params.cart_redirect_after_add)return void(window.location=wc_add_to_cart_params.cart_url);b.removeClass("loading");var e=c.fragments,f=c.cart_hash;e&&a.each(e,function(b){a(b).addClass("updating")}),a(".shop_table.cart, .updating, .cart_totals").fadeTo("400","0.6").block({message:null,overlayCSS:{opacity:.6}}),b.addClass("added"),wc_add_to_cart_params.is_cart||0!==b.parent().find(".added_to_cart").size()||b.after(' <a href="'+wc_add_to_cart_params.cart_url+'" class="added_to_cart wc-forward" title="'+wc_add_to_cart_params.i18n_view_cart+'">'+wc_add_to_cart_params.i18n_view_cart+"</a>"),e&&a.each(e,function(b,c){a(b).replaceWith(c)}),a(".widget_shopping_cart, .updating").stop(!0).css("opacity","1").unblock(),a(".shop_table.cart").load(d+" .shop_table.cart:eq(0) > *",function(){a(".shop_table.cart").stop(!0).css("opacity","1").unblock(),a(document.body).trigger("cart_page_refreshed")}),a(".cart_totals").load(d+" .cart_totals:eq(0) > *",function(){a(".cart_totals").stop(!0).css("opacity","1").unblock()}),a(document.body).trigger("added_to_cart",[e,f,b])}}),!1}return!0})});
\ No newline at end of file
+/*!
+ * WooCommerce Add to Cart JS
+ */
+jQuery(function(a){return"undefined"!=typeof wc_add_to_cart_params&&(a(document).on("click",".add_to_cart_button",function(){var b=a(this);if(b.is(".ajax_add_to_cart")){if(!b.attr("data-product_id"))return!0;b.removeClass("added"),b.addClass("loading");var c={};return a.each(b.data(),function(a,b){c[a]=b}),a(document.body).trigger("adding_to_cart",[b,c]),a.post(wc_add_to_cart_params.wc_ajax_url.toString().replace("%%endpoint%%","add_to_cart"),c,function(c){if(c)return c.error&&c.product_url?void(window.location=c.product_url):"yes"===wc_add_to_cart_params.cart_redirect_after_add?void(window.location=wc_add_to_cart_params.cart_url):void a(document.body).trigger("added_to_cart",[c.fragments,c.cart_hash,b])}),!1}return!0}),void a(document.body).on("added_to_cart",function(b,c,d,e){var f=window.location.toString().replace("add-to-cart","added-to-cart");e="undefined"!=typeof e&&e,e&&e.removeClass("loading"),c&&a.each(c,function(b){a(b).addClass("updating")}),a(".shop_table.cart, .updating, .cart_totals").fadeTo("400","0.6").block({message:null,overlayCSS:{opacity:.6}}),e&&(e.addClass("added"),wc_add_to_cart_params.is_cart||0!==e.parent().find(".added_to_cart").length||e.after(' <a href="'+wc_add_to_cart_params.cart_url+'" class="added_to_cart wc-forward" title="'+wc_add_to_cart_params.i18n_view_cart+'">'+wc_add_to_cart_params.i18n_view_cart+"</a>")),c&&(a.each(c,function(b,c){a(b).replaceWith(c)}),a(document.body).trigger("wc_fragments_loaded")),a(".widget_shopping_cart, .updating").stop(!0).css("opacity","1").unblock(),a(".shop_table.cart").load(f+" .shop_table.cart:eq(0) > *",function(){a(".shop_table.cart").stop(!0).css("opacity","1").unblock(),a(document.body).trigger("cart_page_refreshed")}),a(".cart_totals").load(f+" .cart_totals:eq(0) > *",function(){a(".cart_totals").stop(!0).css("opacity","1").unblock()})}))});
\ No newline at end of file
diff --git a/assets/js/frontend/address-i18n.js b/assets/js/frontend/address-i18n.js
index 828ac3cca16..f4cab1a4b0b 100644
--- a/assets/js/frontend/address-i18n.js
+++ b/assets/js/frontend/address-i18n.js
@@ -3,7 +3,7 @@ jQuery( function( $ ) {
 
 	// wc_address_i18n_params is required to continue, ensure the object exists
 	if ( typeof wc_address_i18n_params === 'undefined' ) {
-    	return false;
+		return false;
 	}
 
 	var locale_json = wc_address_i18n_params.locale.replace( /&quot;/g, '"' ),
@@ -42,20 +42,6 @@ jQuery( function( $ ) {
 				$statefield.attr( 'data-o_class', $statefield.attr( 'class' ) );
 			}
 
-			// Re-order postcode/city
-			if ( thislocale.postcode_before_city ) {
-				$postcodefield.add( $cityfield ).add( $statefield ).removeClass( 'form-row-first form-row-last' ).addClass( 'form-row-first' );
-				$cityfield.removeClass( 'form-row-wide form-row-first' ).addClass( 'form-row-last' );
-				$postcodefield.insertBefore( $cityfield );
-			} else {
-				// Default
-				$postcodefield.attr( 'class', $postcodefield.attr( 'data-o_class' ) );
-				$cityfield.attr( 'class', $cityfield.attr( 'data-o_class' ) );
-				$statefield.attr( 'class', $statefield.attr( 'data-o_class' ) );
-				$postcodefield.insertAfter( $statefield );
-			}
-
-			// Handle locale fields
 			var locale_fields = $.parseJSON( wc_address_i18n_params.locale_fields );
 
 			$.each( locale_fields, function( key, value ) {
@@ -88,6 +74,12 @@ jQuery( function( $ ) {
 						}
 					}
 
+					if ( thislocale[ key ].priority ) {
+						field.data( 'priority', thislocale[ key ].priority );
+					} else if ( locale['default'][ key ].priority ) {
+						field.data( 'priority', locale['default'][ key ].priority );
+					}
+
 				} else if ( locale['default'][ key ] ) {
 
 					if ( 'state' !== key ) {
@@ -98,7 +90,7 @@ jQuery( function( $ ) {
 						}
 					}
 
-					if ( 'postcode' === key || 'city' === key ) {
+					if ( 'postcode' === key || 'city' === key || 'state' === key ) {
 						if ( locale['default'][ key ].label ) {
 							field.find( 'label' ).html( locale['default'][ key ].label );
 						}
@@ -109,13 +101,49 @@ jQuery( function( $ ) {
 					}
 
 					if ( locale['default'][ key ].required === true ) {
-						if ( field.find( 'label abbr' ).size() === 0 ) {
+						if ( field.find( 'label abbr' ).length === 0 ) {
 							field_is_required( field, true );
 						}
 					}
+
+					if ( locale['default'][ key ].priority ) {
+						field.data( 'priority', locale['default'][ key ].priority );
+					}
 				}
 
 			});
-		});
 
+			var fieldsets = $('.woocommerce-billing-fields__field-wrapper, .woocommerce-shipping-fields__field-wrapper, .woocommerce-address-fields__field-wrapper, .woocommerce-additional-fields__field-wrapper .woocommerce-account-fields');
+
+			fieldsets.each( function( index, fieldset ) {
+				var rows    = $( fieldset ).find( '.form-row' );
+				var wrapper = rows.first().parent();
+
+				// Before sorting, ensure all fields have a priority for bW compatibility.
+				var last_priority = 0;
+
+				rows.each( function() {
+					if ( ! $( this ).data( 'priority' ) ) {
+						 $( this ).data( 'priority', last_priority + 1 );
+					}
+					last_priority = $( this ).data( 'priority' );
+				} );
+
+				// Sort the fields.
+				rows.sort( function( a, b ) {
+					var asort = $( a ).data( 'priority' ),
+						bsort = $( b ).data( 'priority' );
+
+					if ( asort > bsort ) {
+						return 1;
+					}
+					if ( asort < bsort ) {
+						return -1;
+					}
+					return 0;
+				});
+
+				rows.detach().appendTo( wrapper );
+			} );
+		});
 });
diff --git a/assets/js/frontend/address-i18n.min.js b/assets/js/frontend/address-i18n.min.js
index 69e03c3d965..af9c64cca14 100644
--- a/assets/js/frontend/address-i18n.min.js
+++ b/assets/js/frontend/address-i18n.min.js
@@ -1 +1 @@
-jQuery(function(a){function b(a,b){b?(a.find("label").append(' <abbr class="required" title="'+wc_address_i18n_params.i18n_required_text+'">*</abbr>'),a.addClass("validate-required")):(a.find("label abbr").remove(),a.removeClass("validate-required"))}if("undefined"==typeof wc_address_i18n_params)return!1;var c=wc_address_i18n_params.locale.replace(/&quot;/g,'"'),d=a.parseJSON(c);a(document.body).bind("country_to_state_changing",function(c,e,f){var g,h=f;g="undefined"!=typeof d[e]?d[e]:d["default"];var i=h.find("#billing_postcode_field, #shipping_postcode_field"),j=h.find("#billing_city_field, #shipping_city_field"),k=h.find("#billing_state_field, #shipping_state_field");i.attr("data-o_class")||(i.attr("data-o_class",i.attr("class")),j.attr("data-o_class",j.attr("class")),k.attr("data-o_class",k.attr("class"))),g.postcode_before_city?(i.add(j).add(k).removeClass("form-row-first form-row-last").addClass("form-row-first"),j.removeClass("form-row-wide form-row-first").addClass("form-row-last"),i.insertBefore(j)):(i.attr("class",i.attr("data-o_class")),j.attr("class",j.attr("data-o_class")),k.attr("class",k.attr("data-o_class")),i.insertAfter(k));var l=a.parseJSON(wc_address_i18n_params.locale_fields);a.each(l,function(a,c){var e=h.find(c);g[a]?(g[a].label&&e.find("label").html(g[a].label),g[a].placeholder&&e.find("input").attr("placeholder",g[a].placeholder),b(e,!1),"undefined"==typeof g[a].required&&d["default"][a].required===!0?b(e,!0):g[a].required===!0&&b(e,!0),"state"!==a&&(g[a].hidden===!0?e.hide().find("input").val(""):e.show())):d["default"][a]&&("state"!==a&&("undefined"==typeof d["default"][a].hidden||d["default"][a].hidden===!1?e.show():d["default"][a].hidden===!0&&e.hide().find("input").val("")),("postcode"===a||"city"===a)&&(d["default"][a].label&&e.find("label").html(d["default"][a].label),d["default"][a].placeholder&&e.find("input").attr("placeholder",d["default"][a].placeholder)),d["default"][a].required===!0&&0===e.find("label abbr").size()&&b(e,!0))})})});
\ No newline at end of file
+jQuery(function(a){function b(a,b){b?(a.find("label").append(' <abbr class="required" title="'+wc_address_i18n_params.i18n_required_text+'">*</abbr>'),a.addClass("validate-required")):(a.find("label abbr").remove(),a.removeClass("validate-required"))}if("undefined"==typeof wc_address_i18n_params)return!1;var c=wc_address_i18n_params.locale.replace(/&quot;/g,'"'),d=a.parseJSON(c);a(document.body).bind("country_to_state_changing",function(c,e,f){var g,h=f;g="undefined"!=typeof d[e]?d[e]:d.default;var i=h.find("#billing_postcode_field, #shipping_postcode_field"),j=h.find("#billing_city_field, #shipping_city_field"),k=h.find("#billing_state_field, #shipping_state_field");i.attr("data-o_class")||(i.attr("data-o_class",i.attr("class")),j.attr("data-o_class",j.attr("class")),k.attr("data-o_class",k.attr("class")));var l=a.parseJSON(wc_address_i18n_params.locale_fields);a.each(l,function(a,c){var e=h.find(c);g[a]?(g[a].label&&e.find("label").html(g[a].label),g[a].placeholder&&e.find("input").attr("placeholder",g[a].placeholder),b(e,!1),"undefined"==typeof g[a].required&&d.default[a].required===!0?b(e,!0):g[a].required===!0&&b(e,!0),"state"!==a&&(g[a].hidden===!0?e.hide().find("input").val(""):e.show()),g[a].priority?e.data("priority",g[a].priority):d.default[a].priority&&e.data("priority",d.default[a].priority)):d.default[a]&&("state"!==a&&("undefined"==typeof d.default[a].hidden||d.default[a].hidden===!1?e.show():d.default[a].hidden===!0&&e.hide().find("input").val("")),"postcode"!==a&&"city"!==a&&"state"!==a||(d.default[a].label&&e.find("label").html(d.default[a].label),d.default[a].placeholder&&e.find("input").attr("placeholder",d.default[a].placeholder)),d.default[a].required===!0&&0===e.find("label abbr").length&&b(e,!0),d.default[a].priority&&e.data("priority",d.default[a].priority))});var m=a(".woocommerce-billing-fields__field-wrapper, .woocommerce-shipping-fields__field-wrapper, .woocommerce-address-fields__field-wrapper, .woocommerce-additional-fields__field-wrapper .woocommerce-account-fields");m.each(function(b,c){var d=a(c).find(".form-row"),e=d.first().parent(),f=0;d.each(function(){a(this).data("priority")||a(this).data("priority",f+1),f=a(this).data("priority")}),d.sort(function(b,c){var d=a(b).data("priority"),e=a(c).data("priority");return d>e?1:d<e?-1:0}),d.detach().appendTo(e)})})});
\ No newline at end of file
diff --git a/assets/js/frontend/cart-fragments.js b/assets/js/frontend/cart-fragments.js
index 302bbf410c2..363d70f563b 100644
--- a/assets/js/frontend/cart-fragments.js
+++ b/assets/js/frontend/cart-fragments.js
@@ -1,4 +1,4 @@
-/* global wc_cart_fragments_params */
+/* global wc_cart_fragments_params, Cookies */
 jQuery( function( $ ) {
 
 	// wc_cart_fragments_params is required to continue, ensure the object exists
@@ -8,10 +8,14 @@ jQuery( function( $ ) {
 
 	/* Storage Handling */
 	var $supports_html5_storage;
+	var cart_hash_key = wc_cart_fragments_params.ajax_url.toString() + '-wc_cart_hash';
+
 	try {
 		$supports_html5_storage = ( 'sessionStorage' in window && window.sessionStorage !== null );
 		window.sessionStorage.setItem( 'wc', 'test' );
 		window.sessionStorage.removeItem( 'wc' );
+		window.localStorage.setItem( 'wc', 'test' );
+		window.localStorage.removeItem( 'wc' );
 	} catch( err ) {
 		$supports_html5_storage = false;
 	}
@@ -26,8 +30,8 @@ jQuery( function( $ ) {
 	/** Set the cart hash in both session and local storage */
 	function set_cart_hash( cart_hash ) {
 		if ( $supports_html5_storage ) {
-			localStorage.setItem( 'wc_cart_hash', cart_hash );
-			sessionStorage.setItem( 'wc_cart_hash', cart_hash );
+			localStorage.setItem( cart_hash_key, cart_hash );
+			sessionStorage.setItem( cart_hash_key, cart_hash );
 		}
 	}
 
@@ -66,8 +70,12 @@ jQuery( function( $ ) {
 		var cart_timeout = null,
 			day_in_ms    = ( 24 * 60 * 60 * 1000 );
 
-		$( document.body ).bind( 'added_to_cart', function( event, fragments, cart_hash ) {
-			var prev_cart_hash = sessionStorage.getItem( 'wc_cart_hash' );
+		$( document.body ).on( 'wc_fragment_refresh updated_wc_div', function() {
+			refresh_cart_fragment();
+		});
+
+		$( document.body ).on( 'added_to_cart', function( event, fragments, cart_hash ) {
+			var prev_cart_hash = sessionStorage.getItem( cart_hash_key );
 
 			if ( prev_cart_hash === null || prev_cart_hash === undefined || prev_cart_hash === '' ) {
 				set_cart_creation_timestamp();
@@ -77,22 +85,30 @@ jQuery( function( $ ) {
 			set_cart_hash( cart_hash );
 		});
 
-		$( document.body ).bind( 'wc_fragments_refreshed', function() {
+		$( document.body ).on( 'wc_fragments_refreshed', function() {
 			clearTimeout( cart_timeout );
 			cart_timeout = setTimeout( refresh_cart_fragment, day_in_ms );
 		} );
 
 		// Refresh when storage changes in another tab
 		$( window ).on( 'storage onstorage', function ( e ) {
-			if ( 'wc_cart_hash' === e.originalEvent.key && localStorage.getItem( 'wc_cart_hash' ) !== sessionStorage.getItem( 'wc_cart_hash' ) ) {
-				$.ajax( $fragment_refresh );
+			if ( cart_hash_key === e.originalEvent.key && localStorage.getItem( cart_hash_key ) !== sessionStorage.getItem( cart_hash_key ) ) {
+				refresh_cart_fragment();
 			}
 		});
 
+		// Refresh when page is shown after back button (safari)
+		$( window ).on( 'pageshow' , function( e ) {
+			if ( e.originalEvent.persisted ) {
+				$( '.widget_shopping_cart_content' ).empty();
+				$( document.body ).trigger( 'wc_fragment_refresh' );
+			}
+		} );
+
 		try {
 			var wc_fragments = $.parseJSON( sessionStorage.getItem( wc_cart_fragments_params.fragment_name ) ),
-				cart_hash    = sessionStorage.getItem( 'wc_cart_hash' ),
-				cookie_hash  = $.cookie( 'woocommerce_cart_hash'),
+				cart_hash    = sessionStorage.getItem( cart_hash_key ),
+				cookie_hash  = Cookies.get( 'woocommerce_cart_hash'),
 				cart_created = sessionStorage.getItem( 'wc_cart_created' );
 
 			if ( cart_hash === null || cart_hash === undefined || cart_hash === '' ) {
@@ -136,13 +152,13 @@ jQuery( function( $ ) {
 	}
 
 	/* Cart Hiding */
-	if ( $.cookie( 'woocommerce_items_in_cart' ) > 0 ) {
+	if ( Cookies.get( 'woocommerce_items_in_cart' ) > 0 ) {
 		$( '.hide_cart_widget_if_empty' ).closest( '.widget_shopping_cart' ).show();
 	} else {
 		$( '.hide_cart_widget_if_empty' ).closest( '.widget_shopping_cart' ).hide();
 	}
 
-	$( document.body ).bind( 'adding_to_cart', function() {
+	$( document.body ).on( 'adding_to_cart', function() {
 		$( '.hide_cart_widget_if_empty' ).closest( '.widget_shopping_cart' ).show();
 	});
 });
diff --git a/assets/js/frontend/cart-fragments.min.js b/assets/js/frontend/cart-fragments.min.js
index 2b8fd419322..bdef6209fe1 100644
--- a/assets/js/frontend/cart-fragments.min.js
+++ b/assets/js/frontend/cart-fragments.min.js
@@ -1 +1 @@
-jQuery(function(a){function b(){e&&sessionStorage.setItem("wc_cart_created",(new Date).getTime())}function c(a){e&&(localStorage.setItem("wc_cart_hash",a),sessionStorage.setItem("wc_cart_hash",a))}function d(){a.ajax(g)}if("undefined"==typeof wc_cart_fragments_params)return!1;var e;try{e="sessionStorage"in window&&null!==window.sessionStorage,window.sessionStorage.setItem("wc","test"),window.sessionStorage.removeItem("wc")}catch(f){e=!1}var g={url:wc_cart_fragments_params.wc_ajax_url.toString().replace("%%endpoint%%","get_refreshed_fragments"),type:"POST",success:function(d){d&&d.fragments&&(a.each(d.fragments,function(b,c){a(b).replaceWith(c)}),e&&(sessionStorage.setItem(wc_cart_fragments_params.fragment_name,JSON.stringify(d.fragments)),c(d.cart_hash),d.cart_hash&&b()),a(document.body).trigger("wc_fragments_refreshed"))}};if(e){var h=null,i=864e5;a(document.body).bind("added_to_cart",function(a,d,e){var f=sessionStorage.getItem("wc_cart_hash");(null===f||void 0===f||""===f)&&b(),sessionStorage.setItem(wc_cart_fragments_params.fragment_name,JSON.stringify(d)),c(e)}),a(document.body).bind("wc_fragments_refreshed",function(){clearTimeout(h),h=setTimeout(d,i)}),a(window).on("storage onstorage",function(b){"wc_cart_hash"===b.originalEvent.key&&localStorage.getItem("wc_cart_hash")!==sessionStorage.getItem("wc_cart_hash")&&a.ajax(g)});try{var j=a.parseJSON(sessionStorage.getItem(wc_cart_fragments_params.fragment_name)),k=sessionStorage.getItem("wc_cart_hash"),l=a.cookie("woocommerce_cart_hash"),m=sessionStorage.getItem("wc_cart_created");if((null===k||void 0===k||""===k)&&(k=""),(null===l||void 0===l||""===l)&&(l=""),k&&(null===m||void 0===m||""===m))throw"No cart_created";if(m){var n=1*m+i,o=(new Date).getTime();if(o>n)throw"Fragment expired";h=setTimeout(d,n-o)}if(!j||!j["div.widget_shopping_cart_content"]||k!==l)throw"No fragment";a.each(j,function(b,c){a(b).replaceWith(c)}),a(document.body).trigger("wc_fragments_loaded")}catch(f){d()}}else d();a.cookie("woocommerce_items_in_cart")>0?a(".hide_cart_widget_if_empty").closest(".widget_shopping_cart").show():a(".hide_cart_widget_if_empty").closest(".widget_shopping_cart").hide(),a(document.body).bind("adding_to_cart",function(){a(".hide_cart_widget_if_empty").closest(".widget_shopping_cart").show()})});
\ No newline at end of file
+jQuery(function(a){function b(){e&&sessionStorage.setItem("wc_cart_created",(new Date).getTime())}function c(a){e&&(localStorage.setItem(f,a),sessionStorage.setItem(f,a))}function d(){a.ajax(g)}if("undefined"==typeof wc_cart_fragments_params)return!1;var e,f=wc_cart_fragments_params.ajax_url.toString()+"-wc_cart_hash";try{e="sessionStorage"in window&&null!==window.sessionStorage,window.sessionStorage.setItem("wc","test"),window.sessionStorage.removeItem("wc"),window.localStorage.setItem("wc","test"),window.localStorage.removeItem("wc")}catch(a){e=!1}var g={url:wc_cart_fragments_params.wc_ajax_url.toString().replace("%%endpoint%%","get_refreshed_fragments"),type:"POST",success:function(d){d&&d.fragments&&(a.each(d.fragments,function(b,c){a(b).replaceWith(c)}),e&&(sessionStorage.setItem(wc_cart_fragments_params.fragment_name,JSON.stringify(d.fragments)),c(d.cart_hash),d.cart_hash&&b()),a(document.body).trigger("wc_fragments_refreshed"))}};if(e){var h=null,i=864e5;a(document.body).on("wc_fragment_refresh updated_wc_div",function(){d()}),a(document.body).on("added_to_cart",function(a,d,e){var g=sessionStorage.getItem(f);null!==g&&void 0!==g&&""!==g||b(),sessionStorage.setItem(wc_cart_fragments_params.fragment_name,JSON.stringify(d)),c(e)}),a(document.body).on("wc_fragments_refreshed",function(){clearTimeout(h),h=setTimeout(d,i)}),a(window).on("storage onstorage",function(a){f===a.originalEvent.key&&localStorage.getItem(f)!==sessionStorage.getItem(f)&&d()}),a(window).on("pageshow",function(b){b.originalEvent.persisted&&(a(".widget_shopping_cart_content").empty(),a(document.body).trigger("wc_fragment_refresh"))});try{var j=a.parseJSON(sessionStorage.getItem(wc_cart_fragments_params.fragment_name)),k=sessionStorage.getItem(f),l=Cookies.get("woocommerce_cart_hash"),m=sessionStorage.getItem("wc_cart_created");if(null!==k&&void 0!==k&&""!==k||(k=""),null!==l&&void 0!==l&&""!==l||(l=""),k&&(null===m||void 0===m||""===m))throw"No cart_created";if(m){var n=1*m+i,o=(new Date).getTime();if(n<o)throw"Fragment expired";h=setTimeout(d,n-o)}if(!j||!j["div.widget_shopping_cart_content"]||k!==l)throw"No fragment";a.each(j,function(b,c){a(b).replaceWith(c)}),a(document.body).trigger("wc_fragments_loaded")}catch(a){d()}}else d();Cookies.get("woocommerce_items_in_cart")>0?a(".hide_cart_widget_if_empty").closest(".widget_shopping_cart").show():a(".hide_cart_widget_if_empty").closest(".widget_shopping_cart").hide(),a(document.body).on("adding_to_cart",function(){a(".hide_cart_widget_if_empty").closest(".widget_shopping_cart").show()})});
\ No newline at end of file
diff --git a/assets/js/frontend/cart.js b/assets/js/frontend/cart.js
index e6ae0396dc0..ae1432e03de 100644
--- a/assets/js/frontend/cart.js
+++ b/assets/js/frontend/cart.js
@@ -6,35 +6,541 @@ jQuery( function( $ ) {
 		return false;
 	}
 
-	// Shipping calculator
-	$( document ).on( 'click', '.shipping-calculator-button', function() {
-		$( '.shipping-calculator-form' ).slideToggle( 'slow' );
-		return false;
-	}).on( 'change', 'select.shipping_method, input[name^=shipping_method]', function() {
-		var shipping_methods = [];
+	// Utility functions for the file.
 
-		$( 'select.shipping_method, input[name^=shipping_method][type=radio]:checked, input[name^=shipping_method][type=hidden]' ).each( function() {
-			shipping_methods[ $( this ).data( 'index' ) ] = $( this ).val();
-		});
+	/**
+	 * Gets a url for a given AJAX endpoint.
+	 *
+	 * @param {String} endpoint The AJAX Endpoint
+	 * @return {String} The URL to use for the request
+	 */
+	var get_url = function( endpoint ) {
+		return wc_cart_params.wc_ajax_url.toString().replace(
+			'%%endpoint%%',
+			endpoint
+		);
+	};
 
-		$( 'div.cart_totals' ).block({
-			message: null,
-			overlayCSS: {
-				background: '#fff',
-				opacity: 0.6
+	/**
+	 * Check if a node is blocked for processing.
+	 *
+	 * @param {JQuery Object} $node
+	 * @return {bool} True if the DOM Element is UI Blocked, false if not.
+	 */
+	var is_blocked = function( $node ) {
+		return $node.is( '.processing' ) || $node.parents( '.processing' ).length;
+	};
+
+	/**
+	 * Block a node visually for processing.
+	 *
+	 * @param {JQuery Object} $node
+	 */
+	var block = function( $node ) {
+		if ( ! is_blocked( $node ) ) {
+			$node.addClass( 'processing' ).block( {
+				message: null,
+				overlayCSS: {
+					background: '#fff',
+					opacity: 0.6
+				}
+			} );
+		}
+	};
+
+	/**
+	 * Unblock a node after processing is complete.
+	 *
+	 * @param {JQuery Object} $node
+	 */
+	var unblock = function( $node ) {
+		$node.removeClass( 'processing' ).unblock();
+	};
+
+	/**
+	 * Update the .woocommerce div with a string of html.
+	 *
+	 * @param {String} html_str The HTML string with which to replace the div.
+	 * @param {bool} preserve_notices Should notices be kept? False by default.
+	 */
+	var update_wc_div = function( html_str, preserve_notices ) {
+		var $html       = $.parseHTML( html_str );
+		var $new_form   = $( '.woocommerce-cart-form', $html );
+		var $new_totals = $( '.cart_totals', $html );
+		var $notices    = $( '.woocommerce-error, .woocommerce-message, .woocommerce-info', $html );
+
+		// No form, cannot do this.
+		if ( $( '.woocommerce-cart-form' ).length === 0 ) {
+			window.location.href = window.location.href;
+			return;
+		}
+
+		// Remove errors
+		if ( ! preserve_notices ) {
+			$( '.woocommerce-error, .woocommerce-message, .woocommerce-info' ).remove();
+		}
+
+		if ( $new_form.length === 0 ) {
+			// If the checkout is also displayed on this page, trigger reload instead.
+			if ( $( '.woocommerce-checkout' ).length ) {
+				window.location.href = window.location.href;
+				return;
 			}
-		});
 
-		var data = {
-			security: wc_cart_params.update_shipping_method_nonce,
-			shipping_method: shipping_methods
-		};
+			// No items to display now! Replace all cart content.
+			var $cart_html = $( '.cart-empty', $html ).closest( '.woocommerce' );
+			$( '.woocommerce-cart-form__contents' ).closest( '.woocommerce' ).replaceWith( $cart_html );
 
-		$.post( wc_cart_params.wc_ajax_url.toString().replace( '%%endpoint%%', 'update_shipping_method' ), data, function( response ) {
-			$( 'div.cart_totals' ).replaceWith( response );
-			$( document.body ).trigger( 'updated_shipping_method' );
-		});
-	});
+			// Display errors
+			if ( $notices.length > 0 ) {
+				show_notice( $notices, $( '.cart-empty' ).closest( '.woocommerce' ) );
+			}
+		} else {
+			// If the checkout is also displayed on this page, trigger update event.
+			if ( $( '.woocommerce-checkout' ).length ) {
+				$( document.body ).trigger( 'update_checkout' );
+			}
 
-	$( '.shipping-calculator-form' ).hide();
-});
+			$( '.woocommerce-cart-form' ).replaceWith( $new_form );
+			$( '.woocommerce-cart-form' ).find( 'input[name="update_cart"]' ).prop( 'disabled', true );
+
+			if ( $notices.length > 0 ) {
+				show_notice( $notices );
+			}
+
+			update_cart_totals_div( $new_totals );
+		}
+
+		$( document.body ).trigger( 'updated_wc_div' );
+	};
+
+	/**
+	 * Update the .cart_totals div with a string of html.
+	 *
+	 * @param {String} html_str The HTML string with which to replace the div.
+	 */
+	var update_cart_totals_div = function( html_str ) {
+		$( '.cart_totals' ).replaceWith( html_str );
+		$( document.body ).trigger( 'updated_cart_totals' );
+	};
+
+	/**
+	 * Clear previous notices and shows new one above form.
+	 *
+	 * @param {Object} The Notice HTML Element in string or object form.
+	 */
+	var show_notice = function( html_element, $target ) {
+		if ( ! $target ) {
+			$target = $( '.woocommerce-cart-form' );
+		}
+		$target.before( html_element );
+	};
+
+
+	/**
+	 * Object to handle AJAX calls for cart shipping changes.
+	 */
+	var cart_shipping = {
+
+		/**
+		 * Initialize event handlers and UI state.
+		 */
+		init: function( cart ) {
+			this.cart                       = cart;
+			this.toggle_shipping            = this.toggle_shipping.bind( this );
+			this.shipping_method_selected   = this.shipping_method_selected.bind( this );
+			this.shipping_calculator_submit = this.shipping_calculator_submit.bind( this );
+
+			$( document ).on(
+				'click',
+				'.shipping-calculator-button',
+				this.toggle_shipping
+			);
+			$( document ).on(
+				'change',
+				'select.shipping_method, input[name^=shipping_method]',
+				this.shipping_method_selected
+			);
+			$( document ).on(
+				'submit',
+				'form.woocommerce-shipping-calculator',
+				this.shipping_calculator_submit
+			);
+
+			$( '.shipping-calculator-form' ).hide();
+		},
+
+		/**
+		 * Toggle Shipping Calculator panel
+		 */
+		toggle_shipping: function() {
+			$( '.shipping-calculator-form' ).slideToggle( 'slow' );
+			return false;
+		},
+
+		/**
+		 * Handles when a shipping method is selected.
+		 *
+		 * @param {Object} evt The JQuery event.
+		 */
+		shipping_method_selected: function( evt ) {
+			var target = evt.currentTarget;
+
+			var shipping_methods = {};
+
+			$( 'select.shipping_method, input[name^=shipping_method][type=radio]:checked, input[name^=shipping_method][type=hidden]' ).each( function() {
+				shipping_methods[ $( target ).data( 'index' ) ] = $( target ).val();
+			} );
+
+			block( $( 'div.cart_totals' ) );
+
+			var data = {
+				security: wc_cart_params.update_shipping_method_nonce,
+				shipping_method: shipping_methods
+			};
+
+			$.ajax( {
+				type:     'post',
+				url:      get_url( 'update_shipping_method' ),
+				data:     data,
+				dataType: 'html',
+				success:  function( response ) {
+					update_cart_totals_div( response );
+				},
+				complete: function() {
+					unblock( $( 'div.cart_totals' ) );
+					$( document.body ).trigger( 'updated_shipping_method' );
+				}
+			} );
+		},
+
+		/**
+		 * Handles a shipping calculator form submit.
+		 *
+		 * @param {Object} evt The JQuery event.
+		 */
+		shipping_calculator_submit: function( evt ) {
+			evt.preventDefault();
+
+			var $form = $( evt.currentTarget );
+
+			block( $( 'div.cart_totals' ) );
+			block( $form );
+
+			// Provide the submit button value because wc-form-handler expects it.
+			$( '<input />' ).attr( 'type', 'hidden' )
+							.attr( 'name', 'calc_shipping' )
+							.attr( 'value', 'x' )
+							.appendTo( $form );
+
+			// Make call to actual form post URL.
+			$.ajax( {
+				type:     $form.attr( 'method' ),
+				url:      $form.attr( 'action' ),
+				data:     $form.serialize(),
+				dataType: 'html',
+				success:  function( response ) {
+					update_wc_div( response );
+				},
+				complete: function() {
+					unblock( $form );
+					unblock( $( 'div.cart_totals' ) );
+				}
+			} );
+		}
+	};
+
+	/**
+	 * Object to handle cart UI.
+	 */
+	var cart = {
+		/**
+		 * Initialize cart UI events.
+		 */
+		init: function() {
+			this.update_cart_totals    = this.update_cart_totals.bind( this );
+			this.input_keypress        = this.input_keypress.bind( this );
+			this.cart_submit           = this.cart_submit.bind( this );
+			this.submit_click          = this.submit_click.bind( this );
+			this.apply_coupon          = this.apply_coupon.bind( this );
+			this.remove_coupon_clicked = this.remove_coupon_clicked.bind( this );
+			this.quantity_update       = this.quantity_update.bind( this );
+			this.item_remove_clicked   = this.item_remove_clicked.bind( this );
+			this.update_cart           = this.update_cart.bind( this );
+
+			$( document ).on(
+				'wc_update_cart',
+				this.update_cart );
+			$( document ).on(
+				'click',
+				'.woocommerce-cart-form input[type=submit]',
+				this.submit_click );
+			$( document ).on(
+				'keypress',
+				'.woocommerce-cart-form input[type=number]',
+				this.input_keypress );
+			$( document ).on(
+				'submit',
+				'.woocommerce-cart-form',
+				this.cart_submit );
+			$( document ).on(
+				'click',
+				'a.woocommerce-remove-coupon',
+				this.remove_coupon_clicked );
+			$( document ).on(
+				'click',
+				'.woocommerce-cart-form .product-remove > a',
+				this.item_remove_clicked );
+			$( document ).on(
+				'change input',
+				'.woocommerce-cart-form .cart_item :input',
+				this.input_changed );
+
+			$( '.woocommerce-cart-form input[name="update_cart"]' ).prop( 'disabled', true );
+		},
+
+		/**
+		 * After an input is changed, enable the update cart button.
+		 */
+		input_changed: function() {
+			$( '.woocommerce-cart-form input[name="update_cart"]' ).prop( 'disabled', false );
+		},
+
+		/**
+		 * Update entire cart via ajax.
+		 */
+		update_cart: function( preserve_notices ) {
+			var $form = $( '.woocommerce-cart-form' );
+
+			block( $form );
+			block( $( 'div.cart_totals' ) );
+
+			// Make call to actual form post URL.
+			$.ajax( {
+				type:     $form.attr( 'method' ),
+				url:      $form.attr( 'action' ),
+				data:     $form.serialize(),
+				dataType: 'html',
+				success:  function( response ) {
+					update_wc_div( response, preserve_notices );
+				},
+				complete: function() {
+					unblock( $form );
+					unblock( $( 'div.cart_totals' ) );
+				}
+			} );
+		},
+
+		/**
+		 * Update the cart after something has changed.
+		 */
+		update_cart_totals: function() {
+			block( $( 'div.cart_totals' ) );
+
+			$.ajax( {
+				url:      get_url( 'get_cart_totals' ),
+				dataType: 'html',
+				success:  function( response ) {
+					update_cart_totals_div( response );
+				},
+				complete: function() {
+					unblock( $( 'div.cart_totals' ) );
+				}
+			} );
+		},
+
+		/**
+		 * Handle the <ENTER> key for quantity fields.
+		 *
+		 * @param {Object} evt The JQuery event
+		 *
+		 * For IE, if you hit enter on a quantity field, it makes the
+		 * document.activeElement the first submit button it finds.
+		 * For us, that is the Apply Coupon button. This is required
+		 * to catch the event before that happens.
+		 */
+		input_keypress: function( evt ) {
+
+			// Catch the enter key and don't let it submit the form.
+			if ( 13 === evt.keyCode ) {
+				evt.preventDefault();
+				this.cart_submit( evt );
+			}
+		},
+
+		/**
+		 * Handle cart form submit and route to correct logic.
+		 *
+		 * @param {Object} evt The JQuery event
+		 */
+		cart_submit: function( evt ) {
+			var $submit = $( document.activeElement );
+			var $clicked = $( 'input[type=submit][clicked=true]' );
+			var $form = $( evt.currentTarget );
+
+			// For submit events, currentTarget is form.
+			// For keypress events, currentTarget is input.
+			if ( ! $form.is( 'form' ) ) {
+				$form = $( evt.currentTarget ).parents( 'form' );
+			}
+
+			if ( 0 === $form.find( '.woocommerce-cart-form__contents' ).length ) {
+				return;
+			}
+
+			if ( is_blocked( $form ) ) {
+				return false;
+			}
+
+			if ( $clicked.is( 'input[name="update_cart"]' ) || $submit.is( 'input.qty' ) ) {
+				evt.preventDefault();
+				this.quantity_update( $form );
+
+			} else if ( $clicked.is( 'input[name="apply_coupon"]' ) || $submit.is( '#coupon_code' ) ) {
+				evt.preventDefault();
+				this.apply_coupon( $form );
+			}
+		},
+
+		/**
+		 * Special handling to identify which submit button was clicked.
+		 *
+		 * @param {Object} evt The JQuery event
+		 */
+		submit_click: function( evt ) {
+			$( 'input[type=submit]', $( evt.target ).parents( 'form' ) ).removeAttr( 'clicked' );
+			$( evt.target ).attr( 'clicked', 'true' );
+		},
+
+		/**
+		 * Apply Coupon code
+		 *
+		 * @param {JQuery Object} $form The cart form.
+		 */
+		apply_coupon: function( $form ) {
+			block( $form );
+
+			var cart = this;
+			var $text_field = $( '#coupon_code' );
+			var coupon_code = $text_field.val();
+
+			var data = {
+				security: wc_cart_params.apply_coupon_nonce,
+				coupon_code: coupon_code
+			};
+
+			$.ajax( {
+				type:     'POST',
+				url:      get_url( 'apply_coupon' ),
+				data:     data,
+				dataType: 'html',
+				success: function( response ) {
+					$( '.woocommerce-error, .woocommerce-message, .woocommerce-info' ).remove();
+					show_notice( response );
+					$( document.body ).trigger( 'applied_coupon', [ coupon_code ] );
+				},
+				complete: function() {
+					unblock( $form );
+					$text_field.val( '' );
+					cart.update_cart( true );
+				}
+			} );
+		},
+
+		/**
+		 * Handle when a remove coupon link is clicked.
+		 *
+		 * @param {Object} evt The JQuery event
+		 */
+		remove_coupon_clicked: function( evt ) {
+			evt.preventDefault();
+
+			var cart     = this;
+			var $wrapper = $( evt.currentTarget ).closest( '.cart_totals' );
+			var coupon   = $( evt.currentTarget ).attr( 'data-coupon' );
+
+			block( $wrapper );
+
+			var data = {
+				security: wc_cart_params.remove_coupon_nonce,
+				coupon: coupon
+			};
+
+			$.ajax( {
+				type:    'POST',
+				url:      get_url( 'remove_coupon' ),
+				data:     data,
+				dataType: 'html',
+				success: function( response ) {
+					$( '.woocommerce-error, .woocommerce-message, .woocommerce-info' ).remove();
+					show_notice( response );
+					$( document.body ).trigger( 'removed_coupon', [ coupon ] );
+					unblock( $wrapper );
+				},
+				complete: function() {
+					cart.update_cart( true );
+				}
+			} );
+		},
+
+		/**
+		 * Handle a cart Quantity Update
+		 *
+		 * @param {JQuery Object} $form The cart form.
+		 */
+		quantity_update: function( $form ) {
+			block( $form );
+			block( $( 'div.cart_totals' ) );
+
+			// Provide the submit button value because wc-form-handler expects it.
+			$( '<input />' ).attr( 'type', 'hidden' )
+							.attr( 'name', 'update_cart' )
+							.attr( 'value', 'Update Cart' )
+							.appendTo( $form );
+
+			// Make call to actual form post URL.
+			$.ajax( {
+				type:     $form.attr( 'method' ),
+				url:      $form.attr( 'action' ),
+				data:     $form.serialize(),
+				dataType: 'html',
+				success:  function( response ) {
+					update_wc_div( response );
+				},
+				complete: function() {
+					unblock( $form );
+					unblock( $( 'div.cart_totals' ) );
+				}
+			} );
+		},
+
+		/**
+		 * Handle when a remove item link is clicked.
+		 *
+		 * @param {Object} evt The JQuery event
+		 */
+		item_remove_clicked: function( evt ) {
+			evt.preventDefault();
+
+			var $a = $( evt.currentTarget );
+			var $form = $a.parents( 'form' );
+
+			block( $form );
+			block( $( 'div.cart_totals' ) );
+
+			$.ajax( {
+				type:     'GET',
+				url:      $a.attr( 'href' ),
+				dataType: 'html',
+				success: update_wc_div,
+				complete: function() {
+					unblock( $form );
+					unblock( $( 'div.cart_totals' ) );
+				}
+			} );
+		}
+	};
+
+	cart_shipping.init( cart );
+	cart.init();
+} );
diff --git a/assets/js/frontend/cart.min.js b/assets/js/frontend/cart.min.js
index a1a3317cac9..90f8a6123d2 100644
--- a/assets/js/frontend/cart.min.js
+++ b/assets/js/frontend/cart.min.js
@@ -1 +1 @@
-jQuery(function(a){return"undefined"==typeof wc_cart_params?!1:(a(document).on("click",".shipping-calculator-button",function(){return a(".shipping-calculator-form").slideToggle("slow"),!1}).on("change","select.shipping_method, input[name^=shipping_method]",function(){var b=[];a("select.shipping_method, input[name^=shipping_method][type=radio]:checked, input[name^=shipping_method][type=hidden]").each(function(){b[a(this).data("index")]=a(this).val()}),a("div.cart_totals").block({message:null,overlayCSS:{background:"#fff",opacity:.6}});var c={security:wc_cart_params.update_shipping_method_nonce,shipping_method:b};a.post(wc_cart_params.wc_ajax_url.toString().replace("%%endpoint%%","update_shipping_method"),c,function(b){a("div.cart_totals").replaceWith(b),a(document.body).trigger("updated_shipping_method")})}),void a(".shipping-calculator-form").hide())});
\ No newline at end of file
+jQuery(function(a){if("undefined"==typeof wc_cart_params)return!1;var b=function(a){return wc_cart_params.wc_ajax_url.toString().replace("%%endpoint%%",a)},c=function(a){return a.is(".processing")||a.parents(".processing").length},d=function(a){c(a)||a.addClass("processing").block({message:null,overlayCSS:{background:"#fff",opacity:.6}})},e=function(a){a.removeClass("processing").unblock()},f=function(b,c){var d=a.parseHTML(b),e=a(".woocommerce-cart-form",d),f=a(".cart_totals",d),i=a(".woocommerce-error, .woocommerce-message, .woocommerce-info",d);if(0===a(".woocommerce-cart-form").length)return void(window.location.href=window.location.href);if(c||a(".woocommerce-error, .woocommerce-message, .woocommerce-info").remove(),0===e.length){if(a(".woocommerce-checkout").length)return void(window.location.href=window.location.href);var j=a(".cart-empty",d).closest(".woocommerce");a(".woocommerce-cart-form__contents").closest(".woocommerce").replaceWith(j),i.length>0&&h(i,a(".cart-empty").closest(".woocommerce"))}else a(".woocommerce-checkout").length&&a(document.body).trigger("update_checkout"),a(".woocommerce-cart-form").replaceWith(e),a(".woocommerce-cart-form").find('input[name="update_cart"]').prop("disabled",!0),i.length>0&&h(i),g(f);a(document.body).trigger("updated_wc_div")},g=function(b){a(".cart_totals").replaceWith(b),a(document.body).trigger("updated_cart_totals")},h=function(b,c){c||(c=a(".woocommerce-cart-form")),c.before(b)},i={init:function(b){this.cart=b,this.toggle_shipping=this.toggle_shipping.bind(this),this.shipping_method_selected=this.shipping_method_selected.bind(this),this.shipping_calculator_submit=this.shipping_calculator_submit.bind(this),a(document).on("click",".shipping-calculator-button",this.toggle_shipping),a(document).on("change","select.shipping_method, input[name^=shipping_method]",this.shipping_method_selected),a(document).on("submit","form.woocommerce-shipping-calculator",this.shipping_calculator_submit),a(".shipping-calculator-form").hide()},toggle_shipping:function(){return a(".shipping-calculator-form").slideToggle("slow"),!1},shipping_method_selected:function(c){var f=c.currentTarget,h={};a("select.shipping_method, input[name^=shipping_method][type=radio]:checked, input[name^=shipping_method][type=hidden]").each(function(){h[a(f).data("index")]=a(f).val()}),d(a("div.cart_totals"));var i={security:wc_cart_params.update_shipping_method_nonce,shipping_method:h};a.ajax({type:"post",url:b("update_shipping_method"),data:i,dataType:"html",success:function(a){g(a)},complete:function(){e(a("div.cart_totals")),a(document.body).trigger("updated_shipping_method")}})},shipping_calculator_submit:function(b){b.preventDefault();var c=a(b.currentTarget);d(a("div.cart_totals")),d(c),a("<input />").attr("type","hidden").attr("name","calc_shipping").attr("value","x").appendTo(c),a.ajax({type:c.attr("method"),url:c.attr("action"),data:c.serialize(),dataType:"html",success:function(a){f(a)},complete:function(){e(c),e(a("div.cart_totals"))}})}},j={init:function(){this.update_cart_totals=this.update_cart_totals.bind(this),this.input_keypress=this.input_keypress.bind(this),this.cart_submit=this.cart_submit.bind(this),this.submit_click=this.submit_click.bind(this),this.apply_coupon=this.apply_coupon.bind(this),this.remove_coupon_clicked=this.remove_coupon_clicked.bind(this),this.quantity_update=this.quantity_update.bind(this),this.item_remove_clicked=this.item_remove_clicked.bind(this),this.update_cart=this.update_cart.bind(this),a(document).on("wc_update_cart",this.update_cart),a(document).on("click",".woocommerce-cart-form input[type=submit]",this.submit_click),a(document).on("keypress",".woocommerce-cart-form input[type=number]",this.input_keypress),a(document).on("submit",".woocommerce-cart-form",this.cart_submit),a(document).on("click","a.woocommerce-remove-coupon",this.remove_coupon_clicked),a(document).on("click",".woocommerce-cart-form .product-remove > a",this.item_remove_clicked),a(document).on("change input",".woocommerce-cart-form .cart_item :input",this.input_changed),a('.woocommerce-cart-form input[name="update_cart"]').prop("disabled",!0)},input_changed:function(){a('.woocommerce-cart-form input[name="update_cart"]').prop("disabled",!1)},update_cart:function(b){var c=a(".woocommerce-cart-form");d(c),d(a("div.cart_totals")),a.ajax({type:c.attr("method"),url:c.attr("action"),data:c.serialize(),dataType:"html",success:function(a){f(a,b)},complete:function(){e(c),e(a("div.cart_totals"))}})},update_cart_totals:function(){d(a("div.cart_totals")),a.ajax({url:b("get_cart_totals"),dataType:"html",success:function(a){g(a)},complete:function(){e(a("div.cart_totals"))}})},input_keypress:function(a){13===a.keyCode&&(a.preventDefault(),this.cart_submit(a))},cart_submit:function(b){var d=a(document.activeElement),e=a("input[type=submit][clicked=true]"),f=a(b.currentTarget);if(f.is("form")||(f=a(b.currentTarget).parents("form")),0!==f.find(".woocommerce-cart-form__contents").length)return!c(f)&&void(e.is('input[name="update_cart"]')||d.is("input.qty")?(b.preventDefault(),this.quantity_update(f)):(e.is('input[name="apply_coupon"]')||d.is("#coupon_code"))&&(b.preventDefault(),this.apply_coupon(f)))},submit_click:function(b){a("input[type=submit]",a(b.target).parents("form")).removeAttr("clicked"),a(b.target).attr("clicked","true")},apply_coupon:function(c){d(c);var f=this,g=a("#coupon_code"),i=g.val(),j={security:wc_cart_params.apply_coupon_nonce,coupon_code:i};a.ajax({type:"POST",url:b("apply_coupon"),data:j,dataType:"html",success:function(b){a(".woocommerce-error, .woocommerce-message, .woocommerce-info").remove(),h(b),a(document.body).trigger("applied_coupon",[i])},complete:function(){e(c),g.val(""),f.update_cart(!0)}})},remove_coupon_clicked:function(c){c.preventDefault();var f=this,g=a(c.currentTarget).closest(".cart_totals"),i=a(c.currentTarget).attr("data-coupon");d(g);var j={security:wc_cart_params.remove_coupon_nonce,coupon:i};a.ajax({type:"POST",url:b("remove_coupon"),data:j,dataType:"html",success:function(b){a(".woocommerce-error, .woocommerce-message, .woocommerce-info").remove(),h(b),a(document.body).trigger("removed_coupon",[i]),e(g)},complete:function(){f.update_cart(!0)}})},quantity_update:function(b){d(b),d(a("div.cart_totals")),a("<input />").attr("type","hidden").attr("name","update_cart").attr("value","Update Cart").appendTo(b),a.ajax({type:b.attr("method"),url:b.attr("action"),data:b.serialize(),dataType:"html",success:function(a){f(a)},complete:function(){e(b),e(a("div.cart_totals"))}})},item_remove_clicked:function(b){b.preventDefault();var c=a(b.currentTarget),g=c.parents("form");d(g),d(a("div.cart_totals")),a.ajax({type:"GET",url:c.attr("href"),dataType:"html",success:f,complete:function(){e(g),e(a("div.cart_totals"))}})}};i.init(j),j.init()});
\ No newline at end of file
diff --git a/assets/js/frontend/checkout.js b/assets/js/frontend/checkout.js
index 6c98c94938f..d48ac40f2ff 100644
--- a/assets/js/frontend/checkout.js
+++ b/assets/js/frontend/checkout.js
@@ -25,17 +25,20 @@ jQuery( function( $ ) {
 				this.$order_review.on( 'click', 'input[name="payment_method"]', this.payment_method_selected );
 			}
 
+			// Prevent HTML5 validation which can conflict.
+			this.$checkout_form.attr( 'novalidate', 'novalidate' );
+
 			// Form submission
 			this.$checkout_form.on( 'submit', this.submit );
 
 			// Inline validation
-			this.$checkout_form.on( 'blur change', '.input-text, select', this.validate_field );
+			this.$checkout_form.on( 'input blur change', '.input-text, select, input:checkbox', this.validate_field );
 
 			// Manual trigger
 			this.$checkout_form.on( 'update', this.trigger_update_checkout );
 
 			// Inputs/selects which update totals
-			this.$checkout_form.on( 'change', 'select.shipping_method, input[name^="shipping_method"], #ship-to-different-address input, .update_totals_on_change select, .update_totals_on_change input[type="radio"]', this.trigger_update_checkout );
+			this.$checkout_form.on( 'change', 'select.shipping_method, input[name^="shipping_method"], #ship-to-different-address input, .update_totals_on_change select, .update_totals_on_change input[type="radio"], .update_totals_on_change input[type="checkbox"]', this.trigger_update_checkout );
 			this.$checkout_form.on( 'change', '.address-field select', this.input_changed );
 			this.$checkout_form.on( 'change', '.address-field input.input-text, .update_totals_on_change input.input-text', this.maybe_input_changed );
 			this.$checkout_form.on( 'change keydown', '.address-field input.input-text, .update_totals_on_change input.input-text', this.queue_update_checkout );
@@ -55,24 +58,29 @@ jQuery( function( $ ) {
 				$( 'input#createaccount' ).change( this.toggle_create_account ).change();
 			}
 		},
-		init_payment_methods: function() {
+		init_payment_methods: function( selectedPaymentMethod ) {
 			var $payment_methods = $( '.woocommerce-checkout' ).find( 'input[name="payment_method"]' );
 
 			// If there is one method, we can hide the radio input
-			if ( 1 === $payment_methods.size() ) {
+			if ( 1 === $payment_methods.length ) {
 				$payment_methods.eq(0).hide();
 			}
 
+			// If there was a previously selected method, check that one.
+			if ( selectedPaymentMethod ) {
+				$( '#' + selectedPaymentMethod ).prop( 'checked', true );
+			}
+
 			// If there are none selected, select the first.
-			if ( 0 === $payment_methods.filter( ':checked' ).size() ) {
-				$payment_methods.eq(0).attr( 'checked', 'checked' );
+			if ( 0 === $payment_methods.filter( ':checked' ).length ) {
+				$payment_methods.eq(0).prop( 'checked', true );
 			}
 
 			// Trigger click event for selected method
 			$payment_methods.filter( ':checked' ).eq(0).trigger( 'click' );
 		},
 		get_payment_method: function() {
-			return wc_checkout_form.$order_review.find( 'input[name="payment_method"]:checked' ).val();
+			return wc_checkout_form.$checkout_form.find( 'input[name="payment_method"]:checked' ).val();
 		},
 		payment_method_selected: function() {
 			if ( $( '.payment_methods input.input-radio' ).length > 1 ) {
@@ -99,6 +107,8 @@ jQuery( function( $ ) {
 			$( 'div.create-account' ).hide();
 
 			if ( $( this ).is( ':checked' ) ) {
+				// Ensure password is not pre-populated.
+				$( '#account_password' ).val( '' ).change();
 				$( 'div.create-account' ).slideDown();
 			}
 		},
@@ -134,10 +144,10 @@ jQuery( function( $ ) {
 		maybe_update_checkout: function() {
 			var update_totals = true;
 
-			if ( $( wc_checkout_form.dirtyInput ).size() ) {
+			if ( $( wc_checkout_form.dirtyInput ).length ) {
 				var $required_inputs = $( wc_checkout_form.dirtyInput ).closest( 'div' ).find( '.address-field.validate-required' );
 
-				if ( $required_inputs.size() ) {
+				if ( $required_inputs.length ) {
 					$required_inputs.each( function() {
 						if ( $( this ).find( 'input.input-text' ).val() === '' ) {
 							update_totals = false;
@@ -158,36 +168,45 @@ jQuery( function( $ ) {
 		reset_update_checkout_timer: function() {
 			clearTimeout( wc_checkout_form.updateTimer );
 		},
-		validate_field: function() {
-			var $this     = $( this ),
-				$parent   = $this.closest( '.form-row' ),
-				validated = true;
+		validate_field: function( e ) {
+			var $this             = $( this ),
+				$parent           = $this.closest( '.form-row' ),
+				validated         = true,
+				validate_required = $parent.is( '.validate-required' ),
+				validate_email    = $parent.is( '.validate-email' ),
+				event_type        = e.type;
 
-			if ( $parent.is( '.validate-required' ) ) {
-				if ( 'checkbox' === $this.attr( 'type' ) && ! $this.is( ':checked' ) ) {
-					$parent.removeClass( 'woocommerce-validated' ).addClass( 'woocommerce-invalid woocommerce-invalid-required-field' );
-					validated = false;
-				} else if ( $this.val() === '' ) {
-					$parent.removeClass( 'woocommerce-validated' ).addClass( 'woocommerce-invalid woocommerce-invalid-required-field' );
-					validated = false;
-				}
+			if ( 'input' === event_type ) {
+				$parent.removeClass( 'woocommerce-invalid woocommerce-invalid-required-field woocommerce-invalid-email woocommerce-validated' );
 			}
 
-			if ( $parent.is( '.validate-email' ) ) {
-				if ( $this.val() ) {
+			if ( 'focusout' === event_type || 'change' === event_type ) {
 
-					/* http://stackoverflow.com/questions/2855865/jquery-validate-e-mail-address-regex */
-					var pattern = new RegExp(/^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i);
-
-					if ( ! pattern.test( $this.val()  ) ) {
-						$parent.removeClass( 'woocommerce-validated' ).addClass( 'woocommerce-invalid woocommerce-invalid-email' );
+				if ( validate_required ) {
+					if ( 'checkbox' === $this.attr( 'type' ) && ! $this.is( ':checked' ) ) {
+						$parent.removeClass( 'woocommerce-validated' ).addClass( 'woocommerce-invalid woocommerce-invalid-required-field' );
+						validated = false;
+					} else if ( $this.val() === '' ) {
+						$parent.removeClass( 'woocommerce-validated' ).addClass( 'woocommerce-invalid woocommerce-invalid-required-field' );
 						validated = false;
 					}
 				}
-			}
 
-			if ( validated ) {
-				$parent.removeClass( 'woocommerce-invalid woocommerce-invalid-required-field' ).addClass( 'woocommerce-validated' );
+				if ( validate_email ) {
+					if ( $this.val() ) {
+						/* https://stackoverflow.com/questions/2855865/jquery-validate-e-mail-address-regex */
+						var pattern = new RegExp(/^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i);
+
+						if ( ! pattern.test( $this.val()  ) ) {
+							$parent.removeClass( 'woocommerce-validated' ).addClass( 'woocommerce-invalid woocommerce-invalid-email' );
+							validated = false;
+						}
+					}
+				}
+
+				if ( validated ) {
+					$parent.removeClass( 'woocommerce-invalid woocommerce-invalid-required-field woocommerce-invalid-email' ).addClass( 'woocommerce-validated' );
+				}
 			}
 		},
 		update_checkout: function( event, args ) {
@@ -200,7 +219,7 @@ jQuery( function( $ ) {
 				wc_checkout_form.xhr.abort();
 			}
 
-			if ( $( 'form.checkout' ).size() === 0 ) {
+			if ( $( 'form.checkout' ).length === 0 ) {
 				return;
 			}
 
@@ -249,7 +268,7 @@ jQuery( function( $ ) {
 			};
 
 			if ( false !== args.update_shipping_method ) {
-				var shipping_methods = [];
+				var shipping_methods = {};
 
 				$( 'select.shipping_method, input[name^="shipping_method"][type="radio"]:checked, input[name^="shipping_method"][type="hidden"]' ).each( function() {
 					shipping_methods[ $( this ).data( 'index' ) ] = $( this ).val();
@@ -271,12 +290,34 @@ jQuery( function( $ ) {
 				url:		wc_checkout_params.wc_ajax_url.toString().replace( '%%endpoint%%', 'update_order_review' ),
 				data:		data,
 				success:	function( data ) {
+
+					var selectedPaymentMethod = $( '.woocommerce-checkout input[name="payment_method"]:checked' ).attr( 'id' );
+
 					// Reload the page if requested
-					if ( 'true' === data.reload ) {
+					if ( true === data.reload ) {
 						window.location.reload();
 						return;
 					}
 
+					// Remove any notices added previously
+					$( '.woocommerce-NoticeGroup-updateOrderReview' ).remove();
+
+					var termsCheckBoxChecked = $( '#terms' ).prop( 'checked' );
+
+					// Save payment details to a temporary object
+					var paymentDetails = {};
+					$( '.payment_box input' ).each( function() {
+						var ID = $( this ).attr( 'id' );
+
+						if ( ID ) {
+							if ( $.inArray( $( this ).attr( 'type' ), [ 'checkbox', 'radio' ] ) !== -1 ) {
+								paymentDetails[ ID ] = $( this ).prop( 'checked' );
+							} else {
+								paymentDetails[ ID ] = $( this ).val();
+							}
+						}
+					});
+
 					// Always update the fragments
 					if ( data && data.fragments ) {
 						$.each( data.fragments, function ( key, value ) {
@@ -285,22 +326,43 @@ jQuery( function( $ ) {
 						} );
 					}
 
+					// Recheck the terms and conditions box, if needed
+					if ( termsCheckBoxChecked ) {
+						$( '#terms' ).prop( 'checked', true );
+					}
+
+					// Fill in the payment details if possible
+					if ( ! $.isEmptyObject( paymentDetails ) ) {
+						$( '.payment_box input' ).each( function() {
+							var ID = $( this ).attr( 'id' );
+
+							if ( ID ) {
+								if ( $.inArray( $( this ).attr( 'type' ), [ 'checkbox', 'radio' ] ) !== -1 ) {
+									$( this ).prop( 'checked', paymentDetails[ ID ] ).change();
+								} else {
+									$( this ).val( paymentDetails[ ID ] ).change();
+								}
+							}
+						});
+					}
+
 					// Check for error
 					if ( 'failure' === data.result ) {
 
 						var $form = $( 'form.checkout' );
 
+						// Remove notices from all sources
 						$( '.woocommerce-error, .woocommerce-message' ).remove();
 
-						// Add new errors
+						// Add new errors returned by this event
 						if ( data.messages ) {
-							$form.prepend( data.messages );
+							$form.prepend( '<div class="woocommerce-NoticeGroup woocommerce-NoticeGroup-updateOrderReview">' + data.messages + '</div>' );
 						} else {
 							$form.prepend( data );
 						}
 
 						// Lose focus for all fields
-						$form.find( '.input-text, select' ).blur();
+						$form.find( '.input-text, select, input:checkbox' ).blur();
 
 						// Scroll to top
 						$( 'html, body' ).animate( {
@@ -309,11 +371,11 @@ jQuery( function( $ ) {
 
 					}
 
-					// re-init methods
-					wc_checkout_form.init_payment_methods();
+					// Re-init methods
+					wc_checkout_form.init_payment_methods( selectedPaymentMethod );
 
-					// Fire updated_checkout e
-					$( document.body ).trigger( 'updated_checkout' );
+					// Fire updated_checkout event.
+					$( document.body ).trigger( 'updated_checkout', [ data ] );
 				}
 
 			});
@@ -352,7 +414,7 @@ jQuery( function( $ ) {
 						}
 
 						try {
-							// check for valid JSON
+							// Check for valid JSON
 							var data = $.parseJSON( raw_response );
 
 							if ( data && 'object' === typeof data ) {
@@ -363,7 +425,7 @@ jQuery( function( $ ) {
 
 						} catch ( e ) {
 
-							// attempt to fix the malformed JSON
+							// Attempt to fix the malformed JSON
 							var valid_json = raw_response.match( /{"result.*"}/ );
 
 							if ( null === valid_json ) {
@@ -386,26 +448,26 @@ jQuery( function( $ ) {
 					dataType:   'json',
 					success:	function( result ) {
 						try {
-							if ( result.result === 'success' ) {
+							if ( 'success' === result.result ) {
 								if ( -1 === result.redirect.indexOf( 'https://' ) || -1 === result.redirect.indexOf( 'http://' ) ) {
 									window.location = result.redirect;
 								} else {
 									window.location = decodeURI( result.redirect );
 								}
-							} else if ( result.result === 'failure' ) {
+							} else if ( 'failure' === result.result ) {
 								throw 'Result failure';
 							} else {
 								throw 'Invalid response';
 							}
 						} catch( err ) {
 							// Reload page
-							if ( result.reload === 'true' ) {
+							if ( true === result.reload ) {
 								window.location.reload();
 								return;
 							}
 
 							// Trigger update in case we need a fresh nonce
-							if ( result.refresh === 'true' ) {
+							if ( true === result.refresh ) {
 								$( document.body ).trigger( 'update_checkout' );
 							}
 
@@ -426,10 +488,10 @@ jQuery( function( $ ) {
 			return false;
 		},
 		submit_error: function( error_message ) {
-			$( '.woocommerce-error, .woocommerce-message' ).remove();
-			wc_checkout_form.$checkout_form.prepend( error_message );
+			$( '.woocommerce-NoticeGroup-checkout, .woocommerce-error, .woocommerce-message' ).remove();
+			wc_checkout_form.$checkout_form.prepend( '<div class="woocommerce-NoticeGroup woocommerce-NoticeGroup-checkout">' + error_message + '</div>' );
 			wc_checkout_form.$checkout_form.removeClass( 'processing' ).unblock();
-			wc_checkout_form.$checkout_form.find( '.input-text, select' ).blur();
+			wc_checkout_form.$checkout_form.find( '.input-text, select, input:checkbox' ).blur();
 			$( 'html, body' ).animate({
 				scrollTop: ( $( 'form.checkout' ).offset().top - 100 )
 			}, 1000 );
@@ -521,13 +583,13 @@ jQuery( function( $ ) {
 
 						$( document.body ).trigger( 'update_checkout', { update_shipping_method: false } );
 
-						// remove coupon code from coupon field
+						// Remove coupon code from coupon field
 						$( 'form.checkout_coupon' ).find( 'input[name="coupon_code"]' ).val( '' );
 					}
 				},
 				error: function ( jqXHR ) {
 					if ( wc_checkout_params.debug_mode ) {
-						/*jshint devel: true */
+						/* jshint devel: true */
 						console.log( jqXHR.responseText );
 					}
 				},
@@ -541,7 +603,18 @@ jQuery( function( $ ) {
 			$( document.body ).on( 'click', 'a.showlogin', this.show_login_form );
 		},
 		show_login_form: function() {
-			$( 'form.login' ).slideToggle();
+			$( 'form.login, form.woocommerce-form--login' ).slideToggle();
+			return false;
+		}
+	};
+
+	var wc_terms_toggle = {
+		init: function() {
+			$( document.body ).on( 'click', 'a.woocommerce-terms-and-conditions-link', this.toggle_terms );
+		},
+
+		toggle_terms: function() {
+			$( '.woocommerce-terms-and-conditions' ).slideToggle();
 			return false;
 		}
 	};
@@ -549,4 +622,5 @@ jQuery( function( $ ) {
 	wc_checkout_form.init();
 	wc_checkout_coupons.init();
 	wc_checkout_login_form.init();
+	wc_terms_toggle.init();
 });
diff --git a/assets/js/frontend/checkout.min.js b/assets/js/frontend/checkout.min.js
index a59b3e731ee..52f7fcc6ebb 100644
--- a/assets/js/frontend/checkout.min.js
+++ b/assets/js/frontend/checkout.min.js
@@ -1 +1 @@
-jQuery(function(a){if("undefined"==typeof wc_checkout_params)return!1;a.blockUI.defaults.overlayCSS.cursor="default";var b={updateTimer:!1,dirtyInput:!1,xhr:!1,$order_review:a("#order_review"),$checkout_form:a("form.checkout"),init:function(){a(document.body).bind("update_checkout",this.update_checkout),a(document.body).bind("init_checkout",this.init_checkout),this.$checkout_form.on("click",'input[name="payment_method"]',this.payment_method_selected),a(document.body).hasClass("woocommerce-order-pay")&&this.$order_review.on("click",'input[name="payment_method"]',this.payment_method_selected),this.$checkout_form.on("submit",this.submit),this.$checkout_form.on("blur change",".input-text, select",this.validate_field),this.$checkout_form.on("update",this.trigger_update_checkout),this.$checkout_form.on("change",'select.shipping_method, input[name^="shipping_method"], #ship-to-different-address input, .update_totals_on_change select, .update_totals_on_change input[type="radio"]',this.trigger_update_checkout),this.$checkout_form.on("change",".address-field select",this.input_changed),this.$checkout_form.on("change",".address-field input.input-text, .update_totals_on_change input.input-text",this.maybe_input_changed),this.$checkout_form.on("change keydown",".address-field input.input-text, .update_totals_on_change input.input-text",this.queue_update_checkout),this.$checkout_form.on("change","#ship-to-different-address input",this.ship_to_different_address),this.$checkout_form.find("#ship-to-different-address input").change(),this.init_payment_methods(),"1"===wc_checkout_params.is_checkout&&a(document.body).trigger("init_checkout"),"yes"===wc_checkout_params.option_guest_checkout&&a("input#createaccount").change(this.toggle_create_account).change()},init_payment_methods:function(){var b=a(".woocommerce-checkout").find('input[name="payment_method"]');1===b.size()&&b.eq(0).hide(),0===b.filter(":checked").size()&&b.eq(0).attr("checked","checked"),b.filter(":checked").eq(0).trigger("click")},get_payment_method:function(){return b.$order_review.find('input[name="payment_method"]:checked').val()},payment_method_selected:function(){if(a(".payment_methods input.input-radio").length>1){var b=a("div.payment_box."+a(this).attr("ID"));a(this).is(":checked")&&!b.is(":visible")&&(a("div.payment_box").filter(":visible").slideUp(250),a(this).is(":checked")&&a("div.payment_box."+a(this).attr("ID")).slideDown(250))}else a("div.payment_box").show();a(this).data("order_button_text")?a("#place_order").val(a(this).data("order_button_text")):a("#place_order").val(a("#place_order").data("value"))},toggle_create_account:function(){a("div.create-account").hide(),a(this).is(":checked")&&a("div.create-account").slideDown()},init_checkout:function(){a("#billing_country, #shipping_country, .country_to_state").change(),a(document.body).trigger("update_checkout")},maybe_input_changed:function(a){b.dirtyInput&&b.input_changed(a)},input_changed:function(a){b.dirtyInput=a.target,b.maybe_update_checkout()},queue_update_checkout:function(a){var c=a.keyCode||a.which||0;return 9===c?!0:(b.dirtyInput=this,b.reset_update_checkout_timer(),void(b.updateTimer=setTimeout(b.maybe_update_checkout,"1000")))},trigger_update_checkout:function(){b.reset_update_checkout_timer(),b.dirtyInput=!1,a(document.body).trigger("update_checkout")},maybe_update_checkout:function(){var c=!0;if(a(b.dirtyInput).size()){var d=a(b.dirtyInput).closest("div").find(".address-field.validate-required");d.size()&&d.each(function(){""===a(this).find("input.input-text").val()&&(c=!1)})}c&&b.trigger_update_checkout()},ship_to_different_address:function(){a("div.shipping_address").hide(),a(this).is(":checked")&&a("div.shipping_address").slideDown()},reset_update_checkout_timer:function(){clearTimeout(b.updateTimer)},validate_field:function(){var b=a(this),c=b.closest(".form-row"),d=!0;if(c.is(".validate-required")&&("checkbox"!==b.attr("type")||b.is(":checked")?""===b.val()&&(c.removeClass("woocommerce-validated").addClass("woocommerce-invalid woocommerce-invalid-required-field"),d=!1):(c.removeClass("woocommerce-validated").addClass("woocommerce-invalid woocommerce-invalid-required-field"),d=!1)),c.is(".validate-email")&&b.val()){var e=new RegExp(/^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i);e.test(b.val())||(c.removeClass("woocommerce-validated").addClass("woocommerce-invalid woocommerce-invalid-email"),d=!1)}d&&c.removeClass("woocommerce-invalid woocommerce-invalid-required-field").addClass("woocommerce-validated")},update_checkout:function(a,c){b.reset_update_checkout_timer(),b.updateTimer=setTimeout(b.update_checkout_action,"5",c)},update_checkout_action:function(c){if(b.xhr&&b.xhr.abort(),0!==a("form.checkout").size()){c="undefined"!=typeof c?c:{update_shipping_method:!0};var d=a("#billing_country").val(),e=a("#billing_state").val(),f=a("input#billing_postcode").val(),g=a("#billing_city").val(),h=a("input#billing_address_1").val(),i=a("input#billing_address_2").val(),j=d,k=e,l=f,m=g,n=h,o=i;a("#ship-to-different-address").find("input").is(":checked")&&(j=a("#shipping_country").val(),k=a("#shipping_state").val(),l=a("input#shipping_postcode").val(),m=a("#shipping_city").val(),n=a("input#shipping_address_1").val(),o=a("input#shipping_address_2").val());var p={security:wc_checkout_params.update_order_review_nonce,payment_method:b.get_payment_method(),country:d,state:e,postcode:f,city:g,address:h,address_2:i,s_country:j,s_state:k,s_postcode:l,s_city:m,s_address:n,s_address_2:o,post_data:a("form.checkout").serialize()};if(!1!==c.update_shipping_method){var q=[];a('select.shipping_method, input[name^="shipping_method"][type="radio"]:checked, input[name^="shipping_method"][type="hidden"]').each(function(){q[a(this).data("index")]=a(this).val()}),p.shipping_method=q}a(".woocommerce-checkout-payment, .woocommerce-checkout-review-order-table").block({message:null,overlayCSS:{background:"#fff",opacity:.6}}),b.xhr=a.ajax({type:"POST",url:wc_checkout_params.wc_ajax_url.toString().replace("%%endpoint%%","update_order_review"),data:p,success:function(c){if("true"===c.reload)return void window.location.reload();if(c&&c.fragments&&a.each(c.fragments,function(b,c){a(b).replaceWith(c),a(b).unblock()}),"failure"===c.result){var d=a("form.checkout");a(".woocommerce-error, .woocommerce-message").remove(),c.messages?d.prepend(c.messages):d.prepend(c),d.find(".input-text, select").blur(),a("html, body").animate({scrollTop:a("form.checkout").offset().top-100},1e3)}b.init_payment_methods(),a(document.body).trigger("updated_checkout")}})}},submit:function(){b.reset_update_checkout_timer();var c=a(this);if(c.is(".processing"))return!1;if(c.triggerHandler("checkout_place_order")!==!1&&c.triggerHandler("checkout_place_order_"+b.get_payment_method())!==!1){c.addClass("processing");var d=c.data();1!==d["blockUI.isBlocked"]&&c.block({message:null,overlayCSS:{background:"#fff",opacity:.6}}),a.ajaxSetup({dataFilter:function(b,c){if("json"!==c)return b;try{var d=a.parseJSON(b);if(d&&"object"==typeof d)return b}catch(e){var f=b.match(/{"result.*"}/);null===f?console.log("Unable to fix malformed JSON"):(console.log("Fixed malformed JSON. Original:"),console.log(b),b=f[0])}return b}}),a.ajax({type:"POST",url:wc_checkout_params.checkout_url,data:c.serialize(),dataType:"json",success:function(c){try{if("success"!==c.result)throw"failure"===c.result?"Result failure":"Invalid response";-1===c.redirect.indexOf("https://")||-1===c.redirect.indexOf("http://")?window.location=c.redirect:window.location=decodeURI(c.redirect)}catch(d){if("true"===c.reload)return void window.location.reload();"true"===c.refresh&&a(document.body).trigger("update_checkout"),c.messages?b.submit_error(c.messages):b.submit_error('<div class="woocommerce-error">'+wc_checkout_params.i18n_checkout_error+"</div>")}},error:function(a,c,d){b.submit_error('<div class="woocommerce-error">'+d+"</div>")}})}return!1},submit_error:function(c){a(".woocommerce-error, .woocommerce-message").remove(),b.$checkout_form.prepend(c),b.$checkout_form.removeClass("processing").unblock(),b.$checkout_form.find(".input-text, select").blur(),a("html, body").animate({scrollTop:a("form.checkout").offset().top-100},1e3),a(document.body).trigger("checkout_error")}},c={init:function(){a(document.body).on("click","a.showcoupon",this.show_coupon_form),a(document.body).on("click",".woocommerce-remove-coupon",this.remove_coupon),a("form.checkout_coupon").hide().submit(this.submit)},show_coupon_form:function(){return a(".checkout_coupon").slideToggle(400,function(){a(".checkout_coupon").find(":input:eq(0)").focus()}),!1},submit:function(){var b=a(this);if(b.is(".processing"))return!1;b.addClass("processing").block({message:null,overlayCSS:{background:"#fff",opacity:.6}});var c={security:wc_checkout_params.apply_coupon_nonce,coupon_code:b.find('input[name="coupon_code"]').val()};return a.ajax({type:"POST",url:wc_checkout_params.wc_ajax_url.toString().replace("%%endpoint%%","apply_coupon"),data:c,success:function(c){a(".woocommerce-error, .woocommerce-message").remove(),b.removeClass("processing").unblock(),c&&(b.before(c),b.slideUp(),a(document.body).trigger("update_checkout",{update_shipping_method:!1}))},dataType:"html"}),!1},remove_coupon:function(b){b.preventDefault();var c=a(this).parents(".woocommerce-checkout-review-order"),d=a(this).data("coupon");c.addClass("processing").block({message:null,overlayCSS:{background:"#fff",opacity:.6}});var e={security:wc_checkout_params.remove_coupon_nonce,coupon:d};a.ajax({type:"POST",url:wc_checkout_params.wc_ajax_url.toString().replace("%%endpoint%%","remove_coupon"),data:e,success:function(b){a(".woocommerce-error, .woocommerce-message").remove(),c.removeClass("processing").unblock(),b&&(a("form.woocommerce-checkout").before(b),a(document.body).trigger("update_checkout",{update_shipping_method:!1}),a("form.checkout_coupon").find('input[name="coupon_code"]').val(""))},error:function(a){wc_checkout_params.debug_mode&&console.log(a.responseText)},dataType:"html"})}},d={init:function(){a(document.body).on("click","a.showlogin",this.show_login_form)},show_login_form:function(){return a("form.login").slideToggle(),!1}};b.init(),c.init(),d.init()});
\ No newline at end of file
+jQuery(function(a){if("undefined"==typeof wc_checkout_params)return!1;a.blockUI.defaults.overlayCSS.cursor="default";var b={updateTimer:!1,dirtyInput:!1,xhr:!1,$order_review:a("#order_review"),$checkout_form:a("form.checkout"),init:function(){a(document.body).bind("update_checkout",this.update_checkout),a(document.body).bind("init_checkout",this.init_checkout),this.$checkout_form.on("click",'input[name="payment_method"]',this.payment_method_selected),a(document.body).hasClass("woocommerce-order-pay")&&this.$order_review.on("click",'input[name="payment_method"]',this.payment_method_selected),this.$checkout_form.attr("novalidate","novalidate"),this.$checkout_form.on("submit",this.submit),this.$checkout_form.on("input blur change",".input-text, select, input:checkbox",this.validate_field),this.$checkout_form.on("update",this.trigger_update_checkout),this.$checkout_form.on("change",'select.shipping_method, input[name^="shipping_method"], #ship-to-different-address input, .update_totals_on_change select, .update_totals_on_change input[type="radio"], .update_totals_on_change input[type="checkbox"]',this.trigger_update_checkout),this.$checkout_form.on("change",".address-field select",this.input_changed),this.$checkout_form.on("change",".address-field input.input-text, .update_totals_on_change input.input-text",this.maybe_input_changed),this.$checkout_form.on("change keydown",".address-field input.input-text, .update_totals_on_change input.input-text",this.queue_update_checkout),this.$checkout_form.on("change","#ship-to-different-address input",this.ship_to_different_address),this.$checkout_form.find("#ship-to-different-address input").change(),this.init_payment_methods(),"1"===wc_checkout_params.is_checkout&&a(document.body).trigger("init_checkout"),"yes"===wc_checkout_params.option_guest_checkout&&a("input#createaccount").change(this.toggle_create_account).change()},init_payment_methods:function(b){var c=a(".woocommerce-checkout").find('input[name="payment_method"]');1===c.length&&c.eq(0).hide(),b&&a("#"+b).prop("checked",!0),0===c.filter(":checked").length&&c.eq(0).prop("checked",!0),c.filter(":checked").eq(0).trigger("click")},get_payment_method:function(){return b.$checkout_form.find('input[name="payment_method"]:checked').val()},payment_method_selected:function(){if(a(".payment_methods input.input-radio").length>1){var b=a("div.payment_box."+a(this).attr("ID"));a(this).is(":checked")&&!b.is(":visible")&&(a("div.payment_box").filter(":visible").slideUp(250),a(this).is(":checked")&&a("div.payment_box."+a(this).attr("ID")).slideDown(250))}else a("div.payment_box").show();a(this).data("order_button_text")?a("#place_order").val(a(this).data("order_button_text")):a("#place_order").val(a("#place_order").data("value"))},toggle_create_account:function(){a("div.create-account").hide(),a(this).is(":checked")&&(a("#account_password").val("").change(),a("div.create-account").slideDown())},init_checkout:function(){a("#billing_country, #shipping_country, .country_to_state").change(),a(document.body).trigger("update_checkout")},maybe_input_changed:function(a){b.dirtyInput&&b.input_changed(a)},input_changed:function(a){b.dirtyInput=a.target,b.maybe_update_checkout()},queue_update_checkout:function(a){var c=a.keyCode||a.which||0;return 9===c||(b.dirtyInput=this,b.reset_update_checkout_timer(),void(b.updateTimer=setTimeout(b.maybe_update_checkout,"1000")))},trigger_update_checkout:function(){b.reset_update_checkout_timer(),b.dirtyInput=!1,a(document.body).trigger("update_checkout")},maybe_update_checkout:function(){var c=!0;if(a(b.dirtyInput).length){var d=a(b.dirtyInput).closest("div").find(".address-field.validate-required");d.length&&d.each(function(){""===a(this).find("input.input-text").val()&&(c=!1)})}c&&b.trigger_update_checkout()},ship_to_different_address:function(){a("div.shipping_address").hide(),a(this).is(":checked")&&a("div.shipping_address").slideDown()},reset_update_checkout_timer:function(){clearTimeout(b.updateTimer)},validate_field:function(b){var c=a(this),d=c.closest(".form-row"),e=!0,f=d.is(".validate-required"),g=d.is(".validate-email"),h=b.type;if("input"===h&&d.removeClass("woocommerce-invalid woocommerce-invalid-required-field woocommerce-invalid-email woocommerce-validated"),"focusout"===h||"change"===h){if(f&&("checkbox"!==c.attr("type")||c.is(":checked")?""===c.val()&&(d.removeClass("woocommerce-validated").addClass("woocommerce-invalid woocommerce-invalid-required-field"),e=!1):(d.removeClass("woocommerce-validated").addClass("woocommerce-invalid woocommerce-invalid-required-field"),e=!1)),g&&c.val()){var i=new RegExp(/^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i);i.test(c.val())||(d.removeClass("woocommerce-validated").addClass("woocommerce-invalid woocommerce-invalid-email"),e=!1)}e&&d.removeClass("woocommerce-invalid woocommerce-invalid-required-field woocommerce-invalid-email").addClass("woocommerce-validated")}},update_checkout:function(a,c){b.reset_update_checkout_timer(),b.updateTimer=setTimeout(b.update_checkout_action,"5",c)},update_checkout_action:function(c){if(b.xhr&&b.xhr.abort(),0!==a("form.checkout").length){c="undefined"!=typeof c?c:{update_shipping_method:!0};var d=a("#billing_country").val(),e=a("#billing_state").val(),f=a("input#billing_postcode").val(),g=a("#billing_city").val(),h=a("input#billing_address_1").val(),i=a("input#billing_address_2").val(),j=d,k=e,l=f,m=g,n=h,o=i;a("#ship-to-different-address").find("input").is(":checked")&&(j=a("#shipping_country").val(),k=a("#shipping_state").val(),l=a("input#shipping_postcode").val(),m=a("#shipping_city").val(),n=a("input#shipping_address_1").val(),o=a("input#shipping_address_2").val());var p={security:wc_checkout_params.update_order_review_nonce,payment_method:b.get_payment_method(),country:d,state:e,postcode:f,city:g,address:h,address_2:i,s_country:j,s_state:k,s_postcode:l,s_city:m,s_address:n,s_address_2:o,post_data:a("form.checkout").serialize()};if(!1!==c.update_shipping_method){var q={};a('select.shipping_method, input[name^="shipping_method"][type="radio"]:checked, input[name^="shipping_method"][type="hidden"]').each(function(){q[a(this).data("index")]=a(this).val()}),p.shipping_method=q}a(".woocommerce-checkout-payment, .woocommerce-checkout-review-order-table").block({message:null,overlayCSS:{background:"#fff",opacity:.6}}),b.xhr=a.ajax({type:"POST",url:wc_checkout_params.wc_ajax_url.toString().replace("%%endpoint%%","update_order_review"),data:p,success:function(c){var d=a('.woocommerce-checkout input[name="payment_method"]:checked').attr("id");if(!0===c.reload)return void window.location.reload();a(".woocommerce-NoticeGroup-updateOrderReview").remove();var e=a("#terms").prop("checked"),f={};if(a(".payment_box input").each(function(){var b=a(this).attr("id");b&&(a.inArray(a(this).attr("type"),["checkbox","radio"])!==-1?f[b]=a(this).prop("checked"):f[b]=a(this).val())}),c&&c.fragments&&a.each(c.fragments,function(b,c){a(b).replaceWith(c),a(b).unblock()}),e&&a("#terms").prop("checked",!0),a.isEmptyObject(f)||a(".payment_box input").each(function(){var b=a(this).attr("id");b&&(a.inArray(a(this).attr("type"),["checkbox","radio"])!==-1?a(this).prop("checked",f[b]).change():a(this).val(f[b]).change())}),"failure"===c.result){var g=a("form.checkout");a(".woocommerce-error, .woocommerce-message").remove(),c.messages?g.prepend('<div class="woocommerce-NoticeGroup woocommerce-NoticeGroup-updateOrderReview">'+c.messages+"</div>"):g.prepend(c),g.find(".input-text, select, input:checkbox").blur(),a("html, body").animate({scrollTop:a("form.checkout").offset().top-100},1e3)}b.init_payment_methods(d),a(document.body).trigger("updated_checkout",[c])}})}},submit:function(){b.reset_update_checkout_timer();var c=a(this);if(c.is(".processing"))return!1;if(c.triggerHandler("checkout_place_order")!==!1&&c.triggerHandler("checkout_place_order_"+b.get_payment_method())!==!1){c.addClass("processing");var d=c.data();1!==d["blockUI.isBlocked"]&&c.block({message:null,overlayCSS:{background:"#fff",opacity:.6}}),a.ajaxSetup({dataFilter:function(b,c){if("json"!==c)return b;try{var d=a.parseJSON(b);if(d&&"object"==typeof d)return b}catch(a){var e=b.match(/{"result.*"}/);null===e?console.log("Unable to fix malformed JSON"):(console.log("Fixed malformed JSON. Original:"),console.log(b),b=e[0])}return b}}),a.ajax({type:"POST",url:wc_checkout_params.checkout_url,data:c.serialize(),dataType:"json",success:function(c){try{if("success"!==c.result)throw"failure"===c.result?"Result failure":"Invalid response";-1===c.redirect.indexOf("https://")||-1===c.redirect.indexOf("http://")?window.location=c.redirect:window.location=decodeURI(c.redirect)}catch(d){if(!0===c.reload)return void window.location.reload();!0===c.refresh&&a(document.body).trigger("update_checkout"),c.messages?b.submit_error(c.messages):b.submit_error('<div class="woocommerce-error">'+wc_checkout_params.i18n_checkout_error+"</div>")}},error:function(a,c,d){b.submit_error('<div class="woocommerce-error">'+d+"</div>")}})}return!1},submit_error:function(c){a(".woocommerce-NoticeGroup-checkout, .woocommerce-error, .woocommerce-message").remove(),b.$checkout_form.prepend('<div class="woocommerce-NoticeGroup woocommerce-NoticeGroup-checkout">'+c+"</div>"),b.$checkout_form.removeClass("processing").unblock(),b.$checkout_form.find(".input-text, select, input:checkbox").blur(),a("html, body").animate({scrollTop:a("form.checkout").offset().top-100},1e3),a(document.body).trigger("checkout_error")}},c={init:function(){a(document.body).on("click","a.showcoupon",this.show_coupon_form),a(document.body).on("click",".woocommerce-remove-coupon",this.remove_coupon),a("form.checkout_coupon").hide().submit(this.submit)},show_coupon_form:function(){return a(".checkout_coupon").slideToggle(400,function(){a(".checkout_coupon").find(":input:eq(0)").focus()}),!1},submit:function(){var b=a(this);if(b.is(".processing"))return!1;b.addClass("processing").block({message:null,overlayCSS:{background:"#fff",opacity:.6}});var c={security:wc_checkout_params.apply_coupon_nonce,coupon_code:b.find('input[name="coupon_code"]').val()};return a.ajax({type:"POST",url:wc_checkout_params.wc_ajax_url.toString().replace("%%endpoint%%","apply_coupon"),data:c,success:function(c){a(".woocommerce-error, .woocommerce-message").remove(),b.removeClass("processing").unblock(),c&&(b.before(c),b.slideUp(),a(document.body).trigger("update_checkout",{update_shipping_method:!1}))},dataType:"html"}),!1},remove_coupon:function(b){b.preventDefault();var c=a(this).parents(".woocommerce-checkout-review-order"),d=a(this).data("coupon");c.addClass("processing").block({message:null,overlayCSS:{background:"#fff",opacity:.6}});var e={security:wc_checkout_params.remove_coupon_nonce,coupon:d};a.ajax({type:"POST",url:wc_checkout_params.wc_ajax_url.toString().replace("%%endpoint%%","remove_coupon"),data:e,success:function(b){a(".woocommerce-error, .woocommerce-message").remove(),c.removeClass("processing").unblock(),b&&(a("form.woocommerce-checkout").before(b),a(document.body).trigger("update_checkout",{update_shipping_method:!1}),a("form.checkout_coupon").find('input[name="coupon_code"]').val(""))},error:function(a){wc_checkout_params.debug_mode&&console.log(a.responseText)},dataType:"html"})}},d={init:function(){a(document.body).on("click","a.showlogin",this.show_login_form)},show_login_form:function(){return a("form.login, form.woocommerce-form--login").slideToggle(),!1}},e={init:function(){a(document.body).on("click","a.woocommerce-terms-and-conditions-link",this.toggle_terms)},toggle_terms:function(){return a(".woocommerce-terms-and-conditions").slideToggle(),!1}};b.init(),c.init(),d.init(),e.init()});
\ No newline at end of file
diff --git a/assets/js/frontend/country-select.js b/assets/js/frontend/country-select.js
index 503f02845f0..a47fc5dfdfb 100644
--- a/assets/js/frontend/country-select.js
+++ b/assets/js/frontend/country-select.js
@@ -7,54 +7,48 @@ jQuery( function( $ ) {
 	}
 
 	function getEnhancedSelectFormatString() {
-		var formatString = {
-			formatMatches: function( matches ) {
-				if ( 1 === matches ) {
-					return wc_country_select_params.i18n_matches_1;
+		return {
+			'language': {
+				errorLoading: function() {
+					// Workaround for https://github.com/select2/select2/issues/4355 instead of i18n_ajax_error.
+					return wc_country_select_params.i18n_searching;
+				},
+				inputTooLong: function( args ) {
+					var overChars = args.input.length - args.maximum;
+
+					if ( 1 === overChars ) {
+						return wc_country_select_params.i18n_input_too_long_1;
+					}
+
+					return wc_country_select_params.i18n_input_too_long_n.replace( '%qty%', overChars );
+				},
+				inputTooShort: function( args ) {
+					var remainingChars = args.minimum - args.input.length;
+
+					if ( 1 === remainingChars ) {
+						return wc_country_select_params.i18n_input_too_short_1;
+					}
+
+					return wc_country_select_params.i18n_input_too_short_n.replace( '%qty%', remainingChars );
+				},
+				loadingMore: function() {
+					return wc_country_select_params.i18n_load_more;
+				},
+				maximumSelected: function( args ) {
+					if ( args.maximum === 1 ) {
+						return wc_country_select_params.i18n_selection_too_long_1;
+					}
+
+					return wc_country_select_params.i18n_selection_too_long_n.replace( '%qty%', args.maximum );
+				},
+				noResults: function() {
+					return wc_country_select_params.i18n_no_matches;
+				},
+				searching: function() {
+					return wc_country_select_params.i18n_searching;
 				}
-
-				return wc_country_select_params.i18n_matches_n.replace( '%qty%', matches );
-			},
-			formatNoMatches: function() {
-				return wc_country_select_params.i18n_no_matches;
-			},
-			formatAjaxError: function() {
-				return wc_country_select_params.i18n_ajax_error;
-			},
-			formatInputTooShort: function( input, min ) {
-				var number = min - input.length;
-
-				if ( 1 === number ) {
-					return wc_country_select_params.i18n_input_too_short_1;
-				}
-
-				return wc_country_select_params.i18n_input_too_short_n.replace( '%qty%', number );
-			},
-			formatInputTooLong: function( input, max ) {
-				var number = input.length - max;
-
-				if ( 1 === number ) {
-					return wc_country_select_params.i18n_input_too_long_1;
-				}
-
-				return wc_country_select_params.i18n_input_too_long_n.replace( '%qty%', number );
-			},
-			formatSelectionTooBig: function( limit ) {
-				if ( 1 === limit ) {
-					return wc_country_select_params.i18n_selection_too_long_1;
-				}
-
-				return wc_country_select_params.i18n_selection_too_long_n.replace( '%qty%', limit );
-			},
-			formatLoadMore: function() {
-				return wc_country_select_params.i18n_load_more;
-			},
-			formatSearching: function() {
-				return wc_country_select_params.i18n_searching;
 			}
 		};
-
-		return formatString;
 	}
 
 	// Select2 Enhancement if it exists
@@ -62,12 +56,15 @@ jQuery( function( $ ) {
 		var wc_country_select_select2 = function() {
 			$( 'select.country_select:visible, select.state_select:visible' ).each( function() {
 				var select2_args = $.extend({
-					placeholder: $( this ).attr( 'placeholder' ),
 					placeholderOption: 'first',
 					width: '100%'
 				}, getEnhancedSelectFormatString() );
 
 				$( this ).select2( select2_args );
+				// Maintain focus after select https://github.com/select2/select2/issues/4384
+				$( this ).on( 'select2:select', function() {
+					$( this ).focus();
+				} );
 			});
 		};
 
@@ -83,15 +80,20 @@ jQuery( function( $ ) {
 		states = $.parseJSON( states_json );
 
 	$( document.body ).on( 'change', 'select.country_to_state, input.country_to_state', function() {
+		// Grab wrapping element to target only stateboxes in same 'group'
+		var $wrapper    = $( this ).closest('.woocommerce-billing-fields, .woocommerce-shipping-fields, .woocommerce-shipping-calculator');
+
+		if ( ! $wrapper.length ) {
+			$wrapper = $( this ).closest('.form-row').parent();
+		}
 
 		var country     = $( this ).val(),
-			$wrapper    = $( this ).closest('.form-row').parent(), // Grab wrapping form-row parent to target stateboxes in same 'group'
 			$statebox   = $wrapper.find( '#billing_state, #shipping_state, #calc_shipping_state' ),
 			$parent     = $statebox.parent(),
 			input_name  = $statebox.attr( 'name' ),
 			input_id    = $statebox.attr( 'id' ),
 			value       = $statebox.val(),
-			placeholder = $statebox.attr( 'placeholder' );
+			placeholder = $statebox.attr( 'placeholder' ) || $statebox.attr( 'data-placeholder' ) || '';
 
 		if ( states[ country ] ) {
 			if ( $.isEmptyObject( states[ country ] ) ) {
@@ -116,7 +118,7 @@ jQuery( function( $ ) {
 
 				if ( $statebox.is( 'input' ) ) {
 					// Change for select
-					$statebox.replaceWith( '<select name="' + input_name + '" id="' + input_id + '" class="state_select" placeholder="' + placeholder + '"></select>' );
+					$statebox.replaceWith( '<select name="' + input_name + '" id="' + input_id + '" class="state_select" data-placeholder="' + placeholder + '"></select>' );
 					$statebox = $wrapper.find( '#billing_state, #shipping_state, #calc_shipping_state' );
 				}
 
@@ -134,7 +136,7 @@ jQuery( function( $ ) {
 
 				$( document.body ).trigger( 'country_to_state_changed', [country, $wrapper ] );
 
-			} else if ( $statebox.is( '.hidden' ) ) {
+			} else if ( $statebox.is( 'input[type="hidden"]' ) ) {
 
 				$parent.show().find( '.select2-container' ).remove();
 				$statebox.replaceWith( '<input type="text" class="input-text" name="' + input_name + '" id="' + input_id + '" placeholder="' + placeholder + '" />' );
diff --git a/assets/js/frontend/country-select.min.js b/assets/js/frontend/country-select.min.js
index 6b50aee6ceb..c75f75310d0 100644
--- a/assets/js/frontend/country-select.min.js
+++ b/assets/js/frontend/country-select.min.js
@@ -1 +1 @@
-jQuery(function(a){function b(){var a={formatMatches:function(a){return 1===a?wc_country_select_params.i18n_matches_1:wc_country_select_params.i18n_matches_n.replace("%qty%",a)},formatNoMatches:function(){return wc_country_select_params.i18n_no_matches},formatAjaxError:function(){return wc_country_select_params.i18n_ajax_error},formatInputTooShort:function(a,b){var c=b-a.length;return 1===c?wc_country_select_params.i18n_input_too_short_1:wc_country_select_params.i18n_input_too_short_n.replace("%qty%",c)},formatInputTooLong:function(a,b){var c=a.length-b;return 1===c?wc_country_select_params.i18n_input_too_long_1:wc_country_select_params.i18n_input_too_long_n.replace("%qty%",c)},formatSelectionTooBig:function(a){return 1===a?wc_country_select_params.i18n_selection_too_long_1:wc_country_select_params.i18n_selection_too_long_n.replace("%qty%",a)},formatLoadMore:function(){return wc_country_select_params.i18n_load_more},formatSearching:function(){return wc_country_select_params.i18n_searching}};return a}if("undefined"==typeof wc_country_select_params)return!1;if(a().select2){var c=function(){a("select.country_select:visible, select.state_select:visible").each(function(){var c=a.extend({placeholder:a(this).attr("placeholder"),placeholderOption:"first",width:"100%"},b());a(this).select2(c)})};c(),a(document.body).bind("country_to_state_changed",function(){c()})}var d=wc_country_select_params.countries.replace(/&quot;/g,'"'),e=a.parseJSON(d);a(document.body).on("change","select.country_to_state, input.country_to_state",function(){var b=a(this).val(),c=a(this).closest(".form-row").parent(),d=c.find("#billing_state, #shipping_state, #calc_shipping_state"),f=d.parent(),g=d.attr("name"),h=d.attr("id"),i=d.val(),j=d.attr("placeholder");if(e[b])if(a.isEmptyObject(e[b]))d.parent().hide().find(".select2-container").remove(),d.replaceWith('<input type="hidden" class="hidden" name="'+g+'" id="'+h+'" value="" placeholder="'+j+'" />'),a(document.body).trigger("country_to_state_changed",[b,c]);else{var k="",l=e[b];for(var m in l)l.hasOwnProperty(m)&&(k=k+'<option value="'+m+'">'+l[m]+"</option>");d.parent().show(),d.is("input")&&(d.replaceWith('<select name="'+g+'" id="'+h+'" class="state_select" placeholder="'+j+'"></select>'),d=c.find("#billing_state, #shipping_state, #calc_shipping_state")),d.html('<option value="">'+wc_country_select_params.i18n_select_state_text+"</option>"+k),d.val(i).change(),a(document.body).trigger("country_to_state_changed",[b,c])}else d.is("select")?(f.show().find(".select2-container").remove(),d.replaceWith('<input type="text" class="input-text" name="'+g+'" id="'+h+'" placeholder="'+j+'" />'),a(document.body).trigger("country_to_state_changed",[b,c])):d.is(".hidden")&&(f.show().find(".select2-container").remove(),d.replaceWith('<input type="text" class="input-text" name="'+g+'" id="'+h+'" placeholder="'+j+'" />'),a(document.body).trigger("country_to_state_changed",[b,c]));a(document.body).trigger("country_to_state_changing",[b,c])}),a(function(){a(":input.country_to_state").change()})});
\ No newline at end of file
+jQuery(function(a){function b(){return{language:{errorLoading:function(){return wc_country_select_params.i18n_searching},inputTooLong:function(a){var b=a.input.length-a.maximum;return 1===b?wc_country_select_params.i18n_input_too_long_1:wc_country_select_params.i18n_input_too_long_n.replace("%qty%",b)},inputTooShort:function(a){var b=a.minimum-a.input.length;return 1===b?wc_country_select_params.i18n_input_too_short_1:wc_country_select_params.i18n_input_too_short_n.replace("%qty%",b)},loadingMore:function(){return wc_country_select_params.i18n_load_more},maximumSelected:function(a){return 1===a.maximum?wc_country_select_params.i18n_selection_too_long_1:wc_country_select_params.i18n_selection_too_long_n.replace("%qty%",a.maximum)},noResults:function(){return wc_country_select_params.i18n_no_matches},searching:function(){return wc_country_select_params.i18n_searching}}}}if("undefined"==typeof wc_country_select_params)return!1;if(a().select2){var c=function(){a("select.country_select:visible, select.state_select:visible").each(function(){var c=a.extend({placeholderOption:"first",width:"100%"},b());a(this).select2(c),a(this).on("select2:select",function(){a(this).focus()})})};c(),a(document.body).bind("country_to_state_changed",function(){c()})}var d=wc_country_select_params.countries.replace(/&quot;/g,'"'),e=a.parseJSON(d);a(document.body).on("change","select.country_to_state, input.country_to_state",function(){var b=a(this).closest(".woocommerce-billing-fields, .woocommerce-shipping-fields, .woocommerce-shipping-calculator");b.length||(b=a(this).closest(".form-row").parent());var c=a(this).val(),d=b.find("#billing_state, #shipping_state, #calc_shipping_state"),f=d.parent(),g=d.attr("name"),h=d.attr("id"),i=d.val(),j=d.attr("placeholder")||d.attr("data-placeholder")||"";if(e[c])if(a.isEmptyObject(e[c]))d.parent().hide().find(".select2-container").remove(),d.replaceWith('<input type="hidden" class="hidden" name="'+g+'" id="'+h+'" value="" placeholder="'+j+'" />'),a(document.body).trigger("country_to_state_changed",[c,b]);else{var k="",l=e[c];for(var m in l)l.hasOwnProperty(m)&&(k=k+'<option value="'+m+'">'+l[m]+"</option>");d.parent().show(),d.is("input")&&(d.replaceWith('<select name="'+g+'" id="'+h+'" class="state_select" data-placeholder="'+j+'"></select>'),d=b.find("#billing_state, #shipping_state, #calc_shipping_state")),d.html('<option value="">'+wc_country_select_params.i18n_select_state_text+"</option>"+k),d.val(i).change(),a(document.body).trigger("country_to_state_changed",[c,b])}else d.is("select")?(f.show().find(".select2-container").remove(),d.replaceWith('<input type="text" class="input-text" name="'+g+'" id="'+h+'" placeholder="'+j+'" />'),a(document.body).trigger("country_to_state_changed",[c,b])):d.is('input[type="hidden"]')&&(f.show().find(".select2-container").remove(),d.replaceWith('<input type="text" class="input-text" name="'+g+'" id="'+h+'" placeholder="'+j+'" />'),a(document.body).trigger("country_to_state_changed",[c,b]));a(document.body).trigger("country_to_state_changing",[c,b])}),a(function(){a(":input.country_to_state").change()})});
\ No newline at end of file
diff --git a/assets/js/frontend/credit-card-form.js b/assets/js/frontend/credit-card-form.js
index 4fc1eb42866..cbdd8e6416c 100644
--- a/assets/js/frontend/credit-card-form.js
+++ b/assets/js/frontend/credit-card-form.js
@@ -3,10 +3,11 @@ jQuery( function( $ ) {
 	$( '.wc-credit-card-form-card-expiry' ).payment( 'formatCardExpiry' );
 	$( '.wc-credit-card-form-card-cvc' ).payment( 'formatCardCVC' );
 
-	$( 'body' )
-		.on( 'updated_checkout', function() {
+	$( document.body )
+		.on( 'updated_checkout wc-credit-card-form-init', function() {
 			$( '.wc-credit-card-form-card-number' ).payment( 'formatCardNumber' );
 			$( '.wc-credit-card-form-card-expiry' ).payment( 'formatCardExpiry' );
 			$( '.wc-credit-card-form-card-cvc' ).payment( 'formatCardCVC' );
-		});
-} );
\ No newline at end of file
+		})
+		.trigger( 'wc-credit-card-form-init' );
+} );
diff --git a/assets/js/frontend/credit-card-form.min.js b/assets/js/frontend/credit-card-form.min.js
index aa64c896717..00e2a133809 100644
--- a/assets/js/frontend/credit-card-form.min.js
+++ b/assets/js/frontend/credit-card-form.min.js
@@ -1 +1 @@
-jQuery(function(a){a(".wc-credit-card-form-card-number").payment("formatCardNumber"),a(".wc-credit-card-form-card-expiry").payment("formatCardExpiry"),a(".wc-credit-card-form-card-cvc").payment("formatCardCVC"),a("body").on("updated_checkout",function(){a(".wc-credit-card-form-card-number").payment("formatCardNumber"),a(".wc-credit-card-form-card-expiry").payment("formatCardExpiry"),a(".wc-credit-card-form-card-cvc").payment("formatCardCVC")})});
\ No newline at end of file
+jQuery(function(a){a(".wc-credit-card-form-card-number").payment("formatCardNumber"),a(".wc-credit-card-form-card-expiry").payment("formatCardExpiry"),a(".wc-credit-card-form-card-cvc").payment("formatCardCVC"),a(document.body).on("updated_checkout wc-credit-card-form-init",function(){a(".wc-credit-card-form-card-number").payment("formatCardNumber"),a(".wc-credit-card-form-card-expiry").payment("formatCardExpiry"),a(".wc-credit-card-form-card-cvc").payment("formatCardCVC")}).trigger("wc-credit-card-form-init")});
\ No newline at end of file
diff --git a/assets/js/frontend/password-strength-meter.js b/assets/js/frontend/password-strength-meter.js
index 7c501e0d519..c9e908ad248 100644
--- a/assets/js/frontend/password-strength-meter.js
+++ b/assets/js/frontend/password-strength-meter.js
@@ -1,44 +1,43 @@
-/* global wp, pwsL10n */
+/* global wp, pwsL10n, wc_password_strength_meter_params */
 jQuery( function( $ ) {
 
 	/**
-	 * Password Strength Meter class
+	 * Password Strength Meter class.
 	 */
 	var wc_password_strength_meter = {
 
 		/**
-		 * Initialize strength meter actions
+		 * Initialize strength meter actions.
 		 */
 		init: function() {
 			$( document.body )
-				.on( 'keyup', 'form.register #reg_password, form.checkout #account_password', this.strengthMeter )
-				.on( 'change', 'form.checkout #createaccount', this.checkoutNeedsRegistration );
-
+				.on( 'keyup change', 'form.register #reg_password, form.checkout #account_password, form.edit-account #password_1, form.lost_reset_password #password_1', this.strengthMeter );
 			$( 'form.checkout #createaccount' ).change();
 		},
 
 		/**
-		 * Strength Meter
+		 * Strength Meter.
 		 */
 		strengthMeter: function() {
-			var wrapper  = $( 'form.register, form.checkout' ),
-				submit   = $( 'input[type="submit"]', wrapper ),
-				field    = $( '#reg_password, #account_password', wrapper ),
-				strength = 1;
+			var wrapper    = $( 'form.register, form.checkout, form.edit-account, form.lost_reset_password' ),
+				submit     = $( 'input[type="submit"]', wrapper ),
+				field      = $( '#reg_password, #account_password, #password_1', wrapper ),
+				strength   = 1,
+				fieldValue = field.val();
 
 			wc_password_strength_meter.includeMeter( wrapper, field );
 
-			strength = wc_password_strength_meter.checkPasswordStrength( field );
+			strength = wc_password_strength_meter.checkPasswordStrength( wrapper, field );
 
-			if ( 3 === strength || 4 === strength ) {
-				submit.removeAttr( 'disabled' );
+			if ( fieldValue.length > 0 && strength < wc_password_strength_meter_params.min_password_strength && ! wrapper.is( 'form.checkout' ) ) {
+				submit.attr( 'disabled', 'disabled' ).addClass( 'disabled' );
 			} else {
-				submit.attr( 'disabled', 'disabled' );
+				submit.removeAttr( 'disabled', 'disabled' ).removeClass( 'disabled' );
 			}
 		},
 
 		/**
-		 * Include meter HTML
+		 * Include meter HTML.
 		 *
 		 * @param {Object} wrapper
 		 * @param {Object} field
@@ -46,59 +45,63 @@ jQuery( function( $ ) {
 		includeMeter: function( wrapper, field ) {
 			var meter = wrapper.find( '.woocommerce-password-strength' );
 
-			if ( 0 === meter.length ) {
-				field.after( '<div class="woocommerce-password-strength" aria-live="polite"></div>' );
-			} else if ( '' === field.val() ) {
+			if ( '' === field.val() ) {
 				meter.remove();
+				$( document.body ).trigger( 'wc-password-strength-removed' );
+			} else if ( 0 === meter.length ) {
+				field.after( '<div class="woocommerce-password-strength" aria-live="polite"></div>' );
+				$( document.body ).trigger( 'wc-password-strength-added' );
 			}
 		},
 
 		/**
-		 * Check password strength
+		 * Check password strength.
 		 *
-		 * @param  {Object} field
+		 * @param {Object} field
 		 *
 		 * @return {Int}
 		 */
-		checkPasswordStrength: function( field ) {
-			var meter = $( '.woocommerce-password-strength' );
-			var strength = wp.passwordStrength.meter( field.val(), wp.passwordStrength.userInputBlacklist() );
+		checkPasswordStrength: function( wrapper, field ) {
+			var meter     = wrapper.find( '.woocommerce-password-strength' );
+			var hint      = wrapper.find( '.woocommerce-password-hint' );
+			var hint_html = '<small class="woocommerce-password-hint">' + wc_password_strength_meter_params.i18n_password_hint + '</small>';
+			var strength  = wp.passwordStrength.meter( field.val(), wp.passwordStrength.userInputBlacklist() );
+			var error     = '';
 
-			// Reset classes
+			// Reset
 			meter.removeClass( 'short bad good strong' );
+			hint.remove();
+
+			// Error to append
+			if ( strength < wc_password_strength_meter_params.min_password_strength ) {
+				error = ' - ' + wc_password_strength_meter_params.i18n_password_error;
+			}
 
 			switch ( strength ) {
+				case 0 :
+					meter.addClass( 'short' ).html( pwsL10n['short'] + error );
+					meter.after( hint_html );
+					break;
+				case 1 :
+					meter.addClass( 'bad' ).html( pwsL10n.bad + error );
+					meter.after( hint_html );
+					break;
 				case 2 :
-					meter.addClass( 'bad' ).html( pwsL10n.bad );
+					meter.addClass( 'bad' ).html( pwsL10n.bad + error );
+					meter.after( hint_html );
 					break;
 				case 3 :
-					meter.addClass( 'good' ).html( pwsL10n.good );
+					meter.addClass( 'good' ).html( pwsL10n.good + error );
 					break;
 				case 4 :
-					meter.addClass( 'strong' ).html( pwsL10n.strong );
+					meter.addClass( 'strong' ).html( pwsL10n.strong + error );
 					break;
 				case 5 :
 					meter.addClass( 'short' ).html( pwsL10n.mismatch );
 					break;
-
-				default :
-					meter.addClass( 'short' ).html( pwsL10n['short'] );
 			}
 
 			return strength;
-		},
-
-		/**
-		 * Check if user wants register on checkout.
-		 */
-		checkoutNeedsRegistration: function() {
-			var submit = $( 'form.checkout input[type="submit"]' );
-
-			if ( $( this ).is( ':checked' ) ) {
-				submit.attr( 'disabled', 'disabled' );
-			} else {
-				submit.removeAttr( 'disabled' );
-			}
 		}
 	};
 
diff --git a/assets/js/frontend/password-strength-meter.min.js b/assets/js/frontend/password-strength-meter.min.js
index e3ce9ea41c7..f8a1c42f5b7 100644
--- a/assets/js/frontend/password-strength-meter.min.js
+++ b/assets/js/frontend/password-strength-meter.min.js
@@ -1 +1 @@
-jQuery(function(a){var b={init:function(){a(document.body).on("keyup","form.register #reg_password, form.checkout #account_password",this.strengthMeter).on("change","form.checkout #createaccount",this.checkoutNeedsRegistration),a("form.checkout #createaccount").change()},strengthMeter:function(){var c=a("form.register, form.checkout"),d=a('input[type="submit"]',c),e=a("#reg_password, #account_password",c),f=1;b.includeMeter(c,e),f=b.checkPasswordStrength(e),3===f||4===f?d.removeAttr("disabled"):d.attr("disabled","disabled")},includeMeter:function(a,b){var c=a.find(".woocommerce-password-strength");0===c.length?b.after('<div class="woocommerce-password-strength" aria-live="polite"></div>'):""===b.val()&&c.remove()},checkPasswordStrength:function(b){var c=a(".woocommerce-password-strength"),d=wp.passwordStrength.meter(b.val(),wp.passwordStrength.userInputBlacklist());switch(c.removeClass("short bad good strong"),d){case 2:c.addClass("bad").html(pwsL10n.bad);break;case 3:c.addClass("good").html(pwsL10n.good);break;case 4:c.addClass("strong").html(pwsL10n.strong);break;case 5:c.addClass("short").html(pwsL10n.mismatch);break;default:c.addClass("short").html(pwsL10n["short"])}return d},checkoutNeedsRegistration:function(){var b=a('form.checkout input[type="submit"]');a(this).is(":checked")?b.attr("disabled","disabled"):b.removeAttr("disabled")}};b.init()});
\ No newline at end of file
+jQuery(function(a){var b={init:function(){a(document.body).on("keyup change","form.register #reg_password, form.checkout #account_password, form.edit-account #password_1, form.lost_reset_password #password_1",this.strengthMeter),a("form.checkout #createaccount").change()},strengthMeter:function(){var c=a("form.register, form.checkout, form.edit-account, form.lost_reset_password"),d=a('input[type="submit"]',c),e=a("#reg_password, #account_password, #password_1",c),f=1,g=e.val();b.includeMeter(c,e),f=b.checkPasswordStrength(c,e),g.length>0&&f<wc_password_strength_meter_params.min_password_strength&&!c.is("form.checkout")?d.attr("disabled","disabled").addClass("disabled"):d.removeAttr("disabled","disabled").removeClass("disabled")},includeMeter:function(b,c){var d=b.find(".woocommerce-password-strength");""===c.val()?(d.remove(),a(document.body).trigger("wc-password-strength-removed")):0===d.length&&(c.after('<div class="woocommerce-password-strength" aria-live="polite"></div>'),a(document.body).trigger("wc-password-strength-added"))},checkPasswordStrength:function(a,b){var c=a.find(".woocommerce-password-strength"),d=a.find(".woocommerce-password-hint"),e='<small class="woocommerce-password-hint">'+wc_password_strength_meter_params.i18n_password_hint+"</small>",f=wp.passwordStrength.meter(b.val(),wp.passwordStrength.userInputBlacklist()),g="";switch(c.removeClass("short bad good strong"),d.remove(),f<wc_password_strength_meter_params.min_password_strength&&(g=" - "+wc_password_strength_meter_params.i18n_password_error),f){case 0:c.addClass("short").html(pwsL10n.short+g),c.after(e);break;case 1:c.addClass("bad").html(pwsL10n.bad+g),c.after(e);break;case 2:c.addClass("bad").html(pwsL10n.bad+g),c.after(e);break;case 3:c.addClass("good").html(pwsL10n.good+g);break;case 4:c.addClass("strong").html(pwsL10n.strong+g);break;case 5:c.addClass("short").html(pwsL10n.mismatch)}return f}};b.init()});
\ No newline at end of file
diff --git a/assets/js/frontend/price-slider.js b/assets/js/frontend/price-slider.js
index c24da8aed6d..d25a39d8e79 100644
--- a/assets/js/frontend/price-slider.js
+++ b/assets/js/frontend/price-slider.js
@@ -1,4 +1,4 @@
-/* global woocommerce_price_slider_params */
+/* global woocommerce_price_slider_params, accounting */
 jQuery( function( $ ) {
 
 	// woocommerce_price_slider_params is required to continue, ensure the object exists
@@ -24,27 +24,22 @@ jQuery( function( $ ) {
 	}
 
 	$( document.body ).bind( 'price_slider_create price_slider_slide', function( event, min, max ) {
-		if ( woocommerce_price_slider_params.currency_pos === 'left' ) {
 
-			$( '.price_slider_amount span.from' ).html( woocommerce_price_slider_params.currency_symbol + min );
-			$( '.price_slider_amount span.to' ).html( woocommerce_price_slider_params.currency_symbol + max );
+		$( '.price_slider_amount span.from' ).html( accounting.formatMoney( min, {
+			symbol:    woocommerce_price_slider_params.currency_format_symbol,
+			decimal:   woocommerce_price_slider_params.currency_format_decimal_sep,
+			thousand:  woocommerce_price_slider_params.currency_format_thousand_sep,
+			precision: woocommerce_price_slider_params.currency_format_num_decimals,
+			format:    woocommerce_price_slider_params.currency_format
+		} ) );
 
-		} else if ( woocommerce_price_slider_params.currency_pos === 'left_space' ) {
-
-			$( '.price_slider_amount span.from' ).html( woocommerce_price_slider_params.currency_symbol + ' ' + min );
-			$( '.price_slider_amount span.to' ).html( woocommerce_price_slider_params.currency_symbol + ' ' + max );
-
-		} else if ( woocommerce_price_slider_params.currency_pos === 'right' ) {
-
-			$( '.price_slider_amount span.from' ).html( min + woocommerce_price_slider_params.currency_symbol );
-			$( '.price_slider_amount span.to' ).html( max + woocommerce_price_slider_params.currency_symbol );
-
-		} else if ( woocommerce_price_slider_params.currency_pos === 'right_space' ) {
-
-			$( '.price_slider_amount span.from' ).html( min + ' ' + woocommerce_price_slider_params.currency_symbol );
-			$( '.price_slider_amount span.to' ).html( max + ' ' + woocommerce_price_slider_params.currency_symbol );
-
-		}
+		$( '.price_slider_amount span.to' ).html( accounting.formatMoney( max, {
+			symbol:    woocommerce_price_slider_params.currency_format_symbol,
+			decimal:   woocommerce_price_slider_params.currency_format_decimal_sep,
+			thousand:  woocommerce_price_slider_params.currency_format_thousand_sep,
+			precision: woocommerce_price_slider_params.currency_format_num_decimals,
+			format:    woocommerce_price_slider_params.currency_format
+		} ) );
 
 		$( document.body ).trigger( 'price_slider_updated', [ min, max ] );
 	});
diff --git a/assets/js/frontend/price-slider.min.js b/assets/js/frontend/price-slider.min.js
index 7be4fffc462..691d3211010 100644
--- a/assets/js/frontend/price-slider.min.js
+++ b/assets/js/frontend/price-slider.min.js
@@ -1 +1 @@
-jQuery(function(a){if("undefined"==typeof woocommerce_price_slider_params)return!1;a("input#min_price, input#max_price").hide(),a(".price_slider, .price_label").show();var b=a(".price_slider_amount #min_price").data("min"),c=a(".price_slider_amount #max_price").data("max"),d=parseInt(b,10),e=parseInt(c,10);woocommerce_price_slider_params.min_price&&(d=parseInt(woocommerce_price_slider_params.min_price,10)),woocommerce_price_slider_params.max_price&&(e=parseInt(woocommerce_price_slider_params.max_price,10)),a(document.body).bind("price_slider_create price_slider_slide",function(b,c,d){"left"===woocommerce_price_slider_params.currency_pos?(a(".price_slider_amount span.from").html(woocommerce_price_slider_params.currency_symbol+c),a(".price_slider_amount span.to").html(woocommerce_price_slider_params.currency_symbol+d)):"left_space"===woocommerce_price_slider_params.currency_pos?(a(".price_slider_amount span.from").html(woocommerce_price_slider_params.currency_symbol+" "+c),a(".price_slider_amount span.to").html(woocommerce_price_slider_params.currency_symbol+" "+d)):"right"===woocommerce_price_slider_params.currency_pos?(a(".price_slider_amount span.from").html(c+woocommerce_price_slider_params.currency_symbol),a(".price_slider_amount span.to").html(d+woocommerce_price_slider_params.currency_symbol)):"right_space"===woocommerce_price_slider_params.currency_pos&&(a(".price_slider_amount span.from").html(c+" "+woocommerce_price_slider_params.currency_symbol),a(".price_slider_amount span.to").html(d+" "+woocommerce_price_slider_params.currency_symbol)),a(document.body).trigger("price_slider_updated",[c,d])}),a(".price_slider").slider({range:!0,animate:!0,min:b,max:c,values:[d,e],create:function(){a(".price_slider_amount #min_price").val(d),a(".price_slider_amount #max_price").val(e),a(document.body).trigger("price_slider_create",[d,e])},slide:function(b,c){a("input#min_price").val(c.values[0]),a("input#max_price").val(c.values[1]),a(document.body).trigger("price_slider_slide",[c.values[0],c.values[1]])},change:function(b,c){a(document.body).trigger("price_slider_change",[c.values[0],c.values[1]])}})});
\ No newline at end of file
+jQuery(function(a){if("undefined"==typeof woocommerce_price_slider_params)return!1;a("input#min_price, input#max_price").hide(),a(".price_slider, .price_label").show();var b=a(".price_slider_amount #min_price").data("min"),c=a(".price_slider_amount #max_price").data("max"),d=parseInt(b,10),e=parseInt(c,10);woocommerce_price_slider_params.min_price&&(d=parseInt(woocommerce_price_slider_params.min_price,10)),woocommerce_price_slider_params.max_price&&(e=parseInt(woocommerce_price_slider_params.max_price,10)),a(document.body).bind("price_slider_create price_slider_slide",function(b,c,d){a(".price_slider_amount span.from").html(accounting.formatMoney(c,{symbol:woocommerce_price_slider_params.currency_format_symbol,decimal:woocommerce_price_slider_params.currency_format_decimal_sep,thousand:woocommerce_price_slider_params.currency_format_thousand_sep,precision:woocommerce_price_slider_params.currency_format_num_decimals,format:woocommerce_price_slider_params.currency_format})),a(".price_slider_amount span.to").html(accounting.formatMoney(d,{symbol:woocommerce_price_slider_params.currency_format_symbol,decimal:woocommerce_price_slider_params.currency_format_decimal_sep,thousand:woocommerce_price_slider_params.currency_format_thousand_sep,precision:woocommerce_price_slider_params.currency_format_num_decimals,format:woocommerce_price_slider_params.currency_format})),a(document.body).trigger("price_slider_updated",[c,d])}),a(".price_slider").slider({range:!0,animate:!0,min:b,max:c,values:[d,e],create:function(){a(".price_slider_amount #min_price").val(d),a(".price_slider_amount #max_price").val(e),a(document.body).trigger("price_slider_create",[d,e])},slide:function(b,c){a("input#min_price").val(c.values[0]),a("input#max_price").val(c.values[1]),a(document.body).trigger("price_slider_slide",[c.values[0],c.values[1]])},change:function(b,c){a(document.body).trigger("price_slider_change",[c.values[0],c.values[1]])}})});
\ No newline at end of file
diff --git a/assets/js/frontend/single-product.js b/assets/js/frontend/single-product.js
index e2d207c9d22..cdfbd01759d 100644
--- a/assets/js/frontend/single-product.js
+++ b/assets/js/frontend/single-product.js
@@ -1,29 +1,30 @@
-/*global wc_single_product_params */
+/*global wc_single_product_params, PhotoSwipe, PhotoSwipeUI_Default */
 jQuery( function( $ ) {
 
-	// wc_single_product_params is required to continue, ensure the object exists
+	// wc_single_product_params is required to continue.
 	if ( typeof wc_single_product_params === 'undefined' ) {
 		return false;
 	}
 
-	// Tabs
-	$( '.wc-tabs-wrapper, .woocommerce-tabs' )
-		.on( 'init', function() {
+	$( 'body' )
+		// Tabs
+		.on( 'init', '.wc-tabs-wrapper, .woocommerce-tabs', function() {
 			$( '.wc-tab, .woocommerce-tabs .panel:not(.panel .panel)' ).hide();
 
 			var hash  = window.location.hash;
 			var url   = window.location.href;
 			var $tabs = $( this ).find( '.wc-tabs, ul.tabs' ).first();
 
-			if ( hash.toLowerCase().indexOf( 'comment-' ) >= 0 || hash === '#reviews' ) {
+			if ( hash.toLowerCase().indexOf( 'comment-' ) >= 0 || hash === '#reviews' || hash === '#tab-reviews' ) {
 				$tabs.find( 'li.reviews_tab a' ).click();
 			} else if ( url.indexOf( 'comment-page-' ) > 0 || url.indexOf( 'cpage=' ) > 0 ) {
 				$tabs.find( 'li.reviews_tab a' ).click();
 			} else {
 				$tabs.find( 'li:first a' ).click();
 			}
-		})
-		.on( 'click', '.wc-tabs li a, ul.tabs li a', function() {
+		} )
+		.on( 'click', '.wc-tabs li a, ul.tabs li a', function( e ) {
+			e.preventDefault();
 			var $tab          = $( this );
 			var $tabs_wrapper = $tab.closest( '.wc-tabs-wrapper, .woocommerce-tabs' );
 			var $tabs         = $tabs_wrapper.find( '.wc-tabs, ul.tabs' );
@@ -33,20 +34,16 @@ jQuery( function( $ ) {
 
 			$tab.closest( 'li' ).addClass( 'active' );
 			$tabs_wrapper.find( $tab.attr( 'href' ) ).show();
-
-			return false;
-		})
-		.trigger( 'init' );
-
-	$( 'a.woocommerce-review-link' ).click( function() {
-		$( '.reviews_tab a' ).click();
-		return true;
-	});
-
-	// Star ratings for comments
-	$( '#rating' ).hide().before( '<p class="stars"><span><a class="star-1" href="#">1</a><a class="star-2" href="#">2</a><a class="star-3" href="#">3</a><a class="star-4" href="#">4</a><a class="star-5" href="#">5</a></span></p>' );
-
-	$( 'body' )
+		} )
+		// Review link
+		.on( 'click', 'a.woocommerce-review-link', function() {
+			$( '.reviews_tab a' ).click();
+			return true;
+		} )
+		// Star ratings for comments
+		.on( 'init', '#rating', function() {
+			$( '#rating' ).hide().before( '<p class="stars"><span><a class="star-1" href="#">1</a><a class="star-2" href="#">2</a><a class="star-3" href="#">3</a><a class="star-4" href="#">4</a><a class="star-5" href="#">5</a></span></p>' );
+		} )
 		.on( 'click', '#respond p.stars a', function() {
 			var $star   	= $( this ),
 				$rating 	= $( this ).closest( '#respond' ).find( '#rating' ),
@@ -58,15 +55,213 @@ jQuery( function( $ ) {
 			$container.addClass( 'selected' );
 
 			return false;
-		})
+		} )
 		.on( 'click', '#respond #submit', function() {
 			var $rating = $( this ).closest( '#respond' ).find( '#rating' ),
 				rating  = $rating.val();
 
-			if ( $rating.size() > 0 && ! rating && wc_single_product_params.review_rating_required === 'yes' ) {
+			if ( $rating.length > 0 && ! rating && wc_single_product_params.review_rating_required === 'yes' ) {
 				window.alert( wc_single_product_params.i18n_required_rating_text );
 
 				return false;
 			}
-		});
-});
+		} );
+
+	// Init Tabs and Star Ratings
+	$( '.wc-tabs-wrapper, .woocommerce-tabs, #rating' ).trigger( 'init' );
+
+	/**
+	 * Product gallery class.
+	 */
+	var ProductGallery = function( $target, args ) {
+		this.$target = $target;
+		this.$images = $( '.woocommerce-product-gallery__image', $target );
+
+		// No images? Abort.
+		if ( 0 === this.$images.length ) {
+			this.$target.css( 'opacity', 1 );
+			return;
+		}
+
+		// Make this object available.
+		$target.data( 'product_gallery', this );
+
+		// Pick functionality to initialize...
+		this.flexslider_enabled = $.isFunction( $.fn.flexslider ) && wc_single_product_params.flexslider_enabled;
+		this.zoom_enabled       = $.isFunction( $.fn.zoom ) && wc_single_product_params.zoom_enabled;
+		this.photoswipe_enabled = typeof PhotoSwipe !== 'undefined' && wc_single_product_params.photoswipe_enabled;
+
+		// ...also taking args into account.
+		if ( args ) {
+			this.flexslider_enabled = false === args.flexslider_enabled ? false : this.flexslider_enabled;
+			this.zoom_enabled       = false === args.zoom_enabled ? false : this.zoom_enabled;
+			this.photoswipe_enabled = false === args.photoswipe_enabled ? false : this.photoswipe_enabled;
+		}
+
+		// Bind functions to this.
+		this.initFlexslider       = this.initFlexslider.bind( this );
+		this.initZoom             = this.initZoom.bind( this );
+		this.initPhotoswipe       = this.initPhotoswipe.bind( this );
+		this.onResetSlidePosition = this.onResetSlidePosition.bind( this );
+		this.getGalleryItems      = this.getGalleryItems.bind( this );
+		this.openPhotoswipe       = this.openPhotoswipe.bind( this );
+
+		if ( this.flexslider_enabled ) {
+			this.initFlexslider();
+			$target.on( 'woocommerce_gallery_reset_slide_position', this.onResetSlidePosition );
+		} else {
+			this.$target.css( 'opacity', 1 );
+		}
+
+		if ( this.zoom_enabled ) {
+			this.initZoom();
+			$target.on( 'woocommerce_gallery_init_zoom', this.initZoom );
+		}
+
+		if ( this.photoswipe_enabled ) {
+			this.initPhotoswipe();
+		}
+	};
+
+	/**
+	 * Initialize flexSlider.
+	 */
+	ProductGallery.prototype.initFlexslider = function() {
+		var $target = this.$target;
+
+		$target.flexslider( {
+			selector:       '.woocommerce-product-gallery__wrapper > .woocommerce-product-gallery__image',
+			animation:      wc_single_product_params.flexslider.animation,
+			smoothHeight:   wc_single_product_params.flexslider.smoothHeight,
+			directionNav:   wc_single_product_params.flexslider.directionNav,
+			controlNav:     wc_single_product_params.flexslider.controlNav,
+			slideshow:      wc_single_product_params.flexslider.slideshow,
+			animationSpeed: wc_single_product_params.flexslider.animationSpeed,
+			animationLoop:  wc_single_product_params.flexslider.animationLoop, // Breaks photoswipe pagination if true.
+			start: function() {
+				$target.css( 'opacity', 1 );
+			}
+		} );
+	};
+
+	/**
+	 * Init zoom.
+	 */
+	ProductGallery.prototype.initZoom = function() {
+		var zoomTarget   = this.$images,
+			galleryWidth = this.$target.width(),
+			zoomEnabled  = false;
+
+		if ( ! this.flexslider_enabled ) {
+			zoomTarget = zoomTarget.first();
+		}
+
+		$( zoomTarget ).each( function( index, target ) {
+			var image = $( target ).find( 'img' );
+
+			if ( image.data( 'large_image_width' ) > galleryWidth ) {
+				zoomEnabled = true;
+				return false;
+			}
+		} );
+
+		// But only zoom if the img is larger than its container.
+		if ( zoomEnabled ) {
+			var zoom_options = {
+				touch: false
+			};
+
+			if ( 'ontouchstart' in window ) {
+				zoom_options.on = 'click';
+			}
+
+			zoomTarget.trigger( 'zoom.destroy' );
+			zoomTarget.zoom( zoom_options );
+		}
+	};
+
+	/**
+	 * Init PhotoSwipe.
+	 */
+	ProductGallery.prototype.initPhotoswipe = function() {
+		if ( this.zoom_enabled && this.$images.length > 0 ) {
+			this.$target.prepend( '<a href="#" class="woocommerce-product-gallery__trigger">🔍</a>' );
+			this.$target.on( 'click', '.woocommerce-product-gallery__trigger', this.openPhotoswipe );
+		}
+		this.$target.on( 'click', '.woocommerce-product-gallery__image a', this.openPhotoswipe );
+	};
+
+	/**
+	 * Reset slide position to 0.
+	 */
+	ProductGallery.prototype.onResetSlidePosition = function() {
+		this.$target.flexslider( 0 );
+	};
+
+	/**
+	 * Get product gallery image items.
+	 */
+	ProductGallery.prototype.getGalleryItems = function() {
+		var $slides = this.$images,
+			items   = [];
+
+		if ( $slides.length > 0 ) {
+			$slides.each( function( i, el ) {
+				var img = $( el ).find( 'img' ),
+					large_image_src = img.attr( 'data-large_image' ),
+					large_image_w   = img.attr( 'data-large_image_width' ),
+					large_image_h   = img.attr( 'data-large_image_height' ),
+					item            = {
+						src: large_image_src,
+						w:   large_image_w,
+						h:   large_image_h,
+						title: img.attr( 'title' )
+					};
+				items.push( item );
+			} );
+		}
+
+		return items;
+	};
+
+	/**
+	 * Open photoswipe modal.
+	 */
+	ProductGallery.prototype.openPhotoswipe = function( e ) {
+		e.preventDefault();
+
+		var pswpElement = $( '.pswp' )[0],
+			items       = this.getGalleryItems(),
+			eventTarget = $( e.target ),
+			clicked;
+
+		if ( ! eventTarget.is( '.woocommerce-product-gallery__trigger' ) ) {
+			clicked = eventTarget.closest( '.woocommerce-product-gallery__image' );
+		} else {
+			clicked = this.$target.find( '.flex-active-slide' );
+		}
+
+		var options = $.extend( {
+			index: $( clicked ).index()
+		}, wc_single_product_params.photoswipe_options );
+
+		// Initializes and opens PhotoSwipe.
+		var photoswipe = new PhotoSwipe( pswpElement, PhotoSwipeUI_Default, items, options );
+		photoswipe.init();
+	};
+
+	/**
+	 * Function to call wc_product_gallery on jquery selector.
+	 */
+	$.fn.wc_product_gallery = function( args ) {
+		new ProductGallery( this, args );
+		return this;
+	};
+
+	/*
+	 * Initialize all galleries on page.
+	 */
+	$( '.woocommerce-product-gallery' ).each( function() {
+		$( this ).wc_product_gallery();
+	} );
+} );
diff --git a/assets/js/frontend/single-product.min.js b/assets/js/frontend/single-product.min.js
index 8921a353851..bd48adcd4cf 100644
--- a/assets/js/frontend/single-product.min.js
+++ b/assets/js/frontend/single-product.min.js
@@ -1 +1 @@
-jQuery(function(a){return"undefined"==typeof wc_single_product_params?!1:(a(".wc-tabs-wrapper, .woocommerce-tabs").on("init",function(){a(".wc-tab, .woocommerce-tabs .panel:not(.panel .panel)").hide();var b=window.location.hash,c=window.location.href,d=a(this).find(".wc-tabs, ul.tabs").first();b.toLowerCase().indexOf("comment-")>=0||"#reviews"===b?d.find("li.reviews_tab a").click():c.indexOf("comment-page-")>0||c.indexOf("cpage=")>0?d.find("li.reviews_tab a").click():d.find("li:first a").click()}).on("click",".wc-tabs li a, ul.tabs li a",function(){var b=a(this),c=b.closest(".wc-tabs-wrapper, .woocommerce-tabs"),d=c.find(".wc-tabs, ul.tabs");return d.find("li").removeClass("active"),c.find(".wc-tab, .panel:not(.panel .panel)").hide(),b.closest("li").addClass("active"),c.find(b.attr("href")).show(),!1}).trigger("init"),a("a.woocommerce-review-link").click(function(){return a(".reviews_tab a").click(),!0}),a("#rating").hide().before('<p class="stars"><span><a class="star-1" href="#">1</a><a class="star-2" href="#">2</a><a class="star-3" href="#">3</a><a class="star-4" href="#">4</a><a class="star-5" href="#">5</a></span></p>'),void a("body").on("click","#respond p.stars a",function(){var b=a(this),c=a(this).closest("#respond").find("#rating"),d=a(this).closest(".stars");return c.val(b.text()),b.siblings("a").removeClass("active"),b.addClass("active"),d.addClass("selected"),!1}).on("click","#respond #submit",function(){var b=a(this).closest("#respond").find("#rating"),c=b.val();return b.size()>0&&!c&&"yes"===wc_single_product_params.review_rating_required?(window.alert(wc_single_product_params.i18n_required_rating_text),!1):void 0}))});
\ No newline at end of file
+jQuery(function(a){if("undefined"==typeof wc_single_product_params)return!1;a("body").on("init",".wc-tabs-wrapper, .woocommerce-tabs",function(){a(".wc-tab, .woocommerce-tabs .panel:not(.panel .panel)").hide();var b=window.location.hash,c=window.location.href,d=a(this).find(".wc-tabs, ul.tabs").first();b.toLowerCase().indexOf("comment-")>=0||"#reviews"===b||"#tab-reviews"===b?d.find("li.reviews_tab a").click():c.indexOf("comment-page-")>0||c.indexOf("cpage=")>0?d.find("li.reviews_tab a").click():d.find("li:first a").click()}).on("click",".wc-tabs li a, ul.tabs li a",function(b){b.preventDefault();var c=a(this),d=c.closest(".wc-tabs-wrapper, .woocommerce-tabs"),e=d.find(".wc-tabs, ul.tabs");e.find("li").removeClass("active"),d.find(".wc-tab, .panel:not(.panel .panel)").hide(),c.closest("li").addClass("active"),d.find(c.attr("href")).show()}).on("click","a.woocommerce-review-link",function(){return a(".reviews_tab a").click(),!0}).on("init","#rating",function(){a("#rating").hide().before('<p class="stars"><span><a class="star-1" href="#">1</a><a class="star-2" href="#">2</a><a class="star-3" href="#">3</a><a class="star-4" href="#">4</a><a class="star-5" href="#">5</a></span></p>')}).on("click","#respond p.stars a",function(){var b=a(this),c=a(this).closest("#respond").find("#rating"),d=a(this).closest(".stars");return c.val(b.text()),b.siblings("a").removeClass("active"),b.addClass("active"),d.addClass("selected"),!1}).on("click","#respond #submit",function(){var b=a(this).closest("#respond").find("#rating"),c=b.val();if(b.length>0&&!c&&"yes"===wc_single_product_params.review_rating_required)return window.alert(wc_single_product_params.i18n_required_rating_text),!1}),a(".wc-tabs-wrapper, .woocommerce-tabs, #rating").trigger("init");var b=function(b,c){return this.$target=b,this.$images=a(".woocommerce-product-gallery__image",b),0===this.$images.length?void this.$target.css("opacity",1):(b.data("product_gallery",this),this.flexslider_enabled=a.isFunction(a.fn.flexslider)&&wc_single_product_params.flexslider_enabled,this.zoom_enabled=a.isFunction(a.fn.zoom)&&wc_single_product_params.zoom_enabled,this.photoswipe_enabled="undefined"!=typeof PhotoSwipe&&wc_single_product_params.photoswipe_enabled,c&&(this.flexslider_enabled=!1!==c.flexslider_enabled&&this.flexslider_enabled,this.zoom_enabled=!1!==c.zoom_enabled&&this.zoom_enabled,this.photoswipe_enabled=!1!==c.photoswipe_enabled&&this.photoswipe_enabled),this.initFlexslider=this.initFlexslider.bind(this),this.initZoom=this.initZoom.bind(this),this.initPhotoswipe=this.initPhotoswipe.bind(this),this.onResetSlidePosition=this.onResetSlidePosition.bind(this),this.getGalleryItems=this.getGalleryItems.bind(this),this.openPhotoswipe=this.openPhotoswipe.bind(this),this.flexslider_enabled?(this.initFlexslider(),b.on("woocommerce_gallery_reset_slide_position",this.onResetSlidePosition)):this.$target.css("opacity",1),this.zoom_enabled&&(this.initZoom(),b.on("woocommerce_gallery_init_zoom",this.initZoom)),void(this.photoswipe_enabled&&this.initPhotoswipe()))};b.prototype.initFlexslider=function(){var a=this.$target;a.flexslider({selector:".woocommerce-product-gallery__wrapper > .woocommerce-product-gallery__image",animation:wc_single_product_params.flexslider.animation,smoothHeight:wc_single_product_params.flexslider.smoothHeight,directionNav:wc_single_product_params.flexslider.directionNav,controlNav:wc_single_product_params.flexslider.controlNav,slideshow:wc_single_product_params.flexslider.slideshow,animationSpeed:wc_single_product_params.flexslider.animationSpeed,animationLoop:wc_single_product_params.flexslider.animationLoop,start:function(){a.css("opacity",1)}})},b.prototype.initZoom=function(){var b=this.$images,c=this.$target.width(),d=!1;if(this.flexslider_enabled||(b=b.first()),a(b).each(function(b,e){var f=a(e).find("img");if(f.data("large_image_width")>c)return d=!0,!1}),d){var e={touch:!1};"ontouchstart"in window&&(e.on="click"),b.trigger("zoom.destroy"),b.zoom(e)}},b.prototype.initPhotoswipe=function(){this.zoom_enabled&&this.$images.length>0&&(this.$target.prepend('<a href="#" class="woocommerce-product-gallery__trigger">🔍</a>'),this.$target.on("click",".woocommerce-product-gallery__trigger",this.openPhotoswipe)),this.$target.on("click",".woocommerce-product-gallery__image a",this.openPhotoswipe)},b.prototype.onResetSlidePosition=function(){this.$target.flexslider(0)},b.prototype.getGalleryItems=function(){var b=this.$images,c=[];return b.length>0&&b.each(function(b,d){var e=a(d).find("img"),f=e.attr("data-large_image"),g=e.attr("data-large_image_width"),h=e.attr("data-large_image_height"),i={src:f,w:g,h:h,title:e.attr("title")};c.push(i)}),c},b.prototype.openPhotoswipe=function(b){b.preventDefault();var c,d=a(".pswp")[0],e=this.getGalleryItems(),f=a(b.target);c=f.is(".woocommerce-product-gallery__trigger")?this.$target.find(".flex-active-slide"):f.closest(".woocommerce-product-gallery__image");var g=a.extend({index:a(c).index()},wc_single_product_params.photoswipe_options),h=new PhotoSwipe(d,PhotoSwipeUI_Default,e,g);h.init()},a.fn.wc_product_gallery=function(a){return new b(this,a),this},a(".woocommerce-product-gallery").each(function(){a(this).wc_product_gallery()})});
\ No newline at end of file
diff --git a/assets/js/frontend/tokenization-form.js b/assets/js/frontend/tokenization-form.js
new file mode 100644
index 00000000000..fb14a340521
--- /dev/null
+++ b/assets/js/frontend/tokenization-form.js
@@ -0,0 +1,86 @@
+( function( $ ) {
+	$( function() {
+		var wcTokenizationForm = (function() {
+			function wcTokenizationForm( target ) {
+				var $target             = $( target ),
+					$formWrap           = $target.closest( '.payment_box' ),
+					$wcTokenizationForm = this;
+
+				this.onTokenChange = function() {
+					if ( 'new' === $( this ).val() ) {
+						 $wcTokenizationForm.showForm();
+						 $wcTokenizationForm.showSaveNewCheckbox();
+					} else {
+						 $wcTokenizationForm.hideForm();
+						 $wcTokenizationForm.hideSaveNewCheckbox();
+					}
+				};
+
+				this.onCreateAccountChange = function() {
+					if ( $( this ).is( ':checked' ) ) {
+						 $wcTokenizationForm.showSaveNewCheckbox();
+					} else {
+						 $wcTokenizationForm.hideSaveNewCheckbox();
+					}
+				};
+
+				this.onDisplay = function() {
+					// Make sure a radio button is selected if there is no is_default for this payment method..
+					if ( 0 === $( ':input.woocommerce-SavedPaymentMethods-tokenInput:checked', $target ).length ) {
+						$( ':input.woocommerce-SavedPaymentMethods-tokenInput:last', $target ).prop( 'checked', true );
+					}
+
+					// Don't show the "use new" radio button if we only have one method..
+					if ( 0 === $target.data( 'count' ) ) {
+						$( '.woocommerce-SavedPaymentMethods-new', $target ).hide();
+					}
+
+					// Trigger change event
+					$( ':input.woocommerce-SavedPaymentMethods-tokenInput:checked', $target ).trigger( 'change' );
+
+					// Hide "save card" if "Create Account" is not checked.
+					// Check that the field is shown in the form - some plugins and force create account remove it
+					if ( $( 'input#createaccount' ).length && ! $('input#createaccount').is( ':checked' ) ) {
+						$wcTokenizationForm.hideSaveNewCheckbox();
+					}
+
+				};
+
+				this.hideForm = function() {
+					$( '.wc-payment-form', $formWrap ).hide();
+				};
+
+				this.showForm = function() {
+					$( '.wc-payment-form', $formWrap ).show();
+				};
+
+				this.showSaveNewCheckbox = function() {
+					$( '.woocommerce-SavedPaymentMethods-saveNew', $formWrap ).show();
+				};
+
+				this.hideSaveNewCheckbox = function() {
+					$( '.woocommerce-SavedPaymentMethods-saveNew', $formWrap ).hide();
+				};
+
+				// When a radio button is changed, make sure to show/hide our new CC info area
+				$( ':input.woocommerce-SavedPaymentMethods-tokenInput', $target ).change( this.onTokenChange );
+
+				// OR if create account is checked
+				$ ( 'input#createaccount' ).change( this.onCreateAccountChange );
+
+				this.onDisplay();
+			}
+
+			return wcTokenizationForm;
+		})();
+
+		$( document.body ).on( 'updated_checkout wc-credit-card-form-init', function() {
+			// Loop over gateways with saved payment methods
+			var $saved_payment_methods = $( 'ul.woocommerce-SavedPaymentMethods' );
+
+			$saved_payment_methods.each( function() {
+				new wcTokenizationForm( this );
+			} );
+		} );
+	});
+})( jQuery );
diff --git a/assets/js/frontend/tokenization-form.min.js b/assets/js/frontend/tokenization-form.min.js
new file mode 100644
index 00000000000..b2c6ec4088b
--- /dev/null
+++ b/assets/js/frontend/tokenization-form.min.js
@@ -0,0 +1 @@
+!function(a){a(function(){var b=function(){function b(b){var c=a(b),d=c.closest(".payment_box"),e=this;this.onTokenChange=function(){"new"===a(this).val()?(e.showForm(),e.showSaveNewCheckbox()):(e.hideForm(),e.hideSaveNewCheckbox())},this.onCreateAccountChange=function(){a(this).is(":checked")?e.showSaveNewCheckbox():e.hideSaveNewCheckbox()},this.onDisplay=function(){0===a(":input.woocommerce-SavedPaymentMethods-tokenInput:checked",c).length&&a(":input.woocommerce-SavedPaymentMethods-tokenInput:last",c).prop("checked",!0),0===c.data("count")&&a(".woocommerce-SavedPaymentMethods-new",c).hide(),a(":input.woocommerce-SavedPaymentMethods-tokenInput:checked",c).trigger("change"),a("input#createaccount").length&&!a("input#createaccount").is(":checked")&&e.hideSaveNewCheckbox()},this.hideForm=function(){a(".wc-payment-form",d).hide()},this.showForm=function(){a(".wc-payment-form",d).show()},this.showSaveNewCheckbox=function(){a(".woocommerce-SavedPaymentMethods-saveNew",d).show()},this.hideSaveNewCheckbox=function(){a(".woocommerce-SavedPaymentMethods-saveNew",d).hide()},a(":input.woocommerce-SavedPaymentMethods-tokenInput",c).change(this.onTokenChange),a("input#createaccount").change(this.onCreateAccountChange),this.onDisplay()}return b}();a(document.body).on("updated_checkout wc-credit-card-form-init",function(){var c=a("ul.woocommerce-SavedPaymentMethods");c.each(function(){new b(this)})})})}(jQuery);
\ No newline at end of file
diff --git a/assets/js/frontend/woocommerce.js b/assets/js/frontend/woocommerce.js
index 34df84119c6..0a5d4f7c7fe 100644
--- a/assets/js/frontend/woocommerce.js
+++ b/assets/js/frontend/woocommerce.js
@@ -1,3 +1,4 @@
+/* global Cookies */
 jQuery( function( $ ) {
 	// Orderby
 	$( '.woocommerce-ordering' ).on( 'change', 'select.orderby', function() {
@@ -12,4 +13,17 @@ jQuery( function( $ ) {
 			$( this ).val( min );
 		}
 	});
+
+	// Set a cookie and hide the store notice when the dismiss button is clicked
+	jQuery( '.woocommerce-store-notice__dismiss-link' ).click( function() {
+		Cookies.set( 'store_notice', 'hidden', { path: '/' } );
+		jQuery( '.woocommerce-store-notice' ).hide();
+	});
+
+	// Check the value of that cookie and show/hide the notice accordingly
+	if ( 'hidden' === Cookies.get( 'store_notice' ) ) {
+		jQuery( '.woocommerce-store-notice' ).hide();
+	} else {
+		jQuery( '.woocommerce-store-notice' ).show();
+	}
 });
diff --git a/assets/js/frontend/woocommerce.min.js b/assets/js/frontend/woocommerce.min.js
index 10e80b97098..db8bfedfce6 100644
--- a/assets/js/frontend/woocommerce.min.js
+++ b/assets/js/frontend/woocommerce.min.js
@@ -1 +1 @@
-jQuery(function(a){a(".woocommerce-ordering").on("change","select.orderby",function(){a(this).closest("form").submit()}),a("input.qty:not(.product-quantity input.qty)").each(function(){var b=parseFloat(a(this).attr("min"));b>=0&&parseFloat(a(this).val())<b&&a(this).val(b)})});
\ No newline at end of file
+jQuery(function(a){a(".woocommerce-ordering").on("change","select.orderby",function(){a(this).closest("form").submit()}),a("input.qty:not(.product-quantity input.qty)").each(function(){var b=parseFloat(a(this).attr("min"));b>=0&&parseFloat(a(this).val())<b&&a(this).val(b)}),jQuery(".woocommerce-store-notice__dismiss-link").click(function(){Cookies.set("store_notice","hidden",{path:"/"}),jQuery(".woocommerce-store-notice").hide()}),"hidden"===Cookies.get("store_notice")?jQuery(".woocommerce-store-notice").hide():jQuery(".woocommerce-store-notice").show()});
\ No newline at end of file
diff --git a/assets/js/jquery-blockui/jquery.blockUI.min.js b/assets/js/jquery-blockui/jquery.blockUI.min.js
index 0571d56cf2c..36dab7dd11b 100644
--- a/assets/js/jquery-blockui/jquery.blockUI.min.js
+++ b/assets/js/jquery-blockui/jquery.blockUI.min.js
@@ -11,4 +11,4 @@
  *
  * Thanks to Amir-Hossein Sobhi for some excellent contributions!
  */
-!function(){"use strict";function a(a){function b(b,d){var f,p,q=b==window,r=d&&void 0!==d.message?d.message:void 0;if(d=a.extend({},a.blockUI.defaults,d||{}),!d.ignoreIfBlocked||!a(b).data("blockUI.isBlocked")){if(d.overlayCSS=a.extend({},a.blockUI.defaults.overlayCSS,d.overlayCSS||{}),f=a.extend({},a.blockUI.defaults.css,d.css||{}),d.onOverlayClick&&(d.overlayCSS.cursor="pointer"),p=a.extend({},a.blockUI.defaults.themedCSS,d.themedCSS||{}),r=void 0===r?d.message:r,q&&n&&c(window,{fadeOut:0}),r&&"string"!=typeof r&&(r.parentNode||r.jquery)){var s=r.jquery?r[0]:r,t={};a(b).data("blockUI.history",t),t.el=s,t.parent=s.parentNode,t.display=s.style.display,t.position=s.style.position,t.parent&&t.parent.removeChild(s)}a(b).data("blockUI.onUnblock",d.onUnblock);var u,v,w,x,y=d.baseZ;u=a(k||d.forceIframe?'<iframe class="blockUI" style="z-index:'+y++ +';display:none;border:none;margin:0;padding:0;position:absolute;width:100%;height:100%;top:0;left:0" src="'+d.iframeSrc+'"></iframe>':'<div class="blockUI" style="display:none"></div>'),v=a(d.theme?'<div class="blockUI blockOverlay ui-widget-overlay" style="z-index:'+y++ +';display:none"></div>':'<div class="blockUI blockOverlay" style="z-index:'+y++ +';display:none;border:none;margin:0;padding:0;width:100%;height:100%;top:0;left:0"></div>'),d.theme&&q?(x='<div class="blockUI '+d.blockMsgClass+' blockPage ui-dialog ui-widget ui-corner-all" style="z-index:'+(y+10)+';display:none;position:fixed">',d.title&&(x+='<div class="ui-widget-header ui-dialog-titlebar ui-corner-all blockTitle">'+(d.title||"&nbsp;")+"</div>"),x+='<div class="ui-widget-content ui-dialog-content"></div>',x+="</div>"):d.theme?(x='<div class="blockUI '+d.blockMsgClass+' blockElement ui-dialog ui-widget ui-corner-all" style="z-index:'+(y+10)+';display:none;position:absolute">',d.title&&(x+='<div class="ui-widget-header ui-dialog-titlebar ui-corner-all blockTitle">'+(d.title||"&nbsp;")+"</div>"),x+='<div class="ui-widget-content ui-dialog-content"></div>',x+="</div>"):x=q?'<div class="blockUI '+d.blockMsgClass+' blockPage" style="z-index:'+(y+10)+';display:none;position:fixed"></div>':'<div class="blockUI '+d.blockMsgClass+' blockElement" style="z-index:'+(y+10)+';display:none;position:absolute"></div>',w=a(x),r&&(d.theme?(w.css(p),w.addClass("ui-widget-content")):w.css(f)),d.theme||v.css(d.overlayCSS),v.css("position",q?"fixed":"absolute"),(k||d.forceIframe)&&u.css("opacity",0);var z=[u,v,w],A=a(q?"body":b);a.each(z,function(){this.appendTo(A)}),d.theme&&d.draggable&&a.fn.draggable&&w.draggable({handle:".ui-dialog-titlebar",cancel:"li"});var B=m&&(!a.support.boxModel||a("object,embed",q?null:b).length>0);if(l||B){if(q&&d.allowBodyStretch&&a.support.boxModel&&a("html,body").css("height","100%"),(l||!a.support.boxModel)&&!q)var C=i(b,"borderTopWidth"),D=i(b,"borderLeftWidth"),E=C?"(0 - "+C+")":0,F=D?"(0 - "+D+")":0;a.each(z,function(a,b){var c=b[0].style;if(c.position="absolute",2>a)q?c.setExpression("height","Math.max(document.body.scrollHeight, document.body.offsetHeight) - (jQuery.support.boxModel?0:"+d.quirksmodeOffsetHack+') + "px"'):c.setExpression("height",'this.parentNode.offsetHeight + "px"'),q?c.setExpression("width",'jQuery.support.boxModel && document.documentElement.clientWidth || document.body.clientWidth + "px"'):c.setExpression("width",'this.parentNode.offsetWidth + "px"'),F&&c.setExpression("left",F),E&&c.setExpression("top",E);else if(d.centerY)q&&c.setExpression("top",'(document.documentElement.clientHeight || document.body.clientHeight) / 2 - (this.offsetHeight / 2) + (blah = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + "px"'),c.marginTop=0;else if(!d.centerY&&q){var e=d.css&&d.css.top?parseInt(d.css.top,10):0,f="((document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + "+e+') + "px"';c.setExpression("top",f)}})}if(r&&(d.theme?w.find(".ui-widget-content").append(r):w.append(r),(r.jquery||r.nodeType)&&a(r).show()),(k||d.forceIframe)&&d.showOverlay&&u.show(),d.fadeIn){var G=d.onBlock?d.onBlock:j,H=d.showOverlay&&!r?G:j,I=r?G:j;d.showOverlay&&v._fadeIn(d.fadeIn,H),r&&w._fadeIn(d.fadeIn,I)}else d.showOverlay&&v.show(),r&&w.show(),d.onBlock&&d.onBlock.bind(w)();if(e(1,b,d),q?(n=w[0],o=a(d.focusableElements,n),d.focusInput&&setTimeout(g,20)):h(w[0],d.centerX,d.centerY),d.timeout){var J=setTimeout(function(){q?a.unblockUI(d):a(b).unblock(d)},d.timeout);a(b).data("blockUI.timeout",J)}}}function c(b,c){var f,g=b==window,h=a(b),i=h.data("blockUI.history"),j=h.data("blockUI.timeout");j&&(clearTimeout(j),h.removeData("blockUI.timeout")),c=a.extend({},a.blockUI.defaults,c||{}),e(0,b,c),null===c.onUnblock&&(c.onUnblock=h.data("blockUI.onUnblock"),h.removeData("blockUI.onUnblock"));var k;k=g?a(document.body).children().filter(".blockUI").add("body > .blockUI"):h.find(">.blockUI"),c.cursorReset&&(k.length>1&&(k[1].style.cursor=c.cursorReset),k.length>2&&(k[2].style.cursor=c.cursorReset)),g&&(n=o=null),c.fadeOut?(f=k.length,k.stop().fadeOut(c.fadeOut,function(){0===--f&&d(k,i,c,b)})):d(k,i,c,b)}function d(b,c,d,e){var f=a(e);if(!f.data("blockUI.isBlocked")){b.each(function(a,b){this.parentNode&&this.parentNode.removeChild(this)}),c&&c.el&&(c.el.style.display=c.display,c.el.style.position=c.position,c.el.style.cursor="default",c.parent&&c.parent.appendChild(c.el),f.removeData("blockUI.history")),f.data("blockUI.static")&&f.css("position","static"),"function"==typeof d.onUnblock&&d.onUnblock(e,d);var g=a(document.body),h=g.width(),i=g[0].style.width;g.width(h-1).width(h),g[0].style.width=i}}function e(b,c,d){var e=c==window,g=a(c);if((b||(!e||n)&&(e||g.data("blockUI.isBlocked")))&&(g.data("blockUI.isBlocked",b),e&&d.bindEvents&&(!b||d.showOverlay))){var h="mousedown mouseup keydown keypress keyup touchstart touchend touchmove";b?a(document).bind(h,d,f):a(document).unbind(h,f)}}function f(b){if("keydown"===b.type&&b.keyCode&&9==b.keyCode&&n&&b.data.constrainTabKey){var c=o,d=!b.shiftKey&&b.target===c[c.length-1],e=b.shiftKey&&b.target===c[0];if(d||e)return setTimeout(function(){g(e)},10),!1}var f=b.data,h=a(b.target);return h.hasClass("blockOverlay")&&f.onOverlayClick&&f.onOverlayClick(b),h.parents("div."+f.blockMsgClass).length>0?!0:0===h.parents().children().filter("div.blockUI").length}function g(a){if(o){var b=o[a===!0?o.length-1:0];b&&b.focus()}}function h(a,b,c){var d=a.parentNode,e=a.style,f=(d.offsetWidth-a.offsetWidth)/2-i(d,"borderLeftWidth"),g=(d.offsetHeight-a.offsetHeight)/2-i(d,"borderTopWidth");b&&(e.left=f>0?f+"px":"0"),c&&(e.top=g>0?g+"px":"0")}function i(b,c){return parseInt(a.css(b,c),10)||0}a.fn._fadeIn=a.fn.fadeIn;var j=a.noop||function(){},k=/MSIE/.test(navigator.userAgent),l=/MSIE 6.0/.test(navigator.userAgent)&&!/MSIE 8.0/.test(navigator.userAgent),m=(document.documentMode||0,a.isFunction(document.createElement("div").style.setExpression));a.blockUI=function(a){b(window,a)},a.unblockUI=function(a){c(window,a)},a.growlUI=function(b,c,d,e){var f=a('<div class="growlUI"></div>');b&&f.append("<h1>"+b+"</h1>"),c&&f.append("<h2>"+c+"</h2>"),void 0===d&&(d=3e3);var g=function(b){b=b||{},a.blockUI({message:f,fadeIn:"undefined"!=typeof b.fadeIn?b.fadeIn:700,fadeOut:"undefined"!=typeof b.fadeOut?b.fadeOut:1e3,timeout:"undefined"!=typeof b.timeout?b.timeout:d,centerY:!1,showOverlay:!1,onUnblock:e,css:a.blockUI.defaults.growlCSS})};g();f.css("opacity");f.mouseover(function(){g({fadeIn:0,timeout:3e4});var b=a(".blockMsg");b.stop(),b.fadeTo(300,1)}).mouseout(function(){a(".blockMsg").fadeOut(1e3)})},a.fn.block=function(c){if(this[0]===window)return a.blockUI(c),this;var d=a.extend({},a.blockUI.defaults,c||{});return this.each(function(){var b=a(this);d.ignoreIfBlocked&&b.data("blockUI.isBlocked")||b.unblock({fadeOut:0})}),this.each(function(){"static"==a.css(this,"position")&&(this.style.position="relative",a(this).data("blockUI.static",!0)),this.style.zoom=1,b(this,c)})},a.fn.unblock=function(b){return this[0]===window?(a.unblockUI(b),this):this.each(function(){c(this,b)})},a.blockUI.version=2.7,a.blockUI.defaults={message:"<h1>Please wait...</h1>",title:null,draggable:!0,theme:!1,css:{padding:0,margin:0,width:"30%",top:"40%",left:"35%",textAlign:"center",color:"#000",border:"3px solid #aaa",backgroundColor:"#fff",cursor:"wait"},themedCSS:{width:"30%",top:"40%",left:"35%"},overlayCSS:{backgroundColor:"#000",opacity:.6,cursor:"wait"},cursorReset:"default",growlCSS:{width:"350px",top:"10px",left:"",right:"10px",border:"none",padding:"5px",opacity:.6,cursor:"default",color:"#fff",backgroundColor:"#000","-webkit-border-radius":"10px","-moz-border-radius":"10px","border-radius":"10px"},iframeSrc:/^https/i.test(window.location.href||"")?"javascript:false":"about:blank",forceIframe:!1,baseZ:1e3,centerX:!0,centerY:!0,allowBodyStretch:!0,bindEvents:!0,constrainTabKey:!0,fadeIn:200,fadeOut:400,timeout:0,showOverlay:!0,focusInput:!0,focusableElements:":input:enabled:visible",onBlock:null,onUnblock:null,onOverlayClick:null,quirksmodeOffsetHack:4,blockMsgClass:"blockMsg",ignoreIfBlocked:!1};var n=null,o=[]}"function"==typeof define&&define.amd&&define.amd.jQuery?define(["jquery"],a):a(jQuery)}();
\ No newline at end of file
+!function(){"use strict";function a(a){function b(b,d){var f,p,q=b==window,r=d&&void 0!==d.message?d.message:void 0;if(d=a.extend({},a.blockUI.defaults,d||{}),!d.ignoreIfBlocked||!a(b).data("blockUI.isBlocked")){if(d.overlayCSS=a.extend({},a.blockUI.defaults.overlayCSS,d.overlayCSS||{}),f=a.extend({},a.blockUI.defaults.css,d.css||{}),d.onOverlayClick&&(d.overlayCSS.cursor="pointer"),p=a.extend({},a.blockUI.defaults.themedCSS,d.themedCSS||{}),r=void 0===r?d.message:r,q&&n&&c(window,{fadeOut:0}),r&&"string"!=typeof r&&(r.parentNode||r.jquery)){var s=r.jquery?r[0]:r,t={};a(b).data("blockUI.history",t),t.el=s,t.parent=s.parentNode,t.display=s.style.display,t.position=s.style.position,t.parent&&t.parent.removeChild(s)}a(b).data("blockUI.onUnblock",d.onUnblock);var u,v,w,x,y=d.baseZ;u=a(k||d.forceIframe?'<iframe class="blockUI" style="z-index:'+y++ +';display:none;border:none;margin:0;padding:0;position:absolute;width:100%;height:100%;top:0;left:0" src="'+d.iframeSrc+'"></iframe>':'<div class="blockUI" style="display:none"></div>'),v=a(d.theme?'<div class="blockUI blockOverlay ui-widget-overlay" style="z-index:'+y++ +';display:none"></div>':'<div class="blockUI blockOverlay" style="z-index:'+y++ +';display:none;border:none;margin:0;padding:0;width:100%;height:100%;top:0;left:0"></div>'),d.theme&&q?(x='<div class="blockUI '+d.blockMsgClass+' blockPage ui-dialog ui-widget ui-corner-all" style="z-index:'+(y+10)+';display:none;position:fixed">',d.title&&(x+='<div class="ui-widget-header ui-dialog-titlebar ui-corner-all blockTitle">'+(d.title||"&nbsp;")+"</div>"),x+='<div class="ui-widget-content ui-dialog-content"></div>',x+="</div>"):d.theme?(x='<div class="blockUI '+d.blockMsgClass+' blockElement ui-dialog ui-widget ui-corner-all" style="z-index:'+(y+10)+';display:none;position:absolute">',d.title&&(x+='<div class="ui-widget-header ui-dialog-titlebar ui-corner-all blockTitle">'+(d.title||"&nbsp;")+"</div>"),x+='<div class="ui-widget-content ui-dialog-content"></div>',x+="</div>"):x=q?'<div class="blockUI '+d.blockMsgClass+' blockPage" style="z-index:'+(y+10)+';display:none;position:fixed"></div>':'<div class="blockUI '+d.blockMsgClass+' blockElement" style="z-index:'+(y+10)+';display:none;position:absolute"></div>',w=a(x),r&&(d.theme?(w.css(p),w.addClass("ui-widget-content")):w.css(f)),d.theme||v.css(d.overlayCSS),v.css("position",q?"fixed":"absolute"),(k||d.forceIframe)&&u.css("opacity",0);var z=[u,v,w],A=a(q?"body":b);a.each(z,function(){this.appendTo(A)}),d.theme&&d.draggable&&a.fn.draggable&&w.draggable({handle:".ui-dialog-titlebar",cancel:"li"});var B=m&&(!a.support.boxModel||a("object,embed",q?null:b).length>0);if(l||B){if(q&&d.allowBodyStretch&&a.support.boxModel&&a("html,body").css("height","100%"),(l||!a.support.boxModel)&&!q)var C=i(b,"borderTopWidth"),D=i(b,"borderLeftWidth"),E=C?"(0 - "+C+")":0,F=D?"(0 - "+D+")":0;a.each(z,function(a,b){var c=b[0].style;if(c.position="absolute",a<2)q?c.setExpression("height","Math.max(document.body.scrollHeight, document.body.offsetHeight) - (jQuery.support.boxModel?0:"+d.quirksmodeOffsetHack+') + "px"'):c.setExpression("height",'this.parentNode.offsetHeight + "px"'),q?c.setExpression("width",'jQuery.support.boxModel && document.documentElement.clientWidth || document.body.clientWidth + "px"'):c.setExpression("width",'this.parentNode.offsetWidth + "px"'),F&&c.setExpression("left",F),E&&c.setExpression("top",E);else if(d.centerY)q&&c.setExpression("top",'(document.documentElement.clientHeight || document.body.clientHeight) / 2 - (this.offsetHeight / 2) + (blah = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + "px"'),c.marginTop=0;else if(!d.centerY&&q){var e=d.css&&d.css.top?parseInt(d.css.top,10):0,f="((document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + "+e+') + "px"';c.setExpression("top",f)}})}if(r&&(d.theme?w.find(".ui-widget-content").append(r):w.append(r),(r.jquery||r.nodeType)&&a(r).show()),(k||d.forceIframe)&&d.showOverlay&&u.show(),d.fadeIn){var G=d.onBlock?d.onBlock:j,H=d.showOverlay&&!r?G:j,I=r?G:j;d.showOverlay&&v._fadeIn(d.fadeIn,H),r&&w._fadeIn(d.fadeIn,I)}else d.showOverlay&&v.show(),r&&w.show(),d.onBlock&&d.onBlock.bind(w)();if(e(1,b,d),q?(n=w[0],o=a(d.focusableElements,n),d.focusInput&&setTimeout(g,20)):h(w[0],d.centerX,d.centerY),d.timeout){var J=setTimeout(function(){q?a.unblockUI(d):a(b).unblock(d)},d.timeout);a(b).data("blockUI.timeout",J)}}}function c(b,c){var f,g=b==window,h=a(b),i=h.data("blockUI.history"),j=h.data("blockUI.timeout");j&&(clearTimeout(j),h.removeData("blockUI.timeout")),c=a.extend({},a.blockUI.defaults,c||{}),e(0,b,c),null===c.onUnblock&&(c.onUnblock=h.data("blockUI.onUnblock"),h.removeData("blockUI.onUnblock"));var k;k=g?a(document.body).children().filter(".blockUI").add("body > .blockUI"):h.find(">.blockUI"),c.cursorReset&&(k.length>1&&(k[1].style.cursor=c.cursorReset),k.length>2&&(k[2].style.cursor=c.cursorReset)),g&&(n=o=null),c.fadeOut?(f=k.length,k.stop().fadeOut(c.fadeOut,function(){0===--f&&d(k,i,c,b)})):d(k,i,c,b)}function d(b,c,d,e){var f=a(e);if(!f.data("blockUI.isBlocked")){b.each(function(a,b){this.parentNode&&this.parentNode.removeChild(this)}),c&&c.el&&(c.el.style.display=c.display,c.el.style.position=c.position,c.el.style.cursor="default",c.parent&&c.parent.appendChild(c.el),f.removeData("blockUI.history")),f.data("blockUI.static")&&f.css("position","static"),"function"==typeof d.onUnblock&&d.onUnblock(e,d);var g=a(document.body),h=g.width(),i=g[0].style.width;g.width(h-1).width(h),g[0].style.width=i}}function e(b,c,d){var e=c==window,g=a(c);if((b||(!e||n)&&(e||g.data("blockUI.isBlocked")))&&(g.data("blockUI.isBlocked",b),e&&d.bindEvents&&(!b||d.showOverlay))){var h="mousedown mouseup keydown keypress keyup touchstart touchend touchmove";b?a(document).bind(h,d,f):a(document).unbind(h,f)}}function f(b){if("keydown"===b.type&&b.keyCode&&9==b.keyCode&&n&&b.data.constrainTabKey){var c=o,d=!b.shiftKey&&b.target===c[c.length-1],e=b.shiftKey&&b.target===c[0];if(d||e)return setTimeout(function(){g(e)},10),!1}var f=b.data,h=a(b.target);return h.hasClass("blockOverlay")&&f.onOverlayClick&&f.onOverlayClick(b),h.parents("div."+f.blockMsgClass).length>0||0===h.parents().children().filter("div.blockUI").length}function g(a){if(o){var b=o[a===!0?o.length-1:0];b&&b.focus()}}function h(a,b,c){var d=a.parentNode,e=a.style,f=(d.offsetWidth-a.offsetWidth)/2-i(d,"borderLeftWidth"),g=(d.offsetHeight-a.offsetHeight)/2-i(d,"borderTopWidth");b&&(e.left=f>0?f+"px":"0"),c&&(e.top=g>0?g+"px":"0")}function i(b,c){return parseInt(a.css(b,c),10)||0}a.fn._fadeIn=a.fn.fadeIn;var j=a.noop||function(){},k=/MSIE/.test(navigator.userAgent),l=/MSIE 6.0/.test(navigator.userAgent)&&!/MSIE 8.0/.test(navigator.userAgent),m=(document.documentMode||0,a.isFunction(document.createElement("div").style.setExpression));a.blockUI=function(a){b(window,a)},a.unblockUI=function(a){c(window,a)},a.growlUI=function(b,c,d,e){var f=a('<div class="growlUI"></div>');b&&f.append("<h1>"+b+"</h1>"),c&&f.append("<h2>"+c+"</h2>"),void 0===d&&(d=3e3);var g=function(b){b=b||{},a.blockUI({message:f,fadeIn:"undefined"!=typeof b.fadeIn?b.fadeIn:700,fadeOut:"undefined"!=typeof b.fadeOut?b.fadeOut:1e3,timeout:"undefined"!=typeof b.timeout?b.timeout:d,centerY:!1,showOverlay:!1,onUnblock:e,css:a.blockUI.defaults.growlCSS})};g();f.css("opacity");f.mouseover(function(){g({fadeIn:0,timeout:3e4});var b=a(".blockMsg");b.stop(),b.fadeTo(300,1)}).mouseout(function(){a(".blockMsg").fadeOut(1e3)})},a.fn.block=function(c){if(this[0]===window)return a.blockUI(c),this;var d=a.extend({},a.blockUI.defaults,c||{});return this.each(function(){var b=a(this);d.ignoreIfBlocked&&b.data("blockUI.isBlocked")||b.unblock({fadeOut:0})}),this.each(function(){"static"==a.css(this,"position")&&(this.style.position="relative",a(this).data("blockUI.static",!0)),this.style.zoom=1,b(this,c)})},a.fn.unblock=function(b){return this[0]===window?(a.unblockUI(b),this):this.each(function(){c(this,b)})},a.blockUI.version=2.7,a.blockUI.defaults={message:"<h1>Please wait...</h1>",title:null,draggable:!0,theme:!1,css:{padding:0,margin:0,width:"30%",top:"40%",left:"35%",textAlign:"center",color:"#000",border:"3px solid #aaa",backgroundColor:"#fff",cursor:"wait"},themedCSS:{width:"30%",top:"40%",left:"35%"},overlayCSS:{backgroundColor:"#000",opacity:.6,cursor:"wait"},cursorReset:"default",growlCSS:{width:"350px",top:"10px",left:"",right:"10px",border:"none",padding:"5px",opacity:.6,cursor:"default",color:"#fff",backgroundColor:"#000","-webkit-border-radius":"10px","-moz-border-radius":"10px","border-radius":"10px"},iframeSrc:/^https/i.test(window.location.href||"")?"javascript:false":"about:blank",forceIframe:!1,baseZ:1e3,centerX:!0,centerY:!0,allowBodyStretch:!0,bindEvents:!0,constrainTabKey:!0,fadeIn:200,fadeOut:400,timeout:0,showOverlay:!0,focusInput:!0,focusableElements:":input:enabled:visible",onBlock:null,onUnblock:null,onOverlayClick:null,quirksmodeOffsetHack:4,blockMsgClass:"blockMsg",ignoreIfBlocked:!1};var n=null,o=[]}"function"==typeof define&&define.amd&&define.amd.jQuery?define(["jquery"],a):a(jQuery)}();
\ No newline at end of file
diff --git a/assets/js/jquery-cookie/jquery.cookie.min.js b/assets/js/jquery-cookie/jquery.cookie.min.js
index 5be813ad400..10486ae1815 100644
--- a/assets/js/jquery-cookie/jquery.cookie.min.js
+++ b/assets/js/jquery-cookie/jquery.cookie.min.js
@@ -5,4 +5,4 @@
  * Copyright 2013 Klaus Hartl
  * Released under the MIT license
  */
-!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):a("object"==typeof exports?require("jquery"):jQuery)}(function(a){function b(a){return h.raw?a:encodeURIComponent(a)}function c(a){return h.raw?a:decodeURIComponent(a)}function d(a){return b(h.json?JSON.stringify(a):String(a))}function e(a){0===a.indexOf('"')&&(a=a.slice(1,-1).replace(/\\"/g,'"').replace(/\\\\/g,"\\"));try{return a=decodeURIComponent(a.replace(g," ")),h.json?JSON.parse(a):a}catch(b){}}function f(b,c){var d=h.raw?b:e(b);return a.isFunction(c)?c(d):d}var g=/\+/g,h=a.cookie=function(e,g,i){if(void 0!==g&&!a.isFunction(g)){if(i=a.extend({},h.defaults,i),"number"==typeof i.expires){var j=i.expires,k=i.expires=new Date;k.setTime(+k+864e5*j)}return document.cookie=[b(e),"=",d(g),i.expires?"; expires="+i.expires.toUTCString():"",i.path?"; path="+i.path:"",i.domain?"; domain="+i.domain:"",i.secure?"; secure":""].join("")}for(var l=e?void 0:{},m=document.cookie?document.cookie.split("; "):[],n=0,o=m.length;o>n;n++){var p=m[n].split("="),q=c(p.shift()),r=p.join("=");if(e&&e===q){l=f(r,g);break}e||void 0===(r=f(r))||(l[q]=r)}return l};h.defaults={},a.removeCookie=function(b,c){return void 0===a.cookie(b)?!1:(a.cookie(b,"",a.extend({},c,{expires:-1})),!a.cookie(b))}});
\ No newline at end of file
+!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):a("object"==typeof exports?require("jquery"):jQuery)}(function(a){function b(a){return h.raw?a:encodeURIComponent(a)}function c(a){return h.raw?a:decodeURIComponent(a)}function d(a){return b(h.json?JSON.stringify(a):String(a))}function e(a){0===a.indexOf('"')&&(a=a.slice(1,-1).replace(/\\"/g,'"').replace(/\\\\/g,"\\"));try{return a=decodeURIComponent(a.replace(g," ")),h.json?JSON.parse(a):a}catch(a){}}function f(b,c){var d=h.raw?b:e(b);return a.isFunction(c)?c(d):d}var g=/\+/g,h=a.cookie=function(e,g,i){if(void 0!==g&&!a.isFunction(g)){if(i=a.extend({},h.defaults,i),"number"==typeof i.expires){var j=i.expires,k=i.expires=new Date;k.setTime(+k+864e5*j)}return document.cookie=[b(e),"=",d(g),i.expires?"; expires="+i.expires.toUTCString():"",i.path?"; path="+i.path:"",i.domain?"; domain="+i.domain:"",i.secure?"; secure":""].join("")}for(var l=e?void 0:{},m=document.cookie?document.cookie.split("; "):[],n=0,o=m.length;n<o;n++){var p=m[n].split("="),q=c(p.shift()),r=p.join("=");if(e&&e===q){l=f(r,g);break}e||void 0===(r=f(r))||(l[q]=r)}return l};h.defaults={},a.removeCookie=function(b,c){return void 0!==a.cookie(b)&&(a.cookie(b,"",a.extend({},c,{expires:-1})),!a.cookie(b))}});
\ No newline at end of file
diff --git a/assets/js/jquery-flot/jquery.flot.min.js b/assets/js/jquery-flot/jquery.flot.min.js
index 21503f5b71a..a06e6705cab 100644
--- a/assets/js/jquery-flot/jquery.flot.min.js
+++ b/assets/js/jquery-flot/jquery.flot.min.js
@@ -1,2 +1,2 @@
-!function(a){a.color={},a.color.make=function(b,c,d,e){var f={};return f.r=b||0,f.g=c||0,f.b=d||0,f.a=null!=e?e:1,f.add=function(a,b){for(var c=0;c<a.length;++c)f[a.charAt(c)]+=b;return f.normalize()},f.scale=function(a,b){for(var c=0;c<a.length;++c)f[a.charAt(c)]*=b;return f.normalize()},f.toString=function(){return f.a>=1?"rgb("+[f.r,f.g,f.b].join(",")+")":"rgba("+[f.r,f.g,f.b,f.a].join(",")+")"},f.normalize=function(){function a(a,b,c){return a>b?a:b>c?c:b}return f.r=a(0,parseInt(f.r),255),f.g=a(0,parseInt(f.g),255),f.b=a(0,parseInt(f.b),255),f.a=a(0,f.a,1),f},f.clone=function(){return a.color.make(f.r,f.b,f.g,f.a)},f.normalize()},a.color.extract=function(b,c){var d;do{if(d=b.css(c).toLowerCase(),""!=d&&"transparent"!=d)break;b=b.parent()}while(!a.nodeName(b.get(0),"body"));return"rgba(0, 0, 0, 0)"==d&&(d="transparent"),a.color.parse(d)},a.color.parse=function(c){var d,e=a.color.make;if(d=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(c))return e(parseInt(d[1],10),parseInt(d[2],10),parseInt(d[3],10));if(d=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(c))return e(parseInt(d[1],10),parseInt(d[2],10),parseInt(d[3],10),parseFloat(d[4]));if(d=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(c))return e(2.55*parseFloat(d[1]),2.55*parseFloat(d[2]),2.55*parseFloat(d[3]));if(d=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(c))return e(2.55*parseFloat(d[1]),2.55*parseFloat(d[2]),2.55*parseFloat(d[3]),parseFloat(d[4]));if(d=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(c))return e(parseInt(d[1],16),parseInt(d[2],16),parseInt(d[3],16));if(d=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(c))return e(parseInt(d[1]+d[1],16),parseInt(d[2]+d[2],16),parseInt(d[3]+d[3],16));var f=a.trim(c).toLowerCase();return"transparent"==f?e(255,255,255,0):(d=b[f]||[0,0,0],e(d[0],d[1],d[2]))};var b={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]}}(jQuery),function(a){function b(b,c){var d=c.children("."+b)[0];if(null==d&&(d=document.createElement("canvas"),d.className=b,a(d).css({direction:"ltr",position:"absolute",left:0,top:0}).appendTo(c),!d.getContext)){if(!window.G_vmlCanvasManager)throw new Error("Canvas is not available. If you're using IE with a fall-back such as Excanvas, then there's either a mistake in your conditional include, or the page has no DOCTYPE and is rendering in Quirks Mode.");d=window.G_vmlCanvasManager.initElement(d)}this.element=d;var e=this.context=d.getContext("2d"),f=window.devicePixelRatio||1,g=e.webkitBackingStorePixelRatio||e.mozBackingStorePixelRatio||e.msBackingStorePixelRatio||e.oBackingStorePixelRatio||e.backingStorePixelRatio||1;this.pixelRatio=f/g,this.resize(c.width(),c.height()),this.textContainer=null,this.text={},this._textCache={}}function c(c,e,f,g){function h(a,b){b=[qa].concat(b);for(var c=0;c<a.length;++c)a[c].apply(this,b)}function i(){for(var c={Canvas:b},d=0;d<g.length;++d){var e=g[d];e.init(qa,c),e.options&&a.extend(!0,ea,e.options)}}function j(b){a.extend(!0,ea,b),b&&b.colors&&(ea.colors=b.colors),null==ea.xaxis.color&&(ea.xaxis.color=a.color.parse(ea.grid.color).scale("a",.22).toString()),null==ea.yaxis.color&&(ea.yaxis.color=a.color.parse(ea.grid.color).scale("a",.22).toString()),null==ea.xaxis.tickColor&&(ea.xaxis.tickColor=ea.grid.tickColor||ea.xaxis.color),null==ea.yaxis.tickColor&&(ea.yaxis.tickColor=ea.grid.tickColor||ea.yaxis.color),null==ea.grid.borderColor&&(ea.grid.borderColor=ea.grid.color),null==ea.grid.tickColor&&(ea.grid.tickColor=a.color.parse(ea.grid.color).scale("a",.22).toString());var d,e,f,g={style:c.css("font-style"),size:Math.round(.8*(+c.css("font-size").replace("px","")||13)),variant:c.css("font-variant"),weight:c.css("font-weight"),family:c.css("font-family")};for(g.lineHeight=1.15*g.size,f=ea.xaxes.length||1,d=0;f>d;++d)e=ea.xaxes[d],e&&!e.tickColor&&(e.tickColor=e.color),e=a.extend(!0,{},ea.xaxis,e),ea.xaxes[d]=e,e.font&&(e.font=a.extend({},g,e.font),e.font.color||(e.font.color=e.color));for(f=ea.yaxes.length||1,d=0;f>d;++d)e=ea.yaxes[d],e&&!e.tickColor&&(e.tickColor=e.color),e=a.extend(!0,{},ea.yaxis,e),ea.yaxes[d]=e,e.font&&(e.font=a.extend({},g,e.font),e.font.color||(e.font.color=e.color));for(ea.xaxis.noTicks&&null==ea.xaxis.ticks&&(ea.xaxis.ticks=ea.xaxis.noTicks),ea.yaxis.noTicks&&null==ea.yaxis.ticks&&(ea.yaxis.ticks=ea.yaxis.noTicks),ea.x2axis&&(ea.xaxes[1]=a.extend(!0,{},ea.xaxis,ea.x2axis),ea.xaxes[1].position="top"),ea.y2axis&&(ea.yaxes[1]=a.extend(!0,{},ea.yaxis,ea.y2axis),ea.yaxes[1].position="right"),ea.grid.coloredAreas&&(ea.grid.markings=ea.grid.coloredAreas),ea.grid.coloredAreasColor&&(ea.grid.markingsColor=ea.grid.coloredAreasColor),ea.lines&&a.extend(!0,ea.series.lines,ea.lines),ea.points&&a.extend(!0,ea.series.points,ea.points),ea.bars&&a.extend(!0,ea.series.bars,ea.bars),null!=ea.shadowSize&&(ea.series.shadowSize=ea.shadowSize),null!=ea.highlightColor&&(ea.series.highlightColor=ea.highlightColor),d=0;d<ea.xaxes.length;++d)q(ka,d+1).options=ea.xaxes[d];for(d=0;d<ea.yaxes.length;++d)q(la,d+1).options=ea.yaxes[d];for(var i in pa)ea.hooks[i]&&ea.hooks[i].length&&(pa[i]=pa[i].concat(ea.hooks[i]));h(pa.processOptions,[ea])}function k(a){da=l(a),r(),s()}function l(b){for(var c=[],d=0;d<b.length;++d){var e=a.extend(!0,{},ea.series);null!=b[d].data?(e.data=b[d].data,delete b[d].data,a.extend(!0,e,b[d]),b[d].data=e.data):e.data=b[d],c.push(e)}return c}function m(a,b){var c=a[b+"axis"];return"object"==typeof c&&(c=c.n),"number"!=typeof c&&(c=1),c}function n(){return a.grep(ka.concat(la),function(a){return a})}function o(a){var b,c,d={};for(b=0;b<ka.length;++b)c=ka[b],c&&c.used&&(d["x"+c.n]=c.c2p(a.left));for(b=0;b<la.length;++b)c=la[b],c&&c.used&&(d["y"+c.n]=c.c2p(a.top));return void 0!==d.x1&&(d.x=d.x1),void 0!==d.y1&&(d.y=d.y1),d}function p(a){var b,c,d,e={};for(b=0;b<ka.length;++b)if(c=ka[b],c&&c.used&&(d="x"+c.n,null==a[d]&&1==c.n&&(d="x"),null!=a[d])){e.left=c.p2c(a[d]);break}for(b=0;b<la.length;++b)if(c=la[b],c&&c.used&&(d="y"+c.n,null==a[d]&&1==c.n&&(d="y"),null!=a[d])){e.top=c.p2c(a[d]);break}return e}function q(b,c){return b[c-1]||(b[c-1]={n:c,direction:b==ka?"x":"y",options:a.extend(!0,{},b==ka?ea.xaxis:ea.yaxis)}),b[c-1]}function r(){var b,c=da.length,d=-1;for(b=0;b<da.length;++b){var e=da[b].color;null!=e&&(c--,"number"==typeof e&&e>d&&(d=e))}d>=c&&(c=d+1);var f,g=[],h=ea.colors,i=h.length,j=0;for(b=0;c>b;b++)f=a.color.parse(h[b%i]||"#666"),b%i==0&&b&&(j=j>=0?.5>j?-j-.2:0:-j),g[b]=f.scale("rgb",1+j);var k,l=0;for(b=0;b<da.length;++b){if(k=da[b],null==k.color?(k.color=g[l].toString(),++l):"number"==typeof k.color&&(k.color=g[k.color].toString()),null==k.lines.show){var n,o=!0;for(n in k)if(k[n]&&k[n].show){o=!1;break}o&&(k.lines.show=!0)}null==k.lines.zero&&(k.lines.zero=!!k.lines.fill),k.xaxis=q(ka,m(k,"x")),k.yaxis=q(la,m(k,"y"))}}function s(){function b(a,b,c){b<a.datamin&&b!=-s&&(a.datamin=b),c>a.datamax&&c!=s&&(a.datamax=c)}var c,d,e,f,g,i,j,k,l,m,o,p,q=Number.POSITIVE_INFINITY,r=Number.NEGATIVE_INFINITY,s=Number.MAX_VALUE;for(a.each(n(),function(a,b){b.datamin=q,b.datamax=r,b.used=!1}),c=0;c<da.length;++c)g=da[c],g.datapoints={points:[]},h(pa.processRawData,[g,g.data,g.datapoints]);for(c=0;c<da.length;++c){if(g=da[c],o=g.data,p=g.datapoints.format,!p){if(p=[],p.push({x:!0,number:!0,required:!0}),p.push({y:!0,number:!0,required:!0}),g.bars.show||g.lines.show&&g.lines.fill){var t=!!(g.bars.show&&g.bars.zero||g.lines.show&&g.lines.zero);p.push({y:!0,number:!0,required:!1,defaultValue:0,autoscale:t}),g.bars.horizontal&&(delete p[p.length-1].y,p[p.length-1].x=!0)}g.datapoints.format=p}if(null==g.datapoints.pointsize){g.datapoints.pointsize=p.length,j=g.datapoints.pointsize,i=g.datapoints.points;var u=g.lines.show&&g.lines.steps;for(g.xaxis.used=g.yaxis.used=!0,d=e=0;d<o.length;++d,e+=j){m=o[d];var v=null==m;if(!v)for(f=0;j>f;++f)k=m[f],l=p[f],l&&(l.number&&null!=k&&(k=+k,isNaN(k)?k=null:k==1/0?k=s:k==-(1/0)&&(k=-s)),null==k&&(l.required&&(v=!0),null!=l.defaultValue&&(k=l.defaultValue))),i[e+f]=k;if(v)for(f=0;j>f;++f)k=i[e+f],null!=k&&(l=p[f],l.autoscale&&(l.x&&b(g.xaxis,k,k),l.y&&b(g.yaxis,k,k))),i[e+f]=null;else if(u&&e>0&&null!=i[e-j]&&i[e-j]!=i[e]&&i[e-j+1]!=i[e+1]){for(f=0;j>f;++f)i[e+j+f]=i[e+f];i[e+1]=i[e-j+1],e+=j}}}}for(c=0;c<da.length;++c)g=da[c],h(pa.processDatapoints,[g,g.datapoints]);for(c=0;c<da.length;++c){g=da[c],i=g.datapoints.points,j=g.datapoints.pointsize,p=g.datapoints.format;var w=q,x=q,y=r,z=r;for(d=0;d<i.length;d+=j)if(null!=i[d])for(f=0;j>f;++f)k=i[d+f],l=p[f],l&&l.autoscale!==!1&&k!=s&&k!=-s&&(l.x&&(w>k&&(w=k),k>y&&(y=k)),l.y&&(x>k&&(x=k),k>z&&(z=k)));if(g.bars.show){var A;switch(g.bars.align){case"left":A=0;break;case"right":A=-g.bars.barWidth;break;case"center":A=-g.bars.barWidth/2;break;default:throw new Error("Invalid bar alignment: "+g.bars.align)}g.bars.horizontal?(x+=A,z+=A+g.bars.barWidth):(w+=A,y+=A+g.bars.barWidth)}b(g.xaxis,w,y),b(g.yaxis,x,z)}a.each(n(),function(a,b){b.datamin==q&&(b.datamin=null),b.datamax==r&&(b.datamax=null)})}function t(){c.css("padding",0).children(":not(.flot-base,.flot-overlay)").remove(),"static"==c.css("position")&&c.css("position","relative"),fa=new b("flot-base",c),ga=new b("flot-overlay",c),ia=fa.context,ja=ga.context,ha=a(ga.element).unbind();var d=c.data("plot");d&&(d.shutdown(),ga.clear()),c.data("plot",qa)}function u(){ea.grid.hoverable&&(ha.mousemove(T),ha.bind("mouseleave",U)),ea.grid.clickable&&ha.click(V),h(pa.bindEvents,[ha])}function v(){sa&&clearTimeout(sa),ha.unbind("mousemove",T),ha.unbind("mouseleave",U),ha.unbind("click",V),h(pa.shutdown,[ha])}function w(a){function b(a){return a}var c,d,e=a.options.transform||b,f=a.options.inverseTransform;"x"==a.direction?(c=a.scale=na/Math.abs(e(a.max)-e(a.min)),d=Math.min(e(a.max),e(a.min))):(c=a.scale=oa/Math.abs(e(a.max)-e(a.min)),c=-c,d=Math.max(e(a.max),e(a.min))),e==b?a.p2c=function(a){return(a-d)*c}:a.p2c=function(a){return(e(a)-d)*c},f?a.c2p=function(a){return f(d+a/c)}:a.c2p=function(a){return d+a/c}}function x(a){var b=a.options,c=a.ticks||[],d=b.labelWidth||0,e=b.labelHeight||0,f=d||"x"==a.direction?Math.floor(fa.width/(c.length||1)):null;legacyStyles=a.direction+"Axis "+a.direction+a.n+"Axis",layer="flot-"+a.direction+"-axis flot-"+a.direction+a.n+"-axis "+legacyStyles,font=b.font||"flot-tick-label tickLabel";for(var g=0;g<c.length;++g){var h=c[g];if(h.label){var i=fa.getTextInfo(layer,h.label,font,null,f);d=Math.max(d,i.width),e=Math.max(e,i.height)}}a.labelWidth=b.labelWidth||d,a.labelHeight=b.labelHeight||e}function y(b){var c,d=b.labelWidth,e=b.labelHeight,f=b.options.position,g=b.options.tickLength,h=ea.grid.axisMargin,i=ea.grid.labelMargin,j="x"==b.direction?ka:la,k=a.grep(j,function(a){return a&&a.options.position==f&&a.reserveSpace});if(a.inArray(b,k)==k.length-1&&(h=0),null==g){var l=a.grep(j,function(a){return a&&a.reserveSpace});c=0==a.inArray(b,l),g=c?"full":5}isNaN(+g)||(i+=+g),"x"==b.direction?(e+=i,"bottom"==f?(ma.bottom+=e+h,b.box={top:fa.height-ma.bottom,height:e}):(b.box={top:ma.top+h,height:e},ma.top+=e+h)):(d+=i,"left"==f?(b.box={left:ma.left+h,width:d},ma.left+=d+h):(ma.right+=d+h,b.box={left:fa.width-ma.right,width:d})),b.position=f,b.tickLength=g,b.box.padding=i,b.innermost=c}function z(a){"x"==a.direction?(a.box.left=ma.left-a.labelWidth/2,a.box.width=fa.width-ma.left-ma.right+a.labelWidth):(a.box.top=ma.top-a.labelHeight/2,a.box.height=fa.height-ma.bottom-ma.top+a.labelHeight)}function A(){var b,c=ea.grid.minBorderMargin,d={x:0,y:0};if(null==c)for(c=0,b=0;b<da.length;++b)c=Math.max(c,2*(da[b].points.radius+da[b].points.lineWidth/2));d.x=d.y=Math.ceil(c),a.each(n(),function(a,b){var c=b.direction;b.reserveSpace&&(d[c]=Math.ceil(Math.max(d[c],("x"==c?b.labelWidth:b.labelHeight)/2)))}),ma.left=Math.max(d.x,ma.left),ma.right=Math.max(d.x,ma.right),ma.top=Math.max(d.y,ma.top),ma.bottom=Math.max(d.y,ma.bottom)}function B(){var b,c=n(),d=ea.grid.show;for(var e in ma){var f=ea.grid.margin||0;ma[e]="number"==typeof f?f:f[e]||0}h(pa.processOffset,[ma]);for(var e in ma)"object"==typeof ea.grid.borderWidth?ma[e]+=d?ea.grid.borderWidth[e]:0:ma[e]+=d?ea.grid.borderWidth:0;if(a.each(c,function(a,b){b.show=b.options.show,null==b.show&&(b.show=b.used),b.reserveSpace=b.show||b.options.reserveSpace,C(b)}),d){var g=a.grep(c,function(a){return a.reserveSpace});for(a.each(g,function(a,b){D(b),E(b),F(b,b.ticks),x(b)}),b=g.length-1;b>=0;--b)y(g[b]);A(),a.each(g,function(a,b){z(b)})}na=fa.width-ma.left-ma.right,oa=fa.height-ma.bottom-ma.top,a.each(c,function(a,b){w(b)}),d&&K(),R()}function C(a){var b=a.options,c=+(null!=b.min?b.min:a.datamin),d=+(null!=b.max?b.max:a.datamax),e=d-c;if(0==e){var f=0==d?1:.01;null==b.min&&(c-=f),(null==b.max||null!=b.min)&&(d+=f)}else{var g=b.autoscaleMargin;null!=g&&(null==b.min&&(c-=e*g,0>c&&null!=a.datamin&&a.datamin>=0&&(c=0)),null==b.max&&(d+=e*g,d>0&&null!=a.datamax&&a.datamax<=0&&(d=0)))}a.min=c,a.max=d}function D(b){var c,e=b.options;c="number"==typeof e.ticks&&e.ticks>0?e.ticks:.3*Math.sqrt("x"==b.direction?fa.width:fa.height);var f=(b.max-b.min)/c,g=-Math.floor(Math.log(f)/Math.LN10),h=e.tickDecimals;null!=h&&g>h&&(g=h);var i,j=Math.pow(10,-g),k=f/j;if(1.5>k?i=1:3>k?(i=2,k>2.25&&(null==h||h>=g+1)&&(i=2.5,++g)):i=7.5>k?5:10,i*=j,null!=e.minTickSize&&i<e.minTickSize&&(i=e.minTickSize),b.delta=f,b.tickDecimals=Math.max(0,null!=h?h:g),b.tickSize=e.tickSize||i,"time"==e.mode&&!b.tickGenerator)throw new Error("Time mode requires the flot.time plugin.");if(b.tickGenerator||(b.tickGenerator=function(a){var b,c=[],e=d(a.min,a.tickSize),f=0,g=Number.NaN;do b=g,g=e+f*a.tickSize,c.push(g),++f;while(g<a.max&&g!=b);return c},b.tickFormatter=function(a,b){var c=b.tickDecimals?Math.pow(10,b.tickDecimals):1,d=""+Math.round(a*c)/c;if(null!=b.tickDecimals){var e=d.indexOf("."),f=-1==e?0:d.length-e-1;if(f<b.tickDecimals)return(f?d:d+".")+(""+c).substr(1,b.tickDecimals-f)}return d}),a.isFunction(e.tickFormatter)&&(b.tickFormatter=function(a,b){return""+e.tickFormatter(a,b)}),null!=e.alignTicksWithAxis){var l=("x"==b.direction?ka:la)[e.alignTicksWithAxis-1];if(l&&l.used&&l!=b){var m=b.tickGenerator(b);if(m.length>0&&(null==e.min&&(b.min=Math.min(b.min,m[0])),null==e.max&&m.length>1&&(b.max=Math.max(b.max,m[m.length-1]))),b.tickGenerator=function(a){var b,c,d=[];for(c=0;c<l.ticks.length;++c)b=(l.ticks[c].v-l.min)/(l.max-l.min),b=a.min+b*(a.max-a.min),d.push(b);return d},!b.mode&&null==e.tickDecimals){var n=Math.max(0,-Math.floor(Math.log(b.delta)/Math.LN10)+1),o=b.tickGenerator(b);o.length>1&&/\..*0$/.test((o[1]-o[0]).toFixed(n))||(b.tickDecimals=n)}}}}function E(b){var c=b.options.ticks,d=[];null==c||"number"==typeof c&&c>0?d=b.tickGenerator(b):c&&(d=a.isFunction(c)?c(b):c);var e,f;for(b.ticks=[],e=0;e<d.length;++e){var g=null,h=d[e];"object"==typeof h?(f=+h[0],h.length>1&&(g=h[1])):f=+h,null==g&&(g=b.tickFormatter(f,b)),isNaN(f)||b.ticks.push({v:f,label:g})}}function F(a,b){a.options.autoscaleMargin&&b.length>0&&(null==a.options.min&&(a.min=Math.min(a.min,b[0].v)),null==a.options.max&&b.length>1&&(a.max=Math.max(a.max,b[b.length-1].v)))}function G(){fa.clear(),h(pa.drawBackground,[ia]);var a=ea.grid;a.show&&a.backgroundColor&&I(),a.show&&!a.aboveData&&J();for(var b=0;b<da.length;++b)h(pa.drawSeries,[ia,da[b]]),L(da[b]);h(pa.draw,[ia]),a.show&&a.aboveData&&J(),fa.render(),X()}function H(a,b){for(var c,d,e,f,g=n(),h=0;h<g.length;++h)if(c=g[h],c.direction==b&&(f=b+c.n+"axis",a[f]||1!=c.n||(f=b+"axis"),a[f])){d=a[f].from,e=a[f].to;break}if(a[f]||(c="x"==b?ka[0]:la[0],d=a[b+"1"],e=a[b+"2"]),null!=d&&null!=e&&d>e){var i=d;d=e,e=i}return{from:d,to:e,axis:c}}function I(){ia.save(),ia.translate(ma.left,ma.top),ia.fillStyle=ca(ea.grid.backgroundColor,oa,0,"rgba(255, 255, 255, 0)"),ia.fillRect(0,0,na,oa),ia.restore()}function J(){var b,c,d,e;ia.save(),ia.translate(ma.left,ma.top);var f=ea.grid.markings;if(f)for(a.isFunction(f)&&(c=qa.getAxes(),c.xmin=c.xaxis.min,c.xmax=c.xaxis.max,c.ymin=c.yaxis.min,c.ymax=c.yaxis.max,f=f(c)),b=0;b<f.length;++b){var g=f[b],h=H(g,"x"),i=H(g,"y");null==h.from&&(h.from=h.axis.min),null==h.to&&(h.to=h.axis.max),null==i.from&&(i.from=i.axis.min),null==i.to&&(i.to=i.axis.max),h.to<h.axis.min||h.from>h.axis.max||i.to<i.axis.min||i.from>i.axis.max||(h.from=Math.max(h.from,h.axis.min),h.to=Math.min(h.to,h.axis.max),i.from=Math.max(i.from,i.axis.min),i.to=Math.min(i.to,i.axis.max),(h.from!=h.to||i.from!=i.to)&&(h.from=h.axis.p2c(h.from),h.to=h.axis.p2c(h.to),i.from=i.axis.p2c(i.from),i.to=i.axis.p2c(i.to),h.from==h.to||i.from==i.to?(ia.beginPath(),ia.strokeStyle=g.color||ea.grid.markingsColor,ia.lineWidth=g.lineWidth||ea.grid.markingsLineWidth,ia.moveTo(h.from,i.from),ia.lineTo(h.to,i.to),ia.stroke()):(ia.fillStyle=g.color||ea.grid.markingsColor,ia.fillRect(h.from,i.to,h.to-h.from,i.from-i.to))))}c=n(),d=ea.grid.borderWidth;for(var j=0;j<c.length;++j){var k,l,m,o,p=c[j],q=p.box,r=p.tickLength;if(p.show&&0!=p.ticks.length){for(ia.lineWidth=1,"x"==p.direction?(k=0,l="full"==r?"top"==p.position?0:oa:q.top-ma.top+("top"==p.position?q.height:0)):(l=0,k="full"==r?"left"==p.position?0:na:q.left-ma.left+("left"==p.position?q.width:0)),p.innermost||(ia.strokeStyle=p.options.color,ia.beginPath(),m=o=0,"x"==p.direction?m=na+1:o=oa+1,1==ia.lineWidth&&("x"==p.direction?l=Math.floor(l)+.5:k=Math.floor(k)+.5),ia.moveTo(k,l),ia.lineTo(k+m,l+o),ia.stroke()),ia.strokeStyle=p.options.tickColor,ia.beginPath(),b=0;b<p.ticks.length;++b){var s=p.ticks[b].v;m=o=0,isNaN(s)||s<p.min||s>p.max||"full"==r&&("object"==typeof d&&d[p.position]>0||d>0)&&(s==p.min||s==p.max)||("x"==p.direction?(k=p.p2c(s),o="full"==r?-oa:r,"top"==p.position&&(o=-o)):(l=p.p2c(s),m="full"==r?-na:r,"left"==p.position&&(m=-m)),1==ia.lineWidth&&("x"==p.direction?k=Math.floor(k)+.5:l=Math.floor(l)+.5),ia.moveTo(k,l),ia.lineTo(k+m,l+o))}ia.stroke()}}d&&(e=ea.grid.borderColor,"object"==typeof d||"object"==typeof e?("object"!=typeof d&&(d={top:d,right:d,bottom:d,left:d}),"object"!=typeof e&&(e={top:e,right:e,bottom:e,left:e}),d.top>0&&(ia.strokeStyle=e.top,ia.lineWidth=d.top,ia.beginPath(),ia.moveTo(0-d.left,0-d.top/2),ia.lineTo(na,0-d.top/2),ia.stroke()),d.right>0&&(ia.strokeStyle=e.right,ia.lineWidth=d.right,ia.beginPath(),ia.moveTo(na+d.right/2,0-d.top),ia.lineTo(na+d.right/2,oa),ia.stroke()),d.bottom>0&&(ia.strokeStyle=e.bottom,ia.lineWidth=d.bottom,ia.beginPath(),ia.moveTo(na+d.right,oa+d.bottom/2),ia.lineTo(0,oa+d.bottom/2),ia.stroke()),d.left>0&&(ia.strokeStyle=e.left,ia.lineWidth=d.left,ia.beginPath(),ia.moveTo(0-d.left/2,oa+d.bottom),ia.lineTo(0-d.left/2,0),ia.stroke())):(ia.lineWidth=d,ia.strokeStyle=ea.grid.borderColor,ia.strokeRect(-d/2,-d/2,na+d,oa+d))),ia.restore()}function K(){a.each(n(),function(a,b){if(b.show&&0!=b.ticks.length){var c,d,e,f,g,h=b.box,i=b.direction+"Axis "+b.direction+b.n+"Axis",j="flot-"+b.direction+"-axis flot-"+b.direction+b.n+"-axis "+i,k=b.options.font||"flot-tick-label tickLabel";fa.removeText(j);for(var l=0;l<b.ticks.length;++l)c=b.ticks[l],!c.label||c.v<b.min||c.v>b.max||("x"==b.direction?(f="center",d=ma.left+b.p2c(c.v),"bottom"==b.position?e=h.top+h.padding:(e=h.top+h.height-h.padding,g="bottom")):(g="middle",e=ma.top+b.p2c(c.v),"left"==b.position?(d=h.left+h.width-h.padding,f="right"):d=h.left+h.padding),fa.addText(j,d,e,c.label,k,null,null,f,g))}})}function L(a){a.lines.show&&M(a),a.bars.show&&P(a),a.points.show&&N(a)}function M(a){function b(a,b,c,d,e){var f=a.points,g=a.pointsize,h=null,i=null;ia.beginPath();for(var j=g;j<f.length;j+=g){var k=f[j-g],l=f[j-g+1],m=f[j],n=f[j+1];if(null!=k&&null!=m){if(n>=l&&l<e.min){if(n<e.min)continue;k=(e.min-l)/(n-l)*(m-k)+k,l=e.min}else if(l>=n&&n<e.min){if(l<e.min)continue;m=(e.min-l)/(n-l)*(m-k)+k,n=e.min}if(l>=n&&l>e.max){if(n>e.max)continue;k=(e.max-l)/(n-l)*(m-k)+k,l=e.max}else if(n>=l&&n>e.max){if(l>e.max)continue;m=(e.max-l)/(n-l)*(m-k)+k,n=e.max}if(m>=k&&k<d.min){if(m<d.min)continue;l=(d.min-k)/(m-k)*(n-l)+l,k=d.min}else if(k>=m&&m<d.min){if(k<d.min)continue;n=(d.min-k)/(m-k)*(n-l)+l,m=d.min}if(k>=m&&k>d.max){if(m>d.max)continue;l=(d.max-k)/(m-k)*(n-l)+l,k=d.max}else if(m>=k&&m>d.max){if(k>d.max)continue;n=(d.max-k)/(m-k)*(n-l)+l,m=d.max}(k!=h||l!=i)&&ia.moveTo(d.p2c(k)+b,e.p2c(l)+c),h=m,i=n,ia.lineTo(d.p2c(m)+b,e.p2c(n)+c)}}ia.stroke()}function c(a,b,c){for(var d=a.points,e=a.pointsize,f=Math.min(Math.max(0,c.min),c.max),g=0,h=!1,i=1,j=0,k=0;;){if(e>0&&g>d.length+e)break;g+=e;var l=d[g-e],m=d[g-e+i],n=d[g],o=d[g+i];if(h){if(e>0&&null!=l&&null==n){k=g,e=-e,i=2;continue}if(0>e&&g==j+e){ia.fill(),h=!1,e=-e,i=1,g=j=k+e;continue}}if(null!=l&&null!=n){if(n>=l&&l<b.min){if(n<b.min)continue;m=(b.min-l)/(n-l)*(o-m)+m,l=b.min}else if(l>=n&&n<b.min){if(l<b.min)continue;o=(b.min-l)/(n-l)*(o-m)+m,n=b.min}if(l>=n&&l>b.max){if(n>b.max)continue;m=(b.max-l)/(n-l)*(o-m)+m,l=b.max}else if(n>=l&&n>b.max){if(l>b.max)continue;o=(b.max-l)/(n-l)*(o-m)+m,n=b.max}if(h||(ia.beginPath(),ia.moveTo(b.p2c(l),c.p2c(f)),h=!0),m>=c.max&&o>=c.max)ia.lineTo(b.p2c(l),c.p2c(c.max)),ia.lineTo(b.p2c(n),c.p2c(c.max));else if(m<=c.min&&o<=c.min)ia.lineTo(b.p2c(l),c.p2c(c.min)),ia.lineTo(b.p2c(n),c.p2c(c.min));else{var p=l,q=n;o>=m&&m<c.min&&o>=c.min?(l=(c.min-m)/(o-m)*(n-l)+l,m=c.min):m>=o&&o<c.min&&m>=c.min&&(n=(c.min-m)/(o-m)*(n-l)+l,o=c.min),m>=o&&m>c.max&&o<=c.max?(l=(c.max-m)/(o-m)*(n-l)+l,m=c.max):o>=m&&o>c.max&&m<=c.max&&(n=(c.max-m)/(o-m)*(n-l)+l,o=c.max),l!=p&&ia.lineTo(b.p2c(p),c.p2c(m)),ia.lineTo(b.p2c(l),c.p2c(m)),ia.lineTo(b.p2c(n),c.p2c(o)),n!=q&&(ia.lineTo(b.p2c(n),c.p2c(o)),ia.lineTo(b.p2c(q),c.p2c(o)))}}}}ia.save(),ia.translate(ma.left,ma.top),ia.lineJoin="round";var d=a.lines.lineWidth,e=a.shadowSize;if(d>0&&e>0){ia.lineWidth=e,ia.strokeStyle="rgba(0,0,0,0.1)";var f=Math.PI/18;b(a.datapoints,Math.sin(f)*(d/2+e/2),Math.cos(f)*(d/2+e/2),a.xaxis,a.yaxis),ia.lineWidth=e/2,b(a.datapoints,Math.sin(f)*(d/2+e/4),Math.cos(f)*(d/2+e/4),a.xaxis,a.yaxis)}ia.lineWidth=d,ia.strokeStyle=a.color;var g=Q(a.lines,a.color,0,oa);g&&(ia.fillStyle=g,c(a.datapoints,a.xaxis,a.yaxis)),d>0&&b(a.datapoints,0,0,a.xaxis,a.yaxis),ia.restore()}function N(a){function b(a,b,c,d,e,f,g,h){for(var i=a.points,j=a.pointsize,k=0;k<i.length;k+=j){var l=i[k],m=i[k+1];null==l||l<f.min||l>f.max||m<g.min||m>g.max||(ia.beginPath(),l=f.p2c(l),m=g.p2c(m)+d,"circle"==h?ia.arc(l,m,b,0,e?Math.PI:2*Math.PI,!1):h(ia,l,m,b,e),ia.closePath(),c&&(ia.fillStyle=c,ia.fill()),ia.stroke())}}ia.save(),ia.translate(ma.left,ma.top);var c=a.points.lineWidth,d=a.shadowSize,e=a.points.radius,f=a.points.symbol;if(0==c&&(c=1e-4),c>0&&d>0){var g=d/2;ia.lineWidth=g,ia.strokeStyle="rgba(0,0,0,0.1)",b(a.datapoints,e,null,g+g/2,!0,a.xaxis,a.yaxis,f),ia.strokeStyle="rgba(0,0,0,0.2)",b(a.datapoints,e,null,g/2,!0,a.xaxis,a.yaxis,f)}ia.lineWidth=c,ia.strokeStyle=a.color,b(a.datapoints,e,Q(a.points,a.color),0,!1,a.xaxis,a.yaxis,f),ia.restore()}function O(a,b,c,d,e,f,g,h,i,j,k,l){var m,n,o,p,q,r,s,t,u;k?(t=r=s=!0,q=!1,m=c,n=a,p=b+d,o=b+e,m>n&&(u=n,n=m,m=u,q=!0,r=!1)):(q=r=s=!0,t=!1,m=a+d,n=a+e,o=c,p=b,o>p&&(u=p,p=o,o=u,t=!0,s=!1)),n<h.min||m>h.max||p<i.min||o>i.max||(m<h.min&&(m=h.min,q=!1),n>h.max&&(n=h.max,r=!1),o<i.min&&(o=i.min,t=!1),p>i.max&&(p=i.max,s=!1),m=h.p2c(m),o=i.p2c(o),n=h.p2c(n),p=i.p2c(p),g&&(j.beginPath(),j.moveTo(m,o),j.lineTo(m,p),j.lineTo(n,p),j.lineTo(n,o),j.fillStyle=g(o,p),j.fill()),l>0&&(q||r||s||t)&&(j.beginPath(),j.moveTo(m,o+f),q?j.lineTo(m,p+f):j.moveTo(m,p+f),s?j.lineTo(n,p+f):j.moveTo(n,p+f),r?j.lineTo(n,o+f):j.moveTo(n,o+f),t?j.lineTo(m,o+f):j.moveTo(m,o+f),j.stroke()))}function P(a){function b(b,c,d,e,f,g,h){for(var i=b.points,j=b.pointsize,k=0;k<i.length;k+=j)null!=i[k]&&O(i[k],i[k+1],i[k+2],c,d,e,f,g,h,ia,a.bars.horizontal,a.bars.lineWidth)}ia.save(),ia.translate(ma.left,ma.top),ia.lineWidth=a.bars.lineWidth,ia.strokeStyle=a.color;var c;switch(a.bars.align){case"left":c=0;break;case"right":c=-a.bars.barWidth;break;case"center":c=-a.bars.barWidth/2;break;default:throw new Error("Invalid bar alignment: "+a.bars.align)}var d=a.bars.fill?function(b,c){return Q(a.bars,a.color,b,c)}:null;b(a.datapoints,c,c+a.bars.barWidth,0,d,a.xaxis,a.yaxis),ia.restore()}function Q(b,c,d,e){var f=b.fill;if(!f)return null;if(b.fillColor)return ca(b.fillColor,d,e,c);var g=a.color.parse(c);return g.a="number"==typeof f?f:.4,g.normalize(),g.toString()}function R(){if(c.find(".legend").remove(),ea.legend.show){for(var b,d,e=[],f=[],g=!1,h=ea.legend.labelFormatter,i=0;i<da.length;++i)b=da[i],b.label&&(d=h?h(b.label,b):b.label,d&&f.push({label:d,color:b.color}));if(ea.legend.sorted)if(a.isFunction(ea.legend.sorted))f.sort(ea.legend.sorted);else if("reverse"==ea.legend.sorted)f.reverse();else{var j="descending"!=ea.legend.sorted;f.sort(function(a,b){return a.label==b.label?0:a.label<b.label!=j?1:-1})}for(var i=0;i<f.length;++i){var k=f[i];i%ea.legend.noColumns==0&&(g&&e.push("</tr>"),e.push("<tr>"),g=!0),e.push('<td class="legendColorBox"><div style="border:1px solid '+ea.legend.labelBoxBorderColor+';padding:1px"><div style="width:4px;height:0;border:5px solid '+k.color+';overflow:hidden"></div></div></td><td class="legendLabel">'+k.label+"</td>")}if(g&&e.push("</tr>"),0!=e.length){var l='<table style="font-size:smaller;color:'+ea.grid.color+'">'+e.join("")+"</table>";if(null!=ea.legend.container)a(ea.legend.container).html(l);else{var m="",n=ea.legend.position,o=ea.legend.margin;null==o[0]&&(o=[o,o]),"n"==n.charAt(0)?m+="top:"+(o[1]+ma.top)+"px;":"s"==n.charAt(0)&&(m+="bottom:"+(o[1]+ma.bottom)+"px;"),"e"==n.charAt(1)?m+="right:"+(o[0]+ma.right)+"px;":"w"==n.charAt(1)&&(m+="left:"+(o[0]+ma.left)+"px;");var p=a('<div class="legend">'+l.replace('style="','style="position:absolute;'+m+";")+"</div>").appendTo(c);if(0!=ea.legend.backgroundOpacity){var q=ea.legend.backgroundColor;null==q&&(q=ea.grid.backgroundColor,q=q&&"string"==typeof q?a.color.parse(q):a.color.extract(p,"background-color"),q.a=1,q=q.toString());var r=p.children();a('<div style="position:absolute;width:'+r.width()+"px;height:"+r.height()+"px;"+m+"background-color:"+q+';"> </div>').prependTo(p).css("opacity",ea.legend.backgroundOpacity)}}}}}function S(a,b,c){var d,e,f,g=ea.grid.mouseActiveRadius,h=g*g+1,i=null;for(d=da.length-1;d>=0;--d)if(c(da[d])){var j=da[d],k=j.xaxis,l=j.yaxis,m=j.datapoints.points,n=k.c2p(a),o=l.c2p(b),p=g/k.scale,q=g/l.scale;if(f=j.datapoints.pointsize,k.options.inverseTransform&&(p=Number.MAX_VALUE),l.options.inverseTransform&&(q=Number.MAX_VALUE),j.lines.show||j.points.show)for(e=0;e<m.length;e+=f){var r=m[e],s=m[e+1];if(null!=r&&!(r-n>p||-p>r-n||s-o>q||-q>s-o)){var t=Math.abs(k.p2c(r)-a),u=Math.abs(l.p2c(s)-b),v=t*t+u*u;h>v&&(h=v,i=[d,e/f])}}if(j.bars.show&&!i){var w="left"==j.bars.align?0:-j.bars.barWidth/2,x=w+j.bars.barWidth;for(e=0;e<m.length;e+=f){var r=m[e],s=m[e+1],y=m[e+2];null!=r&&(da[d].bars.horizontal?n<=Math.max(y,r)&&n>=Math.min(y,r)&&o>=s+w&&s+x>=o:n>=r+w&&r+x>=n&&o>=Math.min(y,s)&&o<=Math.max(y,s))&&(i=[d,e/f])}}}return i?(d=i[0],e=i[1],f=da[d].datapoints.pointsize,{datapoint:da[d].datapoints.points.slice(e*f,(e+1)*f),dataIndex:e,series:da[d],seriesIndex:d}):null}function T(a){ea.grid.hoverable&&W("plothover",a,function(a){return 0!=a.hoverable})}function U(a){ea.grid.hoverable&&W("plothover",a,function(a){return!1})}function V(a){W("plotclick",a,function(a){return 0!=a.clickable})}function W(a,b,d){var e=ha.offset(),f=b.pageX-e.left-ma.left,g=b.pageY-e.top-ma.top,h=o({left:f,top:g});h.pageX=b.pageX,h.pageY=b.pageY;var i=S(f,g,d);if(i&&(i.pageX=parseInt(i.series.xaxis.p2c(i.datapoint[0])+e.left+ma.left,10),i.pageY=parseInt(i.series.yaxis.p2c(i.datapoint[1])+e.top+ma.top,10)),ea.grid.autoHighlight){for(var j=0;j<ra.length;++j){var k=ra[j];k.auto!=a||i&&k.series==i.series&&k.point[0]==i.datapoint[0]&&k.point[1]==i.datapoint[1]||$(k.series,k.point)}i&&Z(i.series,i.datapoint,a)}c.trigger(a,[h,i])}function X(){var a=ea.interaction.redrawOverlayInterval;return-1==a?void Y():void(sa||(sa=setTimeout(Y,a)))}function Y(){sa=null,ja.save(),ga.clear(),ja.translate(ma.left,ma.top);var a,b;for(a=0;a<ra.length;++a)b=ra[a],b.series.bars.show?ba(b.series,b.point):aa(b.series,b.point);ja.restore(),h(pa.drawOverlay,[ja])}function Z(a,b,c){if("number"==typeof a&&(a=da[a]),"number"==typeof b){var d=a.datapoints.pointsize;b=a.datapoints.points.slice(d*b,d*(b+1))}var e=_(a,b);-1==e?(ra.push({series:a,point:b,auto:c}),X()):c||(ra[e].auto=!1)}function $(a,b){if(null==a&&null==b)return ra=[],void X();if("number"==typeof a&&(a=da[a]),"number"==typeof b){var c=a.datapoints.pointsize;b=a.datapoints.points.slice(c*b,c*(b+1))}var d=_(a,b);-1!=d&&(ra.splice(d,1),X())}function _(a,b){for(var c=0;c<ra.length;++c){var d=ra[c];if(d.series==a&&d.point[0]==b[0]&&d.point[1]==b[1])return c}return-1}function aa(b,c){var d=c[0],e=c[1],f=b.xaxis,g=b.yaxis,h="string"==typeof b.highlightColor?b.highlightColor:a.color.parse(b.color).scale("a",.5).toString();if(!(d<f.min||d>f.max||e<g.min||e>g.max)){var i=b.points.radius+b.points.lineWidth/2;ja.lineWidth=i,ja.strokeStyle=h;var j=1.5*i;d=f.p2c(d),e=g.p2c(e),ja.beginPath(),"circle"==b.points.symbol?ja.arc(d,e,j,0,2*Math.PI,!1):b.points.symbol(ja,d,e,j,!1),ja.closePath(),ja.stroke()}}function ba(b,c){var d="string"==typeof b.highlightColor?b.highlightColor:a.color.parse(b.color).scale("a",.5).toString(),e=d,f="left"==b.bars.align?0:-b.bars.barWidth/2;ja.lineWidth=b.bars.lineWidth,ja.strokeStyle=d,O(c[0],c[1],c[2]||0,f,f+b.bars.barWidth,0,function(){return e},b.xaxis,b.yaxis,ja,b.bars.horizontal,b.bars.lineWidth)}function ca(b,c,d,e){if("string"==typeof b)return b;for(var f=ia.createLinearGradient(0,d,0,c),g=0,h=b.colors.length;h>g;++g){var i=b.colors[g];if("string"!=typeof i){var j=a.color.parse(e);null!=i.brightness&&(j=j.scale("rgb",i.brightness)),null!=i.opacity&&(j.a*=i.opacity),i=j.toString()}f.addColorStop(g/(h-1),i)}return f}var da=[],ea={colors:["#edc240","#afd8f8","#cb4b4b","#4da74d","#9440ed"],legend:{show:!0,noColumns:1,labelFormatter:null,labelBoxBorderColor:"#ccc",container:null,position:"ne",margin:5,backgroundColor:null,backgroundOpacity:.85,sorted:null},xaxis:{show:null,position:"bottom",mode:null,font:null,color:null,tickColor:null,transform:null,inverseTransform:null,min:null,max:null,autoscaleMargin:null,ticks:null,tickFormatter:null,labelWidth:null,labelHeight:null,reserveSpace:null,tickLength:null,alignTicksWithAxis:null,tickDecimals:null,tickSize:null,minTickSize:null},yaxis:{autoscaleMargin:.02,position:"left"},xaxes:[],yaxes:[],series:{points:{show:!1,radius:3,lineWidth:2,fill:!0,fillColor:"#ffffff",symbol:"circle"},lines:{lineWidth:2,fill:!1,fillColor:null,steps:!1},bars:{show:!1,lineWidth:2,barWidth:1,fill:!0,fillColor:null,align:"left",horizontal:!1,zero:!0},shadowSize:3,highlightColor:null},grid:{show:!0,aboveData:!1,color:"#545454",backgroundColor:null,borderColor:null,tickColor:null,margin:0,labelMargin:5,axisMargin:8,borderWidth:2,minBorderMargin:null,markings:null,markingsColor:"#f4f4f4",markingsLineWidth:2,clickable:!1,hoverable:!1,autoHighlight:!0,mouseActiveRadius:10},interaction:{redrawOverlayInterval:1e3/60},hooks:{}},fa=null,ga=null,ha=null,ia=null,ja=null,ka=[],la=[],ma={left:0,right:0,top:0,bottom:0},na=0,oa=0,pa={processOptions:[],processRawData:[],
-processDatapoints:[],processOffset:[],drawBackground:[],drawSeries:[],draw:[],bindEvents:[],drawOverlay:[],shutdown:[]},qa=this;qa.setData=k,qa.setupGrid=B,qa.draw=G,qa.getPlaceholder=function(){return c},qa.getCanvas=function(){return fa.element},qa.getPlotOffset=function(){return ma},qa.width=function(){return na},qa.height=function(){return oa},qa.offset=function(){var a=ha.offset();return a.left+=ma.left,a.top+=ma.top,a},qa.getData=function(){return da},qa.getAxes=function(){var b={};return a.each(ka.concat(la),function(a,c){c&&(b[c.direction+(1!=c.n?c.n:"")+"axis"]=c)}),b},qa.getXAxes=function(){return ka},qa.getYAxes=function(){return la},qa.c2p=o,qa.p2c=p,qa.getOptions=function(){return ea},qa.highlight=Z,qa.unhighlight=$,qa.triggerRedrawOverlay=X,qa.pointOffset=function(a){return{left:parseInt(ka[m(a,"x")-1].p2c(+a.x)+ma.left,10),top:parseInt(la[m(a,"y")-1].p2c(+a.y)+ma.top,10)}},qa.shutdown=v,qa.resize=function(){var a=c.width(),b=c.height();fa.resize(a,b),ga.resize(a,b)},qa.hooks=pa,i(qa),j(f),t(),k(e),B(),G(),u();var ra=[],sa=null}function d(a,b){return b*Math.floor(a/b)}var e=Object.prototype.hasOwnProperty;b.prototype.resize=function(a,b){if(0>=a||0>=b)throw new Error("Invalid dimensions for plot, width = "+a+", height = "+b);var c=this.element,d=this.context,e=this.pixelRatio;this.width!=a&&(c.width=a*e,c.style.width=a+"px",this.width=a),this.height!=b&&(c.height=b*e,c.style.height=b+"px",this.height=b),d.restore(),d.save(),d.scale(e,e)},b.prototype.clear=function(){this.context.clearRect(0,0,this.width,this.height)},b.prototype.render=function(){var a=this._textCache;for(var b in a)if(e.call(a,b)){var c=this.getTextLayer(b),d=a[b];c.hide();for(var f in d)if(e.call(d,f)){var g=d[f];for(var h in g)if(e.call(g,h)){for(var i,j=g[h].positions,k=0;i=j[k];k++)i.active?i.rendered||(c.append(i.element),i.rendered=!0):(j.splice(k--,1),i.rendered&&i.element.detach());0==j.length&&delete g[h]}}c.show()}},b.prototype.getTextLayer=function(b){var c=this.text[b];return null==c&&(null==this.textContainer&&(this.textContainer=a("<div class='flot-text'></div>").css({position:"absolute",top:0,left:0,bottom:0,right:0,"font-size":"smaller",color:"#545454"}).insertAfter(this.element)),c=this.text[b]=a("<div></div>").addClass(b).css({position:"absolute",top:0,left:0,bottom:0,right:0}).appendTo(this.textContainer)),c},b.prototype.getTextInfo=function(b,c,d,e,f){var g,h,i,j;if(c=""+c,g="object"==typeof d?d.style+" "+d.variant+" "+d.weight+" "+d.size+"px/"+d.lineHeight+"px "+d.family:d,h=this._textCache[b],null==h&&(h=this._textCache[b]={}),i=h[g],null==i&&(i=h[g]={}),j=i[c],null==j){var k=a("<div></div>").html(c).css({position:"absolute","max-width":f,top:-9999}).appendTo(this.getTextLayer(b));"object"==typeof d?k.css({font:g,color:d.color}):"string"==typeof d&&k.addClass(d),j=i[c]={width:k.outerWidth(!0),height:k.outerHeight(!0),element:k,positions:[]},k.detach()}return j},b.prototype.addText=function(a,b,c,d,e,f,g,h,i){var j=this.getTextInfo(a,d,e,f,g),k=j.positions;"center"==h?b-=j.width/2:"right"==h&&(b-=j.width),"middle"==i?c-=j.height/2:"bottom"==i&&(c-=j.height);for(var l,m=0;l=k[m];m++)if(l.x==b&&l.y==c)return void(l.active=!0);l={active:!0,rendered:!1,element:k.length?j.element.clone():j.element,x:b,y:c},k.push(l),l.element.css({top:Math.round(c),left:Math.round(b),"text-align":h})},b.prototype.removeText=function(a,b,c,d,f,g){if(null==d){var h=this._textCache[a];if(null!=h)for(var i in h)if(e.call(h,i)){var j=h[i];for(var k in j)if(e.call(j,k))for(var l,m=j[k].positions,n=0;l=m[n];n++)l.active=!1}}else for(var l,m=this.getTextInfo(a,d,f,g).positions,n=0;l=m[n];n++)l.x==b&&l.y==c&&(l.active=!1)},a.plot=function(b,d,e){var f=new c(a(b),d,e,a.plot.plugins);return f},a.plot.version="0.8.1",a.plot.plugins=[],a.fn.plot=function(b,c){return this.each(function(){a.plot(this,b,c)})}}(jQuery);
\ No newline at end of file
+!function(a){a.color={},a.color.make=function(b,c,d,e){var f={};return f.r=b||0,f.g=c||0,f.b=d||0,f.a=null!=e?e:1,f.add=function(a,b){for(var c=0;c<a.length;++c)f[a.charAt(c)]+=b;return f.normalize()},f.scale=function(a,b){for(var c=0;c<a.length;++c)f[a.charAt(c)]*=b;return f.normalize()},f.toString=function(){return f.a>=1?"rgb("+[f.r,f.g,f.b].join(",")+")":"rgba("+[f.r,f.g,f.b,f.a].join(",")+")"},f.normalize=function(){function a(a,b,c){return b<a?a:b>c?c:b}return f.r=a(0,parseInt(f.r),255),f.g=a(0,parseInt(f.g),255),f.b=a(0,parseInt(f.b),255),f.a=a(0,f.a,1),f},f.clone=function(){return a.color.make(f.r,f.b,f.g,f.a)},f.normalize()},a.color.extract=function(b,c){var d;do{if(d=b.css(c).toLowerCase(),""!=d&&"transparent"!=d)break;b=b.parent()}while(!a.nodeName(b.get(0),"body"));return"rgba(0, 0, 0, 0)"==d&&(d="transparent"),a.color.parse(d)},a.color.parse=function(c){var d,e=a.color.make;if(d=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(c))return e(parseInt(d[1],10),parseInt(d[2],10),parseInt(d[3],10));if(d=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(c))return e(parseInt(d[1],10),parseInt(d[2],10),parseInt(d[3],10),parseFloat(d[4]));if(d=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(c))return e(2.55*parseFloat(d[1]),2.55*parseFloat(d[2]),2.55*parseFloat(d[3]));if(d=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(c))return e(2.55*parseFloat(d[1]),2.55*parseFloat(d[2]),2.55*parseFloat(d[3]),parseFloat(d[4]));if(d=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(c))return e(parseInt(d[1],16),parseInt(d[2],16),parseInt(d[3],16));if(d=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(c))return e(parseInt(d[1]+d[1],16),parseInt(d[2]+d[2],16),parseInt(d[3]+d[3],16));var f=a.trim(c).toLowerCase();return"transparent"==f?e(255,255,255,0):(d=b[f]||[0,0,0],e(d[0],d[1],d[2]))};var b={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]}}(jQuery),function(a){function b(b,c){var d=c.children("."+b)[0];if(null==d&&(d=document.createElement("canvas"),d.className=b,a(d).css({direction:"ltr",position:"absolute",left:0,top:0}).appendTo(c),!d.getContext)){if(!window.G_vmlCanvasManager)throw new Error("Canvas is not available. If you're using IE with a fall-back such as Excanvas, then there's either a mistake in your conditional include, or the page has no DOCTYPE and is rendering in Quirks Mode.");d=window.G_vmlCanvasManager.initElement(d)}this.element=d;var e=this.context=d.getContext("2d"),f=window.devicePixelRatio||1,g=e.webkitBackingStorePixelRatio||e.mozBackingStorePixelRatio||e.msBackingStorePixelRatio||e.oBackingStorePixelRatio||e.backingStorePixelRatio||1;this.pixelRatio=f/g,this.resize(c.width(),c.height()),this.textContainer=null,this.text={},this._textCache={}}function c(c,e,f,g){function h(a,b){b=[qa].concat(b);for(var c=0;c<a.length;++c)a[c].apply(this,b)}function i(){for(var c={Canvas:b},d=0;d<g.length;++d){var e=g[d];e.init(qa,c),e.options&&a.extend(!0,ea,e.options)}}function j(b){a.extend(!0,ea,b),b&&b.colors&&(ea.colors=b.colors),null==ea.xaxis.color&&(ea.xaxis.color=a.color.parse(ea.grid.color).scale("a",.22).toString()),null==ea.yaxis.color&&(ea.yaxis.color=a.color.parse(ea.grid.color).scale("a",.22).toString()),null==ea.xaxis.tickColor&&(ea.xaxis.tickColor=ea.grid.tickColor||ea.xaxis.color),null==ea.yaxis.tickColor&&(ea.yaxis.tickColor=ea.grid.tickColor||ea.yaxis.color),null==ea.grid.borderColor&&(ea.grid.borderColor=ea.grid.color),null==ea.grid.tickColor&&(ea.grid.tickColor=a.color.parse(ea.grid.color).scale("a",.22).toString());var d,e,f,g={style:c.css("font-style"),size:Math.round(.8*(+c.css("font-size").replace("px","")||13)),variant:c.css("font-variant"),weight:c.css("font-weight"),family:c.css("font-family")};for(g.lineHeight=1.15*g.size,f=ea.xaxes.length||1,d=0;d<f;++d)e=ea.xaxes[d],e&&!e.tickColor&&(e.tickColor=e.color),e=a.extend(!0,{},ea.xaxis,e),ea.xaxes[d]=e,e.font&&(e.font=a.extend({},g,e.font),e.font.color||(e.font.color=e.color));for(f=ea.yaxes.length||1,d=0;d<f;++d)e=ea.yaxes[d],e&&!e.tickColor&&(e.tickColor=e.color),e=a.extend(!0,{},ea.yaxis,e),ea.yaxes[d]=e,e.font&&(e.font=a.extend({},g,e.font),e.font.color||(e.font.color=e.color));for(ea.xaxis.noTicks&&null==ea.xaxis.ticks&&(ea.xaxis.ticks=ea.xaxis.noTicks),ea.yaxis.noTicks&&null==ea.yaxis.ticks&&(ea.yaxis.ticks=ea.yaxis.noTicks),ea.x2axis&&(ea.xaxes[1]=a.extend(!0,{},ea.xaxis,ea.x2axis),ea.xaxes[1].position="top"),ea.y2axis&&(ea.yaxes[1]=a.extend(!0,{},ea.yaxis,ea.y2axis),ea.yaxes[1].position="right"),ea.grid.coloredAreas&&(ea.grid.markings=ea.grid.coloredAreas),ea.grid.coloredAreasColor&&(ea.grid.markingsColor=ea.grid.coloredAreasColor),ea.lines&&a.extend(!0,ea.series.lines,ea.lines),ea.points&&a.extend(!0,ea.series.points,ea.points),ea.bars&&a.extend(!0,ea.series.bars,ea.bars),null!=ea.shadowSize&&(ea.series.shadowSize=ea.shadowSize),null!=ea.highlightColor&&(ea.series.highlightColor=ea.highlightColor),d=0;d<ea.xaxes.length;++d)q(ka,d+1).options=ea.xaxes[d];for(d=0;d<ea.yaxes.length;++d)q(la,d+1).options=ea.yaxes[d];for(var i in pa)ea.hooks[i]&&ea.hooks[i].length&&(pa[i]=pa[i].concat(ea.hooks[i]));h(pa.processOptions,[ea])}function k(a){da=l(a),r(),s()}function l(b){for(var c=[],d=0;d<b.length;++d){var e=a.extend(!0,{},ea.series);null!=b[d].data?(e.data=b[d].data,delete b[d].data,a.extend(!0,e,b[d]),b[d].data=e.data):e.data=b[d],c.push(e)}return c}function m(a,b){var c=a[b+"axis"];return"object"==typeof c&&(c=c.n),"number"!=typeof c&&(c=1),c}function n(){return a.grep(ka.concat(la),function(a){return a})}function o(a){var b,c,d={};for(b=0;b<ka.length;++b)c=ka[b],c&&c.used&&(d["x"+c.n]=c.c2p(a.left));for(b=0;b<la.length;++b)c=la[b],c&&c.used&&(d["y"+c.n]=c.c2p(a.top));return void 0!==d.x1&&(d.x=d.x1),void 0!==d.y1&&(d.y=d.y1),d}function p(a){var b,c,d,e={};for(b=0;b<ka.length;++b)if(c=ka[b],c&&c.used&&(d="x"+c.n,null==a[d]&&1==c.n&&(d="x"),null!=a[d])){e.left=c.p2c(a[d]);break}for(b=0;b<la.length;++b)if(c=la[b],c&&c.used&&(d="y"+c.n,null==a[d]&&1==c.n&&(d="y"),null!=a[d])){e.top=c.p2c(a[d]);break}return e}function q(b,c){return b[c-1]||(b[c-1]={n:c,direction:b==ka?"x":"y",options:a.extend(!0,{},b==ka?ea.xaxis:ea.yaxis)}),b[c-1]}function r(){var b,c=da.length,d=-1;for(b=0;b<da.length;++b){var e=da[b].color;null!=e&&(c--,"number"==typeof e&&e>d&&(d=e))}c<=d&&(c=d+1);var f,g=[],h=ea.colors,i=h.length,j=0;for(b=0;b<c;b++)f=a.color.parse(h[b%i]||"#666"),b%i==0&&b&&(j=j>=0?j<.5?-j-.2:0:-j),g[b]=f.scale("rgb",1+j);var k,l=0;for(b=0;b<da.length;++b){if(k=da[b],null==k.color?(k.color=g[l].toString(),++l):"number"==typeof k.color&&(k.color=g[k.color].toString()),null==k.lines.show){var n,o=!0;for(n in k)if(k[n]&&k[n].show){o=!1;break}o&&(k.lines.show=!0)}null==k.lines.zero&&(k.lines.zero=!!k.lines.fill),k.xaxis=q(ka,m(k,"x")),k.yaxis=q(la,m(k,"y"))}}function s(){function b(a,b,c){b<a.datamin&&b!=-s&&(a.datamin=b),c>a.datamax&&c!=s&&(a.datamax=c)}var c,d,e,f,g,i,j,k,l,m,o,p,q=Number.POSITIVE_INFINITY,r=Number.NEGATIVE_INFINITY,s=Number.MAX_VALUE;for(a.each(n(),function(a,b){b.datamin=q,b.datamax=r,b.used=!1}),c=0;c<da.length;++c)g=da[c],g.datapoints={points:[]},h(pa.processRawData,[g,g.data,g.datapoints]);for(c=0;c<da.length;++c){if(g=da[c],o=g.data,p=g.datapoints.format,!p){if(p=[],p.push({x:!0,number:!0,required:!0}),p.push({y:!0,number:!0,required:!0}),g.bars.show||g.lines.show&&g.lines.fill){var t=!!(g.bars.show&&g.bars.zero||g.lines.show&&g.lines.zero);p.push({y:!0,number:!0,required:!1,defaultValue:0,autoscale:t}),g.bars.horizontal&&(delete p[p.length-1].y,p[p.length-1].x=!0)}g.datapoints.format=p}if(null==g.datapoints.pointsize){g.datapoints.pointsize=p.length,j=g.datapoints.pointsize,i=g.datapoints.points;var u=g.lines.show&&g.lines.steps;for(g.xaxis.used=g.yaxis.used=!0,d=e=0;d<o.length;++d,e+=j){m=o[d];var v=null==m;if(!v)for(f=0;f<j;++f)k=m[f],l=p[f],l&&(l.number&&null!=k&&(k=+k,isNaN(k)?k=null:k==1/0?k=s:k==-(1/0)&&(k=-s)),null==k&&(l.required&&(v=!0),null!=l.defaultValue&&(k=l.defaultValue))),i[e+f]=k;if(v)for(f=0;f<j;++f)k=i[e+f],null!=k&&(l=p[f],l.autoscale&&(l.x&&b(g.xaxis,k,k),l.y&&b(g.yaxis,k,k))),i[e+f]=null;else if(u&&e>0&&null!=i[e-j]&&i[e-j]!=i[e]&&i[e-j+1]!=i[e+1]){for(f=0;f<j;++f)i[e+j+f]=i[e+f];i[e+1]=i[e-j+1],e+=j}}}}for(c=0;c<da.length;++c)g=da[c],h(pa.processDatapoints,[g,g.datapoints]);for(c=0;c<da.length;++c){g=da[c],i=g.datapoints.points,j=g.datapoints.pointsize,p=g.datapoints.format;var w=q,x=q,y=r,z=r;for(d=0;d<i.length;d+=j)if(null!=i[d])for(f=0;f<j;++f)k=i[d+f],l=p[f],l&&l.autoscale!==!1&&k!=s&&k!=-s&&(l.x&&(k<w&&(w=k),k>y&&(y=k)),l.y&&(k<x&&(x=k),k>z&&(z=k)));if(g.bars.show){var A;switch(g.bars.align){case"left":A=0;break;case"right":A=-g.bars.barWidth;break;case"center":A=-g.bars.barWidth/2;break;default:throw new Error("Invalid bar alignment: "+g.bars.align)}g.bars.horizontal?(x+=A,z+=A+g.bars.barWidth):(w+=A,y+=A+g.bars.barWidth)}b(g.xaxis,w,y),b(g.yaxis,x,z)}a.each(n(),function(a,b){b.datamin==q&&(b.datamin=null),b.datamax==r&&(b.datamax=null)})}function t(){c.css("padding",0).children(":not(.flot-base,.flot-overlay)").remove(),"static"==c.css("position")&&c.css("position","relative"),fa=new b("flot-base",c),ga=new b("flot-overlay",c),ia=fa.context,ja=ga.context,ha=a(ga.element).unbind();var d=c.data("plot");d&&(d.shutdown(),ga.clear()),c.data("plot",qa)}function u(){ea.grid.hoverable&&(ha.mousemove(T),ha.bind("mouseleave",U)),ea.grid.clickable&&ha.click(V),h(pa.bindEvents,[ha])}function v(){sa&&clearTimeout(sa),ha.unbind("mousemove",T),ha.unbind("mouseleave",U),ha.unbind("click",V),h(pa.shutdown,[ha])}function w(a){function b(a){return a}var c,d,e=a.options.transform||b,f=a.options.inverseTransform;"x"==a.direction?(c=a.scale=na/Math.abs(e(a.max)-e(a.min)),d=Math.min(e(a.max),e(a.min))):(c=a.scale=oa/Math.abs(e(a.max)-e(a.min)),c=-c,d=Math.max(e(a.max),e(a.min))),e==b?a.p2c=function(a){return(a-d)*c}:a.p2c=function(a){return(e(a)-d)*c},f?a.c2p=function(a){return f(d+a/c)}:a.c2p=function(a){return d+a/c}}function x(a){var b=a.options,c=a.ticks||[],d=b.labelWidth||0,e=b.labelHeight||0,f=d||"x"==a.direction?Math.floor(fa.width/(c.length||1)):null;legacyStyles=a.direction+"Axis "+a.direction+a.n+"Axis",layer="flot-"+a.direction+"-axis flot-"+a.direction+a.n+"-axis "+legacyStyles,font=b.font||"flot-tick-label tickLabel";for(var g=0;g<c.length;++g){var h=c[g];if(h.label){var i=fa.getTextInfo(layer,h.label,font,null,f);d=Math.max(d,i.width),e=Math.max(e,i.height)}}a.labelWidth=b.labelWidth||d,a.labelHeight=b.labelHeight||e}function y(b){var c,d=b.labelWidth,e=b.labelHeight,f=b.options.position,g=b.options.tickLength,h=ea.grid.axisMargin,i=ea.grid.labelMargin,j="x"==b.direction?ka:la,k=a.grep(j,function(a){return a&&a.options.position==f&&a.reserveSpace});if(a.inArray(b,k)==k.length-1&&(h=0),null==g){var l=a.grep(j,function(a){return a&&a.reserveSpace});c=0==a.inArray(b,l),g=c?"full":5}isNaN(+g)||(i+=+g),"x"==b.direction?(e+=i,"bottom"==f?(ma.bottom+=e+h,b.box={top:fa.height-ma.bottom,height:e}):(b.box={top:ma.top+h,height:e},ma.top+=e+h)):(d+=i,"left"==f?(b.box={left:ma.left+h,width:d},ma.left+=d+h):(ma.right+=d+h,b.box={left:fa.width-ma.right,width:d})),b.position=f,b.tickLength=g,b.box.padding=i,b.innermost=c}function z(a){"x"==a.direction?(a.box.left=ma.left-a.labelWidth/2,a.box.width=fa.width-ma.left-ma.right+a.labelWidth):(a.box.top=ma.top-a.labelHeight/2,a.box.height=fa.height-ma.bottom-ma.top+a.labelHeight)}function A(){var b,c=ea.grid.minBorderMargin,d={x:0,y:0};if(null==c)for(c=0,b=0;b<da.length;++b)c=Math.max(c,2*(da[b].points.radius+da[b].points.lineWidth/2));d.x=d.y=Math.ceil(c),a.each(n(),function(a,b){var c=b.direction;b.reserveSpace&&(d[c]=Math.ceil(Math.max(d[c],("x"==c?b.labelWidth:b.labelHeight)/2)))}),ma.left=Math.max(d.x,ma.left),ma.right=Math.max(d.x,ma.right),ma.top=Math.max(d.y,ma.top),ma.bottom=Math.max(d.y,ma.bottom)}function B(){var b,c=n(),d=ea.grid.show;for(var e in ma){var f=ea.grid.margin||0;ma[e]="number"==typeof f?f:f[e]||0}h(pa.processOffset,[ma]);for(var e in ma)"object"==typeof ea.grid.borderWidth?ma[e]+=d?ea.grid.borderWidth[e]:0:ma[e]+=d?ea.grid.borderWidth:0;if(a.each(c,function(a,b){b.show=b.options.show,null==b.show&&(b.show=b.used),b.reserveSpace=b.show||b.options.reserveSpace,C(b)}),d){var g=a.grep(c,function(a){return a.reserveSpace});for(a.each(g,function(a,b){D(b),E(b),F(b,b.ticks),x(b)}),b=g.length-1;b>=0;--b)y(g[b]);A(),a.each(g,function(a,b){z(b)})}na=fa.width-ma.left-ma.right,oa=fa.height-ma.bottom-ma.top,a.each(c,function(a,b){w(b)}),d&&K(),R()}function C(a){var b=a.options,c=+(null!=b.min?b.min:a.datamin),d=+(null!=b.max?b.max:a.datamax),e=d-c;if(0==e){var f=0==d?1:.01;null==b.min&&(c-=f),null!=b.max&&null==b.min||(d+=f)}else{var g=b.autoscaleMargin;null!=g&&(null==b.min&&(c-=e*g,c<0&&null!=a.datamin&&a.datamin>=0&&(c=0)),null==b.max&&(d+=e*g,d>0&&null!=a.datamax&&a.datamax<=0&&(d=0)))}a.min=c,a.max=d}function D(b){var c,e=b.options;c="number"==typeof e.ticks&&e.ticks>0?e.ticks:.3*Math.sqrt("x"==b.direction?fa.width:fa.height);var f=(b.max-b.min)/c,g=-Math.floor(Math.log(f)/Math.LN10),h=e.tickDecimals;null!=h&&g>h&&(g=h);var i,j=Math.pow(10,-g),k=f/j;if(k<1.5?i=1:k<3?(i=2,k>2.25&&(null==h||g+1<=h)&&(i=2.5,++g)):i=k<7.5?5:10,i*=j,null!=e.minTickSize&&i<e.minTickSize&&(i=e.minTickSize),b.delta=f,b.tickDecimals=Math.max(0,null!=h?h:g),b.tickSize=e.tickSize||i,"time"==e.mode&&!b.tickGenerator)throw new Error("Time mode requires the flot.time plugin.");if(b.tickGenerator||(b.tickGenerator=function(a){var b,c=[],e=d(a.min,a.tickSize),f=0,g=Number.NaN;do b=g,g=e+f*a.tickSize,c.push(g),++f;while(g<a.max&&g!=b);return c},b.tickFormatter=function(a,b){var c=b.tickDecimals?Math.pow(10,b.tickDecimals):1,d=""+Math.round(a*c)/c;if(null!=b.tickDecimals){var e=d.indexOf("."),f=e==-1?0:d.length-e-1;if(f<b.tickDecimals)return(f?d:d+".")+(""+c).substr(1,b.tickDecimals-f)}return d}),a.isFunction(e.tickFormatter)&&(b.tickFormatter=function(a,b){return""+e.tickFormatter(a,b)}),null!=e.alignTicksWithAxis){var l=("x"==b.direction?ka:la)[e.alignTicksWithAxis-1];if(l&&l.used&&l!=b){var m=b.tickGenerator(b);if(m.length>0&&(null==e.min&&(b.min=Math.min(b.min,m[0])),null==e.max&&m.length>1&&(b.max=Math.max(b.max,m[m.length-1]))),b.tickGenerator=function(a){var b,c,d=[];for(c=0;c<l.ticks.length;++c)b=(l.ticks[c].v-l.min)/(l.max-l.min),b=a.min+b*(a.max-a.min),d.push(b);return d},!b.mode&&null==e.tickDecimals){var n=Math.max(0,-Math.floor(Math.log(b.delta)/Math.LN10)+1),o=b.tickGenerator(b);o.length>1&&/\..*0$/.test((o[1]-o[0]).toFixed(n))||(b.tickDecimals=n)}}}}function E(b){var c=b.options.ticks,d=[];null==c||"number"==typeof c&&c>0?d=b.tickGenerator(b):c&&(d=a.isFunction(c)?c(b):c);var e,f;for(b.ticks=[],e=0;e<d.length;++e){var g=null,h=d[e];"object"==typeof h?(f=+h[0],h.length>1&&(g=h[1])):f=+h,null==g&&(g=b.tickFormatter(f,b)),isNaN(f)||b.ticks.push({v:f,label:g})}}function F(a,b){a.options.autoscaleMargin&&b.length>0&&(null==a.options.min&&(a.min=Math.min(a.min,b[0].v)),null==a.options.max&&b.length>1&&(a.max=Math.max(a.max,b[b.length-1].v)))}function G(){fa.clear(),h(pa.drawBackground,[ia]);var a=ea.grid;a.show&&a.backgroundColor&&I(),a.show&&!a.aboveData&&J();for(var b=0;b<da.length;++b)h(pa.drawSeries,[ia,da[b]]),L(da[b]);h(pa.draw,[ia]),a.show&&a.aboveData&&J(),fa.render(),X()}function H(a,b){for(var c,d,e,f,g=n(),h=0;h<g.length;++h)if(c=g[h],c.direction==b&&(f=b+c.n+"axis",a[f]||1!=c.n||(f=b+"axis"),a[f])){d=a[f].from,e=a[f].to;break}if(a[f]||(c="x"==b?ka[0]:la[0],d=a[b+"1"],e=a[b+"2"]),null!=d&&null!=e&&d>e){var i=d;d=e,e=i}return{from:d,to:e,axis:c}}function I(){ia.save(),ia.translate(ma.left,ma.top),ia.fillStyle=ca(ea.grid.backgroundColor,oa,0,"rgba(255, 255, 255, 0)"),ia.fillRect(0,0,na,oa),ia.restore()}function J(){var b,c,d,e;ia.save(),ia.translate(ma.left,ma.top);var f=ea.grid.markings;if(f)for(a.isFunction(f)&&(c=qa.getAxes(),c.xmin=c.xaxis.min,c.xmax=c.xaxis.max,c.ymin=c.yaxis.min,c.ymax=c.yaxis.max,f=f(c)),b=0;b<f.length;++b){var g=f[b],h=H(g,"x"),i=H(g,"y");null==h.from&&(h.from=h.axis.min),null==h.to&&(h.to=h.axis.max),null==i.from&&(i.from=i.axis.min),null==i.to&&(i.to=i.axis.max),h.to<h.axis.min||h.from>h.axis.max||i.to<i.axis.min||i.from>i.axis.max||(h.from=Math.max(h.from,h.axis.min),h.to=Math.min(h.to,h.axis.max),i.from=Math.max(i.from,i.axis.min),i.to=Math.min(i.to,i.axis.max),h.from==h.to&&i.from==i.to||(h.from=h.axis.p2c(h.from),h.to=h.axis.p2c(h.to),i.from=i.axis.p2c(i.from),i.to=i.axis.p2c(i.to),h.from==h.to||i.from==i.to?(ia.beginPath(),ia.strokeStyle=g.color||ea.grid.markingsColor,ia.lineWidth=g.lineWidth||ea.grid.markingsLineWidth,ia.moveTo(h.from,i.from),ia.lineTo(h.to,i.to),ia.stroke()):(ia.fillStyle=g.color||ea.grid.markingsColor,ia.fillRect(h.from,i.to,h.to-h.from,i.from-i.to))))}c=n(),d=ea.grid.borderWidth;for(var j=0;j<c.length;++j){var k,l,m,o,p=c[j],q=p.box,r=p.tickLength;if(p.show&&0!=p.ticks.length){for(ia.lineWidth=1,"x"==p.direction?(k=0,l="full"==r?"top"==p.position?0:oa:q.top-ma.top+("top"==p.position?q.height:0)):(l=0,k="full"==r?"left"==p.position?0:na:q.left-ma.left+("left"==p.position?q.width:0)),p.innermost||(ia.strokeStyle=p.options.color,ia.beginPath(),m=o=0,"x"==p.direction?m=na+1:o=oa+1,1==ia.lineWidth&&("x"==p.direction?l=Math.floor(l)+.5:k=Math.floor(k)+.5),ia.moveTo(k,l),ia.lineTo(k+m,l+o),ia.stroke()),ia.strokeStyle=p.options.tickColor,ia.beginPath(),b=0;b<p.ticks.length;++b){var s=p.ticks[b].v;m=o=0,isNaN(s)||s<p.min||s>p.max||"full"==r&&("object"==typeof d&&d[p.position]>0||d>0)&&(s==p.min||s==p.max)||("x"==p.direction?(k=p.p2c(s),o="full"==r?-oa:r,"top"==p.position&&(o=-o)):(l=p.p2c(s),m="full"==r?-na:r,"left"==p.position&&(m=-m)),1==ia.lineWidth&&("x"==p.direction?k=Math.floor(k)+.5:l=Math.floor(l)+.5),ia.moveTo(k,l),ia.lineTo(k+m,l+o))}ia.stroke()}}d&&(e=ea.grid.borderColor,"object"==typeof d||"object"==typeof e?("object"!=typeof d&&(d={top:d,right:d,bottom:d,left:d}),"object"!=typeof e&&(e={top:e,right:e,bottom:e,left:e}),d.top>0&&(ia.strokeStyle=e.top,ia.lineWidth=d.top,ia.beginPath(),ia.moveTo(0-d.left,0-d.top/2),ia.lineTo(na,0-d.top/2),ia.stroke()),d.right>0&&(ia.strokeStyle=e.right,ia.lineWidth=d.right,ia.beginPath(),ia.moveTo(na+d.right/2,0-d.top),ia.lineTo(na+d.right/2,oa),ia.stroke()),d.bottom>0&&(ia.strokeStyle=e.bottom,ia.lineWidth=d.bottom,ia.beginPath(),ia.moveTo(na+d.right,oa+d.bottom/2),ia.lineTo(0,oa+d.bottom/2),ia.stroke()),d.left>0&&(ia.strokeStyle=e.left,ia.lineWidth=d.left,ia.beginPath(),ia.moveTo(0-d.left/2,oa+d.bottom),ia.lineTo(0-d.left/2,0),ia.stroke())):(ia.lineWidth=d,ia.strokeStyle=ea.grid.borderColor,ia.strokeRect(-d/2,-d/2,na+d,oa+d))),ia.restore()}function K(){a.each(n(),function(a,b){if(b.show&&0!=b.ticks.length){var c,d,e,f,g,h=b.box,i=b.direction+"Axis "+b.direction+b.n+"Axis",j="flot-"+b.direction+"-axis flot-"+b.direction+b.n+"-axis "+i,k=b.options.font||"flot-tick-label tickLabel";fa.removeText(j);for(var l=0;l<b.ticks.length;++l)c=b.ticks[l],!c.label||c.v<b.min||c.v>b.max||("x"==b.direction?(f="center",d=ma.left+b.p2c(c.v),"bottom"==b.position?e=h.top+h.padding:(e=h.top+h.height-h.padding,g="bottom")):(g="middle",e=ma.top+b.p2c(c.v),"left"==b.position?(d=h.left+h.width-h.padding,f="right"):d=h.left+h.padding),fa.addText(j,d,e,c.label,k,null,null,f,g))}})}function L(a){a.lines.show&&M(a),a.bars.show&&P(a),a.points.show&&N(a)}function M(a){function b(a,b,c,d,e){var f=a.points,g=a.pointsize,h=null,i=null;ia.beginPath();for(var j=g;j<f.length;j+=g){var k=f[j-g],l=f[j-g+1],m=f[j],n=f[j+1];if(null!=k&&null!=m){if(l<=n&&l<e.min){if(n<e.min)continue;k=(e.min-l)/(n-l)*(m-k)+k,l=e.min}else if(n<=l&&n<e.min){if(l<e.min)continue;m=(e.min-l)/(n-l)*(m-k)+k,n=e.min}if(l>=n&&l>e.max){if(n>e.max)continue;k=(e.max-l)/(n-l)*(m-k)+k,l=e.max}else if(n>=l&&n>e.max){if(l>e.max)continue;m=(e.max-l)/(n-l)*(m-k)+k,n=e.max}if(k<=m&&k<d.min){if(m<d.min)continue;l=(d.min-k)/(m-k)*(n-l)+l,k=d.min}else if(m<=k&&m<d.min){if(k<d.min)continue;n=(d.min-k)/(m-k)*(n-l)+l,m=d.min}if(k>=m&&k>d.max){if(m>d.max)continue;l=(d.max-k)/(m-k)*(n-l)+l,k=d.max}else if(m>=k&&m>d.max){if(k>d.max)continue;n=(d.max-k)/(m-k)*(n-l)+l,m=d.max}k==h&&l==i||ia.moveTo(d.p2c(k)+b,e.p2c(l)+c),h=m,i=n,ia.lineTo(d.p2c(m)+b,e.p2c(n)+c)}}ia.stroke()}function c(a,b,c){for(var d=a.points,e=a.pointsize,f=Math.min(Math.max(0,c.min),c.max),g=0,h=!1,i=1,j=0,k=0;;){if(e>0&&g>d.length+e)break;g+=e;var l=d[g-e],m=d[g-e+i],n=d[g],o=d[g+i];if(h){if(e>0&&null!=l&&null==n){k=g,e=-e,i=2;continue}if(e<0&&g==j+e){ia.fill(),h=!1,e=-e,i=1,g=j=k+e;continue}}if(null!=l&&null!=n){if(l<=n&&l<b.min){if(n<b.min)continue;m=(b.min-l)/(n-l)*(o-m)+m,l=b.min}else if(n<=l&&n<b.min){if(l<b.min)continue;o=(b.min-l)/(n-l)*(o-m)+m,n=b.min}if(l>=n&&l>b.max){if(n>b.max)continue;m=(b.max-l)/(n-l)*(o-m)+m,l=b.max}else if(n>=l&&n>b.max){if(l>b.max)continue;o=(b.max-l)/(n-l)*(o-m)+m,n=b.max}if(h||(ia.beginPath(),ia.moveTo(b.p2c(l),c.p2c(f)),h=!0),m>=c.max&&o>=c.max)ia.lineTo(b.p2c(l),c.p2c(c.max)),ia.lineTo(b.p2c(n),c.p2c(c.max));else if(m<=c.min&&o<=c.min)ia.lineTo(b.p2c(l),c.p2c(c.min)),ia.lineTo(b.p2c(n),c.p2c(c.min));else{var p=l,q=n;m<=o&&m<c.min&&o>=c.min?(l=(c.min-m)/(o-m)*(n-l)+l,m=c.min):o<=m&&o<c.min&&m>=c.min&&(n=(c.min-m)/(o-m)*(n-l)+l,o=c.min),m>=o&&m>c.max&&o<=c.max?(l=(c.max-m)/(o-m)*(n-l)+l,m=c.max):o>=m&&o>c.max&&m<=c.max&&(n=(c.max-m)/(o-m)*(n-l)+l,o=c.max),l!=p&&ia.lineTo(b.p2c(p),c.p2c(m)),ia.lineTo(b.p2c(l),c.p2c(m)),ia.lineTo(b.p2c(n),c.p2c(o)),n!=q&&(ia.lineTo(b.p2c(n),c.p2c(o)),ia.lineTo(b.p2c(q),c.p2c(o)))}}}}ia.save(),ia.translate(ma.left,ma.top),ia.lineJoin="round";var d=a.lines.lineWidth,e=a.shadowSize;if(d>0&&e>0){ia.lineWidth=e,ia.strokeStyle="rgba(0,0,0,0.1)";var f=Math.PI/18;b(a.datapoints,Math.sin(f)*(d/2+e/2),Math.cos(f)*(d/2+e/2),a.xaxis,a.yaxis),ia.lineWidth=e/2,b(a.datapoints,Math.sin(f)*(d/2+e/4),Math.cos(f)*(d/2+e/4),a.xaxis,a.yaxis)}ia.lineWidth=d,ia.strokeStyle=a.color;var g=Q(a.lines,a.color,0,oa);g&&(ia.fillStyle=g,c(a.datapoints,a.xaxis,a.yaxis)),d>0&&b(a.datapoints,0,0,a.xaxis,a.yaxis),ia.restore()}function N(a){function b(a,b,c,d,e,f,g,h){for(var i=a.points,j=a.pointsize,k=0;k<i.length;k+=j){var l=i[k],m=i[k+1];null==l||l<f.min||l>f.max||m<g.min||m>g.max||(ia.beginPath(),l=f.p2c(l),m=g.p2c(m)+d,"circle"==h?ia.arc(l,m,b,0,e?Math.PI:2*Math.PI,!1):h(ia,l,m,b,e),ia.closePath(),c&&(ia.fillStyle=c,ia.fill()),ia.stroke())}}ia.save(),ia.translate(ma.left,ma.top);var c=a.points.lineWidth,d=a.shadowSize,e=a.points.radius,f=a.points.symbol;if(0==c&&(c=1e-4),c>0&&d>0){var g=d/2;ia.lineWidth=g,ia.strokeStyle="rgba(0,0,0,0.1)",b(a.datapoints,e,null,g+g/2,!0,a.xaxis,a.yaxis,f),ia.strokeStyle="rgba(0,0,0,0.2)",b(a.datapoints,e,null,g/2,!0,a.xaxis,a.yaxis,f)}ia.lineWidth=c,ia.strokeStyle=a.color,b(a.datapoints,e,Q(a.points,a.color),0,!1,a.xaxis,a.yaxis,f),ia.restore()}function O(a,b,c,d,e,f,g,h,i,j,k,l){var m,n,o,p,q,r,s,t,u;k?(t=r=s=!0,q=!1,m=c,n=a,p=b+d,o=b+e,n<m&&(u=n,n=m,m=u,q=!0,r=!1)):(q=r=s=!0,t=!1,m=a+d,n=a+e,o=c,p=b,p<o&&(u=p,p=o,o=u,t=!0,s=!1)),n<h.min||m>h.max||p<i.min||o>i.max||(m<h.min&&(m=h.min,q=!1),n>h.max&&(n=h.max,r=!1),o<i.min&&(o=i.min,t=!1),p>i.max&&(p=i.max,s=!1),m=h.p2c(m),o=i.p2c(o),n=h.p2c(n),p=i.p2c(p),g&&(j.beginPath(),j.moveTo(m,o),j.lineTo(m,p),j.lineTo(n,p),j.lineTo(n,o),j.fillStyle=g(o,p),j.fill()),l>0&&(q||r||s||t)&&(j.beginPath(),j.moveTo(m,o+f),q?j.lineTo(m,p+f):j.moveTo(m,p+f),s?j.lineTo(n,p+f):j.moveTo(n,p+f),r?j.lineTo(n,o+f):j.moveTo(n,o+f),t?j.lineTo(m,o+f):j.moveTo(m,o+f),j.stroke()))}function P(a){function b(b,c,d,e,f,g,h){for(var i=b.points,j=b.pointsize,k=0;k<i.length;k+=j)null!=i[k]&&O(i[k],i[k+1],i[k+2],c,d,e,f,g,h,ia,a.bars.horizontal,a.bars.lineWidth)}ia.save(),ia.translate(ma.left,ma.top),ia.lineWidth=a.bars.lineWidth,ia.strokeStyle=a.color;var c;switch(a.bars.align){case"left":c=0;break;case"right":c=-a.bars.barWidth;break;case"center":c=-a.bars.barWidth/2;break;default:throw new Error("Invalid bar alignment: "+a.bars.align)}var d=a.bars.fill?function(b,c){return Q(a.bars,a.color,b,c)}:null;b(a.datapoints,c,c+a.bars.barWidth,0,d,a.xaxis,a.yaxis),ia.restore()}function Q(b,c,d,e){var f=b.fill;if(!f)return null;if(b.fillColor)return ca(b.fillColor,d,e,c);var g=a.color.parse(c);return g.a="number"==typeof f?f:.4,g.normalize(),g.toString()}function R(){if(c.find(".legend").remove(),ea.legend.show){for(var b,d,e=[],f=[],g=!1,h=ea.legend.labelFormatter,i=0;i<da.length;++i)b=da[i],b.label&&(d=h?h(b.label,b):b.label,d&&f.push({label:d,color:b.color}));if(ea.legend.sorted)if(a.isFunction(ea.legend.sorted))f.sort(ea.legend.sorted);else if("reverse"==ea.legend.sorted)f.reverse();else{var j="descending"!=ea.legend.sorted;f.sort(function(a,b){return a.label==b.label?0:a.label<b.label!=j?1:-1})}for(var i=0;i<f.length;++i){var k=f[i];i%ea.legend.noColumns==0&&(g&&e.push("</tr>"),e.push("<tr>"),g=!0),e.push('<td class="legendColorBox"><div style="border:1px solid '+ea.legend.labelBoxBorderColor+';padding:1px"><div style="width:4px;height:0;border:5px solid '+k.color+';overflow:hidden"></div></div></td><td class="legendLabel">'+k.label+"</td>")}if(g&&e.push("</tr>"),0!=e.length){var l='<table style="font-size:smaller;color:'+ea.grid.color+'">'+e.join("")+"</table>";if(null!=ea.legend.container)a(ea.legend.container).html(l);else{var m="",n=ea.legend.position,o=ea.legend.margin;null==o[0]&&(o=[o,o]),"n"==n.charAt(0)?m+="top:"+(o[1]+ma.top)+"px;":"s"==n.charAt(0)&&(m+="bottom:"+(o[1]+ma.bottom)+"px;"),"e"==n.charAt(1)?m+="right:"+(o[0]+ma.right)+"px;":"w"==n.charAt(1)&&(m+="left:"+(o[0]+ma.left)+"px;");var p=a('<div class="legend">'+l.replace('style="','style="position:absolute;'+m+";")+"</div>").appendTo(c);if(0!=ea.legend.backgroundOpacity){var q=ea.legend.backgroundColor;null==q&&(q=ea.grid.backgroundColor,q=q&&"string"==typeof q?a.color.parse(q):a.color.extract(p,"background-color"),q.a=1,q=q.toString());var r=p.children();a('<div style="position:absolute;width:'+r.width()+"px;height:"+r.height()+"px;"+m+"background-color:"+q+';"> </div>').prependTo(p).css("opacity",ea.legend.backgroundOpacity)}}}}}function S(a,b,c){var d,e,f,g=ea.grid.mouseActiveRadius,h=g*g+1,i=null;for(d=da.length-1;d>=0;--d)if(c(da[d])){var j=da[d],k=j.xaxis,l=j.yaxis,m=j.datapoints.points,n=k.c2p(a),o=l.c2p(b),p=g/k.scale,q=g/l.scale;if(f=j.datapoints.pointsize,k.options.inverseTransform&&(p=Number.MAX_VALUE),l.options.inverseTransform&&(q=Number.MAX_VALUE),j.lines.show||j.points.show)for(e=0;e<m.length;e+=f){var r=m[e],s=m[e+1];if(null!=r&&!(r-n>p||r-n<-p||s-o>q||s-o<-q)){var t=Math.abs(k.p2c(r)-a),u=Math.abs(l.p2c(s)-b),v=t*t+u*u;v<h&&(h=v,i=[d,e/f])}}if(j.bars.show&&!i){var w="left"==j.bars.align?0:-j.bars.barWidth/2,x=w+j.bars.barWidth;for(e=0;e<m.length;e+=f){var r=m[e],s=m[e+1],y=m[e+2];null!=r&&(da[d].bars.horizontal?n<=Math.max(y,r)&&n>=Math.min(y,r)&&o>=s+w&&o<=s+x:n>=r+w&&n<=r+x&&o>=Math.min(y,s)&&o<=Math.max(y,s))&&(i=[d,e/f])}}}return i?(d=i[0],e=i[1],f=da[d].datapoints.pointsize,{datapoint:da[d].datapoints.points.slice(e*f,(e+1)*f),dataIndex:e,series:da[d],seriesIndex:d}):null}function T(a){ea.grid.hoverable&&W("plothover",a,function(a){return 0!=a.hoverable})}function U(a){ea.grid.hoverable&&W("plothover",a,function(a){return!1})}function V(a){W("plotclick",a,function(a){return 0!=a.clickable})}function W(a,b,d){var e=ha.offset(),f=b.pageX-e.left-ma.left,g=b.pageY-e.top-ma.top,h=o({left:f,top:g});h.pageX=b.pageX,h.pageY=b.pageY;var i=S(f,g,d);if(i&&(i.pageX=parseInt(i.series.xaxis.p2c(i.datapoint[0])+e.left+ma.left,10),i.pageY=parseInt(i.series.yaxis.p2c(i.datapoint[1])+e.top+ma.top,10)),ea.grid.autoHighlight){for(var j=0;j<ra.length;++j){var k=ra[j];k.auto!=a||i&&k.series==i.series&&k.point[0]==i.datapoint[0]&&k.point[1]==i.datapoint[1]||$(k.series,k.point)}i&&Z(i.series,i.datapoint,a)}c.trigger(a,[h,i])}function X(){var a=ea.interaction.redrawOverlayInterval;return a==-1?void Y():void(sa||(sa=setTimeout(Y,a)))}function Y(){sa=null,ja.save(),ga.clear(),ja.translate(ma.left,ma.top);var a,b;for(a=0;a<ra.length;++a)b=ra[a],b.series.bars.show?ba(b.series,b.point):aa(b.series,b.point);ja.restore(),h(pa.drawOverlay,[ja])}function Z(a,b,c){if("number"==typeof a&&(a=da[a]),"number"==typeof b){var d=a.datapoints.pointsize;b=a.datapoints.points.slice(d*b,d*(b+1))}var e=_(a,b);e==-1?(ra.push({series:a,point:b,auto:c}),X()):c||(ra[e].auto=!1)}function $(a,b){if(null==a&&null==b)return ra=[],void X();if("number"==typeof a&&(a=da[a]),"number"==typeof b){var c=a.datapoints.pointsize;b=a.datapoints.points.slice(c*b,c*(b+1))}var d=_(a,b);d!=-1&&(ra.splice(d,1),X())}function _(a,b){for(var c=0;c<ra.length;++c){var d=ra[c];if(d.series==a&&d.point[0]==b[0]&&d.point[1]==b[1])return c}return-1}function aa(b,c){var d=c[0],e=c[1],f=b.xaxis,g=b.yaxis,h="string"==typeof b.highlightColor?b.highlightColor:a.color.parse(b.color).scale("a",.5).toString();if(!(d<f.min||d>f.max||e<g.min||e>g.max)){var i=b.points.radius+b.points.lineWidth/2;ja.lineWidth=i,ja.strokeStyle=h;var j=1.5*i;d=f.p2c(d),e=g.p2c(e),ja.beginPath(),"circle"==b.points.symbol?ja.arc(d,e,j,0,2*Math.PI,!1):b.points.symbol(ja,d,e,j,!1),ja.closePath(),ja.stroke()}}function ba(b,c){var d="string"==typeof b.highlightColor?b.highlightColor:a.color.parse(b.color).scale("a",.5).toString(),e=d,f="left"==b.bars.align?0:-b.bars.barWidth/2;ja.lineWidth=b.bars.lineWidth,ja.strokeStyle=d,O(c[0],c[1],c[2]||0,f,f+b.bars.barWidth,0,function(){return e},b.xaxis,b.yaxis,ja,b.bars.horizontal,b.bars.lineWidth)}function ca(b,c,d,e){if("string"==typeof b)return b;for(var f=ia.createLinearGradient(0,d,0,c),g=0,h=b.colors.length;g<h;++g){var i=b.colors[g];if("string"!=typeof i){var j=a.color.parse(e);null!=i.brightness&&(j=j.scale("rgb",i.brightness)),null!=i.opacity&&(j.a*=i.opacity),i=j.toString()}f.addColorStop(g/(h-1),i)}return f}var da=[],ea={colors:["#edc240","#afd8f8","#cb4b4b","#4da74d","#9440ed"],legend:{show:!0,noColumns:1,labelFormatter:null,labelBoxBorderColor:"#ccc",container:null,position:"ne",margin:5,backgroundColor:null,backgroundOpacity:.85,sorted:null},xaxis:{show:null,position:"bottom",mode:null,font:null,color:null,tickColor:null,transform:null,inverseTransform:null,min:null,max:null,autoscaleMargin:null,ticks:null,tickFormatter:null,labelWidth:null,labelHeight:null,reserveSpace:null,tickLength:null,alignTicksWithAxis:null,tickDecimals:null,tickSize:null,minTickSize:null},yaxis:{autoscaleMargin:.02,position:"left"},xaxes:[],yaxes:[],series:{points:{show:!1,radius:3,lineWidth:2,fill:!0,fillColor:"#ffffff",symbol:"circle"},lines:{lineWidth:2,fill:!1,fillColor:null,steps:!1},bars:{show:!1,lineWidth:2,barWidth:1,fill:!0,fillColor:null,align:"left",horizontal:!1,zero:!0},shadowSize:3,highlightColor:null},grid:{show:!0,aboveData:!1,color:"#545454",backgroundColor:null,borderColor:null,tickColor:null,margin:0,labelMargin:5,axisMargin:8,borderWidth:2,minBorderMargin:null,markings:null,markingsColor:"#f4f4f4",markingsLineWidth:2,clickable:!1,hoverable:!1,autoHighlight:!0,mouseActiveRadius:10},interaction:{redrawOverlayInterval:1e3/60},hooks:{}},fa=null,ga=null,ha=null,ia=null,ja=null,ka=[],la=[],ma={left:0,right:0,top:0,bottom:0},na=0,oa=0,pa={processOptions:[],processRawData:[],
+processDatapoints:[],processOffset:[],drawBackground:[],drawSeries:[],draw:[],bindEvents:[],drawOverlay:[],shutdown:[]},qa=this;qa.setData=k,qa.setupGrid=B,qa.draw=G,qa.getPlaceholder=function(){return c},qa.getCanvas=function(){return fa.element},qa.getPlotOffset=function(){return ma},qa.width=function(){return na},qa.height=function(){return oa},qa.offset=function(){var a=ha.offset();return a.left+=ma.left,a.top+=ma.top,a},qa.getData=function(){return da},qa.getAxes=function(){var b={};return a.each(ka.concat(la),function(a,c){c&&(b[c.direction+(1!=c.n?c.n:"")+"axis"]=c)}),b},qa.getXAxes=function(){return ka},qa.getYAxes=function(){return la},qa.c2p=o,qa.p2c=p,qa.getOptions=function(){return ea},qa.highlight=Z,qa.unhighlight=$,qa.triggerRedrawOverlay=X,qa.pointOffset=function(a){return{left:parseInt(ka[m(a,"x")-1].p2c(+a.x)+ma.left,10),top:parseInt(la[m(a,"y")-1].p2c(+a.y)+ma.top,10)}},qa.shutdown=v,qa.resize=function(){var a=c.width(),b=c.height();fa.resize(a,b),ga.resize(a,b)},qa.hooks=pa,i(qa),j(f),t(),k(e),B(),G(),u();var ra=[],sa=null}function d(a,b){return b*Math.floor(a/b)}var e=Object.prototype.hasOwnProperty;b.prototype.resize=function(a,b){if(a<=0||b<=0)throw new Error("Invalid dimensions for plot, width = "+a+", height = "+b);var c=this.element,d=this.context,e=this.pixelRatio;this.width!=a&&(c.width=a*e,c.style.width=a+"px",this.width=a),this.height!=b&&(c.height=b*e,c.style.height=b+"px",this.height=b),d.restore(),d.save(),d.scale(e,e)},b.prototype.clear=function(){this.context.clearRect(0,0,this.width,this.height)},b.prototype.render=function(){var a=this._textCache;for(var b in a)if(e.call(a,b)){var c=this.getTextLayer(b),d=a[b];c.hide();for(var f in d)if(e.call(d,f)){var g=d[f];for(var h in g)if(e.call(g,h)){for(var i,j=g[h].positions,k=0;i=j[k];k++)i.active?i.rendered||(c.append(i.element),i.rendered=!0):(j.splice(k--,1),i.rendered&&i.element.detach());0==j.length&&delete g[h]}}c.show()}},b.prototype.getTextLayer=function(b){var c=this.text[b];return null==c&&(null==this.textContainer&&(this.textContainer=a("<div class='flot-text'></div>").css({position:"absolute",top:0,left:0,bottom:0,right:0,"font-size":"smaller",color:"#545454"}).insertAfter(this.element)),c=this.text[b]=a("<div></div>").addClass(b).css({position:"absolute",top:0,left:0,bottom:0,right:0}).appendTo(this.textContainer)),c},b.prototype.getTextInfo=function(b,c,d,e,f){var g,h,i,j;if(c=""+c,g="object"==typeof d?d.style+" "+d.variant+" "+d.weight+" "+d.size+"px/"+d.lineHeight+"px "+d.family:d,h=this._textCache[b],null==h&&(h=this._textCache[b]={}),i=h[g],null==i&&(i=h[g]={}),j=i[c],null==j){var k=a("<div></div>").html(c).css({position:"absolute","max-width":f,top:-9999}).appendTo(this.getTextLayer(b));"object"==typeof d?k.css({font:g,color:d.color}):"string"==typeof d&&k.addClass(d),j=i[c]={width:k.outerWidth(!0),height:k.outerHeight(!0),element:k,positions:[]},k.detach()}return j},b.prototype.addText=function(a,b,c,d,e,f,g,h,i){var j=this.getTextInfo(a,d,e,f,g),k=j.positions;"center"==h?b-=j.width/2:"right"==h&&(b-=j.width),"middle"==i?c-=j.height/2:"bottom"==i&&(c-=j.height);for(var l,m=0;l=k[m];m++)if(l.x==b&&l.y==c)return void(l.active=!0);l={active:!0,rendered:!1,element:k.length?j.element.clone():j.element,x:b,y:c},k.push(l),l.element.css({top:Math.round(c),left:Math.round(b),"text-align":h})},b.prototype.removeText=function(a,b,c,d,f,g){if(null==d){var h=this._textCache[a];if(null!=h)for(var i in h)if(e.call(h,i)){var j=h[i];for(var k in j)if(e.call(j,k))for(var l,m=j[k].positions,n=0;l=m[n];n++)l.active=!1}}else for(var l,m=this.getTextInfo(a,d,f,g).positions,n=0;l=m[n];n++)l.x==b&&l.y==c&&(l.active=!1)},a.plot=function(b,d,e){var f=new c(a(b),d,e,a.plot.plugins);return f},a.plot.version="0.8.1",a.plot.plugins=[],a.fn.plot=function(b,c){return this.each(function(){a.plot(this,b,c)})}}(jQuery);
\ No newline at end of file
diff --git a/assets/js/jquery-flot/jquery.flot.pie.min.js b/assets/js/jquery-flot/jquery.flot.pie.min.js
index 2bacbcf63b8..0f661ee9d6d 100644
--- a/assets/js/jquery-flot/jquery.flot.pie.min.js
+++ b/assets/js/jquery-flot/jquery.flot.pie.min.js
@@ -1 +1 @@
-!function(a){function b(b){function f(b,c,d){x||(x=!0,s=b.getCanvas(),t=a(s).parent(),e=b.getOptions(),b.setData(g(b.getData())))}function g(b){for(var c=0,d=0,f=0,g=e.series.pie.combine.color,h=[],i=0;i<b.length;++i){var j=b[i].data;a.isArray(j)&&1==j.length&&(j=j[0]),a.isArray(j)?!isNaN(parseFloat(j[1]))&&isFinite(j[1])?j[1]=+j[1]:j[1]=0:j=!isNaN(parseFloat(j))&&isFinite(j)?[1,+j]:[1,0],b[i].data=[j]}for(var i=0;i<b.length;++i)c+=b[i].data[0][1];for(var i=0;i<b.length;++i){var j=b[i].data[0][1];j/c<=e.series.pie.combine.threshold&&(d+=j,f++,g||(g=b[i].color))}for(var i=0;i<b.length;++i){var j=b[i].data[0][1];(2>f||j/c>e.series.pie.combine.threshold)&&h.push({data:[[1,j]],color:b[i].color,label:b[i].label,angle:j*Math.PI*2/c,percent:j/(c/100)})}return f>1&&h.push({data:[[1,d]],color:g,label:e.series.pie.combine.label,angle:d*Math.PI*2/c,percent:d/(c/100)}),h}function h(b,f){function g(){y.clearRect(0,0,k,l),t.children().filter(".pieLabel, .pieLabelBackground").remove()}function h(){var a=e.series.pie.shadow.left,b=e.series.pie.shadow.top,c=10,d=e.series.pie.shadow.alpha,f=e.series.pie.radius>1?e.series.pie.radius:u*e.series.pie.radius;if(!(f>=k/2-a||f*e.series.pie.tilt>=l/2-b||c>=f)){y.save(),y.translate(a,b),y.globalAlpha=d,y.fillStyle="#000",y.translate(v,w),y.scale(1,e.series.pie.tilt);for(var g=1;c>=g;g++)y.beginPath(),y.arc(0,0,f,0,2*Math.PI,!1),y.fill(),f-=g;y.restore()}}function j(){function b(a,b,c){0>=a||isNaN(a)||(c?y.fillStyle=b:(y.strokeStyle=b,y.lineJoin="round"),y.beginPath(),Math.abs(a-2*Math.PI)>1e-9&&y.moveTo(0,0),y.arc(0,0,f,g,g+a/2,!1),y.arc(0,0,f,g+a/2,g+a,!1),y.closePath(),g+=a,c?y.fill():y.stroke())}function c(){function b(b,c,d){if(0==b.data[0][1])return!0;var g,h=e.legend.labelFormatter,i=e.series.pie.label.formatter;g=h?h(b.label,b):b.label,i&&(g=i(g,b));var j=(c+b.angle+c)/2,m=v+Math.round(Math.cos(j)*f),n=w+Math.round(Math.sin(j)*f)*e.series.pie.tilt,o="<span class='pieLabel' id='pieLabel"+d+"' style='position:absolute;top:"+n+"px;left:"+m+"px;'>"+g+"</span>";t.append(o);var p=t.children("#pieLabel"+d),q=n-p.height()/2,r=m-p.width()/2;if(p.css("top",q),p.css("left",r),0-q>0||0-r>0||l-(q+p.height())<0||k-(r+p.width())<0)return!1;if(0!=e.series.pie.label.background.opacity){var s=e.series.pie.label.background.color;null==s&&(s=b.color);var u="top:"+q+"px;left:"+r+"px;";a("<div class='pieLabelBackground' style='position:absolute;width:"+p.width()+"px;height:"+p.height()+"px;"+u+"background-color:"+s+";'></div>").css("opacity",e.series.pie.label.background.opacity).insertBefore(p)}return!0}for(var c=d,f=e.series.pie.label.radius>1?e.series.pie.label.radius:u*e.series.pie.label.radius,g=0;g<n.length;++g){if(n[g].percent>=100*e.series.pie.label.threshold&&!b(n[g],c,g))return!1;c+=n[g].angle}return!0}var d=Math.PI*e.series.pie.startAngle,f=e.series.pie.radius>1?e.series.pie.radius:u*e.series.pie.radius;y.save(),y.translate(v,w),y.scale(1,e.series.pie.tilt),y.save();for(var g=d,h=0;h<n.length;++h)n[h].startAngle=g,b(n[h].angle,n[h].color,!0);if(y.restore(),e.series.pie.stroke.width>0){y.save(),y.lineWidth=e.series.pie.stroke.width,g=d;for(var h=0;h<n.length;++h)b(n[h].angle,e.series.pie.stroke.color,!1);y.restore()}return i(y),y.restore(),e.series.pie.label.show?c():!0}if(t){var k=b.getPlaceholder().width(),l=b.getPlaceholder().height(),m=t.children().filter(".legend").children().width()||0;y=f,x=!1,u=Math.min(k,l/e.series.pie.tilt)/2,w=l/2+e.series.pie.offset.top,v=k/2,"auto"==e.series.pie.offset.left?e.legend.position.match("w")?v+=m/2:v-=m/2:v+=e.series.pie.offset.left,u>v?v=u:v>k-u&&(v=k-u);var n=b.getData(),o=0;do o>0&&(u*=d),o+=1,g(),e.series.pie.tilt<=.8&&h();while(!j()&&c>o);o>=c&&(g(),t.prepend("<div class='error'>Could not draw pie with labels contained inside canvas</div>")),b.setSeries&&b.insertLegend&&(b.setSeries(n),b.insertLegend())}}function i(a){if(e.series.pie.innerRadius>0){a.save();var b=e.series.pie.innerRadius>1?e.series.pie.innerRadius:u*e.series.pie.innerRadius;a.globalCompositeOperation="destination-out",a.beginPath(),a.fillStyle=e.series.pie.stroke.color,a.arc(0,0,b,0,2*Math.PI,!1),a.fill(),a.closePath(),a.restore(),a.save(),a.beginPath(),a.strokeStyle=e.series.pie.stroke.color,a.arc(0,0,b,0,2*Math.PI,!1),a.stroke(),a.closePath(),a.restore()}}function j(a,b){for(var c=!1,d=-1,e=a.length,f=e-1;++d<e;f=d)(a[d][1]<=b[1]&&b[1]<a[f][1]||a[f][1]<=b[1]&&b[1]<a[d][1])&&b[0]<(a[f][0]-a[d][0])*(b[1]-a[d][1])/(a[f][1]-a[d][1])+a[d][0]&&(c=!c);return c}function k(a,c){for(var d,e,f=b.getData(),g=b.getOptions(),h=g.series.pie.radius>1?g.series.pie.radius:u*g.series.pie.radius,i=0;i<f.length;++i){var k=f[i];if(k.pie.show){if(y.save(),y.beginPath(),y.moveTo(0,0),y.arc(0,0,h,k.startAngle,k.startAngle+k.angle/2,!1),y.arc(0,0,h,k.startAngle+k.angle/2,k.startAngle+k.angle,!1),y.closePath(),d=a-v,e=c-w,y.isPointInPath){if(y.isPointInPath(a-v,c-w))return y.restore(),{datapoint:[k.percent,k.data],dataIndex:0,series:k,seriesIndex:i}}else{var l=h*Math.cos(k.startAngle),m=h*Math.sin(k.startAngle),n=h*Math.cos(k.startAngle+k.angle/4),o=h*Math.sin(k.startAngle+k.angle/4),p=h*Math.cos(k.startAngle+k.angle/2),q=h*Math.sin(k.startAngle+k.angle/2),r=h*Math.cos(k.startAngle+k.angle/1.5),s=h*Math.sin(k.startAngle+k.angle/1.5),t=h*Math.cos(k.startAngle+k.angle),x=h*Math.sin(k.startAngle+k.angle),z=[[0,0],[l,m],[n,o],[p,q],[r,s],[t,x]],A=[d,e];if(j(z,A))return y.restore(),{datapoint:[k.percent,k.data],dataIndex:0,series:k,seriesIndex:i}}y.restore()}}return null}function l(a){n("plothover",a)}function m(a){n("plotclick",a)}function n(a,c){var d=b.offset(),f=parseInt(c.pageX-d.left),g=parseInt(c.pageY-d.top),h=k(f,g);if(e.grid.autoHighlight)for(var i=0;i<z.length;++i){var j=z[i];j.auto!=a||h&&j.series==h.series||p(j.series)}h&&o(h.series,a);var l={pageX:c.pageX,pageY:c.pageY};t.trigger(a,[l,h])}function o(a,c){var d=q(a);-1==d?(z.push({series:a,auto:c}),b.triggerRedrawOverlay()):c||(z[d].auto=!1)}function p(a){null==a&&(z=[],b.triggerRedrawOverlay());var c=q(a);-1!=c&&(z.splice(c,1),b.triggerRedrawOverlay())}function q(a){for(var b=0;b<z.length;++b){var c=z[b];if(c.series==a)return b}return-1}function r(a,b){function c(a){a.angle<=0||isNaN(a.angle)||(b.fillStyle="rgba(255, 255, 255, "+d.series.pie.highlight.opacity+")",b.beginPath(),Math.abs(a.angle-2*Math.PI)>1e-9&&b.moveTo(0,0),b.arc(0,0,e,a.startAngle,a.startAngle+a.angle/2,!1),b.arc(0,0,e,a.startAngle+a.angle/2,a.startAngle+a.angle,!1),b.closePath(),b.fill())}var d=a.getOptions(),e=d.series.pie.radius>1?d.series.pie.radius:u*d.series.pie.radius;b.save(),b.translate(v,w),b.scale(1,d.series.pie.tilt);for(var f=0;f<z.length;++f)c(z[f].series);i(b),b.restore()}var s=null,t=null,u=null,v=null,w=null,x=!1,y=null,z=[];b.hooks.processOptions.push(function(a,b){b.series.pie.show&&(b.grid.show=!1,"auto"==b.series.pie.label.show&&(b.legend.show?b.series.pie.label.show=!1:b.series.pie.label.show=!0),"auto"==b.series.pie.radius&&(b.series.pie.label.show?b.series.pie.radius=.75:b.series.pie.radius=1),b.series.pie.tilt>1?b.series.pie.tilt=1:b.series.pie.tilt<0&&(b.series.pie.tilt=0))}),b.hooks.bindEvents.push(function(a,b){var c=a.getOptions();c.series.pie.show&&(c.grid.hoverable&&b.unbind("mousemove").mousemove(l),c.grid.clickable&&b.unbind("click").click(m))}),b.hooks.processDatapoints.push(function(a,b,c,d){var e=a.getOptions();e.series.pie.show&&f(a,b,c,d)}),b.hooks.drawOverlay.push(function(a,b){var c=a.getOptions();c.series.pie.show&&r(a,b)}),b.hooks.draw.push(function(a,b){var c=a.getOptions();c.series.pie.show&&h(a,b)})}var c=10,d=.95,e={series:{pie:{show:!1,radius:"auto",innerRadius:0,startAngle:1.5,tilt:1,shadow:{left:5,top:15,alpha:.02},offset:{top:0,left:"auto"},stroke:{color:"#fff",width:1},label:{show:"auto",formatter:function(a,b){return"<div style='font-size:x-small;text-align:center;padding:2px;color:"+b.color+";'>"+a+"<br/>"+Math.round(b.percent)+"%</div>"},radius:1,background:{color:null,opacity:0},threshold:0},combine:{threshold:-1,color:null,label:"Other"},highlight:{opacity:.5}}}};a.plot.plugins.push({init:b,options:e,name:"pie",version:"1.1"})}(jQuery);
\ No newline at end of file
+!function(a){function b(b){function f(b,c,d){x||(x=!0,s=b.getCanvas(),t=a(s).parent(),e=b.getOptions(),b.setData(g(b.getData())))}function g(b){for(var c=0,d=0,f=0,g=e.series.pie.combine.color,h=[],i=0;i<b.length;++i){var j=b[i].data;a.isArray(j)&&1==j.length&&(j=j[0]),a.isArray(j)?!isNaN(parseFloat(j[1]))&&isFinite(j[1])?j[1]=+j[1]:j[1]=0:j=!isNaN(parseFloat(j))&&isFinite(j)?[1,+j]:[1,0],b[i].data=[j]}for(var i=0;i<b.length;++i)c+=b[i].data[0][1];for(var i=0;i<b.length;++i){var j=b[i].data[0][1];j/c<=e.series.pie.combine.threshold&&(d+=j,f++,g||(g=b[i].color))}for(var i=0;i<b.length;++i){var j=b[i].data[0][1];(f<2||j/c>e.series.pie.combine.threshold)&&h.push({data:[[1,j]],color:b[i].color,label:b[i].label,angle:j*Math.PI*2/c,percent:j/(c/100)})}return f>1&&h.push({data:[[1,d]],color:g,label:e.series.pie.combine.label,angle:d*Math.PI*2/c,percent:d/(c/100)}),h}function h(b,f){function g(){y.clearRect(0,0,k,l),t.children().filter(".pieLabel, .pieLabelBackground").remove()}function h(){var a=e.series.pie.shadow.left,b=e.series.pie.shadow.top,c=10,d=e.series.pie.shadow.alpha,f=e.series.pie.radius>1?e.series.pie.radius:u*e.series.pie.radius;if(!(f>=k/2-a||f*e.series.pie.tilt>=l/2-b||f<=c)){y.save(),y.translate(a,b),y.globalAlpha=d,y.fillStyle="#000",y.translate(v,w),y.scale(1,e.series.pie.tilt);for(var g=1;g<=c;g++)y.beginPath(),y.arc(0,0,f,0,2*Math.PI,!1),y.fill(),f-=g;y.restore()}}function j(){function b(a,b,c){a<=0||isNaN(a)||(c?y.fillStyle=b:(y.strokeStyle=b,y.lineJoin="round"),y.beginPath(),Math.abs(a-2*Math.PI)>1e-9&&y.moveTo(0,0),y.arc(0,0,f,g,g+a/2,!1),y.arc(0,0,f,g+a/2,g+a,!1),y.closePath(),g+=a,c?y.fill():y.stroke())}function c(){function b(b,c,d){if(0==b.data[0][1])return!0;var g,h=e.legend.labelFormatter,i=e.series.pie.label.formatter;g=h?h(b.label,b):b.label,i&&(g=i(g,b));var j=(c+b.angle+c)/2,m=v+Math.round(Math.cos(j)*f),n=w+Math.round(Math.sin(j)*f)*e.series.pie.tilt,o="<span class='pieLabel' id='pieLabel"+d+"' style='position:absolute;top:"+n+"px;left:"+m+"px;'>"+g+"</span>";t.append(o);var p=t.children("#pieLabel"+d),q=n-p.height()/2,r=m-p.width()/2;if(p.css("top",q),p.css("left",r),0-q>0||0-r>0||l-(q+p.height())<0||k-(r+p.width())<0)return!1;if(0!=e.series.pie.label.background.opacity){var s=e.series.pie.label.background.color;null==s&&(s=b.color);var u="top:"+q+"px;left:"+r+"px;";a("<div class='pieLabelBackground' style='position:absolute;width:"+p.width()+"px;height:"+p.height()+"px;"+u+"background-color:"+s+";'></div>").css("opacity",e.series.pie.label.background.opacity).insertBefore(p)}return!0}for(var c=d,f=e.series.pie.label.radius>1?e.series.pie.label.radius:u*e.series.pie.label.radius,g=0;g<n.length;++g){if(n[g].percent>=100*e.series.pie.label.threshold&&!b(n[g],c,g))return!1;c+=n[g].angle}return!0}var d=Math.PI*e.series.pie.startAngle,f=e.series.pie.radius>1?e.series.pie.radius:u*e.series.pie.radius;y.save(),y.translate(v,w),y.scale(1,e.series.pie.tilt),y.save();for(var g=d,h=0;h<n.length;++h)n[h].startAngle=g,b(n[h].angle,n[h].color,!0);if(y.restore(),e.series.pie.stroke.width>0){y.save(),y.lineWidth=e.series.pie.stroke.width,g=d;for(var h=0;h<n.length;++h)b(n[h].angle,e.series.pie.stroke.color,!1);y.restore()}return i(y),y.restore(),!e.series.pie.label.show||c()}if(t){var k=b.getPlaceholder().width(),l=b.getPlaceholder().height(),m=t.children().filter(".legend").children().width()||0;y=f,x=!1,u=Math.min(k,l/e.series.pie.tilt)/2,w=l/2+e.series.pie.offset.top,v=k/2,"auto"==e.series.pie.offset.left?e.legend.position.match("w")?v+=m/2:v-=m/2:v+=e.series.pie.offset.left,v<u?v=u:v>k-u&&(v=k-u);var n=b.getData(),o=0;do o>0&&(u*=d),o+=1,g(),e.series.pie.tilt<=.8&&h();while(!j()&&o<c);o>=c&&(g(),t.prepend("<div class='error'>Could not draw pie with labels contained inside canvas</div>")),b.setSeries&&b.insertLegend&&(b.setSeries(n),b.insertLegend())}}function i(a){if(e.series.pie.innerRadius>0){a.save();var b=e.series.pie.innerRadius>1?e.series.pie.innerRadius:u*e.series.pie.innerRadius;a.globalCompositeOperation="destination-out",a.beginPath(),a.fillStyle=e.series.pie.stroke.color,a.arc(0,0,b,0,2*Math.PI,!1),a.fill(),a.closePath(),a.restore(),a.save(),a.beginPath(),a.strokeStyle=e.series.pie.stroke.color,a.arc(0,0,b,0,2*Math.PI,!1),a.stroke(),a.closePath(),a.restore()}}function j(a,b){for(var c=!1,d=-1,e=a.length,f=e-1;++d<e;f=d)(a[d][1]<=b[1]&&b[1]<a[f][1]||a[f][1]<=b[1]&&b[1]<a[d][1])&&b[0]<(a[f][0]-a[d][0])*(b[1]-a[d][1])/(a[f][1]-a[d][1])+a[d][0]&&(c=!c);return c}function k(a,c){for(var d,e,f=b.getData(),g=b.getOptions(),h=g.series.pie.radius>1?g.series.pie.radius:u*g.series.pie.radius,i=0;i<f.length;++i){var k=f[i];if(k.pie.show){if(y.save(),y.beginPath(),y.moveTo(0,0),y.arc(0,0,h,k.startAngle,k.startAngle+k.angle/2,!1),y.arc(0,0,h,k.startAngle+k.angle/2,k.startAngle+k.angle,!1),y.closePath(),d=a-v,e=c-w,y.isPointInPath){if(y.isPointInPath(a-v,c-w))return y.restore(),{datapoint:[k.percent,k.data],dataIndex:0,series:k,seriesIndex:i}}else{var l=h*Math.cos(k.startAngle),m=h*Math.sin(k.startAngle),n=h*Math.cos(k.startAngle+k.angle/4),o=h*Math.sin(k.startAngle+k.angle/4),p=h*Math.cos(k.startAngle+k.angle/2),q=h*Math.sin(k.startAngle+k.angle/2),r=h*Math.cos(k.startAngle+k.angle/1.5),s=h*Math.sin(k.startAngle+k.angle/1.5),t=h*Math.cos(k.startAngle+k.angle),x=h*Math.sin(k.startAngle+k.angle),z=[[0,0],[l,m],[n,o],[p,q],[r,s],[t,x]],A=[d,e];if(j(z,A))return y.restore(),{datapoint:[k.percent,k.data],dataIndex:0,series:k,seriesIndex:i}}y.restore()}}return null}function l(a){n("plothover",a)}function m(a){n("plotclick",a)}function n(a,c){var d=b.offset(),f=parseInt(c.pageX-d.left),g=parseInt(c.pageY-d.top),h=k(f,g);if(e.grid.autoHighlight)for(var i=0;i<z.length;++i){var j=z[i];j.auto!=a||h&&j.series==h.series||p(j.series)}h&&o(h.series,a);var l={pageX:c.pageX,pageY:c.pageY};t.trigger(a,[l,h])}function o(a,c){var d=q(a);d==-1?(z.push({series:a,auto:c}),b.triggerRedrawOverlay()):c||(z[d].auto=!1)}function p(a){null==a&&(z=[],b.triggerRedrawOverlay());var c=q(a);c!=-1&&(z.splice(c,1),b.triggerRedrawOverlay())}function q(a){for(var b=0;b<z.length;++b){var c=z[b];if(c.series==a)return b}return-1}function r(a,b){function c(a){a.angle<=0||isNaN(a.angle)||(b.fillStyle="rgba(255, 255, 255, "+d.series.pie.highlight.opacity+")",b.beginPath(),Math.abs(a.angle-2*Math.PI)>1e-9&&b.moveTo(0,0),b.arc(0,0,e,a.startAngle,a.startAngle+a.angle/2,!1),b.arc(0,0,e,a.startAngle+a.angle/2,a.startAngle+a.angle,!1),b.closePath(),b.fill())}var d=a.getOptions(),e=d.series.pie.radius>1?d.series.pie.radius:u*d.series.pie.radius;b.save(),b.translate(v,w),b.scale(1,d.series.pie.tilt);for(var f=0;f<z.length;++f)c(z[f].series);i(b),b.restore()}var s=null,t=null,u=null,v=null,w=null,x=!1,y=null,z=[];b.hooks.processOptions.push(function(a,b){b.series.pie.show&&(b.grid.show=!1,"auto"==b.series.pie.label.show&&(b.legend.show?b.series.pie.label.show=!1:b.series.pie.label.show=!0),"auto"==b.series.pie.radius&&(b.series.pie.label.show?b.series.pie.radius=.75:b.series.pie.radius=1),b.series.pie.tilt>1?b.series.pie.tilt=1:b.series.pie.tilt<0&&(b.series.pie.tilt=0))}),b.hooks.bindEvents.push(function(a,b){var c=a.getOptions();c.series.pie.show&&(c.grid.hoverable&&b.unbind("mousemove").mousemove(l),c.grid.clickable&&b.unbind("click").click(m))}),b.hooks.processDatapoints.push(function(a,b,c,d){var e=a.getOptions();e.series.pie.show&&f(a,b,c,d)}),b.hooks.drawOverlay.push(function(a,b){var c=a.getOptions();c.series.pie.show&&r(a,b)}),b.hooks.draw.push(function(a,b){var c=a.getOptions();c.series.pie.show&&h(a,b)})}var c=10,d=.95,e={series:{pie:{show:!1,radius:"auto",innerRadius:0,startAngle:1.5,tilt:1,shadow:{left:5,top:15,alpha:.02},offset:{top:0,left:"auto"},stroke:{color:"#fff",width:1},label:{show:"auto",formatter:function(a,b){return"<div style='font-size:x-small;text-align:center;padding:2px;color:"+b.color+";'>"+a+"<br/>"+Math.round(b.percent)+"%</div>"},radius:1,background:{color:null,opacity:0},threshold:0},combine:{threshold:-1,color:null,label:"Other"},highlight:{opacity:.5}}}};a.plot.plugins.push({init:b,options:e,name:"pie",version:"1.1"})}(jQuery);
\ No newline at end of file
diff --git a/assets/js/jquery-flot/jquery.flot.resize.min.js b/assets/js/jquery-flot/jquery.flot.resize.min.js
index f9dd34a4e7d..23e69313c79 100644
--- a/assets/js/jquery-flot/jquery.flot.resize.min.js
+++ b/assets/js/jquery-flot/jquery.flot.resize.min.js
@@ -1 +1 @@
-!function(a,b,c){function d(){e=b[h](function(){f.each(function(){var b=a(this),c=b.width(),d=b.height(),e=a.data(this,j);(c!==e.w||d!==e.h)&&b.trigger(i,[e.w=c,e.h=d])}),d()},g[k])}var e,f=a([]),g=a.resize=a.extend(a.resize,{}),h="setTimeout",i="resize",j=i+"-special-event",k="delay",l="throttleWindow";g[k]=250,g[l]=!0,a.event.special[i]={setup:function(){if(!g[l]&&this[h])return!1;var b=a(this);f=f.add(b),a.data(this,j,{w:b.width(),h:b.height()}),1===f.length&&d()},teardown:function(){if(!g[l]&&this[h])return!1;var b=a(this);f=f.not(b),b.removeData(j),f.length||clearTimeout(e)},add:function(b){function d(b,d,f){var g=a(this),h=a.data(this,j);h.w=d!==c?d:g.width(),h.h=f!==c?f:g.height(),e.apply(this,arguments)}if(!g[l]&&this[h])return!1;var e;return a.isFunction(b)?(e=b,d):(e=b.handler,void(b.handler=d))}}}(jQuery,this),function(a){function b(a){function b(){var b=a.getPlaceholder();0!=b.width()&&0!=b.height()&&(a.resize(),a.setupGrid(),a.draw())}function c(a,c){a.getPlaceholder().resize(b)}function d(a,c){a.getPlaceholder().unbind("resize",b)}a.hooks.bindEvents.push(c),a.hooks.shutdown.push(d)}var c={};a.plot.plugins.push({init:b,options:c,name:"resize",version:"1.0"})}(jQuery);
\ No newline at end of file
+!function(a,b,c){function d(){e=b[h](function(){f.each(function(){var b=a(this),c=b.width(),d=b.height(),e=a.data(this,j);c===e.w&&d===e.h||b.trigger(i,[e.w=c,e.h=d])}),d()},g[k])}var e,f=a([]),g=a.resize=a.extend(a.resize,{}),h="setTimeout",i="resize",j=i+"-special-event",k="delay",l="throttleWindow";g[k]=250,g[l]=!0,a.event.special[i]={setup:function(){if(!g[l]&&this[h])return!1;var b=a(this);f=f.add(b),a.data(this,j,{w:b.width(),h:b.height()}),1===f.length&&d()},teardown:function(){if(!g[l]&&this[h])return!1;var b=a(this);f=f.not(b),b.removeData(j),f.length||clearTimeout(e)},add:function(b){function d(b,d,f){var g=a(this),h=a.data(this,j);h.w=d!==c?d:g.width(),h.h=f!==c?f:g.height(),e.apply(this,arguments)}if(!g[l]&&this[h])return!1;var e;return a.isFunction(b)?(e=b,d):(e=b.handler,void(b.handler=d))}}}(jQuery,this),function(a){function b(a){function b(){var b=a.getPlaceholder();0!=b.width()&&0!=b.height()&&(a.resize(),a.setupGrid(),a.draw())}function c(a,c){a.getPlaceholder().resize(b)}function d(a,c){a.getPlaceholder().unbind("resize",b)}a.hooks.bindEvents.push(c),a.hooks.shutdown.push(d)}var c={};a.plot.plugins.push({init:b,options:c,name:"resize",version:"1.0"})}(jQuery);
\ No newline at end of file
diff --git a/assets/js/jquery-flot/jquery.flot.stack.min.js b/assets/js/jquery-flot/jquery.flot.stack.min.js
index e8be501186d..2d8da5be1ae 100644
--- a/assets/js/jquery-flot/jquery.flot.stack.min.js
+++ b/assets/js/jquery-flot/jquery.flot.stack.min.js
@@ -1 +1 @@
-!function(a){function b(a){function b(a,b){for(var c=null,d=0;d<b.length&&a!=b[d];++d)b[d].stack==a.stack&&(c=b[d]);return c}function c(a,c,d){if(null!=c.stack&&c.stack!==!1){var e=b(c,a.getData());if(e){for(var f,g,h,i,j,k,l,m,n=d.pointsize,o=d.points,p=e.datapoints.pointsize,q=e.datapoints.points,r=[],s=c.lines.show,t=c.bars.horizontal,u=n>2&&(t?d.format[2].x:d.format[2].y),v=s&&c.lines.steps,w=!0,x=t?1:0,y=t?0:1,z=0,A=0;;){if(z>=o.length)break;if(l=r.length,null==o[z]){for(m=0;n>m;++m)r.push(o[z+m]);z+=n}else if(A>=q.length){if(!s)for(m=0;n>m;++m)r.push(o[z+m]);z+=n}else if(null==q[A]){for(m=0;n>m;++m)r.push(null);w=!0,A+=p}else{if(f=o[z+x],g=o[z+y],i=q[A+x],j=q[A+y],k=0,f==i){for(m=0;n>m;++m)r.push(o[z+m]);r[l+y]+=j,k=j,z+=n,A+=p}else if(f>i){if(s&&z>0&&null!=o[z-n]){for(h=g+(o[z-n+y]-g)*(i-f)/(o[z-n+x]-f),r.push(i),r.push(h+j),m=2;n>m;++m)r.push(o[z+m]);k=j}A+=p}else{if(w&&s){z+=n;continue}for(m=0;n>m;++m)r.push(o[z+m]);s&&A>0&&null!=q[A-p]&&(k=j+(q[A-p+y]-j)*(f-i)/(q[A-p+x]-i)),r[l+y]+=k,z+=n}w=!1,l!=r.length&&u&&(r[l+2]+=k)}if(v&&l!=r.length&&l>0&&null!=r[l]&&r[l]!=r[l-n]&&r[l+1]!=r[l-n+1]){for(m=0;n>m;++m)r[l+n+m]=r[l+m];r[l+1]=r[l-n+1]}}d.points=r}}}a.hooks.processDatapoints.push(c)}var c={series:{stack:null}};a.plot.plugins.push({init:b,options:c,name:"stack",version:"1.2"})}(jQuery);
\ No newline at end of file
+!function(a){function b(a){function b(a,b){for(var c=null,d=0;d<b.length&&a!=b[d];++d)b[d].stack==a.stack&&(c=b[d]);return c}function c(a,c,d){if(null!=c.stack&&c.stack!==!1){var e=b(c,a.getData());if(e){for(var f,g,h,i,j,k,l,m,n=d.pointsize,o=d.points,p=e.datapoints.pointsize,q=e.datapoints.points,r=[],s=c.lines.show,t=c.bars.horizontal,u=n>2&&(t?d.format[2].x:d.format[2].y),v=s&&c.lines.steps,w=!0,x=t?1:0,y=t?0:1,z=0,A=0;;){if(z>=o.length)break;if(l=r.length,null==o[z]){for(m=0;m<n;++m)r.push(o[z+m]);z+=n}else if(A>=q.length){if(!s)for(m=0;m<n;++m)r.push(o[z+m]);z+=n}else if(null==q[A]){for(m=0;m<n;++m)r.push(null);w=!0,A+=p}else{if(f=o[z+x],g=o[z+y],i=q[A+x],j=q[A+y],k=0,f==i){for(m=0;m<n;++m)r.push(o[z+m]);r[l+y]+=j,k=j,z+=n,A+=p}else if(f>i){if(s&&z>0&&null!=o[z-n]){for(h=g+(o[z-n+y]-g)*(i-f)/(o[z-n+x]-f),r.push(i),r.push(h+j),m=2;m<n;++m)r.push(o[z+m]);k=j}A+=p}else{if(w&&s){z+=n;continue}for(m=0;m<n;++m)r.push(o[z+m]);s&&A>0&&null!=q[A-p]&&(k=j+(q[A-p+y]-j)*(f-i)/(q[A-p+x]-i)),r[l+y]+=k,z+=n}w=!1,l!=r.length&&u&&(r[l+2]+=k)}if(v&&l!=r.length&&l>0&&null!=r[l]&&r[l]!=r[l-n]&&r[l+1]!=r[l-n+1]){for(m=0;m<n;++m)r[l+n+m]=r[l+m];r[l+1]=r[l-n+1]}}d.points=r}}}a.hooks.processDatapoints.push(c)}var c={series:{stack:null}};a.plot.plugins.push({init:b,options:c,name:"stack",version:"1.2"})}(jQuery);
\ No newline at end of file
diff --git a/assets/js/jquery-flot/jquery.flot.time.min.js b/assets/js/jquery-flot/jquery.flot.time.min.js
index 74974219fd5..16cc8bd25a1 100644
--- a/assets/js/jquery-flot/jquery.flot.time.min.js
+++ b/assets/js/jquery-flot/jquery.flot.time.min.js
@@ -1 +1 @@
-!function(a){function b(a,b){return b*Math.floor(a/b)}function c(a,b,c,d){if("function"==typeof a.strftime)return a.strftime(b);var e=function(a,b){return a=""+a,b=""+(null==b?"0":b),1==a.length?b+a:a},f=[],g=!1,h=a.getHours(),i=12>h;null==c&&(c=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]),null==d&&(d=["Sun","Mon","Tue","Wed","Thu","Fri","Sat"]);var j;j=h>12?h-12:0==h?12:h;for(var k=0;k<b.length;++k){var l=b.charAt(k);if(g){switch(l){case"a":l=""+d[a.getDay()];break;case"b":l=""+c[a.getMonth()];break;case"d":l=e(a.getDate());break;case"e":l=e(a.getDate()," ");break;case"h":case"H":l=e(h);break;case"I":l=e(j);break;case"l":l=e(j," ");break;case"m":l=e(a.getMonth()+1);break;case"M":l=e(a.getMinutes());break;case"q":l=""+(Math.floor(a.getMonth()/3)+1);break;case"S":l=e(a.getSeconds());break;case"y":l=e(a.getFullYear()%100);break;case"Y":l=""+a.getFullYear();break;case"p":l=i?"am":"pm";break;case"P":l=i?"AM":"PM";break;case"w":l=""+a.getDay()}f.push(l),g=!1}else"%"==l?g=!0:f.push(l)}return f.join("")}function d(a){function b(a,b,c,d){a[b]=function(){return c[d].apply(c,arguments)}}var c={date:a};void 0!=a.strftime&&b(c,"strftime",a,"strftime"),b(c,"getTime",a,"getTime"),b(c,"setTime",a,"setTime");for(var d=["Date","Day","FullYear","Hours","Milliseconds","Minutes","Month","Seconds"],e=0;e<d.length;e++)b(c,"get"+d[e],a,"getUTC"+d[e]),b(c,"set"+d[e],a,"setUTC"+d[e]);return c}function e(a,b){if("browser"==b.timezone)return new Date(a);if(b.timezone&&"utc"!=b.timezone){if("undefined"!=typeof timezoneJS&&"undefined"!=typeof timezoneJS.Date){var c=new timezoneJS.Date;return c.setTimezone(b.timezone),c.setTime(a),c}return d(new Date(a))}return d(new Date(a))}function f(d){d.hooks.processOptions.push(function(d,f){a.each(d.getAxes(),function(a,d){var f=d.options;"time"==f.mode&&(d.tickGenerator=function(a){var c=[],d=e(a.min,f),g=0,i=f.tickSize&&"quarter"===f.tickSize[1]||f.minTickSize&&"quarter"===f.minTickSize[1]?k:j;null!=f.minTickSize&&(g="number"==typeof f.tickSize?f.tickSize:f.minTickSize[0]*h[f.minTickSize[1]]);for(var l=0;l<i.length-1&&!(a.delta<(i[l][0]*h[i[l][1]]+i[l+1][0]*h[i[l+1][1]])/2&&i[l][0]*h[i[l][1]]>=g);++l);var m=i[l][0],n=i[l][1];if("year"==n){if(null!=f.minTickSize&&"year"==f.minTickSize[1])m=Math.floor(f.minTickSize[0]);else{var o=Math.pow(10,Math.floor(Math.log(a.delta/h.year)/Math.LN10)),p=a.delta/h.year/o;m=1.5>p?1:3>p?2:7.5>p?5:10,m*=o}1>m&&(m=1)}a.tickSize=f.tickSize||[m,n];var q=a.tickSize[0];n=a.tickSize[1];var r=q*h[n];"second"==n?d.setSeconds(b(d.getSeconds(),q)):"minute"==n?d.setMinutes(b(d.getMinutes(),q)):"hour"==n?d.setHours(b(d.getHours(),q)):"month"==n?d.setMonth(b(d.getMonth(),q)):"quarter"==n?d.setMonth(3*b(d.getMonth()/3,q)):"year"==n&&d.setFullYear(b(d.getFullYear(),q)),d.setMilliseconds(0),r>=h.minute&&d.setSeconds(0),r>=h.hour&&d.setMinutes(0),r>=h.day&&d.setHours(0),r>=4*h.day&&d.setDate(1),r>=2*h.month&&d.setMonth(b(d.getMonth(),3)),r>=2*h.quarter&&d.setMonth(b(d.getMonth(),6)),r>=h.year&&d.setMonth(0);var s,t=0,u=Number.NaN;do if(s=u,u=d.getTime(),c.push(u),"month"==n||"quarter"==n)if(1>q){d.setDate(1);var v=d.getTime();d.setMonth(d.getMonth()+("quarter"==n?3:1));var w=d.getTime();d.setTime(u+t*h.hour+(w-v)*q),t=d.getHours(),d.setHours(0)}else d.setMonth(d.getMonth()+q*("quarter"==n?3:1));else"year"==n?d.setFullYear(d.getFullYear()+q):d.setTime(u+r);while(u<a.max&&u!=s);return c},d.tickFormatter=function(a,b){var d=e(a,b.options);if(null!=f.timeformat)return c(d,f.timeformat,f.monthNames,f.dayNames);var g,i=b.options.tickSize&&"quarter"==b.options.tickSize[1]||b.options.minTickSize&&"quarter"==b.options.minTickSize[1],j=b.tickSize[0]*h[b.tickSize[1]],k=b.max-b.min,l=f.twelveHourClock?" %p":"",m=f.twelveHourClock?"%I":"%H";g=j<h.minute?m+":%M:%S"+l:j<h.day?k<2*h.day?m+":%M"+l:"%b %d "+m+":%M"+l:j<h.month?"%b %d":i&&j<h.quarter||!i&&j<h.year?k<h.year?"%b":"%b %Y":i&&j<h.year?k<h.year?"Q%q":"Q%q %Y":"%Y";var n=c(d,g,f.monthNames,f.dayNames);return n})})})}var g={xaxis:{timezone:null,timeformat:null,twelveHourClock:!1,monthNames:null}},h={second:1e3,minute:6e4,hour:36e5,day:864e5,month:2592e6,quarter:7776e6,year:525949.2*60*1e3},i=[[1,"second"],[2,"second"],[5,"second"],[10,"second"],[30,"second"],[1,"minute"],[2,"minute"],[5,"minute"],[10,"minute"],[30,"minute"],[1,"hour"],[2,"hour"],[4,"hour"],[8,"hour"],[12,"hour"],[1,"day"],[2,"day"],[3,"day"],[.25,"month"],[.5,"month"],[1,"month"],[2,"month"]],j=i.concat([[3,"month"],[6,"month"],[1,"year"]]),k=i.concat([[1,"quarter"],[2,"quarter"],[1,"year"]]);a.plot.plugins.push({init:f,options:g,name:"time",version:"1.0"}),a.plot.formatDate=c}(jQuery);
\ No newline at end of file
+!function(a){function b(a,b){return b*Math.floor(a/b)}function c(a,b,c,d){if("function"==typeof a.strftime)return a.strftime(b);var e=function(a,b){return a=""+a,b=""+(null==b?"0":b),1==a.length?b+a:a},f=[],g=!1,h=a.getHours(),i=h<12;null==c&&(c=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]),null==d&&(d=["Sun","Mon","Tue","Wed","Thu","Fri","Sat"]);var j;j=h>12?h-12:0==h?12:h;for(var k=0;k<b.length;++k){var l=b.charAt(k);if(g){switch(l){case"a":l=""+d[a.getDay()];break;case"b":l=""+c[a.getMonth()];break;case"d":l=e(a.getDate());break;case"e":l=e(a.getDate()," ");break;case"h":case"H":l=e(h);break;case"I":l=e(j);break;case"l":l=e(j," ");break;case"m":l=e(a.getMonth()+1);break;case"M":l=e(a.getMinutes());break;case"q":l=""+(Math.floor(a.getMonth()/3)+1);break;case"S":l=e(a.getSeconds());break;case"y":l=e(a.getFullYear()%100);break;case"Y":l=""+a.getFullYear();break;case"p":l=i?"am":"pm";break;case"P":l=i?"AM":"PM";break;case"w":l=""+a.getDay()}f.push(l),g=!1}else"%"==l?g=!0:f.push(l)}return f.join("")}function d(a){function b(a,b,c,d){a[b]=function(){return c[d].apply(c,arguments)}}var c={date:a};void 0!=a.strftime&&b(c,"strftime",a,"strftime"),b(c,"getTime",a,"getTime"),b(c,"setTime",a,"setTime");for(var d=["Date","Day","FullYear","Hours","Milliseconds","Minutes","Month","Seconds"],e=0;e<d.length;e++)b(c,"get"+d[e],a,"getUTC"+d[e]),b(c,"set"+d[e],a,"setUTC"+d[e]);return c}function e(a,b){if("browser"==b.timezone)return new Date(a);if(b.timezone&&"utc"!=b.timezone){if("undefined"!=typeof timezoneJS&&"undefined"!=typeof timezoneJS.Date){var c=new timezoneJS.Date;return c.setTimezone(b.timezone),c.setTime(a),c}return d(new Date(a))}return d(new Date(a))}function f(d){d.hooks.processOptions.push(function(d,f){a.each(d.getAxes(),function(a,d){var f=d.options;"time"==f.mode&&(d.tickGenerator=function(a){var c=[],d=e(a.min,f),g=0,i=f.tickSize&&"quarter"===f.tickSize[1]||f.minTickSize&&"quarter"===f.minTickSize[1]?k:j;null!=f.minTickSize&&(g="number"==typeof f.tickSize?f.tickSize:f.minTickSize[0]*h[f.minTickSize[1]]);for(var l=0;l<i.length-1&&!(a.delta<(i[l][0]*h[i[l][1]]+i[l+1][0]*h[i[l+1][1]])/2&&i[l][0]*h[i[l][1]]>=g);++l);var m=i[l][0],n=i[l][1];if("year"==n){if(null!=f.minTickSize&&"year"==f.minTickSize[1])m=Math.floor(f.minTickSize[0]);else{var o=Math.pow(10,Math.floor(Math.log(a.delta/h.year)/Math.LN10)),p=a.delta/h.year/o;m=p<1.5?1:p<3?2:p<7.5?5:10,m*=o}m<1&&(m=1)}a.tickSize=f.tickSize||[m,n];var q=a.tickSize[0];n=a.tickSize[1];var r=q*h[n];"second"==n?d.setSeconds(b(d.getSeconds(),q)):"minute"==n?d.setMinutes(b(d.getMinutes(),q)):"hour"==n?d.setHours(b(d.getHours(),q)):"month"==n?d.setMonth(b(d.getMonth(),q)):"quarter"==n?d.setMonth(3*b(d.getMonth()/3,q)):"year"==n&&d.setFullYear(b(d.getFullYear(),q)),d.setMilliseconds(0),r>=h.minute&&d.setSeconds(0),r>=h.hour&&d.setMinutes(0),r>=h.day&&d.setHours(0),r>=4*h.day&&d.setDate(1),r>=2*h.month&&d.setMonth(b(d.getMonth(),3)),r>=2*h.quarter&&d.setMonth(b(d.getMonth(),6)),r>=h.year&&d.setMonth(0);var s,t=0,u=Number.NaN;do if(s=u,u=d.getTime(),c.push(u),"month"==n||"quarter"==n)if(q<1){d.setDate(1);var v=d.getTime();d.setMonth(d.getMonth()+("quarter"==n?3:1));var w=d.getTime();d.setTime(u+t*h.hour+(w-v)*q),t=d.getHours(),d.setHours(0)}else d.setMonth(d.getMonth()+q*("quarter"==n?3:1));else"year"==n?d.setFullYear(d.getFullYear()+q):d.setTime(u+r);while(u<a.max&&u!=s);return c},d.tickFormatter=function(a,b){var d=e(a,b.options);if(null!=f.timeformat)return c(d,f.timeformat,f.monthNames,f.dayNames);var g,i=b.options.tickSize&&"quarter"==b.options.tickSize[1]||b.options.minTickSize&&"quarter"==b.options.minTickSize[1],j=b.tickSize[0]*h[b.tickSize[1]],k=b.max-b.min,l=f.twelveHourClock?" %p":"",m=f.twelveHourClock?"%I":"%H";g=j<h.minute?m+":%M:%S"+l:j<h.day?k<2*h.day?m+":%M"+l:"%b %d "+m+":%M"+l:j<h.month?"%b %d":i&&j<h.quarter||!i&&j<h.year?k<h.year?"%b":"%b %Y":i&&j<h.year?k<h.year?"Q%q":"Q%q %Y":"%Y";var n=c(d,g,f.monthNames,f.dayNames);return n})})})}var g={xaxis:{timezone:null,timeformat:null,twelveHourClock:!1,monthNames:null}},h={second:1e3,minute:6e4,hour:36e5,day:864e5,month:2592e6,quarter:7776e6,year:525949.2*60*1e3},i=[[1,"second"],[2,"second"],[5,"second"],[10,"second"],[30,"second"],[1,"minute"],[2,"minute"],[5,"minute"],[10,"minute"],[30,"minute"],[1,"hour"],[2,"hour"],[4,"hour"],[8,"hour"],[12,"hour"],[1,"day"],[2,"day"],[3,"day"],[.25,"month"],[.5,"month"],[1,"month"],[2,"month"]],j=i.concat([[3,"month"],[6,"month"],[1,"year"]]),k=i.concat([[1,"quarter"],[2,"quarter"],[1,"year"]]);a.plot.plugins.push({init:f,options:g,name:"time",version:"1.0"}),a.plot.formatDate=c}(jQuery);
\ No newline at end of file
diff --git a/assets/js/jquery-payment/jquery.payment.js b/assets/js/jquery-payment/jquery.payment.js
index fa83325495c..1435af36c1e 100644
--- a/assets/js/jquery-payment/jquery.payment.js
+++ b/assets/js/jquery-payment/jquery.payment.js
@@ -2,10 +2,12 @@ jQuery( function( $ ) {
 
 // Generated by CoffeeScript 1.7.1
 (function() {
-  var cardFromNumber, cardFromType, cards, defaultFormat, formatBackCardNumber, formatBackExpiry, formatCardNumber, formatExpiry, formatForwardExpiry, formatForwardSlashAndSpace, hasTextSelected, luhnCheck, reFormatCVC, reFormatCardNumber, reFormatExpiry, reFormatNumeric, restrictCVC, restrictCardNumber, restrictExpiry, restrictNumeric, setCardType,
+  var cardFromNumber, cardFromType, cards, defaultFormat, formatBackCardNumber, formatBackExpiry, formatCardNumber, formatExpiry, formatForwardExpiry, formatForwardSlashAndSpace, hasTextSelected, luhnCheck, reFormatCVC, reFormatCardNumber, reFormatExpiry, reFormatNumeric, replaceFullWidthChars, restrictCVC, restrictCardNumber, restrictExpiry, restrictNumeric, safeVal, setCardType,
     __slice = [].slice,
     __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
 
+  $ = window.jQuery || window.Zepto || window.$;
+
   $.payment = {};
 
   $.payment.fn = {};
@@ -21,77 +23,84 @@ jQuery( function( $ ) {
   $.payment.cards = cards = [
     {
       type: 'visaelectron',
-      pattern: /^4(026|17500|405|508|844|91[37])/,
+      patterns: [4026, 417500, 4405, 4508, 4844, 4913, 4917],
       format: defaultFormat,
       length: [16],
       cvcLength: [3],
       luhn: true
     }, {
       type: 'maestro',
-      pattern: /^(5(018|0[23]|[68])|6(39|7))/,
+      patterns: [5018, 502, 503, 506, 56, 58, 639, 6220, 67],
       format: defaultFormat,
       length: [12, 13, 14, 15, 16, 17, 18, 19],
       cvcLength: [3],
       luhn: true
     }, {
       type: 'forbrugsforeningen',
-      pattern: /^600/,
+      patterns: [600],
       format: defaultFormat,
       length: [16],
       cvcLength: [3],
       luhn: true
     }, {
       type: 'dankort',
-      pattern: /^5019/,
+      patterns: [5019],
+      format: defaultFormat,
+      length: [16],
+      cvcLength: [3],
+      luhn: true
+    }, {
+      type: 'elo',
+      patterns: [4011, 4312, 4389, 4514, 4573, 4576, 5041, 5066, 5067, 509, 6277, 6362, 6363, 650, 6516, 6550],
       format: defaultFormat,
       length: [16],
       cvcLength: [3],
       luhn: true
     }, {
       type: 'visa',
-      pattern: /^4/,
+      patterns: [4],
       format: defaultFormat,
       length: [13, 16],
       cvcLength: [3],
       luhn: true
     }, {
       type: 'mastercard',
-      pattern: /^(5[0-5]|2[2-7])/,
+      patterns: [51, 52, 53, 54, 55, 22, 23, 24, 25, 26, 27],
       format: defaultFormat,
       length: [16],
       cvcLength: [3],
       luhn: true
     }, {
       type: 'amex',
-      pattern: /^3[47]/,
+      patterns: [34, 37],
       format: /(\d{1,4})(\d{1,6})?(\d{1,5})?/,
       length: [15],
       cvcLength: [3, 4],
       luhn: true
     }, {
       type: 'dinersclub',
-      pattern: /^3[0689]/,
+      patterns: [30, 36, 38, 39],
       format: /(\d{1,4})(\d{1,6})?(\d{1,4})?/,
       length: [14],
       cvcLength: [3],
       luhn: true
     }, {
       type: 'discover',
-      pattern: /^6([045]|22)/,
+      patterns: [60, 64, 65, 622],
       format: defaultFormat,
       length: [16],
       cvcLength: [3],
       luhn: true
     }, {
       type: 'unionpay',
-      pattern: /^(62|88)/,
+      patterns: [62, 88],
       format: defaultFormat,
       length: [16, 17, 18, 19],
       cvcLength: [3],
       luhn: false
     }, {
       type: 'jcb',
-      pattern: /^35/,
+      patterns: [35],
       format: defaultFormat,
       length: [16],
       cvcLength: [3],
@@ -100,12 +109,17 @@ jQuery( function( $ ) {
   ];
 
   cardFromNumber = function(num) {
-    var card, _i, _len;
+    var card, p, pattern, _i, _j, _len, _len1, _ref;
     num = (num + '').replace(/\D/g, '');
     for (_i = 0, _len = cards.length; _i < _len; _i++) {
       card = cards[_i];
-      if (card.pattern.test(num)) {
-        return card;
+      _ref = card.patterns;
+      for (_j = 0, _len1 = _ref.length; _j < _len1; _j++) {
+        pattern = _ref[_j];
+        p = pattern + '';
+        if (num.substr(0, p.length) === p) {
+          return card;
+        }
       }
     }
   };
@@ -152,23 +166,74 @@ jQuery( function( $ ) {
     return false;
   };
 
+  safeVal = function(value, $target) {
+    var currPair, cursor, digit, error, last, prevPair;
+    try {
+      cursor = $target.prop('selectionStart');
+    } catch (_error) {
+      error = _error;
+      cursor = null;
+    }
+    last = $target.val();
+    $target.val(value);
+    if (cursor !== null && $target.is(":focus")) {
+      if (cursor === last.length) {
+        cursor = value.length;
+      }
+      if (last !== value) {
+        prevPair = last.slice(cursor - 1, +cursor + 1 || 9e9);
+        currPair = value.slice(cursor - 1, +cursor + 1 || 9e9);
+        digit = value[cursor];
+        if (/\d/.test(digit) && prevPair === ("" + digit + " ") && currPair === (" " + digit)) {
+          cursor = cursor + 1;
+        }
+      }
+      $target.prop('selectionStart', cursor);
+      return $target.prop('selectionEnd', cursor);
+    }
+  };
+
+  replaceFullWidthChars = function(str) {
+    var chars, chr, fullWidth, halfWidth, idx, value, _i, _len;
+    if (str == null) {
+      str = '';
+    }
+    fullWidth = '\uff10\uff11\uff12\uff13\uff14\uff15\uff16\uff17\uff18\uff19';
+    halfWidth = '0123456789';
+    value = '';
+    chars = str.split('');
+    for (_i = 0, _len = chars.length; _i < _len; _i++) {
+      chr = chars[_i];
+      idx = fullWidth.indexOf(chr);
+      if (idx > -1) {
+        chr = halfWidth[idx];
+      }
+      value += chr;
+    }
+    return value;
+  };
+
   reFormatNumeric = function(e) {
+    var $target;
+    $target = $(e.currentTarget);
     return setTimeout(function() {
-      var $target, value;
-      $target = $(e.currentTarget);
+      var value;
       value = $target.val();
+      value = replaceFullWidthChars(value);
       value = value.replace(/\D/g, '');
-      return $target.val(value);
+      return safeVal(value, $target);
     });
   };
 
   reFormatCardNumber = function(e) {
+    var $target;
+    $target = $(e.currentTarget);
     return setTimeout(function() {
-      var $target, value;
-      $target = $(e.currentTarget);
+      var value;
       value = $target.val();
+      value = replaceFullWidthChars(value);
       value = $.payment.formatCardNumber(value);
-      return $target.val(value);
+      return safeVal(value, $target);
     });
   };
 
@@ -234,12 +299,14 @@ jQuery( function( $ ) {
   };
 
   reFormatExpiry = function(e) {
+    var $target;
+    $target = $(e.currentTarget);
     return setTimeout(function() {
-      var $target, value;
-      $target = $(e.currentTarget);
+      var value;
       value = $target.val();
+      value = replaceFullWidthChars(value);
       value = $.payment.formatExpiry(value);
-      return $target.val(value);
+      return safeVal(value, $target);
     });
   };
 
@@ -259,7 +326,14 @@ jQuery( function( $ ) {
     } else if (/^\d\d$/.test(val)) {
       e.preventDefault();
       return setTimeout(function() {
-        return $target.val("" + val + " / ");
+        var m1, m2;
+        m1 = parseInt(val[0], 10);
+        m2 = parseInt(val[1], 10);
+        if (m2 > 2 && m1 !== 0) {
+          return $target.val("0" + m1 + " / " + m2);
+        } else {
+          return $target.val("" + val + " / ");
+        }
       });
     }
   };
@@ -309,12 +383,14 @@ jQuery( function( $ ) {
   };
 
   reFormatCVC = function(e) {
+    var $target;
+    $target = $(e.currentTarget);
     return setTimeout(function() {
-      var $target, value;
-      $target = $(e.currentTarget);
+      var value;
       value = $target.val();
+      value = replaceFullWidthChars(value);
       value = value.replace(/\D/g, '').slice(0, 4);
-      return $target.val(value);
+      return safeVal(value, $target);
     });
   };
 
@@ -457,8 +533,7 @@ jQuery( function( $ ) {
 
   $.payment.cardExpiryVal = function(value) {
     var month, prefix, year, _ref;
-    value = value.replace(/\s/g, '');
-    _ref = value.split('/', 2), month = _ref[0], year = _ref[1];
+    _ref = value.split(/[\s\/]+/, 2), month = _ref[0], year = _ref[1];
     if ((year != null ? year.length : void 0) === 2 && /^\d+$/.test(year)) {
       prefix = (new Date).getFullYear();
       prefix = prefix.toString().slice(0, 2);
diff --git a/assets/js/jquery-payment/jquery.payment.min.js b/assets/js/jquery-payment/jquery.payment.min.js
index a467050e695..32f55a18199 100644
--- a/assets/js/jquery-payment/jquery.payment.min.js
+++ b/assets/js/jquery-payment/jquery.payment.min.js
@@ -1 +1 @@
-jQuery(function(a){(function(){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w=[].slice,x=[].indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(b in this&&this[b]===a)return b;return-1};a.payment={},a.payment.fn={},a.fn.payment=function(){var b,c;return c=arguments[0],b=2<=arguments.length?w.call(arguments,1):[],a.payment.fn[c].apply(this,b)},e=/(\d{1,4})/g,a.payment.cards=d=[{type:"visaelectron",pattern:/^4(026|17500|405|508|844|91[37])/,format:e,length:[16],cvcLength:[3],luhn:!0},{type:"maestro",pattern:/^(5(018|0[23]|[68])|6(39|7))/,format:e,length:[12,13,14,15,16,17,18,19],cvcLength:[3],luhn:!0},{type:"forbrugsforeningen",pattern:/^600/,format:e,length:[16],cvcLength:[3],luhn:!0},{type:"dankort",pattern:/^5019/,format:e,length:[16],cvcLength:[3],luhn:!0},{type:"visa",pattern:/^4/,format:e,length:[13,16],cvcLength:[3],luhn:!0},{type:"mastercard",pattern:/^(5[0-5]|2[2-7])/,format:e,length:[16],cvcLength:[3],luhn:!0},{type:"amex",pattern:/^3[47]/,format:/(\d{1,4})(\d{1,6})?(\d{1,5})?/,length:[15],cvcLength:[3,4],luhn:!0},{type:"dinersclub",pattern:/^3[0689]/,format:/(\d{1,4})(\d{1,6})?(\d{1,4})?/,length:[14],cvcLength:[3],luhn:!0},{type:"discover",pattern:/^6([045]|22)/,format:e,length:[16],cvcLength:[3],luhn:!0},{type:"unionpay",pattern:/^(62|88)/,format:e,length:[16,17,18,19],cvcLength:[3],luhn:!1},{type:"jcb",pattern:/^35/,format:e,length:[16],cvcLength:[3],luhn:!0}],b=function(a){var b,c,e;for(a=(a+"").replace(/\D/g,""),c=0,e=d.length;e>c;c++)if(b=d[c],b.pattern.test(a))return b},c=function(a){var b,c,e;for(c=0,e=d.length;e>c;c++)if(b=d[c],b.type===a)return b},m=function(a){var b,c,d,e,f,g;for(d=!0,e=0,c=(a+"").split("").reverse(),f=0,g=c.length;g>f;f++)b=c[f],b=parseInt(b,10),(d=!d)&&(b*=2),b>9&&(b-=9),e+=b;return e%10===0},l=function(a){var b;return null!=a.prop("selectionStart")&&a.prop("selectionStart")!==a.prop("selectionEnd")?!0:null!=("undefined"!=typeof document&&null!==document&&null!=(b=document.selection)?b.createRange:void 0)&&document.selection.createRange().text?!0:!1},q=function(b){return setTimeout(function(){var c,d;return c=a(b.currentTarget),d=c.val(),d=d.replace(/\D/g,""),c.val(d)})},o=function(b){return setTimeout(function(){var c,d;return c=a(b.currentTarget),d=c.val(),d=a.payment.formatCardNumber(d),c.val(d)})},h=function(c){var d,e,f,g,h,i,j;return f=String.fromCharCode(c.which),!/^\d+$/.test(f)||(d=a(c.currentTarget),j=d.val(),e=b(j+f),g=(j.replace(/\D/g,"")+f).length,i=16,e&&(i=e.length[e.length.length-1]),g>=i||null!=d.prop("selectionStart")&&d.prop("selectionStart")!==j.length)?void 0:(h=e&&"amex"===e.type?/^(\d{4}|\d{4}\s\d{6})$/:/(?:^|\s)(\d{4})$/,h.test(j)?(c.preventDefault(),setTimeout(function(){return d.val(j+" "+f)})):h.test(j+f)?(c.preventDefault(),setTimeout(function(){return d.val(j+f+" ")})):void 0)},f=function(b){var c,d;return c=a(b.currentTarget),d=c.val(),8!==b.which||null!=c.prop("selectionStart")&&c.prop("selectionStart")!==d.length?void 0:/\d\s$/.test(d)?(b.preventDefault(),setTimeout(function(){return c.val(d.replace(/\d\s$/,""))})):/\s\d?$/.test(d)?(b.preventDefault(),setTimeout(function(){return c.val(d.replace(/\d$/,""))})):void 0},p=function(b){return setTimeout(function(){var c,d;return c=a(b.currentTarget),d=c.val(),d=a.payment.formatExpiry(d),c.val(d)})},i=function(b){var c,d,e;return d=String.fromCharCode(b.which),/^\d+$/.test(d)?(c=a(b.currentTarget),e=c.val()+d,/^\d$/.test(e)&&"0"!==e&&"1"!==e?(b.preventDefault(),setTimeout(function(){return c.val("0"+e+" / ")})):/^\d\d$/.test(e)?(b.preventDefault(),setTimeout(function(){return c.val(""+e+" / ")})):void 0):void 0},j=function(b){var c,d,e;return d=String.fromCharCode(b.which),/^\d+$/.test(d)?(c=a(b.currentTarget),e=c.val(),/^\d\d$/.test(e)?c.val(""+e+" / "):void 0):void 0},k=function(b){var c,d,e;return e=String.fromCharCode(b.which),"/"===e||" "===e?(c=a(b.currentTarget),d=c.val(),/^\d$/.test(d)&&"0"!==d?c.val("0"+d+" / "):void 0):void 0},g=function(b){var c,d;return c=a(b.currentTarget),d=c.val(),8!==b.which||null!=c.prop("selectionStart")&&c.prop("selectionStart")!==d.length?void 0:/\d\s\/\s$/.test(d)?(b.preventDefault(),setTimeout(function(){return c.val(d.replace(/\d\s\/\s$/,""))})):void 0},n=function(b){return setTimeout(function(){var c,d;return c=a(b.currentTarget),d=c.val(),d=d.replace(/\D/g,"").slice(0,4),c.val(d)})},u=function(a){var b;return a.metaKey||a.ctrlKey?!0:32===a.which?!1:0===a.which?!0:a.which<33?!0:(b=String.fromCharCode(a.which),!!/[\d\s]/.test(b))},s=function(c){var d,e,f,g;return d=a(c.currentTarget),f=String.fromCharCode(c.which),/^\d+$/.test(f)&&!l(d)?(g=(d.val()+f).replace(/\D/g,""),e=b(g),e?g.length<=e.length[e.length.length-1]:g.length<=16):void 0},t=function(b){var c,d,e;return c=a(b.currentTarget),d=String.fromCharCode(b.which),/^\d+$/.test(d)&&!l(c)?(e=c.val()+d,e=e.replace(/\D/g,""),e.length>6?!1:void 0):void 0},r=function(b){var c,d,e;return c=a(b.currentTarget),d=String.fromCharCode(b.which),/^\d+$/.test(d)&&!l(c)?(e=c.val()+d,e.length<=4):void 0},v=function(b){var c,e,f,g,h;return c=a(b.currentTarget),h=c.val(),g=a.payment.cardType(h)||"unknown",c.hasClass(g)?void 0:(e=function(){var a,b,c;for(c=[],a=0,b=d.length;b>a;a++)f=d[a],c.push(f.type);return c}(),c.removeClass("unknown"),c.removeClass(e.join(" ")),c.addClass(g),c.toggleClass("identified","unknown"!==g),c.trigger("payment.cardType",g))},a.payment.fn.formatCardCVC=function(){return this.on("keypress",u),this.on("keypress",r),this.on("paste",n),this.on("change",n),this.on("input",n),this},a.payment.fn.formatCardExpiry=function(){return this.on("keypress",u),this.on("keypress",t),this.on("keypress",i),this.on("keypress",k),this.on("keypress",j),this.on("keydown",g),this.on("change",p),this.on("input",p),this},a.payment.fn.formatCardNumber=function(){return this.on("keypress",u),this.on("keypress",s),this.on("keypress",h),this.on("keydown",f),this.on("keyup",v),this.on("paste",o),this.on("change",o),this.on("input",o),this.on("input",v),this},a.payment.fn.restrictNumeric=function(){return this.on("keypress",u),this.on("paste",q),this.on("change",q),this.on("input",q),this},a.payment.fn.cardExpiryVal=function(){return a.payment.cardExpiryVal(a(this).val())},a.payment.cardExpiryVal=function(a){var b,c,d,e;return a=a.replace(/\s/g,""),e=a.split("/",2),b=e[0],d=e[1],2===(null!=d?d.length:void 0)&&/^\d+$/.test(d)&&(c=(new Date).getFullYear(),c=c.toString().slice(0,2),d=c+d),b=parseInt(b,10),d=parseInt(d,10),{month:b,year:d}},a.payment.validateCardNumber=function(a){var c,d;return a=(a+"").replace(/\s+|-/g,""),/^\d+$/.test(a)?(c=b(a),c?(d=a.length,x.call(c.length,d)>=0&&(c.luhn===!1||m(a))):!1):!1},a.payment.validateCardExpiry=function(b,c){var d,e,f;return"object"==typeof b&&"month"in b&&(f=b,b=f.month,c=f.year),b&&c?(b=a.trim(b),c=a.trim(c),/^\d+$/.test(b)&&/^\d+$/.test(c)&&b>=1&&12>=b?(2===c.length&&(c=70>c?"20"+c:"19"+c),4!==c.length?!1:(e=new Date(c,b),d=new Date,e.setMonth(e.getMonth()-1),e.setMonth(e.getMonth()+1,1),e>d)):!1):!1},a.payment.validateCardCVC=function(b,d){var e,f;return b=a.trim(b),/^\d+$/.test(b)?(e=c(d),null!=e?(f=b.length,x.call(e.cvcLength,f)>=0):b.length>=3&&b.length<=4):!1},a.payment.cardType=function(a){var c;return a?(null!=(c=b(a))?c.type:void 0)||null:null},a.payment.formatCardNumber=function(c){var d,e,f,g;return c=c.replace(/\D/g,""),(d=b(c))?(f=d.length[d.length.length-1],c=c.slice(0,f),d.format.global?null!=(g=c.match(d.format))?g.join(" "):void 0:(e=d.format.exec(c),null!=e?(e.shift(),e=a.grep(e,function(a){return a}),e.join(" ")):void 0)):c},a.payment.formatExpiry=function(a){var b,c,d,e;return(c=a.match(/^\D*(\d{1,2})(\D+)?(\d{1,4})?/))?(b=c[1]||"",d=c[2]||"",e=c[3]||"",e.length>0?d=" / ":" /"===d?(b=b.substring(0,1),d=""):2===b.length||d.length>0?d=" / ":1===b.length&&"0"!==b&&"1"!==b&&(b="0"+b,d=" / "),b+d+e):""}}).call(this)});
\ No newline at end of file
+jQuery(function(a){(function(){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y=[].slice,z=[].indexOf||function(a){for(var b=0,c=this.length;b<c;b++)if(b in this&&this[b]===a)return b;return-1};a=window.jQuery||window.Zepto||window.$,a.payment={},a.payment.fn={},a.fn.payment=function(){var b,c;return c=arguments[0],b=2<=arguments.length?y.call(arguments,1):[],a.payment.fn[c].apply(this,b)},e=/(\d{1,4})/g,a.payment.cards=d=[{type:"visaelectron",patterns:[4026,417500,4405,4508,4844,4913,4917],format:e,length:[16],cvcLength:[3],luhn:!0},{type:"maestro",patterns:[5018,502,503,506,56,58,639,6220,67],format:e,length:[12,13,14,15,16,17,18,19],cvcLength:[3],luhn:!0},{type:"forbrugsforeningen",patterns:[600],format:e,length:[16],cvcLength:[3],luhn:!0},{type:"dankort",patterns:[5019],format:e,length:[16],cvcLength:[3],luhn:!0},{type:"elo",patterns:[4011,4312,4389,4514,4573,4576,5041,5066,5067,509,6277,6362,6363,650,6516,6550],format:e,length:[16],cvcLength:[3],luhn:!0},{type:"visa",patterns:[4],format:e,length:[13,16],cvcLength:[3],luhn:!0},{type:"mastercard",patterns:[51,52,53,54,55,22,23,24,25,26,27],format:e,length:[16],cvcLength:[3],luhn:!0},{type:"amex",patterns:[34,37],format:/(\d{1,4})(\d{1,6})?(\d{1,5})?/,length:[15],cvcLength:[3,4],luhn:!0},{type:"dinersclub",patterns:[30,36,38,39],format:/(\d{1,4})(\d{1,6})?(\d{1,4})?/,length:[14],cvcLength:[3],luhn:!0},{type:"discover",patterns:[60,64,65,622],format:e,length:[16],cvcLength:[3],luhn:!0},{type:"unionpay",patterns:[62,88],format:e,length:[16,17,18,19],cvcLength:[3],luhn:!1},{type:"jcb",patterns:[35],format:e,length:[16],cvcLength:[3],luhn:!0}],b=function(a){var b,c,e,f,g,h,i,j;for(a=(a+"").replace(/\D/g,""),f=0,h=d.length;f<h;f++)for(b=d[f],j=b.patterns,g=0,i=j.length;g<i;g++)if(e=j[g],c=e+"",a.substr(0,c.length)===c)return b},c=function(a){var b,c,e;for(c=0,e=d.length;c<e;c++)if(b=d[c],b.type===a)return b},m=function(a){var b,c,d,e,f,g;for(d=!0,e=0,c=(a+"").split("").reverse(),f=0,g=c.length;f<g;f++)b=c[f],b=parseInt(b,10),(d=!d)&&(b*=2),b>9&&(b-=9),e+=b;return e%10===0},l=function(a){var b;return null!=a.prop("selectionStart")&&a.prop("selectionStart")!==a.prop("selectionEnd")||!(null==("undefined"!=typeof document&&null!==document&&null!=(b=document.selection)?b.createRange:void 0)||!document.selection.createRange().text)},w=function(a,b){var c,d,e,f,g,h;try{d=b.prop("selectionStart")}catch(a){f=a,d=null}if(g=b.val(),b.val(a),null!==d&&b.is(":focus"))return d===g.length&&(d=a.length),g!==a&&(h=g.slice(d-1,+d+1||9e9),c=a.slice(d-1,+d+1||9e9),e=a[d],/\d/.test(e)&&h===""+e+" "&&c===" "+e&&(d+=1)),b.prop("selectionStart",d),b.prop("selectionEnd",d)},r=function(a){var b,c,d,e,f,g,h,i;for(null==a&&(a=""),d="０１２３４５６７８９",e="0123456789",g="",b=a.split(""),h=0,i=b.length;h<i;h++)c=b[h],f=d.indexOf(c),f>-1&&(c=e[f]),g+=c;return g},q=function(b){var c;return c=a(b.currentTarget),setTimeout(function(){var a;return a=c.val(),a=r(a),a=a.replace(/\D/g,""),w(a,c)})},o=function(b){var c;return c=a(b.currentTarget),setTimeout(function(){var b;return b=c.val(),b=r(b),b=a.payment.formatCardNumber(b),w(b,c)})},h=function(c){var d,e,f,g,h,i,j;if(f=String.fromCharCode(c.which),/^\d+$/.test(f)&&(d=a(c.currentTarget),j=d.val(),e=b(j+f),g=(j.replace(/\D/g,"")+f).length,i=16,e&&(i=e.length[e.length.length-1]),!(g>=i||null!=d.prop("selectionStart")&&d.prop("selectionStart")!==j.length)))return h=e&&"amex"===e.type?/^(\d{4}|\d{4}\s\d{6})$/:/(?:^|\s)(\d{4})$/,h.test(j)?(c.preventDefault(),setTimeout(function(){return d.val(j+" "+f)})):h.test(j+f)?(c.preventDefault(),setTimeout(function(){return d.val(j+f+" ")})):void 0},f=function(b){var c,d;if(c=a(b.currentTarget),d=c.val(),8===b.which&&(null==c.prop("selectionStart")||c.prop("selectionStart")===d.length))return/\d\s$/.test(d)?(b.preventDefault(),setTimeout(function(){return c.val(d.replace(/\d\s$/,""))})):/\s\d?$/.test(d)?(b.preventDefault(),setTimeout(function(){return c.val(d.replace(/\d$/,""))})):void 0},p=function(b){var c;return c=a(b.currentTarget),setTimeout(function(){var b;return b=c.val(),b=r(b),b=a.payment.formatExpiry(b),w(b,c)})},i=function(b){var c,d,e;if(d=String.fromCharCode(b.which),/^\d+$/.test(d))return c=a(b.currentTarget),e=c.val()+d,/^\d$/.test(e)&&"0"!==e&&"1"!==e?(b.preventDefault(),setTimeout(function(){return c.val("0"+e+" / ")})):/^\d\d$/.test(e)?(b.preventDefault(),setTimeout(function(){var a,b;return a=parseInt(e[0],10),b=parseInt(e[1],10),b>2&&0!==a?c.val("0"+a+" / "+b):c.val(""+e+" / ")})):void 0},j=function(b){var c,d,e;if(d=String.fromCharCode(b.which),/^\d+$/.test(d))return c=a(b.currentTarget),e=c.val(),/^\d\d$/.test(e)?c.val(""+e+" / "):void 0},k=function(b){var c,d,e;if(e=String.fromCharCode(b.which),"/"===e||" "===e)return c=a(b.currentTarget),d=c.val(),/^\d$/.test(d)&&"0"!==d?c.val("0"+d+" / "):void 0},g=function(b){var c,d;if(c=a(b.currentTarget),d=c.val(),8===b.which&&(null==c.prop("selectionStart")||c.prop("selectionStart")===d.length))return/\d\s\/\s$/.test(d)?(b.preventDefault(),setTimeout(function(){return c.val(d.replace(/\d\s\/\s$/,""))})):void 0},n=function(b){var c;return c=a(b.currentTarget),setTimeout(function(){var a;return a=c.val(),a=r(a),a=a.replace(/\D/g,"").slice(0,4),w(a,c)})},v=function(a){var b;return!(!a.metaKey&&!a.ctrlKey)||32!==a.which&&(0===a.which||(a.which<33||(b=String.fromCharCode(a.which),!!/[\d\s]/.test(b))))},t=function(c){var d,e,f,g;if(d=a(c.currentTarget),f=String.fromCharCode(c.which),/^\d+$/.test(f)&&!l(d))return g=(d.val()+f).replace(/\D/g,""),e=b(g),e?g.length<=e.length[e.length.length-1]:g.length<=16},u=function(b){var c,d,e;if(c=a(b.currentTarget),d=String.fromCharCode(b.which),/^\d+$/.test(d)&&!l(c))return e=c.val()+d,e=e.replace(/\D/g,""),!(e.length>6)&&void 0},s=function(b){var c,d,e;if(c=a(b.currentTarget),d=String.fromCharCode(b.which),/^\d+$/.test(d)&&!l(c))return e=c.val()+d,e.length<=4},x=function(b){var c,e,f,g,h;if(c=a(b.currentTarget),h=c.val(),g=a.payment.cardType(h)||"unknown",!c.hasClass(g))return e=function(){var a,b,c;for(c=[],a=0,b=d.length;a<b;a++)f=d[a],c.push(f.type);return c}(),c.removeClass("unknown"),c.removeClass(e.join(" ")),c.addClass(g),c.toggleClass("identified","unknown"!==g),c.trigger("payment.cardType",g)},a.payment.fn.formatCardCVC=function(){return this.on("keypress",v),this.on("keypress",s),this.on("paste",n),this.on("change",n),this.on("input",n),this},a.payment.fn.formatCardExpiry=function(){return this.on("keypress",v),this.on("keypress",u),this.on("keypress",i),this.on("keypress",k),this.on("keypress",j),this.on("keydown",g),this.on("change",p),this.on("input",p),this},a.payment.fn.formatCardNumber=function(){return this.on("keypress",v),this.on("keypress",t),this.on("keypress",h),this.on("keydown",f),this.on("keyup",x),this.on("paste",o),this.on("change",o),this.on("input",o),this.on("input",x),this},a.payment.fn.restrictNumeric=function(){return this.on("keypress",v),this.on("paste",q),this.on("change",q),this.on("input",q),this},a.payment.fn.cardExpiryVal=function(){return a.payment.cardExpiryVal(a(this).val())},a.payment.cardExpiryVal=function(a){var b,c,d,e;return e=a.split(/[\s\/]+/,2),b=e[0],d=e[1],2===(null!=d?d.length:void 0)&&/^\d+$/.test(d)&&(c=(new Date).getFullYear(),c=c.toString().slice(0,2),d=c+d),b=parseInt(b,10),d=parseInt(d,10),{month:b,year:d}},a.payment.validateCardNumber=function(a){var c,d;return a=(a+"").replace(/\s+|-/g,""),!!/^\d+$/.test(a)&&(c=b(a),!!c&&(d=a.length,z.call(c.length,d)>=0&&(c.luhn===!1||m(a))))},a.payment.validateCardExpiry=function(b,c){var d,e,f;return"object"==typeof b&&"month"in b&&(f=b,b=f.month,c=f.year),!(!b||!c)&&(b=a.trim(b),c=a.trim(c),!!/^\d+$/.test(b)&&(!!/^\d+$/.test(c)&&(1<=b&&b<=12&&(2===c.length&&(c=c<70?"20"+c:"19"+c),4===c.length&&(e=new Date(c,b),d=new Date,e.setMonth(e.getMonth()-1),e.setMonth(e.getMonth()+1,1),e>d)))))},a.payment.validateCardCVC=function(b,d){var e,f;return b=a.trim(b),!!/^\d+$/.test(b)&&(e=c(d),null!=e?(f=b.length,z.call(e.cvcLength,f)>=0):b.length>=3&&b.length<=4)},a.payment.cardType=function(a){var c;return a?(null!=(c=b(a))?c.type:void 0)||null:null},a.payment.formatCardNumber=function(c){var d,e,f,g;return c=c.replace(/\D/g,""),(d=b(c))?(f=d.length[d.length.length-1],c=c.slice(0,f),d.format.global?null!=(g=c.match(d.format))?g.join(" "):void 0:(e=d.format.exec(c),null!=e?(e.shift(),e=a.grep(e,function(a){return a}),e.join(" ")):void 0)):c},a.payment.formatExpiry=function(a){var b,c,d,e;return(c=a.match(/^\D*(\d{1,2})(\D+)?(\d{1,4})?/))?(b=c[1]||"",d=c[2]||"",e=c[3]||"",e.length>0?d=" / ":" /"===d?(b=b.substring(0,1),d=""):2===b.length||d.length>0?d=" / ":1===b.length&&"0"!==b&&"1"!==b&&(b="0"+b,d=" / "),b+d+e):""}}).call(this)});
\ No newline at end of file
diff --git a/assets/js/jquery-qrcode/jquery.qrcode.min.js b/assets/js/jquery-qrcode/jquery.qrcode.min.js
index 58f2becebb3..997f42d1534 100644
--- a/assets/js/jquery-qrcode/jquery.qrcode.min.js
+++ b/assets/js/jquery-qrcode/jquery.qrcode.min.js
@@ -1 +1 @@
-function QR8bitByte(a){this.mode=QRMode.MODE_8BIT_BYTE,this.data=a}function QRCode(a,b){this.typeNumber=a,this.errorCorrectLevel=b,this.modules=null,this.moduleCount=0,this.dataCache=null,this.dataList=new Array}function QRPolynomial(a,b){if(void 0==a.length)throw new Error(a.length+"/"+b);for(var c=0;c<a.length&&0==a[c];)c++;this.num=new Array(a.length-c+b);for(var d=0;d<a.length-c;d++)this.num[d]=a[d+c]}function QRRSBlock(a,b){this.totalCount=a,this.dataCount=b}function QRBitBuffer(){this.buffer=new Array,this.length=0}QR8bitByte.prototype={getLength:function(a){return this.data.length},write:function(a){for(var b=0;b<this.data.length;b++)a.put(this.data.charCodeAt(b),8)}},QRCode.prototype={addData:function(a){var b=new QR8bitByte(a);this.dataList.push(b),this.dataCache=null},isDark:function(a,b){if(0>a||this.moduleCount<=a||0>b||this.moduleCount<=b)throw new Error(a+","+b);return this.modules[a][b]},getModuleCount:function(){return this.moduleCount},make:function(){if(this.typeNumber<1){var a=1;for(a=1;40>a;a++){for(var b=QRRSBlock.getRSBlocks(a,this.errorCorrectLevel),c=new QRBitBuffer,d=0,e=0;e<b.length;e++)d+=b[e].dataCount;for(var e=0;e<this.dataList.length;e++){var f=this.dataList[e];c.put(f.mode,4),c.put(f.getLength(),QRUtil.getLengthInBits(f.mode,a)),f.write(c)}if(c.getLengthInBits()<=8*d)break}this.typeNumber=a}this.makeImpl(!1,this.getBestMaskPattern())},makeImpl:function(a,b){this.moduleCount=4*this.typeNumber+17,this.modules=new Array(this.moduleCount);for(var c=0;c<this.moduleCount;c++){this.modules[c]=new Array(this.moduleCount);for(var d=0;d<this.moduleCount;d++)this.modules[c][d]=null}this.setupPositionProbePattern(0,0),this.setupPositionProbePattern(this.moduleCount-7,0),this.setupPositionProbePattern(0,this.moduleCount-7),this.setupPositionAdjustPattern(),this.setupTimingPattern(),this.setupTypeInfo(a,b),this.typeNumber>=7&&this.setupTypeNumber(a),null==this.dataCache&&(this.dataCache=QRCode.createData(this.typeNumber,this.errorCorrectLevel,this.dataList)),this.mapData(this.dataCache,b)},setupPositionProbePattern:function(a,b){for(var c=-1;7>=c;c++)if(!(-1>=a+c||this.moduleCount<=a+c))for(var d=-1;7>=d;d++)-1>=b+d||this.moduleCount<=b+d||(c>=0&&6>=c&&(0==d||6==d)||d>=0&&6>=d&&(0==c||6==c)||c>=2&&4>=c&&d>=2&&4>=d?this.modules[a+c][b+d]=!0:this.modules[a+c][b+d]=!1)},getBestMaskPattern:function(){for(var a=0,b=0,c=0;8>c;c++){this.makeImpl(!0,c);var d=QRUtil.getLostPoint(this);(0==c||a>d)&&(a=d,b=c)}return b},createMovieClip:function(a,b,c){var d=a.createEmptyMovieClip(b,c),e=1;this.make();for(var f=0;f<this.modules.length;f++)for(var g=f*e,h=0;h<this.modules[f].length;h++){var i=h*e,j=this.modules[f][h];j&&(d.beginFill(0,100),d.moveTo(i,g),d.lineTo(i+e,g),d.lineTo(i+e,g+e),d.lineTo(i,g+e),d.endFill())}return d},setupTimingPattern:function(){for(var a=8;a<this.moduleCount-8;a++)null==this.modules[a][6]&&(this.modules[a][6]=a%2==0);for(var b=8;b<this.moduleCount-8;b++)null==this.modules[6][b]&&(this.modules[6][b]=b%2==0)},setupPositionAdjustPattern:function(){for(var a=QRUtil.getPatternPosition(this.typeNumber),b=0;b<a.length;b++)for(var c=0;c<a.length;c++){var d=a[b],e=a[c];if(null==this.modules[d][e])for(var f=-2;2>=f;f++)for(var g=-2;2>=g;g++)-2==f||2==f||-2==g||2==g||0==f&&0==g?this.modules[d+f][e+g]=!0:this.modules[d+f][e+g]=!1}},setupTypeNumber:function(a){for(var b=QRUtil.getBCHTypeNumber(this.typeNumber),c=0;18>c;c++){var d=!a&&1==(b>>c&1);this.modules[Math.floor(c/3)][c%3+this.moduleCount-8-3]=d}for(var c=0;18>c;c++){var d=!a&&1==(b>>c&1);this.modules[c%3+this.moduleCount-8-3][Math.floor(c/3)]=d}},setupTypeInfo:function(a,b){for(var c=this.errorCorrectLevel<<3|b,d=QRUtil.getBCHTypeInfo(c),e=0;15>e;e++){var f=!a&&1==(d>>e&1);6>e?this.modules[e][8]=f:8>e?this.modules[e+1][8]=f:this.modules[this.moduleCount-15+e][8]=f}for(var e=0;15>e;e++){var f=!a&&1==(d>>e&1);8>e?this.modules[8][this.moduleCount-e-1]=f:9>e?this.modules[8][15-e-1+1]=f:this.modules[8][15-e-1]=f}this.modules[this.moduleCount-8][8]=!a},mapData:function(a,b){for(var c=-1,d=this.moduleCount-1,e=7,f=0,g=this.moduleCount-1;g>0;g-=2)for(6==g&&g--;;){for(var h=0;2>h;h++)if(null==this.modules[d][g-h]){var i=!1;f<a.length&&(i=1==(a[f]>>>e&1));var j=QRUtil.getMask(b,d,g-h);j&&(i=!i),this.modules[d][g-h]=i,e--,-1==e&&(f++,e=7)}if(d+=c,0>d||this.moduleCount<=d){d-=c,c=-c;break}}}},QRCode.PAD0=236,QRCode.PAD1=17,QRCode.createData=function(a,b,c){for(var d=QRRSBlock.getRSBlocks(a,b),e=new QRBitBuffer,f=0;f<c.length;f++){var g=c[f];e.put(g.mode,4),e.put(g.getLength(),QRUtil.getLengthInBits(g.mode,a)),g.write(e)}for(var h=0,f=0;f<d.length;f++)h+=d[f].dataCount;if(e.getLengthInBits()>8*h)throw new Error("code length overflow. ("+e.getLengthInBits()+">"+8*h+")");for(e.getLengthInBits()+4<=8*h&&e.put(0,4);e.getLengthInBits()%8!=0;)e.putBit(!1);for(;;){if(e.getLengthInBits()>=8*h)break;if(e.put(QRCode.PAD0,8),e.getLengthInBits()>=8*h)break;e.put(QRCode.PAD1,8)}return QRCode.createBytes(e,d)},QRCode.createBytes=function(a,b){for(var c=0,d=0,e=0,f=new Array(b.length),g=new Array(b.length),h=0;h<b.length;h++){var i=b[h].dataCount,j=b[h].totalCount-i;d=Math.max(d,i),e=Math.max(e,j),f[h]=new Array(i);for(var k=0;k<f[h].length;k++)f[h][k]=255&a.buffer[k+c];c+=i;var l=QRUtil.getErrorCorrectPolynomial(j),m=new QRPolynomial(f[h],l.getLength()-1),n=m.mod(l);g[h]=new Array(l.getLength()-1);for(var k=0;k<g[h].length;k++){var o=k+n.getLength()-g[h].length;g[h][k]=o>=0?n.get(o):0}}for(var p=0,k=0;k<b.length;k++)p+=b[k].totalCount;for(var q=new Array(p),r=0,k=0;d>k;k++)for(var h=0;h<b.length;h++)k<f[h].length&&(q[r++]=f[h][k]);for(var k=0;e>k;k++)for(var h=0;h<b.length;h++)k<g[h].length&&(q[r++]=g[h][k]);return q};for(var QRMode={MODE_NUMBER:1,MODE_ALPHA_NUM:2,MODE_8BIT_BYTE:4,MODE_KANJI:8},QRErrorCorrectLevel={L:1,M:0,Q:3,H:2},QRMaskPattern={PATTERN000:0,PATTERN001:1,PATTERN010:2,PATTERN011:3,PATTERN100:4,PATTERN101:5,PATTERN110:6,PATTERN111:7},QRUtil={PATTERN_POSITION_TABLE:[[],[6,18],[6,22],[6,26],[6,30],[6,34],[6,22,38],[6,24,42],[6,26,46],[6,28,50],[6,30,54],[6,32,58],[6,34,62],[6,26,46,66],[6,26,48,70],[6,26,50,74],[6,30,54,78],[6,30,56,82],[6,30,58,86],[6,34,62,90],[6,28,50,72,94],[6,26,50,74,98],[6,30,54,78,102],[6,28,54,80,106],[6,32,58,84,110],[6,30,58,86,114],[6,34,62,90,118],[6,26,50,74,98,122],[6,30,54,78,102,126],[6,26,52,78,104,130],[6,30,56,82,108,134],[6,34,60,86,112,138],[6,30,58,86,114,142],[6,34,62,90,118,146],[6,30,54,78,102,126,150],[6,24,50,76,102,128,154],[6,28,54,80,106,132,158],[6,32,58,84,110,136,162],[6,26,54,82,110,138,166],[6,30,58,86,114,142,170]],G15:1335,G18:7973,G15_MASK:21522,getBCHTypeInfo:function(a){for(var b=a<<10;QRUtil.getBCHDigit(b)-QRUtil.getBCHDigit(QRUtil.G15)>=0;)b^=QRUtil.G15<<QRUtil.getBCHDigit(b)-QRUtil.getBCHDigit(QRUtil.G15);return(a<<10|b)^QRUtil.G15_MASK},getBCHTypeNumber:function(a){for(var b=a<<12;QRUtil.getBCHDigit(b)-QRUtil.getBCHDigit(QRUtil.G18)>=0;)b^=QRUtil.G18<<QRUtil.getBCHDigit(b)-QRUtil.getBCHDigit(QRUtil.G18);return a<<12|b},getBCHDigit:function(a){for(var b=0;0!=a;)b++,a>>>=1;return b},getPatternPosition:function(a){return QRUtil.PATTERN_POSITION_TABLE[a-1]},getMask:function(a,b,c){switch(a){case QRMaskPattern.PATTERN000:return(b+c)%2==0;case QRMaskPattern.PATTERN001:return b%2==0;case QRMaskPattern.PATTERN010:return c%3==0;case QRMaskPattern.PATTERN011:return(b+c)%3==0;case QRMaskPattern.PATTERN100:return(Math.floor(b/2)+Math.floor(c/3))%2==0;case QRMaskPattern.PATTERN101:return b*c%2+b*c%3==0;case QRMaskPattern.PATTERN110:return(b*c%2+b*c%3)%2==0;case QRMaskPattern.PATTERN111:return(b*c%3+(b+c)%2)%2==0;default:throw new Error("bad maskPattern:"+a)}},getErrorCorrectPolynomial:function(a){for(var b=new QRPolynomial([1],0),c=0;a>c;c++)b=b.multiply(new QRPolynomial([1,QRMath.gexp(c)],0));return b},getLengthInBits:function(a,b){if(b>=1&&10>b)switch(a){case QRMode.MODE_NUMBER:return 10;case QRMode.MODE_ALPHA_NUM:return 9;case QRMode.MODE_8BIT_BYTE:return 8;case QRMode.MODE_KANJI:return 8;default:throw new Error("mode:"+a)}else if(27>b)switch(a){case QRMode.MODE_NUMBER:return 12;case QRMode.MODE_ALPHA_NUM:return 11;case QRMode.MODE_8BIT_BYTE:return 16;case QRMode.MODE_KANJI:return 10;default:throw new Error("mode:"+a)}else{if(!(41>b))throw new Error("type:"+b);switch(a){case QRMode.MODE_NUMBER:return 14;case QRMode.MODE_ALPHA_NUM:return 13;case QRMode.MODE_8BIT_BYTE:return 16;case QRMode.MODE_KANJI:return 12;default:throw new Error("mode:"+a)}}},getLostPoint:function(a){for(var b=a.getModuleCount(),c=0,d=0;b>d;d++)for(var e=0;b>e;e++){for(var f=0,g=a.isDark(d,e),h=-1;1>=h;h++)if(!(0>d+h||d+h>=b))for(var i=-1;1>=i;i++)0>e+i||e+i>=b||(0!=h||0!=i)&&g==a.isDark(d+h,e+i)&&f++;f>5&&(c+=3+f-5)}for(var d=0;b-1>d;d++)for(var e=0;b-1>e;e++){var j=0;a.isDark(d,e)&&j++,a.isDark(d+1,e)&&j++,a.isDark(d,e+1)&&j++,a.isDark(d+1,e+1)&&j++,(0==j||4==j)&&(c+=3)}for(var d=0;b>d;d++)for(var e=0;b-6>e;e++)a.isDark(d,e)&&!a.isDark(d,e+1)&&a.isDark(d,e+2)&&a.isDark(d,e+3)&&a.isDark(d,e+4)&&!a.isDark(d,e+5)&&a.isDark(d,e+6)&&(c+=40);for(var e=0;b>e;e++)for(var d=0;b-6>d;d++)a.isDark(d,e)&&!a.isDark(d+1,e)&&a.isDark(d+2,e)&&a.isDark(d+3,e)&&a.isDark(d+4,e)&&!a.isDark(d+5,e)&&a.isDark(d+6,e)&&(c+=40);for(var k=0,e=0;b>e;e++)for(var d=0;b>d;d++)a.isDark(d,e)&&k++;var l=Math.abs(100*k/b/b-50)/5;return c+=10*l}},QRMath={glog:function(a){if(1>a)throw new Error("glog("+a+")");return QRMath.LOG_TABLE[a]},gexp:function(a){for(;0>a;)a+=255;for(;a>=256;)a-=255;return QRMath.EXP_TABLE[a]},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)},i=0;8>i;i++)QRMath.EXP_TABLE[i]=1<<i;for(var i=8;256>i;i++)QRMath.EXP_TABLE[i]=QRMath.EXP_TABLE[i-4]^QRMath.EXP_TABLE[i-5]^QRMath.EXP_TABLE[i-6]^QRMath.EXP_TABLE[i-8];for(var i=0;255>i;i++)QRMath.LOG_TABLE[QRMath.EXP_TABLE[i]]=i;QRPolynomial.prototype={get:function(a){return this.num[a]},getLength:function(){return this.num.length},multiply:function(a){for(var b=new Array(this.getLength()+a.getLength()-1),c=0;c<this.getLength();c++)for(var d=0;d<a.getLength();d++)b[c+d]^=QRMath.gexp(QRMath.glog(this.get(c))+QRMath.glog(a.get(d)));return new QRPolynomial(b,0)},mod:function(a){if(this.getLength()-a.getLength()<0)return this;for(var b=QRMath.glog(this.get(0))-QRMath.glog(a.get(0)),c=new Array(this.getLength()),d=0;d<this.getLength();d++)c[d]=this.get(d);for(var d=0;d<a.getLength();d++)c[d]^=QRMath.gexp(QRMath.glog(a.get(d))+b);return new QRPolynomial(c,0).mod(a)}},QRRSBlock.RS_BLOCK_TABLE=[[1,26,19],[1,26,16],[1,26,13],[1,26,9],[1,44,34],[1,44,28],[1,44,22],[1,44,16],[1,70,55],[1,70,44],[2,35,17],[2,35,13],[1,100,80],[2,50,32],[2,50,24],[4,25,9],[1,134,108],[2,67,43],[2,33,15,2,34,16],[2,33,11,2,34,12],[2,86,68],[4,43,27],[4,43,19],[4,43,15],[2,98,78],[4,49,31],[2,32,14,4,33,15],[4,39,13,1,40,14],[2,121,97],[2,60,38,2,61,39],[4,40,18,2,41,19],[4,40,14,2,41,15],[2,146,116],[3,58,36,2,59,37],[4,36,16,4,37,17],[4,36,12,4,37,13],[2,86,68,2,87,69],[4,69,43,1,70,44],[6,43,19,2,44,20],[6,43,15,2,44,16],[4,101,81],[1,80,50,4,81,51],[4,50,22,4,51,23],[3,36,12,8,37,13],[2,116,92,2,117,93],[6,58,36,2,59,37],[4,46,20,6,47,21],[7,42,14,4,43,15],[4,133,107],[8,59,37,1,60,38],[8,44,20,4,45,21],[12,33,11,4,34,12],[3,145,115,1,146,116],[4,64,40,5,65,41],[11,36,16,5,37,17],[11,36,12,5,37,13],[5,109,87,1,110,88],[5,65,41,5,66,42],[5,54,24,7,55,25],[11,36,12],[5,122,98,1,123,99],[7,73,45,3,74,46],[15,43,19,2,44,20],[3,45,15,13,46,16],[1,135,107,5,136,108],[10,74,46,1,75,47],[1,50,22,15,51,23],[2,42,14,17,43,15],[5,150,120,1,151,121],[9,69,43,4,70,44],[17,50,22,1,51,23],[2,42,14,19,43,15],[3,141,113,4,142,114],[3,70,44,11,71,45],[17,47,21,4,48,22],[9,39,13,16,40,14],[3,135,107,5,136,108],[3,67,41,13,68,42],[15,54,24,5,55,25],[15,43,15,10,44,16],[4,144,116,4,145,117],[17,68,42],[17,50,22,6,51,23],[19,46,16,6,47,17],[2,139,111,7,140,112],[17,74,46],[7,54,24,16,55,25],[34,37,13],[4,151,121,5,152,122],[4,75,47,14,76,48],[11,54,24,14,55,25],[16,45,15,14,46,16],[6,147,117,4,148,118],[6,73,45,14,74,46],[11,54,24,16,55,25],[30,46,16,2,47,17],[8,132,106,4,133,107],[8,75,47,13,76,48],[7,54,24,22,55,25],[22,45,15,13,46,16],[10,142,114,2,143,115],[19,74,46,4,75,47],[28,50,22,6,51,23],[33,46,16,4,47,17],[8,152,122,4,153,123],[22,73,45,3,74,46],[8,53,23,26,54,24],[12,45,15,28,46,16],[3,147,117,10,148,118],[3,73,45,23,74,46],[4,54,24,31,55,25],[11,45,15,31,46,16],[7,146,116,7,147,117],[21,73,45,7,74,46],[1,53,23,37,54,24],[19,45,15,26,46,16],[5,145,115,10,146,116],[19,75,47,10,76,48],[15,54,24,25,55,25],[23,45,15,25,46,16],[13,145,115,3,146,116],[2,74,46,29,75,47],[42,54,24,1,55,25],[23,45,15,28,46,16],[17,145,115],[10,74,46,23,75,47],[10,54,24,35,55,25],[19,45,15,35,46,16],[17,145,115,1,146,116],[14,74,46,21,75,47],[29,54,24,19,55,25],[11,45,15,46,46,16],[13,145,115,6,146,116],[14,74,46,23,75,47],[44,54,24,7,55,25],[59,46,16,1,47,17],[12,151,121,7,152,122],[12,75,47,26,76,48],[39,54,24,14,55,25],[22,45,15,41,46,16],[6,151,121,14,152,122],[6,75,47,34,76,48],[46,54,24,10,55,25],[2,45,15,64,46,16],[17,152,122,4,153,123],[29,74,46,14,75,47],[49,54,24,10,55,25],[24,45,15,46,46,16],[4,152,122,18,153,123],[13,74,46,32,75,47],[48,54,24,14,55,25],[42,45,15,32,46,16],[20,147,117,4,148,118],[40,75,47,7,76,48],[43,54,24,22,55,25],[10,45,15,67,46,16],[19,148,118,6,149,119],[18,75,47,31,76,48],[34,54,24,34,55,25],[20,45,15,61,46,16]],QRRSBlock.getRSBlocks=function(a,b){var c=QRRSBlock.getRsBlockTable(a,b);if(void 0==c)throw new Error("bad rs block @ typeNumber:"+a+"/errorCorrectLevel:"+b);for(var d=c.length/3,e=new Array,f=0;d>f;f++)for(var g=c[3*f+0],h=c[3*f+1],i=c[3*f+2],j=0;g>j;j++)e.push(new QRRSBlock(h,i));return e},QRRSBlock.getRsBlockTable=function(a,b){switch(b){case QRErrorCorrectLevel.L:return QRRSBlock.RS_BLOCK_TABLE[4*(a-1)+0];case QRErrorCorrectLevel.M:return QRRSBlock.RS_BLOCK_TABLE[4*(a-1)+1];case QRErrorCorrectLevel.Q:return QRRSBlock.RS_BLOCK_TABLE[4*(a-1)+2];case QRErrorCorrectLevel.H:return QRRSBlock.RS_BLOCK_TABLE[4*(a-1)+3];default:return void 0}},QRBitBuffer.prototype={get:function(a){var b=Math.floor(a/8);return 1==(this.buffer[b]>>>7-a%8&1)},put:function(a,b){for(var c=0;b>c;c++)this.putBit(1==(a>>>b-c-1&1))},getLengthInBits:function(){return this.length},putBit:function(a){var b=Math.floor(this.length/8);this.buffer.length<=b&&this.buffer.push(0),a&&(this.buffer[b]|=128>>>this.length%8),this.length++}},function(a){a.fn.qrcode=function(b){"string"==typeof b&&(b={text:b}),b=a.extend({},{render:"canvas",width:256,height:256,typeNumber:-1,correctLevel:QRErrorCorrectLevel.H,background:"#ffffff",foreground:"#000000"},b);var c=function(){var a=new QRCode(b.typeNumber,b.correctLevel);a.addData(b.text),a.make();var c=document.createElement("canvas");c.width=b.width,c.height=b.height;for(var d=c.getContext("2d"),e=b.width/a.getModuleCount(),f=b.height/a.getModuleCount(),g=0;g<a.getModuleCount();g++)for(var h=0;h<a.getModuleCount();h++){d.fillStyle=a.isDark(g,h)?b.foreground:b.background;var i=Math.ceil((h+1)*e)-Math.floor(h*e),j=Math.ceil((g+1)*e)-Math.floor(g*e);d.fillRect(Math.round(h*e),Math.round(g*f),i,j)}return c},d=function(){var c=new QRCode(b.typeNumber,b.correctLevel);c.addData(b.text),c.make();for(var d=a("<table></table>").css("width",b.width+"px").css("height",b.height+"px").css("border","0px").css("border-collapse","collapse").css("background-color",b.background),e=b.width/c.getModuleCount(),f=b.height/c.getModuleCount(),g=0;g<c.getModuleCount();g++)for(var h=a("<tr></tr>").css("height",f+"px").appendTo(d),i=0;i<c.getModuleCount();i++)a("<td></td>").css("width",e+"px").css("background-color",c.isDark(g,i)?b.foreground:b.background).appendTo(h);return d};return this.each(function(){var e="canvas"==b.render?c():d();a(e).appendTo(this)})}}(jQuery);
\ No newline at end of file
+function QR8bitByte(a){this.mode=QRMode.MODE_8BIT_BYTE,this.data=a}function QRCode(a,b){this.typeNumber=a,this.errorCorrectLevel=b,this.modules=null,this.moduleCount=0,this.dataCache=null,this.dataList=new Array}function QRPolynomial(a,b){if(void 0==a.length)throw new Error(a.length+"/"+b);for(var c=0;c<a.length&&0==a[c];)c++;this.num=new Array(a.length-c+b);for(var d=0;d<a.length-c;d++)this.num[d]=a[d+c]}function QRRSBlock(a,b){this.totalCount=a,this.dataCount=b}function QRBitBuffer(){this.buffer=new Array,this.length=0}QR8bitByte.prototype={getLength:function(a){return this.data.length},write:function(a){for(var b=0;b<this.data.length;b++)a.put(this.data.charCodeAt(b),8)}},QRCode.prototype={addData:function(a){var b=new QR8bitByte(a);this.dataList.push(b),this.dataCache=null},isDark:function(a,b){if(a<0||this.moduleCount<=a||b<0||this.moduleCount<=b)throw new Error(a+","+b);return this.modules[a][b]},getModuleCount:function(){return this.moduleCount},make:function(){if(this.typeNumber<1){var a=1;for(a=1;a<40;a++){for(var b=QRRSBlock.getRSBlocks(a,this.errorCorrectLevel),c=new QRBitBuffer,d=0,e=0;e<b.length;e++)d+=b[e].dataCount;for(var e=0;e<this.dataList.length;e++){var f=this.dataList[e];c.put(f.mode,4),c.put(f.getLength(),QRUtil.getLengthInBits(f.mode,a)),f.write(c)}if(c.getLengthInBits()<=8*d)break}this.typeNumber=a}this.makeImpl(!1,this.getBestMaskPattern())},makeImpl:function(a,b){this.moduleCount=4*this.typeNumber+17,this.modules=new Array(this.moduleCount);for(var c=0;c<this.moduleCount;c++){this.modules[c]=new Array(this.moduleCount);for(var d=0;d<this.moduleCount;d++)this.modules[c][d]=null}this.setupPositionProbePattern(0,0),this.setupPositionProbePattern(this.moduleCount-7,0),this.setupPositionProbePattern(0,this.moduleCount-7),this.setupPositionAdjustPattern(),this.setupTimingPattern(),this.setupTypeInfo(a,b),this.typeNumber>=7&&this.setupTypeNumber(a),null==this.dataCache&&(this.dataCache=QRCode.createData(this.typeNumber,this.errorCorrectLevel,this.dataList)),this.mapData(this.dataCache,b)},setupPositionProbePattern:function(a,b){for(var c=-1;c<=7;c++)if(!(a+c<=-1||this.moduleCount<=a+c))for(var d=-1;d<=7;d++)b+d<=-1||this.moduleCount<=b+d||(0<=c&&c<=6&&(0==d||6==d)||0<=d&&d<=6&&(0==c||6==c)||2<=c&&c<=4&&2<=d&&d<=4?this.modules[a+c][b+d]=!0:this.modules[a+c][b+d]=!1)},getBestMaskPattern:function(){for(var a=0,b=0,c=0;c<8;c++){this.makeImpl(!0,c);var d=QRUtil.getLostPoint(this);(0==c||a>d)&&(a=d,b=c)}return b},createMovieClip:function(a,b,c){var d=a.createEmptyMovieClip(b,c),e=1;this.make();for(var f=0;f<this.modules.length;f++)for(var g=f*e,h=0;h<this.modules[f].length;h++){var i=h*e,j=this.modules[f][h];j&&(d.beginFill(0,100),d.moveTo(i,g),d.lineTo(i+e,g),d.lineTo(i+e,g+e),d.lineTo(i,g+e),d.endFill())}return d},setupTimingPattern:function(){for(var a=8;a<this.moduleCount-8;a++)null==this.modules[a][6]&&(this.modules[a][6]=a%2==0);for(var b=8;b<this.moduleCount-8;b++)null==this.modules[6][b]&&(this.modules[6][b]=b%2==0)},setupPositionAdjustPattern:function(){for(var a=QRUtil.getPatternPosition(this.typeNumber),b=0;b<a.length;b++)for(var c=0;c<a.length;c++){var d=a[b],e=a[c];if(null==this.modules[d][e])for(var f=-2;f<=2;f++)for(var g=-2;g<=2;g++)f==-2||2==f||g==-2||2==g||0==f&&0==g?this.modules[d+f][e+g]=!0:this.modules[d+f][e+g]=!1}},setupTypeNumber:function(a){for(var b=QRUtil.getBCHTypeNumber(this.typeNumber),c=0;c<18;c++){var d=!a&&1==(b>>c&1);this.modules[Math.floor(c/3)][c%3+this.moduleCount-8-3]=d}for(var c=0;c<18;c++){var d=!a&&1==(b>>c&1);this.modules[c%3+this.moduleCount-8-3][Math.floor(c/3)]=d}},setupTypeInfo:function(a,b){for(var c=this.errorCorrectLevel<<3|b,d=QRUtil.getBCHTypeInfo(c),e=0;e<15;e++){var f=!a&&1==(d>>e&1);e<6?this.modules[e][8]=f:e<8?this.modules[e+1][8]=f:this.modules[this.moduleCount-15+e][8]=f}for(var e=0;e<15;e++){var f=!a&&1==(d>>e&1);e<8?this.modules[8][this.moduleCount-e-1]=f:e<9?this.modules[8][15-e-1+1]=f:this.modules[8][15-e-1]=f}this.modules[this.moduleCount-8][8]=!a},mapData:function(a,b){for(var c=-1,d=this.moduleCount-1,e=7,f=0,g=this.moduleCount-1;g>0;g-=2)for(6==g&&g--;;){for(var h=0;h<2;h++)if(null==this.modules[d][g-h]){var i=!1;f<a.length&&(i=1==(a[f]>>>e&1));var j=QRUtil.getMask(b,d,g-h);j&&(i=!i),this.modules[d][g-h]=i,e--,e==-1&&(f++,e=7)}if(d+=c,d<0||this.moduleCount<=d){d-=c,c=-c;break}}}},QRCode.PAD0=236,QRCode.PAD1=17,QRCode.createData=function(a,b,c){for(var d=QRRSBlock.getRSBlocks(a,b),e=new QRBitBuffer,f=0;f<c.length;f++){var g=c[f];e.put(g.mode,4),e.put(g.getLength(),QRUtil.getLengthInBits(g.mode,a)),g.write(e)}for(var h=0,f=0;f<d.length;f++)h+=d[f].dataCount;if(e.getLengthInBits()>8*h)throw new Error("code length overflow. ("+e.getLengthInBits()+">"+8*h+")");for(e.getLengthInBits()+4<=8*h&&e.put(0,4);e.getLengthInBits()%8!=0;)e.putBit(!1);for(;;){if(e.getLengthInBits()>=8*h)break;if(e.put(QRCode.PAD0,8),e.getLengthInBits()>=8*h)break;e.put(QRCode.PAD1,8)}return QRCode.createBytes(e,d)},QRCode.createBytes=function(a,b){for(var c=0,d=0,e=0,f=new Array(b.length),g=new Array(b.length),h=0;h<b.length;h++){var i=b[h].dataCount,j=b[h].totalCount-i;d=Math.max(d,i),e=Math.max(e,j),f[h]=new Array(i);for(var k=0;k<f[h].length;k++)f[h][k]=255&a.buffer[k+c];c+=i;var l=QRUtil.getErrorCorrectPolynomial(j),m=new QRPolynomial(f[h],l.getLength()-1),n=m.mod(l);g[h]=new Array(l.getLength()-1);for(var k=0;k<g[h].length;k++){var o=k+n.getLength()-g[h].length;g[h][k]=o>=0?n.get(o):0}}for(var p=0,k=0;k<b.length;k++)p+=b[k].totalCount;for(var q=new Array(p),r=0,k=0;k<d;k++)for(var h=0;h<b.length;h++)k<f[h].length&&(q[r++]=f[h][k]);for(var k=0;k<e;k++)for(var h=0;h<b.length;h++)k<g[h].length&&(q[r++]=g[h][k]);return q};for(var QRMode={MODE_NUMBER:1,MODE_ALPHA_NUM:2,MODE_8BIT_BYTE:4,MODE_KANJI:8},QRErrorCorrectLevel={L:1,M:0,Q:3,H:2},QRMaskPattern={PATTERN000:0,PATTERN001:1,PATTERN010:2,PATTERN011:3,PATTERN100:4,PATTERN101:5,PATTERN110:6,PATTERN111:7},QRUtil={PATTERN_POSITION_TABLE:[[],[6,18],[6,22],[6,26],[6,30],[6,34],[6,22,38],[6,24,42],[6,26,46],[6,28,50],[6,30,54],[6,32,58],[6,34,62],[6,26,46,66],[6,26,48,70],[6,26,50,74],[6,30,54,78],[6,30,56,82],[6,30,58,86],[6,34,62,90],[6,28,50,72,94],[6,26,50,74,98],[6,30,54,78,102],[6,28,54,80,106],[6,32,58,84,110],[6,30,58,86,114],[6,34,62,90,118],[6,26,50,74,98,122],[6,30,54,78,102,126],[6,26,52,78,104,130],[6,30,56,82,108,134],[6,34,60,86,112,138],[6,30,58,86,114,142],[6,34,62,90,118,146],[6,30,54,78,102,126,150],[6,24,50,76,102,128,154],[6,28,54,80,106,132,158],[6,32,58,84,110,136,162],[6,26,54,82,110,138,166],[6,30,58,86,114,142,170]],G15:1335,G18:7973,G15_MASK:21522,getBCHTypeInfo:function(a){for(var b=a<<10;QRUtil.getBCHDigit(b)-QRUtil.getBCHDigit(QRUtil.G15)>=0;)b^=QRUtil.G15<<QRUtil.getBCHDigit(b)-QRUtil.getBCHDigit(QRUtil.G15);return(a<<10|b)^QRUtil.G15_MASK},getBCHTypeNumber:function(a){for(var b=a<<12;QRUtil.getBCHDigit(b)-QRUtil.getBCHDigit(QRUtil.G18)>=0;)b^=QRUtil.G18<<QRUtil.getBCHDigit(b)-QRUtil.getBCHDigit(QRUtil.G18);return a<<12|b},getBCHDigit:function(a){for(var b=0;0!=a;)b++,a>>>=1;return b},getPatternPosition:function(a){return QRUtil.PATTERN_POSITION_TABLE[a-1]},getMask:function(a,b,c){switch(a){case QRMaskPattern.PATTERN000:return(b+c)%2==0;case QRMaskPattern.PATTERN001:return b%2==0;case QRMaskPattern.PATTERN010:return c%3==0;case QRMaskPattern.PATTERN011:return(b+c)%3==0;case QRMaskPattern.PATTERN100:return(Math.floor(b/2)+Math.floor(c/3))%2==0;case QRMaskPattern.PATTERN101:return b*c%2+b*c%3==0;case QRMaskPattern.PATTERN110:return(b*c%2+b*c%3)%2==0;case QRMaskPattern.PATTERN111:return(b*c%3+(b+c)%2)%2==0;default:throw new Error("bad maskPattern:"+a)}},getErrorCorrectPolynomial:function(a){for(var b=new QRPolynomial([1],0),c=0;c<a;c++)b=b.multiply(new QRPolynomial([1,QRMath.gexp(c)],0));return b},getLengthInBits:function(a,b){if(1<=b&&b<10)switch(a){case QRMode.MODE_NUMBER:return 10;case QRMode.MODE_ALPHA_NUM:return 9;case QRMode.MODE_8BIT_BYTE:return 8;case QRMode.MODE_KANJI:return 8;default:throw new Error("mode:"+a)}else if(b<27)switch(a){case QRMode.MODE_NUMBER:return 12;case QRMode.MODE_ALPHA_NUM:return 11;case QRMode.MODE_8BIT_BYTE:return 16;case QRMode.MODE_KANJI:return 10;default:throw new Error("mode:"+a)}else{if(!(b<41))throw new Error("type:"+b);switch(a){case QRMode.MODE_NUMBER:return 14;case QRMode.MODE_ALPHA_NUM:return 13;case QRMode.MODE_8BIT_BYTE:return 16;case QRMode.MODE_KANJI:return 12;default:throw new Error("mode:"+a)}}},getLostPoint:function(a){for(var b=a.getModuleCount(),c=0,d=0;d<b;d++)for(var e=0;e<b;e++){for(var f=0,g=a.isDark(d,e),h=-1;h<=1;h++)if(!(d+h<0||b<=d+h))for(var i=-1;i<=1;i++)e+i<0||b<=e+i||0==h&&0==i||g==a.isDark(d+h,e+i)&&f++;f>5&&(c+=3+f-5)}for(var d=0;d<b-1;d++)for(var e=0;e<b-1;e++){var j=0;a.isDark(d,e)&&j++,a.isDark(d+1,e)&&j++,a.isDark(d,e+1)&&j++,a.isDark(d+1,e+1)&&j++,0!=j&&4!=j||(c+=3)}for(var d=0;d<b;d++)for(var e=0;e<b-6;e++)a.isDark(d,e)&&!a.isDark(d,e+1)&&a.isDark(d,e+2)&&a.isDark(d,e+3)&&a.isDark(d,e+4)&&!a.isDark(d,e+5)&&a.isDark(d,e+6)&&(c+=40);for(var e=0;e<b;e++)for(var d=0;d<b-6;d++)a.isDark(d,e)&&!a.isDark(d+1,e)&&a.isDark(d+2,e)&&a.isDark(d+3,e)&&a.isDark(d+4,e)&&!a.isDark(d+5,e)&&a.isDark(d+6,e)&&(c+=40);for(var k=0,e=0;e<b;e++)for(var d=0;d<b;d++)a.isDark(d,e)&&k++;var l=Math.abs(100*k/b/b-50)/5;return c+=10*l}},QRMath={glog:function(a){if(a<1)throw new Error("glog("+a+")");return QRMath.LOG_TABLE[a]},gexp:function(a){for(;a<0;)a+=255;for(;a>=256;)a-=255;return QRMath.EXP_TABLE[a]},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)},i=0;i<8;i++)QRMath.EXP_TABLE[i]=1<<i;for(var i=8;i<256;i++)QRMath.EXP_TABLE[i]=QRMath.EXP_TABLE[i-4]^QRMath.EXP_TABLE[i-5]^QRMath.EXP_TABLE[i-6]^QRMath.EXP_TABLE[i-8];for(var i=0;i<255;i++)QRMath.LOG_TABLE[QRMath.EXP_TABLE[i]]=i;QRPolynomial.prototype={get:function(a){return this.num[a]},getLength:function(){return this.num.length},multiply:function(a){for(var b=new Array(this.getLength()+a.getLength()-1),c=0;c<this.getLength();c++)for(var d=0;d<a.getLength();d++)b[c+d]^=QRMath.gexp(QRMath.glog(this.get(c))+QRMath.glog(a.get(d)));return new QRPolynomial(b,0)},mod:function(a){if(this.getLength()-a.getLength()<0)return this;for(var b=QRMath.glog(this.get(0))-QRMath.glog(a.get(0)),c=new Array(this.getLength()),d=0;d<this.getLength();d++)c[d]=this.get(d);for(var d=0;d<a.getLength();d++)c[d]^=QRMath.gexp(QRMath.glog(a.get(d))+b);return new QRPolynomial(c,0).mod(a)}},QRRSBlock.RS_BLOCK_TABLE=[[1,26,19],[1,26,16],[1,26,13],[1,26,9],[1,44,34],[1,44,28],[1,44,22],[1,44,16],[1,70,55],[1,70,44],[2,35,17],[2,35,13],[1,100,80],[2,50,32],[2,50,24],[4,25,9],[1,134,108],[2,67,43],[2,33,15,2,34,16],[2,33,11,2,34,12],[2,86,68],[4,43,27],[4,43,19],[4,43,15],[2,98,78],[4,49,31],[2,32,14,4,33,15],[4,39,13,1,40,14],[2,121,97],[2,60,38,2,61,39],[4,40,18,2,41,19],[4,40,14,2,41,15],[2,146,116],[3,58,36,2,59,37],[4,36,16,4,37,17],[4,36,12,4,37,13],[2,86,68,2,87,69],[4,69,43,1,70,44],[6,43,19,2,44,20],[6,43,15,2,44,16],[4,101,81],[1,80,50,4,81,51],[4,50,22,4,51,23],[3,36,12,8,37,13],[2,116,92,2,117,93],[6,58,36,2,59,37],[4,46,20,6,47,21],[7,42,14,4,43,15],[4,133,107],[8,59,37,1,60,38],[8,44,20,4,45,21],[12,33,11,4,34,12],[3,145,115,1,146,116],[4,64,40,5,65,41],[11,36,16,5,37,17],[11,36,12,5,37,13],[5,109,87,1,110,88],[5,65,41,5,66,42],[5,54,24,7,55,25],[11,36,12],[5,122,98,1,123,99],[7,73,45,3,74,46],[15,43,19,2,44,20],[3,45,15,13,46,16],[1,135,107,5,136,108],[10,74,46,1,75,47],[1,50,22,15,51,23],[2,42,14,17,43,15],[5,150,120,1,151,121],[9,69,43,4,70,44],[17,50,22,1,51,23],[2,42,14,19,43,15],[3,141,113,4,142,114],[3,70,44,11,71,45],[17,47,21,4,48,22],[9,39,13,16,40,14],[3,135,107,5,136,108],[3,67,41,13,68,42],[15,54,24,5,55,25],[15,43,15,10,44,16],[4,144,116,4,145,117],[17,68,42],[17,50,22,6,51,23],[19,46,16,6,47,17],[2,139,111,7,140,112],[17,74,46],[7,54,24,16,55,25],[34,37,13],[4,151,121,5,152,122],[4,75,47,14,76,48],[11,54,24,14,55,25],[16,45,15,14,46,16],[6,147,117,4,148,118],[6,73,45,14,74,46],[11,54,24,16,55,25],[30,46,16,2,47,17],[8,132,106,4,133,107],[8,75,47,13,76,48],[7,54,24,22,55,25],[22,45,15,13,46,16],[10,142,114,2,143,115],[19,74,46,4,75,47],[28,50,22,6,51,23],[33,46,16,4,47,17],[8,152,122,4,153,123],[22,73,45,3,74,46],[8,53,23,26,54,24],[12,45,15,28,46,16],[3,147,117,10,148,118],[3,73,45,23,74,46],[4,54,24,31,55,25],[11,45,15,31,46,16],[7,146,116,7,147,117],[21,73,45,7,74,46],[1,53,23,37,54,24],[19,45,15,26,46,16],[5,145,115,10,146,116],[19,75,47,10,76,48],[15,54,24,25,55,25],[23,45,15,25,46,16],[13,145,115,3,146,116],[2,74,46,29,75,47],[42,54,24,1,55,25],[23,45,15,28,46,16],[17,145,115],[10,74,46,23,75,47],[10,54,24,35,55,25],[19,45,15,35,46,16],[17,145,115,1,146,116],[14,74,46,21,75,47],[29,54,24,19,55,25],[11,45,15,46,46,16],[13,145,115,6,146,116],[14,74,46,23,75,47],[44,54,24,7,55,25],[59,46,16,1,47,17],[12,151,121,7,152,122],[12,75,47,26,76,48],[39,54,24,14,55,25],[22,45,15,41,46,16],[6,151,121,14,152,122],[6,75,47,34,76,48],[46,54,24,10,55,25],[2,45,15,64,46,16],[17,152,122,4,153,123],[29,74,46,14,75,47],[49,54,24,10,55,25],[24,45,15,46,46,16],[4,152,122,18,153,123],[13,74,46,32,75,47],[48,54,24,14,55,25],[42,45,15,32,46,16],[20,147,117,4,148,118],[40,75,47,7,76,48],[43,54,24,22,55,25],[10,45,15,67,46,16],[19,148,118,6,149,119],[18,75,47,31,76,48],[34,54,24,34,55,25],[20,45,15,61,46,16]],QRRSBlock.getRSBlocks=function(a,b){var c=QRRSBlock.getRsBlockTable(a,b);if(void 0==c)throw new Error("bad rs block @ typeNumber:"+a+"/errorCorrectLevel:"+b);for(var d=c.length/3,e=new Array,f=0;f<d;f++)for(var g=c[3*f+0],h=c[3*f+1],i=c[3*f+2],j=0;j<g;j++)e.push(new QRRSBlock(h,i));return e},QRRSBlock.getRsBlockTable=function(a,b){switch(b){case QRErrorCorrectLevel.L:return QRRSBlock.RS_BLOCK_TABLE[4*(a-1)+0];case QRErrorCorrectLevel.M:return QRRSBlock.RS_BLOCK_TABLE[4*(a-1)+1];case QRErrorCorrectLevel.Q:return QRRSBlock.RS_BLOCK_TABLE[4*(a-1)+2];case QRErrorCorrectLevel.H:return QRRSBlock.RS_BLOCK_TABLE[4*(a-1)+3];default:return}},QRBitBuffer.prototype={get:function(a){var b=Math.floor(a/8);return 1==(this.buffer[b]>>>7-a%8&1)},put:function(a,b){for(var c=0;c<b;c++)this.putBit(1==(a>>>b-c-1&1))},getLengthInBits:function(){return this.length},putBit:function(a){var b=Math.floor(this.length/8);this.buffer.length<=b&&this.buffer.push(0),a&&(this.buffer[b]|=128>>>this.length%8),this.length++}},function(a){a.fn.qrcode=function(b){"string"==typeof b&&(b={text:b}),b=a.extend({},{render:"canvas",width:256,height:256,typeNumber:-1,correctLevel:QRErrorCorrectLevel.H,background:"#ffffff",foreground:"#000000"},b);var c=function(){var a=new QRCode(b.typeNumber,b.correctLevel);a.addData(b.text),a.make();var c=document.createElement("canvas");c.width=b.width,c.height=b.height;for(var d=c.getContext("2d"),e=b.width/a.getModuleCount(),f=b.height/a.getModuleCount(),g=0;g<a.getModuleCount();g++)for(var h=0;h<a.getModuleCount();h++){d.fillStyle=a.isDark(g,h)?b.foreground:b.background;var i=Math.ceil((h+1)*e)-Math.floor(h*e),j=Math.ceil((g+1)*e)-Math.floor(g*e);d.fillRect(Math.round(h*e),Math.round(g*f),i,j)}return c},d=function(){var c=new QRCode(b.typeNumber,b.correctLevel);c.addData(b.text),c.make();for(var d=a("<table></table>").css("width",b.width+"px").css("height",b.height+"px").css("border","0px").css("border-collapse","collapse").css("background-color",b.background),e=b.width/c.getModuleCount(),f=b.height/c.getModuleCount(),g=0;g<c.getModuleCount();g++)for(var h=a("<tr></tr>").css("height",f+"px").appendTo(d),i=0;i<c.getModuleCount();i++)a("<td></td>").css("width",e+"px").css("background-color",c.isDark(g,i)?b.foreground:b.background).appendTo(h);return d};return this.each(function(){var e="canvas"==b.render?c():d();a(e).appendTo(this)})}}(jQuery);
\ No newline at end of file
diff --git a/assets/js/jquery-serializejson/jquery.serializejson.min.js b/assets/js/jquery-serializejson/jquery.serializejson.min.js
index 22f8eacc27a..8248d4951f4 100644
--- a/assets/js/jquery-serializejson/jquery.serializejson.min.js
+++ b/assets/js/jquery-serializejson/jquery.serializejson.min.js
@@ -7,4 +7,4 @@
   Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
   and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
 */
-!function(a){"use strict";a.fn.serializeJSON=function(b){var c,d,e,f,g,h,i;return h=a.serializeJSON,i=h.setupOpts(b),d=this.serializeArray(),h.readCheckboxUncheckedValues(d,this,i),c={},a.each(d,function(a,b){e=h.splitInputNameIntoKeysArray(b.name,i),f=e.pop(),"skip"!==f&&(g=h.parseValue(b.value,f,i),i.parseWithFunction&&"_"===f&&(g=i.parseWithFunction(g,b.name)),h.deepSet(c,e,g,i))}),c},a.serializeJSON={defaultOptions:{checkboxUncheckedValue:void 0,parseNumbers:!1,parseBooleans:!1,parseNulls:!1,parseAll:!1,parseWithFunction:null,customTypes:{},defaultTypes:{string:function(a){return String(a)},number:function(a){return Number(a)},"boolean":function(a){var b=["false","null","undefined","","0"];return-1===b.indexOf(a)},"null":function(a){var b=["false","null","undefined","","0"];return-1===b.indexOf(a)?a:null},array:function(a){return JSON.parse(a)},object:function(a){return JSON.parse(a)},auto:function(b){return a.serializeJSON.parseValue(b,null,{parseNumbers:!0,parseBooleans:!0,parseNulls:!0})}},useIntKeysAsArrayIndex:!1},setupOpts:function(b){var c,d,e,f,g,h;h=a.serializeJSON,null==b&&(b={}),e=h.defaultOptions||{},d=["checkboxUncheckedValue","parseNumbers","parseBooleans","parseNulls","parseAll","parseWithFunction","customTypes","defaultTypes","useIntKeysAsArrayIndex"];for(c in b)if(-1===d.indexOf(c))throw new Error("serializeJSON ERROR: invalid option '"+c+"'. Please use one of "+d.join(", "));return f=function(a){return b[a]!==!1&&""!==b[a]&&(b[a]||e[a])},g=f("parseAll"),{checkboxUncheckedValue:f("checkboxUncheckedValue"),parseNumbers:g||f("parseNumbers"),parseBooleans:g||f("parseBooleans"),parseNulls:g||f("parseNulls"),parseWithFunction:f("parseWithFunction"),typeFunctions:a.extend({},f("defaultTypes"),f("customTypes")),useIntKeysAsArrayIndex:f("useIntKeysAsArrayIndex")}},parseValue:function(b,c,d){var e,f;return f=a.serializeJSON,e=d.typeFunctions&&d.typeFunctions[c],e?e(b):d.parseNumbers&&f.isNumeric(b)?Number(b):!d.parseBooleans||"true"!==b&&"false"!==b?d.parseNulls&&"null"==b?null:b:"true"===b},isObject:function(a){return a===Object(a)},isUndefined:function(a){return void 0===a},isValidArrayIndex:function(a){return/^[0-9]+$/.test(String(a))},isNumeric:function(a){return a-parseFloat(a)>=0},optionKeys:function(a){if(Object.keys)return Object.keys(a);var b,c=[];for(b in a)c.push(b);return c},splitInputNameIntoKeysArray:function(b,c){var d,e,f,g,h;return h=a.serializeJSON,g=h.extractTypeFromInputName(b,c),e=g[0],f=g[1],d=e.split("["),d=a.map(d,function(a){return a.replace(/\]/g,"")}),""===d[0]&&d.shift(),d.push(f),d},extractTypeFromInputName:function(b,c){var d,e,f;if(d=b.match(/(.*):([^:]+)$/)){if(f=a.serializeJSON,e=f.optionKeys(c?c.typeFunctions:f.defaultOptions.defaultTypes),e.push("skip"),-1!==e.indexOf(d[2]))return[d[1],d[2]];throw new Error("serializeJSON ERROR: Invalid type "+d[2]+" found in input name '"+b+"', please use one of "+e.join(", "))}return[b,"_"]},deepSet:function(b,c,d,e){var f,g,h,i,j,k;if(null==e&&(e={}),k=a.serializeJSON,k.isUndefined(b))throw new Error("ArgumentError: param 'o' expected to be an object or array, found undefined");if(!c||0===c.length)throw new Error("ArgumentError: param 'keys' expected to be an array with least one element");f=c[0],1===c.length?""===f?b.push(d):b[f]=d:(g=c[1],""===f&&(i=b.length-1,j=b[i],f=k.isObject(j)&&(k.isUndefined(j[g])||c.length>2)?i:i+1),""===g?(k.isUndefined(b[f])||!a.isArray(b[f]))&&(b[f]=[]):e.useIntKeysAsArrayIndex&&k.isValidArrayIndex(g)?(k.isUndefined(b[f])||!a.isArray(b[f]))&&(b[f]=[]):(k.isUndefined(b[f])||!k.isObject(b[f]))&&(b[f]={}),h=c.slice(1),k.deepSet(b[f],h,d,e))},readCheckboxUncheckedValues:function(b,c,d){var e,f,g,h,i;null==d&&(d={}),i=a.serializeJSON,e="input[type=checkbox][name]:not(:checked):not([disabled])",f=c.find(e).add(c.filter(e)),f.each(function(c,e){g=a(e),h=g.attr("data-unchecked-value"),h?b.push({name:e.name,value:h}):i.isUndefined(d.checkboxUncheckedValue)||b.push({name:e.name,value:d.checkboxUncheckedValue})})}}}(window.jQuery||window.Zepto||window.$);
\ No newline at end of file
+!function(a){"use strict";a.fn.serializeJSON=function(b){var c,d,e,f,g,h,i;return h=a.serializeJSON,i=h.setupOpts(b),d=this.serializeArray(),h.readCheckboxUncheckedValues(d,this,i),c={},a.each(d,function(a,b){e=h.splitInputNameIntoKeysArray(b.name,i),f=e.pop(),"skip"!==f&&(g=h.parseValue(b.value,f,i),i.parseWithFunction&&"_"===f&&(g=i.parseWithFunction(g,b.name)),h.deepSet(c,e,g,i))}),c},a.serializeJSON={defaultOptions:{checkboxUncheckedValue:void 0,parseNumbers:!1,parseBooleans:!1,parseNulls:!1,parseAll:!1,parseWithFunction:null,customTypes:{},defaultTypes:{string:function(a){return String(a)},number:function(a){return Number(a)},boolean:function(a){var b=["false","null","undefined","","0"];return b.indexOf(a)===-1},null:function(a){var b=["false","null","undefined","","0"];return b.indexOf(a)===-1?a:null},array:function(a){return JSON.parse(a)},object:function(a){return JSON.parse(a)},auto:function(b){return a.serializeJSON.parseValue(b,null,{parseNumbers:!0,parseBooleans:!0,parseNulls:!0})}},useIntKeysAsArrayIndex:!1},setupOpts:function(b){var c,d,e,f,g,h;h=a.serializeJSON,null==b&&(b={}),e=h.defaultOptions||{},d=["checkboxUncheckedValue","parseNumbers","parseBooleans","parseNulls","parseAll","parseWithFunction","customTypes","defaultTypes","useIntKeysAsArrayIndex"];for(c in b)if(d.indexOf(c)===-1)throw new Error("serializeJSON ERROR: invalid option '"+c+"'. Please use one of "+d.join(", "));return f=function(a){return b[a]!==!1&&""!==b[a]&&(b[a]||e[a])},g=f("parseAll"),{checkboxUncheckedValue:f("checkboxUncheckedValue"),parseNumbers:g||f("parseNumbers"),parseBooleans:g||f("parseBooleans"),parseNulls:g||f("parseNulls"),parseWithFunction:f("parseWithFunction"),typeFunctions:a.extend({},f("defaultTypes"),f("customTypes")),useIntKeysAsArrayIndex:f("useIntKeysAsArrayIndex")}},parseValue:function(b,c,d){var e,f;return f=a.serializeJSON,e=d.typeFunctions&&d.typeFunctions[c],e?e(b):d.parseNumbers&&f.isNumeric(b)?Number(b):!d.parseBooleans||"true"!==b&&"false"!==b?d.parseNulls&&"null"==b?null:b:"true"===b},isObject:function(a){return a===Object(a)},isUndefined:function(a){return void 0===a},isValidArrayIndex:function(a){return/^[0-9]+$/.test(String(a))},isNumeric:function(a){return a-parseFloat(a)>=0},optionKeys:function(a){if(Object.keys)return Object.keys(a);var b,c=[];for(b in a)c.push(b);return c},splitInputNameIntoKeysArray:function(b,c){var d,e,f,g,h;return h=a.serializeJSON,g=h.extractTypeFromInputName(b,c),e=g[0],f=g[1],d=e.split("["),d=a.map(d,function(a){return a.replace(/\]/g,"")}),""===d[0]&&d.shift(),d.push(f),d},extractTypeFromInputName:function(b,c){var d,e,f;if(d=b.match(/(.*):([^:]+)$/)){if(f=a.serializeJSON,e=f.optionKeys(c?c.typeFunctions:f.defaultOptions.defaultTypes),e.push("skip"),e.indexOf(d[2])!==-1)return[d[1],d[2]];throw new Error("serializeJSON ERROR: Invalid type "+d[2]+" found in input name '"+b+"', please use one of "+e.join(", "))}return[b,"_"]},deepSet:function(b,c,d,e){var f,g,h,i,j,k;if(null==e&&(e={}),k=a.serializeJSON,k.isUndefined(b))throw new Error("ArgumentError: param 'o' expected to be an object or array, found undefined");if(!c||0===c.length)throw new Error("ArgumentError: param 'keys' expected to be an array with least one element");f=c[0],1===c.length?""===f?b.push(d):b[f]=d:(g=c[1],""===f&&(i=b.length-1,j=b[i],f=k.isObject(j)&&(k.isUndefined(j[g])||c.length>2)?i:i+1),""===g?!k.isUndefined(b[f])&&a.isArray(b[f])||(b[f]=[]):e.useIntKeysAsArrayIndex&&k.isValidArrayIndex(g)?!k.isUndefined(b[f])&&a.isArray(b[f])||(b[f]=[]):!k.isUndefined(b[f])&&k.isObject(b[f])||(b[f]={}),h=c.slice(1),k.deepSet(b[f],h,d,e))},readCheckboxUncheckedValues:function(b,c,d){var e,f,g,h,i;null==d&&(d={}),i=a.serializeJSON,e="input[type=checkbox][name]:not(:checked):not([disabled])",f=c.find(e).add(c.filter(e)),f.each(function(c,e){g=a(e),h=g.attr("data-unchecked-value"),h?b.push({name:e.name,value:h}):i.isUndefined(d.checkboxUncheckedValue)||b.push({name:e.name,value:d.checkboxUncheckedValue})})}}}(window.jQuery||window.Zepto||window.$);
\ No newline at end of file
diff --git a/assets/js/jquery-tiptip/jquery.tipTip.min.js b/assets/js/jquery-tiptip/jquery.tipTip.min.js
index 2100209a77e..8fd09bf9600 100644
--- a/assets/js/jquery-tiptip/jquery.tipTip.min.js
+++ b/assets/js/jquery-tiptip/jquery.tipTip.min.js
@@ -1 +1 @@
-!function(a){a.fn.tipTip=function(b){var c={activation:"hover",keepAlive:!1,maxWidth:"200px",edgeOffset:3,defaultPosition:"bottom",delay:400,fadeIn:200,fadeOut:200,attribute:"title",content:!1,enter:function(){},exit:function(){}},d=a.extend(c,b);if(a("#tiptip_holder").length<=0){var e=a('<div id="tiptip_holder" style="max-width:'+d.maxWidth+';"></div>'),f=a('<div id="tiptip_content"></div>'),g=a('<div id="tiptip_arrow"></div>');a("body").append(e.html(f).prepend(g.html('<div id="tiptip_arrow_inner"></div>')))}else var e=a("#tiptip_holder"),f=a("#tiptip_content"),g=a("#tiptip_arrow");return this.each(function(){function b(){d.enter.call(this),f.html(i),e.hide().removeAttr("class").css("margin","0"),g.removeAttr("style");var b=parseInt(h.offset().top),c=parseInt(h.offset().left),k=parseInt(h.outerWidth()),l=parseInt(h.outerHeight()),m=e.outerWidth(),n=e.outerHeight(),o=Math.round((k-m)/2),p=Math.round((l-n)/2),q=Math.round(c+o),r=Math.round(b+l+d.edgeOffset),s="",t="",u=Math.round(m-12)/2;"bottom"==d.defaultPosition?s="_bottom":"top"==d.defaultPosition?s="_top":"left"==d.defaultPosition?s="_left":"right"==d.defaultPosition&&(s="_right");var v=o+c<parseInt(a(window).scrollLeft()),w=m+c>parseInt(a(window).width());v&&0>o||"_right"==s&&!w||"_left"==s&&c<m+d.edgeOffset+5?(s="_right",t=Math.round(n-13)/2,u=-12,q=Math.round(c+k+d.edgeOffset),r=Math.round(b+p)):(w&&0>o||"_left"==s&&!v)&&(s="_left",t=Math.round(n-13)/2,u=Math.round(m),q=Math.round(c-(m+d.edgeOffset+5)),r=Math.round(b+p));var x=b+l+d.edgeOffset+n+8>parseInt(a(window).height()+a(window).scrollTop()),y=b+l-(d.edgeOffset+n+8)<0;x||"_bottom"==s&&x||"_top"==s&&!y?("_top"==s||"_bottom"==s?s="_top":s+="_top",t=n,r=Math.round(b-(n+5+d.edgeOffset))):(y|("_top"==s&&y)||"_bottom"==s&&!x)&&("_top"==s||"_bottom"==s?s="_bottom":s+="_bottom",t=-12,r=Math.round(b+l+d.edgeOffset)),"_right_top"==s||"_left_top"==s?r+=5:("_right_bottom"==s||"_left_bottom"==s)&&(r-=5),("_left_top"==s||"_left_bottom"==s)&&(q+=5),g.css({"margin-left":u+"px","margin-top":t+"px"}),e.css({"margin-left":q+"px","margin-top":r+"px"}).attr("class","tip"+s),j&&clearTimeout(j),j=setTimeout(function(){e.stop(!0,!0).fadeIn(d.fadeIn)},d.delay)}function c(){d.exit.call(this),j&&clearTimeout(j),e.fadeOut(d.fadeOut)}var h=a(this);if(d.content)var i=d.content;else var i=h.attr(d.attribute);if(""!=i){d.content||h.removeAttr(d.attribute);var j=!1;"hover"==d.activation?(h.hover(function(){b()},function(){d.keepAlive||c()}),d.keepAlive&&e.hover(function(){},function(){c()})):"focus"==d.activation?h.focus(function(){b()}).blur(function(){c()}):"click"==d.activation&&(h.click(function(){return b(),!1}).hover(function(){},function(){d.keepAlive||c()}),d.keepAlive&&e.hover(function(){},function(){c()}))}})}}(jQuery);
\ No newline at end of file
+!function(a){a.fn.tipTip=function(b){var c={activation:"hover",keepAlive:!1,maxWidth:"200px",edgeOffset:3,defaultPosition:"bottom",delay:400,fadeIn:200,fadeOut:200,attribute:"title",content:!1,enter:function(){},exit:function(){}},d=a.extend(c,b);if(a("#tiptip_holder").length<=0){var e=a('<div id="tiptip_holder" style="max-width:'+d.maxWidth+';"></div>'),f=a('<div id="tiptip_content"></div>'),g=a('<div id="tiptip_arrow"></div>');a("body").append(e.html(f).prepend(g.html('<div id="tiptip_arrow_inner"></div>')))}else var e=a("#tiptip_holder"),f=a("#tiptip_content"),g=a("#tiptip_arrow");return this.each(function(){function b(){d.enter.call(this),f.html(i),e.hide().removeAttr("class").css("margin","0"),g.removeAttr("style");var b=parseInt(h.offset().top),c=parseInt(h.offset().left),k=parseInt(h.outerWidth()),l=parseInt(h.outerHeight()),m=e.outerWidth(),n=e.outerHeight(),o=Math.round((k-m)/2),p=Math.round((l-n)/2),q=Math.round(c+o),r=Math.round(b+l+d.edgeOffset),s="",t="",u=Math.round(m-12)/2;"bottom"==d.defaultPosition?s="_bottom":"top"==d.defaultPosition?s="_top":"left"==d.defaultPosition?s="_left":"right"==d.defaultPosition&&(s="_right");var v=o+c<parseInt(a(window).scrollLeft()),w=m+c>parseInt(a(window).width());v&&o<0||"_right"==s&&!w||"_left"==s&&c<m+d.edgeOffset+5?(s="_right",t=Math.round(n-13)/2,u=-12,q=Math.round(c+k+d.edgeOffset),r=Math.round(b+p)):(w&&o<0||"_left"==s&&!v)&&(s="_left",t=Math.round(n-13)/2,u=Math.round(m),q=Math.round(c-(m+d.edgeOffset+5)),r=Math.round(b+p));var x=b+l+d.edgeOffset+n+8>parseInt(a(window).height()+a(window).scrollTop()),y=b+l-(d.edgeOffset+n+8)<0;x||"_bottom"==s&&x||"_top"==s&&!y?("_top"==s||"_bottom"==s?s="_top":s+="_top",t=n,r=Math.round(b-(n+5+d.edgeOffset))):(y|("_top"==s&&y)||"_bottom"==s&&!x)&&("_top"==s||"_bottom"==s?s="_bottom":s+="_bottom",t=-12,r=Math.round(b+l+d.edgeOffset)),"_right_top"==s||"_left_top"==s?r+=5:"_right_bottom"!=s&&"_left_bottom"!=s||(r-=5),"_left_top"!=s&&"_left_bottom"!=s||(q+=5),g.css({"margin-left":u+"px","margin-top":t+"px"}),e.css({"margin-left":q+"px","margin-top":r+"px"}).attr("class","tip"+s),j&&clearTimeout(j),j=setTimeout(function(){e.stop(!0,!0).fadeIn(d.fadeIn)},d.delay)}function c(){d.exit.call(this),j&&clearTimeout(j),e.fadeOut(d.fadeOut)}var h=a(this);if(d.content)var i=d.content;else var i=h.attr(d.attribute);if(""!=i){d.content||h.removeAttr(d.attribute);var j=!1;"hover"==d.activation?(h.hover(function(){b()},function(){d.keepAlive||c()}),d.keepAlive&&e.hover(function(){},function(){c()})):"focus"==d.activation?h.focus(function(){b()}).blur(function(){c()}):"click"==d.activation&&(h.click(function(){return b(),!1}).hover(function(){},function(){d.keepAlive||c()}),d.keepAlive&&e.hover(function(){},function(){c()}))}})}}(jQuery);
\ No newline at end of file
diff --git a/assets/js/js-cookie/js.cookie.js b/assets/js/js-cookie/js.cookie.js
new file mode 100755
index 00000000000..c6c39758317
--- /dev/null
+++ b/assets/js/js-cookie/js.cookie.js
@@ -0,0 +1,165 @@
+/*!
+ * JavaScript Cookie v2.1.4
+ * https://github.com/js-cookie/js-cookie
+ *
+ * Copyright 2006, 2015 Klaus Hartl & Fagner Brack
+ * Released under the MIT license
+ */
+;(function (factory) {
+	var registeredInModuleLoader = false;
+	if (typeof define === 'function' && define.amd) {
+		define(factory);
+		registeredInModuleLoader = true;
+	}
+	if (typeof exports === 'object') {
+		module.exports = factory();
+		registeredInModuleLoader = true;
+	}
+	if (!registeredInModuleLoader) {
+		var OldCookies = window.Cookies;
+		var api = window.Cookies = factory();
+		api.noConflict = function () {
+			window.Cookies = OldCookies;
+			return api;
+		};
+	}
+}(function () {
+	function extend () {
+		var i = 0;
+		var result = {};
+		for (; i < arguments.length; i++) {
+			var attributes = arguments[ i ];
+			for (var key in attributes) {
+				result[key] = attributes[key];
+			}
+		}
+		return result;
+	}
+
+	function init (converter) {
+		function api (key, value, attributes) {
+			var result;
+			if (typeof document === 'undefined') {
+				return;
+			}
+
+			// Write
+
+			if (arguments.length > 1) {
+				attributes = extend({
+					path: '/'
+				}, api.defaults, attributes);
+
+				if (typeof attributes.expires === 'number') {
+					var expires = new Date();
+					expires.setMilliseconds(expires.getMilliseconds() + attributes.expires * 864e+5);
+					attributes.expires = expires;
+				}
+
+				// We're using "expires" because "max-age" is not supported by IE
+				attributes.expires = attributes.expires ? attributes.expires.toUTCString() : '';
+
+				try {
+					result = JSON.stringify(value);
+					if (/^[\{\[]/.test(result)) {
+						value = result;
+					}
+				} catch (e) {}
+
+				if (!converter.write) {
+					value = encodeURIComponent(String(value))
+						.replace(/%(23|24|26|2B|3A|3C|3E|3D|2F|3F|40|5B|5D|5E|60|7B|7D|7C)/g, decodeURIComponent);
+				} else {
+					value = converter.write(value, key);
+				}
+
+				key = encodeURIComponent(String(key));
+				key = key.replace(/%(23|24|26|2B|5E|60|7C)/g, decodeURIComponent);
+				key = key.replace(/[\(\)]/g, escape);
+
+				var stringifiedAttributes = '';
+
+				for (var attributeName in attributes) {
+					if (!attributes[attributeName]) {
+						continue;
+					}
+					stringifiedAttributes += '; ' + attributeName;
+					if (attributes[attributeName] === true) {
+						continue;
+					}
+					stringifiedAttributes += '=' + attributes[attributeName];
+				}
+				return (document.cookie = key + '=' + value + stringifiedAttributes);
+			}
+
+			// Read
+
+			if (!key) {
+				result = {};
+			}
+
+			// To prevent the for loop in the first place assign an empty array
+			// in case there are no cookies at all. Also prevents odd result when
+			// calling "get()"
+			var cookies = document.cookie ? document.cookie.split('; ') : [];
+			var rdecode = /(%[0-9A-Z]{2})+/g;
+			var i = 0;
+
+			for (; i < cookies.length; i++) {
+				var parts = cookies[i].split('=');
+				var cookie = parts.slice(1).join('=');
+
+				if (cookie.charAt(0) === '"') {
+					cookie = cookie.slice(1, -1);
+				}
+
+				try {
+					var name = parts[0].replace(rdecode, decodeURIComponent);
+					cookie = converter.read ?
+						converter.read(cookie, name) : converter(cookie, name) ||
+						cookie.replace(rdecode, decodeURIComponent);
+
+					if (this.json) {
+						try {
+							cookie = JSON.parse(cookie);
+						} catch (e) {}
+					}
+
+					if (key === name) {
+						result = cookie;
+						break;
+					}
+
+					if (!key) {
+						result[name] = cookie;
+					}
+				} catch (e) {}
+			}
+
+			return result;
+		}
+
+		api.set = api;
+		api.get = function (key) {
+			return api.call(api, key);
+		};
+		api.getJSON = function () {
+			return api.apply({
+				json: true
+			}, [].slice.call(arguments));
+		};
+		api.defaults = {};
+
+		api.remove = function (key, attributes) {
+			api(key, '', extend(attributes, {
+				expires: -1
+			}));
+		};
+
+		api.withConverter = init;
+
+		return api;
+	}
+
+	return init(function () {});
+}));
diff --git a/assets/js/js-cookie/js.cookie.min.js b/assets/js/js-cookie/js.cookie.min.js
new file mode 100644
index 00000000000..11145b4c255
--- /dev/null
+++ b/assets/js/js-cookie/js.cookie.min.js
@@ -0,0 +1,8 @@
+/*!
+ * JavaScript Cookie v2.1.4
+ * https://github.com/js-cookie/js-cookie
+ *
+ * Copyright 2006, 2015 Klaus Hartl & Fagner Brack
+ * Released under the MIT license
+ */
+!function(a){var b=!1;if("function"==typeof define&&define.amd&&(define(a),b=!0),"object"==typeof exports&&(module.exports=a(),b=!0),!b){var c=window.Cookies,d=window.Cookies=a();d.noConflict=function(){return window.Cookies=c,d}}}(function(){function a(){for(var a=0,b={};a<arguments.length;a++){var c=arguments[a];for(var d in c)b[d]=c[d]}return b}function b(c){function d(b,e,f){var g;if("undefined"!=typeof document){if(arguments.length>1){if(f=a({path:"/"},d.defaults,f),"number"==typeof f.expires){var h=new Date;h.setMilliseconds(h.getMilliseconds()+864e5*f.expires),f.expires=h}f.expires=f.expires?f.expires.toUTCString():"";try{g=JSON.stringify(e),/^[\{\[]/.test(g)&&(e=g)}catch(a){}e=c.write?c.write(e,b):encodeURIComponent(String(e)).replace(/%(23|24|26|2B|3A|3C|3E|3D|2F|3F|40|5B|5D|5E|60|7B|7D|7C)/g,decodeURIComponent),b=encodeURIComponent(String(b)),b=b.replace(/%(23|24|26|2B|5E|60|7C)/g,decodeURIComponent),b=b.replace(/[\(\)]/g,escape);var i="";for(var j in f)f[j]&&(i+="; "+j,f[j]!==!0&&(i+="="+f[j]));return document.cookie=b+"="+e+i}b||(g={});for(var k=document.cookie?document.cookie.split("; "):[],l=/(%[0-9A-Z]{2})+/g,m=0;m<k.length;m++){var n=k[m].split("="),o=n.slice(1).join("=");'"'===o.charAt(0)&&(o=o.slice(1,-1));try{var p=n[0].replace(l,decodeURIComponent);if(o=c.read?c.read(o,p):c(o,p)||o.replace(l,decodeURIComponent),this.json)try{o=JSON.parse(o)}catch(a){}if(b===p){g=o;break}b||(g[p]=o)}catch(a){}}return g}}return d.set=d,d.get=function(a){return d.call(d,a)},d.getJSON=function(){return d.apply({json:!0},[].slice.call(arguments))},d.defaults={},d.remove=function(b,c){d(b,"",a(c,{expires:-1}))},d.withConverter=b,d}return b(function(){})});
\ No newline at end of file
diff --git a/assets/js/photoswipe/photoswipe-ui-default.js b/assets/js/photoswipe/photoswipe-ui-default.js
new file mode 100644
index 00000000000..7f3a71a0fdc
--- /dev/null
+++ b/assets/js/photoswipe/photoswipe-ui-default.js
@@ -0,0 +1,861 @@
+/*! PhotoSwipe Default UI - 4.1.1 - 2015-12-24
+* http://photoswipe.com
+* Copyright (c) 2015 Dmitry Semenov; */
+/**
+*
+* UI on top of main sliding area (caption, arrows, close button, etc.).
+* Built just using public methods/properties of PhotoSwipe.
+* 
+*/
+(function (root, factory) { 
+	if (typeof define === 'function' && define.amd) {
+		define(factory);
+	} else if (typeof exports === 'object') {
+		module.exports = factory();
+	} else {
+		root.PhotoSwipeUI_Default = factory();
+	}
+})(this, function () {
+
+	'use strict';
+
+
+
+var PhotoSwipeUI_Default =
+ function(pswp, framework) {
+
+	var ui = this;
+	var _overlayUIUpdated = false,
+		_controlsVisible = true,
+		_fullscrenAPI,
+		_controls,
+		_captionContainer,
+		_fakeCaptionContainer,
+		_indexIndicator,
+		_shareButton,
+		_shareModal,
+		_shareModalHidden = true,
+		_initalCloseOnScrollValue,
+		_isIdle,
+		_listen,
+
+		_loadingIndicator,
+		_loadingIndicatorHidden,
+		_loadingIndicatorTimeout,
+
+		_galleryHasOneSlide,
+
+		_options,
+		_defaultUIOptions = {
+			barsSize: {top:44, bottom:'auto'},
+			closeElClasses: ['item', 'caption', 'zoom-wrap', 'ui', 'top-bar'], 
+			timeToIdle: 4000, 
+			timeToIdleOutside: 1000,
+			loadingIndicatorDelay: 1000, // 2s
+			
+			addCaptionHTMLFn: function(item, captionEl /*, isFake */) {
+				if(!item.title) {
+					captionEl.children[0].innerHTML = '';
+					return false;
+				}
+				captionEl.children[0].innerHTML = item.title;
+				return true;
+			},
+
+			closeEl:true,
+			captionEl: true,
+			fullscreenEl: true,
+			zoomEl: true,
+			shareEl: true,
+			counterEl: true,
+			arrowEl: true,
+			preloaderEl: true,
+
+			tapToClose: false,
+			tapToToggleControls: true,
+
+			clickToCloseNonZoomable: true,
+
+			shareButtons: [
+				{id:'facebook', label:'Share on Facebook', url:'https://www.facebook.com/sharer/sharer.php?u={{url}}'},
+				{id:'twitter', label:'Tweet', url:'https://twitter.com/intent/tweet?text={{text}}&url={{url}}'},
+				{id:'pinterest', label:'Pin it', url:'http://www.pinterest.com/pin/create/button/'+
+													'?url={{url}}&media={{image_url}}&description={{text}}'},
+				{id:'download', label:'Download image', url:'{{raw_image_url}}', download:true}
+			],
+			getImageURLForShare: function( /* shareButtonData */ ) {
+				return pswp.currItem.src || '';
+			},
+			getPageURLForShare: function( /* shareButtonData */ ) {
+				return window.location.href;
+			},
+			getTextForShare: function( /* shareButtonData */ ) {
+				return pswp.currItem.title || '';
+			},
+				
+			indexIndicatorSep: ' / ',
+			fitControlsWidth: 1200
+
+		},
+		_blockControlsTap,
+		_blockControlsTapTimeout;
+
+
+
+	var _onControlsTap = function(e) {
+			if(_blockControlsTap) {
+				return true;
+			}
+
+
+			e = e || window.event;
+
+			if(_options.timeToIdle && _options.mouseUsed && !_isIdle) {
+				// reset idle timer
+				_onIdleMouseMove();
+			}
+
+
+			var target = e.target || e.srcElement,
+				uiElement,
+				clickedClass = target.getAttribute('class') || '',
+				found;
+
+			for(var i = 0; i < _uiElements.length; i++) {
+				uiElement = _uiElements[i];
+				if(uiElement.onTap && clickedClass.indexOf('pswp__' + uiElement.name ) > -1 ) {
+					uiElement.onTap();
+					found = true;
+
+				}
+			}
+
+			if(found) {
+				if(e.stopPropagation) {
+					e.stopPropagation();
+				}
+				_blockControlsTap = true;
+
+				// Some versions of Android don't prevent ghost click event 
+				// when preventDefault() was called on touchstart and/or touchend.
+				// 
+				// This happens on v4.3, 4.2, 4.1, 
+				// older versions strangely work correctly, 
+				// but just in case we add delay on all of them)	
+				var tapDelay = framework.features.isOldAndroid ? 600 : 30;
+				_blockControlsTapTimeout = setTimeout(function() {
+					_blockControlsTap = false;
+				}, tapDelay);
+			}
+
+		},
+		_fitControlsInViewport = function() {
+			return !pswp.likelyTouchDevice || _options.mouseUsed || screen.width > _options.fitControlsWidth;
+		},
+		_togglePswpClass = function(el, cName, add) {
+			framework[ (add ? 'add' : 'remove') + 'Class' ](el, 'pswp__' + cName);
+		},
+
+		// add class when there is just one item in the gallery
+		// (by default it hides left/right arrows and 1ofX counter)
+		_countNumItems = function() {
+			var hasOneSlide = (_options.getNumItemsFn() === 1);
+
+			if(hasOneSlide !== _galleryHasOneSlide) {
+				_togglePswpClass(_controls, 'ui--one-slide', hasOneSlide);
+				_galleryHasOneSlide = hasOneSlide;
+			}
+		},
+		_toggleShareModalClass = function() {
+			_togglePswpClass(_shareModal, 'share-modal--hidden', _shareModalHidden);
+		},
+		_toggleShareModal = function() {
+
+			_shareModalHidden = !_shareModalHidden;
+			
+			
+			if(!_shareModalHidden) {
+				_toggleShareModalClass();
+				setTimeout(function() {
+					if(!_shareModalHidden) {
+						framework.addClass(_shareModal, 'pswp__share-modal--fade-in');
+					}
+				}, 30);
+			} else {
+				framework.removeClass(_shareModal, 'pswp__share-modal--fade-in');
+				setTimeout(function() {
+					if(_shareModalHidden) {
+						_toggleShareModalClass();
+					}
+				}, 300);
+			}
+			
+			if(!_shareModalHidden) {
+				_updateShareURLs();
+			}
+			return false;
+		},
+
+		_openWindowPopup = function(e) {
+			e = e || window.event;
+			var target = e.target || e.srcElement;
+
+			pswp.shout('shareLinkClick', e, target);
+
+			if(!target.href) {
+				return false;
+			}
+
+			if( target.hasAttribute('download') ) {
+				return true;
+			}
+
+			window.open(target.href, 'pswp_share', 'scrollbars=yes,resizable=yes,toolbar=no,'+
+										'location=yes,width=550,height=420,top=100,left=' + 
+										(window.screen ? Math.round(screen.width / 2 - 275) : 100)  );
+
+			if(!_shareModalHidden) {
+				_toggleShareModal();
+			}
+			
+			return false;
+		},
+		_updateShareURLs = function() {
+			var shareButtonOut = '',
+				shareButtonData,
+				shareURL,
+				image_url,
+				page_url,
+				share_text;
+
+			for(var i = 0; i < _options.shareButtons.length; i++) {
+				shareButtonData = _options.shareButtons[i];
+
+				image_url = _options.getImageURLForShare(shareButtonData);
+				page_url = _options.getPageURLForShare(shareButtonData);
+				share_text = _options.getTextForShare(shareButtonData);
+
+				shareURL = shareButtonData.url.replace('{{url}}', encodeURIComponent(page_url) )
+									.replace('{{image_url}}', encodeURIComponent(image_url) )
+									.replace('{{raw_image_url}}', image_url )
+									.replace('{{text}}', encodeURIComponent(share_text) );
+
+				shareButtonOut += '<a href="' + shareURL + '" target="_blank" '+
+									'class="pswp__share--' + shareButtonData.id + '"' +
+									(shareButtonData.download ? 'download' : '') + '>' + 
+									shareButtonData.label + '</a>';
+
+				if(_options.parseShareButtonOut) {
+					shareButtonOut = _options.parseShareButtonOut(shareButtonData, shareButtonOut);
+				}
+			}
+			_shareModal.children[0].innerHTML = shareButtonOut;
+			_shareModal.children[0].onclick = _openWindowPopup;
+
+		},
+		_hasCloseClass = function(target) {
+			for(var  i = 0; i < _options.closeElClasses.length; i++) {
+				if( framework.hasClass(target, 'pswp__' + _options.closeElClasses[i]) ) {
+					return true;
+				}
+			}
+		},
+		_idleInterval,
+		_idleTimer,
+		_idleIncrement = 0,
+		_onIdleMouseMove = function() {
+			clearTimeout(_idleTimer);
+			_idleIncrement = 0;
+			if(_isIdle) {
+				ui.setIdle(false);
+			}
+		},
+		_onMouseLeaveWindow = function(e) {
+			e = e ? e : window.event;
+			var from = e.relatedTarget || e.toElement;
+			if (!from || from.nodeName === 'HTML') {
+				clearTimeout(_idleTimer);
+				_idleTimer = setTimeout(function() {
+					ui.setIdle(true);
+				}, _options.timeToIdleOutside);
+			}
+		},
+		_setupFullscreenAPI = function() {
+			if(_options.fullscreenEl && !framework.features.isOldAndroid) {
+				if(!_fullscrenAPI) {
+					_fullscrenAPI = ui.getFullscreenAPI();
+				}
+				if(_fullscrenAPI) {
+					framework.bind(document, _fullscrenAPI.eventK, ui.updateFullscreen);
+					ui.updateFullscreen();
+					framework.addClass(pswp.template, 'pswp--supports-fs');
+				} else {
+					framework.removeClass(pswp.template, 'pswp--supports-fs');
+				}
+			}
+		},
+		_setupLoadingIndicator = function() {
+			// Setup loading indicator
+			if(_options.preloaderEl) {
+			
+				_toggleLoadingIndicator(true);
+
+				_listen('beforeChange', function() {
+
+					clearTimeout(_loadingIndicatorTimeout);
+
+					// display loading indicator with delay
+					_loadingIndicatorTimeout = setTimeout(function() {
+
+						if(pswp.currItem && pswp.currItem.loading) {
+
+							if( !pswp.allowProgressiveImg() || (pswp.currItem.img && !pswp.currItem.img.naturalWidth)  ) {
+								// show preloader if progressive loading is not enabled, 
+								// or image width is not defined yet (because of slow connection)
+								_toggleLoadingIndicator(false); 
+								// items-controller.js function allowProgressiveImg
+							}
+							
+						} else {
+							_toggleLoadingIndicator(true); // hide preloader
+						}
+
+					}, _options.loadingIndicatorDelay);
+					
+				});
+				_listen('imageLoadComplete', function(index, item) {
+					if(pswp.currItem === item) {
+						_toggleLoadingIndicator(true);
+					}
+				});
+
+			}
+		},
+		_toggleLoadingIndicator = function(hide) {
+			if( _loadingIndicatorHidden !== hide ) {
+				_togglePswpClass(_loadingIndicator, 'preloader--active', !hide);
+				_loadingIndicatorHidden = hide;
+			}
+		},
+		_applyNavBarGaps = function(item) {
+			var gap = item.vGap;
+
+			if( _fitControlsInViewport() ) {
+				
+				var bars = _options.barsSize; 
+				if(_options.captionEl && bars.bottom === 'auto') {
+					if(!_fakeCaptionContainer) {
+						_fakeCaptionContainer = framework.createEl('pswp__caption pswp__caption--fake');
+						_fakeCaptionContainer.appendChild( framework.createEl('pswp__caption__center') );
+						_controls.insertBefore(_fakeCaptionContainer, _captionContainer);
+						framework.addClass(_controls, 'pswp__ui--fit');
+					}
+					if( _options.addCaptionHTMLFn(item, _fakeCaptionContainer, true) ) {
+
+						var captionSize = _fakeCaptionContainer.clientHeight;
+						gap.bottom = parseInt(captionSize,10) || 44;
+					} else {
+						gap.bottom = bars.top; // if no caption, set size of bottom gap to size of top
+					}
+				} else {
+					gap.bottom = bars.bottom === 'auto' ? 0 : bars.bottom;
+				}
+				
+				// height of top bar is static, no need to calculate it
+				gap.top = bars.top;
+			} else {
+				gap.top = gap.bottom = 0;
+			}
+		},
+		_setupIdle = function() {
+			// Hide controls when mouse is used
+			if(_options.timeToIdle) {
+				_listen('mouseUsed', function() {
+					
+					framework.bind(document, 'mousemove', _onIdleMouseMove);
+					framework.bind(document, 'mouseout', _onMouseLeaveWindow);
+
+					_idleInterval = setInterval(function() {
+						_idleIncrement++;
+						if(_idleIncrement === 2) {
+							ui.setIdle(true);
+						}
+					}, _options.timeToIdle / 2);
+				});
+			}
+		},
+		_setupHidingControlsDuringGestures = function() {
+
+			// Hide controls on vertical drag
+			_listen('onVerticalDrag', function(now) {
+				if(_controlsVisible && now < 0.95) {
+					ui.hideControls();
+				} else if(!_controlsVisible && now >= 0.95) {
+					ui.showControls();
+				}
+			});
+
+			// Hide controls when pinching to close
+			var pinchControlsHidden;
+			_listen('onPinchClose' , function(now) {
+				if(_controlsVisible && now < 0.9) {
+					ui.hideControls();
+					pinchControlsHidden = true;
+				} else if(pinchControlsHidden && !_controlsVisible && now > 0.9) {
+					ui.showControls();
+				}
+			});
+
+			_listen('zoomGestureEnded', function() {
+				pinchControlsHidden = false;
+				if(pinchControlsHidden && !_controlsVisible) {
+					ui.showControls();
+				}
+			});
+
+		};
+
+
+
+	var _uiElements = [
+		{ 
+			name: 'caption', 
+			option: 'captionEl',
+			onInit: function(el) {  
+				_captionContainer = el; 
+			} 
+		},
+		{ 
+			name: 'share-modal', 
+			option: 'shareEl',
+			onInit: function(el) {  
+				_shareModal = el;
+			},
+			onTap: function() {
+				_toggleShareModal();
+			} 
+		},
+		{ 
+			name: 'button--share', 
+			option: 'shareEl',
+			onInit: function(el) { 
+				_shareButton = el;
+			},
+			onTap: function() {
+				_toggleShareModal();
+			} 
+		},
+		{ 
+			name: 'button--zoom', 
+			option: 'zoomEl',
+			onTap: pswp.toggleDesktopZoom
+		},
+		{ 
+			name: 'counter', 
+			option: 'counterEl',
+			onInit: function(el) {  
+				_indexIndicator = el;
+			} 
+		},
+		{ 
+			name: 'button--close', 
+			option: 'closeEl',
+			onTap: pswp.close
+		},
+		{ 
+			name: 'button--arrow--left', 
+			option: 'arrowEl',
+			onTap: pswp.prev
+		},
+		{ 
+			name: 'button--arrow--right', 
+			option: 'arrowEl',
+			onTap: pswp.next
+		},
+		{ 
+			name: 'button--fs', 
+			option: 'fullscreenEl',
+			onTap: function() {  
+				if(_fullscrenAPI.isFullscreen()) {
+					_fullscrenAPI.exit();
+				} else {
+					_fullscrenAPI.enter();
+				}
+			} 
+		},
+		{ 
+			name: 'preloader', 
+			option: 'preloaderEl',
+			onInit: function(el) {  
+				_loadingIndicator = el;
+			} 
+		}
+
+	];
+
+	var _setupUIElements = function() {
+		var item,
+			classAttr,
+			uiElement;
+
+		var loopThroughChildElements = function(sChildren) {
+			if(!sChildren) {
+				return;
+			}
+
+			var l = sChildren.length;
+			for(var i = 0; i < l; i++) {
+				item = sChildren[i];
+				classAttr = item.className;
+
+				for(var a = 0; a < _uiElements.length; a++) {
+					uiElement = _uiElements[a];
+
+					if(classAttr.indexOf('pswp__' + uiElement.name) > -1  ) {
+
+						if( _options[uiElement.option] ) { // if element is not disabled from options
+							
+							framework.removeClass(item, 'pswp__element--disabled');
+							if(uiElement.onInit) {
+								uiElement.onInit(item);
+							}
+							
+							//item.style.display = 'block';
+						} else {
+							framework.addClass(item, 'pswp__element--disabled');
+							//item.style.display = 'none';
+						}
+					}
+				}
+			}
+		};
+		loopThroughChildElements(_controls.children);
+
+		var topBar =  framework.getChildByClass(_controls, 'pswp__top-bar');
+		if(topBar) {
+			loopThroughChildElements( topBar.children );
+		}
+	};
+
+
+	
+
+	ui.init = function() {
+
+		// extend options
+		framework.extend(pswp.options, _defaultUIOptions, true);
+
+		// create local link for fast access
+		_options = pswp.options;
+
+		// find pswp__ui element
+		_controls = framework.getChildByClass(pswp.scrollWrap, 'pswp__ui');
+
+		// create local link
+		_listen = pswp.listen;
+
+
+		_setupHidingControlsDuringGestures();
+
+		// update controls when slides change
+		_listen('beforeChange', ui.update);
+
+		// toggle zoom on double-tap
+		_listen('doubleTap', function(point) {
+			var initialZoomLevel = pswp.currItem.initialZoomLevel;
+			if(pswp.getZoomLevel() !== initialZoomLevel) {
+				pswp.zoomTo(initialZoomLevel, point, 333);
+			} else {
+				pswp.zoomTo(_options.getDoubleTapZoom(false, pswp.currItem), point, 333);
+			}
+		});
+
+		// Allow text selection in caption
+		_listen('preventDragEvent', function(e, isDown, preventObj) {
+			var t = e.target || e.srcElement;
+			if(
+				t && 
+				t.getAttribute('class') && e.type.indexOf('mouse') > -1 && 
+				( t.getAttribute('class').indexOf('__caption') > 0 || (/(SMALL|STRONG|EM)/i).test(t.tagName) ) 
+			) {
+				preventObj.prevent = false;
+			}
+		});
+
+		// bind events for UI
+		_listen('bindEvents', function() {
+			framework.bind(_controls, 'pswpTap click', _onControlsTap);
+			framework.bind(pswp.scrollWrap, 'pswpTap', ui.onGlobalTap);
+
+			if(!pswp.likelyTouchDevice) {
+				framework.bind(pswp.scrollWrap, 'mouseover', ui.onMouseOver);
+			}
+		});
+
+		// unbind events for UI
+		_listen('unbindEvents', function() {
+			if(!_shareModalHidden) {
+				_toggleShareModal();
+			}
+
+			if(_idleInterval) {
+				clearInterval(_idleInterval);
+			}
+			framework.unbind(document, 'mouseout', _onMouseLeaveWindow);
+			framework.unbind(document, 'mousemove', _onIdleMouseMove);
+			framework.unbind(_controls, 'pswpTap click', _onControlsTap);
+			framework.unbind(pswp.scrollWrap, 'pswpTap', ui.onGlobalTap);
+			framework.unbind(pswp.scrollWrap, 'mouseover', ui.onMouseOver);
+
+			if(_fullscrenAPI) {
+				framework.unbind(document, _fullscrenAPI.eventK, ui.updateFullscreen);
+				if(_fullscrenAPI.isFullscreen()) {
+					_options.hideAnimationDuration = 0;
+					_fullscrenAPI.exit();
+				}
+				_fullscrenAPI = null;
+			}
+		});
+
+
+		// clean up things when gallery is destroyed
+		_listen('destroy', function() {
+			if(_options.captionEl) {
+				if(_fakeCaptionContainer) {
+					_controls.removeChild(_fakeCaptionContainer);
+				}
+				framework.removeClass(_captionContainer, 'pswp__caption--empty');
+			}
+
+			if(_shareModal) {
+				_shareModal.children[0].onclick = null;
+			}
+			framework.removeClass(_controls, 'pswp__ui--over-close');
+			framework.addClass( _controls, 'pswp__ui--hidden');
+			ui.setIdle(false);
+		});
+		
+
+		if(!_options.showAnimationDuration) {
+			framework.removeClass( _controls, 'pswp__ui--hidden');
+		}
+		_listen('initialZoomIn', function() {
+			if(_options.showAnimationDuration) {
+				framework.removeClass( _controls, 'pswp__ui--hidden');
+			}
+		});
+		_listen('initialZoomOut', function() {
+			framework.addClass( _controls, 'pswp__ui--hidden');
+		});
+
+		_listen('parseVerticalMargin', _applyNavBarGaps);
+		
+		_setupUIElements();
+
+		if(_options.shareEl && _shareButton && _shareModal) {
+			_shareModalHidden = true;
+		}
+
+		_countNumItems();
+
+		_setupIdle();
+
+		_setupFullscreenAPI();
+
+		_setupLoadingIndicator();
+	};
+
+	ui.setIdle = function(isIdle) {
+		_isIdle = isIdle;
+		_togglePswpClass(_controls, 'ui--idle', isIdle);
+	};
+
+	ui.update = function() {
+		// Don't update UI if it's hidden
+		if(_controlsVisible && pswp.currItem) {
+			
+			ui.updateIndexIndicator();
+
+			if(_options.captionEl) {
+				_options.addCaptionHTMLFn(pswp.currItem, _captionContainer);
+
+				_togglePswpClass(_captionContainer, 'caption--empty', !pswp.currItem.title);
+			}
+
+			_overlayUIUpdated = true;
+
+		} else {
+			_overlayUIUpdated = false;
+		}
+
+		if(!_shareModalHidden) {
+			_toggleShareModal();
+		}
+
+		_countNumItems();
+	};
+
+	ui.updateFullscreen = function(e) {
+
+		if(e) {
+			// some browsers change window scroll position during the fullscreen
+			// so PhotoSwipe updates it just in case
+			setTimeout(function() {
+				pswp.setScrollOffset( 0, framework.getScrollY() );
+			}, 50);
+		}
+		
+		// toogle pswp--fs class on root element
+		framework[ (_fullscrenAPI.isFullscreen() ? 'add' : 'remove') + 'Class' ](pswp.template, 'pswp--fs');
+	};
+
+	ui.updateIndexIndicator = function() {
+		if(_options.counterEl) {
+			_indexIndicator.innerHTML = (pswp.getCurrentIndex()+1) + 
+										_options.indexIndicatorSep + 
+										_options.getNumItemsFn();
+		}
+	};
+	
+	ui.onGlobalTap = function(e) {
+		e = e || window.event;
+		var target = e.target || e.srcElement;
+
+		if(_blockControlsTap) {
+			return;
+		}
+
+		if(e.detail && e.detail.pointerType === 'mouse') {
+
+			// close gallery if clicked outside of the image
+			if(_hasCloseClass(target)) {
+				pswp.close();
+				return;
+			}
+
+			if(framework.hasClass(target, 'pswp__img')) {
+				if(pswp.getZoomLevel() === 1 && pswp.getZoomLevel() <= pswp.currItem.fitRatio) {
+					if(_options.clickToCloseNonZoomable) {
+						pswp.close();
+					}
+				} else {
+					pswp.toggleDesktopZoom(e.detail.releasePoint);
+				}
+			}
+			
+		} else {
+
+			// tap anywhere (except buttons) to toggle visibility of controls
+			if(_options.tapToToggleControls) {
+				if(_controlsVisible) {
+					ui.hideControls();
+				} else {
+					ui.showControls();
+				}
+			}
+
+			// tap to close gallery
+			if(_options.tapToClose && (framework.hasClass(target, 'pswp__img') || _hasCloseClass(target)) ) {
+				pswp.close();
+				return;
+			}
+			
+		}
+	};
+	ui.onMouseOver = function(e) {
+		e = e || window.event;
+		var target = e.target || e.srcElement;
+
+		// add class when mouse is over an element that should close the gallery
+		_togglePswpClass(_controls, 'ui--over-close', _hasCloseClass(target));
+	};
+
+	ui.hideControls = function() {
+		framework.addClass(_controls,'pswp__ui--hidden');
+		_controlsVisible = false;
+	};
+
+	ui.showControls = function() {
+		_controlsVisible = true;
+		if(!_overlayUIUpdated) {
+			ui.update();
+		}
+		framework.removeClass(_controls,'pswp__ui--hidden');
+	};
+
+	ui.supportsFullscreen = function() {
+		var d = document;
+		return !!(d.exitFullscreen || d.mozCancelFullScreen || d.webkitExitFullscreen || d.msExitFullscreen);
+	};
+
+	ui.getFullscreenAPI = function() {
+		var dE = document.documentElement,
+			api,
+			tF = 'fullscreenchange';
+
+		if (dE.requestFullscreen) {
+			api = {
+				enterK: 'requestFullscreen',
+				exitK: 'exitFullscreen',
+				elementK: 'fullscreenElement',
+				eventK: tF
+			};
+
+		} else if(dE.mozRequestFullScreen ) {
+			api = {
+				enterK: 'mozRequestFullScreen',
+				exitK: 'mozCancelFullScreen',
+				elementK: 'mozFullScreenElement',
+				eventK: 'moz' + tF
+			};
+
+			
+
+		} else if(dE.webkitRequestFullscreen) {
+			api = {
+				enterK: 'webkitRequestFullscreen',
+				exitK: 'webkitExitFullscreen',
+				elementK: 'webkitFullscreenElement',
+				eventK: 'webkit' + tF
+			};
+
+		} else if(dE.msRequestFullscreen) {
+			api = {
+				enterK: 'msRequestFullscreen',
+				exitK: 'msExitFullscreen',
+				elementK: 'msFullscreenElement',
+				eventK: 'MSFullscreenChange'
+			};
+		}
+
+		if(api) {
+			api.enter = function() { 
+				// disable close-on-scroll in fullscreen
+				_initalCloseOnScrollValue = _options.closeOnScroll; 
+				_options.closeOnScroll = false; 
+
+				if(this.enterK === 'webkitRequestFullscreen') {
+					pswp.template[this.enterK]( Element.ALLOW_KEYBOARD_INPUT );
+				} else {
+					return pswp.template[this.enterK](); 
+				}
+			};
+			api.exit = function() { 
+				_options.closeOnScroll = _initalCloseOnScrollValue;
+
+				return document[this.exitK](); 
+
+			};
+			api.isFullscreen = function() { return document[this.elementK]; };
+		}
+
+		return api;
+	};
+
+
+
+};
+return PhotoSwipeUI_Default;
+
+
+});
diff --git a/assets/js/photoswipe/photoswipe-ui-default.min.js b/assets/js/photoswipe/photoswipe-ui-default.min.js
new file mode 100644
index 00000000000..ff44e061a7f
--- /dev/null
+++ b/assets/js/photoswipe/photoswipe-ui-default.min.js
@@ -0,0 +1,4 @@
+/*! PhotoSwipe Default UI - 4.1.1 - 2015-12-24
+* http://photoswipe.com
+* Copyright (c) 2015 Dmitry Semenov; */
+!function(a,b){"function"==typeof define&&define.amd?define(b):"object"==typeof exports?module.exports=b():a.PhotoSwipeUI_Default=b()}(this,function(){"use strict";var a=function(a,b){var c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v=this,w=!1,x=!0,y=!0,z={barsSize:{top:44,bottom:"auto"},closeElClasses:["item","caption","zoom-wrap","ui","top-bar"],timeToIdle:4e3,timeToIdleOutside:1e3,loadingIndicatorDelay:1e3,addCaptionHTMLFn:function(a,b){return a.title?(b.children[0].innerHTML=a.title,!0):(b.children[0].innerHTML="",!1)},closeEl:!0,captionEl:!0,fullscreenEl:!0,zoomEl:!0,shareEl:!0,counterEl:!0,arrowEl:!0,preloaderEl:!0,tapToClose:!1,tapToToggleControls:!0,clickToCloseNonZoomable:!0,shareButtons:[{id:"facebook",label:"Share on Facebook",url:"https://www.facebook.com/sharer/sharer.php?u={{url}}"},{id:"twitter",label:"Tweet",url:"https://twitter.com/intent/tweet?text={{text}}&url={{url}}"},{id:"pinterest",label:"Pin it",url:"http://www.pinterest.com/pin/create/button/?url={{url}}&media={{image_url}}&description={{text}}"},{id:"download",label:"Download image",url:"{{raw_image_url}}",download:!0}],getImageURLForShare:function(){return a.currItem.src||""},getPageURLForShare:function(){return window.location.href},getTextForShare:function(){return a.currItem.title||""},indexIndicatorSep:" / ",fitControlsWidth:1200},A=function(a){if(r)return!0;a=a||window.event,q.timeToIdle&&q.mouseUsed&&!k&&K();for(var c,d,e=a.target||a.srcElement,f=e.getAttribute("class")||"",g=0;g<S.length;g++)c=S[g],c.onTap&&f.indexOf("pswp__"+c.name)>-1&&(c.onTap(),d=!0);if(d){a.stopPropagation&&a.stopPropagation(),r=!0;var h=b.features.isOldAndroid?600:30;s=setTimeout(function(){r=!1},h)}},B=function(){return!a.likelyTouchDevice||q.mouseUsed||screen.width>q.fitControlsWidth},C=function(a,c,d){b[(d?"add":"remove")+"Class"](a,"pswp__"+c)},D=function(){var a=1===q.getNumItemsFn();a!==p&&(C(d,"ui--one-slide",a),p=a)},E=function(){C(i,"share-modal--hidden",y)},F=function(){return y=!y,y?(b.removeClass(i,"pswp__share-modal--fade-in"),setTimeout(function(){y&&E()},300)):(E(),setTimeout(function(){y||b.addClass(i,"pswp__share-modal--fade-in")},30)),y||H(),!1},G=function(b){b=b||window.event;var c=b.target||b.srcElement;return a.shout("shareLinkClick",b,c),!!c.href&&(!!c.hasAttribute("download")||(window.open(c.href,"pswp_share","scrollbars=yes,resizable=yes,toolbar=no,location=yes,width=550,height=420,top=100,left="+(window.screen?Math.round(screen.width/2-275):100)),y||F(),!1))},H=function(){for(var a,b,c,d,e,f="",g=0;g<q.shareButtons.length;g++)a=q.shareButtons[g],c=q.getImageURLForShare(a),d=q.getPageURLForShare(a),e=q.getTextForShare(a),b=a.url.replace("{{url}}",encodeURIComponent(d)).replace("{{image_url}}",encodeURIComponent(c)).replace("{{raw_image_url}}",c).replace("{{text}}",encodeURIComponent(e)),f+='<a href="'+b+'" target="_blank" class="pswp__share--'+a.id+'"'+(a.download?"download":"")+">"+a.label+"</a>",q.parseShareButtonOut&&(f=q.parseShareButtonOut(a,f));i.children[0].innerHTML=f,i.children[0].onclick=G},I=function(a){for(var c=0;c<q.closeElClasses.length;c++)if(b.hasClass(a,"pswp__"+q.closeElClasses[c]))return!0},J=0,K=function(){clearTimeout(u),J=0,k&&v.setIdle(!1)},L=function(a){a=a?a:window.event;var b=a.relatedTarget||a.toElement;b&&"HTML"!==b.nodeName||(clearTimeout(u),u=setTimeout(function(){v.setIdle(!0)},q.timeToIdleOutside))},M=function(){q.fullscreenEl&&!b.features.isOldAndroid&&(c||(c=v.getFullscreenAPI()),c?(b.bind(document,c.eventK,v.updateFullscreen),v.updateFullscreen(),b.addClass(a.template,"pswp--supports-fs")):b.removeClass(a.template,"pswp--supports-fs"))},N=function(){q.preloaderEl&&(O(!0),l("beforeChange",function(){clearTimeout(o),o=setTimeout(function(){a.currItem&&a.currItem.loading?(!a.allowProgressiveImg()||a.currItem.img&&!a.currItem.img.naturalWidth)&&O(!1):O(!0)},q.loadingIndicatorDelay)}),l("imageLoadComplete",function(b,c){a.currItem===c&&O(!0)}))},O=function(a){n!==a&&(C(m,"preloader--active",!a),n=a)},P=function(a){var c=a.vGap;if(B()){var g=q.barsSize;if(q.captionEl&&"auto"===g.bottom)if(f||(f=b.createEl("pswp__caption pswp__caption--fake"),f.appendChild(b.createEl("pswp__caption__center")),d.insertBefore(f,e),b.addClass(d,"pswp__ui--fit")),q.addCaptionHTMLFn(a,f,!0)){var h=f.clientHeight;c.bottom=parseInt(h,10)||44}else c.bottom=g.top;else c.bottom="auto"===g.bottom?0:g.bottom;c.top=g.top}else c.top=c.bottom=0},Q=function(){q.timeToIdle&&l("mouseUsed",function(){b.bind(document,"mousemove",K),b.bind(document,"mouseout",L),t=setInterval(function(){J++,2===J&&v.setIdle(!0)},q.timeToIdle/2)})},R=function(){l("onVerticalDrag",function(a){x&&a<.95?v.hideControls():!x&&a>=.95&&v.showControls()});var a;l("onPinchClose",function(b){x&&b<.9?(v.hideControls(),a=!0):a&&!x&&b>.9&&v.showControls()}),l("zoomGestureEnded",function(){a=!1,a&&!x&&v.showControls()})},S=[{name:"caption",option:"captionEl",onInit:function(a){e=a}},{name:"share-modal",option:"shareEl",onInit:function(a){i=a},onTap:function(){F()}},{name:"button--share",option:"shareEl",onInit:function(a){h=a},onTap:function(){F()}},{name:"button--zoom",option:"zoomEl",onTap:a.toggleDesktopZoom},{name:"counter",option:"counterEl",onInit:function(a){g=a}},{name:"button--close",option:"closeEl",onTap:a.close},{name:"button--arrow--left",option:"arrowEl",onTap:a.prev},{name:"button--arrow--right",option:"arrowEl",onTap:a.next},{name:"button--fs",option:"fullscreenEl",onTap:function(){c.isFullscreen()?c.exit():c.enter()}},{name:"preloader",option:"preloaderEl",onInit:function(a){m=a}}],T=function(){var a,c,e,f=function(d){if(d)for(var f=d.length,g=0;g<f;g++){a=d[g],c=a.className;for(var h=0;h<S.length;h++)e=S[h],c.indexOf("pswp__"+e.name)>-1&&(q[e.option]?(b.removeClass(a,"pswp__element--disabled"),e.onInit&&e.onInit(a)):b.addClass(a,"pswp__element--disabled"))}};f(d.children);var g=b.getChildByClass(d,"pswp__top-bar");g&&f(g.children)};v.init=function(){b.extend(a.options,z,!0),q=a.options,d=b.getChildByClass(a.scrollWrap,"pswp__ui"),l=a.listen,R(),l("beforeChange",v.update),l("doubleTap",function(b){var c=a.currItem.initialZoomLevel;a.getZoomLevel()!==c?a.zoomTo(c,b,333):a.zoomTo(q.getDoubleTapZoom(!1,a.currItem),b,333)}),l("preventDragEvent",function(a,b,c){var d=a.target||a.srcElement;d&&d.getAttribute("class")&&a.type.indexOf("mouse")>-1&&(d.getAttribute("class").indexOf("__caption")>0||/(SMALL|STRONG|EM)/i.test(d.tagName))&&(c.prevent=!1)}),l("bindEvents",function(){b.bind(d,"pswpTap click",A),b.bind(a.scrollWrap,"pswpTap",v.onGlobalTap),a.likelyTouchDevice||b.bind(a.scrollWrap,"mouseover",v.onMouseOver)}),l("unbindEvents",function(){y||F(),t&&clearInterval(t),b.unbind(document,"mouseout",L),b.unbind(document,"mousemove",K),b.unbind(d,"pswpTap click",A),b.unbind(a.scrollWrap,"pswpTap",v.onGlobalTap),b.unbind(a.scrollWrap,"mouseover",v.onMouseOver),c&&(b.unbind(document,c.eventK,v.updateFullscreen),c.isFullscreen()&&(q.hideAnimationDuration=0,c.exit()),c=null)}),l("destroy",function(){q.captionEl&&(f&&d.removeChild(f),b.removeClass(e,"pswp__caption--empty")),i&&(i.children[0].onclick=null),b.removeClass(d,"pswp__ui--over-close"),b.addClass(d,"pswp__ui--hidden"),v.setIdle(!1)}),q.showAnimationDuration||b.removeClass(d,"pswp__ui--hidden"),l("initialZoomIn",function(){q.showAnimationDuration&&b.removeClass(d,"pswp__ui--hidden")}),l("initialZoomOut",function(){b.addClass(d,"pswp__ui--hidden")}),l("parseVerticalMargin",P),T(),q.shareEl&&h&&i&&(y=!0),D(),Q(),M(),N()},v.setIdle=function(a){k=a,C(d,"ui--idle",a)},v.update=function(){x&&a.currItem?(v.updateIndexIndicator(),q.captionEl&&(q.addCaptionHTMLFn(a.currItem,e),C(e,"caption--empty",!a.currItem.title)),w=!0):w=!1,y||F(),D()},v.updateFullscreen=function(d){d&&setTimeout(function(){a.setScrollOffset(0,b.getScrollY())},50),b[(c.isFullscreen()?"add":"remove")+"Class"](a.template,"pswp--fs")},v.updateIndexIndicator=function(){q.counterEl&&(g.innerHTML=a.getCurrentIndex()+1+q.indexIndicatorSep+q.getNumItemsFn())},v.onGlobalTap=function(c){c=c||window.event;var d=c.target||c.srcElement;if(!r)if(c.detail&&"mouse"===c.detail.pointerType){if(I(d))return void a.close();b.hasClass(d,"pswp__img")&&(1===a.getZoomLevel()&&a.getZoomLevel()<=a.currItem.fitRatio?q.clickToCloseNonZoomable&&a.close():a.toggleDesktopZoom(c.detail.releasePoint))}else if(q.tapToToggleControls&&(x?v.hideControls():v.showControls()),q.tapToClose&&(b.hasClass(d,"pswp__img")||I(d)))return void a.close()},v.onMouseOver=function(a){a=a||window.event;var b=a.target||a.srcElement;C(d,"ui--over-close",I(b))},v.hideControls=function(){b.addClass(d,"pswp__ui--hidden"),x=!1},v.showControls=function(){x=!0,w||v.update(),b.removeClass(d,"pswp__ui--hidden")},v.supportsFullscreen=function(){var a=document;return!!(a.exitFullscreen||a.mozCancelFullScreen||a.webkitExitFullscreen||a.msExitFullscreen)},v.getFullscreenAPI=function(){var b,c=document.documentElement,d="fullscreenchange";return c.requestFullscreen?b={enterK:"requestFullscreen",exitK:"exitFullscreen",elementK:"fullscreenElement",eventK:d}:c.mozRequestFullScreen?b={enterK:"mozRequestFullScreen",exitK:"mozCancelFullScreen",elementK:"mozFullScreenElement",eventK:"moz"+d}:c.webkitRequestFullscreen?b={enterK:"webkitRequestFullscreen",exitK:"webkitExitFullscreen",elementK:"webkitFullscreenElement",eventK:"webkit"+d}:c.msRequestFullscreen&&(b={enterK:"msRequestFullscreen",exitK:"msExitFullscreen",elementK:"msFullscreenElement",eventK:"MSFullscreenChange"}),b&&(b.enter=function(){return j=q.closeOnScroll,q.closeOnScroll=!1,"webkitRequestFullscreen"!==this.enterK?a.template[this.enterK]():void a.template[this.enterK](Element.ALLOW_KEYBOARD_INPUT)},b.exit=function(){return q.closeOnScroll=j,document[this.exitK]()},b.isFullscreen=function(){return document[this.elementK]}),b}};return a});
\ No newline at end of file
diff --git a/assets/js/photoswipe/photoswipe.js b/assets/js/photoswipe/photoswipe.js
new file mode 100644
index 00000000000..d2cf5efa1ad
--- /dev/null
+++ b/assets/js/photoswipe/photoswipe.js
@@ -0,0 +1,3718 @@
+/*! PhotoSwipe - v4.1.1 - 2015-12-24
+* http://photoswipe.com
+* Copyright (c) 2015 Dmitry Semenov; */
+(function (root, factory) { 
+	if (typeof define === 'function' && define.amd) {
+		define(factory);
+	} else if (typeof exports === 'object') {
+		module.exports = factory();
+	} else {
+		root.PhotoSwipe = factory();
+	}
+})(this, function () {
+
+	'use strict';
+	var PhotoSwipe = function(template, UiClass, items, options){
+
+/*>>framework-bridge*/
+/**
+ *
+ * Set of generic functions used by gallery.
+ * 
+ * You're free to modify anything here as long as functionality is kept.
+ * 
+ */
+var framework = {
+	features: null,
+	bind: function(target, type, listener, unbind) {
+		var methodName = (unbind ? 'remove' : 'add') + 'EventListener';
+		type = type.split(' ');
+		for(var i = 0; i < type.length; i++) {
+			if(type[i]) {
+				target[methodName]( type[i], listener, false);
+			}
+		}
+	},
+	isArray: function(obj) {
+		return (obj instanceof Array);
+	},
+	createEl: function(classes, tag) {
+		var el = document.createElement(tag || 'div');
+		if(classes) {
+			el.className = classes;
+		}
+		return el;
+	},
+	getScrollY: function() {
+		var yOffset = window.pageYOffset;
+		return yOffset !== undefined ? yOffset : document.documentElement.scrollTop;
+	},
+	unbind: function(target, type, listener) {
+		framework.bind(target,type,listener,true);
+	},
+	removeClass: function(el, className) {
+		var reg = new RegExp('(\\s|^)' + className + '(\\s|$)');
+		el.className = el.className.replace(reg, ' ').replace(/^\s\s*/, '').replace(/\s\s*$/, ''); 
+	},
+	addClass: function(el, className) {
+		if( !framework.hasClass(el,className) ) {
+			el.className += (el.className ? ' ' : '') + className;
+		}
+	},
+	hasClass: function(el, className) {
+		return el.className && new RegExp('(^|\\s)' + className + '(\\s|$)').test(el.className);
+	},
+	getChildByClass: function(parentEl, childClassName) {
+		var node = parentEl.firstChild;
+		while(node) {
+			if( framework.hasClass(node, childClassName) ) {
+				return node;
+			}
+			node = node.nextSibling;
+		}
+	},
+	arraySearch: function(array, value, key) {
+		var i = array.length;
+		while(i--) {
+			if(array[i][key] === value) {
+				return i;
+			} 
+		}
+		return -1;
+	},
+	extend: function(o1, o2, preventOverwrite) {
+		for (var prop in o2) {
+			if (o2.hasOwnProperty(prop)) {
+				if(preventOverwrite && o1.hasOwnProperty(prop)) {
+					continue;
+				}
+				o1[prop] = o2[prop];
+			}
+		}
+	},
+	easing: {
+		sine: {
+			out: function(k) {
+				return Math.sin(k * (Math.PI / 2));
+			},
+			inOut: function(k) {
+				return - (Math.cos(Math.PI * k) - 1) / 2;
+			}
+		},
+		cubic: {
+			out: function(k) {
+				return --k * k * k + 1;
+			}
+		}
+		/*
+			elastic: {
+				out: function ( k ) {
+
+					var s, a = 0.1, p = 0.4;
+					if ( k === 0 ) return 0;
+					if ( k === 1 ) return 1;
+					if ( !a || a < 1 ) { a = 1; s = p / 4; }
+					else s = p * Math.asin( 1 / a ) / ( 2 * Math.PI );
+					return ( a * Math.pow( 2, - 10 * k) * Math.sin( ( k - s ) * ( 2 * Math.PI ) / p ) + 1 );
+
+				},
+			},
+			back: {
+				out: function ( k ) {
+					var s = 1.70158;
+					return --k * k * ( ( s + 1 ) * k + s ) + 1;
+				}
+			}
+		*/
+	},
+
+	/**
+	 * 
+	 * @return {object}
+	 * 
+	 * {
+	 *  raf : request animation frame function
+	 *  caf : cancel animation frame function
+	 *  transfrom : transform property key (with vendor), or null if not supported
+	 *  oldIE : IE8 or below
+	 * }
+	 * 
+	 */
+	detectFeatures: function() {
+		if(framework.features) {
+			return framework.features;
+		}
+		var helperEl = framework.createEl(),
+			helperStyle = helperEl.style,
+			vendor = '',
+			features = {};
+
+		// IE8 and below
+		features.oldIE = document.all && !document.addEventListener;
+
+		features.touch = 'ontouchstart' in window;
+
+		if(window.requestAnimationFrame) {
+			features.raf = window.requestAnimationFrame;
+			features.caf = window.cancelAnimationFrame;
+		}
+
+		features.pointerEvent = navigator.pointerEnabled || navigator.msPointerEnabled;
+
+		// fix false-positive detection of old Android in new IE
+		// (IE11 ua string contains "Android 4.0")
+		
+		if(!features.pointerEvent) { 
+
+			var ua = navigator.userAgent;
+
+			// Detect if device is iPhone or iPod and if it's older than iOS 8
+			// http://stackoverflow.com/a/14223920
+			// 
+			// This detection is made because of buggy top/bottom toolbars
+			// that don't trigger window.resize event.
+			// For more info refer to _isFixedPosition variable in core.js
+
+			if (/iP(hone|od)/.test(navigator.platform)) {
+				var v = (navigator.appVersion).match(/OS (\d+)_(\d+)_?(\d+)?/);
+				if(v && v.length > 0) {
+					v = parseInt(v[1], 10);
+					if(v >= 1 && v < 8 ) {
+						features.isOldIOSPhone = true;
+					}
+				}
+			}
+
+			// Detect old Android (before KitKat)
+			// due to bugs related to position:fixed
+			// http://stackoverflow.com/questions/7184573/pick-up-the-android-version-in-the-browser-by-javascript
+			
+			var match = ua.match(/Android\s([0-9\.]*)/);
+			var androidversion =  match ? match[1] : 0;
+			androidversion = parseFloat(androidversion);
+			if(androidversion >= 1 ) {
+				if(androidversion < 4.4) {
+					features.isOldAndroid = true; // for fixed position bug & performance
+				}
+				features.androidVersion = androidversion; // for touchend bug
+			}	
+			features.isMobileOpera = /opera mini|opera mobi/i.test(ua);
+
+			// p.s. yes, yes, UA sniffing is bad, propose your solution for above bugs.
+		}
+		
+		var styleChecks = ['transform', 'perspective', 'animationName'],
+			vendors = ['', 'webkit','Moz','ms','O'],
+			styleCheckItem,
+			styleName;
+
+		for(var i = 0; i < 4; i++) {
+			vendor = vendors[i];
+
+			for(var a = 0; a < 3; a++) {
+				styleCheckItem = styleChecks[a];
+
+				// uppercase first letter of property name, if vendor is present
+				styleName = vendor + (vendor ? 
+										styleCheckItem.charAt(0).toUpperCase() + styleCheckItem.slice(1) : 
+										styleCheckItem);
+			
+				if(!features[styleCheckItem] && styleName in helperStyle ) {
+					features[styleCheckItem] = styleName;
+				}
+			}
+
+			if(vendor && !features.raf) {
+				vendor = vendor.toLowerCase();
+				features.raf = window[vendor+'RequestAnimationFrame'];
+				if(features.raf) {
+					features.caf = window[vendor+'CancelAnimationFrame'] || 
+									window[vendor+'CancelRequestAnimationFrame'];
+				}
+			}
+		}
+			
+		if(!features.raf) {
+			var lastTime = 0;
+			features.raf = function(fn) {
+				var currTime = new Date().getTime();
+				var timeToCall = Math.max(0, 16 - (currTime - lastTime));
+				var id = window.setTimeout(function() { fn(currTime + timeToCall); }, timeToCall);
+				lastTime = currTime + timeToCall;
+				return id;
+			};
+			features.caf = function(id) { clearTimeout(id); };
+		}
+
+		// Detect SVG support
+		features.svg = !!document.createElementNS && 
+						!!document.createElementNS('http://www.w3.org/2000/svg', 'svg').createSVGRect;
+
+		framework.features = features;
+
+		return features;
+	}
+};
+
+framework.detectFeatures();
+
+// Override addEventListener for old versions of IE
+if(framework.features.oldIE) {
+
+	framework.bind = function(target, type, listener, unbind) {
+		
+		type = type.split(' ');
+
+		var methodName = (unbind ? 'detach' : 'attach') + 'Event',
+			evName,
+			_handleEv = function() {
+				listener.handleEvent.call(listener);
+			};
+
+		for(var i = 0; i < type.length; i++) {
+			evName = type[i];
+			if(evName) {
+
+				if(typeof listener === 'object' && listener.handleEvent) {
+					if(!unbind) {
+						listener['oldIE' + evName] = _handleEv;
+					} else {
+						if(!listener['oldIE' + evName]) {
+							return false;
+						}
+					}
+
+					target[methodName]( 'on' + evName, listener['oldIE' + evName]);
+				} else {
+					target[methodName]( 'on' + evName, listener);
+				}
+
+			}
+		}
+	};
+	
+}
+
+/*>>framework-bridge*/
+
+/*>>core*/
+//function(template, UiClass, items, options)
+
+var self = this;
+
+/**
+ * Static vars, don't change unless you know what you're doing.
+ */
+var DOUBLE_TAP_RADIUS = 25, 
+	NUM_HOLDERS = 3;
+
+/**
+ * Options
+ */
+var _options = {
+	allowPanToNext:true,
+	spacing: 0.12,
+	bgOpacity: 1,
+	mouseUsed: false,
+	loop: true,
+	pinchToClose: true,
+	closeOnScroll: true,
+	closeOnVerticalDrag: true,
+	verticalDragRange: 0.75,
+	hideAnimationDuration: 333,
+	showAnimationDuration: 333,
+	showHideOpacity: false,
+	focus: true,
+	escKey: true,
+	arrowKeys: true,
+	mainScrollEndFriction: 0.35,
+	panEndFriction: 0.35,
+	isClickableElement: function(el) {
+        return el.tagName === 'A';
+    },
+    getDoubleTapZoom: function(isMouseClick, item) {
+    	if(isMouseClick) {
+    		return 1;
+    	} else {
+    		return item.initialZoomLevel < 0.7 ? 1 : 1.33;
+    	}
+    },
+    maxSpreadZoom: 1.33,
+	modal: true,
+
+	// not fully implemented yet
+	scaleMode: 'fit' // TODO
+};
+framework.extend(_options, options);
+
+
+/**
+ * Private helper variables & functions
+ */
+
+var _getEmptyPoint = function() { 
+		return {x:0,y:0}; 
+	};
+
+var _isOpen,
+	_isDestroying,
+	_closedByScroll,
+	_currentItemIndex,
+	_containerStyle,
+	_containerShiftIndex,
+	_currPanDist = _getEmptyPoint(),
+	_startPanOffset = _getEmptyPoint(),
+	_panOffset = _getEmptyPoint(),
+	_upMoveEvents, // drag move, drag end & drag cancel events array
+	_downEvents, // drag start events array
+	_globalEventHandlers,
+	_viewportSize = {},
+	_currZoomLevel,
+	_startZoomLevel,
+	_translatePrefix,
+	_translateSufix,
+	_updateSizeInterval,
+	_itemsNeedUpdate,
+	_currPositionIndex = 0,
+	_offset = {},
+	_slideSize = _getEmptyPoint(), // size of slide area, including spacing
+	_itemHolders,
+	_prevItemIndex,
+	_indexDiff = 0, // difference of indexes since last content update
+	_dragStartEvent,
+	_dragMoveEvent,
+	_dragEndEvent,
+	_dragCancelEvent,
+	_transformKey,
+	_pointerEventEnabled,
+	_isFixedPosition = true,
+	_likelyTouchDevice,
+	_modules = [],
+	_requestAF,
+	_cancelAF,
+	_initalClassName,
+	_initalWindowScrollY,
+	_oldIE,
+	_currentWindowScrollY,
+	_features,
+	_windowVisibleSize = {},
+	_renderMaxResolution = false,
+
+	// Registers PhotoSWipe module (History, Controller ...)
+	_registerModule = function(name, module) {
+		framework.extend(self, module.publicMethods);
+		_modules.push(name);
+	},
+
+	_getLoopedId = function(index) {
+		var numSlides = _getNumItems();
+		if(index > numSlides - 1) {
+			return index - numSlides;
+		} else  if(index < 0) {
+			return numSlides + index;
+		}
+		return index;
+	},
+	
+	// Micro bind/trigger
+	_listeners = {},
+	_listen = function(name, fn) {
+		if(!_listeners[name]) {
+			_listeners[name] = [];
+		}
+		return _listeners[name].push(fn);
+	},
+	_shout = function(name) {
+		var listeners = _listeners[name];
+
+		if(listeners) {
+			var args = Array.prototype.slice.call(arguments);
+			args.shift();
+
+			for(var i = 0; i < listeners.length; i++) {
+				listeners[i].apply(self, args);
+			}
+		}
+	},
+
+	_getCurrentTime = function() {
+		return new Date().getTime();
+	},
+	_applyBgOpacity = function(opacity) {
+		_bgOpacity = opacity;
+		self.bg.style.opacity = opacity * _options.bgOpacity;
+	},
+
+	_applyZoomTransform = function(styleObj,x,y,zoom,item) {
+		if(!_renderMaxResolution || (item && item !== self.currItem) ) {
+			zoom = zoom / (item ? item.fitRatio : self.currItem.fitRatio);	
+		}
+			
+		styleObj[_transformKey] = _translatePrefix + x + 'px, ' + y + 'px' + _translateSufix + ' scale(' + zoom + ')';
+	},
+	_applyCurrentZoomPan = function( allowRenderResolution ) {
+		if(_currZoomElementStyle) {
+
+			if(allowRenderResolution) {
+				if(_currZoomLevel > self.currItem.fitRatio) {
+					if(!_renderMaxResolution) {
+						_setImageSize(self.currItem, false, true);
+						_renderMaxResolution = true;
+					}
+				} else {
+					if(_renderMaxResolution) {
+						_setImageSize(self.currItem);
+						_renderMaxResolution = false;
+					}
+				}
+			}
+			
+
+			_applyZoomTransform(_currZoomElementStyle, _panOffset.x, _panOffset.y, _currZoomLevel);
+		}
+	},
+	_applyZoomPanToItem = function(item) {
+		if(item.container) {
+
+			_applyZoomTransform(item.container.style, 
+								item.initialPosition.x, 
+								item.initialPosition.y, 
+								item.initialZoomLevel,
+								item);
+		}
+	},
+	_setTranslateX = function(x, elStyle) {
+		elStyle[_transformKey] = _translatePrefix + x + 'px, 0px' + _translateSufix;
+	},
+	_moveMainScroll = function(x, dragging) {
+
+		if(!_options.loop && dragging) {
+			var newSlideIndexOffset = _currentItemIndex + (_slideSize.x * _currPositionIndex - x) / _slideSize.x,
+				delta = Math.round(x - _mainScrollPos.x);
+
+			if( (newSlideIndexOffset < 0 && delta > 0) || 
+				(newSlideIndexOffset >= _getNumItems() - 1 && delta < 0) ) {
+				x = _mainScrollPos.x + delta * _options.mainScrollEndFriction;
+			} 
+		}
+		
+		_mainScrollPos.x = x;
+		_setTranslateX(x, _containerStyle);
+	},
+	_calculatePanOffset = function(axis, zoomLevel) {
+		var m = _midZoomPoint[axis] - _offset[axis];
+		return _startPanOffset[axis] + _currPanDist[axis] + m - m * ( zoomLevel / _startZoomLevel );
+	},
+	
+	_equalizePoints = function(p1, p2) {
+		p1.x = p2.x;
+		p1.y = p2.y;
+		if(p2.id) {
+			p1.id = p2.id;
+		}
+	},
+	_roundPoint = function(p) {
+		p.x = Math.round(p.x);
+		p.y = Math.round(p.y);
+	},
+
+	_mouseMoveTimeout = null,
+	_onFirstMouseMove = function() {
+		// Wait until mouse move event is fired at least twice during 100ms
+		// We do this, because some mobile browsers trigger it on touchstart
+		if(_mouseMoveTimeout ) { 
+			framework.unbind(document, 'mousemove', _onFirstMouseMove);
+			framework.addClass(template, 'pswp--has_mouse');
+			_options.mouseUsed = true;
+			_shout('mouseUsed');
+		}
+		_mouseMoveTimeout = setTimeout(function() {
+			_mouseMoveTimeout = null;
+		}, 100);
+	},
+
+	_bindEvents = function() {
+		framework.bind(document, 'keydown', self);
+
+		if(_features.transform) {
+			// don't bind click event in browsers that don't support transform (mostly IE8)
+			framework.bind(self.scrollWrap, 'click', self);
+		}
+		
+
+		if(!_options.mouseUsed) {
+			framework.bind(document, 'mousemove', _onFirstMouseMove);
+		}
+
+		framework.bind(window, 'resize scroll', self);
+
+		_shout('bindEvents');
+	},
+
+	_unbindEvents = function() {
+		framework.unbind(window, 'resize', self);
+		framework.unbind(window, 'scroll', _globalEventHandlers.scroll);
+		framework.unbind(document, 'keydown', self);
+		framework.unbind(document, 'mousemove', _onFirstMouseMove);
+
+		if(_features.transform) {
+			framework.unbind(self.scrollWrap, 'click', self);
+		}
+
+		if(_isDragging) {
+			framework.unbind(window, _upMoveEvents, self);
+		}
+
+		_shout('unbindEvents');
+	},
+	
+	_calculatePanBounds = function(zoomLevel, update) {
+		var bounds = _calculateItemSize( self.currItem, _viewportSize, zoomLevel );
+		if(update) {
+			_currPanBounds = bounds;
+		}
+		return bounds;
+	},
+	
+	_getMinZoomLevel = function(item) {
+		if(!item) {
+			item = self.currItem;
+		}
+		return item.initialZoomLevel;
+	},
+	_getMaxZoomLevel = function(item) {
+		if(!item) {
+			item = self.currItem;
+		}
+		return item.w > 0 ? _options.maxSpreadZoom : 1;
+	},
+
+	// Return true if offset is out of the bounds
+	_modifyDestPanOffset = function(axis, destPanBounds, destPanOffset, destZoomLevel) {
+		if(destZoomLevel === self.currItem.initialZoomLevel) {
+			destPanOffset[axis] = self.currItem.initialPosition[axis];
+			return true;
+		} else {
+			destPanOffset[axis] = _calculatePanOffset(axis, destZoomLevel); 
+
+			if(destPanOffset[axis] > destPanBounds.min[axis]) {
+				destPanOffset[axis] = destPanBounds.min[axis];
+				return true;
+			} else if(destPanOffset[axis] < destPanBounds.max[axis] ) {
+				destPanOffset[axis] = destPanBounds.max[axis];
+				return true;
+			}
+		}
+		return false;
+	},
+
+	_setupTransforms = function() {
+
+		if(_transformKey) {
+			// setup 3d transforms
+			var allow3dTransform = _features.perspective && !_likelyTouchDevice;
+			_translatePrefix = 'translate' + (allow3dTransform ? '3d(' : '(');
+			_translateSufix = _features.perspective ? ', 0px)' : ')';	
+			return;
+		}
+
+		// Override zoom/pan/move functions in case old browser is used (most likely IE)
+		// (so they use left/top/width/height, instead of CSS transform)
+	
+		_transformKey = 'left';
+		framework.addClass(template, 'pswp--ie');
+
+		_setTranslateX = function(x, elStyle) {
+			elStyle.left = x + 'px';
+		};
+		_applyZoomPanToItem = function(item) {
+
+			var zoomRatio = item.fitRatio > 1 ? 1 : item.fitRatio,
+				s = item.container.style,
+				w = zoomRatio * item.w,
+				h = zoomRatio * item.h;
+
+			s.width = w + 'px';
+			s.height = h + 'px';
+			s.left = item.initialPosition.x + 'px';
+			s.top = item.initialPosition.y + 'px';
+
+		};
+		_applyCurrentZoomPan = function() {
+			if(_currZoomElementStyle) {
+
+				var s = _currZoomElementStyle,
+					item = self.currItem,
+					zoomRatio = item.fitRatio > 1 ? 1 : item.fitRatio,
+					w = zoomRatio * item.w,
+					h = zoomRatio * item.h;
+
+				s.width = w + 'px';
+				s.height = h + 'px';
+
+
+				s.left = _panOffset.x + 'px';
+				s.top = _panOffset.y + 'px';
+			}
+			
+		};
+	},
+
+	_onKeyDown = function(e) {
+		var keydownAction = '';
+		if(_options.escKey && e.keyCode === 27) { 
+			keydownAction = 'close';
+		} else if(_options.arrowKeys) {
+			if(e.keyCode === 37) {
+				keydownAction = 'prev';
+			} else if(e.keyCode === 39) { 
+				keydownAction = 'next';
+			}
+		}
+
+		if(keydownAction) {
+			// don't do anything if special key pressed to prevent from overriding default browser actions
+			// e.g. in Chrome on Mac cmd+arrow-left returns to previous page
+			if( !e.ctrlKey && !e.altKey && !e.shiftKey && !e.metaKey ) {
+				if(e.preventDefault) {
+					e.preventDefault();
+				} else {
+					e.returnValue = false;
+				} 
+				self[keydownAction]();
+			}
+		}
+	},
+
+	_onGlobalClick = function(e) {
+		if(!e) {
+			return;
+		}
+
+		// don't allow click event to pass through when triggering after drag or some other gesture
+		if(_moved || _zoomStarted || _mainScrollAnimating || _verticalDragInitiated) {
+			e.preventDefault();
+			e.stopPropagation();
+		}
+	},
+
+	_updatePageScrollOffset = function() {
+		self.setScrollOffset(0, framework.getScrollY());		
+	};
+	
+
+
+	
+
+
+
+// Micro animation engine
+var _animations = {},
+	_numAnimations = 0,
+	_stopAnimation = function(name) {
+		if(_animations[name]) {
+			if(_animations[name].raf) {
+				_cancelAF( _animations[name].raf );
+			}
+			_numAnimations--;
+			delete _animations[name];
+		}
+	},
+	_registerStartAnimation = function(name) {
+		if(_animations[name]) {
+			_stopAnimation(name);
+		}
+		if(!_animations[name]) {
+			_numAnimations++;
+			_animations[name] = {};
+		}
+	},
+	_stopAllAnimations = function() {
+		for (var prop in _animations) {
+
+			if( _animations.hasOwnProperty( prop ) ) {
+				_stopAnimation(prop);
+			} 
+			
+		}
+	},
+	_animateProp = function(name, b, endProp, d, easingFn, onUpdate, onComplete) {
+		var startAnimTime = _getCurrentTime(), t;
+		_registerStartAnimation(name);
+
+		var animloop = function(){
+			if ( _animations[name] ) {
+				
+				t = _getCurrentTime() - startAnimTime; // time diff
+				//b - beginning (start prop)
+				//d - anim duration
+
+				if ( t >= d ) {
+					_stopAnimation(name);
+					onUpdate(endProp);
+					if(onComplete) {
+						onComplete();
+					}
+					return;
+				}
+				onUpdate( (endProp - b) * easingFn(t/d) + b );
+
+				_animations[name].raf = _requestAF(animloop);
+			}
+		};
+		animloop();
+	};
+	
+
+
+var publicMethods = {
+
+	// make a few local variables and functions public
+	shout: _shout,
+	listen: _listen,
+	viewportSize: _viewportSize,
+	options: _options,
+
+	isMainScrollAnimating: function() {
+		return _mainScrollAnimating;
+	},
+	getZoomLevel: function() {
+		return _currZoomLevel;
+	},
+	getCurrentIndex: function() {
+		return _currentItemIndex;
+	},
+	isDragging: function() {
+		return _isDragging;
+	},	
+	isZooming: function() {
+		return _isZooming;
+	},
+	setScrollOffset: function(x,y) {
+		_offset.x = x;
+		_currentWindowScrollY = _offset.y = y;
+		_shout('updateScrollOffset', _offset);
+	},
+	applyZoomPan: function(zoomLevel,panX,panY,allowRenderResolution) {
+		_panOffset.x = panX;
+		_panOffset.y = panY;
+		_currZoomLevel = zoomLevel;
+		_applyCurrentZoomPan( allowRenderResolution );
+	},
+
+	init: function() {
+
+		if(_isOpen || _isDestroying) {
+			return;
+		}
+
+		var i;
+
+		self.framework = framework; // basic functionality
+		self.template = template; // root DOM element of PhotoSwipe
+		self.bg = framework.getChildByClass(template, 'pswp__bg');
+
+		_initalClassName = template.className;
+		_isOpen = true;
+				
+		_features = framework.detectFeatures();
+		_requestAF = _features.raf;
+		_cancelAF = _features.caf;
+		_transformKey = _features.transform;
+		_oldIE = _features.oldIE;
+		
+		self.scrollWrap = framework.getChildByClass(template, 'pswp__scroll-wrap');
+		self.container = framework.getChildByClass(self.scrollWrap, 'pswp__container');
+
+		_containerStyle = self.container.style; // for fast access
+
+		// Objects that hold slides (there are only 3 in DOM)
+		self.itemHolders = _itemHolders = [
+			{el:self.container.children[0] , wrap:0, index: -1},
+			{el:self.container.children[1] , wrap:0, index: -1},
+			{el:self.container.children[2] , wrap:0, index: -1}
+		];
+
+		// hide nearby item holders until initial zoom animation finishes (to avoid extra Paints)
+		_itemHolders[0].el.style.display = _itemHolders[2].el.style.display = 'none';
+
+		_setupTransforms();
+
+		// Setup global events
+		_globalEventHandlers = {
+			resize: self.updateSize,
+			scroll: _updatePageScrollOffset,
+			keydown: _onKeyDown,
+			click: _onGlobalClick
+		};
+
+		// disable show/hide effects on old browsers that don't support CSS animations or transforms, 
+		// old IOS, Android and Opera mobile. Blackberry seems to work fine, even older models.
+		var oldPhone = _features.isOldIOSPhone || _features.isOldAndroid || _features.isMobileOpera;
+		if(!_features.animationName || !_features.transform || oldPhone) {
+			_options.showAnimationDuration = _options.hideAnimationDuration = 0;
+		}
+
+		// init modules
+		for(i = 0; i < _modules.length; i++) {
+			self['init' + _modules[i]]();
+		}
+		
+		// init
+		if(UiClass) {
+			var ui = self.ui = new UiClass(self, framework);
+			ui.init();
+		}
+
+		_shout('firstUpdate');
+		_currentItemIndex = _currentItemIndex || _options.index || 0;
+		// validate index
+		if( isNaN(_currentItemIndex) || _currentItemIndex < 0 || _currentItemIndex >= _getNumItems() ) {
+			_currentItemIndex = 0;
+		}
+		self.currItem = _getItemAt( _currentItemIndex );
+
+		
+		if(_features.isOldIOSPhone || _features.isOldAndroid) {
+			_isFixedPosition = false;
+		}
+		
+		template.setAttribute('aria-hidden', 'false');
+		if(_options.modal) {
+			if(!_isFixedPosition) {
+				template.style.position = 'absolute';
+				template.style.top = framework.getScrollY() + 'px';
+			} else {
+				template.style.position = 'fixed';
+			}
+		}
+
+		if(_currentWindowScrollY === undefined) {
+			_shout('initialLayout');
+			_currentWindowScrollY = _initalWindowScrollY = framework.getScrollY();
+		}
+		
+		// add classes to root element of PhotoSwipe
+		var rootClasses = 'pswp--open ';
+		if(_options.mainClass) {
+			rootClasses += _options.mainClass + ' ';
+		}
+		if(_options.showHideOpacity) {
+			rootClasses += 'pswp--animate_opacity ';
+		}
+		rootClasses += _likelyTouchDevice ? 'pswp--touch' : 'pswp--notouch';
+		rootClasses += _features.animationName ? ' pswp--css_animation' : '';
+		rootClasses += _features.svg ? ' pswp--svg' : '';
+		framework.addClass(template, rootClasses);
+
+		self.updateSize();
+
+		// initial update
+		_containerShiftIndex = -1;
+		_indexDiff = null;
+		for(i = 0; i < NUM_HOLDERS; i++) {
+			_setTranslateX( (i+_containerShiftIndex) * _slideSize.x, _itemHolders[i].el.style);
+		}
+
+		if(!_oldIE) {
+			framework.bind(self.scrollWrap, _downEvents, self); // no dragging for old IE
+		}	
+
+		_listen('initialZoomInEnd', function() {
+			self.setContent(_itemHolders[0], _currentItemIndex-1);
+			self.setContent(_itemHolders[2], _currentItemIndex+1);
+
+			_itemHolders[0].el.style.display = _itemHolders[2].el.style.display = 'block';
+
+			if(_options.focus) {
+				// focus causes layout, 
+				// which causes lag during the animation, 
+				// that's why we delay it untill the initial zoom transition ends
+				template.focus();
+			}
+			 
+
+			_bindEvents();
+		});
+
+		// set content for center slide (first time)
+		self.setContent(_itemHolders[1], _currentItemIndex);
+		
+		self.updateCurrItem();
+
+		_shout('afterInit');
+
+		if(!_isFixedPosition) {
+
+			// On all versions of iOS lower than 8.0, we check size of viewport every second.
+			// 
+			// This is done to detect when Safari top & bottom bars appear, 
+			// as this action doesn't trigger any events (like resize). 
+			// 
+			// On iOS8 they fixed this.
+			// 
+			// 10 Nov 2014: iOS 7 usage ~40%. iOS 8 usage 56%.
+			
+			_updateSizeInterval = setInterval(function() {
+				if(!_numAnimations && !_isDragging && !_isZooming && (_currZoomLevel === self.currItem.initialZoomLevel)  ) {
+					self.updateSize();
+				}
+			}, 1000);
+		}
+
+		framework.addClass(template, 'pswp--visible');
+	},
+
+	// Close the gallery, then destroy it
+	close: function() {
+		if(!_isOpen) {
+			return;
+		}
+
+		_isOpen = false;
+		_isDestroying = true;
+		_shout('close');
+		_unbindEvents();
+
+		_showOrHide(self.currItem, null, true, self.destroy);
+	},
+
+	// destroys the gallery (unbinds events, cleans up intervals and timeouts to avoid memory leaks)
+	destroy: function() {
+		_shout('destroy');
+
+		if(_showOrHideTimeout) {
+			clearTimeout(_showOrHideTimeout);
+		}
+		
+		template.setAttribute('aria-hidden', 'true');
+		template.className = _initalClassName;
+
+		if(_updateSizeInterval) {
+			clearInterval(_updateSizeInterval);
+		}
+
+		framework.unbind(self.scrollWrap, _downEvents, self);
+
+		// we unbind scroll event at the end, as closing animation may depend on it
+		framework.unbind(window, 'scroll', self);
+
+		_stopDragUpdateLoop();
+
+		_stopAllAnimations();
+
+		_listeners = null;
+	},
+
+	/**
+	 * Pan image to position
+	 * @param {Number} x     
+	 * @param {Number} y     
+	 * @param {Boolean} force Will ignore bounds if set to true.
+	 */
+	panTo: function(x,y,force) {
+		if(!force) {
+			if(x > _currPanBounds.min.x) {
+				x = _currPanBounds.min.x;
+			} else if(x < _currPanBounds.max.x) {
+				x = _currPanBounds.max.x;
+			}
+
+			if(y > _currPanBounds.min.y) {
+				y = _currPanBounds.min.y;
+			} else if(y < _currPanBounds.max.y) {
+				y = _currPanBounds.max.y;
+			}
+		}
+		
+		_panOffset.x = x;
+		_panOffset.y = y;
+		_applyCurrentZoomPan();
+	},
+	
+	handleEvent: function (e) {
+		e = e || window.event;
+		if(_globalEventHandlers[e.type]) {
+			_globalEventHandlers[e.type](e);
+		}
+	},
+
+
+	goTo: function(index) {
+
+		index = _getLoopedId(index);
+
+		var diff = index - _currentItemIndex;
+		_indexDiff = diff;
+
+		_currentItemIndex = index;
+		self.currItem = _getItemAt( _currentItemIndex );
+		_currPositionIndex -= diff;
+		
+		_moveMainScroll(_slideSize.x * _currPositionIndex);
+		
+
+		_stopAllAnimations();
+		_mainScrollAnimating = false;
+
+		self.updateCurrItem();
+	},
+	next: function() {
+		self.goTo( _currentItemIndex + 1);
+	},
+	prev: function() {
+		self.goTo( _currentItemIndex - 1);
+	},
+
+	// update current zoom/pan objects
+	updateCurrZoomItem: function(emulateSetContent) {
+		if(emulateSetContent) {
+			_shout('beforeChange', 0);
+		}
+
+		// itemHolder[1] is middle (current) item
+		if(_itemHolders[1].el.children.length) {
+			var zoomElement = _itemHolders[1].el.children[0];
+			if( framework.hasClass(zoomElement, 'pswp__zoom-wrap') ) {
+				_currZoomElementStyle = zoomElement.style;
+			} else {
+				_currZoomElementStyle = null;
+			}
+		} else {
+			_currZoomElementStyle = null;
+		}
+		
+		_currPanBounds = self.currItem.bounds;	
+		_startZoomLevel = _currZoomLevel = self.currItem.initialZoomLevel;
+
+		_panOffset.x = _currPanBounds.center.x;
+		_panOffset.y = _currPanBounds.center.y;
+
+		if(emulateSetContent) {
+			_shout('afterChange');
+		}
+	},
+
+
+	invalidateCurrItems: function() {
+		_itemsNeedUpdate = true;
+		for(var i = 0; i < NUM_HOLDERS; i++) {
+			if( _itemHolders[i].item ) {
+				_itemHolders[i].item.needsUpdate = true;
+			}
+		}
+	},
+
+	updateCurrItem: function(beforeAnimation) {
+
+		if(_indexDiff === 0) {
+			return;
+		}
+
+		var diffAbs = Math.abs(_indexDiff),
+			tempHolder;
+
+		if(beforeAnimation && diffAbs < 2) {
+			return;
+		}
+
+
+		self.currItem = _getItemAt( _currentItemIndex );
+		_renderMaxResolution = false;
+		
+		_shout('beforeChange', _indexDiff);
+
+		if(diffAbs >= NUM_HOLDERS) {
+			_containerShiftIndex += _indexDiff + (_indexDiff > 0 ? -NUM_HOLDERS : NUM_HOLDERS);
+			diffAbs = NUM_HOLDERS;
+		}
+		for(var i = 0; i < diffAbs; i++) {
+			if(_indexDiff > 0) {
+				tempHolder = _itemHolders.shift();
+				_itemHolders[NUM_HOLDERS-1] = tempHolder; // move first to last
+
+				_containerShiftIndex++;
+				_setTranslateX( (_containerShiftIndex+2) * _slideSize.x, tempHolder.el.style);
+				self.setContent(tempHolder, _currentItemIndex - diffAbs + i + 1 + 1);
+			} else {
+				tempHolder = _itemHolders.pop();
+				_itemHolders.unshift( tempHolder ); // move last to first
+
+				_containerShiftIndex--;
+				_setTranslateX( _containerShiftIndex * _slideSize.x, tempHolder.el.style);
+				self.setContent(tempHolder, _currentItemIndex + diffAbs - i - 1 - 1);
+			}
+			
+		}
+
+		// reset zoom/pan on previous item
+		if(_currZoomElementStyle && Math.abs(_indexDiff) === 1) {
+
+			var prevItem = _getItemAt(_prevItemIndex);
+			if(prevItem.initialZoomLevel !== _currZoomLevel) {
+				_calculateItemSize(prevItem , _viewportSize );
+				_setImageSize(prevItem);
+				_applyZoomPanToItem( prevItem ); 				
+			}
+
+		}
+
+		// reset diff after update
+		_indexDiff = 0;
+
+		self.updateCurrZoomItem();
+
+		_prevItemIndex = _currentItemIndex;
+
+		_shout('afterChange');
+		
+	},
+
+
+
+	updateSize: function(force) {
+		
+		if(!_isFixedPosition && _options.modal) {
+			var windowScrollY = framework.getScrollY();
+			if(_currentWindowScrollY !== windowScrollY) {
+				template.style.top = windowScrollY + 'px';
+				_currentWindowScrollY = windowScrollY;
+			}
+			if(!force && _windowVisibleSize.x === window.innerWidth && _windowVisibleSize.y === window.innerHeight) {
+				return;
+			}
+			_windowVisibleSize.x = window.innerWidth;
+			_windowVisibleSize.y = window.innerHeight;
+
+			//template.style.width = _windowVisibleSize.x + 'px';
+			template.style.height = _windowVisibleSize.y + 'px';
+		}
+
+
+
+		_viewportSize.x = self.scrollWrap.clientWidth;
+		_viewportSize.y = self.scrollWrap.clientHeight;
+
+		_updatePageScrollOffset();
+
+		_slideSize.x = _viewportSize.x + Math.round(_viewportSize.x * _options.spacing);
+		_slideSize.y = _viewportSize.y;
+
+		_moveMainScroll(_slideSize.x * _currPositionIndex);
+
+		_shout('beforeResize'); // even may be used for example to switch image sources
+
+
+		// don't re-calculate size on inital size update
+		if(_containerShiftIndex !== undefined) {
+
+			var holder,
+				item,
+				hIndex;
+
+			for(var i = 0; i < NUM_HOLDERS; i++) {
+				holder = _itemHolders[i];
+				_setTranslateX( (i+_containerShiftIndex) * _slideSize.x, holder.el.style);
+
+				hIndex = _currentItemIndex+i-1;
+
+				if(_options.loop && _getNumItems() > 2) {
+					hIndex = _getLoopedId(hIndex);
+				}
+
+				// update zoom level on items and refresh source (if needsUpdate)
+				item = _getItemAt( hIndex );
+
+				// re-render gallery item if `needsUpdate`,
+				// or doesn't have `bounds` (entirely new slide object)
+				if( item && (_itemsNeedUpdate || item.needsUpdate || !item.bounds) ) {
+
+					self.cleanSlide( item );
+					
+					self.setContent( holder, hIndex );
+
+					// if "center" slide
+					if(i === 1) {
+						self.currItem = item;
+						self.updateCurrZoomItem(true);
+					}
+
+					item.needsUpdate = false;
+
+				} else if(holder.index === -1 && hIndex >= 0) {
+					// add content first time
+					self.setContent( holder, hIndex );
+				}
+				if(item && item.container) {
+					_calculateItemSize(item, _viewportSize);
+					_setImageSize(item);
+					_applyZoomPanToItem( item );
+				}
+				
+			}
+			_itemsNeedUpdate = false;
+		}	
+
+		_startZoomLevel = _currZoomLevel = self.currItem.initialZoomLevel;
+		_currPanBounds = self.currItem.bounds;
+
+		if(_currPanBounds) {
+			_panOffset.x = _currPanBounds.center.x;
+			_panOffset.y = _currPanBounds.center.y;
+			_applyCurrentZoomPan( true );
+		}
+		
+		_shout('resize');
+	},
+	
+	// Zoom current item to
+	zoomTo: function(destZoomLevel, centerPoint, speed, easingFn, updateFn) {
+		/*
+			if(destZoomLevel === 'fit') {
+				destZoomLevel = self.currItem.fitRatio;
+			} else if(destZoomLevel === 'fill') {
+				destZoomLevel = self.currItem.fillRatio;
+			}
+		*/
+
+		if(centerPoint) {
+			_startZoomLevel = _currZoomLevel;
+			_midZoomPoint.x = Math.abs(centerPoint.x) - _panOffset.x ;
+			_midZoomPoint.y = Math.abs(centerPoint.y) - _panOffset.y ;
+			_equalizePoints(_startPanOffset, _panOffset);
+		}
+
+		var destPanBounds = _calculatePanBounds(destZoomLevel, false),
+			destPanOffset = {};
+
+		_modifyDestPanOffset('x', destPanBounds, destPanOffset, destZoomLevel);
+		_modifyDestPanOffset('y', destPanBounds, destPanOffset, destZoomLevel);
+
+		var initialZoomLevel = _currZoomLevel;
+		var initialPanOffset = {
+			x: _panOffset.x,
+			y: _panOffset.y
+		};
+
+		_roundPoint(destPanOffset);
+
+		var onUpdate = function(now) {
+			if(now === 1) {
+				_currZoomLevel = destZoomLevel;
+				_panOffset.x = destPanOffset.x;
+				_panOffset.y = destPanOffset.y;
+			} else {
+				_currZoomLevel = (destZoomLevel - initialZoomLevel) * now + initialZoomLevel;
+				_panOffset.x = (destPanOffset.x - initialPanOffset.x) * now + initialPanOffset.x;
+				_panOffset.y = (destPanOffset.y - initialPanOffset.y) * now + initialPanOffset.y;
+			}
+
+			if(updateFn) {
+				updateFn(now);
+			}
+
+			_applyCurrentZoomPan( now === 1 );
+		};
+
+		if(speed) {
+			_animateProp('customZoomTo', 0, 1, speed, easingFn || framework.easing.sine.inOut, onUpdate);
+		} else {
+			onUpdate(1);
+		}
+	}
+
+
+};
+
+
+/*>>core*/
+
+/*>>gestures*/
+/**
+ * Mouse/touch/pointer event handlers.
+ * 
+ * separated from @core.js for readability
+ */
+
+var MIN_SWIPE_DISTANCE = 30,
+	DIRECTION_CHECK_OFFSET = 10; // amount of pixels to drag to determine direction of swipe
+
+var _gestureStartTime,
+	_gestureCheckSpeedTime,
+
+	// pool of objects that are used during dragging of zooming
+	p = {}, // first point
+	p2 = {}, // second point (for zoom gesture)
+	delta = {},
+	_currPoint = {},
+	_startPoint = {},
+	_currPointers = [],
+	_startMainScrollPos = {},
+	_releaseAnimData,
+	_posPoints = [], // array of points during dragging, used to determine type of gesture
+	_tempPoint = {},
+
+	_isZoomingIn,
+	_verticalDragInitiated,
+	_oldAndroidTouchEndTimeout,
+	_currZoomedItemIndex = 0,
+	_centerPoint = _getEmptyPoint(),
+	_lastReleaseTime = 0,
+	_isDragging, // at least one pointer is down
+	_isMultitouch, // at least two _pointers are down
+	_zoomStarted, // zoom level changed during zoom gesture
+	_moved,
+	_dragAnimFrame,
+	_mainScrollShifted,
+	_currentPoints, // array of current touch points
+	_isZooming,
+	_currPointsDistance,
+	_startPointsDistance,
+	_currPanBounds,
+	_mainScrollPos = _getEmptyPoint(),
+	_currZoomElementStyle,
+	_mainScrollAnimating, // true, if animation after swipe gesture is running
+	_midZoomPoint = _getEmptyPoint(),
+	_currCenterPoint = _getEmptyPoint(),
+	_direction,
+	_isFirstMove,
+	_opacityChanged,
+	_bgOpacity,
+	_wasOverInitialZoom,
+
+	_isEqualPoints = function(p1, p2) {
+		return p1.x === p2.x && p1.y === p2.y;
+	},
+	_isNearbyPoints = function(touch0, touch1) {
+		return Math.abs(touch0.x - touch1.x) < DOUBLE_TAP_RADIUS && Math.abs(touch0.y - touch1.y) < DOUBLE_TAP_RADIUS;
+	},
+	_calculatePointsDistance = function(p1, p2) {
+		_tempPoint.x = Math.abs( p1.x - p2.x );
+		_tempPoint.y = Math.abs( p1.y - p2.y );
+		return Math.sqrt(_tempPoint.x * _tempPoint.x + _tempPoint.y * _tempPoint.y);
+	},
+	_stopDragUpdateLoop = function() {
+		if(_dragAnimFrame) {
+			_cancelAF(_dragAnimFrame);
+			_dragAnimFrame = null;
+		}
+	},
+	_dragUpdateLoop = function() {
+		if(_isDragging) {
+			_dragAnimFrame = _requestAF(_dragUpdateLoop);
+			_renderMovement();
+		}
+	},
+	_canPan = function() {
+		return !(_options.scaleMode === 'fit' && _currZoomLevel ===  self.currItem.initialZoomLevel);
+	},
+	
+	// find the closest parent DOM element
+	_closestElement = function(el, fn) {
+	  	if(!el || el === document) {
+	  		return false;
+	  	}
+
+	  	// don't search elements above pswp__scroll-wrap
+	  	if(el.getAttribute('class') && el.getAttribute('class').indexOf('pswp__scroll-wrap') > -1 ) {
+	  		return false;
+	  	}
+
+	  	if( fn(el) ) {
+	  		return el;
+	  	}
+
+	  	return _closestElement(el.parentNode, fn);
+	},
+
+	_preventObj = {},
+	_preventDefaultEventBehaviour = function(e, isDown) {
+	    _preventObj.prevent = !_closestElement(e.target, _options.isClickableElement);
+
+		_shout('preventDragEvent', e, isDown, _preventObj);
+		return _preventObj.prevent;
+
+	},
+	_convertTouchToPoint = function(touch, p) {
+		p.x = touch.pageX;
+		p.y = touch.pageY;
+		p.id = touch.identifier;
+		return p;
+	},
+	_findCenterOfPoints = function(p1, p2, pCenter) {
+		pCenter.x = (p1.x + p2.x) * 0.5;
+		pCenter.y = (p1.y + p2.y) * 0.5;
+	},
+	_pushPosPoint = function(time, x, y) {
+		if(time - _gestureCheckSpeedTime > 50) {
+			var o = _posPoints.length > 2 ? _posPoints.shift() : {};
+			o.x = x;
+			o.y = y; 
+			_posPoints.push(o);
+			_gestureCheckSpeedTime = time;
+		}
+	},
+
+	_calculateVerticalDragOpacityRatio = function() {
+		var yOffset = _panOffset.y - self.currItem.initialPosition.y; // difference between initial and current position
+		return 1 -  Math.abs( yOffset / (_viewportSize.y / 2)  );
+	},
+
+	
+	// points pool, reused during touch events
+	_ePoint1 = {},
+	_ePoint2 = {},
+	_tempPointsArr = [],
+	_tempCounter,
+	_getTouchPoints = function(e) {
+		// clean up previous points, without recreating array
+		while(_tempPointsArr.length > 0) {
+			_tempPointsArr.pop();
+		}
+
+		if(!_pointerEventEnabled) {
+			if(e.type.indexOf('touch') > -1) {
+
+				if(e.touches && e.touches.length > 0) {
+					_tempPointsArr[0] = _convertTouchToPoint(e.touches[0], _ePoint1);
+					if(e.touches.length > 1) {
+						_tempPointsArr[1] = _convertTouchToPoint(e.touches[1], _ePoint2);
+					}
+				}
+				
+			} else {
+				_ePoint1.x = e.pageX;
+				_ePoint1.y = e.pageY;
+				_ePoint1.id = '';
+				_tempPointsArr[0] = _ePoint1;//_ePoint1;
+			}
+		} else {
+			_tempCounter = 0;
+			// we can use forEach, as pointer events are supported only in modern browsers
+			_currPointers.forEach(function(p) {
+				if(_tempCounter === 0) {
+					_tempPointsArr[0] = p;
+				} else if(_tempCounter === 1) {
+					_tempPointsArr[1] = p;
+				}
+				_tempCounter++;
+
+			});
+		}
+		return _tempPointsArr;
+	},
+
+	_panOrMoveMainScroll = function(axis, delta) {
+
+		var panFriction,
+			overDiff = 0,
+			newOffset = _panOffset[axis] + delta[axis],
+			startOverDiff,
+			dir = delta[axis] > 0,
+			newMainScrollPosition = _mainScrollPos.x + delta.x,
+			mainScrollDiff = _mainScrollPos.x - _startMainScrollPos.x,
+			newPanPos,
+			newMainScrollPos;
+
+		// calculate fdistance over the bounds and friction
+		if(newOffset > _currPanBounds.min[axis] || newOffset < _currPanBounds.max[axis]) {
+			panFriction = _options.panEndFriction;
+			// Linear increasing of friction, so at 1/4 of viewport it's at max value. 
+			// Looks not as nice as was expected. Left for history.
+			// panFriction = (1 - (_panOffset[axis] + delta[axis] + panBounds.min[axis]) / (_viewportSize[axis] / 4) );
+		} else {
+			panFriction = 1;
+		}
+		
+		newOffset = _panOffset[axis] + delta[axis] * panFriction;
+
+		// move main scroll or start panning
+		if(_options.allowPanToNext || _currZoomLevel === self.currItem.initialZoomLevel) {
+
+
+			if(!_currZoomElementStyle) {
+				
+				newMainScrollPos = newMainScrollPosition;
+
+			} else if(_direction === 'h' && axis === 'x' && !_zoomStarted ) {
+				
+				if(dir) {
+					if(newOffset > _currPanBounds.min[axis]) {
+						panFriction = _options.panEndFriction;
+						overDiff = _currPanBounds.min[axis] - newOffset;
+						startOverDiff = _currPanBounds.min[axis] - _startPanOffset[axis];
+					}
+					
+					// drag right
+					if( (startOverDiff <= 0 || mainScrollDiff < 0) && _getNumItems() > 1 ) {
+						newMainScrollPos = newMainScrollPosition;
+						if(mainScrollDiff < 0 && newMainScrollPosition > _startMainScrollPos.x) {
+							newMainScrollPos = _startMainScrollPos.x;
+						}
+					} else {
+						if(_currPanBounds.min.x !== _currPanBounds.max.x) {
+							newPanPos = newOffset;
+						}
+						
+					}
+
+				} else {
+
+					if(newOffset < _currPanBounds.max[axis] ) {
+						panFriction =_options.panEndFriction;
+						overDiff = newOffset - _currPanBounds.max[axis];
+						startOverDiff = _startPanOffset[axis] - _currPanBounds.max[axis];
+					}
+
+					if( (startOverDiff <= 0 || mainScrollDiff > 0) && _getNumItems() > 1 ) {
+						newMainScrollPos = newMainScrollPosition;
+
+						if(mainScrollDiff > 0 && newMainScrollPosition < _startMainScrollPos.x) {
+							newMainScrollPos = _startMainScrollPos.x;
+						}
+
+					} else {
+						if(_currPanBounds.min.x !== _currPanBounds.max.x) {
+							newPanPos = newOffset;
+						}
+					}
+
+				}
+
+
+				//
+			}
+
+			if(axis === 'x') {
+
+				if(newMainScrollPos !== undefined) {
+					_moveMainScroll(newMainScrollPos, true);
+					if(newMainScrollPos === _startMainScrollPos.x) {
+						_mainScrollShifted = false;
+					} else {
+						_mainScrollShifted = true;
+					}
+				}
+
+				if(_currPanBounds.min.x !== _currPanBounds.max.x) {
+					if(newPanPos !== undefined) {
+						_panOffset.x = newPanPos;
+					} else if(!_mainScrollShifted) {
+						_panOffset.x += delta.x * panFriction;
+					}
+				}
+
+				return newMainScrollPos !== undefined;
+			}
+
+		}
+
+		if(!_mainScrollAnimating) {
+			
+			if(!_mainScrollShifted) {
+				if(_currZoomLevel > self.currItem.fitRatio) {
+					_panOffset[axis] += delta[axis] * panFriction;
+				
+				}
+			}
+
+			
+		}
+		
+	},
+
+	// Pointerdown/touchstart/mousedown handler
+	_onDragStart = function(e) {
+
+		// Allow dragging only via left mouse button.
+		// As this handler is not added in IE8 - we ignore e.which
+		// 
+		// http://www.quirksmode.org/js/events_properties.html
+		// https://developer.mozilla.org/en-US/docs/Web/API/event.button
+		if(e.type === 'mousedown' && e.button > 0  ) {
+			return;
+		}
+
+		if(_initialZoomRunning) {
+			e.preventDefault();
+			return;
+		}
+
+		if(_oldAndroidTouchEndTimeout && e.type === 'mousedown') {
+			return;
+		}
+
+		if(_preventDefaultEventBehaviour(e, true)) {
+			e.preventDefault();
+		}
+
+
+
+		_shout('pointerDown');
+
+		if(_pointerEventEnabled) {
+			var pointerIndex = framework.arraySearch(_currPointers, e.pointerId, 'id');
+			if(pointerIndex < 0) {
+				pointerIndex = _currPointers.length;
+			}
+			_currPointers[pointerIndex] = {x:e.pageX, y:e.pageY, id: e.pointerId};
+		}
+		
+
+
+		var startPointsList = _getTouchPoints(e),
+			numPoints = startPointsList.length;
+
+		_currentPoints = null;
+
+		_stopAllAnimations();
+
+		// init drag
+		if(!_isDragging || numPoints === 1) {
+
+			
+
+			_isDragging = _isFirstMove = true;
+			framework.bind(window, _upMoveEvents, self);
+
+			_isZoomingIn = 
+				_wasOverInitialZoom = 
+				_opacityChanged = 
+				_verticalDragInitiated = 
+				_mainScrollShifted = 
+				_moved = 
+				_isMultitouch = 
+				_zoomStarted = false;
+
+			_direction = null;
+
+			_shout('firstTouchStart', startPointsList);
+
+			_equalizePoints(_startPanOffset, _panOffset);
+
+			_currPanDist.x = _currPanDist.y = 0;
+			_equalizePoints(_currPoint, startPointsList[0]);
+			_equalizePoints(_startPoint, _currPoint);
+
+			//_equalizePoints(_startMainScrollPos, _mainScrollPos);
+			_startMainScrollPos.x = _slideSize.x * _currPositionIndex;
+
+			_posPoints = [{
+				x: _currPoint.x,
+				y: _currPoint.y
+			}];
+
+			_gestureCheckSpeedTime = _gestureStartTime = _getCurrentTime();
+
+			//_mainScrollAnimationEnd(true);
+			_calculatePanBounds( _currZoomLevel, true );
+			
+			// Start rendering
+			_stopDragUpdateLoop();
+			_dragUpdateLoop();
+			
+		}
+
+		// init zoom
+		if(!_isZooming && numPoints > 1 && !_mainScrollAnimating && !_mainScrollShifted) {
+			_startZoomLevel = _currZoomLevel;
+			_zoomStarted = false; // true if zoom changed at least once
+
+			_isZooming = _isMultitouch = true;
+			_currPanDist.y = _currPanDist.x = 0;
+
+			_equalizePoints(_startPanOffset, _panOffset);
+
+			_equalizePoints(p, startPointsList[0]);
+			_equalizePoints(p2, startPointsList[1]);
+
+			_findCenterOfPoints(p, p2, _currCenterPoint);
+
+			_midZoomPoint.x = Math.abs(_currCenterPoint.x) - _panOffset.x;
+			_midZoomPoint.y = Math.abs(_currCenterPoint.y) - _panOffset.y;
+			_currPointsDistance = _startPointsDistance = _calculatePointsDistance(p, p2);
+		}
+
+
+	},
+
+	// Pointermove/touchmove/mousemove handler
+	_onDragMove = function(e) {
+
+		e.preventDefault();
+
+		if(_pointerEventEnabled) {
+			var pointerIndex = framework.arraySearch(_currPointers, e.pointerId, 'id');
+			if(pointerIndex > -1) {
+				var p = _currPointers[pointerIndex];
+				p.x = e.pageX;
+				p.y = e.pageY; 
+			}
+		}
+
+		if(_isDragging) {
+			var touchesList = _getTouchPoints(e);
+			if(!_direction && !_moved && !_isZooming) {
+
+				if(_mainScrollPos.x !== _slideSize.x * _currPositionIndex) {
+					// if main scroll position is shifted – direction is always horizontal
+					_direction = 'h';
+				} else {
+					var diff = Math.abs(touchesList[0].x - _currPoint.x) - Math.abs(touchesList[0].y - _currPoint.y);
+					// check the direction of movement
+					if(Math.abs(diff) >= DIRECTION_CHECK_OFFSET) {
+						_direction = diff > 0 ? 'h' : 'v';
+						_currentPoints = touchesList;
+					}
+				}
+				
+			} else {
+				_currentPoints = touchesList;
+			}
+		}	
+	},
+	// 
+	_renderMovement =  function() {
+
+		if(!_currentPoints) {
+			return;
+		}
+
+		var numPoints = _currentPoints.length;
+
+		if(numPoints === 0) {
+			return;
+		}
+
+		_equalizePoints(p, _currentPoints[0]);
+
+		delta.x = p.x - _currPoint.x;
+		delta.y = p.y - _currPoint.y;
+
+		if(_isZooming && numPoints > 1) {
+			// Handle behaviour for more than 1 point
+
+			_currPoint.x = p.x;
+			_currPoint.y = p.y;
+		
+			// check if one of two points changed
+			if( !delta.x && !delta.y && _isEqualPoints(_currentPoints[1], p2) ) {
+				return;
+			}
+
+			_equalizePoints(p2, _currentPoints[1]);
+
+
+			if(!_zoomStarted) {
+				_zoomStarted = true;
+				_shout('zoomGestureStarted');
+			}
+			
+			// Distance between two points
+			var pointsDistance = _calculatePointsDistance(p,p2);
+
+			var zoomLevel = _calculateZoomLevel(pointsDistance);
+
+			// slightly over the of initial zoom level
+			if(zoomLevel > self.currItem.initialZoomLevel + self.currItem.initialZoomLevel / 15) {
+				_wasOverInitialZoom = true;
+			}
+
+			// Apply the friction if zoom level is out of the bounds
+			var zoomFriction = 1,
+				minZoomLevel = _getMinZoomLevel(),
+				maxZoomLevel = _getMaxZoomLevel();
+
+			if ( zoomLevel < minZoomLevel ) {
+				
+				if(_options.pinchToClose && !_wasOverInitialZoom && _startZoomLevel <= self.currItem.initialZoomLevel) {
+					// fade out background if zooming out
+					var minusDiff = minZoomLevel - zoomLevel;
+					var percent = 1 - minusDiff / (minZoomLevel / 1.2);
+
+					_applyBgOpacity(percent);
+					_shout('onPinchClose', percent);
+					_opacityChanged = true;
+				} else {
+					zoomFriction = (minZoomLevel - zoomLevel) / minZoomLevel;
+					if(zoomFriction > 1) {
+						zoomFriction = 1;
+					}
+					zoomLevel = minZoomLevel - zoomFriction * (minZoomLevel / 3);
+				}
+				
+			} else if ( zoomLevel > maxZoomLevel ) {
+				// 1.5 - extra zoom level above the max. E.g. if max is x6, real max 6 + 1.5 = 7.5
+				zoomFriction = (zoomLevel - maxZoomLevel) / ( minZoomLevel * 6 );
+				if(zoomFriction > 1) {
+					zoomFriction = 1;
+				}
+				zoomLevel = maxZoomLevel + zoomFriction * minZoomLevel;
+			}
+
+			if(zoomFriction < 0) {
+				zoomFriction = 0;
+			}
+
+			// distance between touch points after friction is applied
+			_currPointsDistance = pointsDistance;
+
+			// _centerPoint - The point in the middle of two pointers
+			_findCenterOfPoints(p, p2, _centerPoint);
+		
+			// paning with two pointers pressed
+			_currPanDist.x += _centerPoint.x - _currCenterPoint.x;
+			_currPanDist.y += _centerPoint.y - _currCenterPoint.y;
+			_equalizePoints(_currCenterPoint, _centerPoint);
+
+			_panOffset.x = _calculatePanOffset('x', zoomLevel);
+			_panOffset.y = _calculatePanOffset('y', zoomLevel);
+
+			_isZoomingIn = zoomLevel > _currZoomLevel;
+			_currZoomLevel = zoomLevel;
+			_applyCurrentZoomPan();
+
+		} else {
+
+			// handle behaviour for one point (dragging or panning)
+
+			if(!_direction) {
+				return;
+			}
+
+			if(_isFirstMove) {
+				_isFirstMove = false;
+
+				// subtract drag distance that was used during the detection direction  
+
+				if( Math.abs(delta.x) >= DIRECTION_CHECK_OFFSET) {
+					delta.x -= _currentPoints[0].x - _startPoint.x;
+				}
+				
+				if( Math.abs(delta.y) >= DIRECTION_CHECK_OFFSET) {
+					delta.y -= _currentPoints[0].y - _startPoint.y;
+				}
+			}
+
+			_currPoint.x = p.x;
+			_currPoint.y = p.y;
+
+			// do nothing if pointers position hasn't changed
+			if(delta.x === 0 && delta.y === 0) {
+				return;
+			}
+
+			if(_direction === 'v' && _options.closeOnVerticalDrag) {
+				if(!_canPan()) {
+					_currPanDist.y += delta.y;
+					_panOffset.y += delta.y;
+
+					var opacityRatio = _calculateVerticalDragOpacityRatio();
+
+					_verticalDragInitiated = true;
+					_shout('onVerticalDrag', opacityRatio);
+
+					_applyBgOpacity(opacityRatio);
+					_applyCurrentZoomPan();
+					return ;
+				}
+			}
+
+			_pushPosPoint(_getCurrentTime(), p.x, p.y);
+
+			_moved = true;
+			_currPanBounds = self.currItem.bounds;
+			
+			var mainScrollChanged = _panOrMoveMainScroll('x', delta);
+			if(!mainScrollChanged) {
+				_panOrMoveMainScroll('y', delta);
+
+				_roundPoint(_panOffset);
+				_applyCurrentZoomPan();
+			}
+
+		}
+
+	},
+	
+	// Pointerup/pointercancel/touchend/touchcancel/mouseup event handler
+	_onDragRelease = function(e) {
+
+		if(_features.isOldAndroid ) {
+
+			if(_oldAndroidTouchEndTimeout && e.type === 'mouseup') {
+				return;
+			}
+
+			// on Android (v4.1, 4.2, 4.3 & possibly older) 
+			// ghost mousedown/up event isn't preventable via e.preventDefault,
+			// which causes fake mousedown event
+			// so we block mousedown/up for 600ms
+			if( e.type.indexOf('touch') > -1 ) {
+				clearTimeout(_oldAndroidTouchEndTimeout);
+				_oldAndroidTouchEndTimeout = setTimeout(function() {
+					_oldAndroidTouchEndTimeout = 0;
+				}, 600);
+			}
+			
+		}
+
+		_shout('pointerUp');
+
+		if(_preventDefaultEventBehaviour(e, false)) {
+			e.preventDefault();
+		}
+
+		var releasePoint;
+
+		if(_pointerEventEnabled) {
+			var pointerIndex = framework.arraySearch(_currPointers, e.pointerId, 'id');
+			
+			if(pointerIndex > -1) {
+				releasePoint = _currPointers.splice(pointerIndex, 1)[0];
+
+				if(navigator.pointerEnabled) {
+					releasePoint.type = e.pointerType || 'mouse';
+				} else {
+					var MSPOINTER_TYPES = {
+						4: 'mouse', // event.MSPOINTER_TYPE_MOUSE
+						2: 'touch', // event.MSPOINTER_TYPE_TOUCH 
+						3: 'pen' // event.MSPOINTER_TYPE_PEN
+					};
+					releasePoint.type = MSPOINTER_TYPES[e.pointerType];
+
+					if(!releasePoint.type) {
+						releasePoint.type = e.pointerType || 'mouse';
+					}
+				}
+
+			}
+		}
+
+		var touchList = _getTouchPoints(e),
+			gestureType,
+			numPoints = touchList.length;
+
+		if(e.type === 'mouseup') {
+			numPoints = 0;
+		}
+
+		// Do nothing if there were 3 touch points or more
+		if(numPoints === 2) {
+			_currentPoints = null;
+			return true;
+		}
+
+		// if second pointer released
+		if(numPoints === 1) {
+			_equalizePoints(_startPoint, touchList[0]);
+		}				
+
+
+		// pointer hasn't moved, send "tap release" point
+		if(numPoints === 0 && !_direction && !_mainScrollAnimating) {
+			if(!releasePoint) {
+				if(e.type === 'mouseup') {
+					releasePoint = {x: e.pageX, y: e.pageY, type:'mouse'};
+				} else if(e.changedTouches && e.changedTouches[0]) {
+					releasePoint = {x: e.changedTouches[0].pageX, y: e.changedTouches[0].pageY, type:'touch'};
+				}		
+			}
+
+			_shout('touchRelease', e, releasePoint);
+		}
+
+		// Difference in time between releasing of two last touch points (zoom gesture)
+		var releaseTimeDiff = -1;
+
+		// Gesture completed, no pointers left
+		if(numPoints === 0) {
+			_isDragging = false;
+			framework.unbind(window, _upMoveEvents, self);
+
+			_stopDragUpdateLoop();
+
+			if(_isZooming) {
+				// Two points released at the same time
+				releaseTimeDiff = 0;
+			} else if(_lastReleaseTime !== -1) {
+				releaseTimeDiff = _getCurrentTime() - _lastReleaseTime;
+			}
+		}
+		_lastReleaseTime = numPoints === 1 ? _getCurrentTime() : -1;
+		
+		if(releaseTimeDiff !== -1 && releaseTimeDiff < 150) {
+			gestureType = 'zoom';
+		} else {
+			gestureType = 'swipe';
+		}
+
+		if(_isZooming && numPoints < 2) {
+			_isZooming = false;
+
+			// Only second point released
+			if(numPoints === 1) {
+				gestureType = 'zoomPointerUp';
+			}
+			_shout('zoomGestureEnded');
+		}
+
+		_currentPoints = null;
+		if(!_moved && !_zoomStarted && !_mainScrollAnimating && !_verticalDragInitiated) {
+			// nothing to animate
+			return;
+		}
+	
+		_stopAllAnimations();
+
+		
+		if(!_releaseAnimData) {
+			_releaseAnimData = _initDragReleaseAnimationData();
+		}
+		
+		_releaseAnimData.calculateSwipeSpeed('x');
+
+
+		if(_verticalDragInitiated) {
+
+			var opacityRatio = _calculateVerticalDragOpacityRatio();
+
+			if(opacityRatio < _options.verticalDragRange) {
+				self.close();
+			} else {
+				var initalPanY = _panOffset.y,
+					initialBgOpacity = _bgOpacity;
+
+				_animateProp('verticalDrag', 0, 1, 300, framework.easing.cubic.out, function(now) {
+					
+					_panOffset.y = (self.currItem.initialPosition.y - initalPanY) * now + initalPanY;
+
+					_applyBgOpacity(  (1 - initialBgOpacity) * now + initialBgOpacity );
+					_applyCurrentZoomPan();
+				});
+
+				_shout('onVerticalDrag', 1);
+			}
+
+			return;
+		}
+
+
+		// main scroll 
+		if(  (_mainScrollShifted || _mainScrollAnimating) && numPoints === 0) {
+			var itemChanged = _finishSwipeMainScrollGesture(gestureType, _releaseAnimData);
+			if(itemChanged) {
+				return;
+			}
+			gestureType = 'zoomPointerUp';
+		}
+
+		// prevent zoom/pan animation when main scroll animation runs
+		if(_mainScrollAnimating) {
+			return;
+		}
+		
+		// Complete simple zoom gesture (reset zoom level if it's out of the bounds)  
+		if(gestureType !== 'swipe') {
+			_completeZoomGesture();
+			return;
+		}
+	
+		// Complete pan gesture if main scroll is not shifted, and it's possible to pan current image
+		if(!_mainScrollShifted && _currZoomLevel > self.currItem.fitRatio) {
+			_completePanGesture(_releaseAnimData);
+		}
+	},
+
+
+	// Returns object with data about gesture
+	// It's created only once and then reused
+	_initDragReleaseAnimationData  = function() {
+		// temp local vars
+		var lastFlickDuration,
+			tempReleasePos;
+
+		// s = this
+		var s = {
+			lastFlickOffset: {},
+			lastFlickDist: {},
+			lastFlickSpeed: {},
+			slowDownRatio:  {},
+			slowDownRatioReverse:  {},
+			speedDecelerationRatio:  {},
+			speedDecelerationRatioAbs:  {},
+			distanceOffset:  {},
+			backAnimDestination: {},
+			backAnimStarted: {},
+			calculateSwipeSpeed: function(axis) {
+				
+
+				if( _posPoints.length > 1) {
+					lastFlickDuration = _getCurrentTime() - _gestureCheckSpeedTime + 50;
+					tempReleasePos = _posPoints[_posPoints.length-2][axis];
+				} else {
+					lastFlickDuration = _getCurrentTime() - _gestureStartTime; // total gesture duration
+					tempReleasePos = _startPoint[axis];
+				}
+				s.lastFlickOffset[axis] = _currPoint[axis] - tempReleasePos;
+				s.lastFlickDist[axis] = Math.abs(s.lastFlickOffset[axis]);
+				if(s.lastFlickDist[axis] > 20) {
+					s.lastFlickSpeed[axis] = s.lastFlickOffset[axis] / lastFlickDuration;
+				} else {
+					s.lastFlickSpeed[axis] = 0;
+				}
+				if( Math.abs(s.lastFlickSpeed[axis]) < 0.1 ) {
+					s.lastFlickSpeed[axis] = 0;
+				}
+				
+				s.slowDownRatio[axis] = 0.95;
+				s.slowDownRatioReverse[axis] = 1 - s.slowDownRatio[axis];
+				s.speedDecelerationRatio[axis] = 1;
+			},
+
+			calculateOverBoundsAnimOffset: function(axis, speed) {
+				if(!s.backAnimStarted[axis]) {
+
+					if(_panOffset[axis] > _currPanBounds.min[axis]) {
+						s.backAnimDestination[axis] = _currPanBounds.min[axis];
+						
+					} else if(_panOffset[axis] < _currPanBounds.max[axis]) {
+						s.backAnimDestination[axis] = _currPanBounds.max[axis];
+					}
+
+					if(s.backAnimDestination[axis] !== undefined) {
+						s.slowDownRatio[axis] = 0.7;
+						s.slowDownRatioReverse[axis] = 1 - s.slowDownRatio[axis];
+						if(s.speedDecelerationRatioAbs[axis] < 0.05) {
+
+							s.lastFlickSpeed[axis] = 0;
+							s.backAnimStarted[axis] = true;
+
+							_animateProp('bounceZoomPan'+axis,_panOffset[axis], 
+								s.backAnimDestination[axis], 
+								speed || 300, 
+								framework.easing.sine.out, 
+								function(pos) {
+									_panOffset[axis] = pos;
+									_applyCurrentZoomPan();
+								}
+							);
+
+						}
+					}
+				}
+			},
+
+			// Reduces the speed by slowDownRatio (per 10ms)
+			calculateAnimOffset: function(axis) {
+				if(!s.backAnimStarted[axis]) {
+					s.speedDecelerationRatio[axis] = s.speedDecelerationRatio[axis] * (s.slowDownRatio[axis] + 
+												s.slowDownRatioReverse[axis] - 
+												s.slowDownRatioReverse[axis] * s.timeDiff / 10);
+
+					s.speedDecelerationRatioAbs[axis] = Math.abs(s.lastFlickSpeed[axis] * s.speedDecelerationRatio[axis]);
+					s.distanceOffset[axis] = s.lastFlickSpeed[axis] * s.speedDecelerationRatio[axis] * s.timeDiff;
+					_panOffset[axis] += s.distanceOffset[axis];
+
+				}
+			},
+
+			panAnimLoop: function() {
+				if ( _animations.zoomPan ) {
+					_animations.zoomPan.raf = _requestAF(s.panAnimLoop);
+
+					s.now = _getCurrentTime();
+					s.timeDiff = s.now - s.lastNow;
+					s.lastNow = s.now;
+					
+					s.calculateAnimOffset('x');
+					s.calculateAnimOffset('y');
+
+					_applyCurrentZoomPan();
+					
+					s.calculateOverBoundsAnimOffset('x');
+					s.calculateOverBoundsAnimOffset('y');
+
+
+					if (s.speedDecelerationRatioAbs.x < 0.05 && s.speedDecelerationRatioAbs.y < 0.05) {
+
+						// round pan position
+						_panOffset.x = Math.round(_panOffset.x);
+						_panOffset.y = Math.round(_panOffset.y);
+						_applyCurrentZoomPan();
+						
+						_stopAnimation('zoomPan');
+						return;
+					}
+				}
+
+			}
+		};
+		return s;
+	},
+
+	_completePanGesture = function(animData) {
+		// calculate swipe speed for Y axis (paanning)
+		animData.calculateSwipeSpeed('y');
+
+		_currPanBounds = self.currItem.bounds;
+		
+		animData.backAnimDestination = {};
+		animData.backAnimStarted = {};
+
+		// Avoid acceleration animation if speed is too low
+		if(Math.abs(animData.lastFlickSpeed.x) <= 0.05 && Math.abs(animData.lastFlickSpeed.y) <= 0.05 ) {
+			animData.speedDecelerationRatioAbs.x = animData.speedDecelerationRatioAbs.y = 0;
+
+			// Run pan drag release animation. E.g. if you drag image and release finger without momentum.
+			animData.calculateOverBoundsAnimOffset('x');
+			animData.calculateOverBoundsAnimOffset('y');
+			return true;
+		}
+
+		// Animation loop that controls the acceleration after pan gesture ends
+		_registerStartAnimation('zoomPan');
+		animData.lastNow = _getCurrentTime();
+		animData.panAnimLoop();
+	},
+
+
+	_finishSwipeMainScrollGesture = function(gestureType, _releaseAnimData) {
+		var itemChanged;
+		if(!_mainScrollAnimating) {
+			_currZoomedItemIndex = _currentItemIndex;
+		}
+
+
+		
+		var itemsDiff;
+
+		if(gestureType === 'swipe') {
+			var totalShiftDist = _currPoint.x - _startPoint.x,
+				isFastLastFlick = _releaseAnimData.lastFlickDist.x < 10;
+
+			// if container is shifted for more than MIN_SWIPE_DISTANCE, 
+			// and last flick gesture was in right direction
+			if(totalShiftDist > MIN_SWIPE_DISTANCE && 
+				(isFastLastFlick || _releaseAnimData.lastFlickOffset.x > 20) ) {
+				// go to prev item
+				itemsDiff = -1;
+			} else if(totalShiftDist < -MIN_SWIPE_DISTANCE && 
+				(isFastLastFlick || _releaseAnimData.lastFlickOffset.x < -20) ) {
+				// go to next item
+				itemsDiff = 1;
+			}
+		}
+
+		var nextCircle;
+
+		if(itemsDiff) {
+			
+			_currentItemIndex += itemsDiff;
+
+			if(_currentItemIndex < 0) {
+				_currentItemIndex = _options.loop ? _getNumItems()-1 : 0;
+				nextCircle = true;
+			} else if(_currentItemIndex >= _getNumItems()) {
+				_currentItemIndex = _options.loop ? 0 : _getNumItems()-1;
+				nextCircle = true;
+			}
+
+			if(!nextCircle || _options.loop) {
+				_indexDiff += itemsDiff;
+				_currPositionIndex -= itemsDiff;
+				itemChanged = true;
+			}
+			
+
+			
+		}
+
+		var animateToX = _slideSize.x * _currPositionIndex;
+		var animateToDist = Math.abs( animateToX - _mainScrollPos.x );
+		var finishAnimDuration;
+
+
+		if(!itemChanged && animateToX > _mainScrollPos.x !== _releaseAnimData.lastFlickSpeed.x > 0) {
+			// "return to current" duration, e.g. when dragging from slide 0 to -1
+			finishAnimDuration = 333; 
+		} else {
+			finishAnimDuration = Math.abs(_releaseAnimData.lastFlickSpeed.x) > 0 ? 
+									animateToDist / Math.abs(_releaseAnimData.lastFlickSpeed.x) : 
+									333;
+
+			finishAnimDuration = Math.min(finishAnimDuration, 400);
+			finishAnimDuration = Math.max(finishAnimDuration, 250);
+		}
+
+		if(_currZoomedItemIndex === _currentItemIndex) {
+			itemChanged = false;
+		}
+		
+		_mainScrollAnimating = true;
+		
+		_shout('mainScrollAnimStart');
+
+		_animateProp('mainScroll', _mainScrollPos.x, animateToX, finishAnimDuration, framework.easing.cubic.out, 
+			_moveMainScroll,
+			function() {
+				_stopAllAnimations();
+				_mainScrollAnimating = false;
+				_currZoomedItemIndex = -1;
+				
+				if(itemChanged || _currZoomedItemIndex !== _currentItemIndex) {
+					self.updateCurrItem();
+				}
+				
+				_shout('mainScrollAnimComplete');
+			}
+		);
+
+		if(itemChanged) {
+			self.updateCurrItem(true);
+		}
+
+		return itemChanged;
+	},
+
+	_calculateZoomLevel = function(touchesDistance) {
+		return  1 / _startPointsDistance * touchesDistance * _startZoomLevel;
+	},
+
+	// Resets zoom if it's out of bounds
+	_completeZoomGesture = function() {
+		var destZoomLevel = _currZoomLevel,
+			minZoomLevel = _getMinZoomLevel(),
+			maxZoomLevel = _getMaxZoomLevel();
+
+		if ( _currZoomLevel < minZoomLevel ) {
+			destZoomLevel = minZoomLevel;
+		} else if ( _currZoomLevel > maxZoomLevel ) {
+			destZoomLevel = maxZoomLevel;
+		}
+
+		var destOpacity = 1,
+			onUpdate,
+			initialOpacity = _bgOpacity;
+
+		if(_opacityChanged && !_isZoomingIn && !_wasOverInitialZoom && _currZoomLevel < minZoomLevel) {
+			//_closedByScroll = true;
+			self.close();
+			return true;
+		}
+
+		if(_opacityChanged) {
+			onUpdate = function(now) {
+				_applyBgOpacity(  (destOpacity - initialOpacity) * now + initialOpacity );
+			};
+		}
+
+		self.zoomTo(destZoomLevel, 0, 200,  framework.easing.cubic.out, onUpdate);
+		return true;
+	};
+
+
+_registerModule('Gestures', {
+	publicMethods: {
+
+		initGestures: function() {
+
+			// helper function that builds touch/pointer/mouse events
+			var addEventNames = function(pref, down, move, up, cancel) {
+				_dragStartEvent = pref + down;
+				_dragMoveEvent = pref + move;
+				_dragEndEvent = pref + up;
+				if(cancel) {
+					_dragCancelEvent = pref + cancel;
+				} else {
+					_dragCancelEvent = '';
+				}
+			};
+
+			_pointerEventEnabled = _features.pointerEvent;
+			if(_pointerEventEnabled && _features.touch) {
+				// we don't need touch events, if browser supports pointer events
+				_features.touch = false;
+			}
+
+			if(_pointerEventEnabled) {
+				if(navigator.pointerEnabled) {
+					addEventNames('pointer', 'down', 'move', 'up', 'cancel');
+				} else {
+					// IE10 pointer events are case-sensitive
+					addEventNames('MSPointer', 'Down', 'Move', 'Up', 'Cancel');
+				}
+			} else if(_features.touch) {
+				addEventNames('touch', 'start', 'move', 'end', 'cancel');
+				_likelyTouchDevice = true;
+			} else {
+				addEventNames('mouse', 'down', 'move', 'up');	
+			}
+
+			_upMoveEvents = _dragMoveEvent + ' ' + _dragEndEvent  + ' ' +  _dragCancelEvent;
+			_downEvents = _dragStartEvent;
+
+			if(_pointerEventEnabled && !_likelyTouchDevice) {
+				_likelyTouchDevice = (navigator.maxTouchPoints > 1) || (navigator.msMaxTouchPoints > 1);
+			}
+			// make variable public
+			self.likelyTouchDevice = _likelyTouchDevice; 
+			
+			_globalEventHandlers[_dragStartEvent] = _onDragStart;
+			_globalEventHandlers[_dragMoveEvent] = _onDragMove;
+			_globalEventHandlers[_dragEndEvent] = _onDragRelease; // the Kraken
+
+			if(_dragCancelEvent) {
+				_globalEventHandlers[_dragCancelEvent] = _globalEventHandlers[_dragEndEvent];
+			}
+
+			// Bind mouse events on device with detected hardware touch support, in case it supports multiple types of input.
+			if(_features.touch) {
+				_downEvents += ' mousedown';
+				_upMoveEvents += ' mousemove mouseup';
+				_globalEventHandlers.mousedown = _globalEventHandlers[_dragStartEvent];
+				_globalEventHandlers.mousemove = _globalEventHandlers[_dragMoveEvent];
+				_globalEventHandlers.mouseup = _globalEventHandlers[_dragEndEvent];
+			}
+
+			if(!_likelyTouchDevice) {
+				// don't allow pan to next slide from zoomed state on Desktop
+				_options.allowPanToNext = false;
+			}
+		}
+
+	}
+});
+
+
+/*>>gestures*/
+
+/*>>show-hide-transition*/
+/**
+ * show-hide-transition.js:
+ *
+ * Manages initial opening or closing transition.
+ *
+ * If you're not planning to use transition for gallery at all,
+ * you may set options hideAnimationDuration and showAnimationDuration to 0,
+ * and just delete startAnimation function.
+ * 
+ */
+
+
+var _showOrHideTimeout,
+	_showOrHide = function(item, img, out, completeFn) {
+
+		if(_showOrHideTimeout) {
+			clearTimeout(_showOrHideTimeout);
+		}
+
+		_initialZoomRunning = true;
+		_initialContentSet = true;
+		
+		// dimensions of small thumbnail {x:,y:,w:}.
+		// Height is optional, as calculated based on large image.
+		var thumbBounds; 
+		if(item.initialLayout) {
+			thumbBounds = item.initialLayout;
+			item.initialLayout = null;
+		} else {
+			thumbBounds = _options.getThumbBoundsFn && _options.getThumbBoundsFn(_currentItemIndex);
+		}
+
+		var duration = out ? _options.hideAnimationDuration : _options.showAnimationDuration;
+
+		var onComplete = function() {
+			_stopAnimation('initialZoom');
+			if(!out) {
+				_applyBgOpacity(1);
+				if(img) {
+					img.style.display = 'block';
+				}
+				framework.addClass(template, 'pswp--animated-in');
+				_shout('initialZoom' + (out ? 'OutEnd' : 'InEnd'));
+			} else {
+				self.template.removeAttribute('style');
+				self.bg.removeAttribute('style');
+			}
+
+			if(completeFn) {
+				completeFn();
+			}
+			_initialZoomRunning = false;
+		};
+
+		// if bounds aren't provided, just open gallery without animation
+		if(!duration || !thumbBounds || thumbBounds.x === undefined) {
+
+			_shout('initialZoom' + (out ? 'Out' : 'In') );
+
+			_currZoomLevel = item.initialZoomLevel;
+			_equalizePoints(_panOffset,  item.initialPosition );
+			_applyCurrentZoomPan();
+
+			template.style.opacity = out ? 0 : 1;
+			_applyBgOpacity(1);
+
+			if(duration) {
+				setTimeout(function() {
+					onComplete();
+				}, duration);
+			} else {
+				onComplete();
+			}
+
+			return;
+		}
+
+		var startAnimation = function() {
+			var closeWithRaf = _closedByScroll,
+				fadeEverything = !self.currItem.src || self.currItem.loadError || _options.showHideOpacity;
+			
+			// apply hw-acceleration to image
+			if(item.miniImg) {
+				item.miniImg.style.webkitBackfaceVisibility = 'hidden';
+			}
+
+			if(!out) {
+				_currZoomLevel = thumbBounds.w / item.w;
+				_panOffset.x = thumbBounds.x;
+				_panOffset.y = thumbBounds.y - _initalWindowScrollY;
+
+				self[fadeEverything ? 'template' : 'bg'].style.opacity = 0.001;
+				_applyCurrentZoomPan();
+			}
+
+			_registerStartAnimation('initialZoom');
+			
+			if(out && !closeWithRaf) {
+				framework.removeClass(template, 'pswp--animated-in');
+			}
+
+			if(fadeEverything) {
+				if(out) {
+					framework[ (closeWithRaf ? 'remove' : 'add') + 'Class' ](template, 'pswp--animate_opacity');
+				} else {
+					setTimeout(function() {
+						framework.addClass(template, 'pswp--animate_opacity');
+					}, 30);
+				}
+			}
+
+			_showOrHideTimeout = setTimeout(function() {
+
+				_shout('initialZoom' + (out ? 'Out' : 'In') );
+				
+
+				if(!out) {
+
+					// "in" animation always uses CSS transitions (instead of rAF).
+					// CSS transition work faster here, 
+					// as developer may also want to animate other things, 
+					// like ui on top of sliding area, which can be animated just via CSS
+					
+					_currZoomLevel = item.initialZoomLevel;
+					_equalizePoints(_panOffset,  item.initialPosition );
+					_applyCurrentZoomPan();
+					_applyBgOpacity(1);
+
+					if(fadeEverything) {
+						template.style.opacity = 1;
+					} else {
+						_applyBgOpacity(1);
+					}
+
+					_showOrHideTimeout = setTimeout(onComplete, duration + 20);
+				} else {
+
+					// "out" animation uses rAF only when PhotoSwipe is closed by browser scroll, to recalculate position
+					var destZoomLevel = thumbBounds.w / item.w,
+						initialPanOffset = {
+							x: _panOffset.x,
+							y: _panOffset.y
+						},
+						initialZoomLevel = _currZoomLevel,
+						initalBgOpacity = _bgOpacity,
+						onUpdate = function(now) {
+							
+							if(now === 1) {
+								_currZoomLevel = destZoomLevel;
+								_panOffset.x = thumbBounds.x;
+								_panOffset.y = thumbBounds.y  - _currentWindowScrollY;
+							} else {
+								_currZoomLevel = (destZoomLevel - initialZoomLevel) * now + initialZoomLevel;
+								_panOffset.x = (thumbBounds.x - initialPanOffset.x) * now + initialPanOffset.x;
+								_panOffset.y = (thumbBounds.y - _currentWindowScrollY - initialPanOffset.y) * now + initialPanOffset.y;
+							}
+							
+							_applyCurrentZoomPan();
+							if(fadeEverything) {
+								template.style.opacity = 1 - now;
+							} else {
+								_applyBgOpacity( initalBgOpacity - now * initalBgOpacity );
+							}
+						};
+
+					if(closeWithRaf) {
+						_animateProp('initialZoom', 0, 1, duration, framework.easing.cubic.out, onUpdate, onComplete);
+					} else {
+						onUpdate(1);
+						_showOrHideTimeout = setTimeout(onComplete, duration + 20);
+					}
+				}
+			
+			}, out ? 25 : 90); // Main purpose of this delay is to give browser time to paint and
+					// create composite layers of PhotoSwipe UI parts (background, controls, caption, arrows).
+					// Which avoids lag at the beginning of scale transition.
+		};
+		startAnimation();
+
+		
+	};
+
+/*>>show-hide-transition*/
+
+/*>>items-controller*/
+/**
+*
+* Controller manages gallery items, their dimensions, and their content.
+* 
+*/
+
+var _items,
+	_tempPanAreaSize = {},
+	_imagesToAppendPool = [],
+	_initialContentSet,
+	_initialZoomRunning,
+	_controllerDefaultOptions = {
+		index: 0,
+		errorMsg: '<div class="pswp__error-msg"><a href="%url%" target="_blank">The image</a> could not be loaded.</div>',
+		forceProgressiveLoading: false, // TODO
+		preload: [1,1],
+		getNumItemsFn: function() {
+			return _items.length;
+		}
+	};
+
+
+var _getItemAt,
+	_getNumItems,
+	_initialIsLoop,
+	_getZeroBounds = function() {
+		return {
+			center:{x:0,y:0}, 
+			max:{x:0,y:0}, 
+			min:{x:0,y:0}
+		};
+	},
+	_calculateSingleItemPanBounds = function(item, realPanElementW, realPanElementH ) {
+		var bounds = item.bounds;
+
+		// position of element when it's centered
+		bounds.center.x = Math.round((_tempPanAreaSize.x - realPanElementW) / 2);
+		bounds.center.y = Math.round((_tempPanAreaSize.y - realPanElementH) / 2) + item.vGap.top;
+
+		// maximum pan position
+		bounds.max.x = (realPanElementW > _tempPanAreaSize.x) ? 
+							Math.round(_tempPanAreaSize.x - realPanElementW) : 
+							bounds.center.x;
+		
+		bounds.max.y = (realPanElementH > _tempPanAreaSize.y) ? 
+							Math.round(_tempPanAreaSize.y - realPanElementH) + item.vGap.top : 
+							bounds.center.y;
+		
+		// minimum pan position
+		bounds.min.x = (realPanElementW > _tempPanAreaSize.x) ? 0 : bounds.center.x;
+		bounds.min.y = (realPanElementH > _tempPanAreaSize.y) ? item.vGap.top : bounds.center.y;
+	},
+	_calculateItemSize = function(item, viewportSize, zoomLevel) {
+
+		if (item.src && !item.loadError) {
+			var isInitial = !zoomLevel;
+			
+			if(isInitial) {
+				if(!item.vGap) {
+					item.vGap = {top:0,bottom:0};
+				}
+				// allows overriding vertical margin for individual items
+				_shout('parseVerticalMargin', item);
+			}
+
+
+			_tempPanAreaSize.x = viewportSize.x;
+			_tempPanAreaSize.y = viewportSize.y - item.vGap.top - item.vGap.bottom;
+
+			if (isInitial) {
+				var hRatio = _tempPanAreaSize.x / item.w;
+				var vRatio = _tempPanAreaSize.y / item.h;
+
+				item.fitRatio = hRatio < vRatio ? hRatio : vRatio;
+				//item.fillRatio = hRatio > vRatio ? hRatio : vRatio;
+
+				var scaleMode = _options.scaleMode;
+
+				if (scaleMode === 'orig') {
+					zoomLevel = 1;
+				} else if (scaleMode === 'fit') {
+					zoomLevel = item.fitRatio;
+				}
+
+				if (zoomLevel > 1) {
+					zoomLevel = 1;
+				}
+
+				item.initialZoomLevel = zoomLevel;
+				
+				if(!item.bounds) {
+					// reuse bounds object
+					item.bounds = _getZeroBounds(); 
+				}
+			}
+
+			if(!zoomLevel) {
+				return;
+			}
+
+			_calculateSingleItemPanBounds(item, item.w * zoomLevel, item.h * zoomLevel);
+
+			if (isInitial && zoomLevel === item.initialZoomLevel) {
+				item.initialPosition = item.bounds.center;
+			}
+
+			return item.bounds;
+		} else {
+			item.w = item.h = 0;
+			item.initialZoomLevel = item.fitRatio = 1;
+			item.bounds = _getZeroBounds();
+			item.initialPosition = item.bounds.center;
+
+			// if it's not image, we return zero bounds (content is not zoomable)
+			return item.bounds;
+		}
+		
+	},
+
+	
+
+
+	_appendImage = function(index, item, baseDiv, img, preventAnimation, keepPlaceholder) {
+		
+
+		if(item.loadError) {
+			return;
+		}
+
+		if(img) {
+
+			item.imageAppended = true;
+			_setImageSize(item, img, (item === self.currItem && _renderMaxResolution) );
+			
+			baseDiv.appendChild(img);
+
+			if(keepPlaceholder) {
+				setTimeout(function() {
+					if(item && item.loaded && item.placeholder) {
+						item.placeholder.style.display = 'none';
+						item.placeholder = null;
+					}
+				}, 500);
+			}
+		}
+	},
+	
+
+
+	_preloadImage = function(item) {
+		item.loading = true;
+		item.loaded = false;
+		var img = item.img = framework.createEl('pswp__img', 'img');
+		var onComplete = function() {
+			item.loading = false;
+			item.loaded = true;
+
+			if(item.loadComplete) {
+				item.loadComplete(item);
+			} else {
+				item.img = null; // no need to store image object
+			}
+			img.onload = img.onerror = null;
+			img = null;
+		};
+		img.onload = onComplete;
+		img.onerror = function() {
+			item.loadError = true;
+			onComplete();
+		};		
+
+		img.src = item.src;// + '?a=' + Math.random();
+
+		return img;
+	},
+	_checkForError = function(item, cleanUp) {
+		if(item.src && item.loadError && item.container) {
+
+			if(cleanUp) {
+				item.container.innerHTML = '';
+			}
+
+			item.container.innerHTML = _options.errorMsg.replace('%url%',  item.src );
+			return true;
+			
+		}
+	},
+	_setImageSize = function(item, img, maxRes) {
+		if(!item.src) {
+			return;
+		}
+
+		if(!img) {
+			img = item.container.lastChild;
+		}
+
+		var w = maxRes ? item.w : Math.round(item.w * item.fitRatio),
+			h = maxRes ? item.h : Math.round(item.h * item.fitRatio);
+		
+		if(item.placeholder && !item.loaded) {
+			item.placeholder.style.width = w + 'px';
+			item.placeholder.style.height = h + 'px';
+		}
+
+		img.style.width = w + 'px';
+		img.style.height = h + 'px';
+	},
+	_appendImagesPool = function() {
+
+		if(_imagesToAppendPool.length) {
+			var poolItem;
+
+			for(var i = 0; i < _imagesToAppendPool.length; i++) {
+				poolItem = _imagesToAppendPool[i];
+				if( poolItem.holder.index === poolItem.index ) {
+					_appendImage(poolItem.index, poolItem.item, poolItem.baseDiv, poolItem.img, false, poolItem.clearPlaceholder);
+				}
+			}
+			_imagesToAppendPool = [];
+		}
+	};
+	
+
+
+_registerModule('Controller', {
+
+	publicMethods: {
+
+		lazyLoadItem: function(index) {
+			index = _getLoopedId(index);
+			var item = _getItemAt(index);
+
+			if(!item || ((item.loaded || item.loading) && !_itemsNeedUpdate)) {
+				return;
+			}
+
+			_shout('gettingData', index, item);
+
+			if (!item.src) {
+				return;
+			}
+
+			_preloadImage(item);
+		},
+		initController: function() {
+			framework.extend(_options, _controllerDefaultOptions, true);
+			self.items = _items = items;
+			_getItemAt = self.getItemAt;
+			_getNumItems = _options.getNumItemsFn; //self.getNumItems;
+
+
+
+			_initialIsLoop = _options.loop;
+			if(_getNumItems() < 3) {
+				_options.loop = false; // disable loop if less then 3 items
+			}
+
+			_listen('beforeChange', function(diff) {
+
+				var p = _options.preload,
+					isNext = diff === null ? true : (diff >= 0),
+					preloadBefore = Math.min(p[0], _getNumItems() ),
+					preloadAfter = Math.min(p[1], _getNumItems() ),
+					i;
+
+
+				for(i = 1; i <= (isNext ? preloadAfter : preloadBefore); i++) {
+					self.lazyLoadItem(_currentItemIndex+i);
+				}
+				for(i = 1; i <= (isNext ? preloadBefore : preloadAfter); i++) {
+					self.lazyLoadItem(_currentItemIndex-i);
+				}
+			});
+
+			_listen('initialLayout', function() {
+				self.currItem.initialLayout = _options.getThumbBoundsFn && _options.getThumbBoundsFn(_currentItemIndex);
+			});
+
+			_listen('mainScrollAnimComplete', _appendImagesPool);
+			_listen('initialZoomInEnd', _appendImagesPool);
+
+
+
+			_listen('destroy', function() {
+				var item;
+				for(var i = 0; i < _items.length; i++) {
+					item = _items[i];
+					// remove reference to DOM elements, for GC
+					if(item.container) {
+						item.container = null; 
+					}
+					if(item.placeholder) {
+						item.placeholder = null;
+					}
+					if(item.img) {
+						item.img = null;
+					}
+					if(item.preloader) {
+						item.preloader = null;
+					}
+					if(item.loadError) {
+						item.loaded = item.loadError = false;
+					}
+				}
+				_imagesToAppendPool = null;
+			});
+		},
+
+
+		getItemAt: function(index) {
+			if (index >= 0) {
+				return _items[index] !== undefined ? _items[index] : false;
+			}
+			return false;
+		},
+
+		allowProgressiveImg: function() {
+			// 1. Progressive image loading isn't working on webkit/blink 
+			//    when hw-acceleration (e.g. translateZ) is applied to IMG element.
+			//    That's why in PhotoSwipe parent element gets zoom transform, not image itself.
+			//    
+			// 2. Progressive image loading sometimes blinks in webkit/blink when applying animation to parent element.
+			//    That's why it's disabled on touch devices (mainly because of swipe transition)
+			//    
+			// 3. Progressive image loading sometimes doesn't work in IE (up to 11).
+
+			// Don't allow progressive loading on non-large touch devices
+			return _options.forceProgressiveLoading || !_likelyTouchDevice || _options.mouseUsed || screen.width > 1200; 
+			// 1200 - to eliminate touch devices with large screen (like Chromebook Pixel)
+		},
+
+		setContent: function(holder, index) {
+
+			if(_options.loop) {
+				index = _getLoopedId(index);
+			}
+
+			var prevItem = self.getItemAt(holder.index);
+			if(prevItem) {
+				prevItem.container = null;
+			}
+	
+			var item = self.getItemAt(index),
+				img;
+			
+			if(!item) {
+				holder.el.innerHTML = '';
+				return;
+			}
+
+			// allow to override data
+			_shout('gettingData', index, item);
+
+			holder.index = index;
+			holder.item = item;
+
+			// base container DIV is created only once for each of 3 holders
+			var baseDiv = item.container = framework.createEl('pswp__zoom-wrap'); 
+
+			
+
+			if(!item.src && item.html) {
+				if(item.html.tagName) {
+					baseDiv.appendChild(item.html);
+				} else {
+					baseDiv.innerHTML = item.html;
+				}
+			}
+
+			_checkForError(item);
+
+			_calculateItemSize(item, _viewportSize);
+			
+			if(item.src && !item.loadError && !item.loaded) {
+
+				item.loadComplete = function(item) {
+
+					// gallery closed before image finished loading
+					if(!_isOpen) {
+						return;
+					}
+
+					// check if holder hasn't changed while image was loading
+					if(holder && holder.index === index ) {
+						if( _checkForError(item, true) ) {
+							item.loadComplete = item.img = null;
+							_calculateItemSize(item, _viewportSize);
+							_applyZoomPanToItem(item);
+
+							if(holder.index === _currentItemIndex) {
+								// recalculate dimensions
+								self.updateCurrZoomItem();
+							}
+							return;
+						}
+						if( !item.imageAppended ) {
+							if(_features.transform && (_mainScrollAnimating || _initialZoomRunning) ) {
+								_imagesToAppendPool.push({
+									item:item,
+									baseDiv:baseDiv,
+									img:item.img,
+									index:index,
+									holder:holder,
+									clearPlaceholder:true
+								});
+							} else {
+								_appendImage(index, item, baseDiv, item.img, _mainScrollAnimating || _initialZoomRunning, true);
+							}
+						} else {
+							// remove preloader & mini-img
+							if(!_initialZoomRunning && item.placeholder) {
+								item.placeholder.style.display = 'none';
+								item.placeholder = null;
+							}
+						}
+					}
+
+					item.loadComplete = null;
+					item.img = null; // no need to store image element after it's added
+
+					_shout('imageLoadComplete', index, item);
+				};
+
+				if(framework.features.transform) {
+					
+					var placeholderClassName = 'pswp__img pswp__img--placeholder'; 
+					placeholderClassName += (item.msrc ? '' : ' pswp__img--placeholder--blank');
+
+					var placeholder = framework.createEl(placeholderClassName, item.msrc ? 'img' : '');
+					if(item.msrc) {
+						placeholder.src = item.msrc;
+					}
+					
+					_setImageSize(item, placeholder);
+
+					baseDiv.appendChild(placeholder);
+					item.placeholder = placeholder;
+
+				}
+				
+
+				
+
+				if(!item.loading) {
+					_preloadImage(item);
+				}
+
+
+				if( self.allowProgressiveImg() ) {
+					// just append image
+					if(!_initialContentSet && _features.transform) {
+						_imagesToAppendPool.push({
+							item:item, 
+							baseDiv:baseDiv, 
+							img:item.img, 
+							index:index, 
+							holder:holder
+						});
+					} else {
+						_appendImage(index, item, baseDiv, item.img, true, true);
+					}
+				}
+				
+			} else if(item.src && !item.loadError) {
+				// image object is created every time, due to bugs of image loading & delay when switching images
+				img = framework.createEl('pswp__img', 'img');
+				img.style.opacity = 1;
+				img.src = item.src;
+				_setImageSize(item, img);
+				_appendImage(index, item, baseDiv, img, true);
+			}
+			
+
+			if(!_initialContentSet && index === _currentItemIndex) {
+				_currZoomElementStyle = baseDiv.style;
+				_showOrHide(item, (img ||item.img) );
+			} else {
+				_applyZoomPanToItem(item);
+			}
+
+			holder.el.innerHTML = '';
+			holder.el.appendChild(baseDiv);
+		},
+
+		cleanSlide: function( item ) {
+			if(item.img ) {
+				item.img.onload = item.img.onerror = null;
+			}
+			item.loaded = item.loading = item.img = item.imageAppended = false;
+		}
+
+	}
+});
+
+/*>>items-controller*/
+
+/*>>tap*/
+/**
+ * tap.js:
+ *
+ * Displatches tap and double-tap events.
+ * 
+ */
+
+var tapTimer,
+	tapReleasePoint = {},
+	_dispatchTapEvent = function(origEvent, releasePoint, pointerType) {		
+		var e = document.createEvent( 'CustomEvent' ),
+			eDetail = {
+				origEvent:origEvent, 
+				target:origEvent.target, 
+				releasePoint: releasePoint, 
+				pointerType:pointerType || 'touch'
+			};
+
+		e.initCustomEvent( 'pswpTap', true, true, eDetail );
+		origEvent.target.dispatchEvent(e);
+	};
+
+_registerModule('Tap', {
+	publicMethods: {
+		initTap: function() {
+			_listen('firstTouchStart', self.onTapStart);
+			_listen('touchRelease', self.onTapRelease);
+			_listen('destroy', function() {
+				tapReleasePoint = {};
+				tapTimer = null;
+			});
+		},
+		onTapStart: function(touchList) {
+			if(touchList.length > 1) {
+				clearTimeout(tapTimer);
+				tapTimer = null;
+			}
+		},
+		onTapRelease: function(e, releasePoint) {
+			if(!releasePoint) {
+				return;
+			}
+
+			if(!_moved && !_isMultitouch && !_numAnimations) {
+				var p0 = releasePoint;
+				if(tapTimer) {
+					clearTimeout(tapTimer);
+					tapTimer = null;
+
+					// Check if taped on the same place
+					if ( _isNearbyPoints(p0, tapReleasePoint) ) {
+						_shout('doubleTap', p0);
+						return;
+					}
+				}
+
+				if(releasePoint.type === 'mouse') {
+					_dispatchTapEvent(e, releasePoint, 'mouse');
+					return;
+				}
+
+				var clickedTagName = e.target.tagName.toUpperCase();
+				// avoid double tap delay on buttons and elements that have class pswp__single-tap
+				if(clickedTagName === 'BUTTON' || framework.hasClass(e.target, 'pswp__single-tap') ) {
+					_dispatchTapEvent(e, releasePoint);
+					return;
+				}
+
+				_equalizePoints(tapReleasePoint, p0);
+
+				tapTimer = setTimeout(function() {
+					_dispatchTapEvent(e, releasePoint);
+					tapTimer = null;
+				}, 300);
+			}
+		}
+	}
+});
+
+/*>>tap*/
+
+/*>>desktop-zoom*/
+/**
+ *
+ * desktop-zoom.js:
+ *
+ * - Binds mousewheel event for paning zoomed image.
+ * - Manages "dragging", "zoomed-in", "zoom-out" classes.
+ *   (which are used for cursors and zoom icon)
+ * - Adds toggleDesktopZoom function.
+ * 
+ */
+
+var _wheelDelta;
+	
+_registerModule('DesktopZoom', {
+
+	publicMethods: {
+
+		initDesktopZoom: function() {
+
+			if(_oldIE) {
+				// no zoom for old IE (<=8)
+				return;
+			}
+
+			if(_likelyTouchDevice) {
+				// if detected hardware touch support, we wait until mouse is used,
+				// and only then apply desktop-zoom features
+				_listen('mouseUsed', function() {
+					self.setupDesktopZoom();
+				});
+			} else {
+				self.setupDesktopZoom(true);
+			}
+
+		},
+
+		setupDesktopZoom: function(onInit) {
+
+			_wheelDelta = {};
+
+			var events = 'wheel mousewheel DOMMouseScroll';
+			
+			_listen('bindEvents', function() {
+				framework.bind(template, events,  self.handleMouseWheel);
+			});
+
+			_listen('unbindEvents', function() {
+				if(_wheelDelta) {
+					framework.unbind(template, events, self.handleMouseWheel);
+				}
+			});
+
+			self.mouseZoomedIn = false;
+
+			var hasDraggingClass,
+				updateZoomable = function() {
+					if(self.mouseZoomedIn) {
+						framework.removeClass(template, 'pswp--zoomed-in');
+						self.mouseZoomedIn = false;
+					}
+					if(_currZoomLevel < 1) {
+						framework.addClass(template, 'pswp--zoom-allowed');
+					} else {
+						framework.removeClass(template, 'pswp--zoom-allowed');
+					}
+					removeDraggingClass();
+				},
+				removeDraggingClass = function() {
+					if(hasDraggingClass) {
+						framework.removeClass(template, 'pswp--dragging');
+						hasDraggingClass = false;
+					}
+				};
+
+			_listen('resize' , updateZoomable);
+			_listen('afterChange' , updateZoomable);
+			_listen('pointerDown', function() {
+				if(self.mouseZoomedIn) {
+					hasDraggingClass = true;
+					framework.addClass(template, 'pswp--dragging');
+				}
+			});
+			_listen('pointerUp', removeDraggingClass);
+
+			if(!onInit) {
+				updateZoomable();
+			}
+			
+		},
+
+		handleMouseWheel: function(e) {
+
+			if(_currZoomLevel <= self.currItem.fitRatio) {
+				if( _options.modal ) {
+
+					if (!_options.closeOnScroll || _numAnimations || _isDragging) {
+						e.preventDefault();
+					} else if(_transformKey && Math.abs(e.deltaY) > 2) {
+						// close PhotoSwipe
+						// if browser supports transforms & scroll changed enough
+						_closedByScroll = true;
+						self.close();
+					}
+
+				}
+				return true;
+			}
+
+			// allow just one event to fire
+			e.stopPropagation();
+
+			// https://developer.mozilla.org/en-US/docs/Web/Events/wheel
+			_wheelDelta.x = 0;
+
+			if('deltaX' in e) {
+				if(e.deltaMode === 1 /* DOM_DELTA_LINE */) {
+					// 18 - average line height
+					_wheelDelta.x = e.deltaX * 18;
+					_wheelDelta.y = e.deltaY * 18;
+				} else {
+					_wheelDelta.x = e.deltaX;
+					_wheelDelta.y = e.deltaY;
+				}
+			} else if('wheelDelta' in e) {
+				if(e.wheelDeltaX) {
+					_wheelDelta.x = -0.16 * e.wheelDeltaX;
+				}
+				if(e.wheelDeltaY) {
+					_wheelDelta.y = -0.16 * e.wheelDeltaY;
+				} else {
+					_wheelDelta.y = -0.16 * e.wheelDelta;
+				}
+			} else if('detail' in e) {
+				_wheelDelta.y = e.detail;
+			} else {
+				return;
+			}
+
+			_calculatePanBounds(_currZoomLevel, true);
+
+			var newPanX = _panOffset.x - _wheelDelta.x,
+				newPanY = _panOffset.y - _wheelDelta.y;
+
+			// only prevent scrolling in nonmodal mode when not at edges
+			if (_options.modal ||
+				(
+				newPanX <= _currPanBounds.min.x && newPanX >= _currPanBounds.max.x &&
+				newPanY <= _currPanBounds.min.y && newPanY >= _currPanBounds.max.y
+				) ) {
+				e.preventDefault();
+			}
+
+			// TODO: use rAF instead of mousewheel?
+			self.panTo(newPanX, newPanY);
+		},
+
+		toggleDesktopZoom: function(centerPoint) {
+			centerPoint = centerPoint || {x:_viewportSize.x/2 + _offset.x, y:_viewportSize.y/2 + _offset.y };
+
+			var doubleTapZoomLevel = _options.getDoubleTapZoom(true, self.currItem);
+			var zoomOut = _currZoomLevel === doubleTapZoomLevel;
+			
+			self.mouseZoomedIn = !zoomOut;
+
+			self.zoomTo(zoomOut ? self.currItem.initialZoomLevel : doubleTapZoomLevel, centerPoint, 333);
+			framework[ (!zoomOut ? 'add' : 'remove') + 'Class'](template, 'pswp--zoomed-in');
+		}
+
+	}
+});
+
+
+/*>>desktop-zoom*/
+
+/*>>history*/
+/**
+ *
+ * history.js:
+ *
+ * - Back button to close gallery.
+ * 
+ * - Unique URL for each slide: example.com/&pid=1&gid=3
+ *   (where PID is picture index, and GID and gallery index)
+ *   
+ * - Switch URL when slides change.
+ * 
+ */
+
+
+var _historyDefaultOptions = {
+	history: true,
+	galleryUID: 1
+};
+
+var _historyUpdateTimeout,
+	_hashChangeTimeout,
+	_hashAnimCheckTimeout,
+	_hashChangedByScript,
+	_hashChangedByHistory,
+	_hashReseted,
+	_initialHash,
+	_historyChanged,
+	_closedFromURL,
+	_urlChangedOnce,
+	_windowLoc,
+
+	_supportsPushState,
+
+	_getHash = function() {
+		return _windowLoc.hash.substring(1);
+	},
+	_cleanHistoryTimeouts = function() {
+
+		if(_historyUpdateTimeout) {
+			clearTimeout(_historyUpdateTimeout);
+		}
+
+		if(_hashAnimCheckTimeout) {
+			clearTimeout(_hashAnimCheckTimeout);
+		}
+	},
+
+	// pid - Picture index
+	// gid - Gallery index
+	_parseItemIndexFromURL = function() {
+		var hash = _getHash(),
+			params = {};
+
+		if(hash.length < 5) { // pid=1
+			return params;
+		}
+
+		var i, vars = hash.split('&');
+		for (i = 0; i < vars.length; i++) {
+			if(!vars[i]) {
+				continue;
+			}
+			var pair = vars[i].split('=');	
+			if(pair.length < 2) {
+				continue;
+			}
+			params[pair[0]] = pair[1];
+		}
+		if(_options.galleryPIDs) {
+			// detect custom pid in hash and search for it among the items collection
+			var searchfor = params.pid;
+			params.pid = 0; // if custom pid cannot be found, fallback to the first item
+			for(i = 0; i < _items.length; i++) {
+				if(_items[i].pid === searchfor) {
+					params.pid = i;
+					break;
+				}
+			}
+		} else {
+			params.pid = parseInt(params.pid,10)-1;
+		}
+		if( params.pid < 0 ) {
+			params.pid = 0;
+		}
+		return params;
+	},
+	_updateHash = function() {
+
+		if(_hashAnimCheckTimeout) {
+			clearTimeout(_hashAnimCheckTimeout);
+		}
+
+
+		if(_numAnimations || _isDragging) {
+			// changing browser URL forces layout/paint in some browsers, which causes noticable lag during animation
+			// that's why we update hash only when no animations running
+			_hashAnimCheckTimeout = setTimeout(_updateHash, 500);
+			return;
+		}
+		
+		if(_hashChangedByScript) {
+			clearTimeout(_hashChangeTimeout);
+		} else {
+			_hashChangedByScript = true;
+		}
+
+
+		var pid = (_currentItemIndex + 1);
+		var item = _getItemAt( _currentItemIndex );
+		if(item.hasOwnProperty('pid')) {
+			// carry forward any custom pid assigned to the item
+			pid = item.pid;
+		}
+		var newHash = _initialHash + '&'  +  'gid=' + _options.galleryUID + '&' + 'pid=' + pid;
+
+		if(!_historyChanged) {
+			if(_windowLoc.hash.indexOf(newHash) === -1) {
+				_urlChangedOnce = true;
+			}
+			// first time - add new hisory record, then just replace
+		}
+
+		var newURL = _windowLoc.href.split('#')[0] + '#' +  newHash;
+
+		if( _supportsPushState ) {
+
+			if('#' + newHash !== window.location.hash) {
+				history[_historyChanged ? 'replaceState' : 'pushState']('', document.title, newURL);
+			}
+
+		} else {
+			if(_historyChanged) {
+				_windowLoc.replace( newURL );
+			} else {
+				_windowLoc.hash = newHash;
+			}
+		}
+		
+		
+
+		_historyChanged = true;
+		_hashChangeTimeout = setTimeout(function() {
+			_hashChangedByScript = false;
+		}, 60);
+	};
+
+
+
+	
+
+_registerModule('History', {
+
+	
+
+	publicMethods: {
+		initHistory: function() {
+
+			framework.extend(_options, _historyDefaultOptions, true);
+
+			if( !_options.history ) {
+				return;
+			}
+
+
+			_windowLoc = window.location;
+			_urlChangedOnce = false;
+			_closedFromURL = false;
+			_historyChanged = false;
+			_initialHash = _getHash();
+			_supportsPushState = ('pushState' in history);
+
+
+			if(_initialHash.indexOf('gid=') > -1) {
+				_initialHash = _initialHash.split('&gid=')[0];
+				_initialHash = _initialHash.split('?gid=')[0];
+			}
+			
+
+			_listen('afterChange', self.updateURL);
+			_listen('unbindEvents', function() {
+				framework.unbind(window, 'hashchange', self.onHashChange);
+			});
+
+
+			var returnToOriginal = function() {
+				_hashReseted = true;
+				if(!_closedFromURL) {
+
+					if(_urlChangedOnce) {
+						history.back();
+					} else {
+
+						if(_initialHash) {
+							_windowLoc.hash = _initialHash;
+						} else {
+							if (_supportsPushState) {
+
+								// remove hash from url without refreshing it or scrolling to top
+								history.pushState('', document.title,  _windowLoc.pathname + _windowLoc.search );
+							} else {
+								_windowLoc.hash = '';
+							}
+						}
+					}
+					
+				}
+
+				_cleanHistoryTimeouts();
+			};
+
+
+			_listen('unbindEvents', function() {
+				if(_closedByScroll) {
+					// if PhotoSwipe is closed by scroll, we go "back" before the closing animation starts
+					// this is done to keep the scroll position
+					returnToOriginal();
+				}
+			});
+			_listen('destroy', function() {
+				if(!_hashReseted) {
+					returnToOriginal();
+				}
+			});
+			_listen('firstUpdate', function() {
+				_currentItemIndex = _parseItemIndexFromURL().pid;
+			});
+
+			
+
+			
+			var index = _initialHash.indexOf('pid=');
+			if(index > -1) {
+				_initialHash = _initialHash.substring(0, index);
+				if(_initialHash.slice(-1) === '&') {
+					_initialHash = _initialHash.slice(0, -1);
+				}
+			}
+			
+
+			setTimeout(function() {
+				if(_isOpen) { // hasn't destroyed yet
+					framework.bind(window, 'hashchange', self.onHashChange);
+				}
+			}, 40);
+			
+		},
+		onHashChange: function() {
+
+			if(_getHash() === _initialHash) {
+
+				_closedFromURL = true;
+				self.close();
+				return;
+			}
+			if(!_hashChangedByScript) {
+
+				_hashChangedByHistory = true;
+				self.goTo( _parseItemIndexFromURL().pid );
+				_hashChangedByHistory = false;
+			}
+			
+		},
+		updateURL: function() {
+
+			// Delay the update of URL, to avoid lag during transition, 
+			// and to not to trigger actions like "refresh page sound" or "blinking favicon" to often
+			
+			_cleanHistoryTimeouts();
+			
+
+			if(_hashChangedByHistory) {
+				return;
+			}
+
+			if(!_historyChanged) {
+				_updateHash(); // first time
+			} else {
+				_historyUpdateTimeout = setTimeout(_updateHash, 800);
+			}
+		}
+	
+	}
+});
+
+
+/*>>history*/
+	framework.extend(self, publicMethods); };
+	return PhotoSwipe;
+});
\ No newline at end of file
diff --git a/assets/js/photoswipe/photoswipe.min.js b/assets/js/photoswipe/photoswipe.min.js
new file mode 100644
index 00000000000..4d60954f971
--- /dev/null
+++ b/assets/js/photoswipe/photoswipe.min.js
@@ -0,0 +1,4 @@
+/*! PhotoSwipe - v4.1.1 - 2015-12-24
+* http://photoswipe.com
+* Copyright (c) 2015 Dmitry Semenov; */
+!function(a,b){"function"==typeof define&&define.amd?define(b):"object"==typeof exports?module.exports=b():a.PhotoSwipe=b()}(this,function(){"use strict";var a=function(a,b,c,d){var e={features:null,bind:function(a,b,c,d){var e=(d?"remove":"add")+"EventListener";b=b.split(" ");for(var f=0;f<b.length;f++)b[f]&&a[e](b[f],c,!1)},isArray:function(a){return a instanceof Array},createEl:function(a,b){var c=document.createElement(b||"div");return a&&(c.className=a),c},getScrollY:function(){var a=window.pageYOffset;return void 0!==a?a:document.documentElement.scrollTop},unbind:function(a,b,c){e.bind(a,b,c,!0)},removeClass:function(a,b){var c=new RegExp("(\\s|^)"+b+"(\\s|$)");a.className=a.className.replace(c," ").replace(/^\s\s*/,"").replace(/\s\s*$/,"")},addClass:function(a,b){e.hasClass(a,b)||(a.className+=(a.className?" ":"")+b)},hasClass:function(a,b){return a.className&&new RegExp("(^|\\s)"+b+"(\\s|$)").test(a.className)},getChildByClass:function(a,b){for(var c=a.firstChild;c;){if(e.hasClass(c,b))return c;c=c.nextSibling}},arraySearch:function(a,b,c){for(var d=a.length;d--;)if(a[d][c]===b)return d;return-1},extend:function(a,b,c){for(var d in b)if(b.hasOwnProperty(d)){if(c&&a.hasOwnProperty(d))continue;a[d]=b[d]}},easing:{sine:{out:function(a){return Math.sin(a*(Math.PI/2))},inOut:function(a){return-(Math.cos(Math.PI*a)-1)/2}},cubic:{out:function(a){return--a*a*a+1}}},detectFeatures:function(){if(e.features)return e.features;var a=e.createEl(),b=a.style,c="",d={};if(d.oldIE=document.all&&!document.addEventListener,d.touch="ontouchstart"in window,window.requestAnimationFrame&&(d.raf=window.requestAnimationFrame,d.caf=window.cancelAnimationFrame),d.pointerEvent=navigator.pointerEnabled||navigator.msPointerEnabled,!d.pointerEvent){var f=navigator.userAgent;if(/iP(hone|od)/.test(navigator.platform)){var g=navigator.appVersion.match(/OS (\d+)_(\d+)_?(\d+)?/);g&&g.length>0&&(g=parseInt(g[1],10),g>=1&&g<8&&(d.isOldIOSPhone=!0))}var h=f.match(/Android\s([0-9\.]*)/),i=h?h[1]:0;i=parseFloat(i),i>=1&&(i<4.4&&(d.isOldAndroid=!0),d.androidVersion=i),d.isMobileOpera=/opera mini|opera mobi/i.test(f)}for(var j,k,l=["transform","perspective","animationName"],m=["","webkit","Moz","ms","O"],n=0;n<4;n++){c=m[n];for(var o=0;o<3;o++)j=l[o],k=c+(c?j.charAt(0).toUpperCase()+j.slice(1):j),!d[j]&&k in b&&(d[j]=k);c&&!d.raf&&(c=c.toLowerCase(),d.raf=window[c+"RequestAnimationFrame"],d.raf&&(d.caf=window[c+"CancelAnimationFrame"]||window[c+"CancelRequestAnimationFrame"]))}if(!d.raf){var p=0;d.raf=function(a){var b=(new Date).getTime(),c=Math.max(0,16-(b-p)),d=window.setTimeout(function(){a(b+c)},c);return p=b+c,d},d.caf=function(a){clearTimeout(a)}}return d.svg=!!document.createElementNS&&!!document.createElementNS("http://www.w3.org/2000/svg","svg").createSVGRect,e.features=d,d}};e.detectFeatures(),e.features.oldIE&&(e.bind=function(a,b,c,d){b=b.split(" ");for(var e,f=(d?"detach":"attach")+"Event",g=function(){c.handleEvent.call(c)},h=0;h<b.length;h++)if(e=b[h])if("object"==typeof c&&c.handleEvent){if(d){if(!c["oldIE"+e])return!1}else c["oldIE"+e]=g;a[f]("on"+e,c["oldIE"+e])}else a[f]("on"+e,c)});var f=this,g=25,h=3,i={allowPanToNext:!0,spacing:.12,bgOpacity:1,mouseUsed:!1,loop:!0,pinchToClose:!0,closeOnScroll:!0,closeOnVerticalDrag:!0,verticalDragRange:.75,hideAnimationDuration:333,showAnimationDuration:333,showHideOpacity:!1,focus:!0,escKey:!0,arrowKeys:!0,mainScrollEndFriction:.35,panEndFriction:.35,isClickableElement:function(a){return"A"===a.tagName},getDoubleTapZoom:function(a,b){return a?1:b.initialZoomLevel<.7?1:1.33},maxSpreadZoom:1.33,modal:!0,scaleMode:"fit"};e.extend(i,d);var j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,$,_,aa,ba,ca,da,ea,fa,ga,ha,ia,ja,ka,la=function(){return{x:0,y:0}},ma=la(),na=la(),oa=la(),pa={},qa=0,ra={},sa=la(),ta=0,ua=!0,va=[],wa={},xa=!1,ya=function(a,b){e.extend(f,b.publicMethods),va.push(a)},za=function(a){var b=_b();return a>b-1?a-b:a<0?b+a:a},Aa={},Ba=function(a,b){return Aa[a]||(Aa[a]=[]),Aa[a].push(b)},Ca=function(a){var b=Aa[a];if(b){var c=Array.prototype.slice.call(arguments);c.shift();for(var d=0;d<b.length;d++)b[d].apply(f,c)}},Da=function(){return(new Date).getTime()},Ea=function(a){ia=a,f.bg.style.opacity=a*i.bgOpacity},Fa=function(a,b,c,d,e){(!xa||e&&e!==f.currItem)&&(d/=e?e.fitRatio:f.currItem.fitRatio),a[E]=u+b+"px, "+c+"px"+v+" scale("+d+")"},Ga=function(a){da&&(a&&(s>f.currItem.fitRatio?xa||(lc(f.currItem,!1,!0),xa=!0):xa&&(lc(f.currItem),xa=!1)),Fa(da,oa.x,oa.y,s))},Ha=function(a){a.container&&Fa(a.container.style,a.initialPosition.x,a.initialPosition.y,a.initialZoomLevel,a)},Ia=function(a,b){b[E]=u+a+"px, 0px"+v},Ja=function(a,b){if(!i.loop&&b){var c=m+(sa.x*qa-a)/sa.x,d=Math.round(a-sb.x);(c<0&&d>0||c>=_b()-1&&d<0)&&(a=sb.x+d*i.mainScrollEndFriction)}sb.x=a,Ia(a,n)},Ka=function(a,b){var c=tb[a]-ra[a];return na[a]+ma[a]+c-c*(b/t)},La=function(a,b){a.x=b.x,a.y=b.y,b.id&&(a.id=b.id)},Ma=function(a){a.x=Math.round(a.x),a.y=Math.round(a.y)},Na=null,Oa=function(){Na&&(e.unbind(document,"mousemove",Oa),e.addClass(a,"pswp--has_mouse"),i.mouseUsed=!0,Ca("mouseUsed")),Na=setTimeout(function(){Na=null},100)},Pa=function(){e.bind(document,"keydown",f),N.transform&&e.bind(f.scrollWrap,"click",f),i.mouseUsed||e.bind(document,"mousemove",Oa),e.bind(window,"resize scroll",f),Ca("bindEvents")},Qa=function(){e.unbind(window,"resize",f),e.unbind(window,"scroll",r.scroll),e.unbind(document,"keydown",f),e.unbind(document,"mousemove",Oa),N.transform&&e.unbind(f.scrollWrap,"click",f),U&&e.unbind(window,p,f),Ca("unbindEvents")},Ra=function(a,b){var c=hc(f.currItem,pa,a);return b&&(ca=c),c},Sa=function(a){return a||(a=f.currItem),a.initialZoomLevel},Ta=function(a){return a||(a=f.currItem),a.w>0?i.maxSpreadZoom:1},Ua=function(a,b,c,d){return d===f.currItem.initialZoomLevel?(c[a]=f.currItem.initialPosition[a],!0):(c[a]=Ka(a,d),c[a]>b.min[a]?(c[a]=b.min[a],!0):c[a]<b.max[a]&&(c[a]=b.max[a],!0))},Va=function(){if(E){var b=N.perspective&&!G;return u="translate"+(b?"3d(":"("),void(v=N.perspective?", 0px)":")")}E="left",e.addClass(a,"pswp--ie"),Ia=function(a,b){b.left=a+"px"},Ha=function(a){var b=a.fitRatio>1?1:a.fitRatio,c=a.container.style,d=b*a.w,e=b*a.h;c.width=d+"px",c.height=e+"px",c.left=a.initialPosition.x+"px",c.top=a.initialPosition.y+"px"},Ga=function(){if(da){var a=da,b=f.currItem,c=b.fitRatio>1?1:b.fitRatio,d=c*b.w,e=c*b.h;a.width=d+"px",a.height=e+"px",a.left=oa.x+"px",a.top=oa.y+"px"}}},Wa=function(a){var b="";i.escKey&&27===a.keyCode?b="close":i.arrowKeys&&(37===a.keyCode?b="prev":39===a.keyCode&&(b="next")),b&&(a.ctrlKey||a.altKey||a.shiftKey||a.metaKey||(a.preventDefault?a.preventDefault():a.returnValue=!1,f[b]()))},Xa=function(a){a&&(X||W||ea||S)&&(a.preventDefault(),a.stopPropagation())},Ya=function(){f.setScrollOffset(0,e.getScrollY())},Za={},$a=0,_a=function(a){Za[a]&&(Za[a].raf&&I(Za[a].raf),$a--,delete Za[a])},ab=function(a){Za[a]&&_a(a),Za[a]||($a++,Za[a]={})},bb=function(){for(var a in Za)Za.hasOwnProperty(a)&&_a(a)},cb=function(a,b,c,d,e,f,g){var h,i=Da();ab(a);var j=function(){if(Za[a]){if(h=Da()-i,h>=d)return _a(a),f(c),void(g&&g());f((c-b)*e(h/d)+b),Za[a].raf=H(j)}};j()},db={shout:Ca,listen:Ba,viewportSize:pa,options:i,isMainScrollAnimating:function(){return ea},getZoomLevel:function(){return s},getCurrentIndex:function(){return m},isDragging:function(){return U},isZooming:function(){return _},setScrollOffset:function(a,b){ra.x=a,M=ra.y=b,Ca("updateScrollOffset",ra)},applyZoomPan:function(a,b,c,d){oa.x=b,oa.y=c,s=a,Ga(d)},init:function(){if(!j&&!k){var c;f.framework=e,f.template=a,f.bg=e.getChildByClass(a,"pswp__bg"),J=a.className,j=!0,N=e.detectFeatures(),H=N.raf,I=N.caf,E=N.transform,L=N.oldIE,f.scrollWrap=e.getChildByClass(a,"pswp__scroll-wrap"),f.container=e.getChildByClass(f.scrollWrap,"pswp__container"),n=f.container.style,f.itemHolders=y=[{el:f.container.children[0],wrap:0,index:-1},{el:f.container.children[1],wrap:0,index:-1},{el:f.container.children[2],wrap:0,index:-1}],y[0].el.style.display=y[2].el.style.display="none",Va(),r={resize:f.updateSize,scroll:Ya,keydown:Wa,click:Xa};var d=N.isOldIOSPhone||N.isOldAndroid||N.isMobileOpera;for(N.animationName&&N.transform&&!d||(i.showAnimationDuration=i.hideAnimationDuration=0),c=0;c<va.length;c++)f["init"+va[c]]();if(b){var g=f.ui=new b(f,e);g.init()}Ca("firstUpdate"),m=m||i.index||0,(isNaN(m)||m<0||m>=_b())&&(m=0),f.currItem=$b(m),(N.isOldIOSPhone||N.isOldAndroid)&&(ua=!1),a.setAttribute("aria-hidden","false"),i.modal&&(ua?a.style.position="fixed":(a.style.position="absolute",a.style.top=e.getScrollY()+"px")),void 0===M&&(Ca("initialLayout"),M=K=e.getScrollY());var l="pswp--open ";for(i.mainClass&&(l+=i.mainClass+" "),i.showHideOpacity&&(l+="pswp--animate_opacity "),l+=G?"pswp--touch":"pswp--notouch",l+=N.animationName?" pswp--css_animation":"",l+=N.svg?" pswp--svg":"",e.addClass(a,l),f.updateSize(),o=-1,ta=null,c=0;c<h;c++)Ia((c+o)*sa.x,y[c].el.style);L||e.bind(f.scrollWrap,q,f),Ba("initialZoomInEnd",function(){f.setContent(y[0],m-1),f.setContent(y[2],m+1),y[0].el.style.display=y[2].el.style.display="block",i.focus&&a.focus(),Pa()}),f.setContent(y[1],m),f.updateCurrItem(),Ca("afterInit"),ua||(w=setInterval(function(){$a||U||_||s!==f.currItem.initialZoomLevel||f.updateSize()},1e3)),e.addClass(a,"pswp--visible")}},close:function(){j&&(j=!1,k=!0,Ca("close"),Qa(),bc(f.currItem,null,!0,f.destroy))},destroy:function(){Ca("destroy"),Wb&&clearTimeout(Wb),a.setAttribute("aria-hidden","true"),a.className=J,w&&clearInterval(w),e.unbind(f.scrollWrap,q,f),e.unbind(window,"scroll",f),yb(),bb(),Aa=null},panTo:function(a,b,c){c||(a>ca.min.x?a=ca.min.x:a<ca.max.x&&(a=ca.max.x),b>ca.min.y?b=ca.min.y:b<ca.max.y&&(b=ca.max.y)),oa.x=a,oa.y=b,Ga()},handleEvent:function(a){a=a||window.event,r[a.type]&&r[a.type](a)},goTo:function(a){a=za(a);var b=a-m;ta=b,m=a,f.currItem=$b(m),qa-=b,Ja(sa.x*qa),bb(),ea=!1,f.updateCurrItem()},next:function(){f.goTo(m+1)},prev:function(){f.goTo(m-1)},updateCurrZoomItem:function(a){if(a&&Ca("beforeChange",0),y[1].el.children.length){var b=y[1].el.children[0];da=e.hasClass(b,"pswp__zoom-wrap")?b.style:null}else da=null;ca=f.currItem.bounds,t=s=f.currItem.initialZoomLevel,oa.x=ca.center.x,oa.y=ca.center.y,a&&Ca("afterChange")},invalidateCurrItems:function(){x=!0;for(var a=0;a<h;a++)y[a].item&&(y[a].item.needsUpdate=!0)},updateCurrItem:function(a){if(0!==ta){var b,c=Math.abs(ta);if(!(a&&c<2)){f.currItem=$b(m),xa=!1,Ca("beforeChange",ta),c>=h&&(o+=ta+(ta>0?-h:h),c=h);for(var d=0;d<c;d++)ta>0?(b=y.shift(),y[h-1]=b,o++,Ia((o+2)*sa.x,b.el.style),f.setContent(b,m-c+d+1+1)):(b=y.pop(),y.unshift(b),o--,Ia(o*sa.x,b.el.style),f.setContent(b,m+c-d-1-1));if(da&&1===Math.abs(ta)){var e=$b(z);e.initialZoomLevel!==s&&(hc(e,pa),lc(e),Ha(e))}ta=0,f.updateCurrZoomItem(),z=m,Ca("afterChange")}}},updateSize:function(b){if(!ua&&i.modal){var c=e.getScrollY();if(M!==c&&(a.style.top=c+"px",M=c),!b&&wa.x===window.innerWidth&&wa.y===window.innerHeight)return;wa.x=window.innerWidth,wa.y=window.innerHeight,a.style.height=wa.y+"px"}if(pa.x=f.scrollWrap.clientWidth,pa.y=f.scrollWrap.clientHeight,Ya(),sa.x=pa.x+Math.round(pa.x*i.spacing),sa.y=pa.y,Ja(sa.x*qa),Ca("beforeResize"),void 0!==o){for(var d,g,j,k=0;k<h;k++)d=y[k],Ia((k+o)*sa.x,d.el.style),j=m+k-1,i.loop&&_b()>2&&(j=za(j)),g=$b(j),g&&(x||g.needsUpdate||!g.bounds)?(f.cleanSlide(g),f.setContent(d,j),1===k&&(f.currItem=g,f.updateCurrZoomItem(!0)),g.needsUpdate=!1):d.index===-1&&j>=0&&f.setContent(d,j),g&&g.container&&(hc(g,pa),lc(g),Ha(g));x=!1}t=s=f.currItem.initialZoomLevel,ca=f.currItem.bounds,ca&&(oa.x=ca.center.x,oa.y=ca.center.y,Ga(!0)),Ca("resize")},zoomTo:function(a,b,c,d,f){b&&(t=s,tb.x=Math.abs(b.x)-oa.x,tb.y=Math.abs(b.y)-oa.y,La(na,oa));var g=Ra(a,!1),h={};Ua("x",g,h,a),Ua("y",g,h,a);var i=s,j={x:oa.x,y:oa.y};Ma(h);var k=function(b){1===b?(s=a,oa.x=h.x,oa.y=h.y):(s=(a-i)*b+i,oa.x=(h.x-j.x)*b+j.x,oa.y=(h.y-j.y)*b+j.y),f&&f(b),Ga(1===b)};c?cb("customZoomTo",0,1,c,d||e.easing.sine.inOut,k):k(1)}},eb=30,fb=10,gb={},hb={},ib={},jb={},kb={},lb=[],mb={},nb=[],ob={},pb=0,qb=la(),rb=0,sb=la(),tb=la(),ub=la(),vb=function(a,b){return a.x===b.x&&a.y===b.y},wb=function(a,b){return Math.abs(a.x-b.x)<g&&Math.abs(a.y-b.y)<g},xb=function(a,b){return ob.x=Math.abs(a.x-b.x),ob.y=Math.abs(a.y-b.y),Math.sqrt(ob.x*ob.x+ob.y*ob.y)},yb=function(){Y&&(I(Y),Y=null)},zb=function(){U&&(Y=H(zb),Pb())},Ab=function(){return!("fit"===i.scaleMode&&s===f.currItem.initialZoomLevel)},Bb=function(a,b){return!(!a||a===document)&&(!(a.getAttribute("class")&&a.getAttribute("class").indexOf("pswp__scroll-wrap")>-1)&&(b(a)?a:Bb(a.parentNode,b)))},Cb={},Db=function(a,b){return Cb.prevent=!Bb(a.target,i.isClickableElement),Ca("preventDragEvent",a,b,Cb),Cb.prevent},Eb=function(a,b){return b.x=a.pageX,b.y=a.pageY,b.id=a.identifier,b},Fb=function(a,b,c){c.x=.5*(a.x+b.x),c.y=.5*(a.y+b.y)},Gb=function(a,b,c){if(a-P>50){var d=nb.length>2?nb.shift():{};d.x=b,d.y=c,nb.push(d),P=a}},Hb=function(){var a=oa.y-f.currItem.initialPosition.y;return 1-Math.abs(a/(pa.y/2))},Ib={},Jb={},Kb=[],Lb=function(a){for(;Kb.length>0;)Kb.pop();return F?(ka=0,lb.forEach(function(a){0===ka?Kb[0]=a:1===ka&&(Kb[1]=a),ka++})):a.type.indexOf("touch")>-1?a.touches&&a.touches.length>0&&(Kb[0]=Eb(a.touches[0],Ib),a.touches.length>1&&(Kb[1]=Eb(a.touches[1],Jb))):(Ib.x=a.pageX,Ib.y=a.pageY,Ib.id="",Kb[0]=Ib),Kb},Mb=function(a,b){var c,d,e,g,h=0,j=oa[a]+b[a],k=b[a]>0,l=sb.x+b.x,m=sb.x-mb.x;return c=j>ca.min[a]||j<ca.max[a]?i.panEndFriction:1,j=oa[a]+b[a]*c,!i.allowPanToNext&&s!==f.currItem.initialZoomLevel||(da?"h"!==fa||"x"!==a||W||(k?(j>ca.min[a]&&(c=i.panEndFriction,h=ca.min[a]-j,d=ca.min[a]-na[a]),(d<=0||m<0)&&_b()>1?(g=l,m<0&&l>mb.x&&(g=mb.x)):ca.min.x!==ca.max.x&&(e=j)):(j<ca.max[a]&&(c=i.panEndFriction,h=j-ca.max[a],d=na[a]-ca.max[a]),(d<=0||m>0)&&_b()>1?(g=l,m>0&&l<mb.x&&(g=mb.x)):ca.min.x!==ca.max.x&&(e=j))):g=l,"x"!==a)?void(ea||Z||s>f.currItem.fitRatio&&(oa[a]+=b[a]*c)):(void 0!==g&&(Ja(g,!0),Z=g!==mb.x),ca.min.x!==ca.max.x&&(void 0!==e?oa.x=e:Z||(oa.x+=b.x*c)),void 0!==g)},Nb=function(a){if(!("mousedown"===a.type&&a.button>0)){if(Zb)return void a.preventDefault();if(!T||"mousedown"!==a.type){if(Db(a,!0)&&a.preventDefault(),Ca("pointerDown"),F){var b=e.arraySearch(lb,a.pointerId,"id");b<0&&(b=lb.length),lb[b]={x:a.pageX,y:a.pageY,id:a.pointerId}}var c=Lb(a),d=c.length;$=null,bb(),U&&1!==d||(U=ga=!0,e.bind(window,p,f),R=ja=ha=S=Z=X=V=W=!1,fa=null,Ca("firstTouchStart",c),La(na,oa),ma.x=ma.y=0,La(jb,c[0]),La(kb,jb),mb.x=sa.x*qa,nb=[{x:jb.x,y:jb.y}],P=O=Da(),Ra(s,!0),yb(),zb()),!_&&d>1&&!ea&&!Z&&(t=s,W=!1,_=V=!0,ma.y=ma.x=0,La(na,oa),La(gb,c[0]),La(hb,c[1]),Fb(gb,hb,ub),tb.x=Math.abs(ub.x)-oa.x,tb.y=Math.abs(ub.y)-oa.y,aa=ba=xb(gb,hb))}}},Ob=function(a){if(a.preventDefault(),F){var b=e.arraySearch(lb,a.pointerId,"id");if(b>-1){var c=lb[b];c.x=a.pageX,c.y=a.pageY}}if(U){var d=Lb(a);if(fa||X||_)$=d;else if(sb.x!==sa.x*qa)fa="h";else{var f=Math.abs(d[0].x-jb.x)-Math.abs(d[0].y-jb.y);Math.abs(f)>=fb&&(fa=f>0?"h":"v",$=d)}}},Pb=function(){if($){var a=$.length;if(0!==a)if(La(gb,$[0]),ib.x=gb.x-jb.x,ib.y=gb.y-jb.y,_&&a>1){if(jb.x=gb.x,jb.y=gb.y,!ib.x&&!ib.y&&vb($[1],hb))return;La(hb,$[1]),W||(W=!0,Ca("zoomGestureStarted"));var b=xb(gb,hb),c=Ub(b);c>f.currItem.initialZoomLevel+f.currItem.initialZoomLevel/15&&(ja=!0);var d=1,e=Sa(),g=Ta();if(c<e)if(i.pinchToClose&&!ja&&t<=f.currItem.initialZoomLevel){var h=e-c,j=1-h/(e/1.2);Ea(j),Ca("onPinchClose",j),ha=!0}else d=(e-c)/e,d>1&&(d=1),c=e-d*(e/3);else c>g&&(d=(c-g)/(6*e),d>1&&(d=1),c=g+d*e);d<0&&(d=0),aa=b,Fb(gb,hb,qb),ma.x+=qb.x-ub.x,ma.y+=qb.y-ub.y,La(ub,qb),oa.x=Ka("x",c),oa.y=Ka("y",c),R=c>s,s=c,Ga()}else{if(!fa)return;if(ga&&(ga=!1,Math.abs(ib.x)>=fb&&(ib.x-=$[0].x-kb.x),Math.abs(ib.y)>=fb&&(ib.y-=$[0].y-kb.y)),jb.x=gb.x,jb.y=gb.y,0===ib.x&&0===ib.y)return;if("v"===fa&&i.closeOnVerticalDrag&&!Ab()){ma.y+=ib.y,oa.y+=ib.y;var k=Hb();return S=!0,Ca("onVerticalDrag",k),Ea(k),void Ga()}Gb(Da(),gb.x,gb.y),X=!0,ca=f.currItem.bounds;var l=Mb("x",ib);l||(Mb("y",ib),Ma(oa),Ga())}}},Qb=function(a){if(N.isOldAndroid){if(T&&"mouseup"===a.type)return;a.type.indexOf("touch")>-1&&(clearTimeout(T),T=setTimeout(function(){T=0},600))}Ca("pointerUp"),Db(a,!1)&&a.preventDefault();var b;if(F){var c=e.arraySearch(lb,a.pointerId,"id");if(c>-1)if(b=lb.splice(c,1)[0],navigator.pointerEnabled)b.type=a.pointerType||"mouse";else{var d={4:"mouse",2:"touch",3:"pen"};b.type=d[a.pointerType],b.type||(b.type=a.pointerType||"mouse")}}var g,h=Lb(a),j=h.length;if("mouseup"===a.type&&(j=0),2===j)return $=null,!0;1===j&&La(kb,h[0]),0!==j||fa||ea||(b||("mouseup"===a.type?b={x:a.pageX,y:a.pageY,type:"mouse"}:a.changedTouches&&a.changedTouches[0]&&(b={x:a.changedTouches[0].pageX,y:a.changedTouches[0].pageY,type:"touch"})),Ca("touchRelease",a,b));var k=-1;if(0===j&&(U=!1,e.unbind(window,p,f),yb(),_?k=0:rb!==-1&&(k=Da()-rb)),rb=1===j?Da():-1,g=k!==-1&&k<150?"zoom":"swipe",_&&j<2&&(_=!1,1===j&&(g="zoomPointerUp"),Ca("zoomGestureEnded")),$=null,X||W||ea||S)if(bb(),Q||(Q=Rb()),Q.calculateSwipeSpeed("x"),S){var l=Hb();if(l<i.verticalDragRange)f.close();else{var m=oa.y,n=ia;cb("verticalDrag",0,1,300,e.easing.cubic.out,function(a){oa.y=(f.currItem.initialPosition.y-m)*a+m,Ea((1-n)*a+n),Ga()}),Ca("onVerticalDrag",1)}}else{if((Z||ea)&&0===j){var o=Tb(g,Q);if(o)return;g="zoomPointerUp"}if(!ea)return"swipe"!==g?void Vb():void(!Z&&s>f.currItem.fitRatio&&Sb(Q))}},Rb=function(){var a,b,c={lastFlickOffset:{},lastFlickDist:{},lastFlickSpeed:{},slowDownRatio:{},slowDownRatioReverse:{},speedDecelerationRatio:{},speedDecelerationRatioAbs:{},distanceOffset:{},backAnimDestination:{},backAnimStarted:{},calculateSwipeSpeed:function(d){nb.length>1?(a=Da()-P+50,b=nb[nb.length-2][d]):(a=Da()-O,b=kb[d]),c.lastFlickOffset[d]=jb[d]-b,c.lastFlickDist[d]=Math.abs(c.lastFlickOffset[d]),c.lastFlickDist[d]>20?c.lastFlickSpeed[d]=c.lastFlickOffset[d]/a:c.lastFlickSpeed[d]=0,Math.abs(c.lastFlickSpeed[d])<.1&&(c.lastFlickSpeed[d]=0),c.slowDownRatio[d]=.95,c.slowDownRatioReverse[d]=1-c.slowDownRatio[d],c.speedDecelerationRatio[d]=1},calculateOverBoundsAnimOffset:function(a,b){c.backAnimStarted[a]||(oa[a]>ca.min[a]?c.backAnimDestination[a]=ca.min[a]:oa[a]<ca.max[a]&&(c.backAnimDestination[a]=ca.max[a]),void 0!==c.backAnimDestination[a]&&(c.slowDownRatio[a]=.7,c.slowDownRatioReverse[a]=1-c.slowDownRatio[a],c.speedDecelerationRatioAbs[a]<.05&&(c.lastFlickSpeed[a]=0,c.backAnimStarted[a]=!0,cb("bounceZoomPan"+a,oa[a],c.backAnimDestination[a],b||300,e.easing.sine.out,function(b){oa[a]=b,Ga()}))))},calculateAnimOffset:function(a){c.backAnimStarted[a]||(c.speedDecelerationRatio[a]=c.speedDecelerationRatio[a]*(c.slowDownRatio[a]+c.slowDownRatioReverse[a]-c.slowDownRatioReverse[a]*c.timeDiff/10),c.speedDecelerationRatioAbs[a]=Math.abs(c.lastFlickSpeed[a]*c.speedDecelerationRatio[a]),c.distanceOffset[a]=c.lastFlickSpeed[a]*c.speedDecelerationRatio[a]*c.timeDiff,oa[a]+=c.distanceOffset[a])},panAnimLoop:function(){if(Za.zoomPan&&(Za.zoomPan.raf=H(c.panAnimLoop),c.now=Da(),c.timeDiff=c.now-c.lastNow,c.lastNow=c.now,c.calculateAnimOffset("x"),c.calculateAnimOffset("y"),Ga(),c.calculateOverBoundsAnimOffset("x"),c.calculateOverBoundsAnimOffset("y"),c.speedDecelerationRatioAbs.x<.05&&c.speedDecelerationRatioAbs.y<.05))return oa.x=Math.round(oa.x),oa.y=Math.round(oa.y),Ga(),void _a("zoomPan")}};return c},Sb=function(a){return a.calculateSwipeSpeed("y"),ca=f.currItem.bounds,a.backAnimDestination={},a.backAnimStarted={},Math.abs(a.lastFlickSpeed.x)<=.05&&Math.abs(a.lastFlickSpeed.y)<=.05?(a.speedDecelerationRatioAbs.x=a.speedDecelerationRatioAbs.y=0,a.calculateOverBoundsAnimOffset("x"),a.calculateOverBoundsAnimOffset("y"),!0):(ab("zoomPan"),a.lastNow=Da(),void a.panAnimLoop())},Tb=function(a,b){var c;ea||(pb=m);var d;if("swipe"===a){var g=jb.x-kb.x,h=b.lastFlickDist.x<10;g>eb&&(h||b.lastFlickOffset.x>20)?d=-1:g<-eb&&(h||b.lastFlickOffset.x<-20)&&(d=1)}var j;d&&(m+=d,m<0?(m=i.loop?_b()-1:0,j=!0):m>=_b()&&(m=i.loop?0:_b()-1,j=!0),j&&!i.loop||(ta+=d,qa-=d,c=!0));var k,l=sa.x*qa,n=Math.abs(l-sb.x);return c||l>sb.x==b.lastFlickSpeed.x>0?(k=Math.abs(b.lastFlickSpeed.x)>0?n/Math.abs(b.lastFlickSpeed.x):333,k=Math.min(k,400),k=Math.max(k,250)):k=333,pb===m&&(c=!1),ea=!0,Ca("mainScrollAnimStart"),cb("mainScroll",sb.x,l,k,e.easing.cubic.out,Ja,function(){bb(),ea=!1,pb=-1,(c||pb!==m)&&f.updateCurrItem(),Ca("mainScrollAnimComplete")}),c&&f.updateCurrItem(!0),c},Ub=function(a){return 1/ba*a*t},Vb=function(){var a=s,b=Sa(),c=Ta();s<b?a=b:s>c&&(a=c);var d,g=1,h=ia;return ha&&!R&&!ja&&s<b?(f.close(),!0):(ha&&(d=function(a){Ea((g-h)*a+h)}),f.zoomTo(a,0,200,e.easing.cubic.out,d),!0)};ya("Gestures",{publicMethods:{initGestures:function(){var a=function(a,b,c,d,e){A=a+b,B=a+c,C=a+d,D=e?a+e:""};F=N.pointerEvent,F&&N.touch&&(N.touch=!1),F?navigator.pointerEnabled?a("pointer","down","move","up","cancel"):a("MSPointer","Down","Move","Up","Cancel"):N.touch?(a("touch","start","move","end","cancel"),G=!0):a("mouse","down","move","up"),p=B+" "+C+" "+D,q=A,F&&!G&&(G=navigator.maxTouchPoints>1||navigator.msMaxTouchPoints>1),f.likelyTouchDevice=G,r[A]=Nb,r[B]=Ob,r[C]=Qb,D&&(r[D]=r[C]),N.touch&&(q+=" mousedown",p+=" mousemove mouseup",r.mousedown=r[A],r.mousemove=r[B],r.mouseup=r[C]),G||(i.allowPanToNext=!1)}}});var Wb,Xb,Yb,Zb,$b,_b,ac,bc=function(b,c,d,g){Wb&&clearTimeout(Wb),Zb=!0,Yb=!0;var h;b.initialLayout?(h=b.initialLayout,b.initialLayout=null):h=i.getThumbBoundsFn&&i.getThumbBoundsFn(m);var j=d?i.hideAnimationDuration:i.showAnimationDuration,k=function(){_a("initialZoom"),d?(f.template.removeAttribute("style"),f.bg.removeAttribute("style")):(Ea(1),c&&(c.style.display="block"),e.addClass(a,"pswp--animated-in"),Ca("initialZoom"+(d?"OutEnd":"InEnd"))),g&&g(),Zb=!1};if(!j||!h||void 0===h.x)return Ca("initialZoom"+(d?"Out":"In")),s=b.initialZoomLevel,La(oa,b.initialPosition),Ga(),a.style.opacity=d?0:1,Ea(1),void(j?setTimeout(function(){k()},j):k());var n=function(){var c=l,g=!f.currItem.src||f.currItem.loadError||i.showHideOpacity;b.miniImg&&(b.miniImg.style.webkitBackfaceVisibility="hidden"),d||(s=h.w/b.w,oa.x=h.x,oa.y=h.y-K,f[g?"template":"bg"].style.opacity=.001,Ga()),ab("initialZoom"),d&&!c&&e.removeClass(a,"pswp--animated-in"),g&&(d?e[(c?"remove":"add")+"Class"](a,"pswp--animate_opacity"):setTimeout(function(){e.addClass(a,"pswp--animate_opacity")},30)),Wb=setTimeout(function(){if(Ca("initialZoom"+(d?"Out":"In")),d){var f=h.w/b.w,i={x:oa.x,y:oa.y},l=s,m=ia,n=function(b){1===b?(s=f,oa.x=h.x,oa.y=h.y-M):(s=(f-l)*b+l,oa.x=(h.x-i.x)*b+i.x,oa.y=(h.y-M-i.y)*b+i.y),Ga(),g?a.style.opacity=1-b:Ea(m-b*m)};c?cb("initialZoom",0,1,j,e.easing.cubic.out,n,k):(n(1),Wb=setTimeout(k,j+20))}else s=b.initialZoomLevel,La(oa,b.initialPosition),Ga(),Ea(1),g?a.style.opacity=1:Ea(1),Wb=setTimeout(k,j+20)},d?25:90)};n()},cc={},dc=[],ec={index:0,errorMsg:'<div class="pswp__error-msg"><a href="%url%" target="_blank">The image</a> could not be loaded.</div>',forceProgressiveLoading:!1,preload:[1,1],getNumItemsFn:function(){return Xb.length}},fc=function(){return{center:{x:0,y:0},max:{x:0,y:0},min:{x:0,y:0}}},gc=function(a,b,c){var d=a.bounds;d.center.x=Math.round((cc.x-b)/2),d.center.y=Math.round((cc.y-c)/2)+a.vGap.top,d.max.x=b>cc.x?Math.round(cc.x-b):d.center.x,d.max.y=c>cc.y?Math.round(cc.y-c)+a.vGap.top:d.center.y,d.min.x=b>cc.x?0:d.center.x,d.min.y=c>cc.y?a.vGap.top:d.center.y},hc=function(a,b,c){if(a.src&&!a.loadError){var d=!c;if(d&&(a.vGap||(a.vGap={top:0,bottom:0}),Ca("parseVerticalMargin",a)),cc.x=b.x,cc.y=b.y-a.vGap.top-a.vGap.bottom,d){var e=cc.x/a.w,f=cc.y/a.h;a.fitRatio=e<f?e:f;var g=i.scaleMode;"orig"===g?c=1:"fit"===g&&(c=a.fitRatio),c>1&&(c=1),a.initialZoomLevel=c,a.bounds||(a.bounds=fc())}if(!c)return;return gc(a,a.w*c,a.h*c),d&&c===a.initialZoomLevel&&(a.initialPosition=a.bounds.center),a.bounds}return a.w=a.h=0,a.initialZoomLevel=a.fitRatio=1,a.bounds=fc(),a.initialPosition=a.bounds.center,a.bounds},ic=function(a,b,c,d,e,g){b.loadError||d&&(b.imageAppended=!0,lc(b,d,b===f.currItem&&xa),c.appendChild(d),g&&setTimeout(function(){b&&b.loaded&&b.placeholder&&(b.placeholder.style.display="none",b.placeholder=null)},500))},jc=function(a){a.loading=!0,a.loaded=!1;var b=a.img=e.createEl("pswp__img","img"),c=function(){a.loading=!1,a.loaded=!0,a.loadComplete?a.loadComplete(a):a.img=null,b.onload=b.onerror=null,b=null};return b.onload=c,b.onerror=function(){a.loadError=!0,c()},b.src=a.src,b},kc=function(a,b){if(a.src&&a.loadError&&a.container)return b&&(a.container.innerHTML=""),a.container.innerHTML=i.errorMsg.replace("%url%",a.src),!0},lc=function(a,b,c){if(a.src){b||(b=a.container.lastChild);var d=c?a.w:Math.round(a.w*a.fitRatio),e=c?a.h:Math.round(a.h*a.fitRatio);a.placeholder&&!a.loaded&&(a.placeholder.style.width=d+"px",a.placeholder.style.height=e+"px"),b.style.width=d+"px",b.style.height=e+"px"}},mc=function(){if(dc.length){for(var a,b=0;b<dc.length;b++)a=dc[b],a.holder.index===a.index&&ic(a.index,a.item,a.baseDiv,a.img,!1,a.clearPlaceholder);dc=[]}};ya("Controller",{publicMethods:{lazyLoadItem:function(a){a=za(a);var b=$b(a);b&&(!b.loaded&&!b.loading||x)&&(Ca("gettingData",a,b),b.src&&jc(b))},initController:function(){e.extend(i,ec,!0),f.items=Xb=c,$b=f.getItemAt,_b=i.getNumItemsFn,ac=i.loop,_b()<3&&(i.loop=!1),Ba("beforeChange",function(a){var b,c=i.preload,d=null===a||a>=0,e=Math.min(c[0],_b()),g=Math.min(c[1],_b());for(b=1;b<=(d?g:e);b++)f.lazyLoadItem(m+b);for(b=1;b<=(d?e:g);b++)f.lazyLoadItem(m-b)}),Ba("initialLayout",function(){f.currItem.initialLayout=i.getThumbBoundsFn&&i.getThumbBoundsFn(m)}),Ba("mainScrollAnimComplete",mc),Ba("initialZoomInEnd",mc),Ba("destroy",function(){for(var a,b=0;b<Xb.length;b++)a=Xb[b],a.container&&(a.container=null),a.placeholder&&(a.placeholder=null),a.img&&(a.img=null),a.preloader&&(a.preloader=null),a.loadError&&(a.loaded=a.loadError=!1);dc=null})},getItemAt:function(a){return a>=0&&(void 0!==Xb[a]&&Xb[a])},allowProgressiveImg:function(){return i.forceProgressiveLoading||!G||i.mouseUsed||screen.width>1200},setContent:function(a,b){i.loop&&(b=za(b));var c=f.getItemAt(a.index);c&&(c.container=null);var d,g=f.getItemAt(b);if(!g)return void(a.el.innerHTML="");Ca("gettingData",b,g),a.index=b,a.item=g;var h=g.container=e.createEl("pswp__zoom-wrap");if(!g.src&&g.html&&(g.html.tagName?h.appendChild(g.html):h.innerHTML=g.html),kc(g),hc(g,pa),!g.src||g.loadError||g.loaded)g.src&&!g.loadError&&(d=e.createEl("pswp__img","img"),d.style.opacity=1,d.src=g.src,lc(g,d),ic(b,g,h,d,!0));else{if(g.loadComplete=function(c){if(j){if(a&&a.index===b){if(kc(c,!0))return c.loadComplete=c.img=null,hc(c,pa),Ha(c),void(a.index===m&&f.updateCurrZoomItem());c.imageAppended?!Zb&&c.placeholder&&(c.placeholder.style.display="none",c.placeholder=null):N.transform&&(ea||Zb)?dc.push({item:c,baseDiv:h,img:c.img,index:b,holder:a,clearPlaceholder:!0}):ic(b,c,h,c.img,ea||Zb,!0)}c.loadComplete=null,c.img=null,Ca("imageLoadComplete",b,c)}},e.features.transform){var k="pswp__img pswp__img--placeholder";k+=g.msrc?"":" pswp__img--placeholder--blank";var l=e.createEl(k,g.msrc?"img":"");g.msrc&&(l.src=g.msrc),lc(g,l),h.appendChild(l),g.placeholder=l}g.loading||jc(g),f.allowProgressiveImg()&&(!Yb&&N.transform?dc.push({item:g,baseDiv:h,img:g.img,index:b,holder:a}):ic(b,g,h,g.img,!0,!0))}Yb||b!==m?Ha(g):(da=h.style,bc(g,d||g.img)),a.el.innerHTML="",a.el.appendChild(h)},cleanSlide:function(a){a.img&&(a.img.onload=a.img.onerror=null),a.loaded=a.loading=a.img=a.imageAppended=!1}}});var nc,oc={},pc=function(a,b,c){var d=document.createEvent("CustomEvent"),e={origEvent:a,target:a.target,releasePoint:b,pointerType:c||"touch"};d.initCustomEvent("pswpTap",!0,!0,e),a.target.dispatchEvent(d)};ya("Tap",{publicMethods:{initTap:function(){Ba("firstTouchStart",f.onTapStart),Ba("touchRelease",f.onTapRelease),Ba("destroy",function(){oc={},nc=null})},onTapStart:function(a){a.length>1&&(clearTimeout(nc),nc=null)},onTapRelease:function(a,b){if(b&&!X&&!V&&!$a){var c=b;if(nc&&(clearTimeout(nc),nc=null,wb(c,oc)))return void Ca("doubleTap",c);if("mouse"===b.type)return void pc(a,b,"mouse");var d=a.target.tagName.toUpperCase();if("BUTTON"===d||e.hasClass(a.target,"pswp__single-tap"))return void pc(a,b);La(oc,c),nc=setTimeout(function(){pc(a,b),nc=null},300)}}}});var qc;ya("DesktopZoom",{publicMethods:{initDesktopZoom:function(){L||(G?Ba("mouseUsed",function(){f.setupDesktopZoom()}):f.setupDesktopZoom(!0))},setupDesktopZoom:function(b){qc={};var c="wheel mousewheel DOMMouseScroll";Ba("bindEvents",function(){e.bind(a,c,f.handleMouseWheel)}),Ba("unbindEvents",function(){qc&&e.unbind(a,c,f.handleMouseWheel)}),f.mouseZoomedIn=!1;var d,g=function(){f.mouseZoomedIn&&(e.removeClass(a,"pswp--zoomed-in"),f.mouseZoomedIn=!1),s<1?e.addClass(a,"pswp--zoom-allowed"):e.removeClass(a,"pswp--zoom-allowed"),h()},h=function(){d&&(e.removeClass(a,"pswp--dragging"),d=!1)};Ba("resize",g),Ba("afterChange",g),Ba("pointerDown",function(){f.mouseZoomedIn&&(d=!0,e.addClass(a,"pswp--dragging"))}),Ba("pointerUp",h),b||g()},handleMouseWheel:function(a){if(s<=f.currItem.fitRatio)return i.modal&&(!i.closeOnScroll||$a||U?a.preventDefault():E&&Math.abs(a.deltaY)>2&&(l=!0,f.close())),!0;if(a.stopPropagation(),qc.x=0,"deltaX"in a)1===a.deltaMode?(qc.x=18*a.deltaX,qc.y=18*a.deltaY):(qc.x=a.deltaX,qc.y=a.deltaY);else if("wheelDelta"in a)a.wheelDeltaX&&(qc.x=-.16*a.wheelDeltaX),a.wheelDeltaY?qc.y=-.16*a.wheelDeltaY:qc.y=-.16*a.wheelDelta;else{if(!("detail"in a))return;qc.y=a.detail}Ra(s,!0);var b=oa.x-qc.x,c=oa.y-qc.y;(i.modal||b<=ca.min.x&&b>=ca.max.x&&c<=ca.min.y&&c>=ca.max.y)&&a.preventDefault(),f.panTo(b,c)},toggleDesktopZoom:function(b){b=b||{x:pa.x/2+ra.x,y:pa.y/2+ra.y};var c=i.getDoubleTapZoom(!0,f.currItem),d=s===c;f.mouseZoomedIn=!d,f.zoomTo(d?f.currItem.initialZoomLevel:c,b,333),e[(d?"remove":"add")+"Class"](a,"pswp--zoomed-in")}}});var rc,sc,tc,uc,vc,wc,xc,yc,zc,Ac,Bc,Cc,Dc={history:!0,galleryUID:1},Ec=function(){return Bc.hash.substring(1)},Fc=function(){rc&&clearTimeout(rc),tc&&clearTimeout(tc)},Gc=function(){var a=Ec(),b={};if(a.length<5)return b;var c,d=a.split("&");for(c=0;c<d.length;c++)if(d[c]){var e=d[c].split("=");e.length<2||(b[e[0]]=e[1])}if(i.galleryPIDs){var f=b.pid;for(b.pid=0,c=0;c<Xb.length;c++)if(Xb[c].pid===f){b.pid=c;break}}else b.pid=parseInt(b.pid,10)-1;return b.pid<0&&(b.pid=0),b},Hc=function(){if(tc&&clearTimeout(tc),$a||U)return void(tc=setTimeout(Hc,500));uc?clearTimeout(sc):uc=!0;var a=m+1,b=$b(m);b.hasOwnProperty("pid")&&(a=b.pid);var c=xc+"&gid="+i.galleryUID+"&pid="+a;yc||Bc.hash.indexOf(c)===-1&&(Ac=!0);var d=Bc.href.split("#")[0]+"#"+c;Cc?"#"+c!==window.location.hash&&history[yc?"replaceState":"pushState"]("",document.title,d):yc?Bc.replace(d):Bc.hash=c,yc=!0,sc=setTimeout(function(){uc=!1},60)};ya("History",{publicMethods:{initHistory:function(){if(e.extend(i,Dc,!0),i.history){Bc=window.location,Ac=!1,zc=!1,yc=!1,xc=Ec(),Cc="pushState"in history,xc.indexOf("gid=")>-1&&(xc=xc.split("&gid=")[0],xc=xc.split("?gid=")[0]),Ba("afterChange",f.updateURL),Ba("unbindEvents",function(){e.unbind(window,"hashchange",f.onHashChange)});var a=function(){wc=!0,zc||(Ac?history.back():xc?Bc.hash=xc:Cc?history.pushState("",document.title,Bc.pathname+Bc.search):Bc.hash=""),Fc()};Ba("unbindEvents",function(){l&&a()}),Ba("destroy",function(){wc||a()}),Ba("firstUpdate",function(){m=Gc().pid});var b=xc.indexOf("pid=");b>-1&&(xc=xc.substring(0,b),"&"===xc.slice(-1)&&(xc=xc.slice(0,-1))),setTimeout(function(){j&&e.bind(window,"hashchange",f.onHashChange)},40)}},onHashChange:function(){return Ec()===xc?(zc=!0,void f.close()):void(uc||(vc=!0,f.goTo(Gc().pid),vc=!1))},updateURL:function(){Fc(),vc||(yc?rc=setTimeout(Hc,800):Hc())}}}),e.extend(f,db)};return a});
\ No newline at end of file
diff --git a/assets/js/prettyPhoto/jquery.prettyPhoto.js b/assets/js/prettyPhoto/jquery.prettyPhoto.js
index 9ecf9d11f9d..2eb2b86b786 100644
--- a/assets/js/prettyPhoto/jquery.prettyPhoto.js
+++ b/assets/js/prettyPhoto/jquery.prettyPhoto.js
@@ -6,7 +6,7 @@
 ------------------------------------------------------------------------- */
 (function($) {
 	$.prettyPhoto = {version: '3.1.6'};
-	
+
 	$.fn.prettyPhoto = function(pp_settings) {
 		pp_settings = jQuery.extend({
 			hook: 'rel', /* the attribute tag to use for prettyPhoto hooks. default: 'rel'. For HTML5, use "data-rel" or similar. */
@@ -86,30 +86,30 @@
 							</div>',
 			image_markup: '<img id="fullResImage" src="{path}" />',
 			flash_markup: '<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="{width}" height="{height}"><param name="wmode" value="{wmode}" /><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="{path}" /><embed src="{path}" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="{width}" height="{height}" wmode="{wmode}"></embed></object>',
-			quicktime_markup: '<object classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab" height="{height}" width="{width}"><param name="src" value="{path}"><param name="autoplay" value="{autoplay}"><param name="type" value="video/quicktime"><embed src="{path}" height="{height}" width="{width}" autoplay="{autoplay}" type="video/quicktime" pluginspage="http://www.apple.com/quicktime/download/"></embed></object>',
+			quicktime_markup: '<object classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="https://www.apple.com/qtactivex/qtplugin.cab" height="{height}" width="{width}"><param name="src" value="{path}"><param name="autoplay" value="{autoplay}"><param name="type" value="video/quicktime"><embed src="{path}" height="{height}" width="{width}" autoplay="{autoplay}" type="video/quicktime" pluginspage="https://www.apple.com/quicktime/download/"></embed></object>',
 			iframe_markup: '<iframe src ="{path}" width="{width}" height="{height}" frameborder="no"></iframe>',
 			inline_markup: '<div class="pp_inline">{content}</div>',
 			custom_markup: '',
-			social_tools: '<div class="twitter"><a href="http://twitter.com/share" class="twitter-share-button" data-count="none">Tweet</a><script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script></div><div class="facebook"><iframe src="//www.facebook.com/plugins/like.php?locale=en_US&href={location_href}&amp;layout=button_count&amp;show_faces=true&amp;width=500&amp;action=like&amp;font&amp;colorscheme=light&amp;height=23" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:500px; height:23px;" allowTransparency="true"></iframe></div>' /* html or false to disable */
+			social_tools: '<div class="twitter"><a href="//twitter.com/share" class="twitter-share-button" data-count="none">Tweet</a><script type="text/javascript" src="//platform.twitter.com/widgets.js"></script></div><div class="facebook"><iframe src="//www.facebook.com/plugins/like.php?locale=en_US&href={location_href}&amp;layout=button_count&amp;show_faces=true&amp;width=500&amp;action=like&amp;font&amp;colorscheme=light&amp;height=23" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:500px; height:23px;" allowTransparency="true"></iframe></div>' /* html or false to disable */
 		}, pp_settings);
-		
+
 		// Global variables accessible only by prettyPhoto
 		var matchedObjects = this, percentBased = false, pp_dimensions, pp_open,
-		
+
 		// prettyPhoto container specific
 		pp_contentHeight, pp_contentWidth, pp_containerHeight, pp_containerWidth,
-		
+
 		// Window size
 		windowHeight = $(window).height(), windowWidth = $(window).width(),
 
 		// Global elements
 		pp_slideshow;
-		
+
 		doresize = true, scroll_pos = _get_scroll();
-	
+
 		// Window/Keyboard events
 		$(window).unbind('resize.prettyphoto').bind('resize.prettyphoto',function(){ _center_overlay(); _resize_overlay(); });
-		
+
 		if(pp_settings.keyboard_shortcuts) {
 			$(document).unbind('keydown.prettyphoto').bind('keydown.prettyphoto',function(e){
 				if(typeof $pp_pic_holder != 'undefined'){
@@ -134,39 +134,39 @@
 				};
 			});
 		};
-		
+
 		/**
 		* Initialize prettyPhoto.
 		*/
 		$.prettyPhoto.initialize = function() {
-			
+
 			settings = pp_settings;
-			
+
 			if(settings.theme == 'pp_default') settings.horizontal_padding = 16;
-			
+
 			// Find out if the picture is part of a set
 			theRel = $(this).attr(settings.hook);
 			galleryRegExp = /\[(?:.*)\]/;
 			isSet = (galleryRegExp.exec(theRel)) ? true : false;
-			
+
 			// Put the SRCs, TITLEs, ALTs into an array.
 			pp_images = (isSet) ? jQuery.map(matchedObjects, function(n, i){ if($(n).attr(settings.hook).indexOf(theRel) != -1) return $(n).attr('href'); }) : $.makeArray($(this).attr('href'));
 			pp_titles = (isSet) ? jQuery.map(matchedObjects, function(n, i){ if($(n).attr(settings.hook).indexOf(theRel) != -1) return ($(n).find('img').attr('alt')) ? $(n).find('img').attr('alt') : ""; }) : $.makeArray($(this).find('img').attr('alt'));
 			pp_descriptions = (isSet) ? jQuery.map(matchedObjects, function(n, i){ if($(n).attr(settings.hook).indexOf(theRel) != -1) return ($(n).attr('title')) ? $(n).attr('title') : ""; }) : $.makeArray($(this).attr('title'));
-			
+
 			if(pp_images.length > settings.overlay_gallery_max) settings.overlay_gallery = false;
-			
+
 			set_position = jQuery.inArray($(this).attr('href'), pp_images); // Define where in the array the clicked item is positionned
 			rel_index = (isSet) ? set_position : $("a["+settings.hook+"^='"+theRel+"']").index($(this));
-			
+
 			_build_overlay(this); // Build the overlay {this} being the caller
-			
+
 			if(settings.allow_resize)
 				$(window).bind('scroll.prettyphoto',function(){ _center_overlay(); });
-			
-			
+
+
 			$.prettyPhoto.open();
-			
+
 			return false;
 		}
 
@@ -187,28 +187,28 @@
 				set_position = (arguments[3])? arguments[3]: 0;
 				_build_overlay(event.target); // Build the overlay {this} being the caller
 			}
-			
+
 			if(settings.hideflash) $('object,embed,iframe[src*=youtube],iframe[src*=vimeo]').css('visibility','hidden'); // Hide the flash
 
-			_checkPosition($(pp_images).size()); // Hide the next/previous links if on first or last images.
-		
+			_checkPosition($(pp_images).length); // Hide the next/previous links if on first or last images.
+
 			$('.pp_loaderIcon').show();
-		
+
 			if(settings.deeplinking)
 				setHashtag();
-		
+
 			// Rebuild Facebook Like Button with updated href
 			if(settings.social_tools){
-				facebook_like_link = settings.social_tools.replace('{location_href}', encodeURIComponent(location.href)); 
+				facebook_like_link = settings.social_tools.replace('{location_href}', encodeURIComponent(location.href));
 				$pp_pic_holder.find('.pp_social').html(facebook_like_link);
 			}
-			
+
 			// Fade the content in
 			if($ppt.is(':hidden')) $ppt.css('opacity',0).show();
 			$pp_overlay.show().fadeTo(settings.animation_speed,settings.opacity);
 
 			// Display the current position
-			$pp_pic_holder.find('.currentTextHolder').text((set_position+1) + settings.counter_separator_label + $(pp_images).size());
+			$pp_pic_holder.find('.currentTextHolder').text((set_position+1) + settings.counter_separator_label + $(pp_images).length);
 
 			// Set the description
 			if(typeof pp_descriptions[set_position] != 'undefined' && pp_descriptions[set_position] != ""){
@@ -216,24 +216,24 @@
 			}else{
 				$pp_pic_holder.find('.pp_description').hide();
 			}
-			
+
 			// Get the dimensions
 			movie_width = ( parseFloat(getParam('width',pp_images[set_position])) ) ? getParam('width',pp_images[set_position]) : settings.default_width.toString();
 			movie_height = ( parseFloat(getParam('height',pp_images[set_position])) ) ? getParam('height',pp_images[set_position]) : settings.default_height.toString();
-			
+
 			// If the size is % based, calculate according to window dimensions
 			percentBased=false;
 			if(movie_height.indexOf('%') != -1) { movie_height = parseFloat(($(window).height() * parseFloat(movie_height) / 100) - 150); percentBased = true; }
 			if(movie_width.indexOf('%') != -1) { movie_width = parseFloat(($(window).width() * parseFloat(movie_width) / 100) - 150); percentBased = true; }
-			
+
 			// Fade the holder
 			$pp_pic_holder.fadeIn(function(){
 				// Set the title
 				(settings.show_title && pp_titles[set_position] != "" && typeof pp_titles[set_position] != "undefined") ? $ppt.html(unescape(pp_titles[set_position])) : $ppt.html('&nbsp;');
-				
+
 				imgPreloader = "";
 				skipInjection = false;
-				
+
 				// Inject the proper content
 				switch(_getFileType(pp_images[set_position])){
 					case 'image':
@@ -241,7 +241,7 @@
 
 						// Preload the neighbour images
 						nextImage = new Image();
-						if(isSet && set_position < $(pp_images).size() -1) nextImage.src = pp_images[set_position + 1];
+						if(isSet && set_position < $(pp_images).length -1) nextImage.src = pp_images[set_position + 1];
 						prevImage = new Image();
 						if(isSet && pp_images[set_position - 1]) prevImage.src = pp_images[set_position - 1];
 
@@ -258,16 +258,16 @@
 							alert('Image cannot be loaded. Make sure the path is correct and image exist.');
 							$.prettyPhoto.close();
 						};
-					
+
 						imgPreloader.src = pp_images[set_position];
 					break;
-				
+
 					case 'youtube':
 						pp_dimensions = _fitToViewport(movie_width,movie_height); // Fit item to viewport
-						
+
 						// Regular youtube link
 						movie_id = getParam('v',pp_images[set_position]);
-						
+
 						// youtu.be link
 						if(movie_id == ""){
 							movie_id = pp_images[set_position].split('youtu.be/');
@@ -279,77 +279,77 @@
 								movie_id = movie_id.substr(0,movie_id.indexOf('&')); // Strip anything after the &
 						}
 
-						movie = 'http://www.youtube.com/embed/'+movie_id;
+						movie = '//www.youtube.com/embed/'+movie_id;
 						(getParam('rel',pp_images[set_position])) ? movie+="?rel="+getParam('rel',pp_images[set_position]) : movie+="?rel=1";
-							
+
 						if(settings.autoplay) movie += "&autoplay=1";
-					
+
 						toInject = settings.iframe_markup.replace(/{width}/g,pp_dimensions['width']).replace(/{height}/g,pp_dimensions['height']).replace(/{wmode}/g,settings.wmode).replace(/{path}/g,movie);
 					break;
-				
+
 					case 'vimeo':
 						pp_dimensions = _fitToViewport(movie_width,movie_height); // Fit item to viewport
-					
+
 						movie_id = pp_images[set_position];
 						var regExp = /http(s?):\/\/(www\.)?vimeo.com\/(\d+)/;
 						var match = movie_id.match(regExp);
-						
-						movie = 'http://player.vimeo.com/video/'+ match[3] +'?title=0&amp;byline=0&amp;portrait=0';
+
+						movie = '//player.vimeo.com/video/'+ match[3] +'?title=0&amp;byline=0&amp;portrait=0';
 						if(settings.autoplay) movie += "&autoplay=1;";
-				
+
 						vimeo_width = pp_dimensions['width'] + '/embed/?moog_width='+ pp_dimensions['width'];
-				
+
 						toInject = settings.iframe_markup.replace(/{width}/g,vimeo_width).replace(/{height}/g,pp_dimensions['height']).replace(/{path}/g,movie);
 					break;
-				
+
 					case 'quicktime':
 						pp_dimensions = _fitToViewport(movie_width,movie_height); // Fit item to viewport
 						pp_dimensions['height']+=15; pp_dimensions['contentHeight']+=15; pp_dimensions['containerHeight']+=15; // Add space for the control bar
-				
+
 						toInject = settings.quicktime_markup.replace(/{width}/g,pp_dimensions['width']).replace(/{height}/g,pp_dimensions['height']).replace(/{wmode}/g,settings.wmode).replace(/{path}/g,pp_images[set_position]).replace(/{autoplay}/g,settings.autoplay);
 					break;
-				
+
 					case 'flash':
 						pp_dimensions = _fitToViewport(movie_width,movie_height); // Fit item to viewport
-					
+
 						flash_vars = pp_images[set_position];
 						flash_vars = flash_vars.substring(pp_images[set_position].indexOf('flashvars') + 10,pp_images[set_position].length);
 
 						filename = pp_images[set_position];
 						filename = filename.substring(0,filename.indexOf('?'));
-					
+
 						toInject =  settings.flash_markup.replace(/{width}/g,pp_dimensions['width']).replace(/{height}/g,pp_dimensions['height']).replace(/{wmode}/g,settings.wmode).replace(/{path}/g,filename+'?'+flash_vars);
 					break;
-				
+
 					case 'iframe':
 						pp_dimensions = _fitToViewport(movie_width,movie_height); // Fit item to viewport
-				
+
 						frame_url = pp_images[set_position];
 						frame_url = frame_url.substr(0,frame_url.indexOf('iframe')-1);
 
 						toInject = settings.iframe_markup.replace(/{width}/g,pp_dimensions['width']).replace(/{height}/g,pp_dimensions['height']).replace(/{path}/g,frame_url);
 					break;
-					
+
 					case 'ajax':
 						doresize = false; // Make sure the dimensions are not resized.
 						pp_dimensions = _fitToViewport(movie_width,movie_height);
 						doresize = true; // Reset the dimensions
-					
+
 						skipInjection = true;
 						$.get(pp_images[set_position],function(responseHTML){
 							toInject = settings.inline_markup.replace(/{content}/g,responseHTML);
 							$pp_pic_holder.find('#pp_full_res')[0].innerHTML = toInject;
 							_showContent();
 						});
-						
+
 					break;
-					
+
 					case 'custom':
 						pp_dimensions = _fitToViewport(movie_width,movie_height); // Fit item to viewport
-					
+
 						toInject = settings.custom_markup;
 					break;
-				
+
 					case 'inline':
 						// to get the item height clone it, apply default width, wrap it in the prettyPhoto containers , then delete
 						myClone = $(pp_images[set_position]).clone().append('<br clear="all" />').css({'width':settings.default_width}).wrapInner('<div id="pp_full_res"><div class="pp_inline"></div></div>').appendTo($('body')).show();
@@ -363,7 +363,7 @@
 
 				if(!imgPreloader && !skipInjection){
 					$pp_pic_holder.find('#pp_full_res')[0].innerHTML = toInject;
-				
+
 					// Show content
 					_showContent();
 				};
@@ -372,24 +372,24 @@
 			return false;
 		};
 
-	
+
 		/**
 		* Change page in the prettyPhoto modal box
 		* @param direction {String} Direction of the paging, previous or next.
 		*/
 		$.prettyPhoto.changePage = function(direction){
 			currentGalleryPage = 0;
-			
+
 			if(direction == 'previous') {
 				set_position--;
-				if (set_position < 0) set_position = $(pp_images).size()-1;
+				if (set_position < 0) set_position = $(pp_images).length-1;
 			}else if(direction == 'next'){
 				set_position++;
-				if(set_position > $(pp_images).size()-1) set_position = 0;
+				if(set_position > $(pp_images).length-1) set_position = 0;
 			}else{
 				set_position=direction;
 			};
-			
+
 			rel_index = set_position;
 
 			if(!doresize) doresize = true; // Allow the resizing of the images
@@ -417,7 +417,7 @@
 			}else{
 				currentGalleryPage = direction;
 			};
-			
+
 			slide_speed = (direction == 'next' || direction == 'previous') ? settings.animation_speed : 0;
 
 			slide_to = currentGalleryPage * (itemsPerPage * itemWidth);
@@ -437,7 +437,7 @@
 				});
 				pp_slideshow = setInterval($.prettyPhoto.startSlideshow,settings.slideshow);
 			}else{
-				$.prettyPhoto.changePage('next');	
+				$.prettyPhoto.changePage('next');
 			};
 		}
 
@@ -460,33 +460,33 @@
 		*/
 		$.prettyPhoto.close = function(){
 			if($pp_overlay.is(":animated")) return;
-			
+
 			$.prettyPhoto.stopSlideshow();
-			
+
 			$pp_pic_holder.stop().find('object,embed').css('visibility','hidden');
-			
+
 			$('div.pp_pic_holder,div.ppt,.pp_fade').fadeOut(settings.animation_speed,function(){ $(this).remove(); });
-			
+
 			$pp_overlay.fadeOut(settings.animation_speed, function(){
-				
+
 				if(settings.hideflash) $('object,embed,iframe[src*=youtube],iframe[src*=vimeo]').css('visibility','visible'); // Show the flash
-				
+
 				$(this).remove(); // No more need for the prettyPhoto markup
-				
+
 				$(window).unbind('scroll.prettyphoto');
-				
+
 				clearHashtag();
-				
+
 				settings.callback();
-				
+
 				doresize = true;
-				
+
 				pp_open = false;
-				
+
 				delete settings;
 			});
 		};
-	
+
 		/**
 		* Set the proper sizes on the containers and animate the content in.
 		*/
@@ -505,7 +505,7 @@
 					height:pp_dimensions['contentHeight'],
 					width:pp_dimensions['contentWidth']
 				},settings.animation_speed);
-			
+
 			// Resize picture the holder
 			$pp_pic_holder.animate({
 				'top': projectedTop,
@@ -518,7 +518,7 @@
 
 				// Show the nav
 				if(isSet && _getFileType(pp_images[set_position])=="image") { $pp_pic_holder.find('.pp_hoverContainer').show(); }else{ $pp_pic_holder.find('.pp_hoverContainer').hide(); }
-			
+
 				if(settings.allow_expand) {
 					if(pp_dimensions['resized']){ // Fade the resizing link if the image is resized
 						$('a.pp_expand,a.pp_contract').show();
@@ -526,18 +526,18 @@
 						$('a.pp_expand').hide();
 					}
 				}
-				
+
 				if(settings.autoplay_slideshow && !pp_slideshow && !pp_open) $.prettyPhoto.startSlideshow();
-				
+
 				settings.changepicturecallback(); // Callback!
-				
+
 				pp_open = true;
 			});
-			
+
 			_insert_gallery();
 			pp_settings.ajaxcallback();
 		};
-		
+
 		/**
 		* Hide the content...DUH!
 		*/
@@ -546,11 +546,11 @@
 			$pp_pic_holder.find('#pp_full_res object,#pp_full_res embed').css('visibility','hidden');
 			$pp_pic_holder.find('.pp_fade').fadeOut(settings.animation_speed,function(){
 				$('.pp_loaderIcon').show();
-				
+
 				callback();
 			});
 		};
-	
+
 		/**
 		* Check the item position in the gallery array, hide or show the navigation links
 		* @param setCount {integer} The total number of items in the set
@@ -558,7 +558,7 @@
 		function _checkPosition(setCount){
 			(setCount > 1) ? $('.pp_nav').show() : $('.pp_nav').hide(); // Hide the bottom nav if it's not a set.
 		};
-	
+
 		/**
 		* Resize the item dimensions if it's bigger than the viewport
 		* @param width {integer} Width of the item to be opened
@@ -569,13 +569,13 @@
 			resized = false;
 
 			_getDimensions(width,height);
-			
+
 			// Define them in case there's no resize needed
 			imageWidth = width, imageHeight = height;
 
 			if( ((pp_containerWidth > windowWidth) || (pp_containerHeight > windowHeight)) && doresize && settings.allow_resize && !percentBased) {
 				resized = true, fitting = false;
-			
+
 				while (!fitting){
 					if((pp_containerWidth > windowWidth)){
 						imageWidth = (windowWidth - 200);
@@ -589,16 +589,16 @@
 
 					pp_containerHeight = imageHeight, pp_containerWidth = imageWidth;
 				};
-			
 
-				
+
+
 				if((pp_containerWidth > windowWidth) || (pp_containerHeight > windowHeight)){
 					_fitToViewport(pp_containerWidth,pp_containerHeight)
 				};
-				
+
 				_getDimensions(imageWidth,imageHeight);
 			};
-			
+
 			return {
 				width:Math.floor(imageWidth),
 				height:Math.floor(imageHeight),
@@ -609,7 +609,7 @@
 				resized:resized
 			};
 		};
-		
+
 		/**
 		* Get the containers dimensions according to the item size
 		* @param width {integer} Width of the item to be opened
@@ -618,12 +618,12 @@
 		function _getDimensions(width,height){
 			width = parseFloat(width);
 			height = parseFloat(height);
-			
+
 			// Get the details height, to do so, I need to clone it since it's invisible
 			$pp_details = $pp_pic_holder.find('.pp_details');
 			$pp_details.width(width);
 			detailsHeight = parseFloat($pp_details.css('marginTop')) + parseFloat($pp_details.css('marginBottom'));
-			
+
 			$pp_details = $pp_details.clone().addClass(settings.theme).width(width).appendTo($('body')).css({
 				'position':'absolute',
 				'top':-10000
@@ -631,7 +631,7 @@
 			detailsHeight += $pp_details.height();
 			detailsHeight = (detailsHeight <= 34) ? 36 : detailsHeight; // Min-height for the details
 			$pp_details.remove();
-			
+
 			// Get the titles height, to do so, I need to clone it since it's invisible
 			$pp_title = $pp_pic_holder.find('.ppt');
 			$pp_title.width(width);
@@ -642,20 +642,20 @@
 			});
 			titleHeight += $pp_title.height();
 			$pp_title.remove();
-			
+
 			// Get the container size, to resize the holder to the right dimensions
 			pp_contentHeight = height + detailsHeight;
 			pp_contentWidth = width;
 			pp_containerHeight = pp_contentHeight + titleHeight + $pp_pic_holder.find('.pp_top').height() + $pp_pic_holder.find('.pp_bottom').height();
 			pp_containerWidth = width;
 		}
-	
+
 		function _getFileType(itemSrc){
 			if (itemSrc.match(/youtube\.com\/watch/i) || itemSrc.match(/youtu\.be/i)) {
 				return 'youtube';
 			}else if (itemSrc.match(/vimeo\.com/i)) {
 				return 'vimeo';
-			}else if(itemSrc.match(/\b.mov\b/i)){ 
+			}else if(itemSrc.match(/\b.mov\b/i)){
 				return 'quicktime';
 			}else if(itemSrc.match(/\b.swf\b/i)){
 				return 'flash';
@@ -671,7 +671,7 @@
 				return 'image';
 			};
 		};
-	
+
 		function _center_overlay(){
 			if(doresize && typeof $pp_pic_holder != 'undefined') {
 				scroll_pos = _get_scroll();
@@ -679,7 +679,7 @@
 
 				projectedTop = (windowHeight/2) + scroll_pos['scrollTop'] - (contentHeight/2);
 				if(projectedTop < 0) projectedTop = 0;
-				
+
 				if(contentHeight > windowHeight)
 					return;
 
@@ -689,7 +689,7 @@
 				});
 			};
 		};
-	
+
 		function _get_scroll(){
 			if (self.pageYOffset) {
 				return {scrollTop:self.pageYOffset,scrollLeft:self.pageXOffset};
@@ -699,18 +699,18 @@
 				return {scrollTop:document.body.scrollTop,scrollLeft:document.body.scrollLeft};
 			};
 		};
-	
+
 		function _resize_overlay() {
 			windowHeight = $(window).height(), windowWidth = $(window).width();
-			
+
 			if(typeof $pp_overlay != "undefined") $pp_overlay.height($(document).height()).width(windowWidth);
 		};
-	
+
 		function _insert_gallery(){
 			if(isSet && settings.overlay_gallery && _getFileType(pp_images[set_position])=="image") {
 				itemWidth = 52+5; // 52 beign the thumb width, 5 being the right margin.
 				navWidth = (settings.theme == "facebook" || settings.theme == "pp_default") ? 50 : 30; // Define the arrow width depending on the theme
-				
+
 				itemsPerPage = Math.floor((pp_dimensions['containerWidth'] - 100 - navWidth) / itemWidth);
 				itemsPerPage = (itemsPerPage < pp_images.length) ? itemsPerPage : pp_images.length;
 				totalPage = Math.ceil(pp_images.length / itemsPerPage) - 1;
@@ -725,36 +725,36 @@
 
 				galleryWidth = itemsPerPage * itemWidth;
 				fullGalleryWidth = pp_images.length * itemWidth;
-				
+
 				// Set the proper width to the gallery items
 				$pp_gallery
 					.css('margin-left',-((galleryWidth/2) + (navWidth/2)))
 					.find('div:first').width(galleryWidth+5)
 					.find('ul').width(fullGalleryWidth)
 					.find('li.selected').removeClass('selected');
-				
+
 				goToPage = (Math.floor(set_position/itemsPerPage) < totalPage) ? Math.floor(set_position/itemsPerPage) : totalPage;
 
 				$.prettyPhoto.changeGalleryPage(goToPage);
-				
+
 				$pp_gallery_li.filter(':eq('+set_position+')').addClass('selected');
 			}else{
 				$pp_pic_holder.find('.pp_content').unbind('mouseenter mouseleave');
 				// $pp_gallery.hide();
 			}
 		}
-	
+
 		function _build_overlay(caller){
 			// Inject Social Tool markup into General markup
 			if(settings.social_tools)
-				facebook_like_link = settings.social_tools.replace('{location_href}', encodeURIComponent(location.href)); 
+				facebook_like_link = settings.social_tools.replace('{location_href}', encodeURIComponent(location.href));
+
+			settings.markup = settings.markup.replace('{pp_social}','');
 
-			settings.markup = settings.markup.replace('{pp_social}',''); 
-			
 			$('body').append(settings.markup); // Inject the markup
-			
+
 			$pp_pic_holder = $('.pp_pic_holder') , $ppt = $('.ppt'), $pp_overlay = $('div.pp_overlay'); // Set my global selectors
-			
+
 			// Inject the inline gallery!
 			if(isSet && settings.overlay_gallery) {
 				currentGalleryPage = 0;
@@ -769,25 +769,25 @@
 					}
 					toInject += "<li class='"+classname+"'><a href='#'><img src='" + img_src + "' width='50' alt='' /></a></li>";
 				};
-				
+
 				toInject = settings.gallery_markup.replace(/{gallery}/g,toInject);
-				
+
 				$pp_pic_holder.find('#pp_full_res').after(toInject);
-				
+
 				$pp_gallery = $('.pp_pic_holder .pp_gallery'), $pp_gallery_li = $pp_gallery.find('li'); // Set the gallery selectors
-				
+
 				$pp_gallery.find('.pp_arrow_next').click(function(){
 					$.prettyPhoto.changeGalleryPage('next');
 					$.prettyPhoto.stopSlideshow();
 					return false;
 				});
-				
+
 				$pp_gallery.find('.pp_arrow_previous').click(function(){
 					$.prettyPhoto.changeGalleryPage('previous');
 					$.prettyPhoto.stopSlideshow();
 					return false;
 				});
-				
+
 				$pp_pic_holder.find('.pp_content').hover(
 					function(){
 						$pp_pic_holder.find('.pp_gallery:not(.disabled)').fadeIn();
@@ -807,8 +807,8 @@
 						});
 				});
 			};
-			
-			
+
+
 			// Inject the play/pause if it's a slideshow
 			if(settings.slideshow){
 				$pp_pic_holder.find('.pp_nav').prepend('<a href="#" class="pp_play">Play</a>')
@@ -817,9 +817,9 @@
 					return false;
 				});
 			}
-			
+
 			$pp_pic_holder.attr('class','pp_pic_holder ' + settings.theme); // Set the proper theme
-			
+
 			$pp_overlay
 				.css({
 					'opacity':0,
@@ -843,31 +843,31 @@
 						$(this).removeClass('pp_contract').addClass('pp_expand');
 						doresize = true;
 					};
-				
+
 					_hideContent(function(){ $.prettyPhoto.open(); });
-			
+
 					return false;
 				});
 			}
-		
+
 			$pp_pic_holder.find('.pp_previous, .pp_nav .pp_arrow_previous').bind('click',function(){
 				$.prettyPhoto.changePage('previous');
 				$.prettyPhoto.stopSlideshow();
 				return false;
 			});
-		
+
 			$pp_pic_holder.find('.pp_next, .pp_nav .pp_arrow_next').bind('click',function(){
 				$.prettyPhoto.changePage('next');
 				$.prettyPhoto.stopSlideshow();
 				return false;
 			});
-			
+
 			_center_overlay(); // Center it
 		};
 
 		if(!pp_alreadyInitialized && getHashtag()){
 			pp_alreadyInitialized = true;
-			
+
 			// Grab the rel index to trigger the click on the correct element
 			hashIndex = getHashtag();
 			hashRel = hashIndex;
@@ -878,26 +878,26 @@
 			// Useful in the event the page contain several init scripts.
 			setTimeout(function(){ $("a["+pp_settings.hook+"^='"+hashRel+"']:eq("+hashIndex+")").trigger('click'); },50);
 		}
-		
+
 		return this.unbind('click.prettyphoto').bind('click.prettyphoto',$.prettyPhoto.initialize); // Return the jQuery object for chaining. The unbind method is used to avoid click conflict when the plugin is called more than once
 	};
-	
+
 	function getHashtag(){
 		var url = location.href;
 		hashtag = (url.indexOf('#prettyPhoto') !== -1) ? decodeURI(url.substring(url.indexOf('#prettyPhoto')+1,url.length)) : false;
 		if(hashtag){  hashtag = hashtag.replace(/<|>/g,''); }
 		return hashtag;
 	};
-	
+
 	function setHashtag(){
 		if(typeof theRel == 'undefined') return; // theRel is set on normal calls, it's impossible to deeplink using the API
 		location.hash = theRel + '/'+rel_index+'/';
 	};
-	
+
 	function clearHashtag(){
 		if ( location.href.indexOf('#prettyPhoto') !== -1 ) location.hash = "prettyPhoto";
 	}
-	
+
 	function getParam(name,url){
 	  name = name.replace(/[\[]/,"\\\[").replace(/[\]]/,"\\\]");
 	  var regexS = "[\\?&]"+name+"=([^&#]*)";
@@ -905,7 +905,7 @@
 	  var results = regex.exec( url );
 	  return ( results == null ) ? "" : results[1];
 	}
-	
+
 })(jQuery);
 
 var pp_alreadyInitialized = false; // Used for the deep linking to make sure not to call the same function several times.
diff --git a/assets/js/prettyPhoto/jquery.prettyPhoto.min.js b/assets/js/prettyPhoto/jquery.prettyPhoto.min.js
index 793052a25d1..7d1a0346aa7 100644
--- a/assets/js/prettyPhoto/jquery.prettyPhoto.min.js
+++ b/assets/js/prettyPhoto/jquery.prettyPhoto.min.js
@@ -1 +1 @@
-!function(a){function b(){var a=location.href;return hashtag=-1!==a.indexOf("#prettyPhoto")?decodeURI(a.substring(a.indexOf("#prettyPhoto")+1,a.length)):!1,hashtag&&(hashtag=hashtag.replace(/<|>/g,"")),hashtag}function c(){"undefined"!=typeof theRel&&(location.hash=theRel+"/"+rel_index+"/")}function d(){-1!==location.href.indexOf("#prettyPhoto")&&(location.hash="prettyPhoto")}function e(a,b){a=a.replace(/[\[]/,"\\[").replace(/[\]]/,"\\]");var c="[\\?&]"+a+"=([^&#]*)",d=new RegExp(c),e=d.exec(b);return null==e?"":e[1]}a.prettyPhoto={version:"3.1.6"},a.fn.prettyPhoto=function(f){function g(){a(".pp_loaderIcon").hide(),projectedTop=scroll_pos.scrollTop+(A/2-r.containerHeight/2),projectedTop<0&&(projectedTop=0),$ppt.fadeTo(settings.animation_speed,1),$pp_pic_holder.find(".pp_content").animate({height:r.contentHeight,width:r.contentWidth},settings.animation_speed),$pp_pic_holder.animate({top:projectedTop,left:B/2-r.containerWidth/2<0?0:B/2-r.containerWidth/2,width:r.containerWidth},settings.animation_speed,function(){$pp_pic_holder.find(".pp_hoverContainer,#fullResImage").height(r.height).width(r.width),$pp_pic_holder.find(".pp_fade").fadeIn(settings.animation_speed),isSet&&"image"==l(pp_images[set_position])?$pp_pic_holder.find(".pp_hoverContainer").show():$pp_pic_holder.find(".pp_hoverContainer").hide(),settings.allow_expand&&(r.resized?a("a.pp_expand,a.pp_contract").show():a("a.pp_expand").hide()),!settings.autoplay_slideshow||x||s||a.prettyPhoto.startSlideshow(),settings.changepicturecallback(),s=!0}),p(),f.ajaxcallback()}function h(b){$pp_pic_holder.find("#pp_full_res object,#pp_full_res embed").css("visibility","hidden"),$pp_pic_holder.find(".pp_fade").fadeOut(settings.animation_speed,function(){a(".pp_loaderIcon").show(),b()})}function i(b){b>1?a(".pp_nav").show():a(".pp_nav").hide()}function j(a,b){if(resized=!1,k(a,b),imageWidth=a,imageHeight=b,(w>B||v>A)&&doresize&&settings.allow_resize&&!z){for(resized=!0,fitting=!1;!fitting;)w>B?(imageWidth=B-200,imageHeight=b/a*imageWidth):v>A?(imageHeight=A-200,imageWidth=a/b*imageHeight):fitting=!0,v=imageHeight,w=imageWidth;(w>B||v>A)&&j(w,v),k(imageWidth,imageHeight)}return{width:Math.floor(imageWidth),height:Math.floor(imageHeight),containerHeight:Math.floor(v),containerWidth:Math.floor(w)+2*settings.horizontal_padding,contentHeight:Math.floor(t),contentWidth:Math.floor(u),resized:resized}}function k(b,c){b=parseFloat(b),c=parseFloat(c),$pp_details=$pp_pic_holder.find(".pp_details"),$pp_details.width(b),detailsHeight=parseFloat($pp_details.css("marginTop"))+parseFloat($pp_details.css("marginBottom")),$pp_details=$pp_details.clone().addClass(settings.theme).width(b).appendTo(a("body")).css({position:"absolute",top:-1e4}),detailsHeight+=$pp_details.height(),detailsHeight=detailsHeight<=34?36:detailsHeight,$pp_details.remove(),$pp_title=$pp_pic_holder.find(".ppt"),$pp_title.width(b),titleHeight=parseFloat($pp_title.css("marginTop"))+parseFloat($pp_title.css("marginBottom")),$pp_title=$pp_title.clone().appendTo(a("body")).css({position:"absolute",top:-1e4}),titleHeight+=$pp_title.height(),$pp_title.remove(),t=c+detailsHeight,u=b,v=t+titleHeight+$pp_pic_holder.find(".pp_top").height()+$pp_pic_holder.find(".pp_bottom").height(),w=b}function l(a){return a.match(/youtube\.com\/watch/i)||a.match(/youtu\.be/i)?"youtube":a.match(/vimeo\.com/i)?"vimeo":a.match(/\b.mov\b/i)?"quicktime":a.match(/\b.swf\b/i)?"flash":a.match(/\biframe=true\b/i)?"iframe":a.match(/\bajax=true\b/i)?"ajax":a.match(/\bcustom=true\b/i)?"custom":"#"==a.substr(0,1)?"inline":"image"}function m(){if(doresize&&"undefined"!=typeof $pp_pic_holder){if(scroll_pos=n(),contentHeight=$pp_pic_holder.height(),contentwidth=$pp_pic_holder.width(),projectedTop=A/2+scroll_pos.scrollTop-contentHeight/2,projectedTop<0&&(projectedTop=0),contentHeight>A)return;$pp_pic_holder.css({top:projectedTop,left:B/2+scroll_pos.scrollLeft-contentwidth/2})}}function n(){return self.pageYOffset?{scrollTop:self.pageYOffset,scrollLeft:self.pageXOffset}:document.documentElement&&document.documentElement.scrollTop?{scrollTop:document.documentElement.scrollTop,scrollLeft:document.documentElement.scrollLeft}:document.body?{scrollTop:document.body.scrollTop,scrollLeft:document.body.scrollLeft}:void 0}function o(){A=a(window).height(),B=a(window).width(),"undefined"!=typeof $pp_overlay&&$pp_overlay.height(a(document).height()).width(B)}function p(){isSet&&settings.overlay_gallery&&"image"==l(pp_images[set_position])?(itemWidth=57,navWidth="facebook"==settings.theme||"pp_default"==settings.theme?50:30,itemsPerPage=Math.floor((r.containerWidth-100-navWidth)/itemWidth),itemsPerPage=itemsPerPage<pp_images.length?itemsPerPage:pp_images.length,totalPage=Math.ceil(pp_images.length/itemsPerPage)-1,0==totalPage?(navWidth=0,$pp_gallery.find(".pp_arrow_next,.pp_arrow_previous").hide()):$pp_gallery.find(".pp_arrow_next,.pp_arrow_previous").show(),galleryWidth=itemsPerPage*itemWidth,fullGalleryWidth=pp_images.length*itemWidth,$pp_gallery.css("margin-left",-(galleryWidth/2+navWidth/2)).find("div:first").width(galleryWidth+5).find("ul").width(fullGalleryWidth).find("li.selected").removeClass("selected"),goToPage=Math.floor(set_position/itemsPerPage)<totalPage?Math.floor(set_position/itemsPerPage):totalPage,a.prettyPhoto.changeGalleryPage(goToPage),$pp_gallery_li.filter(":eq("+set_position+")").addClass("selected")):$pp_pic_holder.find(".pp_content").unbind("mouseenter mouseleave")}function q(b){if(settings.social_tools&&(facebook_like_link=settings.social_tools.replace("{location_href}",encodeURIComponent(location.href))),settings.markup=settings.markup.replace("{pp_social}",""),a("body").append(settings.markup),$pp_pic_holder=a(".pp_pic_holder"),$ppt=a(".ppt"),$pp_overlay=a("div.pp_overlay"),isSet&&settings.overlay_gallery){currentGalleryPage=0,toInject="";for(var c=0;c<pp_images.length;c++)pp_images[c].match(/\b(jpg|jpeg|png|gif)\b/gi)?(classname="",img_src=pp_images[c]):(classname="default",img_src=""),toInject+="<li class='"+classname+"'><a href='#'><img src='"+img_src+"' width='50' alt='' /></a></li>";toInject=settings.gallery_markup.replace(/{gallery}/g,toInject),$pp_pic_holder.find("#pp_full_res").after(toInject),$pp_gallery=a(".pp_pic_holder .pp_gallery"),$pp_gallery_li=$pp_gallery.find("li"),$pp_gallery.find(".pp_arrow_next").click(function(){return a.prettyPhoto.changeGalleryPage("next"),a.prettyPhoto.stopSlideshow(),!1}),$pp_gallery.find(".pp_arrow_previous").click(function(){return a.prettyPhoto.changeGalleryPage("previous"),a.prettyPhoto.stopSlideshow(),!1}),$pp_pic_holder.find(".pp_content").hover(function(){$pp_pic_holder.find(".pp_gallery:not(.disabled)").fadeIn()},function(){$pp_pic_holder.find(".pp_gallery:not(.disabled)").fadeOut()}),itemWidth=57,$pp_gallery_li.each(function(b){a(this).find("a").click(function(){return a.prettyPhoto.changePage(b),a.prettyPhoto.stopSlideshow(),!1})})}settings.slideshow&&($pp_pic_holder.find(".pp_nav").prepend('<a href="#" class="pp_play">Play</a>'),$pp_pic_holder.find(".pp_nav .pp_play").click(function(){return a.prettyPhoto.startSlideshow(),!1})),$pp_pic_holder.attr("class","pp_pic_holder "+settings.theme),$pp_overlay.css({opacity:0,height:a(document).height(),width:a(window).width()}).bind("click",function(){settings.modal||a.prettyPhoto.close()}),a("a.pp_close").bind("click",function(){return a.prettyPhoto.close(),!1}),settings.allow_expand&&a("a.pp_expand").bind("click",function(b){return a(this).hasClass("pp_expand")?(a(this).removeClass("pp_expand").addClass("pp_contract"),doresize=!1):(a(this).removeClass("pp_contract").addClass("pp_expand"),doresize=!0),h(function(){a.prettyPhoto.open()}),!1}),$pp_pic_holder.find(".pp_previous, .pp_nav .pp_arrow_previous").bind("click",function(){return a.prettyPhoto.changePage("previous"),a.prettyPhoto.stopSlideshow(),!1}),$pp_pic_holder.find(".pp_next, .pp_nav .pp_arrow_next").bind("click",function(){return a.prettyPhoto.changePage("next"),a.prettyPhoto.stopSlideshow(),!1}),m()}f=jQuery.extend({hook:"rel",animation_speed:"fast",ajaxcallback:function(){},slideshow:5e3,autoplay_slideshow:!1,opacity:.8,show_title:!0,allow_resize:!0,allow_expand:!0,default_width:500,default_height:344,counter_separator_label:"/",theme:"pp_default",horizontal_padding:20,hideflash:!1,wmode:"opaque",autoplay:!0,modal:!1,deeplinking:!0,overlay_gallery:!0,overlay_gallery_max:30,keyboard_shortcuts:!0,changepicturecallback:function(){},callback:function(){},ie6_fallback:!0,markup:'<div class="pp_pic_holder"> 						<div class="ppt">&nbsp;</div> 						<div class="pp_top"> 							<div class="pp_left"></div> 							<div class="pp_middle"></div> 							<div class="pp_right"></div> 						</div> 						<div class="pp_content_container"> 							<div class="pp_left"> 							<div class="pp_right"> 								<div class="pp_content"> 									<div class="pp_loaderIcon"></div> 									<div class="pp_fade"> 										<a href="#" class="pp_expand" title="Expand the image">Expand</a> 										<div class="pp_hoverContainer"> 											<a class="pp_next" href="#">next</a> 											<a class="pp_previous" href="#">previous</a> 										</div> 										<div id="pp_full_res"></div> 										<div class="pp_details"> 											<div class="pp_nav"> 												<a href="#" class="pp_arrow_previous">Previous</a> 												<p class="currentTextHolder">0/0</p> 												<a href="#" class="pp_arrow_next">Next</a> 											</div> 											<p class="pp_description"></p> 											<div class="pp_social">{pp_social}</div> 											<a class="pp_close" href="#">Close</a> 										</div> 									</div> 								</div> 							</div> 							</div> 						</div> 						<div class="pp_bottom"> 							<div class="pp_left"></div> 							<div class="pp_middle"></div> 							<div class="pp_right"></div> 						</div> 					</div> 					<div class="pp_overlay"></div>',gallery_markup:'<div class="pp_gallery"> 								<a href="#" class="pp_arrow_previous">Previous</a> 								<div> 									<ul> 										{gallery} 									</ul> 								</div> 								<a href="#" class="pp_arrow_next">Next</a> 							</div>',image_markup:'<img id="fullResImage" src="{path}" />',flash_markup:'<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="{width}" height="{height}"><param name="wmode" value="{wmode}" /><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="{path}" /><embed src="{path}" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="{width}" height="{height}" wmode="{wmode}"></embed></object>',quicktime_markup:'<object classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab" height="{height}" width="{width}"><param name="src" value="{path}"><param name="autoplay" value="{autoplay}"><param name="type" value="video/quicktime"><embed src="{path}" height="{height}" width="{width}" autoplay="{autoplay}" type="video/quicktime" pluginspage="http://www.apple.com/quicktime/download/"></embed></object>',iframe_markup:'<iframe src ="{path}" width="{width}" height="{height}" frameborder="no"></iframe>',inline_markup:'<div class="pp_inline">{content}</div>',custom_markup:"",social_tools:'<div class="twitter"><a href="http://twitter.com/share" class="twitter-share-button" data-count="none">Tweet</a><script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script></div><div class="facebook"><iframe src="//www.facebook.com/plugins/like.php?locale=en_US&href={location_href}&amp;layout=button_count&amp;show_faces=true&amp;width=500&amp;action=like&amp;font&amp;colorscheme=light&amp;height=23" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:500px; height:23px;" allowTransparency="true"></iframe></div>'},f);var r,s,t,u,v,w,x,y=this,z=!1,A=a(window).height(),B=a(window).width();return doresize=!0,scroll_pos=n(),a(window).unbind("resize.prettyphoto").bind("resize.prettyphoto",function(){m(),o()}),f.keyboard_shortcuts&&a(document).unbind("keydown.prettyphoto").bind("keydown.prettyphoto",function(b){if("undefined"!=typeof $pp_pic_holder&&$pp_pic_holder.is(":visible"))switch(b.keyCode){case 37:a.prettyPhoto.changePage("previous"),b.preventDefault();break;case 39:a.prettyPhoto.changePage("next"),b.preventDefault();break;case 27:settings.modal||a.prettyPhoto.close(),b.preventDefault()}}),a.prettyPhoto.initialize=function(){return settings=f,"pp_default"==settings.theme&&(settings.horizontal_padding=16),theRel=a(this).attr(settings.hook),galleryRegExp=/\[(?:.*)\]/,isSet=galleryRegExp.exec(theRel)?!0:!1,pp_images=isSet?jQuery.map(y,function(b,c){return-1!=a(b).attr(settings.hook).indexOf(theRel)?a(b).attr("href"):void 0}):a.makeArray(a(this).attr("href")),pp_titles=isSet?jQuery.map(y,function(b,c){return-1!=a(b).attr(settings.hook).indexOf(theRel)?a(b).find("img").attr("alt")?a(b).find("img").attr("alt"):"":void 0}):a.makeArray(a(this).find("img").attr("alt")),pp_descriptions=isSet?jQuery.map(y,function(b,c){return-1!=a(b).attr(settings.hook).indexOf(theRel)?a(b).attr("title")?a(b).attr("title"):"":void 0}):a.makeArray(a(this).attr("title")),pp_images.length>settings.overlay_gallery_max&&(settings.overlay_gallery=!1),set_position=jQuery.inArray(a(this).attr("href"),pp_images),rel_index=isSet?set_position:a("a["+settings.hook+"^='"+theRel+"']").index(a(this)),q(this),settings.allow_resize&&a(window).bind("scroll.prettyphoto",function(){m()}),a.prettyPhoto.open(),!1},a.prettyPhoto.open=function(b){return"undefined"==typeof settings&&(settings=f,pp_images=a.makeArray(arguments[0]),pp_titles=arguments[1]?a.makeArray(arguments[1]):a.makeArray(""),pp_descriptions=arguments[2]?a.makeArray(arguments[2]):a.makeArray(""),isSet=pp_images.length>1?!0:!1,set_position=arguments[3]?arguments[3]:0,q(b.target)),settings.hideflash&&a("object,embed,iframe[src*=youtube],iframe[src*=vimeo]").css("visibility","hidden"),i(a(pp_images).size()),a(".pp_loaderIcon").show(),settings.deeplinking&&c(),settings.social_tools&&(facebook_like_link=settings.social_tools.replace("{location_href}",encodeURIComponent(location.href)),$pp_pic_holder.find(".pp_social").html(facebook_like_link)),$ppt.is(":hidden")&&$ppt.css("opacity",0).show(),$pp_overlay.show().fadeTo(settings.animation_speed,settings.opacity),$pp_pic_holder.find(".currentTextHolder").text(set_position+1+settings.counter_separator_label+a(pp_images).size()),"undefined"!=typeof pp_descriptions[set_position]&&""!=pp_descriptions[set_position]?$pp_pic_holder.find(".pp_description").show().html(unescape(pp_descriptions[set_position])):$pp_pic_holder.find(".pp_description").hide(),movie_width=parseFloat(e("width",pp_images[set_position]))?e("width",pp_images[set_position]):settings.default_width.toString(),movie_height=parseFloat(e("height",pp_images[set_position]))?e("height",pp_images[set_position]):settings.default_height.toString(),z=!1,-1!=movie_height.indexOf("%")&&(movie_height=parseFloat(a(window).height()*parseFloat(movie_height)/100-150),z=!0),-1!=movie_width.indexOf("%")&&(movie_width=parseFloat(a(window).width()*parseFloat(movie_width)/100-150),z=!0),$pp_pic_holder.fadeIn(function(){switch(settings.show_title&&""!=pp_titles[set_position]&&"undefined"!=typeof pp_titles[set_position]?$ppt.html(unescape(pp_titles[set_position])):$ppt.html("&nbsp;"),imgPreloader="",skipInjection=!1,l(pp_images[set_position])){case"image":imgPreloader=new Image,nextImage=new Image,isSet&&set_position<a(pp_images).size()-1&&(nextImage.src=pp_images[set_position+1]),prevImage=new Image,isSet&&pp_images[set_position-1]&&(prevImage.src=pp_images[set_position-1]),$pp_pic_holder.find("#pp_full_res")[0].innerHTML=settings.image_markup.replace(/{path}/g,pp_images[set_position]),imgPreloader.onload=function(){r=j(imgPreloader.width,imgPreloader.height),g()},imgPreloader.onerror=function(){alert("Image cannot be loaded. Make sure the path is correct and image exist."),a.prettyPhoto.close()},imgPreloader.src=pp_images[set_position];break;case"youtube":r=j(movie_width,movie_height),movie_id=e("v",pp_images[set_position]),""==movie_id&&(movie_id=pp_images[set_position].split("youtu.be/"),movie_id=movie_id[1],movie_id.indexOf("?")>0&&(movie_id=movie_id.substr(0,movie_id.indexOf("?"))),movie_id.indexOf("&")>0&&(movie_id=movie_id.substr(0,movie_id.indexOf("&")))),movie="http://www.youtube.com/embed/"+movie_id,e("rel",pp_images[set_position])?movie+="?rel="+e("rel",pp_images[set_position]):movie+="?rel=1",settings.autoplay&&(movie+="&autoplay=1"),toInject=settings.iframe_markup.replace(/{width}/g,r.width).replace(/{height}/g,r.height).replace(/{wmode}/g,settings.wmode).replace(/{path}/g,movie);break;case"vimeo":r=j(movie_width,movie_height),movie_id=pp_images[set_position];var b=/http(s?):\/\/(www\.)?vimeo.com\/(\d+)/,c=movie_id.match(b);movie="http://player.vimeo.com/video/"+c[3]+"?title=0&amp;byline=0&amp;portrait=0",settings.autoplay&&(movie+="&autoplay=1;"),vimeo_width=r.width+"/embed/?moog_width="+r.width,toInject=settings.iframe_markup.replace(/{width}/g,vimeo_width).replace(/{height}/g,r.height).replace(/{path}/g,movie);break;case"quicktime":r=j(movie_width,movie_height),r.height+=15,r.contentHeight+=15,r.containerHeight+=15,toInject=settings.quicktime_markup.replace(/{width}/g,r.width).replace(/{height}/g,r.height).replace(/{wmode}/g,settings.wmode).replace(/{path}/g,pp_images[set_position]).replace(/{autoplay}/g,settings.autoplay);break;case"flash":r=j(movie_width,movie_height),flash_vars=pp_images[set_position],flash_vars=flash_vars.substring(pp_images[set_position].indexOf("flashvars")+10,pp_images[set_position].length),filename=pp_images[set_position],filename=filename.substring(0,filename.indexOf("?")),toInject=settings.flash_markup.replace(/{width}/g,r.width).replace(/{height}/g,r.height).replace(/{wmode}/g,settings.wmode).replace(/{path}/g,filename+"?"+flash_vars);break;case"iframe":r=j(movie_width,movie_height),frame_url=pp_images[set_position],frame_url=frame_url.substr(0,frame_url.indexOf("iframe")-1),toInject=settings.iframe_markup.replace(/{width}/g,r.width).replace(/{height}/g,r.height).replace(/{path}/g,frame_url);break;case"ajax":doresize=!1,r=j(movie_width,movie_height),doresize=!0,skipInjection=!0,a.get(pp_images[set_position],function(a){toInject=settings.inline_markup.replace(/{content}/g,a),$pp_pic_holder.find("#pp_full_res")[0].innerHTML=toInject,g()});break;case"custom":r=j(movie_width,movie_height),toInject=settings.custom_markup;break;case"inline":myClone=a(pp_images[set_position]).clone().append('<br clear="all" />').css({width:settings.default_width}).wrapInner('<div id="pp_full_res"><div class="pp_inline"></div></div>').appendTo(a("body")).show(),doresize=!1,r=j(a(myClone).width(),a(myClone).height()),doresize=!0,a(myClone).remove(),toInject=settings.inline_markup.replace(/{content}/g,a(pp_images[set_position]).html())}imgPreloader||skipInjection||($pp_pic_holder.find("#pp_full_res")[0].innerHTML=toInject,g())}),!1},a.prettyPhoto.changePage=function(b){currentGalleryPage=0,"previous"==b?(set_position--,set_position<0&&(set_position=a(pp_images).size()-1)):"next"==b?(set_position++,set_position>a(pp_images).size()-1&&(set_position=0)):set_position=b,rel_index=set_position,doresize||(doresize=!0),settings.allow_expand&&a(".pp_contract").removeClass("pp_contract").addClass("pp_expand"),h(function(){a.prettyPhoto.open()})},a.prettyPhoto.changeGalleryPage=function(a){"next"==a?(currentGalleryPage++,currentGalleryPage>totalPage&&(currentGalleryPage=0)):"previous"==a?(currentGalleryPage--,currentGalleryPage<0&&(currentGalleryPage=totalPage)):currentGalleryPage=a,slide_speed="next"==a||"previous"==a?settings.animation_speed:0,slide_to=currentGalleryPage*(itemsPerPage*itemWidth),$pp_gallery.find("ul").animate({left:-slide_to},slide_speed)},a.prettyPhoto.startSlideshow=function(){"undefined"==typeof x?($pp_pic_holder.find(".pp_play").unbind("click").removeClass("pp_play").addClass("pp_pause").click(function(){return a.prettyPhoto.stopSlideshow(),!1}),x=setInterval(a.prettyPhoto.startSlideshow,settings.slideshow)):a.prettyPhoto.changePage("next")},a.prettyPhoto.stopSlideshow=function(){$pp_pic_holder.find(".pp_pause").unbind("click").removeClass("pp_pause").addClass("pp_play").click(function(){return a.prettyPhoto.startSlideshow(),!1}),clearInterval(x),x=void 0},a.prettyPhoto.close=function(){$pp_overlay.is(":animated")||(a.prettyPhoto.stopSlideshow(),$pp_pic_holder.stop().find("object,embed").css("visibility","hidden"),a("div.pp_pic_holder,div.ppt,.pp_fade").fadeOut(settings.animation_speed,function(){a(this).remove()}),$pp_overlay.fadeOut(settings.animation_speed,function(){settings.hideflash&&a("object,embed,iframe[src*=youtube],iframe[src*=vimeo]").css("visibility","visible"),a(this).remove(),a(window).unbind("scroll.prettyphoto"),d(),settings.callback(),doresize=!0,s=!1,delete settings}))},!pp_alreadyInitialized&&b()&&(pp_alreadyInitialized=!0,hashIndex=b(),hashRel=hashIndex,hashIndex=hashIndex.substring(hashIndex.indexOf("/")+1,hashIndex.length-1),hashRel=hashRel.substring(0,hashRel.indexOf("/")),setTimeout(function(){a("a["+f.hook+"^='"+hashRel+"']:eq("+hashIndex+")").trigger("click")},50)),this.unbind("click.prettyphoto").bind("click.prettyphoto",a.prettyPhoto.initialize)}}(jQuery);var pp_alreadyInitialized=!1;
\ No newline at end of file
+!function(a){function b(){var a=location.href;return hashtag=a.indexOf("#prettyPhoto")!==-1&&decodeURI(a.substring(a.indexOf("#prettyPhoto")+1,a.length)),hashtag&&(hashtag=hashtag.replace(/<|>/g,"")),hashtag}function c(){"undefined"!=typeof theRel&&(location.hash=theRel+"/"+rel_index+"/")}function d(){location.href.indexOf("#prettyPhoto")!==-1&&(location.hash="prettyPhoto")}function e(a,b){a=a.replace(/[\[]/,"\\[").replace(/[\]]/,"\\]");var c="[\\?&]"+a+"=([^&#]*)",d=new RegExp(c),e=d.exec(b);return null==e?"":e[1]}a.prettyPhoto={version:"3.1.6"},a.fn.prettyPhoto=function(f){function g(){a(".pp_loaderIcon").hide(),projectedTop=scroll_pos.scrollTop+(A/2-r.containerHeight/2),projectedTop<0&&(projectedTop=0),$ppt.fadeTo(settings.animation_speed,1),$pp_pic_holder.find(".pp_content").animate({height:r.contentHeight,width:r.contentWidth},settings.animation_speed),$pp_pic_holder.animate({top:projectedTop,left:B/2-r.containerWidth/2<0?0:B/2-r.containerWidth/2,width:r.containerWidth},settings.animation_speed,function(){$pp_pic_holder.find(".pp_hoverContainer,#fullResImage").height(r.height).width(r.width),$pp_pic_holder.find(".pp_fade").fadeIn(settings.animation_speed),isSet&&"image"==l(pp_images[set_position])?$pp_pic_holder.find(".pp_hoverContainer").show():$pp_pic_holder.find(".pp_hoverContainer").hide(),settings.allow_expand&&(r.resized?a("a.pp_expand,a.pp_contract").show():a("a.pp_expand").hide()),!settings.autoplay_slideshow||x||s||a.prettyPhoto.startSlideshow(),settings.changepicturecallback(),s=!0}),p(),f.ajaxcallback()}function h(b){$pp_pic_holder.find("#pp_full_res object,#pp_full_res embed").css("visibility","hidden"),$pp_pic_holder.find(".pp_fade").fadeOut(settings.animation_speed,function(){a(".pp_loaderIcon").show(),b()})}function i(b){b>1?a(".pp_nav").show():a(".pp_nav").hide()}function j(a,b){if(resized=!1,k(a,b),imageWidth=a,imageHeight=b,(w>B||v>A)&&doresize&&settings.allow_resize&&!z){for(resized=!0,fitting=!1;!fitting;)w>B?(imageWidth=B-200,imageHeight=b/a*imageWidth):v>A?(imageHeight=A-200,imageWidth=a/b*imageHeight):fitting=!0,v=imageHeight,w=imageWidth;(w>B||v>A)&&j(w,v),k(imageWidth,imageHeight)}return{width:Math.floor(imageWidth),height:Math.floor(imageHeight),containerHeight:Math.floor(v),containerWidth:Math.floor(w)+2*settings.horizontal_padding,contentHeight:Math.floor(t),contentWidth:Math.floor(u),resized:resized}}function k(b,c){b=parseFloat(b),c=parseFloat(c),$pp_details=$pp_pic_holder.find(".pp_details"),$pp_details.width(b),detailsHeight=parseFloat($pp_details.css("marginTop"))+parseFloat($pp_details.css("marginBottom")),$pp_details=$pp_details.clone().addClass(settings.theme).width(b).appendTo(a("body")).css({position:"absolute",top:-1e4}),detailsHeight+=$pp_details.height(),detailsHeight=detailsHeight<=34?36:detailsHeight,$pp_details.remove(),$pp_title=$pp_pic_holder.find(".ppt"),$pp_title.width(b),titleHeight=parseFloat($pp_title.css("marginTop"))+parseFloat($pp_title.css("marginBottom")),$pp_title=$pp_title.clone().appendTo(a("body")).css({position:"absolute",top:-1e4}),titleHeight+=$pp_title.height(),$pp_title.remove(),t=c+detailsHeight,u=b,v=t+titleHeight+$pp_pic_holder.find(".pp_top").height()+$pp_pic_holder.find(".pp_bottom").height(),w=b}function l(a){return a.match(/youtube\.com\/watch/i)||a.match(/youtu\.be/i)?"youtube":a.match(/vimeo\.com/i)?"vimeo":a.match(/\b.mov\b/i)?"quicktime":a.match(/\b.swf\b/i)?"flash":a.match(/\biframe=true\b/i)?"iframe":a.match(/\bajax=true\b/i)?"ajax":a.match(/\bcustom=true\b/i)?"custom":"#"==a.substr(0,1)?"inline":"image"}function m(){if(doresize&&"undefined"!=typeof $pp_pic_holder){if(scroll_pos=n(),contentHeight=$pp_pic_holder.height(),contentwidth=$pp_pic_holder.width(),projectedTop=A/2+scroll_pos.scrollTop-contentHeight/2,projectedTop<0&&(projectedTop=0),contentHeight>A)return;$pp_pic_holder.css({top:projectedTop,left:B/2+scroll_pos.scrollLeft-contentwidth/2})}}function n(){return self.pageYOffset?{scrollTop:self.pageYOffset,scrollLeft:self.pageXOffset}:document.documentElement&&document.documentElement.scrollTop?{scrollTop:document.documentElement.scrollTop,scrollLeft:document.documentElement.scrollLeft}:document.body?{scrollTop:document.body.scrollTop,scrollLeft:document.body.scrollLeft}:void 0}function o(){A=a(window).height(),B=a(window).width(),"undefined"!=typeof $pp_overlay&&$pp_overlay.height(a(document).height()).width(B)}function p(){isSet&&settings.overlay_gallery&&"image"==l(pp_images[set_position])?(itemWidth=57,navWidth="facebook"==settings.theme||"pp_default"==settings.theme?50:30,itemsPerPage=Math.floor((r.containerWidth-100-navWidth)/itemWidth),itemsPerPage=itemsPerPage<pp_images.length?itemsPerPage:pp_images.length,totalPage=Math.ceil(pp_images.length/itemsPerPage)-1,0==totalPage?(navWidth=0,$pp_gallery.find(".pp_arrow_next,.pp_arrow_previous").hide()):$pp_gallery.find(".pp_arrow_next,.pp_arrow_previous").show(),galleryWidth=itemsPerPage*itemWidth,fullGalleryWidth=pp_images.length*itemWidth,$pp_gallery.css("margin-left",-(galleryWidth/2+navWidth/2)).find("div:first").width(galleryWidth+5).find("ul").width(fullGalleryWidth).find("li.selected").removeClass("selected"),goToPage=Math.floor(set_position/itemsPerPage)<totalPage?Math.floor(set_position/itemsPerPage):totalPage,a.prettyPhoto.changeGalleryPage(goToPage),$pp_gallery_li.filter(":eq("+set_position+")").addClass("selected")):$pp_pic_holder.find(".pp_content").unbind("mouseenter mouseleave")}function q(b){if(settings.social_tools&&(facebook_like_link=settings.social_tools.replace("{location_href}",encodeURIComponent(location.href))),settings.markup=settings.markup.replace("{pp_social}",""),a("body").append(settings.markup),$pp_pic_holder=a(".pp_pic_holder"),$ppt=a(".ppt"),$pp_overlay=a("div.pp_overlay"),isSet&&settings.overlay_gallery){currentGalleryPage=0,toInject="";for(var c=0;c<pp_images.length;c++)pp_images[c].match(/\b(jpg|jpeg|png|gif)\b/gi)?(classname="",img_src=pp_images[c]):(classname="default",img_src=""),toInject+="<li class='"+classname+"'><a href='#'><img src='"+img_src+"' width='50' alt='' /></a></li>";toInject=settings.gallery_markup.replace(/{gallery}/g,toInject),$pp_pic_holder.find("#pp_full_res").after(toInject),$pp_gallery=a(".pp_pic_holder .pp_gallery"),$pp_gallery_li=$pp_gallery.find("li"),$pp_gallery.find(".pp_arrow_next").click(function(){return a.prettyPhoto.changeGalleryPage("next"),a.prettyPhoto.stopSlideshow(),!1}),$pp_gallery.find(".pp_arrow_previous").click(function(){return a.prettyPhoto.changeGalleryPage("previous"),a.prettyPhoto.stopSlideshow(),!1}),$pp_pic_holder.find(".pp_content").hover(function(){$pp_pic_holder.find(".pp_gallery:not(.disabled)").fadeIn()},function(){$pp_pic_holder.find(".pp_gallery:not(.disabled)").fadeOut()}),itemWidth=57,$pp_gallery_li.each(function(b){a(this).find("a").click(function(){return a.prettyPhoto.changePage(b),a.prettyPhoto.stopSlideshow(),!1})})}settings.slideshow&&($pp_pic_holder.find(".pp_nav").prepend('<a href="#" class="pp_play">Play</a>'),$pp_pic_holder.find(".pp_nav .pp_play").click(function(){return a.prettyPhoto.startSlideshow(),!1})),$pp_pic_holder.attr("class","pp_pic_holder "+settings.theme),$pp_overlay.css({opacity:0,height:a(document).height(),width:a(window).width()}).bind("click",function(){settings.modal||a.prettyPhoto.close()}),a("a.pp_close").bind("click",function(){return a.prettyPhoto.close(),!1}),settings.allow_expand&&a("a.pp_expand").bind("click",function(b){return a(this).hasClass("pp_expand")?(a(this).removeClass("pp_expand").addClass("pp_contract"),doresize=!1):(a(this).removeClass("pp_contract").addClass("pp_expand"),doresize=!0),h(function(){a.prettyPhoto.open()}),!1}),$pp_pic_holder.find(".pp_previous, .pp_nav .pp_arrow_previous").bind("click",function(){return a.prettyPhoto.changePage("previous"),a.prettyPhoto.stopSlideshow(),!1}),$pp_pic_holder.find(".pp_next, .pp_nav .pp_arrow_next").bind("click",function(){return a.prettyPhoto.changePage("next"),a.prettyPhoto.stopSlideshow(),!1}),m()}f=jQuery.extend({hook:"rel",animation_speed:"fast",ajaxcallback:function(){},slideshow:5e3,autoplay_slideshow:!1,opacity:.8,show_title:!0,allow_resize:!0,allow_expand:!0,default_width:500,default_height:344,counter_separator_label:"/",theme:"pp_default",horizontal_padding:20,hideflash:!1,wmode:"opaque",autoplay:!0,modal:!1,deeplinking:!0,overlay_gallery:!0,overlay_gallery_max:30,keyboard_shortcuts:!0,changepicturecallback:function(){},callback:function(){},ie6_fallback:!0,markup:'<div class="pp_pic_holder"> \t\t\t\t\t\t<div class="ppt">&nbsp;</div> \t\t\t\t\t\t<div class="pp_top"> \t\t\t\t\t\t\t<div class="pp_left"></div> \t\t\t\t\t\t\t<div class="pp_middle"></div> \t\t\t\t\t\t\t<div class="pp_right"></div> \t\t\t\t\t\t</div> \t\t\t\t\t\t<div class="pp_content_container"> \t\t\t\t\t\t\t<div class="pp_left"> \t\t\t\t\t\t\t<div class="pp_right"> \t\t\t\t\t\t\t\t<div class="pp_content"> \t\t\t\t\t\t\t\t\t<div class="pp_loaderIcon"></div> \t\t\t\t\t\t\t\t\t<div class="pp_fade"> \t\t\t\t\t\t\t\t\t\t<a href="#" class="pp_expand" title="Expand the image">Expand</a> \t\t\t\t\t\t\t\t\t\t<div class="pp_hoverContainer"> \t\t\t\t\t\t\t\t\t\t\t<a class="pp_next" href="#">next</a> \t\t\t\t\t\t\t\t\t\t\t<a class="pp_previous" href="#">previous</a> \t\t\t\t\t\t\t\t\t\t</div> \t\t\t\t\t\t\t\t\t\t<div id="pp_full_res"></div> \t\t\t\t\t\t\t\t\t\t<div class="pp_details"> \t\t\t\t\t\t\t\t\t\t\t<div class="pp_nav"> \t\t\t\t\t\t\t\t\t\t\t\t<a href="#" class="pp_arrow_previous">Previous</a> \t\t\t\t\t\t\t\t\t\t\t\t<p class="currentTextHolder">0/0</p> \t\t\t\t\t\t\t\t\t\t\t\t<a href="#" class="pp_arrow_next">Next</a> \t\t\t\t\t\t\t\t\t\t\t</div> \t\t\t\t\t\t\t\t\t\t\t<p class="pp_description"></p> \t\t\t\t\t\t\t\t\t\t\t<div class="pp_social">{pp_social}</div> \t\t\t\t\t\t\t\t\t\t\t<a class="pp_close" href="#">Close</a> \t\t\t\t\t\t\t\t\t\t</div> \t\t\t\t\t\t\t\t\t</div> \t\t\t\t\t\t\t\t</div> \t\t\t\t\t\t\t</div> \t\t\t\t\t\t\t</div> \t\t\t\t\t\t</div> \t\t\t\t\t\t<div class="pp_bottom"> \t\t\t\t\t\t\t<div class="pp_left"></div> \t\t\t\t\t\t\t<div class="pp_middle"></div> \t\t\t\t\t\t\t<div class="pp_right"></div> \t\t\t\t\t\t</div> \t\t\t\t\t</div> \t\t\t\t\t<div class="pp_overlay"></div>',gallery_markup:'<div class="pp_gallery"> \t\t\t\t\t\t\t\t<a href="#" class="pp_arrow_previous">Previous</a> \t\t\t\t\t\t\t\t<div> \t\t\t\t\t\t\t\t\t<ul> \t\t\t\t\t\t\t\t\t\t{gallery} \t\t\t\t\t\t\t\t\t</ul> \t\t\t\t\t\t\t\t</div> \t\t\t\t\t\t\t\t<a href="#" class="pp_arrow_next">Next</a> \t\t\t\t\t\t\t</div>',image_markup:'<img id="fullResImage" src="{path}" />',flash_markup:'<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="{width}" height="{height}"><param name="wmode" value="{wmode}" /><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="{path}" /><embed src="{path}" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="{width}" height="{height}" wmode="{wmode}"></embed></object>',quicktime_markup:'<object classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="https://www.apple.com/qtactivex/qtplugin.cab" height="{height}" width="{width}"><param name="src" value="{path}"><param name="autoplay" value="{autoplay}"><param name="type" value="video/quicktime"><embed src="{path}" height="{height}" width="{width}" autoplay="{autoplay}" type="video/quicktime" pluginspage="https://www.apple.com/quicktime/download/"></embed></object>',iframe_markup:'<iframe src ="{path}" width="{width}" height="{height}" frameborder="no"></iframe>',inline_markup:'<div class="pp_inline">{content}</div>',custom_markup:"",social_tools:'<div class="twitter"><a href="//twitter.com/share" class="twitter-share-button" data-count="none">Tweet</a><script type="text/javascript" src="//platform.twitter.com/widgets.js"></script></div><div class="facebook"><iframe src="//www.facebook.com/plugins/like.php?locale=en_US&href={location_href}&amp;layout=button_count&amp;show_faces=true&amp;width=500&amp;action=like&amp;font&amp;colorscheme=light&amp;height=23" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:500px; height:23px;" allowTransparency="true"></iframe></div>'},f);var r,s,t,u,v,w,x,y=this,z=!1,A=a(window).height(),B=a(window).width();return doresize=!0,scroll_pos=n(),a(window).unbind("resize.prettyphoto").bind("resize.prettyphoto",function(){m(),o()}),f.keyboard_shortcuts&&a(document).unbind("keydown.prettyphoto").bind("keydown.prettyphoto",function(b){if("undefined"!=typeof $pp_pic_holder&&$pp_pic_holder.is(":visible"))switch(b.keyCode){case 37:a.prettyPhoto.changePage("previous"),b.preventDefault();break;case 39:a.prettyPhoto.changePage("next"),b.preventDefault();break;case 27:settings.modal||a.prettyPhoto.close(),b.preventDefault()}}),a.prettyPhoto.initialize=function(){return settings=f,"pp_default"==settings.theme&&(settings.horizontal_padding=16),theRel=a(this).attr(settings.hook),galleryRegExp=/\[(?:.*)\]/,isSet=!!galleryRegExp.exec(theRel),pp_images=isSet?jQuery.map(y,function(b,c){if(a(b).attr(settings.hook).indexOf(theRel)!=-1)return a(b).attr("href")}):a.makeArray(a(this).attr("href")),pp_titles=isSet?jQuery.map(y,function(b,c){if(a(b).attr(settings.hook).indexOf(theRel)!=-1)return a(b).find("img").attr("alt")?a(b).find("img").attr("alt"):""}):a.makeArray(a(this).find("img").attr("alt")),pp_descriptions=isSet?jQuery.map(y,function(b,c){if(a(b).attr(settings.hook).indexOf(theRel)!=-1)return a(b).attr("title")?a(b).attr("title"):""}):a.makeArray(a(this).attr("title")),pp_images.length>settings.overlay_gallery_max&&(settings.overlay_gallery=!1),set_position=jQuery.inArray(a(this).attr("href"),pp_images),rel_index=isSet?set_position:a("a["+settings.hook+"^='"+theRel+"']").index(a(this)),q(this),settings.allow_resize&&a(window).bind("scroll.prettyphoto",function(){m()}),a.prettyPhoto.open(),!1},a.prettyPhoto.open=function(b){return"undefined"==typeof settings&&(settings=f,pp_images=a.makeArray(arguments[0]),pp_titles=arguments[1]?a.makeArray(arguments[1]):a.makeArray(""),pp_descriptions=arguments[2]?a.makeArray(arguments[2]):a.makeArray(""),isSet=pp_images.length>1,set_position=arguments[3]?arguments[3]:0,q(b.target)),settings.hideflash&&a("object,embed,iframe[src*=youtube],iframe[src*=vimeo]").css("visibility","hidden"),i(a(pp_images).length),a(".pp_loaderIcon").show(),settings.deeplinking&&c(),settings.social_tools&&(facebook_like_link=settings.social_tools.replace("{location_href}",encodeURIComponent(location.href)),$pp_pic_holder.find(".pp_social").html(facebook_like_link)),$ppt.is(":hidden")&&$ppt.css("opacity",0).show(),$pp_overlay.show().fadeTo(settings.animation_speed,settings.opacity),$pp_pic_holder.find(".currentTextHolder").text(set_position+1+settings.counter_separator_label+a(pp_images).length),"undefined"!=typeof pp_descriptions[set_position]&&""!=pp_descriptions[set_position]?$pp_pic_holder.find(".pp_description").show().html(unescape(pp_descriptions[set_position])):$pp_pic_holder.find(".pp_description").hide(),movie_width=parseFloat(e("width",pp_images[set_position]))?e("width",pp_images[set_position]):settings.default_width.toString(),movie_height=parseFloat(e("height",pp_images[set_position]))?e("height",pp_images[set_position]):settings.default_height.toString(),z=!1,movie_height.indexOf("%")!=-1&&(movie_height=parseFloat(a(window).height()*parseFloat(movie_height)/100-150),z=!0),movie_width.indexOf("%")!=-1&&(movie_width=parseFloat(a(window).width()*parseFloat(movie_width)/100-150),z=!0),$pp_pic_holder.fadeIn(function(){switch(settings.show_title&&""!=pp_titles[set_position]&&"undefined"!=typeof pp_titles[set_position]?$ppt.html(unescape(pp_titles[set_position])):$ppt.html("&nbsp;"),imgPreloader="",skipInjection=!1,l(pp_images[set_position])){case"image":imgPreloader=new Image,nextImage=new Image,isSet&&set_position<a(pp_images).length-1&&(nextImage.src=pp_images[set_position+1]),prevImage=new Image,isSet&&pp_images[set_position-1]&&(prevImage.src=pp_images[set_position-1]),$pp_pic_holder.find("#pp_full_res")[0].innerHTML=settings.image_markup.replace(/{path}/g,pp_images[set_position]),imgPreloader.onload=function(){r=j(imgPreloader.width,imgPreloader.height),g()},imgPreloader.onerror=function(){alert("Image cannot be loaded. Make sure the path is correct and image exist."),a.prettyPhoto.close()},imgPreloader.src=pp_images[set_position];break;case"youtube":r=j(movie_width,movie_height),movie_id=e("v",pp_images[set_position]),""==movie_id&&(movie_id=pp_images[set_position].split("youtu.be/"),movie_id=movie_id[1],movie_id.indexOf("?")>0&&(movie_id=movie_id.substr(0,movie_id.indexOf("?"))),movie_id.indexOf("&")>0&&(movie_id=movie_id.substr(0,movie_id.indexOf("&")))),movie="//www.youtube.com/embed/"+movie_id,e("rel",pp_images[set_position])?movie+="?rel="+e("rel",pp_images[set_position]):movie+="?rel=1",settings.autoplay&&(movie+="&autoplay=1"),toInject=settings.iframe_markup.replace(/{width}/g,r.width).replace(/{height}/g,r.height).replace(/{wmode}/g,settings.wmode).replace(/{path}/g,movie);break;case"vimeo":r=j(movie_width,movie_height),movie_id=pp_images[set_position];var b=/http(s?):\/\/(www\.)?vimeo.com\/(\d+)/,c=movie_id.match(b);movie="//player.vimeo.com/video/"+c[3]+"?title=0&amp;byline=0&amp;portrait=0",settings.autoplay&&(movie+="&autoplay=1;"),vimeo_width=r.width+"/embed/?moog_width="+r.width,toInject=settings.iframe_markup.replace(/{width}/g,vimeo_width).replace(/{height}/g,r.height).replace(/{path}/g,movie);break;case"quicktime":r=j(movie_width,movie_height),r.height+=15,r.contentHeight+=15,r.containerHeight+=15,toInject=settings.quicktime_markup.replace(/{width}/g,r.width).replace(/{height}/g,r.height).replace(/{wmode}/g,settings.wmode).replace(/{path}/g,pp_images[set_position]).replace(/{autoplay}/g,settings.autoplay);break;case"flash":r=j(movie_width,movie_height),flash_vars=pp_images[set_position],flash_vars=flash_vars.substring(pp_images[set_position].indexOf("flashvars")+10,pp_images[set_position].length),filename=pp_images[set_position],filename=filename.substring(0,filename.indexOf("?")),toInject=settings.flash_markup.replace(/{width}/g,r.width).replace(/{height}/g,r.height).replace(/{wmode}/g,settings.wmode).replace(/{path}/g,filename+"?"+flash_vars);break;case"iframe":r=j(movie_width,movie_height),frame_url=pp_images[set_position],frame_url=frame_url.substr(0,frame_url.indexOf("iframe")-1),toInject=settings.iframe_markup.replace(/{width}/g,r.width).replace(/{height}/g,r.height).replace(/{path}/g,frame_url);break;case"ajax":doresize=!1,r=j(movie_width,movie_height),doresize=!0,skipInjection=!0,a.get(pp_images[set_position],function(a){toInject=settings.inline_markup.replace(/{content}/g,a),$pp_pic_holder.find("#pp_full_res")[0].innerHTML=toInject,g()});break;case"custom":r=j(movie_width,movie_height),toInject=settings.custom_markup;break;case"inline":myClone=a(pp_images[set_position]).clone().append('<br clear="all" />').css({width:settings.default_width}).wrapInner('<div id="pp_full_res"><div class="pp_inline"></div></div>').appendTo(a("body")).show(),doresize=!1,r=j(a(myClone).width(),a(myClone).height()),doresize=!0,a(myClone).remove(),toInject=settings.inline_markup.replace(/{content}/g,a(pp_images[set_position]).html())}imgPreloader||skipInjection||($pp_pic_holder.find("#pp_full_res")[0].innerHTML=toInject,g())}),!1},a.prettyPhoto.changePage=function(b){currentGalleryPage=0,"previous"==b?(set_position--,set_position<0&&(set_position=a(pp_images).length-1)):"next"==b?(set_position++,set_position>a(pp_images).length-1&&(set_position=0)):set_position=b,rel_index=set_position,doresize||(doresize=!0),settings.allow_expand&&a(".pp_contract").removeClass("pp_contract").addClass("pp_expand"),h(function(){a.prettyPhoto.open()})},a.prettyPhoto.changeGalleryPage=function(a){"next"==a?(currentGalleryPage++,currentGalleryPage>totalPage&&(currentGalleryPage=0)):"previous"==a?(currentGalleryPage--,currentGalleryPage<0&&(currentGalleryPage=totalPage)):currentGalleryPage=a,slide_speed="next"==a||"previous"==a?settings.animation_speed:0,slide_to=currentGalleryPage*(itemsPerPage*itemWidth),$pp_gallery.find("ul").animate({left:-slide_to},slide_speed)},a.prettyPhoto.startSlideshow=function(){"undefined"==typeof x?($pp_pic_holder.find(".pp_play").unbind("click").removeClass("pp_play").addClass("pp_pause").click(function(){return a.prettyPhoto.stopSlideshow(),!1}),x=setInterval(a.prettyPhoto.startSlideshow,settings.slideshow)):a.prettyPhoto.changePage("next")},a.prettyPhoto.stopSlideshow=function(){$pp_pic_holder.find(".pp_pause").unbind("click").removeClass("pp_pause").addClass("pp_play").click(function(){return a.prettyPhoto.startSlideshow(),!1}),clearInterval(x),x=void 0},a.prettyPhoto.close=function(){$pp_overlay.is(":animated")||(a.prettyPhoto.stopSlideshow(),$pp_pic_holder.stop().find("object,embed").css("visibility","hidden"),a("div.pp_pic_holder,div.ppt,.pp_fade").fadeOut(settings.animation_speed,function(){a(this).remove()}),$pp_overlay.fadeOut(settings.animation_speed,function(){settings.hideflash&&a("object,embed,iframe[src*=youtube],iframe[src*=vimeo]").css("visibility","visible"),a(this).remove(),a(window).unbind("scroll.prettyphoto"),d(),settings.callback(),doresize=!0,s=!1,delete settings}))},!pp_alreadyInitialized&&b()&&(pp_alreadyInitialized=!0,hashIndex=b(),hashRel=hashIndex,hashIndex=hashIndex.substring(hashIndex.indexOf("/")+1,hashIndex.length-1),hashRel=hashRel.substring(0,hashRel.indexOf("/")),setTimeout(function(){a("a["+f.hook+"^='"+hashRel+"']:eq("+hashIndex+")").trigger("click")},50)),this.unbind("click.prettyphoto").bind("click.prettyphoto",a.prettyPhoto.initialize)}}(jQuery);var pp_alreadyInitialized=!1;
\ No newline at end of file
diff --git a/assets/js/round/round.min.js b/assets/js/round/round.min.js
index 5ba3659d429..e73d9974be4 100644
--- a/assets/js/round/round.min.js
+++ b/assets/js/round/round.min.js
@@ -1 +1 @@
-function round(a,b,c){var d,e,f,g;if(b|=0,d=Math.pow(10,b),a*=d,g=a>0|-(0>a),f=a%1===.5*g,e=Math.floor(a),f)switch(c){case"2":case"PHP_ROUND_HALF_DOWN":a=e+(0>g);break;case"3":case"PHP_ROUND_HALF_EVEN":a=e+e%2*g;break;case"4":case"PHP_ROUND_HALF_ODD":a=e+!(e%2);break;default:a=e+(g>0)}return(f?a:Math.round(a))/d}
\ No newline at end of file
+function round(a,b,c){var d,e,f,g;if(b|=0,d=Math.pow(10,b),a*=d,g=a>0|-(a<0),f=a%1===.5*g,e=Math.floor(a),f)switch(c){case"2":case"PHP_ROUND_HALF_DOWN":a=e+(g<0);break;case"3":case"PHP_ROUND_HALF_EVEN":a=e+e%2*g;break;case"4":case"PHP_ROUND_HALF_ODD":a=e+!(e%2);break;default:a=e+(g>0)}return(f?a:Math.round(a))/d}
\ No newline at end of file
diff --git a/assets/js/select2/select2.full.js b/assets/js/select2/select2.full.js
new file mode 100644
index 00000000000..e750834ef5d
--- /dev/null
+++ b/assets/js/select2/select2.full.js
@@ -0,0 +1,6436 @@
+/*!
+ * Select2 4.0.3
+ * https://select2.github.io
+ *
+ * Released under the MIT license
+ * https://github.com/select2/select2/blob/master/LICENSE.md
+ */
+(function (factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['jquery'], factory);
+  } else if (typeof exports === 'object') {
+    // Node/CommonJS
+    factory(require('jquery'));
+  } else {
+    // Browser globals
+    factory(jQuery);
+  }
+}(function (jQuery) {
+  // This is needed so we can catch the AMD loader configuration and use it
+  // The inner file should be wrapped (by `banner.start.js`) in a function that
+  // returns the AMD loader references.
+  var S2 =
+(function () {
+  // Restore the Select2 AMD loader so it can be used
+  // Needed mostly in the language files, where the loader is not inserted
+  if (jQuery && jQuery.fn && jQuery.fn.select2 && jQuery.fn.select2.amd) {
+    var S2 = jQuery.fn.select2.amd;
+  }
+var S2;(function () { if (!S2 || !S2.requirejs) {
+if (!S2) { S2 = {}; } else { require = S2; }
+/**
+ * @license almond 0.3.1 Copyright (c) 2011-2014, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
+ * see: http://github.com/jrburke/almond for details
+ */
+//Going sloppy to avoid 'use strict' string cost, but strict practices should
+//be followed.
+/*jslint sloppy: true */
+/*global setTimeout: false */
+
+var requirejs, require, define;
+(function (undef) {
+    var main, req, makeMap, handlers,
+        defined = {},
+        waiting = {},
+        config = {},
+        defining = {},
+        hasOwn = Object.prototype.hasOwnProperty,
+        aps = [].slice,
+        jsSuffixRegExp = /\.js$/;
+
+    function hasProp(obj, prop) {
+        return hasOwn.call(obj, prop);
+    }
+
+    /**
+     * Given a relative module name, like ./something, normalize it to
+     * a real name that can be mapped to a path.
+     * @param {String} name the relative name
+     * @param {String} baseName a real name that the name arg is relative
+     * to.
+     * @returns {String} normalized name
+     */
+    function normalize(name, baseName) {
+        var nameParts, nameSegment, mapValue, foundMap, lastIndex,
+            foundI, foundStarMap, starI, i, j, part,
+            baseParts = baseName && baseName.split("/"),
+            map = config.map,
+            starMap = (map && map['*']) || {};
+
+        //Adjust any relative paths.
+        if (name && name.charAt(0) === ".") {
+            //If have a base name, try to normalize against it,
+            //otherwise, assume it is a top-level require that will
+            //be relative to baseUrl in the end.
+            if (baseName) {
+                name = name.split('/');
+                lastIndex = name.length - 1;
+
+                // Node .js allowance:
+                if (config.nodeIdCompat && jsSuffixRegExp.test(name[lastIndex])) {
+                    name[lastIndex] = name[lastIndex].replace(jsSuffixRegExp, '');
+                }
+
+                //Lop off the last part of baseParts, so that . matches the
+                //"directory" and not name of the baseName's module. For instance,
+                //baseName of "one/two/three", maps to "one/two/three.js", but we
+                //want the directory, "one/two" for this normalization.
+                name = baseParts.slice(0, baseParts.length - 1).concat(name);
+
+                //start trimDots
+                for (i = 0; i < name.length; i += 1) {
+                    part = name[i];
+                    if (part === ".") {
+                        name.splice(i, 1);
+                        i -= 1;
+                    } else if (part === "..") {
+                        if (i === 1 && (name[2] === '..' || name[0] === '..')) {
+                            //End of the line. Keep at least one non-dot
+                            //path segment at the front so it can be mapped
+                            //correctly to disk. Otherwise, there is likely
+                            //no path mapping for a path starting with '..'.
+                            //This can still fail, but catches the most reasonable
+                            //uses of ..
+                            break;
+                        } else if (i > 0) {
+                            name.splice(i - 1, 2);
+                            i -= 2;
+                        }
+                    }
+                }
+                //end trimDots
+
+                name = name.join("/");
+            } else if (name.indexOf('./') === 0) {
+                // No baseName, so this is ID is resolved relative
+                // to baseUrl, pull off the leading dot.
+                name = name.substring(2);
+            }
+        }
+
+        //Apply map config if available.
+        if ((baseParts || starMap) && map) {
+            nameParts = name.split('/');
+
+            for (i = nameParts.length; i > 0; i -= 1) {
+                nameSegment = nameParts.slice(0, i).join("/");
+
+                if (baseParts) {
+                    //Find the longest baseName segment match in the config.
+                    //So, do joins on the biggest to smallest lengths of baseParts.
+                    for (j = baseParts.length; j > 0; j -= 1) {
+                        mapValue = map[baseParts.slice(0, j).join('/')];
+
+                        //baseName segment has  config, find if it has one for
+                        //this name.
+                        if (mapValue) {
+                            mapValue = mapValue[nameSegment];
+                            if (mapValue) {
+                                //Match, update name to the new value.
+                                foundMap = mapValue;
+                                foundI = i;
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                if (foundMap) {
+                    break;
+                }
+
+                //Check for a star map match, but just hold on to it,
+                //if there is a shorter segment match later in a matching
+                //config, then favor over this star map.
+                if (!foundStarMap && starMap && starMap[nameSegment]) {
+                    foundStarMap = starMap[nameSegment];
+                    starI = i;
+                }
+            }
+
+            if (!foundMap && foundStarMap) {
+                foundMap = foundStarMap;
+                foundI = starI;
+            }
+
+            if (foundMap) {
+                nameParts.splice(0, foundI, foundMap);
+                name = nameParts.join('/');
+            }
+        }
+
+        return name;
+    }
+
+    function makeRequire(relName, forceSync) {
+        return function () {
+            //A version of a require function that passes a moduleName
+            //value for items that may need to
+            //look up paths relative to the moduleName
+            var args = aps.call(arguments, 0);
+
+            //If first arg is not require('string'), and there is only
+            //one arg, it is the array form without a callback. Insert
+            //a null so that the following concat is correct.
+            if (typeof args[0] !== 'string' && args.length === 1) {
+                args.push(null);
+            }
+            return req.apply(undef, args.concat([relName, forceSync]));
+        };
+    }
+
+    function makeNormalize(relName) {
+        return function (name) {
+            return normalize(name, relName);
+        };
+    }
+
+    function makeLoad(depName) {
+        return function (value) {
+            defined[depName] = value;
+        };
+    }
+
+    function callDep(name) {
+        if (hasProp(waiting, name)) {
+            var args = waiting[name];
+            delete waiting[name];
+            defining[name] = true;
+            main.apply(undef, args);
+        }
+
+        if (!hasProp(defined, name) && !hasProp(defining, name)) {
+            throw new Error('No ' + name);
+        }
+        return defined[name];
+    }
+
+    //Turns a plugin!resource to [plugin, resource]
+    //with the plugin being undefined if the name
+    //did not have a plugin prefix.
+    function splitPrefix(name) {
+        var prefix,
+            index = name ? name.indexOf('!') : -1;
+        if (index > -1) {
+            prefix = name.substring(0, index);
+            name = name.substring(index + 1, name.length);
+        }
+        return [prefix, name];
+    }
+
+    /**
+     * Makes a name map, normalizing the name, and using a plugin
+     * for normalization if necessary. Grabs a ref to plugin
+     * too, as an optimization.
+     */
+    makeMap = function (name, relName) {
+        var plugin,
+            parts = splitPrefix(name),
+            prefix = parts[0];
+
+        name = parts[1];
+
+        if (prefix) {
+            prefix = normalize(prefix, relName);
+            plugin = callDep(prefix);
+        }
+
+        //Normalize according
+        if (prefix) {
+            if (plugin && plugin.normalize) {
+                name = plugin.normalize(name, makeNormalize(relName));
+            } else {
+                name = normalize(name, relName);
+            }
+        } else {
+            name = normalize(name, relName);
+            parts = splitPrefix(name);
+            prefix = parts[0];
+            name = parts[1];
+            if (prefix) {
+                plugin = callDep(prefix);
+            }
+        }
+
+        //Using ridiculous property names for space reasons
+        return {
+            f: prefix ? prefix + '!' + name : name, //fullName
+            n: name,
+            pr: prefix,
+            p: plugin
+        };
+    };
+
+    function makeConfig(name) {
+        return function () {
+            return (config && config.config && config.config[name]) || {};
+        };
+    }
+
+    handlers = {
+        require: function (name) {
+            return makeRequire(name);
+        },
+        exports: function (name) {
+            var e = defined[name];
+            if (typeof e !== 'undefined') {
+                return e;
+            } else {
+                return (defined[name] = {});
+            }
+        },
+        module: function (name) {
+            return {
+                id: name,
+                uri: '',
+                exports: defined[name],
+                config: makeConfig(name)
+            };
+        }
+    };
+
+    main = function (name, deps, callback, relName) {
+        var cjsModule, depName, ret, map, i,
+            args = [],
+            callbackType = typeof callback,
+            usingExports;
+
+        //Use name if no relName
+        relName = relName || name;
+
+        //Call the callback to define the module, if necessary.
+        if (callbackType === 'undefined' || callbackType === 'function') {
+            //Pull out the defined dependencies and pass the ordered
+            //values to the callback.
+            //Default to [require, exports, module] if no deps
+            deps = !deps.length && callback.length ? ['require', 'exports', 'module'] : deps;
+            for (i = 0; i < deps.length; i += 1) {
+                map = makeMap(deps[i], relName);
+                depName = map.f;
+
+                //Fast path CommonJS standard dependencies.
+                if (depName === "require") {
+                    args[i] = handlers.require(name);
+                } else if (depName === "exports") {
+                    //CommonJS module spec 1.1
+                    args[i] = handlers.exports(name);
+                    usingExports = true;
+                } else if (depName === "module") {
+                    //CommonJS module spec 1.1
+                    cjsModule = args[i] = handlers.module(name);
+                } else if (hasProp(defined, depName) ||
+                           hasProp(waiting, depName) ||
+                           hasProp(defining, depName)) {
+                    args[i] = callDep(depName);
+                } else if (map.p) {
+                    map.p.load(map.n, makeRequire(relName, true), makeLoad(depName), {});
+                    args[i] = defined[depName];
+                } else {
+                    throw new Error(name + ' missing ' + depName);
+                }
+            }
+
+            ret = callback ? callback.apply(defined[name], args) : undefined;
+
+            if (name) {
+                //If setting exports via "module" is in play,
+                //favor that over return value and exports. After that,
+                //favor a non-undefined return value over exports use.
+                if (cjsModule && cjsModule.exports !== undef &&
+                        cjsModule.exports !== defined[name]) {
+                    defined[name] = cjsModule.exports;
+                } else if (ret !== undef || !usingExports) {
+                    //Use the return value from the function.
+                    defined[name] = ret;
+                }
+            }
+        } else if (name) {
+            //May just be an object definition for the module. Only
+            //worry about defining if have a module name.
+            defined[name] = callback;
+        }
+    };
+
+    requirejs = require = req = function (deps, callback, relName, forceSync, alt) {
+        if (typeof deps === "string") {
+            if (handlers[deps]) {
+                //callback in this case is really relName
+                return handlers[deps](callback);
+            }
+            //Just return the module wanted. In this scenario, the
+            //deps arg is the module name, and second arg (if passed)
+            //is just the relName.
+            //Normalize module name, if it contains . or ..
+            return callDep(makeMap(deps, callback).f);
+        } else if (!deps.splice) {
+            //deps is a config object, not an array.
+            config = deps;
+            if (config.deps) {
+                req(config.deps, config.callback);
+            }
+            if (!callback) {
+                return;
+            }
+
+            if (callback.splice) {
+                //callback is an array, which means it is a dependency list.
+                //Adjust args if there are dependencies
+                deps = callback;
+                callback = relName;
+                relName = null;
+            } else {
+                deps = undef;
+            }
+        }
+
+        //Support require(['a'])
+        callback = callback || function () {};
+
+        //If relName is a function, it is an errback handler,
+        //so remove it.
+        if (typeof relName === 'function') {
+            relName = forceSync;
+            forceSync = alt;
+        }
+
+        //Simulate async callback;
+        if (forceSync) {
+            main(undef, deps, callback, relName);
+        } else {
+            //Using a non-zero value because of concern for what old browsers
+            //do, and latest browsers "upgrade" to 4 if lower value is used:
+            //http://www.whatwg.org/specs/web-apps/current-work/multipage/timers.html#dom-windowtimers-settimeout:
+            //If want a value immediately, use require('id') instead -- something
+            //that works in almond on the global level, but not guaranteed and
+            //unlikely to work in other AMD implementations.
+            setTimeout(function () {
+                main(undef, deps, callback, relName);
+            }, 4);
+        }
+
+        return req;
+    };
+
+    /**
+     * Just drops the config on the floor, but returns req in case
+     * the config return value is used.
+     */
+    req.config = function (cfg) {
+        return req(cfg);
+    };
+
+    /**
+     * Expose module registry for debugging and tooling
+     */
+    requirejs._defined = defined;
+
+    define = function (name, deps, callback) {
+        if (typeof name !== 'string') {
+            throw new Error('See almond README: incorrect module build, no module name');
+        }
+
+        //This module may not have dependencies
+        if (!deps.splice) {
+            //deps is not an array, so probably means
+            //an object literal or factory function for
+            //the value. Adjust args.
+            callback = deps;
+            deps = [];
+        }
+
+        if (!hasProp(defined, name) && !hasProp(waiting, name)) {
+            waiting[name] = [name, deps, callback];
+        }
+    };
+
+    define.amd = {
+        jQuery: true
+    };
+}());
+
+S2.requirejs = requirejs;S2.require = require;S2.define = define;
+}
+}());
+S2.define("almond", function(){});
+
+/* global jQuery:false, $:false */
+S2.define('jquery',[],function () {
+  var _$ = jQuery || $;
+
+  if (_$ == null && console && console.error) {
+    console.error(
+      'Select2: An instance of jQuery or a jQuery-compatible library was not ' +
+      'found. Make sure that you are including jQuery before Select2 on your ' +
+      'web page.'
+    );
+  }
+
+  return _$;
+});
+
+S2.define('select2/utils',[
+  'jquery'
+], function ($) {
+  var Utils = {};
+
+  Utils.Extend = function (ChildClass, SuperClass) {
+    var __hasProp = {}.hasOwnProperty;
+
+    function BaseConstructor () {
+      this.constructor = ChildClass;
+    }
+
+    for (var key in SuperClass) {
+      if (__hasProp.call(SuperClass, key)) {
+        ChildClass[key] = SuperClass[key];
+      }
+    }
+
+    BaseConstructor.prototype = SuperClass.prototype;
+    ChildClass.prototype = new BaseConstructor();
+    ChildClass.__super__ = SuperClass.prototype;
+
+    return ChildClass;
+  };
+
+  function getMethods (theClass) {
+    var proto = theClass.prototype;
+
+    var methods = [];
+
+    for (var methodName in proto) {
+      var m = proto[methodName];
+
+      if (typeof m !== 'function') {
+        continue;
+      }
+
+      if (methodName === 'constructor') {
+        continue;
+      }
+
+      methods.push(methodName);
+    }
+
+    return methods;
+  }
+
+  Utils.Decorate = function (SuperClass, DecoratorClass) {
+    var decoratedMethods = getMethods(DecoratorClass);
+    var superMethods = getMethods(SuperClass);
+
+    function DecoratedClass () {
+      var unshift = Array.prototype.unshift;
+
+      var argCount = DecoratorClass.prototype.constructor.length;
+
+      var calledConstructor = SuperClass.prototype.constructor;
+
+      if (argCount > 0) {
+        unshift.call(arguments, SuperClass.prototype.constructor);
+
+        calledConstructor = DecoratorClass.prototype.constructor;
+      }
+
+      calledConstructor.apply(this, arguments);
+    }
+
+    DecoratorClass.displayName = SuperClass.displayName;
+
+    function ctr () {
+      this.constructor = DecoratedClass;
+    }
+
+    DecoratedClass.prototype = new ctr();
+
+    for (var m = 0; m < superMethods.length; m++) {
+        var superMethod = superMethods[m];
+
+        DecoratedClass.prototype[superMethod] =
+          SuperClass.prototype[superMethod];
+    }
+
+    var calledMethod = function (methodName) {
+      // Stub out the original method if it's not decorating an actual method
+      var originalMethod = function () {};
+
+      if (methodName in DecoratedClass.prototype) {
+        originalMethod = DecoratedClass.prototype[methodName];
+      }
+
+      var decoratedMethod = DecoratorClass.prototype[methodName];
+
+      return function () {
+        var unshift = Array.prototype.unshift;
+
+        unshift.call(arguments, originalMethod);
+
+        return decoratedMethod.apply(this, arguments);
+      };
+    };
+
+    for (var d = 0; d < decoratedMethods.length; d++) {
+      var decoratedMethod = decoratedMethods[d];
+
+      DecoratedClass.prototype[decoratedMethod] = calledMethod(decoratedMethod);
+    }
+
+    return DecoratedClass;
+  };
+
+  var Observable = function () {
+    this.listeners = {};
+  };
+
+  Observable.prototype.on = function (event, callback) {
+    this.listeners = this.listeners || {};
+
+    if (event in this.listeners) {
+      this.listeners[event].push(callback);
+    } else {
+      this.listeners[event] = [callback];
+    }
+  };
+
+  Observable.prototype.trigger = function (event) {
+    var slice = Array.prototype.slice;
+    var params = slice.call(arguments, 1);
+
+    this.listeners = this.listeners || {};
+
+    // Params should always come in as an array
+    if (params == null) {
+      params = [];
+    }
+
+    // If there are no arguments to the event, use a temporary object
+    if (params.length === 0) {
+      params.push({});
+    }
+
+    // Set the `_type` of the first object to the event
+    params[0]._type = event;
+
+    if (event in this.listeners) {
+      this.invoke(this.listeners[event], slice.call(arguments, 1));
+    }
+
+    if ('*' in this.listeners) {
+      this.invoke(this.listeners['*'], arguments);
+    }
+  };
+
+  Observable.prototype.invoke = function (listeners, params) {
+    for (var i = 0, len = listeners.length; i < len; i++) {
+      listeners[i].apply(this, params);
+    }
+  };
+
+  Utils.Observable = Observable;
+
+  Utils.generateChars = function (length) {
+    var chars = '';
+
+    for (var i = 0; i < length; i++) {
+      var randomChar = Math.floor(Math.random() * 36);
+      chars += randomChar.toString(36);
+    }
+
+    return chars;
+  };
+
+  Utils.bind = function (func, context) {
+    return function () {
+      func.apply(context, arguments);
+    };
+  };
+
+  Utils._convertData = function (data) {
+    for (var originalKey in data) {
+      var keys = originalKey.split('-');
+
+      var dataLevel = data;
+
+      if (keys.length === 1) {
+        continue;
+      }
+
+      for (var k = 0; k < keys.length; k++) {
+        var key = keys[k];
+
+        // Lowercase the first letter
+        // By default, dash-separated becomes camelCase
+        key = key.substring(0, 1).toLowerCase() + key.substring(1);
+
+        if (!(key in dataLevel)) {
+          dataLevel[key] = {};
+        }
+
+        if (k == keys.length - 1) {
+          dataLevel[key] = data[originalKey];
+        }
+
+        dataLevel = dataLevel[key];
+      }
+
+      delete data[originalKey];
+    }
+
+    return data;
+  };
+
+  Utils.hasScroll = function (index, el) {
+    // Adapted from the function created by @ShadowScripter
+    // and adapted by @BillBarry on the Stack Exchange Code Review website.
+    // The original code can be found at
+    // http://codereview.stackexchange.com/q/13338
+    // and was designed to be used with the Sizzle selector engine.
+
+    var $el = $(el);
+    var overflowX = el.style.overflowX;
+    var overflowY = el.style.overflowY;
+
+    //Check both x and y declarations
+    if (overflowX === overflowY &&
+        (overflowY === 'hidden' || overflowY === 'visible')) {
+      return false;
+    }
+
+    if (overflowX === 'scroll' || overflowY === 'scroll') {
+      return true;
+    }
+
+    return ($el.innerHeight() < el.scrollHeight ||
+      $el.innerWidth() < el.scrollWidth);
+  };
+
+  Utils.escapeMarkup = function (markup) {
+    var replaceMap = {
+      '\\': '&#92;',
+      '&': '&amp;',
+      '<': '&lt;',
+      '>': '&gt;',
+      '"': '&quot;',
+      '\'': '&#39;',
+      '/': '&#47;'
+    };
+
+    // Do not try to escape the markup if it's not a string
+    if (typeof markup !== 'string') {
+      return markup;
+    }
+
+    return String(markup).replace(/[&<>"'\/\\]/g, function (match) {
+      return replaceMap[match];
+    });
+  };
+
+  // Append an array of jQuery nodes to a given element.
+  Utils.appendMany = function ($element, $nodes) {
+    // jQuery 1.7.x does not support $.fn.append() with an array
+    // Fall back to a jQuery object collection using $.fn.add()
+    if ($.fn.jquery.substr(0, 3) === '1.7') {
+      var $jqNodes = $();
+
+      $.map($nodes, function (node) {
+        $jqNodes = $jqNodes.add(node);
+      });
+
+      $nodes = $jqNodes;
+    }
+
+    $element.append($nodes);
+  };
+
+  return Utils;
+});
+
+S2.define('select2/results',[
+  'jquery',
+  './utils'
+], function ($, Utils) {
+  function Results ($element, options, dataAdapter) {
+    this.$element = $element;
+    this.data = dataAdapter;
+    this.options = options;
+
+    Results.__super__.constructor.call(this);
+  }
+
+  Utils.Extend(Results, Utils.Observable);
+
+  Results.prototype.render = function () {
+    var $results = $(
+      '<ul class="select2-results__options" role="tree"></ul>'
+    );
+
+    if (this.options.get('multiple')) {
+      $results.attr('aria-multiselectable', 'true');
+    }
+
+    this.$results = $results;
+
+    return $results;
+  };
+
+  Results.prototype.clear = function () {
+    this.$results.empty();
+  };
+
+  Results.prototype.displayMessage = function (params) {
+    var escapeMarkup = this.options.get('escapeMarkup');
+
+    this.clear();
+    this.hideLoading();
+
+    var $message = $(
+      '<li role="treeitem" aria-live="assertive"' +
+      ' class="select2-results__option"></li>'
+    );
+
+    var message = this.options.get('translations').get(params.message);
+
+    $message.append(
+      escapeMarkup(
+        message(params.args)
+      )
+    );
+
+    $message[0].className += ' select2-results__message';
+
+    this.$results.append($message);
+  };
+
+  Results.prototype.hideMessages = function () {
+    this.$results.find('.select2-results__message').remove();
+  };
+
+  Results.prototype.append = function (data) {
+    this.hideLoading();
+
+    var $options = [];
+
+    if (data.results == null || data.results.length === 0) {
+      if (this.$results.children().length === 0) {
+        this.trigger('results:message', {
+          message: 'noResults'
+        });
+      }
+
+      return;
+    }
+
+    data.results = this.sort(data.results);
+
+    for (var d = 0; d < data.results.length; d++) {
+      var item = data.results[d];
+
+      var $option = this.option(item);
+
+      $options.push($option);
+    }
+
+    this.$results.append($options);
+  };
+
+  Results.prototype.position = function ($results, $dropdown) {
+    var $resultsContainer = $dropdown.find('.select2-results');
+    $resultsContainer.append($results);
+  };
+
+  Results.prototype.sort = function (data) {
+    var sorter = this.options.get('sorter');
+
+    return sorter(data);
+  };
+
+  Results.prototype.highlightFirstItem = function () {
+    var $options = this.$results
+      .find('.select2-results__option[aria-selected]');
+
+    var $selected = $options.filter('[aria-selected=true]');
+
+    // Check if there are any selected options
+    if ($selected.length > 0) {
+      // If there are selected options, highlight the first
+      $selected.first().trigger('mouseenter');
+    } else {
+      // If there are no selected options, highlight the first option
+      // in the dropdown
+      $options.first().trigger('mouseenter');
+    }
+
+    this.ensureHighlightVisible();
+  };
+
+  Results.prototype.setClasses = function () {
+    var self = this;
+
+    this.data.current(function (selected) {
+      var selectedIds = $.map(selected, function (s) {
+        return s.id.toString();
+      });
+
+      var $options = self.$results
+        .find('.select2-results__option[aria-selected]');
+
+      $options.each(function () {
+        var $option = $(this);
+
+        var item = $.data(this, 'data');
+
+        // id needs to be converted to a string when comparing
+        var id = '' + item.id;
+
+        if ((item.element != null && item.element.selected) ||
+            (item.element == null && $.inArray(id, selectedIds) > -1)) {
+          $option.attr('aria-selected', 'true');
+        } else {
+          $option.attr('aria-selected', 'false');
+        }
+      });
+
+    });
+  };
+
+  Results.prototype.showLoading = function (params) {
+    this.hideLoading();
+
+    var loadingMore = this.options.get('translations').get('searching');
+
+    var loading = {
+      disabled: true,
+      loading: true,
+      text: loadingMore(params)
+    };
+    var $loading = this.option(loading);
+    $loading.className += ' loading-results';
+
+    this.$results.prepend($loading);
+  };
+
+  Results.prototype.hideLoading = function () {
+    this.$results.find('.loading-results').remove();
+  };
+
+  Results.prototype.option = function (data) {
+    var option = document.createElement('li');
+    option.className = 'select2-results__option';
+
+    var attrs = {
+      'role': 'treeitem',
+      'aria-selected': 'false'
+    };
+
+    if (data.disabled) {
+      delete attrs['aria-selected'];
+      attrs['aria-disabled'] = 'true';
+    }
+
+    if (data.id == null) {
+      delete attrs['aria-selected'];
+    }
+
+    if (data._resultId != null) {
+      option.id = data._resultId;
+    }
+
+    if (data.title) {
+      option.title = data.title;
+    }
+
+    if (data.children) {
+      attrs.role = 'group';
+      attrs['aria-label'] = data.text;
+      delete attrs['aria-selected'];
+    }
+
+    for (var attr in attrs) {
+      var val = attrs[attr];
+
+      option.setAttribute(attr, val);
+    }
+
+    if (data.children) {
+      var $option = $(option);
+
+      var label = document.createElement('strong');
+      label.className = 'select2-results__group';
+
+      var $label = $(label);
+      this.template(data, label);
+
+      var $children = [];
+
+      for (var c = 0; c < data.children.length; c++) {
+        var child = data.children[c];
+
+        var $child = this.option(child);
+
+        $children.push($child);
+      }
+
+      var $childrenContainer = $('<ul></ul>', {
+        'class': 'select2-results__options select2-results__options--nested'
+      });
+
+      $childrenContainer.append($children);
+
+      $option.append(label);
+      $option.append($childrenContainer);
+    } else {
+      this.template(data, option);
+    }
+
+    $.data(option, 'data', data);
+
+    return option;
+  };
+
+  Results.prototype.bind = function (container, $container) {
+    var self = this;
+
+    var id = container.id + '-results';
+
+    this.$results.attr('id', id);
+
+    container.on('results:all', function (params) {
+      self.clear();
+      self.append(params.data);
+
+      if (container.isOpen()) {
+        self.setClasses();
+        self.highlightFirstItem();
+      }
+    });
+
+    container.on('results:append', function (params) {
+      self.append(params.data);
+
+      if (container.isOpen()) {
+        self.setClasses();
+      }
+    });
+
+    container.on('query', function (params) {
+      self.hideMessages();
+      self.showLoading(params);
+    });
+
+    container.on('select', function () {
+      if (!container.isOpen()) {
+        return;
+      }
+
+      self.setClasses();
+      self.highlightFirstItem();
+    });
+
+    container.on('unselect', function () {
+      if (!container.isOpen()) {
+        return;
+      }
+
+      self.setClasses();
+      self.highlightFirstItem();
+    });
+
+    container.on('open', function () {
+      // When the dropdown is open, aria-expended="true"
+      self.$results.attr('aria-expanded', 'true');
+      self.$results.attr('aria-hidden', 'false');
+
+      self.setClasses();
+      self.ensureHighlightVisible();
+    });
+
+    container.on('close', function () {
+      // When the dropdown is closed, aria-expended="false"
+      self.$results.attr('aria-expanded', 'false');
+      self.$results.attr('aria-hidden', 'true');
+      self.$results.removeAttr('aria-activedescendant');
+    });
+
+    container.on('results:toggle', function () {
+      var $highlighted = self.getHighlightedResults();
+
+      if ($highlighted.length === 0) {
+        return;
+      }
+
+      $highlighted.trigger('mouseup');
+    });
+
+    container.on('results:select', function () {
+      var $highlighted = self.getHighlightedResults();
+
+      if ($highlighted.length === 0) {
+        return;
+      }
+
+      var data = $highlighted.data('data');
+
+      if ($highlighted.attr('aria-selected') == 'true') {
+        self.trigger('close', {});
+      } else {
+        self.trigger('select', {
+          data: data
+        });
+      }
+    });
+
+    container.on('results:previous', function () {
+      var $highlighted = self.getHighlightedResults();
+
+      var $options = self.$results.find('[aria-selected]');
+
+      var currentIndex = $options.index($highlighted);
+
+      // If we are already at te top, don't move further
+      if (currentIndex === 0) {
+        return;
+      }
+
+      var nextIndex = currentIndex - 1;
+
+      // If none are highlighted, highlight the first
+      if ($highlighted.length === 0) {
+        nextIndex = 0;
+      }
+
+      var $next = $options.eq(nextIndex);
+
+      $next.trigger('mouseenter');
+
+      var currentOffset = self.$results.offset().top;
+      var nextTop = $next.offset().top;
+      var nextOffset = self.$results.scrollTop() + (nextTop - currentOffset);
+
+      if (nextIndex === 0) {
+        self.$results.scrollTop(0);
+      } else if (nextTop - currentOffset < 0) {
+        self.$results.scrollTop(nextOffset);
+      }
+    });
+
+    container.on('results:next', function () {
+      var $highlighted = self.getHighlightedResults();
+
+      var $options = self.$results.find('[aria-selected]');
+
+      var currentIndex = $options.index($highlighted);
+
+      var nextIndex = currentIndex + 1;
+
+      // If we are at the last option, stay there
+      if (nextIndex >= $options.length) {
+        return;
+      }
+
+      var $next = $options.eq(nextIndex);
+
+      $next.trigger('mouseenter');
+
+      var currentOffset = self.$results.offset().top +
+        self.$results.outerHeight(false);
+      var nextBottom = $next.offset().top + $next.outerHeight(false);
+      var nextOffset = self.$results.scrollTop() + nextBottom - currentOffset;
+
+      if (nextIndex === 0) {
+        self.$results.scrollTop(0);
+      } else if (nextBottom > currentOffset) {
+        self.$results.scrollTop(nextOffset);
+      }
+    });
+
+    container.on('results:focus', function (params) {
+      params.element.addClass('select2-results__option--highlighted');
+    });
+
+    container.on('results:message', function (params) {
+      self.displayMessage(params);
+    });
+
+    if ($.fn.mousewheel) {
+      this.$results.on('mousewheel', function (e) {
+        var top = self.$results.scrollTop();
+
+        var bottom = self.$results.get(0).scrollHeight - top + e.deltaY;
+
+        var isAtTop = e.deltaY > 0 && top - e.deltaY <= 0;
+        var isAtBottom = e.deltaY < 0 && bottom <= self.$results.height();
+
+        if (isAtTop) {
+          self.$results.scrollTop(0);
+
+          e.preventDefault();
+          e.stopPropagation();
+        } else if (isAtBottom) {
+          self.$results.scrollTop(
+            self.$results.get(0).scrollHeight - self.$results.height()
+          );
+
+          e.preventDefault();
+          e.stopPropagation();
+        }
+      });
+    }
+
+    this.$results.on('mouseup', '.select2-results__option[aria-selected]',
+      function (evt) {
+      var $this = $(this);
+
+      var data = $this.data('data');
+
+      if ($this.attr('aria-selected') === 'true') {
+        if (self.options.get('multiple')) {
+          self.trigger('unselect', {
+            originalEvent: evt,
+            data: data
+          });
+        } else {
+          self.trigger('close', {});
+        }
+
+        return;
+      }
+
+      self.trigger('select', {
+        originalEvent: evt,
+        data: data
+      });
+    });
+
+    this.$results.on('mouseenter', '.select2-results__option[aria-selected]',
+      function (evt) {
+      var data = $(this).data('data');
+
+      self.getHighlightedResults()
+          .removeClass('select2-results__option--highlighted');
+
+      self.trigger('results:focus', {
+        data: data,
+        element: $(this)
+      });
+    });
+  };
+
+  Results.prototype.getHighlightedResults = function () {
+    var $highlighted = this.$results
+    .find('.select2-results__option--highlighted');
+
+    return $highlighted;
+  };
+
+  Results.prototype.destroy = function () {
+    this.$results.remove();
+  };
+
+  Results.prototype.ensureHighlightVisible = function () {
+    var $highlighted = this.getHighlightedResults();
+
+    if ($highlighted.length === 0) {
+      return;
+    }
+
+    var $options = this.$results.find('[aria-selected]');
+
+    var currentIndex = $options.index($highlighted);
+
+    var currentOffset = this.$results.offset().top;
+    var nextTop = $highlighted.offset().top;
+    var nextOffset = this.$results.scrollTop() + (nextTop - currentOffset);
+
+    var offsetDelta = nextTop - currentOffset;
+    nextOffset -= $highlighted.outerHeight(false) * 2;
+
+    if (currentIndex <= 2) {
+      this.$results.scrollTop(0);
+    } else if (offsetDelta > this.$results.outerHeight() || offsetDelta < 0) {
+      this.$results.scrollTop(nextOffset);
+    }
+  };
+
+  Results.prototype.template = function (result, container) {
+    var template = this.options.get('templateResult');
+    var escapeMarkup = this.options.get('escapeMarkup');
+
+    var content = template(result, container);
+
+    if (content == null) {
+      container.style.display = 'none';
+    } else if (typeof content === 'string') {
+      container.innerHTML = escapeMarkup(content);
+    } else {
+      $(container).append(content);
+    }
+  };
+
+  return Results;
+});
+
+S2.define('select2/keys',[
+
+], function () {
+  var KEYS = {
+    BACKSPACE: 8,
+    TAB: 9,
+    ENTER: 13,
+    SHIFT: 16,
+    CTRL: 17,
+    ALT: 18,
+    ESC: 27,
+    SPACE: 32,
+    PAGE_UP: 33,
+    PAGE_DOWN: 34,
+    END: 35,
+    HOME: 36,
+    LEFT: 37,
+    UP: 38,
+    RIGHT: 39,
+    DOWN: 40,
+    DELETE: 46
+  };
+
+  return KEYS;
+});
+
+S2.define('select2/selection/base',[
+  'jquery',
+  '../utils',
+  '../keys'
+], function ($, Utils, KEYS) {
+  function BaseSelection ($element, options) {
+    this.$element = $element;
+    this.options = options;
+
+    BaseSelection.__super__.constructor.call(this);
+  }
+
+  Utils.Extend(BaseSelection, Utils.Observable);
+
+  BaseSelection.prototype.render = function () {
+    var $selection = $(
+      '<span class="select2-selection" role="combobox" ' +
+      ' aria-haspopup="true" aria-expanded="false">' +
+      '</span>'
+    );
+
+    this._tabindex = 0;
+
+    if (this.$element.data('old-tabindex') != null) {
+      this._tabindex = this.$element.data('old-tabindex');
+    } else if (this.$element.attr('tabindex') != null) {
+      this._tabindex = this.$element.attr('tabindex');
+    }
+
+    $selection.attr('title', this.$element.attr('title'));
+    $selection.attr('tabindex', this._tabindex);
+
+    this.$selection = $selection;
+
+    return $selection;
+  };
+
+  BaseSelection.prototype.bind = function (container, $container) {
+    var self = this;
+
+    var id = container.id + '-container';
+    var resultsId = container.id + '-results';
+
+    this.container = container;
+
+    this.$selection.on('focus', function (evt) {
+      self.trigger('focus', evt);
+    });
+
+    this.$selection.on('blur', function (evt) {
+      self._handleBlur(evt);
+    });
+
+    this.$selection.on('keydown', function (evt) {
+      self.trigger('keypress', evt);
+
+      if (evt.which === KEYS.SPACE) {
+        evt.preventDefault();
+      }
+    });
+
+    container.on('results:focus', function (params) {
+      self.$selection.attr('aria-activedescendant', params.data._resultId);
+    });
+
+    container.on('selection:update', function (params) {
+      self.update(params.data);
+    });
+
+    container.on('open', function () {
+      // When the dropdown is open, aria-expanded="true"
+      self.$selection.attr('aria-expanded', 'true');
+      self.$selection.attr('aria-owns', resultsId);
+
+      self._attachCloseHandler(container);
+    });
+
+    container.on('close', function () {
+      // When the dropdown is closed, aria-expanded="false"
+      self.$selection.attr('aria-expanded', 'false');
+      self.$selection.removeAttr('aria-activedescendant');
+      self.$selection.removeAttr('aria-owns');
+
+      self.$selection.focus();
+
+      self._detachCloseHandler(container);
+    });
+
+    container.on('enable', function () {
+      self.$selection.attr('tabindex', self._tabindex);
+    });
+
+    container.on('disable', function () {
+      self.$selection.attr('tabindex', '-1');
+    });
+  };
+
+  BaseSelection.prototype._handleBlur = function (evt) {
+    var self = this;
+
+    // This needs to be delayed as the active element is the body when the tab
+    // key is pressed, possibly along with others.
+    window.setTimeout(function () {
+      // Don't trigger `blur` if the focus is still in the selection
+      if (
+        (document.activeElement == self.$selection[0]) ||
+        ($.contains(self.$selection[0], document.activeElement))
+      ) {
+        return;
+      }
+
+      self.trigger('blur', evt);
+    }, 1);
+  };
+
+  BaseSelection.prototype._attachCloseHandler = function (container) {
+    var self = this;
+
+    $(document.body).on('mousedown.select2.' + container.id, function (e) {
+      var $target = $(e.target);
+
+      var $select = $target.closest('.select2');
+
+      var $all = $('.select2.select2-container--open');
+
+      $all.each(function () {
+        var $this = $(this);
+
+        if (this == $select[0]) {
+          return;
+        }
+
+        var $element = $this.data('element');
+
+        $element.select2('close');
+      });
+    });
+  };
+
+  BaseSelection.prototype._detachCloseHandler = function (container) {
+    $(document.body).off('mousedown.select2.' + container.id);
+  };
+
+  BaseSelection.prototype.position = function ($selection, $container) {
+    var $selectionContainer = $container.find('.selection');
+    $selectionContainer.append($selection);
+  };
+
+  BaseSelection.prototype.destroy = function () {
+    this._detachCloseHandler(this.container);
+  };
+
+  BaseSelection.prototype.update = function (data) {
+    throw new Error('The `update` method must be defined in child classes.');
+  };
+
+  return BaseSelection;
+});
+
+S2.define('select2/selection/single',[
+  'jquery',
+  './base',
+  '../utils',
+  '../keys'
+], function ($, BaseSelection, Utils, KEYS) {
+  function SingleSelection () {
+    SingleSelection.__super__.constructor.apply(this, arguments);
+  }
+
+  Utils.Extend(SingleSelection, BaseSelection);
+
+  SingleSelection.prototype.render = function () {
+    var $selection = SingleSelection.__super__.render.call(this);
+
+    $selection.addClass('select2-selection--single');
+
+    $selection.html(
+      '<span class="select2-selection__rendered"></span>' +
+      '<span class="select2-selection__arrow" role="presentation">' +
+        '<b role="presentation"></b>' +
+      '</span>'
+    );
+
+    return $selection;
+  };
+
+  SingleSelection.prototype.bind = function (container, $container) {
+    var self = this;
+
+    SingleSelection.__super__.bind.apply(this, arguments);
+
+    var id = container.id + '-container';
+
+    this.$selection.find('.select2-selection__rendered').attr('id', id);
+    this.$selection.attr('aria-labelledby', id);
+
+    this.$selection.on('mousedown', function (evt) {
+      // Only respond to left clicks
+      if (evt.which !== 1) {
+        return;
+      }
+
+      self.trigger('toggle', {
+        originalEvent: evt
+      });
+    });
+
+    this.$selection.on('focus', function (evt) {
+      // User focuses on the container
+    });
+
+    this.$selection.on('blur', function (evt) {
+      // User exits the container
+    });
+
+    container.on('focus', function (evt) {
+      if (!container.isOpen()) {
+        self.$selection.focus();
+      }
+    });
+
+    container.on('selection:update', function (params) {
+      self.update(params.data);
+    });
+  };
+
+  SingleSelection.prototype.clear = function () {
+    this.$selection.find('.select2-selection__rendered').empty();
+  };
+
+  SingleSelection.prototype.display = function (data, container) {
+    var template = this.options.get('templateSelection');
+    var escapeMarkup = this.options.get('escapeMarkup');
+
+    return escapeMarkup(template(data, container));
+  };
+
+  SingleSelection.prototype.selectionContainer = function () {
+    return $('<span></span>');
+  };
+
+  SingleSelection.prototype.update = function (data) {
+    if (data.length === 0) {
+      this.clear();
+      return;
+    }
+
+    var selection = data[0];
+
+    var $rendered = this.$selection.find('.select2-selection__rendered');
+    var formatted = this.display(selection, $rendered);
+
+    $rendered.empty().append(formatted);
+    $rendered.prop('title', selection.title || selection.text);
+  };
+
+  return SingleSelection;
+});
+
+S2.define('select2/selection/multiple',[
+  'jquery',
+  './base',
+  '../utils'
+], function ($, BaseSelection, Utils) {
+  function MultipleSelection ($element, options) {
+    MultipleSelection.__super__.constructor.apply(this, arguments);
+  }
+
+  Utils.Extend(MultipleSelection, BaseSelection);
+
+  MultipleSelection.prototype.render = function () {
+    var $selection = MultipleSelection.__super__.render.call(this);
+
+    $selection.addClass('select2-selection--multiple');
+
+    $selection.html(
+      '<ul class="select2-selection__rendered"></ul>'
+    );
+
+    return $selection;
+  };
+
+  MultipleSelection.prototype.bind = function (container, $container) {
+    var self = this;
+
+    MultipleSelection.__super__.bind.apply(this, arguments);
+
+    this.$selection.on('click', function (evt) {
+      self.trigger('toggle', {
+        originalEvent: evt
+      });
+    });
+
+    this.$selection.on(
+      'click',
+      '.select2-selection__choice__remove',
+      function (evt) {
+        // Ignore the event if it is disabled
+        if (self.options.get('disabled')) {
+          return;
+        }
+
+        var $remove = $(this);
+        var $selection = $remove.parent();
+
+        var data = $selection.data('data');
+
+        self.trigger('unselect', {
+          originalEvent: evt,
+          data: data
+        });
+      }
+    );
+  };
+
+  MultipleSelection.prototype.clear = function () {
+    this.$selection.find('.select2-selection__rendered').empty();
+  };
+
+  MultipleSelection.prototype.display = function (data, container) {
+    var template = this.options.get('templateSelection');
+    var escapeMarkup = this.options.get('escapeMarkup');
+
+    return escapeMarkup(template(data, container));
+  };
+
+  MultipleSelection.prototype.selectionContainer = function () {
+    var $container = $(
+      '<li class="select2-selection__choice">' +
+        '<span class="select2-selection__choice__remove" role="presentation">' +
+          '&times;' +
+        '</span>' +
+      '</li>'
+    );
+
+    return $container;
+  };
+
+  MultipleSelection.prototype.update = function (data) {
+    this.clear();
+
+    if (data.length === 0) {
+      return;
+    }
+
+    var $selections = [];
+
+    for (var d = 0; d < data.length; d++) {
+      var selection = data[d];
+
+      var $selection = this.selectionContainer();
+      var formatted = this.display(selection, $selection);
+
+      $selection.append(formatted);
+      $selection.prop('title', selection.title || selection.text);
+
+      $selection.data('data', selection);
+
+      $selections.push($selection);
+    }
+
+    var $rendered = this.$selection.find('.select2-selection__rendered');
+
+    Utils.appendMany($rendered, $selections);
+  };
+
+  return MultipleSelection;
+});
+
+S2.define('select2/selection/placeholder',[
+  '../utils'
+], function (Utils) {
+  function Placeholder (decorated, $element, options) {
+    this.placeholder = this.normalizePlaceholder(options.get('placeholder'));
+
+    decorated.call(this, $element, options);
+  }
+
+  Placeholder.prototype.normalizePlaceholder = function (_, placeholder) {
+    if (typeof placeholder === 'string') {
+      placeholder = {
+        id: '',
+        text: placeholder
+      };
+    }
+
+    return placeholder;
+  };
+
+  Placeholder.prototype.createPlaceholder = function (decorated, placeholder) {
+    var $placeholder = this.selectionContainer();
+
+    $placeholder.html(this.display(placeholder));
+    $placeholder.addClass('select2-selection__placeholder')
+                .removeClass('select2-selection__choice');
+
+    return $placeholder;
+  };
+
+  Placeholder.prototype.update = function (decorated, data) {
+    var singlePlaceholder = (
+      data.length == 1 && data[0].id != this.placeholder.id
+    );
+    var multipleSelections = data.length > 1;
+
+    if (multipleSelections || singlePlaceholder) {
+      return decorated.call(this, data);
+    }
+
+    this.clear();
+
+    var $placeholder = this.createPlaceholder(this.placeholder);
+
+    this.$selection.find('.select2-selection__rendered').append($placeholder);
+  };
+
+  return Placeholder;
+});
+
+S2.define('select2/selection/allowClear',[
+  'jquery',
+  '../keys'
+], function ($, KEYS) {
+  function AllowClear () { }
+
+  AllowClear.prototype.bind = function (decorated, container, $container) {
+    var self = this;
+
+    decorated.call(this, container, $container);
+
+    if (this.placeholder == null) {
+      if (this.options.get('debug') && window.console && console.error) {
+        console.error(
+          'Select2: The `allowClear` option should be used in combination ' +
+          'with the `placeholder` option.'
+        );
+      }
+    }
+
+    this.$selection.on('mousedown', '.select2-selection__clear',
+      function (evt) {
+        self._handleClear(evt);
+    });
+
+    container.on('keypress', function (evt) {
+      self._handleKeyboardClear(evt, container);
+    });
+  };
+
+  AllowClear.prototype._handleClear = function (_, evt) {
+    // Ignore the event if it is disabled
+    if (this.options.get('disabled')) {
+      return;
+    }
+
+    var $clear = this.$selection.find('.select2-selection__clear');
+
+    // Ignore the event if nothing has been selected
+    if ($clear.length === 0) {
+      return;
+    }
+
+    evt.stopPropagation();
+
+    var data = $clear.data('data');
+
+    for (var d = 0; d < data.length; d++) {
+      var unselectData = {
+        data: data[d]
+      };
+
+      // Trigger the `unselect` event, so people can prevent it from being
+      // cleared.
+      this.trigger('unselect', unselectData);
+
+      // If the event was prevented, don't clear it out.
+      if (unselectData.prevented) {
+        return;
+      }
+    }
+
+    this.$element.val(this.placeholder.id).trigger('change');
+
+    this.trigger('toggle', {});
+  };
+
+  AllowClear.prototype._handleKeyboardClear = function (_, evt, container) {
+    if (container.isOpen()) {
+      return;
+    }
+
+    if (evt.which == KEYS.DELETE || evt.which == KEYS.BACKSPACE) {
+      this._handleClear(evt);
+    }
+  };
+
+  AllowClear.prototype.update = function (decorated, data) {
+    decorated.call(this, data);
+
+    if (this.$selection.find('.select2-selection__placeholder').length > 0 ||
+        data.length === 0) {
+      return;
+    }
+
+    var $remove = $(
+      '<span class="select2-selection__clear">' +
+        '&times;' +
+      '</span>'
+    );
+    $remove.data('data', data);
+
+    this.$selection.find('.select2-selection__rendered').prepend($remove);
+  };
+
+  return AllowClear;
+});
+
+S2.define('select2/selection/search',[
+  'jquery',
+  '../utils',
+  '../keys'
+], function ($, Utils, KEYS) {
+  function Search (decorated, $element, options) {
+    decorated.call(this, $element, options);
+  }
+
+  Search.prototype.render = function (decorated) {
+    var $search = $(
+      '<li class="select2-search select2-search--inline">' +
+        '<input class="select2-search__field" type="search" tabindex="-1"' +
+        ' autocomplete="off" autocorrect="off" autocapitalize="off"' +
+        ' spellcheck="false" role="textbox" aria-autocomplete="list" />' +
+      '</li>'
+    );
+
+    this.$searchContainer = $search;
+    this.$search = $search.find('input');
+
+    var $rendered = decorated.call(this);
+
+    this._transferTabIndex();
+
+    return $rendered;
+  };
+
+  Search.prototype.bind = function (decorated, container, $container) {
+    var self = this;
+
+    decorated.call(this, container, $container);
+
+    container.on('open', function () {
+      self.$search.trigger('focus');
+    });
+
+    container.on('close', function () {
+      self.$search.val('');
+      self.$search.removeAttr('aria-activedescendant');
+      self.$search.trigger('focus');
+    });
+
+    container.on('enable', function () {
+      self.$search.prop('disabled', false);
+
+      self._transferTabIndex();
+    });
+
+    container.on('disable', function () {
+      self.$search.prop('disabled', true);
+    });
+
+    container.on('focus', function (evt) {
+      self.$search.trigger('focus');
+    });
+
+    container.on('results:focus', function (params) {
+      self.$search.attr('aria-activedescendant', params.id);
+    });
+
+    this.$selection.on('focusin', '.select2-search--inline', function (evt) {
+      self.trigger('focus', evt);
+    });
+
+    this.$selection.on('focusout', '.select2-search--inline', function (evt) {
+      self._handleBlur(evt);
+    });
+
+    this.$selection.on('keydown', '.select2-search--inline', function (evt) {
+      evt.stopPropagation();
+
+      self.trigger('keypress', evt);
+
+      self._keyUpPrevented = evt.isDefaultPrevented();
+
+      var key = evt.which;
+
+      if (key === KEYS.BACKSPACE && self.$search.val() === '') {
+        var $previousChoice = self.$searchContainer
+          .prev('.select2-selection__choice');
+
+        if ($previousChoice.length > 0) {
+          var item = $previousChoice.data('data');
+
+          self.searchRemoveChoice(item);
+
+          evt.preventDefault();
+        }
+      }
+    });
+
+    // Try to detect the IE version should the `documentMode` property that
+    // is stored on the document. This is only implemented in IE and is
+    // slightly cleaner than doing a user agent check.
+    // This property is not available in Edge, but Edge also doesn't have
+    // this bug.
+    var msie = document.documentMode;
+    var disableInputEvents = msie && msie <= 11;
+
+    // Workaround for browsers which do not support the `input` event
+    // This will prevent double-triggering of events for browsers which support
+    // both the `keyup` and `input` events.
+    this.$selection.on(
+      'input.searchcheck',
+      '.select2-search--inline',
+      function (evt) {
+        // IE will trigger the `input` event when a placeholder is used on a
+        // search box. To get around this issue, we are forced to ignore all
+        // `input` events in IE and keep using `keyup`.
+        if (disableInputEvents) {
+          self.$selection.off('input.search input.searchcheck');
+          return;
+        }
+
+        // Unbind the duplicated `keyup` event
+        self.$selection.off('keyup.search');
+      }
+    );
+
+    this.$selection.on(
+      'keyup.search input.search',
+      '.select2-search--inline',
+      function (evt) {
+        // IE will trigger the `input` event when a placeholder is used on a
+        // search box. To get around this issue, we are forced to ignore all
+        // `input` events in IE and keep using `keyup`.
+        if (disableInputEvents && evt.type === 'input') {
+          self.$selection.off('input.search input.searchcheck');
+          return;
+        }
+
+        var key = evt.which;
+
+        // We can freely ignore events from modifier keys
+        if (key == KEYS.SHIFT || key == KEYS.CTRL || key == KEYS.ALT) {
+          return;
+        }
+
+        // Tabbing will be handled during the `keydown` phase
+        if (key == KEYS.TAB) {
+          return;
+        }
+
+        self.handleSearch(evt);
+      }
+    );
+  };
+
+  /**
+   * This method will transfer the tabindex attribute from the rendered
+   * selection to the search box. This allows for the search box to be used as
+   * the primary focus instead of the selection container.
+   *
+   * @private
+   */
+  Search.prototype._transferTabIndex = function (decorated) {
+    this.$search.attr('tabindex', this.$selection.attr('tabindex'));
+    this.$selection.attr('tabindex', '-1');
+  };
+
+  Search.prototype.createPlaceholder = function (decorated, placeholder) {
+    this.$search.attr('placeholder', placeholder.text);
+  };
+
+  Search.prototype.update = function (decorated, data) {
+    var searchHadFocus = this.$search[0] == document.activeElement;
+
+    this.$search.attr('placeholder', '');
+
+    decorated.call(this, data);
+
+    this.$selection.find('.select2-selection__rendered')
+                   .append(this.$searchContainer);
+
+    this.resizeSearch();
+    if (searchHadFocus) {
+      this.$search.focus();
+    }
+  };
+
+  Search.prototype.handleSearch = function () {
+    this.resizeSearch();
+
+    if (!this._keyUpPrevented) {
+      var input = this.$search.val();
+
+      this.trigger('query', {
+        term: input
+      });
+    }
+
+    this._keyUpPrevented = false;
+  };
+
+  Search.prototype.searchRemoveChoice = function (decorated, item) {
+    this.trigger('unselect', {
+      data: item
+    });
+
+    this.$search.val(item.text);
+    this.handleSearch();
+  };
+
+  Search.prototype.resizeSearch = function () {
+    this.$search.css('width', '25px');
+
+    var width = '';
+
+    if (this.$search.attr('placeholder') !== '') {
+      width = this.$selection.find('.select2-selection__rendered').innerWidth();
+    } else {
+      var minimumWidth = this.$search.val().length + 1;
+
+      width = (minimumWidth * 0.75) + 'em';
+    }
+
+    this.$search.css('width', width);
+  };
+
+  return Search;
+});
+
+S2.define('select2/selection/eventRelay',[
+  'jquery'
+], function ($) {
+  function EventRelay () { }
+
+  EventRelay.prototype.bind = function (decorated, container, $container) {
+    var self = this;
+    var relayEvents = [
+      'open', 'opening',
+      'close', 'closing',
+      'select', 'selecting',
+      'unselect', 'unselecting'
+    ];
+
+    var preventableEvents = ['opening', 'closing', 'selecting', 'unselecting'];
+
+    decorated.call(this, container, $container);
+
+    container.on('*', function (name, params) {
+      // Ignore events that should not be relayed
+      if ($.inArray(name, relayEvents) === -1) {
+        return;
+      }
+
+      // The parameters should always be an object
+      params = params || {};
+
+      // Generate the jQuery event for the Select2 event
+      var evt = $.Event('select2:' + name, {
+        params: params
+      });
+
+      self.$element.trigger(evt);
+
+      // Only handle preventable events if it was one
+      if ($.inArray(name, preventableEvents) === -1) {
+        return;
+      }
+
+      params.prevented = evt.isDefaultPrevented();
+    });
+  };
+
+  return EventRelay;
+});
+
+S2.define('select2/translation',[
+  'jquery',
+  'require'
+], function ($, require) {
+  function Translation (dict) {
+    this.dict = dict || {};
+  }
+
+  Translation.prototype.all = function () {
+    return this.dict;
+  };
+
+  Translation.prototype.get = function (key) {
+    return this.dict[key];
+  };
+
+  Translation.prototype.extend = function (translation) {
+    this.dict = $.extend({}, translation.all(), this.dict);
+  };
+
+  // Static functions
+
+  Translation._cache = {};
+
+  Translation.loadPath = function (path) {
+    if (!(path in Translation._cache)) {
+      var translations = require(path);
+
+      Translation._cache[path] = translations;
+    }
+
+    return new Translation(Translation._cache[path]);
+  };
+
+  return Translation;
+});
+
+S2.define('select2/diacritics',[
+
+], function () {
+  var diacritics = {
+    '\u24B6': 'A',
+    '\uFF21': 'A',
+    '\u00C0': 'A',
+    '\u00C1': 'A',
+    '\u00C2': 'A',
+    '\u1EA6': 'A',
+    '\u1EA4': 'A',
+    '\u1EAA': 'A',
+    '\u1EA8': 'A',
+    '\u00C3': 'A',
+    '\u0100': 'A',
+    '\u0102': 'A',
+    '\u1EB0': 'A',
+    '\u1EAE': 'A',
+    '\u1EB4': 'A',
+    '\u1EB2': 'A',
+    '\u0226': 'A',
+    '\u01E0': 'A',
+    '\u00C4': 'A',
+    '\u01DE': 'A',
+    '\u1EA2': 'A',
+    '\u00C5': 'A',
+    '\u01FA': 'A',
+    '\u01CD': 'A',
+    '\u0200': 'A',
+    '\u0202': 'A',
+    '\u1EA0': 'A',
+    '\u1EAC': 'A',
+    '\u1EB6': 'A',
+    '\u1E00': 'A',
+    '\u0104': 'A',
+    '\u023A': 'A',
+    '\u2C6F': 'A',
+    '\uA732': 'AA',
+    '\u00C6': 'AE',
+    '\u01FC': 'AE',
+    '\u01E2': 'AE',
+    '\uA734': 'AO',
+    '\uA736': 'AU',
+    '\uA738': 'AV',
+    '\uA73A': 'AV',
+    '\uA73C': 'AY',
+    '\u24B7': 'B',
+    '\uFF22': 'B',
+    '\u1E02': 'B',
+    '\u1E04': 'B',
+    '\u1E06': 'B',
+    '\u0243': 'B',
+    '\u0182': 'B',
+    '\u0181': 'B',
+    '\u24B8': 'C',
+    '\uFF23': 'C',
+    '\u0106': 'C',
+    '\u0108': 'C',
+    '\u010A': 'C',
+    '\u010C': 'C',
+    '\u00C7': 'C',
+    '\u1E08': 'C',
+    '\u0187': 'C',
+    '\u023B': 'C',
+    '\uA73E': 'C',
+    '\u24B9': 'D',
+    '\uFF24': 'D',
+    '\u1E0A': 'D',
+    '\u010E': 'D',
+    '\u1E0C': 'D',
+    '\u1E10': 'D',
+    '\u1E12': 'D',
+    '\u1E0E': 'D',
+    '\u0110': 'D',
+    '\u018B': 'D',
+    '\u018A': 'D',
+    '\u0189': 'D',
+    '\uA779': 'D',
+    '\u01F1': 'DZ',
+    '\u01C4': 'DZ',
+    '\u01F2': 'Dz',
+    '\u01C5': 'Dz',
+    '\u24BA': 'E',
+    '\uFF25': 'E',
+    '\u00C8': 'E',
+    '\u00C9': 'E',
+    '\u00CA': 'E',
+    '\u1EC0': 'E',
+    '\u1EBE': 'E',
+    '\u1EC4': 'E',
+    '\u1EC2': 'E',
+    '\u1EBC': 'E',
+    '\u0112': 'E',
+    '\u1E14': 'E',
+    '\u1E16': 'E',
+    '\u0114': 'E',
+    '\u0116': 'E',
+    '\u00CB': 'E',
+    '\u1EBA': 'E',
+    '\u011A': 'E',
+    '\u0204': 'E',
+    '\u0206': 'E',
+    '\u1EB8': 'E',
+    '\u1EC6': 'E',
+    '\u0228': 'E',
+    '\u1E1C': 'E',
+    '\u0118': 'E',
+    '\u1E18': 'E',
+    '\u1E1A': 'E',
+    '\u0190': 'E',
+    '\u018E': 'E',
+    '\u24BB': 'F',
+    '\uFF26': 'F',
+    '\u1E1E': 'F',
+    '\u0191': 'F',
+    '\uA77B': 'F',
+    '\u24BC': 'G',
+    '\uFF27': 'G',
+    '\u01F4': 'G',
+    '\u011C': 'G',
+    '\u1E20': 'G',
+    '\u011E': 'G',
+    '\u0120': 'G',
+    '\u01E6': 'G',
+    '\u0122': 'G',
+    '\u01E4': 'G',
+    '\u0193': 'G',
+    '\uA7A0': 'G',
+    '\uA77D': 'G',
+    '\uA77E': 'G',
+    '\u24BD': 'H',
+    '\uFF28': 'H',
+    '\u0124': 'H',
+    '\u1E22': 'H',
+    '\u1E26': 'H',
+    '\u021E': 'H',
+    '\u1E24': 'H',
+    '\u1E28': 'H',
+    '\u1E2A': 'H',
+    '\u0126': 'H',
+    '\u2C67': 'H',
+    '\u2C75': 'H',
+    '\uA78D': 'H',
+    '\u24BE': 'I',
+    '\uFF29': 'I',
+    '\u00CC': 'I',
+    '\u00CD': 'I',
+    '\u00CE': 'I',
+    '\u0128': 'I',
+    '\u012A': 'I',
+    '\u012C': 'I',
+    '\u0130': 'I',
+    '\u00CF': 'I',
+    '\u1E2E': 'I',
+    '\u1EC8': 'I',
+    '\u01CF': 'I',
+    '\u0208': 'I',
+    '\u020A': 'I',
+    '\u1ECA': 'I',
+    '\u012E': 'I',
+    '\u1E2C': 'I',
+    '\u0197': 'I',
+    '\u24BF': 'J',
+    '\uFF2A': 'J',
+    '\u0134': 'J',
+    '\u0248': 'J',
+    '\u24C0': 'K',
+    '\uFF2B': 'K',
+    '\u1E30': 'K',
+    '\u01E8': 'K',
+    '\u1E32': 'K',
+    '\u0136': 'K',
+    '\u1E34': 'K',
+    '\u0198': 'K',
+    '\u2C69': 'K',
+    '\uA740': 'K',
+    '\uA742': 'K',
+    '\uA744': 'K',
+    '\uA7A2': 'K',
+    '\u24C1': 'L',
+    '\uFF2C': 'L',
+    '\u013F': 'L',
+    '\u0139': 'L',
+    '\u013D': 'L',
+    '\u1E36': 'L',
+    '\u1E38': 'L',
+    '\u013B': 'L',
+    '\u1E3C': 'L',
+    '\u1E3A': 'L',
+    '\u0141': 'L',
+    '\u023D': 'L',
+    '\u2C62': 'L',
+    '\u2C60': 'L',
+    '\uA748': 'L',
+    '\uA746': 'L',
+    '\uA780': 'L',
+    '\u01C7': 'LJ',
+    '\u01C8': 'Lj',
+    '\u24C2': 'M',
+    '\uFF2D': 'M',
+    '\u1E3E': 'M',
+    '\u1E40': 'M',
+    '\u1E42': 'M',
+    '\u2C6E': 'M',
+    '\u019C': 'M',
+    '\u24C3': 'N',
+    '\uFF2E': 'N',
+    '\u01F8': 'N',
+    '\u0143': 'N',
+    '\u00D1': 'N',
+    '\u1E44': 'N',
+    '\u0147': 'N',
+    '\u1E46': 'N',
+    '\u0145': 'N',
+    '\u1E4A': 'N',
+    '\u1E48': 'N',
+    '\u0220': 'N',
+    '\u019D': 'N',
+    '\uA790': 'N',
+    '\uA7A4': 'N',
+    '\u01CA': 'NJ',
+    '\u01CB': 'Nj',
+    '\u24C4': 'O',
+    '\uFF2F': 'O',
+    '\u00D2': 'O',
+    '\u00D3': 'O',
+    '\u00D4': 'O',
+    '\u1ED2': 'O',
+    '\u1ED0': 'O',
+    '\u1ED6': 'O',
+    '\u1ED4': 'O',
+    '\u00D5': 'O',
+    '\u1E4C': 'O',
+    '\u022C': 'O',
+    '\u1E4E': 'O',
+    '\u014C': 'O',
+    '\u1E50': 'O',
+    '\u1E52': 'O',
+    '\u014E': 'O',
+    '\u022E': 'O',
+    '\u0230': 'O',
+    '\u00D6': 'O',
+    '\u022A': 'O',
+    '\u1ECE': 'O',
+    '\u0150': 'O',
+    '\u01D1': 'O',
+    '\u020C': 'O',
+    '\u020E': 'O',
+    '\u01A0': 'O',
+    '\u1EDC': 'O',
+    '\u1EDA': 'O',
+    '\u1EE0': 'O',
+    '\u1EDE': 'O',
+    '\u1EE2': 'O',
+    '\u1ECC': 'O',
+    '\u1ED8': 'O',
+    '\u01EA': 'O',
+    '\u01EC': 'O',
+    '\u00D8': 'O',
+    '\u01FE': 'O',
+    '\u0186': 'O',
+    '\u019F': 'O',
+    '\uA74A': 'O',
+    '\uA74C': 'O',
+    '\u01A2': 'OI',
+    '\uA74E': 'OO',
+    '\u0222': 'OU',
+    '\u24C5': 'P',
+    '\uFF30': 'P',
+    '\u1E54': 'P',
+    '\u1E56': 'P',
+    '\u01A4': 'P',
+    '\u2C63': 'P',
+    '\uA750': 'P',
+    '\uA752': 'P',
+    '\uA754': 'P',
+    '\u24C6': 'Q',
+    '\uFF31': 'Q',
+    '\uA756': 'Q',
+    '\uA758': 'Q',
+    '\u024A': 'Q',
+    '\u24C7': 'R',
+    '\uFF32': 'R',
+    '\u0154': 'R',
+    '\u1E58': 'R',
+    '\u0158': 'R',
+    '\u0210': 'R',
+    '\u0212': 'R',
+    '\u1E5A': 'R',
+    '\u1E5C': 'R',
+    '\u0156': 'R',
+    '\u1E5E': 'R',
+    '\u024C': 'R',
+    '\u2C64': 'R',
+    '\uA75A': 'R',
+    '\uA7A6': 'R',
+    '\uA782': 'R',
+    '\u24C8': 'S',
+    '\uFF33': 'S',
+    '\u1E9E': 'S',
+    '\u015A': 'S',
+    '\u1E64': 'S',
+    '\u015C': 'S',
+    '\u1E60': 'S',
+    '\u0160': 'S',
+    '\u1E66': 'S',
+    '\u1E62': 'S',
+    '\u1E68': 'S',
+    '\u0218': 'S',
+    '\u015E': 'S',
+    '\u2C7E': 'S',
+    '\uA7A8': 'S',
+    '\uA784': 'S',
+    '\u24C9': 'T',
+    '\uFF34': 'T',
+    '\u1E6A': 'T',
+    '\u0164': 'T',
+    '\u1E6C': 'T',
+    '\u021A': 'T',
+    '\u0162': 'T',
+    '\u1E70': 'T',
+    '\u1E6E': 'T',
+    '\u0166': 'T',
+    '\u01AC': 'T',
+    '\u01AE': 'T',
+    '\u023E': 'T',
+    '\uA786': 'T',
+    '\uA728': 'TZ',
+    '\u24CA': 'U',
+    '\uFF35': 'U',
+    '\u00D9': 'U',
+    '\u00DA': 'U',
+    '\u00DB': 'U',
+    '\u0168': 'U',
+    '\u1E78': 'U',
+    '\u016A': 'U',
+    '\u1E7A': 'U',
+    '\u016C': 'U',
+    '\u00DC': 'U',
+    '\u01DB': 'U',
+    '\u01D7': 'U',
+    '\u01D5': 'U',
+    '\u01D9': 'U',
+    '\u1EE6': 'U',
+    '\u016E': 'U',
+    '\u0170': 'U',
+    '\u01D3': 'U',
+    '\u0214': 'U',
+    '\u0216': 'U',
+    '\u01AF': 'U',
+    '\u1EEA': 'U',
+    '\u1EE8': 'U',
+    '\u1EEE': 'U',
+    '\u1EEC': 'U',
+    '\u1EF0': 'U',
+    '\u1EE4': 'U',
+    '\u1E72': 'U',
+    '\u0172': 'U',
+    '\u1E76': 'U',
+    '\u1E74': 'U',
+    '\u0244': 'U',
+    '\u24CB': 'V',
+    '\uFF36': 'V',
+    '\u1E7C': 'V',
+    '\u1E7E': 'V',
+    '\u01B2': 'V',
+    '\uA75E': 'V',
+    '\u0245': 'V',
+    '\uA760': 'VY',
+    '\u24CC': 'W',
+    '\uFF37': 'W',
+    '\u1E80': 'W',
+    '\u1E82': 'W',
+    '\u0174': 'W',
+    '\u1E86': 'W',
+    '\u1E84': 'W',
+    '\u1E88': 'W',
+    '\u2C72': 'W',
+    '\u24CD': 'X',
+    '\uFF38': 'X',
+    '\u1E8A': 'X',
+    '\u1E8C': 'X',
+    '\u24CE': 'Y',
+    '\uFF39': 'Y',
+    '\u1EF2': 'Y',
+    '\u00DD': 'Y',
+    '\u0176': 'Y',
+    '\u1EF8': 'Y',
+    '\u0232': 'Y',
+    '\u1E8E': 'Y',
+    '\u0178': 'Y',
+    '\u1EF6': 'Y',
+    '\u1EF4': 'Y',
+    '\u01B3': 'Y',
+    '\u024E': 'Y',
+    '\u1EFE': 'Y',
+    '\u24CF': 'Z',
+    '\uFF3A': 'Z',
+    '\u0179': 'Z',
+    '\u1E90': 'Z',
+    '\u017B': 'Z',
+    '\u017D': 'Z',
+    '\u1E92': 'Z',
+    '\u1E94': 'Z',
+    '\u01B5': 'Z',
+    '\u0224': 'Z',
+    '\u2C7F': 'Z',
+    '\u2C6B': 'Z',
+    '\uA762': 'Z',
+    '\u24D0': 'a',
+    '\uFF41': 'a',
+    '\u1E9A': 'a',
+    '\u00E0': 'a',
+    '\u00E1': 'a',
+    '\u00E2': 'a',
+    '\u1EA7': 'a',
+    '\u1EA5': 'a',
+    '\u1EAB': 'a',
+    '\u1EA9': 'a',
+    '\u00E3': 'a',
+    '\u0101': 'a',
+    '\u0103': 'a',
+    '\u1EB1': 'a',
+    '\u1EAF': 'a',
+    '\u1EB5': 'a',
+    '\u1EB3': 'a',
+    '\u0227': 'a',
+    '\u01E1': 'a',
+    '\u00E4': 'a',
+    '\u01DF': 'a',
+    '\u1EA3': 'a',
+    '\u00E5': 'a',
+    '\u01FB': 'a',
+    '\u01CE': 'a',
+    '\u0201': 'a',
+    '\u0203': 'a',
+    '\u1EA1': 'a',
+    '\u1EAD': 'a',
+    '\u1EB7': 'a',
+    '\u1E01': 'a',
+    '\u0105': 'a',
+    '\u2C65': 'a',
+    '\u0250': 'a',
+    '\uA733': 'aa',
+    '\u00E6': 'ae',
+    '\u01FD': 'ae',
+    '\u01E3': 'ae',
+    '\uA735': 'ao',
+    '\uA737': 'au',
+    '\uA739': 'av',
+    '\uA73B': 'av',
+    '\uA73D': 'ay',
+    '\u24D1': 'b',
+    '\uFF42': 'b',
+    '\u1E03': 'b',
+    '\u1E05': 'b',
+    '\u1E07': 'b',
+    '\u0180': 'b',
+    '\u0183': 'b',
+    '\u0253': 'b',
+    '\u24D2': 'c',
+    '\uFF43': 'c',
+    '\u0107': 'c',
+    '\u0109': 'c',
+    '\u010B': 'c',
+    '\u010D': 'c',
+    '\u00E7': 'c',
+    '\u1E09': 'c',
+    '\u0188': 'c',
+    '\u023C': 'c',
+    '\uA73F': 'c',
+    '\u2184': 'c',
+    '\u24D3': 'd',
+    '\uFF44': 'd',
+    '\u1E0B': 'd',
+    '\u010F': 'd',
+    '\u1E0D': 'd',
+    '\u1E11': 'd',
+    '\u1E13': 'd',
+    '\u1E0F': 'd',
+    '\u0111': 'd',
+    '\u018C': 'd',
+    '\u0256': 'd',
+    '\u0257': 'd',
+    '\uA77A': 'd',
+    '\u01F3': 'dz',
+    '\u01C6': 'dz',
+    '\u24D4': 'e',
+    '\uFF45': 'e',
+    '\u00E8': 'e',
+    '\u00E9': 'e',
+    '\u00EA': 'e',
+    '\u1EC1': 'e',
+    '\u1EBF': 'e',
+    '\u1EC5': 'e',
+    '\u1EC3': 'e',
+    '\u1EBD': 'e',
+    '\u0113': 'e',
+    '\u1E15': 'e',
+    '\u1E17': 'e',
+    '\u0115': 'e',
+    '\u0117': 'e',
+    '\u00EB': 'e',
+    '\u1EBB': 'e',
+    '\u011B': 'e',
+    '\u0205': 'e',
+    '\u0207': 'e',
+    '\u1EB9': 'e',
+    '\u1EC7': 'e',
+    '\u0229': 'e',
+    '\u1E1D': 'e',
+    '\u0119': 'e',
+    '\u1E19': 'e',
+    '\u1E1B': 'e',
+    '\u0247': 'e',
+    '\u025B': 'e',
+    '\u01DD': 'e',
+    '\u24D5': 'f',
+    '\uFF46': 'f',
+    '\u1E1F': 'f',
+    '\u0192': 'f',
+    '\uA77C': 'f',
+    '\u24D6': 'g',
+    '\uFF47': 'g',
+    '\u01F5': 'g',
+    '\u011D': 'g',
+    '\u1E21': 'g',
+    '\u011F': 'g',
+    '\u0121': 'g',
+    '\u01E7': 'g',
+    '\u0123': 'g',
+    '\u01E5': 'g',
+    '\u0260': 'g',
+    '\uA7A1': 'g',
+    '\u1D79': 'g',
+    '\uA77F': 'g',
+    '\u24D7': 'h',
+    '\uFF48': 'h',
+    '\u0125': 'h',
+    '\u1E23': 'h',
+    '\u1E27': 'h',
+    '\u021F': 'h',
+    '\u1E25': 'h',
+    '\u1E29': 'h',
+    '\u1E2B': 'h',
+    '\u1E96': 'h',
+    '\u0127': 'h',
+    '\u2C68': 'h',
+    '\u2C76': 'h',
+    '\u0265': 'h',
+    '\u0195': 'hv',
+    '\u24D8': 'i',
+    '\uFF49': 'i',
+    '\u00EC': 'i',
+    '\u00ED': 'i',
+    '\u00EE': 'i',
+    '\u0129': 'i',
+    '\u012B': 'i',
+    '\u012D': 'i',
+    '\u00EF': 'i',
+    '\u1E2F': 'i',
+    '\u1EC9': 'i',
+    '\u01D0': 'i',
+    '\u0209': 'i',
+    '\u020B': 'i',
+    '\u1ECB': 'i',
+    '\u012F': 'i',
+    '\u1E2D': 'i',
+    '\u0268': 'i',
+    '\u0131': 'i',
+    '\u24D9': 'j',
+    '\uFF4A': 'j',
+    '\u0135': 'j',
+    '\u01F0': 'j',
+    '\u0249': 'j',
+    '\u24DA': 'k',
+    '\uFF4B': 'k',
+    '\u1E31': 'k',
+    '\u01E9': 'k',
+    '\u1E33': 'k',
+    '\u0137': 'k',
+    '\u1E35': 'k',
+    '\u0199': 'k',
+    '\u2C6A': 'k',
+    '\uA741': 'k',
+    '\uA743': 'k',
+    '\uA745': 'k',
+    '\uA7A3': 'k',
+    '\u24DB': 'l',
+    '\uFF4C': 'l',
+    '\u0140': 'l',
+    '\u013A': 'l',
+    '\u013E': 'l',
+    '\u1E37': 'l',
+    '\u1E39': 'l',
+    '\u013C': 'l',
+    '\u1E3D': 'l',
+    '\u1E3B': 'l',
+    '\u017F': 'l',
+    '\u0142': 'l',
+    '\u019A': 'l',
+    '\u026B': 'l',
+    '\u2C61': 'l',
+    '\uA749': 'l',
+    '\uA781': 'l',
+    '\uA747': 'l',
+    '\u01C9': 'lj',
+    '\u24DC': 'm',
+    '\uFF4D': 'm',
+    '\u1E3F': 'm',
+    '\u1E41': 'm',
+    '\u1E43': 'm',
+    '\u0271': 'm',
+    '\u026F': 'm',
+    '\u24DD': 'n',
+    '\uFF4E': 'n',
+    '\u01F9': 'n',
+    '\u0144': 'n',
+    '\u00F1': 'n',
+    '\u1E45': 'n',
+    '\u0148': 'n',
+    '\u1E47': 'n',
+    '\u0146': 'n',
+    '\u1E4B': 'n',
+    '\u1E49': 'n',
+    '\u019E': 'n',
+    '\u0272': 'n',
+    '\u0149': 'n',
+    '\uA791': 'n',
+    '\uA7A5': 'n',
+    '\u01CC': 'nj',
+    '\u24DE': 'o',
+    '\uFF4F': 'o',
+    '\u00F2': 'o',
+    '\u00F3': 'o',
+    '\u00F4': 'o',
+    '\u1ED3': 'o',
+    '\u1ED1': 'o',
+    '\u1ED7': 'o',
+    '\u1ED5': 'o',
+    '\u00F5': 'o',
+    '\u1E4D': 'o',
+    '\u022D': 'o',
+    '\u1E4F': 'o',
+    '\u014D': 'o',
+    '\u1E51': 'o',
+    '\u1E53': 'o',
+    '\u014F': 'o',
+    '\u022F': 'o',
+    '\u0231': 'o',
+    '\u00F6': 'o',
+    '\u022B': 'o',
+    '\u1ECF': 'o',
+    '\u0151': 'o',
+    '\u01D2': 'o',
+    '\u020D': 'o',
+    '\u020F': 'o',
+    '\u01A1': 'o',
+    '\u1EDD': 'o',
+    '\u1EDB': 'o',
+    '\u1EE1': 'o',
+    '\u1EDF': 'o',
+    '\u1EE3': 'o',
+    '\u1ECD': 'o',
+    '\u1ED9': 'o',
+    '\u01EB': 'o',
+    '\u01ED': 'o',
+    '\u00F8': 'o',
+    '\u01FF': 'o',
+    '\u0254': 'o',
+    '\uA74B': 'o',
+    '\uA74D': 'o',
+    '\u0275': 'o',
+    '\u01A3': 'oi',
+    '\u0223': 'ou',
+    '\uA74F': 'oo',
+    '\u24DF': 'p',
+    '\uFF50': 'p',
+    '\u1E55': 'p',
+    '\u1E57': 'p',
+    '\u01A5': 'p',
+    '\u1D7D': 'p',
+    '\uA751': 'p',
+    '\uA753': 'p',
+    '\uA755': 'p',
+    '\u24E0': 'q',
+    '\uFF51': 'q',
+    '\u024B': 'q',
+    '\uA757': 'q',
+    '\uA759': 'q',
+    '\u24E1': 'r',
+    '\uFF52': 'r',
+    '\u0155': 'r',
+    '\u1E59': 'r',
+    '\u0159': 'r',
+    '\u0211': 'r',
+    '\u0213': 'r',
+    '\u1E5B': 'r',
+    '\u1E5D': 'r',
+    '\u0157': 'r',
+    '\u1E5F': 'r',
+    '\u024D': 'r',
+    '\u027D': 'r',
+    '\uA75B': 'r',
+    '\uA7A7': 'r',
+    '\uA783': 'r',
+    '\u24E2': 's',
+    '\uFF53': 's',
+    '\u00DF': 's',
+    '\u015B': 's',
+    '\u1E65': 's',
+    '\u015D': 's',
+    '\u1E61': 's',
+    '\u0161': 's',
+    '\u1E67': 's',
+    '\u1E63': 's',
+    '\u1E69': 's',
+    '\u0219': 's',
+    '\u015F': 's',
+    '\u023F': 's',
+    '\uA7A9': 's',
+    '\uA785': 's',
+    '\u1E9B': 's',
+    '\u24E3': 't',
+    '\uFF54': 't',
+    '\u1E6B': 't',
+    '\u1E97': 't',
+    '\u0165': 't',
+    '\u1E6D': 't',
+    '\u021B': 't',
+    '\u0163': 't',
+    '\u1E71': 't',
+    '\u1E6F': 't',
+    '\u0167': 't',
+    '\u01AD': 't',
+    '\u0288': 't',
+    '\u2C66': 't',
+    '\uA787': 't',
+    '\uA729': 'tz',
+    '\u24E4': 'u',
+    '\uFF55': 'u',
+    '\u00F9': 'u',
+    '\u00FA': 'u',
+    '\u00FB': 'u',
+    '\u0169': 'u',
+    '\u1E79': 'u',
+    '\u016B': 'u',
+    '\u1E7B': 'u',
+    '\u016D': 'u',
+    '\u00FC': 'u',
+    '\u01DC': 'u',
+    '\u01D8': 'u',
+    '\u01D6': 'u',
+    '\u01DA': 'u',
+    '\u1EE7': 'u',
+    '\u016F': 'u',
+    '\u0171': 'u',
+    '\u01D4': 'u',
+    '\u0215': 'u',
+    '\u0217': 'u',
+    '\u01B0': 'u',
+    '\u1EEB': 'u',
+    '\u1EE9': 'u',
+    '\u1EEF': 'u',
+    '\u1EED': 'u',
+    '\u1EF1': 'u',
+    '\u1EE5': 'u',
+    '\u1E73': 'u',
+    '\u0173': 'u',
+    '\u1E77': 'u',
+    '\u1E75': 'u',
+    '\u0289': 'u',
+    '\u24E5': 'v',
+    '\uFF56': 'v',
+    '\u1E7D': 'v',
+    '\u1E7F': 'v',
+    '\u028B': 'v',
+    '\uA75F': 'v',
+    '\u028C': 'v',
+    '\uA761': 'vy',
+    '\u24E6': 'w',
+    '\uFF57': 'w',
+    '\u1E81': 'w',
+    '\u1E83': 'w',
+    '\u0175': 'w',
+    '\u1E87': 'w',
+    '\u1E85': 'w',
+    '\u1E98': 'w',
+    '\u1E89': 'w',
+    '\u2C73': 'w',
+    '\u24E7': 'x',
+    '\uFF58': 'x',
+    '\u1E8B': 'x',
+    '\u1E8D': 'x',
+    '\u24E8': 'y',
+    '\uFF59': 'y',
+    '\u1EF3': 'y',
+    '\u00FD': 'y',
+    '\u0177': 'y',
+    '\u1EF9': 'y',
+    '\u0233': 'y',
+    '\u1E8F': 'y',
+    '\u00FF': 'y',
+    '\u1EF7': 'y',
+    '\u1E99': 'y',
+    '\u1EF5': 'y',
+    '\u01B4': 'y',
+    '\u024F': 'y',
+    '\u1EFF': 'y',
+    '\u24E9': 'z',
+    '\uFF5A': 'z',
+    '\u017A': 'z',
+    '\u1E91': 'z',
+    '\u017C': 'z',
+    '\u017E': 'z',
+    '\u1E93': 'z',
+    '\u1E95': 'z',
+    '\u01B6': 'z',
+    '\u0225': 'z',
+    '\u0240': 'z',
+    '\u2C6C': 'z',
+    '\uA763': 'z',
+    '\u0386': '\u0391',
+    '\u0388': '\u0395',
+    '\u0389': '\u0397',
+    '\u038A': '\u0399',
+    '\u03AA': '\u0399',
+    '\u038C': '\u039F',
+    '\u038E': '\u03A5',
+    '\u03AB': '\u03A5',
+    '\u038F': '\u03A9',
+    '\u03AC': '\u03B1',
+    '\u03AD': '\u03B5',
+    '\u03AE': '\u03B7',
+    '\u03AF': '\u03B9',
+    '\u03CA': '\u03B9',
+    '\u0390': '\u03B9',
+    '\u03CC': '\u03BF',
+    '\u03CD': '\u03C5',
+    '\u03CB': '\u03C5',
+    '\u03B0': '\u03C5',
+    '\u03C9': '\u03C9',
+    '\u03C2': '\u03C3'
+  };
+
+  return diacritics;
+});
+
+S2.define('select2/data/base',[
+  '../utils'
+], function (Utils) {
+  function BaseAdapter ($element, options) {
+    BaseAdapter.__super__.constructor.call(this);
+  }
+
+  Utils.Extend(BaseAdapter, Utils.Observable);
+
+  BaseAdapter.prototype.current = function (callback) {
+    throw new Error('The `current` method must be defined in child classes.');
+  };
+
+  BaseAdapter.prototype.query = function (params, callback) {
+    throw new Error('The `query` method must be defined in child classes.');
+  };
+
+  BaseAdapter.prototype.bind = function (container, $container) {
+    // Can be implemented in subclasses
+  };
+
+  BaseAdapter.prototype.destroy = function () {
+    // Can be implemented in subclasses
+  };
+
+  BaseAdapter.prototype.generateResultId = function (container, data) {
+    var id = container.id + '-result-';
+
+    id += Utils.generateChars(4);
+
+    if (data.id != null) {
+      id += '-' + data.id.toString();
+    } else {
+      id += '-' + Utils.generateChars(4);
+    }
+    return id;
+  };
+
+  return BaseAdapter;
+});
+
+S2.define('select2/data/select',[
+  './base',
+  '../utils',
+  'jquery'
+], function (BaseAdapter, Utils, $) {
+  function SelectAdapter ($element, options) {
+    this.$element = $element;
+    this.options = options;
+
+    SelectAdapter.__super__.constructor.call(this);
+  }
+
+  Utils.Extend(SelectAdapter, BaseAdapter);
+
+  SelectAdapter.prototype.current = function (callback) {
+    var data = [];
+    var self = this;
+
+    this.$element.find(':selected').each(function () {
+      var $option = $(this);
+
+      var option = self.item($option);
+
+      data.push(option);
+    });
+
+    callback(data);
+  };
+
+  SelectAdapter.prototype.select = function (data) {
+    var self = this;
+
+    data.selected = true;
+
+    // If data.element is a DOM node, use it instead
+    if ($(data.element).is('option')) {
+      data.element.selected = true;
+
+      this.$element.trigger('change');
+
+      return;
+    }
+
+    if (this.$element.prop('multiple')) {
+      this.current(function (currentData) {
+        var val = [];
+
+        data = [data];
+        data.push.apply(data, currentData);
+
+        for (var d = 0; d < data.length; d++) {
+          var id = data[d].id;
+
+          if ($.inArray(id, val) === -1) {
+            val.push(id);
+          }
+        }
+
+        self.$element.val(val);
+        self.$element.trigger('change');
+      });
+    } else {
+      var val = data.id;
+
+      this.$element.val(val);
+      this.$element.trigger('change');
+    }
+  };
+
+  SelectAdapter.prototype.unselect = function (data) {
+    var self = this;
+
+    if (!this.$element.prop('multiple')) {
+      return;
+    }
+
+    data.selected = false;
+
+    if ($(data.element).is('option')) {
+      data.element.selected = false;
+
+      this.$element.trigger('change');
+
+      return;
+    }
+
+    this.current(function (currentData) {
+      var val = [];
+
+      for (var d = 0; d < currentData.length; d++) {
+        var id = currentData[d].id;
+
+        if (id !== data.id && $.inArray(id, val) === -1) {
+          val.push(id);
+        }
+      }
+
+      self.$element.val(val);
+
+      self.$element.trigger('change');
+    });
+  };
+
+  SelectAdapter.prototype.bind = function (container, $container) {
+    var self = this;
+
+    this.container = container;
+
+    container.on('select', function (params) {
+      self.select(params.data);
+    });
+
+    container.on('unselect', function (params) {
+      self.unselect(params.data);
+    });
+  };
+
+  SelectAdapter.prototype.destroy = function () {
+    // Remove anything added to child elements
+    this.$element.find('*').each(function () {
+      // Remove any custom data set by Select2
+      $.removeData(this, 'data');
+    });
+  };
+
+  SelectAdapter.prototype.query = function (params, callback) {
+    var data = [];
+    var self = this;
+
+    var $options = this.$element.children();
+
+    $options.each(function () {
+      var $option = $(this);
+
+      if (!$option.is('option') && !$option.is('optgroup')) {
+        return;
+      }
+
+      var option = self.item($option);
+
+      var matches = self.matches(params, option);
+
+      if (matches !== null) {
+        data.push(matches);
+      }
+    });
+
+    callback({
+      results: data
+    });
+  };
+
+  SelectAdapter.prototype.addOptions = function ($options) {
+    Utils.appendMany(this.$element, $options);
+  };
+
+  SelectAdapter.prototype.option = function (data) {
+    var option;
+
+    if (data.children) {
+      option = document.createElement('optgroup');
+      option.label = data.text;
+    } else {
+      option = document.createElement('option');
+
+      if (option.textContent !== undefined) {
+        option.textContent = data.text;
+      } else {
+        option.innerText = data.text;
+      }
+    }
+
+    if (data.id) {
+      option.value = data.id;
+    }
+
+    if (data.disabled) {
+      option.disabled = true;
+    }
+
+    if (data.selected) {
+      option.selected = true;
+    }
+
+    if (data.title) {
+      option.title = data.title;
+    }
+
+    var $option = $(option);
+
+    var normalizedData = this._normalizeItem(data);
+    normalizedData.element = option;
+
+    // Override the option's data with the combined data
+    $.data(option, 'data', normalizedData);
+
+    return $option;
+  };
+
+  SelectAdapter.prototype.item = function ($option) {
+    var data = {};
+
+    data = $.data($option[0], 'data');
+
+    if (data != null) {
+      return data;
+    }
+
+    if ($option.is('option')) {
+      data = {
+        id: $option.val(),
+        text: $option.text(),
+        disabled: $option.prop('disabled'),
+        selected: $option.prop('selected'),
+        title: $option.prop('title')
+      };
+    } else if ($option.is('optgroup')) {
+      data = {
+        text: $option.prop('label'),
+        children: [],
+        title: $option.prop('title')
+      };
+
+      var $children = $option.children('option');
+      var children = [];
+
+      for (var c = 0; c < $children.length; c++) {
+        var $child = $($children[c]);
+
+        var child = this.item($child);
+
+        children.push(child);
+      }
+
+      data.children = children;
+    }
+
+    data = this._normalizeItem(data);
+    data.element = $option[0];
+
+    $.data($option[0], 'data', data);
+
+    return data;
+  };
+
+  SelectAdapter.prototype._normalizeItem = function (item) {
+    if (!$.isPlainObject(item)) {
+      item = {
+        id: item,
+        text: item
+      };
+    }
+
+    item = $.extend({}, {
+      text: ''
+    }, item);
+
+    var defaults = {
+      selected: false,
+      disabled: false
+    };
+
+    if (item.id != null) {
+      item.id = item.id.toString();
+    }
+
+    if (item.text != null) {
+      item.text = item.text.toString();
+    }
+
+    if (item._resultId == null && item.id && this.container != null) {
+      item._resultId = this.generateResultId(this.container, item);
+    }
+
+    return $.extend({}, defaults, item);
+  };
+
+  SelectAdapter.prototype.matches = function (params, data) {
+    var matcher = this.options.get('matcher');
+
+    return matcher(params, data);
+  };
+
+  return SelectAdapter;
+});
+
+S2.define('select2/data/array',[
+  './select',
+  '../utils',
+  'jquery'
+], function (SelectAdapter, Utils, $) {
+  function ArrayAdapter ($element, options) {
+    var data = options.get('data') || [];
+
+    ArrayAdapter.__super__.constructor.call(this, $element, options);
+
+    this.addOptions(this.convertToOptions(data));
+  }
+
+  Utils.Extend(ArrayAdapter, SelectAdapter);
+
+  ArrayAdapter.prototype.select = function (data) {
+    var $option = this.$element.find('option').filter(function (i, elm) {
+      return elm.value == data.id.toString();
+    });
+
+    if ($option.length === 0) {
+      $option = this.option(data);
+
+      this.addOptions($option);
+    }
+
+    ArrayAdapter.__super__.select.call(this, data);
+  };
+
+  ArrayAdapter.prototype.convertToOptions = function (data) {
+    var self = this;
+
+    var $existing = this.$element.find('option');
+    var existingIds = $existing.map(function () {
+      return self.item($(this)).id;
+    }).get();
+
+    var $options = [];
+
+    // Filter out all items except for the one passed in the argument
+    function onlyItem (item) {
+      return function () {
+        return $(this).val() == item.id;
+      };
+    }
+
+    for (var d = 0; d < data.length; d++) {
+      var item = this._normalizeItem(data[d]);
+
+      // Skip items which were pre-loaded, only merge the data
+      if ($.inArray(item.id, existingIds) >= 0) {
+        var $existingOption = $existing.filter(onlyItem(item));
+
+        var existingData = this.item($existingOption);
+        var newData = $.extend(true, {}, item, existingData);
+
+        var $newOption = this.option(newData);
+
+        $existingOption.replaceWith($newOption);
+
+        continue;
+      }
+
+      var $option = this.option(item);
+
+      if (item.children) {
+        var $children = this.convertToOptions(item.children);
+
+        Utils.appendMany($option, $children);
+      }
+
+      $options.push($option);
+    }
+
+    return $options;
+  };
+
+  return ArrayAdapter;
+});
+
+S2.define('select2/data/ajax',[
+  './array',
+  '../utils',
+  'jquery'
+], function (ArrayAdapter, Utils, $) {
+  function AjaxAdapter ($element, options) {
+    this.ajaxOptions = this._applyDefaults(options.get('ajax'));
+
+    if (this.ajaxOptions.processResults != null) {
+      this.processResults = this.ajaxOptions.processResults;
+    }
+
+    AjaxAdapter.__super__.constructor.call(this, $element, options);
+  }
+
+  Utils.Extend(AjaxAdapter, ArrayAdapter);
+
+  AjaxAdapter.prototype._applyDefaults = function (options) {
+    var defaults = {
+      data: function (params) {
+        return $.extend({}, params, {
+          q: params.term
+        });
+      },
+      transport: function (params, success, failure) {
+        var $request = $.ajax(params);
+
+        $request.then(success);
+        $request.fail(failure);
+
+        return $request;
+      }
+    };
+
+    return $.extend({}, defaults, options, true);
+  };
+
+  AjaxAdapter.prototype.processResults = function (results) {
+    return results;
+  };
+
+  AjaxAdapter.prototype.query = function (params, callback) {
+    var matches = [];
+    var self = this;
+
+    if (this._request != null) {
+      // JSONP requests cannot always be aborted
+      if ($.isFunction(this._request.abort)) {
+        this._request.abort();
+      }
+
+      this._request = null;
+    }
+
+    var options = $.extend({
+      type: 'GET'
+    }, this.ajaxOptions);
+
+    if (typeof options.url === 'function') {
+      options.url = options.url.call(this.$element, params);
+    }
+
+    if (typeof options.data === 'function') {
+      options.data = options.data.call(this.$element, params);
+    }
+
+    function request () {
+      var $request = options.transport(options, function (data) {
+        var results = self.processResults(data, params);
+
+        if (self.options.get('debug') && window.console && console.error) {
+          // Check to make sure that the response included a `results` key.
+          if (!results || !results.results || !$.isArray(results.results)) {
+            console.error(
+              'Select2: The AJAX results did not return an array in the ' +
+              '`results` key of the response.'
+            );
+          }
+        }
+
+        callback(results);
+      }, function () {
+        // Attempt to detect if a request was aborted
+        // Only works if the transport exposes a status property
+        if ($request.status && $request.status === '0') {
+          return;
+        }
+
+        self.trigger('results:message', {
+          message: 'errorLoading'
+        });
+      });
+
+      self._request = $request;
+    }
+
+    if (this.ajaxOptions.delay && params.term != null) {
+      if (this._queryTimeout) {
+        window.clearTimeout(this._queryTimeout);
+      }
+
+      this._queryTimeout = window.setTimeout(request, this.ajaxOptions.delay);
+    } else {
+      request();
+    }
+  };
+
+  return AjaxAdapter;
+});
+
+S2.define('select2/data/tags',[
+  'jquery'
+], function ($) {
+  function Tags (decorated, $element, options) {
+    var tags = options.get('tags');
+
+    var createTag = options.get('createTag');
+
+    if (createTag !== undefined) {
+      this.createTag = createTag;
+    }
+
+    var insertTag = options.get('insertTag');
+
+    if (insertTag !== undefined) {
+        this.insertTag = insertTag;
+    }
+
+    decorated.call(this, $element, options);
+
+    if ($.isArray(tags)) {
+      for (var t = 0; t < tags.length; t++) {
+        var tag = tags[t];
+        var item = this._normalizeItem(tag);
+
+        var $option = this.option(item);
+
+        this.$element.append($option);
+      }
+    }
+  }
+
+  Tags.prototype.query = function (decorated, params, callback) {
+    var self = this;
+
+    this._removeOldTags();
+
+    if (params.term == null || params.page != null) {
+      decorated.call(this, params, callback);
+      return;
+    }
+
+    function wrapper (obj, child) {
+      var data = obj.results;
+
+      for (var i = 0; i < data.length; i++) {
+        var option = data[i];
+
+        var checkChildren = (
+          option.children != null &&
+          !wrapper({
+            results: option.children
+          }, true)
+        );
+
+        var checkText = option.text === params.term;
+
+        if (checkText || checkChildren) {
+          if (child) {
+            return false;
+          }
+
+          obj.data = data;
+          callback(obj);
+
+          return;
+        }
+      }
+
+      if (child) {
+        return true;
+      }
+
+      var tag = self.createTag(params);
+
+      if (tag != null) {
+        var $option = self.option(tag);
+        $option.attr('data-select2-tag', true);
+
+        self.addOptions([$option]);
+
+        self.insertTag(data, tag);
+      }
+
+      obj.results = data;
+
+      callback(obj);
+    }
+
+    decorated.call(this, params, wrapper);
+  };
+
+  Tags.prototype.createTag = function (decorated, params) {
+    var term = $.trim(params.term);
+
+    if (term === '') {
+      return null;
+    }
+
+    return {
+      id: term,
+      text: term
+    };
+  };
+
+  Tags.prototype.insertTag = function (_, data, tag) {
+    data.unshift(tag);
+  };
+
+  Tags.prototype._removeOldTags = function (_) {
+    var tag = this._lastTag;
+
+    var $options = this.$element.find('option[data-select2-tag]');
+
+    $options.each(function () {
+      if (this.selected) {
+        return;
+      }
+
+      $(this).remove();
+    });
+  };
+
+  return Tags;
+});
+
+S2.define('select2/data/tokenizer',[
+  'jquery'
+], function ($) {
+  function Tokenizer (decorated, $element, options) {
+    var tokenizer = options.get('tokenizer');
+
+    if (tokenizer !== undefined) {
+      this.tokenizer = tokenizer;
+    }
+
+    decorated.call(this, $element, options);
+  }
+
+  Tokenizer.prototype.bind = function (decorated, container, $container) {
+    decorated.call(this, container, $container);
+
+    this.$search =  container.dropdown.$search || container.selection.$search ||
+      $container.find('.select2-search__field');
+  };
+
+  Tokenizer.prototype.query = function (decorated, params, callback) {
+    var self = this;
+
+    function createAndSelect (data) {
+      // Normalize the data object so we can use it for checks
+      var item = self._normalizeItem(data);
+
+      // Check if the data object already exists as a tag
+      // Select it if it doesn't
+      var $existingOptions = self.$element.find('option').filter(function () {
+        return $(this).val() === item.id;
+      });
+
+      // If an existing option wasn't found for it, create the option
+      if (!$existingOptions.length) {
+        var $option = self.option(item);
+        $option.attr('data-select2-tag', true);
+
+        self._removeOldTags();
+        self.addOptions([$option]);
+      }
+
+      // Select the item, now that we know there is an option for it
+      select(item);
+    }
+
+    function select (data) {
+      self.trigger('select', {
+        data: data
+      });
+    }
+
+    params.term = params.term || '';
+
+    var tokenData = this.tokenizer(params, this.options, createAndSelect);
+
+    if (tokenData.term !== params.term) {
+      // Replace the search term if we have the search box
+      if (this.$search.length) {
+        this.$search.val(tokenData.term);
+        this.$search.focus();
+      }
+
+      params.term = tokenData.term;
+    }
+
+    decorated.call(this, params, callback);
+  };
+
+  Tokenizer.prototype.tokenizer = function (_, params, options, callback) {
+    var separators = options.get('tokenSeparators') || [];
+    var term = params.term;
+    var i = 0;
+
+    var createTag = this.createTag || function (params) {
+      return {
+        id: params.term,
+        text: params.term
+      };
+    };
+
+    while (i < term.length) {
+      var termChar = term[i];
+
+      if ($.inArray(termChar, separators) === -1) {
+        i++;
+
+        continue;
+      }
+
+      var part = term.substr(0, i);
+      var partParams = $.extend({}, params, {
+        term: part
+      });
+
+      var data = createTag(partParams);
+
+      if (data == null) {
+        i++;
+        continue;
+      }
+
+      callback(data);
+
+      // Reset the term to not include the tokenized portion
+      term = term.substr(i + 1) || '';
+      i = 0;
+    }
+
+    return {
+      term: term
+    };
+  };
+
+  return Tokenizer;
+});
+
+S2.define('select2/data/minimumInputLength',[
+
+], function () {
+  function MinimumInputLength (decorated, $e, options) {
+    this.minimumInputLength = options.get('minimumInputLength');
+
+    decorated.call(this, $e, options);
+  }
+
+  MinimumInputLength.prototype.query = function (decorated, params, callback) {
+    params.term = params.term || '';
+
+    if (params.term.length < this.minimumInputLength) {
+      this.trigger('results:message', {
+        message: 'inputTooShort',
+        args: {
+          minimum: this.minimumInputLength,
+          input: params.term,
+          params: params
+        }
+      });
+
+      return;
+    }
+
+    decorated.call(this, params, callback);
+  };
+
+  return MinimumInputLength;
+});
+
+S2.define('select2/data/maximumInputLength',[
+
+], function () {
+  function MaximumInputLength (decorated, $e, options) {
+    this.maximumInputLength = options.get('maximumInputLength');
+
+    decorated.call(this, $e, options);
+  }
+
+  MaximumInputLength.prototype.query = function (decorated, params, callback) {
+    params.term = params.term || '';
+
+    if (this.maximumInputLength > 0 &&
+        params.term.length > this.maximumInputLength) {
+      this.trigger('results:message', {
+        message: 'inputTooLong',
+        args: {
+          maximum: this.maximumInputLength,
+          input: params.term,
+          params: params
+        }
+      });
+
+      return;
+    }
+
+    decorated.call(this, params, callback);
+  };
+
+  return MaximumInputLength;
+});
+
+S2.define('select2/data/maximumSelectionLength',[
+
+], function (){
+  function MaximumSelectionLength (decorated, $e, options) {
+    this.maximumSelectionLength = options.get('maximumSelectionLength');
+
+    decorated.call(this, $e, options);
+  }
+
+  MaximumSelectionLength.prototype.query =
+    function (decorated, params, callback) {
+      var self = this;
+
+      this.current(function (currentData) {
+        var count = currentData != null ? currentData.length : 0;
+        if (self.maximumSelectionLength > 0 &&
+          count >= self.maximumSelectionLength) {
+          self.trigger('results:message', {
+            message: 'maximumSelected',
+            args: {
+              maximum: self.maximumSelectionLength
+            }
+          });
+          return;
+        }
+        decorated.call(self, params, callback);
+      });
+  };
+
+  return MaximumSelectionLength;
+});
+
+S2.define('select2/dropdown',[
+  'jquery',
+  './utils'
+], function ($, Utils) {
+  function Dropdown ($element, options) {
+    this.$element = $element;
+    this.options = options;
+
+    Dropdown.__super__.constructor.call(this);
+  }
+
+  Utils.Extend(Dropdown, Utils.Observable);
+
+  Dropdown.prototype.render = function () {
+    var $dropdown = $(
+      '<span class="select2-dropdown">' +
+        '<span class="select2-results"></span>' +
+      '</span>'
+    );
+
+    $dropdown.attr('dir', this.options.get('dir'));
+
+    this.$dropdown = $dropdown;
+
+    return $dropdown;
+  };
+
+  Dropdown.prototype.bind = function () {
+    // Should be implemented in subclasses
+  };
+
+  Dropdown.prototype.position = function ($dropdown, $container) {
+    // Should be implmented in subclasses
+  };
+
+  Dropdown.prototype.destroy = function () {
+    // Remove the dropdown from the DOM
+    this.$dropdown.remove();
+  };
+
+  return Dropdown;
+});
+
+S2.define('select2/dropdown/search',[
+  'jquery',
+  '../utils'
+], function ($, Utils) {
+  function Search () { }
+
+  Search.prototype.render = function (decorated) {
+    var $rendered = decorated.call(this);
+
+    var $search = $(
+      '<span class="select2-search select2-search--dropdown">' +
+        '<input class="select2-search__field" type="search" tabindex="-1"' +
+        ' autocomplete="off" autocorrect="off" autocapitalize="off"' +
+        ' spellcheck="false" role="textbox" />' +
+      '</span>'
+    );
+
+    this.$searchContainer = $search;
+    this.$search = $search.find('input');
+
+    $rendered.prepend($search);
+
+    return $rendered;
+  };
+
+  Search.prototype.bind = function (decorated, container, $container) {
+    var self = this;
+
+    decorated.call(this, container, $container);
+
+    this.$search.on('keydown', function (evt) {
+      self.trigger('keypress', evt);
+
+      self._keyUpPrevented = evt.isDefaultPrevented();
+    });
+
+    // Workaround for browsers which do not support the `input` event
+    // This will prevent double-triggering of events for browsers which support
+    // both the `keyup` and `input` events.
+    this.$search.on('input', function (evt) {
+      // Unbind the duplicated `keyup` event
+      $(this).off('keyup');
+    });
+
+    this.$search.on('keyup input', function (evt) {
+      self.handleSearch(evt);
+    });
+
+    container.on('open', function () {
+      self.$search.attr('tabindex', 0);
+
+      self.$search.focus();
+
+      window.setTimeout(function () {
+        self.$search.focus();
+      }, 0);
+    });
+
+    container.on('close', function () {
+      self.$search.attr('tabindex', -1);
+
+      self.$search.val('');
+    });
+
+    container.on('focus', function () {
+      if (container.isOpen()) {
+        self.$search.focus();
+      }
+    });
+
+    container.on('results:all', function (params) {
+      if (params.query.term == null || params.query.term === '') {
+        var showSearch = self.showSearch(params);
+
+        if (showSearch) {
+          self.$searchContainer.removeClass('select2-search--hide');
+        } else {
+          self.$searchContainer.addClass('select2-search--hide');
+        }
+      }
+    });
+  };
+
+  Search.prototype.handleSearch = function (evt) {
+    if (!this._keyUpPrevented) {
+      var input = this.$search.val();
+
+      this.trigger('query', {
+        term: input
+      });
+    }
+
+    this._keyUpPrevented = false;
+  };
+
+  Search.prototype.showSearch = function (_, params) {
+    return true;
+  };
+
+  return Search;
+});
+
+S2.define('select2/dropdown/hidePlaceholder',[
+
+], function () {
+  function HidePlaceholder (decorated, $element, options, dataAdapter) {
+    this.placeholder = this.normalizePlaceholder(options.get('placeholder'));
+
+    decorated.call(this, $element, options, dataAdapter);
+  }
+
+  HidePlaceholder.prototype.append = function (decorated, data) {
+    data.results = this.removePlaceholder(data.results);
+
+    decorated.call(this, data);
+  };
+
+  HidePlaceholder.prototype.normalizePlaceholder = function (_, placeholder) {
+    if (typeof placeholder === 'string') {
+      placeholder = {
+        id: '',
+        text: placeholder
+      };
+    }
+
+    return placeholder;
+  };
+
+  HidePlaceholder.prototype.removePlaceholder = function (_, data) {
+    var modifiedData = data.slice(0);
+
+    for (var d = data.length - 1; d >= 0; d--) {
+      var item = data[d];
+
+      if (this.placeholder.id === item.id) {
+        modifiedData.splice(d, 1);
+      }
+    }
+
+    return modifiedData;
+  };
+
+  return HidePlaceholder;
+});
+
+S2.define('select2/dropdown/infiniteScroll',[
+  'jquery'
+], function ($) {
+  function InfiniteScroll (decorated, $element, options, dataAdapter) {
+    this.lastParams = {};
+
+    decorated.call(this, $element, options, dataAdapter);
+
+    this.$loadingMore = this.createLoadingMore();
+    this.loading = false;
+  }
+
+  InfiniteScroll.prototype.append = function (decorated, data) {
+    this.$loadingMore.remove();
+    this.loading = false;
+
+    decorated.call(this, data);
+
+    if (this.showLoadingMore(data)) {
+      this.$results.append(this.$loadingMore);
+    }
+  };
+
+  InfiniteScroll.prototype.bind = function (decorated, container, $container) {
+    var self = this;
+
+    decorated.call(this, container, $container);
+
+    container.on('query', function (params) {
+      self.lastParams = params;
+      self.loading = true;
+    });
+
+    container.on('query:append', function (params) {
+      self.lastParams = params;
+      self.loading = true;
+    });
+
+    this.$results.on('scroll', function () {
+      var isLoadMoreVisible = $.contains(
+        document.documentElement,
+        self.$loadingMore[0]
+      );
+
+      if (self.loading || !isLoadMoreVisible) {
+        return;
+      }
+
+      var currentOffset = self.$results.offset().top +
+        self.$results.outerHeight(false);
+      var loadingMoreOffset = self.$loadingMore.offset().top +
+        self.$loadingMore.outerHeight(false);
+
+      if (currentOffset + 50 >= loadingMoreOffset) {
+        self.loadMore();
+      }
+    });
+  };
+
+  InfiniteScroll.prototype.loadMore = function () {
+    this.loading = true;
+
+    var params = $.extend({}, {page: 1}, this.lastParams);
+
+    params.page++;
+
+    this.trigger('query:append', params);
+  };
+
+  InfiniteScroll.prototype.showLoadingMore = function (_, data) {
+    return data.pagination && data.pagination.more;
+  };
+
+  InfiniteScroll.prototype.createLoadingMore = function () {
+    var $option = $(
+      '<li ' +
+      'class="select2-results__option select2-results__option--load-more"' +
+      'role="treeitem" aria-disabled="true"></li>'
+    );
+
+    var message = this.options.get('translations').get('loadingMore');
+
+    $option.html(message(this.lastParams));
+
+    return $option;
+  };
+
+  return InfiniteScroll;
+});
+
+S2.define('select2/dropdown/attachBody',[
+  'jquery',
+  '../utils'
+], function ($, Utils) {
+  function AttachBody (decorated, $element, options) {
+    this.$dropdownParent = options.get('dropdownParent') || $(document.body);
+
+    decorated.call(this, $element, options);
+  }
+
+  AttachBody.prototype.bind = function (decorated, container, $container) {
+    var self = this;
+
+    var setupResultsEvents = false;
+
+    decorated.call(this, container, $container);
+
+    container.on('open', function () {
+      self._showDropdown();
+      self._attachPositioningHandler(container);
+
+      if (!setupResultsEvents) {
+        setupResultsEvents = true;
+
+        container.on('results:all', function () {
+          self._positionDropdown();
+          self._resizeDropdown();
+        });
+
+        container.on('results:append', function () {
+          self._positionDropdown();
+          self._resizeDropdown();
+        });
+      }
+    });
+
+    container.on('close', function () {
+      self._hideDropdown();
+      self._detachPositioningHandler(container);
+    });
+
+    this.$dropdownContainer.on('mousedown', function (evt) {
+      evt.stopPropagation();
+    });
+  };
+
+  AttachBody.prototype.destroy = function (decorated) {
+    decorated.call(this);
+
+    this.$dropdownContainer.remove();
+  };
+
+  AttachBody.prototype.position = function (decorated, $dropdown, $container) {
+    // Clone all of the container classes
+    $dropdown.attr('class', $container.attr('class'));
+
+    $dropdown.removeClass('select2');
+    $dropdown.addClass('select2-container--open');
+
+    $dropdown.css({
+      position: 'absolute',
+      top: -999999
+    });
+
+    this.$container = $container;
+  };
+
+  AttachBody.prototype.render = function (decorated) {
+    var $container = $('<span></span>');
+
+    var $dropdown = decorated.call(this);
+    $container.append($dropdown);
+
+    this.$dropdownContainer = $container;
+
+    return $container;
+  };
+
+  AttachBody.prototype._hideDropdown = function (decorated) {
+    this.$dropdownContainer.detach();
+  };
+
+  AttachBody.prototype._attachPositioningHandler =
+      function (decorated, container) {
+    var self = this;
+
+    var scrollEvent = 'scroll.select2.' + container.id;
+    var resizeEvent = 'resize.select2.' + container.id;
+    var orientationEvent = 'orientationchange.select2.' + container.id;
+
+    var $watchers = this.$container.parents().filter(Utils.hasScroll);
+    $watchers.each(function () {
+      $(this).data('select2-scroll-position', {
+        x: $(this).scrollLeft(),
+        y: $(this).scrollTop()
+      });
+    });
+
+    $watchers.on(scrollEvent, function (ev) {
+      var position = $(this).data('select2-scroll-position');
+      $(this).scrollTop(position.y);
+    });
+
+    $(window).on(scrollEvent + ' ' + resizeEvent + ' ' + orientationEvent,
+      function (e) {
+      self._positionDropdown();
+      self._resizeDropdown();
+    });
+  };
+
+  AttachBody.prototype._detachPositioningHandler =
+      function (decorated, container) {
+    var scrollEvent = 'scroll.select2.' + container.id;
+    var resizeEvent = 'resize.select2.' + container.id;
+    var orientationEvent = 'orientationchange.select2.' + container.id;
+
+    var $watchers = this.$container.parents().filter(Utils.hasScroll);
+    $watchers.off(scrollEvent);
+
+    $(window).off(scrollEvent + ' ' + resizeEvent + ' ' + orientationEvent);
+  };
+
+  AttachBody.prototype._positionDropdown = function () {
+    var $window = $(window);
+
+    var isCurrentlyAbove = this.$dropdown.hasClass('select2-dropdown--above');
+    var isCurrentlyBelow = this.$dropdown.hasClass('select2-dropdown--below');
+
+    var newDirection = null;
+
+    var offset = this.$container.offset();
+
+    offset.bottom = offset.top + this.$container.outerHeight(false);
+
+    var container = {
+      height: this.$container.outerHeight(false)
+    };
+
+    container.top = offset.top;
+    container.bottom = offset.top + container.height;
+
+    var dropdown = {
+      height: this.$dropdown.outerHeight(false)
+    };
+
+    var viewport = {
+      top: $window.scrollTop(),
+      bottom: $window.scrollTop() + $window.height()
+    };
+
+    var enoughRoomAbove = viewport.top < (offset.top - dropdown.height);
+    var enoughRoomBelow = viewport.bottom > (offset.bottom + dropdown.height);
+
+    var css = {
+      left: offset.left,
+      top: container.bottom
+    };
+
+    // Determine what the parent element is to use for calciulating the offset
+    var $offsetParent = this.$dropdownParent;
+
+    // For statically positoned elements, we need to get the element
+    // that is determining the offset
+    if ($offsetParent.css('position') === 'static') {
+      $offsetParent = $offsetParent.offsetParent();
+    }
+
+    var parentOffset = $offsetParent.offset();
+
+    css.top -= parentOffset.top;
+    css.left -= parentOffset.left;
+
+    if (!isCurrentlyAbove && !isCurrentlyBelow) {
+      newDirection = 'below';
+    }
+
+    if (!enoughRoomBelow && enoughRoomAbove && !isCurrentlyAbove) {
+      newDirection = 'above';
+    } else if (!enoughRoomAbove && enoughRoomBelow && isCurrentlyAbove) {
+      newDirection = 'below';
+    }
+
+    if (newDirection == 'above' ||
+      (isCurrentlyAbove && newDirection !== 'below')) {
+      css.top = container.top - parentOffset.top - dropdown.height;
+    }
+
+    if (newDirection != null) {
+      this.$dropdown
+        .removeClass('select2-dropdown--below select2-dropdown--above')
+        .addClass('select2-dropdown--' + newDirection);
+      this.$container
+        .removeClass('select2-container--below select2-container--above')
+        .addClass('select2-container--' + newDirection);
+    }
+
+    this.$dropdownContainer.css(css);
+  };
+
+  AttachBody.prototype._resizeDropdown = function () {
+    var css = {
+      width: this.$container.outerWidth(false) + 'px'
+    };
+
+    if (this.options.get('dropdownAutoWidth')) {
+      css.minWidth = css.width;
+      css.position = 'relative';
+      css.width = 'auto';
+    }
+
+    this.$dropdown.css(css);
+  };
+
+  AttachBody.prototype._showDropdown = function (decorated) {
+    this.$dropdownContainer.appendTo(this.$dropdownParent);
+
+    this._positionDropdown();
+    this._resizeDropdown();
+  };
+
+  return AttachBody;
+});
+
+S2.define('select2/dropdown/minimumResultsForSearch',[
+
+], function () {
+  function countResults (data) {
+    var count = 0;
+
+    for (var d = 0; d < data.length; d++) {
+      var item = data[d];
+
+      if (item.children) {
+        count += countResults(item.children);
+      } else {
+        count++;
+      }
+    }
+
+    return count;
+  }
+
+  function MinimumResultsForSearch (decorated, $element, options, dataAdapter) {
+    this.minimumResultsForSearch = options.get('minimumResultsForSearch');
+
+    if (this.minimumResultsForSearch < 0) {
+      this.minimumResultsForSearch = Infinity;
+    }
+
+    decorated.call(this, $element, options, dataAdapter);
+  }
+
+  MinimumResultsForSearch.prototype.showSearch = function (decorated, params) {
+    if (countResults(params.data.results) < this.minimumResultsForSearch) {
+      return false;
+    }
+
+    return decorated.call(this, params);
+  };
+
+  return MinimumResultsForSearch;
+});
+
+S2.define('select2/dropdown/selectOnClose',[
+
+], function () {
+  function SelectOnClose () { }
+
+  SelectOnClose.prototype.bind = function (decorated, container, $container) {
+    var self = this;
+
+    decorated.call(this, container, $container);
+
+    container.on('close', function (params) {
+      self._handleSelectOnClose(params);
+    });
+  };
+
+  SelectOnClose.prototype._handleSelectOnClose = function (_, params) {
+    if (params && params.originalSelect2Event != null) {
+      var event = params.originalSelect2Event;
+
+      // Don't select an item if the close event was triggered from a select or
+      // unselect event
+      if (event._type === 'select' || event._type === 'unselect') {
+        return;
+      }
+    }
+
+    var $highlightedResults = this.getHighlightedResults();
+
+    // Only select highlighted results
+    if ($highlightedResults.length < 1) {
+      return;
+    }
+
+    var data = $highlightedResults.data('data');
+
+    // Don't re-select already selected resulte
+    if (
+      (data.element != null && data.element.selected) ||
+      (data.element == null && data.selected)
+    ) {
+      return;
+    }
+
+    this.trigger('select', {
+        data: data
+    });
+  };
+
+  return SelectOnClose;
+});
+
+S2.define('select2/dropdown/closeOnSelect',[
+
+], function () {
+  function CloseOnSelect () { }
+
+  CloseOnSelect.prototype.bind = function (decorated, container, $container) {
+    var self = this;
+
+    decorated.call(this, container, $container);
+
+    container.on('select', function (evt) {
+      self._selectTriggered(evt);
+    });
+
+    container.on('unselect', function (evt) {
+      self._selectTriggered(evt);
+    });
+  };
+
+  CloseOnSelect.prototype._selectTriggered = function (_, evt) {
+    var originalEvent = evt.originalEvent;
+
+    // Don't close if the control key is being held
+    if (originalEvent && originalEvent.ctrlKey) {
+      return;
+    }
+
+    this.trigger('close', {
+      originalEvent: originalEvent,
+      originalSelect2Event: evt
+    });
+  };
+
+  return CloseOnSelect;
+});
+
+S2.define('select2/i18n/en',[],function () {
+  // English
+  return {
+    errorLoading: function () {
+      return 'The results could not be loaded.';
+    },
+    inputTooLong: function (args) {
+      var overChars = args.input.length - args.maximum;
+
+      var message = 'Please delete ' + overChars + ' character';
+
+      if (overChars != 1) {
+        message += 's';
+      }
+
+      return message;
+    },
+    inputTooShort: function (args) {
+      var remainingChars = args.minimum - args.input.length;
+
+      var message = 'Please enter ' + remainingChars + ' or more characters';
+
+      return message;
+    },
+    loadingMore: function () {
+      return 'Loading more results…';
+    },
+    maximumSelected: function (args) {
+      var message = 'You can only select ' + args.maximum + ' item';
+
+      if (args.maximum != 1) {
+        message += 's';
+      }
+
+      return message;
+    },
+    noResults: function () {
+      return 'No results found';
+    },
+    searching: function () {
+      return 'Searching…';
+    }
+  };
+});
+
+S2.define('select2/defaults',[
+  'jquery',
+  'require',
+
+  './results',
+
+  './selection/single',
+  './selection/multiple',
+  './selection/placeholder',
+  './selection/allowClear',
+  './selection/search',
+  './selection/eventRelay',
+
+  './utils',
+  './translation',
+  './diacritics',
+
+  './data/select',
+  './data/array',
+  './data/ajax',
+  './data/tags',
+  './data/tokenizer',
+  './data/minimumInputLength',
+  './data/maximumInputLength',
+  './data/maximumSelectionLength',
+
+  './dropdown',
+  './dropdown/search',
+  './dropdown/hidePlaceholder',
+  './dropdown/infiniteScroll',
+  './dropdown/attachBody',
+  './dropdown/minimumResultsForSearch',
+  './dropdown/selectOnClose',
+  './dropdown/closeOnSelect',
+
+  './i18n/en'
+], function ($, require,
+
+             ResultsList,
+
+             SingleSelection, MultipleSelection, Placeholder, AllowClear,
+             SelectionSearch, EventRelay,
+
+             Utils, Translation, DIACRITICS,
+
+             SelectData, ArrayData, AjaxData, Tags, Tokenizer,
+             MinimumInputLength, MaximumInputLength, MaximumSelectionLength,
+
+             Dropdown, DropdownSearch, HidePlaceholder, InfiniteScroll,
+             AttachBody, MinimumResultsForSearch, SelectOnClose, CloseOnSelect,
+
+             EnglishTranslation) {
+  function Defaults () {
+    this.reset();
+  }
+
+  Defaults.prototype.apply = function (options) {
+    options = $.extend(true, {}, this.defaults, options);
+
+    if (options.dataAdapter == null) {
+      if (options.ajax != null) {
+        options.dataAdapter = AjaxData;
+      } else if (options.data != null) {
+        options.dataAdapter = ArrayData;
+      } else {
+        options.dataAdapter = SelectData;
+      }
+
+      if (options.minimumInputLength > 0) {
+        options.dataAdapter = Utils.Decorate(
+          options.dataAdapter,
+          MinimumInputLength
+        );
+      }
+
+      if (options.maximumInputLength > 0) {
+        options.dataAdapter = Utils.Decorate(
+          options.dataAdapter,
+          MaximumInputLength
+        );
+      }
+
+      if (options.maximumSelectionLength > 0) {
+        options.dataAdapter = Utils.Decorate(
+          options.dataAdapter,
+          MaximumSelectionLength
+        );
+      }
+
+      if (options.tags) {
+        options.dataAdapter = Utils.Decorate(options.dataAdapter, Tags);
+      }
+
+      if (options.tokenSeparators != null || options.tokenizer != null) {
+        options.dataAdapter = Utils.Decorate(
+          options.dataAdapter,
+          Tokenizer
+        );
+      }
+
+      if (options.query != null) {
+        var Query = require(options.amdBase + 'compat/query');
+
+        options.dataAdapter = Utils.Decorate(
+          options.dataAdapter,
+          Query
+        );
+      }
+
+      if (options.initSelection != null) {
+        var InitSelection = require(options.amdBase + 'compat/initSelection');
+
+        options.dataAdapter = Utils.Decorate(
+          options.dataAdapter,
+          InitSelection
+        );
+      }
+    }
+
+    if (options.resultsAdapter == null) {
+      options.resultsAdapter = ResultsList;
+
+      if (options.ajax != null) {
+        options.resultsAdapter = Utils.Decorate(
+          options.resultsAdapter,
+          InfiniteScroll
+        );
+      }
+
+      if (options.placeholder != null) {
+        options.resultsAdapter = Utils.Decorate(
+          options.resultsAdapter,
+          HidePlaceholder
+        );
+      }
+
+      if (options.selectOnClose) {
+        options.resultsAdapter = Utils.Decorate(
+          options.resultsAdapter,
+          SelectOnClose
+        );
+      }
+    }
+
+    if (options.dropdownAdapter == null) {
+      if (options.multiple) {
+        options.dropdownAdapter = Dropdown;
+      } else {
+        var SearchableDropdown = Utils.Decorate(Dropdown, DropdownSearch);
+
+        options.dropdownAdapter = SearchableDropdown;
+      }
+
+      if (options.minimumResultsForSearch !== 0) {
+        options.dropdownAdapter = Utils.Decorate(
+          options.dropdownAdapter,
+          MinimumResultsForSearch
+        );
+      }
+
+      if (options.closeOnSelect) {
+        options.dropdownAdapter = Utils.Decorate(
+          options.dropdownAdapter,
+          CloseOnSelect
+        );
+      }
+
+      if (
+        options.dropdownCssClass != null ||
+        options.dropdownCss != null ||
+        options.adaptDropdownCssClass != null
+      ) {
+        var DropdownCSS = require(options.amdBase + 'compat/dropdownCss');
+
+        options.dropdownAdapter = Utils.Decorate(
+          options.dropdownAdapter,
+          DropdownCSS
+        );
+      }
+
+      options.dropdownAdapter = Utils.Decorate(
+        options.dropdownAdapter,
+        AttachBody
+      );
+    }
+
+    if (options.selectionAdapter == null) {
+      if (options.multiple) {
+        options.selectionAdapter = MultipleSelection;
+      } else {
+        options.selectionAdapter = SingleSelection;
+      }
+
+      // Add the placeholder mixin if a placeholder was specified
+      if (options.placeholder != null) {
+        options.selectionAdapter = Utils.Decorate(
+          options.selectionAdapter,
+          Placeholder
+        );
+      }
+
+      if (options.allowClear) {
+        options.selectionAdapter = Utils.Decorate(
+          options.selectionAdapter,
+          AllowClear
+        );
+      }
+
+      if (options.multiple) {
+        options.selectionAdapter = Utils.Decorate(
+          options.selectionAdapter,
+          SelectionSearch
+        );
+      }
+
+      if (
+        options.containerCssClass != null ||
+        options.containerCss != null ||
+        options.adaptContainerCssClass != null
+      ) {
+        var ContainerCSS = require(options.amdBase + 'compat/containerCss');
+
+        options.selectionAdapter = Utils.Decorate(
+          options.selectionAdapter,
+          ContainerCSS
+        );
+      }
+
+      options.selectionAdapter = Utils.Decorate(
+        options.selectionAdapter,
+        EventRelay
+      );
+    }
+
+    if (typeof options.language === 'string') {
+      // Check if the language is specified with a region
+      if (options.language.indexOf('-') > 0) {
+        // Extract the region information if it is included
+        var languageParts = options.language.split('-');
+        var baseLanguage = languageParts[0];
+
+        options.language = [options.language, baseLanguage];
+      } else {
+        options.language = [options.language];
+      }
+    }
+
+    if ($.isArray(options.language)) {
+      var languages = new Translation();
+      options.language.push('en');
+
+      var languageNames = options.language;
+
+      for (var l = 0; l < languageNames.length; l++) {
+        var name = languageNames[l];
+        var language = {};
+
+        try {
+          // Try to load it with the original name
+          language = Translation.loadPath(name);
+        } catch (e) {
+          try {
+            // If we couldn't load it, check if it wasn't the full path
+            name = this.defaults.amdLanguageBase + name;
+            language = Translation.loadPath(name);
+          } catch (ex) {
+            // The translation could not be loaded at all. Sometimes this is
+            // because of a configuration problem, other times this can be
+            // because of how Select2 helps load all possible translation files.
+            if (options.debug && window.console && console.warn) {
+              console.warn(
+                'Select2: The language file for "' + name + '" could not be ' +
+                'automatically loaded. A fallback will be used instead.'
+              );
+            }
+
+            continue;
+          }
+        }
+
+        languages.extend(language);
+      }
+
+      options.translations = languages;
+    } else {
+      var baseTranslation = Translation.loadPath(
+        this.defaults.amdLanguageBase + 'en'
+      );
+      var customTranslation = new Translation(options.language);
+
+      customTranslation.extend(baseTranslation);
+
+      options.translations = customTranslation;
+    }
+
+    return options;
+  };
+
+  Defaults.prototype.reset = function () {
+    function stripDiacritics (text) {
+      // Used 'uni range + named function' from http://jsperf.com/diacritics/18
+      function match(a) {
+        return DIACRITICS[a] || a;
+      }
+
+      return text.replace(/[^\u0000-\u007E]/g, match);
+    }
+
+    function matcher (params, data) {
+      // Always return the object if there is nothing to compare
+      if ($.trim(params.term) === '') {
+        return data;
+      }
+
+      // Do a recursive check for options with children
+      if (data.children && data.children.length > 0) {
+        // Clone the data object if there are children
+        // This is required as we modify the object to remove any non-matches
+        var match = $.extend(true, {}, data);
+
+        // Check each child of the option
+        for (var c = data.children.length - 1; c >= 0; c--) {
+          var child = data.children[c];
+
+          var matches = matcher(params, child);
+
+          // If there wasn't a match, remove the object in the array
+          if (matches == null) {
+            match.children.splice(c, 1);
+          }
+        }
+
+        // If any children matched, return the new object
+        if (match.children.length > 0) {
+          return match;
+        }
+
+        // If there were no matching children, check just the plain object
+        return matcher(params, match);
+      }
+
+      var original = stripDiacritics(data.text).toUpperCase();
+      var term = stripDiacritics(params.term).toUpperCase();
+
+      // Check if the text contains the term
+      if (original.indexOf(term) > -1) {
+        return data;
+      }
+
+      // If it doesn't contain the term, don't return anything
+      return null;
+    }
+
+    this.defaults = {
+      amdBase: './',
+      amdLanguageBase: './i18n/',
+      closeOnSelect: true,
+      debug: false,
+      dropdownAutoWidth: false,
+      escapeMarkup: Utils.escapeMarkup,
+      language: EnglishTranslation,
+      matcher: matcher,
+      minimumInputLength: 0,
+      maximumInputLength: 0,
+      maximumSelectionLength: 0,
+      minimumResultsForSearch: 0,
+      selectOnClose: false,
+      sorter: function (data) {
+        return data;
+      },
+      templateResult: function (result) {
+        return result.text;
+      },
+      templateSelection: function (selection) {
+        return selection.text;
+      },
+      theme: 'default',
+      width: 'resolve'
+    };
+  };
+
+  Defaults.prototype.set = function (key, value) {
+    var camelKey = $.camelCase(key);
+
+    var data = {};
+    data[camelKey] = value;
+
+    var convertedData = Utils._convertData(data);
+
+    $.extend(this.defaults, convertedData);
+  };
+
+  var defaults = new Defaults();
+
+  return defaults;
+});
+
+S2.define('select2/options',[
+  'require',
+  'jquery',
+  './defaults',
+  './utils'
+], function (require, $, Defaults, Utils) {
+  function Options (options, $element) {
+    this.options = options;
+
+    if ($element != null) {
+      this.fromElement($element);
+    }
+
+    this.options = Defaults.apply(this.options);
+
+    if ($element && $element.is('input')) {
+      var InputCompat = require(this.get('amdBase') + 'compat/inputData');
+
+      this.options.dataAdapter = Utils.Decorate(
+        this.options.dataAdapter,
+        InputCompat
+      );
+    }
+  }
+
+  Options.prototype.fromElement = function ($e) {
+    var excludedData = ['select2'];
+
+    if (this.options.multiple == null) {
+      this.options.multiple = $e.prop('multiple');
+    }
+
+    if (this.options.disabled == null) {
+      this.options.disabled = $e.prop('disabled');
+    }
+
+    if (this.options.language == null) {
+      if ($e.prop('lang')) {
+        this.options.language = $e.prop('lang').toLowerCase();
+      } else if ($e.closest('[lang]').prop('lang')) {
+        this.options.language = $e.closest('[lang]').prop('lang');
+      }
+    }
+
+    if (this.options.dir == null) {
+      if ($e.prop('dir')) {
+        this.options.dir = $e.prop('dir');
+      } else if ($e.closest('[dir]').prop('dir')) {
+        this.options.dir = $e.closest('[dir]').prop('dir');
+      } else {
+        this.options.dir = 'ltr';
+      }
+    }
+
+    $e.prop('disabled', this.options.disabled);
+    $e.prop('multiple', this.options.multiple);
+
+    if ($e.data('select2Tags')) {
+      if (this.options.debug && window.console && console.warn) {
+        console.warn(
+          'Select2: The `data-select2-tags` attribute has been changed to ' +
+          'use the `data-data` and `data-tags="true"` attributes and will be ' +
+          'removed in future versions of Select2.'
+        );
+      }
+
+      $e.data('data', $e.data('select2Tags'));
+      $e.data('tags', true);
+    }
+
+    if ($e.data('ajaxUrl')) {
+      if (this.options.debug && window.console && console.warn) {
+        console.warn(
+          'Select2: The `data-ajax-url` attribute has been changed to ' +
+          '`data-ajax--url` and support for the old attribute will be removed' +
+          ' in future versions of Select2.'
+        );
+      }
+
+      $e.attr('ajax--url', $e.data('ajaxUrl'));
+      $e.data('ajax--url', $e.data('ajaxUrl'));
+    }
+
+    var dataset = {};
+
+    // Prefer the element's `dataset` attribute if it exists
+    // jQuery 1.x does not correctly handle data attributes with multiple dashes
+    if ($.fn.jquery && $.fn.jquery.substr(0, 2) == '1.' && $e[0].dataset) {
+      dataset = $.extend(true, {}, $e[0].dataset, $e.data());
+    } else {
+      dataset = $e.data();
+    }
+
+    var data = $.extend(true, {}, dataset);
+
+    data = Utils._convertData(data);
+
+    for (var key in data) {
+      if ($.inArray(key, excludedData) > -1) {
+        continue;
+      }
+
+      if ($.isPlainObject(this.options[key])) {
+        $.extend(this.options[key], data[key]);
+      } else {
+        this.options[key] = data[key];
+      }
+    }
+
+    return this;
+  };
+
+  Options.prototype.get = function (key) {
+    return this.options[key];
+  };
+
+  Options.prototype.set = function (key, val) {
+    this.options[key] = val;
+  };
+
+  return Options;
+});
+
+S2.define('select2/core',[
+  'jquery',
+  './options',
+  './utils',
+  './keys'
+], function ($, Options, Utils, KEYS) {
+  var Select2 = function ($element, options) {
+    if ($element.data('select2') != null) {
+      $element.data('select2').destroy();
+    }
+
+    this.$element = $element;
+
+    this.id = this._generateId($element);
+
+    options = options || {};
+
+    this.options = new Options(options, $element);
+
+    Select2.__super__.constructor.call(this);
+
+    // Set up the tabindex
+
+    var tabindex = $element.attr('tabindex') || 0;
+    $element.data('old-tabindex', tabindex);
+    $element.attr('tabindex', '-1');
+
+    // Set up containers and adapters
+
+    var DataAdapter = this.options.get('dataAdapter');
+    this.dataAdapter = new DataAdapter($element, this.options);
+
+    var $container = this.render();
+
+    this._placeContainer($container);
+
+    var SelectionAdapter = this.options.get('selectionAdapter');
+    this.selection = new SelectionAdapter($element, this.options);
+    this.$selection = this.selection.render();
+
+    this.selection.position(this.$selection, $container);
+
+    var DropdownAdapter = this.options.get('dropdownAdapter');
+    this.dropdown = new DropdownAdapter($element, this.options);
+    this.$dropdown = this.dropdown.render();
+
+    this.dropdown.position(this.$dropdown, $container);
+
+    var ResultsAdapter = this.options.get('resultsAdapter');
+    this.results = new ResultsAdapter($element, this.options, this.dataAdapter);
+    this.$results = this.results.render();
+
+    this.results.position(this.$results, this.$dropdown);
+
+    // Bind events
+
+    var self = this;
+
+    // Bind the container to all of the adapters
+    this._bindAdapters();
+
+    // Register any DOM event handlers
+    this._registerDomEvents();
+
+    // Register any internal event handlers
+    this._registerDataEvents();
+    this._registerSelectionEvents();
+    this._registerDropdownEvents();
+    this._registerResultsEvents();
+    this._registerEvents();
+
+    // Set the initial state
+    this.dataAdapter.current(function (initialData) {
+      self.trigger('selection:update', {
+        data: initialData
+      });
+    });
+
+    // Hide the original select
+    $element.addClass('select2-hidden-accessible');
+    $element.attr('aria-hidden', 'true');
+
+    // Synchronize any monitored attributes
+    this._syncAttributes();
+
+    $element.data('select2', this);
+  };
+
+  Utils.Extend(Select2, Utils.Observable);
+
+  Select2.prototype._generateId = function ($element) {
+    var id = '';
+
+    if ($element.attr('id') != null) {
+      id = $element.attr('id');
+    } else if ($element.attr('name') != null) {
+      id = $element.attr('name') + '-' + Utils.generateChars(2);
+    } else {
+      id = Utils.generateChars(4);
+    }
+
+    id = id.replace(/(:|\.|\[|\]|,)/g, '');
+    id = 'select2-' + id;
+
+    return id;
+  };
+
+  Select2.prototype._placeContainer = function ($container) {
+    $container.insertAfter(this.$element);
+
+    var width = this._resolveWidth(this.$element, this.options.get('width'));
+
+    if (width != null) {
+      $container.css('width', width);
+    }
+  };
+
+  Select2.prototype._resolveWidth = function ($element, method) {
+    var WIDTH = /^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i;
+
+    if (method == 'resolve') {
+      var styleWidth = this._resolveWidth($element, 'style');
+
+      if (styleWidth != null) {
+        return styleWidth;
+      }
+
+      return this._resolveWidth($element, 'element');
+    }
+
+    if (method == 'element') {
+      var elementWidth = $element.outerWidth(false);
+
+      if (elementWidth <= 0) {
+        return 'auto';
+      }
+
+      return elementWidth + 'px';
+    }
+
+    if (method == 'style') {
+      var style = $element.attr('style');
+
+      if (typeof(style) !== 'string') {
+        return null;
+      }
+
+      var attrs = style.split(';');
+
+      for (var i = 0, l = attrs.length; i < l; i = i + 1) {
+        var attr = attrs[i].replace(/\s/g, '');
+        var matches = attr.match(WIDTH);
+
+        if (matches !== null && matches.length >= 1) {
+          return matches[1];
+        }
+      }
+
+      return null;
+    }
+
+    return method;
+  };
+
+  Select2.prototype._bindAdapters = function () {
+    this.dataAdapter.bind(this, this.$container);
+    this.selection.bind(this, this.$container);
+
+    this.dropdown.bind(this, this.$container);
+    this.results.bind(this, this.$container);
+  };
+
+  Select2.prototype._registerDomEvents = function () {
+    var self = this;
+
+    this.$element.on('change.select2', function () {
+      self.dataAdapter.current(function (data) {
+        self.trigger('selection:update', {
+          data: data
+        });
+      });
+    });
+
+    this.$element.on('focus.select2', function (evt) {
+      self.trigger('focus', evt);
+    });
+
+    this._syncA = Utils.bind(this._syncAttributes, this);
+    this._syncS = Utils.bind(this._syncSubtree, this);
+
+    if (this.$element[0].attachEvent) {
+      this.$element[0].attachEvent('onpropertychange', this._syncA);
+    }
+
+    var observer = window.MutationObserver ||
+      window.WebKitMutationObserver ||
+      window.MozMutationObserver
+    ;
+
+    if (observer != null) {
+      this._observer = new observer(function (mutations) {
+        $.each(mutations, self._syncA);
+        $.each(mutations, self._syncS);
+      });
+      this._observer.observe(this.$element[0], {
+        attributes: true,
+        childList: true,
+        subtree: false
+      });
+    } else if (this.$element[0].addEventListener) {
+      this.$element[0].addEventListener(
+        'DOMAttrModified',
+        self._syncA,
+        false
+      );
+      this.$element[0].addEventListener(
+        'DOMNodeInserted',
+        self._syncS,
+        false
+      );
+      this.$element[0].addEventListener(
+        'DOMNodeRemoved',
+        self._syncS,
+        false
+      );
+    }
+  };
+
+  Select2.prototype._registerDataEvents = function () {
+    var self = this;
+
+    this.dataAdapter.on('*', function (name, params) {
+      self.trigger(name, params);
+    });
+  };
+
+  Select2.prototype._registerSelectionEvents = function () {
+    var self = this;
+    var nonRelayEvents = ['toggle', 'focus'];
+
+    this.selection.on('toggle', function () {
+      self.toggleDropdown();
+    });
+
+    this.selection.on('focus', function (params) {
+      self.focus(params);
+    });
+
+    this.selection.on('*', function (name, params) {
+      if ($.inArray(name, nonRelayEvents) !== -1) {
+        return;
+      }
+
+      self.trigger(name, params);
+    });
+  };
+
+  Select2.prototype._registerDropdownEvents = function () {
+    var self = this;
+
+    this.dropdown.on('*', function (name, params) {
+      self.trigger(name, params);
+    });
+  };
+
+  Select2.prototype._registerResultsEvents = function () {
+    var self = this;
+
+    this.results.on('*', function (name, params) {
+      self.trigger(name, params);
+    });
+  };
+
+  Select2.prototype._registerEvents = function () {
+    var self = this;
+
+    this.on('open', function () {
+      self.$container.addClass('select2-container--open');
+    });
+
+    this.on('close', function () {
+      self.$container.removeClass('select2-container--open');
+    });
+
+    this.on('enable', function () {
+      self.$container.removeClass('select2-container--disabled');
+    });
+
+    this.on('disable', function () {
+      self.$container.addClass('select2-container--disabled');
+    });
+
+    this.on('blur', function () {
+      self.$container.removeClass('select2-container--focus');
+    });
+
+    this.on('query', function (params) {
+      if (!self.isOpen()) {
+        self.trigger('open', {});
+      }
+
+      this.dataAdapter.query(params, function (data) {
+        self.trigger('results:all', {
+          data: data,
+          query: params
+        });
+      });
+    });
+
+    this.on('query:append', function (params) {
+      this.dataAdapter.query(params, function (data) {
+        self.trigger('results:append', {
+          data: data,
+          query: params
+        });
+      });
+    });
+
+    this.on('keypress', function (evt) {
+      var key = evt.which;
+
+      if (self.isOpen()) {
+        if (key === KEYS.ESC || key === KEYS.TAB ||
+            (key === KEYS.UP && evt.altKey)) {
+          self.close();
+
+          evt.preventDefault();
+        } else if (key === KEYS.ENTER) {
+          self.trigger('results:select', {});
+
+          evt.preventDefault();
+        } else if ((key === KEYS.SPACE && evt.ctrlKey)) {
+          self.trigger('results:toggle', {});
+
+          evt.preventDefault();
+        } else if (key === KEYS.UP) {
+          self.trigger('results:previous', {});
+
+          evt.preventDefault();
+        } else if (key === KEYS.DOWN) {
+          self.trigger('results:next', {});
+
+          evt.preventDefault();
+        }
+      } else {
+        if (key === KEYS.ENTER || key === KEYS.SPACE ||
+            (key === KEYS.DOWN && evt.altKey)) {
+          self.open();
+
+          evt.preventDefault();
+        }
+      }
+    });
+  };
+
+  Select2.prototype._syncAttributes = function () {
+    this.options.set('disabled', this.$element.prop('disabled'));
+
+    if (this.options.get('disabled')) {
+      if (this.isOpen()) {
+        this.close();
+      }
+
+      this.trigger('disable', {});
+    } else {
+      this.trigger('enable', {});
+    }
+  };
+
+  Select2.prototype._syncSubtree = function (evt, mutations) {
+    var changed = false;
+    var self = this;
+
+    // Ignore any mutation events raised for elements that aren't options or
+    // optgroups. This handles the case when the select element is destroyed
+    if (
+      evt && evt.target && (
+        evt.target.nodeName !== 'OPTION' && evt.target.nodeName !== 'OPTGROUP'
+      )
+    ) {
+      return;
+    }
+
+    if (!mutations) {
+      // If mutation events aren't supported, then we can only assume that the
+      // change affected the selections
+      changed = true;
+    } else if (mutations.addedNodes && mutations.addedNodes.length > 0) {
+      for (var n = 0; n < mutations.addedNodes.length; n++) {
+        var node = mutations.addedNodes[n];
+
+        if (node.selected) {
+          changed = true;
+        }
+      }
+    } else if (mutations.removedNodes && mutations.removedNodes.length > 0) {
+      changed = true;
+    }
+
+    // Only re-pull the data if we think there is a change
+    if (changed) {
+      this.dataAdapter.current(function (currentData) {
+        self.trigger('selection:update', {
+          data: currentData
+        });
+      });
+    }
+  };
+
+  /**
+   * Override the trigger method to automatically trigger pre-events when
+   * there are events that can be prevented.
+   */
+  Select2.prototype.trigger = function (name, args) {
+    var actualTrigger = Select2.__super__.trigger;
+    var preTriggerMap = {
+      'open': 'opening',
+      'close': 'closing',
+      'select': 'selecting',
+      'unselect': 'unselecting'
+    };
+
+    if (args === undefined) {
+      args = {};
+    }
+
+    if (name in preTriggerMap) {
+      var preTriggerName = preTriggerMap[name];
+      var preTriggerArgs = {
+        prevented: false,
+        name: name,
+        args: args
+      };
+
+      actualTrigger.call(this, preTriggerName, preTriggerArgs);
+
+      if (preTriggerArgs.prevented) {
+        args.prevented = true;
+
+        return;
+      }
+    }
+
+    actualTrigger.call(this, name, args);
+  };
+
+  Select2.prototype.toggleDropdown = function () {
+    if (this.options.get('disabled')) {
+      return;
+    }
+
+    if (this.isOpen()) {
+      this.close();
+    } else {
+      this.open();
+    }
+  };
+
+  Select2.prototype.open = function () {
+    if (this.isOpen()) {
+      return;
+    }
+
+    this.trigger('query', {});
+  };
+
+  Select2.prototype.close = function () {
+    if (!this.isOpen()) {
+      return;
+    }
+
+    this.trigger('close', {});
+  };
+
+  Select2.prototype.isOpen = function () {
+    return this.$container.hasClass('select2-container--open');
+  };
+
+  Select2.prototype.hasFocus = function () {
+    return this.$container.hasClass('select2-container--focus');
+  };
+
+  Select2.prototype.focus = function (data) {
+    // No need to re-trigger focus events if we are already focused
+    if (this.hasFocus()) {
+      return;
+    }
+
+    this.$container.addClass('select2-container--focus');
+    this.trigger('focus', {});
+  };
+
+  Select2.prototype.enable = function (args) {
+    if (this.options.get('debug') && window.console && console.warn) {
+      console.warn(
+        'Select2: The `select2("enable")` method has been deprecated and will' +
+        ' be removed in later Select2 versions. Use $element.prop("disabled")' +
+        ' instead.'
+      );
+    }
+
+    if (args == null || args.length === 0) {
+      args = [true];
+    }
+
+    var disabled = !args[0];
+
+    this.$element.prop('disabled', disabled);
+  };
+
+  Select2.prototype.data = function () {
+    if (this.options.get('debug') &&
+        arguments.length > 0 && window.console && console.warn) {
+      console.warn(
+        'Select2: Data can no longer be set using `select2("data")`. You ' +
+        'should consider setting the value instead using `$element.val()`.'
+      );
+    }
+
+    var data = [];
+
+    this.dataAdapter.current(function (currentData) {
+      data = currentData;
+    });
+
+    return data;
+  };
+
+  Select2.prototype.val = function (args) {
+    if (this.options.get('debug') && window.console && console.warn) {
+      console.warn(
+        'Select2: The `select2("val")` method has been deprecated and will be' +
+        ' removed in later Select2 versions. Use $element.val() instead.'
+      );
+    }
+
+    if (args == null || args.length === 0) {
+      return this.$element.val();
+    }
+
+    var newVal = args[0];
+
+    if ($.isArray(newVal)) {
+      newVal = $.map(newVal, function (obj) {
+        return obj.toString();
+      });
+    }
+
+    this.$element.val(newVal).trigger('change');
+  };
+
+  Select2.prototype.destroy = function () {
+    this.$container.remove();
+
+    if (this.$element[0].detachEvent) {
+      this.$element[0].detachEvent('onpropertychange', this._syncA);
+    }
+
+    if (this._observer != null) {
+      this._observer.disconnect();
+      this._observer = null;
+    } else if (this.$element[0].removeEventListener) {
+      this.$element[0]
+        .removeEventListener('DOMAttrModified', this._syncA, false);
+      this.$element[0]
+        .removeEventListener('DOMNodeInserted', this._syncS, false);
+      this.$element[0]
+        .removeEventListener('DOMNodeRemoved', this._syncS, false);
+    }
+
+    this._syncA = null;
+    this._syncS = null;
+
+    this.$element.off('.select2');
+    this.$element.attr('tabindex', this.$element.data('old-tabindex'));
+
+    this.$element.removeClass('select2-hidden-accessible');
+    this.$element.attr('aria-hidden', 'false');
+    this.$element.removeData('select2');
+
+    this.dataAdapter.destroy();
+    this.selection.destroy();
+    this.dropdown.destroy();
+    this.results.destroy();
+
+    this.dataAdapter = null;
+    this.selection = null;
+    this.dropdown = null;
+    this.results = null;
+  };
+
+  Select2.prototype.render = function () {
+    var $container = $(
+      '<span class="select2 select2-container">' +
+        '<span class="selection"></span>' +
+        '<span class="dropdown-wrapper" aria-hidden="true"></span>' +
+      '</span>'
+    );
+
+    $container.attr('dir', this.options.get('dir'));
+
+    this.$container = $container;
+
+    this.$container.addClass('select2-container--' + this.options.get('theme'));
+
+    $container.data('element', this.$element);
+
+    return $container;
+  };
+
+  return Select2;
+});
+
+S2.define('select2/compat/utils',[
+  'jquery'
+], function ($) {
+  function syncCssClasses ($dest, $src, adapter) {
+    var classes, replacements = [], adapted;
+
+    classes = $.trim($dest.attr('class'));
+
+    if (classes) {
+      classes = '' + classes; // for IE which returns object
+
+      $(classes.split(/\s+/)).each(function () {
+        // Save all Select2 classes
+        if (this.indexOf('select2-') === 0) {
+          replacements.push(this);
+        }
+      });
+    }
+
+    classes = $.trim($src.attr('class'));
+
+    if (classes) {
+      classes = '' + classes; // for IE which returns object
+
+      $(classes.split(/\s+/)).each(function () {
+        // Only adapt non-Select2 classes
+        if (this.indexOf('select2-') !== 0) {
+          adapted = adapter(this);
+
+          if (adapted != null) {
+            replacements.push(adapted);
+          }
+        }
+      });
+    }
+
+    $dest.attr('class', replacements.join(' '));
+  }
+
+  return {
+    syncCssClasses: syncCssClasses
+  };
+});
+
+S2.define('select2/compat/containerCss',[
+  'jquery',
+  './utils'
+], function ($, CompatUtils) {
+  // No-op CSS adapter that discards all classes by default
+  function _containerAdapter (clazz) {
+    return null;
+  }
+
+  function ContainerCSS () { }
+
+  ContainerCSS.prototype.render = function (decorated) {
+    var $container = decorated.call(this);
+
+    var containerCssClass = this.options.get('containerCssClass') || '';
+
+    if ($.isFunction(containerCssClass)) {
+      containerCssClass = containerCssClass(this.$element);
+    }
+
+    var containerCssAdapter = this.options.get('adaptContainerCssClass');
+    containerCssAdapter = containerCssAdapter || _containerAdapter;
+
+    if (containerCssClass.indexOf(':all:') !== -1) {
+      containerCssClass = containerCssClass.replace(':all:', '');
+
+      var _cssAdapter = containerCssAdapter;
+
+      containerCssAdapter = function (clazz) {
+        var adapted = _cssAdapter(clazz);
+
+        if (adapted != null) {
+          // Append the old one along with the adapted one
+          return adapted + ' ' + clazz;
+        }
+
+        return clazz;
+      };
+    }
+
+    var containerCss = this.options.get('containerCss') || {};
+
+    if ($.isFunction(containerCss)) {
+      containerCss = containerCss(this.$element);
+    }
+
+    CompatUtils.syncCssClasses($container, this.$element, containerCssAdapter);
+
+    $container.css(containerCss);
+    $container.addClass(containerCssClass);
+
+    return $container;
+  };
+
+  return ContainerCSS;
+});
+
+S2.define('select2/compat/dropdownCss',[
+  'jquery',
+  './utils'
+], function ($, CompatUtils) {
+  // No-op CSS adapter that discards all classes by default
+  function _dropdownAdapter (clazz) {
+    return null;
+  }
+
+  function DropdownCSS () { }
+
+  DropdownCSS.prototype.render = function (decorated) {
+    var $dropdown = decorated.call(this);
+
+    var dropdownCssClass = this.options.get('dropdownCssClass') || '';
+
+    if ($.isFunction(dropdownCssClass)) {
+      dropdownCssClass = dropdownCssClass(this.$element);
+    }
+
+    var dropdownCssAdapter = this.options.get('adaptDropdownCssClass');
+    dropdownCssAdapter = dropdownCssAdapter || _dropdownAdapter;
+
+    if (dropdownCssClass.indexOf(':all:') !== -1) {
+      dropdownCssClass = dropdownCssClass.replace(':all:', '');
+
+      var _cssAdapter = dropdownCssAdapter;
+
+      dropdownCssAdapter = function (clazz) {
+        var adapted = _cssAdapter(clazz);
+
+        if (adapted != null) {
+          // Append the old one along with the adapted one
+          return adapted + ' ' + clazz;
+        }
+
+        return clazz;
+      };
+    }
+
+    var dropdownCss = this.options.get('dropdownCss') || {};
+
+    if ($.isFunction(dropdownCss)) {
+      dropdownCss = dropdownCss(this.$element);
+    }
+
+    CompatUtils.syncCssClasses($dropdown, this.$element, dropdownCssAdapter);
+
+    $dropdown.css(dropdownCss);
+    $dropdown.addClass(dropdownCssClass);
+
+    return $dropdown;
+  };
+
+  return DropdownCSS;
+});
+
+S2.define('select2/compat/initSelection',[
+  'jquery'
+], function ($) {
+  function InitSelection (decorated, $element, options) {
+    if (options.get('debug') && window.console && console.warn) {
+      console.warn(
+        'Select2: The `initSelection` option has been deprecated in favor' +
+        ' of a custom data adapter that overrides the `current` method. ' +
+        'This method is now called multiple times instead of a single ' +
+        'time when the instance is initialized. Support will be removed ' +
+        'for the `initSelection` option in future versions of Select2'
+      );
+    }
+
+    this.initSelection = options.get('initSelection');
+    this._isInitialized = false;
+
+    decorated.call(this, $element, options);
+  }
+
+  InitSelection.prototype.current = function (decorated, callback) {
+    var self = this;
+
+    if (this._isInitialized) {
+      decorated.call(this, callback);
+
+      return;
+    }
+
+    this.initSelection.call(null, this.$element, function (data) {
+      self._isInitialized = true;
+
+      if (!$.isArray(data)) {
+        data = [data];
+      }
+
+      callback(data);
+    });
+  };
+
+  return InitSelection;
+});
+
+S2.define('select2/compat/inputData',[
+  'jquery'
+], function ($) {
+  function InputData (decorated, $element, options) {
+    this._currentData = [];
+    this._valueSeparator = options.get('valueSeparator') || ',';
+
+    if ($element.prop('type') === 'hidden') {
+      if (options.get('debug') && console && console.warn) {
+        console.warn(
+          'Select2: Using a hidden input with Select2 is no longer ' +
+          'supported and may stop working in the future. It is recommended ' +
+          'to use a `<select>` element instead.'
+        );
+      }
+    }
+
+    decorated.call(this, $element, options);
+  }
+
+  InputData.prototype.current = function (_, callback) {
+    function getSelected (data, selectedIds) {
+      var selected = [];
+
+      if (data.selected || $.inArray(data.id, selectedIds) !== -1) {
+        data.selected = true;
+        selected.push(data);
+      } else {
+        data.selected = false;
+      }
+
+      if (data.children) {
+        selected.push.apply(selected, getSelected(data.children, selectedIds));
+      }
+
+      return selected;
+    }
+
+    var selected = [];
+
+    for (var d = 0; d < this._currentData.length; d++) {
+      var data = this._currentData[d];
+
+      selected.push.apply(
+        selected,
+        getSelected(
+          data,
+          this.$element.val().split(
+            this._valueSeparator
+          )
+        )
+      );
+    }
+
+    callback(selected);
+  };
+
+  InputData.prototype.select = function (_, data) {
+    if (!this.options.get('multiple')) {
+      this.current(function (allData) {
+        $.map(allData, function (data) {
+          data.selected = false;
+        });
+      });
+
+      this.$element.val(data.id);
+      this.$element.trigger('change');
+    } else {
+      var value = this.$element.val();
+      value += this._valueSeparator + data.id;
+
+      this.$element.val(value);
+      this.$element.trigger('change');
+    }
+  };
+
+  InputData.prototype.unselect = function (_, data) {
+    var self = this;
+
+    data.selected = false;
+
+    this.current(function (allData) {
+      var values = [];
+
+      for (var d = 0; d < allData.length; d++) {
+        var item = allData[d];
+
+        if (data.id == item.id) {
+          continue;
+        }
+
+        values.push(item.id);
+      }
+
+      self.$element.val(values.join(self._valueSeparator));
+      self.$element.trigger('change');
+    });
+  };
+
+  InputData.prototype.query = function (_, params, callback) {
+    var results = [];
+
+    for (var d = 0; d < this._currentData.length; d++) {
+      var data = this._currentData[d];
+
+      var matches = this.matches(params, data);
+
+      if (matches !== null) {
+        results.push(matches);
+      }
+    }
+
+    callback({
+      results: results
+    });
+  };
+
+  InputData.prototype.addOptions = function (_, $options) {
+    var options = $.map($options, function ($option) {
+      return $.data($option[0], 'data');
+    });
+
+    this._currentData.push.apply(this._currentData, options);
+  };
+
+  return InputData;
+});
+
+S2.define('select2/compat/matcher',[
+  'jquery'
+], function ($) {
+  function oldMatcher (matcher) {
+    function wrappedMatcher (params, data) {
+      var match = $.extend(true, {}, data);
+
+      if (params.term == null || $.trim(params.term) === '') {
+        return match;
+      }
+
+      if (data.children) {
+        for (var c = data.children.length - 1; c >= 0; c--) {
+          var child = data.children[c];
+
+          // Check if the child object matches
+          // The old matcher returned a boolean true or false
+          var doesMatch = matcher(params.term, child.text, child);
+
+          // If the child didn't match, pop it off
+          if (!doesMatch) {
+            match.children.splice(c, 1);
+          }
+        }
+
+        if (match.children.length > 0) {
+          return match;
+        }
+      }
+
+      if (matcher(params.term, data.text, data)) {
+        return match;
+      }
+
+      return null;
+    }
+
+    return wrappedMatcher;
+  }
+
+  return oldMatcher;
+});
+
+S2.define('select2/compat/query',[
+
+], function () {
+  function Query (decorated, $element, options) {
+    if (options.get('debug') && window.console && console.warn) {
+      console.warn(
+        'Select2: The `query` option has been deprecated in favor of a ' +
+        'custom data adapter that overrides the `query` method. Support ' +
+        'will be removed for the `query` option in future versions of ' +
+        'Select2.'
+      );
+    }
+
+    decorated.call(this, $element, options);
+  }
+
+  Query.prototype.query = function (_, params, callback) {
+    params.callback = callback;
+
+    var query = this.options.get('query');
+
+    query.call(null, params);
+  };
+
+  return Query;
+});
+
+S2.define('select2/dropdown/attachContainer',[
+
+], function () {
+  function AttachContainer (decorated, $element, options) {
+    decorated.call(this, $element, options);
+  }
+
+  AttachContainer.prototype.position =
+    function (decorated, $dropdown, $container) {
+    var $dropdownContainer = $container.find('.dropdown-wrapper');
+    $dropdownContainer.append($dropdown);
+
+    $dropdown.addClass('select2-dropdown--below');
+    $container.addClass('select2-container--below');
+  };
+
+  return AttachContainer;
+});
+
+S2.define('select2/dropdown/stopPropagation',[
+
+], function () {
+  function StopPropagation () { }
+
+  StopPropagation.prototype.bind = function (decorated, container, $container) {
+    decorated.call(this, container, $container);
+
+    var stoppedEvents = [
+    'blur',
+    'change',
+    'click',
+    'dblclick',
+    'focus',
+    'focusin',
+    'focusout',
+    'input',
+    'keydown',
+    'keyup',
+    'keypress',
+    'mousedown',
+    'mouseenter',
+    'mouseleave',
+    'mousemove',
+    'mouseover',
+    'mouseup',
+    'search',
+    'touchend',
+    'touchstart'
+    ];
+
+    this.$dropdown.on(stoppedEvents.join(' '), function (evt) {
+      evt.stopPropagation();
+    });
+  };
+
+  return StopPropagation;
+});
+
+S2.define('select2/selection/stopPropagation',[
+
+], function () {
+  function StopPropagation () { }
+
+  StopPropagation.prototype.bind = function (decorated, container, $container) {
+    decorated.call(this, container, $container);
+
+    var stoppedEvents = [
+      'blur',
+      'change',
+      'click',
+      'dblclick',
+      'focus',
+      'focusin',
+      'focusout',
+      'input',
+      'keydown',
+      'keyup',
+      'keypress',
+      'mousedown',
+      'mouseenter',
+      'mouseleave',
+      'mousemove',
+      'mouseover',
+      'mouseup',
+      'search',
+      'touchend',
+      'touchstart'
+    ];
+
+    this.$selection.on(stoppedEvents.join(' '), function (evt) {
+      evt.stopPropagation();
+    });
+  };
+
+  return StopPropagation;
+});
+
+/*!
+ * jQuery Mousewheel 3.1.13
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license
+ * http://jquery.org/license
+ */
+
+(function (factory) {
+    if ( typeof S2.define === 'function' && S2.define.amd ) {
+        // AMD. Register as an anonymous module.
+        S2.define('jquery-mousewheel',['jquery'], factory);
+    } else if (typeof exports === 'object') {
+        // Node/CommonJS style for Browserify
+        module.exports = factory;
+    } else {
+        // Browser globals
+        factory(jQuery);
+    }
+}(function ($) {
+
+    var toFix  = ['wheel', 'mousewheel', 'DOMMouseScroll', 'MozMousePixelScroll'],
+        toBind = ( 'onwheel' in document || document.documentMode >= 9 ) ?
+                    ['wheel'] : ['mousewheel', 'DomMouseScroll', 'MozMousePixelScroll'],
+        slice  = Array.prototype.slice,
+        nullLowestDeltaTimeout, lowestDelta;
+
+    if ( $.event.fixHooks ) {
+        for ( var i = toFix.length; i; ) {
+            $.event.fixHooks[ toFix[--i] ] = $.event.mouseHooks;
+        }
+    }
+
+    var special = $.event.special.mousewheel = {
+        version: '3.1.12',
+
+        setup: function() {
+            if ( this.addEventListener ) {
+                for ( var i = toBind.length; i; ) {
+                    this.addEventListener( toBind[--i], handler, false );
+                }
+            } else {
+                this.onmousewheel = handler;
+            }
+            // Store the line height and page height for this particular element
+            $.data(this, 'mousewheel-line-height', special.getLineHeight(this));
+            $.data(this, 'mousewheel-page-height', special.getPageHeight(this));
+        },
+
+        teardown: function() {
+            if ( this.removeEventListener ) {
+                for ( var i = toBind.length; i; ) {
+                    this.removeEventListener( toBind[--i], handler, false );
+                }
+            } else {
+                this.onmousewheel = null;
+            }
+            // Clean up the data we added to the element
+            $.removeData(this, 'mousewheel-line-height');
+            $.removeData(this, 'mousewheel-page-height');
+        },
+
+        getLineHeight: function(elem) {
+            var $elem = $(elem),
+                $parent = $elem['offsetParent' in $.fn ? 'offsetParent' : 'parent']();
+            if (!$parent.length) {
+                $parent = $('body');
+            }
+            return parseInt($parent.css('fontSize'), 10) || parseInt($elem.css('fontSize'), 10) || 16;
+        },
+
+        getPageHeight: function(elem) {
+            return $(elem).height();
+        },
+
+        settings: {
+            adjustOldDeltas: true, // see shouldAdjustOldDeltas() below
+            normalizeOffset: true  // calls getBoundingClientRect for each event
+        }
+    };
+
+    $.fn.extend({
+        mousewheel: function(fn) {
+            return fn ? this.bind('mousewheel', fn) : this.trigger('mousewheel');
+        },
+
+        unmousewheel: function(fn) {
+            return this.unbind('mousewheel', fn);
+        }
+    });
+
+
+    function handler(event) {
+        var orgEvent   = event || window.event,
+            args       = slice.call(arguments, 1),
+            delta      = 0,
+            deltaX     = 0,
+            deltaY     = 0,
+            absDelta   = 0,
+            offsetX    = 0,
+            offsetY    = 0;
+        event = $.event.fix(orgEvent);
+        event.type = 'mousewheel';
+
+        // Old school scrollwheel delta
+        if ( 'detail'      in orgEvent ) { deltaY = orgEvent.detail * -1;      }
+        if ( 'wheelDelta'  in orgEvent ) { deltaY = orgEvent.wheelDelta;       }
+        if ( 'wheelDeltaY' in orgEvent ) { deltaY = orgEvent.wheelDeltaY;      }
+        if ( 'wheelDeltaX' in orgEvent ) { deltaX = orgEvent.wheelDeltaX * -1; }
+
+        // Firefox < 17 horizontal scrolling related to DOMMouseScroll event
+        if ( 'axis' in orgEvent && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {
+            deltaX = deltaY * -1;
+            deltaY = 0;
+        }
+
+        // Set delta to be deltaY or deltaX if deltaY is 0 for backwards compatabilitiy
+        delta = deltaY === 0 ? deltaX : deltaY;
+
+        // New school wheel delta (wheel event)
+        if ( 'deltaY' in orgEvent ) {
+            deltaY = orgEvent.deltaY * -1;
+            delta  = deltaY;
+        }
+        if ( 'deltaX' in orgEvent ) {
+            deltaX = orgEvent.deltaX;
+            if ( deltaY === 0 ) { delta  = deltaX * -1; }
+        }
+
+        // No change actually happened, no reason to go any further
+        if ( deltaY === 0 && deltaX === 0 ) { return; }
+
+        // Need to convert lines and pages to pixels if we aren't already in pixels
+        // There are three delta modes:
+        //   * deltaMode 0 is by pixels, nothing to do
+        //   * deltaMode 1 is by lines
+        //   * deltaMode 2 is by pages
+        if ( orgEvent.deltaMode === 1 ) {
+            var lineHeight = $.data(this, 'mousewheel-line-height');
+            delta  *= lineHeight;
+            deltaY *= lineHeight;
+            deltaX *= lineHeight;
+        } else if ( orgEvent.deltaMode === 2 ) {
+            var pageHeight = $.data(this, 'mousewheel-page-height');
+            delta  *= pageHeight;
+            deltaY *= pageHeight;
+            deltaX *= pageHeight;
+        }
+
+        // Store lowest absolute delta to normalize the delta values
+        absDelta = Math.max( Math.abs(deltaY), Math.abs(deltaX) );
+
+        if ( !lowestDelta || absDelta < lowestDelta ) {
+            lowestDelta = absDelta;
+
+            // Adjust older deltas if necessary
+            if ( shouldAdjustOldDeltas(orgEvent, absDelta) ) {
+                lowestDelta /= 40;
+            }
+        }
+
+        // Adjust older deltas if necessary
+        if ( shouldAdjustOldDeltas(orgEvent, absDelta) ) {
+            // Divide all the things by 40!
+            delta  /= 40;
+            deltaX /= 40;
+            deltaY /= 40;
+        }
+
+        // Get a whole, normalized value for the deltas
+        delta  = Math[ delta  >= 1 ? 'floor' : 'ceil' ](delta  / lowestDelta);
+        deltaX = Math[ deltaX >= 1 ? 'floor' : 'ceil' ](deltaX / lowestDelta);
+        deltaY = Math[ deltaY >= 1 ? 'floor' : 'ceil' ](deltaY / lowestDelta);
+
+        // Normalise offsetX and offsetY properties
+        if ( special.settings.normalizeOffset && this.getBoundingClientRect ) {
+            var boundingRect = this.getBoundingClientRect();
+            offsetX = event.clientX - boundingRect.left;
+            offsetY = event.clientY - boundingRect.top;
+        }
+
+        // Add information to the event object
+        event.deltaX = deltaX;
+        event.deltaY = deltaY;
+        event.deltaFactor = lowestDelta;
+        event.offsetX = offsetX;
+        event.offsetY = offsetY;
+        // Go ahead and set deltaMode to 0 since we converted to pixels
+        // Although this is a little odd since we overwrite the deltaX/Y
+        // properties with normalized deltas.
+        event.deltaMode = 0;
+
+        // Add event and delta to the front of the arguments
+        args.unshift(event, delta, deltaX, deltaY);
+
+        // Clearout lowestDelta after sometime to better
+        // handle multiple device types that give different
+        // a different lowestDelta
+        // Ex: trackpad = 3 and mouse wheel = 120
+        if (nullLowestDeltaTimeout) { clearTimeout(nullLowestDeltaTimeout); }
+        nullLowestDeltaTimeout = setTimeout(nullLowestDelta, 200);
+
+        return ($.event.dispatch || $.event.handle).apply(this, args);
+    }
+
+    function nullLowestDelta() {
+        lowestDelta = null;
+    }
+
+    function shouldAdjustOldDeltas(orgEvent, absDelta) {
+        // If this is an older event and the delta is divisable by 120,
+        // then we are assuming that the browser is treating this as an
+        // older mouse wheel event and that we should divide the deltas
+        // by 40 to try and get a more usable deltaFactor.
+        // Side note, this actually impacts the reported scroll distance
+        // in older browsers and can cause scrolling to be slower than native.
+        // Turn this off by setting $.event.special.mousewheel.settings.adjustOldDeltas to false.
+        return special.settings.adjustOldDeltas && orgEvent.type === 'mousewheel' && absDelta % 120 === 0;
+    }
+
+}));
+
+S2.define('jquery.select2',[
+  'jquery',
+  'jquery-mousewheel',
+
+  './select2/core',
+  './select2/defaults'
+], function ($, _, Select2, Defaults) {
+  if ($.fn.select2 == null) {
+    // All methods that should return the element
+    var thisMethods = ['open', 'close', 'destroy'];
+
+    $.fn.select2 = function (options) {
+      options = options || {};
+
+      if (typeof options === 'object') {
+        this.each(function () {
+          var instanceOptions = $.extend(true, {}, options);
+
+          var instance = new Select2($(this), instanceOptions);
+        });
+
+        return this;
+      } else if (typeof options === 'string') {
+        var ret;
+        var args = Array.prototype.slice.call(arguments, 1);
+
+        this.each(function () {
+          var instance = $(this).data('select2');
+
+          if (instance == null && window.console && console.error) {
+            console.error(
+              'The select2(\'' + options + '\') method was called on an ' +
+              'element that is not using Select2.'
+            );
+          }
+
+          ret = instance[options].apply(instance, args);
+        });
+
+        // Check if we should be returning `this`
+        if ($.inArray(options, thisMethods) > -1) {
+          return this;
+        }
+
+        return ret;
+      } else {
+        throw new Error('Invalid arguments for Select2: ' + options);
+      }
+    };
+  }
+
+  if ($.fn.select2.defaults == null) {
+    $.fn.select2.defaults = Defaults;
+  }
+
+  return Select2;
+});
+
+  // Return the AMD loader configuration so it can be used outside of this file
+  return {
+    define: S2.define,
+    require: S2.require
+  };
+}());
+
+  // Autoload the jQuery bindings
+  // We know that all of the modules exist above this, so we're safe
+  var select2 = S2.require('jquery.select2');
+
+  // Hold the AMD module references on the jQuery function that was just loaded
+  // This allows Select2 to use the internal loader outside of this file, such
+  // as in the language files.
+  jQuery.fn.select2.amd = S2;
+
+  // Return the Select2 instance for anyone who is importing it.
+  return select2;
+}));
diff --git a/assets/js/select2/select2.full.min.js b/assets/js/select2/select2.full.min.js
new file mode 100644
index 00000000000..684edf32388
--- /dev/null
+++ b/assets/js/select2/select2.full.min.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.3 | https://github.com/select2/select2/blob/master/LICENSE.md */!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):a("object"==typeof exports?require("jquery"):jQuery)}(function(a){var b=function(){if(a&&a.fn&&a.fn.select2&&a.fn.select2.amd)var b=a.fn.select2.amd;var b;return function(){if(!b||!b.requirejs){b?c=b:b={};var a,c,d;!function(b){function e(a,b){return u.call(a,b)}function f(a,b){var c,d,e,f,g,h,i,j,k,l,m,n=b&&b.split("/"),o=s.map,p=o&&o["*"]||{};if(a&&"."===a.charAt(0))if(b){for(a=a.split("/"),g=a.length-1,s.nodeIdCompat&&w.test(a[g])&&(a[g]=a[g].replace(w,"")),a=n.slice(0,n.length-1).concat(a),k=0;k<a.length;k+=1)if(m=a[k],"."===m)a.splice(k,1),k-=1;else if(".."===m){if(1===k&&(".."===a[2]||".."===a[0]))break;k>0&&(a.splice(k-1,2),k-=2)}a=a.join("/")}else 0===a.indexOf("./")&&(a=a.substring(2));if((n||p)&&o){for(c=a.split("/"),k=c.length;k>0;k-=1){if(d=c.slice(0,k).join("/"),n)for(l=n.length;l>0;l-=1)if(e=o[n.slice(0,l).join("/")],e&&(e=e[d])){f=e,h=k;break}if(f)break;!i&&p&&p[d]&&(i=p[d],j=k)}!f&&i&&(f=i,h=j),f&&(c.splice(0,h,f),a=c.join("/"))}return a}function g(a,c){return function(){var d=v.call(arguments,0);return"string"!=typeof d[0]&&1===d.length&&d.push(null),n.apply(b,d.concat([a,c]))}}function h(a){return function(b){return f(b,a)}}function i(a){return function(b){q[a]=b}}function j(a){if(e(r,a)){var c=r[a];delete r[a],t[a]=!0,m.apply(b,c)}if(!e(q,a)&&!e(t,a))throw new Error("No "+a);return q[a]}function k(a){var b,c=a?a.indexOf("!"):-1;return c>-1&&(b=a.substring(0,c),a=a.substring(c+1,a.length)),[b,a]}function l(a){return function(){return s&&s.config&&s.config[a]||{}}}var m,n,o,p,q={},r={},s={},t={},u=Object.prototype.hasOwnProperty,v=[].slice,w=/\.js$/;o=function(a,b){var c,d=k(a),e=d[0];return a=d[1],e&&(e=f(e,b),c=j(e)),e?a=c&&c.normalize?c.normalize(a,h(b)):f(a,b):(a=f(a,b),d=k(a),e=d[0],a=d[1],e&&(c=j(e))),{f:e?e+"!"+a:a,n:a,pr:e,p:c}},p={require:function(a){return g(a)},exports:function(a){var b=q[a];return"undefined"!=typeof b?b:q[a]={}},module:function(a){return{id:a,uri:"",exports:q[a],config:l(a)}}},m=function(a,c,d,f){var h,k,l,m,n,s,u=[],v=typeof d;if(f=f||a,"undefined"===v||"function"===v){for(c=!c.length&&d.length?["require","exports","module"]:c,n=0;n<c.length;n+=1)if(m=o(c[n],f),k=m.f,"require"===k)u[n]=p.require(a);else if("exports"===k)u[n]=p.exports(a),s=!0;else if("module"===k)h=u[n]=p.module(a);else if(e(q,k)||e(r,k)||e(t,k))u[n]=j(k);else{if(!m.p)throw new Error(a+" missing "+k);m.p.load(m.n,g(f,!0),i(k),{}),u[n]=q[k]}l=d?d.apply(q[a],u):void 0,a&&(h&&h.exports!==b&&h.exports!==q[a]?q[a]=h.exports:l===b&&s||(q[a]=l))}else a&&(q[a]=d)},a=c=n=function(a,c,d,e,f){if("string"==typeof a)return p[a]?p[a](c):j(o(a,c).f);if(!a.splice){if(s=a,s.deps&&n(s.deps,s.callback),!c)return;c.splice?(a=c,c=d,d=null):a=b}return c=c||function(){},"function"==typeof d&&(d=e,e=f),e?m(b,a,c,d):setTimeout(function(){m(b,a,c,d)},4),n},n.config=function(a){return n(a)},a._defined=q,d=function(a,b,c){if("string"!=typeof a)throw new Error("See almond README: incorrect module build, no module name");b.splice||(c=b,b=[]),e(q,a)||e(r,a)||(r[a]=[a,b,c])},d.amd={jQuery:!0}}(),b.requirejs=a,b.require=c,b.define=d}}(),b.define("almond",function(){}),b.define("jquery",[],function(){var b=a||$;return null==b&&console&&console.error&&console.error("Select2: An instance of jQuery or a jQuery-compatible library was not found. Make sure that you are including jQuery before Select2 on your web page."),b}),b.define("select2/utils",["jquery"],function(a){function b(a){var b=a.prototype,c=[];for(var d in b){var e=b[d];"function"==typeof e&&"constructor"!==d&&c.push(d)}return c}var c={};c.Extend=function(a,b){function c(){this.constructor=a}var d={}.hasOwnProperty;for(var e in b)d.call(b,e)&&(a[e]=b[e]);return c.prototype=b.prototype,a.prototype=new c,a.__super__=b.prototype,a},c.Decorate=function(a,c){function d(){var b=Array.prototype.unshift,d=c.prototype.constructor.length,e=a.prototype.constructor;d>0&&(b.call(arguments,a.prototype.constructor),e=c.prototype.constructor),e.apply(this,arguments)}function e(){this.constructor=d}var f=b(c),g=b(a);c.displayName=a.displayName,d.prototype=new e;for(var h=0;h<g.length;h++){var i=g[h];d.prototype[i]=a.prototype[i]}for(var j=(function(a){var b=function(){};a in d.prototype&&(b=d.prototype[a]);var e=c.prototype[a];return function(){var a=Array.prototype.unshift;return a.call(arguments,b),e.apply(this,arguments)}}),k=0;k<f.length;k++){var l=f[k];d.prototype[l]=j(l)}return d};var d=function(){this.listeners={}};return d.prototype.on=function(a,b){this.listeners=this.listeners||{},a in this.listeners?this.listeners[a].push(b):this.listeners[a]=[b]},d.prototype.trigger=function(a){var b=Array.prototype.slice,c=b.call(arguments,1);this.listeners=this.listeners||{},null==c&&(c=[]),0===c.length&&c.push({}),c[0]._type=a,a in this.listeners&&this.invoke(this.listeners[a],b.call(arguments,1)),"*"in this.listeners&&this.invoke(this.listeners["*"],arguments)},d.prototype.invoke=function(a,b){for(var c=0,d=a.length;d>c;c++)a[c].apply(this,b)},c.Observable=d,c.generateChars=function(a){for(var b="",c=0;a>c;c++){var d=Math.floor(36*Math.random());b+=d.toString(36)}return b},c.bind=function(a,b){return function(){a.apply(b,arguments)}},c._convertData=function(a){for(var b in a){var c=b.split("-"),d=a;if(1!==c.length){for(var e=0;e<c.length;e++){var f=c[e];f=f.substring(0,1).toLowerCase()+f.substring(1),f in d||(d[f]={}),e==c.length-1&&(d[f]=a[b]),d=d[f]}delete a[b]}}return a},c.hasScroll=function(b,c){var d=a(c),e=c.style.overflowX,f=c.style.overflowY;return e!==f||"hidden"!==f&&"visible"!==f?"scroll"===e||"scroll"===f?!0:d.innerHeight()<c.scrollHeight||d.innerWidth()<c.scrollWidth:!1},c.escapeMarkup=function(a){var b={"\\":"&#92;","&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#47;"};return"string"!=typeof a?a:String(a).replace(/[&<>"'\/\\]/g,function(a){return b[a]})},c.appendMany=function(b,c){if("1.7"===a.fn.jquery.substr(0,3)){var d=a();a.map(c,function(a){d=d.add(a)}),c=d}b.append(c)},c}),b.define("select2/results",["jquery","./utils"],function(a,b){function c(a,b,d){this.$element=a,this.data=d,this.options=b,c.__super__.constructor.call(this)}return b.Extend(c,b.Observable),c.prototype.render=function(){var b=a('<ul class="select2-results__options" role="tree"></ul>');return this.options.get("multiple")&&b.attr("aria-multiselectable","true"),this.$results=b,b},c.prototype.clear=function(){this.$results.empty()},c.prototype.displayMessage=function(b){var c=this.options.get("escapeMarkup");this.clear(),this.hideLoading();var d=a('<li role="treeitem" aria-live="assertive" class="select2-results__option"></li>'),e=this.options.get("translations").get(b.message);d.append(c(e(b.args))),d[0].className+=" select2-results__message",this.$results.append(d)},c.prototype.hideMessages=function(){this.$results.find(".select2-results__message").remove()},c.prototype.append=function(a){this.hideLoading();var b=[];if(null==a.results||0===a.results.length)return void(0===this.$results.children().length&&this.trigger("results:message",{message:"noResults"}));a.results=this.sort(a.results);for(var c=0;c<a.results.length;c++){var d=a.results[c],e=this.option(d);b.push(e)}this.$results.append(b)},c.prototype.position=function(a,b){var c=b.find(".select2-results");c.append(a)},c.prototype.sort=function(a){var b=this.options.get("sorter");return b(a)},c.prototype.highlightFirstItem=function(){var a=this.$results.find(".select2-results__option[aria-selected]"),b=a.filter("[aria-selected=true]");b.length>0?b.first().trigger("mouseenter"):a.first().trigger("mouseenter"),this.ensureHighlightVisible()},c.prototype.setClasses=function(){var b=this;this.data.current(function(c){var d=a.map(c,function(a){return a.id.toString()}),e=b.$results.find(".select2-results__option[aria-selected]");e.each(function(){var b=a(this),c=a.data(this,"data"),e=""+c.id;null!=c.element&&c.element.selected||null==c.element&&a.inArray(e,d)>-1?b.attr("aria-selected","true"):b.attr("aria-selected","false")})})},c.prototype.showLoading=function(a){this.hideLoading();var b=this.options.get("translations").get("searching"),c={disabled:!0,loading:!0,text:b(a)},d=this.option(c);d.className+=" loading-results",this.$results.prepend(d)},c.prototype.hideLoading=function(){this.$results.find(".loading-results").remove()},c.prototype.option=function(b){var c=document.createElement("li");c.className="select2-results__option";var d={role:"treeitem","aria-selected":"false"};b.disabled&&(delete d["aria-selected"],d["aria-disabled"]="true"),null==b.id&&delete d["aria-selected"],null!=b._resultId&&(c.id=b._resultId),b.title&&(c.title=b.title),b.children&&(d.role="group",d["aria-label"]=b.text,delete d["aria-selected"]);for(var e in d){var f=d[e];c.setAttribute(e,f)}if(b.children){var g=a(c),h=document.createElement("strong");h.className="select2-results__group";a(h);this.template(b,h);for(var i=[],j=0;j<b.children.length;j++){var k=b.children[j],l=this.option(k);i.push(l)}var m=a("<ul></ul>",{"class":"select2-results__options select2-results__options--nested"});m.append(i),g.append(h),g.append(m)}else this.template(b,c);return a.data(c,"data",b),c},c.prototype.bind=function(b,c){var d=this,e=b.id+"-results";this.$results.attr("id",e),b.on("results:all",function(a){d.clear(),d.append(a.data),b.isOpen()&&(d.setClasses(),d.highlightFirstItem())}),b.on("results:append",function(a){d.append(a.data),b.isOpen()&&d.setClasses()}),b.on("query",function(a){d.hideMessages(),d.showLoading(a)}),b.on("select",function(){b.isOpen()&&(d.setClasses(),d.highlightFirstItem())}),b.on("unselect",function(){b.isOpen()&&(d.setClasses(),d.highlightFirstItem())}),b.on("open",function(){d.$results.attr("aria-expanded","true"),d.$results.attr("aria-hidden","false"),d.setClasses(),d.ensureHighlightVisible()}),b.on("close",function(){d.$results.attr("aria-expanded","false"),d.$results.attr("aria-hidden","true"),d.$results.removeAttr("aria-activedescendant")}),b.on("results:toggle",function(){var a=d.getHighlightedResults();0!==a.length&&a.trigger("mouseup")}),b.on("results:select",function(){var a=d.getHighlightedResults();if(0!==a.length){var b=a.data("data");"true"==a.attr("aria-selected")?d.trigger("close",{}):d.trigger("select",{data:b})}}),b.on("results:previous",function(){var a=d.getHighlightedResults(),b=d.$results.find("[aria-selected]"),c=b.index(a);if(0!==c){var e=c-1;0===a.length&&(e=0);var f=b.eq(e);f.trigger("mouseenter");var g=d.$results.offset().top,h=f.offset().top,i=d.$results.scrollTop()+(h-g);0===e?d.$results.scrollTop(0):0>h-g&&d.$results.scrollTop(i)}}),b.on("results:next",function(){var a=d.getHighlightedResults(),b=d.$results.find("[aria-selected]"),c=b.index(a),e=c+1;if(!(e>=b.length)){var f=b.eq(e);f.trigger("mouseenter");var g=d.$results.offset().top+d.$results.outerHeight(!1),h=f.offset().top+f.outerHeight(!1),i=d.$results.scrollTop()+h-g;0===e?d.$results.scrollTop(0):h>g&&d.$results.scrollTop(i)}}),b.on("results:focus",function(a){a.element.addClass("select2-results__option--highlighted")}),b.on("results:message",function(a){d.displayMessage(a)}),a.fn.mousewheel&&this.$results.on("mousewheel",function(a){var b=d.$results.scrollTop(),c=d.$results.get(0).scrollHeight-b+a.deltaY,e=a.deltaY>0&&b-a.deltaY<=0,f=a.deltaY<0&&c<=d.$results.height();e?(d.$results.scrollTop(0),a.preventDefault(),a.stopPropagation()):f&&(d.$results.scrollTop(d.$results.get(0).scrollHeight-d.$results.height()),a.preventDefault(),a.stopPropagation())}),this.$results.on("mouseup",".select2-results__option[aria-selected]",function(b){var c=a(this),e=c.data("data");return"true"===c.attr("aria-selected")?void(d.options.get("multiple")?d.trigger("unselect",{originalEvent:b,data:e}):d.trigger("close",{})):void d.trigger("select",{originalEvent:b,data:e})}),this.$results.on("mouseenter",".select2-results__option[aria-selected]",function(b){var c=a(this).data("data");d.getHighlightedResults().removeClass("select2-results__option--highlighted"),d.trigger("results:focus",{data:c,element:a(this)})})},c.prototype.getHighlightedResults=function(){var a=this.$results.find(".select2-results__option--highlighted");return a},c.prototype.destroy=function(){this.$results.remove()},c.prototype.ensureHighlightVisible=function(){var a=this.getHighlightedResults();if(0!==a.length){var b=this.$results.find("[aria-selected]"),c=b.index(a),d=this.$results.offset().top,e=a.offset().top,f=this.$results.scrollTop()+(e-d),g=e-d;f-=2*a.outerHeight(!1),2>=c?this.$results.scrollTop(0):(g>this.$results.outerHeight()||0>g)&&this.$results.scrollTop(f)}},c.prototype.template=function(b,c){var d=this.options.get("templateResult"),e=this.options.get("escapeMarkup"),f=d(b,c);null==f?c.style.display="none":"string"==typeof f?c.innerHTML=e(f):a(c).append(f)},c}),b.define("select2/keys",[],function(){var a={BACKSPACE:8,TAB:9,ENTER:13,SHIFT:16,CTRL:17,ALT:18,ESC:27,SPACE:32,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,LEFT:37,UP:38,RIGHT:39,DOWN:40,DELETE:46};return a}),b.define("select2/selection/base",["jquery","../utils","../keys"],function(a,b,c){function d(a,b){this.$element=a,this.options=b,d.__super__.constructor.call(this)}return b.Extend(d,b.Observable),d.prototype.render=function(){var b=a('<span class="select2-selection" role="combobox"  aria-haspopup="true" aria-expanded="false"></span>');return this._tabindex=0,null!=this.$element.data("old-tabindex")?this._tabindex=this.$element.data("old-tabindex"):null!=this.$element.attr("tabindex")&&(this._tabindex=this.$element.attr("tabindex")),b.attr("title",this.$element.attr("title")),b.attr("tabindex",this._tabindex),this.$selection=b,b},d.prototype.bind=function(a,b){var d=this,e=(a.id+"-container",a.id+"-results");this.container=a,this.$selection.on("focus",function(a){d.trigger("focus",a)}),this.$selection.on("blur",function(a){d._handleBlur(a)}),this.$selection.on("keydown",function(a){d.trigger("keypress",a),a.which===c.SPACE&&a.preventDefault()}),a.on("results:focus",function(a){d.$selection.attr("aria-activedescendant",a.data._resultId)}),a.on("selection:update",function(a){d.update(a.data)}),a.on("open",function(){d.$selection.attr("aria-expanded","true"),d.$selection.attr("aria-owns",e),d._attachCloseHandler(a)}),a.on("close",function(){d.$selection.attr("aria-expanded","false"),d.$selection.removeAttr("aria-activedescendant"),d.$selection.removeAttr("aria-owns"),d.$selection.focus(),d._detachCloseHandler(a)}),a.on("enable",function(){d.$selection.attr("tabindex",d._tabindex)}),a.on("disable",function(){d.$selection.attr("tabindex","-1")})},d.prototype._handleBlur=function(b){var c=this;window.setTimeout(function(){document.activeElement==c.$selection[0]||a.contains(c.$selection[0],document.activeElement)||c.trigger("blur",b)},1)},d.prototype._attachCloseHandler=function(b){a(document.body).on("mousedown.select2."+b.id,function(b){var c=a(b.target),d=c.closest(".select2"),e=a(".select2.select2-container--open");e.each(function(){var b=a(this);if(this!=d[0]){var c=b.data("element");c.select2("close")}})})},d.prototype._detachCloseHandler=function(b){a(document.body).off("mousedown.select2."+b.id)},d.prototype.position=function(a,b){var c=b.find(".selection");c.append(a)},d.prototype.destroy=function(){this._detachCloseHandler(this.container)},d.prototype.update=function(a){throw new Error("The `update` method must be defined in child classes.")},d}),b.define("select2/selection/single",["jquery","./base","../utils","../keys"],function(a,b,c,d){function e(){e.__super__.constructor.apply(this,arguments)}return c.Extend(e,b),e.prototype.render=function(){var a=e.__super__.render.call(this);return a.addClass("select2-selection--single"),a.html('<span class="select2-selection__rendered"></span><span class="select2-selection__arrow" role="presentation"><b role="presentation"></b></span>'),a},e.prototype.bind=function(a,b){var c=this;e.__super__.bind.apply(this,arguments);var d=a.id+"-container";this.$selection.find(".select2-selection__rendered").attr("id",d),this.$selection.attr("aria-labelledby",d),this.$selection.on("mousedown",function(a){1===a.which&&c.trigger("toggle",{originalEvent:a})}),this.$selection.on("focus",function(a){}),this.$selection.on("blur",function(a){}),a.on("focus",function(b){a.isOpen()||c.$selection.focus()}),a.on("selection:update",function(a){c.update(a.data)})},e.prototype.clear=function(){this.$selection.find(".select2-selection__rendered").empty()},e.prototype.display=function(a,b){var c=this.options.get("templateSelection"),d=this.options.get("escapeMarkup");return d(c(a,b))},e.prototype.selectionContainer=function(){return a("<span></span>")},e.prototype.update=function(a){if(0===a.length)return void this.clear();var b=a[0],c=this.$selection.find(".select2-selection__rendered"),d=this.display(b,c);c.empty().append(d),c.prop("title",b.title||b.text)},e}),b.define("select2/selection/multiple",["jquery","./base","../utils"],function(a,b,c){function d(a,b){d.__super__.constructor.apply(this,arguments)}return c.Extend(d,b),d.prototype.render=function(){var a=d.__super__.render.call(this);return a.addClass("select2-selection--multiple"),a.html('<ul class="select2-selection__rendered"></ul>'),a},d.prototype.bind=function(b,c){var e=this;d.__super__.bind.apply(this,arguments),this.$selection.on("click",function(a){e.trigger("toggle",{originalEvent:a})}),this.$selection.on("click",".select2-selection__choice__remove",function(b){if(!e.options.get("disabled")){var c=a(this),d=c.parent(),f=d.data("data");e.trigger("unselect",{originalEvent:b,data:f})}})},d.prototype.clear=function(){this.$selection.find(".select2-selection__rendered").empty()},d.prototype.display=function(a,b){var c=this.options.get("templateSelection"),d=this.options.get("escapeMarkup");return d(c(a,b))},d.prototype.selectionContainer=function(){var b=a('<li class="select2-selection__choice"><span class="select2-selection__choice__remove" role="presentation">&times;</span></li>');return b},d.prototype.update=function(a){if(this.clear(),0!==a.length){for(var b=[],d=0;d<a.length;d++){var e=a[d],f=this.selectionContainer(),g=this.display(e,f);f.append(g),f.prop("title",e.title||e.text),f.data("data",e),b.push(f)}var h=this.$selection.find(".select2-selection__rendered");c.appendMany(h,b)}},d}),b.define("select2/selection/placeholder",["../utils"],function(a){function b(a,b,c){this.placeholder=this.normalizePlaceholder(c.get("placeholder")),a.call(this,b,c)}return b.prototype.normalizePlaceholder=function(a,b){return"string"==typeof b&&(b={id:"",text:b}),b},b.prototype.createPlaceholder=function(a,b){var c=this.selectionContainer();return c.html(this.display(b)),c.addClass("select2-selection__placeholder").removeClass("select2-selection__choice"),c},b.prototype.update=function(a,b){var c=1==b.length&&b[0].id!=this.placeholder.id,d=b.length>1;if(d||c)return a.call(this,b);this.clear();var e=this.createPlaceholder(this.placeholder);this.$selection.find(".select2-selection__rendered").append(e)},b}),b.define("select2/selection/allowClear",["jquery","../keys"],function(a,b){function c(){}return c.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),null==this.placeholder&&this.options.get("debug")&&window.console&&console.error&&console.error("Select2: The `allowClear` option should be used in combination with the `placeholder` option."),this.$selection.on("mousedown",".select2-selection__clear",function(a){d._handleClear(a)}),b.on("keypress",function(a){d._handleKeyboardClear(a,b)})},c.prototype._handleClear=function(a,b){if(!this.options.get("disabled")){var c=this.$selection.find(".select2-selection__clear");if(0!==c.length){b.stopPropagation();for(var d=c.data("data"),e=0;e<d.length;e++){var f={data:d[e]};if(this.trigger("unselect",f),f.prevented)return}this.$element.val(this.placeholder.id).trigger("change"),this.trigger("toggle",{})}}},c.prototype._handleKeyboardClear=function(a,c,d){d.isOpen()||(c.which==b.DELETE||c.which==b.BACKSPACE)&&this._handleClear(c)},c.prototype.update=function(b,c){if(b.call(this,c),!(this.$selection.find(".select2-selection__placeholder").length>0||0===c.length)){var d=a('<span class="select2-selection__clear">&times;</span>');d.data("data",c),this.$selection.find(".select2-selection__rendered").prepend(d)}},c}),b.define("select2/selection/search",["jquery","../utils","../keys"],function(a,b,c){function d(a,b,c){a.call(this,b,c)}return d.prototype.render=function(b){var c=a('<li class="select2-search select2-search--inline"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" role="textbox" aria-autocomplete="list" /></li>');this.$searchContainer=c,this.$search=c.find("input");var d=b.call(this);return this._transferTabIndex(),d},d.prototype.bind=function(a,b,d){var e=this;a.call(this,b,d),b.on("open",function(){e.$search.trigger("focus")}),b.on("close",function(){e.$search.val(""),e.$search.removeAttr("aria-activedescendant"),e.$search.trigger("focus")}),b.on("enable",function(){e.$search.prop("disabled",!1),e._transferTabIndex()}),b.on("disable",function(){e.$search.prop("disabled",!0)}),b.on("focus",function(a){e.$search.trigger("focus")}),b.on("results:focus",function(a){e.$search.attr("aria-activedescendant",a.id)}),this.$selection.on("focusin",".select2-search--inline",function(a){e.trigger("focus",a)}),this.$selection.on("focusout",".select2-search--inline",function(a){e._handleBlur(a)}),this.$selection.on("keydown",".select2-search--inline",function(a){a.stopPropagation(),e.trigger("keypress",a),e._keyUpPrevented=a.isDefaultPrevented();var b=a.which;if(b===c.BACKSPACE&&""===e.$search.val()){var d=e.$searchContainer.prev(".select2-selection__choice");if(d.length>0){var f=d.data("data");e.searchRemoveChoice(f),a.preventDefault()}}});var f=document.documentMode,g=f&&11>=f;this.$selection.on("input.searchcheck",".select2-search--inline",function(a){return g?void e.$selection.off("input.search input.searchcheck"):void e.$selection.off("keyup.search")}),this.$selection.on("keyup.search input.search",".select2-search--inline",function(a){if(g&&"input"===a.type)return void e.$selection.off("input.search input.searchcheck");var b=a.which;b!=c.SHIFT&&b!=c.CTRL&&b!=c.ALT&&b!=c.TAB&&e.handleSearch(a)})},d.prototype._transferTabIndex=function(a){this.$search.attr("tabindex",this.$selection.attr("tabindex")),this.$selection.attr("tabindex","-1")},d.prototype.createPlaceholder=function(a,b){this.$search.attr("placeholder",b.text)},d.prototype.update=function(a,b){var c=this.$search[0]==document.activeElement;this.$search.attr("placeholder",""),a.call(this,b),this.$selection.find(".select2-selection__rendered").append(this.$searchContainer),this.resizeSearch(),c&&this.$search.focus()},d.prototype.handleSearch=function(){if(this.resizeSearch(),!this._keyUpPrevented){var a=this.$search.val();this.trigger("query",{term:a})}this._keyUpPrevented=!1},d.prototype.searchRemoveChoice=function(a,b){this.trigger("unselect",{data:b}),this.$search.val(b.text),this.handleSearch()},d.prototype.resizeSearch=function(){this.$search.css("width","25px");var a="";if(""!==this.$search.attr("placeholder"))a=this.$selection.find(".select2-selection__rendered").innerWidth();else{var b=this.$search.val().length+1;a=.75*b+"em"}this.$search.css("width",a)},d}),b.define("select2/selection/eventRelay",["jquery"],function(a){function b(){}return b.prototype.bind=function(b,c,d){var e=this,f=["open","opening","close","closing","select","selecting","unselect","unselecting"],g=["opening","closing","selecting","unselecting"];b.call(this,c,d),c.on("*",function(b,c){if(-1!==a.inArray(b,f)){c=c||{};var d=a.Event("select2:"+b,{params:c});e.$element.trigger(d),-1!==a.inArray(b,g)&&(c.prevented=d.isDefaultPrevented())}})},b}),b.define("select2/translation",["jquery","require"],function(a,b){function c(a){this.dict=a||{}}return c.prototype.all=function(){return this.dict},c.prototype.get=function(a){return this.dict[a]},c.prototype.extend=function(b){this.dict=a.extend({},b.all(),this.dict)},c._cache={},c.loadPath=function(a){if(!(a in c._cache)){var d=b(a);c._cache[a]=d}return new c(c._cache[a])},c}),b.define("select2/diacritics",[],function(){var a={"Ⓐ":"A","Ａ":"A","À":"A","Á":"A","Â":"A","Ầ":"A","Ấ":"A","Ẫ":"A","Ẩ":"A","Ã":"A","Ā":"A","Ă":"A","Ằ":"A","Ắ":"A","Ẵ":"A","Ẳ":"A","Ȧ":"A","Ǡ":"A","Ä":"A","Ǟ":"A","Ả":"A","Å":"A","Ǻ":"A","Ǎ":"A","Ȁ":"A","Ȃ":"A","Ạ":"A","Ậ":"A","Ặ":"A","Ḁ":"A","Ą":"A","Ⱥ":"A","Ɐ":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ⓑ":"B","Ｂ":"B","Ḃ":"B","Ḅ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","Ɓ":"B","Ⓒ":"C","Ｃ":"C","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","Ç":"C","Ḉ":"C","Ƈ":"C","Ȼ":"C","Ꜿ":"C","Ⓓ":"D","Ｄ":"D","Ḋ":"D","Ď":"D","Ḍ":"D","Ḑ":"D","Ḓ":"D","Ḏ":"D","Đ":"D","Ƌ":"D","Ɗ":"D","Ɖ":"D","Ꝺ":"D","DZ":"DZ","DŽ":"DZ","Dz":"Dz","Dž":"Dz","Ⓔ":"E","Ｅ":"E","È":"E","É":"E","Ê":"E","Ề":"E","Ế":"E","Ễ":"E","Ể":"E","Ẽ":"E","Ē":"E","Ḕ":"E","Ḗ":"E","Ĕ":"E","Ė":"E","Ë":"E","Ẻ":"E","Ě":"E","Ȅ":"E","Ȇ":"E","Ẹ":"E","Ệ":"E","Ȩ":"E","Ḝ":"E","Ę":"E","Ḙ":"E","Ḛ":"E","Ɛ":"E","Ǝ":"E","Ⓕ":"F","Ｆ":"F","Ḟ":"F","Ƒ":"F","Ꝼ":"F","Ⓖ":"G","Ｇ":"G","Ǵ":"G","Ĝ":"G","Ḡ":"G","Ğ":"G","Ġ":"G","Ǧ":"G","Ģ":"G","Ǥ":"G","Ɠ":"G","Ꞡ":"G","Ᵹ":"G","Ꝿ":"G","Ⓗ":"H","Ｈ":"H","Ĥ":"H","Ḣ":"H","Ḧ":"H","Ȟ":"H","Ḥ":"H","Ḩ":"H","Ḫ":"H","Ħ":"H","Ⱨ":"H","Ⱶ":"H","Ɥ":"H","Ⓘ":"I","Ｉ":"I","Ì":"I","Í":"I","Î":"I","Ĩ":"I","Ī":"I","Ĭ":"I","İ":"I","Ï":"I","Ḯ":"I","Ỉ":"I","Ǐ":"I","Ȉ":"I","Ȋ":"I","Ị":"I","Į":"I","Ḭ":"I","Ɨ":"I","Ⓙ":"J","Ｊ":"J","Ĵ":"J","Ɉ":"J","Ⓚ":"K","Ｋ":"K","Ḱ":"K","Ǩ":"K","Ḳ":"K","Ķ":"K","Ḵ":"K","Ƙ":"K","Ⱪ":"K","Ꝁ":"K","Ꝃ":"K","Ꝅ":"K","Ꞣ":"K","Ⓛ":"L","Ｌ":"L","Ŀ":"L","Ĺ":"L","Ľ":"L","Ḷ":"L","Ḹ":"L","Ļ":"L","Ḽ":"L","Ḻ":"L","Ł":"L","Ƚ":"L","Ɫ":"L","Ⱡ":"L","Ꝉ":"L","Ꝇ":"L","Ꞁ":"L","LJ":"LJ","Lj":"Lj","Ⓜ":"M","Ｍ":"M","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ɯ":"M","Ⓝ":"N","Ｎ":"N","Ǹ":"N","Ń":"N","Ñ":"N","Ṅ":"N","Ň":"N","Ṇ":"N","Ņ":"N","Ṋ":"N","Ṉ":"N","Ƞ":"N","Ɲ":"N","Ꞑ":"N","Ꞥ":"N","NJ":"NJ","Nj":"Nj","Ⓞ":"O","Ｏ":"O","Ò":"O","Ó":"O","Ô":"O","Ồ":"O","Ố":"O","Ỗ":"O","Ổ":"O","Õ":"O","Ṍ":"O","Ȭ":"O","Ṏ":"O","Ō":"O","Ṑ":"O","Ṓ":"O","Ŏ":"O","Ȯ":"O","Ȱ":"O","Ö":"O","Ȫ":"O","Ỏ":"O","Ő":"O","Ǒ":"O","Ȍ":"O","Ȏ":"O","Ơ":"O","Ờ":"O","Ớ":"O","Ỡ":"O","Ở":"O","Ợ":"O","Ọ":"O","Ộ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Ɔ":"O","Ɵ":"O","Ꝋ":"O","Ꝍ":"O","Ƣ":"OI","Ꝏ":"OO","Ȣ":"OU","Ⓟ":"P","Ｐ":"P","Ṕ":"P","Ṗ":"P","Ƥ":"P","Ᵽ":"P","Ꝑ":"P","Ꝓ":"P","Ꝕ":"P","Ⓠ":"Q","Ｑ":"Q","Ꝗ":"Q","Ꝙ":"Q","Ɋ":"Q","Ⓡ":"R","Ｒ":"R","Ŕ":"R","Ṙ":"R","Ř":"R","Ȑ":"R","Ȓ":"R","Ṛ":"R","Ṝ":"R","Ŗ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","Ꝛ":"R","Ꞧ":"R","Ꞃ":"R","Ⓢ":"S","Ｓ":"S","ẞ":"S","Ś":"S","Ṥ":"S","Ŝ":"S","Ṡ":"S","Š":"S","Ṧ":"S","Ṣ":"S","Ṩ":"S","Ș":"S","Ş":"S","Ȿ":"S","Ꞩ":"S","Ꞅ":"S","Ⓣ":"T","Ｔ":"T","Ṫ":"T","Ť":"T","Ṭ":"T","Ț":"T","Ţ":"T","Ṱ":"T","Ṯ":"T","Ŧ":"T","Ƭ":"T","Ʈ":"T","Ⱦ":"T","Ꞇ":"T","Ꜩ":"TZ","Ⓤ":"U","Ｕ":"U","Ù":"U","Ú":"U","Û":"U","Ũ":"U","Ṹ":"U","Ū":"U","Ṻ":"U","Ŭ":"U","Ü":"U","Ǜ":"U","Ǘ":"U","Ǖ":"U","Ǚ":"U","Ủ":"U","Ů":"U","Ű":"U","Ǔ":"U","Ȕ":"U","Ȗ":"U","Ư":"U","Ừ":"U","Ứ":"U","Ữ":"U","Ử":"U","Ự":"U","Ụ":"U","Ṳ":"U","Ų":"U","Ṷ":"U","Ṵ":"U","Ʉ":"U","Ⓥ":"V","Ｖ":"V","Ṽ":"V","Ṿ":"V","Ʋ":"V","Ꝟ":"V","Ʌ":"V","Ꝡ":"VY","Ⓦ":"W","Ｗ":"W","Ẁ":"W","Ẃ":"W","Ŵ":"W","Ẇ":"W","Ẅ":"W","Ẉ":"W","Ⱳ":"W","Ⓧ":"X","Ｘ":"X","Ẋ":"X","Ẍ":"X","Ⓨ":"Y","Ｙ":"Y","Ỳ":"Y","Ý":"Y","Ŷ":"Y","Ỹ":"Y","Ȳ":"Y","Ẏ":"Y","Ÿ":"Y","Ỷ":"Y","Ỵ":"Y","Ƴ":"Y","Ɏ":"Y","Ỿ":"Y","Ⓩ":"Z","Ｚ":"Z","Ź":"Z","Ẑ":"Z","Ż":"Z","Ž":"Z","Ẓ":"Z","Ẕ":"Z","Ƶ":"Z","Ȥ":"Z","Ɀ":"Z","Ⱬ":"Z","Ꝣ":"Z","ⓐ":"a","ａ":"a","ẚ":"a","à":"a","á":"a","â":"a","ầ":"a","ấ":"a","ẫ":"a","ẩ":"a","ã":"a","ā":"a","ă":"a","ằ":"a","ắ":"a","ẵ":"a","ẳ":"a","ȧ":"a","ǡ":"a","ä":"a","ǟ":"a","ả":"a","å":"a","ǻ":"a","ǎ":"a","ȁ":"a","ȃ":"a","ạ":"a","ậ":"a","ặ":"a","ḁ":"a","ą":"a","ⱥ":"a","ɐ":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ⓑ":"b","ｂ":"b","ḃ":"b","ḅ":"b","ḇ":"b","ƀ":"b","ƃ":"b","ɓ":"b","ⓒ":"c","ｃ":"c","ć":"c","ĉ":"c","ċ":"c","č":"c","ç":"c","ḉ":"c","ƈ":"c","ȼ":"c","ꜿ":"c","ↄ":"c","ⓓ":"d","ｄ":"d","ḋ":"d","ď":"d","ḍ":"d","ḑ":"d","ḓ":"d","ḏ":"d","đ":"d","ƌ":"d","ɖ":"d","ɗ":"d","ꝺ":"d","dz":"dz","dž":"dz","ⓔ":"e","ｅ":"e","è":"e","é":"e","ê":"e","ề":"e","ế":"e","ễ":"e","ể":"e","ẽ":"e","ē":"e","ḕ":"e","ḗ":"e","ĕ":"e","ė":"e","ë":"e","ẻ":"e","ě":"e","ȅ":"e","ȇ":"e","ẹ":"e","ệ":"e","ȩ":"e","ḝ":"e","ę":"e","ḙ":"e","ḛ":"e","ɇ":"e","ɛ":"e","ǝ":"e","ⓕ":"f","ｆ":"f","ḟ":"f","ƒ":"f","ꝼ":"f","ⓖ":"g","ｇ":"g","ǵ":"g","ĝ":"g","ḡ":"g","ğ":"g","ġ":"g","ǧ":"g","ģ":"g","ǥ":"g","ɠ":"g","ꞡ":"g","ᵹ":"g","ꝿ":"g","ⓗ":"h","ｈ":"h","ĥ":"h","ḣ":"h","ḧ":"h","ȟ":"h","ḥ":"h","ḩ":"h","ḫ":"h","ẖ":"h","ħ":"h","ⱨ":"h","ⱶ":"h","ɥ":"h","ƕ":"hv","ⓘ":"i","ｉ":"i","ì":"i","í":"i","î":"i","ĩ":"i","ī":"i","ĭ":"i","ï":"i","ḯ":"i","ỉ":"i","ǐ":"i","ȉ":"i","ȋ":"i","ị":"i","į":"i","ḭ":"i","ɨ":"i","ı":"i","ⓙ":"j","ｊ":"j","ĵ":"j","ǰ":"j","ɉ":"j","ⓚ":"k","ｋ":"k","ḱ":"k","ǩ":"k","ḳ":"k","ķ":"k","ḵ":"k","ƙ":"k","ⱪ":"k","ꝁ":"k","ꝃ":"k","ꝅ":"k","ꞣ":"k","ⓛ":"l","ｌ":"l","ŀ":"l","ĺ":"l","ľ":"l","ḷ":"l","ḹ":"l","ļ":"l","ḽ":"l","ḻ":"l","ſ":"l","ł":"l","ƚ":"l","ɫ":"l","ⱡ":"l","ꝉ":"l","ꞁ":"l","ꝇ":"l","lj":"lj","ⓜ":"m","ｍ":"m","ḿ":"m","ṁ":"m","ṃ":"m","ɱ":"m","ɯ":"m","ⓝ":"n","ｎ":"n","ǹ":"n","ń":"n","ñ":"n","ṅ":"n","ň":"n","ṇ":"n","ņ":"n","ṋ":"n","ṉ":"n","ƞ":"n","ɲ":"n","ʼn":"n","ꞑ":"n","ꞥ":"n","nj":"nj","ⓞ":"o","ｏ":"o","ò":"o","ó":"o","ô":"o","ồ":"o","ố":"o","ỗ":"o","ổ":"o","õ":"o","ṍ":"o","ȭ":"o","ṏ":"o","ō":"o","ṑ":"o","ṓ":"o","ŏ":"o","ȯ":"o","ȱ":"o","ö":"o","ȫ":"o","ỏ":"o","ő":"o","ǒ":"o","ȍ":"o","ȏ":"o","ơ":"o","ờ":"o","ớ":"o","ỡ":"o","ở":"o","ợ":"o","ọ":"o","ộ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","ɔ":"o","ꝋ":"o","ꝍ":"o","ɵ":"o","ƣ":"oi","ȣ":"ou","ꝏ":"oo","ⓟ":"p","ｐ":"p","ṕ":"p","ṗ":"p","ƥ":"p","ᵽ":"p","ꝑ":"p","ꝓ":"p","ꝕ":"p","ⓠ":"q","ｑ":"q","ɋ":"q","ꝗ":"q","ꝙ":"q","ⓡ":"r","ｒ":"r","ŕ":"r","ṙ":"r","ř":"r","ȑ":"r","ȓ":"r","ṛ":"r","ṝ":"r","ŗ":"r","ṟ":"r","ɍ":"r","ɽ":"r","ꝛ":"r","ꞧ":"r","ꞃ":"r","ⓢ":"s","ｓ":"s","ß":"s","ś":"s","ṥ":"s","ŝ":"s","ṡ":"s","š":"s","ṧ":"s","ṣ":"s","ṩ":"s","ș":"s","ş":"s","ȿ":"s","ꞩ":"s","ꞅ":"s","ẛ":"s","ⓣ":"t","ｔ":"t","ṫ":"t","ẗ":"t","ť":"t","ṭ":"t","ț":"t","ţ":"t","ṱ":"t","ṯ":"t","ŧ":"t","ƭ":"t","ʈ":"t","ⱦ":"t","ꞇ":"t","ꜩ":"tz","ⓤ":"u","ｕ":"u","ù":"u","ú":"u","û":"u","ũ":"u","ṹ":"u","ū":"u","ṻ":"u","ŭ":"u","ü":"u","ǜ":"u","ǘ":"u","ǖ":"u","ǚ":"u","ủ":"u","ů":"u","ű":"u","ǔ":"u","ȕ":"u","ȗ":"u","ư":"u","ừ":"u","ứ":"u","ữ":"u","ử":"u","ự":"u","ụ":"u","ṳ":"u","ų":"u","ṷ":"u","ṵ":"u","ʉ":"u","ⓥ":"v","ｖ":"v","ṽ":"v","ṿ":"v","ʋ":"v","ꝟ":"v","ʌ":"v","ꝡ":"vy","ⓦ":"w","ｗ":"w","ẁ":"w","ẃ":"w","ŵ":"w","ẇ":"w","ẅ":"w","ẘ":"w","ẉ":"w","ⱳ":"w","ⓧ":"x","ｘ":"x","ẋ":"x","ẍ":"x","ⓨ":"y","ｙ":"y","ỳ":"y","ý":"y","ŷ":"y","ỹ":"y","ȳ":"y","ẏ":"y","ÿ":"y","ỷ":"y","ẙ":"y","ỵ":"y","ƴ":"y","ɏ":"y","ỿ":"y","ⓩ":"z","ｚ":"z","ź":"z","ẑ":"z","ż":"z","ž":"z","ẓ":"z","ẕ":"z","ƶ":"z","ȥ":"z","ɀ":"z","ⱬ":"z","ꝣ":"z","Ά":"Α","Έ":"Ε","Ή":"Η","Ί":"Ι","Ϊ":"Ι","Ό":"Ο","Ύ":"Υ","Ϋ":"Υ","Ώ":"Ω","ά":"α","έ":"ε","ή":"η","ί":"ι","ϊ":"ι","ΐ":"ι","ό":"ο","ύ":"υ","ϋ":"υ","ΰ":"υ","ω":"ω","ς":"σ"};return a}),b.define("select2/data/base",["../utils"],function(a){function b(a,c){b.__super__.constructor.call(this)}return a.Extend(b,a.Observable),b.prototype.current=function(a){throw new Error("The `current` method must be defined in child classes.")},b.prototype.query=function(a,b){throw new Error("The `query` method must be defined in child classes.")},b.prototype.bind=function(a,b){},b.prototype.destroy=function(){},b.prototype.generateResultId=function(b,c){var d=b.id+"-result-";return d+=a.generateChars(4),d+=null!=c.id?"-"+c.id.toString():"-"+a.generateChars(4)},b}),b.define("select2/data/select",["./base","../utils","jquery"],function(a,b,c){function d(a,b){this.$element=a,this.options=b,d.__super__.constructor.call(this)}return b.Extend(d,a),d.prototype.current=function(a){var b=[],d=this;this.$element.find(":selected").each(function(){var a=c(this),e=d.item(a);b.push(e)}),a(b)},d.prototype.select=function(a){var b=this;if(a.selected=!0,c(a.element).is("option"))return a.element.selected=!0,void this.$element.trigger("change");
+if(this.$element.prop("multiple"))this.current(function(d){var e=[];a=[a],a.push.apply(a,d);for(var f=0;f<a.length;f++){var g=a[f].id;-1===c.inArray(g,e)&&e.push(g)}b.$element.val(e),b.$element.trigger("change")});else{var d=a.id;this.$element.val(d),this.$element.trigger("change")}},d.prototype.unselect=function(a){var b=this;if(this.$element.prop("multiple"))return a.selected=!1,c(a.element).is("option")?(a.element.selected=!1,void this.$element.trigger("change")):void this.current(function(d){for(var e=[],f=0;f<d.length;f++){var g=d[f].id;g!==a.id&&-1===c.inArray(g,e)&&e.push(g)}b.$element.val(e),b.$element.trigger("change")})},d.prototype.bind=function(a,b){var c=this;this.container=a,a.on("select",function(a){c.select(a.data)}),a.on("unselect",function(a){c.unselect(a.data)})},d.prototype.destroy=function(){this.$element.find("*").each(function(){c.removeData(this,"data")})},d.prototype.query=function(a,b){var d=[],e=this,f=this.$element.children();f.each(function(){var b=c(this);if(b.is("option")||b.is("optgroup")){var f=e.item(b),g=e.matches(a,f);null!==g&&d.push(g)}}),b({results:d})},d.prototype.addOptions=function(a){b.appendMany(this.$element,a)},d.prototype.option=function(a){var b;a.children?(b=document.createElement("optgroup"),b.label=a.text):(b=document.createElement("option"),void 0!==b.textContent?b.textContent=a.text:b.innerText=a.text),a.id&&(b.value=a.id),a.disabled&&(b.disabled=!0),a.selected&&(b.selected=!0),a.title&&(b.title=a.title);var d=c(b),e=this._normalizeItem(a);return e.element=b,c.data(b,"data",e),d},d.prototype.item=function(a){var b={};if(b=c.data(a[0],"data"),null!=b)return b;if(a.is("option"))b={id:a.val(),text:a.text(),disabled:a.prop("disabled"),selected:a.prop("selected"),title:a.prop("title")};else if(a.is("optgroup")){b={text:a.prop("label"),children:[],title:a.prop("title")};for(var d=a.children("option"),e=[],f=0;f<d.length;f++){var g=c(d[f]),h=this.item(g);e.push(h)}b.children=e}return b=this._normalizeItem(b),b.element=a[0],c.data(a[0],"data",b),b},d.prototype._normalizeItem=function(a){c.isPlainObject(a)||(a={id:a,text:a}),a=c.extend({},{text:""},a);var b={selected:!1,disabled:!1};return null!=a.id&&(a.id=a.id.toString()),null!=a.text&&(a.text=a.text.toString()),null==a._resultId&&a.id&&null!=this.container&&(a._resultId=this.generateResultId(this.container,a)),c.extend({},b,a)},d.prototype.matches=function(a,b){var c=this.options.get("matcher");return c(a,b)},d}),b.define("select2/data/array",["./select","../utils","jquery"],function(a,b,c){function d(a,b){var c=b.get("data")||[];d.__super__.constructor.call(this,a,b),this.addOptions(this.convertToOptions(c))}return b.Extend(d,a),d.prototype.select=function(a){var b=this.$element.find("option").filter(function(b,c){return c.value==a.id.toString()});0===b.length&&(b=this.option(a),this.addOptions(b)),d.__super__.select.call(this,a)},d.prototype.convertToOptions=function(a){function d(a){return function(){return c(this).val()==a.id}}for(var e=this,f=this.$element.find("option"),g=f.map(function(){return e.item(c(this)).id}).get(),h=[],i=0;i<a.length;i++){var j=this._normalizeItem(a[i]);if(c.inArray(j.id,g)>=0){var k=f.filter(d(j)),l=this.item(k),m=c.extend(!0,{},j,l),n=this.option(m);k.replaceWith(n)}else{var o=this.option(j);if(j.children){var p=this.convertToOptions(j.children);b.appendMany(o,p)}h.push(o)}}return h},d}),b.define("select2/data/ajax",["./array","../utils","jquery"],function(a,b,c){function d(a,b){this.ajaxOptions=this._applyDefaults(b.get("ajax")),null!=this.ajaxOptions.processResults&&(this.processResults=this.ajaxOptions.processResults),d.__super__.constructor.call(this,a,b)}return b.Extend(d,a),d.prototype._applyDefaults=function(a){var b={data:function(a){return c.extend({},a,{q:a.term})},transport:function(a,b,d){var e=c.ajax(a);return e.then(b),e.fail(d),e}};return c.extend({},b,a,!0)},d.prototype.processResults=function(a){return a},d.prototype.query=function(a,b){function d(){var d=f.transport(f,function(d){var f=e.processResults(d,a);e.options.get("debug")&&window.console&&console.error&&(f&&f.results&&c.isArray(f.results)||console.error("Select2: The AJAX results did not return an array in the `results` key of the response.")),b(f)},function(){d.status&&"0"===d.status||e.trigger("results:message",{message:"errorLoading"})});e._request=d}var e=this;null!=this._request&&(c.isFunction(this._request.abort)&&this._request.abort(),this._request=null);var f=c.extend({type:"GET"},this.ajaxOptions);"function"==typeof f.url&&(f.url=f.url.call(this.$element,a)),"function"==typeof f.data&&(f.data=f.data.call(this.$element,a)),this.ajaxOptions.delay&&null!=a.term?(this._queryTimeout&&window.clearTimeout(this._queryTimeout),this._queryTimeout=window.setTimeout(d,this.ajaxOptions.delay)):d()},d}),b.define("select2/data/tags",["jquery"],function(a){function b(b,c,d){var e=d.get("tags"),f=d.get("createTag");void 0!==f&&(this.createTag=f);var g=d.get("insertTag");if(void 0!==g&&(this.insertTag=g),b.call(this,c,d),a.isArray(e))for(var h=0;h<e.length;h++){var i=e[h],j=this._normalizeItem(i),k=this.option(j);this.$element.append(k)}}return b.prototype.query=function(a,b,c){function d(a,f){for(var g=a.results,h=0;h<g.length;h++){var i=g[h],j=null!=i.children&&!d({results:i.children},!0),k=i.text===b.term;if(k||j)return f?!1:(a.data=g,void c(a))}if(f)return!0;var l=e.createTag(b);if(null!=l){var m=e.option(l);m.attr("data-select2-tag",!0),e.addOptions([m]),e.insertTag(g,l)}a.results=g,c(a)}var e=this;return this._removeOldTags(),null==b.term||null!=b.page?void a.call(this,b,c):void a.call(this,b,d)},b.prototype.createTag=function(b,c){var d=a.trim(c.term);return""===d?null:{id:d,text:d}},b.prototype.insertTag=function(a,b,c){b.unshift(c)},b.prototype._removeOldTags=function(b){var c=(this._lastTag,this.$element.find("option[data-select2-tag]"));c.each(function(){this.selected||a(this).remove()})},b}),b.define("select2/data/tokenizer",["jquery"],function(a){function b(a,b,c){var d=c.get("tokenizer");void 0!==d&&(this.tokenizer=d),a.call(this,b,c)}return b.prototype.bind=function(a,b,c){a.call(this,b,c),this.$search=b.dropdown.$search||b.selection.$search||c.find(".select2-search__field")},b.prototype.query=function(b,c,d){function e(b){var c=g._normalizeItem(b),d=g.$element.find("option").filter(function(){return a(this).val()===c.id});if(!d.length){var e=g.option(c);e.attr("data-select2-tag",!0),g._removeOldTags(),g.addOptions([e])}f(c)}function f(a){g.trigger("select",{data:a})}var g=this;c.term=c.term||"";var h=this.tokenizer(c,this.options,e);h.term!==c.term&&(this.$search.length&&(this.$search.val(h.term),this.$search.focus()),c.term=h.term),b.call(this,c,d)},b.prototype.tokenizer=function(b,c,d,e){for(var f=d.get("tokenSeparators")||[],g=c.term,h=0,i=this.createTag||function(a){return{id:a.term,text:a.term}};h<g.length;){var j=g[h];if(-1!==a.inArray(j,f)){var k=g.substr(0,h),l=a.extend({},c,{term:k}),m=i(l);null!=m?(e(m),g=g.substr(h+1)||"",h=0):h++}else h++}return{term:g}},b}),b.define("select2/data/minimumInputLength",[],function(){function a(a,b,c){this.minimumInputLength=c.get("minimumInputLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){return b.term=b.term||"",b.term.length<this.minimumInputLength?void this.trigger("results:message",{message:"inputTooShort",args:{minimum:this.minimumInputLength,input:b.term,params:b}}):void a.call(this,b,c)},a}),b.define("select2/data/maximumInputLength",[],function(){function a(a,b,c){this.maximumInputLength=c.get("maximumInputLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){return b.term=b.term||"",this.maximumInputLength>0&&b.term.length>this.maximumInputLength?void this.trigger("results:message",{message:"inputTooLong",args:{maximum:this.maximumInputLength,input:b.term,params:b}}):void a.call(this,b,c)},a}),b.define("select2/data/maximumSelectionLength",[],function(){function a(a,b,c){this.maximumSelectionLength=c.get("maximumSelectionLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){var d=this;this.current(function(e){var f=null!=e?e.length:0;return d.maximumSelectionLength>0&&f>=d.maximumSelectionLength?void d.trigger("results:message",{message:"maximumSelected",args:{maximum:d.maximumSelectionLength}}):void a.call(d,b,c)})},a}),b.define("select2/dropdown",["jquery","./utils"],function(a,b){function c(a,b){this.$element=a,this.options=b,c.__super__.constructor.call(this)}return b.Extend(c,b.Observable),c.prototype.render=function(){var b=a('<span class="select2-dropdown"><span class="select2-results"></span></span>');return b.attr("dir",this.options.get("dir")),this.$dropdown=b,b},c.prototype.bind=function(){},c.prototype.position=function(a,b){},c.prototype.destroy=function(){this.$dropdown.remove()},c}),b.define("select2/dropdown/search",["jquery","../utils"],function(a,b){function c(){}return c.prototype.render=function(b){var c=b.call(this),d=a('<span class="select2-search select2-search--dropdown"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" role="textbox" /></span>');return this.$searchContainer=d,this.$search=d.find("input"),c.prepend(d),c},c.prototype.bind=function(b,c,d){var e=this;b.call(this,c,d),this.$search.on("keydown",function(a){e.trigger("keypress",a),e._keyUpPrevented=a.isDefaultPrevented()}),this.$search.on("input",function(b){a(this).off("keyup")}),this.$search.on("keyup input",function(a){e.handleSearch(a)}),c.on("open",function(){e.$search.attr("tabindex",0),e.$search.focus(),window.setTimeout(function(){e.$search.focus()},0)}),c.on("close",function(){e.$search.attr("tabindex",-1),e.$search.val("")}),c.on("focus",function(){c.isOpen()&&e.$search.focus()}),c.on("results:all",function(a){if(null==a.query.term||""===a.query.term){var b=e.showSearch(a);b?e.$searchContainer.removeClass("select2-search--hide"):e.$searchContainer.addClass("select2-search--hide")}})},c.prototype.handleSearch=function(a){if(!this._keyUpPrevented){var b=this.$search.val();this.trigger("query",{term:b})}this._keyUpPrevented=!1},c.prototype.showSearch=function(a,b){return!0},c}),b.define("select2/dropdown/hidePlaceholder",[],function(){function a(a,b,c,d){this.placeholder=this.normalizePlaceholder(c.get("placeholder")),a.call(this,b,c,d)}return a.prototype.append=function(a,b){b.results=this.removePlaceholder(b.results),a.call(this,b)},a.prototype.normalizePlaceholder=function(a,b){return"string"==typeof b&&(b={id:"",text:b}),b},a.prototype.removePlaceholder=function(a,b){for(var c=b.slice(0),d=b.length-1;d>=0;d--){var e=b[d];this.placeholder.id===e.id&&c.splice(d,1)}return c},a}),b.define("select2/dropdown/infiniteScroll",["jquery"],function(a){function b(a,b,c,d){this.lastParams={},a.call(this,b,c,d),this.$loadingMore=this.createLoadingMore(),this.loading=!1}return b.prototype.append=function(a,b){this.$loadingMore.remove(),this.loading=!1,a.call(this,b),this.showLoadingMore(b)&&this.$results.append(this.$loadingMore)},b.prototype.bind=function(b,c,d){var e=this;b.call(this,c,d),c.on("query",function(a){e.lastParams=a,e.loading=!0}),c.on("query:append",function(a){e.lastParams=a,e.loading=!0}),this.$results.on("scroll",function(){var b=a.contains(document.documentElement,e.$loadingMore[0]);if(!e.loading&&b){var c=e.$results.offset().top+e.$results.outerHeight(!1),d=e.$loadingMore.offset().top+e.$loadingMore.outerHeight(!1);c+50>=d&&e.loadMore()}})},b.prototype.loadMore=function(){this.loading=!0;var b=a.extend({},{page:1},this.lastParams);b.page++,this.trigger("query:append",b)},b.prototype.showLoadingMore=function(a,b){return b.pagination&&b.pagination.more},b.prototype.createLoadingMore=function(){var b=a('<li class="select2-results__option select2-results__option--load-more"role="treeitem" aria-disabled="true"></li>'),c=this.options.get("translations").get("loadingMore");return b.html(c(this.lastParams)),b},b}),b.define("select2/dropdown/attachBody",["jquery","../utils"],function(a,b){function c(b,c,d){this.$dropdownParent=d.get("dropdownParent")||a(document.body),b.call(this,c,d)}return c.prototype.bind=function(a,b,c){var d=this,e=!1;a.call(this,b,c),b.on("open",function(){d._showDropdown(),d._attachPositioningHandler(b),e||(e=!0,b.on("results:all",function(){d._positionDropdown(),d._resizeDropdown()}),b.on("results:append",function(){d._positionDropdown(),d._resizeDropdown()}))}),b.on("close",function(){d._hideDropdown(),d._detachPositioningHandler(b)}),this.$dropdownContainer.on("mousedown",function(a){a.stopPropagation()})},c.prototype.destroy=function(a){a.call(this),this.$dropdownContainer.remove()},c.prototype.position=function(a,b,c){b.attr("class",c.attr("class")),b.removeClass("select2"),b.addClass("select2-container--open"),b.css({position:"absolute",top:-999999}),this.$container=c},c.prototype.render=function(b){var c=a("<span></span>"),d=b.call(this);return c.append(d),this.$dropdownContainer=c,c},c.prototype._hideDropdown=function(a){this.$dropdownContainer.detach()},c.prototype._attachPositioningHandler=function(c,d){var e=this,f="scroll.select2."+d.id,g="resize.select2."+d.id,h="orientationchange.select2."+d.id,i=this.$container.parents().filter(b.hasScroll);i.each(function(){a(this).data("select2-scroll-position",{x:a(this).scrollLeft(),y:a(this).scrollTop()})}),i.on(f,function(b){var c=a(this).data("select2-scroll-position");a(this).scrollTop(c.y)}),a(window).on(f+" "+g+" "+h,function(a){e._positionDropdown(),e._resizeDropdown()})},c.prototype._detachPositioningHandler=function(c,d){var e="scroll.select2."+d.id,f="resize.select2."+d.id,g="orientationchange.select2."+d.id,h=this.$container.parents().filter(b.hasScroll);h.off(e),a(window).off(e+" "+f+" "+g)},c.prototype._positionDropdown=function(){var b=a(window),c=this.$dropdown.hasClass("select2-dropdown--above"),d=this.$dropdown.hasClass("select2-dropdown--below"),e=null,f=this.$container.offset();f.bottom=f.top+this.$container.outerHeight(!1);var g={height:this.$container.outerHeight(!1)};g.top=f.top,g.bottom=f.top+g.height;var h={height:this.$dropdown.outerHeight(!1)},i={top:b.scrollTop(),bottom:b.scrollTop()+b.height()},j=i.top<f.top-h.height,k=i.bottom>f.bottom+h.height,l={left:f.left,top:g.bottom},m=this.$dropdownParent;"static"===m.css("position")&&(m=m.offsetParent());var n=m.offset();l.top-=n.top,l.left-=n.left,c||d||(e="below"),k||!j||c?!j&&k&&c&&(e="below"):e="above",("above"==e||c&&"below"!==e)&&(l.top=g.top-n.top-h.height),null!=e&&(this.$dropdown.removeClass("select2-dropdown--below select2-dropdown--above").addClass("select2-dropdown--"+e),this.$container.removeClass("select2-container--below select2-container--above").addClass("select2-container--"+e)),this.$dropdownContainer.css(l)},c.prototype._resizeDropdown=function(){var a={width:this.$container.outerWidth(!1)+"px"};this.options.get("dropdownAutoWidth")&&(a.minWidth=a.width,a.position="relative",a.width="auto"),this.$dropdown.css(a)},c.prototype._showDropdown=function(a){this.$dropdownContainer.appendTo(this.$dropdownParent),this._positionDropdown(),this._resizeDropdown()},c}),b.define("select2/dropdown/minimumResultsForSearch",[],function(){function a(b){for(var c=0,d=0;d<b.length;d++){var e=b[d];e.children?c+=a(e.children):c++}return c}function b(a,b,c,d){this.minimumResultsForSearch=c.get("minimumResultsForSearch"),this.minimumResultsForSearch<0&&(this.minimumResultsForSearch=1/0),a.call(this,b,c,d)}return b.prototype.showSearch=function(b,c){return a(c.data.results)<this.minimumResultsForSearch?!1:b.call(this,c)},b}),b.define("select2/dropdown/selectOnClose",[],function(){function a(){}return a.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),b.on("close",function(a){d._handleSelectOnClose(a)})},a.prototype._handleSelectOnClose=function(a,b){if(b&&null!=b.originalSelect2Event){var c=b.originalSelect2Event;if("select"===c._type||"unselect"===c._type)return}var d=this.getHighlightedResults();if(!(d.length<1)){var e=d.data("data");null!=e.element&&e.element.selected||null==e.element&&e.selected||this.trigger("select",{data:e})}},a}),b.define("select2/dropdown/closeOnSelect",[],function(){function a(){}return a.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),b.on("select",function(a){d._selectTriggered(a)}),b.on("unselect",function(a){d._selectTriggered(a)})},a.prototype._selectTriggered=function(a,b){var c=b.originalEvent;c&&c.ctrlKey||this.trigger("close",{originalEvent:c,originalSelect2Event:b})},a}),b.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(a){var b=a.input.length-a.maximum,c="Please delete "+b+" character";return 1!=b&&(c+="s"),c},inputTooShort:function(a){var b=a.minimum-a.input.length,c="Please enter "+b+" or more characters";return c},loadingMore:function(){return"Loading more results…"},maximumSelected:function(a){var b="You can only select "+a.maximum+" item";return 1!=a.maximum&&(b+="s"),b},noResults:function(){return"No results found"},searching:function(){return"Searching…"}}}),b.define("select2/defaults",["jquery","require","./results","./selection/single","./selection/multiple","./selection/placeholder","./selection/allowClear","./selection/search","./selection/eventRelay","./utils","./translation","./diacritics","./data/select","./data/array","./data/ajax","./data/tags","./data/tokenizer","./data/minimumInputLength","./data/maximumInputLength","./data/maximumSelectionLength","./dropdown","./dropdown/search","./dropdown/hidePlaceholder","./dropdown/infiniteScroll","./dropdown/attachBody","./dropdown/minimumResultsForSearch","./dropdown/selectOnClose","./dropdown/closeOnSelect","./i18n/en"],function(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C){function D(){this.reset()}D.prototype.apply=function(l){if(l=a.extend(!0,{},this.defaults,l),null==l.dataAdapter){if(null!=l.ajax?l.dataAdapter=o:null!=l.data?l.dataAdapter=n:l.dataAdapter=m,l.minimumInputLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,r)),l.maximumInputLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,s)),l.maximumSelectionLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,t)),l.tags&&(l.dataAdapter=j.Decorate(l.dataAdapter,p)),(null!=l.tokenSeparators||null!=l.tokenizer)&&(l.dataAdapter=j.Decorate(l.dataAdapter,q)),null!=l.query){var C=b(l.amdBase+"compat/query");l.dataAdapter=j.Decorate(l.dataAdapter,C)}if(null!=l.initSelection){var D=b(l.amdBase+"compat/initSelection");l.dataAdapter=j.Decorate(l.dataAdapter,D)}}if(null==l.resultsAdapter&&(l.resultsAdapter=c,null!=l.ajax&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,x)),null!=l.placeholder&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,w)),l.selectOnClose&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,A))),null==l.dropdownAdapter){if(l.multiple)l.dropdownAdapter=u;else{var E=j.Decorate(u,v);l.dropdownAdapter=E}if(0!==l.minimumResultsForSearch&&(l.dropdownAdapter=j.Decorate(l.dropdownAdapter,z)),l.closeOnSelect&&(l.dropdownAdapter=j.Decorate(l.dropdownAdapter,B)),null!=l.dropdownCssClass||null!=l.dropdownCss||null!=l.adaptDropdownCssClass){var F=b(l.amdBase+"compat/dropdownCss");l.dropdownAdapter=j.Decorate(l.dropdownAdapter,F)}l.dropdownAdapter=j.Decorate(l.dropdownAdapter,y)}if(null==l.selectionAdapter){if(l.multiple?l.selectionAdapter=e:l.selectionAdapter=d,null!=l.placeholder&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,f)),l.allowClear&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,g)),l.multiple&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,h)),null!=l.containerCssClass||null!=l.containerCss||null!=l.adaptContainerCssClass){var G=b(l.amdBase+"compat/containerCss");l.selectionAdapter=j.Decorate(l.selectionAdapter,G)}l.selectionAdapter=j.Decorate(l.selectionAdapter,i)}if("string"==typeof l.language)if(l.language.indexOf("-")>0){var H=l.language.split("-"),I=H[0];l.language=[l.language,I]}else l.language=[l.language];if(a.isArray(l.language)){var J=new k;l.language.push("en");for(var K=l.language,L=0;L<K.length;L++){var M=K[L],N={};try{N=k.loadPath(M)}catch(O){try{M=this.defaults.amdLanguageBase+M,N=k.loadPath(M)}catch(P){l.debug&&window.console&&console.warn&&console.warn('Select2: The language file for "'+M+'" could not be automatically loaded. A fallback will be used instead.');continue}}J.extend(N)}l.translations=J}else{var Q=k.loadPath(this.defaults.amdLanguageBase+"en"),R=new k(l.language);R.extend(Q),l.translations=R}return l},D.prototype.reset=function(){function b(a){function b(a){return l[a]||a}return a.replace(/[^\u0000-\u007E]/g,b)}function c(d,e){if(""===a.trim(d.term))return e;if(e.children&&e.children.length>0){for(var f=a.extend(!0,{},e),g=e.children.length-1;g>=0;g--){var h=e.children[g],i=c(d,h);null==i&&f.children.splice(g,1)}return f.children.length>0?f:c(d,f)}var j=b(e.text).toUpperCase(),k=b(d.term).toUpperCase();return j.indexOf(k)>-1?e:null}this.defaults={amdBase:"./",amdLanguageBase:"./i18n/",closeOnSelect:!0,debug:!1,dropdownAutoWidth:!1,escapeMarkup:j.escapeMarkup,language:C,matcher:c,minimumInputLength:0,maximumInputLength:0,maximumSelectionLength:0,minimumResultsForSearch:0,selectOnClose:!1,sorter:function(a){return a},templateResult:function(a){return a.text},templateSelection:function(a){return a.text},theme:"default",width:"resolve"}},D.prototype.set=function(b,c){var d=a.camelCase(b),e={};e[d]=c;var f=j._convertData(e);a.extend(this.defaults,f)};var E=new D;return E}),b.define("select2/options",["require","jquery","./defaults","./utils"],function(a,b,c,d){function e(b,e){if(this.options=b,null!=e&&this.fromElement(e),this.options=c.apply(this.options),e&&e.is("input")){var f=a(this.get("amdBase")+"compat/inputData");this.options.dataAdapter=d.Decorate(this.options.dataAdapter,f)}}return e.prototype.fromElement=function(a){var c=["select2"];null==this.options.multiple&&(this.options.multiple=a.prop("multiple")),null==this.options.disabled&&(this.options.disabled=a.prop("disabled")),null==this.options.language&&(a.prop("lang")?this.options.language=a.prop("lang").toLowerCase():a.closest("[lang]").prop("lang")&&(this.options.language=a.closest("[lang]").prop("lang"))),null==this.options.dir&&(a.prop("dir")?this.options.dir=a.prop("dir"):a.closest("[dir]").prop("dir")?this.options.dir=a.closest("[dir]").prop("dir"):this.options.dir="ltr"),a.prop("disabled",this.options.disabled),a.prop("multiple",this.options.multiple),a.data("select2Tags")&&(this.options.debug&&window.console&&console.warn&&console.warn('Select2: The `data-select2-tags` attribute has been changed to use the `data-data` and `data-tags="true"` attributes and will be removed in future versions of Select2.'),a.data("data",a.data("select2Tags")),a.data("tags",!0)),a.data("ajaxUrl")&&(this.options.debug&&window.console&&console.warn&&console.warn("Select2: The `data-ajax-url` attribute has been changed to `data-ajax--url` and support for the old attribute will be removed in future versions of Select2."),a.attr("ajax--url",a.data("ajaxUrl")),a.data("ajax--url",a.data("ajaxUrl")));var e={};e=b.fn.jquery&&"1."==b.fn.jquery.substr(0,2)&&a[0].dataset?b.extend(!0,{},a[0].dataset,a.data()):a.data();var f=b.extend(!0,{},e);f=d._convertData(f);for(var g in f)b.inArray(g,c)>-1||(b.isPlainObject(this.options[g])?b.extend(this.options[g],f[g]):this.options[g]=f[g]);return this},e.prototype.get=function(a){return this.options[a]},e.prototype.set=function(a,b){this.options[a]=b},e}),b.define("select2/core",["jquery","./options","./utils","./keys"],function(a,b,c,d){var e=function(a,c){null!=a.data("select2")&&a.data("select2").destroy(),this.$element=a,this.id=this._generateId(a),c=c||{},this.options=new b(c,a),e.__super__.constructor.call(this);var d=a.attr("tabindex")||0;a.data("old-tabindex",d),a.attr("tabindex","-1");var f=this.options.get("dataAdapter");this.dataAdapter=new f(a,this.options);var g=this.render();this._placeContainer(g);var h=this.options.get("selectionAdapter");this.selection=new h(a,this.options),this.$selection=this.selection.render(),this.selection.position(this.$selection,g);var i=this.options.get("dropdownAdapter");this.dropdown=new i(a,this.options),this.$dropdown=this.dropdown.render(),this.dropdown.position(this.$dropdown,g);var j=this.options.get("resultsAdapter");this.results=new j(a,this.options,this.dataAdapter),this.$results=this.results.render(),this.results.position(this.$results,this.$dropdown);var k=this;this._bindAdapters(),this._registerDomEvents(),this._registerDataEvents(),this._registerSelectionEvents(),this._registerDropdownEvents(),this._registerResultsEvents(),this._registerEvents(),this.dataAdapter.current(function(a){k.trigger("selection:update",{data:a})}),a.addClass("select2-hidden-accessible"),a.attr("aria-hidden","true"),this._syncAttributes(),a.data("select2",this)};return c.Extend(e,c.Observable),e.prototype._generateId=function(a){var b="";return b=null!=a.attr("id")?a.attr("id"):null!=a.attr("name")?a.attr("name")+"-"+c.generateChars(2):c.generateChars(4),b=b.replace(/(:|\.|\[|\]|,)/g,""),b="select2-"+b},e.prototype._placeContainer=function(a){a.insertAfter(this.$element);var b=this._resolveWidth(this.$element,this.options.get("width"));null!=b&&a.css("width",b)},e.prototype._resolveWidth=function(a,b){var c=/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i;if("resolve"==b){var d=this._resolveWidth(a,"style");return null!=d?d:this._resolveWidth(a,"element")}if("element"==b){var e=a.outerWidth(!1);return 0>=e?"auto":e+"px"}if("style"==b){var f=a.attr("style");if("string"!=typeof f)return null;for(var g=f.split(";"),h=0,i=g.length;i>h;h+=1){var j=g[h].replace(/\s/g,""),k=j.match(c);if(null!==k&&k.length>=1)return k[1]}return null}return b},e.prototype._bindAdapters=function(){this.dataAdapter.bind(this,this.$container),this.selection.bind(this,this.$container),this.dropdown.bind(this,this.$container),this.results.bind(this,this.$container)},e.prototype._registerDomEvents=function(){var b=this;this.$element.on("change.select2",function(){b.dataAdapter.current(function(a){b.trigger("selection:update",{data:a})})}),this.$element.on("focus.select2",function(a){b.trigger("focus",a)}),this._syncA=c.bind(this._syncAttributes,this),this._syncS=c.bind(this._syncSubtree,this),this.$element[0].attachEvent&&this.$element[0].attachEvent("onpropertychange",this._syncA);var d=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver;null!=d?(this._observer=new d(function(c){a.each(c,b._syncA),a.each(c,b._syncS)}),this._observer.observe(this.$element[0],{attributes:!0,childList:!0,subtree:!1})):this.$element[0].addEventListener&&(this.$element[0].addEventListener("DOMAttrModified",b._syncA,!1),this.$element[0].addEventListener("DOMNodeInserted",b._syncS,!1),this.$element[0].addEventListener("DOMNodeRemoved",b._syncS,!1))},e.prototype._registerDataEvents=function(){var a=this;this.dataAdapter.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerSelectionEvents=function(){var b=this,c=["toggle","focus"];this.selection.on("toggle",function(){b.toggleDropdown()}),this.selection.on("focus",function(a){b.focus(a)}),this.selection.on("*",function(d,e){-1===a.inArray(d,c)&&b.trigger(d,e)})},e.prototype._registerDropdownEvents=function(){var a=this;this.dropdown.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerResultsEvents=function(){var a=this;this.results.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerEvents=function(){var a=this;this.on("open",function(){a.$container.addClass("select2-container--open")}),this.on("close",function(){a.$container.removeClass("select2-container--open")}),this.on("enable",function(){a.$container.removeClass("select2-container--disabled")}),this.on("disable",function(){a.$container.addClass("select2-container--disabled")}),this.on("blur",function(){a.$container.removeClass("select2-container--focus")}),this.on("query",function(b){a.isOpen()||a.trigger("open",{}),this.dataAdapter.query(b,function(c){a.trigger("results:all",{data:c,query:b})})}),this.on("query:append",function(b){this.dataAdapter.query(b,function(c){a.trigger("results:append",{data:c,query:b})})}),this.on("keypress",function(b){var c=b.which;a.isOpen()?c===d.ESC||c===d.TAB||c===d.UP&&b.altKey?(a.close(),b.preventDefault()):c===d.ENTER?(a.trigger("results:select",{}),b.preventDefault()):c===d.SPACE&&b.ctrlKey?(a.trigger("results:toggle",{}),b.preventDefault()):c===d.UP?(a.trigger("results:previous",{}),b.preventDefault()):c===d.DOWN&&(a.trigger("results:next",{}),b.preventDefault()):(c===d.ENTER||c===d.SPACE||c===d.DOWN&&b.altKey)&&(a.open(),b.preventDefault())})},e.prototype._syncAttributes=function(){this.options.set("disabled",this.$element.prop("disabled")),this.options.get("disabled")?(this.isOpen()&&this.close(),this.trigger("disable",{})):this.trigger("enable",{})},e.prototype._syncSubtree=function(a,b){var c=!1,d=this;if(!a||!a.target||"OPTION"===a.target.nodeName||"OPTGROUP"===a.target.nodeName){if(b)if(b.addedNodes&&b.addedNodes.length>0)for(var e=0;e<b.addedNodes.length;e++){var f=b.addedNodes[e];f.selected&&(c=!0)}else b.removedNodes&&b.removedNodes.length>0&&(c=!0);else c=!0;c&&this.dataAdapter.current(function(a){d.trigger("selection:update",{data:a})})}},e.prototype.trigger=function(a,b){var c=e.__super__.trigger,d={open:"opening",close:"closing",select:"selecting",unselect:"unselecting"};if(void 0===b&&(b={}),a in d){var f=d[a],g={prevented:!1,name:a,args:b};if(c.call(this,f,g),g.prevented)return void(b.prevented=!0)}c.call(this,a,b)},e.prototype.toggleDropdown=function(){this.options.get("disabled")||(this.isOpen()?this.close():this.open())},e.prototype.open=function(){this.isOpen()||this.trigger("query",{})},e.prototype.close=function(){this.isOpen()&&this.trigger("close",{})},e.prototype.isOpen=function(){return this.$container.hasClass("select2-container--open")},e.prototype.hasFocus=function(){return this.$container.hasClass("select2-container--focus")},e.prototype.focus=function(a){this.hasFocus()||(this.$container.addClass("select2-container--focus"),this.trigger("focus",{}))},e.prototype.enable=function(a){this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("enable")` method has been deprecated and will be removed in later Select2 versions. Use $element.prop("disabled") instead.'),(null==a||0===a.length)&&(a=[!0]);var b=!a[0];this.$element.prop("disabled",b)},e.prototype.data=function(){this.options.get("debug")&&arguments.length>0&&window.console&&console.warn&&console.warn('Select2: Data can no longer be set using `select2("data")`. You should consider setting the value instead using `$element.val()`.');var a=[];return this.dataAdapter.current(function(b){a=b}),a},e.prototype.val=function(b){if(this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("val")` method has been deprecated and will be removed in later Select2 versions. Use $element.val() instead.'),null==b||0===b.length)return this.$element.val();var c=b[0];a.isArray(c)&&(c=a.map(c,function(a){return a.toString()})),this.$element.val(c).trigger("change")},e.prototype.destroy=function(){this.$container.remove(),this.$element[0].detachEvent&&this.$element[0].detachEvent("onpropertychange",this._syncA),null!=this._observer?(this._observer.disconnect(),this._observer=null):this.$element[0].removeEventListener&&(this.$element[0].removeEventListener("DOMAttrModified",this._syncA,!1),this.$element[0].removeEventListener("DOMNodeInserted",this._syncS,!1),this.$element[0].removeEventListener("DOMNodeRemoved",this._syncS,!1)),this._syncA=null,this._syncS=null,this.$element.off(".select2"),this.$element.attr("tabindex",this.$element.data("old-tabindex")),this.$element.removeClass("select2-hidden-accessible"),this.$element.attr("aria-hidden","false"),this.$element.removeData("select2"),this.dataAdapter.destroy(),this.selection.destroy(),this.dropdown.destroy(),this.results.destroy(),this.dataAdapter=null,this.selection=null,this.dropdown=null,this.results=null;
+},e.prototype.render=function(){var b=a('<span class="select2 select2-container"><span class="selection"></span><span class="dropdown-wrapper" aria-hidden="true"></span></span>');return b.attr("dir",this.options.get("dir")),this.$container=b,this.$container.addClass("select2-container--"+this.options.get("theme")),b.data("element",this.$element),b},e}),b.define("select2/compat/utils",["jquery"],function(a){function b(b,c,d){var e,f,g=[];e=a.trim(b.attr("class")),e&&(e=""+e,a(e.split(/\s+/)).each(function(){0===this.indexOf("select2-")&&g.push(this)})),e=a.trim(c.attr("class")),e&&(e=""+e,a(e.split(/\s+/)).each(function(){0!==this.indexOf("select2-")&&(f=d(this),null!=f&&g.push(f))})),b.attr("class",g.join(" "))}return{syncCssClasses:b}}),b.define("select2/compat/containerCss",["jquery","./utils"],function(a,b){function c(a){return null}function d(){}return d.prototype.render=function(d){var e=d.call(this),f=this.options.get("containerCssClass")||"";a.isFunction(f)&&(f=f(this.$element));var g=this.options.get("adaptContainerCssClass");if(g=g||c,-1!==f.indexOf(":all:")){f=f.replace(":all:","");var h=g;g=function(a){var b=h(a);return null!=b?b+" "+a:a}}var i=this.options.get("containerCss")||{};return a.isFunction(i)&&(i=i(this.$element)),b.syncCssClasses(e,this.$element,g),e.css(i),e.addClass(f),e},d}),b.define("select2/compat/dropdownCss",["jquery","./utils"],function(a,b){function c(a){return null}function d(){}return d.prototype.render=function(d){var e=d.call(this),f=this.options.get("dropdownCssClass")||"";a.isFunction(f)&&(f=f(this.$element));var g=this.options.get("adaptDropdownCssClass");if(g=g||c,-1!==f.indexOf(":all:")){f=f.replace(":all:","");var h=g;g=function(a){var b=h(a);return null!=b?b+" "+a:a}}var i=this.options.get("dropdownCss")||{};return a.isFunction(i)&&(i=i(this.$element)),b.syncCssClasses(e,this.$element,g),e.css(i),e.addClass(f),e},d}),b.define("select2/compat/initSelection",["jquery"],function(a){function b(a,b,c){c.get("debug")&&window.console&&console.warn&&console.warn("Select2: The `initSelection` option has been deprecated in favor of a custom data adapter that overrides the `current` method. This method is now called multiple times instead of a single time when the instance is initialized. Support will be removed for the `initSelection` option in future versions of Select2"),this.initSelection=c.get("initSelection"),this._isInitialized=!1,a.call(this,b,c)}return b.prototype.current=function(b,c){var d=this;return this._isInitialized?void b.call(this,c):void this.initSelection.call(null,this.$element,function(b){d._isInitialized=!0,a.isArray(b)||(b=[b]),c(b)})},b}),b.define("select2/compat/inputData",["jquery"],function(a){function b(a,b,c){this._currentData=[],this._valueSeparator=c.get("valueSeparator")||",","hidden"===b.prop("type")&&c.get("debug")&&console&&console.warn&&console.warn("Select2: Using a hidden input with Select2 is no longer supported and may stop working in the future. It is recommended to use a `<select>` element instead."),a.call(this,b,c)}return b.prototype.current=function(b,c){function d(b,c){var e=[];return b.selected||-1!==a.inArray(b.id,c)?(b.selected=!0,e.push(b)):b.selected=!1,b.children&&e.push.apply(e,d(b.children,c)),e}for(var e=[],f=0;f<this._currentData.length;f++){var g=this._currentData[f];e.push.apply(e,d(g,this.$element.val().split(this._valueSeparator)))}c(e)},b.prototype.select=function(b,c){if(this.options.get("multiple")){var d=this.$element.val();d+=this._valueSeparator+c.id,this.$element.val(d),this.$element.trigger("change")}else this.current(function(b){a.map(b,function(a){a.selected=!1})}),this.$element.val(c.id),this.$element.trigger("change")},b.prototype.unselect=function(a,b){var c=this;b.selected=!1,this.current(function(a){for(var d=[],e=0;e<a.length;e++){var f=a[e];b.id!=f.id&&d.push(f.id)}c.$element.val(d.join(c._valueSeparator)),c.$element.trigger("change")})},b.prototype.query=function(a,b,c){for(var d=[],e=0;e<this._currentData.length;e++){var f=this._currentData[e],g=this.matches(b,f);null!==g&&d.push(g)}c({results:d})},b.prototype.addOptions=function(b,c){var d=a.map(c,function(b){return a.data(b[0],"data")});this._currentData.push.apply(this._currentData,d)},b}),b.define("select2/compat/matcher",["jquery"],function(a){function b(b){function c(c,d){var e=a.extend(!0,{},d);if(null==c.term||""===a.trim(c.term))return e;if(d.children){for(var f=d.children.length-1;f>=0;f--){var g=d.children[f],h=b(c.term,g.text,g);h||e.children.splice(f,1)}if(e.children.length>0)return e}return b(c.term,d.text,d)?e:null}return c}return b}),b.define("select2/compat/query",[],function(){function a(a,b,c){c.get("debug")&&window.console&&console.warn&&console.warn("Select2: The `query` option has been deprecated in favor of a custom data adapter that overrides the `query` method. Support will be removed for the `query` option in future versions of Select2."),a.call(this,b,c)}return a.prototype.query=function(a,b,c){b.callback=c;var d=this.options.get("query");d.call(null,b)},a}),b.define("select2/dropdown/attachContainer",[],function(){function a(a,b,c){a.call(this,b,c)}return a.prototype.position=function(a,b,c){var d=c.find(".dropdown-wrapper");d.append(b),b.addClass("select2-dropdown--below"),c.addClass("select2-container--below")},a}),b.define("select2/dropdown/stopPropagation",[],function(){function a(){}return a.prototype.bind=function(a,b,c){a.call(this,b,c);var d=["blur","change","click","dblclick","focus","focusin","focusout","input","keydown","keyup","keypress","mousedown","mouseenter","mouseleave","mousemove","mouseover","mouseup","search","touchend","touchstart"];this.$dropdown.on(d.join(" "),function(a){a.stopPropagation()})},a}),b.define("select2/selection/stopPropagation",[],function(){function a(){}return a.prototype.bind=function(a,b,c){a.call(this,b,c);var d=["blur","change","click","dblclick","focus","focusin","focusout","input","keydown","keyup","keypress","mousedown","mouseenter","mouseleave","mousemove","mouseover","mouseup","search","touchend","touchstart"];this.$selection.on(d.join(" "),function(a){a.stopPropagation()})},a}),function(c){"function"==typeof b.define&&b.define.amd?b.define("jquery-mousewheel",["jquery"],c):"object"==typeof exports?module.exports=c:c(a)}(function(a){function b(b){var g=b||window.event,h=i.call(arguments,1),j=0,l=0,m=0,n=0,o=0,p=0;if(b=a.event.fix(g),b.type="mousewheel","detail"in g&&(m=-1*g.detail),"wheelDelta"in g&&(m=g.wheelDelta),"wheelDeltaY"in g&&(m=g.wheelDeltaY),"wheelDeltaX"in g&&(l=-1*g.wheelDeltaX),"axis"in g&&g.axis===g.HORIZONTAL_AXIS&&(l=-1*m,m=0),j=0===m?l:m,"deltaY"in g&&(m=-1*g.deltaY,j=m),"deltaX"in g&&(l=g.deltaX,0===m&&(j=-1*l)),0!==m||0!==l){if(1===g.deltaMode){var q=a.data(this,"mousewheel-line-height");j*=q,m*=q,l*=q}else if(2===g.deltaMode){var r=a.data(this,"mousewheel-page-height");j*=r,m*=r,l*=r}if(n=Math.max(Math.abs(m),Math.abs(l)),(!f||f>n)&&(f=n,d(g,n)&&(f/=40)),d(g,n)&&(j/=40,l/=40,m/=40),j=Math[j>=1?"floor":"ceil"](j/f),l=Math[l>=1?"floor":"ceil"](l/f),m=Math[m>=1?"floor":"ceil"](m/f),k.settings.normalizeOffset&&this.getBoundingClientRect){var s=this.getBoundingClientRect();o=b.clientX-s.left,p=b.clientY-s.top}return b.deltaX=l,b.deltaY=m,b.deltaFactor=f,b.offsetX=o,b.offsetY=p,b.deltaMode=0,h.unshift(b,j,l,m),e&&clearTimeout(e),e=setTimeout(c,200),(a.event.dispatch||a.event.handle).apply(this,h)}}function c(){f=null}function d(a,b){return k.settings.adjustOldDeltas&&"mousewheel"===a.type&&b%120===0}var e,f,g=["wheel","mousewheel","DOMMouseScroll","MozMousePixelScroll"],h="onwheel"in document||document.documentMode>=9?["wheel"]:["mousewheel","DomMouseScroll","MozMousePixelScroll"],i=Array.prototype.slice;if(a.event.fixHooks)for(var j=g.length;j;)a.event.fixHooks[g[--j]]=a.event.mouseHooks;var k=a.event.special.mousewheel={version:"3.1.12",setup:function(){if(this.addEventListener)for(var c=h.length;c;)this.addEventListener(h[--c],b,!1);else this.onmousewheel=b;a.data(this,"mousewheel-line-height",k.getLineHeight(this)),a.data(this,"mousewheel-page-height",k.getPageHeight(this))},teardown:function(){if(this.removeEventListener)for(var c=h.length;c;)this.removeEventListener(h[--c],b,!1);else this.onmousewheel=null;a.removeData(this,"mousewheel-line-height"),a.removeData(this,"mousewheel-page-height")},getLineHeight:function(b){var c=a(b),d=c["offsetParent"in a.fn?"offsetParent":"parent"]();return d.length||(d=a("body")),parseInt(d.css("fontSize"),10)||parseInt(c.css("fontSize"),10)||16},getPageHeight:function(b){return a(b).height()},settings:{adjustOldDeltas:!0,normalizeOffset:!0}};a.fn.extend({mousewheel:function(a){return a?this.bind("mousewheel",a):this.trigger("mousewheel")},unmousewheel:function(a){return this.unbind("mousewheel",a)}})}),b.define("jquery.select2",["jquery","jquery-mousewheel","./select2/core","./select2/defaults"],function(a,b,c,d){if(null==a.fn.select2){var e=["open","close","destroy"];a.fn.select2=function(b){if(b=b||{},"object"==typeof b)return this.each(function(){var d=a.extend(!0,{},b);new c(a(this),d)}),this;if("string"==typeof b){var d,f=Array.prototype.slice.call(arguments,1);return this.each(function(){var c=a(this).data("select2");null==c&&window.console&&console.error&&console.error("The select2('"+b+"') method was called on an element that is not using Select2."),d=c[b].apply(c,f)}),a.inArray(b,e)>-1?this:d}throw new Error("Invalid arguments for Select2: "+b)}}return null==a.fn.select2.defaults&&(a.fn.select2.defaults=d),c}),{define:b.define,require:b.require}}(),c=b.require("jquery.select2");return a.fn.select2.amd=b,c});
\ No newline at end of file
diff --git a/assets/js/select2/select2.js b/assets/js/select2/select2.js
index 195ccee5bb0..13b84fadff6 100644
--- a/assets/js/select2/select2.js
+++ b/assets/js/select2/select2.js
@@ -1,3729 +1,5725 @@
-/*
-Copyright 2012 Igor Vaynberg
+/*!
+ * Select2 4.0.3
+ * https://select2.github.io
+ *
+ * Released under the MIT license
+ * https://github.com/select2/select2/blob/master/LICENSE.md
+ */
+(function (factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['jquery'], factory);
+  } else if (typeof exports === 'object') {
+    // Node/CommonJS
+    factory(require('jquery'));
+  } else {
+    // Browser globals
+    factory(jQuery);
+  }
+}(function (jQuery) {
+  // This is needed so we can catch the AMD loader configuration and use it
+  // The inner file should be wrapped (by `banner.start.js`) in a function that
+  // returns the AMD loader references.
+  var S2 =
+(function () {
+  // Restore the Select2 AMD loader so it can be used
+  // Needed mostly in the language files, where the loader is not inserted
+  if (jQuery && jQuery.fn && jQuery.fn.select2 && jQuery.fn.select2.amd) {
+    var S2 = jQuery.fn.select2.amd;
+  }
+var S2;(function () { if (!S2 || !S2.requirejs) {
+if (!S2) { S2 = {}; } else { require = S2; }
+/**
+ * @license almond 0.3.1 Copyright (c) 2011-2014, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
+ * see: http://github.com/jrburke/almond for details
+ */
+//Going sloppy to avoid 'use strict' string cost, but strict practices should
+//be followed.
+/*jslint sloppy: true */
+/*global setTimeout: false */
 
-Version: 3.5.4 Timestamp: Sun Aug 30 13:30:32 EDT 2015
+var requirejs, require, define;
+(function (undef) {
+    var main, req, makeMap, handlers,
+        defined = {},
+        waiting = {},
+        config = {},
+        defining = {},
+        hasOwn = Object.prototype.hasOwnProperty,
+        aps = [].slice,
+        jsSuffixRegExp = /\.js$/;
 
-This software is licensed under the Apache License, Version 2.0 (the "Apache License") or the GNU
-General Public License version 2 (the "GPL License"). You may choose either license to govern your
-use of this software only upon the condition that you accept all of the terms of either the Apache
-License or the GPL License.
-
-You may obtain a copy of the Apache License and the GPL License at:
-
-    http://www.apache.org/licenses/LICENSE-2.0
-    http://www.gnu.org/licenses/gpl-2.0.html
-
-Unless required by applicable law or agreed to in writing, software distributed under the
-Apache License or the GPL License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the Apache License and the GPL License for
-the specific language governing permissions and limitations under the Apache License and the GPL License.
-*/
-(function ($) {
-    if(typeof $.fn.each2 == "undefined") {
-        $.extend($.fn, {
-            /*
-            * 4-10 times faster .each replacement
-            * use it carefully, as it overrides jQuery context of element on each iteration
-            */
-            each2 : function (c) {
-                var j = $([0]), i = -1, l = this.length;
-                while (
-                    ++i < l
-                    && (j.context = j[0] = this[i])
-                    && c.call(j[0], i, j) !== false //"this"=DOM, i=index, j=jQuery object
-                );
-                return this;
-            }
-        });
-    }
-})(jQuery);
-
-(function ($, undefined) {
-    "use strict";
-    /*global document, window, jQuery, console */
-
-    if (window.Select2 !== undefined) {
-        return;
-    }
-
-    var AbstractSelect2, SingleSelect2, MultiSelect2, nextUid, sizer,
-        lastMousePosition={x:0,y:0}, $document, scrollBarDimensions,
-
-    KEY = {
-        TAB: 9,
-        ENTER: 13,
-        ESC: 27,
-        SPACE: 32,
-        LEFT: 37,
-        UP: 38,
-        RIGHT: 39,
-        DOWN: 40,
-        SHIFT: 16,
-        CTRL: 17,
-        ALT: 18,
-        PAGE_UP: 33,
-        PAGE_DOWN: 34,
-        HOME: 36,
-        END: 35,
-        BACKSPACE: 8,
-        DELETE: 46,
-        isArrow: function (k) {
-            k = k.which ? k.which : k;
-            switch (k) {
-            case KEY.LEFT:
-            case KEY.RIGHT:
-            case KEY.UP:
-            case KEY.DOWN:
-                return true;
-            }
-            return false;
-        },
-        isControl: function (e) {
-            var k = e.which;
-            switch (k) {
-            case KEY.SHIFT:
-            case KEY.CTRL:
-            case KEY.ALT:
-                return true;
-            }
-
-            if (e.metaKey) return true;
-
-            return false;
-        },
-        isFunctionKey: function (k) {
-            k = k.which ? k.which : k;
-            return k >= 112 && k <= 123;
-        }
-    },
-    MEASURE_SCROLLBAR_TEMPLATE = "<div class='select2-measure-scrollbar'></div>",
-
-    DIACRITICS = {"\u24B6":"A","\uFF21":"A","\u00C0":"A","\u00C1":"A","\u00C2":"A","\u1EA6":"A","\u1EA4":"A","\u1EAA":"A","\u1EA8":"A","\u00C3":"A","\u0100":"A","\u0102":"A","\u1EB0":"A","\u1EAE":"A","\u1EB4":"A","\u1EB2":"A","\u0226":"A","\u01E0":"A","\u00C4":"A","\u01DE":"A","\u1EA2":"A","\u00C5":"A","\u01FA":"A","\u01CD":"A","\u0200":"A","\u0202":"A","\u1EA0":"A","\u1EAC":"A","\u1EB6":"A","\u1E00":"A","\u0104":"A","\u023A":"A","\u2C6F":"A","\uA732":"AA","\u00C6":"AE","\u01FC":"AE","\u01E2":"AE","\uA734":"AO","\uA736":"AU","\uA738":"AV","\uA73A":"AV","\uA73C":"AY","\u24B7":"B","\uFF22":"B","\u1E02":"B","\u1E04":"B","\u1E06":"B","\u0243":"B","\u0182":"B","\u0181":"B","\u24B8":"C","\uFF23":"C","\u0106":"C","\u0108":"C","\u010A":"C","\u010C":"C","\u00C7":"C","\u1E08":"C","\u0187":"C","\u023B":"C","\uA73E":"C","\u24B9":"D","\uFF24":"D","\u1E0A":"D","\u010E":"D","\u1E0C":"D","\u1E10":"D","\u1E12":"D","\u1E0E":"D","\u0110":"D","\u018B":"D","\u018A":"D","\u0189":"D","\uA779":"D","\u01F1":"DZ","\u01C4":"DZ","\u01F2":"Dz","\u01C5":"Dz","\u24BA":"E","\uFF25":"E","\u00C8":"E","\u00C9":"E","\u00CA":"E","\u1EC0":"E","\u1EBE":"E","\u1EC4":"E","\u1EC2":"E","\u1EBC":"E","\u0112":"E","\u1E14":"E","\u1E16":"E","\u0114":"E","\u0116":"E","\u00CB":"E","\u1EBA":"E","\u011A":"E","\u0204":"E","\u0206":"E","\u1EB8":"E","\u1EC6":"E","\u0228":"E","\u1E1C":"E","\u0118":"E","\u1E18":"E","\u1E1A":"E","\u0190":"E","\u018E":"E","\u24BB":"F","\uFF26":"F","\u1E1E":"F","\u0191":"F","\uA77B":"F","\u24BC":"G","\uFF27":"G","\u01F4":"G","\u011C":"G","\u1E20":"G","\u011E":"G","\u0120":"G","\u01E6":"G","\u0122":"G","\u01E4":"G","\u0193":"G","\uA7A0":"G","\uA77D":"G","\uA77E":"G","\u24BD":"H","\uFF28":"H","\u0124":"H","\u1E22":"H","\u1E26":"H","\u021E":"H","\u1E24":"H","\u1E28":"H","\u1E2A":"H","\u0126":"H","\u2C67":"H","\u2C75":"H","\uA78D":"H","\u24BE":"I","\uFF29":"I","\u00CC":"I","\u00CD":"I","\u00CE":"I","\u0128":"I","\u012A":"I","\u012C":"I","\u0130":"I","\u00CF":"I","\u1E2E":"I","\u1EC8":"I","\u01CF":"I","\u0208":"I","\u020A":"I","\u1ECA":"I","\u012E":"I","\u1E2C":"I","\u0197":"I","\u24BF":"J","\uFF2A":"J","\u0134":"J","\u0248":"J","\u24C0":"K","\uFF2B":"K","\u1E30":"K","\u01E8":"K","\u1E32":"K","\u0136":"K","\u1E34":"K","\u0198":"K","\u2C69":"K","\uA740":"K","\uA742":"K","\uA744":"K","\uA7A2":"K","\u24C1":"L","\uFF2C":"L","\u013F":"L","\u0139":"L","\u013D":"L","\u1E36":"L","\u1E38":"L","\u013B":"L","\u1E3C":"L","\u1E3A":"L","\u0141":"L","\u023D":"L","\u2C62":"L","\u2C60":"L","\uA748":"L","\uA746":"L","\uA780":"L","\u01C7":"LJ","\u01C8":"Lj","\u24C2":"M","\uFF2D":"M","\u1E3E":"M","\u1E40":"M","\u1E42":"M","\u2C6E":"M","\u019C":"M","\u24C3":"N","\uFF2E":"N","\u01F8":"N","\u0143":"N","\u00D1":"N","\u1E44":"N","\u0147":"N","\u1E46":"N","\u0145":"N","\u1E4A":"N","\u1E48":"N","\u0220":"N","\u019D":"N","\uA790":"N","\uA7A4":"N","\u01CA":"NJ","\u01CB":"Nj","\u24C4":"O","\uFF2F":"O","\u00D2":"O","\u00D3":"O","\u00D4":"O","\u1ED2":"O","\u1ED0":"O","\u1ED6":"O","\u1ED4":"O","\u00D5":"O","\u1E4C":"O","\u022C":"O","\u1E4E":"O","\u014C":"O","\u1E50":"O","\u1E52":"O","\u014E":"O","\u022E":"O","\u0230":"O","\u00D6":"O","\u022A":"O","\u1ECE":"O","\u0150":"O","\u01D1":"O","\u020C":"O","\u020E":"O","\u01A0":"O","\u1EDC":"O","\u1EDA":"O","\u1EE0":"O","\u1EDE":"O","\u1EE2":"O","\u1ECC":"O","\u1ED8":"O","\u01EA":"O","\u01EC":"O","\u00D8":"O","\u01FE":"O","\u0186":"O","\u019F":"O","\uA74A":"O","\uA74C":"O","\u01A2":"OI","\uA74E":"OO","\u0222":"OU","\u24C5":"P","\uFF30":"P","\u1E54":"P","\u1E56":"P","\u01A4":"P","\u2C63":"P","\uA750":"P","\uA752":"P","\uA754":"P","\u24C6":"Q","\uFF31":"Q","\uA756":"Q","\uA758":"Q","\u024A":"Q","\u24C7":"R","\uFF32":"R","\u0154":"R","\u1E58":"R","\u0158":"R","\u0210":"R","\u0212":"R","\u1E5A":"R","\u1E5C":"R","\u0156":"R","\u1E5E":"R","\u024C":"R","\u2C64":"R","\uA75A":"R","\uA7A6":"R","\uA782":"R","\u24C8":"S","\uFF33":"S","\u1E9E":"S","\u015A":"S","\u1E64":"S","\u015C":"S","\u1E60":"S","\u0160":"S","\u1E66":"S","\u1E62":"S","\u1E68":"S","\u0218":"S","\u015E":"S","\u2C7E":"S","\uA7A8":"S","\uA784":"S","\u24C9":"T","\uFF34":"T","\u1E6A":"T","\u0164":"T","\u1E6C":"T","\u021A":"T","\u0162":"T","\u1E70":"T","\u1E6E":"T","\u0166":"T","\u01AC":"T","\u01AE":"T","\u023E":"T","\uA786":"T","\uA728":"TZ","\u24CA":"U","\uFF35":"U","\u00D9":"U","\u00DA":"U","\u00DB":"U","\u0168":"U","\u1E78":"U","\u016A":"U","\u1E7A":"U","\u016C":"U","\u00DC":"U","\u01DB":"U","\u01D7":"U","\u01D5":"U","\u01D9":"U","\u1EE6":"U","\u016E":"U","\u0170":"U","\u01D3":"U","\u0214":"U","\u0216":"U","\u01AF":"U","\u1EEA":"U","\u1EE8":"U","\u1EEE":"U","\u1EEC":"U","\u1EF0":"U","\u1EE4":"U","\u1E72":"U","\u0172":"U","\u1E76":"U","\u1E74":"U","\u0244":"U","\u24CB":"V","\uFF36":"V","\u1E7C":"V","\u1E7E":"V","\u01B2":"V","\uA75E":"V","\u0245":"V","\uA760":"VY","\u24CC":"W","\uFF37":"W","\u1E80":"W","\u1E82":"W","\u0174":"W","\u1E86":"W","\u1E84":"W","\u1E88":"W","\u2C72":"W","\u24CD":"X","\uFF38":"X","\u1E8A":"X","\u1E8C":"X","\u24CE":"Y","\uFF39":"Y","\u1EF2":"Y","\u00DD":"Y","\u0176":"Y","\u1EF8":"Y","\u0232":"Y","\u1E8E":"Y","\u0178":"Y","\u1EF6":"Y","\u1EF4":"Y","\u01B3":"Y","\u024E":"Y","\u1EFE":"Y","\u24CF":"Z","\uFF3A":"Z","\u0179":"Z","\u1E90":"Z","\u017B":"Z","\u017D":"Z","\u1E92":"Z","\u1E94":"Z","\u01B5":"Z","\u0224":"Z","\u2C7F":"Z","\u2C6B":"Z","\uA762":"Z","\u24D0":"a","\uFF41":"a","\u1E9A":"a","\u00E0":"a","\u00E1":"a","\u00E2":"a","\u1EA7":"a","\u1EA5":"a","\u1EAB":"a","\u1EA9":"a","\u00E3":"a","\u0101":"a","\u0103":"a","\u1EB1":"a","\u1EAF":"a","\u1EB5":"a","\u1EB3":"a","\u0227":"a","\u01E1":"a","\u00E4":"a","\u01DF":"a","\u1EA3":"a","\u00E5":"a","\u01FB":"a","\u01CE":"a","\u0201":"a","\u0203":"a","\u1EA1":"a","\u1EAD":"a","\u1EB7":"a","\u1E01":"a","\u0105":"a","\u2C65":"a","\u0250":"a","\uA733":"aa","\u00E6":"ae","\u01FD":"ae","\u01E3":"ae","\uA735":"ao","\uA737":"au","\uA739":"av","\uA73B":"av","\uA73D":"ay","\u24D1":"b","\uFF42":"b","\u1E03":"b","\u1E05":"b","\u1E07":"b","\u0180":"b","\u0183":"b","\u0253":"b","\u24D2":"c","\uFF43":"c","\u0107":"c","\u0109":"c","\u010B":"c","\u010D":"c","\u00E7":"c","\u1E09":"c","\u0188":"c","\u023C":"c","\uA73F":"c","\u2184":"c","\u24D3":"d","\uFF44":"d","\u1E0B":"d","\u010F":"d","\u1E0D":"d","\u1E11":"d","\u1E13":"d","\u1E0F":"d","\u0111":"d","\u018C":"d","\u0256":"d","\u0257":"d","\uA77A":"d","\u01F3":"dz","\u01C6":"dz","\u24D4":"e","\uFF45":"e","\u00E8":"e","\u00E9":"e","\u00EA":"e","\u1EC1":"e","\u1EBF":"e","\u1EC5":"e","\u1EC3":"e","\u1EBD":"e","\u0113":"e","\u1E15":"e","\u1E17":"e","\u0115":"e","\u0117":"e","\u00EB":"e","\u1EBB":"e","\u011B":"e","\u0205":"e","\u0207":"e","\u1EB9":"e","\u1EC7":"e","\u0229":"e","\u1E1D":"e","\u0119":"e","\u1E19":"e","\u1E1B":"e","\u0247":"e","\u025B":"e","\u01DD":"e","\u24D5":"f","\uFF46":"f","\u1E1F":"f","\u0192":"f","\uA77C":"f","\u24D6":"g","\uFF47":"g","\u01F5":"g","\u011D":"g","\u1E21":"g","\u011F":"g","\u0121":"g","\u01E7":"g","\u0123":"g","\u01E5":"g","\u0260":"g","\uA7A1":"g","\u1D79":"g","\uA77F":"g","\u24D7":"h","\uFF48":"h","\u0125":"h","\u1E23":"h","\u1E27":"h","\u021F":"h","\u1E25":"h","\u1E29":"h","\u1E2B":"h","\u1E96":"h","\u0127":"h","\u2C68":"h","\u2C76":"h","\u0265":"h","\u0195":"hv","\u24D8":"i","\uFF49":"i","\u00EC":"i","\u00ED":"i","\u00EE":"i","\u0129":"i","\u012B":"i","\u012D":"i","\u00EF":"i","\u1E2F":"i","\u1EC9":"i","\u01D0":"i","\u0209":"i","\u020B":"i","\u1ECB":"i","\u012F":"i","\u1E2D":"i","\u0268":"i","\u0131":"i","\u24D9":"j","\uFF4A":"j","\u0135":"j","\u01F0":"j","\u0249":"j","\u24DA":"k","\uFF4B":"k","\u1E31":"k","\u01E9":"k","\u1E33":"k","\u0137":"k","\u1E35":"k","\u0199":"k","\u2C6A":"k","\uA741":"k","\uA743":"k","\uA745":"k","\uA7A3":"k","\u24DB":"l","\uFF4C":"l","\u0140":"l","\u013A":"l","\u013E":"l","\u1E37":"l","\u1E39":"l","\u013C":"l","\u1E3D":"l","\u1E3B":"l","\u017F":"l","\u0142":"l","\u019A":"l","\u026B":"l","\u2C61":"l","\uA749":"l","\uA781":"l","\uA747":"l","\u01C9":"lj","\u24DC":"m","\uFF4D":"m","\u1E3F":"m","\u1E41":"m","\u1E43":"m","\u0271":"m","\u026F":"m","\u24DD":"n","\uFF4E":"n","\u01F9":"n","\u0144":"n","\u00F1":"n","\u1E45":"n","\u0148":"n","\u1E47":"n","\u0146":"n","\u1E4B":"n","\u1E49":"n","\u019E":"n","\u0272":"n","\u0149":"n","\uA791":"n","\uA7A5":"n","\u01CC":"nj","\u24DE":"o","\uFF4F":"o","\u00F2":"o","\u00F3":"o","\u00F4":"o","\u1ED3":"o","\u1ED1":"o","\u1ED7":"o","\u1ED5":"o","\u00F5":"o","\u1E4D":"o","\u022D":"o","\u1E4F":"o","\u014D":"o","\u1E51":"o","\u1E53":"o","\u014F":"o","\u022F":"o","\u0231":"o","\u00F6":"o","\u022B":"o","\u1ECF":"o","\u0151":"o","\u01D2":"o","\u020D":"o","\u020F":"o","\u01A1":"o","\u1EDD":"o","\u1EDB":"o","\u1EE1":"o","\u1EDF":"o","\u1EE3":"o","\u1ECD":"o","\u1ED9":"o","\u01EB":"o","\u01ED":"o","\u00F8":"o","\u01FF":"o","\u0254":"o","\uA74B":"o","\uA74D":"o","\u0275":"o","\u01A3":"oi","\u0223":"ou","\uA74F":"oo","\u24DF":"p","\uFF50":"p","\u1E55":"p","\u1E57":"p","\u01A5":"p","\u1D7D":"p","\uA751":"p","\uA753":"p","\uA755":"p","\u24E0":"q","\uFF51":"q","\u024B":"q","\uA757":"q","\uA759":"q","\u24E1":"r","\uFF52":"r","\u0155":"r","\u1E59":"r","\u0159":"r","\u0211":"r","\u0213":"r","\u1E5B":"r","\u1E5D":"r","\u0157":"r","\u1E5F":"r","\u024D":"r","\u027D":"r","\uA75B":"r","\uA7A7":"r","\uA783":"r","\u24E2":"s","\uFF53":"s","\u00DF":"s","\u015B":"s","\u1E65":"s","\u015D":"s","\u1E61":"s","\u0161":"s","\u1E67":"s","\u1E63":"s","\u1E69":"s","\u0219":"s","\u015F":"s","\u023F":"s","\uA7A9":"s","\uA785":"s","\u1E9B":"s","\u24E3":"t","\uFF54":"t","\u1E6B":"t","\u1E97":"t","\u0165":"t","\u1E6D":"t","\u021B":"t","\u0163":"t","\u1E71":"t","\u1E6F":"t","\u0167":"t","\u01AD":"t","\u0288":"t","\u2C66":"t","\uA787":"t","\uA729":"tz","\u24E4":"u","\uFF55":"u","\u00F9":"u","\u00FA":"u","\u00FB":"u","\u0169":"u","\u1E79":"u","\u016B":"u","\u1E7B":"u","\u016D":"u","\u00FC":"u","\u01DC":"u","\u01D8":"u","\u01D6":"u","\u01DA":"u","\u1EE7":"u","\u016F":"u","\u0171":"u","\u01D4":"u","\u0215":"u","\u0217":"u","\u01B0":"u","\u1EEB":"u","\u1EE9":"u","\u1EEF":"u","\u1EED":"u","\u1EF1":"u","\u1EE5":"u","\u1E73":"u","\u0173":"u","\u1E77":"u","\u1E75":"u","\u0289":"u","\u24E5":"v","\uFF56":"v","\u1E7D":"v","\u1E7F":"v","\u028B":"v","\uA75F":"v","\u028C":"v","\uA761":"vy","\u24E6":"w","\uFF57":"w","\u1E81":"w","\u1E83":"w","\u0175":"w","\u1E87":"w","\u1E85":"w","\u1E98":"w","\u1E89":"w","\u2C73":"w","\u24E7":"x","\uFF58":"x","\u1E8B":"x","\u1E8D":"x","\u24E8":"y","\uFF59":"y","\u1EF3":"y","\u00FD":"y","\u0177":"y","\u1EF9":"y","\u0233":"y","\u1E8F":"y","\u00FF":"y","\u1EF7":"y","\u1E99":"y","\u1EF5":"y","\u01B4":"y","\u024F":"y","\u1EFF":"y","\u24E9":"z","\uFF5A":"z","\u017A":"z","\u1E91":"z","\u017C":"z","\u017E":"z","\u1E93":"z","\u1E95":"z","\u01B6":"z","\u0225":"z","\u0240":"z","\u2C6C":"z","\uA763":"z","\u0386":"\u0391","\u0388":"\u0395","\u0389":"\u0397","\u038A":"\u0399","\u03AA":"\u0399","\u038C":"\u039F","\u038E":"\u03A5","\u03AB":"\u03A5","\u038F":"\u03A9","\u03AC":"\u03B1","\u03AD":"\u03B5","\u03AE":"\u03B7","\u03AF":"\u03B9","\u03CA":"\u03B9","\u0390":"\u03B9","\u03CC":"\u03BF","\u03CD":"\u03C5","\u03CB":"\u03C5","\u03B0":"\u03C5","\u03C9":"\u03C9","\u03C2":"\u03C3"};
-
-    $document = $(document);
-
-    nextUid=(function() { var counter=1; return function() { return counter++; }; }());
-
-
-    function reinsertElement(element) {
-        var placeholder = $(document.createTextNode(''));
-
-        element.before(placeholder);
-        placeholder.before(element);
-        placeholder.remove();
-    }
-
-    function stripDiacritics(str) {
-        // Used 'uni range + named function' from http://jsperf.com/diacritics/18
-        function match(a) {
-            return DIACRITICS[a] || a;
-        }
-
-        return str.replace(/[^\u0000-\u007E]/g, match);
-    }
-
-    function indexOf(value, array) {
-        var i = 0, l = array.length;
-        for (; i < l; i = i + 1) {
-            if (equal(value, array[i])) return i;
-        }
-        return -1;
-    }
-
-    function measureScrollbar () {
-        var $template = $( MEASURE_SCROLLBAR_TEMPLATE );
-        $template.appendTo(document.body);
-
-        var dim = {
-            width: $template.width() - $template[0].clientWidth,
-            height: $template.height() - $template[0].clientHeight
-        };
-        $template.remove();
-
-        return dim;
+    function hasProp(obj, prop) {
+        return hasOwn.call(obj, prop);
     }
 
     /**
-     * Compares equality of a and b
-     * @param a
-     * @param b
+     * Given a relative module name, like ./something, normalize it to
+     * a real name that can be mapped to a path.
+     * @param {String} name the relative name
+     * @param {String} baseName a real name that the name arg is relative
+     * to.
+     * @returns {String} normalized name
      */
-    function equal(a, b) {
-        if (a === b) return true;
-        if (a === undefined || b === undefined) return false;
-        if (a === null || b === null) return false;
-        // Check whether 'a' or 'b' is a string (primitive or object).
-        // The concatenation of an empty string (+'') converts its argument to a string's primitive.
-        if (a.constructor === String) return a+'' === b+''; // a+'' - in case 'a' is a String object
-        if (b.constructor === String) return b+'' === a+''; // b+'' - in case 'b' is a String object
-        return false;
-    }
+    function normalize(name, baseName) {
+        var nameParts, nameSegment, mapValue, foundMap, lastIndex,
+            foundI, foundStarMap, starI, i, j, part,
+            baseParts = baseName && baseName.split("/"),
+            map = config.map,
+            starMap = (map && map['*']) || {};
 
-    /**
-     * Splits the string into an array of values, transforming each value. An empty array is returned for nulls or empty
-     * strings
-     * @param string
-     * @param separator
-     */
-    function splitVal(string, separator, transform) {
-        var val, i, l;
-        if (string === null || string.length < 1) return [];
-        val = string.split(separator);
-        for (i = 0, l = val.length; i < l; i = i + 1) val[i] = transform(val[i]);
-        return val;
-    }
+        //Adjust any relative paths.
+        if (name && name.charAt(0) === ".") {
+            //If have a base name, try to normalize against it,
+            //otherwise, assume it is a top-level require that will
+            //be relative to baseUrl in the end.
+            if (baseName) {
+                name = name.split('/');
+                lastIndex = name.length - 1;
 
-    function getSideBorderPadding(element) {
-        return element.outerWidth(false) - element.width();
-    }
-
-    function installKeyUpChangeEvent(element) {
-        var key="keyup-change-value";
-        element.on("keydown", function () {
-            if ($.data(element, key) === undefined) {
-                $.data(element, key, element.val());
-            }
-        });
-        element.on("keyup", function () {
-            var val= $.data(element, key);
-            if (val !== undefined && element.val() !== val) {
-                $.removeData(element, key);
-                element.trigger("keyup-change");
-            }
-        });
-    }
-
-
-    /**
-     * filters mouse events so an event is fired only if the mouse moved.
-     *
-     * filters out mouse events that occur when mouse is stationary but
-     * the elements under the pointer are scrolled.
-     */
-    function installFilteredMouseMove(element) {
-        element.on("mousemove", function (e) {
-            var lastpos = lastMousePosition;
-            if (lastpos === undefined || lastpos.x !== e.pageX || lastpos.y !== e.pageY) {
-                $(e.target).trigger("mousemove-filtered", e);
-            }
-        });
-    }
-
-    /**
-     * Debounces a function. Returns a function that calls the original fn function only if no invocations have been made
-     * within the last quietMillis milliseconds.
-     *
-     * @param quietMillis number of milliseconds to wait before invoking fn
-     * @param fn function to be debounced
-     * @param ctx object to be used as this reference within fn
-     * @return debounced version of fn
-     */
-    function debounce(quietMillis, fn, ctx) {
-        ctx = ctx || undefined;
-        var timeout;
-        return function () {
-            var args = arguments;
-            window.clearTimeout(timeout);
-            timeout = window.setTimeout(function() {
-                fn.apply(ctx, args);
-            }, quietMillis);
-        };
-    }
-
-    function installDebouncedScroll(threshold, element) {
-        var notify = debounce(threshold, function (e) { element.trigger("scroll-debounced", e);});
-        element.on("scroll", function (e) {
-            if (indexOf(e.target, element.get()) >= 0) notify(e);
-        });
-    }
-
-    function focus($el) {
-        if ($el[0] === document.activeElement) return;
-
-        /* set the focus in a 0 timeout - that way the focus is set after the processing
-            of the current event has finished - which seems like the only reliable way
-            to set focus */
-        window.setTimeout(function() {
-            var el=$el[0], pos=$el.val().length, range;
-
-            $el.focus();
-
-            /* make sure el received focus so we do not error out when trying to manipulate the caret.
-                sometimes modals or others listeners may steal it after its set */
-            var isVisible = (el.offsetWidth > 0 || el.offsetHeight > 0);
-            if (isVisible && el === document.activeElement) {
-
-                /* after the focus is set move the caret to the end, necessary when we val()
-                    just before setting focus */
-                if(el.setSelectionRange)
-                {
-                    el.setSelectionRange(pos, pos);
-                }
-                else if (el.createTextRange) {
-                    range = el.createTextRange();
-                    range.collapse(false);
-                    range.select();
-                }
-            }
-        }, 0);
-    }
-
-    function getCursorInfo(el) {
-        el = $(el)[0];
-        var offset = 0;
-        var length = 0;
-        if ('selectionStart' in el) {
-            offset = el.selectionStart;
-            length = el.selectionEnd - offset;
-        } else if ('selection' in document) {
-            el.focus();
-            var sel = document.selection.createRange();
-            length = document.selection.createRange().text.length;
-            sel.moveStart('character', -el.value.length);
-            offset = sel.text.length - length;
-        }
-        return { offset: offset, length: length };
-    }
-
-    function killEvent(event) {
-        event.preventDefault();
-        event.stopPropagation();
-    }
-    function killEventImmediately(event) {
-        event.preventDefault();
-        event.stopImmediatePropagation();
-    }
-
-    function measureTextWidth(e) {
-        if (!sizer){
-            var style = e[0].currentStyle || window.getComputedStyle(e[0], null);
-            sizer = $(document.createElement("div")).css({
-                position: "absolute",
-                left: "-10000px",
-                top: "-10000px",
-                display: "none",
-                fontSize: style.fontSize,
-                fontFamily: style.fontFamily,
-                fontStyle: style.fontStyle,
-                fontWeight: style.fontWeight,
-                letterSpacing: style.letterSpacing,
-                textTransform: style.textTransform,
-                whiteSpace: "nowrap"
-            });
-            sizer.attr("class","select2-sizer");
-            $(document.body).append(sizer);
-        }
-        sizer.text(e.val());
-        return sizer.width();
-    }
-
-    function syncCssClasses(dest, src, adapter) {
-        var classes, replacements = [], adapted;
-
-        classes = $.trim(dest.attr("class"));
-
-        if (classes) {
-            classes = '' + classes; // for IE which returns object
-
-            $(classes.split(/\s+/)).each2(function() {
-                if (this.indexOf("select2-") === 0) {
-                    replacements.push(this);
-                }
-            });
-        }
-
-        classes = $.trim(src.attr("class"));
-
-        if (classes) {
-            classes = '' + classes; // for IE which returns object
-
-            $(classes.split(/\s+/)).each2(function() {
-                if (this.indexOf("select2-") !== 0) {
-                    adapted = adapter(this);
-
-                    if (adapted) {
-                        replacements.push(adapted);
-                    }
-                }
-            });
-        }
-
-        dest.attr("class", replacements.join(" "));
-    }
-
-
-    function markMatch(text, term, markup, escapeMarkup) {
-        var match=stripDiacritics(text.toUpperCase()).indexOf(stripDiacritics(term.toUpperCase())),
-            tl=term.length;
-
-        if (match<0) {
-            markup.push(escapeMarkup(text));
-            return;
-        }
-
-        markup.push(escapeMarkup(text.substring(0, match)));
-        markup.push("<span class='select2-match'>");
-        markup.push(escapeMarkup(text.substring(match, match + tl)));
-        markup.push("</span>");
-        markup.push(escapeMarkup(text.substring(match + tl, text.length)));
-    }
-
-    function defaultEscapeMarkup(markup) {
-        var replace_map = {
-            '\\': '&#92;',
-            '&': '&amp;',
-            '<': '&lt;',
-            '>': '&gt;',
-            '"': '&quot;',
-            "'": '&#39;',
-            "/": '&#47;'
-        };
-
-        return String(markup).replace(/[&<>"'\/\\]/g, function (match) {
-            return replace_map[match];
-        });
-    }
-
-    /**
-     * Produces an ajax-based query function
-     *
-     * @param options object containing configuration parameters
-     * @param options.params parameter map for the transport ajax call, can contain such options as cache, jsonpCallback, etc. see $.ajax
-     * @param options.transport function that will be used to execute the ajax request. must be compatible with parameters supported by $.ajax
-     * @param options.url url for the data
-     * @param options.data a function(searchTerm, pageNumber, context) that should return an object containing query string parameters for the above url.
-     * @param options.dataType request data type: ajax, jsonp, other datatypes supported by jQuery's $.ajax function or the transport function if specified
-     * @param options.quietMillis (optional) milliseconds to wait before making the ajaxRequest, helps debounce the ajax function if invoked too often
-     * @param options.results a function(remoteData, pageNumber, query) that converts data returned form the remote request to the format expected by Select2.
-     *      The expected format is an object containing the following keys:
-     *      results array of objects that will be used as choices
-     *      more (optional) boolean indicating whether there are more results available
-     *      Example: {results:[{id:1, text:'Red'},{id:2, text:'Blue'}], more:true}
-     */
-    function ajax(options) {
-        var timeout, // current scheduled but not yet executed request
-            handler = null,
-            quietMillis = options.quietMillis || 100,
-            ajaxUrl = options.url,
-            self = this;
-
-        return function (query) {
-            window.clearTimeout(timeout);
-            timeout = window.setTimeout(function () {
-                var data = options.data, // ajax data function
-                    url = ajaxUrl, // ajax url string or function
-                    transport = options.transport || $.fn.select2.ajaxDefaults.transport,
-                    // deprecated - to be removed in 4.0  - use params instead
-                    deprecated = {
-                        type: options.type || 'GET', // set type of request (GET or POST)
-                        cache: options.cache || false,
-                        jsonpCallback: options.jsonpCallback||undefined,
-                        dataType: options.dataType||"json"
-                    },
-                    params = $.extend({}, $.fn.select2.ajaxDefaults.params, deprecated);
-
-                data = data ? data.call(self, query.term, query.page, query.context) : null;
-                url = (typeof url === 'function') ? url.call(self, query.term, query.page, query.context) : url;
-
-                if (handler && typeof handler.abort === "function") { handler.abort(); }
-
-                if (options.params) {
-                    if ($.isFunction(options.params)) {
-                        $.extend(params, options.params.call(self));
-                    } else {
-                        $.extend(params, options.params);
-                    }
+                // Node .js allowance:
+                if (config.nodeIdCompat && jsSuffixRegExp.test(name[lastIndex])) {
+                    name[lastIndex] = name[lastIndex].replace(jsSuffixRegExp, '');
                 }
 
-                $.extend(params, {
-                    url: url,
-                    dataType: options.dataType,
-                    data: data,
-                    success: function (data) {
-                        // TODO - replace query.page with query so users have access to term, page, etc.
-                        // added query as third paramter to keep backwards compatibility
-                        var results = options.results(data, query.page, query);
-                        query.callback(results);
-                    },
-                    error: function(jqXHR, textStatus, errorThrown){
-                        var results = {
-                            hasError: true,
-                            jqXHR: jqXHR,
-                            textStatus: textStatus,
-                            errorThrown: errorThrown
-                        };
+                //Lop off the last part of baseParts, so that . matches the
+                //"directory" and not name of the baseName's module. For instance,
+                //baseName of "one/two/three", maps to "one/two/three.js", but we
+                //want the directory, "one/two" for this normalization.
+                name = baseParts.slice(0, baseParts.length - 1).concat(name);
 
-                        query.callback(results);
-                    }
-                });
-                handler = transport.call(self, params);
-            }, quietMillis);
-        };
-    }
-
-    /**
-     * Produces a query function that works with a local array
-     *
-     * @param options object containing configuration parameters. The options parameter can either be an array or an
-     * object.
-     *
-     * If the array form is used it is assumed that it contains objects with 'id' and 'text' keys.
-     *
-     * If the object form is used it is assumed that it contains 'data' and 'text' keys. The 'data' key should contain
-     * an array of objects that will be used as choices. These objects must contain at least an 'id' key. The 'text'
-     * key can either be a String in which case it is expected that each element in the 'data' array has a key with the
-     * value of 'text' which will be used to match choices. Alternatively, text can be a function(item) that can extract
-     * the text.
-     */
-    function local(options) {
-        var data = options, // data elements
-            dataText,
-            tmp,
-            text = function (item) { return ""+item.text; }; // function used to retrieve the text portion of a data item that is matched against the search
-
-         if ($.isArray(data)) {
-            tmp = data;
-            data = { results: tmp };
-        }
-
-         if ($.isFunction(data) === false) {
-            tmp = data;
-            data = function() { return tmp; };
-        }
-
-        var dataItem = data();
-        if (dataItem.text) {
-            text = dataItem.text;
-            // if text is not a function we assume it to be a key name
-            if (!$.isFunction(text)) {
-                dataText = dataItem.text; // we need to store this in a separate variable because in the next step data gets reset and data.text is no longer available
-                text = function (item) { return item[dataText]; };
-            }
-        }
-
-        return function (query) {
-            var t = query.term, filtered = { results: [] }, process;
-            if (t === "") {
-                query.callback(data());
-                return;
-            }
-
-            process = function(datum, collection) {
-                var group, attr;
-                datum = datum[0];
-                if (datum.children) {
-                    group = {};
-                    for (attr in datum) {
-                        if (datum.hasOwnProperty(attr)) group[attr]=datum[attr];
-                    }
-                    group.children=[];
-                    $(datum.children).each2(function(i, childDatum) { process(childDatum, group.children); });
-                    if (group.children.length || query.matcher(t, text(group), datum)) {
-                        collection.push(group);
-                    }
-                } else {
-                    if (query.matcher(t, text(datum), datum)) {
-                        collection.push(datum);
-                    }
-                }
-            };
-
-            $(data().results).each2(function(i, datum) { process(datum, filtered.results); });
-            query.callback(filtered);
-        };
-    }
-
-    // TODO javadoc
-    function tags(data) {
-        var isFunc = $.isFunction(data);
-        return function (query) {
-            var t = query.term, filtered = {results: []};
-            var result = isFunc ? data(query) : data;
-            if ($.isArray(result)) {
-                $(result).each(function () {
-                    var isObject = this.text !== undefined,
-                        text = isObject ? this.text : this;
-                    if (t === "" || query.matcher(t, text)) {
-                        filtered.results.push(isObject ? this : {id: this, text: this});
-                    }
-                });
-                query.callback(filtered);
-            }
-        };
-    }
-
-    /**
-     * Checks if the formatter function should be used.
-     *
-     * Throws an error if it is not a function. Returns true if it should be used,
-     * false if no formatting should be performed.
-     *
-     * @param formatter
-     */
-    function checkFormatter(formatter, formatterName) {
-        if ($.isFunction(formatter)) return true;
-        if (!formatter) return false;
-        if (typeof(formatter) === 'string') return true;
-        throw new Error(formatterName +" must be a string, function, or falsy value");
-    }
-
-  /**
-   * Returns a given value
-   * If given a function, returns its output
-   *
-   * @param val string|function
-   * @param context value of "this" to be passed to function
-   * @returns {*}
-   */
-    function evaluate(val, context) {
-        if ($.isFunction(val)) {
-            var args = Array.prototype.slice.call(arguments, 2);
-            return val.apply(context, args);
-        }
-        return val;
-    }
-
-    function countResults(results) {
-        var count = 0;
-        $.each(results, function(i, item) {
-            if (item.children) {
-                count += countResults(item.children);
-            } else {
-                count++;
-            }
-        });
-        return count;
-    }
-
-    /**
-     * Default tokenizer. This function uses breaks the input on substring match of any string from the
-     * opts.tokenSeparators array and uses opts.createSearchChoice to create the choice object. Both of those
-     * two options have to be defined in order for the tokenizer to work.
-     *
-     * @param input text user has typed so far or pasted into the search field
-     * @param selection currently selected choices
-     * @param selectCallback function(choice) callback tho add the choice to selection
-     * @param opts select2's opts
-     * @return undefined/null to leave the current input unchanged, or a string to change the input to the returned value
-     */
-    function defaultTokenizer(input, selection, selectCallback, opts) {
-        var original = input, // store the original so we can compare and know if we need to tell the search to update its text
-            dupe = false, // check for whether a token we extracted represents a duplicate selected choice
-            token, // token
-            index, // position at which the separator was found
-            i, l, // looping variables
-            separator; // the matched separator
-
-        if (!opts.createSearchChoice || !opts.tokenSeparators || opts.tokenSeparators.length < 1) return undefined;
-
-        while (true) {
-            index = -1;
-
-            for (i = 0, l = opts.tokenSeparators.length; i < l; i++) {
-                separator = opts.tokenSeparators[i];
-                index = input.indexOf(separator);
-                if (index >= 0) break;
-            }
-
-            if (index < 0) break; // did not find any token separator in the input string, bail
-
-            token = input.substring(0, index);
-            input = input.substring(index + separator.length);
-
-            if (token.length > 0) {
-                token = opts.createSearchChoice.call(this, token, selection);
-                if (token !== undefined && token !== null && opts.id(token) !== undefined && opts.id(token) !== null) {
-                    dupe = false;
-                    for (i = 0, l = selection.length; i < l; i++) {
-                        if (equal(opts.id(token), opts.id(selection[i]))) {
-                            dupe = true; break;
+                //start trimDots
+                for (i = 0; i < name.length; i += 1) {
+                    part = name[i];
+                    if (part === ".") {
+                        name.splice(i, 1);
+                        i -= 1;
+                    } else if (part === "..") {
+                        if (i === 1 && (name[2] === '..' || name[0] === '..')) {
+                            //End of the line. Keep at least one non-dot
+                            //path segment at the front so it can be mapped
+                            //correctly to disk. Otherwise, there is likely
+                            //no path mapping for a path starting with '..'.
+                            //This can still fail, but catches the most reasonable
+                            //uses of ..
+                            break;
+                        } else if (i > 0) {
+                            name.splice(i - 1, 2);
+                            i -= 2;
                         }
                     }
-
-                    if (!dupe) selectCallback(token);
                 }
+                //end trimDots
+
+                name = name.join("/");
+            } else if (name.indexOf('./') === 0) {
+                // No baseName, so this is ID is resolved relative
+                // to baseUrl, pull off the leading dot.
+                name = name.substring(2);
             }
         }
 
-        if (original!==input) return input;
-    }
-
-    function cleanupJQueryElements() {
-        var self = this;
-
-        $.each(arguments, function (i, element) {
-            self[element].remove();
-            self[element] = null;
-        });
-    }
-
-    /**
-     * Creates a new class
-     *
-     * @param superClass
-     * @param methods
-     */
-    function clazz(SuperClass, methods) {
-        var constructor = function () {};
-        constructor.prototype = new SuperClass;
-        constructor.prototype.constructor = constructor;
-        constructor.prototype.parent = SuperClass.prototype;
-        constructor.prototype = $.extend(constructor.prototype, methods);
-        return constructor;
-    }
-
-    AbstractSelect2 = clazz(Object, {
-
-        // abstract
-        bind: function (func) {
-            var self = this;
-            return function () {
-                func.apply(self, arguments);
-            };
-        },
-
-        // abstract
-        init: function (opts) {
-            var results, search, resultsSelector = ".select2-results";
-
-            // prepare options
-            this.opts = opts = this.prepareOpts(opts);
-
-            this.id=opts.id;
-
-            // destroy if called on an existing component
-            if (opts.element.data("select2") !== undefined &&
-                opts.element.data("select2") !== null) {
-                opts.element.data("select2").destroy();
-            }
-
-            this.container = this.createContainer();
-
-            this.liveRegion = $('.select2-hidden-accessible');
-            if (this.liveRegion.length == 0) {
-                this.liveRegion = $("<span>", {
-                        role: "status",
-                        "aria-live": "polite"
-                    })
-                    .addClass("select2-hidden-accessible")
-                    .appendTo(document.body);
-            }
-
-            this.containerId="s2id_"+(opts.element.attr("id") || "autogen"+nextUid());
-            this.containerEventName= this.containerId
-                .replace(/([.])/g, '_')
-                .replace(/([;&,\-\.\+\*\~':"\!\^#$%@\[\]\(\)=>\|])/g, '\\$1');
-            this.container.attr("id", this.containerId);
-
-            this.container.attr("title", opts.element.attr("title"));
-
-            this.body = $(document.body);
-
-            syncCssClasses(this.container, this.opts.element, this.opts.adaptContainerCssClass);
-
-            this.container.attr("style", opts.element.attr("style"));
-            this.container.css(evaluate(opts.containerCss, this.opts.element));
-            this.container.addClass(evaluate(opts.containerCssClass, this.opts.element));
-
-            this.elementTabIndex = this.opts.element.attr("tabindex");
-
-            // swap container for the element
-            this.opts.element
-                .data("select2", this)
-                .attr("tabindex", "-1")
-                .before(this.container)
-                .on("click.select2", killEvent); // do not leak click events
-
-            this.container.data("select2", this);
-
-            this.dropdown = this.container.find(".select2-drop");
-
-            syncCssClasses(this.dropdown, this.opts.element, this.opts.adaptDropdownCssClass);
-
-            this.dropdown.addClass(evaluate(opts.dropdownCssClass, this.opts.element));
-            this.dropdown.data("select2", this);
-            this.dropdown.on("click", killEvent);
-
-            this.results = results = this.container.find(resultsSelector);
-            this.search = search = this.container.find("input.select2-input");
-
-            this.queryCount = 0;
-            this.resultsPage = 0;
-            this.context = null;
-
-            // initialize the container
-            this.initContainer();
-
-            this.container.on("click", killEvent);
-
-            installFilteredMouseMove(this.results);
-
-            this.dropdown.on("mousemove-filtered", resultsSelector, this.bind(this.highlightUnderEvent));
-            this.dropdown.on("touchstart touchmove touchend", resultsSelector, this.bind(function (event) {
-                this._touchEvent = true;
-                this.highlightUnderEvent(event);
-            }));
-            this.dropdown.on("touchmove", resultsSelector, this.bind(this.touchMoved));
-            this.dropdown.on("touchstart touchend", resultsSelector, this.bind(this.clearTouchMoved));
-
-            // Waiting for a click event on touch devices to select option and hide dropdown
-            // otherwise click will be triggered on an underlying element
-            this.dropdown.on('click', this.bind(function (event) {
-                if (this._touchEvent) {
-                    this._touchEvent = false;
-                    this.selectHighlighted();
-                }
-            }));
-
-            installDebouncedScroll(80, this.results);
-            this.dropdown.on("scroll-debounced", resultsSelector, this.bind(this.loadMoreIfNeeded));
-
-            // do not propagate change event from the search field out of the component
-            $(this.container).on("change", ".select2-input", function(e) {e.stopPropagation();});
-            $(this.dropdown).on("change", ".select2-input", function(e) {e.stopPropagation();});
-
-            // if jquery.mousewheel plugin is installed we can prevent out-of-bounds scrolling of results via mousewheel
-            if ($.fn.mousewheel) {
-                results.mousewheel(function (e, delta, deltaX, deltaY) {
-                    var top = results.scrollTop();
-                    if (deltaY > 0 && top - deltaY <= 0) {
-                        results.scrollTop(0);
-                        killEvent(e);
-                    } else if (deltaY < 0 && results.get(0).scrollHeight - results.scrollTop() + deltaY <= results.height()) {
-                        results.scrollTop(results.get(0).scrollHeight - results.height());
-                        killEvent(e);
-                    }
-                });
-            }
-
-            installKeyUpChangeEvent(search);
-            search.on("keyup-change input paste", this.bind(this.updateResults));
-            search.on("focus", function () { search.addClass("select2-focused"); });
-            search.on("blur", function () { search.removeClass("select2-focused");});
-
-            this.dropdown.on("mouseup", resultsSelector, this.bind(function (e) {
-                if ($(e.target).closest(".select2-result-selectable").length > 0) {
-                    this.highlightUnderEvent(e);
-                    this.selectHighlighted(e);
-                }
-            }));
-
-            // trap all mouse events from leaving the dropdown. sometimes there may be a modal that is listening
-            // for mouse events outside of itself so it can close itself. since the dropdown is now outside the select2's
-            // dom it will trigger the popup close, which is not what we want
-            // focusin can cause focus wars between modals and select2 since the dropdown is outside the modal.
-            this.dropdown.on("click mouseup mousedown touchstart touchend focusin", function (e) { e.stopPropagation(); });
-
-            this.lastSearchTerm = undefined;
-
-            if ($.isFunction(this.opts.initSelection)) {
-                // initialize selection based on the current value of the source element
-                this.initSelection();
-
-                // if the user has provided a function that can set selection based on the value of the source element
-                // we monitor the change event on the element and trigger it, allowing for two way synchronization
-                this.monitorSource();
-            }
-
-            if (opts.maximumInputLength !== null) {
-                this.search.attr("maxlength", opts.maximumInputLength);
-            }
-
-            var disabled = opts.element.prop("disabled");
-            if (disabled === undefined) disabled = false;
-            this.enable(!disabled);
-
-            var readonly = opts.element.prop("readonly");
-            if (readonly === undefined) readonly = false;
-            this.readonly(readonly);
-
-            // Calculate size of scrollbar
-            scrollBarDimensions = scrollBarDimensions || measureScrollbar();
-
-            this.autofocus = opts.element.prop("autofocus");
-            opts.element.prop("autofocus", false);
-            if (this.autofocus) this.focus();
-
-            this.search.attr("placeholder", opts.searchInputPlaceholder);
-        },
-
-        // abstract
-        destroy: function () {
-            var element=this.opts.element, select2 = element.data("select2"), self = this;
-
-            this.close();
-
-            if (element.length && element[0].detachEvent && self._sync) {
-                element.each(function () {
-                    if (self._sync) {
-                        this.detachEvent("onpropertychange", self._sync);
-                    }
-                });
-            }
-            if (this.propertyObserver) {
-                this.propertyObserver.disconnect();
-                this.propertyObserver = null;
-            }
-            this._sync = null;
-
-            if (select2 !== undefined) {
-                select2.container.remove();
-                select2.liveRegion.remove();
-                select2.dropdown.remove();
-                element.removeData("select2")
-                    .off(".select2");
-                if (!element.is("input[type='hidden']")) {
-                    element
-                        .show()
-                        .prop("autofocus", this.autofocus || false);
-                    if (this.elementTabIndex) {
-                        element.attr({tabindex: this.elementTabIndex});
-                    } else {
-                        element.removeAttr("tabindex");
-                    }
-                    element.show();
-                } else {
-                    element.css("display", "");
-                }
-            }
-
-            cleanupJQueryElements.call(this,
-                "container",
-                "liveRegion",
-                "dropdown",
-                "results",
-                "search"
-            );
-        },
-
-        // abstract
-        optionToData: function(element) {
-            if (element.is("option")) {
-                return {
-                    id:element.prop("value"),
-                    text:element.text(),
-                    element: element.get(),
-                    css: element.attr("class"),
-                    disabled: element.prop("disabled"),
-                    locked: equal(element.attr("locked"), "locked") || equal(element.data("locked"), true)
-                };
-            } else if (element.is("optgroup")) {
-                return {
-                    text:element.attr("label"),
-                    children:[],
-                    element: element.get(),
-                    css: element.attr("class")
-                };
-            }
-        },
-
-        // abstract
-        prepareOpts: function (opts) {
-            var element, select, idKey, ajaxUrl, self = this;
-
-            element = opts.element;
-
-            if (element.get(0).tagName.toLowerCase() === "select") {
-                this.select = select = opts.element;
-            }
-
-            if (select) {
-                // these options are not allowed when attached to a select because they are picked up off the element itself
-                $.each(["id", "multiple", "ajax", "query", "createSearchChoice", "initSelection", "data", "tags"], function () {
-                    if (this in opts) {
-                        throw new Error("Option '" + this + "' is not allowed for Select2 when attached to a <select> element.");
-                    }
-                });
-            }
-
-            opts.debug = opts.debug || $.fn.select2.defaults.debug;
-
-            // Warnings for options renamed/removed in Select2 4.0.0
-            // Only when it's enabled through debug mode
-            if (opts.debug && console && console.warn) {
-                // id was removed
-                if (opts.id != null) {
-                    console.warn(
-                        'Select2: The `id` option has been removed in Select2 4.0.0, ' +
-                        'consider renaming your `id` property or mapping the property before your data makes it to Select2. ' +
-                        'You can read more at https://select2.github.io/announcements-4.0.html#changed-id'
-                    );
-                }
-
-                // text was removed
-                if (opts.text != null) {
-                    console.warn(
-                        'Select2: The `text` option has been removed in Select2 4.0.0, ' +
-                        'consider renaming your `text` property or mapping the property before your data makes it to Select2. ' +
-                        'You can read more at https://select2.github.io/announcements-4.0.html#changed-id'
-                    );
-                }
-
-                // sortResults was renamed to results
-                if (opts.sortResults != null) {
-                    console.warn(
-                        'Select2: the `sortResults` option has been renamed to `sorter` in Select2 4.0.0. '
-                    );
-                }
-
-                // selectOnBlur was renamed to selectOnClose
-                if (opts.selectOnBlur != null) {
-                    console.warn(
-                        'Select2: The `selectOnBlur` option has been renamed to `selectOnClose` in Select2 4.0.0.'
-                    );
-                }
-
-                // ajax.results was renamed to ajax.processResults
-                if (opts.ajax != null && opts.ajax.results != null) {
-                    console.warn(
-                        'Select2: The `ajax.results` option has been renamed to `ajax.processResults` in Select2 4.0.0.'
-                    );
-                }
-
-                // format* options were renamed to language.*
-                if (opts.formatNoResults != null) {
-                    console.warn(
-                        'Select2: The `formatNoResults` option has been renamed to `language.noResults` in Select2 4.0.0.'
-                    );
-                }
-                if (opts.formatSearching != null) {
-                    console.warn(
-                        'Select2: The `formatSearching` option has been renamed to `language.searching` in Select2 4.0.0.'
-                    );
-                }
-                if (opts.formatInputTooShort != null) {
-                    console.warn(
-                        'Select2: The `formatInputTooShort` option has been renamed to `language.inputTooShort` in Select2 4.0.0.'
-                    );
-                }
-                if (opts.formatInputTooLong != null) {
-                    console.warn(
-                        'Select2: The `formatInputTooLong` option has been renamed to `language.inputTooLong` in Select2 4.0.0.'
-                    );
-                }
-                if (opts.formatLoading != null) {
-                    console.warn(
-                        'Select2: The `formatLoading` option has been renamed to `language.loadingMore` in Select2 4.0.0.'
-                    );
-                }
-                if (opts.formatSelectionTooBig != null) {
-                    console.warn(
-                        'Select2: The `formatSelectionTooBig` option has been renamed to `language.maximumSelected` in Select2 4.0.0.'
-                    );
-                }
-
-                if (opts.element.data('select2Tags')) {
-                    console.warn(
-                        'Select2: The `data-select2-tags` attribute has been renamed to `data-tags` in Select2 4.0.0.'
-                    );
-                }
-            }
-
-            // Aliasing options renamed in Select2 4.0.0
-
-            // data-select2-tags -> data-tags
-            if (opts.element.data('tags') != null) {
-                var elemTags = opts.element.data('tags');
-
-                // data-tags should actually be a boolean
-                if (!$.isArray(elemTags)) {
-                    elemTags = [];
-                }
-
-                opts.element.data('select2Tags', elemTags);
-            }
-
-            // sortResults -> sorter
-            if (opts.sorter != null) {
-                opts.sortResults = opts.sorter;
-            }
-
-            // selectOnBlur -> selectOnClose
-            if (opts.selectOnClose != null) {
-                opts.selectOnBlur = opts.selectOnClose;
-            }
-
-            // ajax.results -> ajax.processResults
-            if (opts.ajax != null) {
-                if ($.isFunction(opts.ajax.processResults)) {
-                    opts.ajax.results = opts.ajax.processResults;
-                }
-            }
-
-            // Formatters/language options
-            if (opts.language != null) {
-                var lang = opts.language;
-
-                // formatNoMatches -> language.noMatches
-                if ($.isFunction(lang.noMatches)) {
-                    opts.formatNoMatches = lang.noMatches;
-                }
-
-                // formatSearching -> language.searching
-                if ($.isFunction(lang.searching)) {
-                    opts.formatSearching = lang.searching;
-                }
-
-                // formatInputTooShort -> language.inputTooShort
-                if ($.isFunction(lang.inputTooShort)) {
-                    opts.formatInputTooShort = lang.inputTooShort;
-                }
-
-                // formatInputTooLong -> language.inputTooLong
-                if ($.isFunction(lang.inputTooLong)) {
-                    opts.formatInputTooLong = lang.inputTooLong;
-                }
-
-                // formatLoading -> language.loadingMore
-                if ($.isFunction(lang.loadingMore)) {
-                    opts.formatLoading = lang.loadingMore;
-                }
-
-                // formatSelectionTooBig -> language.maximumSelected
-                if ($.isFunction(lang.maximumSelected)) {
-                    opts.formatSelectionTooBig = lang.maximumSelected;
-                }
-            }
-
-            opts = $.extend({}, {
-                populateResults: function(container, results, query) {
-                    var populate, id=this.opts.id, liveRegion=this.liveRegion;
-
-                    populate=function(results, container, depth) {
-
-                        var i, l, result, selectable, disabled, compound, node, label, innerContainer, formatted;
-
-                        results = opts.sortResults(results, container, query);
-
-                        // collect the created nodes for bulk append
-                        var nodes = [];
-                        for (i = 0, l = results.length; i < l; i = i + 1) {
-
-                            result=results[i];
-
-                            disabled = (result.disabled === true);
-                            selectable = (!disabled) && (id(result) !== undefined);
-
-                            compound=result.children && result.children.length > 0;
-
-                            node=$("<li></li>");
-                            node.addClass("select2-results-dept-"+depth);
-                            node.addClass("select2-result");
-                            node.addClass(selectable ? "select2-result-selectable" : "select2-result-unselectable");
-                            if (disabled) { node.addClass("select2-disabled"); }
-                            if (compound) { node.addClass("select2-result-with-children"); }
-                            node.addClass(self.opts.formatResultCssClass(result));
-                            node.attr("role", "presentation");
-
-                            label=$(document.createElement("div"));
-                            label.addClass("select2-result-label");
-                            label.attr("id", "select2-result-label-" + nextUid());
-                            label.attr("role", "option");
-
-                            formatted=opts.formatResult(result, label, query, self.opts.escapeMarkup);
-                            if (formatted!==undefined) {
-                                label.html(formatted);
-                                node.append(label);
-                            }
-
-
-                            if (compound) {
-                                innerContainer=$("<ul></ul>");
-                                innerContainer.addClass("select2-result-sub");
-                                populate(result.children, innerContainer, depth+1);
-                                node.append(innerContainer);
-                            }
-
-                            node.data("select2-data", result);
-                            nodes.push(node[0]);
-                        }
-
-                        // bulk append the created nodes
-                        container.append(nodes);
-                        liveRegion.text(opts.formatMatches(results.length));
-                    };
-
-                    populate(results, container, 0);
-                }
-            }, $.fn.select2.defaults, opts);
-
-            if (typeof(opts.id) !== "function") {
-                idKey = opts.id;
-                opts.id = function (e) { return e[idKey]; };
-            }
-
-            if ($.isArray(opts.element.data("select2Tags"))) {
-                if ("tags" in opts) {
-                    throw "tags specified as both an attribute 'data-select2-tags' and in options of Select2 " + opts.element.attr("id");
-                }
-                opts.tags=opts.element.data("select2Tags");
-            }
-
-            if (select) {
-                opts.query = this.bind(function (query) {
-                    var data = { results: [], more: false },
-                        term = query.term,
-                        children, placeholderOption, process;
-
-                    process=function(element, collection) {
-                        var group;
-                        if (element.is("option")) {
-                            if (query.matcher(term, element.text(), element)) {
-                                collection.push(self.optionToData(element));
-                            }
-                        } else if (element.is("optgroup")) {
-                            group=self.optionToData(element);
-                            element.children().each2(function(i, elm) { process(elm, group.children); });
-                            if (group.children.length>0) {
-                                collection.push(group);
+        //Apply map config if available.
+        if ((baseParts || starMap) && map) {
+            nameParts = name.split('/');
+
+            for (i = nameParts.length; i > 0; i -= 1) {
+                nameSegment = nameParts.slice(0, i).join("/");
+
+                if (baseParts) {
+                    //Find the longest baseName segment match in the config.
+                    //So, do joins on the biggest to smallest lengths of baseParts.
+                    for (j = baseParts.length; j > 0; j -= 1) {
+                        mapValue = map[baseParts.slice(0, j).join('/')];
+
+                        //baseName segment has  config, find if it has one for
+                        //this name.
+                        if (mapValue) {
+                            mapValue = mapValue[nameSegment];
+                            if (mapValue) {
+                                //Match, update name to the new value.
+                                foundMap = mapValue;
+                                foundI = i;
+                                break;
                             }
                         }
-                    };
-
-                    children=element.children();
-
-                    // ignore the placeholder option if there is one
-                    if (this.getPlaceholder() !== undefined && children.length > 0) {
-                        placeholderOption = this.getPlaceholderOption();
-                        if (placeholderOption) {
-                            children=children.not(placeholderOption);
-                        }
-                    }
-
-                    children.each2(function(i, elm) { process(elm, data.results); });
-
-                    query.callback(data);
-                });
-                // this is needed because inside val() we construct choices from options and their id is hardcoded
-                opts.id=function(e) { return e.id; };
-            } else {
-                if (!("query" in opts)) {
-                    if ("ajax" in opts) {
-                        ajaxUrl = opts.element.data("ajax-url");
-                        if (ajaxUrl && ajaxUrl.length > 0) {
-                            opts.ajax.url = ajaxUrl;
-                        }
-                        opts.query = ajax.call(opts.element, opts.ajax);
-                    } else if ("data" in opts) {
-                        opts.query = local(opts.data);
-                    } else if ("tags" in opts) {
-                        opts.query = tags(opts.tags);
-                        if (opts.createSearchChoice === undefined) {
-                            opts.createSearchChoice = function (term) { return {id: $.trim(term), text: $.trim(term)}; };
-                        }
-                        if (opts.initSelection === undefined) {
-                            opts.initSelection = function (element, callback) {
-                                var data = [];
-                                $(splitVal(element.val(), opts.separator, opts.transformVal)).each(function () {
-                                    var obj = { id: this, text: this },
-                                        tags = opts.tags;
-                                    if ($.isFunction(tags)) tags=tags();
-                                    $(tags).each(function() { if (equal(this.id, obj.id)) { obj = this; return false; } });
-                                    data.push(obj);
-                                });
-
-                                callback(data);
-                            };
-                        }
                     }
                 }
-            }
-            if (typeof(opts.query) !== "function") {
-                throw "query function not defined for Select2 " + opts.element.attr("id");
-            }
 
-            if (opts.createSearchChoicePosition === 'top') {
-                opts.createSearchChoicePosition = function(list, item) { list.unshift(item); };
-            }
-            else if (opts.createSearchChoicePosition === 'bottom') {
-                opts.createSearchChoicePosition = function(list, item) { list.push(item); };
-            }
-            else if (typeof(opts.createSearchChoicePosition) !== "function")  {
-                throw "invalid createSearchChoicePosition option must be 'top', 'bottom' or a custom function";
-            }
-
-            return opts;
-        },
-
-        /**
-         * Monitor the original element for changes and update select2 accordingly
-         */
-        // abstract
-        monitorSource: function () {
-            var el = this.opts.element, observer, self = this;
-
-            el.on("change.select2", this.bind(function (e) {
-                if (this.opts.element.data("select2-change-triggered") !== true) {
-                    this.initSelection();
-                }
-            }));
-
-            this._sync = this.bind(function () {
-
-                // sync enabled state
-                var disabled = el.prop("disabled");
-                if (disabled === undefined) disabled = false;
-                this.enable(!disabled);
-
-                var readonly = el.prop("readonly");
-                if (readonly === undefined) readonly = false;
-                this.readonly(readonly);
-
-                if (this.container) {
-                    syncCssClasses(this.container, this.opts.element, this.opts.adaptContainerCssClass);
-                    this.container.addClass(evaluate(this.opts.containerCssClass, this.opts.element));
-                }
-
-                if (this.dropdown) {
-                    syncCssClasses(this.dropdown, this.opts.element, this.opts.adaptDropdownCssClass);
-                    this.dropdown.addClass(evaluate(this.opts.dropdownCssClass, this.opts.element));
-                }
-
-            });
-
-            // IE8-10 (IE9/10 won't fire propertyChange via attachEventListener)
-            if (el.length && el[0].attachEvent) {
-                el.each(function() {
-                    this.attachEvent("onpropertychange", self._sync);
-                });
-            }
-
-            // safari, chrome, firefox, IE11
-            observer = window.MutationObserver || window.WebKitMutationObserver|| window.MozMutationObserver;
-            if (observer !== undefined) {
-                if (this.propertyObserver) { delete this.propertyObserver; this.propertyObserver = null; }
-                this.propertyObserver = new observer(function (mutations) {
-                    $.each(mutations, self._sync);
-                });
-                this.propertyObserver.observe(el.get(0), { attributes:true, subtree:false });
-            }
-        },
-
-        // abstract
-        triggerSelect: function(data) {
-            var evt = $.Event("select2-selecting", { val: this.id(data), object: data, choice: data });
-            this.opts.element.trigger(evt);
-            return !evt.isDefaultPrevented();
-        },
-
-        /**
-         * Triggers the change event on the source element
-         */
-        // abstract
-        triggerChange: function (details) {
-
-            details = details || {};
-            details= $.extend({}, details, { type: "change", val: this.val() });
-            // prevents recursive triggering
-            this.opts.element.data("select2-change-triggered", true);
-            this.opts.element.trigger(details);
-            this.opts.element.data("select2-change-triggered", false);
-
-            // some validation frameworks ignore the change event and listen instead to keyup, click for selects
-            // so here we trigger the click event manually
-            this.opts.element.click();
-
-            // ValidationEngine ignores the change event and listens instead to blur
-            // so here we trigger the blur event manually if so desired
-            if (this.opts.blurOnChange)
-                this.opts.element.blur();
-        },
-
-        //abstract
-        isInterfaceEnabled: function()
-        {
-            return this.enabledInterface === true;
-        },
-
-        // abstract
-        enableInterface: function() {
-            var enabled = this._enabled && !this._readonly,
-                disabled = !enabled;
-
-            if (enabled === this.enabledInterface) return false;
-
-            this.container.toggleClass("select2-container-disabled", disabled);
-            this.close();
-            this.enabledInterface = enabled;
-
-            return true;
-        },
-
-        // abstract
-        enable: function(enabled) {
-            if (enabled === undefined) enabled = true;
-            if (this._enabled === enabled) return;
-            this._enabled = enabled;
-
-            this.opts.element.prop("disabled", !enabled);
-            this.enableInterface();
-        },
-
-        // abstract
-        disable: function() {
-            this.enable(false);
-        },
-
-        // abstract
-        readonly: function(enabled) {
-            if (enabled === undefined) enabled = false;
-            if (this._readonly === enabled) return;
-            this._readonly = enabled;
-
-            this.opts.element.prop("readonly", enabled);
-            this.enableInterface();
-        },
-
-        // abstract
-        opened: function () {
-            return (this.container) ? this.container.hasClass("select2-dropdown-open") : false;
-        },
-
-        // abstract
-        positionDropdown: function() {
-            var $dropdown = this.dropdown,
-                container = this.container,
-                offset = container.offset(),
-                height = container.outerHeight(false),
-                width = container.outerWidth(false),
-                dropHeight = $dropdown.outerHeight(false),
-                $window = $(window),
-                windowWidth = $window.width(),
-                windowHeight = $window.height(),
-                viewPortRight = $window.scrollLeft() + windowWidth,
-                viewportBottom = $window.scrollTop() + windowHeight,
-                dropTop = offset.top + height,
-                dropLeft = offset.left,
-                enoughRoomBelow = dropTop + dropHeight <= viewportBottom,
-                enoughRoomAbove = (offset.top - dropHeight) >= $window.scrollTop(),
-                dropWidth = $dropdown.outerWidth(false),
-                enoughRoomOnRight = function() {
-                    return dropLeft + dropWidth <= viewPortRight;
-                },
-                enoughRoomOnLeft = function() {
-                    return offset.left + viewPortRight + container.outerWidth(false)  > dropWidth;
-                },
-                aboveNow = $dropdown.hasClass("select2-drop-above"),
-                bodyOffset,
-                above,
-                changeDirection,
-                css,
-                resultsListNode;
-
-            // always prefer the current above/below alignment, unless there is not enough room
-            if (aboveNow) {
-                above = true;
-                if (!enoughRoomAbove && enoughRoomBelow) {
-                    changeDirection = true;
-                    above = false;
-                }
-            } else {
-                above = false;
-                if (!enoughRoomBelow && enoughRoomAbove) {
-                    changeDirection = true;
-                    above = true;
-                }
-            }
-
-            //if we are changing direction we need to get positions when dropdown is hidden;
-            if (changeDirection) {
-                $dropdown.hide();
-                offset = this.container.offset();
-                height = this.container.outerHeight(false);
-                width = this.container.outerWidth(false);
-                dropHeight = $dropdown.outerHeight(false);
-                viewPortRight = $window.scrollLeft() + windowWidth;
-                viewportBottom = $window.scrollTop() + windowHeight;
-                dropTop = offset.top + height;
-                dropLeft = offset.left;
-                dropWidth = $dropdown.outerWidth(false);
-                $dropdown.show();
-
-                // fix so the cursor does not move to the left within the search-textbox in IE
-                this.focusSearch();
-            }
-
-            if (this.opts.dropdownAutoWidth) {
-                resultsListNode = $('.select2-results', $dropdown)[0];
-                $dropdown.addClass('select2-drop-auto-width');
-                $dropdown.css('width', '');
-                // Add scrollbar width to dropdown if vertical scrollbar is present
-                dropWidth = $dropdown.outerWidth(false) + (resultsListNode.scrollHeight === resultsListNode.clientHeight ? 0 : scrollBarDimensions.width);
-                dropWidth > width ? width = dropWidth : dropWidth = width;
-                dropHeight = $dropdown.outerHeight(false);
-            }
-            else {
-                this.container.removeClass('select2-drop-auto-width');
-            }
-
-            //console.log("below/ droptop:", dropTop, "dropHeight", dropHeight, "sum", (dropTop+dropHeight)+" viewport bottom", viewportBottom, "enough?", enoughRoomBelow);
-            //console.log("above/ offset.top", offset.top, "dropHeight", dropHeight, "top", (offset.top-dropHeight), "scrollTop", this.body.scrollTop(), "enough?", enoughRoomAbove);
-
-            // fix positioning when body has an offset and is not position: static
-            if (this.body.css('position') !== 'static') {
-                bodyOffset = this.body.offset();
-                dropTop -= bodyOffset.top;
-                dropLeft -= bodyOffset.left;
-            }
-
-            if (!enoughRoomOnRight() && enoughRoomOnLeft()) {
-                dropLeft = offset.left + this.container.outerWidth(false) - dropWidth;
-            }
-
-            css =  {
-                left: dropLeft,
-                width: width
-            };
-
-            if (above) {
-                this.container.addClass("select2-drop-above");
-                $dropdown.addClass("select2-drop-above");
-                dropHeight = $dropdown.outerHeight(false);
-                css.top = offset.top - dropHeight;
-                css.bottom = 'auto';
-            }
-            else {
-                css.top = dropTop;
-                css.bottom = 'auto';
-                this.container.removeClass("select2-drop-above");
-                $dropdown.removeClass("select2-drop-above");
-            }
-            css = $.extend(css, evaluate(this.opts.dropdownCss, this.opts.element));
-
-            $dropdown.css(css);
-        },
-
-        // abstract
-        shouldOpen: function() {
-            var event;
-
-            if (this.opened()) return false;
-
-            if (this._enabled === false || this._readonly === true) return false;
-
-            event = $.Event("select2-opening");
-            this.opts.element.trigger(event);
-            return !event.isDefaultPrevented();
-        },
-
-        // abstract
-        clearDropdownAlignmentPreference: function() {
-            // clear the classes used to figure out the preference of where the dropdown should be opened
-            this.container.removeClass("select2-drop-above");
-            this.dropdown.removeClass("select2-drop-above");
-        },
-
-        /**
-         * Opens the dropdown
-         *
-         * @return {Boolean} whether or not dropdown was opened. This method will return false if, for example,
-         * the dropdown is already open, or if the 'open' event listener on the element called preventDefault().
-         */
-        // abstract
-        open: function () {
-
-            if (!this.shouldOpen()) return false;
-
-            this.opening();
-
-            // Only bind the document mousemove when the dropdown is visible
-            $document.on("mousemove.select2Event", function (e) {
-                lastMousePosition.x = e.pageX;
-                lastMousePosition.y = e.pageY;
-            });
-
-            return true;
-        },
-
-        /**
-         * Performs the opening of the dropdown
-         */
-        // abstract
-        opening: function() {
-            var cid = this.containerEventName,
-                scroll = "scroll." + cid,
-                resize = "resize."+cid,
-                orient = "orientationchange."+cid,
-                mask;
-
-            this.container.addClass("select2-dropdown-open").addClass("select2-container-active");
-
-            this.clearDropdownAlignmentPreference();
-
-            if(this.dropdown[0] !== this.body.children().last()[0]) {
-                this.dropdown.detach().appendTo(this.body);
-            }
-
-            // create the dropdown mask if doesn't already exist
-            mask = $("#select2-drop-mask");
-            if (mask.length === 0) {
-                mask = $(document.createElement("div"));
-                mask.attr("id","select2-drop-mask").attr("class","select2-drop-mask");
-                mask.hide();
-                mask.appendTo(this.body);
-                mask.on("mousedown touchstart click", function (e) {
-                    // Prevent IE from generating a click event on the body
-                    reinsertElement(mask);
-
-                    var dropdown = $("#select2-drop"), self;
-                    if (dropdown.length > 0) {
-                        self=dropdown.data("select2");
-                        if (self.opts.selectOnBlur) {
-                            self.selectHighlighted({noFocus: true});
-                        }
-                        self.close();
-                        e.preventDefault();
-                        e.stopPropagation();
-                    }
-                });
-            }
-
-            // ensure the mask is always right before the dropdown
-            if (this.dropdown.prev()[0] !== mask[0]) {
-                this.dropdown.before(mask);
-            }
-
-            // move the global id to the correct dropdown
-            $("#select2-drop").removeAttr("id");
-            this.dropdown.attr("id", "select2-drop");
-
-            // show the elements
-            mask.show();
-
-            this.positionDropdown();
-            this.dropdown.show();
-            this.positionDropdown();
-
-            this.dropdown.addClass("select2-drop-active");
-
-            // attach listeners to events that can change the position of the container and thus require
-            // the position of the dropdown to be updated as well so it does not come unglued from the container
-            var that = this;
-            this.container.parents().add(window).each(function () {
-                $(this).on(resize+" "+scroll+" "+orient, function (e) {
-                    if (that.opened()) that.positionDropdown();
-                });
-            });
-
-
-        },
-
-        // abstract
-        close: function () {
-            if (!this.opened()) return;
-
-            var cid = this.containerEventName,
-                scroll = "scroll." + cid,
-                resize = "resize."+cid,
-                orient = "orientationchange."+cid;
-
-            // unbind event listeners
-            this.container.parents().add(window).each(function () { $(this).off(scroll).off(resize).off(orient); });
-
-            this.clearDropdownAlignmentPreference();
-
-            $("#select2-drop-mask").hide();
-            this.dropdown.removeAttr("id"); // only the active dropdown has the select2-drop id
-            this.dropdown.hide();
-            this.container.removeClass("select2-dropdown-open").removeClass("select2-container-active");
-            this.results.empty();
-
-            // Now that the dropdown is closed, unbind the global document mousemove event
-            $document.off("mousemove.select2Event");
-
-            this.clearSearch();
-            this.search.removeClass("select2-active");
-
-            // Remove the aria active descendant for highlighted element
-            this.search.removeAttr("aria-activedescendant");
-            this.opts.element.trigger($.Event("select2-close"));
-        },
-
-        /**
-         * Opens control, sets input value, and updates results.
-         */
-        // abstract
-        externalSearch: function (term) {
-            this.open();
-            this.search.val(term);
-            this.updateResults(false);
-        },
-
-        // abstract
-        clearSearch: function () {
-
-        },
-
-        /**
-         * @return {Boolean} Whether or not search value was changed.
-         * @private
-         */
-        prefillNextSearchTerm: function () {
-            // initializes search's value with nextSearchTerm (if defined by user)
-            // ignore nextSearchTerm if the dropdown is opened by the user pressing a letter
-            if(this.search.val() !== "") {
-                return false;
-            }
-
-            var nextSearchTerm = this.opts.nextSearchTerm(this.data(), this.lastSearchTerm);
-            if(nextSearchTerm !== undefined){
-                this.search.val(nextSearchTerm);
-                this.search.select();
-                return true;
-            }
-
-            return false;
-        },
-
-        //abstract
-        getMaximumSelectionSize: function() {
-            return evaluate(this.opts.maximumSelectionSize, this.opts.element);
-        },
-
-        // abstract
-        ensureHighlightVisible: function () {
-            var results = this.results, children, index, child, hb, rb, y, more, topOffset;
-
-            index = this.highlight();
-
-            if (index < 0) return;
-
-            if (index == 0) {
-
-                // if the first element is highlighted scroll all the way to the top,
-                // that way any unselectable headers above it will also be scrolled
-                // into view
-
-                results.scrollTop(0);
-                return;
-            }
-
-            children = this.findHighlightableChoices().find('.select2-result-label');
-
-            child = $(children[index]);
-
-            topOffset = (child.offset() || {}).top || 0;
-
-            hb = topOffset + child.outerHeight(true);
-
-            // if this is the last child lets also make sure select2-more-results is visible
-            if (index === children.length - 1) {
-                more = results.find("li.select2-more-results");
-                if (more.length > 0) {
-                    hb = more.offset().top + more.outerHeight(true);
-                }
-            }
-
-            rb = results.offset().top + results.outerHeight(false);
-            if (hb > rb) {
-                results.scrollTop(results.scrollTop() + (hb - rb));
-            }
-            y = topOffset - results.offset().top;
-
-            // make sure the top of the element is visible
-            if (y < 0 && child.css('display') != 'none' ) {
-                results.scrollTop(results.scrollTop() + y); // y is negative
-            }
-        },
-
-        // abstract
-        findHighlightableChoices: function() {
-            return this.results.find(".select2-result-selectable:not(.select2-disabled):not(.select2-selected)");
-        },
-
-        // abstract
-        moveHighlight: function (delta) {
-            var choices = this.findHighlightableChoices(),
-                index = this.highlight();
-
-            while (index > -1 && index < choices.length) {
-                index += delta;
-                var choice = $(choices[index]);
-                if (choice.hasClass("select2-result-selectable") && !choice.hasClass("select2-disabled") && !choice.hasClass("select2-selected")) {
-                    this.highlight(index);
+                if (foundMap) {
                     break;
                 }
-            }
-        },
 
-        // abstract
-        highlight: function (index) {
-            var choices = this.findHighlightableChoices(),
-                choice,
-                data;
-
-            if (arguments.length === 0) {
-                return indexOf(choices.filter(".select2-highlighted")[0], choices.get());
-            }
-
-            if (index >= choices.length) index = choices.length - 1;
-            if (index < 0) index = 0;
-
-            this.removeHighlight();
-
-            choice = $(choices[index]);
-            choice.addClass("select2-highlighted");
-
-            // ensure assistive technology can determine the active choice
-            this.search.attr("aria-activedescendant", choice.find(".select2-result-label").attr("id"));
-
-            this.ensureHighlightVisible();
-
-            this.liveRegion.text(choice.text());
-
-            data = choice.data("select2-data");
-            if (data) {
-                this.opts.element.trigger({ type: "select2-highlight", val: this.id(data), choice: data });
-            }
-        },
-
-        removeHighlight: function() {
-            this.results.find(".select2-highlighted").removeClass("select2-highlighted");
-        },
-
-        touchMoved: function() {
-            this._touchMoved = true;
-        },
-
-        clearTouchMoved: function() {
-          this._touchMoved = false;
-        },
-
-        // abstract
-        countSelectableResults: function() {
-            return this.findHighlightableChoices().length;
-        },
-
-        // abstract
-        highlightUnderEvent: function (event) {
-            var el = $(event.target).closest(".select2-result-selectable");
-            if (el.length > 0 && !el.is(".select2-highlighted")) {
-                var choices = this.findHighlightableChoices();
-                this.highlight(choices.index(el));
-            } else if (el.length == 0) {
-                // if we are over an unselectable item remove all highlights
-                this.removeHighlight();
-            }
-        },
-
-        // abstract
-        loadMoreIfNeeded: function () {
-            var results = this.results,
-                more = results.find("li.select2-more-results"),
-                below, // pixels the element is below the scroll fold, below==0 is when the element is starting to be visible
-                page = this.resultsPage + 1,
-                self=this,
-                term=this.search.val(),
-                context=this.context;
-
-            if (more.length === 0) return;
-            below = more.offset().top - results.offset().top - results.height();
-
-            if (below <= this.opts.loadMorePadding) {
-                more.addClass("select2-active");
-                this.opts.query({
-                        element: this.opts.element,
-                        term: term,
-                        page: page,
-                        context: context,
-                        matcher: this.opts.matcher,
-                        callback: this.bind(function (data) {
-
-                    // ignore a response if the select2 has been closed before it was received
-                    if (!self.opened()) return;
-
-
-                    self.opts.populateResults.call(this, results, data.results, {term: term, page: page, context:context});
-                    self.postprocessResults(data, false, false);
-
-                    if (data.more===true) {
-                        more.detach().appendTo(results).html(self.opts.escapeMarkup(evaluate(self.opts.formatLoadMore, self.opts.element, page+1)));
-                        window.setTimeout(function() { self.loadMoreIfNeeded(); }, 10);
-                    } else {
-                        more.remove();
-                    }
-                    self.positionDropdown();
-                    self.resultsPage = page;
-                    self.context = data.context;
-                    this.opts.element.trigger({ type: "select2-loaded", items: data });
-                })});
-            }
-        },
-
-        /**
-         * Default tokenizer function which does nothing
-         */
-        tokenize: function() {
-
-        },
-
-        /**
-         * @param initial whether or not this is the call to this method right after the dropdown has been opened
-         */
-        // abstract
-        updateResults: function (initial) {
-            var search = this.search,
-                results = this.results,
-                opts = this.opts,
-                data,
-                self = this,
-                input,
-                term = search.val(),
-                lastTerm = $.data(this.container, "select2-last-term"),
-                // sequence number used to drop out-of-order responses
-                queryNumber;
-
-            // prevent duplicate queries against the same term
-            if (initial !== true && lastTerm && equal(term, lastTerm)) return;
-
-            $.data(this.container, "select2-last-term", term);
-
-            // if the search is currently hidden we do not alter the results
-            if (initial !== true && (this.showSearchInput === false || !this.opened())) {
-                return;
-            }
-
-            function postRender() {
-                search.removeClass("select2-active");
-                self.positionDropdown();
-                if (results.find('.select2-no-results,.select2-selection-limit,.select2-searching').length) {
-                    self.liveRegion.text(results.text());
-                }
-                else {
-                    self.liveRegion.text(self.opts.formatMatches(results.find('.select2-result-selectable:not(".select2-selected")').length));
+                //Check for a star map match, but just hold on to it,
+                //if there is a shorter segment match later in a matching
+                //config, then favor over this star map.
+                if (!foundStarMap && starMap && starMap[nameSegment]) {
+                    foundStarMap = starMap[nameSegment];
+                    starI = i;
                 }
             }
 
-            function render(html) {
-                results.html(html);
-                postRender();
+            if (!foundMap && foundStarMap) {
+                foundMap = foundStarMap;
+                foundI = starI;
             }
 
-            queryNumber = ++this.queryCount;
-
-            var maxSelSize = this.getMaximumSelectionSize();
-            if (maxSelSize >=1) {
-                data = this.data();
-                if ($.isArray(data) && data.length >= maxSelSize && checkFormatter(opts.formatSelectionTooBig, "formatSelectionTooBig")) {
-                    render("<li class='select2-selection-limit'>" + evaluate(opts.formatSelectionTooBig, opts.element, maxSelSize) + "</li>");
-                    return;
-                }
+            if (foundMap) {
+                nameParts.splice(0, foundI, foundMap);
+                name = nameParts.join('/');
             }
+        }
 
-            if (search.val().length < opts.minimumInputLength) {
-                if (checkFormatter(opts.formatInputTooShort, "formatInputTooShort")) {
-                    render("<li class='select2-no-results'>" + evaluate(opts.formatInputTooShort, opts.element, search.val(), opts.minimumInputLength) + "</li>");
-                } else {
-                    render("");
-                }
-                if (initial && this.showSearch) this.showSearch(true);
-                return;
+        return name;
+    }
+
+    function makeRequire(relName, forceSync) {
+        return function () {
+            //A version of a require function that passes a moduleName
+            //value for items that may need to
+            //look up paths relative to the moduleName
+            var args = aps.call(arguments, 0);
+
+            //If first arg is not require('string'), and there is only
+            //one arg, it is the array form without a callback. Insert
+            //a null so that the following concat is correct.
+            if (typeof args[0] !== 'string' && args.length === 1) {
+                args.push(null);
             }
+            return req.apply(undef, args.concat([relName, forceSync]));
+        };
+    }
 
-            if (opts.maximumInputLength && search.val().length > opts.maximumInputLength) {
-                if (checkFormatter(opts.formatInputTooLong, "formatInputTooLong")) {
-                    render("<li class='select2-no-results'>" + evaluate(opts.formatInputTooLong, opts.element, search.val(), opts.maximumInputLength) + "</li>");
-                } else {
-                    render("");
-                }
-                return;
+    function makeNormalize(relName) {
+        return function (name) {
+            return normalize(name, relName);
+        };
+    }
+
+    function makeLoad(depName) {
+        return function (value) {
+            defined[depName] = value;
+        };
+    }
+
+    function callDep(name) {
+        if (hasProp(waiting, name)) {
+            var args = waiting[name];
+            delete waiting[name];
+            defining[name] = true;
+            main.apply(undef, args);
+        }
+
+        if (!hasProp(defined, name) && !hasProp(defining, name)) {
+            throw new Error('No ' + name);
+        }
+        return defined[name];
+    }
+
+    //Turns a plugin!resource to [plugin, resource]
+    //with the plugin being undefined if the name
+    //did not have a plugin prefix.
+    function splitPrefix(name) {
+        var prefix,
+            index = name ? name.indexOf('!') : -1;
+        if (index > -1) {
+            prefix = name.substring(0, index);
+            name = name.substring(index + 1, name.length);
+        }
+        return [prefix, name];
+    }
+
+    /**
+     * Makes a name map, normalizing the name, and using a plugin
+     * for normalization if necessary. Grabs a ref to plugin
+     * too, as an optimization.
+     */
+    makeMap = function (name, relName) {
+        var plugin,
+            parts = splitPrefix(name),
+            prefix = parts[0];
+
+        name = parts[1];
+
+        if (prefix) {
+            prefix = normalize(prefix, relName);
+            plugin = callDep(prefix);
+        }
+
+        //Normalize according
+        if (prefix) {
+            if (plugin && plugin.normalize) {
+                name = plugin.normalize(name, makeNormalize(relName));
+            } else {
+                name = normalize(name, relName);
             }
-
-            if (opts.formatSearching && this.findHighlightableChoices().length === 0) {
-                render("<li class='select2-searching'>" + evaluate(opts.formatSearching, opts.element) + "</li>");
+        } else {
+            name = normalize(name, relName);
+            parts = splitPrefix(name);
+            prefix = parts[0];
+            name = parts[1];
+            if (prefix) {
+                plugin = callDep(prefix);
             }
+        }
 
-            search.addClass("select2-active");
+        //Using ridiculous property names for space reasons
+        return {
+            f: prefix ? prefix + '!' + name : name, //fullName
+            n: name,
+            pr: prefix,
+            p: plugin
+        };
+    };
 
-            this.removeHighlight();
+    function makeConfig(name) {
+        return function () {
+            return (config && config.config && config.config[name]) || {};
+        };
+    }
 
-            // give the tokenizer a chance to pre-process the input
-            input = this.tokenize();
-            if (input != undefined && input != null) {
-                search.val(input);
-            }
-
-            this.resultsPage = 1;
-
-            opts.query({
-                element: opts.element,
-                    term: search.val(),
-                    page: this.resultsPage,
-                    context: null,
-                    matcher: opts.matcher,
-                    callback: this.bind(function (data) {
-                var def; // default choice
-
-                // ignore old responses
-                if (queryNumber != this.queryCount) {
-                  return;
-                }
-
-                // ignore a response if the select2 has been closed before it was received
-                if (!this.opened()) {
-                    this.search.removeClass("select2-active");
-                    return;
-                }
-
-                // handle ajax error
-                if(data.hasError !== undefined && checkFormatter(opts.formatAjaxError, "formatAjaxError")) {
-                    render("<li class='select2-ajax-error'>" + evaluate(opts.formatAjaxError, opts.element, data.jqXHR, data.textStatus, data.errorThrown) + "</li>");
-                    return;
-                }
-
-                // save context, if any
-                this.context = (data.context===undefined) ? null : data.context;
-                // create a default choice and prepend it to the list
-                if (this.opts.createSearchChoice && search.val() !== "") {
-                    def = this.opts.createSearchChoice.call(self, search.val(), data.results);
-                    if (def !== undefined && def !== null && self.id(def) !== undefined && self.id(def) !== null) {
-                        if ($(data.results).filter(
-                            function () {
-                                return equal(self.id(this), self.id(def));
-                            }).length === 0) {
-                            this.opts.createSearchChoicePosition(data.results, def);
-                        }
-                    }
-                }
-
-                if (data.results.length === 0 && checkFormatter(opts.formatNoMatches, "formatNoMatches")) {
-                    render("<li class='select2-no-results'>" + evaluate(opts.formatNoMatches, opts.element, search.val()) + "</li>");
-                    if(this.showSearch){
-                        this.showSearch(search.val());
-                    }
-                    return;
-                }
-
-                results.empty();
-                self.opts.populateResults.call(this, results, data.results, {term: search.val(), page: this.resultsPage, context:null});
-
-                if (data.more === true && checkFormatter(opts.formatLoadMore, "formatLoadMore")) {
-                    results.append("<li class='select2-more-results'>" + opts.escapeMarkup(evaluate(opts.formatLoadMore, opts.element, this.resultsPage)) + "</li>");
-                    window.setTimeout(function() { self.loadMoreIfNeeded(); }, 10);
-                }
-
-                this.postprocessResults(data, initial);
-
-                postRender();
-
-                this.opts.element.trigger({ type: "select2-loaded", items: data });
-            })});
+    handlers = {
+        require: function (name) {
+            return makeRequire(name);
         },
-
-        // abstract
-        cancel: function () {
-            this.close();
-        },
-
-        // abstract
-        blur: function () {
-            // if selectOnBlur == true, select the currently highlighted option
-            if (this.opts.selectOnBlur)
-                this.selectHighlighted({noFocus: true});
-
-            this.close();
-            this.container.removeClass("select2-container-active");
-            // synonymous to .is(':focus'), which is available in jquery >= 1.6
-            if (this.search[0] === document.activeElement) { this.search.blur(); }
-            this.clearSearch();
-            this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus");
-        },
-
-        // abstract
-        focusSearch: function () {
-            focus(this.search);
-        },
-
-        // abstract
-        selectHighlighted: function (options) {
-            if (this._touchMoved) {
-              this.clearTouchMoved();
-              return;
-            }
-            var index=this.highlight(),
-                highlighted=this.results.find(".select2-highlighted"),
-                data = highlighted.closest('.select2-result').data("select2-data");
-
-            if (data) {
-                this.highlight(index);
-                this.onSelect(data, options);
-            } else if (options && options.noFocus) {
-                this.close();
+        exports: function (name) {
+            var e = defined[name];
+            if (typeof e !== 'undefined') {
+                return e;
+            } else {
+                return (defined[name] = {});
             }
         },
-
-        // abstract
-        getPlaceholder: function () {
-            var placeholderOption;
-            return this.opts.element.attr("placeholder") ||
-                this.opts.element.attr("data-placeholder") || // jquery 1.4 compat
-                this.opts.element.data("placeholder") ||
-                this.opts.placeholder ||
-                ((placeholderOption = this.getPlaceholderOption()) !== undefined ? placeholderOption.text() : undefined);
-        },
-
-        // abstract
-        getPlaceholderOption: function() {
-            if (this.select) {
-                var firstOption = this.select.children('option').first();
-                if (this.opts.placeholderOption !== undefined ) {
-                    //Determine the placeholder option based on the specified placeholderOption setting
-                    return (this.opts.placeholderOption === "first" && firstOption) ||
-                           (typeof this.opts.placeholderOption === "function" && this.opts.placeholderOption(this.select));
-                } else if ($.trim(firstOption.text()) === "" && firstOption.val() === "") {
-                    //No explicit placeholder option specified, use the first if it's blank
-                    return firstOption;
-                }
-            }
-        },
-
-        /**
-         * Get the desired width for the container element.  This is
-         * derived first from option `width` passed to select2, then
-         * the inline 'style' on the original element, and finally
-         * falls back to the jQuery calculated element width.
-         */
-        // abstract
-        initContainerWidth: function () {
-            function resolveContainerWidth() {
-                var style, attrs, matches, i, l, attr;
-
-                if (this.opts.width === "off") {
-                    return null;
-                } else if (this.opts.width === "element"){
-                    return this.opts.element.outerWidth(false) === 0 ? 'auto' : this.opts.element.outerWidth(false) + 'px';
-                } else if (this.opts.width === "copy" || this.opts.width === "resolve") {
-                    // check if there is inline style on the element that contains width
-                    style = this.opts.element.attr('style');
-                    if (typeof(style) === "string") {
-                        attrs = style.split(';');
-                        for (i = 0, l = attrs.length; i < l; i = i + 1) {
-                            attr = attrs[i].replace(/\s/g, '');
-                            matches = attr.match(/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i);
-                            if (matches !== null && matches.length >= 1)
-                                return matches[1];
-                        }
-                    }
-
-                    if (this.opts.width === "resolve") {
-                        // next check if css('width') can resolve a width that is percent based, this is sometimes possible
-                        // when attached to input type=hidden or elements hidden via css
-                        style = this.opts.element.css('width');
-                        if (style.indexOf("%") > 0) return style;
-
-                        // finally, fallback on the calculated width of the element
-                        return (this.opts.element.outerWidth(false) === 0 ? 'auto' : this.opts.element.outerWidth(false) + 'px');
-                    }
-
-                    return null;
-                } else if ($.isFunction(this.opts.width)) {
-                    return this.opts.width();
-                } else {
-                    return this.opts.width;
-               }
+        module: function (name) {
+            return {
+                id: name,
+                uri: '',
+                exports: defined[name],
+                config: makeConfig(name)
             };
-
-            var width = resolveContainerWidth.call(this);
-            if (width !== null) {
-                this.container.css("width", width);
-            }
         }
-    });
-
-    SingleSelect2 = clazz(AbstractSelect2, {
-
-        // single
-
-        createContainer: function () {
-            var container = $(document.createElement("div")).attr({
-                "class": "select2-container"
-            }).html([
-                "<a href='javascript:void(0)' class='select2-choice' tabindex='-1'>",
-                "   <span class='select2-chosen'>&#160;</span><abbr class='select2-search-choice-close'></abbr>",
-                "   <span class='select2-arrow' role='presentation'><b role='presentation'></b></span>",
-                "</a>",
-                "<label for='' class='select2-offscreen'></label>",
-                "<input class='select2-focusser select2-offscreen' type='text' aria-haspopup='true' role='button' />",
-                "<div class='select2-drop select2-display-none'>",
-                "   <div class='select2-search'>",
-                "       <label for='' class='select2-offscreen'></label>",
-                "       <input type='text' autocomplete='off' autocorrect='off' autocapitalize='off' spellcheck='false' class='select2-input' role='combobox' aria-expanded='true'",
-                "       aria-autocomplete='list' />",
-                "   </div>",
-                "   <ul class='select2-results' role='listbox'>",
-                "   </ul>",
-                "</div>"].join(""));
-            return container;
-        },
-
-        // single
-        enableInterface: function() {
-            if (this.parent.enableInterface.apply(this, arguments)) {
-                this.focusser.prop("disabled", !this.isInterfaceEnabled());
-            }
-        },
-
-        // single
-        opening: function () {
-            var el, range, len;
-
-            if (this.opts.minimumResultsForSearch >= 0) {
-                this.showSearch(true);
-            }
-
-            this.parent.opening.apply(this, arguments);
-
-            if (this.showSearchInput !== false) {
-                // IE appends focusser.val() at the end of field :/ so we manually insert it at the beginning using a range
-                // all other browsers handle this just fine
-
-                this.search.val(this.focusser.val());
-            }
-            if (this.opts.shouldFocusInput(this)) {
-                this.search.focus();
-                // move the cursor to the end after focussing, otherwise it will be at the beginning and
-                // new text will appear *before* focusser.val()
-                el = this.search.get(0);
-                if (el.createTextRange) {
-                    range = el.createTextRange();
-                    range.collapse(false);
-                    range.select();
-                } else if (el.setSelectionRange) {
-                    len = this.search.val().length;
-                    el.setSelectionRange(len, len);
-                }
-            }
-
-            this.prefillNextSearchTerm();
-
-            this.focusser.prop("disabled", true).val("");
-            this.updateResults(true);
-            this.opts.element.trigger($.Event("select2-open"));
-        },
-
-        // single
-        close: function () {
-            if (!this.opened()) return;
-            this.parent.close.apply(this, arguments);
-
-            this.focusser.prop("disabled", false);
-
-            if (this.opts.shouldFocusInput(this)) {
-                this.focusser.focus();
-            }
-        },
-
-        // single
-        focus: function () {
-            if (this.opened()) {
-                this.close();
-            } else {
-                this.focusser.prop("disabled", false);
-                if (this.opts.shouldFocusInput(this)) {
-                    this.focusser.focus();
-                }
-            }
-        },
-
-        // single
-        isFocused: function () {
-            return this.container.hasClass("select2-container-active");
-        },
-
-        // single
-        cancel: function () {
-            this.parent.cancel.apply(this, arguments);
-            this.focusser.prop("disabled", false);
-
-            if (this.opts.shouldFocusInput(this)) {
-                this.focusser.focus();
-            }
-        },
-
-        // single
-        destroy: function() {
-            $("label[for='" + this.focusser.attr('id') + "']")
-                .attr('for', this.opts.element.attr("id"));
-            this.parent.destroy.apply(this, arguments);
-
-            cleanupJQueryElements.call(this,
-                "selection",
-                "focusser"
-            );
-        },
-
-        // single
-        initContainer: function () {
-
-            var selection,
-                container = this.container,
-                dropdown = this.dropdown,
-                idSuffix = nextUid(),
-                elementLabel;
-
-            if (this.opts.minimumResultsForSearch < 0) {
-                this.showSearch(false);
-            } else {
-                this.showSearch(true);
-            }
-
-            this.selection = selection = container.find(".select2-choice");
-
-            this.focusser = container.find(".select2-focusser");
-
-            // add aria associations
-            selection.find(".select2-chosen").attr("id", "select2-chosen-"+idSuffix);
-            this.focusser.attr("aria-labelledby", "select2-chosen-"+idSuffix);
-            this.results.attr("id", "select2-results-"+idSuffix);
-            this.search.attr("aria-owns", "select2-results-"+idSuffix);
-
-            // rewrite labels from original element to focusser
-            this.focusser.attr("id", "s2id_autogen"+idSuffix);
-
-            elementLabel = $("label[for='" + this.opts.element.attr("id") + "']");
-            this.opts.element.on('focus.select2', this.bind(function () { this.focus(); }));
-
-            this.focusser.prev()
-                .text(elementLabel.text())
-                .attr('for', this.focusser.attr('id'));
-
-            // Ensure the original element retains an accessible name
-            var originalTitle = this.opts.element.attr("title");
-            this.opts.element.attr("title", (originalTitle || elementLabel.text()));
-
-            this.focusser.attr("tabindex", this.elementTabIndex);
-
-            // write label for search field using the label from the focusser element
-            this.search.attr("id", this.focusser.attr('id') + '_search');
-
-            this.search.prev()
-                .text($("label[for='" + this.focusser.attr('id') + "']").text())
-                .attr('for', this.search.attr('id'));
-
-            this.search.on("keydown", this.bind(function (e) {
-                if (!this.isInterfaceEnabled()) return;
-
-                // filter 229 keyCodes (input method editor is processing key input)
-                if (229 == e.keyCode) return;
-
-                if (e.which === KEY.PAGE_UP || e.which === KEY.PAGE_DOWN) {
-                    // prevent the page from scrolling
-                    killEvent(e);
-                    return;
-                }
-
-                switch (e.which) {
-                    case KEY.UP:
-                    case KEY.DOWN:
-                        this.moveHighlight((e.which === KEY.UP) ? -1 : 1);
-                        killEvent(e);
-                        return;
-                    case KEY.ENTER:
-                        this.selectHighlighted();
-                        killEvent(e);
-                        return;
-                    case KEY.TAB:
-                        this.selectHighlighted({noFocus: true});
-                        return;
-                    case KEY.ESC:
-                        this.cancel(e);
-                        killEvent(e);
-                        return;
-                }
-            }));
-
-            this.search.on("blur", this.bind(function(e) {
-                // a workaround for chrome to keep the search field focussed when the scroll bar is used to scroll the dropdown.
-                // without this the search field loses focus which is annoying
-                if (document.activeElement === this.body.get(0)) {
-                    window.setTimeout(this.bind(function() {
-                        if (this.opened() && this.results && this.results.length > 1) {
-                            this.search.focus();
-                        }
-                    }), 0);
-                }
-            }));
-
-            this.focusser.on("keydown", this.bind(function (e) {
-                if (!this.isInterfaceEnabled()) return;
-
-                if (e.which === KEY.TAB || KEY.isControl(e) || KEY.isFunctionKey(e) || e.which === KEY.ESC) {
-                    return;
-                }
-
-                if (this.opts.openOnEnter === false && e.which === KEY.ENTER) {
-                    killEvent(e);
-                    return;
-                }
-
-                if (e.which == KEY.DOWN || e.which == KEY.UP
-                    || (e.which == KEY.ENTER && this.opts.openOnEnter)) {
-
-                    if (e.altKey || e.ctrlKey || e.shiftKey || e.metaKey) return;
-
-                    this.open();
-                    killEvent(e);
-                    return;
-                }
-
-                if (e.which == KEY.DELETE || e.which == KEY.BACKSPACE) {
-                    if (this.opts.allowClear) {
-                        this.clear();
-                    }
-                    killEvent(e);
-                    return;
-                }
-            }));
-
-
-            installKeyUpChangeEvent(this.focusser);
-            this.focusser.on("keyup-change input", this.bind(function(e) {
-                if (this.opts.minimumResultsForSearch >= 0) {
-                    e.stopPropagation();
-                    if (this.opened()) return;
-                    this.open();
-                }
-            }));
-
-            selection.on("mousedown touchstart", "abbr", this.bind(function (e) {
-                if (!this.isInterfaceEnabled()) {
-                    return;
-                }
-
-                this.clear();
-                killEventImmediately(e);
-                this.close();
-
-                if (this.selection) {
-                    this.selection.focus();
-                }
-            }));
-
-            selection.on("mousedown touchstart", this.bind(function (e) {
-                // Prevent IE from generating a click event on the body
-                reinsertElement(selection);
-
-                if (!this.container.hasClass("select2-container-active")) {
-                    this.opts.element.trigger($.Event("select2-focus"));
-                }
-
-                if (this.opened()) {
-                    this.close();
-                } else if (this.isInterfaceEnabled()) {
-                    this.open();
-                }
-
-                killEvent(e);
-            }));
-
-            dropdown.on("mousedown touchstart", this.bind(function() {
-                if (this.opts.shouldFocusInput(this)) {
-                    this.search.focus();
-                }
-            }));
-
-            selection.on("focus", this.bind(function(e) {
-                killEvent(e);
-            }));
-
-            this.focusser.on("focus", this.bind(function(){
-                if (!this.container.hasClass("select2-container-active")) {
-                    this.opts.element.trigger($.Event("select2-focus"));
-                }
-                this.container.addClass("select2-container-active");
-            })).on("blur", this.bind(function() {
-                if (!this.opened()) {
-                    this.container.removeClass("select2-container-active");
-                    this.opts.element.trigger($.Event("select2-blur"));
-                }
-            }));
-            this.search.on("focus", this.bind(function(){
-                if (!this.container.hasClass("select2-container-active")) {
-                    this.opts.element.trigger($.Event("select2-focus"));
-                }
-                this.container.addClass("select2-container-active");
-            }));
-
-            this.initContainerWidth();
-            this.opts.element.hide();
-            this.setPlaceholder();
-
-        },
-
-        // single
-        clear: function(triggerChange) {
-            var data=this.selection.data("select2-data");
-            if (data) { // guard against queued quick consecutive clicks
-                var evt = $.Event("select2-clearing");
-                this.opts.element.trigger(evt);
-                if (evt.isDefaultPrevented()) {
-                    return;
-                }
-                var placeholderOption = this.getPlaceholderOption();
-                this.opts.element.val(placeholderOption ? placeholderOption.val() : "");
-                this.selection.find(".select2-chosen").empty();
-                this.selection.removeData("select2-data");
-                this.setPlaceholder();
-
-                if (triggerChange !== false){
-                    this.opts.element.trigger({ type: "select2-removed", val: this.id(data), choice: data });
-                    this.triggerChange({removed:data});
-                }
-            }
-        },
-
-        /**
-         * Sets selection based on source element's value
-         */
-        // single
-        initSelection: function () {
-            var selected;
-            if (this.isPlaceholderOptionSelected()) {
-                this.updateSelection(null);
-                this.close();
-                this.setPlaceholder();
-            } else {
-                var self = this;
-                this.opts.initSelection.call(null, this.opts.element, function(selected){
-                    if (selected !== undefined && selected !== null) {
-                        self.updateSelection(selected);
-                        self.close();
-                        self.setPlaceholder();
-                        self.lastSearchTerm = self.search.val();
-                    }
-                });
-            }
-        },
-
-        isPlaceholderOptionSelected: function() {
-            var placeholderOption;
-            if (this.getPlaceholder() === undefined) return false; // no placeholder specified so no option should be considered
-            return ((placeholderOption = this.getPlaceholderOption()) !== undefined && placeholderOption.prop("selected"))
-                || (this.opts.element.val() === "")
-                || (this.opts.element.val() === undefined)
-                || (this.opts.element.val() === null);
-        },
-
-        // single
-        prepareOpts: function () {
-            var opts = this.parent.prepareOpts.apply(this, arguments),
-                self=this;
-
-            if (opts.element.get(0).tagName.toLowerCase() === "select") {
-                // install the selection initializer
-                opts.initSelection = function (element, callback) {
-                    var selected = element.find("option").filter(function() { return this.selected && !this.disabled });
-                    // a single select box always has a value, no need to null check 'selected'
-                    callback(self.optionToData(selected));
-                };
-            } else if ("data" in opts) {
-                // install default initSelection when applied to hidden input and data is local
-                opts.initSelection = opts.initSelection || function (element, callback) {
-                    var id = element.val();
-                    //search in data by id, storing the actual matching item
-                    var match = null;
-                    opts.query({
-                        matcher: function(term, text, el){
-                            var is_match = equal(id, opts.id(el));
-                            if (is_match) {
-                                match = el;
-                            }
-                            return is_match;
-                        },
-                        callback: !$.isFunction(callback) ? $.noop : function() {
-                            callback(match);
-                        }
-                    });
-                };
-            }
-
-            return opts;
-        },
-
-        // single
-        getPlaceholder: function() {
-            // if a placeholder is specified on a single select without a valid placeholder option ignore it
-            if (this.select) {
-                if (this.getPlaceholderOption() === undefined) {
-                    return undefined;
-                }
-            }
-
-            return this.parent.getPlaceholder.apply(this, arguments);
-        },
-
-        // single
-        setPlaceholder: function () {
-            var placeholder = this.getPlaceholder();
-
-            if (this.isPlaceholderOptionSelected() && placeholder !== undefined) {
-
-                // check for a placeholder option if attached to a select
-                if (this.select && this.getPlaceholderOption() === undefined) return;
-
-                this.selection.find(".select2-chosen").html(this.opts.escapeMarkup(placeholder));
-
-                this.selection.addClass("select2-default");
-
-                this.container.removeClass("select2-allowclear");
-            }
-        },
-
-        // single
-        postprocessResults: function (data, initial, noHighlightUpdate) {
-            var selected = 0, self = this, showSearchInput = true;
-
-            // find the selected element in the result list
-
-            this.findHighlightableChoices().each2(function (i, elm) {
-                if (equal(self.id(elm.data("select2-data")), self.opts.element.val())) {
-                    selected = i;
-                    return false;
-                }
-            });
-
-            // and highlight it
-            if (noHighlightUpdate !== false) {
-                if (initial === true && selected >= 0) {
-                    this.highlight(selected);
+    };
+
+    main = function (name, deps, callback, relName) {
+        var cjsModule, depName, ret, map, i,
+            args = [],
+            callbackType = typeof callback,
+            usingExports;
+
+        //Use name if no relName
+        relName = relName || name;
+
+        //Call the callback to define the module, if necessary.
+        if (callbackType === 'undefined' || callbackType === 'function') {
+            //Pull out the defined dependencies and pass the ordered
+            //values to the callback.
+            //Default to [require, exports, module] if no deps
+            deps = !deps.length && callback.length ? ['require', 'exports', 'module'] : deps;
+            for (i = 0; i < deps.length; i += 1) {
+                map = makeMap(deps[i], relName);
+                depName = map.f;
+
+                //Fast path CommonJS standard dependencies.
+                if (depName === "require") {
+                    args[i] = handlers.require(name);
+                } else if (depName === "exports") {
+                    //CommonJS module spec 1.1
+                    args[i] = handlers.exports(name);
+                    usingExports = true;
+                } else if (depName === "module") {
+                    //CommonJS module spec 1.1
+                    cjsModule = args[i] = handlers.module(name);
+                } else if (hasProp(defined, depName) ||
+                           hasProp(waiting, depName) ||
+                           hasProp(defining, depName)) {
+                    args[i] = callDep(depName);
+                } else if (map.p) {
+                    map.p.load(map.n, makeRequire(relName, true), makeLoad(depName), {});
+                    args[i] = defined[depName];
                 } else {
-                    this.highlight(0);
+                    throw new Error(name + ' missing ' + depName);
                 }
             }
 
-            // hide the search box if this is the first we got the results and there are enough of them for search
+            ret = callback ? callback.apply(defined[name], args) : undefined;
 
-            if (initial === true) {
-                var min = this.opts.minimumResultsForSearch;
-                if (min >= 0) {
-                    this.showSearch(countResults(data.results) >= min);
-                }
-            }
-        },
-
-        // single
-        showSearch: function(showSearchInput) {
-            if (this.showSearchInput === showSearchInput) return;
-
-            this.showSearchInput = showSearchInput;
-
-            this.dropdown.find(".select2-search").toggleClass("select2-search-hidden", !showSearchInput);
-            this.dropdown.find(".select2-search").toggleClass("select2-offscreen", !showSearchInput);
-            //add "select2-with-searchbox" to the container if search box is shown
-            $(this.dropdown, this.container).toggleClass("select2-with-searchbox", showSearchInput);
-        },
-
-        // single
-        onSelect: function (data, options) {
-
-            if (!this.triggerSelect(data)) { return; }
-
-            var old = this.opts.element.val(),
-                oldData = this.data();
-
-            this.opts.element.val(this.id(data));
-            this.updateSelection(data);
-
-            this.opts.element.trigger({ type: "select2-selected", val: this.id(data), choice: data });
-
-            this.lastSearchTerm = this.search.val();
-            this.close();
-
-            if ((!options || !options.noFocus) && this.opts.shouldFocusInput(this)) {
-                this.focusser.focus();
-            }
-
-            if (!equal(old, this.id(data))) {
-                this.triggerChange({ added: data, removed: oldData });
-            }
-        },
-
-        // single
-        updateSelection: function (data) {
-
-            var container=this.selection.find(".select2-chosen"), formatted, cssClass;
-
-            this.selection.data("select2-data", data);
-
-            container.empty();
-            if (data !== null) {
-                formatted=this.opts.formatSelection(data, container, this.opts.escapeMarkup);
-            }
-            if (formatted !== undefined) {
-                container.append(formatted);
-            }
-            cssClass=this.opts.formatSelectionCssClass(data, container);
-            if (cssClass !== undefined) {
-                container.addClass(cssClass);
-            }
-
-            this.selection.removeClass("select2-default");
-
-            if (this.opts.allowClear && this.getPlaceholder() !== undefined) {
-                this.container.addClass("select2-allowclear");
-            }
-        },
-
-        // single
-        val: function () {
-            var val,
-                triggerChange = false,
-                data = null,
-                self = this,
-                oldData = this.data();
-
-            if (arguments.length === 0) {
-                return this.opts.element.val();
-            }
-
-            val = arguments[0];
-
-            if (arguments.length > 1) {
-                triggerChange = arguments[1];
-
-                if (this.opts.debug && console && console.warn) {
-                    console.warn(
-                        'Select2: The second option to `select2("val")` is not supported in Select2 4.0.0. ' +
-                        'The `change` event will always be triggered in 4.0.0.'
-                    );
-                }
-            }
-
-            if (this.select) {
-                if (this.opts.debug && console && console.warn) {
-                    console.warn(
-                        'Select2: Setting the value on a <select> using `select2("val")` is no longer supported in 4.0.0. ' +
-                        'You can use the `.val(newValue).trigger("change")` method provided by jQuery instead.'
-                    );
-                }
-
-                this.select
-                    .val(val)
-                    .find("option").filter(function() { return this.selected }).each2(function (i, elm) {
-                        data = self.optionToData(elm);
-                        return false;
-                    });
-                this.updateSelection(data);
-                this.setPlaceholder();
-                if (triggerChange) {
-                    this.triggerChange({added: data, removed:oldData});
-                }
-            } else {
-                // val is an id. !val is true for [undefined,null,'',0] - 0 is legal
-                if (!val && val !== 0) {
-                    this.clear(triggerChange);
-                    return;
-                }
-                if (this.opts.initSelection === undefined) {
-                    throw new Error("cannot call val() if initSelection() is not defined");
-                }
-                this.opts.element.val(val);
-                this.opts.initSelection(this.opts.element, function(data){
-                    self.opts.element.val(!data ? "" : self.id(data));
-                    self.updateSelection(data);
-                    self.setPlaceholder();
-                    if (triggerChange) {
-                        self.triggerChange({added: data, removed:oldData});
-                    }
-                });
-            }
-        },
-
-        // single
-        clearSearch: function () {
-            this.search.val("");
-            this.focusser.val("");
-        },
-
-        // single
-        data: function(value) {
-            var data,
-                triggerChange = false;
-
-            if (arguments.length === 0) {
-                data = this.selection.data("select2-data");
-                if (data == undefined) data = null;
-                return data;
-            } else {
-                if (this.opts.debug && console && console.warn) {
-                    console.warn(
-                        'Select2: The `select2("data")` method can no longer set selected values in 4.0.0, ' +
-                        'consider using the `.val()` method instead.'
-                    );
-                }
-
-                if (arguments.length > 1) {
-                    triggerChange = arguments[1];
-                }
-                if (!value) {
-                    this.clear(triggerChange);
-                } else {
-                    data = this.data();
-                    this.opts.element.val(!value ? "" : this.id(value));
-                    this.updateSelection(value);
-                    if (triggerChange) {
-                        this.triggerChange({added: value, removed:data});
-                    }
+            if (name) {
+                //If setting exports via "module" is in play,
+                //favor that over return value and exports. After that,
+                //favor a non-undefined return value over exports use.
+                if (cjsModule && cjsModule.exports !== undef &&
+                        cjsModule.exports !== defined[name]) {
+                    defined[name] = cjsModule.exports;
+                } else if (ret !== undef || !usingExports) {
+                    //Use the return value from the function.
+                    defined[name] = ret;
                 }
             }
+        } else if (name) {
+            //May just be an object definition for the module. Only
+            //worry about defining if have a module name.
+            defined[name] = callback;
         }
-    });
+    };
 
-    MultiSelect2 = clazz(AbstractSelect2, {
-
-        // multi
-        createContainer: function () {
-            var container = $(document.createElement("div")).attr({
-                "class": "select2-container select2-container-multi"
-            }).html([
-                "<ul class='select2-choices'>",
-                "  <li class='select2-search-field'>",
-                "    <label for='' class='select2-offscreen'></label>",
-                "    <input type='text' autocomplete='off' autocorrect='off' autocapitalize='off' spellcheck='false' class='select2-input'>",
-                "  </li>",
-                "</ul>",
-                "<div class='select2-drop select2-drop-multi select2-display-none'>",
-                "   <ul class='select2-results'>",
-                "   </ul>",
-                "</div>"].join(""));
-            return container;
-        },
-
-        // multi
-        prepareOpts: function () {
-            var opts = this.parent.prepareOpts.apply(this, arguments),
-                self=this;
-
-            // TODO validate placeholder is a string if specified
-            if (opts.element.get(0).tagName.toLowerCase() === "select") {
-                // install the selection initializer
-                opts.initSelection = function (element, callback) {
-
-                    var data = [];
-
-                    element.find("option").filter(function() { return this.selected && !this.disabled }).each2(function (i, elm) {
-                        data.push(self.optionToData(elm));
-                    });
-                    callback(data);
-                };
-            } else if ("data" in opts) {
-                // install default initSelection when applied to hidden input and data is local
-                opts.initSelection = opts.initSelection || function (element, callback) {
-                    var ids = splitVal(element.val(), opts.separator, opts.transformVal);
-                    //search in data by array of ids, storing matching items in a list
-                    var matches = [];
-                    opts.query({
-                        matcher: function(term, text, el){
-                            var is_match = $.grep(ids, function(id) {
-                                return equal(id, opts.id(el));
-                            }).length;
-                            if (is_match) {
-                                matches.push(el);
-                            }
-                            return is_match;
-                        },
-                        callback: !$.isFunction(callback) ? $.noop : function() {
-                            // reorder matches based on the order they appear in the ids array because right now
-                            // they are in the order in which they appear in data array
-                            var ordered = [];
-                            for (var i = 0; i < ids.length; i++) {
-                                var id = ids[i];
-                                for (var j = 0; j < matches.length; j++) {
-                                    var match = matches[j];
-                                    if (equal(id, opts.id(match))) {
-                                        ordered.push(match);
-                                        matches.splice(j, 1);
-                                        break;
-                                    }
-                                }
-                            }
-                            callback(ordered);
-                        }
-                    });
-                };
+    requirejs = require = req = function (deps, callback, relName, forceSync, alt) {
+        if (typeof deps === "string") {
+            if (handlers[deps]) {
+                //callback in this case is really relName
+                return handlers[deps](callback);
             }
-
-            return opts;
-        },
-
-        // multi
-        selectChoice: function (choice) {
-
-            var selected = this.container.find(".select2-search-choice-focus");
-            if (selected.length && choice && choice[0] == selected[0]) {
-
-            } else {
-                if (selected.length) {
-                    this.opts.element.trigger("choice-deselected", selected);
-                }
-                selected.removeClass("select2-search-choice-focus");
-                if (choice && choice.length) {
-                    this.close();
-                    choice.addClass("select2-search-choice-focus");
-                    this.opts.element.trigger("choice-selected", choice);
-                }
+            //Just return the module wanted. In this scenario, the
+            //deps arg is the module name, and second arg (if passed)
+            //is just the relName.
+            //Normalize module name, if it contains . or ..
+            return callDep(makeMap(deps, callback).f);
+        } else if (!deps.splice) {
+            //deps is a config object, not an array.
+            config = deps;
+            if (config.deps) {
+                req(config.deps, config.callback);
             }
-        },
-
-        // multi
-        destroy: function() {
-            $("label[for='" + this.search.attr('id') + "']")
-                .attr('for', this.opts.element.attr("id"));
-            this.parent.destroy.apply(this, arguments);
-
-            cleanupJQueryElements.call(this,
-                "searchContainer",
-                "selection"
-            );
-        },
-
-        // multi
-        initContainer: function () {
-
-            var selector = ".select2-choices", selection;
-
-            this.searchContainer = this.container.find(".select2-search-field");
-            this.selection = selection = this.container.find(selector);
-
-            var _this = this;
-            this.selection.on("click", ".select2-container:not(.select2-container-disabled) .select2-search-choice:not(.select2-locked)", function (e) {
-                _this.search[0].focus();
-                _this.selectChoice($(this));
-            });
-
-            // rewrite labels from original element to focusser
-            this.search.attr("id", "s2id_autogen"+nextUid());
-
-            this.search.prev()
-                .text($("label[for='" + this.opts.element.attr("id") + "']").text())
-                .attr('for', this.search.attr('id'));
-            this.opts.element.on('focus.select2', this.bind(function () { this.focus(); }));
-
-            this.search.on("input paste", this.bind(function() {
-                if (this.search.attr('placeholder') && this.search.val().length == 0) return;
-                if (!this.isInterfaceEnabled()) return;
-                if (!this.opened()) {
-                    this.open();
-                }
-            }));
-
-            this.search.attr("tabindex", this.elementTabIndex);
-
-            this.keydowns = 0;
-            this.search.on("keydown", this.bind(function (e) {
-                if (!this.isInterfaceEnabled()) return;
-
-                ++this.keydowns;
-                var selected = selection.find(".select2-search-choice-focus");
-                var prev = selected.prev(".select2-search-choice:not(.select2-locked)");
-                var next = selected.next(".select2-search-choice:not(.select2-locked)");
-                var pos = getCursorInfo(this.search);
-
-                if (selected.length &&
-                    (e.which == KEY.LEFT || e.which == KEY.RIGHT || e.which == KEY.BACKSPACE || e.which == KEY.DELETE || e.which == KEY.ENTER)) {
-                    var selectedChoice = selected;
-                    if (e.which == KEY.LEFT && prev.length) {
-                        selectedChoice = prev;
-                    }
-                    else if (e.which == KEY.RIGHT) {
-                        selectedChoice = next.length ? next : null;
-                    }
-                    else if (e.which === KEY.BACKSPACE) {
-                        if (this.unselect(selected.first())) {
-                            this.search.width(10);
-                            selectedChoice = prev.length ? prev : next;
-                        }
-                    } else if (e.which == KEY.DELETE) {
-                        if (this.unselect(selected.first())) {
-                            this.search.width(10);
-                            selectedChoice = next.length ? next : null;
-                        }
-                    } else if (e.which == KEY.ENTER) {
-                        selectedChoice = null;
-                    }
-
-                    this.selectChoice(selectedChoice);
-                    killEvent(e);
-                    if (!selectedChoice || !selectedChoice.length) {
-                        this.open();
-                    }
-                    return;
-                } else if (((e.which === KEY.BACKSPACE && this.keydowns == 1)
-                    || e.which == KEY.LEFT) && (pos.offset == 0 && !pos.length)) {
-
-                    this.selectChoice(selection.find(".select2-search-choice:not(.select2-locked)").last());
-                    killEvent(e);
-                    return;
-                } else {
-                    this.selectChoice(null);
-                }
-
-                if (this.opened()) {
-                    switch (e.which) {
-                    case KEY.UP:
-                    case KEY.DOWN:
-                        this.moveHighlight((e.which === KEY.UP) ? -1 : 1);
-                        killEvent(e);
-                        return;
-                    case KEY.ENTER:
-                        this.selectHighlighted();
-                        killEvent(e);
-                        return;
-                    case KEY.TAB:
-                        this.selectHighlighted({noFocus:true});
-                        this.close();
-                        return;
-                    case KEY.ESC:
-                        this.cancel(e);
-                        killEvent(e);
-                        return;
-                    }
-                }
-
-                if (e.which === KEY.TAB || KEY.isControl(e) || KEY.isFunctionKey(e)
-                 || e.which === KEY.BACKSPACE || e.which === KEY.ESC) {
-                    return;
-                }
-
-                if (e.which === KEY.ENTER) {
-                    if (this.opts.openOnEnter === false) {
-                        return;
-                    } else if (e.altKey || e.ctrlKey || e.shiftKey || e.metaKey) {
-                        return;
-                    }
-                }
-
-                this.open();
-
-                if (e.which === KEY.PAGE_UP || e.which === KEY.PAGE_DOWN) {
-                    // prevent the page from scrolling
-                    killEvent(e);
-                }
-
-                if (e.which === KEY.ENTER) {
-                    // prevent form from being submitted
-                    killEvent(e);
-                }
-
-            }));
-
-            this.search.on("keyup", this.bind(function (e) {
-                this.keydowns = 0;
-                this.resizeSearch();
-            })
-            );
-
-            this.search.on("blur", this.bind(function(e) {
-                this.container.removeClass("select2-container-active");
-                this.search.removeClass("select2-focused");
-                this.selectChoice(null);
-                if (!this.opened()) this.clearSearch();
-                e.stopImmediatePropagation();
-                this.opts.element.trigger($.Event("select2-blur"));
-            }));
-
-            this.container.on("click", selector, this.bind(function (e) {
-                if (!this.isInterfaceEnabled()) return;
-                if ($(e.target).closest(".select2-search-choice").length > 0) {
-                    // clicked inside a select2 search choice, do not open
-                    return;
-                }
-                this.selectChoice(null);
-                this.clearPlaceholder();
-                if (!this.container.hasClass("select2-container-active")) {
-                    this.opts.element.trigger($.Event("select2-focus"));
-                }
-                this.open();
-                this.focusSearch();
-                e.preventDefault();
-            }));
-
-            this.container.on("focus", selector, this.bind(function () {
-                if (!this.isInterfaceEnabled()) return;
-                if (!this.container.hasClass("select2-container-active")) {
-                    this.opts.element.trigger($.Event("select2-focus"));
-                }
-                this.container.addClass("select2-container-active");
-                this.dropdown.addClass("select2-drop-active");
-                this.clearPlaceholder();
-            }));
-
-            this.initContainerWidth();
-            this.opts.element.hide();
-
-            // set the placeholder if necessary
-            this.clearSearch();
-        },
-
-        // multi
-        enableInterface: function() {
-            if (this.parent.enableInterface.apply(this, arguments)) {
-                this.search.prop("disabled", !this.isInterfaceEnabled());
-            }
-        },
-
-        // multi
-        initSelection: function () {
-            var data;
-            if (this.opts.element.val() === "" && this.opts.element.text() === "") {
-                this.updateSelection([]);
-                this.close();
-                // set the placeholder if necessary
-                this.clearSearch();
-            }
-            if (this.select || this.opts.element.val() !== "") {
-                var self = this;
-                this.opts.initSelection.call(null, this.opts.element, function(data){
-                    if (data !== undefined && data !== null) {
-                        self.updateSelection(data);
-                        self.close();
-                        // set the placeholder if necessary
-                        self.clearSearch();
-                    }
-                });
-            }
-        },
-
-        // multi
-        clearSearch: function () {
-            var placeholder = this.getPlaceholder(),
-                maxWidth = this.getMaxSearchWidth();
-
-            if (placeholder !== undefined  && this.getVal().length === 0 && this.search.hasClass("select2-focused") === false) {
-                this.search.val(placeholder).addClass("select2-default");
-                // stretch the search box to full width of the container so as much of the placeholder is visible as possible
-                // we could call this.resizeSearch(), but we do not because that requires a sizer and we do not want to create one so early because of a firefox bug, see #944
-                this.search.width(maxWidth > 0 ? maxWidth : this.container.css("width"));
-            } else {
-                this.search.val("").width(10);
-            }
-        },
-
-        // multi
-        clearPlaceholder: function () {
-            if (this.search.hasClass("select2-default")) {
-                this.search.val("").removeClass("select2-default");
-            }
-        },
-
-        // multi
-        opening: function () {
-            this.clearPlaceholder(); // should be done before super so placeholder is not used to search
-            this.resizeSearch();
-
-            this.parent.opening.apply(this, arguments);
-
-            this.focusSearch();
-
-            this.prefillNextSearchTerm();
-            this.updateResults(true);
-
-            if (this.opts.shouldFocusInput(this)) {
-                this.search.focus();
-            }
-            this.opts.element.trigger($.Event("select2-open"));
-        },
-
-        // multi
-        close: function () {
-            if (!this.opened()) return;
-            this.parent.close.apply(this, arguments);
-        },
-
-        // multi
-        focus: function () {
-            this.close();
-            this.search.focus();
-        },
-
-        // multi
-        isFocused: function () {
-            return this.search.hasClass("select2-focused");
-        },
-
-        // multi
-        updateSelection: function (data) {
-            var ids = {}, filtered = [], self = this;
-
-            // filter out duplicates
-            $(data).each(function () {
-                if (!(self.id(this) in ids)) {
-                    ids[self.id(this)] = 0;
-                    filtered.push(this);
-                }
-            });
-
-            this.selection.find(".select2-search-choice").remove();
-            this.addSelectedChoice(filtered);
-            self.postprocessResults();
-        },
-
-        // multi
-        tokenize: function() {
-            var input = this.search.val();
-            input = this.opts.tokenizer.call(this, input, this.data(), this.bind(this.onSelect), this.opts);
-            if (input != null && input != undefined) {
-                this.search.val(input);
-                if (input.length > 0) {
-                    this.open();
-                }
-            }
-
-        },
-
-        // multi
-        onSelect: function (data, options) {
-
-            if (!this.triggerSelect(data) || data.text === "") { return; }
-
-            this.addSelectedChoice(data);
-
-            this.opts.element.trigger({ type: "selected", val: this.id(data), choice: data });
-
-            // keep track of the search's value before it gets cleared
-            this.lastSearchTerm = this.search.val();
-
-            this.clearSearch();
-            this.updateResults();
-
-            if (this.select || !this.opts.closeOnSelect) this.postprocessResults(data, false, this.opts.closeOnSelect===true);
-
-            if (this.opts.closeOnSelect) {
-                this.close();
-                this.search.width(10);
-            } else {
-                if (this.countSelectableResults()>0) {
-                    this.search.width(10);
-                    this.resizeSearch();
-                    if (this.getMaximumSelectionSize() > 0 && this.val().length >= this.getMaximumSelectionSize()) {
-                        // if we reached max selection size repaint the results so choices
-                        // are replaced with the max selection reached message
-                        this.updateResults(true);
-                    } else {
-                        // initializes search's value with nextSearchTerm and update search result
-                        if (this.prefillNextSearchTerm()) {
-                            this.updateResults();
-                        }
-                    }
-                    this.positionDropdown();
-                } else {
-                    // if nothing left to select close
-                    this.close();
-                    this.search.width(10);
-                }
-            }
-
-            // since its not possible to select an element that has already been
-            // added we do not need to check if this is a new element before firing change
-            this.triggerChange({ added: data });
-
-            if (!options || !options.noFocus)
-                this.focusSearch();
-        },
-
-        // multi
-        cancel: function () {
-            this.close();
-            this.focusSearch();
-        },
-
-        addSelectedChoice: function (data) {
-            var val = this.getVal(), self = this;
-            $(data).each(function () {
-                val.push(self.createChoice(this));
-            });
-            this.setVal(val);
-        },
-
-        createChoice: function (data) {
-            var enableChoice = !data.locked,
-                enabledItem = $(
-                    "<li class='select2-search-choice'>" +
-                    "    <div></div>" +
-                    "    <a href='#' class='select2-search-choice-close' tabindex='-1'></a>" +
-                    "</li>"),
-                disabledItem = $(
-                    "<li class='select2-search-choice select2-locked'>" +
-                    "<div></div>" +
-                    "</li>");
-            var choice = enableChoice ? enabledItem : disabledItem,
-                id = this.id(data),
-                formatted,
-                cssClass;
-
-            formatted=this.opts.formatSelection(data, choice.find("div"), this.opts.escapeMarkup);
-            if (formatted != undefined) {
-                choice.find("div").replaceWith($("<div></div>").html(formatted));
-            }
-            cssClass=this.opts.formatSelectionCssClass(data, choice.find("div"));
-            if (cssClass != undefined) {
-                choice.addClass(cssClass);
-            }
-
-            if(enableChoice){
-              choice.find(".select2-search-choice-close")
-                  .on("mousedown", killEvent)
-                  .on("click dblclick", this.bind(function (e) {
-                  if (!this.isInterfaceEnabled()) return;
-
-                  this.unselect($(e.target));
-                  this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus");
-                  killEvent(e);
-                  this.close();
-                  this.focusSearch();
-              })).on("focus", this.bind(function () {
-                  if (!this.isInterfaceEnabled()) return;
-                  this.container.addClass("select2-container-active");
-                  this.dropdown.addClass("select2-drop-active");
-              }));
-            }
-
-            choice.data("select2-data", data);
-            choice.insertBefore(this.searchContainer);
-
-            return id;
-        },
-
-        // multi
-        unselect: function (selected) {
-            var val = this.getVal(),
-                data,
-                index;
-            selected = selected.closest(".select2-search-choice");
-
-            if (selected.length === 0) {
-                throw "Invalid argument: " + selected + ". Must be .select2-search-choice";
-            }
-
-            data = selected.data("select2-data");
-
-            if (!data) {
-                // prevent a race condition when the 'x' is clicked really fast repeatedly the event can be queued
-                // and invoked on an element already removed
+            if (!callback) {
                 return;
             }
 
-            var evt = $.Event("select2-removing");
-            evt.val = this.id(data);
-            evt.choice = data;
-            this.opts.element.trigger(evt);
-
-            if (evt.isDefaultPrevented()) {
-                return false;
-            }
-
-            while((index = indexOf(this.id(data), val)) >= 0) {
-                val.splice(index, 1);
-                this.setVal(val);
-                if (this.select) this.postprocessResults();
-            }
-
-            selected.remove();
-
-            this.opts.element.trigger({ type: "select2-removed", val: this.id(data), choice: data });
-            this.triggerChange({ removed: data });
-
-            return true;
-        },
-
-        // multi
-        postprocessResults: function (data, initial, noHighlightUpdate) {
-            var val = this.getVal(),
-                choices = this.results.find(".select2-result"),
-                compound = this.results.find(".select2-result-with-children"),
-                self = this;
-
-            choices.each2(function (i, choice) {
-                var id = self.id(choice.data("select2-data"));
-                if (indexOf(id, val) >= 0) {
-                    choice.addClass("select2-selected");
-                    // mark all children of the selected parent as selected
-                    choice.find(".select2-result-selectable").addClass("select2-selected");
-                }
-            });
-
-            compound.each2(function(i, choice) {
-                // hide an optgroup if it doesn't have any selectable children
-                if (!choice.is('.select2-result-selectable')
-                    && choice.find(".select2-result-selectable:not(.select2-selected)").length === 0) {
-                    choice.addClass("select2-selected");
-                }
-            });
-
-            if (this.highlight() == -1 && noHighlightUpdate !== false && this.opts.closeOnSelect === true){
-                self.highlight(0);
-            }
-
-            //If all results are chosen render formatNoMatches
-            if(!this.opts.createSearchChoice && !choices.filter('.select2-result:not(.select2-selected)').length > 0){
-                if(!data || data && !data.more && this.results.find(".select2-no-results").length === 0) {
-                    if (checkFormatter(self.opts.formatNoMatches, "formatNoMatches")) {
-                        this.results.append("<li class='select2-no-results'>" + evaluate(self.opts.formatNoMatches, self.opts.element, self.search.val()) + "</li>");
-                    }
-                }
-            }
-
-        },
-
-        // multi
-        getMaxSearchWidth: function() {
-            return this.selection.width() - getSideBorderPadding(this.search);
-        },
-
-        // multi
-        resizeSearch: function () {
-            var minimumWidth, left, maxWidth, containerLeft, searchWidth,
-                sideBorderPadding = getSideBorderPadding(this.search);
-
-            minimumWidth = measureTextWidth(this.search) + 10;
-
-            left = this.search.offset().left;
-
-            maxWidth = this.selection.width();
-            containerLeft = this.selection.offset().left;
-
-            searchWidth = maxWidth - (left - containerLeft) - sideBorderPadding;
-
-            if (searchWidth < minimumWidth) {
-                searchWidth = maxWidth - sideBorderPadding;
-            }
-
-            if (searchWidth < 40) {
-                searchWidth = maxWidth - sideBorderPadding;
-            }
-
-            if (searchWidth <= 0) {
-              searchWidth = minimumWidth;
-            }
-
-            this.search.width(Math.floor(searchWidth));
-        },
-
-        // multi
-        getVal: function () {
-            var val;
-            if (this.select) {
-                val = this.select.val();
-                return val === null ? [] : val;
+            if (callback.splice) {
+                //callback is an array, which means it is a dependency list.
+                //Adjust args if there are dependencies
+                deps = callback;
+                callback = relName;
+                relName = null;
             } else {
-                val = this.opts.element.val();
-                return splitVal(val, this.opts.separator, this.opts.transformVal);
-            }
-        },
-
-        // multi
-        setVal: function (val) {
-            if (this.select) {
-                this.select.val(val);
-            } else {
-                var unique = [], valMap = {};
-                // filter out duplicates
-                $(val).each(function () {
-                    if (!(this in valMap)) {
-                        unique.push(this);
-                        valMap[this] = 0;
-                    }
-                });
-                this.opts.element.val(unique.length === 0 ? "" : unique.join(this.opts.separator));
-            }
-        },
-
-        // multi
-        buildChangeDetails: function (old, current) {
-            var current = current.slice(0),
-                old = old.slice(0);
-
-            // remove intersection from each array
-            for (var i = 0; i < current.length; i++) {
-                for (var j = 0; j < old.length; j++) {
-                    if (equal(this.opts.id(current[i]), this.opts.id(old[j]))) {
-                        current.splice(i, 1);
-                        i--;
-                        old.splice(j, 1);
-                        break;
-                    }
-                }
-            }
-
-            return {added: current, removed: old};
-        },
-
-
-        // multi
-        val: function (val, triggerChange) {
-            var oldData, self=this;
-
-            if (arguments.length === 0) {
-                return this.getVal();
-            }
-
-            oldData=this.data();
-            if (!oldData.length) oldData=[];
-
-            // val is an id. !val is true for [undefined,null,'',0] - 0 is legal
-            if (!val && val !== 0) {
-                this.opts.element.val("");
-                this.updateSelection([]);
-                this.clearSearch();
-                if (triggerChange) {
-                    this.triggerChange({added: this.data(), removed: oldData});
-                }
-                return;
-            }
-
-            // val is a list of ids
-            this.setVal(val);
-
-            if (this.select) {
-                this.opts.initSelection(this.select, this.bind(this.updateSelection));
-                if (triggerChange) {
-                    this.triggerChange(this.buildChangeDetails(oldData, this.data()));
-                }
-            } else {
-                if (this.opts.initSelection === undefined) {
-                    throw new Error("val() cannot be called if initSelection() is not defined");
-                }
-
-                this.opts.initSelection(this.opts.element, function(data){
-                    var ids=$.map(data, self.id);
-                    self.setVal(ids);
-                    self.updateSelection(data);
-                    self.clearSearch();
-                    if (triggerChange) {
-                        self.triggerChange(self.buildChangeDetails(oldData, self.data()));
-                    }
-                });
-            }
-            this.clearSearch();
-        },
-
-        // multi
-        onSortStart: function() {
-            if (this.select) {
-                throw new Error("Sorting of elements is not supported when attached to <select>. Attach to <input type='hidden'/> instead.");
-            }
-
-            // collapse search field into 0 width so its container can be collapsed as well
-            this.search.width(0);
-            // hide the container
-            this.searchContainer.hide();
-        },
-
-        // multi
-        onSortEnd:function() {
-
-            var val=[], self=this;
-
-            // show search and move it to the end of the list
-            this.searchContainer.show();
-            // make sure the search container is the last item in the list
-            this.searchContainer.appendTo(this.searchContainer.parent());
-            // since we collapsed the width in dragStarted, we resize it here
-            this.resizeSearch();
-
-            // update selection
-            this.selection.find(".select2-search-choice").each(function() {
-                val.push(self.opts.id($(this).data("select2-data")));
-            });
-            this.setVal(val);
-            this.triggerChange();
-        },
-
-        // multi
-        data: function(values, triggerChange) {
-            var self=this, ids, old;
-            if (arguments.length === 0) {
-                 return this.selection
-                     .children(".select2-search-choice")
-                     .map(function() { return $(this).data("select2-data"); })
-                     .get();
-            } else {
-                old = this.data();
-                if (!values) { values = []; }
-                ids = $.map(values, function(e) { return self.opts.id(e); });
-                this.setVal(ids);
-                this.updateSelection(values);
-                this.clearSearch();
-                if (triggerChange) {
-                    this.triggerChange(this.buildChangeDetails(old, this.data()));
-                }
+                deps = undef;
             }
         }
+
+        //Support require(['a'])
+        callback = callback || function () {};
+
+        //If relName is a function, it is an errback handler,
+        //so remove it.
+        if (typeof relName === 'function') {
+            relName = forceSync;
+            forceSync = alt;
+        }
+
+        //Simulate async callback;
+        if (forceSync) {
+            main(undef, deps, callback, relName);
+        } else {
+            //Using a non-zero value because of concern for what old browsers
+            //do, and latest browsers "upgrade" to 4 if lower value is used:
+            //http://www.whatwg.org/specs/web-apps/current-work/multipage/timers.html#dom-windowtimers-settimeout:
+            //If want a value immediately, use require('id') instead -- something
+            //that works in almond on the global level, but not guaranteed and
+            //unlikely to work in other AMD implementations.
+            setTimeout(function () {
+                main(undef, deps, callback, relName);
+            }, 4);
+        }
+
+        return req;
+    };
+
+    /**
+     * Just drops the config on the floor, but returns req in case
+     * the config return value is used.
+     */
+    req.config = function (cfg) {
+        return req(cfg);
+    };
+
+    /**
+     * Expose module registry for debugging and tooling
+     */
+    requirejs._defined = defined;
+
+    define = function (name, deps, callback) {
+        if (typeof name !== 'string') {
+            throw new Error('See almond README: incorrect module build, no module name');
+        }
+
+        //This module may not have dependencies
+        if (!deps.splice) {
+            //deps is not an array, so probably means
+            //an object literal or factory function for
+            //the value. Adjust args.
+            callback = deps;
+            deps = [];
+        }
+
+        if (!hasProp(defined, name) && !hasProp(waiting, name)) {
+            waiting[name] = [name, deps, callback];
+        }
+    };
+
+    define.amd = {
+        jQuery: true
+    };
+}());
+
+S2.requirejs = requirejs;S2.require = require;S2.define = define;
+}
+}());
+S2.define("almond", function(){});
+
+/* global jQuery:false, $:false */
+S2.define('jquery',[],function () {
+  var _$ = jQuery || $;
+
+  if (_$ == null && console && console.error) {
+    console.error(
+      'Select2: An instance of jQuery or a jQuery-compatible library was not ' +
+      'found. Make sure that you are including jQuery before Select2 on your ' +
+      'web page.'
+    );
+  }
+
+  return _$;
+});
+
+S2.define('select2/utils',[
+  'jquery'
+], function ($) {
+  var Utils = {};
+
+  Utils.Extend = function (ChildClass, SuperClass) {
+    var __hasProp = {}.hasOwnProperty;
+
+    function BaseConstructor () {
+      this.constructor = ChildClass;
+    }
+
+    for (var key in SuperClass) {
+      if (__hasProp.call(SuperClass, key)) {
+        ChildClass[key] = SuperClass[key];
+      }
+    }
+
+    BaseConstructor.prototype = SuperClass.prototype;
+    ChildClass.prototype = new BaseConstructor();
+    ChildClass.__super__ = SuperClass.prototype;
+
+    return ChildClass;
+  };
+
+  function getMethods (theClass) {
+    var proto = theClass.prototype;
+
+    var methods = [];
+
+    for (var methodName in proto) {
+      var m = proto[methodName];
+
+      if (typeof m !== 'function') {
+        continue;
+      }
+
+      if (methodName === 'constructor') {
+        continue;
+      }
+
+      methods.push(methodName);
+    }
+
+    return methods;
+  }
+
+  Utils.Decorate = function (SuperClass, DecoratorClass) {
+    var decoratedMethods = getMethods(DecoratorClass);
+    var superMethods = getMethods(SuperClass);
+
+    function DecoratedClass () {
+      var unshift = Array.prototype.unshift;
+
+      var argCount = DecoratorClass.prototype.constructor.length;
+
+      var calledConstructor = SuperClass.prototype.constructor;
+
+      if (argCount > 0) {
+        unshift.call(arguments, SuperClass.prototype.constructor);
+
+        calledConstructor = DecoratorClass.prototype.constructor;
+      }
+
+      calledConstructor.apply(this, arguments);
+    }
+
+    DecoratorClass.displayName = SuperClass.displayName;
+
+    function ctr () {
+      this.constructor = DecoratedClass;
+    }
+
+    DecoratedClass.prototype = new ctr();
+
+    for (var m = 0; m < superMethods.length; m++) {
+        var superMethod = superMethods[m];
+
+        DecoratedClass.prototype[superMethod] =
+          SuperClass.prototype[superMethod];
+    }
+
+    var calledMethod = function (methodName) {
+      // Stub out the original method if it's not decorating an actual method
+      var originalMethod = function () {};
+
+      if (methodName in DecoratedClass.prototype) {
+        originalMethod = DecoratedClass.prototype[methodName];
+      }
+
+      var decoratedMethod = DecoratorClass.prototype[methodName];
+
+      return function () {
+        var unshift = Array.prototype.unshift;
+
+        unshift.call(arguments, originalMethod);
+
+        return decoratedMethod.apply(this, arguments);
+      };
+    };
+
+    for (var d = 0; d < decoratedMethods.length; d++) {
+      var decoratedMethod = decoratedMethods[d];
+
+      DecoratedClass.prototype[decoratedMethod] = calledMethod(decoratedMethod);
+    }
+
+    return DecoratedClass;
+  };
+
+  var Observable = function () {
+    this.listeners = {};
+  };
+
+  Observable.prototype.on = function (event, callback) {
+    this.listeners = this.listeners || {};
+
+    if (event in this.listeners) {
+      this.listeners[event].push(callback);
+    } else {
+      this.listeners[event] = [callback];
+    }
+  };
+
+  Observable.prototype.trigger = function (event) {
+    var slice = Array.prototype.slice;
+    var params = slice.call(arguments, 1);
+
+    this.listeners = this.listeners || {};
+
+    // Params should always come in as an array
+    if (params == null) {
+      params = [];
+    }
+
+    // If there are no arguments to the event, use a temporary object
+    if (params.length === 0) {
+      params.push({});
+    }
+
+    // Set the `_type` of the first object to the event
+    params[0]._type = event;
+
+    if (event in this.listeners) {
+      this.invoke(this.listeners[event], slice.call(arguments, 1));
+    }
+
+    if ('*' in this.listeners) {
+      this.invoke(this.listeners['*'], arguments);
+    }
+  };
+
+  Observable.prototype.invoke = function (listeners, params) {
+    for (var i = 0, len = listeners.length; i < len; i++) {
+      listeners[i].apply(this, params);
+    }
+  };
+
+  Utils.Observable = Observable;
+
+  Utils.generateChars = function (length) {
+    var chars = '';
+
+    for (var i = 0; i < length; i++) {
+      var randomChar = Math.floor(Math.random() * 36);
+      chars += randomChar.toString(36);
+    }
+
+    return chars;
+  };
+
+  Utils.bind = function (func, context) {
+    return function () {
+      func.apply(context, arguments);
+    };
+  };
+
+  Utils._convertData = function (data) {
+    for (var originalKey in data) {
+      var keys = originalKey.split('-');
+
+      var dataLevel = data;
+
+      if (keys.length === 1) {
+        continue;
+      }
+
+      for (var k = 0; k < keys.length; k++) {
+        var key = keys[k];
+
+        // Lowercase the first letter
+        // By default, dash-separated becomes camelCase
+        key = key.substring(0, 1).toLowerCase() + key.substring(1);
+
+        if (!(key in dataLevel)) {
+          dataLevel[key] = {};
+        }
+
+        if (k == keys.length - 1) {
+          dataLevel[key] = data[originalKey];
+        }
+
+        dataLevel = dataLevel[key];
+      }
+
+      delete data[originalKey];
+    }
+
+    return data;
+  };
+
+  Utils.hasScroll = function (index, el) {
+    // Adapted from the function created by @ShadowScripter
+    // and adapted by @BillBarry on the Stack Exchange Code Review website.
+    // The original code can be found at
+    // http://codereview.stackexchange.com/q/13338
+    // and was designed to be used with the Sizzle selector engine.
+
+    var $el = $(el);
+    var overflowX = el.style.overflowX;
+    var overflowY = el.style.overflowY;
+
+    //Check both x and y declarations
+    if (overflowX === overflowY &&
+        (overflowY === 'hidden' || overflowY === 'visible')) {
+      return false;
+    }
+
+    if (overflowX === 'scroll' || overflowY === 'scroll') {
+      return true;
+    }
+
+    return ($el.innerHeight() < el.scrollHeight ||
+      $el.innerWidth() < el.scrollWidth);
+  };
+
+  Utils.escapeMarkup = function (markup) {
+    var replaceMap = {
+      '\\': '&#92;',
+      '&': '&amp;',
+      '<': '&lt;',
+      '>': '&gt;',
+      '"': '&quot;',
+      '\'': '&#39;',
+      '/': '&#47;'
+    };
+
+    // Do not try to escape the markup if it's not a string
+    if (typeof markup !== 'string') {
+      return markup;
+    }
+
+    return String(markup).replace(/[&<>"'\/\\]/g, function (match) {
+      return replaceMap[match];
+    });
+  };
+
+  // Append an array of jQuery nodes to a given element.
+  Utils.appendMany = function ($element, $nodes) {
+    // jQuery 1.7.x does not support $.fn.append() with an array
+    // Fall back to a jQuery object collection using $.fn.add()
+    if ($.fn.jquery.substr(0, 3) === '1.7') {
+      var $jqNodes = $();
+
+      $.map($nodes, function (node) {
+        $jqNodes = $jqNodes.add(node);
+      });
+
+      $nodes = $jqNodes;
+    }
+
+    $element.append($nodes);
+  };
+
+  return Utils;
+});
+
+S2.define('select2/results',[
+  'jquery',
+  './utils'
+], function ($, Utils) {
+  function Results ($element, options, dataAdapter) {
+    this.$element = $element;
+    this.data = dataAdapter;
+    this.options = options;
+
+    Results.__super__.constructor.call(this);
+  }
+
+  Utils.Extend(Results, Utils.Observable);
+
+  Results.prototype.render = function () {
+    var $results = $(
+      '<ul class="select2-results__options" role="tree"></ul>'
+    );
+
+    if (this.options.get('multiple')) {
+      $results.attr('aria-multiselectable', 'true');
+    }
+
+    this.$results = $results;
+
+    return $results;
+  };
+
+  Results.prototype.clear = function () {
+    this.$results.empty();
+  };
+
+  Results.prototype.displayMessage = function (params) {
+    var escapeMarkup = this.options.get('escapeMarkup');
+
+    this.clear();
+    this.hideLoading();
+
+    var $message = $(
+      '<li role="treeitem" aria-live="assertive"' +
+      ' class="select2-results__option"></li>'
+    );
+
+    var message = this.options.get('translations').get(params.message);
+
+    $message.append(
+      escapeMarkup(
+        message(params.args)
+      )
+    );
+
+    $message[0].className += ' select2-results__message';
+
+    this.$results.append($message);
+  };
+
+  Results.prototype.hideMessages = function () {
+    this.$results.find('.select2-results__message').remove();
+  };
+
+  Results.prototype.append = function (data) {
+    this.hideLoading();
+
+    var $options = [];
+
+    if (data.results == null || data.results.length === 0) {
+      if (this.$results.children().length === 0) {
+        this.trigger('results:message', {
+          message: 'noResults'
+        });
+      }
+
+      return;
+    }
+
+    data.results = this.sort(data.results);
+
+    for (var d = 0; d < data.results.length; d++) {
+      var item = data.results[d];
+
+      var $option = this.option(item);
+
+      $options.push($option);
+    }
+
+    this.$results.append($options);
+  };
+
+  Results.prototype.position = function ($results, $dropdown) {
+    var $resultsContainer = $dropdown.find('.select2-results');
+    $resultsContainer.append($results);
+  };
+
+  Results.prototype.sort = function (data) {
+    var sorter = this.options.get('sorter');
+
+    return sorter(data);
+  };
+
+  Results.prototype.highlightFirstItem = function () {
+    var $options = this.$results
+      .find('.select2-results__option[aria-selected]');
+
+    var $selected = $options.filter('[aria-selected=true]');
+
+    // Check if there are any selected options
+    if ($selected.length > 0) {
+      // If there are selected options, highlight the first
+      $selected.first().trigger('mouseenter');
+    } else {
+      // If there are no selected options, highlight the first option
+      // in the dropdown
+      $options.first().trigger('mouseenter');
+    }
+
+    this.ensureHighlightVisible();
+  };
+
+  Results.prototype.setClasses = function () {
+    var self = this;
+
+    this.data.current(function (selected) {
+      var selectedIds = $.map(selected, function (s) {
+        return s.id.toString();
+      });
+
+      var $options = self.$results
+        .find('.select2-results__option[aria-selected]');
+
+      $options.each(function () {
+        var $option = $(this);
+
+        var item = $.data(this, 'data');
+
+        // id needs to be converted to a string when comparing
+        var id = '' + item.id;
+
+        if ((item.element != null && item.element.selected) ||
+            (item.element == null && $.inArray(id, selectedIds) > -1)) {
+          $option.attr('aria-selected', 'true');
+        } else {
+          $option.attr('aria-selected', 'false');
+        }
+      });
+
+    });
+  };
+
+  Results.prototype.showLoading = function (params) {
+    this.hideLoading();
+
+    var loadingMore = this.options.get('translations').get('searching');
+
+    var loading = {
+      disabled: true,
+      loading: true,
+      text: loadingMore(params)
+    };
+    var $loading = this.option(loading);
+    $loading.className += ' loading-results';
+
+    this.$results.prepend($loading);
+  };
+
+  Results.prototype.hideLoading = function () {
+    this.$results.find('.loading-results').remove();
+  };
+
+  Results.prototype.option = function (data) {
+    var option = document.createElement('li');
+    option.className = 'select2-results__option';
+
+    var attrs = {
+      'role': 'treeitem',
+      'aria-selected': 'false'
+    };
+
+    if (data.disabled) {
+      delete attrs['aria-selected'];
+      attrs['aria-disabled'] = 'true';
+    }
+
+    if (data.id == null) {
+      delete attrs['aria-selected'];
+    }
+
+    if (data._resultId != null) {
+      option.id = data._resultId;
+    }
+
+    if (data.title) {
+      option.title = data.title;
+    }
+
+    if (data.children) {
+      attrs.role = 'group';
+      attrs['aria-label'] = data.text;
+      delete attrs['aria-selected'];
+    }
+
+    for (var attr in attrs) {
+      var val = attrs[attr];
+
+      option.setAttribute(attr, val);
+    }
+
+    if (data.children) {
+      var $option = $(option);
+
+      var label = document.createElement('strong');
+      label.className = 'select2-results__group';
+
+      var $label = $(label);
+      this.template(data, label);
+
+      var $children = [];
+
+      for (var c = 0; c < data.children.length; c++) {
+        var child = data.children[c];
+
+        var $child = this.option(child);
+
+        $children.push($child);
+      }
+
+      var $childrenContainer = $('<ul></ul>', {
+        'class': 'select2-results__options select2-results__options--nested'
+      });
+
+      $childrenContainer.append($children);
+
+      $option.append(label);
+      $option.append($childrenContainer);
+    } else {
+      this.template(data, option);
+    }
+
+    $.data(option, 'data', data);
+
+    return option;
+  };
+
+  Results.prototype.bind = function (container, $container) {
+    var self = this;
+
+    var id = container.id + '-results';
+
+    this.$results.attr('id', id);
+
+    container.on('results:all', function (params) {
+      self.clear();
+      self.append(params.data);
+
+      if (container.isOpen()) {
+        self.setClasses();
+        self.highlightFirstItem();
+      }
     });
 
-    $.fn.select2 = function () {
+    container.on('results:append', function (params) {
+      self.append(params.data);
 
-        var args = Array.prototype.slice.call(arguments, 0),
-            opts,
-            select2,
-            method, value, multiple,
-            allowedMethods = ["val", "destroy", "opened", "open", "close", "focus", "isFocused", "container", "dropdown", "onSortStart", "onSortEnd", "enable", "disable", "readonly", "positionDropdown", "data", "search"],
-            valueMethods = ["opened", "isFocused", "container", "dropdown"],
-            propertyMethods = ["val", "data"],
-            methodsMap = { search: "externalSearch" };
+      if (container.isOpen()) {
+        self.setClasses();
+      }
+    });
+
+    container.on('query', function (params) {
+      self.hideMessages();
+      self.showLoading(params);
+    });
+
+    container.on('select', function () {
+      if (!container.isOpen()) {
+        return;
+      }
+
+      self.setClasses();
+      self.highlightFirstItem();
+    });
+
+    container.on('unselect', function () {
+      if (!container.isOpen()) {
+        return;
+      }
+
+      self.setClasses();
+      self.highlightFirstItem();
+    });
+
+    container.on('open', function () {
+      // When the dropdown is open, aria-expended="true"
+      self.$results.attr('aria-expanded', 'true');
+      self.$results.attr('aria-hidden', 'false');
+
+      self.setClasses();
+      self.ensureHighlightVisible();
+    });
+
+    container.on('close', function () {
+      // When the dropdown is closed, aria-expended="false"
+      self.$results.attr('aria-expanded', 'false');
+      self.$results.attr('aria-hidden', 'true');
+      self.$results.removeAttr('aria-activedescendant');
+    });
+
+    container.on('results:toggle', function () {
+      var $highlighted = self.getHighlightedResults();
+
+      if ($highlighted.length === 0) {
+        return;
+      }
+
+      $highlighted.trigger('mouseup');
+    });
+
+    container.on('results:select', function () {
+      var $highlighted = self.getHighlightedResults();
+
+      if ($highlighted.length === 0) {
+        return;
+      }
+
+      var data = $highlighted.data('data');
+
+      if ($highlighted.attr('aria-selected') == 'true') {
+        self.trigger('close', {});
+      } else {
+        self.trigger('select', {
+          data: data
+        });
+      }
+    });
+
+    container.on('results:previous', function () {
+      var $highlighted = self.getHighlightedResults();
+
+      var $options = self.$results.find('[aria-selected]');
+
+      var currentIndex = $options.index($highlighted);
+
+      // If we are already at te top, don't move further
+      if (currentIndex === 0) {
+        return;
+      }
+
+      var nextIndex = currentIndex - 1;
+
+      // If none are highlighted, highlight the first
+      if ($highlighted.length === 0) {
+        nextIndex = 0;
+      }
+
+      var $next = $options.eq(nextIndex);
+
+      $next.trigger('mouseenter');
+
+      var currentOffset = self.$results.offset().top;
+      var nextTop = $next.offset().top;
+      var nextOffset = self.$results.scrollTop() + (nextTop - currentOffset);
+
+      if (nextIndex === 0) {
+        self.$results.scrollTop(0);
+      } else if (nextTop - currentOffset < 0) {
+        self.$results.scrollTop(nextOffset);
+      }
+    });
+
+    container.on('results:next', function () {
+      var $highlighted = self.getHighlightedResults();
+
+      var $options = self.$results.find('[aria-selected]');
+
+      var currentIndex = $options.index($highlighted);
+
+      var nextIndex = currentIndex + 1;
+
+      // If we are at the last option, stay there
+      if (nextIndex >= $options.length) {
+        return;
+      }
+
+      var $next = $options.eq(nextIndex);
+
+      $next.trigger('mouseenter');
+
+      var currentOffset = self.$results.offset().top +
+        self.$results.outerHeight(false);
+      var nextBottom = $next.offset().top + $next.outerHeight(false);
+      var nextOffset = self.$results.scrollTop() + nextBottom - currentOffset;
+
+      if (nextIndex === 0) {
+        self.$results.scrollTop(0);
+      } else if (nextBottom > currentOffset) {
+        self.$results.scrollTop(nextOffset);
+      }
+    });
+
+    container.on('results:focus', function (params) {
+      params.element.addClass('select2-results__option--highlighted');
+    });
+
+    container.on('results:message', function (params) {
+      self.displayMessage(params);
+    });
+
+    if ($.fn.mousewheel) {
+      this.$results.on('mousewheel', function (e) {
+        var top = self.$results.scrollTop();
+
+        var bottom = self.$results.get(0).scrollHeight - top + e.deltaY;
+
+        var isAtTop = e.deltaY > 0 && top - e.deltaY <= 0;
+        var isAtBottom = e.deltaY < 0 && bottom <= self.$results.height();
+
+        if (isAtTop) {
+          self.$results.scrollTop(0);
+
+          e.preventDefault();
+          e.stopPropagation();
+        } else if (isAtBottom) {
+          self.$results.scrollTop(
+            self.$results.get(0).scrollHeight - self.$results.height()
+          );
+
+          e.preventDefault();
+          e.stopPropagation();
+        }
+      });
+    }
+
+    this.$results.on('mouseup', '.select2-results__option[aria-selected]',
+      function (evt) {
+      var $this = $(this);
+
+      var data = $this.data('data');
+
+      if ($this.attr('aria-selected') === 'true') {
+        if (self.options.get('multiple')) {
+          self.trigger('unselect', {
+            originalEvent: evt,
+            data: data
+          });
+        } else {
+          self.trigger('close', {});
+        }
+
+        return;
+      }
+
+      self.trigger('select', {
+        originalEvent: evt,
+        data: data
+      });
+    });
+
+    this.$results.on('mouseenter', '.select2-results__option[aria-selected]',
+      function (evt) {
+      var data = $(this).data('data');
+
+      self.getHighlightedResults()
+          .removeClass('select2-results__option--highlighted');
+
+      self.trigger('results:focus', {
+        data: data,
+        element: $(this)
+      });
+    });
+  };
+
+  Results.prototype.getHighlightedResults = function () {
+    var $highlighted = this.$results
+    .find('.select2-results__option--highlighted');
+
+    return $highlighted;
+  };
+
+  Results.prototype.destroy = function () {
+    this.$results.remove();
+  };
+
+  Results.prototype.ensureHighlightVisible = function () {
+    var $highlighted = this.getHighlightedResults();
+
+    if ($highlighted.length === 0) {
+      return;
+    }
+
+    var $options = this.$results.find('[aria-selected]');
+
+    var currentIndex = $options.index($highlighted);
+
+    var currentOffset = this.$results.offset().top;
+    var nextTop = $highlighted.offset().top;
+    var nextOffset = this.$results.scrollTop() + (nextTop - currentOffset);
+
+    var offsetDelta = nextTop - currentOffset;
+    nextOffset -= $highlighted.outerHeight(false) * 2;
+
+    if (currentIndex <= 2) {
+      this.$results.scrollTop(0);
+    } else if (offsetDelta > this.$results.outerHeight() || offsetDelta < 0) {
+      this.$results.scrollTop(nextOffset);
+    }
+  };
+
+  Results.prototype.template = function (result, container) {
+    var template = this.options.get('templateResult');
+    var escapeMarkup = this.options.get('escapeMarkup');
+
+    var content = template(result, container);
+
+    if (content == null) {
+      container.style.display = 'none';
+    } else if (typeof content === 'string') {
+      container.innerHTML = escapeMarkup(content);
+    } else {
+      $(container).append(content);
+    }
+  };
+
+  return Results;
+});
+
+S2.define('select2/keys',[
+
+], function () {
+  var KEYS = {
+    BACKSPACE: 8,
+    TAB: 9,
+    ENTER: 13,
+    SHIFT: 16,
+    CTRL: 17,
+    ALT: 18,
+    ESC: 27,
+    SPACE: 32,
+    PAGE_UP: 33,
+    PAGE_DOWN: 34,
+    END: 35,
+    HOME: 36,
+    LEFT: 37,
+    UP: 38,
+    RIGHT: 39,
+    DOWN: 40,
+    DELETE: 46
+  };
+
+  return KEYS;
+});
+
+S2.define('select2/selection/base',[
+  'jquery',
+  '../utils',
+  '../keys'
+], function ($, Utils, KEYS) {
+  function BaseSelection ($element, options) {
+    this.$element = $element;
+    this.options = options;
+
+    BaseSelection.__super__.constructor.call(this);
+  }
+
+  Utils.Extend(BaseSelection, Utils.Observable);
+
+  BaseSelection.prototype.render = function () {
+    var $selection = $(
+      '<span class="select2-selection" role="combobox" ' +
+      ' aria-haspopup="true" aria-expanded="false">' +
+      '</span>'
+    );
+
+    this._tabindex = 0;
+
+    if (this.$element.data('old-tabindex') != null) {
+      this._tabindex = this.$element.data('old-tabindex');
+    } else if (this.$element.attr('tabindex') != null) {
+      this._tabindex = this.$element.attr('tabindex');
+    }
+
+    $selection.attr('title', this.$element.attr('title'));
+    $selection.attr('tabindex', this._tabindex);
+
+    this.$selection = $selection;
+
+    return $selection;
+  };
+
+  BaseSelection.prototype.bind = function (container, $container) {
+    var self = this;
+
+    var id = container.id + '-container';
+    var resultsId = container.id + '-results';
+
+    this.container = container;
+
+    this.$selection.on('focus', function (evt) {
+      self.trigger('focus', evt);
+    });
+
+    this.$selection.on('blur', function (evt) {
+      self._handleBlur(evt);
+    });
+
+    this.$selection.on('keydown', function (evt) {
+      self.trigger('keypress', evt);
+
+      if (evt.which === KEYS.SPACE) {
+        evt.preventDefault();
+      }
+    });
+
+    container.on('results:focus', function (params) {
+      self.$selection.attr('aria-activedescendant', params.data._resultId);
+    });
+
+    container.on('selection:update', function (params) {
+      self.update(params.data);
+    });
+
+    container.on('open', function () {
+      // When the dropdown is open, aria-expanded="true"
+      self.$selection.attr('aria-expanded', 'true');
+      self.$selection.attr('aria-owns', resultsId);
+
+      self._attachCloseHandler(container);
+    });
+
+    container.on('close', function () {
+      // When the dropdown is closed, aria-expanded="false"
+      self.$selection.attr('aria-expanded', 'false');
+      self.$selection.removeAttr('aria-activedescendant');
+      self.$selection.removeAttr('aria-owns');
+
+      self.$selection.focus();
+
+      self._detachCloseHandler(container);
+    });
+
+    container.on('enable', function () {
+      self.$selection.attr('tabindex', self._tabindex);
+    });
+
+    container.on('disable', function () {
+      self.$selection.attr('tabindex', '-1');
+    });
+  };
+
+  BaseSelection.prototype._handleBlur = function (evt) {
+    var self = this;
+
+    // This needs to be delayed as the active element is the body when the tab
+    // key is pressed, possibly along with others.
+    window.setTimeout(function () {
+      // Don't trigger `blur` if the focus is still in the selection
+      if (
+        (document.activeElement == self.$selection[0]) ||
+        ($.contains(self.$selection[0], document.activeElement))
+      ) {
+        return;
+      }
+
+      self.trigger('blur', evt);
+    }, 1);
+  };
+
+  BaseSelection.prototype._attachCloseHandler = function (container) {
+    var self = this;
+
+    $(document.body).on('mousedown.select2.' + container.id, function (e) {
+      var $target = $(e.target);
+
+      var $select = $target.closest('.select2');
+
+      var $all = $('.select2.select2-container--open');
+
+      $all.each(function () {
+        var $this = $(this);
+
+        if (this == $select[0]) {
+          return;
+        }
+
+        var $element = $this.data('element');
+
+        $element.select2('close');
+      });
+    });
+  };
+
+  BaseSelection.prototype._detachCloseHandler = function (container) {
+    $(document.body).off('mousedown.select2.' + container.id);
+  };
+
+  BaseSelection.prototype.position = function ($selection, $container) {
+    var $selectionContainer = $container.find('.selection');
+    $selectionContainer.append($selection);
+  };
+
+  BaseSelection.prototype.destroy = function () {
+    this._detachCloseHandler(this.container);
+  };
+
+  BaseSelection.prototype.update = function (data) {
+    throw new Error('The `update` method must be defined in child classes.');
+  };
+
+  return BaseSelection;
+});
+
+S2.define('select2/selection/single',[
+  'jquery',
+  './base',
+  '../utils',
+  '../keys'
+], function ($, BaseSelection, Utils, KEYS) {
+  function SingleSelection () {
+    SingleSelection.__super__.constructor.apply(this, arguments);
+  }
+
+  Utils.Extend(SingleSelection, BaseSelection);
+
+  SingleSelection.prototype.render = function () {
+    var $selection = SingleSelection.__super__.render.call(this);
+
+    $selection.addClass('select2-selection--single');
+
+    $selection.html(
+      '<span class="select2-selection__rendered"></span>' +
+      '<span class="select2-selection__arrow" role="presentation">' +
+        '<b role="presentation"></b>' +
+      '</span>'
+    );
+
+    return $selection;
+  };
+
+  SingleSelection.prototype.bind = function (container, $container) {
+    var self = this;
+
+    SingleSelection.__super__.bind.apply(this, arguments);
+
+    var id = container.id + '-container';
+
+    this.$selection.find('.select2-selection__rendered').attr('id', id);
+    this.$selection.attr('aria-labelledby', id);
+
+    this.$selection.on('mousedown', function (evt) {
+      // Only respond to left clicks
+      if (evt.which !== 1) {
+        return;
+      }
+
+      self.trigger('toggle', {
+        originalEvent: evt
+      });
+    });
+
+    this.$selection.on('focus', function (evt) {
+      // User focuses on the container
+    });
+
+    this.$selection.on('blur', function (evt) {
+      // User exits the container
+    });
+
+    container.on('focus', function (evt) {
+      if (!container.isOpen()) {
+        self.$selection.focus();
+      }
+    });
+
+    container.on('selection:update', function (params) {
+      self.update(params.data);
+    });
+  };
+
+  SingleSelection.prototype.clear = function () {
+    this.$selection.find('.select2-selection__rendered').empty();
+  };
+
+  SingleSelection.prototype.display = function (data, container) {
+    var template = this.options.get('templateSelection');
+    var escapeMarkup = this.options.get('escapeMarkup');
+
+    return escapeMarkup(template(data, container));
+  };
+
+  SingleSelection.prototype.selectionContainer = function () {
+    return $('<span></span>');
+  };
+
+  SingleSelection.prototype.update = function (data) {
+    if (data.length === 0) {
+      this.clear();
+      return;
+    }
+
+    var selection = data[0];
+
+    var $rendered = this.$selection.find('.select2-selection__rendered');
+    var formatted = this.display(selection, $rendered);
+
+    $rendered.empty().append(formatted);
+    $rendered.prop('title', selection.title || selection.text);
+  };
+
+  return SingleSelection;
+});
+
+S2.define('select2/selection/multiple',[
+  'jquery',
+  './base',
+  '../utils'
+], function ($, BaseSelection, Utils) {
+  function MultipleSelection ($element, options) {
+    MultipleSelection.__super__.constructor.apply(this, arguments);
+  }
+
+  Utils.Extend(MultipleSelection, BaseSelection);
+
+  MultipleSelection.prototype.render = function () {
+    var $selection = MultipleSelection.__super__.render.call(this);
+
+    $selection.addClass('select2-selection--multiple');
+
+    $selection.html(
+      '<ul class="select2-selection__rendered"></ul>'
+    );
+
+    return $selection;
+  };
+
+  MultipleSelection.prototype.bind = function (container, $container) {
+    var self = this;
+
+    MultipleSelection.__super__.bind.apply(this, arguments);
+
+    this.$selection.on('click', function (evt) {
+      self.trigger('toggle', {
+        originalEvent: evt
+      });
+    });
+
+    this.$selection.on(
+      'click',
+      '.select2-selection__choice__remove',
+      function (evt) {
+        // Ignore the event if it is disabled
+        if (self.options.get('disabled')) {
+          return;
+        }
+
+        var $remove = $(this);
+        var $selection = $remove.parent();
+
+        var data = $selection.data('data');
+
+        self.trigger('unselect', {
+          originalEvent: evt,
+          data: data
+        });
+      }
+    );
+  };
+
+  MultipleSelection.prototype.clear = function () {
+    this.$selection.find('.select2-selection__rendered').empty();
+  };
+
+  MultipleSelection.prototype.display = function (data, container) {
+    var template = this.options.get('templateSelection');
+    var escapeMarkup = this.options.get('escapeMarkup');
+
+    return escapeMarkup(template(data, container));
+  };
+
+  MultipleSelection.prototype.selectionContainer = function () {
+    var $container = $(
+      '<li class="select2-selection__choice">' +
+        '<span class="select2-selection__choice__remove" role="presentation">' +
+          '&times;' +
+        '</span>' +
+      '</li>'
+    );
+
+    return $container;
+  };
+
+  MultipleSelection.prototype.update = function (data) {
+    this.clear();
+
+    if (data.length === 0) {
+      return;
+    }
+
+    var $selections = [];
+
+    for (var d = 0; d < data.length; d++) {
+      var selection = data[d];
+
+      var $selection = this.selectionContainer();
+      var formatted = this.display(selection, $selection);
+
+      $selection.append(formatted);
+      $selection.prop('title', selection.title || selection.text);
+
+      $selection.data('data', selection);
+
+      $selections.push($selection);
+    }
+
+    var $rendered = this.$selection.find('.select2-selection__rendered');
+
+    Utils.appendMany($rendered, $selections);
+  };
+
+  return MultipleSelection;
+});
+
+S2.define('select2/selection/placeholder',[
+  '../utils'
+], function (Utils) {
+  function Placeholder (decorated, $element, options) {
+    this.placeholder = this.normalizePlaceholder(options.get('placeholder'));
+
+    decorated.call(this, $element, options);
+  }
+
+  Placeholder.prototype.normalizePlaceholder = function (_, placeholder) {
+    if (typeof placeholder === 'string') {
+      placeholder = {
+        id: '',
+        text: placeholder
+      };
+    }
+
+    return placeholder;
+  };
+
+  Placeholder.prototype.createPlaceholder = function (decorated, placeholder) {
+    var $placeholder = this.selectionContainer();
+
+    $placeholder.html(this.display(placeholder));
+    $placeholder.addClass('select2-selection__placeholder')
+                .removeClass('select2-selection__choice');
+
+    return $placeholder;
+  };
+
+  Placeholder.prototype.update = function (decorated, data) {
+    var singlePlaceholder = (
+      data.length == 1 && data[0].id != this.placeholder.id
+    );
+    var multipleSelections = data.length > 1;
+
+    if (multipleSelections || singlePlaceholder) {
+      return decorated.call(this, data);
+    }
+
+    this.clear();
+
+    var $placeholder = this.createPlaceholder(this.placeholder);
+
+    this.$selection.find('.select2-selection__rendered').append($placeholder);
+  };
+
+  return Placeholder;
+});
+
+S2.define('select2/selection/allowClear',[
+  'jquery',
+  '../keys'
+], function ($, KEYS) {
+  function AllowClear () { }
+
+  AllowClear.prototype.bind = function (decorated, container, $container) {
+    var self = this;
+
+    decorated.call(this, container, $container);
+
+    if (this.placeholder == null) {
+      if (this.options.get('debug') && window.console && console.error) {
+        console.error(
+          'Select2: The `allowClear` option should be used in combination ' +
+          'with the `placeholder` option.'
+        );
+      }
+    }
+
+    this.$selection.on('mousedown', '.select2-selection__clear',
+      function (evt) {
+        self._handleClear(evt);
+    });
+
+    container.on('keypress', function (evt) {
+      self._handleKeyboardClear(evt, container);
+    });
+  };
+
+  AllowClear.prototype._handleClear = function (_, evt) {
+    // Ignore the event if it is disabled
+    if (this.options.get('disabled')) {
+      return;
+    }
+
+    var $clear = this.$selection.find('.select2-selection__clear');
+
+    // Ignore the event if nothing has been selected
+    if ($clear.length === 0) {
+      return;
+    }
+
+    evt.stopPropagation();
+
+    var data = $clear.data('data');
+
+    for (var d = 0; d < data.length; d++) {
+      var unselectData = {
+        data: data[d]
+      };
+
+      // Trigger the `unselect` event, so people can prevent it from being
+      // cleared.
+      this.trigger('unselect', unselectData);
+
+      // If the event was prevented, don't clear it out.
+      if (unselectData.prevented) {
+        return;
+      }
+    }
+
+    this.$element.val(this.placeholder.id).trigger('change');
+
+    this.trigger('toggle', {});
+  };
+
+  AllowClear.prototype._handleKeyboardClear = function (_, evt, container) {
+    if (container.isOpen()) {
+      return;
+    }
+
+    if (evt.which == KEYS.DELETE || evt.which == KEYS.BACKSPACE) {
+      this._handleClear(evt);
+    }
+  };
+
+  AllowClear.prototype.update = function (decorated, data) {
+    decorated.call(this, data);
+
+    if (this.$selection.find('.select2-selection__placeholder').length > 0 ||
+        data.length === 0) {
+      return;
+    }
+
+    var $remove = $(
+      '<span class="select2-selection__clear">' +
+        '&times;' +
+      '</span>'
+    );
+    $remove.data('data', data);
+
+    this.$selection.find('.select2-selection__rendered').prepend($remove);
+  };
+
+  return AllowClear;
+});
+
+S2.define('select2/selection/search',[
+  'jquery',
+  '../utils',
+  '../keys'
+], function ($, Utils, KEYS) {
+  function Search (decorated, $element, options) {
+    decorated.call(this, $element, options);
+  }
+
+  Search.prototype.render = function (decorated) {
+    var $search = $(
+      '<li class="select2-search select2-search--inline">' +
+        '<input class="select2-search__field" type="search" tabindex="-1"' +
+        ' autocomplete="off" autocorrect="off" autocapitalize="off"' +
+        ' spellcheck="false" role="textbox" aria-autocomplete="list" />' +
+      '</li>'
+    );
+
+    this.$searchContainer = $search;
+    this.$search = $search.find('input');
+
+    var $rendered = decorated.call(this);
+
+    this._transferTabIndex();
+
+    return $rendered;
+  };
+
+  Search.prototype.bind = function (decorated, container, $container) {
+    var self = this;
+
+    decorated.call(this, container, $container);
+
+    container.on('open', function () {
+      self.$search.trigger('focus');
+    });
+
+    container.on('close', function () {
+      self.$search.val('');
+      self.$search.removeAttr('aria-activedescendant');
+      self.$search.trigger('focus');
+    });
+
+    container.on('enable', function () {
+      self.$search.prop('disabled', false);
+
+      self._transferTabIndex();
+    });
+
+    container.on('disable', function () {
+      self.$search.prop('disabled', true);
+    });
+
+    container.on('focus', function (evt) {
+      self.$search.trigger('focus');
+    });
+
+    container.on('results:focus', function (params) {
+      self.$search.attr('aria-activedescendant', params.id);
+    });
+
+    this.$selection.on('focusin', '.select2-search--inline', function (evt) {
+      self.trigger('focus', evt);
+    });
+
+    this.$selection.on('focusout', '.select2-search--inline', function (evt) {
+      self._handleBlur(evt);
+    });
+
+    this.$selection.on('keydown', '.select2-search--inline', function (evt) {
+      evt.stopPropagation();
+
+      self.trigger('keypress', evt);
+
+      self._keyUpPrevented = evt.isDefaultPrevented();
+
+      var key = evt.which;
+
+      if (key === KEYS.BACKSPACE && self.$search.val() === '') {
+        var $previousChoice = self.$searchContainer
+          .prev('.select2-selection__choice');
+
+        if ($previousChoice.length > 0) {
+          var item = $previousChoice.data('data');
+
+          self.searchRemoveChoice(item);
+
+          evt.preventDefault();
+        }
+      }
+    });
+
+    // Try to detect the IE version should the `documentMode` property that
+    // is stored on the document. This is only implemented in IE and is
+    // slightly cleaner than doing a user agent check.
+    // This property is not available in Edge, but Edge also doesn't have
+    // this bug.
+    var msie = document.documentMode;
+    var disableInputEvents = msie && msie <= 11;
+
+    // Workaround for browsers which do not support the `input` event
+    // This will prevent double-triggering of events for browsers which support
+    // both the `keyup` and `input` events.
+    this.$selection.on(
+      'input.searchcheck',
+      '.select2-search--inline',
+      function (evt) {
+        // IE will trigger the `input` event when a placeholder is used on a
+        // search box. To get around this issue, we are forced to ignore all
+        // `input` events in IE and keep using `keyup`.
+        if (disableInputEvents) {
+          self.$selection.off('input.search input.searchcheck');
+          return;
+        }
+
+        // Unbind the duplicated `keyup` event
+        self.$selection.off('keyup.search');
+      }
+    );
+
+    this.$selection.on(
+      'keyup.search input.search',
+      '.select2-search--inline',
+      function (evt) {
+        // IE will trigger the `input` event when a placeholder is used on a
+        // search box. To get around this issue, we are forced to ignore all
+        // `input` events in IE and keep using `keyup`.
+        if (disableInputEvents && evt.type === 'input') {
+          self.$selection.off('input.search input.searchcheck');
+          return;
+        }
+
+        var key = evt.which;
+
+        // We can freely ignore events from modifier keys
+        if (key == KEYS.SHIFT || key == KEYS.CTRL || key == KEYS.ALT) {
+          return;
+        }
+
+        // Tabbing will be handled during the `keydown` phase
+        if (key == KEYS.TAB) {
+          return;
+        }
+
+        self.handleSearch(evt);
+      }
+    );
+  };
+
+  /**
+   * This method will transfer the tabindex attribute from the rendered
+   * selection to the search box. This allows for the search box to be used as
+   * the primary focus instead of the selection container.
+   *
+   * @private
+   */
+  Search.prototype._transferTabIndex = function (decorated) {
+    this.$search.attr('tabindex', this.$selection.attr('tabindex'));
+    this.$selection.attr('tabindex', '-1');
+  };
+
+  Search.prototype.createPlaceholder = function (decorated, placeholder) {
+    this.$search.attr('placeholder', placeholder.text);
+  };
+
+  Search.prototype.update = function (decorated, data) {
+    var searchHadFocus = this.$search[0] == document.activeElement;
+
+    this.$search.attr('placeholder', '');
+
+    decorated.call(this, data);
+
+    this.$selection.find('.select2-selection__rendered')
+                   .append(this.$searchContainer);
+
+    this.resizeSearch();
+    if (searchHadFocus) {
+      this.$search.focus();
+    }
+  };
+
+  Search.prototype.handleSearch = function () {
+    this.resizeSearch();
+
+    if (!this._keyUpPrevented) {
+      var input = this.$search.val();
+
+      this.trigger('query', {
+        term: input
+      });
+    }
+
+    this._keyUpPrevented = false;
+  };
+
+  Search.prototype.searchRemoveChoice = function (decorated, item) {
+    this.trigger('unselect', {
+      data: item
+    });
+
+    this.$search.val(item.text);
+    this.handleSearch();
+  };
+
+  Search.prototype.resizeSearch = function () {
+    this.$search.css('width', '25px');
+
+    var width = '';
+
+    if (this.$search.attr('placeholder') !== '') {
+      width = this.$selection.find('.select2-selection__rendered').innerWidth();
+    } else {
+      var minimumWidth = this.$search.val().length + 1;
+
+      width = (minimumWidth * 0.75) + 'em';
+    }
+
+    this.$search.css('width', width);
+  };
+
+  return Search;
+});
+
+S2.define('select2/selection/eventRelay',[
+  'jquery'
+], function ($) {
+  function EventRelay () { }
+
+  EventRelay.prototype.bind = function (decorated, container, $container) {
+    var self = this;
+    var relayEvents = [
+      'open', 'opening',
+      'close', 'closing',
+      'select', 'selecting',
+      'unselect', 'unselecting'
+    ];
+
+    var preventableEvents = ['opening', 'closing', 'selecting', 'unselecting'];
+
+    decorated.call(this, container, $container);
+
+    container.on('*', function (name, params) {
+      // Ignore events that should not be relayed
+      if ($.inArray(name, relayEvents) === -1) {
+        return;
+      }
+
+      // The parameters should always be an object
+      params = params || {};
+
+      // Generate the jQuery event for the Select2 event
+      var evt = $.Event('select2:' + name, {
+        params: params
+      });
+
+      self.$element.trigger(evt);
+
+      // Only handle preventable events if it was one
+      if ($.inArray(name, preventableEvents) === -1) {
+        return;
+      }
+
+      params.prevented = evt.isDefaultPrevented();
+    });
+  };
+
+  return EventRelay;
+});
+
+S2.define('select2/translation',[
+  'jquery',
+  'require'
+], function ($, require) {
+  function Translation (dict) {
+    this.dict = dict || {};
+  }
+
+  Translation.prototype.all = function () {
+    return this.dict;
+  };
+
+  Translation.prototype.get = function (key) {
+    return this.dict[key];
+  };
+
+  Translation.prototype.extend = function (translation) {
+    this.dict = $.extend({}, translation.all(), this.dict);
+  };
+
+  // Static functions
+
+  Translation._cache = {};
+
+  Translation.loadPath = function (path) {
+    if (!(path in Translation._cache)) {
+      var translations = require(path);
+
+      Translation._cache[path] = translations;
+    }
+
+    return new Translation(Translation._cache[path]);
+  };
+
+  return Translation;
+});
+
+S2.define('select2/diacritics',[
+
+], function () {
+  var diacritics = {
+    '\u24B6': 'A',
+    '\uFF21': 'A',
+    '\u00C0': 'A',
+    '\u00C1': 'A',
+    '\u00C2': 'A',
+    '\u1EA6': 'A',
+    '\u1EA4': 'A',
+    '\u1EAA': 'A',
+    '\u1EA8': 'A',
+    '\u00C3': 'A',
+    '\u0100': 'A',
+    '\u0102': 'A',
+    '\u1EB0': 'A',
+    '\u1EAE': 'A',
+    '\u1EB4': 'A',
+    '\u1EB2': 'A',
+    '\u0226': 'A',
+    '\u01E0': 'A',
+    '\u00C4': 'A',
+    '\u01DE': 'A',
+    '\u1EA2': 'A',
+    '\u00C5': 'A',
+    '\u01FA': 'A',
+    '\u01CD': 'A',
+    '\u0200': 'A',
+    '\u0202': 'A',
+    '\u1EA0': 'A',
+    '\u1EAC': 'A',
+    '\u1EB6': 'A',
+    '\u1E00': 'A',
+    '\u0104': 'A',
+    '\u023A': 'A',
+    '\u2C6F': 'A',
+    '\uA732': 'AA',
+    '\u00C6': 'AE',
+    '\u01FC': 'AE',
+    '\u01E2': 'AE',
+    '\uA734': 'AO',
+    '\uA736': 'AU',
+    '\uA738': 'AV',
+    '\uA73A': 'AV',
+    '\uA73C': 'AY',
+    '\u24B7': 'B',
+    '\uFF22': 'B',
+    '\u1E02': 'B',
+    '\u1E04': 'B',
+    '\u1E06': 'B',
+    '\u0243': 'B',
+    '\u0182': 'B',
+    '\u0181': 'B',
+    '\u24B8': 'C',
+    '\uFF23': 'C',
+    '\u0106': 'C',
+    '\u0108': 'C',
+    '\u010A': 'C',
+    '\u010C': 'C',
+    '\u00C7': 'C',
+    '\u1E08': 'C',
+    '\u0187': 'C',
+    '\u023B': 'C',
+    '\uA73E': 'C',
+    '\u24B9': 'D',
+    '\uFF24': 'D',
+    '\u1E0A': 'D',
+    '\u010E': 'D',
+    '\u1E0C': 'D',
+    '\u1E10': 'D',
+    '\u1E12': 'D',
+    '\u1E0E': 'D',
+    '\u0110': 'D',
+    '\u018B': 'D',
+    '\u018A': 'D',
+    '\u0189': 'D',
+    '\uA779': 'D',
+    '\u01F1': 'DZ',
+    '\u01C4': 'DZ',
+    '\u01F2': 'Dz',
+    '\u01C5': 'Dz',
+    '\u24BA': 'E',
+    '\uFF25': 'E',
+    '\u00C8': 'E',
+    '\u00C9': 'E',
+    '\u00CA': 'E',
+    '\u1EC0': 'E',
+    '\u1EBE': 'E',
+    '\u1EC4': 'E',
+    '\u1EC2': 'E',
+    '\u1EBC': 'E',
+    '\u0112': 'E',
+    '\u1E14': 'E',
+    '\u1E16': 'E',
+    '\u0114': 'E',
+    '\u0116': 'E',
+    '\u00CB': 'E',
+    '\u1EBA': 'E',
+    '\u011A': 'E',
+    '\u0204': 'E',
+    '\u0206': 'E',
+    '\u1EB8': 'E',
+    '\u1EC6': 'E',
+    '\u0228': 'E',
+    '\u1E1C': 'E',
+    '\u0118': 'E',
+    '\u1E18': 'E',
+    '\u1E1A': 'E',
+    '\u0190': 'E',
+    '\u018E': 'E',
+    '\u24BB': 'F',
+    '\uFF26': 'F',
+    '\u1E1E': 'F',
+    '\u0191': 'F',
+    '\uA77B': 'F',
+    '\u24BC': 'G',
+    '\uFF27': 'G',
+    '\u01F4': 'G',
+    '\u011C': 'G',
+    '\u1E20': 'G',
+    '\u011E': 'G',
+    '\u0120': 'G',
+    '\u01E6': 'G',
+    '\u0122': 'G',
+    '\u01E4': 'G',
+    '\u0193': 'G',
+    '\uA7A0': 'G',
+    '\uA77D': 'G',
+    '\uA77E': 'G',
+    '\u24BD': 'H',
+    '\uFF28': 'H',
+    '\u0124': 'H',
+    '\u1E22': 'H',
+    '\u1E26': 'H',
+    '\u021E': 'H',
+    '\u1E24': 'H',
+    '\u1E28': 'H',
+    '\u1E2A': 'H',
+    '\u0126': 'H',
+    '\u2C67': 'H',
+    '\u2C75': 'H',
+    '\uA78D': 'H',
+    '\u24BE': 'I',
+    '\uFF29': 'I',
+    '\u00CC': 'I',
+    '\u00CD': 'I',
+    '\u00CE': 'I',
+    '\u0128': 'I',
+    '\u012A': 'I',
+    '\u012C': 'I',
+    '\u0130': 'I',
+    '\u00CF': 'I',
+    '\u1E2E': 'I',
+    '\u1EC8': 'I',
+    '\u01CF': 'I',
+    '\u0208': 'I',
+    '\u020A': 'I',
+    '\u1ECA': 'I',
+    '\u012E': 'I',
+    '\u1E2C': 'I',
+    '\u0197': 'I',
+    '\u24BF': 'J',
+    '\uFF2A': 'J',
+    '\u0134': 'J',
+    '\u0248': 'J',
+    '\u24C0': 'K',
+    '\uFF2B': 'K',
+    '\u1E30': 'K',
+    '\u01E8': 'K',
+    '\u1E32': 'K',
+    '\u0136': 'K',
+    '\u1E34': 'K',
+    '\u0198': 'K',
+    '\u2C69': 'K',
+    '\uA740': 'K',
+    '\uA742': 'K',
+    '\uA744': 'K',
+    '\uA7A2': 'K',
+    '\u24C1': 'L',
+    '\uFF2C': 'L',
+    '\u013F': 'L',
+    '\u0139': 'L',
+    '\u013D': 'L',
+    '\u1E36': 'L',
+    '\u1E38': 'L',
+    '\u013B': 'L',
+    '\u1E3C': 'L',
+    '\u1E3A': 'L',
+    '\u0141': 'L',
+    '\u023D': 'L',
+    '\u2C62': 'L',
+    '\u2C60': 'L',
+    '\uA748': 'L',
+    '\uA746': 'L',
+    '\uA780': 'L',
+    '\u01C7': 'LJ',
+    '\u01C8': 'Lj',
+    '\u24C2': 'M',
+    '\uFF2D': 'M',
+    '\u1E3E': 'M',
+    '\u1E40': 'M',
+    '\u1E42': 'M',
+    '\u2C6E': 'M',
+    '\u019C': 'M',
+    '\u24C3': 'N',
+    '\uFF2E': 'N',
+    '\u01F8': 'N',
+    '\u0143': 'N',
+    '\u00D1': 'N',
+    '\u1E44': 'N',
+    '\u0147': 'N',
+    '\u1E46': 'N',
+    '\u0145': 'N',
+    '\u1E4A': 'N',
+    '\u1E48': 'N',
+    '\u0220': 'N',
+    '\u019D': 'N',
+    '\uA790': 'N',
+    '\uA7A4': 'N',
+    '\u01CA': 'NJ',
+    '\u01CB': 'Nj',
+    '\u24C4': 'O',
+    '\uFF2F': 'O',
+    '\u00D2': 'O',
+    '\u00D3': 'O',
+    '\u00D4': 'O',
+    '\u1ED2': 'O',
+    '\u1ED0': 'O',
+    '\u1ED6': 'O',
+    '\u1ED4': 'O',
+    '\u00D5': 'O',
+    '\u1E4C': 'O',
+    '\u022C': 'O',
+    '\u1E4E': 'O',
+    '\u014C': 'O',
+    '\u1E50': 'O',
+    '\u1E52': 'O',
+    '\u014E': 'O',
+    '\u022E': 'O',
+    '\u0230': 'O',
+    '\u00D6': 'O',
+    '\u022A': 'O',
+    '\u1ECE': 'O',
+    '\u0150': 'O',
+    '\u01D1': 'O',
+    '\u020C': 'O',
+    '\u020E': 'O',
+    '\u01A0': 'O',
+    '\u1EDC': 'O',
+    '\u1EDA': 'O',
+    '\u1EE0': 'O',
+    '\u1EDE': 'O',
+    '\u1EE2': 'O',
+    '\u1ECC': 'O',
+    '\u1ED8': 'O',
+    '\u01EA': 'O',
+    '\u01EC': 'O',
+    '\u00D8': 'O',
+    '\u01FE': 'O',
+    '\u0186': 'O',
+    '\u019F': 'O',
+    '\uA74A': 'O',
+    '\uA74C': 'O',
+    '\u01A2': 'OI',
+    '\uA74E': 'OO',
+    '\u0222': 'OU',
+    '\u24C5': 'P',
+    '\uFF30': 'P',
+    '\u1E54': 'P',
+    '\u1E56': 'P',
+    '\u01A4': 'P',
+    '\u2C63': 'P',
+    '\uA750': 'P',
+    '\uA752': 'P',
+    '\uA754': 'P',
+    '\u24C6': 'Q',
+    '\uFF31': 'Q',
+    '\uA756': 'Q',
+    '\uA758': 'Q',
+    '\u024A': 'Q',
+    '\u24C7': 'R',
+    '\uFF32': 'R',
+    '\u0154': 'R',
+    '\u1E58': 'R',
+    '\u0158': 'R',
+    '\u0210': 'R',
+    '\u0212': 'R',
+    '\u1E5A': 'R',
+    '\u1E5C': 'R',
+    '\u0156': 'R',
+    '\u1E5E': 'R',
+    '\u024C': 'R',
+    '\u2C64': 'R',
+    '\uA75A': 'R',
+    '\uA7A6': 'R',
+    '\uA782': 'R',
+    '\u24C8': 'S',
+    '\uFF33': 'S',
+    '\u1E9E': 'S',
+    '\u015A': 'S',
+    '\u1E64': 'S',
+    '\u015C': 'S',
+    '\u1E60': 'S',
+    '\u0160': 'S',
+    '\u1E66': 'S',
+    '\u1E62': 'S',
+    '\u1E68': 'S',
+    '\u0218': 'S',
+    '\u015E': 'S',
+    '\u2C7E': 'S',
+    '\uA7A8': 'S',
+    '\uA784': 'S',
+    '\u24C9': 'T',
+    '\uFF34': 'T',
+    '\u1E6A': 'T',
+    '\u0164': 'T',
+    '\u1E6C': 'T',
+    '\u021A': 'T',
+    '\u0162': 'T',
+    '\u1E70': 'T',
+    '\u1E6E': 'T',
+    '\u0166': 'T',
+    '\u01AC': 'T',
+    '\u01AE': 'T',
+    '\u023E': 'T',
+    '\uA786': 'T',
+    '\uA728': 'TZ',
+    '\u24CA': 'U',
+    '\uFF35': 'U',
+    '\u00D9': 'U',
+    '\u00DA': 'U',
+    '\u00DB': 'U',
+    '\u0168': 'U',
+    '\u1E78': 'U',
+    '\u016A': 'U',
+    '\u1E7A': 'U',
+    '\u016C': 'U',
+    '\u00DC': 'U',
+    '\u01DB': 'U',
+    '\u01D7': 'U',
+    '\u01D5': 'U',
+    '\u01D9': 'U',
+    '\u1EE6': 'U',
+    '\u016E': 'U',
+    '\u0170': 'U',
+    '\u01D3': 'U',
+    '\u0214': 'U',
+    '\u0216': 'U',
+    '\u01AF': 'U',
+    '\u1EEA': 'U',
+    '\u1EE8': 'U',
+    '\u1EEE': 'U',
+    '\u1EEC': 'U',
+    '\u1EF0': 'U',
+    '\u1EE4': 'U',
+    '\u1E72': 'U',
+    '\u0172': 'U',
+    '\u1E76': 'U',
+    '\u1E74': 'U',
+    '\u0244': 'U',
+    '\u24CB': 'V',
+    '\uFF36': 'V',
+    '\u1E7C': 'V',
+    '\u1E7E': 'V',
+    '\u01B2': 'V',
+    '\uA75E': 'V',
+    '\u0245': 'V',
+    '\uA760': 'VY',
+    '\u24CC': 'W',
+    '\uFF37': 'W',
+    '\u1E80': 'W',
+    '\u1E82': 'W',
+    '\u0174': 'W',
+    '\u1E86': 'W',
+    '\u1E84': 'W',
+    '\u1E88': 'W',
+    '\u2C72': 'W',
+    '\u24CD': 'X',
+    '\uFF38': 'X',
+    '\u1E8A': 'X',
+    '\u1E8C': 'X',
+    '\u24CE': 'Y',
+    '\uFF39': 'Y',
+    '\u1EF2': 'Y',
+    '\u00DD': 'Y',
+    '\u0176': 'Y',
+    '\u1EF8': 'Y',
+    '\u0232': 'Y',
+    '\u1E8E': 'Y',
+    '\u0178': 'Y',
+    '\u1EF6': 'Y',
+    '\u1EF4': 'Y',
+    '\u01B3': 'Y',
+    '\u024E': 'Y',
+    '\u1EFE': 'Y',
+    '\u24CF': 'Z',
+    '\uFF3A': 'Z',
+    '\u0179': 'Z',
+    '\u1E90': 'Z',
+    '\u017B': 'Z',
+    '\u017D': 'Z',
+    '\u1E92': 'Z',
+    '\u1E94': 'Z',
+    '\u01B5': 'Z',
+    '\u0224': 'Z',
+    '\u2C7F': 'Z',
+    '\u2C6B': 'Z',
+    '\uA762': 'Z',
+    '\u24D0': 'a',
+    '\uFF41': 'a',
+    '\u1E9A': 'a',
+    '\u00E0': 'a',
+    '\u00E1': 'a',
+    '\u00E2': 'a',
+    '\u1EA7': 'a',
+    '\u1EA5': 'a',
+    '\u1EAB': 'a',
+    '\u1EA9': 'a',
+    '\u00E3': 'a',
+    '\u0101': 'a',
+    '\u0103': 'a',
+    '\u1EB1': 'a',
+    '\u1EAF': 'a',
+    '\u1EB5': 'a',
+    '\u1EB3': 'a',
+    '\u0227': 'a',
+    '\u01E1': 'a',
+    '\u00E4': 'a',
+    '\u01DF': 'a',
+    '\u1EA3': 'a',
+    '\u00E5': 'a',
+    '\u01FB': 'a',
+    '\u01CE': 'a',
+    '\u0201': 'a',
+    '\u0203': 'a',
+    '\u1EA1': 'a',
+    '\u1EAD': 'a',
+    '\u1EB7': 'a',
+    '\u1E01': 'a',
+    '\u0105': 'a',
+    '\u2C65': 'a',
+    '\u0250': 'a',
+    '\uA733': 'aa',
+    '\u00E6': 'ae',
+    '\u01FD': 'ae',
+    '\u01E3': 'ae',
+    '\uA735': 'ao',
+    '\uA737': 'au',
+    '\uA739': 'av',
+    '\uA73B': 'av',
+    '\uA73D': 'ay',
+    '\u24D1': 'b',
+    '\uFF42': 'b',
+    '\u1E03': 'b',
+    '\u1E05': 'b',
+    '\u1E07': 'b',
+    '\u0180': 'b',
+    '\u0183': 'b',
+    '\u0253': 'b',
+    '\u24D2': 'c',
+    '\uFF43': 'c',
+    '\u0107': 'c',
+    '\u0109': 'c',
+    '\u010B': 'c',
+    '\u010D': 'c',
+    '\u00E7': 'c',
+    '\u1E09': 'c',
+    '\u0188': 'c',
+    '\u023C': 'c',
+    '\uA73F': 'c',
+    '\u2184': 'c',
+    '\u24D3': 'd',
+    '\uFF44': 'd',
+    '\u1E0B': 'd',
+    '\u010F': 'd',
+    '\u1E0D': 'd',
+    '\u1E11': 'd',
+    '\u1E13': 'd',
+    '\u1E0F': 'd',
+    '\u0111': 'd',
+    '\u018C': 'd',
+    '\u0256': 'd',
+    '\u0257': 'd',
+    '\uA77A': 'd',
+    '\u01F3': 'dz',
+    '\u01C6': 'dz',
+    '\u24D4': 'e',
+    '\uFF45': 'e',
+    '\u00E8': 'e',
+    '\u00E9': 'e',
+    '\u00EA': 'e',
+    '\u1EC1': 'e',
+    '\u1EBF': 'e',
+    '\u1EC5': 'e',
+    '\u1EC3': 'e',
+    '\u1EBD': 'e',
+    '\u0113': 'e',
+    '\u1E15': 'e',
+    '\u1E17': 'e',
+    '\u0115': 'e',
+    '\u0117': 'e',
+    '\u00EB': 'e',
+    '\u1EBB': 'e',
+    '\u011B': 'e',
+    '\u0205': 'e',
+    '\u0207': 'e',
+    '\u1EB9': 'e',
+    '\u1EC7': 'e',
+    '\u0229': 'e',
+    '\u1E1D': 'e',
+    '\u0119': 'e',
+    '\u1E19': 'e',
+    '\u1E1B': 'e',
+    '\u0247': 'e',
+    '\u025B': 'e',
+    '\u01DD': 'e',
+    '\u24D5': 'f',
+    '\uFF46': 'f',
+    '\u1E1F': 'f',
+    '\u0192': 'f',
+    '\uA77C': 'f',
+    '\u24D6': 'g',
+    '\uFF47': 'g',
+    '\u01F5': 'g',
+    '\u011D': 'g',
+    '\u1E21': 'g',
+    '\u011F': 'g',
+    '\u0121': 'g',
+    '\u01E7': 'g',
+    '\u0123': 'g',
+    '\u01E5': 'g',
+    '\u0260': 'g',
+    '\uA7A1': 'g',
+    '\u1D79': 'g',
+    '\uA77F': 'g',
+    '\u24D7': 'h',
+    '\uFF48': 'h',
+    '\u0125': 'h',
+    '\u1E23': 'h',
+    '\u1E27': 'h',
+    '\u021F': 'h',
+    '\u1E25': 'h',
+    '\u1E29': 'h',
+    '\u1E2B': 'h',
+    '\u1E96': 'h',
+    '\u0127': 'h',
+    '\u2C68': 'h',
+    '\u2C76': 'h',
+    '\u0265': 'h',
+    '\u0195': 'hv',
+    '\u24D8': 'i',
+    '\uFF49': 'i',
+    '\u00EC': 'i',
+    '\u00ED': 'i',
+    '\u00EE': 'i',
+    '\u0129': 'i',
+    '\u012B': 'i',
+    '\u012D': 'i',
+    '\u00EF': 'i',
+    '\u1E2F': 'i',
+    '\u1EC9': 'i',
+    '\u01D0': 'i',
+    '\u0209': 'i',
+    '\u020B': 'i',
+    '\u1ECB': 'i',
+    '\u012F': 'i',
+    '\u1E2D': 'i',
+    '\u0268': 'i',
+    '\u0131': 'i',
+    '\u24D9': 'j',
+    '\uFF4A': 'j',
+    '\u0135': 'j',
+    '\u01F0': 'j',
+    '\u0249': 'j',
+    '\u24DA': 'k',
+    '\uFF4B': 'k',
+    '\u1E31': 'k',
+    '\u01E9': 'k',
+    '\u1E33': 'k',
+    '\u0137': 'k',
+    '\u1E35': 'k',
+    '\u0199': 'k',
+    '\u2C6A': 'k',
+    '\uA741': 'k',
+    '\uA743': 'k',
+    '\uA745': 'k',
+    '\uA7A3': 'k',
+    '\u24DB': 'l',
+    '\uFF4C': 'l',
+    '\u0140': 'l',
+    '\u013A': 'l',
+    '\u013E': 'l',
+    '\u1E37': 'l',
+    '\u1E39': 'l',
+    '\u013C': 'l',
+    '\u1E3D': 'l',
+    '\u1E3B': 'l',
+    '\u017F': 'l',
+    '\u0142': 'l',
+    '\u019A': 'l',
+    '\u026B': 'l',
+    '\u2C61': 'l',
+    '\uA749': 'l',
+    '\uA781': 'l',
+    '\uA747': 'l',
+    '\u01C9': 'lj',
+    '\u24DC': 'm',
+    '\uFF4D': 'm',
+    '\u1E3F': 'm',
+    '\u1E41': 'm',
+    '\u1E43': 'm',
+    '\u0271': 'm',
+    '\u026F': 'm',
+    '\u24DD': 'n',
+    '\uFF4E': 'n',
+    '\u01F9': 'n',
+    '\u0144': 'n',
+    '\u00F1': 'n',
+    '\u1E45': 'n',
+    '\u0148': 'n',
+    '\u1E47': 'n',
+    '\u0146': 'n',
+    '\u1E4B': 'n',
+    '\u1E49': 'n',
+    '\u019E': 'n',
+    '\u0272': 'n',
+    '\u0149': 'n',
+    '\uA791': 'n',
+    '\uA7A5': 'n',
+    '\u01CC': 'nj',
+    '\u24DE': 'o',
+    '\uFF4F': 'o',
+    '\u00F2': 'o',
+    '\u00F3': 'o',
+    '\u00F4': 'o',
+    '\u1ED3': 'o',
+    '\u1ED1': 'o',
+    '\u1ED7': 'o',
+    '\u1ED5': 'o',
+    '\u00F5': 'o',
+    '\u1E4D': 'o',
+    '\u022D': 'o',
+    '\u1E4F': 'o',
+    '\u014D': 'o',
+    '\u1E51': 'o',
+    '\u1E53': 'o',
+    '\u014F': 'o',
+    '\u022F': 'o',
+    '\u0231': 'o',
+    '\u00F6': 'o',
+    '\u022B': 'o',
+    '\u1ECF': 'o',
+    '\u0151': 'o',
+    '\u01D2': 'o',
+    '\u020D': 'o',
+    '\u020F': 'o',
+    '\u01A1': 'o',
+    '\u1EDD': 'o',
+    '\u1EDB': 'o',
+    '\u1EE1': 'o',
+    '\u1EDF': 'o',
+    '\u1EE3': 'o',
+    '\u1ECD': 'o',
+    '\u1ED9': 'o',
+    '\u01EB': 'o',
+    '\u01ED': 'o',
+    '\u00F8': 'o',
+    '\u01FF': 'o',
+    '\u0254': 'o',
+    '\uA74B': 'o',
+    '\uA74D': 'o',
+    '\u0275': 'o',
+    '\u01A3': 'oi',
+    '\u0223': 'ou',
+    '\uA74F': 'oo',
+    '\u24DF': 'p',
+    '\uFF50': 'p',
+    '\u1E55': 'p',
+    '\u1E57': 'p',
+    '\u01A5': 'p',
+    '\u1D7D': 'p',
+    '\uA751': 'p',
+    '\uA753': 'p',
+    '\uA755': 'p',
+    '\u24E0': 'q',
+    '\uFF51': 'q',
+    '\u024B': 'q',
+    '\uA757': 'q',
+    '\uA759': 'q',
+    '\u24E1': 'r',
+    '\uFF52': 'r',
+    '\u0155': 'r',
+    '\u1E59': 'r',
+    '\u0159': 'r',
+    '\u0211': 'r',
+    '\u0213': 'r',
+    '\u1E5B': 'r',
+    '\u1E5D': 'r',
+    '\u0157': 'r',
+    '\u1E5F': 'r',
+    '\u024D': 'r',
+    '\u027D': 'r',
+    '\uA75B': 'r',
+    '\uA7A7': 'r',
+    '\uA783': 'r',
+    '\u24E2': 's',
+    '\uFF53': 's',
+    '\u00DF': 's',
+    '\u015B': 's',
+    '\u1E65': 's',
+    '\u015D': 's',
+    '\u1E61': 's',
+    '\u0161': 's',
+    '\u1E67': 's',
+    '\u1E63': 's',
+    '\u1E69': 's',
+    '\u0219': 's',
+    '\u015F': 's',
+    '\u023F': 's',
+    '\uA7A9': 's',
+    '\uA785': 's',
+    '\u1E9B': 's',
+    '\u24E3': 't',
+    '\uFF54': 't',
+    '\u1E6B': 't',
+    '\u1E97': 't',
+    '\u0165': 't',
+    '\u1E6D': 't',
+    '\u021B': 't',
+    '\u0163': 't',
+    '\u1E71': 't',
+    '\u1E6F': 't',
+    '\u0167': 't',
+    '\u01AD': 't',
+    '\u0288': 't',
+    '\u2C66': 't',
+    '\uA787': 't',
+    '\uA729': 'tz',
+    '\u24E4': 'u',
+    '\uFF55': 'u',
+    '\u00F9': 'u',
+    '\u00FA': 'u',
+    '\u00FB': 'u',
+    '\u0169': 'u',
+    '\u1E79': 'u',
+    '\u016B': 'u',
+    '\u1E7B': 'u',
+    '\u016D': 'u',
+    '\u00FC': 'u',
+    '\u01DC': 'u',
+    '\u01D8': 'u',
+    '\u01D6': 'u',
+    '\u01DA': 'u',
+    '\u1EE7': 'u',
+    '\u016F': 'u',
+    '\u0171': 'u',
+    '\u01D4': 'u',
+    '\u0215': 'u',
+    '\u0217': 'u',
+    '\u01B0': 'u',
+    '\u1EEB': 'u',
+    '\u1EE9': 'u',
+    '\u1EEF': 'u',
+    '\u1EED': 'u',
+    '\u1EF1': 'u',
+    '\u1EE5': 'u',
+    '\u1E73': 'u',
+    '\u0173': 'u',
+    '\u1E77': 'u',
+    '\u1E75': 'u',
+    '\u0289': 'u',
+    '\u24E5': 'v',
+    '\uFF56': 'v',
+    '\u1E7D': 'v',
+    '\u1E7F': 'v',
+    '\u028B': 'v',
+    '\uA75F': 'v',
+    '\u028C': 'v',
+    '\uA761': 'vy',
+    '\u24E6': 'w',
+    '\uFF57': 'w',
+    '\u1E81': 'w',
+    '\u1E83': 'w',
+    '\u0175': 'w',
+    '\u1E87': 'w',
+    '\u1E85': 'w',
+    '\u1E98': 'w',
+    '\u1E89': 'w',
+    '\u2C73': 'w',
+    '\u24E7': 'x',
+    '\uFF58': 'x',
+    '\u1E8B': 'x',
+    '\u1E8D': 'x',
+    '\u24E8': 'y',
+    '\uFF59': 'y',
+    '\u1EF3': 'y',
+    '\u00FD': 'y',
+    '\u0177': 'y',
+    '\u1EF9': 'y',
+    '\u0233': 'y',
+    '\u1E8F': 'y',
+    '\u00FF': 'y',
+    '\u1EF7': 'y',
+    '\u1E99': 'y',
+    '\u1EF5': 'y',
+    '\u01B4': 'y',
+    '\u024F': 'y',
+    '\u1EFF': 'y',
+    '\u24E9': 'z',
+    '\uFF5A': 'z',
+    '\u017A': 'z',
+    '\u1E91': 'z',
+    '\u017C': 'z',
+    '\u017E': 'z',
+    '\u1E93': 'z',
+    '\u1E95': 'z',
+    '\u01B6': 'z',
+    '\u0225': 'z',
+    '\u0240': 'z',
+    '\u2C6C': 'z',
+    '\uA763': 'z',
+    '\u0386': '\u0391',
+    '\u0388': '\u0395',
+    '\u0389': '\u0397',
+    '\u038A': '\u0399',
+    '\u03AA': '\u0399',
+    '\u038C': '\u039F',
+    '\u038E': '\u03A5',
+    '\u03AB': '\u03A5',
+    '\u038F': '\u03A9',
+    '\u03AC': '\u03B1',
+    '\u03AD': '\u03B5',
+    '\u03AE': '\u03B7',
+    '\u03AF': '\u03B9',
+    '\u03CA': '\u03B9',
+    '\u0390': '\u03B9',
+    '\u03CC': '\u03BF',
+    '\u03CD': '\u03C5',
+    '\u03CB': '\u03C5',
+    '\u03B0': '\u03C5',
+    '\u03C9': '\u03C9',
+    '\u03C2': '\u03C3'
+  };
+
+  return diacritics;
+});
+
+S2.define('select2/data/base',[
+  '../utils'
+], function (Utils) {
+  function BaseAdapter ($element, options) {
+    BaseAdapter.__super__.constructor.call(this);
+  }
+
+  Utils.Extend(BaseAdapter, Utils.Observable);
+
+  BaseAdapter.prototype.current = function (callback) {
+    throw new Error('The `current` method must be defined in child classes.');
+  };
+
+  BaseAdapter.prototype.query = function (params, callback) {
+    throw new Error('The `query` method must be defined in child classes.');
+  };
+
+  BaseAdapter.prototype.bind = function (container, $container) {
+    // Can be implemented in subclasses
+  };
+
+  BaseAdapter.prototype.destroy = function () {
+    // Can be implemented in subclasses
+  };
+
+  BaseAdapter.prototype.generateResultId = function (container, data) {
+    var id = container.id + '-result-';
+
+    id += Utils.generateChars(4);
+
+    if (data.id != null) {
+      id += '-' + data.id.toString();
+    } else {
+      id += '-' + Utils.generateChars(4);
+    }
+    return id;
+  };
+
+  return BaseAdapter;
+});
+
+S2.define('select2/data/select',[
+  './base',
+  '../utils',
+  'jquery'
+], function (BaseAdapter, Utils, $) {
+  function SelectAdapter ($element, options) {
+    this.$element = $element;
+    this.options = options;
+
+    SelectAdapter.__super__.constructor.call(this);
+  }
+
+  Utils.Extend(SelectAdapter, BaseAdapter);
+
+  SelectAdapter.prototype.current = function (callback) {
+    var data = [];
+    var self = this;
+
+    this.$element.find(':selected').each(function () {
+      var $option = $(this);
+
+      var option = self.item($option);
+
+      data.push(option);
+    });
+
+    callback(data);
+  };
+
+  SelectAdapter.prototype.select = function (data) {
+    var self = this;
+
+    data.selected = true;
+
+    // If data.element is a DOM node, use it instead
+    if ($(data.element).is('option')) {
+      data.element.selected = true;
+
+      this.$element.trigger('change');
+
+      return;
+    }
+
+    if (this.$element.prop('multiple')) {
+      this.current(function (currentData) {
+        var val = [];
+
+        data = [data];
+        data.push.apply(data, currentData);
+
+        for (var d = 0; d < data.length; d++) {
+          var id = data[d].id;
+
+          if ($.inArray(id, val) === -1) {
+            val.push(id);
+          }
+        }
+
+        self.$element.val(val);
+        self.$element.trigger('change');
+      });
+    } else {
+      var val = data.id;
+
+      this.$element.val(val);
+      this.$element.trigger('change');
+    }
+  };
+
+  SelectAdapter.prototype.unselect = function (data) {
+    var self = this;
+
+    if (!this.$element.prop('multiple')) {
+      return;
+    }
+
+    data.selected = false;
+
+    if ($(data.element).is('option')) {
+      data.element.selected = false;
+
+      this.$element.trigger('change');
+
+      return;
+    }
+
+    this.current(function (currentData) {
+      var val = [];
+
+      for (var d = 0; d < currentData.length; d++) {
+        var id = currentData[d].id;
+
+        if (id !== data.id && $.inArray(id, val) === -1) {
+          val.push(id);
+        }
+      }
+
+      self.$element.val(val);
+
+      self.$element.trigger('change');
+    });
+  };
+
+  SelectAdapter.prototype.bind = function (container, $container) {
+    var self = this;
+
+    this.container = container;
+
+    container.on('select', function (params) {
+      self.select(params.data);
+    });
+
+    container.on('unselect', function (params) {
+      self.unselect(params.data);
+    });
+  };
+
+  SelectAdapter.prototype.destroy = function () {
+    // Remove anything added to child elements
+    this.$element.find('*').each(function () {
+      // Remove any custom data set by Select2
+      $.removeData(this, 'data');
+    });
+  };
+
+  SelectAdapter.prototype.query = function (params, callback) {
+    var data = [];
+    var self = this;
+
+    var $options = this.$element.children();
+
+    $options.each(function () {
+      var $option = $(this);
+
+      if (!$option.is('option') && !$option.is('optgroup')) {
+        return;
+      }
+
+      var option = self.item($option);
+
+      var matches = self.matches(params, option);
+
+      if (matches !== null) {
+        data.push(matches);
+      }
+    });
+
+    callback({
+      results: data
+    });
+  };
+
+  SelectAdapter.prototype.addOptions = function ($options) {
+    Utils.appendMany(this.$element, $options);
+  };
+
+  SelectAdapter.prototype.option = function (data) {
+    var option;
+
+    if (data.children) {
+      option = document.createElement('optgroup');
+      option.label = data.text;
+    } else {
+      option = document.createElement('option');
+
+      if (option.textContent !== undefined) {
+        option.textContent = data.text;
+      } else {
+        option.innerText = data.text;
+      }
+    }
+
+    if (data.id) {
+      option.value = data.id;
+    }
+
+    if (data.disabled) {
+      option.disabled = true;
+    }
+
+    if (data.selected) {
+      option.selected = true;
+    }
+
+    if (data.title) {
+      option.title = data.title;
+    }
+
+    var $option = $(option);
+
+    var normalizedData = this._normalizeItem(data);
+    normalizedData.element = option;
+
+    // Override the option's data with the combined data
+    $.data(option, 'data', normalizedData);
+
+    return $option;
+  };
+
+  SelectAdapter.prototype.item = function ($option) {
+    var data = {};
+
+    data = $.data($option[0], 'data');
+
+    if (data != null) {
+      return data;
+    }
+
+    if ($option.is('option')) {
+      data = {
+        id: $option.val(),
+        text: $option.text(),
+        disabled: $option.prop('disabled'),
+        selected: $option.prop('selected'),
+        title: $option.prop('title')
+      };
+    } else if ($option.is('optgroup')) {
+      data = {
+        text: $option.prop('label'),
+        children: [],
+        title: $option.prop('title')
+      };
+
+      var $children = $option.children('option');
+      var children = [];
+
+      for (var c = 0; c < $children.length; c++) {
+        var $child = $($children[c]);
+
+        var child = this.item($child);
+
+        children.push(child);
+      }
+
+      data.children = children;
+    }
+
+    data = this._normalizeItem(data);
+    data.element = $option[0];
+
+    $.data($option[0], 'data', data);
+
+    return data;
+  };
+
+  SelectAdapter.prototype._normalizeItem = function (item) {
+    if (!$.isPlainObject(item)) {
+      item = {
+        id: item,
+        text: item
+      };
+    }
+
+    item = $.extend({}, {
+      text: ''
+    }, item);
+
+    var defaults = {
+      selected: false,
+      disabled: false
+    };
+
+    if (item.id != null) {
+      item.id = item.id.toString();
+    }
+
+    if (item.text != null) {
+      item.text = item.text.toString();
+    }
+
+    if (item._resultId == null && item.id && this.container != null) {
+      item._resultId = this.generateResultId(this.container, item);
+    }
+
+    return $.extend({}, defaults, item);
+  };
+
+  SelectAdapter.prototype.matches = function (params, data) {
+    var matcher = this.options.get('matcher');
+
+    return matcher(params, data);
+  };
+
+  return SelectAdapter;
+});
+
+S2.define('select2/data/array',[
+  './select',
+  '../utils',
+  'jquery'
+], function (SelectAdapter, Utils, $) {
+  function ArrayAdapter ($element, options) {
+    var data = options.get('data') || [];
+
+    ArrayAdapter.__super__.constructor.call(this, $element, options);
+
+    this.addOptions(this.convertToOptions(data));
+  }
+
+  Utils.Extend(ArrayAdapter, SelectAdapter);
+
+  ArrayAdapter.prototype.select = function (data) {
+    var $option = this.$element.find('option').filter(function (i, elm) {
+      return elm.value == data.id.toString();
+    });
+
+    if ($option.length === 0) {
+      $option = this.option(data);
+
+      this.addOptions($option);
+    }
+
+    ArrayAdapter.__super__.select.call(this, data);
+  };
+
+  ArrayAdapter.prototype.convertToOptions = function (data) {
+    var self = this;
+
+    var $existing = this.$element.find('option');
+    var existingIds = $existing.map(function () {
+      return self.item($(this)).id;
+    }).get();
+
+    var $options = [];
+
+    // Filter out all items except for the one passed in the argument
+    function onlyItem (item) {
+      return function () {
+        return $(this).val() == item.id;
+      };
+    }
+
+    for (var d = 0; d < data.length; d++) {
+      var item = this._normalizeItem(data[d]);
+
+      // Skip items which were pre-loaded, only merge the data
+      if ($.inArray(item.id, existingIds) >= 0) {
+        var $existingOption = $existing.filter(onlyItem(item));
+
+        var existingData = this.item($existingOption);
+        var newData = $.extend(true, {}, item, existingData);
+
+        var $newOption = this.option(newData);
+
+        $existingOption.replaceWith($newOption);
+
+        continue;
+      }
+
+      var $option = this.option(item);
+
+      if (item.children) {
+        var $children = this.convertToOptions(item.children);
+
+        Utils.appendMany($option, $children);
+      }
+
+      $options.push($option);
+    }
+
+    return $options;
+  };
+
+  return ArrayAdapter;
+});
+
+S2.define('select2/data/ajax',[
+  './array',
+  '../utils',
+  'jquery'
+], function (ArrayAdapter, Utils, $) {
+  function AjaxAdapter ($element, options) {
+    this.ajaxOptions = this._applyDefaults(options.get('ajax'));
+
+    if (this.ajaxOptions.processResults != null) {
+      this.processResults = this.ajaxOptions.processResults;
+    }
+
+    AjaxAdapter.__super__.constructor.call(this, $element, options);
+  }
+
+  Utils.Extend(AjaxAdapter, ArrayAdapter);
+
+  AjaxAdapter.prototype._applyDefaults = function (options) {
+    var defaults = {
+      data: function (params) {
+        return $.extend({}, params, {
+          q: params.term
+        });
+      },
+      transport: function (params, success, failure) {
+        var $request = $.ajax(params);
+
+        $request.then(success);
+        $request.fail(failure);
+
+        return $request;
+      }
+    };
+
+    return $.extend({}, defaults, options, true);
+  };
+
+  AjaxAdapter.prototype.processResults = function (results) {
+    return results;
+  };
+
+  AjaxAdapter.prototype.query = function (params, callback) {
+    var matches = [];
+    var self = this;
+
+    if (this._request != null) {
+      // JSONP requests cannot always be aborted
+      if ($.isFunction(this._request.abort)) {
+        this._request.abort();
+      }
+
+      this._request = null;
+    }
+
+    var options = $.extend({
+      type: 'GET'
+    }, this.ajaxOptions);
+
+    if (typeof options.url === 'function') {
+      options.url = options.url.call(this.$element, params);
+    }
+
+    if (typeof options.data === 'function') {
+      options.data = options.data.call(this.$element, params);
+    }
+
+    function request () {
+      var $request = options.transport(options, function (data) {
+        var results = self.processResults(data, params);
+
+        if (self.options.get('debug') && window.console && console.error) {
+          // Check to make sure that the response included a `results` key.
+          if (!results || !results.results || !$.isArray(results.results)) {
+            console.error(
+              'Select2: The AJAX results did not return an array in the ' +
+              '`results` key of the response.'
+            );
+          }
+        }
+
+        callback(results);
+      }, function () {
+        // Attempt to detect if a request was aborted
+        // Only works if the transport exposes a status property
+        if ($request.status && $request.status === '0') {
+          return;
+        }
+
+        self.trigger('results:message', {
+          message: 'errorLoading'
+        });
+      });
+
+      self._request = $request;
+    }
+
+    if (this.ajaxOptions.delay && params.term != null) {
+      if (this._queryTimeout) {
+        window.clearTimeout(this._queryTimeout);
+      }
+
+      this._queryTimeout = window.setTimeout(request, this.ajaxOptions.delay);
+    } else {
+      request();
+    }
+  };
+
+  return AjaxAdapter;
+});
+
+S2.define('select2/data/tags',[
+  'jquery'
+], function ($) {
+  function Tags (decorated, $element, options) {
+    var tags = options.get('tags');
+
+    var createTag = options.get('createTag');
+
+    if (createTag !== undefined) {
+      this.createTag = createTag;
+    }
+
+    var insertTag = options.get('insertTag');
+
+    if (insertTag !== undefined) {
+        this.insertTag = insertTag;
+    }
+
+    decorated.call(this, $element, options);
+
+    if ($.isArray(tags)) {
+      for (var t = 0; t < tags.length; t++) {
+        var tag = tags[t];
+        var item = this._normalizeItem(tag);
+
+        var $option = this.option(item);
+
+        this.$element.append($option);
+      }
+    }
+  }
+
+  Tags.prototype.query = function (decorated, params, callback) {
+    var self = this;
+
+    this._removeOldTags();
+
+    if (params.term == null || params.page != null) {
+      decorated.call(this, params, callback);
+      return;
+    }
+
+    function wrapper (obj, child) {
+      var data = obj.results;
+
+      for (var i = 0; i < data.length; i++) {
+        var option = data[i];
+
+        var checkChildren = (
+          option.children != null &&
+          !wrapper({
+            results: option.children
+          }, true)
+        );
+
+        var checkText = option.text === params.term;
+
+        if (checkText || checkChildren) {
+          if (child) {
+            return false;
+          }
+
+          obj.data = data;
+          callback(obj);
+
+          return;
+        }
+      }
+
+      if (child) {
+        return true;
+      }
+
+      var tag = self.createTag(params);
+
+      if (tag != null) {
+        var $option = self.option(tag);
+        $option.attr('data-select2-tag', true);
+
+        self.addOptions([$option]);
+
+        self.insertTag(data, tag);
+      }
+
+      obj.results = data;
+
+      callback(obj);
+    }
+
+    decorated.call(this, params, wrapper);
+  };
+
+  Tags.prototype.createTag = function (decorated, params) {
+    var term = $.trim(params.term);
+
+    if (term === '') {
+      return null;
+    }
+
+    return {
+      id: term,
+      text: term
+    };
+  };
+
+  Tags.prototype.insertTag = function (_, data, tag) {
+    data.unshift(tag);
+  };
+
+  Tags.prototype._removeOldTags = function (_) {
+    var tag = this._lastTag;
+
+    var $options = this.$element.find('option[data-select2-tag]');
+
+    $options.each(function () {
+      if (this.selected) {
+        return;
+      }
+
+      $(this).remove();
+    });
+  };
+
+  return Tags;
+});
+
+S2.define('select2/data/tokenizer',[
+  'jquery'
+], function ($) {
+  function Tokenizer (decorated, $element, options) {
+    var tokenizer = options.get('tokenizer');
+
+    if (tokenizer !== undefined) {
+      this.tokenizer = tokenizer;
+    }
+
+    decorated.call(this, $element, options);
+  }
+
+  Tokenizer.prototype.bind = function (decorated, container, $container) {
+    decorated.call(this, container, $container);
+
+    this.$search =  container.dropdown.$search || container.selection.$search ||
+      $container.find('.select2-search__field');
+  };
+
+  Tokenizer.prototype.query = function (decorated, params, callback) {
+    var self = this;
+
+    function createAndSelect (data) {
+      // Normalize the data object so we can use it for checks
+      var item = self._normalizeItem(data);
+
+      // Check if the data object already exists as a tag
+      // Select it if it doesn't
+      var $existingOptions = self.$element.find('option').filter(function () {
+        return $(this).val() === item.id;
+      });
+
+      // If an existing option wasn't found for it, create the option
+      if (!$existingOptions.length) {
+        var $option = self.option(item);
+        $option.attr('data-select2-tag', true);
+
+        self._removeOldTags();
+        self.addOptions([$option]);
+      }
+
+      // Select the item, now that we know there is an option for it
+      select(item);
+    }
+
+    function select (data) {
+      self.trigger('select', {
+        data: data
+      });
+    }
+
+    params.term = params.term || '';
+
+    var tokenData = this.tokenizer(params, this.options, createAndSelect);
+
+    if (tokenData.term !== params.term) {
+      // Replace the search term if we have the search box
+      if (this.$search.length) {
+        this.$search.val(tokenData.term);
+        this.$search.focus();
+      }
+
+      params.term = tokenData.term;
+    }
+
+    decorated.call(this, params, callback);
+  };
+
+  Tokenizer.prototype.tokenizer = function (_, params, options, callback) {
+    var separators = options.get('tokenSeparators') || [];
+    var term = params.term;
+    var i = 0;
+
+    var createTag = this.createTag || function (params) {
+      return {
+        id: params.term,
+        text: params.term
+      };
+    };
+
+    while (i < term.length) {
+      var termChar = term[i];
+
+      if ($.inArray(termChar, separators) === -1) {
+        i++;
+
+        continue;
+      }
+
+      var part = term.substr(0, i);
+      var partParams = $.extend({}, params, {
+        term: part
+      });
+
+      var data = createTag(partParams);
+
+      if (data == null) {
+        i++;
+        continue;
+      }
+
+      callback(data);
+
+      // Reset the term to not include the tokenized portion
+      term = term.substr(i + 1) || '';
+      i = 0;
+    }
+
+    return {
+      term: term
+    };
+  };
+
+  return Tokenizer;
+});
+
+S2.define('select2/data/minimumInputLength',[
+
+], function () {
+  function MinimumInputLength (decorated, $e, options) {
+    this.minimumInputLength = options.get('minimumInputLength');
+
+    decorated.call(this, $e, options);
+  }
+
+  MinimumInputLength.prototype.query = function (decorated, params, callback) {
+    params.term = params.term || '';
+
+    if (params.term.length < this.minimumInputLength) {
+      this.trigger('results:message', {
+        message: 'inputTooShort',
+        args: {
+          minimum: this.minimumInputLength,
+          input: params.term,
+          params: params
+        }
+      });
+
+      return;
+    }
+
+    decorated.call(this, params, callback);
+  };
+
+  return MinimumInputLength;
+});
+
+S2.define('select2/data/maximumInputLength',[
+
+], function () {
+  function MaximumInputLength (decorated, $e, options) {
+    this.maximumInputLength = options.get('maximumInputLength');
+
+    decorated.call(this, $e, options);
+  }
+
+  MaximumInputLength.prototype.query = function (decorated, params, callback) {
+    params.term = params.term || '';
+
+    if (this.maximumInputLength > 0 &&
+        params.term.length > this.maximumInputLength) {
+      this.trigger('results:message', {
+        message: 'inputTooLong',
+        args: {
+          maximum: this.maximumInputLength,
+          input: params.term,
+          params: params
+        }
+      });
+
+      return;
+    }
+
+    decorated.call(this, params, callback);
+  };
+
+  return MaximumInputLength;
+});
+
+S2.define('select2/data/maximumSelectionLength',[
+
+], function (){
+  function MaximumSelectionLength (decorated, $e, options) {
+    this.maximumSelectionLength = options.get('maximumSelectionLength');
+
+    decorated.call(this, $e, options);
+  }
+
+  MaximumSelectionLength.prototype.query =
+    function (decorated, params, callback) {
+      var self = this;
+
+      this.current(function (currentData) {
+        var count = currentData != null ? currentData.length : 0;
+        if (self.maximumSelectionLength > 0 &&
+          count >= self.maximumSelectionLength) {
+          self.trigger('results:message', {
+            message: 'maximumSelected',
+            args: {
+              maximum: self.maximumSelectionLength
+            }
+          });
+          return;
+        }
+        decorated.call(self, params, callback);
+      });
+  };
+
+  return MaximumSelectionLength;
+});
+
+S2.define('select2/dropdown',[
+  'jquery',
+  './utils'
+], function ($, Utils) {
+  function Dropdown ($element, options) {
+    this.$element = $element;
+    this.options = options;
+
+    Dropdown.__super__.constructor.call(this);
+  }
+
+  Utils.Extend(Dropdown, Utils.Observable);
+
+  Dropdown.prototype.render = function () {
+    var $dropdown = $(
+      '<span class="select2-dropdown">' +
+        '<span class="select2-results"></span>' +
+      '</span>'
+    );
+
+    $dropdown.attr('dir', this.options.get('dir'));
+
+    this.$dropdown = $dropdown;
+
+    return $dropdown;
+  };
+
+  Dropdown.prototype.bind = function () {
+    // Should be implemented in subclasses
+  };
+
+  Dropdown.prototype.position = function ($dropdown, $container) {
+    // Should be implmented in subclasses
+  };
+
+  Dropdown.prototype.destroy = function () {
+    // Remove the dropdown from the DOM
+    this.$dropdown.remove();
+  };
+
+  return Dropdown;
+});
+
+S2.define('select2/dropdown/search',[
+  'jquery',
+  '../utils'
+], function ($, Utils) {
+  function Search () { }
+
+  Search.prototype.render = function (decorated) {
+    var $rendered = decorated.call(this);
+
+    var $search = $(
+      '<span class="select2-search select2-search--dropdown">' +
+        '<input class="select2-search__field" type="search" tabindex="-1"' +
+        ' autocomplete="off" autocorrect="off" autocapitalize="off"' +
+        ' spellcheck="false" role="textbox" />' +
+      '</span>'
+    );
+
+    this.$searchContainer = $search;
+    this.$search = $search.find('input');
+
+    $rendered.prepend($search);
+
+    return $rendered;
+  };
+
+  Search.prototype.bind = function (decorated, container, $container) {
+    var self = this;
+
+    decorated.call(this, container, $container);
+
+    this.$search.on('keydown', function (evt) {
+      self.trigger('keypress', evt);
+
+      self._keyUpPrevented = evt.isDefaultPrevented();
+    });
+
+    // Workaround for browsers which do not support the `input` event
+    // This will prevent double-triggering of events for browsers which support
+    // both the `keyup` and `input` events.
+    this.$search.on('input', function (evt) {
+      // Unbind the duplicated `keyup` event
+      $(this).off('keyup');
+    });
+
+    this.$search.on('keyup input', function (evt) {
+      self.handleSearch(evt);
+    });
+
+    container.on('open', function () {
+      self.$search.attr('tabindex', 0);
+
+      self.$search.focus();
+
+      window.setTimeout(function () {
+        self.$search.focus();
+      }, 0);
+    });
+
+    container.on('close', function () {
+      self.$search.attr('tabindex', -1);
+
+      self.$search.val('');
+    });
+
+    container.on('focus', function () {
+      if (container.isOpen()) {
+        self.$search.focus();
+      }
+    });
+
+    container.on('results:all', function (params) {
+      if (params.query.term == null || params.query.term === '') {
+        var showSearch = self.showSearch(params);
+
+        if (showSearch) {
+          self.$searchContainer.removeClass('select2-search--hide');
+        } else {
+          self.$searchContainer.addClass('select2-search--hide');
+        }
+      }
+    });
+  };
+
+  Search.prototype.handleSearch = function (evt) {
+    if (!this._keyUpPrevented) {
+      var input = this.$search.val();
+
+      this.trigger('query', {
+        term: input
+      });
+    }
+
+    this._keyUpPrevented = false;
+  };
+
+  Search.prototype.showSearch = function (_, params) {
+    return true;
+  };
+
+  return Search;
+});
+
+S2.define('select2/dropdown/hidePlaceholder',[
+
+], function () {
+  function HidePlaceholder (decorated, $element, options, dataAdapter) {
+    this.placeholder = this.normalizePlaceholder(options.get('placeholder'));
+
+    decorated.call(this, $element, options, dataAdapter);
+  }
+
+  HidePlaceholder.prototype.append = function (decorated, data) {
+    data.results = this.removePlaceholder(data.results);
+
+    decorated.call(this, data);
+  };
+
+  HidePlaceholder.prototype.normalizePlaceholder = function (_, placeholder) {
+    if (typeof placeholder === 'string') {
+      placeholder = {
+        id: '',
+        text: placeholder
+      };
+    }
+
+    return placeholder;
+  };
+
+  HidePlaceholder.prototype.removePlaceholder = function (_, data) {
+    var modifiedData = data.slice(0);
+
+    for (var d = data.length - 1; d >= 0; d--) {
+      var item = data[d];
+
+      if (this.placeholder.id === item.id) {
+        modifiedData.splice(d, 1);
+      }
+    }
+
+    return modifiedData;
+  };
+
+  return HidePlaceholder;
+});
+
+S2.define('select2/dropdown/infiniteScroll',[
+  'jquery'
+], function ($) {
+  function InfiniteScroll (decorated, $element, options, dataAdapter) {
+    this.lastParams = {};
+
+    decorated.call(this, $element, options, dataAdapter);
+
+    this.$loadingMore = this.createLoadingMore();
+    this.loading = false;
+  }
+
+  InfiniteScroll.prototype.append = function (decorated, data) {
+    this.$loadingMore.remove();
+    this.loading = false;
+
+    decorated.call(this, data);
+
+    if (this.showLoadingMore(data)) {
+      this.$results.append(this.$loadingMore);
+    }
+  };
+
+  InfiniteScroll.prototype.bind = function (decorated, container, $container) {
+    var self = this;
+
+    decorated.call(this, container, $container);
+
+    container.on('query', function (params) {
+      self.lastParams = params;
+      self.loading = true;
+    });
+
+    container.on('query:append', function (params) {
+      self.lastParams = params;
+      self.loading = true;
+    });
+
+    this.$results.on('scroll', function () {
+      var isLoadMoreVisible = $.contains(
+        document.documentElement,
+        self.$loadingMore[0]
+      );
+
+      if (self.loading || !isLoadMoreVisible) {
+        return;
+      }
+
+      var currentOffset = self.$results.offset().top +
+        self.$results.outerHeight(false);
+      var loadingMoreOffset = self.$loadingMore.offset().top +
+        self.$loadingMore.outerHeight(false);
+
+      if (currentOffset + 50 >= loadingMoreOffset) {
+        self.loadMore();
+      }
+    });
+  };
+
+  InfiniteScroll.prototype.loadMore = function () {
+    this.loading = true;
+
+    var params = $.extend({}, {page: 1}, this.lastParams);
+
+    params.page++;
+
+    this.trigger('query:append', params);
+  };
+
+  InfiniteScroll.prototype.showLoadingMore = function (_, data) {
+    return data.pagination && data.pagination.more;
+  };
+
+  InfiniteScroll.prototype.createLoadingMore = function () {
+    var $option = $(
+      '<li ' +
+      'class="select2-results__option select2-results__option--load-more"' +
+      'role="treeitem" aria-disabled="true"></li>'
+    );
+
+    var message = this.options.get('translations').get('loadingMore');
+
+    $option.html(message(this.lastParams));
+
+    return $option;
+  };
+
+  return InfiniteScroll;
+});
+
+S2.define('select2/dropdown/attachBody',[
+  'jquery',
+  '../utils'
+], function ($, Utils) {
+  function AttachBody (decorated, $element, options) {
+    this.$dropdownParent = options.get('dropdownParent') || $(document.body);
+
+    decorated.call(this, $element, options);
+  }
+
+  AttachBody.prototype.bind = function (decorated, container, $container) {
+    var self = this;
+
+    var setupResultsEvents = false;
+
+    decorated.call(this, container, $container);
+
+    container.on('open', function () {
+      self._showDropdown();
+      self._attachPositioningHandler(container);
+
+      if (!setupResultsEvents) {
+        setupResultsEvents = true;
+
+        container.on('results:all', function () {
+          self._positionDropdown();
+          self._resizeDropdown();
+        });
+
+        container.on('results:append', function () {
+          self._positionDropdown();
+          self._resizeDropdown();
+        });
+      }
+    });
+
+    container.on('close', function () {
+      self._hideDropdown();
+      self._detachPositioningHandler(container);
+    });
+
+    this.$dropdownContainer.on('mousedown', function (evt) {
+      evt.stopPropagation();
+    });
+  };
+
+  AttachBody.prototype.destroy = function (decorated) {
+    decorated.call(this);
+
+    this.$dropdownContainer.remove();
+  };
+
+  AttachBody.prototype.position = function (decorated, $dropdown, $container) {
+    // Clone all of the container classes
+    $dropdown.attr('class', $container.attr('class'));
+
+    $dropdown.removeClass('select2');
+    $dropdown.addClass('select2-container--open');
+
+    $dropdown.css({
+      position: 'absolute',
+      top: -999999
+    });
+
+    this.$container = $container;
+  };
+
+  AttachBody.prototype.render = function (decorated) {
+    var $container = $('<span></span>');
+
+    var $dropdown = decorated.call(this);
+    $container.append($dropdown);
+
+    this.$dropdownContainer = $container;
+
+    return $container;
+  };
+
+  AttachBody.prototype._hideDropdown = function (decorated) {
+    this.$dropdownContainer.detach();
+  };
+
+  AttachBody.prototype._attachPositioningHandler =
+      function (decorated, container) {
+    var self = this;
+
+    var scrollEvent = 'scroll.select2.' + container.id;
+    var resizeEvent = 'resize.select2.' + container.id;
+    var orientationEvent = 'orientationchange.select2.' + container.id;
+
+    var $watchers = this.$container.parents().filter(Utils.hasScroll);
+    $watchers.each(function () {
+      $(this).data('select2-scroll-position', {
+        x: $(this).scrollLeft(),
+        y: $(this).scrollTop()
+      });
+    });
+
+    $watchers.on(scrollEvent, function (ev) {
+      var position = $(this).data('select2-scroll-position');
+      $(this).scrollTop(position.y);
+    });
+
+    $(window).on(scrollEvent + ' ' + resizeEvent + ' ' + orientationEvent,
+      function (e) {
+      self._positionDropdown();
+      self._resizeDropdown();
+    });
+  };
+
+  AttachBody.prototype._detachPositioningHandler =
+      function (decorated, container) {
+    var scrollEvent = 'scroll.select2.' + container.id;
+    var resizeEvent = 'resize.select2.' + container.id;
+    var orientationEvent = 'orientationchange.select2.' + container.id;
+
+    var $watchers = this.$container.parents().filter(Utils.hasScroll);
+    $watchers.off(scrollEvent);
+
+    $(window).off(scrollEvent + ' ' + resizeEvent + ' ' + orientationEvent);
+  };
+
+  AttachBody.prototype._positionDropdown = function () {
+    var $window = $(window);
+
+    var isCurrentlyAbove = this.$dropdown.hasClass('select2-dropdown--above');
+    var isCurrentlyBelow = this.$dropdown.hasClass('select2-dropdown--below');
+
+    var newDirection = null;
+
+    var offset = this.$container.offset();
+
+    offset.bottom = offset.top + this.$container.outerHeight(false);
+
+    var container = {
+      height: this.$container.outerHeight(false)
+    };
+
+    container.top = offset.top;
+    container.bottom = offset.top + container.height;
+
+    var dropdown = {
+      height: this.$dropdown.outerHeight(false)
+    };
+
+    var viewport = {
+      top: $window.scrollTop(),
+      bottom: $window.scrollTop() + $window.height()
+    };
+
+    var enoughRoomAbove = viewport.top < (offset.top - dropdown.height);
+    var enoughRoomBelow = viewport.bottom > (offset.bottom + dropdown.height);
+
+    var css = {
+      left: offset.left,
+      top: container.bottom
+    };
+
+    // Determine what the parent element is to use for calciulating the offset
+    var $offsetParent = this.$dropdownParent;
+
+    // For statically positoned elements, we need to get the element
+    // that is determining the offset
+    if ($offsetParent.css('position') === 'static') {
+      $offsetParent = $offsetParent.offsetParent();
+    }
+
+    var parentOffset = $offsetParent.offset();
+
+    css.top -= parentOffset.top;
+    css.left -= parentOffset.left;
+
+    if (!isCurrentlyAbove && !isCurrentlyBelow) {
+      newDirection = 'below';
+    }
+
+    if (!enoughRoomBelow && enoughRoomAbove && !isCurrentlyAbove) {
+      newDirection = 'above';
+    } else if (!enoughRoomAbove && enoughRoomBelow && isCurrentlyAbove) {
+      newDirection = 'below';
+    }
+
+    if (newDirection == 'above' ||
+      (isCurrentlyAbove && newDirection !== 'below')) {
+      css.top = container.top - parentOffset.top - dropdown.height;
+    }
+
+    if (newDirection != null) {
+      this.$dropdown
+        .removeClass('select2-dropdown--below select2-dropdown--above')
+        .addClass('select2-dropdown--' + newDirection);
+      this.$container
+        .removeClass('select2-container--below select2-container--above')
+        .addClass('select2-container--' + newDirection);
+    }
+
+    this.$dropdownContainer.css(css);
+  };
+
+  AttachBody.prototype._resizeDropdown = function () {
+    var css = {
+      width: this.$container.outerWidth(false) + 'px'
+    };
+
+    if (this.options.get('dropdownAutoWidth')) {
+      css.minWidth = css.width;
+      css.position = 'relative';
+      css.width = 'auto';
+    }
+
+    this.$dropdown.css(css);
+  };
+
+  AttachBody.prototype._showDropdown = function (decorated) {
+    this.$dropdownContainer.appendTo(this.$dropdownParent);
+
+    this._positionDropdown();
+    this._resizeDropdown();
+  };
+
+  return AttachBody;
+});
+
+S2.define('select2/dropdown/minimumResultsForSearch',[
+
+], function () {
+  function countResults (data) {
+    var count = 0;
+
+    for (var d = 0; d < data.length; d++) {
+      var item = data[d];
+
+      if (item.children) {
+        count += countResults(item.children);
+      } else {
+        count++;
+      }
+    }
+
+    return count;
+  }
+
+  function MinimumResultsForSearch (decorated, $element, options, dataAdapter) {
+    this.minimumResultsForSearch = options.get('minimumResultsForSearch');
+
+    if (this.minimumResultsForSearch < 0) {
+      this.minimumResultsForSearch = Infinity;
+    }
+
+    decorated.call(this, $element, options, dataAdapter);
+  }
+
+  MinimumResultsForSearch.prototype.showSearch = function (decorated, params) {
+    if (countResults(params.data.results) < this.minimumResultsForSearch) {
+      return false;
+    }
+
+    return decorated.call(this, params);
+  };
+
+  return MinimumResultsForSearch;
+});
+
+S2.define('select2/dropdown/selectOnClose',[
+
+], function () {
+  function SelectOnClose () { }
+
+  SelectOnClose.prototype.bind = function (decorated, container, $container) {
+    var self = this;
+
+    decorated.call(this, container, $container);
+
+    container.on('close', function (params) {
+      self._handleSelectOnClose(params);
+    });
+  };
+
+  SelectOnClose.prototype._handleSelectOnClose = function (_, params) {
+    if (params && params.originalSelect2Event != null) {
+      var event = params.originalSelect2Event;
+
+      // Don't select an item if the close event was triggered from a select or
+      // unselect event
+      if (event._type === 'select' || event._type === 'unselect') {
+        return;
+      }
+    }
+
+    var $highlightedResults = this.getHighlightedResults();
+
+    // Only select highlighted results
+    if ($highlightedResults.length < 1) {
+      return;
+    }
+
+    var data = $highlightedResults.data('data');
+
+    // Don't re-select already selected resulte
+    if (
+      (data.element != null && data.element.selected) ||
+      (data.element == null && data.selected)
+    ) {
+      return;
+    }
+
+    this.trigger('select', {
+        data: data
+    });
+  };
+
+  return SelectOnClose;
+});
+
+S2.define('select2/dropdown/closeOnSelect',[
+
+], function () {
+  function CloseOnSelect () { }
+
+  CloseOnSelect.prototype.bind = function (decorated, container, $container) {
+    var self = this;
+
+    decorated.call(this, container, $container);
+
+    container.on('select', function (evt) {
+      self._selectTriggered(evt);
+    });
+
+    container.on('unselect', function (evt) {
+      self._selectTriggered(evt);
+    });
+  };
+
+  CloseOnSelect.prototype._selectTriggered = function (_, evt) {
+    var originalEvent = evt.originalEvent;
+
+    // Don't close if the control key is being held
+    if (originalEvent && originalEvent.ctrlKey) {
+      return;
+    }
+
+    this.trigger('close', {
+      originalEvent: originalEvent,
+      originalSelect2Event: evt
+    });
+  };
+
+  return CloseOnSelect;
+});
+
+S2.define('select2/i18n/en',[],function () {
+  // English
+  return {
+    errorLoading: function () {
+      return 'The results could not be loaded.';
+    },
+    inputTooLong: function (args) {
+      var overChars = args.input.length - args.maximum;
+
+      var message = 'Please delete ' + overChars + ' character';
+
+      if (overChars != 1) {
+        message += 's';
+      }
+
+      return message;
+    },
+    inputTooShort: function (args) {
+      var remainingChars = args.minimum - args.input.length;
+
+      var message = 'Please enter ' + remainingChars + ' or more characters';
+
+      return message;
+    },
+    loadingMore: function () {
+      return 'Loading more results…';
+    },
+    maximumSelected: function (args) {
+      var message = 'You can only select ' + args.maximum + ' item';
+
+      if (args.maximum != 1) {
+        message += 's';
+      }
+
+      return message;
+    },
+    noResults: function () {
+      return 'No results found';
+    },
+    searching: function () {
+      return 'Searching…';
+    }
+  };
+});
+
+S2.define('select2/defaults',[
+  'jquery',
+  'require',
+
+  './results',
+
+  './selection/single',
+  './selection/multiple',
+  './selection/placeholder',
+  './selection/allowClear',
+  './selection/search',
+  './selection/eventRelay',
+
+  './utils',
+  './translation',
+  './diacritics',
+
+  './data/select',
+  './data/array',
+  './data/ajax',
+  './data/tags',
+  './data/tokenizer',
+  './data/minimumInputLength',
+  './data/maximumInputLength',
+  './data/maximumSelectionLength',
+
+  './dropdown',
+  './dropdown/search',
+  './dropdown/hidePlaceholder',
+  './dropdown/infiniteScroll',
+  './dropdown/attachBody',
+  './dropdown/minimumResultsForSearch',
+  './dropdown/selectOnClose',
+  './dropdown/closeOnSelect',
+
+  './i18n/en'
+], function ($, require,
+
+             ResultsList,
+
+             SingleSelection, MultipleSelection, Placeholder, AllowClear,
+             SelectionSearch, EventRelay,
+
+             Utils, Translation, DIACRITICS,
+
+             SelectData, ArrayData, AjaxData, Tags, Tokenizer,
+             MinimumInputLength, MaximumInputLength, MaximumSelectionLength,
+
+             Dropdown, DropdownSearch, HidePlaceholder, InfiniteScroll,
+             AttachBody, MinimumResultsForSearch, SelectOnClose, CloseOnSelect,
+
+             EnglishTranslation) {
+  function Defaults () {
+    this.reset();
+  }
+
+  Defaults.prototype.apply = function (options) {
+    options = $.extend(true, {}, this.defaults, options);
+
+    if (options.dataAdapter == null) {
+      if (options.ajax != null) {
+        options.dataAdapter = AjaxData;
+      } else if (options.data != null) {
+        options.dataAdapter = ArrayData;
+      } else {
+        options.dataAdapter = SelectData;
+      }
+
+      if (options.minimumInputLength > 0) {
+        options.dataAdapter = Utils.Decorate(
+          options.dataAdapter,
+          MinimumInputLength
+        );
+      }
+
+      if (options.maximumInputLength > 0) {
+        options.dataAdapter = Utils.Decorate(
+          options.dataAdapter,
+          MaximumInputLength
+        );
+      }
+
+      if (options.maximumSelectionLength > 0) {
+        options.dataAdapter = Utils.Decorate(
+          options.dataAdapter,
+          MaximumSelectionLength
+        );
+      }
+
+      if (options.tags) {
+        options.dataAdapter = Utils.Decorate(options.dataAdapter, Tags);
+      }
+
+      if (options.tokenSeparators != null || options.tokenizer != null) {
+        options.dataAdapter = Utils.Decorate(
+          options.dataAdapter,
+          Tokenizer
+        );
+      }
+
+      if (options.query != null) {
+        var Query = require(options.amdBase + 'compat/query');
+
+        options.dataAdapter = Utils.Decorate(
+          options.dataAdapter,
+          Query
+        );
+      }
+
+      if (options.initSelection != null) {
+        var InitSelection = require(options.amdBase + 'compat/initSelection');
+
+        options.dataAdapter = Utils.Decorate(
+          options.dataAdapter,
+          InitSelection
+        );
+      }
+    }
+
+    if (options.resultsAdapter == null) {
+      options.resultsAdapter = ResultsList;
+
+      if (options.ajax != null) {
+        options.resultsAdapter = Utils.Decorate(
+          options.resultsAdapter,
+          InfiniteScroll
+        );
+      }
+
+      if (options.placeholder != null) {
+        options.resultsAdapter = Utils.Decorate(
+          options.resultsAdapter,
+          HidePlaceholder
+        );
+      }
+
+      if (options.selectOnClose) {
+        options.resultsAdapter = Utils.Decorate(
+          options.resultsAdapter,
+          SelectOnClose
+        );
+      }
+    }
+
+    if (options.dropdownAdapter == null) {
+      if (options.multiple) {
+        options.dropdownAdapter = Dropdown;
+      } else {
+        var SearchableDropdown = Utils.Decorate(Dropdown, DropdownSearch);
+
+        options.dropdownAdapter = SearchableDropdown;
+      }
+
+      if (options.minimumResultsForSearch !== 0) {
+        options.dropdownAdapter = Utils.Decorate(
+          options.dropdownAdapter,
+          MinimumResultsForSearch
+        );
+      }
+
+      if (options.closeOnSelect) {
+        options.dropdownAdapter = Utils.Decorate(
+          options.dropdownAdapter,
+          CloseOnSelect
+        );
+      }
+
+      if (
+        options.dropdownCssClass != null ||
+        options.dropdownCss != null ||
+        options.adaptDropdownCssClass != null
+      ) {
+        var DropdownCSS = require(options.amdBase + 'compat/dropdownCss');
+
+        options.dropdownAdapter = Utils.Decorate(
+          options.dropdownAdapter,
+          DropdownCSS
+        );
+      }
+
+      options.dropdownAdapter = Utils.Decorate(
+        options.dropdownAdapter,
+        AttachBody
+      );
+    }
+
+    if (options.selectionAdapter == null) {
+      if (options.multiple) {
+        options.selectionAdapter = MultipleSelection;
+      } else {
+        options.selectionAdapter = SingleSelection;
+      }
+
+      // Add the placeholder mixin if a placeholder was specified
+      if (options.placeholder != null) {
+        options.selectionAdapter = Utils.Decorate(
+          options.selectionAdapter,
+          Placeholder
+        );
+      }
+
+      if (options.allowClear) {
+        options.selectionAdapter = Utils.Decorate(
+          options.selectionAdapter,
+          AllowClear
+        );
+      }
+
+      if (options.multiple) {
+        options.selectionAdapter = Utils.Decorate(
+          options.selectionAdapter,
+          SelectionSearch
+        );
+      }
+
+      if (
+        options.containerCssClass != null ||
+        options.containerCss != null ||
+        options.adaptContainerCssClass != null
+      ) {
+        var ContainerCSS = require(options.amdBase + 'compat/containerCss');
+
+        options.selectionAdapter = Utils.Decorate(
+          options.selectionAdapter,
+          ContainerCSS
+        );
+      }
+
+      options.selectionAdapter = Utils.Decorate(
+        options.selectionAdapter,
+        EventRelay
+      );
+    }
+
+    if (typeof options.language === 'string') {
+      // Check if the language is specified with a region
+      if (options.language.indexOf('-') > 0) {
+        // Extract the region information if it is included
+        var languageParts = options.language.split('-');
+        var baseLanguage = languageParts[0];
+
+        options.language = [options.language, baseLanguage];
+      } else {
+        options.language = [options.language];
+      }
+    }
+
+    if ($.isArray(options.language)) {
+      var languages = new Translation();
+      options.language.push('en');
+
+      var languageNames = options.language;
+
+      for (var l = 0; l < languageNames.length; l++) {
+        var name = languageNames[l];
+        var language = {};
+
+        try {
+          // Try to load it with the original name
+          language = Translation.loadPath(name);
+        } catch (e) {
+          try {
+            // If we couldn't load it, check if it wasn't the full path
+            name = this.defaults.amdLanguageBase + name;
+            language = Translation.loadPath(name);
+          } catch (ex) {
+            // The translation could not be loaded at all. Sometimes this is
+            // because of a configuration problem, other times this can be
+            // because of how Select2 helps load all possible translation files.
+            if (options.debug && window.console && console.warn) {
+              console.warn(
+                'Select2: The language file for "' + name + '" could not be ' +
+                'automatically loaded. A fallback will be used instead.'
+              );
+            }
+
+            continue;
+          }
+        }
+
+        languages.extend(language);
+      }
+
+      options.translations = languages;
+    } else {
+      var baseTranslation = Translation.loadPath(
+        this.defaults.amdLanguageBase + 'en'
+      );
+      var customTranslation = new Translation(options.language);
+
+      customTranslation.extend(baseTranslation);
+
+      options.translations = customTranslation;
+    }
+
+    return options;
+  };
+
+  Defaults.prototype.reset = function () {
+    function stripDiacritics (text) {
+      // Used 'uni range + named function' from http://jsperf.com/diacritics/18
+      function match(a) {
+        return DIACRITICS[a] || a;
+      }
+
+      return text.replace(/[^\u0000-\u007E]/g, match);
+    }
+
+    function matcher (params, data) {
+      // Always return the object if there is nothing to compare
+      if ($.trim(params.term) === '') {
+        return data;
+      }
+
+      // Do a recursive check for options with children
+      if (data.children && data.children.length > 0) {
+        // Clone the data object if there are children
+        // This is required as we modify the object to remove any non-matches
+        var match = $.extend(true, {}, data);
+
+        // Check each child of the option
+        for (var c = data.children.length - 1; c >= 0; c--) {
+          var child = data.children[c];
+
+          var matches = matcher(params, child);
+
+          // If there wasn't a match, remove the object in the array
+          if (matches == null) {
+            match.children.splice(c, 1);
+          }
+        }
+
+        // If any children matched, return the new object
+        if (match.children.length > 0) {
+          return match;
+        }
+
+        // If there were no matching children, check just the plain object
+        return matcher(params, match);
+      }
+
+      var original = stripDiacritics(data.text).toUpperCase();
+      var term = stripDiacritics(params.term).toUpperCase();
+
+      // Check if the text contains the term
+      if (original.indexOf(term) > -1) {
+        return data;
+      }
+
+      // If it doesn't contain the term, don't return anything
+      return null;
+    }
+
+    this.defaults = {
+      amdBase: './',
+      amdLanguageBase: './i18n/',
+      closeOnSelect: true,
+      debug: false,
+      dropdownAutoWidth: false,
+      escapeMarkup: Utils.escapeMarkup,
+      language: EnglishTranslation,
+      matcher: matcher,
+      minimumInputLength: 0,
+      maximumInputLength: 0,
+      maximumSelectionLength: 0,
+      minimumResultsForSearch: 0,
+      selectOnClose: false,
+      sorter: function (data) {
+        return data;
+      },
+      templateResult: function (result) {
+        return result.text;
+      },
+      templateSelection: function (selection) {
+        return selection.text;
+      },
+      theme: 'default',
+      width: 'resolve'
+    };
+  };
+
+  Defaults.prototype.set = function (key, value) {
+    var camelKey = $.camelCase(key);
+
+    var data = {};
+    data[camelKey] = value;
+
+    var convertedData = Utils._convertData(data);
+
+    $.extend(this.defaults, convertedData);
+  };
+
+  var defaults = new Defaults();
+
+  return defaults;
+});
+
+S2.define('select2/options',[
+  'require',
+  'jquery',
+  './defaults',
+  './utils'
+], function (require, $, Defaults, Utils) {
+  function Options (options, $element) {
+    this.options = options;
+
+    if ($element != null) {
+      this.fromElement($element);
+    }
+
+    this.options = Defaults.apply(this.options);
+
+    if ($element && $element.is('input')) {
+      var InputCompat = require(this.get('amdBase') + 'compat/inputData');
+
+      this.options.dataAdapter = Utils.Decorate(
+        this.options.dataAdapter,
+        InputCompat
+      );
+    }
+  }
+
+  Options.prototype.fromElement = function ($e) {
+    var excludedData = ['select2'];
+
+    if (this.options.multiple == null) {
+      this.options.multiple = $e.prop('multiple');
+    }
+
+    if (this.options.disabled == null) {
+      this.options.disabled = $e.prop('disabled');
+    }
+
+    if (this.options.language == null) {
+      if ($e.prop('lang')) {
+        this.options.language = $e.prop('lang').toLowerCase();
+      } else if ($e.closest('[lang]').prop('lang')) {
+        this.options.language = $e.closest('[lang]').prop('lang');
+      }
+    }
+
+    if (this.options.dir == null) {
+      if ($e.prop('dir')) {
+        this.options.dir = $e.prop('dir');
+      } else if ($e.closest('[dir]').prop('dir')) {
+        this.options.dir = $e.closest('[dir]').prop('dir');
+      } else {
+        this.options.dir = 'ltr';
+      }
+    }
+
+    $e.prop('disabled', this.options.disabled);
+    $e.prop('multiple', this.options.multiple);
+
+    if ($e.data('select2Tags')) {
+      if (this.options.debug && window.console && console.warn) {
+        console.warn(
+          'Select2: The `data-select2-tags` attribute has been changed to ' +
+          'use the `data-data` and `data-tags="true"` attributes and will be ' +
+          'removed in future versions of Select2.'
+        );
+      }
+
+      $e.data('data', $e.data('select2Tags'));
+      $e.data('tags', true);
+    }
+
+    if ($e.data('ajaxUrl')) {
+      if (this.options.debug && window.console && console.warn) {
+        console.warn(
+          'Select2: The `data-ajax-url` attribute has been changed to ' +
+          '`data-ajax--url` and support for the old attribute will be removed' +
+          ' in future versions of Select2.'
+        );
+      }
+
+      $e.attr('ajax--url', $e.data('ajaxUrl'));
+      $e.data('ajax--url', $e.data('ajaxUrl'));
+    }
+
+    var dataset = {};
+
+    // Prefer the element's `dataset` attribute if it exists
+    // jQuery 1.x does not correctly handle data attributes with multiple dashes
+    if ($.fn.jquery && $.fn.jquery.substr(0, 2) == '1.' && $e[0].dataset) {
+      dataset = $.extend(true, {}, $e[0].dataset, $e.data());
+    } else {
+      dataset = $e.data();
+    }
+
+    var data = $.extend(true, {}, dataset);
+
+    data = Utils._convertData(data);
+
+    for (var key in data) {
+      if ($.inArray(key, excludedData) > -1) {
+        continue;
+      }
+
+      if ($.isPlainObject(this.options[key])) {
+        $.extend(this.options[key], data[key]);
+      } else {
+        this.options[key] = data[key];
+      }
+    }
+
+    return this;
+  };
+
+  Options.prototype.get = function (key) {
+    return this.options[key];
+  };
+
+  Options.prototype.set = function (key, val) {
+    this.options[key] = val;
+  };
+
+  return Options;
+});
+
+S2.define('select2/core',[
+  'jquery',
+  './options',
+  './utils',
+  './keys'
+], function ($, Options, Utils, KEYS) {
+  var Select2 = function ($element, options) {
+    if ($element.data('select2') != null) {
+      $element.data('select2').destroy();
+    }
+
+    this.$element = $element;
+
+    this.id = this._generateId($element);
+
+    options = options || {};
+
+    this.options = new Options(options, $element);
+
+    Select2.__super__.constructor.call(this);
+
+    // Set up the tabindex
+
+    var tabindex = $element.attr('tabindex') || 0;
+    $element.data('old-tabindex', tabindex);
+    $element.attr('tabindex', '-1');
+
+    // Set up containers and adapters
+
+    var DataAdapter = this.options.get('dataAdapter');
+    this.dataAdapter = new DataAdapter($element, this.options);
+
+    var $container = this.render();
+
+    this._placeContainer($container);
+
+    var SelectionAdapter = this.options.get('selectionAdapter');
+    this.selection = new SelectionAdapter($element, this.options);
+    this.$selection = this.selection.render();
+
+    this.selection.position(this.$selection, $container);
+
+    var DropdownAdapter = this.options.get('dropdownAdapter');
+    this.dropdown = new DropdownAdapter($element, this.options);
+    this.$dropdown = this.dropdown.render();
+
+    this.dropdown.position(this.$dropdown, $container);
+
+    var ResultsAdapter = this.options.get('resultsAdapter');
+    this.results = new ResultsAdapter($element, this.options, this.dataAdapter);
+    this.$results = this.results.render();
+
+    this.results.position(this.$results, this.$dropdown);
+
+    // Bind events
+
+    var self = this;
+
+    // Bind the container to all of the adapters
+    this._bindAdapters();
+
+    // Register any DOM event handlers
+    this._registerDomEvents();
+
+    // Register any internal event handlers
+    this._registerDataEvents();
+    this._registerSelectionEvents();
+    this._registerDropdownEvents();
+    this._registerResultsEvents();
+    this._registerEvents();
+
+    // Set the initial state
+    this.dataAdapter.current(function (initialData) {
+      self.trigger('selection:update', {
+        data: initialData
+      });
+    });
+
+    // Hide the original select
+    $element.addClass('select2-hidden-accessible');
+    $element.attr('aria-hidden', 'true');
+
+    // Synchronize any monitored attributes
+    this._syncAttributes();
+
+    $element.data('select2', this);
+  };
+
+  Utils.Extend(Select2, Utils.Observable);
+
+  Select2.prototype._generateId = function ($element) {
+    var id = '';
+
+    if ($element.attr('id') != null) {
+      id = $element.attr('id');
+    } else if ($element.attr('name') != null) {
+      id = $element.attr('name') + '-' + Utils.generateChars(2);
+    } else {
+      id = Utils.generateChars(4);
+    }
+
+    id = id.replace(/(:|\.|\[|\]|,)/g, '');
+    id = 'select2-' + id;
+
+    return id;
+  };
+
+  Select2.prototype._placeContainer = function ($container) {
+    $container.insertAfter(this.$element);
+
+    var width = this._resolveWidth(this.$element, this.options.get('width'));
+
+    if (width != null) {
+      $container.css('width', width);
+    }
+  };
+
+  Select2.prototype._resolveWidth = function ($element, method) {
+    var WIDTH = /^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i;
+
+    if (method == 'resolve') {
+      var styleWidth = this._resolveWidth($element, 'style');
+
+      if (styleWidth != null) {
+        return styleWidth;
+      }
+
+      return this._resolveWidth($element, 'element');
+    }
+
+    if (method == 'element') {
+      var elementWidth = $element.outerWidth(false);
+
+      if (elementWidth <= 0) {
+        return 'auto';
+      }
+
+      return elementWidth + 'px';
+    }
+
+    if (method == 'style') {
+      var style = $element.attr('style');
+
+      if (typeof(style) !== 'string') {
+        return null;
+      }
+
+      var attrs = style.split(';');
+
+      for (var i = 0, l = attrs.length; i < l; i = i + 1) {
+        var attr = attrs[i].replace(/\s/g, '');
+        var matches = attr.match(WIDTH);
+
+        if (matches !== null && matches.length >= 1) {
+          return matches[1];
+        }
+      }
+
+      return null;
+    }
+
+    return method;
+  };
+
+  Select2.prototype._bindAdapters = function () {
+    this.dataAdapter.bind(this, this.$container);
+    this.selection.bind(this, this.$container);
+
+    this.dropdown.bind(this, this.$container);
+    this.results.bind(this, this.$container);
+  };
+
+  Select2.prototype._registerDomEvents = function () {
+    var self = this;
+
+    this.$element.on('change.select2', function () {
+      self.dataAdapter.current(function (data) {
+        self.trigger('selection:update', {
+          data: data
+        });
+      });
+    });
+
+    this.$element.on('focus.select2', function (evt) {
+      self.trigger('focus', evt);
+    });
+
+    this._syncA = Utils.bind(this._syncAttributes, this);
+    this._syncS = Utils.bind(this._syncSubtree, this);
+
+    if (this.$element[0].attachEvent) {
+      this.$element[0].attachEvent('onpropertychange', this._syncA);
+    }
+
+    var observer = window.MutationObserver ||
+      window.WebKitMutationObserver ||
+      window.MozMutationObserver
+    ;
+
+    if (observer != null) {
+      this._observer = new observer(function (mutations) {
+        $.each(mutations, self._syncA);
+        $.each(mutations, self._syncS);
+      });
+      this._observer.observe(this.$element[0], {
+        attributes: true,
+        childList: true,
+        subtree: false
+      });
+    } else if (this.$element[0].addEventListener) {
+      this.$element[0].addEventListener(
+        'DOMAttrModified',
+        self._syncA,
+        false
+      );
+      this.$element[0].addEventListener(
+        'DOMNodeInserted',
+        self._syncS,
+        false
+      );
+      this.$element[0].addEventListener(
+        'DOMNodeRemoved',
+        self._syncS,
+        false
+      );
+    }
+  };
+
+  Select2.prototype._registerDataEvents = function () {
+    var self = this;
+
+    this.dataAdapter.on('*', function (name, params) {
+      self.trigger(name, params);
+    });
+  };
+
+  Select2.prototype._registerSelectionEvents = function () {
+    var self = this;
+    var nonRelayEvents = ['toggle', 'focus'];
+
+    this.selection.on('toggle', function () {
+      self.toggleDropdown();
+    });
+
+    this.selection.on('focus', function (params) {
+      self.focus(params);
+    });
+
+    this.selection.on('*', function (name, params) {
+      if ($.inArray(name, nonRelayEvents) !== -1) {
+        return;
+      }
+
+      self.trigger(name, params);
+    });
+  };
+
+  Select2.prototype._registerDropdownEvents = function () {
+    var self = this;
+
+    this.dropdown.on('*', function (name, params) {
+      self.trigger(name, params);
+    });
+  };
+
+  Select2.prototype._registerResultsEvents = function () {
+    var self = this;
+
+    this.results.on('*', function (name, params) {
+      self.trigger(name, params);
+    });
+  };
+
+  Select2.prototype._registerEvents = function () {
+    var self = this;
+
+    this.on('open', function () {
+      self.$container.addClass('select2-container--open');
+    });
+
+    this.on('close', function () {
+      self.$container.removeClass('select2-container--open');
+    });
+
+    this.on('enable', function () {
+      self.$container.removeClass('select2-container--disabled');
+    });
+
+    this.on('disable', function () {
+      self.$container.addClass('select2-container--disabled');
+    });
+
+    this.on('blur', function () {
+      self.$container.removeClass('select2-container--focus');
+    });
+
+    this.on('query', function (params) {
+      if (!self.isOpen()) {
+        self.trigger('open', {});
+      }
+
+      this.dataAdapter.query(params, function (data) {
+        self.trigger('results:all', {
+          data: data,
+          query: params
+        });
+      });
+    });
+
+    this.on('query:append', function (params) {
+      this.dataAdapter.query(params, function (data) {
+        self.trigger('results:append', {
+          data: data,
+          query: params
+        });
+      });
+    });
+
+    this.on('keypress', function (evt) {
+      var key = evt.which;
+
+      if (self.isOpen()) {
+        if (key === KEYS.ESC || key === KEYS.TAB ||
+            (key === KEYS.UP && evt.altKey)) {
+          self.close();
+
+          evt.preventDefault();
+        } else if (key === KEYS.ENTER) {
+          self.trigger('results:select', {});
+
+          evt.preventDefault();
+        } else if ((key === KEYS.SPACE && evt.ctrlKey)) {
+          self.trigger('results:toggle', {});
+
+          evt.preventDefault();
+        } else if (key === KEYS.UP) {
+          self.trigger('results:previous', {});
+
+          evt.preventDefault();
+        } else if (key === KEYS.DOWN) {
+          self.trigger('results:next', {});
+
+          evt.preventDefault();
+        }
+      } else {
+        if (key === KEYS.ENTER || key === KEYS.SPACE ||
+            (key === KEYS.DOWN && evt.altKey)) {
+          self.open();
+
+          evt.preventDefault();
+        }
+      }
+    });
+  };
+
+  Select2.prototype._syncAttributes = function () {
+    this.options.set('disabled', this.$element.prop('disabled'));
+
+    if (this.options.get('disabled')) {
+      if (this.isOpen()) {
+        this.close();
+      }
+
+      this.trigger('disable', {});
+    } else {
+      this.trigger('enable', {});
+    }
+  };
+
+  Select2.prototype._syncSubtree = function (evt, mutations) {
+    var changed = false;
+    var self = this;
+
+    // Ignore any mutation events raised for elements that aren't options or
+    // optgroups. This handles the case when the select element is destroyed
+    if (
+      evt && evt.target && (
+        evt.target.nodeName !== 'OPTION' && evt.target.nodeName !== 'OPTGROUP'
+      )
+    ) {
+      return;
+    }
+
+    if (!mutations) {
+      // If mutation events aren't supported, then we can only assume that the
+      // change affected the selections
+      changed = true;
+    } else if (mutations.addedNodes && mutations.addedNodes.length > 0) {
+      for (var n = 0; n < mutations.addedNodes.length; n++) {
+        var node = mutations.addedNodes[n];
+
+        if (node.selected) {
+          changed = true;
+        }
+      }
+    } else if (mutations.removedNodes && mutations.removedNodes.length > 0) {
+      changed = true;
+    }
+
+    // Only re-pull the data if we think there is a change
+    if (changed) {
+      this.dataAdapter.current(function (currentData) {
+        self.trigger('selection:update', {
+          data: currentData
+        });
+      });
+    }
+  };
+
+  /**
+   * Override the trigger method to automatically trigger pre-events when
+   * there are events that can be prevented.
+   */
+  Select2.prototype.trigger = function (name, args) {
+    var actualTrigger = Select2.__super__.trigger;
+    var preTriggerMap = {
+      'open': 'opening',
+      'close': 'closing',
+      'select': 'selecting',
+      'unselect': 'unselecting'
+    };
+
+    if (args === undefined) {
+      args = {};
+    }
+
+    if (name in preTriggerMap) {
+      var preTriggerName = preTriggerMap[name];
+      var preTriggerArgs = {
+        prevented: false,
+        name: name,
+        args: args
+      };
+
+      actualTrigger.call(this, preTriggerName, preTriggerArgs);
+
+      if (preTriggerArgs.prevented) {
+        args.prevented = true;
+
+        return;
+      }
+    }
+
+    actualTrigger.call(this, name, args);
+  };
+
+  Select2.prototype.toggleDropdown = function () {
+    if (this.options.get('disabled')) {
+      return;
+    }
+
+    if (this.isOpen()) {
+      this.close();
+    } else {
+      this.open();
+    }
+  };
+
+  Select2.prototype.open = function () {
+    if (this.isOpen()) {
+      return;
+    }
+
+    this.trigger('query', {});
+  };
+
+  Select2.prototype.close = function () {
+    if (!this.isOpen()) {
+      return;
+    }
+
+    this.trigger('close', {});
+  };
+
+  Select2.prototype.isOpen = function () {
+    return this.$container.hasClass('select2-container--open');
+  };
+
+  Select2.prototype.hasFocus = function () {
+    return this.$container.hasClass('select2-container--focus');
+  };
+
+  Select2.prototype.focus = function (data) {
+    // No need to re-trigger focus events if we are already focused
+    if (this.hasFocus()) {
+      return;
+    }
+
+    this.$container.addClass('select2-container--focus');
+    this.trigger('focus', {});
+  };
+
+  Select2.prototype.enable = function (args) {
+    if (this.options.get('debug') && window.console && console.warn) {
+      console.warn(
+        'Select2: The `select2("enable")` method has been deprecated and will' +
+        ' be removed in later Select2 versions. Use $element.prop("disabled")' +
+        ' instead.'
+      );
+    }
+
+    if (args == null || args.length === 0) {
+      args = [true];
+    }
+
+    var disabled = !args[0];
+
+    this.$element.prop('disabled', disabled);
+  };
+
+  Select2.prototype.data = function () {
+    if (this.options.get('debug') &&
+        arguments.length > 0 && window.console && console.warn) {
+      console.warn(
+        'Select2: Data can no longer be set using `select2("data")`. You ' +
+        'should consider setting the value instead using `$element.val()`.'
+      );
+    }
+
+    var data = [];
+
+    this.dataAdapter.current(function (currentData) {
+      data = currentData;
+    });
+
+    return data;
+  };
+
+  Select2.prototype.val = function (args) {
+    if (this.options.get('debug') && window.console && console.warn) {
+      console.warn(
+        'Select2: The `select2("val")` method has been deprecated and will be' +
+        ' removed in later Select2 versions. Use $element.val() instead.'
+      );
+    }
+
+    if (args == null || args.length === 0) {
+      return this.$element.val();
+    }
+
+    var newVal = args[0];
+
+    if ($.isArray(newVal)) {
+      newVal = $.map(newVal, function (obj) {
+        return obj.toString();
+      });
+    }
+
+    this.$element.val(newVal).trigger('change');
+  };
+
+  Select2.prototype.destroy = function () {
+    this.$container.remove();
+
+    if (this.$element[0].detachEvent) {
+      this.$element[0].detachEvent('onpropertychange', this._syncA);
+    }
+
+    if (this._observer != null) {
+      this._observer.disconnect();
+      this._observer = null;
+    } else if (this.$element[0].removeEventListener) {
+      this.$element[0]
+        .removeEventListener('DOMAttrModified', this._syncA, false);
+      this.$element[0]
+        .removeEventListener('DOMNodeInserted', this._syncS, false);
+      this.$element[0]
+        .removeEventListener('DOMNodeRemoved', this._syncS, false);
+    }
+
+    this._syncA = null;
+    this._syncS = null;
+
+    this.$element.off('.select2');
+    this.$element.attr('tabindex', this.$element.data('old-tabindex'));
+
+    this.$element.removeClass('select2-hidden-accessible');
+    this.$element.attr('aria-hidden', 'false');
+    this.$element.removeData('select2');
+
+    this.dataAdapter.destroy();
+    this.selection.destroy();
+    this.dropdown.destroy();
+    this.results.destroy();
+
+    this.dataAdapter = null;
+    this.selection = null;
+    this.dropdown = null;
+    this.results = null;
+  };
+
+  Select2.prototype.render = function () {
+    var $container = $(
+      '<span class="select2 select2-container">' +
+        '<span class="selection"></span>' +
+        '<span class="dropdown-wrapper" aria-hidden="true"></span>' +
+      '</span>'
+    );
+
+    $container.attr('dir', this.options.get('dir'));
+
+    this.$container = $container;
+
+    this.$container.addClass('select2-container--' + this.options.get('theme'));
+
+    $container.data('element', this.$element);
+
+    return $container;
+  };
+
+  return Select2;
+});
+
+S2.define('jquery-mousewheel',[
+  'jquery'
+], function ($) {
+  // Used to shim jQuery.mousewheel for non-full builds.
+  return $;
+});
+
+S2.define('jquery.select2',[
+  'jquery',
+  'jquery-mousewheel',
+
+  './select2/core',
+  './select2/defaults'
+], function ($, _, Select2, Defaults) {
+  if ($.fn.select2 == null) {
+    // All methods that should return the element
+    var thisMethods = ['open', 'close', 'destroy'];
+
+    $.fn.select2 = function (options) {
+      options = options || {};
+
+      if (typeof options === 'object') {
+        this.each(function () {
+          var instanceOptions = $.extend(true, {}, options);
+
+          var instance = new Select2($(this), instanceOptions);
+        });
+
+        return this;
+      } else if (typeof options === 'string') {
+        var ret;
+        var args = Array.prototype.slice.call(arguments, 1);
 
         this.each(function () {
-            if (args.length === 0 || typeof(args[0]) === "object") {
-                opts = args.length === 0 ? {} : $.extend({}, args[0]);
-                opts.element = $(this);
+          var instance = $(this).data('select2');
 
-                if (opts.element.get(0).tagName.toLowerCase() === "select") {
-                    multiple = opts.element.prop("multiple");
-                } else {
-                    multiple = opts.multiple || false;
-                    if ("tags" in opts) {opts.multiple = multiple = true;}
-                }
-
-                select2 = multiple ? new window.Select2["class"].multi() : new window.Select2["class"].single();
-                select2.init(opts);
-            } else if (typeof(args[0]) === "string") {
-
-                if (indexOf(args[0], allowedMethods) < 0) {
-                    throw "Unknown method: " + args[0];
-                }
-
-                value = undefined;
-                select2 = $(this).data("select2");
-                if (select2 === undefined) return;
-
-                method=args[0];
-
-                if (method === "container") {
-                    value = select2.container;
-                } else if (method === "dropdown") {
-                    value = select2.dropdown;
-                } else {
-                    if (methodsMap[method]) method = methodsMap[method];
-
-                    value = select2[method].apply(select2, args.slice(1));
-                }
-                if (indexOf(args[0], valueMethods) >= 0
-                    || (indexOf(args[0], propertyMethods) >= 0 && args.length == 1)) {
-                    return false; // abort the iteration, ready to return first matched value
-                }
-            } else {
-                throw "Invalid arguments to select2 plugin: " + args;
-            }
-        });
-        return (value === undefined) ? this : value;
-    };
-
-    // plugin defaults, accessible to users
-    $.fn.select2.defaults = {
-        debug: false,
-        width: "copy",
-        loadMorePadding: 0,
-        closeOnSelect: true,
-        openOnEnter: true,
-        containerCss: {},
-        dropdownCss: {},
-        containerCssClass: "",
-        dropdownCssClass: "",
-        formatResult: function(result, container, query, escapeMarkup) {
-            var markup=[];
-            markMatch(this.text(result), query.term, markup, escapeMarkup);
-            return markup.join("");
-        },
-        transformVal: function(val) {
-            return $.trim(val);
-        },
-        formatSelection: function (data, container, escapeMarkup) {
-            return data ? escapeMarkup(this.text(data)) : undefined;
-        },
-        sortResults: function (results, container, query) {
-            return results;
-        },
-        formatResultCssClass: function(data) {return data.css;},
-        formatSelectionCssClass: function(data, container) {return undefined;},
-        minimumResultsForSearch: 0,
-        minimumInputLength: 0,
-        maximumInputLength: null,
-        maximumSelectionSize: 0,
-        id: function (e) { return e == undefined ? null : e.id; },
-        text: function (e) {
-          if (e && this.data && this.data.text) {
-            if ($.isFunction(this.data.text)) {
-              return this.data.text(e);
-            } else {
-              return e[this.data.text];
-            }
-          } else {
-            return e.text;
+          if (instance == null && window.console && console.error) {
+            console.error(
+              'The select2(\'' + options + '\') method was called on an ' +
+              'element that is not using Select2.'
+            );
           }
-        },
-        matcher: function(term, text) {
-            return stripDiacritics(''+text).toUpperCase().indexOf(stripDiacritics(''+term).toUpperCase()) >= 0;
-        },
-        separator: ",",
-        tokenSeparators: [],
-        tokenizer: defaultTokenizer,
-        escapeMarkup: defaultEscapeMarkup,
-        blurOnChange: false,
-        selectOnBlur: false,
-        adaptContainerCssClass: function(c) { return c; },
-        adaptDropdownCssClass: function(c) { return null; },
-        nextSearchTerm: function(selectedObject, currentSearchTerm) { return undefined; },
-        searchInputPlaceholder: '',
-        createSearchChoicePosition: 'top',
-        shouldFocusInput: function (instance) {
-            // Attempt to detect touch devices
-            var supportsTouchEvents = (('ontouchstart' in window) ||
-                                       (navigator.msMaxTouchPoints > 0));
 
-            // Only devices which support touch events should be special cased
-            if (!supportsTouchEvents) {
-                return true;
-            }
+          ret = instance[options].apply(instance, args);
+        });
 
-            // Never focus the input if search is disabled
-            if (instance.opts.minimumResultsForSearch < 0) {
-                return false;
-            }
-
-            return true;
+        // Check if we should be returning `this`
+        if ($.inArray(options, thisMethods) > -1) {
+          return this;
         }
+
+        return ret;
+      } else {
+        throw new Error('Invalid arguments for Select2: ' + options);
+      }
     };
+  }
 
-    $.fn.select2.locales = [];
+  if ($.fn.select2.defaults == null) {
+    $.fn.select2.defaults = Defaults;
+  }
 
-    $.fn.select2.locales['en'] = {
-         formatMatches: function (matches) { if (matches === 1) { return "One result is available, press enter to select it."; } return matches + " results are available, use up and down arrow keys to navigate."; },
-         formatNoMatches: function () { return "No matches found"; },
-         formatAjaxError: function (jqXHR, textStatus, errorThrown) { return "Loading failed"; },
-         formatInputTooShort: function (input, min) { var n = min - input.length; return "Please enter " + n + " or more character" + (n == 1 ? "" : "s"); },
-         formatInputTooLong: function (input, max) { var n = input.length - max; return "Please delete " + n + " character" + (n == 1 ? "" : "s"); },
-         formatSelectionTooBig: function (limit) { return "You can only select " + limit + " item" + (limit == 1 ? "" : "s"); },
-         formatLoadMore: function (pageNumber) { return "Loading more results…"; },
-         formatSearching: function () { return "Searching…"; }
-    };
+  return Select2;
+});
 
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['en']);
+  // Return the AMD loader configuration so it can be used outside of this file
+  return {
+    define: S2.define,
+    require: S2.require
+  };
+}());
 
-    $.fn.select2.ajaxDefaults = {
-        transport: $.ajax,
-        params: {
-            type: "GET",
-            cache: false,
-            dataType: "json"
-        }
-    };
+  // Autoload the jQuery bindings
+  // We know that all of the modules exist above this, so we're safe
+  var select2 = S2.require('jquery.select2');
 
-    // exports
-    window.Select2 = {
-        query: {
-            ajax: ajax,
-            local: local,
-            tags: tags
-        }, util: {
-            debounce: debounce,
-            markMatch: markMatch,
-            escapeMarkup: defaultEscapeMarkup,
-            stripDiacritics: stripDiacritics
-        }, "class": {
-            "abstract": AbstractSelect2,
-            "single": SingleSelect2,
-            "multi": MultiSelect2
-        }
-    };
+  // Hold the AMD module references on the jQuery function that was just loaded
+  // This allows Select2 to use the internal loader outside of this file, such
+  // as in the language files.
+  jQuery.fn.select2.amd = S2;
 
-}(jQuery));
+  // Return the Select2 instance for anyone who is importing it.
+  return select2;
+}));
diff --git a/assets/js/select2/select2.min.js b/assets/js/select2/select2.min.js
index 4273f044139..9e63e5fc9c3 100644
--- a/assets/js/select2/select2.min.js
+++ b/assets/js/select2/select2.min.js
@@ -1,3 +1,10 @@
-!function(a){"undefined"==typeof a.fn.each2&&a.extend(a.fn,{each2:function(b){for(var c=a([0]),d=-1,e=this.length;++d<e&&(c.context=c[0]=this[d])&&b.call(c[0],d,c)!==!1;);return this}})}(jQuery),function(a,b){"use strict";function c(b){var c=a(document.createTextNode(""));b.before(c),c.before(b),c.remove()}function d(a){function b(a){return O[a]||a}return a.replace(/[^\u0000-\u007E]/g,b)}function e(a,b){for(var c=0,d=b.length;d>c;c+=1)if(g(a,b[c]))return c;return-1}function f(){var b=a(N);b.appendTo(document.body);var c={width:b.width()-b[0].clientWidth,height:b.height()-b[0].clientHeight};return b.remove(),c}function g(a,c){return a===c?!0:a===b||c===b?!1:null===a||null===c?!1:a.constructor===String?a+""==c+"":c.constructor===String?c+""==a+"":!1}function h(a,b,c){var d,e,f;if(null===a||a.length<1)return[];for(d=a.split(b),e=0,f=d.length;f>e;e+=1)d[e]=c(d[e]);return d}function i(a){return a.outerWidth(!1)-a.width()}function j(c){var d="keyup-change-value";c.on("keydown",function(){a.data(c,d)===b&&a.data(c,d,c.val())}),c.on("keyup",function(){var e=a.data(c,d);e!==b&&c.val()!==e&&(a.removeData(c,d),c.trigger("keyup-change"))})}function k(c){c.on("mousemove",function(c){var d=L;(d===b||d.x!==c.pageX||d.y!==c.pageY)&&a(c.target).trigger("mousemove-filtered",c)})}function l(a,c,d){d=d||b;var e;return function(){var b=arguments;window.clearTimeout(e),e=window.setTimeout(function(){c.apply(d,b)},a)}}function m(a,b){var c=l(a,function(a){b.trigger("scroll-debounced",a)});b.on("scroll",function(a){e(a.target,b.get())>=0&&c(a)})}function n(a){a[0]!==document.activeElement&&window.setTimeout(function(){var b,c=a[0],d=a.val().length;a.focus();var e=c.offsetWidth>0||c.offsetHeight>0;e&&c===document.activeElement&&(c.setSelectionRange?c.setSelectionRange(d,d):c.createTextRange&&(b=c.createTextRange(),b.collapse(!1),b.select()))},0)}function o(b){b=a(b)[0];var c=0,d=0;if("selectionStart"in b)c=b.selectionStart,d=b.selectionEnd-c;else if("selection"in document){b.focus();var e=document.selection.createRange();d=document.selection.createRange().text.length,e.moveStart("character",-b.value.length),c=e.text.length-d}return{offset:c,length:d}}function p(a){a.preventDefault(),a.stopPropagation()}function q(a){a.preventDefault(),a.stopImmediatePropagation()}function r(b){if(!I){var c=b[0].currentStyle||window.getComputedStyle(b[0],null);I=a(document.createElement("div")).css({position:"absolute",left:"-10000px",top:"-10000px",display:"none",fontSize:c.fontSize,fontFamily:c.fontFamily,fontStyle:c.fontStyle,fontWeight:c.fontWeight,letterSpacing:c.letterSpacing,textTransform:c.textTransform,whiteSpace:"nowrap"}),I.attr("class","select2-sizer"),a(document.body).append(I)}return I.text(b.val()),I.width()}function s(b,c,d){var e,f,g=[];e=a.trim(b.attr("class")),e&&(e=""+e,a(e.split(/\s+/)).each2(function(){0===this.indexOf("select2-")&&g.push(this)})),e=a.trim(c.attr("class")),e&&(e=""+e,a(e.split(/\s+/)).each2(function(){0!==this.indexOf("select2-")&&(f=d(this),f&&g.push(f))})),b.attr("class",g.join(" "))}function t(a,b,c,e){var f=d(a.toUpperCase()).indexOf(d(b.toUpperCase())),g=b.length;return 0>f?void c.push(e(a)):(c.push(e(a.substring(0,f))),c.push("<span class='select2-match'>"),c.push(e(a.substring(f,f+g))),c.push("</span>"),void c.push(e(a.substring(f+g,a.length))))}function u(a){var b={"\\":"&#92;","&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#47;"};return String(a).replace(/[&<>"'\/\\]/g,function(a){return b[a]})}function v(c){var d,e=null,f=c.quietMillis||100,g=c.url,h=this;return function(i){window.clearTimeout(d),d=window.setTimeout(function(){var d=c.data,f=g,j=c.transport||a.fn.select2.ajaxDefaults.transport,k={type:c.type||"GET",cache:c.cache||!1,jsonpCallback:c.jsonpCallback||b,dataType:c.dataType||"json"},l=a.extend({},a.fn.select2.ajaxDefaults.params,k);d=d?d.call(h,i.term,i.page,i.context):null,f="function"==typeof f?f.call(h,i.term,i.page,i.context):f,e&&"function"==typeof e.abort&&e.abort(),c.params&&(a.isFunction(c.params)?a.extend(l,c.params.call(h)):a.extend(l,c.params)),a.extend(l,{url:f,dataType:c.dataType,data:d,success:function(a){var b=c.results(a,i.page,i);i.callback(b)},error:function(a,b,c){var d={hasError:!0,jqXHR:a,textStatus:b,errorThrown:c};i.callback(d)}}),e=j.call(h,l)},f)}}function w(b){var c,d,e=b,f=function(a){return""+a.text};a.isArray(e)&&(d=e,e={results:d}),a.isFunction(e)===!1&&(d=e,e=function(){return d});var g=e();return g.text&&(f=g.text,a.isFunction(f)||(c=g.text,f=function(a){return a[c]})),function(b){var c,d=b.term,g={results:[]};return""===d?void b.callback(e()):(c=function(e,g){var h,i;if(e=e[0],e.children){h={};for(i in e)e.hasOwnProperty(i)&&(h[i]=e[i]);h.children=[],a(e.children).each2(function(a,b){c(b,h.children)}),(h.children.length||b.matcher(d,f(h),e))&&g.push(h)}else b.matcher(d,f(e),e)&&g.push(e)},a(e().results).each2(function(a,b){c(b,g.results)}),void b.callback(g))}}function x(c){var d=a.isFunction(c);return function(e){var f=e.term,g={results:[]},h=d?c(e):c;a.isArray(h)&&(a(h).each(function(){var a=this.text!==b,c=a?this.text:this;(""===f||e.matcher(f,c))&&g.results.push(a?this:{id:this,text:this})}),e.callback(g))}}function y(b,c){if(a.isFunction(b))return!0;if(!b)return!1;if("string"==typeof b)return!0;throw new Error(c+" must be a string, function, or falsy value")}function z(b,c){if(a.isFunction(b)){var d=Array.prototype.slice.call(arguments,2);return b.apply(c,d)}return b}function A(b){var c=0;return a.each(b,function(a,b){b.children?c+=A(b.children):c++}),c}function B(a,c,d,e){var f,h,i,j,k,l=a,m=!1;if(!e.createSearchChoice||!e.tokenSeparators||e.tokenSeparators.length<1)return b;for(;;){for(h=-1,i=0,j=e.tokenSeparators.length;j>i&&(k=e.tokenSeparators[i],h=a.indexOf(k),!(h>=0));i++);if(0>h)break;if(f=a.substring(0,h),a=a.substring(h+k.length),f.length>0&&(f=e.createSearchChoice.call(this,f,c),f!==b&&null!==f&&e.id(f)!==b&&null!==e.id(f))){for(m=!1,i=0,j=c.length;j>i;i++)if(g(e.id(f),e.id(c[i]))){m=!0;break}m||d(f)}}return l!==a?a:void 0}function C(){var b=this;a.each(arguments,function(a,c){b[c].remove(),b[c]=null})}function D(b,c){var d=function(){};return d.prototype=new b,d.prototype.constructor=d,d.prototype.parent=b.prototype,d.prototype=a.extend(d.prototype,c),d}if(window.Select2===b){var E,F,G,H,I,J,K,L={x:0,y:0},M={TAB:9,ENTER:13,ESC:27,SPACE:32,LEFT:37,UP:38,RIGHT:39,DOWN:40,SHIFT:16,CTRL:17,ALT:18,PAGE_UP:33,PAGE_DOWN:34,HOME:36,END:35,BACKSPACE:8,DELETE:46,isArrow:function(a){switch(a=a.which?a.which:a){case M.LEFT:case M.RIGHT:case M.UP:case M.DOWN:return!0}return!1},isControl:function(a){var b=a.which;switch(b){case M.SHIFT:case M.CTRL:case M.ALT:return!0}return a.metaKey?!0:!1},isFunctionKey:function(a){return a=a.which?a.which:a,a>=112&&123>=a}},N="<div class='select2-measure-scrollbar'></div>",O={"Ⓐ":"A","Ａ":"A","À":"A","Á":"A","Â":"A","Ầ":"A","Ấ":"A","Ẫ":"A","Ẩ":"A","Ã":"A","Ā":"A","Ă":"A","Ằ":"A","Ắ":"A","Ẵ":"A","Ẳ":"A","Ȧ":"A","Ǡ":"A","Ä":"A","Ǟ":"A","Ả":"A","Å":"A","Ǻ":"A","Ǎ":"A","Ȁ":"A","Ȃ":"A","Ạ":"A","Ậ":"A","Ặ":"A","Ḁ":"A","Ą":"A","Ⱥ":"A","Ɐ":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ⓑ":"B","Ｂ":"B","Ḃ":"B","Ḅ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","Ɓ":"B","Ⓒ":"C","Ｃ":"C","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","Ç":"C","Ḉ":"C","Ƈ":"C","Ȼ":"C","Ꜿ":"C","Ⓓ":"D","Ｄ":"D","Ḋ":"D","Ď":"D","Ḍ":"D","Ḑ":"D","Ḓ":"D","Ḏ":"D","Đ":"D","Ƌ":"D","Ɗ":"D","Ɖ":"D","Ꝺ":"D","DZ":"DZ","DŽ":"DZ","Dz":"Dz","Dž":"Dz","Ⓔ":"E","Ｅ":"E","È":"E","É":"E","Ê":"E","Ề":"E","Ế":"E","Ễ":"E","Ể":"E","Ẽ":"E","Ē":"E","Ḕ":"E","Ḗ":"E","Ĕ":"E","Ė":"E","Ë":"E","Ẻ":"E","Ě":"E","Ȅ":"E","Ȇ":"E","Ẹ":"E","Ệ":"E","Ȩ":"E","Ḝ":"E","Ę":"E","Ḙ":"E","Ḛ":"E","Ɛ":"E","Ǝ":"E","Ⓕ":"F","Ｆ":"F","Ḟ":"F","Ƒ":"F","Ꝼ":"F","Ⓖ":"G","Ｇ":"G","Ǵ":"G","Ĝ":"G","Ḡ":"G","Ğ":"G","Ġ":"G","Ǧ":"G","Ģ":"G","Ǥ":"G","Ɠ":"G","Ꞡ":"G","Ᵹ":"G","Ꝿ":"G","Ⓗ":"H","Ｈ":"H","Ĥ":"H","Ḣ":"H","Ḧ":"H","Ȟ":"H","Ḥ":"H","Ḩ":"H","Ḫ":"H","Ħ":"H","Ⱨ":"H","Ⱶ":"H","Ɥ":"H","Ⓘ":"I","Ｉ":"I","Ì":"I","Í":"I","Î":"I","Ĩ":"I","Ī":"I","Ĭ":"I","İ":"I","Ï":"I","Ḯ":"I","Ỉ":"I","Ǐ":"I","Ȉ":"I","Ȋ":"I","Ị":"I","Į":"I","Ḭ":"I","Ɨ":"I","Ⓙ":"J","Ｊ":"J","Ĵ":"J","Ɉ":"J","Ⓚ":"K","Ｋ":"K","Ḱ":"K","Ǩ":"K","Ḳ":"K","Ķ":"K","Ḵ":"K","Ƙ":"K","Ⱪ":"K","Ꝁ":"K","Ꝃ":"K","Ꝅ":"K","Ꞣ":"K","Ⓛ":"L","Ｌ":"L","Ŀ":"L","Ĺ":"L","Ľ":"L","Ḷ":"L","Ḹ":"L","Ļ":"L","Ḽ":"L","Ḻ":"L","Ł":"L","Ƚ":"L","Ɫ":"L","Ⱡ":"L","Ꝉ":"L","Ꝇ":"L","Ꞁ":"L","LJ":"LJ","Lj":"Lj","Ⓜ":"M","Ｍ":"M","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ɯ":"M","Ⓝ":"N","Ｎ":"N","Ǹ":"N","Ń":"N","Ñ":"N","Ṅ":"N","Ň":"N","Ṇ":"N","Ņ":"N","Ṋ":"N","Ṉ":"N","Ƞ":"N","Ɲ":"N","Ꞑ":"N","Ꞥ":"N","NJ":"NJ","Nj":"Nj","Ⓞ":"O","Ｏ":"O","Ò":"O","Ó":"O","Ô":"O","Ồ":"O","Ố":"O","Ỗ":"O","Ổ":"O","Õ":"O","Ṍ":"O","Ȭ":"O","Ṏ":"O","Ō":"O","Ṑ":"O","Ṓ":"O","Ŏ":"O","Ȯ":"O","Ȱ":"O","Ö":"O","Ȫ":"O","Ỏ":"O","Ő":"O","Ǒ":"O","Ȍ":"O","Ȏ":"O","Ơ":"O","Ờ":"O","Ớ":"O","Ỡ":"O","Ở":"O","Ợ":"O","Ọ":"O","Ộ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Ɔ":"O","Ɵ":"O","Ꝋ":"O","Ꝍ":"O","Ƣ":"OI","Ꝏ":"OO","Ȣ":"OU","Ⓟ":"P","Ｐ":"P","Ṕ":"P","Ṗ":"P","Ƥ":"P","Ᵽ":"P","Ꝑ":"P","Ꝓ":"P","Ꝕ":"P","Ⓠ":"Q","Ｑ":"Q","Ꝗ":"Q","Ꝙ":"Q","Ɋ":"Q","Ⓡ":"R","Ｒ":"R","Ŕ":"R","Ṙ":"R","Ř":"R","Ȑ":"R","Ȓ":"R","Ṛ":"R","Ṝ":"R","Ŗ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","Ꝛ":"R","Ꞧ":"R","Ꞃ":"R","Ⓢ":"S","Ｓ":"S","ẞ":"S","Ś":"S","Ṥ":"S","Ŝ":"S","Ṡ":"S","Š":"S","Ṧ":"S","Ṣ":"S","Ṩ":"S","Ș":"S","Ş":"S","Ȿ":"S","Ꞩ":"S","Ꞅ":"S","Ⓣ":"T","Ｔ":"T","Ṫ":"T","Ť":"T","Ṭ":"T","Ț":"T","Ţ":"T","Ṱ":"T","Ṯ":"T","Ŧ":"T","Ƭ":"T","Ʈ":"T","Ⱦ":"T","Ꞇ":"T","Ꜩ":"TZ","Ⓤ":"U","Ｕ":"U","Ù":"U","Ú":"U","Û":"U","Ũ":"U","Ṹ":"U","Ū":"U","Ṻ":"U","Ŭ":"U","Ü":"U","Ǜ":"U","Ǘ":"U","Ǖ":"U","Ǚ":"U","Ủ":"U","Ů":"U","Ű":"U","Ǔ":"U","Ȕ":"U","Ȗ":"U","Ư":"U","Ừ":"U","Ứ":"U","Ữ":"U","Ử":"U","Ự":"U","Ụ":"U","Ṳ":"U","Ų":"U","Ṷ":"U","Ṵ":"U","Ʉ":"U","Ⓥ":"V","Ｖ":"V","Ṽ":"V","Ṿ":"V","Ʋ":"V","Ꝟ":"V","Ʌ":"V","Ꝡ":"VY","Ⓦ":"W","Ｗ":"W","Ẁ":"W","Ẃ":"W","Ŵ":"W","Ẇ":"W","Ẅ":"W","Ẉ":"W","Ⱳ":"W","Ⓧ":"X","Ｘ":"X","Ẋ":"X","Ẍ":"X","Ⓨ":"Y","Ｙ":"Y","Ỳ":"Y","Ý":"Y","Ŷ":"Y","Ỹ":"Y","Ȳ":"Y","Ẏ":"Y","Ÿ":"Y","Ỷ":"Y","Ỵ":"Y","Ƴ":"Y","Ɏ":"Y","Ỿ":"Y","Ⓩ":"Z","Ｚ":"Z","Ź":"Z","Ẑ":"Z","Ż":"Z","Ž":"Z","Ẓ":"Z","Ẕ":"Z","Ƶ":"Z","Ȥ":"Z","Ɀ":"Z","Ⱬ":"Z","Ꝣ":"Z","ⓐ":"a","ａ":"a","ẚ":"a","à":"a","á":"a","â":"a","ầ":"a","ấ":"a","ẫ":"a","ẩ":"a","ã":"a","ā":"a","ă":"a","ằ":"a","ắ":"a","ẵ":"a","ẳ":"a","ȧ":"a","ǡ":"a","ä":"a","ǟ":"a","ả":"a","å":"a","ǻ":"a","ǎ":"a","ȁ":"a","ȃ":"a","ạ":"a","ậ":"a","ặ":"a","ḁ":"a","ą":"a","ⱥ":"a","ɐ":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ⓑ":"b","ｂ":"b","ḃ":"b","ḅ":"b","ḇ":"b","ƀ":"b","ƃ":"b","ɓ":"b","ⓒ":"c","ｃ":"c","ć":"c","ĉ":"c","ċ":"c","č":"c","ç":"c","ḉ":"c","ƈ":"c","ȼ":"c","ꜿ":"c","ↄ":"c","ⓓ":"d","ｄ":"d","ḋ":"d","ď":"d","ḍ":"d","ḑ":"d","ḓ":"d","ḏ":"d","đ":"d","ƌ":"d","ɖ":"d","ɗ":"d","ꝺ":"d","dz":"dz","dž":"dz","ⓔ":"e","ｅ":"e","è":"e","é":"e","ê":"e","ề":"e","ế":"e","ễ":"e","ể":"e","ẽ":"e","ē":"e","ḕ":"e","ḗ":"e","ĕ":"e","ė":"e","ë":"e","ẻ":"e","ě":"e","ȅ":"e","ȇ":"e","ẹ":"e","ệ":"e","ȩ":"e","ḝ":"e","ę":"e","ḙ":"e","ḛ":"e","ɇ":"e","ɛ":"e","ǝ":"e","ⓕ":"f","ｆ":"f","ḟ":"f","ƒ":"f","ꝼ":"f","ⓖ":"g","ｇ":"g","ǵ":"g","ĝ":"g","ḡ":"g","ğ":"g","ġ":"g","ǧ":"g","ģ":"g","ǥ":"g","ɠ":"g","ꞡ":"g","ᵹ":"g","ꝿ":"g","ⓗ":"h","ｈ":"h","ĥ":"h","ḣ":"h","ḧ":"h","ȟ":"h","ḥ":"h","ḩ":"h","ḫ":"h","ẖ":"h","ħ":"h","ⱨ":"h","ⱶ":"h","ɥ":"h","ƕ":"hv","ⓘ":"i","ｉ":"i","ì":"i","í":"i","î":"i","ĩ":"i","ī":"i","ĭ":"i","ï":"i","ḯ":"i","ỉ":"i","ǐ":"i","ȉ":"i","ȋ":"i","ị":"i","į":"i","ḭ":"i","ɨ":"i","ı":"i","ⓙ":"j","ｊ":"j","ĵ":"j","ǰ":"j","ɉ":"j","ⓚ":"k","ｋ":"k","ḱ":"k","ǩ":"k","ḳ":"k","ķ":"k","ḵ":"k","ƙ":"k","ⱪ":"k","ꝁ":"k","ꝃ":"k","ꝅ":"k","ꞣ":"k","ⓛ":"l","ｌ":"l","ŀ":"l","ĺ":"l","ľ":"l","ḷ":"l","ḹ":"l","ļ":"l","ḽ":"l","ḻ":"l","ſ":"l","ł":"l","ƚ":"l","ɫ":"l","ⱡ":"l","ꝉ":"l","ꞁ":"l","ꝇ":"l","lj":"lj","ⓜ":"m","ｍ":"m","ḿ":"m","ṁ":"m","ṃ":"m","ɱ":"m","ɯ":"m","ⓝ":"n","ｎ":"n","ǹ":"n","ń":"n","ñ":"n","ṅ":"n","ň":"n","ṇ":"n","ņ":"n","ṋ":"n","ṉ":"n","ƞ":"n","ɲ":"n","ʼn":"n","ꞑ":"n","ꞥ":"n","nj":"nj","ⓞ":"o","ｏ":"o","ò":"o","ó":"o","ô":"o","ồ":"o","ố":"o","ỗ":"o","ổ":"o","õ":"o","ṍ":"o","ȭ":"o","ṏ":"o","ō":"o","ṑ":"o","ṓ":"o","ŏ":"o","ȯ":"o","ȱ":"o","ö":"o","ȫ":"o","ỏ":"o","ő":"o","ǒ":"o","ȍ":"o","ȏ":"o","ơ":"o","ờ":"o","ớ":"o","ỡ":"o","ở":"o","ợ":"o","ọ":"o","ộ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","ɔ":"o","ꝋ":"o","ꝍ":"o","ɵ":"o","ƣ":"oi","ȣ":"ou","ꝏ":"oo","ⓟ":"p","ｐ":"p","ṕ":"p","ṗ":"p","ƥ":"p","ᵽ":"p","ꝑ":"p","ꝓ":"p","ꝕ":"p","ⓠ":"q","ｑ":"q","ɋ":"q","ꝗ":"q","ꝙ":"q","ⓡ":"r","ｒ":"r","ŕ":"r","ṙ":"r","ř":"r","ȑ":"r","ȓ":"r","ṛ":"r","ṝ":"r","ŗ":"r","ṟ":"r","ɍ":"r","ɽ":"r","ꝛ":"r","ꞧ":"r","ꞃ":"r","ⓢ":"s","ｓ":"s","ß":"s","ś":"s","ṥ":"s","ŝ":"s","ṡ":"s","š":"s","ṧ":"s","ṣ":"s","ṩ":"s","ș":"s","ş":"s","ȿ":"s","ꞩ":"s","ꞅ":"s","ẛ":"s","ⓣ":"t","ｔ":"t","ṫ":"t","ẗ":"t","ť":"t","ṭ":"t","ț":"t","ţ":"t","ṱ":"t","ṯ":"t","ŧ":"t","ƭ":"t","ʈ":"t","ⱦ":"t","ꞇ":"t","ꜩ":"tz","ⓤ":"u","ｕ":"u","ù":"u","ú":"u","û":"u","ũ":"u","ṹ":"u","ū":"u","ṻ":"u","ŭ":"u","ü":"u","ǜ":"u","ǘ":"u","ǖ":"u","ǚ":"u","ủ":"u","ů":"u","ű":"u","ǔ":"u","ȕ":"u","ȗ":"u","ư":"u","ừ":"u","ứ":"u","ữ":"u","ử":"u","ự":"u","ụ":"u","ṳ":"u","ų":"u","ṷ":"u","ṵ":"u","ʉ":"u","ⓥ":"v","ｖ":"v","ṽ":"v","ṿ":"v","ʋ":"v","ꝟ":"v","ʌ":"v","ꝡ":"vy","ⓦ":"w","ｗ":"w","ẁ":"w","ẃ":"w","ŵ":"w","ẇ":"w","ẅ":"w","ẘ":"w","ẉ":"w","ⱳ":"w","ⓧ":"x","ｘ":"x","ẋ":"x","ẍ":"x","ⓨ":"y","ｙ":"y","ỳ":"y","ý":"y","ŷ":"y","ỹ":"y","ȳ":"y","ẏ":"y","ÿ":"y","ỷ":"y","ẙ":"y","ỵ":"y","ƴ":"y","ɏ":"y","ỿ":"y","ⓩ":"z","ｚ":"z","ź":"z","ẑ":"z","ż":"z","ž":"z","ẓ":"z","ẕ":"z","ƶ":"z","ȥ":"z","ɀ":"z","ⱬ":"z","ꝣ":"z","Ά":"Α","Έ":"Ε","Ή":"Η","Ί":"Ι","Ϊ":"Ι","Ό":"Ο","Ύ":"Υ","Ϋ":"Υ","Ώ":"Ω","ά":"α","έ":"ε","ή":"η","ί":"ι","ϊ":"ι","ΐ":"ι","ό":"ο","ύ":"υ","ϋ":"υ","ΰ":"υ","ω":"ω","ς":"σ"};J=a(document),H=function(){var a=1;return function(){return a++}}(),E=D(Object,{bind:function(a){var b=this;return function(){a.apply(b,arguments)}},init:function(c){var d,e,g=".select2-results";this.opts=c=this.prepareOpts(c),this.id=c.id,c.element.data("select2")!==b&&null!==c.element.data("select2")&&c.element.data("select2").destroy(),this.container=this.createContainer(),this.liveRegion=a(".select2-hidden-accessible"),0==this.liveRegion.length&&(this.liveRegion=a("<span>",{role:"status","aria-live":"polite"}).addClass("select2-hidden-accessible").appendTo(document.body)),this.containerId="s2id_"+(c.element.attr("id")||"autogen"+H()),this.containerEventName=this.containerId.replace(/([.])/g,"_").replace(/([;&,\-\.\+\*\~':"\!\^#$%@\[\]\(\)=>\|])/g,"\\$1"),this.container.attr("id",this.containerId),this.container.attr("title",c.element.attr("title")),this.body=a(document.body),s(this.container,this.opts.element,this.opts.adaptContainerCssClass),this.container.attr("style",c.element.attr("style")),this.container.css(z(c.containerCss,this.opts.element)),this.container.addClass(z(c.containerCssClass,this.opts.element)),this.elementTabIndex=this.opts.element.attr("tabindex"),this.opts.element.data("select2",this).attr("tabindex","-1").before(this.container).on("click.select2",p),this.container.data("select2",this),this.dropdown=this.container.find(".select2-drop"),s(this.dropdown,this.opts.element,this.opts.adaptDropdownCssClass),this.dropdown.addClass(z(c.dropdownCssClass,this.opts.element)),this.dropdown.data("select2",this),this.dropdown.on("click",p),this.results=d=this.container.find(g),this.search=e=this.container.find("input.select2-input"),this.queryCount=0,this.resultsPage=0,this.context=null,this.initContainer(),this.container.on("click",p),k(this.results),this.dropdown.on("mousemove-filtered",g,this.bind(this.highlightUnderEvent)),this.dropdown.on("touchstart touchmove touchend",g,this.bind(function(a){this._touchEvent=!0,this.highlightUnderEvent(a)})),this.dropdown.on("touchmove",g,this.bind(this.touchMoved)),this.dropdown.on("touchstart touchend",g,this.bind(this.clearTouchMoved)),this.dropdown.on("click",this.bind(function(a){this._touchEvent&&(this._touchEvent=!1,this.selectHighlighted())})),m(80,this.results),this.dropdown.on("scroll-debounced",g,this.bind(this.loadMoreIfNeeded)),a(this.container).on("change",".select2-input",function(a){a.stopPropagation()}),a(this.dropdown).on("change",".select2-input",function(a){a.stopPropagation()}),a.fn.mousewheel&&d.mousewheel(function(a,b,c,e){var f=d.scrollTop();e>0&&0>=f-e?(d.scrollTop(0),p(a)):0>e&&d.get(0).scrollHeight-d.scrollTop()+e<=d.height()&&(d.scrollTop(d.get(0).scrollHeight-d.height()),p(a))}),j(e),e.on("keyup-change input paste",this.bind(this.updateResults)),e.on("focus",function(){e.addClass("select2-focused")}),e.on("blur",function(){e.removeClass("select2-focused")}),this.dropdown.on("mouseup",g,this.bind(function(b){a(b.target).closest(".select2-result-selectable").length>0&&(this.highlightUnderEvent(b),this.selectHighlighted(b))})),this.dropdown.on("click mouseup mousedown touchstart touchend focusin",function(a){a.stopPropagation()}),this.lastSearchTerm=b,a.isFunction(this.opts.initSelection)&&(this.initSelection(),this.monitorSource()),null!==c.maximumInputLength&&this.search.attr("maxlength",c.maximumInputLength);var h=c.element.prop("disabled");h===b&&(h=!1),this.enable(!h);var i=c.element.prop("readonly");i===b&&(i=!1),this.readonly(i),K=K||f(),this.autofocus=c.element.prop("autofocus"),c.element.prop("autofocus",!1),this.autofocus&&this.focus(),this.search.attr("placeholder",c.searchInputPlaceholder)},destroy:function(){var a=this.opts.element,c=a.data("select2"),d=this;this.close(),a.length&&a[0].detachEvent&&d._sync&&a.each(function(){d._sync&&this.detachEvent("onpropertychange",d._sync)}),this.propertyObserver&&(this.propertyObserver.disconnect(),this.propertyObserver=null),this._sync=null,c!==b&&(c.container.remove(),c.liveRegion.remove(),c.dropdown.remove(),a.removeData("select2").off(".select2"),a.is("input[type='hidden']")?a.css("display",""):(a.show().prop("autofocus",this.autofocus||!1),this.elementTabIndex?a.attr({tabindex:this.elementTabIndex}):a.removeAttr("tabindex"),a.show())),C.call(this,"container","liveRegion","dropdown","results","search")},optionToData:function(a){return a.is("option")?{id:a.prop("value"),text:a.text(),element:a.get(),css:a.attr("class"),disabled:a.prop("disabled"),locked:g(a.attr("locked"),"locked")||g(a.data("locked"),!0)}:a.is("optgroup")?{text:a.attr("label"),children:[],element:a.get(),css:a.attr("class")}:void 0},prepareOpts:function(c){var d,e,f,i,j=this;if(d=c.element,"select"===d.get(0).tagName.toLowerCase()&&(this.select=e=c.element),e&&a.each(["id","multiple","ajax","query","createSearchChoice","initSelection","data","tags"],function(){if(this in c)throw new Error("Option '"+this+"' is not allowed for Select2 when attached to a <select> element.")}),c.debug=c.debug||a.fn.select2.defaults.debug,c.debug&&console&&console.warn&&(null!=c.id&&console.warn("Select2: The `id` option has been removed in Select2 4.0.0, consider renaming your `id` property or mapping the property before your data makes it to Select2. You can read more at https://select2.github.io/announcements-4.0.html#changed-id"),null!=c.text&&console.warn("Select2: The `text` option has been removed in Select2 4.0.0, consider renaming your `text` property or mapping the property before your data makes it to Select2. You can read more at https://select2.github.io/announcements-4.0.html#changed-id"),null!=c.sortResults&&console.warn("Select2: the `sortResults` option has been renamed to `sorter` in Select2 4.0.0. "),null!=c.selectOnBlur&&console.warn("Select2: The `selectOnBlur` option has been renamed to `selectOnClose` in Select2 4.0.0."),null!=c.ajax&&null!=c.ajax.results&&console.warn("Select2: The `ajax.results` option has been renamed to `ajax.processResults` in Select2 4.0.0."),null!=c.formatNoResults&&console.warn("Select2: The `formatNoResults` option has been renamed to `language.noResults` in Select2 4.0.0."),null!=c.formatSearching&&console.warn("Select2: The `formatSearching` option has been renamed to `language.searching` in Select2 4.0.0."),null!=c.formatInputTooShort&&console.warn("Select2: The `formatInputTooShort` option has been renamed to `language.inputTooShort` in Select2 4.0.0."),null!=c.formatInputTooLong&&console.warn("Select2: The `formatInputTooLong` option has been renamed to `language.inputTooLong` in Select2 4.0.0."),null!=c.formatLoading&&console.warn("Select2: The `formatLoading` option has been renamed to `language.loadingMore` in Select2 4.0.0."),null!=c.formatSelectionTooBig&&console.warn("Select2: The `formatSelectionTooBig` option has been renamed to `language.maximumSelected` in Select2 4.0.0."),c.element.data("select2Tags")&&console.warn("Select2: The `data-select2-tags` attribute has been renamed to `data-tags` in Select2 4.0.0.")),null!=c.element.data("tags")){var k=c.element.data("tags");a.isArray(k)||(k=[]),c.element.data("select2Tags",k)}if(null!=c.sorter&&(c.sortResults=c.sorter),null!=c.selectOnClose&&(c.selectOnBlur=c.selectOnClose),null!=c.ajax&&a.isFunction(c.ajax.processResults)&&(c.ajax.results=c.ajax.processResults),null!=c.language){var l=c.language;a.isFunction(l.noMatches)&&(c.formatNoMatches=l.noMatches),a.isFunction(l.searching)&&(c.formatSearching=l.searching),a.isFunction(l.inputTooShort)&&(c.formatInputTooShort=l.inputTooShort),a.isFunction(l.inputTooLong)&&(c.formatInputTooLong=l.inputTooLong),a.isFunction(l.loadingMore)&&(c.formatLoading=l.loadingMore),a.isFunction(l.maximumSelected)&&(c.formatSelectionTooBig=l.maximumSelected)}if(c=a.extend({},{populateResults:function(d,e,f){var g,h=this.opts.id,i=this.liveRegion;(g=function(d,e,k){var l,m,n,o,p,q,r,s,t,u;d=c.sortResults(d,e,f);var v=[];for(l=0,m=d.length;m>l;l+=1)n=d[l],p=n.disabled===!0,o=!p&&h(n)!==b,q=n.children&&n.children.length>0,r=a("<li></li>"),r.addClass("select2-results-dept-"+k),r.addClass("select2-result"),r.addClass(o?"select2-result-selectable":"select2-result-unselectable"),p&&r.addClass("select2-disabled"),q&&r.addClass("select2-result-with-children"),r.addClass(j.opts.formatResultCssClass(n)),r.attr("role","presentation"),s=a(document.createElement("div")),s.addClass("select2-result-label"),s.attr("id","select2-result-label-"+H()),s.attr("role","option"),u=c.formatResult(n,s,f,j.opts.escapeMarkup),u!==b&&(s.html(u),r.append(s)),q&&(t=a("<ul></ul>"),t.addClass("select2-result-sub"),g(n.children,t,k+1),r.append(t)),r.data("select2-data",n),v.push(r[0]);e.append(v),i.text(c.formatMatches(d.length))})(e,d,0)}},a.fn.select2.defaults,c),"function"!=typeof c.id&&(f=c.id,c.id=function(a){return a[f]}),a.isArray(c.element.data("select2Tags"))){if("tags"in c)throw"tags specified as both an attribute 'data-select2-tags' and in options of Select2 "+c.element.attr("id");c.tags=c.element.data("select2Tags")}if(e?(c.query=this.bind(function(a){var c,e,f,g={results:[],more:!1},h=a.term;f=function(b,c){var d;b.is("option")?a.matcher(h,b.text(),b)&&c.push(j.optionToData(b)):b.is("optgroup")&&(d=j.optionToData(b),b.children().each2(function(a,b){f(b,d.children)}),d.children.length>0&&c.push(d))},c=d.children(),this.getPlaceholder()!==b&&c.length>0&&(e=this.getPlaceholderOption(),e&&(c=c.not(e))),c.each2(function(a,b){f(b,g.results)}),a.callback(g)}),c.id=function(a){return a.id}):"query"in c||("ajax"in c?(i=c.element.data("ajax-url"),i&&i.length>0&&(c.ajax.url=i),c.query=v.call(c.element,c.ajax)):"data"in c?c.query=w(c.data):"tags"in c&&(c.query=x(c.tags),c.createSearchChoice===b&&(c.createSearchChoice=function(b){return{id:a.trim(b),text:a.trim(b)}}),c.initSelection===b&&(c.initSelection=function(b,d){var e=[];a(h(b.val(),c.separator,c.transformVal)).each(function(){var b={id:this,text:this},d=c.tags;a.isFunction(d)&&(d=d()),a(d).each(function(){return g(this.id,b.id)?(b=this,!1):void 0}),e.push(b)}),d(e)}))),"function"!=typeof c.query)throw"query function not defined for Select2 "+c.element.attr("id");if("top"===c.createSearchChoicePosition)c.createSearchChoicePosition=function(a,b){a.unshift(b)};else if("bottom"===c.createSearchChoicePosition)c.createSearchChoicePosition=function(a,b){a.push(b)};else if("function"!=typeof c.createSearchChoicePosition)throw"invalid createSearchChoicePosition option must be 'top', 'bottom' or a custom function";return c},monitorSource:function(){var c,d=this.opts.element,e=this;d.on("change.select2",this.bind(function(a){this.opts.element.data("select2-change-triggered")!==!0&&this.initSelection()})),this._sync=this.bind(function(){var a=d.prop("disabled");a===b&&(a=!1),this.enable(!a);var c=d.prop("readonly");c===b&&(c=!1),this.readonly(c),this.container&&(s(this.container,this.opts.element,this.opts.adaptContainerCssClass),this.container.addClass(z(this.opts.containerCssClass,this.opts.element))),this.dropdown&&(s(this.dropdown,this.opts.element,this.opts.adaptDropdownCssClass),this.dropdown.addClass(z(this.opts.dropdownCssClass,this.opts.element)))}),d.length&&d[0].attachEvent&&d.each(function(){this.attachEvent("onpropertychange",e._sync)}),c=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver,c!==b&&(this.propertyObserver&&(delete this.propertyObserver,this.propertyObserver=null),this.propertyObserver=new c(function(b){a.each(b,e._sync)}),this.propertyObserver.observe(d.get(0),{attributes:!0,subtree:!1}))},triggerSelect:function(b){var c=a.Event("select2-selecting",{val:this.id(b),object:b,choice:b});return this.opts.element.trigger(c),!c.isDefaultPrevented()},triggerChange:function(b){b=b||{},b=a.extend({},b,{type:"change",val:this.val()}),this.opts.element.data("select2-change-triggered",!0),this.opts.element.trigger(b),this.opts.element.data("select2-change-triggered",!1),this.opts.element.click(),this.opts.blurOnChange&&this.opts.element.blur()},isInterfaceEnabled:function(){return this.enabledInterface===!0},enableInterface:function(){var a=this._enabled&&!this._readonly,b=!a;return a===this.enabledInterface?!1:(this.container.toggleClass("select2-container-disabled",b),this.close(),this.enabledInterface=a,!0)},enable:function(a){a===b&&(a=!0),this._enabled!==a&&(this._enabled=a,this.opts.element.prop("disabled",!a),this.enableInterface())},disable:function(){this.enable(!1)},readonly:function(a){a===b&&(a=!1),this._readonly!==a&&(this._readonly=a,this.opts.element.prop("readonly",a),this.enableInterface())},opened:function(){return this.container?this.container.hasClass("select2-dropdown-open"):!1},positionDropdown:function(){var b,c,d,e,f,g=this.dropdown,h=this.container,i=h.offset(),j=h.outerHeight(!1),k=h.outerWidth(!1),l=g.outerHeight(!1),m=a(window),n=m.width(),o=m.height(),p=m.scrollLeft()+n,q=m.scrollTop()+o,r=i.top+j,s=i.left,t=q>=r+l,u=i.top-l>=m.scrollTop(),v=g.outerWidth(!1),w=function(){return p>=s+v},x=function(){return i.left+p+h.outerWidth(!1)>v},y=g.hasClass("select2-drop-above");y?(c=!0,!u&&t&&(d=!0,c=!1)):(c=!1,!t&&u&&(d=!0,c=!0)),d&&(g.hide(),i=this.container.offset(),j=this.container.outerHeight(!1),k=this.container.outerWidth(!1),l=g.outerHeight(!1),p=m.scrollLeft()+n,q=m.scrollTop()+o,r=i.top+j,s=i.left,v=g.outerWidth(!1),g.show(),this.focusSearch()),this.opts.dropdownAutoWidth?(f=a(".select2-results",g)[0],g.addClass("select2-drop-auto-width"),g.css("width",""),v=g.outerWidth(!1)+(f.scrollHeight===f.clientHeight?0:K.width),v>k?k=v:v=k,l=g.outerHeight(!1)):this.container.removeClass("select2-drop-auto-width"),"static"!==this.body.css("position")&&(b=this.body.offset(),r-=b.top,s-=b.left),!w()&&x()&&(s=i.left+this.container.outerWidth(!1)-v),e={left:s,width:k},c?(this.container.addClass("select2-drop-above"),g.addClass("select2-drop-above"),l=g.outerHeight(!1),e.top=i.top-l,e.bottom="auto"):(e.top=r,e.bottom="auto",this.container.removeClass("select2-drop-above"),g.removeClass("select2-drop-above")),e=a.extend(e,z(this.opts.dropdownCss,this.opts.element)),g.css(e)},shouldOpen:function(){var b;return this.opened()?!1:this._enabled===!1||this._readonly===!0?!1:(b=a.Event("select2-opening"),this.opts.element.trigger(b),!b.isDefaultPrevented())},clearDropdownAlignmentPreference:function(){this.container.removeClass("select2-drop-above"),this.dropdown.removeClass("select2-drop-above")},open:function(){return this.shouldOpen()?(this.opening(),J.on("mousemove.select2Event",function(a){L.x=a.pageX,L.y=a.pageY}),!0):!1},opening:function(){var b,d=this.containerEventName,e="scroll."+d,f="resize."+d,g="orientationchange."+d;this.container.addClass("select2-dropdown-open").addClass("select2-container-active"),this.clearDropdownAlignmentPreference(),this.dropdown[0]!==this.body.children().last()[0]&&this.dropdown.detach().appendTo(this.body),b=a("#select2-drop-mask"),0===b.length&&(b=a(document.createElement("div")),b.attr("id","select2-drop-mask").attr("class","select2-drop-mask"),b.hide(),b.appendTo(this.body),b.on("mousedown touchstart click",function(d){c(b);var e,f=a("#select2-drop");f.length>0&&(e=f.data("select2"),e.opts.selectOnBlur&&e.selectHighlighted({noFocus:!0}),e.close(),d.preventDefault(),d.stopPropagation())})),this.dropdown.prev()[0]!==b[0]&&this.dropdown.before(b),a("#select2-drop").removeAttr("id"),this.dropdown.attr("id","select2-drop"),b.show(),this.positionDropdown(),this.dropdown.show(),this.positionDropdown(),this.dropdown.addClass("select2-drop-active");var h=this;this.container.parents().add(window).each(function(){a(this).on(f+" "+e+" "+g,function(a){h.opened()&&h.positionDropdown()})})},close:function(){if(this.opened()){var b=this.containerEventName,c="scroll."+b,d="resize."+b,e="orientationchange."+b;this.container.parents().add(window).each(function(){a(this).off(c).off(d).off(e)}),this.clearDropdownAlignmentPreference(),a("#select2-drop-mask").hide(),this.dropdown.removeAttr("id"),this.dropdown.hide(),this.container.removeClass("select2-dropdown-open").removeClass("select2-container-active"),this.results.empty(),J.off("mousemove.select2Event"),this.clearSearch(),this.search.removeClass("select2-active"),this.search.removeAttr("aria-activedescendant"),this.opts.element.trigger(a.Event("select2-close"))}},externalSearch:function(a){this.open(),this.search.val(a),this.updateResults(!1)},clearSearch:function(){},prefillNextSearchTerm:function(){if(""!==this.search.val())return!1;var a=this.opts.nextSearchTerm(this.data(),this.lastSearchTerm);return a!==b?(this.search.val(a),this.search.select(),!0):!1},getMaximumSelectionSize:function(){return z(this.opts.maximumSelectionSize,this.opts.element)},ensureHighlightVisible:function(){var b,c,d,e,f,g,h,i,j=this.results;if(c=this.highlight(),!(0>c)){if(0==c)return void j.scrollTop(0);b=this.findHighlightableChoices().find(".select2-result-label"),d=a(b[c]),i=(d.offset()||{}).top||0,e=i+d.outerHeight(!0),c===b.length-1&&(h=j.find("li.select2-more-results"),h.length>0&&(e=h.offset().top+h.outerHeight(!0))),f=j.offset().top+j.outerHeight(!1),e>f&&j.scrollTop(j.scrollTop()+(e-f)),g=i-j.offset().top,0>g&&"none"!=d.css("display")&&j.scrollTop(j.scrollTop()+g)}},findHighlightableChoices:function(){return this.results.find(".select2-result-selectable:not(.select2-disabled):not(.select2-selected)")},moveHighlight:function(b){for(var c=this.findHighlightableChoices(),d=this.highlight();d>-1&&d<c.length;){d+=b;var e=a(c[d]);if(e.hasClass("select2-result-selectable")&&!e.hasClass("select2-disabled")&&!e.hasClass("select2-selected")){this.highlight(d);break}}},highlight:function(b){var c,d,f=this.findHighlightableChoices();return 0===arguments.length?e(f.filter(".select2-highlighted")[0],f.get()):(b>=f.length&&(b=f.length-1),0>b&&(b=0),this.removeHighlight(),c=a(f[b]),c.addClass("select2-highlighted"),this.search.attr("aria-activedescendant",c.find(".select2-result-label").attr("id")),this.ensureHighlightVisible(),this.liveRegion.text(c.text()),d=c.data("select2-data"),void(d&&this.opts.element.trigger({type:"select2-highlight",val:this.id(d),choice:d})))},removeHighlight:function(){this.results.find(".select2-highlighted").removeClass("select2-highlighted")},touchMoved:function(){this._touchMoved=!0},clearTouchMoved:function(){this._touchMoved=!1},countSelectableResults:function(){return this.findHighlightableChoices().length},highlightUnderEvent:function(b){var c=a(b.target).closest(".select2-result-selectable");if(c.length>0&&!c.is(".select2-highlighted")){
-var d=this.findHighlightableChoices();this.highlight(d.index(c))}else 0==c.length&&this.removeHighlight()},loadMoreIfNeeded:function(){var a,b=this.results,c=b.find("li.select2-more-results"),d=this.resultsPage+1,e=this,f=this.search.val(),g=this.context;0!==c.length&&(a=c.offset().top-b.offset().top-b.height(),a<=this.opts.loadMorePadding&&(c.addClass("select2-active"),this.opts.query({element:this.opts.element,term:f,page:d,context:g,matcher:this.opts.matcher,callback:this.bind(function(a){e.opened()&&(e.opts.populateResults.call(this,b,a.results,{term:f,page:d,context:g}),e.postprocessResults(a,!1,!1),a.more===!0?(c.detach().appendTo(b).html(e.opts.escapeMarkup(z(e.opts.formatLoadMore,e.opts.element,d+1))),window.setTimeout(function(){e.loadMoreIfNeeded()},10)):c.remove(),e.positionDropdown(),e.resultsPage=d,e.context=a.context,this.opts.element.trigger({type:"select2-loaded",items:a}))})})))},tokenize:function(){},updateResults:function(c){function d(){j.removeClass("select2-active"),m.positionDropdown(),k.find(".select2-no-results,.select2-selection-limit,.select2-searching").length?m.liveRegion.text(k.text()):m.liveRegion.text(m.opts.formatMatches(k.find('.select2-result-selectable:not(".select2-selected")').length))}function e(a){k.html(a),d()}var f,h,i,j=this.search,k=this.results,l=this.opts,m=this,n=j.val(),o=a.data(this.container,"select2-last-term");if((c===!0||!o||!g(n,o))&&(a.data(this.container,"select2-last-term",n),c===!0||this.showSearchInput!==!1&&this.opened())){i=++this.queryCount;var p=this.getMaximumSelectionSize();if(p>=1&&(f=this.data(),a.isArray(f)&&f.length>=p&&y(l.formatSelectionTooBig,"formatSelectionTooBig")))return void e("<li class='select2-selection-limit'>"+z(l.formatSelectionTooBig,l.element,p)+"</li>");if(j.val().length<l.minimumInputLength)return e(y(l.formatInputTooShort,"formatInputTooShort")?"<li class='select2-no-results'>"+z(l.formatInputTooShort,l.element,j.val(),l.minimumInputLength)+"</li>":""),void(c&&this.showSearch&&this.showSearch(!0));if(l.maximumInputLength&&j.val().length>l.maximumInputLength)return void e(y(l.formatInputTooLong,"formatInputTooLong")?"<li class='select2-no-results'>"+z(l.formatInputTooLong,l.element,j.val(),l.maximumInputLength)+"</li>":"");l.formatSearching&&0===this.findHighlightableChoices().length&&e("<li class='select2-searching'>"+z(l.formatSearching,l.element)+"</li>"),j.addClass("select2-active"),this.removeHighlight(),h=this.tokenize(),h!=b&&null!=h&&j.val(h),this.resultsPage=1,l.query({element:l.element,term:j.val(),page:this.resultsPage,context:null,matcher:l.matcher,callback:this.bind(function(f){var h;if(i==this.queryCount){if(!this.opened())return void this.search.removeClass("select2-active");if(f.hasError!==b&&y(l.formatAjaxError,"formatAjaxError"))return void e("<li class='select2-ajax-error'>"+z(l.formatAjaxError,l.element,f.jqXHR,f.textStatus,f.errorThrown)+"</li>");if(this.context=f.context===b?null:f.context,this.opts.createSearchChoice&&""!==j.val()&&(h=this.opts.createSearchChoice.call(m,j.val(),f.results),h!==b&&null!==h&&m.id(h)!==b&&null!==m.id(h)&&0===a(f.results).filter(function(){return g(m.id(this),m.id(h))}).length&&this.opts.createSearchChoicePosition(f.results,h)),0===f.results.length&&y(l.formatNoMatches,"formatNoMatches"))return e("<li class='select2-no-results'>"+z(l.formatNoMatches,l.element,j.val())+"</li>"),void(this.showSearch&&this.showSearch(j.val()));k.empty(),m.opts.populateResults.call(this,k,f.results,{term:j.val(),page:this.resultsPage,context:null}),f.more===!0&&y(l.formatLoadMore,"formatLoadMore")&&(k.append("<li class='select2-more-results'>"+l.escapeMarkup(z(l.formatLoadMore,l.element,this.resultsPage))+"</li>"),window.setTimeout(function(){m.loadMoreIfNeeded()},10)),this.postprocessResults(f,c),d(),this.opts.element.trigger({type:"select2-loaded",items:f})}})})}},cancel:function(){this.close()},blur:function(){this.opts.selectOnBlur&&this.selectHighlighted({noFocus:!0}),this.close(),this.container.removeClass("select2-container-active"),this.search[0]===document.activeElement&&this.search.blur(),this.clearSearch(),this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus")},focusSearch:function(){n(this.search)},selectHighlighted:function(a){if(this._touchMoved)return void this.clearTouchMoved();var b=this.highlight(),c=this.results.find(".select2-highlighted"),d=c.closest(".select2-result").data("select2-data");d?(this.highlight(b),this.onSelect(d,a)):a&&a.noFocus&&this.close()},getPlaceholder:function(){var a;return this.opts.element.attr("placeholder")||this.opts.element.attr("data-placeholder")||this.opts.element.data("placeholder")||this.opts.placeholder||((a=this.getPlaceholderOption())!==b?a.text():b)},getPlaceholderOption:function(){if(this.select){var c=this.select.children("option").first();if(this.opts.placeholderOption!==b)return"first"===this.opts.placeholderOption&&c||"function"==typeof this.opts.placeholderOption&&this.opts.placeholderOption(this.select);if(""===a.trim(c.text())&&""===c.val())return c}},initContainerWidth:function(){function b(){var b,c,d,e,f,g;if("off"===this.opts.width)return null;if("element"===this.opts.width)return 0===this.opts.element.outerWidth(!1)?"auto":this.opts.element.outerWidth(!1)+"px";if("copy"===this.opts.width||"resolve"===this.opts.width){if(b=this.opts.element.attr("style"),"string"==typeof b)for(c=b.split(";"),e=0,f=c.length;f>e;e+=1)if(g=c[e].replace(/\s/g,""),d=g.match(/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i),null!==d&&d.length>=1)return d[1];return"resolve"===this.opts.width?(b=this.opts.element.css("width"),b.indexOf("%")>0?b:0===this.opts.element.outerWidth(!1)?"auto":this.opts.element.outerWidth(!1)+"px"):null}return a.isFunction(this.opts.width)?this.opts.width():this.opts.width}var c=b.call(this);null!==c&&this.container.css("width",c)}}),F=D(E,{createContainer:function(){var b=a(document.createElement("div")).attr({"class":"select2-container"}).html(["<a href='javascript:void(0)' class='select2-choice' tabindex='-1'>","   <span class='select2-chosen'>&#160;</span><abbr class='select2-search-choice-close'></abbr>","   <span class='select2-arrow' role='presentation'><b role='presentation'></b></span>","</a>","<label for='' class='select2-offscreen'></label>","<input class='select2-focusser select2-offscreen' type='text' aria-haspopup='true' role='button' />","<div class='select2-drop select2-display-none'>","   <div class='select2-search'>","       <label for='' class='select2-offscreen'></label>","       <input type='text' autocomplete='off' autocorrect='off' autocapitalize='off' spellcheck='false' class='select2-input' role='combobox' aria-expanded='true'","       aria-autocomplete='list' />","   </div>","   <ul class='select2-results' role='listbox'>","   </ul>","</div>"].join(""));return b},enableInterface:function(){this.parent.enableInterface.apply(this,arguments)&&this.focusser.prop("disabled",!this.isInterfaceEnabled())},opening:function(){var b,c,d;this.opts.minimumResultsForSearch>=0&&this.showSearch(!0),this.parent.opening.apply(this,arguments),this.showSearchInput!==!1&&this.search.val(this.focusser.val()),this.opts.shouldFocusInput(this)&&(this.search.focus(),b=this.search.get(0),b.createTextRange?(c=b.createTextRange(),c.collapse(!1),c.select()):b.setSelectionRange&&(d=this.search.val().length,b.setSelectionRange(d,d))),this.prefillNextSearchTerm(),this.focusser.prop("disabled",!0).val(""),this.updateResults(!0),this.opts.element.trigger(a.Event("select2-open"))},close:function(){this.opened()&&(this.parent.close.apply(this,arguments),this.focusser.prop("disabled",!1),this.opts.shouldFocusInput(this)&&this.focusser.focus())},focus:function(){this.opened()?this.close():(this.focusser.prop("disabled",!1),this.opts.shouldFocusInput(this)&&this.focusser.focus())},isFocused:function(){return this.container.hasClass("select2-container-active")},cancel:function(){this.parent.cancel.apply(this,arguments),this.focusser.prop("disabled",!1),this.opts.shouldFocusInput(this)&&this.focusser.focus()},destroy:function(){a("label[for='"+this.focusser.attr("id")+"']").attr("for",this.opts.element.attr("id")),this.parent.destroy.apply(this,arguments),C.call(this,"selection","focusser")},initContainer:function(){var b,d,e=this.container,f=this.dropdown,g=H();this.opts.minimumResultsForSearch<0?this.showSearch(!1):this.showSearch(!0),this.selection=b=e.find(".select2-choice"),this.focusser=e.find(".select2-focusser"),b.find(".select2-chosen").attr("id","select2-chosen-"+g),this.focusser.attr("aria-labelledby","select2-chosen-"+g),this.results.attr("id","select2-results-"+g),this.search.attr("aria-owns","select2-results-"+g),this.focusser.attr("id","s2id_autogen"+g),d=a("label[for='"+this.opts.element.attr("id")+"']"),this.opts.element.on("focus.select2",this.bind(function(){this.focus()})),this.focusser.prev().text(d.text()).attr("for",this.focusser.attr("id"));var h=this.opts.element.attr("title");this.opts.element.attr("title",h||d.text()),this.focusser.attr("tabindex",this.elementTabIndex),this.search.attr("id",this.focusser.attr("id")+"_search"),this.search.prev().text(a("label[for='"+this.focusser.attr("id")+"']").text()).attr("for",this.search.attr("id")),this.search.on("keydown",this.bind(function(a){if(this.isInterfaceEnabled()&&229!=a.keyCode){if(a.which===M.PAGE_UP||a.which===M.PAGE_DOWN)return void p(a);switch(a.which){case M.UP:case M.DOWN:return this.moveHighlight(a.which===M.UP?-1:1),void p(a);case M.ENTER:return this.selectHighlighted(),void p(a);case M.TAB:return void this.selectHighlighted({noFocus:!0});case M.ESC:return this.cancel(a),void p(a)}}})),this.search.on("blur",this.bind(function(a){document.activeElement===this.body.get(0)&&window.setTimeout(this.bind(function(){this.opened()&&this.results&&this.results.length>1&&this.search.focus()}),0)})),this.focusser.on("keydown",this.bind(function(a){if(this.isInterfaceEnabled()&&a.which!==M.TAB&&!M.isControl(a)&&!M.isFunctionKey(a)&&a.which!==M.ESC){if(this.opts.openOnEnter===!1&&a.which===M.ENTER)return void p(a);if(a.which==M.DOWN||a.which==M.UP||a.which==M.ENTER&&this.opts.openOnEnter){if(a.altKey||a.ctrlKey||a.shiftKey||a.metaKey)return;return this.open(),void p(a)}return a.which==M.DELETE||a.which==M.BACKSPACE?(this.opts.allowClear&&this.clear(),void p(a)):void 0}})),j(this.focusser),this.focusser.on("keyup-change input",this.bind(function(a){if(this.opts.minimumResultsForSearch>=0){if(a.stopPropagation(),this.opened())return;this.open()}})),b.on("mousedown touchstart","abbr",this.bind(function(a){this.isInterfaceEnabled()&&(this.clear(),q(a),this.close(),this.selection&&this.selection.focus())})),b.on("mousedown touchstart",this.bind(function(d){c(b),this.container.hasClass("select2-container-active")||this.opts.element.trigger(a.Event("select2-focus")),this.opened()?this.close():this.isInterfaceEnabled()&&this.open(),p(d)})),f.on("mousedown touchstart",this.bind(function(){this.opts.shouldFocusInput(this)&&this.search.focus()})),b.on("focus",this.bind(function(a){p(a)})),this.focusser.on("focus",this.bind(function(){this.container.hasClass("select2-container-active")||this.opts.element.trigger(a.Event("select2-focus")),this.container.addClass("select2-container-active")})).on("blur",this.bind(function(){this.opened()||(this.container.removeClass("select2-container-active"),this.opts.element.trigger(a.Event("select2-blur")))})),this.search.on("focus",this.bind(function(){this.container.hasClass("select2-container-active")||this.opts.element.trigger(a.Event("select2-focus")),this.container.addClass("select2-container-active")})),this.initContainerWidth(),this.opts.element.hide(),this.setPlaceholder()},clear:function(b){var c=this.selection.data("select2-data");if(c){var d=a.Event("select2-clearing");if(this.opts.element.trigger(d),d.isDefaultPrevented())return;var e=this.getPlaceholderOption();this.opts.element.val(e?e.val():""),this.selection.find(".select2-chosen").empty(),this.selection.removeData("select2-data"),this.setPlaceholder(),b!==!1&&(this.opts.element.trigger({type:"select2-removed",val:this.id(c),choice:c}),this.triggerChange({removed:c}))}},initSelection:function(){if(this.isPlaceholderOptionSelected())this.updateSelection(null),this.close(),this.setPlaceholder();else{var a=this;this.opts.initSelection.call(null,this.opts.element,function(c){c!==b&&null!==c&&(a.updateSelection(c),a.close(),a.setPlaceholder(),a.lastSearchTerm=a.search.val())})}},isPlaceholderOptionSelected:function(){var a;return this.getPlaceholder()===b?!1:(a=this.getPlaceholderOption())!==b&&a.prop("selected")||""===this.opts.element.val()||this.opts.element.val()===b||null===this.opts.element.val()},prepareOpts:function(){var b=this.parent.prepareOpts.apply(this,arguments),c=this;return"select"===b.element.get(0).tagName.toLowerCase()?b.initSelection=function(a,b){var d=a.find("option").filter(function(){return this.selected&&!this.disabled});b(c.optionToData(d))}:"data"in b&&(b.initSelection=b.initSelection||function(c,d){var e=c.val(),f=null;b.query({matcher:function(a,c,d){var h=g(e,b.id(d));return h&&(f=d),h},callback:a.isFunction(d)?function(){d(f)}:a.noop})}),b},getPlaceholder:function(){return this.select&&this.getPlaceholderOption()===b?b:this.parent.getPlaceholder.apply(this,arguments)},setPlaceholder:function(){var a=this.getPlaceholder();if(this.isPlaceholderOptionSelected()&&a!==b){if(this.select&&this.getPlaceholderOption()===b)return;this.selection.find(".select2-chosen").html(this.opts.escapeMarkup(a)),this.selection.addClass("select2-default"),this.container.removeClass("select2-allowclear")}},postprocessResults:function(a,b,c){var d=0,e=this;if(this.findHighlightableChoices().each2(function(a,b){return g(e.id(b.data("select2-data")),e.opts.element.val())?(d=a,!1):void 0}),c!==!1&&(b===!0&&d>=0?this.highlight(d):this.highlight(0)),b===!0){var f=this.opts.minimumResultsForSearch;f>=0&&this.showSearch(A(a.results)>=f)}},showSearch:function(b){this.showSearchInput!==b&&(this.showSearchInput=b,this.dropdown.find(".select2-search").toggleClass("select2-search-hidden",!b),this.dropdown.find(".select2-search").toggleClass("select2-offscreen",!b),a(this.dropdown,this.container).toggleClass("select2-with-searchbox",b))},onSelect:function(a,b){if(this.triggerSelect(a)){var c=this.opts.element.val(),d=this.data();this.opts.element.val(this.id(a)),this.updateSelection(a),this.opts.element.trigger({type:"select2-selected",val:this.id(a),choice:a}),this.lastSearchTerm=this.search.val(),this.close(),b&&b.noFocus||!this.opts.shouldFocusInput(this)||this.focusser.focus(),g(c,this.id(a))||this.triggerChange({added:a,removed:d})}},updateSelection:function(a){var c,d,e=this.selection.find(".select2-chosen");this.selection.data("select2-data",a),e.empty(),null!==a&&(c=this.opts.formatSelection(a,e,this.opts.escapeMarkup)),c!==b&&e.append(c),d=this.opts.formatSelectionCssClass(a,e),d!==b&&e.addClass(d),this.selection.removeClass("select2-default"),this.opts.allowClear&&this.getPlaceholder()!==b&&this.container.addClass("select2-allowclear")},val:function(){var a,c=!1,d=null,e=this,f=this.data();if(0===arguments.length)return this.opts.element.val();if(a=arguments[0],arguments.length>1&&(c=arguments[1],this.opts.debug&&console&&console.warn&&console.warn('Select2: The second option to `select2("val")` is not supported in Select2 4.0.0. The `change` event will always be triggered in 4.0.0.')),this.select)this.opts.debug&&console&&console.warn&&console.warn('Select2: Setting the value on a <select> using `select2("val")` is no longer supported in 4.0.0. You can use the `.val(newValue).trigger("change")` method provided by jQuery instead.'),this.select.val(a).find("option").filter(function(){return this.selected}).each2(function(a,b){return d=e.optionToData(b),!1}),this.updateSelection(d),this.setPlaceholder(),c&&this.triggerChange({added:d,removed:f});else{if(!a&&0!==a)return void this.clear(c);if(this.opts.initSelection===b)throw new Error("cannot call val() if initSelection() is not defined");this.opts.element.val(a),this.opts.initSelection(this.opts.element,function(a){e.opts.element.val(a?e.id(a):""),e.updateSelection(a),e.setPlaceholder(),c&&e.triggerChange({added:a,removed:f})})}},clearSearch:function(){this.search.val(""),this.focusser.val("")},data:function(a){var c,d=!1;return 0===arguments.length?(c=this.selection.data("select2-data"),c==b&&(c=null),c):(this.opts.debug&&console&&console.warn&&console.warn('Select2: The `select2("data")` method can no longer set selected values in 4.0.0, consider using the `.val()` method instead.'),arguments.length>1&&(d=arguments[1]),a?(c=this.data(),this.opts.element.val(a?this.id(a):""),this.updateSelection(a),d&&this.triggerChange({added:a,removed:c})):this.clear(d),void 0)}}),G=D(E,{createContainer:function(){var b=a(document.createElement("div")).attr({"class":"select2-container select2-container-multi"}).html(["<ul class='select2-choices'>","  <li class='select2-search-field'>","    <label for='' class='select2-offscreen'></label>","    <input type='text' autocomplete='off' autocorrect='off' autocapitalize='off' spellcheck='false' class='select2-input'>","  </li>","</ul>","<div class='select2-drop select2-drop-multi select2-display-none'>","   <ul class='select2-results'>","   </ul>","</div>"].join(""));return b},prepareOpts:function(){var b=this.parent.prepareOpts.apply(this,arguments),c=this;return"select"===b.element.get(0).tagName.toLowerCase()?b.initSelection=function(a,b){var d=[];a.find("option").filter(function(){return this.selected&&!this.disabled}).each2(function(a,b){d.push(c.optionToData(b))}),b(d)}:"data"in b&&(b.initSelection=b.initSelection||function(c,d){var e=h(c.val(),b.separator,b.transformVal),f=[];b.query({matcher:function(c,d,h){var i=a.grep(e,function(a){return g(a,b.id(h))}).length;return i&&f.push(h),i},callback:a.isFunction(d)?function(){for(var a=[],c=0;c<e.length;c++)for(var h=e[c],i=0;i<f.length;i++){var j=f[i];if(g(h,b.id(j))){a.push(j),f.splice(i,1);break}}d(a)}:a.noop})}),b},selectChoice:function(a){var b=this.container.find(".select2-search-choice-focus");b.length&&a&&a[0]==b[0]||(b.length&&this.opts.element.trigger("choice-deselected",b),b.removeClass("select2-search-choice-focus"),a&&a.length&&(this.close(),a.addClass("select2-search-choice-focus"),this.opts.element.trigger("choice-selected",a)))},destroy:function(){a("label[for='"+this.search.attr("id")+"']").attr("for",this.opts.element.attr("id")),this.parent.destroy.apply(this,arguments),C.call(this,"searchContainer","selection")},initContainer:function(){var b,c=".select2-choices";this.searchContainer=this.container.find(".select2-search-field"),this.selection=b=this.container.find(c);var d=this;this.selection.on("click",".select2-container:not(.select2-container-disabled) .select2-search-choice:not(.select2-locked)",function(b){d.search[0].focus(),d.selectChoice(a(this))}),this.search.attr("id","s2id_autogen"+H()),this.search.prev().text(a("label[for='"+this.opts.element.attr("id")+"']").text()).attr("for",this.search.attr("id")),this.opts.element.on("focus.select2",this.bind(function(){this.focus()})),this.search.on("input paste",this.bind(function(){this.search.attr("placeholder")&&0==this.search.val().length||this.isInterfaceEnabled()&&(this.opened()||this.open())})),this.search.attr("tabindex",this.elementTabIndex),this.keydowns=0,this.search.on("keydown",this.bind(function(a){if(this.isInterfaceEnabled()){++this.keydowns;var c=b.find(".select2-search-choice-focus"),d=c.prev(".select2-search-choice:not(.select2-locked)"),e=c.next(".select2-search-choice:not(.select2-locked)"),f=o(this.search);if(c.length&&(a.which==M.LEFT||a.which==M.RIGHT||a.which==M.BACKSPACE||a.which==M.DELETE||a.which==M.ENTER)){var g=c;return a.which==M.LEFT&&d.length?g=d:a.which==M.RIGHT?g=e.length?e:null:a.which===M.BACKSPACE?this.unselect(c.first())&&(this.search.width(10),g=d.length?d:e):a.which==M.DELETE?this.unselect(c.first())&&(this.search.width(10),g=e.length?e:null):a.which==M.ENTER&&(g=null),this.selectChoice(g),p(a),void(g&&g.length||this.open())}if((a.which===M.BACKSPACE&&1==this.keydowns||a.which==M.LEFT)&&0==f.offset&&!f.length)return this.selectChoice(b.find(".select2-search-choice:not(.select2-locked)").last()),void p(a);if(this.selectChoice(null),this.opened())switch(a.which){case M.UP:case M.DOWN:return this.moveHighlight(a.which===M.UP?-1:1),void p(a);case M.ENTER:return this.selectHighlighted(),void p(a);case M.TAB:return this.selectHighlighted({noFocus:!0}),void this.close();case M.ESC:return this.cancel(a),void p(a)}if(a.which!==M.TAB&&!M.isControl(a)&&!M.isFunctionKey(a)&&a.which!==M.BACKSPACE&&a.which!==M.ESC){if(a.which===M.ENTER){if(this.opts.openOnEnter===!1)return;if(a.altKey||a.ctrlKey||a.shiftKey||a.metaKey)return}this.open(),(a.which===M.PAGE_UP||a.which===M.PAGE_DOWN)&&p(a),a.which===M.ENTER&&p(a)}}})),this.search.on("keyup",this.bind(function(a){this.keydowns=0,this.resizeSearch()})),this.search.on("blur",this.bind(function(b){this.container.removeClass("select2-container-active"),this.search.removeClass("select2-focused"),this.selectChoice(null),this.opened()||this.clearSearch(),b.stopImmediatePropagation(),this.opts.element.trigger(a.Event("select2-blur"))})),this.container.on("click",c,this.bind(function(b){this.isInterfaceEnabled()&&(a(b.target).closest(".select2-search-choice").length>0||(this.selectChoice(null),this.clearPlaceholder(),this.container.hasClass("select2-container-active")||this.opts.element.trigger(a.Event("select2-focus")),this.open(),this.focusSearch(),b.preventDefault()))})),this.container.on("focus",c,this.bind(function(){this.isInterfaceEnabled()&&(this.container.hasClass("select2-container-active")||this.opts.element.trigger(a.Event("select2-focus")),this.container.addClass("select2-container-active"),this.dropdown.addClass("select2-drop-active"),this.clearPlaceholder())})),this.initContainerWidth(),this.opts.element.hide(),this.clearSearch()},enableInterface:function(){this.parent.enableInterface.apply(this,arguments)&&this.search.prop("disabled",!this.isInterfaceEnabled())},initSelection:function(){if(""===this.opts.element.val()&&""===this.opts.element.text()&&(this.updateSelection([]),this.close(),this.clearSearch()),this.select||""!==this.opts.element.val()){var a=this;this.opts.initSelection.call(null,this.opts.element,function(c){c!==b&&null!==c&&(a.updateSelection(c),a.close(),a.clearSearch())})}},clearSearch:function(){var a=this.getPlaceholder(),c=this.getMaxSearchWidth();a!==b&&0===this.getVal().length&&this.search.hasClass("select2-focused")===!1?(this.search.val(a).addClass("select2-default"),this.search.width(c>0?c:this.container.css("width"))):this.search.val("").width(10)},clearPlaceholder:function(){this.search.hasClass("select2-default")&&this.search.val("").removeClass("select2-default")},opening:function(){this.clearPlaceholder(),this.resizeSearch(),this.parent.opening.apply(this,arguments),this.focusSearch(),this.prefillNextSearchTerm(),this.updateResults(!0),this.opts.shouldFocusInput(this)&&this.search.focus(),this.opts.element.trigger(a.Event("select2-open"))},close:function(){this.opened()&&this.parent.close.apply(this,arguments)},focus:function(){this.close(),this.search.focus()},isFocused:function(){return this.search.hasClass("select2-focused")},updateSelection:function(b){var c={},d=[],e=this;a(b).each(function(){e.id(this)in c||(c[e.id(this)]=0,d.push(this))}),this.selection.find(".select2-search-choice").remove(),this.addSelectedChoice(d),e.postprocessResults()},tokenize:function(){var a=this.search.val();a=this.opts.tokenizer.call(this,a,this.data(),this.bind(this.onSelect),this.opts),null!=a&&a!=b&&(this.search.val(a),a.length>0&&this.open())},onSelect:function(a,b){this.triggerSelect(a)&&""!==a.text&&(this.addSelectedChoice(a),this.opts.element.trigger({type:"selected",val:this.id(a),choice:a}),this.lastSearchTerm=this.search.val(),this.clearSearch(),this.updateResults(),(this.select||!this.opts.closeOnSelect)&&this.postprocessResults(a,!1,this.opts.closeOnSelect===!0),this.opts.closeOnSelect?(this.close(),this.search.width(10)):this.countSelectableResults()>0?(this.search.width(10),this.resizeSearch(),this.getMaximumSelectionSize()>0&&this.val().length>=this.getMaximumSelectionSize()?this.updateResults(!0):this.prefillNextSearchTerm()&&this.updateResults(),this.positionDropdown()):(this.close(),this.search.width(10)),this.triggerChange({added:a}),b&&b.noFocus||this.focusSearch())},cancel:function(){this.close(),this.focusSearch()},addSelectedChoice:function(b){var c=this.getVal(),d=this;a(b).each(function(){c.push(d.createChoice(this))}),this.setVal(c)},createChoice:function(c){var d,e,f=!c.locked,g=a("<li class='select2-search-choice'>    <div></div>    <a href='#' class='select2-search-choice-close' tabindex='-1'></a></li>"),h=a("<li class='select2-search-choice select2-locked'><div></div></li>"),i=f?g:h,j=this.id(c);return d=this.opts.formatSelection(c,i.find("div"),this.opts.escapeMarkup),d!=b&&i.find("div").replaceWith(a("<div></div>").html(d)),e=this.opts.formatSelectionCssClass(c,i.find("div")),e!=b&&i.addClass(e),f&&i.find(".select2-search-choice-close").on("mousedown",p).on("click dblclick",this.bind(function(b){this.isInterfaceEnabled()&&(this.unselect(a(b.target)),this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus"),p(b),this.close(),this.focusSearch())})).on("focus",this.bind(function(){this.isInterfaceEnabled()&&(this.container.addClass("select2-container-active"),this.dropdown.addClass("select2-drop-active"))})),i.data("select2-data",c),i.insertBefore(this.searchContainer),j},unselect:function(b){var c,d,f=this.getVal();if(b=b.closest(".select2-search-choice"),0===b.length)throw"Invalid argument: "+b+". Must be .select2-search-choice";if(c=b.data("select2-data")){var g=a.Event("select2-removing");if(g.val=this.id(c),g.choice=c,this.opts.element.trigger(g),g.isDefaultPrevented())return!1;for(;(d=e(this.id(c),f))>=0;)f.splice(d,1),this.setVal(f),this.select&&this.postprocessResults();return b.remove(),this.opts.element.trigger({type:"select2-removed",val:this.id(c),choice:c}),this.triggerChange({removed:c}),!0}},postprocessResults:function(a,b,c){var d=this.getVal(),f=this.results.find(".select2-result"),g=this.results.find(".select2-result-with-children"),h=this;f.each2(function(a,b){var c=h.id(b.data("select2-data"));e(c,d)>=0&&(b.addClass("select2-selected"),b.find(".select2-result-selectable").addClass("select2-selected"))}),g.each2(function(a,b){b.is(".select2-result-selectable")||0!==b.find(".select2-result-selectable:not(.select2-selected)").length||b.addClass("select2-selected")}),-1==this.highlight()&&c!==!1&&this.opts.closeOnSelect===!0&&h.highlight(0),!this.opts.createSearchChoice&&!f.filter(".select2-result:not(.select2-selected)").length>0&&(!a||a&&!a.more&&0===this.results.find(".select2-no-results").length)&&y(h.opts.formatNoMatches,"formatNoMatches")&&this.results.append("<li class='select2-no-results'>"+z(h.opts.formatNoMatches,h.opts.element,h.search.val())+"</li>")},getMaxSearchWidth:function(){return this.selection.width()-i(this.search)},resizeSearch:function(){var a,b,c,d,e,f=i(this.search);a=r(this.search)+10,b=this.search.offset().left,c=this.selection.width(),d=this.selection.offset().left,e=c-(b-d)-f,a>e&&(e=c-f),40>e&&(e=c-f),0>=e&&(e=a),this.search.width(Math.floor(e))},getVal:function(){var a;return this.select?(a=this.select.val(),null===a?[]:a):(a=this.opts.element.val(),h(a,this.opts.separator,this.opts.transformVal))},setVal:function(b){if(this.select)this.select.val(b);else{var c=[],d={};a(b).each(function(){this in d||(c.push(this),d[this]=0)}),this.opts.element.val(0===c.length?"":c.join(this.opts.separator))}},buildChangeDetails:function(a,b){for(var b=b.slice(0),a=a.slice(0),c=0;c<b.length;c++)for(var d=0;d<a.length;d++)if(g(this.opts.id(b[c]),this.opts.id(a[d]))){b.splice(c,1),c--,a.splice(d,1);break}return{added:b,removed:a}},val:function(c,d){var e,f=this;if(0===arguments.length)return this.getVal();if(e=this.data(),e.length||(e=[]),!c&&0!==c)return this.opts.element.val(""),this.updateSelection([]),this.clearSearch(),void(d&&this.triggerChange({added:this.data(),removed:e}));if(this.setVal(c),this.select)this.opts.initSelection(this.select,this.bind(this.updateSelection)),d&&this.triggerChange(this.buildChangeDetails(e,this.data()));else{if(this.opts.initSelection===b)throw new Error("val() cannot be called if initSelection() is not defined");this.opts.initSelection(this.opts.element,function(b){var c=a.map(b,f.id);f.setVal(c),f.updateSelection(b),f.clearSearch(),d&&f.triggerChange(f.buildChangeDetails(e,f.data()))})}this.clearSearch()},onSortStart:function(){if(this.select)throw new Error("Sorting of elements is not supported when attached to <select>. Attach to <input type='hidden'/> instead.");this.search.width(0),this.searchContainer.hide()},onSortEnd:function(){var b=[],c=this;this.searchContainer.show(),this.searchContainer.appendTo(this.searchContainer.parent()),this.resizeSearch(),this.selection.find(".select2-search-choice").each(function(){b.push(c.opts.id(a(this).data("select2-data")))}),this.setVal(b),this.triggerChange()},data:function(b,c){var d,e,f=this;return 0===arguments.length?this.selection.children(".select2-search-choice").map(function(){return a(this).data("select2-data")}).get():(e=this.data(),b||(b=[]),d=a.map(b,function(a){return f.opts.id(a)}),this.setVal(d),this.updateSelection(b),this.clearSearch(),c&&this.triggerChange(this.buildChangeDetails(e,this.data())),void 0)}}),a.fn.select2=function(){var c,d,f,g,h,i=Array.prototype.slice.call(arguments,0),j=["val","destroy","opened","open","close","focus","isFocused","container","dropdown","onSortStart","onSortEnd","enable","disable","readonly","positionDropdown","data","search"],k=["opened","isFocused","container","dropdown"],l=["val","data"],m={search:"externalSearch"};return this.each(function(){if(0===i.length||"object"==typeof i[0])c=0===i.length?{}:a.extend({},i[0]),c.element=a(this),"select"===c.element.get(0).tagName.toLowerCase()?h=c.element.prop("multiple"):(h=c.multiple||!1,"tags"in c&&(c.multiple=h=!0)),d=h?new window.Select2["class"].multi:new window.Select2["class"].single,d.init(c);else{if("string"!=typeof i[0])throw"Invalid arguments to select2 plugin: "+i;if(e(i[0],j)<0)throw"Unknown method: "+i[0];if(g=b,d=a(this).data("select2"),d===b)return;if(f=i[0],"container"===f?g=d.container:"dropdown"===f?g=d.dropdown:(m[f]&&(f=m[f]),g=d[f].apply(d,i.slice(1))),e(i[0],k)>=0||e(i[0],l)>=0&&1==i.length)return!1}}),g===b?this:g},a.fn.select2.defaults={debug:!1,width:"copy",loadMorePadding:0,closeOnSelect:!0,openOnEnter:!0,containerCss:{},dropdownCss:{},containerCssClass:"",dropdownCssClass:"",formatResult:function(a,b,c,d){var e=[];return t(this.text(a),c.term,e,d),e.join("")},transformVal:function(b){return a.trim(b)},formatSelection:function(a,c,d){return a?d(this.text(a)):b},sortResults:function(a,b,c){return a},formatResultCssClass:function(a){return a.css},formatSelectionCssClass:function(a,c){return b},minimumResultsForSearch:0,minimumInputLength:0,maximumInputLength:null,maximumSelectionSize:0,id:function(a){return a==b?null:a.id},text:function(b){return b&&this.data&&this.data.text?a.isFunction(this.data.text)?this.data.text(b):b[this.data.text]:b.text},matcher:function(a,b){return d(""+b).toUpperCase().indexOf(d(""+a).toUpperCase())>=0},separator:",",tokenSeparators:[],tokenizer:B,escapeMarkup:u,blurOnChange:!1,selectOnBlur:!1,adaptContainerCssClass:function(a){return a},adaptDropdownCssClass:function(a){return null},nextSearchTerm:function(a,c){return b},searchInputPlaceholder:"",createSearchChoicePosition:"top",shouldFocusInput:function(a){var b="ontouchstart"in window||navigator.msMaxTouchPoints>0;return b&&a.opts.minimumResultsForSearch<0?!1:!0}},a.fn.select2.locales=[],a.fn.select2.locales.en={formatMatches:function(a){
-return 1===a?"One result is available, press enter to select it.":a+" results are available, use up and down arrow keys to navigate."},formatNoMatches:function(){return"No matches found"},formatAjaxError:function(a,b,c){return"Loading failed"},formatInputTooShort:function(a,b){var c=b-a.length;return"Please enter "+c+" or more character"+(1==c?"":"s")},formatInputTooLong:function(a,b){var c=a.length-b;return"Please delete "+c+" character"+(1==c?"":"s")},formatSelectionTooBig:function(a){return"You can only select "+a+" item"+(1==a?"":"s")},formatLoadMore:function(a){return"Loading more results…"},formatSearching:function(){return"Searching…"}},a.extend(a.fn.select2.defaults,a.fn.select2.locales.en),a.fn.select2.ajaxDefaults={transport:a.ajax,params:{type:"GET",cache:!1,dataType:"json"}},window.Select2={query:{ajax:v,local:w,tags:x},util:{debounce:l,markMatch:t,escapeMarkup:u,stripDiacritics:d},"class":{"abstract":E,single:F,multi:G}}}}(jQuery);
\ No newline at end of file
+/*!
+ * Select2 4.0.3
+ * https://select2.github.io
+ *
+ * Released under the MIT license
+ * https://github.com/select2/select2/blob/master/LICENSE.md
+ */
+!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):a("object"==typeof exports?require("jquery"):jQuery)}(function(a){var b=function(){if(a&&a.fn&&a.fn.select2&&a.fn.select2.amd)var b=a.fn.select2.amd;var b;return function(){if(!b||!b.requirejs){b?c=b:b={};var a,c,d;!function(b){function e(a,b){return u.call(a,b)}function f(a,b){var c,d,e,f,g,h,i,j,k,l,m,n=b&&b.split("/"),o=s.map,p=o&&o["*"]||{};if(a&&"."===a.charAt(0))if(b){for(a=a.split("/"),g=a.length-1,s.nodeIdCompat&&w.test(a[g])&&(a[g]=a[g].replace(w,"")),a=n.slice(0,n.length-1).concat(a),k=0;k<a.length;k+=1)if(m=a[k],"."===m)a.splice(k,1),k-=1;else if(".."===m){if(1===k&&(".."===a[2]||".."===a[0]))break;k>0&&(a.splice(k-1,2),k-=2)}a=a.join("/")}else 0===a.indexOf("./")&&(a=a.substring(2));if((n||p)&&o){for(c=a.split("/"),k=c.length;k>0;k-=1){if(d=c.slice(0,k).join("/"),n)for(l=n.length;l>0;l-=1)if(e=o[n.slice(0,l).join("/")],e&&(e=e[d])){f=e,h=k;break}if(f)break;!i&&p&&p[d]&&(i=p[d],j=k)}!f&&i&&(f=i,h=j),f&&(c.splice(0,h,f),a=c.join("/"))}return a}function g(a,c){return function(){var d=v.call(arguments,0);return"string"!=typeof d[0]&&1===d.length&&d.push(null),n.apply(b,d.concat([a,c]))}}function h(a){return function(b){return f(b,a)}}function i(a){return function(b){q[a]=b}}function j(a){if(e(r,a)){var c=r[a];delete r[a],t[a]=!0,m.apply(b,c)}if(!e(q,a)&&!e(t,a))throw new Error("No "+a);return q[a]}function k(a){var b,c=a?a.indexOf("!"):-1;return c>-1&&(b=a.substring(0,c),a=a.substring(c+1,a.length)),[b,a]}function l(a){return function(){return s&&s.config&&s.config[a]||{}}}var m,n,o,p,q={},r={},s={},t={},u=Object.prototype.hasOwnProperty,v=[].slice,w=/\.js$/;o=function(a,b){var c,d=k(a),e=d[0];return a=d[1],e&&(e=f(e,b),c=j(e)),e?a=c&&c.normalize?c.normalize(a,h(b)):f(a,b):(a=f(a,b),d=k(a),e=d[0],a=d[1],e&&(c=j(e))),{f:e?e+"!"+a:a,n:a,pr:e,p:c}},p={require:function(a){return g(a)},exports:function(a){var b=q[a];return"undefined"!=typeof b?b:q[a]={}},module:function(a){return{id:a,uri:"",exports:q[a],config:l(a)}}},m=function(a,c,d,f){var h,k,l,m,n,s,u=[],v=typeof d;if(f=f||a,"undefined"===v||"function"===v){for(c=!c.length&&d.length?["require","exports","module"]:c,n=0;n<c.length;n+=1)if(m=o(c[n],f),k=m.f,"require"===k)u[n]=p.require(a);else if("exports"===k)u[n]=p.exports(a),s=!0;else if("module"===k)h=u[n]=p.module(a);else if(e(q,k)||e(r,k)||e(t,k))u[n]=j(k);else{if(!m.p)throw new Error(a+" missing "+k);m.p.load(m.n,g(f,!0),i(k),{}),u[n]=q[k]}l=d?d.apply(q[a],u):void 0,a&&(h&&h.exports!==b&&h.exports!==q[a]?q[a]=h.exports:l===b&&s||(q[a]=l))}else a&&(q[a]=d)},a=c=n=function(a,c,d,e,f){if("string"==typeof a)return p[a]?p[a](c):j(o(a,c).f);if(!a.splice){if(s=a,s.deps&&n(s.deps,s.callback),!c)return;c.splice?(a=c,c=d,d=null):a=b}return c=c||function(){},"function"==typeof d&&(d=e,e=f),e?m(b,a,c,d):setTimeout(function(){m(b,a,c,d)},4),n},n.config=function(a){return n(a)},a._defined=q,d=function(a,b,c){if("string"!=typeof a)throw new Error("See almond README: incorrect module build, no module name");b.splice||(c=b,b=[]),e(q,a)||e(r,a)||(r[a]=[a,b,c])},d.amd={jQuery:!0}}(),b.requirejs=a,b.require=c,b.define=d}}(),b.define("almond",function(){}),b.define("jquery",[],function(){var b=a||$;return null==b&&console&&console.error&&console.error("Select2: An instance of jQuery or a jQuery-compatible library was not found. Make sure that you are including jQuery before Select2 on your web page."),b}),b.define("select2/utils",["jquery"],function(a){function b(a){var b=a.prototype,c=[];for(var d in b){var e=b[d];"function"==typeof e&&"constructor"!==d&&c.push(d)}return c}var c={};c.Extend=function(a,b){function c(){this.constructor=a}var d={}.hasOwnProperty;for(var e in b)d.call(b,e)&&(a[e]=b[e]);return c.prototype=b.prototype,a.prototype=new c,a.__super__=b.prototype,a},c.Decorate=function(a,c){function d(){var b=Array.prototype.unshift,d=c.prototype.constructor.length,e=a.prototype.constructor;d>0&&(b.call(arguments,a.prototype.constructor),e=c.prototype.constructor),e.apply(this,arguments)}function e(){this.constructor=d}var f=b(c),g=b(a);c.displayName=a.displayName,d.prototype=new e;for(var h=0;h<g.length;h++){var i=g[h];d.prototype[i]=a.prototype[i]}for(var j=(function(a){var b=function(){};a in d.prototype&&(b=d.prototype[a]);var e=c.prototype[a];return function(){var a=Array.prototype.unshift;return a.call(arguments,b),e.apply(this,arguments)}}),k=0;k<f.length;k++){var l=f[k];d.prototype[l]=j(l)}return d};var d=function(){this.listeners={}};return d.prototype.on=function(a,b){this.listeners=this.listeners||{},a in this.listeners?this.listeners[a].push(b):this.listeners[a]=[b]},d.prototype.trigger=function(a){var b=Array.prototype.slice,c=b.call(arguments,1);this.listeners=this.listeners||{},null==c&&(c=[]),0===c.length&&c.push({}),c[0]._type=a,a in this.listeners&&this.invoke(this.listeners[a],b.call(arguments,1)),"*"in this.listeners&&this.invoke(this.listeners["*"],arguments)},d.prototype.invoke=function(a,b){for(var c=0,d=a.length;c<d;c++)a[c].apply(this,b)},c.Observable=d,c.generateChars=function(a){for(var b="",c=0;c<a;c++){var d=Math.floor(36*Math.random());b+=d.toString(36)}return b},c.bind=function(a,b){return function(){a.apply(b,arguments)}},c._convertData=function(a){for(var b in a){var c=b.split("-"),d=a;if(1!==c.length){for(var e=0;e<c.length;e++){var f=c[e];f=f.substring(0,1).toLowerCase()+f.substring(1),f in d||(d[f]={}),e==c.length-1&&(d[f]=a[b]),d=d[f]}delete a[b]}}return a},c.hasScroll=function(b,c){var d=a(c),e=c.style.overflowX,f=c.style.overflowY;return(e!==f||"hidden"!==f&&"visible"!==f)&&("scroll"===e||"scroll"===f||(d.innerHeight()<c.scrollHeight||d.innerWidth()<c.scrollWidth))},c.escapeMarkup=function(a){var b={"\\":"&#92;","&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#47;"};return"string"!=typeof a?a:String(a).replace(/[&<>"'\/\\]/g,function(a){return b[a]})},c.appendMany=function(b,c){if("1.7"===a.fn.jquery.substr(0,3)){var d=a();a.map(c,function(a){d=d.add(a)}),c=d}b.append(c)},c}),b.define("select2/results",["jquery","./utils"],function(a,b){function c(a,b,d){this.$element=a,this.data=d,this.options=b,c.__super__.constructor.call(this)}return b.Extend(c,b.Observable),c.prototype.render=function(){var b=a('<ul class="select2-results__options" role="tree"></ul>');return this.options.get("multiple")&&b.attr("aria-multiselectable","true"),this.$results=b,b},c.prototype.clear=function(){this.$results.empty()},c.prototype.displayMessage=function(b){var c=this.options.get("escapeMarkup");this.clear(),this.hideLoading();var d=a('<li role="treeitem" aria-live="assertive" class="select2-results__option"></li>'),e=this.options.get("translations").get(b.message);d.append(c(e(b.args))),d[0].className+=" select2-results__message",this.$results.append(d)},c.prototype.hideMessages=function(){this.$results.find(".select2-results__message").remove()},c.prototype.append=function(a){this.hideLoading();var b=[];if(null==a.results||0===a.results.length)return void(0===this.$results.children().length&&this.trigger("results:message",{message:"noResults"}));a.results=this.sort(a.results);for(var c=0;c<a.results.length;c++){var d=a.results[c],e=this.option(d);b.push(e)}this.$results.append(b)},c.prototype.position=function(a,b){var c=b.find(".select2-results");c.append(a)},c.prototype.sort=function(a){var b=this.options.get("sorter");return b(a)},c.prototype.highlightFirstItem=function(){var a=this.$results.find(".select2-results__option[aria-selected]"),b=a.filter("[aria-selected=true]");b.length>0?b.first().trigger("mouseenter"):a.first().trigger("mouseenter"),this.ensureHighlightVisible()},c.prototype.setClasses=function(){var b=this;this.data.current(function(c){var d=a.map(c,function(a){return a.id.toString()}),e=b.$results.find(".select2-results__option[aria-selected]");e.each(function(){var b=a(this),c=a.data(this,"data"),e=""+c.id;null!=c.element&&c.element.selected||null==c.element&&a.inArray(e,d)>-1?b.attr("aria-selected","true"):b.attr("aria-selected","false")})})},c.prototype.showLoading=function(a){this.hideLoading();var b=this.options.get("translations").get("searching"),c={disabled:!0,loading:!0,text:b(a)},d=this.option(c);d.className+=" loading-results",this.$results.prepend(d)},c.prototype.hideLoading=function(){this.$results.find(".loading-results").remove()},c.prototype.option=function(b){var c=document.createElement("li");c.className="select2-results__option";var d={role:"treeitem","aria-selected":"false"};b.disabled&&(delete d["aria-selected"],d["aria-disabled"]="true"),null==b.id&&delete d["aria-selected"],null!=b._resultId&&(c.id=b._resultId),b.title&&(c.title=b.title),b.children&&(d.role="group",d["aria-label"]=b.text,delete d["aria-selected"]);for(var e in d){var f=d[e];c.setAttribute(e,f)}if(b.children){var g=a(c),h=document.createElement("strong");h.className="select2-results__group";a(h);this.template(b,h);for(var i=[],j=0;j<b.children.length;j++){var k=b.children[j],l=this.option(k);i.push(l)}var m=a("<ul></ul>",{class:"select2-results__options select2-results__options--nested"});m.append(i),g.append(h),g.append(m)}else this.template(b,c);return a.data(c,"data",b),c},c.prototype.bind=function(b,c){var d=this,e=b.id+"-results";this.$results.attr("id",e),b.on("results:all",function(a){d.clear(),d.append(a.data),b.isOpen()&&(d.setClasses(),d.highlightFirstItem())}),b.on("results:append",function(a){d.append(a.data),b.isOpen()&&d.setClasses()}),b.on("query",function(a){d.hideMessages(),d.showLoading(a)}),b.on("select",function(){b.isOpen()&&(d.setClasses(),d.highlightFirstItem())}),b.on("unselect",function(){b.isOpen()&&(d.setClasses(),d.highlightFirstItem())}),b.on("open",function(){d.$results.attr("aria-expanded","true"),d.$results.attr("aria-hidden","false"),d.setClasses(),d.ensureHighlightVisible()}),b.on("close",function(){d.$results.attr("aria-expanded","false"),d.$results.attr("aria-hidden","true"),d.$results.removeAttr("aria-activedescendant")}),b.on("results:toggle",function(){var a=d.getHighlightedResults();0!==a.length&&a.trigger("mouseup")}),b.on("results:select",function(){var a=d.getHighlightedResults();if(0!==a.length){var b=a.data("data");"true"==a.attr("aria-selected")?d.trigger("close",{}):d.trigger("select",{data:b})}}),b.on("results:previous",function(){var a=d.getHighlightedResults(),b=d.$results.find("[aria-selected]"),c=b.index(a);if(0!==c){var e=c-1;0===a.length&&(e=0);var f=b.eq(e);f.trigger("mouseenter");var g=d.$results.offset().top,h=f.offset().top,i=d.$results.scrollTop()+(h-g);0===e?d.$results.scrollTop(0):h-g<0&&d.$results.scrollTop(i)}}),b.on("results:next",function(){var a=d.getHighlightedResults(),b=d.$results.find("[aria-selected]"),c=b.index(a),e=c+1;if(!(e>=b.length)){var f=b.eq(e);f.trigger("mouseenter");var g=d.$results.offset().top+d.$results.outerHeight(!1),h=f.offset().top+f.outerHeight(!1),i=d.$results.scrollTop()+h-g;0===e?d.$results.scrollTop(0):h>g&&d.$results.scrollTop(i)}}),b.on("results:focus",function(a){a.element.addClass("select2-results__option--highlighted")}),b.on("results:message",function(a){d.displayMessage(a)}),a.fn.mousewheel&&this.$results.on("mousewheel",function(a){var b=d.$results.scrollTop(),c=d.$results.get(0).scrollHeight-b+a.deltaY,e=a.deltaY>0&&b-a.deltaY<=0,f=a.deltaY<0&&c<=d.$results.height();e?(d.$results.scrollTop(0),a.preventDefault(),a.stopPropagation()):f&&(d.$results.scrollTop(d.$results.get(0).scrollHeight-d.$results.height()),a.preventDefault(),a.stopPropagation())}),this.$results.on("mouseup",".select2-results__option[aria-selected]",function(b){var c=a(this),e=c.data("data");return"true"===c.attr("aria-selected")?void(d.options.get("multiple")?d.trigger("unselect",{originalEvent:b,data:e}):d.trigger("close",{})):void d.trigger("select",{originalEvent:b,data:e})}),this.$results.on("mouseenter",".select2-results__option[aria-selected]",function(b){var c=a(this).data("data");d.getHighlightedResults().removeClass("select2-results__option--highlighted"),d.trigger("results:focus",{data:c,element:a(this)})})},c.prototype.getHighlightedResults=function(){var a=this.$results.find(".select2-results__option--highlighted");return a},c.prototype.destroy=function(){this.$results.remove()},c.prototype.ensureHighlightVisible=function(){var a=this.getHighlightedResults();if(0!==a.length){var b=this.$results.find("[aria-selected]"),c=b.index(a),d=this.$results.offset().top,e=a.offset().top,f=this.$results.scrollTop()+(e-d),g=e-d;f-=2*a.outerHeight(!1),c<=2?this.$results.scrollTop(0):(g>this.$results.outerHeight()||g<0)&&this.$results.scrollTop(f)}},c.prototype.template=function(b,c){var d=this.options.get("templateResult"),e=this.options.get("escapeMarkup"),f=d(b,c);null==f?c.style.display="none":"string"==typeof f?c.innerHTML=e(f):a(c).append(f)},c}),b.define("select2/keys",[],function(){var a={BACKSPACE:8,TAB:9,ENTER:13,SHIFT:16,CTRL:17,ALT:18,ESC:27,SPACE:32,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,LEFT:37,UP:38,RIGHT:39,DOWN:40,DELETE:46};return a}),b.define("select2/selection/base",["jquery","../utils","../keys"],function(a,b,c){function d(a,b){this.$element=a,this.options=b,d.__super__.constructor.call(this)}return b.Extend(d,b.Observable),d.prototype.render=function(){var b=a('<span class="select2-selection" role="combobox"  aria-haspopup="true" aria-expanded="false"></span>');return this._tabindex=0,null!=this.$element.data("old-tabindex")?this._tabindex=this.$element.data("old-tabindex"):null!=this.$element.attr("tabindex")&&(this._tabindex=this.$element.attr("tabindex")),b.attr("title",this.$element.attr("title")),b.attr("tabindex",this._tabindex),this.$selection=b,b},d.prototype.bind=function(a,b){var d=this,e=(a.id+"-container",a.id+"-results");this.container=a,this.$selection.on("focus",function(a){d.trigger("focus",a)}),this.$selection.on("blur",function(a){d._handleBlur(a)}),this.$selection.on("keydown",function(a){d.trigger("keypress",a),a.which===c.SPACE&&a.preventDefault()}),a.on("results:focus",function(a){d.$selection.attr("aria-activedescendant",a.data._resultId)}),a.on("selection:update",function(a){d.update(a.data)}),a.on("open",function(){d.$selection.attr("aria-expanded","true"),d.$selection.attr("aria-owns",e),d._attachCloseHandler(a)}),a.on("close",function(){d.$selection.attr("aria-expanded","false"),d.$selection.removeAttr("aria-activedescendant"),d.$selection.removeAttr("aria-owns"),d.$selection.focus(),d._detachCloseHandler(a)}),a.on("enable",function(){d.$selection.attr("tabindex",d._tabindex)}),a.on("disable",function(){d.$selection.attr("tabindex","-1")})},d.prototype._handleBlur=function(b){var c=this;window.setTimeout(function(){document.activeElement==c.$selection[0]||a.contains(c.$selection[0],document.activeElement)||c.trigger("blur",b)},1)},d.prototype._attachCloseHandler=function(b){a(document.body).on("mousedown.select2."+b.id,function(b){var c=a(b.target),d=c.closest(".select2"),e=a(".select2.select2-container--open");e.each(function(){var b=a(this);if(this!=d[0]){var c=b.data("element");c.select2("close")}})})},d.prototype._detachCloseHandler=function(b){a(document.body).off("mousedown.select2."+b.id)},d.prototype.position=function(a,b){var c=b.find(".selection");c.append(a)},d.prototype.destroy=function(){this._detachCloseHandler(this.container)},d.prototype.update=function(a){throw new Error("The `update` method must be defined in child classes.")},d}),b.define("select2/selection/single",["jquery","./base","../utils","../keys"],function(a,b,c,d){function e(){e.__super__.constructor.apply(this,arguments)}return c.Extend(e,b),e.prototype.render=function(){var a=e.__super__.render.call(this);return a.addClass("select2-selection--single"),a.html('<span class="select2-selection__rendered"></span><span class="select2-selection__arrow" role="presentation"><b role="presentation"></b></span>'),a},e.prototype.bind=function(a,b){var c=this;e.__super__.bind.apply(this,arguments);var d=a.id+"-container";this.$selection.find(".select2-selection__rendered").attr("id",d),this.$selection.attr("aria-labelledby",d),this.$selection.on("mousedown",function(a){1===a.which&&c.trigger("toggle",{originalEvent:a})}),this.$selection.on("focus",function(a){}),this.$selection.on("blur",function(a){}),a.on("focus",function(b){a.isOpen()||c.$selection.focus()}),a.on("selection:update",function(a){c.update(a.data)})},e.prototype.clear=function(){this.$selection.find(".select2-selection__rendered").empty()},e.prototype.display=function(a,b){var c=this.options.get("templateSelection"),d=this.options.get("escapeMarkup");return d(c(a,b))},e.prototype.selectionContainer=function(){return a("<span></span>")},e.prototype.update=function(a){if(0===a.length)return void this.clear();var b=a[0],c=this.$selection.find(".select2-selection__rendered"),d=this.display(b,c);c.empty().append(d),c.prop("title",b.title||b.text)},e}),b.define("select2/selection/multiple",["jquery","./base","../utils"],function(a,b,c){function d(a,b){d.__super__.constructor.apply(this,arguments)}return c.Extend(d,b),d.prototype.render=function(){var a=d.__super__.render.call(this);return a.addClass("select2-selection--multiple"),a.html('<ul class="select2-selection__rendered"></ul>'),a},d.prototype.bind=function(b,c){var e=this;d.__super__.bind.apply(this,arguments),this.$selection.on("click",function(a){e.trigger("toggle",{originalEvent:a})}),this.$selection.on("click",".select2-selection__choice__remove",function(b){if(!e.options.get("disabled")){var c=a(this),d=c.parent(),f=d.data("data");e.trigger("unselect",{originalEvent:b,data:f})}})},d.prototype.clear=function(){this.$selection.find(".select2-selection__rendered").empty()},d.prototype.display=function(a,b){var c=this.options.get("templateSelection"),d=this.options.get("escapeMarkup");return d(c(a,b))},d.prototype.selectionContainer=function(){var b=a('<li class="select2-selection__choice"><span class="select2-selection__choice__remove" role="presentation">&times;</span></li>');return b},d.prototype.update=function(a){if(this.clear(),0!==a.length){for(var b=[],d=0;d<a.length;d++){var e=a[d],f=this.selectionContainer(),g=this.display(e,f);f.append(g),f.prop("title",e.title||e.text),f.data("data",e),b.push(f)}var h=this.$selection.find(".select2-selection__rendered");c.appendMany(h,b)}},d}),b.define("select2/selection/placeholder",["../utils"],function(a){function b(a,b,c){this.placeholder=this.normalizePlaceholder(c.get("placeholder")),a.call(this,b,c)}return b.prototype.normalizePlaceholder=function(a,b){return"string"==typeof b&&(b={id:"",text:b}),b},b.prototype.createPlaceholder=function(a,b){var c=this.selectionContainer();return c.html(this.display(b)),c.addClass("select2-selection__placeholder").removeClass("select2-selection__choice"),c},b.prototype.update=function(a,b){var c=1==b.length&&b[0].id!=this.placeholder.id,d=b.length>1;if(d||c)return a.call(this,b);this.clear();var e=this.createPlaceholder(this.placeholder);this.$selection.find(".select2-selection__rendered").append(e)},b}),b.define("select2/selection/allowClear",["jquery","../keys"],function(a,b){function c(){}return c.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),null==this.placeholder&&this.options.get("debug")&&window.console&&console.error&&console.error("Select2: The `allowClear` option should be used in combination with the `placeholder` option."),this.$selection.on("mousedown",".select2-selection__clear",function(a){d._handleClear(a)}),b.on("keypress",function(a){d._handleKeyboardClear(a,b)})},c.prototype._handleClear=function(a,b){if(!this.options.get("disabled")){var c=this.$selection.find(".select2-selection__clear");if(0!==c.length){b.stopPropagation();for(var d=c.data("data"),e=0;e<d.length;e++){var f={data:d[e]};if(this.trigger("unselect",f),f.prevented)return}this.$element.val(this.placeholder.id).trigger("change"),this.trigger("toggle",{})}}},c.prototype._handleKeyboardClear=function(a,c,d){d.isOpen()||c.which!=b.DELETE&&c.which!=b.BACKSPACE||this._handleClear(c)},c.prototype.update=function(b,c){if(b.call(this,c),!(this.$selection.find(".select2-selection__placeholder").length>0||0===c.length)){var d=a('<span class="select2-selection__clear">&times;</span>');d.data("data",c),this.$selection.find(".select2-selection__rendered").prepend(d)}},c}),b.define("select2/selection/search",["jquery","../utils","../keys"],function(a,b,c){function d(a,b,c){a.call(this,b,c)}return d.prototype.render=function(b){var c=a('<li class="select2-search select2-search--inline"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" role="textbox" aria-autocomplete="list" /></li>');this.$searchContainer=c,this.$search=c.find("input");var d=b.call(this);return this._transferTabIndex(),d},d.prototype.bind=function(a,b,d){var e=this;a.call(this,b,d),b.on("open",function(){e.$search.trigger("focus")}),b.on("close",function(){e.$search.val(""),e.$search.removeAttr("aria-activedescendant"),e.$search.trigger("focus")}),b.on("enable",function(){e.$search.prop("disabled",!1),e._transferTabIndex()}),b.on("disable",function(){e.$search.prop("disabled",!0)}),b.on("focus",function(a){e.$search.trigger("focus")}),b.on("results:focus",function(a){e.$search.attr("aria-activedescendant",a.id)}),this.$selection.on("focusin",".select2-search--inline",function(a){e.trigger("focus",a)}),this.$selection.on("focusout",".select2-search--inline",function(a){e._handleBlur(a)}),this.$selection.on("keydown",".select2-search--inline",function(a){a.stopPropagation(),e.trigger("keypress",a),e._keyUpPrevented=a.isDefaultPrevented();var b=a.which;if(b===c.BACKSPACE&&""===e.$search.val()){var d=e.$searchContainer.prev(".select2-selection__choice");if(d.length>0){var f=d.data("data");e.searchRemoveChoice(f),a.preventDefault()}}});var f=document.documentMode,g=f&&f<=11;this.$selection.on("input.searchcheck",".select2-search--inline",function(a){return g?void e.$selection.off("input.search input.searchcheck"):void e.$selection.off("keyup.search")}),this.$selection.on("keyup.search input.search",".select2-search--inline",function(a){if(g&&"input"===a.type)return void e.$selection.off("input.search input.searchcheck");var b=a.which;b!=c.SHIFT&&b!=c.CTRL&&b!=c.ALT&&b!=c.TAB&&e.handleSearch(a)})},d.prototype._transferTabIndex=function(a){this.$search.attr("tabindex",this.$selection.attr("tabindex")),this.$selection.attr("tabindex","-1")},d.prototype.createPlaceholder=function(a,b){this.$search.attr("placeholder",b.text)},d.prototype.update=function(a,b){var c=this.$search[0]==document.activeElement;this.$search.attr("placeholder",""),a.call(this,b),this.$selection.find(".select2-selection__rendered").append(this.$searchContainer),this.resizeSearch(),c&&this.$search.focus()},d.prototype.handleSearch=function(){if(this.resizeSearch(),!this._keyUpPrevented){var a=this.$search.val();this.trigger("query",{term:a})}this._keyUpPrevented=!1},d.prototype.searchRemoveChoice=function(a,b){this.trigger("unselect",{data:b}),this.$search.val(b.text),this.handleSearch()},d.prototype.resizeSearch=function(){this.$search.css("width","25px");var a="";if(""!==this.$search.attr("placeholder"))a=this.$selection.find(".select2-selection__rendered").innerWidth();else{var b=this.$search.val().length+1;a=.75*b+"em"}this.$search.css("width",a)},d}),b.define("select2/selection/eventRelay",["jquery"],function(a){function b(){}return b.prototype.bind=function(b,c,d){var e=this,f=["open","opening","close","closing","select","selecting","unselect","unselecting"],g=["opening","closing","selecting","unselecting"];b.call(this,c,d),c.on("*",function(b,c){if(a.inArray(b,f)!==-1){c=c||{};var d=a.Event("select2:"+b,{params:c});e.$element.trigger(d),a.inArray(b,g)!==-1&&(c.prevented=d.isDefaultPrevented())}})},b}),b.define("select2/translation",["jquery","require"],function(a,b){function c(a){this.dict=a||{}}return c.prototype.all=function(){return this.dict},c.prototype.get=function(a){return this.dict[a]},c.prototype.extend=function(b){this.dict=a.extend({},b.all(),this.dict)},c._cache={},c.loadPath=function(a){if(!(a in c._cache)){var d=b(a);c._cache[a]=d}return new c(c._cache[a])},c}),b.define("select2/diacritics",[],function(){var a={"Ⓐ":"A","Ａ":"A","À":"A","Á":"A","Â":"A","Ầ":"A","Ấ":"A","Ẫ":"A","Ẩ":"A","Ã":"A","Ā":"A","Ă":"A","Ằ":"A","Ắ":"A","Ẵ":"A","Ẳ":"A","Ȧ":"A","Ǡ":"A","Ä":"A","Ǟ":"A","Ả":"A","Å":"A","Ǻ":"A","Ǎ":"A","Ȁ":"A","Ȃ":"A","Ạ":"A","Ậ":"A","Ặ":"A","Ḁ":"A","Ą":"A","Ⱥ":"A","Ɐ":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ⓑ":"B","Ｂ":"B","Ḃ":"B","Ḅ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","Ɓ":"B","Ⓒ":"C","Ｃ":"C","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","Ç":"C","Ḉ":"C","Ƈ":"C","Ȼ":"C","Ꜿ":"C","Ⓓ":"D","Ｄ":"D","Ḋ":"D","Ď":"D","Ḍ":"D","Ḑ":"D","Ḓ":"D","Ḏ":"D","Đ":"D","Ƌ":"D","Ɗ":"D","Ɖ":"D","Ꝺ":"D","DZ":"DZ","DŽ":"DZ","Dz":"Dz","Dž":"Dz","Ⓔ":"E","Ｅ":"E","È":"E","É":"E","Ê":"E","Ề":"E","Ế":"E","Ễ":"E","Ể":"E","Ẽ":"E","Ē":"E","Ḕ":"E","Ḗ":"E","Ĕ":"E","Ė":"E","Ë":"E","Ẻ":"E","Ě":"E","Ȅ":"E","Ȇ":"E","Ẹ":"E","Ệ":"E","Ȩ":"E","Ḝ":"E","Ę":"E","Ḙ":"E","Ḛ":"E","Ɛ":"E","Ǝ":"E","Ⓕ":"F","Ｆ":"F","Ḟ":"F","Ƒ":"F","Ꝼ":"F","Ⓖ":"G","Ｇ":"G","Ǵ":"G","Ĝ":"G","Ḡ":"G","Ğ":"G","Ġ":"G","Ǧ":"G","Ģ":"G","Ǥ":"G","Ɠ":"G","Ꞡ":"G","Ᵹ":"G","Ꝿ":"G","Ⓗ":"H","Ｈ":"H","Ĥ":"H","Ḣ":"H","Ḧ":"H","Ȟ":"H","Ḥ":"H","Ḩ":"H","Ḫ":"H","Ħ":"H","Ⱨ":"H","Ⱶ":"H","Ɥ":"H","Ⓘ":"I","Ｉ":"I","Ì":"I","Í":"I","Î":"I","Ĩ":"I","Ī":"I","Ĭ":"I","İ":"I","Ï":"I","Ḯ":"I","Ỉ":"I","Ǐ":"I","Ȉ":"I","Ȋ":"I","Ị":"I","Į":"I","Ḭ":"I","Ɨ":"I","Ⓙ":"J","Ｊ":"J","Ĵ":"J","Ɉ":"J","Ⓚ":"K","Ｋ":"K","Ḱ":"K","Ǩ":"K","Ḳ":"K","Ķ":"K","Ḵ":"K","Ƙ":"K","Ⱪ":"K","Ꝁ":"K","Ꝃ":"K","Ꝅ":"K","Ꞣ":"K","Ⓛ":"L","Ｌ":"L","Ŀ":"L","Ĺ":"L","Ľ":"L","Ḷ":"L","Ḹ":"L","Ļ":"L","Ḽ":"L","Ḻ":"L","Ł":"L","Ƚ":"L","Ɫ":"L","Ⱡ":"L","Ꝉ":"L","Ꝇ":"L","Ꞁ":"L","LJ":"LJ","Lj":"Lj","Ⓜ":"M","Ｍ":"M","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ɯ":"M","Ⓝ":"N","Ｎ":"N","Ǹ":"N","Ń":"N","Ñ":"N","Ṅ":"N","Ň":"N","Ṇ":"N","Ņ":"N","Ṋ":"N","Ṉ":"N","Ƞ":"N","Ɲ":"N","Ꞑ":"N","Ꞥ":"N","NJ":"NJ","Nj":"Nj","Ⓞ":"O","Ｏ":"O","Ò":"O","Ó":"O","Ô":"O","Ồ":"O","Ố":"O","Ỗ":"O","Ổ":"O","Õ":"O","Ṍ":"O","Ȭ":"O","Ṏ":"O","Ō":"O","Ṑ":"O","Ṓ":"O","Ŏ":"O","Ȯ":"O","Ȱ":"O","Ö":"O","Ȫ":"O","Ỏ":"O","Ő":"O","Ǒ":"O","Ȍ":"O","Ȏ":"O","Ơ":"O","Ờ":"O","Ớ":"O","Ỡ":"O","Ở":"O","Ợ":"O","Ọ":"O","Ộ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Ɔ":"O","Ɵ":"O","Ꝋ":"O","Ꝍ":"O","Ƣ":"OI","Ꝏ":"OO","Ȣ":"OU","Ⓟ":"P","Ｐ":"P","Ṕ":"P","Ṗ":"P","Ƥ":"P","Ᵽ":"P","Ꝑ":"P","Ꝓ":"P","Ꝕ":"P","Ⓠ":"Q","Ｑ":"Q","Ꝗ":"Q","Ꝙ":"Q","Ɋ":"Q","Ⓡ":"R","Ｒ":"R","Ŕ":"R","Ṙ":"R","Ř":"R","Ȑ":"R","Ȓ":"R","Ṛ":"R","Ṝ":"R","Ŗ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","Ꝛ":"R","Ꞧ":"R","Ꞃ":"R","Ⓢ":"S","Ｓ":"S","ẞ":"S","Ś":"S","Ṥ":"S","Ŝ":"S","Ṡ":"S","Š":"S","Ṧ":"S","Ṣ":"S","Ṩ":"S","Ș":"S","Ş":"S","Ȿ":"S","Ꞩ":"S","Ꞅ":"S","Ⓣ":"T","Ｔ":"T","Ṫ":"T","Ť":"T","Ṭ":"T","Ț":"T","Ţ":"T","Ṱ":"T","Ṯ":"T","Ŧ":"T","Ƭ":"T","Ʈ":"T","Ⱦ":"T","Ꞇ":"T","Ꜩ":"TZ","Ⓤ":"U","Ｕ":"U","Ù":"U","Ú":"U","Û":"U","Ũ":"U","Ṹ":"U","Ū":"U","Ṻ":"U","Ŭ":"U","Ü":"U","Ǜ":"U","Ǘ":"U","Ǖ":"U","Ǚ":"U","Ủ":"U","Ů":"U","Ű":"U","Ǔ":"U","Ȕ":"U","Ȗ":"U","Ư":"U","Ừ":"U","Ứ":"U","Ữ":"U","Ử":"U","Ự":"U","Ụ":"U","Ṳ":"U","Ų":"U","Ṷ":"U","Ṵ":"U","Ʉ":"U","Ⓥ":"V","Ｖ":"V","Ṽ":"V","Ṿ":"V","Ʋ":"V","Ꝟ":"V","Ʌ":"V","Ꝡ":"VY","Ⓦ":"W","Ｗ":"W","Ẁ":"W","Ẃ":"W","Ŵ":"W","Ẇ":"W","Ẅ":"W","Ẉ":"W","Ⱳ":"W","Ⓧ":"X","Ｘ":"X","Ẋ":"X","Ẍ":"X","Ⓨ":"Y","Ｙ":"Y","Ỳ":"Y","Ý":"Y","Ŷ":"Y","Ỹ":"Y","Ȳ":"Y","Ẏ":"Y","Ÿ":"Y","Ỷ":"Y","Ỵ":"Y","Ƴ":"Y","Ɏ":"Y","Ỿ":"Y","Ⓩ":"Z","Ｚ":"Z","Ź":"Z","Ẑ":"Z","Ż":"Z","Ž":"Z","Ẓ":"Z","Ẕ":"Z","Ƶ":"Z","Ȥ":"Z","Ɀ":"Z","Ⱬ":"Z","Ꝣ":"Z","ⓐ":"a","ａ":"a","ẚ":"a","à":"a","á":"a","â":"a","ầ":"a","ấ":"a","ẫ":"a","ẩ":"a","ã":"a","ā":"a","ă":"a","ằ":"a","ắ":"a","ẵ":"a","ẳ":"a","ȧ":"a","ǡ":"a","ä":"a","ǟ":"a","ả":"a","å":"a","ǻ":"a","ǎ":"a","ȁ":"a","ȃ":"a","ạ":"a","ậ":"a","ặ":"a","ḁ":"a","ą":"a","ⱥ":"a","ɐ":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ⓑ":"b","ｂ":"b","ḃ":"b","ḅ":"b","ḇ":"b","ƀ":"b","ƃ":"b","ɓ":"b","ⓒ":"c","ｃ":"c","ć":"c","ĉ":"c","ċ":"c","č":"c","ç":"c","ḉ":"c","ƈ":"c","ȼ":"c","ꜿ":"c","ↄ":"c","ⓓ":"d","ｄ":"d","ḋ":"d","ď":"d","ḍ":"d","ḑ":"d","ḓ":"d","ḏ":"d","đ":"d","ƌ":"d","ɖ":"d","ɗ":"d","ꝺ":"d","dz":"dz","dž":"dz","ⓔ":"e","ｅ":"e","è":"e","é":"e","ê":"e","ề":"e","ế":"e","ễ":"e","ể":"e","ẽ":"e","ē":"e","ḕ":"e","ḗ":"e","ĕ":"e","ė":"e","ë":"e","ẻ":"e","ě":"e","ȅ":"e","ȇ":"e","ẹ":"e","ệ":"e","ȩ":"e","ḝ":"e","ę":"e","ḙ":"e","ḛ":"e","ɇ":"e","ɛ":"e","ǝ":"e","ⓕ":"f","ｆ":"f","ḟ":"f","ƒ":"f","ꝼ":"f","ⓖ":"g","ｇ":"g","ǵ":"g","ĝ":"g","ḡ":"g","ğ":"g","ġ":"g","ǧ":"g","ģ":"g","ǥ":"g","ɠ":"g","ꞡ":"g","ᵹ":"g","ꝿ":"g","ⓗ":"h","ｈ":"h","ĥ":"h","ḣ":"h","ḧ":"h","ȟ":"h","ḥ":"h","ḩ":"h","ḫ":"h","ẖ":"h","ħ":"h","ⱨ":"h","ⱶ":"h","ɥ":"h","ƕ":"hv","ⓘ":"i","ｉ":"i","ì":"i","í":"i","î":"i","ĩ":"i","ī":"i","ĭ":"i","ï":"i","ḯ":"i","ỉ":"i","ǐ":"i","ȉ":"i","ȋ":"i","ị":"i","į":"i","ḭ":"i","ɨ":"i","ı":"i","ⓙ":"j","ｊ":"j","ĵ":"j","ǰ":"j","ɉ":"j","ⓚ":"k","ｋ":"k","ḱ":"k","ǩ":"k","ḳ":"k","ķ":"k","ḵ":"k","ƙ":"k","ⱪ":"k","ꝁ":"k","ꝃ":"k","ꝅ":"k","ꞣ":"k","ⓛ":"l","ｌ":"l","ŀ":"l","ĺ":"l","ľ":"l","ḷ":"l","ḹ":"l","ļ":"l","ḽ":"l","ḻ":"l","ſ":"l","ł":"l","ƚ":"l","ɫ":"l","ⱡ":"l","ꝉ":"l","ꞁ":"l","ꝇ":"l","lj":"lj","ⓜ":"m","ｍ":"m","ḿ":"m","ṁ":"m","ṃ":"m","ɱ":"m","ɯ":"m","ⓝ":"n","ｎ":"n","ǹ":"n","ń":"n","ñ":"n","ṅ":"n","ň":"n","ṇ":"n","ņ":"n","ṋ":"n","ṉ":"n","ƞ":"n","ɲ":"n","ʼn":"n","ꞑ":"n","ꞥ":"n","nj":"nj","ⓞ":"o","ｏ":"o","ò":"o","ó":"o","ô":"o","ồ":"o","ố":"o","ỗ":"o","ổ":"o","õ":"o","ṍ":"o","ȭ":"o","ṏ":"o","ō":"o","ṑ":"o","ṓ":"o","ŏ":"o","ȯ":"o","ȱ":"o","ö":"o","ȫ":"o","ỏ":"o","ő":"o","ǒ":"o","ȍ":"o","ȏ":"o","ơ":"o","ờ":"o","ớ":"o","ỡ":"o","ở":"o","ợ":"o","ọ":"o","ộ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","ɔ":"o","ꝋ":"o","ꝍ":"o","ɵ":"o","ƣ":"oi","ȣ":"ou","ꝏ":"oo","ⓟ":"p","ｐ":"p","ṕ":"p","ṗ":"p","ƥ":"p","ᵽ":"p","ꝑ":"p","ꝓ":"p","ꝕ":"p","ⓠ":"q","ｑ":"q","ɋ":"q","ꝗ":"q","ꝙ":"q","ⓡ":"r","ｒ":"r","ŕ":"r","ṙ":"r","ř":"r","ȑ":"r","ȓ":"r","ṛ":"r","ṝ":"r","ŗ":"r","ṟ":"r","ɍ":"r","ɽ":"r","ꝛ":"r","ꞧ":"r","ꞃ":"r","ⓢ":"s","ｓ":"s","ß":"s","ś":"s","ṥ":"s","ŝ":"s","ṡ":"s","š":"s","ṧ":"s","ṣ":"s","ṩ":"s","ș":"s","ş":"s","ȿ":"s","ꞩ":"s","ꞅ":"s","ẛ":"s","ⓣ":"t","ｔ":"t","ṫ":"t","ẗ":"t","ť":"t","ṭ":"t","ț":"t","ţ":"t","ṱ":"t","ṯ":"t","ŧ":"t","ƭ":"t","ʈ":"t","ⱦ":"t","ꞇ":"t","ꜩ":"tz","ⓤ":"u","ｕ":"u","ù":"u","ú":"u","û":"u","ũ":"u","ṹ":"u","ū":"u","ṻ":"u","ŭ":"u","ü":"u","ǜ":"u","ǘ":"u","ǖ":"u","ǚ":"u","ủ":"u","ů":"u","ű":"u","ǔ":"u","ȕ":"u","ȗ":"u","ư":"u","ừ":"u","ứ":"u","ữ":"u","ử":"u","ự":"u","ụ":"u","ṳ":"u","ų":"u","ṷ":"u","ṵ":"u","ʉ":"u","ⓥ":"v","ｖ":"v","ṽ":"v","ṿ":"v","ʋ":"v","ꝟ":"v","ʌ":"v","ꝡ":"vy","ⓦ":"w","ｗ":"w","ẁ":"w","ẃ":"w","ŵ":"w","ẇ":"w","ẅ":"w","ẘ":"w","ẉ":"w","ⱳ":"w","ⓧ":"x","ｘ":"x","ẋ":"x","ẍ":"x","ⓨ":"y","ｙ":"y","ỳ":"y","ý":"y","ŷ":"y","ỹ":"y","ȳ":"y","ẏ":"y","ÿ":"y","ỷ":"y","ẙ":"y","ỵ":"y","ƴ":"y","ɏ":"y","ỿ":"y","ⓩ":"z","ｚ":"z","ź":"z","ẑ":"z","ż":"z","ž":"z","ẓ":"z","ẕ":"z","ƶ":"z","ȥ":"z","ɀ":"z","ⱬ":"z","ꝣ":"z","Ά":"Α","Έ":"Ε","Ή":"Η","Ί":"Ι","Ϊ":"Ι","Ό":"Ο","Ύ":"Υ","Ϋ":"Υ","Ώ":"Ω","ά":"α","έ":"ε","ή":"η","ί":"ι","ϊ":"ι","ΐ":"ι","ό":"ο","ύ":"υ","ϋ":"υ","ΰ":"υ","ω":"ω","ς":"σ"};return a}),b.define("select2/data/base",["../utils"],function(a){function b(a,c){b.__super__.constructor.call(this)}return a.Extend(b,a.Observable),b.prototype.current=function(a){throw new Error("The `current` method must be defined in child classes.")},b.prototype.query=function(a,b){throw new Error("The `query` method must be defined in child classes.")},b.prototype.bind=function(a,b){},b.prototype.destroy=function(){},b.prototype.generateResultId=function(b,c){var d=b.id+"-result-";return d+=a.generateChars(4),d+=null!=c.id?"-"+c.id.toString():"-"+a.generateChars(4)},b}),b.define("select2/data/select",["./base","../utils","jquery"],function(a,b,c){function d(a,b){this.$element=a,this.options=b,d.__super__.constructor.call(this)}return b.Extend(d,a),d.prototype.current=function(a){var b=[],d=this;this.$element.find(":selected").each(function(){var a=c(this),e=d.item(a);b.push(e)}),a(b)},d.prototype.select=function(a){var b=this;if(a.selected=!0,c(a.element).is("option"))return a.element.selected=!0,void this.$element.trigger("change");
+if(this.$element.prop("multiple"))this.current(function(d){var e=[];a=[a],a.push.apply(a,d);for(var f=0;f<a.length;f++){var g=a[f].id;c.inArray(g,e)===-1&&e.push(g)}b.$element.val(e),b.$element.trigger("change")});else{var d=a.id;this.$element.val(d),this.$element.trigger("change")}},d.prototype.unselect=function(a){var b=this;if(this.$element.prop("multiple"))return a.selected=!1,c(a.element).is("option")?(a.element.selected=!1,void this.$element.trigger("change")):void this.current(function(d){for(var e=[],f=0;f<d.length;f++){var g=d[f].id;g!==a.id&&c.inArray(g,e)===-1&&e.push(g)}b.$element.val(e),b.$element.trigger("change")})},d.prototype.bind=function(a,b){var c=this;this.container=a,a.on("select",function(a){c.select(a.data)}),a.on("unselect",function(a){c.unselect(a.data)})},d.prototype.destroy=function(){this.$element.find("*").each(function(){c.removeData(this,"data")})},d.prototype.query=function(a,b){var d=[],e=this,f=this.$element.children();f.each(function(){var b=c(this);if(b.is("option")||b.is("optgroup")){var f=e.item(b),g=e.matches(a,f);null!==g&&d.push(g)}}),b({results:d})},d.prototype.addOptions=function(a){b.appendMany(this.$element,a)},d.prototype.option=function(a){var b;a.children?(b=document.createElement("optgroup"),b.label=a.text):(b=document.createElement("option"),void 0!==b.textContent?b.textContent=a.text:b.innerText=a.text),a.id&&(b.value=a.id),a.disabled&&(b.disabled=!0),a.selected&&(b.selected=!0),a.title&&(b.title=a.title);var d=c(b),e=this._normalizeItem(a);return e.element=b,c.data(b,"data",e),d},d.prototype.item=function(a){var b={};if(b=c.data(a[0],"data"),null!=b)return b;if(a.is("option"))b={id:a.val(),text:a.text(),disabled:a.prop("disabled"),selected:a.prop("selected"),title:a.prop("title")};else if(a.is("optgroup")){b={text:a.prop("label"),children:[],title:a.prop("title")};for(var d=a.children("option"),e=[],f=0;f<d.length;f++){var g=c(d[f]),h=this.item(g);e.push(h)}b.children=e}return b=this._normalizeItem(b),b.element=a[0],c.data(a[0],"data",b),b},d.prototype._normalizeItem=function(a){c.isPlainObject(a)||(a={id:a,text:a}),a=c.extend({},{text:""},a);var b={selected:!1,disabled:!1};return null!=a.id&&(a.id=a.id.toString()),null!=a.text&&(a.text=a.text.toString()),null==a._resultId&&a.id&&null!=this.container&&(a._resultId=this.generateResultId(this.container,a)),c.extend({},b,a)},d.prototype.matches=function(a,b){var c=this.options.get("matcher");return c(a,b)},d}),b.define("select2/data/array",["./select","../utils","jquery"],function(a,b,c){function d(a,b){var c=b.get("data")||[];d.__super__.constructor.call(this,a,b),this.addOptions(this.convertToOptions(c))}return b.Extend(d,a),d.prototype.select=function(a){var b=this.$element.find("option").filter(function(b,c){return c.value==a.id.toString()});0===b.length&&(b=this.option(a),this.addOptions(b)),d.__super__.select.call(this,a)},d.prototype.convertToOptions=function(a){function d(a){return function(){return c(this).val()==a.id}}for(var e=this,f=this.$element.find("option"),g=f.map(function(){return e.item(c(this)).id}).get(),h=[],i=0;i<a.length;i++){var j=this._normalizeItem(a[i]);if(c.inArray(j.id,g)>=0){var k=f.filter(d(j)),l=this.item(k),m=c.extend(!0,{},j,l),n=this.option(m);k.replaceWith(n)}else{var o=this.option(j);if(j.children){var p=this.convertToOptions(j.children);b.appendMany(o,p)}h.push(o)}}return h},d}),b.define("select2/data/ajax",["./array","../utils","jquery"],function(a,b,c){function d(a,b){this.ajaxOptions=this._applyDefaults(b.get("ajax")),null!=this.ajaxOptions.processResults&&(this.processResults=this.ajaxOptions.processResults),d.__super__.constructor.call(this,a,b)}return b.Extend(d,a),d.prototype._applyDefaults=function(a){var b={data:function(a){return c.extend({},a,{q:a.term})},transport:function(a,b,d){var e=c.ajax(a);return e.then(b),e.fail(d),e}};return c.extend({},b,a,!0)},d.prototype.processResults=function(a){return a},d.prototype.query=function(a,b){function d(){var d=f.transport(f,function(d){var f=e.processResults(d,a);e.options.get("debug")&&window.console&&console.error&&(f&&f.results&&c.isArray(f.results)||console.error("Select2: The AJAX results did not return an array in the `results` key of the response.")),b(f)},function(){d.status&&"0"===d.status||e.trigger("results:message",{message:"errorLoading"})});e._request=d}var e=this;null!=this._request&&(c.isFunction(this._request.abort)&&this._request.abort(),this._request=null);var f=c.extend({type:"GET"},this.ajaxOptions);"function"==typeof f.url&&(f.url=f.url.call(this.$element,a)),"function"==typeof f.data&&(f.data=f.data.call(this.$element,a)),this.ajaxOptions.delay&&null!=a.term?(this._queryTimeout&&window.clearTimeout(this._queryTimeout),this._queryTimeout=window.setTimeout(d,this.ajaxOptions.delay)):d()},d}),b.define("select2/data/tags",["jquery"],function(a){function b(b,c,d){var e=d.get("tags"),f=d.get("createTag");void 0!==f&&(this.createTag=f);var g=d.get("insertTag");if(void 0!==g&&(this.insertTag=g),b.call(this,c,d),a.isArray(e))for(var h=0;h<e.length;h++){var i=e[h],j=this._normalizeItem(i),k=this.option(j);this.$element.append(k)}}return b.prototype.query=function(a,b,c){function d(a,f){for(var g=a.results,h=0;h<g.length;h++){var i=g[h],j=null!=i.children&&!d({results:i.children},!0),k=i.text===b.term;if(k||j)return!f&&(a.data=g,void c(a))}if(f)return!0;var l=e.createTag(b);if(null!=l){var m=e.option(l);m.attr("data-select2-tag",!0),e.addOptions([m]),e.insertTag(g,l)}a.results=g,c(a)}var e=this;return this._removeOldTags(),null==b.term||null!=b.page?void a.call(this,b,c):void a.call(this,b,d)},b.prototype.createTag=function(b,c){var d=a.trim(c.term);return""===d?null:{id:d,text:d}},b.prototype.insertTag=function(a,b,c){b.unshift(c)},b.prototype._removeOldTags=function(b){var c=(this._lastTag,this.$element.find("option[data-select2-tag]"));c.each(function(){this.selected||a(this).remove()})},b}),b.define("select2/data/tokenizer",["jquery"],function(a){function b(a,b,c){var d=c.get("tokenizer");void 0!==d&&(this.tokenizer=d),a.call(this,b,c)}return b.prototype.bind=function(a,b,c){a.call(this,b,c),this.$search=b.dropdown.$search||b.selection.$search||c.find(".select2-search__field")},b.prototype.query=function(b,c,d){function e(b){var c=g._normalizeItem(b),d=g.$element.find("option").filter(function(){return a(this).val()===c.id});if(!d.length){var e=g.option(c);e.attr("data-select2-tag",!0),g._removeOldTags(),g.addOptions([e])}f(c)}function f(a){g.trigger("select",{data:a})}var g=this;c.term=c.term||"";var h=this.tokenizer(c,this.options,e);h.term!==c.term&&(this.$search.length&&(this.$search.val(h.term),this.$search.focus()),c.term=h.term),b.call(this,c,d)},b.prototype.tokenizer=function(b,c,d,e){for(var f=d.get("tokenSeparators")||[],g=c.term,h=0,i=this.createTag||function(a){return{id:a.term,text:a.term}};h<g.length;){var j=g[h];if(a.inArray(j,f)!==-1){var k=g.substr(0,h),l=a.extend({},c,{term:k}),m=i(l);null!=m?(e(m),g=g.substr(h+1)||"",h=0):h++}else h++}return{term:g}},b}),b.define("select2/data/minimumInputLength",[],function(){function a(a,b,c){this.minimumInputLength=c.get("minimumInputLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){return b.term=b.term||"",b.term.length<this.minimumInputLength?void this.trigger("results:message",{message:"inputTooShort",args:{minimum:this.minimumInputLength,input:b.term,params:b}}):void a.call(this,b,c)},a}),b.define("select2/data/maximumInputLength",[],function(){function a(a,b,c){this.maximumInputLength=c.get("maximumInputLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){return b.term=b.term||"",this.maximumInputLength>0&&b.term.length>this.maximumInputLength?void this.trigger("results:message",{message:"inputTooLong",args:{maximum:this.maximumInputLength,input:b.term,params:b}}):void a.call(this,b,c)},a}),b.define("select2/data/maximumSelectionLength",[],function(){function a(a,b,c){this.maximumSelectionLength=c.get("maximumSelectionLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){var d=this;this.current(function(e){var f=null!=e?e.length:0;return d.maximumSelectionLength>0&&f>=d.maximumSelectionLength?void d.trigger("results:message",{message:"maximumSelected",args:{maximum:d.maximumSelectionLength}}):void a.call(d,b,c)})},a}),b.define("select2/dropdown",["jquery","./utils"],function(a,b){function c(a,b){this.$element=a,this.options=b,c.__super__.constructor.call(this)}return b.Extend(c,b.Observable),c.prototype.render=function(){var b=a('<span class="select2-dropdown"><span class="select2-results"></span></span>');return b.attr("dir",this.options.get("dir")),this.$dropdown=b,b},c.prototype.bind=function(){},c.prototype.position=function(a,b){},c.prototype.destroy=function(){this.$dropdown.remove()},c}),b.define("select2/dropdown/search",["jquery","../utils"],function(a,b){function c(){}return c.prototype.render=function(b){var c=b.call(this),d=a('<span class="select2-search select2-search--dropdown"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" role="textbox" /></span>');return this.$searchContainer=d,this.$search=d.find("input"),c.prepend(d),c},c.prototype.bind=function(b,c,d){var e=this;b.call(this,c,d),this.$search.on("keydown",function(a){e.trigger("keypress",a),e._keyUpPrevented=a.isDefaultPrevented()}),this.$search.on("input",function(b){a(this).off("keyup")}),this.$search.on("keyup input",function(a){e.handleSearch(a)}),c.on("open",function(){e.$search.attr("tabindex",0),e.$search.focus(),window.setTimeout(function(){e.$search.focus()},0)}),c.on("close",function(){e.$search.attr("tabindex",-1),e.$search.val("")}),c.on("focus",function(){c.isOpen()&&e.$search.focus()}),c.on("results:all",function(a){if(null==a.query.term||""===a.query.term){var b=e.showSearch(a);b?e.$searchContainer.removeClass("select2-search--hide"):e.$searchContainer.addClass("select2-search--hide")}})},c.prototype.handleSearch=function(a){if(!this._keyUpPrevented){var b=this.$search.val();this.trigger("query",{term:b})}this._keyUpPrevented=!1},c.prototype.showSearch=function(a,b){return!0},c}),b.define("select2/dropdown/hidePlaceholder",[],function(){function a(a,b,c,d){this.placeholder=this.normalizePlaceholder(c.get("placeholder")),a.call(this,b,c,d)}return a.prototype.append=function(a,b){b.results=this.removePlaceholder(b.results),a.call(this,b)},a.prototype.normalizePlaceholder=function(a,b){return"string"==typeof b&&(b={id:"",text:b}),b},a.prototype.removePlaceholder=function(a,b){for(var c=b.slice(0),d=b.length-1;d>=0;d--){var e=b[d];this.placeholder.id===e.id&&c.splice(d,1)}return c},a}),b.define("select2/dropdown/infiniteScroll",["jquery"],function(a){function b(a,b,c,d){this.lastParams={},a.call(this,b,c,d),this.$loadingMore=this.createLoadingMore(),this.loading=!1}return b.prototype.append=function(a,b){this.$loadingMore.remove(),this.loading=!1,a.call(this,b),this.showLoadingMore(b)&&this.$results.append(this.$loadingMore)},b.prototype.bind=function(b,c,d){var e=this;b.call(this,c,d),c.on("query",function(a){e.lastParams=a,e.loading=!0}),c.on("query:append",function(a){e.lastParams=a,e.loading=!0}),this.$results.on("scroll",function(){var b=a.contains(document.documentElement,e.$loadingMore[0]);if(!e.loading&&b){var c=e.$results.offset().top+e.$results.outerHeight(!1),d=e.$loadingMore.offset().top+e.$loadingMore.outerHeight(!1);c+50>=d&&e.loadMore()}})},b.prototype.loadMore=function(){this.loading=!0;var b=a.extend({},{page:1},this.lastParams);b.page++,this.trigger("query:append",b)},b.prototype.showLoadingMore=function(a,b){return b.pagination&&b.pagination.more},b.prototype.createLoadingMore=function(){var b=a('<li class="select2-results__option select2-results__option--load-more"role="treeitem" aria-disabled="true"></li>'),c=this.options.get("translations").get("loadingMore");return b.html(c(this.lastParams)),b},b}),b.define("select2/dropdown/attachBody",["jquery","../utils"],function(a,b){function c(b,c,d){this.$dropdownParent=d.get("dropdownParent")||a(document.body),b.call(this,c,d)}return c.prototype.bind=function(a,b,c){var d=this,e=!1;a.call(this,b,c),b.on("open",function(){d._showDropdown(),d._attachPositioningHandler(b),e||(e=!0,b.on("results:all",function(){d._positionDropdown(),d._resizeDropdown()}),b.on("results:append",function(){d._positionDropdown(),d._resizeDropdown()}))}),b.on("close",function(){d._hideDropdown(),d._detachPositioningHandler(b)}),this.$dropdownContainer.on("mousedown",function(a){a.stopPropagation()})},c.prototype.destroy=function(a){a.call(this),this.$dropdownContainer.remove()},c.prototype.position=function(a,b,c){b.attr("class",c.attr("class")),b.removeClass("select2"),b.addClass("select2-container--open"),b.css({position:"absolute",top:-999999}),this.$container=c},c.prototype.render=function(b){var c=a("<span></span>"),d=b.call(this);return c.append(d),this.$dropdownContainer=c,c},c.prototype._hideDropdown=function(a){this.$dropdownContainer.detach()},c.prototype._attachPositioningHandler=function(c,d){var e=this,f="scroll.select2."+d.id,g="resize.select2."+d.id,h="orientationchange.select2."+d.id,i=this.$container.parents().filter(b.hasScroll);i.each(function(){a(this).data("select2-scroll-position",{x:a(this).scrollLeft(),y:a(this).scrollTop()})}),i.on(f,function(b){var c=a(this).data("select2-scroll-position");a(this).scrollTop(c.y)}),a(window).on(f+" "+g+" "+h,function(a){e._positionDropdown(),e._resizeDropdown()})},c.prototype._detachPositioningHandler=function(c,d){var e="scroll.select2."+d.id,f="resize.select2."+d.id,g="orientationchange.select2."+d.id,h=this.$container.parents().filter(b.hasScroll);h.off(e),a(window).off(e+" "+f+" "+g)},c.prototype._positionDropdown=function(){var b=a(window),c=this.$dropdown.hasClass("select2-dropdown--above"),d=this.$dropdown.hasClass("select2-dropdown--below"),e=null,f=this.$container.offset();f.bottom=f.top+this.$container.outerHeight(!1);var g={height:this.$container.outerHeight(!1)};g.top=f.top,g.bottom=f.top+g.height;var h={height:this.$dropdown.outerHeight(!1)},i={top:b.scrollTop(),bottom:b.scrollTop()+b.height()},j=i.top<f.top-h.height,k=i.bottom>f.bottom+h.height,l={left:f.left,top:g.bottom},m=this.$dropdownParent;"static"===m.css("position")&&(m=m.offsetParent());var n=m.offset();l.top-=n.top,l.left-=n.left,c||d||(e="below"),k||!j||c?!j&&k&&c&&(e="below"):e="above",("above"==e||c&&"below"!==e)&&(l.top=g.top-n.top-h.height),null!=e&&(this.$dropdown.removeClass("select2-dropdown--below select2-dropdown--above").addClass("select2-dropdown--"+e),this.$container.removeClass("select2-container--below select2-container--above").addClass("select2-container--"+e)),this.$dropdownContainer.css(l)},c.prototype._resizeDropdown=function(){var a={width:this.$container.outerWidth(!1)+"px"};this.options.get("dropdownAutoWidth")&&(a.minWidth=a.width,a.position="relative",a.width="auto"),this.$dropdown.css(a)},c.prototype._showDropdown=function(a){this.$dropdownContainer.appendTo(this.$dropdownParent),this._positionDropdown(),this._resizeDropdown()},c}),b.define("select2/dropdown/minimumResultsForSearch",[],function(){function a(b){for(var c=0,d=0;d<b.length;d++){var e=b[d];e.children?c+=a(e.children):c++}return c}function b(a,b,c,d){this.minimumResultsForSearch=c.get("minimumResultsForSearch"),this.minimumResultsForSearch<0&&(this.minimumResultsForSearch=1/0),a.call(this,b,c,d)}return b.prototype.showSearch=function(b,c){return!(a(c.data.results)<this.minimumResultsForSearch)&&b.call(this,c)},b}),b.define("select2/dropdown/selectOnClose",[],function(){function a(){}return a.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),b.on("close",function(a){d._handleSelectOnClose(a)})},a.prototype._handleSelectOnClose=function(a,b){if(b&&null!=b.originalSelect2Event){var c=b.originalSelect2Event;if("select"===c._type||"unselect"===c._type)return}var d=this.getHighlightedResults();if(!(d.length<1)){var e=d.data("data");null!=e.element&&e.element.selected||null==e.element&&e.selected||this.trigger("select",{data:e})}},a}),b.define("select2/dropdown/closeOnSelect",[],function(){function a(){}return a.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),b.on("select",function(a){d._selectTriggered(a)}),b.on("unselect",function(a){d._selectTriggered(a)})},a.prototype._selectTriggered=function(a,b){var c=b.originalEvent;c&&c.ctrlKey||this.trigger("close",{originalEvent:c,originalSelect2Event:b})},a}),b.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(a){var b=a.input.length-a.maximum,c="Please delete "+b+" character";return 1!=b&&(c+="s"),c},inputTooShort:function(a){var b=a.minimum-a.input.length,c="Please enter "+b+" or more characters";return c},loadingMore:function(){return"Loading more results…"},maximumSelected:function(a){var b="You can only select "+a.maximum+" item";return 1!=a.maximum&&(b+="s"),b},noResults:function(){return"No results found"},searching:function(){return"Searching…"}}}),b.define("select2/defaults",["jquery","require","./results","./selection/single","./selection/multiple","./selection/placeholder","./selection/allowClear","./selection/search","./selection/eventRelay","./utils","./translation","./diacritics","./data/select","./data/array","./data/ajax","./data/tags","./data/tokenizer","./data/minimumInputLength","./data/maximumInputLength","./data/maximumSelectionLength","./dropdown","./dropdown/search","./dropdown/hidePlaceholder","./dropdown/infiniteScroll","./dropdown/attachBody","./dropdown/minimumResultsForSearch","./dropdown/selectOnClose","./dropdown/closeOnSelect","./i18n/en"],function(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C){function D(){this.reset()}D.prototype.apply=function(l){if(l=a.extend(!0,{},this.defaults,l),null==l.dataAdapter){if(null!=l.ajax?l.dataAdapter=o:null!=l.data?l.dataAdapter=n:l.dataAdapter=m,l.minimumInputLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,r)),l.maximumInputLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,s)),l.maximumSelectionLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,t)),l.tags&&(l.dataAdapter=j.Decorate(l.dataAdapter,p)),null==l.tokenSeparators&&null==l.tokenizer||(l.dataAdapter=j.Decorate(l.dataAdapter,q)),null!=l.query){var C=b(l.amdBase+"compat/query");l.dataAdapter=j.Decorate(l.dataAdapter,C)}if(null!=l.initSelection){var D=b(l.amdBase+"compat/initSelection");l.dataAdapter=j.Decorate(l.dataAdapter,D)}}if(null==l.resultsAdapter&&(l.resultsAdapter=c,null!=l.ajax&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,x)),null!=l.placeholder&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,w)),l.selectOnClose&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,A))),null==l.dropdownAdapter){if(l.multiple)l.dropdownAdapter=u;else{var E=j.Decorate(u,v);l.dropdownAdapter=E}if(0!==l.minimumResultsForSearch&&(l.dropdownAdapter=j.Decorate(l.dropdownAdapter,z)),l.closeOnSelect&&(l.dropdownAdapter=j.Decorate(l.dropdownAdapter,B)),null!=l.dropdownCssClass||null!=l.dropdownCss||null!=l.adaptDropdownCssClass){var F=b(l.amdBase+"compat/dropdownCss");l.dropdownAdapter=j.Decorate(l.dropdownAdapter,F)}l.dropdownAdapter=j.Decorate(l.dropdownAdapter,y)}if(null==l.selectionAdapter){if(l.multiple?l.selectionAdapter=e:l.selectionAdapter=d,null!=l.placeholder&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,f)),l.allowClear&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,g)),l.multiple&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,h)),null!=l.containerCssClass||null!=l.containerCss||null!=l.adaptContainerCssClass){var G=b(l.amdBase+"compat/containerCss");l.selectionAdapter=j.Decorate(l.selectionAdapter,G)}l.selectionAdapter=j.Decorate(l.selectionAdapter,i)}if("string"==typeof l.language)if(l.language.indexOf("-")>0){var H=l.language.split("-"),I=H[0];l.language=[l.language,I]}else l.language=[l.language];if(a.isArray(l.language)){var J=new k;l.language.push("en");for(var K=l.language,L=0;L<K.length;L++){var M=K[L],N={};try{N=k.loadPath(M)}catch(a){try{M=this.defaults.amdLanguageBase+M,N=k.loadPath(M)}catch(a){l.debug&&window.console&&console.warn&&console.warn('Select2: The language file for "'+M+'" could not be automatically loaded. A fallback will be used instead.');continue}}J.extend(N)}l.translations=J}else{var O=k.loadPath(this.defaults.amdLanguageBase+"en"),P=new k(l.language);P.extend(O),l.translations=P}return l},D.prototype.reset=function(){function b(a){function b(a){return l[a]||a}return a.replace(/[^\u0000-\u007E]/g,b)}function c(d,e){if(""===a.trim(d.term))return e;if(e.children&&e.children.length>0){for(var f=a.extend(!0,{},e),g=e.children.length-1;g>=0;g--){var h=e.children[g],i=c(d,h);null==i&&f.children.splice(g,1)}return f.children.length>0?f:c(d,f)}var j=b(e.text).toUpperCase(),k=b(d.term).toUpperCase();return j.indexOf(k)>-1?e:null}this.defaults={amdBase:"./",amdLanguageBase:"./i18n/",closeOnSelect:!0,debug:!1,dropdownAutoWidth:!1,escapeMarkup:j.escapeMarkup,language:C,matcher:c,minimumInputLength:0,maximumInputLength:0,maximumSelectionLength:0,minimumResultsForSearch:0,selectOnClose:!1,sorter:function(a){return a},templateResult:function(a){return a.text},templateSelection:function(a){return a.text},theme:"default",width:"resolve"}},D.prototype.set=function(b,c){var d=a.camelCase(b),e={};e[d]=c;var f=j._convertData(e);a.extend(this.defaults,f)};var E=new D;return E}),b.define("select2/options",["require","jquery","./defaults","./utils"],function(a,b,c,d){function e(b,e){if(this.options=b,null!=e&&this.fromElement(e),this.options=c.apply(this.options),e&&e.is("input")){var f=a(this.get("amdBase")+"compat/inputData");this.options.dataAdapter=d.Decorate(this.options.dataAdapter,f)}}return e.prototype.fromElement=function(a){var c=["select2"];null==this.options.multiple&&(this.options.multiple=a.prop("multiple")),null==this.options.disabled&&(this.options.disabled=a.prop("disabled")),null==this.options.language&&(a.prop("lang")?this.options.language=a.prop("lang").toLowerCase():a.closest("[lang]").prop("lang")&&(this.options.language=a.closest("[lang]").prop("lang"))),null==this.options.dir&&(a.prop("dir")?this.options.dir=a.prop("dir"):a.closest("[dir]").prop("dir")?this.options.dir=a.closest("[dir]").prop("dir"):this.options.dir="ltr"),a.prop("disabled",this.options.disabled),a.prop("multiple",this.options.multiple),a.data("select2Tags")&&(this.options.debug&&window.console&&console.warn&&console.warn('Select2: The `data-select2-tags` attribute has been changed to use the `data-data` and `data-tags="true"` attributes and will be removed in future versions of Select2.'),a.data("data",a.data("select2Tags")),a.data("tags",!0)),a.data("ajaxUrl")&&(this.options.debug&&window.console&&console.warn&&console.warn("Select2: The `data-ajax-url` attribute has been changed to `data-ajax--url` and support for the old attribute will be removed in future versions of Select2."),a.attr("ajax--url",a.data("ajaxUrl")),a.data("ajax--url",a.data("ajaxUrl")));var e={};e=b.fn.jquery&&"1."==b.fn.jquery.substr(0,2)&&a[0].dataset?b.extend(!0,{},a[0].dataset,a.data()):a.data();var f=b.extend(!0,{},e);f=d._convertData(f);for(var g in f)b.inArray(g,c)>-1||(b.isPlainObject(this.options[g])?b.extend(this.options[g],f[g]):this.options[g]=f[g]);return this},e.prototype.get=function(a){return this.options[a]},e.prototype.set=function(a,b){this.options[a]=b},e}),b.define("select2/core",["jquery","./options","./utils","./keys"],function(a,b,c,d){var e=function(a,c){null!=a.data("select2")&&a.data("select2").destroy(),this.$element=a,this.id=this._generateId(a),c=c||{},this.options=new b(c,a),e.__super__.constructor.call(this);var d=a.attr("tabindex")||0;a.data("old-tabindex",d),a.attr("tabindex","-1");var f=this.options.get("dataAdapter");this.dataAdapter=new f(a,this.options);var g=this.render();this._placeContainer(g);var h=this.options.get("selectionAdapter");this.selection=new h(a,this.options),this.$selection=this.selection.render(),this.selection.position(this.$selection,g);var i=this.options.get("dropdownAdapter");this.dropdown=new i(a,this.options),this.$dropdown=this.dropdown.render(),this.dropdown.position(this.$dropdown,g);var j=this.options.get("resultsAdapter");this.results=new j(a,this.options,this.dataAdapter),this.$results=this.results.render(),this.results.position(this.$results,this.$dropdown);var k=this;this._bindAdapters(),this._registerDomEvents(),this._registerDataEvents(),this._registerSelectionEvents(),this._registerDropdownEvents(),this._registerResultsEvents(),this._registerEvents(),this.dataAdapter.current(function(a){k.trigger("selection:update",{data:a})}),a.addClass("select2-hidden-accessible"),a.attr("aria-hidden","true"),this._syncAttributes(),a.data("select2",this)};return c.Extend(e,c.Observable),e.prototype._generateId=function(a){var b="";return b=null!=a.attr("id")?a.attr("id"):null!=a.attr("name")?a.attr("name")+"-"+c.generateChars(2):c.generateChars(4),b=b.replace(/(:|\.|\[|\]|,)/g,""),b="select2-"+b},e.prototype._placeContainer=function(a){a.insertAfter(this.$element);var b=this._resolveWidth(this.$element,this.options.get("width"));null!=b&&a.css("width",b)},e.prototype._resolveWidth=function(a,b){var c=/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i;if("resolve"==b){var d=this._resolveWidth(a,"style");return null!=d?d:this._resolveWidth(a,"element")}if("element"==b){var e=a.outerWidth(!1);return e<=0?"auto":e+"px"}if("style"==b){var f=a.attr("style");if("string"!=typeof f)return null;for(var g=f.split(";"),h=0,i=g.length;h<i;h+=1){var j=g[h].replace(/\s/g,""),k=j.match(c);if(null!==k&&k.length>=1)return k[1]}return null}return b},e.prototype._bindAdapters=function(){this.dataAdapter.bind(this,this.$container),this.selection.bind(this,this.$container),this.dropdown.bind(this,this.$container),this.results.bind(this,this.$container)},e.prototype._registerDomEvents=function(){var b=this;this.$element.on("change.select2",function(){b.dataAdapter.current(function(a){b.trigger("selection:update",{data:a})})}),this.$element.on("focus.select2",function(a){b.trigger("focus",a)}),this._syncA=c.bind(this._syncAttributes,this),this._syncS=c.bind(this._syncSubtree,this),this.$element[0].attachEvent&&this.$element[0].attachEvent("onpropertychange",this._syncA);var d=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver;null!=d?(this._observer=new d(function(c){a.each(c,b._syncA),a.each(c,b._syncS)}),this._observer.observe(this.$element[0],{attributes:!0,childList:!0,subtree:!1})):this.$element[0].addEventListener&&(this.$element[0].addEventListener("DOMAttrModified",b._syncA,!1),this.$element[0].addEventListener("DOMNodeInserted",b._syncS,!1),this.$element[0].addEventListener("DOMNodeRemoved",b._syncS,!1))},e.prototype._registerDataEvents=function(){var a=this;this.dataAdapter.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerSelectionEvents=function(){var b=this,c=["toggle","focus"];this.selection.on("toggle",function(){b.toggleDropdown()}),this.selection.on("focus",function(a){b.focus(a)}),this.selection.on("*",function(d,e){a.inArray(d,c)===-1&&b.trigger(d,e)})},e.prototype._registerDropdownEvents=function(){var a=this;this.dropdown.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerResultsEvents=function(){var a=this;this.results.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerEvents=function(){var a=this;this.on("open",function(){a.$container.addClass("select2-container--open")}),this.on("close",function(){a.$container.removeClass("select2-container--open")}),this.on("enable",function(){a.$container.removeClass("select2-container--disabled")}),this.on("disable",function(){a.$container.addClass("select2-container--disabled")}),this.on("blur",function(){a.$container.removeClass("select2-container--focus")}),this.on("query",function(b){a.isOpen()||a.trigger("open",{}),this.dataAdapter.query(b,function(c){a.trigger("results:all",{data:c,query:b})})}),this.on("query:append",function(b){this.dataAdapter.query(b,function(c){a.trigger("results:append",{data:c,query:b})})}),this.on("keypress",function(b){var c=b.which;a.isOpen()?c===d.ESC||c===d.TAB||c===d.UP&&b.altKey?(a.close(),b.preventDefault()):c===d.ENTER?(a.trigger("results:select",{}),b.preventDefault()):c===d.SPACE&&b.ctrlKey?(a.trigger("results:toggle",{}),b.preventDefault()):c===d.UP?(a.trigger("results:previous",{}),b.preventDefault()):c===d.DOWN&&(a.trigger("results:next",{}),b.preventDefault()):(c===d.ENTER||c===d.SPACE||c===d.DOWN&&b.altKey)&&(a.open(),b.preventDefault())})},e.prototype._syncAttributes=function(){this.options.set("disabled",this.$element.prop("disabled")),this.options.get("disabled")?(this.isOpen()&&this.close(),this.trigger("disable",{})):this.trigger("enable",{})},e.prototype._syncSubtree=function(a,b){var c=!1,d=this;if(!a||!a.target||"OPTION"===a.target.nodeName||"OPTGROUP"===a.target.nodeName){if(b)if(b.addedNodes&&b.addedNodes.length>0)for(var e=0;e<b.addedNodes.length;e++){var f=b.addedNodes[e];f.selected&&(c=!0)}else b.removedNodes&&b.removedNodes.length>0&&(c=!0);else c=!0;c&&this.dataAdapter.current(function(a){d.trigger("selection:update",{data:a})})}},e.prototype.trigger=function(a,b){var c=e.__super__.trigger,d={open:"opening",close:"closing",select:"selecting",unselect:"unselecting"};if(void 0===b&&(b={}),a in d){var f=d[a],g={prevented:!1,name:a,args:b};if(c.call(this,f,g),g.prevented)return void(b.prevented=!0)}c.call(this,a,b)},e.prototype.toggleDropdown=function(){this.options.get("disabled")||(this.isOpen()?this.close():this.open())},e.prototype.open=function(){this.isOpen()||this.trigger("query",{})},e.prototype.close=function(){this.isOpen()&&this.trigger("close",{})},e.prototype.isOpen=function(){return this.$container.hasClass("select2-container--open")},e.prototype.hasFocus=function(){return this.$container.hasClass("select2-container--focus")},e.prototype.focus=function(a){this.hasFocus()||(this.$container.addClass("select2-container--focus"),this.trigger("focus",{}))},e.prototype.enable=function(a){this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("enable")` method has been deprecated and will be removed in later Select2 versions. Use $element.prop("disabled") instead.'),null!=a&&0!==a.length||(a=[!0]);var b=!a[0];this.$element.prop("disabled",b)},e.prototype.data=function(){this.options.get("debug")&&arguments.length>0&&window.console&&console.warn&&console.warn('Select2: Data can no longer be set using `select2("data")`. You should consider setting the value instead using `$element.val()`.');var a=[];return this.dataAdapter.current(function(b){a=b}),a},e.prototype.val=function(b){if(this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("val")` method has been deprecated and will be removed in later Select2 versions. Use $element.val() instead.'),null==b||0===b.length)return this.$element.val();var c=b[0];a.isArray(c)&&(c=a.map(c,function(a){return a.toString()})),this.$element.val(c).trigger("change")},e.prototype.destroy=function(){this.$container.remove(),this.$element[0].detachEvent&&this.$element[0].detachEvent("onpropertychange",this._syncA),null!=this._observer?(this._observer.disconnect(),this._observer=null):this.$element[0].removeEventListener&&(this.$element[0].removeEventListener("DOMAttrModified",this._syncA,!1),this.$element[0].removeEventListener("DOMNodeInserted",this._syncS,!1),this.$element[0].removeEventListener("DOMNodeRemoved",this._syncS,!1)),this._syncA=null,this._syncS=null,this.$element.off(".select2"),this.$element.attr("tabindex",this.$element.data("old-tabindex")),this.$element.removeClass("select2-hidden-accessible"),this.$element.attr("aria-hidden","false"),this.$element.removeData("select2"),this.dataAdapter.destroy(),this.selection.destroy(),this.dropdown.destroy(),this.results.destroy(),this.dataAdapter=null,this.selection=null,this.dropdown=null,this.results=null},e.prototype.render=function(){
+var b=a('<span class="select2 select2-container"><span class="selection"></span><span class="dropdown-wrapper" aria-hidden="true"></span></span>');return b.attr("dir",this.options.get("dir")),this.$container=b,this.$container.addClass("select2-container--"+this.options.get("theme")),b.data("element",this.$element),b},e}),b.define("jquery-mousewheel",["jquery"],function(a){return a}),b.define("jquery.select2",["jquery","jquery-mousewheel","./select2/core","./select2/defaults"],function(a,b,c,d){if(null==a.fn.select2){var e=["open","close","destroy"];a.fn.select2=function(b){if(b=b||{},"object"==typeof b)return this.each(function(){var d=a.extend(!0,{},b);new c(a(this),d)}),this;if("string"==typeof b){var d,f=Array.prototype.slice.call(arguments,1);return this.each(function(){var c=a(this).data("select2");null==c&&window.console&&console.error&&console.error("The select2('"+b+"') method was called on an element that is not using Select2."),d=c[b].apply(c,f)}),a.inArray(b,e)>-1?this:d}throw new Error("Invalid arguments for Select2: "+b)}}return null==a.fn.select2.defaults&&(a.fn.select2.defaults=d),c}),{define:b.define,require:b.require}}(),c=b.require("jquery.select2");return a.fn.select2.amd=b,c});
\ No newline at end of file
diff --git a/assets/js/stupidtable/stupidtable.js b/assets/js/stupidtable/stupidtable.js
index a0bd5db6fcf..017a9fd543b 100644
--- a/assets/js/stupidtable/stupidtable.js
+++ b/assets/js/stupidtable/stupidtable.js
@@ -24,11 +24,13 @@
         var dir = $.fn.stupidtable.dir;
 
         // Account for colspans
-        $this.parents("tr").find("th").slice(0, $this.index()).each(function() {
+        $this.parents("tr").find("th").slice(0, $this.index() + 1).each(function() {
           var cols = $(this).attr("colspan") || 1;
           th_index += parseInt(cols,10);
         });
 
+        th_index = th_index - 1;
+
         // Determine (and/or reverse) sorting direction, default `asc`
         var sort_dir = $this.data("sort-default") || dir.ASC;
         if ($this.data("sort-dir"))
@@ -44,7 +46,7 @@
 
         // Trigger `beforetablesort` event that calling scripts can hook into;
         // pass parameters for sorted column index and sorting direction
-        $table.trigger("beforetablesort", {column: th_index, direction: sort_dir});
+        $table.trigger("beforetablesort", {column: $this.index(), direction: sort_dir});
         // More reliable method of forcing a redraw
         $table.css("display");
 
@@ -70,6 +72,7 @@
 
               // Sort by the data-order-by value
               column.sort(function(a, b) { return sortMethod(a[0], b[0]); });
+
               if (sort_dir != dir.ASC)
                 column.reverse();
 
@@ -84,7 +87,7 @@
           $this.data("sort-dir", sort_dir).addClass("sorting-"+sort_dir);
 
           // Trigger `aftertablesort` event. Similar to `beforetablesort`
-          $table.trigger("aftertablesort", {column: th_index, direction: sort_dir});
+          $table.trigger("aftertablesort", {column: $this.index(), direction: sort_dir});
           // More reliable method of forcing a redraw
           $table.css("display");
         }, 10);
diff --git a/assets/js/stupidtable/stupidtable.min.js b/assets/js/stupidtable/stupidtable.min.js
index 3f866da3c48..f8678bb2cf2 100644
--- a/assets/js/stupidtable/stupidtable.min.js
+++ b/assets/js/stupidtable/stupidtable.min.js
@@ -1 +1 @@
-!function(a){a.fn.stupidtable=function(b){return this.each(function(){var c=a(this);b=b||{},b=a.extend({},a.fn.stupidtable.default_sort_fns,b),c.on("click.stupidtable","thead th",function(){var d=a(this),e=0,f=a.fn.stupidtable.dir;d.parents("tr").find("th").slice(0,d.index()).each(function(){var b=a(this).attr("colspan")||1;e+=parseInt(b,10)});var g=d.data("sort-default")||f.ASC;d.data("sort-dir")&&(g=d.data("sort-dir")===f.ASC?f.DESC:f.ASC);var h=d.data("sort")||null;null!==h&&(c.trigger("beforetablesort",{column:e,direction:g}),c.css("display"),setTimeout(function(){var i=b[h];c.children("tbody").each(function(b,c){var d=[],h=a(c),j=h.children("tr").not("[data-sort-ignore]");j.each(function(b,c){var f=a(c).children().eq(e),g=f.data("sort-value"),h="undefined"!=typeof g?g:f.text();d.push([h,c])}),d.sort(function(a,b){return i(a[0],b[0])}),g!=f.ASC&&d.reverse(),j=a.map(d,function(a){return a[1]}),h.append(j)}),c.find("th").data("sort-dir",null).removeClass("sorting-desc sorting-asc"),d.data("sort-dir",g).addClass("sorting-"+g),c.trigger("aftertablesort",{column:e,direction:g}),c.css("display")},10))})})},a.fn.stupidtable.dir={ASC:"asc",DESC:"desc"},a.fn.stupidtable.default_sort_fns={"int":function(a,b){return parseInt(a,10)-parseInt(b,10)},"float":function(a,b){return parseFloat(a)-parseFloat(b)},string:function(a,b){return a.localeCompare(b)},"string-ins":function(a,b){return a=a.toLocaleLowerCase(),b=b.toLocaleLowerCase(),a.localeCompare(b)}}}(jQuery);
\ No newline at end of file
+!function(a){a.fn.stupidtable=function(b){return this.each(function(){var c=a(this);b=b||{},b=a.extend({},a.fn.stupidtable.default_sort_fns,b),c.on("click.stupidtable","thead th",function(){var d=a(this),e=0,f=a.fn.stupidtable.dir;d.parents("tr").find("th").slice(0,d.index()+1).each(function(){var b=a(this).attr("colspan")||1;e+=parseInt(b,10)}),e-=1;var g=d.data("sort-default")||f.ASC;d.data("sort-dir")&&(g=d.data("sort-dir")===f.ASC?f.DESC:f.ASC);var h=d.data("sort")||null;null!==h&&(c.trigger("beforetablesort",{column:d.index(),direction:g}),c.css("display"),setTimeout(function(){var i=b[h];c.children("tbody").each(function(b,c){var d=[],h=a(c),j=h.children("tr").not("[data-sort-ignore]");j.each(function(b,c){var f=a(c).children().eq(e),g=f.data("sort-value"),h="undefined"!=typeof g?g:f.text();d.push([h,c])}),d.sort(function(a,b){return i(a[0],b[0])}),g!=f.ASC&&d.reverse(),j=a.map(d,function(a){return a[1]}),h.append(j)}),c.find("th").data("sort-dir",null).removeClass("sorting-desc sorting-asc"),d.data("sort-dir",g).addClass("sorting-"+g),c.trigger("aftertablesort",{column:d.index(),direction:g}),c.css("display")},10))})})},a.fn.stupidtable.dir={ASC:"asc",DESC:"desc"},a.fn.stupidtable.default_sort_fns={int:function(a,b){return parseInt(a,10)-parseInt(b,10)},float:function(a,b){return parseFloat(a)-parseFloat(b)},string:function(a,b){return a.localeCompare(b)},"string-ins":function(a,b){return a=a.toLocaleLowerCase(),b=b.toLocaleLowerCase(),a.localeCompare(b)}}}(jQuery);
\ No newline at end of file
diff --git a/assets/js/zeroclipboard/jquery.zeroclipboard.min.js b/assets/js/zeroclipboard/jquery.zeroclipboard.min.js
index 6f77845220e..021cebe29f0 100644
--- a/assets/js/zeroclipboard/jquery.zeroclipboard.min.js
+++ b/assets/js/zeroclipboard/jquery.zeroclipboard.min.js
@@ -14,4 +14,4 @@
  * http://zeroclipboard.org/
  * v2.1.2
  */
-!function(a,b){var c,e=a,f=e.document,g=e.navigator,h=e.setTimeout,i=e.encodeURIComponent,j=e.ActiveXObject,k=e.Number.parseInt||e.parseInt,l=e.Number.parseFloat||e.parseFloat,m=e.Number.isNaN||e.isNaN,n=e.Math.round,o=e.Date.now,p=e.Object.keys,q=e.Object.defineProperty,r=e.Object.prototype.hasOwnProperty,s=e.Array.prototype.slice,t=function(a){return s.call(a,0)},u=function(){var a,c,d,e,f,g,h=t(arguments),i=h[0]||{};for(a=1,c=h.length;c>a;a++)if(null!=(d=h[a]))for(e in d)r.call(d,e)&&(f=i[e],g=d[e],i!==g&&g!==b&&(i[e]=g));return i},v=function(a){var b,c,d,e;if("object"!=typeof a||null==a)b=a;else if("number"==typeof a.length)for(b=[],c=0,d=a.length;d>c;c++)r.call(a,c)&&(b[c]=v(a[c]));else{b={};for(e in a)r.call(a,e)&&(b[e]=v(a[e]))}return b},w=function(a,b){for(var c={},d=0,e=b.length;e>d;d++)b[d]in a&&(c[b[d]]=a[b[d]]);return c},x=function(a,b){var c={};for(var d in a)-1===b.indexOf(d)&&(c[d]=a[d]);return c},y=function(a){if(a)for(var b in a)r.call(a,b)&&delete a[b];return a},z=function(a,b){if(a&&1===a.nodeType&&a.ownerDocument&&b&&(1===b.nodeType&&b.ownerDocument&&b.ownerDocument===a.ownerDocument||9===b.nodeType&&!b.ownerDocument&&b===a.ownerDocument))do{if(a===b)return!0;a=a.parentNode}while(a);return!1},A={bridge:null,version:"0.0.0",pluginType:"unknown",disabled:null,outdated:null,unavailable:null,deactivated:null,overdue:null,ready:null},B="11.0.0",C={},D={},E=null,F={ready:"Flash communication is established",error:{"flash-disabled":"Flash is disabled or not installed","flash-outdated":"Flash is too outdated to support ZeroClipboard","flash-unavailable":"Flash is unable to communicate bidirectionally with JavaScript","flash-deactivated":"Flash is too outdated for your browser and/or is configured as click-to-activate","flash-overdue":"Flash communication was established but NOT within the acceptable time limit"}},G=function(){var a,b,c,d,e="ZeroClipboard.swf";if(!f.currentScript||!(d=f.currentScript.src)){var g=f.getElementsByTagName("script");if("readyState"in g[0])for(a=g.length;a--&&("interactive"!==g[a].readyState||!(d=g[a].src)););else if("loading"===f.readyState)d=g[g.length-1].src;else{for(a=g.length;a--;){if(c=g[a].src,!c){b=null;break}if(c=c.split("#")[0].split("?")[0],c=c.slice(0,c.lastIndexOf("/")+1),null==b)b=c;else if(b!==c){b=null;break}}null!==b&&(d=b)}}return d&&(d=d.split("#")[0].split("?")[0],e=d.slice(0,d.lastIndexOf("/")+1)+e),e}(),H={swfPath:G,trustedDomains:a.location.host?[a.location.host]:[],cacheBust:!0,forceEnhancedClipboard:!1,flashLoadTimeout:3e4,autoActivate:!0,bubbleEvents:!0,containerId:"global-zeroclipboard-html-bridge",containerClass:"global-zeroclipboard-container",swfObjectId:"global-zeroclipboard-flash-bridge",hoverClass:"zeroclipboard-is-hover",activeClass:"zeroclipboard-is-active",forceHandCursor:!1,title:null,zIndex:999999999},I=function(a){if("object"==typeof a&&null!==a)for(var b in a)if(r.call(a,b))if(/^(?:forceHandCursor|title|zIndex|bubbleEvents)$/.test(b))H[b]=a[b];else if(null==A.bridge)if("containerId"===b||"swfObjectId"===b){if(!X(a[b]))throw new Error("The specified `"+b+"` value is not valid as an HTML4 Element ID");H[b]=a[b]}else H[b]=a[b];{if("string"!=typeof a||!a)return v(H);if(r.call(H,a))return H[a]}},J=function(){return{browser:w(g,["userAgent","platform","appName"]),flash:x(A,["bridge"]),zeroclipboard:{version:ya.version,config:ya.config()}}},K=function(){return!!(A.disabled||A.outdated||A.unavailable||A.deactivated)},L=function(a,b){var c,d,e,f={};if("string"==typeof a&&a)e=a.toLowerCase().split(/\s+/);else if("object"==typeof a&&a&&"undefined"==typeof b)for(c in a)r.call(a,c)&&"string"==typeof c&&c&&"function"==typeof a[c]&&ya.on(c,a[c]);if(e&&e.length){for(c=0,d=e.length;d>c;c++)a=e[c].replace(/^on/,""),f[a]=!0,C[a]||(C[a]=[]),C[a].push(b);if(f.ready&&A.ready&&ya.emit({type:"ready"}),f.error){var g=["disabled","outdated","unavailable","deactivated","overdue"];for(c=0,d=g.length;d>c;c++)if(A[g[c]]===!0){ya.emit({type:"error",name:"flash-"+g[c]});break}}}return ya},M=function(a,b){var c,d,e,f,g;if(0===arguments.length)f=p(C);else if("string"==typeof a&&a)f=a.split(/\s+/);else if("object"==typeof a&&a&&"undefined"==typeof b)for(c in a)r.call(a,c)&&"string"==typeof c&&c&&"function"==typeof a[c]&&ya.off(c,a[c]);if(f&&f.length)for(c=0,d=f.length;d>c;c++)if(a=f[c].toLowerCase().replace(/^on/,""),g=C[a],g&&g.length)if(b)for(e=g.indexOf(b);-1!==e;)g.splice(e,1),e=g.indexOf(b,e);else g.length=0;return ya},N=function(a){var b;return b="string"==typeof a&&a?v(C[a])||null:v(C)},O=function(a){var b,c,d;return a=Y(a),a&&!ca(a)?"ready"===a.type&&A.overdue===!0?ya.emit({type:"error",name:"flash-overdue"}):(b=u({},a),ba.call(this,b),"copy"===a.type&&(d=ia(D),c=d.data,E=d.formatMap),c):void 0},P=function(){if("boolean"!=typeof A.ready&&(A.ready=!1),!ya.isFlashUnusable()&&null===A.bridge){var a=H.flashLoadTimeout;"number"==typeof a&&a>=0&&h(function(){"boolean"!=typeof A.deactivated&&(A.deactivated=!0),A.deactivated===!0&&ya.emit({type:"error",name:"flash-deactivated"})},a),A.overdue=!1,ga()}},Q=function(){ya.clearData(),ya.blur(),ya.emit("destroy"),ha(),ya.off()},R=function(a,b){var c;if("object"==typeof a&&a&&"undefined"==typeof b)c=a,ya.clearData();else{if("string"!=typeof a||!a)return;c={},c[a]=b}for(var d in c)"string"==typeof d&&d&&r.call(c,d)&&"string"==typeof c[d]&&c[d]&&(D[d]=c[d])},S=function(a){"undefined"==typeof a?(y(D),E=null):"string"==typeof a&&r.call(D,a)&&delete D[a]},T=function(a){return"undefined"==typeof a?v(D):"string"==typeof a&&r.call(D,a)?D[a]:void 0},U=function(a){if(a&&1===a.nodeType){c&&(qa(c,H.activeClass),c!==a&&qa(c,H.hoverClass)),c=a,pa(a,H.hoverClass);var b=a.getAttribute("title")||H.title;if("string"==typeof b&&b){var d=fa(A.bridge);d&&d.setAttribute("title",b)}var e=H.forceHandCursor===!0||"pointer"===ra(a,"cursor");va(e),ua()}},V=function(){var a=fa(A.bridge);a&&(a.removeAttribute("title"),a.style.left="0px",a.style.top="-9999px",a.style.width="1px",a.style.top="1px"),c&&(qa(c,H.hoverClass),qa(c,H.activeClass),c=null)},W=function(){return c||null},X=function(a){return"string"==typeof a&&a&&/^[A-Za-z][A-Za-z0-9_:\-\.]*$/.test(a)},Y=function(a){var b;if("string"==typeof a&&a?(b=a,a={}):"object"==typeof a&&a&&"string"==typeof a.type&&a.type&&(b=a.type),b){u(a,{type:b.toLowerCase(),target:a.target||c||null,relatedTarget:a.relatedTarget||null,currentTarget:A&&A.bridge||null,timeStamp:a.timeStamp||o()||null});var d=F[a.type];return"error"===a.type&&a.name&&d&&(d=d[a.name]),d&&(a.message=d),"ready"===a.type&&u(a,{target:null,version:A.version}),"error"===a.type&&(/^flash-(disabled|outdated|unavailable|deactivated|overdue)$/.test(a.name)&&u(a,{target:null,minimumVersion:B}),/^flash-(outdated|unavailable|deactivated|overdue)$/.test(a.name)&&u(a,{version:A.version})),"copy"===a.type&&(a.clipboardData={setData:ya.setData,clearData:ya.clearData}),"aftercopy"===a.type&&(a=ja(a,E)),a.target&&!a.relatedTarget&&(a.relatedTarget=Z(a.target)),a=$(a)}},Z=function(a){var b=a&&a.getAttribute&&a.getAttribute("data-clipboard-target");return b?f.getElementById(b):null},$=function(a){if(a&&/^_(?:click|mouse(?:over|out|down|up|move))$/.test(a.type)){var c=a.target,d="_mouseover"===a.type&&a.relatedTarget?a.relatedTarget:b,g="_mouseout"===a.type&&a.relatedTarget?a.relatedTarget:b,h=ta(c),i=e.screenLeft||e.screenX||0,j=e.screenTop||e.screenY||0,k=f.body.scrollLeft+f.documentElement.scrollLeft,l=f.body.scrollTop+f.documentElement.scrollTop,m=h.left+("number"==typeof a._stageX?a._stageX:0),n=h.top+("number"==typeof a._stageY?a._stageY:0),o=m-k,p=n-l,q=i+o,r=j+p,s="number"==typeof a.movementX?a.movementX:0,t="number"==typeof a.movementY?a.movementY:0;delete a._stageX,delete a._stageY,u(a,{srcElement:c,fromElement:d,toElement:g,screenX:q,screenY:r,pageX:m,pageY:n,clientX:o,clientY:p,x:o,y:p,movementX:s,movementY:t,offsetX:0,offsetY:0,layerX:0,layerY:0})}return a},_=function(a){var b=a&&"string"==typeof a.type&&a.type||"";return!/^(?:(?:before)?copy|destroy)$/.test(b)},aa=function(a,b,c,d){d?h(function(){a.apply(b,c)},0):a.apply(b,c)},ba=function(a){if("object"==typeof a&&a&&a.type){var b=_(a),c=C["*"]||[],d=C[a.type]||[],f=c.concat(d);if(f&&f.length){var g,h,i,j,k,l=this;for(g=0,h=f.length;h>g;g++)i=f[g],j=l,"string"==typeof i&&"function"==typeof e[i]&&(i=e[i]),"object"==typeof i&&i&&"function"==typeof i.handleEvent&&(j=i,i=i.handleEvent),"function"==typeof i&&(k=u({},a),aa(i,j,[k],b))}return this}},ca=function(a){var b=a.target||c||null,d="swf"===a._source;delete a._source;var e=["flash-disabled","flash-outdated","flash-unavailable","flash-deactivated","flash-overdue"];switch(a.type){case"error":-1!==e.indexOf(a.name)&&u(A,{disabled:"flash-disabled"===a.name,outdated:"flash-outdated"===a.name,unavailable:"flash-unavailable"===a.name,deactivated:"flash-deactivated"===a.name,overdue:"flash-overdue"===a.name,ready:!1});break;case"ready":var f=A.deactivated===!0;u(A,{disabled:!1,outdated:!1,unavailable:!1,deactivated:!1,overdue:f,ready:!f});break;case"copy":var g,h,i=a.relatedTarget;!D["text/html"]&&!D["text/plain"]&&i&&(h=i.value||i.outerHTML||i.innerHTML)&&(g=i.value||i.textContent||i.innerText)?(a.clipboardData.clearData(),a.clipboardData.setData("text/plain",g),h!==g&&a.clipboardData.setData("text/html",h)):!D["text/plain"]&&a.target&&(g=a.target.getAttribute("data-clipboard-text"))&&(a.clipboardData.clearData(),a.clipboardData.setData("text/plain",g));break;case"aftercopy":ya.clearData(),b&&b!==oa()&&b.focus&&b.focus();break;case"_mouseover":ya.focus(b),H.bubbleEvents===!0&&d&&(b&&b!==a.relatedTarget&&!z(a.relatedTarget,b)&&da(u({},a,{type:"mouseenter",bubbles:!1,cancelable:!1})),da(u({},a,{type:"mouseover"})));break;case"_mouseout":ya.blur(),H.bubbleEvents===!0&&d&&(b&&b!==a.relatedTarget&&!z(a.relatedTarget,b)&&da(u({},a,{type:"mouseleave",bubbles:!1,cancelable:!1})),da(u({},a,{type:"mouseout"})));break;case"_mousedown":pa(b,H.activeClass),H.bubbleEvents===!0&&d&&da(u({},a,{type:a.type.slice(1)}));break;case"_mouseup":qa(b,H.activeClass),H.bubbleEvents===!0&&d&&da(u({},a,{type:a.type.slice(1)}));break;case"_click":case"_mousemove":H.bubbleEvents===!0&&d&&da(u({},a,{type:a.type.slice(1)}))}return/^_(?:click|mouse(?:over|out|down|up|move))$/.test(a.type)?!0:void 0},da=function(a){if(a&&"string"==typeof a.type&&a){var b,c=a.target||null,d=c&&c.ownerDocument||f,g={view:d.defaultView||e,canBubble:!0,cancelable:!0,detail:"click"===a.type?1:0,button:"number"==typeof a.which?a.which-1:"number"==typeof a.button?a.button:d.createEvent?0:1},h=u(g,a);c&&d.createEvent&&c.dispatchEvent&&(h=[h.type,h.canBubble,h.cancelable,h.view,h.detail,h.screenX,h.screenY,h.clientX,h.clientY,h.ctrlKey,h.altKey,h.shiftKey,h.metaKey,h.button,h.relatedTarget],b=d.createEvent("MouseEvents"),b.initMouseEvent&&(b.initMouseEvent.apply(b,h),b._source="js",c.dispatchEvent(b)))}},ea=function(){var a=f.createElement("div");return a.id=H.containerId,a.className=H.containerClass,a.style.position="absolute",a.style.left="0px",a.style.top="-9999px",a.style.width="1px",a.style.height="1px",a.style.zIndex=""+wa(H.zIndex),a},fa=function(a){for(var b=a&&a.parentNode;b&&"OBJECT"===b.nodeName&&b.parentNode;)b=b.parentNode;return b||null},ga=function(){var a,b=A.bridge,c=fa(b);if(!b){var d=na(e.location.host,H),g="never"===d?"none":"all",h=la(H),i=H.swfPath+ka(H.swfPath,H);c=ea();var j=f.createElement("div");c.appendChild(j),f.body.appendChild(c);var k=f.createElement("div"),l="activex"===A.pluginType;k.innerHTML='<object id="'+H.swfObjectId+'" name="'+H.swfObjectId+'" width="100%" height="100%" '+(l?'classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"':'type="application/x-shockwave-flash" data="'+i+'"')+">"+(l?'<param name="movie" value="'+i+'"/>':"")+'<param name="allowScriptAccess" value="'+d+'"/><param name="allowNetworking" value="'+g+'"/><param name="menu" value="false"/><param name="wmode" value="transparent"/><param name="flashvars" value="'+h+'"/></object>',b=k.firstChild,k=null,b.ZeroClipboard=ya,c.replaceChild(b,j)}return b||(b=f[H.swfObjectId],b&&(a=b.length)&&(b=b[a-1]),!b&&c&&(b=c.firstChild)),A.bridge=b||null,b},ha=function(){var a=A.bridge;if(a){var b=fa(a);b&&("activex"===A.pluginType&&"readyState"in a?(a.style.display="none",function c(){if(4===a.readyState){for(var d in a)"function"==typeof a[d]&&(a[d]=null);a.parentNode&&a.parentNode.removeChild(a),b.parentNode&&b.parentNode.removeChild(b)}else h(c,10)}()):(a.parentNode&&a.parentNode.removeChild(a),b.parentNode&&b.parentNode.removeChild(b))),A.ready=null,A.bridge=null,A.deactivated=null}},ia=function(a){var b={},c={};if("object"==typeof a&&a){for(var d in a)if(d&&r.call(a,d)&&"string"==typeof a[d]&&a[d])switch(d.toLowerCase()){case"text/plain":case"text":case"air:text":case"flash:text":b.text=a[d],c.text=d;break;case"text/html":case"html":case"air:html":case"flash:html":b.html=a[d],c.html=d;break;case"application/rtf":case"text/rtf":case"rtf":case"richtext":case"air:rtf":case"flash:rtf":b.rtf=a[d],c.rtf=d}return{data:b,formatMap:c}}},ja=function(a,b){if("object"!=typeof a||!a||"object"!=typeof b||!b)return a;var c={};for(var d in a)if(r.call(a,d)){if("success"!==d&&"data"!==d){c[d]=a[d];continue}c[d]={};var e=a[d];for(var f in e)f&&r.call(e,f)&&r.call(b,f)&&(c[d][b[f]]=e[f])}return c},ka=function(a,b){var c=null==b||b&&b.cacheBust===!0;return c?(-1===a.indexOf("?")?"?":"&")+"noCache="+o():""},la=function(a){var b,c,d,f,g="",h=[];if(a.trustedDomains&&("string"==typeof a.trustedDomains?f=[a.trustedDomains]:"object"==typeof a.trustedDomains&&"length"in a.trustedDomains&&(f=a.trustedDomains)),f&&f.length)for(b=0,c=f.length;c>b;b++)if(r.call(f,b)&&f[b]&&"string"==typeof f[b]){if(d=ma(f[b]),!d)continue;if("*"===d){h.length=0,h.push(d);break}h.push.apply(h,[d,"//"+d,e.location.protocol+"//"+d])}return h.length&&(g+="trustedOrigins="+i(h.join(","))),a.forceEnhancedClipboard===!0&&(g+=(g?"&":"")+"forceEnhancedClipboard=true"),"string"==typeof a.swfObjectId&&a.swfObjectId&&(g+=(g?"&":"")+"swfObjectId="+i(a.swfObjectId)),g},ma=function(a){if(null==a||""===a)return null;if(a=a.replace(/^\s+|\s+$/g,""),""===a)return null;var b=a.indexOf("//");a=-1===b?a:a.slice(b+2);var c=a.indexOf("/");return a=-1===c?a:-1===b||0===c?null:a.slice(0,c),a&&".swf"===a.slice(-4).toLowerCase()?null:a||null},na=function(){var a=function(a){var b,c,d,e=[];if("string"==typeof a&&(a=[a]),"object"!=typeof a||!a||"number"!=typeof a.length)return e;for(b=0,c=a.length;c>b;b++)if(r.call(a,b)&&(d=ma(a[b]))){if("*"===d){e.length=0,e.push("*");break}-1===e.indexOf(d)&&e.push(d)}return e};return function(b,c){var d=ma(c.swfPath);null===d&&(d=b);var e=a(c.trustedDomains),f=e.length;if(f>0){if(1===f&&"*"===e[0])return"always";if(-1!==e.indexOf(b))return 1===f&&b===d?"sameDomain":"always"}return"never"}}(),oa=function(){try{return f.activeElement}catch(a){return null}},pa=function(a,b){if(!a||1!==a.nodeType)return a;if(a.classList)return a.classList.contains(b)||a.classList.add(b),a;if(b&&"string"==typeof b){var c=(b||"").split(/\s+/);if(1===a.nodeType)if(a.className){for(var d=" "+a.className+" ",e=a.className,f=0,g=c.length;g>f;f++)d.indexOf(" "+c[f]+" ")<0&&(e+=" "+c[f]);a.className=e.replace(/^\s+|\s+$/g,"")}else a.className=b}return a},qa=function(a,b){if(!a||1!==a.nodeType)return a;if(a.classList)return a.classList.contains(b)&&a.classList.remove(b),a;if("string"==typeof b&&b){var c=b.split(/\s+/);if(1===a.nodeType&&a.className){for(var d=(" "+a.className+" ").replace(/[\n\t]/g," "),e=0,f=c.length;f>e;e++)d=d.replace(" "+c[e]+" "," ");a.className=d.replace(/^\s+|\s+$/g,"")}}return a},ra=function(a,b){var c=e.getComputedStyle(a,null).getPropertyValue(b);return"cursor"!==b||c&&"auto"!==c||"A"!==a.nodeName?c:"pointer"},sa=function(){var a,b,c,d=1;return"function"==typeof f.body.getBoundingClientRect&&(a=f.body.getBoundingClientRect(),b=a.right-a.left,c=f.body.offsetWidth,d=n(b/c*100)/100),d},ta=function(a){var b={left:0,top:0,width:0,height:0};if(a.getBoundingClientRect){var c,d,g,h=a.getBoundingClientRect();"pageXOffset"in e&&"pageYOffset"in e?(c=e.pageXOffset,d=e.pageYOffset):(g=sa(),c=n(f.documentElement.scrollLeft/g),d=n(f.documentElement.scrollTop/g));var i=f.documentElement.clientLeft||0,j=f.documentElement.clientTop||0;b.left=h.left+c-i,b.top=h.top+d-j,b.width="width"in h?h.width:h.right-h.left,b.height="height"in h?h.height:h.bottom-h.top}return b},ua=function(){var a;if(c&&(a=fa(A.bridge))){var b=ta(c);u(a.style,{width:b.width+"px",height:b.height+"px",top:b.top+"px",left:b.left+"px",zIndex:""+wa(H.zIndex)})}},va=function(a){A.ready===!0&&(A.bridge&&"function"==typeof A.bridge.setHandCursor?A.bridge.setHandCursor(a):A.ready=!1)},wa=function(a){if(/^(?:auto|inherit)$/.test(a))return a;var b;return"number"!=typeof a||m(a)?"string"==typeof a&&(b=wa(k(a,10))):b=a,"number"==typeof b?b:"auto"},xa=function(a){function b(a){var b=a.match(/[\d]+/g);return b.length=3,b.join(".")}function c(a){return!!a&&(a=a.toLowerCase())&&(/^(pepflashplayer\.dll|libpepflashplayer\.so|pepperflashplayer\.plugin)$/.test(a)||"chrome.plugin"===a.slice(-13))}function d(a){a&&(i=!0,a.version&&(m=b(a.version)),!m&&a.description&&(m=b(a.description)),a.filename&&(k=c(a.filename)))}var e,f,h,i=!1,j=!1,k=!1,m="";if(g.plugins&&g.plugins.length)e=g.plugins["Shockwave Flash"],d(e),g.plugins["Shockwave Flash 2.0"]&&(i=!0,m="2.0.0.11");else if(g.mimeTypes&&g.mimeTypes.length)h=g.mimeTypes["application/x-shockwave-flash"],e=h&&h.enabledPlugin,d(e);else if("undefined"!=typeof a){j=!0;try{f=new a("ShockwaveFlash.ShockwaveFlash.7"),i=!0,m=b(f.GetVariable("$version"))}catch(n){try{f=new a("ShockwaveFlash.ShockwaveFlash.6"),i=!0,m="6.0.21"}catch(o){try{f=new a("ShockwaveFlash.ShockwaveFlash"),i=!0,m=b(f.GetVariable("$version"))}catch(p){j=!1}}}}A.disabled=i!==!0,A.outdated=m&&l(m)<l(B),A.version=m||"0.0.0",A.pluginType=k?"pepper":j?"activex":i?"netscape":"unknown"};xa(j);var ya=function(){return this instanceof ya?void("function"==typeof ya._createClient&&ya._createClient.apply(this,t(arguments))):new ya};q(ya,"version",{value:"2.1.2",writable:!1,configurable:!0,enumerable:!0}),ya.config=function(){return I.apply(this,t(arguments))},ya.state=function(){return J.apply(this,t(arguments))},ya.isFlashUnusable=function(){return K.apply(this,t(arguments))},ya.on=function(){return L.apply(this,t(arguments))},ya.off=function(){return M.apply(this,t(arguments))},ya.handlers=function(){return N.apply(this,t(arguments))},ya.emit=function(){return O.apply(this,t(arguments))},ya.create=function(){return P.apply(this,t(arguments))},ya.destroy=function(){return Q.apply(this,t(arguments))},ya.setData=function(){return R.apply(this,t(arguments))},ya.clearData=function(){return S.apply(this,t(arguments))},ya.getData=function(){return T.apply(this,t(arguments))},ya.focus=ya.activate=function(){return U.apply(this,t(arguments))},ya.blur=ya.deactivate=function(){return V.apply(this,t(arguments))},ya.activeElement=function(){return W.apply(this,t(arguments))},"function"==typeof define&&define.amd?define(function(){return ya}):"object"==typeof d&&d&&"object"==typeof d.exports&&d.exports?d.exports=ya:a.ZeroClipboard=ya}(function(){return this||b}()),function(a,b,c){function d(){for(var a,c="",d={},e=b.getSelection(),f=document.createElement("div"),g=0,h=e.rangeCount;h>g;g++)a=e.getRangeAt(g),c+=a.toString(),f.appendChild(a.cloneContents());return d["text/plain"]=c,c.replace(/\s/g,"")&&(d["text/html"]=f.innerHTML),d}function e(a){if("string"!=typeof a||!a)return null;var b,c,d=a;return d=d.replace(/<(?:hr)(?:\s+[^>]*)?\s*[\/]?>/gi,"{\\pard \\brdrb \\brdrs \\brdrw10 \\brsp20 \\par}\n{\\pard\\par}\n"),d=d.replace(/<(?:br)(?:\s+[^>]*)?\s*[\/]?>/gi,"{\\pard\\par}\n"),d=d.replace(/<(?:p|div|section|article)(?:\s+[^>]*)?\s*[\/]>/gi,"{\\pard\\par}\n"),d=d.replace(/<(?:[^>]+)\/>/g,""),d=d.replace(/<a(?:\s+[^>]*)?(?:\s+href=(["'])(?:javascript:void\(0?\);?|#|return false;?|void\(0?\);?|)\1)(?:\s+[^>]*)?>/gi,"{{{\n"),b=d,d=d.replace(/<a(?:\s+[^>]*)?(?:\s+href=(["'])(.+)\1)(?:\s+[^>]*)?>/gi,'{\\field{\\*\\fldinst{HYPERLINK\n "$2"\n}}{\\fldrslt{\\ul\\cf1\n'),c=d!==b,d=d.replace(/<a(?:\s+[^>]*)?>/gi,"{{{\n"),d=d.replace(/<\/a(?:\s+[^>]*)?>/gi,"\n}}}"),d=d.replace(/<(?:b|strong)(?:\s+[^>]*)?>/gi,"{\\b\n"),d=d.replace(/<(?:i|em)(?:\s+[^>]*)?>/gi,"{\\i\n"),d=d.replace(/<(?:u|ins)(?:\s+[^>]*)?>/gi,"{\\ul\n"),d=d.replace(/<(?:strike|del)(?:\s+[^>]*)?>/gi,"{\\strike\n"),d=d.replace(/<sup(?:\s+[^>]*)?>/gi,"{\\super\n"),d=d.replace(/<sub(?:\s+[^>]*)?>/gi,"{\\sub\n"),d=d.replace(/<(?:p|div|section|article)(?:\s+[^>]*)?>/gi,"{\\pard\n"),d=d.replace(/<\/(?:p|div|section|article)(?:\s+[^>]*)?>/gi,"\n\\par}\n"),d=d.replace(/<\/(?:b|strong|i|em|u|ins|strike|del|sup|sub)(?:\s+[^>]*)?>/gi,"\n}"),d=d.replace(/<(?:[^>]+)>/g,""),d="{\\rtf1\\ansi\n"+(c?"{\\colortbl\n;\n\\red0\\green0\\blue255;\n}\n":"")+d+"\n}"}function f(b){var c=a.Event(b.type,a.extend(b,{_source:"swf"}));if(a(b.target).trigger(c),"copy"===c.type){if(a.event.special.copy.options.requirePreventDefault===!0&&!c.isDefaultPrevented()){b.clipboardData.clearData();var f=d();(f["text/plain"]||f["text/html"])&&b.clipboardData.setData(f)}var g=o.getData();if(a.event.special.copy.options.autoConvertHtmlToRtf===!0&&g["text/html"]&&!g["application/rtf"]){var h=e(g["text/html"]);b.clipboardData.setData("application/rtf",h)}}}function g(b){var c=a.Event("copy-error",a.extend(b,{type:"copy-error",_source:"swf"}));a(b.target).trigger(c)}function h(){a.event.props.push("clipboardData"),o.config(a.extend(!0,{autoActivate:!1},q.options)),o.on("beforecopy copy aftercopy",f),o.on("error",g),o.create()}function i(){o.destroy();var b=a.event.props.indexOf("clipboardData");-1!==b&&a.event.props.splice(b,1)}function j(b){l(b),b.target&&b.target!==o.activeElement()&&b.target!==a("#"+o.config("containerId"))[0]&&b.target!==a("#"+o.config("swfObjectId"))[0]&&o.focus(b.target)}function k(b){l(b),b.relatedTarget&&b.relatedTarget!==o.activeElement()&&b.relatedTarget!==a("#"+o.config("containerId"))[0]&&b.relatedTarget!==a("#"+o.config("swfObjectId"))[0]&&o.blur()}function l(a){o.isFlashUnusable()||"js"===a.originalEvent._source||(a.stopImmediatePropagation(),a.preventDefault())}var m=0,n=".zeroclipboard",o=b.ZeroClipboard,p=o.config("trustedDomains"),q={add:function(b){0===m++&&h();var c=n+(b.namespace?"."+b.namespace:""),d=b.selector,e="zc|{"+d+"}|{"+c+"}|count",f=a(this);"number"!=typeof f.data(e)&&f.data(e,0),0===f.data(e)&&(f.on("mouseenter"+c,d,j),f.on("mouseleave"+c,d,k),f.on("mouseover"+c,d,l),f.on("mouseout"+c,d,l),f.on("mousemove"+c,d,l),f.on("mousedown"+c,d,l),f.on("mouseup"+c,d,l),f.on("click"+c,d,l)),f.data(e,f.data(e)+1)},remove:function(b){var c=n+(b.namespace?"."+b.namespace:""),d=b.selector,e="zc|{"+d+"}|{"+c+"}|count",f=a(this);f.data(e,f.data(e)-1),0===f.data(e)&&(f.off("click"+c,d,l),f.off("mouseup"+c,d,l),f.off("mousedown"+c,d,l),f.off("mousemove"+c,d,l),f.off("mouseout"+c,d,l),f.off("mouseover"+c,d,l),f.off("mouseleave"+c,d,k),f.off("mouseenter"+c,d,j),f.removeData(e)),0===--m&&i()},trigger:function(b){if("copy"===b.type){var c=a(this),d="swf"===b._source;delete b._source,d||(c.trigger(a.extend(!0,{},b,{type:"beforecopy"})),c.one("copy",function(){var d={},e=o.getData();a.each(e,function(a){d[a]=!1});var f=a.extend(!0,{},b,{type:"aftercopy",data:a.extend(!0,{},e),success:d});c.trigger(f)}))}},_default:function(){return!0},options:{requirePreventDefault:!0,autoConvertHtmlToRtf:!0,trustedDomains:p,hoverClass:"hover",activeClass:"active"}};a.event.special.beforecopy=q,a.event.special.copy=q,a.event.special.aftercopy=q,a.event.special["copy-error"]=q}(jQuery,function(){return this||b}()),e||delete b.ZeroClipboard}(jQuery,function(){return this||window}());
\ No newline at end of file
+!function(a,b){var c,e=a,f=e.document,g=e.navigator,h=e.setTimeout,i=e.encodeURIComponent,j=e.ActiveXObject,k=e.Number.parseInt||e.parseInt,l=e.Number.parseFloat||e.parseFloat,m=e.Number.isNaN||e.isNaN,n=e.Math.round,o=e.Date.now,p=e.Object.keys,q=e.Object.defineProperty,r=e.Object.prototype.hasOwnProperty,s=e.Array.prototype.slice,t=function(a){return s.call(a,0)},u=function(){var a,c,d,e,f,g,h=t(arguments),i=h[0]||{};for(a=1,c=h.length;a<c;a++)if(null!=(d=h[a]))for(e in d)r.call(d,e)&&(f=i[e],g=d[e],i!==g&&g!==b&&(i[e]=g));return i},v=function(a){var b,c,d,e;if("object"!=typeof a||null==a)b=a;else if("number"==typeof a.length)for(b=[],c=0,d=a.length;c<d;c++)r.call(a,c)&&(b[c]=v(a[c]));else{b={};for(e in a)r.call(a,e)&&(b[e]=v(a[e]))}return b},w=function(a,b){for(var c={},d=0,e=b.length;d<e;d++)b[d]in a&&(c[b[d]]=a[b[d]]);return c},x=function(a,b){var c={};for(var d in a)b.indexOf(d)===-1&&(c[d]=a[d]);return c},y=function(a){if(a)for(var b in a)r.call(a,b)&&delete a[b];return a},z=function(a,b){if(a&&1===a.nodeType&&a.ownerDocument&&b&&(1===b.nodeType&&b.ownerDocument&&b.ownerDocument===a.ownerDocument||9===b.nodeType&&!b.ownerDocument&&b===a.ownerDocument))do{if(a===b)return!0;a=a.parentNode}while(a);return!1},A={bridge:null,version:"0.0.0",pluginType:"unknown",disabled:null,outdated:null,unavailable:null,deactivated:null,overdue:null,ready:null},B="11.0.0",C={},D={},E=null,F={ready:"Flash communication is established",error:{"flash-disabled":"Flash is disabled or not installed","flash-outdated":"Flash is too outdated to support ZeroClipboard","flash-unavailable":"Flash is unable to communicate bidirectionally with JavaScript","flash-deactivated":"Flash is too outdated for your browser and/or is configured as click-to-activate","flash-overdue":"Flash communication was established but NOT within the acceptable time limit"}},G=function(){var a,b,c,d,e="ZeroClipboard.swf";if(!f.currentScript||!(d=f.currentScript.src)){var g=f.getElementsByTagName("script");if("readyState"in g[0])for(a=g.length;a--&&("interactive"!==g[a].readyState||!(d=g[a].src)););else if("loading"===f.readyState)d=g[g.length-1].src;else{for(a=g.length;a--;){if(c=g[a].src,!c){b=null;break}if(c=c.split("#")[0].split("?")[0],c=c.slice(0,c.lastIndexOf("/")+1),null==b)b=c;else if(b!==c){b=null;break}}null!==b&&(d=b)}}return d&&(d=d.split("#")[0].split("?")[0],e=d.slice(0,d.lastIndexOf("/")+1)+e),e}(),H={swfPath:G,trustedDomains:a.location.host?[a.location.host]:[],cacheBust:!0,forceEnhancedClipboard:!1,flashLoadTimeout:3e4,autoActivate:!0,bubbleEvents:!0,containerId:"global-zeroclipboard-html-bridge",containerClass:"global-zeroclipboard-container",swfObjectId:"global-zeroclipboard-flash-bridge",hoverClass:"zeroclipboard-is-hover",activeClass:"zeroclipboard-is-active",forceHandCursor:!1,title:null,zIndex:999999999},I=function(a){if("object"==typeof a&&null!==a)for(var b in a)if(r.call(a,b))if(/^(?:forceHandCursor|title|zIndex|bubbleEvents)$/.test(b))H[b]=a[b];else if(null==A.bridge)if("containerId"===b||"swfObjectId"===b){if(!X(a[b]))throw new Error("The specified `"+b+"` value is not valid as an HTML4 Element ID");H[b]=a[b]}else H[b]=a[b];{if("string"!=typeof a||!a)return v(H);if(r.call(H,a))return H[a]}},J=function(){return{browser:w(g,["userAgent","platform","appName"]),flash:x(A,["bridge"]),zeroclipboard:{version:ya.version,config:ya.config()}}},K=function(){return!!(A.disabled||A.outdated||A.unavailable||A.deactivated)},L=function(a,b){var c,d,e,f={};if("string"==typeof a&&a)e=a.toLowerCase().split(/\s+/);else if("object"==typeof a&&a&&"undefined"==typeof b)for(c in a)r.call(a,c)&&"string"==typeof c&&c&&"function"==typeof a[c]&&ya.on(c,a[c]);if(e&&e.length){for(c=0,d=e.length;c<d;c++)a=e[c].replace(/^on/,""),f[a]=!0,C[a]||(C[a]=[]),C[a].push(b);if(f.ready&&A.ready&&ya.emit({type:"ready"}),f.error){var g=["disabled","outdated","unavailable","deactivated","overdue"];for(c=0,d=g.length;c<d;c++)if(A[g[c]]===!0){ya.emit({type:"error",name:"flash-"+g[c]});break}}}return ya},M=function(a,b){var c,d,e,f,g;if(0===arguments.length)f=p(C);else if("string"==typeof a&&a)f=a.split(/\s+/);else if("object"==typeof a&&a&&"undefined"==typeof b)for(c in a)r.call(a,c)&&"string"==typeof c&&c&&"function"==typeof a[c]&&ya.off(c,a[c]);if(f&&f.length)for(c=0,d=f.length;c<d;c++)if(a=f[c].toLowerCase().replace(/^on/,""),g=C[a],g&&g.length)if(b)for(e=g.indexOf(b);e!==-1;)g.splice(e,1),e=g.indexOf(b,e);else g.length=0;return ya},N=function(a){var b;return b="string"==typeof a&&a?v(C[a])||null:v(C)},O=function(a){var b,c,d;if(a=Y(a),a&&!ca(a))return"ready"===a.type&&A.overdue===!0?ya.emit({type:"error",name:"flash-overdue"}):(b=u({},a),ba.call(this,b),"copy"===a.type&&(d=ia(D),c=d.data,E=d.formatMap),c)},P=function(){if("boolean"!=typeof A.ready&&(A.ready=!1),!ya.isFlashUnusable()&&null===A.bridge){var a=H.flashLoadTimeout;"number"==typeof a&&a>=0&&h(function(){"boolean"!=typeof A.deactivated&&(A.deactivated=!0),A.deactivated===!0&&ya.emit({type:"error",name:"flash-deactivated"})},a),A.overdue=!1,ga()}},Q=function(){ya.clearData(),ya.blur(),ya.emit("destroy"),ha(),ya.off()},R=function(a,b){var c;if("object"==typeof a&&a&&"undefined"==typeof b)c=a,ya.clearData();else{if("string"!=typeof a||!a)return;c={},c[a]=b}for(var d in c)"string"==typeof d&&d&&r.call(c,d)&&"string"==typeof c[d]&&c[d]&&(D[d]=c[d])},S=function(a){"undefined"==typeof a?(y(D),E=null):"string"==typeof a&&r.call(D,a)&&delete D[a]},T=function(a){return"undefined"==typeof a?v(D):"string"==typeof a&&r.call(D,a)?D[a]:void 0},U=function(a){if(a&&1===a.nodeType){c&&(qa(c,H.activeClass),c!==a&&qa(c,H.hoverClass)),c=a,pa(a,H.hoverClass);var b=a.getAttribute("title")||H.title;if("string"==typeof b&&b){var d=fa(A.bridge);d&&d.setAttribute("title",b)}var e=H.forceHandCursor===!0||"pointer"===ra(a,"cursor");va(e),ua()}},V=function(){var a=fa(A.bridge);a&&(a.removeAttribute("title"),a.style.left="0px",a.style.top="-9999px",a.style.width="1px",a.style.top="1px"),c&&(qa(c,H.hoverClass),qa(c,H.activeClass),c=null)},W=function(){return c||null},X=function(a){return"string"==typeof a&&a&&/^[A-Za-z][A-Za-z0-9_:\-\.]*$/.test(a)},Y=function(a){var b;if("string"==typeof a&&a?(b=a,a={}):"object"==typeof a&&a&&"string"==typeof a.type&&a.type&&(b=a.type),b){u(a,{type:b.toLowerCase(),target:a.target||c||null,relatedTarget:a.relatedTarget||null,currentTarget:A&&A.bridge||null,timeStamp:a.timeStamp||o()||null});var d=F[a.type];return"error"===a.type&&a.name&&d&&(d=d[a.name]),d&&(a.message=d),"ready"===a.type&&u(a,{target:null,version:A.version}),"error"===a.type&&(/^flash-(disabled|outdated|unavailable|deactivated|overdue)$/.test(a.name)&&u(a,{target:null,minimumVersion:B}),/^flash-(outdated|unavailable|deactivated|overdue)$/.test(a.name)&&u(a,{version:A.version})),"copy"===a.type&&(a.clipboardData={setData:ya.setData,clearData:ya.clearData}),"aftercopy"===a.type&&(a=ja(a,E)),a.target&&!a.relatedTarget&&(a.relatedTarget=Z(a.target)),a=$(a)}},Z=function(a){var b=a&&a.getAttribute&&a.getAttribute("data-clipboard-target");return b?f.getElementById(b):null},$=function(a){if(a&&/^_(?:click|mouse(?:over|out|down|up|move))$/.test(a.type)){var c=a.target,d="_mouseover"===a.type&&a.relatedTarget?a.relatedTarget:b,g="_mouseout"===a.type&&a.relatedTarget?a.relatedTarget:b,h=ta(c),i=e.screenLeft||e.screenX||0,j=e.screenTop||e.screenY||0,k=f.body.scrollLeft+f.documentElement.scrollLeft,l=f.body.scrollTop+f.documentElement.scrollTop,m=h.left+("number"==typeof a._stageX?a._stageX:0),n=h.top+("number"==typeof a._stageY?a._stageY:0),o=m-k,p=n-l,q=i+o,r=j+p,s="number"==typeof a.movementX?a.movementX:0,t="number"==typeof a.movementY?a.movementY:0;delete a._stageX,delete a._stageY,u(a,{srcElement:c,fromElement:d,toElement:g,screenX:q,screenY:r,pageX:m,pageY:n,clientX:o,clientY:p,x:o,y:p,movementX:s,movementY:t,offsetX:0,offsetY:0,layerX:0,layerY:0})}return a},_=function(a){var b=a&&"string"==typeof a.type&&a.type||"";return!/^(?:(?:before)?copy|destroy)$/.test(b)},aa=function(a,b,c,d){d?h(function(){a.apply(b,c)},0):a.apply(b,c)},ba=function(a){if("object"==typeof a&&a&&a.type){var b=_(a),c=C["*"]||[],d=C[a.type]||[],f=c.concat(d);if(f&&f.length){var g,h,i,j,k,l=this;for(g=0,h=f.length;g<h;g++)i=f[g],j=l,"string"==typeof i&&"function"==typeof e[i]&&(i=e[i]),"object"==typeof i&&i&&"function"==typeof i.handleEvent&&(j=i,i=i.handleEvent),"function"==typeof i&&(k=u({},a),aa(i,j,[k],b))}return this}},ca=function(a){var b=a.target||c||null,d="swf"===a._source;delete a._source;var e=["flash-disabled","flash-outdated","flash-unavailable","flash-deactivated","flash-overdue"];switch(a.type){case"error":e.indexOf(a.name)!==-1&&u(A,{disabled:"flash-disabled"===a.name,outdated:"flash-outdated"===a.name,unavailable:"flash-unavailable"===a.name,deactivated:"flash-deactivated"===a.name,overdue:"flash-overdue"===a.name,ready:!1});break;case"ready":var f=A.deactivated===!0;u(A,{disabled:!1,outdated:!1,unavailable:!1,deactivated:!1,overdue:f,ready:!f});break;case"copy":var g,h,i=a.relatedTarget;!D["text/html"]&&!D["text/plain"]&&i&&(h=i.value||i.outerHTML||i.innerHTML)&&(g=i.value||i.textContent||i.innerText)?(a.clipboardData.clearData(),a.clipboardData.setData("text/plain",g),h!==g&&a.clipboardData.setData("text/html",h)):!D["text/plain"]&&a.target&&(g=a.target.getAttribute("data-clipboard-text"))&&(a.clipboardData.clearData(),a.clipboardData.setData("text/plain",g));break;case"aftercopy":ya.clearData(),b&&b!==oa()&&b.focus&&b.focus();break;case"_mouseover":ya.focus(b),H.bubbleEvents===!0&&d&&(b&&b!==a.relatedTarget&&!z(a.relatedTarget,b)&&da(u({},a,{type:"mouseenter",bubbles:!1,cancelable:!1})),da(u({},a,{type:"mouseover"})));break;case"_mouseout":ya.blur(),H.bubbleEvents===!0&&d&&(b&&b!==a.relatedTarget&&!z(a.relatedTarget,b)&&da(u({},a,{type:"mouseleave",bubbles:!1,cancelable:!1})),da(u({},a,{type:"mouseout"})));break;case"_mousedown":pa(b,H.activeClass),H.bubbleEvents===!0&&d&&da(u({},a,{type:a.type.slice(1)}));break;case"_mouseup":qa(b,H.activeClass),H.bubbleEvents===!0&&d&&da(u({},a,{type:a.type.slice(1)}));break;case"_click":case"_mousemove":H.bubbleEvents===!0&&d&&da(u({},a,{type:a.type.slice(1)}))}if(/^_(?:click|mouse(?:over|out|down|up|move))$/.test(a.type))return!0},da=function(a){if(a&&"string"==typeof a.type&&a){var b,c=a.target||null,d=c&&c.ownerDocument||f,g={view:d.defaultView||e,canBubble:!0,cancelable:!0,detail:"click"===a.type?1:0,button:"number"==typeof a.which?a.which-1:"number"==typeof a.button?a.button:d.createEvent?0:1},h=u(g,a);c&&d.createEvent&&c.dispatchEvent&&(h=[h.type,h.canBubble,h.cancelable,h.view,h.detail,h.screenX,h.screenY,h.clientX,h.clientY,h.ctrlKey,h.altKey,h.shiftKey,h.metaKey,h.button,h.relatedTarget],b=d.createEvent("MouseEvents"),b.initMouseEvent&&(b.initMouseEvent.apply(b,h),b._source="js",c.dispatchEvent(b)))}},ea=function(){var a=f.createElement("div");return a.id=H.containerId,a.className=H.containerClass,a.style.position="absolute",a.style.left="0px",a.style.top="-9999px",a.style.width="1px",a.style.height="1px",a.style.zIndex=""+wa(H.zIndex),a},fa=function(a){for(var b=a&&a.parentNode;b&&"OBJECT"===b.nodeName&&b.parentNode;)b=b.parentNode;return b||null},ga=function(){var a,b=A.bridge,c=fa(b);if(!b){var d=na(e.location.host,H),g="never"===d?"none":"all",h=la(H),i=H.swfPath+ka(H.swfPath,H);c=ea();var j=f.createElement("div");c.appendChild(j),f.body.appendChild(c);var k=f.createElement("div"),l="activex"===A.pluginType;k.innerHTML='<object id="'+H.swfObjectId+'" name="'+H.swfObjectId+'" width="100%" height="100%" '+(l?'classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"':'type="application/x-shockwave-flash" data="'+i+'"')+">"+(l?'<param name="movie" value="'+i+'"/>':"")+'<param name="allowScriptAccess" value="'+d+'"/><param name="allowNetworking" value="'+g+'"/><param name="menu" value="false"/><param name="wmode" value="transparent"/><param name="flashvars" value="'+h+'"/></object>',b=k.firstChild,k=null,b.ZeroClipboard=ya,c.replaceChild(b,j)}return b||(b=f[H.swfObjectId],b&&(a=b.length)&&(b=b[a-1]),!b&&c&&(b=c.firstChild)),A.bridge=b||null,b},ha=function(){var a=A.bridge;if(a){var b=fa(a);b&&("activex"===A.pluginType&&"readyState"in a?(a.style.display="none",function c(){if(4===a.readyState){for(var d in a)"function"==typeof a[d]&&(a[d]=null);a.parentNode&&a.parentNode.removeChild(a),b.parentNode&&b.parentNode.removeChild(b)}else h(c,10)}()):(a.parentNode&&a.parentNode.removeChild(a),b.parentNode&&b.parentNode.removeChild(b))),A.ready=null,A.bridge=null,A.deactivated=null}},ia=function(a){var b={},c={};if("object"==typeof a&&a){for(var d in a)if(d&&r.call(a,d)&&"string"==typeof a[d]&&a[d])switch(d.toLowerCase()){case"text/plain":case"text":case"air:text":case"flash:text":b.text=a[d],c.text=d;break;case"text/html":case"html":case"air:html":case"flash:html":b.html=a[d],c.html=d;break;case"application/rtf":case"text/rtf":case"rtf":case"richtext":case"air:rtf":case"flash:rtf":b.rtf=a[d],c.rtf=d}return{data:b,formatMap:c}}},ja=function(a,b){if("object"!=typeof a||!a||"object"!=typeof b||!b)return a;var c={};for(var d in a)if(r.call(a,d)){if("success"!==d&&"data"!==d){c[d]=a[d];continue}c[d]={};var e=a[d];for(var f in e)f&&r.call(e,f)&&r.call(b,f)&&(c[d][b[f]]=e[f])}return c},ka=function(a,b){var c=null==b||b&&b.cacheBust===!0;return c?(a.indexOf("?")===-1?"?":"&")+"noCache="+o():""},la=function(a){var b,c,d,f,g="",h=[];if(a.trustedDomains&&("string"==typeof a.trustedDomains?f=[a.trustedDomains]:"object"==typeof a.trustedDomains&&"length"in a.trustedDomains&&(f=a.trustedDomains)),f&&f.length)for(b=0,c=f.length;b<c;b++)if(r.call(f,b)&&f[b]&&"string"==typeof f[b]){if(d=ma(f[b]),!d)continue;if("*"===d){h.length=0,h.push(d);break}h.push.apply(h,[d,"//"+d,e.location.protocol+"//"+d])}return h.length&&(g+="trustedOrigins="+i(h.join(","))),a.forceEnhancedClipboard===!0&&(g+=(g?"&":"")+"forceEnhancedClipboard=true"),"string"==typeof a.swfObjectId&&a.swfObjectId&&(g+=(g?"&":"")+"swfObjectId="+i(a.swfObjectId)),g},ma=function(a){if(null==a||""===a)return null;if(a=a.replace(/^\s+|\s+$/g,""),""===a)return null;var b=a.indexOf("//");a=b===-1?a:a.slice(b+2);var c=a.indexOf("/");return a=c===-1?a:b===-1||0===c?null:a.slice(0,c),a&&".swf"===a.slice(-4).toLowerCase()?null:a||null},na=function(){var a=function(a){var b,c,d,e=[];if("string"==typeof a&&(a=[a]),"object"!=typeof a||!a||"number"!=typeof a.length)return e;for(b=0,c=a.length;b<c;b++)if(r.call(a,b)&&(d=ma(a[b]))){if("*"===d){e.length=0,e.push("*");break}e.indexOf(d)===-1&&e.push(d)}return e};return function(b,c){var d=ma(c.swfPath);null===d&&(d=b);var e=a(c.trustedDomains),f=e.length;if(f>0){if(1===f&&"*"===e[0])return"always";if(e.indexOf(b)!==-1)return 1===f&&b===d?"sameDomain":"always"}return"never"}}(),oa=function(){try{return f.activeElement}catch(a){return null}},pa=function(a,b){if(!a||1!==a.nodeType)return a;if(a.classList)return a.classList.contains(b)||a.classList.add(b),a;if(b&&"string"==typeof b){var c=(b||"").split(/\s+/);if(1===a.nodeType)if(a.className){for(var d=" "+a.className+" ",e=a.className,f=0,g=c.length;f<g;f++)d.indexOf(" "+c[f]+" ")<0&&(e+=" "+c[f]);a.className=e.replace(/^\s+|\s+$/g,"")}else a.className=b}return a},qa=function(a,b){if(!a||1!==a.nodeType)return a;if(a.classList)return a.classList.contains(b)&&a.classList.remove(b),a;if("string"==typeof b&&b){var c=b.split(/\s+/);if(1===a.nodeType&&a.className){for(var d=(" "+a.className+" ").replace(/[\n\t]/g," "),e=0,f=c.length;e<f;e++)d=d.replace(" "+c[e]+" "," ");a.className=d.replace(/^\s+|\s+$/g,"")}}return a},ra=function(a,b){var c=e.getComputedStyle(a,null).getPropertyValue(b);return"cursor"!==b||c&&"auto"!==c||"A"!==a.nodeName?c:"pointer"},sa=function(){var a,b,c,d=1;return"function"==typeof f.body.getBoundingClientRect&&(a=f.body.getBoundingClientRect(),b=a.right-a.left,c=f.body.offsetWidth,d=n(b/c*100)/100),d},ta=function(a){var b={left:0,top:0,width:0,height:0};if(a.getBoundingClientRect){var c,d,g,h=a.getBoundingClientRect();"pageXOffset"in e&&"pageYOffset"in e?(c=e.pageXOffset,d=e.pageYOffset):(g=sa(),c=n(f.documentElement.scrollLeft/g),d=n(f.documentElement.scrollTop/g));var i=f.documentElement.clientLeft||0,j=f.documentElement.clientTop||0;b.left=h.left+c-i,b.top=h.top+d-j,b.width="width"in h?h.width:h.right-h.left,b.height="height"in h?h.height:h.bottom-h.top}return b},ua=function(){var a;if(c&&(a=fa(A.bridge))){var b=ta(c);u(a.style,{width:b.width+"px",height:b.height+"px",top:b.top+"px",left:b.left+"px",zIndex:""+wa(H.zIndex)})}},va=function(a){A.ready===!0&&(A.bridge&&"function"==typeof A.bridge.setHandCursor?A.bridge.setHandCursor(a):A.ready=!1)},wa=function(a){if(/^(?:auto|inherit)$/.test(a))return a;var b;return"number"!=typeof a||m(a)?"string"==typeof a&&(b=wa(k(a,10))):b=a,"number"==typeof b?b:"auto"},xa=function(a){function b(a){var b=a.match(/[\d]+/g);return b.length=3,b.join(".")}function c(a){return!!a&&(a=a.toLowerCase())&&(/^(pepflashplayer\.dll|libpepflashplayer\.so|pepperflashplayer\.plugin)$/.test(a)||"chrome.plugin"===a.slice(-13))}function d(a){a&&(i=!0,a.version&&(m=b(a.version)),!m&&a.description&&(m=b(a.description)),a.filename&&(k=c(a.filename)))}var e,f,h,i=!1,j=!1,k=!1,m="";if(g.plugins&&g.plugins.length)e=g.plugins["Shockwave Flash"],d(e),g.plugins["Shockwave Flash 2.0"]&&(i=!0,m="2.0.0.11");else if(g.mimeTypes&&g.mimeTypes.length)h=g.mimeTypes["application/x-shockwave-flash"],e=h&&h.enabledPlugin,d(e);else if("undefined"!=typeof a){j=!0;try{f=new a("ShockwaveFlash.ShockwaveFlash.7"),i=!0,m=b(f.GetVariable("$version"))}catch(c){try{f=new a("ShockwaveFlash.ShockwaveFlash.6"),i=!0,m="6.0.21"}catch(c){try{f=new a("ShockwaveFlash.ShockwaveFlash"),i=!0,m=b(f.GetVariable("$version"))}catch(a){j=!1}}}}A.disabled=i!==!0,A.outdated=m&&l(m)<l(B),A.version=m||"0.0.0",A.pluginType=k?"pepper":j?"activex":i?"netscape":"unknown"};xa(j);var ya=function(){return this instanceof ya?void("function"==typeof ya._createClient&&ya._createClient.apply(this,t(arguments))):new ya};q(ya,"version",{value:"2.1.2",writable:!1,configurable:!0,enumerable:!0}),ya.config=function(){return I.apply(this,t(arguments))},ya.state=function(){return J.apply(this,t(arguments))},ya.isFlashUnusable=function(){return K.apply(this,t(arguments))},ya.on=function(){return L.apply(this,t(arguments))},ya.off=function(){return M.apply(this,t(arguments))},ya.handlers=function(){return N.apply(this,t(arguments))},ya.emit=function(){return O.apply(this,t(arguments))},ya.create=function(){return P.apply(this,t(arguments))},ya.destroy=function(){return Q.apply(this,t(arguments))},ya.setData=function(){return R.apply(this,t(arguments))},ya.clearData=function(){return S.apply(this,t(arguments))},ya.getData=function(){return T.apply(this,t(arguments))},ya.focus=ya.activate=function(){return U.apply(this,t(arguments))},ya.blur=ya.deactivate=function(){return V.apply(this,t(arguments))},ya.activeElement=function(){return W.apply(this,t(arguments))},"function"==typeof define&&define.amd?define(function(){return ya}):"object"==typeof d&&d&&"object"==typeof d.exports&&d.exports?d.exports=ya:a.ZeroClipboard=ya}(function(){return this||b}()),function(a,b,c){function d(){for(var a,c="",d={},e=b.getSelection(),f=document.createElement("div"),g=0,h=e.rangeCount;g<h;g++)a=e.getRangeAt(g),c+=a.toString(),f.appendChild(a.cloneContents());return d["text/plain"]=c,c.replace(/\s/g,"")&&(d["text/html"]=f.innerHTML),d}function e(a){if("string"!=typeof a||!a)return null;var b,c,d=a;return d=d.replace(/<(?:hr)(?:\s+[^>]*)?\s*[\/]?>/gi,"{\\pard \\brdrb \\brdrs \\brdrw10 \\brsp20 \\par}\n{\\pard\\par}\n"),d=d.replace(/<(?:br)(?:\s+[^>]*)?\s*[\/]?>/gi,"{\\pard\\par}\n"),d=d.replace(/<(?:p|div|section|article)(?:\s+[^>]*)?\s*[\/]>/gi,"{\\pard\\par}\n"),d=d.replace(/<(?:[^>]+)\/>/g,""),d=d.replace(/<a(?:\s+[^>]*)?(?:\s+href=(["'])(?:javascript:void\(0?\);?|#|return false;?|void\(0?\);?|)\1)(?:\s+[^>]*)?>/gi,"{{{\n"),b=d,d=d.replace(/<a(?:\s+[^>]*)?(?:\s+href=(["'])(.+)\1)(?:\s+[^>]*)?>/gi,'{\\field{\\*\\fldinst{HYPERLINK\n "$2"\n}}{\\fldrslt{\\ul\\cf1\n'),c=d!==b,d=d.replace(/<a(?:\s+[^>]*)?>/gi,"{{{\n"),d=d.replace(/<\/a(?:\s+[^>]*)?>/gi,"\n}}}"),d=d.replace(/<(?:b|strong)(?:\s+[^>]*)?>/gi,"{\\b\n"),d=d.replace(/<(?:i|em)(?:\s+[^>]*)?>/gi,"{\\i\n"),d=d.replace(/<(?:u|ins)(?:\s+[^>]*)?>/gi,"{\\ul\n"),d=d.replace(/<(?:strike|del)(?:\s+[^>]*)?>/gi,"{\\strike\n"),d=d.replace(/<sup(?:\s+[^>]*)?>/gi,"{\\super\n"),d=d.replace(/<sub(?:\s+[^>]*)?>/gi,"{\\sub\n"),d=d.replace(/<(?:p|div|section|article)(?:\s+[^>]*)?>/gi,"{\\pard\n"),d=d.replace(/<\/(?:p|div|section|article)(?:\s+[^>]*)?>/gi,"\n\\par}\n"),d=d.replace(/<\/(?:b|strong|i|em|u|ins|strike|del|sup|sub)(?:\s+[^>]*)?>/gi,"\n}"),d=d.replace(/<(?:[^>]+)>/g,""),d="{\\rtf1\\ansi\n"+(c?"{\\colortbl\n;\n\\red0\\green0\\blue255;\n}\n":"")+d+"\n}"}function f(b){var c=a.Event(b.type,a.extend(b,{_source:"swf"}));if(a(b.target).trigger(c),"copy"===c.type){if(a.event.special.copy.options.requirePreventDefault===!0&&!c.isDefaultPrevented()){b.clipboardData.clearData();var f=d();(f["text/plain"]||f["text/html"])&&b.clipboardData.setData(f)}var g=o.getData();if(a.event.special.copy.options.autoConvertHtmlToRtf===!0&&g["text/html"]&&!g["application/rtf"]){var h=e(g["text/html"]);b.clipboardData.setData("application/rtf",h)}}}function g(b){var c=a.Event("copy-error",a.extend(b,{type:"copy-error",_source:"swf"}));a(b.target).trigger(c)}function h(){a.event.props.push("clipboardData"),o.config(a.extend(!0,{autoActivate:!1},q.options)),o.on("beforecopy copy aftercopy",f),o.on("error",g),o.create()}function i(){o.destroy();var b=a.event.props.indexOf("clipboardData");b!==-1&&a.event.props.splice(b,1)}function j(b){l(b),b.target&&b.target!==o.activeElement()&&b.target!==a("#"+o.config("containerId"))[0]&&b.target!==a("#"+o.config("swfObjectId"))[0]&&o.focus(b.target)}function k(b){l(b),b.relatedTarget&&b.relatedTarget!==o.activeElement()&&b.relatedTarget!==a("#"+o.config("containerId"))[0]&&b.relatedTarget!==a("#"+o.config("swfObjectId"))[0]&&o.blur()}function l(a){o.isFlashUnusable()||"js"===a.originalEvent._source||(a.stopImmediatePropagation(),a.preventDefault())}var m=0,n=".zeroclipboard",o=b.ZeroClipboard,p=o.config("trustedDomains"),q={add:function(b){0===m++&&h();var c=n+(b.namespace?"."+b.namespace:""),d=b.selector,e="zc|{"+d+"}|{"+c+"}|count",f=a(this);"number"!=typeof f.data(e)&&f.data(e,0),0===f.data(e)&&(f.on("mouseenter"+c,d,j),f.on("mouseleave"+c,d,k),f.on("mouseover"+c,d,l),f.on("mouseout"+c,d,l),f.on("mousemove"+c,d,l),f.on("mousedown"+c,d,l),f.on("mouseup"+c,d,l),f.on("click"+c,d,l)),f.data(e,f.data(e)+1)},remove:function(b){var c=n+(b.namespace?"."+b.namespace:""),d=b.selector,e="zc|{"+d+"}|{"+c+"}|count",f=a(this);f.data(e,f.data(e)-1),0===f.data(e)&&(f.off("click"+c,d,l),f.off("mouseup"+c,d,l),f.off("mousedown"+c,d,l),f.off("mousemove"+c,d,l),f.off("mouseout"+c,d,l),f.off("mouseover"+c,d,l),f.off("mouseleave"+c,d,k),f.off("mouseenter"+c,d,j),f.removeData(e)),0===--m&&i()},trigger:function(b){if("copy"===b.type){var c=a(this),d="swf"===b._source;delete b._source,d||(c.trigger(a.extend(!0,{},b,{type:"beforecopy"})),c.one("copy",function(){var d={},e=o.getData();a.each(e,function(a){d[a]=!1});var f=a.extend(!0,{},b,{type:"aftercopy",data:a.extend(!0,{},e),success:d});c.trigger(f)}))}},_default:function(){return!0},options:{requirePreventDefault:!0,autoConvertHtmlToRtf:!0,trustedDomains:p,hoverClass:"hover",activeClass:"active"}};a.event.special.beforecopy=q,a.event.special.copy=q,a.event.special.aftercopy=q,a.event.special["copy-error"]=q}(jQuery,function(){return this||b}()),e||delete b.ZeroClipboard}(jQuery,function(){return this||window}());
\ No newline at end of file
diff --git a/assets/js/zoom/jquery.zoom.js b/assets/js/zoom/jquery.zoom.js
new file mode 100644
index 00000000000..17e8d651e06
--- /dev/null
+++ b/assets/js/zoom/jquery.zoom.js
@@ -0,0 +1,234 @@
+/*!
+	Zoom 1.7.18
+	license: MIT
+	http://www.jacklmoore.com/zoom
+*/
+(function ($) {
+	var defaults = {
+		url: false,
+		callback: false,
+		target: false,
+		duration: 120,
+		on: 'mouseover', // other options: grab, click, toggle
+		touch: true, // enables a touch fallback
+		onZoomIn: false,
+		onZoomOut: false,
+		magnify: 1
+	};
+
+	// Core Zoom Logic, independent of event listeners.
+	$.zoom = function(target, source, img, magnify) {
+		var targetHeight,
+			targetWidth,
+			sourceHeight,
+			sourceWidth,
+			xRatio,
+			yRatio,
+			offset,
+			$target = $(target),
+			position = $target.css('position'),
+			$source = $(source);
+
+		// The parent element needs positioning so that the zoomed element can be correctly positioned within.
+		target.style.position = /(absolute|fixed)/.test(position) ? position : 'relative';
+		target.style.overflow = 'hidden';
+		img.style.width = img.style.height = '';
+
+		$(img)
+			.addClass('zoomImg')
+			.css({
+				position: 'absolute',
+				top: 0,
+				left: 0,
+				opacity: 0,
+				width: img.width * magnify,
+				height: img.height * magnify,
+				border: 'none',
+				maxWidth: 'none',
+				maxHeight: 'none'
+			})
+			.appendTo(target);
+
+		return {
+			init: function() {
+				targetWidth = $target.outerWidth();
+				targetHeight = $target.outerHeight();
+
+				if (source === target) {
+					sourceWidth = targetWidth;
+					sourceHeight = targetHeight;
+				} else {
+					sourceWidth = $source.outerWidth();
+					sourceHeight = $source.outerHeight();
+				}
+
+				xRatio = (img.width - targetWidth) / sourceWidth;
+				yRatio = (img.height - targetHeight) / sourceHeight;
+
+				offset = $source.offset();
+			},
+			move: function (e) {
+				var left = (e.pageX - offset.left),
+					top = (e.pageY - offset.top);
+
+				top = Math.max(Math.min(top, sourceHeight), 0);
+				left = Math.max(Math.min(left, sourceWidth), 0);
+
+				img.style.left = (left * -xRatio) + 'px';
+				img.style.top = (top * -yRatio) + 'px';
+			}
+		};
+	};
+
+	$.fn.zoom = function (options) {
+		return this.each(function () {
+			var
+			settings = $.extend({}, defaults, options || {}),
+			//target will display the zoomed image
+			target = settings.target && $(settings.target)[0] || this,
+			//source will provide zoom location info (thumbnail)
+			source = this,
+			$source = $(source),
+			img = document.createElement('img'),
+			$img = $(img),
+			mousemove = 'mousemove.zoom',
+			clicked = false,
+			touched = false;
+
+			// If a url wasn't specified, look for an image element.
+			if (!settings.url) {
+				var srcElement = source.querySelector('img');
+				if (srcElement) {
+					settings.url = srcElement.getAttribute('data-src') || srcElement.currentSrc || srcElement.src;
+				}
+				if (!settings.url) {
+					return;
+				}
+			}
+
+			$source.one('zoom.destroy', function(position, overflow){
+				$source.off(".zoom");
+				target.style.position = position;
+				target.style.overflow = overflow;
+				img.onload = null;
+				$img.remove();
+			}.bind(this, target.style.position, target.style.overflow));
+
+			img.onload = function () {
+				var zoom = $.zoom(target, source, img, settings.magnify);
+
+				function start(e) {
+					zoom.init();
+					zoom.move(e);
+
+					// Skip the fade-in for IE8 and lower since it chokes on fading-in
+					// and changing position based on mousemovement at the same time.
+					$img.stop()
+					.fadeTo($.support.opacity ? settings.duration : 0, 1, $.isFunction(settings.onZoomIn) ? settings.onZoomIn.call(img) : false);
+				}
+
+				function stop() {
+					$img.stop()
+					.fadeTo(settings.duration, 0, $.isFunction(settings.onZoomOut) ? settings.onZoomOut.call(img) : false);
+				}
+
+				// Mouse events
+				if (settings.on === 'grab') {
+					$source
+						.on('mousedown.zoom',
+							function (e) {
+								if (e.which === 1) {
+									$(document).one('mouseup.zoom',
+										function () {
+											stop();
+
+											$(document).off(mousemove, zoom.move);
+										}
+									);
+
+									start(e);
+
+									$(document).on(mousemove, zoom.move);
+
+									e.preventDefault();
+								}
+							}
+						);
+				} else if (settings.on === 'click') {
+					$source.on('click.zoom',
+						function (e) {
+							if (clicked) {
+								// bubble the event up to the document to trigger the unbind.
+								return;
+							} else {
+								clicked = true;
+								start(e);
+								$(document).on(mousemove, zoom.move);
+								$(document).one('click.zoom',
+									function () {
+										stop();
+										clicked = false;
+										$(document).off(mousemove, zoom.move);
+									}
+								);
+								return false;
+							}
+						}
+					);
+				} else if (settings.on === 'toggle') {
+					$source.on('click.zoom',
+						function (e) {
+							if (clicked) {
+								stop();
+							} else {
+								start(e);
+							}
+							clicked = !clicked;
+						}
+					);
+				} else if (settings.on === 'mouseover') {
+					zoom.init(); // Preemptively call init because IE7 will fire the mousemove handler before the hover handler.
+
+					$source
+						.on('mouseenter.zoom', start)
+						.on('mouseleave.zoom', stop)
+						.on(mousemove, zoom.move);
+				}
+
+				// Touch fallback
+				if (settings.touch) {
+					$source
+						.on('touchstart.zoom', function (e) {
+							e.preventDefault();
+							if (touched) {
+								touched = false;
+								stop();
+							} else {
+								touched = true;
+								start( e.originalEvent.touches[0] || e.originalEvent.changedTouches[0] );
+							}
+						})
+						.on('touchmove.zoom', function (e) {
+							e.preventDefault();
+							zoom.move( e.originalEvent.touches[0] || e.originalEvent.changedTouches[0] );
+						})
+						.on('touchend.zoom', function (e) {
+							e.preventDefault();
+							if (touched) {
+								touched = false;
+								stop();
+							}
+						});
+				}
+
+				if ($.isFunction(settings.callback)) {
+					settings.callback.call(img);
+				}
+			};
+
+			img.src = settings.url;
+		});
+	};
+
+	$.fn.zoom.defaults = defaults;
+}(window.jQuery));
diff --git a/assets/js/zoom/jquery.zoom.min.js b/assets/js/zoom/jquery.zoom.min.js
new file mode 100644
index 00000000000..7ff7153cb03
--- /dev/null
+++ b/assets/js/zoom/jquery.zoom.min.js
@@ -0,0 +1,6 @@
+/*!
+	Zoom 1.7.18
+	license: MIT
+	http://www.jacklmoore.com/zoom
+*/
+!function(a){var b={url:!1,callback:!1,target:!1,duration:120,on:"mouseover",touch:!0,onZoomIn:!1,onZoomOut:!1,magnify:1};a.zoom=function(b,c,d,e){var f,g,h,i,j,k,l,m=a(b),n=m.css("position"),o=a(c);return b.style.position=/(absolute|fixed)/.test(n)?n:"relative",b.style.overflow="hidden",d.style.width=d.style.height="",a(d).addClass("zoomImg").css({position:"absolute",top:0,left:0,opacity:0,width:d.width*e,height:d.height*e,border:"none",maxWidth:"none",maxHeight:"none"}).appendTo(b),{init:function(){g=m.outerWidth(),f=m.outerHeight(),c===b?(i=g,h=f):(i=o.outerWidth(),h=o.outerHeight()),j=(d.width-g)/i,k=(d.height-f)/h,l=o.offset()},move:function(a){var b=a.pageX-l.left,c=a.pageY-l.top;c=Math.max(Math.min(c,h),0),b=Math.max(Math.min(b,i),0),d.style.left=b*-j+"px",d.style.top=c*-k+"px"}}},a.fn.zoom=function(c){return this.each(function(){var d=a.extend({},b,c||{}),e=d.target&&a(d.target)[0]||this,f=this,g=a(f),h=document.createElement("img"),i=a(h),j="mousemove.zoom",k=!1,l=!1;if(!d.url){var m=f.querySelector("img");if(m&&(d.url=m.getAttribute("data-src")||m.currentSrc||m.src),!d.url)return}g.one("zoom.destroy",function(a,b){g.off(".zoom"),e.style.position=a,e.style.overflow=b,h.onload=null,i.remove()}.bind(this,e.style.position,e.style.overflow)),h.onload=function(){function b(b){m.init(),m.move(b),i.stop().fadeTo(a.support.opacity?d.duration:0,1,!!a.isFunction(d.onZoomIn)&&d.onZoomIn.call(h))}function c(){i.stop().fadeTo(d.duration,0,!!a.isFunction(d.onZoomOut)&&d.onZoomOut.call(h))}var m=a.zoom(e,f,h,d.magnify);"grab"===d.on?g.on("mousedown.zoom",function(d){1===d.which&&(a(document).one("mouseup.zoom",function(){c(),a(document).off(j,m.move)}),b(d),a(document).on(j,m.move),d.preventDefault())}):"click"===d.on?g.on("click.zoom",function(d){return k?void 0:(k=!0,b(d),a(document).on(j,m.move),a(document).one("click.zoom",function(){c(),k=!1,a(document).off(j,m.move)}),!1)}):"toggle"===d.on?g.on("click.zoom",function(a){k?c():b(a),k=!k}):"mouseover"===d.on&&(m.init(),g.on("mouseenter.zoom",b).on("mouseleave.zoom",c).on(j,m.move)),d.touch&&g.on("touchstart.zoom",function(a){a.preventDefault(),l?(l=!1,c()):(l=!0,b(a.originalEvent.touches[0]||a.originalEvent.changedTouches[0]))}).on("touchmove.zoom",function(a){a.preventDefault(),m.move(a.originalEvent.touches[0]||a.originalEvent.changedTouches[0])}).on("touchend.zoom",function(a){a.preventDefault(),l&&(l=!1,c())}),a.isFunction(d.callback)&&d.callback.call(h)},h.src=d.url})},a.fn.zoom.defaults=b}(window.jQuery);
\ No newline at end of file
diff --git a/composer.json b/composer.json
new file mode 100644
index 00000000000..c5263b52868
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,23 @@
+{
+  "name": "woocommerce/woocommerce",
+  "description": "An e-commerce toolkit that helps you sell anything. Beautifully.",
+  "homepage": "https://woocommerce.com/",
+  "type": "wordpress-plugin",
+  "license": "GPL-2.0+",
+  "require": {
+    "composer/installers": "~1.2"
+  },
+  "require-dev": {
+    "squizlabs/php_codesniffer": "*",
+    "wp-coding-standards/wpcs": "0.10.0",
+    "phpunit/phpunit": "5.7.19"
+  },
+  "scripts": {
+    "post-install-cmd": [
+      "\"vendor/bin/phpcs\" --config-set installed_paths vendor/wp-coding-standards/wpcs"
+    ],
+    "post-update-cmd": [
+      "\"vendor/bin/phpcs\" --config-set installed_paths vendor/wp-coding-standards/wpcs"
+    ]
+  }
+}
diff --git a/composer.lock b/composer.lock
new file mode 100644
index 00000000000..e548a7eef1b
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,1553 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "3e1a8fa4256dcf3ef3caee1b027d6779",
+    "packages": [
+        {
+            "name": "composer/installers",
+            "version": "v1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/installers.git",
+                "reference": "d78064c68299743e0161004f2de3a0204e33b804"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/installers/zipball/d78064c68299743e0161004f2de3a0204e33b804",
+                "reference": "d78064c68299743e0161004f2de3a0204e33b804",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.0"
+            },
+            "replace": {
+                "roundcube/plugin-installer": "*",
+                "shama/baton": "*"
+            },
+            "require-dev": {
+                "composer/composer": "1.0.*@dev",
+                "phpunit/phpunit": "4.1.*"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "class": "Composer\\Installers\\Plugin",
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\Installers\\": "src/Composer/Installers"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Kyle Robinson Young",
+                    "email": "kyle@dontkry.com",
+                    "homepage": "https://github.com/shama"
+                }
+            ],
+            "description": "A multi-framework Composer library installer",
+            "homepage": "https://composer.github.io/installers/",
+            "keywords": [
+                "Craft",
+                "Dolibarr",
+                "Hurad",
+                "ImageCMS",
+                "MODX Evo",
+                "Mautic",
+                "OXID",
+                "Plentymarkets",
+                "RadPHP",
+                "SMF",
+                "Thelia",
+                "WolfCMS",
+                "agl",
+                "aimeos",
+                "annotatecms",
+                "attogram",
+                "bitrix",
+                "cakephp",
+                "chef",
+                "cockpit",
+                "codeigniter",
+                "concrete5",
+                "croogo",
+                "dokuwiki",
+                "drupal",
+                "elgg",
+                "expressionengine",
+                "fuelphp",
+                "grav",
+                "installer",
+                "joomla",
+                "kohana",
+                "laravel",
+                "lithium",
+                "magento",
+                "mako",
+                "mediawiki",
+                "modulework",
+                "moodle",
+                "phpbb",
+                "piwik",
+                "ppi",
+                "puppet",
+                "reindex",
+                "roundcube",
+                "shopware",
+                "silverstripe",
+                "symfony",
+                "typo3",
+                "wordpress",
+                "yawik",
+                "zend",
+                "zikula"
+            ],
+            "time": "2016-08-13T20:53:52+00:00"
+        }
+    ],
+    "packages-dev": [
+        {
+            "name": "doctrine/instantiator",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3,<8.0-DEV"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2015-06-14T21:17:01+00:00"
+        },
+        {
+            "name": "myclabs/deep-copy",
+            "version": "1.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/myclabs/DeepCopy.git",
+                "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8e6e04167378abf1ddb4d3522d8755c5fd90d102",
+                "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "doctrine/collections": "1.*",
+                "phpunit/phpunit": "~4.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Create deep copies (clones) of your objects",
+            "homepage": "https://github.com/myclabs/DeepCopy",
+            "keywords": [
+                "clone",
+                "copy",
+                "duplicate",
+                "object",
+                "object graph"
+            ],
+            "time": "2017-04-12T18:52:22+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-common",
+            "version": "1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
+                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "opensource@ijaap.nl"
+                }
+            ],
+            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "FQSEN",
+                "phpDocumentor",
+                "phpdoc",
+                "reflection",
+                "static analysis"
+            ],
+            "time": "2015-12-27T11:43:31+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "3.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e",
+                "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5",
+                "phpdocumentor/reflection-common": "^1.0@dev",
+                "phpdocumentor/type-resolver": "^0.2.0",
+                "webmozart/assert": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^4.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+            "time": "2016-09-30T07:12:33+00:00"
+        },
+        {
+            "name": "phpdocumentor/type-resolver",
+            "version": "0.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/TypeResolver.git",
+                "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb",
+                "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5",
+                "phpdocumentor/reflection-common": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^5.2||^4.8.24"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "time": "2016-11-25T06:54:22+00:00"
+        },
+        {
+            "name": "phpspec/prophecy",
+            "version": "v1.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/prophecy.git",
+                "reference": "93d39f1f7f9326d746203c7c056f300f7f126073"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073",
+                "reference": "93d39f1f7f9326d746203c7c056f300f7f126073",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.3|^7.0",
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
+                "sebastian/comparator": "^1.1|^2.0",
+                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "^2.5|^3.2",
+                "phpunit/phpunit": "^4.8 || ^5.6.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.6.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Prophecy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "email": "marcello.duarte@gmail.com"
+                }
+            ],
+            "description": "Highly opinionated mocking framework for PHP 5.3+",
+            "homepage": "https://github.com/phpspec/prophecy",
+            "keywords": [
+                "Double",
+                "Dummy",
+                "fake",
+                "mock",
+                "spy",
+                "stub"
+            ],
+            "time": "2017-03-02T20:05:34+00:00"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "4.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef7b2f56815df854e66ceaee8ebe9393ae36a40d",
+                "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-xmlwriter": "*",
+                "php": "^5.6 || ^7.0",
+                "phpunit/php-file-iterator": "^1.3",
+                "phpunit/php-text-template": "^1.2",
+                "phpunit/php-token-stream": "^1.4.2 || ^2.0",
+                "sebastian/code-unit-reverse-lookup": "^1.0",
+                "sebastian/environment": "^1.3.2 || ^2.0",
+                "sebastian/version": "^1.0 || ^2.0"
+            },
+            "require-dev": {
+                "ext-xdebug": "^2.1.4",
+                "phpunit/phpunit": "^5.7"
+            },
+            "suggest": {
+                "ext-xdebug": "^2.5.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2017-04-02T07:44:40+00:00"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "1.4.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
+                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2016-10-03T07:40:28+00:00"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2015-06-21T13:50:34+00:00"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "1.0.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2017-02-26T11:10:40+00:00"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "1.4.11",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e03f8f67534427a787e21a385a67ec3ca6978ea7",
+                "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "time": "2017-02-27T10:12:30+00:00"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "5.7.19",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "69c4f49ff376af2692bad9cebd883d17ebaa98a1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/69c4f49ff376af2692bad9cebd883d17ebaa98a1",
+                "reference": "69c4f49ff376af2692bad9cebd883d17ebaa98a1",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-libxml": "*",
+                "ext-mbstring": "*",
+                "ext-xml": "*",
+                "myclabs/deep-copy": "~1.3",
+                "php": "^5.6 || ^7.0",
+                "phpspec/prophecy": "^1.6.2",
+                "phpunit/php-code-coverage": "^4.0.4",
+                "phpunit/php-file-iterator": "~1.4",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-timer": "^1.0.6",
+                "phpunit/phpunit-mock-objects": "^3.2",
+                "sebastian/comparator": "^1.2.4",
+                "sebastian/diff": "~1.2",
+                "sebastian/environment": "^1.3.4 || ^2.0",
+                "sebastian/exporter": "~2.0",
+                "sebastian/global-state": "^1.1",
+                "sebastian/object-enumerator": "~2.0",
+                "sebastian/resource-operations": "~1.0",
+                "sebastian/version": "~1.0.3|~2.0",
+                "symfony/yaml": "~2.1|~3.0"
+            },
+            "conflict": {
+                "phpdocumentor/reflection-docblock": "3.0.2"
+            },
+            "require-dev": {
+                "ext-pdo": "*"
+            },
+            "suggest": {
+                "ext-xdebug": "*",
+                "phpunit/php-invoker": "~1.1"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.7.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "time": "2017-04-03T02:22:27+00:00"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "3.4.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3ab72b65b39b491e0c011e2e09bb2206c2aa8e24",
+                "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.6 || ^7.0",
+                "phpunit/php-text-template": "^1.2",
+                "sebastian/exporter": "^1.2 || ^2.0"
+            },
+            "conflict": {
+                "phpunit/phpunit": "<5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.4"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ],
+            "time": "2016-12-08T20:27:08+00:00"
+        },
+        {
+            "name": "sebastian/code-unit-reverse-lookup",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
+                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Looks up which function or method a line of code belongs to",
+            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
+            "time": "2017-03-04T06:30:41+00:00"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "1.2.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
+                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/diff": "~1.2",
+                "sebastian/exporter": "~1.2 || ~2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "time": "2017-01-29T09:50:25+00:00"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "1.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e",
+                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff"
+            ],
+            "time": "2015-12-08T07:14:41+00:00"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5795ffe5dc5b02460c3e34222fee8cbe245d8fac",
+                "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "time": "2016-11-26T07:53:53+00:00"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
+                "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/recursion-context": "~2.0"
+            },
+            "require-dev": {
+                "ext-mbstring": "*",
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "time": "2016-11-19T08:54:04+00:00"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "time": "2015-10-12T03:26:01+00:00"
+        },
+        {
+            "name": "sebastian/object-enumerator",
+            "version": "2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
+                "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7",
+                "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6",
+                "sebastian/recursion-context": "~2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
+            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+            "time": "2017-02-18T15:18:39+00:00"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a",
+                "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "time": "2016-11-19T07:33:16+00:00"
+        },
+        {
+            "name": "sebastian/resource-operations",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/resource-operations.git",
+                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides a list of PHP built-in functions that operate on resources",
+            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+            "time": "2015-07-28T20:34:47+00:00"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "time": "2016-10-03T07:35:21+00:00"
+        },
+        {
+            "name": "squizlabs/php_codesniffer",
+            "version": "2.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
+                "reference": "571e27b6348e5b3a637b2abc82ac0d01e6d7bbed"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/571e27b6348e5b3a637b2abc82ac0d01e6d7bbed",
+                "reference": "571e27b6348e5b3a637b2abc82ac0d01e6d7bbed",
+                "shasum": ""
+            },
+            "require": {
+                "ext-simplexml": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": ">=5.1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "bin": [
+                "scripts/phpcs",
+                "scripts/phpcbf"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "CodeSniffer.php",
+                    "CodeSniffer/CLI.php",
+                    "CodeSniffer/Exception.php",
+                    "CodeSniffer/File.php",
+                    "CodeSniffer/Fixer.php",
+                    "CodeSniffer/Report.php",
+                    "CodeSniffer/Reporting.php",
+                    "CodeSniffer/Sniff.php",
+                    "CodeSniffer/Tokens.php",
+                    "CodeSniffer/Reports/",
+                    "CodeSniffer/Tokenizers/",
+                    "CodeSniffer/DocGenerators/",
+                    "CodeSniffer/Standards/AbstractPatternSniff.php",
+                    "CodeSniffer/Standards/AbstractScopeSniff.php",
+                    "CodeSniffer/Standards/AbstractVariableSniff.php",
+                    "CodeSniffer/Standards/IncorrectPatternException.php",
+                    "CodeSniffer/Standards/Generic/Sniffs/",
+                    "CodeSniffer/Standards/MySource/Sniffs/",
+                    "CodeSniffer/Standards/PEAR/Sniffs/",
+                    "CodeSniffer/Standards/PSR1/Sniffs/",
+                    "CodeSniffer/Standards/PSR2/Sniffs/",
+                    "CodeSniffer/Standards/Squiz/Sniffs/",
+                    "CodeSniffer/Standards/Zend/Sniffs/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Greg Sherwood",
+                    "role": "lead"
+                }
+            ],
+            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
+            "homepage": "http://www.squizlabs.com/php-codesniffer",
+            "keywords": [
+                "phpcs",
+                "standards"
+            ],
+            "time": "2016-09-01T23:53:02+00:00"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v3.2.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "62b4cdb99d52cb1ff253c465eb1532a80cebb621"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/62b4cdb99d52cb1ff253c465eb1532a80cebb621",
+                "reference": "62b4cdb99d52cb1ff253c465eb1532a80cebb621",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9"
+            },
+            "require-dev": {
+                "symfony/console": "~2.8|~3.0"
+            },
+            "suggest": {
+                "symfony/console": "For validating YAML files using the lint command"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Yaml\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-03-20T09:45:15+00:00"
+        },
+        {
+            "name": "webmozart/assert",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozart/assert.git",
+                "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/2db61e59ff05fe5126d152bd0655c9ea113e550f",
+                "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6",
+                "sebastian/version": "^1.0.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Webmozart\\Assert\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Assertions to validate method input/output with nice error messages.",
+            "keywords": [
+                "assert",
+                "check",
+                "validate"
+            ],
+            "time": "2016-11-23T20:04:58+00:00"
+        },
+        {
+            "name": "wp-coding-standards/wpcs",
+            "version": "0.10.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git",
+                "reference": "b39490465f6fd7375743a395019cd597e12119c9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/WordPress-Coding-Standards/WordPress-Coding-Standards/zipball/b39490465f6fd7375743a395019cd597e12119c9",
+                "reference": "b39490465f6fd7375743a395019cd597e12119c9",
+                "shasum": ""
+            },
+            "require": {
+                "squizlabs/php_codesniffer": "^2.6"
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/graphs/contributors"
+                }
+            ],
+            "description": "PHP_CodeSniffer rules (sniffs) to enforce WordPress coding conventions",
+            "keywords": [
+                "phpcs",
+                "standards",
+                "wordpress"
+            ],
+            "time": "2016-08-29T20:04:47+00:00"
+        }
+    ],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": [],
+    "platform-dev": []
+}
diff --git a/dummy-data/dummy-data.xml b/dummy-data/dummy-data.xml
index cf00fa4644a..a8867b6d5fc 100644
--- a/dummy-data/dummy-data.xml
+++ b/dummy-data/dummy-data.xml
@@ -18,22 +18,22 @@
 
 <!-- generator="WordPress/3.5.1" created="2013-06-14 12:35" -->
 <rss version="2.0"
-	xmlns:excerpt="http://wordpress.org/export/1.2/excerpt/"
+	xmlns:excerpt="https://wordpress.org/export/1.2/excerpt/"
 	xmlns:content="http://purl.org/rss/1.0/modules/content/"
 	xmlns:wfw="http://wellformedweb.org/CommentAPI/"
 	xmlns:dc="http://purl.org/dc/elements/1.1/"
-	xmlns:wp="http://wordpress.org/export/1.2/"
+	xmlns:wp="https://wordpress.org/export/1.2/"
 >
 
 <channel>
 	<title>WooCommerce Dummy Data</title>
-	<link>http://demo2.woothemes.com/woocommerce</link>
+	<link>http://demo.woothemes.com/woocommerce</link>
 	<description>Just another WooThemes Demo site</description>
 	<pubDate>Fri, 14 Jun 2013 12:35:54 +0000</pubDate>
 	<language>en-US</language>
 	<wp:wxr_version>1.2</wp:wxr_version>
 	<wp:base_site_url>http://demo2.woothemes.com/</wp:base_site_url>
-	<wp:base_blog_url>http://demo2.woothemes.com/woocommerce</wp:base_blog_url>
+	<wp:base_blog_url>http://demo.woothemes.com/woocommerce</wp:base_blog_url>
 
 	<wp:term><wp:term_id>17</wp:term_id><wp:term_taxonomy>pa_color</wp:term_taxonomy><wp:term_slug>black</wp:term_slug><wp:term_parent></wp:term_parent><wp:term_name><![CDATA[Black]]></wp:term_name></wp:term>
 	<wp:term><wp:term_id>19</wp:term_id><wp:term_taxonomy>pa_color</wp:term_taxonomy><wp:term_slug>blue</wp:term_slug><wp:term_parent></wp:term_parent><wp:term_name><![CDATA[Blue]]></wp:term_name></wp:term>
@@ -50,14 +50,14 @@
 	<wp:term><wp:term_id>15</wp:term_id><wp:term_taxonomy>product_cat</wp:term_taxonomy><wp:term_slug>t-shirts</wp:term_slug><wp:term_parent>clothing</wp:term_parent><wp:term_name><![CDATA[T-shirts]]></wp:term_name></wp:term>
 	<wp:term><wp:term_id>22</wp:term_id><wp:term_taxonomy>product_cat</wp:term_taxonomy><wp:term_slug>albums</wp:term_slug><wp:term_parent>music</wp:term_parent><wp:term_name><![CDATA[Albums]]></wp:term_name></wp:term>
 
-	<generator>http://wordpress.org/?v=3.5.1</generator>
+	<generator>https://wordpress.org/?v=3.5.1</generator>
 
 	<item>
 		<title>T_1_front</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-logo/t_1_front/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-logo/t_1_front/</link>
 		<pubDate>Fri, 07 Jun 2013 10:35:28 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/T_1_front.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_1_front.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -73,7 +73,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/T_1_front.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_1_front.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/T_1_front.jpg]]></wp:meta_value>
@@ -85,10 +85,10 @@
 	</item>
 	<item>
 		<title>T_1_back</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-logo/t_1_back/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-logo/t_1_back/</link>
 		<pubDate>Fri, 07 Jun 2013 10:35:39 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/T_1_back.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_1_back.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -104,7 +104,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/T_1_back.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_1_back.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/T_1_back.jpg]]></wp:meta_value>
@@ -116,10 +116,10 @@
 	</item>
 	<item>
 		<title>T_2_front</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/premium-quality/t_2_front/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/premium-quality/t_2_front/</link>
 		<pubDate>Fri, 07 Jun 2013 10:41:23 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/T_2_front.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_2_front.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -135,7 +135,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/T_2_front.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_2_front.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/T_2_front.jpg]]></wp:meta_value>
@@ -147,10 +147,10 @@
 	</item>
 	<item>
 		<title>T_2_back</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/premium-quality/t_2_back/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/premium-quality/t_2_back/</link>
 		<pubDate>Fri, 07 Jun 2013 10:41:34 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/T_2_back.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_2_back.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -166,7 +166,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/T_2_back.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_2_back.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/T_2_back.jpg]]></wp:meta_value>
@@ -178,10 +178,10 @@
 	</item>
 	<item>
 		<title>T_4_front</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/ship-your-idea/t_4_front/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/ship-your-idea/t_4_front/</link>
 		<pubDate>Fri, 07 Jun 2013 10:45:14 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/T_4_front.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_4_front.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -197,7 +197,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/T_4_front.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_4_front.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/T_4_front.jpg]]></wp:meta_value>
@@ -209,10 +209,10 @@
 	</item>
 	<item>
 		<title>T_3_back</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/ship-your-idea/t_3_back/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/ship-your-idea/t_3_back/</link>
 		<pubDate>Fri, 07 Jun 2013 10:45:26 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/T_3_back.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_3_back.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -228,7 +228,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/T_3_back.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_3_back.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/T_3_back.jpg]]></wp:meta_value>
@@ -240,10 +240,10 @@
 	</item>
 	<item>
 		<title>T_3_front</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/ship-your-idea/t_3_front/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/ship-your-idea/t_3_front/</link>
 		<pubDate>Fri, 07 Jun 2013 10:45:27 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/T_3_front.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_3_front.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -259,7 +259,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/T_3_front.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_3_front.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/T_3_front.jpg]]></wp:meta_value>
@@ -271,10 +271,10 @@
 	</item>
 	<item>
 		<title>T_4_back</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/ship-your-idea/t_4_back/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/ship-your-idea/t_4_back/</link>
 		<pubDate>Fri, 07 Jun 2013 10:45:29 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/T_4_back.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_4_back.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -290,7 +290,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/T_4_back.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_4_back.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/T_4_back.jpg]]></wp:meta_value>
@@ -302,10 +302,10 @@
 	</item>
 	<item>
 		<title>T_4_front</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/ship-your-idea/t_4_front-2/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/ship-your-idea/t_4_front-2/</link>
 		<pubDate>Fri, 07 Jun 2013 10:45:30 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/T_4_front1.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_4_front1.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -321,7 +321,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/T_4_front1.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_4_front1.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/T_4_front1.jpg]]></wp:meta_value>
@@ -333,10 +333,10 @@
 	</item>
 	<item>
 		<title>T_5_front</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/ninja-silhouette/t_5_front/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/ninja-silhouette/t_5_front/</link>
 		<pubDate>Fri, 07 Jun 2013 10:49:13 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/T_5_front.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_5_front.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -352,7 +352,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/T_5_front.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_5_front.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/T_5_front.jpg]]></wp:meta_value>
@@ -364,10 +364,10 @@
 	</item>
 	<item>
 		<title>T_5_back</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/ninja-silhouette/t_5_back/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/ninja-silhouette/t_5_back/</link>
 		<pubDate>Fri, 07 Jun 2013 10:49:23 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/T_5_back.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_5_back.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -383,7 +383,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/T_5_back.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_5_back.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/T_5_back.jpg]]></wp:meta_value>
@@ -395,10 +395,10 @@
 	</item>
 	<item>
 		<title>T_6_front</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-ninja/t_6_front/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-ninja/t_6_front/</link>
 		<pubDate>Fri, 07 Jun 2013 10:51:51 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/T_6_front.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_6_front.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -414,7 +414,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/T_6_front.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_6_front.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/T_6_front.jpg]]></wp:meta_value>
@@ -426,10 +426,10 @@
 	</item>
 	<item>
 		<title>T_6_back</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-ninja/t_6_back/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-ninja/t_6_back/</link>
 		<pubDate>Fri, 07 Jun 2013 10:52:02 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/T_6_back.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_6_back.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -445,7 +445,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/T_6_back.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_6_back.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/T_6_back.jpg]]></wp:meta_value>
@@ -457,10 +457,10 @@
 	</item>
 	<item>
 		<title>T_7_front</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/happy-ninja/t_7_front/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/happy-ninja/t_7_front/</link>
 		<pubDate>Fri, 07 Jun 2013 10:52:55 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/T_7_front.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_7_front.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -476,7 +476,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/T_7_front.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_7_front.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/T_7_front.jpg]]></wp:meta_value>
@@ -488,10 +488,10 @@
 	</item>
 	<item>
 		<title>T_7_back</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/happy-ninja/t_7_back/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/happy-ninja/t_7_back/</link>
 		<pubDate>Fri, 07 Jun 2013 10:53:29 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/T_7_back.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_7_back.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -507,7 +507,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/T_7_back.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_7_back.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/T_7_back.jpg]]></wp:meta_value>
@@ -519,10 +519,10 @@
 	</item>
 	<item>
 		<title>hoodie_7_front</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/ship-your-idea-2/hoodie_7_front/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/ship-your-idea-2/hoodie_7_front/</link>
 		<pubDate>Fri, 07 Jun 2013 10:59:40 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_7_front.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_7_front.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -538,7 +538,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_7_front.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_7_front.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/hoodie_7_front.jpg]]></wp:meta_value>
@@ -550,10 +550,10 @@
 	</item>
 	<item>
 		<title>hoodie_7_back</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/ship-your-idea-2/hoodie_7_back/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/ship-your-idea-2/hoodie_7_back/</link>
 		<pubDate>Fri, 07 Jun 2013 10:59:54 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_7_back.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_7_back.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -569,7 +569,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_7_back.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_7_back.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/hoodie_7_back.jpg]]></wp:meta_value>
@@ -581,10 +581,10 @@
 	</item>
 	<item>
 		<title>hoodie_1_back</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/ship-your-idea-2/hoodie_1_back/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/ship-your-idea-2/hoodie_1_back/</link>
 		<pubDate>Fri, 07 Jun 2013 11:00:00 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_1_back.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_1_back.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -600,7 +600,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_1_back.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_1_back.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/hoodie_1_back.jpg]]></wp:meta_value>
@@ -612,10 +612,10 @@
 	</item>
 	<item>
 		<title>hoodie_1_front</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/ship-your-idea-2/hoodie_1_front/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/ship-your-idea-2/hoodie_1_front/</link>
 		<pubDate>Fri, 07 Jun 2013 11:00:01 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_1_front.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_1_front.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -631,7 +631,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_1_front.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_1_front.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/hoodie_1_front.jpg]]></wp:meta_value>
@@ -643,10 +643,10 @@
 	</item>
 	<item>
 		<title>hoodie_2_front</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-ninja-2/hoodie_2_front/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-ninja-2/hoodie_2_front/</link>
 		<pubDate>Fri, 07 Jun 2013 11:01:23 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_2_front.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_2_front.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -662,7 +662,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_2_front.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_2_front.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/hoodie_2_front.jpg]]></wp:meta_value>
@@ -674,10 +674,10 @@
 	</item>
 	<item>
 		<title>hoodie_2_back</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-ninja-2/hoodie_2_back/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-ninja-2/hoodie_2_back/</link>
 		<pubDate>Fri, 07 Jun 2013 11:02:26 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_2_back.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_2_back.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -693,7 +693,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_2_back.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_2_back.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/hoodie_2_back.jpg]]></wp:meta_value>
@@ -705,10 +705,10 @@
 	</item>
 	<item>
 		<title>hoodie_3_front</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/patient-ninja/hoodie_3_front/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/patient-ninja/hoodie_3_front/</link>
 		<pubDate>Fri, 07 Jun 2013 11:03:16 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_3_front.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_3_front.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -724,7 +724,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_3_front.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_3_front.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/hoodie_3_front.jpg]]></wp:meta_value>
@@ -736,10 +736,10 @@
 	</item>
 	<item>
 		<title>hoodie_3_back</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/patient-ninja/hoodie_3_back/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/patient-ninja/hoodie_3_back/</link>
 		<pubDate>Fri, 07 Jun 2013 11:03:50 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_3_back.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_3_back.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -755,7 +755,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_3_back.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_3_back.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/hoodie_3_back.jpg]]></wp:meta_value>
@@ -767,10 +767,10 @@
 	</item>
 	<item>
 		<title>hoodie_4_front</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/happy-ninja-2/hoodie_4_front/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/happy-ninja-2/hoodie_4_front/</link>
 		<pubDate>Fri, 07 Jun 2013 11:05:03 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_4_front.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_4_front.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -786,7 +786,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_4_front.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_4_front.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/hoodie_4_front.jpg]]></wp:meta_value>
@@ -798,10 +798,10 @@
 	</item>
 	<item>
 		<title>hoodie_4_back</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/happy-ninja-2/hoodie_4_back/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/happy-ninja-2/hoodie_4_back/</link>
 		<pubDate>Fri, 07 Jun 2013 11:05:13 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_4_back.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_4_back.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -817,7 +817,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_4_back.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_4_back.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/hoodie_4_back.jpg]]></wp:meta_value>
@@ -829,10 +829,10 @@
 	</item>
 	<item>
 		<title>hoodie_5_front</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/ninja-silhouette-2/hoodie_5_front/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/ninja-silhouette-2/hoodie_5_front/</link>
 		<pubDate>Fri, 07 Jun 2013 11:06:32 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_5_front.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_5_front.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -848,7 +848,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_5_front.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_5_front.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/hoodie_5_front.jpg]]></wp:meta_value>
@@ -860,10 +860,10 @@
 	</item>
 	<item>
 		<title>hoodie_5_back</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/ninja-silhouette-2/hoodie_5_back/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/ninja-silhouette-2/hoodie_5_back/</link>
 		<pubDate>Fri, 07 Jun 2013 11:07:10 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_5_back.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_5_back.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -879,7 +879,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_5_back.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_5_back.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/hoodie_5_back.jpg]]></wp:meta_value>
@@ -891,10 +891,10 @@
 	</item>
 	<item>
 		<title>hoodie_6_front</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-logo-2/hoodie_6_front/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-logo-2/hoodie_6_front/</link>
 		<pubDate>Fri, 07 Jun 2013 11:12:02 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_6_front.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_6_front.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -910,7 +910,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_6_front.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_6_front.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/hoodie_6_front.jpg]]></wp:meta_value>
@@ -922,10 +922,10 @@
 	</item>
 	<item>
 		<title>hoodie_6_back</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-logo-2/hoodie_6_back/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-logo-2/hoodie_6_back/</link>
 		<pubDate>Fri, 07 Jun 2013 11:12:16 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_6_back.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_6_back.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -941,7 +941,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_6_back.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_6_back.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/hoodie_6_back.jpg]]></wp:meta_value>
@@ -953,10 +953,10 @@
 	</item>
 	<item>
 		<title>poster_1_up</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/ship-your-idea-3/poster_1_up/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/ship-your-idea-3/poster_1_up/</link>
 		<pubDate>Fri, 07 Jun 2013 11:21:34 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/poster_1_up.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/poster_1_up.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -972,7 +972,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/poster_1_up.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/poster_1_up.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/poster_1_up.jpg]]></wp:meta_value>
@@ -984,10 +984,10 @@
 	</item>
 	<item>
 		<title>Poster_1_flat</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/ship-your-idea-3/poster_1_flat/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/ship-your-idea-3/poster_1_flat/</link>
 		<pubDate>Fri, 07 Jun 2013 11:22:05 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/Poster_1_flat.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/Poster_1_flat.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -1003,7 +1003,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/Poster_1_flat.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/Poster_1_flat.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/Poster_1_flat.jpg]]></wp:meta_value>
@@ -1015,10 +1015,10 @@
 	</item>
 	<item>
 		<title>poster_2_up</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/flying-ninja/poster_2_up/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/flying-ninja/poster_2_up/</link>
 		<pubDate>Fri, 07 Jun 2013 11:24:19 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/poster_2_up.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/poster_2_up.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -1034,7 +1034,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/poster_2_up.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/poster_2_up.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/poster_2_up.jpg]]></wp:meta_value>
@@ -1046,10 +1046,10 @@
 	</item>
 	<item>
 		<title>Poster_2_flat</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/flying-ninja/poster_2_flat/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/flying-ninja/poster_2_flat/</link>
 		<pubDate>Fri, 07 Jun 2013 11:24:47 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/Poster_2_flat.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/Poster_2_flat.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -1065,7 +1065,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/Poster_2_flat.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/Poster_2_flat.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/Poster_2_flat.jpg]]></wp:meta_value>
@@ -1077,10 +1077,10 @@
 	</item>
 	<item>
 		<title>poster_3_up</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/premium-quality-2/poster_3_up/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/premium-quality-2/poster_3_up/</link>
 		<pubDate>Fri, 07 Jun 2013 11:26:47 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/poster_3_up.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/poster_3_up.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -1096,7 +1096,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/poster_3_up.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/poster_3_up.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/poster_3_up.jpg]]></wp:meta_value>
@@ -1108,10 +1108,10 @@
 	</item>
 	<item>
 		<title>Poster_3_flat</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/premium-quality-2/poster_3_flat/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/premium-quality-2/poster_3_flat/</link>
 		<pubDate>Fri, 07 Jun 2013 11:27:31 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/Poster_3_flat.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/Poster_3_flat.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -1127,7 +1127,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/Poster_3_flat.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/Poster_3_flat.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/Poster_3_flat.jpg]]></wp:meta_value>
@@ -1139,10 +1139,10 @@
 	</item>
 	<item>
 		<title>poster_4_up</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-ninja-3/poster_4_up/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-ninja-3/poster_4_up/</link>
 		<pubDate>Fri, 07 Jun 2013 11:28:07 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/poster_4_up.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/poster_4_up.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -1158,7 +1158,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/poster_4_up.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/poster_4_up.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/poster_4_up.jpg]]></wp:meta_value>
@@ -1170,10 +1170,10 @@
 	</item>
 	<item>
 		<title>Poster_4_flat</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-ninja-3/poster_4_flat/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-ninja-3/poster_4_flat/</link>
 		<pubDate>Fri, 07 Jun 2013 11:28:20 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/Poster_4_flat.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/Poster_4_flat.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -1189,7 +1189,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/Poster_4_flat.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/Poster_4_flat.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/Poster_4_flat.jpg]]></wp:meta_value>
@@ -1201,10 +1201,10 @@
 	</item>
 	<item>
 		<title>poster_5_up</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-logo-3/poster_5_up/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-logo-3/poster_5_up/</link>
 		<pubDate>Fri, 07 Jun 2013 11:29:26 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/poster_5_up.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/poster_5_up.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -1220,7 +1220,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/poster_5_up.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/poster_5_up.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/poster_5_up.jpg]]></wp:meta_value>
@@ -1232,10 +1232,10 @@
 	</item>
 	<item>
 		<title>Poster_5_flat</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-logo-3/poster_5_flat/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-logo-3/poster_5_flat/</link>
 		<pubDate>Fri, 07 Jun 2013 11:29:37 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/Poster_5_flat.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/Poster_5_flat.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -1251,7 +1251,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/Poster_5_flat.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/Poster_5_flat.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/Poster_5_flat.jpg]]></wp:meta_value>
@@ -1263,10 +1263,10 @@
 	</item>
 	<item>
 		<title>cd_1_angle</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-album-1/cd_1_angle/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-album-1/cd_1_angle/</link>
 		<pubDate>Fri, 07 Jun 2013 11:32:44 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/cd_1_angle.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_1_angle.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -1282,7 +1282,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/cd_1_angle.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_1_angle.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/cd_1_angle.jpg]]></wp:meta_value>
@@ -1294,10 +1294,10 @@
 	</item>
 	<item>
 		<title>cd_1_flat</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-album-1/cd_1_flat/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-album-1/cd_1_flat/</link>
 		<pubDate>Fri, 07 Jun 2013 11:32:57 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/cd_1_flat.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_1_flat.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -1313,7 +1313,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/cd_1_flat.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_1_flat.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/cd_1_flat.jpg]]></wp:meta_value>
@@ -1325,10 +1325,10 @@
 	</item>
 	<item>
 		<title>cd_2_angle</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-album-2/cd_2_angle/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-album-2/cd_2_angle/</link>
 		<pubDate>Fri, 07 Jun 2013 11:33:53 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/cd_2_angle.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_2_angle.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -1344,7 +1344,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/cd_2_angle.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_2_angle.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/cd_2_angle.jpg]]></wp:meta_value>
@@ -1356,10 +1356,10 @@
 	</item>
 	<item>
 		<title>cd_2_flat</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-album-2/cd_2_flat/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-album-2/cd_2_flat/</link>
 		<pubDate>Fri, 07 Jun 2013 11:34:07 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/cd_2_flat.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_2_flat.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -1375,7 +1375,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/cd_2_flat.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_2_flat.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/cd_2_flat.jpg]]></wp:meta_value>
@@ -1387,10 +1387,10 @@
 	</item>
 	<item>
 		<title>cd_3_angle</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-album-3/cd_3_angle/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-album-3/cd_3_angle/</link>
 		<pubDate>Fri, 07 Jun 2013 11:34:58 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/cd_3_angle.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_3_angle.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -1406,7 +1406,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/cd_3_angle.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_3_angle.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/cd_3_angle.jpg]]></wp:meta_value>
@@ -1418,10 +1418,10 @@
 	</item>
 	<item>
 		<title>cd_3_flat</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-album-3/cd_3_flat/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-album-3/cd_3_flat/</link>
 		<pubDate>Fri, 07 Jun 2013 11:35:10 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/cd_3_flat.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_3_flat.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -1437,7 +1437,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/cd_3_flat.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_3_flat.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/cd_3_flat.jpg]]></wp:meta_value>
@@ -1449,10 +1449,10 @@
 	</item>
 	<item>
 		<title>cd_4_flat</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-single-1/cd_4_flat/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-single-1/cd_4_flat/</link>
 		<pubDate>Fri, 07 Jun 2013 11:36:10 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/cd_4_flat.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_4_flat.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -1468,7 +1468,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/cd_4_flat.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_4_flat.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/cd_4_flat.jpg]]></wp:meta_value>
@@ -1480,10 +1480,10 @@
 	</item>
 	<item>
 		<title>cd_4_angle</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-single-1/cd_4_angle/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-single-1/cd_4_angle/</link>
 		<pubDate>Fri, 07 Jun 2013 11:36:22 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/cd_4_angle.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_4_angle.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -1499,7 +1499,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/cd_4_angle.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_4_angle.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/cd_4_angle.jpg]]></wp:meta_value>
@@ -1511,10 +1511,10 @@
 	</item>
 	<item>
 		<title>cd_5_angle</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-album-4/cd_5_angle/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-album-4/cd_5_angle/</link>
 		<pubDate>Fri, 07 Jun 2013 11:37:04 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/cd_5_angle.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_5_angle.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -1530,7 +1530,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/cd_5_angle.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_5_angle.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/cd_5_angle.jpg]]></wp:meta_value>
@@ -1542,10 +1542,10 @@
 	</item>
 	<item>
 		<title>cd_5_flat</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-album-4/cd_5_flat/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-album-4/cd_5_flat/</link>
 		<pubDate>Fri, 07 Jun 2013 11:37:17 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/cd_5_flat.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_5_flat.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -1561,7 +1561,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/cd_5_flat.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_5_flat.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/cd_5_flat.jpg]]></wp:meta_value>
@@ -1573,10 +1573,10 @@
 	</item>
 	<item>
 		<title>cd_6_angle</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-single-2/cd_6_angle/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-single-2/cd_6_angle/</link>
 		<pubDate>Fri, 07 Jun 2013 11:37:51 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/cd_6_angle.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_6_angle.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -1592,7 +1592,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/cd_6_angle.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_6_angle.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/cd_6_angle.jpg]]></wp:meta_value>
@@ -1604,10 +1604,10 @@
 	</item>
 	<item>
 		<title>cd_6_flat</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-single-2/cd_6_flat/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-single-2/cd_6_flat/</link>
 		<pubDate>Fri, 07 Jun 2013 11:38:03 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/files/2013/06/cd_6_flat.jpg</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_6_flat.jpg</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -1623,7 +1623,7 @@
 		<wp:post_type>attachment</wp:post_type>
 		<wp:post_password></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
-		<wp:attachment_url>http://demo2.woothemes.com/woocommerce/files/2013/06/cd_6_flat.jpg</wp:attachment_url>
+		<wp:attachment_url>http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_6_flat.jpg</wp:attachment_url>
 		<wp:postmeta>
 			<wp:meta_key>_wp_attached_file</wp:meta_key>
 			<wp:meta_value><![CDATA[2013/06/cd_6_flat.jpg]]></wp:meta_value>
@@ -1635,10 +1635,10 @@
 	</item>
 	<item>
 		<title>Woo Logo</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-logo/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-logo/</link>
 		<pubDate>Fri, 07 Jun 2013 10:35:51 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/?post_type=product&#038;p=15</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/?post_type=product&#038;p=15</guid>
 		<description></description>
 		<content:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></content:encoded>
 		<excerpt:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></excerpt:encoded>
@@ -1711,7 +1711,7 @@
 		</wp:postmeta>
 		<wp:postmeta>
 			<wp:meta_key>_featured</wp:meta_key>
-			<wp:meta_value><![CDATA[no]]></wp:meta_value>
+			<wp:meta_value><![CDATA[yes]]></wp:meta_value>
 		</wp:postmeta>
 		<wp:postmeta>
 			<wp:meta_key>_weight</wp:meta_key>
@@ -1792,7 +1792,7 @@
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:67:{s:15:"comment_post_ID";i:15;s:14:"comment_author";s:12:"Cobus Bester";s:20:"comment_author_email";s:18:"bester.c@gmail.com";s:18:"comment_author_url";N;s:15:"comment_content";s:49:"Simple and effective design. One of my favorites.";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"196.215.9.147";s:10:"user_agent";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:8:"referrer";s:56:"http://demo2.woothemes.com/woocommerce/product/woo-logo/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:56:"http://demo2.woothemes.com/woocommerce/product/woo-logo/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:12:"Cobus Bester";s:10:"POST_email";s:18:"bester.c@gmail.com";s:11:"POST_rating";s:1:"4";s:12:"POST_comment";s:49:"Simple and effective design. One of my favorites.";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:30:"/woocommerce/product/woo-logo/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"15";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"bbd941e9bf";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"273";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:56:"http://demo2.woothemes.com/woocommerce/product/woo-logo/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:19:"HTTP_ACCEPT_CHARSET";s:30:"ISO-8859-1,utf-8;q=0.7,*;q=0.3";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"196.215.9.147";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"57596";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370606225";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:15:25";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:67:{s:15:"comment_post_ID";i:15;s:14:"comment_author";s:12:"Cobus Bester";s:20:"comment_author_email";s:18:"bester.c@gmail.com";s:18:"comment_author_url";N;s:15:"comment_content";s:49:"Simple and effective design. One of my favorites.";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"196.215.9.147";s:10:"user_agent";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:8:"referrer";s:56:"http://demo.woothemes.com/woocommerce/product/woo-logo/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:56:"http://demo.woothemes.com/woocommerce/product/woo-logo/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:12:"Cobus Bester";s:10:"POST_email";s:18:"bester.c@gmail.com";s:11:"POST_rating";s:1:"4";s:12:"POST_comment";s:49:"Simple and effective design. One of my favorites.";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:30:"/woocommerce/product/woo-logo/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"15";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"bbd941e9bf";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"273";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:56:"http://demo.woothemes.com/woocommerce/product/woo-logo/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:19:"HTTP_ACCEPT_CHARSET";s:30:"ISO-8859-1,utf-8;q=0.7,*;q=0.3";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"196.215.9.147";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"57596";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370606225";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:15:25";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -1806,10 +1806,10 @@
 	</item>
 	<item>
 		<title>Premium Quality</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/premium-quality/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/premium-quality/</link>
 		<pubDate>Fri, 07 Jun 2013 10:41:52 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/?post_type=product&#038;p=19</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/?post_type=product&#038;p=19</guid>
 		<description></description>
 		<content:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></content:encoded>
 		<excerpt:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></excerpt:encoded>
@@ -1959,7 +1959,7 @@
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:67:{s:15:"comment_post_ID";i:19;s:14:"comment_author";s:12:"Cobus Bester";s:20:"comment_author_email";s:18:"bester.c@gmail.com";s:18:"comment_author_url";N;s:15:"comment_content";s:56:"Wonderful quality, and an awesome design. WooThemes ftw!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"196.215.9.147";s:10:"user_agent";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:8:"referrer";s:63:"http://demo2.woothemes.com/woocommerce/product/premium-quality/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:63:"http://demo2.woothemes.com/woocommerce/product/premium-quality/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:12:"Cobus Bester";s:10:"POST_email";s:18:"bester.c@gmail.com";s:11:"POST_rating";s:1:"4";s:12:"POST_comment";s:56:"Wonderful quality, and an awesome design. WooThemes ftw!";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:37:"/woocommerce/product/premium-quality/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"19";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"0f92b67011";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"291";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:63:"http://demo2.woothemes.com/woocommerce/product/premium-quality/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:19:"HTTP_ACCEPT_CHARSET";s:30:"ISO-8859-1,utf-8;q=0.7,*;q=0.3";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"196.215.9.147";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"54854";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370606029";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 10:41:52";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:67:{s:15:"comment_post_ID";i:19;s:14:"comment_author";s:12:"Cobus Bester";s:20:"comment_author_email";s:18:"bester.c@gmail.com";s:18:"comment_author_url";N;s:15:"comment_content";s:56:"Wonderful quality, and an awesome design. WooThemes ftw!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"196.215.9.147";s:10:"user_agent";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:8:"referrer";s:62:"http://demo.woothemes.com/woocommerce/product/premium-quality/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:62:"http://demo.woothemes.com/woocommerce/product/premium-quality/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:12:"Cobus Bester";s:10:"POST_email";s:18:"bester.c@gmail.com";s:11:"POST_rating";s:1:"4";s:12:"POST_comment";s:56:"Wonderful quality, and an awesome design. WooThemes ftw!";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:37:"/woocommerce/product/premium-quality/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"19";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"0f92b67011";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"291";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:62:"http://demo.woothemes.com/woocommerce/product/premium-quality/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:19:"HTTP_ACCEPT_CHARSET";s:30:"ISO-8859-1,utf-8;q=0.7,*;q=0.3";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"196.215.9.147";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"54854";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370606029";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 10:41:52";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -1997,9 +1997,9 @@ I'm ordering mine next week]]></wp:comment_content>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
 				<wp:meta_value><![CDATA[a:64:{s:15:"comment_post_ID";i:19;s:14:"comment_author";s:6:"Andrew";s:20:"comment_author_email";s:25:"andrew@chromeorange.co.uk";s:18:"comment_author_url";N;s:15:"comment_content";s:85:"This t-shirt is awesome! Would recommend to everyone!
 
-I'm ordering mine next week";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"86.19.152.140";s:10:"user_agent";s:81:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:21.0) Gecko/20100101 Firefox/21.0";s:8:"referrer";s:63:"http://demo2.woothemes.com/woocommerce/product/premium-quality/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:63:"http://demo2.woothemes.com/woocommerce/product/premium-quality/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:6:"Andrew";s:10:"POST_email";s:25:"andrew@chromeorange.co.uk";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:85:"This t-shirt is awesome! Would recommend to everyone!
+I'm ordering mine next week";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"86.19.152.140";s:10:"user_agent";s:81:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:21.0) Gecko/20100101 Firefox/21.0";s:8:"referrer";s:62:"http://demo.woothemes.com/woocommerce/product/premium-quality/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:62:"http://demo.woothemes.com/woocommerce/product/premium-quality/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:6:"Andrew";s:10:"POST_email";s:25:"andrew@chromeorange.co.uk";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:85:"This t-shirt is awesome! Would recommend to everyone!
 
-I'm ordering mine next week";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:37:"/woocommerce/product/premium-quality/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"19";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"0f92b67011";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:81:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:21.0) Gecko/20100101 Firefox/21.0";s:15:"HTTP_CONNECTION";s:5:"close";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.5";s:20:"HTTP_ACCEPT_ENCODING";s:13:"gzip, deflate";s:12:"HTTP_REFERER";s:63:"http://demo2.woothemes.com/woocommerce/product/premium-quality/";s:11:"HTTP_COOKIE";s:0:"";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:14:"CONTENT_LENGTH";s:3:"331";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"86.19.152.140";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"58011";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370606265";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 10:41:52";}]]></wp:meta_value>
+I'm ordering mine next week";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:37:"/woocommerce/product/premium-quality/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"19";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"0f92b67011";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:81:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:21.0) Gecko/20100101 Firefox/21.0";s:15:"HTTP_CONNECTION";s:5:"close";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.5";s:20:"HTTP_ACCEPT_ENCODING";s:13:"gzip, deflate";s:12:"HTTP_REFERER";s:62:"http://demo.woothemes.com/woocommerce/product/premium-quality/";s:11:"HTTP_COOKIE";s:0:"";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:14:"CONTENT_LENGTH";s:3:"331";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"86.19.152.140";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"58011";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370606265";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 10:41:52";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -2013,10 +2013,10 @@ I'm ordering mine next week";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http
 	</item>
 	<item>
 		<title>Ship Your Idea</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/ship-your-idea/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/ship-your-idea/</link>
 		<pubDate>Fri, 07 Jun 2013 10:46:01 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/?post_type=product&#038;p=22</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/?post_type=product&#038;p=22</guid>
 		<description></description>
 		<content:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></content:encoded>
 		<excerpt:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></excerpt:encoded>
@@ -2204,7 +2204,7 @@ I'm ordering mine next week";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:22;s:14:"comment_author";s:12:"James Koster";s:20:"comment_author_email";s:23:"james@jameskoster.co.uk";s:18:"comment_author_url";N;s:15:"comment_content";s:53:"Nice T-shirt, I got one in black. Goes with anything!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"86.146.141.82";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:62:"http://demo2.woothemes.com/woocommerce/product/ship-your-idea/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:62:"http://demo2.woothemes.com/woocommerce/product/ship-your-idea/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:12:"James Koster";s:10:"POST_email";s:23:"james@jameskoster.co.uk";s:11:"POST_rating";s:1:"4";s:12:"POST_comment";s:53:"Nice T-shirt, I got one in black. Goes with anything!";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:36:"/woocommerce/product/ship-your-idea/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"22";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"19b2b0163a";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"292";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:62:"http://demo2.woothemes.com/woocommerce/product/ship-your-idea/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"86.146.141.82";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"47178";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370605393";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:14:41";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:22;s:14:"comment_author";s:12:"James Koster";s:20:"comment_author_email";s:23:"james@jameskoster.co.uk";s:18:"comment_author_url";N;s:15:"comment_content";s:53:"Nice T-shirt, I got one in black. Goes with anything!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"86.146.141.82";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:62:"http://demo.woothemes.com/woocommerce/product/ship-your-idea/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:62:"http://demo.woothemes.com/woocommerce/product/ship-your-idea/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:12:"James Koster";s:10:"POST_email";s:23:"james@jameskoster.co.uk";s:11:"POST_rating";s:1:"4";s:12:"POST_comment";s:53:"Nice T-shirt, I got one in black. Goes with anything!";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:36:"/woocommerce/product/ship-your-idea/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"22";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"19b2b0163a";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"292";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:62:"http://demo.woothemes.com/woocommerce/product/ship-your-idea/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"86.146.141.82";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"47178";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370605393";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:14:41";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -2238,7 +2238,7 @@ I'm ordering mine next week";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:67:{s:15:"comment_post_ID";i:22;s:14:"comment_author";s:12:"Cobus Bester";s:20:"comment_author_email";s:18:"bester.c@gmail.com";s:18:"comment_author_url";N;s:15:"comment_content";s:47:"Very comfortable shirt, and I love the graphic!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"196.215.9.147";s:10:"user_agent";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:8:"referrer";s:62:"http://demo2.woothemes.com/woocommerce/product/ship-your-idea/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:62:"http://demo2.woothemes.com/woocommerce/product/ship-your-idea/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:12:"Cobus Bester";s:10:"POST_email";s:18:"bester.c@gmail.com";s:11:"POST_rating";s:1:"4";s:12:"POST_comment";s:47:"Very comfortable shirt, and I love the graphic!";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:36:"/woocommerce/product/ship-your-idea/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"22";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"19b2b0163a";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"281";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:62:"http://demo2.woothemes.com/woocommerce/product/ship-your-idea/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:19:"HTTP_ACCEPT_CHARSET";s:30:"ISO-8859-1,utf-8;q=0.7,*;q=0.3";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"196.215.9.147";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"55879";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370606115";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:14:41";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:67:{s:15:"comment_post_ID";i:22;s:14:"comment_author";s:12:"Cobus Bester";s:20:"comment_author_email";s:18:"bester.c@gmail.com";s:18:"comment_author_url";N;s:15:"comment_content";s:47:"Very comfortable shirt, and I love the graphic!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"196.215.9.147";s:10:"user_agent";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:8:"referrer";s:62:"http://demo.woothemes.com/woocommerce/product/ship-your-idea/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:62:"http://demo.woothemes.com/woocommerce/product/ship-your-idea/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:12:"Cobus Bester";s:10:"POST_email";s:18:"bester.c@gmail.com";s:11:"POST_rating";s:1:"4";s:12:"POST_comment";s:47:"Very comfortable shirt, and I love the graphic!";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:36:"/woocommerce/product/ship-your-idea/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"22";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"19b2b0163a";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"281";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:62:"http://demo.woothemes.com/woocommerce/product/ship-your-idea/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:19:"HTTP_ACCEPT_CHARSET";s:30:"ISO-8859-1,utf-8;q=0.7,*;q=0.3";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"196.215.9.147";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"55879";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370606115";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:14:41";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -2272,7 +2272,7 @@ I'm ordering mine next week";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:64:{s:15:"comment_post_ID";i:22;s:14:"comment_author";s:6:"Stuart";s:20:"comment_author_email";s:20:"stuart@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:54:"Great T-shirt quality, Great Design and Great Service.";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"82.32.109.140";s:10:"user_agent";s:72:"Mozilla/5.0 (Windows NT 6.1; WOW64; rv:21.0) Gecko/20100101 Firefox/21.0";s:8:"referrer";s:62:"http://demo2.woothemes.com/woocommerce/product/ship-your-idea/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:62:"http://demo2.woothemes.com/woocommerce/product/ship-your-idea/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:6:"Stuart";s:10:"POST_email";s:20:"stuart@woothemes.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:54:"Great T-shirt quality, Great Design and Great Service.";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:36:"/woocommerce/product/ship-your-idea/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"22";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"0ad3ed6bac";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:72:"Mozilla/5.0 (Windows NT 6.1; WOW64; rv:21.0) Gecko/20100101 Firefox/21.0";s:15:"HTTP_CONNECTION";s:5:"close";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.5";s:20:"HTTP_ACCEPT_ENCODING";s:13:"gzip, deflate";s:12:"HTTP_REFERER";s:62:"http://demo2.woothemes.com/woocommerce/product/ship-your-idea/";s:11:"HTTP_COOKIE";s:0:"";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:14:"CONTENT_LENGTH";s:3:"282";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"82.32.109.140";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"40932";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370610134";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:14:41";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:64:{s:15:"comment_post_ID";i:22;s:14:"comment_author";s:6:"Stuart";s:20:"comment_author_email";s:20:"stuart@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:54:"Great T-shirt quality, Great Design and Great Service.";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"82.32.109.140";s:10:"user_agent";s:72:"Mozilla/5.0 (Windows NT 6.1; WOW64; rv:21.0) Gecko/20100101 Firefox/21.0";s:8:"referrer";s:62:"http://demo.woothemes.com/woocommerce/product/ship-your-idea/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:62:"http://demo.woothemes.com/woocommerce/product/ship-your-idea/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:6:"Stuart";s:10:"POST_email";s:20:"stuart@woothemes.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:54:"Great T-shirt quality, Great Design and Great Service.";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:36:"/woocommerce/product/ship-your-idea/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"22";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"0ad3ed6bac";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:72:"Mozilla/5.0 (Windows NT 6.1; WOW64; rv:21.0) Gecko/20100101 Firefox/21.0";s:15:"HTTP_CONNECTION";s:5:"close";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.5";s:20:"HTTP_ACCEPT_ENCODING";s:13:"gzip, deflate";s:12:"HTTP_REFERER";s:62:"http://demo.woothemes.com/woocommerce/product/ship-your-idea/";s:11:"HTTP_COOKIE";s:0:"";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:14:"CONTENT_LENGTH";s:3:"282";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"82.32.109.140";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"40932";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370610134";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:14:41";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -2286,10 +2286,10 @@ I'm ordering mine next week";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http
 	</item>
 	<item>
 		<title>Ninja Silhouette</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/ninja-silhouette/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/ninja-silhouette/</link>
 		<pubDate>Fri, 07 Jun 2013 10:49:51 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/?post_type=product&#038;p=31</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/?post_type=product&#038;p=31</guid>
 		<description></description>
 		<content:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></content:encoded>
 		<excerpt:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></excerpt:encoded>
@@ -2447,7 +2447,7 @@ I'm ordering mine next week";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:67:{s:15:"comment_post_ID";i:31;s:14:"comment_author";s:12:"Cobus Bester";s:20:"comment_author_email";s:18:"bester.c@gmail.com";s:18:"comment_author_url";N;s:15:"comment_content";s:76:"The ninja silhouette is one of my favorite designs. This is a great product.";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"196.215.9.147";s:10:"user_agent";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:8:"referrer";s:64:"http://demo2.woothemes.com/woocommerce/product/ninja-silhouette/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:64:"http://demo2.woothemes.com/woocommerce/product/ninja-silhouette/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:12:"Cobus Bester";s:10:"POST_email";s:18:"bester.c@gmail.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:76:"The ninja silhouette is one of my favorite designs. This is a great product.";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:38:"/woocommerce/product/ninja-silhouette/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"31";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"a0acab20c6";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"308";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:64:"http://demo2.woothemes.com/woocommerce/product/ninja-silhouette/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:19:"HTTP_ACCEPT_CHARSET";s:30:"ISO-8859-1,utf-8;q=0.7,*;q=0.3";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"196.215.9.147";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"55289";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370606072";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:15:05";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:67:{s:15:"comment_post_ID";i:31;s:14:"comment_author";s:12:"Cobus Bester";s:20:"comment_author_email";s:18:"bester.c@gmail.com";s:18:"comment_author_url";N;s:15:"comment_content";s:76:"The ninja silhouette is one of my favorite designs. This is a great product.";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"196.215.9.147";s:10:"user_agent";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:8:"referrer";s:64:"http://demo.woothemes.com/woocommerce/product/ninja-silhouette/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:64:"http://demo.woothemes.com/woocommerce/product/ninja-silhouette/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:12:"Cobus Bester";s:10:"POST_email";s:18:"bester.c@gmail.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:76:"The ninja silhouette is one of my favorite designs. This is a great product.";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:38:"/woocommerce/product/ninja-silhouette/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"31";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"a0acab20c6";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"308";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:64:"http://demo.woothemes.com/woocommerce/product/ninja-silhouette/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:19:"HTTP_ACCEPT_CHARSET";s:30:"ISO-8859-1,utf-8;q=0.7,*;q=0.3";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"196.215.9.147";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"55289";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370606072";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:15:05";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -2461,10 +2461,10 @@ I'm ordering mine next week";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http
 	</item>
 	<item>
 		<title>Woo Ninja</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-ninja/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-ninja/</link>
 		<pubDate>Fri, 07 Jun 2013 10:52:06 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/?post_type=product&#038;p=34</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/?post_type=product&#038;p=34</guid>
 		<description></description>
 		<content:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></content:encoded>
 		<excerpt:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></excerpt:encoded>
@@ -2602,10 +2602,10 @@ I'm ordering mine next week";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http
 	</item>
 	<item>
 		<title>Happy Ninja</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/happy-ninja/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/happy-ninja/</link>
 		<pubDate>Fri, 07 Jun 2013 10:53:15 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/?post_type=product&#038;p=37</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/?post_type=product&#038;p=37</guid>
 		<description></description>
 		<content:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></content:encoded>
 		<excerpt:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></excerpt:encoded>
@@ -2763,7 +2763,7 @@ I'm ordering mine next week";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:64:{s:15:"comment_post_ID";i:37;s:14:"comment_author";s:6:"Stuart";s:20:"comment_author_email";s:20:"stuart@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:65:"This will go great with my Hoodie that I ordered a few weeks ago.";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"82.32.109.140";s:10:"user_agent";s:72:"Mozilla/5.0 (Windows NT 6.1; WOW64; rv:21.0) Gecko/20100101 Firefox/21.0";s:8:"referrer";s:59:"http://demo2.woothemes.com/woocommerce/product/happy-ninja/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:59:"http://demo2.woothemes.com/woocommerce/product/happy-ninja/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:6:"Stuart";s:10:"POST_email";s:20:"stuart@woothemes.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:65:"This will go great with my Hoodie that I ordered a few weeks ago.";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:33:"/woocommerce/product/happy-ninja/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"37";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"7da2a7b2b2";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:72:"Mozilla/5.0 (Windows NT 6.1; WOW64; rv:21.0) Gecko/20100101 Firefox/21.0";s:15:"HTTP_CONNECTION";s:5:"close";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.5";s:20:"HTTP_ACCEPT_ENCODING";s:13:"gzip, deflate";s:12:"HTTP_REFERER";s:59:"http://demo2.woothemes.com/woocommerce/product/happy-ninja/";s:11:"HTTP_COOKIE";s:0:"";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:14:"CONTENT_LENGTH";s:3:"288";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"82.32.109.140";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"40272";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370610085";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:14:15";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:64:{s:15:"comment_post_ID";i:37;s:14:"comment_author";s:6:"Stuart";s:20:"comment_author_email";s:20:"stuart@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:65:"This will go great with my Hoodie that I ordered a few weeks ago.";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"82.32.109.140";s:10:"user_agent";s:72:"Mozilla/5.0 (Windows NT 6.1; WOW64; rv:21.0) Gecko/20100101 Firefox/21.0";s:8:"referrer";s:59:"http://demo.woothemes.com/woocommerce/product/happy-ninja/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:59:"http://demo.woothemes.com/woocommerce/product/happy-ninja/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:6:"Stuart";s:10:"POST_email";s:20:"stuart@woothemes.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:65:"This will go great with my Hoodie that I ordered a few weeks ago.";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:33:"/woocommerce/product/happy-ninja/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"37";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"7da2a7b2b2";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:72:"Mozilla/5.0 (Windows NT 6.1; WOW64; rv:21.0) Gecko/20100101 Firefox/21.0";s:15:"HTTP_CONNECTION";s:5:"close";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.5";s:20:"HTTP_ACCEPT_ENCODING";s:13:"gzip, deflate";s:12:"HTTP_REFERER";s:59:"http://demo.woothemes.com/woocommerce/product/happy-ninja/";s:11:"HTTP_COOKIE";s:0:"";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:14:"CONTENT_LENGTH";s:3:"288";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"82.32.109.140";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"40272";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370610085";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:14:15";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -2797,7 +2797,7 @@ I'm ordering mine next week";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:37;s:14:"comment_author";s:5:"Maria";s:20:"comment_author_email";s:19:"maria@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:56:"Love this shirt! The ninja near and dear to my heart. <3";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"24.225.103.32";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:59:"http://demo2.woothemes.com/woocommerce/product/happy-ninja/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:59:"http://demo2.woothemes.com/woocommerce/product/happy-ninja/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:5:"Maria";s:10:"POST_email";s:19:"maria@woothemes.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:56:"Love this shirt! The ninja near and dear to my heart. <3";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:33:"/woocommerce/product/happy-ninja/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"37";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"7da2a7b2b2";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"281";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:59:"http://demo2.woothemes.com/woocommerce/product/happy-ninja/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"24.225.103.32";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"24107";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370620193";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:14:15";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:37;s:14:"comment_author";s:5:"Maria";s:20:"comment_author_email";s:19:"maria@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:56:"Love this shirt! The ninja near and dear to my heart. <3";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"24.225.103.32";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:59:"http://demo.woothemes.com/woocommerce/product/happy-ninja/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:59:"http://demo.woothemes.com/woocommerce/product/happy-ninja/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:5:"Maria";s:10:"POST_email";s:19:"maria@woothemes.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:56:"Love this shirt! The ninja near and dear to my heart. <3";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:33:"/woocommerce/product/happy-ninja/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"37";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"7da2a7b2b2";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"281";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:59:"http://demo.woothemes.com/woocommerce/product/happy-ninja/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"24.225.103.32";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"24107";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370620193";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:14:15";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -2811,10 +2811,10 @@ I'm ordering mine next week";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http
 	</item>
 	<item>
 		<title>Ship Your Idea</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/ship-your-idea-2/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/ship-your-idea-2/</link>
 		<pubDate>Fri, 07 Jun 2013 11:00:28 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/?post_type=product&#038;p=40</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/?post_type=product&#038;p=40</guid>
 		<description></description>
 		<content:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></content:encoded>
 		<excerpt:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></excerpt:encoded>
@@ -2998,7 +2998,7 @@ I'm ordering mine next week";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:64:{s:15:"comment_post_ID";i:40;s:14:"comment_author";s:6:"Stuart";s:20:"comment_author_email";s:20:"stuart@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:108:"Another great quality product that anyone who see's me wearing has asked where to purchase one of their own.";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"82.32.109.140";s:10:"user_agent";s:72:"Mozilla/5.0 (Windows NT 6.1; WOW64; rv:21.0) Gecko/20100101 Firefox/21.0";s:8:"referrer";s:64:"http://demo2.woothemes.com/woocommerce/product/ship-your-idea-2/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:64:"http://demo2.woothemes.com/woocommerce/product/ship-your-idea-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:6:"Stuart";s:10:"POST_email";s:20:"stuart@woothemes.com";s:11:"POST_rating";s:1:"4";s:12:"POST_comment";s:108:"Another great quality product that anyone who see's me wearing has asked where to purchase one of their own.";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:38:"/woocommerce/product/ship-your-idea-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"40";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"3493e6658d";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:72:"Mozilla/5.0 (Windows NT 6.1; WOW64; rv:21.0) Gecko/20100101 Firefox/21.0";s:15:"HTTP_CONNECTION";s:5:"close";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.5";s:20:"HTTP_ACCEPT_ENCODING";s:13:"gzip, deflate";s:12:"HTTP_REFERER";s:64:"http://demo2.woothemes.com/woocommerce/product/ship-your-idea-2/";s:11:"HTTP_COOKIE";s:0:"";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:14:"CONTENT_LENGTH";s:3:"338";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"82.32.109.140";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"41743";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370610209";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:18:57";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:64:{s:15:"comment_post_ID";i:40;s:14:"comment_author";s:6:"Stuart";s:20:"comment_author_email";s:20:"stuart@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:108:"Another great quality product that anyone who see's me wearing has asked where to purchase one of their own.";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"82.32.109.140";s:10:"user_agent";s:72:"Mozilla/5.0 (Windows NT 6.1; WOW64; rv:21.0) Gecko/20100101 Firefox/21.0";s:8:"referrer";s:64:"http://demo.woothemes.com/woocommerce/product/ship-your-idea-2/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:64:"http://demo.woothemes.com/woocommerce/product/ship-your-idea-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:6:"Stuart";s:10:"POST_email";s:20:"stuart@woothemes.com";s:11:"POST_rating";s:1:"4";s:12:"POST_comment";s:108:"Another great quality product that anyone who see's me wearing has asked where to purchase one of their own.";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:38:"/woocommerce/product/ship-your-idea-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"40";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"3493e6658d";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:72:"Mozilla/5.0 (Windows NT 6.1; WOW64; rv:21.0) Gecko/20100101 Firefox/21.0";s:15:"HTTP_CONNECTION";s:5:"close";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.5";s:20:"HTTP_ACCEPT_ENCODING";s:13:"gzip, deflate";s:12:"HTTP_REFERER";s:64:"http://demo.woothemes.com/woocommerce/product/ship-your-idea-2/";s:11:"HTTP_COOKIE";s:0:"";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:14:"CONTENT_LENGTH";s:3:"338";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"82.32.109.140";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"41743";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370610209";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:18:57";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -3032,7 +3032,7 @@ I'm ordering mine next week";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:40;s:14:"comment_author";s:4:"Ryan";s:20:"comment_author_email";s:18:"ryan@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:168:"This hoodie gets me lots of looks while out in public, I got the blue one and it's awesome. Not sure if people are looking at my hoodie only, or also at my rocking bod.";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:14:"99.153.225.252";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:64:"http://demo2.woothemes.com/woocommerce/product/ship-your-idea-2/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:64:"http://demo2.woothemes.com/woocommerce/product/ship-your-idea-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:4:"Ryan";s:10:"POST_email";s:18:"ryan@woothemes.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:168:"This hoodie gets me lots of looks while out in public, I got the blue one and it's awesome. Not sure if people are looking at my hoodie only, or also at my rocking bod.";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:38:"/woocommerce/product/ship-your-idea-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"40";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"3493e6658d";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"398";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:64:"http://demo2.woothemes.com/woocommerce/product/ship-your-idea-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:14:"99.153.225.252";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"54935";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370611492";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:18:57";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:40;s:14:"comment_author";s:4:"Ryan";s:20:"comment_author_email";s:18:"ryan@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:168:"This hoodie gets me lots of looks while out in public, I got the blue one and it's awesome. Not sure if people are looking at my hoodie only, or also at my rocking bod.";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:14:"99.153.225.252";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:64:"http://demo.woothemes.com/woocommerce/product/ship-your-idea-2/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:64:"http://demo.woothemes.com/woocommerce/product/ship-your-idea-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:4:"Ryan";s:10:"POST_email";s:18:"ryan@woothemes.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:168:"This hoodie gets me lots of looks while out in public, I got the blue one and it's awesome. Not sure if people are looking at my hoodie only, or also at my rocking bod.";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:38:"/woocommerce/product/ship-your-idea-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"40";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"3493e6658d";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"398";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:64:"http://demo.woothemes.com/woocommerce/product/ship-your-idea-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:14:"99.153.225.252";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"54935";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370611492";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:18:57";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -3066,7 +3066,7 @@ I'm ordering mine next week";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:40;s:14:"comment_author";s:5:"Maria";s:20:"comment_author_email";s:19:"maria@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:8:"Ship it!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"24.225.103.32";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:64:"http://demo2.woothemes.com/woocommerce/product/ship-your-idea-2/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:64:"http://demo2.woothemes.com/woocommerce/product/ship-your-idea-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:5:"Maria";s:10:"POST_email";s:19:"maria@woothemes.com";s:11:"POST_rating";s:1:"3";s:12:"POST_comment";s:8:"Ship it!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:38:"/woocommerce/product/ship-your-idea-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"40";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"3493e6658d";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"236";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:64:"http://demo2.woothemes.com/woocommerce/product/ship-your-idea-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"24.225.103.32";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"27030";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370620411";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:18:57";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:40;s:14:"comment_author";s:5:"Maria";s:20:"comment_author_email";s:19:"maria@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:8:"Ship it!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"24.225.103.32";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:64:"http://demo.woothemes.com/woocommerce/product/ship-your-idea-2/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:64:"http://demo.woothemes.com/woocommerce/product/ship-your-idea-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:5:"Maria";s:10:"POST_email";s:19:"maria@woothemes.com";s:11:"POST_rating";s:1:"3";s:12:"POST_comment";s:8:"Ship it!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:38:"/woocommerce/product/ship-your-idea-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"40";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"3493e6658d";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"236";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:64:"http://demo.woothemes.com/woocommerce/product/ship-your-idea-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"24.225.103.32";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"27030";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370620411";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:18:57";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -3080,10 +3080,10 @@ I'm ordering mine next week";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http
 	</item>
 	<item>
 		<title>Woo Ninja</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-ninja-2/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-ninja-2/</link>
 		<pubDate>Fri, 07 Jun 2013 11:02:31 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/?post_type=product&#038;p=47</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/?post_type=product&#038;p=47</guid>
 		<description></description>
 		<content:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></content:encoded>
 		<excerpt:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></excerpt:encoded>
@@ -3237,7 +3237,7 @@ I'm ordering mine next week";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:67:{s:15:"comment_post_ID";i:47;s:14:"comment_author";s:12:"Cobus Bester";s:20:"comment_author_email";s:18:"bester.c@gmail.com";s:18:"comment_author_url";N;s:15:"comment_content";s:71:"This hoodie is great for those chilly winter days. I love the WooNinja!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"196.215.9.147";s:10:"user_agent";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:8:"referrer";s:59:"http://demo2.woothemes.com/woocommerce/product/woo-ninja-2/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:59:"http://demo2.woothemes.com/woocommerce/product/woo-ninja-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:12:"Cobus Bester";s:10:"POST_email";s:18:"bester.c@gmail.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:71:"This hoodie is great for those chilly winter days. I love the WooNinja!";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:33:"/woocommerce/product/woo-ninja-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"47";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"38d66a284b";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"300";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:59:"http://demo2.woothemes.com/woocommerce/product/woo-ninja-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:19:"HTTP_ACCEPT_CHARSET";s:30:"ISO-8859-1,utf-8;q=0.7,*;q=0.3";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"196.215.9.147";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"58209";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370606279";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:18:45";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:67:{s:15:"comment_post_ID";i:47;s:14:"comment_author";s:12:"Cobus Bester";s:20:"comment_author_email";s:18:"bester.c@gmail.com";s:18:"comment_author_url";N;s:15:"comment_content";s:71:"This hoodie is great for those chilly winter days. I love the WooNinja!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"196.215.9.147";s:10:"user_agent";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:8:"referrer";s:59:"http://demo.woothemes.com/woocommerce/product/woo-ninja-2/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:59:"http://demo.woothemes.com/woocommerce/product/woo-ninja-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:12:"Cobus Bester";s:10:"POST_email";s:18:"bester.c@gmail.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:71:"This hoodie is great for those chilly winter days. I love the WooNinja!";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:33:"/woocommerce/product/woo-ninja-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"47";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"38d66a284b";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"300";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:59:"http://demo.woothemes.com/woocommerce/product/woo-ninja-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:19:"HTTP_ACCEPT_CHARSET";s:30:"ISO-8859-1,utf-8;q=0.7,*;q=0.3";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"196.215.9.147";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"58209";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370606279";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:18:45";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -3271,7 +3271,7 @@ I'm ordering mine next week";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:47;s:14:"comment_author";s:5:"Maria";s:20:"comment_author_email";s:19:"maria@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:40:"Perfect for the lady Ninja in your life!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"24.225.103.32";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:59:"http://demo2.woothemes.com/woocommerce/product/woo-ninja-2/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:59:"http://demo2.woothemes.com/woocommerce/product/woo-ninja-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:5:"Maria";s:10:"POST_email";s:19:"maria@woothemes.com";s:11:"POST_rating";s:1:"4";s:12:"POST_comment";s:40:"Perfect for the lady Ninja in your life!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:33:"/woocommerce/product/woo-ninja-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"47";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"ade950552e";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"263";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:59:"http://demo2.woothemes.com/woocommerce/product/woo-ninja-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"24.225.103.32";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"26829";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370620393";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:18:45";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:47;s:14:"comment_author";s:5:"Maria";s:20:"comment_author_email";s:19:"maria@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:40:"Perfect for the lady Ninja in your life!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"24.225.103.32";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:59:"http://demo.woothemes.com/woocommerce/product/woo-ninja-2/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:59:"http://demo.woothemes.com/woocommerce/product/woo-ninja-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:5:"Maria";s:10:"POST_email";s:19:"maria@woothemes.com";s:11:"POST_rating";s:1:"4";s:12:"POST_comment";s:40:"Perfect for the lady Ninja in your life!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:33:"/woocommerce/product/woo-ninja-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"47";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"ade950552e";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"263";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:59:"http://demo.woothemes.com/woocommerce/product/woo-ninja-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"24.225.103.32";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"26829";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370620393";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:18:45";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -3285,10 +3285,10 @@ I'm ordering mine next week";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http
 	</item>
 	<item>
 		<title>Patient Ninja</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/patient-ninja/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/patient-ninja/</link>
 		<pubDate>Fri, 07 Jun 2013 11:03:56 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/?post_type=product&#038;p=50</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/?post_type=product&#038;p=50</guid>
 		<description></description>
 		<content:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></content:encoded>
 		<excerpt:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></excerpt:encoded>
@@ -3357,7 +3357,7 @@ I'm ordering mine next week";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http
 		</wp:postmeta>
 		<wp:postmeta>
 			<wp:meta_key>_featured</wp:meta_key>
-			<wp:meta_value><![CDATA[no]]></wp:meta_value>
+			<wp:meta_value><![CDATA[yes]]></wp:meta_value>
 		</wp:postmeta>
 		<wp:postmeta>
 			<wp:meta_key>_weight</wp:meta_key>
@@ -3442,7 +3442,7 @@ I'm ordering mine next week";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:50;s:14:"comment_author";s:12:"James Koster";s:20:"comment_author_email";s:23:"james@jameskoster.co.uk";s:18:"comment_author_url";N;s:15:"comment_content";s:103:"Perfect when you're waiting for the next batch of Woo Goodies to be released. Patient Ninja is Patient.";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"86.146.141.82";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:61:"http://demo2.woothemes.com/woocommerce/product/patient-ninja/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:61:"http://demo2.woothemes.com/woocommerce/product/patient-ninja/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:12:"James Koster";s:10:"POST_email";s:23:"james@jameskoster.co.uk";s:11:"POST_rating";s:1:"4";s:12:"POST_comment";s:103:"Perfect when you're waiting for the next batch of Woo Goodies to be released. Patient Ninja is Patient.";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:35:"/woocommerce/product/patient-ninja/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"50";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"ad4e7e1f00";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"339";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:61:"http://demo2.woothemes.com/woocommerce/product/patient-ninja/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"86.146.141.82";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"49636";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370605612";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:17:10";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:50;s:14:"comment_author";s:12:"James Koster";s:20:"comment_author_email";s:23:"james@jameskoster.co.uk";s:18:"comment_author_url";N;s:15:"comment_content";s:103:"Perfect when you're waiting for the next batch of Woo Goodies to be released. Patient Ninja is Patient.";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"86.146.141.82";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:61:"http://demo.woothemes.com/woocommerce/product/patient-ninja/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:61:"http://demo.woothemes.com/woocommerce/product/patient-ninja/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:12:"James Koster";s:10:"POST_email";s:23:"james@jameskoster.co.uk";s:11:"POST_rating";s:1:"4";s:12:"POST_comment";s:103:"Perfect when you're waiting for the next batch of Woo Goodies to be released. Patient Ninja is Patient.";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:35:"/woocommerce/product/patient-ninja/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"50";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"ad4e7e1f00";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"339";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:61:"http://demo.woothemes.com/woocommerce/product/patient-ninja/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"86.146.141.82";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"49636";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370605612";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:17:10";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -3476,7 +3476,7 @@ I'm ordering mine next week";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:67:{s:15:"comment_post_ID";i:50;s:14:"comment_author";s:12:"Cobus Bester";s:20:"comment_author_email";s:18:"bester.c@gmail.com";s:18:"comment_author_url";N;s:15:"comment_content";s:46:"The most comfortable hoodie I have ever owned!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"196.215.9.147";s:10:"user_agent";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:8:"referrer";s:61:"http://demo2.woothemes.com/woocommerce/product/patient-ninja/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:61:"http://demo2.woothemes.com/woocommerce/product/patient-ninja/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:12:"Cobus Bester";s:10:"POST_email";s:18:"bester.c@gmail.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:46:"The most comfortable hoodie I have ever owned!";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:35:"/woocommerce/product/patient-ninja/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"50";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"ad4e7e1f00";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"277";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:61:"http://demo2.woothemes.com/woocommerce/product/patient-ninja/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:19:"HTTP_ACCEPT_CHARSET";s:30:"ISO-8859-1,utf-8;q=0.7,*;q=0.3";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"196.215.9.147";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"54451";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370605993";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:17:10";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:67:{s:15:"comment_post_ID";i:50;s:14:"comment_author";s:12:"Cobus Bester";s:20:"comment_author_email";s:18:"bester.c@gmail.com";s:18:"comment_author_url";N;s:15:"comment_content";s:46:"The most comfortable hoodie I have ever owned!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"196.215.9.147";s:10:"user_agent";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:8:"referrer";s:61:"http://demo.woothemes.com/woocommerce/product/patient-ninja/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:61:"http://demo.woothemes.com/woocommerce/product/patient-ninja/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:12:"Cobus Bester";s:10:"POST_email";s:18:"bester.c@gmail.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:46:"The most comfortable hoodie I have ever owned!";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:35:"/woocommerce/product/patient-ninja/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"50";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"ad4e7e1f00";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"277";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:61:"http://demo.woothemes.com/woocommerce/product/patient-ninja/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:19:"HTTP_ACCEPT_CHARSET";s:30:"ISO-8859-1,utf-8;q=0.7,*;q=0.3";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"196.215.9.147";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"54451";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370605993";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:17:10";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -3514,9 +3514,9 @@ If only it came in red as well!]]></wp:comment_content>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
 				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:50;s:14:"comment_author";s:6:"Magnus";s:20:"comment_author_email";s:20:"magnus@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:62:"This is my favorite hoodie!
 
-If only it came in red as well!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"79.161.106.35";s:10:"user_agent";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.93 Safari/537.36";s:8:"referrer";s:61:"http://demo2.woothemes.com/woocommerce/product/patient-ninja/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:61:"http://demo2.woothemes.com/woocommerce/product/patient-ninja/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:6:"Magnus";s:10:"POST_email";s:20:"magnus@woothemes.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:62:"This is my favorite hoodie!
+If only it came in red as well!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"79.161.106.35";s:10:"user_agent";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.93 Safari/537.36";s:8:"referrer";s:61:"http://demo.woothemes.com/woocommerce/product/patient-ninja/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:61:"http://demo.woothemes.com/woocommerce/product/patient-ninja/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:6:"Magnus";s:10:"POST_email";s:20:"magnus@woothemes.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:62:"This is my favorite hoodie!
 
-If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:35:"/woocommerce/product/patient-ninja/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"50";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"f9f3bd0a31";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.93 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"299";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:61:"http://demo2.woothemes.com/woocommerce/product/patient-ninja/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"79.161.106.35";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"62118";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370606643";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:17:10";}]]></wp:meta_value>
+If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:35:"/woocommerce/product/patient-ninja/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"50";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"f9f3bd0a31";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.93 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"299";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:61:"http://demo.woothemes.com/woocommerce/product/patient-ninja/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"79.161.106.35";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"62118";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370606643";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:17:10";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -3530,10 +3530,10 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 	</item>
 	<item>
 		<title>Happy Ninja</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/happy-ninja-2/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/happy-ninja-2/</link>
 		<pubDate>Fri, 07 Jun 2013 11:05:37 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/?post_type=product&#038;p=53</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/?post_type=product&#038;p=53</guid>
 		<description></description>
 		<content:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></content:encoded>
 		<excerpt:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></excerpt:encoded>
@@ -3672,7 +3672,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 			<wp:comment_author_IP>86.19.152.140</wp:comment_author_IP>
 			<wp:comment_date>2013-06-07 11:54:51</wp:comment_date>
 			<wp:comment_date_gmt>2013-06-07 11:54:51</wp:comment_date_gmt>
-			<wp:comment_content><![CDATA[I bought this thinking it was a nice green colour, apparently it GREY! I'm colour blind so I don't care but my girlfriend says grey makes me look fat]]></wp:comment_content>
+			<wp:comment_content><![CDATA[I bought this thinking it was a nice green color, apparently it GREY! I'm color blind so I don't care but my girlfriend says grey makes me look fat]]></wp:comment_content>
 			<wp:comment_approved>1</wp:comment_approved>
 			<wp:comment_type></wp:comment_type>
 			<wp:comment_parent>0</wp:comment_parent>
@@ -3687,7 +3687,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:64:{s:15:"comment_post_ID";i:53;s:14:"comment_author";s:6:"Andrew";s:20:"comment_author_email";s:25:"andrew@chromeorange.co.uk";s:18:"comment_author_url";N;s:15:"comment_content";s:149:"I bought this thinking it was a nice green colour, apparently it GREY! I'm colour blind so I don't care but my girlfriend says grey makes me look fat";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"86.19.152.140";s:10:"user_agent";s:81:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:21.0) Gecko/20100101 Firefox/21.0";s:8:"referrer";s:61:"http://demo2.woothemes.com/woocommerce/product/happy-ninja-2/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:61:"http://demo2.woothemes.com/woocommerce/product/happy-ninja-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:6:"Andrew";s:10:"POST_email";s:25:"andrew@chromeorange.co.uk";s:11:"POST_rating";s:1:"1";s:12:"POST_comment";s:149:"I bought this thinking it was a nice green colour, apparently it GREY! I'm colour blind so I don't care but my girlfriend says grey makes me look fat";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:35:"/woocommerce/product/happy-ninja-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"53";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"d96b507062";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:81:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:21.0) Gecko/20100101 Firefox/21.0";s:15:"HTTP_CONNECTION";s:5:"close";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.5";s:20:"HTTP_ACCEPT_ENCODING";s:13:"gzip, deflate";s:12:"HTTP_REFERER";s:61:"http://demo2.woothemes.com/woocommerce/product/happy-ninja-2/";s:11:"HTTP_COOKIE";s:0:"";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:14:"CONTENT_LENGTH";s:3:"387";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"86.19.152.140";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"55431";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370606091";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:17:38";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:64:{s:15:"comment_post_ID";i:53;s:14:"comment_author";s:6:"Andrew";s:20:"comment_author_email";s:25:"andrew@chromeorange.co.uk";s:18:"comment_author_url";N;s:15:"comment_content";s:149:"I bought this thinking it was a nice green color, apparently it GREY! I'm color blind so I don't care but my girlfriend says grey makes me look fat";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"86.19.152.140";s:10:"user_agent";s:81:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:21.0) Gecko/20100101 Firefox/21.0";s:8:"referrer";s:61:"http://demo.woothemes.com/woocommerce/product/happy-ninja-2/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:61:"http://demo.woothemes.com/woocommerce/product/happy-ninja-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:6:"Andrew";s:10:"POST_email";s:25:"andrew@chromeorange.co.uk";s:11:"POST_rating";s:1:"1";s:12:"POST_comment";s:149:"I bought this thinking it was a nice green color, apparently it GREY! I'm color blind so I don't care but my girlfriend says grey makes me look fat";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:35:"/woocommerce/product/happy-ninja-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"53";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"d96b507062";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:81:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:21.0) Gecko/20100101 Firefox/21.0";s:15:"HTTP_CONNECTION";s:5:"close";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.5";s:20:"HTTP_ACCEPT_ENCODING";s:13:"gzip, deflate";s:12:"HTTP_REFERER";s:61:"http://demo.woothemes.com/woocommerce/product/happy-ninja-2/";s:11:"HTTP_COOKIE";s:0:"";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:14:"CONTENT_LENGTH";s:3:"387";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"86.19.152.140";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"55431";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370606091";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:17:38";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -3721,7 +3721,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:53;s:14:"comment_author";s:5:"Maria";s:20:"comment_author_email";s:19:"maria@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:122:"I love grey hoodies! This is perfect with my grey Ninja shirt, when I get cold I throw this on and I can still be a Ninja.";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"24.225.103.32";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:61:"http://demo2.woothemes.com/woocommerce/product/happy-ninja-2/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:61:"http://demo2.woothemes.com/woocommerce/product/happy-ninja-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:5:"Maria";s:10:"POST_email";s:19:"maria@woothemes.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:123:"I love grey hoodies! This is perfect with my grey Ninja shirt, when I get cold I throw this on and I can still be a Ninja. ";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:35:"/woocommerce/product/happy-ninja-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"53";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"7c862b3966";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"350";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:61:"http://demo2.woothemes.com/woocommerce/product/happy-ninja-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"24.225.103.32";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"24514";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370620222";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:17:38";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:53;s:14:"comment_author";s:5:"Maria";s:20:"comment_author_email";s:19:"maria@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:122:"I love grey hoodies! This is perfect with my grey Ninja shirt, when I get cold I throw this on and I can still be a Ninja.";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"24.225.103.32";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:61:"http://demo.woothemes.com/woocommerce/product/happy-ninja-2/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:61:"http://demo.woothemes.com/woocommerce/product/happy-ninja-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:5:"Maria";s:10:"POST_email";s:19:"maria@woothemes.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:123:"I love grey hoodies! This is perfect with my grey Ninja shirt, when I get cold I throw this on and I can still be a Ninja. ";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:35:"/woocommerce/product/happy-ninja-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"53";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"7c862b3966";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"350";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:61:"http://demo.woothemes.com/woocommerce/product/happy-ninja-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"24.225.103.32";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"24514";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370620222";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:17:38";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -3735,10 +3735,10 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 	</item>
 	<item>
 		<title>Ninja Silhouette</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/ninja-silhouette-2/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/ninja-silhouette-2/</link>
 		<pubDate>Fri, 07 Jun 2013 11:07:19 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/?post_type=product&#038;p=56</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/?post_type=product&#038;p=56</guid>
 		<description></description>
 		<content:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></content:encoded>
 		<excerpt:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></excerpt:encoded>
@@ -3807,7 +3807,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 		</wp:postmeta>
 		<wp:postmeta>
 			<wp:meta_key>_featured</wp:meta_key>
-			<wp:meta_value><![CDATA[no]]></wp:meta_value>
+			<wp:meta_value><![CDATA[yes]]></wp:meta_value>
 		</wp:postmeta>
 		<wp:postmeta>
 			<wp:meta_key>_weight</wp:meta_key>
@@ -3892,7 +3892,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:65:{s:15:"comment_post_ID";i:56;s:14:"comment_author";s:7:"student";s:20:"comment_author_email";s:21:"student@woothemes.com";s:18:"comment_author_url";s:0:"";s:15:"comment_content";s:27:"Perfect Hoodie for a Ninja!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:600;s:7:"user_ip";s:13:"196.215.9.147";s:10:"user_agent";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.93 Safari/537.36";s:8:"referrer";s:66:"http://demo2.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:66:"http://demo2.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:9:"user_role";s:0:"";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:27:"Perfect Hoodie for a Ninja!";s:7:"POST__n";s:10:"b7bb36a5b7";s:21:"POST__wp_http_referer";s:40:"/woocommerce/product/ninja-silhouette-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"56";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"83a5efa213";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.93 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"216";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:66:"http://demo2.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"196.215.9.147";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:4:"4903";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370607293";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:18:23";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:65:{s:15:"comment_post_ID";i:56;s:14:"comment_author";s:7:"student";s:20:"comment_author_email";s:21:"student@woothemes.com";s:18:"comment_author_url";s:0:"";s:15:"comment_content";s:27:"Perfect Hoodie for a Ninja!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:600;s:7:"user_ip";s:13:"196.215.9.147";s:10:"user_agent";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.93 Safari/537.36";s:8:"referrer";s:66:"http://demo.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:66:"http://demo.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:9:"user_role";s:0:"";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:27:"Perfect Hoodie for a Ninja!";s:7:"POST__n";s:10:"b7bb36a5b7";s:21:"POST__wp_http_referer";s:40:"/woocommerce/product/ninja-silhouette-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"56";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"83a5efa213";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.93 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"216";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:66:"http://demo.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"196.215.9.147";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:4:"4903";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370607293";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:18:23";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -3926,7 +3926,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:56;s:14:"comment_author";s:11:"Coen Jacobs";s:20:"comment_author_email";s:18:"coen@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:56:"I have lots of hoodies, but none is as cool as this one!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:12:"84.39.28.254";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:66:"http://demo2.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:66:"http://demo2.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:11:"Coen Jacobs";s:10:"POST_email";s:18:"coen@woothemes.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:56:"I have lots of hoodies, but none is as cool as this one!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:40:"/woocommerce/product/ninja-silhouette-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"56";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"96525c59f8";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"293";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:66:"http://demo2.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:23:"en-US,en;q=0.8,nl;q=0.6";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:12:"84.39.28.254";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:4:"9614";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370607656";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:18:23";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:56;s:14:"comment_author";s:11:"Coen Jacobs";s:20:"comment_author_email";s:18:"coen@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:56:"I have lots of hoodies, but none is as cool as this one!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:12:"84.39.28.254";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:66:"http://demo.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:66:"http://demo.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:11:"Coen Jacobs";s:10:"POST_email";s:18:"coen@woothemes.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:56:"I have lots of hoodies, but none is as cool as this one!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:40:"/woocommerce/product/ninja-silhouette-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"56";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"96525c59f8";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"293";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:66:"http://demo.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:23:"en-US,en;q=0.8,nl;q=0.6";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:12:"84.39.28.254";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:4:"9614";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370607656";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:18:23";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -3960,7 +3960,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:56;s:14:"comment_author";s:3:"Dan";s:20:"comment_author_email";s:17:"dan@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:97:"I love hoodies, and ninjas, so what could be better than a ninja hoodie? Not much, if you ask me!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"188.221.1.167";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:66:"http://demo2.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:66:"http://demo2.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:3:"Dan";s:10:"POST_email";s:17:"dan@woothemes.com";s:11:"POST_rating";s:1:"4";s:12:"POST_comment";s:97:"I love hoodies, and ninjas, so what could be better than a ninja hoodie? Not much, if you ask me!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:40:"/woocommerce/product/ninja-silhouette-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"56";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"96525c59f8";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"331";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:66:"http://demo2.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"188.221.1.167";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"24701";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370608902";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:18:23";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:56;s:14:"comment_author";s:3:"Dan";s:20:"comment_author_email";s:17:"dan@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:97:"I love hoodies, and ninjas, so what could be better than a ninja hoodie? Not much, if you ask me!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"188.221.1.167";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:66:"http://demo.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:66:"http://demo.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:3:"Dan";s:10:"POST_email";s:17:"dan@woothemes.com";s:11:"POST_rating";s:1:"4";s:12:"POST_comment";s:97:"I love hoodies, and ninjas, so what could be better than a ninja hoodie? Not much, if you ask me!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:40:"/woocommerce/product/ninja-silhouette-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"56";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"96525c59f8";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"331";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:66:"http://demo.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"188.221.1.167";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"24701";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370608902";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:18:23";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -3994,7 +3994,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:56;s:14:"comment_author";s:4:"Ryan";s:20:"comment_author_email";s:18:"ryan@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:123:"This is the most bombastic hoodie in this shop, it's soft and has the sly WooThemes ninja on it. Why wouldn't you buy this?";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:14:"99.153.225.252";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:66:"http://demo2.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:66:"http://demo2.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:4:"Ryan";s:10:"POST_email";s:18:"ryan@woothemes.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:123:"This is the most bombastic hoodie in this shop, it's soft and has the sly WooThemes ninja on it. Why wouldn't you buy this?";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:40:"/woocommerce/product/ninja-silhouette-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"56";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"96525c59f8";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"357";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:66:"http://demo2.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:14:"99.153.225.252";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"56439";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370611600";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:18:23";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:56;s:14:"comment_author";s:4:"Ryan";s:20:"comment_author_email";s:18:"ryan@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:123:"This is the most bombastic hoodie in this shop, it's soft and has the sly WooThemes ninja on it. Why wouldn't you buy this?";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:14:"99.153.225.252";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:66:"http://demo.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:66:"http://demo.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:4:"Ryan";s:10:"POST_email";s:18:"ryan@woothemes.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:123:"This is the most bombastic hoodie in this shop, it's soft and has the sly WooThemes ninja on it. Why wouldn't you buy this?";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:40:"/woocommerce/product/ninja-silhouette-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"56";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"96525c59f8";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"357";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:66:"http://demo.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:14:"99.153.225.252";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"56439";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370611600";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:18:23";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -4028,7 +4028,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:56;s:14:"comment_author";s:5:"Maria";s:20:"comment_author_email";s:19:"maria@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:67:"This only gets 1 star because I don't have this yet. I want it now!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"24.225.103.32";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:66:"http://demo2.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:66:"http://demo2.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:5:"Maria";s:10:"POST_email";s:19:"maria@woothemes.com";s:11:"POST_rating";s:1:"1";s:12:"POST_comment";s:68:"This only gets 1 star because I don't have this yet. I want it now! ";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:40:"/woocommerce/product/ninja-silhouette-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"56";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"96525c59f8";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"300";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:66:"http://demo2.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"24.225.103.32";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"27338";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370620436";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:18:23";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:56;s:14:"comment_author";s:5:"Maria";s:20:"comment_author_email";s:19:"maria@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:67:"This only gets 1 star because I don't have this yet. I want it now!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"24.225.103.32";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:66:"http://demo.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:66:"http://demo.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:5:"Maria";s:10:"POST_email";s:19:"maria@woothemes.com";s:11:"POST_rating";s:1:"1";s:12:"POST_comment";s:68:"This only gets 1 star because I don't have this yet. I want it now! ";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:40:"/woocommerce/product/ninja-silhouette-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"56";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"96525c59f8";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"300";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:66:"http://demo.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"24.225.103.32";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"27338";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370620436";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:18:23";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -4062,7 +4062,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:68:{s:15:"comment_post_ID";i:56;s:14:"comment_author";s:7:"Gerhard";s:20:"comment_author_email";s:21:"gerhard@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:21:"The best hoodie ever!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:12:"72.251.244.9";s:10:"user_agent";s:135:"Mozilla/5.0 (iPhone; CPU iPhone OS 6_1_3 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10B329 Safari/8536.25";s:8:"referrer";s:66:"http://demo2.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:66:"http://demo2.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:7:"Gerhard";s:10:"POST_email";s:21:"gerhard@woothemes.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:21:"The best hoodie ever!";s:7:"POST__n";s:10:"56eef4b919";s:21:"POST__wp_http_referer";s:40:"/woocommerce/product/ninja-silhouette-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"56";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"98e3d67d36";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:135:"Mozilla/5.0 (iPhone; CPU iPhone OS 6_1_3 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10B329 Safari/8536.25";s:15:"HTTP_CONNECTION";s:5:"close";s:20:"HTTP_ACCEPT_LANGUAGE";s:5:"en-us";s:11:"HTTP_PRAGMA";s:8:"no-cache";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:12:"HTTP_REFERER";s:66:"http://demo2.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:11:"HTTP_COOKIE";s:0:"";s:14:"CONTENT_LENGTH";s:3:"255";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:20:"HTTP_ACCEPT_ENCODING";s:13:"gzip, deflate";s:8:"HTTP_VIA";s:5:"Onavo";s:18:"HTTP_CACHE_CONTROL";s:14:"max-age=259200";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:12:"72.251.244.9";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"14967";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370684262";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:18:23";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:68:{s:15:"comment_post_ID";i:56;s:14:"comment_author";s:7:"Gerhard";s:20:"comment_author_email";s:21:"gerhard@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:21:"The best hoodie ever!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:12:"72.251.244.9";s:10:"user_agent";s:135:"Mozilla/5.0 (iPhone; CPU iPhone OS 6_1_3 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10B329 Safari/8536.25";s:8:"referrer";s:66:"http://demo.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:66:"http://demo.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:7:"Gerhard";s:10:"POST_email";s:21:"gerhard@woothemes.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:21:"The best hoodie ever!";s:7:"POST__n";s:10:"56eef4b919";s:21:"POST__wp_http_referer";s:40:"/woocommerce/product/ninja-silhouette-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"56";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"98e3d67d36";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:135:"Mozilla/5.0 (iPhone; CPU iPhone OS 6_1_3 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10B329 Safari/8536.25";s:15:"HTTP_CONNECTION";s:5:"close";s:20:"HTTP_ACCEPT_LANGUAGE";s:5:"en-us";s:11:"HTTP_PRAGMA";s:8:"no-cache";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:12:"HTTP_REFERER";s:66:"http://demo.woothemes.com/woocommerce/product/ninja-silhouette-2/";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:11:"HTTP_COOKIE";s:0:"";s:14:"CONTENT_LENGTH";s:3:"255";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:20:"HTTP_ACCEPT_ENCODING";s:13:"gzip, deflate";s:8:"HTTP_VIA";s:5:"Onavo";s:18:"HTTP_CACHE_CONTROL";s:14:"max-age=259200";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:12:"72.251.244.9";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"14967";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370684262";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:18:23";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -4072,10 +4072,10 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 	</item>
 	<item>
 		<title>Woo Logo</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-logo-2/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-logo-2/</link>
 		<pubDate>Fri, 07 Jun 2013 11:12:55 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/?post_type=product&#038;p=60</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/?post_type=product&#038;p=60</guid>
 		<description></description>
 		<content:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></content:encoded>
 		<excerpt:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></excerpt:encoded>
@@ -4229,7 +4229,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:60;s:14:"comment_author";s:6:"Magnus";s:20:"comment_author_email";s:20:"magnus@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:34:"I like the logo but not the color.";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"79.161.106.35";s:10:"user_agent";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.93 Safari/537.36";s:8:"referrer";s:58:"http://demo2.woothemes.com/woocommerce/product/woo-logo-2/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:58:"http://demo2.woothemes.com/woocommerce/product/woo-logo-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:6:"Magnus";s:10:"POST_email";s:20:"magnus@woothemes.com";s:11:"POST_rating";s:1:"3";s:12:"POST_comment";s:35:"I like the logo but not the color. ";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:32:"/woocommerce/product/woo-logo-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"60";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"71dc771f00";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.93 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"257";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:58:"http://demo2.woothemes.com/woocommerce/product/woo-logo-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"79.161.106.35";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"62521";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370606673";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:18:08";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:60;s:14:"comment_author";s:6:"Magnus";s:20:"comment_author_email";s:20:"magnus@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:34:"I like the logo but not the color.";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"79.161.106.35";s:10:"user_agent";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.93 Safari/537.36";s:8:"referrer";s:58:"http://demo.woothemes.com/woocommerce/product/woo-logo-2/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:58:"http://demo.woothemes.com/woocommerce/product/woo-logo-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:6:"Magnus";s:10:"POST_email";s:20:"magnus@woothemes.com";s:11:"POST_rating";s:1:"3";s:12:"POST_comment";s:35:"I like the logo but not the color. ";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:32:"/woocommerce/product/woo-logo-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"60";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"71dc771f00";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.93 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"257";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:58:"http://demo.woothemes.com/woocommerce/product/woo-logo-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"79.161.106.35";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"62521";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370606673";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:18:08";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -4263,7 +4263,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:60;s:14:"comment_author";s:5:"Maria";s:20:"comment_author_email";s:19:"maria@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:29:"Three letters, one word: WOO!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"24.225.103.32";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:58:"http://demo2.woothemes.com/woocommerce/product/woo-logo-2/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:58:"http://demo2.woothemes.com/woocommerce/product/woo-logo-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:5:"Maria";s:10:"POST_email";s:19:"maria@woothemes.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:29:"Three letters, one word: WOO!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:32:"/woocommerce/product/woo-logo-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"60";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"71dc771f00";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"255";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:58:"http://demo2.woothemes.com/woocommerce/product/woo-logo-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"24.225.103.32";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"27597";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370620465";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:18:08";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:60;s:14:"comment_author";s:5:"Maria";s:20:"comment_author_email";s:19:"maria@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:29:"Three letters, one word: WOO!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"24.225.103.32";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:58:"http://demo.woothemes.com/woocommerce/product/woo-logo-2/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:58:"http://demo.woothemes.com/woocommerce/product/woo-logo-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:5:"Maria";s:10:"POST_email";s:19:"maria@woothemes.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:29:"Three letters, one word: WOO!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:32:"/woocommerce/product/woo-logo-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"60";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"71dc771f00";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"255";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:58:"http://demo.woothemes.com/woocommerce/product/woo-logo-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"24.225.103.32";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"27597";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370620465";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:18:08";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -4277,10 +4277,10 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 	</item>
 	<item>
 		<title>Ship Your Idea</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/ship-your-idea-3/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/ship-your-idea-3/</link>
 		<pubDate>Fri, 07 Jun 2013 11:22:50 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/?post_type=product&#038;p=67</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/?post_type=product&#038;p=67</guid>
 		<description></description>
 		<content:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></content:encoded>
 		<excerpt:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></excerpt:encoded>
@@ -4417,10 +4417,10 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 	</item>
 	<item>
 		<title>Flying Ninja</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/flying-ninja/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/flying-ninja/</link>
 		<pubDate>Fri, 07 Jun 2013 11:25:01 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/?post_type=product&#038;p=70</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/?post_type=product&#038;p=70</guid>
 		<description></description>
 		<content:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></content:encoded>
 		<excerpt:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></excerpt:encoded>
@@ -4569,7 +4569,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:67:{s:15:"comment_post_ID";i:70;s:14:"comment_author";s:12:"Cobus Bester";s:20:"comment_author_email";s:18:"bester.c@gmail.com";s:18:"comment_author_url";N;s:15:"comment_content";s:86:"Really happy with this print. The colors are great, and the paper quality is good too.";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"196.215.9.147";s:10:"user_agent";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:8:"referrer";s:60:"http://demo2.woothemes.com/woocommerce/product/flying-ninja/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:60:"http://demo2.woothemes.com/woocommerce/product/flying-ninja/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:12:"Cobus Bester";s:10:"POST_email";s:18:"bester.c@gmail.com";s:11:"POST_rating";s:1:"4";s:12:"POST_comment";s:86:"Really happy with this print. The colors are great, and the paper quality is good too.";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:34:"/woocommerce/product/flying-ninja/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"70";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"09a0ca91cf";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"316";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:60:"http://demo2.woothemes.com/woocommerce/product/flying-ninja/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:19:"HTTP_ACCEPT_CHARSET";s:30:"ISO-8859-1,utf-8;q=0.7,*;q=0.3";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"196.215.9.147";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"53744";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370605945";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:25:12";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:67:{s:15:"comment_post_ID";i:70;s:14:"comment_author";s:12:"Cobus Bester";s:20:"comment_author_email";s:18:"bester.c@gmail.com";s:18:"comment_author_url";N;s:15:"comment_content";s:86:"Really happy with this print. The colors are great, and the paper quality is good too.";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"196.215.9.147";s:10:"user_agent";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:8:"referrer";s:60:"http://demo.woothemes.com/woocommerce/product/flying-ninja/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:60:"http://demo.woothemes.com/woocommerce/product/flying-ninja/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:12:"Cobus Bester";s:10:"POST_email";s:18:"bester.c@gmail.com";s:11:"POST_rating";s:1:"4";s:12:"POST_comment";s:86:"Really happy with this print. The colors are great, and the paper quality is good too.";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:34:"/woocommerce/product/flying-ninja/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"70";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"09a0ca91cf";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"316";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:60:"http://demo.woothemes.com/woocommerce/product/flying-ninja/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:19:"HTTP_ACCEPT_CHARSET";s:30:"ISO-8859-1,utf-8;q=0.7,*;q=0.3";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"196.215.9.147";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"53744";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370605945";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:25:12";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -4603,7 +4603,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:64:{s:15:"comment_post_ID";i:70;s:14:"comment_author";s:6:"Andrew";s:20:"comment_author_email";s:25:"andrew@chromeorange.co.uk";s:18:"comment_author_url";N;s:15:"comment_content";s:136:"You only get the picture, not the person holding it, something they don't mention in the description, now I've got to find my own person";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"86.19.152.140";s:10:"user_agent";s:81:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:21.0) Gecko/20100101 Firefox/21.0";s:8:"referrer";s:60:"http://demo2.woothemes.com/woocommerce/product/flying-ninja/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:60:"http://demo2.woothemes.com/woocommerce/product/flying-ninja/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:6:"Andrew";s:10:"POST_email";s:25:"andrew@chromeorange.co.uk";s:11:"POST_rating";s:1:"3";s:12:"POST_comment";s:136:"You only get the picture, not the person holding it, something they don't mention in the description, now I've got to find my own person";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:34:"/woocommerce/product/flying-ninja/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"70";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"09a0ca91cf";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:81:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:21.0) Gecko/20100101 Firefox/21.0";s:15:"HTTP_CONNECTION";s:5:"close";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.5";s:20:"HTTP_ACCEPT_ENCODING";s:13:"gzip, deflate";s:12:"HTTP_REFERER";s:60:"http://demo2.woothemes.com/woocommerce/product/flying-ninja/";s:11:"HTTP_COOKIE";s:0:"";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:14:"CONTENT_LENGTH";s:3:"375";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"86.19.152.140";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"56980";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370606196";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:25:12";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:64:{s:15:"comment_post_ID";i:70;s:14:"comment_author";s:6:"Andrew";s:20:"comment_author_email";s:25:"andrew@chromeorange.co.uk";s:18:"comment_author_url";N;s:15:"comment_content";s:136:"You only get the picture, not the person holding it, something they don't mention in the description, now I've got to find my own person";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"86.19.152.140";s:10:"user_agent";s:81:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:21.0) Gecko/20100101 Firefox/21.0";s:8:"referrer";s:60:"http://demo.woothemes.com/woocommerce/product/flying-ninja/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:60:"http://demo.woothemes.com/woocommerce/product/flying-ninja/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:6:"Andrew";s:10:"POST_email";s:25:"andrew@chromeorange.co.uk";s:11:"POST_rating";s:1:"3";s:12:"POST_comment";s:136:"You only get the picture, not the person holding it, something they don't mention in the description, now I've got to find my own person";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:34:"/woocommerce/product/flying-ninja/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"70";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"09a0ca91cf";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:81:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:21.0) Gecko/20100101 Firefox/21.0";s:15:"HTTP_CONNECTION";s:5:"close";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.5";s:20:"HTTP_ACCEPT_ENCODING";s:13:"gzip, deflate";s:12:"HTTP_REFERER";s:60:"http://demo.woothemes.com/woocommerce/product/flying-ninja/";s:11:"HTTP_COOKIE";s:0:"";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:14:"CONTENT_LENGTH";s:3:"375";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"86.19.152.140";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"56980";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370606196";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:25:12";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -4637,7 +4637,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:70;s:14:"comment_author";s:11:"Coen Jacobs";s:20:"comment_author_email";s:18:"coen@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:60:"This is my favorite poster. In fact, I've ordered 5 of them!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:12:"84.39.28.254";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:60:"http://demo2.woothemes.com/woocommerce/product/flying-ninja/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:60:"http://demo2.woothemes.com/woocommerce/product/flying-ninja/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:11:"Coen Jacobs";s:10:"POST_email";s:18:"coen@woothemes.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:60:"This is my favorite poster. In fact, I've ordered 5 of them!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:34:"/woocommerce/product/flying-ninja/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"70";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"a0ccbdfa0d";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"293";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:60:"http://demo2.woothemes.com/woocommerce/product/flying-ninja/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:23:"en-US,en;q=0.8,nl;q=0.6";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:12:"84.39.28.254";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:4:"8391";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370607565";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:25:12";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:70;s:14:"comment_author";s:11:"Coen Jacobs";s:20:"comment_author_email";s:18:"coen@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:60:"This is my favorite poster. In fact, I've ordered 5 of them!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:12:"84.39.28.254";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:60:"http://demo.woothemes.com/woocommerce/product/flying-ninja/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:60:"http://demo.woothemes.com/woocommerce/product/flying-ninja/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:11:"Coen Jacobs";s:10:"POST_email";s:18:"coen@woothemes.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:60:"This is my favorite poster. In fact, I've ordered 5 of them!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:34:"/woocommerce/product/flying-ninja/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"70";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"a0ccbdfa0d";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"293";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:60:"http://demo.woothemes.com/woocommerce/product/flying-ninja/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:23:"en-US,en;q=0.8,nl;q=0.6";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:12:"84.39.28.254";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:4:"8391";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370607565";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:25:12";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -4671,7 +4671,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:64:{s:15:"comment_post_ID";i:70;s:14:"comment_author";s:6:"Stuart";s:20:"comment_author_email";s:20:"stuart@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:79:"This is a fantastic quality print and is happily hanging framed on my wall now.";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"82.32.109.140";s:10:"user_agent";s:72:"Mozilla/5.0 (Windows NT 6.1; WOW64; rv:21.0) Gecko/20100101 Firefox/21.0";s:8:"referrer";s:60:"http://demo2.woothemes.com/woocommerce/product/flying-ninja/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:60:"http://demo2.woothemes.com/woocommerce/product/flying-ninja/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:6:"Stuart";s:10:"POST_email";s:20:"stuart@woothemes.com";s:11:"POST_rating";s:1:"4";s:12:"POST_comment";s:79:"This is a fantastic quality print and is happily hanging framed on my wall now.";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:34:"/woocommerce/product/flying-ninja/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"70";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"a0ccbdfa0d";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:72:"Mozilla/5.0 (Windows NT 6.1; WOW64; rv:21.0) Gecko/20100101 Firefox/21.0";s:15:"HTTP_CONNECTION";s:5:"close";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.5";s:20:"HTTP_ACCEPT_ENCODING";s:13:"gzip, deflate";s:12:"HTTP_REFERER";s:60:"http://demo2.woothemes.com/woocommerce/product/flying-ninja/";s:11:"HTTP_COOKIE";s:0:"";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:14:"CONTENT_LENGTH";s:3:"303";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"82.32.109.140";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"39257";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370609989";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:25:12";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:64:{s:15:"comment_post_ID";i:70;s:14:"comment_author";s:6:"Stuart";s:20:"comment_author_email";s:20:"stuart@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:79:"This is a fantastic quality print and is happily hanging framed on my wall now.";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"82.32.109.140";s:10:"user_agent";s:72:"Mozilla/5.0 (Windows NT 6.1; WOW64; rv:21.0) Gecko/20100101 Firefox/21.0";s:8:"referrer";s:60:"http://demo.woothemes.com/woocommerce/product/flying-ninja/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:60:"http://demo.woothemes.com/woocommerce/product/flying-ninja/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:6:"Stuart";s:10:"POST_email";s:20:"stuart@woothemes.com";s:11:"POST_rating";s:1:"4";s:12:"POST_comment";s:79:"This is a fantastic quality print and is happily hanging framed on my wall now.";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:34:"/woocommerce/product/flying-ninja/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"70";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"a0ccbdfa0d";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:72:"Mozilla/5.0 (Windows NT 6.1; WOW64; rv:21.0) Gecko/20100101 Firefox/21.0";s:15:"HTTP_CONNECTION";s:5:"close";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.5";s:20:"HTTP_ACCEPT_ENCODING";s:13:"gzip, deflate";s:12:"HTTP_REFERER";s:60:"http://demo.woothemes.com/woocommerce/product/flying-ninja/";s:11:"HTTP_COOKIE";s:0:"";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:14:"CONTENT_LENGTH";s:3:"303";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"82.32.109.140";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"39257";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370609989";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:25:12";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -4685,10 +4685,10 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 	</item>
 	<item>
 		<title>Premium Quality</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/premium-quality-2/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/premium-quality-2/</link>
 		<pubDate>Fri, 07 Jun 2013 11:27:38 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/?post_type=product&#038;p=73</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/?post_type=product&#038;p=73</guid>
 		<description></description>
 		<content:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></content:encoded>
 		<excerpt:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></excerpt:encoded>
@@ -4841,7 +4841,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:73;s:14:"comment_author";s:3:"Dan";s:20:"comment_author_email";s:17:"dan@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:135:"I thought I was buying a man holding a poster, but when it arrived it was just the poster. Cool poster though, so I'll give it 3 stars!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"188.221.1.167";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:65:"http://demo2.woothemes.com/woocommerce/product/premium-quality-2/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:65:"http://demo2.woothemes.com/woocommerce/product/premium-quality-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:3:"Dan";s:10:"POST_email";s:17:"dan@woothemes.com";s:11:"POST_rating";s:1:"3";s:12:"POST_comment";s:135:"I thought I was buying a man holding a poster, but when it arrived it was just the poster. Cool poster though, so I'll give it 3 stars!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:39:"/woocommerce/product/premium-quality-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"73";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"441b7bcdc8";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"366";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:65:"http://demo2.woothemes.com/woocommerce/product/premium-quality-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"188.221.1.167";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"22513";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370608744";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:27:38";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:73;s:14:"comment_author";s:3:"Dan";s:20:"comment_author_email";s:17:"dan@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:135:"I thought I was buying a man holding a poster, but when it arrived it was just the poster. Cool poster though, so I'll give it 3 stars!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"188.221.1.167";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:65:"http://demo.woothemes.com/woocommerce/product/premium-quality-2/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:65:"http://demo.woothemes.com/woocommerce/product/premium-quality-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:3:"Dan";s:10:"POST_email";s:17:"dan@woothemes.com";s:11:"POST_rating";s:1:"3";s:12:"POST_comment";s:135:"I thought I was buying a man holding a poster, but when it arrived it was just the poster. Cool poster though, so I'll give it 3 stars!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:39:"/woocommerce/product/premium-quality-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"73";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"441b7bcdc8";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"366";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:65:"http://demo.woothemes.com/woocommerce/product/premium-quality-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"188.221.1.167";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"22513";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370608744";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:27:38";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -4875,9 +4875,9 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:73;s:14:"comment_author";s:5:"Maria";s:20:"comment_author_email";s:19:"maria@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:98:"I didn't expect this poster to arrive folded. Now there are lines on the poster and one sad Ninja.";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"24.225.103.32";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:65:"http://demo2.woothemes.com/woocommerce/product/premium-quality-2/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:65:"http://demo2.woothemes.com/woocommerce/product/premium-quality-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:5:"Maria";s:10:"POST_email";s:19:"maria@woothemes.com";s:11:"POST_rating";s:1:"1";s:12:"POST_comment";s:103:"I didn't expect this poster to arrive folded. Now there are lines on the poster and one sad Ninja.
+				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:73;s:14:"comment_author";s:5:"Maria";s:20:"comment_author_email";s:19:"maria@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:98:"I didn't expect this poster to arrive folded. Now there are lines on the poster and one sad Ninja.";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"24.225.103.32";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:65:"http://demo.woothemes.com/woocommerce/product/premium-quality-2/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:65:"http://demo.woothemes.com/woocommerce/product/premium-quality-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:5:"Maria";s:10:"POST_email";s:19:"maria@woothemes.com";s:11:"POST_rating";s:1:"1";s:12:"POST_comment";s:103:"I didn't expect this poster to arrive folded. Now there are lines on the poster and one sad Ninja.
 
-";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:39:"/woocommerce/product/premium-quality-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"73";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"441b7bcdc8";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"340";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:65:"http://demo2.woothemes.com/woocommerce/product/premium-quality-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"24.225.103.32";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"28277";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370620529";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:27:38";}]]></wp:meta_value>
+";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:39:"/woocommerce/product/premium-quality-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"73";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"441b7bcdc8";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"340";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:65:"http://demo.woothemes.com/woocommerce/product/premium-quality-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"24.225.103.32";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"28277";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370620529";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:27:38";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -4891,10 +4891,10 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 	</item>
 	<item>
 		<title>Woo Ninja</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-ninja-3/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-ninja-3/</link>
 		<pubDate>Fri, 07 Jun 2013 11:28:45 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/?post_type=product&#038;p=76</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/?post_type=product&#038;p=76</guid>
 		<description></description>
 		<content:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></content:encoded>
 		<excerpt:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></excerpt:encoded>
@@ -5047,7 +5047,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:76;s:14:"comment_author";s:5:"Maria";s:20:"comment_author_email";s:19:"maria@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:44:"He really is the cutest little man. Swoooon!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"24.225.103.32";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:59:"http://demo2.woothemes.com/woocommerce/product/woo-ninja-3/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:59:"http://demo2.woothemes.com/woocommerce/product/woo-ninja-3/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:5:"Maria";s:10:"POST_email";s:19:"maria@woothemes.com";s:11:"POST_rating";s:1:"4";s:12:"POST_comment";s:45:"He really is the cutest little man. Swoooon! ";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:33:"/woocommerce/product/woo-ninja-3/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"76";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"29cab5ecf2";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"268";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:59:"http://demo2.woothemes.com/woocommerce/product/woo-ninja-3/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"24.225.103.32";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"28885";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370620584";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:28:45";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:76;s:14:"comment_author";s:5:"Maria";s:20:"comment_author_email";s:19:"maria@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:44:"He really is the cutest little man. Swoooon!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"24.225.103.32";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:59:"http://demo.woothemes.com/woocommerce/product/woo-ninja-3/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:59:"http://demo.woothemes.com/woocommerce/product/woo-ninja-3/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:5:"Maria";s:10:"POST_email";s:19:"maria@woothemes.com";s:11:"POST_rating";s:1:"4";s:12:"POST_comment";s:45:"He really is the cutest little man. Swoooon! ";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:33:"/woocommerce/product/woo-ninja-3/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"76";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"29cab5ecf2";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"268";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:59:"http://demo.woothemes.com/woocommerce/product/woo-ninja-3/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"24.225.103.32";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"28885";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370620584";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:28:45";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -5061,10 +5061,10 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 	</item>
 	<item>
 		<title>Variation #23 of Ship Your Idea</title>
-		<link>http://demo2.woothemes.com/woocommerce/?product_variation=product-22-variation</link>
+		<link>http://demo.woothemes.com/woocommerce/?product_variation=product-22-variation</link>
 		<pubDate>Fri, 07 Jun 2013 10:44:57 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/?product_variation=product-22-variation</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/?product_variation=product-22-variation</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -5159,10 +5159,10 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 	</item>
 	<item>
 		<title>Variation #24 of Ship Your Idea</title>
-		<link>http://demo2.woothemes.com/woocommerce/?product_variation=product-22-variation-2</link>
+		<link>http://demo.woothemes.com/woocommerce/?product_variation=product-22-variation-2</link>
 		<pubDate>Fri, 07 Jun 2013 10:44:58 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/?product_variation=product-22-variation-2</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/?product_variation=product-22-variation-2</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -5257,10 +5257,10 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 	</item>
 	<item>
 		<title>Variation #41 of Ship Your Idea</title>
-		<link>http://demo2.woothemes.com/woocommerce/?product_variation=product-40-variation</link>
+		<link>http://demo.woothemes.com/woocommerce/?product_variation=product-40-variation</link>
 		<pubDate>Fri, 07 Jun 2013 10:59:15 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/?product_variation=product-40-variation</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/?product_variation=product-40-variation</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -5355,10 +5355,10 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 	</item>
 	<item>
 		<title>Variation #42 of Ship Your Idea</title>
-		<link>http://demo2.woothemes.com/woocommerce/?product_variation=product-40-variation-2</link>
+		<link>http://demo.woothemes.com/woocommerce/?product_variation=product-40-variation-2</link>
 		<pubDate>Fri, 07 Jun 2013 10:59:15 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/?product_variation=product-40-variation-2</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/?product_variation=product-40-variation-2</guid>
 		<description></description>
 		<content:encoded><![CDATA[]]></content:encoded>
 		<excerpt:encoded><![CDATA[]]></excerpt:encoded>
@@ -5453,10 +5453,10 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 	</item>
 	<item>
 		<title>Woo Logo</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-logo-3/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-logo-3/</link>
 		<pubDate>Fri, 07 Jun 2013 11:29:44 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/?post_type=product&#038;p=79</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/?post_type=product&#038;p=79</guid>
 		<description></description>
 		<content:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></content:encoded>
 		<excerpt:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></excerpt:encoded>
@@ -5589,10 +5589,10 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 	</item>
 	<item>
 		<title>Woo Album #1</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-album-1/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-album-1/</link>
 		<pubDate>Fri, 07 Jun 2013 11:33:05 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/?post_type=product&#038;p=83</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/?post_type=product&#038;p=83</guid>
 		<description></description>
 		<content:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></content:encoded>
 		<excerpt:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></excerpt:encoded>
@@ -5734,10 +5734,10 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 	</item>
 	<item>
 		<title>Woo Album #2</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-album-2/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-album-2/</link>
 		<pubDate>Fri, 07 Jun 2013 11:34:14 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/?post_type=product&#038;p=87</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/?post_type=product&#038;p=87</guid>
 		<description></description>
 		<content:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></content:encoded>
 		<excerpt:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></excerpt:encoded>
@@ -5810,7 +5810,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 		</wp:postmeta>
 		<wp:postmeta>
 			<wp:meta_key>_featured</wp:meta_key>
-			<wp:meta_value><![CDATA[no]]></wp:meta_value>
+			<wp:meta_value><![CDATA[yes]]></wp:meta_value>
 		</wp:postmeta>
 		<wp:postmeta>
 			<wp:meta_key>_weight</wp:meta_key>
@@ -5899,7 +5899,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:67:{s:15:"comment_post_ID";i:87;s:14:"comment_author";s:12:"Cobus Bester";s:20:"comment_author_email";s:18:"bester.c@gmail.com";s:18:"comment_author_url";N;s:15:"comment_content";s:72:"Wonderful collection of WooThemes classics! A must buy for all Woo fans.";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"196.215.9.147";s:10:"user_agent";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:8:"referrer";s:59:"http://demo2.woothemes.com/woocommerce/product/woo-album-2/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:59:"http://demo2.woothemes.com/woocommerce/product/woo-album-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:12:"Cobus Bester";s:10:"POST_email";s:18:"bester.c@gmail.com";s:11:"POST_rating";s:1:"4";s:12:"POST_comment";s:72:"Wonderful collection of WooThemes classics! A must buy for all Woo fans.";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:33:"/woocommerce/product/woo-album-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"87";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"0f8261c8a1";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"301";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:59:"http://demo2.woothemes.com/woocommerce/product/woo-album-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:19:"HTTP_ACCEPT_CHARSET";s:30:"ISO-8859-1,utf-8;q=0.7,*;q=0.3";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"196.215.9.147";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"56904";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370606192";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:39:39";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:67:{s:15:"comment_post_ID";i:87;s:14:"comment_author";s:12:"Cobus Bester";s:20:"comment_author_email";s:18:"bester.c@gmail.com";s:18:"comment_author_url";N;s:15:"comment_content";s:72:"Wonderful collection of WooThemes classics! A must buy for all Woo fans.";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"196.215.9.147";s:10:"user_agent";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:8:"referrer";s:59:"http://demo.woothemes.com/woocommerce/product/woo-album-2/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:59:"http://demo.woothemes.com/woocommerce/product/woo-album-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:12:"Cobus Bester";s:10:"POST_email";s:18:"bester.c@gmail.com";s:11:"POST_rating";s:1:"4";s:12:"POST_comment";s:72:"Wonderful collection of WooThemes classics! A must buy for all Woo fans.";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:33:"/woocommerce/product/woo-album-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"87";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"0f8261c8a1";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"301";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:59:"http://demo.woothemes.com/woocommerce/product/woo-album-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:19:"HTTP_ACCEPT_CHARSET";s:30:"ISO-8859-1,utf-8;q=0.7,*;q=0.3";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"196.215.9.147";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"56904";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370606192";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:39:39";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -5913,10 +5913,10 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 	</item>
 	<item>
 		<title>Woo Album #3</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-album-3/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-album-3/</link>
 		<pubDate>Fri, 07 Jun 2013 11:35:18 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/?post_type=product&#038;p=90</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/?post_type=product&#038;p=90</guid>
 		<description></description>
 		<content:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></content:encoded>
 		<excerpt:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></excerpt:encoded>
@@ -6078,7 +6078,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:90;s:14:"comment_author";s:11:"Coen Jacobs";s:20:"comment_author_email";s:18:"coen@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:104:"This album gets a bit boring after you've listened to it more than once. Worth that first listen though.";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:12:"84.39.28.254";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:59:"http://demo2.woothemes.com/woocommerce/product/woo-album-3/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:59:"http://demo2.woothemes.com/woocommerce/product/woo-album-3/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:11:"Coen Jacobs";s:10:"POST_email";s:18:"coen@woothemes.com";s:11:"POST_rating";s:1:"3";s:12:"POST_comment";s:104:"This album gets a bit boring after you've listened to it more than once. Worth that first listen though.";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:33:"/woocommerce/product/woo-album-3/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"90";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"80cf1a3ac9";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"332";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:59:"http://demo2.woothemes.com/woocommerce/product/woo-album-3/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:23:"en-US,en;q=0.8,nl;q=0.6";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:12:"84.39.28.254";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"10605";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370607727";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:39:44";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:90;s:14:"comment_author";s:11:"Coen Jacobs";s:20:"comment_author_email";s:18:"coen@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:104:"This album gets a bit boring after you've listened to it more than once. Worth that first listen though.";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:12:"84.39.28.254";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:59:"http://demo.woothemes.com/woocommerce/product/woo-album-3/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:59:"http://demo.woothemes.com/woocommerce/product/woo-album-3/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:11:"Coen Jacobs";s:10:"POST_email";s:18:"coen@woothemes.com";s:11:"POST_rating";s:1:"3";s:12:"POST_comment";s:104:"This album gets a bit boring after you've listened to it more than once. Worth that first listen though.";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:33:"/woocommerce/product/woo-album-3/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"90";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"80cf1a3ac9";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"332";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:59:"http://demo.woothemes.com/woocommerce/product/woo-album-3/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:23:"en-US,en;q=0.8,nl;q=0.6";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:12:"84.39.28.254";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"10605";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370607727";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:39:44";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -6092,10 +6092,10 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 	</item>
 	<item>
 		<title>Woo Single #1</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-single-1/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-single-1/</link>
 		<pubDate>Fri, 07 Jun 2013 11:36:34 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/?post_type=product&#038;p=93</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/?post_type=product&#038;p=93</guid>
 		<description></description>
 		<content:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></content:encoded>
 		<excerpt:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></excerpt:encoded>
@@ -6237,10 +6237,10 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 	</item>
 	<item>
 		<title>Woo Album #4</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-album-4/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-album-4/</link>
 		<pubDate>Fri, 07 Jun 2013 11:37:23 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/?post_type=product&#038;p=96</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/?post_type=product&#038;p=96</guid>
 		<description></description>
 		<content:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></content:encoded>
 		<excerpt:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></excerpt:encoded>
@@ -6402,7 +6402,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:96;s:14:"comment_author";s:12:"James Koster";s:20:"comment_author_email";s:23:"james@jameskoster.co.uk";s:18:"comment_author_url";N;s:15:"comment_content";s:71:"The most influential album of the last 25 years? This just might be it.";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"86.146.141.82";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:59:"http://demo2.woothemes.com/woocommerce/product/woo-album-4/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:59:"http://demo2.woothemes.com/woocommerce/product/woo-album-4/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:12:"James Koster";s:10:"POST_email";s:23:"james@jameskoster.co.uk";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:71:"The most influential album of the last 25 years? This just might be it.";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:33:"/woocommerce/product/woo-album-4/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"96";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"ed891d3d81";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"305";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:59:"http://demo2.woothemes.com/woocommerce/product/woo-album-4/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"86.146.141.82";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"48176";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370605490";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:39:52";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:96;s:14:"comment_author";s:12:"James Koster";s:20:"comment_author_email";s:23:"james@jameskoster.co.uk";s:18:"comment_author_url";N;s:15:"comment_content";s:71:"The most influential album of the last 25 years? This just might be it.";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"86.146.141.82";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:59:"http://demo.woothemes.com/woocommerce/product/woo-album-4/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:59:"http://demo.woothemes.com/woocommerce/product/woo-album-4/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:12:"James Koster";s:10:"POST_email";s:23:"james@jameskoster.co.uk";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:71:"The most influential album of the last 25 years? This just might be it.";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:33:"/woocommerce/product/woo-album-4/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"96";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"ed891d3d81";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"305";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:59:"http://demo.woothemes.com/woocommerce/product/woo-album-4/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"86.146.141.82";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"48176";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370605490";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:39:52";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -6436,7 +6436,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:96;s:14:"comment_author";s:11:"Coen Jacobs";s:20:"comment_author_email";s:18:"coen@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:29:"Some rad tunes on this album!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:12:"84.39.28.254";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:59:"http://demo2.woothemes.com/woocommerce/product/woo-album-4/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:59:"http://demo2.woothemes.com/woocommerce/product/woo-album-4/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:11:"Coen Jacobs";s:10:"POST_email";s:18:"coen@woothemes.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:29:"Some rad tunes on this album!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:33:"/woocommerce/product/woo-album-4/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"96";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"a6305fd045";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"257";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:59:"http://demo2.woothemes.com/woocommerce/product/woo-album-4/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:23:"en-US,en;q=0.8,nl;q=0.6";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:12:"84.39.28.254";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"10047";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370607690";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:39:52";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:96;s:14:"comment_author";s:11:"Coen Jacobs";s:20:"comment_author_email";s:18:"coen@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:29:"Some rad tunes on this album!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:12:"84.39.28.254";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:59:"http://demo.woothemes.com/woocommerce/product/woo-album-4/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:59:"http://demo.woothemes.com/woocommerce/product/woo-album-4/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:11:"Coen Jacobs";s:10:"POST_email";s:18:"coen@woothemes.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:29:"Some rad tunes on this album!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:33:"/woocommerce/product/woo-album-4/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"96";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"a6305fd045";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"257";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:59:"http://demo.woothemes.com/woocommerce/product/woo-album-4/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:23:"en-US,en;q=0.8,nl;q=0.6";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:12:"84.39.28.254";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"10047";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370607690";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:39:52";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -6450,10 +6450,10 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 	</item>
 	<item>
 		<title>Woo Single #2</title>
-		<link>http://demo2.woothemes.com/woocommerce/product/woo-single-2/</link>
+		<link>http://demo.woothemes.com/woocommerce/product/woo-single-2/</link>
 		<pubDate>Fri, 07 Jun 2013 11:38:12 +0000</pubDate>
 		<dc:creator>wooteam</dc:creator>
-		<guid isPermaLink="false">http://demo2.woothemes.com/woocommerce/?post_type=product&#038;p=99</guid>
+		<guid isPermaLink="false">http://demo.woothemes.com/woocommerce/?post_type=product&#038;p=99</guid>
 		<description></description>
 		<content:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></content:encoded>
 		<excerpt:encoded><![CDATA[Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.]]></excerpt:encoded>
@@ -6603,7 +6603,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:67:{s:15:"comment_post_ID";i:99;s:14:"comment_author";s:12:"Cobus Bester";s:20:"comment_author_email";s:18:"bester.c@gmail.com";s:18:"comment_author_url";N;s:15:"comment_content";s:70:"This album proves why The Woo are the best band ever. Best music ever!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"196.215.9.147";s:10:"user_agent";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:8:"referrer";s:60:"http://demo2.woothemes.com/woocommerce/product/woo-single-2/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:60:"http://demo2.woothemes.com/woocommerce/product/woo-single-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:12:"Cobus Bester";s:10:"POST_email";s:18:"bester.c@gmail.com";s:11:"POST_rating";s:1:"4";s:12:"POST_comment";s:70:"This album proves why The Woo are the best band ever. Best music ever!";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:34:"/woocommerce/product/woo-single-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"99";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"059233ad6f";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"300";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:60:"http://demo2.woothemes.com/woocommerce/product/woo-single-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:19:"HTTP_ACCEPT_CHARSET";s:30:"ISO-8859-1,utf-8;q=0.7,*;q=0.3";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"196.215.9.147";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"58583";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370606323";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:39:32";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:67:{s:15:"comment_post_ID";i:99;s:14:"comment_author";s:12:"Cobus Bester";s:20:"comment_author_email";s:18:"bester.c@gmail.com";s:18:"comment_author_url";N;s:15:"comment_content";s:70:"This album proves why The Woo are the best band ever. Best music ever!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"196.215.9.147";s:10:"user_agent";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:8:"referrer";s:60:"http://demo.woothemes.com/woocommerce/product/woo-single-2/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:60:"http://demo.woothemes.com/woocommerce/product/woo-single-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:12:"Cobus Bester";s:10:"POST_email";s:18:"bester.c@gmail.com";s:11:"POST_rating";s:1:"4";s:12:"POST_comment";s:70:"This album proves why The Woo are the best band ever. Best music ever!";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:34:"/woocommerce/product/woo-single-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"99";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"059233ad6f";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:119:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"300";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:60:"http://demo.woothemes.com/woocommerce/product/woo-single-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:19:"HTTP_ACCEPT_CHARSET";s:30:"ISO-8859-1,utf-8;q=0.7,*;q=0.3";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"196.215.9.147";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"58583";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370606323";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:39:32";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
@@ -6637,7 +6637,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>akismet_as_submitted</wp:meta_key>
-				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:99;s:14:"comment_author";s:5:"Maria";s:20:"comment_author_email";s:19:"maria@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:83:"Can’t wait to start mixin’ with this one! Irba-irr-Up-up-up-up-date your theme!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"24.225.103.32";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:60:"http://demo2.woothemes.com/woocommerce/product/woo-single-2/";s:4:"blog";s:38:"http://demo2.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:60:"http://demo2.woothemes.com/woocommerce/product/woo-single-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:5:"Maria";s:10:"POST_email";s:19:"maria@woothemes.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:83:"Can’t wait to start mixin’ with this one! Irba-irr-Up-up-up-up-date your theme!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:34:"/woocommerce/product/woo-single-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"99";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"55e6a1c67c";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"321";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:60:"http://demo2.woothemes.com/woocommerce/product/woo-single-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"24.225.103.32";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"26649";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370620368";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:39:32";}]]></wp:meta_value>
+				<wp:meta_value><![CDATA[a:66:{s:15:"comment_post_ID";i:99;s:14:"comment_author";s:5:"Maria";s:20:"comment_author_email";s:19:"maria@woothemes.com";s:18:"comment_author_url";N;s:15:"comment_content";s:83:"Can’t wait to start mixin’ with this one! Irba-irr-Up-up-up-up-date your theme!";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"24.225.103.32";s:10:"user_agent";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:8:"referrer";s:60:"http://demo.woothemes.com/woocommerce/product/woo-single-2/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:60:"http://demo.woothemes.com/woocommerce/product/woo-single-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:5:"Maria";s:10:"POST_email";s:19:"maria@woothemes.com";s:11:"POST_rating";s:1:"5";s:12:"POST_comment";s:83:"Can’t wait to start mixin’ with this one! Irba-irr-Up-up-up-up-date your theme!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_http_referer";s:34:"/woocommerce/product/woo-single-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"99";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"55e6a1c67c";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:120:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36";s:15:"HTTP_CONNECTION";s:5:"close";s:14:"CONTENT_LENGTH";s:3:"321";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:11:"HTTP_ORIGIN";s:26:"http://demo2.woothemes.com";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:12:"HTTP_REFERER";s:60:"http://demo.woothemes.com/woocommerce/product/woo-single-2/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.8";s:11:"HTTP_COOKIE";s:0:"";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"24.225.103.32";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"26649";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370620368";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:39:32";}]]></wp:meta_value>
 			</wp:commentmeta>
 			<wp:commentmeta>
 				<wp:meta_key>rating</wp:meta_key>
diff --git a/dummy-data/dummy-products.csv b/dummy-data/dummy-products.csv
index f69eb5ba92f..64d6fbd3121 100644
--- a/dummy-data/dummy-products.csv
+++ b/dummy-data/dummy-products.csv
@@ -1,24 +1,24 @@
 "post_title","post_name","ID","post_excerpt","post_content","post_status","menu_order","post_date","post_parent","comment_status","sku","downloadable","virtual","visibility","stock","stock_status","backorders","manage_stock","regular_price","sale_price","weight","length","width","height","tax_status","tax_class","upsell_ids","crosssell_ids","featured","sale_price_dates_from","sale_price_dates_to","file_path","file_paths","download_limit","download_expiry","product_url","button_text","meta:_yoast_wpseo_focuskw","meta:_yoast_wpseo_title","meta:_yoast_wpseo_metadesc","meta:_yoast_wpseo_metakeywords","images","tax:product_type","tax:product_cat","tax:product_tag","tax:product_shipping_class","meta:total_sales","attribute:pa_color","attribute_data:pa_color","attribute_default:pa_color"
-"Woo Logo","woo-logo","15","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 10:35:51","0","open","","no","no","visible","5","instock","no","yes","20","18","","","","","","","60","","no","","","","","","","","","","","","","http://demo2.woothemes.com/woocommerce/files/2013/06/T_1_front.jpg|http://demo2.woothemes.com/woocommerce/files/2013/06/T_1_back.jpg","simple","Clothing|T-shirts","","","0","","",""
-"Premium Quality","premium-quality","19","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 10:41:52","0","open","","no","no","visible","","instock","no","no","20","","","","","","","","","","no","","","","","","","","","","","","","http://demo2.woothemes.com/woocommerce/files/2013/06/T_2_front.jpg|http://demo2.woothemes.com/woocommerce/files/2013/06/T_2_back.jpg","simple","Clothing|T-shirts","","","0","","",""
-"Ship Your Idea","ship-your-idea","22","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 10:46:01","0","open","","no","no","visible","","instock","no","no","","","","","","","","","40","","no","","","","","","","","","","","","","http://demo2.woothemes.com/woocommerce/files/2013/06/T_4_front.jpg|http://demo2.woothemes.com/woocommerce/files/2013/06/T_3_back.jpg|http://demo2.woothemes.com/woocommerce/files/2013/06/T_3_front.jpg|http://demo2.woothemes.com/woocommerce/files/2013/06/T_4_back.jpg|http://demo2.woothemes.com/woocommerce/files/2013/06/T_4_front1.jpg","variable","Clothing|T-shirts","","","0","Black|Green","0|0|1",""
-"Ninja Silhouette","ninja-silhouette","31","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 10:49:51","0","open","","no","no","visible","","instock","no","no","20","","","","","","","","56","34|37","no","","","","","","","","","","","","","http://demo2.woothemes.com/woocommerce/files/2013/06/T_5_front.jpg|http://demo2.woothemes.com/woocommerce/files/2013/06/T_5_back.jpg","simple","Clothing|T-shirts","","","0","","",""
-"Woo Ninja","woo-ninja","34","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 10:52:06","0","open","","no","no","visible","","instock","no","no","20","","","","","","","","47","37|31","no","","","","","","","","","","","","","http://demo2.woothemes.com/woocommerce/files/2013/06/T_6_front.jpg|http://demo2.woothemes.com/woocommerce/files/2013/06/T_6_back.jpg","simple","Clothing|T-shirts","","","0","","",""
-"Happy Ninja","happy-ninja","37","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 10:53:15","0","open","","no","no","visible","","instock","no","no","18","","","","","","","","53","34|31","no","","","","","","","","","","","","","http://demo2.woothemes.com/woocommerce/files/2013/06/T_7_front.jpg|http://demo2.woothemes.com/woocommerce/files/2013/06/T_7_back.jpg","simple","Clothing|T-shirts","","","0","","",""
-"Ship Your Idea","ship-your-idea-2","40","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:00:28","0","open","","no","no","visible","","instock","no","no","","","","","","","","","","22","no","","","","","","","","","","","","","http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_7_front.jpg|http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_7_back.jpg|http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_1_back.jpg|http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_1_front.jpg","variable","Clothing|Hoodies","","","0","Black|Blue","0|0|1","black"
-"Woo Ninja","woo-ninja-2","47","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:02:31","0","open","","no","no","visible","","instock","no","no","35","","","","","","","","","34","no","","","","","","","","","","","","","http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_2_front.jpg|http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_2_back.jpg","simple","Clothing|Hoodies","","","0","","",""
-"Patient Ninja","patient-ninja","50","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:03:56","0","open","","no","no","visible","","instock","no","no","35","","","","","","","","","53","no","","","","","","","","","","","","","http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_3_front.jpg|http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_3_back.jpg","simple","Clothing|Hoodies","","","0","","",""
-"Happy Ninja","happy-ninja-2","53","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:05:37","0","open","","no","no","visible","","instock","no","no","35","","","","","","","","","37","no","","","","","","","","","","","","","http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_4_front.jpg|http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_4_back.jpg","simple","Clothing|Hoodies","","","0","","",""
-"Ninja Silhouette","ninja-silhouette-2","56","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:07:19","0","open","","no","no","visible","","instock","no","no","35","","","","","","","","","31","no","","","","","","","","","","","","","http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_5_front.jpg|http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_5_back.jpg","simple","Clothing|Hoodies","","","0","","",""
-"Woo Logo","woo-logo-2","60","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:12:55","0","open","","no","no","visible","","instock","no","no","35","","","","","","","","","15","no","","","","","","","","","","","","","http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_6_front.jpg|http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_6_back.jpg","simple","Clothing|Hoodies","","","0","","",""
-"Ship Your Idea","ship-your-idea-3","67","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:22:50","0","open","","no","no","visible","","instock","no","no","15","","","","","","","","22|40","22|40","no","","","","","","","","","","","","","http://demo2.woothemes.com/woocommerce/files/2013/06/poster_1_up.jpg|http://demo2.woothemes.com/woocommerce/files/2013/06/Poster_1_flat.jpg","simple","Posters","","","0","","",""
-"Flying Ninja","flying-ninja","70","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:25:01","0","open","","no","no","visible","","instock","no","no","15","12","","","","","","","","","no","","","","","","","","","","","","","http://demo2.woothemes.com/woocommerce/files/2013/06/poster_2_up.jpg|http://demo2.woothemes.com/woocommerce/files/2013/06/Poster_2_flat.jpg","simple","Posters","","","0","","",""
-"Premium Quality","premium-quality-2","73","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:27:38","0","open","","no","no","visible","","instock","no","no","15","12","","","","","","","19","","no","","","","","","","","","","","","","http://demo2.woothemes.com/woocommerce/files/2013/06/poster_3_up.jpg|http://demo2.woothemes.com/woocommerce/files/2013/06/Poster_3_flat.jpg","simple","Posters","","","0","","",""
-"Woo Ninja","woo-ninja-3","76","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:28:45","0","open","","no","no","visible","","instock","no","no","15","","","","","","","","","34|47","no","","","","","","","","","","","","","http://demo2.woothemes.com/woocommerce/files/2013/06/poster_4_up.jpg|http://demo2.woothemes.com/woocommerce/files/2013/06/Poster_4_flat.jpg","simple","Posters","","","0","","",""
-"Woo Logo","woo-logo-3","79","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:29:44","0","open","","no","no","visible","","instock","no","no","15","","","","","","","","","15|60","no","","","","","","","","","","","","","http://demo2.woothemes.com/woocommerce/files/2013/06/poster_5_up.jpg|http://demo2.woothemes.com/woocommerce/files/2013/06/Poster_5_flat.jpg","simple","Posters","","","0","","",""
-"Woo Album #1","woo-album-1","83","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:33:05","0","open","","yes","no","visible","","instock","no","no","9","","","","","","","","","","no","","","","","","","","","","","","","http://demo2.woothemes.com/woocommerce/files/2013/06/cd_1_angle.jpg|http://demo2.woothemes.com/woocommerce/files/2013/06/cd_1_flat.jpg","simple","Albums|Music","","","0","","",""
-"Woo Album #2","woo-album-2","87","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:34:14","0","open","","yes","no","visible","","instock","no","no","9","","","","","","","","","","no","","","","","","","","","","","","","http://demo2.woothemes.com/woocommerce/files/2013/06/cd_2_angle.jpg|http://demo2.woothemes.com/woocommerce/files/2013/06/cd_2_flat.jpg","simple","Albums|Music","","","0","","",""
-"Woo Album #3","woo-album-3","90","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:35:18","0","open","","yes","no","visible","","instock","no","no","9","","","","","","","","","","no","","","","","","","","","","","","","http://demo2.woothemes.com/woocommerce/files/2013/06/cd_3_angle.jpg|http://demo2.woothemes.com/woocommerce/files/2013/06/cd_3_flat.jpg","simple","Albums|Music","","","0","","",""
-"Woo Single #1","woo-single-1","93","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:36:34","0","open","","yes","no","visible","","instock","no","no","3","","","","","","","","","","no","","","","","","","","","","","","","http://demo2.woothemes.com/woocommerce/files/2013/06/cd_4_angle.jpg|http://demo2.woothemes.com/woocommerce/files/2013/06/cd_4_flat.jpg","simple","Music|Singles","","","0","","",""
-"Woo Album #4","woo-album-4","96","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:37:23","0","open","","yes","no","visible","","instock","no","no","9","","","","","","","","","","no","","","","","","","","","","","","","http://demo2.woothemes.com/woocommerce/files/2013/06/cd_5_angle.jpg|http://demo2.woothemes.com/woocommerce/files/2013/06/cd_5_flat.jpg","simple","Albums|Music","","","0","","",""
-"Woo Single #2","woo-single-2","99","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:38:12","0","open","","no","no","visible","","instock","no","no","3","2","","","","","","","","","no","","","","","","","","","","","","","http://demo2.woothemes.com/woocommerce/files/2013/06/cd_6_angle.jpg|http://demo2.woothemes.com/woocommerce/files/2013/06/cd_6_flat.jpg","simple","Music|Singles","","","0","","",""
+"Woo Logo","woo-logo","15","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 10:35:51","0","open","","no","no","visible","5","instock","no","yes","20","18","","","","","","","60","","no","","","","","","","","","","","","","http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_1_front.jpg|http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_1_back.jpg","simple","Clothing|T-shirts","","","0","","",""
+"Premium Quality","premium-quality","19","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 10:41:52","0","open","","no","no","visible","","instock","no","no","20","","","","","","","","","","no","","","","","","","","","","","","","http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_2_front.jpg|http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_2_back.jpg","simple","Clothing|T-shirts","","","0","","",""
+"Ship Your Idea","ship-your-idea","22","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 10:46:01","0","open","","no","no","visible","","instock","no","no","","","","","","","","","40","","no","","","","","","","","","","","","","http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_4_front.jpg|http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_3_back.jpg|http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_3_front.jpg|http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_4_back.jpg|http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_4_front1.jpg","variable","Clothing|T-shirts","","","0","Black|Green","0|0|1",""
+"Ninja Silhouette","ninja-silhouette","31","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 10:49:51","0","open","","no","no","visible","","instock","no","no","20","","","","","","","","56","34|37","no","","","","","","","","","","","","","http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_5_front.jpg|http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_5_back.jpg","simple","Clothing|T-shirts","","","0","","",""
+"Woo Ninja","woo-ninja","34","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 10:52:06","0","open","","no","no","visible","","instock","no","no","20","","","","","","","","47","37|31","no","","","","","","","","","","","","","http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_6_front.jpg|http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_6_back.jpg","simple","Clothing|T-shirts","","","0","","",""
+"Happy Ninja","happy-ninja","37","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 10:53:15","0","open","","no","no","visible","","instock","no","no","18","","","","","","","","53","34|31","no","","","","","","","","","","","","","http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_7_front.jpg|http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_7_back.jpg","simple","Clothing|T-shirts","","","0","","",""
+"Ship Your Idea","ship-your-idea-2","40","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:00:28","0","open","","no","no","visible","","instock","no","no","","","","","","","","","","22","no","","","","","","","","","","","","","http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_7_front.jpg|http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_7_back.jpg|http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_1_back.jpg|http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_1_front.jpg","variable","Clothing|Hoodies","","","0","Black|Blue","0|0|1","black"
+"Woo Ninja","woo-ninja-2","47","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:02:31","0","open","","no","no","visible","","instock","no","no","35","","","","","","","","","34","no","","","","","","","","","","","","","http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_2_front.jpg|http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_2_back.jpg","simple","Clothing|Hoodies","","","0","","",""
+"Patient Ninja","patient-ninja","50","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:03:56","0","open","","no","no","visible","","instock","no","no","35","","","","","","","","","53","no","","","","","","","","","","","","","http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_3_front.jpg|http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_3_back.jpg","simple","Clothing|Hoodies","","","0","","",""
+"Happy Ninja","happy-ninja-2","53","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:05:37","0","open","","no","no","visible","","instock","no","no","35","","","","","","","","","37","no","","","","","","","","","","","","","http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_4_front.jpg|http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_4_back.jpg","simple","Clothing|Hoodies","","","0","","",""
+"Ninja Silhouette","ninja-silhouette-2","56","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:07:19","0","open","","no","no","visible","","instock","no","no","35","","","","","","","","","31","no","","","","","","","","","","","","","http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_5_front.jpg|http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_5_back.jpg","simple","Clothing|Hoodies","","","0","","",""
+"Woo Logo","woo-logo-2","60","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:12:55","0","open","","no","no","visible","","instock","no","no","35","","","","","","","","","15","no","","","","","","","","","","","","","http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_6_front.jpg|http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_6_back.jpg","simple","Clothing|Hoodies","","","0","","",""
+"Ship Your Idea","ship-your-idea-3","67","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:22:50","0","open","","no","no","visible","","instock","no","no","15","","","","","","","","22|40","22|40","no","","","","","","","","","","","","","http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/poster_1_up.jpg|http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/Poster_1_flat.jpg","simple","Posters","","","0","","",""
+"Flying Ninja","flying-ninja","70","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:25:01","0","open","","no","no","visible","","instock","no","no","15","12","","","","","","","","","no","","","","","","","","","","","","","http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/poster_2_up.jpg|http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/Poster_2_flat.jpg","simple","Posters","","","0","","",""
+"Premium Quality","premium-quality-2","73","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:27:38","0","open","","no","no","visible","","instock","no","no","15","12","","","","","","","19","","no","","","","","","","","","","","","","http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/poster_3_up.jpg|http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/Poster_3_flat.jpg","simple","Posters","","","0","","",""
+"Woo Ninja","woo-ninja-3","76","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:28:45","0","open","","no","no","visible","","instock","no","no","15","","","","","","","","","34|47","no","","","","","","","","","","","","","http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/poster_4_up.jpg|http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/Poster_4_flat.jpg","simple","Posters","","","0","","",""
+"Woo Logo","woo-logo-3","79","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:29:44","0","open","","no","no","visible","","instock","no","no","15","","","","","","","","","15|60","no","","","","","","","","","","","","","http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/poster_5_up.jpg|http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/Poster_5_flat.jpg","simple","Posters","","","0","","",""
+"Woo Album #1","woo-album-1","83","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:33:05","0","open","","yes","no","visible","","instock","no","no","9","","","","","","","","","","no","","","","","","","","","","","","","http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_1_angle.jpg|http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_1_flat.jpg","simple","Albums|Music","","","0","","",""
+"Woo Album #2","woo-album-2","87","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:34:14","0","open","","yes","no","visible","","instock","no","no","9","","","","","","","","","","no","","","","","","","","","","","","","http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_2_angle.jpg|http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_2_flat.jpg","simple","Albums|Music","","","0","","",""
+"Woo Album #3","woo-album-3","90","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:35:18","0","open","","yes","no","visible","","instock","no","no","9","","","","","","","","","","no","","","","","","","","","","","","","http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_3_angle.jpg|http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_3_flat.jpg","simple","Albums|Music","","","0","","",""
+"Woo Single #1","woo-single-1","93","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:36:34","0","open","","yes","no","visible","","instock","no","no","3","","","","","","","","","","no","","","","","","","","","","","","","http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_4_angle.jpg|http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_4_flat.jpg","simple","Music|Singles","","","0","","",""
+"Woo Album #4","woo-album-4","96","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:37:23","0","open","","yes","no","visible","","instock","no","no","9","","","","","","","","","","no","","","","","","","","","","","","","http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_5_angle.jpg|http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_5_flat.jpg","simple","Albums|Music","","","0","","",""
+"Woo Single #2","woo-single-2","99","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.","publish","0","2013-06-07 11:38:12","0","open","","no","no","visible","","instock","no","no","3","2","","","","","","","","","no","","","","","","","","","","","","","http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_6_angle.jpg|http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/cd_6_flat.jpg","simple","Music|Singles","","","0","","",""
diff --git a/dummy-data/dummy-variations.csv b/dummy-data/dummy-variations.csv
index 9d26930f836..a9163625492 100644
--- a/dummy-data/dummy-variations.csv
+++ b/dummy-data/dummy-variations.csv
@@ -1,5 +1,5 @@
 "Parent","parent_sku","post_parent","ID","post_status","sku","downloadable","virtual","stock","regular_price","sale_price","weight","length","width","height","file_path","file_paths","download_limit","images","tax:product_shipping_class","meta:attribute_pa_color"
-"Ship Your Idea","","22","23","publish","","no","no","","20","","","","","","","","","http://demo2.woothemes.com/woocommerce/files/2013/06/T_4_front1.jpg","","black"
-"Ship Your Idea","","40","41","publish","","no","no","","35","","","","","","","","","http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_7_front.jpg","","black"
-"Ship Your Idea","","22","24","publish","","no","no","","20","","","","","","","","","http://demo2.woothemes.com/woocommerce/files/2013/06/T_3_front.jpg","","green"
-"Ship Your Idea","","40","42","publish","","no","no","","35","30","","","","","","","","http://demo2.woothemes.com/woocommerce/files/2013/06/hoodie_1_front.jpg","","blue"
+"Ship Your Idea","","22","23","publish","","no","no","","20","","","","","","","","","http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_4_front1.jpg","","black"
+"Ship Your Idea","","40","41","publish","","no","no","","35","","","","","","","","","http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_7_front.jpg","","black"
+"Ship Your Idea","","22","24","publish","","no","no","","20","","","","","","","","","http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/T_3_front.jpg","","green"
+"Ship Your Idea","","40","42","publish","","no","no","","35","30","","","","","","","","http://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2013/06/hoodie_1_front.jpg","","blue"
diff --git a/i18n/continents.php b/i18n/continents.php
new file mode 100644
index 00000000000..9b0162d4de9
--- /dev/null
+++ b/i18n/continents.php
@@ -0,0 +1,304 @@
+<?php
+/**
+ * Continents
+ *
+ * Returns an array of continents.
+ *
+ * @author      WooThemes
+ * @category    i18n
+ * @package     WooCommerce/i18n
+ * @version     2.5.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+return array(
+	'AF' => array(
+		'name'      => __( 'Africa', 'woocommerce' ),
+		'countries' => array(
+			'AO',
+			'BF',
+			'BI',
+			'BJ',
+			'BW',
+			'CD',
+			'CF',
+			'CG',
+			'CI',
+			'CM',
+			'CV',
+			'DJ',
+			'DZ',
+			'EG',
+			'EH',
+			'ER',
+			'ET',
+			'GA',
+			'GH',
+			'GM',
+			'GN',
+			'GQ',
+			'GW',
+			'KE',
+			'KM',
+			'LR',
+			'LS',
+			'LY',
+			'MA',
+			'MG',
+			'ML',
+			'MR',
+			'MU',
+			'MW',
+			'MZ',
+			'NA',
+			'NE',
+			'NG',
+			'RE',
+			'RW',
+			'SC',
+			'SD',
+			'SH',
+			'SL',
+			'SN',
+			'SO',
+			'SS',
+			'ST',
+			'SZ',
+			'TD',
+			'TG',
+			'TN',
+			'TZ',
+			'UG',
+			'YT',
+			'ZA',
+			'ZM',
+			'ZW',
+		),
+	),
+	'AN' => array(
+		'name'      => __( 'Antarctica', 'woocommerce' ),
+		'countries' => array(
+			'AQ',
+			'BV',
+			'GS',
+			'HM',
+			'TF',
+		),
+	),
+	'AS' => array(
+		'name'      => __( 'Asia', 'woocommerce' ),
+		'countries' => array(
+			'AE',
+			'AF',
+			'AM',
+			'AZ',
+			'BD',
+			'BH',
+			'BN',
+			'BT',
+			'CC',
+			'CN',
+			'CX',
+			'CY',
+			'GE',
+			'HK',
+			'ID',
+			'IL',
+			'IN',
+			'IO',
+			'IQ',
+			'IR',
+			'JO',
+			'JP',
+			'KG',
+			'KH',
+			'KP',
+			'KR',
+			'KW',
+			'KZ',
+			'LA',
+			'LB',
+			'LK',
+			'MM',
+			'MN',
+			'MO',
+			'MV',
+			'MY',
+			'NP',
+			'OM',
+			'PH',
+			'PK',
+			'PS',
+			'QA',
+			'SA',
+			'SG',
+			'SY',
+			'TH',
+			'TJ',
+			'TL',
+			'TM',
+			'TW',
+			'UZ',
+			'VN',
+			'YE',
+		),
+	),
+	'EU' => array(
+		'name'      => __( 'Europe', 'woocommerce' ),
+		'countries' => array(
+			'AD',
+			'AL',
+			'AT',
+			'AX',
+			'BA',
+			'BE',
+			'BG',
+			'BY',
+			'CH',
+			'CY',
+			'CZ',
+			'DE',
+			'DK',
+			'EE',
+			'ES',
+			'FI',
+			'FO',
+			'FR',
+			'GB',
+			'GG',
+			'GI',
+			'GR',
+			'HR',
+			'HU',
+			'IE',
+			'IM',
+			'IS',
+			'IT',
+			'JE',
+			'LI',
+			'LT',
+			'LU',
+			'LV',
+			'MC',
+			'MD',
+			'ME',
+			'MK',
+			'MT',
+			'NL',
+			'NO',
+			'PL',
+			'PT',
+			'RO',
+			'RS',
+			'RU',
+			'SE',
+			'SI',
+			'SJ',
+			'SK',
+			'SM',
+			'TR',
+			'UA',
+			'VA',
+		),
+	),
+	'NA' => array(
+		'name'      => __( 'North America', 'woocommerce' ),
+		'countries' => array(
+			'AG',
+			'AI',
+			'AN',
+			'AW',
+			'BB',
+			'BL',
+			'BM',
+			'BQ',
+			'BS',
+			'BZ',
+			'CA',
+			'CR',
+			'CU',
+			'CW',
+			'DM',
+			'DO',
+			'GD',
+			'GL',
+			'GP',
+			'GT',
+			'HN',
+			'HT',
+			'JM',
+			'KN',
+			'KY',
+			'LC',
+			'MF',
+			'MQ',
+			'MS',
+			'MX',
+			'NI',
+			'PA',
+			'PM',
+			'PR',
+			'SV',
+			'SX',
+			'TC',
+			'TT',
+			'US',
+			'VC',
+			'VG',
+			'VI',
+		),
+	),
+	'OC' => array(
+		'name'      => __( 'Oceania', 'woocommerce' ),
+		'countries' => array(
+			'AS',
+			'AU',
+			'CK',
+			'FJ',
+			'FM',
+			'GU',
+			'KI',
+			'MH',
+			'MP',
+			'NC',
+			'NF',
+			'NR',
+			'NU',
+			'NZ',
+			'PF',
+			'PG',
+			'PN',
+			'PW',
+			'SB',
+			'TK',
+			'TO',
+			'TV',
+			'UM',
+			'VU',
+			'WF',
+			'WS',
+		),
+	),
+	'SA' => array(
+		'name'      => __( 'South America', 'woocommerce' ),
+		'countries' => array(
+			'AR',
+			'BO',
+			'BR',
+			'CL',
+			'CO',
+			'EC',
+			'FK',
+			'GF',
+			'GY',
+			'PE',
+			'PY',
+			'SR',
+			'UY',
+			'VE',
+		),
+	),
+);
diff --git a/i18n/countries.php b/i18n/countries.php
index c7e7a2cbd02..5ed3a806e53 100644
--- a/i18n/countries.php
+++ b/i18n/countries.php
@@ -7,11 +7,11 @@
  * @author      WooThemes
  * @category    i18n
  * @package     WooCommerce/i18n
- * @version     2.2.0
+ * @version     2.5.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
 return array(
@@ -19,6 +19,7 @@ return array(
 	'AX' => __( '&#197;land Islands', 'woocommerce' ),
 	'AL' => __( 'Albania', 'woocommerce' ),
 	'DZ' => __( 'Algeria', 'woocommerce' ),
+	'AS' => __( 'American Samoa', 'woocommerce' ),
 	'AD' => __( 'Andorra', 'woocommerce' ),
 	'AO' => __( 'Angola', 'woocommerce' ),
 	'AI' => __( 'Anguilla', 'woocommerce' ),
@@ -72,7 +73,7 @@ return array(
 	'CR' => __( 'Costa Rica', 'woocommerce' ),
 	'HR' => __( 'Croatia', 'woocommerce' ),
 	'CU' => __( 'Cuba', 'woocommerce' ),
-	'CW' => __( 'Cura&Ccedil;ao', 'woocommerce' ),
+	'CW' => __( 'Cura&ccedil;ao', 'woocommerce' ),
 	'CY' => __( 'Cyprus', 'woocommerce' ),
 	'CZ' => __( 'Czech Republic', 'woocommerce' ),
 	'DK' => __( 'Denmark', 'woocommerce' ),
@@ -104,6 +105,7 @@ return array(
 	'GL' => __( 'Greenland', 'woocommerce' ),
 	'GD' => __( 'Grenada', 'woocommerce' ),
 	'GP' => __( 'Guadeloupe', 'woocommerce' ),
+	'GU' => __( 'Guam', 'woocommerce' ),
 	'GT' => __( 'Guatemala', 'woocommerce' ),
 	'GG' => __( 'Guernsey', 'woocommerce' ),
 	'GN' => __( 'Guinea', 'woocommerce' ),
@@ -119,7 +121,7 @@ return array(
 	'ID' => __( 'Indonesia', 'woocommerce' ),
 	'IR' => __( 'Iran', 'woocommerce' ),
 	'IQ' => __( 'Iraq', 'woocommerce' ),
-	'IE' => __( 'Republic of Ireland', 'woocommerce' ),
+	'IE' => __( 'Ireland', 'woocommerce' ),
 	'IM' => __( 'Isle of Man', 'woocommerce' ),
 	'IL' => __( 'Israel', 'woocommerce' ),
 	'IT' => __( 'Italy', 'woocommerce' ),
@@ -169,7 +171,6 @@ return array(
 	'NR' => __( 'Nauru', 'woocommerce' ),
 	'NP' => __( 'Nepal', 'woocommerce' ),
 	'NL' => __( 'Netherlands', 'woocommerce' ),
-	'AN' => __( 'Netherlands Antilles', 'woocommerce' ),
 	'NC' => __( 'New Caledonia', 'woocommerce' ),
 	'NZ' => __( 'New Zealand', 'woocommerce' ),
 	'NI' => __( 'Nicaragua', 'woocommerce' ),
@@ -177,6 +178,7 @@ return array(
 	'NG' => __( 'Nigeria', 'woocommerce' ),
 	'NU' => __( 'Niue', 'woocommerce' ),
 	'NF' => __( 'Norfolk Island', 'woocommerce' ),
+	'MP' => __( 'Northern Mariana Islands', 'woocommerce' ),
 	'KP' => __( 'North Korea', 'woocommerce' ),
 	'NO' => __( 'Norway', 'woocommerce' ),
 	'OM' => __( 'Oman', 'woocommerce' ),
@@ -190,6 +192,7 @@ return array(
 	'PN' => __( 'Pitcairn', 'woocommerce' ),
 	'PL' => __( 'Poland', 'woocommerce' ),
 	'PT' => __( 'Portugal', 'woocommerce' ),
+	'PR' => __( 'Puerto Rico', 'woocommerce' ),
 	'QA' => __( 'Qatar', 'woocommerce' ),
 	'RE' => __( 'Reunion', 'woocommerce' ),
 	'RO' => __( 'Romania', 'woocommerce' ),
@@ -247,6 +250,8 @@ return array(
 	'AE' => __( 'United Arab Emirates', 'woocommerce' ),
 	'GB' => __( 'United Kingdom (UK)', 'woocommerce' ),
 	'US' => __( 'United States (US)', 'woocommerce' ),
+	'UM' => __( 'United States (US) Minor Outlying Islands', 'woocommerce' ),
+	'VI' => __( 'United States (US) Virgin Islands', 'woocommerce' ),
 	'UY' => __( 'Uruguay', 'woocommerce' ),
 	'UZ' => __( 'Uzbekistan', 'woocommerce' ),
 	'VU' => __( 'Vanuatu', 'woocommerce' ),
@@ -255,8 +260,8 @@ return array(
 	'VN' => __( 'Vietnam', 'woocommerce' ),
 	'WF' => __( 'Wallis and Futuna', 'woocommerce' ),
 	'EH' => __( 'Western Sahara', 'woocommerce' ),
-	'WS' => __( 'Western Samoa', 'woocommerce' ),
+	'WS' => __( 'Samoa', 'woocommerce' ),
 	'YE' => __( 'Yemen', 'woocommerce' ),
 	'ZM' => __( 'Zambia', 'woocommerce' ),
-	'ZW' => __( 'Zimbabwe', 'woocommerce' )
+	'ZW' => __( 'Zimbabwe', 'woocommerce' ),
 );
diff --git a/i18n/languages/woocommerce.pot b/i18n/languages/woocommerce.pot
index bb4b72b99ea..05e2d7c20e0 100644
--- a/i18n/languages/woocommerce.pot
+++ b/i18n/languages/woocommerce.pot
@@ -1,17 +1,45 @@
-# Copyright (C) 2015 WooThemes
+# Copyright (C) 2017 Automattic
 # This file is distributed under the same license as the WooCommerce package.
 msgid ""
 msgstr ""
-"Project-Id-Version: WooCommerce 2.5.0-beta-3\n"
-"Report-Msgid-Bugs-To: https://github.com/woothemes/woocommerce/issues\n"
-"POT-Creation-Date: 2015-12-18 19:04:48+00:00\n"
+"Project-Id-Version: WooCommerce 3.0.0-rc.2\n"
+"Report-Msgid-Bugs-To: https://github.com/woocommerce/woocommerce/issues\n"
+"POT-Creation-Date: 2017-04-04 12:23:31+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2017-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
-"X-Generator: grunt-wp-i18n 0.5.3\n"
+"X-Generator: grunt-wp-i18n 0.5.4\n"
+
+#: i18n/continents.php:19
+msgid "Africa"
+msgstr ""
+
+#: i18n/continents.php:82 i18n/countries.php:26
+msgid "Antarctica"
+msgstr ""
+
+#: i18n/continents.php:92
+msgid "Asia"
+msgstr ""
+
+#: i18n/continents.php:150
+msgid "Europe"
+msgstr ""
+
+#: i18n/continents.php:208
+msgid "North America"
+msgstr ""
+
+#: i18n/continents.php:255
+msgid "Oceania"
+msgstr ""
+
+#: i18n/continents.php:286
+msgid "South America"
+msgstr ""
 
 #: i18n/countries.php:18
 msgid "Afghanistan"
@@ -30,966 +58,982 @@ msgid "Algeria"
 msgstr ""
 
 #: i18n/countries.php:22
-msgid "Andorra"
+msgid "American Samoa"
 msgstr ""
 
 #: i18n/countries.php:23
-msgid "Angola"
+msgid "Andorra"
 msgstr ""
 
 #: i18n/countries.php:24
-msgid "Anguilla"
+msgid "Angola"
 msgstr ""
 
 #: i18n/countries.php:25
-msgid "Antarctica"
-msgstr ""
-
-#: i18n/countries.php:26
-msgid "Antigua and Barbuda"
+msgid "Anguilla"
 msgstr ""
 
 #: i18n/countries.php:27
-msgid "Argentina"
+msgid "Antigua and Barbuda"
 msgstr ""
 
 #: i18n/countries.php:28
-msgid "Armenia"
+msgid "Argentina"
 msgstr ""
 
 #: i18n/countries.php:29
-msgid "Aruba"
+msgid "Armenia"
 msgstr ""
 
 #: i18n/countries.php:30
-msgid "Australia"
+msgid "Aruba"
 msgstr ""
 
 #: i18n/countries.php:31
-msgid "Austria"
+msgid "Australia"
 msgstr ""
 
 #: i18n/countries.php:32
-msgid "Azerbaijan"
+msgid "Austria"
 msgstr ""
 
 #: i18n/countries.php:33
-msgid "Bahamas"
+msgid "Azerbaijan"
 msgstr ""
 
 #: i18n/countries.php:34
-msgid "Bahrain"
+msgid "Bahamas"
 msgstr ""
 
 #: i18n/countries.php:35
-msgid "Bangladesh"
+msgid "Bahrain"
 msgstr ""
 
 #: i18n/countries.php:36
-msgid "Barbados"
+msgid "Bangladesh"
 msgstr ""
 
 #: i18n/countries.php:37
-msgid "Belarus"
+msgid "Barbados"
 msgstr ""
 
 #: i18n/countries.php:38
-msgid "Belgium"
+msgid "Belarus"
 msgstr ""
 
 #: i18n/countries.php:39
-msgid "Belau"
+msgid "Belgium"
 msgstr ""
 
 #: i18n/countries.php:40
-msgid "Belize"
+msgid "Belau"
 msgstr ""
 
 #: i18n/countries.php:41
-msgid "Benin"
+msgid "Belize"
 msgstr ""
 
 #: i18n/countries.php:42
-msgid "Bermuda"
+msgid "Benin"
 msgstr ""
 
 #: i18n/countries.php:43
-msgid "Bhutan"
+msgid "Bermuda"
 msgstr ""
 
 #: i18n/countries.php:44
-msgid "Bolivia"
+msgid "Bhutan"
 msgstr ""
 
 #: i18n/countries.php:45
-msgid "Bonaire, Saint Eustatius and Saba"
+msgid "Bolivia"
 msgstr ""
 
 #: i18n/countries.php:46
-msgid "Bosnia and Herzegovina"
+msgid "Bonaire, Saint Eustatius and Saba"
 msgstr ""
 
 #: i18n/countries.php:47
-msgid "Botswana"
+msgid "Bosnia and Herzegovina"
 msgstr ""
 
 #: i18n/countries.php:48
-msgid "Bouvet Island"
+msgid "Botswana"
 msgstr ""
 
 #: i18n/countries.php:49
-msgid "Brazil"
+msgid "Bouvet Island"
 msgstr ""
 
 #: i18n/countries.php:50
-msgid "British Indian Ocean Territory"
+msgid "Brazil"
 msgstr ""
 
 #: i18n/countries.php:51
-msgid "British Virgin Islands"
+msgid "British Indian Ocean Territory"
 msgstr ""
 
 #: i18n/countries.php:52
-msgid "Brunei"
+msgid "British Virgin Islands"
 msgstr ""
 
 #: i18n/countries.php:53
-msgid "Bulgaria"
+msgid "Brunei"
 msgstr ""
 
 #: i18n/countries.php:54
-msgid "Burkina Faso"
+msgid "Bulgaria"
 msgstr ""
 
 #: i18n/countries.php:55
-msgid "Burundi"
+msgid "Burkina Faso"
 msgstr ""
 
 #: i18n/countries.php:56
-msgid "Cambodia"
+msgid "Burundi"
 msgstr ""
 
 #: i18n/countries.php:57
-msgid "Cameroon"
+msgid "Cambodia"
 msgstr ""
 
 #: i18n/countries.php:58
-msgid "Canada"
+msgid "Cameroon"
 msgstr ""
 
 #: i18n/countries.php:59
-msgid "Cape Verde"
+msgid "Canada"
 msgstr ""
 
 #: i18n/countries.php:60
-msgid "Cayman Islands"
+msgid "Cape Verde"
 msgstr ""
 
 #: i18n/countries.php:61
-msgid "Central African Republic"
+msgid "Cayman Islands"
 msgstr ""
 
 #: i18n/countries.php:62
-msgid "Chad"
+msgid "Central African Republic"
 msgstr ""
 
 #: i18n/countries.php:63
-msgid "Chile"
+msgid "Chad"
 msgstr ""
 
 #: i18n/countries.php:64
-msgid "China"
+msgid "Chile"
 msgstr ""
 
 #: i18n/countries.php:65
-msgid "Christmas Island"
+msgid "China"
 msgstr ""
 
 #: i18n/countries.php:66
-msgid "Cocos (Keeling) Islands"
+msgid "Christmas Island"
 msgstr ""
 
 #: i18n/countries.php:67
-msgid "Colombia"
+msgid "Cocos (Keeling) Islands"
 msgstr ""
 
 #: i18n/countries.php:68
-msgid "Comoros"
+msgid "Colombia"
 msgstr ""
 
 #: i18n/countries.php:69
-msgid "Congo (Brazzaville)"
+msgid "Comoros"
 msgstr ""
 
 #: i18n/countries.php:70
-msgid "Congo (Kinshasa)"
+msgid "Congo (Brazzaville)"
 msgstr ""
 
 #: i18n/countries.php:71
-msgid "Cook Islands"
+msgid "Congo (Kinshasa)"
 msgstr ""
 
 #: i18n/countries.php:72
-msgid "Costa Rica"
+msgid "Cook Islands"
 msgstr ""
 
 #: i18n/countries.php:73
-msgid "Croatia"
+msgid "Costa Rica"
 msgstr ""
 
 #: i18n/countries.php:74
-msgid "Cuba"
+msgid "Croatia"
 msgstr ""
 
 #: i18n/countries.php:75
-msgid "Cura&Ccedil;ao"
+msgid "Cuba"
 msgstr ""
 
 #: i18n/countries.php:76
-msgid "Cyprus"
+msgid "Cura&ccedil;ao"
 msgstr ""
 
 #: i18n/countries.php:77
-msgid "Czech Republic"
+msgid "Cyprus"
 msgstr ""
 
 #: i18n/countries.php:78
-msgid "Denmark"
+msgid "Czech Republic"
 msgstr ""
 
 #: i18n/countries.php:79
-msgid "Djibouti"
+msgid "Denmark"
 msgstr ""
 
 #: i18n/countries.php:80
-msgid "Dominica"
+msgid "Djibouti"
 msgstr ""
 
 #: i18n/countries.php:81
-msgid "Dominican Republic"
+msgid "Dominica"
 msgstr ""
 
 #: i18n/countries.php:82
-msgid "Ecuador"
+msgid "Dominican Republic"
 msgstr ""
 
 #: i18n/countries.php:83
-msgid "Egypt"
+msgid "Ecuador"
 msgstr ""
 
 #: i18n/countries.php:84
-msgid "El Salvador"
+msgid "Egypt"
 msgstr ""
 
 #: i18n/countries.php:85
-msgid "Equatorial Guinea"
+msgid "El Salvador"
 msgstr ""
 
 #: i18n/countries.php:86
-msgid "Eritrea"
+msgid "Equatorial Guinea"
 msgstr ""
 
 #: i18n/countries.php:87
-msgid "Estonia"
+msgid "Eritrea"
 msgstr ""
 
 #: i18n/countries.php:88
-msgid "Ethiopia"
+msgid "Estonia"
 msgstr ""
 
 #: i18n/countries.php:89
-msgid "Falkland Islands"
+msgid "Ethiopia"
 msgstr ""
 
 #: i18n/countries.php:90
-msgid "Faroe Islands"
+msgid "Falkland Islands"
 msgstr ""
 
 #: i18n/countries.php:91
-msgid "Fiji"
+msgid "Faroe Islands"
 msgstr ""
 
 #: i18n/countries.php:92
-msgid "Finland"
+msgid "Fiji"
 msgstr ""
 
 #: i18n/countries.php:93
-msgid "France"
+msgid "Finland"
 msgstr ""
 
 #: i18n/countries.php:94
-msgid "French Guiana"
+msgid "France"
 msgstr ""
 
 #: i18n/countries.php:95
-msgid "French Polynesia"
+msgid "French Guiana"
 msgstr ""
 
 #: i18n/countries.php:96
-msgid "French Southern Territories"
+msgid "French Polynesia"
 msgstr ""
 
 #: i18n/countries.php:97
-msgid "Gabon"
+msgid "French Southern Territories"
 msgstr ""
 
 #: i18n/countries.php:98
-msgid "Gambia"
+msgid "Gabon"
 msgstr ""
 
 #: i18n/countries.php:99
-msgid "Georgia"
+msgid "Gambia"
 msgstr ""
 
 #: i18n/countries.php:100
-msgid "Germany"
+msgid "Georgia"
 msgstr ""
 
 #: i18n/countries.php:101
-msgid "Ghana"
+msgid "Germany"
 msgstr ""
 
 #: i18n/countries.php:102
-msgid "Gibraltar"
+msgid "Ghana"
 msgstr ""
 
 #: i18n/countries.php:103
-msgid "Greece"
+msgid "Gibraltar"
 msgstr ""
 
 #: i18n/countries.php:104
-msgid "Greenland"
+msgid "Greece"
 msgstr ""
 
 #: i18n/countries.php:105
-msgid "Grenada"
+msgid "Greenland"
 msgstr ""
 
 #: i18n/countries.php:106
-msgid "Guadeloupe"
+msgid "Grenada"
 msgstr ""
 
 #: i18n/countries.php:107
-msgid "Guatemala"
+msgid "Guadeloupe"
 msgstr ""
 
 #: i18n/countries.php:108
-msgid "Guernsey"
+msgid "Guam"
 msgstr ""
 
 #: i18n/countries.php:109
-msgid "Guinea"
+msgid "Guatemala"
 msgstr ""
 
 #: i18n/countries.php:110
-msgid "Guinea-Bissau"
+msgid "Guernsey"
 msgstr ""
 
 #: i18n/countries.php:111
-msgid "Guyana"
+msgid "Guinea"
 msgstr ""
 
 #: i18n/countries.php:112
-msgid "Haiti"
+msgid "Guinea-Bissau"
 msgstr ""
 
 #: i18n/countries.php:113
-msgid "Heard Island and McDonald Islands"
+msgid "Guyana"
 msgstr ""
 
 #: i18n/countries.php:114
-msgid "Honduras"
+msgid "Haiti"
 msgstr ""
 
 #: i18n/countries.php:115
-msgid "Hong Kong"
+msgid "Heard Island and McDonald Islands"
 msgstr ""
 
 #: i18n/countries.php:116
-msgid "Hungary"
+msgid "Honduras"
 msgstr ""
 
 #: i18n/countries.php:117
-msgid "Iceland"
+msgid "Hong Kong"
 msgstr ""
 
 #: i18n/countries.php:118
-msgid "India"
+msgid "Hungary"
 msgstr ""
 
 #: i18n/countries.php:119
-msgid "Indonesia"
+msgid "Iceland"
 msgstr ""
 
 #: i18n/countries.php:120
-msgid "Iran"
+msgid "India"
 msgstr ""
 
 #: i18n/countries.php:121
-msgid "Iraq"
+msgid "Indonesia"
 msgstr ""
 
 #: i18n/countries.php:122
-msgid "Republic of Ireland"
+msgid "Iran"
 msgstr ""
 
 #: i18n/countries.php:123
-msgid "Isle of Man"
+msgid "Iraq"
 msgstr ""
 
 #: i18n/countries.php:124
-msgid "Israel"
+msgid "Ireland"
 msgstr ""
 
 #: i18n/countries.php:125
-msgid "Italy"
+msgid "Isle of Man"
 msgstr ""
 
 #: i18n/countries.php:126
-msgid "Ivory Coast"
+msgid "Israel"
 msgstr ""
 
 #: i18n/countries.php:127
-msgid "Jamaica"
+msgid "Italy"
 msgstr ""
 
 #: i18n/countries.php:128
-msgid "Japan"
+msgid "Ivory Coast"
 msgstr ""
 
 #: i18n/countries.php:129
-msgid "Jersey"
+msgid "Jamaica"
 msgstr ""
 
 #: i18n/countries.php:130
-msgid "Jordan"
+msgid "Japan"
 msgstr ""
 
 #: i18n/countries.php:131
-msgid "Kazakhstan"
+msgid "Jersey"
 msgstr ""
 
 #: i18n/countries.php:132
-msgid "Kenya"
+msgid "Jordan"
 msgstr ""
 
 #: i18n/countries.php:133
-msgid "Kiribati"
+msgid "Kazakhstan"
 msgstr ""
 
 #: i18n/countries.php:134
-msgid "Kuwait"
+msgid "Kenya"
 msgstr ""
 
 #: i18n/countries.php:135
-msgid "Kyrgyzstan"
+msgid "Kiribati"
 msgstr ""
 
 #: i18n/countries.php:136
-msgid "Laos"
+msgid "Kuwait"
 msgstr ""
 
 #: i18n/countries.php:137
-msgid "Latvia"
+msgid "Kyrgyzstan"
 msgstr ""
 
 #: i18n/countries.php:138
-msgid "Lebanon"
+msgid "Laos"
 msgstr ""
 
 #: i18n/countries.php:139
-msgid "Lesotho"
+msgid "Latvia"
 msgstr ""
 
 #: i18n/countries.php:140
-msgid "Liberia"
+msgid "Lebanon"
 msgstr ""
 
 #: i18n/countries.php:141
-msgid "Libya"
+msgid "Lesotho"
 msgstr ""
 
 #: i18n/countries.php:142
-msgid "Liechtenstein"
+msgid "Liberia"
 msgstr ""
 
 #: i18n/countries.php:143
-msgid "Lithuania"
+msgid "Libya"
 msgstr ""
 
 #: i18n/countries.php:144
-msgid "Luxembourg"
+msgid "Liechtenstein"
 msgstr ""
 
 #: i18n/countries.php:145
-msgid "Macao S.A.R., China"
+msgid "Lithuania"
 msgstr ""
 
 #: i18n/countries.php:146
-msgid "Macedonia"
+msgid "Luxembourg"
 msgstr ""
 
 #: i18n/countries.php:147
-msgid "Madagascar"
+msgid "Macao S.A.R., China"
 msgstr ""
 
 #: i18n/countries.php:148
-msgid "Malawi"
+msgid "Macedonia"
 msgstr ""
 
 #: i18n/countries.php:149
-msgid "Malaysia"
+msgid "Madagascar"
 msgstr ""
 
 #: i18n/countries.php:150
-msgid "Maldives"
+msgid "Malawi"
 msgstr ""
 
 #: i18n/countries.php:151
-msgid "Mali"
+msgid "Malaysia"
 msgstr ""
 
 #: i18n/countries.php:152
-msgid "Malta"
+msgid "Maldives"
 msgstr ""
 
 #: i18n/countries.php:153
-msgid "Marshall Islands"
+msgid "Mali"
 msgstr ""
 
 #: i18n/countries.php:154
-msgid "Martinique"
+msgid "Malta"
 msgstr ""
 
 #: i18n/countries.php:155
-msgid "Mauritania"
+msgid "Marshall Islands"
 msgstr ""
 
 #: i18n/countries.php:156
-msgid "Mauritius"
+msgid "Martinique"
 msgstr ""
 
 #: i18n/countries.php:157
-msgid "Mayotte"
+msgid "Mauritania"
 msgstr ""
 
 #: i18n/countries.php:158
-msgid "Mexico"
+msgid "Mauritius"
 msgstr ""
 
 #: i18n/countries.php:159
-msgid "Micronesia"
+msgid "Mayotte"
 msgstr ""
 
 #: i18n/countries.php:160
-msgid "Moldova"
+msgid "Mexico"
 msgstr ""
 
 #: i18n/countries.php:161
-msgid "Monaco"
+msgid "Micronesia"
 msgstr ""
 
 #: i18n/countries.php:162
-msgid "Mongolia"
+msgid "Moldova"
 msgstr ""
 
 #: i18n/countries.php:163
-msgid "Montenegro"
+msgid "Monaco"
 msgstr ""
 
 #: i18n/countries.php:164
-msgid "Montserrat"
+msgid "Mongolia"
 msgstr ""
 
 #: i18n/countries.php:165
-msgid "Morocco"
+msgid "Montenegro"
 msgstr ""
 
 #: i18n/countries.php:166
-msgid "Mozambique"
+msgid "Montserrat"
 msgstr ""
 
 #: i18n/countries.php:167
-msgid "Myanmar"
+msgid "Morocco"
 msgstr ""
 
 #: i18n/countries.php:168
-msgid "Namibia"
+msgid "Mozambique"
 msgstr ""
 
 #: i18n/countries.php:169
-msgid "Nauru"
+msgid "Myanmar"
 msgstr ""
 
 #: i18n/countries.php:170
-msgid "Nepal"
+msgid "Namibia"
 msgstr ""
 
 #: i18n/countries.php:171
-msgid "Netherlands"
+msgid "Nauru"
 msgstr ""
 
 #: i18n/countries.php:172
-msgid "Netherlands Antilles"
+msgid "Nepal"
 msgstr ""
 
 #: i18n/countries.php:173
-msgid "New Caledonia"
+msgid "Netherlands"
 msgstr ""
 
 #: i18n/countries.php:174
-msgid "New Zealand"
+msgid "New Caledonia"
 msgstr ""
 
 #: i18n/countries.php:175
-msgid "Nicaragua"
+msgid "New Zealand"
 msgstr ""
 
 #: i18n/countries.php:176
+msgid "Nicaragua"
+msgstr ""
+
+#: i18n/countries.php:177 i18n/states/NG.php:40
 msgid "Niger"
 msgstr ""
 
-#: i18n/countries.php:177
+#: i18n/countries.php:178
 msgid "Nigeria"
 msgstr ""
 
-#: i18n/countries.php:178
+#: i18n/countries.php:179
 msgid "Niue"
 msgstr ""
 
-#: i18n/countries.php:179
+#: i18n/countries.php:180
 msgid "Norfolk Island"
 msgstr ""
 
-#: i18n/countries.php:180
-msgid "North Korea"
-msgstr ""
-
 #: i18n/countries.php:181
-msgid "Norway"
+msgid "Northern Mariana Islands"
 msgstr ""
 
 #: i18n/countries.php:182
-msgid "Oman"
+msgid "North Korea"
 msgstr ""
 
 #: i18n/countries.php:183
-msgid "Pakistan"
+msgid "Norway"
 msgstr ""
 
 #: i18n/countries.php:184
-msgid "Palestinian Territory"
+msgid "Oman"
 msgstr ""
 
 #: i18n/countries.php:185
-msgid "Panama"
+msgid "Pakistan"
 msgstr ""
 
 #: i18n/countries.php:186
-msgid "Papua New Guinea"
+msgid "Palestinian Territory"
 msgstr ""
 
 #: i18n/countries.php:187
-msgid "Paraguay"
+msgid "Panama"
 msgstr ""
 
 #: i18n/countries.php:188
-msgid "Peru"
+msgid "Papua New Guinea"
 msgstr ""
 
 #: i18n/countries.php:189
-msgid "Philippines"
+msgid "Paraguay"
 msgstr ""
 
 #: i18n/countries.php:190
-msgid "Pitcairn"
+msgid "Peru"
 msgstr ""
 
 #: i18n/countries.php:191
-msgid "Poland"
+msgid "Philippines"
 msgstr ""
 
 #: i18n/countries.php:192
-msgid "Portugal"
+msgid "Pitcairn"
 msgstr ""
 
 #: i18n/countries.php:193
-msgid "Qatar"
+msgid "Poland"
 msgstr ""
 
 #: i18n/countries.php:194
-msgid "Reunion"
+msgid "Portugal"
 msgstr ""
 
 #: i18n/countries.php:195
-msgid "Romania"
+msgid "Puerto Rico"
 msgstr ""
 
 #: i18n/countries.php:196
-msgid "Russia"
+msgid "Qatar"
 msgstr ""
 
 #: i18n/countries.php:197
-msgid "Rwanda"
+msgid "Reunion"
 msgstr ""
 
 #: i18n/countries.php:198
-msgid "Saint Barth&eacute;lemy"
+msgid "Romania"
 msgstr ""
 
 #: i18n/countries.php:199
-msgid "Saint Helena"
+msgid "Russia"
 msgstr ""
 
 #: i18n/countries.php:200
-msgid "Saint Kitts and Nevis"
+msgid "Rwanda"
 msgstr ""
 
 #: i18n/countries.php:201
-msgid "Saint Lucia"
+msgid "Saint Barth&eacute;lemy"
 msgstr ""
 
 #: i18n/countries.php:202
-msgid "Saint Martin (French part)"
+msgid "Saint Helena"
 msgstr ""
 
 #: i18n/countries.php:203
-msgid "Saint Martin (Dutch part)"
+msgid "Saint Kitts and Nevis"
 msgstr ""
 
 #: i18n/countries.php:204
-msgid "Saint Pierre and Miquelon"
+msgid "Saint Lucia"
 msgstr ""
 
 #: i18n/countries.php:205
-msgid "Saint Vincent and the Grenadines"
+msgid "Saint Martin (French part)"
 msgstr ""
 
 #: i18n/countries.php:206
-msgid "San Marino"
+msgid "Saint Martin (Dutch part)"
 msgstr ""
 
 #: i18n/countries.php:207
-msgid "S&atilde;o Tom&eacute; and Pr&iacute;ncipe"
+msgid "Saint Pierre and Miquelon"
 msgstr ""
 
 #: i18n/countries.php:208
-msgid "Saudi Arabia"
+msgid "Saint Vincent and the Grenadines"
 msgstr ""
 
 #: i18n/countries.php:209
-msgid "Senegal"
+msgid "San Marino"
 msgstr ""
 
 #: i18n/countries.php:210
-msgid "Serbia"
+msgid "S&atilde;o Tom&eacute; and Pr&iacute;ncipe"
 msgstr ""
 
 #: i18n/countries.php:211
-msgid "Seychelles"
+msgid "Saudi Arabia"
 msgstr ""
 
 #: i18n/countries.php:212
-msgid "Sierra Leone"
+msgid "Senegal"
 msgstr ""
 
 #: i18n/countries.php:213
-msgid "Singapore"
+msgid "Serbia"
 msgstr ""
 
 #: i18n/countries.php:214
-msgid "Slovakia"
+msgid "Seychelles"
 msgstr ""
 
 #: i18n/countries.php:215
-msgid "Slovenia"
+msgid "Sierra Leone"
 msgstr ""
 
 #: i18n/countries.php:216
-msgid "Solomon Islands"
+msgid "Singapore"
 msgstr ""
 
 #: i18n/countries.php:217
-msgid "Somalia"
+msgid "Slovakia"
 msgstr ""
 
 #: i18n/countries.php:218
-msgid "South Africa"
+msgid "Slovenia"
 msgstr ""
 
 #: i18n/countries.php:219
-msgid "South Georgia/Sandwich Islands"
+msgid "Solomon Islands"
 msgstr ""
 
 #: i18n/countries.php:220
-msgid "South Korea"
+msgid "Somalia"
 msgstr ""
 
 #: i18n/countries.php:221
-msgid "South Sudan"
+msgid "South Africa"
 msgstr ""
 
 #: i18n/countries.php:222
-msgid "Spain"
+msgid "South Georgia/Sandwich Islands"
 msgstr ""
 
 #: i18n/countries.php:223
-msgid "Sri Lanka"
+msgid "South Korea"
 msgstr ""
 
 #: i18n/countries.php:224
-msgid "Sudan"
+msgid "South Sudan"
 msgstr ""
 
 #: i18n/countries.php:225
-msgid "Suriname"
+msgid "Spain"
 msgstr ""
 
 #: i18n/countries.php:226
-msgid "Svalbard and Jan Mayen"
+msgid "Sri Lanka"
 msgstr ""
 
 #: i18n/countries.php:227
-msgid "Swaziland"
+msgid "Sudan"
 msgstr ""
 
 #: i18n/countries.php:228
-msgid "Sweden"
+msgid "Suriname"
 msgstr ""
 
 #: i18n/countries.php:229
-msgid "Switzerland"
+msgid "Svalbard and Jan Mayen"
 msgstr ""
 
 #: i18n/countries.php:230
-msgid "Syria"
+msgid "Swaziland"
 msgstr ""
 
 #: i18n/countries.php:231
-msgid "Taiwan"
+msgid "Sweden"
 msgstr ""
 
 #: i18n/countries.php:232
-msgid "Tajikistan"
+msgid "Switzerland"
 msgstr ""
 
 #: i18n/countries.php:233
-msgid "Tanzania"
+msgid "Syria"
 msgstr ""
 
 #: i18n/countries.php:234
-msgid "Thailand"
+msgid "Taiwan"
 msgstr ""
 
 #: i18n/countries.php:235
-msgid "Timor-Leste"
+msgid "Tajikistan"
 msgstr ""
 
 #: i18n/countries.php:236
-msgid "Togo"
+msgid "Tanzania"
 msgstr ""
 
 #: i18n/countries.php:237
-msgid "Tokelau"
+msgid "Thailand"
 msgstr ""
 
 #: i18n/countries.php:238
-msgid "Tonga"
+msgid "Timor-Leste"
 msgstr ""
 
 #: i18n/countries.php:239
-msgid "Trinidad and Tobago"
+msgid "Togo"
 msgstr ""
 
 #: i18n/countries.php:240
-msgid "Tunisia"
+msgid "Tokelau"
 msgstr ""
 
 #: i18n/countries.php:241
-msgid "Turkey"
+msgid "Tonga"
 msgstr ""
 
 #: i18n/countries.php:242
-msgid "Turkmenistan"
+msgid "Trinidad and Tobago"
 msgstr ""
 
 #: i18n/countries.php:243
-msgid "Turks and Caicos Islands"
+msgid "Tunisia"
 msgstr ""
 
 #: i18n/countries.php:244
-msgid "Tuvalu"
+msgid "Turkey"
 msgstr ""
 
 #: i18n/countries.php:245
-msgid "Uganda"
+msgid "Turkmenistan"
 msgstr ""
 
 #: i18n/countries.php:246
-msgid "Ukraine"
+msgid "Turks and Caicos Islands"
 msgstr ""
 
 #: i18n/countries.php:247
-msgid "United Arab Emirates"
+msgid "Tuvalu"
 msgstr ""
 
 #: i18n/countries.php:248
-msgid "United Kingdom (UK)"
+msgid "Uganda"
 msgstr ""
 
 #: i18n/countries.php:249
-msgid "United States (US)"
+msgid "Ukraine"
 msgstr ""
 
 #: i18n/countries.php:250
-msgid "Uruguay"
+msgid "United Arab Emirates"
 msgstr ""
 
 #: i18n/countries.php:251
-msgid "Uzbekistan"
+msgid "United Kingdom (UK)"
 msgstr ""
 
 #: i18n/countries.php:252
-msgid "Vanuatu"
+msgid "United States (US)"
 msgstr ""
 
 #: i18n/countries.php:253
-msgid "Vatican"
+msgid "United States (US) Minor Outlying Islands"
 msgstr ""
 
 #: i18n/countries.php:254
-msgid "Venezuela"
+msgid "United States (US) Virgin Islands"
 msgstr ""
 
 #: i18n/countries.php:255
-msgid "Vietnam"
+msgid "Uruguay"
 msgstr ""
 
 #: i18n/countries.php:256
-msgid "Wallis and Futuna"
+msgid "Uzbekistan"
 msgstr ""
 
 #: i18n/countries.php:257
-msgid "Western Sahara"
+msgid "Vanuatu"
 msgstr ""
 
 #: i18n/countries.php:258
-msgid "Western Samoa"
+msgid "Vatican"
 msgstr ""
 
 #: i18n/countries.php:259
-msgid "Yemen"
+msgid "Venezuela"
 msgstr ""
 
 #: i18n/countries.php:260
-msgid "Zambia"
+msgid "Vietnam"
 msgstr ""
 
 #: i18n/countries.php:261
+msgid "Wallis and Futuna"
+msgstr ""
+
+#: i18n/countries.php:262
+msgid "Western Sahara"
+msgstr ""
+
+#: i18n/countries.php:263
+msgid "Samoa"
+msgstr ""
+
+#: i18n/countries.php:264
+msgid "Yemen"
+msgstr ""
+
+#: i18n/countries.php:265
+msgid "Zambia"
+msgstr ""
+
+#: i18n/countries.php:266
 msgid "Zimbabwe"
 msgstr ""
 
-#: i18n/locale-info.php:351
+#: i18n/locale-info.php:371
 msgid "Consumption tax"
 msgstr ""
 
@@ -2257,6 +2301,110 @@ msgstr ""
 msgid "Papua Barat"
 msgstr ""
 
+#: i18n/states/IE.php:13
+msgid "Clare"
+msgstr ""
+
+#: i18n/states/IE.php:14
+msgid "Cork"
+msgstr ""
+
+#: i18n/states/IE.php:15
+msgid "Cavan"
+msgstr ""
+
+#: i18n/states/IE.php:16
+msgid "Carlow"
+msgstr ""
+
+#: i18n/states/IE.php:17
+msgid "Donegal"
+msgstr ""
+
+#: i18n/states/IE.php:18
+msgid "Dublin"
+msgstr ""
+
+#: i18n/states/IE.php:19
+msgid "Galway"
+msgstr ""
+
+#: i18n/states/IE.php:20
+msgid "Kildare"
+msgstr ""
+
+#: i18n/states/IE.php:21
+msgid "Kilkenny"
+msgstr ""
+
+#: i18n/states/IE.php:22
+msgid "Kerry"
+msgstr ""
+
+#: i18n/states/IE.php:23
+msgid "Longford"
+msgstr ""
+
+#: i18n/states/IE.php:24
+msgid "Louth"
+msgstr ""
+
+#: i18n/states/IE.php:25
+msgid "Limerick"
+msgstr ""
+
+#: i18n/states/IE.php:26
+msgid "Leitrim"
+msgstr ""
+
+#: i18n/states/IE.php:27
+msgid "Laois"
+msgstr ""
+
+#: i18n/states/IE.php:28
+msgid "Meath"
+msgstr ""
+
+#: i18n/states/IE.php:29
+msgid "Monaghan"
+msgstr ""
+
+#: i18n/states/IE.php:30
+msgid "Mayo"
+msgstr ""
+
+#: i18n/states/IE.php:31
+msgid "Offaly"
+msgstr ""
+
+#: i18n/states/IE.php:32
+msgid "Roscommon"
+msgstr ""
+
+#: i18n/states/IE.php:33
+msgid "Sligo"
+msgstr ""
+
+#: i18n/states/IE.php:34
+msgid "Tipperary"
+msgstr ""
+
+#: i18n/states/IE.php:35
+msgid "Waterford"
+msgstr ""
+
+#: i18n/states/IE.php:36
+msgid "Westmeath"
+msgstr ""
+
+#: i18n/states/IE.php:37
+msgid "Wicklow"
+msgstr ""
+
+#: i18n/states/IE.php:38
+msgid "Wexford"
+msgstr ""
+
 #: i18n/states/IN.php:13
 msgid "Andhra Pradesh"
 msgstr ""
@@ -2337,7 +2485,7 @@ msgstr ""
 msgid "Orissa"
 msgstr ""
 
-#: i18n/states/IN.php:33
+#: i18n/states/IN.php:33 i18n/states/PK.php:19
 msgid "Punjab"
 msgstr ""
 
@@ -2382,7 +2530,7 @@ msgid "Chandigarh"
 msgstr ""
 
 #: i18n/states/IN.php:44
-msgid "Dadar and Nagar Haveli"
+msgid "Dadra and Nagar Haveli"
 msgstr ""
 
 #: i18n/states/IN.php:45
@@ -2702,7 +2850,7 @@ msgid "La Spezia"
 msgstr ""
 
 #: i18n/states/IT.php:57
-msgid "L&apos;Aquila"
+msgid "L'Aquila"
 msgstr ""
 
 #: i18n/states/IT.php:58
@@ -3341,6 +3489,150 @@ msgstr ""
 msgid "Kuala Lumpur"
 msgstr ""
 
+#: i18n/states/NG.php:14
+msgid "Abia"
+msgstr ""
+
+#: i18n/states/NG.php:15
+msgid "Abuja"
+msgstr ""
+
+#: i18n/states/NG.php:16
+msgid "Adamawa"
+msgstr ""
+
+#: i18n/states/NG.php:17
+msgid "Akwa Ibom"
+msgstr ""
+
+#: i18n/states/NG.php:18
+msgid "Anambra"
+msgstr ""
+
+#: i18n/states/NG.php:19
+msgid "Bauchi"
+msgstr ""
+
+#: i18n/states/NG.php:20
+msgid "Bayelsa"
+msgstr ""
+
+#: i18n/states/NG.php:21
+msgid "Benue"
+msgstr ""
+
+#: i18n/states/NG.php:22
+msgid "Borno"
+msgstr ""
+
+#: i18n/states/NG.php:23
+msgid "Cross River"
+msgstr ""
+
+#: i18n/states/NG.php:24
+msgid "Delta"
+msgstr ""
+
+#: i18n/states/NG.php:25
+msgid "Ebonyi"
+msgstr ""
+
+#: i18n/states/NG.php:26
+msgid "Edo"
+msgstr ""
+
+#: i18n/states/NG.php:27
+msgid "Ekiti"
+msgstr ""
+
+#: i18n/states/NG.php:28
+msgid "Enugu"
+msgstr ""
+
+#: i18n/states/NG.php:29
+msgid "Gombe"
+msgstr ""
+
+#: i18n/states/NG.php:30
+msgid "Imo"
+msgstr ""
+
+#: i18n/states/NG.php:31
+msgid "Jigawa"
+msgstr ""
+
+#: i18n/states/NG.php:32
+msgid "Kaduna"
+msgstr ""
+
+#: i18n/states/NG.php:33
+msgid "Kano"
+msgstr ""
+
+#: i18n/states/NG.php:34
+msgid "Katsina"
+msgstr ""
+
+#: i18n/states/NG.php:35
+msgid "Kebbi"
+msgstr ""
+
+#: i18n/states/NG.php:36
+msgid "Kogi"
+msgstr ""
+
+#: i18n/states/NG.php:37
+msgid "Kwara"
+msgstr ""
+
+#: i18n/states/NG.php:38
+msgid "Lagos"
+msgstr ""
+
+#: i18n/states/NG.php:39
+msgid "Nasarawa"
+msgstr ""
+
+#: i18n/states/NG.php:41
+msgid "Ogun"
+msgstr ""
+
+#: i18n/states/NG.php:42
+msgid "Ondo"
+msgstr ""
+
+#: i18n/states/NG.php:43
+msgid "Osun"
+msgstr ""
+
+#: i18n/states/NG.php:44
+msgid "Oyo"
+msgstr ""
+
+#: i18n/states/NG.php:45
+msgid "Plateau"
+msgstr ""
+
+#: i18n/states/NG.php:46
+msgid "Rivers"
+msgstr ""
+
+#: i18n/states/NG.php:47
+msgid "Sokoto"
+msgstr ""
+
+#: i18n/states/NG.php:48
+msgid "Taraba"
+msgstr ""
+
+#: i18n/states/NG.php:49
+msgid "Yobe"
+msgstr ""
+
+#: i18n/states/NG.php:50
+msgid "Zamfara"
+msgstr ""
+
 #: i18n/states/NP.php:13
 msgid "Bagmati"
 msgstr ""
@@ -3889,6 +4181,34 @@ msgstr ""
 msgid "Metro Manila"
 msgstr ""
 
+#: i18n/states/PK.php:13
+msgid "Azad Kashmir"
+msgstr ""
+
+#: i18n/states/PK.php:14
+msgid "Balochistan"
+msgstr ""
+
+#: i18n/states/PK.php:15
+msgid "FATA"
+msgstr ""
+
+#: i18n/states/PK.php:16
+msgid "Gilgit Baltistan"
+msgstr ""
+
+#: i18n/states/PK.php:17
+msgid "Islamabad Capital Territory"
+msgstr ""
+
+#: i18n/states/PK.php:18
+msgid "Khyber Pakhtunkhwa"
+msgstr ""
+
+#: i18n/states/PK.php:20
+msgid "Sindh"
+msgstr ""
+
 #: i18n/states/TH.php:13
 msgid ""
 "Amnat Charoen "
@@ -4780,30 +5100,6 @@ msgstr ""
 msgid "Armed Forces (AP)"
 msgstr ""
 
-#: i18n/states/US.php:67
-msgid "American Samoa"
-msgstr ""
-
-#: i18n/states/US.php:68
-msgid "Guam"
-msgstr ""
-
-#: i18n/states/US.php:69
-msgid "Northern Mariana Islands"
-msgstr ""
-
-#: i18n/states/US.php:70
-msgid "Puerto Rico"
-msgstr ""
-
-#: i18n/states/US.php:71
-msgid "US Minor Outlying Islands"
-msgstr ""
-
-#: i18n/states/US.php:72
-msgid "US Virgin Islands"
-msgstr ""
-
 #: i18n/states/ZA.php:13
 msgid "Eastern Cape"
 msgstr ""
@@ -4840,204 +5136,555 @@ msgstr ""
 msgid "Western Cape"
 msgstr ""
 
-#: includes/abstracts/abstract-wc-integration.php:29
-#: includes/abstracts/abstract-wc-settings-api.php:79
-#: includes/admin/class-wc-admin-menus.php:80
-#: includes/admin/settings/class-wc-settings-api.php:45
-#: includes/admin/views/html-admin-page-status-report.php:406
-#: includes/class-wc-install.php:714
-msgid "Settings"
+#: includes/abstracts/abstract-wc-order.php:457
+msgid "Invalid parent ID"
 msgstr ""
 
-#: includes/abstracts/abstract-wc-order.php:271
-#: includes/abstracts/abstract-wc-order.php:327
-msgid "Backordered"
+#: includes/abstracts/abstract-wc-order.php:512
+msgid "Invalid currency code"
 msgstr ""
 
-#: includes/abstracts/abstract-wc-order.php:1767
+#: includes/abstracts/abstract-wc-order.php:1397
+#. translators: %s: shipping method
 msgid "via %s"
 msgstr ""
 
-#: includes/abstracts/abstract-wc-order.php:1772
-#: includes/abstracts/abstract-wc-product.php:1016
-#: includes/abstracts/abstract-wc-product.php:1022
-#: includes/class-wc-cart.php:1577 includes/class-wc-product-variable.php:351
-#: includes/class-wc-product-variation.php:318
+#: includes/abstracts/abstract-wc-order.php:1402
+#: includes/class-wc-cart.php:1614 includes/class-wc-product-grouped.php:100
 msgid "Free!"
 msgstr ""
 
-#: includes/abstracts/abstract-wc-order.php:1835
+#: includes/abstracts/abstract-wc-order.php:1427
 msgid "Subtotal:"
 msgstr ""
 
-#: includes/abstracts/abstract-wc-order.php:1842
+#: includes/abstracts/abstract-wc-order.php:1442
+#: includes/admin/meta-boxes/views/html-order-items.php:121
 msgid "Discount:"
 msgstr ""
 
-#: includes/abstracts/abstract-wc-order.php:1849
+#: includes/abstracts/abstract-wc-order.php:1457
+#: includes/admin/meta-boxes/views/html-order-items.php:131
 msgid "Shipping:"
 msgstr ""
 
-#: includes/abstracts/abstract-wc-order.php:1864
-#: includes/admin/meta-boxes/views/html-order-fee.php:20
-msgid "Fee"
-msgstr ""
-
-#: includes/abstracts/abstract-wc-order.php:1902
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:290
-#: includes/shortcodes/class-wc-shortcode-checkout.php:154
-#: templates/checkout/thankyou.php:54
-msgid "Payment Method:"
-msgstr ""
-
-#: includes/abstracts/abstract-wc-order.php:1910
-#: includes/admin/meta-boxes/views/html-order-items.php:245
-#: includes/admin/meta-boxes/views/html-order-refund.php:18
-msgid "Refund"
-msgstr ""
-
-#: includes/abstracts/abstract-wc-order.php:1917
-#: includes/shortcodes/class-wc-shortcode-checkout.php:149
-#: templates/checkout/thankyou.php:49
+#: includes/abstracts/abstract-wc-order.php:1516
+#: includes/admin/meta-boxes/views/html-order-item.php:97
+#: includes/admin/meta-boxes/views/html-order-item.php:143
+#: includes/shortcodes/class-wc-shortcode-checkout.php:144
+#: templates/checkout/thankyou.php:56
 msgid "Total:"
 msgstr ""
 
-#: includes/abstracts/abstract-wc-order.php:2182
-#: templates/emails/plain/email-order-items.php:57
-msgid "Download %d"
+#: includes/abstracts/abstract-wc-payment-gateway.php:432
+msgid "Use a new payment method"
 msgstr ""
 
-#: includes/abstracts/abstract-wc-order.php:2182
-#: templates/emails/plain/email-order-items.php:59
-msgid "Download"
+#: includes/abstracts/abstract-wc-payment-gateway.php:456
+msgid "Save to account"
 msgstr ""
 
-#. Plugin Name of the plugin/theme
-msgid "WooCommerce"
+#: includes/abstracts/abstract-wc-product.php:757
+msgid "Invalid catalog visibility option."
 msgstr ""
 
-#: includes/abstracts/abstract-wc-order.php:2272
-msgid "Order status changed from %s to %s."
+#: includes/abstracts/abstract-wc-product.php:794
+msgid "Invalid or duplicated SKU."
 msgstr ""
 
-#: includes/abstracts/abstract-wc-order.php:2522
-msgid "Item %s variation #%s stock reduced from %s to %s."
+#: includes/abstracts/abstract-wc-product.php:878
+msgid "Invalid product tax status."
 msgstr ""
 
-#: includes/abstracts/abstract-wc-order.php:2524
-#: includes/class-wc-ajax.php:1366
-msgid "Item %s stock reduced from %s to %s."
+#: includes/abstracts/abstract-wc-product.php:1158
+msgid ""
+"The downloadable file %1$s cannot be used as it does not have an allowed "
+"file type. Allowed types include: %2$s"
 msgstr ""
 
-#: includes/abstracts/abstract-wc-payment-gateway.php:299
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:294
-msgid "Card Number"
+#: includes/abstracts/abstract-wc-product.php:1164
+msgid "The downloadable file %s cannot be used as it does not exist on the server."
 msgstr ""
 
-#: includes/abstracts/abstract-wc-payment-gateway.php:303
-msgid "Expiry (MM/YY)"
-msgstr ""
-
-#: includes/abstracts/abstract-wc-payment-gateway.php:304
-msgid "MM / YY"
-msgstr ""
-
-#: includes/abstracts/abstract-wc-payment-gateway.php:307
-msgid "Card Code"
-msgstr ""
-
-#: includes/abstracts/abstract-wc-payment-gateway.php:308
-msgid "CVC"
-msgstr ""
-
-#: includes/abstracts/abstract-wc-product.php:584
-#: includes/class-wc-product-simple.php:48
-#: includes/class-wc-product-variation.php:198
+#: includes/abstracts/abstract-wc-product.php:1703
+#: includes/class-wc-product-simple.php:54
 msgid "Add to cart"
 msgstr ""
 
-#: includes/abstracts/abstract-wc-product.php:593
+#: includes/abstracts/abstract-wc-product.php:1712
+#: includes/class-wc-embed.php:112 includes/class-wc-product-simple.php:54
+#: includes/class-wc-product-variable.php:60
 msgid "Read more"
 msgstr ""
 
-#: includes/abstracts/abstract-wc-product.php:673
-#: includes/abstracts/abstract-wc-product.php:684
-#: includes/abstracts/abstract-wc-product.php:706
-#: includes/admin/class-wc-admin-post-types.php:400
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:337
-#: includes/admin/reports/class-wc-report-stock.php:108
-#: includes/admin/views/html-bulk-edit-product.php:223
-#: includes/admin/views/html-quick-edit-product.php:166
-#: includes/class-wc-ajax.php:841 includes/class-wc-ajax.php:2438
-#: includes/class-wc-product-variation.php:537
-#: includes/class-wc-product-variation.php:547
-#: includes/class-wc-product-variation.php:563
-msgid "In stock"
-msgstr ""
-
-#: includes/abstracts/abstract-wc-product.php:678
-#: includes/class-wc-product-variation.php:541
-msgid "Only %s left in stock"
-msgstr ""
-
-#: includes/abstracts/abstract-wc-product.php:681
-#: includes/abstracts/abstract-wc-product.php:692
-#: includes/class-wc-product-variation.php:544
-#: includes/class-wc-product-variation.php:554
-msgid "(can be backordered)"
-msgstr ""
-
-#: includes/abstracts/abstract-wc-product.php:689
-#: includes/class-wc-product-variation.php:551
-msgid "%s in stock"
-msgstr ""
-
-#: includes/abstracts/abstract-wc-product.php:701
-#: includes/class-wc-product-variation.php:560 templates/cart/cart.php:90
-msgid "Available on backorder"
-msgstr ""
-
-#: includes/abstracts/abstract-wc-product.php:711
-#: includes/abstracts/abstract-wc-product.php:717
-#: includes/admin/class-wc-admin-post-types.php:402
+#: includes/abstracts/abstract-wc-product.php:1864
+#: includes/admin/class-wc-admin-post-types.php:438
 #: includes/admin/class-wc-admin-reports.php:100
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:338
 #: includes/admin/reports/class-wc-report-stock.php:110
-#: includes/admin/views/html-bulk-edit-product.php:224
-#: includes/admin/views/html-quick-edit-product.php:167
-#: includes/class-wc-ajax.php:842 includes/class-wc-ajax.php:2439
-#: includes/class-wc-product-variation.php:566
-#: includes/class-wc-product-variation.php:570
+#: includes/wc-product-functions.php:803
 msgid "Out of stock"
 msgstr ""
 
-#: includes/abstracts/abstract-wc-product.php:1157
-#: includes/class-wc-embed.php:132 templates/single-product/rating.php:35
-msgid "Rated %s out of 5"
+#: includes/abstracts/abstract-wc-product.php:1866 templates/cart/cart.php:91
+msgid "Available on backorder"
 msgstr ""
 
-#: includes/abstracts/abstract-wc-product.php:1159
-#: includes/admin/class-wc-admin-dashboard.php:198
-#: templates/single-product/review.php:39
-msgid "out of 5"
+#: includes/abstracts/abstract-wc-rest-controller.php:97
+#: includes/api/legacy/v2/class-wc-api-coupons.php:519
+#: includes/api/legacy/v2/class-wc-api-customers.php:783
+#: includes/api/legacy/v2/class-wc-api-orders.php:1768
+#: includes/api/legacy/v2/class-wc-api-products.php:2272
+#: includes/api/legacy/v3/class-wc-api-coupons.php:519
+#: includes/api/legacy/v3/class-wc-api-customers.php:773
+#: includes/api/legacy/v3/class-wc-api-orders.php:1818
+#: includes/api/legacy/v3/class-wc-api-products.php:3078
+#: includes/api/legacy/v3/class-wc-api-taxes.php:465
+#. translators: %s: items limit
+msgid "Unable to accept more than %s items for this request."
 msgstr ""
 
-#: includes/abstracts/abstract-wc-product.php:1535
-msgid "%s &ndash; %s"
+#: includes/abstracts/abstract-wc-rest-controller.php:221
+#: includes/abstracts/abstract-wc-rest-controller.php:239
+#: includes/abstracts/abstract-wc-rest-controller.php:262
+#: includes/abstracts/abstract-wc-rest-controller.php:305
+#: includes/api/class-wc-rest-payment-gateways-controller.php:185
+#: includes/api/class-wc-rest-shipping-zone-methods-controller.php:317
+msgid "An invalid setting value was passed."
 msgstr ""
 
-#: includes/admin/class-wc-admin-addons.php:99
+#: includes/abstracts/abstract-wc-rest-controller.php:359
+msgid "List of created resources."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-controller.php:367
+msgid "List of updated resources."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-controller.php:375
+msgid "List of delete resources."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-crud-controller.php:43
+#: includes/abstracts/abstract-wc-rest-crud-controller.php:113
+#: includes/abstracts/abstract-wc-rest-crud-controller.php:125
+msgid "Method '%s' not implemented. Must be overridden in subclass."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-crud-controller.php:56
+#: includes/abstracts/abstract-wc-rest-posts-controller.php:83
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:155
+#: includes/api/class-wc-rest-payment-gateways-controller.php:96
+#: includes/api/class-wc-rest-shipping-methods-controller.php:90
+#: includes/api/class-wc-rest-system-status-tools-controller.php:94
+#: includes/api/v1/class-wc-rest-customers-controller.php:165
+#: includes/api/v1/class-wc-rest-order-notes-controller.php:151
+#: includes/api/v1/class-wc-rest-product-attributes-controller.php:159
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:150
+#: includes/api/v1/class-wc-rest-taxes-controller.php:142
+#: includes/api/v1/class-wc-rest-webhook-deliveries.php:106
+msgid "Sorry, you cannot view this resource."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-crud-controller.php:72
+#: includes/abstracts/abstract-wc-rest-posts-controller.php:99
+#: includes/abstracts/abstract-wc-rest-shipping-zones-controller.php:103
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:174
+#: includes/api/class-wc-rest-payment-gateways-controller.php:109
+#: includes/api/v1/class-wc-rest-customers-controller.php:181
+#: includes/api/v1/class-wc-rest-taxes-controller.php:156
+msgid "Sorry, you are not allowed to edit this resource."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-crud-controller.php:88
+#: includes/abstracts/abstract-wc-rest-posts-controller.php:115
+#: includes/abstracts/abstract-wc-rest-shipping-zones-controller.php:121
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:193
+#: includes/api/v1/class-wc-rest-customers-controller.php:197
+#: includes/api/v1/class-wc-rest-order-notes-controller.php:167
+#: includes/api/v1/class-wc-rest-product-attributes-controller.php:195
+#: includes/api/v1/class-wc-rest-tax-classes-controller.php:118
+#: includes/api/v1/class-wc-rest-taxes-controller.php:170
+msgid "Sorry, you are not allowed to delete this resource."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-crud-controller.php:138
+#: includes/abstracts/abstract-wc-rest-crud-controller.php:225
+#: includes/abstracts/abstract-wc-rest-crud-controller.php:385
+#: includes/abstracts/abstract-wc-rest-posts-controller.php:148
+#: includes/api/class-wc-rest-product-variations-controller.php:458
+#: includes/api/class-wc-rest-products-controller.php:1264
+msgid "Invalid ID."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-crud-controller.php:186
+#: includes/abstracts/abstract-wc-rest-posts-controller.php:170
+#: includes/api/v1/class-wc-rest-coupons-controller.php:310
+#: includes/api/v1/class-wc-rest-order-notes-controller.php:217
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:282
+#: includes/api/v1/class-wc-rest-orders-controller.php:814
+#: includes/api/v1/class-wc-rest-products-controller.php:739
+#: includes/api/v1/class-wc-rest-webhooks-controller.php:155
+#. translators: %s: post type
+msgid "Cannot create existing %s."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-crud-controller.php:402
+#: includes/abstracts/abstract-wc-rest-posts-controller.php:433
+#: includes/api/class-wc-rest-product-variations-controller.php:475
+#: includes/api/class-wc-rest-products-controller.php:1285
+#: includes/api/v1/class-wc-rest-products-controller.php:1658
+#. translators: %s: post type
+msgid "Sorry, you are not allowed to delete %s."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-crud-controller.php:416
+#: includes/abstracts/abstract-wc-rest-posts-controller.php:446
+#: includes/api/class-wc-rest-product-variations-controller.php:489
+#: includes/api/class-wc-rest-products-controller.php:1312
+#: includes/api/v1/class-wc-rest-products-controller.php:1685
+#. translators: %s: post type
+msgid "The %s does not support trashing."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-crud-controller.php:423
+#: includes/abstracts/abstract-wc-rest-posts-controller.php:452
+#: includes/api/class-wc-rest-product-variations-controller.php:496
+#: includes/api/class-wc-rest-products-controller.php:1319
+#: includes/api/v1/class-wc-rest-products-controller.php:1691
+#. translators: %s: post type
+msgid "The %s has already been deleted."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-crud-controller.php:433
+#: includes/abstracts/abstract-wc-rest-posts-controller.php:462
+#: includes/api/class-wc-rest-product-variations-controller.php:506
+#: includes/api/class-wc-rest-products-controller.php:1329
+#: includes/api/v1/class-wc-rest-order-notes-controller.php:313
+#: includes/api/v1/class-wc-rest-products-controller.php:1702
+#: includes/api/v1/class-wc-rest-webhooks-controller.php:342
+#. translators: %s: post type
+msgid "The %s cannot be deleted."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-crud-controller.php:478
+#: includes/vendor/abstract-wp-rest-controller.php:253
+msgid "Current page of the collection."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-crud-controller.php:486
+#: includes/vendor/abstract-wp-rest-controller.php:261
+msgid "Maximum number of items to be returned in result set."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-crud-controller.php:495
+#: includes/vendor/abstract-wp-rest-controller.php:270
+msgid "Limit results to those matching a string."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-crud-controller.php:501
+#: includes/abstracts/abstract-wc-rest-posts-controller.php:618
+msgid "Limit response to resources published after a given ISO8601 compliant date."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-crud-controller.php:507
+#: includes/abstracts/abstract-wc-rest-posts-controller.php:624
+msgid "Limit response to resources published before a given ISO8601 compliant date."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-crud-controller.php:513
+#: includes/abstracts/abstract-wc-rest-posts-controller.php:630
+#: includes/api/v1/class-wc-rest-customers-controller.php:863
+#: includes/api/v1/class-wc-rest-taxes-controller.php:656
+msgid "Ensure result set excludes specific IDs."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-crud-controller.php:522
+#: includes/abstracts/abstract-wc-rest-posts-controller.php:639
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:708
+msgid "Limit result set to specific ids."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-crud-controller.php:531
+#: includes/abstracts/abstract-wc-rest-posts-controller.php:648
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:718
+#: includes/api/v1/class-wc-rest-customers-controller.php:881
+#: includes/api/v1/class-wc-rest-taxes-controller.php:674
+msgid "Offset the result set by a specific number of items."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-crud-controller.php:537
+#: includes/abstracts/abstract-wc-rest-posts-controller.php:654
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:725
+#: includes/api/v1/class-wc-rest-customers-controller.php:888
+#: includes/api/v1/class-wc-rest-taxes-controller.php:681
+msgid "Order sort attribute ascending or descending."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-crud-controller.php:544
+#: includes/abstracts/abstract-wc-rest-posts-controller.php:661
+#: includes/api/v1/class-wc-rest-customers-controller.php:896
+#: includes/api/v1/class-wc-rest-taxes-controller.php:689
+msgid "Sort collection by object attribute."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-crud-controller.php:559
+#: includes/abstracts/abstract-wc-rest-posts-controller.php:678
+msgid "Limit result set to those of particular parent IDs."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-crud-controller.php:568
+#: includes/abstracts/abstract-wc-rest-posts-controller.php:687
+msgid "Limit result set to all items except those of a particular parent ID."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-posts-controller.php:53
+#: includes/abstracts/abstract-wc-rest-shipping-zones-controller.php:67
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:117
+#: includes/api/class-wc-rest-payment-gateways-controller.php:83
+#: includes/api/class-wc-rest-setting-options-controller.php:341
+#: includes/api/class-wc-rest-settings-controller.php:179
+#: includes/api/class-wc-rest-shipping-methods-controller.php:77
+#: includes/api/class-wc-rest-system-status-controller.php:60
+#: includes/api/class-wc-rest-system-status-tools-controller.php:81
+#: includes/api/v1/class-wc-rest-customer-downloads-controller.php:74
+#: includes/api/v1/class-wc-rest-customers-controller.php:135
+#: includes/api/v1/class-wc-rest-order-notes-controller.php:121
+#: includes/api/v1/class-wc-rest-product-attributes-controller.php:127
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:134
+#: includes/api/v1/class-wc-rest-report-sales-controller.php:69
+#: includes/api/v1/class-wc-rest-reports-controller.php:62
+#: includes/api/v1/class-wc-rest-tax-classes-controller.php:90
+#: includes/api/v1/class-wc-rest-taxes-controller.php:114
+#: includes/api/v1/class-wc-rest-webhook-deliveries.php:90
+msgid "Sorry, you cannot list resources."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-posts-controller.php:67
+#: includes/abstracts/abstract-wc-rest-shipping-zones-controller.php:85
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:136
+#: includes/api/v1/class-wc-rest-customers-controller.php:149
+#: includes/api/v1/class-wc-rest-order-notes-controller.php:135
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:165
+#: includes/api/v1/class-wc-rest-tax-classes-controller.php:104
+#: includes/api/v1/class-wc-rest-taxes-controller.php:128
+msgid "Sorry, you are not allowed to create resources."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-posts-controller.php:129
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:212
+#: includes/api/class-wc-rest-product-reviews-controller.php:70
+#: includes/api/v1/class-wc-rest-customers-controller.php:211
+#: includes/api/v1/class-wc-rest-product-attributes-controller.php:209
+#: includes/api/v1/class-wc-rest-taxes-controller.php:184
+msgid "Sorry, you are not allowed to batch manipulate this resource."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-posts-controller.php:146
+#: includes/abstracts/abstract-wc-rest-posts-controller.php:253
+#: includes/api/class-wc-rest-products-controller.php:675
+#: includes/api/class-wc-rest-products-controller.php:1268
+#: includes/api/v1/class-wc-rest-products-controller.php:1639
+msgid ""
+"To manipulate product variations you should use the "
+"/products/&lt;product_id&gt;/variations/&lt;id&gt; endpoint."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-posts-controller.php:255
+#: includes/abstracts/abstract-wc-rest-posts-controller.php:416
+#: includes/api/v1/class-wc-rest-coupons-controller.php:351
+#: includes/api/v1/class-wc-rest-orders-controller.php:853
+#: includes/api/v1/class-wc-rest-products-controller.php:784
+#: includes/api/v1/class-wc-rest-webhooks-controller.php:244
+msgid "ID is invalid."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-posts-controller.php:700
+msgid ""
+"Use WP Query arguments to modify the response; private query vars require "
+"appropriate authorization."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-shipping-zones-controller.php:49
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:237
+#: includes/api/class-wc-rest-payment-gateways-controller.php:142
+#: includes/api/class-wc-rest-payment-gateways-controller.php:159
+#: includes/api/class-wc-rest-shipping-methods-controller.php:122
+#: includes/api/class-wc-rest-shipping-zone-methods-controller.php:119
+#: includes/api/class-wc-rest-shipping-zone-methods-controller.php:217
+#: includes/api/class-wc-rest-shipping-zone-methods-controller.php:273
+#: includes/api/v1/class-wc-rest-customer-downloads-controller.php:70
+#: includes/api/v1/class-wc-rest-product-attributes-controller.php:155
+#: includes/api/v1/class-wc-rest-product-attributes-controller.php:173
+#: includes/api/v1/class-wc-rest-product-attributes-controller.php:191
+#: includes/api/v1/class-wc-rest-product-attributes-controller.php:631
+msgid "Resource does not exist."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-shipping-zones-controller.php:63
+#: includes/abstracts/abstract-wc-rest-shipping-zones-controller.php:81
+#: includes/abstracts/abstract-wc-rest-shipping-zones-controller.php:99
+#: includes/abstracts/abstract-wc-rest-shipping-zones-controller.php:117
+msgid "Shipping is disabled."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:49
+#: includes/api/v1/class-wc-rest-product-attribute-terms-controller.php:63
+#: includes/api/v1/class-wc-rest-product-attributes-controller.php:63
+msgid "Name for the resource."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:60
+#: includes/api/class-wc-rest-coupons-controller.php:75
+#: includes/api/class-wc-rest-customers-controller.php:128
+#: includes/api/class-wc-rest-order-notes-controller.php:132
+#: includes/api/class-wc-rest-order-refunds-controller.php:92
+#: includes/api/class-wc-rest-order-refunds-controller.php:342
+#: includes/api/class-wc-rest-orders-controller.php:82
+#: includes/api/class-wc-rest-orders-controller.php:793
+#: includes/api/class-wc-rest-payment-gateways-controller.php:53
+#: includes/api/class-wc-rest-product-categories-controller.php:106
+#: includes/api/class-wc-rest-product-reviews-controller.php:155
+#: includes/api/class-wc-rest-product-variations-controller.php:593
+#: includes/api/class-wc-rest-products-controller.php:83
+#: includes/api/class-wc-rest-products-controller.php:1363
+#: includes/api/class-wc-rest-setting-options-controller.php:81
+#: includes/api/class-wc-rest-shipping-methods-controller.php:53
+#: includes/api/class-wc-rest-shipping-zones-controller.php:275
+#: includes/api/class-wc-rest-system-status-tools-controller.php:54
+#: includes/api/class-wc-rest-webhook-deliveries.php:80
+#: includes/api/class-wc-rest-webhooks-controller.php:97
+#: includes/api/v1/class-wc-rest-coupons-controller.php:82
+#: includes/api/v1/class-wc-rest-customer-downloads-controller.php:46
+#: includes/api/v1/class-wc-rest-customers-controller.php:78
+#: includes/api/v1/class-wc-rest-customers-controller.php:630
+#: includes/api/v1/class-wc-rest-order-notes-controller.php:81
+#: includes/api/v1/class-wc-rest-order-notes-controller.php:398
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:87
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:346
+#: includes/api/v1/class-wc-rest-orders-controller.php:76
+#: includes/api/v1/class-wc-rest-orders-controller.php:907
+#: includes/api/v1/class-wc-rest-product-attribute-terms-controller.php:74
+#: includes/api/v1/class-wc-rest-product-attribute-terms-controller.php:195
+#: includes/api/v1/class-wc-rest-product-attributes-controller.php:75
+#: includes/api/v1/class-wc-rest-product-attributes-controller.php:536
+#: includes/api/v1/class-wc-rest-product-categories-controller.php:170
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:92
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:516
+#: includes/api/v1/class-wc-rest-product-shipping-classes-controller.php:94
+#: includes/api/v1/class-wc-rest-product-tags-controller.php:94
+#: includes/api/v1/class-wc-rest-products-controller.php:77
+#: includes/api/v1/class-wc-rest-products-controller.php:1736
+#: includes/api/v1/class-wc-rest-tax-classes-controller.php:332
+#: includes/api/v1/class-wc-rest-taxes-controller.php:62
+#: includes/api/v1/class-wc-rest-taxes-controller.php:574
+#: includes/api/v1/class-wc-rest-webhook-deliveries.php:66
+#: includes/api/v1/class-wc-rest-webhook-deliveries.php:234
+#: includes/api/v1/class-wc-rest-webhooks-controller.php:92
+#: includes/api/v1/class-wc-rest-webhooks-controller.php:498
+msgid "Unique identifier for the resource."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:86
+#: includes/api/class-wc-rest-order-refunds-controller.php:112
+#: includes/api/v1/class-wc-rest-customers-controller.php:104
+#: includes/api/v1/class-wc-rest-order-notes-controller.php:105
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:107
+#: includes/api/v1/class-wc-rest-product-attribute-terms-controller.php:104
+#: includes/api/v1/class-wc-rest-product-attributes-controller.php:101
+#: includes/api/v1/class-wc-rest-tax-classes-controller.php:74
+#: includes/api/v1/class-wc-rest-taxes-controller.php:88
+#: includes/api/v1/class-wc-rest-webhooks-controller.php:118
+msgid "Required to be true, as resource does not support trashing."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:229
+msgid "Taxonomy does not exist."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:376
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:480
+msgid "Can not set resource parent, taxonomy is not hierarchical."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:382
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:491
+msgid "Parent resource does not exist."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:542
+#: includes/api/v1/class-wc-rest-product-attributes-controller.php:417
+msgid "Resource does not support trashing."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:551
+#: includes/api/v1/class-wc-rest-customers-controller.php:493
+#: includes/api/v1/class-wc-rest-product-attributes-controller.php:436
+#: includes/api/v1/class-wc-rest-taxes-controller.php:470
+msgid "The resource cannot be deleted."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:699
+msgid "Ensure result set excludes specific ids."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:736
+msgid "Sort collection by resource attribute."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:752
+msgid "Whether to hide resources not assigned to any products."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:759
+msgid "Limit result set to resources assigned to a specific parent."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:766
+msgid "Limit result set to resources assigned to a specific product."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:772
+msgid "Limit result set to resources with a specific slug."
+msgstr ""
+
+#: includes/abstracts/abstract-wc-settings-api.php:735
+#: includes/admin/class-wc-admin-menus.php:279
+#: includes/admin/class-wc-admin-settings.php:607
+#: includes/admin/meta-boxes/views/html-product-attribute.php:45
+msgid "Select all"
+msgstr ""
+
+#: includes/abstracts/abstract-wc-settings-api.php:735
+#: includes/admin/class-wc-admin-settings.php:607
+#: includes/admin/meta-boxes/views/html-product-attribute.php:46
+msgid "Select none"
+msgstr ""
+
+#: includes/abstracts/abstract-wc-shipping-method.php:279
+#: includes/admin/class-wc-admin-meta-boxes.php:127
+msgid "Items"
+msgstr ""
+
+#: includes/admin/class-wc-admin-addons.php:128
 msgid "Need a fresh look? Try Storefront child themes"
 msgstr ""
 
-#: includes/admin/class-wc-admin-addons.php:103
+#: includes/admin/class-wc-admin-addons.php:132
 msgid "View more Storefront child themes"
 msgstr ""
 
-#: includes/admin/class-wc-admin-addons.php:108
+#: includes/admin/class-wc-admin-addons.php:137
 msgid "Need a theme? Try Storefront"
 msgstr ""
 
+#: includes/admin/class-wc-admin-addons.php:348
+msgid "Free"
+msgstr ""
+
+#: includes/admin/class-wc-admin-addons.php:350
+msgid "Installed"
+msgstr ""
+
 #: includes/admin/class-wc-admin-api-keys-table-list.php:26
 msgid "key"
 msgstr ""
@@ -5047,21 +5694,25 @@ msgid "keys"
 msgstr ""
 
 #: includes/admin/class-wc-admin-api-keys-table-list.php:40
-#: includes/admin/class-wc-admin-post-types.php:251
-#: includes/admin/class-wc-admin-setup-wizard.php:227
+#: includes/admin/class-wc-admin-post-types.php:286
+#: includes/admin/class-wc-admin-setup-wizard.php:248
+#: includes/admin/meta-boxes/views/html-variation-admin.php:307
+#: includes/admin/settings/class-wc-settings-shipping.php:339
+#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:73
 #: includes/admin/settings/views/html-keys-edit.php:16
-#: includes/gateways/bacs/class-wc-gateway-bacs.php:87
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:86
 #: includes/gateways/cheque/class-wc-gateway-cheque.php:67
-#: includes/gateways/cod/class-wc-gateway-cod.php:75
+#: includes/gateways/cod/class-wc-gateway-cod.php:82
 #: includes/gateways/paypal/includes/settings-paypal.php:25
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:197
-#: includes/wc-template-functions.php:1083
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:204
+#: includes/wc-template-functions.php:1122
+#: templates/single-product/tabs/description.php:25
 msgid "Description"
 msgstr ""
 
 #: includes/admin/class-wc-admin-api-keys-table-list.php:41
-#: includes/admin/settings/views/html-keys-edit.php:62
-msgid "Consumer Key Ending In"
+#: includes/admin/settings/views/html-keys-edit.php:70
+msgid "Consumer key ending in"
 msgstr ""
 
 #: includes/admin/class-wc-admin-api-keys-table-list.php:42
@@ -5070,21 +5721,22 @@ msgid "User"
 msgstr ""
 
 #: includes/admin/class-wc-admin-api-keys-table-list.php:43
-#: includes/admin/settings/views/html-keys-edit.php:40
+#: includes/admin/settings/views/html-keys-edit.php:48
 msgid "Permissions"
 msgstr ""
 
 #: includes/admin/class-wc-admin-api-keys-table-list.php:44
-#: includes/admin/settings/views/html-keys-edit.php:70
-msgid "Last Access"
+#: includes/admin/settings/views/html-keys-edit.php:78
+msgid "Last access"
 msgstr ""
 
 #: includes/admin/class-wc-admin-api-keys-table-list.php:70
-msgid "API Key"
+msgid "API key"
 msgstr ""
 
 #: includes/admin/class-wc-admin-api-keys-table-list.php:79
 #: includes/admin/class-wc-admin-webhooks-table-list.php:95
+#: includes/admin/meta-boxes/views/html-order-refund.php:20
 msgid "ID: %d"
 msgstr ""
 
@@ -5093,389 +5745,413 @@ msgid "View/Edit"
 msgstr ""
 
 #: includes/admin/class-wc-admin-api-keys-table-list.php:81
-msgid "Revoke API Key"
+msgid "Revoke API key"
 msgstr ""
 
 #: includes/admin/class-wc-admin-api-keys-table-list.php:81
-#: includes/admin/class-wc-admin-api-keys-table-list.php:171
+#: includes/admin/class-wc-admin-api-keys-table-list.php:170
 msgid "Revoke"
 msgstr ""
 
-#: includes/admin/class-wc-admin-api-keys-table-list.php:136
-#: includes/admin/settings/views/html-keys-edit.php:47
-#: includes/class-wc-auth.php:77
+#: includes/admin/class-wc-admin-api-keys-table-list.php:134
+#: includes/admin/settings/views/html-keys-edit.php:55
+#: includes/class-wc-auth.php:76
 msgid "Read"
 msgstr ""
 
-#: includes/admin/class-wc-admin-api-keys-table-list.php:137
-#: includes/admin/settings/views/html-keys-edit.php:48
-#: includes/class-wc-auth.php:78
+#: includes/admin/class-wc-admin-api-keys-table-list.php:135
+#: includes/admin/settings/views/html-keys-edit.php:56
+#: includes/class-wc-auth.php:77
 msgid "Write"
 msgstr ""
 
-#: includes/admin/class-wc-admin-api-keys-table-list.php:138
-#: includes/admin/settings/views/html-keys-edit.php:49
-#: includes/class-wc-auth.php:79
+#: includes/admin/class-wc-admin-api-keys-table-list.php:136
+#: includes/admin/settings/views/html-keys-edit.php:57
+#: includes/class-wc-auth.php:78
 msgid "Read/Write"
 msgstr ""
 
-#: includes/admin/class-wc-admin-api-keys-table-list.php:161
-#: includes/admin/settings/views/html-keys-edit.php:79
+#: includes/admin/class-wc-admin-api-keys-table-list.php:155
+#: includes/admin/settings/views/html-keys-edit.php:84
+#. translators: 1: last access date 2: last access time
+msgid "%1$s at %2$s"
+msgstr ""
+
+#: includes/admin/class-wc-admin-api-keys-table-list.php:160
+#: includes/admin/settings/views/html-keys-edit.php:88
 msgid "Unknown"
 msgstr ""
 
-#: includes/admin/class-wc-admin-api-keys.php:62
+#: includes/admin/class-wc-admin-api-keys.php:61
 #: includes/admin/settings/class-wc-settings-api.php:46
 msgid "Keys/Apps"
 msgstr ""
 
-#: includes/admin/class-wc-admin-api-keys.php:62
-msgid "Add Key"
+#: includes/admin/class-wc-admin-api-keys.php:61
+msgid "Add key"
 msgstr ""
 
-#: includes/admin/class-wc-admin-api-keys.php:72
-msgid "Search Key"
+#: includes/admin/class-wc-admin-api-keys.php:71
+msgid "Search key"
 msgstr ""
 
-#: includes/admin/class-wc-admin-api-keys.php:133
-msgid "API Key revoked successfully."
+#: includes/admin/class-wc-admin-api-keys.php:132
+msgid "API key revoked successfully."
 msgstr ""
 
-#: includes/admin/class-wc-admin-api-keys.php:142
-#: includes/admin/class-wc-admin-api-keys.php:157
-#: includes/admin/class-wc-admin-notices.php:94
-#: includes/admin/class-wc-admin-settings.php:58
-#: includes/admin/class-wc-admin-webhooks.php:128
-#: includes/admin/class-wc-admin-webhooks.php:182
-#: includes/admin/class-wc-admin-webhooks.php:262
-#: includes/admin/class-wc-admin-webhooks.php:291
-#: includes/emails/class-wc-email.php:678
+#: includes/admin/class-wc-admin-api-keys.php:141
+#: includes/admin/class-wc-admin-api-keys.php:156
+#: includes/admin/class-wc-admin-notices.php:128
+#: includes/admin/class-wc-admin-settings.php:75
+#: includes/admin/class-wc-admin-status.php:281
+#: includes/admin/class-wc-admin-status.php:300
+#: includes/admin/class-wc-admin-status.php:316
+#: includes/admin/class-wc-admin-webhooks.php:142
+#: includes/admin/class-wc-admin-webhooks.php:202
+#: includes/admin/class-wc-admin-webhooks.php:287
+#: includes/admin/class-wc-admin-webhooks.php:316
+#: includes/emails/class-wc-email.php:688
 msgid "Action failed. Please refresh the page and retry."
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:148
+#. Plugin Name of the plugin/theme
+msgid "WooCommerce"
+msgstr ""
+
+#: includes/admin/class-wc-admin-assets.php:151
+#. translators: %s: decimal
 msgid "Please enter in decimal (%s) format without thousand separators."
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:149
+#: includes/admin/class-wc-admin-assets.php:153
+#. translators: %s: price decimal separator
 msgid ""
 "Please enter in monetary decimal (%s) format without thousand separators "
 "and currency symbols."
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:150
+#: includes/admin/class-wc-admin-assets.php:154
 msgid "Please enter in country code with two capital letters."
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:151
+#: includes/admin/class-wc-admin-assets.php:155
 msgid "Please enter in a value less than the regular price."
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:190
+#: includes/admin/class-wc-admin-assets.php:194
 msgid ""
 "Are you sure you want to link all variations? This will create a new "
 "variation for each and every possible combination of variation attributes "
-"(max 50 per run)."
-msgstr ""
-
-#: includes/admin/class-wc-admin-assets.php:191
-msgid "Enter a value"
-msgstr ""
-
-#: includes/admin/class-wc-admin-assets.php:192
-msgid "Variation menu order (determines position in the list of variations)"
-msgstr ""
-
-#: includes/admin/class-wc-admin-assets.php:193
-msgid "Enter a value (fixed or %)"
-msgstr ""
-
-#: includes/admin/class-wc-admin-assets.php:194
-msgid "Are you sure you want to delete all variations? This cannot be undone."
+"(max %d per run)."
 msgstr ""
 
 #: includes/admin/class-wc-admin-assets.php:195
-msgid "Last warning, are you sure?"
+msgid "Enter a value"
 msgstr ""
 
 #: includes/admin/class-wc-admin-assets.php:196
-#: includes/admin/class-wc-admin-taxonomies.php:131
-#: includes/admin/class-wc-admin-taxonomies.php:222
-msgid "Choose an image"
+msgid "Variation menu order (determines position in the list of variations)"
 msgstr ""
 
 #: includes/admin/class-wc-admin-assets.php:197
-msgid "Set variation image"
+msgid "Enter a value (fixed or %)"
 msgstr ""
 
 #: includes/admin/class-wc-admin-assets.php:198
-msgid "variation added"
+msgid "Are you sure you want to delete all variations? This cannot be undone."
 msgstr ""
 
 #: includes/admin/class-wc-admin-assets.php:199
-msgid "variations added"
+msgid "Last warning, are you sure?"
 msgstr ""
 
 #: includes/admin/class-wc-admin-assets.php:200
-msgid "No variations added"
+#: includes/admin/class-wc-admin-taxonomies.php:130
+#: includes/admin/class-wc-admin-taxonomies.php:240
+msgid "Choose an image"
 msgstr ""
 
 #: includes/admin/class-wc-admin-assets.php:201
-msgid "Are you sure you want to remove this variation?"
+msgid "Set variation image"
 msgstr ""
 
 #: includes/admin/class-wc-admin-assets.php:202
-msgid "Sale start date (YYYY-MM-DD format or leave blank)"
+msgid "variation added"
 msgstr ""
 
 #: includes/admin/class-wc-admin-assets.php:203
-msgid "Sale end date (YYYY-MM-DD format or leave blank)"
+msgid "variations added"
 msgstr ""
 
 #: includes/admin/class-wc-admin-assets.php:204
-msgid "Save changes before changing page?"
+msgid "No variations added"
 msgstr ""
 
 #: includes/admin/class-wc-admin-assets.php:205
-msgid "%qty% variation"
+msgid "Are you sure you want to remove this variation?"
 msgstr ""
 
 #: includes/admin/class-wc-admin-assets.php:206
+msgid "Sale start date (YYYY-MM-DD format or leave blank)"
+msgstr ""
+
+#: includes/admin/class-wc-admin-assets.php:207
+msgid "Sale end date (YYYY-MM-DD format or leave blank)"
+msgstr ""
+
+#: includes/admin/class-wc-admin-assets.php:208
+msgid "Save changes before changing page?"
+msgstr ""
+
+#: includes/admin/class-wc-admin-assets.php:209
+msgid "%qty% variation"
+msgstr ""
+
+#: includes/admin/class-wc-admin-assets.php:210
 msgid "%qty% variations"
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:221
-#: includes/admin/class-wc-admin-assets.php:349
-#: includes/admin/settings/views/html-webhooks-edit.php:50
-#: includes/class-wc-frontend-scripts.php:326
+#: includes/admin/class-wc-admin-assets.php:222
+#: includes/admin/class-wc-admin-assets.php:359
+#: includes/admin/settings/views/html-webhooks-edit.php:54
+#: includes/class-wc-frontend-scripts.php:543
 msgid "Select an option&hellip;"
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:232
+#: includes/admin/class-wc-admin-assets.php:240
 msgid ""
 "Are you sure you want to remove the selected items? If you have previously "
 "reduced this item's stock, or this order was submitted by a customer, you "
 "will need to manually restore the item's stock."
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:233
+#: includes/admin/class-wc-admin-assets.php:241
 msgid "Please select some items."
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:234
+#: includes/admin/class-wc-admin-assets.php:242
 msgid "Are you sure you wish to process this refund? This action cannot be undone."
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:235
+#: includes/admin/class-wc-admin-assets.php:243
 msgid "Are you sure you wish to delete this refund? This action cannot be undone."
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:236
+#: includes/admin/class-wc-admin-assets.php:244
 msgid ""
 "Are you sure you wish to delete this tax column? This action cannot be "
 "undone."
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:237
+#: includes/admin/class-wc-admin-assets.php:245
 msgid "Remove this item meta?"
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:238
+#: includes/admin/class-wc-admin-assets.php:246
 msgid "Remove this attribute?"
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:239
-#: includes/admin/class-wc-admin-attributes.php:267
-#: includes/admin/class-wc-admin-attributes.php:322
-#: includes/admin/class-wc-admin-attributes.php:356
-#: includes/admin/class-wc-admin-attributes.php:379
-#: includes/admin/class-wc-admin-attributes.php:435
-#: includes/admin/class-wc-admin-attributes.php:476
-#: includes/admin/class-wc-admin-post-types.php:219
-#: includes/admin/class-wc-admin-setup-wizard.php:493
+#: includes/admin/class-wc-admin-assets.php:247
+#: includes/admin/class-wc-admin-attributes.php:280
+#: includes/admin/class-wc-admin-attributes.php:334
+#: includes/admin/class-wc-admin-attributes.php:369
+#: includes/admin/class-wc-admin-attributes.php:391
+#: includes/admin/class-wc-admin-attributes.php:454
+#: includes/admin/class-wc-admin-attributes.php:495
+#: includes/admin/class-wc-admin-post-types.php:254
+#: includes/admin/class-wc-admin-setup-wizard.php:488
 #: includes/admin/class-wc-admin-webhooks-table-list.php:40
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:191
 #: includes/admin/meta-boxes/views/html-product-attribute.php:12
-#: includes/admin/meta-boxes/views/html-variation-admin.php:258
-#: includes/admin/settings/class-wc-settings-shipping.php:189
+#: includes/admin/meta-boxes/views/html-product-data-general.php:61
+#: includes/admin/meta-boxes/views/html-variation-admin.php:320
 #: includes/admin/settings/views/html-webhooks-edit.php:15
-#: includes/admin/views/html-admin-page-status-report.php:575
-#: includes/class-wc-ajax.php:1448
+#: includes/admin/views/html-admin-page-status-report.php:519
 #: includes/widgets/class-wc-widget-product-categories.php:52
-#: templates/single-product-reviews.php:73
+#: templates/single-product-reviews.php:77
 msgid "Name"
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:240
+#: includes/admin/class-wc-admin-assets.php:248
 #: includes/admin/meta-boxes/views/html-product-attribute.php:3
-#: includes/admin/meta-boxes/views/html-variation-admin.php:17
+#: includes/admin/meta-boxes/views/html-variation-admin.php:16
+#: includes/admin/settings/views/html-admin-page-shipping-classes.php:48
 msgid "Remove"
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:241
-#: includes/admin/meta-boxes/views/html-order-download-permission.php:11
+#: includes/admin/class-wc-admin-assets.php:249
+#: includes/admin/meta-boxes/views/html-order-download-permission.php:10
 #: includes/admin/meta-boxes/views/html-product-attribute.php:4
-#: includes/admin/meta-boxes/views/html-variation-admin.php:18
+#: includes/admin/meta-boxes/views/html-variation-admin.php:17
 msgid "Click to toggle"
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:242
-#: includes/admin/meta-boxes/views/html-product-attribute.php:25
+#: includes/admin/class-wc-admin-assets.php:250
+#: includes/admin/meta-boxes/views/html-product-attribute.php:24
 msgid "Value(s)"
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:243
+#: includes/admin/class-wc-admin-assets.php:251
 msgid "Enter some text, or some attributes by pipe (|) separating values."
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:244
-#: includes/admin/meta-boxes/views/html-product-attribute.php:66
+#: includes/admin/class-wc-admin-assets.php:252
+#: includes/admin/meta-boxes/views/html-product-attribute.php:76
 msgid "Visible on the product page"
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:245
-#: includes/admin/meta-boxes/views/html-product-attribute.php:72
+#: includes/admin/class-wc-admin-assets.php:253
+#: includes/admin/meta-boxes/views/html-product-attribute.php:82
 msgid "Used for variations"
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:246
+#: includes/admin/class-wc-admin-assets.php:254
 msgid "Enter a name for the new attribute term:"
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:247
+#: includes/admin/class-wc-admin-assets.php:255
 msgid "Calculate totals based on order items, discounts, and shipping?"
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:248
+#: includes/admin/class-wc-admin-assets.php:256
 msgid ""
 "Calculate line taxes? This will calculate taxes based on the customers "
 "country. If no billing/shipping is set it will use the store base country."
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:249
+#: includes/admin/class-wc-admin-assets.php:257
 msgid ""
 "Copy billing information to shipping information? This will remove any "
 "currently entered shipping information."
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:250
+#: includes/admin/class-wc-admin-assets.php:258
 msgid ""
 "Load the customer's billing information? This will remove any currently "
 "entered billing information."
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:251
+#: includes/admin/class-wc-admin-assets.php:259
 msgid ""
 "Load the customer's shipping information? This will remove any currently "
 "entered shipping information."
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:252
-#: includes/admin/class-wc-admin-post-types.php:232
-#: includes/admin/class-wc-admin-post-types.php:2159
+#: includes/admin/class-wc-admin-assets.php:260
+#: includes/admin/class-wc-admin-post-types.php:267
+#: includes/admin/class-wc-admin-post-types.php:1797
 #: includes/admin/views/html-bulk-edit-product.php:199
 #: includes/admin/views/html-quick-edit-product.php:157
 msgid "Featured"
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:256
+#: includes/admin/class-wc-admin-assets.php:264
 msgid "No customer selected"
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:280
+#: includes/admin/class-wc-admin-assets.php:288
 msgid ""
 "Could not grant access - the user may already have permission for this file "
 "or billing email is not set. Ensure the billing email is set, and the order "
 "has been saved."
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:281
+#: includes/admin/class-wc-admin-assets.php:289
 msgid "Are you sure you want to revoke access to this download?"
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:282
+#: includes/admin/class-wc-admin-assets.php:290
 msgid "You cannot add the same tax rate twice!"
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:283
-msgid ""
-"Your product has variations! Before changing the product type, it is a good "
-"idea to delete the variations to avoid errors in the stock reports."
+#: includes/admin/class-wc-admin-assets.php:291
+msgid "Are you sure you wish to delete this note? This action cannot be undone."
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:98
-#: includes/api/class-wc-api-products.php:2628
-#: includes/api/v2/class-wc-api-products.php:2097
+#: includes/admin/class-wc-admin-assets.php:340
+#: includes/admin/views/html-admin-page-status-report.php:27
+msgid "Copying to clipboard failed. Please press Ctrl/Cmd+C to copy."
+msgstr ""
+
+#: includes/admin/class-wc-admin-attributes.php:99
+#: includes/api/legacy/v2/class-wc-api-products.php:1963
+#: includes/api/legacy/v3/class-wc-api-products.php:2522
+#: includes/api/v1/class-wc-rest-product-attributes-controller.php:646
+#. translators: %s: attribute name
 msgid "Slug \"%s\" is too long (28 characters max). Shorten it, please."
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:100
-#: includes/api/class-wc-api-products.php:2630
-#: includes/api/v2/class-wc-api-products.php:2099
+#: includes/admin/class-wc-admin-attributes.php:102
+#: includes/api/legacy/v2/class-wc-api-products.php:1965
+#: includes/api/legacy/v3/class-wc-api-products.php:2524
+#: includes/api/v1/class-wc-rest-product-attributes-controller.php:648
+#. translators: %s: attribute name
 msgid "Slug \"%s\" is not allowed because it is a reserved term. Change it, please."
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:117
-#: includes/admin/class-wc-admin-attributes.php:146
+#: includes/admin/class-wc-admin-attributes.php:119
+#: includes/admin/class-wc-admin-attributes.php:149
 msgid "Please, provide an attribute name and slug."
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:121
-#: includes/admin/class-wc-admin-attributes.php:154
-#: includes/api/class-wc-api-products.php:2632
-#: includes/api/v2/class-wc-api-products.php:2101
+#: includes/admin/class-wc-admin-attributes.php:124
+#: includes/admin/class-wc-admin-attributes.php:158
+#: includes/api/legacy/v2/class-wc-api-products.php:1967
+#: includes/api/legacy/v3/class-wc-api-products.php:2526
+#: includes/api/v1/class-wc-rest-product-attributes-controller.php:650
+#. translators: %s: attribute name
 msgid "Slug \"%s\" is already in use. Change it, please."
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:193
+#: includes/admin/class-wc-admin-attributes.php:205
 msgid "Attribute updated successfully"
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:247
-msgid "Edit Attribute"
+#: includes/admin/class-wc-admin-attributes.php:259
+msgid "Edit attribute"
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:252
+#: includes/admin/class-wc-admin-attributes.php:264
 msgid "Error: non-existing attribute ID."
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:271
-#: includes/admin/class-wc-admin-attributes.php:437
+#: includes/admin/class-wc-admin-attributes.php:284
+#: includes/admin/class-wc-admin-attributes.php:456
 msgid "Name for the attribute (shown on the front-end)."
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:276
-#: includes/admin/class-wc-admin-attributes.php:357
-#: includes/admin/class-wc-admin-attributes.php:441
+#: includes/admin/class-wc-admin-attributes.php:289
+#: includes/admin/class-wc-admin-attributes.php:370
+#: includes/admin/class-wc-admin-attributes.php:460
+#: includes/admin/settings/class-wc-settings-shipping.php:338
+#: includes/admin/settings/views/html-admin-page-shipping-classes.php:62
 msgid "Slug"
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:280
-#: includes/admin/class-wc-admin-attributes.php:443
-msgid "Unique slug/reference for the attribute; must be shorter than 28 characters."
+#: includes/admin/class-wc-admin-attributes.php:293
+#: includes/admin/class-wc-admin-attributes.php:462
+msgid "Unique slug/reference for the attribute; must be no more than 28 characters."
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:285
-#: includes/admin/class-wc-admin-attributes.php:447
-msgid "Enable Archives?"
+#: includes/admin/class-wc-admin-attributes.php:298
+msgid "Enable archives?"
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:289
-#: includes/admin/class-wc-admin-attributes.php:449
+#: includes/admin/class-wc-admin-attributes.php:302
+#: includes/admin/class-wc-admin-attributes.php:468
 msgid ""
 "Enable this if you want this attribute to have product archives in your "
 "store."
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:294
-#: includes/admin/class-wc-admin-attributes.php:358
-#: includes/admin/class-wc-admin-attributes.php:453
-#: includes/admin/class-wc-admin-post-types.php:233
+#: includes/admin/class-wc-admin-attributes.php:307
+#: includes/admin/class-wc-admin-attributes.php:371
+#: includes/admin/class-wc-admin-attributes.php:472
+#: includes/admin/class-wc-admin-post-types.php:268
 msgid "Type"
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:312
-#: includes/admin/class-wc-admin-attributes.php:469
+#: includes/admin/class-wc-admin-attributes.php:324
+#: includes/admin/class-wc-admin-attributes.php:488
 msgid ""
 "Determines how you select attributes for products. Under admin panel -> "
 "products -> product data -> attributes -> values, <strong>Text</strong> "
@@ -5483,183 +6159,196 @@ msgid ""
 "terms in a drop-down list."
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:317
-#: includes/admin/class-wc-admin-attributes.php:473
+#: includes/admin/class-wc-admin-attributes.php:329
+#: includes/admin/class-wc-admin-attributes.php:492
 msgid "Default sort order"
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:321
-#: includes/admin/class-wc-admin-attributes.php:388
-#: includes/admin/class-wc-admin-attributes.php:475
+#: includes/admin/class-wc-admin-attributes.php:333
+#: includes/admin/class-wc-admin-attributes.php:400
+#: includes/admin/class-wc-admin-attributes.php:494
 msgid "Custom ordering"
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:323
-#: includes/admin/class-wc-admin-attributes.php:382
-#: includes/admin/class-wc-admin-attributes.php:477
+#: includes/admin/class-wc-admin-attributes.php:335
+#: includes/admin/class-wc-admin-attributes.php:394
+#: includes/admin/class-wc-admin-attributes.php:496
 msgid "Name (numeric)"
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:324
-#: includes/admin/class-wc-admin-attributes.php:385
-#: includes/admin/class-wc-admin-attributes.php:478
+#: includes/admin/class-wc-admin-attributes.php:336
+#: includes/admin/class-wc-admin-attributes.php:397
+#: includes/admin/class-wc-admin-attributes.php:497
 msgid "Term ID"
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:326
-#: includes/admin/class-wc-admin-attributes.php:480
+#: includes/admin/class-wc-admin-attributes.php:338
+#: includes/admin/class-wc-admin-attributes.php:499
 msgid ""
 "Determines the sort order of the terms on the frontend shop product pages. "
 "If using custom ordering, you can drag and drop the terms in this attribute."
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:331
+#: includes/admin/class-wc-admin-attributes.php:344
 msgid "Update"
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:348
-#: includes/admin/class-wc-admin-menus.php:62
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:109
-msgid "Attributes"
-msgstr ""
-
-#: includes/admin/class-wc-admin-attributes.php:359
+#: includes/admin/class-wc-admin-attributes.php:372
 #: includes/widgets/class-wc-widget-product-categories.php:49
 #: includes/widgets/class-wc-widget-products.php:53
 msgid "Order by"
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:360
+#: includes/admin/class-wc-admin-attributes.php:373
 msgid "Terms"
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:372
-#: includes/admin/class-wc-admin-post-types.php:439
-#: includes/admin/class-wc-admin-post-types.php:569
-#: includes/admin/class-wc-admin-post-types.php:2163
+#: includes/admin/class-wc-admin-attributes.php:384
+#: includes/admin/class-wc-admin-post-types.php:1801
 #: includes/admin/class-wc-admin-webhooks-table-list.php:99
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:242
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:326
-#: includes/admin/meta-boxes/views/html-order-items.php:223
-#: includes/admin/reports/class-wc-report-customer-list.php:169
-#: includes/admin/reports/class-wc-report-stock.php:126
-#: includes/class-wc-post-types.php:242 includes/class-wc-post-types.php:294
-#: includes/class-wc-post-types.php:353 includes/class-wc-post-types.php:391
-#: templates/myaccount/my-address.php:53
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:274
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:364
+#: includes/admin/reports/class-wc-report-customer-list.php:159
+#: includes/admin/reports/class-wc-report-stock.php:127
+#: includes/admin/settings/views/html-admin-page-shipping-classes.php:48
+#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:107
+#: includes/admin/settings/views/html-admin-page-shipping-zones.php:28
+#: includes/admin/settings/views/html-admin-page-shipping-zones.php:78
+#: includes/class-wc-post-types.php:263 includes/class-wc-post-types.php:322
+#: includes/class-wc-post-types.php:385 includes/class-wc-post-types.php:426
+#: templates/myaccount/my-address.php:51
 msgid "Edit"
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:372
-#: includes/admin/meta-boxes/class-wc-meta-box-product-images.php:57
-#: includes/admin/meta-boxes/class-wc-meta-box-product-images.php:77
-#: includes/admin/meta-boxes/views/html-product-download.php:6
-#: includes/admin/meta-boxes/views/html-product-variation-download.php:5
+#: includes/admin/class-wc-admin-attributes.php:384
+#: includes/admin/class-wc-admin-log-table-list.php:159
+#: includes/admin/meta-boxes/class-wc-meta-box-product-images.php:58
+#: includes/admin/meta-boxes/class-wc-meta-box-product-images.php:78
+#: includes/admin/meta-boxes/views/html-product-download.php:9
+#: includes/admin/meta-boxes/views/html-product-variation-download.php:8
+#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:107
+#: includes/admin/settings/views/html-admin-page-shipping-zones.php:78
+#: includes/wc-account-functions.php:269
 msgid "Delete"
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:375
-msgid "Public"
+#: includes/admin/class-wc-admin-attributes.php:387
+msgid "(Public)"
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:417
+#: includes/admin/class-wc-admin-attributes.php:433
 msgid "Configure terms"
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:421
+#: includes/admin/class-wc-admin-attributes.php:438
 msgid "No attributes currently exist."
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:431
-msgid "Add New Attribute"
+#: includes/admin/class-wc-admin-attributes.php:448
+msgid "Add new attribute"
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:432
+#: includes/admin/class-wc-admin-attributes.php:449
 msgid ""
-"Attributes let you define extra product data, such as size or colour. You "
+"Attributes let you define extra product data, such as size or color. You "
 "can use these attributes in the shop sidebar using the \"layered nav\" "
 "widgets. Please note: you cannot rename an attribute later on."
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:483
-msgid "Add Attribute"
+#: includes/admin/class-wc-admin-attributes.php:466
+msgid "Enable Archives?"
 msgstr ""
 
-#: includes/admin/class-wc-admin-attributes.php:494
+#: includes/admin/class-wc-admin-attributes.php:504
+msgid "Add attribute"
+msgstr ""
+
+#: includes/admin/class-wc-admin-attributes.php:515
 msgid "Are you sure you want to delete this attribute?"
 msgstr ""
 
 #: includes/admin/class-wc-admin-dashboard.php:37
 #: includes/widgets/class-wc-widget-recent-reviews.php:25
-msgid "WooCommerce Recent Reviews"
+msgid "WooCommerce recent reviews"
 msgstr ""
 
-#: includes/admin/class-wc-admin-dashboard.php:40
+#: includes/admin/class-wc-admin-dashboard.php:39
 #: includes/admin/class-wc-admin-menus.php:97
-msgid "WooCommerce Status"
+msgid "WooCommerce status"
 msgstr ""
 
-#: includes/admin/class-wc-admin-dashboard.php:135
-msgid "<strong>%s</strong> sales this month"
+#: includes/admin/class-wc-admin-dashboard.php:102
+#. translators: %s: net sales
+msgid "%s net sales this month"
 msgstr ""
 
-#: includes/admin/class-wc-admin-dashboard.php:142
-msgid "%s top seller this month (sold %d)"
+#: includes/admin/class-wc-admin-dashboard.php:119
+#. translators: 1: top seller product title 2: top seller quantity
+msgid "%1$s top seller this month (sold %2$d)"
 msgstr ""
 
-#: includes/admin/class-wc-admin-dashboard.php:148
+#: includes/admin/class-wc-admin-dashboard.php:157
+#. translators: %s: order count
 msgid "<strong>%s order</strong> awaiting processing"
 msgid_plural "<strong>%s orders</strong> awaiting processing"
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/admin/class-wc-admin-dashboard.php:153
+#: includes/admin/class-wc-admin-dashboard.php:168
+#. translators: %s: order count
 msgid "<strong>%s order</strong> on-hold"
 msgid_plural "<strong>%s orders</strong> on-hold"
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/admin/class-wc-admin-dashboard.php:158
+#: includes/admin/class-wc-admin-dashboard.php:224
+#. translators: %s: order count
 msgid "<strong>%s product</strong> low in stock"
 msgid_plural "<strong>%s products</strong> low in stock"
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/admin/class-wc-admin-dashboard.php:163
+#: includes/admin/class-wc-admin-dashboard.php:235
+#. translators: %s: order count
 msgid "<strong>%s product</strong> out of stock"
 msgid_plural "<strong>%s products</strong> out of stock"
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/admin/class-wc-admin-dashboard.php:200
-msgid "reviewed by"
+#: includes/admin/class-wc-admin-dashboard.php:272
+#: templates/single-product/review-rating.php:31
+#. translators: %s: rating
+msgid "%s out of 5"
 msgstr ""
 
-#: includes/admin/class-wc-admin-dashboard.php:206
+#: includes/admin/class-wc-admin-dashboard.php:275
+#. translators: %s: review author
+msgid "reviewed by %s"
+msgstr ""
+
+#: includes/admin/class-wc-admin-dashboard.php:281
 msgid "There are no product reviews yet."
 msgstr ""
 
-#: includes/admin/class-wc-admin-duplicate-product.php:47
+#: includes/admin/class-wc-admin-duplicate-product.php:46
 msgid "Make a duplicate from this product"
 msgstr ""
 
-#: includes/admin/class-wc-admin-duplicate-product.php:48
+#: includes/admin/class-wc-admin-duplicate-product.php:47
 msgid "Duplicate"
 msgstr ""
 
-#: includes/admin/class-wc-admin-duplicate-product.php:74
+#: includes/admin/class-wc-admin-duplicate-product.php:73
 msgid "Copy to a new draft"
 msgstr ""
 
-#: includes/admin/class-wc-admin-duplicate-product.php:85
+#: includes/admin/class-wc-admin-duplicate-product.php:83
 msgid "No product to duplicate has been supplied!"
 msgstr ""
 
-#: includes/admin/class-wc-admin-duplicate-product.php:107
-msgid "Product creation failed, could not find original product:"
-msgstr ""
-
-#: includes/admin/class-wc-admin-duplicate-product.php:133
-msgid "(Copy)"
+#: includes/admin/class-wc-admin-duplicate-product.php:94
+#. translators: %s: product id
+msgid "Product creation failed, could not find original product: %s"
 msgstr ""
 
 #: includes/admin/class-wc-admin-help.php:41
@@ -5672,1167 +6361,1269 @@ msgid "Product Settings"
 msgstr ""
 
 #: includes/admin/class-wc-admin-help.php:53
-msgid "Tax Settings"
+msgid "Display Settings"
 msgstr ""
 
 #: includes/admin/class-wc-admin-help.php:57
-msgid "Checkout Settings"
+msgid "Inventory Settings"
 msgstr ""
 
 #: includes/admin/class-wc-admin-help.php:61
-msgid "Account Settings"
+msgid "Downloadable Products Settings"
 msgstr ""
 
 #: includes/admin/class-wc-admin-help.php:65
-msgid "Email Settings"
+msgid "Tax Settings"
 msgstr ""
 
 #: includes/admin/class-wc-admin-help.php:69
-msgid "Webhook Settings"
-msgstr ""
-
 #: includes/admin/class-wc-admin-help.php:73
-#: includes/admin/class-wc-admin-setup-wizard.php:640
-msgid "PayPal Standard"
-msgstr ""
-
 #: includes/admin/class-wc-admin-help.php:77
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:24
-msgid "Simplify Commerce"
+msgid "Tax Rate Example"
 msgstr ""
 
 #: includes/admin/class-wc-admin-help.php:81
-msgid "Shipping Settings"
+msgid "Shipping Zones"
 msgstr ""
 
 #: includes/admin/class-wc-admin-help.php:85
-#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:30
-#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:70
-msgid "Free Shipping"
+msgid "Shipping Options"
 msgstr ""
 
 #: includes/admin/class-wc-admin-help.php:89
-#: includes/shipping/local-delivery/class-wc-shipping-local-delivery.php:24
-#: includes/shipping/local-delivery/class-wc-shipping-local-delivery.php:98
-msgid "Local Delivery"
+msgid "Shipping Classes"
 msgstr ""
 
 #: includes/admin/class-wc-admin-help.php:93
-#: includes/shipping/local-pickup/class-wc-shipping-local-pickup.php:24
-#: includes/shipping/local-pickup/class-wc-shipping-local-pickup.php:75
-msgid "Local Pickup"
+msgid "Checkout Settings"
 msgstr ""
 
 #: includes/admin/class-wc-admin-help.php:97
+msgid "Bank Transfer (BACS) Payment Method"
+msgstr ""
+
 #: includes/admin/class-wc-admin-help.php:101
+msgid "Check Payment Method"
+msgstr ""
+
 #: includes/admin/class-wc-admin-help.php:105
+msgid "Cash on Delivery (COD) Payment Method"
+msgstr ""
+
 #: includes/admin/class-wc-admin-help.php:109
-msgid "Product Categories, Tags, Shipping Classes, &amp; Attributes"
+msgid "PayPal Standard Method"
 msgstr ""
 
 #: includes/admin/class-wc-admin-help.php:113
-msgid "Simple Products"
+msgid "PayPal by Braintree Payment Method"
 msgstr ""
 
 #: includes/admin/class-wc-admin-help.php:117
-#: includes/admin/class-wc-admin-help.php:184
-#: includes/admin/class-wc-admin-help.php:202
-#: includes/admin/class-wc-admin-menus.php:97
-#: includes/admin/views/html-admin-page-status.php:16
-msgid "System Status"
+msgid "Stripe Payment Method"
 msgstr ""
 
 #: includes/admin/class-wc-admin-help.php:121
+msgid "Account Settings"
+msgstr ""
+
+#: includes/admin/class-wc-admin-help.php:125
+msgid "Email Settings"
+msgstr ""
+
+#: includes/admin/class-wc-admin-help.php:129
+#: includes/admin/class-wc-admin-help.php:133
+msgid "API Settings"
+msgstr ""
+
+#: includes/admin/class-wc-admin-help.php:137
+msgid "Keys & Apps"
+msgstr ""
+
+#: includes/admin/class-wc-admin-help.php:141
+#: includes/admin/class-wc-admin-webhooks.php:431
+#: includes/admin/settings/class-wc-settings-api.php:47
+#: includes/class-wc-post-types.php:421
+msgid "Webhooks"
+msgstr ""
+
+#: includes/admin/class-wc-admin-help.php:145
+msgid "Creating Products"
+msgstr ""
+
+#: includes/admin/class-wc-admin-help.php:149
+msgid "Product Categories"
+msgstr ""
+
+#: includes/admin/class-wc-admin-help.php:153
+msgid "Product Tags"
+msgstr ""
+
+#: includes/admin/class-wc-admin-help.php:157
+msgid "Product Attributes"
+msgstr ""
+
+#: includes/admin/class-wc-admin-help.php:161
+msgid "System Status"
+msgstr ""
+
+#: includes/admin/class-wc-admin-help.php:165
+#: includes/admin/views/html-admin-page-status.php:13
+msgid "Tools"
+msgstr ""
+
+#: includes/admin/class-wc-admin-help.php:169
 #: includes/admin/class-wc-admin-menus.php:70
 msgid "Reports"
 msgstr ""
 
-#: includes/admin/class-wc-admin-help.php:125
-#: includes/admin/class-wc-admin-help.php:129
-#: includes/admin/settings/class-wc-settings-checkout.php:75
-#: includes/class-wc-post-types.php:348
+#: includes/admin/class-wc-admin-help.php:173
+msgid "Customer Reports"
+msgstr ""
+
+#: includes/admin/class-wc-admin-help.php:177
+msgid "Stock Reports"
+msgstr ""
+
+#: includes/admin/class-wc-admin-help.php:181
+msgid "Tax Reports"
+msgstr ""
+
+#: includes/admin/class-wc-admin-help.php:185
+#: includes/admin/class-wc-admin-help.php:189
+#: includes/admin/settings/class-wc-settings-checkout.php:74
+#: includes/class-wc-post-types.php:380
 msgid "Coupons"
 msgstr ""
 
-#: includes/admin/class-wc-admin-help.php:133
-#: includes/admin/class-wc-admin-help.php:137
+#: includes/admin/class-wc-admin-help.php:193
+#: includes/admin/class-wc-admin-help.php:197
 msgid "Managing Orders"
 msgstr ""
 
-#: includes/admin/class-wc-admin-help.php:160
-#: includes/admin/class-wc-admin-help.php:162
-msgid "WooCommerce 101"
+#: includes/admin/class-wc-admin-help.php:220
+#: includes/admin/class-wc-admin-help.php:222
+msgid "Guided Tour"
 msgstr ""
 
-#: includes/admin/class-wc-admin-help.php:169
-#: includes/admin/class-wc-admin-help.php:171
-msgid "Documentation"
+#: includes/admin/class-wc-admin-help.php:233
+#: includes/admin/class-wc-admin-help.php:235
+msgid "Help &amp; Support"
 msgstr ""
 
-#: includes/admin/class-wc-admin-help.php:172
+#: includes/admin/class-wc-admin-help.php:237
 msgid ""
-"Should you need help understanding, using, or extending WooCommerce, please "
-"read our documentation. You will find all kinds of resources including "
-"snippets, tutorials and much more."
+"Should you need help understanding, using, or extending WooCommerce, <a "
+"href=\"%s\">please read our documentation</a>. You will find all kinds of "
+"resources including snippets, tutorials and much more."
 msgstr ""
 
-#: includes/admin/class-wc-admin-help.php:173
-msgid "WooCommerce Documentation"
-msgstr ""
-
-#: includes/admin/class-wc-admin-help.php:173
-msgid "Developer API Docs"
-msgstr ""
-
-#: includes/admin/class-wc-admin-help.php:179
-#: includes/admin/class-wc-admin-help.php:181
-msgid "Support"
-msgstr ""
-
-#: includes/admin/class-wc-admin-help.php:182
+#: includes/admin/class-wc-admin-help.php:241
 msgid ""
-"After %sreading the documentation%s, for further assistance you can use the "
-"%scommunity forums%s on WordPress.org to talk with other users. If however "
-"you are a WooThemes customer, or need help with premium add-ons sold by "
-"WooThemes, please %suse our helpdesk%s."
+"For further assistance with WooCommerce core you can use the <a "
+"href=\"%1$s\">community forum</a>. If you need help with premium extensions "
+"sold by WooCommerce, please <a href=\"%2$s\">use our helpdesk</a>."
 msgstr ""
 
-#: includes/admin/class-wc-admin-help.php:183
+#: includes/admin/class-wc-admin-help.php:245
 msgid ""
 "Before asking for help we recommend checking the system status page to "
 "identify any problems with your configuration."
 msgstr ""
 
-#: includes/admin/class-wc-admin-help.php:184
-msgid "WordPress.org Forums"
+#: includes/admin/class-wc-admin-help.php:246
+#: includes/admin/class-wc-admin-help.php:255
+#: includes/admin/class-wc-admin-menus.php:97
+#: includes/admin/views/html-admin-page-status.php:12
+msgid "System status"
 msgstr ""
 
-#: includes/admin/class-wc-admin-help.php:184
-msgid "WooThemes Customer Support"
+#: includes/admin/class-wc-admin-help.php:246
+msgid "Community forum"
 msgstr ""
 
-#: includes/admin/class-wc-admin-help.php:189
-#: includes/admin/class-wc-admin-help.php:191
-msgid "Education"
+#: includes/admin/class-wc-admin-help.php:246
+msgid "WooCommerce helpdesk"
 msgstr ""
 
-#: includes/admin/class-wc-admin-help.php:192
-msgid ""
-"If you would like to learn about using WooCommerce from an expert, consider "
-"following a WooCommerce course ran by one of our educational partners."
-msgstr ""
-
-#: includes/admin/class-wc-admin-help.php:193
-msgid "View Education Partners"
-msgstr ""
-
-#: includes/admin/class-wc-admin-help.php:198
-#: includes/admin/class-wc-admin-help.php:200
+#: includes/admin/class-wc-admin-help.php:251
+#: includes/admin/class-wc-admin-help.php:253
 msgid "Found a bug?"
 msgstr ""
 
-#: includes/admin/class-wc-admin-help.php:201
+#: includes/admin/class-wc-admin-help.php:254
 msgid ""
 "If you find a bug within WooCommerce core you can create a ticket via <a "
-"href=\"%s\">Github issues</a>. Ensure you read the <a "
-"href=\"%s\">contribution guide</a> prior to submitting your report. To help "
-"us solve your issue, please be as descriptive as possible and include your "
-"<a href=\"%s\">system status report</a>."
+"href=\"%1$s\">Github issues</a>. Ensure you read the <a "
+"href=\"%2$s\">contribution guide</a> prior to submitting your report. To "
+"help us solve your issue, please be as descriptive as possible and include "
+"your <a href=\"%3$s\">system status report</a>."
 msgstr ""
 
-#: includes/admin/class-wc-admin-help.php:202
+#: includes/admin/class-wc-admin-help.php:255
 msgid "Report a bug"
 msgstr ""
 
-#: includes/admin/class-wc-admin-help.php:208
-#: includes/admin/class-wc-admin-help.php:210
-#: includes/admin/class-wc-admin-help.php:212
-msgid "Setup Wizard"
+#: includes/admin/class-wc-admin-help.php:261
+#: includes/admin/class-wc-admin-help.php:263
+msgid "Education"
 msgstr ""
 
-#: includes/admin/class-wc-admin-help.php:211
+#: includes/admin/class-wc-admin-help.php:264
+msgid ""
+"If you would like to learn about using WooCommerce from an expert, consider "
+"following a WooCommerce course offered by one of our educational partners."
+msgstr ""
+
+#: includes/admin/class-wc-admin-help.php:265
+msgid "View education partners"
+msgstr ""
+
+#: includes/admin/class-wc-admin-help.php:270
+#: includes/admin/class-wc-admin-help.php:272
+#: includes/admin/class-wc-admin-help.php:274
+msgid "Setup wizard"
+msgstr ""
+
+#: includes/admin/class-wc-admin-help.php:273
 msgid ""
 "If you need to access the setup wizard again, please click on the button "
 "below."
 msgstr ""
 
-#: includes/admin/class-wc-admin-help.php:217
+#: includes/admin/class-wc-admin-help.php:279
 msgid "For more information:"
 msgstr ""
 
-#: includes/admin/class-wc-admin-help.php:218
+#: includes/admin/class-wc-admin-help.php:280
 msgid "About WooCommerce"
 msgstr ""
 
-#: includes/admin/class-wc-admin-help.php:219
-msgid "WordPress.org Project"
+#: includes/admin/class-wc-admin-help.php:281
+msgid "WordPress.org project"
 msgstr ""
 
-#: includes/admin/class-wc-admin-help.php:220
-msgid "Github Project"
+#: includes/admin/class-wc-admin-help.php:282
+msgid "Github project"
 msgstr ""
 
-#: includes/admin/class-wc-admin-help.php:221
-msgid "Official Themes"
+#: includes/admin/class-wc-admin-help.php:283
+msgid "Official themes"
 msgstr ""
 
-#: includes/admin/class-wc-admin-help.php:222
-msgid "Official Extensions"
+#: includes/admin/class-wc-admin-help.php:284
+msgid "Official extensions"
 msgstr ""
 
 #: includes/admin/class-wc-admin-importers.php:34
-msgid "WooCommerce Tax Rates (CSV)"
+msgid "WooCommerce tax rates (CSV)"
 msgstr ""
 
 #: includes/admin/class-wc-admin-importers.php:34
 msgid "Import <strong>tax rates</strong> to your store via a csv file."
 msgstr ""
 
+#: includes/admin/class-wc-admin-log-table-list.php:26
+msgid "log"
+msgstr ""
+
+#: includes/admin/class-wc-admin-log-table-list.php:27
+msgid "logs"
+msgstr ""
+
+#: includes/admin/class-wc-admin-log-table-list.php:40
+#: includes/admin/class-wc-admin-log-table-list.php:113
+msgid "Emergency"
+msgstr ""
+
+#: includes/admin/class-wc-admin-log-table-list.php:41
+#: includes/admin/class-wc-admin-log-table-list.php:114
+msgid "Alert"
+msgstr ""
+
+#: includes/admin/class-wc-admin-log-table-list.php:42
+#: includes/admin/class-wc-admin-log-table-list.php:115
+msgid "Critical"
+msgstr ""
+
+#: includes/admin/class-wc-admin-log-table-list.php:43
+#: includes/admin/class-wc-admin-log-table-list.php:116
+msgid "Error"
+msgstr ""
+
+#: includes/admin/class-wc-admin-log-table-list.php:44
+#: includes/admin/class-wc-admin-log-table-list.php:117
+msgid "Warning"
+msgstr ""
+
+#: includes/admin/class-wc-admin-log-table-list.php:45
+#: includes/admin/class-wc-admin-log-table-list.php:118
+msgid "Notice"
+msgstr ""
+
+#: includes/admin/class-wc-admin-log-table-list.php:46
+#: includes/admin/class-wc-admin-log-table-list.php:119
+msgid "Info"
+msgstr ""
+
+#: includes/admin/class-wc-admin-log-table-list.php:47
+#: includes/admin/class-wc-admin-log-table-list.php:120
+msgid "Debug"
+msgstr ""
+
+#: includes/admin/class-wc-admin-log-table-list.php:52
+msgid "Filter by level"
+msgstr ""
+
+#: includes/admin/class-wc-admin-log-table-list.php:54
+msgid "All levels"
+msgstr ""
+
+#: includes/admin/class-wc-admin-log-table-list.php:74
+msgid "Timestamp"
+msgstr ""
+
+#: includes/admin/class-wc-admin-log-table-list.php:75
+msgid "Level"
+msgstr ""
+
+#: includes/admin/class-wc-admin-log-table-list.php:76
+msgid "Message"
+msgstr ""
+
+#: includes/admin/class-wc-admin-log-table-list.php:77
+msgid "Source"
+msgstr ""
+
+#: includes/admin/class-wc-admin-log-table-list.php:173
+#: includes/widgets/class-wc-widget-price-filter.php:116
+msgid "Filter"
+msgstr ""
+
+#: includes/admin/class-wc-admin-log-table-list.php:209
+msgid "Filter by source"
+msgstr ""
+
+#: includes/admin/class-wc-admin-log-table-list.php:211
+msgid "All sources"
+msgstr ""
+
+#: includes/admin/class-wc-admin-menus.php:62
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:100
+msgid "Attributes"
+msgstr ""
+
 #: includes/admin/class-wc-admin-menus.php:72
-msgid "Sales Reports"
+msgid "Sales reports"
 msgstr ""
 
 #: includes/admin/class-wc-admin-menus.php:80
-msgid "WooCommerce Settings"
+msgid "WooCommerce settings"
 msgstr ""
 
-#: includes/admin/class-wc-admin-menus.php:105
-#: includes/admin/views/html-admin-page-addons.php:15
-msgid "WooCommerce Add-ons/Extensions"
+#: includes/admin/class-wc-admin-menus.php:80
+#: includes/admin/settings/class-wc-settings-api.php:45
+#: includes/admin/views/html-admin-page-status-report.php:411
+#: includes/class-wc-install.php:885
+msgid "Settings"
 msgstr ""
 
-#: includes/admin/class-wc-admin-menus.php:105
-msgid "Add-ons"
+#: includes/admin/class-wc-admin-menus.php:104
+msgid "WooCommerce extensions"
 msgstr ""
 
-#: includes/admin/class-wc-admin-menus.php:236
-msgid "WooCommerce Endpoints"
+#: includes/admin/class-wc-admin-menus.php:104
+msgid "Extensions"
 msgstr ""
 
-#: includes/admin/class-wc-admin-menus.php:269
-msgid "Select All"
+#: includes/admin/class-wc-admin-menus.php:234
+msgid "WooCommerce endpoints"
 msgstr ""
 
-#: includes/admin/class-wc-admin-menus.php:272
-msgid "Add to Menu"
+#: includes/admin/class-wc-admin-menus.php:250
+#: includes/admin/settings/class-wc-settings-accounts.php:167
+#: includes/class-wc-query.php:125
+msgid "Lost password"
 msgstr ""
 
-#: includes/admin/class-wc-admin-menus.php:305
+#: includes/admin/class-wc-admin-menus.php:282
+msgid "Add to menu"
+msgstr ""
+
+#: includes/admin/class-wc-admin-menus.php:315
 msgid "Visit Store"
 msgstr ""
 
-#: includes/admin/class-wc-admin-meta-boxes.php:105
-#: includes/admin/class-wc-admin-pointers.php:154
-msgid "Product Short Description"
+#: includes/admin/class-wc-admin-meta-boxes.php:119
+#: includes/admin/class-wc-admin-pointers.php:156
+msgid "Product short description"
 msgstr ""
 
-#: includes/admin/class-wc-admin-meta-boxes.php:106
+#: includes/admin/class-wc-admin-meta-boxes.php:120
 #: includes/admin/views/html-bulk-edit-product.php:15
 #: includes/admin/views/html-quick-edit-product.php:15
-msgid "Product Data"
+msgid "Product data"
 msgstr ""
 
-#: includes/admin/class-wc-admin-meta-boxes.php:107
-msgid "Product Gallery"
+#: includes/admin/class-wc-admin-meta-boxes.php:121
+msgid "Product gallery"
 msgstr ""
 
-#: includes/admin/class-wc-admin-meta-boxes.php:112
-msgid "%s Data"
+#: includes/admin/class-wc-admin-meta-boxes.php:126
+msgid "%s data"
 msgstr ""
 
-#: includes/admin/class-wc-admin-meta-boxes.php:113
-msgid "%s Items"
+#: includes/admin/class-wc-admin-meta-boxes.php:128
+msgid "%s notes"
 msgstr ""
 
-#: includes/admin/class-wc-admin-meta-boxes.php:114
-msgid "%s Notes"
+#: includes/admin/class-wc-admin-meta-boxes.php:129
+msgid "Downloadable product permissions"
 msgstr ""
 
-#: includes/admin/class-wc-admin-meta-boxes.php:115
-msgid "Downloadable Product Permissions"
-msgstr ""
-
-#: includes/admin/class-wc-admin-meta-boxes.php:115
+#: includes/admin/class-wc-admin-meta-boxes.php:129
 msgid ""
 "Note: Permissions for order items will automatically be granted when the "
 "order status changes to processing/completed."
 msgstr ""
 
-#: includes/admin/class-wc-admin-meta-boxes.php:116
-msgid "%s Actions"
+#: includes/admin/class-wc-admin-meta-boxes.php:130
+msgid "%s actions"
 msgstr ""
 
-#: includes/admin/class-wc-admin-meta-boxes.php:121
-msgid "Coupon Data"
+#: includes/admin/class-wc-admin-meta-boxes.php:134
+msgid "Coupon data"
 msgstr ""
 
-#: includes/admin/class-wc-admin-meta-boxes.php:126
+#: includes/admin/class-wc-admin-meta-boxes.php:138
 msgid "Rating"
 msgstr ""
 
-#: includes/admin/class-wc-admin-meta-boxes.php:162
-#: includes/admin/settings/class-wc-settings-products.php:463
-#: templates/single-product-reviews.php:34
+#: includes/admin/class-wc-admin-meta-boxes.php:174
+#: includes/admin/settings/class-wc-settings-products.php:461
+#: templates/single-product-reviews.php:36
 msgid "Reviews"
 msgstr ""
 
-#: includes/admin/class-wc-admin-notices.php:98
-#: includes/class-wc-checkout.php:74 includes/class-wc-checkout.php:83
+#: includes/admin/class-wc-admin-notices.php:132
+#: includes/class-wc-checkout.php:148 includes/class-wc-checkout.php:155
 #: includes/class-wc-emails.php:48 includes/class-wc-emails.php:57
 #: includes/class-wc-payment-gateways.php:51
-#: includes/class-wc-payment-gateways.php:60 includes/class-wc-shipping.php:65
-#: includes/class-wc-shipping.php:74 includes/emails/class-wc-email.php:682
-#: woocommerce.php:106 woocommerce.php:114
+#: includes/class-wc-payment-gateways.php:60 includes/class-wc-shipping.php:69
+#: includes/class-wc-shipping.php:78 includes/emails/class-wc-email.php:692
+#: woocommerce.php:140 woocommerce.php:148
 msgid "Cheatin&#8217; huh?"
 msgstr ""
 
-#: includes/admin/class-wc-admin-permalink-settings.php:36
-msgid "Product Permalinks"
-msgstr ""
-
-#: includes/admin/class-wc-admin-permalink-settings.php:41
-msgid "Product category base"
+#: includes/admin/class-wc-admin-permalink-settings.php:43
+msgid "Product permalinks"
 msgstr ""
 
 #: includes/admin/class-wc-admin-permalink-settings.php:48
-msgid "Product tag base"
+msgid "Product category base"
 msgstr ""
 
 #: includes/admin/class-wc-admin-permalink-settings.php:55
+msgid "Product tag base"
+msgstr ""
+
+#: includes/admin/class-wc-admin-permalink-settings.php:62
 msgid "Product attribute base"
 msgstr ""
 
-#: includes/admin/class-wc-admin-permalink-settings.php:96
+#: includes/admin/class-wc-admin-permalink-settings.php:102
 msgid "These settings control the permalinks used specifically for products."
 msgstr ""
 
-#: includes/admin/class-wc-admin-permalink-settings.php:115
-#: includes/admin/class-wc-admin-taxonomies.php:95
-#: includes/admin/class-wc-admin-taxonomies.php:184
+#: includes/admin/class-wc-admin-permalink-settings.php:118
+#: includes/admin/class-wc-admin-taxonomies.php:94
+#: includes/admin/class-wc-admin-taxonomies.php:202
 msgid "Default"
 msgstr ""
 
-#: includes/admin/class-wc-admin-permalink-settings.php:120
+#: includes/admin/class-wc-admin-permalink-settings.php:123
 msgid "Shop base"
 msgstr ""
 
-#: includes/admin/class-wc-admin-permalink-settings.php:124
+#: includes/admin/class-wc-admin-permalink-settings.php:127
 msgid "Shop base with category"
 msgstr ""
 
-#: includes/admin/class-wc-admin-permalink-settings.php:130
-msgid "Custom Base"
+#: includes/admin/class-wc-admin-permalink-settings.php:133
+msgid "Custom base"
 msgstr ""
 
-#: includes/admin/class-wc-admin-permalink-settings.php:132
+#: includes/admin/class-wc-admin-permalink-settings.php:135
 msgid ""
 "Enter a custom base to use. A base <strong>must</strong> be set or "
 "WordPress will use default instead."
 msgstr ""
 
-#: includes/admin/class-wc-admin-pointers.php:58
-msgid "Product Name"
+#: includes/admin/class-wc-admin-pointers.php:60
+#: includes/admin/class-wc-admin-post-types.php:1740
+msgid "Product name"
 msgstr ""
 
-#: includes/admin/class-wc-admin-pointers.php:59
+#: includes/admin/class-wc-admin-pointers.php:61
 msgid ""
 "Give your new product a name here. This is a required field and will be "
 "what your customers will see in your store."
 msgstr ""
 
-#: includes/admin/class-wc-admin-pointers.php:71
-#: templates/single-product/tabs/description.php:24
-msgid "Product Description"
+#: includes/admin/class-wc-admin-pointers.php:73
+msgid "Product description"
 msgstr ""
 
-#: includes/admin/class-wc-admin-pointers.php:72
+#: includes/admin/class-wc-admin-pointers.php:74
 msgid ""
 "This is your products main body of content. Here you should describe your "
 "product in detail."
 msgstr ""
 
-#: includes/admin/class-wc-admin-pointers.php:87
-msgid "Choose Product Type"
+#: includes/admin/class-wc-admin-pointers.php:89
+msgid "Choose product type"
 msgstr ""
 
-#: includes/admin/class-wc-admin-pointers.php:88
+#: includes/admin/class-wc-admin-pointers.php:90
 msgid ""
 "Choose a type for this product. Simple is suitable for most physical goods "
 "and services (we recommend setting up a simple product for now)."
 msgstr ""
 
-#: includes/admin/class-wc-admin-pointers.php:89
+#: includes/admin/class-wc-admin-pointers.php:91
 msgid "Variable is for more complex products such as t-shirts with multiple sizes."
 msgstr ""
 
-#: includes/admin/class-wc-admin-pointers.php:90
+#: includes/admin/class-wc-admin-pointers.php:92
 msgid "Grouped products are for grouping several simple products into one."
 msgstr ""
 
-#: includes/admin/class-wc-admin-pointers.php:91
+#: includes/admin/class-wc-admin-pointers.php:93
 msgid "Finally, external products are for linking off-site."
 msgstr ""
 
-#: includes/admin/class-wc-admin-pointers.php:106
-msgid "Virtual Products"
+#: includes/admin/class-wc-admin-pointers.php:108
+msgid "Virtual products"
 msgstr ""
 
-#: includes/admin/class-wc-admin-pointers.php:107
+#: includes/admin/class-wc-admin-pointers.php:109
 msgid ""
 "Check the \"Virtual\" box if this is a non-physical item, for example a "
 "service, which does not need shipping."
 msgstr ""
 
-#: includes/admin/class-wc-admin-pointers.php:122
+#: includes/admin/class-wc-admin-pointers.php:124
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:68
 #: includes/admin/settings/class-wc-settings-products.php:47
-#: includes/admin/settings/class-wc-settings-products.php:364
-msgid "Downloadable Products"
+#: includes/admin/settings/class-wc-settings-products.php:362
+msgid "Downloadable products"
 msgstr ""
 
-#: includes/admin/class-wc-admin-pointers.php:123
+#: includes/admin/class-wc-admin-pointers.php:125
 msgid ""
 "If purchasing this product gives a customer access to a downloadable file, "
 "e.g. software, check this box."
 msgstr ""
 
-#: includes/admin/class-wc-admin-pointers.php:138
+#: includes/admin/class-wc-admin-pointers.php:140
 msgid "Prices"
 msgstr ""
 
-#: includes/admin/class-wc-admin-pointers.php:139
+#: includes/admin/class-wc-admin-pointers.php:141
 msgid "Next you'll need to give your product a price."
 msgstr ""
 
-#: includes/admin/class-wc-admin-pointers.php:155
+#: includes/admin/class-wc-admin-pointers.php:157
 msgid ""
 "Add a quick summary for your product here. This will appear on the product "
 "page under the product name."
 msgstr ""
 
-#: includes/admin/class-wc-admin-pointers.php:166
+#: includes/admin/class-wc-admin-pointers.php:168
 #: includes/admin/settings/class-wc-settings-products.php:176
-msgid "Product Images"
+msgid "Product images"
 msgstr ""
 
-#: includes/admin/class-wc-admin-pointers.php:167
+#: includes/admin/class-wc-admin-pointers.php:169
 msgid ""
 "Upload or assign an image to your product here. This image will be shown in "
 "your store's catalog."
 msgstr ""
 
-#: includes/admin/class-wc-admin-pointers.php:178
-#: includes/class-wc-post-types.php:98 includes/class-wc-post-types.php:100
+#: includes/admin/class-wc-admin-pointers.php:180
+#: includes/class-wc-post-types.php:117 includes/class-wc-post-types.php:119
 #: includes/widgets/class-wc-widget-product-tag-cloud.php:29
-msgid "Product Tags"
+msgid "Product tags"
 msgstr ""
 
-#: includes/admin/class-wc-admin-pointers.php:179
+#: includes/admin/class-wc-admin-pointers.php:181
 msgid ""
 "You can optionally \"tag\" your products here. Tags as a method of labeling "
 "your products to make them easier for customers to find."
 msgstr ""
 
-#: includes/admin/class-wc-admin-pointers.php:190
-#: includes/class-wc-post-types.php:63 includes/class-wc-post-types.php:65
+#: includes/admin/class-wc-admin-pointers.php:192
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:189
+#: includes/class-wc-post-types.php:83
 #: includes/widgets/class-wc-widget-product-categories.php:43
-msgid "Product Categories"
+msgid "Product categories"
 msgstr ""
 
-#: includes/admin/class-wc-admin-pointers.php:191
+#: includes/admin/class-wc-admin-pointers.php:193
 msgid ""
 "Optionally assign categories to your products to make them easier to browse "
 "through and find in your store."
 msgstr ""
 
-#: includes/admin/class-wc-admin-pointers.php:202
-msgid "Publish Your Product!"
+#: includes/admin/class-wc-admin-pointers.php:204
+msgid "Publish your product!"
 msgstr ""
 
-#: includes/admin/class-wc-admin-pointers.php:203
+#: includes/admin/class-wc-admin-pointers.php:205
 msgid ""
 "When you are finished editing your product, hit the \"Publish\" button to "
 "publish your product to your store."
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:122
+#: includes/admin/class-wc-admin-post-types.php:133
 msgid "Product updated. <a href=\"%s\">View Product</a>"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:123
-#: includes/admin/class-wc-admin-post-types.php:138
+#: includes/admin/class-wc-admin-post-types.php:134
 #: includes/admin/class-wc-admin-post-types.php:154
+#: includes/admin/class-wc-admin-post-types.php:172
 msgid "Custom field updated."
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:124
-#: includes/admin/class-wc-admin-post-types.php:139
+#: includes/admin/class-wc-admin-post-types.php:135
 #: includes/admin/class-wc-admin-post-types.php:155
+#: includes/admin/class-wc-admin-post-types.php:173
 msgid "Custom field deleted."
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:125
+#: includes/admin/class-wc-admin-post-types.php:136
 msgid "Product updated."
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:126
+#: includes/admin/class-wc-admin-post-types.php:138
+#. translators: %s: revision title
 msgid "Product restored to revision from %s"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:127
+#: includes/admin/class-wc-admin-post-types.php:140
+#. translators: %s: product url
 msgid "Product published. <a href=\"%s\">View Product</a>"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:128
+#: includes/admin/class-wc-admin-post-types.php:141
 msgid "Product saved."
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:129
-msgid "Product submitted. <a target=\"_blank\" href=\"%s\">Preview Product</a>"
-msgstr ""
-
-#: includes/admin/class-wc-admin-post-types.php:130
-msgid ""
-"Product scheduled for: <strong>%1$s</strong>. <a target=\"_blank\" "
-"href=\"%2$s\">Preview Product</a>"
-msgstr ""
-
-#: includes/admin/class-wc-admin-post-types.php:131
-#: includes/admin/class-wc-admin-post-types.php:146
-#: includes/admin/class-wc-admin-post-types.php:162
-#: includes/admin/settings/views/html-webhook-log.php:10
-#: includes/admin/settings/views/html-webhooks-edit.php:126
-#: includes/admin/settings/views/html-webhooks-edit.php:135
-#: includes/admin/settings/views/html-webhooks-edit.php:143
-msgid "M j, Y @ G:i"
-msgstr ""
-
-#: includes/admin/class-wc-admin-post-types.php:132
-msgid "Product draft updated. <a target=\"_blank\" href=\"%s\">Preview Product</a>"
-msgstr ""
-
-#: includes/admin/class-wc-admin-post-types.php:137
-#: includes/admin/class-wc-admin-post-types.php:140
-#: includes/admin/class-wc-admin-post-types.php:142
-msgid "Order updated."
-msgstr ""
-
-#: includes/admin/class-wc-admin-post-types.php:141
-msgid "Order restored to revision from %s"
-msgstr ""
-
 #: includes/admin/class-wc-admin-post-types.php:143
-msgid "Order saved."
-msgstr ""
-
-#: includes/admin/class-wc-admin-post-types.php:144
-msgid "Order submitted."
+#. translators: %s: product url
+msgid "Product submitted. <a target=\"_blank\" href=\"%s\">Preview product</a>"
 msgstr ""
 
 #: includes/admin/class-wc-admin-post-types.php:145
-msgid "Order scheduled for: <strong>%1$s</strong>."
+#. translators: 1: date 2: product url
+msgid ""
+"Product scheduled for: <strong>%1$s</strong>. <a target=\"_blank\" "
+"href=\"%2$s\">Preview product</a>"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:147
-msgid "Order draft updated."
+#: includes/admin/class-wc-admin-post-types.php:146
+#: includes/admin/class-wc-admin-post-types.php:164
+#: includes/admin/class-wc-admin-post-types.php:182
+#: includes/admin/settings/views/html-webhook-log.php:10
+#: includes/admin/settings/views/html-webhooks-edit.php:143
+#: includes/admin/settings/views/html-webhooks-edit.php:152
+#: includes/admin/settings/views/html-webhooks-edit.php:160
+msgid "M j, Y @ G:i"
 msgstr ""
 
 #: includes/admin/class-wc-admin-post-types.php:148
-msgid "Order updated and email sent."
+#. translators: %s: product url
+msgid "Product draft updated. <a target=\"_blank\" href=\"%s\">Preview product</a>"
 msgstr ""
 
 #: includes/admin/class-wc-admin-post-types.php:153
 #: includes/admin/class-wc-admin-post-types.php:156
-#: includes/admin/class-wc-admin-post-types.php:158
-msgid "Coupon updated."
-msgstr ""
-
-#: includes/admin/class-wc-admin-post-types.php:157
-msgid "Coupon restored to revision from %s"
-msgstr ""
-
 #: includes/admin/class-wc-admin-post-types.php:159
-msgid "Coupon saved."
+msgid "Order updated."
+msgstr ""
+
+#: includes/admin/class-wc-admin-post-types.php:158
+#. translators: %s: revision title
+msgid "Order restored to revision from %s"
 msgstr ""
 
 #: includes/admin/class-wc-admin-post-types.php:160
-msgid "Coupon submitted."
+msgid "Order saved."
 msgstr ""
 
 #: includes/admin/class-wc-admin-post-types.php:161
-msgid "Coupon scheduled for: <strong>%1$s</strong>."
+msgid "Order submitted."
 msgstr ""
 
 #: includes/admin/class-wc-admin-post-types.php:163
-msgid "Coupon draft updated."
+#. translators: %s: date
+msgid "Order scheduled for: <strong>%1$s</strong>."
+msgstr ""
+
+#: includes/admin/class-wc-admin-post-types.php:165
+msgid "Order draft updated."
+msgstr ""
+
+#: includes/admin/class-wc-admin-post-types.php:166
+msgid "Order updated and email sent."
+msgstr ""
+
+#: includes/admin/class-wc-admin-post-types.php:171
+#: includes/admin/class-wc-admin-post-types.php:174
+#: includes/admin/class-wc-admin-post-types.php:177
+msgid "Coupon updated."
+msgstr ""
+
+#: includes/admin/class-wc-admin-post-types.php:176
+#. translators: %s: revision title
+msgid "Coupon restored to revision from %s"
 msgstr ""
 
 #: includes/admin/class-wc-admin-post-types.php:178
+msgid "Coupon saved."
+msgstr ""
+
+#: includes/admin/class-wc-admin-post-types.php:179
+msgid "Coupon submitted."
+msgstr ""
+
+#: includes/admin/class-wc-admin-post-types.php:181
+#. translators: %s: date
+msgid "Coupon scheduled for: <strong>%1$s</strong>."
+msgstr ""
+
+#: includes/admin/class-wc-admin-post-types.php:183
+msgid "Coupon draft updated."
+msgstr ""
+
+#: includes/admin/class-wc-admin-post-types.php:199
+#. translators: %s: product count
 msgid "%s product updated."
 msgid_plural "%s products updated."
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/admin/class-wc-admin-post-types.php:179
+#: includes/admin/class-wc-admin-post-types.php:201
+#. translators: %s: product count
 msgid "%s product not updated, somebody is editing it."
 msgid_plural "%s products not updated, somebody is editing them."
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/admin/class-wc-admin-post-types.php:180
+#: includes/admin/class-wc-admin-post-types.php:203
+#. translators: %s: product count
 msgid "%s product permanently deleted."
 msgid_plural "%s products permanently deleted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/admin/class-wc-admin-post-types.php:181
+#: includes/admin/class-wc-admin-post-types.php:205
+#. translators: %s: product count
 msgid "%s product moved to the Trash."
 msgid_plural "%s products moved to the Trash."
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/admin/class-wc-admin-post-types.php:182
+#: includes/admin/class-wc-admin-post-types.php:207
+#. translators: %s: product count
 msgid "%s product restored from the Trash."
 msgid_plural "%s products restored from the Trash."
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/admin/class-wc-admin-post-types.php:186
+#: includes/admin/class-wc-admin-post-types.php:212
+#. translators: %s: order count
 msgid "%s order updated."
 msgid_plural "%s orders updated."
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/admin/class-wc-admin-post-types.php:187
+#: includes/admin/class-wc-admin-post-types.php:214
+#. translators: %s: order count
 msgid "%s order not updated, somebody is editing it."
 msgid_plural "%s orders not updated, somebody is editing them."
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/admin/class-wc-admin-post-types.php:188
+#: includes/admin/class-wc-admin-post-types.php:216
+#. translators: %s: order count
 msgid "%s order permanently deleted."
 msgid_plural "%s orders permanently deleted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/admin/class-wc-admin-post-types.php:189
+#: includes/admin/class-wc-admin-post-types.php:218
+#. translators: %s: order count
 msgid "%s order moved to the Trash."
 msgid_plural "%s orders moved to the Trash."
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/admin/class-wc-admin-post-types.php:190
+#: includes/admin/class-wc-admin-post-types.php:220
+#. translators: %s: order count
 msgid "%s order restored from the Trash."
 msgid_plural "%s orders restored from the Trash."
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/admin/class-wc-admin-post-types.php:194
+#: includes/admin/class-wc-admin-post-types.php:225
+#. translators: %s: coupon count
 msgid "%s coupon updated."
 msgid_plural "%s coupons updated."
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/admin/class-wc-admin-post-types.php:195
+#: includes/admin/class-wc-admin-post-types.php:227
+#. translators: %s: coupon count
 msgid "%s coupon not updated, somebody is editing it."
 msgid_plural "%s coupons not updated, somebody is editing them."
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/admin/class-wc-admin-post-types.php:196
+#: includes/admin/class-wc-admin-post-types.php:229
+#. translators: %s: coupon count
 msgid "%s coupon permanently deleted."
 msgid_plural "%s coupons permanently deleted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/admin/class-wc-admin-post-types.php:197
+#: includes/admin/class-wc-admin-post-types.php:231
+#. translators: %s: coupon count
 msgid "%s coupon moved to the Trash."
 msgid_plural "%s coupons moved to the Trash."
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/admin/class-wc-admin-post-types.php:198
+#: includes/admin/class-wc-admin-post-types.php:233
+#. translators: %s: coupon count
 msgid "%s coupon restored from the Trash."
 msgid_plural "%s coupons restored from the Trash."
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/admin/class-wc-admin-post-types.php:218
-#: includes/admin/class-wc-admin-taxonomies.php:300
+#: includes/admin/class-wc-admin-post-types.php:253
+#: includes/admin/class-wc-admin-taxonomies.php:319
 msgid "Image"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:222
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:140
-#: includes/admin/meta-boxes/views/html-variation-admin.php:68
+#: includes/admin/class-wc-admin-post-types.php:257
+#: includes/admin/meta-boxes/views/html-product-data-inventory.php:9
+#: includes/admin/meta-boxes/views/html-variation-admin.php:64
 #: includes/admin/views/html-quick-edit-product.php:22
 msgid "SKU"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:226
+#: includes/admin/class-wc-admin-post-types.php:261
 #: includes/admin/class-wc-admin-reports.php:91
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:696
-#: includes/admin/reports/class-wc-report-stock.php:29
-#: includes/admin/reports/class-wc-report-stock.php:30
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:60
+#: includes/admin/reports/class-wc-report-stock.php:34
+#: includes/admin/reports/class-wc-report-stock.php:35
 msgid "Stock"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:229
+#: includes/admin/class-wc-admin-post-types.php:264
 #: includes/admin/views/html-bulk-edit-product.php:21
 #: includes/admin/views/html-quick-edit-product.php:33
 #: includes/widgets/class-wc-widget-products.php:56 templates/cart/cart.php:36
-#: templates/cart/cart.php:95 templates/emails/email-order-details.php:35
+#: templates/cart/cart.php:96 templates/emails/email-order-details.php:38
 msgid "Price"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:230
-#: includes/admin/reports/class-wc-report-sales-by-category.php:164
+#: includes/admin/class-wc-admin-post-types.php:265
+#: includes/admin/reports/class-wc-report-sales-by-category.php:193
+#: includes/class-wc-post-types.php:81
 msgid "Categories"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:231
+#: includes/admin/class-wc-admin-post-types.php:266
 msgid "Tags"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:234
-#: includes/admin/class-wc-admin-post-types.php:274
-#: includes/admin/reports/class-wc-report-coupon-usage.php:341
-#: includes/admin/reports/class-wc-report-customers.php:210
-#: includes/admin/reports/class-wc-report-sales-by-category.php:235
-#: includes/admin/reports/class-wc-report-sales-by-date.php:455
-#: includes/admin/reports/class-wc-report-sales-by-product.php:365
+#: includes/admin/class-wc-admin-post-types.php:269
+#: includes/admin/class-wc-admin-post-types.php:308
+#: includes/admin/reports/class-wc-report-coupon-usage.php:351
+#: includes/admin/reports/class-wc-report-customers.php:227
+#: includes/admin/reports/class-wc-report-sales-by-category.php:264
+#: includes/admin/reports/class-wc-report-sales-by-date.php:517
+#: includes/admin/reports/class-wc-report-sales-by-product.php:377
 #: includes/admin/settings/views/html-webhook-logs.php:17
 #: includes/admin/settings/views/html-webhook-logs.php:25
+#: includes/wc-account-functions.php:184
 #: includes/widgets/class-wc-widget-products.php:55
-#: templates/myaccount/my-orders.php:26
+#: templates/myaccount/my-orders.php:14
 msgid "Date"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:248
+#: includes/admin/class-wc-admin-post-types.php:283
 msgid "Code"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:249
+#: includes/admin/class-wc-admin-post-types.php:284
 msgid "Coupon type"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:250
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:68
-#: includes/admin/reports/class-wc-report-sales-by-date.php:566
+#: includes/admin/class-wc-admin-post-types.php:285
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:78
+#: includes/admin/reports/class-wc-report-sales-by-date.php:637
 msgid "Coupon amount"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:252
+#: includes/admin/class-wc-admin-post-types.php:287
 msgid "Product IDs"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:253
+#: includes/admin/class-wc-admin-post-types.php:288
 msgid "Usage / Limit"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:254
+#: includes/admin/class-wc-admin-post-types.php:289
 msgid "Expiry date"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:267
+#: includes/admin/class-wc-admin-post-types.php:302
 #: includes/admin/class-wc-admin-webhooks-table-list.php:41
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:680
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:44
 #: includes/admin/settings/views/html-webhook-log.php:25
-#: includes/admin/settings/views/html-webhooks-edit.php:24
-#: templates/myaccount/my-orders.php:27
+#: includes/admin/settings/views/html-webhooks-edit.php:28
+#: includes/wc-account-functions.php:185 templates/myaccount/my-orders.php:15
 msgid "Status"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:268
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:163
-#: includes/gateways/paypal/includes/class-wc-gateway-paypal-request.php:182
-#: templates/myaccount/my-orders.php:25
+#: includes/admin/class-wc-admin-post-types.php:303
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:165
+#: includes/gateways/paypal/includes/class-wc-gateway-paypal-request.php:204
+#: includes/wc-account-functions.php:183 templates/myaccount/my-orders.php:13
 msgid "Order"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:269
-msgid "Purchased"
-msgstr ""
-
-#: includes/admin/class-wc-admin-post-types.php:270
+#: includes/admin/class-wc-admin-post-types.php:304
 msgid "Billing"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:271
+#: includes/admin/class-wc-admin-post-types.php:305
 msgid "Ship to"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:272
-msgid "Customer Message"
+#: includes/admin/class-wc-admin-post-types.php:306
+msgid "Customer message"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:273
-#: includes/class-wc-checkout.php:125
-msgid "Order Notes"
+#: includes/admin/class-wc-admin-post-types.php:307
+#: includes/class-wc-checkout.php:194
+msgid "Order notes"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:275
-#: includes/admin/meta-boxes/views/html-order-items.php:57
-#: includes/admin/reports/class-wc-report-taxes-by-code.php:172
-#: templates/cart/cart-totals.php:90 templates/cart/cart-totals.php:91
-#: templates/cart/cart.php:38 templates/cart/cart.php:118
-#: templates/checkout/review-order.php:26
-#: templates/checkout/review-order.php:105 templates/myaccount/my-orders.php:28
-#: templates/order/order-details.php:31
+#: includes/admin/class-wc-admin-post-types.php:309
+#: includes/admin/meta-boxes/views/html-order-items.php:32
+#: includes/admin/reports/class-wc-report-taxes-by-code.php:177
+#: includes/wc-account-functions.php:186 templates/cart/cart-totals.php:92
+#: templates/cart/cart-totals.php:93 templates/cart/cart.php:38
+#: templates/cart/cart.php:119 templates/checkout/review-order.php:27
+#: templates/checkout/review-order.php:106 templates/myaccount/my-orders.php:16
+#: templates/order/order-details.php:38
 msgid "Total"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:276
-#: includes/admin/meta-boxes/class-wc-meta-box-order-actions.php:41
-#: includes/admin/meta-boxes/views/html-order-items.php:221
-#: includes/admin/reports/class-wc-report-customer-list.php:235
-#: includes/admin/reports/class-wc-report-stock.php:159
+#: includes/admin/class-wc-admin-post-types.php:310
+#: includes/admin/meta-boxes/class-wc-meta-box-order-actions.php:43
+#: includes/admin/reports/class-wc-report-customer-list.php:215
+#: includes/admin/reports/class-wc-report-stock.php:168
 msgid "Actions"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:351
+#: includes/admin/class-wc-admin-post-types.php:388
 msgid "Grouped"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:353
+#: includes/admin/class-wc-admin-post-types.php:390
 msgid "External/Affiliate"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:357
-#: includes/admin/class-wc-admin-post-types.php:1691
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:57
-#: includes/admin/meta-boxes/views/html-variation-admin.php:80
+#: includes/admin/class-wc-admin-post-types.php:394
+#: includes/admin/class-wc-admin-post-types.php:1498
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:59
+#: includes/admin/meta-boxes/views/html-variation-admin.php:81
 msgid "Virtual"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:359
-#: includes/admin/class-wc-admin-post-types.php:1683
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:64
-#: includes/admin/meta-boxes/views/html-variation-admin.php:78
+#: includes/admin/class-wc-admin-post-types.php:396
+#: includes/admin/class-wc-admin-post-types.php:1490
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:66
+#: includes/admin/meta-boxes/views/html-variation-admin.php:77
 msgid "Downloadable"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:361
+#: includes/admin/class-wc-admin-post-types.php:398
 msgid "Simple"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:365
+#: includes/admin/class-wc-admin-post-types.php:401
 msgid "Variable"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:389
+#: includes/admin/class-wc-admin-post-types.php:425
 msgid "Toggle featured"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:391
-#: includes/admin/class-wc-admin-post-types.php:631
-#: includes/admin/class-wc-admin-post-types.php:712
-#: includes/admin/class-wc-admin-post-types.php:714
-#: includes/admin/class-wc-admin-post-types.php:716
-#: includes/admin/settings/class-wc-settings-checkout.php:312
-#: includes/admin/settings/class-wc-settings-emails.php:269
-#: includes/admin/settings/class-wc-settings-shipping.php:211
+#: includes/admin/class-wc-admin-post-types.php:427
+#: includes/admin/class-wc-admin-post-types.php:544
+#: includes/admin/class-wc-admin-post-types.php:592
+#: includes/admin/class-wc-admin-post-types.php:595
+#: includes/admin/class-wc-admin-post-types.php:598
+#: includes/admin/settings/class-wc-settings-checkout.php:328
+#: includes/admin/settings/class-wc-settings-emails.php:274
+#: includes/admin/settings/class-wc-settings-shipping.php:244
 #: includes/admin/views/html-bulk-edit-product.php:205
-#: includes/admin/views/html-bulk-edit-product.php:242
-#: includes/admin/views/html-bulk-edit-product.php:303
+#: includes/admin/views/html-bulk-edit-product.php:239
+#: includes/admin/views/html-bulk-edit-product.php:296
 msgid "Yes"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:393
+#: includes/admin/class-wc-admin-post-types.php:429
+#: includes/admin/settings/class-wc-settings-shipping.php:245
 #: includes/admin/views/html-bulk-edit-product.php:206
-#: includes/admin/views/html-bulk-edit-product.php:243
-#: includes/admin/views/html-bulk-edit-product.php:304
+#: includes/admin/views/html-bulk-edit-product.php:240
+#: includes/admin/views/html-bulk-edit-product.php:297
 msgid "No"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:439
-msgid "Edit this item"
+#: includes/admin/class-wc-admin-post-types.php:436
+#: includes/admin/reports/class-wc-report-stock.php:108
+#: includes/wc-formatting-functions.php:970
+#: includes/wc-product-functions.php:802
+msgid "In stock"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:440
-msgid "Edit this item inline"
+#: includes/admin/class-wc-admin-post-types.php:504
+#. translators: 1: count 2: limit
+msgid "%1$s / %2$s"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:440
-msgid "Quick&nbsp;Edit"
+#: includes/admin/class-wc-admin-post-types.php:540
+msgid "Y-m-d"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:444
-#: includes/admin/class-wc-admin-post-types.php:575
-#: includes/admin/class-wc-admin-webhooks-table-list.php:104
-msgid "Restore this item from the Trash"
+#: includes/admin/class-wc-admin-post-types.php:559
+#: templates/order/order-details-customer.php:46
+msgid "Phone:"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:444
-#: includes/admin/class-wc-admin-post-types.php:575
-#: includes/admin/class-wc-admin-webhooks-table-list.php:104
-#: includes/admin/class-wc-admin-webhooks-table-list.php:246
-msgid "Restore"
-msgstr ""
-
-#: includes/admin/class-wc-admin-post-types.php:446
-#: includes/admin/class-wc-admin-post-types.php:577
-#: includes/admin/class-wc-admin-webhooks-table-list.php:106
-msgid "Move this item to the Trash"
-msgstr ""
-
-#: includes/admin/class-wc-admin-post-types.php:446
-#: includes/admin/class-wc-admin-post-types.php:577
-#: includes/admin/class-wc-admin-webhooks-table-list.php:106
-msgid "Trash"
-msgstr ""
-
-#: includes/admin/class-wc-admin-post-types.php:450
-#: includes/admin/class-wc-admin-post-types.php:581
-#: includes/admin/class-wc-admin-webhooks-table-list.php:109
-msgid "Delete this item permanently"
-msgstr ""
-
-#: includes/admin/class-wc-admin-post-types.php:450
-#: includes/admin/class-wc-admin-post-types.php:581
-#: includes/admin/class-wc-admin-webhooks-table-list.php:109
-#: includes/admin/class-wc-admin-webhooks-table-list.php:247
-#: includes/admin/meta-boxes/class-wc-meta-box-order-actions.php:74
-#: includes/admin/settings/views/html-webhooks-edit.php:153
-msgid "Delete Permanently"
-msgstr ""
-
-#: includes/admin/class-wc-admin-post-types.php:456
-msgid "Preview &#8220;%s&#8221;"
-msgstr ""
-
-#: includes/admin/class-wc-admin-post-types.php:456
-msgid "Preview"
-msgstr ""
-
-#: includes/admin/class-wc-admin-post-types.php:458
-msgid "View &#8220;%s&#8221;"
-msgstr ""
-
-#: includes/admin/class-wc-admin-post-types.php:458
-#: includes/admin/class-wc-admin-post-types.php:792
-#: includes/admin/reports/class-wc-report-stock.php:133
-#: includes/admin/views/html-admin-page-status-logs.php:24
-#: templates/myaccount/my-orders.php:88
-msgid "View"
-msgstr ""
-
-#: includes/admin/class-wc-admin-post-types.php:529
-msgid "%s / %s"
-msgstr ""
-
-#: includes/admin/class-wc-admin-post-types.php:531
-msgid "%s / &infin;"
-msgstr ""
-
-#: includes/admin/class-wc-admin-post-types.php:620
-msgid "Unpublished"
-msgstr ""
-
-#: includes/admin/class-wc-admin-post-types.php:622
-msgid "Y/m/d g:i:s A"
-msgstr ""
-
-#: includes/admin/class-wc-admin-post-types.php:623
-msgid "Y/m/d"
-msgstr ""
-
-#: includes/admin/class-wc-admin-post-types.php:639
-#: includes/admin/reports/class-wc-report-sales-by-date.php:392
-msgid "%d item"
-msgid_plural "%d items"
-msgstr[0] ""
-msgstr[1] ""
-
-#: includes/admin/class-wc-admin-post-types.php:679
-msgid "Tel:"
-msgstr ""
-
-#: includes/admin/class-wc-admin-post-types.php:692
-#: includes/admin/class-wc-admin-post-types.php:728
+#: includes/admin/class-wc-admin-post-types.php:572
+#: includes/admin/class-wc-admin-post-types.php:609
 msgid "Via"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:714
+#: includes/admin/class-wc-admin-post-types.php:595
+#. translators: %d: notes count
 msgid "plus %d other note"
 msgid_plural "plus %d other notes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/admin/class-wc-admin-post-types.php:716
+#: includes/admin/class-wc-admin-post-types.php:598
+#. translators: %d: notes count
 msgid "%d note"
 msgid_plural "%d notes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/admin/class-wc-admin-post-types.php:753
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:235
+#: includes/admin/class-wc-admin-post-types.php:625
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:265
 msgid "Guest"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:763
+#: includes/admin/class-wc-admin-post-types.php:630
+#. translators: 1: order and number (i.e. Order #13) 2: user name
+msgid "%1$s by %2$s"
+msgstr ""
+
+#: includes/admin/class-wc-admin-post-types.php:639
 msgid "Show more details"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:777
+#: includes/admin/class-wc-admin-post-types.php:653
 msgid "Processing"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:785
+#: includes/admin/class-wc-admin-post-types.php:661
 msgid "Complete"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:939
-msgid "Sort Products"
+#: includes/admin/class-wc-admin-post-types.php:668
+#: includes/admin/reports/class-wc-report-stock.php:134
+#: includes/admin/views/html-admin-page-status-logs.php:28
+#: templates/myaccount/my-orders.php:79 templates/myaccount/orders.php:75
+msgid "View"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:1420
-#: includes/admin/class-wc-admin-post-types.php:1421
+#: includes/admin/class-wc-admin-post-types.php:795
+msgid "Sort products"
+msgstr ""
+
+#: includes/admin/class-wc-admin-post-types.php:1281
 msgid "Mark processing"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:1423
-#: includes/admin/class-wc-admin-post-types.php:1424
+#: includes/admin/class-wc-admin-post-types.php:1282
 msgid "Mark on-hold"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:1426
-#: includes/admin/class-wc-admin-post-types.php:1427
+#: includes/admin/class-wc-admin-post-types.php:1283
 msgid "Mark complete"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:1463
+#: includes/admin/class-wc-admin-post-types.php:1318
 msgid "Order status changed by bulk edit:"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:1497
+#: includes/admin/class-wc-admin-post-types.php:1353
+#. translators: %s: orders count
 msgid "Order status changed."
 msgid_plural "%s order statuses changed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/admin/class-wc-admin-post-types.php:1643
+#: includes/admin/class-wc-admin-post-types.php:1450
 msgid "Show all product types"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:1656
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:40
-#: includes/wc-product-functions.php:516
+#: includes/admin/class-wc-admin-post-types.php:1463
+#: includes/wc-product-functions.php:523
 msgid "Grouped product"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:1659
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:41
-#: includes/wc-product-functions.php:517
+#: includes/admin/class-wc-admin-post-types.php:1466
+#: includes/wc-product-functions.php:524
 msgid "External/Affiliate product"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:1662
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:42
-#: includes/wc-product-functions.php:518
+#: includes/admin/class-wc-admin-post-types.php:1469
+#: includes/wc-product-functions.php:525
 msgid "Variable product"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:1665
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:39
-#: includes/wc-product-functions.php:515
+#: includes/admin/class-wc-admin-post-types.php:1472
+#: includes/wc-product-functions.php:522
 msgid "Simple product"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:1706
+#: includes/admin/class-wc-admin-post-types.php:1513
 msgid "Show all types"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:1735
+#: includes/admin/class-wc-admin-post-types.php:1542
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:258
 #: includes/admin/settings/views/html-keys-edit.php:35
+#: includes/class-wc-ajax.php:1244
+#. translators: 1: user display name 2: user ID 3: user email
+msgid "%1$s (#%2$s &ndash; %3$s)"
+msgstr ""
+
+#: includes/admin/class-wc-admin-post-types.php:1549
 msgid "Search for a customer&hellip;"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:2080
-msgid "Product name"
-msgstr ""
-
-#: includes/admin/class-wc-admin-post-types.php:2083
-#: templates/cart/cart.php:136 templates/checkout/form-coupon.php:35
+#: includes/admin/class-wc-admin-post-types.php:1743
+#: templates/cart/cart.php:137 templates/checkout/form-coupon.php:36
 msgid "Coupon code"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:2097
+#: includes/admin/class-wc-admin-post-types.php:1757
 msgid "Description (optional)"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:2113
-msgid "Insert into %s"
-msgstr ""
-
-#: includes/admin/class-wc-admin-post-types.php:2114
-msgid "Uploaded to this %s"
-msgstr ""
-
-#: includes/admin/class-wc-admin-post-types.php:2148
-msgid "Catalog/search"
-msgstr ""
-
-#: includes/admin/class-wc-admin-post-types.php:2149
-#: includes/admin/views/html-bulk-edit-product.php:187
-#: includes/admin/views/html-quick-edit-product.php:144
-msgid "Catalog"
-msgstr ""
-
-#: includes/admin/class-wc-admin-post-types.php:2150
-#: includes/admin/views/html-bulk-edit-product.php:188
-#: includes/admin/views/html-quick-edit-product.php:145
-msgid "Search"
-msgstr ""
-
-#: includes/admin/class-wc-admin-post-types.php:2151
-#: includes/admin/views/html-bulk-edit-product.php:189
-#: includes/admin/views/html-quick-edit-product.php:146
-msgid "Hidden"
-msgstr ""
-
-#: includes/admin/class-wc-admin-post-types.php:2155
+#: includes/admin/class-wc-admin-post-types.php:1793
 msgid "Catalog visibility:"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:2171
+#: includes/admin/class-wc-admin-post-types.php:1809
 msgid ""
 "Choose where this product should be displayed in your catalog. The product "
 "will always be accessible directly."
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:2177
+#: includes/admin/class-wc-admin-post-types.php:1815
 msgid "Enable this option to feature this product."
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:2179
-msgid "Featured Product"
+#: includes/admin/class-wc-admin-post-types.php:1817
+msgid "Featured product"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:2182
+#: includes/admin/class-wc-admin-post-types.php:1820
 msgid "OK"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:2183
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:175
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:744
-#: includes/admin/meta-boxes/views/html-order-items.php:261
-#: includes/admin/meta-boxes/views/html-order-items.php:307
-#: templates/myaccount/my-orders.php:92
+#: includes/admin/class-wc-admin-post-types.php:1821
+#: includes/admin/meta-boxes/views/html-order-items.php:226
+#: includes/admin/meta-boxes/views/html-order-items.php:268
+#: includes/admin/meta-boxes/views/html-product-data-general.php:47
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:108
+#: templates/myaccount/my-orders.php:83 templates/myaccount/orders.php:79
 msgid "Cancel"
 msgstr ""
 
+#: includes/admin/class-wc-admin-post-types.php:1920
+msgid "When you receive a new order, it will appear here."
+msgstr ""
+
+#: includes/admin/class-wc-admin-post-types.php:1921
+msgid "Learn more about orders"
+msgstr ""
+
+#: includes/admin/class-wc-admin-post-types.php:1926
+msgid ""
+"Coupons are a great way to offer discounts and rewards to your customers. "
+"They will appear here once created."
+msgstr ""
+
+#: includes/admin/class-wc-admin-post-types.php:1927
+msgid "Learn more about coupons"
+msgstr ""
+
+#: includes/admin/class-wc-admin-post-types.php:1932
+msgid "Ready to start selling something awesome?"
+msgstr ""
+
+#: includes/admin/class-wc-admin-post-types.php:1933
+#: includes/admin/class-wc-admin-setup-wizard.php:788
+msgid "Create your first product!"
+msgstr ""
+
+#: includes/admin/class-wc-admin-post-types.php:1965
+msgid ""
+"This is the WooCommerce shop page. The shop page is a special archive that "
+"lists your products. <a href=\"%s\">You can read more about this here</a>."
+msgstr ""
+
 #: includes/admin/class-wc-admin-profile.php:41
-msgid "Customer Billing Address"
+#: includes/admin/settings/views/settings-tax.php:32
+msgid "Customer billing address"
 msgstr ""
 
 #: includes/admin/class-wc-admin-profile.php:44
 #: includes/admin/class-wc-admin-profile.php:97
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:43
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:92
+#: includes/class-wc-countries.php:551 includes/class-wc-form-handler.php:195
 #: templates/myaccount/form-edit-account.php:30
 msgid "First name"
 msgstr ""
 
 #: includes/admin/class-wc-admin-profile.php:48
 #: includes/admin/class-wc-admin-profile.php:101
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:47
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:96
+#: includes/class-wc-countries.php:559 includes/class-wc-form-handler.php:196
 #: templates/myaccount/form-edit-account.php:34
 msgid "Last name"
 msgstr ""
@@ -6848,23 +7639,31 @@ msgstr ""
 #: includes/admin/class-wc-admin-profile.php:109
 #: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:55
 #: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:104
-msgid "Address 1"
+#: includes/api/class-wc-rest-customers-controller.php:219
+#: includes/api/class-wc-rest-customers-controller.php:282
+#: includes/api/class-wc-rest-orders-controller.php:957
+#: includes/api/class-wc-rest-orders-controller.php:1020
+msgid "Address line 1"
 msgstr ""
 
 #: includes/admin/class-wc-admin-profile.php:60
 #: includes/admin/class-wc-admin-profile.php:113
 #: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:59
 #: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:108
-msgid "Address 2"
+#: includes/api/class-wc-rest-customers-controller.php:224
+#: includes/api/class-wc-rest-customers-controller.php:287
+#: includes/api/class-wc-rest-orders-controller.php:962
+#: includes/api/class-wc-rest-orders-controller.php:1025
+msgid "Address line 2"
 msgstr ""
 
 #: includes/admin/class-wc-admin-profile.php:64
 #: includes/admin/class-wc-admin-profile.php:117
 #: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:63
 #: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:112
-#: includes/admin/settings/class-wc-settings-tax.php:165
-#: includes/admin/settings/views/html-settings-tax.php:20
-#: templates/cart/shipping-calculator.php:82
+#: includes/admin/settings/class-wc-settings-tax.php:173
+#: includes/admin/settings/views/html-settings-tax.php:27
+#: templates/cart/shipping-calculator.php:83
 msgid "City"
 msgstr ""
 
@@ -6872,19 +7671,21 @@ msgstr ""
 #: includes/admin/class-wc-admin-profile.php:121
 #: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:67
 #: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:116
-#: includes/class-wc-countries.php:597 includes/class-wc-countries.php:598
-#: includes/class-wc-countries.php:878 includes/class-wc-countries.php:879
-msgid "Postcode"
+#: includes/admin/settings/class-wc-settings-tax.php:172
+#: includes/admin/settings/views/html-settings-tax.php:26
+#: includes/class-wc-countries.php:612
+#: templates/cart/shipping-calculator.php:91
+msgid "Postcode / ZIP"
 msgstr ""
 
 #: includes/admin/class-wc-admin-profile.php:72
 #: includes/admin/class-wc-admin-profile.php:125
-#: includes/admin/class-wc-admin-settings.php:557
-#: includes/admin/class-wc-admin-settings.php:582
-#: includes/admin/class-wc-admin-setup-wizard.php:490
+#: includes/admin/class-wc-admin-settings.php:574
+#: includes/admin/class-wc-admin-settings.php:599
+#: includes/admin/class-wc-admin-setup-wizard.php:485
 #: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:71
 #: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:120
-#: includes/class-wc-countries.php:508
+#: includes/class-wc-countries.php:574
 msgid "Country"
 msgstr ""
 
@@ -6892,8 +7693,8 @@ msgstr ""
 #: includes/admin/class-wc-admin-profile.php:129
 #: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:75
 #: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:124
-#: includes/wc-template-functions.php:1754
-#: templates/cart/shipping-calculator.php:38
+#: includes/wc-template-functions.php:1935
+#: templates/cart/shipping-calculator.php:39
 msgid "Select a country&hellip;"
 msgstr ""
 
@@ -6901,33 +7702,43 @@ msgstr ""
 #: includes/admin/class-wc-admin-profile.php:132
 #: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:78
 #: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:127
-msgid "State/County"
+#: includes/class-wc-countries.php:604
+#: templates/cart/shipping-calculator.php:56
+#: templates/cart/shipping-calculator.php:62
+#: templates/cart/shipping-calculator.php:74
+msgid "State / County"
 msgstr ""
 
 #: includes/admin/class-wc-admin-profile.php:80
 #: includes/admin/class-wc-admin-profile.php:133
-msgid "State/County or state code"
+msgid "State / County or state code"
 msgstr ""
 
 #: includes/admin/class-wc-admin-profile.php:84
-msgid "Telephone"
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:86
+#: includes/class-wc-countries.php:1078 includes/class-wc-emails.php:397
+msgid "Phone"
 msgstr ""
 
 #: includes/admin/class-wc-admin-profile.php:88
 #: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:83
-#: includes/admin/reports/class-wc-report-customer-list.php:230
-#: includes/admin/settings/class-wc-settings-emails.php:233
-#: includes/class-wc-emails.php:352 templates/single-product-reviews.php:75
-msgid "Email"
+#: includes/class-wc-countries.php:1087 includes/class-wc-emails.php:390
+#: includes/class-wc-form-handler.php:197
+#: templates/myaccount/form-edit-account.php:40
+#: templates/myaccount/form-login.php:91
+msgid "Email address"
 msgstr ""
 
 #: includes/admin/class-wc-admin-profile.php:94
-msgid "Customer Shipping Address"
+#: includes/admin/settings/views/settings-tax.php:31
+msgid "Customer shipping address"
 msgstr ""
 
 #: includes/admin/class-wc-admin-reports.php:45
-#: includes/admin/reports/class-wc-report-customer-list.php:232
-#: includes/class-wc-post-types.php:290
+#: includes/admin/reports/class-wc-report-customer-list.php:212
+#: includes/admin/settings/class-wc-settings-accounts.php:113
+#: includes/class-wc-post-types.php:318 includes/class-wc-query.php:101
+#: includes/wc-account-functions.php:97
 msgid "Orders"
 msgstr ""
 
@@ -6953,11 +7764,11 @@ msgid "Customers"
 msgstr ""
 
 #: includes/admin/class-wc-admin-reports.php:77
-msgid "Customers vs. Guests"
+msgid "Customers vs. guests"
 msgstr ""
 
 #: includes/admin/class-wc-admin-reports.php:83
-msgid "Customer List"
+msgid "Customer list"
 msgstr ""
 
 #: includes/admin/class-wc-admin-reports.php:94
@@ -6980,66 +7791,56 @@ msgstr ""
 msgid "Taxes by date"
 msgstr ""
 
-#: includes/admin/class-wc-admin-settings.php:69
+#: includes/admin/class-wc-admin-settings.php:83
 msgid "Your settings have been saved."
 msgstr ""
 
-#: includes/admin/class-wc-admin-settings.php:127
+#: includes/admin/class-wc-admin-settings.php:142
 msgid "The changes you made will be lost if you navigate away from this page."
 msgstr ""
 
-#: includes/admin/class-wc-admin-settings.php:499
+#: includes/admin/class-wc-admin-settings.php:516
 msgid ""
 "The settings of this image size have been disabled because its values are "
 "being overwritten by a filter."
 msgstr ""
 
-#: includes/admin/class-wc-admin-settings.php:508
-msgid "Hard Crop?"
+#: includes/admin/class-wc-admin-settings.php:525
+msgid "Hard crop?"
 msgstr ""
 
-#: includes/admin/class-wc-admin-settings.php:535
+#: includes/admin/class-wc-admin-settings.php:552
 msgid "Select a page&hellip;"
 msgstr ""
 
-#: includes/admin/class-wc-admin-settings.php:557
-#: includes/admin/class-wc-admin-setup-wizard.php:299
+#: includes/admin/class-wc-admin-settings.php:574
+#: includes/admin/class-wc-admin-setup-wizard.php:321
 msgid "Choose a country&hellip;"
 msgstr ""
 
-#: includes/admin/class-wc-admin-settings.php:582
+#: includes/admin/class-wc-admin-settings.php:599
 msgid "Choose countries&hellip;"
 msgstr ""
 
-#: includes/admin/class-wc-admin-settings.php:590
-#: includes/admin/meta-boxes/views/html-product-attribute.php:40
-msgid "Select all"
-msgstr ""
-
-#: includes/admin/class-wc-admin-settings.php:590
-#: includes/admin/meta-boxes/views/html-product-attribute.php:41
-msgid "Select none"
-msgstr ""
-
 #: includes/admin/class-wc-admin-setup-wizard.php:59
 msgid "Introduction"
 msgstr ""
 
 #: includes/admin/class-wc-admin-setup-wizard.php:64
-#: includes/admin/class-wc-admin-setup-wizard.php:220
-msgid "Page Setup"
+#: includes/admin/class-wc-admin-setup-wizard.php:241
+msgid "Page setup"
 msgstr ""
 
 #: includes/admin/class-wc-admin-setup-wizard.php:69
-msgid "Store Locale"
+msgid "Store locale"
 msgstr ""
 
 #: includes/admin/class-wc-admin-setup-wizard.php:74
-msgid "Shipping &amp; Tax"
+msgid "Shipping &amp; tax"
 msgstr ""
 
 #: includes/admin/class-wc-admin-setup-wizard.php:79
-#: includes/admin/class-wc-admin-setup-wizard.php:634
+#: includes/admin/class-wc-admin-setup-wizard.php:665
 msgid "Payments"
 msgstr ""
 
@@ -7047,618 +7848,455 @@ msgstr ""
 msgid "Ready!"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:147
+#: includes/admin/class-wc-admin-setup-wizard.php:168
 msgid "WooCommerce &rsaquo; Setup Wizard"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:163
+#: includes/admin/class-wc-admin-setup-wizard.php:184
 msgid "Return to the WordPress Dashboard"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:205
+#: includes/admin/class-wc-admin-setup-wizard.php:226
 msgid "Welcome to the world of WooCommerce!"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:206
+#: includes/admin/class-wc-admin-setup-wizard.php:227
 msgid ""
 "Thank you for choosing WooCommerce to power your online store! This quick "
 "setup wizard will help you configure the basic settings. <strong>It’s "
 "completely optional and shouldn’t take longer than five minutes.</strong>"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:207
+#: includes/admin/class-wc-admin-setup-wizard.php:228
 msgid ""
 "No time right now? If you don’t want to go through the wizard, you can skip "
 "and return to the WordPress dashboard. Come back anytime if you change your "
 "mind!"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:209
-msgid "Let's Go!"
+#: includes/admin/class-wc-admin-setup-wizard.php:230
+msgid "Let's go!"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:210
+#: includes/admin/class-wc-admin-setup-wizard.php:231
 msgid "Not right now"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:222
+#: includes/admin/class-wc-admin-setup-wizard.php:243
 msgid ""
-"Your store needs a few essential %spages%s. The following will be created "
-"automatically (if they do not already exist):"
+"Your store needs a few essential <a href=\"%s\" "
+"target=\"_blank\">pages</a>. The following will be created automatically "
+"(if they do not already exist):"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:226
-msgid "Page Name"
+#: includes/admin/class-wc-admin-setup-wizard.php:247
+msgid "Page name"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:233
+#: includes/admin/class-wc-admin-setup-wizard.php:254
 msgid "The shop page will display your products."
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:237
+#: includes/admin/class-wc-admin-setup-wizard.php:258
 msgid ""
 "The cart page will be where the customers go to view their cart and begin "
 "checkout."
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:242
+#: includes/admin/class-wc-admin-setup-wizard.php:263
 msgid "The checkout page will be where the customers go to pay for their items."
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:248
+#: includes/admin/class-wc-admin-setup-wizard.php:269
 msgid ""
 "Registered customers will be able to manage their account details and view "
 "past orders on this page."
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:254
+#: includes/admin/class-wc-admin-setup-wizard.php:275
 msgid ""
 "Once created, these pages can be managed from your admin dashboard on the "
-"%sPages screen%s. You can control which pages are shown on your website via "
-"%sAppearance > Menus%s."
+"<a href=\"%1$s\" target=\"_blank\">Pages screen</a>. You can control which "
+"pages are shown on your website via <a href=\"%2$s\" "
+"target=\"_blank\">Appearance > Menus</a>."
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:257
-#: includes/admin/class-wc-admin-setup-wizard.php:366
-#: includes/admin/class-wc-admin-setup-wizard.php:523
-#: includes/admin/class-wc-admin-setup-wizard.php:676
+#: includes/admin/class-wc-admin-setup-wizard.php:278
+#: includes/admin/class-wc-admin-setup-wizard.php:394
+#: includes/admin/class-wc-admin-setup-wizard.php:515
+#: includes/admin/class-wc-admin-setup-wizard.php:708
 msgid "Continue"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:258
-#: includes/admin/class-wc-admin-setup-wizard.php:367
-#: includes/admin/class-wc-admin-setup-wizard.php:524
-#: includes/admin/class-wc-admin-setup-wizard.php:677
+#: includes/admin/class-wc-admin-setup-wizard.php:279
+#: includes/admin/class-wc-admin-setup-wizard.php:395
+#: includes/admin/class-wc-admin-setup-wizard.php:516
+#: includes/admin/class-wc-admin-setup-wizard.php:709
 msgid "Skip this step"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:293
-msgid "Store Locale Setup"
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:297
-msgid "Where is your store based?"
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:305
-msgid "Which currency will your store use?"
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:307
-#: includes/admin/class-wc-admin-setup-wizard.php:308
-msgid "Choose a currency&hellip;"
-msgstr ""
-
 #: includes/admin/class-wc-admin-setup-wizard.php:315
-msgid "If your currency is not listed you can %sadd it later%s."
+msgid "Store locale setup"
 msgstr ""
 
 #: includes/admin/class-wc-admin-setup-wizard.php:319
-#: includes/admin/settings/class-wc-settings-general.php:137
-#: includes/admin/views/html-admin-page-status-report.php:421
-msgid "Currency Position"
+msgid "Where is your store based?"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:322
-#: includes/admin/settings/class-wc-settings-general.php:145
+#: includes/admin/class-wc-admin-setup-wizard.php:327
+msgid "Which currency will your store use?"
+msgstr ""
+
+#: includes/admin/class-wc-admin-setup-wizard.php:329
+#: includes/admin/class-wc-admin-setup-wizard.php:330
+msgid "Choose a currency&hellip;"
+msgstr ""
+
+#: includes/admin/class-wc-admin-setup-wizard.php:333
+#: includes/admin/meta-boxes/views/html-order-items.php:39
+#: includes/admin/views/html-bulk-edit-product.php:133
+msgid "%1$s (%2$s)"
+msgstr ""
+
+#: includes/admin/class-wc-admin-setup-wizard.php:337
+msgid ""
+"If your currency is not listed you can <a href=\"%s\" target=\"_blank\">add "
+"it later</a>."
+msgstr ""
+
+#: includes/admin/class-wc-admin-setup-wizard.php:341
+#: includes/admin/settings/class-wc-settings-general.php:179
+#: includes/admin/views/html-admin-page-status-report.php:431
+msgid "Currency position"
+msgstr ""
+
+#: includes/admin/class-wc-admin-setup-wizard.php:344
+#: includes/admin/settings/class-wc-settings-general.php:187
 msgid "Left"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:323
-#: includes/admin/settings/class-wc-settings-general.php:146
+#: includes/admin/class-wc-admin-setup-wizard.php:345
+#: includes/admin/settings/class-wc-settings-general.php:188
 msgid "Right"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:324
-#: includes/admin/settings/class-wc-settings-general.php:147
+#: includes/admin/class-wc-admin-setup-wizard.php:346
+#: includes/admin/settings/class-wc-settings-general.php:189
 msgid "Left with space"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:325
-#: includes/admin/settings/class-wc-settings-general.php:148
+#: includes/admin/class-wc-admin-setup-wizard.php:347
+#: includes/admin/settings/class-wc-settings-general.php:190
 msgid "Right with space"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:330
-#: includes/admin/settings/class-wc-settings-general.php:154
-#: includes/admin/views/html-admin-page-status-report.php:426
-msgid "Thousand Separator"
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:336
-#: includes/admin/settings/class-wc-settings-general.php:164
-#: includes/admin/views/html-admin-page-status-report.php:431
-msgid "Decimal Separator"
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:342
-msgid "Which unit should be used for product weights?"
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:345
-#: includes/admin/settings/class-wc-settings-products.php:431
-msgid "kg"
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:346
-#: includes/admin/settings/class-wc-settings-products.php:432
-msgid "g"
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:347
-#: includes/admin/settings/class-wc-settings-products.php:433
-msgid "lbs"
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:348
-#: includes/admin/settings/class-wc-settings-products.php:434
-msgid "oz"
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:353
-msgid "Which unit should be used for product dimensions?"
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:356
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:193
-#: includes/admin/settings/class-wc-settings-products.php:448
-msgid "m"
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:357
-#: includes/admin/settings/class-wc-settings-products.php:449
-msgid "cm"
+#: includes/admin/class-wc-admin-setup-wizard.php:352
+#: includes/admin/settings/class-wc-settings-general.php:196
+#: includes/admin/views/html-admin-page-status-report.php:436
+msgid "Thousand separator"
 msgstr ""
 
 #: includes/admin/class-wc-admin-setup-wizard.php:358
-#: includes/admin/settings/class-wc-settings-products.php:450
+#: includes/admin/settings/class-wc-settings-general.php:206
+#: includes/admin/views/html-admin-page-status-report.php:441
+msgid "Decimal separator"
+msgstr ""
+
+#: includes/admin/class-wc-admin-setup-wizard.php:364
+#: includes/admin/settings/class-wc-settings-general.php:216
+#: includes/admin/views/html-admin-page-status-report.php:446
+msgid "Number of decimals"
+msgstr ""
+
+#: includes/admin/class-wc-admin-setup-wizard.php:370
+msgid "Which unit should be used for product weights?"
+msgstr ""
+
+#: includes/admin/class-wc-admin-setup-wizard.php:373
+#: includes/admin/settings/class-wc-settings-products.php:429
+msgid "kg"
+msgstr ""
+
+#: includes/admin/class-wc-admin-setup-wizard.php:374
+#: includes/admin/settings/class-wc-settings-products.php:430
+msgid "g"
+msgstr ""
+
+#: includes/admin/class-wc-admin-setup-wizard.php:375
+#: includes/admin/settings/class-wc-settings-products.php:431
+msgid "lbs"
+msgstr ""
+
+#: includes/admin/class-wc-admin-setup-wizard.php:376
+#: includes/admin/settings/class-wc-settings-products.php:432
+msgid "oz"
+msgstr ""
+
+#: includes/admin/class-wc-admin-setup-wizard.php:381
+msgid "Which unit should be used for product dimensions?"
+msgstr ""
+
+#: includes/admin/class-wc-admin-setup-wizard.php:384
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:216
+#: includes/admin/settings/class-wc-settings-products.php:446
+msgid "m"
+msgstr ""
+
+#: includes/admin/class-wc-admin-setup-wizard.php:385
+#: includes/admin/settings/class-wc-settings-products.php:447
+msgid "cm"
+msgstr ""
+
+#: includes/admin/class-wc-admin-setup-wizard.php:386
+#: includes/admin/settings/class-wc-settings-products.php:448
 msgid "mm"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:359
-#: includes/admin/settings/class-wc-settings-products.php:451
+#: includes/admin/class-wc-admin-setup-wizard.php:387
+#: includes/admin/settings/class-wc-settings-products.php:449
 msgid "in"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:360
-#: includes/admin/settings/class-wc-settings-products.php:452
+#: includes/admin/class-wc-admin-setup-wizard.php:388
+#: includes/admin/settings/class-wc-settings-products.php:450
 msgid "yd"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:417
-msgid "Shipping &amp; Tax Setup"
+#: includes/admin/class-wc-admin-setup-wizard.php:435
+msgid "Shipping &amp; Tax setup"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:419
+#: includes/admin/class-wc-admin-setup-wizard.php:437
 msgid ""
 "If you will be charging sales tax, or shipping physical goods to customers, "
-"you can configure the basic options below. This is optional and can be "
-"changed later via %1$sWooCommerce > Settings > Tax%3$s and %2$sWooCommerce "
-"> Settings > Shipping%3$s."
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:423
-msgid "Basic Shipping Setup"
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:427
-msgid "Will you be shipping products?"
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:430
-msgid "Yes, I will be shipping physical goods to customers"
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:434
-msgid "<strong>Domestic</strong> shipping costs:"
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:436
-#: includes/admin/class-wc-admin-setup-wizard.php:442
-msgid "A total of %s per order and/or %s per item"
+"you can enable these below. This is optional and can be changed later."
 msgstr ""
 
 #: includes/admin/class-wc-admin-setup-wizard.php:440
-msgid "<strong>International</strong> shipping costs:"
+msgid "Will you be shipping products?"
+msgstr ""
+
+#: includes/admin/class-wc-admin-setup-wizard.php:443
+msgid "Yes, I will be shipping physical goods to customers"
 msgstr ""
 
 #: includes/admin/class-wc-admin-setup-wizard.php:447
-msgid "Basic Tax Setup"
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:451
 msgid "Will you be charging sales tax?"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:454
+#: includes/admin/class-wc-admin-setup-wizard.php:450
 msgid "Yes, I will be charging sales tax"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:458
+#: includes/admin/class-wc-admin-setup-wizard.php:454
 msgid "How will you enter product prices?"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:460
+#: includes/admin/class-wc-admin-setup-wizard.php:456
 msgid "I will enter prices inclusive of tax"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:461
+#: includes/admin/class-wc-admin-setup-wizard.php:457
 msgid "I will enter prices exclusive of tax"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:483
-msgid "Import Tax Rates?"
+#: includes/admin/class-wc-admin-setup-wizard.php:480
+msgid ""
+"The following tax rates will be imported automatically for you. You can "
+"read more about taxes in <a href=\"%s\" target=\"_blank\">our "
+"documentation</a>."
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:485
-msgid "Yes, please import some starter tax rates"
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:491
-#: includes/class-wc-countries.php:601 includes/class-wc-countries.php:872
+#: includes/admin/class-wc-admin-setup-wizard.php:486
+#: includes/class-wc-countries.php:677 includes/class-wc-countries.php:987
 msgid "State"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:492
+#: includes/admin/class-wc-admin-setup-wizard.php:487
 msgid "Rate (%)"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:494
-msgid "Tax Shipping"
+#: includes/admin/class-wc-admin-setup-wizard.php:507
+msgid ""
+"You may need to add/edit rates based on your products or business location "
+"which can be done from the <a href=\"%s\" target=\"_blank\">tax "
+"settings</a> screen. If in doubt, speak to an accountant."
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:513
-msgid ""
-"Please note: you may still need to add local and product specific tax rates "
-"depending on your business location. If in doubt, speak to an accountant."
+#: includes/admin/class-wc-admin-setup-wizard.php:588
+msgid "PayPal by Braintree"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:515
+#: includes/admin/class-wc-admin-setup-wizard.php:590
+#: includes/admin/class-wc-admin-setup-wizard.php:597
 msgid ""
-"You can edit tax rates later from the %1$stax settings%3$s screen and read "
-"more about taxes in %2$sour documentation%3$s."
+"Safe and secure payments using credit cards or your customer's PayPal "
+"account. <a href=\"%s\" target=\"_blank\">Learn more about PayPal</a>."
+msgstr ""
+
+#: includes/admin/class-wc-admin-setup-wizard.php:595
+msgid "PayPal Express Checkout"
+msgstr ""
+
+#: includes/admin/class-wc-admin-setup-wizard.php:602
+msgid "Stripe"
+msgstr ""
+
+#: includes/admin/class-wc-admin-setup-wizard.php:604
+msgid ""
+"A modern and robust way to accept credit card payments on your store. <a "
+"href=\"%s\" target=\"_blank\">Learn more about Stripe</a>."
+msgstr ""
+
+#: includes/admin/class-wc-admin-setup-wizard.php:609
+msgid "PayPal Standard"
+msgstr ""
+
+#: includes/admin/class-wc-admin-setup-wizard.php:610
+msgid "Accept payments via PayPal using account balance or credit card."
+msgstr ""
+
+#: includes/admin/class-wc-admin-setup-wizard.php:615
+#: includes/admin/class-wc-admin-setup-wizard.php:618
+msgid "PayPal email address"
+msgstr ""
+
+#: includes/admin/class-wc-admin-setup-wizard.php:624
+msgid "A simple offline gateway that lets you accept a check as method of payment."
+msgstr ""
+
+#: includes/admin/class-wc-admin-setup-wizard.php:629
+msgid "Bank transfer (BACS) payments"
+msgstr ""
+
+#: includes/admin/class-wc-admin-setup-wizard.php:630
+msgid "A simple offline gateway that lets you accept BACS payment."
+msgstr ""
+
+#: includes/admin/class-wc-admin-setup-wizard.php:635
+#: includes/gateways/cod/class-wc-gateway-cod.php:51
+#: includes/gateways/cod/class-wc-gateway-cod.php:78
+msgid "Cash on delivery"
 msgstr ""
 
 #: includes/admin/class-wc-admin-setup-wizard.php:636
+msgid "A simple offline gateway that lets you accept cash on delivery."
+msgstr ""
+
+#: includes/admin/class-wc-admin-setup-wizard.php:667
 msgid ""
-"WooCommerce can accept both online and offline payments. %2$sAdditional "
-"payment methods%3$s can be installed later and managed from the "
-"%1$scheckout settings%3$s screen."
+"WooCommerce can accept both online and offline payments. <a href=\"%1$s\" "
+"target=\"_blank\">Additional payment methods</a> can be installed later and "
+"managed from the <a href=\"%2$s\" target=\"_blank\">checkout settings</a> "
+"screen."
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:641
+#: includes/admin/class-wc-admin-setup-wizard.php:772
+msgid "Your store is ready!"
+msgstr ""
+
+#: includes/admin/class-wc-admin-setup-wizard.php:776
 msgid ""
-"To accept payments via PayPal on your store, simply enter your PayPal email "
-"address below."
+"Want to help make WooCommerce even more awesome? Allow WooCommerce to "
+"collect non-sensitive diagnostic data and usage information. %1$sFind out "
+"more%2$s."
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:645
-msgid "PayPal Email Address:"
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:652
-msgid "Offline Payments"
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:653
-msgid ""
-"Offline gateways require manual processing, but can be useful in certain "
-"circumstances or for testing payments."
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:657
-msgid "Cheque Payments"
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:659
-msgid "Enable payment via Cheques"
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:663
-#: includes/gateways/cod/class-wc-gateway-cod.php:26
-#: includes/gateways/cod/class-wc-gateway-cod.php:71
-msgid "Cash on Delivery"
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:665
-msgid "Enable cash on delivery"
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:669
-msgid "Bank Transfer (BACS)"
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:671
-msgid "Enable BACS payments"
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:738
-msgid "Your Store is Ready!"
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:742
-#: includes/admin/views/html-notice-tracking.php:11
-msgid ""
-"Want to help make WooCommerce even more awesome? Allow WooThemes to collect "
-"non-sensitive diagnostic data and usage information, and get %s discount on "
-"your next WooThemes purchase. %sFind out more%s."
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:744
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:326
-#: includes/admin/views/html-bulk-edit-product.php:284
+#: includes/admin/class-wc-admin-setup-wizard.php:778
 #: includes/admin/views/html-notice-tracking.php:13
-#: includes/admin/views/html-quick-edit-product.php:203
-#: includes/class-wc-ajax.php:836 includes/class-wc-ajax.php:2433
+#: includes/wc-product-functions.php:817
 msgid "Allow"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:745
+#: includes/admin/class-wc-admin-setup-wizard.php:779
 msgid "No thanks"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:752
-msgid "Next Steps"
+#: includes/admin/class-wc-admin-setup-wizard.php:786
+msgid "Next steps"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:754
-msgid "Create your first product!"
+#: includes/admin/class-wc-admin-setup-wizard.php:792
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:8
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:98
+msgid "Learn more"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:758
-msgid "Learn More"
+#: includes/admin/class-wc-admin-setup-wizard.php:794
+msgid "Watch the Guided Tour videos"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:760
-msgid "Watch the WC 101 video walkthroughs"
-msgstr ""
-
-#: includes/admin/class-wc-admin-setup-wizard.php:761
+#: includes/admin/class-wc-admin-setup-wizard.php:795
 msgid "Get eCommerce advice in your inbox"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:762
-msgid "Follow Sidekick interactive walkthroughs"
+#: includes/admin/class-wc-admin-setup-wizard.php:796
+msgid "Learn more about getting started"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:763
-msgid "Read more about getting started"
+#: includes/admin/class-wc-admin-status.php:49
+msgid "Tool does not exist."
 msgstr ""
 
-#: includes/admin/class-wc-admin-status.php:50
-msgid "Product Transients Cleared"
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:75
-msgid "%d Transients Rows Cleared"
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:83
-msgid "Roles successfully reset"
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:95
-msgid "Terms successfully recounted"
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:103
-msgid "Sessions successfully cleared"
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:107
-msgid "All missing WooCommerce pages was installed successfully."
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:115
-msgid "Tax rates successfully deleted"
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:121
-msgid "Usage tracking settings successfully reset."
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:130
-msgid "There was an error calling %s::%s"
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:133
-msgid "There was an error calling %s"
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:143
+#: includes/admin/class-wc-admin-status.php:61
 msgid "Your changes have been saved."
 msgstr ""
 
-#: includes/admin/class-wc-admin-status.php:156
-msgid "WC Transients"
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:157
-msgid "Clear transients"
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:158
-msgid "This tool will clear the product/shop transients cache."
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:161
-msgid "Expired Transients"
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:162
-msgid "Clear expired transients"
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:163
-msgid "This tool will clear ALL expired transients from WordPress."
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:166
-msgid "Term counts"
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:167
-msgid "Recount terms"
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:168
-msgid ""
-"This tool will recount product terms - useful when changing your settings "
-"in a way which hides products from the catalog."
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:171
-msgid "Capabilities"
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:172
-msgid "Reset capabilities"
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:173
-msgid ""
-"This tool will reset the admin, customer and shop_manager roles to default. "
-"Use this if your users cannot access all of the WooCommerce admin pages."
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:176
-msgid "Customer Sessions"
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:177
-msgid "Clear all sessions"
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:178
-msgid ""
-"<strong class=\"red\">Warning:</strong> This tool will delete all customer "
-"session data from the database, including any current live carts."
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:181
-msgid "Install WooCommerce Pages"
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:182
-msgid "Install pages"
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:183
-msgid ""
-"<strong class=\"red\">Note:</strong> This tool will install all the missing "
-"WooCommerce pages. Pages already defined and set up will not be replaced."
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:186
-msgid "Delete all WooCommerce tax rates"
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:187
-msgid "Delete ALL tax rates"
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:188
-msgid ""
-"<strong class=\"red\">Note:</strong> This option will delete ALL of your "
-"tax rates, use with caution."
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:191
-msgid "Reset Usage Tracking Settings"
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:192
-msgid "Reset usage tracking settings"
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:193
-msgid ""
-"This will reset your usage tracking settings, causing it to show the opt-in "
-"banner again and not sending any data."
-msgstr ""
-
-#: includes/admin/class-wc-admin-taxonomies.php:93
-#: includes/admin/class-wc-admin-taxonomies.php:181
-#: includes/widgets/class-wc-widget-layered-nav.php:89
+#: includes/admin/class-wc-admin-taxonomies.php:92
+#: includes/admin/class-wc-admin-taxonomies.php:199
+#: includes/widgets/class-wc-widget-layered-nav.php:86
 msgid "Display type"
 msgstr ""
 
-#: includes/admin/class-wc-admin-taxonomies.php:96
-#: includes/admin/class-wc-admin-taxonomies.php:185
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:99
+#: includes/admin/class-wc-admin-taxonomies.php:95
+#: includes/admin/class-wc-admin-taxonomies.php:203
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:153
 #: includes/admin/settings/class-wc-settings-products.php:28
-#: includes/class-wc-post-types.php:237
+#: includes/class-wc-post-types.php:258
 #: includes/widgets/class-wc-widget-products.php:29
 msgid "Products"
 msgstr ""
 
-#: includes/admin/class-wc-admin-taxonomies.php:97
-#: includes/admin/class-wc-admin-taxonomies.php:186
+#: includes/admin/class-wc-admin-taxonomies.php:96
+#: includes/admin/class-wc-admin-taxonomies.php:204
 msgid "Subcategories"
 msgstr ""
 
-#: includes/admin/class-wc-admin-taxonomies.php:98
-#: includes/admin/class-wc-admin-taxonomies.php:187
+#: includes/admin/class-wc-admin-taxonomies.php:97
+#: includes/admin/class-wc-admin-taxonomies.php:205
 msgid "Both"
 msgstr ""
 
-#: includes/admin/class-wc-admin-taxonomies.php:102
-#: includes/admin/class-wc-admin-taxonomies.php:192
-#: includes/admin/class-wc-admin-taxonomies.php:331
+#: includes/admin/class-wc-admin-taxonomies.php:101
+#: includes/admin/class-wc-admin-taxonomies.php:210
+#: includes/admin/class-wc-admin-taxonomies.php:348
 msgid "Thumbnail"
 msgstr ""
 
-#: includes/admin/class-wc-admin-taxonomies.php:106
-#: includes/admin/class-wc-admin-taxonomies.php:197
+#: includes/admin/class-wc-admin-taxonomies.php:105
+#: includes/admin/class-wc-admin-taxonomies.php:215
 msgid "Upload/Add image"
 msgstr ""
 
-#: includes/admin/class-wc-admin-taxonomies.php:107
-#: includes/admin/class-wc-admin-taxonomies.php:198
+#: includes/admin/class-wc-admin-taxonomies.php:106
+#: includes/admin/class-wc-admin-taxonomies.php:216
 msgid "Remove image"
 msgstr ""
 
-#: includes/admin/class-wc-admin-taxonomies.php:133
-#: includes/admin/class-wc-admin-taxonomies.php:224
+#: includes/admin/class-wc-admin-taxonomies.php:132
+#: includes/admin/class-wc-admin-taxonomies.php:242
 msgid "Use image"
 msgstr ""
 
-#: includes/admin/class-wc-admin-taxonomies.php:274
+#: includes/admin/class-wc-admin-taxonomies.php:295
 msgid ""
 "Product categories for your store can be managed here. To change the order "
 "of categories on the front-end you can drag and drop to sort them. To see "
-"more categories listed click the \"screen options\" link at the top of the "
-"page."
+"more categories listed click the \"screen options\" link at the top-right "
+"of this page."
 msgstr ""
 
-#: includes/admin/class-wc-admin-taxonomies.php:281
-msgid ""
-"Shipping classes can be used to group products of similar type. These "
-"groups can then be used by certain shipping methods to provide different "
-"rates to different products."
-msgstr ""
-
-#: includes/admin/class-wc-admin-taxonomies.php:288
+#: includes/admin/class-wc-admin-taxonomies.php:302
 msgid ""
 "Attribute terms can be assigned to products and "
 "variations.<br/><br/><b>Note</b>: Deleting a term will remove it from all "
@@ -7675,1530 +8313,1536 @@ msgid "webhooks"
 msgstr ""
 
 #: includes/admin/class-wc-admin-webhooks-table-list.php:42
-#: includes/admin/settings/views/html-webhooks-edit.php:41
+#: includes/admin/settings/views/html-webhooks-edit.php:45
 msgid "Topic"
 msgstr ""
 
 #: includes/admin/class-wc-admin-webhooks-table-list.php:43
-#: includes/admin/settings/views/html-webhooks-edit.php:93
+#: includes/admin/settings/views/html-webhooks-edit.php:97
 msgid "Delivery URL"
 msgstr ""
 
-#: includes/admin/class-wc-admin-webhooks-table-list.php:164
+#: includes/admin/class-wc-admin-webhooks-table-list.php:104
+msgid "Restore this item from the Trash"
+msgstr ""
+
+#: includes/admin/class-wc-admin-webhooks-table-list.php:104
+#: includes/admin/class-wc-admin-webhooks-table-list.php:250
+msgid "Restore"
+msgstr ""
+
+#: includes/admin/class-wc-admin-webhooks-table-list.php:106
+msgid "Move this item to the Trash"
+msgstr ""
+
+#: includes/admin/class-wc-admin-webhooks-table-list.php:106
+msgid "Trash"
+msgstr ""
+
+#: includes/admin/class-wc-admin-webhooks-table-list.php:109
+msgid "Delete this item permanently"
+msgstr ""
+
+#: includes/admin/class-wc-admin-webhooks-table-list.php:109
+#: includes/admin/class-wc-admin-webhooks-table-list.php:251
+#: includes/admin/meta-boxes/class-wc-meta-box-order-actions.php:78
+#: includes/admin/settings/views/html-webhooks-edit.php:170
+msgid "Delete permanently"
+msgstr ""
+
 #: includes/admin/class-wc-admin-webhooks-table-list.php:165
+#: includes/admin/class-wc-admin-webhooks-table-list.php:166
+#. translators: %s: count
 msgid "Activated <span class=\"count\">(%s)</span>"
 msgstr ""
 
-#: includes/admin/class-wc-admin-webhooks-table-list.php:172
-#: includes/admin/class-wc-admin-webhooks-table-list.php:173
+#: includes/admin/class-wc-admin-webhooks-table-list.php:174
+#: includes/admin/class-wc-admin-webhooks-table-list.php:175
+#. translators: %s: count
 msgid "Paused <span class=\"count\">(%s)</span>"
 msgstr ""
 
-#: includes/admin/class-wc-admin-webhooks-table-list.php:180
-#: includes/admin/class-wc-admin-webhooks-table-list.php:181
+#: includes/admin/class-wc-admin-webhooks-table-list.php:183
+#: includes/admin/class-wc-admin-webhooks-table-list.php:184
+#. translators: %s: count
 msgid "Disabled <span class=\"count\">(%s)</span>"
 msgstr ""
 
-#: includes/admin/class-wc-admin-webhooks-table-list.php:252
-#: includes/admin/meta-boxes/class-wc-meta-box-order-actions.php:76
-#: includes/admin/settings/views/html-webhooks-edit.php:153
-msgid "Move to Trash"
+#: includes/admin/class-wc-admin-webhooks-table-list.php:256
+#: includes/admin/meta-boxes/class-wc-meta-box-order-actions.php:80
+#: includes/admin/settings/views/html-webhooks-edit.php:170
+msgid "Move to trash"
 msgstr ""
 
-#: includes/admin/class-wc-admin-webhooks-table-list.php:263
-msgid "Empty Trash"
+#: includes/admin/class-wc-admin-webhooks-table-list.php:267
+msgid "Empty trash"
 msgstr ""
 
-#: includes/admin/class-wc-admin-webhooks.php:49
-#: includes/admin/class-wc-admin-webhooks.php:195
-#: includes/api/class-wc-api-webhooks.php:197
-#: includes/api/v2/class-wc-api-webhooks.php:197
+#: includes/admin/class-wc-admin-webhooks.php:51
+#: includes/admin/class-wc-admin-webhooks.php:217
+#: includes/api/legacy/v2/class-wc-api-webhooks.php:198
+#: includes/api/legacy/v3/class-wc-api-webhooks.php:198
+#: includes/api/v1/class-wc-rest-webhooks-controller.php:379
+#. translators: %s: date`
+#. translators: %s: date
 msgid "Webhook created on %s"
 msgstr ""
 
-#: includes/admin/class-wc-admin-webhooks.php:186
+#: includes/admin/class-wc-admin-webhooks.php:206
 msgid "You don't have permissions to create Webhooks!"
 msgstr ""
 
-#: includes/admin/class-wc-admin-webhooks.php:266
+#: includes/admin/class-wc-admin-webhooks.php:291
 msgid "You don't have permissions to edit Webhooks!"
 msgstr ""
 
-#: includes/admin/class-wc-admin-webhooks.php:295
+#: includes/admin/class-wc-admin-webhooks.php:320
 msgid "You don't have permissions to delete Webhooks!"
 msgstr ""
 
-#: includes/admin/class-wc-admin-webhooks.php:371
-msgid "1 webhook moved to the Trash."
+#: includes/admin/class-wc-admin-webhooks.php:397
+#. translators: %d: count
+msgid "%d webhook moved to the Trash."
 msgid_plural "%d webhooks moved to the Trash."
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/admin/class-wc-admin-webhooks.php:377
-msgid "1 webhook restored from the Trash."
+#: includes/admin/class-wc-admin-webhooks.php:404
+#. translators: %d: count
+msgid "%d webhook restored from the Trash."
 msgid_plural "%d webhooks restored from the Trash."
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/admin/class-wc-admin-webhooks.php:383
-msgid "1 webhook permanently deleted."
+#: includes/admin/class-wc-admin-webhooks.php:411
+#. translators: %d: count
+msgid "%d webhook permanently deleted."
 msgid_plural "%d webhooks permanently deleted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/admin/class-wc-admin-webhooks.php:387
+#: includes/admin/class-wc-admin-webhooks.php:415
 msgid "Webhook updated successfully."
 msgstr ""
 
-#: includes/admin/class-wc-admin-webhooks.php:391
+#: includes/admin/class-wc-admin-webhooks.php:419
 msgid "Webhook created successfully."
 msgstr ""
 
-#: includes/admin/class-wc-admin-webhooks.php:403
-#: includes/admin/settings/class-wc-settings-api.php:47
-#: includes/class-wc-post-types.php:386
-msgid "Webhooks"
+#: includes/admin/class-wc-admin-webhooks.php:431
+#: includes/class-wc-post-types.php:424
+msgid "Add webhook"
 msgstr ""
 
-#: includes/admin/class-wc-admin-webhooks.php:403
-#: includes/class-wc-post-types.php:389
-msgid "Add Webhook"
+#: includes/admin/class-wc-admin-webhooks.php:441
+#: includes/class-wc-post-types.php:431
+msgid "Search webhooks"
 msgstr ""
 
-#: includes/admin/class-wc-admin-webhooks.php:413
-#: includes/class-wc-post-types.php:396
-msgid "Search Webhooks"
-msgstr ""
-
-#: includes/admin/class-wc-admin-webhooks.php:444
+#: includes/admin/class-wc-admin-webhooks.php:472
 msgid "This Webhook has no log yet."
 msgstr ""
 
-#: includes/admin/class-wc-admin-webhooks.php:495
-#: includes/admin/class-wc-admin-webhooks.php:497
+#: includes/admin/class-wc-admin-webhooks.php:519
+#. translators: 1: items count (i.e. 8 items) 2: current page 3: total pages
+msgid "%1$s &ndash; Page %2$d of %3$d"
+msgstr ""
+
+#: includes/admin/class-wc-admin-webhooks.php:520
+msgid "%d item"
+msgid_plural "%d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: includes/admin/class-wc-admin-webhooks.php:529
+#: includes/admin/class-wc-admin-webhooks.php:531
 msgid "&lsaquo; Previous"
 msgstr ""
 
-#: includes/admin/class-wc-admin-webhooks.php:501
-#: includes/admin/class-wc-admin-webhooks.php:503
+#: includes/admin/class-wc-admin-webhooks.php:535
+#: includes/admin/class-wc-admin-webhooks.php:537
 msgid "Next &rsaquo;"
 msgstr ""
 
-#: includes/admin/class-wc-admin.php:148
-msgid "HTML Email Template"
+#: includes/admin/class-wc-admin.php:182
+msgid "HTML email template"
 msgstr ""
 
-#: includes/admin/class-wc-admin.php:195
+#: includes/admin/class-wc-admin.php:223
+#. translators: %s: five stars
 msgid ""
-"If you like <strong>WooCommerce</strong> please leave us a "
-"%s&#9733;&#9733;&#9733;&#9733;&#9733;%s rating. A huge thank you from "
-"WooThemes in advance!"
+"If you like <strong>WooCommerce</strong> please leave us a %s rating. A "
+"huge thanks in advance!"
 msgstr ""
 
-#: includes/admin/class-wc-admin.php:195
+#: includes/admin/class-wc-admin.php:223
 msgid "Thanks :)"
 msgstr ""
 
-#: includes/admin/class-wc-admin.php:203
+#: includes/admin/class-wc-admin.php:231
 msgid "Thank you for selling with WooCommerce."
 msgstr ""
 
-#: includes/admin/importers/class-wc-tax-rate-importer.php:104
+#: includes/admin/importers/class-wc-tax-rate-importer.php:125
 msgid "The file does not exist, please try again."
 msgstr ""
 
-#: includes/admin/importers/class-wc-tax-rate-importer.php:139
+#: includes/admin/importers/class-wc-tax-rate-importer.php:159
 msgid "The CSV is invalid."
 msgstr ""
 
-#: includes/admin/importers/class-wc-tax-rate-importer.php:147
-msgid "Import complete - imported <strong>%s</strong> tax rates."
+#: includes/admin/importers/class-wc-tax-rate-importer.php:169
+#. translators: %s: tax rates count
+msgid "Import complete - imported %s tax rates."
 msgstr ""
 
-#: includes/admin/importers/class-wc-tax-rate-importer.php:157
+#: includes/admin/importers/class-wc-tax-rate-importer.php:181
 msgid "All done!"
 msgstr ""
 
-#: includes/admin/importers/class-wc-tax-rate-importer.php:157
-msgid "View Tax Rates"
+#: includes/admin/importers/class-wc-tax-rate-importer.php:181
+msgid "View tax rates"
 msgstr ""
 
-#: includes/admin/importers/class-wc-tax-rate-importer.php:193
-msgid "Import Tax Rates"
+#: includes/admin/importers/class-wc-tax-rate-importer.php:217
+msgid "Import tax rates"
 msgstr ""
 
-#: includes/admin/importers/class-wc-tax-rate-importer.php:209
+#: includes/admin/importers/class-wc-tax-rate-importer.php:233
 msgid ""
 "Hi there! Upload a CSV file containing tax rates to import the contents "
 "into your shop. Choose a .csv file to upload, then click \"Upload file and "
 "import\"."
 msgstr ""
 
-#: includes/admin/importers/class-wc-tax-rate-importer.php:211
+#: includes/admin/importers/class-wc-tax-rate-importer.php:235
 msgid ""
 "Tax rates need to be defined with columns in a specific order (10 columns). "
 "<a href=\"%s\">Click here to download a sample</a>."
 msgstr ""
 
-#: includes/admin/importers/class-wc-tax-rate-importer.php:219
+#: includes/admin/importers/class-wc-tax-rate-importer.php:243
 msgid ""
 "Before you can upload your import file, you will need to fix the following "
 "error:"
 msgstr ""
 
-#: includes/admin/importers/class-wc-tax-rate-importer.php:228
+#: includes/admin/importers/class-wc-tax-rate-importer.php:252
 msgid "Choose a file from your computer:"
 msgstr ""
 
-#: includes/admin/importers/class-wc-tax-rate-importer.php:234
+#: includes/admin/importers/class-wc-tax-rate-importer.php:261
+#. translators: %s: maximum upload size
 msgid "Maximum size: %s"
 msgstr ""
 
-#: includes/admin/importers/class-wc-tax-rate-importer.php:239
+#: includes/admin/importers/class-wc-tax-rate-importer.php:269
 msgid "OR enter path to file:"
 msgstr ""
 
-#: includes/admin/importers/class-wc-tax-rate-importer.php:246
+#: includes/admin/importers/class-wc-tax-rate-importer.php:276
 msgid "Delimiter"
 msgstr ""
 
-#: includes/admin/importers/class-wc-tax-rate-importer.php:252
+#: includes/admin/importers/class-wc-tax-rate-importer.php:282
 msgid "Upload file and import"
 msgstr ""
 
-#: includes/admin/importers/class-wc-tax-rate-importer.php:266
+#: includes/admin/importers/class-wc-tax-rate-importer.php:296
 msgid "Sorry, there has been an error."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:39
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:89
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:43
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:80
 #: includes/admin/settings/class-wc-settings-general.php:28
 #: includes/admin/settings/class-wc-settings-products.php:44
 msgid "General"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:44
-msgid "Usage Restriction"
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:48
+msgid "Usage restriction"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:49
-msgid "Usage Limits"
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:53
+msgid "Usage limits"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:65
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:71
 msgid "Discount type"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:68
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:80
 msgid "Value of the coupon."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:71
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:89
 msgid "Allow free shipping"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:71
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:90
 msgid ""
-"Check this box if the coupon grants free shipping. The <a href=\"%s\">free "
-"shipping method</a> must be enabled and be set to require \"a valid free "
-"shipping coupon\" (see the \"Free Shipping Requires\" setting)."
+"Check this box if the coupon grants free shipping. A <a href=\"%s\" "
+"target=\"_blank\">free shipping method</a> must be enabled in your shipping "
+"zone and be set to require \"a valid free shipping coupon\" (see the \"Free "
+"Shipping Requires\" setting)."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:74
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:99
 msgid "Coupon expiry date"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:84
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:118
 msgid "Minimum spend"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:84
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:119
 msgid "No minimum"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:84
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:120
 msgid ""
 "This field allows you to set the minimum spend (subtotal, including taxes) "
 "allowed to use the coupon."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:87
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:128
 msgid "Maximum spend"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:87
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:129
 msgid "No maximum"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:87
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:130
 msgid ""
 "This field allows you to set the maximum spend (subtotal, including taxes) "
 "allowed when using the coupon."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:90
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:138
 msgid "Individual use only"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:90
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:139
 msgid ""
 "Check this box if the coupon cannot be used in conjunction with other "
 "coupons."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:93
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:145
 msgid "Exclude sale items"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:93
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:146
 msgid ""
 "Check this box if the coupon should not apply to items on sale. Per-item "
 "coupons will only work if the item is not on sale. Per-cart coupons will "
 "only work if there are no sale items in the cart."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:100
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:118
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:489
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:506
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:526
-#: includes/admin/meta-boxes/views/html-order-items.php:325
-#: includes/admin/reports/class-wc-report-sales-by-product.php:181
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:154
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:171
+#: includes/admin/meta-boxes/views/html-order-items.php:286
+#: includes/admin/meta-boxes/views/html-product-data-linked-products.php:6
+#: includes/admin/meta-boxes/views/html-product-data-linked-products.php:22
+#: includes/admin/meta-boxes/views/html-product-data-linked-products.php:38
+#: includes/admin/reports/class-wc-report-sales-by-product.php:204
 msgid "Search for a product&hellip;"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:112
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:165
 msgid ""
 "Products which need to be in the cart to use this coupon or, for \"Product "
 "Discounts\", which products are discounted."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:117
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:170
 msgid "Exclude products"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:130
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:182
 msgid ""
 "Products which must not be in the cart to use this coupon or, for \"Product "
 "Discounts\", which products are not discounted."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:137
-msgid "Product categories"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:138
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:190
 msgid "Any category"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:147
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:199
 msgid ""
 "A product must be in this category for the coupon to remain valid or, for "
 "\"Product Discounts\", products in these categories will be discounted."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:152
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:204
 msgid "Exclude categories"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:153
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:205
 msgid "No categories"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:162
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:214
 msgid ""
 "Product must not be in this category for the coupon to remain valid or, for "
 "\"Product Discounts\", products in these categories will not be discounted."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:168
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:222
 msgid "Email restrictions"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:168
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:223
 msgid "No restrictions"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:168
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:224
 msgid ""
 "List of allowed emails to check against the customer's billing email when "
 "an order is placed. Separate email addresses with commas."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:182
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:246
 msgid "Usage limit per coupon"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:182
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:247
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:279
+msgid "Unlimited usage"
+msgstr ""
+
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:248
 msgid "How many times this coupon can be used before it is void."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:188
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:262
 msgid "Limit usage to X items"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:188
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:263
+msgid "Apply to all qualifying items in cart"
+msgstr ""
+
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:264
 msgid ""
 "The maximum number of individual items this coupon can apply to when using "
 "product discounts. Leave blank to apply to all qualifying items in cart."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:194
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:278
 msgid "Usage limit per user"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:194
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:280
 msgid ""
-"How many times this coupon can be used by an invidual user. Uses billing "
+"How many times this coupon can be used by an individual user. Uses billing "
 "email for guests, and user ID for logged in users."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:231
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:316
 msgid ""
 "Coupon code already exists - customers will use the latest coupon with this "
 "code."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-actions.php:42
+#: includes/admin/meta-boxes/class-wc-meta-box-order-actions.php:50
 msgid "Resend order emails"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-actions.php:58
-msgid "Generate download permissions"
+#: includes/admin/meta-boxes/class-wc-meta-box-order-actions.php:54
+msgid "Resend %s"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-actions.php:65
-#: includes/admin/meta-boxes/views/html-order-items.php:233
+#: includes/admin/meta-boxes/class-wc-meta-box-order-actions.php:62
+msgid "Regenerate download permissions"
+msgstr ""
+
+#: includes/admin/meta-boxes/class-wc-meta-box-order-actions.php:69
 msgid "Apply"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-actions.php:82
+#: includes/admin/meta-boxes/class-wc-meta-box-order-actions.php:86
 msgid "Save %s"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-actions.php:82
+#: includes/admin/meta-boxes/class-wc-meta-box-order-actions.php:86
 msgid "Save/update the %s"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-actions.php:123
+#: includes/admin/meta-boxes/class-wc-meta-box-order-actions.php:135
+#. translators: %s: email title
 msgid "%s email notification manually sent."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:43
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:92
-#: includes/class-wc-countries.php:492 includes/class-wc-form-handler.php:177
-msgid "First Name"
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:172
+#. translators: 1: order type 2: order number
+msgid "%1$s #%2$s details"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:47
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:96
-#: includes/class-wc-countries.php:497 includes/class-wc-form-handler.php:178
-msgid "Last Name"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:86
-#: includes/class-wc-countries.php:974
-msgid "Phone"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:171
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:182
+#. translators: %s: payment method
 msgid "Payment via %s"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:184
-msgid "Customer IP"
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:196
+#. translators: 1: date 2: time
+msgid "on %1$s @ %2$s"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:190
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:205
+#. translators: %s: IP address
+msgid "Customer IP: %s"
+msgstr ""
+
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:213
 msgid "General Details"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:192
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:215
 msgid "Order date:"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:193
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:216
 msgid "h"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:196
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:219
 msgid "Order status:"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:200
-#: includes/admin/settings/class-wc-settings-checkout.php:179
-#: templates/checkout/thankyou.php:29 templates/myaccount/my-orders.php:84
-msgid "Pay"
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:223
+msgid "Customer payment page &rarr;"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:214
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:237
 msgid "Customer:"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:222
-msgid "View other orders"
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:246
+msgid "View other orders &rarr;"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:241
-#: templates/checkout/form-billing.php:32
-msgid "Billing Details"
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:273
+#: templates/checkout/form-billing.php:33
+msgid "Billing details"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:243
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:276
 msgid "Load billing address"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:250
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:252
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:335
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:337
-#: includes/class-wc-countries.php:513
-msgid "Address"
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:284
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:286
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:375
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:377
+msgid "Address:"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:252
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:286
 msgid "No billing address set."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:292
-#: includes/admin/meta-boxes/views/html-order-shipping.php:26
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:328
+#: includes/class-wc-order.php:1747
+#: includes/shortcodes/class-wc-shortcode-checkout.php:149
+#: templates/checkout/thankyou.php:63
+msgid "Payment method:"
+msgstr ""
+
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:330
+#: includes/admin/meta-boxes/views/html-order-shipping.php:24
 #: includes/admin/settings/class-wc-settings-emails.php:101
 #: includes/admin/settings/class-wc-settings-emails.php:112
-#: includes/admin/settings/views/settings-tax.php:103
-#: includes/shipping/flat-rate/includes/settings-flat-rate.php:82
-#: includes/shipping/flat-rate/includes/settings-flat-rate.php:91
-#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:100
-#: templates/order/order-details-customer.php:60
-#: templates/order/order-details-customer.php:71
-#: templates/single-product/meta.php:34
+#: includes/admin/settings/views/settings-tax.php:95
+#: includes/shipping/flat-rate/includes/settings-flat-rate.php:57
+#: includes/shipping/flat-rate/includes/settings-flat-rate.php:66
+#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:86
+#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:84
+#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:93
+#: includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php:122
+#: includes/wc-account-functions.php:264
+#: includes/wc-formatting-functions.php:1039
+#: includes/wc-formatting-functions.php:1058
+#: templates/order/order-details-customer.php:66
+#: templates/order/order-details-customer.php:78
+#: templates/single-product/meta.php:31
 msgid "N/A"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:306
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:308
-#: includes/admin/meta-boxes/views/html-order-shipping.php:42
-#: includes/admin/meta-boxes/views/html-order-shipping.php:44
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:344
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:346
+#: includes/admin/meta-boxes/views/html-order-shipping.php:39
+#: includes/admin/meta-boxes/views/html-order-shipping.php:41
 msgid "Other"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:315
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:353
 msgid "Transaction ID"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:325
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:363
 #: includes/gateways/paypal/includes/settings-paypal.php:82
-msgid "Shipping Details"
+msgid "Shipping details"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:327
-msgid "Copy from billing"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:328
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:366
 msgid "Load shipping address"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:337
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:367
+msgid "Copy billing address"
+msgstr ""
+
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:377
 msgid "No shipping address set."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:355
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:385
-msgid "Customer Provided Note"
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:399
+msgid "Customer provided note:"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:386
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:429
+msgid "Customer provided note"
+msgstr ""
+
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:430
 msgid "Customer's notes about the order"
 msgstr ""
 
 #: includes/admin/meta-boxes/class-wc-meta-box-order-downloads.php:55
-#: includes/class-wc-ajax.php:1066
+#: includes/class-wc-ajax.php:705
 msgid "File %d"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-downloads.php:68
+#: includes/admin/meta-boxes/class-wc-meta-box-order-downloads.php:67
 msgid "Search for a downloadable product&hellip;"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-downloads.php:69
-msgid "Grant Access"
+#: includes/admin/meta-boxes/class-wc-meta-box-order-downloads.php:68
+msgid "Grant access"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-notes.php:55
+#: includes/admin/meta-boxes/class-wc-meta-box-order-notes.php:58
 msgid "added on %1$s at %2$s"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-notes.php:56
+#: includes/admin/meta-boxes/class-wc-meta-box-order-notes.php:62
+#: includes/admin/views/html-admin-page-status-report.php:398
+#: includes/widgets/class-wc-widget-recent-reviews.php:85
+#. translators: %s: note author
+#. translators: %s: plugin author
+#. translators: %s: review author
 msgid "by %s"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-notes.php:57
-#: includes/class-wc-ajax.php:1710
+#: includes/admin/meta-boxes/class-wc-meta-box-order-notes.php:65
+#: includes/class-wc-ajax.php:1106
 msgid "Delete note"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-notes.php:64
+#: includes/admin/meta-boxes/class-wc-meta-box-order-notes.php:71
 msgid "There are no notes yet."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-notes.php:70
+#: includes/admin/meta-boxes/class-wc-meta-box-order-notes.php:78
 msgid "Add note"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-notes.php:70
+#: includes/admin/meta-boxes/class-wc-meta-box-order-notes.php:78
 msgid ""
 "Add a note for your reference, or add a customer note (the user will be "
 "notified)."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-notes.php:76
+#: includes/admin/meta-boxes/class-wc-meta-box-order-notes.php:82
+msgid "Note type"
+msgstr ""
+
+#: includes/admin/meta-boxes/class-wc-meta-box-order-notes.php:84
 msgid "Private note"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-notes.php:77
+#: includes/admin/meta-boxes/class-wc-meta-box-order-notes.php:85
 msgid "Note to customer"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-order-notes.php:79
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:437
-#: includes/admin/meta-boxes/views/html-order-items.php:330
-#: includes/admin/meta-boxes/views/html-order-items.php:387
+#: includes/admin/meta-boxes/class-wc-meta-box-order-notes.php:87
+#: includes/admin/meta-boxes/views/html-order-items.php:291
+#: includes/admin/meta-boxes/views/html-order-items.php:348
+#: includes/admin/meta-boxes/views/html-product-data-attributes.php:23
 msgid "Add"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:45
-msgid "Product Type"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:58
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:60
 msgid "Virtual products are intangible and aren't shipped."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:65
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:67
 msgid "Downloadable products give access to a file upon purchase."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:94
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:694
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:85
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:58
 #: includes/admin/settings/class-wc-settings-products.php:46
-#: includes/admin/settings/class-wc-settings-products.php:244
+#: includes/admin/settings/class-wc-settings-products.php:235
 msgid "Inventory"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:99
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:698
-#: includes/admin/meta-boxes/views/html-order-items.php:154
-#: includes/admin/meta-boxes/views/html-order-shipping.php:20
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:90
+#: includes/admin/meta-boxes/views/html-order-shipping.php:17
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:62
 #: includes/admin/settings/class-wc-settings-shipping.php:27
-#: includes/admin/settings/class-wc-settings-tax.php:170
-#: includes/admin/settings/views/html-settings-tax.php:25
-#: includes/wc-cart-functions.php:180 templates/cart/cart-totals.php:54
-#: templates/cart/cart-totals.php:55
+#: includes/admin/settings/class-wc-settings-tax.php:178
+#: includes/admin/settings/views/html-settings-tax.php:32
+#: includes/class-wc-order-item-shipping.php:154
+#: templates/cart/cart-totals.php:55 templates/cart/cart-totals.php:56
 msgid "Shipping"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:104
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:95
 msgid "Linked Products"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:114
-#: includes/class-wc-post-types.php:276
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:105
+#: includes/class-wc-post-types.php:303
 msgid "Variations"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:119
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:110
 msgid "Advanced"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:140
-msgid "Stock Keeping Unit"
+#: includes/admin/meta-boxes/class-wc-meta-box-product-images.php:58
+#: includes/admin/meta-boxes/class-wc-meta-box-product-images.php:78
+msgid "Delete image"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:140
+#: includes/admin/meta-boxes/class-wc-meta-box-product-images.php:78
+msgid "Add images to product gallery"
+msgstr ""
+
+#: includes/admin/meta-boxes/class-wc-meta-box-product-images.php:78
+msgid "Add to gallery"
+msgstr ""
+
+#: includes/admin/meta-boxes/class-wc-meta-box-product-images.php:78
+msgid "Add product gallery images"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-download-permission.php:9
+msgid "Revoke access"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-download-permission.php:19
+msgid "Downloaded %s time"
+msgid_plural "Downloaded %s times"
+msgstr[0] ""
+msgstr[1] ""
+
+#: includes/admin/meta-boxes/views/html-order-download-permission.php:26
+#: includes/wc-account-functions.php:203
+msgid "Downloads remaining"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-download-permission.php:28
+#: includes/admin/meta-boxes/views/html-product-data-general.php:98
+#: includes/admin/meta-boxes/views/html-variation-admin.php:360
+msgid "Unlimited"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-download-permission.php:31
+msgid "Access expires"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-download-permission.php:32
+#: includes/admin/meta-boxes/views/html-product-data-general.php:111
+#: includes/admin/meta-boxes/views/html-variation-admin.php:376
+#: templates/myaccount/downloads.php:68
+msgid "Never"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-download-permission.php:35
+msgid "Customer download link"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-fee.php:18
+#: includes/class-wc-order-item-fee.php:121
+msgid "Fee"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-fee.php:21
+msgid "Fee name"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-item-meta.php:51
+msgid "Add&nbsp;meta"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-item.php:24
+#: templates/single-product/meta.php:31
+msgid "SKU:"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-item.php:28
+msgid "Variation ID:"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-item.php:33
+#. translators: %s: variation id
+msgid "%s (No longer exists)"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-item.php:93
+#: includes/admin/meta-boxes/views/html-order-item.php:139
+msgid "Pre-discount:"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-item.php:98
+msgid "After pre-tax discounts."
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-item.php:159
+msgid "Edit item"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-item.php:159
+msgid "Delete item"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:28
+#: includes/class-wc-form-handler.php:460
+#: includes/gateways/paypal/includes/class-wc-gateway-paypal-request.php:338
+msgid "Item"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:30
+#: includes/shipping/flat-rate/includes/settings-flat-rate.php:31
+#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:58
+#: includes/shipping/local-pickup/class-wc-shipping-local-pickup.php:87
+msgid "Cost"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:31
+#: templates/checkout/form-pay.php:30
+msgid "Qty"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:37
+#: includes/admin/meta-boxes/views/html-order-items.php:38
+#: includes/admin/reports/class-wc-report-taxes-by-code.php:149
+#: includes/admin/settings/class-wc-settings-tax.php:33
+#: includes/class-wc-countries.php:350 includes/class-wc-order-item-tax.php:159
+#: includes/class-wc-tax.php:753
+msgid "Tax"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:95
+msgid "Delete selected row(s)"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:96
+msgid "Reduce stock"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:97
+msgid "Increase stock"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:107
+msgid "Coupon(s)"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:121
+msgid "This is the total discount. Discounts are defined per line item."
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:131
+msgid "This is the shipping and handling total costs for the order."
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:163
+msgid "Order total"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:184
+msgid "Refunded"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:198
+msgid "Add item(s)"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:200
+msgid "To edit this order change the status back to \"Pending\""
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:200
+msgid "This order is no longer editable."
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:203
+#: includes/admin/meta-boxes/views/html-order-items.php:305
+msgid "Add tax"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:206
+#: includes/class-wc-order.php:1763
+msgid "Refund"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:213
+msgid "Calculate taxes"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:214
+msgid "Calculate total"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:219
+msgid "Add product(s)"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:220
+msgid "Add fee"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:221
+msgid "Add shipping cost"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:227
+#: templates/myaccount/form-reset-password.php:47
+msgid "Save"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:233
+msgid "Restock refunded items"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:237
+msgid "Amount already refunded"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:241
+msgid "Total available to refund"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:245
+#: includes/admin/reports/class-wc-report-sales-by-date.php:677
+msgid "Refund amount"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:252
+msgid "Note: the refund reason will be visible by the customer."
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:252
+msgid "Reason for refund (optional):"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:264
+msgid "Payment gateway"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:266
 msgid ""
-"SKU refers to a Stock-keeping unit, a unique identifier for each distinct "
-"product and service that can be purchased."
+"The payment gateway used to place this order does not support automatic "
+"refunds."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:152
+#: includes/admin/meta-boxes/views/html-order-items.php:266
+msgid "Refund %1$s via %2$s"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:267
+msgid ""
+"You will need to manually issue a refund through your payment gateway after "
+"using this."
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:267
+msgid "Refund %s manually"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:279
+msgid "Add products"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:316
+msgid "Rate name"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:317
+#: includes/admin/meta-boxes/views/html-product-data-general.php:143
+#: includes/admin/meta-boxes/views/html-variation-admin.php:281
+#: includes/admin/settings/class-wc-settings-tax.php:179
+#: includes/admin/views/html-bulk-edit-product.php:89
+#: includes/admin/views/html-quick-edit-product.php:68
+msgid "Tax class"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:318
+msgid "Rate code"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:319
+#: includes/admin/settings/class-wc-settings-tax.php:174
+msgid "Rate %"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:340
+msgid "Or, enter tax rate ID:"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:341
+#: includes/gateways/paypal/includes/settings-paypal.php:113
+#: includes/gateways/paypal/includes/settings-paypal.php:121
+#: includes/gateways/paypal/includes/settings-paypal.php:134
+#: includes/gateways/paypal/includes/settings-paypal.php:142
+#: includes/gateways/paypal/includes/settings-paypal.php:150
+msgid "Optional"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-refund.php:17
+#. translators: 1: refund id 2: date
+msgid "Refund #%1$s - %2$s"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-shipping.php:21
+msgid "Shipping name"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-shipping.php:23
+msgid "Shipping method"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-product-attribute.php:29
+msgid "Select terms"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-product-attribute.php:47
+msgid "Add new"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-product-attribute.php:59
+#. translators: %s: WC_DELIMITER
+msgid "\"%s\" separate terms"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-product-attribute.php:69
+msgid "Enter some text, or some attributes by \"%s\" separating values."
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-product-data-advanced.php:8
+msgid "Purchase note"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-product-data-advanced.php:10
+msgid "Enter an optional note to send the customer after purchase."
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-product-data-advanced.php:20
+msgid "Menu order"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-product-data-advanced.php:22
+msgid "Custom ordering position."
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-product-data-advanced.php:36
+msgid "Enable reviews"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-product-data-attributes.php:4
+#: includes/admin/meta-boxes/views/html-product-data-attributes.php:46
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:79
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:113
+msgid "Expand"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-product-data-attributes.php:4
+#: includes/admin/meta-boxes/views/html-product-data-attributes.php:46
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:79
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:113
+msgid "Close"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-product-data-attributes.php:7
+msgid "Custom product attribute"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-product-data-attributes.php:48
+msgid "Save attributes"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-product-data-general.php:8
 msgid "Product URL"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:152
+#: includes/admin/meta-boxes/views/html-product-data-general.php:10
 msgid "Enter the external URL to the product."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:155
+#: includes/admin/meta-boxes/views/html-product-data-general.php:16
 msgid "Button text"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:155
+#: includes/admin/meta-boxes/views/html-product-data-general.php:18
 msgid "This text will be shown on the button linking to the external product."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:162
+#: includes/admin/meta-boxes/views/html-product-data-general.php:28
 #: includes/admin/views/html-quick-edit-product.php:35
-msgid "Regular Price"
+msgid "Regular price"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:165
+#: includes/admin/meta-boxes/views/html-product-data-general.php:36
 #: includes/admin/views/html-quick-edit-product.php:42
-msgid "Sale Price"
+msgid "Sale price"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:165
-#: includes/admin/meta-boxes/views/html-variation-admin.php:97
+#: includes/admin/meta-boxes/views/html-product-data-general.php:37
+#: includes/admin/meta-boxes/views/html-variation-admin.php:124
 msgid "Schedule"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:172
-msgid "Sale Price Dates"
+#: includes/admin/meta-boxes/views/html-product-data-general.php:44
+msgid "Sale price dates"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:175
+#: includes/admin/meta-boxes/views/html-product-data-general.php:47
 msgid "The sale will end at the beginning of the set date."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:186
-#: includes/admin/meta-boxes/views/html-variation-admin.php:254
-msgid "Downloadable Files"
+#: includes/admin/meta-boxes/views/html-product-data-general.php:56
+#: includes/admin/meta-boxes/views/html-variation-admin.php:316
+msgid "Downloadable files"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:191
-#: includes/admin/meta-boxes/views/html-variation-admin.php:258
+#: includes/admin/meta-boxes/views/html-product-data-general.php:61
+#: includes/admin/meta-boxes/views/html-variation-admin.php:320
 msgid "This is the name of the download shown to the customer."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:192
-#: includes/admin/meta-boxes/views/html-variation-admin.php:259
+#: includes/admin/meta-boxes/views/html-product-data-general.php:62
+#: includes/admin/meta-boxes/views/html-variation-admin.php:321
 msgid "File URL"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:192
-#: includes/admin/meta-boxes/views/html-variation-admin.php:259
+#: includes/admin/meta-boxes/views/html-product-data-general.php:62
+#: includes/admin/meta-boxes/views/html-variation-admin.php:321
 msgid ""
 "This is the URL or absolute path to the file which customers will get "
 "access to. URLs entered here should already be encoded."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:218
-#: includes/admin/meta-boxes/views/html-variation-admin.php:289
+#: includes/admin/meta-boxes/views/html-product-data-general.php:87
 msgid "Add File"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:227
-msgid "Download Limit"
+#: includes/admin/meta-boxes/views/html-product-data-general.php:97
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:69
+#: includes/admin/meta-boxes/views/html-variation-admin.php:359
+msgid "Download limit"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:227
-#: includes/admin/meta-boxes/views/html-order-download-permission.php:23
-#: includes/admin/meta-boxes/views/html-variation-admin.php:299
-#: includes/admin/meta-boxes/views/html-variation-admin.php:303
-msgid "Unlimited"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:227
-#: includes/admin/meta-boxes/views/html-variation-admin.php:298
+#: includes/admin/meta-boxes/views/html-product-data-general.php:99
+#: includes/admin/meta-boxes/views/html-variation-admin.php:361
 msgid "Leave blank for unlimited re-downloads."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:233
-msgid "Download Expiry"
+#: includes/admin/meta-boxes/views/html-product-data-general.php:110
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:70
+#: includes/admin/meta-boxes/views/html-variation-admin.php:375
+msgid "Download expiry"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:233
-#: includes/admin/meta-boxes/views/html-order-download-permission.php:27
-msgid "Never"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:233
-#: includes/admin/meta-boxes/views/html-variation-admin.php:302
+#: includes/admin/meta-boxes/views/html-product-data-general.php:112
+#: includes/admin/meta-boxes/views/html-variation-admin.php:377
 msgid "Enter the number of days before a download link expires, or leave blank."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:239
-msgid "Download Type"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:239
-msgid "Choose a download type - this controls the <a href=\"%s\">schema</a>."
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:240
-msgid "Standard Product"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:241
-msgid "Application/Software"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:242
-msgid "Music"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:256
+#: includes/admin/meta-boxes/views/html-product-data-general.php:130
 #: includes/admin/views/html-bulk-edit-product.php:70
 #: includes/admin/views/html-quick-edit-product.php:50
-#: includes/shipping/flat-rate/includes/settings-flat-rate.php:48
-msgid "Tax Status"
+#: includes/shipping/flat-rate/includes/settings-flat-rate.php:21
+#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:48
+#: includes/shipping/local-pickup/class-wc-shipping-local-pickup.php:77
+msgid "Tax status"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:258
+#: includes/admin/meta-boxes/views/html-product-data-general.php:132
 #: includes/admin/views/html-bulk-edit-product.php:76
 #: includes/admin/views/html-quick-edit-product.php:55
-#: includes/shipping/flat-rate/includes/settings-flat-rate.php:53
+#: includes/shipping/flat-rate/includes/settings-flat-rate.php:26
+#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:53
+#: includes/shipping/local-pickup/class-wc-shipping-local-pickup.php:82
 msgid "Taxable"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:259
+#: includes/admin/meta-boxes/views/html-product-data-general.php:133
 #: includes/admin/views/html-bulk-edit-product.php:77
 #: includes/admin/views/html-quick-edit-product.php:56
 msgid "Shipping only"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:263
+#: includes/admin/meta-boxes/views/html-product-data-general.php:137
 msgid ""
 "Define whether or not the entire product is taxable, or just the cost of "
 "shipping it."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:268
-#: includes/admin/meta-boxes/views/html-order-items.php:21
-#: includes/admin/settings/views/html-settings-tax.php:11
-#: includes/admin/settings/views/settings-tax.php:53
-#: includes/admin/views/html-bulk-edit-product.php:95
-#: includes/admin/views/html-quick-edit-product.php:73
-#: includes/class-wc-ajax.php:824 includes/class-wc-ajax.php:2421
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:210
-msgid "Standard"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:278
-#: includes/admin/settings/class-wc-settings-tax.php:171
-#: includes/admin/views/html-bulk-edit-product.php:89
-#: includes/admin/views/html-quick-edit-product.php:68
-msgid "Tax Class"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:281
+#: includes/admin/meta-boxes/views/html-product-data-general.php:146
+#: includes/admin/meta-boxes/views/html-variation-admin.php:284
 msgid ""
 "Choose a tax class for this product. Tax classes are used to apply "
 "different tax rates specific to certain types of product."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:303
-#: includes/admin/meta-boxes/views/html-variation-admin.php:84
-#: includes/admin/views/html-bulk-edit-product.php:236
-#: includes/admin/views/html-quick-edit-product.php:182
+#: includes/admin/meta-boxes/views/html-product-data-inventory.php:9
+#: includes/admin/meta-boxes/views/html-variation-admin.php:64
+msgid "Stock Keeping Unit"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-product-data-inventory.php:11
+#: includes/admin/meta-boxes/views/html-variation-admin.php:66
+msgid ""
+"SKU refers to a Stock-keeping unit, a unique identifier for each distinct "
+"product and service that can be purchased."
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-product-data-inventory.php:23
+#: includes/admin/meta-boxes/views/html-variation-admin.php:87
+#: includes/admin/views/html-bulk-edit-product.php:233
+#: includes/admin/views/html-quick-edit-product.php:178
 msgid "Manage stock?"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:303
+#: includes/admin/meta-boxes/views/html-product-data-inventory.php:24
 msgid "Enable stock management at product level"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:312
-#: includes/admin/views/html-bulk-edit-product.php:255
-#: includes/admin/views/html-bulk-edit-product.php:271
-#: includes/admin/views/html-quick-edit-product.php:186
-msgid "Stock Qty"
+#: includes/admin/meta-boxes/views/html-product-data-inventory.php:34
+#: includes/admin/meta-boxes/views/html-variation-admin.php:162
+msgid "Stock quantity"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:314
+#: includes/admin/meta-boxes/views/html-product-data-inventory.php:36
 msgid ""
 "Stock quantity. If this is a variable product this value will be used to "
 "control stock for all variations, unless you define stock at variation "
 "level."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:323
-#: includes/admin/meta-boxes/views/html-variation-admin.php:133
-msgid "Allow Backorders?"
+#: includes/admin/meta-boxes/views/html-product-data-inventory.php:47
+#: includes/admin/meta-boxes/views/html-variation-admin.php:177
+msgid "Allow backorders?"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:324
-#: includes/admin/views/html-bulk-edit-product.php:282
-#: includes/admin/views/html-quick-edit-product.php:201
-#: includes/class-wc-ajax.php:834 includes/class-wc-ajax.php:2431
-msgid "Do not allow"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:325
-#: includes/admin/views/html-bulk-edit-product.php:283
-#: includes/admin/views/html-quick-edit-product.php:202
-#: includes/class-wc-ajax.php:835 includes/class-wc-ajax.php:2432
-msgid "Allow, but notify customer"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:327
+#: includes/admin/meta-boxes/views/html-product-data-inventory.php:50
+#: includes/admin/meta-boxes/views/html-variation-admin.php:180
 msgid ""
 "If managing stock, this controls whether or not backorders are allowed. If "
 "enabled, stock quantity can go below 0."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:336
-#: includes/admin/meta-boxes/views/html-variation-admin.php:160
-#: includes/admin/reports/class-wc-report-stock.php:158
+#: includes/admin/meta-boxes/views/html-product-data-inventory.php:62
+#: includes/admin/meta-boxes/views/html-variation-admin.php:204
+#: includes/admin/reports/class-wc-report-stock.php:167
 msgid "Stock status"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:339
-#: includes/admin/meta-boxes/views/html-variation-admin.php:160
+#: includes/admin/meta-boxes/views/html-product-data-inventory.php:65
+#: includes/admin/meta-boxes/views/html-variation-admin.php:207
+#: includes/api/class-wc-rest-products-controller.php:1596
+#: includes/api/v1/class-wc-rest-products-controller.php:1954
 msgid ""
 "Controls whether or not the product is listed as \"in stock\" or \"out of "
 "stock\" on the frontend."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:348
-msgid "Sold Individually"
+#: includes/admin/meta-boxes/views/html-product-data-inventory.php:78
+msgid "Sold individually"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:348
+#: includes/admin/meta-boxes/views/html-product-data-inventory.php:79
 msgid "Enable this to only allow one of this item to be bought in a single order"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:367
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:702
-#: includes/admin/meta-boxes/views/html-variation-admin.php:175
-#: includes/admin/views/html-bulk-edit-product.php:117
-#: includes/admin/views/html-quick-edit-product.php:98
-#: templates/single-product/product-attributes.php:37
-msgid "Weight"
+#: includes/admin/meta-boxes/views/html-product-data-linked-products.php:5
+msgid "Up-sells"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:367
-msgid "Weight in decimal form"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:373
-#: templates/single-product/product-attributes.php:44
-msgid "Dimensions"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:375
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:699
-#: includes/admin/views/html-quick-edit-product.php:111
-msgid "Length"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:376
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:700
-#: includes/admin/views/html-quick-edit-product.php:112
-msgid "Width"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:377
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:701
-#: includes/admin/views/html-quick-edit-product.php:113
-msgid "Height"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:379
-msgid "LxWxH in decimal form"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:400
-#: includes/admin/views/html-bulk-edit-product.php:169
-#: includes/admin/views/html-quick-edit-product.php:126
-msgid "No shipping class"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:406
-#: includes/admin/views/html-bulk-edit-product.php:165
-#: includes/admin/views/html-quick-edit-product.php:123
-msgid "Shipping class"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:406
-msgid ""
-"Shipping classes are used by certain shipping methods to group similar "
-"products."
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:418
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:477
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:715
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:749
-msgid "Expand"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:418
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:477
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:715
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:749
-msgid "Close"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:421
-msgid "Custom product attribute"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:479
-msgid "Save Attributes"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:488
-msgid "Up-Sells"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:501
+#: includes/admin/meta-boxes/views/html-product-data-linked-products.php:17
 msgid ""
 "Up-sells are products which you recommend instead of the currently viewed "
 "product, for example, products that are more profitable or better quality "
 "or more expensive."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:505
-msgid "Cross-Sells"
+#: includes/admin/meta-boxes/views/html-product-data-linked-products.php:21
+msgid "Cross-sells"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:518
+#: includes/admin/meta-boxes/views/html-product-data-linked-products.php:33
 msgid ""
 "Cross-sells are products which you promote in the cart, based on the "
 "current product."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:525
-msgid "Grouping"
+#: includes/admin/meta-boxes/views/html-product-data-linked-products.php:37
+msgid "Grouped products"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:537
-msgid "Set this option to make this product part of a grouped product."
+#: includes/admin/meta-boxes/views/html-product-data-linked-products.php:49
+msgid "This lets you choose which products are part of this group."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:555
-msgid "Purchase Note"
+#: includes/admin/meta-boxes/views/html-product-data-panel.php:6
+msgid "Product Type"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:555
-msgid "Enter an optional note to send the customer after purchase."
+#: includes/admin/meta-boxes/views/html-product-data-shipping.php:8
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:66
+#: includes/admin/views/html-bulk-edit-product.php:117
+#: includes/admin/views/html-quick-edit-product.php:98
+#: templates/single-product/product-attributes.php:28
+msgid "Weight"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:562
-msgid "Menu order"
+#: includes/admin/meta-boxes/views/html-product-data-shipping.php:11
+#: includes/admin/meta-boxes/views/html-variation-admin.php:225
+msgid "Weight in decimal form"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:562
-msgid "Custom ordering position."
+#: includes/admin/meta-boxes/views/html-product-data-shipping.php:19
+msgid "Dimensions (%s)"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:570
-msgid "Enable reviews"
+#: includes/admin/meta-boxes/views/html-product-data-shipping.php:21
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:63
+#: includes/admin/meta-boxes/views/html-variation-admin.php:243
+#: includes/admin/views/html-quick-edit-product.php:111
+msgid "Length"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:623
+#: includes/admin/meta-boxes/views/html-product-data-shipping.php:22
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:64
+#: includes/admin/meta-boxes/views/html-variation-admin.php:244
+#: includes/admin/views/html-quick-edit-product.php:112
+msgid "Width"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-product-data-shipping.php:23
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:65
+#: includes/admin/meta-boxes/views/html-variation-admin.php:245
+#: includes/admin/views/html-quick-edit-product.php:113
+msgid "Height"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-product-data-shipping.php:25
+msgid "LxWxH in decimal form"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-product-data-shipping.php:38
+#: includes/admin/views/html-bulk-edit-product.php:169
+#: includes/admin/views/html-quick-edit-product.php:126
+msgid "No shipping class"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-product-data-shipping.php:45
+#: includes/admin/meta-boxes/views/html-variation-admin.php:264
+#: includes/admin/settings/class-wc-settings-shipping.php:337
+#: includes/admin/views/html-bulk-edit-product.php:165
+#: includes/admin/views/html-quick-edit-product.php:123
+#: includes/class-wc-post-types.php:157
+msgid "Shipping class"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-product-data-shipping.php:47
+msgid ""
+"Shipping classes are used by certain shipping methods to group similar "
+"products."
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:7
 msgid ""
 "Before you can add a variation you need to add some variation attributes on "
 "the <strong>Attributes</strong> tab."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:625
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:97
-msgid "Learn more"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:633
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:15
 msgid "Default Form Values"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:633
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:15
 msgid "These are the attributes that will be pre-selected on the frontend."
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:648
-msgid "No default"
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:21
+msgid "No default %s&hellip;"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:677
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:41
 msgid "Add variation"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:678
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:42
 msgid "Create variations from all attributes"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:679
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:43
 msgid "Delete all variations"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:681
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:45
 msgid "Toggle &quot;Enabled&quot;"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:682
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:46
 msgid "Toggle &quot;Downloadable&quot;"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:683
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:47
 msgid "Toggle &quot;Virtual&quot;"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:685
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:49
 msgid "Pricing"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:686
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:50
 msgid "Set regular prices"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:687
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:51
 msgid "Increase regular prices (fixed amount or percentage)"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:688
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:52
 msgid "Decrease regular prices (fixed amount or percentage)"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:689
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:53
 msgid "Set sale prices"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:690
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:54
 msgid "Increase sale prices (fixed amount or percentage)"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:691
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:55
 msgid "Decrease sale prices (fixed amount or percentage)"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:692
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:56
 msgid "Set scheduled sale dates"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:695
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:59
 msgid "Toggle &quot;Manage stock&quot;"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:704
-msgid "Downloadable products"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:705
-msgid "Download limit"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:706
-msgid "Download expiry"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:710
-#: includes/admin/views/html-report-by-date.php:41
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:74
+#: includes/admin/views/html-report-by-date.php:56
 msgid "Go"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:713
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:747
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:77
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:111
 msgid "%s item"
 msgid_plural "%s items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:718
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:752
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:82
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:116
 msgid "Go to the first page"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:719
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:753
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:83
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:117
 msgid "Go to the previous page"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:721
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:755
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:85
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:119
 msgid "Select Page"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:722
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:756
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:86
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:120
+#: includes/admin/settings/views/html-settings-tax.php:120
 msgid "Current page"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:729
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:763
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:93
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:127
 msgid "Go to the next page"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:730
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:764
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:94
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:128
 msgid "Go to the last page"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:743
-#: includes/admin/settings/views/html-keys-edit.php:96
-#: includes/admin/views/html-admin-page-status-tools.php:69
-msgid "Save Changes"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:854
-msgid "Product SKU must be unique."
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:1167
-msgid ""
-"The downloadable file %s cannot be used as it does not have an allowed file "
-"type. Allowed types include: %s"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:1180
-msgid "The downloadable file %s cannot be used as it does not exist on the server."
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:1289
-#: includes/api/class-wc-api-products.php:1726
-#: includes/api/v2/class-wc-api-products.php:1264
-#: includes/cli/class-wc-cli-product.php:1538
-msgid "Variation #%s of %s"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:1342
-msgid "#%s &ndash; Variation SKU must be unique."
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:1462
-msgid ""
-"#%s &ndash; The downloadable file %s cannot be used as it does not have an "
-"allowed file type. Allowed types include: %s"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:1469
-msgid ""
-"#%s &ndash; The downloadable file %s cannot be used as it does not exist on "
-"the server."
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-images.php:57
-#: includes/admin/meta-boxes/class-wc-meta-box-product-images.php:77
-msgid "Delete image"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-images.php:77
-msgid "Add Images to Product Gallery"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-images.php:77
-msgid "Add to gallery"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-images.php:77
-msgid "Add product gallery images"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-download-permission.php:10
-msgid "Revoke Access"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-download-permission.php:13
-msgid "%s: %s"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-download-permission.php:13
-msgid "Downloaded %s time"
-msgid_plural "Downloaded %s times"
-msgstr[0] ""
-msgstr[1] ""
-
-#: includes/admin/meta-boxes/views/html-order-download-permission.php:20
-msgid "Downloads Remaining"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-download-permission.php:26
-msgid "Access Expires"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-fee.php:23
-msgid "Fee Name"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-item.php:19
-msgid "Product ID:"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-item.php:22
-#: includes/admin/meta-boxes/views/html-order-item.php:24
-msgid "Variation ID:"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-item.php:24
-msgid "No longer exists"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-item.php:28
-msgid "Product SKU:"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-item.php:142
-msgid "Add&nbsp;meta"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-item.php:204
-#: includes/admin/meta-boxes/views/html-order-item.php:247
-msgid "After pre-tax discounts."
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-item.php:207
-#: includes/admin/meta-boxes/views/html-order-item.php:250
-msgid "Before pre-tax discounts."
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:51
-#: includes/class-wc-form-handler.php:401
-#: includes/gateways/paypal/includes/class-wc-gateway-paypal-request.php:293
-msgid "Item"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:55
-#: includes/shipping/flat-rate/includes/settings-flat-rate.php:58
-msgid "Cost"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:56
-#: templates/checkout/form-pay.php:29
-msgid "Qty"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:63
-#: includes/admin/meta-boxes/views/html-order-items.php:64
-#: includes/admin/reports/class-wc-report-taxes-by-code.php:144
-#: includes/admin/settings/class-wc-settings-tax.php:28
-#: includes/class-wc-countries.php:290 includes/class-wc-tax.php:637
-msgid "Tax"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:129
-msgid "Coupon(s) Used"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:144
-msgid "This is the total discount. Discounts are defined per line item."
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:144
-msgid "Discount"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:154
-msgid "This is the shipping and handling total costs for the order."
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:188
-msgid "Order Total"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:208
-msgid "Refunded"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:224
-msgid "Delete selected line item(s)"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:227
-msgid "Stock Actions"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:228
-msgid "Reduce line item stock"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:229
-msgid "Increase line item stock"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:237
-msgid "Add line item(s)"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:239
-msgid "To edit this order change the status back to \"Pending\""
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:239
-msgid "This order has been paid for and is no longer editable"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:242
-msgid "Add Tax"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:252
-msgid "Calculate Taxes"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:253
-msgid "Calculate Total"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:258
-msgid "Add product(s)"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:259
-msgid "Add fee"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:260
-msgid "Add shipping cost"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:262
-#: templates/myaccount/form-lost-password.php:58
-msgid "Save"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:272
-msgid "Restock refunded items"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:276
-msgid "Amount already refunded"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:280
-msgid "Total available to refund"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:284
-#: includes/admin/reports/class-wc-report-sales-by-date.php:606
-msgid "Refund amount"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:291
-msgid "Reason for refund (optional)"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:303
-msgid "Payment Gateway"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:305
-msgid ""
-"The payment gateway used to place this order does not support automatic "
-"refunds."
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:306
-msgid ""
-"You will need to manually issue a refund through your payment gateway after "
-"using this."
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:318
-msgid "Add products"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:344
-msgid "Add tax"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:355
-msgid "Rate name"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:356
-msgid "Tax class"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:357
-msgid "Rate code"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:358
-#: includes/admin/settings/class-wc-settings-tax.php:166
-msgid "Rate %"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:379
-msgid "Or, enter tax rate ID:"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:380
-#: includes/gateways/paypal/includes/settings-paypal.php:113
-#: includes/gateways/paypal/includes/settings-paypal.php:126
-#: includes/gateways/paypal/includes/settings-paypal.php:134
-#: includes/gateways/paypal/includes/settings-paypal.php:142
-msgid "Optional"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-refund.php:21
-msgid "ID: "
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-shipping.php:23
-msgid "Shipping Name"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-shipping.php:25
-msgid "Shipping Method"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-product-attribute.php:30
-msgid "Select terms"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-product-attribute.php:42
-msgid "Add new"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-product-attribute.php:51
-msgid "\"%s\" separate terms"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-product-attribute.php:59
-msgid "Enter some text, or some attributes by \"%s\" separating values."
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-product-download.php:3
-#: includes/admin/meta-boxes/views/html-product-variation-download.php:2
-msgid "File Name"
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:107
+#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:90
+#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:142
+#: includes/admin/settings/views/html-keys-edit.php:105
+#: includes/admin/views/html-admin-page-status-tools.php:29
+#: includes/admin/views/html-admin-settings.php:31
+#: templates/myaccount/form-edit-account.php:66
+msgid "Save changes"
 msgstr ""
 
 #: includes/admin/meta-boxes/views/html-product-download.php:4
 #: includes/admin/meta-boxes/views/html-product-variation-download.php:3
+msgid "File name"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-product-download.php:7
+#: includes/admin/meta-boxes/views/html-product-variation-download.php:6
 msgid "http://"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-product-download.php:5
-#: includes/admin/meta-boxes/views/html-product-variation-download.php:4
+#: includes/admin/meta-boxes/views/html-product-download.php:8
+#: includes/admin/meta-boxes/views/html-product-variation-download.php:7
 msgid "Choose file"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-product-download.php:5
-#: includes/admin/meta-boxes/views/html-product-variation-download.php:4
+#: includes/admin/meta-boxes/views/html-product-download.php:8
+#: includes/admin/meta-boxes/views/html-product-variation-download.php:7
 msgid "Insert file URL"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-variation-admin.php:19
+#: includes/admin/meta-boxes/views/html-variation-admin.php:18
 msgid "Drag and drop, or click to set admin variation order"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-variation-admin.php:33
-#: includes/class-wc-product-variation.php:680
-msgid "Any"
+#: includes/admin/meta-boxes/views/html-variation-admin.php:32
+#. translators: %s: attribute label
+msgid "Any %s&hellip;"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-variation-admin.php:64
+#: includes/admin/meta-boxes/views/html-variation-admin.php:53
 msgid "Remove this image"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-variation-admin.php:64
+#: includes/admin/meta-boxes/views/html-variation-admin.php:53
 msgid "Upload an image"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-variation-admin.php:68
-msgid "Enter a SKU for this variation or leave blank to use the parent product SKU."
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-variation-admin.php:76
-#: includes/admin/settings/class-wc-settings-checkout.php:272
-#: includes/admin/settings/class-wc-settings-emails.php:269
-#: includes/admin/settings/class-wc-settings-shipping.php:191
-#: includes/admin/views/html-admin-page-status-tools.php:37
-#: includes/admin/views/html-admin-page-status-tools.php:48
-#: includes/admin/views/html-admin-page-status-tools.php:59
+#: includes/admin/meta-boxes/views/html-variation-admin.php:73
+#: includes/admin/settings/class-wc-settings-checkout.php:290
+#: includes/admin/settings/class-wc-settings-emails.php:274
+#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:72
 msgid "Enabled"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-variation-admin.php:78
+#: includes/admin/meta-boxes/views/html-variation-admin.php:76
 msgid ""
 "Enable this option if access is given to a downloadable file upon purchase "
 "of a product"
@@ -9208,193 +9852,187 @@ msgstr ""
 msgid "Enable this option if a product is not shipped or there is no shipping cost"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-variation-admin.php:84
+#: includes/admin/meta-boxes/views/html-variation-admin.php:86
 msgid "Enable this option to enable stock management at variation level"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-variation-admin.php:93
-msgid "Regular Price:"
+#: includes/admin/meta-boxes/views/html-variation-admin.php:99
+#. translators: %s: currency symbol
+msgid "Regular price (%s)"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-variation-admin.php:94
+#: includes/admin/meta-boxes/views/html-variation-admin.php:110
 msgid "Variation price (required)"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-variation-admin.php:97
-msgid "Sale Price:"
+#: includes/admin/meta-boxes/views/html-variation-admin.php:115
+#. translators: %s: currency symbol
+msgid "Sale price (%s)"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-variation-admin.php:97
+#: includes/admin/meta-boxes/views/html-variation-admin.php:124
 msgid "Cancel schedule"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-variation-admin.php:103
-msgid "Sale start date:"
+#: includes/admin/meta-boxes/views/html-variation-admin.php:133
+msgid "Sale start date"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-variation-admin.php:107
-msgid "Sale end date:"
+#: includes/admin/meta-boxes/views/html-variation-admin.php:137
+msgid "Sale end date"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-variation-admin.php:129
-msgid "Stock Qty:"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-variation-admin.php:129
+#: includes/admin/meta-boxes/views/html-variation-admin.php:164
 msgid ""
 "Enter a quantity to enable stock management at variation level, or leave "
 "blank to use the parent product's options."
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-variation-admin.php:175
-msgid ""
-"Enter a weight for this variation or leave blank to use the parent product "
-"weight."
+#: includes/admin/meta-boxes/views/html-variation-admin.php:214
+#. translators: %s: weight unit
+msgid "Weight (%s)"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-variation-admin.php:183
-msgid "Dimensions (L&times;W&times;H)"
+#: includes/admin/meta-boxes/views/html-variation-admin.php:237
+#. translators: %s: dimension unit
+msgid "Dimensions (L&times;W&times;H) (%s)"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-variation-admin.php:207
-msgid "Shipping class:"
+#: includes/admin/meta-boxes/views/html-variation-admin.php:241
+msgid "Length x width x height in decimal form"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-variation-admin.php:211
-#: includes/admin/meta-boxes/views/html-variation-admin.php:225
+#: includes/admin/meta-boxes/views/html-variation-admin.php:268
+#: includes/admin/meta-boxes/views/html-variation-admin.php:282
 msgid "Same as parent"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-variation-admin.php:223
-msgid "Tax class:"
+#: includes/admin/meta-boxes/views/html-variation-admin.php:309
+msgid "Enter an optional description for this variation."
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-variation-admin.php:248
-msgid "Variation Description:"
+#: includes/admin/meta-boxes/views/html-variation-admin.php:346
+msgid "Add file"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-variation-admin.php:298
-msgid "Download Limit:"
+#: includes/admin/reports/class-wc-admin-report.php:495
+#. translators: 1: total income 2: days
+msgid "Sold %1$s worth in the last %2$d days"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-variation-admin.php:302
-msgid "Download Expiry:"
-msgstr ""
-
-#: includes/admin/reports/class-wc-admin-report.php:449
-msgid "Sold %s worth in the last %d days"
-msgstr ""
-
-#: includes/admin/reports/class-wc-admin-report.php:451
-msgid "Sold 1 item in the last %d days"
-msgid_plural "Sold %d items in the last %d days"
+#: includes/admin/reports/class-wc-admin-report.php:498
+#. translators: 1: total items sold 2: days
+msgid "Sold 1 item in the last %2$d days"
+msgid_plural "Sold %1$d items in the last %2$d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/admin/reports/class-wc-report-coupon-usage.php:99
+#: includes/admin/reports/class-wc-report-coupon-usage.php:109
+#. translators: %s: discount amount
 msgid "%s discounts in total"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-coupon-usage.php:105
-msgid "%d coupons used in total"
+#: includes/admin/reports/class-wc-report-coupon-usage.php:116
+#. translators: %s: coupons amount
+msgid "%s coupons used in total"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-coupon-usage.php:119
-#: includes/admin/reports/class-wc-report-customers.php:146
-#: includes/admin/reports/class-wc-report-sales-by-category.php:85
-#: includes/admin/reports/class-wc-report-sales-by-date.php:415
-#: includes/admin/reports/class-wc-report-sales-by-product.php:105
-#: includes/admin/reports/class-wc-report-taxes-by-code.php:44
-#: includes/admin/reports/class-wc-report-taxes-by-date.php:44
+#: includes/admin/reports/class-wc-report-coupon-usage.php:130
+#: includes/admin/reports/class-wc-report-customers.php:163
+#: includes/admin/reports/class-wc-report-sales-by-category.php:114
+#: includes/admin/reports/class-wc-report-sales-by-date.php:477
+#: includes/admin/reports/class-wc-report-sales-by-product.php:128
+#: includes/admin/reports/class-wc-report-taxes-by-code.php:49
+#: includes/admin/reports/class-wc-report-taxes-by-date.php:49
 msgid "Year"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-coupon-usage.php:120
-#: includes/admin/reports/class-wc-report-customers.php:147
-#: includes/admin/reports/class-wc-report-sales-by-category.php:86
-#: includes/admin/reports/class-wc-report-sales-by-date.php:416
-#: includes/admin/reports/class-wc-report-sales-by-product.php:106
-#: includes/admin/reports/class-wc-report-taxes-by-code.php:45
-#: includes/admin/reports/class-wc-report-taxes-by-date.php:45
-msgid "Last Month"
+#: includes/admin/reports/class-wc-report-coupon-usage.php:131
+#: includes/admin/reports/class-wc-report-customers.php:164
+#: includes/admin/reports/class-wc-report-sales-by-category.php:115
+#: includes/admin/reports/class-wc-report-sales-by-date.php:478
+#: includes/admin/reports/class-wc-report-sales-by-product.php:129
+#: includes/admin/reports/class-wc-report-taxes-by-code.php:50
+#: includes/admin/reports/class-wc-report-taxes-by-date.php:50
+msgid "Last month"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-coupon-usage.php:121
-#: includes/admin/reports/class-wc-report-customers.php:148
-#: includes/admin/reports/class-wc-report-sales-by-category.php:87
-#: includes/admin/reports/class-wc-report-sales-by-date.php:417
-#: includes/admin/reports/class-wc-report-sales-by-product.php:107
-#: includes/admin/reports/class-wc-report-taxes-by-code.php:46
-#: includes/admin/reports/class-wc-report-taxes-by-date.php:46
-msgid "This Month"
+#: includes/admin/reports/class-wc-report-coupon-usage.php:132
+#: includes/admin/reports/class-wc-report-customers.php:165
+#: includes/admin/reports/class-wc-report-sales-by-category.php:116
+#: includes/admin/reports/class-wc-report-sales-by-date.php:479
+#: includes/admin/reports/class-wc-report-sales-by-product.php:130
+#: includes/admin/reports/class-wc-report-taxes-by-code.php:51
+#: includes/admin/reports/class-wc-report-taxes-by-date.php:51
+msgid "This month"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-coupon-usage.php:122
-#: includes/admin/reports/class-wc-report-customers.php:149
-#: includes/admin/reports/class-wc-report-sales-by-category.php:88
-#: includes/admin/reports/class-wc-report-sales-by-date.php:418
-#: includes/admin/reports/class-wc-report-sales-by-product.php:108
-msgid "Last 7 Days"
+#: includes/admin/reports/class-wc-report-coupon-usage.php:133
+#: includes/admin/reports/class-wc-report-customers.php:166
+#: includes/admin/reports/class-wc-report-sales-by-category.php:117
+#: includes/admin/reports/class-wc-report-sales-by-date.php:480
+#: includes/admin/reports/class-wc-report-sales-by-product.php:131
+msgid "Last 7 days"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-coupon-usage.php:162
+#: includes/admin/reports/class-wc-report-coupon-usage.php:173
 msgid "Filter by coupon"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-coupon-usage.php:190
+#: includes/admin/reports/class-wc-report-coupon-usage.php:201
 msgid "Choose coupons&hellip;"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-coupon-usage.php:191
+#: includes/admin/reports/class-wc-report-coupon-usage.php:202
 msgid "All coupons"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-coupon-usage.php:198
-#: includes/admin/reports/class-wc-report-sales-by-category.php:195
-#: includes/admin/reports/class-wc-report-sales-by-product.php:182
+#: includes/admin/reports/class-wc-report-coupon-usage.php:209
+#: includes/admin/reports/class-wc-report-sales-by-category.php:224
+#: includes/admin/reports/class-wc-report-sales-by-product.php:205
 #: includes/widgets/class-wc-widget-products.php:43
 msgid "Show"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-coupon-usage.php:206
+#: includes/admin/reports/class-wc-report-coupon-usage.php:217
 msgid "No used coupons found"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-coupon-usage.php:211
-msgid "Most Popular"
+#: includes/admin/reports/class-wc-report-coupon-usage.php:222
+msgid "Most popular"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-coupon-usage.php:253
-#: includes/admin/reports/class-wc-report-coupon-usage.php:301
+#: includes/admin/reports/class-wc-report-coupon-usage.php:264
+#: includes/admin/reports/class-wc-report-coupon-usage.php:311
 msgid "No coupons found in range"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-coupon-usage.php:258
-msgid "Most Discount"
+#: includes/admin/reports/class-wc-report-coupon-usage.php:269
+msgid "Most discount"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-coupon-usage.php:344
-#: includes/admin/reports/class-wc-report-customers.php:213
-#: includes/admin/reports/class-wc-report-sales-by-category.php:238
-#: includes/admin/reports/class-wc-report-sales-by-date.php:459
-#: includes/admin/reports/class-wc-report-sales-by-product.php:368
-#: includes/admin/reports/class-wc-report-taxes-by-code.php:33
-#: includes/admin/reports/class-wc-report-taxes-by-date.php:33
-#: includes/admin/settings/views/html-settings-tax.php:33
+#: includes/admin/reports/class-wc-report-coupon-usage.php:354
+#: includes/admin/reports/class-wc-report-customers.php:230
+#: includes/admin/reports/class-wc-report-sales-by-category.php:267
+#: includes/admin/reports/class-wc-report-sales-by-date.php:521
+#: includes/admin/reports/class-wc-report-sales-by-product.php:380
+#: includes/admin/reports/class-wc-report-taxes-by-code.php:38
+#: includes/admin/reports/class-wc-report-taxes-by-date.php:38
+#: includes/admin/settings/views/html-settings-tax.php:40
 msgid "Export CSV"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-coupon-usage.php:451
+#: includes/admin/reports/class-wc-report-coupon-usage.php:461
 msgid "Number of coupons used"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-coupon-usage.php:459
+#: includes/admin/reports/class-wc-report-coupon-usage.php:469
 msgid "Discount amount"
 msgstr ""
 
 #: includes/admin/reports/class-wc-report-customer-list.php:27
-#: includes/admin/settings/class-wc-settings-emails.php:260
-#: includes/class-wc-install.php:485
+#: includes/admin/settings/class-wc-settings-emails.php:265
+#: includes/class-wc-install.php:653
 msgid "Customer"
 msgstr ""
 
@@ -9416,78 +10054,85 @@ msgstr ""
 msgid "Search customers"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-customer-list.php:163
+#: includes/admin/reports/class-wc-report-customer-list.php:153
 msgid "Refresh stats"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-customer-list.php:175
+#: includes/admin/reports/class-wc-report-customer-list.php:165
 msgid "View orders"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-customer-list.php:200
+#: includes/admin/reports/class-wc-report-customer-list.php:178
 msgid "Link previous orders"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-customer-list.php:228
+#: includes/admin/reports/class-wc-report-customer-list.php:208
 msgid "Name (Last, First)"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-customer-list.php:229
-#: templates/myaccount/form-login.php:83
+#: includes/admin/reports/class-wc-report-customer-list.php:209
+#: includes/class-wc-checkout.php:204 templates/myaccount/form-login.php:84
 msgid "Username"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-customer-list.php:231
+#: includes/admin/reports/class-wc-report-customer-list.php:210
+#: includes/admin/settings/class-wc-settings-emails.php:238
+#: templates/single-product-reviews.php:79
+msgid "Email"
+msgstr ""
+
+#: includes/admin/reports/class-wc-report-customer-list.php:211
 msgid "Location"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-customer-list.php:233
-msgid "Money Spent"
+#: includes/admin/reports/class-wc-report-customer-list.php:213
+msgid "Money spent"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-customer-list.php:234
+#: includes/admin/reports/class-wc-report-customer-list.php:214
 msgid "Last order"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-customers.php:24
+#: includes/admin/reports/class-wc-report-customers.php:41
+#. translators: %s: signups amount
 msgid "%s signups in this period"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-customers.php:92
-msgid "Customer Sales"
+#: includes/admin/reports/class-wc-report-customers.php:109
+msgid "Customer sales"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-customers.php:93
-msgid "Guest Sales"
+#: includes/admin/reports/class-wc-report-customers.php:110
+msgid "Guest sales"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-customers.php:102
-#: includes/admin/reports/class-wc-report-customers.php:301
-msgid "Customer Orders"
+#: includes/admin/reports/class-wc-report-customers.php:119
+#: includes/admin/reports/class-wc-report-customers.php:316
+msgid "Customer orders"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-customers.php:107
-#: includes/admin/reports/class-wc-report-customers.php:311
-msgid "Guest Orders"
+#: includes/admin/reports/class-wc-report-customers.php:124
+#: includes/admin/reports/class-wc-report-customers.php:326
+msgid "Guest orders"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-customers.php:126
+#: includes/admin/reports/class-wc-report-customers.php:143
 msgid "orders"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-customers.php:307
+#: includes/admin/reports/class-wc-report-customers.php:322
 msgid "customer orders"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-customers.php:317
+#: includes/admin/reports/class-wc-report-customers.php:332
 msgid "guest orders"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-customers.php:321
+#: includes/admin/reports/class-wc-report-customers.php:336
 msgid "Signups"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-customers.php:328
+#: includes/admin/reports/class-wc-report-customers.php:343
 msgid "new users"
 msgstr ""
 
@@ -9499,248 +10144,269 @@ msgstr ""
 msgid "No out of stock products found."
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-category.php:68
-msgid "%s sales in %s"
+#: includes/admin/reports/class-wc-report-sales-by-category.php:97
+#. translators: 1: total items sold 2: category name
+msgid "%1$s sales in %2$s"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-category.php:179
+#: includes/admin/reports/class-wc-report-sales-by-category.php:208
 msgid "Select categories&hellip;"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-category.php:193
+#: includes/admin/reports/class-wc-report-sales-by-category.php:222
 msgid "None"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-category.php:194
+#: includes/admin/reports/class-wc-report-sales-by-category.php:223
 msgid "All"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-category.php:254
-msgid "&larr; Choose a category to view stats"
+#: includes/admin/reports/class-wc-report-sales-by-category.php:283
+msgid "Choose a category to view stats"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-date.php:342
+#: includes/admin/reports/class-wc-report-sales-by-date.php:360
+#. translators: %s: average total sales
 msgid "%s average gross daily sales"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-date.php:343
+#: includes/admin/reports/class-wc-report-sales-by-date.php:365
+#. translators: %s: average sales
 msgid "%s average net daily sales"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-date.php:347
+#: includes/admin/reports/class-wc-report-sales-by-date.php:373
+#. translators: %s: average total sales
 msgid "%s average gross monthly sales"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-date.php:348
+#: includes/admin/reports/class-wc-report-sales-by-date.php:378
+#. translators: %s: average sales
 msgid "%s average net monthly sales"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-date.php:353
+#: includes/admin/reports/class-wc-report-sales-by-date.php:387
+#. translators: %s: total sales
 msgid "%s gross sales in this period"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-date.php:354
+#: includes/admin/reports/class-wc-report-sales-by-date.php:390
 msgid ""
 "This is the sum of the order totals after any refunds and including "
 "shipping and taxes."
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-date.php:367
+#: includes/admin/reports/class-wc-report-sales-by-date.php:405
+#. translators: %s: net sales
 msgid "%s net sales in this period"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-date.php:368
+#: includes/admin/reports/class-wc-report-sales-by-date.php:408
 msgid ""
 "This is the sum of the order totals after any refunds and excluding "
 "shipping and taxes."
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-date.php:381
+#: includes/admin/reports/class-wc-report-sales-by-date.php:423
+#. translators: %s: total orders
 msgid "%s orders placed"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-date.php:387
+#: includes/admin/reports/class-wc-report-sales-by-date.php:433
+#. translators: %s: total items
 msgid "%s items purchased"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-date.php:397
+#: includes/admin/reports/class-wc-report-sales-by-date.php:442
+#. translators: 1: total refunds 2: total refunded orders 3: refunded items
+msgid "%1$s refunded %2$d order (%3$d item)"
+msgid_plural "%1$s refunded %2$d orders (%3$d items)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: includes/admin/reports/class-wc-report-sales-by-date.php:453
+#. translators: %s: total shipping
 msgid "%s charged for shipping"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-date.php:402
+#: includes/admin/reports/class-wc-report-sales-by-date.php:462
+#. translators: %s: total coupons
 msgid "%s worth of coupons used"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-date.php:530
-#: includes/admin/reports/class-wc-report-sales-by-product.php:482
+#: includes/admin/reports/class-wc-report-sales-by-date.php:601
+#: includes/admin/reports/class-wc-report-sales-by-product.php:494
 msgid "Number of items sold"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-date.php:538
+#: includes/admin/reports/class-wc-report-sales-by-date.php:609
+#: includes/admin/reports/class-wc-report-taxes-by-code.php:151
+#: includes/admin/reports/class-wc-report-taxes-by-date.php:153
 msgid "Number of orders"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-date.php:546
+#: includes/admin/reports/class-wc-report-sales-by-date.php:617
 msgid "Average gross sales amount"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-date.php:556
+#: includes/admin/reports/class-wc-report-sales-by-date.php:627
 msgid "Average net sales amount"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-date.php:576
+#: includes/admin/reports/class-wc-report-sales-by-date.php:647
 msgid "Shipping amount"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-date.php:586
-msgid "Gross Sales amount"
+#: includes/admin/reports/class-wc-report-sales-by-date.php:657
+msgid "Gross sales amount"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-date.php:596
-msgid "Net Sales amount"
+#: includes/admin/reports/class-wc-report-sales-by-date.php:667
+msgid "Net sales amount"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-product.php:85
+#: includes/admin/reports/class-wc-report-sales-by-product.php:107
+#. translators: %s: total items sold
 msgid "%s sales for the selected items"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-product.php:91
+#: includes/admin/reports/class-wc-report-sales-by-product.php:114
+#. translators: %s: total items purchased
 msgid "%s purchases for the selected items"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-product.php:137
+#: includes/admin/reports/class-wc-report-sales-by-product.php:160
 msgid "Showing reports for:"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-product.php:169
+#: includes/admin/reports/class-wc-report-sales-by-product.php:192
 msgid "Reset"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-product.php:177
-msgid "Product Search"
+#: includes/admin/reports/class-wc-report-sales-by-product.php:200
+msgid "Product search"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-product.php:192
-msgid "Top Sellers"
+#: includes/admin/reports/class-wc-report-sales-by-product.php:215
+msgid "Top sellers"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-product.php:236
-#: includes/admin/reports/class-wc-report-sales-by-product.php:286
-#: includes/admin/reports/class-wc-report-sales-by-product.php:326
+#: includes/admin/reports/class-wc-report-sales-by-product.php:250
+#: includes/admin/reports/class-wc-report-sales-by-product.php:298
+#: includes/admin/reports/class-wc-report-sales-by-product.php:338
 msgid "No products found in range"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-product.php:241
-msgid "Top Freebies"
+#: includes/admin/reports/class-wc-report-sales-by-product.php:255
+msgid "Top freebies"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-product.php:291
-msgid "Top Earners"
+#: includes/admin/reports/class-wc-report-sales-by-product.php:303
+msgid "Top earners"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-product.php:384
-msgid "&larr; Choose a product to view stats"
+#: includes/admin/reports/class-wc-report-sales-by-product.php:396
+msgid "Choose a product to view stats"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-product.php:490
+#: includes/admin/reports/class-wc-report-sales-by-product.php:502
 msgid "Sales amount"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-stock.php:39
+#: includes/admin/reports/class-wc-report-stock.php:44
 msgid "No products found."
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-stock.php:141
-msgid "product"
+#: includes/admin/reports/class-wc-report-stock.php:146
+#: includes/widgets/class-wc-widget-product-tag-cloud.php:86
+#. translators: %s: product count
+msgid "%s product"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-stock.php:155
-#: includes/class-wc-post-types.php:238 templates/cart/cart.php:35
-#: templates/cart/cart.php:77 templates/checkout/form-pay.php:28
-#: templates/checkout/review-order.php:25
-#: templates/emails/email-order-details.php:33
-#: templates/order/order-details.php:30
+#: includes/admin/reports/class-wc-report-stock.php:164
+#: includes/class-wc-post-types.php:259
+#: includes/data-stores/class-wc-product-data-store-cpt.php:94
+#: includes/wc-account-functions.php:202 templates/cart/cart.php:35
+#: templates/cart/cart.php:78 templates/checkout/form-pay.php:29
+#: templates/checkout/review-order.php:26
+#: templates/emails/email-order-details.php:36
+#: templates/order/order-details.php:37
 msgid "Product"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-stock.php:156
+#: includes/admin/reports/class-wc-report-stock.php:165
 msgid "Parent"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-stock.php:157
+#: includes/admin/reports/class-wc-report-stock.php:166
 msgid "Units in stock"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-taxes-by-code.php:145
+#: includes/admin/reports/class-wc-report-taxes-by-code.php:150
 msgid "Rate"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-taxes-by-code.php:146
-#: includes/admin/reports/class-wc-report-taxes-by-date.php:148
-msgid "Number of Orders"
+#: includes/admin/reports/class-wc-report-taxes-by-code.php:152
+msgid "Tax amount"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-taxes-by-code.php:147
-msgid "Tax Amount"
+#: includes/admin/reports/class-wc-report-taxes-by-code.php:152
+msgid "This is the sum of the \"Tax rows\" tax amount within your orders."
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-taxes-by-code.php:147
-msgid "This is the sum of the \"Tax Rows\" tax amount within your orders."
+#: includes/admin/reports/class-wc-report-taxes-by-code.php:153
+msgid "Shipping tax amount"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-taxes-by-code.php:148
-msgid "Shipping Tax Amount"
+#: includes/admin/reports/class-wc-report-taxes-by-code.php:153
+msgid "This is the sum of the \"Tax rows\" shipping tax amount within your orders."
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-taxes-by-code.php:148
-msgid "This is the sum of the \"Tax Rows\" shipping tax amount within your orders."
+#: includes/admin/reports/class-wc-report-taxes-by-code.php:154
+#: includes/admin/reports/class-wc-report-taxes-by-date.php:156
+msgid "Total tax"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-taxes-by-code.php:149
-#: includes/admin/reports/class-wc-report-taxes-by-date.php:151
-msgid "Total Tax"
-msgstr ""
-
-#: includes/admin/reports/class-wc-report-taxes-by-code.php:149
-#: includes/admin/reports/class-wc-report-taxes-by-date.php:151
+#: includes/admin/reports/class-wc-report-taxes-by-code.php:154
+#: includes/admin/reports/class-wc-report-taxes-by-date.php:156
 msgid "This is the total tax for the rate (shipping tax + product tax)."
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-taxes-by-code.php:181
-#: includes/admin/reports/class-wc-report-taxes-by-date.php:196
+#: includes/admin/reports/class-wc-report-taxes-by-code.php:186
+#: includes/admin/reports/class-wc-report-taxes-by-date.php:198
 msgid "No taxes found in this period"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-taxes-by-date.php:147
+#: includes/admin/reports/class-wc-report-taxes-by-date.php:152
 msgid "Period"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-taxes-by-date.php:149
-msgid "Total Sales"
+#: includes/admin/reports/class-wc-report-taxes-by-date.php:154
+msgid "Total sales"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-taxes-by-date.php:149
-msgid "This is the sum of the 'Order Total' field within your orders."
+#: includes/admin/reports/class-wc-report-taxes-by-date.php:154
+msgid "This is the sum of the 'Order total' field within your orders."
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-taxes-by-date.php:150
-msgid "Total Shipping"
+#: includes/admin/reports/class-wc-report-taxes-by-date.php:155
+msgid "Total shipping"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-taxes-by-date.php:150
-msgid "This is the sum of the 'Shipping Total' field within your orders."
+#: includes/admin/reports/class-wc-report-taxes-by-date.php:155
+msgid "This is the sum of the 'Shipping total' field within your orders."
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-taxes-by-date.php:152
+#: includes/admin/reports/class-wc-report-taxes-by-date.php:157
 msgid "Net profit"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-taxes-by-date.php:152
+#: includes/admin/reports/class-wc-report-taxes-by-date.php:157
 msgid "Total sales minus shipping and tax."
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-taxes-by-date.php:185
-#: templates/checkout/form-pay.php:30
+#: includes/admin/reports/class-wc-report-taxes-by-date.php:187
+#: templates/checkout/form-pay.php:31
 msgid "Totals"
 msgstr ""
 
@@ -9749,7 +10415,7 @@ msgid "Accounts"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-accounts.php:43
-msgid "Account Pages"
+msgid "Account pages"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-accounts.php:43
@@ -9759,112 +10425,133 @@ msgid ""
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-accounts.php:46
-msgid "My Account Page"
+msgid "My account page"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-accounts.php:47
-#: includes/admin/settings/class-wc-settings-checkout.php:139
-#: includes/admin/settings/class-wc-settings-checkout.php:150
-msgid "Page contents:"
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-accounts.php:58
-msgid "My Account Endpoints"
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-accounts.php:58
-msgid ""
-"Endpoints are appended to your page URLs to handle specific actions on the "
-"accounts pages. They should be unique."
+#: includes/admin/settings/class-wc-settings-checkout.php:137
+#: includes/admin/settings/class-wc-settings-checkout.php:148
+msgid "Page contents: [%s]"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-accounts.php:61
-#: includes/class-wc-post-types.php:297 includes/class-wc-post-types.php:298
-msgid "View Order"
+msgid "Customer registration"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-accounts.php:62
-msgid "Endpoint for the My Account &rarr; View Order page"
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-accounts.php:70
-msgid "Edit Account"
+msgid "Enable customer registration on the \"Checkout\" page."
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-accounts.php:71
-msgid "Endpoint for the My Account &rarr; Edit Account page"
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-accounts.php:79
-#: includes/class-wc-query.php:122
-msgid "Edit Address"
+msgid "Enable customer registration on the \"My account\" page."
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-accounts.php:80
-msgid "Endpoint for the My Account &rarr; Edit Address page"
+#: includes/class-wc-download-handler.php:131 templates/auth/form-login.php:44
+#: templates/global/form-login.php:48 templates/myaccount/form-login.php:37
+#: templates/myaccount/form-login.php:56
+msgid "Login"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-accounts.php:88
-#: includes/class-wc-query.php:128
-msgid "Lost Password"
+#: includes/admin/settings/class-wc-settings-accounts.php:81
+msgid "Display returning customer login reminder on the \"Checkout\" page."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-accounts.php:89
-msgid "Endpoint for the My Account &rarr; Lost Password page"
+#: includes/admin/settings/class-wc-settings-accounts.php:90
+msgid "Account creation"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-accounts.php:97
-#: templates/auth/form-grant-access.php:38
+#: includes/admin/settings/class-wc-settings-accounts.php:91
+msgid "Automatically generate username from customer email."
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-accounts.php:100
+msgid "Automatically generate customer password"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-accounts.php:110
+msgid "My account endpoints"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-accounts.php:110
+msgid ""
+"Endpoints are appended to your page URLs to handle specific actions on the "
+"accounts pages. They should be unique and can be left blank to disable the "
+"endpoint."
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-accounts.php:114
+msgid "Endpoint for the \"My account &rarr; Orders\" page."
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-accounts.php:122
+#: includes/class-wc-post-types.php:325 includes/class-wc-post-types.php:326
+msgid "View order"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-accounts.php:123
+msgid "Endpoint for the \"My account &rarr; View order\" page."
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-accounts.php:131
+#: includes/class-wc-query.php:110 includes/wc-account-functions.php:98
+msgid "Downloads"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-accounts.php:132
+msgid "Endpoint for the \"My account &rarr; Downloads\" page."
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-accounts.php:140
+msgid "Edit account"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-accounts.php:141
+msgid "Endpoint for the \"My account &rarr; Edit account\" page."
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-accounts.php:149
+#: includes/class-wc-query.php:116 includes/wc-account-functions.php:99
+msgid "Addresses"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-accounts.php:150
+msgid "Endpoint for the \"My account &rarr; Addresses\" page."
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-accounts.php:158
+#: includes/class-wc-query.php:119 includes/wc-account-functions.php:100
+msgid "Payment methods"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-accounts.php:159
+msgid "Endpoint for the \"My account &rarr; Payment methods\" page."
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-accounts.php:168
+msgid "Endpoint for the \"My account &rarr; Lost password\" page."
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-accounts.php:176
+#: includes/wc-account-functions.php:102
+#: templates/auth/form-grant-access.php:39
 msgid "Logout"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-accounts.php:98
+#: includes/admin/settings/class-wc-settings-accounts.php:177
 msgid ""
 "Endpoint for the triggering logout. You can add this to your menus via a "
 "custom link: yoursite.com/?customer-logout=true"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-accounts.php:107
-msgid "Registration Options"
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-accounts.php:110
-msgid "Enable Registration"
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-accounts.php:111
-msgid "Enable registration on the \"Checkout\" page"
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-accounts.php:120
-msgid "Enable registration on the \"My Account\" page"
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-accounts.php:129
-msgid "Display returning customer login reminder on the \"Checkout\" page"
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-accounts.php:138
-msgid "Account Creation"
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-accounts.php:139
-msgid "Automatically generate username from customer email"
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-accounts.php:148
-msgid "Automatically generate customer password"
-msgstr ""
-
 #: includes/admin/settings/class-wc-settings-api.php:27
 #: includes/admin/settings/class-wc-settings-api.php:68
-#: includes/admin/views/html-admin-page-status-report.php:445
 msgid "API"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-api.php:61
 #: includes/admin/settings/class-wc-settings-general.php:50
-msgid "General Options"
+msgid "General options"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-api.php:69
@@ -9872,135 +10559,161 @@ msgid "Enable the REST API"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-checkout.php:44
-msgid "Checkout Options"
+msgid "Checkout options"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-checkout.php:69
-msgid "Checkout Process"
+#: includes/admin/settings/class-wc-settings-checkout.php:68
+#: includes/admin/settings/class-wc-settings-checkout.php:94
+msgid "Checkout process"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-checkout.php:76
+#: includes/admin/settings/class-wc-settings-checkout.php:75
 msgid "Enable the use of coupons"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-checkout.php:81
+#: includes/admin/settings/class-wc-settings-checkout.php:80
 msgid "Coupons can be applied from the cart and checkout pages."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-checkout.php:86
+#: includes/admin/settings/class-wc-settings-checkout.php:84
 msgid "Calculate coupon discounts sequentially"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-checkout.php:90
+#: includes/admin/settings/class-wc-settings-checkout.php:88
 msgid ""
 "When applying multiple coupons, apply the first coupon to the full price "
 "and the second coupon to the discounted price and so on."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-checkout.php:97
+#: includes/admin/settings/class-wc-settings-checkout.php:95
 msgid "Enable guest checkout"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-checkout.php:98
+#: includes/admin/settings/class-wc-settings-checkout.php:96
 msgid "Allows customers to checkout without creating an account."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-checkout.php:107
+#: includes/admin/settings/class-wc-settings-checkout.php:105
 msgid "Force secure checkout"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-checkout.php:113
-msgid "Force SSL (HTTPS) on the checkout pages (a SSL Certificate is required)."
+#: includes/admin/settings/class-wc-settings-checkout.php:111
+msgid ""
+"Force SSL (HTTPS) on the checkout pages (<a href=\"%s\" "
+"target=\"_blank\">an SSL Certificate is required</a>)."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-checkout.php:117
+#: includes/admin/settings/class-wc-settings-checkout.php:115
 msgid "Force HTTP when leaving the checkout"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-checkout.php:131
-msgid "Checkout Pages"
+#: includes/admin/settings/class-wc-settings-checkout.php:129
+msgid "Checkout pages"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-checkout.php:132
+#: includes/admin/settings/class-wc-settings-checkout.php:130
 msgid ""
 "These pages need to be set so that WooCommerce knows where to send users to "
 "checkout."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-checkout.php:138
-msgid "Cart Page"
+#: includes/admin/settings/class-wc-settings-checkout.php:136
+msgid "Cart page"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-checkout.php:149
-msgid "Checkout Page"
+#: includes/admin/settings/class-wc-settings-checkout.php:147
+msgid "Checkout page"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-checkout.php:160
-msgid "Terms and Conditions"
+#: includes/admin/settings/class-wc-settings-checkout.php:158
+msgid "Terms and conditions"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-checkout.php:161
+#: includes/admin/settings/class-wc-settings-checkout.php:159
 msgid ""
 "If you define a \"Terms\" page the customer will be asked if they accept "
 "them when checking out."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-checkout.php:176
-msgid "Checkout Endpoints"
+#: includes/admin/settings/class-wc-settings-checkout.php:174
+msgid "Checkout endpoints"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-checkout.php:176
+#: includes/admin/settings/class-wc-settings-checkout.php:174
 msgid ""
 "Endpoints are appended to your page URLs to handle specific actions during "
 "the checkout process. They should be unique."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-checkout.php:180
-msgid "Endpoint for the Checkout &rarr; Pay page"
+#: includes/admin/settings/class-wc-settings-checkout.php:177
+#: templates/checkout/thankyou.php:33 templates/myaccount/my-orders.php:75
+#: templates/myaccount/orders.php:71
+msgid "Pay"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-checkout.php:188
-#: includes/class-wc-query.php:112
-msgid "Order Received"
+#: includes/admin/settings/class-wc-settings-checkout.php:178
+msgid "Endpoint for the \"Checkout &rarr; Pay\" page."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-checkout.php:189
-msgid "Endpoint for the Checkout &rarr; Order Received page"
+#: includes/admin/settings/class-wc-settings-checkout.php:186
+#: includes/class-wc-query.php:94
+msgid "Order received"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-checkout.php:197
-#: includes/class-wc-query.php:125
-#: templates/myaccount/form-add-payment-method.php:57
-msgid "Add Payment Method"
+#: includes/admin/settings/class-wc-settings-checkout.php:187
+msgid "Endpoint for the \"Checkout &rarr; Order received\" page."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-checkout.php:198
-msgid "Endpoint for the Checkout &rarr; Add Payment Method page"
+#: includes/admin/settings/class-wc-settings-checkout.php:195
+#: includes/class-wc-query.php:122
+#: templates/myaccount/form-add-payment-method.php:53
+#: templates/myaccount/payment-methods.php:79
+msgid "Add payment method"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-checkout.php:211
-msgid "Payment Gateways"
+#: includes/admin/settings/class-wc-settings-checkout.php:196
+msgid "Endpoint for the \"Checkout &rarr; Add payment method\" page."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-checkout.php:212
+#: includes/admin/settings/class-wc-settings-checkout.php:204
+msgid "Delete payment method"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-checkout.php:205
+msgid "Endpoint for the delete payment method page."
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-checkout.php:213
+msgid "Set default payment method"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-checkout.php:214
+msgid "Endpoint for the setting a default payment method page."
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-checkout.php:227
+msgid "Payment gateways"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-checkout.php:228
 msgid ""
 "Installed gateways are listed below. Drag and drop gateways to control "
 "their display order on the frontend."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-checkout.php:262
-msgid "Gateway Display Order"
+#: includes/admin/settings/class-wc-settings-checkout.php:280
+msgid "Gateway display order"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-checkout.php:270
+#: includes/admin/settings/class-wc-settings-checkout.php:288
 msgid "Gateway"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-checkout.php:271
+#: includes/admin/settings/class-wc-settings-checkout.php:289
 msgid "Gateway ID"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-checkout.php:298
+#: includes/admin/settings/class-wc-settings-checkout.php:316
 msgid "(no title)"
 msgstr ""
 
@@ -10009,11 +10722,11 @@ msgid "Emails"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-emails.php:43
-msgid "Email Options"
+msgid "Email options"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-emails.php:56
-msgid "Email Notifications"
+msgid "Email notifications"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-emails.php:56
@@ -10023,11 +10736,11 @@ msgid ""
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-emails.php:64
-msgid "Email Sender Options"
+msgid "Email sender options"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-emails.php:67
-msgid "\"From\" Name"
+msgid "\"From\" name"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-emails.php:68
@@ -10035,7 +10748,7 @@ msgid "How the sender's name appears in outgoing WooCommerce emails."
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-emails.php:78
-msgid "\"From\" Address"
+msgid "\"From\" address"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-emails.php:79
@@ -10043,7 +10756,7 @@ msgid "How the sender's email appears in outgoing WooCommerce emails."
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-emails.php:93
-msgid "Email Template"
+msgid "Email template"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-emails.php:93
@@ -10053,7 +10766,7 @@ msgid ""
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-emails.php:96
-msgid "Header Image"
+msgid "Header image"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-emails.php:97
@@ -10063,83 +10776,84 @@ msgid ""
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-emails.php:108
-msgid "Footer Text"
+msgid "Footer text"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-emails.php:109
 msgid "The text to appear in the footer of WooCommerce emails."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-emails.php:114
-msgid "Powered by WooCommerce"
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-emails.php:120
-msgid "Base Colour"
+#: includes/admin/settings/class-wc-settings-emails.php:115
+#. translators: %s: site name
+msgid "%s - Powered by WooCommerce"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-emails.php:121
-msgid ""
-"The base colour for WooCommerce email templates. Default "
-"<code>#557da1</code>."
+msgid "Base color"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-emails.php:131
-msgid "Background Colour"
+#: includes/admin/settings/class-wc-settings-emails.php:123
+#. translators: %s: default color
+msgid "The base color for WooCommerce email templates. Default %s."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-emails.php:132
-msgid ""
-"The background colour for WooCommerce email templates. Default "
-"<code>#f5f5f5</code>."
+#: includes/admin/settings/class-wc-settings-emails.php:133
+msgid "Background color"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-emails.php:142
-msgid "Body Background Colour"
+#: includes/admin/settings/class-wc-settings-emails.php:135
+#. translators: %s: default color
+msgid "The background color for WooCommerce email templates. Default %s."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-emails.php:143
-msgid "The main body background colour. Default <code>#fdfdfd</code>."
+#: includes/admin/settings/class-wc-settings-emails.php:145
+msgid "Body background color"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-emails.php:153
-msgid "Body Text Colour"
+#: includes/admin/settings/class-wc-settings-emails.php:147
+#. translators: %s: default color
+msgid "The main body background color. Default %s."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-emails.php:154
-msgid "The main body text colour. Default <code>#505050</code>."
+#: includes/admin/settings/class-wc-settings-emails.php:157
+msgid "Body text color"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-emails.php:234
-msgid "Content Type"
+#: includes/admin/settings/class-wc-settings-emails.php:159
+#. translators: %s: default color
+msgid "The main body text color. Default %s."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-emails.php:235
-#: includes/emails/class-wc-email-cancelled-order.php:107
-#: includes/emails/class-wc-email-failed-order.php:107
-#: includes/emails/class-wc-email-new-order.php:112
+#: includes/admin/settings/class-wc-settings-emails.php:239
+msgid "Content type"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-emails.php:240
+#: includes/emails/class-wc-email-cancelled-order.php:114
+#: includes/emails/class-wc-email-failed-order.php:114
+#: includes/emails/class-wc-email-new-order.php:119
 msgid "Recipient(s)"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-emails.php:267
+#: includes/admin/settings/class-wc-settings-emails.php:272
 msgid "Manually sent"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-emails.php:267
+#: includes/admin/settings/class-wc-settings-emails.php:272
 msgid "Manual"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-emails.php:271
+#: includes/admin/settings/class-wc-settings-emails.php:276
 #: includes/wc-webhook-functions.php:25
 msgid "Disabled"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-emails.php:283
+#: includes/admin/settings/class-wc-settings-emails.php:288
 msgid "Configure"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-general.php:53
-msgid "Base Location"
+msgid "Base location"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-general.php:54
@@ -10149,7 +10863,7 @@ msgid ""
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-general.php:63
-msgid "Selling Location(s)"
+msgid "Selling location(s)"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-general.php:64
@@ -10161,111 +10875,132 @@ msgid "Sell to all countries"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-general.php:73
-msgid "Sell to specific countries only"
+#: includes/admin/settings/class-wc-settings-general.php:79
+msgid "Sell to all countries, except for&hellip;"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-general.php:78
-#: includes/admin/settings/class-wc-settings-shipping.php:132
-#: includes/shipping/flat-rate/includes/settings-flat-rate.php:33
-#: includes/shipping/flat-rate/includes/settings-flat-rate.php:37
-#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:80
-#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:84
-#: includes/shipping/local-delivery/class-wc-shipping-local-delivery.php:137
-#: includes/shipping/local-delivery/class-wc-shipping-local-delivery.php:141
-#: includes/shipping/local-pickup/class-wc-shipping-local-pickup.php:93
-#: includes/shipping/local-pickup/class-wc-shipping-local-pickup.php:97
-msgid "Specific Countries"
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-general.php:87
-msgid "Default Customer Address"
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-general.php:89
-msgid ""
-"This option determines the customers default address (before they input "
-"their details)."
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-general.php:90
-msgid ""
-"The %sMaxMind GeoLite Database%s will be periodically downloaded to your "
-"wp-content directory if using geolocation."
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-general.php:95
-msgid "No address"
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-general.php:96
-#: includes/admin/settings/views/settings-tax.php:41
-msgid "Shop base address"
+#: includes/admin/settings/class-wc-settings-general.php:74
+#: includes/admin/settings/class-wc-settings-general.php:88
+msgid "Sell to specific countries"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-general.php:97
-msgid "Geolocate"
+msgid "Shipping location(s)"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-general.php:98
+msgid ""
+"Choose which countries you want to ship to, or choose to ship to all "
+"locations you sell to."
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-general.php:105
+msgid "Ship to all countries you sell to"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-general.php:106
+msgid "Ship to all countries"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-general.php:107
+msgid "Ship to specific countries only"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-general.php:108
+msgid "Disable shipping &amp; shipping calculations"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-general.php:113
+msgid "Ship to specific countries"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-general.php:122
+msgid "Default customer location"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-general.php:124
+msgid ""
+"This option determines a customers default location. The MaxMind GeoLite "
+"Database will be periodically downloaded to your wp-content directory if "
+"using geolocation."
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-general.php:129
+msgid "No location by default"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-general.php:130
+#: includes/admin/settings/views/settings-tax.php:33
+msgid "Shop base address"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-general.php:131
+msgid "Geolocate"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-general.php:132
 msgid "Geolocate (with page caching support)"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-general.php:103
-msgid "Store Notice"
+#: includes/admin/settings/class-wc-settings-general.php:137
+msgid "Enable taxes"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-general.php:104
+#: includes/admin/settings/class-wc-settings-general.php:138
+msgid "Enable taxes and tax calculations"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-general.php:145
+msgid "Store notice"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-general.php:146
 msgid "Enable site-wide store notice text"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-general.php:111
-msgid "Store Notice Text"
+#: includes/admin/settings/class-wc-settings-general.php:153
+msgid "Store notice text"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-general.php:114
-#: includes/wc-template-functions.php:437
+#: includes/admin/settings/class-wc-settings-general.php:156
+#: includes/wc-template-functions.php:495
 msgid ""
 "This is a demo store for testing purposes &mdash; no orders shall be "
 "fulfilled."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-general.php:122
-msgid "Currency Options"
+#: includes/admin/settings/class-wc-settings-general.php:164
+msgid "Currency options"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-general.php:122
+#: includes/admin/settings/class-wc-settings-general.php:164
 msgid "The following options affect how prices are displayed on the frontend."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-general.php:125
-#: includes/admin/views/html-admin-page-status-report.php:416
+#: includes/admin/settings/class-wc-settings-general.php:167
+#: includes/admin/views/html-admin-page-status-report.php:426
 msgid "Currency"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-general.php:126
+#: includes/admin/settings/class-wc-settings-general.php:168
 msgid ""
 "This controls what currency prices are listed at in the catalog and which "
 "currency gateways will take payments in."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-general.php:138
+#: includes/admin/settings/class-wc-settings-general.php:180
 msgid "This controls the position of the currency symbol."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-general.php:155
+#: includes/admin/settings/class-wc-settings-general.php:197
 msgid "This sets the thousand separator of displayed prices."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-general.php:165
+#: includes/admin/settings/class-wc-settings-general.php:207
 msgid "This sets the decimal separator of displayed prices."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-general.php:174
-#: includes/admin/views/html-admin-page-status-report.php:436
-msgid "Number of Decimals"
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-general.php:175
+#: includes/admin/settings/class-wc-settings-general.php:217
 msgid "This sets the number of decimal points shown in displayed prices."
 msgstr ""
 
@@ -10278,11 +11013,11 @@ msgid "Display"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-products.php:85
-msgid "Shop & Product Pages"
+msgid "Shop &amp; product pages"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-products.php:92
-msgid "Shop Page"
+msgid "Shop page"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-products.php:93
@@ -10298,7 +11033,7 @@ msgid ""
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-products.php:103
-msgid "Shop Page Display"
+msgid "Shop page display"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-products.php:104
@@ -10311,16 +11046,15 @@ msgid "Show products"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-products.php:112
-msgid "Show categories &amp; subcategories"
+msgid "Show categories"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-products.php:113
-#: includes/admin/settings/class-wc-settings-products.php:129
-msgid "Show both"
+msgid "Show categories &amp; products"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-products.php:119
-msgid "Default Category Display"
+msgid "Default category display"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-products.php:120
@@ -10331,8 +11065,12 @@ msgstr ""
 msgid "Show subcategories"
 msgstr ""
 
+#: includes/admin/settings/class-wc-settings-products.php:129
+msgid "Show subcategories &amp; products"
+msgstr ""
+
 #: includes/admin/settings/class-wc-settings-products.php:135
-msgid "Default Product Sorting"
+msgid "Default product sorting"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-products.php:136
@@ -10348,7 +11086,8 @@ msgid "Popularity (sales)"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-products.php:145
-msgid "Average Rating"
+#: includes/widgets/class-wc-widget-rating-filter.php:30
+msgid "Average rating"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-products.php:146
@@ -10379,127 +11118,126 @@ msgstr ""
 msgid ""
 "These settings affect the display and dimensions of images in your catalog "
 "- the display on the front-end will still be affected by CSS styles. After "
-"changing these settings you may need to <a href=\"%s\">regenerate your "
-"thumbnails</a>."
+"changing these settings you may need to <a target=\"_blank\" "
+"href=\"%s\">regenerate your thumbnails</a>."
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-products.php:183
-msgid "Catalog Images"
+msgid "Catalog images"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-products.php:184
-msgid "This size is usually used in product listings"
+msgid "This size is usually used in product listings. (W x H)"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-products.php:197
-msgid "Single Product Image"
+msgid "Single product image"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-products.php:198
-msgid "This is the size used by the main image on the product page."
+msgid "This is the size used by the main image on the product page. (W x H)"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-products.php:211
-msgid "Product Thumbnails"
+msgid "Product thumbnails"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-products.php:212
-msgid "This size is usually used for the gallery of images on the product page."
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-products.php:225
-msgid "Product Image Gallery"
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-products.php:226
-msgid "Enable Lightbox for product images"
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-products.php:229
 msgid ""
-"Include WooCommerce's lightbox. Product gallery images will open in a "
-"lightbox."
+"This size is usually used for the gallery of images on the product page. (W "
+"x H)"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:251
-msgid "Manage Stock"
+#: includes/admin/settings/class-wc-settings-products.php:242
+msgid "Manage stock"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:252
+#: includes/admin/settings/class-wc-settings-products.php:243
 msgid "Enable stock management"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:259
-msgid "Hold Stock (minutes)"
+#: includes/admin/settings/class-wc-settings-products.php:250
+msgid "Hold stock (minutes)"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:260
+#: includes/admin/settings/class-wc-settings-products.php:251
 msgid ""
 "Hold stock (for unpaid orders) for x minutes. When this limit is reached, "
 "the pending order will be cancelled. Leave blank to disable."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:273
+#: includes/admin/settings/class-wc-settings-products.php:265
 msgid "Notifications"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:274
+#: includes/admin/settings/class-wc-settings-products.php:266
 msgid "Enable low stock notifications"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:283
+#: includes/admin/settings/class-wc-settings-products.php:276
 msgid "Enable out of stock notifications"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:292
-msgid "Notification Recipient(s)"
+#: includes/admin/settings/class-wc-settings-products.php:286
+msgid "Notification recipient(s)"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:293
+#: includes/admin/settings/class-wc-settings-products.php:287
 msgid "Enter recipients (comma separated) that will receive this notification."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:303
-msgid "Low Stock Threshold"
+#: includes/admin/settings/class-wc-settings-products.php:298
+msgid "Low stock threshold"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:317
-msgid "Out Of Stock Threshold"
+#: includes/admin/settings/class-wc-settings-products.php:299
+msgid "When product stock reaches this amount you will be notified via email."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:331
-msgid "Out Of Stock Visibility"
+#: includes/admin/settings/class-wc-settings-products.php:314
+msgid "Out of stock threshold"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:332
+#: includes/admin/settings/class-wc-settings-products.php:315
+msgid ""
+"When product stock reaches this amount the stock status will change to "
+"\"out of stock\" and you will be notified via email. This setting does not "
+"affect existing \"in stock\" products."
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-products.php:329
+msgid "Out of stock visibility"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-products.php:330
 msgid "Hide out of stock items from the catalog"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:339
-msgid "Stock Display Format"
+#: includes/admin/settings/class-wc-settings-products.php:337
+msgid "Stock display format"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:340
-msgid "This controls how stock is displayed on the frontend."
+#: includes/admin/settings/class-wc-settings-products.php:338
+msgid "This controls how stock quantities are displayed on the frontend."
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-products.php:345
+msgid "Always show quantity remaining in stock e.g. \"12 in stock\""
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-products.php:346
+msgid "Only show quantity remaining in stock when low e.g. \"Only 2 left in stock\""
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-products.php:347
-msgid "Always show stock e.g. \"12 in stock\""
+msgid "Never show quantity remaining in stock"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:348
-msgid "Only show stock when low e.g. \"Only 2 left in stock\" vs. \"In Stock\""
+#: includes/admin/settings/class-wc-settings-products.php:368
+msgid "File download method"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:349
-msgid "Never show stock amount"
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-products.php:370
-msgid "File Download Method"
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-products.php:371
+#: includes/admin/settings/class-wc-settings-products.php:369
 msgid ""
 "Forcing downloads will keep URLs hidden, but some servers may serve large "
 "files unreliably. If supported, <code>X-Accel-Redirect</code>/ "
@@ -10507,215 +11245,432 @@ msgid ""
 "requires <code>mod_xsendfile</code>)."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:379
-msgid "Force Downloads"
+#: includes/admin/settings/class-wc-settings-products.php:377
+msgid "Force downloads"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:380
+#: includes/admin/settings/class-wc-settings-products.php:378
 msgid "X-Accel-Redirect/X-Sendfile"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:381
+#: includes/admin/settings/class-wc-settings-products.php:379
 msgid "Redirect only"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:387
-msgid "Access Restriction"
+#: includes/admin/settings/class-wc-settings-products.php:385
+msgid "Access restriction"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:388
+#: includes/admin/settings/class-wc-settings-products.php:386
 msgid "Downloads require login"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:392
+#: includes/admin/settings/class-wc-settings-products.php:390
 msgid "This setting does not apply to guest purchases."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:398
+#: includes/admin/settings/class-wc-settings-products.php:396
 msgid "Grant access to downloadable products after payment"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:402
+#: includes/admin/settings/class-wc-settings-products.php:400
 msgid ""
 "Enable this option to grant access to downloads when orders are "
 "\"processing\", rather than \"completed\"."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:417
+#: includes/admin/settings/class-wc-settings-products.php:415
 msgid "Measurements"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:423
-msgid "Weight Unit"
+#: includes/admin/settings/class-wc-settings-products.php:421
+msgid "Weight unit"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:424
+#: includes/admin/settings/class-wc-settings-products.php:422
 msgid "This controls what unit you will define weights in."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:440
-msgid "Dimensions Unit"
+#: includes/admin/settings/class-wc-settings-products.php:438
+msgid "Dimensions unit"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:441
+#: includes/admin/settings/class-wc-settings-products.php:439
 msgid "This controls what unit you will define lengths in."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:470
-msgid "Product Ratings"
+#: includes/admin/settings/class-wc-settings-products.php:468
+msgid "Product ratings"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:471
+#: includes/admin/settings/class-wc-settings-products.php:469
 msgid "Enable ratings on reviews"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:481
+#: includes/admin/settings/class-wc-settings-products.php:478
 msgid "Ratings are required to leave a review"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:491
+#: includes/admin/settings/class-wc-settings-products.php:488
 msgid "Show \"verified owner\" label for customer reviews"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-products.php:501
+#: includes/admin/settings/class-wc-settings-products.php:498
 msgid "Only allow reviews from \"verified owners\""
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-shipping.php:43
-#: includes/admin/settings/class-wc-settings-shipping.php:71
-msgid "Shipping Options"
+#: includes/admin/settings/class-wc-settings-shipping.php:48
+#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:8
+#: includes/admin/settings/views/html-admin-page-shipping-zones-instance.php:7
+#: includes/admin/settings/views/html-admin-page-shipping-zones.php:8
+#: includes/admin/views/html-notice-legacy-shipping.php:13
+msgid "Shipping zones"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-shipping.php:74
-msgid "Shipping Calculations"
+#: includes/admin/settings/class-wc-settings-shipping.php:49
+#: includes/admin/settings/class-wc-settings-shipping.php:77
+msgid "Shipping options"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-shipping.php:75
-msgid "Enable shipping"
+#: includes/admin/settings/class-wc-settings-shipping.php:50
+#: includes/admin/settings/views/html-admin-page-shipping-classes.php:8
+#: includes/class-wc-post-types.php:154
+msgid "Shipping classes"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-shipping.php:83
+#: includes/admin/settings/class-wc-settings-shipping.php:80
+msgid "Calculations"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-shipping.php:81
 msgid "Enable the shipping calculator on the cart page"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-shipping.php:92
+#: includes/admin/settings/class-wc-settings-shipping.php:90
 msgid "Hide shipping costs until an address is entered"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-shipping.php:101
-msgid "Shipping Destination"
+#: includes/admin/settings/class-wc-settings-shipping.php:99
+msgid "Shipping destination"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-shipping.php:102
+#: includes/admin/settings/class-wc-settings-shipping.php:100
 msgid "This controls which shipping address is used by default."
 msgstr ""
 
+#: includes/admin/settings/class-wc-settings-shipping.php:105
+msgid "Default to customer shipping address"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-shipping.php:106
+msgid "Default to customer billing address"
+msgstr ""
+
 #: includes/admin/settings/class-wc-settings-shipping.php:107
-msgid "Default to shipping address"
+msgid "Force shipping to the customer billing address"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-shipping.php:108
-msgid "Default to billing address"
+#: includes/admin/settings/class-wc-settings-shipping.php:115
+msgid "Debug mode"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-shipping.php:109
-msgid "Only ship to the customer's billing address"
+#: includes/admin/settings/class-wc-settings-shipping.php:116
+msgid "Enable debug mode"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-shipping.php:117
-msgid "Restrict shipping to Location(s)"
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-shipping.php:118
 msgid ""
-"Choose which countries you want to ship to, or choose to ship to all <a "
-"href=\"%s\">locations you sell to</a>."
+"Enable shipping debug mode to show matching shipping zones and to bypass "
+"shipping rate cache."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-shipping.php:125
-msgid "Ship to all countries you sell to"
+#: includes/admin/settings/class-wc-settings-shipping.php:214
+#: includes/admin/settings/class-wc-settings-shipping.php:296
+msgid "Zone does not exist!"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-shipping.php:126
-msgid "Ship to all countries"
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-shipping.php:127
-msgid "Ship to specific countries only"
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-shipping.php:183
-msgid "Shipping Methods"
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-shipping.php:190
-msgid "ID"
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-shipping.php:192
-msgid "Selection Priority"
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-shipping.php:192
-msgid ""
-"Available methods will be chosen by default in this order. If multiple "
-"methods have the same priority, they will be sorted by cost."
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-shipping.php:225
-msgid "Drag and drop the above shipping methods to control their display order."
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-tax.php:39
-#: includes/admin/settings/views/settings-tax.php:9
-msgid "Tax Options"
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-tax.php:40
-msgid "Standard Rates"
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-tax.php:47
-msgid "%s Rates"
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-tax.php:159
-msgid "No row(s) selected"
-msgstr ""
-
-#: includes/admin/settings/class-wc-settings-tax.php:160
+#: includes/admin/settings/class-wc-settings-shipping.php:240
+#: includes/admin/settings/class-wc-settings-shipping.php:273
+#: includes/admin/settings/class-wc-settings-shipping.php:329
+#: includes/admin/settings/class-wc-settings-tax.php:168
 msgid "Your changed data will be lost if you leave this page without saving."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-tax.php:162
-msgid "Country Code"
+#: includes/admin/settings/class-wc-settings-shipping.php:241
+msgid ""
+"Do you wish to save your changes first? Your changed data will be discarded "
+"if you choose to cancel."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-tax.php:163
-msgid "State Code"
+#: includes/admin/settings/class-wc-settings-shipping.php:242
+#: includes/admin/settings/class-wc-settings-shipping.php:275
+#: includes/admin/settings/class-wc-settings-shipping.php:330
+msgid "Your changes were not saved. Please retry."
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-tax.php:164
-#: includes/admin/settings/views/html-settings-tax.php:19
-msgid "ZIP/Postcode"
+#: includes/admin/settings/class-wc-settings-shipping.php:243
+msgid "Shipping method could not be added. Please retry."
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-shipping.php:246
+#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:9
+#: includes/class-wc-shipping-zone.php:272
+msgid "Zone"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-shipping.php:274
+msgid "Are you sure you want to delete this zone? This action cannot be undone."
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-shipping.php:276
+#: includes/admin/settings/views/html-admin-page-shipping-zones.php:45
+msgid "No shipping methods offered to this zone."
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-shipping.php:293
+msgid "Invalid shipping method!"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-shipping.php:299
+msgid "This shipping method does not have any settings to configure."
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-shipping.php:305
+msgid "Edit failed. Please try again."
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-shipping.php:340
+msgid "Product count"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-tax.php:55
+#: includes/admin/settings/views/settings-tax.php:9
+msgid "Tax options"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-tax.php:56
+msgid "Standard rates"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-tax.php:63
+msgid "%s rates"
 msgstr ""
 
 #: includes/admin/settings/class-wc-settings-tax.php:167
-msgid "Tax Name"
+msgid "No row(s) selected"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-tax.php:168
-#: includes/admin/settings/views/html-settings-tax.php:23
+#: includes/admin/settings/class-wc-settings-tax.php:170
+msgid "Country code"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-tax.php:171
+#: includes/admin/settings/views/html-settings-tax.php:25
+msgid "State code"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-tax.php:175
+#: includes/admin/settings/views/html-settings-tax.php:29
+msgid "Tax name"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-tax.php:176
+#: includes/admin/settings/views/html-settings-tax.php:30
 msgid "Priority"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-tax.php:169
-#: includes/admin/settings/views/html-settings-tax.php:24
+#: includes/admin/settings/class-wc-settings-tax.php:177
+#: includes/admin/settings/views/html-settings-tax.php:31
 msgid "Compound"
 msgstr ""
 
+#: includes/admin/settings/views/html-admin-page-shipping-classes.php:9
+msgid ""
+"Shipping classes can be used to group products of similar type and can be "
+"used by some Shipping Methods (such as \"Flat rate shipping\") to provide "
+"different rates to different classes of product."
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-classes.php:23
+msgid "Save shipping classes"
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-classes.php:24
+msgid "Add shipping class"
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-classes.php:33
+msgid "No shipping classes have been created."
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-classes.php:52
+msgid "Shipping class name"
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-classes.php:54
+msgid "Cancel changes"
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-classes.php:68
+msgid "Description for your reference"
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:19
+#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:23
+#: includes/admin/settings/views/html-admin-page-shipping-zones.php:16
+msgid "Zone name"
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:20
+msgid "This is the name of the zone for your reference."
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:28
+msgid "Zone regions"
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:29
+msgid ""
+"These are regions inside this zone. Customers will be matched against these "
+"regions."
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:32
+msgid "Select regions within this zone"
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:52
+msgid "Limit to specific ZIP/postcodes"
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:55
+msgid "List 1 postcode per line"
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:56
+msgid ""
+"Postcodes containing wildcards (e.g. CB23*) and fully numeric ranges (e.g. "
+"<code>90210...99000</code>) are also supported."
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:63
+msgid "Shipping methods"
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:64
+msgid ""
+"The following shipping methods apply to customers with shipping addresses "
+"within this zone."
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:71
+msgid "Shipping method title"
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:79
+#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:156
+#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:181
+#: includes/admin/settings/views/html-admin-page-shipping-zones.php:95
+#: includes/admin/settings/views/html-admin-page-shipping-zones.php:121
+msgid "Add shipping method"
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:96
+msgid ""
+"You can add multiple shipping methods within this zone. Only customers "
+"within the zone will see them."
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:126
+#. translators: %s: shipping method title
+msgid "%s Settings"
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:131
+#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:158
+#: includes/admin/settings/views/html-admin-page-shipping-zones.php:97
+msgid "Close modal panel"
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:164
+#: includes/admin/settings/views/html-admin-page-shipping-zones.php:103
+msgid ""
+"Choose the shipping method you wish to add. Only shipping methods which "
+"support zones are listed."
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-zones.php:9
+#: includes/admin/settings/views/html-admin-page-shipping-zones.php:66
+msgid "Add shipping zone"
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-zones.php:11
+msgid ""
+"A shipping zone is a geographic region where a certain set of shipping "
+"methods are offered."
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-zones.php:11
+msgid ""
+"WooCommerce will match a customer to a single zone using their shipping "
+"address and present the shipping methods within that zone to them."
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-zones.php:15
+msgid ""
+"Drag and drop to re-order your custom zones. This is the order in which "
+"they will be matched against the customer address."
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-zones.php:17
+msgid "Region(s)"
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-zones.php:18
+msgid "Shipping method(s)"
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-zones.php:26
+#: includes/data-stores/class-wc-shipping-zone-data-store.php:66
+msgid "Rest of the World"
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-zones.php:31
+msgid ""
+"This zone is <b>optionally</b> used for regions that are not included in "
+"any other shipping zone."
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-zones.php:58
+msgid ""
+"A shipping zone is a geographic region where a certain set of shipping "
+"methods and rates apply."
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-zones.php:59
+msgid "For example:"
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-zones.php:61
+msgid "Local zone = California ZIP 90210 = Local pickup"
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-zones.php:62
+msgid "US domestic zone = All US states = Flat rate shipping"
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-zones.php:63
+msgid "Europe zone = Any country in Europe = Flat rate shipping"
+msgstr ""
+
+#: includes/admin/settings/views/html-admin-page-shipping-zones.php:65
+msgid ""
+"Add as many zones as you need &ndash; customers will only see the methods "
+"available for their address."
+msgstr ""
+
 #: includes/admin/settings/views/html-keys-edit.php:8
-msgid "Key Details"
+msgid "Key details"
 msgstr ""
 
 #: includes/admin/settings/views/html-keys-edit.php:17
@@ -10727,156 +11682,163 @@ msgid "Owner of these keys."
 msgstr ""
 
 #: includes/admin/settings/views/html-keys-edit.php:41
+msgid "Search for a user&hellip;"
+msgstr ""
+
+#: includes/admin/settings/views/html-keys-edit.php:49
 msgid "Select the access type of these keys."
 msgstr ""
 
-#: includes/admin/settings/views/html-keys-edit.php:92
-msgid "Generate API Key"
+#: includes/admin/settings/views/html-keys-edit.php:101
+msgid "Generate API key"
 msgstr ""
 
-#: includes/admin/settings/views/html-keys-edit.php:97
-#: includes/class-wc-ajax.php:2373
-msgid "Revoke Key"
+#: includes/admin/settings/views/html-keys-edit.php:106
+#: includes/class-wc-ajax.php:1521
+msgid "Revoke key"
 msgstr ""
 
-#: includes/admin/settings/views/html-keys-edit.php:109
-msgid "Consumer Key"
+#: includes/admin/settings/views/html-keys-edit.php:119
+msgid "Consumer key"
 msgstr ""
 
-#: includes/admin/settings/views/html-keys-edit.php:112
-#: includes/admin/settings/views/html-keys-edit.php:120
-#: includes/admin/views/html-admin-page-status-report.php:17
+#: includes/admin/settings/views/html-keys-edit.php:122
+#: includes/admin/settings/views/html-keys-edit.php:130
+#: includes/admin/views/html-admin-page-status-report.php:26
 msgid "Copied!"
 msgstr ""
 
-#: includes/admin/settings/views/html-keys-edit.php:112
-#: includes/admin/settings/views/html-keys-edit.php:120
+#: includes/admin/settings/views/html-keys-edit.php:122
+#: includes/admin/settings/views/html-keys-edit.php:130
 msgid "Copy"
 msgstr ""
 
-#: includes/admin/settings/views/html-keys-edit.php:117
-msgid "Consumer Secret"
+#: includes/admin/settings/views/html-keys-edit.php:127
+msgid "Consumer secret"
 msgstr ""
 
-#: includes/admin/settings/views/html-keys-edit.php:125
+#: includes/admin/settings/views/html-keys-edit.php:135
 msgid "QRCode"
 msgstr ""
 
 #: includes/admin/settings/views/html-settings-tax.php:8
-msgid "Search…"
+msgid "Search&hellip;"
 msgstr ""
 
-#: includes/admin/settings/views/html-settings-tax.php:11
-msgid "\"%s\" Tax Rates"
+#: includes/admin/settings/views/html-settings-tax.php:16
+#. translators: %s: tax rate
+msgid "\"%s\" tax rates"
 msgstr ""
 
 #: includes/admin/settings/views/html-settings-tax.php:17
-msgid "Country&nbsp;Code"
+#: includes/admin/views/html-bulk-edit-product.php:95
+#: includes/admin/views/html-quick-edit-product.php:73
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:217
+#: includes/wc-product-functions.php:784
+msgid "Standard"
 msgstr ""
 
-#: includes/admin/settings/views/html-settings-tax.php:17
+#: includes/admin/settings/views/html-settings-tax.php:24
+msgid "Country&nbsp;code"
+msgstr ""
+
+#: includes/admin/settings/views/html-settings-tax.php:24
 msgid "A 2 digit country code, e.g. US. Leave blank to apply to all."
 msgstr ""
 
-#: includes/admin/settings/views/html-settings-tax.php:18
-msgid "State&nbsp;Code"
-msgstr ""
-
-#: includes/admin/settings/views/html-settings-tax.php:18
+#: includes/admin/settings/views/html-settings-tax.php:25
 msgid "A 2 digit state code, e.g. AL. Leave blank to apply to all."
 msgstr ""
 
-#: includes/admin/settings/views/html-settings-tax.php:19
+#: includes/admin/settings/views/html-settings-tax.php:26
 msgid ""
 "Postcode for this rule. Semi-colon (;) separate multiple values. Leave "
-"blank to apply to all areas. Wildcards (*) can be used. Ranges for numeric "
-"postcodes (e.g. 12345-12350) will be expanded into individual postcodes."
+"blank to apply to all areas. Wildcards (*) and ranges for numeric postcodes "
+"(e.g. 12345...12350) can also be used."
 msgstr ""
 
-#: includes/admin/settings/views/html-settings-tax.php:20
+#: includes/admin/settings/views/html-settings-tax.php:27
 msgid ""
 "Cities for this rule. Semi-colon (;) separate multiple values. Leave blank "
 "to apply to all cities."
 msgstr ""
 
-#: includes/admin/settings/views/html-settings-tax.php:21
+#: includes/admin/settings/views/html-settings-tax.php:28
 msgid "Rate&nbsp;%"
 msgstr ""
 
-#: includes/admin/settings/views/html-settings-tax.php:21
+#: includes/admin/settings/views/html-settings-tax.php:28
 msgid "Enter a tax rate (percentage) to 4 decimal places."
 msgstr ""
 
-#: includes/admin/settings/views/html-settings-tax.php:22
-msgid "Tax&nbsp;Name"
-msgstr ""
-
-#: includes/admin/settings/views/html-settings-tax.php:22
+#: includes/admin/settings/views/html-settings-tax.php:29
 msgid "Enter a name for this tax rate."
 msgstr ""
 
-#: includes/admin/settings/views/html-settings-tax.php:23
+#: includes/admin/settings/views/html-settings-tax.php:30
 msgid ""
 "Choose a priority for this tax rate. Only 1 matching rate per priority will "
 "be used. To define multiple tax rates for a single area you need to specify "
 "a different priority per rate."
 msgstr ""
 
-#: includes/admin/settings/views/html-settings-tax.php:24
+#: includes/admin/settings/views/html-settings-tax.php:31
 msgid ""
 "Choose whether or not this is a compound rate. Compound tax rates are "
 "applied on top of other tax rates."
 msgstr ""
 
-#: includes/admin/settings/views/html-settings-tax.php:25
+#: includes/admin/settings/views/html-settings-tax.php:32
 msgid "Choose whether or not this tax rate also gets applied to shipping."
 msgstr ""
 
-#: includes/admin/settings/views/html-settings-tax.php:31
+#: includes/admin/settings/views/html-settings-tax.php:38
 msgid "Insert row"
 msgstr ""
 
-#: includes/admin/settings/views/html-settings-tax.php:32
+#: includes/admin/settings/views/html-settings-tax.php:39
 msgid "Remove selected row(s)"
 msgstr ""
 
-#: includes/admin/settings/views/html-settings-tax.php:34
+#: includes/admin/settings/views/html-settings-tax.php:41
 msgid "Import CSV"
 msgstr ""
 
-#: includes/admin/settings/views/html-settings-tax.php:40
-msgid "Loading…"
+#: includes/admin/settings/views/html-settings-tax.php:47
+msgid "Loading&hellip;"
 msgstr ""
 
-#: includes/admin/settings/views/html-settings-tax.php:46
+#: includes/admin/settings/views/html-settings-tax.php:53
 msgid "Tax rate ID: %s"
 msgstr ""
 
-#: includes/admin/settings/views/html-settings-tax.php:89
-msgid "No Matching Tax Rates Found."
-msgstr ""
-
-#: includes/admin/settings/views/html-settings-tax.php:100
-msgid "First page"
+#: includes/admin/settings/views/html-settings-tax.php:94
+msgid "No matching tax rates found."
 msgstr ""
 
 #: includes/admin/settings/views/html-settings-tax.php:104
+#. translators: %s: number
+msgid "%s items"
+msgstr ""
+
+#: includes/admin/settings/views/html-settings-tax.php:111
+msgid "First page"
+msgstr ""
+
+#: includes/admin/settings/views/html-settings-tax.php:115
 msgid "Previous page"
 msgstr ""
 
-#: includes/admin/settings/views/html-settings-tax.php:109
-msgid "Current Page"
-msgstr ""
-
-#: includes/admin/settings/views/html-settings-tax.php:116
+#: includes/admin/settings/views/html-settings-tax.php:132
 msgid "Next page"
 msgstr ""
 
-#: includes/admin/settings/views/html-settings-tax.php:120
+#: includes/admin/settings/views/html-settings-tax.php:136
 msgid "Last page"
 msgstr ""
 
 #: includes/admin/settings/views/html-webhook-log.php:13
+#: includes/wc-account-functions.php:224
 msgid "Method"
 msgstr ""
 
@@ -10890,7 +11852,7 @@ msgid "Headers"
 msgstr ""
 
 #: includes/admin/settings/views/html-webhook-log.php:21
-#: includes/admin/settings/views/html-webhook-log.php:33
+#: includes/admin/settings/views/html-webhook-log.php:34
 msgid "Content"
 msgstr ""
 
@@ -10910,235 +11872,238 @@ msgid "Response"
 msgstr ""
 
 #: includes/admin/settings/views/html-webhooks-edit.php:10
-msgid "Webhook Data"
+msgid "Webhook data"
 msgstr ""
 
-#: includes/admin/settings/views/html-webhooks-edit.php:16
+#: includes/admin/settings/views/html-webhooks-edit.php:18
 msgid ""
 "Friendly name for identifying this webhook, defaults to Webhook created on "
 "%s."
 msgstr ""
 
-#: includes/admin/settings/views/html-webhooks-edit.php:25
+#: includes/admin/settings/views/html-webhooks-edit.php:29
 msgid ""
 "The options are &quot;Active&quot; (delivers payload), &quot;Paused&quot; "
 "(does not deliver), or &quot;Disabled&quot; (does not deliver due delivery "
 "failures)."
 msgstr ""
 
-#: includes/admin/settings/views/html-webhooks-edit.php:42
+#: includes/admin/settings/views/html-webhooks-edit.php:46
 msgid "Select when the webhook will fire."
 msgstr ""
 
-#: includes/admin/settings/views/html-webhooks-edit.php:51
-msgid "Coupon Created"
-msgstr ""
-
-#: includes/admin/settings/views/html-webhooks-edit.php:52
-msgid "Coupon Updated"
-msgstr ""
-
-#: includes/admin/settings/views/html-webhooks-edit.php:53
-msgid "Coupon Deleted"
-msgstr ""
-
-#: includes/admin/settings/views/html-webhooks-edit.php:54
-msgid "Customer Created"
-msgstr ""
-
 #: includes/admin/settings/views/html-webhooks-edit.php:55
-msgid "Customer Updated"
+msgid "Coupon created"
 msgstr ""
 
 #: includes/admin/settings/views/html-webhooks-edit.php:56
-msgid "Customer Deleted"
+msgid "Coupon updated"
 msgstr ""
 
 #: includes/admin/settings/views/html-webhooks-edit.php:57
-msgid "Order Created"
+msgid "Coupon deleted"
 msgstr ""
 
 #: includes/admin/settings/views/html-webhooks-edit.php:58
-msgid "Order Updated"
+msgid "Customer created"
 msgstr ""
 
 #: includes/admin/settings/views/html-webhooks-edit.php:59
-msgid "Order Deleted"
+msgid "Customer updated"
 msgstr ""
 
 #: includes/admin/settings/views/html-webhooks-edit.php:60
-msgid "Product Created"
+msgid "Customer deleted"
 msgstr ""
 
 #: includes/admin/settings/views/html-webhooks-edit.php:61
-msgid "Product Updated"
+msgid "Order created"
 msgstr ""
 
 #: includes/admin/settings/views/html-webhooks-edit.php:62
-msgid "Product Deleted"
+msgid "Order updated"
 msgstr ""
 
 #: includes/admin/settings/views/html-webhooks-edit.php:63
-msgid "Action"
+msgid "Order deleted"
 msgstr ""
 
 #: includes/admin/settings/views/html-webhooks-edit.php:64
+msgid "Product created"
+msgstr ""
+
+#: includes/admin/settings/views/html-webhooks-edit.php:65
+msgid "Product updated"
+msgstr ""
+
+#: includes/admin/settings/views/html-webhooks-edit.php:66
+msgid "Product deleted"
+msgstr ""
+
+#: includes/admin/settings/views/html-webhooks-edit.php:67
+msgid "Action"
+msgstr ""
+
+#: includes/admin/settings/views/html-webhooks-edit.php:68
 msgid "Custom"
 msgstr ""
 
-#: includes/admin/settings/views/html-webhooks-edit.php:75
-msgid "Action Event"
+#: includes/admin/settings/views/html-webhooks-edit.php:79
+msgid "Action event"
 msgstr ""
 
-#: includes/admin/settings/views/html-webhooks-edit.php:76
-msgid "Enter the Action that will trigger this webhook."
+#: includes/admin/settings/views/html-webhooks-edit.php:80
+msgid "Enter the action that will trigger this webhook."
 msgstr ""
 
-#: includes/admin/settings/views/html-webhooks-edit.php:84
-msgid "Custom Topic"
+#: includes/admin/settings/views/html-webhooks-edit.php:88
+msgid "Custom topic"
 msgstr ""
 
-#: includes/admin/settings/views/html-webhooks-edit.php:85
-msgid "Enter the Custom Topic that will trigger this webhook."
+#: includes/admin/settings/views/html-webhooks-edit.php:89
+msgid "Enter the custom topic that will trigger this webhook."
 msgstr ""
 
-#: includes/admin/settings/views/html-webhooks-edit.php:94
+#: includes/admin/settings/views/html-webhooks-edit.php:98
 msgid "URL where the webhook payload is delivered."
 msgstr ""
 
-#: includes/admin/settings/views/html-webhooks-edit.php:102
+#: includes/admin/settings/views/html-webhooks-edit.php:106
 msgid "Secret"
 msgstr ""
 
-#: includes/admin/settings/views/html-webhooks-edit.php:103
+#: includes/admin/settings/views/html-webhooks-edit.php:107
 msgid ""
-"The Secret Key is used to generate a hash of the delivered webhook and "
-"provided in the request headers. This will default to the current API "
-"user's consumer secret if not provided."
+"The secret key is used to generate a hash of the delivered webhook and "
+"provided in the request headers."
+msgstr ""
+
+#: includes/admin/settings/views/html-webhooks-edit.php:115
+msgid "API Version"
 msgstr ""
 
 #: includes/admin/settings/views/html-webhooks-edit.php:116
-msgid "Webhook Actions"
+msgid "REST API version used in the webhook deliveries."
 msgstr ""
 
-#: includes/admin/settings/views/html-webhooks-edit.php:123
-#: includes/admin/settings/views/html-webhooks-edit.php:132
-msgid "Created at"
+#: includes/admin/settings/views/html-webhooks-edit.php:120
+msgid "WP REST API Integration v2"
+msgstr ""
+
+#: includes/admin/settings/views/html-webhooks-edit.php:121
+msgid "WP REST API Integration v1"
+msgstr ""
+
+#: includes/admin/settings/views/html-webhooks-edit.php:122
+msgid "Legacy API v3 (deprecated)"
+msgstr ""
+
+#: includes/admin/settings/views/html-webhooks-edit.php:133
+msgid "Webhook actions"
 msgstr ""
 
 #: includes/admin/settings/views/html-webhooks-edit.php:140
+#: includes/admin/settings/views/html-webhooks-edit.php:149
+msgid "Created at"
+msgstr ""
+
+#: includes/admin/settings/views/html-webhooks-edit.php:157
 msgid "Updated at"
 msgstr ""
 
-#: includes/admin/settings/views/html-webhooks-edit.php:151
-msgid "Save Webhook"
+#: includes/admin/settings/views/html-webhooks-edit.php:168
+msgid "Save webhook"
 msgstr ""
 
-#: includes/admin/settings/views/html-webhooks-edit.php:163
-msgid "Webhook Logs"
+#: includes/admin/settings/views/html-webhooks-edit.php:180
+msgid "Webhook logs"
 msgstr ""
 
 #: includes/admin/settings/views/settings-tax.php:12
-msgid "Enable Taxes"
+msgid "Prices entered with tax"
 msgstr ""
 
-#: includes/admin/settings/views/settings-tax.php:13
-msgid "Enable taxes and tax calculations"
-msgstr ""
-
-#: includes/admin/settings/views/settings-tax.php:20
-msgid "Prices Entered With Tax"
-msgstr ""
-
-#: includes/admin/settings/views/settings-tax.php:24
+#: includes/admin/settings/views/settings-tax.php:16
 msgid ""
 "This option is important as it will affect how you input prices. Changing "
 "it will not update existing products."
 msgstr ""
 
-#: includes/admin/settings/views/settings-tax.php:26
+#: includes/admin/settings/views/settings-tax.php:18
 msgid "Yes, I will enter prices inclusive of tax"
 msgstr ""
 
-#: includes/admin/settings/views/settings-tax.php:27
+#: includes/admin/settings/views/settings-tax.php:19
 msgid "No, I will enter prices exclusive of tax"
 msgstr ""
 
-#: includes/admin/settings/views/settings-tax.php:32
-msgid "Calculate Tax Based On:"
+#: includes/admin/settings/views/settings-tax.php:24
+msgid "Calculate tax based on"
 msgstr ""
 
-#: includes/admin/settings/views/settings-tax.php:34
+#: includes/admin/settings/views/settings-tax.php:26
 msgid "This option determines which address is used to calculate tax."
 msgstr ""
 
+#: includes/admin/settings/views/settings-tax.php:38
+msgid "Shipping tax class"
+msgstr ""
+
 #: includes/admin/settings/views/settings-tax.php:39
-msgid "Customer shipping address"
-msgstr ""
-
-#: includes/admin/settings/views/settings-tax.php:40
-msgid "Customer billing address"
-msgstr ""
-
-#: includes/admin/settings/views/settings-tax.php:46
-msgid "Shipping Tax Class:"
-msgstr ""
-
-#: includes/admin/settings/views/settings-tax.php:47
 msgid ""
 "Optionally control which tax class shipping gets, or leave it so shipping "
 "tax is based on the cart items themselves."
 msgstr ""
 
-#: includes/admin/settings/views/settings-tax.php:53
+#: includes/admin/settings/views/settings-tax.php:45
 msgid "Shipping tax class based on cart items"
 msgstr ""
 
-#: includes/admin/settings/views/settings-tax.php:58
+#: includes/admin/settings/views/settings-tax.php:50
 msgid "Rounding"
 msgstr ""
 
-#: includes/admin/settings/views/settings-tax.php:59
+#: includes/admin/settings/views/settings-tax.php:51
 msgid "Round tax at subtotal level, instead of rounding per line"
 msgstr ""
 
-#: includes/admin/settings/views/settings-tax.php:66
-msgid "Additional Tax Classes"
+#: includes/admin/settings/views/settings-tax.php:58
+msgid "Additional tax classes"
+msgstr ""
+
+#: includes/admin/settings/views/settings-tax.php:59
+msgid ""
+"List additional tax classes below (1 per line). This is in addition to the "
+"default \"Standard rate\"."
+msgstr ""
+
+#: includes/admin/settings/views/settings-tax.php:63
+msgid "Reduced rate%sZero rate"
 msgstr ""
 
 #: includes/admin/settings/views/settings-tax.php:67
-msgid ""
-"List additional tax classes below (1 per line). This is in addition to the "
-"default \"Standard Rate\"."
+msgid "Display prices in the shop"
 msgstr ""
 
-#: includes/admin/settings/views/settings-tax.php:71
-msgid "Reduced Rate%sZero Rate"
-msgstr ""
-
-#: includes/admin/settings/views/settings-tax.php:75
-msgid "Display Prices in the Shop:"
-msgstr ""
-
-#: includes/admin/settings/views/settings-tax.php:81
-#: includes/admin/settings/views/settings-tax.php:93
+#: includes/admin/settings/views/settings-tax.php:73
+#: includes/admin/settings/views/settings-tax.php:85
 msgid "Including tax"
 msgstr ""
 
-#: includes/admin/settings/views/settings-tax.php:82
-#: includes/admin/settings/views/settings-tax.php:94
+#: includes/admin/settings/views/settings-tax.php:74
+#: includes/admin/settings/views/settings-tax.php:86
 msgid "Excluding tax"
 msgstr ""
 
-#: includes/admin/settings/views/settings-tax.php:87
-msgid "Display Prices During Cart and Checkout:"
+#: includes/admin/settings/views/settings-tax.php:79
+msgid "Display prices during cart and checkout"
 msgstr ""
 
-#: includes/admin/settings/views/settings-tax.php:100
-msgid "Price Display Suffix:"
+#: includes/admin/settings/views/settings-tax.php:92
+msgid "Price display suffix"
 msgstr ""
 
-#: includes/admin/settings/views/settings-tax.php:105
+#: includes/admin/settings/views/settings-tax.php:97
 msgid ""
 "Define text to show after your product prices. This could be, for example, "
 "\"inc. Vat\" to explain your pricing. You can also have prices substituted "
@@ -11146,234 +12111,248 @@ msgid ""
 "{price_excluding_tax}."
 msgstr ""
 
-#: includes/admin/settings/views/settings-tax.php:109
-msgid "Display Tax Totals:"
+#: includes/admin/settings/views/settings-tax.php:101
+msgid "Display tax totals"
 msgstr ""
 
-#: includes/admin/settings/views/settings-tax.php:115
+#: includes/admin/settings/views/settings-tax.php:107
 msgid "As a single total"
 msgstr ""
 
-#: includes/admin/settings/views/settings-tax.php:116
+#: includes/admin/settings/views/settings-tax.php:108
 msgid "Itemized"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-addons.php:16
-msgid "Browse all extensions"
-msgstr ""
-
-#: includes/admin/views/html-admin-page-addons.php:44
+#: includes/admin/views/html-admin-page-addons.php:48
 msgid ""
-"Our catalog of WooCommerce Extensions can be found on WooThemes.com here: "
+"Our catalog of WooCommerce Extensions can be found on WooCommerce.com here: "
 "<a href=\"%s\">WooCommerce Extensions Catalog</a>"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-addons.php:50
+#: includes/admin/views/html-admin-page-addons.php:54
 msgid "Looking for a WooCommerce theme?"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-addons.php:51
-msgid "We recommend Storefront, the %sofficial%s WooCommerce theme."
+#: includes/admin/views/html-admin-page-addons.php:55
+msgid "We recommend Storefront, the <em>official</em> WooCommerce theme."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-addons.php:52
+#: includes/admin/views/html-admin-page-addons.php:56
 msgid ""
-"Storefront is an intuitive &amp; flexible, %sfree%s WordPress theme "
-"offering deep integration with WooCommerce and many of the most popular "
-"customer-facing extensions."
+"Storefront is an intuitive, flexible and <strong>free</strong> WordPress "
+"theme offering deep integration with WooCommerce and many of the most "
+"popular customer-facing extensions."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-addons.php:54
+#: includes/admin/views/html-admin-page-addons.php:58
 msgid "Read all about it"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-addons.php:55
+#: includes/admin/views/html-admin-page-addons.php:59
 msgid "Download &amp; install"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-logs.php:15
-msgid "Log file: %s (%s)"
+#: includes/admin/views/html-admin-page-status-logs-db.php:17
+msgid "Flush all logs"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-logs.php:33
+#: includes/admin/views/html-admin-page-status-logs-db.php:23
+msgid "Are you sure you want to clear all logs from the database?"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-logs.php:17
+msgid "Delete log"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-logs.php:37
 msgid "There are currently no logs to view."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:12
+#: includes/admin/views/html-admin-page-status-report.php:21
 msgid ""
 "Please copy and paste this information in your ticket when contacting "
 "support:"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:13
-msgid "Get System Report"
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-report.php:14
-msgid "Understanding the Status Report"
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-report.php:17
-msgid "Copy for Support"
+#: includes/admin/views/html-admin-page-status-report.php:22
+msgid "Get system report"
 msgstr ""
 
 #: includes/admin/views/html-admin-page-status-report.php:23
-msgid "WordPress Environment"
+msgid "Understanding the status report"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:28
-msgid "Home URL"
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-report.php:29
-msgid "The URL of your site's homepage."
+#: includes/admin/views/html-admin-page-status-report.php:26
+msgid "Copy for support"
 msgstr ""
 
 #: includes/admin/views/html-admin-page-status-report.php:33
-msgid "Site URL"
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-report.php:34
-msgid "The root URL of your site."
+msgid "WordPress environment"
 msgstr ""
 
 #: includes/admin/views/html-admin-page-status-report.php:38
-msgid "WC Version"
+msgid "Home URL"
 msgstr ""
 
 #: includes/admin/views/html-admin-page-status-report.php:39
-msgid "The version of WooCommerce installed on your site."
+msgid "The URL of your site's homepage."
 msgstr ""
 
 #: includes/admin/views/html-admin-page-status-report.php:43
-msgid "Log Directory Writable"
+msgid "Site URL"
 msgstr ""
 
 #: includes/admin/views/html-admin-page-status-report.php:44
+msgid "The root URL of your site."
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:48
+msgid "WC version"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:49
+msgid "The version of WooCommerce installed on your site."
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:53
+msgid "Log directory writable"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:54
 msgid ""
 "Several WooCommerce extensions can write logs which makes debugging "
 "problems easier. The directory must be writable for this to happen."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:49
-msgid ""
-"To allow logging, make <code>%s</code> writable or define a custom "
-"<code>WC_LOG_DIR</code>."
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-report.php:54
-msgid "WP Version"
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-report.php:55
-msgid "The version of WordPress installed on your site."
-msgstr ""
-
 #: includes/admin/views/html-admin-page-status-report.php:59
-msgid "WP Multisite"
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-report.php:60
-msgid "Whether or not you have WordPress Multisite enabled."
+msgid "To allow logging, make %1$s writable or define a custom %2$s."
 msgstr ""
 
 #: includes/admin/views/html-admin-page-status-report.php:64
-msgid "WP Memory Limit"
+msgid "WP version"
 msgstr ""
 
 #: includes/admin/views/html-admin-page-status-report.php:65
+msgid "The version of WordPress installed on your site."
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:69
+msgid "WP multisite"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:70
+msgid "Whether or not you have WordPress Multisite enabled."
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:74
+msgid "WP memory limit"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:75
 msgid "The maximum amount of memory (RAM) that your site can use at one time."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:75
-msgid "%s - We recommend setting memory to at least 64MB. See: %s"
+#: includes/admin/views/html-admin-page-status-report.php:78
+msgid "%1$s - We recommend setting memory to at least 64MB. See: %2$s"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:75
+#: includes/admin/views/html-admin-page-status-report.php:78
 msgid "Increasing memory allocated to PHP"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:82
-msgid "WP Debug Mode"
+#: includes/admin/views/html-admin-page-status-report.php:85
+msgid "WP debug mode"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:83
+#: includes/admin/views/html-admin-page-status-report.php:86
 msgid "Displays whether or not WordPress is in Debug Mode."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:87
-msgid "Language"
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-report.php:88
-msgid "The current language used by WordPress. Default = English"
-msgstr ""
-
 #: includes/admin/views/html-admin-page-status-report.php:96
-msgid "Server Environment"
+msgid "WP cron"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:101
-msgid "Server Info"
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-report.php:102
-msgid "Information about the web server that is currently hosting your site."
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-report.php:106
-msgid "PHP Version"
+#: includes/admin/views/html-admin-page-status-report.php:97
+msgid "Displays whether or not WP Cron Jobs are enabled."
 msgstr ""
 
 #: includes/admin/views/html-admin-page-status-report.php:107
-msgid "The version of PHP installed on your hosting server."
+msgid "Language"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:114
-msgid "%s - We recommend a minimum PHP version of 5.4. See: %s"
+#: includes/admin/views/html-admin-page-status-report.php:108
+msgid "The current language used by WordPress. Default = English"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:114
-msgid "How to update your PHP version"
+#: includes/admin/views/html-admin-page-status-report.php:116
+msgid "Server environment"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:119
-msgid "Couldn't determine PHP version because phpversion() doesn't exist."
+#: includes/admin/views/html-admin-page-status-report.php:121
+msgid "Server info"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:125
-msgid "PHP Post Max Size"
+#: includes/admin/views/html-admin-page-status-report.php:122
+msgid "Information about the web server that is currently hosting your site."
 msgstr ""
 
 #: includes/admin/views/html-admin-page-status-report.php:126
-msgid "The largest filesize that can be contained in one post."
+msgid "PHP version"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:127
+msgid "The version of PHP installed on your hosting server."
 msgstr ""
 
 #: includes/admin/views/html-admin-page-status-report.php:130
-msgid "PHP Time Limit"
+msgid "%1$s - We recommend a minimum PHP version of 5.6. See: %2$s"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:131
+#: includes/admin/views/html-admin-page-status-report.php:130
+msgid "How to update your PHP version"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:138
+msgid "PHP post max size"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:139
+msgid "The largest filesize that can be contained in one post."
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:143
+msgid "PHP time limit"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:144
 msgid ""
 "The amount of time (in seconds) that your site will spend on a single "
 "operation before timing out (to avoid server lockups)"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:135
-msgid "PHP Max Input Vars"
+#: includes/admin/views/html-admin-page-status-report.php:148
+msgid "PHP max input vars"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:136
+#: includes/admin/views/html-admin-page-status-report.php:149
 msgid ""
 "The maximum number of variables your server can use for a single function "
 "to avoid overloads."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:140
-msgid "SUHOSIN Installed"
+#: includes/admin/views/html-admin-page-status-report.php:153
+msgid "cURL version"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:141
+#: includes/admin/views/html-admin-page-status-report.php:154
+msgid "The version of cURL installed on your server."
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:158
+msgid "SUHOSIN installed"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:159
 msgid ""
 "Suhosin is an advanced protection system for PHP installations. It was "
 "designed to protect your servers on the one hand against a number of well "
@@ -11383,412 +12362,446 @@ msgid ""
 "its data submission limits."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:146
-msgid "MySQL Version"
+#: includes/admin/views/html-admin-page-status-report.php:170
+msgid "MySQL version"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:147
+#: includes/admin/views/html-admin-page-status-report.php:171
 msgid "The version of MySQL installed on your hosting server."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:157
-msgid "Max Upload Size"
+#: includes/admin/views/html-admin-page-status-report.php:175
+msgid "%1$s - We recommend a minimum MySQL version of 5.6. See: %2$s"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:158
+#: includes/admin/views/html-admin-page-status-report.php:175
+msgid "WordPress requirements"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:184
+msgid "Max upload size"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:185
 msgid "The largest filesize that can be uploaded to your WordPress installation."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:162
-msgid "Default Timezone is UTC"
+#: includes/admin/views/html-admin-page-status-report.php:189
+msgid "Default timezone is UTC"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:163
+#: includes/admin/views/html-admin-page-status-report.php:190
 msgid "The default timezone for your server."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:167
+#: includes/admin/views/html-admin-page-status-report.php:193
 msgid "Default timezone is %s - it should be UTC"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:178
+#: includes/admin/views/html-admin-page-status-report.php:200
+msgid "fsockopen/cURL"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:201
 msgid ""
 "Payment gateways can use cURL to communicate with remote servers to "
 "authorize payments, other plugins may also use it when communicating with "
 "remote services."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:184
+#: includes/admin/views/html-admin-page-status-report.php:206
 msgid ""
 "Your server does not have fsockopen or cURL enabled - PayPal IPN and other "
 "scripts which communicate with other servers will not work. Contact your "
 "hosting provider."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:189
+#: includes/admin/views/html-admin-page-status-report.php:211
+msgid "SoapClient"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:212
 msgid ""
 "Some webservices like shipping use SOAP to get information from remote "
 "servers, for example, live shipping quotes from FedEx require SOAP to be "
 "installed."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:195
+#: includes/admin/views/html-admin-page-status-report.php:217
 msgid ""
 "Your server does not have the %s class enabled - some gateway plugins which "
 "use SOAP may not work as expected."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:200
+#: includes/admin/views/html-admin-page-status-report.php:222
+msgid "DOMDocument"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:223
 msgid "HTML/Multipart emails use DOMDocument to generate inline CSS in templates."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:206
+#: includes/admin/views/html-admin-page-status-report.php:228
 msgid ""
 "Your server does not have the %s class enabled - HTML/Multipart emails, and "
 "also some extensions, will not work without DOMDocument."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:211
+#: includes/admin/views/html-admin-page-status-report.php:233
+msgid "GZip"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:234
 msgid "GZip (gzopen) is used to open the GEOIP database from MaxMind."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:217
+#: includes/admin/views/html-admin-page-status-report.php:239
 msgid ""
 "Your server does not support the %s function - this is required to use the "
-"GeoIP database from MaxMind. The API fallback will be used instead for "
-"geolocation."
+"GeoIP database from MaxMind."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:222
+#: includes/admin/views/html-admin-page-status-report.php:244
+msgid "Multibyte string"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:245
 msgid ""
 "Multibyte String (mbstring) is used to convert character encoding, like for "
 "emails or converting characters to lowercase."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:228
+#: includes/admin/views/html-admin-page-status-report.php:250
 msgid ""
 "Your server does not support the %s functions - this is required for better "
 "character encoding. Some fallbacks will be used instead for it."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:232
-msgid "Remote Post"
+#: includes/admin/views/html-admin-page-status-report.php:255
+msgid "Remote post"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:233
+#: includes/admin/views/html-admin-page-status-report.php:256
 msgid ""
 "PayPal uses this method of communicating when sending back transaction "
 "information."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:246
-msgid ""
-"wp_remote_post() failed. PayPal IPN won't work with your server. Contact "
-"your hosting provider."
+#: includes/admin/views/html-admin-page-status-report.php:261
+msgid "wp_remote_post() failed. Contact your hosting provider."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:248
 #: includes/admin/views/html-admin-page-status-report.php:266
-#: includes/class-wc-auth.php:354
-msgid "Error: %s"
+msgid "Remote get"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:250
-#: includes/admin/views/html-admin-page-status-report.php:268
-msgid "Status code: %s"
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-report.php:256
-msgid "Remote Get"
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-report.php:257
+#: includes/admin/views/html-admin-page-status-report.php:267
 msgid ""
 "WooCommerce plugins may use this method of communication when checking for "
 "plugin updates."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:264
-msgid ""
-"wp_remote_get() failed. The WooCommerce plugin updater won't work with your "
-"server. Contact your hosting provider."
+#: includes/admin/views/html-admin-page-status-report.php:272
+msgid "wp_remote_get() failed. Contact your hosting provider."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:295
+#: includes/admin/views/html-admin-page-status-report.php:281
 msgid "Database"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:300
-msgid "WC Database Version"
+#: includes/admin/views/html-admin-page-status-report.php:286
+msgid "WC database version"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:301
+#: includes/admin/views/html-admin-page-status-report.php:287
 msgid ""
 "The version of WooCommerce that the database is formatted for. This should "
-"be the same as your WooCommerce Version."
+"be the same as your WooCommerce version."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:323
+#: includes/admin/views/html-admin-page-status-report.php:291
+msgid "Database prefix"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:295
+msgid "%1$s - We recommend using a prefix with less than 20 characters. See: %2$s"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:295
+msgid "How to update your database table prefix"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:308
 msgid "Table does not exist"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:334
-msgid "Active Plugins"
+#: includes/admin/views/html-admin-page-status-report.php:316
+msgid "MaxMind GeoIP database"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:359
+#: includes/admin/views/html-admin-page-status-report.php:317
+msgid "The GeoIP database from MaxMind is used to geolocate customers."
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:322
+msgid ""
+"The MaxMind GeoIP Database does not exist - Geolocation will not function. "
+"You can download and install it manually from %1$s to the path: %2$s. "
+"Scroll down to \"Downloads\" and download the \"Binary / gzip\" file next "
+"to \"GeoLite Country\". Please remember to uncompress GeoIP.dat.gz and "
+"upload the GeoIP.dat file only."
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:334
+msgid "Security"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:339
+msgid "Secure connection (HTTPS)"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:340
+#: includes/api/class-wc-rest-system-status-controller.php:499
+msgid "Is the connection to your store secure?"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:345
+msgid ""
+"Your store is not using HTTPS. <a href=\"%s\" target=\"_blank\">Learn more "
+"about HTTPS and SSL Certificates</a>."
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:350
+msgid "Hide errors from visitors"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:351
+msgid ""
+"Error messages can contain sensitive information about your store "
+"environment. These should be hidden from untrusted visitors."
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:356
+msgid "Error messages should not be shown to visitors."
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:365
+msgid "Active plugins"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:377
 msgid "Visit plugin homepage"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:387
+#: includes/admin/views/html-admin-page-status-report.php:385
+#: includes/admin/views/html-admin-page-status-report.php:530
+#: includes/admin/views/html-admin-page-status-report.php:561
+#. translators: %s: plugin latest version
+#. translators: %s: theme latest version
+#. translators: %s: parant theme latest version
+msgid "%s is available"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:389
 msgid "Network enabled"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:411
-msgid "Force SSL"
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-report.php:412
-msgid "Does your site force a SSL Certificate for transactions?"
+#: includes/admin/views/html-admin-page-status-report.php:416
+msgid "API enabled"
 msgstr ""
 
 #: includes/admin/views/html-admin-page-status-report.php:417
+msgid "Does your site have REST API enabled?"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:421
+msgid "Force SSL"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:422
+msgid "Does your site force a SSL Certificate for transactions?"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:427
 msgid ""
 "What currency prices are listed at in the catalog and which currency "
 "gateways will take payments in."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:422
+#: includes/admin/views/html-admin-page-status-report.php:432
 msgid "The position of the currency symbol."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:427
+#: includes/admin/views/html-admin-page-status-report.php:437
 msgid "The thousand separator of displayed prices."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:432
+#: includes/admin/views/html-admin-page-status-report.php:442
 msgid "The decimal separator of displayed prices."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:437
+#: includes/admin/views/html-admin-page-status-report.php:447
 msgid "The number of decimal points shown in displayed prices."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:450
-msgid "API Enabled"
-msgstr ""
-
 #: includes/admin/views/html-admin-page-status-report.php:451
-msgid "Does your site have REST API enabled?"
+msgid "Taxonomies: Product types"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:455
-msgid "API Version"
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-report.php:456
-msgid "What version of the REST API does your site use?"
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-report.php:464
-msgid "WC Pages"
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-report.php:473
-msgid "The URL of your WooCommerce shop's homepage (along with the Page ID)."
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-report.php:478
-msgid "The URL of your WooCommerce shop's cart (along with the page ID)."
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-report.php:483
-msgid "The URL of your WooCommerce shop's checkout (along with the page ID)."
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-report.php:488
-msgid ""
-"The URL of your WooCommerce shop's “My Account” Page (along with the page "
-"ID)."
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-report.php:509
-msgid "Page not set"
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-report.php:519
-msgid "Page does not exist"
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-report.php:524
-msgid "Page does not contain the shortcode: %s"
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-report.php:542
-msgid "Taxonomies"
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-report.php:542
+#: includes/admin/views/html-admin-page-status-report.php:452
 msgid ""
 "A list of taxonomy terms that can be used in regard to order/product "
 "statuses."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:547
-msgid "Product Types"
+#: includes/admin/views/html-admin-page-status-report.php:466
+msgid "WC pages"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:563
+#: includes/admin/views/html-admin-page-status-report.php:476
+msgid "Edit %s page"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:482
+msgid "The URL of your WooCommerce shop's %s (along with the Page ID)."
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:486
+msgid "Page not set"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:489
+msgid "Page ID is set, but the page does not exist"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:492
+msgid "Page visibility should be <a href=\"%s\" target=\"_blank\">public</a>"
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:498
+msgid "Page does not contain the shortcode."
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:514
 msgid "Theme"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:576
+#: includes/admin/views/html-admin-page-status-report.php:520
 msgid "The name of the current active theme."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:580
+#: includes/admin/views/html-admin-page-status-report.php:524
 msgid "Version"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:581
+#: includes/admin/views/html-admin-page-status-report.php:525
 msgid "The installed version of the current active theme."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:586
-#: includes/admin/views/html-admin-page-status-report.php:619
-msgid "%s is available"
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-report.php:591
+#: includes/admin/views/html-admin-page-status-report.php:535
 msgid "Author URL"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:592
+#: includes/admin/views/html-admin-page-status-report.php:536
 msgid "The theme developers URL."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:596
-msgid "Child Theme"
+#: includes/admin/views/html-admin-page-status-report.php:540
+msgid "Child theme"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:597
+#: includes/admin/views/html-admin-page-status-report.php:541
 msgid "Displays whether or not the current theme is a child theme."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:599
+#: includes/admin/views/html-admin-page-status-report.php:543
 msgid ""
 "If you're modifying WooCommerce on a parent theme you didn't build "
 "personally, then we recommend using a child theme. See: <a href=\"%s\" "
 "target=\"_blank\">How to create a child theme</a>"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:608
-msgid "Parent Theme Name"
+#: includes/admin/views/html-admin-page-status-report.php:550
+msgid "Parent theme name"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:609
+#: includes/admin/views/html-admin-page-status-report.php:551
 msgid "The name of the parent theme."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:613
-msgid "Parent Theme Version"
+#: includes/admin/views/html-admin-page-status-report.php:555
+msgid "Parent theme version"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:614
+#: includes/admin/views/html-admin-page-status-report.php:556
 msgid "The installed version of the parent theme."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:624
-msgid "Parent Theme Author URL"
+#: includes/admin/views/html-admin-page-status-report.php:566
+msgid "Parent theme author URL"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:625
+#: includes/admin/views/html-admin-page-status-report.php:567
 msgid "The parent theme developers URL."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:630
-msgid "WooCommerce Support"
+#: includes/admin/views/html-admin-page-status-report.php:572
+msgid "WooCommerce support"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:631
+#: includes/admin/views/html-admin-page-status-report.php:573
 msgid ""
 "Displays whether or not the current active theme declares WooCommerce "
 "support."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:634
-msgid "Not Declared"
+#: includes/admin/views/html-admin-page-status-report.php:576
+msgid "Not declared"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:645
+#: includes/admin/views/html-admin-page-status-report.php:587
 msgid "Templates"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:645
+#: includes/admin/views/html-admin-page-status-report.php:587
 msgid ""
 "This section shows any files that are overriding the default WooCommerce "
 "template pages."
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:681
-msgid ""
-"<code>%s</code> version <strong style=\"color:red\">%s</strong> is out of "
-"date. The core version is %s"
+#: includes/admin/views/html-admin-page-status-report.php:593
+msgid "Archive template"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:693
-#: includes/admin/views/html-admin-page-status-report.php:702
+#: includes/admin/views/html-admin-page-status-report.php:595
+msgid ""
+"Your theme has a woocommerce.php file, you will not be able to override the "
+"woocommerce/archive-product.php custom template since woocommerce.php has "
+"priority over archive-product.php. This is intended to prevent display "
+"issues."
+msgstr ""
+
+#: includes/admin/views/html-admin-page-status-report.php:601
+#: includes/admin/views/html-admin-page-status-report.php:631
 msgid "Overrides"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:714
-msgid "Learn how to update outdated templates"
+#: includes/admin/views/html-admin-page-status-report.php:611
+msgid "%1$s version %2$s is out of date. The core version is %3$s"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-tools.php:18
-#: includes/admin/views/html-admin-page-status.php:17
-msgid "Tools"
+#: includes/admin/views/html-admin-page-status-report.php:641
+msgid "Outdated templates"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-tools.php:34
-msgid "Shipping Debug Mode"
+#: includes/admin/views/html-admin-page-status-report.php:643
+msgid "Learn how to update"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-tools.php:40
-msgid "This tool will disable shipping rate caching."
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-tools.php:45
-msgid "Template Debug Mode"
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-tools.php:51
-msgid ""
-"This tool will disable template overrides for logged-in administrators for "
-"debugging purposes."
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-tools.php:56
-msgid "Remove All Data"
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-tools.php:62
-msgid ""
-"This tool will remove all WooCommerce, Product and Order data when using "
-"the \"Delete\" link on the plugins screen. It will also remove any "
-"setting/option prepended with \"woocommerce_\" so may also affect installed "
-"WooCommerce Extensions."
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status.php:18
+#: includes/admin/views/html-admin-page-status.php:14
 msgid "Logs"
 msgstr ""
 
-#: includes/admin/views/html-admin-settings.php:35
-#: templates/myaccount/form-edit-account.php:66
-msgid "Save changes"
-msgstr ""
-
 #: includes/admin/views/html-bulk-edit-product.php:26
 #: includes/admin/views/html-bulk-edit-product.php:50
 #: includes/admin/views/html-bulk-edit-product.php:75
@@ -11798,30 +12811,26 @@ msgstr ""
 #: includes/admin/views/html-bulk-edit-product.php:168
 #: includes/admin/views/html-bulk-edit-product.php:185
 #: includes/admin/views/html-bulk-edit-product.php:204
-#: includes/admin/views/html-bulk-edit-product.php:222
-#: includes/admin/views/html-bulk-edit-product.php:241
-#: includes/admin/views/html-bulk-edit-product.php:260
-#: includes/admin/views/html-bulk-edit-product.php:281
-#: includes/admin/views/html-bulk-edit-product.php:302
-msgid "— No Change —"
+#: includes/admin/views/html-bulk-edit-product.php:238
+#: includes/admin/views/html-bulk-edit-product.php:257
+#: includes/admin/views/html-bulk-edit-product.php:295
+msgid "— No change —"
 msgstr ""
 
 #: includes/admin/views/html-bulk-edit-product.php:27
 #: includes/admin/views/html-bulk-edit-product.php:51
 #: includes/admin/views/html-bulk-edit-product.php:123
 #: includes/admin/views/html-bulk-edit-product.php:147
-#: includes/admin/views/html-bulk-edit-product.php:261
+#: includes/admin/views/html-bulk-edit-product.php:258
 msgid "Change to:"
 msgstr ""
 
 #: includes/admin/views/html-bulk-edit-product.php:28
-#: includes/admin/views/html-bulk-edit-product.php:52
-msgid "Increase by (fixed amount or %):"
+msgid "Increase existing price by (fixed amount or %):"
 msgstr ""
 
 #: includes/admin/views/html-bulk-edit-product.php:29
-#: includes/admin/views/html-bulk-edit-product.php:53
-msgid "Decrease by (fixed amount or %):"
+msgid "Decrease existing price by (fixed amount or %):"
 msgstr ""
 
 #: includes/admin/views/html-bulk-edit-product.php:39
@@ -11833,18 +12842,22 @@ msgstr ""
 msgid "Sale"
 msgstr ""
 
+#: includes/admin/views/html-bulk-edit-product.php:52
+msgid "Increase existing sale price by (fixed amount or %):"
+msgstr ""
+
+#: includes/admin/views/html-bulk-edit-product.php:53
+msgid "Decrease existing sale price by (fixed amount or %):"
+msgstr ""
+
 #: includes/admin/views/html-bulk-edit-product.php:54
-msgid "Decrease regular price by (fixed amount or %):"
+msgid "Set to regular price decreased by (fixed amount or %):"
 msgstr ""
 
 #: includes/admin/views/html-bulk-edit-product.php:64
 msgid "Enter sale price (%s)"
 msgstr ""
 
-#: includes/admin/views/html-bulk-edit-product.php:133
-msgid "%s (%s)"
-msgstr ""
-
 #: includes/admin/views/html-bulk-edit-product.php:141
 #: includes/admin/views/html-quick-edit-product.php:109
 msgid "L/W/H"
@@ -11872,18 +12885,58 @@ msgstr ""
 msgid "Catalog &amp; search"
 msgstr ""
 
+#: includes/admin/views/html-bulk-edit-product.php:187
+#: includes/admin/views/html-quick-edit-product.php:144
+#: includes/wc-product-functions.php:732
+msgid "Catalog"
+msgstr ""
+
+#: includes/admin/views/html-bulk-edit-product.php:188
+#: includes/admin/views/html-quick-edit-product.php:145
+#: includes/wc-product-functions.php:733
+msgid "Search"
+msgstr ""
+
+#: includes/admin/views/html-bulk-edit-product.php:189
+#: includes/admin/views/html-quick-edit-product.php:146
+#: includes/wc-product-functions.php:734
+msgid "Hidden"
+msgstr ""
+
 #: includes/admin/views/html-bulk-edit-product.php:217
 #: includes/admin/views/html-quick-edit-product.php:161
 msgid "In stock?"
 msgstr ""
 
-#: includes/admin/views/html-bulk-edit-product.php:276
-#: includes/admin/views/html-quick-edit-product.php:196
+#: includes/admin/views/html-bulk-edit-product.php:221
+#: includes/admin/views/html-bulk-edit-product.php:277
+msgid "— No Change —"
+msgstr ""
+
+#: includes/admin/views/html-bulk-edit-product.php:252
+#: includes/admin/views/html-bulk-edit-product.php:268
+#: includes/admin/views/html-quick-edit-product.php:182
+msgid "Stock qty"
+msgstr ""
+
+#: includes/admin/views/html-bulk-edit-product.php:273
+#: includes/admin/views/html-quick-edit-product.php:192
 msgid "Backorders?"
 msgstr ""
 
-#: includes/admin/views/html-bulk-edit-product.php:297
-msgid "Sold Individually?"
+#: includes/admin/views/html-bulk-edit-product.php:290
+msgid "Sold individually?"
+msgstr ""
+
+#: includes/admin/views/html-notice-custom.php:12
+#: includes/admin/views/html-notice-legacy-shipping.php:11
+#: includes/admin/views/html-notice-no-shipping-methods.php:11
+#: includes/admin/views/html-notice-simplify-commerce.php:19
+#: includes/admin/views/html-notice-template-check.php:13
+#: includes/admin/views/html-notice-theme-support.php:12
+#: includes/admin/views/html-notice-updated.php:12
+#: includes/wc-template-functions.php:498
+msgid "Dismiss"
 msgstr ""
 
 #: includes/admin/views/html-notice-install.php:12
@@ -11897,41 +12950,102 @@ msgid "Run the Setup Wizard"
 msgstr ""
 
 #: includes/admin/views/html-notice-install.php:13
-msgid "Skip Setup"
+msgid "Skip setup"
 msgstr ""
 
-#: includes/admin/views/html-notice-template-check.php:13
+#: includes/admin/views/html-notice-legacy-shipping.php:13
+msgid "New:"
+msgstr ""
+
+#: includes/admin/views/html-notice-legacy-shipping.php:13
 msgid ""
-"<strong>Your theme (%s) contains outdated copies of some WooCommerce "
+"a group of regions that can be assigned different shipping methods and "
+"rates."
+msgstr ""
+
+#: includes/admin/views/html-notice-legacy-shipping.php:14
+msgid ""
+"Legacy shipping methods (flat rate, international flat rate, local pickup "
+"and delivery, and free shipping) are deprecated but will continue to work "
+"as normal for now. <b><em>They will be removed in future versions of "
+"WooCommerce</em></b>. We recommend disabling these and setting up new rates "
+"within shipping zones as soon as possible."
+msgstr ""
+
+#: includes/admin/views/html-notice-legacy-shipping.php:18
+#: includes/admin/views/html-notice-no-shipping-methods.php:18
+msgid "Setup shipping zones"
+msgstr ""
+
+#: includes/admin/views/html-notice-legacy-shipping.php:20
+#: includes/admin/views/html-notice-no-shipping-methods.php:19
+msgid "Learn more about shipping zones"
+msgstr ""
+
+#: includes/admin/views/html-notice-no-shipping-methods.php:13
+msgid "Add shipping methods &amp; zones"
+msgstr ""
+
+#: includes/admin/views/html-notice-no-shipping-methods.php:14
+msgid ""
+"Shipping is currently enabled, but you haven't added any shipping methods "
+"to your shipping zones."
+msgstr ""
+
+#: includes/admin/views/html-notice-no-shipping-methods.php:15
+msgid ""
+"Customers will not be able to purchase physical goods from your store until "
+"a shipping method is available."
+msgstr ""
+
+#: includes/admin/views/html-notice-simplify-commerce.php:21
+msgid ""
+"<strong>The Simplify Commerce payment gateway is deprecated</strong> "
+"&#8211; Please install our new free Simplify Commerce plugin from "
+"WordPress.org. Simplify Commerce will be removed from WooCommerce core in a "
+"future update."
+msgstr ""
+
+#: includes/admin/views/html-notice-simplify-commerce.php:23
+msgid "Install our new Simplify Commerce plugin"
+msgstr ""
+
+#: includes/admin/views/html-notice-template-check.php:15
+msgid ""
+"<strong>Your theme (%1$s) contains outdated copies of some WooCommerce "
 "template files.</strong> These files may need updating to ensure they are "
 "compatible with the current version of WooCommerce. You can see which files "
-"are affected from the %ssystem status page%s. If in doubt, check with the "
-"author of the theme."
+"are affected from the <a href=\"%2$s\">system status page</a>. If in doubt, "
+"check with the author of the theme."
 msgstr ""
 
-#: includes/admin/views/html-notice-template-check.php:14
-msgid "Learn More About Templates"
-msgstr ""
-
-#: includes/admin/views/html-notice-template-check.php:14
-#: includes/admin/views/html-notice-theme-support.php:16
-msgid "Hide This Notice"
-msgstr ""
-
-#: includes/admin/views/html-notice-theme-support.php:12
-msgid ""
-"<strong>Your theme does not declare WooCommerce support</strong> &#8211; "
-"Please read our %sintegration%s guide or check out our %sStorefront%s theme "
-"which is totally free to download and designed specifically for use with "
-"WooCommerce."
+#: includes/admin/views/html-notice-template-check.php:16
+msgid "Learn more about templates"
 msgstr ""
 
 #: includes/admin/views/html-notice-theme-support.php:14
-msgid "Read More About Storefront"
+msgid ""
+"<strong>Your theme does not declare WooCommerce support</strong> &#8211; "
+"Please read our <a href=\"%1$s\" target=\"_blank\">integration</a> guide or "
+"check out our <a href=\"%2$s\" target=\"_blank\">Storefront</a> theme which "
+"is totally free to download and designed specifically for use with "
+"WooCommerce."
 msgstr ""
 
-#: includes/admin/views/html-notice-theme-support.php:15
-msgid "Theme Integration Guide"
+#: includes/admin/views/html-notice-theme-support.php:16
+msgid "Read more about Storefront"
+msgstr ""
+
+#: includes/admin/views/html-notice-theme-support.php:17
+msgid "Theme integration guide"
+msgstr ""
+
+#: includes/admin/views/html-notice-tracking.php:11
+msgid ""
+"Want to help make WooCommerce even more awesome? Allow WooCommerce to "
+"collect non-sensitive diagnostic data and usage information, and get %1$s "
+"discount on your next WooThemes purchase. <a href=\"%2$s\" "
+"target=\"_blank\">Find out more</a>."
 msgstr ""
 
 #: includes/admin/views/html-notice-tracking.php:14
@@ -11939,9 +13053,12 @@ msgid "No, do not bother me again"
 msgstr ""
 
 #: includes/admin/views/html-notice-update.php:12
-msgid ""
-"<strong>WooCommerce Data Update Required</strong> &#8211; We just need to "
-"update your install to the latest version"
+#: includes/admin/views/html-notice-updating.php:12
+msgid "WooCommerce data update"
+msgstr ""
+
+#: includes/admin/views/html-notice-update.php:12
+msgid "We need to update your store's database to the latest version."
 msgstr ""
 
 #: includes/admin/views/html-notice-update.php:13
@@ -11954,1204 +13071,4195 @@ msgid ""
 "Are you sure you wish to run the updater now?"
 msgstr ""
 
-#: includes/admin/views/html-report-by-date.php:23
+#: includes/admin/views/html-notice-updated.php:14
+msgid ""
+"WooCommerce data update complete. Thank you for updating to the latest "
+"version!"
+msgstr ""
+
+#: includes/admin/views/html-notice-updating.php:12
+msgid "Your database is being updated in the background."
+msgstr ""
+
+#: includes/admin/views/html-notice-updating.php:12
+msgid "Taking a while? Click here to run it now."
+msgstr ""
+
+#: includes/admin/views/html-report-by-date.php:19
+#. translators: 1: start date 2: end date
+msgid "From %1$s to %2$s"
+msgstr ""
+
+#: includes/admin/views/html-report-by-date.php:37
 msgid "Custom:"
 msgstr ""
 
-#: includes/api/class-wc-api-authentication.php:83
-#: includes/api/class-wc-api-authentication.php:115
-#: includes/api/v1/class-wc-api-authentication.php:115
-#: includes/api/v2/class-wc-api-authentication.php:115
-msgid "Consumer Secret is invalid"
+#: includes/api/class-wc-rest-authentication.php:124
+#: includes/api/legacy/v1/class-wc-api-authentication.php:115
+#: includes/api/legacy/v2/class-wc-api-authentication.php:115
+#: includes/api/legacy/v3/class-wc-api-authentication.php:83
+msgid "Consumer secret is invalid."
 msgstr ""
 
-#: includes/api/class-wc-api-authentication.php:112
+#: includes/api/class-wc-rest-authentication.php:251
+msgid "Missing OAuth parameter %s"
+msgid_plural "Missing OAuth parameters %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: includes/api/class-wc-rest-authentication.php:291
+#: includes/api/legacy/v1/class-wc-api-authentication.php:184
+#: includes/api/legacy/v2/class-wc-api-authentication.php:183
+#: includes/api/legacy/v3/class-wc-api-authentication.php:179
+msgid "Consumer key is invalid."
+msgstr ""
+
+#: includes/api/class-wc-rest-authentication.php:341
+#: includes/api/legacy/v1/class-wc-api-authentication.php:252
+#: includes/api/legacy/v2/class-wc-api-authentication.php:251
+#: includes/api/legacy/v3/class-wc-api-authentication.php:241
+msgid "Invalid signature - failed to sort parameters."
+msgstr ""
+
+#: includes/api/class-wc-rest-authentication.php:360
+#: includes/api/legacy/v1/class-wc-api-authentication.php:266
+#: includes/api/legacy/v2/class-wc-api-authentication.php:265
+#: includes/api/legacy/v3/class-wc-api-authentication.php:261
+msgid "Invalid signature - signature method is invalid."
+msgstr ""
+
+#: includes/api/class-wc-rest-authentication.php:368
+#: includes/api/legacy/v1/class-wc-api-authentication.php:274
+#: includes/api/legacy/v2/class-wc-api-authentication.php:273
+#: includes/api/legacy/v3/class-wc-api-authentication.php:270
+msgid "Invalid signature - provided signature does not match."
+msgstr ""
+
+#: includes/api/class-wc-rest-authentication.php:419
+#: includes/api/legacy/v1/class-wc-api-authentication.php:332
+#: includes/api/legacy/v2/class-wc-api-authentication.php:331
+#: includes/api/legacy/v3/class-wc-api-authentication.php:335
+msgid "Invalid timestamp."
+msgstr ""
+
+#: includes/api/class-wc-rest-authentication.php:429
+#: includes/api/legacy/v1/class-wc-api-authentication.php:342
+#: includes/api/legacy/v2/class-wc-api-authentication.php:341
+#: includes/api/legacy/v3/class-wc-api-authentication.php:345
+msgid "Invalid nonce - nonce has already been used."
+msgstr ""
+
+#: includes/api/class-wc-rest-authentication.php:493
+#: includes/api/legacy/v1/class-wc-api-authentication.php:377
+#: includes/api/legacy/v2/class-wc-api-authentication.php:376
+#: includes/api/legacy/v3/class-wc-api-authentication.php:380
+msgid "The API key provided does not have read permissions."
+msgstr ""
+
+#: includes/api/class-wc-rest-authentication.php:503
+#: includes/api/legacy/v1/class-wc-api-authentication.php:386
+#: includes/api/legacy/v2/class-wc-api-authentication.php:385
+#: includes/api/legacy/v3/class-wc-api-authentication.php:389
+msgid "The API key provided does not have write permissions."
+msgstr ""
+
+#: includes/api/class-wc-rest-authentication.php:541
+#: includes/api/legacy/v3/class-wc-api-authentication.php:111
 msgid ""
 "WooCommerce API. Use a consumer key in the username field and a consumer "
-"secret in the password field"
+"secret in the password field."
 msgstr ""
 
-#: includes/api/class-wc-api-authentication.php:145
-#: includes/api/v1/class-wc-api-authentication.php:148
-#: includes/api/v2/class-wc-api-authentication.php:148
-msgid "%s parameter is missing"
+#: includes/api/class-wc-rest-coupons-controller.php:63
+#: includes/api/class-wc-rest-coupons-controller.php:337
+#: includes/api/class-wc-rest-orders-controller.php:1526
+#: includes/api/v1/class-wc-rest-coupons-controller.php:70
+#: includes/api/v1/class-wc-rest-coupons-controller.php:421
+#: includes/api/v1/class-wc-rest-orders-controller.php:1523
+msgid "Coupon code."
 msgstr ""
 
-#: includes/api/class-wc-api-authentication.php:180
-#: includes/api/v1/class-wc-api-authentication.php:183
-#: includes/api/v2/class-wc-api-authentication.php:183
-msgid "Consumer Key is invalid"
+#: includes/api/class-wc-rest-coupons-controller.php:101
+#: includes/api/class-wc-rest-orders-controller.php:108
+#: includes/api/class-wc-rest-product-variations-controller.php:112
+#: includes/api/class-wc-rest-products-controller.php:108
+#: includes/api/class-wc-rest-shipping-zone-methods-controller.php:86
+#: includes/api/class-wc-rest-shipping-zones-controller.php:76
+#: includes/api/v1/class-wc-rest-coupons-controller.php:108
+#: includes/api/v1/class-wc-rest-orders-controller.php:102
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:118
+#: includes/api/v1/class-wc-rest-products-controller.php:102
+msgid "Whether to bypass trash and force deletion."
 msgstr ""
 
-#: includes/api/class-wc-api-authentication.php:198
-#: includes/api/v1/class-wc-api-authentication.php:201
-#: includes/api/v2/class-wc-api-authentication.php:201
-msgid "API user is invalid"
+#: includes/api/class-wc-rest-coupons-controller.php:267
+#: includes/api/legacy/class-wc-rest-legacy-coupons-controller.php:113
+#: includes/api/v1/class-wc-rest-coupons-controller.php:253
+msgid "The coupon code cannot be empty."
 msgstr ""
 
-#: includes/api/class-wc-api-authentication.php:242
-#: includes/api/v1/class-wc-api-authentication.php:251
-#: includes/api/v2/class-wc-api-authentication.php:251
-msgid "Invalid Signature - failed to sort parameters"
-msgstr ""
-
-#: includes/api/class-wc-api-authentication.php:262
-#: includes/api/v1/class-wc-api-authentication.php:265
-#: includes/api/v2/class-wc-api-authentication.php:265
-msgid "Invalid Signature - signature method is invalid"
-msgstr ""
-
-#: includes/api/class-wc-api-authentication.php:271
-#: includes/api/v1/class-wc-api-authentication.php:273
-#: includes/api/v2/class-wc-api-authentication.php:273
-msgid "Invalid Signature - provided signature does not match"
-msgstr ""
-
-#: includes/api/class-wc-api-authentication.php:336
-#: includes/api/v1/class-wc-api-authentication.php:331
-#: includes/api/v2/class-wc-api-authentication.php:331
-msgid "Invalid timestamp"
-msgstr ""
-
-#: includes/api/class-wc-api-authentication.php:346
-#: includes/api/v1/class-wc-api-authentication.php:341
-#: includes/api/v2/class-wc-api-authentication.php:341
-msgid "Invalid nonce - nonce has already been used"
-msgstr ""
-
-#: includes/api/class-wc-api-authentication.php:381
-#: includes/api/v1/class-wc-api-authentication.php:376
-#: includes/api/v2/class-wc-api-authentication.php:376
-msgid "The API key provided does not have read permissions"
-msgstr ""
-
-#: includes/api/class-wc-api-authentication.php:390
-#: includes/api/v1/class-wc-api-authentication.php:385
-#: includes/api/v2/class-wc-api-authentication.php:385
-msgid "The API key provided does not have write permissions"
-msgstr ""
-
-#: includes/api/class-wc-api-coupons.php:120
-#: includes/api/v1/class-wc-api-coupons.php:109
-#: includes/api/v2/class-wc-api-coupons.php:120
-msgid "Invalid coupon ID"
-msgstr ""
-
-#: includes/api/class-wc-api-coupons.php:166
-#: includes/api/v1/class-wc-api-coupons.php:153
-#: includes/api/v2/class-wc-api-coupons.php:166
-msgid "You do not have permission to read the coupons count"
-msgstr ""
-
-#: includes/api/class-wc-api-coupons.php:192
-#: includes/api/v1/class-wc-api-coupons.php:172
-#: includes/api/v2/class-wc-api-coupons.php:192
-msgid "Invalid coupon code"
-msgstr ""
-
-#: includes/api/class-wc-api-coupons.php:213
-#: includes/api/class-wc-api-customers.php:345
-#: includes/api/class-wc-api-orders.php:415
-#: includes/api/class-wc-api-orders.php:1323
-#: includes/api/class-wc-api-orders.php:1615
-#: includes/api/class-wc-api-products.php:255
-#: includes/api/class-wc-api-products.php:653
-#: includes/api/class-wc-api-products.php:902
-#: includes/api/class-wc-api-products.php:2660
-#: includes/api/class-wc-api-products.php:2991
-#: includes/api/class-wc-api-products.php:3325
-#: includes/api/class-wc-api-taxes.php:184
-#: includes/api/class-wc-api-taxes.php:564
-#: includes/api/class-wc-api-webhooks.php:169
-#: includes/api/v2/class-wc-api-coupons.php:213
-#: includes/api/v2/class-wc-api-customers.php:345
-#: includes/api/v2/class-wc-api-orders.php:384
-#: includes/api/v2/class-wc-api-orders.php:1285
-#: includes/api/v2/class-wc-api-orders.php:1577
-#: includes/api/v2/class-wc-api-products.php:210
-#: includes/api/v2/class-wc-api-products.php:2129
-#: includes/api/v2/class-wc-api-webhooks.php:169
-msgid "No %1$s data specified to create %1$s"
-msgstr ""
-
-#: includes/api/class-wc-api-coupons.php:220
-#: includes/api/v2/class-wc-api-coupons.php:220
-msgid "You do not have permission to create coupons"
-msgstr ""
-
-#: includes/api/class-wc-api-coupons.php:227
-#: includes/api/class-wc-api-customers.php:359
-#: includes/api/class-wc-api-products.php:269
-#: includes/api/class-wc-api-products.php:2624
-#: includes/api/class-wc-api-products.php:3011
-#: includes/api/class-wc-api-server.php:427
-#: includes/api/class-wc-api-taxes.php:575
-#: includes/api/v1/class-wc-api-server.php:409
-#: includes/api/v2/class-wc-api-coupons.php:227
-#: includes/api/v2/class-wc-api-customers.php:359
-#: includes/api/v2/class-wc-api-products.php:224
-#: includes/api/v2/class-wc-api-products.php:2093
-#: includes/api/v2/class-wc-api-server.php:427 includes/class-wc-auth.php:159
-#: includes/cli/class-wc-cli-coupon.php:63
-#: includes/cli/class-wc-cli-product.php:151
-#: includes/cli/class-wc-cli-tax.php:130
-msgid "Missing parameter %s"
-msgstr ""
-
-#: includes/api/class-wc-api-coupons.php:242
-#: includes/api/class-wc-api-coupons.php:358
-#: includes/api/v2/class-wc-api-coupons.php:242
-#: includes/api/v2/class-wc-api-coupons.php:358
-#: includes/cli/class-wc-cli-coupon.php:78
-#: includes/cli/class-wc-cli-coupon.php:453
+#: includes/api/class-wc-rest-coupons-controller.php:282
+#: includes/api/legacy/class-wc-rest-legacy-coupons-controller.php:129
+#: includes/api/legacy/v2/class-wc-api-coupons.php:229
+#: includes/api/legacy/v2/class-wc-api-coupons.php:337
+#: includes/api/legacy/v3/class-wc-api-coupons.php:229
+#: includes/api/legacy/v3/class-wc-api-coupons.php:337
+#: includes/api/v1/class-wc-rest-coupons-controller.php:269
 msgid "The coupon code already exists"
 msgstr ""
 
-#: includes/api/class-wc-api-coupons.php:270
-#: includes/api/class-wc-api-coupons.php:379
-#: includes/api/v2/class-wc-api-coupons.php:270
-#: includes/api/v2/class-wc-api-coupons.php:379
-#: includes/cli/class-wc-cli-coupon.php:106
-#: includes/cli/class-wc-cli-coupon.php:465
-msgid "Invalid coupon type - the coupon type must be any of these: %s"
+#: includes/api/class-wc-rest-coupons-controller.php:331
+#: includes/api/v1/class-wc-rest-coupons-controller.php:415
+msgid "Unique identifier for the object."
 msgstr ""
 
-#: includes/api/class-wc-api-coupons.php:329
-#: includes/api/class-wc-api-customers.php:400
-#: includes/api/class-wc-api-orders.php:552
-#: includes/api/class-wc-api-orders.php:1380
-#: includes/api/class-wc-api-orders.php:1692
-#: includes/api/class-wc-api-products.php:358
-#: includes/api/class-wc-api-products.php:728
-#: includes/api/class-wc-api-products.php:946
-#: includes/api/class-wc-api-products.php:2742
-#: includes/api/class-wc-api-products.php:3054
-#: includes/api/class-wc-api-products.php:3381
-#: includes/api/class-wc-api-taxes.php:254
-#: includes/api/class-wc-api-webhooks.php:245
-#: includes/api/v2/class-wc-api-coupons.php:329
-#: includes/api/v2/class-wc-api-customers.php:400
-#: includes/api/v2/class-wc-api-orders.php:521
-#: includes/api/v2/class-wc-api-orders.php:1342
-#: includes/api/v2/class-wc-api-orders.php:1654
-#: includes/api/v2/class-wc-api-products.php:312
-#: includes/api/v2/class-wc-api-products.php:2210
-#: includes/api/v2/class-wc-api-webhooks.php:245
-msgid "No %1$s data specified to edit %1$s"
-msgstr ""
-
-#: includes/api/class-wc-api-coupons.php:364
-#: includes/api/class-wc-api-coupons.php:372
-#: includes/api/v2/class-wc-api-coupons.php:364
-#: includes/api/v2/class-wc-api-coupons.php:372
-#: includes/cli/class-wc-cli-coupon.php:459
-msgid "Failed to update coupon"
-msgstr ""
-
-#: includes/api/class-wc-api-coupons.php:526
-#: includes/api/class-wc-api-customers.php:777
-#: includes/api/class-wc-api-orders.php:1805
-#: includes/api/class-wc-api-products.php:3175
-#: includes/api/class-wc-api-taxes.php:457
-#: includes/api/v2/class-wc-api-coupons.php:526
-#: includes/api/v2/class-wc-api-customers.php:789
-#: includes/api/v2/class-wc-api-orders.php:1767
-#: includes/api/v2/class-wc-api-products.php:2397
-msgid "No %1$s data specified to create/edit %1$s"
-msgstr ""
-
-#: includes/api/class-wc-api-coupons.php:534
-#: includes/api/class-wc-api-customers.php:785
-#: includes/api/class-wc-api-orders.php:1813
-#: includes/api/class-wc-api-products.php:3183
-#: includes/api/class-wc-api-taxes.php:465
-#: includes/api/v2/class-wc-api-coupons.php:534
-#: includes/api/v2/class-wc-api-customers.php:797
-#: includes/api/v2/class-wc-api-orders.php:1775
-#: includes/api/v2/class-wc-api-products.php:2405
-msgid "Unable to accept more than %s items for this request"
-msgstr ""
-
-#: includes/api/class-wc-api-customers.php:217
-#: includes/api/class-wc-api-customers.php:220
-#: includes/api/v2/class-wc-api-customers.php:217
-#: includes/api/v2/class-wc-api-customers.php:220
-msgid "Invalid customer Email"
-msgstr ""
-
-#: includes/api/class-wc-api-customers.php:239
-#: includes/api/v1/class-wc-api-customers.php:195
-#: includes/api/v2/class-wc-api-customers.php:239
-msgid "You do not have permission to read the customers count"
-msgstr ""
-
-#: includes/api/class-wc-api-customers.php:352
-#: includes/api/v1/class-wc-api-customers.php:211
-#: includes/api/v2/class-wc-api-customers.php:352
-msgid "You do not have permission to create this customer"
-msgstr ""
-
-#: includes/api/class-wc-api-customers.php:714
-#: includes/api/v1/class-wc-api-customers.php:461
-#: includes/api/v2/class-wc-api-customers.php:726
-msgid "Invalid customer ID"
-msgstr ""
-
-#: includes/api/class-wc-api-customers.php:721
-#: includes/api/v1/class-wc-api-customers.php:467
-#: includes/api/v2/class-wc-api-customers.php:733
-msgid "Invalid customer"
-msgstr ""
-
-#: includes/api/class-wc-api-customers.php:729
-#: includes/api/v1/class-wc-api-customers.php:474
-#: includes/api/v2/class-wc-api-customers.php:741
-msgid "You do not have permission to read this customer"
-msgstr ""
-
-#: includes/api/class-wc-api-customers.php:735
-#: includes/api/v1/class-wc-api-customers.php:479
-#: includes/api/v2/class-wc-api-customers.php:747
-msgid "You do not have permission to edit this customer"
-msgstr ""
-
-#: includes/api/class-wc-api-customers.php:741
-#: includes/api/v1/class-wc-api-customers.php:484
-#: includes/api/v2/class-wc-api-customers.php:753
-msgid "You do not have permission to delete this customer"
-msgstr ""
-
-#: includes/api/class-wc-api-json-handler.php:58
-#: includes/api/v1/class-wc-api-json-handler.php:59
-#: includes/api/v2/class-wc-api-json-handler.php:58
-msgid "JSONP support is disabled on this site"
-msgstr ""
-
-#: includes/api/class-wc-api-json-handler.php:66
-#: includes/api/v1/class-wc-api-json-handler.php:67
-#: includes/api/v2/class-wc-api-json-handler.php:66
-msgid "The JSONP callback function is invalid"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:349
-#: includes/api/v1/class-wc-api-orders.php:258
-#: includes/api/v2/class-wc-api-orders.php:318
-msgid "You do not have permission to read the orders count"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:422
-#: includes/api/v2/class-wc-api-orders.php:391
-msgid "You do not have permission to create orders"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:438
-#: includes/api/class-wc-api-orders.php:583
-#: includes/api/v2/class-wc-api-orders.php:407
-#: includes/api/v2/class-wc-api-orders.php:552
-#: includes/cli/class-wc-cli-order.php:114
-#: includes/cli/class-wc-cli-order.php:450
-msgid "Customer ID is invalid"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:448
-#: includes/api/v2/class-wc-api-orders.php:417
-#: includes/cli/class-wc-cli-order.php:122
-msgid "Cannot create order: %s"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:482
-#: includes/api/v2/class-wc-api-orders.php:451
-#: includes/cli/class-wc-cli-order.php:151
-msgid "Payment method ID and title are required"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:498
-#: includes/api/class-wc-api-orders.php:648
-#: includes/api/v2/class-wc-api-orders.php:467
-#: includes/api/v2/class-wc-api-orders.php:617
-#: includes/cli/class-wc-cli-order.php:166
-#: includes/cli/class-wc-cli-order.php:521
-msgid "Provided order currency is invalid"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:569
-#: includes/api/class-wc-api-orders.php:1628
-#: includes/api/v2/class-wc-api-orders.php:538
-#: includes/api/v2/class-wc-api-orders.php:1590
-#: includes/cli/class-wc-cli-order.php:429
-msgid "Order ID is invalid"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:609
-#: includes/api/v2/class-wc-api-orders.php:578
-#: includes/cli/class-wc-cli-order.php:476
-msgid "Order item ID is required"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:879
-#: includes/api/v2/class-wc-api-orders.php:842
-#: includes/cli/class-wc-cli-order.php:891
-msgid "Order item ID provided is not associated with order"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:902
-#: includes/api/v2/class-wc-api-orders.php:865
-#: includes/cli/class-wc-cli-order.php:913
-msgid "Product ID or SKU is required"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:912
-#: includes/api/v2/class-wc-api-orders.php:875
-#: includes/cli/class-wc-cli-order.php:923
-msgid "Product ID provided does not match this line item"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:927
-#: includes/api/v2/class-wc-api-orders.php:890
-#: includes/cli/class-wc-cli-order.php:938
-msgid "The product variation is invalid"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:938
-#: includes/api/v2/class-wc-api-orders.php:901
-#: includes/cli/class-wc-cli-order.php:949
-msgid "Product is invalid"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:943
-#: includes/api/v2/class-wc-api-orders.php:906
-#: includes/cli/class-wc-cli-order.php:954
-msgid "Product quantity must be a positive float"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:948
-#: includes/api/v2/class-wc-api-orders.php:911
-#: includes/cli/class-wc-cli-order.php:959
-msgid "Product quantity is required"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:981
-#: includes/api/v2/class-wc-api-orders.php:944
-#: includes/cli/class-wc-cli-order.php:994
-msgid "Cannot create line item, try again"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:989
-#: includes/api/v2/class-wc-api-orders.php:952
-#: includes/cli/class-wc-cli-order.php:1002
-msgid "Cannot update line item, try again"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:1058
-#: includes/api/v2/class-wc-api-orders.php:1020
-#: includes/cli/class-wc-cli-order.php:1076
-msgid "Shipping total must be a positive amount"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:1065
-#: includes/api/v2/class-wc-api-orders.php:1027
-#: includes/cli/class-wc-cli-order.php:1083
-msgid "Shipping method ID is required"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:1073
-#: includes/api/v2/class-wc-api-orders.php:1035
-#: includes/cli/class-wc-cli-order.php:1091
-msgid "Cannot create shipping method, try again"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:1095
-#: includes/api/v2/class-wc-api-orders.php:1057
-#: includes/cli/class-wc-cli-order.php:1113
-msgid "Cannot update shipping method, try again"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:1115
-#: includes/api/v2/class-wc-api-orders.php:1077
-#: includes/cli/class-wc-cli-order.php:1133
-msgid "Fee title is required"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:1131
-#: includes/api/v2/class-wc-api-orders.php:1093
-#: includes/cli/class-wc-cli-order.php:1149
-msgid "Fee tax class is required when fee is taxable"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:1150
-#: includes/api/v2/class-wc-api-orders.php:1112
-#: includes/cli/class-wc-cli-order.php:1168
-msgid "Cannot create fee, try again"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:1176
-#: includes/api/v2/class-wc-api-orders.php:1138
-#: includes/cli/class-wc-cli-order.php:1194
-msgid "Cannot update fee, try again"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:1194
-#: includes/api/v2/class-wc-api-orders.php:1156
-#: includes/cli/class-wc-cli-order.php:1212
-msgid "Coupon discount total must be a positive amount"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:1201
-#: includes/api/v2/class-wc-api-orders.php:1163
-#: includes/cli/class-wc-cli-order.php:1219
-msgid "Coupon code is required"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:1207
-#: includes/api/v2/class-wc-api-orders.php:1169
-#: includes/cli/class-wc-cli-order.php:1225
-msgid "Cannot create coupon, try again"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:1225
-#: includes/api/v2/class-wc-api-orders.php:1187
-#: includes/cli/class-wc-cli-order.php:1243
-msgid "Cannot update coupon, try again"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:1290
-#: includes/api/class-wc-api-orders.php:1398
-#: includes/api/class-wc-api-orders.php:1460
-#: includes/api/v2/class-wc-api-orders.php:1252
-#: includes/api/v2/class-wc-api-orders.php:1360
-#: includes/api/v2/class-wc-api-orders.php:1422
-msgid "Invalid order note ID"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:1296
-#: includes/api/class-wc-api-orders.php:1405
-#: includes/api/class-wc-api-orders.php:1467
-#: includes/api/v2/class-wc-api-orders.php:1258
-#: includes/api/v2/class-wc-api-orders.php:1367
-#: includes/api/v2/class-wc-api-orders.php:1429
-msgid "An order note with the provided ID could not be found"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:1330
-#: includes/api/v2/class-wc-api-orders.php:1292
-msgid "You do not have permission to create order notes"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:1345
-#: includes/api/v2/class-wc-api-orders.php:1307
-msgid "Order note is required"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:1354
-#: includes/api/v2/class-wc-api-orders.php:1316
-msgid "Cannot create order note, please try again"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:1410
-#: includes/api/class-wc-api-orders.php:1472
-#: includes/api/v2/class-wc-api-orders.php:1372
-#: includes/api/v2/class-wc-api-orders.php:1434
-msgid "The order note ID provided is not associated with the order"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:1479
-#: includes/api/v2/class-wc-api-orders.php:1441
-msgid "This order note cannot be deleted"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:1484
-#: includes/api/v2/class-wc-api-orders.php:1446
-msgid "Permanently deleted order note"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:1545
-#: includes/api/class-wc-api-orders.php:1708
-#: includes/api/class-wc-api-orders.php:1767
-#: includes/api/v2/class-wc-api-orders.php:1507
-#: includes/api/v2/class-wc-api-orders.php:1670
-#: includes/api/v2/class-wc-api-orders.php:1729
-msgid "Invalid order refund ID"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:1552
-#: includes/api/class-wc-api-orders.php:1715
-#: includes/api/class-wc-api-orders.php:1774
-#: includes/api/v2/class-wc-api-orders.php:1514
-#: includes/api/v2/class-wc-api-orders.php:1677
-#: includes/api/v2/class-wc-api-orders.php:1736
-msgid "An order refund with the provided ID could not be found"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:1622
-#: includes/api/v2/class-wc-api-orders.php:1584
-msgid "You do not have permission to create order refunds"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:1635
-#: includes/api/v2/class-wc-api-orders.php:1597
-msgid "Refund amount is required"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:1637
-#: includes/api/v2/class-wc-api-orders.php:1599
-msgid "Refund amount must be positive"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:1647
-#: includes/api/v2/class-wc-api-orders.php:1609
-msgid "Cannot create order refund, please try again"
-msgstr ""
-
-#: includes/api/class-wc-api-orders.php:1664
-#: includes/api/v2/class-wc-api-orders.php:1626
+#: includes/api/class-wc-rest-coupons-controller.php:342
+#: includes/api/v1/class-wc-rest-coupons-controller.php:450
 msgid ""
-"An error occurred while attempting to create the refund using the payment "
-"gateway API"
+"The amount of discount. Should always be numeric, even if setting a "
+"percentage."
 msgstr ""
 
-#: includes/api/class-wc-api-orders.php:1720
-#: includes/api/class-wc-api-orders.php:1779
-#: includes/api/v2/class-wc-api-orders.php:1682
-#: includes/api/v2/class-wc-api-orders.php:1741
-msgid "The order refund ID provided is not associated with the order"
+#: includes/api/class-wc-rest-coupons-controller.php:347
+#: includes/api/v1/class-wc-rest-coupons-controller.php:426
+msgid "The date the coupon was created, in the site's timezone."
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:228
-#: includes/api/v1/class-wc-api-products.php:143
-#: includes/api/v2/class-wc-api-products.php:183
-msgid "You do not have permission to read the products count"
+#: includes/api/class-wc-rest-coupons-controller.php:353
+msgid "The date the coupon was created, as GMT."
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:262
-#: includes/api/v2/class-wc-api-products.php:217
-msgid "You do not have permission to create products"
+#: includes/api/class-wc-rest-coupons-controller.php:359
+#: includes/api/v1/class-wc-rest-coupons-controller.php:432
+msgid "The date the coupon was last modified, in the site's timezone."
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:284
-#: includes/api/class-wc-api-products.php:409
-#: includes/api/v2/class-wc-api-products.php:239
-#: includes/api/v2/class-wc-api-products.php:358
-#: includes/cli/class-wc-cli-product.php:166
-#: includes/cli/class-wc-cli-product.php:641
-msgid "Invalid product type - the product type must be any of these: %s"
+#: includes/api/class-wc-rest-coupons-controller.php:365
+msgid "The date the coupon was last modified, as GMT."
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:464
-#: includes/api/class-wc-api-products.php:3126
-#: includes/api/class-wc-api-resource.php:377
-#: includes/api/v1/class-wc-api-resource.php:316
-#: includes/api/v2/class-wc-api-products.php:413
-#: includes/api/v2/class-wc-api-resource.php:378
-msgid "This %s cannot be deleted"
+#: includes/api/class-wc-rest-coupons-controller.php:371
+#: includes/api/v1/class-wc-rest-coupons-controller.php:443
+msgid "Determines the type of discount that will be applied."
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:473
-#: includes/api/class-wc-api-resource.php:380
-#: includes/api/v1/class-wc-api-resource.php:319
-#: includes/api/v2/class-wc-api-products.php:422
-#: includes/api/v2/class-wc-api-resource.php:382
-msgid "Permanently deleted %s"
+#: includes/api/class-wc-rest-coupons-controller.php:378
+#: includes/api/v1/class-wc-rest-coupons-controller.php:438
+msgid "Coupon description."
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:477
-#: includes/api/class-wc-api-products.php:813
-#: includes/api/class-wc-api-products.php:1000
-#: includes/api/class-wc-api-products.php:2865
-#: includes/api/class-wc-api-products.php:3133
-#: includes/api/class-wc-api-products.php:3437
-#: includes/api/class-wc-api-resource.php:386
-#: includes/api/class-wc-api-taxes.php:354
-#: includes/api/class-wc-api-taxes.php:650
-#: includes/api/v1/class-wc-api-resource.php:325
-#: includes/api/v2/class-wc-api-products.php:426
-#: includes/api/v2/class-wc-api-products.php:2331
-#: includes/api/v2/class-wc-api-resource.php:386
-msgid "Deleted %s"
+#: includes/api/class-wc-rest-coupons-controller.php:383
+msgid "The date the coupon expires, in the site's timezone."
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:567
-#: includes/api/class-wc-api-products.php:603
-#: includes/api/v2/class-wc-api-products.php:516
-#: includes/api/v2/class-wc-api-products.php:552
-msgid "You do not have permission to read product categories"
+#: includes/api/class-wc-rest-coupons-controller.php:388
+msgid "The date the coupon expires, as GMT."
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:598
-#: includes/api/v2/class-wc-api-products.php:547
-msgid "Invalid product category ID"
+#: includes/api/class-wc-rest-coupons-controller.php:393
+#: includes/api/v1/class-wc-rest-coupons-controller.php:460
+msgid "Number of times the coupon has been used already."
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:609
-#: includes/api/v2/class-wc-api-products.php:558
-msgid "A product category with the provided ID could not be found"
+#: includes/api/class-wc-rest-coupons-controller.php:399
+#: includes/api/v1/class-wc-rest-coupons-controller.php:466
+msgid ""
+"If true, the coupon can only be used individually. Other applied coupons "
+"will be removed from the cart."
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:658
-msgid "You do not have permission to create product categories"
+#: includes/api/class-wc-rest-coupons-controller.php:405
+#: includes/api/v1/class-wc-rest-coupons-controller.php:472
+msgid "List of product IDs the coupon can be used on."
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:678
-msgid "Product category parent is invalid"
+#: includes/api/class-wc-rest-coupons-controller.php:413
+#: includes/api/v1/class-wc-rest-coupons-controller.php:480
+msgid "List of product IDs the coupon cannot be used on."
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:736
-msgid "You do not have permission to edit product categories"
+#: includes/api/class-wc-rest-coupons-controller.php:421
+#: includes/api/v1/class-wc-rest-coupons-controller.php:488
+msgid "How many times the coupon can be used in total."
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:766
-msgid "Could not edit the category"
+#: includes/api/class-wc-rest-coupons-controller.php:426
+#: includes/api/v1/class-wc-rest-coupons-controller.php:493
+msgid "How many times the coupon can be used per customer."
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:799
-msgid "You do not have permission to delete product category"
+#: includes/api/class-wc-rest-coupons-controller.php:431
+#: includes/api/v1/class-wc-rest-coupons-controller.php:498
+msgid "Max number of items in the cart the coupon can be applied to."
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:805
-msgid "Could not delete the category"
+#: includes/api/class-wc-rest-coupons-controller.php:436
+#: includes/api/v1/class-wc-rest-coupons-controller.php:503
+msgid ""
+"If true and if the free shipping method requires a coupon, this coupon will "
+"enable free shipping."
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:830
-#: includes/api/class-wc-api-products.php:866
-msgid "You do not have permission to read product tags"
+#: includes/api/class-wc-rest-coupons-controller.php:442
+#: includes/api/v1/class-wc-rest-coupons-controller.php:509
+msgid "List of category IDs the coupon applies to."
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:861
-msgid "Invalid product tag ID"
+#: includes/api/class-wc-rest-coupons-controller.php:450
+#: includes/api/v1/class-wc-rest-coupons-controller.php:517
+msgid "List of category IDs the coupon does not apply to."
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:872
-msgid "A product tag with the provided ID could not be found"
+#: includes/api/class-wc-rest-coupons-controller.php:458
+#: includes/api/v1/class-wc-rest-coupons-controller.php:525
+msgid "If true, this coupon will not be applied to items that have sale prices."
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:907
-msgid "You do not have permission to create product tags"
+#: includes/api/class-wc-rest-coupons-controller.php:464
+#: includes/api/v1/class-wc-rest-coupons-controller.php:531
+msgid "Minimum order amount that needs to be in the cart before coupon applies."
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:954
-msgid "You do not have permission to edit product tags"
+#: includes/api/class-wc-rest-coupons-controller.php:469
+#: includes/api/v1/class-wc-rest-coupons-controller.php:536
+msgid "Maximum order amount allowed when using the coupon."
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:966
-msgid "Could not edit the tag"
+#: includes/api/class-wc-rest-coupons-controller.php:474
+#: includes/api/v1/class-wc-rest-coupons-controller.php:541
+msgid "List of email addresses that can use this coupon."
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:989
-msgid "You do not have permission to delete product tag"
+#: includes/api/class-wc-rest-coupons-controller.php:482
+#: includes/api/v1/class-wc-rest-coupons-controller.php:549
+msgid "List of user IDs (or guest email addresses) that have used the coupon."
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:995
-msgid "Could not delete the tag"
+#: includes/api/class-wc-rest-coupons-controller.php:491
+#: includes/api/class-wc-rest-customers-controller.php:338
+#: includes/api/class-wc-rest-order-refunds-controller.php:375
+#: includes/api/class-wc-rest-order-refunds-controller.php:487
+#: includes/api/class-wc-rest-orders-controller.php:1097
+#: includes/api/class-wc-rest-orders-controller.php:1209
+#: includes/api/class-wc-rest-orders-controller.php:1300
+#: includes/api/class-wc-rest-orders-controller.php:1386
+#: includes/api/class-wc-rest-orders-controller.php:1484
+#: includes/api/class-wc-rest-orders-controller.php:1542
+#: includes/api/class-wc-rest-product-variations-controller.php:909
+#: includes/api/class-wc-rest-products-controller.php:1938
+msgid "Meta data."
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:1309
-#: includes/api/class-wc-api-products.php:1773
-#: includes/api/v2/class-wc-api-products.php:852
-#: includes/api/v2/class-wc-api-products.php:1311
-#: includes/cli/class-wc-cli-product.php:1126
-#: includes/cli/class-wc-cli-product.php:1585
-msgid "The SKU already exists on another product"
+#: includes/api/class-wc-rest-coupons-controller.php:498
+#: includes/api/class-wc-rest-customers-controller.php:345
+#: includes/api/class-wc-rest-order-refunds-controller.php:382
+#: includes/api/class-wc-rest-order-refunds-controller.php:494
+#: includes/api/class-wc-rest-orders-controller.php:1104
+#: includes/api/class-wc-rest-orders-controller.php:1216
+#: includes/api/class-wc-rest-orders-controller.php:1307
+#: includes/api/class-wc-rest-orders-controller.php:1393
+#: includes/api/class-wc-rest-orders-controller.php:1491
+#: includes/api/class-wc-rest-orders-controller.php:1549
+#: includes/api/class-wc-rest-product-variations-controller.php:916
+#: includes/api/class-wc-rest-products-controller.php:1945
+msgid "Meta ID."
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:2229
-#: includes/api/class-wc-api-products.php:2230
-#: includes/api/v1/class-wc-api-products.php:461
-#: includes/api/v1/class-wc-api-products.php:462
-#: includes/api/v2/class-wc-api-products.php:1757
-#: includes/api/v2/class-wc-api-products.php:1758
-#: includes/cli/class-wc-cli-product.php:914
-#: includes/cli/class-wc-cli-product.php:915
-#: includes/wc-product-functions.php:289
-#: templates/single-product/product-image.php:50
+#: includes/api/class-wc-rest-coupons-controller.php:504
+#: includes/api/class-wc-rest-customers-controller.php:351
+#: includes/api/class-wc-rest-order-refunds-controller.php:388
+#: includes/api/class-wc-rest-order-refunds-controller.php:500
+#: includes/api/class-wc-rest-orders-controller.php:1110
+#: includes/api/class-wc-rest-orders-controller.php:1222
+#: includes/api/class-wc-rest-orders-controller.php:1313
+#: includes/api/class-wc-rest-orders-controller.php:1399
+#: includes/api/class-wc-rest-orders-controller.php:1497
+#: includes/api/class-wc-rest-orders-controller.php:1555
+#: includes/api/class-wc-rest-product-variations-controller.php:922
+#: includes/api/class-wc-rest-products-controller.php:1951
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:477
+#: includes/api/v1/class-wc-rest-orders-controller.php:1302
+msgid "Meta key."
+msgstr ""
+
+#: includes/api/class-wc-rest-coupons-controller.php:509
+#: includes/api/class-wc-rest-customers-controller.php:356
+#: includes/api/class-wc-rest-order-refunds-controller.php:393
+#: includes/api/class-wc-rest-order-refunds-controller.php:505
+#: includes/api/class-wc-rest-orders-controller.php:1115
+#: includes/api/class-wc-rest-orders-controller.php:1227
+#: includes/api/class-wc-rest-orders-controller.php:1318
+#: includes/api/class-wc-rest-orders-controller.php:1404
+#: includes/api/class-wc-rest-orders-controller.php:1502
+#: includes/api/class-wc-rest-orders-controller.php:1560
+#: includes/api/class-wc-rest-product-variations-controller.php:927
+#: includes/api/class-wc-rest-products-controller.php:1956
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:489
+#: includes/api/v1/class-wc-rest-orders-controller.php:1314
+msgid "Meta value."
+msgstr ""
+
+#: includes/api/class-wc-rest-coupons-controller.php:530
+#: includes/api/v1/class-wc-rest-coupons-controller.php:572
+msgid "Limit result set to resources with a specific code."
+msgstr ""
+
+#: includes/api/class-wc-rest-customer-downloads-controller.php:85
+#: includes/api/v1/class-wc-rest-customer-downloads-controller.php:175
+msgid "Download ID (MD5)."
+msgstr ""
+
+#: includes/api/class-wc-rest-customer-downloads-controller.php:91
+#: includes/api/v1/class-wc-rest-customer-downloads-controller.php:169
+msgid "Download file URL."
+msgstr ""
+
+#: includes/api/class-wc-rest-customer-downloads-controller.php:97
+#: includes/api/v1/class-wc-rest-customer-downloads-controller.php:181
+msgid "Downloadable product ID."
+msgstr ""
+
+#: includes/api/class-wc-rest-customer-downloads-controller.php:103
+#: includes/api/class-wc-rest-order-refunds-controller.php:414
+#: includes/api/class-wc-rest-orders-controller.php:1136
+#: includes/api/class-wc-rest-products-controller.php:1369
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:381
+#: includes/api/v1/class-wc-rest-orders-controller.php:1206
+#: includes/api/v1/class-wc-rest-products-controller.php:1742
+#: includes/api/v1/class-wc-rest-report-top-sellers-controller.php:152
+msgid "Product name."
+msgstr ""
+
+#: includes/api/class-wc-rest-customer-downloads-controller.php:109
+#: includes/api/v1/class-wc-rest-customer-downloads-controller.php:187
+msgid "Downloadable file name."
+msgstr ""
+
+#: includes/api/class-wc-rest-customer-downloads-controller.php:115
+#: includes/api/v1/class-wc-rest-customer-downloads-controller.php:193
+#: includes/cli/class-wc-cli-runner.php:97
+msgid "Order ID."
+msgstr ""
+
+#: includes/api/class-wc-rest-customer-downloads-controller.php:121
+#: includes/api/class-wc-rest-orders-controller.php:810
+#: includes/api/v1/class-wc-rest-customer-downloads-controller.php:199
+#: includes/api/v1/class-wc-rest-orders-controller.php:925
+msgid "Order key."
+msgstr ""
+
+#: includes/api/class-wc-rest-customer-downloads-controller.php:127
+#: includes/api/v1/class-wc-rest-customer-downloads-controller.php:205
+msgid "Number of downloads remaining."
+msgstr ""
+
+#: includes/api/class-wc-rest-customer-downloads-controller.php:133
+#: includes/api/v1/class-wc-rest-customer-downloads-controller.php:211
+msgid "The date when download access expires, in the site's timezone."
+msgstr ""
+
+#: includes/api/class-wc-rest-customer-downloads-controller.php:139
+msgid "The date when download access expires, as GMT."
+msgstr ""
+
+#: includes/api/class-wc-rest-customer-downloads-controller.php:145
+#: includes/api/v1/class-wc-rest-customer-downloads-controller.php:217
+msgid "File details."
+msgstr ""
+
+#: includes/api/class-wc-rest-customer-downloads-controller.php:151
+#: includes/api/class-wc-rest-product-variations-controller.php:707
+#: includes/api/class-wc-rest-products-controller.php:1537
+#: includes/api/v1/class-wc-rest-customer-downloads-controller.php:223
+#: includes/api/v1/class-wc-rest-products-controller.php:1888
+#: includes/api/v1/class-wc-rest-products-controller.php:2366
+msgid "File name."
+msgstr ""
+
+#: includes/api/class-wc-rest-customer-downloads-controller.php:157
+#: includes/api/class-wc-rest-product-variations-controller.php:712
+#: includes/api/class-wc-rest-products-controller.php:1542
+#: includes/api/v1/class-wc-rest-customer-downloads-controller.php:229
+#: includes/api/v1/class-wc-rest-products-controller.php:1893
+#: includes/api/v1/class-wc-rest-products-controller.php:2371
+msgid "File URL."
+msgstr ""
+
+#: includes/api/class-wc-rest-customers-controller.php:134
+msgid "The date the customer was created, in the site's timezone."
+msgstr ""
+
+#: includes/api/class-wc-rest-customers-controller.php:140
+#: includes/api/class-wc-rest-orders-controller.php:848
+#: includes/api/v1/class-wc-rest-orders-controller.php:956
+msgid "The date the order was created, as GMT."
+msgstr ""
+
+#: includes/api/class-wc-rest-customers-controller.php:146
+msgid "The date the customer was last modified, in the site's timezone."
+msgstr ""
+
+#: includes/api/class-wc-rest-customers-controller.php:152
+#: includes/api/v1/class-wc-rest-customers-controller.php:642
+msgid "The date the customer was last modified, as GMT."
+msgstr ""
+
+#: includes/api/class-wc-rest-customers-controller.php:158
+#: includes/api/v1/class-wc-rest-customers-controller.php:648
+msgid "The email address for the customer."
+msgstr ""
+
+#: includes/api/class-wc-rest-customers-controller.php:164
+#: includes/api/v1/class-wc-rest-customers-controller.php:654
+msgid "Customer first name."
+msgstr ""
+
+#: includes/api/class-wc-rest-customers-controller.php:172
+#: includes/api/v1/class-wc-rest-customers-controller.php:662
+msgid "Customer last name."
+msgstr ""
+
+#: includes/api/class-wc-rest-customers-controller.php:180
+msgid "Customer role."
+msgstr ""
+
+#: includes/api/class-wc-rest-customers-controller.php:186
+#: includes/api/v1/class-wc-rest-customers-controller.php:670
+msgid "Customer login name."
+msgstr ""
+
+#: includes/api/class-wc-rest-customers-controller.php:194
+#: includes/api/v1/class-wc-rest-customers-controller.php:678
+msgid "Customer password."
+msgstr ""
+
+#: includes/api/class-wc-rest-customers-controller.php:199
+#: includes/api/v1/class-wc-rest-customers-controller.php:721
+msgid "List of billing address data."
+msgstr ""
+
+#: includes/api/class-wc-rest-customers-controller.php:204
+#: includes/api/class-wc-rest-customers-controller.php:267
+#: includes/api/class-wc-rest-orders-controller.php:942
+#: includes/api/class-wc-rest-orders-controller.php:1005
+#: includes/api/v1/class-wc-rest-customers-controller.php:726
+#: includes/api/v1/class-wc-rest-customers-controller.php:789
+#: includes/api/v1/class-wc-rest-orders-controller.php:1021
+#: includes/api/v1/class-wc-rest-orders-controller.php:1084
+msgid "First name."
+msgstr ""
+
+#: includes/api/class-wc-rest-customers-controller.php:209
+#: includes/api/class-wc-rest-customers-controller.php:272
+#: includes/api/class-wc-rest-orders-controller.php:947
+#: includes/api/class-wc-rest-orders-controller.php:1010
+#: includes/api/v1/class-wc-rest-customers-controller.php:731
+#: includes/api/v1/class-wc-rest-customers-controller.php:794
+#: includes/api/v1/class-wc-rest-orders-controller.php:1026
+#: includes/api/v1/class-wc-rest-orders-controller.php:1089
+msgid "Last name."
+msgstr ""
+
+#: includes/api/class-wc-rest-customers-controller.php:214
+#: includes/api/class-wc-rest-customers-controller.php:277
+#: includes/api/class-wc-rest-orders-controller.php:952
+#: includes/api/class-wc-rest-orders-controller.php:1015
+#: includes/api/v1/class-wc-rest-customers-controller.php:736
+#: includes/api/v1/class-wc-rest-customers-controller.php:799
+#: includes/api/v1/class-wc-rest-orders-controller.php:1031
+#: includes/api/v1/class-wc-rest-orders-controller.php:1094
+msgid "Company name."
+msgstr ""
+
+#: includes/api/class-wc-rest-customers-controller.php:229
+#: includes/api/class-wc-rest-customers-controller.php:292
+#: includes/api/class-wc-rest-orders-controller.php:967
+#: includes/api/class-wc-rest-orders-controller.php:1030
+#: includes/api/v1/class-wc-rest-customers-controller.php:751
+#: includes/api/v1/class-wc-rest-customers-controller.php:814
+#: includes/api/v1/class-wc-rest-orders-controller.php:1046
+#: includes/api/v1/class-wc-rest-orders-controller.php:1109
+#: includes/api/v1/class-wc-rest-taxes-controller.php:595
+msgid "City name."
+msgstr ""
+
+#: includes/api/class-wc-rest-customers-controller.php:234
+#: includes/api/class-wc-rest-customers-controller.php:297
+#: includes/api/class-wc-rest-orders-controller.php:972
+#: includes/api/class-wc-rest-orders-controller.php:1035
+#: includes/api/v1/class-wc-rest-customers-controller.php:756
+#: includes/api/v1/class-wc-rest-customers-controller.php:819
+#: includes/api/v1/class-wc-rest-orders-controller.php:1051
+#: includes/api/v1/class-wc-rest-orders-controller.php:1114
+msgid "ISO code or name of the state, province or district."
+msgstr ""
+
+#: includes/api/class-wc-rest-customers-controller.php:239
+#: includes/api/class-wc-rest-customers-controller.php:302
+#: includes/api/class-wc-rest-orders-controller.php:977
+#: includes/api/class-wc-rest-orders-controller.php:1040
+#: includes/api/v1/class-wc-rest-customers-controller.php:761
+#: includes/api/v1/class-wc-rest-customers-controller.php:824
+#: includes/api/v1/class-wc-rest-orders-controller.php:1056
+#: includes/api/v1/class-wc-rest-orders-controller.php:1119
+msgid "Postal code."
+msgstr ""
+
+#: includes/api/class-wc-rest-customers-controller.php:244
+#: includes/api/class-wc-rest-customers-controller.php:307
+#: includes/api/v1/class-wc-rest-customers-controller.php:766
+#: includes/api/v1/class-wc-rest-customers-controller.php:829
+msgid "ISO code of the country."
+msgstr ""
+
+#: includes/api/class-wc-rest-customers-controller.php:249
+#: includes/api/class-wc-rest-orders-controller.php:987
+#: includes/api/v1/class-wc-rest-customers-controller.php:771
+#: includes/api/v1/class-wc-rest-orders-controller.php:1066
+msgid "Email address."
+msgstr ""
+
+#: includes/api/class-wc-rest-customers-controller.php:255
+#: includes/api/class-wc-rest-orders-controller.php:993
+#: includes/api/v1/class-wc-rest-customers-controller.php:777
+#: includes/api/v1/class-wc-rest-orders-controller.php:1072
+msgid "Phone number."
+msgstr ""
+
+#: includes/api/class-wc-rest-customers-controller.php:262
+#: includes/api/v1/class-wc-rest-customers-controller.php:784
+msgid "List of shipping address data."
+msgstr ""
+
+#: includes/api/class-wc-rest-customers-controller.php:314
+msgid "Is the customer a paying customer?"
+msgstr ""
+
+#: includes/api/class-wc-rest-customers-controller.php:320
+#: includes/api/v1/class-wc-rest-customers-controller.php:703
+msgid "Quantity of orders made by the customer."
+msgstr ""
+
+#: includes/api/class-wc-rest-customers-controller.php:326
+#: includes/api/v1/class-wc-rest-customers-controller.php:709
+msgid "Total amount spent."
+msgstr ""
+
+#: includes/api/class-wc-rest-customers-controller.php:332
+#: includes/api/v1/class-wc-rest-customers-controller.php:715
+msgid "Avatar URL."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-notes-controller.php:42
+#: includes/api/class-wc-rest-order-refunds-controller.php:186
+#: includes/api/class-wc-rest-order-refunds-controller.php:268
+#: includes/api/v1/class-wc-rest-order-notes-controller.php:183
+#: includes/api/v1/class-wc-rest-order-notes-controller.php:223
+#: includes/api/v1/class-wc-rest-order-notes-controller.php:265
+#: includes/api/v1/class-wc-rest-order-notes-controller.php:298
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:126
+#: includes/wc-core-functions.php:137 includes/wc-order-functions.php:498
+msgid "Invalid order ID."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-notes-controller.php:138
+#: includes/api/v1/class-wc-rest-order-notes-controller.php:404
+msgid "The date the order note was created, in the site's timezone."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-notes-controller.php:144
+msgid "The date the order note was created, as GMT."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-notes-controller.php:150
+#: includes/api/v1/class-wc-rest-order-notes-controller.php:70
+msgid "Order note content."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-notes-controller.php:155
+msgid ""
+"If true, the note will be shown to customers and they will be notified. If "
+"false, the note will be for admin reference only."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-notes-controller.php:176
+msgid "Limit result to customers or internal notes."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-refunds-controller.php:66
+#: includes/api/class-wc-rest-order-refunds-controller.php:88
+#: includes/api/v1/class-wc-rest-order-notes-controller.php:53
+#: includes/api/v1/class-wc-rest-order-notes-controller.php:85
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:61
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:83
+msgid "The order ID."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-refunds-controller.php:190
+#: includes/api/legacy/v2/class-wc-api-orders.php:1499
+#: includes/api/legacy/v2/class-wc-api-orders.php:1661
+#: includes/api/legacy/v2/class-wc-api-orders.php:1722
+#: includes/api/legacy/v3/class-wc-api-orders.php:1549
+#: includes/api/legacy/v3/class-wc-api-orders.php:1711
+#: includes/api/legacy/v3/class-wc-api-orders.php:1772
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:132
+msgid "Invalid order refund ID."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-refunds-controller.php:272
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:292
+msgid "Refund amount must be greater than zero."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-refunds-controller.php:290
+#: includes/api/legacy/v2/class-wc-api-orders.php:1598
+#: includes/api/legacy/v3/class-wc-api-orders.php:1648
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:310
+msgid "Cannot create order refund, please try again."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-refunds-controller.php:348
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:352
+msgid "The date the order refund was created, in the site's timezone."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-refunds-controller.php:354
+msgid "The date the order refund was created, as GMT."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-refunds-controller.php:360
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:358
+msgid "Refund amount."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-refunds-controller.php:365
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:363
+msgid "Reason for refund."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-refunds-controller.php:370
+msgid "User ID of user who created the refund."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-refunds-controller.php:401
+#: includes/api/class-wc-rest-orders-controller.php:1123
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:368
+#: includes/api/v1/class-wc-rest-orders-controller.php:1193
+msgid "Line items data."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-refunds-controller.php:408
+#: includes/api/class-wc-rest-orders-controller.php:1130
+#: includes/api/class-wc-rest-orders-controller.php:1258
+#: includes/api/class-wc-rest-orders-controller.php:1336
+#: includes/api/class-wc-rest-orders-controller.php:1422
+#: includes/api/class-wc-rest-orders-controller.php:1520
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:375
+#: includes/api/v1/class-wc-rest-orders-controller.php:1200
+#: includes/api/v1/class-wc-rest-orders-controller.php:1334
+#: includes/api/v1/class-wc-rest-orders-controller.php:1386
+#: includes/api/v1/class-wc-rest-orders-controller.php:1446
+#: includes/api/v1/class-wc-rest-orders-controller.php:1517
+msgid "Item ID."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-refunds-controller.php:419
+#: includes/api/class-wc-rest-orders-controller.php:1141
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:393
+#: includes/api/v1/class-wc-rest-orders-controller.php:1218
+#: includes/api/v1/class-wc-rest-report-top-sellers-controller.php:158
+#: includes/cli/class-wc-cli-runner.php:95
+msgid "Product ID."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-refunds-controller.php:424
+#: includes/api/class-wc-rest-orders-controller.php:1146
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:398
+#: includes/api/v1/class-wc-rest-orders-controller.php:1223
+msgid "Variation ID, if applicable."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-refunds-controller.php:429
+#: includes/api/class-wc-rest-orders-controller.php:1151
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:403
+#: includes/api/v1/class-wc-rest-orders-controller.php:1228
+msgid "Quantity ordered."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-refunds-controller.php:434
+#: includes/api/class-wc-rest-orders-controller.php:1156
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:408
+#: includes/api/v1/class-wc-rest-orders-controller.php:1233
+msgid "Tax class of product."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-refunds-controller.php:439
+#: includes/api/class-wc-rest-orders-controller.php:1161
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:420
+#: includes/api/v1/class-wc-rest-orders-controller.php:1245
+msgid "Line subtotal (before discounts)."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-refunds-controller.php:444
+#: includes/api/class-wc-rest-orders-controller.php:1166
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:425
+#: includes/api/v1/class-wc-rest-orders-controller.php:1250
+msgid "Line subtotal tax (before discounts)."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-refunds-controller.php:450
+#: includes/api/class-wc-rest-orders-controller.php:1172
+#: includes/api/class-wc-rest-orders-controller.php:1352
+#: includes/api/class-wc-rest-orders-controller.php:1444
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:430
+#: includes/api/v1/class-wc-rest-orders-controller.php:1255
+#: includes/api/v1/class-wc-rest-orders-controller.php:1402
+#: includes/api/v1/class-wc-rest-orders-controller.php:1468
+msgid "Line total (after discounts)."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-refunds-controller.php:455
+#: includes/api/class-wc-rest-orders-controller.php:1177
+#: includes/api/class-wc-rest-orders-controller.php:1357
+#: includes/api/class-wc-rest-orders-controller.php:1449
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:435
+#: includes/api/v1/class-wc-rest-orders-controller.php:1260
+#: includes/api/v1/class-wc-rest-orders-controller.php:1407
+#: includes/api/v1/class-wc-rest-orders-controller.php:1473
+msgid "Line total tax (after discounts)."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-refunds-controller.php:461
+#: includes/api/class-wc-rest-orders-controller.php:1183
+#: includes/api/class-wc-rest-orders-controller.php:1363
+#: includes/api/class-wc-rest-orders-controller.php:1455
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:440
+#: includes/api/v1/class-wc-rest-orders-controller.php:1265
+#: includes/api/v1/class-wc-rest-orders-controller.php:1413
+#: includes/api/v1/class-wc-rest-orders-controller.php:1478
+msgid "Line taxes."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-refunds-controller.php:469
+#: includes/api/class-wc-rest-orders-controller.php:1191
+#: includes/api/class-wc-rest-orders-controller.php:1270
+#: includes/api/class-wc-rest-orders-controller.php:1371
+#: includes/api/class-wc-rest-orders-controller.php:1463
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:448
+#: includes/api/v1/class-wc-rest-orders-controller.php:1273
+#: includes/api/v1/class-wc-rest-orders-controller.php:1346
+#: includes/api/v1/class-wc-rest-orders-controller.php:1421
+#: includes/api/v1/class-wc-rest-orders-controller.php:1486
+msgid "Tax rate ID."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-refunds-controller.php:474
+#: includes/api/class-wc-rest-orders-controller.php:1196
+#: includes/api/class-wc-rest-orders-controller.php:1377
+#: includes/api/class-wc-rest-orders-controller.php:1469
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:454
+#: includes/api/v1/class-wc-rest-orders-controller.php:1279
+#: includes/api/v1/class-wc-rest-orders-controller.php:1427
+#: includes/api/v1/class-wc-rest-orders-controller.php:1492
+msgid "Tax total."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-refunds-controller.php:479
+#: includes/api/class-wc-rest-orders-controller.php:1201
+#: includes/api/class-wc-rest-orders-controller.php:1475
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:460
+#: includes/api/v1/class-wc-rest-orders-controller.php:1285
+#: includes/api/v1/class-wc-rest-orders-controller.php:1498
+msgid "Tax subtotal."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-refunds-controller.php:513
+#: includes/api/class-wc-rest-orders-controller.php:1235
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:387
+#: includes/api/v1/class-wc-rest-orders-controller.php:1212
+msgid "Product SKU."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-refunds-controller.php:519
+#: includes/api/class-wc-rest-orders-controller.php:1241
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:414
+#: includes/api/v1/class-wc-rest-orders-controller.php:1239
+msgid "Product price."
+msgstr ""
+
+#: includes/api/class-wc-rest-order-refunds-controller.php:528
+msgid "When true, the payment gateway API is used to generate the refund."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:493
+#: includes/api/legacy/class-wc-rest-legacy-orders-controller.php:248
+#: includes/api/legacy/v2/class-wc-api-orders.php:386
+#: includes/api/legacy/v2/class-wc-api-orders.php:532
+#: includes/api/legacy/v3/class-wc-api-orders.php:423
+#: includes/api/legacy/v3/class-wc-api-orders.php:574
+#: includes/api/v1/class-wc-rest-orders-controller.php:538
+msgid "Customer ID is invalid."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:557
+#: includes/api/v1/class-wc-rest-orders-controller.php:617
+msgid "Product ID or SKU is required."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:644
+#: includes/api/legacy/v2/class-wc-api-orders.php:1017
+#: includes/api/legacy/v3/class-wc-api-orders.php:1067
+#: includes/api/v1/class-wc-rest-orders-controller.php:685
+msgid "Shipping method ID is required."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:666
+#: includes/api/v1/class-wc-rest-orders-controller.php:706
+msgid "Fee name is required."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:688
+#: includes/api/legacy/v2/class-wc-api-orders.php:1148
+#: includes/api/legacy/v3/class-wc-api-orders.php:1198
+#: includes/api/v1/class-wc-rest-orders-controller.php:727
+msgid "Coupon code is required."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:727
+#: includes/api/legacy/v2/class-wc-api-orders.php:838
+#: includes/api/legacy/v3/class-wc-api-orders.php:886
+#: includes/api/v1/class-wc-rest-orders-controller.php:765
+msgid "Order item ID provided is not associated with order."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:799
+#: includes/api/v1/class-wc-rest-orders-controller.php:913
+msgid "Parent order ID."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:804
+#: includes/api/v1/class-wc-rest-orders-controller.php:931
+msgid "Order number."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:816
+#: includes/api/v1/class-wc-rest-orders-controller.php:1164
+msgid "Shows where the order was created."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:822
+#: includes/api/v1/class-wc-rest-orders-controller.php:944
+msgid "Version of WooCommerce which last updated the order."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:828
+#: includes/api/v1/class-wc-rest-orders-controller.php:918
+msgid "Order status."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:835
+#: includes/api/v1/class-wc-rest-orders-controller.php:937
+msgid "Currency the order was created with, in ISO format."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:842
+msgid "The date the order was created, in the site's timezone."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:854
+msgid "The date the order was last modified, in the site's timezone."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:860
+#: includes/api/v1/class-wc-rest-orders-controller.php:962
+msgid "The date the order was last modified, as GMT."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:866
+#: includes/api/v1/class-wc-rest-orders-controller.php:974
+msgid "Total discount amount for the order."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:872
+#: includes/api/v1/class-wc-rest-orders-controller.php:980
+msgid "Total discount tax amount for the order."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:878
+#: includes/api/v1/class-wc-rest-orders-controller.php:986
+msgid "Total shipping amount for the order."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:884
+#: includes/api/v1/class-wc-rest-orders-controller.php:992
+msgid "Total shipping tax amount for the order."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:890
+#: includes/api/v1/class-wc-rest-orders-controller.php:998
+msgid "Sum of line item taxes only."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:896
+#: includes/api/v1/class-wc-rest-orders-controller.php:1004
+msgid "Grand total."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:902
+#: includes/api/v1/class-wc-rest-orders-controller.php:1010
+msgid "Sum of all taxes."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:908
+#: includes/api/v1/class-wc-rest-orders-controller.php:950
+msgid "True the prices included tax during checkout."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:914
+#: includes/api/v1/class-wc-rest-orders-controller.php:968
+msgid "User ID who owns the order. 0 for guests."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:920
+#: includes/api/v1/class-wc-rest-orders-controller.php:1152
+msgid "Customer's IP address."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:926
+#: includes/api/v1/class-wc-rest-orders-controller.php:1158
+msgid "User agent of the customer."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:932
+#: includes/api/v1/class-wc-rest-orders-controller.php:1170
+msgid "Note left by customer during checkout."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:937
+#: includes/api/v1/class-wc-rest-orders-controller.php:1016
+msgid "Billing address."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:982
+#: includes/api/class-wc-rest-orders-controller.php:1045
+#: includes/api/v1/class-wc-rest-orders-controller.php:1061
+#: includes/api/v1/class-wc-rest-orders-controller.php:1124
+msgid "Country code in ISO 3166-1 alpha-2 format."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1000
+#: includes/api/v1/class-wc-rest-orders-controller.php:1079
+msgid "Shipping address."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1052
+#: includes/api/v1/class-wc-rest-orders-controller.php:1131
+msgid "Payment method ID."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1057
+#: includes/api/v1/class-wc-rest-orders-controller.php:1136
+msgid "Payment method title."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1062
+#: includes/api/v1/class-wc-rest-orders-controller.php:1147
+msgid "Unique transaction ID."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1067
+#: includes/api/v1/class-wc-rest-orders-controller.php:1181
+msgid "The date the order was paid, in the site's timezone."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1073
+msgid "The date the order was paid, as GMT."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1079
+#: includes/api/v1/class-wc-rest-orders-controller.php:1175
+msgid "The date the order was completed, in the site's timezone."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1085
+msgid "The date the order was completed, as GMT."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1091
+#: includes/api/v1/class-wc-rest-orders-controller.php:1187
+msgid "MD5 hash of cart items to ensure orders are not modified."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1250
+#: includes/api/v1/class-wc-rest-orders-controller.php:1326
+msgid "Tax lines data."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1264
+#: includes/api/v1/class-wc-rest-orders-controller.php:1340
+msgid "Tax rate code."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1276
+#: includes/api/v1/class-wc-rest-orders-controller.php:1352
+msgid "Tax rate label."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1282
+#: includes/api/v1/class-wc-rest-orders-controller.php:1358
+msgid "Show if is a compound tax rate."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1288
+#: includes/api/v1/class-wc-rest-orders-controller.php:1364
+msgid "Tax total (not including shipping taxes)."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1294
+#: includes/api/v1/class-wc-rest-orders-controller.php:1370
+msgid "Shipping tax total."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1329
+#: includes/api/v1/class-wc-rest-orders-controller.php:1379
+msgid "Shipping lines data."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1342
+#: includes/api/v1/class-wc-rest-orders-controller.php:1392
+msgid "Shipping method name."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1347
+#: includes/api/class-wc-rest-shipping-zone-methods-controller.php:49
+#: includes/api/class-wc-rest-shipping-zone-methods-controller.php:456
+#: includes/api/v1/class-wc-rest-orders-controller.php:1397
+msgid "Shipping method ID."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1415
+#: includes/api/v1/class-wc-rest-orders-controller.php:1439
+msgid "Fee lines data."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1428
+#: includes/api/v1/class-wc-rest-orders-controller.php:1452
+msgid "Fee name."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1433
+#: includes/api/v1/class-wc-rest-orders-controller.php:1457
+msgid "Tax class of fee."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1438
+#: includes/api/v1/class-wc-rest-orders-controller.php:1462
+msgid "Tax status of fee."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1513
+#: includes/api/v1/class-wc-rest-orders-controller.php:1510
+msgid "Coupons line data."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1531
+#: includes/api/v1/class-wc-rest-orders-controller.php:1528
+msgid "Discount total."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1536
+#: includes/api/v1/class-wc-rest-orders-controller.php:1533
+msgid "Discount total tax."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1571
+#: includes/api/v1/class-wc-rest-orders-controller.php:1542
+msgid "List of refunds."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1579
+#: includes/api/v1/class-wc-rest-orders-controller.php:1550
+#: includes/cli/class-wc-cli-runner.php:98
+msgid "Refund ID."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1585
+#: includes/api/v1/class-wc-rest-orders-controller.php:1556
+msgid "Refund reason."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1591
+#: includes/api/v1/class-wc-rest-orders-controller.php:1562
+msgid "Refund total."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1600
+#: includes/api/v1/class-wc-rest-orders-controller.php:1141
+msgid ""
+"Define if the order is paid. It will set the status to processing and "
+"reduce stock items."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1621
+#: includes/api/v1/class-wc-rest-orders-controller.php:1586
+msgid "Limit result set to orders assigned a specific status."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1628
+#: includes/api/v1/class-wc-rest-orders-controller.php:1593
+msgid "Limit result set to orders assigned a specific customer."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1634
+#: includes/api/v1/class-wc-rest-orders-controller.php:1599
+msgid "Limit result set to orders assigned a specific product."
+msgstr ""
+
+#: includes/api/class-wc-rest-orders-controller.php:1641
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:516
+#: includes/api/v1/class-wc-rest-orders-controller.php:1606
+msgid "Number of decimal points to use in each resource."
+msgstr ""
+
+#: includes/api/class-wc-rest-payment-gateways-controller.php:345
+msgid "Payment gateway ID."
+msgstr ""
+
+#: includes/api/class-wc-rest-payment-gateways-controller.php:351
+msgid "Payment gateway title on checkout."
+msgstr ""
+
+#: includes/api/class-wc-rest-payment-gateways-controller.php:356
+msgid "Payment gateway description on checkout."
+msgstr ""
+
+#: includes/api/class-wc-rest-payment-gateways-controller.php:361
+msgid "Payment gateway sort order."
+msgstr ""
+
+#: includes/api/class-wc-rest-payment-gateways-controller.php:369
+msgid "Payment gateway enabled status."
+msgstr ""
+
+#: includes/api/class-wc-rest-payment-gateways-controller.php:374
+msgid "Payment gateway method title."
+msgstr ""
+
+#: includes/api/class-wc-rest-payment-gateways-controller.php:380
+msgid "Payment gateway method description."
+msgstr ""
+
+#: includes/api/class-wc-rest-payment-gateways-controller.php:386
+msgid "Payment gateway settings."
+msgstr ""
+
+#: includes/api/class-wc-rest-payment-gateways-controller.php:391
+#: includes/api/class-wc-rest-setting-options-controller.php:464
+#: includes/api/class-wc-rest-shipping-zone-methods-controller.php:479
+msgid "A unique identifier for the setting."
+msgstr ""
+
+#: includes/api/class-wc-rest-payment-gateways-controller.php:397
+#: includes/api/class-wc-rest-setting-options-controller.php:473
+#: includes/api/class-wc-rest-settings-controller.php:204
+#: includes/api/class-wc-rest-shipping-zone-methods-controller.php:485
+msgid "A human readable label for the setting used in interfaces."
+msgstr ""
+
+#: includes/api/class-wc-rest-payment-gateways-controller.php:403
+#: includes/api/class-wc-rest-setting-options-controller.php:482
+#: includes/api/class-wc-rest-settings-controller.php:210
+#: includes/api/class-wc-rest-shipping-zone-methods-controller.php:491
+msgid "A human readable description for the setting used in interfaces."
+msgstr ""
+
+#: includes/api/class-wc-rest-payment-gateways-controller.php:409
+#: includes/api/class-wc-rest-setting-options-controller.php:520
+#: includes/api/class-wc-rest-shipping-zone-methods-controller.php:497
+msgid "Type of setting."
+msgstr ""
+
+#: includes/api/class-wc-rest-payment-gateways-controller.php:416
+#: includes/api/class-wc-rest-setting-options-controller.php:491
+#: includes/api/class-wc-rest-shipping-zone-methods-controller.php:504
+msgid "Setting value."
+msgstr ""
+
+#: includes/api/class-wc-rest-payment-gateways-controller.php:421
+#: includes/api/class-wc-rest-setting-options-controller.php:496
+#: includes/api/class-wc-rest-shipping-zone-methods-controller.php:509
+msgid "Default value for the setting."
+msgstr ""
+
+#: includes/api/class-wc-rest-payment-gateways-controller.php:427
+#: includes/api/class-wc-rest-setting-options-controller.php:502
+#: includes/api/class-wc-rest-shipping-zone-methods-controller.php:515
+msgid "Additional help text shown to the user about the setting."
+msgstr ""
+
+#: includes/api/class-wc-rest-payment-gateways-controller.php:433
+#: includes/api/class-wc-rest-setting-options-controller.php:511
+#: includes/api/class-wc-rest-shipping-zone-methods-controller.php:521
+msgid "Placeholder text to be displayed in text inputs."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-categories-controller.php:112
+#: includes/api/class-wc-rest-products-controller.php:1746
+#: includes/api/v1/class-wc-rest-product-categories-controller.php:176
+#: includes/api/v1/class-wc-rest-products-controller.php:2104
+msgid "Category name."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-categories-controller.php:120
+#: includes/api/v1/class-wc-rest-product-attribute-terms-controller.php:209
+#: includes/api/v1/class-wc-rest-product-attributes-controller.php:550
+#: includes/api/v1/class-wc-rest-product-categories-controller.php:184
+#: includes/api/v1/class-wc-rest-product-shipping-classes-controller.php:108
+#: includes/api/v1/class-wc-rest-product-tags-controller.php:108
+msgid "An alphanumeric identifier for the resource unique to its type."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-categories-controller.php:128
+#: includes/api/v1/class-wc-rest-product-categories-controller.php:192
+msgid "The ID for the parent of the resource."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-categories-controller.php:133
+#: includes/api/v1/class-wc-rest-product-attribute-terms-controller.php:217
+#: includes/api/v1/class-wc-rest-product-categories-controller.php:197
+#: includes/api/v1/class-wc-rest-product-shipping-classes-controller.php:116
+#: includes/api/v1/class-wc-rest-product-tags-controller.php:116
+msgid "HTML description of the resource."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-categories-controller.php:141
+#: includes/api/v1/class-wc-rest-product-categories-controller.php:205
+msgid "Category archive display type."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-categories-controller.php:148
+#: includes/api/v1/class-wc-rest-product-categories-controller.php:212
+msgid "Image data."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-categories-controller.php:153
+#: includes/api/class-wc-rest-product-variations-controller.php:827
+#: includes/api/class-wc-rest-products-controller.php:1795
+#: includes/api/v1/class-wc-rest-product-categories-controller.php:217
+#: includes/api/v1/class-wc-rest-products-controller.php:2153
+#: includes/api/v1/class-wc-rest-products-controller.php:2486
+msgid "Image ID."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-categories-controller.php:158
+#: includes/api/class-wc-rest-product-variations-controller.php:832
+#: includes/api/class-wc-rest-products-controller.php:1800
+#: includes/api/v1/class-wc-rest-product-categories-controller.php:222
+#: includes/api/v1/class-wc-rest-products-controller.php:2158
+#: includes/api/v1/class-wc-rest-products-controller.php:2491
+msgid "The date the image was created, in the site's timezone."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-categories-controller.php:164
+#: includes/api/class-wc-rest-product-variations-controller.php:838
+#: includes/api/class-wc-rest-products-controller.php:1806
+msgid "The date the image was created, as GMT."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-categories-controller.php:170
+#: includes/api/class-wc-rest-product-variations-controller.php:844
+#: includes/api/class-wc-rest-products-controller.php:1812
+#: includes/api/v1/class-wc-rest-product-categories-controller.php:228
+#: includes/api/v1/class-wc-rest-products-controller.php:2164
+#: includes/api/v1/class-wc-rest-products-controller.php:2497
+msgid "The date the image was last modified, in the site's timezone."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-categories-controller.php:176
+#: includes/api/class-wc-rest-product-variations-controller.php:850
+#: includes/api/class-wc-rest-products-controller.php:1818
+msgid "The date the image was last modified, as GMT."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-categories-controller.php:182
+#: includes/api/class-wc-rest-product-variations-controller.php:856
+#: includes/api/class-wc-rest-products-controller.php:1824
+#: includes/api/v1/class-wc-rest-product-categories-controller.php:234
+#: includes/api/v1/class-wc-rest-products-controller.php:2170
+#: includes/api/v1/class-wc-rest-products-controller.php:2503
+msgid "Image URL."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-categories-controller.php:188
+#: includes/api/class-wc-rest-product-variations-controller.php:862
+#: includes/api/class-wc-rest-products-controller.php:1830
+#: includes/api/v1/class-wc-rest-product-categories-controller.php:240
+#: includes/api/v1/class-wc-rest-products-controller.php:2176
+#: includes/api/v1/class-wc-rest-products-controller.php:2509
+msgid "Image name."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-categories-controller.php:193
+#: includes/api/class-wc-rest-product-variations-controller.php:867
+#: includes/api/class-wc-rest-products-controller.php:1835
+#: includes/api/v1/class-wc-rest-product-categories-controller.php:245
+#: includes/api/v1/class-wc-rest-products-controller.php:2181
+#: includes/api/v1/class-wc-rest-products-controller.php:2514
+msgid "Image alternative text."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-categories-controller.php:200
+#: includes/api/v1/class-wc-rest-product-attribute-terms-controller.php:225
+#: includes/api/v1/class-wc-rest-product-categories-controller.php:252
+msgid "Menu order, used to custom sort the resource."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-categories-controller.php:205
+#: includes/api/v1/class-wc-rest-product-attribute-terms-controller.php:230
+#: includes/api/v1/class-wc-rest-product-categories-controller.php:257
+#: includes/api/v1/class-wc-rest-product-shipping-classes-controller.php:124
+#: includes/api/v1/class-wc-rest-product-tags-controller.php:124
+msgid "Number of published products for the resource."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-reviews-controller.php:48
+#: includes/api/class-wc-rest-product-variations-controller.php:61
+#: includes/api/class-wc-rest-product-variations-controller.php:82
+#: includes/api/class-wc-rest-product-variations-controller.php:121
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:46
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:88
+msgid "Unique identifier for the variable product."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-reviews-controller.php:161
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:522
+msgid "The content of the review."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-reviews-controller.php:166
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:527
+msgid "The date the review was created, in the site's timezone."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-reviews-controller.php:171
+msgid "The date the review was created, as GMT."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-reviews-controller.php:176
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:532
+msgid "Review rating (0 to 5)."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-reviews-controller.php:181
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:537
+msgid "Reviewer name."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-reviews-controller.php:186
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:542
+msgid "Reviewer email."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-reviews-controller.php:191
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:547
+msgid "Shows if the reviewer bought the product or not."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:86
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:50
+msgid "Unique identifier for the variation."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:599
+#: includes/api/v1/class-wc-rest-products-controller.php:2274
+msgid "The date the variation was created, in the site's timezone."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:605
+#: includes/api/v1/class-wc-rest-products-controller.php:2280
+msgid "The date the variation was last modified, in the site's timezone."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:611
+msgid "Variation description."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:616
+#: includes/api/v1/class-wc-rest-products-controller.php:2286
+msgid "Variation URL."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:623
+#: includes/api/class-wc-rest-products-controller.php:1447
+#: includes/api/v1/class-wc-rest-products-controller.php:1808
+#: includes/api/v1/class-wc-rest-products-controller.php:2293
+msgid "Unique identifier."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:628
+#: includes/api/v1/class-wc-rest-products-controller.php:2298
+msgid "Current variation price."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:634
+#: includes/api/v1/class-wc-rest-products-controller.php:2304
+msgid "Variation regular price."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:639
+#: includes/api/v1/class-wc-rest-products-controller.php:2309
+msgid "Variation sale price."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:644
+#: includes/api/class-wc-rest-products-controller.php:1468
+msgid "Start date of sale price, in the site's timezone."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:649
+#: includes/api/class-wc-rest-products-controller.php:1473
+msgid "Start date of sale price, as GMT."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:654
+#: includes/api/class-wc-rest-product-variations-controller.php:659
+#: includes/api/class-wc-rest-products-controller.php:1478
+#: includes/api/class-wc-rest-products-controller.php:1483
+msgid "End date of sale price, in the site's timezone."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:664
+#: includes/api/v1/class-wc-rest-products-controller.php:2324
+msgid "Shows if the variation is on sale."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:670
+#: includes/api/class-wc-rest-products-controller.php:1870
+#: includes/api/v1/class-wc-rest-products-controller.php:2216
+msgid ""
+"Define if the attribute is visible on the \"Additional information\" tab in "
+"the product's page."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:676
+#: includes/api/v1/class-wc-rest-products-controller.php:2330
+msgid "Shows if the variation can be bought."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:682
+#: includes/api/v1/class-wc-rest-products-controller.php:2341
+msgid "If the variation is virtual."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:688
+#: includes/api/v1/class-wc-rest-products-controller.php:2347
+msgid "If the variation is downloadable."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:694
+#: includes/api/class-wc-rest-products-controller.php:1524
+#: includes/api/v1/class-wc-rest-products-controller.php:1875
+#: includes/api/v1/class-wc-rest-products-controller.php:2353
+msgid "List of downloadable files."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:701
+#: includes/api/class-wc-rest-products-controller.php:1531
+#: includes/api/v1/class-wc-rest-products-controller.php:1882
+#: includes/api/v1/class-wc-rest-products-controller.php:2360
+msgid "File MD5 hash."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:720
+#: includes/api/class-wc-rest-products-controller.php:1550
+#: includes/api/v1/class-wc-rest-products-controller.php:1901
+#: includes/api/v1/class-wc-rest-products-controller.php:2379
+msgid "Number of times downloadable files can be downloaded after purchase."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:726
+#: includes/api/class-wc-rest-products-controller.php:1556
+#: includes/api/v1/class-wc-rest-products-controller.php:1907
+#: includes/api/v1/class-wc-rest-products-controller.php:2385
+msgid "Number of days until access to downloadable files expires."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:732
+#: includes/api/class-wc-rest-products-controller.php:1573
+#: includes/api/v1/class-wc-rest-products-controller.php:1931
+#: includes/api/v1/class-wc-rest-products-controller.php:2391
+msgid "Tax status."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:739
+#: includes/api/class-wc-rest-products-controller.php:1580
+#: includes/api/v1/class-wc-rest-products-controller.php:1938
+#: includes/api/v1/class-wc-rest-products-controller.php:2398
+#: includes/api/v1/class-wc-rest-taxes-controller.php:633
+msgid "Tax class."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:744
+#: includes/api/v1/class-wc-rest-products-controller.php:2403
+msgid "Stock management at variation level."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:750
+#: includes/api/class-wc-rest-products-controller.php:1591
+#: includes/api/v1/class-wc-rest-products-controller.php:1949
+#: includes/api/v1/class-wc-rest-products-controller.php:2409
+msgid "Stock quantity."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:755
+#: includes/api/v1/class-wc-rest-products-controller.php:2414
+msgid ""
+"Controls whether or not the variation is listed as \"in stock\" or \"out of "
+"stock\" on the frontend."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:761
+#: includes/api/class-wc-rest-products-controller.php:1602
+#: includes/api/v1/class-wc-rest-products-controller.php:1960
+#: includes/api/v1/class-wc-rest-products-controller.php:2420
+msgid "If managing stock, this controls if backorders are allowed."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:768
+#: includes/api/class-wc-rest-products-controller.php:1609
+#: includes/api/v1/class-wc-rest-products-controller.php:1967
+#: includes/api/v1/class-wc-rest-products-controller.php:2427
+msgid "Shows if backorders are allowed."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:774
+#: includes/api/v1/class-wc-rest-products-controller.php:2433
+msgid "Shows if the variation is on backordered."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:781
+#: includes/api/v1/class-wc-rest-products-controller.php:2440
+#. translators: %s: weight unit
+msgid "Variation weight (%s)."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:786
+#: includes/api/v1/class-wc-rest-products-controller.php:2445
+msgid "Variation dimensions."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:792
+#: includes/api/v1/class-wc-rest-products-controller.php:2451
+#. translators: %s: dimension unit
+msgid "Variation length (%s)."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:798
+#: includes/api/v1/class-wc-rest-products-controller.php:2457
+#. translators: %s: dimension unit
+msgid "Variation width (%s)."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:804
+#: includes/api/v1/class-wc-rest-products-controller.php:2463
+#. translators: %s: dimension unit
+msgid "Variation height (%s)."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:811
+#: includes/api/class-wc-rest-products-controller.php:1670
+#: includes/api/v1/class-wc-rest-products-controller.php:2028
+#: includes/api/v1/class-wc-rest-products-controller.php:2470
+msgid "Shipping class slug."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:816
+#: includes/api/class-wc-rest-products-controller.php:1675
+#: includes/api/v1/class-wc-rest-products-controller.php:2033
+#: includes/api/v1/class-wc-rest-products-controller.php:2475
+msgid "Shipping class ID."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:822
+#: includes/api/v1/class-wc-rest-products-controller.php:2481
+msgid "Variation image data."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:872
+#: includes/api/class-wc-rest-products-controller.php:1840
+#: includes/api/v1/class-wc-rest-products-controller.php:2186
+#: includes/api/v1/class-wc-rest-products-controller.php:2519
+msgid "Image position. 0 means that the image is featured."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:879
+#: includes/api/class-wc-rest-products-controller.php:1848
+#: includes/api/v1/class-wc-rest-products-controller.php:2194
+#: includes/api/v1/class-wc-rest-products-controller.php:2526
+msgid "List of attributes."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:886
+#: includes/api/class-wc-rest-products-controller.php:1855
+#: includes/api/class-wc-rest-products-controller.php:1897
+#: includes/api/v1/class-wc-rest-products-controller.php:2201
+#: includes/api/v1/class-wc-rest-products-controller.php:2243
+#: includes/api/v1/class-wc-rest-products-controller.php:2533
+#: includes/cli/class-wc-cli-runner.php:99
+msgid "Attribute ID."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:891
+#: includes/api/class-wc-rest-products-controller.php:1860
+#: includes/api/class-wc-rest-products-controller.php:1902
+#: includes/api/v1/class-wc-rest-product-attributes-controller.php:542
+#: includes/api/v1/class-wc-rest-products-controller.php:2206
+#: includes/api/v1/class-wc-rest-products-controller.php:2248
+#: includes/api/v1/class-wc-rest-products-controller.php:2538
+msgid "Attribute name."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:896
+#: includes/api/class-wc-rest-products-controller.php:1907
+#: includes/api/v1/class-wc-rest-products-controller.php:2253
+#: includes/api/v1/class-wc-rest-products-controller.php:2543
+msgid "Selected attribute term name."
+msgstr ""
+
+#: includes/api/class-wc-rest-product-variations-controller.php:904
+#: includes/api/class-wc-rest-products-controller.php:1933
+#: includes/api/v1/class-wc-rest-products-controller.php:2563
+msgid "Menu order, used to custom sort products."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:393
+#: includes/api/class-wc-rest-products-controller.php:394
+#: includes/api/legacy/v1/class-wc-api-products.php:445
+#: includes/api/legacy/v1/class-wc-api-products.php:446
+#: includes/api/legacy/v2/class-wc-api-products.php:1603
+#: includes/api/legacy/v2/class-wc-api-products.php:1604
+#: includes/api/legacy/v3/class-wc-api-products.php:2102
+#: includes/api/legacy/v3/class-wc-api-products.php:2103
+#: includes/api/v1/class-wc-rest-products-controller.php:313
+#: includes/api/v1/class-wc-rest-products-controller.php:314
+#: includes/wc-product-functions.php:325
 msgid "Placeholder"
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:2340
-#: includes/api/v2/class-wc-api-products.php:1834
-#: includes/cli/class-wc-cli-product.php:2016
-msgid "Invalid URL %s"
+#: includes/api/class-wc-rest-products-controller.php:1052
+#: includes/api/v1/class-wc-rest-products-controller.php:867
+msgid "#%s is an invalid image ID."
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:2352
-#: includes/api/v2/class-wc-api-products.php:1846
-#: includes/cli/class-wc-cli-product.php:2028
-msgid "Error getting remote image %s"
+#: includes/api/class-wc-rest-products-controller.php:1374
+#: includes/api/v1/class-wc-rest-products-controller.php:1747
+msgid "Product slug."
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:2381
-#: includes/api/v2/class-wc-api-products.php:1875
-#: includes/cli/class-wc-cli-product.php:2057
-msgid "Zero size file downloaded"
+#: includes/api/class-wc-rest-products-controller.php:1379
+#: includes/api/v1/class-wc-rest-products-controller.php:1752
+msgid "Product URL."
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:2538
-#: includes/api/class-wc-api-products.php:2582
-#: includes/api/v2/class-wc-api-products.php:2007
-#: includes/api/v2/class-wc-api-products.php:2051
+#: includes/api/class-wc-rest-products-controller.php:1386
+#: includes/api/v1/class-wc-rest-products-controller.php:1759
+msgid "The date the product was created, in the site's timezone."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1392
+msgid "The date the product was created, as GMT."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1398
+#: includes/api/v1/class-wc-rest-products-controller.php:1765
+msgid "The date the product was last modified, in the site's timezone."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1404
+msgid "The date the product was last modified, as GMT."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1410
+#: includes/api/v1/class-wc-rest-products-controller.php:1771
+msgid "Product type."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1417
+#: includes/api/v1/class-wc-rest-products-controller.php:1778
+msgid "Product status (post status)."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1424
+#: includes/api/v1/class-wc-rest-products-controller.php:1785
+msgid "Featured product."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1430
+#: includes/api/v1/class-wc-rest-products-controller.php:1791
+msgid "Catalog visibility."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1437
+#: includes/api/v1/class-wc-rest-products-controller.php:1798
+msgid "Product description."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1442
+#: includes/api/v1/class-wc-rest-products-controller.php:1803
+msgid "Product short description."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1452
+#: includes/api/v1/class-wc-rest-products-controller.php:1813
+msgid "Current product price."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1458
+#: includes/api/v1/class-wc-rest-products-controller.php:1819
+msgid "Product regular price."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1463
+#: includes/api/v1/class-wc-rest-products-controller.php:1824
+msgid "Product sale price."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1488
+#: includes/api/v1/class-wc-rest-products-controller.php:1839
+msgid "Price formatted in HTML."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1494
+#: includes/api/v1/class-wc-rest-products-controller.php:1845
+msgid "Shows if the product is on sale."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1500
+#: includes/api/v1/class-wc-rest-products-controller.php:1851
+msgid "Shows if the product can be bought."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1506
+#: includes/api/v1/class-wc-rest-products-controller.php:1857
+msgid "Amount of sales."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1512
+#: includes/api/v1/class-wc-rest-products-controller.php:1863
+msgid "If the product is virtual."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1518
+#: includes/api/v1/class-wc-rest-products-controller.php:1869
+msgid "If the product is downloadable."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1562
+#: includes/api/v1/class-wc-rest-products-controller.php:1920
+msgid "Product external URL. Only for external products."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1568
+#: includes/api/v1/class-wc-rest-products-controller.php:1926
+msgid "Product external button text. Only for external products."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1585
+#: includes/api/v1/class-wc-rest-products-controller.php:1943
+msgid "Stock management at product level."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1615
+#: includes/api/v1/class-wc-rest-products-controller.php:1973
+msgid "Shows if the product is on backordered."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1621
+#: includes/api/v1/class-wc-rest-products-controller.php:1979
+msgid "Allow one item to be bought in a single order."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1628
+#: includes/api/v1/class-wc-rest-products-controller.php:1986
+#. translators: %s: weight unit
+msgid "Product weight (%s)."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1633
+#: includes/api/v1/class-wc-rest-products-controller.php:1991
+msgid "Product dimensions."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1639
+#: includes/api/v1/class-wc-rest-products-controller.php:1997
+#. translators: %s: dimension unit
+msgid "Product length (%s)."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1645
+#: includes/api/v1/class-wc-rest-products-controller.php:2003
+#. translators: %s: dimension unit
+msgid "Product width (%s)."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1651
+#: includes/api/v1/class-wc-rest-products-controller.php:2009
+#. translators: %s: dimension unit
+msgid "Product height (%s)."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1658
+#: includes/api/v1/class-wc-rest-products-controller.php:2016
+msgid "Shows if the product need to be shipped."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1664
+#: includes/api/v1/class-wc-rest-products-controller.php:2022
+msgid "Shows whether or not the product shipping is taxable."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1681
+#: includes/api/v1/class-wc-rest-products-controller.php:2039
+msgid "Allow reviews."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1687
+#: includes/api/v1/class-wc-rest-products-controller.php:2045
+msgid "Reviews average rating."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1693
+#: includes/api/v1/class-wc-rest-products-controller.php:2051
+msgid "Amount of reviews that the product have."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1699
+#: includes/api/v1/class-wc-rest-products-controller.php:2057
+msgid "List of related products IDs."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1708
+#: includes/api/v1/class-wc-rest-products-controller.php:2066
+msgid "List of up-sell products IDs."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1716
+#: includes/api/v1/class-wc-rest-products-controller.php:2074
+msgid "List of cross-sell products IDs."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1724
+#: includes/api/v1/class-wc-rest-products-controller.php:2082
+msgid "Product parent ID."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1729
+#: includes/api/v1/class-wc-rest-products-controller.php:2087
+msgid "Optional note to send the customer after purchase."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1734
+#: includes/api/v1/class-wc-rest-products-controller.php:2092
+msgid "List of categories."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1741
+#: includes/api/v1/class-wc-rest-products-controller.php:2099
+msgid "Category ID."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1752
+#: includes/api/v1/class-wc-rest-products-controller.php:2110
+msgid "Category slug."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1761
+#: includes/api/v1/class-wc-rest-products-controller.php:2119
+msgid "List of tags."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1768
+#: includes/api/v1/class-wc-rest-products-controller.php:2126
+msgid "Tag ID."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1773
+#: includes/api/v1/class-wc-rest-product-tags-controller.php:100
+#: includes/api/v1/class-wc-rest-products-controller.php:2131
+msgid "Tag name."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1779
+#: includes/api/v1/class-wc-rest-products-controller.php:2137
+msgid "Tag slug."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1788
+#: includes/api/v1/class-wc-rest-products-controller.php:2146
+msgid "List of images."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1865
+#: includes/api/v1/class-wc-rest-products-controller.php:2211
+msgid "Attribute position."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1876
+#: includes/api/v1/class-wc-rest-products-controller.php:2222
+msgid "Define if the attribute can be used as variation."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1882
+#: includes/api/v1/class-wc-rest-products-controller.php:2228
+msgid "List of available term names of the attribute."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1890
+#: includes/api/v1/class-wc-rest-products-controller.php:2236
+msgid "Defaults variation attributes."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1915
+msgid "List of variations IDs."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1924
+#: includes/api/v1/class-wc-rest-products-controller.php:2554
+msgid "List of grouped products ID."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1978
+#: includes/api/v1/class-wc-rest-products-controller.php:2582
+msgid "Limit result set to products with a specific slug."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1984
+#: includes/api/v1/class-wc-rest-products-controller.php:2588
+msgid "Limit result set to products assigned a specific status."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1991
+#: includes/api/v1/class-wc-rest-products-controller.php:2595
+msgid "Limit result set to products assigned a specific type."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:1998
+#: includes/api/v1/class-wc-rest-products-controller.php:2632
+msgid "Limit result set to products with a specific SKU."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:2004
+msgid "Limit result set to featured products."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:2010
+#: includes/api/v1/class-wc-rest-products-controller.php:2602
+msgid "Limit result set to products assigned a specific category ID."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:2016
+#: includes/api/v1/class-wc-rest-products-controller.php:2608
+msgid "Limit result set to products assigned a specific tag ID."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:2022
+#: includes/api/v1/class-wc-rest-products-controller.php:2614
+msgid "Limit result set to products assigned a specific shipping class ID."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:2028
+#: includes/api/v1/class-wc-rest-products-controller.php:2620
+msgid "Limit result set to products with a specific attribute."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:2034
+#: includes/api/v1/class-wc-rest-products-controller.php:2626
+msgid ""
+"Limit result set to products with a specific attribute term ID (required an "
+"assigned attribute)."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:2042
+msgid "Limit result set to products with a specific tax class."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:2051
+msgid "Limit result set to products in stock or out of stock."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:2057
+msgid "Limit result set to products on sale."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:2063
+msgid "Limit result set to products based on a minimum price."
+msgstr ""
+
+#: includes/api/class-wc-rest-products-controller.php:2069
+msgid "Limit result set to products based on a maximum price."
+msgstr ""
+
+#: includes/api/class-wc-rest-setting-options-controller.php:46
+#: includes/api/class-wc-rest-setting-options-controller.php:61
+#: includes/api/class-wc-rest-setting-options-controller.php:77
+msgid "Settings group ID."
+msgstr ""
+
+#: includes/api/class-wc-rest-setting-options-controller.php:155
+#: includes/api/class-wc-rest-setting-options-controller.php:161
+msgid "Invalid setting group."
+msgstr ""
+
+#: includes/api/class-wc-rest-setting-options-controller.php:199
+#: includes/api/class-wc-rest-setting-options-controller.php:211
+#: includes/api/class-wc-rest-setting-options-controller.php:217
+msgid "Invalid setting."
+msgstr ""
+
+#: includes/api/class-wc-rest-setting-options-controller.php:356
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:179
+msgid "Sorry, you cannot edit this resource."
+msgstr ""
+
+#: includes/api/class-wc-rest-setting-options-controller.php:530
+msgid ""
+"Array of options (key value pairs) for inputs such as select, multiselect, "
+"and radio buttons."
+msgstr ""
+
+#: includes/api/class-wc-rest-settings-controller.php:63
+msgid "No setting groups have been registered."
+msgstr ""
+
+#: includes/api/class-wc-rest-settings-controller.php:198
+msgid "A unique identifier that can be used to link settings together."
+msgstr ""
+
+#: includes/api/class-wc-rest-settings-controller.php:216
+msgid "ID of parent grouping."
+msgstr ""
+
+#: includes/api/class-wc-rest-settings-controller.php:222
+msgid "IDs for settings sub groups."
+msgstr ""
+
+#: includes/api/class-wc-rest-shipping-methods-controller.php:196
+msgid "Method ID."
+msgstr ""
+
+#: includes/api/class-wc-rest-shipping-methods-controller.php:202
+#: includes/api/class-wc-rest-shipping-zone-methods-controller.php:462
+msgid "Shipping method title."
+msgstr ""
+
+#: includes/api/class-wc-rest-shipping-methods-controller.php:208
+#: includes/api/class-wc-rest-shipping-zone-methods-controller.php:468
+msgid "Shipping method description."
+msgstr ""
+
+#: includes/api/class-wc-rest-shipping-zone-locations-controller.php:32
+#: includes/api/class-wc-rest-shipping-zones-controller.php:53
+msgid "Unique ID for the resource."
+msgstr ""
+
+#: includes/api/class-wc-rest-shipping-zone-locations-controller.php:167
+msgid "Shipping zone location code."
+msgstr ""
+
+#: includes/api/class-wc-rest-shipping-zone-locations-controller.php:172
+msgid "Shipping zone location type."
+msgstr ""
+
+#: includes/api/class-wc-rest-shipping-zone-methods-controller.php:32
+#: includes/api/class-wc-rest-shipping-zone-methods-controller.php:59
+msgid "Unique ID for the zone."
+msgstr ""
+
+#: includes/api/class-wc-rest-shipping-zone-methods-controller.php:63
+msgid "Unique ID for the instance."
+msgstr ""
+
+#: includes/api/class-wc-rest-shipping-zone-methods-controller.php:177
+msgid "Resource cannot be created."
+msgstr ""
+
+#: includes/api/class-wc-rest-shipping-zone-methods-controller.php:232
+msgid "Shipping methods do not support trashing."
+msgstr ""
+
+#: includes/api/class-wc-rest-shipping-zone-methods-controller.php:434
+msgid "Shipping method instance ID."
+msgstr ""
+
+#: includes/api/class-wc-rest-shipping-zone-methods-controller.php:440
+msgid "Shipping method customer facing title."
+msgstr ""
+
+#: includes/api/class-wc-rest-shipping-zone-methods-controller.php:446
+msgid "Shipping method sort order."
+msgstr ""
+
+#: includes/api/class-wc-rest-shipping-zone-methods-controller.php:451
+msgid "Shipping method enabled status."
+msgstr ""
+
+#: includes/api/class-wc-rest-shipping-zone-methods-controller.php:474
+msgid "Shipping method settings."
+msgstr ""
+
+#: includes/api/class-wc-rest-shipping-zones-controller.php:43
+#: includes/api/class-wc-rest-shipping-zones-controller.php:281
+msgid "Shipping zone name."
+msgstr ""
+
+#: includes/api/class-wc-rest-shipping-zones-controller.php:152
+msgid ""
+"Resource cannot be created. Check to make sure 'order' and 'name' are "
+"present."
+msgstr ""
+
+#: includes/api/class-wc-rest-shipping-zones-controller.php:208
+msgid "Shipping zones do not support trashing."
+msgstr ""
+
+#: includes/api/class-wc-rest-shipping-zones-controller.php:289
+msgid "Shipping zone order."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:103
+msgid "Environment."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:109
+msgid "Home URL."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:116
+msgid "Site URL."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:123
+msgid "WooCommerce version."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:129
+msgid "Log directory."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:135
+msgid "Is log directory writable?"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:141
+msgid "WordPress version."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:147
+msgid "Is WordPress multisite?"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:153
+msgid "WordPress memory limit."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:159
+msgid "Is WordPress debug mode active?"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:165
+msgid "Are WordPress cron jobs enabled?"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:171
+msgid "WordPress language."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:177
+msgid "Server info."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:183
+msgid "PHP version."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:189
+msgid "PHP post max size."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:195
+msgid "PHP max execution time."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:201
+msgid "PHP max input vars."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:207
+msgid "cURL version."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:213
+msgid "Is SUHOSIN installed?"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:219
+msgid "Max upload size."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:225
+msgid "MySQL version."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:231
+msgid "Default timezone."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:237
+msgid "Is fsockopen/cURL enabled?"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:243
+msgid "Is SoapClient class enabled?"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:249
+msgid "Is DomDocument class enabled?"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:255
+msgid "Is GZip enabled?"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:261
+msgid "Is mbstring enabled?"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:267
+msgid "Remote POST successful?"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:273
+msgid "Remote POST response."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:279
+msgid "Remote GET successful?"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:285
+msgid "Remote GET response."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:293
+msgid "Database."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:299
+msgid "WC database version."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:305
+msgid "Database prefix."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:311
+msgid "MaxMind GeoIP database."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:317
+msgid "Database tables."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:328
+msgid "Active plugins."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:337
+msgid "Theme."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:343
+msgid "Theme name."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:349
+msgid "Theme version."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:355
+msgid "Latest version of theme."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:361
+msgid "Theme author URL."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:368
+msgid "Is this theme a child theme?"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:374
+msgid "Does the theme declare WooCommerce support?"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:380
+msgid "Does the theme have a woocommerce.php file?"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:386
+msgid "Does this theme have outdated templates?"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:392
+msgid "Template overrides."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:401
+msgid "Parent theme name."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:407
+msgid "Parent theme version."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:413
+msgid "Parent theme author URL."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:422
+msgid "Settings."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:428
+msgid "REST API enabled?"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:434
+msgid "SSL forced?"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:440
+msgid "Currency."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:446
+msgid "Currency symbol."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:452
+msgid "Currency position."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:458
+msgid "Thousand separator."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:464
+msgid "Decimal separator."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:470
+msgid "Number of decimals."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:476
+msgid "Geolocation enabled?"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:482
+msgid "Taxonomy terms for product/order statuses."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:493
+msgid "Security."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:505
+msgid "Hide errors from visitors?"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-controller.php:513
+msgid "WooCommerce pages."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:107
+#: includes/api/v1/class-wc-rest-product-attributes-controller.php:177
+msgid "Sorry, you cannot update resource."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:121
+msgid "WC transients"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:122
+msgid "Clear transients"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:123
+msgid "This tool will clear the product/shop transients cache."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:126
+msgid "Expired transients"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:127
+msgid "Clear expired transients"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:128
+msgid "This tool will clear ALL expired transients from WordPress."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:131
+msgid "Orphaned variations"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:132
+msgid "Delete orphaned variations"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:133
+msgid "This tool will delete all variations which have no parent."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:136
+msgid "Term counts"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:137
+msgid "Recount terms"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:138
+msgid ""
+"This tool will recount product terms - useful when changing your settings "
+"in a way which hides products from the catalog."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:141
+msgid "Capabilities"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:142
+msgid "Reset capabilities"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:143
+msgid ""
+"This tool will reset the admin, customer and shop_manager roles to default. "
+"Use this if your users cannot access all of the WooCommerce admin pages."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:146
+msgid "Customer sessions"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:147
+msgid "Clear all sessions"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:150
+#: includes/api/class-wc-rest-system-status-tools-controller.php:159
+#: includes/api/class-wc-rest-system-status-tools-controller.php:168
+#: templates/order/order-details-customer.php:32
+msgid "Note:"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:151
+msgid ""
+"This tool will delete all customer session data from the database, "
+"including any current live carts."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:155
+msgid "Install WooCommerce pages"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:156
+msgid "Install pages"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:160
+msgid ""
+"This tool will install all the missing WooCommerce pages. Pages already "
+"defined and set up will not be replaced."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:164
+msgid "Delete all WooCommerce tax rates"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:165
+msgid "Delete ALL tax rates"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:169
+msgid "This option will delete ALL of your tax rates, use with caution."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:173
+#: includes/api/class-wc-rest-system-status-tools-controller.php:174
+msgid "Reset usage tracking settings"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:175
+msgid ""
+"This will reset your usage tracking settings, causing it to show the opt-in "
+"banner again and not sending any data."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:212
+#: includes/api/class-wc-rest-system-status-tools-controller.php:231
+msgid "Invalid tool ID."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:281
+msgid "A unique identifier for the tool."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:289
+msgid "Tool name."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:297
+msgid "What running the tool will do."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:305
+msgid "Tool description."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:313
+msgid "Did the tool run successfully?"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:318
+msgid "Tool return message."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:374
+msgid "Product transients cleared"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:398
+msgid "%d transients rows cleared"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:408
+msgid "%d orphaned variations deleted"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:414
+msgid "Roles successfully reset"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:421
+msgid "Terms successfully recounted"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:426
+msgid "Sessions successfully cleared"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:430
+msgid "All missing WooCommerce pages was installed successfully."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:437
+msgid "Tax rates successfully deleted"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:442
+msgid "Usage tracking settings successfully reset."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:452
+msgid "There was an error calling %s"
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:454
+msgid "Tool ran."
+msgstr ""
+
+#: includes/api/class-wc-rest-system-status-tools-controller.php:458
+msgid "There was an error calling this tool. There is no callback present."
+msgstr ""
+
+#: includes/api/class-wc-rest-webhook-deliveries.php:86
+#: includes/api/v1/class-wc-rest-webhook-deliveries.php:240
+msgid "The delivery duration, in seconds."
+msgstr ""
+
+#: includes/api/class-wc-rest-webhook-deliveries.php:92
+#: includes/api/v1/class-wc-rest-webhook-deliveries.php:246
+msgid ""
+"A friendly summary of the response including the HTTP response code, "
+"message, and body."
+msgstr ""
+
+#: includes/api/class-wc-rest-webhook-deliveries.php:98
+#: includes/api/class-wc-rest-webhook-deliveries.php:105
+#: includes/api/v1/class-wc-rest-webhook-deliveries.php:252
+#: includes/api/v1/class-wc-rest-webhook-deliveries.php:259
+msgid "The URL where the webhook was delivered."
+msgstr ""
+
+#: includes/api/class-wc-rest-webhook-deliveries.php:112
+#: includes/api/v1/class-wc-rest-webhook-deliveries.php:266
+msgid "Request headers."
+msgstr ""
+
+#: includes/api/class-wc-rest-webhook-deliveries.php:121
+#: includes/api/v1/class-wc-rest-webhook-deliveries.php:275
+msgid "Request body."
+msgstr ""
+
+#: includes/api/class-wc-rest-webhook-deliveries.php:127
+#: includes/api/v1/class-wc-rest-webhook-deliveries.php:281
+msgid "The HTTP response code from the receiving server."
+msgstr ""
+
+#: includes/api/class-wc-rest-webhook-deliveries.php:133
+#: includes/api/v1/class-wc-rest-webhook-deliveries.php:287
+msgid "The HTTP response message from the receiving server."
+msgstr ""
+
+#: includes/api/class-wc-rest-webhook-deliveries.php:139
+#: includes/api/v1/class-wc-rest-webhook-deliveries.php:293
+msgid "Array of the response headers from the receiving server."
+msgstr ""
+
+#: includes/api/class-wc-rest-webhook-deliveries.php:148
+#: includes/api/v1/class-wc-rest-webhook-deliveries.php:302
+msgid "The response body from the receiving server."
+msgstr ""
+
+#: includes/api/class-wc-rest-webhook-deliveries.php:154
+#: includes/api/v1/class-wc-rest-webhook-deliveries.php:308
+msgid "The date the webhook delivery was logged, in the site's timezone."
+msgstr ""
+
+#: includes/api/class-wc-rest-webhook-deliveries.php:160
+msgid "The date the webhook delivery was logged, as GMT."
+msgstr ""
+
+#: includes/api/class-wc-rest-webhooks-controller.php:103
+#: includes/api/v1/class-wc-rest-webhooks-controller.php:504
+msgid "A friendly name for the webhook."
+msgstr ""
+
+#: includes/api/class-wc-rest-webhooks-controller.php:108
+#: includes/api/v1/class-wc-rest-webhooks-controller.php:509
+msgid "Webhook status."
+msgstr ""
+
+#: includes/api/class-wc-rest-webhooks-controller.php:118
+#: includes/api/v1/class-wc-rest-webhooks-controller.php:72
+#: includes/api/v1/class-wc-rest-webhooks-controller.php:519
+msgid "Webhook topic."
+msgstr ""
+
+#: includes/api/class-wc-rest-webhooks-controller.php:123
+#: includes/api/v1/class-wc-rest-webhooks-controller.php:524
+msgid "Webhook resource."
+msgstr ""
+
+#: includes/api/class-wc-rest-webhooks-controller.php:129
+#: includes/api/v1/class-wc-rest-webhooks-controller.php:530
+msgid "Webhook event."
+msgstr ""
+
+#: includes/api/class-wc-rest-webhooks-controller.php:135
+#: includes/api/v1/class-wc-rest-webhooks-controller.php:536
+msgid "WooCommerce action names associated with the webhook."
+msgstr ""
+
+#: includes/api/class-wc-rest-webhooks-controller.php:144
+#: includes/api/v1/class-wc-rest-webhooks-controller.php:545
+msgid "The URL where the webhook payload is delivered."
+msgstr ""
+
+#: includes/api/class-wc-rest-webhooks-controller.php:151
+#: includes/api/v1/class-wc-rest-webhooks-controller.php:552
+msgid ""
+"Secret key used to generate a hash of the delivered webhook and provided in "
+"the request headers. This will default is a MD5 hash from the current "
+"user's ID|username if not provided."
+msgstr ""
+
+#: includes/api/class-wc-rest-webhooks-controller.php:156
+#: includes/api/v1/class-wc-rest-webhooks-controller.php:557
+msgid "The date the webhook was created, in the site's timezone."
+msgstr ""
+
+#: includes/api/class-wc-rest-webhooks-controller.php:162
+msgid "The date the webhook was created, as GMT."
+msgstr ""
+
+#: includes/api/class-wc-rest-webhooks-controller.php:168
+#: includes/api/v1/class-wc-rest-webhooks-controller.php:563
+msgid "The date the webhook was last modified, in the site's timezone."
+msgstr ""
+
+#: includes/api/class-wc-rest-webhooks-controller.php:174
+msgid "The date the webhook was last modified, as GMT."
+msgstr ""
+
+#: includes/api/legacy/class-wc-rest-legacy-products-controller.php:531
+#: includes/api/legacy/v2/class-wc-api-products.php:1274
+#: includes/api/legacy/v3/class-wc-api-products.php:1764
+#: includes/api/v1/class-wc-rest-products-controller.php:1374
+#. translators: 1: variation id 2: product name
+msgid "Variation #%1$s of %2$s"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-authentication.php:93
+#: includes/api/legacy/v2/class-wc-api-authentication.php:93
+msgid "Consumer key is missing."
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-authentication.php:109
+#: includes/api/legacy/v2/class-wc-api-authentication.php:109
+msgid "Consumer secret is missing."
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-authentication.php:149
+#: includes/api/legacy/v2/class-wc-api-authentication.php:148
+#: includes/api/legacy/v3/class-wc-api-authentication.php:144
+#. translators: %s: parameter name
+msgid "%s parameter is missing"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-authentication.php:202
+#: includes/api/legacy/v2/class-wc-api-authentication.php:201
+#: includes/api/legacy/v3/class-wc-api-authentication.php:197
+msgid "API user is invalid"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-coupons.php:107
+#: includes/api/legacy/v2/class-wc-api-coupons.php:117
+#: includes/api/legacy/v3/class-wc-api-coupons.php:117
+msgid "Invalid coupon ID"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-coupons.php:148
+#: includes/api/legacy/v2/class-wc-api-coupons.php:161
+#: includes/api/legacy/v3/class-wc-api-coupons.php:161
+msgid "You do not have permission to read the coupons count"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-coupons.php:167
+#: includes/api/legacy/v2/class-wc-api-coupons.php:187
+#: includes/api/legacy/v3/class-wc-api-coupons.php:187
+msgid "Invalid coupon code"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-customers.php:186
+#: includes/api/legacy/v2/class-wc-api-customers.php:228
+#: includes/api/legacy/v3/class-wc-api-customers.php:229
+msgid "You do not have permission to read the customers count"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-customers.php:201
+#: includes/api/legacy/v2/class-wc-api-customers.php:351
+#: includes/api/legacy/v3/class-wc-api-customers.php:352
+msgid "You do not have permission to create this customer"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-customers.php:428
+#: includes/api/legacy/v2/class-wc-api-customers.php:712
+#: includes/api/legacy/v3/class-wc-api-customers.php:702
+msgid "Invalid customer ID"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-customers.php:434
+#: includes/api/legacy/v2/class-wc-api-customers.php:719
+#: includes/api/legacy/v3/class-wc-api-customers.php:709
+msgid "Invalid customer"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-customers.php:441
+#: includes/api/legacy/v2/class-wc-api-customers.php:727
+#: includes/api/legacy/v3/class-wc-api-customers.php:717
+msgid "You do not have permission to read this customer"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-customers.php:446
+#: includes/api/legacy/v2/class-wc-api-customers.php:733
+#: includes/api/legacy/v3/class-wc-api-customers.php:723
+msgid "You do not have permission to edit this customer"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-customers.php:451
+#: includes/api/legacy/v2/class-wc-api-customers.php:739
+#: includes/api/legacy/v3/class-wc-api-customers.php:729
+msgid "You do not have permission to delete this customer"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-json-handler.php:59
+#: includes/api/legacy/v2/class-wc-api-json-handler.php:58
+#: includes/api/legacy/v3/class-wc-api-json-handler.php:58
+msgid "JSONP support is disabled on this site"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-json-handler.php:67
+#: includes/api/legacy/v2/class-wc-api-json-handler.php:66
+#: includes/api/legacy/v3/class-wc-api-json-handler.php:66
+msgid "The JSONP callback function is invalid"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-orders.php:250
+#: includes/api/legacy/v2/class-wc-api-orders.php:297
+#: includes/api/legacy/v3/class-wc-api-orders.php:334
+msgid "You do not have permission to read the orders count"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-products.php:141
+#: includes/api/legacy/v2/class-wc-api-products.php:183
+#: includes/api/legacy/v3/class-wc-api-products.php:232
+msgid "You do not have permission to read the products count"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-reports.php:470
+#: includes/api/legacy/v2/class-wc-api-reports.php:320
+#: includes/api/legacy/v3/class-wc-api-reports.php:320
+msgid "You do not have permission to read this report"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-resource.php:74
+#: includes/api/legacy/v2/class-wc-api-resource.php:95
+#: includes/api/legacy/v3/class-wc-api-resource.php:97
+msgid "Invalid %s ID"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-resource.php:86
+#: includes/api/legacy/v2/class-wc-api-resource.php:112
+#: includes/api/legacy/v3/class-wc-api-resource.php:114
+msgid "Invalid %s"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-resource.php:93
+#: includes/api/legacy/v2/class-wc-api-resource.php:120
+#: includes/api/legacy/v3/class-wc-api-resource.php:122
+msgid "You do not have permission to read this %s"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-resource.php:98
+#: includes/api/legacy/v2/class-wc-api-resource.php:125
+#: includes/api/legacy/v3/class-wc-api-resource.php:127
+msgid "You do not have permission to edit this %s"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-resource.php:103
+#: includes/api/legacy/v2/class-wc-api-resource.php:130
+#: includes/api/legacy/v3/class-wc-api-resource.php:132
+msgid "You do not have permission to delete this %s"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-resource.php:303
+#: includes/api/legacy/v2/class-wc-api-resource.php:374
+#: includes/api/legacy/v3/class-wc-api-resource.php:376
+msgid "Permanently deleted customer"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-resource.php:305
+#: includes/api/legacy/v2/class-wc-api-resource.php:376
+#: includes/api/legacy/v3/class-wc-api-resource.php:378
+msgid "The customer cannot be deleted"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-resource.php:313
+#: includes/api/legacy/v2/class-wc-api-products.php:442
+#: includes/api/legacy/v2/class-wc-api-resource.php:384
+#: includes/api/legacy/v3/class-wc-api-products.php:501
+#: includes/api/legacy/v3/class-wc-api-products.php:3020
+#: includes/api/legacy/v3/class-wc-api-resource.php:386
+msgid "This %s cannot be deleted"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-resource.php:316
+#: includes/api/legacy/v2/class-wc-api-products.php:451
+#: includes/api/legacy/v2/class-wc-api-resource.php:388
+#: includes/api/legacy/v3/class-wc-api-products.php:510
+#: includes/api/legacy/v3/class-wc-api-resource.php:389
+msgid "Permanently deleted %s"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-resource.php:322
+#: includes/api/legacy/v2/class-wc-api-products.php:455
+#: includes/api/legacy/v2/class-wc-api-products.php:2197
+#: includes/api/legacy/v2/class-wc-api-resource.php:392
+#: includes/api/legacy/v3/class-wc-api-products.php:514
+#: includes/api/legacy/v3/class-wc-api-products.php:854
+#: includes/api/legacy/v3/class-wc-api-products.php:1042
+#: includes/api/legacy/v3/class-wc-api-products.php:2759
+#: includes/api/legacy/v3/class-wc-api-products.php:3027
+#: includes/api/legacy/v3/class-wc-api-products.php:3334
+#: includes/api/legacy/v3/class-wc-api-resource.php:395
+#: includes/api/legacy/v3/class-wc-api-taxes.php:354
+#: includes/api/legacy/v3/class-wc-api-taxes.php:665
+msgid "Deleted %s"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-server.php:170
+#: includes/api/legacy/v2/class-wc-api-server.php:165
+#: includes/api/legacy/v3/class-wc-api-server.php:165
+msgid "Invalid authentication method"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-server.php:321
+#: includes/api/legacy/v2/class-wc-api-server.php:320
+#: includes/api/legacy/v3/class-wc-api-server.php:320
+msgid "Unsupported request method"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-server.php:338
+#: includes/api/legacy/v2/class-wc-api-server.php:339
+#: includes/api/legacy/v3/class-wc-api-server.php:339
+msgid "The handler for the route is invalid"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-server.php:373
+#: includes/api/legacy/v2/class-wc-api-server.php:376
+#: includes/api/legacy/v3/class-wc-api-server.php:376
+msgid "No route was found matching the URL and request method"
+msgstr ""
+
+#: includes/api/legacy/v1/class-wc-api-server.php:405
+#: includes/api/legacy/v2/class-wc-api-coupons.php:222
+#: includes/api/legacy/v2/class-wc-api-customers.php:358
+#: includes/api/legacy/v2/class-wc-api-products.php:224
+#: includes/api/legacy/v2/class-wc-api-products.php:1959
+#: includes/api/legacy/v2/class-wc-api-server.php:429
+#: includes/api/legacy/v3/class-wc-api-coupons.php:222
+#: includes/api/legacy/v3/class-wc-api-customers.php:359
+#: includes/api/legacy/v3/class-wc-api-products.php:273
+#: includes/api/legacy/v3/class-wc-api-products.php:2518
+#: includes/api/legacy/v3/class-wc-api-products.php:2905
+#: includes/api/legacy/v3/class-wc-api-server.php:429
+#: includes/api/legacy/v3/class-wc-api-taxes.php:575
+#: includes/class-wc-auth.php:174
+#. translators: %s: parameter
+msgid "Missing parameter %s"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-coupons.php:208
+#: includes/api/legacy/v2/class-wc-api-customers.php:344
+#: includes/api/legacy/v2/class-wc-api-orders.php:363
+#: includes/api/legacy/v2/class-wc-api-orders.php:1276
+#: includes/api/legacy/v2/class-wc-api-orders.php:1566
+#: includes/api/legacy/v2/class-wc-api-products.php:210
+#: includes/api/legacy/v2/class-wc-api-products.php:1995
+#: includes/api/legacy/v2/class-wc-api-webhooks.php:169
+#: includes/api/legacy/v3/class-wc-api-coupons.php:208
+#: includes/api/legacy/v3/class-wc-api-customers.php:345
+#: includes/api/legacy/v3/class-wc-api-orders.php:400
+#: includes/api/legacy/v3/class-wc-api-orders.php:1326
+#: includes/api/legacy/v3/class-wc-api-orders.php:1616
+#: includes/api/legacy/v3/class-wc-api-products.php:259
+#: includes/api/legacy/v3/class-wc-api-products.php:690
+#: includes/api/legacy/v3/class-wc-api-products.php:943
+#: includes/api/legacy/v3/class-wc-api-products.php:2554
+#: includes/api/legacy/v3/class-wc-api-products.php:2885
+#: includes/api/legacy/v3/class-wc-api-products.php:3220
+#: includes/api/legacy/v3/class-wc-api-taxes.php:184
+#: includes/api/legacy/v3/class-wc-api-taxes.php:564
+#: includes/api/legacy/v3/class-wc-api-webhooks.php:169
+msgid "No %1$s data specified to create %1$s"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-coupons.php:215
+#: includes/api/legacy/v3/class-wc-api-coupons.php:215
+msgid "You do not have permission to create coupons"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-coupons.php:257
+#: includes/api/legacy/v2/class-wc-api-coupons.php:358
+#: includes/api/legacy/v3/class-wc-api-coupons.php:257
+#: includes/api/legacy/v3/class-wc-api-coupons.php:358
+msgid "Invalid coupon type - the coupon type must be any of these: %s"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-coupons.php:317
+#: includes/api/legacy/v2/class-wc-api-customers.php:397
+#: includes/api/legacy/v2/class-wc-api-orders.php:501
+#: includes/api/legacy/v2/class-wc-api-orders.php:1335
+#: includes/api/legacy/v2/class-wc-api-orders.php:1645
+#: includes/api/legacy/v2/class-wc-api-products.php:317
+#: includes/api/legacy/v2/class-wc-api-products.php:2076
+#: includes/api/legacy/v2/class-wc-api-webhooks.php:250
+#: includes/api/legacy/v3/class-wc-api-coupons.php:317
+#: includes/api/legacy/v3/class-wc-api-customers.php:398
+#: includes/api/legacy/v3/class-wc-api-orders.php:543
+#: includes/api/legacy/v3/class-wc-api-orders.php:1385
+#: includes/api/legacy/v3/class-wc-api-orders.php:1695
+#: includes/api/legacy/v3/class-wc-api-products.php:371
+#: includes/api/legacy/v3/class-wc-api-products.php:767
+#: includes/api/legacy/v3/class-wc-api-products.php:988
+#: includes/api/legacy/v3/class-wc-api-products.php:2636
+#: includes/api/legacy/v3/class-wc-api-products.php:2948
+#: includes/api/legacy/v3/class-wc-api-products.php:3278
+#: includes/api/legacy/v3/class-wc-api-taxes.php:254
+#: includes/api/legacy/v3/class-wc-api-webhooks.php:250
+msgid "No %1$s data specified to edit %1$s"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-coupons.php:343
+#: includes/api/legacy/v2/class-wc-api-coupons.php:351
+#: includes/api/legacy/v3/class-wc-api-coupons.php:343
+#: includes/api/legacy/v3/class-wc-api-coupons.php:351
+msgid "Failed to update coupon"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-coupons.php:511
+#: includes/api/legacy/v2/class-wc-api-customers.php:775
+#: includes/api/legacy/v2/class-wc-api-orders.php:1760
+#: includes/api/legacy/v2/class-wc-api-products.php:2264
+#: includes/api/legacy/v3/class-wc-api-coupons.php:511
+#: includes/api/legacy/v3/class-wc-api-customers.php:765
+#: includes/api/legacy/v3/class-wc-api-orders.php:1810
+#: includes/api/legacy/v3/class-wc-api-products.php:3070
+#: includes/api/legacy/v3/class-wc-api-taxes.php:457
+msgid "No %1$s data specified to create/edit %1$s"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-customers.php:206
+#: includes/api/legacy/v2/class-wc-api-customers.php:209
+#: includes/api/legacy/v3/class-wc-api-customers.php:207
+#: includes/api/legacy/v3/class-wc-api-customers.php:210
+msgid "Invalid customer email"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-customers.php:369
+#: includes/api/legacy/v3/class-wc-api-customers.php:370
+#: includes/api/v1/class-wc-rest-customers-controller.php:340
+msgid "This resource cannot be created."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:370
+#: includes/api/legacy/v3/class-wc-api-orders.php:407
+msgid "You do not have permission to create orders"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:396
+#: includes/api/legacy/v3/class-wc-api-orders.php:433
+msgid "Cannot create order: %s"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:430
+#: includes/api/legacy/v3/class-wc-api-orders.php:472
+msgid "Payment method ID and title are required"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:446
+#: includes/api/legacy/v2/class-wc-api-orders.php:597
+#: includes/api/legacy/v3/class-wc-api-orders.php:488
+#: includes/api/legacy/v3/class-wc-api-orders.php:638
+msgid "Provided order currency is invalid."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:518
+#: includes/api/legacy/v2/class-wc-api-orders.php:1579
+#: includes/api/legacy/v3/class-wc-api-orders.php:560
+#: includes/api/legacy/v3/class-wc-api-orders.php:1629
+msgid "Order ID is invalid"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:859
+#: includes/api/legacy/v3/class-wc-api-orders.php:907
+msgid "Product ID or SKU is required"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:869
+#: includes/api/legacy/v3/class-wc-api-orders.php:917
+msgid "Product ID provided does not match this line item"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:884
+#: includes/api/legacy/v3/class-wc-api-orders.php:932
+msgid "The product variation is invalid"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:894
+#: includes/api/legacy/v3/class-wc-api-orders.php:942
+msgid "Product is invalid."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:899
+#: includes/api/legacy/v3/class-wc-api-orders.php:947
+msgid "Product quantity must be a positive float."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:904
+#: includes/api/legacy/v3/class-wc-api-orders.php:952
+msgid "Product quantity is required."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:943
+#: includes/api/legacy/v3/class-wc-api-orders.php:992
+msgid "Cannot create line item, try again."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:1010
+#: includes/api/legacy/v3/class-wc-api-orders.php:1060
+msgid "Shipping total must be a positive amount."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:1027
+#: includes/api/legacy/v3/class-wc-api-orders.php:1077
+msgid "Cannot create shipping method, try again."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:1048
+#: includes/api/legacy/v3/class-wc-api-orders.php:1098
+msgid "Cannot update shipping method, try again."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:1068
+#: includes/api/legacy/v3/class-wc-api-orders.php:1118
+msgid "Fee title is required"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:1079
+#: includes/api/legacy/v3/class-wc-api-orders.php:1129
+msgid "Fee tax class is required when fee is taxable."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:1098
+#: includes/api/legacy/v3/class-wc-api-orders.php:1148
+msgid "Cannot create fee, try again."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:1123
+#: includes/api/legacy/v3/class-wc-api-orders.php:1173
+msgid "Cannot update fee, try again."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:1141
+#: includes/api/legacy/v3/class-wc-api-orders.php:1191
+msgid "Coupon discount total must be a positive amount."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:1161
+#: includes/api/legacy/v3/class-wc-api-orders.php:1211
+msgid "Cannot create coupon, try again."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:1178
+#: includes/api/legacy/v3/class-wc-api-orders.php:1228
+msgid "Cannot update coupon, try again."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:1243
+#: includes/api/legacy/v2/class-wc-api-orders.php:1353
+#: includes/api/legacy/v2/class-wc-api-orders.php:1417
+#: includes/api/legacy/v3/class-wc-api-orders.php:1293
+#: includes/api/legacy/v3/class-wc-api-orders.php:1403
+#: includes/api/legacy/v3/class-wc-api-orders.php:1467
+msgid "Invalid order note ID"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:1249
+#: includes/api/legacy/v2/class-wc-api-orders.php:1360
+#: includes/api/legacy/v2/class-wc-api-orders.php:1424
+#: includes/api/legacy/v3/class-wc-api-orders.php:1299
+#: includes/api/legacy/v3/class-wc-api-orders.php:1410
+#: includes/api/legacy/v3/class-wc-api-orders.php:1474
+msgid "An order note with the provided ID could not be found"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:1283
+#: includes/api/legacy/v3/class-wc-api-orders.php:1333
+msgid "You do not have permission to create order notes"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:1298
+#: includes/api/legacy/v3/class-wc-api-orders.php:1348
+msgid "Order note is required"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:1307
+#: includes/api/legacy/v3/class-wc-api-orders.php:1357
+#: includes/api/v1/class-wc-rest-order-notes-controller.php:230
+msgid "Cannot create order note, please try again."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:1365
+#: includes/api/legacy/v2/class-wc-api-orders.php:1429
+#: includes/api/legacy/v3/class-wc-api-orders.php:1415
+#: includes/api/legacy/v3/class-wc-api-orders.php:1479
+msgid "The order note ID provided is not associated with the order"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:1436
+#: includes/api/legacy/v3/class-wc-api-orders.php:1486
+msgid "This order note cannot be deleted"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:1441
+#: includes/api/legacy/v3/class-wc-api-orders.php:1491
+msgid "Permanently deleted order note"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:1506
+#: includes/api/legacy/v2/class-wc-api-orders.php:1668
+#: includes/api/legacy/v2/class-wc-api-orders.php:1729
+#: includes/api/legacy/v3/class-wc-api-orders.php:1556
+#: includes/api/legacy/v3/class-wc-api-orders.php:1718
+#: includes/api/legacy/v3/class-wc-api-orders.php:1779
+msgid "An order refund with the provided ID could not be found."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:1573
+#: includes/api/legacy/v3/class-wc-api-orders.php:1623
+msgid "You do not have permission to create order refunds"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:1586
+#: includes/api/legacy/v3/class-wc-api-orders.php:1636
+msgid "Refund amount is required."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:1588
+#: includes/api/legacy/v3/class-wc-api-orders.php:1638
+msgid "Refund amount must be positive."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:1615
+#: includes/api/legacy/v3/class-wc-api-orders.php:1665
+#: includes/wc-order-functions.php:635
+msgid ""
+"An error occurred while attempting to create the refund using the payment "
+"gateway API."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-orders.php:1673
+#: includes/api/legacy/v2/class-wc-api-orders.php:1734
+#: includes/api/legacy/v3/class-wc-api-orders.php:1723
+#: includes/api/legacy/v3/class-wc-api-orders.php:1784
+msgid "The order refund ID provided is not associated with the order."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-products.php:217
+#: includes/api/legacy/v3/class-wc-api-products.php:266
+msgid "You do not have permission to create products"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-products.php:239
+#: includes/api/legacy/v2/class-wc-api-products.php:363
+#: includes/api/legacy/v3/class-wc-api-products.php:288
+#: includes/api/legacy/v3/class-wc-api-products.php:417
+msgid "Invalid product type - the product type must be any of these: %s"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-products.php:545
+#: includes/api/legacy/v2/class-wc-api-products.php:581
+#: includes/api/legacy/v3/class-wc-api-products.php:604
+#: includes/api/legacy/v3/class-wc-api-products.php:640
+msgid "You do not have permission to read product categories"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-products.php:576
+#: includes/api/legacy/v3/class-wc-api-products.php:635
+msgid "Invalid product category ID"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-products.php:587
+#: includes/api/legacy/v3/class-wc-api-products.php:646
+msgid "A product category with the provided ID could not be found"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-products.php:928
+#: includes/api/legacy/v3/class-wc-api-products.php:1413
+msgid "The SKU already exists on another product."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-products.php:1681
+#: includes/api/legacy/v3/class-wc-api-products.php:2215
+#: includes/wc-rest-functions.php:74
+msgid "Invalid URL %s."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-products.php:1693
+#: includes/api/legacy/v2/class-wc-api-products.php:1695
+#: includes/api/legacy/v3/class-wc-api-products.php:2227
+#: includes/api/legacy/v3/class-wc-api-products.php:2229
+#: includes/wc-rest-functions.php:86 includes/wc-rest-functions.php:88
+msgid "Error getting remote image %s."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-products.php:1693
+#: includes/api/legacy/v3/class-wc-api-products.php:2227
+#: includes/class-wc-auth.php:383 includes/wc-rest-functions.php:86
+#. translators: %s: error messase
+msgid "Error: %s."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-products.php:1716
+#: includes/api/legacy/v3/class-wc-api-products.php:2250
+#: includes/wc-rest-functions.php:109
+msgid "Invalid image type."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-products.php:1733
+#: includes/api/legacy/v3/class-wc-api-products.php:2267
+#: includes/wc-rest-functions.php:127
+msgid "Zero size file downloaded."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-products.php:1873
+#: includes/api/legacy/v2/class-wc-api-products.php:1917
+#: includes/api/legacy/v3/class-wc-api-products.php:2432
+#: includes/api/legacy/v3/class-wc-api-products.php:2476
 msgid "You do not have permission to read product attributes"
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:2577
-#: includes/api/class-wc-api-products.php:2945
-#: includes/api/v2/class-wc-api-products.php:2046
+#: includes/api/legacy/v2/class-wc-api-products.php:1912
+#: includes/api/legacy/v3/class-wc-api-products.php:2471
+#: includes/api/legacy/v3/class-wc-api-products.php:2839
 msgid "Invalid product attribute ID"
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:2592
-#: includes/api/class-wc-api-products.php:2836
-#: includes/api/class-wc-api-products.php:2889
-#: includes/api/class-wc-api-products.php:2956
-#: includes/api/class-wc-api-products.php:3004
-#: includes/api/class-wc-api-products.php:3068
-#: includes/api/class-wc-api-products.php:3119
-#: includes/api/v2/class-wc-api-products.php:2061
-#: includes/api/v2/class-wc-api-products.php:2303
+#: includes/api/legacy/v2/class-wc-api-products.php:1927
+#: includes/api/legacy/v2/class-wc-api-products.php:2169
+#: includes/api/legacy/v3/class-wc-api-products.php:2486
+#: includes/api/legacy/v3/class-wc-api-products.php:2730
+#: includes/api/legacy/v3/class-wc-api-products.php:2783
+#: includes/api/legacy/v3/class-wc-api-products.php:2850
+#: includes/api/legacy/v3/class-wc-api-products.php:2898
+#: includes/api/legacy/v3/class-wc-api-products.php:2962
+#: includes/api/legacy/v3/class-wc-api-products.php:3013
 msgid "A product attribute with the provided ID could not be found"
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:2637
-#: includes/api/v2/class-wc-api-products.php:2106
+#: includes/api/legacy/v2/class-wc-api-products.php:1972
+#: includes/api/legacy/v3/class-wc-api-products.php:2531
 msgid ""
 "Invalid product attribute type - the product attribute type must be any of "
 "these: %s"
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:2642
-#: includes/api/v2/class-wc-api-products.php:2111
+#: includes/api/legacy/v2/class-wc-api-products.php:1977
+#: includes/api/legacy/v3/class-wc-api-products.php:2536
 msgid ""
 "Invalid product attribute order_by type - the product attribute order_by "
 "type must be any of these: %s"
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:2667
-#: includes/api/class-wc-api-products.php:2998
-#: includes/api/v2/class-wc-api-products.php:2136
+#: includes/api/legacy/v2/class-wc-api-products.php:2002
+#: includes/api/legacy/v3/class-wc-api-products.php:2561
+#: includes/api/legacy/v3/class-wc-api-products.php:2892
 msgid "You do not have permission to create product attributes"
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:2750
-#: includes/api/class-wc-api-products.php:3062
-#: includes/api/v2/class-wc-api-products.php:2218
+#: includes/api/legacy/v2/class-wc-api-products.php:2084
+#: includes/api/legacy/v3/class-wc-api-products.php:2644
+#: includes/api/legacy/v3/class-wc-api-products.php:2956
 msgid "You do not have permission to edit product attributes"
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:2796
-#: includes/api/v2/class-wc-api-products.php:2264
+#: includes/api/legacy/v2/class-wc-api-products.php:2130
+#: includes/api/legacy/v3/class-wc-api-products.php:2690
 msgid "Could not edit the attribute"
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:2824
-#: includes/api/v2/class-wc-api-products.php:2291
+#: includes/api/legacy/v2/class-wc-api-products.php:2157
+#: includes/api/legacy/v3/class-wc-api-products.php:2718
 msgid "You do not have permission to delete product attributes"
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:2846
-#: includes/api/v2/class-wc-api-products.php:2313
+#: includes/api/legacy/v2/class-wc-api-products.php:2179
+#: includes/api/legacy/v3/class-wc-api-products.php:2740
 msgid "Could not delete the attribute"
 msgstr ""
 
-#: includes/api/class-wc-api-products.php:2883
-#: includes/api/class-wc-api-products.php:2950
-msgid "You do not have permission to read product attribute terms"
-msgstr ""
-
-#: includes/api/class-wc-api-products.php:2962
-msgid "A product attribute term with the provided ID could not be found"
-msgstr ""
-
-#: includes/api/class-wc-api-products.php:3113
-msgid "You do not have permission to delete product attribute terms"
-msgstr ""
-
-#: includes/api/class-wc-api-products.php:3251
-#: includes/api/class-wc-api-products.php:3286
-msgid "You do not have permission to read product shipping classes"
-msgstr ""
-
-#: includes/api/class-wc-api-products.php:3281
-msgid "Invalid product shipping class ID"
-msgstr ""
-
-#: includes/api/class-wc-api-products.php:3292
-msgid "A product shipping class with the provided ID could not be found"
-msgstr ""
-
-#: includes/api/class-wc-api-products.php:3330
-msgid "You do not have permission to create product shipping classes"
-msgstr ""
-
-#: includes/api/class-wc-api-products.php:3348
-msgid "Product shipping class parent is invalid"
-msgstr ""
-
-#: includes/api/class-wc-api-products.php:3389
-msgid "You do not have permission to edit product shipping classes"
-msgstr ""
-
-#: includes/api/class-wc-api-products.php:3401
-msgid "Could not edit the shipping class"
-msgstr ""
-
-#: includes/api/class-wc-api-products.php:3426
-msgid "You do not have permission to delete product shipping classes"
-msgstr ""
-
-#: includes/api/class-wc-api-products.php:3432
-msgid "Could not delete the shipping class"
-msgstr ""
-
-#: includes/api/class-wc-api-reports.php:321
-#: includes/api/v1/class-wc-api-reports.php:471
-#: includes/api/v2/class-wc-api-reports.php:321
-msgid "You do not have permission to read this report"
-msgstr ""
-
-#: includes/api/class-wc-api-resource.php:85
-#: includes/api/v1/class-wc-api-resource.php:74
-#: includes/api/v2/class-wc-api-resource.php:85
-msgid "Invalid %s ID"
-msgstr ""
-
-#: includes/api/class-wc-api-resource.php:94
-#: includes/api/v2/class-wc-api-resource.php:94
-msgid "No %s found with the ID equal to %s"
-msgstr ""
-
-#: includes/api/class-wc-api-resource.php:102
-#: includes/api/v1/class-wc-api-resource.php:86
-#: includes/api/v2/class-wc-api-resource.php:102
-msgid "Invalid %s"
-msgstr ""
-
-#: includes/api/class-wc-api-resource.php:110
-#: includes/api/v1/class-wc-api-resource.php:93
-#: includes/api/v2/class-wc-api-resource.php:110
-msgid "You do not have permission to read this %s"
-msgstr ""
-
-#: includes/api/class-wc-api-resource.php:115
-#: includes/api/v1/class-wc-api-resource.php:98
-#: includes/api/v2/class-wc-api-resource.php:115
-msgid "You do not have permission to edit this %s"
-msgstr ""
-
-#: includes/api/class-wc-api-resource.php:120
-#: includes/api/v1/class-wc-api-resource.php:103
-#: includes/api/v2/class-wc-api-resource.php:120
-msgid "You do not have permission to delete this %s"
-msgstr ""
-
-#: includes/api/class-wc-api-resource.php:366
-#: includes/api/v1/class-wc-api-resource.php:305
-#: includes/api/v2/class-wc-api-resource.php:366
-msgid "Permanently deleted customer"
-msgstr ""
-
-#: includes/api/class-wc-api-resource.php:368
-#: includes/api/v1/class-wc-api-resource.php:307
-#: includes/api/v2/class-wc-api-resource.php:368
-msgid "The customer cannot be deleted"
-msgstr ""
-
-#: includes/api/class-wc-api-server.php:164
-#: includes/api/v1/class-wc-api-server.php:170
-#: includes/api/v2/class-wc-api-server.php:164
-msgid "Invalid authentication method"
-msgstr ""
-
-#: includes/api/class-wc-api-server.php:318
-#: includes/api/v1/class-wc-api-server.php:321
-#: includes/api/v2/class-wc-api-server.php:318
-msgid "Unsupported request method"
-msgstr ""
-
-#: includes/api/class-wc-api-server.php:337
-#: includes/api/v1/class-wc-api-server.php:338
-#: includes/api/v2/class-wc-api-server.php:337
-msgid "The handler for the route is invalid"
-msgstr ""
-
-#: includes/api/class-wc-api-server.php:374
-#: includes/api/v1/class-wc-api-server.php:374
-#: includes/api/v2/class-wc-api-server.php:374
-msgid "No route was found matching the URL and request method"
-msgstr ""
-
-#: includes/api/class-wc-api-taxes.php:128
-msgid "You do not have permission to read tax rate"
-msgstr ""
-
-#: includes/api/class-wc-api-taxes.php:135
-msgid "A tax rate with the provided ID could not be found"
-msgstr ""
-
-#: includes/api/class-wc-api-taxes.php:189
-msgid "You do not have permission to create tax rates"
-msgstr ""
-
-#: includes/api/class-wc-api-taxes.php:259
-msgid "You do not have permission to edit tax rates"
-msgstr ""
-
-#: includes/api/class-wc-api-taxes.php:343
-msgid "You do not have permission to delete tax rates"
-msgstr ""
-
-#: includes/api/class-wc-api-taxes.php:351
-msgid "Could not delete the tax rate"
-msgstr ""
-
-#: includes/api/class-wc-api-taxes.php:373
-msgid "You do not have permission to read the taxes count"
-msgstr ""
-
-#: includes/api/class-wc-api-taxes.php:526
-msgid "You do not have permission to read tax classes"
-msgstr ""
-
-#: includes/api/class-wc-api-taxes.php:534
-#: includes/cli/class-wc-cli-tax.php:434
-msgid "Standard Rate"
-msgstr ""
-
-#: includes/api/class-wc-api-taxes.php:569
-msgid "You do not have permission to create tax classes"
-msgstr ""
-
-#: includes/api/class-wc-api-taxes.php:593
-#: includes/cli/class-wc-cli-tax.php:148
-msgid "Tax class already exists"
-msgstr ""
-
-#: includes/api/class-wc-api-taxes.php:629
-msgid "You do not have permission to delete tax classes"
-msgstr ""
-
-#: includes/api/class-wc-api-taxes.php:645
-msgid "Could not delete the tax class"
-msgstr ""
-
-#: includes/api/class-wc-api-taxes.php:666
-msgid "You do not have permission to read the tax classes count"
-msgstr ""
-
-#: includes/api/class-wc-api-webhooks.php:143
-#: includes/api/v2/class-wc-api-webhooks.php:143
-msgid "You do not have permission to read the webhooks count"
-msgstr ""
-
-#: includes/api/class-wc-api-webhooks.php:176
-#: includes/api/v2/class-wc-api-webhooks.php:176
-msgid "You do not have permission to create webhooks"
-msgstr ""
-
-#: includes/api/class-wc-api-webhooks.php:183
-#: includes/api/v2/class-wc-api-webhooks.php:183
-msgid "Webhook topic is required and must be valid"
-msgstr ""
-
-#: includes/api/class-wc-api-webhooks.php:188
-#: includes/api/class-wc-api-webhooks.php:279
-#: includes/api/v2/class-wc-api-webhooks.php:188
-#: includes/api/v2/class-wc-api-webhooks.php:279
-msgid "Webhook delivery URL must be a valid URL starting with http:// or https://"
-msgstr ""
-
-#: includes/api/class-wc-api-webhooks.php:203
-#: includes/api/v2/class-wc-api-webhooks.php:203
-msgid "Cannot create webhook: %s"
-msgstr ""
-
-#: includes/api/class-wc-api-webhooks.php:268
-#: includes/api/v2/class-wc-api-webhooks.php:268
-msgid "Webhook topic must be valid"
-msgstr ""
-
-#: includes/api/class-wc-api-webhooks.php:440
-#: includes/api/v2/class-wc-api-webhooks.php:437
-msgid "Invalid webhook delivery ID"
-msgstr ""
-
-#: includes/api/class-wc-api-webhooks.php:448
-#: includes/api/v2/class-wc-api-webhooks.php:445
-msgid "Invalid webhook delivery"
-msgstr ""
-
-#: includes/api/v1/class-wc-api-authentication.php:93
-#: includes/api/v2/class-wc-api-authentication.php:93
-msgid "Consumer Key is missing"
-msgstr ""
-
-#: includes/api/v1/class-wc-api-authentication.php:109
-#: includes/api/v2/class-wc-api-authentication.php:109
-msgid "Consumer Secret is missing"
-msgstr ""
-
-#: includes/api/v2/class-wc-api-products.php:2352
+#: includes/api/legacy/v2/class-wc-api-products.php:2218
 msgid "Invalid product SKU"
 msgstr ""
 
-#: includes/class-wc-ajax.php:211
+#: includes/api/legacy/v2/class-wc-api-resource.php:104
+#: includes/api/legacy/v3/class-wc-api-resource.php:106
+msgid "No %1$s found with the ID equal to %2$s"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-webhooks.php:143
+#: includes/api/legacy/v3/class-wc-api-webhooks.php:143
+msgid "You do not have permission to read the webhooks count"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-webhooks.php:176
+#: includes/api/legacy/v3/class-wc-api-webhooks.php:176
+msgid "You do not have permission to create webhooks."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-webhooks.php:183
+#: includes/api/legacy/v3/class-wc-api-webhooks.php:183
+#: includes/api/v1/class-wc-rest-webhooks-controller.php:160
+msgid "Webhook topic is required and must be valid."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-webhooks.php:188
+#: includes/api/legacy/v2/class-wc-api-webhooks.php:284
+#: includes/api/legacy/v3/class-wc-api-webhooks.php:188
+#: includes/api/legacy/v3/class-wc-api-webhooks.php:284
+msgid "Webhook delivery URL must be a valid URL starting with http:// or https://"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-webhooks.php:205
+#: includes/api/legacy/v3/class-wc-api-webhooks.php:205
+msgid "Cannot create webhook: %s"
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-webhooks.php:273
+#: includes/api/legacy/v3/class-wc-api-webhooks.php:273
+#: includes/api/v1/class-wc-rest-webhooks-controller.php:254
+msgid "Webhook topic must be valid."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-webhooks.php:442
+#: includes/api/legacy/v3/class-wc-api-webhooks.php:445
+msgid "Invalid webhook delivery ID."
+msgstr ""
+
+#: includes/api/legacy/v2/class-wc-api-webhooks.php:450
+#: includes/api/legacy/v3/class-wc-api-webhooks.php:453
+msgid "Invalid webhook delivery."
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-authentication.php:114
+msgid "Consumer Secret is invalid."
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-products.php:695
+msgid "You do not have permission to create product categories"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-products.php:715
+msgid "Product category parent is invalid"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-products.php:775
+msgid "You do not have permission to edit product categories"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-products.php:805
+msgid "Could not edit the category"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-products.php:838
+msgid "You do not have permission to delete product category"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-products.php:844
+msgid "Could not delete the category"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-products.php:871
+#: includes/api/legacy/v3/class-wc-api-products.php:907
+msgid "You do not have permission to read product tags"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-products.php:902
+msgid "Invalid product tag ID"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-products.php:913
+msgid "A product tag with the provided ID could not be found"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-products.php:948
+msgid "You do not have permission to create product tags"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-products.php:996
+msgid "You do not have permission to edit product tags"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-products.php:1008
+msgid "Could not edit the tag"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-products.php:1031
+msgid "You do not have permission to delete product tag"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-products.php:1037
+msgid "Could not delete the tag"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-products.php:2777
+#: includes/api/legacy/v3/class-wc-api-products.php:2844
+msgid "You do not have permission to read product attribute terms"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-products.php:2856
+msgid "A product attribute term with the provided ID could not be found"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-products.php:3007
+msgid "You do not have permission to delete product attribute terms"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-products.php:3146
+#: includes/api/legacy/v3/class-wc-api-products.php:3181
+msgid "You do not have permission to read product shipping classes"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-products.php:3176
+msgid "Invalid product shipping class ID"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-products.php:3187
+msgid "A product shipping class with the provided ID could not be found"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-products.php:3225
+msgid "You do not have permission to create product shipping classes"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-products.php:3243
+msgid "Product shipping class parent is invalid"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-products.php:3286
+msgid "You do not have permission to edit product shipping classes"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-products.php:3298
+msgid "Could not edit the shipping class"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-products.php:3323
+msgid "You do not have permission to delete product shipping classes"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-products.php:3329
+msgid "Could not delete the shipping class"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-taxes.php:128
+msgid "You do not have permission to read tax rate"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-taxes.php:135
+msgid "A tax rate with the provided ID could not be found"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-taxes.php:189
+msgid "You do not have permission to create tax rates"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-taxes.php:259
+msgid "You do not have permission to edit tax rates"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-taxes.php:343
+msgid "You do not have permission to delete tax rates"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-taxes.php:351
+msgid "Could not delete the tax rate"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-taxes.php:373
+msgid "You do not have permission to read the taxes count"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-taxes.php:526
+msgid "You do not have permission to read tax classes"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-taxes.php:534
+#: includes/api/v1/class-wc-rest-tax-classes-controller.php:136
+msgid "Standard rate"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-taxes.php:569
+msgid "You do not have permission to create tax classes"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-taxes.php:593
+msgid "Tax class already exists"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-taxes.php:631
+msgid "You do not have permission to delete tax classes"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-taxes.php:647
+msgid "Could not delete the tax class"
+msgstr ""
+
+#: includes/api/legacy/v3/class-wc-api-taxes.php:681
+msgid "You do not have permission to read the tax classes count"
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-coupons-controller.php:455
+msgid "UTC DateTime when the coupon expires."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-customers-controller.php:58
+msgid "New user email address."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-customers-controller.php:62
+msgid "New user username."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-customers-controller.php:67
+msgid "New user password."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-customers-controller.php:109
+msgid "ID to reassign posts to."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-customers-controller.php:323
+#: includes/api/v1/class-wc-rest-tax-classes-controller.php:182
+#: includes/api/v1/class-wc-rest-taxes-controller.php:362
+msgid "Cannot create existing resource."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-customers-controller.php:381
+#: includes/api/v1/class-wc-rest-customers-controller.php:402
+#: includes/api/v1/class-wc-rest-order-notes-controller.php:271
+#: includes/api/v1/class-wc-rest-order-notes-controller.php:304
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:239
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:320
+#: includes/api/v1/class-wc-rest-taxes-controller.php:398
+#: includes/api/v1/class-wc-rest-taxes-controller.php:418
+#: includes/api/v1/class-wc-rest-taxes-controller.php:461
+#: includes/api/v1/class-wc-rest-webhook-deliveries.php:154
+msgid "Invalid resource ID."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-customers-controller.php:406
+msgid "Email address is invalid."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-customers-controller.php:410
+msgid "Username isn't editable."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-customers-controller.php:464
+msgid "Customers do not support trashing."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-customers-controller.php:469
+#: includes/api/v1/class-wc-rest-tax-classes-controller.php:243
+msgid "Invalid resource id."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-customers-controller.php:474
+msgid "Invalid resource id for reassignment."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-customers-controller.php:636
+msgid "The date the customer was created, as GMT."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-customers-controller.php:683
+msgid "Last order data."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-customers-controller.php:689
+msgid "Last order ID."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-customers-controller.php:695
+msgid "The date of the customer last order, as GMT."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-customers-controller.php:741
+#: includes/api/v1/class-wc-rest-customers-controller.php:804
+#: includes/api/v1/class-wc-rest-orders-controller.php:1036
+#: includes/api/v1/class-wc-rest-orders-controller.php:1099
+msgid "Address line 1."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-customers-controller.php:746
+#: includes/api/v1/class-wc-rest-customers-controller.php:809
+#: includes/api/v1/class-wc-rest-orders-controller.php:1041
+#: includes/api/v1/class-wc-rest-orders-controller.php:1104
+msgid "Address line 2."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-customers-controller.php:872
+#: includes/api/v1/class-wc-rest-taxes-controller.php:665
+msgid "Limit result set to specific IDs."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-customers-controller.php:908
+msgid "Limit result set to resources with a specific email."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-customers-controller.php:914
+msgid "Limit result set to resources with a specific role."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-order-notes-controller.php:292
+#: includes/api/v1/class-wc-rest-webhooks-controller.php:326
+msgid "Webhooks do not support trashing."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-order-notes-controller.php:410
+msgid "Order note."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-order-notes-controller.php:415
+msgid ""
+"Shows/define if the note is only for reference or for the customer (the "
+"user will be notified)."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:288
+msgid "Order is invalid"
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:469
+#: includes/api/v1/class-wc-rest-orders-controller.php:1294
+msgid "Line item meta data."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-order-refunds-controller.php:483
+#: includes/api/v1/class-wc-rest-orders-controller.php:1308
+msgid "Meta label."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-product-attribute-terms-controller.php:46
+#: includes/api/v1/class-wc-rest-product-attribute-terms-controller.php:78
+#: includes/api/v1/class-wc-rest-product-attribute-terms-controller.php:114
+msgid "Unique identifier for the attribute of the terms."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-product-attribute-terms-controller.php:201
+msgid "Term name."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-product-attributes-controller.php:141
+msgid "Sorry, you cannot create new resource."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-product-attributes-controller.php:373
+msgid "Could not edit the attribute."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-product-attributes-controller.php:558
+msgid "Type of attribute."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-product-attributes-controller.php:565
+msgid "Default sort order."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-product-attributes-controller.php:572
+msgid "Enable/Disable attribute archives."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:68
+msgid "Review content."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:73
+msgid "Name of the reviewer."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:78
+msgid "Email of the reviewer."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:193
+msgid "Sorry, you cannot delete this resource."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:208
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:233
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:259
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:314
+msgid "Invalid product ID."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:276
+msgid "Creating product review failed."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:327
+msgid "Updating product review failed."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:364
+msgid "Invalid product review ID."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:384
+msgid "The product review does not support trashing."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:388
+msgid "The comment has already been trashed."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-product-reviews-controller.php:395
+msgid "The product review cannot be deleted."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-product-shipping-classes-controller.php:100
+msgid "Shipping class name."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-products-controller.php:1641
+#: includes/api/v1/class-wc-rest-webhooks-controller.php:332
+msgid "Invalid post ID."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-products-controller.php:1829
+#: includes/api/v1/class-wc-rest-products-controller.php:2314
+msgid "Start date of sale price."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-products-controller.php:1834
+#: includes/api/v1/class-wc-rest-products-controller.php:2319
+msgid "End data of sale price."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-products-controller.php:1913
+msgid "Download type, this controls the schema on the front-end."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-products-controller.php:2261
+msgid "List of variations."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-products-controller.php:2268
+msgid "Variation ID."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-products-controller.php:2336
+msgid "If the variation is visible."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-report-sales-controller.php:292
+msgid "Gross sales in the period."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-report-sales-controller.php:298
+msgid "Net sales in the period."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-report-sales-controller.php:304
+msgid "Average net daily sales."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-report-sales-controller.php:310
+msgid "Total of orders placed."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-report-sales-controller.php:316
+msgid "Total of items purchased."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-report-sales-controller.php:322
+msgid "Total charged for taxes."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-report-sales-controller.php:328
+msgid "Total charged for shipping."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-report-sales-controller.php:334
+msgid "Total of refunded orders."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-report-sales-controller.php:340
+msgid "Total of coupons used."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-report-sales-controller.php:346
+msgid "Group type."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-report-sales-controller.php:352
+msgid "Totals."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-report-sales-controller.php:375
+msgid "Report period."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-report-sales-controller.php:383
+#. translators: %s: date format
+msgid ""
+"Return sales for a specific start date, the date need to be in the %s "
+"format."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-report-sales-controller.php:391
+#. translators: %s: date format
+msgid "Return sales for a specific end date, the date need to be in the %s format."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-report-top-sellers-controller.php:164
+msgid "Total number of purchases."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-reports-controller.php:79
+msgid "List of sales reports."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-reports-controller.php:83
+msgid "List of top sellers products."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-reports-controller.php:147
+msgid "An alphanumeric identifier for the resource."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-reports-controller.php:153
+msgid "A human-readable description of the resource."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-tax-classes-controller.php:62
+msgid "Unique slug for the resource."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-tax-classes-controller.php:223
+#: includes/api/v1/class-wc-rest-taxes-controller.php:455
+msgid "Taxes do not support trashing."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-tax-classes-controller.php:338
+msgid "Tax class name."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-taxes-controller.php:580
+msgid "Country ISO 3166 code."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-taxes-controller.php:585
+msgid "State code."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-taxes-controller.php:590
+msgid "Postcode / ZIP."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-taxes-controller.php:600
+msgid "Tax rate."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-taxes-controller.php:605
+msgid "Tax rate name."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-taxes-controller.php:610
+msgid "Tax priority."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-taxes-controller.php:616
+msgid "Whether or not this is a compound rate."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-taxes-controller.php:622
+msgid "Whether or not this tax rate also gets applied to shipping."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-taxes-controller.php:628
+msgid "Indicates the order that will appear in queries."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-taxes-controller.php:699
+msgid "Sort by tax class."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-webhook-deliveries.php:46
+#: includes/api/v1/class-wc-rest-webhook-deliveries.php:62
+msgid "Unique identifier for the webhook."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-webhook-deliveries.php:122
+#: includes/api/v1/class-wc-rest-webhook-deliveries.php:148
+msgid "Invalid webhook ID."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-webhooks-controller.php:77
+msgid "Webhook delivery URL."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-webhooks-controller.php:82
+msgid "Webhook secret."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-webhooks-controller.php:165
+#: includes/api/v1/class-wc-rest-webhooks-controller.php:263
+msgid "Webhook delivery URL must be a valid URL starting with http:// or https://."
+msgstr ""
+
+#: includes/api/v1/class-wc-rest-webhooks-controller.php:584
+msgid "Limit result set to webhooks assigned a specific status."
+msgstr ""
+
+#: includes/class-wc-ajax.php:206
 msgid "Sorry there was a problem removing this coupon."
 msgstr ""
 
-#: includes/class-wc-ajax.php:217
+#: includes/class-wc-ajax.php:209
 msgid "Coupon has been removed."
 msgstr ""
 
-#: includes/class-wc-ajax.php:268
+#: includes/class-wc-ajax.php:253
 msgid "Sorry, your session has expired."
 msgstr ""
 
-#: includes/class-wc-ajax.php:268
-msgid "Return to homepage"
+#: includes/class-wc-ajax.php:253 templates/cart/cart-empty.php:36
+msgid "Return to shop"
 msgstr ""
 
-#: includes/class-wc-ajax.php:1377
+#: includes/class-wc-ajax.php:756
+msgid "Invalid order"
+msgstr ""
+
+#: includes/class-wc-ajax.php:947
+msgid "Item %1$s stock reduced from %2$s to %3$s."
+msgstr ""
+
+#: includes/class-wc-ajax.php:954
 msgid ""
 "No products had their stock reduced - they may not have stock management "
 "enabled."
 msgstr ""
 
-#: includes/class-wc-ajax.php:1419
-msgid "Item %s stock increased from %s to %s."
+#: includes/class-wc-ajax.php:987
+msgid "Item %1$s stock increased from %2$s to %3$s."
 msgstr ""
 
-#: includes/class-wc-ajax.php:1429
+#: includes/class-wc-ajax.php:994
 msgid ""
 "No products had their stock increased - they may not have stock management "
 "enabled."
 msgstr ""
 
-#: includes/class-wc-ajax.php:1448
-msgid "Value"
-msgstr ""
-
-#: includes/class-wc-ajax.php:2157
+#: includes/class-wc-ajax.php:1358
 msgid "Invalid refund amount"
 msgstr ""
 
-#: includes/class-wc-ajax.php:2202
-msgid "Refund failed"
-msgstr ""
-
-#: includes/class-wc-ajax.php:2217
-msgid "Item #%s stock increased from %s to %s."
-msgstr ""
-
-#: includes/class-wc-ajax.php:2306
+#: includes/class-wc-ajax.php:1455
 msgid "Description is missing."
 msgstr ""
 
-#: includes/class-wc-ajax.php:2309
+#: includes/class-wc-ajax.php:1458
 msgid "User is missing."
 msgstr ""
 
-#: includes/class-wc-ajax.php:2312
+#: includes/class-wc-ajax.php:1461
 msgid "Permissions is missing."
 msgstr ""
 
-#: includes/class-wc-ajax.php:2341
+#: includes/class-wc-ajax.php:1490
 msgid "API Key updated successfully."
 msgstr ""
 
-#: includes/class-wc-ajax.php:2372
+#: includes/class-wc-ajax.php:1520
 msgid ""
 "API Key generated successfully. Make sure to copy your new API keys now. "
 "You won't be able to see it again!"
 msgstr ""
 
-#: includes/class-wc-ajax.php:2589
+#: includes/class-wc-ajax.php:1602
 msgid "Dismiss this notice."
 msgstr ""
 
-#: includes/class-wc-auth.php:98
+#: includes/class-wc-auth.php:97 includes/class-wc-post-types.php:388
 msgid "View coupons"
 msgstr ""
 
-#: includes/class-wc-auth.php:99
+#: includes/class-wc-auth.php:98
 msgid "View customers"
 msgstr ""
 
-#: includes/class-wc-auth.php:100
+#: includes/class-wc-auth.php:99
 msgid "View orders and sales reports"
 msgstr ""
 
-#: includes/class-wc-auth.php:101 includes/class-wc-product-grouped.php:41
+#: includes/class-wc-auth.php:100 includes/class-wc-product-grouped.php:43
 msgid "View products"
 msgstr ""
 
-#: includes/class-wc-auth.php:104 includes/class-wc-auth.php:111
+#: includes/class-wc-auth.php:103 includes/class-wc-auth.php:110
 msgid "Create webhooks"
 msgstr ""
 
-#: includes/class-wc-auth.php:105
+#: includes/class-wc-auth.php:104
 msgid "Create coupons"
 msgstr ""
 
-#: includes/class-wc-auth.php:106
+#: includes/class-wc-auth.php:105
 msgid "Create customers"
 msgstr ""
 
-#: includes/class-wc-auth.php:107
+#: includes/class-wc-auth.php:106
 msgid "Create orders"
 msgstr ""
 
-#: includes/class-wc-auth.php:108
+#: includes/class-wc-auth.php:107
 msgid "Create products"
 msgstr ""
 
-#: includes/class-wc-auth.php:112
+#: includes/class-wc-auth.php:111
 msgid "View and manage coupons"
 msgstr ""
 
-#: includes/class-wc-auth.php:113
+#: includes/class-wc-auth.php:112
 msgid "View and manage customers"
 msgstr ""
 
-#: includes/class-wc-auth.php:114
+#: includes/class-wc-auth.php:113
 msgid "View and manage orders and sales reports"
 msgstr ""
 
-#: includes/class-wc-auth.php:115
+#: includes/class-wc-auth.php:114
 msgid "View and manage products"
 msgstr ""
 
-#: includes/class-wc-auth.php:164
+#: includes/class-wc-auth.php:180
+#. translators: %s: scope
 msgid "Invalid scope %s"
 msgstr ""
 
-#: includes/class-wc-auth.php:169
+#: includes/class-wc-auth.php:188
+#. translators: %s: url
 msgid "The %s is not a valid URL"
 msgstr ""
 
-#: includes/class-wc-auth.php:174
+#: includes/class-wc-auth.php:195
 msgid "The callback_url need to be over SSL"
 msgstr ""
 
-#: includes/class-wc-auth.php:192
-msgid "%s - API %s (created on %s at %s)."
+#: includes/class-wc-auth.php:215
+#. translators: 1: app name 2: scope 3: date 4: time
+msgid "%1$s - API %2$s (created on %3$s at %4$s)."
 msgstr ""
 
-#: includes/class-wc-auth.php:254
+#: includes/class-wc-auth.php:282
 msgid ""
 "An error occurred in the request and at the time were unable to send the "
 "consumer data"
 msgstr ""
 
-#: includes/class-wc-auth.php:296
+#: includes/class-wc-auth.php:324
 msgid "API disabled!"
 msgstr ""
 
-#: includes/class-wc-auth.php:338
+#: includes/class-wc-auth.php:366
 msgid "Invalid nonce verification"
 msgstr ""
 
-#: includes/class-wc-auth.php:349
+#: includes/class-wc-auth.php:377
 msgid "You do not have permissions to access this page!"
 msgstr ""
 
-#: includes/class-wc-auth.php:354
-msgid "Access Denied"
+#: includes/class-wc-auth.php:383
+msgid "Access denied"
 msgstr ""
 
 #: includes/class-wc-breadcrumb.php:119
@@ -13178,1078 +17286,1330 @@ msgstr ""
 msgid "Page %d"
 msgstr ""
 
-#: includes/class-wc-cache-helper.php:219
+#: includes/class-wc-cache-helper.php:223
 msgid ""
 "In order for <strong>database caching</strong> to work with WooCommerce you "
-"must add <code>_wc_session_</code> to the \"Ignored Query Strings\" option "
-"in W3 Total Cache settings <a href=\"%s\">here</a>."
+"must add %1$s to the \"Ignored Query Strings\" option in <a "
+"href=\"%2$s\">W3 Total Cache settings</a>."
 msgstr ""
 
 #: includes/class-wc-cart.php:240
+#. translators: %s: product name
 msgid ""
 "%s has been removed from your cart because it can no longer be purchased. "
 "Please contact us if you need assistance."
 msgstr ""
 
-#: includes/class-wc-cart.php:459
+#: includes/class-wc-cart.php:453
 msgid "An item which is no longer available was removed from your cart."
 msgstr ""
 
-#: includes/class-wc-cart.php:485
+#: includes/class-wc-cart.php:480
+#. translators: %s: product name
 msgid ""
 "Sorry, \"%s\" is not in stock. Please edit your cart and try again. We "
-"apologise for any inconvenience caused."
+"apologize for any inconvenience caused."
 msgstr ""
 
-#: includes/class-wc-cart.php:499
+#: includes/class-wc-cart.php:493
+#. translators: 1: product name 2: quantity in stock
 msgid ""
-"Sorry, we do not have enough \"%s\" in stock to fulfill your order (%s in "
-"stock). Please edit your cart and try again. We apologise for any "
+"Sorry, we do not have enough \"%1$s\" in stock to fulfill your order (%2$s "
+"in stock). Please edit your cart and try again. We apologize for any "
 "inconvenience caused."
 msgstr ""
 
-#: includes/class-wc-cart.php:534
+#: includes/class-wc-cart.php:522
+#. translators: 1: product name 2: minutes
 msgid ""
-"Sorry, we do not have enough \"%s\" in stock to fulfill your order right "
-"now. Please try again in %d minutes or edit your cart and try again. We "
-"apologise for any inconvenience caused."
+"Sorry, we do not have enough \"%1$s\" in stock to fulfill your order right "
+"now. Please try again in %2$d minutes or edit your cart and try again. We "
+"apologize for any inconvenience caused."
 msgstr ""
 
-#: includes/class-wc-cart.php:697
+#: includes/class-wc-cart.php:681
 msgid "Get cart should not be called before the wp_loaded action."
 msgstr ""
 
-#: includes/class-wc-cart.php:904 includes/class-wc-cart.php:939
-#: includes/class-wc-frontend-scripts.php:307 includes/wc-cart-functions.php:85
-#: templates/cart/mini-cart.php:84
-msgid "View Cart"
+#: includes/class-wc-cart.php:912 includes/class-wc-frontend-scripts.php:523
+#: includes/wc-cart-functions.php:115 includes/wc-template-functions.php:1421
+#. translators: %s: product name
+msgid "View cart"
 msgstr ""
 
-#: includes/class-wc-cart.php:904
-msgid "You cannot add another &quot;%s&quot; to your cart."
+#: includes/class-wc-cart.php:912
+msgid "You cannot add another \"%s\" to your cart."
 msgstr ""
 
-#: includes/class-wc-cart.php:910
+#: includes/class-wc-cart.php:918
 msgid "Sorry, this product cannot be purchased."
 msgstr ""
 
-#: includes/class-wc-cart.php:915
+#: includes/class-wc-cart.php:923
 msgid ""
 "You cannot add &quot;%s&quot; to the cart because the product is out of "
 "stock."
 msgstr ""
 
-#: includes/class-wc-cart.php:919
+#: includes/class-wc-cart.php:928
+#. translators: 1: product name 2: quantity in stock
 msgid ""
-"You cannot add that amount of &quot;%s&quot; to the cart because there is "
-"not enough stock (%s remaining)."
+"You cannot add that amount of &quot;%1$s&quot; to the cart because there is "
+"not enough stock (%2$s remaining)."
+msgstr ""
+
+#: includes/class-wc-cart.php:939
+msgid "View Cart"
 msgstr ""
 
 #: includes/class-wc-cart.php:940
 msgid ""
-"You cannot add that amount to the cart &mdash; we have %s in stock and you "
-"already have %s in your cart."
+"You cannot add that amount to the cart &mdash; we have %1$s in stock and "
+"you already have %2$s in your cart."
 msgstr ""
 
-#: includes/class-wc-checkout.php:106
+#: includes/class-wc-checkout.php:195
+msgid "Notes about your order, e.g. special notes for delivery."
+msgstr ""
+
+#: includes/class-wc-checkout.php:202
 msgid "Account username"
 msgstr ""
 
-#: includes/class-wc-checkout.php:115
+#: includes/class-wc-checkout.php:211
 msgid "Account password"
 msgstr ""
 
-#: includes/class-wc-checkout.php:202 includes/class-wc-checkout.php:213
-#: includes/class-wc-checkout.php:238 includes/class-wc-checkout.php:250
-#: includes/class-wc-checkout.php:263 includes/class-wc-checkout.php:274
-#: includes/class-wc-checkout.php:281
-msgid "Error %d: Unable to create order. Please try again."
+#: includes/class-wc-checkout.php:213 templates/auth/form-login.php:39
+#: templates/global/form-login.php:39 templates/myaccount/form-login.php:48
+#: templates/myaccount/form-login.php:98
+msgid "Password"
 msgstr ""
 
-#: includes/class-wc-checkout.php:350
-msgid "We were unable to process your order, please try again."
+#: includes/class-wc-checkout.php:593
+#. translators: %s: field name
+msgid "Shipping %s"
 msgstr ""
 
-#: includes/class-wc-checkout.php:363
-msgid ""
-"Sorry, your session has expired. <a href=\"%s\" "
-"class=\"wc-backward\">Return to homepage</a>"
+#: includes/class-wc-checkout.php:597
+#. translators: %s: field name
+msgid "Billing %s"
 msgstr ""
 
-#: includes/class-wc-checkout.php:443 includes/class-wc-form-handler.php:85
-#: includes/class-wc-form-handler.php:184
-msgid "is a required field."
-msgstr ""
-
-#: includes/class-wc-checkout.php:456 includes/class-wc-form-handler.php:98
+#: includes/class-wc-checkout.php:606 includes/class-wc-form-handler.php:114
 #: includes/shortcodes/class-wc-shortcode-cart.php:27
-msgid "Please enter a valid postcode/ZIP."
+msgid "Please enter a valid postcode / ZIP."
 msgstr ""
 
-#: includes/class-wc-checkout.php:465 includes/class-wc-form-handler.php:107
-msgid "is not a valid phone number."
+#: includes/class-wc-checkout.php:615 includes/class-wc-form-handler.php:123
+#. translators: %s: phone number
+msgid "%s is not a valid phone number."
 msgstr ""
 
-#: includes/class-wc-checkout.php:471 includes/class-wc-form-handler.php:114
-msgid "is not a valid email address."
+#: includes/class-wc-checkout.php:624 includes/class-wc-form-handler.php:130
+#. translators: %s: email address
+msgid "%s is not a valid email address."
 msgstr ""
 
-#: includes/class-wc-checkout.php:489
-msgid "is not valid. Please enter one of the following:"
+#: includes/class-wc-checkout.php:642
+#. translators: 1: state field 2: valid states
+msgid "%1$s is not valid. Please enter one of the following: %2$s"
 msgstr ""
 
-#: includes/class-wc-checkout.php:545 includes/class-wc-form-handler.php:294
+#: includes/class-wc-checkout.php:649 includes/class-wc-form-handler.php:101
+#: includes/class-wc-form-handler.php:202
+#. translators: %s: field name
+msgid "%s is a required field."
+msgstr ""
+
+#: includes/class-wc-checkout.php:667 includes/class-wc-form-handler.php:307
 msgid "You must accept our Terms &amp; Conditions."
 msgstr ""
 
-#: includes/class-wc-checkout.php:551
+#: includes/class-wc-checkout.php:674
+msgid "Please enter an address to continue."
+msgstr ""
+
+#: includes/class-wc-checkout.php:676
 msgid ""
 "Unfortunately <strong>we do not ship %s</strong>. Please enter an "
 "alternative shipping address."
 msgstr ""
 
-#: includes/class-wc-checkout.php:560
-msgid "Invalid shipping method."
+#: includes/class-wc-checkout.php:682
+msgid ""
+"No shipping method has been selected. Please double check your address, or "
+"contact us if you need any help."
 msgstr ""
 
-#: includes/class-wc-checkout.php:572 includes/class-wc-form-handler.php:304
+#: includes/class-wc-checkout.php:692 includes/class-wc-form-handler.php:317
+#: includes/class-wc-form-handler.php:399
+#: includes/class-wc-form-handler.php:423
 msgid "Invalid payment method."
 msgstr ""
 
-#: includes/class-wc-comments.php:194
+#: includes/class-wc-checkout.php:899
+msgid "We were unable to process your order, please try again."
+msgstr ""
+
+#: includes/class-wc-checkout.php:908
+msgid ""
+"Sorry, your session has expired. <a href=\"%s\" "
+"class=\"wc-backward\">Return to shop</a>"
+msgstr ""
+
+#: includes/class-wc-comments.php:192
 msgid "Please rate the product."
 msgstr ""
 
-#: includes/class-wc-countries.php:269
+#: includes/class-wc-countries.php:328
 msgid "to the"
 msgstr ""
 
-#: includes/class-wc-countries.php:269
+#: includes/class-wc-countries.php:328
 msgid "to"
 msgstr ""
 
-#: includes/class-wc-countries.php:280
+#: includes/class-wc-countries.php:340
 msgid "the"
 msgstr ""
 
-#: includes/class-wc-countries.php:290
+#: includes/class-wc-countries.php:350
 msgid "VAT"
 msgstr ""
 
-#: includes/class-wc-countries.php:300
+#: includes/class-wc-countries.php:360
 msgid "(incl. VAT)"
 msgstr ""
 
-#: includes/class-wc-countries.php:300
+#: includes/class-wc-countries.php:360
 msgid "(incl. tax)"
 msgstr ""
 
-#: includes/class-wc-countries.php:310
+#: includes/class-wc-countries.php:370
 msgid "(ex. VAT)"
 msgstr ""
 
-#: includes/class-wc-countries.php:310
+#: includes/class-wc-countries.php:370
 msgid "(ex. tax)"
 msgstr ""
 
-#: includes/class-wc-countries.php:503
-msgid "Company Name"
+#: includes/class-wc-countries.php:567
+msgid "Company name"
 msgstr ""
 
-#: includes/class-wc-countries.php:524 includes/class-wc-countries.php:525
+#: includes/class-wc-countries.php:581
+msgid "Address"
+msgstr ""
+
+#: includes/class-wc-countries.php:582
+msgid "Street address"
+msgstr ""
+
+#: includes/class-wc-countries.php:589
+msgid "Apartment, suite, unit etc. (optional)"
+msgstr ""
+
+#: includes/class-wc-countries.php:596
 msgid "Town / City"
 msgstr ""
 
-#: includes/class-wc-countries.php:531
-msgid "State / County"
-msgstr ""
-
-#: includes/class-wc-countries.php:537 includes/class-wc-countries.php:538
-#: templates/cart/shipping-calculator.php:90
-msgid "Postcode / ZIP"
-msgstr ""
-
-#: includes/class-wc-countries.php:593 includes/class-wc-countries.php:594
+#: includes/class-wc-countries.php:671
 msgid "Suburb"
 msgstr ""
 
-#: includes/class-wc-countries.php:616
+#: includes/class-wc-countries.php:674 includes/class-wc-countries.php:882
+#: includes/class-wc-countries.php:992
+msgid "Postcode"
+msgstr ""
+
+#: includes/class-wc-countries.php:693
 msgid "District"
 msgstr ""
 
-#: includes/class-wc-countries.php:624 includes/class-wc-countries.php:647
-#: includes/class-wc-countries.php:673 includes/class-wc-countries.php:738
-#: includes/class-wc-countries.php:758 includes/class-wc-countries.php:776
-#: includes/class-wc-countries.php:836 includes/class-wc-countries.php:862
-#: includes/class-wc-countries.php:909
+#: includes/class-wc-countries.php:702 includes/class-wc-countries.php:724
+#: includes/class-wc-countries.php:749 includes/class-wc-countries.php:820
+#: includes/class-wc-countries.php:854 includes/class-wc-countries.php:877
+#: includes/class-wc-countries.php:949 includes/class-wc-countries.php:979
+#: includes/class-wc-countries.php:1021
 msgid "Province"
 msgstr ""
 
-#: includes/class-wc-countries.php:654
+#: includes/class-wc-countries.php:732
 msgid "Canton"
 msgstr ""
 
-#: includes/class-wc-countries.php:667 includes/class-wc-countries.php:726
+#: includes/class-wc-countries.php:744 includes/class-wc-countries.php:810
+#: includes/class-wc-countries.php:886
 msgid "Region"
 msgstr ""
 
-#: includes/class-wc-countries.php:722 includes/class-wc-countries.php:723
+#: includes/class-wc-countries.php:807
 msgid "Town / District"
 msgstr ""
 
-#: includes/class-wc-countries.php:732 includes/class-wc-countries.php:882
+#: includes/class-wc-countries.php:815 includes/class-wc-countries.php:829
+#: includes/class-wc-countries.php:995
 msgid "County"
 msgstr ""
 
-#: includes/class-wc-countries.php:764
+#: includes/class-wc-countries.php:826
+msgid "Eircode"
+msgstr ""
+
+#: includes/class-wc-countries.php:859
 msgid "Prefecture"
 msgstr ""
 
-#: includes/class-wc-countries.php:793
+#: includes/class-wc-countries.php:899
 msgid "State / Zone"
 msgstr ""
 
-#: includes/class-wc-countries.php:843
+#: includes/class-wc-countries.php:957
 msgid "Municipality"
 msgstr ""
 
-#: includes/class-wc-countries.php:868 includes/class-wc-countries.php:869
+#: includes/class-wc-countries.php:984
 msgid "ZIP"
 msgstr ""
 
-#: includes/class-wc-countries.php:967
-msgid "Email Address"
+#: includes/class-wc-coupon.php:452
+msgid "Invalid discount type"
 msgstr ""
 
-#: includes/class-wc-coupon.php:738
+#: includes/class-wc-coupon.php:637
+msgid "Invalid email address restriction"
+msgstr ""
+
+#: includes/class-wc-coupon.php:1099
 msgid "Coupon code applied successfully."
 msgstr ""
 
-#: includes/class-wc-coupon.php:741
+#: includes/class-wc-coupon.php:1102
 msgid "Coupon code removed successfully."
 msgstr ""
 
-#: includes/class-wc-coupon.php:759
+#: includes/class-wc-coupon.php:1120
 msgid "Coupon is not valid."
 msgstr ""
 
-#: includes/class-wc-coupon.php:762
+#: includes/class-wc-coupon.php:1124
+#. translators: %s: coupon code
 msgid "Coupon \"%s\" does not exist!"
 msgstr ""
 
-#: includes/class-wc-coupon.php:765
+#: includes/class-wc-coupon.php:1128
+#. translators: %s: coupon code
 msgid ""
 "Sorry, it seems the coupon \"%s\" is invalid - it has now been removed from "
 "your order."
 msgstr ""
 
-#: includes/class-wc-coupon.php:768
+#: includes/class-wc-coupon.php:1132
+#. translators: %s: coupon code
 msgid ""
 "Sorry, it seems the coupon \"%s\" is not yours - it has now been removed "
 "from your order."
 msgstr ""
 
-#: includes/class-wc-coupon.php:771
+#: includes/class-wc-coupon.php:1135
 msgid "Coupon code already applied!"
 msgstr ""
 
-#: includes/class-wc-coupon.php:774
+#: includes/class-wc-coupon.php:1139
+#. translators: %s: coupon code
 msgid ""
 "Sorry, coupon \"%s\" has already been applied and cannot be used in "
 "conjunction with other coupons."
 msgstr ""
 
-#: includes/class-wc-coupon.php:777
+#: includes/class-wc-coupon.php:1142
 msgid "Coupon usage limit has been reached."
 msgstr ""
 
-#: includes/class-wc-coupon.php:780
+#: includes/class-wc-coupon.php:1145
 msgid "This coupon has expired."
 msgstr ""
 
-#: includes/class-wc-coupon.php:783
+#: includes/class-wc-coupon.php:1149
+#. translators: %s: coupon minimum amount
 msgid "The minimum spend for this coupon is %s."
 msgstr ""
 
-#: includes/class-wc-coupon.php:786
+#: includes/class-wc-coupon.php:1153
+#. translators: %s: coupon maximum amount
 msgid "The maximum spend for this coupon is %s."
 msgstr ""
 
-#: includes/class-wc-coupon.php:789
+#: includes/class-wc-coupon.php:1156
 msgid "Sorry, this coupon is not applicable to your cart contents."
 msgstr ""
 
-#: includes/class-wc-coupon.php:802
+#: includes/class-wc-coupon.php:1170
+#. translators: %s: products list
 msgid "Sorry, this coupon is not applicable to the products: %s."
 msgstr ""
 
-#: includes/class-wc-coupon.php:821
+#: includes/class-wc-coupon.php:1190
+#. translators: %s: categories list
 msgid "Sorry, this coupon is not applicable to the categories: %s."
 msgstr ""
 
-#: includes/class-wc-coupon.php:824
+#: includes/class-wc-coupon.php:1193
 msgid "Sorry, this coupon is not valid for sale items."
 msgstr ""
 
-#: includes/class-wc-coupon.php:844
+#: includes/class-wc-coupon.php:1213
 msgid "Coupon does not exist!"
 msgstr ""
 
-#: includes/class-wc-coupon.php:847
+#: includes/class-wc-coupon.php:1216
 msgid "Please enter a coupon code."
 msgstr ""
 
-#: includes/class-wc-download-handler.php:53
+#: includes/class-wc-customer.php:697
+msgid "Invalid email address"
+msgstr ""
+
+#: includes/class-wc-customer.php:735
+msgid "Invalid role"
+msgstr ""
+
+#: includes/class-wc-customer.php:948 includes/class-wc-order.php:977
+msgid "Invalid billing email address"
+msgstr ""
+
+#: includes/class-wc-data-store.php:84 includes/class-wc-data-store.php:90
+#: includes/class-wc-data-store.php:96
+#: includes/data-stores/class-wc-shipping-zone-data-store.php:78
+msgid "Invalid data store."
+msgstr ""
+
+#: includes/class-wc-download-handler.php:41
+#: includes/class-wc-download-handler.php:56
 msgid "Invalid download link."
 msgstr ""
 
-#: includes/class-wc-download-handler.php:98
-#: includes/class-wc-form-handler.php:578
-#: includes/shortcodes/class-wc-shortcode-checkout.php:176
-#: includes/shortcodes/class-wc-shortcode-my-account.php:108
+#: includes/class-wc-download-handler.php:93
+#: includes/class-wc-form-handler.php:659
+#: includes/data-stores/abstract-wc-order-data-store-cpt.php:86
+#: includes/shortcodes/class-wc-shortcode-checkout.php:169
+#: includes/shortcodes/class-wc-shortcode-my-account.php:118
+#: includes/wc-order-functions.php:616
 msgid "Invalid order."
 msgstr ""
 
-#: includes/class-wc-download-handler.php:109
+#: includes/class-wc-download-handler.php:104
 msgid "Sorry, you have reached your download limit for this file"
 msgstr ""
 
-#: includes/class-wc-download-handler.php:120
+#: includes/class-wc-download-handler.php:115
 msgid "Sorry, this download has expired"
 msgstr ""
 
-#: includes/class-wc-download-handler.php:133
-#: includes/class-wc-download-handler.php:136
+#: includes/class-wc-download-handler.php:128
+#: includes/class-wc-download-handler.php:131
 msgid "You must be logged in to download files."
 msgstr ""
 
-#: includes/class-wc-download-handler.php:136 templates/auth/form-login.php:43
-#: templates/global/form-login.php:47 templates/myaccount/form-login.php:36
-#: templates/myaccount/form-login.php:55
-msgid "Login"
-msgstr ""
-
-#: includes/class-wc-download-handler.php:136
+#: includes/class-wc-download-handler.php:131
 msgid "Log in to Download Files"
 msgstr ""
 
-#: includes/class-wc-download-handler.php:139
+#: includes/class-wc-download-handler.php:134
 msgid "This is not your download link."
 msgstr ""
 
-#: includes/class-wc-download-handler.php:172
+#: includes/class-wc-download-handler.php:151
 msgid "No file defined"
 msgstr ""
 
-#: includes/class-wc-download-handler.php:282
+#: includes/class-wc-download-handler.php:265
 msgid "File not found"
 msgstr ""
 
-#: includes/class-wc-download-handler.php:420
-msgid "Go to homepage"
+#: includes/class-wc-download-handler.php:401
+msgid "Go to shop"
 msgstr ""
 
-#: includes/class-wc-emails.php:282
+#: includes/class-wc-emails.php:383
 msgid "Note"
 msgstr ""
 
-#: includes/class-wc-emails.php:359
-msgid "Tel"
-msgstr ""
-
-#: includes/class-wc-emails.php:398
+#: includes/class-wc-emails.php:439
 msgid "Product low in stock"
 msgstr ""
 
-#: includes/class-wc-emails.php:399
-msgid "%s is low in stock."
+#: includes/class-wc-emails.php:442
+#. translators: 1: product name 2: items in stock
+msgid "%1$s is low in stock. There are %2$d left."
 msgstr ""
 
-#: includes/class-wc-emails.php:399
-msgid "There are %d left"
-msgstr ""
-
-#: includes/class-wc-emails.php:416
+#: includes/class-wc-emails.php:462
 msgid "Product out of stock"
 msgstr ""
 
-#: includes/class-wc-emails.php:417
+#: includes/class-wc-emails.php:464
+#. translators: %s: product name
 msgid "%s is out of stock."
 msgstr ""
 
-#: includes/class-wc-emails.php:446
-msgid "Product Backorder"
+#: includes/class-wc-emails.php:493
+msgid "Product backorder"
 msgstr ""
 
-#: includes/class-wc-emails.php:447
-msgid "%s units of %s have been backordered in order #%s."
+#: includes/class-wc-emails.php:494
+msgid "%1$s units of %2$s have been backordered in order #%3$s."
 msgstr ""
 
-#: includes/class-wc-embed.php:114
-msgid "Buy Now"
+#: includes/class-wc-embed.php:109
+msgid "Buy now"
 msgstr ""
 
-#: includes/class-wc-embed.php:117 includes/class-wc-product-simple.php:48
-#: includes/class-wc-product-variation.php:198
-msgid "Read More"
-msgstr ""
-
-#: includes/class-wc-form-handler.php:129
+#: includes/class-wc-form-handler.php:147
 msgid "Address changed successfully."
 msgstr ""
 
-#: includes/class-wc-form-handler.php:179
-#: templates/myaccount/form-edit-account.php:40
-#: templates/myaccount/form-login.php:90
-msgid "Email address"
-msgstr ""
-
-#: includes/class-wc-form-handler.php:190 includes/wc-user-functions.php:48
+#: includes/class-wc-form-handler.php:209 includes/wc-user-functions.php:49
 msgid "Please provide a valid email address."
 msgstr ""
 
-#: includes/class-wc-form-handler.php:192
+#: includes/class-wc-form-handler.php:211
 msgid "This email address is already registered."
 msgstr ""
 
-#: includes/class-wc-form-handler.php:198
-msgid "Your current password is incorrect."
-msgstr ""
-
-#: includes/class-wc-form-handler.php:203
+#: includes/class-wc-form-handler.php:217
 msgid "Please fill out all password fields."
 msgstr ""
 
-#: includes/class-wc-form-handler.php:206
+#: includes/class-wc-form-handler.php:220
 msgid "Please enter your current password."
 msgstr ""
 
-#: includes/class-wc-form-handler.php:209
+#: includes/class-wc-form-handler.php:223
 msgid "Please re-enter your password."
 msgstr ""
 
-#: includes/class-wc-form-handler.php:212
+#: includes/class-wc-form-handler.php:226
 msgid "New passwords do not match."
 msgstr ""
 
-#: includes/class-wc-form-handler.php:233
+#: includes/class-wc-form-handler.php:229
+msgid "Your current password is incorrect."
+msgstr ""
+
+#: includes/class-wc-form-handler.php:250
 msgid "Account details changed successfully."
 msgstr ""
 
-#: includes/class-wc-form-handler.php:366
+#: includes/class-wc-form-handler.php:378
 msgid "Payment method added."
 msgstr ""
 
-#: includes/class-wc-form-handler.php:406
-msgid "%s removed. %sUndo?%s"
+#: includes/class-wc-form-handler.php:402
+msgid "Payment method deleted."
 msgstr ""
 
-#: includes/class-wc-form-handler.php:408
+#: includes/class-wc-form-handler.php:426
+msgid "This payment method was successfully set as your default."
+msgstr ""
+
+#: includes/class-wc-form-handler.php:464
+#: includes/class-wc-form-handler.php:467
 msgid "%s removed."
 msgstr ""
 
-#: includes/class-wc-form-handler.php:455
+#: includes/class-wc-form-handler.php:465
+msgid "Undo?"
+msgstr ""
+
+#: includes/class-wc-form-handler.php:517
 msgid "You can only have 1 %s in your cart."
 msgstr ""
 
-#: includes/class-wc-form-handler.php:479
+#: includes/class-wc-form-handler.php:540
 msgid "Cart updated."
 msgstr ""
 
-#: includes/class-wc-form-handler.php:545
+#: includes/class-wc-form-handler.php:611
+msgid ""
+"%d item from your previous order is currently unavailable and could not be "
+"added to your cart."
+msgid_plural ""
+"%d items from your previous order are currently unavailable and could not "
+"be added to your cart."
+msgstr[0] ""
+msgstr[1] ""
+
+#: includes/class-wc-form-handler.php:622
 msgid "The cart has been filled with the items from your previous order."
 msgstr ""
 
-#: includes/class-wc-form-handler.php:568
+#: includes/class-wc-form-handler.php:649
 msgid "Order cancelled by customer."
 msgstr ""
 
-#: includes/class-wc-form-handler.php:571
+#: includes/class-wc-form-handler.php:652
 msgid "Your order was cancelled."
 msgstr ""
 
-#: includes/class-wc-form-handler.php:576
+#: includes/class-wc-form-handler.php:657
 msgid ""
 "Your order can no longer be cancelled. Please contact us if you need "
 "assistance."
 msgstr ""
 
-#: includes/class-wc-form-handler.php:686
+#: includes/class-wc-form-handler.php:767
 msgid "Please choose the quantity of items you wish to add to your cart&hellip;"
 msgstr ""
 
-#: includes/class-wc-form-handler.php:694
+#: includes/class-wc-form-handler.php:774
 msgid "Please choose a product to add to your cart&hellip;"
 msgstr ""
 
-#: includes/class-wc-form-handler.php:747
+#: includes/class-wc-form-handler.php:802
+msgid "Please choose product options&hellip;"
+msgstr ""
+
+#: includes/class-wc-form-handler.php:830
+msgid "Invalid value posted for %s"
+msgstr ""
+
+#: includes/class-wc-form-handler.php:837
 msgid "%s is a required field"
 msgid_plural "%s are required fields"
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/class-wc-form-handler.php:749
-msgid "Please choose product options&hellip;"
+#: includes/class-wc-form-handler.php:875
+#: includes/class-wc-form-handler.php:879
+#: includes/class-wc-form-handler.php:888
+#: includes/class-wc-form-handler.php:1029 includes/wc-user-functions.php:111
+msgid "Error:"
 msgstr ""
 
-#: includes/class-wc-form-handler.php:776
-#: includes/class-wc-form-handler.php:780
-#: includes/class-wc-form-handler.php:784
-#: includes/class-wc-form-handler.php:793
-#: includes/class-wc-form-handler.php:924
-msgid "Error"
-msgstr ""
-
-#: includes/class-wc-form-handler.php:780
+#: includes/class-wc-form-handler.php:879
 msgid "Username is required."
 msgstr ""
 
-#: includes/class-wc-form-handler.php:784
-msgid "Password is required."
-msgstr ""
-
-#: includes/class-wc-form-handler.php:793
+#: includes/class-wc-form-handler.php:888
 msgid "A user could not be found with this email address."
 msgstr ""
 
-#: includes/class-wc-form-handler.php:820
-msgid "You are now logged in as <strong>%s</strong>"
-msgstr ""
-
-#: includes/class-wc-form-handler.php:864
+#: includes/class-wc-form-handler.php:966
 msgid "Please enter your password."
 msgstr ""
 
-#: includes/class-wc-form-handler.php:868
+#: includes/class-wc-form-handler.php:970
 msgid "Passwords do not match."
 msgstr ""
 
-#: includes/class-wc-form-handler.php:907
+#: includes/class-wc-form-handler.php:1012
 msgid "Anti-spam field was filled in."
 msgstr ""
 
-#: includes/class-wc-frontend-scripts.php:264
+#: includes/class-wc-frontend-scripts.php:465
 msgid "Please select a rating"
 msgstr ""
 
-#: includes/class-wc-frontend-scripts.php:279
+#: includes/class-wc-frontend-scripts.php:493
 msgid "Error processing checkout. Please try again."
 msgstr ""
 
-#: includes/class-wc-frontend-scripts.php:286
-#: includes/wc-template-functions.php:1706
+#: includes/class-wc-frontend-scripts.php:500
+#: includes/wc-template-functions.php:1876
 msgid "required"
 msgstr ""
 
-#: includes/class-wc-frontend-scripts.php:318
+#: includes/class-wc-frontend-scripts.php:535
 msgid ""
 "Sorry, no products matched your selection. Please choose a different "
 "combination."
 msgstr ""
 
-#: includes/class-wc-frontend-scripts.php:319
-msgid "Select product options before adding this product to your cart."
+#: includes/class-wc-frontend-scripts.php:536
+msgid "Please select some product options before adding this product to your cart."
 msgstr ""
 
-#: includes/class-wc-frontend-scripts.php:320
+#: includes/class-wc-frontend-scripts.php:537
 #: templates/single-product/add-to-cart/variation.php:31
 msgid "Sorry, this product is unavailable. Please choose a different combination."
 msgstr ""
 
-#: includes/class-wc-install.php:72
-msgid ""
-"WooCommerce data update complete. Thank you for updating to the latest "
-"version!"
+#: includes/class-wc-frontend-scripts.php:559
+msgid "Please enter a stronger password."
 msgstr ""
 
-#: includes/class-wc-install.php:195
+#: includes/class-wc-install.php:281
 msgid "Monthly"
 msgstr ""
 
-#: includes/class-wc-install.php:490
-msgid "Shop Manager"
+#: includes/class-wc-install.php:658
+msgid "Shop manager"
 msgstr ""
 
-#: includes/class-wc-install.php:714
-msgid "View WooCommerce Settings"
+#: includes/class-wc-install.php:885
+msgid "View WooCommerce settings"
 msgstr ""
 
-#: includes/class-wc-install.php:730
-msgid "View WooCommerce Documentation"
+#: includes/class-wc-install.php:901
+msgid "View WooCommerce documentation"
 msgstr ""
 
-#: includes/class-wc-install.php:730
+#: includes/class-wc-install.php:901
 msgid "Docs"
 msgstr ""
 
-#: includes/class-wc-install.php:731
-msgid "View WooCommerce API Docs"
+#: includes/class-wc-install.php:902
+msgid "View WooCommerce API docs"
 msgstr ""
 
-#: includes/class-wc-install.php:731
-msgid "API Docs"
+#: includes/class-wc-install.php:902
+msgid "API docs"
 msgstr ""
 
-#: includes/class-wc-install.php:732
-msgid "Visit Premium Customer Support Forum"
+#: includes/class-wc-install.php:903
+msgid "Visit premium customer support"
 msgstr ""
 
-#: includes/class-wc-install.php:732
-msgid "Premium Support"
+#: includes/class-wc-install.php:903
+msgid "Premium support"
 msgstr ""
 
-#: includes/class-wc-order.php:46
-msgid "(Includes %s)"
+#: includes/class-wc-install.php:1045
+msgid ""
+"%1$s could not be installed (%2$s). <a href=\"%3$s\">Please install it "
+"manually by clicking here.</a>"
 msgstr ""
 
-#: includes/class-wc-post-types.php:66
-msgid "Product Category"
+#: includes/class-wc-install.php:1071
+msgid ""
+"%1$s was installed but could not be activated. <a href=\"%2$s\">Please "
+"activate it manually by clicking here.</a>"
 msgstr ""
 
-#: includes/class-wc-post-types.php:68
-msgid "Search Product Categories"
+#: includes/class-wc-logger.php:55
+msgid ""
+"The provided handler <code>%s</code> does not implement "
+"WC_Log_Handler_Interface."
 msgstr ""
 
-#: includes/class-wc-post-types.php:69
-msgid "All Product Categories"
+#: includes/class-wc-logger.php:122
+msgid "WC_Logger::log was called with an invalid level \"%s\"."
 msgstr ""
 
-#: includes/class-wc-post-types.php:70
-msgid "Parent Product Category"
+#: includes/class-wc-order-item-fee.php:48
+#: includes/class-wc-order-item-product.php:61
+msgid "Invalid tax class"
 msgstr ""
 
-#: includes/class-wc-post-types.php:71
-msgid "Parent Product Category:"
+#: includes/class-wc-order-item-product.php:74
+msgid "Invalid product ID"
 msgstr ""
 
-#: includes/class-wc-post-types.php:72
-msgid "Edit Product Category"
+#: includes/class-wc-order-item-product.php:87
+msgid "Invalid variation ID"
 msgstr ""
 
-#: includes/class-wc-post-types.php:73
-msgid "Update Product Category"
+#: includes/class-wc-order-item-product.php:182
+msgid "Invalid product"
 msgstr ""
 
-#: includes/class-wc-post-types.php:74
-msgid "Add New Product Category"
+#: includes/class-wc-order-item-product.php:201
+#: includes/legacy/abstract-wc-legacy-order.php:164
+msgid "Backordered"
 msgstr ""
 
-#: includes/class-wc-post-types.php:75
-msgid "New Product Category Name"
+#: includes/class-wc-order-refund.php:64
+#: includes/data-stores/class-wc-order-refund-data-store-cpt.php:101
+#. translators: %s: Order date
+msgid "Refund &ndash; %s"
 msgstr ""
 
-#: includes/class-wc-post-types.php:101
-msgid "Product Tag"
+#: includes/class-wc-order.php:160 includes/wc-cart-functions.php:309
+msgid "(includes %s)"
 msgstr ""
 
-#: includes/class-wc-post-types.php:103
-msgid "Search Product Tags"
+#: includes/class-wc-order.php:303
+#. translators: 1: old order status 2: new order status
+msgid "Order status changed from %1$s to %2$s."
 msgstr ""
 
-#: includes/class-wc-post-types.php:104
-msgid "All Product Tags"
+#: includes/class-wc-order.php:309
+#. translators: %s: new order status
+msgid "Order status set to %s."
 msgstr ""
 
-#: includes/class-wc-post-types.php:105
-msgid "Edit Product Tag"
+#: includes/class-wc-post-types.php:84
+msgid "Category"
 msgstr ""
 
-#: includes/class-wc-post-types.php:106
-msgid "Update Product Tag"
+#: includes/class-wc-post-types.php:86
+msgid "Search categories"
 msgstr ""
 
-#: includes/class-wc-post-types.php:107
-msgid "Add New Product Tag"
+#: includes/class-wc-post-types.php:87
+msgid "All categories"
 msgstr ""
 
-#: includes/class-wc-post-types.php:108
-msgid "New Product Tag Name"
+#: includes/class-wc-post-types.php:88
+msgid "Parent category"
 msgstr ""
 
-#: includes/class-wc-post-types.php:109
-msgid "Popular Product Tags"
+#: includes/class-wc-post-types.php:89
+msgid "Parent category:"
 msgstr ""
 
-#: includes/class-wc-post-types.php:110
-msgid "Separate Product Tags with commas"
+#: includes/class-wc-post-types.php:90
+msgid "Edit category"
 msgstr ""
 
-#: includes/class-wc-post-types.php:111
-msgid "Add or remove Product Tags"
+#: includes/class-wc-post-types.php:91
+msgid "Update category"
 msgstr ""
 
-#: includes/class-wc-post-types.php:112
-msgid "Choose from the most used Product tags"
+#: includes/class-wc-post-types.php:92
+msgid "Add new category"
 msgstr ""
 
-#: includes/class-wc-post-types.php:113
-msgid "No Product Tags found"
+#: includes/class-wc-post-types.php:93
+msgid "New category name"
 msgstr ""
 
-#: includes/class-wc-post-types.php:135 includes/class-wc-post-types.php:137
-msgid "Shipping Classes"
+#: includes/class-wc-post-types.php:94
+msgid "No categories found"
 msgstr ""
 
-#: includes/class-wc-post-types.php:138
-msgid "Shipping Class"
+#: includes/class-wc-post-types.php:120
+msgid "Tag"
 msgstr ""
 
-#: includes/class-wc-post-types.php:140
-msgid "Search Shipping Classes"
+#: includes/class-wc-post-types.php:122
+msgid "Search tags"
 msgstr ""
 
-#: includes/class-wc-post-types.php:141
-msgid "All Shipping Classes"
+#: includes/class-wc-post-types.php:123
+msgid "All tags"
 msgstr ""
 
-#: includes/class-wc-post-types.php:142
-msgid "Parent Shipping Class"
+#: includes/class-wc-post-types.php:124
+msgid "Edit tag"
 msgstr ""
 
-#: includes/class-wc-post-types.php:143
-msgid "Parent Shipping Class:"
+#: includes/class-wc-post-types.php:125
+msgid "Update tag"
 msgstr ""
 
-#: includes/class-wc-post-types.php:144
-msgid "Edit Shipping Class"
+#: includes/class-wc-post-types.php:126
+msgid "Add new tag"
 msgstr ""
 
-#: includes/class-wc-post-types.php:145
-msgid "Update Shipping Class"
+#: includes/class-wc-post-types.php:127
+msgid "New tag name"
 msgstr ""
 
-#: includes/class-wc-post-types.php:146
-msgid "Add New Shipping Class"
+#: includes/class-wc-post-types.php:128
+msgid "Popular tags"
 msgstr ""
 
-#: includes/class-wc-post-types.php:147
-msgid "New Shipping Class Name"
+#: includes/class-wc-post-types.php:129
+msgid "Separate tags with commas"
 msgstr ""
 
-#: includes/class-wc-post-types.php:178
+#: includes/class-wc-post-types.php:130
+msgid "Add or remove tags"
+msgstr ""
+
+#: includes/class-wc-post-types.php:131
+msgid "Choose from the most used tags"
+msgstr ""
+
+#: includes/class-wc-post-types.php:132
+msgid "No tags found"
+msgstr ""
+
+#: includes/class-wc-post-types.php:156
+msgid "Product shipping classes"
+msgstr ""
+
+#: includes/class-wc-post-types.php:159
+msgid "Search shipping classes"
+msgstr ""
+
+#: includes/class-wc-post-types.php:160
+msgid "All shipping classes"
+msgstr ""
+
+#: includes/class-wc-post-types.php:161
+msgid "Parent shipping class"
+msgstr ""
+
+#: includes/class-wc-post-types.php:162
+msgid "Parent shipping class:"
+msgstr ""
+
+#: includes/class-wc-post-types.php:163
+msgid "Edit shipping class"
+msgstr ""
+
+#: includes/class-wc-post-types.php:164
+msgid "Update shipping class"
+msgstr ""
+
+#: includes/class-wc-post-types.php:165
+msgid "Add new shipping class"
+msgstr ""
+
+#: includes/class-wc-post-types.php:166
+msgid "New shipping class Name"
+msgstr ""
+
+#: includes/class-wc-post-types.php:198
 msgid "Search %s"
 msgstr ""
 
-#: includes/class-wc-post-types.php:179
+#: includes/class-wc-post-types.php:199
 msgid "All %s"
 msgstr ""
 
-#: includes/class-wc-post-types.php:180
+#: includes/class-wc-post-types.php:200
 msgid "Parent %s"
 msgstr ""
 
-#: includes/class-wc-post-types.php:181
+#: includes/class-wc-post-types.php:201
 msgid "Parent %s:"
 msgstr ""
 
-#: includes/class-wc-post-types.php:182
+#: includes/class-wc-post-types.php:202
 msgid "Edit %s"
 msgstr ""
 
-#: includes/class-wc-post-types.php:183
+#: includes/class-wc-post-types.php:203
 msgid "Update %s"
 msgstr ""
 
-#: includes/class-wc-post-types.php:184
-msgid "Add New %s"
+#: includes/class-wc-post-types.php:204
+msgid "Add new %s"
 msgstr ""
 
-#: includes/class-wc-post-types.php:185
+#: includes/class-wc-post-types.php:205
 msgid "New %s"
 msgstr ""
 
-#: includes/class-wc-post-types.php:240
-msgid "Add Product"
+#: includes/class-wc-post-types.php:206
+msgid "No &quot;%s&quot; found"
 msgstr ""
 
-#: includes/class-wc-post-types.php:241
-msgid "Add New Product"
+#: includes/class-wc-post-types.php:261
+msgid "Add product"
 msgstr ""
 
-#: includes/class-wc-post-types.php:243
-msgid "Edit Product"
+#: includes/class-wc-post-types.php:262
+msgid "Add new product"
 msgstr ""
 
-#: includes/class-wc-post-types.php:244
-msgid "New Product"
+#: includes/class-wc-post-types.php:264
+msgid "Edit product"
 msgstr ""
 
-#: includes/class-wc-post-types.php:245 includes/class-wc-post-types.php:246
-msgid "View Product"
+#: includes/class-wc-post-types.php:265
+msgid "New product"
 msgstr ""
 
-#: includes/class-wc-post-types.php:247
-msgid "Search Products"
+#: includes/class-wc-post-types.php:266 includes/class-wc-post-types.php:267
+msgid "View product"
 msgstr ""
 
-#: includes/class-wc-post-types.php:248
-msgid "No Products found"
+#: includes/class-wc-post-types.php:268
+msgid "Search products"
 msgstr ""
 
-#: includes/class-wc-post-types.php:249
-msgid "No Products found in trash"
+#: includes/class-wc-post-types.php:269
+msgid "No products found"
 msgstr ""
 
-#: includes/class-wc-post-types.php:250
-msgid "Parent Product"
+#: includes/class-wc-post-types.php:270
+msgid "No products found in trash"
 msgstr ""
 
-#: includes/class-wc-post-types.php:251
-#: templates/emails/email-order-items.php:33
-msgid "Product Image"
+#: includes/class-wc-post-types.php:271
+msgid "Parent product"
 msgstr ""
 
-#: includes/class-wc-post-types.php:252
+#: includes/class-wc-post-types.php:272
+#: templates/emails/email-order-items.php:34
+msgid "Product image"
+msgstr ""
+
+#: includes/class-wc-post-types.php:273
 msgid "Set product image"
 msgstr ""
 
-#: includes/class-wc-post-types.php:253
+#: includes/class-wc-post-types.php:274
 msgid "Remove product image"
 msgstr ""
 
-#: includes/class-wc-post-types.php:254
+#: includes/class-wc-post-types.php:275
 msgid "Use as product image"
 msgstr ""
 
-#: includes/class-wc-post-types.php:256
+#: includes/class-wc-post-types.php:276
+msgid "Insert into product"
+msgstr ""
+
+#: includes/class-wc-post-types.php:277
+msgid "Uploaded to this product"
+msgstr ""
+
+#: includes/class-wc-post-types.php:278
+msgid "Filter products"
+msgstr ""
+
+#: includes/class-wc-post-types.php:279
+msgid "Products navigation"
+msgstr ""
+
+#: includes/class-wc-post-types.php:280
+msgid "Products list"
+msgstr ""
+
+#: includes/class-wc-post-types.php:282
 msgid "This is where you can add new products to your store."
 msgstr ""
 
-#: includes/class-wc-post-types.php:292
-msgid "Add Order"
+#: includes/class-wc-post-types.php:320
+msgid "Add order"
 msgstr ""
 
-#: includes/class-wc-post-types.php:293
-msgid "Add New Order"
+#: includes/class-wc-post-types.php:321
+msgid "Add new order"
 msgstr ""
 
-#: includes/class-wc-post-types.php:295
-msgid "Edit Order"
+#: includes/class-wc-post-types.php:323
+msgid "Edit order"
 msgstr ""
 
-#: includes/class-wc-post-types.php:296
-msgid "New Order"
-msgstr ""
-
-#: includes/class-wc-post-types.php:299
-msgid "Search Orders"
-msgstr ""
-
-#: includes/class-wc-post-types.php:300
-msgid "No Orders found"
-msgstr ""
-
-#: includes/class-wc-post-types.php:301
-msgid "No Orders found in trash"
-msgstr ""
-
-#: includes/class-wc-post-types.php:302
-msgid "Parent Orders"
-msgstr ""
-
-#: includes/class-wc-post-types.php:305
-msgid "This is where store orders are stored."
+#: includes/class-wc-post-types.php:324
+#: includes/emails/class-wc-email-new-order.php:27
+msgid "New order"
 msgstr ""
 
 #: includes/class-wc-post-types.php:327
-msgid "Refunds"
+msgid "Search orders"
 msgstr ""
 
-#: includes/class-wc-post-types.php:349 templates/cart/cart.php:136
-msgid "Coupon"
+#: includes/class-wc-post-types.php:328
+msgid "No orders found"
 msgstr ""
 
-#: includes/class-wc-post-types.php:351
-msgid "Add Coupon"
+#: includes/class-wc-post-types.php:329
+msgid "No orders found in trash"
 msgstr ""
 
-#: includes/class-wc-post-types.php:352
-msgid "Add New Coupon"
+#: includes/class-wc-post-types.php:330
+msgid "Parent orders"
 msgstr ""
 
-#: includes/class-wc-post-types.php:354
-msgid "Edit Coupon"
+#: includes/class-wc-post-types.php:332
+msgid "Filter orders"
 msgstr ""
 
-#: includes/class-wc-post-types.php:355
-msgid "New Coupon"
+#: includes/class-wc-post-types.php:333
+msgid "Orders navigation"
 msgstr ""
 
-#: includes/class-wc-post-types.php:356
-msgid "View Coupons"
+#: includes/class-wc-post-types.php:334
+msgid "Orders list"
 msgstr ""
 
-#: includes/class-wc-post-types.php:357
-msgid "View Coupon"
+#: includes/class-wc-post-types.php:336
+msgid "This is where store orders are stored."
 msgstr ""
 
 #: includes/class-wc-post-types.php:358
-msgid "Search Coupons"
+msgid "Refunds"
 msgstr ""
 
-#: includes/class-wc-post-types.php:359
-msgid "No Coupons found"
+#: includes/class-wc-post-types.php:381
+msgid "Coupon"
 msgstr ""
 
-#: includes/class-wc-post-types.php:360
-msgid "No Coupons found in trash"
+#: includes/class-wc-post-types.php:383
+msgid "Add coupon"
 msgstr ""
 
-#: includes/class-wc-post-types.php:361
-msgid "Parent Coupon"
+#: includes/class-wc-post-types.php:384
+msgid "Add new coupon"
 msgstr ""
 
-#: includes/class-wc-post-types.php:363
-msgid "This is where you can add new coupons that customers can use in your store."
+#: includes/class-wc-post-types.php:386
+msgid "Edit coupon"
 msgstr ""
 
 #: includes/class-wc-post-types.php:387
-msgid "Webhook"
+msgid "New coupon"
+msgstr ""
+
+#: includes/class-wc-post-types.php:389
+msgid "View coupon"
 msgstr ""
 
 #: includes/class-wc-post-types.php:390
-msgid "Add New Webhook"
+msgid "Search coupons"
+msgstr ""
+
+#: includes/class-wc-post-types.php:391
+msgid "No coupons found"
 msgstr ""
 
 #: includes/class-wc-post-types.php:392
-msgid "Edit Webhook"
+msgid "No coupons found in trash"
 msgstr ""
 
 #: includes/class-wc-post-types.php:393
-msgid "New Webhook"
+msgid "Parent coupon"
 msgstr ""
 
 #: includes/class-wc-post-types.php:394
-msgid "View Webhooks"
+msgid "Filter coupons"
 msgstr ""
 
 #: includes/class-wc-post-types.php:395
-msgid "View Webhook"
+msgid "Coupons navigation"
 msgstr ""
 
-#: includes/class-wc-post-types.php:397
-msgid "No Webhooks found"
+#: includes/class-wc-post-types.php:396
+msgid "Coupons list"
 msgstr ""
 
 #: includes/class-wc-post-types.php:398
-msgid "No Webhooks found in trash"
+msgid "This is where you can add new coupons that customers can use in your store."
 msgstr ""
 
-#: includes/class-wc-post-types.php:399
-msgid "Parent Webhook"
+#: includes/class-wc-post-types.php:422
+msgid "Webhook"
+msgstr ""
+
+#: includes/class-wc-post-types.php:425
+msgid "Add new webhook"
+msgstr ""
+
+#: includes/class-wc-post-types.php:427
+msgid "Edit webhook"
+msgstr ""
+
+#: includes/class-wc-post-types.php:428
+msgid "New webhook"
 msgstr ""
 
 #: includes/class-wc-post-types.php:429
-msgid "Pending Payment <span class=\"count\">(%s)</span>"
-msgid_plural "Pending Payment <span class=\"count\">(%s)</span>"
+msgid "View webhooks"
+msgstr ""
+
+#: includes/class-wc-post-types.php:430
+msgid "View webhook"
+msgstr ""
+
+#: includes/class-wc-post-types.php:432
+msgid "No webhooks found"
+msgstr ""
+
+#: includes/class-wc-post-types.php:433
+msgid "No webhooks found in trash"
+msgstr ""
+
+#: includes/class-wc-post-types.php:434
+msgid "Parent webhook"
+msgstr ""
+
+#: includes/class-wc-post-types.php:469
+msgid "Pending payment <span class=\"count\">(%s)</span>"
+msgid_plural "Pending payment <span class=\"count\">(%s)</span>"
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/class-wc-post-types.php:437
+#: includes/class-wc-post-types.php:477
 msgid "Processing <span class=\"count\">(%s)</span>"
 msgid_plural "Processing <span class=\"count\">(%s)</span>"
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/class-wc-post-types.php:445
-msgid "On Hold <span class=\"count\">(%s)</span>"
-msgid_plural "On Hold <span class=\"count\">(%s)</span>"
+#: includes/class-wc-post-types.php:485
+msgid "On hold <span class=\"count\">(%s)</span>"
+msgid_plural "On hold <span class=\"count\">(%s)</span>"
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/class-wc-post-types.php:453
+#: includes/class-wc-post-types.php:493
 msgid "Completed <span class=\"count\">(%s)</span>"
 msgid_plural "Completed <span class=\"count\">(%s)</span>"
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/class-wc-post-types.php:461
+#: includes/class-wc-post-types.php:501
 msgid "Cancelled <span class=\"count\">(%s)</span>"
 msgid_plural "Cancelled <span class=\"count\">(%s)</span>"
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/class-wc-post-types.php:469
+#: includes/class-wc-post-types.php:509
 msgid "Refunded <span class=\"count\">(%s)</span>"
 msgid_plural "Refunded <span class=\"count\">(%s)</span>"
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/class-wc-post-types.php:477
+#: includes/class-wc-post-types.php:517
 msgid "Failed <span class=\"count\">(%s)</span>"
 msgid_plural "Failed <span class=\"count\">(%s)</span>"
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/class-wc-product-external.php:88
-msgid "Buy product"
+#: includes/class-wc-product-external.php:105
+#: includes/class-wc-product-external.php:119
+msgid "External products cannot be stock managed."
 msgstr ""
 
-#: includes/class-wc-product-variable.php:43
+#: includes/class-wc-product-external.php:133
+msgid "External products cannot be backordered."
+msgstr ""
+
+#: includes/class-wc-product-variable.php:60
 msgid "Select options"
 msgstr ""
 
-#: includes/class-wc-product-variable.php:725
-msgid ""
-"This variable product has no active variations. Add or enable variations to "
-"allow this product to be purchased."
+#: includes/class-wc-query.php:91
+#: includes/shortcodes/class-wc-shortcode-checkout.php:114
+msgid "Pay for order"
 msgstr ""
 
-#: includes/class-wc-product-variation.php:749
-msgid "%s &ndash; %s%s"
+#: includes/class-wc-query.php:99
+#. translators: %s: page
+msgid "Orders (page %d)"
 msgstr ""
 
-#: includes/class-wc-query.php:109
-msgid "Pay for Order"
-msgstr ""
-
-#: includes/class-wc-query.php:116
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:405
-#: templates/emails/email-order-details.php:25
-#: templates/emails/email-order-details.php:27
+#: includes/class-wc-query.php:107
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:615
+#: templates/emails/email-order-details.php:28
+#: templates/emails/email-order-details.php:30
+#. translators: %s: order number
 msgid "Order #%s"
 msgstr ""
 
-#: includes/class-wc-query.php:119
-msgid "Edit Account Details"
+#: includes/class-wc-query.php:113
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:123
+#: includes/wc-account-functions.php:101
+msgid "Account details"
 msgstr ""
 
-#: includes/class-wc-webhook.php:604
+#: includes/class-wc-shipping-zone.php:141
+msgid "%s and %d other region"
+msgid_plural "%s and %d other regions"
+msgstr[0] ""
+msgstr[1] ""
+
+#: includes/class-wc-shipping-zone.php:146
+msgid "Everywhere"
+msgstr ""
+
+#: includes/class-wc-webhook.php:685
 msgid "Error: Delivery URL cannot be reached: %s"
 msgstr ""
 
-#: includes/class-wc-webhook.php:608
+#: includes/class-wc-webhook.php:689
 msgid "Error: Delivery URL returned response code: %s"
 msgstr ""
 
-#: includes/cli/class-wc-cli-coupon.php:241
-#: includes/cli/class-wc-cli-coupon.php:431
-msgid "Invalid coupon ID or code: %s"
+#: includes/cli/class-wc-cli-rest-command.php:125
+msgid "Trashed"
 msgstr ""
 
-#: includes/cli/class-wc-cli-customer.php:566
-msgid "Invalid customer \"%s\""
+#: includes/cli/class-wc-cli-rest-command.php:127
+msgid "Deleted"
 msgstr ""
 
-#: includes/cli/class-wc-cli-order.php:109
-msgid "Missing customer_id field"
+#: includes/cli/class-wc-cli-rest-command.php:216
+msgid "Updated"
 msgstr ""
 
-#: includes/cli/class-wc-cli-order.php:272
-msgid "Invalid order \"%s\""
+#: includes/cli/class-wc-cli-rest-command.php:290
+msgid ""
+"Make sure to include the --user flag with an account that has permissions "
+"for this action."
 msgstr ""
 
-#: includes/cli/class-wc-cli-product-category.php:124
-msgid "Invalid product category ID \"%s\""
+#: includes/cli/class-wc-cli-runner.php:64
+msgid "No schema title found for %s, skipping REST command registration."
 msgstr ""
 
-#: includes/cli/class-wc-cli-product.php:288
-#: includes/cli/class-wc-cli-product.php:537
-msgid "Invalid product \"%s\""
+#: includes/cli/class-wc-cli-runner.php:96
+msgid "Customer ID."
 msgstr ""
 
-#: includes/cli/class-wc-cli-tax.php:300 includes/cli/class-wc-cli-tax.php:495
-msgid "Invalid tax rate ID: %s"
+#: includes/cli/class-wc-cli-runner.php:160
+#: includes/cli/class-wc-cli-tool-command.php:36
+msgid "The id for the resource."
+msgstr ""
+
+#: includes/cli/class-wc-cli-runner.php:184
+#: includes/cli/class-wc-cli-tool-command.php:45
+msgid "Limit response to specific fields. Defaults to all fields."
+msgstr ""
+
+#: includes/cli/class-wc-cli-runner.php:190
+#: includes/cli/class-wc-cli-tool-command.php:51
+msgid "Get the value of an individual field."
+msgstr ""
+
+#: includes/cli/class-wc-cli-runner.php:196
+#: includes/cli/class-wc-cli-tool-command.php:57
+msgid "Render response in a particular format."
+msgstr ""
+
+#: includes/cli/class-wc-cli-runner.php:217
+msgid "Output just the id when the operation is successful."
+msgstr ""
+
+#: includes/cli/class-wc-cli-update-command.php:34
+msgid "Calling update function: %s"
+msgstr ""
+
+#: includes/cli/class-wc-cli-update-command.php:42
+msgid "%1$d updates complete. Database version is %2$s"
+msgstr ""
+
+#: includes/data-stores/abstract-wc-order-data-store-cpt.php:185
+#. translators: %s: Order date
+msgid "Order &ndash; %s"
+msgstr ""
+
+#: includes/data-stores/abstract-wc-order-item-type-data-store.php:117
+msgid "Invalid order item."
+msgstr ""
+
+#: includes/data-stores/class-wc-coupon-data-store-cpt.php:90
+msgid "Invalid coupon."
+msgstr ""
+
+#: includes/data-stores/class-wc-customer-data-store.php:126
+#: includes/data-stores/class-wc-customer-data-store.php:131
+msgid "Invalid customer."
+msgstr ""
+
+#: includes/data-stores/class-wc-customer-download-data-store.php:79
+msgid "Invalid download."
+msgstr ""
+
+#: includes/data-stores/class-wc-payment-token-data-store.php:34
+#: includes/data-stores/class-wc-payment-token-data-store.php:75
+msgid "Invalid or missing payment token fields."
+msgstr ""
+
+#: includes/data-stores/class-wc-payment-token-data-store.php:148
+msgid "Invalid payment token."
+msgstr ""
+
+#: includes/data-stores/class-wc-product-data-store-cpt.php:133
+msgid "Invalid product."
 msgstr ""
 
 #: includes/emails/class-wc-email-cancelled-order.php:27
@@ -14267,86 +18627,89 @@ msgstr ""
 msgid "[{site_title}] Cancelled order ({order_number})"
 msgstr ""
 
-#: includes/emails/class-wc-email-cancelled-order.php:101
-#: includes/emails/class-wc-email-customer-completed-order.php:137
-#: includes/emails/class-wc-email-customer-refunded-order.php:173
-#: includes/emails/class-wc-email-failed-order.php:101
-#: includes/emails/class-wc-email-new-order.php:106
-#: includes/emails/class-wc-email.php:481
-#: includes/gateways/bacs/class-wc-gateway-bacs.php:74
+#: includes/emails/class-wc-email-cancelled-order.php:108
+#: includes/emails/class-wc-email-customer-completed-order.php:143
+#: includes/emails/class-wc-email-customer-refunded-order.php:197
+#: includes/emails/class-wc-email-failed-order.php:108
+#: includes/emails/class-wc-email-new-order.php:113
+#: includes/emails/class-wc-email.php:487
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:73
 #: includes/gateways/cheque/class-wc-gateway-cheque.php:54
+#: includes/gateways/cod/class-wc-gateway-cod.php:68
 #: includes/gateways/paypal/includes/settings-paypal.php:12
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:183
-#: includes/shipping/flat-rate/includes/settings-flat-rate.php:14
-#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:61
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:190
+#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:14
+#: includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php:83
 msgid "Enable/Disable"
 msgstr ""
 
-#: includes/emails/class-wc-email-cancelled-order.php:103
-#: includes/emails/class-wc-email-customer-completed-order.php:139
-#: includes/emails/class-wc-email-customer-refunded-order.php:175
-#: includes/emails/class-wc-email-failed-order.php:103
-#: includes/emails/class-wc-email-new-order.php:108
-#: includes/emails/class-wc-email.php:483
+#: includes/emails/class-wc-email-cancelled-order.php:110
+#: includes/emails/class-wc-email-customer-completed-order.php:145
+#: includes/emails/class-wc-email-customer-refunded-order.php:199
+#: includes/emails/class-wc-email-failed-order.php:110
+#: includes/emails/class-wc-email-new-order.php:115
+#: includes/emails/class-wc-email.php:489
 msgid "Enable this email notification"
 msgstr ""
 
-#: includes/emails/class-wc-email-cancelled-order.php:109
-#: includes/emails/class-wc-email-failed-order.php:109
-#: includes/emails/class-wc-email-new-order.php:114
-msgid ""
-"Enter recipients (comma separated) for this email. Defaults to "
-"<code>%s</code>."
-msgstr ""
-
-#: includes/emails/class-wc-email-cancelled-order.php:115
-#: includes/emails/class-wc-email-customer-completed-order.php:143
-#: includes/emails/class-wc-email-failed-order.php:115
-#: includes/emails/class-wc-email-new-order.php:120
-msgid "Subject"
-msgstr ""
-
 #: includes/emails/class-wc-email-cancelled-order.php:117
-#: includes/emails/class-wc-email-failed-order.php:117
-#: includes/emails/class-wc-email-new-order.php:122
-msgid ""
-"This controls the email subject line. Leave blank to use the default "
-"subject: <code>%s</code>."
+#: includes/emails/class-wc-email-failed-order.php:116
+#: includes/emails/class-wc-email-new-order.php:121
+#. translators: %s: admin email
+msgid "Enter recipients (comma separated) for this email. Defaults to %s."
 msgstr ""
 
 #: includes/emails/class-wc-email-cancelled-order.php:123
-#: includes/emails/class-wc-email-customer-completed-order.php:151
-#: includes/emails/class-wc-email-customer-invoice.php:153
-#: includes/emails/class-wc-email-failed-order.php:123
-#: includes/emails/class-wc-email-new-order.php:128
-#: includes/emails/class-wc-email.php:495
-msgid "Email Heading"
+#: includes/emails/class-wc-email-customer-completed-order.php:149
+#: includes/emails/class-wc-email-failed-order.php:122
+#: includes/emails/class-wc-email-new-order.php:127
+msgid "Subject"
 msgstr ""
 
-#: includes/emails/class-wc-email-cancelled-order.php:125
-#: includes/emails/class-wc-email-failed-order.php:125
-#: includes/emails/class-wc-email-new-order.php:130
+#: includes/emails/class-wc-email-cancelled-order.php:126
+#: includes/emails/class-wc-email-failed-order.php:124
+#: includes/emails/class-wc-email-new-order.php:129
+#. translators: %s: default subject
+msgid ""
+"This controls the email subject line. Leave blank to use the default "
+"subject: %s."
+msgstr ""
+
+#: includes/emails/class-wc-email-cancelled-order.php:132
+#: includes/emails/class-wc-email-customer-completed-order.php:158
+#: includes/emails/class-wc-email-customer-invoice.php:167
+#: includes/emails/class-wc-email-failed-order.php:130
+#: includes/emails/class-wc-email-new-order.php:135
+#: includes/emails/class-wc-email.php:502
+msgid "Email heading"
+msgstr ""
+
+#: includes/emails/class-wc-email-cancelled-order.php:135
+#: includes/emails/class-wc-email-failed-order.php:132
+#: includes/emails/class-wc-email-new-order.php:137
+#. translators: %s: default heading
 msgid ""
 "This controls the main heading contained within the email notification. "
-"Leave blank to use the default heading: <code>%s</code>."
+"Leave blank to use the default heading: %s."
 msgstr ""
 
-#: includes/emails/class-wc-email-cancelled-order.php:131
-#: includes/emails/class-wc-email-customer-completed-order.php:175
-#: includes/emails/class-wc-email-customer-refunded-order.php:211
-#: includes/emails/class-wc-email-failed-order.php:131
-#: includes/emails/class-wc-email-new-order.php:136
-#: includes/emails/class-wc-email.php:503
+#: includes/emails/class-wc-email-cancelled-order.php:141
+#: includes/emails/class-wc-email-customer-completed-order.php:185
+#: includes/emails/class-wc-email-customer-invoice.php:194
+#: includes/emails/class-wc-email-customer-refunded-order.php:239
+#: includes/emails/class-wc-email-failed-order.php:138
+#: includes/emails/class-wc-email-new-order.php:143
+#: includes/emails/class-wc-email.php:511
 msgid "Email type"
 msgstr ""
 
-#: includes/emails/class-wc-email-cancelled-order.php:133
-#: includes/emails/class-wc-email-customer-completed-order.php:177
-#: includes/emails/class-wc-email-customer-invoice.php:179
-#: includes/emails/class-wc-email-customer-refunded-order.php:213
-#: includes/emails/class-wc-email-failed-order.php:133
-#: includes/emails/class-wc-email-new-order.php:138
-#: includes/emails/class-wc-email.php:505
+#: includes/emails/class-wc-email-cancelled-order.php:143
+#: includes/emails/class-wc-email-customer-completed-order.php:187
+#: includes/emails/class-wc-email-customer-invoice.php:196
+#: includes/emails/class-wc-email-customer-refunded-order.php:241
+#: includes/emails/class-wc-email-failed-order.php:140
+#: includes/emails/class-wc-email-new-order.php:145
+#: includes/emails/class-wc-email.php:513
 msgid "Choose which format of email to send."
 msgstr ""
 
@@ -14376,194 +18739,212 @@ msgstr ""
 msgid "Your {site_title} order from {order_date} is complete - download your files"
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-completed-order.php:145
-#: includes/emails/class-wc-email-customer-completed-order.php:153
+#: includes/emails/class-wc-email-customer-completed-order.php:152
 #: includes/emails/class-wc-email-customer-completed-order.php:161
-#: includes/emails/class-wc-email-customer-completed-order.php:169
-#: includes/emails/class-wc-email-customer-invoice.php:147
-#: includes/emails/class-wc-email-customer-invoice.php:155
-#: includes/emails/class-wc-email-customer-invoice.php:163
-#: includes/emails/class-wc-email-customer-invoice.php:171
-#: includes/emails/class-wc-email-customer-refunded-order.php:181
-#: includes/emails/class-wc-email-customer-refunded-order.php:189
-#: includes/emails/class-wc-email-customer-refunded-order.php:197
-#: includes/emails/class-wc-email-customer-refunded-order.php:205
-#: includes/emails/class-wc-email.php:489
-#: includes/emails/class-wc-email.php:497
-msgid "Defaults to <code>%s</code>"
-msgstr ""
-
-#: includes/emails/class-wc-email-customer-completed-order.php:159
-msgid "Subject (downloadable)"
+#: includes/emails/class-wc-email-customer-completed-order.php:170
+#: includes/emails/class-wc-email-customer-completed-order.php:179
+#: includes/emails/class-wc-email-customer-invoice.php:161
+#: includes/emails/class-wc-email-customer-invoice.php:170
+#: includes/emails/class-wc-email-customer-invoice.php:179
+#: includes/emails/class-wc-email-customer-invoice.php:188
+#: includes/emails/class-wc-email-customer-refunded-order.php:206
+#: includes/emails/class-wc-email-customer-refunded-order.php:215
+#: includes/emails/class-wc-email-customer-refunded-order.php:224
+#: includes/emails/class-wc-email-customer-refunded-order.php:233
+#: includes/emails/class-wc-email.php:496
+#: includes/emails/class-wc-email.php:505
+#. translators: %s: default subject
+#. translators: %s: default heading
+#. translators: %s: default subject
+#. translators: %s: default heading
+#. translators: %s: default subject
+#. translators: %s: default heading
+#. translators: %s: default heading
+#. translators: %s: default subject
+#. translators: %s: default heading
+msgid "Defaults to %s"
 msgstr ""
 
 #: includes/emails/class-wc-email-customer-completed-order.php:167
-msgid "Email Heading (downloadable)"
+msgid "Subject (downloadable)"
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-invoice.php:31
+#: includes/emails/class-wc-email-customer-completed-order.php:176
+msgid "Email heading (downloadable)"
+msgstr ""
+
+#: includes/emails/class-wc-email-customer-invoice.php:42
 msgid "Customer invoice"
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-invoice.php:32
+#: includes/emails/class-wc-email-customer-invoice.php:43
 msgid ""
 "Customer invoice emails can be sent to customers containing their order "
 "information and payment links."
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-invoice.php:37
+#: includes/emails/class-wc-email-customer-invoice.php:48
 msgid "Invoice for order {order_number} from {order_date}"
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-invoice.php:38
+#: includes/emails/class-wc-email-customer-invoice.php:49
 msgid "Invoice for order {order_number}"
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-invoice.php:40
+#: includes/emails/class-wc-email-customer-invoice.php:51
 msgid "Your {site_title} order from {order_date}"
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-invoice.php:41
+#: includes/emails/class-wc-email-customer-invoice.php:52
 msgid "Order {order_number} details"
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-invoice.php:145
-#: includes/emails/class-wc-email.php:487
-msgid "Email Subject"
+#: includes/emails/class-wc-email-customer-invoice.php:158
+#: includes/emails/class-wc-email.php:493
+msgid "Email subject"
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-invoice.php:161
-msgid "Email Subject (paid)"
+#: includes/emails/class-wc-email-customer-invoice.php:176
+msgid "Email subject (paid)"
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-invoice.php:169
-msgid "Email Heading (paid)"
+#: includes/emails/class-wc-email-customer-invoice.php:185
+msgid "Email heading (paid)"
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-invoice.php:177
-msgid "Email Type"
-msgstr ""
-
-#: includes/emails/class-wc-email-customer-new-account.php:34
+#: includes/emails/class-wc-email-customer-new-account.php:57
 msgid "New account"
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-new-account.php:35
+#: includes/emails/class-wc-email-customer-new-account.php:58
 msgid ""
 "Customer \"new account\" emails are sent to the customer when a customer "
 "signs up via checkout or account pages."
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-new-account.php:40
+#: includes/emails/class-wc-email-customer-new-account.php:63
 msgid "Your account on {site_title}"
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-new-account.php:41
+#: includes/emails/class-wc-email-customer-new-account.php:64
 msgid "Welcome to {site_title}"
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-note.php:31
+#: includes/emails/class-wc-email-customer-note.php:36
 msgid "Customer note"
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-note.php:32
+#: includes/emails/class-wc-email-customer-note.php:37
 msgid "Customer note emails are sent when you add a note to an order."
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-note.php:37
+#: includes/emails/class-wc-email-customer-note.php:42
 msgid "Note added to your {site_title} order from {order_date}"
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-note.php:38
+#: includes/emails/class-wc-email-customer-note.php:43
 msgid "A note has been added to your order"
 msgstr ""
 
+#: includes/emails/class-wc-email-customer-on-hold-order.php:28
+msgid "Order on-hold"
+msgstr ""
+
+#: includes/emails/class-wc-email-customer-on-hold-order.php:29
+msgid ""
+"This is an order notification sent to customers containing order details "
+"after an order is placed on-hold."
+msgstr ""
+
+#: includes/emails/class-wc-email-customer-on-hold-order.php:30
+#: includes/emails/class-wc-email-customer-processing-order.php:30
+msgid "Thank you for your order"
+msgstr ""
+
+#: includes/emails/class-wc-email-customer-on-hold-order.php:31
+#: includes/emails/class-wc-email-customer-processing-order.php:31
+msgid "Your {site_title} order receipt from {order_date}"
+msgstr ""
+
 #: includes/emails/class-wc-email-customer-processing-order.php:28
 msgid "Processing order"
 msgstr ""
 
 #: includes/emails/class-wc-email-customer-processing-order.php:29
 msgid ""
-"This is an order notification sent to customers containing their order "
-"details after payment."
+"This is an order notification sent to customers containing order details "
+"after payment."
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-processing-order.php:30
-msgid "Thank you for your order"
-msgstr ""
-
-#: includes/emails/class-wc-email-customer-processing-order.php:31
-msgid "Your {site_title} order receipt from {order_date}"
-msgstr ""
-
-#: includes/emails/class-wc-email-customer-refunded-order.php:41
+#: includes/emails/class-wc-email-customer-refunded-order.php:57
 msgid "Your {site_title} order from {order_date} has been partially refunded"
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-refunded-order.php:42
+#: includes/emails/class-wc-email-customer-refunded-order.php:58
 msgid "Your {site_title} order from {order_date} has been refunded"
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-refunded-order.php:44
+#: includes/emails/class-wc-email-customer-refunded-order.php:60
 msgid "Your order has been fully refunded"
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-refunded-order.php:45
+#: includes/emails/class-wc-email-customer-refunded-order.php:61
 msgid "Your order has been partially refunded"
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-refunded-order.php:49
-msgid "Partially Refunded order"
+#: includes/emails/class-wc-email-customer-refunded-order.php:68
+msgid "Partially refunded order"
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-refunded-order.php:50
+#: includes/emails/class-wc-email-customer-refunded-order.php:69
 msgid ""
 "Order partially refunded emails are sent to customers when their orders are "
 "partially refunded."
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-refunded-order.php:58
+#: includes/emails/class-wc-email-customer-refunded-order.php:74
 msgid "Refunded order"
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-refunded-order.php:59
+#: includes/emails/class-wc-email-customer-refunded-order.php:75
 msgid ""
 "Order refunded emails are sent to customers when their orders are marked "
 "refunded."
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-refunded-order.php:179
-msgid "Full Refund Subject"
-msgstr ""
-
-#: includes/emails/class-wc-email-customer-refunded-order.php:187
-msgid "Partial Refund Subject"
-msgstr ""
-
-#: includes/emails/class-wc-email-customer-refunded-order.php:195
-msgid "Full Refund Email Heading"
-msgstr ""
-
 #: includes/emails/class-wc-email-customer-refunded-order.php:203
-msgid "Partial Refund Email Heading"
+msgid "Full refund subject"
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-reset-password.php:37
+#: includes/emails/class-wc-email-customer-refunded-order.php:212
+msgid "Partial refund subject"
+msgstr ""
+
+#: includes/emails/class-wc-email-customer-refunded-order.php:221
+msgid "Full refund email heading"
+msgstr ""
+
+#: includes/emails/class-wc-email-customer-refunded-order.php:230
+msgid "Partial refund email heading"
+msgstr ""
+
+#: includes/emails/class-wc-email-customer-reset-password.php:49
+#: templates/myaccount/form-lost-password.php:40
 msgid "Reset password"
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-reset-password.php:38
+#: includes/emails/class-wc-email-customer-reset-password.php:50
 msgid ""
 "Customer \"reset password\" emails are sent when customers reset their "
 "passwords."
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-reset-password.php:44
-msgid "Password Reset for {site_title}"
+#: includes/emails/class-wc-email-customer-reset-password.php:56
+msgid "Password reset for {site_title}"
 msgstr ""
 
-#: includes/emails/class-wc-email-customer-reset-password.php:45
-msgid "Password Reset Instructions"
+#: includes/emails/class-wc-email-customer-reset-password.php:57
+msgid "Password reset instructions"
 msgstr ""
 
 #: includes/emails/class-wc-email-failed-order.php:27
@@ -14581,10 +18962,6 @@ msgstr ""
 msgid "[{site_title}] Failed order ({order_number})"
 msgstr ""
 
-#: includes/emails/class-wc-email-new-order.php:27
-msgid "New order"
-msgstr ""
-
 #: includes/emails/class-wc-email-new-order.php:28
 msgid ""
 "New order emails are sent to chosen recipient(s) when a new order is "
@@ -14599,71 +18976,73 @@ msgstr ""
 msgid "[{site_title}] New customer order ({order_number}) - {order_date}"
 msgstr ""
 
-#: includes/emails/class-wc-email.php:519
+#: includes/emails/class-wc-email.php:527
 msgid "Plain text"
 msgstr ""
 
-#: includes/emails/class-wc-email.php:522
+#: includes/emails/class-wc-email.php:530
 msgid "HTML"
 msgstr ""
 
-#: includes/emails/class-wc-email.php:523
+#: includes/emails/class-wc-email.php:531
 msgid "Multipart"
 msgstr ""
 
-#: includes/emails/class-wc-email.php:586
+#: includes/emails/class-wc-email.php:596
 msgid "Could not write to template file."
 msgstr ""
 
-#: includes/emails/class-wc-email.php:632
+#: includes/emails/class-wc-email.php:642
 msgid "Template file copied to theme."
 msgstr ""
 
-#: includes/emails/class-wc-email.php:661
+#: includes/emails/class-wc-email.php:671
 msgid "Template file deleted from theme."
 msgstr ""
 
-#: includes/emails/class-wc-email.php:734
+#: includes/emails/class-wc-email.php:717
+msgid "Return to emails"
+msgstr ""
+
+#: includes/emails/class-wc-email.php:745
 msgid "HTML template"
 msgstr ""
 
-#: includes/emails/class-wc-email.php:735
+#: includes/emails/class-wc-email.php:746
 msgid "Plain text template"
 msgstr ""
 
-#: includes/emails/class-wc-email.php:760
+#: includes/emails/class-wc-email.php:771
 msgid "Delete template file"
 msgstr ""
 
-#: includes/emails/class-wc-email.php:763
-msgid ""
-"This template has been overridden by your theme and can be found in: "
-"<code>%s</code>."
+#: includes/emails/class-wc-email.php:774
+msgid "This template has been overridden by your theme and can be found in: %s."
 msgstr ""
 
-#: includes/emails/class-wc-email.php:776
+#: includes/emails/class-wc-email.php:787
 msgid "Copy file to theme"
 msgstr ""
 
-#: includes/emails/class-wc-email.php:779
+#: includes/emails/class-wc-email.php:790
 msgid ""
-"To override and edit this email template copy <code>%s</code> to your theme "
-"folder: <code>%s</code>."
+"To override and edit this email template copy %1$s to your theme folder: "
+"%2$s."
 msgstr ""
 
-#: includes/emails/class-wc-email.php:788
+#: includes/emails/class-wc-email.php:799
 msgid "File was not found."
 msgstr ""
 
-#: includes/emails/class-wc-email.php:815
+#: includes/emails/class-wc-email.php:826
 msgid "View template"
 msgstr ""
 
-#: includes/emails/class-wc-email.php:816
+#: includes/emails/class-wc-email.php:827
 msgid "Hide template"
 msgstr ""
 
-#: includes/emails/class-wc-email.php:827
+#: includes/emails/class-wc-email.php:838
 msgid "Are you sure you want to delete this template file?"
 msgstr ""
 
@@ -14675,341 +19054,387 @@ msgstr ""
 msgid "Allows payments by BACS, more commonly known as direct bank/wire transfer."
 msgstr ""
 
-#: includes/gateways/bacs/class-wc-gateway-bacs.php:76
-msgid "Enable Bank Transfer"
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:75
+msgid "Enable bank transfer"
 msgstr ""
 
-#: includes/gateways/bacs/class-wc-gateway-bacs.php:80
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:79
 #: includes/gateways/cheque/class-wc-gateway-cheque.php:60
-#: includes/gateways/cod/class-wc-gateway-cod.php:68
+#: includes/gateways/cod/class-wc-gateway-cod.php:75
 #: includes/gateways/paypal/includes/settings-paypal.php:18
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:190
-#: includes/shipping/local-delivery/class-wc-shipping-local-delivery.php:95
-#: includes/shipping/local-pickup/class-wc-shipping-local-pickup.php:72
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:197
+#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:74
+#: includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php:117
+#: includes/shipping/legacy-local-pickup/class-wc-shipping-legacy-local-pickup.php:94
+#: includes/shipping/local-pickup/class-wc-shipping-local-pickup.php:70
 #: includes/widgets/class-wc-widget-cart.php:32
 #: includes/widgets/class-wc-widget-layered-nav-filters.php:30
-#: includes/widgets/class-wc-widget-layered-nav.php:78
+#: includes/widgets/class-wc-widget-layered-nav.php:75
 #: includes/widgets/class-wc-widget-price-filter.php:32
 #: includes/widgets/class-wc-widget-product-categories.php:44
 #: includes/widgets/class-wc-widget-product-search.php:30
 #: includes/widgets/class-wc-widget-product-tag-cloud.php:30
 #: includes/widgets/class-wc-widget-products.php:30
+#: includes/widgets/class-wc-widget-rating-filter.php:31
 #: includes/widgets/class-wc-widget-recent-reviews.php:30
 #: includes/widgets/class-wc-widget-recently-viewed.php:30
 #: includes/widgets/class-wc-widget-top-rated-products.php:32
 msgid "Title"
 msgstr ""
 
-#: includes/gateways/bacs/class-wc-gateway-bacs.php:82
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:81
 #: includes/gateways/cheque/class-wc-gateway-cheque.php:62
 #: includes/gateways/paypal/includes/settings-paypal.php:20
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:192
-#: includes/shipping/flat-rate/includes/settings-flat-rate.php:22
-#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:69
-#: includes/shipping/local-delivery/class-wc-shipping-local-delivery.php:97
-#: includes/shipping/local-pickup/class-wc-shipping-local-pickup.php:74
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:199
+#: includes/shipping/flat-rate/includes/settings-flat-rate.php:16
+#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:76
+#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:22
+#: includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php:91
+#: includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php:119
+#: includes/shipping/legacy-local-pickup/class-wc-shipping-legacy-local-pickup.php:96
+#: includes/shipping/local-pickup/class-wc-shipping-local-pickup.php:72
 msgid "This controls the title which the user sees during checkout."
 msgstr ""
 
-#: includes/gateways/bacs/class-wc-gateway-bacs.php:83
-msgid "Direct Bank Transfer"
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:82
+msgid "Direct bank transfer"
 msgstr ""
 
-#: includes/gateways/bacs/class-wc-gateway-bacs.php:89
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:88
 #: includes/gateways/cheque/class-wc-gateway-cheque.php:69
-#: includes/gateways/cod/class-wc-gateway-cod.php:70
+#: includes/gateways/cod/class-wc-gateway-cod.php:77
 msgid "Payment method description that the customer will see on your checkout."
 msgstr ""
 
-#: includes/gateways/bacs/class-wc-gateway-bacs.php:90
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:89
 msgid ""
 "Make your payment directly into our bank account. Please use your Order ID "
 "as the payment reference. Your order won't be shipped until the funds have "
 "cleared in our account."
 msgstr ""
 
-#: includes/gateways/bacs/class-wc-gateway-bacs.php:94
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:93
 #: includes/gateways/cheque/class-wc-gateway-cheque.php:74
-#: includes/gateways/cod/class-wc-gateway-cod.php:82
+#: includes/gateways/cod/class-wc-gateway-cod.php:89
 msgid "Instructions"
 msgstr ""
 
-#: includes/gateways/bacs/class-wc-gateway-bacs.php:96
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:95
 #: includes/gateways/cheque/class-wc-gateway-cheque.php:76
 msgid "Instructions that will be added to the thank you page and emails."
 msgstr ""
 
-#: includes/gateways/bacs/class-wc-gateway-bacs.php:118
-#: includes/gateways/bacs/class-wc-gateway-bacs.php:272
-msgid "Sort Code"
-msgstr ""
-
-#: includes/gateways/bacs/class-wc-gateway-bacs.php:122
-msgid "Account Details"
-msgstr ""
-
-#: includes/gateways/bacs/class-wc-gateway-bacs.php:128
-msgid "Account Name"
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:119
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:277
+msgid "Sort code"
 msgstr ""
 
 #: includes/gateways/bacs/class-wc-gateway-bacs.php:129
-#: includes/gateways/bacs/class-wc-gateway-bacs.php:292
-msgid "Account Number"
+msgid "Account name"
 msgstr ""
 
 #: includes/gateways/bacs/class-wc-gateway-bacs.php:130
-msgid "Bank Name"
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:301
+#: includes/gateways/class-wc-payment-gateway-echeck.php:44
+msgid "Account number"
 msgstr ""
 
-#: includes/gateways/bacs/class-wc-gateway-bacs.php:132
-#: includes/gateways/bacs/class-wc-gateway-bacs.php:300
-msgid "IBAN"
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:131
+msgid "Bank name"
 msgstr ""
 
 #: includes/gateways/bacs/class-wc-gateway-bacs.php:133
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:309
+msgid "IBAN"
+msgstr ""
+
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:134
 msgid "BIC / Swift"
 msgstr ""
 
-#: includes/gateways/bacs/class-wc-gateway-bacs.php:158
-msgid "+ Add Account"
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:159
+msgid "+ Add account"
 msgstr ""
 
-#: includes/gateways/bacs/class-wc-gateway-bacs.php:158
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:159
 msgid "Remove selected account(s)"
 msgstr ""
 
-#: includes/gateways/bacs/class-wc-gateway-bacs.php:277
-msgid "Our Bank Details"
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:297
+msgid "Bank"
 msgstr ""
 
-#: includes/gateways/bacs/class-wc-gateway-bacs.php:304
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:313
 msgid "BIC"
 msgstr ""
 
-#: includes/gateways/bacs/class-wc-gateway-bacs.php:332
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:329
+msgid "Our bank details"
+msgstr ""
+
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:346
 msgid "Awaiting BACS payment"
 msgstr ""
 
-#: includes/gateways/bacs/class-wc-gateway-bacs.php:362
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:375
 msgid "BSB"
 msgstr ""
 
-#: includes/gateways/bacs/class-wc-gateway-bacs.php:367
-msgid "Bank Transit Number"
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:380
+msgid "Bank transit number"
 msgstr ""
 
-#: includes/gateways/bacs/class-wc-gateway-bacs.php:372
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:385
 msgid "IFSC"
 msgstr ""
 
-#: includes/gateways/bacs/class-wc-gateway-bacs.php:377
-msgid "Branch Sort"
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:390
+msgid "Branch sort"
 msgstr ""
 
-#: includes/gateways/bacs/class-wc-gateway-bacs.php:382
-#: includes/gateways/bacs/class-wc-gateway-bacs.php:387
-msgid "Bank Code"
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:395
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:400
+msgid "Bank code"
 msgstr ""
 
-#: includes/gateways/bacs/class-wc-gateway-bacs.php:392
-msgid "Routing Number"
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:405
+#: includes/gateways/class-wc-payment-gateway-echeck.php:40
+msgid "Routing number"
 msgstr ""
 
-#: includes/gateways/bacs/class-wc-gateway-bacs.php:397
-msgid "Branch Code"
-msgstr ""
-
-#: includes/gateways/cheque/class-wc-gateway-cheque.php:27
-msgid "Cheque"
+#: includes/gateways/bacs/class-wc-gateway-bacs.php:410
+msgid "Branch code"
 msgstr ""
 
 #: includes/gateways/cheque/class-wc-gateway-cheque.php:28
 msgid ""
-"Allows cheque payments. Why would you take cheques in this day and age? "
-"Well you probably wouldn't but it does allow you to make test purchases for "
+"Allows check payments. Why would you take checks in this day and age? Well "
+"you probably wouldn't but it does allow you to make test purchases for "
 "testing order emails and the 'success' pages etc."
 msgstr ""
 
 #: includes/gateways/cheque/class-wc-gateway-cheque.php:56
-msgid "Enable Cheque Payment"
-msgstr ""
-
-#: includes/gateways/cheque/class-wc-gateway-cheque.php:63
-msgid "Cheque Payment"
+msgid "Enable check payments"
 msgstr ""
 
 #: includes/gateways/cheque/class-wc-gateway-cheque.php:70
 msgid ""
-"Please send your cheque to Store Name, Store Street, Store Town, Store "
-"State / County, Store Postcode."
+"Please send a check to Store Name, Store Street, Store Town, Store State / "
+"County, Store Postcode."
 msgstr ""
 
-#: includes/gateways/cheque/class-wc-gateway-cheque.php:116
-msgid "Awaiting cheque payment"
+#: includes/gateways/class-wc-payment-gateway-cc.php:54
+msgid "Card code"
 msgstr ""
 
-#: includes/gateways/cod/class-wc-gateway-cod.php:27
+#: includes/gateways/class-wc-payment-gateway-cc.php:55
+msgid "CVC"
+msgstr ""
+
+#: includes/gateways/class-wc-payment-gateway-cc.php:60
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:306
+msgid "Card number"
+msgstr ""
+
+#: includes/gateways/class-wc-payment-gateway-cc.php:64
+msgid "Expiry (MM/YY)"
+msgstr ""
+
+#: includes/gateways/class-wc-payment-gateway-cc.php:65
+msgid "MM / YY"
+msgstr ""
+
+#: includes/gateways/cod/class-wc-gateway-cod.php:52
 msgid "Have your customers pay with cash (or by other means) upon delivery."
 msgstr ""
 
-#: includes/gateways/cod/class-wc-gateway-cod.php:61
-msgid "Enable COD"
-msgstr ""
-
-#: includes/gateways/cod/class-wc-gateway-cod.php:62
-msgid "Enable Cash on Delivery"
-msgstr ""
-
-#: includes/gateways/cod/class-wc-gateway-cod.php:77
-msgid "Payment method description that the customer will see on your website."
-msgstr ""
-
-#: includes/gateways/cod/class-wc-gateway-cod.php:78
-#: includes/gateways/cod/class-wc-gateway-cod.php:85
-msgid "Pay with cash upon delivery."
+#: includes/gateways/cod/class-wc-gateway-cod.php:69
+msgid "Enable cash on delivery"
 msgstr ""
 
 #: includes/gateways/cod/class-wc-gateway-cod.php:84
+msgid "Payment method description that the customer will see on your website."
+msgstr ""
+
+#: includes/gateways/cod/class-wc-gateway-cod.php:85
+#: includes/gateways/cod/class-wc-gateway-cod.php:92
+msgid "Pay with cash upon delivery."
+msgstr ""
+
+#: includes/gateways/cod/class-wc-gateway-cod.php:91
 msgid "Instructions that will be added to the thank you page."
 msgstr ""
 
-#: includes/gateways/cod/class-wc-gateway-cod.php:89
+#: includes/gateways/cod/class-wc-gateway-cod.php:96
 msgid "Enable for shipping methods"
 msgstr ""
 
-#: includes/gateways/cod/class-wc-gateway-cod.php:94
+#: includes/gateways/cod/class-wc-gateway-cod.php:101
 msgid ""
 "If COD is only available for certain methods, set it up here. Leave blank "
 "to enable for all methods."
 msgstr ""
 
-#: includes/gateways/cod/class-wc-gateway-cod.php:98
+#: includes/gateways/cod/class-wc-gateway-cod.php:105
 msgid "Select shipping methods"
 msgstr ""
 
-#: includes/gateways/cod/class-wc-gateway-cod.php:102
+#: includes/gateways/cod/class-wc-gateway-cod.php:109
 msgid "Accept for virtual orders"
 msgstr ""
 
-#: includes/gateways/cod/class-wc-gateway-cod.php:103
+#: includes/gateways/cod/class-wc-gateway-cod.php:110
 msgid "Accept COD if the order is virtual"
 msgstr ""
 
-#: includes/gateways/cod/class-wc-gateway-cod.php:203
+#: includes/gateways/cod/class-wc-gateway-cod.php:208
 msgid "Payment to be made upon delivery."
 msgstr ""
 
-#: includes/gateways/paypal/class-wc-gateway-paypal.php:32
+#: includes/gateways/paypal/class-wc-gateway-paypal.php:35
 msgid "Proceed to PayPal"
 msgstr ""
 
-#: includes/gateways/paypal/class-wc-gateway-paypal.php:33
+#: includes/gateways/paypal/class-wc-gateway-paypal.php:36
 #: includes/gateways/paypal/includes/settings-paypal.php:21
 msgid "PayPal"
 msgstr ""
 
-#: includes/gateways/paypal/class-wc-gateway-paypal.php:34
+#: includes/gateways/paypal/class-wc-gateway-paypal.php:37
 msgid ""
-"PayPal standard sends customers to PayPal to enter their payment "
+"PayPal Standard sends customers to PayPal to enter their payment "
 "information. PayPal IPN requires fsockopen/cURL support to update order "
-"statuses after payment. Check the %ssystem status%s page for more details."
+"statuses after payment. Check the <a href=\"%s\">system status</a> page for "
+"more details."
 msgstr ""
 
-#: includes/gateways/paypal/class-wc-gateway-paypal.php:93
-msgid "PayPal Acceptance Mark"
+#: includes/gateways/paypal/class-wc-gateway-paypal.php:100
+msgid "PayPal acceptance mark"
 msgstr ""
 
-#: includes/gateways/paypal/class-wc-gateway-paypal.php:96
+#: includes/gateways/paypal/class-wc-gateway-paypal.php:103
 msgid "What is PayPal?"
 msgstr ""
 
-#: includes/gateways/paypal/class-wc-gateway-paypal.php:202
-msgid "Gateway Disabled"
+#: includes/gateways/paypal/class-wc-gateway-paypal.php:212
+msgid "Gateway disabled"
 msgstr ""
 
-#: includes/gateways/paypal/class-wc-gateway-paypal.php:202
+#: includes/gateways/paypal/class-wc-gateway-paypal.php:212
 msgid "PayPal does not support your store currency."
 msgstr ""
 
-#: includes/gateways/paypal/class-wc-gateway-paypal.php:269
-msgid "Refund Failed: No transaction ID"
+#: includes/gateways/paypal/class-wc-gateway-paypal.php:288
+msgid "Refund failed: No transaction ID"
 msgstr ""
 
-#: includes/gateways/paypal/class-wc-gateway-paypal.php:290
-msgid "Refunded %s - Refund ID: %s"
+#: includes/gateways/paypal/class-wc-gateway-paypal.php:305
+msgid "Refunded %1$s - Refund ID: %2$s"
 msgstr ""
 
-#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:130
+#: includes/gateways/paypal/class-wc-gateway-paypal.php:327
+msgid "Payment could not captured: %s"
+msgstr ""
+
+#: includes/gateways/paypal/class-wc-gateway-paypal.php:336
+msgid "Payment of %1$s was captured - Auth ID: %2$s, Transaction ID: %3$s"
+msgstr ""
+
+#: includes/gateways/paypal/class-wc-gateway-paypal.php:341
+msgid "Payment could not captured - Auth ID: %1$s, Status: %2$s"
+msgstr ""
+
+#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:135
 msgid "Validation error: PayPal currencies do not match (code %s)."
 msgstr ""
 
-#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:144
+#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:150
 msgid "Validation error: PayPal amounts do not match (gross %s)."
 msgstr ""
 
-#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:159
+#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:166
 msgid "Validation error: PayPal IPN response from a different email address (%s)."
 msgstr ""
 
-#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:182
+#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:193
 msgid "IPN payment completed"
 msgstr ""
 
-#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:190
-msgid "Payment pending: %s"
+#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:201
+#: includes/gateways/paypal/includes/class-wc-gateway-paypal-pdt-handler.php:123
+msgid ""
+"Payment authorized. Change payment status to processing or complete to "
+"capture funds."
 msgstr ""
 
-#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:207
-#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:243
-#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:257
+#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:203
+#: includes/gateways/paypal/includes/class-wc-gateway-paypal-pdt-handler.php:125
+msgid "Payment pending (%s)."
+msgstr ""
+
+#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:223
+#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:276
+#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:291
 msgid "Payment %s via IPN."
 msgstr ""
 
-#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:246
+#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:261
+msgid "Payment for cancelled order %s received"
+msgstr ""
+
+#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:262
+msgid ""
+"Order #%1$s has been marked paid by PayPal IPN, but was previously "
+"cancelled. Admin handling required."
+msgstr ""
+
+#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:279
 msgid "Payment for order %s refunded"
 msgstr ""
 
-#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:247
-msgid "Order #%s has been marked as refunded - PayPal reason code: %s"
+#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:280
+msgid "Order #%1$s has been marked as refunded - PayPal reason code: %2$s"
 msgstr ""
 
-#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:260
+#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:294
 msgid "Payment for order %s reversed"
 msgstr ""
 
-#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:261
-msgid "Order #%s has been marked on-hold due to a reversal - PayPal reason code: %s"
+#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:295
+msgid ""
+"Order #%1$s has been marked on-hold due to a reversal - PayPal reason code: "
+"%2$s"
 msgstr ""
 
-#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:271
+#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:306
 msgid "Reversal cancelled for order #%s"
 msgstr ""
 
-#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:272
+#: includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php:307
 msgid ""
-"Order #%s has had a reversal cancelled. Please check the status of payment "
-"and update the order status accordingly here: %s"
+"Order #%1$s has had a reversal cancelled. Please check the status of "
+"payment and update the order status accordingly here: %2$s"
 msgstr ""
 
-#: includes/gateways/paypal/includes/class-wc-gateway-paypal-pdt-handler.php:74
+#: includes/gateways/paypal/includes/class-wc-gateway-paypal-pdt-handler.php:100
 msgid "Validation error: PayPal amounts do not match (amt %s)."
 msgstr ""
 
-#: includes/gateways/paypal/includes/class-wc-gateway-paypal-pdt-handler.php:76
+#: includes/gateways/paypal/includes/class-wc-gateway-paypal-pdt-handler.php:102
 msgid "PDT payment completed"
 msgstr ""
 
-#: includes/gateways/paypal/includes/class-wc-gateway-paypal-request.php:183
-#: includes/gateways/paypal/includes/class-wc-gateway-paypal-request.php:266
+#: includes/gateways/paypal/includes/class-wc-gateway-paypal-request.php:188
+#: includes/gateways/paypal/includes/class-wc-gateway-paypal-request.php:212
 msgid "Shipping via %s"
 msgstr ""
 
 #: includes/gateways/paypal/includes/settings-paypal.php:14
-msgid "Enable PayPal standard"
+msgid "Enable PayPal Standard"
 msgstr ""
 
 #: includes/gateways/paypal/includes/settings-paypal.php:28
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:199
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:206
 msgid "This controls the description which the user sees during checkout."
 msgstr ""
 
@@ -15020,7 +19445,7 @@ msgid ""
 msgstr ""
 
 #: includes/gateways/paypal/includes/settings-paypal.php:32
-msgid "PayPal Email"
+msgid "PayPal email"
 msgstr ""
 
 #: includes/gateways/paypal/includes/settings-paypal.php:34
@@ -15030,7 +19455,7 @@ msgid ""
 msgstr ""
 
 #: includes/gateways/paypal/includes/settings-paypal.php:40
-msgid "PayPal Sandbox"
+msgid "PayPal sandbox"
 msgstr ""
 
 #: includes/gateways/paypal/includes/settings-paypal.php:42
@@ -15039,12 +19464,12 @@ msgstr ""
 
 #: includes/gateways/paypal/includes/settings-paypal.php:44
 msgid ""
-"PayPal sandbox can be used to test payments. Sign up for a developer "
-"account <a href=\"%s\">here</a>."
+"PayPal sandbox can be used to test payments. Sign up for a <a "
+"href=\"%s\">developer account</a>."
 msgstr ""
 
 #: includes/gateways/paypal/includes/settings-paypal.php:47
-msgid "Debug Log"
+msgid "Debug log"
 msgstr ""
 
 #: includes/gateways/paypal/includes/settings-paypal.php:49
@@ -15052,7 +19477,7 @@ msgid "Enable logging"
 msgstr ""
 
 #: includes/gateways/paypal/includes/settings-paypal.php:51
-msgid "Log PayPal events, such as IPN requests, inside <code>%s</code>"
+msgid "Log PayPal events, such as IPN requests, inside %s"
 msgstr ""
 
 #: includes/gateways/paypal/includes/settings-paypal.php:54
@@ -15060,7 +19485,7 @@ msgid "Advanced options"
 msgstr ""
 
 #: includes/gateways/paypal/includes/settings-paypal.php:59
-msgid "Receiver Email"
+msgid "Receiver email"
 msgstr ""
 
 #: includes/gateways/paypal/includes/settings-paypal.php:61
@@ -15071,7 +19496,7 @@ msgid ""
 msgstr ""
 
 #: includes/gateways/paypal/includes/settings-paypal.php:67
-msgid "PayPal Identity Token"
+msgid "PayPal identity token"
 msgstr ""
 
 #: includes/gateways/paypal/includes/settings-paypal.php:69
@@ -15083,7 +19508,7 @@ msgid ""
 msgstr ""
 
 #: includes/gateways/paypal/includes/settings-paypal.php:75
-msgid "Invoice Prefix"
+msgid "Invoice prefix"
 msgstr ""
 
 #: includes/gateways/paypal/includes/settings-paypal.php:77
@@ -15104,7 +19529,7 @@ msgid ""
 msgstr ""
 
 #: includes/gateways/paypal/includes/settings-paypal.php:89
-msgid "Address Override"
+msgid "Address override"
 msgstr ""
 
 #: includes/gateways/paypal/includes/settings-paypal.php:91
@@ -15120,7 +19545,7 @@ msgid ""
 msgstr ""
 
 #: includes/gateways/paypal/includes/settings-paypal.php:96
-msgid "Payment Action"
+msgid "Payment action"
 msgstr ""
 
 #: includes/gateways/paypal/includes/settings-paypal.php:99
@@ -15138,144 +19563,157 @@ msgid "Authorize"
 msgstr ""
 
 #: includes/gateways/paypal/includes/settings-paypal.php:108
-msgid "Page Style"
+msgid "Page style"
 msgstr ""
 
 #: includes/gateways/paypal/includes/settings-paypal.php:110
 msgid ""
 "Optionally enter the name of the page style you wish to use. These are "
-"defined within your PayPal account."
+"defined within your PayPal account. This affects classic PayPal checkout "
+"screens."
 msgstr ""
 
 #: includes/gateways/paypal/includes/settings-paypal.php:116
-msgid "API Credentials"
+msgid "Image url"
 msgstr ""
 
 #: includes/gateways/paypal/includes/settings-paypal.php:118
 msgid ""
+"Optionally enter the URL to a 150x50px image displayed as your logo in the "
+"upper left corner of the PayPal checkout pages."
+msgstr ""
+
+#: includes/gateways/paypal/includes/settings-paypal.php:124
+msgid "API credentials"
+msgstr ""
+
+#: includes/gateways/paypal/includes/settings-paypal.php:126
+msgid ""
 "Enter your PayPal API credentials to process refunds via PayPal. Learn how "
-"to access your PayPal API Credentials %shere%s."
-msgstr ""
-
-#: includes/gateways/paypal/includes/settings-paypal.php:121
-msgid "API Username"
-msgstr ""
-
-#: includes/gateways/paypal/includes/settings-paypal.php:123
-#: includes/gateways/paypal/includes/settings-paypal.php:131
-#: includes/gateways/paypal/includes/settings-paypal.php:139
-msgid "Get your API credentials from PayPal."
+"to access your <a href=\"%s\">PayPal API Credentials</a>."
 msgstr ""
 
 #: includes/gateways/paypal/includes/settings-paypal.php:129
-msgid "API Password"
+msgid "API username"
+msgstr ""
+
+#: includes/gateways/paypal/includes/settings-paypal.php:131
+#: includes/gateways/paypal/includes/settings-paypal.php:139
+#: includes/gateways/paypal/includes/settings-paypal.php:147
+msgid "Get your API credentials from PayPal."
 msgstr ""
 
 #: includes/gateways/paypal/includes/settings-paypal.php:137
-msgid "API Signature"
+msgid "API password"
+msgstr ""
+
+#: includes/gateways/paypal/includes/settings-paypal.php:145
+msgid "API signature"
 msgstr ""
 
 #: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:94
-#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:188
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:316
+#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:187
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:420
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:594
 msgid ""
 "Please make sure your card details have been entered correctly and that "
 "your browser supports JavaScript."
 msgstr ""
 
 #: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:97
-#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:191
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:319
+#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:190
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:423
 msgid ""
 "Developers: Please make sure that you're including jQuery and there are no "
 "JavaScript errors on the page."
 msgstr ""
 
 #: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:114
-#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:211
+#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:210
 msgid "Error creating user in Simplify Commerce."
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:182
-#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:292
-#: includes/gateways/simplify-commerce-deprecated/class-wc-addons-gateway-simplify-commerce-deprecated.php:60
+#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:181
+#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:291
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:494
 msgid "Sorry, the minimum allowed order total is 0.50 to use this payment method."
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:298
-#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:435
-#: includes/gateways/simplify-commerce-deprecated/class-wc-addons-gateway-simplify-commerce-deprecated.php:70
-msgid "Customer not found"
+#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:297
+#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:440
+msgid "Customer not found."
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:306
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:328
-msgid "%s - Order #%s"
+#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:305
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:501
+msgid "%1$s - Order #%2$s"
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:322
-#: includes/gateways/simplify-commerce-deprecated/class-wc-addons-gateway-simplify-commerce-deprecated.php:100
-msgid "Simplify payment error: %s"
+#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:321
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:520
+msgid "Simplify payment error: %s."
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:332
-#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:452
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:484
-#: includes/gateways/simplify-commerce-deprecated/class-wc-addons-gateway-simplify-commerce-deprecated.php:110
-msgid "Simplify payment approved (ID: %s, Auth Code: %s)"
+#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:331
+#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:457
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:530
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:695
+msgid "Simplify payment approved (ID: %1$s, Auth Code: %2$s)"
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:336
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:342
-#: includes/gateways/simplify-commerce-deprecated/class-wc-addons-gateway-simplify-commerce-deprecated.php:114
+#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:335
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:534
 msgid "Simplify payment declined"
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:338
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:344
-#: includes/gateways/simplify-commerce-deprecated/class-wc-addons-gateway-simplify-commerce-deprecated.php:116
+#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:337
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:536
 msgid "Payment was declined - please try another card."
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:352
-#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:457
+#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:351
+#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:462
 msgid "Simplify Transaction Failed (%s)"
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:430
-msgid "%s - Pre-order for \"%s\""
+#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:431
+#. translators: 1: site name 2: product name 3: order number
+msgid "%1$s - Pre-order for \"%2$s\" (Order #%3$s)"
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:430
-#: includes/gateways/simplify-commerce-deprecated/class-wc-addons-gateway-simplify-commerce-deprecated.php:65
-msgid "(Order #%s)"
-msgstr ""
-
-#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:454
+#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:459
 msgid "Payment was declined - the customer need to try another card."
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:501
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:456
+#: includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php:506
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:667
 msgid "Payment was declined by Simplify Commerce."
 msgstr ""
 
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:24
+msgid "Simplify Commerce"
+msgstr ""
+
 #: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:25
 msgid ""
 "Take payments via Simplify Commerce - uses simplify.js to create card "
 "tokens and the Simplify Commerce SDK. Requires SSL when sandbox is disabled."
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:89
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:26
+msgid "Use a new card"
+msgstr ""
+
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:90
 msgid "Simplify Commerce by MasterCard"
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:94
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:95
 msgid "Getting started"
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:95
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:101
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:96
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:102
 msgid ""
 "Simplify Commerce is your merchant account and payment gateway all rolled "
 "into one. Choose Simplify Commerce as your WooCommerce payment gateway to "
@@ -15283,21 +19721,21 @@ msgid ""
 "backed by MasterCard."
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:97
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:98
 msgid "Sign up for Simplify Commerce"
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:144
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:148
 msgid ""
 "Simplify Commerce Error: Simplify commerce requires PHP 5.3 and above. You "
 "are using version %s."
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:149
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:153
 msgid "Simplify Commerce Error: Please enter your public and private keys"
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:154
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:158
 msgid ""
 "Simplify Commerce is enabled, but the <a href=\"%s\">force SSL option</a> "
 "is disabled; your checkout may not be secure! Please enable SSL and ensure "
@@ -15305,23 +19743,24 @@ msgid ""
 "in sandbox mode."
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:184
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:191
 msgid "Enable Simplify Commerce"
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:193
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:200
+#: includes/wc-account-functions.php:238 includes/wc-account-functions.php:304
 msgid "Credit card"
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:204
-msgid "Payment Mode"
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:211
+msgid "Payment mode"
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:205
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:212
 msgid "Enable Hosted Payments"
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:207
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:214
 msgid ""
 "Standard will display the credit card fields on your store (SSL required). "
 "%1$s Hosted Payments will display a Simplify Commerce modal dialog on your "
@@ -15331,426 +19770,629 @@ msgid ""
 "Commerce docs%3$s."
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:211
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:218
 msgid "Hosted Payments"
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:215
-msgid "Modal Color"
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:222
+msgid "Modal color"
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:217
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:224
 msgid "Set the color of the buttons and titles on the modal dialog."
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:222
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:229
 msgid "Sandbox"
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:223
-msgid "Enable Sandbox Mode"
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:230
+msgid "Enable sandbox mode"
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:225
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:232
 msgid ""
 "Place the payment gateway in sandbox mode using sandbox API keys (real "
 "payments will not be taken)."
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:229
-msgid "Sandbox Public Key"
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:236
+msgid "Sandbox public key"
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:231
 #: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:238
 #: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:245
 #: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:252
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:259
 msgid "Get your API keys from your Simplify account: Settings > API Keys."
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:236
-msgid "Sandbox Private Key"
-msgstr ""
-
 #: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:243
-msgid "Public Key"
+msgid "Sandbox private key"
 msgstr ""
 
 #: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:250
-msgid "Private Key"
+msgid "Public key"
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:266
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:257
+msgid "Private key"
+msgstr ""
+
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:273
 msgid "TEST MODE ENABLED. Use a test card: %s"
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:295
-msgid "Expiry Month"
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:307
+msgid "Expiry month"
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:296
-msgid "Expiry Year"
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:308
+msgid "Expiry year"
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:297
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:309
 msgid "is invalid"
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:427
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:317
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:331
+msgid "There was a problem adding this card."
+msgstr ""
+
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:638
 msgid ""
 "Thank you for your order, please click the button below to pay with credit "
 "card using Simplify Commerce by MasterCard."
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:436
-msgid "Pay Now"
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:647
+msgid "Pay now"
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:436
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:647
 msgid "Cancel order &amp; restore cart"
 msgstr ""
 
-#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:520
+#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:731
 msgid "Refund was declined."
 msgstr ""
 
-#: includes/gateways/simplify-commerce-deprecated/class-wc-addons-gateway-simplify-commerce-deprecated.php:65
-msgid "%s - Subscription for \"%s\""
+#: includes/legacy/abstract-wc-legacy-order.php:504
+#: includes/wc-template-functions.php:2444
+#. translators: 1: current item count
+msgid "Download %d"
 msgstr ""
 
-#: includes/shipping/flat-rate/class-wc-shipping-flat-rate.php:24
-#: includes/shipping/flat-rate/includes/settings-flat-rate.php:23
-msgid "Flat Rate"
+#: includes/legacy/abstract-wc-legacy-order.php:504
+#: includes/wc-template-functions.php:2444 templates/myaccount/downloads.php:76
+msgid "Download"
+msgstr ""
+
+#: includes/legacy/abstract-wc-legacy-product.php:72
+msgid "Product properties should not be accessed directly."
+msgstr ""
+
+#: includes/libraries/wp-background-process.php:420
+msgid "Every %d minutes"
+msgstr ""
+
+#: includes/log-handlers/class-wc-log-handler-email.php:151
+msgid "[%1$s] %2$s: %3$s WooCommerce log message"
+msgid_plural "[%1$s] %2$s: %3$s WooCommerce log messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: includes/log-handlers/class-wc-log-handler-email.php:172
+msgid "You have received the following WooCommerce log message:"
+msgid_plural "You have received the following WooCommerce log messages:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: includes/log-handlers/class-wc-log-handler-email.php:183
+msgid "Visit %s admin area:"
+msgstr ""
+
+#: includes/log-handlers/class-wc-log-handler-file.php:344
+msgid "This method should not be called before plugins_loaded."
+msgstr ""
+
+#: includes/payment-tokens/class-wc-payment-token-cc.php:45
+#. translators: 1: credit card type 2: last 4 digits 3: expiry month 4: expiry
+#. year
+msgid "%1$s ending in %2$s (expires %3$s/%4$s)"
+msgstr ""
+
+#: includes/payment-tokens/class-wc-payment-token-echeck.php:41
+#: includes/wc-account-functions.php:239 includes/wc-account-functions.php:326
+msgid "eCheck"
 msgstr ""
 
 #: includes/shipping/flat-rate/class-wc-shipping-flat-rate.php:25
-msgid "Flat Rate Shipping lets you charge a fixed rate for shipping."
+#: includes/shipping/flat-rate/includes/settings-flat-rate.php:17
+#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:23
+msgid "Flat rate"
+msgstr ""
+
+#: includes/shipping/flat-rate/class-wc-shipping-flat-rate.php:26
+msgid "Lets you charge a fixed rate for shipping."
 msgstr ""
 
 #: includes/shipping/flat-rate/includes/settings-flat-rate.php:7
+#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:7
 msgid "Enter a cost (excl. tax) or sum, e.g. <code>10.00 * [qty]</code>."
 msgstr ""
 
 #: includes/shipping/flat-rate/includes/settings-flat-rate.php:7
 msgid ""
+"Use <code>[qty]</code> for the number of items, <br/><code>[cost]</code> "
+"for the total cost of items, and <code>[fee percent=\"10\" min_fee=\"20\" "
+"max_fee=\"\"]</code> for percentage based fees."
+msgstr ""
+
+#: includes/shipping/flat-rate/includes/settings-flat-rate.php:14
+#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:20
+#: includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php:89
+msgid "Method title"
+msgstr ""
+
+#: includes/shipping/flat-rate/includes/settings-flat-rate.php:44
+#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:71
+msgid "Shipping class costs"
+msgstr ""
+
+#: includes/shipping/flat-rate/includes/settings-flat-rate.php:47
+#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:74
+msgid ""
+"These costs can optionally be added based on the <a href=\"%s\">product "
+"shipping class</a>."
+msgstr ""
+
+#: includes/shipping/flat-rate/includes/settings-flat-rate.php:55
+#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:82
+#. translators: %s: shipping class name
+msgid "\"%s\" shipping class cost"
+msgstr ""
+
+#: includes/shipping/flat-rate/includes/settings-flat-rate.php:64
+#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:91
+msgid "No shipping class cost"
+msgstr ""
+
+#: includes/shipping/flat-rate/includes/settings-flat-rate.php:72
+#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:99
+msgid "Calculation type"
+msgstr ""
+
+#: includes/shipping/flat-rate/includes/settings-flat-rate.php:77
+#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:104
+msgid "Per class: Charge shipping for each shipping class individually"
+msgstr ""
+
+#: includes/shipping/flat-rate/includes/settings-flat-rate.php:78
+#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:105
+msgid "Per order: Charge shipping for the most expensive shipping class"
+msgstr ""
+
+#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:40
+msgid "Free shipping"
+msgstr ""
+
+#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:41
+msgid ""
+"Free shipping is a special method which can be triggered with coupons and "
+"minimum spends."
+msgstr ""
+
+#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:81
+#: includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php:117
+msgid "Free shipping requires..."
+msgstr ""
+
+#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:87
+#: includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php:123
+msgid "A valid free shipping coupon"
+msgstr ""
+
+#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:88
+#: includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php:124
+msgid "A minimum order amount"
+msgstr ""
+
+#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:89
+#: includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php:125
+msgid "A minimum order amount OR a coupon"
+msgstr ""
+
+#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:90
+#: includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php:126
+msgid "A minimum order amount AND a coupon"
+msgstr ""
+
+#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:94
+#: includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php:130
+msgid "Minimum order amount"
+msgstr ""
+
+#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:97
+#: includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php:133
+msgid ""
+"Users will need to spend this amount to get free shipping (if enabled "
+"above)."
+msgstr ""
+
+#: includes/shipping/legacy-flat-rate/class-wc-shipping-legacy-flat-rate.php:26
+msgid "Flat rate (legacy)"
+msgstr ""
+
+#: includes/shipping/legacy-flat-rate/class-wc-shipping-legacy-flat-rate.php:27
+#: includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php:31
+#: includes/shipping/legacy-international-delivery/class-wc-shipping-legacy-international-delivery.php:24
+#: includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php:25
+#: includes/shipping/legacy-local-pickup/class-wc-shipping-legacy-local-pickup.php:25
+msgid ""
+"This method is deprecated in 2.6.0 and will be removed in future versions - "
+"we recommend disabling it and instead setting up a new rate within your <a "
+"href=\"%s\">Shipping zones</a>."
+msgstr ""
+
+#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:7
+msgid ""
 "Supports the following placeholders: <code>[qty]</code> = number of items, "
 "<code>[cost]</code> = cost of items, <code>[fee percent=\"10\" "
 "min_fee=\"20\"]</code> = Percentage based fee."
 msgstr ""
 
-#: includes/shipping/flat-rate/includes/settings-flat-rate.php:16
-msgid "Enable this shipping method"
+#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:16
+#: includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php:85
+#: includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php:113
+#: includes/shipping/legacy-local-pickup/class-wc-shipping-legacy-local-pickup.php:90
+msgid "Once disabled, this legacy method will no longer be available."
 msgstr ""
 
-#: includes/shipping/flat-rate/includes/settings-flat-rate.php:20
-#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:67
-msgid "Method Title"
-msgstr ""
-
-#: includes/shipping/flat-rate/includes/settings-flat-rate.php:27
-#: includes/shipping/international-delivery/class-wc-shipping-international-delivery.php:34
+#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:27
+#: includes/shipping/legacy-international-delivery/class-wc-shipping-legacy-international-delivery.php:45
 msgid "Availability"
 msgstr ""
 
-#: includes/shipping/flat-rate/includes/settings-flat-rate.php:32
-#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:79
-#: includes/shipping/local-delivery/class-wc-shipping-local-delivery.php:136
-#: includes/shipping/local-pickup/class-wc-shipping-local-pickup.php:92
+#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:32
+#: includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php:101
+#: includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php:158
+#: includes/shipping/legacy-local-pickup/class-wc-shipping-legacy-local-pickup.php:114
 msgid "All allowed countries"
 msgstr ""
 
-#: includes/shipping/flat-rate/includes/settings-flat-rate.php:44
-#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:91
-#: includes/shipping/local-delivery/class-wc-shipping-local-delivery.php:148
-#: includes/shipping/local-pickup/class-wc-shipping-local-pickup.php:104
+#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:33
+#: includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php:102
+#: includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php:159
+msgid "Specific Countries"
+msgstr ""
+
+#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:37
+#: includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php:106
+#: includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php:163
+#: includes/shipping/legacy-local-pickup/class-wc-shipping-legacy-local-pickup.php:115
+#: includes/shipping/legacy-local-pickup/class-wc-shipping-legacy-local-pickup.php:119
+msgid "Specific countries"
+msgstr ""
+
+#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:44
+#: includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php:113
+#: includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php:170
+#: includes/shipping/legacy-local-pickup/class-wc-shipping-legacy-local-pickup.php:126
 msgid "Select some countries"
 msgstr ""
 
-#: includes/shipping/flat-rate/includes/settings-flat-rate.php:71
-msgid "Shipping Class Costs"
+#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:112
+#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:118
+msgid "Additional rates"
 msgstr ""
 
-#: includes/shipping/flat-rate/includes/settings-flat-rate.php:73
-msgid "These costs can optionally be added based on the %sproduct shipping class%s."
-msgstr ""
-
-#: includes/shipping/flat-rate/includes/settings-flat-rate.php:80
-msgid "\"%s\" Shipping Class Cost"
-msgstr ""
-
-#: includes/shipping/flat-rate/includes/settings-flat-rate.php:89
-msgid "No Shipping Class Cost"
-msgstr ""
-
-#: includes/shipping/flat-rate/includes/settings-flat-rate.php:97
-msgid "Calculation Type"
-msgstr ""
-
-#: includes/shipping/flat-rate/includes/settings-flat-rate.php:102
-msgid "Per Class: Charge shipping for each shipping class individually"
-msgstr ""
-
-#: includes/shipping/flat-rate/includes/settings-flat-rate.php:103
-msgid "Per Order: Charge shipping for the most expensive shipping class"
-msgstr ""
-
-#: includes/shipping/flat-rate/includes/settings-flat-rate.php:110
-#: includes/shipping/flat-rate/includes/settings-flat-rate.php:115
-msgid "Additional Rates"
-msgstr ""
-
-#: includes/shipping/flat-rate/includes/settings-flat-rate.php:112
+#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:115
 msgid ""
 "These rates are extra shipping options with additional costs (based on the "
 "flat rate)."
 msgstr ""
 
-#: includes/shipping/flat-rate/includes/settings-flat-rate.php:117
+#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:120
 msgid ""
-"One per line: Option Name | Additional Cost [+- Percents] | Per Cost Type "
-"(order, class, or item) Example: <code>Priority Mail | 6.95 [+ 0.2%] | "
+"One per line: Option name | Additional cost [+- Percents] | Per cost type "
+"(order, class, or item) Example: <code>Priority mail | 6.95 [+ 0.2%] | "
 "order</code>."
 msgstr ""
 
-#: includes/shipping/flat-rate/includes/settings-flat-rate.php:120
+#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:123
 msgid ""
-"Option Name | Additional Cost [+- Percents%] | Per Cost Type (order, class, "
+"Option name | Additional cost [+- Percents%] | Per cost type (order, class, "
 "or item)"
 msgstr ""
 
-#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:63
-msgid "Enable Free Shipping"
+#: includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php:30
+msgid "Free shipping (legacy)"
 msgstr ""
 
-#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:74
-#: includes/shipping/local-delivery/class-wc-shipping-local-delivery.php:131
-#: includes/shipping/local-pickup/class-wc-shipping-local-pickup.php:87
+#: includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php:92
+msgid "Free Shipping"
+msgstr ""
+
+#: includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php:96
+#: includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php:153
+#: includes/shipping/legacy-local-pickup/class-wc-shipping-legacy-local-pickup.php:109
 msgid "Method availability"
 msgstr ""
 
-#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:95
-msgid "Free Shipping Requires..."
+#: includes/shipping/legacy-international-delivery/class-wc-shipping-legacy-international-delivery.php:23
+msgid "International flat rate (legacy)"
 msgstr ""
 
-#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:101
-msgid "A valid free shipping coupon"
-msgstr ""
-
-#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:102
-msgid "A minimum order amount (defined below)"
-msgstr ""
-
-#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:103
-msgid "A minimum order amount OR a coupon"
-msgstr ""
-
-#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:104
-msgid "A minimum order amount AND a coupon"
-msgstr ""
-
-#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:108
-msgid "Minimum Order Amount"
-msgstr ""
-
-#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:111
-msgid ""
-"Users will need to spend this amount to get free shipping (if enabled "
-"above)."
-msgstr ""
-
-#: includes/shipping/international-delivery/class-wc-shipping-international-delivery.php:21
-msgid "International Flat Rate"
-msgstr ""
-
-#: includes/shipping/international-delivery/class-wc-shipping-international-delivery.php:22
-msgid "International Flat Rate Shipping lets you charge a fixed rate for shipping."
-msgstr ""
-
-#: includes/shipping/international-delivery/class-wc-shipping-international-delivery.php:40
+#: includes/shipping/legacy-international-delivery/class-wc-shipping-legacy-international-delivery.php:51
 msgid "Selected countries"
 msgstr ""
 
-#: includes/shipping/international-delivery/class-wc-shipping-international-delivery.php:41
+#: includes/shipping/legacy-international-delivery/class-wc-shipping-legacy-international-delivery.php:52
 msgid "Excluding selected countries"
 msgstr ""
 
-#: includes/shipping/local-delivery/class-wc-shipping-local-delivery.php:25
-msgid "Local delivery is a simple shipping method for delivering orders locally."
+#: includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php:24
+msgid "Local delivery (legacy)"
 msgstr ""
 
-#: includes/shipping/local-delivery/class-wc-shipping-local-delivery.php:89
-#: includes/shipping/local-pickup/class-wc-shipping-local-pickup.php:66
+#: includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php:111
+#: includes/shipping/legacy-local-pickup/class-wc-shipping-legacy-local-pickup.php:88
 msgid "Enable"
 msgstr ""
 
-#: includes/shipping/local-delivery/class-wc-shipping-local-delivery.php:91
-msgid "Enable local delivery"
+#: includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php:120
+msgid "Local delivery"
 msgstr ""
 
-#: includes/shipping/local-delivery/class-wc-shipping-local-delivery.php:102
-msgid "Fee Type"
+#: includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php:124
+msgid "Fee type"
 msgstr ""
 
-#: includes/shipping/local-delivery/class-wc-shipping-local-delivery.php:105
+#: includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php:127
 msgid "How to calculate delivery charges"
 msgstr ""
 
-#: includes/shipping/local-delivery/class-wc-shipping-local-delivery.php:108
+#: includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php:130
 msgid "Fixed amount"
 msgstr ""
 
-#: includes/shipping/local-delivery/class-wc-shipping-local-delivery.php:109
+#: includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php:131
 msgid "Percentage of cart total"
 msgstr ""
 
-#: includes/shipping/local-delivery/class-wc-shipping-local-delivery.php:110
+#: includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php:132
 msgid "Fixed amount per product"
 msgstr ""
 
-#: includes/shipping/local-delivery/class-wc-shipping-local-delivery.php:115
-msgid "Delivery Fee"
+#: includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php:137
+msgid "Delivery fee"
 msgstr ""
 
-#: includes/shipping/local-delivery/class-wc-shipping-local-delivery.php:117
+#: includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php:139
 msgid ""
 "What fee do you want to charge for local delivery, disregarded if you "
 "choose free. Leave blank to disable."
 msgstr ""
 
-#: includes/shipping/local-delivery/class-wc-shipping-local-delivery.php:123
-#: includes/shipping/local-pickup/class-wc-shipping-local-pickup.php:79
-msgid "Allowed ZIP/Post Codes"
+#: includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php:145
+#: includes/shipping/legacy-local-pickup/class-wc-shipping-legacy-local-pickup.php:101
+msgid "Allowed ZIP/post codes"
 msgstr ""
 
-#: includes/shipping/local-delivery/class-wc-shipping-local-delivery.php:125
+#: includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php:147
 msgid "What ZIP/post codes are available for local delivery?"
 msgstr ""
 
-#: includes/shipping/local-delivery/class-wc-shipping-local-delivery.php:127
-#: includes/shipping/local-pickup/class-wc-shipping-local-pickup.php:83
+#: includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php:149
+#: includes/shipping/legacy-local-pickup/class-wc-shipping-legacy-local-pickup.php:105
 msgid ""
 "Separate codes with a comma. Accepts wildcards, e.g. <code>P*</code> will "
 "match a postcode of PE30. Also accepts a pattern, e.g. <code>NG1___</code> "
 "would match NG1 1AA but not NG10 1AA"
 msgstr ""
 
-#: includes/shipping/local-pickup/class-wc-shipping-local-pickup.php:25
-msgid ""
-"Local pickup is a simple method which allows customers to pick up orders "
-"themselves."
+#: includes/shipping/legacy-local-pickup/class-wc-shipping-legacy-local-pickup.php:24
+msgid "Local pickup (legacy)"
 msgstr ""
 
-#: includes/shipping/local-pickup/class-wc-shipping-local-pickup.php:68
-msgid "Enable local pickup"
+#: includes/shipping/legacy-local-pickup/class-wc-shipping-legacy-local-pickup.php:97
+#: includes/shipping/local-pickup/class-wc-shipping-local-pickup.php:24
+#: includes/shipping/local-pickup/class-wc-shipping-local-pickup.php:73
+msgid "Local pickup"
 msgstr ""
 
-#: includes/shipping/local-pickup/class-wc-shipping-local-pickup.php:81
+#: includes/shipping/legacy-local-pickup/class-wc-shipping-legacy-local-pickup.php:103
 msgid "What ZIP/post codes are available for local pickup?"
 msgstr ""
 
-#: includes/shortcodes/class-wc-shortcode-cart.php:42
+#: includes/shipping/local-pickup/class-wc-shipping-local-pickup.php:25
+msgid ""
+"Allow customers to pick up orders themselves. By default, when using local "
+"pickup store base taxes will apply regardless of customer address."
+msgstr ""
+
+#: includes/shipping/local-pickup/class-wc-shipping-local-pickup.php:90
+msgid "Optional cost for local pickup."
+msgstr ""
+
+#: includes/shortcodes/class-wc-shortcode-cart.php:43
 msgid "Shipping costs updated."
 msgstr ""
 
-#: includes/shortcodes/class-wc-shortcode-checkout.php:89
+#: includes/shortcodes/class-wc-shortcode-checkout.php:91
 msgid "Invalid order. If you have an account please log in and try again."
 msgstr ""
 
-#: includes/shortcodes/class-wc-shortcode-checkout.php:89
-#: includes/shortcodes/class-wc-shortcode-my-account.php:108
-#: templates/checkout/thankyou.php:31
-msgid "My Account"
+#: includes/shortcodes/class-wc-shortcode-checkout.php:91
+#: includes/shortcodes/class-wc-shortcode-my-account.php:118
+#: templates/checkout/thankyou.php:35
+msgid "My account"
 msgstr ""
 
-#: includes/shortcodes/class-wc-shortcode-checkout.php:117
-msgid "Pay for order"
-msgstr ""
-
-#: includes/shortcodes/class-wc-shortcode-checkout.php:121
-#: includes/shortcodes/class-wc-shortcode-checkout.php:168
+#: includes/shortcodes/class-wc-shortcode-checkout.php:118
+#: includes/shortcodes/class-wc-shortcode-checkout.php:163
 msgid ""
 "This order&rsquo;s status is &ldquo;%s&rdquo;&mdash;it cannot be paid for. "
 "Please contact us if you need assistance."
 msgstr ""
 
-#: includes/shortcodes/class-wc-shortcode-checkout.php:125
-#: includes/shortcodes/class-wc-shortcode-checkout.php:172
+#: includes/shortcodes/class-wc-shortcode-checkout.php:121
+#: includes/shortcodes/class-wc-shortcode-checkout.php:166
 msgid "Sorry, this order is invalid and cannot be paid for."
 msgstr ""
 
-#: includes/shortcodes/class-wc-shortcode-checkout.php:141
-#: templates/checkout/thankyou.php:41
-msgid "Order Number:"
+#: includes/shortcodes/class-wc-shortcode-checkout.php:136
+#: templates/checkout/thankyou.php:46
+msgid "Order number:"
 msgstr ""
 
-#: includes/shortcodes/class-wc-shortcode-checkout.php:145
-#: templates/checkout/thankyou.php:45
+#: includes/shortcodes/class-wc-shortcode-checkout.php:140
+#: templates/checkout/thankyou.php:51
 msgid "Date:"
 msgstr ""
 
-#: includes/shortcodes/class-wc-shortcode-checkout.php:242
+#: includes/shortcodes/class-wc-shortcode-checkout.php:239
 msgid ""
 "The order totals have been updated. Please confirm your order by pressing "
-"the Place Order button at the bottom of the page."
+"the \"Place order\" button at the bottom of the page."
 msgstr ""
 
-#: includes/shortcodes/class-wc-shortcode-my-account.php:200
-msgid "Your password has been reset."
+#: includes/shortcodes/class-wc-shortcode-my-account.php:46
+msgid "Your password has been reset successfully."
 msgstr ""
 
-#: includes/shortcodes/class-wc-shortcode-my-account.php:200
-msgid "Log in"
+#: includes/shortcodes/class-wc-shortcode-my-account.php:237
+msgid "Enter a username or email address."
 msgstr ""
 
-#: includes/shortcodes/class-wc-shortcode-my-account.php:222
-msgid "Enter a username or e-mail address."
+#: includes/shortcodes/class-wc-shortcode-my-account.php:260
+#: includes/shortcodes/class-wc-shortcode-my-account.php:265
+msgid "Invalid username or email."
 msgstr ""
 
-#: includes/shortcodes/class-wc-shortcode-my-account.php:238
-#: includes/shortcodes/class-wc-shortcode-my-account.php:243
-msgid "Invalid username or e-mail."
-msgstr ""
-
-#: includes/shortcodes/class-wc-shortcode-my-account.php:256
+#: includes/shortcodes/class-wc-shortcode-my-account.php:278
 msgid "Password reset is not allowed for this user"
 msgstr ""
 
-#: includes/shortcodes/class-wc-shortcode-my-account.php:283
-msgid "Check your e-mail for the confirmation link."
-msgstr ""
-
-#: includes/shortcodes/class-wc-shortcode-my-account.php:302
-#: includes/shortcodes/class-wc-shortcode-my-account.php:307
-#: includes/shortcodes/class-wc-shortcode-my-account.php:323
-msgid "Invalid key"
-msgstr ""
-
-#: includes/shortcodes/class-wc-shortcode-my-account.php:358
-msgid "Add a new payment method."
-msgstr ""
-
-#: includes/shortcodes/class-wc-shortcode-order-tracking.php:48
+#: includes/shortcodes/class-wc-shortcode-order-tracking.php:46
 msgid "Please enter a valid order ID"
 msgstr ""
 
-#: includes/shortcodes/class-wc-shortcode-order-tracking.php:52
+#: includes/shortcodes/class-wc-shortcode-order-tracking.php:48
 msgid "Please enter a valid order email"
 msgstr ""
 
-#: includes/shortcodes/class-wc-shortcode-order-tracking.php:71
+#: includes/shortcodes/class-wc-shortcode-order-tracking.php:62
 msgid "Sorry, we could not find that order ID in our database."
 msgstr ""
 
-#: includes/updates/woocommerce-update-2.4.php:171
-#: includes/wc-order-functions.php:789
-msgid "Order Fully Refunded"
+#: includes/vendor/abstract-wp-rest-controller.php:30
+msgid "The register_routes() method must be overriden"
 msgstr ""
 
-#: includes/wc-attribute-functions.php:143
+#: includes/vendor/abstract-wp-rest-controller.php:40
+#: includes/vendor/abstract-wp-rest-controller.php:50
+#: includes/vendor/abstract-wp-rest-controller.php:60
+#: includes/vendor/abstract-wp-rest-controller.php:70
+#: includes/vendor/abstract-wp-rest-controller.php:80
+#: includes/vendor/abstract-wp-rest-controller.php:90
+#: includes/vendor/abstract-wp-rest-controller.php:100
+#: includes/vendor/abstract-wp-rest-controller.php:110
+#: includes/vendor/abstract-wp-rest-controller.php:120
+#: includes/vendor/abstract-wp-rest-controller.php:130
+#: includes/vendor/abstract-wp-rest-controller.php:140
+#: includes/vendor/abstract-wp-rest-controller.php:151
+msgid "Method '%s' not implemented. Must be over-ridden in subclass."
+msgstr ""
+
+#: includes/vendor/abstract-wp-rest-controller.php:288
+msgid ""
+"Scope under which the request is made; determines fields present in "
+"response."
+msgstr ""
+
+#: includes/vendor/wp-rest-functions.php:170
+#. translators: 1: parameter 2: arguments
+msgid "%1$s is not one of %2$s"
+msgstr ""
+
+#: includes/vendor/wp-rest-functions.php:176
+#: includes/vendor/wp-rest-functions.php:181
+#: includes/vendor/wp-rest-functions.php:186 includes/wc-rest-functions.php:195
+#. translators: 1: parameter 2: integer type
+#. translators: 1: parameter 2: boolean type
+#. translators: 1: parameter 2: string type
+msgid "%1$s is not of type %2$s"
+msgstr ""
+
+#: includes/vendor/wp-rest-functions.php:193 includes/wc-rest-functions.php:202
+msgid "The date you provided is invalid."
+msgstr ""
+
+#: includes/vendor/wp-rest-functions.php:199
+msgid "The email address you provided is invalid."
+msgstr ""
+
+#: includes/vendor/wp-rest-functions.php:205
+#. translators: %s: IP address
+msgid "%s is not a valid IP address."
+msgstr ""
+
+#: includes/vendor/wp-rest-functions.php:214
+msgid "%1$s must be greater than %2$d (exclusive)"
+msgstr ""
+
+#: includes/vendor/wp-rest-functions.php:216
+msgid "%1$s must be greater than %2$d (inclusive)"
+msgstr ""
+
+#: includes/vendor/wp-rest-functions.php:220
+msgid "%1$s must be less than %2$d (exclusive)"
+msgstr ""
+
+#: includes/vendor/wp-rest-functions.php:222
+msgid "%1$s must be less than %2$d (inclusive)"
+msgstr ""
+
+#: includes/vendor/wp-rest-functions.php:227
+msgid "%1$s must be between %2$d (exclusive) and %3$d (exclusive)"
+msgstr ""
+
+#: includes/vendor/wp-rest-functions.php:231
+msgid "%1$s must be between %2$d (inclusive) and %3$d (exclusive)"
+msgstr ""
+
+#: includes/vendor/wp-rest-functions.php:235
+msgid "%1$s must be between %2$d (exclusive) and %3$d (inclusive)"
+msgstr ""
+
+#: includes/vendor/wp-rest-functions.php:239
+msgid "%1$s must be between %2$d (inclusive) and %3$d (inclusive)"
+msgstr ""
+
+#: includes/wc-account-functions.php:96
+msgid "Dashboard"
+msgstr ""
+
+#: includes/wc-account-functions.php:204 includes/wc-account-functions.php:225
+msgid "Expires"
+msgstr ""
+
+#: includes/wc-account-functions.php:205
+msgid "File"
+msgstr ""
+
+#: includes/wc-account-functions.php:278
+msgid "Make default"
+msgstr ""
+
+#: includes/wc-attribute-functions.php:195
 msgid "Select"
 msgstr ""
 
-#: includes/wc-attribute-functions.php:144
+#: includes/wc-attribute-functions.php:196
 msgid "Text"
 msgstr ""
 
@@ -15758,381 +20400,896 @@ msgstr ""
 msgid "This product is protected and cannot be purchased."
 msgstr ""
 
-#: includes/wc-cart-functions.php:78
+#: includes/wc-cart-functions.php:108
 msgid "%s has been added to your cart."
 msgid_plural "%s have been added to your cart."
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/wc-cart-functions.php:83
-msgid "Continue Shopping"
+#: includes/wc-cart-functions.php:113
+msgid "Continue shopping"
 msgstr ""
 
-#: includes/wc-cart-functions.php:103
+#: includes/wc-cart-functions.php:144
 msgid "and"
 msgstr ""
 
-#: includes/wc-cart-functions.php:206
-msgid "Coupon:"
+#: includes/wc-cart-functions.php:252
+msgid "Coupon: %s"
 msgstr ""
 
-#: includes/wc-cart-functions.php:231
+#: includes/wc-cart-functions.php:276
 msgid "Free shipping coupon"
 msgstr ""
 
-#: includes/wc-cart-functions.php:236
+#: includes/wc-cart-functions.php:280
 msgid "[Remove]"
 msgstr ""
 
-#: includes/wc-cart-functions.php:262 templates/cart/cart-totals.php:69
+#: includes/wc-cart-functions.php:307
 msgid "estimated for %s"
 msgstr ""
 
-#: includes/wc-cart-functions.php:264
-msgid "(includes %s%s)"
-msgstr ""
-
-#: includes/wc-cart-functions.php:303
-msgid "Free"
-msgstr ""
-
-#: includes/wc-core-functions.php:79
-msgid "Order &ndash; %s"
-msgstr ""
-
-#: includes/wc-core-functions.php:85
-msgid "Invalid order status"
-msgstr ""
-
-#: includes/wc-core-functions.php:131
-msgid "Invalid order ID"
-msgstr ""
-
-#: includes/wc-core-functions.php:272
-msgid "United Arab Emirates Dirham"
-msgstr ""
-
-#: includes/wc-core-functions.php:273
-msgid "Argentine Peso"
-msgstr ""
-
-#: includes/wc-core-functions.php:274
-msgid "Australian Dollars"
-msgstr ""
-
-#: includes/wc-core-functions.php:275
-msgid "Bangladeshi Taka"
-msgstr ""
-
-#: includes/wc-core-functions.php:276
-msgid "Bulgarian Lev"
-msgstr ""
-
-#: includes/wc-core-functions.php:277
-msgid "Brazilian Real"
-msgstr ""
-
-#: includes/wc-core-functions.php:278
-msgid "Canadian Dollars"
+#: includes/wc-core-functions.php:194
+msgid "%s does not exist."
 msgstr ""
 
 #: includes/wc-core-functions.php:279
-msgid "Swiss Franc"
+msgid "United Arab Emirates dirham"
 msgstr ""
 
 #: includes/wc-core-functions.php:280
-msgid "Chilean Peso"
+msgid "Afghan afghani"
 msgstr ""
 
 #: includes/wc-core-functions.php:281
-msgid "Chinese Yuan"
+msgid "Albanian lek"
 msgstr ""
 
 #: includes/wc-core-functions.php:282
-msgid "Colombian Peso"
+msgid "Armenian dram"
 msgstr ""
 
 #: includes/wc-core-functions.php:283
-msgid "Czech Koruna"
+msgid "Netherlands Antillean guilder"
 msgstr ""
 
 #: includes/wc-core-functions.php:284
-msgid "Danish Krone"
+msgid "Angolan kwanza"
 msgstr ""
 
 #: includes/wc-core-functions.php:285
-msgid "Dominican Peso"
+msgid "Argentine peso"
 msgstr ""
 
 #: includes/wc-core-functions.php:286
-msgid "Egyptian Pound"
+msgid "Australian dollar"
 msgstr ""
 
 #: includes/wc-core-functions.php:287
-msgid "Euros"
+msgid "Aruban florin"
 msgstr ""
 
 #: includes/wc-core-functions.php:288
-msgid "Pounds Sterling"
+msgid "Azerbaijani manat"
 msgstr ""
 
 #: includes/wc-core-functions.php:289
-msgid "Hong Kong Dollar"
+msgid "Bosnia and Herzegovina convertible mark"
 msgstr ""
 
 #: includes/wc-core-functions.php:290
-msgid "Croatia kuna"
+msgid "Barbadian dollar"
 msgstr ""
 
 #: includes/wc-core-functions.php:291
-msgid "Hungarian Forint"
+msgid "Bangladeshi taka"
 msgstr ""
 
 #: includes/wc-core-functions.php:292
-msgid "Indonesia Rupiah"
+msgid "Bulgarian lev"
 msgstr ""
 
 #: includes/wc-core-functions.php:293
-msgid "Israeli Shekel"
+msgid "Bahraini dinar"
 msgstr ""
 
 #: includes/wc-core-functions.php:294
-msgid "Indian Rupee"
+msgid "Burundian franc"
 msgstr ""
 
 #: includes/wc-core-functions.php:295
-msgid "Icelandic krona"
+msgid "Bermudian dollar"
 msgstr ""
 
 #: includes/wc-core-functions.php:296
-msgid "Japanese Yen"
+msgid "Brunei dollar"
 msgstr ""
 
 #: includes/wc-core-functions.php:297
-msgid "Kenyan shilling"
+msgid "Bolivian boliviano"
 msgstr ""
 
 #: includes/wc-core-functions.php:298
-msgid "Lao Kip"
+msgid "Brazilian real"
 msgstr ""
 
 #: includes/wc-core-functions.php:299
-msgid "South Korean Won"
+msgid "Bahamian dollar"
 msgstr ""
 
 #: includes/wc-core-functions.php:300
-msgid "Mexican Peso"
+msgid "Bitcoin"
 msgstr ""
 
 #: includes/wc-core-functions.php:301
-msgid "Malaysian Ringgits"
+msgid "Bhutanese ngultrum"
 msgstr ""
 
 #: includes/wc-core-functions.php:302
-msgid "Nigerian Naira"
+msgid "Botswana pula"
 msgstr ""
 
 #: includes/wc-core-functions.php:303
-msgid "Norwegian Krone"
+msgid "Belarusian ruble"
 msgstr ""
 
 #: includes/wc-core-functions.php:304
-msgid "Nepali Rupee"
+msgid "Belize dollar"
 msgstr ""
 
 #: includes/wc-core-functions.php:305
-msgid "New Zealand Dollar"
+msgid "Canadian dollar"
 msgstr ""
 
 #: includes/wc-core-functions.php:306
-msgid "Philippine Pesos"
+msgid "Congolese franc"
 msgstr ""
 
 #: includes/wc-core-functions.php:307
-msgid "Pakistani Rupee"
+msgid "Swiss franc"
 msgstr ""
 
 #: includes/wc-core-functions.php:308
-msgid "Polish Zloty"
+msgid "Chilean peso"
 msgstr ""
 
 #: includes/wc-core-functions.php:309
-msgid "Paraguayan Guaraní"
+msgid "Chinese yuan"
 msgstr ""
 
 #: includes/wc-core-functions.php:310
-msgid "Romanian Leu"
+msgid "Colombian peso"
 msgstr ""
 
 #: includes/wc-core-functions.php:311
-msgid "Russian Ruble"
+msgid "Costa Rican col&oacute;n"
 msgstr ""
 
 #: includes/wc-core-functions.php:312
-msgid "Swedish Krona"
+msgid "Cuban convertible peso"
 msgstr ""
 
 #: includes/wc-core-functions.php:313
-msgid "Singapore Dollar"
+msgid "Cuban peso"
 msgstr ""
 
 #: includes/wc-core-functions.php:314
-msgid "Thai Baht"
+msgid "Cape Verdean escudo"
 msgstr ""
 
 #: includes/wc-core-functions.php:315
-msgid "Turkish Lira"
+msgid "Czech koruna"
 msgstr ""
 
 #: includes/wc-core-functions.php:316
-msgid "Taiwan New Dollars"
+msgid "Djiboutian franc"
 msgstr ""
 
 #: includes/wc-core-functions.php:317
-msgid "Ukrainian Hryvnia"
+msgid "Danish krone"
 msgstr ""
 
 #: includes/wc-core-functions.php:318
-msgid "US Dollars"
+msgid "Dominican peso"
 msgstr ""
 
 #: includes/wc-core-functions.php:319
-msgid "Vietnamese Dong"
+msgid "Algerian dinar"
 msgstr ""
 
 #: includes/wc-core-functions.php:320
+msgid "Egyptian pound"
+msgstr ""
+
+#: includes/wc-core-functions.php:321
+msgid "Eritrean nakfa"
+msgstr ""
+
+#: includes/wc-core-functions.php:322
+msgid "Ethiopian birr"
+msgstr ""
+
+#: includes/wc-core-functions.php:323
+msgid "Euro"
+msgstr ""
+
+#: includes/wc-core-functions.php:324
+msgid "Fijian dollar"
+msgstr ""
+
+#: includes/wc-core-functions.php:325
+msgid "Falkland Islands pound"
+msgstr ""
+
+#: includes/wc-core-functions.php:326
+msgid "Pound sterling"
+msgstr ""
+
+#: includes/wc-core-functions.php:327
+msgid "Georgian lari"
+msgstr ""
+
+#: includes/wc-core-functions.php:328
+msgid "Guernsey pound"
+msgstr ""
+
+#: includes/wc-core-functions.php:329
+msgid "Ghana cedi"
+msgstr ""
+
+#: includes/wc-core-functions.php:330
+msgid "Gibraltar pound"
+msgstr ""
+
+#: includes/wc-core-functions.php:331
+msgid "Gambian dalasi"
+msgstr ""
+
+#: includes/wc-core-functions.php:332
+msgid "Guinean franc"
+msgstr ""
+
+#: includes/wc-core-functions.php:333
+msgid "Guatemalan quetzal"
+msgstr ""
+
+#: includes/wc-core-functions.php:334
+msgid "Guyanese dollar"
+msgstr ""
+
+#: includes/wc-core-functions.php:335
+msgid "Hong Kong dollar"
+msgstr ""
+
+#: includes/wc-core-functions.php:336
+msgid "Honduran lempira"
+msgstr ""
+
+#: includes/wc-core-functions.php:337
+msgid "Croatian kuna"
+msgstr ""
+
+#: includes/wc-core-functions.php:338
+msgid "Haitian gourde"
+msgstr ""
+
+#: includes/wc-core-functions.php:339
+msgid "Hungarian forint"
+msgstr ""
+
+#: includes/wc-core-functions.php:340
+msgid "Indonesian rupiah"
+msgstr ""
+
+#: includes/wc-core-functions.php:341
+msgid "Israeli new shekel"
+msgstr ""
+
+#: includes/wc-core-functions.php:342
+msgid "Manx pound"
+msgstr ""
+
+#: includes/wc-core-functions.php:343
+msgid "Indian rupee"
+msgstr ""
+
+#: includes/wc-core-functions.php:344
+msgid "Iraqi dinar"
+msgstr ""
+
+#: includes/wc-core-functions.php:345
+msgid "Iranian rial"
+msgstr ""
+
+#: includes/wc-core-functions.php:346
+msgid "Iranian toman"
+msgstr ""
+
+#: includes/wc-core-functions.php:347
+msgid "Icelandic kr&oacute;na"
+msgstr ""
+
+#: includes/wc-core-functions.php:348
+msgid "Jersey pound"
+msgstr ""
+
+#: includes/wc-core-functions.php:349
+msgid "Jamaican dollar"
+msgstr ""
+
+#: includes/wc-core-functions.php:350
+msgid "Jordanian dinar"
+msgstr ""
+
+#: includes/wc-core-functions.php:351
+msgid "Japanese yen"
+msgstr ""
+
+#: includes/wc-core-functions.php:352
+msgid "Kenyan shilling"
+msgstr ""
+
+#: includes/wc-core-functions.php:353
+msgid "Kyrgyzstani som"
+msgstr ""
+
+#: includes/wc-core-functions.php:354
+msgid "Cambodian riel"
+msgstr ""
+
+#: includes/wc-core-functions.php:355
+msgid "Comorian franc"
+msgstr ""
+
+#: includes/wc-core-functions.php:356
+msgid "North Korean won"
+msgstr ""
+
+#: includes/wc-core-functions.php:357
+msgid "South Korean won"
+msgstr ""
+
+#: includes/wc-core-functions.php:358
+msgid "Kuwaiti dinar"
+msgstr ""
+
+#: includes/wc-core-functions.php:359
+msgid "Cayman Islands dollar"
+msgstr ""
+
+#: includes/wc-core-functions.php:360
+msgid "Kazakhstani tenge"
+msgstr ""
+
+#: includes/wc-core-functions.php:361
+msgid "Lao kip"
+msgstr ""
+
+#: includes/wc-core-functions.php:362
+msgid "Lebanese pound"
+msgstr ""
+
+#: includes/wc-core-functions.php:363
+msgid "Sri Lankan rupee"
+msgstr ""
+
+#: includes/wc-core-functions.php:364
+msgid "Liberian dollar"
+msgstr ""
+
+#: includes/wc-core-functions.php:365
+msgid "Lesotho loti"
+msgstr ""
+
+#: includes/wc-core-functions.php:366
+msgid "Libyan dinar"
+msgstr ""
+
+#: includes/wc-core-functions.php:367
+msgid "Moroccan dirham"
+msgstr ""
+
+#: includes/wc-core-functions.php:368
+msgid "Moldovan leu"
+msgstr ""
+
+#: includes/wc-core-functions.php:369
+msgid "Malagasy ariary"
+msgstr ""
+
+#: includes/wc-core-functions.php:370
+msgid "Macedonian denar"
+msgstr ""
+
+#: includes/wc-core-functions.php:371
+msgid "Burmese kyat"
+msgstr ""
+
+#: includes/wc-core-functions.php:372
+msgid "Mongolian t&ouml;gr&ouml;g"
+msgstr ""
+
+#: includes/wc-core-functions.php:373
+msgid "Macanese pataca"
+msgstr ""
+
+#: includes/wc-core-functions.php:374
+msgid "Mauritanian ouguiya"
+msgstr ""
+
+#: includes/wc-core-functions.php:375
+msgid "Mauritian rupee"
+msgstr ""
+
+#: includes/wc-core-functions.php:376
+msgid "Maldivian rufiyaa"
+msgstr ""
+
+#: includes/wc-core-functions.php:377
+msgid "Malawian kwacha"
+msgstr ""
+
+#: includes/wc-core-functions.php:378
+msgid "Mexican peso"
+msgstr ""
+
+#: includes/wc-core-functions.php:379
+msgid "Malaysian ringgit"
+msgstr ""
+
+#: includes/wc-core-functions.php:380
+msgid "Mozambican metical"
+msgstr ""
+
+#: includes/wc-core-functions.php:381
+msgid "Namibian dollar"
+msgstr ""
+
+#: includes/wc-core-functions.php:382
+msgid "Nigerian naira"
+msgstr ""
+
+#: includes/wc-core-functions.php:383
+msgid "Nicaraguan c&oacute;rdoba"
+msgstr ""
+
+#: includes/wc-core-functions.php:384
+msgid "Norwegian krone"
+msgstr ""
+
+#: includes/wc-core-functions.php:385
+msgid "Nepalese rupee"
+msgstr ""
+
+#: includes/wc-core-functions.php:386
+msgid "New Zealand dollar"
+msgstr ""
+
+#: includes/wc-core-functions.php:387
+msgid "Omani rial"
+msgstr ""
+
+#: includes/wc-core-functions.php:388
+msgid "Panamanian balboa"
+msgstr ""
+
+#: includes/wc-core-functions.php:389
+msgid "Peruvian nuevo sol"
+msgstr ""
+
+#: includes/wc-core-functions.php:390
+msgid "Papua New Guinean kina"
+msgstr ""
+
+#: includes/wc-core-functions.php:391
+msgid "Philippine peso"
+msgstr ""
+
+#: includes/wc-core-functions.php:392
+msgid "Pakistani rupee"
+msgstr ""
+
+#: includes/wc-core-functions.php:393
+msgid "Polish z&#x142;oty"
+msgstr ""
+
+#: includes/wc-core-functions.php:394
+msgid "Transnistrian ruble"
+msgstr ""
+
+#: includes/wc-core-functions.php:395
+msgid "Paraguayan guaran&iacute;"
+msgstr ""
+
+#: includes/wc-core-functions.php:396
+msgid "Qatari riyal"
+msgstr ""
+
+#: includes/wc-core-functions.php:397
+msgid "Romanian leu"
+msgstr ""
+
+#: includes/wc-core-functions.php:398
+msgid "Serbian dinar"
+msgstr ""
+
+#: includes/wc-core-functions.php:399
+msgid "Russian ruble"
+msgstr ""
+
+#: includes/wc-core-functions.php:400
+msgid "Rwandan franc"
+msgstr ""
+
+#: includes/wc-core-functions.php:401
+msgid "Saudi riyal"
+msgstr ""
+
+#: includes/wc-core-functions.php:402
+msgid "Solomon Islands dollar"
+msgstr ""
+
+#: includes/wc-core-functions.php:403
+msgid "Seychellois rupee"
+msgstr ""
+
+#: includes/wc-core-functions.php:404
+msgid "Sudanese pound"
+msgstr ""
+
+#: includes/wc-core-functions.php:405
+msgid "Swedish krona"
+msgstr ""
+
+#: includes/wc-core-functions.php:406
+msgid "Singapore dollar"
+msgstr ""
+
+#: includes/wc-core-functions.php:407
+msgid "Saint Helena pound"
+msgstr ""
+
+#: includes/wc-core-functions.php:408
+msgid "Sierra Leonean leone"
+msgstr ""
+
+#: includes/wc-core-functions.php:409
+msgid "Somali shilling"
+msgstr ""
+
+#: includes/wc-core-functions.php:410
+msgid "Surinamese dollar"
+msgstr ""
+
+#: includes/wc-core-functions.php:411
+msgid "South Sudanese pound"
+msgstr ""
+
+#: includes/wc-core-functions.php:412
+msgid "S&atilde;o Tom&eacute; and Pr&iacute;ncipe dobra"
+msgstr ""
+
+#: includes/wc-core-functions.php:413
+msgid "Syrian pound"
+msgstr ""
+
+#: includes/wc-core-functions.php:414
+msgid "Swazi lilangeni"
+msgstr ""
+
+#: includes/wc-core-functions.php:415
+msgid "Thai baht"
+msgstr ""
+
+#: includes/wc-core-functions.php:416
+msgid "Tajikistani somoni"
+msgstr ""
+
+#: includes/wc-core-functions.php:417
+msgid "Turkmenistan manat"
+msgstr ""
+
+#: includes/wc-core-functions.php:418
+msgid "Tunisian dinar"
+msgstr ""
+
+#: includes/wc-core-functions.php:419
+msgid "Tongan pa&#x2bb;anga"
+msgstr ""
+
+#: includes/wc-core-functions.php:420
+msgid "Turkish lira"
+msgstr ""
+
+#: includes/wc-core-functions.php:421
+msgid "Trinidad and Tobago dollar"
+msgstr ""
+
+#: includes/wc-core-functions.php:422
+msgid "New Taiwan dollar"
+msgstr ""
+
+#: includes/wc-core-functions.php:423
+msgid "Tanzanian shilling"
+msgstr ""
+
+#: includes/wc-core-functions.php:424
+msgid "Ukrainian hryvnia"
+msgstr ""
+
+#: includes/wc-core-functions.php:425
+msgid "Ugandan shilling"
+msgstr ""
+
+#: includes/wc-core-functions.php:426
+msgid "United States dollar"
+msgstr ""
+
+#: includes/wc-core-functions.php:427
+msgid "Uruguayan peso"
+msgstr ""
+
+#: includes/wc-core-functions.php:428
+msgid "Uzbekistani som"
+msgstr ""
+
+#: includes/wc-core-functions.php:429
+msgid "Venezuelan bol&iacute;var"
+msgstr ""
+
+#: includes/wc-core-functions.php:430
+msgid "Vietnamese &#x111;&#x1ed3;ng"
+msgstr ""
+
+#: includes/wc-core-functions.php:431
+msgid "Vanuatu vatu"
+msgstr ""
+
+#: includes/wc-core-functions.php:432
+msgid "Samoan t&#x101;l&#x101;"
+msgstr ""
+
+#: includes/wc-core-functions.php:433
+msgid "Central African CFA franc"
+msgstr ""
+
+#: includes/wc-core-functions.php:434
+msgid "East Caribbean dollar"
+msgstr ""
+
+#: includes/wc-core-functions.php:435
+msgid "West African CFA franc"
+msgstr ""
+
+#: includes/wc-core-functions.php:436
+msgid "CFP franc"
+msgstr ""
+
+#: includes/wc-core-functions.php:437
+msgid "Yemeni rial"
+msgstr ""
+
+#: includes/wc-core-functions.php:438
 msgid "South African rand"
 msgstr ""
 
+#: includes/wc-core-functions.php:439
+msgid "Zambian kwacha"
+msgstr ""
+
+#: includes/wc-core-functions.php:1214
+msgid "MasterCard"
+msgstr ""
+
+#: includes/wc-core-functions.php:1215
+msgid "Visa"
+msgstr ""
+
+#: includes/wc-core-functions.php:1216
+msgid "Discover"
+msgstr ""
+
+#: includes/wc-core-functions.php:1217
+msgid "American Express"
+msgstr ""
+
+#: includes/wc-core-functions.php:1218
+msgid "Diners"
+msgstr ""
+
+#: includes/wc-core-functions.php:1219
+msgid "JCB"
+msgstr ""
+
+#: includes/wc-core-functions.php:1440
+msgid ""
+"The class <code>%s</code> provided by woocommerce_logging_class filter must "
+"implement <code>WC_Logger_Interface</code>."
+msgstr ""
+
 #: includes/wc-coupon-functions.php:24
-msgid "Cart Discount"
+msgid "Percentage discount"
 msgstr ""
 
 #: includes/wc-coupon-functions.php:25
-msgid "Cart % Discount"
+msgid "Fixed cart discount"
 msgstr ""
 
 #: includes/wc-coupon-functions.php:26
-msgid "Product Discount"
+msgid "Fixed product discount"
 msgstr ""
 
-#: includes/wc-coupon-functions.php:27
-msgid "Product % Discount"
+#: includes/wc-formatting-functions.php:976
+msgid "Only %s left in stock"
 msgstr ""
 
-#: includes/wc-deprecated-functions.php:706
-msgid ""
-"The shop_order_status taxonomy is no more in WooCommerce 2.2! You should "
-"use the new WooCommerce post_status instead, <a href=\"%s\">read more...</a>"
+#: includes/wc-formatting-functions.php:980
+msgid "%s in stock"
 msgstr ""
 
-#: includes/wc-deprecated-functions.php:710
-msgid ""
-"The \"publish\" order status is no more in WooCommerce 2.2! You should use "
-"the new WooCommerce post_status instead, <a href=\"%s\">read more...</a>"
+#: includes/wc-formatting-functions.php:985
+msgid "(can be backordered)"
 msgstr ""
 
-#: includes/wc-notice-functions.php:27 includes/wc-notice-functions.php:59
-#: includes/wc-notice-functions.php:77 includes/wc-notice-functions.php:100
-#: includes/wc-notice-functions.php:113 includes/wc-notice-functions.php:160
+#: includes/wc-notice-functions.php:27 includes/wc-notice-functions.php:58
+#: includes/wc-notice-functions.php:76 includes/wc-notice-functions.php:98
+#: includes/wc-notice-functions.php:112 includes/wc-notice-functions.php:125
+#: includes/wc-notice-functions.php:172
 msgid "This function should not be called before woocommerce_init."
 msgstr ""
 
-#: includes/wc-order-functions.php:508
+#: includes/wc-order-functions.php:97
+msgid ""
+"wc_get_order should not be called before post types are registered "
+"(woocommerce_after_register_post_type action)."
+msgstr ""
+
+#: includes/wc-order-functions.php:507
+msgid "Invalid refund amount."
+msgstr ""
+
+#: includes/wc-order-functions.php:625
+msgid "The payment gateway for this order does not exist."
+msgstr ""
+
+#: includes/wc-order-functions.php:629
+msgid "The payment gateway for this order does not support automatic refunds."
+msgstr ""
+
+#: includes/wc-order-functions.php:669
+msgid "Item #%1$s stock increased from %2$s to %3$s."
+msgstr ""
+
+#: includes/wc-order-functions.php:729 includes/wc-update-functions.php:773
+msgid "Order fully refunded"
+msgstr ""
+
+#: includes/wc-order-functions.php:853
 msgid "Unpaid order cancelled - time limit reached."
 msgstr ""
 
-#: includes/wc-order-functions.php:633
-msgid "Refund &ndash; %s"
+#: includes/wc-product-functions.php:102
+msgid "wc_get_product should not be called before the woocommerce_init action."
 msgstr ""
 
-#: includes/wc-template-functions.php:131
+#: includes/wc-product-functions.php:731
+msgid "Visible"
+msgstr ""
+
+#: includes/wc-product-functions.php:815
+msgid "Do not allow"
+msgstr ""
+
+#: includes/wc-product-functions.php:816
+msgid "Allow, but notify customer"
+msgstr ""
+
+#: includes/wc-stock-functions.php:97
+#. translators: 1: item name 2: old stock quantity 3: new stock quantity
+msgid "%1$s stock reduced from %2$s to %3$s."
+msgstr ""
+
+#: includes/wc-template-functions.php:32
+msgid "Checkout is not available whilst your cart is empty."
+msgstr ""
+
+#: includes/wc-template-functions.php:157
 msgid "New products"
 msgstr ""
 
-#: includes/wc-template-functions.php:139
+#: includes/wc-template-functions.php:165
 msgid "New products added to %s"
 msgstr ""
 
-#: includes/wc-template-functions.php:147
+#: includes/wc-template-functions.php:173
 msgid "New products tagged %s"
 msgstr ""
 
-#: includes/wc-template-functions.php:457
-msgid "Search Results: &ldquo;%s&rdquo;"
+#: includes/wc-template-functions.php:515
+msgid "Search results: &ldquo;%s&rdquo;"
 msgstr ""
 
-#: includes/wc-template-functions.php:460
+#: includes/wc-template-functions.php:518
 msgid "&nbsp;&ndash; Page %s"
 msgstr ""
 
-#: includes/wc-template-functions.php:758
+#: includes/wc-template-functions.php:797
 msgid "Default sorting"
 msgstr ""
 
-#: includes/wc-template-functions.php:759
+#: includes/wc-template-functions.php:798
 msgid "Sort by popularity"
 msgstr ""
 
-#: includes/wc-template-functions.php:760
+#: includes/wc-template-functions.php:799
 msgid "Sort by average rating"
 msgstr ""
 
-#: includes/wc-template-functions.php:761
+#: includes/wc-template-functions.php:800
 msgid "Sort by newness"
 msgstr ""
 
-#: includes/wc-template-functions.php:762
+#: includes/wc-template-functions.php:801
 msgid "Sort by price: low to high"
 msgstr ""
 
-#: includes/wc-template-functions.php:763
+#: includes/wc-template-functions.php:802
 msgid "Sort by price: high to low"
 msgstr ""
 
-#: includes/wc-template-functions.php:1092
-#: templates/checkout/form-shipping.php:66
-#: templates/single-product/tabs/additional-information.php:24
-msgid "Additional Information"
+#: includes/wc-template-functions.php:1131
+#: templates/checkout/form-shipping.php:56
+#: templates/single-product/tabs/additional-information.php:25
+msgid "Additional information"
 msgstr ""
 
-#: includes/wc-template-functions.php:1101
+#: includes/wc-template-functions.php:1140
 msgid "Reviews (%d)"
 msgstr ""
 
-#: includes/wc-template-functions.php:1185
-msgid ""
-"Use $args argument as an array instead. Deprecated argument will be removed "
-"in WC 2.2."
+#: includes/wc-template-functions.php:1433
+msgid "Checkout"
 msgstr ""
 
-#: includes/wc-template-functions.php:1398
+#: includes/wc-template-functions.php:1558
 msgid "Place order"
 msgstr ""
 
-#: includes/wc-template-functions.php:1762
+#: includes/wc-template-functions.php:1943
 msgid "Update country"
 msgstr ""
 
-#: includes/wc-template-functions.php:1783
-#: templates/cart/shipping-calculator.php:62
+#: includes/wc-template-functions.php:1964
+#: templates/cart/shipping-calculator.php:63
 msgid "Select a state&hellip;"
 msgstr ""
 
-#: includes/wc-template-functions.php:1828
-#: includes/wc-template-functions.php:1975
+#: includes/wc-template-functions.php:2009
+#: includes/wc-template-functions.php:2161
+#: includes/wc-template-functions.php:2171
 msgid "Choose an option"
 msgstr ""
 
-#: includes/wc-term-functions.php:167
+#: includes/wc-template-functions.php:2530
+#: includes/widgets/class-wc-widget-layered-nav-filters.php:166
+#: includes/widgets/class-wc-widget-rating-filter.php:188
+msgid "Rated %s out of 5"
+msgstr ""
+
+#: includes/wc-template-functions.php:2531
+msgid "out of 5"
+msgstr ""
+
+#: includes/wc-term-functions.php:219
 msgid "Select a category"
 msgstr ""
 
-#: includes/wc-term-functions.php:170
+#: includes/wc-term-functions.php:222
 msgid "Uncategorized"
 msgstr ""
 
-#: includes/wc-user-functions.php:52
+#: includes/wc-user-functions.php:53
 msgid "An account is already registered with your email address. Please login."
 msgstr ""
 
@@ -16144,15 +21301,11 @@ msgstr ""
 msgid "An account is already registered with that username. Please choose another."
 msgstr ""
 
-#: includes/wc-user-functions.php:86
+#: includes/wc-user-functions.php:85
 msgid "Please enter an account password."
 msgstr ""
 
-#: includes/wc-user-functions.php:112
-msgid "ERROR"
-msgstr ""
-
-#: includes/wc-user-functions.php:112
+#: includes/wc-user-functions.php:111
 msgid ""
 "Couldn&#8217;t register you&hellip; please contact us if you continue to "
 "have problems."
@@ -16167,11 +21320,11 @@ msgid "Paused"
 msgstr ""
 
 #: includes/widgets/class-wc-widget-cart.php:25
-msgid "Display the user's Cart in the sidebar."
+msgid "Display the user's cart in the sidebar."
 msgstr ""
 
 #: includes/widgets/class-wc-widget-cart.php:27
-msgid "WooCommerce Cart"
+msgid "WooCommerce cart"
 msgstr ""
 
 #: includes/widgets/class-wc-widget-cart.php:31
@@ -16187,25 +21340,26 @@ msgid "Shows active layered nav filters so users can see and deactivate them."
 msgstr ""
 
 #: includes/widgets/class-wc-widget-layered-nav-filters.php:25
-msgid "WooCommerce Layered Nav Filters"
+msgid "WooCommerce layered nav filters"
 msgstr ""
 
 #: includes/widgets/class-wc-widget-layered-nav-filters.php:29
-msgid "Active Filters"
+msgid "Active filters"
 msgstr ""
 
-#: includes/widgets/class-wc-widget-layered-nav-filters.php:84
-#: includes/widgets/class-wc-widget-layered-nav-filters.php:91
-#: includes/widgets/class-wc-widget-layered-nav-filters.php:96
+#: includes/widgets/class-wc-widget-layered-nav-filters.php:147
+#: includes/widgets/class-wc-widget-layered-nav-filters.php:154
+#: includes/widgets/class-wc-widget-layered-nav-filters.php:159
+#: includes/widgets/class-wc-widget-layered-nav-filters.php:166
 msgid "Remove filter"
 msgstr ""
 
-#: includes/widgets/class-wc-widget-layered-nav-filters.php:91
-msgid "Min"
+#: includes/widgets/class-wc-widget-layered-nav-filters.php:154
+msgid "Min %s"
 msgstr ""
 
-#: includes/widgets/class-wc-widget-layered-nav-filters.php:96
-msgid "Max"
+#: includes/widgets/class-wc-widget-layered-nav-filters.php:159
+msgid "Max %s"
 msgstr ""
 
 #: includes/widgets/class-wc-widget-layered-nav.php:23
@@ -16215,38 +21369,38 @@ msgid ""
 msgstr ""
 
 #: includes/widgets/class-wc-widget-layered-nav.php:25
-msgid "WooCommerce Layered Nav"
+msgid "WooCommerce layered nav"
 msgstr ""
 
-#: includes/widgets/class-wc-widget-layered-nav.php:77
+#: includes/widgets/class-wc-widget-layered-nav.php:74
 msgid "Filter by"
 msgstr ""
 
-#: includes/widgets/class-wc-widget-layered-nav.php:83
+#: includes/widgets/class-wc-widget-layered-nav.php:80
 msgid "Attribute"
 msgstr ""
 
-#: includes/widgets/class-wc-widget-layered-nav.php:91
+#: includes/widgets/class-wc-widget-layered-nav.php:88
 msgid "List"
 msgstr ""
 
-#: includes/widgets/class-wc-widget-layered-nav.php:92
+#: includes/widgets/class-wc-widget-layered-nav.php:89
 msgid "Dropdown"
 msgstr ""
 
-#: includes/widgets/class-wc-widget-layered-nav.php:98
+#: includes/widgets/class-wc-widget-layered-nav.php:95
 msgid "Query type"
 msgstr ""
 
-#: includes/widgets/class-wc-widget-layered-nav.php:100
+#: includes/widgets/class-wc-widget-layered-nav.php:97
 msgid "AND"
 msgstr ""
 
-#: includes/widgets/class-wc-widget-layered-nav.php:101
+#: includes/widgets/class-wc-widget-layered-nav.php:98
 msgid "OR"
 msgstr ""
 
-#: includes/widgets/class-wc-widget-layered-nav.php:181
+#: includes/widgets/class-wc-widget-layered-nav.php:223
 msgid "Any %s"
 msgstr ""
 
@@ -16257,26 +21411,22 @@ msgid ""
 msgstr ""
 
 #: includes/widgets/class-wc-widget-price-filter.php:27
-msgid "WooCommerce Price Filter"
+msgid "WooCommerce price filter"
 msgstr ""
 
 #: includes/widgets/class-wc-widget-price-filter.php:31
 msgid "Filter by price"
 msgstr ""
 
-#: includes/widgets/class-wc-widget-price-filter.php:176
+#: includes/widgets/class-wc-widget-price-filter.php:114
 msgid "Min price"
 msgstr ""
 
-#: includes/widgets/class-wc-widget-price-filter.php:177
+#: includes/widgets/class-wc-widget-price-filter.php:115
 msgid "Max price"
 msgstr ""
 
-#: includes/widgets/class-wc-widget-price-filter.php:178
-msgid "Filter"
-msgstr ""
-
-#: includes/widgets/class-wc-widget-price-filter.php:180
+#: includes/widgets/class-wc-widget-price-filter.php:118
 msgid "Price:"
 msgstr ""
 
@@ -16285,11 +21435,11 @@ msgid "A list or dropdown of product categories."
 msgstr ""
 
 #: includes/widgets/class-wc-widget-product-categories.php:39
-msgid "WooCommerce Product Categories"
+msgid "WooCommerce product categories"
 msgstr ""
 
 #: includes/widgets/class-wc-widget-product-categories.php:51
-msgid "Category Order"
+msgid "Category order"
 msgstr ""
 
 #: includes/widgets/class-wc-widget-product-categories.php:58
@@ -16312,7 +21462,7 @@ msgstr ""
 msgid "Hide empty categories"
 msgstr ""
 
-#: includes/widgets/class-wc-widget-product-categories.php:236
+#: includes/widgets/class-wc-widget-product-categories.php:234
 msgid "No product categories exist."
 msgstr ""
 
@@ -16321,7 +21471,7 @@ msgid "A Search box for products only."
 msgstr ""
 
 #: includes/widgets/class-wc-widget-product-search.php:25
-msgid "WooCommerce Product Search"
+msgid "WooCommerce product search"
 msgstr ""
 
 #: includes/widgets/class-wc-widget-product-tag-cloud.php:23
@@ -16329,7 +21479,7 @@ msgid "Your most used product tags in cloud format."
 msgstr ""
 
 #: includes/widgets/class-wc-widget-product-tag-cloud.php:25
-msgid "WooCommerce Product Tags"
+msgid "WooCommerce product tags"
 msgstr ""
 
 #: includes/widgets/class-wc-widget-products.php:23
@@ -16337,7 +21487,7 @@ msgid "Display a list of your products on your site."
 msgstr ""
 
 #: includes/widgets/class-wc-widget-products.php:25
-msgid "WooCommerce Products"
+msgid "WooCommerce products"
 msgstr ""
 
 #: includes/widgets/class-wc-widget-products.php:38
@@ -16347,15 +21497,15 @@ msgid "Number of products to show"
 msgstr ""
 
 #: includes/widgets/class-wc-widget-products.php:45
-msgid "All Products"
+msgid "All products"
 msgstr ""
 
 #: includes/widgets/class-wc-widget-products.php:46
-msgid "Featured Products"
+msgid "Featured products"
 msgstr ""
 
 #: includes/widgets/class-wc-widget-products.php:47
-msgid "On-sale Products"
+msgid "On-sale products"
 msgstr ""
 
 #: includes/widgets/class-wc-widget-products.php:57
@@ -16382,12 +21532,20 @@ msgstr ""
 msgid "Show hidden products"
 msgstr ""
 
+#: includes/widgets/class-wc-widget-rating-filter.php:24
+msgid "Filter products by rating when viewing product archives and categories."
+msgstr ""
+
+#: includes/widgets/class-wc-widget-rating-filter.php:26
+msgid "WooCommerce average rating filter"
+msgstr ""
+
 #: includes/widgets/class-wc-widget-recent-reviews.php:23
 msgid "Display a list of your most recent reviews on your site."
 msgstr ""
 
 #: includes/widgets/class-wc-widget-recent-reviews.php:29
-msgid "Recent Reviews"
+msgid "Recent reviews"
 msgstr ""
 
 #: includes/widgets/class-wc-widget-recent-reviews.php:38
@@ -16399,11 +21557,11 @@ msgid "Display a list of recently viewed products."
 msgstr ""
 
 #: includes/widgets/class-wc-widget-recently-viewed.php:25
-msgid "WooCommerce Recently Viewed"
+msgid "WooCommerce recently viewed"
 msgstr ""
 
 #: includes/widgets/class-wc-widget-recently-viewed.php:29
-msgid "Recently Viewed Products"
+msgid "Recently viewed products"
 msgstr ""
 
 #: includes/widgets/class-wc-widget-top-rated-products.php:25
@@ -16411,204 +21569,187 @@ msgid "Display a list of your top rated products on your site."
 msgstr ""
 
 #: includes/widgets/class-wc-widget-top-rated-products.php:27
-msgid "WooCommerce Top Rated Products"
+msgid "WooCommerce top rated products"
 msgstr ""
 
 #: includes/widgets/class-wc-widget-top-rated-products.php:31
-msgid "Top Rated Products"
+msgid "Top rated products"
 msgstr ""
 
-#: templates/auth/form-grant-access.php:24 templates/auth/form-login.php:26
+#: templates/auth/form-grant-access.php:25 templates/auth/form-login.php:27
 msgid "%s would like to connect to your store"
 msgstr ""
 
-#: templates/auth/form-grant-access.php:28
-msgid "This will give \"%s\" <strong>%s</strong> access which will allow it to:"
+#: templates/auth/form-grant-access.php:29
+msgid "This will give \"%1$s\" %2$s access which will allow it to:"
 msgstr ""
 
-#: templates/auth/form-grant-access.php:38
+#: templates/auth/form-grant-access.php:39
 msgid "Logged in as %s"
 msgstr ""
 
-#: templates/auth/form-grant-access.php:42
+#: templates/auth/form-grant-access.php:43
 msgid "Approve"
 msgstr ""
 
-#: templates/auth/form-grant-access.php:43
+#: templates/auth/form-grant-access.php:44
 msgid "Deny"
 msgstr ""
 
-#: templates/auth/form-login.php:30
+#: templates/auth/form-login.php:31
 msgid ""
 "To connect to %1$s you need to be logged in. Log in to your store below, or "
-"%2$scancel and return to %1$s%3$s"
+"<a href=\"%2$s\">cancel and return to %1$s</a>"
 msgstr ""
 
-#: templates/auth/form-login.php:34 templates/myaccount/form-login.php:43
+#: templates/auth/form-login.php:35 templates/myaccount/form-login.php:44
 msgid "Username or email address"
 msgstr ""
 
-#: templates/auth/form-login.php:38 templates/global/form-login.php:38
-#: templates/myaccount/form-login.php:47 templates/myaccount/form-login.php:97
-msgid "Password"
+#: templates/auth/header.php:29
+msgid "Application authentication request"
 msgstr ""
 
-#: templates/auth/header.php:28
-msgid "Application Authentication Request"
-msgstr ""
-
-#: templates/cart/cart-empty.php:27
+#: templates/cart/cart-empty.php:28
 msgid "Your cart is currently empty."
 msgstr ""
 
-#: templates/cart/cart-empty.php:34
-msgid "Return To Shop"
-msgstr ""
-
-#: templates/cart/cart-shipping.php:47
+#: templates/cart/cart-shipping.php:48
 msgid "Shipping costs will be calculated once you have provided your address."
 msgstr ""
 
-#: templates/cart/cart-shipping.php:49
+#: templates/cart/cart-shipping.php:50
 msgid ""
 "There are no shipping methods available. Please double check your address, "
 "or contact us if you need any help."
 msgstr ""
 
-#: templates/cart/cart-totals.php:27
-msgid "Cart Totals"
+#: templates/cart/cart-totals.php:28
+msgid "Cart totals"
 msgstr ""
 
-#: templates/cart/cart-totals.php:32 templates/cart/cart-totals.php:33
-#: templates/cart/mini-cart.php:79 templates/checkout/review-order.php:58
+#: templates/cart/cart-totals.php:33 templates/cart/cart-totals.php:34
+#: templates/cart/mini-cart.php:84 templates/checkout/review-order.php:59
 msgid "Subtotal"
 msgstr ""
 
-#: templates/cart/cart.php:37 templates/cart/cart.php:101
-#: templates/emails/email-order-details.php:34
+#: templates/cart/cart-totals.php:71
+msgid "(estimated for %s)"
+msgstr ""
+
+#: templates/cart/cart.php:37 templates/cart/cart.php:102
+#: templates/emails/email-order-details.php:37
 msgid "Quantity"
 msgstr ""
 
-#: templates/cart/cart.php:58 templates/cart/mini-cart.php:48
+#: templates/cart/cart.php:59 templates/cart/mini-cart.php:51
 msgid "Remove this item"
 msgstr ""
 
-#: templates/cart/cart.php:136 templates/checkout/form-coupon.php:39
-msgid "Apply Coupon"
+#: templates/cart/cart.php:137
+msgid "Coupon:"
+msgstr ""
+
+#: templates/cart/cart.php:137 templates/checkout/form-coupon.php:40
+msgid "Apply coupon"
 msgstr ""
 
 #: templates/cart/cart.php:142
-msgid "Update Cart"
+msgid "Update cart"
 msgstr ""
 
-#: templates/cart/cross-sells.php:48
+#: templates/cart/cross-sells.php:27
 msgid "You may be interested in&hellip;"
 msgstr ""
 
-#: templates/cart/mini-cart.php:71
+#: templates/cart/mini-cart.php:76
 msgid "No products in the cart."
 msgstr ""
 
-#: templates/cart/mini-cart.php:85
-msgid "Checkout"
+#: templates/cart/proceed-to-checkout-button.php:27
+msgid "Proceed to checkout"
 msgstr ""
 
-#: templates/cart/proceed-to-checkout-button.php:26
-msgid "Proceed to Checkout"
+#: templates/cart/shipping-calculator.php:33
+msgid "Calculate shipping"
 msgstr ""
 
-#: templates/cart/shipping-calculator.php:32
-msgid "Calculate Shipping"
+#: templates/cart/shipping-calculator.php:96 templates/checkout/payment.php:43
+msgid "Update totals"
 msgstr ""
 
-#: templates/cart/shipping-calculator.php:55
-#: templates/cart/shipping-calculator.php:61
-#: templates/cart/shipping-calculator.php:73
-msgid "State / county"
-msgstr ""
-
-#: templates/cart/shipping-calculator.php:95
-msgid "Update Totals"
-msgstr ""
-
-#: templates/checkout/cart-errors.php:26
+#: templates/checkout/cart-errors.php:27
 msgid ""
 "There are some issues with the items in your cart (shown above). Please go "
 "back to the cart page and resolve these issues before checking out."
 msgstr ""
 
-#: templates/checkout/cart-errors.php:30
-msgid "Return To Cart"
+#: templates/checkout/cart-errors.php:31
+msgid "Return to cart"
 msgstr ""
 
-#: templates/checkout/form-billing.php:28
+#: templates/checkout/form-billing.php:29
 msgid "Billing &amp; Shipping"
 msgstr ""
 
-#: templates/checkout/form-billing.php:51
+#: templates/checkout/form-billing.php:54
 msgid "Create an account?"
 msgstr ""
 
-#: templates/checkout/form-billing.php:62
-msgid ""
-"Create an account by entering the information below. If you are a returning "
-"customer please login at the top of the page."
-msgstr ""
-
-#: templates/checkout/form-checkout.php:28
+#: templates/checkout/form-checkout.php:29
 msgid "You must be logged in to checkout."
 msgstr ""
 
-#: templates/checkout/form-checkout.php:54
+#: templates/checkout/form-checkout.php:55
 msgid "Your order"
 msgstr ""
 
-#: templates/checkout/form-coupon.php:27
+#: templates/checkout/form-coupon.php:28
 msgid "Have a coupon?"
 msgstr ""
 
-#: templates/checkout/form-coupon.php:27
+#: templates/checkout/form-coupon.php:28
 msgid "Click here to enter your code"
 msgstr ""
 
-#: templates/checkout/form-login.php:26
+#: templates/checkout/form-login.php:27
 msgid "Returning customer?"
 msgstr ""
 
-#: templates/checkout/form-login.php:27
+#: templates/checkout/form-login.php:28
 msgid "Click here to login"
 msgstr ""
 
-#: templates/checkout/form-login.php:34
+#: templates/checkout/form-login.php:33
 msgid ""
 "If you have shopped with us before, please enter your details in the boxes "
 "below. If you are a new customer, please proceed to the Billing &amp; "
 "Shipping section."
 msgstr ""
 
-#: templates/checkout/form-pay.php:68
+#: templates/checkout/form-pay.php:81
 msgid ""
 "Sorry, it seems that there are no available payment methods for your "
 "location. Please contact us if you require assistance or wish to make "
 "alternate arrangements."
 msgstr ""
 
-#: templates/checkout/form-shipping.php:40
+#: templates/checkout/form-shipping.php:29
 msgid "Ship to a different address?"
 msgstr ""
 
-#: templates/checkout/payment.php:34
+#: templates/checkout/payment.php:35
 msgid ""
 "Sorry, it seems that there are no available payment methods for your state. "
 "Please contact us if you require assistance or wish to make alternate "
 "arrangements."
 msgstr ""
 
-#: templates/checkout/payment.php:34
+#: templates/checkout/payment.php:35
 msgid "Please fill in your details above to see available payment methods."
 msgstr ""
 
-#: templates/checkout/payment.php:41
+#: templates/checkout/payment.php:42
 msgid ""
 "Since your browser does not support JavaScript, or it is disabled, please "
 "ensure you click the <em>Update Totals</em> button before placing your "
@@ -16616,93 +21757,96 @@ msgid ""
 "do so."
 msgstr ""
 
-#: templates/checkout/payment.php:42
-msgid "Update totals"
-msgstr ""
-
-#: templates/checkout/terms.php:16
+#: templates/checkout/terms.php:17
 msgid ""
 "I&rsquo;ve read and accept the <a href=\"%s\" target=\"_blank\">terms &amp; "
 "conditions</a>"
 msgstr ""
 
-#: templates/checkout/thankyou.php:26
+#: templates/checkout/thankyou.php:30
 msgid ""
 "Unfortunately your order cannot be processed as the originating "
 "bank/merchant has declined your transaction. Please attempt your purchase "
 "again."
 msgstr ""
 
-#: templates/checkout/thankyou.php:37 templates/checkout/thankyou.php:68
+#: templates/checkout/thankyou.php:41 templates/checkout/thankyou.php:78
 msgid "Thank you. Your order has been received."
 msgstr ""
 
-#: templates/emails/admin-cancelled-order.php:27
-#: templates/emails/plain/admin-cancelled-order.php:24
-msgid "The order #%d from %s has been cancelled. The order was as follows:"
+#: templates/emails/admin-cancelled-order.php:28
+#: templates/emails/plain/admin-cancelled-order.php:25
+msgid "The order #%1$d from %2$s has been cancelled. The order was as follows:"
 msgstr ""
 
-#: templates/emails/admin-failed-order.php:27
-#: templates/emails/plain/admin-failed-order.php:24
-msgid "Payment for order #%d from %s has failed. The order was as follows:"
+#: templates/emails/admin-failed-order.php:28
+#: templates/emails/plain/admin-failed-order.php:25
+msgid "Payment for order #%1$d from %2$s has failed. The order was as follows:"
 msgstr ""
 
-#: templates/emails/admin-new-order.php:27
+#: templates/emails/admin-new-order.php:28
 msgid "You have received an order from %s. The order is as follows:"
 msgstr ""
 
-#: templates/emails/customer-completed-order.php:27
-#: templates/emails/plain/customer-completed-order.php:24
+#: templates/emails/customer-completed-order.php:28
+#: templates/emails/plain/customer-completed-order.php:25
 msgid ""
 "Hi there. Your recent order on %s has been completed. Your order details "
 "are shown below for your reference:"
 msgstr ""
 
-#: templates/emails/customer-invoice.php:28
-#: templates/emails/plain/customer-invoice.php:25
+#: templates/emails/customer-invoice.php:29
+#: templates/emails/plain/customer-invoice.php:26
 msgid ""
-"An order has been created for you on %s. To pay for this order please use "
-"the following link: %s"
+"An order has been created for you on %1$s. To pay for this order please use "
+"the following link: %2$s"
 msgstr ""
 
-#: templates/emails/customer-invoice.php:28
+#: templates/emails/customer-invoice.php:29
 msgid "pay"
 msgstr ""
 
-#: templates/emails/customer-new-account.php:26
-#: templates/emails/plain/customer-new-account.php:24
-msgid "Thanks for creating an account on %s. Your username is <strong>%s</strong>."
+#: templates/emails/customer-new-account.php:27
+#: templates/emails/plain/customer-new-account.php:25
+msgid "Thanks for creating an account on %1$s. Your username is %2$s"
 msgstr ""
 
-#: templates/emails/customer-new-account.php:30
-msgid "Your password has been automatically generated: <strong>%s</strong>"
+#: templates/emails/customer-new-account.php:31
+msgid "Your password has been automatically generated: %s"
 msgstr ""
 
-#: templates/emails/customer-new-account.php:34
-#: templates/emails/plain/customer-new-account.php:29
+#: templates/emails/customer-new-account.php:35
+#: templates/emails/plain/customer-new-account.php:30
 msgid ""
 "You can access your account area to view your orders and change your "
 "password here: %s."
 msgstr ""
 
-#: templates/emails/customer-note.php:27
-#: templates/emails/plain/customer-note.php:24
+#: templates/emails/customer-note.php:28
+#: templates/emails/plain/customer-note.php:25
 msgid "Hello, a note has just been added to your order:"
 msgstr ""
 
-#: templates/emails/customer-note.php:31
-#: templates/emails/plain/customer-note.php:32
+#: templates/emails/customer-note.php:32
+#: templates/emails/plain/customer-note.php:33
 msgid "For your reference, your order details are shown below."
 msgstr ""
 
-#: templates/emails/customer-processing-order.php:27
-#: templates/emails/plain/customer-processing-order.php:24
+#: templates/emails/customer-on-hold-order.php:28
+#: templates/emails/plain/customer-on-hold-order.php:25
+msgid ""
+"Your order is on-hold until we confirm payment has been received. Your "
+"order details are shown below for your reference:"
+msgstr ""
+
+#: templates/emails/customer-processing-order.php:28
+#: templates/emails/plain/customer-processing-order.php:25
 msgid ""
 "Your order has been received and is now being processed. Your order details "
 "are shown below for your reference:"
 msgstr ""
 
-#: templates/emails/customer-refunded-order.php:29
+#: templates/emails/customer-refunded-order.php:30
 msgid "Hi there. Your order on %s has been partially refunded."
 msgstr ""
 
@@ -16710,109 +21854,128 @@ msgstr ""
 msgid "Hi there. Your order on %s has been refunded."
 msgstr ""
 
-#: templates/emails/customer-reset-password.php:26
-#: templates/emails/plain/customer-reset-password.php:24
-msgid "Someone requested that the password be reset for the following account:"
-msgstr ""
-
 #: templates/emails/customer-reset-password.php:27
-#: templates/emails/plain/customer-reset-password.php:26
-msgid "Username: %s"
+#: templates/emails/plain/customer-reset-password.php:25
+msgid "Someone requested that the password be reset for the following account:"
 msgstr ""
 
 #: templates/emails/customer-reset-password.php:28
 #: templates/emails/plain/customer-reset-password.php:27
-msgid "If this was a mistake, just ignore this email and nothing will happen."
+msgid "Username: %s"
 msgstr ""
 
 #: templates/emails/customer-reset-password.php:29
 #: templates/emails/plain/customer-reset-password.php:28
+msgid "If this was a mistake, just ignore this email and nothing will happen."
+msgstr ""
+
+#: templates/emails/customer-reset-password.php:30
+#: templates/emails/plain/customer-reset-password.php:29
 msgid "To reset your password, visit the following address:"
 msgstr ""
 
-#: templates/emails/customer-reset-password.php:32
+#: templates/emails/customer-reset-password.php:33
 msgid "Click here to reset your password"
 msgstr ""
 
-#: templates/emails/email-addresses.php:25
-#: templates/emails/plain/email-addresses.php:22
+#: templates/emails/email-addresses.php:28
+#: templates/emails/plain/email-addresses.php:23
+#: templates/myaccount/form-edit-address.php:23
+#: templates/myaccount/my-address.php:27 templates/myaccount/my-address.php:32
+#: templates/order/order-details-customer.php:63
 msgid "Billing address"
 msgstr ""
 
-#: templates/emails/email-addresses.php:31
-#: templates/emails/plain/email-addresses.php:26
+#: templates/emails/email-addresses.php:34
+#: templates/emails/plain/email-addresses.php:27
+#: templates/myaccount/form-edit-address.php:23
+#: templates/myaccount/my-address.php:28
+#: templates/order/order-details-customer.php:75
 msgid "Shipping address"
 msgstr ""
 
-#: templates/emails/email-customer-details.php:25
-#: templates/emails/plain/email-customer-details.php:24
+#: templates/emails/email-customer-details.php:27
+#: templates/emails/plain/email-customer-details.php:25
+#: templates/order/order-details-customer.php:26
 msgid "Customer details"
 msgstr ""
 
-#: templates/emails/plain/admin-new-order.php:24
+#: templates/emails/plain/admin-new-order.php:25
 msgid "You have received an order from %s."
 msgstr ""
 
-#: templates/emails/plain/customer-new-account.php:27
-msgid "Your password is <strong>%s</strong>."
+#: templates/emails/plain/customer-new-account.php:28
+msgid "Your password is %s."
 msgstr ""
 
-#: templates/emails/plain/customer-refunded-order.php:24
+#: templates/emails/plain/customer-refunded-order.php:25
 msgid ""
 "Hi there. Your order on %s has been refunded. Your order details are shown "
 "below for your reference:"
 msgstr ""
 
-#: templates/emails/plain/email-order-details.php:24
+#: templates/emails/plain/email-order-details.php:25
 msgid "Order number: %s"
 msgstr ""
 
-#: templates/emails/plain/email-order-details.php:25
-msgid "jS F Y"
-msgstr ""
-
-#: templates/emails/plain/email-order-details.php:42
+#: templates/emails/plain/email-order-details.php:44
 msgid "View order: %s"
 msgstr ""
 
-#: templates/emails/plain/email-order-items.php:43
-msgid "Quantity: %s"
-msgstr ""
-
-#: templates/emails/plain/email-order-items.php:46
-msgid "Cost: %s"
-msgstr ""
-
-#: templates/global/form-login.php:34
-#: templates/myaccount/form-lost-password.php:32
+#: templates/global/form-login.php:35
+#: templates/myaccount/form-lost-password.php:30
 msgid "Username or email"
 msgstr ""
 
-#: templates/global/form-login.php:50 templates/myaccount/form-login.php:57
+#: templates/global/form-login.php:51 templates/myaccount/form-login.php:58
 msgid "Remember me"
 msgstr ""
 
-#: templates/global/form-login.php:54 templates/myaccount/form-login.php:61
+#: templates/global/form-login.php:55 templates/myaccount/form-login.php:62
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/loop/no-products-found.php:23
+#: templates/loop/no-products-found.php:24
 msgid "No products were found matching your selection."
 msgstr ""
 
-#: templates/loop/result-count.php:38
+#: templates/loop/result-count.php:40 templates/loop/result-count.php:43
+#. translators: %d: total results
+#. translators: 1: first result 2: last result 3: total results
 msgid "Showing the single result"
-msgstr ""
+msgid_plural "Showing all %d results"
+msgstr[0] ""
+msgstr[1] ""
 
-#: templates/loop/result-count.php:40
-msgid "Showing all %d results"
-msgstr ""
-
-#: templates/loop/sale-flash.php:27 templates/single-product/sale-flash.php:27
+#: templates/loop/sale-flash.php:28 templates/single-product/sale-flash.php:28
 msgid "Sale!"
 msgstr ""
 
-#: templates/myaccount/form-add-payment-method.php:49
+#: templates/myaccount/dashboard.php:29
+#. translators: 1: user display name 2: logout url
+msgid "Hello %1$s (not %1$s? <a href=\"%2$s\">Sign out</a>)"
+msgstr ""
+
+#: templates/myaccount/dashboard.php:37
+msgid ""
+"From your account dashboard you can view your <a href=\"%1$s\">recent "
+"orders</a>, manage your <a href=\"%2$s\">shipping and billing addresses</a> "
+"and <a href=\"%3$s\">edit your password and account details</a>."
+msgstr ""
+
+#: templates/myaccount/downloads.php:62
+msgid "&infin;"
+msgstr ""
+
+#: templates/myaccount/downloads.php:98 templates/myaccount/orders.php:122
+msgid "Go shop"
+msgstr ""
+
+#: templates/myaccount/downloads.php:100
+msgid "No downloads available yet."
+msgstr ""
+
+#: templates/myaccount/form-add-payment-method.php:59
 msgid ""
 "Sorry, it seems that there are no payment methods which support adding a "
 "new payment method. Please contact us if you require assistance or wish to "
@@ -16820,328 +21983,327 @@ msgid ""
 msgstr ""
 
 #: templates/myaccount/form-edit-account.php:45
-msgid "Password Change"
+msgid "Password change"
 msgstr ""
 
 #: templates/myaccount/form-edit-account.php:48
-msgid "Current Password (leave blank to leave unchanged)"
+msgid "Current password (leave blank to leave unchanged)"
 msgstr ""
 
 #: templates/myaccount/form-edit-account.php:52
-msgid "New Password (leave blank to leave unchanged)"
+msgid "New password (leave blank to leave unchanged)"
 msgstr ""
 
 #: templates/myaccount/form-edit-account.php:56
-msgid "Confirm New Password"
+msgid "Confirm new password"
 msgstr ""
 
-#: templates/myaccount/form-edit-address.php:24
-#: templates/myaccount/my-address.php:27 templates/myaccount/my-address.php:33
-#: templates/order/order-details-customer.php:57
-msgid "Billing Address"
+#: templates/myaccount/form-edit-address.php:47
+msgid "Save address"
 msgstr ""
 
-#: templates/myaccount/form-edit-address.php:24
-#: templates/myaccount/my-address.php:28
-#: templates/order/order-details-customer.php:68
-msgid "Shipping Address"
-msgstr ""
-
-#: templates/myaccount/form-edit-address.php:53
-msgid "Save Address"
-msgstr ""
-
-#: templates/myaccount/form-login.php:74 templates/myaccount/form-login.php:111
+#: templates/myaccount/form-login.php:75 templates/myaccount/form-login.php:111
 msgid "Register"
 msgstr ""
 
-#: templates/myaccount/form-login.php:104
+#: templates/myaccount/form-login.php:105
 msgid "Anti-spam"
 msgstr ""
 
-#: templates/myaccount/form-lost-password.php:30
+#: templates/myaccount/form-lost-password.php:27
 msgid ""
 "Lost your password? Please enter your username or email address. You will "
 "receive a link to create a new password via email."
 msgstr ""
 
-#: templates/myaccount/form-lost-password.php:36
+#: templates/myaccount/form-reset-password.php:27
 msgid "Enter a new password below."
 msgstr ""
 
-#: templates/myaccount/form-lost-password.php:39
+#: templates/myaccount/form-reset-password.php:30
 msgid "New password"
 msgstr ""
 
-#: templates/myaccount/form-lost-password.php:43
+#: templates/myaccount/form-reset-password.php:34
 msgid "Re-enter new password"
 msgstr ""
 
-#: templates/myaccount/form-lost-password.php:58
-msgid "Reset Password"
+#: templates/myaccount/lost-password-confirmation.php:24
+msgid "Password reset email has been sent."
 msgstr ""
 
-#: templates/myaccount/my-account.php:27
-msgid "Hello <strong>%1$s</strong> (not %1$s? <a href=\"%2$s\">Sign out</a>)."
-msgstr ""
-
-#: templates/myaccount/my-account.php:32
+#: templates/myaccount/lost-password-confirmation.php:27
 msgid ""
-"From your account dashboard you can view your recent orders, manage your "
-"shipping and billing addresses and <a href=\"%s\">edit your password and "
-"account details</a>."
+"A password reset email has been sent to the email address on file for your "
+"account, but may take several minutes to show up in your inbox. Please wait "
+"at least 10 minutes before attempting another reset."
 msgstr ""
 
-#: templates/myaccount/my-address.php:25
-msgid "My Addresses"
-msgstr ""
-
-#: templates/myaccount/my-address.php:31
-msgid "My Address"
-msgstr ""
-
-#: templates/myaccount/my-address.php:43
+#: templates/myaccount/my-address.php:41
 msgid "The following addresses will be used on the checkout page by default."
 msgstr ""
 
-#: templates/myaccount/my-address.php:72
+#: templates/myaccount/my-address.php:70
 msgid "You have not set up this type of address yet."
 msgstr ""
 
-#: templates/myaccount/my-downloads.php:28
-msgid "Available Downloads"
+#: templates/myaccount/my-downloads.php:30
+msgid "Available downloads"
 msgstr ""
 
-#: templates/myaccount/my-downloads.php:37
+#: templates/myaccount/my-downloads.php:39
 msgid "%s download remaining"
 msgid_plural "%s downloads remaining"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/myaccount/my-orders.php:42
-msgid "Recent Orders"
+#: templates/myaccount/my-orders.php:30
+msgid "Recent orders"
 msgstr ""
 
-#: templates/myaccount/my-orders.php:77
-msgid "%s for %s item"
-msgid_plural "%s for %s items"
+#: templates/myaccount/my-orders.php:67 templates/myaccount/orders.php:63
+#. translators: 1: formatted order total 2: total order items
+msgid "%1$s for %2$s item"
+msgid_plural "%1$s for %2$s items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/myaccount/view-order.php:28
-msgid ""
-"Order #<mark class=\"order-number\">%s</mark> was placed on <mark "
-"class=\"order-date\">%s</mark> and is currently <mark "
-"class=\"order-status\">%s</mark>."
+#: templates/myaccount/orders.php:110
+msgid "Previous"
 msgstr ""
 
-#: templates/myaccount/view-order.php:32 templates/order/tracking.php:33
-msgid "Order Updates"
+#: templates/myaccount/orders.php:114
+msgid "Next"
 msgstr ""
 
-#: templates/myaccount/view-order.php:38 templates/order/tracking.php:39
+#: templates/myaccount/orders.php:124
+msgid "No order has been made yet."
+msgstr ""
+
+#: templates/myaccount/payment-methods.php:52
+#. translators: 1: credit card type 2: last 4 digits
+msgid "%1$s ending in %2$s"
+msgstr ""
+
+#: templates/myaccount/payment-methods.php:73
+msgid "No saved methods found."
+msgstr ""
+
+#: templates/myaccount/view-order.php:29 templates/order/tracking.php:27
+#. translators: 1: order number 2: order date 3: order status
+msgid "Order #%1$s was placed on %2$s and is currently %3$s."
+msgstr ""
+
+#: templates/myaccount/view-order.php:37 templates/order/tracking.php:35
+msgid "Order updates"
+msgstr ""
+
+#: templates/myaccount/view-order.php:43 templates/order/tracking.php:41
 msgid "l jS \\o\\f F Y, h:ia"
 msgstr ""
 
-#: templates/order/form-tracking.php:28
+#: templates/order/form-tracking.php:29
 msgid ""
 "To track your order please enter your Order ID in the box below and press "
 "the \"Track\" button. This was given to you on your receipt and in the "
 "confirmation email you should have received."
 msgstr ""
 
-#: templates/order/form-tracking.php:30
+#: templates/order/form-tracking.php:31
 msgid "Order ID"
 msgstr ""
 
-#: templates/order/form-tracking.php:30
+#: templates/order/form-tracking.php:31
 msgid "Found in your order confirmation email."
 msgstr ""
 
-#: templates/order/form-tracking.php:31
-msgid "Billing Email"
+#: templates/order/form-tracking.php:32
+msgid "Billing email"
 msgstr ""
 
-#: templates/order/form-tracking.php:31
+#: templates/order/form-tracking.php:32
 msgid "Email you used during checkout."
 msgstr ""
 
-#: templates/order/form-tracking.php:34
+#: templates/order/form-tracking.php:35
 msgid "Track"
 msgstr ""
 
-#: templates/order/order-again.php:24
-msgid "Order Again"
+#: templates/order/order-again.php:25
+msgid "Order again"
 msgstr ""
 
-#: templates/order/order-details-customer.php:22
-msgid "Customer Details"
-msgstr ""
-
-#: templates/order/order-details-customer.php:27
-msgid "Note:"
-msgstr ""
-
-#: templates/order/order-details-customer.php:34
+#: templates/order/order-details-customer.php:39
 msgid "Email:"
 msgstr ""
 
-#: templates/order/order-details-customer.php:41
-msgid "Telephone:"
+#: templates/order/order-details.php:31
+msgid "Order details"
 msgstr ""
 
-#: templates/order/order-details.php:26
-msgid "Order Details"
-msgstr ""
-
-#: templates/order/tracking.php:22
-msgid "Order #%s which was made %s has the status &ldquo;%s&rdquo;"
-msgstr ""
-
-#: templates/order/tracking.php:22
-msgid "ago"
-msgstr ""
-
-#: templates/order/tracking.php:24
-msgid "and was completed"
-msgstr ""
-
-#: templates/order/tracking.php:24
-msgid " ago"
-msgstr ""
-
-#: templates/product-searchform.php:26
+#: templates/product-searchform.php:25
 msgid "Search for:"
 msgstr ""
 
-#: templates/single-product/add-to-cart/variable.php:31
+#: templates/product-searchform.php:26
+msgid "Search products&hellip;"
+msgstr ""
+
+#: templates/single-product/add-to-cart/variable.php:32
 msgid "This product is currently out of stock and unavailable."
 msgstr ""
 
-#: templates/single-product/add-to-cart/variable.php:42
+#: templates/single-product/add-to-cart/variable.php:43
 msgid "Clear"
 msgstr ""
 
-#: templates/single-product/meta.php:34
-msgid "SKU:"
-msgstr ""
-
-#: templates/single-product/meta.php:38
+#: templates/single-product/meta.php:35
 msgid "Category:"
 msgid_plural "Categories:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/single-product/meta.php:40
+#: templates/single-product/meta.php:37
 msgid "Tag:"
 msgid_plural "Tags:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/single-product/rating.php:37
-msgid "out of %s5%s"
+#: templates/single-product/photoswipe.php:51
+msgid "Close (Esc)"
 msgstr ""
 
-#: templates/single-product/rating.php:38
+#: templates/single-product/photoswipe.php:53
+msgid "Share"
+msgstr ""
+
+#: templates/single-product/photoswipe.php:55
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: templates/single-product/photoswipe.php:57
+msgid "Zoom in/out"
+msgstr ""
+
+#: templates/single-product/photoswipe.php:74
+msgid "Previous (arrow left)"
+msgstr ""
+
+#: templates/single-product/photoswipe.php:76
+msgid "Next (arrow right)"
+msgstr ""
+
+#: templates/single-product/product-attributes.php:35
+msgid "Dimensions"
+msgstr ""
+
+#: templates/single-product/product-image.php:54
+msgid "Awaiting product image"
+msgstr ""
+
+#: templates/single-product/rating.php:41
+#. translators: 1: average rating 2: max rating (i.e. 5)
+msgid "%1$s out of %2$s"
+msgstr ""
+
+#: templates/single-product/rating.php:49
+#. translators: %s: rating count
 msgid "based on %s customer rating"
 msgid_plural "based on %s customer ratings"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/single-product/rating.php:41
+#: templates/single-product/rating.php:55
 msgid "%s customer review"
 msgid_plural "%s customer reviews"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/single-product/related.php:50
-msgid "Related Products"
+#: templates/single-product/related.php:27
+msgid "Related products"
 msgstr ""
 
-#: templates/single-product/review.php:38
-msgid "Rated %d out of 5"
+#: templates/single-product/review-meta.php:28
+msgid "Your review is awaiting approval"
 msgstr ""
 
-#: templates/single-product/review.php:48
-msgid "Your comment is awaiting approval"
-msgstr ""
-
-#: templates/single-product/review.php:57
+#: templates/single-product/review-meta.php:36
 msgid "verified owner"
 msgstr ""
 
-#: templates/single-product/up-sells.php:51
+#: templates/single-product/up-sells.php:27
 msgid "You may also like&hellip;"
 msgstr ""
 
-#: templates/single-product-reviews.php:32
-msgid "%s review for %s"
-msgid_plural "%s reviews for %s"
+#: templates/single-product-reviews.php:34
+#. translators: 1: reviews count 2: product name
+msgid "%1$s review for %2$s"
+msgid_plural "%1$s reviews for %2$s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/single-product-reviews.php:55
+#: templates/single-product-reviews.php:58
 msgid "There are no reviews yet."
 msgstr ""
 
-#: templates/single-product-reviews.php:68
+#: templates/single-product-reviews.php:71
 msgid "Add a review"
 msgstr ""
 
-#: templates/single-product-reviews.php:68
+#: templates/single-product-reviews.php:71
 msgid "Be the first to review &ldquo;%s&rdquo;"
 msgstr ""
 
-#: templates/single-product-reviews.php:69
+#: templates/single-product-reviews.php:72
 msgid "Leave a Reply to %s"
 msgstr ""
 
-#: templates/single-product-reviews.php:78
+#: templates/single-product-reviews.php:82
 msgid "Submit"
 msgstr ""
 
-#: templates/single-product-reviews.php:84
+#: templates/single-product-reviews.php:88
 msgid "You must be <a href=\"%s\">logged in</a> to post a review."
 msgstr ""
 
-#: templates/single-product-reviews.php:88
-msgid "Your Rating"
-msgstr ""
-
-#: templates/single-product-reviews.php:89
-msgid "Rate&hellip;"
-msgstr ""
-
-#: templates/single-product-reviews.php:90
-msgid "Perfect"
-msgstr ""
-
-#: templates/single-product-reviews.php:91
-msgid "Good"
-msgstr ""
-
 #: templates/single-product-reviews.php:92
-msgid "Average"
+msgid "Your rating"
 msgstr ""
 
 #: templates/single-product-reviews.php:93
-msgid "Not that bad"
+msgid "Rate&hellip;"
 msgstr ""
 
 #: templates/single-product-reviews.php:94
-msgid "Very Poor"
+msgid "Perfect"
+msgstr ""
+
+#: templates/single-product-reviews.php:95
+msgid "Good"
+msgstr ""
+
+#: templates/single-product-reviews.php:96
+msgid "Average"
+msgstr ""
+
+#: templates/single-product-reviews.php:97
+msgid "Not that bad"
 msgstr ""
 
 #: templates/single-product-reviews.php:98
-msgid "Your Review"
+msgid "Very poor"
 msgstr ""
 
-#: templates/single-product-reviews.php:107
+#: templates/single-product-reviews.php:102
+msgid "Your review"
+msgstr ""
+
+#: templates/single-product-reviews.php:111
 msgid "Only logged in customers who have purchased this product may leave a review."
 msgstr ""
 
 #. Plugin URI of the plugin/theme
-msgid "http://www.woothemes.com/woocommerce/"
+msgid "https://woocommerce.com/"
 msgstr ""
 
 #. Description of the plugin/theme
@@ -17149,11 +22311,34 @@ msgid "An e-commerce toolkit that helps you sell anything. Beautifully."
 msgstr ""
 
 #. Author of the plugin/theme
-msgid "WooThemes"
+msgid "Automattic"
 msgstr ""
 
 #. Author URI of the plugin/theme
-msgid "http://woothemes.com"
+msgid "https://woocommerce.com"
+msgstr ""
+
+#: i18n/locale-info.php:87 i18n/locale-info.php:97 i18n/locale-info.php:107
+msgctxt "Canadian Tax Rates"
+msgid "PST"
+msgstr ""
+
+#: i18n/locale-info.php:117
+msgctxt "Canadian Tax Rates"
+msgid "QST"
+msgstr ""
+
+#: i18n/locale-info.php:127 i18n/locale-info.php:134 i18n/locale-info.php:141
+#: i18n/locale-info.php:148 i18n/locale-info.php:155
+msgctxt "Canadian Tax Rates"
+msgid "HST"
+msgstr ""
+
+#: i18n/locale-info.php:162 i18n/locale-info.php:169 i18n/locale-info.php:176
+#: i18n/locale-info.php:183 i18n/locale-info.php:190 i18n/locale-info.php:197
+#: i18n/locale-info.php:204 i18n/locale-info.php:211
+msgctxt "Canadian Tax Rates"
+msgid "GST"
 msgstr ""
 
 #: i18n/states/US.php:23
@@ -17161,511 +22346,407 @@ msgctxt "US state of Georgia"
 msgid "Georgia"
 msgstr ""
 
-#: includes/abstracts/abstract-wc-order.php:1098
-#: includes/abstracts/abstract-wc-order.php:1109
-#: includes/admin/class-wc-admin-post-types.php:742
-#: includes/admin/class-wc-admin-post-types.php:751
-msgctxt "full name"
-msgid "%1$s %2$s"
-msgstr ""
-
-#: includes/abstracts/abstract-wc-product.php:1038
-msgctxt "min_price"
-msgid "From:"
-msgstr ""
-
-#: includes/admin/class-wc-admin-api-keys-table-list.php:156
-#: includes/admin/settings/views/html-keys-edit.php:75
-msgctxt "date and time"
-msgid "%1$s at %2$s"
-msgstr ""
-
-#: includes/admin/class-wc-admin-assets.php:114
-#: includes/admin/class-wc-admin-setup-wizard.php:96
-#: includes/class-wc-frontend-scripts.php:327
-msgctxt "enhanced select"
-msgid "One result is available, press enter to select it."
-msgstr ""
-
-#: includes/admin/class-wc-admin-assets.php:115
-#: includes/admin/class-wc-admin-setup-wizard.php:97
-#: includes/class-wc-frontend-scripts.php:328
-msgctxt "enhanced select"
-msgid "%qty% results are available, use up and down arrow keys to navigate."
-msgstr ""
-
-#: includes/admin/class-wc-admin-assets.php:116
+#: includes/admin/class-wc-admin-assets.php:118
 #: includes/admin/class-wc-admin-setup-wizard.php:98
-#: includes/class-wc-frontend-scripts.php:329
+#: includes/class-wc-frontend-scripts.php:544
 msgctxt "enhanced select"
 msgid "No matches found"
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:117
+#: includes/admin/class-wc-admin-assets.php:119
 #: includes/admin/class-wc-admin-setup-wizard.php:99
-#: includes/class-wc-frontend-scripts.php:330
+#: includes/class-wc-frontend-scripts.php:545
 msgctxt "enhanced select"
 msgid "Loading failed"
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:118
+#: includes/admin/class-wc-admin-assets.php:120
 #: includes/admin/class-wc-admin-setup-wizard.php:100
-#: includes/class-wc-frontend-scripts.php:331
+#: includes/class-wc-frontend-scripts.php:546
 msgctxt "enhanced select"
 msgid "Please enter 1 or more characters"
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:119
+#: includes/admin/class-wc-admin-assets.php:121
 #: includes/admin/class-wc-admin-setup-wizard.php:101
-#: includes/class-wc-frontend-scripts.php:332
+#: includes/class-wc-frontend-scripts.php:547
 msgctxt "enhanced select"
 msgid "Please enter %qty% or more characters"
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:120
+#: includes/admin/class-wc-admin-assets.php:122
 #: includes/admin/class-wc-admin-setup-wizard.php:102
-#: includes/class-wc-frontend-scripts.php:333
+#: includes/class-wc-frontend-scripts.php:548
 msgctxt "enhanced select"
 msgid "Please delete 1 character"
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:121
+#: includes/admin/class-wc-admin-assets.php:123
 #: includes/admin/class-wc-admin-setup-wizard.php:103
-#: includes/class-wc-frontend-scripts.php:334
+#: includes/class-wc-frontend-scripts.php:549
 msgctxt "enhanced select"
 msgid "Please delete %qty% characters"
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:122
+#: includes/admin/class-wc-admin-assets.php:124
 #: includes/admin/class-wc-admin-setup-wizard.php:104
-#: includes/class-wc-frontend-scripts.php:335
+#: includes/class-wc-frontend-scripts.php:550
 msgctxt "enhanced select"
 msgid "You can only select 1 item"
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:123
+#: includes/admin/class-wc-admin-assets.php:125
 #: includes/admin/class-wc-admin-setup-wizard.php:105
-#: includes/class-wc-frontend-scripts.php:336
+#: includes/class-wc-frontend-scripts.php:551
 msgctxt "enhanced select"
 msgid "You can only select %qty% items"
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:124
+#: includes/admin/class-wc-admin-assets.php:126
 #: includes/admin/class-wc-admin-setup-wizard.php:106
-#: includes/class-wc-frontend-scripts.php:337
+#: includes/class-wc-frontend-scripts.php:552
 msgctxt "enhanced select"
 msgid "Loading more results&hellip;"
 msgstr ""
 
-#: includes/admin/class-wc-admin-assets.php:125
+#: includes/admin/class-wc-admin-assets.php:127
 #: includes/admin/class-wc-admin-setup-wizard.php:107
-#: includes/class-wc-frontend-scripts.php:338
+#: includes/class-wc-frontend-scripts.php:553
 msgctxt "enhanced select"
 msgid "Searching&hellip;"
 msgstr ""
 
-#: includes/admin/class-wc-admin-menus.php:142
-#: includes/class-wc-post-types.php:303
+#: includes/admin/class-wc-admin-menus.php:141
+#: includes/class-wc-post-types.php:331
 msgctxt "Admin menu name"
 msgid "Orders"
 msgstr ""
 
-#: includes/class-wc-post-types.php:67
+#: includes/class-wc-post-types.php:85
 msgctxt "Admin menu name"
 msgid "Categories"
 msgstr ""
 
-#: includes/class-wc-post-types.php:102
+#: includes/class-wc-post-types.php:121
 msgctxt "Admin menu name"
 msgid "Tags"
 msgstr ""
 
-#: includes/class-wc-post-types.php:139
+#: includes/class-wc-post-types.php:158
 msgctxt "Admin menu name"
-msgid "Shipping Classes"
+msgid "Shipping classes"
 msgstr ""
 
-#: includes/class-wc-post-types.php:239
+#: includes/class-wc-post-types.php:260
 msgctxt "Admin menu name"
 msgid "Products"
 msgstr ""
 
-#: includes/class-wc-post-types.php:350
+#: includes/class-wc-post-types.php:382
 msgctxt "Admin menu name"
 msgid "Coupons"
 msgstr ""
 
-#: includes/class-wc-post-types.php:388
+#: includes/class-wc-post-types.php:423
 msgctxt "Admin menu name"
 msgid "Webhooks"
 msgstr ""
 
-#: includes/admin/class-wc-admin-permalink-settings.php:68
-#: includes/class-wc-post-types.php:86
-#: includes/updates/woocommerce-update-2.0.php:46
+#: includes/admin/class-wc-admin-permalink-settings.php:76
+#: includes/wc-core-functions.php:1587 includes/wc-update-functions.php:51
 msgctxt "slug"
 msgid "product-category"
 msgstr ""
 
-#: includes/admin/class-wc-admin-permalink-settings.php:78
-#: includes/class-wc-post-types.php:124
-#: includes/updates/woocommerce-update-2.0.php:47
+#: includes/admin/class-wc-admin-permalink-settings.php:85
+#: includes/wc-core-functions.php:1588 includes/wc-update-functions.php:52
 msgctxt "slug"
 msgid "product-tag"
 msgstr ""
 
 #: includes/admin/class-wc-admin-permalink-settings.php:196
-#: includes/class-wc-post-types.php:231
-#: includes/updates/woocommerce-update-2.0.php:55
-#: includes/wc-core-functions.php:557 includes/wc-core-functions.php:592
+#: includes/wc-core-functions.php:1586 includes/wc-update-functions.php:60
 msgctxt "slug"
 msgid "product"
 msgstr ""
 
-#: includes/wc-product-functions.php:236
+#: includes/wc-product-functions.php:272
 msgctxt "slug"
 msgid "uncategorized"
 msgstr ""
 
-#: includes/admin/class-wc-admin-permalink-settings.php:103
-#: includes/admin/class-wc-admin-permalink-settings.php:209
+#: includes/admin/class-wc-admin-permalink-settings.php:106
+#: includes/admin/class-wc-admin-permalink-settings.php:206
 msgctxt "default-slug"
 msgid "shop"
 msgstr ""
 
-#: includes/admin/class-wc-admin-permalink-settings.php:104
+#: includes/admin/class-wc-admin-permalink-settings.php:107
 msgctxt "default-slug"
 msgid "product"
 msgstr ""
 
-#: includes/admin/class-wc-admin-post-types.php:757
-msgctxt "Order number by X"
-msgid "%s by %s"
+#: includes/admin/class-wc-admin-post-types.php:621
+#: includes/class-wc-order.php:779 includes/class-wc-order.php:789
+#. translators: 1: first name 2: last name
+msgctxt "full name"
+msgid "%1$s %2$s"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:232
-#: includes/class-wc-install.php:234
+#: includes/admin/class-wc-admin-setup-wizard.php:253
+#: includes/class-wc-install.php:320
 msgctxt "Page title"
 msgid "Shop"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:236
-#: includes/class-wc-install.php:239
+#: includes/admin/class-wc-admin-setup-wizard.php:257
+#: includes/class-wc-install.php:325
 msgctxt "Page title"
 msgid "Cart"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:240
-#: includes/class-wc-install.php:244
+#: includes/admin/class-wc-admin-setup-wizard.php:261
+#: includes/class-wc-install.php:330
 msgctxt "Page title"
 msgid "Checkout"
 msgstr ""
 
-#: includes/admin/class-wc-admin-setup-wizard.php:246
-#: includes/class-wc-install.php:249
+#: includes/admin/class-wc-admin-setup-wizard.php:267
+#: includes/class-wc-install.php:335
 msgctxt "Page title"
-msgid "My Account"
+msgid "My account"
 msgstr ""
 
-#: includes/admin/class-wc-admin-webhooks-table-list.php:212
+#: includes/admin/class-wc-admin-setup-wizard.php:623
+#: includes/gateways/cheque/class-wc-gateway-cheque.php:27
+#: includes/gateways/cheque/class-wc-gateway-cheque.php:63
+msgctxt "Check payment method"
+msgid "Check payments"
+msgstr ""
+
+#: includes/gateways/cheque/class-wc-gateway-cheque.php:116
+msgctxt "Check payment method"
+msgid "Awaiting check payment"
+msgstr ""
+
+#: includes/admin/class-wc-admin-webhooks-table-list.php:216
+#. translators: %s: count
 msgctxt "posts"
 msgid "All <span class=\"count\">(%s)</span>"
 msgid_plural "All <span class=\"count\">(%s)</span>"
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/admin/class-wc-admin-webhooks.php:49
-#: includes/admin/class-wc-admin-webhooks.php:195
-#: includes/admin/settings/views/html-webhooks-edit.php:16
-#: includes/api/class-wc-api-webhooks.php:197
-#: includes/api/v2/class-wc-api-webhooks.php:197
+#: includes/admin/class-wc-admin-webhooks.php:51
+#: includes/admin/class-wc-admin-webhooks.php:217
+#: includes/admin/settings/views/html-webhooks-edit.php:18
+#: includes/api/legacy/v2/class-wc-api-webhooks.php:198
+#: includes/api/legacy/v3/class-wc-api-webhooks.php:198
+#: includes/api/v1/class-wc-rest-webhooks-controller.php:379
 msgctxt "Webhook created on date parsed by strftime"
 msgid "%b %d, %Y @ %I:%M %p"
 msgstr ""
 
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:74
-msgctxt "placeholder"
-msgid "YYYY-MM-DD"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:182
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:194
-msgctxt "placeholder"
-msgid "Unlimited usage"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:188
-msgctxt "placeholder"
-msgid "Apply to all qualifying items in cart"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:155
-msgctxt "placeholder"
-msgid "Buy product"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:173
-#: includes/admin/meta-boxes/views/html-variation-admin.php:104
-msgctxt "placeholder"
-msgid "From&hellip;"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:174
-#: includes/admin/meta-boxes/views/html-variation-admin.php:108
-msgctxt "placeholder"
-msgid "To&hellip;"
-msgstr ""
-
-#: includes/class-wc-checkout.php:108
-msgctxt "placeholder"
-msgid "Username"
-msgstr ""
-
-#: includes/class-wc-checkout.php:117
-msgctxt "placeholder"
-msgid "Password"
-msgstr ""
-
-#: includes/class-wc-checkout.php:126
-msgctxt "placeholder"
-msgid "Notes about your order, e.g. special notes for delivery."
-msgstr ""
-
-#: includes/class-wc-countries.php:514
-msgctxt "placeholder"
-msgid "Street address"
-msgstr ""
-
-#: includes/class-wc-countries.php:519
-msgctxt "placeholder"
-msgid "Apartment, suite, unit etc. (optional)"
-msgstr ""
-
-#: templates/product-searchform.php:27
-msgctxt "placeholder"
-msgid "Search Products&hellip;"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:167
-msgctxt "Order #123 details"
-msgid "%s #%s details"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:260
-#: includes/admin/views/html-bulk-edit-product.php:78
-#: includes/admin/views/html-quick-edit-product.php:57
-#: includes/shipping/flat-rate/includes/settings-flat-rate.php:54
-msgctxt "Tax status"
-msgid "None"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:727
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:761
-msgctxt "number of pages"
-msgid "of"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:305
-msgctxt "Refund $amount"
-msgid "Refund %s via %s"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-items.php:306
-msgctxt "Refund $amount manually"
-msgid "Refund %s manually"
-msgstr ""
-
-#: includes/admin/meta-boxes/views/html-order-refund.php:21
+#: includes/admin/meta-boxes/views/html-order-refund.php:20
 msgctxt "Ex: Refund - $date >by< $username"
 msgid "by"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-customer-list.php:146
-#: templates/myaccount/my-orders.php:67
+#: includes/admin/meta-boxes/views/html-product-data-general.php:17
+msgctxt "placeholder"
+msgid "Buy product"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-product-data-general.php:45
+#: includes/admin/meta-boxes/views/html-variation-admin.php:134
+msgctxt "placeholder"
+msgid "From&hellip;"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-product-data-general.php:46
+#: includes/admin/meta-boxes/views/html-variation-admin.php:138
+msgctxt "placeholder"
+msgid "To&hellip;"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-product-data-general.php:134
+#: includes/admin/views/html-bulk-edit-product.php:78
+#: includes/admin/views/html-quick-edit-product.php:57
+#: includes/shipping/flat-rate/includes/settings-flat-rate.php:27
+#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:54
+#: includes/shipping/local-pickup/class-wc-shipping-local-pickup.php:83
+msgctxt "Tax status"
+msgid "None"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:91
+#: includes/admin/meta-boxes/views/html-product-data-variations.php:125
+msgctxt "number of pages"
+msgid "of"
+msgstr ""
+
+#: includes/admin/reports/class-wc-report-customer-list.php:136
+#: templates/myaccount/my-orders.php:55 templates/myaccount/orders.php:51
 msgctxt "hash before order number"
 msgid "#"
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-sales-by-date.php:392
-msgctxt "%s = amount of the refunds, %d = number of refunded orders."
-msgid "%s refunded %d order"
-msgid_plural "%s refunded %d orders"
-msgstr[0] ""
-msgstr[1] ""
-
 #: includes/admin/settings/class-wc-settings-checkout.php:28
 msgctxt "Settings tab label"
 msgid "Checkout"
 msgstr ""
 
-#: includes/admin/settings/class-wc-settings-checkout.php:96
-msgctxt "Settings group label"
-msgid "Checkout"
-msgstr ""
-
-#: includes/admin/settings/views/html-settings-tax.php:96
-msgctxt "%s will be a number eventually, but must be a string for now."
-msgid "%s items"
-msgstr ""
-
-#: includes/admin/settings/views/html-settings-tax.php:110
-msgctxt "Pagination, like `1 of 3`"
+#: includes/admin/settings/views/html-settings-tax.php:124
+#. translators: 1: current page 2: total pages
+msgctxt "Pagination"
 msgid "%1$s of %2$s"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:383
-msgctxt "Version info"
-msgid "%s is available"
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-report.php:395
-msgctxt "by author"
-msgid "by %s"
-msgstr ""
-
-#: includes/admin/views/html-admin-page-status-report.php:470
+#: includes/api/class-wc-rest-system-status-controller.php:862
 msgctxt "Page setting"
-msgid "Shop Base"
+msgid "Shop base"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:475
+#: includes/api/class-wc-rest-system-status-controller.php:866
 msgctxt "Page setting"
 msgid "Cart"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:480
+#: includes/api/class-wc-rest-system-status-controller.php:870
 msgctxt "Page setting"
 msgid "Checkout"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:485
+#: includes/api/class-wc-rest-system-status-controller.php:874
 msgctxt "Page setting"
-msgid "My Account"
+msgid "My account"
 msgstr ""
 
-#: includes/admin/views/html-admin-page-status-report.php:499
-msgctxt "WC Pages links in the System Status"
-msgid "Edit %s page"
-msgstr ""
-
-#: includes/class-wc-install.php:233
-msgctxt "Page slug"
-msgid "shop"
-msgstr ""
-
-#: includes/class-wc-install.php:238
-msgctxt "Page slug"
-msgid "cart"
-msgstr ""
-
-#: includes/class-wc-install.php:243
-msgctxt "Page slug"
-msgid "checkout"
-msgstr ""
-
-#: includes/class-wc-install.php:248
-msgctxt "Page slug"
-msgid "my-account"
-msgstr ""
-
-#: includes/class-wc-post-types.php:291
-msgctxt "shop_order post type singular name"
-msgid "Order"
-msgstr ""
-
-#: includes/class-wc-post-types.php:424 includes/wc-order-functions.php:25
-msgctxt "Order status"
-msgid "Pending Payment"
-msgstr ""
-
-#: includes/class-wc-post-types.php:432 includes/wc-order-functions.php:26
-msgctxt "Order status"
-msgid "Processing"
-msgstr ""
-
-#: includes/class-wc-post-types.php:440 includes/wc-order-functions.php:27
-msgctxt "Order status"
-msgid "On Hold"
-msgstr ""
-
-#: includes/class-wc-post-types.php:448 includes/wc-order-functions.php:28
-msgctxt "Order status"
-msgid "Completed"
-msgstr ""
-
-#: includes/class-wc-post-types.php:456 includes/wc-order-functions.php:29
-msgctxt "Order status"
-msgid "Cancelled"
-msgstr ""
-
-#: includes/class-wc-post-types.php:464 includes/wc-order-functions.php:30
-msgctxt "Order status"
-msgid "Refunded"
-msgstr ""
-
-#: includes/class-wc-post-types.php:472 includes/wc-order-functions.php:31
-msgctxt "Order status"
-msgid "Failed"
-msgstr ""
-
-#: includes/class-wc-product-grouped.php:156
-#: includes/class-wc-product-variable.php:342
-#: includes/class-wc-product-variable.php:348
-msgctxt "Price range: from-to"
-msgid "%1$s&ndash;%2$s"
-msgstr ""
-
-#: includes/wc-cart-functions.php:100
+#: includes/class-wc-form-handler.php:460 includes/wc-cart-functions.php:103
 msgctxt "Item name in quotes"
 msgid "&ldquo;%s&rdquo;"
 msgstr ""
 
-#: includes/wc-core-functions.php:79 includes/wc-order-functions.php:633
+#: includes/class-wc-install.php:319
+msgctxt "Page slug"
+msgid "shop"
+msgstr ""
+
+#: includes/class-wc-install.php:324
+msgctxt "Page slug"
+msgid "cart"
+msgstr ""
+
+#: includes/class-wc-install.php:329
+msgctxt "Page slug"
+msgid "checkout"
+msgstr ""
+
+#: includes/class-wc-install.php:334
+msgctxt "Page slug"
+msgid "my-account"
+msgstr ""
+
+#: includes/class-wc-order-refund.php:64
+#: includes/data-stores/abstract-wc-order-data-store-cpt.php:185
+#: includes/data-stores/class-wc-order-refund-data-store-cpt.php:101
 msgctxt "Order date parsed by strftime"
 msgid "%b %d, %Y @ %I:%M %p"
 msgstr ""
 
-#: includes/wc-page-functions.php:116
+#: includes/class-wc-post-types.php:196
+msgctxt "Product Attribute"
+msgid "Product %s"
+msgstr ""
+
+#: includes/class-wc-post-types.php:319
+msgctxt "shop_order post type singular name"
+msgid "Order"
+msgstr ""
+
+#: includes/class-wc-post-types.php:464 includes/wc-order-functions.php:112
+msgctxt "Order status"
+msgid "Pending payment"
+msgstr ""
+
+#: includes/class-wc-post-types.php:472 includes/wc-order-functions.php:113
+msgctxt "Order status"
+msgid "Processing"
+msgstr ""
+
+#: includes/class-wc-post-types.php:480 includes/wc-order-functions.php:114
+msgctxt "Order status"
+msgid "On hold"
+msgstr ""
+
+#: includes/class-wc-post-types.php:488 includes/wc-order-functions.php:115
+msgctxt "Order status"
+msgid "Completed"
+msgstr ""
+
+#: includes/class-wc-post-types.php:496 includes/wc-order-functions.php:116
+msgctxt "Order status"
+msgid "Cancelled"
+msgstr ""
+
+#: includes/class-wc-post-types.php:504 includes/wc-order-functions.php:117
+msgctxt "Order status"
+msgid "Refunded"
+msgstr ""
+
+#: includes/class-wc-post-types.php:512 includes/wc-order-functions.php:118
+msgctxt "Order status"
+msgid "Failed"
+msgstr ""
+
+#: includes/class-wc-product-grouped.php:96
+msgctxt "Price range: from-to"
+msgid "%1$s&ndash;%2$s"
+msgstr ""
+
+#: includes/wc-formatting-functions.php:1022
+msgctxt "Price range: from-to"
+msgid "%1$s &ndash; %2$s"
+msgstr ""
+
+#: includes/wc-account-functions.php:64
 msgctxt "edit-address-slug"
 msgid "billing"
 msgstr ""
 
-#: includes/wc-page-functions.php:117
+#: includes/wc-account-functions.php:65
 msgctxt "edit-address-slug"
 msgid "shipping"
 msgstr ""
 
-#: includes/wc-template-functions.php:1353
+#: includes/wc-cart-functions.php:223
+msgctxt "shipping packages"
+msgid "Shipping"
+msgid_plural "Shipping %d"
+msgstr[0] ""
+msgstr[1] ""
+
+#: includes/wc-template-functions.php:1508
 msgctxt "breadcrumb"
 msgid "Home"
 msgstr ""
 
+#: includes/wc-template-functions.php:2546
+msgctxt "min_price"
+msgid "From:"
+msgstr ""
+
 #: includes/widgets/class-wc-widget-products.php:64
 msgctxt "Sorting order"
 msgid "Order"
 msgstr ""
 
-#: includes/widgets/class-wc-widget-recent-reviews.php:86
-msgctxt "by comment author"
-msgid "by %1$s"
-msgstr ""
-
-#: templates/global/quantity-input.php:23
+#: templates/global/quantity-input.php:32
 msgctxt "Product quantity input tooltip"
 msgid "Qty"
 msgstr ""
 
-#: templates/loop/result-count.php:42
-msgctxt "%1$d = first, %2$d = last, %3$d = total"
-msgid "Showing %1$d&ndash;%2$d of %3$d results"
-msgstr ""
-
 #: templates/product-searchform.php:27
-msgctxt "label"
-msgid "Search for:"
-msgstr ""
-
-#: templates/product-searchform.php:28
 msgctxt "submit button"
 msgid "Search"
 msgstr ""
\ No newline at end of file
diff --git a/i18n/locale-info.php b/i18n/locale-info.php
index 0753522d784..d6a71b5957a 100644
--- a/i18n/locale-info.php
+++ b/i18n/locale-info.php
@@ -15,10 +15,10 @@ return array(
 					'state'    => '',
 					'rate'     => '10.0000',
 					'name'     => 'GST',
-					'shipping' => true
-				)
-			)
-		)
+					'shipping' => true,
+				),
+			),
+		),
 	),
 	'BD' => array(
 		'currency_code'  => 'BDT',
@@ -35,10 +35,10 @@ return array(
 					'state'    => '',
 					'rate'     => '15.0000',
 					'name'     => 'VAT',
-					'shipping' => true
-				)
-			)
-		)
+					'shipping' => true,
+				),
+			),
+		),
 	),
 	'BE' => array(
 		'currency_code'  => 'EUR',
@@ -53,12 +53,12 @@ return array(
 			  array(
 					'country'  => 'BE',
 					'state'    => '',
-					'rate'     => '20.0000',
+					'rate'     => '21.0000',
 					'name'     => 'BTW',
-					'shipping' => true
-				)
-			)
-		)
+					'shipping' => true,
+				),
+			),
+		),
 	),
 	'BR' => array(
 		'currency_code'  => 'BRL',
@@ -68,7 +68,7 @@ return array(
 		'num_decimals'   => 2,
 		'weight_unit'    => 'kg',
 		'dimension_unit' => 'cm',
-		'tax_rates'      => array()
+		'tax_rates'      => array(),
 	),
 	'CA' => array(
 		'currency_code'  => 'CAD',
@@ -84,135 +84,135 @@ return array(
 					'country'  => 'CA',
 					'state'    => 'BC',
 					'rate'     => '7.0000',
-					'name'     => 'PST',
+					'name'     => _x( 'PST', 'Canadian Tax Rates', 'woocommerce' ),
 					'shipping' => false,
-					'priority' => 2
-				)
+					'priority' => 2,
+				),
 			),
 			'SK' => array(
 				array(
 					'country'  => 'CA',
 					'state'    => 'SK',
 					'rate'     => '5.0000',
-					'name'     => 'PST',
+					'name'     => _x( 'PST', 'Canadian Tax Rates', 'woocommerce' ),
 					'shipping' => false,
-					'priority' => 2
-				)
+					'priority' => 2,
+				),
 			),
 			'MB' => array(
 				array(
 					'country'  => 'CA',
 					'state'    => 'MB',
 					'rate'     => '8.0000',
-					'name'     => 'PST',
+					'name'     => _x( 'PST', 'Canadian Tax Rates', 'woocommerce' ),
 					'shipping' => false,
-					'priority' => 2
-				)
+					'priority' => 2,
+				),
 			),
 			'QC' => array(
 				array(
 					'country'  => 'CA',
 					'state'    => 'QC',
 					'rate'     => '9.975',
-					'name'     => 'QST',
+					'name'     => _x( 'QST', 'Canadian Tax Rates', 'woocommerce' ),
 					'shipping' => false,
-					'priority' => 2
-				)
+					'priority' => 2,
+				),
 			),
 			'*' => array(
 				array(
 					'country'  => 'CA',
 					'state'    => 'ON',
 					'rate'     => '13.0000',
-					'name'     => 'HST',
-					'shipping' => true
+					'name'     => _x( 'HST', 'Canadian Tax Rates', 'woocommerce' ),
+					'shipping' => true,
 				),
 				array(
 					'country'  => 'CA',
 					'state'    => 'NL',
 					'rate'     => '13.0000',
-					'name'     => 'HST',
-					'shipping' => true
+					'name'     => _x( 'HST', 'Canadian Tax Rates', 'woocommerce' ),
+					'shipping' => true,
 				),
 				array(
 					'country'  => 'CA',
 					'state'    => 'NB',
 					'rate'     => '13.0000',
-					'name'     => 'HST',
-					'shipping' => true
+					'name'     => _x( 'HST', 'Canadian Tax Rates', 'woocommerce' ),
+					'shipping' => true,
 				),
 				array(
 					'country'  => 'CA',
 					'state'    => 'PE',
 					'rate'     => '14.0000',
-					'name'     => 'HST',
-					'shipping' => true
+					'name'     => _x( 'HST', 'Canadian Tax Rates', 'woocommerce' ),
+					'shipping' => true,
 				),
 				array(
 					'country'  => 'CA',
 					'state'    => 'NS',
 					'rate'     => '15.0000',
-					'name'     => 'HST',
-					'shipping' => true
+					'name'     => _x( 'HST', 'Canadian Tax Rates', 'woocommerce' ),
+					'shipping' => true,
 				),
 				array(
 					'country'  => 'CA',
 					'state'    => 'AB',
 					'rate'     => '5.0000',
-					'name'     => 'GST',
-					'shipping' => true
+					'name'     => _x( 'GST', 'Canadian Tax Rates', 'woocommerce' ),
+					'shipping' => true,
 				),
 				array(
 					'country'  => 'CA',
 					'state'    => 'BC',
 					'rate'     => '5.0000',
-					'name'     => 'GST',
-					'shipping' => true
+					'name'     => _x( 'GST', 'Canadian Tax Rates', 'woocommerce' ),
+					'shipping' => true,
 				),
 				array(
 					'country'  => 'CA',
 					'state'    => 'NT',
 					'rate'     => '5.0000',
-					'name'     => 'GST',
-					'shipping' => true
+					'name'     => _x( 'GST', 'Canadian Tax Rates', 'woocommerce' ),
+					'shipping' => true,
 				),
 				array(
 					'country'  => 'CA',
 					'state'    => 'NU',
 					'rate'     => '5.0000',
-					'name'     => 'GST',
-					'shipping' => true
+					'name'     => _x( 'GST', 'Canadian Tax Rates', 'woocommerce' ),
+					'shipping' => true,
 				),
 				array(
 					'country'  => 'CA',
 					'state'    => 'YT',
 					'rate'     => '5.0000',
-					'name'     => 'GST',
-					'shipping' => true
+					'name'     => _x( 'GST', 'Canadian Tax Rates', 'woocommerce' ),
+					'shipping' => true,
 				),
 				array(
 					'country'  => 'CA',
 					'state'    => 'SK',
 					'rate'     => '5.0000',
-					'name'     => 'GST',
-					'shipping' => true
+					'name'     => _x( 'GST', 'Canadian Tax Rates', 'woocommerce' ),
+					'shipping' => true,
 				),
 				array(
 					'country'  => 'CA',
 					'state'    => 'MB',
 					'rate'     => '5.0000',
-					'name'     => 'GST',
-					'shipping' => true
+					'name'     => _x( 'GST', 'Canadian Tax Rates', 'woocommerce' ),
+					'shipping' => true,
 				),
 				array(
 					'country'  => 'CA',
 					'state'    => 'QC',
 					'rate'     => '5.0000',
-					'name'     => 'GST',
-					'shipping' => true
-				)
-			)
-		)
+					'name'     => _x( 'GST', 'Canadian Tax Rates', 'woocommerce' ),
+					'shipping' => true,
+				),
+			),
+		),
 	),
 	'DE' => array(
 		'currency_code'  => 'EUR',
@@ -229,10 +229,10 @@ return array(
 					'state'    => '',
 					'rate'     => '19.0000',
 					'name'     => 'Mwst.',
-					'shipping' => true
-				)
-			)
-		)
+					'shipping' => true,
+				),
+			),
+		),
 	),
 	'ES' => array(
 		'currency_code'  => 'EUR',
@@ -249,10 +249,30 @@ return array(
 					'state'    => '',
 					'rate'     => '21.0000',
 					'name'     => 'VAT',
-					'shipping' => true
-				)
-			)
-		)
+					'shipping' => true,
+				),
+			),
+		),
+	),
+	'FI' => array(
+		'currency_code'  => 'EUR',
+		'currency_pos'   => 'right_space',
+		'thousand_sep'   => ' ',
+		'decimal_sep'    => ',',
+		'num_decimals'   => 2,
+		'weight_unit'    => 'kg',
+		'dimension_unit' => 'cm',
+		'tax_rates'      => array(
+			'' => array(
+				array(
+					'country'  => 'FI',
+					'state'    => '',
+					'rate'     => '24.0000',
+					'name'     => 'ALV',
+					'shipping' => true,
+				),
+			),
+		),
 	),
 	'FR' => array(
 		'currency_code'  => 'EUR',
@@ -268,11 +288,11 @@ return array(
 					'country'  => 'FR',
 					'state'    => '',
 					'rate'     => '20.0000',
-					'name'     => 'VAT',
-					'shipping' => true
-				)
-			)
-		)
+					'name'     => 'TVA',
+					'shipping' => true,
+				),
+			),
+		),
 	),
 	'GB' => array(
 		'currency_code'  => 'GBP',
@@ -289,10 +309,10 @@ return array(
 					'state'	 => '',
 					'rate'	  => '20.0000',
 					'name'	  => 'VAT',
-					'shipping' => true
-				)
-			)
-		)
+					'shipping' => true,
+				),
+			),
+		),
 	),
 	'HU' => array(
 		'currency_code'  => 'HUF',
@@ -309,10 +329,10 @@ return array(
 					'state'    => '',
 					'rate'     => '27.0000',
 					'name'     => 'ÁFA',
-					'shipping' => true
-				)
-			)
-		)
+					'shipping' => true,
+				),
+			),
+		),
 	),
 	'IT' => array(
 		'currency_code'  => 'EUR',
@@ -329,10 +349,10 @@ return array(
 					'state'    => '',
 					'rate'     => '22.0000',
 					'name'     => 'IVA',
-					'shipping' => true
-				)
-			)
-		)
+					'shipping' => true,
+				),
+			),
+		),
 	),
 	'JP' => array(
 		'currency_code'  => 'JPY',
@@ -349,10 +369,10 @@ return array(
 					'state'    => '',
 					'rate'     => '8.0000',
 					'name'     => __( 'Consumption tax', 'woocommerce' ),
-					'shipping' => true
-				)
-			)
-		)
+					'shipping' => true,
+				),
+			),
+		),
 	),
 	'NL' => array(
 		'currency_code'  => 'EUR',
@@ -369,10 +389,10 @@ return array(
 					'state'    => '',
 					'rate'     => '21.0000',
 					'name'     => 'VAT',
-					'shipping' => true
-				)
-			)
-		)
+					'shipping' => true,
+				),
+			),
+		),
 	),
 	'NO' => array(
 		'currency_code'  => 'Kr',
@@ -389,10 +409,10 @@ return array(
 					'state'    => '',
 					'rate'     => '25.0000',
 					'name'     => 'MVA',
-					'shipping' => true
-				)
-			)
-		)
+					'shipping' => true,
+				),
+			),
+		),
 	),
 	'NP' => array(
 		'currency_code'  => 'NPR',
@@ -409,16 +429,16 @@ return array(
 					'state'    => '',
 					'rate'     => '13.0000',
 					'name'     => 'VAT',
-					'shipping' => true
-				)
-			)
-		)
+					'shipping' => true,
+				),
+			),
+		),
 	),
 	'PL' => array(
 		'currency_code'  => 'PLN',
-		'currency_pos'   => 'right',
-		'thousand_sep'   => ',',
-		'decimal_sep'    => '.',
+		'currency_pos'   => 'right_space',
+		'thousand_sep'   => ' ',
+		'decimal_sep'    => ',',
 		'num_decimals'   => 2,
 		'weight_unit'    => 'kg',
 		'dimension_unit' => 'cm',
@@ -429,10 +449,30 @@ return array(
 					'state'    => '',
 					'rate'     => '23.0000',
 					'name'     => 'VAT',
-					'shipping' => true
-				)
-			)
-		)
+					'shipping' => true,
+				),
+			),
+		),
+	),
+	'RO' => array(
+		'currency_code'  => 'RON',
+		'currency_pos'   => 'right_space',
+		'thousand_sep'   => '.',
+		'decimal_sep'    => ',',
+		'num_decimals'   => 2,
+		'weight_unit'    => 'kg',
+		'dimension_unit' => 'cm',
+		'tax_rates'      => array(
+			'' => array(
+				array(
+					'country'  => 'RO',
+					'state'    => '',
+					'rate'     => '19.0000',
+					'name'     => 'TVA',
+					'shipping' => true,
+				),
+			),
+		),
 	),
 	'TH' => array(
 		'currency_code'  => 'THB',
@@ -449,10 +489,10 @@ return array(
 					'state'    => '',
 					'rate'     => '7.0000',
 					'name'     => 'VAT',
-					'shipping' => true
-				)
-			)
-		)
+					'shipping' => true,
+				),
+			),
+		),
 	),
 	'TR' => array(
 		'currency_code'  => 'TRY',
@@ -469,10 +509,10 @@ return array(
 					'state'    => '',
 					'rate'     => '18.0000',
 					'name'     => 'KDV',
-					'shipping' => true
-				)
-			)
-		)
+					'shipping' => true,
+				),
+			),
+		),
 	),
 	'US' => array(
 		'currency_code'  => 'USD',
@@ -489,8 +529,8 @@ return array(
 					'state'    => 'AL',
 					'rate'     => '4.0000',
 					'name'     => 'State Tax',
-					'shipping' => false
-				)
+					'shipping' => false,
+				),
 			),
 			'AZ' => array(
 				array(
@@ -498,8 +538,8 @@ return array(
 					'state'    => 'AZ',
 					'rate'     => '5.6000',
 					'name'     => 'State Tax',
-					'shipping' => false
-				)
+					'shipping' => false,
+				),
 			),
 			'AR' => array(
 				array(
@@ -507,8 +547,8 @@ return array(
 					'state'    => 'AR',
 					'rate'     => '6.5000',
 					'name'     => 'State Tax',
-					'shipping' => true
-				)
+					'shipping' => true,
+				),
 			),
 			'CA' => array(
 				array(
@@ -516,8 +556,8 @@ return array(
 					'state'    => 'CA',
 					'rate'     => '7.5000',
 					'name'     => 'State Tax',
-					'shipping' => false
-				)
+					'shipping' => false,
+				),
 			),
 			'CO' => array(
 				array(
@@ -525,8 +565,8 @@ return array(
 					'state'    => 'CO',
 					'rate'     => '2.9000',
 					'name'     => 'State Tax',
-					'shipping' => false
-				)
+					'shipping' => false,
+				),
 			),
 			'CT' => array(
 				array(
@@ -534,8 +574,8 @@ return array(
 					'state'    => 'CT',
 					'rate'     => '6.3500',
 					'name'     => 'State Tax',
-					'shipping' => true
-				)
+					'shipping' => true,
+				),
 			),
 			'DC' => array(
 				array(
@@ -543,8 +583,8 @@ return array(
 					'state'    => 'DC',
 					'rate'     => '5.7500',
 					'name'     => 'State Tax',
-					'shipping' => true
-				)
+					'shipping' => true,
+				),
 			),
 			'FL' => array(
 				array(
@@ -552,8 +592,8 @@ return array(
 					'state'    => 'FL',
 					'rate'     => '6.0000',
 					'name'     => 'State Tax',
-					'shipping' => true
-				)
+					'shipping' => true,
+				),
 			),
 			'GA' => array(
 				array(
@@ -561,8 +601,8 @@ return array(
 					'state'    => 'GA',
 					'rate'     => '4.0000',
 					'name'     => 'State Tax',
-					'shipping' => true
-				)
+					'shipping' => true,
+				),
 			),
 			'GU' => array(
 				array(
@@ -570,8 +610,8 @@ return array(
 					'state'    => 'GU',
 					'rate'     => '4.0000',
 					'name'     => 'State Tax',
-					'shipping' => false
-				)
+					'shipping' => false,
+				),
 			),
 			'HI' => array(
 				array(
@@ -579,8 +619,8 @@ return array(
 					'state'    => 'HI',
 					'rate'     => '4.0000',
 					'name'     => 'State Tax',
-					'shipping' => true
-				)
+					'shipping' => true,
+				),
 			),
 			'ID' => array(
 				array(
@@ -588,8 +628,8 @@ return array(
 					'state'    => 'ID',
 					'rate'     => '6.0000',
 					'name'     => 'State Tax',
-					'shipping' => false
-				)
+					'shipping' => false,
+				),
 			),
 			'IL' => array(
 				array(
@@ -597,8 +637,8 @@ return array(
 					'state'    => 'IL',
 					'rate'     => '6.2500',
 					'name'     => 'State Tax',
-					'shipping' => false
-				)
+					'shipping' => false,
+				),
 			),
 			'IN' => array(
 				array(
@@ -606,8 +646,8 @@ return array(
 					'state'    => 'IN',
 					'rate'     => '7.0000',
 					'name'     => 'State Tax',
-					'shipping' => false
-				)
+					'shipping' => false,
+				),
 			),
 			'IA' => array(
 				array(
@@ -615,8 +655,8 @@ return array(
 					'state'    => 'IA',
 					'rate'     => '6.0000',
 					'name'     => 'State Tax',
-					'shipping' => false
-				)
+					'shipping' => false,
+				),
 			),
 			'KS' => array(
 				array(
@@ -624,8 +664,8 @@ return array(
 					'state'    => 'KS',
 					'rate'     => '6.1500',
 					'name'     => 'State Tax',
-					'shipping' => true
-				)
+					'shipping' => true,
+				),
 			),
 			'KY' => array(
 				array(
@@ -633,8 +673,8 @@ return array(
 					'state'    => 'KY',
 					'rate'     => '6.0000',
 					'name'     => 'State Tax',
-					'shipping' => true
-				)
+					'shipping' => true,
+				),
 			),
 			'LA' => array(
 				array(
@@ -642,8 +682,8 @@ return array(
 					'state'    => 'LA',
 					'rate'     => '4.0000',
 					'name'     => 'State Tax',
-					'shipping' => false
-				)
+					'shipping' => false,
+				),
 			),
 			'ME' => array(
 				array(
@@ -651,8 +691,8 @@ return array(
 					'state'    => 'ME',
 					'rate'     => '5.5000',
 					'name'     => 'State Tax',
-					'shipping' => false
-				)
+					'shipping' => false,
+				),
 			),
 			'MD' => array(
 				array(
@@ -660,8 +700,8 @@ return array(
 					'state'    => 'MD',
 					'rate'     => '6.0000',
 					'name'     => 'State Tax',
-					'shipping' => false
-				)
+					'shipping' => false,
+				),
 			),
 			'MA' => array(
 				array(
@@ -669,8 +709,8 @@ return array(
 					'state'    => 'MA',
 					'rate'     => '6.2500',
 					'name'     => 'State Tax',
-					'shipping' => false
-				)
+					'shipping' => false,
+				),
 			),
 			'MI' => array(
 				array(
@@ -678,8 +718,8 @@ return array(
 					'state'    => 'MI',
 					'rate'     => '6.0000',
 					'name'     => 'State Tax',
-					'shipping' => true
-				)
+					'shipping' => true,
+				),
 			),
 			'MN' => array(
 				array(
@@ -687,8 +727,8 @@ return array(
 					'state'    => 'MN',
 					'rate'     => '6.8750',
 					'name'     => 'State Tax',
-					'shipping' => true
-				)
+					'shipping' => true,
+				),
 			),
 			'MS' => array(
 				array(
@@ -696,8 +736,8 @@ return array(
 					'state'    => 'MS',
 					'rate'     => '7.0000',
 					'name'     => 'State Tax',
-					'shipping' => true
-				)
+					'shipping' => true,
+				),
 			),
 			'MO' => array(
 				array(
@@ -705,8 +745,8 @@ return array(
 					'state'    => 'MO',
 					'rate'     => '4.225',
 					'name'     => 'State Tax',
-					'shipping' => false
-				)
+					'shipping' => false,
+				),
 			),
 			'NE' => array(
 				array(
@@ -714,8 +754,8 @@ return array(
 					'state'    => 'NE',
 					'rate'     => '5.5000',
 					'name'     => 'State Tax',
-					'shipping' => true
-				)
+					'shipping' => true,
+				),
 			),
 			'NV' => array(
 				array(
@@ -723,8 +763,8 @@ return array(
 					'state'    => 'NV',
 					'rate'     => '6.8500',
 					'name'     => 'State Tax',
-					'shipping' => false
-				)
+					'shipping' => false,
+				),
 			),
 			'NJ' => array(
 				array(
@@ -732,8 +772,8 @@ return array(
 					'state'    => 'NJ',
 					'rate'     => '7.0000',
 					'name'     => 'State Tax',
-					'shipping' => true
-				)
+					'shipping' => true,
+				),
 			),
 			'NM' => array(
 				array(
@@ -741,8 +781,8 @@ return array(
 					'state'    => 'NM',
 					'rate'     => '5.1250',
 					'name'     => 'State Tax',
-					'shipping' => true
-				)
+					'shipping' => true,
+				),
 			),
 			'NY' => array(
 				array(
@@ -750,8 +790,8 @@ return array(
 					'state'    => 'NY',
 					'rate'     => '4.0000',
 					'name'     => 'State Tax',
-					'shipping' => true
-				)
+					'shipping' => true,
+				),
 			),
 			'NC' => array(
 				array(
@@ -759,8 +799,8 @@ return array(
 					'state'    => 'NC',
 					'rate'     => '4.7500',
 					'name'     => 'State Tax',
-					'shipping' => true
-				)
+					'shipping' => true,
+				),
 			),
 			'ND' => array(
 				array(
@@ -768,8 +808,8 @@ return array(
 					'state'    => 'ND',
 					'rate'     => '5.0000',
 					'name'     => 'State Tax',
-					'shipping' => true
-				)
+					'shipping' => true,
+				),
 			),
 			'OH' => array(
 				array(
@@ -777,8 +817,8 @@ return array(
 					'state'    => 'OH',
 					'rate'     => '5.7500',
 					'name'     => 'State Tax',
-					'shipping' => true
-				)
+					'shipping' => true,
+				),
 			),
 			'OK' => array(
 				array(
@@ -786,8 +826,8 @@ return array(
 					'state'    => 'OK',
 					'rate'     => '4.5000',
 					'name'     => 'State Tax',
-					'shipping' => false
-				)
+					'shipping' => false,
+				),
 			),
 			'PA' => array(
 				array(
@@ -795,8 +835,8 @@ return array(
 					'state'    => 'PA',
 					'rate'     => '6.0000',
 					'name'     => 'State Tax',
-					'shipping' => true
-				)
+					'shipping' => true,
+				),
 			),
 			'PR' => array(
 				array(
@@ -804,8 +844,8 @@ return array(
 					'state'    => 'PR',
 					'rate'     => '6.0000',
 					'name'     => 'State Tax',
-					'shipping' => false
-				)
+					'shipping' => false,
+				),
 			),
 			'RI' => array(
 				array(
@@ -813,8 +853,8 @@ return array(
 					'state'    => 'RI',
 					'rate'     => '7.0000',
 					'name'     => 'State Tax',
-					'shipping' => false
-				)
+					'shipping' => false,
+				),
 			),
 			'SC' => array(
 				array(
@@ -822,8 +862,8 @@ return array(
 					'state'    => 'SC',
 					'rate'     => '6.0000',
 					'name'     => 'State Tax',
-					'shipping' => true
-				)
+					'shipping' => true,
+				),
 			),
 			'SD' => array(
 				array(
@@ -831,8 +871,8 @@ return array(
 					'state'    => 'SD',
 					'rate'     => '4.0000',
 					'name'     => 'State Tax',
-					'shipping' => true
-				)
+					'shipping' => true,
+				),
 			),
 			'TN' => array(
 				array(
@@ -840,8 +880,8 @@ return array(
 					'state'    => 'TN',
 					'rate'     => '7.0000',
 					'name'     => 'State Tax',
-					'shipping' => true
-				)
+					'shipping' => true,
+				),
 			),
 			'TX' => array(
 				array(
@@ -849,8 +889,8 @@ return array(
 					'state'    => 'TX',
 					'rate'     => '6.2500',
 					'name'     => 'State Tax',
-					'shipping' => true
-				)
+					'shipping' => true,
+				),
 			),
 			'UT' => array(
 				array(
@@ -858,8 +898,8 @@ return array(
 					'state'    => 'UT',
 					'rate'     => '5.9500',
 					'name'     => 'State Tax',
-					'shipping' => false
-				)
+					'shipping' => false,
+				),
 			),
 			'VT' => array(
 				array(
@@ -867,8 +907,8 @@ return array(
 					'state'    => 'VT',
 					'rate'     => '6.0000',
 					'name'     => 'State Tax',
-					'shipping' => true
-				)
+					'shipping' => true,
+				),
 			),
 			'VA' => array(
 				array(
@@ -876,8 +916,8 @@ return array(
 					'state'    => 'VA',
 					'rate'     => '5.3000',
 					'name'     => 'State Tax',
-					'shipping' => false
-				)
+					'shipping' => false,
+				),
 			),
 			'WA' => array(
 				array(
@@ -885,8 +925,8 @@ return array(
 					'state'    => 'WA',
 					'rate'     => '6.5000',
 					'name'     => 'State Tax',
-					'shipping' => true
-				)
+					'shipping' => true,
+				),
 			),
 			'WV' => array(
 				array(
@@ -894,8 +934,8 @@ return array(
 					'state'    => 'WV',
 					'rate'     => '6.0000',
 					'name'     => 'State Tax',
-					'shipping' => true
-				)
+					'shipping' => true,
+				),
 			),
 			'WI' => array(
 				array(
@@ -903,8 +943,8 @@ return array(
 					'state'    => 'WI',
 					'rate'     => '5.0000',
 					'name'     => 'State Tax',
-					'shipping' => true
-				)
+					'shipping' => true,
+				),
 			),
 			'WY' => array(
 				array(
@@ -912,10 +952,10 @@ return array(
 					'state'    => 'WY',
 					'rate'     => '4.0000',
 					'name'     => 'State Tax',
-					'shipping' => true
-				)
-			)
-		)
+					'shipping' => true,
+				),
+			),
+		),
 	),
 	'ZA' => array(
 		'currency_code'  => 'ZAR',
@@ -932,9 +972,9 @@ return array(
 					'state'    => '',
 					'rate'     => '14.0000',
 					'name'     => 'VAT',
-					'shipping' => true
-				)
-			)
-		)
-	)
+					'shipping' => true,
+				),
+			),
+		),
+	),
 );
diff --git a/i18n/states/AR.php b/i18n/states/AR.php
index c3073582073..0abda5aa8ca 100644
--- a/i18n/states/AR.php
+++ b/i18n/states/AR.php
@@ -33,5 +33,5 @@ $states['AR'] = array(
 	'S' => __( 'Santa Fe', 'woocommerce' ),
 	'G' => __( 'Santiago del Estero', 'woocommerce' ),
 	'V' => __( 'Tierra del Fuego', 'woocommerce' ),
-	'T' => __( 'Tucum&aacute;n', 'woocommerce' )
+	'T' => __( 'Tucum&aacute;n', 'woocommerce' ),
 );
diff --git a/i18n/states/AU.php b/i18n/states/AU.php
index 175dc87faf4..ebdd58951d8 100644
--- a/i18n/states/AU.php
+++ b/i18n/states/AU.php
@@ -17,5 +17,5 @@ $states['AU'] = array(
 	'SA'  => __( 'South Australia', 'woocommerce' ),
 	'TAS' => __( 'Tasmania', 'woocommerce' ),
 	'VIC' => __( 'Victoria', 'woocommerce' ),
-	'WA'  => __( 'Western Australia', 'woocommerce' )
+	'WA'  => __( 'Western Australia', 'woocommerce' ),
 );
diff --git a/i18n/states/BD.php b/i18n/states/BD.php
index d140e9636a8..2cbc4a3af7e 100644
--- a/i18n/states/BD.php
+++ b/i18n/states/BD.php
@@ -21,7 +21,7 @@ $states['BD'] = array(
 	'CHI'  => __( 'Chittagong', 'woocommerce' ),
 	'CHU'  => __( 'Chuadanga', 'woocommerce' ),
 	'COM'  => __( 'Comilla', 'woocommerce' ),
-	'COX'  => __( 'Cox\'s Bazar', 'woocommerce' ),
+	'COX'  => __( "Cox's Bazar", 'woocommerce' ),
 	'DHA'  => __( 'Dhaka', 'woocommerce' ),
 	'DIN'  => __( 'Dinajpur', 'woocommerce' ),
 	'FAR'  => __( 'Faridpur ', 'woocommerce' ),
@@ -73,5 +73,5 @@ $states['BD'] = array(
 	'SUN'  => __( 'Sunamganj', 'woocommerce' ),
 	'SYL'  => __( 'Sylhet', 'woocommerce' ),
 	'TAN'  => __( 'Tangail', 'woocommerce' ),
-	'THA'  => __( 'Thakurgaon', 'woocommerce' )
+	'THA'  => __( 'Thakurgaon', 'woocommerce' ),
 );
diff --git a/i18n/states/BO.php b/i18n/states/BO.php
new file mode 100644
index 00000000000..525f100ce9d
--- /dev/null
+++ b/i18n/states/BO.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Bolivian states
+ *
+ * @author      Roman Random
+ * @category    i18n
+ * @package     WooCommerce/i18n
+ * @version     3.1.0
+ */
+global $states;
+
+$states['BO'] = array(
+	'B' => __( 'Chuquisaca', 'woocommerce' ),
+	'H' => __( 'Beni', 'woocommerce' ),
+	'C' => __( 'Cochabamba', 'woocommerce' ),
+	'L' => __( 'La Paz', 'woocommerce' ),
+	'O' => __( 'Oruro', 'woocommerce' ),
+	'N' => __( 'Pando', 'woocommerce' ),
+	'P' => __( 'Potosí', 'woocommerce' ),
+	'S' => __( 'Santa Cruz', 'woocommerce' ),
+	'T' => __( 'Tarija', 'woocommerce' ),
+);
diff --git a/i18n/states/BR.php b/i18n/states/BR.php
index 9e0097b63b4..0e12adc4724 100644
--- a/i18n/states/BR.php
+++ b/i18n/states/BR.php
@@ -36,5 +36,5 @@ $states['BR'] = array(
 	'SC' => __( 'Santa Catarina', 'woocommerce' ),
 	'SP' => __( 'S&atilde;o Paulo', 'woocommerce' ),
 	'SE' => __( 'Sergipe', 'woocommerce' ),
-	'TO' => __( 'Tocantins', 'woocommerce' )
+	'TO' => __( 'Tocantins', 'woocommerce' ),
 );
diff --git a/i18n/states/CA.php b/i18n/states/CA.php
index f42d407485b..6a845bd9107 100644
--- a/i18n/states/CA.php
+++ b/i18n/states/CA.php
@@ -22,5 +22,5 @@ $states['CA'] = array(
 	'PE' => __( 'Prince Edward Island', 'woocommerce' ),
 	'QC' => __( 'Quebec', 'woocommerce' ),
 	'SK' => __( 'Saskatchewan', 'woocommerce' ),
-	'YT' => __( 'Yukon Territory', 'woocommerce' )
+	'YT' => __( 'Yukon Territory', 'woocommerce' ),
 );
diff --git a/i18n/states/CN.php b/i18n/states/CN.php
index 4f8a85d4190..a25c053bc96 100644
--- a/i18n/states/CN.php
+++ b/i18n/states/CN.php
@@ -41,5 +41,5 @@ $states['CN'] = array(
 	'CN29' => __( 'Ningxia Hui / &#23425;&#22799;', 'woocommerce' ),
 	'CN30' => __( 'Macau / &#28595;&#38376;', 'woocommerce' ),
 	'CN31' => __( 'Tibet / &#35199;&#34255;', 'woocommerce' ),
-	'CN32' => __( 'Xinjiang / &#26032;&#30086;', 'woocommerce' )
+	'CN32' => __( 'Xinjiang / &#26032;&#30086;', 'woocommerce' ),
 );
diff --git a/i18n/states/ES.php b/i18n/states/ES.php
index 64ea9ced467..4eb789af326 100644
--- a/i18n/states/ES.php
+++ b/i18n/states/ES.php
@@ -61,5 +61,5 @@ $states['ES'] = array(
 	'VA' => __( 'Valladolid', 'woocommerce' ),
 	'BI' => __( 'Bizkaia', 'woocommerce' ),
 	'ZA' => __( 'Zamora', 'woocommerce' ),
-	'Z'  => __( 'Zaragoza', 'woocommerce' )
+	'Z'  => __( 'Zaragoza', 'woocommerce' ),
 );
diff --git a/i18n/states/GR.php b/i18n/states/GR.php
index 0184ab52159..928774eb730 100644
--- a/i18n/states/GR.php
+++ b/i18n/states/GR.php
@@ -22,5 +22,5 @@ $states['GR'] = array(
 	'J' => __( 'Πελοπόννησος', 'woocommerce' ),
 	'K' => __( 'Βόρειο Αιγαίο', 'woocommerce' ),
 	'L' => __( 'Νότιο Αιγαίο', 'woocommerce' ),
-	'M' => __( 'Κρήτη', 'woocommerce' )
+	'M' => __( 'Κρήτη', 'woocommerce' ),
 );
diff --git a/i18n/states/HK.php b/i18n/states/HK.php
index f55b322b42c..58262f7d5c5 100644
--- a/i18n/states/HK.php
+++ b/i18n/states/HK.php
@@ -12,5 +12,5 @@ global $states;
 $states['HK'] = array(
 	'HONG KONG'       => __( 'Hong Kong Island', 'woocommerce' ),
 	'KOWLOON'         => __( 'Kowloon', 'woocommerce' ),
-	'NEW TERRITORIES' => __( 'New Territories', 'woocommerce' )
+	'NEW TERRITORIES' => __( 'New Territories', 'woocommerce' ),
 );
diff --git a/i18n/states/HU.php b/i18n/states/HU.php
index 22a27b568fe..0ede9a71827 100644
--- a/i18n/states/HU.php
+++ b/i18n/states/HU.php
@@ -29,5 +29,5 @@ $states['HU'] = array(
 	'TO' => __( 'Tolna', 'woocommerce' ),
 	'VA' => __( 'Vas', 'woocommerce' ),
 	'VE' => __( 'Veszprém', 'woocommerce' ),
-	'ZA' => __( 'Zala', 'woocommerce' )
+	'ZA' => __( 'Zala', 'woocommerce' ),
 );
diff --git a/i18n/states/ID.php b/i18n/states/ID.php
index bd0c4af1293..47b6d7b339e 100644
--- a/i18n/states/ID.php
+++ b/i18n/states/ID.php
@@ -43,5 +43,5 @@ $states['ID'] = array(
 	'MA' => __( 'Maluku', 'woocommerce' ),
 	'MU' => __( 'Maluku Utara', 'woocommerce' ),
 	'PA' => __( 'Papua', 'woocommerce' ),
-	'PB' => __( 'Papua Barat', 'woocommerce' )
+	'PB' => __( 'Papua Barat', 'woocommerce' ),
 );
diff --git a/i18n/states/IE.php b/i18n/states/IE.php
new file mode 100644
index 00000000000..70ccf901bdd
--- /dev/null
+++ b/i18n/states/IE.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Republic of Ireland
+ *
+ * @author      WooThemes
+ * @category    i18n
+ * @package     WooCommerce/i18n
+ * @version     3.0.0
+ */
+global $states;
+
+$states['IE'] = array(
+	'CE' => __( 'Clare', 'woocommerce' ),
+	'CK' => __( 'Cork', 'woocommerce' ),
+	'CN' => __( 'Cavan', 'woocommerce' ),
+	'CW' => __( 'Carlow', 'woocommerce' ),
+	'DL' => __( 'Donegal', 'woocommerce' ),
+	'DN' => __( 'Dublin', 'woocommerce' ),
+	'GY' => __( 'Galway', 'woocommerce' ),
+	'KE' => __( 'Kildare', 'woocommerce' ),
+	'KK' => __( 'Kilkenny', 'woocommerce' ),
+	'KY' => __( 'Kerry', 'woocommerce' ),
+	'LD' => __( 'Longford', 'woocommerce' ),
+	'LH' => __( 'Louth', 'woocommerce' ),
+	'LK' => __( 'Limerick', 'woocommerce' ),
+	'LM' => __( 'Leitrim', 'woocommerce' ),
+	'LS' => __( 'Laois', 'woocommerce' ),
+	'MH' => __( 'Meath', 'woocommerce' ),
+	'MN' => __( 'Monaghan', 'woocommerce' ),
+	'MO' => __( 'Mayo', 'woocommerce' ),
+	'OY' => __( 'Offaly', 'woocommerce' ),
+	'RN' => __( 'Roscommon', 'woocommerce' ),
+	'SO' => __( 'Sligo', 'woocommerce' ),
+	'TY' => __( 'Tipperary', 'woocommerce' ),
+	'WD' => __( 'Waterford', 'woocommerce' ),
+	'WH' => __( 'Westmeath', 'woocommerce' ),
+	'WW' => __( 'Wicklow', 'woocommerce' ),
+	'WX' => __( 'Wexford', 'woocommerce' ),
+);
diff --git a/i18n/states/IN.php b/i18n/states/IN.php
index eea2e5482e1..1f12d04a8bd 100644
--- a/i18n/states/IN.php
+++ b/i18n/states/IN.php
@@ -41,9 +41,9 @@ $states['IN'] = array(
 	'WB' => __( 'West Bengal', 'woocommerce' ),
 	'AN' => __( 'Andaman and Nicobar Islands', 'woocommerce' ),
 	'CH' => __( 'Chandigarh', 'woocommerce' ),
-	'DN' => __( 'Dadar and Nagar Haveli', 'woocommerce' ),
+	'DN' => __( 'Dadra and Nagar Haveli', 'woocommerce' ),
 	'DD' => __( 'Daman and Diu', 'woocommerce' ),
 	'DL' => __( 'Delhi', 'woocommerce' ),
 	'LD' => __( 'Lakshadeep', 'woocommerce' ),
-	'PY' => __( 'Pondicherry (Puducherry)', 'woocommerce' )
+	'PY' => __( 'Pondicherry (Puducherry)', 'woocommerce' ),
 );
diff --git a/i18n/states/IR.php b/i18n/states/IR.php
index ce8ca23711e..077c1acdff0 100644
--- a/i18n/states/IR.php
+++ b/i18n/states/IR.php
@@ -40,5 +40,5 @@ $states['IR'] = array(
 	'MZN' => __( 'Mazandaran (مازندران)', 'woocommerce' ),
 	'MKZ' => __( 'Markazi (مرکزی)', 'woocommerce' ),
 	'HRZ' => __( 'Hormozgan (هرمزگان)', 'woocommerce' ),
-	'SBN' => __( 'Sistan and Baluchestan (سیستان و بلوچستان)', 'woocommerce' )
+	'SBN' => __( 'Sistan and Baluchestan (سیستان و بلوچستان)', 'woocommerce' ),
 );
diff --git a/i18n/states/IT.php b/i18n/states/IT.php
index 62a5259e520..e737e4081a2 100644
--- a/i18n/states/IT.php
+++ b/i18n/states/IT.php
@@ -54,7 +54,7 @@ $states['IT'] = array(
 	'IM' => __( 'Imperia', 'woocommerce' ),
 	'IS' => __( 'Isernia', 'woocommerce' ),
 	'SP' => __( 'La Spezia', 'woocommerce' ),
-	'AQ' => __( 'L&apos;Aquila', 'woocommerce' ),
+	'AQ' => __( "L'Aquila", 'woocommerce' ),
 	'LT' => __( 'Latina', 'woocommerce' ),
 	'LE' => __( 'Lecce', 'woocommerce' ),
 	'LC' => __( 'Lecco', 'woocommerce' ),
@@ -119,5 +119,5 @@ $states['IT'] = array(
 	'VR' => __( 'Verona', 'woocommerce' ),
 	'VV' => __( 'Vibo Valentia', 'woocommerce' ),
 	'VI' => __( 'Vicenza', 'woocommerce' ),
-	'VT' => __( 'Viterbo', 'woocommerce' )
+	'VT' => __( 'Viterbo', 'woocommerce' ),
 );
diff --git a/i18n/states/MX.php b/i18n/states/MX.php
index 586c4bffc20..3739993b662 100644
--- a/i18n/states/MX.php
+++ b/i18n/states/MX.php
@@ -41,5 +41,5 @@ $states['MX'] = array(
 	'Tlaxcala' 				=> __( 'Tlaxcala', 'woocommerce' ),
 	'Veracruz' 				=> __( 'Veracruz', 'woocommerce' ),
 	'Yucatan' 				=> __( 'Yucatán', 'woocommerce' ),
-	'Zacatecas' 			=> __( 'Zacatecas', 'woocommerce' )
+	'Zacatecas' 			=> __( 'Zacatecas', 'woocommerce' ),
 );
diff --git a/i18n/states/MY.php b/i18n/states/MY.php
index e4c69cffc87..71f56b6f5da 100644
--- a/i18n/states/MY.php
+++ b/i18n/states/MY.php
@@ -25,5 +25,5 @@ $states['MY'] = array(
 	'SGR' => __( 'Selangor', 'woocommerce' ),
 	'TRG' => __( 'Terengganu', 'woocommerce' ),
 	'PJY' => __( 'Putrajaya', 'woocommerce' ),
-	'KUL' => __( 'Kuala Lumpur', 'woocommerce' )
+	'KUL' => __( 'Kuala Lumpur', 'woocommerce' ),
 );
diff --git a/i18n/states/NG.php b/i18n/states/NG.php
new file mode 100644
index 00000000000..9acaf5ad59c
--- /dev/null
+++ b/i18n/states/NG.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Nigerian provinces
+ *
+ * @author   hoshomoh
+ * @category i18n
+ * @package  WooCommerce/i18n
+ * @version  3.0.0
+ */
+
+global $states;
+
+$states['NG'] = array(
+	'AB' => __( 'Abia', 'woocommerce' ),
+	'FC' => __( 'Abuja', 'woocommerce' ),
+	'AD' => __( 'Adamawa', 'woocommerce' ),
+	'AK' => __( 'Akwa Ibom', 'woocommerce' ),
+	'AN' => __( 'Anambra', 'woocommerce' ),
+	'BA' => __( 'Bauchi', 'woocommerce' ),
+	'BY' => __( 'Bayelsa', 'woocommerce' ),
+	'BE' => __( 'Benue', 'woocommerce' ),
+	'BO' => __( 'Borno', 'woocommerce' ),
+	'CR' => __( 'Cross River', 'woocommerce' ),
+	'DE' => __( 'Delta', 'woocommerce' ),
+	'EB' => __( 'Ebonyi', 'woocommerce' ),
+	'ED' => __( 'Edo', 'woocommerce' ),
+	'EK' => __( 'Ekiti', 'woocommerce' ),
+	'EN' => __( 'Enugu', 'woocommerce' ),
+	'GO' => __( 'Gombe', 'woocommerce' ),
+	'IM' => __( 'Imo', 'woocommerce' ),
+	'JI' => __( 'Jigawa', 'woocommerce' ),
+	'KD' => __( 'Kaduna', 'woocommerce' ),
+	'KN' => __( 'Kano', 'woocommerce' ),
+	'KT' => __( 'Katsina', 'woocommerce' ),
+	'KE' => __( 'Kebbi', 'woocommerce' ),
+	'KO' => __( 'Kogi', 'woocommerce' ),
+	'KW' => __( 'Kwara', 'woocommerce' ),
+	'LA' => __( 'Lagos', 'woocommerce' ),
+	'NA' => __( 'Nasarawa', 'woocommerce' ),
+	'NI' => __( 'Niger', 'woocommerce' ),
+	'OG' => __( 'Ogun', 'woocommerce' ),
+	'ON' => __( 'Ondo', 'woocommerce' ),
+	'OS' => __( 'Osun', 'woocommerce' ),
+	'OY' => __( 'Oyo', 'woocommerce' ),
+	'PL' => __( 'Plateau', 'woocommerce' ),
+	'RI' => __( 'Rivers', 'woocommerce' ),
+	'SO' => __( 'Sokoto', 'woocommerce' ),
+	'TA' => __( 'Taraba', 'woocommerce' ),
+	'YO' => __( 'Yobe', 'woocommerce' ),
+	'ZA' => __( 'Zamfara', 'woocommerce' ),
+);
diff --git a/i18n/states/NP.php b/i18n/states/NP.php
index 19836c87512..c7e3b9acdf6 100644
--- a/i18n/states/NP.php
+++ b/i18n/states/NP.php
@@ -23,5 +23,5 @@ $states['NP'] = array(
 	'NAR' => __( 'Narayani', 'woocommerce' ),
 	'RAP' => __( 'Rapti', 'woocommerce' ),
 	'SAG' => __( 'Sagarmatha', 'woocommerce' ),
-	'SET' => __( 'Seti', 'woocommerce' )
+	'SET' => __( 'Seti', 'woocommerce' ),
 );
diff --git a/i18n/states/NZ.php b/i18n/states/NZ.php
index cd76cc0a23b..7afbe7ad222 100644
--- a/i18n/states/NZ.php
+++ b/i18n/states/NZ.php
@@ -25,6 +25,6 @@ $states['NZ'] = array(
 	'WC' => __( 'West Coast', 'woocommerce' ),
 	'CT' => __( 'Canterbury', 'woocommerce' ),
 	'OT' => __( 'Otago', 'woocommerce' ),
-	'SL' => __( 'Southland', 'woocommerce'),
+	'SL' => __( 'Southland', 'woocommerce' ),
 );
 
diff --git a/i18n/states/PE.php b/i18n/states/PE.php
index 16febc94428..167ca246e42 100644
--- a/i18n/states/PE.php
+++ b/i18n/states/PE.php
@@ -35,5 +35,5 @@ $states['PE'] = array(
 	'SAM' => __( 'San Mart&iacute;n', 'woocommerce' ),
 	'TAC' => __( 'Tacna', 'woocommerce' ),
 	'TUM' => __( 'Tumbes', 'woocommerce' ),
-	'UCA' => __( 'Ucayali', 'woocommerce' )
+	'UCA' => __( 'Ucayali', 'woocommerce' ),
 );
diff --git a/i18n/states/PK.php b/i18n/states/PK.php
new file mode 100644
index 00000000000..cac1debaad5
--- /dev/null
+++ b/i18n/states/PK.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Pakistan's states
+ *
+ * @author      WooCommerce
+ * @category    i18n
+ * @package     WooCommerce/i18n
+ * @version     3.0.0
+ */
+global $states;
+
+$states['PK'] = array(
+	'JK' => __( 'Azad Kashmir', 'woocommerce' ),
+	'BA' => __( 'Balochistan', 'woocommerce' ),
+	'TA' => __( 'FATA', 'woocommerce' ),
+	'GB' => __( 'Gilgit Baltistan', 'woocommerce' ),
+	'IS' => __( 'Islamabad Capital Territory', 'woocommerce' ),
+	'KP' => __( 'Khyber Pakhtunkhwa', 'woocommerce' ),
+	'PB' => __( 'Punjab', 'woocommerce' ),
+	'SD' => __( 'Sindh', 'woocommerce' ),
+);
diff --git a/i18n/states/TH.php b/i18n/states/TH.php
index 22be37d40aa..a6b68223097 100644
--- a/i18n/states/TH.php
+++ b/i18n/states/TH.php
@@ -86,5 +86,5 @@ $states['TH'] = array(
 	'TH-61' => __( 'Uthai Thani (&#3629;&#3640;&#3607;&#3633;&#3618;&#3608;&#3634;&#3609;&#3637;)', 'woocommerce' ),
 	'TH-53' => __( 'Uttaradit (&#3629;&#3640;&#3605;&#3619;&#3604;&#3636;&#3605;&#3606;&#3660;)', 'woocommerce' ),
 	'TH-95' => __( 'Yala (&#3618;&#3632;&#3621;&#3634;)', 'woocommerce' ),
-	'TH-35' => __( 'Yasothon (&#3618;&#3650;&#3626;&#3608;&#3619;)', 'woocommerce' )
+	'TH-35' => __( 'Yasothon (&#3618;&#3650;&#3626;&#3608;&#3619;)', 'woocommerce' ),
 );
diff --git a/i18n/states/US.php b/i18n/states/US.php
index 52378a9f59c..7b9652799a2 100644
--- a/i18n/states/US.php
+++ b/i18n/states/US.php
@@ -64,10 +64,4 @@ $states['US'] = array(
 	'AA' => __( 'Armed Forces (AA)', 'woocommerce' ),
 	'AE' => __( 'Armed Forces (AE)', 'woocommerce' ),
 	'AP' => __( 'Armed Forces (AP)', 'woocommerce' ),
-	'AS' => __( 'American Samoa', 'woocommerce' ),
-	'GU' => __( 'Guam', 'woocommerce' ),
-	'MP' => __( 'Northern Mariana Islands', 'woocommerce' ),
-	'PR' => __( 'Puerto Rico', 'woocommerce' ),
-	'UM' => __( 'US Minor Outlying Islands', 'woocommerce' ),
-	'VI' => __( 'US Virgin Islands', 'woocommerce' ),
 );
diff --git a/i18n/states/ZA.php b/i18n/states/ZA.php
index c157bcf2fb0..fee5aff5a87 100644
--- a/i18n/states/ZA.php
+++ b/i18n/states/ZA.php
@@ -18,5 +18,5 @@ $states['ZA'] = array(
 	'MP'  => __( 'Mpumalanga', 'woocommerce' ),
 	'NC'  => __( 'Northern Cape', 'woocommerce' ),
 	'NW'  => __( 'North West', 'woocommerce' ),
-	'WC'  => __( 'Western Cape', 'woocommerce' )
+	'WC'  => __( 'Western Cape', 'woocommerce' ),
 );
diff --git a/includes/abstracts/abstract-wc-data.php b/includes/abstracts/abstract-wc-data.php
new file mode 100644
index 00000000000..8b4eebaddb8
--- /dev/null
+++ b/includes/abstracts/abstract-wc-data.php
@@ -0,0 +1,693 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Abstract WC Data Class
+ *
+ * Implemented by classes using the same CRUD(s) pattern.
+ *
+ * @version  2.6.0
+ * @package  WooCommerce/Abstracts
+ * @category Abstract Class
+ * @author   WooThemes
+ */
+abstract class WC_Data {
+
+	/**
+	 * ID for this object.
+	 *
+	 * @since 3.0.0
+	 * @var int
+	 */
+	protected $id = 0;
+
+	/**
+	 * Core data for this object. Name value pairs (name + default value).
+	 *
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $data = array();
+
+	/**
+	 * Core data changes for this object.
+	 *
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $changes = array();
+
+	/**
+	 * This is false until the object is read from the DB.
+	 *
+	 * @since 3.0.0
+	 * @var bool
+	 */
+	protected $object_read = false;
+
+	/**
+	 * This is the name of this object type.
+	 *
+	 * @since 3.0.0
+	 * @var string
+	 */
+	protected $object_type = 'data';
+
+	/**
+	 * Extra data for this object. Name value pairs (name + default value).
+	 * Used as a standard way for sub classes (like product types) to add
+	 * additional information to an inherited class.
+	 *
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $extra_data = array();
+
+	/**
+	 * Set to _data on construct so we can track and reset data if needed.
+	 *
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $default_data = array();
+
+	/**
+	 * Contains a reference to the data store for this class.
+	 *
+	 * @since 3.0.0
+	 * @var object
+	 */
+	protected $data_store;
+
+	/**
+	 * Stores meta in cache for future reads.
+	 * A group must be set to to enable caching.
+	 *
+	 * @since 3.0.0
+	 * @var string
+	 */
+	protected $cache_group = '';
+
+	/**
+	 * Stores additional meta data.
+	 *
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $meta_data = null;
+
+	/**
+	 * Default constructor.
+	 *
+	 * @param int|object|array $read ID to load from the DB (optional) or already queried data.
+	 */
+	public function __construct( $read = 0 ) {
+		$this->data         = array_merge( $this->data, $this->extra_data );
+		$this->default_data = $this->data;
+	}
+
+	/**
+	 * Only store the object ID to avoid serializing the data object instance.
+	 *
+	 * @return array
+	 */
+	public function __sleep() {
+		return array( 'id' );
+	}
+
+	/**
+	 * Re-run the constructor with the object ID.
+	 *
+	 * If the object no longer exists, remove the ID.
+	 */
+	public function __wakeup() {
+		try {
+			$this->__construct( absint( $this->id ) );
+		} catch ( Exception $e ) {
+			$this->set_id( 0 );
+			$this->set_object_read( true );
+		}
+	}
+
+	/**
+	 * When the object is cloned, make sure meta is duplicated correctly.
+	 *
+	 * @since 3.0.2
+	 */
+	public function __clone() {
+		$this->maybe_read_meta_data();
+		if ( ! empty( $this->meta_data ) ) {
+			foreach ( $this->meta_data as $array_key => $meta ) {
+				$this->meta_data[ $array_key ] = clone $meta;
+				if ( ! empty( $meta->id ) ) {
+					unset( $this->meta_data[ $array_key ]->id );
+				}
+			}
+		}
+	}
+
+	/**
+	 * Get the data store.
+	 *
+	 * @since  3.0.0
+	 * @return object
+	 */
+	public function get_data_store() {
+		return $this->data_store;
+	}
+
+	/**
+	 * Returns the unique ID for this object.
+	 *
+	 * @since  2.6.0
+	 * @return int
+	 */
+	public function get_id() {
+		return $this->id;
+	}
+
+	/**
+	 * Delete an object, set the ID to 0, and return result.
+	 *
+	 * @since  2.6.0
+	 * @param  bool $force_delete
+	 * @return bool result
+	 */
+	public function delete( $force_delete = false ) {
+		if ( $this->data_store ) {
+			$this->data_store->delete( $this, array( 'force_delete' => $force_delete ) );
+			$this->set_id( 0 );
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Save should create or update based on object existence.
+	 *
+	 * @since  2.6.0
+	 * @return int
+	 */
+	public function save() {
+		if ( $this->data_store ) {
+			// Trigger action before saving to the DB. Allows you to adjust object props before save.
+			do_action( 'woocommerce_before_' . $this->object_type . '_object_save', $this, $this->data_store );
+
+			if ( $this->get_id() ) {
+				$this->data_store->update( $this );
+			} else {
+				$this->data_store->create( $this );
+			}
+			return $this->get_id();
+		}
+	}
+
+	/**
+	 * Change data to JSON format.
+	 *
+	 * @since  2.6.0
+	 * @return string Data in JSON format.
+	 */
+	public function __toString() {
+		return json_encode( $this->get_data() );
+	}
+
+	/**
+	 * Returns all data for this object.
+	 *
+	 * @since  2.6.0
+	 * @return array
+	 */
+	public function get_data() {
+		return array_merge( array( 'id' => $this->get_id() ), $this->data, array( 'meta_data' => $this->get_meta_data() ) );
+	}
+
+	/**
+	 * Returns array of expected data keys for this object.
+	 *
+	 * @since   3.0.0
+	 * @return array
+	 */
+	public function get_data_keys() {
+		return array_keys( $this->data );
+	}
+
+	/**
+	 * Returns all "extra" data keys for an object (for sub objects like product types).
+	 *
+	 * @since  3.0.0
+	 * @return array
+	 */
+	public function get_extra_data_keys() {
+		return array_keys( $this->extra_data );
+	}
+
+	/**
+	 * Filter null meta values from array.
+	 *
+	 * @since  3.0.0
+	 * @return bool
+	 */
+	protected function filter_null_meta( $meta ) {
+		return ! is_null( $meta->value );
+	}
+
+	/**
+	 * Get All Meta Data.
+	 *
+	 * @since 2.6.0
+	 * @return array
+	 */
+	public function get_meta_data() {
+		$this->maybe_read_meta_data();
+		return array_filter( $this->meta_data, array( $this, 'filter_null_meta' ) );
+	}
+
+	/**
+	 * Get Meta Data by Key.
+	 *
+	 * @since  2.6.0
+	 * @param  string $key
+	 * @param  bool $single return first found meta with key, or all with $key
+	 * @param  string $context What the value is for. Valid values are view and edit.
+	 * @return mixed
+	 */
+	public function get_meta( $key = '', $single = true, $context = 'view' ) {
+		$this->maybe_read_meta_data();
+		$meta_data  = $this->get_meta_data();
+		$array_keys = array_keys( wp_list_pluck( $meta_data, 'key' ), $key );
+		$value      = $single ? '' : array();
+
+		if ( ! empty( $array_keys ) ) {
+			// We don't use the $this->meta_data property directly here because we don't want meta with a null value (i.e. meta which has been deleted via $this->delete_meta_data())
+			if ( $single ) {
+				$value = $meta_data[ current( $array_keys ) ]->value;
+			} else {
+				$value = array_intersect_key( $meta_data, array_flip( $array_keys ) );
+			}
+
+			if ( 'view' === $context ) {
+				$value = apply_filters( $this->get_hook_prefix() . $key, $value, $this );
+			}
+		}
+
+		return $value;
+	}
+
+	/**
+	 * See if meta data exists, since get_meta always returns a '' or array().
+	 *
+	 * @since  3.0.0
+	 * @param  string $key
+	 * @return boolean
+	 */
+	public function meta_exists( $key = '' ) {
+		$this->maybe_read_meta_data();
+		$array_keys = wp_list_pluck( $this->get_meta_data(), 'key' );
+		return in_array( $key, $array_keys );
+	}
+
+	/**
+	 * Set all meta data from array.
+	 *
+	 * @since 2.6.0
+	 * @param array $data Key/Value pairs
+	 */
+	public function set_meta_data( $data ) {
+		if ( ! empty( $data ) && is_array( $data ) ) {
+			$this->maybe_read_meta_data();
+			foreach ( $data as $meta ) {
+				$meta = (array) $meta;
+				if ( isset( $meta['key'], $meta['value'], $meta['id'] ) ) {
+					$this->meta_data[] = (object) array(
+						'id'    => $meta['id'],
+						'key'   => $meta['key'],
+						'value' => $meta['value'],
+					);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Add meta data.
+	 *
+	 * @since 2.6.0
+	 * @param string $key Meta key
+	 * @param string $value Meta value
+	 * @param bool $unique Should this be a unique key?
+	 */
+	public function add_meta_data( $key, $value, $unique = false ) {
+		$this->maybe_read_meta_data();
+		if ( $unique ) {
+			$this->delete_meta_data( $key );
+		}
+		$this->meta_data[] = (object) array(
+			'key'   => $key,
+			'value' => $value,
+		);
+	}
+
+	/**
+	 * Update meta data by key or ID, if provided.
+	 *
+	 * @since  2.6.0
+	 * @param  string $key
+	 * @param  string $value
+	 * @param  int $meta_id
+	 */
+	public function update_meta_data( $key, $value, $meta_id = '' ) {
+		$this->maybe_read_meta_data();
+		if ( $array_key = $meta_id ? array_keys( wp_list_pluck( $this->meta_data, 'id' ), $meta_id ) : '' ) {
+			$this->meta_data[ current( $array_key ) ] = (object) array(
+				'id'    => $meta_id,
+				'key'   => $key,
+				'value' => $value,
+			);
+		} else {
+			$this->add_meta_data( $key, $value, true );
+		}
+	}
+
+	/**
+	 * Delete meta data.
+	 *
+	 * @since 2.6.0
+	 * @param array $key Meta key
+	 */
+	public function delete_meta_data( $key ) {
+		$this->maybe_read_meta_data();
+		if ( $array_keys = array_keys( wp_list_pluck( $this->meta_data, 'key' ), $key ) ) {
+			foreach ( $array_keys as $array_key ) {
+				$this->meta_data[ $array_key ]->value = null;
+			}
+		}
+	}
+
+	/**
+	 * Delete meta data.
+	 *
+	 * @since 2.6.0
+	 * @param int $mid Meta ID
+	 */
+	public function delete_meta_data_by_mid( $mid ) {
+		$this->maybe_read_meta_data();
+		if ( $array_keys = array_keys( wp_list_pluck( $this->meta_data, 'id' ), $mid ) ) {
+			foreach ( $array_keys as $array_key ) {
+				$this->meta_data[ $array_key ]->value = null;
+			}
+		}
+	}
+
+	/**
+	 * Read meta data if null.
+	 *
+	 * @since 3.0.0
+	 */
+	protected function maybe_read_meta_data() {
+		if ( is_null( $this->meta_data ) ) {
+			$this->read_meta_data();
+		}
+	}
+
+	/**
+	 * Read Meta Data from the database. Ignore any internal properties.
+	 * Uses it's own caches because get_metadata does not provide meta_ids.
+	 *
+	 * @since 2.6.0
+	 * @param bool $force_read True to force a new DB read (and update cache).
+	 */
+	public function read_meta_data( $force_read = false ) {
+		$this->meta_data  = array();
+		$cache_loaded     = false;
+
+		if ( ! $this->get_id() ) {
+			return;
+		}
+
+		if ( ! $this->data_store ) {
+			return;
+		}
+
+		if ( ! empty( $this->cache_group ) ) {
+			$cache_key = WC_Cache_Helper::get_cache_prefix( $this->cache_group ) . 'object_meta_' . $this->get_id();
+		}
+
+		if ( ! $force_read ) {
+			if ( ! empty( $this->cache_group ) ) {
+				$cached_meta  = wp_cache_get( $cache_key, $this->cache_group );
+				$cache_loaded = ! empty( $cached_meta );
+			}
+		}
+
+		$raw_meta_data = $cache_loaded ? $cached_meta : $this->data_store->read_meta( $this );
+		if ( $raw_meta_data ) {
+			foreach ( $raw_meta_data as $meta ) {
+				$this->meta_data[] = (object) array(
+					'id'    => (int) $meta->meta_id,
+					'key'   => $meta->meta_key,
+					'value' => maybe_unserialize( $meta->meta_value ),
+				);
+			}
+
+			if ( ! $cache_loaded && ! empty( $this->cache_group ) ) {
+				wp_cache_set( $cache_key, $raw_meta_data, $this->cache_group );
+			}
+		}
+	}
+
+	/**
+	 * Update Meta Data in the database.
+	 *
+	 * @since 2.6.0
+	 */
+	public function save_meta_data() {
+		if ( ! $this->data_store || is_null( $this->meta_data ) ) {
+			return;
+		}
+		foreach ( $this->meta_data as $array_key => $meta ) {
+			if ( is_null( $meta->value ) ) {
+				if ( ! empty( $meta->id ) ) {
+					$this->data_store->delete_meta( $this, $meta );
+					unset( $this->meta_data[ $array_key ] );
+				}
+			} elseif ( empty( $meta->id ) ) {
+				$new_meta_id                       = $this->data_store->add_meta( $this, $meta );
+				$this->meta_data[ $array_key ]->id = $new_meta_id;
+			} else {
+				$this->data_store->update_meta( $this, $meta );
+			}
+		}
+
+		if ( ! empty( $this->cache_group ) ) {
+			WC_Cache_Helper::incr_cache_prefix( $this->cache_group );
+		}
+	}
+
+	/**
+	 * Set ID.
+	 *
+	 * @since 3.0.0
+	 * @param int $id
+	 */
+	public function set_id( $id ) {
+		$this->id = absint( $id );
+	}
+
+	/**
+	 * Set all props to default values.
+	 *
+	 * @since 3.0.0
+	 */
+	public function set_defaults() {
+		$this->data        = $this->default_data;
+		$this->changes     = array();
+		$this->set_object_read( false );
+ 	}
+
+	/**
+	 * Set object read property.
+	 *
+	 * @since 3.0.0
+	 * @param boolean $read
+	 */
+	public function set_object_read( $read = true ) {
+		$this->object_read = (bool) $read;
+	}
+
+	/**
+	 * Get object read property.
+	 *
+	 * @since  3.0.0
+	 * @return boolean
+	 */
+	public function get_object_read() {
+		return (bool) $this->object_read;
+	}
+
+	/**
+	 * Set a collection of props in one go, collect any errors, and return the result.
+	 * Only sets using public methods.
+	 *
+	 * @since  3.0.0
+	 * @param  array $props Key value pairs to set. Key is the prop and should map to a setter function name.
+	 * @return WP_Error|bool
+	 */
+	public function set_props( $props, $context = 'set' ) {
+		$errors = new WP_Error();
+
+		foreach ( $props as $prop => $value ) {
+			try {
+				if ( 'meta_data' === $prop ) {
+					continue;
+				}
+				$setter = "set_$prop";
+				if ( ! is_null( $value ) && is_callable( array( $this, $setter ) ) ) {
+					$reflection = new ReflectionMethod( $this, $setter );
+
+					if ( $reflection->isPublic() ) {
+						$this->{$setter}( $value );
+					}
+				}
+			} catch ( WC_Data_Exception $e ) {
+				$errors->add( $e->getErrorCode(), $e->getMessage() );
+			}
+		}
+
+		return sizeof( $errors->get_error_codes() ) ? $errors : true;
+	}
+
+	/**
+	 * Sets a prop for a setter method.
+	 *
+	 * This stores changes in a special array so we can track what needs saving
+	 * the the DB later.
+	 *
+	 * @since 3.0.0
+	 * @param string $prop Name of prop to set.
+	 * @param mixed  $value Value of the prop.
+	 */
+	protected function set_prop( $prop, $value ) {
+		if ( array_key_exists( $prop, $this->data ) ) {
+			if ( true === $this->object_read ) {
+				if ( $value !== $this->data[ $prop ] || array_key_exists( $prop, $this->changes ) ) {
+					$this->changes[ $prop ] = $value;
+				}
+			} else {
+				$this->data[ $prop ] = $value;
+			}
+		}
+	}
+
+	/**
+	 * Return data changes only.
+	 *
+	 * @since 3.0.0
+	 * @return array
+	 */
+	public function get_changes() {
+		return $this->changes;
+	}
+
+	/**
+	 * Merge changes with data and clear.
+	 *
+	 * @since 3.0.0
+	 */
+	public function apply_changes() {
+		$this->data    = array_replace_recursive( $this->data, $this->changes );
+		$this->changes = array();
+	}
+
+	/**
+	 * Prefix for action and filter hooks on data.
+	 *
+	 * @since  3.0.0
+	 * @return string
+	 */
+	protected function get_hook_prefix() {
+		return 'woocommerce_' . $this->object_type . '_get_';
+	}
+
+	/**
+	 * Gets a prop for a getter method.
+	 *
+	 * Gets the value from either current pending changes, or the data itself.
+	 * Context controls what happens to the value before it's returned.
+	 *
+	 * @since  3.0.0
+	 * @param  string $prop Name of prop to get.
+	 * @param  string $context What the value is for. Valid values are view and edit.
+	 * @return mixed
+	 */
+	protected function get_prop( $prop, $context = 'view' ) {
+		$value = null;
+
+		if ( array_key_exists( $prop, $this->data ) ) {
+			$value = array_key_exists( $prop, $this->changes ) ? $this->changes[ $prop ] : $this->data[ $prop ];
+
+			if ( 'view' === $context ) {
+				$value = apply_filters( $this->get_hook_prefix() . $prop, $value, $this );
+			}
+		}
+
+		return $value;
+	}
+
+	/**
+	 * Sets a date prop whilst handling formatting and datatime objects.
+	 *
+	 * @since 3.0.0
+	 * @param string $prop Name of prop to set.
+	 * @param string|integer $value Value of the prop.
+	 */
+	protected function set_date_prop( $prop, $value ) {
+		try {
+			if ( empty( $value ) ) {
+				$this->set_prop( $prop, null );
+				return;
+			}
+
+			if ( is_a( $value, 'WC_DateTime' ) ) {
+				$datetime = $value;
+			} elseif ( is_numeric( $value ) ) {
+				// Timestamps are handled as UTC timestamps in all cases.
+				$datetime = new WC_DateTime( "@{$value}", new DateTimeZone( 'UTC' ) );
+			} else {
+				// Strings are defined in local WP timezone. Convert to UTC.
+				if ( 1 === preg_match( '/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(Z|((-|\+)\d{2}:\d{2}))$/', $value, $date_bits ) ) {
+					$offset    = ! empty( $date_bits[7] ) ? iso8601_timezone_to_offset( $date_bits[7] ) : wc_timezone_offset();
+					$timestamp = gmmktime( $date_bits[4], $date_bits[5], $date_bits[6], $date_bits[2], $date_bits[3], $date_bits[1] ) - $offset;
+				} else {
+					$timestamp = wc_string_to_timestamp( get_gmt_from_date( gmdate( 'Y-m-d H:i:s', wc_string_to_timestamp( $value ) ) ) );
+				}
+				$datetime  = new WC_DateTime( "@{$timestamp}", new DateTimeZone( 'UTC' ) );
+			}
+
+			// Set local timezone or offset.
+			if ( get_option( 'timezone_string' ) ) {
+				$datetime->setTimezone( new DateTimeZone( wc_timezone_string() ) );
+			} else {
+				$datetime->set_utc_offset( wc_timezone_offset() );
+			}
+
+			$this->set_prop( $prop, $datetime );
+		} catch ( Exception $e ) {}
+	}
+
+	/**
+	 * When invalid data is found, throw an exception unless reading from the DB.
+	 *
+	 * @throws WC_Data_Exception
+	 * @since 3.0.0
+	 * @param string $code             Error code.
+	 * @param string $message          Error message.
+	 * @param int    $http_status_code HTTP status code.
+	 * @param array  $data             Extra error data.
+	 */
+	protected function error( $code, $message, $http_status_code = 400, $data = array() ) {
+		throw new WC_Data_Exception( $code, $message, $http_status_code, $data );
+	}
+}
diff --git a/includes/abstracts/abstract-wc-deprecated-hooks.php b/includes/abstracts/abstract-wc-deprecated-hooks.php
new file mode 100644
index 00000000000..a0f6df39177
--- /dev/null
+++ b/includes/abstracts/abstract-wc-deprecated-hooks.php
@@ -0,0 +1,92 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC_Deprecated_Hooks class maps old actions and filters to new ones. This is the base class for handling those deprecated hooks.
+ *
+ * Based on the WCS_Hook_Deprecator class by Prospress.
+ *
+ * @since 3.0.0
+ */
+abstract class WC_Deprecated_Hooks {
+
+	/**
+	 * Array of deprecated hooks we need to handle.
+	 *
+	 * @var array
+	 */
+	protected $deprecated_hooks = array();
+
+	/**
+	 * Constructor.
+	 */
+	public function __construct() {
+		$new_hooks = array_keys( $this->deprecated_hooks );
+		array_walk( $new_hooks, array( $this, 'hook_in' ) );
+	}
+
+	/**
+	 * Hook into the new hook so we can handle deprecated hooks once fired.
+	 *
+	 * @param  string $hook_name
+	 */
+	abstract function hook_in( $hook_name );
+
+	/**
+	 * Get old hooks to map to new hook.
+	 *
+	 * @param  string $new_hook
+	 * @return array
+	 */
+	public function get_old_hooks( $new_hook ) {
+		$old_hooks = isset( $this->deprecated_hooks[ $new_hook ] ) ? $this->deprecated_hooks[ $new_hook ] : array();
+		$old_hooks = is_array( $old_hooks ) ? $old_hooks : array( $old_hooks );
+
+		return $old_hooks;
+	}
+
+	/**
+	 * If the hook is Deprecated, call the old hooks here.
+	 */
+	public function maybe_handle_deprecated_hook() {
+		$new_hook          = current_filter();
+		$old_hooks         = $this->get_old_hooks( $new_hook );
+		$new_callback_args = func_get_args();
+		$return_value      = $new_callback_args[0];
+
+		foreach ( $old_hooks as $old_hook ) {
+			$return_value = $this->handle_deprecated_hook( $new_hook, $old_hook, $new_callback_args, $return_value );
+		}
+
+		return $return_value;
+	}
+
+	/**
+	 * If the old hook is in-use, trigger it.
+	 *
+	 * @param string $new_hook
+	 * @param string $old_hook
+	 * @param array $new_callback_args
+	 * @param mixed $return_value
+	 * @return mixed
+	 */
+	abstract function handle_deprecated_hook( $new_hook, $old_hook, $new_callback_args, $return_value );
+
+	/**
+	 * Display a deprecated notice for old hooks.
+	 */
+	protected function display_notice( $old_hook, $new_hook ) {
+		wc_deprecated_function( sprintf( 'The "%s" hook uses out of date data structures and', esc_html( $old_hook ) ), WC_VERSION, esc_html( $new_hook ) );
+	}
+
+	/**
+	 * Fire off a legacy hook with it's args.
+	 *
+	 * @param  string $old_hook
+	 * @param  array $new_callback_args
+	 * @return mixed
+	 */
+	abstract protected function trigger_hook( $old_hook, $new_callback_args );
+}
diff --git a/includes/abstracts/abstract-wc-integration.php b/includes/abstracts/abstract-wc-integration.php
index bb6490e9b7d..01f3372a465 100644
--- a/includes/abstracts/abstract-wc-integration.php
+++ b/includes/abstracts/abstract-wc-integration.php
@@ -11,7 +11,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  *
  * @class    WC_Integration
  * @extends  WC_Settings_API
- * @version  2.0.0
+ * @version  2.6.0
  * @package  WooCommerce/Abstracts
  * @category Abstract Class
  * @author   WooThemes
@@ -19,24 +19,54 @@ if ( ! defined( 'ABSPATH' ) ) {
 abstract class WC_Integration extends WC_Settings_API {
 
 	/**
-	 * Admin Options.
-	 *
-	 * Setup the gateway settings screen.
-	 * Override this in your gateway.
+	 * yes or no based on whether the integration is enabled.
+	 * @var string
 	 */
-	public function admin_options() { ?>
+	public $enabled = 'yes';
 
-		<h3><?php echo isset( $this->method_title ) ? $this->method_title : __( 'Settings', 'woocommerce' ) ; ?></h3>
+	/**
+	 * Integration title.
+	 * @var string
+	 */
+	public $method_title = '';
 
-		<?php echo isset( $this->method_description ) ? wpautop( $this->method_description ) : ''; ?>
+	/**
+	 * Integration description.
+	 * @var string
+	 */
+	public $method_description = '';
 
-		<table class="form-table">
-			<?php $this->generate_settings_html(); ?>
-		</table>
+	/**
+	 * Return the title for admin screens.
+	 * @return string
+	 */
+	public function get_method_title() {
+		return apply_filters( 'woocommerce_integration_title', $this->method_title, $this );
+	}
 
-		<!-- Section -->
-		<div><input type="hidden" name="section" value="<?php echo $this->id; ?>" /></div>
+	/**
+	 * Return the description for admin screens.
+	 * @return string
+	 */
+	public function get_method_description() {
+		return apply_filters( 'woocommerce_integration_description', $this->method_description, $this );
+	}
 
-		<?php
+	/**
+	 * Output the gateway settings screen.
+	 */
+	public function admin_options() {
+		echo '<h2>' . esc_html( $this->get_method_title() ) . '</h2>';
+		echo wp_kses_post( wpautop( $this->get_method_description() ) );
+		echo '<div><input type="hidden" name="section" value="' . esc_attr( $this->id ) . '" /></div>';
+		parent::admin_options();
+	}
+
+	/**
+	 * Init settings for gateways.
+	 */
+	public function init_settings() {
+		parent::init_settings();
+		$this->enabled  = ! empty( $this->settings['enabled'] ) && 'yes' === $this->settings['enabled'] ? 'yes' : 'no';
 	}
 }
diff --git a/includes/abstracts/abstract-wc-log-handler.php b/includes/abstracts/abstract-wc-log-handler.php
new file mode 100644
index 00000000000..a8f5898ffd7
--- /dev/null
+++ b/includes/abstracts/abstract-wc-log-handler.php
@@ -0,0 +1,48 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+
+/**
+ * Abstract WC Log Handler Class
+ *
+ * @version        1.0.0
+ * @package        WooCommerce/Abstracts
+ * @category       Abstract Class
+ * @author         WooThemes
+ */
+abstract class WC_Log_Handler implements WC_Log_Handler_Interface {
+
+	/**
+	 * Formats a timestamp for use in log messages.
+	 *
+	 * @param int $timestamp Log timestamp.
+	 * @return string Formatted time for use in log entry.
+	 */
+	protected static function format_time( $timestamp ) {
+		return date( 'c', $timestamp );
+	}
+
+	/**
+	 * Builds a log entry text from level, timestamp and message.
+	 *
+	 * @param int $timestamp Log timestamp.
+	 * @param string $level emergency|alert|critical|error|warning|notice|info|debug
+	 * @param string $message Log message.
+	 * @param array $context Additional information for log handlers.
+	 *
+	 * @return string Formatted log entry.
+	 */
+	protected static function format_entry( $timestamp, $level, $message, $context ) {
+		$time_string = self::format_time( $timestamp );
+		$level_string = strtoupper( $level );
+		$entry = "{$time_string} {$level_string} {$message}";
+
+		return apply_filters( 'woocommerce_format_log_entry', $entry, array(
+			'timestamp' => $timestamp,
+			'level' => $level,
+			'message' => $message,
+			'context' => $context,
+		) );
+	}
+}
diff --git a/includes/abstracts/abstract-wc-order.php b/includes/abstracts/abstract-wc-order.php
index 76f5d492361..1ea430096cf 100644
--- a/includes/abstracts/abstract-wc-order.php
+++ b/includes/abstracts/abstract-wc-order.php
@@ -1,94 +1,86 @@
 <?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+include_once( WC_ABSPATH . 'includes/legacy/abstract-wc-legacy-order.php' );
+
 /**
  * Abstract Order
  *
- * The WooCommerce order class handles order data.
+ * Handles generic order data and database interaction which is extended by both
+ * WC_Order (regular orders) and WC_Order_Refund (refunds are negative orders).
  *
- * @class       WC_Order
- * @version     2.2.0
+ * @class       WC_Abstract_Order
+ * @version     3.0.0
  * @package     WooCommerce/Classes
  * @category    Class
  * @author      WooThemes
- *
- * @property    string $billing_first_name The billing address first name.
- * @property    string $billing_last_name The billing address last name.
- * @property    string $billing_company The billing address company.
- * @property    string $billing_address_1 The first line of the billing address.
- * @property    string $billing_address_2 The second line of the billing address.
- * @property    string $billing_city The city of the billing address.
- * @property    string $billing_state The state of the billing address.
- * @property    string $billing_postcode The postcode of the billing address.
- * @property    string $billing_country The country of the billing address.
- * @property    string $billing_phone The billing phone number.
- * @property    string $billing_email The billing email.
- * @property    string $shipping_first_name The shipping address first name.
- * @property    string $shipping_last_name The shipping address last name.
- * @property    string $shipping_company The shipping address company.
- * @property    string $shipping_address_1 The first line of the shipping address.
- * @property    string $shipping_address_2 The second line of the shipping address.
- * @property    string $shipping_city The city of the shipping address.
- * @property    string $shipping_state The state of the shipping address.
- * @property    string $shipping_postcode The postcode of the shipping address.
- * @property    string $shipping_country The country of the shipping address.
- * @property    string $cart_discount Total amount of discount.
- * @property    string $cart_discount_tax Total amount of discount applied to taxes.
- * @property    string $shipping_method_title < 2.1 was used for shipping method title. Now @deprecated.
- * @property    int $customer_user User ID who the order belongs to. 0 for guests.
- * @property    string $order_key Random key/password unqique to each order.
- * @property    string $order_discount Stored after tax discounts pre-2.3. Now @deprecated.
- * @property    string $order_tax Stores order tax total.
- * @property    string $order_shipping_tax Stores shipping tax total.
- * @property    string $order_shipping Stores shipping total.
- * @property    string $order_total Stores order total.
- * @property    string $order_currency Stores currency code used for the order.
- * @property    string $payment_method method ID.
- * @property    string $payment_method_title Name of the payment method used.
- * @property    string $customer_ip_address Customer IP Address.
- * @property    string $customer_user_agent Customer User agent.
  */
-abstract class WC_Abstract_Order {
+abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
 
-	/** @public int Order (post) ID. */
-	public $id                          = 0;
+	/**
+	 * Order Data array. This is the core order data exposed in APIs since 3.0.0.
+	 *
+	 * Notes: cart_tax = cart_tax is the new name for the legacy 'order_tax'
+	 * which is the tax for items only, not shipping.
+	 *
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $data = array(
+		'parent_id'          => 0,
+		'status'             => '',
+		'currency'           => '',
+		'version'            => '',
+		'prices_include_tax' => false,
+		'date_created'       => null,
+		'date_modified'      => null,
+		'discount_total'     => 0,
+		'discount_tax'       => 0,
+		'shipping_total'     => 0,
+		'shipping_tax'       => 0,
+		'cart_tax'           => 0,
+		'total'              => 0,
+		'total_tax'          => 0,
+	);
 
-	/** @var $post WP_Post. */
-	public $post                        = null;
+	/**
+	 * Order items will be stored here, sometimes before they persist in the DB.
+	 *
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $items = array();
 
-	/** @public string Order type. */
-	public $order_type                  = false;
+	/**
+	 * Order items that need deleting are stored here.
+	 *
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $items_to_delete = array();
 
-	/** @public string Order Date. */
-	public $order_date                  = '';
+	/**
+	 * Stores meta in cache for future reads.
+	 *
+	 * A group must be set to to enable caching.
+	 * @var string
+	 */
+	protected $cache_group = 'orders';
 
-	/** @public string Order Modified Date. */
-	public $modified_date               = '';
+	/**
+	 * Which data store to load.
+	 *
+	 * @var string
+	 */
+	protected $data_store_name = 'order';
 
-	/** @public string Customer Message (excerpt). */
-	public $customer_message            = '';
-
-	/** @public string Customer Note */
-	public $customer_note               = '';
-
-	/** @public string Order Status. */
-	public $post_status                 = '';
-
-	/** @public bool Do prices include tax? */
-	public $prices_include_tax          = false;
-
-	/** @public string Display mode for taxes in cart. */
-	public $tax_display_cart            = '';
-
-	/** @public bool Do totals display ex tax? */
-	public $display_totals_ex_tax       = false;
-
-	/** @public bool Do cart prices display ex tax? */
-	public $display_cart_ex_tax         = false;
-
-	/** @protected string Formatted address. Accessed via get_formatted_billing_address(). */
-	protected $formatted_billing_address  = '';
-
-	/** @protected string Formatted address. Accessed via get_formatted_shipping_address(). */
-	protected $formatted_shipping_address = '';
+	/**
+	 * This is the name of this object type.
+	 * @var string
+	 */
+	protected $object_type = 'order';
 
 	/**
 	 * Get the order if ID is passed, otherwise the order is new and empty.
@@ -96,1129 +88,625 @@ abstract class WC_Abstract_Order {
 	 * should be used. It is possible, but the aforementioned are preferred and are the only.
 	 * methods that will be maintained going forward.
 	 *
-	 * @param int $order
+	 * @param  int|object|WC_Order $order Order to read.
 	 */
 	public function __construct( $order = 0 ) {
-		$this->prices_include_tax    = get_option('woocommerce_prices_include_tax') == 'yes' ? true : false;
-		$this->tax_display_cart      = get_option( 'woocommerce_tax_display_cart' );
-		$this->display_totals_ex_tax = $this->tax_display_cart == 'excl' ? true : false;
-		$this->display_cart_ex_tax   = $this->tax_display_cart == 'excl' ? true : false;
-		$this->init( $order );
+		parent::__construct( $order );
+
+		if ( is_numeric( $order ) && $order > 0 ) {
+			$this->set_id( $order );
+		} elseif ( $order instanceof self ) {
+			$this->set_id( $order->get_id() );
+		} elseif ( ! empty( $order->ID ) ) {
+			$this->set_id( $order->ID );
+		} else {
+			$this->set_object_read( true );
+		}
+
+		$this->data_store = WC_Data_Store::load( $this->data_store_name );
+
+		if ( $this->get_id() > 0 ) {
+			$this->data_store->read( $this );
+		}
 	}
 
 	/**
-	 * Init/load the order object. Called from the constructor.
+	 * Get internal type.
 	 *
-	 * @param  int|object|WC_Order $order Order to init.
+	 * @return string
 	 */
-	protected function init( $order ) {
-		if ( is_numeric( $order ) ) {
-			$this->id   = absint( $order );
-			$this->post = get_post( $order );
-			$this->get_order( $this->id );
-		} elseif ( $order instanceof WC_Order ) {
-			$this->id   = absint( $order->id );
-			$this->post = $order->post;
-			$this->get_order( $this->id );
-		} elseif ( isset( $order->ID ) ) {
-			$this->id   = absint( $order->ID );
-			$this->post = $order;
-			$this->get_order( $this->id );
+	public function get_type() {
+		return 'shop_order';
+	}
+
+	/**
+	 * Get all class data in array format.
+	 *
+	 * @since 3.0.0
+	 * @return array
+	 */
+	public function get_data() {
+		return array_merge(
+			array(
+				'id' => $this->get_id(),
+			),
+			$this->data,
+			array(
+				'meta_data'      => $this->get_meta_data(),
+				'line_items'     => $this->get_items( 'line_item' ),
+				'tax_lines'      => $this->get_items( 'tax' ),
+				'shipping_lines' => $this->get_items( 'shipping' ),
+				'fee_lines'      => $this->get_items( 'fee' ),
+				'coupon_lines'   => $this->get_items( 'coupon' ),
+			)
+		);
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| CRUD methods
+	|--------------------------------------------------------------------------
+	|
+	| Methods which create, read, update and delete orders from the database.
+	| Written in abstract fashion so that the way orders are stored can be
+	| changed more easily in the future.
+	|
+	| A save method is included for convenience (chooses update or create based
+	| on if the order exists yet).
+	|
+	*/
+
+	/**
+	 * Save data to the database.
+	 *
+	 * @since 3.0.0
+	 * @return int order ID
+	 */
+	public function save() {
+		if ( $this->data_store ) {
+			// Trigger action before saving to the DB. Allows you to adjust object props before save.
+			do_action( 'woocommerce_before_' . $this->object_type . '_object_save', $this, $this->data_store );
+
+			if ( $this->get_id() ) {
+				$this->data_store->update( $this );
+			} else {
+				$this->data_store->create( $this );
+			}
+		}
+		$this->save_items();
+		return $this->get_id();
+	}
+
+	/**
+	 * Save all order items which are part of this order.
+	 */
+	protected function save_items() {
+		foreach ( $this->items_to_delete as $item ) {
+			$item->delete();
+		}
+		$this->items_to_delete = array();
+
+		// Add/save items.
+		foreach ( $this->items as $item_group => $items ) {
+			if ( is_array( $items ) ) {
+				foreach ( array_filter( $items ) as $item_key => $item ) {
+					$item->set_order_id( $this->get_id() );
+					$item_id = $item->save();
+
+					// If ID changed (new item saved to DB)...
+					if ( $item_id !== $item_key ) {
+						$this->items[ $item_group ][ $item_id ] = $item;
+
+						unset( $this->items[ $item_group ][ $item_key ] );
+					}
+				}
+			}
 		}
 	}
 
+	/*
+	|--------------------------------------------------------------------------
+	| Getters
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Get parent order ID.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return integer
+	 */
+	public function get_parent_id( $context = 'view' ) {
+		return $this->get_prop( 'parent_id', $context );
+	}
+
+	/**
+	 * Gets order currency.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_currency( $context = 'view' ) {
+		return $this->get_prop( 'currency', $context );
+	}
+
+	/**
+	 * Get order_version.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_version( $context = 'view' ) {
+		return $this->get_prop( 'version', $context );
+	}
+
+	/**
+	 * Get prices_include_tax.
+	 *
+	 * @param  string $context
+	 * @return bool
+	 */
+	public function get_prices_include_tax( $context = 'view' ) {
+		return $this->get_prop( 'prices_include_tax', $context );
+	}
+
+	/**
+	 * Get date_created.
+	 *
+	 * @param  string $context
+	 * @return WC_DateTime|NULL object if the date is set or null if there is no date.
+	 */
+	public function get_date_created( $context = 'view' ) {
+		return $this->get_prop( 'date_created', $context );
+	}
+
+	/**
+	 * Get date_modified.
+	 *
+	 * @param  string $context
+	 * @return WC_DateTime|NULL object if the date is set or null if there is no date.
+	 */
+	public function get_date_modified( $context = 'view' ) {
+		return $this->get_prop( 'date_modified', $context );
+	}
+
+	/**
+	 * Return the order statuses without wc- internal prefix.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_status( $context = 'view' ) {
+		$status = $this->get_prop( 'status', $context );
+
+		if ( empty( $status ) && 'view' === $context ) {
+			// In view context, return the default status if no status has been set.
+			$status = apply_filters( 'woocommerce_default_order_status', 'pending' );
+		}
+		return $status;
+	}
+
+	/**
+	 * Get discount_total.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_discount_total( $context = 'view' ) {
+		return $this->get_prop( 'discount_total', $context );
+	}
+
+	/**
+	 * Get discount_tax.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_discount_tax( $context = 'view' ) {
+		return $this->get_prop( 'discount_tax', $context );
+	}
+
+	/**
+	 * Get shipping_total.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_shipping_total( $context = 'view' ) {
+		return $this->get_prop( 'shipping_total', $context );
+	}
+
+	/**
+	 * Get shipping_tax.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_shipping_tax( $context = 'view' ) {
+		return $this->get_prop( 'shipping_tax', $context );
+	}
+
+	/**
+	 * Gets cart tax amount.
+	 *
+	 * @param  string $context
+	 * @return float
+	 */
+	public function get_cart_tax( $context = 'view' ) {
+		return $this->get_prop( 'cart_tax', $context );
+	}
+
+	/**
+	 * Gets order grand total. incl. taxes. Used in gateways.
+	 *
+	 * @param  string $context
+	 * @return float
+	 */
+	public function get_total( $context = 'view' ) {
+		return $this->get_prop( 'total', $context );
+	}
+
+	/**
+	 * Get total tax amount. Alias for get_order_tax().
+	 *
+	 * @param  string $context
+	 * @return float
+	 */
+	public function get_total_tax( $context = 'view' ) {
+		return $this->get_prop( 'total_tax', $context );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Non-CRUD Getters
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Gets the total discount amount.
+	 *
+	 * @param  bool $ex_tax Show discount excl any tax.
+	 * @return float
+	 */
+	public function get_total_discount( $ex_tax = true ) {
+		if ( $ex_tax ) {
+			$total_discount = $this->get_discount_total();
+		} else {
+			$total_discount = $this->get_discount_total() + $this->get_discount_tax();
+		}
+		return apply_filters( 'woocommerce_order_get_total_discount', round( $total_discount, WC_ROUNDING_PRECISION ), $this );
+	}
+
+	/**
+	 * Gets order subtotal.
+	 * @return float
+	 */
+	public function get_subtotal() {
+		$subtotal = 0;
+
+		foreach ( $this->get_items() as $item ) {
+			$subtotal += $item->get_subtotal();
+		}
+
+		return apply_filters( 'woocommerce_order_get_subtotal', (double) $subtotal, $this );
+	}
+
+	/**
+	 * Get taxes, merged by code, formatted ready for output.
+	 *
+	 * @return array
+	 */
+	public function get_tax_totals() {
+		$tax_totals = array();
+
+		foreach ( $this->get_items( 'tax' ) as $key => $tax ) {
+			$code = $tax->get_rate_code();
+
+			if ( ! isset( $tax_totals[ $code ] ) ) {
+				$tax_totals[ $code ] = new stdClass();
+				$tax_totals[ $code ]->amount = 0;
+			}
+
+			$tax_totals[ $code ]->id                = $key;
+			$tax_totals[ $code ]->rate_id           = $tax->get_rate_id();
+			$tax_totals[ $code ]->is_compound       = $tax->is_compound();
+			$tax_totals[ $code ]->label             = $tax->get_label();
+			$tax_totals[ $code ]->amount           += (float) $tax->get_tax_total() + (float) $tax->get_shipping_tax_total();
+			$tax_totals[ $code ]->formatted_amount  = wc_price( wc_round_tax_total( $tax_totals[ $code ]->amount ), array( 'currency' => $this->get_currency() ) );
+		}
+
+		if ( apply_filters( 'woocommerce_order_hide_zero_taxes', true ) ) {
+			$amounts    = array_filter( wp_list_pluck( $tax_totals, 'amount' ) );
+			$tax_totals = array_intersect_key( $tax_totals, $amounts );
+		}
+
+		return apply_filters( 'woocommerce_order_get_tax_totals', $tax_totals, $this );
+	}
+
+	/**
+	 * Get all valid statuses for this order
+	 *
+	 * @since 3.0.0
+	 * @return array Internal status keys e.g. 'wc-processing'
+	 */
+	protected function get_valid_statuses() {
+		return array_keys( wc_get_order_statuses() );
+	}
+
+	/**
+	 * Get user ID. Used by orders, not other order types like refunds.
+	 *
+	 * @param  string $context
+	 * @return int
+	 */
+	public function get_user_id( $context = 'view' ) {
+		return 0;
+	}
+
+	/**
+	 * Get user. Used by orders, not other order types like refunds.
+	 *
+	 * @return WP_User|false
+	 */
+	public function get_user() {
+		return false;
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Setters
+	|--------------------------------------------------------------------------
+	|
+	| Functions for setting order data. These should not update anything in the
+	| database itself and should only change what is stored in the class
+	| object. However, for backwards compatibility pre 3.0.0 some of these
+	| setters may handle both.
+	*/
+
+	/**
+	 * Set parent order ID.
+	 *
+	 * @since 3.0.0
+	 * @param int $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_parent_id( $value ) {
+		if ( $value && ( $value === $this->get_id() || ! wc_get_order( $value ) ) ) {
+			$this->error( 'order_invalid_parent_id', __( 'Invalid parent ID', 'woocommerce' ) );
+		}
+		$this->set_prop( 'parent_id', absint( $value ) );
+	}
+
+	/**
+	 * Set order status.
+	 *
+	 * @since 3.0.0
+	 * @param string $new_status Status to change the order to. No internal wc- prefix is required.
+	 * @return array details of change
+	 */
+	public function set_status( $new_status ) {
+		$old_status = $this->get_status();
+		$new_status = 'wc-' === substr( $new_status, 0, 3 ) ? substr( $new_status, 3 ) : $new_status;
+
+		// If setting the status, ensure it's set to a valid status.
+		if ( true === $this->object_read ) {
+			// Only allow valid new status
+			if ( ! in_array( 'wc-' . $new_status, $this->get_valid_statuses() ) && 'trash' !== $new_status ) {
+				$new_status = 'pending';
+			}
+
+			// If the old status is set but unknown (e.g. draft) assume its pending for action usage.
+			if ( $old_status && ! in_array( 'wc-' . $old_status, $this->get_valid_statuses() ) && 'trash' !== $old_status ) {
+				$old_status = 'pending';
+			}
+		}
+
+		$this->set_prop( 'status', $new_status );
+
+		return array(
+			'from' => $old_status,
+			'to'   => $new_status,
+		);
+	}
+
+	/**
+	 * Set order_version.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_version( $value ) {
+		$this->set_prop( 'version', $value );
+	}
+
+	/**
+	 * Set order_currency.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_currency( $value ) {
+		if ( $value && ! in_array( $value, array_keys( get_woocommerce_currencies() ) ) ) {
+			$this->error( 'order_invalid_currency', __( 'Invalid currency code', 'woocommerce' ) );
+		}
+		$this->set_prop( 'currency', $value ? $value : get_woocommerce_currency() );
+	}
+
+	/**
+	 * Set prices_include_tax.
+	 *
+	 * @param bool $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_prices_include_tax( $value ) {
+		$this->set_prop( 'prices_include_tax', (bool) $value );
+	}
+
+	/**
+	 * Set date_created.
+	 *
+	 * @param  string|integer|null $date UTC timestamp, or ISO 8601 DateTime. If the DateTime string has no timezone or offset, WordPress site timezone will be assumed. Null if their is no date.
+	 * @throws WC_Data_Exception
+	 */
+	public function set_date_created( $date = null ) {
+		$this->set_date_prop( 'date_created', $date );
+	}
+
+	/**
+	 * Set date_modified.
+	 *
+	 * @param  string|integer|null $date UTC timestamp, or ISO 8601 DateTime. If the DateTime string has no timezone or offset, WordPress site timezone will be assumed. Null if their is no date.
+	 * @throws WC_Data_Exception
+	 */
+	public function set_date_modified( $date = null ) {
+		$this->set_date_prop( 'date_modified', $date );
+	}
+
+	/**
+	 * Set discount_total.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_discount_total( $value ) {
+		$this->set_prop( 'discount_total', wc_format_decimal( $value ) );
+	}
+
+	/**
+	 * Set discount_tax.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_discount_tax( $value ) {
+		$this->set_prop( 'discount_tax', wc_format_decimal( $value ) );
+	}
+
+	/**
+	 * Set shipping_total.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_shipping_total( $value ) {
+		$this->set_prop( 'shipping_total', wc_format_decimal( $value ) );
+	}
+
+	/**
+	 * Set shipping_tax.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_shipping_tax( $value ) {
+		$this->set_prop( 'shipping_tax', wc_format_decimal( $value ) );
+		$this->set_total_tax( (float) $this->get_cart_tax() + (float) $this->get_shipping_tax() );
+	}
+
+	/**
+	 * Set cart tax.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_cart_tax( $value ) {
+		$this->set_prop( 'cart_tax', wc_format_decimal( $value ) );
+		$this->set_total_tax( (float) $this->get_cart_tax() + (float) $this->get_shipping_tax() );
+	}
+
+	/**
+	 * Sets order tax (sum of cart and shipping tax). Used internaly only.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	protected function set_total_tax( $value ) {
+		$this->set_prop( 'total_tax', wc_format_decimal( $value ) );
+	}
+
+	/**
+	 * Set total.
+	 *
+	 * @param string $value
+	 * @param string $deprecated Function used to set different totals based on this.
+	 * @throws WC_Data_Exception
+	 */
+	public function set_total( $value, $deprecated = '' ) {
+		if ( $deprecated ) {
+			wc_deprecated_argument( 'total_type', '3.0', 'Use dedicated total setter methods instead.' );
+			return $this->legacy_set_total( $value, $deprecated );
+		}
+		$this->set_prop( 'total', wc_format_decimal( $value, wc_get_price_decimals() ) );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Order Item Handling
+	|--------------------------------------------------------------------------
+	|
+	| Order items are used for products, taxes, shipping, and fees within
+	| each order.
+	*/
+
 	/**
 	 * Remove all line items (products, coupons, shipping, taxes) from the order.
 	 *
 	 * @param string $type Order item type. Default null.
 	 */
 	public function remove_order_items( $type = null ) {
-		global $wpdb;
-
 		if ( ! empty( $type ) ) {
-			$wpdb->query( $wpdb->prepare( "DELETE FROM itemmeta USING {$wpdb->prefix}woocommerce_order_itemmeta itemmeta INNER JOIN {$wpdb->prefix}woocommerce_order_items items WHERE itemmeta.order_item_id = items.order_item_id AND items.order_id = %d AND items.order_item_type = %s", $this->id, $type ) );
-			$wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->prefix}woocommerce_order_items WHERE order_id = %d AND order_item_type = %s", $this->id, $type ) );
+			$this->data_store->delete_items( $this, $type );
+
+			if ( $group = $this->type_to_group( $type ) ) {
+				unset( $this->items[ $group ] );
+			}
 		} else {
-			$wpdb->query( $wpdb->prepare( "DELETE FROM itemmeta USING {$wpdb->prefix}woocommerce_order_itemmeta itemmeta INNER JOIN {$wpdb->prefix}woocommerce_order_items items WHERE itemmeta.order_item_id = items.order_item_id and items.order_id = %d", $this->id ) );
-			$wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->prefix}woocommerce_order_items WHERE order_id = %d", $this->id ) );
+			$this->data_store->delete_items( $this );
+			$this->items = array();
 		}
 	}
 
 	/**
-	 * Set the payment method for the order.
+	 * Convert a type to a types group.
 	 *
-	 * @param WC_Payment_Gateway
-	 * @param WC_Payment_Gateway $payment_method
+	 * @param string $type
+	 * @return string group
 	 */
-	public function set_payment_method( $payment_method ) {
-
-		if ( is_object( $payment_method ) ) {
-			update_post_meta( $this->id, '_payment_method', $payment_method->id );
-			update_post_meta( $this->id, '_payment_method_title', $payment_method->get_title() );
-		}
-	}
-
-	/**
-	 * Set the customer address.
-	 *
-	 * @param array $address Address data.
-	 * @param string $type billing or shipping.
-	 */
-	public function set_address( $address, $type = 'billing' ) {
-
-		foreach ( $address as $key => $value ) {
-			update_post_meta( $this->id, "_{$type}_" . $key, $value );
-		}
-	}
-
-	/**
-	 * Returns the requested address in raw, non-formatted way.
-	 * @since  2.4.0
-	 * @param  string $type Billing or shipping. Anything else besides 'billing' will return shipping address.
-	 * @return array The stored address after filter.
-	 */
-	public function get_address( $type = 'billing' ) {
-
-		if ( 'billing' === $type ) {
-			$address = array(
-				'first_name' => $this->billing_first_name,
-				'last_name'  => $this->billing_last_name,
-				'company'    => $this->billing_company,
-				'address_1'  => $this->billing_address_1,
-				'address_2'  => $this->billing_address_2,
-				'city'       => $this->billing_city,
-				'state'      => $this->billing_state,
-				'postcode'   => $this->billing_postcode,
-				'country'    => $this->billing_country,
-				'email'      => $this->billing_email,
-				'phone'      => $this->billing_phone,
-			);
-		} else {
-			$address = array(
-				'first_name' => $this->shipping_first_name,
-				'last_name'  => $this->shipping_last_name,
-				'company'    => $this->shipping_company,
-				'address_1'  => $this->shipping_address_1,
-				'address_2'  => $this->shipping_address_2,
-				'city'       => $this->shipping_city,
-				'state'      => $this->shipping_state,
-				'postcode'   => $this->shipping_postcode,
-				'country'    => $this->shipping_country,
-			);
-		}
-
-		return apply_filters( 'woocommerce_get_order_address', $address, $type, $this );
-	}
-
-	/**
-	 * Add a product line item to the order.
-	 *
-	 * @since 2.2
-	 * @param \WC_Product $product
-	 * @param int $qty Line item quantity.
-	 * @param array $args
-	 * @return int|bool Item ID or false.
-	 */
-	public function add_product( $product, $qty = 1, $args = array() ) {
-
-		$default_args = array(
-			'variation' => array(),
-			'totals'    => array()
-		);
-
-		$args    = wp_parse_args( $args, $default_args );
-		$item_id = wc_add_order_item( $this->id, array(
-			'order_item_name' => $product->get_title(),
-			'order_item_type' => 'line_item'
+	protected function type_to_group( $type ) {
+		$type_to_group = apply_filters( 'woocommerce_order_type_to_group', array(
+			'line_item' => 'line_items',
+			'tax'       => 'tax_lines',
+			'shipping'  => 'shipping_lines',
+			'fee'       => 'fee_lines',
+			'coupon'    => 'coupon_lines',
 		) );
-
-		if ( ! $item_id ) {
-			return false;
-		}
-
-		wc_add_order_item_meta( $item_id, '_qty',          wc_stock_amount( $qty ) );
-		wc_add_order_item_meta( $item_id, '_tax_class',    $product->get_tax_class() );
-		wc_add_order_item_meta( $item_id, '_product_id',   $product->id );
-		wc_add_order_item_meta( $item_id, '_variation_id', isset( $product->variation_id ) ? $product->variation_id : 0 );
-
-		// Set line item totals, either passed in or from the product
-		wc_add_order_item_meta( $item_id, '_line_subtotal',     wc_format_decimal( isset( $args['totals']['subtotal'] ) ? $args['totals']['subtotal'] : $product->get_price_excluding_tax( $qty ) ) );
-		wc_add_order_item_meta( $item_id, '_line_total',        wc_format_decimal( isset( $args['totals']['total'] ) ? $args['totals']['total'] : $product->get_price_excluding_tax( $qty ) ) );
-		wc_add_order_item_meta( $item_id, '_line_subtotal_tax', wc_format_decimal( isset( $args['totals']['subtotal_tax'] ) ? $args['totals']['subtotal_tax'] : 0 ) );
-		wc_add_order_item_meta( $item_id, '_line_tax',          wc_format_decimal( isset( $args['totals']['tax'] ) ? $args['totals']['tax'] : 0 ) );
-
-		// Save tax data - Since 2.2
-		if ( isset( $args['totals']['tax_data'] ) ) {
-
-			$tax_data             = array();
-			$tax_data['total']    = array_map( 'wc_format_decimal', $args['totals']['tax_data']['total'] );
-			$tax_data['subtotal'] = array_map( 'wc_format_decimal', $args['totals']['tax_data']['subtotal'] );
-
-			wc_add_order_item_meta( $item_id, '_line_tax_data', $tax_data );
-		} else {
-			wc_add_order_item_meta( $item_id, '_line_tax_data', array( 'total' => array(), 'subtotal' => array() ) );
-		}
-
-		// Add variation meta
-		if ( ! empty( $args['variation'] ) ) {
-			foreach ( $args['variation'] as $key => $value ) {
-				wc_add_order_item_meta( $item_id, str_replace( 'attribute_', '', $key ), $value );
-			}
-		}
-
-		// Backorders
-		if ( $product->backorders_require_notification() && $product->is_on_backorder( $qty ) ) {
-			wc_add_order_item_meta( $item_id, apply_filters( 'woocommerce_backordered_item_meta_name', __( 'Backordered', 'woocommerce' ) ), $qty - max( 0, $product->get_total_stock() ) );
-		}
-
-		do_action( 'woocommerce_order_add_product', $this->id, $item_id, $product, $qty, $args );
-
-		return $item_id;
-	}
-
-
-	/**
-	 * Update a line item for the order.
-	 *
-	 * Note this does not update order totals.
-	 *
-	 * @since 2.2
-	 * @param int $item_id order item ID.
-	 * @param array $args data to update.
-	 * @param WC_Product $product
-	 * @return bool
-	 */
-	public function update_product( $item_id, $product, $args ) {
-
-		if ( ! $item_id || ! is_object( $product ) ) {
-			return false;
-		}
-
-		// quantity
-		if ( isset( $args['qty'] ) ) {
-			wc_update_order_item_meta( $item_id, '_qty', wc_stock_amount( $args['qty'] ) );
-		}
-
-		// tax class
-		if ( isset( $args['tax_class'] ) ) {
-			wc_update_order_item_meta( $item_id, '_tax_class', $args['tax_class'] );
-		}
-
-		// set item totals, either provided or from product
-		if ( isset( $args['qty'] ) ) {
-			wc_update_order_item_meta( $item_id, '_line_subtotal', wc_format_decimal( isset( $args['totals']['subtotal'] ) ? $args['totals']['subtotal'] : $product->get_price_excluding_tax( $args['qty'] ) ) );
-			wc_update_order_item_meta( $item_id, '_line_total', wc_format_decimal( isset( $args['totals']['total'] ) ? $args['totals']['total'] : $product->get_price_excluding_tax( $args['qty'] ) ) );
-		}
-
-		// set item tax totals
-		wc_update_order_item_meta( $item_id, '_line_subtotal_tax', wc_format_decimal( isset( $args['totals']['subtotal_tax'] ) ? $args['totals']['subtotal_tax'] : 0 ) );
-		wc_update_order_item_meta( $item_id, '_line_tax', wc_format_decimal( isset( $args['totals']['tax'] ) ? $args['totals']['tax'] : 0 ) );
-
-		// variation meta
-		if ( isset( $args['variation'] ) && is_array( $args['variation'] ) ) {
-
-			foreach ( $args['variation'] as $key => $value ) {
-				wc_update_order_item_meta( $item_id, str_replace( 'attribute_', '', $key ), $value );
-			}
-		}
-
-		// backorders
-		if ( isset( $args['qty'] ) && $product->backorders_require_notification() && $product->is_on_backorder( $args['qty'] ) ) {
-			wc_update_order_item_meta( $item_id, apply_filters( 'woocommerce_backordered_item_meta_name', __( 'Backordered', 'woocommerce' ) ), $args['qty'] - max( 0, $product->get_total_stock() ) );
-		}
-
-		do_action( 'woocommerce_order_edit_product', $this->id, $item_id, $args, $product );
-
-		return true;
-	}
-
-
-	/**
-	 * Add coupon code to the order.
-	 *
-	 * @param string $code
-	 * @param integer $discount_amount
-	 * @param integer $discount_amount_tax "Discounted" tax - used for tax inclusive prices.
-	 * @return int|bool Item ID or false.
-	 */
-	public function add_coupon( $code, $discount_amount = 0, $discount_amount_tax = 0 ) {
-		$item_id = wc_add_order_item( $this->id, array(
-			'order_item_name' => $code,
-			'order_item_type' => 'coupon'
-		) );
-
-		if ( ! $item_id ) {
-			return false;
-		}
-
-		wc_add_order_item_meta( $item_id, 'discount_amount', $discount_amount );
-		wc_add_order_item_meta( $item_id, 'discount_amount_tax', $discount_amount_tax );
-
-		do_action( 'woocommerce_order_add_coupon', $this->id, $item_id, $code, $discount_amount, $discount_amount_tax );
-
-		return $item_id;
-	}
-
-	/**
-	 * Update coupon for order.
-	 *
-	 * Note this does not update order totals.
-	 *
-	 * @since 2.2
-	 * @param int $item_id
-	 * @param array $args
-	 * @return bool
-	 */
-	public function update_coupon( $item_id, $args ) {
-		if ( ! $item_id ) {
-			return false;
-		}
-
-		// code
-		if ( isset( $args['code'] ) ) {
-			wc_update_order_item( $item_id, array( 'order_item_name' => $args['code'] ) );
-		}
-
-		// amount
-		if ( isset( $args['discount_amount'] ) ) {
-			wc_update_order_item_meta( $item_id, 'discount_amount', wc_format_decimal( $args['discount_amount'] ) );
-		}
-		if ( isset( $args['discount_amount_tax'] ) ) {
-			wc_add_order_item_meta( $item_id, 'discount_amount_tax', wc_format_decimal( $args['discount_amount_tax'] ) );
-		}
-
-		do_action( 'woocommerce_order_update_coupon', $this->id, $item_id, $args );
-
-		return true;
-	}
-
-	/**
-	 * Add a tax row to the order.
-	 *
-	 * @since 2.2
-	 * @param int tax_rate_id
-	 * @return int|bool Item ID or false.
-	 */
-	public function add_tax( $tax_rate_id, $tax_amount = 0, $shipping_tax_amount = 0 ) {
-
-		$code = WC_Tax::get_rate_code( $tax_rate_id );
-
-		if ( ! $code ) {
-			return false;
-		}
-
-		$item_id = wc_add_order_item( $this->id, array(
-			'order_item_name' => $code,
-			'order_item_type' => 'tax'
-		) );
-
-		if ( ! $item_id ) {
-			return false;
-		}
-
-		wc_add_order_item_meta( $item_id, 'rate_id', $tax_rate_id );
-		wc_add_order_item_meta( $item_id, 'label', WC_Tax::get_rate_label( $tax_rate_id ) );
-		wc_add_order_item_meta( $item_id, 'compound', WC_Tax::is_compound( $tax_rate_id ) ? 1 : 0 );
-		wc_add_order_item_meta( $item_id, 'tax_amount', wc_format_decimal( $tax_amount ) );
-		wc_add_order_item_meta( $item_id, 'shipping_tax_amount', wc_format_decimal( $shipping_tax_amount ) );
-
-		do_action( 'woocommerce_order_add_tax', $this->id, $item_id, $tax_rate_id, $tax_amount, $shipping_tax_amount );
-
-		return $item_id;
-	}
-
-	/**
-	 * Add a shipping row to the order.
-	 *
-	 * @param WC_Shipping_Rate shipping_rate
-	 * @return int|bool Item ID or false.
-	 */
-	public function add_shipping( $shipping_rate ) {
-
-		$item_id = wc_add_order_item( $this->id, array(
-			'order_item_name' 		=> $shipping_rate->label,
-			'order_item_type' 		=> 'shipping'
-		) );
-
-		if ( ! $item_id ) {
-			return false;
-		}
-
-		wc_add_order_item_meta( $item_id, 'method_id', $shipping_rate->id );
-		wc_add_order_item_meta( $item_id, 'cost', wc_format_decimal( $shipping_rate->cost ) );
-
-		// Save shipping taxes - Since 2.2
-		$taxes = array_map( 'wc_format_decimal', $shipping_rate->taxes );
-		wc_add_order_item_meta( $item_id, 'taxes', $taxes );
-
-		do_action( 'woocommerce_order_add_shipping', $this->id, $item_id, $shipping_rate );
-
-		// Update total
-		$this->set_total( $this->order_shipping + wc_format_decimal( $shipping_rate->cost ), 'shipping' );
-
-		return $item_id;
-	}
-
-	/**
-	 * Update shipping method for order.
-	 *
-	 * Note this does not update the order total.
-	 *
-	 * @since 2.2
-	 * @param int $item_id
-	 * @param array $args
-	 * @return bool
-	 */
-	public function update_shipping( $item_id, $args ) {
-
-		if ( ! $item_id ) {
-			return false;
-		}
-
-		// method title
-		if ( isset( $args['method_title'] ) ) {
-			wc_update_order_item( $item_id, array( 'order_item_name' => $args['method_title'] ) );
-		}
-
-		// method ID
-		if ( isset( $args['method_id'] ) ) {
-			wc_update_order_item_meta( $item_id, 'method_id', $args['method_id'] );
-		}
-
-		// method cost
-		if ( isset( $args['cost'] ) ) {
-			// Get old cost before updating
-			$old_cost = wc_get_order_item_meta( $item_id, 'cost' );
-
-			// Update
-			wc_update_order_item_meta( $item_id, 'cost', wc_format_decimal( $args['cost'] ) );
-
-			// Update total
-			$this->set_total( $this->order_shipping - wc_format_decimal( $old_cost ) + wc_format_decimal( $args['cost'] ), 'shipping' );
-		}
-
-		do_action( 'woocommerce_order_update_shipping', $this->id, $item_id, $args );
-
-		return true;
-	}
-
-	/**
-	 * Add a fee to the order.
-	 *
-	 * @param object $fee
-	 * @return int|bool Item ID or false.
-	 */
-	public function add_fee( $fee ) {
-
-		$item_id = wc_add_order_item( $this->id, array(
-			'order_item_name' => $fee->name,
-			'order_item_type' => 'fee'
-		) );
-
-		if ( ! $item_id ) {
-			return false;
-		}
-
-		if ( $fee->taxable ) {
-			wc_add_order_item_meta( $item_id, '_tax_class', $fee->tax_class );
-		} else {
-			wc_add_order_item_meta( $item_id, '_tax_class', '0' );
-		}
-
-		wc_add_order_item_meta( $item_id, '_line_total', wc_format_decimal( $fee->amount ) );
-		wc_add_order_item_meta( $item_id, '_line_tax', wc_format_decimal( $fee->tax ) );
-
-		// Save tax data - Since 2.2
-		$tax_data = array_map( 'wc_format_decimal', $fee->tax_data );
-		wc_add_order_item_meta( $item_id, '_line_tax_data', array( 'total' => $tax_data ) );
-
-		do_action( 'woocommerce_order_add_fee', $this->id, $item_id, $fee );
-
-		return $item_id;
-	}
-
-	/**
-	 * Update fee for order.
-	 *
-	 * Note this does not update order totals.
-	 *
-	 * @since 2.2
-	 * @param int $item_id
-	 * @param array $args
-	 * @return bool
-	 */
-	public function update_fee( $item_id, $args ) {
-
-		if ( ! $item_id ) {
-			return false;
-		}
-
-		// name
-		if ( isset( $args['name'] ) ) {
-			wc_update_order_item( $item_id, array( 'order_item_name' => $args['name'] ) );
-		}
-
-		// tax class
-		if ( isset( $args['tax_class'] ) ) {
-			wc_update_order_item_meta( $item_id, '_tax_class', $args['tax_class'] );
-		}
-
-		// total
-		if ( isset( $args['line_total'] ) ) {
-			wc_update_order_item_meta( $item_id, '_line_total', wc_format_decimal( $args['line_total'] ) );
-		}
-
-		// total tax
-		if ( isset( $args['line_tax'] ) ) {
-			wc_update_order_item_meta( $item_id, '_line_tax', wc_format_decimal( $args['line_tax'] ) );
-		}
-
-		do_action( 'woocommerce_order_update_fee', $this->id, $item_id, $args );
-
-		return true;
-	}
-
-	/**
-	 * Set an order total.
-	 *
-	 * @param float $amount
-	 * @param string $total_type
-	 *
-	 * @return bool
-	 */
-	public function set_total( $amount, $total_type = 'total' ) {
-
-		if ( ! in_array( $total_type, array( 'shipping', 'tax', 'shipping_tax', 'total', 'cart_discount', 'cart_discount_tax' ) ) ) {
-			return false;
-		}
-
-		switch ( $total_type ) {
-			case 'total' :
-				$key    = '_order_total';
-				$amount = wc_format_decimal( $amount, wc_get_price_decimals() );
-			break;
-			case 'cart_discount' :
-			case 'cart_discount_tax' :
-				$key    = '_' . $total_type;
-				$amount = wc_format_decimal( $amount );
-			break;
-			default :
-				$key    = '_order_' . $total_type;
-				$amount = wc_format_decimal( $amount );
-			break;
-		}
-
-		update_post_meta( $this->id, $key, $amount );
-
-		return true;
-	}
-
-	/**
-	 * Calculate taxes for all line items and shipping, and store the totals and tax rows.
-	 *
-	 * Will use the base country unless customer addresses are set.
-	 *
-	 * @return bool success or fail.
-	 */
-	public function calculate_taxes() {
-		$tax_total    = 0;
-		$taxes        = array();
-		$tax_based_on = get_option( 'woocommerce_tax_based_on' );
-
-		if ( 'billing' === $tax_based_on ) {
-			$country  = $this->billing_country;
-			$state    = $this->billing_state;
-			$postcode = $this->billing_postcode;
-			$city     = $this->billing_city;
-		} elseif ( 'shipping' === $tax_based_on ) {
-			$country  = $this->shipping_country;
-			$state    = $this->shipping_state;
-			$postcode = $this->shipping_postcode;
-			$city     = $this->shipping_city;
-		}
-
-		// Default to base
-		if ( 'base' === $tax_based_on || empty( $country ) ) {
-			$default  = wc_get_base_location();
-			$country  = $default['country'];
-			$state    = $default['state'];
-			$postcode = '';
-			$city     = '';
-		}
-
-		// Get items
-		foreach ( $this->get_items( array( 'line_item', 'fee' ) ) as $item_id => $item ) {
-
-			$product           = $this->get_product_from_item( $item );
-			$line_total        = isset( $item['line_total'] ) ? $item['line_total'] : 0;
-			$line_subtotal     = isset( $item['line_subtotal'] ) ? $item['line_subtotal'] : 0;
-			$tax_class         = $item['tax_class'];
-			$item_tax_status   = $product ? $product->get_tax_status() : 'taxable';
-
-			if ( '0' !== $tax_class && 'taxable' === $item_tax_status ) {
-
-				$tax_rates = WC_Tax::find_rates( array(
-					'country'   => $country,
-					'state'     => $state,
-					'postcode'  => $postcode,
-					'city'      => $city,
-					'tax_class' => $tax_class
-				) );
-
-				$line_subtotal_taxes = WC_Tax::calc_tax( $line_subtotal, $tax_rates, false );
-				$line_taxes          = WC_Tax::calc_tax( $line_total, $tax_rates, false );
-				$line_subtotal_tax   = max( 0, array_sum( $line_subtotal_taxes ) );
-				$line_tax            = max( 0, array_sum( $line_taxes ) );
-				$tax_total           += $line_tax;
-
-				wc_update_order_item_meta( $item_id, '_line_subtotal_tax', wc_format_decimal( $line_subtotal_tax ) );
-				wc_update_order_item_meta( $item_id, '_line_tax', wc_format_decimal( $line_tax ) );
-				wc_update_order_item_meta( $item_id, '_line_tax_data', array( 'total' => $line_taxes, 'subtotal' => $line_subtotal_taxes ) );
-
-				// Sum the item taxes
-				foreach ( array_keys( $taxes + $line_taxes ) as $key ) {
-					$taxes[ $key ] = ( isset( $line_taxes[ $key ] ) ? $line_taxes[ $key ] : 0 ) + ( isset( $taxes[ $key ] ) ? $taxes[ $key ] : 0 );
-				}
-			}
-		}
-
-		// Now calculate shipping tax
-		$shipping_methods = $this->get_shipping_methods();
-
-		if ( ! empty( $shipping_methods ) ) {
-			$matched_tax_rates = array();
-			$tax_rates         = WC_Tax::find_rates( array(
-				'country'   => $country,
-				'state'     => $state,
-				'postcode'  => $postcode,
-				'city'      => $city,
-				'tax_class' => ''
-			) );
-
-			if ( ! empty( $tax_rates ) ) {
-				foreach ( $tax_rates as $key => $rate ) {
-					if ( isset( $rate['shipping'] ) && 'yes' === $rate['shipping'] ) {
-						$matched_tax_rates[ $key ] = $rate;
-					}
-				}
-			}
-
-			$shipping_taxes     = WC_Tax::calc_shipping_tax( $this->order_shipping, $matched_tax_rates );
-			$shipping_tax_total = WC_Tax::round( array_sum( $shipping_taxes ) );
-		} else {
-			$shipping_taxes     = array();
-			$shipping_tax_total = 0;
-		}
-
-		// Save tax totals
-		$this->set_total( $shipping_tax_total, 'shipping_tax' );
-		$this->set_total( $tax_total, 'tax' );
-
-		// Tax rows
-		$this->remove_order_items( 'tax' );
-
-		// Now merge to keep tax rows
-		foreach ( array_keys( $taxes + $shipping_taxes ) as $tax_rate_id ) {
-			$this->add_tax( $tax_rate_id, isset( $taxes[ $tax_rate_id ] ) ? $taxes[ $tax_rate_id ] : 0, isset( $shipping_taxes[ $tax_rate_id ] ) ? $shipping_taxes[ $tax_rate_id ] : 0 );
-		}
-
-		return true;
-	}
-
-
-	/**
-	 * Calculate shipping total.
-	 *
-	 * @since 2.2
-	 * @return float
-	 */
-	public function calculate_shipping() {
-
-		$shipping_total = 0;
-
-		foreach ( $this->get_shipping_methods() as $shipping ) {
-			$shipping_total += $shipping['cost'];
-		}
-
-		$this->set_total( $shipping_total, 'shipping' );
-
-		return $this->get_total_shipping();
-	}
-
-	/**
-	 * Update tax lines at order level by looking at the line item taxes themselves.
-	 *
-	 * @return bool success or fail.
-	 */
-	public function update_taxes() {
-		$order_taxes          = array();
-		$order_shipping_taxes = array();
-
-		foreach ( $this->get_items( array( 'line_item', 'fee' ) ) as $item_id => $item ) {
-
-			$line_tax_data = maybe_unserialize( $item['line_tax_data'] );
-
-			if ( isset( $line_tax_data['total'] ) ) {
-
-				foreach ( $line_tax_data['total'] as $tax_rate_id => $tax ) {
-
-					if ( ! isset( $order_taxes[ $tax_rate_id ] ) ) {
-						$order_taxes[ $tax_rate_id ] = 0;
-					}
-
-					$order_taxes[ $tax_rate_id ] += $tax;
-				}
-			}
-		}
-
-		foreach ( $this->get_items( array( 'shipping' ) ) as $item_id => $item ) {
-
-			$line_tax_data = maybe_unserialize( $item['taxes'] );
-
-			if ( isset( $line_tax_data ) ) {
-				foreach ( $line_tax_data as $tax_rate_id => $tax ) {
-					if ( ! isset( $order_shipping_taxes[ $tax_rate_id ] ) ) {
-						$order_shipping_taxes[ $tax_rate_id ] = 0;
-					}
-
-					$order_shipping_taxes[ $tax_rate_id ] += $tax;
-				}
-			}
-		}
-
-		// Remove old existing tax rows.
-		$this->remove_order_items( 'tax' );
-
-		// Now merge to keep tax rows.
-		foreach ( array_keys( $order_taxes + $order_shipping_taxes ) as $tax_rate_id ) {
-			$this->add_tax( $tax_rate_id, isset( $order_taxes[ $tax_rate_id ] ) ? $order_taxes[ $tax_rate_id ] : 0, isset( $order_shipping_taxes[ $tax_rate_id ] ) ? $order_shipping_taxes[ $tax_rate_id ] : 0 );
-		}
-
-		// Save tax totals
-		$this->set_total( WC_Tax::round( array_sum( $order_shipping_taxes ) ), 'shipping_tax' );
-		$this->set_total( WC_Tax::round( array_sum( $order_taxes ) ), 'tax' );
-
-		return true;
-	}
-
-	/**
-	 * Calculate totals by looking at the contents of the order. Stores the totals and returns the orders final total.
-	 *
-	 * @since 2.2
-	 * @param  $and_taxes bool Calc taxes if true.
-	 * @return float calculated grand total.
-	 */
-	public function calculate_totals( $and_taxes = true ) {
-		$cart_subtotal     = 0;
-		$cart_total        = 0;
-		$fee_total         = 0;
-		$cart_subtotal_tax = 0;
-		$cart_total_tax    = 0;
-
-		if ( $and_taxes && wc_tax_enabled() ) {
-			$this->calculate_taxes();
-		}
-
-		// line items
-		foreach ( $this->get_items() as $item ) {
-			$cart_subtotal     += wc_format_decimal( isset( $item['line_subtotal'] ) ? $item['line_subtotal'] : 0 );
-			$cart_total        += wc_format_decimal( isset( $item['line_total'] ) ? $item['line_total'] : 0 );
-			$cart_subtotal_tax += wc_format_decimal( isset( $item['line_subtotal_tax'] ) ? $item['line_subtotal_tax'] : 0 );
-			$cart_total_tax    += wc_format_decimal( isset( $item['line_tax'] ) ? $item['line_tax'] : 0 );
-		}
-
-		$this->calculate_shipping();
-
-		foreach ( $this->get_fees() as $item ) {
-			$fee_total += $item['line_total'];
-		}
-
-		$this->set_total( $cart_subtotal - $cart_total, 'cart_discount' );
-		$this->set_total( $cart_subtotal_tax - $cart_total_tax, 'cart_discount_tax' );
-
-		$grand_total = round( $cart_total + $fee_total + $this->get_total_shipping() + $this->get_cart_tax() + $this->get_shipping_tax(), wc_get_price_decimals() );
-
-		$this->set_total( $grand_total, 'total' );
-
-		return $grand_total;
-	}
-
-	/**
-	 * Gets an order from the database.
-	 *
-	 * @param int $id (default: 0).
-	 * @return bool
-	 */
-	public function get_order( $id = 0 ) {
-
-		if ( ! $id ) {
-			return false;
-		}
-
-		if ( $result = get_post( $id ) ) {
-			$this->populate( $result );
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Populates an order from the loaded post data.
-	 *
-	 * @param mixed $result
-	 */
-	public function populate( $result ) {
-
-		// Standard post data
-		$this->id                  = $result->ID;
-		$this->order_date          = $result->post_date;
-		$this->modified_date       = $result->post_modified;
-		$this->customer_message    = $result->post_excerpt;
-		$this->customer_note       = $result->post_excerpt;
-		$this->post_status         = $result->post_status;
-
-		// Billing email can default to user if set.
-		if ( empty( $this->billing_email ) && ! empty( $this->customer_user ) && ( $user = get_user_by( 'id', $this->customer_user ) ) ) {
-			$this->billing_email = $user->user_email;
-		}
-
-		// Orders store the state of prices including tax when created.
-		$this->prices_include_tax = metadata_exists( 'post', $this->id, '_prices_include_tax' ) ? get_post_meta( $this->id, '_prices_include_tax', true ) === 'yes' : $this->prices_include_tax;
-	}
-
-	/**
-	 * __isset function.
-	 *
-	 * @param mixed $key
-	 * @return bool
-	 */
-	public function __isset( $key ) {
-
-		if ( ! $this->id ) {
-			return false;
-		}
-
-		return metadata_exists( 'post', $this->id, '_' . $key );
-	}
-
-	/**
-	 * __get function.
-	 *
-	 * @param mixed $key
-	 * @return mixed
-	 */
-	public function __get( $key ) {
-		// Get values or default if not set.
-		if ( 'completed_date' === $key ) {
-			$value = ( $value = get_post_meta( $this->id, '_completed_date', true ) ) ? $value : $this->modified_date;
-		} elseif ( 'user_id' === $key ) {
-			$value = ( $value = get_post_meta( $this->id, '_customer_user', true ) ) ? absint( $value ) : '';
-		} elseif ( 'status' === $key ) {
-			$value = $this->get_status();
-		} else {
-			$value = get_post_meta( $this->id, '_' . $key, true );
-		}
-
-		return $value;
-	}
-
-	/**
-	 * Return the order statuses without wc- internal prefix.
-	 *
-	 * Queries get_post_status() directly to avoid having out of date statuses, if updated elsewhere.
-	 *
-	 * @return string
-	 */
-	public function get_status() {
-		$this->post_status = get_post_status( $this->id );
-		return apply_filters( 'woocommerce_order_get_status', 'wc-' === substr( $this->post_status, 0, 3 ) ? substr( $this->post_status, 3 ) : $this->post_status, $this );
-	}
-
-	/**
-	 * Checks the order status against a passed in status.
-	 *
-	 * @return bool
-	 */
-	public function has_status( $status ) {
-		return apply_filters( 'woocommerce_order_has_status', ( is_array( $status ) && in_array( $this->get_status(), $status ) ) || $this->get_status() === $status ? true : false, $this, $status );
-	}
-
-	/**
-	 * Gets the user ID associated with the order. Guests are 0.
-	 *
-	 * @since  2.2
-	 * @return int
-	 */
-	public function get_user_id() {
-		return $this->customer_user ? intval( $this->customer_user ) : 0;
-	}
-
-	/**
-	 * Get the user associated with the order. False for guests.
-	 *
-	 * @since  2.2
-	 * @return WP_User|false
-	 */
-	public function get_user() {
-		return $this->get_user_id() ? get_user_by( 'id', $this->get_user_id() ) : false;
-	}
-
-	/**
-	 * Get transaction id for the order.
-	 *
-	 * @return string
-	 */
-	public function get_transaction_id() {
-		return get_post_meta( $this->id, '_transaction_id', true );
-	}
-
-	/**
-	 * Check if an order key is valid.
-	 *
-	 * @param mixed $key
-	 * @return bool
-	 */
-	public function key_is_valid( $key ) {
-
-		if ( $key == $this->order_key ) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * get_order_number function.
-	 *
-	 * Gets the order number for display (by default, order ID).
-	 *
-	 * @return string
-	 */
-	public function get_order_number() {
-		return apply_filters( 'woocommerce_order_number', $this->id, $this );
-	}
-
-	/**
-	 * Get a formatted billing address for the order.
-	 *
-	 * @return string
-	 */
-	public function get_formatted_billing_address() {
-		if ( ! $this->formatted_billing_address ) {
-
-			// Formatted Addresses.
-			$address = apply_filters( 'woocommerce_order_formatted_billing_address', array(
-				'first_name'    => $this->billing_first_name,
-				'last_name'     => $this->billing_last_name,
-				'company'       => $this->billing_company,
-				'address_1'     => $this->billing_address_1,
-				'address_2'     => $this->billing_address_2,
-				'city'          => $this->billing_city,
-				'state'         => $this->billing_state,
-				'postcode'      => $this->billing_postcode,
-				'country'       => $this->billing_country
-			), $this );
-
-			$this->formatted_billing_address = WC()->countries->get_formatted_address( $address );
-		}
-
-		return $this->formatted_billing_address;
-	}
-
-	/**
-	 * Get a formatted shipping address for the order.
-	 *
-	 * @return string
-	 */
-	public function get_formatted_shipping_address() {
-		if ( ! $this->formatted_shipping_address ) {
-
-			if ( $this->shipping_address_1 || $this->shipping_address_2 ) {
-
-				// Formatted Addresses
-				$address = apply_filters( 'woocommerce_order_formatted_shipping_address', array(
-					'first_name'    => $this->shipping_first_name,
-					'last_name'     => $this->shipping_last_name,
-					'company'       => $this->shipping_company,
-					'address_1'     => $this->shipping_address_1,
-					'address_2'     => $this->shipping_address_2,
-					'city'          => $this->shipping_city,
-					'state'         => $this->shipping_state,
-					'postcode'      => $this->shipping_postcode,
-					'country'       => $this->shipping_country
-				), $this );
-
-				$this->formatted_shipping_address = WC()->countries->get_formatted_address( $address );
-			}
-		}
-
-		return $this->formatted_shipping_address;
-	}
-
-	/**
-	 * Get a formatted shipping address for the order.
-	 *
-	 * @return string
-	 */
-	public function get_shipping_address_map_url() {
-		$address = apply_filters( 'woocommerce_shipping_address_map_url_parts', array(
-			'address_1'     => $this->shipping_address_1,
-			'address_2'     => $this->shipping_address_2,
-			'city'          => $this->shipping_city,
-			'state'         => $this->shipping_state,
-			'postcode'      => $this->shipping_postcode,
-			'country'       => $this->shipping_country
-		), $this );
-
-		return apply_filters( 'woocommerce_shipping_address_map_url', 'http://maps.google.com/maps?&q=' . urlencode( implode( ', ', $address ) ) . '&z=16', $this );
-	}
-
-	/**
-	 * Get the billing address in an array.
-	 * @deprecated 2.3
-	 * @return string
-	 */
-	public function get_billing_address() {
-		_deprecated_function( 'get_billing_address', '2.3', 'get_formatted_billing_address' );
-		return $this->get_formatted_billing_address();
-	}
-
-	/**
-	 * Get the shipping address in an array.
-	 * @deprecated 2.3
-	 * @return string
-	 */
-	public function get_shipping_address() {
-		_deprecated_function( 'get_shipping_address', '2.3', 'get_formatted_shipping_address' );
-		return $this->get_formatted_shipping_address();
-	}
-
-	/**
-	 * Get a formatted billing full name.
-	 *
-	 * @since 2.4.0
-	 *
-	 * @return string
-	 */
-	public function get_formatted_billing_full_name() {
-		return sprintf( _x( '%1$s %2$s', 'full name', 'woocommerce' ),  $this->billing_first_name, $this->billing_last_name );
-	}
-
-	/**
-	 * Get a formatted shipping full name.
-	 *
-	 * @since 2.4.0
-	 *
-	 * @return string
-	 */
-	public function get_formatted_shipping_full_name() {
-		return sprintf( _x( '%1$s %2$s', 'full name', 'woocommerce' ),  $this->shipping_first_name, $this->shipping_last_name );
+		return isset( $type_to_group[ $type ] ) ? $type_to_group[ $type ] : '';
 	}
 
 	/**
 	 * Return an array of items/products within this order.
 	 *
-	 * @param string|array $type Types of line items to get (array or string).
-	 * @return array
+	 * @param string|array $types Types of line items to get (array or string).
+	 * @return Array of WC_Order_item
 	 */
-	public function get_items( $type = '' ) {
-		global $wpdb;
+	public function get_items( $types = 'line_item' ) {
+		$items = array();
+		$types = array_filter( (array) $types );
 
-		if ( empty( $type ) ) {
-			$type = array( 'line_item' );
-		}
-
-		if ( ! is_array( $type ) ) {
-			$type = array( $type );
-		}
-
-		$items          = array();
-		$get_items_sql  = $wpdb->prepare( "SELECT order_item_id, order_item_name, order_item_type FROM {$wpdb->prefix}woocommerce_order_items WHERE order_id = %d ", $this->id );
-		$get_items_sql .= "AND order_item_type IN ( '" . implode( "','", array_map( 'esc_sql', $type ) ) . "' ) ORDER BY order_item_id;";
-		$line_items     = $wpdb->get_results( $get_items_sql );
-
-		// Loop items
-		foreach ( $line_items as $item ) {
-			$items[ $item->order_item_id ]['name']            = $item->order_item_name;
-			$items[ $item->order_item_id ]['type']            = $item->order_item_type;
-			$items[ $item->order_item_id ]['item_meta']       = $this->get_item_meta( $item->order_item_id );
-			$items[ $item->order_item_id ]['item_meta_array'] = $this->get_item_meta_array( $item->order_item_id );
-			$items[ $item->order_item_id ]                    = $this->expand_item_meta( $items[ $item->order_item_id ] );
+		foreach ( $types as $type ) {
+			if ( $group = $this->type_to_group( $type ) ) {
+				if ( ! isset( $this->items[ $group ] ) ) {
+					$this->items[ $group ] = $this->data_store->read_items( $this, $type );
+				}
+				// Don't use array_merge here because keys are numeric
+				$items = array_filter( $items + $this->items[ $group ] );
+			}
 		}
 
 		return apply_filters( 'woocommerce_order_get_items', $items, $this );
 	}
 
-	/**
-	 * Expand item meta into the $item array.
-	 * @since 2.4.0
-	 * @param array $item before expansion.
-	 * @return array
-	 */
-	public function expand_item_meta( $item ) {
-		// Reserved meta keys
-		$reserved_item_meta_keys = array(
-			'name',
-			'type',
-			'item_meta',
-			'item_meta_array',
-			'qty',
-			'tax_class',
-			'product_id',
-			'variation_id',
-			'line_subtotal',
-			'line_total',
-			'line_tax',
-			'line_subtotal_tax'
-		);
-
-		// Expand item meta if set.
-		if ( ! empty( $item['item_meta'] ) ) {
-			foreach ( $item['item_meta'] as $name => $value ) {
-				if ( in_array( $name, $reserved_item_meta_keys ) ) {
-					continue;
-				}
-				if ( '_' === substr( $name, 0, 1 ) ) {
-					$item[ substr( $name, 1 ) ] = $value[0];
-				} elseif ( ! in_array( $name, $reserved_item_meta_keys ) ) {
-					$item[ $name ] = make_clickable( $value[0] );
-				}
-			}
-		}
-		return $item;
-	}
-
-	/**
-	 * Gets the count of order items of a certain type.
-	 *
-	 * @param string $item_type
-	 * @return string
-	 */
-	public function get_item_count( $item_type = '' ) {
-		if ( empty( $item_type ) ) {
-			$item_type = array( 'line_item' );
-		}
-		if ( ! is_array( $item_type ) ) {
-			$item_type = array( $item_type );
-		}
-
-		$items = $this->get_items( $item_type );
-		$count = 0;
-
-		foreach ( $items as $item ) {
-			$count += empty( $item['qty'] ) ? 1 : $item['qty'];
-		}
-
-		return apply_filters( 'woocommerce_get_item_count', $count, $item_type, $this );
-	}
-
-	/**
-	 * Get refunds
-	 * @return array
-	 */
-	public function get_refunds() { return array(); }
-
 	/**
 	 * Return an array of fees within this order.
 	 *
@@ -1247,378 +735,570 @@ abstract class WC_Abstract_Order {
 	}
 
 	/**
-	 * Check whether this order has a specific shipping method or not.
+	 * Gets formatted shipping method title.
 	 *
-	 * @param string $method_id
-	 *
-	 * @return bool
+	 * @return string
 	 */
-	public function has_shipping_method( $method_id ) {
-
-		$shipping_methods = $this->get_shipping_methods();
-		$has_method = false;
-
-		if ( empty( $shipping_methods ) ) {
-			return false;
+	public function get_shipping_method() {
+		$names = array();
+		foreach ( $this->get_shipping_methods() as $shipping_method ) {
+			$names[] = $shipping_method->get_name();
 		}
-
-		foreach ( $shipping_methods as $shipping_method ) {
-			if ( $shipping_method['method_id'] == $method_id ) {
-				$has_method = true;
-			}
-		}
-
-		return $has_method;
+		return apply_filters( 'woocommerce_order_shipping_method', implode( ', ', $names ), $this );
 	}
 
 	/**
-	 * Get taxes, merged by code, formatted ready for output.
+	 * Get coupon codes only.
 	 *
 	 * @return array
 	 */
-	public function get_tax_totals() {
-
-		$taxes      = $this->get_items( 'tax' );
-		$tax_totals = array();
-
-		foreach ( $taxes as $key => $tax ) {
-
-			$code = $tax[ 'name' ];
-
-			if ( ! isset( $tax_totals[ $code ] ) ) {
-				$tax_totals[ $code ] = new stdClass();
-				$tax_totals[ $code ]->amount = 0;
-			}
-
-			$tax_totals[ $code ]->id                = $key;
-			$tax_totals[ $code ]->rate_id           = $tax['rate_id'];
-			$tax_totals[ $code ]->is_compound       = $tax[ 'compound' ];
-			$tax_totals[ $code ]->label             = isset( $tax[ 'label' ] ) ? $tax[ 'label' ] : $tax[ 'name' ];
-			$tax_totals[ $code ]->amount           += $tax[ 'tax_amount' ] + $tax[ 'shipping_tax_amount' ];
-			$tax_totals[ $code ]->formatted_amount  = wc_price( wc_round_tax_total( $tax_totals[ $code ]->amount ), array('currency' => $this->get_order_currency()) );
-		}
-
-		return apply_filters( 'woocommerce_order_tax_totals', $tax_totals, $this );
-	}
-
-	/**
-	 * has_meta function for order items.
-	 *
-	 * @param string $order_item_id
-	 * @return array of meta data.
-	 */
-	public function has_meta( $order_item_id ) {
-		global $wpdb;
-
-		return $wpdb->get_results( $wpdb->prepare( "SELECT meta_key, meta_value, meta_id, order_item_id
-			FROM {$wpdb->prefix}woocommerce_order_itemmeta WHERE order_item_id = %d
-			ORDER BY meta_id", absint( $order_item_id ) ), ARRAY_A );
-	}
-
-	/**
-	 * Get all item meta data in array format in the order it was saved. Does not group meta by key like get_item_meta().
-	 *
-	 * @param mixed $order_item_id
-	 * @return array of objects
-	 */
-	public function get_item_meta_array( $order_item_id ) {
-		global $wpdb;
-
-		// Get cache key - uses get_cache_prefix to invalidate when needed
-		$cache_key       = WC_Cache_Helper::get_cache_prefix( 'orders' ) . 'item_meta_array_' . $order_item_id;
-		$item_meta_array = wp_cache_get( $cache_key, 'orders' );
-
-		if ( false === $item_meta_array ) {
-			$item_meta_array = array();
-			$metadata        = $wpdb->get_results( $wpdb->prepare( "SELECT meta_key, meta_value, meta_id FROM {$wpdb->prefix}woocommerce_order_itemmeta WHERE order_item_id = %d ORDER BY meta_id", absint( $order_item_id ) ) );
-			foreach ( $metadata as $metadata_row ) {
-				$item_meta_array[ $metadata_row->meta_id ] = (object) array( 'key' => $metadata_row->meta_key, 'value' => $metadata_row->meta_value );
-			}
-			wp_cache_set( $cache_key, $item_meta_array, 'orders' );
-		}
-
-		return $item_meta_array ;
-	}
-
-	/**
-	 * Display meta data belonging to an item.
-	 * @param  array $item
-	 */
-	public function display_item_meta( $item ) {
-		$product   = $this->get_product_from_item( $item );
-		$item_meta = new WC_Order_Item_Meta( $item, $product );
-		$item_meta->display();
-	}
-
-	/**
-	 * Get order item meta.
-	 *
-	 * @param mixed $order_item_id
-	 * @param string $key (default: '')
-	 * @param bool $single (default: false)
-	 * @return array|string
-	 */
-	public function get_item_meta( $order_item_id, $key = '', $single = false ) {
-		return get_metadata( 'order_item', $order_item_id, $key, $single );
-	}
-
-	/** Total Getters *******************************************************/
-
-	/**
-	 * Gets the total discount amount.
-	 * @param  $ex_tax Show discount excl any tax.
-	 * @return float
-	 */
-	public function get_total_discount( $ex_tax = true ) {
-		if ( ! $this->order_version || version_compare( $this->order_version, '2.3.7', '<' ) ) {
-			// Backwards compatible total calculation - totals were not stored consistently in old versions.
-			if ( $ex_tax ) {
-				if ( $this->prices_include_tax ) {
-					$total_discount = (double) $this->cart_discount - (double) $this->cart_discount_tax;
-				} else {
-					$total_discount = (double) $this->cart_discount;
-				}
-			} else {
-				if ( $this->prices_include_tax ) {
-					$total_discount = (double) $this->cart_discount;
-				} else {
-					$total_discount = (double) $this->cart_discount + (double) $this->cart_discount_tax;
-				}
-			}
-		// New logic - totals are always stored exclusive of tax, tax total is stored in cart_discount_tax
-		} else {
-			if ( $ex_tax ) {
-				$total_discount = (double) $this->cart_discount;
-			} else {
-				$total_discount = (double) $this->cart_discount + (double) $this->cart_discount_tax;
+	public function get_used_coupons() {
+		$coupon_codes = array();
+		if ( $coupons = $this->get_items( 'coupon' ) ) {
+			foreach ( $coupons as $coupon ) {
+				$coupon_codes[] = $coupon->get_code();
 			}
 		}
-		return apply_filters( 'woocommerce_order_amount_total_discount', round( $total_discount, WC_ROUNDING_PRECISION ), $this );
+		return $coupon_codes;
 	}
 
 	/**
-	 * Gets the discount amount.
-	 * @deprecated in favour of get_total_discount() since we now only have one discount type.
-	 * @return float
-	 */
-	public function get_cart_discount() {
-		_deprecated_function( 'get_cart_discount', '2.3', 'get_total_discount' );
-		return apply_filters( 'woocommerce_order_amount_cart_discount', $this->get_total_discount(), $this );
-	}
-
-	/**
-	 * Get cart discount (formatted).
+	 * Gets the count of order items of a certain type.
 	 *
-	 * @deprecated order (after tax) discounts removed in 2.3.0.
+	 * @param string $item_type
 	 * @return string
 	 */
-	public function get_order_discount_to_display() {
-		_deprecated_function( 'get_order_discount_to_display', '2.3' );
-	}
+	public function get_item_count( $item_type = '' ) {
+		$items = $this->get_items( empty( $item_type ) ? 'line_item' : $item_type );
+		$count = 0;
 
-	/**
-	 * Gets the total (order) discount amount - these are applied after tax.
-	 *
-	 * @deprecated order (after tax) discounts removed in 2.3.0.
-	 * @return float
-	 */
-	public function get_order_discount() {
-		_deprecated_function( 'get_order_discount', '2.3' );
-		return apply_filters( 'woocommerce_order_amount_order_discount', (double) $this->order_discount, $this );
-	}
-
-	/**
-	 * Gets cart tax amount.
-	 *
-	 * @return float
-	 */
-	public function get_cart_tax() {
-		return apply_filters( 'woocommerce_order_amount_cart_tax', (double) $this->order_tax, $this );
-	}
-
-	/**
-	 * Gets shipping tax amount.
-	 *
-	 * @return float
-	 */
-	public function get_shipping_tax() {
-		return apply_filters( 'woocommerce_order_amount_shipping_tax', (double) $this->order_shipping_tax, $this );
-	}
-
-	/**
-	 * Gets shipping and product tax.
-	 *
-	 * @return float
-	 */
-	public function get_total_tax() {
-		return apply_filters( 'woocommerce_order_amount_total_tax', wc_round_tax_total( $this->get_cart_tax() + $this->get_shipping_tax() ), $this );
-	}
-
-	/**
-	 * Gets shipping total.
-	 *
-	 * @return float
-	 */
-	public function get_total_shipping() {
-		return apply_filters( 'woocommerce_order_amount_total_shipping', (double) $this->order_shipping, $this );
-	}
-
-	/**
-	 * Gets order total.
-	 *
-	 * @return float
-	 */
-	public function get_total() {
-		return apply_filters( 'woocommerce_order_amount_total', (double) $this->order_total, $this );
-	}
-
-	/**
-	 * Gets order subtotal.
-	 *
-	 * @return mixed|void
-	 */
-	public function get_subtotal() {
-		$subtotal = 0;
-
-		foreach ( $this->get_items() as $item ) {
-			$subtotal += ( isset( $item['line_subtotal'] ) ) ? $item['line_subtotal'] : 0;
+		foreach ( $items as $item ) {
+			$count += $item->get_quantity();
 		}
 
-		return apply_filters( 'woocommerce_order_amount_subtotal', (double) $subtotal, $this );
+		return apply_filters( 'woocommerce_get_item_count', $count, $item_type, $this );
+	}
+
+	/**
+	 * Get an order item object, based on it's type.
+	 *
+	 * @since  3.0.0
+	 * @param  int $item_id
+	 * @return WC_Order_Item
+	 */
+	public function get_item( $item_id ) {
+		return WC_Order_Factory::get_order_item( $item_id );
+	}
+
+	/**
+	 * Get key for where a certain item type is stored in _items.
+	 *
+	 * @since  3.0.0
+	 * @param  $item object Order item (product, shipping, fee, coupon, tax)
+	 * @return string
+	 */
+	protected function get_items_key( $item ) {
+		if ( is_a( $item, 'WC_Order_Item_Product' ) ) {
+			return 'line_items';
+		} elseif ( is_a( $item, 'WC_Order_Item_Fee' ) ) {
+			return 'fee_lines';
+		} elseif ( is_a( $item, 'WC_Order_Item_Shipping' ) ) {
+			return 'shipping_lines';
+		} elseif ( is_a( $item, 'WC_Order_Item_Tax' ) ) {
+			return 'tax_lines';
+		} elseif ( is_a( $item, 'WC_Order_Item_Coupon' ) ) {
+			return 'coupon_lines';
+		} else {
+			return '';
+		}
+	}
+
+	/**
+	 * Remove item from the order.
+	 *
+	 * @param int $item_id
+	 */
+	public function remove_item( $item_id ) {
+		$item = $this->get_item( $item_id );
+
+		if ( ! $item || ! ( $items_key = $this->get_items_key( $item ) ) ) {
+			return false;
+		}
+
+		// Unset and remove later
+		$this->items_to_delete[] = $item;
+		unset( $this->items[ $items_key ][ $item->get_id() ] );
+	}
+
+	/**
+	 * Adds an order item to this order. The order item will not persist until save.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Order_Item Order item object (product, shipping, fee, coupon, tax)
+	 */
+	public function add_item( $item ) {
+		if ( ! $items_key = $this->get_items_key( $item ) ) {
+			return false;
+		}
+
+		// Make sure existing items are loaded so we can append this new one.
+		if ( ! isset( $this->items[ $items_key ] ) ) {
+			$this->items[ $items_key ] = $this->get_items( $item->get_type() );
+		}
+
+		// Set parent.
+		$item->set_order_id( $this->get_id() );
+
+		// Append new row with generated temporary ID
+		if ( $item_id = $item->get_id() ) {
+			$this->items[ $items_key ][ $item_id ] = $item;
+		} else {
+			$this->items[ $items_key ][ 'new:' . sizeof( $this->items[ $items_key ] ) ] = $item;
+		}
+	}
+
+	/**
+	 * Add a product line item to the order. This is the only line item type with
+	 * it's own method because it saves looking up order amounts (costs are added up for you).
+	 *
+	 * @param  \WC_Product $product
+	 * @param  int $qty
+	 * @param  array $args
+	 * @return int order item ID
+	 * @throws WC_Data_Exception
+	 */
+	public function add_product( $product, $qty = 1, $args = array() ) {
+		if ( $product ) {
+			$default_args = array(
+				'name'         => $product->get_name(),
+				'tax_class'    => $product->get_tax_class(),
+				'product_id'   => $product->is_type( 'variation' ) ? $product->get_parent_id() : $product->get_id(),
+				'variation_id' => $product->is_type( 'variation' ) ? $product->get_id() : 0,
+				'variation'    => $product->is_type( 'variation' ) ? $product->get_attributes() : array(),
+				'subtotal'     => wc_get_price_excluding_tax( $product, array( 'qty' => $qty ) ),
+				'total'        => wc_get_price_excluding_tax( $product, array( 'qty' => $qty ) ),
+				'quantity'     => $qty,
+			);
+		} else {
+			$default_args = array(
+				'quantity'     => $qty,
+			);
+		}
+
+		$args = wp_parse_args( $args, $default_args );
+
+		// BW compatibility with old args
+		if ( isset( $args['totals'] ) ) {
+			foreach ( $args['totals'] as $key => $value ) {
+				if ( 'tax' === $key ) {
+					$args['total_tax'] = $value;
+				} elseif ( 'tax_data' === $key ) {
+					$args['taxes'] = $value;
+				} else {
+					$args[ $key ] = $value;
+				}
+			}
+		}
+
+		$item = new WC_Order_Item_Product();
+		$item->set_props( $args );
+		$item->set_backorder_meta();
+		$item->set_order_id( $this->get_id() );
+		$item->save();
+		$this->add_item( $item );
+		wc_do_deprecated_action( 'woocommerce_order_add_product', array( $this->get_id(), $item->get_id(), $product, $qty, $args ), '3.0', 'woocommerce_new_order_item action instead' );
+		return $item->get_id();
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Payment Token Handling
+	|--------------------------------------------------------------------------
+	|
+	| Payment tokens are hashes used to take payments by certain gateways.
+	|
+	*/
+
+	/**
+	 * Add a payment token to an order
+	 *
+	 * @since 2.6
+	 * @param  WC_Payment_Token   $token     Payment token object
+	 * @return boolean|int The new token ID or false if it failed.
+	 */
+	public function add_payment_token( $token ) {
+		if ( empty( $token ) || ! ( $token instanceof WC_Payment_Token ) ) {
+			return false;
+		}
+
+		$token_ids   = $this->data_store->get_payment_token_ids( $this );
+		$token_ids[] = $token->get_id();
+		$this->data_store->update_payment_token_ids( $this, $token_ids );
+
+		do_action( 'woocommerce_payment_token_added_to_order', $this->get_id(), $token->get_id(), $token, $token_ids );
+		return $token->get_id();
+	}
+
+	/**
+	 * Returns a list of all payment tokens associated with the current order
+	 *
+	 * @since 2.6
+	 * @return array An array of payment token objects
+	 */
+	public function get_payment_tokens() {
+		return $this->data_store->get_payment_token_ids( $this );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Calculations.
+	|--------------------------------------------------------------------------
+	|
+	| These methods calculate order totals and taxes based on the current data.
+	|
+	*/
+
+	/**
+	 * Calculate shipping total.
+	 *
+	 * @since 2.2
+	 * @return float
+	 */
+	public function calculate_shipping() {
+		$shipping_total = 0;
+
+		foreach ( $this->get_shipping_methods() as $shipping ) {
+			$shipping_total += $shipping->get_total();
+		}
+
+		$this->set_shipping_total( $shipping_total );
+		$this->save();
+
+		return $this->get_shipping_total();
+	}
+
+	/**
+	 * Get all tax classes for items in the order.
+	 *
+	 * @since 2.6.3
+	 * @return array
+	 */
+	public function get_items_tax_classes() {
+		$found_tax_classes = array();
+
+		foreach ( $this->get_items() as $item ) {
+			if ( $_product = $item->get_product() ) {
+				$found_tax_classes[] = $_product->get_tax_class();
+			}
+		}
+
+		return array_unique( $found_tax_classes );
+	}
+
+	/**
+	 * Calculate taxes for all line items and shipping, and store the totals and tax rows.
+	 *
+	 * Will use the base country unless customer addresses are set.
+	 * @param $args array Added in 3.0.0 to pass things like location.
+	 */
+	public function calculate_taxes( $args = array() ) {
+		$tax_based_on = get_option( 'woocommerce_tax_based_on' );
+		$args         = wp_parse_args( $args, array(
+			'country'  => 'billing' === $tax_based_on ? $this->get_billing_country()  : $this->get_shipping_country(),
+			'state'    => 'billing' === $tax_based_on ? $this->get_billing_state()    : $this->get_shipping_state(),
+			'postcode' => 'billing' === $tax_based_on ? $this->get_billing_postcode() : $this->get_shipping_postcode(),
+			'city'     => 'billing' === $tax_based_on ? $this->get_billing_city()     : $this->get_shipping_city(),
+		) );
+
+		// Default to base
+		if ( 'base' === $tax_based_on || empty( $args['country'] ) ) {
+			$default          = wc_get_base_location();
+			$args['country']  = $default['country'];
+			$args['state']    = $default['state'];
+			$args['postcode'] = '';
+			$args['city']     = '';
+		}
+
+		// Calc taxes for line items
+		foreach ( $this->get_items( array( 'line_item', 'fee' ) ) as $item_id => $item ) {
+			$tax_class           = $item->get_tax_class();
+			$tax_status          = $item->get_tax_status();
+
+			if ( '0' !== $tax_class && 'taxable' === $tax_status ) {
+				$tax_rates = WC_Tax::find_rates( array(
+					'country'   => $args['country'],
+					'state'     => $args['state'],
+					'postcode'  => $args['postcode'],
+					'city'      => $args['city'],
+					'tax_class' => $tax_class,
+				) );
+
+				$total = $item->get_total();
+				$taxes = WC_Tax::calc_tax( $total, $tax_rates, false );
+
+				if ( $item->is_type( 'line_item' ) ) {
+					$subtotal       = $item->get_subtotal();
+					$subtotal_taxes = WC_Tax::calc_tax( $subtotal, $tax_rates, false );
+					$item->set_taxes( array( 'total' => $taxes, 'subtotal' => $subtotal_taxes ) );
+				} else {
+					$item->set_taxes( array( 'total' => $taxes ) );
+				}
+				$item->save();
+			}
+		}
+
+		// Calc taxes for shipping
+		foreach ( $this->get_shipping_methods() as $item_id => $item ) {
+			$shipping_tax_class = get_option( 'woocommerce_shipping_tax_class' );
+
+			// Inherit tax class from items
+			if ( 'inherit' === $shipping_tax_class ) {
+				$tax_rates         = array();
+				$tax_classes       = array_merge( array( '' ), WC_Tax::get_tax_class_slugs() );
+				$found_tax_classes = $this->get_items_tax_classes();
+
+				foreach ( $tax_classes as $tax_class ) {
+					if ( in_array( $tax_class, $found_tax_classes ) ) {
+						$tax_rates = WC_Tax::find_shipping_rates( array(
+							'country'   => $args['country'],
+							'state'     => $args['state'],
+							'postcode'  => $args['postcode'],
+							'city'      => $args['city'],
+							'tax_class' => $tax_class,
+						) );
+						break;
+					}
+				}
+			} else {
+				$tax_rates = WC_Tax::find_shipping_rates( array(
+					'country'   => $args['country'],
+					'state'     => $args['state'],
+					'postcode'  => $args['postcode'],
+					'city'      => $args['city'],
+					'tax_class' => $shipping_tax_class,
+				) );
+			}
+
+			$item->set_taxes( array( 'total' => WC_Tax::calc_tax( $item->get_total(), $tax_rates, false ) ) );
+			$item->save();
+		}
+		$this->update_taxes();
+	}
+
+	/**
+	 * Update tax lines for the order based on the line item taxes themselves.
+	 */
+	public function update_taxes() {
+		$cart_taxes     = array();
+		$shipping_taxes = array();
+		$existing_taxes = $this->get_taxes();
+		$saved_rate_ids = array();
+
+		foreach ( $this->get_items( array( 'line_item', 'fee' ) ) as $item_id => $item ) {
+			$taxes = $item->get_taxes();
+			foreach ( $taxes['total'] as $tax_rate_id => $tax ) {
+				$cart_taxes[ $tax_rate_id ] = isset( $cart_taxes[ $tax_rate_id ] ) ? $cart_taxes[ $tax_rate_id ] + (float) $tax : (float) $tax;
+			}
+		}
+
+		foreach ( $this->get_shipping_methods() as $item_id => $item ) {
+			$taxes = $item->get_taxes();
+			foreach ( $taxes['total'] as $tax_rate_id => $tax ) {
+				$shipping_taxes[ $tax_rate_id ] = isset( $shipping_taxes[ $tax_rate_id ] ) ? $shipping_taxes[ $tax_rate_id ] + (float) $tax : (float) $tax;
+			}
+		}
+
+		foreach ( $existing_taxes as $tax ) {
+			// Remove taxes which no longer exist for cart/shipping.
+			if ( ( ! array_key_exists( $tax->get_rate_id(), $cart_taxes ) && ! array_key_exists( $tax->get_rate_id(), $shipping_taxes ) ) || in_array( $tax->get_rate_id(), $saved_rate_ids ) ) {
+				$this->remove_item( $tax->get_id() );
+				continue;
+			}
+			$saved_rate_ids[] = $tax->get_rate_id();
+			$tax->set_tax_total( isset( $cart_taxes[ $tax->get_rate_id() ] ) ? $cart_taxes[ $tax->get_rate_id() ] : 0 );
+			$tax->set_shipping_tax_total( ! empty( $shipping_taxes[ $tax->get_rate_id() ] ) ? $shipping_taxes[ $tax->get_rate_id() ] : 0 );
+			$tax->save();
+		}
+
+		$new_rate_ids = wp_parse_id_list( array_diff( array_keys( $cart_taxes + $shipping_taxes ), $saved_rate_ids ) );
+
+		// New taxes.
+		foreach ( $new_rate_ids as $tax_rate_id ) {
+			$item = new WC_Order_Item_Tax();
+			$item->set_rate( $tax_rate_id );
+			$item->set_tax_total( isset( $cart_taxes[ $tax_rate_id ] ) ? $cart_taxes[ $tax_rate_id ] : 0 );
+			$item->set_shipping_tax_total( ! empty( $shipping_taxes[ $tax_rate_id ] ) ? $shipping_taxes[ $tax_rate_id ] : 0 );
+			$this->add_item( $item );
+		}
+
+		// Save tax totals
+		$this->set_shipping_tax( WC_Tax::round( array_sum( $shipping_taxes ) ) );
+		$this->set_cart_tax( WC_Tax::round( array_sum( $cart_taxes ) ) );
+		$this->save();
+	}
+
+	/**
+	 * Calculate totals by looking at the contents of the order. Stores the totals and returns the orders final total.
+	 *
+	 * @since 2.2
+	 * @param  bool $and_taxes Calc taxes if true.
+	 * @return float calculated grand total.
+	 */
+	public function calculate_totals( $and_taxes = true ) {
+		$cart_subtotal     = 0;
+		$cart_total        = 0;
+		$fee_total         = 0;
+		$cart_subtotal_tax = 0;
+		$cart_total_tax    = 0;
+
+		if ( $and_taxes && wc_tax_enabled() ) {
+			$this->calculate_taxes();
+		}
+
+		// line items
+		foreach ( $this->get_items() as $item ) {
+			$cart_subtotal     += $item->get_subtotal();
+			$cart_total        += $item->get_total();
+			$cart_subtotal_tax += $item->get_subtotal_tax();
+			$cart_total_tax    += $item->get_total_tax();
+		}
+
+		$this->calculate_shipping();
+
+		foreach ( $this->get_fees() as $item ) {
+			$fee_total += $item->get_total();
+		}
+
+		$grand_total = round( $cart_total + $fee_total + $this->get_shipping_total() + $this->get_cart_tax() + $this->get_shipping_tax(), wc_get_price_decimals() );
+
+		$this->set_discount_total( $cart_subtotal - $cart_total );
+		$this->set_discount_tax( $cart_subtotal_tax - $cart_total_tax );
+		$this->set_total( $grand_total );
+		$this->save();
+
+		return $grand_total;
 	}
 
 	/**
 	 * Get item subtotal - this is the cost before discount.
 	 *
-	 * @param mixed $item
+	 * @param object $item
 	 * @param bool $inc_tax (default: false).
 	 * @param bool $round (default: true).
 	 * @return float
 	 */
 	public function get_item_subtotal( $item, $inc_tax = false, $round = true ) {
-		if ( $inc_tax ) {
-			$price = ( $item['line_subtotal'] + $item['line_subtotal_tax'] ) / max( 1, $item['qty'] );
-		} else {
-			$price = ( $item['line_subtotal'] / max( 1, $item['qty'] ) );
+		$subtotal = 0;
+
+		if ( is_callable( array( $item, 'get_subtotal' ) ) ) {
+			if ( $inc_tax ) {
+				$subtotal = ( $item->get_subtotal() + $item->get_subtotal_tax() ) / max( 1, $item->get_quantity() );
+			} else {
+				$subtotal = ( floatval( $item->get_subtotal() ) / max( 1, $item->get_quantity() ) );
+			}
+
+			$subtotal = $round ? number_format( (float) $subtotal, wc_get_price_decimals(), '.', '' ) : $subtotal;
 		}
 
-		$price = $round ? number_format( (float) $price, wc_get_price_decimals(), '.', '' ) : $price;
-
-		return apply_filters( 'woocommerce_order_amount_item_subtotal', $price, $this, $item, $inc_tax, $round );
+		return apply_filters( 'woocommerce_order_amount_item_subtotal', $subtotal, $this, $item, $inc_tax, $round );
 	}
 
 	/**
 	 * Get line subtotal - this is the cost before discount.
 	 *
-	 * @param mixed $item
+	 * @param object $item
 	 * @param bool $inc_tax (default: false).
 	 * @param bool $round (default: true).
 	 * @return float
 	 */
 	public function get_line_subtotal( $item, $inc_tax = false, $round = true ) {
-		if ( $inc_tax ) {
-			$price = $item['line_subtotal'] + $item['line_subtotal_tax'];
-		} else {
-			$price = $item['line_subtotal'];
+		$subtotal = 0;
+
+		if ( is_callable( array( $item, 'get_subtotal' ) ) ) {
+			if ( $inc_tax ) {
+				$subtotal = $item->get_subtotal() + $item->get_subtotal_tax();
+			} else {
+				$subtotal = $item->get_subtotal();
+			}
+
+			$subtotal = $round ? round( $subtotal, wc_get_price_decimals() ) : $subtotal;
 		}
 
-		$price = $round ? round( $price, wc_get_price_decimals() ) : $price;
-
-		return apply_filters( 'woocommerce_order_amount_line_subtotal', $price, $this, $item, $inc_tax, $round );
+		return apply_filters( 'woocommerce_order_amount_line_subtotal', $subtotal, $this, $item, $inc_tax, $round );
 	}
 
 	/**
 	 * Calculate item cost - useful for gateways.
 	 *
-	 * @param mixed $item
+	 * @param object $item
 	 * @param bool $inc_tax (default: false).
 	 * @param bool $round (default: true).
 	 * @return float
 	 */
 	public function get_item_total( $item, $inc_tax = false, $round = true ) {
+		$total = 0;
 
-		$qty = ( ! empty( $item['qty'] ) ) ? $item['qty'] : 1;
+		if ( is_callable( array( $item, 'get_total' ) ) ) {
+			if ( $inc_tax ) {
+				$total = ( $item->get_total() + $item->get_total_tax() ) / max( 1, $item->get_quantity() );
+			} else {
+				$total = floatval( $item->get_total() ) / max( 1, $item->get_quantity() );
+			}
 
-		if ( $inc_tax ) {
-			$price = ( $item['line_total'] + $item['line_tax'] ) / max( 1, $qty );
-		} else {
-			$price = $item['line_total'] / max( 1, $qty );
+			$total = $round ? round( $total, wc_get_price_decimals() ) : $total;
 		}
 
-		$price = $round ? round( $price, wc_get_price_decimals() ) : $price;
-
-		return apply_filters( 'woocommerce_order_amount_item_total', $price, $this, $item, $inc_tax, $round );
+		return apply_filters( 'woocommerce_order_amount_item_total', $total, $this, $item, $inc_tax, $round );
 	}
 
 	/**
 	 * Calculate line total - useful for gateways.
 	 *
-	 * @param mixed $item
+	 * @param object $item
 	 * @param bool $inc_tax (default: false).
 	 * @param bool $round (default: true).
 	 * @return float
 	 */
 	public function get_line_total( $item, $inc_tax = false, $round = true ) {
+		$total = 0;
 
-		// Check if we need to add line tax to the line total.
-		$line_total = $inc_tax ? $item['line_total'] + $item['line_tax'] : $item['line_total'];
+		if ( is_callable( array( $item, 'get_total' ) ) ) {
+			// Check if we need to add line tax to the line total.
+			$total = $inc_tax ? $item->get_total() + $item->get_total_tax() : $item->get_total();
 
-		// Check if we need to round.
-		$line_total = $round ? round( $line_total, wc_get_price_decimals() ) : $line_total;
+			// Check if we need to round.
+			$total = $round ? round( $total, wc_get_price_decimals() ) : $total;
+		}
 
-		return apply_filters( 'woocommerce_order_amount_line_total', $line_total, $this, $item, $inc_tax, $round );
+		return apply_filters( 'woocommerce_order_amount_line_total', $total, $this, $item, $inc_tax, $round );
 	}
 
 	/**
-	 * Calculate item tax - useful for gateways.
+	 * Get item tax - useful for gateways.
 	 *
 	 * @param mixed $item
 	 * @param bool $round (default: true).
 	 * @return float
 	 */
 	public function get_item_tax( $item, $round = true ) {
+		$tax = 0;
 
-		$price = $item['line_tax'] / max( 1, $item['qty'] );
-		$price = $round ? wc_round_tax_total( $price ) : $price;
+		if ( is_callable( array( $item, 'get_total_tax' ) ) ) {
+			$tax = $item->get_total_tax() / max( 1, $item->get_quantity() );
+			$tax = $round ? wc_round_tax_total( $tax ) : $tax;
+		}
 
-		return apply_filters( 'woocommerce_order_amount_item_tax', $price, $item, $round, $this );
+		return apply_filters( 'woocommerce_order_amount_item_tax', $tax, $item, $round, $this );
 	}
 
 	/**
-	 * Calculate line tax - useful for gateways.
+	 * Get line tax - useful for gateways.
 	 *
 	 * @param mixed $item
 	 * @return float
 	 */
 	public function get_line_tax( $item ) {
-		return apply_filters( 'woocommerce_order_amount_line_tax', wc_round_tax_total( $item['line_tax'] ), $item, $this );
-	}
-
-	/** End Total Getters *******************************************************/
-
-	/**
-	 * Gets formatted shipping method title.
-	 *
-	 * @return string
-	 */
-	public function get_shipping_method() {
-
-		$labels = array();
-
-		// Backwards compat < 2.1 - get shipping title stored in meta.
-		if ( $this->shipping_method_title ) {
-			$labels[] = $this->shipping_method_title;
-		} else {
-
-			// 2.1+ get line items for shipping.
-			$shipping_methods = $this->get_shipping_methods();
-
-			foreach ( $shipping_methods as $shipping ) {
-				$labels[] = $shipping['name'];
-			}
-		}
-
-		return apply_filters( 'woocommerce_order_shipping_method', implode( ', ', $labels ), $this );
+		return apply_filters( 'woocommerce_order_amount_line_tax', is_callable( array( $item, 'get_total_tax' ) ) ? wc_round_tax_total( $item->get_total_tax() ) : 0, $item, $this );
 	}
 
 	/**
@@ -1629,42 +1309,25 @@ abstract class WC_Abstract_Order {
 	 * @return string
 	 */
 	public function get_formatted_line_subtotal( $item, $tax_display = '' ) {
-
-		if ( ! $tax_display ) {
-			$tax_display = $this->tax_display_cart;
-		}
-
-		if ( ! isset( $item['line_subtotal'] ) || ! isset( $item['line_subtotal_tax'] ) ) {
-			return '';
-		}
+		$tax_display = $tax_display ? $tax_display : get_option( 'woocommerce_tax_display_cart' );
 
 		if ( 'excl' == $tax_display ) {
-			$ex_tax_label = $this->prices_include_tax ? 1 : 0;
+			$ex_tax_label = $this->get_prices_include_tax() ? 1 : 0;
 
-			$subtotal = wc_price( $this->get_line_subtotal( $item ), array( 'ex_tax_label' => $ex_tax_label, 'currency' => $this->get_order_currency() ) );
+			$subtotal = wc_price( $this->get_line_subtotal( $item ), array( 'ex_tax_label' => $ex_tax_label, 'currency' => $this->get_currency() ) );
 		} else {
-			$subtotal = wc_price( $this->get_line_subtotal( $item, true ), array('currency' => $this->get_order_currency()) );
+			$subtotal = wc_price( $this->get_line_subtotal( $item, true ), array( 'currency' => $this->get_currency() ) );
 		}
 
 		return apply_filters( 'woocommerce_order_formatted_line_subtotal', $subtotal, $item, $this );
 	}
 
-	/**
-	 * Gets order currency.
-	 *
-	 * @return string
-	 */
-	public function get_order_currency() {
-		return apply_filters( 'woocommerce_get_order_currency', $this->order_currency, $this );
-	}
-
 	/**
 	 * Gets order total - formatted for display.
-	 *
 	 * @return string
 	 */
 	public function get_formatted_order_total() {
-		$formatted_total = wc_price( $this->get_total(), array( 'currency' => $this->get_order_currency() ) );
+		$formatted_total = wc_price( $this->get_total(), array( 'currency' => $this->get_currency() ) );
 		return apply_filters( 'woocommerce_get_formatted_order_total', $formatted_total, $this );
 	}
 
@@ -1676,101 +1339,80 @@ abstract class WC_Abstract_Order {
 	 * @return string
 	 */
 	public function get_subtotal_to_display( $compound = false, $tax_display = '' ) {
-
-		if ( ! $tax_display ) {
-			$tax_display = $this->tax_display_cart;
-		}
-
-		$subtotal = 0;
+		$tax_display = $tax_display ? $tax_display : get_option( 'woocommerce_tax_display_cart' );
+		$subtotal    = 0;
 
 		if ( ! $compound ) {
 			foreach ( $this->get_items() as $item ) {
+				$subtotal += $item->get_subtotal();
 
-				if ( ! isset( $item['line_subtotal'] ) || ! isset( $item['line_subtotal_tax'] ) ) {
-					return '';
-				}
-
-				$subtotal += $item['line_subtotal'];
-
-				if ( 'incl' == $tax_display ) {
-					$subtotal += $item['line_subtotal_tax'];
+				if ( 'incl' === $tax_display ) {
+					$subtotal += $item->get_subtotal_tax();
 				}
 			}
 
-			$subtotal = wc_price( $subtotal, array('currency' => $this->get_order_currency()) );
+			$subtotal = wc_price( $subtotal, array( 'currency' => $this->get_currency() ) );
 
-			if ( $tax_display == 'excl' && $this->prices_include_tax ) {
+			if ( 'excl' === $tax_display && $this->get_prices_include_tax() ) {
 				$subtotal .= ' <small class="tax_label">' . WC()->countries->ex_tax_or_vat() . '</small>';
 			}
-
 		} else {
-
-			if ( 'incl' == $tax_display ) {
+			if ( 'incl' === $tax_display ) {
 				return '';
 			}
 
 			foreach ( $this->get_items() as $item ) {
-
-				$subtotal += $item['line_subtotal'];
-
+				$subtotal += $item->get_subtotal();
 			}
 
 			// Add Shipping Costs.
-			$subtotal += $this->get_total_shipping();
+			$subtotal += $this->get_shipping_total();
 
 			// Remove non-compound taxes.
 			foreach ( $this->get_taxes() as $tax ) {
-
-				if ( ! empty( $tax['compound'] ) ) {
+				if ( $tax->is_compound() ) {
 					continue;
 				}
-
-				$subtotal = $subtotal + $tax['tax_amount'] + $tax['shipping_tax_amount'];
-
+				$subtotal = $subtotal + $tax->get_tax_total() + $tax->get_shipping_tax_total();
 			}
 
 			// Remove discounts.
 			$subtotal = $subtotal - $this->get_total_discount();
-
-			$subtotal = wc_price( $subtotal, array('currency' => $this->get_order_currency()) );
+			$subtotal = wc_price( $subtotal, array( 'currency' => $this->get_currency() ) );
 		}
 
 		return apply_filters( 'woocommerce_order_subtotal_to_display', $subtotal, $compound, $this );
 	}
 
-
 	/**
 	 * Gets shipping (formatted).
 	 *
 	 * @return string
 	 */
 	public function get_shipping_to_display( $tax_display = '' ) {
-		if ( ! $tax_display ) {
-			$tax_display = $this->tax_display_cart;
-		}
+		$tax_display = $tax_display ? $tax_display : get_option( 'woocommerce_tax_display_cart' );
 
-		if ( $this->order_shipping != 0 ) {
+		if ( $this->get_shipping_total() != 0 ) {
 
-			if ( $tax_display == 'excl' ) {
+			if ( 'excl' === $tax_display ) {
 
 				// Show shipping excluding tax.
-				$shipping = wc_price( $this->order_shipping, array('currency' => $this->get_order_currency()) );
+				$shipping = wc_price( $this->get_shipping_total(), array( 'currency' => $this->get_currency() ) );
 
-				if ( $this->order_shipping_tax != 0 && $this->prices_include_tax ) {
+				if ( $this->get_shipping_tax() != 0 && $this->get_prices_include_tax() ) {
 					$shipping .= apply_filters( 'woocommerce_order_shipping_to_display_tax_label', '&nbsp;<small class="tax_label">' . WC()->countries->ex_tax_or_vat() . '</small>', $this, $tax_display );
 				}
-
 			} else {
 
 				// Show shipping including tax.
-				$shipping = wc_price( $this->order_shipping + $this->order_shipping_tax, array('currency' => $this->get_order_currency()) );
+				$shipping = wc_price( $this->get_shipping_total() + $this->get_shipping_tax(), array( 'currency' => $this->get_currency() ) );
 
-				if ( $this->order_shipping_tax != 0 && ! $this->prices_include_tax ) {
+				if ( $this->get_shipping_tax() != 0 && ! $this->get_prices_include_tax() ) {
 					$shipping .= apply_filters( 'woocommerce_order_shipping_to_display_tax_label', '&nbsp;<small class="tax_label">' . WC()->countries->inc_tax_or_vat() . '</small>', $this, $tax_display );
 				}
-
 			}
 
+			/* translators: %s: shipping method */
 			$shipping .= apply_filters( 'woocommerce_order_shipping_to_display_shipped_via', '&nbsp;<small class="shipped_via">' . sprintf( __( 'via %s', 'woocommerce' ), $this->get_shipping_method() ) . '</small>', $this );
 
 		} elseif ( $this->get_shipping_method() ) {
@@ -1788,215 +1430,160 @@ abstract class WC_Abstract_Order {
 	 * @return string
 	 */
 	public function get_discount_to_display( $tax_display = '' ) {
-		if ( ! $tax_display ) {
-			$tax_display = $this->tax_display_cart;
-		}
-		return apply_filters( 'woocommerce_order_discount_to_display', wc_price( $this->get_total_discount( $tax_display === 'excl' && $this->display_totals_ex_tax ), array( 'currency' => $this->get_order_currency() ) ), $this );
+		$tax_display = $tax_display ? $tax_display : get_option( 'woocommerce_tax_display_cart' );
+		return apply_filters( 'woocommerce_order_discount_to_display', wc_price( $this->get_total_discount( 'excl' === $tax_display && 'excl' === get_option( 'woocommerce_tax_display_cart' ) ), array( 'currency' => $this->get_currency() ) ), $this );
 	}
 
 	/**
-	 * Get cart discount (formatted).
-	 * @deprecated
-	 * @return string
-	 */
-	public function get_cart_discount_to_display( $tax_display = '' ) {
-		_deprecated_function( 'get_cart_discount_to_display', '2.3', 'get_discount_to_display' );
-		return apply_filters( 'woocommerce_order_cart_discount_to_display', $this->get_discount_to_display( $tax_display ), $this );
-	}
-
-	/**
-	 * Get a product (either product or variation).
+	 * Add total row for subtotal.
 	 *
-	 * @param mixed $item
-	 * @return WC_Product
+	 * @param array $total_rows
+	 * @param string $tax_display
 	 */
-	public function get_product_from_item( $item ) {
-
-		if ( ! empty( $item['variation_id'] ) && 'product_variation' === get_post_type( $item['variation_id'] ) ) {
-			$_product = wc_get_product( $item['variation_id'] );
-		} elseif ( ! empty( $item['product_id']  ) ) {
-			$_product = wc_get_product( $item['product_id'] );
-		} else {
-			$_product = false;
+	protected function add_order_item_totals_subtotal_row( &$total_rows, $tax_display ) {
+		if ( $subtotal = $this->get_subtotal_to_display( false, $tax_display ) ) {
+			$total_rows['cart_subtotal'] = array(
+				'label' => __( 'Subtotal:', 'woocommerce' ),
+				'value'    => $subtotal,
+			);
 		}
-
-		return apply_filters( 'woocommerce_get_product_from_item', $_product, $item, $this );
 	}
 
+	/**
+	 * Add total row for discounts.
+	 *
+	 * @param array $total_rows
+	 * @param string $tax_display
+	 */
+	protected function add_order_item_totals_discount_row( &$total_rows, $tax_display ) {
+		if ( $this->get_total_discount() > 0 ) {
+			$total_rows['discount'] = array(
+				'label' => __( 'Discount:', 'woocommerce' ),
+				'value'    => '-' . $this->get_discount_to_display( $tax_display ),
+			);
+		}
+	}
+
+	/**
+	 * Add total row for shipping.
+	 *
+	 * @param array $total_rows
+	 * @param string $tax_display
+	 */
+	protected function add_order_item_totals_shipping_row( &$total_rows, $tax_display ) {
+		if ( $this->get_shipping_method() ) {
+			$total_rows['shipping'] = array(
+				'label' => __( 'Shipping:', 'woocommerce' ),
+				'value'    => $this->get_shipping_to_display( $tax_display ),
+			);
+		}
+	}
+
+	/**
+	 * Add total row for fees.
+	 *
+	 * @param array $total_rows
+	 * @param string $tax_display
+	 */
+	protected function add_order_item_totals_fee_rows( &$total_rows, $tax_display ) {
+		if ( $fees = $this->get_fees() ) {
+			foreach ( $fees as $id => $fee ) {
+				if ( apply_filters( 'woocommerce_get_order_item_totals_excl_free_fees', empty( $fee['line_total'] ) && empty( $fee['line_tax'] ), $id ) ) {
+					continue;
+				}
+				$total_rows[ 'fee_' . $fee->get_id() ] = array(
+					'label' => $fee->get_name() . ':',
+					'value' => wc_price( 'excl' === $tax_display ? $fee->get_total() : $fee->get_total() + $fee->get_total_tax(), array( 'currency' => $this->get_currency() ) ),
+				);
+			}
+		}
+	}
+
+	/**
+	 * Add total row for taxes.
+	 *
+	 * @param array $total_rows
+	 * @param string $tax_display
+	 */
+	protected function add_order_item_totals_tax_rows( &$total_rows, $tax_display ) {
+		// Tax for tax exclusive prices.
+		if ( 'excl' === $tax_display ) {
+			if ( 'itemized' === get_option( 'woocommerce_tax_total_display' ) ) {
+				foreach ( $this->get_tax_totals() as $code => $tax ) {
+					$total_rows[ sanitize_title( $code ) ] = array(
+						'label' => $tax->label . ':',
+						'value'    => $tax->formatted_amount,
+					);
+				}
+			} else {
+				$total_rows['tax'] = array(
+					'label' => WC()->countries->tax_or_vat() . ':',
+					'value'    => wc_price( $this->get_total_tax(), array( 'currency' => $this->get_currency() ) ),
+				);
+			}
+		}
+	}
+
+	/**
+	 * Add total row for grand total.
+	 *
+	 * @param array $total_rows
+	 * @param string $tax_display
+	 */
+	protected function add_order_item_totals_total_row( &$total_rows, $tax_display ) {
+		$total_rows['order_total'] = array(
+			'label' => __( 'Total:', 'woocommerce' ),
+			'value'    => $this->get_formatted_order_total( $tax_display ),
+		);
+	}
 
 	/**
 	 * Get totals for display on pages and in emails.
 	 *
+	 * @param mixed $tax_display
 	 * @return array
 	 */
 	public function get_order_item_totals( $tax_display = '' ) {
+		$tax_display = $tax_display ? $tax_display : get_option( 'woocommerce_tax_display_cart' );
+		$total_rows  = array();
 
-		if ( ! $tax_display ) {
-			$tax_display = $this->tax_display_cart;
-		}
+		$this->add_order_item_totals_subtotal_row( $total_rows, $tax_display );
+		$this->add_order_item_totals_discount_row( $total_rows, $tax_display );
+		$this->add_order_item_totals_shipping_row( $total_rows, $tax_display );
+		$this->add_order_item_totals_fee_rows( $total_rows, $tax_display );
+		$this->add_order_item_totals_tax_rows( $total_rows, $tax_display );
+		$this->add_order_item_totals_total_row( $total_rows, $tax_display );
 
-		$total_rows = array();
-
-		if ( $subtotal = $this->get_subtotal_to_display( false, $tax_display ) ) {
-			$total_rows['cart_subtotal'] = array(
-				'label' => __( 'Subtotal:', 'woocommerce' ),
-				'value'	=> $subtotal
-			);
-		}
-
-		if ( $this->get_total_discount() > 0 ) {
-			$total_rows['discount'] = array(
-				'label' => __( 'Discount:', 'woocommerce' ),
-				'value'	=> '-' . $this->get_discount_to_display( $tax_display )
-			);
-		}
-
-		if ( $this->get_shipping_method() ) {
-			$total_rows['shipping'] = array(
-				'label' => __( 'Shipping:', 'woocommerce' ),
-				'value'	=> $this->get_shipping_to_display( $tax_display )
-			);
-		}
-
-		if ( $fees = $this->get_fees() ) {
-			foreach ( $fees as $id => $fee ) {
-
-				if ( apply_filters( 'woocommerce_get_order_item_totals_excl_free_fees', $fee['line_total'] + $fee['line_tax'] == 0, $id ) ) {
-					continue;
-				}
-
-				if ( 'excl' == $tax_display ) {
-
-					$total_rows[ 'fee_' . $id ] = array(
-						'label' => ( $fee['name'] ? $fee['name'] : __( 'Fee', 'woocommerce' ) ) . ':',
-						'value'	=> wc_price( $fee['line_total'], array('currency' => $this->get_order_currency()) )
-					);
-
-				} else {
-
-					$total_rows[ 'fee_' . $id ] = array(
-						'label' => $fee['name'] . ':',
-						'value'	=> wc_price( $fee['line_total'] + $fee['line_tax'], array('currency' => $this->get_order_currency()) )
-					);
-				}
-			}
-		}
-
-		// Tax for tax exclusive prices.
-		if ( 'excl' === $tax_display ) {
-
-			if ( get_option( 'woocommerce_tax_total_display' ) == 'itemized' ) {
-
-				foreach ( $this->get_tax_totals() as $code => $tax ) {
-
-					$total_rows[ sanitize_title( $code ) ] = array(
-						'label' => $tax->label . ':',
-						'value'	=> $tax->formatted_amount
-					);
-				}
-
-			} else {
-
-				$total_rows['tax'] = array(
-					'label' => WC()->countries->tax_or_vat() . ':',
-					'value'	=> wc_price( $this->get_total_tax(), array( 'currency' => $this->get_order_currency() ) )
-				);
-			}
-		}
-
-		if ( $this->get_total() > 0 && $this->payment_method_title ) {
-			$total_rows['payment_method'] = array(
-				'label' => __( 'Payment Method:', 'woocommerce' ),
-				'value' => $this->payment_method_title
-			);
-		}
-
-		if ( $refunds = $this->get_refunds() ) {
-			foreach ( $refunds as $id => $refund ) {
-				$total_rows[ 'refund_' . $id ] = array(
-					'label' => $refund->get_refund_reason() ? $refund->get_refund_reason() : __( 'Refund', 'woocommerce' ) . ':',
-					'value'	=> wc_price( '-' . $refund->get_refund_amount(), array( 'currency' => $this->get_order_currency() ) )
-				);
-			}
-		}
-
-		$total_rows['order_total'] = array(
-			'label' => __( 'Total:', 'woocommerce' ),
-			'value'	=> $this->get_formatted_order_total( $tax_display )
-		);
-
-		return apply_filters( 'woocommerce_get_order_item_totals', $total_rows, $this );
+		return apply_filters( 'woocommerce_get_order_item_totals', $total_rows, $this, $tax_display );
 	}
 
+	/*
+	|--------------------------------------------------------------------------
+	| Conditionals
+	|--------------------------------------------------------------------------
+	|
+	| Checks if a condition is true or false.
+	|
+	*/
 
 	/**
-	 * Output items for display in html emails.
-	 *
-	 * @param array $args Items args.
-	 * @param null $deprecated1 Deprecated arg.
-	 * @param null $deprecated2 Deprecated arg.
-	 * @param null $deprecated3 Deprecated arg.
-	 * @param null $deprecated4 Deprecated arg.
-	 * @param null $deprecated5 Deprecated arg.
-	 * @return string
-	 */
-	public function email_order_items_table( $args = array(), $deprecated1 = null, $deprecated2 = null, $deprecated3 = null, $deprecated4 = null, $deprecated5 = null ) {
-		ob_start();
-
-		if ( ! is_null( $deprecated1 ) || ! is_null( $deprecated2 ) || ! is_null( $deprecated3 ) || ! is_null( $deprecated4 ) || ! is_null( $deprecated5 ) ) {
-			_deprecated_argument( __FUNCTION__, '2.5.0' );
-		}
-
-		$defaults = array(
-			'show_sku'   => false,
-			'show_image' => false,
-			'image_size' => array( 32, 32 ),
-			'plain_text' => false
-		);
-
-		$args     = wp_parse_args( $args, $defaults );
-		$template = $args['plain_text'] ? 'emails/plain/email-order-items.php' : 'emails/email-order-items.php';
-
-		wc_get_template( $template, array(
-			'order'               => $this,
-			'items'               => $this->get_items(),
-			'show_download_links' => $this->is_download_permitted(),
-			'show_sku'            => $args['show_sku'],
-			'show_purchase_note'  => $this->is_paid(),
-			'show_image'          => $args['show_image'],
-			'image_size'          => $args['image_size'],
-		) );
-
-		return apply_filters( 'woocommerce_email_order_items_table', ob_get_clean(), $this );
-	}
-
-	/**
-	 * Returns if an order has been paid for based on the order status.
-	 * @since 2.5.0
-	 * @return bool
-	 */
-	public function is_paid() {
-		return apply_filters( 'woocommerce_order_is_paid', $this->has_status( apply_filters( 'woocommerce_order_is_paid_statuses', array( 'processing', 'completed' ) ) ), $this );
-	}
-
-	/**
-	 * Checks if product download is permitted.
+	 * Checks the order status against a passed in status.
 	 *
 	 * @return bool
 	 */
-	public function is_download_permitted() {
-		return apply_filters( 'woocommerce_order_is_download_permitted', $this->has_status( 'completed' ) || ( get_option( 'woocommerce_downloads_grant_access_after_payment' ) == 'yes' && $this->has_status( 'processing' ) ), $this );
+	public function has_status( $status ) {
+		return apply_filters( 'woocommerce_order_has_status', ( is_array( $status ) && in_array( $this->get_status(), $status ) ) || $this->get_status() === $status ? true : false, $this, $status );
 	}
 
 	/**
-	 * Returns true if the order contains a downloadable product.
+	 * Check whether this order has a specific shipping method or not.
+	 *
+	 * @param string $method_id
 	 * @return bool
 	 */
-	public function has_downloadable_item() {
-		foreach ( $this->get_items() as $item ) {
-			$_product = $this->get_product_from_item( $item );
-
-			if ( $_product && $_product->exists() && $_product->is_downloadable() && $_product->has_file() ) {
+	public function has_shipping_method( $method_id ) {
+		foreach ( $this->get_shipping_methods() as $shipping_method ) {
+			if ( strpos( $shipping_method->get_method_id(), $method_id ) === 0 ) {
 				return true;
 			}
 		}
@@ -2010,644 +1597,10 @@ abstract class WC_Abstract_Order {
 	 */
 	public function has_free_item() {
 		foreach ( $this->get_items() as $item ) {
-			if ( ! $item['line_total'] ) {
+			if ( ! $item->get_total() ) {
 				return true;
 			}
 		}
 		return false;
 	}
-
-	/**
-	 * Generates a URL so that a customer can pay for their (unpaid - pending) order. Pass 'true' for the checkout version which doesn't offer gateway choices.
-	 *
-	 * @param  boolean $on_checkout
-	 * @return string
-	 */
-	public function get_checkout_payment_url( $on_checkout = false ) {
-
-		$pay_url = wc_get_endpoint_url( 'order-pay', $this->id, wc_get_page_permalink( 'checkout' ) );
-
-		if ( 'yes' == get_option( 'woocommerce_force_ssl_checkout' ) || is_ssl() ) {
-			$pay_url = str_replace( 'http:', 'https:', $pay_url );
-		}
-
-		if ( $on_checkout ) {
-			$pay_url = add_query_arg( 'key', $this->order_key, $pay_url );
-		} else {
-			$pay_url = add_query_arg( array( 'pay_for_order' => 'true', 'key' => $this->order_key ), $pay_url );
-		}
-
-		return apply_filters( 'woocommerce_get_checkout_payment_url', $pay_url, $this );
-	}
-
-	/**
-	 * Generates a URL for the thanks page (order received).
-	 *
-	 * @return string
-	 */
-	public function get_checkout_order_received_url() {
-
-		$order_received_url = wc_get_endpoint_url( 'order-received', $this->id, wc_get_page_permalink( 'checkout' ) );
-
-		if ( 'yes' == get_option( 'woocommerce_force_ssl_checkout' ) || is_ssl() ) {
-			$order_received_url = str_replace( 'http:', 'https:', $order_received_url );
-		}
-
-		$order_received_url = add_query_arg( 'key', $this->order_key, $order_received_url );
-
-		return apply_filters( 'woocommerce_get_checkout_order_received_url', $order_received_url, $this );
-	}
-
-	/**
-	 * Generates a URL so that a customer can cancel their (unpaid - pending) order.
-	 *
-	 * @param string $redirect
-	 *
-	 * @return string
-	 */
-	public function get_cancel_order_url( $redirect = '' ) {
-
-		// Get cancel endpoint
-		$cancel_endpoint = $this->get_cancel_endpoint();
-
-		return apply_filters( 'woocommerce_get_cancel_order_url', wp_nonce_url( add_query_arg( array(
-			'cancel_order' => 'true',
-			'order'        => $this->order_key,
-			'order_id'     => $this->id,
-			'redirect'     => $redirect
-		), $cancel_endpoint ), 'woocommerce-cancel_order' ) );
-	}
-
-	/**
-	 * Generates a raw (unescaped) cancel-order URL for use by payment gateways.
-	 *
-	 * @param string $redirect
-	 *
-	 * @return string The unescaped cancel-order URL.
-	 */
-	public function get_cancel_order_url_raw( $redirect = '' ) {
-
-		// Get cancel endpoint
-		$cancel_endpoint = $this->get_cancel_endpoint();
-
-		return apply_filters( 'woocommerce_get_cancel_order_url_raw', add_query_arg( array(
-			'cancel_order' => 'true',
-			'order'        => $this->order_key,
-			'order_id'     => $this->id,
-			'redirect'     => $redirect,
-			'_wpnonce'     => wp_create_nonce( 'woocommerce-cancel_order' )
-		), $cancel_endpoint ) );
-	}
-
-
-	/**
-	 * Helper method to return the cancel endpoint.
-	 *
-	 * @return string the cancel endpoint; either the cart page or the home page.
-	 */
-	public function get_cancel_endpoint() {
-
-		$cancel_endpoint = wc_get_page_permalink( 'cart' );
-		if ( ! $cancel_endpoint ) {
-			$cancel_endpoint = home_url();
-		}
-
-		if ( false === strpos( $cancel_endpoint, '?' ) ) {
-			$cancel_endpoint = trailingslashit( $cancel_endpoint );
-		}
-
-		return $cancel_endpoint;
-	}
-
-
-	/**
-	 * Generates a URL to view an order from the my account page.
-	 *
-	 * @return string
-	 */
-	public function get_view_order_url() {
-
-		$view_order_url = wc_get_endpoint_url( 'view-order', $this->id, wc_get_page_permalink( 'myaccount' ) );
-
-		return apply_filters( 'woocommerce_get_view_order_url', $view_order_url, $this );
-	}
-
-	/**
-	 * Get the downloadable files for an item in this order.
-	 *
-	 * @param  array $item
-	 * @return array
-	 */
-	public function get_item_downloads( $item ) {
-		global $wpdb;
-
-		$product_id   = $item['variation_id'] > 0 ? $item['variation_id'] : $item['product_id'];
-		$product      = wc_get_product( $product_id );
-		if ( ! $product ) {
-			/**
-			 * $product can be `false`. Example: checking an old order, when a product or variation has been deleted.
-			 * @see \WC_Product_Factory::get_product
-			 */
-			return array();
-		}
-		$download_ids = $wpdb->get_col( $wpdb->prepare("
-			SELECT download_id
-			FROM {$wpdb->prefix}woocommerce_downloadable_product_permissions
-			WHERE user_email = %s
-			AND order_key = %s
-			AND product_id = %s
-			ORDER BY permission_id
-		", $this->billing_email, $this->order_key, $product_id ) );
-
-		$files = array();
-
-		foreach ( $download_ids as $download_id ) {
-
-			if ( $product->has_file( $download_id ) ) {
-				$files[ $download_id ]                 = $product->get_file( $download_id );
-				$files[ $download_id ]['download_url'] = $this->get_download_url( $product_id, $download_id );
-			}
-		}
-
-		return apply_filters( 'woocommerce_get_item_downloads', $files, $item, $this );
-	}
-
-	/**
-	 * Display download links for an order item.
-	 * @param  array $item
-	 */
-	public function display_item_downloads( $item ) {
-		$product = $this->get_product_from_item( $item );
-
-		if ( $product && $product->exists() && $product->is_downloadable() && $this->is_download_permitted() ) {
-			$download_files = $this->get_item_downloads( $item );
-			$i              = 0;
-			$links          = array();
-
-			foreach ( $download_files as $download_id => $file ) {
-				$i++;
-				$prefix  = count( $download_files ) > 1 ? sprintf( __( 'Download %d', 'woocommerce' ), $i ) : __( 'Download', 'woocommerce' );
-				$links[] = '<small class="download-url">' . $prefix . ': <a href="' . esc_url( $file['download_url'] ) . '" target="_blank">' . esc_html( $file['name'] ) . '</a></small>' . "\n";
-			}
-
-			echo '<br/>' . implode( '<br/>', $links );
-		}
-	}
-
-	/**
-	 * Get the Download URL.
-	 *
-	 * @param  int $product_id
-	 * @param  int $download_id
-	 * @return string
-	 */
-	public function get_download_url( $product_id, $download_id ) {
-		return add_query_arg( array(
-			'download_file' => $product_id,
-			'order'         => $this->order_key,
-			'email'         => urlencode( $this->billing_email ),
-			'key'           => $download_id
-		), trailingslashit( home_url() ) );
-	}
-
-	/**
-	 * Adds a note (comment) to the order.
-	 *
-	 * @param string $note Note to add.
-	 * @param int $is_customer_note (default: 0) Is this a note for the customer?
-	 * @param  bool added_by_user Was the note added by a user?
-	 * @return int Comment ID.
-	 */
-	public function add_order_note( $note, $is_customer_note = 0, $added_by_user = false ) {
-		if ( is_user_logged_in() && current_user_can( 'edit_shop_order', $this->id ) && $added_by_user ) {
-			$user                 = get_user_by( 'id', get_current_user_id() );
-			$comment_author       = $user->display_name;
-			$comment_author_email = $user->user_email;
-		} else {
-			$comment_author       = __( 'WooCommerce', 'woocommerce' );
-			$comment_author_email = strtolower( __( 'WooCommerce', 'woocommerce' ) ) . '@';
-			$comment_author_email .= isset( $_SERVER['HTTP_HOST'] ) ? str_replace( 'www.', '', $_SERVER['HTTP_HOST'] ) : 'noreply.com';
-			$comment_author_email = sanitize_email( $comment_author_email );
-		}
-
-		$comment_post_ID        = $this->id;
-		$comment_author_url     = '';
-		$comment_content        = $note;
-		$comment_agent          = 'WooCommerce';
-		$comment_type           = 'order_note';
-		$comment_parent         = 0;
-		$comment_approved       = 1;
-		$commentdata            = apply_filters( 'woocommerce_new_order_note_data', compact( 'comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_agent', 'comment_type', 'comment_parent', 'comment_approved' ), array( 'order_id' => $this->id, 'is_customer_note' => $is_customer_note ) );
-
-		$comment_id = wp_insert_comment( $commentdata );
-
-		if ( $is_customer_note ) {
-			add_comment_meta( $comment_id, 'is_customer_note', 1 );
-
-			do_action( 'woocommerce_new_customer_note', array( 'order_id' => $this->id, 'customer_note' => $commentdata['comment_content'] ) );
-		}
-
-		return $comment_id;
-	}
-
-	/**
-	 * Updates status of order.
-	 *
-	 * @param string $new_status Status to change the order to. No internal wc- prefix is required.
-	 * @param string $note (default: '') Optional note to add.
-	 * @param bool $manual is this a manual order status change?
-	 * @return bool Successful change or not
-	 */
-	public function update_status( $new_status, $note = '', $manual = false ) {
-		if ( ! $this->id ) {
-			return false;
-		}
-
-		// Standardise status names.
-		$new_status = 'wc-' === substr( $new_status, 0, 3 ) ? substr( $new_status, 3 ) : $new_status;
-		$old_status = $this->get_status();
-
-		// If the statuses are the same there is no need to update, unless the post status is not a valid 'wc' status.
-		if ( $new_status === $old_status && in_array( $this->post_status, array_keys( wc_get_order_statuses() ) ) ) {
-			return false;
-		}
-
-		// Update the order.
-		wp_update_post( array( 'ID' => $this->id, 'post_status' => 'wc-' . $new_status ) );
-		$this->post_status = 'wc-' . $new_status;
-
-		$this->add_order_note( trim( $note . ' ' . sprintf( __( 'Order status changed from %s to %s.', 'woocommerce' ), wc_get_order_status_name( $old_status ), wc_get_order_status_name( $new_status ) ) ), 0, $manual );
-
-		// Status was changed.
-		do_action( 'woocommerce_order_status_' . $new_status, $this->id );
-		do_action( 'woocommerce_order_status_' . $old_status . '_to_' . $new_status, $this->id );
-		do_action( 'woocommerce_order_status_changed', $this->id, $old_status, $new_status );
-
-		switch ( $new_status ) {
-
-			case 'completed' :
-				// Record the sales.
-				$this->record_product_sales();
-
-				// Increase coupon usage counts.
-				$this->increase_coupon_usage_counts();
-
-				// Record the completed date of the order.
-				update_post_meta( $this->id, '_completed_date', current_time('mysql') );
-
-				// Update reports.
-				wc_delete_shop_order_transients( $this->id );
-				break;
-
-			case 'processing' :
-			case 'on-hold' :
-				// Record the sales.
-				$this->record_product_sales();
-
-				// Increase coupon usage counts.
-				$this->increase_coupon_usage_counts();
-
-				// Update reports.
-				wc_delete_shop_order_transients( $this->id );
-				break;
-
-			case 'cancelled' :
-				// If the order is cancelled, restore used coupons.
-				$this->decrease_coupon_usage_counts();
-
-				// Update reports.
-				wc_delete_shop_order_transients( $this->id );
-				break;
-		}
-
-		return true;
-	}
-
-
-	/**
-	 * Cancel the order and restore the cart (before payment).
-	 *
-	 * @param string $note (default: '') Optional note to add.
-	 */
-	public function cancel_order( $note = '' ) {
-		WC()->session->set( 'order_awaiting_payment', false );
-		$this->update_status( 'cancelled', $note );
-	}
-
-	/**
-	 * When a payment is complete this function is called.
-	 *
-	 * Most of the time this should mark an order as 'processing' so that admin can process/post the items.
-	 * If the cart contains only downloadable items then the order is 'completed' since the admin needs to take no action.
-	 * Stock levels are reduced at this point.
-	 * Sales are also recorded for products.
-	 * Finally, record the date of payment.
-	 *
-	 * @param $transaction_id string Optional transaction id to store in post meta.
-	 */
-	public function payment_complete( $transaction_id = '' ) {
-		do_action( 'woocommerce_pre_payment_complete', $this->id );
-
-		if ( null !== WC()->session ) {
-			WC()->session->set( 'order_awaiting_payment', false );
-		}
-
-		$valid_order_statuses = apply_filters( 'woocommerce_valid_order_statuses_for_payment_complete', array( 'on-hold', 'pending', 'failed', 'cancelled' ), $this );
-
-		if ( $this->id && $this->has_status( $valid_order_statuses ) ) {
-			$order_needs_processing = false;
-
-			if ( sizeof( $this->get_items() ) > 0 ) {
-				foreach ( $this->get_items() as $item ) {
-					if ( $_product = $this->get_product_from_item( $item ) ) {
-						$virtual_downloadable_item = $_product->is_downloadable() && $_product->is_virtual();
-
-						if ( apply_filters( 'woocommerce_order_item_needs_processing', ! $virtual_downloadable_item, $_product, $this->id ) ) {
-							$order_needs_processing = true;
-							break;
-						}
-					}
-				}
-			}
-
-			$this->update_status( apply_filters( 'woocommerce_payment_complete_order_status', $order_needs_processing ? 'processing' : 'completed', $this->id ) );
-
-			add_post_meta( $this->id, '_paid_date', current_time( 'mysql' ), true );
-
-			if ( ! empty( $transaction_id ) ) {
-				add_post_meta( $this->id, '_transaction_id', $transaction_id, true );
-			}
-
-			wp_update_post( array(
-				'ID'            => $this->id,
-				'post_date'     => current_time( 'mysql', 0 ),
-				'post_date_gmt' => current_time( 'mysql', 1 )
-			) );
-
-			// Payment is complete so reduce stock levels
-			if ( apply_filters( 'woocommerce_payment_complete_reduce_order_stock', ! get_post_meta( $this->id, '_order_stock_reduced', true ), $this->id ) ) {
-				$this->reduce_order_stock();
-			}
-
-			do_action( 'woocommerce_payment_complete', $this->id );
-		} else {
-			do_action( 'woocommerce_payment_complete_order_status_' . $this->get_status(), $this->id );
-		}
-	}
-
-
-	/**
-	 * Record sales.
-	 */
-	public function record_product_sales() {
-		if ( 'yes' === get_post_meta( $this->id, '_recorded_sales', true ) ) {
-			return;
-		}
-
-		if ( sizeof( $this->get_items() ) > 0 ) {
-
-			foreach ( $this->get_items() as $item ) {
-
-				if ( $item['product_id'] > 0 ) {
-					$sales = (int) get_post_meta( $item['product_id'], 'total_sales', true );
-					$sales += (int) $item['qty'];
-
-					if ( $sales ) {
-						update_post_meta( $item['product_id'], 'total_sales', $sales );
-					}
-				}
-			}
-		}
-
-		update_post_meta( $this->id, '_recorded_sales', 'yes' );
-
-		/**
-		 * Called when sales for an order are recorded
-		 *
-		 * @param int $order_id order id
-		 */
-		do_action( 'woocommerce_recorded_sales', $this->id );
-	}
-
-
-	/**
-	 * Get coupon codes only.
-	 *
-	 * @return array
-	 */
-	public function get_used_coupons() {
-
-		$codes   = array();
-		$coupons = $this->get_items( 'coupon' );
-
-		foreach ( $coupons as $item_id => $item ) {
-			$codes[] = trim( $item['name'] );
-		}
-
-		return $codes;
-	}
-
-
-	/**
-	 * Increase applied coupon counts.
-	 */
-	public function increase_coupon_usage_counts() {
-		if ( 'yes' == get_post_meta( $this->id, '_recorded_coupon_usage_counts', true ) ) {
-			return;
-		}
-
-		if ( sizeof( $this->get_used_coupons() ) > 0 ) {
-
-			foreach ( $this->get_used_coupons() as $code ) {
-				if ( ! $code ) {
-					continue;
-				}
-
-				$coupon = new WC_Coupon( $code );
-
-				$used_by = $this->get_user_id();
-
-				if ( ! $used_by ) {
-					$used_by = $this->billing_email;
-				}
-
-				$coupon->inc_usage_count( $used_by );
-			}
-
-			update_post_meta( $this->id, '_recorded_coupon_usage_counts', 'yes' );
-		}
-	}
-
-
-	/**
-	 * Decrease applied coupon counts.
-	 */
-	public function decrease_coupon_usage_counts() {
-
-		if ( 'yes' != get_post_meta( $this->id, '_recorded_coupon_usage_counts', true ) ) {
-			return;
-		}
-
-		if ( sizeof( $this->get_used_coupons() ) > 0 ) {
-
-			foreach ( $this->get_used_coupons() as $code ) {
-
-				if ( ! $code ) {
-					continue;
-				}
-
-				$coupon = new WC_Coupon( $code );
-
-				$used_by = $this->get_user_id();
-				if ( ! $used_by ) {
-					$used_by = $this->billing_email;
-				}
-
-				$coupon->dcr_usage_count( $used_by );
-			}
-
-			delete_post_meta( $this->id, '_recorded_coupon_usage_counts' );
-		}
-	}
-
-	/**
-	 * Reduce stock levels for all line items in the order.
-	 * Runs if stock management is enabled, but can be disabled on per-order basis by extensions @since 2.4.0 via woocommerce_can_reduce_order_stock hook.
-	 */
-	public function reduce_order_stock() {
-		if ( 'yes' === get_option( 'woocommerce_manage_stock' ) && apply_filters( 'woocommerce_can_reduce_order_stock', true, $this ) && sizeof( $this->get_items() ) > 0 ) {
-			foreach ( $this->get_items() as $item ) {
-				if ( $item['product_id'] > 0 ) {
-					$_product = $this->get_product_from_item( $item );
-
-					if ( $_product && $_product->exists() && $_product->managing_stock() ) {
-						$qty       = apply_filters( 'woocommerce_order_item_quantity', $item['qty'], $this, $item );
-						$new_stock = $_product->reduce_stock( $qty );
-						$item_name = $_product->get_sku() ? $_product->get_sku(): $item['product_id'];
-
-						if ( isset( $item['variation_id'] ) && $item['variation_id'] ) {
-							$this->add_order_note( sprintf( __( 'Item %s variation #%s stock reduced from %s to %s.', 'woocommerce' ), $item_name, $item['variation_id'], $new_stock + $qty, $new_stock) );
-						} else {
-							$this->add_order_note( sprintf( __( 'Item %s stock reduced from %s to %s.', 'woocommerce' ), $item_name, $new_stock + $qty, $new_stock) );
-						}
-						$this->send_stock_notifications( $_product, $new_stock, $item['qty'] );
-					}
-				}
-			}
-
-			add_post_meta( $this->id, '_order_stock_reduced', '1', true );
-
-			do_action( 'woocommerce_reduce_order_stock', $this );
-		}
-	}
-
-	/**
-	 * Send the stock notifications.
-	 *
-	 * @param WC_Product $product
-	 * @param int $new_stock
-	 * @param int $qty_ordered
-	 */
-	public function send_stock_notifications( $product, $new_stock, $qty_ordered ) {
-
-		// Backorders
-		if ( $new_stock < 0 ) {
-			do_action( 'woocommerce_product_on_backorder', array( 'product' => $product, 'order_id' => $this->id, 'quantity' => $qty_ordered ) );
-		}
-
-		// stock status notifications
-		$notification_sent = false;
-
-		if ( 'yes' == get_option( 'woocommerce_notify_no_stock' ) && get_option( 'woocommerce_notify_no_stock_amount' ) >= $new_stock ) {
-			do_action( 'woocommerce_no_stock', $product );
-			$notification_sent = true;
-		}
-
-		if ( ! $notification_sent && 'yes' == get_option( 'woocommerce_notify_low_stock' ) && get_option( 'woocommerce_notify_low_stock_amount' ) >= $new_stock ) {
-			do_action( 'woocommerce_low_stock', $product );
-		}
-
-		do_action( 'woocommerce_after_send_stock_notifications', $product, $new_stock, $qty_ordered );
-	}
-
-
-	/**
-	 * List order notes (public) for the customer.
-	 *
-	 * @return array
-	 */
-	public function get_customer_order_notes() {
-		$notes = array();
-		$args  = array(
-			'post_id' => $this->id,
-			'approve' => 'approve',
-			'type'    => ''
-		);
-
-		remove_filter( 'comments_clauses', array( 'WC_Comments', 'exclude_order_comments' ) );
-
-		$comments = get_comments( $args );
-
-		foreach ( $comments as $comment ) {
-			if ( ! get_comment_meta( $comment->comment_ID, 'is_customer_note', true ) ) {
-				continue;
-			}
-			$comment->comment_content = make_clickable( $comment->comment_content );
-			$notes[] = $comment;
-		}
-
-		add_filter( 'comments_clauses', array( 'WC_Comments', 'exclude_order_comments' ) );
-
-		return $notes;
-	}
-
-	/**
-	 * Checks if an order needs payment, based on status and order total.
-	 *
-	 * @return bool
-	 */
-	public function needs_payment() {
-
-		$valid_order_statuses = apply_filters( 'woocommerce_valid_order_statuses_for_payment', array( 'pending', 'failed' ), $this );
-
-		if ( $this->has_status( $valid_order_statuses ) && $this->get_total() > 0 ) {
-			$needs_payment = true;
-		} else {
-			$needs_payment = false;
-		}
-
-		return apply_filters( 'woocommerce_order_needs_payment', $needs_payment, $this, $valid_order_statuses );
-	}
-
-	/**
-	 * Checks if an order needs display the shipping address, based on shipping method.
-	 *
-	 * @return boolean
-	 */
-	public function needs_shipping_address() {
-		if ( 'no' === get_option( 'woocommerce_calc_shipping' ) ) {
-			return false;
-		}
-
-		$hide  = apply_filters( 'woocommerce_order_hide_shipping_address', array( 'local_pickup' ), $this );
-		$needs_address = false;
-
-		foreach ( $this->get_shipping_methods() as $shipping_method ) {
-			if ( ! in_array( $shipping_method['method_id'], $hide ) ) {
-				$needs_address = true;
-				break;
-			}
-		}
-
-		return apply_filters( 'woocommerce_order_needs_shipping_address', $needs_address, $hide, $this );
-	}
-
-	/**
-	 * Checks if an order can be edited, specifically for use on the Edit Order screen.
-	 *
-	 * @return bool
-	 */
-	public function is_editable() {
-		return apply_filters( 'wc_order_is_editable', in_array( $this->get_status(), array( 'pending', 'on-hold', 'auto-draft' ) ), $this );
-	}
 }
diff --git a/includes/abstracts/abstract-wc-payment-gateway.php b/includes/abstracts/abstract-wc-payment-gateway.php
index 6b706977410..77221aefcb2 100644
--- a/includes/abstracts/abstract-wc-payment-gateway.php
+++ b/includes/abstracts/abstract-wc-payment-gateway.php
@@ -25,17 +25,41 @@ abstract class WC_Payment_Gateway extends WC_Settings_API {
 	public $order_button_text;
 
 	/**
-	 * Payment method title.
+	 * yes or no based on whether the method is enabled.
+	 * @var string
+	 */
+	public $enabled = 'yes';
+
+	/**
+	 * Payment method title for the frontend.
 	 * @var string
 	 */
 	public $title;
 
+	/**
+	 * Payment method description for the frontend.
+	 * @var string
+	 */
+	public $description;
+
 	/**
 	 * Chosen payment method id.
 	 * @var bool
 	 */
 	public $chosen;
 
+	/**
+	 * Gateway title.
+	 * @var string
+	 */
+	public $method_title = '';
+
+	/**
+	 * Gateway description.
+	 * @var string
+	 */
+	public $method_description = '';
+
 	/**
 	 * True if the gateway shows fields on the checkout.
 	 * @var bool
@@ -60,12 +84,6 @@ abstract class WC_Payment_Gateway extends WC_Settings_API {
 	 */
 	public $icon;
 
-	/**
-	 * Description for the gateway.
-	 * @var string
-	 */
-	public $description;
-
 	/**
 	 * Supported features such as 'default_credit_card_form', 'refunds'.
 	 * @var array
@@ -84,6 +102,69 @@ abstract class WC_Payment_Gateway extends WC_Settings_API {
 	 */
 	public $view_transaction_url = '';
 
+	/**
+	 * Optional label to show for "new payment method" in the payment
+	 * method/token selection radio selection.
+	 * @var string
+	 */
+	public $new_method_label = '';
+
+	/**
+	 * Contains a users saved tokens for this gateway.
+	 * @var array
+	 */
+	protected $tokens = array();
+
+	/**
+	 * Returns a users saved tokens for this gateway.
+	 * @since 2.6.0
+	 * @return array
+	 */
+	public function get_tokens() {
+		if ( sizeof( $this->tokens ) > 0 ) {
+			return $this->tokens;
+		}
+
+		if ( is_user_logged_in() && $this->supports( 'tokenization' ) ) {
+			$this->tokens = WC_Payment_Tokens::get_customer_tokens( get_current_user_id(), $this->id );
+		}
+
+		return $this->tokens;
+	}
+
+	/**
+	 * Return the title for admin screens.
+	 * @return string
+	 */
+	public function get_method_title() {
+		return apply_filters( 'woocommerce_gateway_method_title', $this->method_title, $this );
+	}
+
+	/**
+	 * Return the description for admin screens.
+	 * @return string
+	 */
+	public function get_method_description() {
+		return apply_filters( 'woocommerce_gateway_method_description', $this->method_description, $this );
+	}
+
+	/**
+	 * Output the gateway settings screen.
+	 */
+	public function admin_options() {
+		echo '<h2>' . esc_html( $this->get_method_title() ) . '</h2>';
+		echo wp_kses_post( wpautop( $this->get_method_description() ) );
+		parent::admin_options();
+	}
+
+	/**
+	 * Init settings for gateways.
+	 */
+	public function init_settings() {
+		parent::init_settings();
+		$this->enabled  = ! empty( $this->settings['enabled'] ) && 'yes' === $this->settings['enabled'] ? 'yes' : 'no';
+	}
+
 	/**
 	 * Get the return url (thank you page).
 	 *
@@ -91,14 +172,13 @@ abstract class WC_Payment_Gateway extends WC_Settings_API {
 	 * @return string
 	 */
 	public function get_return_url( $order = null ) {
-
 		if ( $order ) {
 			$return_url = $order->get_checkout_order_received_url();
 		} else {
 			$return_url = wc_get_endpoint_url( 'order-received', '', wc_get_page_permalink( 'checkout' ) );
 		}
 
-		if ( is_ssl() || get_option('woocommerce_force_ssl_checkout') == 'yes' ) {
+		if ( is_ssl() || get_option( 'woocommerce_force_ssl_checkout' ) == 'yes' ) {
 			$return_url = str_replace( 'http:', 'https:', $return_url );
 		}
 
@@ -152,8 +232,7 @@ abstract class WC_Payment_Gateway extends WC_Settings_API {
 	 * @return bool
 	 */
 	public function is_available() {
-
-		$is_available = ( 'yes' === $this->enabled ) ? true : false;
+		$is_available = ( 'yes' === $this->enabled );
 
 		if ( WC()->cart && 0 < $this->get_order_total() && 0 < $this->max_amount && $this->max_amount < $this->get_order_total() ) {
 			$is_available = false;
@@ -163,7 +242,7 @@ abstract class WC_Payment_Gateway extends WC_Settings_API {
 	}
 
 	/**
-	 * has_fields function.
+	 * Check if the gateway has fields on the checkout.
 	 *
 	 * @return bool
 	 */
@@ -190,7 +269,7 @@ abstract class WC_Payment_Gateway extends WC_Settings_API {
 	}
 
 	/**
-	 * get_icon function.
+	 * Return the gateway's icon.
 	 *
 	 * @return string
 	 */
@@ -237,7 +316,7 @@ abstract class WC_Payment_Gateway extends WC_Settings_API {
 	 * @param  int $order_id
 	 * @param  float $amount
 	 * @param  string $reason
-	 * @return bool|WP_Error True or false based on success, or a WP_Error object.
+	 * @return boolean True or false based on success, or a WP_Error object.
 	 */
 	public function process_refund( $order_id, $amount = null, $reason = '' ) {
 		return false;
@@ -247,6 +326,8 @@ abstract class WC_Payment_Gateway extends WC_Settings_API {
 	 * Validate frontend fields.
 	 *
 	 * Validate payment fields on the frontend.
+	 *
+	 * @return bool
 	 */
 	public function validate_fields() { return true; }
 
@@ -255,13 +336,12 @@ abstract class WC_Payment_Gateway extends WC_Settings_API {
 	 * Override this in your gateway if you have some.
 	 */
 	public function payment_fields() {
-
 		if ( $description = $this->get_description() ) {
 			echo wpautop( wptexturize( $description ) );
 		}
 
 		if ( $this->supports( 'default_credit_card_form' ) ) {
-			$this->credit_card_form();
+			$this->credit_card_form(); // Deprecated, will be removed in a future version.
 		}
 	}
 
@@ -280,47 +360,100 @@ abstract class WC_Payment_Gateway extends WC_Settings_API {
 	}
 
 	/**
-	 * Core credit card form which gateways can used if needed.
-	 *
+	 * Core credit card form which gateways can used if needed. Deprecated - inheirt WC_Payment_Gateway_CC instead.
 	 * @param  array $args
+	 * @param  array $fields
 	 */
 	public function credit_card_form( $args = array(), $fields = array() ) {
+		wc_deprecated_function( 'credit_card_form', '2.6', 'WC_Payment_Gateway_CC->form' );
+		$cc_form = new WC_Payment_Gateway_CC;
+		$cc_form->id       = $this->id;
+		$cc_form->supports = $this->supports;
+		$cc_form->form();
+	}
 
-		wp_enqueue_script( 'wc-credit-card-form' );
+	/**
+	 * Enqueues our tokenization script to handle some of the new form options.
+	 * @since 2.6.0
+	 */
+	public function tokenization_script() {
+		wp_enqueue_script(
+			'woocommerce-tokenization-form',
+			plugins_url( '/assets/js/frontend/tokenization-form' . ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min' ) . '.js', WC_PLUGIN_FILE ),
+			array( 'jquery' ),
+			WC()->version
+		);
+	}
 
-		$default_args = array(
-			'fields_have_names' => true, // Some gateways like stripe don't need names as the form is tokenized.
+	/**
+	 * Grab and display our saved payment methods.
+	 * @since 2.6.0
+	 */
+	public function saved_payment_methods() {
+		$html = '<ul class="woocommerce-SavedPaymentMethods wc-saved-payment-methods" data-count="' . esc_attr( count( $this->get_tokens() ) ) . '">';
+
+		foreach ( $this->get_tokens() as $token ) {
+			$html .= $this->get_saved_payment_method_option_html( $token );
+		}
+
+		$html .= $this->get_new_payment_method_option_html();
+		$html .= '</ul>';
+
+		echo apply_filters( 'wc_payment_gateway_form_saved_payment_methods_html', $html, $this );
+	}
+
+	/**
+	 * Gets saved payment method HTML from a token.
+	 * @since 2.6.0
+	 * @param  WC_Payment_Token $token Payment Token
+	 * @return string                  Generated payment method HTML
+	 */
+	public function get_saved_payment_method_option_html( $token ) {
+		$html = sprintf(
+			'<li class="woocommerce-SavedPaymentMethods-token">
+				<input id="wc-%1$s-payment-token-%2$s" type="radio" name="wc-%1$s-payment-token" value="%2$s" style="width:auto;" class="woocommerce-SavedPaymentMethods-tokenInput" %4$s />
+				<label for="wc-%1$s-payment-token-%2$s">%3$s</label>
+			</li>',
+			esc_attr( $this->id ),
+			esc_attr( $token->get_id() ),
+			esc_html( $token->get_display_name() ),
+			checked( $token->is_default(), true, false )
 		);
 
-		$args = wp_parse_args( $args, apply_filters( 'woocommerce_credit_card_form_args', $default_args, $this->id ) );
+		return apply_filters( 'woocommerce_payment_gateway_get_saved_payment_method_option_html', $html, $token, $this );
+	}
 
-		$default_fields = array(
-			'card-number-field' => '<p class="form-row form-row-wide">
-				<label for="' . esc_attr( $this->id ) . '-card-number">' . __( 'Card Number', 'woocommerce' ) . ' <span class="required">*</span></label>
-				<input id="' . esc_attr( $this->id ) . '-card-number" class="input-text wc-credit-card-form-card-number" type="text" maxlength="20" autocomplete="off" placeholder="•••• •••• •••• ••••" name="' . ( $args['fields_have_names'] ? $this->id . '-card-number' : '' ) . '" />
-			</p>',
-			'card-expiry-field' => '<p class="form-row form-row-first">
-				<label for="' . esc_attr( $this->id ) . '-card-expiry">' . __( 'Expiry (MM/YY)', 'woocommerce' ) . ' <span class="required">*</span></label>
-				<input id="' . esc_attr( $this->id ) . '-card-expiry" class="input-text wc-credit-card-form-card-expiry" type="text" autocomplete="off" placeholder="' . esc_attr__( 'MM / YY', 'woocommerce' ) . '" name="' . ( $args['fields_have_names'] ? $this->id . '-card-expiry' : '' ) . '" />
-			</p>',
-			'card-cvc-field' => '<p class="form-row form-row-last">
-				<label for="' . esc_attr( $this->id ) . '-card-cvc">' . __( 'Card Code', 'woocommerce' ) . ' <span class="required">*</span></label>
-				<input id="' . esc_attr( $this->id ) . '-card-cvc" class="input-text wc-credit-card-form-card-cvc" type="text" autocomplete="off" placeholder="' . esc_attr__( 'CVC', 'woocommerce' ) . '" name="' . ( $args['fields_have_names'] ? $this->id . '-card-cvc' : '' ) . '" />
-			</p>'
+	/**
+	 * Displays a radio button for entering a new payment method (new CC details) instead of using a saved method.
+	 * Only displayed when a gateway supports tokenization.
+	 * @since 2.6.0
+	 */
+	public function get_new_payment_method_option_html() {
+		$label = apply_filters( 'woocommerce_payment_gateway_get_new_payment_method_option_html_label', $this->new_method_label ? $this->new_method_label : __( 'Use a new payment method', 'woocommerce' ), $this );
+		$html  = sprintf(
+			'<li class="woocommerce-SavedPaymentMethods-new">
+				<input id="wc-%1$s-payment-token-new" type="radio" name="wc-%1$s-payment-token" value="new" style="width:auto;" class="woocommerce-SavedPaymentMethods-tokenInput" />
+				<label for="wc-%1$s-payment-token-new">%2$s</label>
+			</li>',
+			esc_attr( $this->id ),
+			esc_html( $label )
 		);
 
-		$fields = wp_parse_args( $fields, apply_filters( 'woocommerce_credit_card_form_fields', $default_fields, $this->id ) );
-		?>
-		<fieldset id="<?php echo $this->id; ?>-cc-form">
-			<?php do_action( 'woocommerce_credit_card_form_start', $this->id ); ?>
-			<?php
-				foreach ( $fields as $field ) {
-					echo $field;
-				}
-			?>
-			<?php do_action( 'woocommerce_credit_card_form_end', $this->id ); ?>
-			<div class="clear"></div>
-		</fieldset>
-		<?php
+		return apply_filters( 'woocommerce_payment_gateway_get_new_payment_method_option_html', $html, $this );
+	}
+
+	/**
+	 * Outputs a checkbox for saving a new payment method to the database.
+	 * @since 2.6.0
+	 */
+	public function save_payment_method_checkbox() {
+		printf(
+			'<p class="form-row woocommerce-SavedPaymentMethods-saveNew">
+				<input id="wc-%1$s-new-payment-method" name="wc-%1$s-new-payment-method" type="checkbox" value="true" style="width:auto;" />
+				<label for="wc-%1$s-new-payment-method" style="display:inline;">%2$s</label>
+			</p>',
+			esc_attr( $this->id ),
+			esc_html__( 'Save to account', 'woocommerce' )
+		);
 	}
 }
diff --git a/includes/abstracts/abstract-wc-payment-token.php b/includes/abstracts/abstract-wc-payment-token.php
new file mode 100644
index 00000000000..d419aee935b
--- /dev/null
+++ b/includes/abstracts/abstract-wc-payment-token.php
@@ -0,0 +1,221 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+include_once( WC_ABSPATH . 'includes/legacy/abstract-wc-legacy-payment-token.php' );
+
+/**
+ * WooCommerce Payment Token.
+ *
+ * Representation of a general payment token to be extended by individuals types of tokens
+ * examples: Credit Card, eCheck.
+ *
+ * @class 		WC_Payment_Token
+ * @version     3.0.0
+ * @since		2.6.0
+ * @package		WooCommerce/Abstracts
+ * @category	Abstract Class
+ * @author		WooThemes
+ */
+ abstract class WC_Payment_Token extends WC_Legacy_Payment_Token {
+
+	/**
+	 * Token Data (stored in the payment_tokens table).
+	 * @var array
+	 */
+	protected $data = array(
+		 'gateway_id' => '',
+		 'token'      => '',
+		 'is_default' => false,
+		 'user_id'    => 0,
+		 'type'       => '',
+	);
+
+	/**
+	 * Token Type (CC, eCheck, or a custom type added by an extension).
+	 * Set by child classes.
+	 */
+	protected $type = '';
+
+	/**
+	 * Initialize a payment token.
+	 *
+	 * These fields are accepted by all payment tokens:
+	 * is_default   - boolean Optional - Indicates this is the default payment token for a user
+	 * token        - string  Required - The actual token to store
+	 * gateway_id   - string  Required - Identifier for the gateway this token is associated with
+	 * user_id      - int     Optional - ID for the user this token is associated with. 0 if this token is not associated with a user
+	 *
+	 * @since 2.6.0
+	 * @param mixed $token
+	 */
+	public function __construct( $token = '' ) {
+		parent::__construct( $token );
+
+		if ( is_numeric( $token ) ) {
+			$this->set_id( $token );
+		} elseif ( is_object( $token ) ) {
+			$token_id = $token->get_id();
+			if ( ! empty( $token_id ) ) {
+				$this->set_id( $token->get_id() );
+			}
+		} else {
+			$this->set_object_read( true );
+		}
+
+		$this->data_store = WC_Data_Store::load( 'payment-token' );
+		if ( $this->get_id() > 0 ) {
+			$this->data_store->read( $this );
+		}
+	}
+
+	/*
+	 |--------------------------------------------------------------------------
+	 | Getters
+	 |--------------------------------------------------------------------------
+	 */
+
+	/**
+	 * Returns the raw payment token.
+	 *
+	 * @since  2.6.0
+	 * @param  string $context
+	 * @return string Raw token
+	 */
+	public function get_token( $context = 'view' ) {
+		return $this->get_prop( 'token', $context );
+	}
+
+	/**
+	 * Returns the type of this payment token (CC, eCheck, or something else).
+	 * Overwritten by child classes.
+	 *
+	 * @since  2.6.0
+	 * @param  string $deprecated Deprecated since WooCommerce 3.0
+	 * @return string Payment Token Type (CC, eCheck)
+	 */
+	public function get_type( $deprecated = '' ) {
+		return $this->type;
+	}
+
+	/**
+	 * Get type to display to user.
+	 * Get's overwritten by child classes.
+	 *
+	 * @since  2.6.0
+	 * @param  string $deprecated Deprecated since WooCommerce 3.0
+	 * @return string
+	 */
+	public function get_display_name( $deprecated = '' ) {
+		return $this->get_type();
+	}
+
+	/**
+	 * Returns the user ID associated with the token or false if this token is not associated.
+	 *
+	 * @since 2.6.0
+	 * @param  string $context
+	 * @return int User ID if this token is associated with a user or 0 if no user is associated
+	 */
+	public function get_user_id( $context = 'view' ) {
+		return $this->get_prop( 'user_id', $context );
+	}
+
+	/**
+	 * Returns the ID of the gateway associated with this payment token.
+	 *
+	 * @since 2.6.0
+	 * @param  string $context
+	 * @return string Gateway ID
+	 */
+	public function get_gateway_id( $context = 'view' ) {
+		return $this->get_prop( 'gateway_id', $context );
+	}
+
+	/**
+	 * Returns the ID of the gateway associated with this payment token.
+	 *
+	 * @since 2.6.0
+	 * @param  string $context
+	 * @return string Gateway ID
+	 */
+	public function get_is_default( $context = 'view' ) {
+		return $this->get_prop( 'is_default', $context );
+	}
+
+	/*
+	 |--------------------------------------------------------------------------
+	 | Setters
+	 |--------------------------------------------------------------------------
+	 */
+
+	/**
+	 * Set the raw payment token.
+	 *
+	 * @since 2.6.0
+	 * @param string $token
+	 */
+	public function set_token( $token ) {
+		$this->set_prop( 'token', $token );
+	}
+
+	/**
+	 * Set the user ID for the user associated with this order.
+	 *
+	 * @since 2.6.0
+	 * @param int $user_id
+	 */
+	public function set_user_id( $user_id ) {
+		$this->set_prop( 'user_id', absint( $user_id ) );
+	}
+
+	/**
+	 * Set the gateway ID.
+	 *
+	 * @since 2.6.0
+	 * @param string $gateway_id
+	 */
+	public function set_gateway_id( $gateway_id ) {
+		$this->set_prop( 'gateway_id', $gateway_id );
+	}
+
+	/**
+	 * Marks the payment as default or non-default.
+	 * @since 2.6.0
+	 * @param boolean $is_default True or false
+	 */
+	public function set_default( $is_default ) {
+		$this->set_prop( 'is_default', (bool) $is_default );
+	}
+
+	/*
+	 |--------------------------------------------------------------------------
+	 | Other Methods
+	 |--------------------------------------------------------------------------
+	 */
+
+	/**
+	 * Returns if the token is marked as default.
+	 *
+	 * @since 2.6.0
+	 * @return boolean True if the token is default
+	 */
+	public function is_default() {
+		return (bool) $this->get_prop( 'is_default', 'view' );
+	}
+
+	/**
+	 * Validate basic token info (token and type are required).
+	 * @since 2.6.0
+	 * @return boolean True if the passed data is valid
+	 */
+	public function validate() {
+		$token = $this->get_prop( 'token', 'edit' );
+		if ( empty( $token ) ) {
+			return false;
+		}
+		return true;
+	}
+
+}
diff --git a/includes/abstracts/abstract-wc-product.php b/includes/abstracts/abstract-wc-product.php
index 1d60caf42af..0a40c8727ba 100644
--- a/includes/abstracts/abstract-wc-product.php
+++ b/includes/abstracts/abstract-wc-product.php
@@ -1,158 +1,1310 @@
 <?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Legacy product contains all deprecated methods for this class and can be
+ * removed in the future.
+ */
+include_once( WC_ABSPATH . 'includes/legacy/abstract-wc-legacy-product.php' );
+
 /**
  * Abstract Product Class
  *
  * The WooCommerce product class handles individual product data.
  *
- * @class       WC_Product
- * @var         WP_Post
- * @version     2.1.0
- * @package     WooCommerce/Abstracts
- * @category    Abstract Class
- * @author      WooThemes
- *
- * @property    string $width Product width
- * @property    string $length Product length
- * @property    string $height Product height
- * @property    string $weight Product weight
- * @property    string $price Product price
- * @property    string $regular_price Product regular price
- * @property    string $sale_price Product sale price
- * @property    string $product_image_gallery String of image IDs in the gallery
- * @property    string $sku Product SKU
- * @property    string $stock Stock amount
- * @property    string $downloadable Shows/define if the product is downloadable
- * @property    string $virtual Shows/define if the product is virtual
- * @property    string $sold_individually Allow one item to be bought in a single order
- * @property    string $tax_status Tax status
- * @property    string $tax_class Tax class
- * @property    string $manage_stock Shows/define if can manage the product stock
- * @property    string $stock_status Stock status
- * @property    string $backorders Whether or not backorders are allowed
- * @property    string $featured Featured product
- * @property    string $visibility Product visibility
- * @property    string $variation_id Variation ID when dealing with variations
+ * @version  3.0.0
+ * @package  WooCommerce/Abstracts
+ * @category Abstract Class
+ * @author   WooThemes
  */
-class WC_Product {
+class WC_Product extends WC_Abstract_Legacy_Product {
 
 	/**
-	 * The product (post) ID.
-	 *
-	 * @var int
-	 */
-	public $id = 0;
-
-	/**
-	 * $post Stores post data.
-	 *
-	 * @var $post WP_Post
-	 */
-	public $post = null;
-
-	/**
-	 * The product's type (simple, variable etc).
-	 *
+	 * This is the name of this object type.
 	 * @var string
 	 */
-	public $product_type = null;
+	protected $object_type = 'product';
 
 	/**
-	 * Product shipping class.
-	 *
+	 * Post type.
 	 * @var string
 	 */
-	protected $shipping_class    = '';
+	protected $post_type = 'product';
 
 	/**
-	 * ID of the shipping class this product has.
-	 *
-	 * @var int
+	 * Cache group.
+	 * @var string
 	 */
-	protected $shipping_class_id = 0;
+	protected $cache_group = 'products';
 
-	/** @public string The product's total stock, including that of its children. */
-	public $total_stock;
+	/**
+	 * Stores product data.
+	 *
+	 * @var array
+	 */
+	protected $data = array(
+		'name'               => '',
+		'slug'               => '',
+		'date_created'       => null,
+		'date_modified'      => null,
+		'status'             => false,
+		'featured'           => false,
+		'catalog_visibility' => 'visible',
+		'description'        => '',
+		'short_description'  => '',
+		'sku'                => '',
+		'price'              => '',
+		'regular_price'      => '',
+		'sale_price'         => '',
+		'date_on_sale_from'  => null,
+		'date_on_sale_to'    => null,
+		'total_sales'        => '0',
+		'tax_status'         => 'taxable',
+		'tax_class'          => '',
+		'manage_stock'       => false,
+		'stock_quantity'     => null,
+		'stock_status'       => 'instock',
+		'backorders'         => 'no',
+		'sold_individually'  => false,
+		'weight'             => '',
+		'length'             => '',
+		'width'              => '',
+		'height'             => '',
+		'upsell_ids'         => array(),
+		'cross_sell_ids'     => array(),
+		'parent_id'          => 0,
+		'reviews_allowed'    => true,
+		'purchase_note'      => '',
+		'attributes'         => array(),
+		'default_attributes' => array(),
+		'menu_order'         => 0,
+		'virtual'            => false,
+		'downloadable'       => false,
+		'category_ids'       => array(),
+		'tag_ids'            => array(),
+		'shipping_class_id'  => 0,
+		'downloads'          => array(),
+		'image_id'           => '',
+		'gallery_image_ids'  => array(),
+		'download_limit'     => -1,
+		'download_expiry'    => -1,
+		'rating_counts'      => array(),
+		'average_rating'     => 0,
+		'review_count'       => 0,
+	);
 
 	/**
 	 * Supported features such as 'ajax_add_to_cart'.
+	 *
 	 * @var array
 	 */
 	protected $supports = array();
 
 	/**
-	 * Constructor gets the post object and sets the ID for the loaded product.
+	 * Get the product if ID is passed, otherwise the product is new and empty.
+	 * This class should NOT be instantiated, but the wc_get_product() function
+	 * should be used. It is possible, but the wc_get_product() is preferred.
 	 *
-	 * @param int|WC_Product|object $product Product ID, post object, or product object
+	 * @param int|WC_Product|object $product Product to init.
 	 */
-	public function __construct( $product ) {
-		if ( is_numeric( $product ) ) {
-			$this->id   = absint( $product );
-			$this->post = get_post( $this->id );
-		} elseif ( $product instanceof WC_Product ) {
-			$this->id   = absint( $product->id );
-			$this->post = $product->post;
-		} elseif ( isset( $product->ID ) ) {
-			$this->id   = absint( $product->ID );
-			$this->post = $product;
+	public function __construct( $product = 0 ) {
+		parent::__construct( $product );
+		if ( is_numeric( $product ) && $product > 0 ) {
+			$this->set_id( $product );
+		} elseif ( $product instanceof self ) {
+			$this->set_id( absint( $product->get_id() ) );
+		} elseif ( ! empty( $product->ID ) ) {
+			$this->set_id( absint( $product->ID ) );
+		} else {
+			$this->set_object_read( true );
+		}
+
+		$this->data_store = WC_Data_Store::load( 'product-' . $this->get_type() );
+		if ( $this->get_id() > 0 ) {
+			$this->data_store->read( $this );
 		}
 	}
 
 	/**
-	 * __isset function.
+	 * Get internal type. Should return string and *should be overridden* by child classes.
 	 *
-	 * @param mixed $key
+	 * The product_type property is deprecated but is used here for BW compat with child classes which may be defining product_type and not have a get_type method.
+	 *
+	 * @since 3.0.0
+	 * @return string
+	 */
+	public function get_type() {
+		return isset( $this->product_type ) ? $this->product_type : 'simple';
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Getters
+	|--------------------------------------------------------------------------
+	|
+	| Methods for getting data from the product object.
+	*/
+
+	/**
+	 * Get product name.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_name( $context = 'view' ) {
+		return $this->get_prop( 'name', $context );
+	}
+
+	/**
+	 * Get product slug.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_slug( $context = 'view' ) {
+		return $this->get_prop( 'slug', $context );
+	}
+
+	/**
+	 * Get product created date.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return WC_DateTime|NULL object if the date is set or null if there is no date.
+	 */
+	public function get_date_created( $context = 'view' ) {
+		return $this->get_prop( 'date_created', $context );
+	}
+
+	/**
+	 * Get product modified date.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return WC_DateTime|NULL object if the date is set or null if there is no date.
+	 */
+	public function get_date_modified( $context = 'view' ) {
+		return $this->get_prop( 'date_modified', $context );
+	}
+
+	/**
+	 * Get product status.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_status( $context = 'view' ) {
+		return $this->get_prop( 'status', $context );
+	}
+
+	/**
+	 * If the product is featured.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return boolean
+	 */
+	public function get_featured( $context = 'view' ) {
+		return $this->get_prop( 'featured', $context );
+	}
+
+	/**
+	 * Get catalog visibility.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_catalog_visibility( $context = 'view' ) {
+		return $this->get_prop( 'catalog_visibility', $context );
+	}
+
+	/**
+	 * Get product description.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_description( $context = 'view' ) {
+		return $this->get_prop( 'description', $context );
+	}
+
+	/**
+	 * Get product short description.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_short_description( $context = 'view' ) {
+		return $this->get_prop( 'short_description', $context );
+	}
+
+	/**
+	 * Get SKU (Stock-keeping unit) - product unique ID.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_sku( $context = 'view' ) {
+		return $this->get_prop( 'sku', $context );
+	}
+
+	/**
+	 * Returns the product's active price.
+	 *
+	 * @param  string $context
+	 * @return string price
+	 */
+	public function get_price( $context = 'view' ) {
+		return $this->get_prop( 'price', $context );
+	}
+
+	/**
+	 * Returns the product's regular price.
+	 *
+	 * @param  string $context
+	 * @return string price
+	 */
+	public function get_regular_price( $context = 'view' ) {
+		return $this->get_prop( 'regular_price', $context );
+	}
+
+	/**
+	 * Returns the product's sale price.
+	 *
+	 * @param  string $context
+	 * @return string price
+	 */
+	public function get_sale_price( $context = 'view' ) {
+		return $this->get_prop( 'sale_price', $context );
+	}
+
+	/**
+	 * Get date on sale from.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return WC_DateTime|NULL object if the date is set or null if there is no date.
+	 */
+	public function get_date_on_sale_from( $context = 'view' ) {
+		return $this->get_prop( 'date_on_sale_from', $context );
+	}
+
+	/**
+	 * Get date on sale to.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return WC_DateTime|NULL object if the date is set or null if there is no date.
+	 */
+	public function get_date_on_sale_to( $context = 'view' ) {
+		return $this->get_prop( 'date_on_sale_to', $context );
+	}
+
+	/**
+	 * Get number total of sales.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return int
+	 */
+	public function get_total_sales( $context = 'view' ) {
+		return $this->get_prop( 'total_sales', $context );
+	}
+
+	/**
+	 * Returns the tax status.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_tax_status( $context = 'view' ) {
+		return $this->get_prop( 'tax_status', $context );
+	}
+
+	/**
+	 * Returns the tax class.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_tax_class( $context = 'view' ) {
+		return $this->get_prop( 'tax_class', $context );
+	}
+
+	/**
+	 * Return if product manage stock.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return boolean
+	 */
+	public function get_manage_stock( $context = 'view' ) {
+		return $this->get_prop( 'manage_stock', $context );
+	}
+
+	/**
+	 * Returns number of items available for sale.
+	 *
+	 * @param  string $context
+	 * @return int|null
+	 */
+	public function get_stock_quantity( $context = 'view' ) {
+		return $this->get_prop( 'stock_quantity', $context );
+	}
+
+	/**
+	 * Return the stock status.
+	 *
+	 * @param  string $context
+	 * @since 3.0.0
+	 * @return string
+	 */
+	public function get_stock_status( $context = 'view' ) {
+		return $this->get_prop( 'stock_status', $context );
+	}
+
+	/**
+	 * Get backorders.
+	 *
+	 * @param  string $context
+	 * @since 3.0.0
+	 * @return string yes no or notify
+	 */
+	public function get_backorders( $context = 'view' ) {
+		return $this->get_prop( 'backorders', $context );
+	}
+
+	/**
+	 * Return if should be sold individually.
+	 *
+	 * @param  string $context
+	 * @since 3.0.0
+	 * @return boolean
+	 */
+	public function get_sold_individually( $context = 'view' ) {
+		return $this->get_prop( 'sold_individually', $context );
+	}
+
+	/**
+	 * Returns the product's weight.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_weight( $context = 'view' ) {
+		return $this->get_prop( 'weight', $context );
+	}
+
+	/**
+	 * Returns the product length.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_length( $context = 'view' ) {
+		return $this->get_prop( 'length', $context );
+	}
+
+	/**
+	 * Returns the product width.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_width( $context = 'view' ) {
+		return $this->get_prop( 'width', $context );
+	}
+
+	/**
+	 * Returns the product height.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_height( $context = 'view' ) {
+		return $this->get_prop( 'height', $context );
+	}
+
+	/**
+	 * Returns formatted dimensions.
+	 *
+	 * @param  $formatted True by default for legacy support - will be false/not set in future versions to return the array only. Use wc_format_dimensions for formatted versions instead.
+	 * @return string|array
+	 */
+	public function get_dimensions( $formatted = true ) {
+		if ( $formatted ) {
+			wc_deprecated_argument( 'WC_Product::get_dimensions', '3.0', 'By default, get_dimensions has an argument set to true so that HTML is returned. This is to support the legacy version of the method. To get HTML dimensions, instead use wc_format_dimensions() function. Pass false to this method to return an array of dimensions. This will be the new default behavior in future versions.' );
+			return apply_filters( 'woocommerce_product_dimensions', wc_format_dimensions( $this->get_dimensions( false ) ), $this );
+		}
+		return array(
+			'length' => $this->get_length(),
+			'width'  => $this->get_width(),
+			'height' => $this->get_height(),
+		);
+	}
+
+	/**
+	 * Get upsel IDs.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return array
+	 */
+	public function get_upsell_ids( $context = 'view' ) {
+		return $this->get_prop( 'upsell_ids', $context );
+	}
+
+	/**
+	 * Get cross sell IDs.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return array
+	 */
+	public function get_cross_sell_ids( $context = 'view' ) {
+		return $this->get_prop( 'cross_sell_ids', $context );
+	}
+
+	/**
+	 * Get parent ID.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return int
+	 */
+	public function get_parent_id( $context = 'view' ) {
+		return $this->get_prop( 'parent_id', $context );
+	}
+
+	/**
+	 * Return if reviews is allowed.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
 	 * @return bool
 	 */
-	public function __isset( $key ) {
-		return metadata_exists( 'post', $this->id, '_' . $key );
+	public function get_reviews_allowed( $context = 'view' ) {
+		return $this->get_prop( 'reviews_allowed', $context );
 	}
 
 	/**
-	 * __get function.
+	 * Get purchase note.
 	 *
-	 * @param string $key
-	 * @return mixed
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return string
 	 */
-	public function __get( $key ) {
-		$value = get_post_meta( $this->id, '_' . $key, true );
-
-		// Get values or default if not set
-		if ( in_array( $key, array( 'downloadable', 'virtual', 'backorders', 'manage_stock', 'featured', 'sold_individually' ) ) ) {
-			$value = $value ? $value : 'no';
-
-		} elseif ( in_array( $key, array( 'product_attributes', 'crosssell_ids', 'upsell_ids' ) ) ) {
-			$value = $value ? $value : array();
-
-		} elseif ( 'visibility' === $key ) {
-			$value = $value ? $value : 'hidden';
-
-		} elseif ( 'stock' === $key ) {
-			$value = $value ? $value : 0;
-
-		} elseif ( 'stock_status' === $key ) {
-			$value = $value ? $value : 'instock';
-
-		} elseif ( 'tax_status' === $key ) {
-			$value = $value ? $value : 'taxable';
-
-		}
-
-		if ( false !== $value ) {
-			$this->$key = $value;
-		}
-
-		return $value;
+	public function get_purchase_note( $context = 'view' ) {
+		return $this->get_prop( 'purchase_note', $context );
 	}
 
 	/**
-	 * Get the product's post data.
+	 * Returns product attributes.
 	 *
-	 * @return object
+	 * @param  string $context
+	 * @return array
 	 */
-	public function get_post_data() {
-		return $this->post;
+	public function get_attributes( $context = 'view' ) {
+		return $this->get_prop( 'attributes', $context );
 	}
 
+	/**
+	 * Get default attributes.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return array
+	 */
+	public function get_default_attributes( $context = 'view' ) {
+		return $this->get_prop( 'default_attributes', $context );
+	}
+
+	/**
+	 * Get menu order.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return int
+	 */
+	public function get_menu_order( $context = 'view' ) {
+		return $this->get_prop( 'menu_order', $context );
+	}
+
+	/**
+	 * Get category ids.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return array
+	 */
+	public function get_category_ids( $context = 'view' ) {
+		return $this->get_prop( 'category_ids', $context );
+	}
+
+	/**
+	 * Get tag ids.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return array
+	 */
+	public function get_tag_ids( $context = 'view' ) {
+		return $this->get_prop( 'tag_ids', $context );
+	}
+
+	/**
+	 * Get virtual.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return bool
+	 */
+	public function get_virtual( $context = 'view' ) {
+		return $this->get_prop( 'virtual', $context );
+	}
+
+	/**
+	 * Returns the gallery attachment ids.
+	 *
+	 * @param  string $context
+	 * @return array
+	 */
+	public function get_gallery_image_ids( $context = 'view' ) {
+		return $this->get_prop( 'gallery_image_ids', $context );
+	}
+
+	/**
+	 * Get shipping class ID.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return int
+	 */
+	public function get_shipping_class_id( $context = 'view' ) {
+		return $this->get_prop( 'shipping_class_id', $context );
+	}
+
+	/**
+	 * Get downloads.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return array
+	 */
+	public function get_downloads( $context = 'view' ) {
+		return $this->get_prop( 'downloads', $context );
+	}
+
+	/**
+	 * Get download expiry.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return int
+	 */
+	public function get_download_expiry( $context = 'view' ) {
+		return $this->get_prop( 'download_expiry', $context );
+	}
+
+	/**
+	 * Get downloadable.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return bool
+	 */
+	public function get_downloadable( $context = 'view' ) {
+		return $this->get_prop( 'downloadable', $context );
+	}
+
+	/**
+	 * Get download limit.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return int
+	 */
+	public function get_download_limit( $context = 'view' ) {
+		return $this->get_prop( 'download_limit', $context );
+	}
+
+	/**
+	 * Get main image ID.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_image_id( $context = 'view' ) {
+		return $this->get_prop( 'image_id', $context );
+	}
+
+	/**
+	 * Get rating count.
+	 * @param  string $context
+	 * @return array of counts
+	 */
+	public function get_rating_counts( $context = 'view' ) {
+		return $this->get_prop( 'rating_counts', $context );
+	}
+
+	/**
+	 * Get average rating.
+	 * @param  string $context
+	 * @return float
+	 */
+	public function get_average_rating( $context = 'view' ) {
+		return $this->get_prop( 'average_rating', $context );
+	}
+
+	/**
+	 * Get review count.
+	 * @param  string $context
+	 * @return int
+	 */
+	public function get_review_count( $context = 'view' ) {
+		return $this->get_prop( 'review_count', $context );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Setters
+	|--------------------------------------------------------------------------
+	|
+	| Functions for setting product data. These should not update anything in the
+	| database itself and should only change what is stored in the class
+	| object.
+	*/
+
+	/**
+	 * Set product name.
+	 *
+	 * @since 3.0.0
+	 * @param string $name Product name.
+	 */
+	public function set_name( $name ) {
+		$this->set_prop( 'name', $name );
+	}
+
+	/**
+	 * Set product slug.
+	 *
+	 * @since 3.0.0
+	 * @param string $slug Product slug.
+	 */
+	public function set_slug( $slug ) {
+		$this->set_prop( 'slug', $slug );
+	}
+
+	/**
+	 * Set product created date.
+	 *
+	 * @since 3.0.0
+	 * @param string|integer|null $date UTC timestamp, or ISO 8601 DateTime. If the DateTime string has no timezone or offset, WordPress site timezone will be assumed. Null if their is no date.
+	 */
+	public function set_date_created( $date = null ) {
+		$this->set_date_prop( 'date_created', $date );
+	}
+
+	/**
+	 * Set product modified date.
+	 *
+	 * @since 3.0.0
+	 * @param string|integer|null $date UTC timestamp, or ISO 8601 DateTime. If the DateTime string has no timezone or offset, WordPress site timezone will be assumed. Null if their is no date.
+	 */
+	public function set_date_modified( $date = null ) {
+		$this->set_date_prop( 'date_modified', $date );
+	}
+
+	/**
+	 * Set product status.
+	 *
+	 * @since 3.0.0
+	 * @param string $status Product status.
+	 */
+	public function set_status( $status ) {
+		$this->set_prop( 'status', $status );
+	}
+
+	/**
+	 * Set if the product is featured.
+	 *
+	 * @since 3.0.0
+	 * @param bool|string
+	 */
+	public function set_featured( $featured ) {
+		$this->set_prop( 'featured', wc_string_to_bool( $featured ) );
+	}
+
+	/**
+	 * Set catalog visibility.
+	 *
+	 * @since 3.0.0
+	 * @throws WC_Data_Exception
+	 * @param string $visibility Options: 'hidden', 'visible', 'search' and 'catalog'.
+	 */
+	public function set_catalog_visibility( $visibility ) {
+		$options = array_keys( wc_get_product_visibility_options() );
+		if ( ! in_array( $visibility, $options, true ) ) {
+			$this->error( 'product_invalid_catalog_visibility', __( 'Invalid catalog visibility option.', 'woocommerce' ) );
+		}
+		$this->set_prop( 'catalog_visibility', $visibility );
+	}
+
+	/**
+	 * Set product description.
+	 *
+	 * @since 3.0.0
+	 * @param string $description Product description.
+	 */
+	public function set_description( $description ) {
+		$this->set_prop( 'description', $description );
+	}
+
+	/**
+	 * Set product short description.
+	 *
+	 * @since 3.0.0
+	 * @param string $short_description Product short description.
+	 */
+	public function set_short_description( $short_description ) {
+		$this->set_prop( 'short_description', $short_description );
+	}
+
+	/**
+	 * Set SKU.
+	 *
+	 * @since 3.0.0
+	 * @throws WC_Data_Exception
+	 * @param string $sku Product SKU.
+	 */
+	public function set_sku( $sku ) {
+		$sku = (string) $sku;
+		if ( $this->get_object_read() && ! empty( $sku ) && ! wc_product_has_unique_sku( $this->get_id(), $sku ) ) {
+			$sku_found = wc_get_product_id_by_sku( $sku );
+
+			$this->error( 'product_invalid_sku', __( 'Invalid or duplicated SKU.', 'woocommerce' ), 400, array( 'resource_id' => $sku_found ) );
+		}
+		$this->set_prop( 'sku', $sku );
+	}
+
+	/**
+	 * Set the product's active price.
+	 *
+	 * @param string $price Price.
+	 */
+	public function set_price( $price ) {
+		$this->set_prop( 'price', wc_format_decimal( $price ) );
+	}
+
+	/**
+	 * Set the product's regular price.
+	 *
+	 * @since 3.0.0
+	 * @param string $price Regular price.
+	 */
+	public function set_regular_price( $price ) {
+		$this->set_prop( 'regular_price', wc_format_decimal( $price ) );
+	}
+
+	/**
+	 * Set the product's sale price.
+	 *
+	 * @since 3.0.0
+	 * @param string $price sale price.
+	 */
+	public function set_sale_price( $price ) {
+		$this->set_prop( 'sale_price', wc_format_decimal( $price ) );
+	}
+
+	/**
+	 * Set date on sale from.
+	 *
+	 * @since 3.0.0
+	 * @param string|integer|null $date UTC timestamp, or ISO 8601 DateTime. If the DateTime string has no timezone or offset, WordPress site timezone will be assumed. Null if their is no date.
+	 */
+	public function set_date_on_sale_from( $date = null ) {
+		$this->set_date_prop( 'date_on_sale_from', $date );
+	}
+
+	/**
+	 * Set date on sale to.
+	 *
+	 * @since 3.0.0
+	 * @param string|integer|null $date UTC timestamp, or ISO 8601 DateTime. If the DateTime string has no timezone or offset, WordPress site timezone will be assumed. Null if their is no date.
+	 */
+	public function set_date_on_sale_to( $date = null ) {
+		$this->set_date_prop( 'date_on_sale_to', $date );
+	}
+
+	/**
+	 * Set number total of sales.
+	 *
+	 * @since 3.0.0
+	 * @param int $total Total of sales.
+	 */
+	public function set_total_sales( $total ) {
+		$this->set_prop( 'total_sales', absint( $total ) );
+	}
+
+	/**
+	 * Set the tax status.
+	 *
+	 * @since 3.0.0
+	 * @throws WC_Data_Exception
+	 * @param string $status Tax status.
+	 */
+	public function set_tax_status( $status ) {
+		$options = array(
+			'taxable',
+			'shipping',
+			'none',
+		);
+
+		// Set default if empty.
+		if ( empty( $status ) ) {
+			$status = 'taxable';
+		}
+
+		if ( ! in_array( $status, $options, true ) ) {
+			$this->error( 'product_invalid_tax_status', __( 'Invalid product tax status.', 'woocommerce' ) );
+		}
+
+		$this->set_prop( 'tax_status', $status );
+	}
+
+	/**
+	 * Set the tax class.
+	 *
+	 * @since 3.0.0
+	 * @param string $class Tax class.
+	 */
+	public function set_tax_class( $class ) {
+		$class       = sanitize_title( $class );
+		$class       = 'standard' === $class ? '' : $class;
+		$this->set_prop( 'tax_class', $class );
+	}
+
+	/**
+	 * Set if product manage stock.
+	 *
+	 * @since 3.0.0
+	 * @param bool
+	 */
+	public function set_manage_stock( $manage_stock ) {
+		$this->set_prop( 'manage_stock', wc_string_to_bool( $manage_stock ) );
+	}
+
+	/**
+	 * Set number of items available for sale.
+	 *
+	 * @since 3.0.0
+	 * @param float|null $quantity Stock quantity.
+	 */
+	public function set_stock_quantity( $quantity ) {
+		$this->set_prop( 'stock_quantity', '' !== $quantity ? wc_stock_amount( $quantity ) : null );
+	}
+
+	/**
+	 * Set stock status.
+	 *
+	 * @param string $status New status.
+	 */
+	public function set_stock_status( $status = '' ) {
+		$this->set_prop( 'stock_status', 'outofstock' === $status ? 'outofstock' : 'instock' );
+	}
+
+	/**
+	 * Set backorders.
+	 *
+	 * @since 3.0.0
+	 * @param string $backorders Options: 'yes', 'no' or 'notify'.
+	 */
+	public function set_backorders( $backorders ) {
+		$this->set_prop( 'backorders', $backorders );
+	}
+
+	/**
+	 * Set if should be sold individually.
+	 *
+	 * @since 3.0.0
+	 * @param bool
+	 */
+	public function set_sold_individually( $sold_individually ) {
+		$this->set_prop( 'sold_individually', wc_string_to_bool( $sold_individually ) );
+	}
+
+	/**
+	 * Set the product's weight.
+	 *
+	 * @since 3.0.0
+	 * @param float|string $weight Total weight.
+	 */
+	public function set_weight( $weight ) {
+		$this->set_prop( 'weight', '' === $weight ? '' : wc_format_decimal( $weight ) );
+	}
+
+	/**
+	 * Set the product length.
+	 *
+	 * @since 3.0.0
+	 * @param float|string $length Total length.
+	 */
+	public function set_length( $length ) {
+		$this->set_prop( 'length', '' === $length ? '' : wc_format_decimal( $length ) );
+	}
+
+	/**
+	 * Set the product width.
+	 *
+	 * @since 3.0.0
+	 * @param float|string $width Total width.
+	 */
+	public function set_width( $width ) {
+		$this->set_prop( 'width', '' === $width ? '' : wc_format_decimal( $width ) );
+	}
+
+	/**
+	 * Set the product height.
+	 *
+	 * @since 3.0.0
+	 * @param float|string $height Total height.
+	 */
+	public function set_height( $height ) {
+		$this->set_prop( 'height', '' === $height ? '' : wc_format_decimal( $height ) );
+	}
+
+	/**
+	 * Set upsell IDs.
+	 *
+	 * @since 3.0.0
+	 * @param array $upsell_ids IDs from the up-sell products.
+	 */
+	public function set_upsell_ids( $upsell_ids ) {
+		$this->set_prop( 'upsell_ids', array_filter( (array) $upsell_ids ) );
+	}
+
+	/**
+	 * Set crosssell IDs.
+	 *
+	 * @since 3.0.0
+	 * @param array $cross_sell_ids IDs from the cross-sell products.
+	 */
+	public function set_cross_sell_ids( $cross_sell_ids ) {
+		$this->set_prop( 'cross_sell_ids', array_filter( (array) $cross_sell_ids ) );
+	}
+
+	/**
+	 * Set parent ID.
+	 *
+	 * @since 3.0.0
+	 * @param int $parent_id Product parent ID.
+	 */
+	public function set_parent_id( $parent_id ) {
+		$this->set_prop( 'parent_id', absint( $parent_id ) );
+	}
+
+	/**
+	 * Set if reviews is allowed.
+	 *
+	 * @since 3.0.0
+	 * @param bool $reviews_allowed Reviews allowed or not.
+	 */
+	public function set_reviews_allowed( $reviews_allowed ) {
+		$this->set_prop( 'reviews_allowed', wc_string_to_bool( $reviews_allowed ) );
+	}
+
+	/**
+	 * Set purchase note.
+	 *
+	 * @since 3.0.0
+	 * @param string $purchase_note Purchase note.
+	 */
+	public function set_purchase_note( $purchase_note ) {
+		$this->set_prop( 'purchase_note', $purchase_note );
+	}
+
+	/**
+	 * Set product attributes.
+	 *
+	 * Attributes are made up of:
+	 * 		id - 0 for product level attributes. ID for global attributes.
+	 * 		name - Attribute name.
+	 * 		options - attribute value or array of term ids/names.
+	 * 		position - integer sort order.
+	 * 		visible - If visible on frontend.
+	 * 		variation - If used for variations.
+	 * 	Indexed by unqiue key to allow clearing old ones after a set.
+	 *
+	 * @since 3.0.0
+	 * @param array $raw_attributes Array of WC_Product_Attribute objects.
+	 */
+	public function set_attributes( $raw_attributes ) {
+		$attributes = array_fill_keys( array_keys( $this->get_attributes( 'edit' ) ), null );
+		foreach ( $raw_attributes as $attribute ) {
+			if ( is_a( $attribute, 'WC_Product_Attribute' ) ) {
+				$attributes[ sanitize_title( $attribute->get_name() ) ] = $attribute;
+			}
+		}
+
+		uasort( $attributes, 'wc_product_attribute_uasort_comparison' );
+		$this->set_prop( 'attributes', $attributes );
+	}
+
+	/**
+	 * Set default attributes.
+	 *
+	 * @since 3.0.0
+	 * @param array $default_attributes List of default attributes.
+	 */
+	public function set_default_attributes( $default_attributes ) {
+		$this->set_prop( 'default_attributes', array_filter( (array) $default_attributes ) );
+	}
+
+	/**
+	 * Set menu order.
+	 *
+	 * @since 3.0.0
+	 * @param int $menu_order Menu order.
+	 */
+	public function set_menu_order( $menu_order ) {
+		$this->set_prop( 'menu_order', intval( $menu_order ) );
+	}
+
+	/**
+	 * Set the product categories.
+	 *
+	 * @since 3.0.0
+	 * @param array $term_ids List of terms IDs.
+	 */
+	public function set_category_ids( $term_ids ) {
+		$this->set_prop( 'category_ids', array_unique( array_map( 'intval', $term_ids ) ) );
+	}
+
+	/**
+	 * Set the product tags.
+	 *
+	 * @since 3.0.0
+	 * @param array $term_ids List of terms IDs.
+	 */
+	public function set_tag_ids( $term_ids ) {
+		$this->set_prop( 'tag_ids', array_unique( array_map( 'intval', $term_ids ) ) );
+	}
+
+	/**
+	 * Set if the product is virtual.
+	 *
+	 * @since 3.0.0
+	 * @param bool|string
+	 */
+	public function set_virtual( $virtual ) {
+		$this->set_prop( 'virtual', wc_string_to_bool( $virtual ) );
+	}
+
+	/**
+	 * Set shipping class ID.
+	 *
+	 * @since 3.0.0
+	 * @param int
+	 */
+	public function set_shipping_class_id( $id ) {
+		$this->set_prop( 'shipping_class_id', absint( $id ) );
+	}
+
+	/**
+	 * Set if the product is downloadable.
+	 *
+	 * @since 3.0.0
+	 * @param bool|string
+	 */
+	public function set_downloadable( $downloadable ) {
+		$this->set_prop( 'downloadable', wc_string_to_bool( $downloadable ) );
+	}
+
+	/**
+	 * Set downloads.
+	 *
+	 * @since 3.0.0
+	 * @param $downloads_array array of WC_Product_Download objects or arrays.
+	 */
+	public function set_downloads( $downloads_array ) {
+		$downloads = array();
+		$errors    = array();
+
+		foreach ( $downloads_array as $download ) {
+			if ( is_a( $download, 'WC_Product_Download' ) ) {
+				$download_object = $download;
+			} else {
+				$download_object           = new WC_Product_Download();
+				$download['previous_hash'] = isset( $download['previous_hash'] ) ? $download['previous_hash'] : '';
+				$file_hash                 = apply_filters( 'woocommerce_downloadable_file_hash', md5( $download['file'] ), $this->get_id(), $download['name'], $download['file'], $download['previous_hash'] );
+
+				$download_object->set_id( $file_hash );
+				$download_object->set_name( $download['name'] );
+				$download_object->set_file( $download['file'] );
+				$download_object->set_previous_hash( $download['previous_hash'] );
+			}
+
+			// Validate the file extension
+			if ( ! $download_object->is_allowed_filetype() ) {
+				if ( $this->get_object_read() ) {
+					$errors[] = sprintf( __( 'The downloadable file %1$s cannot be used as it does not have an allowed file type. Allowed types include: %2$s', 'woocommerce' ), '<code>' . basename( $download_object->get_file() ) . '</code>', '<code>' . implode( ', ', array_keys( $download_object->get_allowed_mime_types() ) ) . '</code>' );
+				}
+				continue;
+			}
+
+			// Validate the file exists.
+			if ( ! $download_object->file_exists() ) {
+				if ( $this->get_object_read() ) {
+					$errors[] = sprintf( __( 'The downloadable file %s cannot be used as it does not exist on the server.', 'woocommerce' ), '<code>' . $download_object->get_file() . '</code>' );
+				}
+				continue;
+			}
+
+			$downloads[ $download_object->get_id() ] = $download_object;
+		}
+
+		if ( $errors ) {
+			$this->error( 'product_invalid_download', $errors[0] );
+		}
+
+		$this->set_prop( 'downloads', $downloads );
+	}
+
+	/**
+	 * Set download limit.
+	 *
+	 * @since 3.0.0
+	 * @param int $download_limit
+	 */
+	public function set_download_limit( $download_limit ) {
+		$this->set_prop( 'download_limit', -1 === (int) $download_limit || '' === $download_limit ? -1 : absint( $download_limit ) );
+	}
+
+	/**
+	 * Set download expiry.
+	 *
+	 * @since 3.0.0
+	 * @param int $download_expiry
+	 */
+	public function set_download_expiry( $download_expiry ) {
+		$this->set_prop( 'download_expiry', -1 === (int) $download_expiry || '' === $download_expiry ? -1 : absint( $download_expiry ) );
+	}
+
+	/**
+	 * Set gallery attachment ids.
+	 *
+	 * @since 3.0.0
+	 * @param array $image_ids
+	 */
+	public function set_gallery_image_ids( $image_ids ) {
+		$image_ids = wp_parse_id_list( $image_ids );
+
+		if ( $this->get_object_read() ) {
+			$image_ids = array_filter( $image_ids, 'wp_attachment_is_image' );
+		}
+
+		$this->set_prop( 'gallery_image_ids', $image_ids );
+	}
+
+	/**
+	 * Set main image ID.
+	 *
+	 * @since 3.0.0
+	 * @param int $image_id
+	 */
+	public function set_image_id( $image_id = '' ) {
+		$this->set_prop( 'image_id', $image_id );
+	}
+
+	/**
+	 * Set rating counts. Read only.
+	 * @param array $counts
+	 */
+	public function set_rating_counts( $counts ) {
+		$this->set_prop( 'rating_counts', array_filter( array_map( 'absint', (array) $counts ) ) );
+	}
+
+	/**
+	 * Set average rating. Read only.
+	 * @param float $average
+	 */
+	public function set_average_rating( $average ) {
+		$this->set_prop( 'average_rating', wc_format_decimal( $average ) );
+	}
+
+	/**
+	 * Set review count. Read only.
+	 * @param int $count
+	 */
+	public function set_review_count( $count ) {
+		$this->set_prop( 'review_count', absint( $count ) );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Other Methods
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Ensure properties are set correctly before save.
+	 * @since 3.0.0
+	 */
+	public function validate_props() {
+		// Before updating, ensure stock props are all aligned. Qty and backorders are not needed if not stock managed.
+		if ( ! $this->get_manage_stock() ) {
+			$this->set_stock_quantity( '' );
+			$this->set_backorders( 'no' );
+
+		// If we are stock managing and we don't have stock, force out of stock status.
+		} elseif ( $this->get_stock_quantity() <= get_option( 'woocommerce_notify_no_stock_amount' ) && 'no' === $this->get_backorders() ) {
+			$this->set_stock_status( 'outofstock' );
+
+		// If the stock level is changing and we do now have enough, force in stock status.
+		} elseif ( $this->get_stock_quantity() > get_option( 'woocommerce_notify_no_stock_amount' ) && array_key_exists( 'stock_quantity', $this->get_changes() ) ) {
+			$this->set_stock_status( 'instock' );
+		}
+	}
+
+	/**
+	 * Save data (either create or update depending on if we are working on an existing product).
+	 *
+	 * @since 3.0.0
+	 */
+	public function save() {
+		$this->validate_props();
+
+		if ( $this->data_store ) {
+			// Trigger action before saving to the DB. Use a pointer to adjust object props before save.
+			do_action( 'woocommerce_before_' . $this->object_type . '_object_save', $this, $this->data_store );
+
+			if ( $this->get_id() ) {
+				$this->data_store->update( $this );
+			} else {
+				$this->data_store->create( $this );
+			}
+			if ( $this->get_parent_id() ) {
+				wc_deferred_product_sync( $this->get_parent_id() );
+			}
+			return $this->get_id();
+		}
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Conditionals
+	|--------------------------------------------------------------------------
+	*/
+
 	/**
 	 * Check if a product supports a given feature.
 	 *
@@ -167,186 +1319,12 @@ class WC_Product {
 	}
 
 	/**
-	 * Return the product ID
+	 * Returns whether or not the product post exists.
 	 *
-	 * @since 2.5.0
-	 * @return int product (post) ID
+	 * @return bool
 	 */
-	public function get_id() {
-
-		return $this->id;
-	}
-
-	/**
-	 * get_gallery_attachment_ids function.
-	 *
-	 * @return array
-	 */
-	public function get_gallery_attachment_ids() {
-		return apply_filters( 'woocommerce_product_gallery_attachment_ids', array_filter( array_filter( (array) explode( ',', $this->product_image_gallery ) ), 'wp_attachment_is_image' ), $this );
-	}
-
-	/**
-	 * Wrapper for get_permalink.
-	 *
-	 * @return string
-	 */
-	public function get_permalink() {
-		return get_permalink( $this->id );
-	}
-
-	/**
-	 * Get SKU (Stock-keeping unit) - product unique ID.
-	 *
-	 * @return string
-	 */
-	public function get_sku() {
-		return apply_filters( 'woocommerce_get_sku', $this->sku, $this );
-	}
-
-	/**
-	 * Returns number of items available for sale.
-	 *
-	 * @return int
-	 */
-	public function get_stock_quantity() {
-		return apply_filters( 'woocommerce_get_stock_quantity', $this->managing_stock() ? wc_stock_amount( $this->stock ) : null, $this );
-	}
-
-	/**
-	 * Get total stock.
-	 *
-	 * This is the stock of parent and children combined.
-	 *
-	 * @return int
-	 */
-	public function get_total_stock() {
-		if ( empty( $this->total_stock ) ) {
-			$this->total_stock = max( 0, $this->get_stock_quantity() );
-
-			if ( sizeof( $this->get_children() ) > 0 ) {
-				foreach ( $this->get_children() as $child_id ) {
-					if ( 'yes' === get_post_meta( $child_id, '_manage_stock', true ) ) {
-						$stock = get_post_meta( $child_id, '_stock', true );
-						$this->total_stock += max( 0, wc_stock_amount( $stock ) );
-					}
-				}
-			}
-		}
-		return wc_stock_amount( $this->total_stock );
-	}
-
-	/**
-	 * Check if the stock status needs changing.
-	 */
-	public function check_stock_status() {
-		if ( ! $this->backorders_allowed() && $this->get_total_stock() <= get_option( 'woocommerce_notify_no_stock_amount' ) ) {
-			if ( $this->stock_status !== 'outofstock' ) {
-				$this->set_stock_status( 'outofstock' );
-			}
-		} elseif ( $this->backorders_allowed() || $this->get_total_stock() > get_option( 'woocommerce_notify_no_stock_amount' ) ) {
-			if ( $this->stock_status !== 'instock' ) {
-				$this->set_stock_status( 'instock' );
-			}
-		}
-	}
-
-	/**
-	 * Set stock level of the product.
-	 *
-	 * Uses queries rather than update_post_meta so we can do this in one query (to avoid stock issues).
-	 * We cannot rely on the original loaded value in case another order was made since then.
-	 *
-	 * @param int $amount (default: null)
-	 * @param string $mode can be set, add, or subtract
-	 * @return int new stock level
-	 */
-	public function set_stock( $amount = null, $mode = 'set' ) {
-		global $wpdb;
-
-		if ( ! is_null( $amount ) && $this->managing_stock() ) {
-
-			// Ensure key exists
-			add_post_meta( $this->id, '_stock', 0, true );
-
-			// Update stock in DB directly
-			switch ( $mode ) {
-				case 'add' :
-					$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->postmeta} SET meta_value = meta_value + %f WHERE post_id = %d AND meta_key='_stock'", $amount, $this->id ) );
-				break;
-				case 'subtract' :
-					$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->postmeta} SET meta_value = meta_value - %f WHERE post_id = %d AND meta_key='_stock'", $amount, $this->id ) );
-				break;
-				default :
-					$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->postmeta} SET meta_value = %f WHERE post_id = %d AND meta_key='_stock'", $amount, $this->id ) );
-				break;
-			}
-
-			// Clear caches
-			wp_cache_delete( $this->id, 'post_meta' );
-			delete_transient( 'wc_low_stock_count' );
-			delete_transient( 'wc_outofstock_count' );
-			unset( $this->stock );
-
-			// Stock status
-			$this->check_stock_status();
-
-			// Trigger action
-			do_action( 'woocommerce_product_set_stock', $this );
-		}
-
-		return $this->get_stock_quantity();
-	}
-
-	/**
-	 * Reduce stock level of the product.
-	 *
-	 * @param int $amount Amount to reduce by. Default: 1
-	 * @return int new stock level
-	 */
-	public function reduce_stock( $amount = 1 ) {
-		return $this->set_stock( $amount, 'subtract' );
-	}
-
-	/**
-	 * Increase stock level of the product.
-	 *
-	 * @param int $amount Amount to increase by. Default 1.
-	 * @return int new stock level
-	 */
-	public function increase_stock( $amount = 1 ) {
-		return $this->set_stock( $amount, 'add' );
-	}
-
-	/**
-	 * set_stock_status function.
-	 *
-	 * @param string $status
-	 */
-	public function set_stock_status( $status ) {
-
-		$status = ( 'outofstock' === $status ) ? 'outofstock' : 'instock';
-
-		// Sanity check
-		if ( $this->managing_stock() ) {
-			if ( ! $this->backorders_allowed() && $this->get_stock_quantity() <= get_option( 'woocommerce_notify_no_stock_amount' ) ) {
-				$status = 'outofstock';
-			}
-		}
-
-		if ( update_post_meta( $this->id, '_stock_status', $status ) ) {
-			$this->stock_status = $status;
-			do_action( 'woocommerce_product_set_stock_status', $this->id, $status );
-		}
-	}
-
-	/**
-	 * Return the product type.
-	 *
-	 * @return string
-	 */
-	public function get_type() {
-		return is_null( $this->product_type ) ? '' : $this->product_type;
+	public function exists() {
+		return false !== $this->get_status();
 	}
 
 	/**
@@ -358,7 +1336,7 @@ class WC_Product {
 	 * @return bool
 	 */
 	public function is_type( $type ) {
-		return ( $this->product_type == $type || ( is_array( $type ) && in_array( $this->product_type, $type ) ) ) ? true : false;
+		return ( $this->get_type() === $type || ( is_array( $type ) && in_array( $this->get_type(), $type ) ) );
 	}
 
 	/**
@@ -367,7 +1345,232 @@ class WC_Product {
 	 * @return bool
 	 */
 	public function is_downloadable() {
-		return $this->downloadable == 'yes' ? true : false;
+		return apply_filters( 'woocommerce_is_downloadable', true === $this->get_downloadable(), $this );
+	}
+
+	/**
+	 * Checks if a product is virtual (has no shipping).
+	 *
+	 * @return bool
+	 */
+	public function is_virtual() {
+		return apply_filters( 'woocommerce_is_virtual', true === $this->get_virtual(), $this );
+	}
+
+	/**
+	 * Returns whether or not the product is featured.
+	 *
+	 * @return bool
+	 */
+	public function is_featured() {
+		return true === $this->get_featured();
+	}
+
+	/**
+	 * Check if a product is sold individually (no quantities).
+	 *
+	 * @return bool
+	 */
+	public function is_sold_individually() {
+		return apply_filters( 'woocommerce_is_sold_individually', true === $this->get_sold_individually(), $this );
+	}
+
+	/**
+	 * Returns whether or not the product is visible in the catalog.
+	 *
+	 * @return bool
+	 */
+	public function is_visible() {
+		$visible = 'visible' === $this->get_catalog_visibility() || ( is_search() && 'search' === $this->get_catalog_visibility() ) || ( ! is_search() && 'catalog' === $this->get_catalog_visibility() );
+
+		if ( 'publish' !== $this->get_status() && ! current_user_can( 'edit_post', $this->get_id() ) ) {
+			$visible = false;
+		}
+
+		if ( 'yes' === get_option( 'woocommerce_hide_out_of_stock_items' ) && ! $this->is_in_stock() ) {
+			$visible = false;
+		}
+
+		return apply_filters( 'woocommerce_product_is_visible', $visible, $this->get_id() );
+	}
+
+	/**
+	 * Returns false if the product cannot be bought.
+	 *
+	 * @return bool
+	 */
+	public function is_purchasable() {
+		return apply_filters( 'woocommerce_is_purchasable', $this->exists() && ( 'publish' === $this->get_status() || current_user_can( 'edit_post', $this->get_id() ) ) && '' !== $this->get_price(), $this );
+	}
+
+	/**
+	 * Returns whether or not the product is on sale.
+	 *
+	 * @param  string $context What the value is for. Valid values are view and edit.
+	 * @return bool
+	 */
+	public function is_on_sale( $context = 'view' ) {
+		if ( '' !== (string) $this->get_sale_price( $context ) && $this->get_regular_price( $context ) > $this->get_sale_price( $context ) ) {
+			$on_sale = true;
+
+			if ( $this->get_date_on_sale_from( $context ) && $this->get_date_on_sale_from( $context )->getTimestamp() > current_time( 'timestamp', true ) ) {
+				$on_sale = false;
+			}
+
+			if ( $this->get_date_on_sale_to( $context ) && $this->get_date_on_sale_to( $context )->getTimestamp() < current_time( 'timestamp', true ) ) {
+				$on_sale = false;
+			}
+		} else {
+			$on_sale = false;
+		}
+		return 'view' === $context ? apply_filters( 'woocommerce_product_is_on_sale', $on_sale, $this ) : $on_sale;
+	}
+
+	/**
+	 * Returns whether or not the product has dimensions set.
+	 *
+	 * @return bool
+	 */
+	public function has_dimensions() {
+		return ( $this->get_length() || $this->get_height() || $this->get_width() ) && ! $this->get_virtual();
+	}
+
+	/**
+	 * Returns whether or not the product has weight set.
+	 *
+	 * @return bool
+	 */
+	public function has_weight() {
+		return $this->get_weight() && ! $this->get_virtual();
+	}
+
+	/**
+	 * Returns whether or not the product is in stock.
+	 *
+	 * @return bool
+	 */
+	public function is_in_stock() {
+		return apply_filters( 'woocommerce_product_is_in_stock', 'instock' === $this->get_stock_status(), $this );
+	}
+
+	/**
+	 * Checks if a product needs shipping.
+	 *
+	 * @return bool
+	 */
+	public function needs_shipping() {
+		return apply_filters( 'woocommerce_product_needs_shipping', ! $this->is_virtual(), $this );
+	}
+
+	/**
+	 * Returns whether or not the product is taxable.
+	 *
+	 * @return bool
+	 */
+	public function is_taxable() {
+		return apply_filters( 'woocommerce_product_is_taxable', $this->get_tax_status() === 'taxable' && wc_tax_enabled(), $this );
+	}
+
+	/**
+	 * Returns whether or not the product shipping is taxable.
+	 *
+	 * @return bool
+	 */
+	public function is_shipping_taxable() {
+		return $this->get_tax_status() === 'taxable' || $this->get_tax_status() === 'shipping';
+	}
+
+	/**
+	 * Returns whether or not the product is stock managed.
+	 *
+	 * @return bool
+	 */
+	public function managing_stock() {
+		if ( 'yes' === get_option( 'woocommerce_manage_stock' ) ) {
+			return $this->get_manage_stock();
+		}
+		return false;
+	}
+
+	/**
+	 * Returns whether or not the product can be backordered.
+	 *
+	 * @return bool
+	 */
+	public function backorders_allowed() {
+		return apply_filters( 'woocommerce_product_backorders_allowed', ( 'yes' === $this->get_backorders() || 'notify' === $this->get_backorders() ), $this->get_id(), $this );
+	}
+
+	/**
+	 * Returns whether or not the product needs to notify the customer on backorder.
+	 *
+	 * @return bool
+	 */
+	public function backorders_require_notification() {
+		return apply_filters( 'woocommerce_product_backorders_require_notification', ( $this->managing_stock() && 'notify' === $this->get_backorders() ), $this );
+	}
+
+	/**
+	 * Check if a product is on backorder.
+	 *
+	 * @param int $qty_in_cart (default: 0)
+	 * @return bool
+	 */
+	public function is_on_backorder( $qty_in_cart = 0 ) {
+		return $this->managing_stock() && $this->backorders_allowed() && ( $this->get_stock_quantity() - $qty_in_cart ) < 0 ? true : false;
+	}
+
+	/**
+	 * Returns whether or not the product has enough stock for the order.
+	 *
+	 * @param mixed $quantity
+	 * @return bool
+	 */
+	public function has_enough_stock( $quantity ) {
+		return ! $this->managing_stock() || $this->backorders_allowed() || $this->get_stock_quantity() >= $quantity;
+	}
+
+	/**
+	 * Returns whether or not the product has any visible attributes.
+	 *
+	 * @return boolean
+	 */
+	public function has_attributes() {
+		foreach ( $this->get_attributes() as $attribute ) {
+			if ( $attribute->get_visible() ) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Returns whether or not the product has any child product.
+	 *
+	 * @return bool
+	 */
+	public function has_child() {
+		return 0 < count( $this->get_children() );
+	}
+
+	/**
+	 * Does a child have dimensions?
+	 *
+	 * @since 3.0.0
+	 * @return bool
+	 */
+	public function child_has_dimensions() {
+		return false;
+	}
+
+	/**
+	 * Does a child have a weight?
+	 *
+	 * @since 3.0.0
+	 * @return boolean
+	 */
+	public function child_has_weight() {
+		return false;
 	}
 
 	/**
@@ -379,191 +1582,109 @@ class WC_Product {
 	 * @return bool Whether downloadable product has a file attached.
 	 */
 	public function has_file( $download_id = '' ) {
-		return ( $this->is_downloadable() && $this->get_file( $download_id ) ) ? true : false;
+		return $this->is_downloadable() && $this->get_file( $download_id );
 	}
 
 	/**
-	 * Gets an array of downloadable files for this product.
+	 * Returns whether or not the product has additonal options that need
+	 * selecting before adding to cart.
 	 *
-	 * @since 2.1.0
-	 *
-	 * @return array
+	 * @since  3.0.0
+	 * @return boolean
 	 */
-	public function get_files() {
-
-		$downloadable_files = array_filter( isset( $this->downloadable_files ) ? (array) maybe_unserialize( $this->downloadable_files ) : array() );
-
-		if ( ! empty( $downloadable_files ) ) {
-
-			foreach ( $downloadable_files as $key => $file ) {
-
-				if ( ! is_array( $file ) ) {
-					$downloadable_files[ $key ] = array(
-						'file' => $file,
-						'name' => ''
-					);
-				}
-
-				// Set default name
-				if ( empty( $file['name'] ) ) {
-					$downloadable_files[ $key ]['name'] = wc_get_filename_from_url( $file['file'] );
-				}
-
-				// Filter URL
-				$downloadable_files[ $key ]['file'] = apply_filters( 'woocommerce_file_download_path', $downloadable_files[ $key ]['file'], $this, $key );
-			}
-		}
-
-		return apply_filters( 'woocommerce_product_files', $downloadable_files, $this );
+	public function has_options() {
+		return false;
 	}
 
-	/**
-	 * Get a file by $download_id.
-	 *
-	 * @param string $download_id file identifier
-	 * @return array|false if not found
-	 */
-	public function get_file( $download_id = '' ) {
-
-		$files = $this->get_files();
-
-		if ( '' === $download_id ) {
-			$file = sizeof( $files ) ? current( $files ) : false;
-		} elseif ( isset( $files[ $download_id ] ) ) {
-			$file = $files[ $download_id ];
-		} else {
-			$file = false;
-		}
-
-		// allow overriding based on the particular file being requested
-		return apply_filters( 'woocommerce_product_file', $file, $this, $download_id );
-	}
+	/*
+	|--------------------------------------------------------------------------
+	| Non-CRUD Getters
+	|--------------------------------------------------------------------------
+	*/
 
 	/**
-	 * Get file download path identified by $download_id.
+	 * Get the product's title. For products this is the product name.
 	 *
-	 * @param string $download_id file identifier
 	 * @return string
 	 */
-	public function get_file_download_path( $download_id ) {
-		$files = $this->get_files();
-
-		if ( isset( $files[ $download_id ] ) ) {
-			$file_path = $files[ $download_id ]['file'];
-		} else {
-			$file_path = '';
-		}
-
-		// allow overriding based on the particular file being requested
-		return apply_filters( 'woocommerce_product_file_download_path', $file_path, $this, $download_id );
+	public function get_title() {
+		return apply_filters( 'woocommerce_product_title', $this->get_name(), $this );
 	}
 
 	/**
-	 * Checks if a product is virtual (has no shipping).
-	 *
-	 * @return bool
+	 * Product permalink.
+	 * @return string
 	 */
-	public function is_virtual() {
-		return apply_filters( 'woocommerce_is_virtual', $this->virtual == 'yes' ? true : false, $this );
+	public function get_permalink() {
+		return get_permalink( $this->get_id() );
 	}
 
 	/**
-	 * Checks if a product needs shipping.
+	 * Returns the children IDs if applicable. Overridden by child classes.
 	 *
-	 * @return bool
-	 */
-	public function needs_shipping() {
-		return apply_filters( 'woocommerce_product_needs_shipping', $this->is_virtual() ? false : true, $this );
-	}
-
-	/**
-	 * Check if a product is sold individually (no quantities).
-	 *
-	 * @return bool
-	 */
-	public function is_sold_individually() {
-
-		$return = false;
-
-		if ( 'yes' == $this->sold_individually ) {
-			$return = true;
-		}
-
-		return apply_filters( 'woocommerce_is_sold_individually', $return, $this );
-	}
-
-	/**
-	 * get_child function.
-	 *
-	 * @param mixed $child_id
-	 * @return WC_Product WC_Product or WC_Product_variation
-	 */
-	public function get_child( $child_id ) {
-		return wc_get_product( $child_id );
-	}
-
-	/**
-	 * get_children function.
-	 *
-	 * @return array
+	 * @return array of IDs
 	 */
 	public function get_children() {
 		return array();
 	}
 
 	/**
-	 * Returns whether or not the product has any child product.
-	 *
-	 * @return bool
-	 */
-	public function has_child() {
-		return false;
-	}
-
-	/**
-	 * Returns whether or not the product post exists.
-	 *
-	 * @return bool
-	 */
-	public function exists() {
-		return empty( $this->post ) ? false : true;
-	}
-
-	/**
-	 * Returns whether or not the product is taxable.
-	 *
-	 * @return bool
-	 */
-	public function is_taxable() {
-		$taxable = $this->get_tax_status() === 'taxable' && wc_tax_enabled() ? true : false;
-		return apply_filters( 'woocommerce_product_is_taxable', $taxable, $this );
-	}
-
-	/**
-	 * Returns whether or not the product shipping is taxable.
-	 *
-	 * @return bool
-	 */
-	public function is_shipping_taxable() {
-		return $this->get_tax_status() === 'taxable' || $this->get_tax_status() === 'shipping' ? true : false;
-	}
-
-	/**
-	 * Get the title of the post.
-	 *
-	 * @return string
-	 */
-	public function get_title() {
-		return apply_filters( 'woocommerce_product_title', $this->post ? $this->post->post_title : '', $this );
-	}
-
-	/**
-	 * Get the parent of the post.
-	 *
+	 * If the stock level comes from another product ID, this should be modified.
+	 * @since  3.0.0
 	 * @return int
 	 */
-	public function get_parent() {
-		return apply_filters( 'woocommerce_product_parent', absint( $this->post->post_parent ), $this );
+	public function get_stock_managed_by_id() {
+		return $this->get_id();
+	}
+
+	/**
+	 * Returns the price in html format.
+	 * @return string
+	 */
+	public function get_price_html( $deprecated = '' ) {
+		if ( '' === $this->get_price() ) {
+			$price = apply_filters( 'woocommerce_empty_price_html', '', $this );
+		} elseif ( $this->is_on_sale() ) {
+			$price = wc_format_sale_price( wc_get_price_to_display( $this, array( 'price' => $this->get_regular_price() ) ), wc_get_price_to_display( $this ) ) . $this->get_price_suffix();
+		} else {
+			$price = wc_price( wc_get_price_to_display( $this ) ) . $this->get_price_suffix();
+		}
+
+		return apply_filters( 'woocommerce_get_price_html', $price, $this );
+	}
+
+	/**
+	 * Get product name with SKU or ID. Used within admin.
+	 *
+	 * @return string Formatted product name
+	 */
+	public function get_formatted_name() {
+		if ( $this->get_sku() ) {
+			$identifier = $this->get_sku();
+		} else {
+			$identifier = '#' . $this->get_id();
+		}
+		return sprintf( '%2$s (%1$s)', $identifier, $this->get_name() );
+	}
+
+	/**
+	 * Get min quantity which can be purchased at once.
+	 *
+	 * @since  3.0.0
+	 * @return int
+	 */
+	public function get_min_purchase_quantity() {
+		return 1;
+	}
+
+	/**
+	 * Get max quantity which can be purchased at once.
+	 *
+	 * @since  3.0.0
+	 * @return int Quantity or -1 if unlimited.
+	 */
+	public function get_max_purchase_quantity() {
+		return $this->is_sold_individually() ? 1 : ( $this->backorders_allowed() || ! $this->get_manage_stock() ? -1 : $this->get_stock_quantity() );
 	}
 
 	/**
@@ -572,7 +1693,7 @@ class WC_Product {
 	 * @return string
 	 */
 	public function add_to_cart_url() {
-		return apply_filters( 'woocommerce_product_add_to_cart_url', get_permalink( $this->id ), $this );
+		return apply_filters( 'woocommerce_product_add_to_cart_url', $this->get_permalink(), $this );
 	}
 
 	/**
@@ -594,353 +1715,110 @@ class WC_Product {
 	}
 
 	/**
-	 * Returns whether or not the product is stock managed.
+	 * Returns the main product image.
 	 *
-	 * @return bool
+	 * @param string $size (default: 'shop_thumbnail')
+	 * @param array $attr
+	 * @param bool True to return $placeholder if no image is found, or false to return an empty string.
+	 * @return string
 	 */
-	public function managing_stock() {
-		return ( ! isset( $this->manage_stock ) || $this->manage_stock == 'no' || get_option( 'woocommerce_manage_stock' ) !== 'yes' ) ? false : true;
-	}
-
-	/**
-	 * Returns whether or not the product is in stock.
-	 *
-	 * @return bool
-	 */
-	public function is_in_stock() {
-		if ( $this->managing_stock() && $this->backorders_allowed() ) {
-			return true;
-		} elseif ( $this->managing_stock() && $this->get_total_stock() <= get_option( 'woocommerce_notify_no_stock_amount' ) ) {
-			return false;
+	public function get_image( $size = 'shop_thumbnail', $attr = array(), $placeholder = true ) {
+		if ( has_post_thumbnail( $this->get_id() ) ) {
+			$image = get_the_post_thumbnail( $this->get_id(), $size, $attr );
+		} elseif ( ( $parent_id = wp_get_post_parent_id( $this->get_id() ) ) && has_post_thumbnail( $parent_id ) ) {
+			$image = get_the_post_thumbnail( $parent_id, $size, $attr );
+		} elseif ( $placeholder ) {
+			$image = wc_placeholder_img( $size );
 		} else {
-			return $this->stock_status === 'instock';
+			$image = '';
 		}
+		return str_replace( array( 'https://', 'http://' ), '//', $image );
 	}
 
 	/**
-	 * Returns whether or not the product can be backordered.
-	 *
-	 * @return bool
-	 */
-	public function backorders_allowed() {
-		return apply_filters( 'woocommerce_product_backorders_allowed', $this->backorders === 'yes' || $this->backorders === 'notify' ? true : false, $this->id );
-	}
-
-	/**
-	 * Returns whether or not the product needs to notify the customer on backorder.
-	 *
-	 * @return bool
-	 */
-	public function backorders_require_notification() {
-		return $this->managing_stock() && $this->backorders === 'notify' ? true : false;
-	}
-
-	/**
-	 * Check if a product is on backorder.
-	 *
-	 * @param int $qty_in_cart (default: 0)
-	 * @return bool
-	 */
-	public function is_on_backorder( $qty_in_cart = 0 ) {
-		return $this->managing_stock() && $this->backorders_allowed() && ( $this->get_total_stock() - $qty_in_cart ) < 0 ? true : false;
-	}
-
-	/**
-	 * Returns whether or not the product has enough stock for the order.
-	 *
-	 * @param mixed $quantity
-	 * @return bool
-	 */
-	public function has_enough_stock( $quantity ) {
-		return ! $this->managing_stock() || $this->backorders_allowed() || $this->get_stock_quantity() >= $quantity ? true : false;
-	}
-
-	/**
-	 * Returns the availability of the product.
+	 * Returns the product shipping class SLUG.
 	 *
 	 * @return string
 	 */
-	public function get_availability() {
-		$availability = $class = '';
+	public function get_shipping_class() {
+		if ( $class_id = $this->get_shipping_class_id() ) {
+			$term = get_term_by( 'id', $class_id, 'product_shipping_class' );
 
-		if ( $this->managing_stock() ) {
-
-			if ( $this->is_in_stock() && $this->get_total_stock() > get_option( 'woocommerce_notify_no_stock_amount' ) ) {
-
-				switch ( get_option( 'woocommerce_stock_format' ) ) {
-
-					case 'no_amount' :
-						$availability = __( 'In stock', 'woocommerce' );
-					break;
-
-					case 'low_amount' :
-						if ( $this->get_total_stock() <= get_option( 'woocommerce_notify_low_stock_amount' ) ) {
-							$availability = sprintf( __( 'Only %s left in stock', 'woocommerce' ), $this->get_total_stock() );
-
-							if ( $this->backorders_allowed() && $this->backorders_require_notification() ) {
-								$availability .= ' ' . __( '(can be backordered)', 'woocommerce' );
-							}
-						} else {
-							$availability = __( 'In stock', 'woocommerce' );
-						}
-					break;
-
-					default :
-						$availability = sprintf( __( '%s in stock', 'woocommerce' ), $this->get_total_stock() );
-
-						if ( $this->backorders_allowed() && $this->backorders_require_notification() ) {
-							$availability .= ' ' . __( '(can be backordered)', 'woocommerce' );
-						}
-					break;
-				}
-
-				$class        = 'in-stock';
-
-			} elseif ( $this->backorders_allowed() && $this->backorders_require_notification() ) {
-
-				$availability = __( 'Available on backorder', 'woocommerce' );
-				$class        = 'available-on-backorder';
-
-			} elseif ( $this->backorders_allowed() ) {
-
-				$availability = __( 'In stock', 'woocommerce' );
-				$class        = 'in-stock';
-
-			} else {
-
-				$availability = __( 'Out of stock', 'woocommerce' );
-				$class        = 'out-of-stock';
+			if ( $term && ! is_wp_error( $term ) ) {
+				return $term->slug;
 			}
-
-		} elseif ( ! $this->is_in_stock() ) {
-
-			$availability = __( 'Out of stock', 'woocommerce' );
-			$class        = 'out-of-stock';
 		}
-
-		return apply_filters( 'woocommerce_get_availability', array( 'availability' => $availability, 'class' => $class ), $this );
+		return '';
 	}
 
 	/**
-	 * Returns whether or not the product is featured.
-	 *
-	 * @return bool
-	 */
-	public function is_featured() {
-		return $this->featured === 'yes' ? true : false;
-	}
-
-	/**
-	 * Returns whether or not the product is visible in the catalog.
-	 *
-	 * @return bool
-	 */
-	public function is_visible() {
-		if ( ! $this->post ) {
-			$visible = false;
-
-		// Published/private
-		} elseif ( $this->post->post_status !== 'publish' && ! current_user_can( 'edit_post', $this->id ) ) {
-			$visible = false;
-
-		// Out of stock visibility
-		} elseif ( 'yes' === get_option( 'woocommerce_hide_out_of_stock_items' ) && ! $this->is_in_stock() ) {
-			$visible = false;
-
-		// visibility setting
-		} elseif ( 'hidden' === $this->visibility ) {
-			$visible = false;
-		} elseif ( 'visible' === $this->visibility ) {
-			$visible = true;
-
-		// Visibility in loop
-		} elseif ( is_search() ) {
-			$visible = 'search' === $this->visibility;
-		} else {
-			$visible = 'catalog' === $this->visibility;
-		}
-
-		return apply_filters( 'woocommerce_product_is_visible', $visible, $this->id );
-	}
-
-	/**
-	 * Returns whether or not the product is on sale.
-	 *
-	 * @return bool
-	 */
-	public function is_on_sale() {
-		return apply_filters( 'woocommerce_product_is_on_sale', ( $this->get_sale_price() !== $this->get_regular_price() && $this->get_sale_price() === $this->get_price() ), $this );
-	}
-
-	/**
-	 * Returns false if the product cannot be bought.
-	 *
-	 * @return bool
-	 */
-	public function is_purchasable() {
-
-		$purchasable = true;
-
-		// Products must exist of course
-		if ( ! $this->exists() ) {
-			$purchasable = false;
-
-		// Other products types need a price to be set
-		} elseif ( $this->get_price() === '' ) {
-			$purchasable = false;
-
-		// Check the product is published
-		} elseif ( $this->post->post_status !== 'publish' && ! current_user_can( 'edit_post', $this->id ) ) {
-			$purchasable = false;
-		}
-
-		return apply_filters( 'woocommerce_is_purchasable', $purchasable, $this );
-	}
-
-	/**
-	 * Set a products price dynamically.
-	 *
-	 * @param float $price Price to set.
-	 */
-	public function set_price( $price ) {
-		$this->price = $price;
-	}
-
-	/**
-	 * Adjust a products price dynamically.
-	 *
-	 * @param mixed $price
-	 */
-	public function adjust_price( $price ) {
-		$this->price = $this->price + $price;
-	}
-
-	/**
-	 * Returns the product's sale price.
-	 *
-	 * @return string price
-	 */
-	public function get_sale_price() {
-		return apply_filters( 'woocommerce_get_sale_price', $this->sale_price, $this );
-	}
-
-	/**
-	 * Returns the product's regular price.
-	 *
-	 * @return string price
-	 */
-	public function get_regular_price() {
-		return apply_filters( 'woocommerce_get_regular_price', $this->regular_price, $this );
-	}
-
-	/**
-	 * Returns the product's active price.
-	 *
-	 * @return string price
-	 */
-	public function get_price() {
-		return apply_filters( 'woocommerce_get_price', $this->price, $this );
-	}
-
-	/**
-	 * Returns the price (including tax). Uses customer tax rates. Can work for a specific $qty for more accurate taxes.
-	 *
-	 * @param  string $price to calculate, left blank to just use get_price()
+	 * Returns a single product attribute as a string.
+	 * @param  string $attribute to get.
 	 * @return string
 	 */
-	public function get_price_including_tax( $qty = 1, $price = '' ) {
-
-		if ( $price === '' ) {
-			$price = $this->get_price();
-		}
-
-		if ( $this->is_taxable() ) {
-
-			if ( get_option( 'woocommerce_prices_include_tax' ) === 'no' ) {
-
-				$tax_rates  = WC_Tax::get_rates( $this->get_tax_class() );
-				$taxes      = WC_Tax::calc_tax( $price * $qty, $tax_rates, false );
-				$tax_amount = WC_Tax::get_tax_total( $taxes );
-				$price      = round( $price * $qty + $tax_amount, wc_get_price_decimals() );
-
-			} else {
-
-				$tax_rates      = WC_Tax::get_rates( $this->get_tax_class() );
-				$base_tax_rates = WC_Tax::get_base_tax_rates( $this->tax_class );
-
-				if ( ! empty( WC()->customer ) && WC()->customer->is_vat_exempt() ) {
-
-					$base_taxes         = WC_Tax::calc_tax( $price * $qty, $base_tax_rates, true );
-					$base_tax_amount    = array_sum( $base_taxes );
-					$price              = round( $price * $qty - $base_tax_amount, wc_get_price_decimals() );
-
-				/**
-				 * The woocommerce_adjust_non_base_location_prices filter can stop base taxes being taken off when dealing with out of base locations.
-				 * e.g. If a product costs 10 including tax, all users will pay 10 regardless of location and taxes.
-				 * This feature is experimental @since 2.4.7 and may change in the future. Use at your risk.
-				 */
-				} elseif ( $tax_rates !== $base_tax_rates && apply_filters( 'woocommerce_adjust_non_base_location_prices', true ) ) {
-
-					$base_taxes         = WC_Tax::calc_tax( $price * $qty, $base_tax_rates, true );
-					$modded_taxes       = WC_Tax::calc_tax( ( $price * $qty ) - array_sum( $base_taxes ), $tax_rates, false );
-					$price              = round( ( $price * $qty ) - array_sum( $base_taxes ) + array_sum( $modded_taxes ), wc_get_price_decimals() );
-
-				} else {
-
-					$price = $price * $qty;
-
-				}
-
-			}
+	public function get_attribute( $attribute ) {
+		$attributes = $this->get_attributes();
+		$attribute  = sanitize_title( $attribute );
 
+		if ( isset( $attributes[ $attribute ] ) ) {
+			$attribute_object = $attributes[ $attribute ];
+		} elseif ( isset( $attributes[ 'pa_' . $attribute ] ) ) {
+			$attribute_object = $attributes[ 'pa_' . $attribute ];
 		} else {
-			$price = $price * $qty;
+			return '';
 		}
-
-		return apply_filters( 'woocommerce_get_price_including_tax', $price, $qty, $this );
+		return $attribute_object->is_taxonomy() ? implode( ', ', wc_get_product_terms( $this->get_id(), $attribute_object->get_name(), array( 'fields' => 'names' ) ) ) : wc_implode_text_attributes( $attribute_object->get_options() );
 	}
 
 	/**
-	 * Returns the price (excluding tax) - ignores tax_class filters since the price may *include* tax and thus needs subtracting.
-	 * Uses store base tax rates. Can work for a specific $qty for more accurate taxes.
-	 *
-	 * @param  string $price to calculate, left blank to just use get_price()
-	 * @return string
+	 * Get the total amount (COUNT) of ratings, or just the count for one rating e.g. number of 5 star ratings.
+	 * @param  int $value Optional. Rating value to get the count for. By default returns the count of all rating values.
+	 * @return int
 	 */
-	public function get_price_excluding_tax( $qty = 1, $price = '' ) {
+	public function get_rating_count( $value = null ) {
+		$counts = $this->get_rating_counts();
 
-		if ( $price === '' ) {
-			$price = $this->get_price();
-		}
-
-		if ( $this->is_taxable() && 'yes' === get_option( 'woocommerce_prices_include_tax' ) ) {
-			$tax_rates  = WC_Tax::get_base_tax_rates( $this->tax_class );
-			$taxes      = WC_Tax::calc_tax( $price * $qty, $tax_rates, true );
-			$price      = WC_Tax::round( $price * $qty - array_sum( $taxes ) );
+		if ( is_null( $value ) ) {
+			return array_sum( $counts );
+		} elseif ( isset( $counts[ $value ] ) ) {
+			return absint( $counts[ $value ] );
 		} else {
-			$price = $price * $qty;
+			return 0;
 		}
-
-		return apply_filters( 'woocommerce_get_price_excluding_tax', $price, $qty, $this );
 	}
 
 	/**
-	 * Returns the price including or excluding tax, based on the 'woocommerce_tax_display_shop' setting.
+	 * Get a file by $download_id.
 	 *
-	 * @param  string  $price to calculate, left blank to just use get_price()
-	 * @param  integer $qty   passed on to get_price_including_tax() or get_price_excluding_tax()
-	 * @return string
+	 * @param string $download_id file identifier
+	 * @return array|false if not found
 	 */
-	public function get_display_price( $price = '', $qty = 1 ) {
+	public function get_file( $download_id = '' ) {
+		$files = $this->get_downloads();
 
-		if ( $price === '' ) {
-			$price = $this->get_price();
+		if ( '' === $download_id ) {
+			$file = sizeof( $files ) ? current( $files ) : false;
+		} elseif ( isset( $files[ $download_id ] ) ) {
+			$file = $files[ $download_id ];
+		} else {
+			$file = false;
 		}
 
-		$tax_display_mode = get_option( 'woocommerce_tax_display_shop' );
-		$display_price    = $tax_display_mode == 'incl' ? $this->get_price_including_tax( $qty, $price ) : $this->get_price_excluding_tax( $qty, $price );
+		return apply_filters( 'woocommerce_product_file', $file, $this, $download_id );
+	}
 
-		return $display_price;
+	/**
+	 * Get file download path identified by $download_id.
+	 *
+	 * @param string $download_id file identifier
+	 * @return string
+	 */
+	public function get_file_download_path( $download_id ) {
+		$files     = $this->get_downloads();
+		$file_path = isset( $files[ $download_id ] ) ? $files[ $download_id ]->get_file() : '';
+
+		// allow overriding based on the particular file being requested
+		return apply_filters( 'woocommerce_product_file_download_path', $file_path, $this, $download_id );
 	}
 
 	/**
@@ -951,658 +1829,64 @@ class WC_Product {
 	 * @return string
 	 */
 	public function get_price_suffix( $price = '', $qty = 1 ) {
+		$html = '';
 
-		if ( $price === '' ) {
-			$price = $this->get_price();
-		}
-
-		$price_display_suffix  = get_option( 'woocommerce_price_display_suffix' );
-
-		if ( $price_display_suffix ) {
-
-			$price_display_suffix = ' <small class="woocommerce-price-suffix">' . $price_display_suffix . '</small>';
-
-			$find = array(
-				'{price_including_tax}',
-				'{price_excluding_tax}'
+		if ( ( $suffix = get_option( 'woocommerce_price_display_suffix' ) ) && wc_tax_enabled() && 'taxable' === $this->get_tax_status() ) {
+			if ( '' === $price ) {
+				$price = $this->get_price();
+			}
+			$replacements = array(
+				'{price_including_tax}' => wc_price( wc_get_price_including_tax( $this, array( 'qty' => $qty, 'price' => $price ) ) ),
+				'{price_excluding_tax}' => wc_price( wc_get_price_excluding_tax( $this, array( 'qty' => $qty, 'price' => $price ) ) ),
 			);
-
-			$replace = array(
-				wc_price( $this->get_price_including_tax( $qty, $price ) ),
-				wc_price( $this->get_price_excluding_tax( $qty, $price ) )
-			);
-
-			$price_display_suffix = str_replace( $find, $replace, $price_display_suffix );
+			$html = str_replace( array_keys( $replacements ), array_values( $replacements ), ' <small class="woocommerce-price-suffix">' . wp_kses_post( $suffix ) . '</small>' );
 		}
-
-		return apply_filters( 'woocommerce_get_price_suffix', $price_display_suffix, $this );
+		return apply_filters( 'woocommerce_get_price_suffix', $html, $this, $price, $qty );
 	}
 
 	/**
-	 * Returns the price in html format.
+	 * Returns the availability of the product.
 	 *
-	 * @param string $price (default: '')
-	 * @return string
+	 * @return string[]
 	 */
-	public function get_price_html( $price = '' ) {
-
-		$display_price         = $this->get_display_price();
-		$display_regular_price = $this->get_display_price( $this->get_regular_price() );
-
-		if ( $this->get_price() > 0 ) {
-
-			if ( $this->is_on_sale() && $this->get_regular_price() ) {
-
-				$price .= $this->get_price_html_from_to( $display_regular_price, $display_price ) . $this->get_price_suffix();
-
-				$price = apply_filters( 'woocommerce_sale_price_html', $price, $this );
-
-			} else {
-
-				$price .= wc_price( $display_price ) . $this->get_price_suffix();
-
-				$price = apply_filters( 'woocommerce_price_html', $price, $this );
-
-			}
-
-		} elseif ( $this->get_price() === '' ) {
-
-			$price = apply_filters( 'woocommerce_empty_price_html', '', $this );
-
-		} elseif ( $this->get_price() == 0 ) {
-
-			if ( $this->is_on_sale() && $this->get_regular_price() ) {
-
-				$price .= $this->get_price_html_from_to( $display_regular_price, __( 'Free!', 'woocommerce' ) );
-
-				$price = apply_filters( 'woocommerce_free_sale_price_html', $price, $this );
-
-			} else {
-
-				$price = '<span class="amount">' . __( 'Free!', 'woocommerce' ) . '</span>';
-
-				$price = apply_filters( 'woocommerce_free_price_html', $price, $this );
-
-			}
-		}
-
-		return apply_filters( 'woocommerce_get_price_html', $price, $this );
+	public function get_availability() {
+		return apply_filters( 'woocommerce_get_availability', array(
+			'availability' => $this->get_availability_text(),
+			'class'        => $this->get_availability_class(),
+		), $this );
 	}
 
 	/**
-	 * Functions for getting parts of a price, in html, used by get_price_html.
+	 * Get availability text based on stock status.
 	 *
 	 * @return string
 	 */
-	public function get_price_html_from_text() {
-		$from = '<span class="from">' . _x( 'From:', 'min_price', 'woocommerce' ) . ' </span>';
-
-		return apply_filters( 'woocommerce_get_price_html_from_text', $from, $this );
-	}
-
-	/**
-	 * Functions for getting parts of a price, in html, used by get_price_html.
-	 *
-	 * @param  string $from String or float to wrap with 'from' text
-	 * @param  mixed $to String or float to wrap with 'to' text
-	 * @return string
-	 */
-	public function get_price_html_from_to( $from, $to ) {
-		$price = '<del>' . ( ( is_numeric( $from ) ) ? wc_price( $from ) : $from ) . '</del> <ins>' . ( ( is_numeric( $to ) ) ? wc_price( $to ) : $to ) . '</ins>';
-
-		return apply_filters( 'woocommerce_get_price_html_from_to', $price, $from, $to, $this );
-	}
-
-	/**
-	 * Returns the tax class.
-	 *
-	 * @return string
-	 */
-	public function get_tax_class() {
-		return apply_filters( 'woocommerce_product_tax_class', $this->tax_class, $this );
-	}
-
-	/**
-	 * Returns the tax status.
-	 *
-	 * @return string
-	 */
-	public function get_tax_status() {
-		return $this->tax_status;
-	}
-
-	/**
-	 * Get the average rating of product. This is calculated once and stored in postmeta.
-	 * @return string
-	 */
-	public function get_average_rating() {
-		global $wpdb;
-
-		// No meta date? Do the calculation
-		if ( ! metadata_exists( 'post', $this->id, '_wc_average_rating' ) ) {
-			if ( $count = $this->get_rating_count() ) {
-				$ratings = $wpdb->get_var( $wpdb->prepare("
-					SELECT SUM(meta_value) FROM $wpdb->commentmeta
-					LEFT JOIN $wpdb->comments ON $wpdb->commentmeta.comment_id = $wpdb->comments.comment_ID
-					WHERE meta_key = 'rating'
-					AND comment_post_ID = %d
-					AND comment_approved = '1'
-					AND meta_value > 0
-				", $this->id ) );
-				$average = number_format( $ratings / $count, 2, '.', '' );
-			} else {
-				$average = 0;
-			}
-			update_post_meta( $this->id, '_wc_average_rating', $average );
+	protected function get_availability_text() {
+		if ( ! $this->is_in_stock() ) {
+			$availability = __( 'Out of stock', 'woocommerce' );
+		} elseif ( $this->managing_stock() && $this->is_on_backorder( 1 ) ) {
+			$availability = $this->backorders_require_notification() ? __( 'Available on backorder', 'woocommerce' ) : '';
+		} elseif ( $this->managing_stock() ) {
+			$availability = wc_format_stock_for_display( $this );
 		} else {
-			$average = get_post_meta( $this->id, '_wc_average_rating', true );
+			$availability = '';
 		}
-
-		return (string) floatval( $average );
+		return apply_filters( 'woocommerce_get_availability_text', $availability, $this );
 	}
 
 	/**
-	 * Get the total amount (COUNT) of ratings.
-	 * @param  int $value Optional. Rating value to get the count for. By default returns the count of all rating values.
-	 * @return int
+	 * Get availability classname based on stock status.
+	 *
+	 * @return string
 	 */
-	public function get_rating_count( $value = null ) {
-		global $wpdb;
-
-		// No meta date? Do the calculation
-		if ( ! metadata_exists( 'post', $this->id, '_wc_rating_count' ) ) {
-			$counts     = array();
-			$raw_counts = $wpdb->get_results( $wpdb->prepare("
-				SELECT meta_value, COUNT( * ) as meta_value_count FROM $wpdb->commentmeta
-				LEFT JOIN $wpdb->comments ON $wpdb->commentmeta.comment_id = $wpdb->comments.comment_ID
-				WHERE meta_key = 'rating'
-				AND comment_post_ID = %d
-				AND comment_approved = '1'
-				AND meta_value > 0
-				GROUP BY meta_value
-			", $this->id ) );
-
-			foreach ( $raw_counts as $count ) {
-				$counts[ $count->meta_value ] = $count->meta_value_count;
-			}
-
-			update_post_meta( $this->id, '_wc_rating_count', $counts );
+	protected function get_availability_class() {
+		if ( ! $this->is_in_stock() ) {
+			$class = 'out-of-stock';
+		} elseif ( $this->managing_stock() && $this->is_on_backorder( 1 ) ) {
+			$class = 'available-on-backorder';
 		} else {
-			$counts = get_post_meta( $this->id, '_wc_rating_count', true );
+			$class = 'in-stock';
 		}
-
-		if ( is_null( $value ) ) {
-			return array_sum( $counts );
-		} else {
-			return isset( $counts[ $value ] ) ? $counts[ $value ] : 0;
-		}
-	}
-
-	/**
-	 * Returns the product rating in html format.
-	 *
-	 * @param string $rating (default: '')
-	 *
-	 * @return string
-	 */
-	public function get_rating_html( $rating = null ) {
-		$rating_html = '';
-
-		if ( ! is_numeric( $rating ) ) {
-			$rating = $this->get_average_rating();
-		}
-
-		if ( $rating > 0 ) {
-
-			$rating_html  = '<div class="star-rating" title="' . sprintf( __( 'Rated %s out of 5', 'woocommerce' ), $rating ) . '">';
-
-			$rating_html .= '<span style="width:' . ( ( $rating / 5 ) * 100 ) . '%"><strong class="rating">' . $rating . '</strong> ' . __( 'out of 5', 'woocommerce' ) . '</span>';
-
-			$rating_html .= '</div>';
-		}
-
-		return apply_filters( 'woocommerce_product_get_rating_html', $rating_html, $rating );
-	}
-
-	/**
-	 * Get the total amount (COUNT) of reviews.
-	 *
-	 * @since 2.3.2
-	 * @return int The total numver of product reviews
-	 */
-	public function get_review_count() {
-		global $wpdb;
-
-		// No meta date? Do the calculation
-		if ( ! metadata_exists( 'post', $this->id, '_wc_review_count' ) ) {
-			$count = $wpdb->get_var( $wpdb->prepare("
-				SELECT COUNT(*) FROM $wpdb->comments
-				WHERE comment_parent = 0
-				AND comment_post_ID = %d
-				AND comment_approved = '1'
-			", $this->id ) );
-
-			update_post_meta( $this->id, '_wc_review_count', $count );
-		} else {
-			$count = get_post_meta( $this->id, '_wc_review_count', true );
-		}
-
-		return apply_filters( 'woocommerce_product_review_count', $count, $this );
-	}
-
-	/**
-	 * Returns the upsell product ids.
-	 *
-	 * @return array
-	 */
-	public function get_upsells() {
-		return apply_filters( 'woocommerce_product_upsell_ids', (array) maybe_unserialize( $this->upsell_ids ), $this );
-	}
-
-	/**
-	 * Returns the cross sell product ids.
-	 *
-	 * @return array
-	 */
-	public function get_cross_sells() {
-		return apply_filters( 'woocommerce_product_crosssell_ids', (array) maybe_unserialize( $this->crosssell_ids ), $this );
-	}
-
-	/**
-	 * Returns the product categories.
-	 *
-	 * @param string $sep (default: ', ')
-	 * @param string $before (default: '')
-	 * @param string $after (default: '')
-	 * @return string
-	 */
-	public function get_categories( $sep = ', ', $before = '', $after = '' ) {
-		return get_the_term_list( $this->id, 'product_cat', $before, $sep, $after );
-	}
-
-	/**
-	 * Returns the product tags.
-	 *
-	 * @param string $sep (default: ', ')
-	 * @param string $before (default: '')
-	 * @param string $after (default: '')
-	 * @return array
-	 */
-	public function get_tags( $sep = ', ', $before = '', $after = '' ) {
-		return get_the_term_list( $this->id, 'product_tag', $before, $sep, $after );
-	}
-
-	/**
-	 * Returns the product shipping class.
-	 *
-	 * @return string
-	 */
-	public function get_shipping_class() {
-
-		if ( ! $this->shipping_class ) {
-
-			$classes = get_the_terms( $this->id, 'product_shipping_class' );
-
-			if ( $classes && ! is_wp_error( $classes ) ) {
-				$this->shipping_class = current( $classes )->slug;
-			} else {
-				$this->shipping_class = '';
-			}
-
-		}
-
-		return $this->shipping_class;
-	}
-
-	/**
-	 * Returns the product shipping class ID.
-	 *
-	 * @return int
-	 */
-	public function get_shipping_class_id() {
-
-		if ( ! $this->shipping_class_id ) {
-
-			$classes = get_the_terms( $this->id, 'product_shipping_class' );
-
-			if ( $classes && ! is_wp_error( $classes ) ) {
-				$this->shipping_class_id = current( $classes )->term_id;
-			} else {
-				$this->shipping_class_id = 0;
-			}
-		}
-
-		return absint( $this->shipping_class_id );
-	}
-
-	/**
-	 * Get and return related products.
-	 *
-	 * Notes:
-	 * 	- Results are cached in a transient for faster queries.
-	 *  - To make results appear random, we query and extra 10 products and shuffle them.
-	 *  - To ensure we always have enough results, it will check $limit before returning the cached result, if not recalc.
-	 *  - This used to rely on transient version to invalidate cache, but to avoid multiple transients we now just expire daily.
-	 *  	This means if a related product is edited and no longer related, it won't be removed for 24 hours. Acceptable trade-off for performance.
-	 *  - Saving a product will flush caches for that product.
-	 *
-	 * @param int $limit (default: 5)
-	 * @return array Array of post IDs
-	 */
-	public function get_related( $limit = 5 ) {
-		global $wpdb;
-
-		$transient_name = 'wc_related_' . $this->id;
-		$related_posts  = get_transient( $transient_name );
-
-		// We want to query related posts if they are not cached, or we don't have enough
-		if ( false === $related_posts || sizeof( $related_posts ) < $limit ) {
-			// Related products are found from category and tag
-			$tags_array = $this->get_related_terms( 'product_tag' );
-			$cats_array = $this->get_related_terms( 'product_cat' );
-
-			// Don't bother if none are set
-			if ( 1 === sizeof( $cats_array ) && 1 === sizeof( $tags_array )) {
-				$related_posts = array();
-			} else {
-				// Sanitize
-				$exclude_ids = array_map( 'absint', array_merge( array( 0, $this->id ), $this->get_upsells() ) );
-
-				// Generate query - but query an extra 10 results to give the appearance of random results
-				$query = $this->build_related_query( $cats_array, $tags_array, $exclude_ids, $limit + 10 );
-
-				// Get the posts
-				$related_posts = $wpdb->get_col( implode( ' ', $query ) );
-			}
-
-			set_transient( $transient_name, $related_posts, DAY_IN_SECONDS );
-		}
-
-		// Randomise the results
-		shuffle( $related_posts );
-
-		// Limit the returned results
-		return array_slice( $related_posts, 0, $limit );
-	}
-
-	/**
-	 * Returns a single product attribute.
-	 *
-	 * @param mixed $attr
-	 * @return string
-	 */
-	public function get_attribute( $attr ) {
-
-		$attributes = $this->get_attributes();
-
-		$attr = sanitize_title( $attr );
-
-		if ( isset( $attributes[ $attr ] ) || isset( $attributes[ 'pa_' . $attr ] ) ) {
-
-			$attribute = isset( $attributes[ $attr ] ) ? $attributes[ $attr ] : $attributes[ 'pa_' . $attr ];
-
-			if ( $attribute['is_taxonomy'] ) {
-
-				return implode( ', ', wc_get_product_terms( $this->id, $attribute['name'], array( 'fields' => 'names' ) ) );
-
-			} else {
-
-				return $attribute['value'];
-			}
-
-		}
-
-		return '';
-	}
-
-	/**
-	 * Returns product attributes.
-	 *
-	 * @return array
-	 */
-	public function get_attributes() {
-		$attributes = array_filter( (array) maybe_unserialize( $this->product_attributes ) );
-		$taxonomies = wp_list_pluck( wc_get_attribute_taxonomies(), 'attribute_name' );
-
-		// Check for any attributes which have been removed globally
-		foreach ( $attributes as $key => $attribute ) {
-			if ( $attribute['is_taxonomy'] ) {
-				if ( ! in_array( substr( $attribute['name'], 3 ), $taxonomies ) ) {
-					unset( $attributes[ $key ] );
-				}
-			}
-		}
-
-		return apply_filters( 'woocommerce_get_product_attributes', $attributes );
-	}
-
-	/**
-	 * Returns whether or not the product has any attributes set.
-	 *
-	 * @return boolean
-	 */
-	public function has_attributes() {
-
-		if ( sizeof( $this->get_attributes() ) > 0 ) {
-
-			foreach ( $this->get_attributes() as $attribute ) {
-
-				if ( isset( $attribute['is_visible'] ) && $attribute['is_visible'] ) {
-					return true;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns whether or not we are showing dimensions on the product page.
-	 *
-	 * @return bool
-	 */
-	public function enable_dimensions_display() {
-		return apply_filters( 'wc_product_enable_dimensions_display', true );
-	}
-
-	/**
-	 * Returns whether or not the product has dimensions set.
-	 *
-	 * @return bool
-	 */
-	public function has_dimensions() {
-		return $this->get_dimensions() ? true : false;
-	}
-
-	/**
-	 * Returns the product length.
-	 * @return string
-	 */
-	public function get_length() {
-		return apply_filters( 'woocommerce_product_length', $this->length ? $this->length : '', $this );
-	}
-
-	/**
-	 * Returns the product width.
-	 * @return string
-	 */
-	public function get_width() {
-		return apply_filters( 'woocommerce_product_width', $this->width ? $this->width : '', $this );
-	}
-
-	/**
-	 * Returns the product height.
-	 * @return string
-	 */
-	public function get_height() {
-		return apply_filters( 'woocommerce_product_height', $this->height ? $this->height : '', $this );
-	}
-
-	/**
-	 * Returns the product's weight.
-	 * @todo   refactor filters in this class to naming woocommerce_product_METHOD
-	 * @return string
-	 */
-	public function get_weight() {
-		return apply_filters( 'woocommerce_product_weight', apply_filters( 'woocommerce_product_get_weight', $this->weight ? $this->weight : '' ), $this );
-	}
-
-	/**
-	 * Returns whether or not the product has weight set.
-	 *
-	 * @return bool
-	 */
-	public function has_weight() {
-		return $this->get_weight() ? true : false;
-	}
-
-	/**
-	 * Returns formatted dimensions.
-	 * @return string
-	 */
-	public function get_dimensions() {
-		$dimensions = implode( ' x ', array_filter( array(
-			$this->get_length(),
-			$this->get_width(),
-			$this->get_height(),
-		) ) );
-
-		if ( ! empty( $dimensions ) ) {
-			$dimensions .= ' ' . get_option( 'woocommerce_dimension_unit' );
-		}
-
-		return  apply_filters( 'woocommerce_product_dimensions', $dimensions, $this );
-	}
-
-	/**
-	 * Lists a table of attributes for the product page.
-	 */
-	public function list_attributes() {
-		wc_get_template( 'single-product/product-attributes.php', array(
-			'product'    => $this
-		) );
-	}
-
-	/**
-	 * Gets the main product image ID.
-	 *
-	 * @return int
-	 */
-	public function get_image_id() {
-
-		if ( has_post_thumbnail( $this->id ) ) {
-			$image_id = get_post_thumbnail_id( $this->id );
-		} elseif ( ( $parent_id = wp_get_post_parent_id( $this->id ) ) && has_post_thumbnail( $parent_id ) ) {
-			$image_id = get_post_thumbnail_id( $parent_id );
-		} else {
-			$image_id = 0;
-		}
-
-		return $image_id;
-	}
-
-	/**
-	 * Returns the main product image.
-	 *
-	 * @param string $size (default: 'shop_thumbnail')
-	 * @return string
-	 */
-	public function get_image( $size = 'shop_thumbnail', $attr = array() ) {
-		if ( has_post_thumbnail( $this->id ) ) {
-			$image = get_the_post_thumbnail( $this->id, $size, $attr );
-		} elseif ( ( $parent_id = wp_get_post_parent_id( $this->id ) ) && has_post_thumbnail( $parent_id ) ) {
-			$image = get_the_post_thumbnail( $parent_id, $size, $attr );
-		} else {
-			$image = wc_placeholder_img( $size );
-		}
-
-		return $image;
-	}
-
-	/**
-	 * Get product name with SKU or ID. Used within admin.
-	 *
-	 * @return string Formatted product name
-	 */
-	public function get_formatted_name() {
-
-		if ( $this->get_sku() ) {
-			$identifier = $this->get_sku();
-		} else {
-			$identifier = '#' . $this->id;
-		}
-
-		return sprintf( __( '%s &ndash; %s', 'woocommerce' ), $identifier, $this->get_title() );
-	}
-
-	/**
-	 * Retrieves related product terms.
-	 *
-	 * @param string $term
-	 * @return array
-	 */
-	protected function get_related_terms( $term ) {
-		$terms_array = array(0);
-
-		$terms = apply_filters( 'woocommerce_get_related_' . $term . '_terms', wp_get_post_terms( $this->id, $term ), $this->id );
-		foreach ( $terms as $term ) {
-			$terms_array[] = $term->term_id;
-		}
-
-		return array_map( 'absint', $terms_array );
-	}
-
-	/**
-	 * Builds the related posts query.
-	 *
-	 * @param array $cats_array
-	 * @param array $tags_array
-	 * @param array $exclude_ids
-	 * @param int   $limit
-	 * @return string
-	 */
-	protected function build_related_query( $cats_array, $tags_array, $exclude_ids, $limit ) {
-		global $wpdb;
-
-		$limit = absint( $limit );
-
-		$query           = array();
-		$query['fields'] = "SELECT DISTINCT ID FROM {$wpdb->posts} p";
-		$query['join']   = " INNER JOIN {$wpdb->postmeta} pm ON ( pm.post_id = p.ID AND pm.meta_key='_visibility' )";
-		$query['join']  .= " INNER JOIN {$wpdb->term_relationships} tr ON (p.ID = tr.object_id)";
-		$query['join']  .= " INNER JOIN {$wpdb->term_taxonomy} tt ON (tr.term_taxonomy_id = tt.term_taxonomy_id)";
-		$query['join']  .= " INNER JOIN {$wpdb->terms} t ON (t.term_id = tt.term_id)";
-
-		if ( get_option( 'woocommerce_hide_out_of_stock_items' ) === 'yes' ) {
-			$query['join'] .= " INNER JOIN {$wpdb->postmeta} pm2 ON ( pm2.post_id = p.ID AND pm2.meta_key='_stock_status' )";
-		}
-
-		$query['where']  = " WHERE 1=1";
-		$query['where'] .= " AND p.post_status = 'publish'";
-		$query['where'] .= " AND p.post_type = 'product'";
-		$query['where'] .= " AND p.ID NOT IN ( " . implode( ',', $exclude_ids ) . " )";
-		$query['where'] .= " AND pm.meta_value IN ( 'visible', 'catalog' )";
-
-		if ( get_option( 'woocommerce_hide_out_of_stock_items' ) === 'yes' ) {
-			$query['where'] .= " AND pm2.meta_value = 'instock'";
-		}
-
-		if ( apply_filters( 'woocommerce_product_related_posts_relate_by_category', true, $this->id ) ) {
-			$query['where'] .= " AND ( tt.taxonomy = 'product_cat' AND t.term_id IN ( " . implode( ',', $cats_array ) . " ) )";
-			$andor = 'OR';
-		} else {
-			$andor = 'AND';
-		}
-
-		// when query is OR - need to check against excluded ids again
-		if ( apply_filters( 'woocommerce_product_related_posts_relate_by_tag', true, $this->id ) ) {
-			$query['where'] .= " {$andor} ( ( tt.taxonomy = 'product_tag' AND t.term_id IN ( " . implode( ',', $tags_array ) . " ) )";
-			$query['where'] .= " AND p.ID NOT IN ( " . implode( ',', $exclude_ids ) . " ) )";
-		}
-
-		$query['limits'] = " LIMIT {$limit} ";
-		$query           = apply_filters( 'woocommerce_product_related_posts_query', $query, $this->id );
-
-		return $query;
+		return apply_filters( 'woocommerce_get_availability_class', $class, $this );
 	}
 }
diff --git a/includes/abstracts/abstract-wc-rest-controller.php b/includes/abstracts/abstract-wc-rest-controller.php
new file mode 100644
index 00000000000..c2c39555635
--- /dev/null
+++ b/includes/abstracts/abstract-wc-rest-controller.php
@@ -0,0 +1,387 @@
+<?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Abstract Rest Controller Class
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/Abstracts
+ * @extends  WP_REST_Controller
+ * @version  2.6.0
+ */
+abstract class WC_REST_Controller extends WP_REST_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v1';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = '';
+
+	/**
+	 * Add the schema from additional fields to an schema array.
+	 *
+	 * The type of object is inferred from the passed schema.
+	 *
+	 * @param array $schema Schema array.
+	 */
+	protected function add_additional_fields_schema( $schema ) {
+		if ( empty( $schema['title'] ) ) {
+			return $schema;
+		}
+
+		/**
+		 * Can't use $this->get_object_type otherwise we cause an inf loop.
+		 */
+		$object_type = $schema['title'];
+
+		$additional_fields = $this->get_additional_fields( $object_type );
+
+		foreach ( $additional_fields as $field_name => $field_options ) {
+			if ( ! $field_options['schema'] ) {
+				continue;
+			}
+
+			$schema['properties'][ $field_name ] = $field_options['schema'];
+		}
+
+		$schema['properties'] = apply_filters( 'woocommerce_rest_' . $object_type . '_schema', $schema['properties'] );
+
+		return $schema;
+	}
+
+	/**
+	 * Get normalized rest base.
+	 *
+	 * @return string
+	 */
+	protected function get_normalized_rest_base() {
+		return preg_replace( '/\(.*\)\//i', '', $this->rest_base );
+	}
+
+	/**
+	 * Check batch limit.
+	 *
+	 * @param array $items Request items.
+	 * @return bool|WP_Error
+	 */
+	protected function check_batch_limit( $items ) {
+		$limit = apply_filters( 'woocommerce_rest_batch_items_limit', 100, $this->get_normalized_rest_base() );
+		$total = 0;
+
+		if ( ! empty( $items['create'] ) ) {
+			$total += count( $items['create'] );
+		}
+
+		if ( ! empty( $items['update'] ) ) {
+			$total += count( $items['update'] );
+		}
+
+		if ( ! empty( $items['delete'] ) ) {
+			$total += count( $items['delete'] );
+		}
+
+		if ( $total > $limit ) {
+			/* translators: %s: items limit */
+			return new WP_Error( 'woocommerce_rest_request_entity_too_large', sprintf( __( 'Unable to accept more than %s items for this request.', 'woocommerce' ), $limit ), array( 'status' => 413 ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Bulk create, update and delete items.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return array Of WP_Error or WP_REST_Response.
+	 */
+	public function batch_items( $request ) {
+		/** @var WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+
+		// Get the request params.
+		$items    = array_filter( $request->get_params() );
+		$response = array();
+
+		// Check batch limit.
+		$limit = $this->check_batch_limit( $items );
+		if ( is_wp_error( $limit ) ) {
+			return $limit;
+		}
+
+		if ( ! empty( $items['create'] ) ) {
+			foreach ( $items['create'] as $item ) {
+				$_item = new WP_REST_Request( 'POST' );
+
+				// Default parameters.
+				$defaults = array();
+				$schema   = $this->get_public_item_schema();
+				foreach ( $schema['properties'] as $arg => $options ) {
+					if ( isset( $options['default'] ) ) {
+						$defaults[ $arg ] = $options['default'];
+					}
+				}
+				$_item->set_default_params( $defaults );
+
+				// Set request parameters.
+				$_item->set_body_params( $item );
+				$_response = $this->create_item( $_item );
+
+				if ( is_wp_error( $_response ) ) {
+					$response['create'][] = array(
+						'id'    => 0,
+						'error' => array( 'code' => $_response->get_error_code(), 'message' => $_response->get_error_message(), 'data' => $_response->get_error_data() ),
+					);
+				} else {
+					$response['create'][] = $wp_rest_server->response_to_data( $_response, '' );
+				}
+			}
+		}
+
+		if ( ! empty( $items['update'] ) ) {
+			foreach ( $items['update'] as $item ) {
+				$_item = new WP_REST_Request( 'PUT' );
+				$_item->set_body_params( $item );
+				$_response = $this->update_item( $_item );
+
+				if ( is_wp_error( $_response ) ) {
+					$response['update'][] = array(
+						'id'    => $item['id'],
+						'error' => array( 'code' => $_response->get_error_code(), 'message' => $_response->get_error_message(), 'data' => $_response->get_error_data() ),
+					);
+				} else {
+					$response['update'][] = $wp_rest_server->response_to_data( $_response, '' );
+				}
+			}
+		}
+
+		if ( ! empty( $items['delete'] ) ) {
+			foreach ( $items['delete'] as $id ) {
+				$id = (int) $id;
+
+				if ( 0 === $id ) {
+					continue;
+				}
+
+				$_item = new WP_REST_Request( 'DELETE' );
+				$_item->set_query_params( array( 'id' => $id, 'force' => true ) );
+				$_response = $this->delete_item( $_item );
+
+				if ( is_wp_error( $_response ) ) {
+					$response['delete'][] = array(
+						'id'    => $id,
+						'error' => array( 'code' => $_response->get_error_code(), 'message' => $_response->get_error_message(), 'data' => $_response->get_error_data() ),
+					);
+				} else {
+					$response['delete'][] = $wp_rest_server->response_to_data( $_response, '' );
+				}
+			}
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Validate a text value for a text based setting.
+	 *
+	 * @since 3.0.0
+	 * @param string $value
+	 * @param array  $setting
+	 * @return string
+	 */
+	public function validate_setting_text_field( $value, $setting ) {
+		$value = is_null( $value ) ? '' : $value;
+		return wp_kses_post( trim( stripslashes( $value ) ) );
+		return $value;
+	}
+
+	/**
+	 * Validate select based settings.
+	 *
+	 * @since 3.0.0
+	 * @param string $value
+	 * @param array  $setting
+	 * @return string|WP_Error
+	 */
+	public function validate_setting_select_field( $value, $setting ) {
+		if ( array_key_exists( $value, $setting['options'] ) ) {
+			return $value;
+		} else {
+			return new WP_Error( 'rest_setting_value_invalid', __( 'An invalid setting value was passed.', 'woocommerce' ), array( 'status' => 400 ) );
+		}
+	}
+
+	/**
+	 * Validate multiselect based settings.
+	 *
+	 * @since 3.0.0
+	 * @param array $values
+	 * @param array  $setting
+	 * @return string|WP_Error
+	 */
+	public function validate_setting_multiselect_field( $values, $setting ) {
+		if ( empty( $values ) ) {
+			return array();
+		}
+
+		if ( ! is_array( $values ) ) {
+			return new WP_Error( 'rest_setting_value_invalid', __( 'An invalid setting value was passed.', 'woocommerce' ), array( 'status' => 400 ) );
+		}
+
+		$final_values = array();
+		foreach ( $values as $value ) {
+			if ( array_key_exists( $value, $setting['options'] ) ) {
+				$final_values[] = $value;
+			}
+		}
+
+		return $final_values;
+	}
+
+	/**
+	 * Validate image_width based settings.
+	 *
+	 * @since 3.0.0
+	 * @param array $value
+	 * @param array $setting
+	 * @return string|WP_Error
+	 */
+	public function validate_setting_image_width_field( $values, $setting ) {
+		if ( ! is_array( $values ) ) {
+			return new WP_Error( 'rest_setting_value_invalid', __( 'An invalid setting value was passed.', 'woocommerce' ), array( 'status' => 400 ) );
+		}
+
+		$current = $setting['value'];
+		if ( isset( $values['width'] ) ) {
+			$current['width'] = intval( $values['width'] );
+		}
+		if ( isset( $values['height'] ) ) {
+			$current['height'] = intval( $values['height'] );
+		}
+		if ( isset( $values['crop'] ) ) {
+			$current['crop'] = (bool) $values['crop'];
+		}
+		return $current;
+	}
+
+	/**
+	 * Validate radio based settings.
+	 *
+	 * @since 3.0.0
+	 * @param string $value
+	 * @param array  $setting
+	 * @return string|WP_Error
+	 */
+	public function validate_setting_radio_field( $value, $setting ) {
+		return $this->validate_setting_select_field( $value, $setting );
+	}
+
+	/**
+	 * Validate checkbox based settings.
+	 *
+	 * @since 3.0.0
+	 * @param string $value
+	 * @param array  $setting
+	 * @return string|WP_Error
+	 */
+	public function validate_setting_checkbox_field( $value, $setting ) {
+		if ( in_array( $value, array( 'yes', 'no' ) ) ) {
+			return $value;
+		} elseif ( empty( $value ) ) {
+			$value = isset( $setting['default'] ) ? $setting['default'] : 'no';
+			return $value;
+		} else {
+			return new WP_Error( 'rest_setting_value_invalid', __( 'An invalid setting value was passed.', 'woocommerce' ), array( 'status' => 400 ) );
+		}
+	}
+
+	/**
+	 * Validate textarea based settings.
+	 *
+	 * @since 3.0.0
+	 * @param string $value
+	 * @param array  $setting
+	 * @return string
+	 */
+	public function validate_setting_textarea_field( $value, $setting ) {
+		$value = is_null( $value ) ? '' : $value;
+		return wp_kses( trim( stripslashes( $value ) ),
+			array_merge(
+				array(
+					'iframe' => array( 'src' => true, 'style' => true, 'id' => true, 'class' => true ),
+				),
+				wp_kses_allowed_html( 'post' )
+			)
+		);
+	}
+
+	/**
+	 * Add meta query.
+	 *
+	 * @since 3.0.0
+	 * @param array $args       Query args.
+	 * @param array $meta_query Meta query.
+	 * @return array
+	 */
+	protected function add_meta_query( $args, $meta_query ) {
+		if ( ! empty( $args['meta_query'] ) ) {
+			$args['meta_query'] = array();
+		}
+
+		$args['meta_query'][] = $meta_query;
+
+		return $args['meta_query'];
+	}
+
+	/**
+	 * Get the batch schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_public_batch_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'batch',
+			'type'       => 'object',
+			'properties' => array(
+				'create' => array(
+					'description' => __( 'List of created resources.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'    => 'object',
+					),
+				),
+				'update' => array(
+					'description' => __( 'List of updated resources.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'    => 'object',
+					),
+				),
+				'delete' => array(
+					'description' => __( 'List of delete resources.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'    => 'integer',
+					),
+				),
+			),
+		);
+
+		return $schema;
+	}
+}
diff --git a/includes/abstracts/abstract-wc-rest-crud-controller.php b/includes/abstracts/abstract-wc-rest-crud-controller.php
new file mode 100644
index 00000000000..6226351f002
--- /dev/null
+++ b/includes/abstracts/abstract-wc-rest-crud-controller.php
@@ -0,0 +1,581 @@
+<?php
+/**
+ * Abstract Rest CRUD Controller Class
+ *
+ * @author   Automattic
+ * @category API
+ * @package  WooCommerce/Abstracts
+ * @version  3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC_REST_CRUD_Controller class.
+ *
+ * @extends WC_REST_Posts_Controller
+ */
+abstract class WC_REST_CRUD_Controller extends WC_REST_Posts_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v2';
+
+	/**
+	 * If object is hierarchical.
+	 *
+	 * @var bool
+	 */
+	protected $hierarchical = false;
+
+	/**
+	 * Get object.
+	 *
+	 * @param  int $id Object ID.
+	 * @return WP_Error|WC_Data
+	 */
+	protected function get_object( $id ) {
+		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass.", 'woocommerce' ), __METHOD__ ), array( 'status' => 405 ) );
+	}
+
+	/**
+	 * Check if a given request has access to read an item.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_item_permissions_check( $request ) {
+		$object = $this->get_object( (int) $request['id'] );
+
+		if ( $object && 0 !== $object->get_id() && ! wc_rest_check_post_permissions( $this->post_type, 'read', $object->get_id() ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot view this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access to update an item.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function update_item_permissions_check( $request ) {
+		$object = $this->get_object( (int) $request['id'] );
+
+		if ( $object && 0 !== $object->get_id() && ! wc_rest_check_post_permissions( $this->post_type, 'edit', $object->get_id() ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_edit', __( 'Sorry, you are not allowed to edit this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access to delete an item.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return bool|WP_Error
+	 */
+	public function delete_item_permissions_check( $request ) {
+		$object = $this->get_object( (int) $request['id'] );
+
+		if ( $object && 0 !== $object->get_id() && ! wc_rest_check_post_permissions( $this->post_type, 'delete', $object->get_id() ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_delete', __( 'Sorry, you are not allowed to delete this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get object permalink.
+	 *
+	 * @param  int $id Object ID.
+	 * @return string
+	 */
+	protected function get_permalink( $object ) {
+		return '';
+	}
+
+	/**
+	 * Prepares the object for the REST response.
+	 *
+	 * @since  3.0.0
+	 * @param  WC_Data         $object  Object data.
+	 * @param  WP_REST_Request $request Request object.
+	 * @return WP_Error|WP_REST_Response Response object on success, or WP_Error object on failure.
+	 */
+	protected function prepare_object_for_response( $object, $request ) {
+		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass.", 'woocommerce' ), __METHOD__ ), array( 'status' => 405 ) );
+	}
+
+	/**
+	 * Prepares one object for create or update operation.
+	 *
+	 * @since  3.0.0
+	 * @param  WP_REST_Request $request Request object.
+	 * @param  bool            $creating If is creating a new object.
+	 * @return WP_Error|WC_Data The prepared item, or WP_Error object on failure.
+	 */
+	protected function prepare_object_for_database( $request, $creating = false ) {
+		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass.", 'woocommerce' ), __METHOD__ ), array( 'status' => 405 ) );
+	}
+
+	/**
+	 * Get a single item.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function get_item( $request ) {
+		$object = $this->get_object( (int) $request['id'] );
+
+		if ( ! $object || 0 === $object->get_id() ) {
+			return new WP_Error( "woocommerce_rest_{$this->post_type}_invalid_id", __( 'Invalid ID.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$data     = $this->prepare_object_for_response( $object, $request );
+		$response = rest_ensure_response( $data );
+
+		if ( $this->public ) {
+			$response->link_header( 'alternate', $this->get_permalink( $object ), array( 'type' => 'text/html' ) );
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Save an object data.
+	 *
+	 * @since  3.0.0
+	 * @param  WP_REST_Request $request  Full details about the request.
+	 * @param  bool            $creating If is creating a new object.
+	 * @return WC_Data|WP_Error
+	 */
+	protected function save_object( $request, $creating = false ) {
+		try {
+			$object = $this->prepare_object_for_database( $request, $creating );
+
+			if ( is_wp_error( $object ) ) {
+				return $object;
+			}
+
+			$object->save();
+
+			return $this->get_object( $object->get_id() );
+		} catch ( WC_Data_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), $e->getErrorData() );
+		} catch ( WC_REST_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
+		}
+	}
+
+	/**
+	 * Create a single item.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function create_item( $request ) {
+		if ( ! empty( $request['id'] ) ) {
+			/* translators: %s: post type */
+			return new WP_Error( "woocommerce_rest_{$this->post_type}_exists", sprintf( __( 'Cannot create existing %s.', 'woocommerce' ), $this->post_type ), array( 'status' => 400 ) );
+		}
+
+		$object = $this->save_object( $request, true );
+
+		if ( is_wp_error( $object ) ) {
+			return $object;
+		}
+
+		$this->update_additional_fields_for_object( $object, $request );
+
+		/**
+		 * Fires after a single object is created or updated via the REST API.
+		 *
+		 * @param WC_Data         $object    Inserted object.
+		 * @param WP_REST_Request $request   Request object.
+		 * @param boolean         $creating  True when creating object, false when updating.
+		 */
+		do_action( "woocommerce_rest_insert_{$this->post_type}_object", $object, $request, true );
+
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_object_for_response( $object, $request );
+		$response = rest_ensure_response( $response );
+		$response->set_status( 201 );
+		$response->header( 'Location', rest_url( sprintf( '/%s/%s/%d', $this->namespace, $this->rest_base, $object->get_id() ) ) );
+
+		return $response;
+	}
+
+	/**
+	 * Update a single post.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function update_item( $request ) {
+		$object = $this->get_object( (int) $request['id'] );
+
+		if ( ! $object || 0 === $object->get_id() ) {
+			return new WP_Error( "woocommerce_rest_{$this->post_type}_invalid_id", __( 'Invalid ID.', 'woocommerce' ), array( 'status' => 400 ) );
+		}
+
+		$object = $this->save_object( $request, false );
+
+		if ( is_wp_error( $object ) ) {
+			return $object;
+		}
+
+		$this->update_additional_fields_for_object( $object, $request );
+
+		/**
+		 * Fires after a single object is created or updated via the REST API.
+		 *
+		 * @param WC_Data         $object    Inserted object.
+		 * @param WP_REST_Request $request   Request object.
+		 * @param boolean         $creating  True when creating object, false when updating.
+		 */
+		do_action( "woocommerce_rest_insert_{$this->post_type}_object", $object, $request, false );
+
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_object_for_response( $object, $request );
+		return rest_ensure_response( $response );
+	}
+
+	/**
+	 * Prepare objects query.
+	 *
+	 * @since  3.0.0
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return array
+	 */
+	protected function prepare_objects_query( $request ) {
+		$args                        = array();
+		$args['offset']              = $request['offset'];
+		$args['order']               = $request['order'];
+		$args['orderby']             = $request['orderby'];
+		$args['paged']               = $request['page'];
+		$args['post__in']            = $request['include'];
+		$args['post__not_in']        = $request['exclude'];
+		$args['posts_per_page']      = $request['per_page'];
+		$args['name']                = $request['slug'];
+		$args['post_parent__in']     = $request['parent'];
+		$args['post_parent__not_in'] = $request['parent_exclude'];
+		$args['s']                   = $request['search'];
+
+		$args['date_query'] = array();
+		// Set before into date query. Date query must be specified as an array of an array.
+		if ( isset( $request['before'] ) ) {
+			$args['date_query'][0]['before'] = $request['before'];
+		}
+
+		// Set after into date query. Date query must be specified as an array of an array.
+		if ( isset( $request['after'] ) ) {
+			$args['date_query'][0]['after'] = $request['after'];
+		}
+
+		// Force the post_type argument, since it's not a user input variable.
+		$args['post_type'] = $this->post_type;
+
+		/**
+		 * Filter the query arguments for a request.
+		 *
+		 * Enables adding extra arguments or setting defaults for a post
+		 * collection request.
+		 *
+		 * @param array           $args    Key value array of query var to query value.
+		 * @param WP_REST_Request $request The request used.
+		 */
+		$args = apply_filters( "woocommerce_rest_{$this->post_type}_object_query", $args, $request );
+
+		return $this->prepare_items_query( $args, $request );
+	}
+
+	/**
+	 * Get objects.
+	 *
+	 * @since  3.0.0
+	 * @param  array $query_args Query args.
+	 * @return array
+	 */
+	protected function get_objects( $query_args ) {
+		$query  = new WP_Query();
+		$result = $query->query( $query_args );
+
+		$total_posts = $query->found_posts;
+		if ( $total_posts < 1 ) {
+			// Out-of-bounds, run the query again without LIMIT for total count.
+			unset( $query_args['paged'] );
+			$count_query = new WP_Query();
+			$count_query->query( $query_args );
+			$total_posts = $count_query->found_posts;
+		}
+
+		return array(
+			'objects' => array_map( array( $this, 'get_object' ), $result ),
+			'total'   => (int) $total_posts,
+			'pages'   => (int) ceil( $total_posts / (int) $query->query_vars['posts_per_page'] ),
+		);
+	}
+
+	/**
+	 * Get a collection of posts.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function get_items( $request ) {
+		$query_args    = $this->prepare_objects_query( $request );
+		$query_results = $this->get_objects( $query_args );
+
+		$objects = array();
+		foreach ( $query_results['objects'] as $object ) {
+			if ( ! wc_rest_check_post_permissions( $this->post_type, 'read', $object->get_id() ) ) {
+				continue;
+			}
+
+			$data = $this->prepare_object_for_response( $object, $request );
+			$objects[] = $this->prepare_response_for_collection( $data );
+		}
+
+		$page      = (int) $query_args['paged'];
+		$max_pages = $query_results['pages'];
+
+		$response = rest_ensure_response( $objects );
+		$response->header( 'X-WP-Total', $query_results['total'] );
+		$response->header( 'X-WP-TotalPages', (int) $max_pages );
+
+		$base = add_query_arg( $request->get_query_params(), rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ) );
+
+		if ( $page > 1 ) {
+			$prev_page = $page - 1;
+			if ( $prev_page > $max_pages ) {
+				$prev_page = $max_pages;
+			}
+			$prev_link = add_query_arg( 'page', $prev_page, $base );
+			$response->link_header( 'prev', $prev_link );
+		}
+		if ( $max_pages > $page ) {
+			$next_page = $page + 1;
+			$next_link = add_query_arg( 'page', $next_page, $base );
+			$response->link_header( 'next', $next_link );
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Delete a single item.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Response|WP_Error
+	 */
+	public function delete_item( $request ) {
+		$id     = (int) $request['id'];
+		$force  = (bool) $request['force'];
+		$object = $this->get_object( (int) $request['id'] );
+		$result = false;
+
+		if ( ! $object || 0 === $object->get_id() ) {
+			return new WP_Error( "woocommerce_rest_{$this->post_type}_invalid_id", __( 'Invalid ID.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$supports_trash = EMPTY_TRASH_DAYS > 0 && is_callable( array( $object, 'get_status' ) );
+
+		/**
+		 * Filter whether an object is trashable.
+		 *
+		 * Return false to disable trash support for the object.
+		 *
+		 * @param boolean $supports_trash Whether the object type support trashing.
+		 * @param WC_Data $object         The object being considered for trashing support.
+		 */
+		$supports_trash = apply_filters( "woocommerce_rest_{$this->post_type}_object_trashable", $supports_trash, $object );
+
+		if ( ! wc_rest_check_post_permissions( $this->post_type, 'delete', $object->get_id() ) ) {
+			/* translators: %s: post type */
+			return new WP_Error( "woocommerce_rest_user_cannot_delete_{$this->post_type}", sprintf( __( 'Sorry, you are not allowed to delete %s.', 'woocommerce' ), $this->post_type ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_object_for_response( $object, $request );
+
+		// If we're forcing, then delete permanently.
+		if ( $force ) {
+			$object->delete( true );
+			$result = 0 === $object->get_id();
+		} else {
+			// If we don't support trashing for this type, error out.
+			if ( ! $supports_trash ) {
+				/* translators: %s: post type */
+				return new WP_Error( 'woocommerce_rest_trash_not_supported', sprintf( __( 'The %s does not support trashing.', 'woocommerce' ), $this->post_type ), array( 'status' => 501 ) );
+			}
+
+			// Otherwise, only trash if we haven't already.
+			if ( is_callable( array( $object, 'get_status' ) ) ) {
+				if ( 'trash' === $object->get_status() ) {
+					/* translators: %s: post type */
+					return new WP_Error( 'woocommerce_rest_already_trashed', sprintf( __( 'The %s has already been deleted.', 'woocommerce' ), $this->post_type ), array( 'status' => 410 ) );
+				}
+
+				$object->delete();
+				$result = 'trash' === $object->get_status();
+			}
+		}
+
+		if ( ! $result ) {
+			/* translators: %s: post type */
+			return new WP_Error( 'woocommerce_rest_cannot_delete', sprintf( __( 'The %s cannot be deleted.', 'woocommerce' ), $this->post_type ), array( 'status' => 500 ) );
+		}
+
+		/**
+		 * Fires after a single object is deleted or trashed via the REST API.
+		 *
+		 * @param WC_Data          $object   The deleted or trashed object.
+		 * @param WP_REST_Response $response The response data.
+		 * @param WP_REST_Request  $request  The request sent to the API.
+		 */
+		do_action( "woocommerce_rest_delete_{$this->post_type}_object", $object, $response, $request );
+
+		return $response;
+	}
+
+	/**
+	 * Prepare links for the request.
+	 *
+	 * @param WC_Data         $object  Object data.
+	 * @param WP_REST_Request $request Request object.
+	 * @return array                   Links for the given post.
+	 */
+	protected function prepare_links( $object, $request ) {
+		$links = array(
+			'self' => array(
+				'href' => rest_url( sprintf( '/%s/%s/%d', $this->namespace, $this->rest_base, $object->get_id() ) ),
+			),
+			'collection' => array(
+				'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ),
+			),
+		);
+
+		return $links;
+	}
+
+	/**
+	 * Get the query params for collections of attachments.
+	 *
+	 * @return array
+	 */
+	public function get_collection_params() {
+		$params                       = array();
+		$params['context']            = $this->get_context_param();
+		$params['context']['default'] = 'view';
+
+		$params['page'] = array(
+			'description'        => __( 'Current page of the collection.', 'woocommerce' ),
+			'type'               => 'integer',
+			'default'            => 1,
+			'sanitize_callback'  => 'absint',
+			'validate_callback'  => 'rest_validate_request_arg',
+			'minimum'            => 1,
+		);
+		$params['per_page'] = array(
+			'description'        => __( 'Maximum number of items to be returned in result set.', 'woocommerce' ),
+			'type'               => 'integer',
+			'default'            => 10,
+			'minimum'            => 1,
+			'maximum'            => 100,
+			'sanitize_callback'  => 'absint',
+			'validate_callback'  => 'rest_validate_request_arg',
+		);
+		$params['search'] = array(
+			'description'        => __( 'Limit results to those matching a string.', 'woocommerce' ),
+			'type'               => 'string',
+			'sanitize_callback'  => 'sanitize_text_field',
+			'validate_callback'  => 'rest_validate_request_arg',
+		);
+		$params['after'] = array(
+			'description'        => __( 'Limit response to resources published after a given ISO8601 compliant date.', 'woocommerce' ),
+			'type'               => 'string',
+			'format'             => 'date-time',
+			'validate_callback'  => 'rest_validate_request_arg',
+		);
+		$params['before'] = array(
+			'description'        => __( 'Limit response to resources published before a given ISO8601 compliant date.', 'woocommerce' ),
+			'type'               => 'string',
+			'format'             => 'date-time',
+			'validate_callback'  => 'rest_validate_request_arg',
+		);
+		$params['exclude'] = array(
+			'description'       => __( 'Ensure result set excludes specific IDs.', 'woocommerce' ),
+			'type'              => 'array',
+			'items'             => array(
+				'type'          => 'integer',
+			),
+			'default'           => array(),
+			'sanitize_callback' => 'wp_parse_id_list',
+		);
+		$params['include'] = array(
+			'description'       => __( 'Limit result set to specific ids.', 'woocommerce' ),
+			'type'              => 'array',
+			'items'             => array(
+				'type'          => 'integer',
+			),
+			'default'           => array(),
+			'sanitize_callback' => 'wp_parse_id_list',
+		);
+		$params['offset'] = array(
+			'description'        => __( 'Offset the result set by a specific number of items.', 'woocommerce' ),
+			'type'               => 'integer',
+			'sanitize_callback'  => 'absint',
+			'validate_callback'  => 'rest_validate_request_arg',
+		);
+		$params['order'] = array(
+			'description'        => __( 'Order sort attribute ascending or descending.', 'woocommerce' ),
+			'type'               => 'string',
+			'default'            => 'desc',
+			'enum'               => array( 'asc', 'desc' ),
+			'validate_callback'  => 'rest_validate_request_arg',
+		);
+		$params['orderby'] = array(
+			'description'        => __( 'Sort collection by object attribute.', 'woocommerce' ),
+			'type'               => 'string',
+			'default'            => 'date',
+			'enum'               => array(
+				'date',
+				'id',
+				'include',
+				'title',
+				'slug',
+			),
+			'validate_callback'  => 'rest_validate_request_arg',
+		);
+
+		if ( $this->hierarchical ) {
+			$params['parent'] = array(
+				'description'       => __( 'Limit result set to those of particular parent IDs.', 'woocommerce' ),
+				'type'              => 'array',
+				'items'             => array(
+					'type'          => 'integer',
+				),
+				'sanitize_callback' => 'wp_parse_id_list',
+				'default'           => array(),
+			);
+			$params['parent_exclude'] = array(
+				'description'       => __( 'Limit result set to all items except those of a particular parent ID.', 'woocommerce' ),
+				'type'              => 'array',
+				'items'             => array(
+					'type'          => 'integer',
+				),
+				'sanitize_callback' => 'wp_parse_id_list',
+				'default'           => array(),
+			);
+		}
+
+		return $params;
+	}
+}
diff --git a/includes/abstracts/abstract-wc-rest-posts-controller.php b/includes/abstracts/abstract-wc-rest-posts-controller.php
new file mode 100644
index 00000000000..036a8b4eeb1
--- /dev/null
+++ b/includes/abstracts/abstract-wc-rest-posts-controller.php
@@ -0,0 +1,717 @@
+<?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Abstract Rest Posts Controller Class
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/Abstracts
+ * @version  2.6.0
+ */
+abstract class WC_REST_Posts_Controller extends WC_REST_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v1';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = '';
+
+	/**
+	 * Post type.
+	 *
+	 * @var string
+	 */
+	protected $post_type = '';
+
+	/**
+	 * Controls visibility on frontend.
+	 *
+	 * @var string
+	 */
+	protected $public = false;
+
+	/**
+	 * Check if a given request has access to read items.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_items_permissions_check( $request ) {
+		if ( ! wc_rest_check_post_permissions( $this->post_type, 'read' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot list resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access to create an item.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function create_item_permissions_check( $request ) {
+		if ( ! wc_rest_check_post_permissions( $this->post_type, 'create' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_create', __( 'Sorry, you are not allowed to create resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access to read an item.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_item_permissions_check( $request ) {
+		$post = get_post( (int) $request['id'] );
+
+		if ( $post && ! wc_rest_check_post_permissions( $this->post_type, 'read', $post->ID ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot view this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access to update an item.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function update_item_permissions_check( $request ) {
+		$post = get_post( (int) $request['id'] );
+
+		if ( $post && ! wc_rest_check_post_permissions( $this->post_type, 'edit', $post->ID ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_edit', __( 'Sorry, you are not allowed to edit this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access to delete an item.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return bool|WP_Error
+	 */
+	public function delete_item_permissions_check( $request ) {
+		$post = get_post( (int) $request['id'] );
+
+		if ( $post && ! wc_rest_check_post_permissions( $this->post_type, 'delete', $post->ID ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_delete', __( 'Sorry, you are not allowed to delete this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access batch create, update and delete items.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return boolean
+	 */
+	public function batch_items_permissions_check( $request ) {
+		if ( ! wc_rest_check_post_permissions( $this->post_type, 'batch' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_batch', __( 'Sorry, you are not allowed to batch manipulate this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get a single item.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function get_item( $request ) {
+		$id   = (int) $request['id'];
+		$post = get_post( $id );
+
+		if ( ! empty( $post->post_type ) && 'product_variation' === $post->post_type && 'product' === $this->post_type ) {
+			return new WP_Error( "woocommerce_rest_invalid_{$this->post_type}_id", __( 'To manipulate product variations you should use the /products/&lt;product_id&gt;/variations/&lt;id&gt; endpoint.', 'woocommerce' ), array( 'status' => 404 ) );
+		} elseif ( empty( $id ) || empty( $post->ID ) || $post->post_type !== $this->post_type ) {
+			return new WP_Error( "woocommerce_rest_invalid_{$this->post_type}_id", __( 'Invalid ID.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$data = $this->prepare_item_for_response( $post, $request );
+		$response = rest_ensure_response( $data );
+
+		if ( $this->public ) {
+			$response->link_header( 'alternate', get_permalink( $id ), array( 'type' => 'text/html' ) );
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Create a single item.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function create_item( $request ) {
+		if ( ! empty( $request['id'] ) ) {
+			/* translators: %s: post type */
+			return new WP_Error( "woocommerce_rest_{$this->post_type}_exists", sprintf( __( 'Cannot create existing %s.', 'woocommerce' ), $this->post_type ), array( 'status' => 400 ) );
+		}
+
+		$post = $this->prepare_item_for_database( $request );
+		if ( is_wp_error( $post ) ) {
+			return $post;
+		}
+
+		$post->post_type = $this->post_type;
+		$post_id         = wp_insert_post( $post, true );
+
+		if ( is_wp_error( $post_id ) ) {
+
+			if ( in_array( $post_id->get_error_code(), array( 'db_insert_error' ) ) ) {
+				$post_id->add_data( array( 'status' => 500 ) );
+			} else {
+				$post_id->add_data( array( 'status' => 400 ) );
+			}
+			return $post_id;
+		}
+		$post->ID = $post_id;
+		$post     = get_post( $post_id );
+
+		$this->update_additional_fields_for_object( $post, $request );
+
+		// Add meta fields.
+		$meta_fields = $this->add_post_meta_fields( $post, $request );
+		if ( is_wp_error( $meta_fields ) ) {
+			// Remove post.
+			$this->delete_post( $post );
+
+			return $meta_fields;
+		}
+
+		/**
+		 * Fires after a single item is created or updated via the REST API.
+		 *
+		 * @param WP_Post         $post      Post object.
+		 * @param WP_REST_Request $request   Request object.
+		 * @param boolean         $creating  True when creating item, false when updating.
+		 */
+		do_action( "woocommerce_rest_insert_{$this->post_type}", $post, $request, true );
+
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_item_for_response( $post, $request );
+		$response = rest_ensure_response( $response );
+		$response->set_status( 201 );
+		$response->header( 'Location', rest_url( sprintf( '/%s/%s/%d', $this->namespace, $this->rest_base, $post_id ) ) );
+
+		return $response;
+	}
+
+	/**
+	 * Add post meta fields.
+	 *
+	 * @param WP_Post $post
+	 * @param WP_REST_Request $request
+	 * @return bool|WP_Error
+	 */
+	protected function add_post_meta_fields( $post, $request ) {
+		return true;
+	}
+
+	/**
+	 * Delete post.
+	 *
+	 * @param WP_Post $post
+	 */
+	protected function delete_post( $post ) {
+		wp_delete_post( $post->ID, true );
+	}
+
+	/**
+	 * Update a single post.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function update_item( $request ) {
+		$id   = (int) $request['id'];
+		$post = get_post( $id );
+
+		if ( ! empty( $post->post_type ) && 'product_variation' === $post->post_type && 'product' === $this->post_type ) {
+			return new WP_Error( "woocommerce_rest_invalid_{$this->post_type}_id", __( 'To manipulate product variations you should use the /products/&lt;product_id&gt;/variations/&lt;id&gt; endpoint.', 'woocommerce' ), array( 'status' => 404 ) );
+		} elseif ( empty( $id ) || empty( $post->ID ) || $post->post_type !== $this->post_type ) {
+			return new WP_Error( "woocommerce_rest_{$this->post_type}_invalid_id", __( 'ID is invalid.', 'woocommerce' ), array( 'status' => 400 ) );
+		}
+
+		$post = $this->prepare_item_for_database( $request );
+		if ( is_wp_error( $post ) ) {
+			return $post;
+		}
+		// Convert the post object to an array, otherwise wp_update_post will expect non-escaped input.
+		$post_id = wp_update_post( (array) $post, true );
+		if ( is_wp_error( $post_id ) ) {
+			if ( in_array( $post_id->get_error_code(), array( 'db_update_error' ) ) ) {
+				$post_id->add_data( array( 'status' => 500 ) );
+			} else {
+				$post_id->add_data( array( 'status' => 400 ) );
+			}
+			return $post_id;
+		}
+
+		$post = get_post( $post_id );
+		$this->update_additional_fields_for_object( $post, $request );
+
+		// Update meta fields.
+		$meta_fields = $this->update_post_meta_fields( $post, $request );
+		if ( is_wp_error( $meta_fields ) ) {
+			return $meta_fields;
+		}
+
+		/**
+		 * Fires after a single item is created or updated via the REST API.
+		 *
+		 * @param WP_Post         $post      Post object.
+		 * @param WP_REST_Request $request   Request object.
+		 * @param boolean         $creating  True when creating item, false when updating.
+		 */
+		do_action( "woocommerce_rest_insert_{$this->post_type}", $post, $request, false );
+
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_item_for_response( $post, $request );
+		return rest_ensure_response( $response );
+	}
+
+	/**
+	 * Get a collection of posts.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function get_items( $request ) {
+		$args                         = array();
+		$args['offset']               = $request['offset'];
+		$args['order']                = $request['order'];
+		$args['orderby']              = $request['orderby'];
+		$args['paged']                = $request['page'];
+		$args['post__in']             = $request['include'];
+		$args['post__not_in']         = $request['exclude'];
+		$args['posts_per_page']       = $request['per_page'];
+		$args['name']                 = $request['slug'];
+		$args['post_parent__in']      = $request['parent'];
+		$args['post_parent__not_in']  = $request['parent_exclude'];
+		$args['s']                    = $request['search'];
+
+		$args['date_query'] = array();
+		// Set before into date query. Date query must be specified as an array of an array.
+		if ( isset( $request['before'] ) ) {
+			$args['date_query'][0]['before'] = $request['before'];
+		}
+
+		// Set after into date query. Date query must be specified as an array of an array.
+		if ( isset( $request['after'] ) ) {
+			$args['date_query'][0]['after'] = $request['after'];
+		}
+
+		if ( 'wc/v1' === $this->namespace ) {
+			if ( is_array( $request['filter'] ) ) {
+				$args = array_merge( $args, $request['filter'] );
+				unset( $args['filter'] );
+			}
+		}
+
+		// Force the post_type argument, since it's not a user input variable.
+		$args['post_type'] = $this->post_type;
+
+		/**
+		 * Filter the query arguments for a request.
+		 *
+		 * Enables adding extra arguments or setting defaults for a post
+		 * collection request.
+		 *
+		 * @param array           $args    Key value array of query var to query value.
+		 * @param WP_REST_Request $request The request used.
+		 */
+		$args = apply_filters( "woocommerce_rest_{$this->post_type}_query", $args, $request );
+		$query_args = $this->prepare_items_query( $args, $request );
+
+		$posts_query = new WP_Query();
+		$query_result = $posts_query->query( $query_args );
+
+		$posts = array();
+		foreach ( $query_result as $post ) {
+			if ( ! wc_rest_check_post_permissions( $this->post_type, 'read', $post->ID ) ) {
+				continue;
+			}
+
+			$data = $this->prepare_item_for_response( $post, $request );
+			$posts[] = $this->prepare_response_for_collection( $data );
+		}
+
+		$page = (int) $query_args['paged'];
+		$total_posts = $posts_query->found_posts;
+
+		if ( $total_posts < 1 ) {
+			// Out-of-bounds, run the query again without LIMIT for total count
+			unset( $query_args['paged'] );
+			$count_query = new WP_Query();
+			$count_query->query( $query_args );
+			$total_posts = $count_query->found_posts;
+		}
+
+		$max_pages = ceil( $total_posts / (int) $query_args['posts_per_page'] );
+
+		$response = rest_ensure_response( $posts );
+		$response->header( 'X-WP-Total', (int) $total_posts );
+		$response->header( 'X-WP-TotalPages', (int) $max_pages );
+
+		$request_params = $request->get_query_params();
+		if ( ! empty( $request_params['filter'] ) ) {
+			// Normalize the pagination params.
+			unset( $request_params['filter']['posts_per_page'] );
+			unset( $request_params['filter']['paged'] );
+		}
+		$base = add_query_arg( $request_params, rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ) );
+
+		if ( $page > 1 ) {
+			$prev_page = $page - 1;
+			if ( $prev_page > $max_pages ) {
+				$prev_page = $max_pages;
+			}
+			$prev_link = add_query_arg( 'page', $prev_page, $base );
+			$response->link_header( 'prev', $prev_link );
+		}
+		if ( $max_pages > $page ) {
+			$next_page = $page + 1;
+			$next_link = add_query_arg( 'page', $next_page, $base );
+			$response->link_header( 'next', $next_link );
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Delete a single item.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Response|WP_Error
+	 */
+	public function delete_item( $request ) {
+		$id    = (int) $request['id'];
+		$force = (bool) $request['force'];
+		$post  = get_post( $id );
+
+		if ( empty( $id ) || empty( $post->ID ) || $post->post_type !== $this->post_type ) {
+			return new WP_Error( "woocommerce_rest_{$this->post_type}_invalid_id", __( 'ID is invalid.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$supports_trash = EMPTY_TRASH_DAYS > 0;
+
+		/**
+		 * Filter whether an item is trashable.
+		 *
+		 * Return false to disable trash support for the item.
+		 *
+		 * @param boolean $supports_trash Whether the item type support trashing.
+		 * @param WP_Post $post           The Post object being considered for trashing support.
+		 */
+		$supports_trash = apply_filters( "woocommerce_rest_{$this->post_type}_trashable", $supports_trash, $post );
+
+		if ( ! wc_rest_check_post_permissions( $this->post_type, 'delete', $post->ID ) ) {
+			/* translators: %s: post type */
+			return new WP_Error( "woocommerce_rest_user_cannot_delete_{$this->post_type}", sprintf( __( 'Sorry, you are not allowed to delete %s.', 'woocommerce' ), $this->post_type ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_item_for_response( $post, $request );
+
+		// If we're forcing, then delete permanently.
+		if ( $force ) {
+			$result = wp_delete_post( $id, true );
+		} else {
+			// If we don't support trashing for this type, error out.
+			if ( ! $supports_trash ) {
+				/* translators: %s: post type */
+				return new WP_Error( 'woocommerce_rest_trash_not_supported', sprintf( __( 'The %s does not support trashing.', 'woocommerce' ), $this->post_type ), array( 'status' => 501 ) );
+			}
+
+			// Otherwise, only trash if we haven't already.
+			if ( 'trash' === $post->post_status ) {
+				/* translators: %s: post type */
+				return new WP_Error( 'woocommerce_rest_already_trashed', sprintf( __( 'The %s has already been deleted.', 'woocommerce' ), $this->post_type ), array( 'status' => 410 ) );
+			}
+
+			// (Note that internally this falls through to `wp_delete_post` if
+			// the trash is disabled.)
+			$result = wp_trash_post( $id );
+		}
+
+		if ( ! $result ) {
+			/* translators: %s: post type */
+			return new WP_Error( 'woocommerce_rest_cannot_delete', sprintf( __( 'The %s cannot be deleted.', 'woocommerce' ), $this->post_type ), array( 'status' => 500 ) );
+		}
+
+		/**
+		 * Fires after a single item is deleted or trashed via the REST API.
+		 *
+		 * @param object           $post     The deleted or trashed item.
+		 * @param WP_REST_Response $response The response data.
+		 * @param WP_REST_Request  $request  The request sent to the API.
+		 */
+		do_action( "woocommerce_rest_delete_{$this->post_type}", $post, $response, $request );
+
+		return $response;
+	}
+
+	/**
+	 * Prepare links for the request.
+	 *
+	 * @param WP_Post $post Post object.
+	 * @param WP_REST_Request $request Request object.
+	 * @return array Links for the given post.
+	 */
+	protected function prepare_links( $post, $request ) {
+		$links = array(
+			'self' => array(
+				'href' => rest_url( sprintf( '/%s/%s/%d', $this->namespace, $this->rest_base, $post->ID ) ),
+			),
+			'collection' => array(
+				'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ),
+			),
+		);
+
+		return $links;
+	}
+
+	/**
+	 * Determine the allowed query_vars for a get_items() response and
+	 * prepare for WP_Query.
+	 *
+	 * @param array           $prepared_args
+	 * @param WP_REST_Request $request
+	 * @return array          $query_args
+	 */
+	protected function prepare_items_query( $prepared_args = array(), $request = null ) {
+
+		$valid_vars = array_flip( $this->get_allowed_query_vars() );
+		$query_args = array();
+		foreach ( $valid_vars as $var => $index ) {
+			if ( isset( $prepared_args[ $var ] ) ) {
+				/**
+				 * Filter the query_vars used in `get_items` for the constructed query.
+				 *
+				 * The dynamic portion of the hook name, $var, refers to the query_var key.
+				 *
+				 * @param mixed $prepared_args[ $var ] The query_var value.
+				 *
+				 */
+				$query_args[ $var ] = apply_filters( "woocommerce_rest_query_var-{$var}", $prepared_args[ $var ] );
+			}
+		}
+
+		$query_args['ignore_sticky_posts'] = true;
+
+		if ( 'include' === $query_args['orderby'] ) {
+			$query_args['orderby'] = 'post__in';
+		} elseif ( 'id' === $query_args['orderby'] ) {
+			$query_args['orderby'] = 'ID'; // ID must be capitalized
+		}
+
+		return $query_args;
+	}
+
+	/**
+	 * Get all the WP Query vars that are allowed for the API request.
+	 *
+	 * @return array
+	 */
+	protected function get_allowed_query_vars() {
+		global $wp;
+
+		/**
+		 * Filter the publicly allowed query vars.
+		 *
+		 * Allows adjusting of the default query vars that are made public.
+		 *
+		 * @param array  Array of allowed WP_Query query vars.
+		 */
+		$valid_vars = apply_filters( 'query_vars', $wp->public_query_vars );
+
+		$post_type_obj = get_post_type_object( $this->post_type );
+		if ( current_user_can( $post_type_obj->cap->edit_posts ) ) {
+			/**
+			 * Filter the allowed 'private' query vars for authorized users.
+			 *
+			 * If the user has the `edit_posts` capability, we also allow use of
+			 * private query parameters, which are only undesirable on the
+			 * frontend, but are safe for use in query strings.
+			 *
+			 * To disable anyway, use
+			 * `add_filter( 'woocommerce_rest_private_query_vars', '__return_empty_array' );`
+			 *
+			 * @param array $private_query_vars Array of allowed query vars for authorized users.
+			 * }
+			 */
+			$private = apply_filters( 'woocommerce_rest_private_query_vars', $wp->private_query_vars );
+			$valid_vars = array_merge( $valid_vars, $private );
+		}
+		// Define our own in addition to WP's normal vars.
+		$rest_valid = array(
+			'date_query',
+			'ignore_sticky_posts',
+			'offset',
+			'post__in',
+			'post__not_in',
+			'post_parent',
+			'post_parent__in',
+			'post_parent__not_in',
+			'posts_per_page',
+			'meta_query',
+			'tax_query',
+			'meta_key',
+			'meta_value',
+			'meta_compare',
+			'meta_value_num',
+		);
+		$valid_vars = array_merge( $valid_vars, $rest_valid );
+
+		/**
+		 * Filter allowed query vars for the REST API.
+		 *
+		 * This filter allows you to add or remove query vars from the final allowed
+		 * list for all requests, including unauthenticated ones. To alter the
+		 * vars for editors only.
+		 *
+		 * @param array {
+		 *    Array of allowed WP_Query query vars.
+		 *
+		 *    @param string $allowed_query_var The query var to allow.
+		 * }
+		 */
+		$valid_vars = apply_filters( 'woocommerce_rest_query_vars', $valid_vars );
+
+		return $valid_vars;
+	}
+
+	/**
+	 * Get the query params for collections of attachments.
+	 *
+	 * @return array
+	 */
+	public function get_collection_params() {
+		$params = parent::get_collection_params();
+
+		$params['context']['default'] = 'view';
+
+		$params['after'] = array(
+			'description'        => __( 'Limit response to resources published after a given ISO8601 compliant date.', 'woocommerce' ),
+			'type'               => 'string',
+			'format'             => 'date-time',
+			'validate_callback'  => 'rest_validate_request_arg',
+		);
+		$params['before'] = array(
+			'description'        => __( 'Limit response to resources published before a given ISO8601 compliant date.', 'woocommerce' ),
+			'type'               => 'string',
+			'format'             => 'date-time',
+			'validate_callback'  => 'rest_validate_request_arg',
+		);
+		$params['exclude'] = array(
+			'description'       => __( 'Ensure result set excludes specific IDs.', 'woocommerce' ),
+			'type'              => 'array',
+			'items'             => array(
+				'type'          => 'integer',
+			),
+			'default'           => array(),
+			'sanitize_callback' => 'wp_parse_id_list',
+		);
+		$params['include'] = array(
+			'description'       => __( 'Limit result set to specific ids.', 'woocommerce' ),
+			'type'              => 'array',
+			'items'             => array(
+				'type'          => 'integer',
+			),
+			'default'           => array(),
+			'sanitize_callback' => 'wp_parse_id_list',
+		);
+		$params['offset'] = array(
+			'description'        => __( 'Offset the result set by a specific number of items.', 'woocommerce' ),
+			'type'               => 'integer',
+			'sanitize_callback'  => 'absint',
+			'validate_callback'  => 'rest_validate_request_arg',
+		);
+		$params['order'] = array(
+			'description'        => __( 'Order sort attribute ascending or descending.', 'woocommerce' ),
+			'type'               => 'string',
+			'default'            => 'desc',
+			'enum'               => array( 'asc', 'desc' ),
+			'validate_callback'  => 'rest_validate_request_arg',
+		);
+		$params['orderby'] = array(
+			'description'        => __( 'Sort collection by object attribute.', 'woocommerce' ),
+			'type'               => 'string',
+			'default'            => 'date',
+			'enum'               => array(
+				'date',
+				'id',
+				'include',
+				'title',
+				'slug',
+			),
+			'validate_callback'  => 'rest_validate_request_arg',
+		);
+
+		$post_type_obj = get_post_type_object( $this->post_type );
+
+		if ( isset( $post_type_obj->hierarchical ) && $post_type_obj->hierarchical ) {
+			$params['parent'] = array(
+				'description'       => __( 'Limit result set to those of particular parent IDs.', 'woocommerce' ),
+				'type'              => 'array',
+				'items'             => array(
+					'type'          => 'integer',
+				),
+				'sanitize_callback' => 'wp_parse_id_list',
+				'default'           => array(),
+			);
+			$params['parent_exclude'] = array(
+				'description'       => __( 'Limit result set to all items except those of a particular parent ID.', 'woocommerce' ),
+				'type'              => 'array',
+				'items'             => array(
+					'type'          => 'integer',
+				),
+				'sanitize_callback' => 'wp_parse_id_list',
+				'default'           => array(),
+			);
+		}
+
+		if ( 'wc/v1' === $this->namespace ) {
+			$params['filter'] = array(
+				'type'        => 'object',
+				'description' => __( 'Use WP Query arguments to modify the response; private query vars require appropriate authorization.', 'woocommerce' ),
+			);
+		}
+
+		return $params;
+	}
+
+	/**
+	 * Update post meta fields.
+	 *
+	 * @param WP_Post $post
+	 * @param WP_REST_Request $request
+	 * @return bool|WP_Error
+	 */
+	protected function update_post_meta_fields( $post, $request ) {
+		return true;
+	}
+}
diff --git a/includes/abstracts/abstract-wc-rest-shipping-zones-controller.php b/includes/abstracts/abstract-wc-rest-shipping-zones-controller.php
new file mode 100644
index 00000000000..016d470c488
--- /dev/null
+++ b/includes/abstracts/abstract-wc-rest-shipping-zones-controller.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * REST API Shipping Zones Controller base
+ *
+ * Houses common functionality between Shipping Zones and Locations.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Shipping Zones base class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Controller
+ */
+abstract class WC_REST_Shipping_Zones_Controller_Base extends WC_REST_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v2';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'shipping/zones';
+
+	/**
+	 * Retrieve a Shipping Zone by it's ID.
+	 *
+	 * @param int $zone_id Shipping Zone ID.
+	 * @return WC_Shipping_Zone|WP_Error
+	 */
+	protected function get_zone( $zone_id ) {
+		$zone = WC_Shipping_Zones::get_zone_by( 'zone_id', $zone_id );
+
+		if ( false === $zone ) {
+			return new WP_Error( 'woocommerce_rest_shipping_zone_invalid', __( 'Resource does not exist.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		return $zone;
+	}
+
+	/**
+	 * Check whether a given request has permission to read Shipping Zones.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_items_permissions_check( $request ) {
+		if ( ! wc_shipping_enabled() ) {
+			return new WP_Error( 'rest_no_route', __( 'Shipping is disabled.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		if ( ! wc_rest_check_manager_permissions( 'settings', 'read' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot list resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access to create Shipping Zones.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function create_item_permissions_check( $request ) {
+		if ( ! wc_shipping_enabled() ) {
+			return new WP_Error( 'rest_no_route', __( 'Shipping is disabled.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		if ( ! wc_rest_check_manager_permissions( 'settings', 'edit' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_create', __( 'Sorry, you are not allowed to create resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check whether a given request has permission to edit Shipping Zones.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function update_items_permissions_check( $request ) {
+		if ( ! wc_shipping_enabled() ) {
+			return new WP_Error( 'rest_no_route', __( 'Shipping is disabled.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		if ( ! wc_rest_check_manager_permissions( 'settings', 'edit' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_edit', __( 'Sorry, you are not allowed to edit this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check whether a given request has permission to delete Shipping Zones.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function delete_items_permissions_check( $request ) {
+		if ( ! wc_shipping_enabled() ) {
+			return new WP_Error( 'rest_no_route', __( 'Shipping is disabled.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		if ( ! wc_rest_check_manager_permissions( 'settings', 'delete' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_edit', __( 'Sorry, you are not allowed to delete this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+}
diff --git a/includes/abstracts/abstract-wc-rest-terms-controller.php b/includes/abstracts/abstract-wc-rest-terms-controller.php
new file mode 100644
index 00000000000..6bd739addac
--- /dev/null
+++ b/includes/abstracts/abstract-wc-rest-terms-controller.php
@@ -0,0 +1,801 @@
+<?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Abstract Rest Terms Controller Class
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/Abstracts
+ * @version  2.6.0
+ */
+abstract class WC_REST_Terms_Controller extends WC_REST_Controller {
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = '';
+
+	/**
+	 * Taxonomy.
+	 *
+	 * @var string
+	 */
+	protected $taxonomy = '';
+
+	/**
+	 * Register the routes for terms.
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+				'args'                => $this->get_collection_params(),
+			),
+			array(
+				'methods'             => WP_REST_Server::CREATABLE,
+				'callback'            => array( $this, 'create_item' ),
+				'permission_callback' => array( $this, 'create_item_permissions_check' ),
+				'args'                => array_merge( $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ), array(
+					'name' => array(
+						'type'        => 'string',
+						'description' => __( 'Name for the resource.', 'woocommerce' ),
+						'required'    => true,
+					),
+				) ),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		));
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
+			'args' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_item' ),
+				'permission_callback' => array( $this, 'get_item_permissions_check' ),
+				'args'                => array(
+					'context'         => $this->get_context_param( array( 'default' => 'view' ) ),
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'update_item' ),
+				'permission_callback' => array( $this, 'update_item_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			array(
+				'methods'             => WP_REST_Server::DELETABLE,
+				'callback'            => array( $this, 'delete_item' ),
+				'permission_callback' => array( $this, 'delete_item_permissions_check' ),
+				'args'                => array(
+					'force' => array(
+						'default'     => false,
+						'type'        => 'boolean',
+						'description' => __( 'Required to be true, as resource does not support trashing.', 'woocommerce' ),
+					),
+				),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/batch', array(
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'batch_items' ),
+				'permission_callback' => array( $this, 'batch_items_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			'schema' => array( $this, 'get_public_batch_schema' ),
+		) );
+	}
+
+	/**
+	 * Check if a given request has access to read the terms.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_items_permissions_check( $request ) {
+		$permissions = $this->check_permissions( $request, 'read' );
+		if ( is_wp_error( $permissions ) ) {
+			return $permissions;
+		}
+
+		if ( ! $permissions ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot list resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access to create a term.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function create_item_permissions_check( $request ) {
+		$permissions = $this->check_permissions( $request, 'create' );
+		if ( is_wp_error( $permissions ) ) {
+			return $permissions;
+		}
+
+		if ( ! $permissions ) {
+			return new WP_Error( 'woocommerce_rest_cannot_create', __( 'Sorry, you are not allowed to create resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access to read a term.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_item_permissions_check( $request ) {
+		$permissions = $this->check_permissions( $request, 'read' );
+		if ( is_wp_error( $permissions ) ) {
+			return $permissions;
+		}
+
+		if ( ! $permissions ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot view this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access to update a term.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function update_item_permissions_check( $request ) {
+		$permissions = $this->check_permissions( $request, 'edit' );
+		if ( is_wp_error( $permissions ) ) {
+			return $permissions;
+		}
+
+		if ( ! $permissions ) {
+			return new WP_Error( 'woocommerce_rest_cannot_edit', __( 'Sorry, you are not allowed to edit this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access to delete a term.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function delete_item_permissions_check( $request ) {
+		$permissions = $this->check_permissions( $request, 'delete' );
+		if ( is_wp_error( $permissions ) ) {
+			return $permissions;
+		}
+
+		if ( ! $permissions ) {
+			return new WP_Error( 'woocommerce_rest_cannot_delete', __( 'Sorry, you are not allowed to delete this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access batch create, update and delete items.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return boolean
+	 */
+	public function batch_items_permissions_check( $request ) {
+		$permissions = $this->check_permissions( $request, 'batch' );
+		if ( is_wp_error( $permissions ) ) {
+			return $permissions;
+		}
+
+		if ( ! $permissions ) {
+			return new WP_Error( 'woocommerce_rest_cannot_batch', __( 'Sorry, you are not allowed to batch manipulate this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check permissions.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @param string $context Request context.
+	 * @return bool|WP_Error
+	 */
+	protected function check_permissions( $request, $context = 'read' ) {
+		// Get taxonomy.
+		$taxonomy = $this->get_taxonomy( $request );
+		if ( ! $taxonomy ) {
+			return new WP_Error( 'woocommerce_rest_taxonomy_invalid', __( 'Taxonomy does not exist.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		// Check permissions for a single term.
+		if ( $id = intval( $request['id'] ) ) {
+			$term = get_term( $id, $taxonomy );
+
+			if ( ! $term || $term->taxonomy !== $taxonomy ) {
+				return new WP_Error( 'woocommerce_rest_term_invalid', __( 'Resource does not exist.', 'woocommerce' ), array( 'status' => 404 ) );
+			}
+
+			return wc_rest_check_product_term_permissions( $taxonomy, $context, $term->term_id );
+		}
+
+		return wc_rest_check_product_term_permissions( $taxonomy, $context );
+	}
+
+	/**
+	 * Get terms associated with a taxonomy.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Response|WP_Error
+	 */
+	public function get_items( $request ) {
+		$taxonomy      = $this->get_taxonomy( $request );
+		$prepared_args = array(
+			'exclude'    => $request['exclude'],
+			'include'    => $request['include'],
+			'order'      => $request['order'],
+			'orderby'    => $request['orderby'],
+			'product'    => $request['product'],
+			'hide_empty' => $request['hide_empty'],
+			'number'     => $request['per_page'],
+			'search'     => $request['search'],
+			'slug'       => $request['slug'],
+		);
+
+		if ( ! empty( $request['offset'] ) ) {
+			$prepared_args['offset'] = $request['offset'];
+		} else {
+			$prepared_args['offset']  = ( $request['page'] - 1 ) * $prepared_args['number'];
+		}
+
+		$taxonomy_obj = get_taxonomy( $taxonomy );
+
+		if ( $taxonomy_obj->hierarchical && isset( $request['parent'] ) ) {
+			if ( 0 === $request['parent'] ) {
+				// Only query top-level terms.
+				$prepared_args['parent'] = 0;
+			} else {
+				if ( $request['parent'] ) {
+					$prepared_args['parent'] = $request['parent'];
+				}
+			}
+		}
+
+		/**
+		 * Filter the query arguments, before passing them to `get_terms()`.
+		 *
+		 * Enables adding extra arguments or setting defaults for a terms
+		 * collection request.
+		 *
+		 * @see https://developer.wordpress.org/reference/functions/get_terms/
+		 *
+		 * @param array           $prepared_args Array of arguments to be
+		 *                                       passed to get_terms.
+		 * @param WP_REST_Request $request       The current request.
+		 */
+		$prepared_args = apply_filters( "woocommerce_rest_{$taxonomy}_query", $prepared_args, $request );
+
+		if ( ! empty( $prepared_args['product'] )  ) {
+			$query_result = $this->get_terms_for_product( $prepared_args );
+			$total_terms = $this->total_terms;
+		} else {
+			$query_result = get_terms( $taxonomy, $prepared_args );
+
+			$count_args = $prepared_args;
+			unset( $count_args['number'] );
+			unset( $count_args['offset'] );
+			$total_terms = wp_count_terms( $taxonomy, $count_args );
+
+			// Ensure we don't return results when offset is out of bounds.
+			// See https://core.trac.wordpress.org/ticket/35935
+			if ( $prepared_args['offset'] >= $total_terms ) {
+				$query_result = array();
+			}
+
+			// wp_count_terms can return a falsy value when the term has no children.
+			if ( ! $total_terms ) {
+				$total_terms = 0;
+			}
+		}
+		$response = array();
+		foreach ( $query_result as $term ) {
+			$data = $this->prepare_item_for_response( $term, $request );
+			$response[] = $this->prepare_response_for_collection( $data );
+		}
+
+		$response = rest_ensure_response( $response );
+
+		// Store pagation values for headers then unset for count query.
+		$per_page = (int) $prepared_args['number'];
+		$page = ceil( ( ( (int) $prepared_args['offset'] ) / $per_page ) + 1 );
+
+		$response->header( 'X-WP-Total', (int) $total_terms );
+		$max_pages = ceil( $total_terms / $per_page );
+		$response->header( 'X-WP-TotalPages', (int) $max_pages );
+
+		$base = add_query_arg( $request->get_query_params(), rest_url( '/' . $this->namespace . '/' . $this->rest_base ) );
+		if ( $page > 1 ) {
+			$prev_page = $page - 1;
+			if ( $prev_page > $max_pages ) {
+				$prev_page = $max_pages;
+			}
+			$prev_link = add_query_arg( 'page', $prev_page, $base );
+			$response->link_header( 'prev', $prev_link );
+		}
+		if ( $max_pages > $page ) {
+			$next_page = $page + 1;
+			$next_link = add_query_arg( 'page', $next_page, $base );
+			$response->link_header( 'next', $next_link );
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Create a single term for a taxonomy.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Request|WP_Error
+	 */
+	public function create_item( $request ) {
+		$taxonomy = $this->get_taxonomy( $request );
+		$name     = $request['name'];
+		$args     = array();
+		$schema   = $this->get_item_schema();
+
+		if ( ! empty( $schema['properties']['description'] ) && isset( $request['description'] ) ) {
+			$args['description'] = $request['description'];
+		}
+		if ( isset( $request['slug'] ) ) {
+			$args['slug'] = $request['slug'];
+		}
+
+		if ( isset( $request['parent'] ) ) {
+			if ( ! is_taxonomy_hierarchical( $taxonomy ) ) {
+				return new WP_Error( 'woocommerce_rest_taxonomy_not_hierarchical', __( 'Can not set resource parent, taxonomy is not hierarchical.', 'woocommerce' ), array( 'status' => 400 ) );
+			}
+
+			$parent = get_term( (int) $request['parent'], $taxonomy );
+
+			if ( ! $parent ) {
+				return new WP_Error( 'woocommerce_rest_term_invalid', __( 'Parent resource does not exist.', 'woocommerce' ), array( 'status' => 404 ) );
+			}
+
+			$args['parent'] = $parent->term_id;
+		}
+
+		$term = wp_insert_term( $name, $taxonomy, $args );
+		if ( is_wp_error( $term ) ) {
+			$error_data = array( 'status' => 400 );
+
+			// If we're going to inform the client that the term exists,
+			// give them the identifier they can actually use.
+			if ( $term_id = $term->get_error_data( 'term_exists' ) ) {
+				$error_data['resource_id'] = $term_id;
+			}
+
+			return new WP_Error( $term->get_error_code(), $term->get_error_message(), $error_data );
+		}
+
+		$term = get_term( $term['term_id'], $taxonomy );
+
+		$this->update_additional_fields_for_object( $term, $request );
+
+		// Add term data.
+		$meta_fields = $this->update_term_meta_fields( $term, $request );
+		if ( is_wp_error( $meta_fields ) ) {
+			wp_delete_term( $term->term_id, $taxonomy );
+
+			return $meta_fields;
+		}
+
+		/**
+		 * Fires after a single term is created or updated via the REST API.
+		 *
+		 * @param WP_Term         $term      Inserted Term object.
+		 * @param WP_REST_Request $request   Request object.
+		 * @param boolean         $creating  True when creating term, false when updating.
+		 */
+		do_action( "woocommerce_rest_insert_{$taxonomy}", $term, $request, true );
+
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_item_for_response( $term, $request );
+		$response = rest_ensure_response( $response );
+		$response->set_status( 201 );
+
+		$base = '/' . $this->namespace . '/' . $this->rest_base;
+		if ( ! empty( $request['attribute_id'] ) ) {
+			$base = str_replace( '(?P<attribute_id>[\d]+)', (int) $request['attribute_id'], $base );
+		}
+
+		$response->header( 'Location', rest_url( $base . '/' . $term->term_id ) );
+
+		return $response;
+	}
+
+	/**
+	 * Get a single term from a taxonomy.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Request|WP_Error
+	 */
+	public function get_item( $request ) {
+		$taxonomy = $this->get_taxonomy( $request );
+		$term     = get_term( (int) $request['id'], $taxonomy );
+
+		if ( is_wp_error( $term ) ) {
+			return $term;
+		}
+
+		$response = $this->prepare_item_for_response( $term, $request );
+
+		return rest_ensure_response( $response );
+	}
+
+	/**
+	 * Update a single term from a taxonomy.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Request|WP_Error
+	 */
+	public function update_item( $request ) {
+		$taxonomy      = $this->get_taxonomy( $request );
+		$term          = get_term( (int) $request['id'], $taxonomy );
+		$schema        = $this->get_item_schema();
+		$prepared_args = array();
+
+		if ( isset( $request['name'] ) ) {
+			$prepared_args['name'] = $request['name'];
+		}
+		if ( ! empty( $schema['properties']['description'] ) && isset( $request['description'] ) ) {
+			$prepared_args['description'] = $request['description'];
+		}
+		if ( isset( $request['slug'] ) ) {
+			$prepared_args['slug'] = $request['slug'];
+		}
+
+		if ( isset( $request['parent'] ) ) {
+			if ( ! is_taxonomy_hierarchical( $taxonomy ) ) {
+				return new WP_Error( 'woocommerce_rest_taxonomy_not_hierarchical', __( 'Can not set resource parent, taxonomy is not hierarchical.', 'woocommerce' ), array( 'status' => 400 ) );
+			}
+
+			$parent_id = (int) $request['parent'];
+
+			if ( 0 === $parent_id ) {
+				$prepared_args['parent'] = $parent_id;
+			} else {
+				$parent = get_term( $parent_id, $taxonomy );
+
+				if ( ! $parent ) {
+					return new WP_Error( 'woocommerce_rest_term_invalid', __( 'Parent resource does not exist.', 'woocommerce' ), array( 'status' => 400 ) );
+				}
+
+				$prepared_args['parent'] = $parent->term_id;
+			}
+		}
+
+		// Only update the term if we haz something to update.
+		if ( ! empty( $prepared_args ) ) {
+			$update = wp_update_term( $term->term_id, $term->taxonomy, $prepared_args );
+			if ( is_wp_error( $update ) ) {
+				return $update;
+			}
+		}
+
+		$term = get_term( (int) $request['id'], $taxonomy );
+
+		$this->update_additional_fields_for_object( $term, $request );
+
+		// Update term data.
+		$meta_fields = $this->update_term_meta_fields( $term, $request );
+		if ( is_wp_error( $meta_fields ) ) {
+			return $meta_fields;
+		}
+
+		/**
+		 * Fires after a single term is created or updated via the REST API.
+		 *
+		 * @param WP_Term         $term      Inserted Term object.
+		 * @param WP_REST_Request $request   Request object.
+		 * @param boolean         $creating  True when creating term, false when updating.
+		 */
+		do_action( "woocommerce_rest_insert_{$taxonomy}", $term, $request, false );
+
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_item_for_response( $term, $request );
+		return rest_ensure_response( $response );
+	}
+
+	/**
+	 * Delete a single term from a taxonomy.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Response|WP_Error
+	 */
+	public function delete_item( $request ) {
+		$taxonomy = $this->get_taxonomy( $request );
+		$force    = isset( $request['force'] ) ? (bool) $request['force'] : false;
+
+		// We don't support trashing for this type, error out.
+		if ( ! $force ) {
+			return new WP_Error( 'woocommerce_rest_trash_not_supported', __( 'Resource does not support trashing.', 'woocommerce' ), array( 'status' => 501 ) );
+		}
+
+		$term = get_term( (int) $request['id'], $taxonomy );
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_item_for_response( $term, $request );
+
+		$retval = wp_delete_term( $term->term_id, $term->taxonomy );
+		if ( ! $retval ) {
+			return new WP_Error( 'woocommerce_rest_cannot_delete', __( 'The resource cannot be deleted.', 'woocommerce' ), array( 'status' => 500 ) );
+		}
+
+		/**
+		 * Fires after a single term is deleted via the REST API.
+		 *
+		 * @param WP_Term          $term     The deleted term.
+		 * @param WP_REST_Response $response The response data.
+		 * @param WP_REST_Request  $request  The request sent to the API.
+		 */
+		do_action( "woocommerce_rest_delete_{$taxonomy}", $term, $response, $request );
+
+		return $response;
+	}
+
+	/**
+	 * Prepare links for the request.
+	 *
+	 * @param object $term Term object.
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return array Links for the given term.
+	 */
+	protected function prepare_links( $term, $request ) {
+		$base = '/' . $this->namespace . '/' . $this->rest_base;
+
+		if ( ! empty( $request['attribute_id'] ) ) {
+			$base = str_replace( '(?P<attribute_id>[\d]+)', (int) $request['attribute_id'], $base );
+		}
+
+		$links = array(
+			'self' => array(
+				'href' => rest_url( trailingslashit( $base ) . $term->term_id ),
+			),
+			'collection' => array(
+				'href' => rest_url( $base ),
+			),
+		);
+
+		if ( $term->parent ) {
+			$parent_term = get_term( (int) $term->parent, $term->taxonomy );
+			if ( $parent_term ) {
+				$links['up'] = array(
+					'href' => rest_url( trailingslashit( $base ) . $parent_term->term_id ),
+				);
+			}
+		}
+
+		return $links;
+	}
+
+	/**
+	 * Update term meta fields.
+	 *
+	 * @param WP_Term $term
+	 * @param WP_REST_Request $request
+	 * @return bool|WP_Error
+	 */
+	protected function update_term_meta_fields( $term, $request ) {
+		return true;
+	}
+
+	/**
+	 * Get the terms attached to a product.
+	 *
+	 * This is an alternative to `get_terms()` that uses `get_the_terms()`
+	 * instead, which hits the object cache. There are a few things not
+	 * supported, notably `include`, `exclude`. In `self::get_items()` these
+	 * are instead treated as a full query.
+	 *
+	 * @param array $prepared_args Arguments for `get_terms()`.
+	 * @return array List of term objects. (Total count in `$this->total_terms`).
+	 */
+	protected function get_terms_for_product( $prepared_args ) {
+		$taxonomy = $this->get_taxonomy( $request );
+
+		$query_result = get_the_terms( $prepared_args['product'], $taxonomy );
+		if ( empty( $query_result ) ) {
+			$this->total_terms = 0;
+			return array();
+		}
+
+		// get_items() verifies that we don't have `include` set, and default.
+		// ordering is by `name`.
+		if ( ! in_array( $prepared_args['orderby'], array( 'name', 'none', 'include' ) ) ) {
+			switch ( $prepared_args['orderby'] ) {
+				case 'id' :
+					$this->sort_column = 'term_id';
+					break;
+
+				case 'slug' :
+				case 'term_group' :
+				case 'description' :
+				case 'count' :
+					$this->sort_column = $prepared_args['orderby'];
+					break;
+			}
+			usort( $query_result, array( $this, 'compare_terms' ) );
+		}
+		if ( strtolower( $prepared_args['order'] ) !== 'asc' ) {
+			$query_result = array_reverse( $query_result );
+		}
+
+		// Pagination.
+		$this->total_terms = count( $query_result );
+		$query_result = array_slice( $query_result, $prepared_args['offset'], $prepared_args['number'] );
+
+		return $query_result;
+	}
+
+	/**
+	 * Comparison function for sorting terms by a column.
+	 *
+	 * Uses `$this->sort_column` to determine field to sort by.
+	 *
+	 * @param stdClass $left Term object.
+	 * @param stdClass $right Term object.
+	 * @return int <0 if left is higher "priority" than right, 0 if equal, >0 if right is higher "priority" than left.
+	 */
+	protected function compare_terms( $left, $right ) {
+		$col       = $this->sort_column;
+		$left_val  = $left->$col;
+		$right_val = $right->$col;
+
+		if ( is_int( $left_val ) && is_int( $right_val ) ) {
+			return $left_val - $right_val;
+		}
+
+		return strcmp( $left_val, $right_val );
+	}
+
+	/**
+	 * Get the query params for collections
+	 *
+	 * @return array
+	 */
+	public function get_collection_params() {
+		$params = parent::get_collection_params();
+
+		if ( '' !== $this->taxonomy ) {
+			$taxonomy = get_taxonomy( $this->taxonomy );
+		} else {
+			$taxonomy = new stdClass();
+			$taxonomy->hierarchical = true;
+		}
+
+		$params['context']['default'] = 'view';
+
+		$params['exclude'] = array(
+			'description'       => __( 'Ensure result set excludes specific ids.', 'woocommerce' ),
+			'type'              => 'array',
+			'items'             => array(
+				'type'          => 'integer',
+			),
+			'default'           => array(),
+			'sanitize_callback' => 'wp_parse_id_list',
+		);
+		$params['include'] = array(
+			'description'       => __( 'Limit result set to specific ids.', 'woocommerce' ),
+			'type'              => 'array',
+			'items'             => array(
+				'type'          => 'integer',
+			),
+			'default'           => array(),
+			'sanitize_callback' => 'wp_parse_id_list',
+		);
+		if ( ! $taxonomy->hierarchical ) {
+			$params['offset'] = array(
+				'description'        => __( 'Offset the result set by a specific number of items.', 'woocommerce' ),
+				'type'               => 'integer',
+				'sanitize_callback'  => 'absint',
+				'validate_callback'  => 'rest_validate_request_arg',
+			);
+		}
+		$params['order']      = array(
+			'description'           => __( 'Order sort attribute ascending or descending.', 'woocommerce' ),
+			'type'                  => 'string',
+			'sanitize_callback'     => 'sanitize_key',
+			'default'               => 'asc',
+			'enum'                  => array(
+				'asc',
+				'desc',
+			),
+			'validate_callback'     => 'rest_validate_request_arg',
+		);
+		$params['orderby']    = array(
+			'description'           => __( 'Sort collection by resource attribute.', 'woocommerce' ),
+			'type'                  => 'string',
+			'sanitize_callback'     => 'sanitize_key',
+			'default'               => 'name',
+			'enum'                  => array(
+				'id',
+				'include',
+				'name',
+				'slug',
+				'term_group',
+				'description',
+				'count',
+			),
+			'validate_callback'     => 'rest_validate_request_arg',
+		);
+		$params['hide_empty'] = array(
+			'description'           => __( 'Whether to hide resources not assigned to any products.', 'woocommerce' ),
+			'type'                  => 'boolean',
+			'default'               => false,
+			'validate_callback'     => 'rest_validate_request_arg',
+		);
+		if ( $taxonomy->hierarchical ) {
+			$params['parent'] = array(
+				'description'        => __( 'Limit result set to resources assigned to a specific parent.', 'woocommerce' ),
+				'type'               => 'integer',
+				'sanitize_callback'  => 'absint',
+				'validate_callback'  => 'rest_validate_request_arg',
+			);
+		}
+		$params['product'] = array(
+			'description'           => __( 'Limit result set to resources assigned to a specific product.', 'woocommerce' ),
+			'type'                  => 'integer',
+			'default'               => null,
+			'validate_callback'     => 'rest_validate_request_arg',
+		);
+		$params['slug']    = array(
+			'description'        => __( 'Limit result set to resources with a specific slug.', 'woocommerce' ),
+			'type'               => 'string',
+			'validate_callback'  => 'rest_validate_request_arg',
+		);
+
+		return $params;
+	}
+
+	/**
+	 * Get taxonomy.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return int|WP_Error
+	 */
+	protected function get_taxonomy( $request ) {
+		// Check if taxonomy is defined.
+		// Prevents check for attribute taxonomy more than one time for each query.
+		if ( '' !== $this->taxonomy ) {
+			return $this->taxonomy;
+		}
+
+		if ( ! empty( $request['attribute_id'] ) ) {
+			$taxonomy = wc_attribute_taxonomy_name_by_id( (int) $request['attribute_id'] );
+
+			$this->taxonomy = $taxonomy;
+		}
+
+		return $this->taxonomy;
+	}
+}
diff --git a/includes/abstracts/abstract-wc-session.php b/includes/abstracts/abstract-wc-session.php
index 192d4416d28..42eff7c3213 100644
--- a/includes/abstracts/abstract-wc-session.php
+++ b/includes/abstracts/abstract-wc-session.php
@@ -40,11 +40,11 @@ abstract class WC_Session {
 	}
 
 	 /**
-	 * __isset function.
-	 *
-	 * @param mixed $key
-	 * @return bool
-	 */
+	  * __isset function.
+	  *
+	  * @param mixed $key
+	  * @return bool
+	  */
 	public function __isset( $key ) {
 		return isset( $this->_data[ sanitize_title( $key ) ] );
 	}
@@ -66,7 +66,7 @@ abstract class WC_Session {
 	 *
 	 * @param string $key
 	 * @param  mixed $default used if the session variable isn't set
-	 * @return mixed value of session variable
+	 * @return array|string value of session variable
 	 */
 	public function get( $key, $default = null ) {
 		$key = sanitize_key( $key );
diff --git a/includes/abstracts/abstract-wc-settings-api.php b/includes/abstracts/abstract-wc-settings-api.php
index 418bb74663b..1be55532e23 100644
--- a/includes/abstracts/abstract-wc-settings-api.php
+++ b/includes/abstracts/abstract-wc-settings-api.php
@@ -2,10 +2,10 @@
 /**
  * Abstract Settings API Class
  *
- * Admin Settings API used by Shipping Methods and Payment Gateways.
+ * Admin Settings API used by Integrations, Shipping Methods, and Payment Gateways.
  *
  * @class    WC_Settings_API
- * @version  2.4.0
+ * @version  2.6.0
  * @package  WooCommerce/Abstracts
  * @category Abstract Class
  * @author   WooThemes
@@ -19,28 +19,16 @@ abstract class WC_Settings_API {
 	public $plugin_id = 'woocommerce_';
 
 	/**
-	 * Method ID.
+	 * ID of the class extending the settings API. Used in option names.
 	 * @var string
 	 */
 	public $id = '';
 
 	/**
-	 * Method title.
-	 * @var string
+	 * Validation errors.
+	 * @var array of strings
 	 */
-	public $method_title = '';
-
-	/**
-	 * Method description.
-	 * @var string
-	 */
-	public $method_description = '';
-
-	/**
-	 * 'yes' if the method is enabled.
-	 * @var string
-	 */
-	public $enabled;
+	public $errors = array();
 
 	/**
 	 * Setting values.
@@ -55,38 +43,39 @@ abstract class WC_Settings_API {
 	public $form_fields = array();
 
 	/**
-	 * Validation errors.
+	 * The posted settings data. When empty, $_POST data will be used.
 	 * @var array
 	 */
-	public $errors = array();
+	protected $data = array();
 
 	/**
-	 * Sanitized fields after validation.
-	 * @var array
+	 * Get the form fields after they are initialized.
+	 * @return array of options
 	 */
-	public $sanitized_fields = array();
-
-	/**
-	 * Admin Options.
-	 *
-	 * Setup the gateway settings screen.
-	 * Override this in your gateway.
-	 *
-	 * @since 1.0.0
-	 */
-	public function admin_options() { ?>
-
-		<h3><?php echo ( ! empty( $this->method_title ) ) ? $this->method_title : __( 'Settings', 'woocommerce' ) ; ?></h3>
-
-		<?php echo ( ! empty( $this->method_description ) ) ? wpautop( $this->method_description ) : ''; ?>
-
-		<table class="form-table">
-			<?php $this->generate_settings_html(); ?>
-		</table><?php
+	public function get_form_fields() {
+		return apply_filters( 'woocommerce_settings_api_form_fields_' . $this->id, array_map( array( $this, 'set_defaults' ), $this->form_fields ) );
 	}
 
 	/**
-	 * Initialise Settings Form Fields.
+	 * Set default required properties for each field.
+	 * @param array
+	 */
+	protected function set_defaults( $field ) {
+		if ( ! isset( $field['default'] ) ) {
+			$field['default'] = '';
+		}
+		return $field;
+	}
+
+	/**
+	 * Output the admin options table.
+	 */
+	public function admin_options() {
+		echo '<table class="form-table">' . $this->generate_settings_html( $this->get_form_fields(), false ) . '</table>';
+	}
+
+	/**
+	 * Initialise settings form fields.
 	 *
 	 * Add an array of fields to be displayed
 	 * on the gateway's settings screen.
@@ -97,43 +86,132 @@ abstract class WC_Settings_API {
 	public function init_form_fields() {}
 
 	/**
-	 * Get the form fields after they are initialized.
-	 * @return array of options
+	 * Return the name of the option in the WP DB.
+	 * @since 2.6.0
+	 * @return string
 	 */
-	public function get_form_fields() {
-		return apply_filters( 'woocommerce_settings_api_form_fields_' . $this->id, $this->form_fields );
+	public function get_option_key() {
+		return $this->plugin_id . $this->id . '_settings';
 	}
 
 	/**
-	 * Admin Panel Options Processing.
-	 * - Saves the options to the DB.
-	 *
-	 * @since 1.0.0
-	 * @return bool
+	 * Get a fields type. Defaults to "text" if not set.
+	 * @param  array $field
+	 * @return string
+	 */
+	public function get_field_type( $field ) {
+		return empty( $field['type'] ) ? 'text' : $field['type'];
+	}
+
+	/**
+	 * Get a fields default value. Defaults to "" if not set.
+	 * @param  array $field
+	 * @return string
+	 */
+	public function get_field_default( $field ) {
+		return empty( $field['default'] ) ? '' : $field['default'];
+	}
+
+	/**
+	 * Get a field's posted and validated value.
+	 * @param string $key
+	 * @param array $field
+	 * @param array $post_data
+	 * @return string
+	 */
+	public function get_field_value( $key, $field, $post_data = array() ) {
+		$type      = $this->get_field_type( $field );
+		$field_key = $this->get_field_key( $key );
+		$post_data = empty( $post_data ) ? $_POST : $post_data;
+		$value     = isset( $post_data[ $field_key ] ) ? $post_data[ $field_key ] : null;
+
+		// Look for a validate_FIELDID_field method for special handling
+		if ( is_callable( array( $this, 'validate_' . $key . '_field' ) ) ) {
+			return $this->{'validate_' . $key . '_field'}( $key, $value );
+		}
+
+		// Look for a validate_FIELDTYPE_field method
+		if ( is_callable( array( $this, 'validate_' . $type . '_field' ) ) ) {
+			return $this->{'validate_' . $type . '_field'}( $key, $value );
+		}
+
+		// Fallback to text
+		return $this->validate_text_field( $key, $value );
+	}
+
+	/**
+	 * Sets the POSTed data. This method can be used to set specific data, instead
+	 * of taking it from the $_POST array.
+	 * @param array data
+	 */
+	public function set_post_data( $data = array() ) {
+		$this->data = $data;
+	}
+
+	/**
+	 * Returns the POSTed data, to be used to save the settings.
+	 * @return array
+	 */
+	public function get_post_data() {
+		if ( ! empty( $this->data ) && is_array( $this->data ) ) {
+			return $this->data;
+		}
+		return $_POST;
+	}
+
+	/**
+	 * Processes and saves options.
+	 * If there is an error thrown, will continue to save and validate fields, but will leave the erroring field out.
+	 * @return bool was anything saved?
 	 */
 	public function process_admin_options() {
+		$this->init_settings();
 
-		$this->validate_settings_fields();
+		$post_data = $this->get_post_data();
 
-		if ( count( $this->errors ) > 0 ) {
-			$this->display_errors();
-			return false;
-		} else {
-			update_option( $this->plugin_id . $this->id . '_settings', apply_filters( 'woocommerce_settings_api_sanitized_fields_' . $this->id, $this->sanitized_fields ) );
-			$this->init_settings();
-			return true;
+		foreach ( $this->get_form_fields() as $key => $field ) {
+			if ( 'title' !== $this->get_field_type( $field ) ) {
+				try {
+					$this->settings[ $key ] = $this->get_field_value( $key, $field, $post_data );
+				} catch ( Exception $e ) {
+					$this->add_error( $e->getMessage() );
+				}
+			}
 		}
+
+		return update_option( $this->get_option_key(), apply_filters( 'woocommerce_settings_api_sanitized_fields_' . $this->id, $this->settings ) );
+	}
+
+	/**
+	 * Add an error message for display in admin on save.
+	 * @param string $error
+	 */
+	public function add_error( $error ) {
+		$this->errors[] = $error;
+	}
+
+	/**
+	 * Get admin error messages.
+	 */
+	public function get_errors() {
+		return $this->errors;
 	}
 
 	/**
 	 * Display admin error messages.
-	 *
-	 * @since 1.0.0
 	 */
-	public function display_errors() {}
+	public function display_errors() {
+		if ( $this->get_errors() ) {
+			echo '<div id="woocommerce_errors" class="error notice is-dismissible">';
+			foreach ( $this->get_errors() as $error ) {
+				echo '<p>' . wp_kses_post( $error ) . '</p>';
+			}
+			echo '</div>';
+		}
+	}
 
 	/**
-	 * Initialise Gateway Settings.
+	 * Initialise Settings.
 	 *
 	 * Store all settings in a single database entry
 	 * and make sure the $settings array is either the default
@@ -143,40 +221,25 @@ abstract class WC_Settings_API {
 	 * @uses get_option(), add_option()
 	 */
 	public function init_settings() {
+		$this->settings = get_option( $this->get_option_key(), null );
 
-		// Load form_field settings.
-		$this->settings = get_option( $this->plugin_id . $this->id . '_settings', null );
-
-		if ( ! $this->settings || ! is_array( $this->settings ) ) {
-
-			$this->settings = array();
-
-			// If there are no settings defined, load defaults.
-			if ( $form_fields = $this->get_form_fields() ) {
-
-				foreach ( $form_fields as $k => $v ) {
-					$this->settings[ $k ] = isset( $v['default'] ) ? $v['default'] : '';
-				}
-			}
-		}
-
-		if ( ! empty( $this->settings ) && is_array( $this->settings ) ) {
-			$this->settings = array_map( array( $this, 'format_settings' ), $this->settings );
-			$this->enabled  = isset( $this->settings['enabled'] ) && $this->settings['enabled'] == 'yes' ? 'yes' : 'no';
+		// If there are no settings defined, use defaults.
+		if ( ! is_array( $this->settings ) ) {
+			$form_fields    = $this->get_form_fields();
+			$this->settings = array_merge( array_fill_keys( array_keys( $form_fields ), '' ), wp_list_pluck( $form_fields, 'default' ) );
 		}
 	}
 
 	/**
 	 * get_option function.
 	 *
-	 * Gets and option from the settings API, using defaults if necessary to prevent undefined notices.
+	 * Gets an option from the settings API, using defaults if necessary to prevent undefined notices.
 	 *
 	 * @param  string $key
 	 * @param  mixed  $empty_value
-	 * @return mixed  The value specified for the option or a default value for the option.
+	 * @return string The value specified for the option or a default value for the option.
 	 */
 	public function get_option( $key, $empty_value = null ) {
-
 		if ( empty( $this->settings ) ) {
 			$this->init_settings();
 		}
@@ -184,10 +247,10 @@ abstract class WC_Settings_API {
 		// Get option default if unset.
 		if ( ! isset( $this->settings[ $key ] ) ) {
 			$form_fields            = $this->get_form_fields();
-			$this->settings[ $key ] = isset( $form_fields[ $key ]['default'] ) ? $form_fields[ $key ]['default'] : '';
+			$this->settings[ $key ] = isset( $form_fields[ $key ] ) ? $this->get_field_default( $form_fields[ $key ] ) : '';
 		}
 
-		if ( ! is_null( $empty_value ) && empty( $this->settings[ $key ] ) && '' === $this->settings[ $key ] ) {
+		if ( ! is_null( $empty_value ) && '' === $this->settings[ $key ] ) {
 			$this->settings[ $key ] = $empty_value;
 		}
 
@@ -204,16 +267,6 @@ abstract class WC_Settings_API {
 		return $this->plugin_id . $this->id . '_' . $key;
 	}
 
-	/**
-	 * Decode values for settings.
-	 *
-	 * @param  mixed $value
-	 * @return array
-	 */
-	public function format_settings( $value ) {
-		return is_array( $value ) ? $value : $value;
-	}
-
 	/**
 	 * Generate Settings HTML.
 	 *
@@ -224,27 +277,27 @@ abstract class WC_Settings_API {
 	 * @uses   method_exists()
 	 * @return string the html for the settings
 	 */
-	public function generate_settings_html( $form_fields = array() ) {
-
+	public function generate_settings_html( $form_fields = array(), $echo = true ) {
 		if ( empty( $form_fields ) ) {
 			$form_fields = $this->get_form_fields();
 		}
 
 		$html = '';
 		foreach ( $form_fields as $k => $v ) {
+			$type = $this->get_field_type( $v );
 
-			if ( ! isset( $v['type'] ) || ( $v['type'] == '' ) ) {
-				$v['type'] = 'text'; // Default to "text" field type.
-			}
-
-			if ( method_exists( $this, 'generate_' . $v['type'] . '_html' ) ) {
-				$html .= $this->{'generate_' . $v['type'] . '_html'}( $k, $v );
+			if ( method_exists( $this, 'generate_' . $type . '_html' ) ) {
+				$html .= $this->{'generate_' . $type . '_html'}( $k, $v );
 			} else {
-				$html .= $this->{'generate_text_html'}( $k, $v );
+				$html .= $this->generate_text_html( $k, $v );
 			}
 		}
 
-		echo $html;
+		if ( $echo ) {
+			echo $html;
+		} else {
+			return $html;
+		}
 	}
 
 	/**
@@ -254,7 +307,7 @@ abstract class WC_Settings_API {
 	 * @return string
 	 */
 	public function get_tooltip_html( $data ) {
-		if ( $data['desc_tip'] === true ) {
+		if ( true === $data['desc_tip'] ) {
 			$tip = $data['description'];
 		} elseif ( ! empty( $data['desc_tip'] ) ) {
 			$tip = $data['desc_tip'];
@@ -272,8 +325,7 @@ abstract class WC_Settings_API {
 	 * @return string
 	 */
 	public function get_description_html( $data ) {
-
-		if ( $data['desc_tip'] === true ) {
+		if ( true === $data['desc_tip'] ) {
 			$description = '';
 		} elseif ( ! empty( $data['desc_tip'] ) ) {
 			$description = $data['description'];
@@ -293,11 +345,9 @@ abstract class WC_Settings_API {
 	 * @return string
 	 */
 	public function get_custom_attribute_html( $data ) {
-
 		$custom_attributes = array();
 
 		if ( ! empty( $data['custom_attributes'] ) && is_array( $data['custom_attributes'] ) ) {
-
 			foreach ( $data['custom_attributes'] as $attribute => $attribute_value ) {
 				$custom_attributes[] = esc_attr( $attribute ) . '="' . esc_attr( $attribute_value ) . '"';
 			}
@@ -315,9 +365,8 @@ abstract class WC_Settings_API {
 	 * @return string
 	 */
 	public function generate_text_html( $key, $data ) {
-
-		$field    = $this->get_field_key( $key );
-		$defaults = array(
+		$field_key = $this->get_field_key( $key );
+		$defaults  = array(
 			'title'             => '',
 			'disabled'          => false,
 			'class'             => '',
@@ -326,7 +375,7 @@ abstract class WC_Settings_API {
 			'type'              => 'text',
 			'desc_tip'          => false,
 			'description'       => '',
-			'custom_attributes' => array()
+			'custom_attributes' => array(),
 		);
 
 		$data = wp_parse_args( $data, $defaults );
@@ -335,13 +384,13 @@ abstract class WC_Settings_API {
 		?>
 		<tr valign="top">
 			<th scope="row" class="titledesc">
-				<label for="<?php echo esc_attr( $field ); ?>"><?php echo wp_kses_post( $data['title'] ); ?></label>
 				<?php echo $this->get_tooltip_html( $data ); ?>
+				<label for="<?php echo esc_attr( $field_key ); ?>"><?php echo wp_kses_post( $data['title'] ); ?></label>
 			</th>
 			<td class="forminp">
 				<fieldset>
 					<legend class="screen-reader-text"><span><?php echo wp_kses_post( $data['title'] ); ?></span></legend>
-					<input class="input-text regular-input <?php echo esc_attr( $data['class'] ); ?>" type="<?php echo esc_attr( $data['type'] ); ?>" name="<?php echo esc_attr( $field ); ?>" id="<?php echo esc_attr( $field ); ?>" style="<?php echo esc_attr( $data['css'] ); ?>" value="<?php echo esc_attr( $this->get_option( $key ) ); ?>" placeholder="<?php echo esc_attr( $data['placeholder'] ); ?>" <?php disabled( $data['disabled'], true ); ?> <?php echo $this->get_custom_attribute_html( $data ); ?> />
+					<input class="input-text regular-input <?php echo esc_attr( $data['class'] ); ?>" type="<?php echo esc_attr( $data['type'] ); ?>" name="<?php echo esc_attr( $field_key ); ?>" id="<?php echo esc_attr( $field_key ); ?>" style="<?php echo esc_attr( $data['css'] ); ?>" value="<?php echo esc_attr( $this->get_option( $key ) ); ?>" placeholder="<?php echo esc_attr( $data['placeholder'] ); ?>" <?php disabled( $data['disabled'], true ); ?> <?php echo $this->get_custom_attribute_html( $data ); ?> />
 					<?php echo $this->get_description_html( $data ); ?>
 				</fieldset>
 			</td>
@@ -360,9 +409,8 @@ abstract class WC_Settings_API {
 	 * @return string
 	 */
 	public function generate_price_html( $key, $data ) {
-
-		$field    = $this->get_field_key( $key );
-		$defaults = array(
+		$field_key = $this->get_field_key( $key );
+		$defaults  = array(
 			'title'             => '',
 			'disabled'          => false,
 			'class'             => '',
@@ -371,7 +419,7 @@ abstract class WC_Settings_API {
 			'type'              => 'text',
 			'desc_tip'          => false,
 			'description'       => '',
-			'custom_attributes' => array()
+			'custom_attributes' => array(),
 		);
 
 		$data = wp_parse_args( $data, $defaults );
@@ -380,13 +428,13 @@ abstract class WC_Settings_API {
 		?>
 		<tr valign="top">
 			<th scope="row" class="titledesc">
-				<label for="<?php echo esc_attr( $field ); ?>"><?php echo wp_kses_post( $data['title'] ); ?></label>
 				<?php echo $this->get_tooltip_html( $data ); ?>
+				<label for="<?php echo esc_attr( $field_key ); ?>"><?php echo wp_kses_post( $data['title'] ); ?></label>
 			</th>
 			<td class="forminp">
 				<fieldset>
 					<legend class="screen-reader-text"><span><?php echo wp_kses_post( $data['title'] ); ?></span></legend>
-					<input class="wc_input_price input-text regular-input <?php echo esc_attr( $data['class'] ); ?>" type="text" name="<?php echo esc_attr( $field ); ?>" id="<?php echo esc_attr( $field ); ?>" style="<?php echo esc_attr( $data['css'] ); ?>" value="<?php echo esc_attr( wc_format_localized_price( $this->get_option( $key ) ) ); ?>" placeholder="<?php echo esc_attr( $data['placeholder'] ); ?>" <?php disabled( $data['disabled'], true ); ?> <?php echo $this->get_custom_attribute_html( $data ); ?> />
+					<input class="wc_input_price input-text regular-input <?php echo esc_attr( $data['class'] ); ?>" type="text" name="<?php echo esc_attr( $field_key ); ?>" id="<?php echo esc_attr( $field_key ); ?>" style="<?php echo esc_attr( $data['css'] ); ?>" value="<?php echo esc_attr( wc_format_localized_price( $this->get_option( $key ) ) ); ?>" placeholder="<?php echo esc_attr( $data['placeholder'] ); ?>" <?php disabled( $data['disabled'], true ); ?> <?php echo $this->get_custom_attribute_html( $data ); ?> />
 					<?php echo $this->get_description_html( $data ); ?>
 				</fieldset>
 			</td>
@@ -405,9 +453,8 @@ abstract class WC_Settings_API {
 	 * @return string
 	 */
 	public function generate_decimal_html( $key, $data ) {
-
-		$field    = $this->get_field_key( $key );
-		$defaults = array(
+		$field_key = $this->get_field_key( $key );
+		$defaults  = array(
 			'title'             => '',
 			'disabled'          => false,
 			'class'             => '',
@@ -416,7 +463,7 @@ abstract class WC_Settings_API {
 			'type'              => 'text',
 			'desc_tip'          => false,
 			'description'       => '',
-			'custom_attributes' => array()
+			'custom_attributes' => array(),
 		);
 
 		$data = wp_parse_args( $data, $defaults );
@@ -425,13 +472,13 @@ abstract class WC_Settings_API {
 		?>
 		<tr valign="top">
 			<th scope="row" class="titledesc">
-				<label for="<?php echo esc_attr( $field ); ?>"><?php echo wp_kses_post( $data['title'] ); ?></label>
 				<?php echo $this->get_tooltip_html( $data ); ?>
+				<label for="<?php echo esc_attr( $field_key ); ?>"><?php echo wp_kses_post( $data['title'] ); ?></label>
 			</th>
 			<td class="forminp">
 				<fieldset>
 					<legend class="screen-reader-text"><span><?php echo wp_kses_post( $data['title'] ); ?></span></legend>
-					<input class="wc_input_decimal input-text regular-input <?php echo esc_attr( $data['class'] ); ?>" type="text" name="<?php echo esc_attr( $field ); ?>" id="<?php echo esc_attr( $field ); ?>" style="<?php echo esc_attr( $data['css'] ); ?>" value="<?php echo esc_attr( wc_format_localized_decimal( $this->get_option( $key ) ) ); ?>" placeholder="<?php echo esc_attr( $data['placeholder'] ); ?>" <?php disabled( $data['disabled'], true ); ?> <?php echo $this->get_custom_attribute_html( $data ); ?> />
+					<input class="wc_input_decimal input-text regular-input <?php echo esc_attr( $data['class'] ); ?>" type="text" name="<?php echo esc_attr( $field_key ); ?>" id="<?php echo esc_attr( $field_key ); ?>" style="<?php echo esc_attr( $data['css'] ); ?>" value="<?php echo esc_attr( wc_format_localized_decimal( $this->get_option( $key ) ) ); ?>" placeholder="<?php echo esc_attr( $data['placeholder'] ); ?>" <?php disabled( $data['disabled'], true ); ?> <?php echo $this->get_custom_attribute_html( $data ); ?> />
 					<?php echo $this->get_description_html( $data ); ?>
 				</fieldset>
 			</td>
@@ -463,9 +510,8 @@ abstract class WC_Settings_API {
 	 * @return string
 	 */
 	public function generate_color_html( $key, $data ) {
-
-		$field    = $this->get_field_key( $key );
-		$defaults = array(
+		$field_key = $this->get_field_key( $key );
+		$defaults  = array(
 			'title'             => '',
 			'disabled'          => false,
 			'class'             => '',
@@ -473,7 +519,7 @@ abstract class WC_Settings_API {
 			'placeholder'       => '',
 			'desc_tip'          => false,
 			'description'       => '',
-			'custom_attributes' => array()
+			'custom_attributes' => array(),
 		);
 
 		$data = wp_parse_args( $data, $defaults );
@@ -482,15 +528,15 @@ abstract class WC_Settings_API {
 		?>
 		<tr valign="top">
 			<th scope="row" class="titledesc">
-				<label for="<?php echo esc_attr( $field ); ?>"><?php echo wp_kses_post( $data['title'] ); ?></label>
 				<?php echo $this->get_tooltip_html( $data ); ?>
+				<label for="<?php echo esc_attr( $field_key ); ?>"><?php echo wp_kses_post( $data['title'] ); ?></label>
 			</th>
 			<td class="forminp">
 				<fieldset>
 					<legend class="screen-reader-text"><span><?php echo wp_kses_post( $data['title'] ); ?></span></legend>
 					<span class="colorpickpreview" style="background:<?php echo esc_attr( $this->get_option( $key ) ); ?>;"></span>
-					<input class="colorpick <?php echo esc_attr( $data['class'] ); ?>" type="text" name="<?php echo esc_attr( $field ); ?>" id="<?php echo esc_attr( $field ); ?>" style="<?php echo esc_attr( $data['css'] ); ?>" value="<?php echo esc_attr( $this->get_option( $key ) ); ?>" placeholder="<?php echo esc_attr( $data['placeholder'] ); ?>" <?php disabled( $data['disabled'], true ); ?> <?php echo $this->get_custom_attribute_html( $data ); ?> />
-					<div id="colorPickerDiv_<?php echo esc_attr( $field ); ?>" class="colorpickdiv" style="z-index: 100; background: #eee; border: 1px solid #ccc; position: absolute; display: none;"></div>
+					<input class="colorpick <?php echo esc_attr( $data['class'] ); ?>" type="text" name="<?php echo esc_attr( $field_key ); ?>" id="<?php echo esc_attr( $field_key ); ?>" style="<?php echo esc_attr( $data['css'] ); ?>" value="<?php echo esc_attr( $this->get_option( $key ) ); ?>" placeholder="<?php echo esc_attr( $data['placeholder'] ); ?>" <?php disabled( $data['disabled'], true ); ?> <?php echo $this->get_custom_attribute_html( $data ); ?> />
+					<div id="colorPickerDiv_<?php echo esc_attr( $field_key ); ?>" class="colorpickdiv" style="z-index: 100; background: #eee; border: 1px solid #ccc; position: absolute; display: none;"></div>
 					<?php echo $this->get_description_html( $data ); ?>
 				</fieldset>
 			</td>
@@ -509,9 +555,8 @@ abstract class WC_Settings_API {
 	 * @return string
 	 */
 	public function generate_textarea_html( $key, $data ) {
-
-		$field    = $this->get_field_key( $key );
-		$defaults = array(
+		$field_key = $this->get_field_key( $key );
+		$defaults  = array(
 			'title'             => '',
 			'disabled'          => false,
 			'class'             => '',
@@ -520,7 +565,7 @@ abstract class WC_Settings_API {
 			'type'              => 'text',
 			'desc_tip'          => false,
 			'description'       => '',
-			'custom_attributes' => array()
+			'custom_attributes' => array(),
 		);
 
 		$data = wp_parse_args( $data, $defaults );
@@ -529,13 +574,13 @@ abstract class WC_Settings_API {
 		?>
 		<tr valign="top">
 			<th scope="row" class="titledesc">
-				<label for="<?php echo esc_attr( $field ); ?>"><?php echo wp_kses_post( $data['title'] ); ?></label>
 				<?php echo $this->get_tooltip_html( $data ); ?>
+				<label for="<?php echo esc_attr( $field_key ); ?>"><?php echo wp_kses_post( $data['title'] ); ?></label>
 			</th>
 			<td class="forminp">
 				<fieldset>
 					<legend class="screen-reader-text"><span><?php echo wp_kses_post( $data['title'] ); ?></span></legend>
-					<textarea rows="3" cols="20" class="input-text wide-input <?php echo esc_attr( $data['class'] ); ?>" type="<?php echo esc_attr( $data['type'] ); ?>" name="<?php echo esc_attr( $field ); ?>" id="<?php echo esc_attr( $field ); ?>" style="<?php echo esc_attr( $data['css'] ); ?>" placeholder="<?php echo esc_attr( $data['placeholder'] ); ?>" <?php disabled( $data['disabled'], true ); ?> <?php echo $this->get_custom_attribute_html( $data ); ?>><?php echo esc_textarea( $this->get_option( $key ) ); ?></textarea>
+					<textarea rows="3" cols="20" class="input-text wide-input <?php echo esc_attr( $data['class'] ); ?>" type="<?php echo esc_attr( $data['type'] ); ?>" name="<?php echo esc_attr( $field_key ); ?>" id="<?php echo esc_attr( $field_key ); ?>" style="<?php echo esc_attr( $data['css'] ); ?>" placeholder="<?php echo esc_attr( $data['placeholder'] ); ?>" <?php disabled( $data['disabled'], true ); ?> <?php echo $this->get_custom_attribute_html( $data ); ?>><?php echo esc_textarea( $this->get_option( $key ) ); ?></textarea>
 					<?php echo $this->get_description_html( $data ); ?>
 				</fieldset>
 			</td>
@@ -554,9 +599,8 @@ abstract class WC_Settings_API {
 	 * @return string
 	 */
 	public function generate_checkbox_html( $key, $data ) {
-
-		$field    = $this->get_field_key( $key );
-		$defaults = array(
+		$field_key = $this->get_field_key( $key );
+		$defaults  = array(
 			'title'             => '',
 			'label'             => '',
 			'disabled'          => false,
@@ -565,7 +609,7 @@ abstract class WC_Settings_API {
 			'type'              => 'text',
 			'desc_tip'          => false,
 			'description'       => '',
-			'custom_attributes' => array()
+			'custom_attributes' => array(),
 		);
 
 		$data = wp_parse_args( $data, $defaults );
@@ -578,14 +622,14 @@ abstract class WC_Settings_API {
 		?>
 		<tr valign="top">
 			<th scope="row" class="titledesc">
-				<label for="<?php echo esc_attr( $field ); ?>"><?php echo wp_kses_post( $data['title'] ); ?></label>
 				<?php echo $this->get_tooltip_html( $data ); ?>
+				<label for="<?php echo esc_attr( $field_key ); ?>"><?php echo wp_kses_post( $data['title'] ); ?></label>
 			</th>
 			<td class="forminp">
 				<fieldset>
 					<legend class="screen-reader-text"><span><?php echo wp_kses_post( $data['title'] ); ?></span></legend>
-					<label for="<?php echo esc_attr( $field ); ?>">
-					<input <?php disabled( $data['disabled'], true ); ?> class="<?php echo esc_attr( $data['class'] ); ?>" type="checkbox" name="<?php echo esc_attr( $field ); ?>" id="<?php echo esc_attr( $field ); ?>" style="<?php echo esc_attr( $data['css'] ); ?>" value="1" <?php checked( $this->get_option( $key ), 'yes' ); ?> <?php echo $this->get_custom_attribute_html( $data ); ?> /> <?php echo wp_kses_post( $data['label'] ); ?></label><br/>
+					<label for="<?php echo esc_attr( $field_key ); ?>">
+					<input <?php disabled( $data['disabled'], true ); ?> class="<?php echo esc_attr( $data['class'] ); ?>" type="checkbox" name="<?php echo esc_attr( $field_key ); ?>" id="<?php echo esc_attr( $field_key ); ?>" style="<?php echo esc_attr( $data['css'] ); ?>" value="1" <?php checked( $this->get_option( $key ), 'yes' ); ?> <?php echo $this->get_custom_attribute_html( $data ); ?> /> <?php echo wp_kses_post( $data['label'] ); ?></label><br/>
 					<?php echo $this->get_description_html( $data ); ?>
 				</fieldset>
 			</td>
@@ -604,9 +648,8 @@ abstract class WC_Settings_API {
 	 * @return string
 	 */
 	public function generate_select_html( $key, $data ) {
-
-		$field    = $this->get_field_key( $key );
-		$defaults = array(
+		$field_key = $this->get_field_key( $key );
+		$defaults  = array(
 			'title'             => '',
 			'disabled'          => false,
 			'class'             => '',
@@ -616,7 +659,7 @@ abstract class WC_Settings_API {
 			'desc_tip'          => false,
 			'description'       => '',
 			'custom_attributes' => array(),
-			'options'           => array()
+			'options'           => array(),
 		);
 
 		$data = wp_parse_args( $data, $defaults );
@@ -625,13 +668,13 @@ abstract class WC_Settings_API {
 		?>
 		<tr valign="top">
 			<th scope="row" class="titledesc">
-				<label for="<?php echo esc_attr( $field ); ?>"><?php echo wp_kses_post( $data['title'] ); ?></label>
 				<?php echo $this->get_tooltip_html( $data ); ?>
+				<label for="<?php echo esc_attr( $field_key ); ?>"><?php echo wp_kses_post( $data['title'] ); ?></label>
 			</th>
 			<td class="forminp">
 				<fieldset>
 					<legend class="screen-reader-text"><span><?php echo wp_kses_post( $data['title'] ); ?></span></legend>
-					<select class="select <?php echo esc_attr( $data['class'] ); ?>" name="<?php echo esc_attr( $field ); ?>" id="<?php echo esc_attr( $field ); ?>" style="<?php echo esc_attr( $data['css'] ); ?>" <?php disabled( $data['disabled'], true ); ?> <?php echo $this->get_custom_attribute_html( $data ); ?>>
+					<select class="select <?php echo esc_attr( $data['class'] ); ?>" name="<?php echo esc_attr( $field_key ); ?>" id="<?php echo esc_attr( $field_key ); ?>" style="<?php echo esc_attr( $data['css'] ); ?>" <?php disabled( $data['disabled'], true ); ?> <?php echo $this->get_custom_attribute_html( $data ); ?>>
 						<?php foreach ( (array) $data['options'] as $option_key => $option_value ) : ?>
 							<option value="<?php echo esc_attr( $option_key ); ?>" <?php selected( $option_key, esc_attr( $this->get_option( $key ) ) ); ?>><?php echo esc_attr( $option_value ); ?></option>
 						<?php endforeach; ?>
@@ -654,9 +697,8 @@ abstract class WC_Settings_API {
 	 * @return string
 	 */
 	public function generate_multiselect_html( $key, $data ) {
-
-		$field    = $this->get_field_key( $key );
-		$defaults = array(
+		$field_key = $this->get_field_key( $key );
+		$defaults  = array(
 			'title'             => '',
 			'disabled'          => false,
 			'class'             => '',
@@ -666,7 +708,8 @@ abstract class WC_Settings_API {
 			'desc_tip'          => false,
 			'description'       => '',
 			'custom_attributes' => array(),
-			'options'           => array()
+			'select_buttons'    => false,
+			'options'           => array(),
 		);
 
 		$data  = wp_parse_args( $data, $defaults );
@@ -676,18 +719,21 @@ abstract class WC_Settings_API {
 		?>
 		<tr valign="top">
 			<th scope="row" class="titledesc">
-				<label for="<?php echo esc_attr( $field ); ?>"><?php echo wp_kses_post( $data['title'] ); ?></label>
 				<?php echo $this->get_tooltip_html( $data ); ?>
+				<label for="<?php echo esc_attr( $field_key ); ?>"><?php echo wp_kses_post( $data['title'] ); ?></label>
 			</th>
 			<td class="forminp">
 				<fieldset>
 					<legend class="screen-reader-text"><span><?php echo wp_kses_post( $data['title'] ); ?></span></legend>
-					<select multiple="multiple" class="multiselect <?php echo esc_attr( $data['class'] ); ?>" name="<?php echo esc_attr( $field ); ?>[]" id="<?php echo esc_attr( $field ); ?>" style="<?php echo esc_attr( $data['css'] ); ?>" <?php disabled( $data['disabled'], true ); ?> <?php echo $this->get_custom_attribute_html( $data ); ?>>
+					<select multiple="multiple" class="multiselect <?php echo esc_attr( $data['class'] ); ?>" name="<?php echo esc_attr( $field_key ); ?>[]" id="<?php echo esc_attr( $field_key ); ?>" style="<?php echo esc_attr( $data['css'] ); ?>" <?php disabled( $data['disabled'], true ); ?> <?php echo $this->get_custom_attribute_html( $data ); ?>>
 						<?php foreach ( (array) $data['options'] as $option_key => $option_value ) : ?>
 							<option value="<?php echo esc_attr( $option_key ); ?>" <?php selected( in_array( $option_key, $value ), true ); ?>><?php echo esc_attr( $option_value ); ?></option>
 						<?php endforeach; ?>
 					</select>
 					<?php echo $this->get_description_html( $data ); ?>
+					<?php if ( $data['select_buttons'] ) : ?>
+						<br/><a class="select_all button" href="#"><?php _e( 'Select all', 'woocommerce' ); ?></a> <a class="select_none button" href="#"><?php _e( 'Select none', 'woocommerce' ); ?></a>
+					<?php endif; ?>
 				</fieldset>
 			</td>
 		</tr>
@@ -705,11 +751,10 @@ abstract class WC_Settings_API {
 	 * @return string
 	 */
 	public function generate_title_html( $key, $data ) {
-
-		$field    = $this->get_field_key( $key );
-		$defaults = array(
-			'title'             => '',
-			'class'             => ''
+		$field_key = $this->get_field_key( $key );
+		$defaults  = array(
+			'title' => '',
+			'class' => '',
 		);
 
 		$data = wp_parse_args( $data, $defaults );
@@ -717,7 +762,7 @@ abstract class WC_Settings_API {
 		ob_start();
 		?>
 			</table>
-			<h3 class="wc-settings-sub-title <?php echo esc_attr( $data['class'] ); ?>" id="<?php echo esc_attr( $field ); ?>"><?php echo wp_kses_post( $data['title'] ); ?></h3>
+			<h3 class="wc-settings-sub-title <?php echo esc_attr( $data['class'] ); ?>" id="<?php echo esc_attr( $field_key ); ?>"><?php echo wp_kses_post( $data['title'] ); ?></h3>
 			<?php if ( ! empty( $data['description'] ) ) : ?>
 				<p><?php echo wp_kses_post( $data['description'] ); ?></p>
 			<?php endif; ?>
@@ -727,63 +772,18 @@ abstract class WC_Settings_API {
 		return ob_get_clean();
 	}
 
-	/**
-	 * Validate the data on the "Settings" form.
-	 *
-	 * @since 1.0.0
-	 * @param array $form_fields (default: array())
-	 */
-	public function validate_settings_fields( $form_fields = array() ) {
-		if ( empty( $form_fields ) ) {
-			$form_fields = $this->get_form_fields();
-		}
-
-		$this->sanitized_fields = array();
-
-		foreach ( $form_fields as $key => $field ) {
-
-			// Default to "text" field type.
-			$type = empty( $field['type'] ) ? 'text' : $field['type'];
-
-			// Look for a validate_FIELDID_field method for special handling
-			if ( method_exists( $this, 'validate_' . $key . '_field' ) ) {
-				$field = $this->{'validate_' . $key . '_field'}( $key );
-
-			// Exclude certain types from saving
-			} elseif ( in_array( $type, array( 'title' ) ) ) {
-				continue;
-
-			// Look for a validate_FIELDTYPE_field method
-			} elseif ( method_exists( $this, 'validate_' . $type . '_field' ) ) {
-				$field = $this->{'validate_' . $type . '_field'}( $key );
-
-			// Fallback to text
-			} else {
-				$field = $this->validate_text_field( $key );
-			}
-
-			$this->sanitized_fields[ $key ] = $field;
-		}
-	}
-
 	/**
 	 * Validate Text Field.
 	 *
 	 * Make sure the data is escaped correctly, etc.
 	 *
-	 * @param  mixed $key
+	 * @param  string $key Field key
+	 * @param  string|null $value Posted Value
 	 * @return string
 	 */
-	public function validate_text_field( $key ) {
-
-		$text  = $this->get_option( $key );
-		$field = $this->get_field_key( $key );
-
-		if ( isset( $_POST[ $field ] ) ) {
-			$text = wp_kses_post( trim( stripslashes( $_POST[ $field ] ) ) );
-		}
-
-		return $text;
+	public function validate_text_field( $key, $value ) {
+		$value = is_null( $value ) ? '' : $value;
+		return wp_kses_post( trim( stripslashes( $value ) ) );
 	}
 
 	/**
@@ -791,24 +791,13 @@ abstract class WC_Settings_API {
 	 *
 	 * Make sure the data is escaped correctly, etc.
 	 *
-	 * @param  mixed $key
+	 * @param  string $key
+	 * @param  string|null $value Posted Value
 	 * @return string
 	 */
-	public function validate_price_field( $key ) {
-
-		$text  = $this->get_option( $key );
-		$field = $this->get_field_key( $key );
-
-		if ( isset( $_POST[ $field ] ) ) {
-
-			if ( $_POST[ $field ] !== '' ) {
-				$text = wc_format_decimal( trim( stripslashes( $_POST[ $field ] ) ) );
-			} else {
-				$text = '';
-			}
-		}
-
-		return $text;
+	public function validate_price_field( $key, $value ) {
+		$value = is_null( $value ) ? '' : $value;
+		return ( '' === $value ) ? '' : wc_format_decimal( trim( stripslashes( $value ) ) );
 	}
 
 	/**
@@ -816,68 +805,44 @@ abstract class WC_Settings_API {
 	 *
 	 * Make sure the data is escaped correctly, etc.
 	 *
-	 * @param  mixed $key
+	 * @param  string $key
+	 * @param  string|null $value Posted Value
 	 * @return string
 	 */
-	public function validate_decimal_field( $key ) {
-
-		$text  = $this->get_option( $key );
-		$field = $this->get_field_key( $key );
-
-		if ( isset( $_POST[ $field ] ) ) {
-
-			if ( $_POST[ $field ] !== '' ) {
-				$text = wc_format_decimal( trim( stripslashes( $_POST[ $field ] ) ) );
-			} else {
-				$text = '';
-			}
-		}
-
-		return $text;
+	public function validate_decimal_field( $key, $value ) {
+		$value = is_null( $value ) ? '' : $value;
+		return ( '' === $value ) ? '' : wc_format_decimal( trim( stripslashes( $value ) ) );
 	}
 
 	/**
-	 * Validate Password Field.
+	 * Validate Password Field. No input sanitization is used to avoid corrupting passwords.
 	 *
-	 * Make sure the data is escaped correctly, etc.
-	 *
-	 * @param  mixed $key
-	 * @since  1.0.0
+	 * @param  string $key
+	 * @param  string|null $value Posted Value
 	 * @return string
 	 */
-	public function validate_password_field( $key ) {
-		$field = $this->get_field_key( $key );
-		$value = wp_kses_post( trim( stripslashes( $_POST[ $field ] ) ) );
-		return $value;
+	public function validate_password_field( $key, $value ) {
+		$value = is_null( $value ) ? '' : $value;
+		return trim( stripslashes( $value ) );
 	}
 
 	/**
 	 * Validate Textarea Field.
 	 *
-	 * Make sure the data is escaped correctly, etc.
-	 *
-	 * @param  mixed $key
-	 * @since  1.0.0
+	 * @param  string $key
+	 * @param  string|null $value Posted Value
 	 * @return string
 	 */
-	public function validate_textarea_field( $key ) {
-
-		$text  = $this->get_option( $key );
-		$field = $this->get_field_key( $key );
-
-		if ( isset( $_POST[ $field ] ) ) {
-
-			$text = wp_kses( trim( stripslashes( $_POST[ $field ] ) ),
-				array_merge(
-					array(
-						'iframe' => array( 'src' => true, 'style' => true, 'id' => true, 'class' => true )
-					),
-					wp_kses_allowed_html( 'post' )
-				)
-			);
-		}
-
-		return $text;
+	public function validate_textarea_field( $key, $value ) {
+		$value = is_null( $value ) ? '' : $value;
+		return wp_kses( trim( stripslashes( $value ) ),
+			array_merge(
+				array(
+					'iframe' => array( 'src' => true, 'style' => true, 'id' => true, 'class' => true ),
+				),
+				wp_kses_allowed_html( 'post' )
+			)
+		);
 	}
 
 	/**
@@ -885,62 +850,53 @@ abstract class WC_Settings_API {
 	 *
 	 * If not set, return "no", otherwise return "yes".
 	 *
-	 * @param  mixed $key
-	 * @since  1.0.0
+	 * @param  string $key
+	 * @param  string|null $value Posted Value
 	 * @return string
 	 */
-	public function validate_checkbox_field( $key ) {
-
-		$status = 'no';
-		$field  = $this->get_field_key( $key );
-
-		if ( isset( $_POST[ $field ] ) && ( 1 == $_POST[ $field ] ) ) {
-			$status = 'yes';
-		}
-
-		return $status;
+	public function validate_checkbox_field( $key, $value ) {
+		return ! is_null( $value ) ? 'yes' : 'no';
 	}
 
 	/**
 	 * Validate Select Field.
 	 *
-	 * Make sure the data is escaped correctly, etc.
-	 *
-	 * @param  mixed $key
-	 * @since  1.0.0
+	 * @param  string $key
+	 * @param  string $value Posted Value
 	 * @return string
 	 */
-	public function validate_select_field( $key ) {
-
-		$value = $this->get_option( $key );
-		$field = $this->get_field_key( $key );
-
-		if ( isset( $_POST[ $field ] ) ) {
-			$value = wc_clean( stripslashes( $_POST[ $field ] ) );
-		}
-
-		return $value;
+	public function validate_select_field( $key, $value ) {
+		$value = is_null( $value ) ? '' : $value;
+		return wc_clean( stripslashes( $value ) );
 	}
 
 	/**
 	 * Validate Multiselect Field.
 	 *
-	 * Make sure the data is escaped correctly, etc.
-	 *
-	 * @param  mixed $key
-	 * @since  1.0.0
+	 * @param  string $key
+	 * @param  string $value Posted Value
 	 * @return string
 	 */
-	public function validate_multiselect_field( $key ) {
+	public function validate_multiselect_field( $key, $value ) {
+		return is_array( $value ) ? array_map( 'wc_clean', array_map( 'stripslashes', $value ) ) : '';
+	}
 
-		$field = $this->get_field_key( $key );
-
-		if ( isset( $_POST[ $field ] ) ) {
-			$value = array_map( 'wc_clean', array_map( 'stripslashes', (array) $_POST[ $field ] ) );
-		} else {
-			$value = '';
-		}
+	/**
+	 * Validate the data on the "Settings" form.
+	 * @deprecated 2.6.0 No longer used
+	 */
+	public function validate_settings_fields( $form_fields = array() ) {
+		wc_deprecated_function( 'validate_settings_fields', '2.6' );
+	}
 
+	/**
+	 * Format settings if needed.
+	 * @deprecated 2.6.0 Unused
+	 * @param  array $value
+	 * @return array
+	 */
+	public function format_settings( $value ) {
+		wc_deprecated_function( 'format_settings', '2.6' );
 		return $value;
 	}
 }
diff --git a/includes/abstracts/abstract-wc-shipping-method.php b/includes/abstracts/abstract-wc-shipping-method.php
index e5a0056099e..e277f72eed2 100644
--- a/includes/abstracts/abstract-wc-shipping-method.php
+++ b/includes/abstracts/abstract-wc-shipping-method.php
@@ -1,7 +1,7 @@
 <?php
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
 /**
@@ -10,178 +10,182 @@ if ( ! defined( 'ABSPATH' ) ) {
  * Extended by shipping methods to handle shipping calculations etc.
  *
  * @class       WC_Shipping_Method
- * @version     2.3.0
+ * @version     3.0.0
  * @package     WooCommerce/Abstracts
  * @category    Abstract Class
  * @author      WooThemes
  */
 abstract class WC_Shipping_Method extends WC_Settings_API {
 
-	/** @var string Unique ID for the shipping method - must be set. */
-	public $id;
+	/**
+	 * Features this method supports. Possible features used by core:
+	 * - shipping-zones Shipping zone functionality + instances
+	 * - instance-settings Instance settings screens.
+	 * - settings Non-instance settings screens. Enabled by default for BW compatibility with methods before instances existed.
+	 * - instance-settings-modal Allows the instance settings to be loaded within a modal in the zones UI.
+	 * @var array
+	 */
+	public $supports = array( 'settings' );
 
-	/** @var int Optional instance ID. */
-	public $number;
+	/**
+	 * Unique ID for the shipping method - must be set.
+	 * @var string
+	 */
+	public $id = '';
 
-	/** @var string Method title */
-	public $method_title;
+	/**
+	 * Method title.
+	 * @var string
+	 */
+	public $method_title = '';
 
-	/** @var string User set title */
+	/**
+	 * Method description.
+	 * @var string
+	 */
+	public $method_description = '';
+
+	/**
+	 * yes or no based on whether the method is enabled.
+	 * @var string
+	 */
+	public $enabled = 'yes';
+
+	/**
+	 * Shipping method title for the frontend.
+	 * @var string
+	 */
 	public $title;
 
-	/**  @var bool True if the method is available. */
+	/**
+	 * This is an array of rates - methods must populate this array to register shipping costs.
+	 * @var array
+	 */
+	public $rates = array();
+
+	/**
+	 * If 'taxable' tax will be charged for this method (if applicable).
+	 * @var string
+	 */
+	public $tax_status = 'taxable';
+
+	/**
+	 * Fee for the method (if applicable).
+	 * @var string
+	 */
+	public $fee = null;
+
+	/**
+	 * Minimum fee for the method (if applicable).
+	 * @var string
+	 */
+	public $minimum_fee = null;
+
+	/**
+	 * Instance ID if used.
+	 * @var int
+	 */
+	public $instance_id = 0;
+
+	/**
+	 * Instance form fields.
+	 * @var array
+	 */
+	public $instance_form_fields = array();
+
+	/**
+	 * Instance settings.
+	 * @var array
+	 */
+	public $instance_settings = array();
+
+	/**
+	 * Availability - legacy. Used for method Availability.
+	 * No longer useful for instance based shipping methods.
+	 * @deprecated 2.6.0
+	 * @var string
+	 */
 	public $availability;
 
-	/** @var array Array of countries this method is enabled for. */
-	public $countries    = array();
+	/**
+	 * Availability countries - legacy. Used for method Availability.
+	 * No longer useful for instance based shipping methods.
+	 * @deprecated 2.6.0
+	 * @var array
+	 */
+	public $countries = array();
 
-	/** @var string If 'taxable' tax will be charged for this method (if applicable) */
-	public $tax_status   = 'taxable';
+	/**
+	 * Constructor.
+	 * @param int $instance_id
+	 */
+	public function __construct( $instance_id = 0 ) {
+		$this->instance_id = absint( $instance_id );
+	}
 
-	/** @var mixed Fees for the method */
-	public $fee          = 0;
+	/**
+	 * Check if a shipping method supports a given feature.
+	 *
+	 * Methods should override this to declare support (or lack of support) for a feature.
+	 *
+	 * @param $feature string The name of a feature to test support for.
+	 * @return bool True if the shipping method supports the feature, false otherwise.
+	 */
+	public function supports( $feature ) {
+		return apply_filters( 'woocommerce_shipping_method_supports', in_array( $feature, $this->supports ), $feature, $this );
+	}
 
-	/** @var float Minimum fee for the method */
-	public $minimum_fee  = null;
-
-	/** @var bool Enabled for disabled */
-	public $enabled      = false;
-
-	/** @var bool Whether the method has settings or not (In WooCommerce > Settings > Shipping) */
-	public $has_settings = true;
-
-	/** @var array Features this method supports. */
-	public $supports     = array();
-
-	/** @var array This is an array of rates - methods must populate this array to register shipping costs */
-	public $rates        = array();
+	/**
+	 * Called to calculate shipping rates for this method. Rates can be added using the add_rate() method.
+	 */
+	public function calculate_shipping( $package = array() ) {}
 
 	/**
 	 * Whether or not we need to calculate tax on top of the shipping rate.
-	 *
 	 * @return boolean
 	 */
 	public function is_taxable() {
-		return ( wc_tax_enabled() && $this->tax_status == 'taxable' && ! WC()->customer->is_vat_exempt() );
+		return wc_tax_enabled() && 'taxable' === $this->tax_status && ! WC()->customer->get_is_vat_exempt();
 	}
 
 	/**
-	 * Add a rate.
-	 *
-	 * Add a shipping rate. If taxes are not set they will be calculated based on cost.
-	 *
-	 * @param array $args (default: array())
+	 * Whether or not this method is enabled in settings.
+	 * @since 2.6.0
+	 * @return boolean
 	 */
-	public function add_rate( $args = array() ) {
-		$args = wp_parse_args( $args, array(
-			'id'        => '',          // ID for the rate
-			'label'     => '',          // Label for the rate
-			'cost'      => '0',         // Amount or array of costs (per item shipping)
-			'taxes'     => '',          // Pass taxes, nothing to have it calculated for you, or 'false' to calc no tax
-			'calc_tax'  => 'per_order'  // Calc tax per_order or per_item. Per item needs an array of costs
-		) );
-
-		// Id and label are required
-		if ( ! $args['id'] || ! $args['label'] ) {
-			return;
-		}
-
-		// Handle cost
-		$total_cost = is_array( $args['cost'] ) ? array_sum( $args['cost'] ) : $args['cost'];
-		$taxes      = $args['taxes'];
-
-		// Taxes - if not an array and not set to false, calc tax based on cost and passed calc_tax variable
-		// This saves shipping methods having to do complex tax calculations
-		if ( ! is_array( $taxes ) && $taxes !== false && $total_cost > 0 && $this->is_taxable() ) {
-			$taxes = array();
-
-			switch ( $args['calc_tax'] ) {
-				case "per_item" :
-					// If we have an array of costs we can look up each items tax class and add tax accordingly
-					if ( is_array( $args['cost'] ) ) {
-
-						$cart = WC()->cart->get_cart();
-
-						foreach ( $args['cost'] as $cost_key => $amount ) {
-							if ( ! isset( $cart[ $cost_key ] ) ) {
-								continue;
-							}
-
-							$item_taxes = WC_Tax::calc_shipping_tax( $amount, WC_Tax::get_shipping_tax_rates( $cart[ $cost_key ]['data']->get_tax_class() ) );
-
-							// Sum the item taxes
-							foreach ( array_keys( $taxes + $item_taxes ) as $key ) {
-								$taxes[ $key ] = ( isset( $item_taxes[ $key ] ) ? $item_taxes[ $key ] : 0 ) + ( isset( $taxes[ $key ] ) ? $taxes[ $key ] : 0 );
-							}
-						}
-
-						// Add any cost for the order - order costs are in the key 'order'
-						if ( isset( $args['cost']['order'] ) ) {
-							$item_taxes = WC_Tax::calc_shipping_tax( $args['cost']['order'], WC_Tax::get_shipping_tax_rates() );
-
-							// Sum the item taxes
-							foreach ( array_keys( $taxes + $item_taxes ) as $key ) {
-								$taxes[ $key ] = ( isset( $item_taxes[ $key ] ) ? $item_taxes[ $key ] : 0 ) + ( isset( $taxes[ $key ] ) ? $taxes[ $key ] : 0 );
-							}
-						}
-					}
-				break;
-				default :
-					$taxes = WC_Tax::calc_shipping_tax( $total_cost, WC_Tax::get_shipping_tax_rates() );
-				break;
-			}
-		}
-
-		$this->rates[] = new WC_Shipping_Rate( $args['id'], $args['label'], $total_cost, $taxes, $this->id );
+	public function is_enabled() {
+		return 'yes' === $this->enabled;
 	}
 
 	/**
-	 * has_settings function.
-	 *
-	 * @return bool
+	 * Return the shipping method instance ID.
+	 * @since 2.6.0
+	 * @return int
 	 */
-	public function has_settings() {
-		return $this->has_settings;
-	}
-
-	/**
-	 * is_available function.
-	 *
-	 * @param array $package
-	 * @return bool
-	 */
-	public function is_available( $package ) {
-		if ( 'no' == $this->enabled ) {
-			return false;
-		}
-
-		// Country availability
-		$countries = is_array( $this->countries ) ? $this->countries : array();
-
-		switch ( $this->availability ) {
-			case 'specific' :
-			case 'including' :
-				$ship_to_countries = array_intersect( $countries, array_keys( WC()->countries->get_shipping_countries() ) );
-			break;
-
-			case 'excluding' :
-				$ship_to_countries = array_diff( array_keys( WC()->countries->get_shipping_countries() ), $countries );
-			break;
-
-			default :
-				$ship_to_countries = array_keys( WC()->countries->get_shipping_countries() );
-			break;
-		}
-
-		if ( ! in_array( $package['destination']['country'], $ship_to_countries ) ) {
-			return false;
-		}
-
-		return apply_filters( 'woocommerce_shipping_' . $this->id . '_is_available', true, $package );
+	public function get_instance_id() {
+		return $this->instance_id;
 	}
 
 	/**
 	 * Return the shipping method title.
+	 * @since 2.6.0
+	 * @return string
+	 */
+	public function get_method_title() {
+		return apply_filters( 'woocommerce_shipping_method_title', $this->method_title, $this );
+	}
+
+	/**
+	 * Return the shipping method description.
+	 * @since 2.6.0
+	 * @return string
+	 */
+	public function get_method_description() {
+		return apply_filters( 'woocommerce_shipping_method_description', $this->method_description, $this );
+	}
+
+	/**
+	 * Return the shipping title which is user set.
 	 *
 	 * @return string
 	 */
@@ -190,10 +194,169 @@ abstract class WC_Shipping_Method extends WC_Settings_API {
 	}
 
 	/**
-	 * get_fee function.
-	 *
-	 * @param mixed $fee
-	 * @param mixed $total
+	 * Return calculated rates for a package.
+	 * @since 2.6.0
+	 * @param object $package
+	 * @return array
+	 */
+	public function get_rates_for_package( $package ) {
+		$this->rates = array();
+		if ( $this->is_available( $package ) && ( empty( $package['ship_via'] ) || in_array( $this->id, $package['ship_via'] ) ) ) {
+			$this->calculate_shipping( $package );
+		}
+		return $this->rates;
+	}
+
+	/**
+	 * Returns a rate ID based on this methods ID and instance, with an optional
+	 * suffix if distinguishing between multiple rates.
+	 * @since 2.6.0
+	 * @param string $suffix
+	 * @return string
+	 */
+	public function get_rate_id( $suffix = '' ) {
+		$rate_id = array( $this->id );
+
+		if ( $this->instance_id ) {
+			$rate_id[] = $this->instance_id;
+		}
+
+		if ( $suffix ) {
+			$rate_id[] = $suffix;
+		}
+
+		return implode( ':', $rate_id );
+	}
+
+	/**
+	 * Add a shipping rate. If taxes are not set they will be calculated based on cost.
+	 * @param array $args (default: array())
+	 */
+	public function add_rate( $args = array() ) {
+		$args = wp_parse_args( $args, array(
+			'id'        => $this->get_rate_id(), // ID for the rate. If not passed, this id:instance default will be used.
+			'label'     => '', // Label for the rate
+			'cost'      => '0', // Amount or array of costs (per item shipping)
+			'taxes'     => '', // Pass taxes, or leave empty to have it calculated for you, or 'false' to disable calculations
+			'calc_tax'  => 'per_order', // Calc tax per_order or per_item. Per item needs an array of costs
+			'meta_data' => array(), // Array of misc meta data to store along with this rate - key value pairs.
+			'package'   => false, // Package array this rate was generated for @since 2.6.0
+		) );
+
+		// ID and label are required
+		if ( ! $args['id'] || ! $args['label'] ) {
+			return;
+		}
+
+		// Total up the cost
+		$total_cost = is_array( $args['cost'] ) ? array_sum( $args['cost'] ) : $args['cost'];
+		$taxes      = $args['taxes'];
+
+		// Taxes - if not an array and not set to false, calc tax based on cost and passed calc_tax variable. This saves shipping methods having to do complex tax calculations.
+		if ( ! is_array( $taxes ) && false !== $taxes && $total_cost > 0 && $this->is_taxable() ) {
+			$taxes = 'per_item' === $args['calc_tax'] ? $this->get_taxes_per_item( $args['cost'] ) : WC_Tax::calc_shipping_tax( $total_cost, WC_Tax::get_shipping_tax_rates() );
+		}
+
+		// Round the total cost after taxes have been calculated.
+		$total_cost = wc_format_decimal( $total_cost, wc_get_price_decimals() );
+
+		// Create rate object
+		$rate = new WC_Shipping_Rate( $args['id'], $args['label'], $total_cost, $taxes, $this->id );
+
+		if ( ! empty( $args['meta_data'] ) ) {
+			foreach ( $args['meta_data'] as $key => $value ) {
+				$rate->add_meta_data( $key, $value );
+			}
+		}
+
+		// Store package data
+		if ( $args['package'] ) {
+			$items_in_package = array();
+			foreach ( $args['package']['contents'] as $item ) {
+				$product = $item['data'];
+				$items_in_package[] = $product->get_name() . ' &times; ' . $item['quantity'];
+			}
+			$rate->add_meta_data( __( 'Items', 'woocommerce' ), implode( ', ', $items_in_package ) );
+		}
+
+		$this->rates[ $args['id'] ] = $rate;
+	}
+
+	/**
+	 * Calc taxes per item being shipping in costs array.
+	 * @since 2.6.0
+	 * @access protected
+	 * @param  array $costs
+	 * @return array of taxes
+	 */
+	protected function get_taxes_per_item( $costs ) {
+		$taxes = array();
+
+		// If we have an array of costs we can look up each items tax class and add tax accordingly
+		if ( is_array( $costs ) ) {
+
+			$cart = WC()->cart->get_cart();
+
+			foreach ( $costs as $cost_key => $amount ) {
+				if ( ! isset( $cart[ $cost_key ] ) ) {
+					continue;
+				}
+
+				$item_taxes = WC_Tax::calc_shipping_tax( $amount, WC_Tax::get_shipping_tax_rates( $cart[ $cost_key ]['data']->get_tax_class() ) );
+
+				// Sum the item taxes
+				foreach ( array_keys( $taxes + $item_taxes ) as $key ) {
+					$taxes[ $key ] = ( isset( $item_taxes[ $key ] ) ? $item_taxes[ $key ] : 0 ) + ( isset( $taxes[ $key ] ) ? $taxes[ $key ] : 0 );
+				}
+			}
+
+			// Add any cost for the order - order costs are in the key 'order'
+			if ( isset( $costs['order'] ) ) {
+				$item_taxes = WC_Tax::calc_shipping_tax( $costs['order'], WC_Tax::get_shipping_tax_rates() );
+
+				// Sum the item taxes
+				foreach ( array_keys( $taxes + $item_taxes ) as $key ) {
+					$taxes[ $key ] = ( isset( $item_taxes[ $key ] ) ? $item_taxes[ $key ] : 0 ) + ( isset( $taxes[ $key ] ) ? $taxes[ $key ] : 0 );
+				}
+			}
+		}
+
+		return $taxes;
+	}
+
+	/**
+	 * Is this method available?
+	 * @param array $package
+	 * @return bool
+	 */
+	public function is_available( $package ) {
+		$available = $this->is_enabled();
+
+		// Country availability (legacy, for non-zone based methods)
+		if ( ! $this->instance_id && $available ) {
+			$countries = is_array( $this->countries ) ? $this->countries : array();
+
+			switch ( $this->availability ) {
+				case 'specific' :
+				case 'including' :
+					$available = in_array( $package['destination']['country'], array_intersect( $countries, array_keys( WC()->countries->get_shipping_countries() ) ) );
+				break;
+				case 'excluding' :
+					$available = in_array( $package['destination']['country'], array_diff( array_keys( WC()->countries->get_shipping_countries() ), $countries ) );
+				break;
+				default :
+					$available = in_array( $package['destination']['country'], array_keys( WC()->countries->get_shipping_countries() ) );
+				break;
+			}
+		}
+
+		return apply_filters( 'woocommerce_shipping_' . $this->id . '_is_available', $available, $package );
+	}
+
+	/**
+	 * Get fee to add to shipping cost.
+	 * @param string|float $fee
+	 * @param float $total
 	 * @return float
 	 */
 	public function get_fee( $fee, $total ) {
@@ -207,15 +370,140 @@ abstract class WC_Shipping_Method extends WC_Settings_API {
 	}
 
 	/**
-	 * Check if a shipping method supports a given feature.
-	 *
-	 * Methods should override this to declare support (or lack of support) for a feature.
-	 *
-	 * @param $feature string The name of a feature to test support for.
-	 * @return bool True if the gateway supports the feature, false otherwise.
-	 * @since 1.5.7
+	 * Does this method have a settings page?
+	 * @return bool
 	 */
-	public function supports( $feature ) {
-		return apply_filters( 'woocommerce_shipping_method_supports', in_array( $feature, $this->supports ) ? true : false, $feature, $this );
+	public function has_settings() {
+		return $this->instance_id ? $this->supports( 'instance-settings' ) : $this->supports( 'settings' );
+	}
+
+	/**
+	 * Return admin options as a html string.
+	 * @return string
+	 */
+	public function get_admin_options_html() {
+		if ( $this->instance_id ) {
+			$settings_html = $this->generate_settings_html( $this->get_instance_form_fields(), false );
+		} else {
+			$settings_html = $this->generate_settings_html( $this->get_form_fields(), false );
+		}
+
+		return '<table class="form-table">' . $settings_html . '</table>';
+	}
+
+	/**
+	 * Output the shipping settings screen.
+	 */
+	public function admin_options() {
+		if ( ! $this->instance_id ) {
+			echo '<h2>' . esc_html( $this->get_method_title() ) . '</h2>';
+		}
+		echo wp_kses_post( wpautop( $this->get_method_description() ) );
+		echo $this->get_admin_options_html();
+	}
+
+	/**
+	 * get_option function.
+	 *
+	 * Gets and option from the settings API, using defaults if necessary to prevent undefined notices.
+	 *
+	 * @param  string $key
+	 * @param  mixed  $empty_value
+	 * @return mixed  The value specified for the option or a default value for the option.
+	 */
+	public function get_option( $key, $empty_value = null ) {
+		// Instance options take priority over global options
+		if ( $this->instance_id && array_key_exists( $key, $this->get_instance_form_fields() ) ) {
+			return $this->get_instance_option( $key, $empty_value );
+		}
+
+		// Return global option
+		return parent::get_option( $key, $empty_value );
+	}
+
+	/**
+	 * Gets an option from the settings API, using defaults if necessary to prevent undefined notices.
+	 *
+	 * @param  string $key
+	 * @param  mixed  $empty_value
+	 * @return mixed  The value specified for the option or a default value for the option.
+	 */
+	public function get_instance_option( $key, $empty_value = null ) {
+		if ( empty( $this->instance_settings ) ) {
+			$this->init_instance_settings();
+		}
+
+		// Get option default if unset.
+		if ( ! isset( $this->instance_settings[ $key ] ) ) {
+			$form_fields                     = $this->get_instance_form_fields();
+			$this->instance_settings[ $key ] = $this->get_field_default( $form_fields[ $key ] );
+		}
+
+		if ( ! is_null( $empty_value ) && '' === $this->instance_settings[ $key ] ) {
+			$this->instance_settings[ $key ] = $empty_value;
+		}
+
+		return $this->instance_settings[ $key ];
+	}
+
+	/**
+	 * Get settings fields for instances of this shipping method (within zones).
+	 * Should be overridden by shipping methods to add options.
+	 * @since 2.6.0
+	 * @return array
+	 */
+	public function get_instance_form_fields() {
+		return apply_filters( 'woocommerce_shipping_instance_form_fields_' . $this->id, array_map( array( $this, 'set_defaults' ), $this->instance_form_fields ) );
+	}
+
+	/**
+	 * Return the name of the option in the WP DB.
+	 * @since 2.6.0
+	 * @return string
+	 */
+	public function get_instance_option_key() {
+		return $this->instance_id ? $this->plugin_id . $this->id . '_' . $this->instance_id . '_settings' : '';
+	}
+
+	/**
+	 * Initialise Settings for instances.
+	 * @since 2.6.0
+	 */
+	public function init_instance_settings() {
+		$this->instance_settings = get_option( $this->get_instance_option_key(), null );
+
+		// If there are no settings defined, use defaults.
+		if ( ! is_array( $this->instance_settings ) ) {
+			$form_fields             = $this->get_instance_form_fields();
+			$this->instance_settings = array_merge( array_fill_keys( array_keys( $form_fields ), '' ), wp_list_pluck( $form_fields, 'default' ) );
+		}
+	}
+
+	/**
+	 * Processes and saves options.
+	 * If there is an error thrown, will continue to save and validate fields, but will leave the erroring field out.
+	 * @since 2.6.0
+	 * @return bool was anything saved?
+	 */
+	public function process_admin_options() {
+		if ( $this->instance_id ) {
+			$this->init_instance_settings();
+
+			$post_data = $this->get_post_data();
+
+			foreach ( $this->get_instance_form_fields() as $key => $field ) {
+				if ( 'title' !== $this->get_field_type( $field ) ) {
+					try {
+						$this->instance_settings[ $key ] = $this->get_field_value( $key, $field, $post_data );
+					} catch ( Exception $e ) {
+						$this->add_error( $e->getMessage() );
+					}
+				}
+			}
+
+			return update_option( $this->get_instance_option_key(), apply_filters( 'woocommerce_shipping_' . $this->id . '_instance_settings_values', $this->instance_settings, $this ) );
+		} else {
+			return parent::process_admin_options();
+		}
 	}
 }
diff --git a/includes/abstracts/abstract-wc-widget.php b/includes/abstracts/abstract-wc-widget.php
index 6cad23d0ef6..dc54788689d 100644
--- a/includes/abstracts/abstract-wc-widget.php
+++ b/includes/abstracts/abstract-wc-widget.php
@@ -49,10 +49,10 @@ abstract class WC_Widget extends WP_Widget {
 	 * Constructor.
 	 */
 	public function __construct() {
-
 		$widget_ops = array(
 			'classname'   => $this->widget_cssclass,
-			'description' => $this->widget_description
+			'description' => $this->widget_description,
+			'customize_selective_refresh' => true,
 		);
 
 		parent::__construct( $this->widget_id, $this->widget_name, $widget_ops );
@@ -63,7 +63,10 @@ abstract class WC_Widget extends WP_Widget {
 	}
 
 	/**
-	 * get_cached_widget function.
+	 * Get cached widget.
+	 *
+	 * @param  array $args
+	 * @return bool true if the widget is cached otherwise false
 	 */
 	public function get_cached_widget( $args ) {
 
@@ -126,7 +129,7 @@ abstract class WC_Widget extends WP_Widget {
 	}
 
 	/**
-	 * update function.
+	 * Updates a particular instance of a widget.
 	 *
 	 * @see    WP_Widget->update
 	 * @param  array $new_instance
@@ -164,7 +167,7 @@ abstract class WC_Widget extends WP_Widget {
 					$instance[ $key ] = wp_kses( trim( wp_unslash( $new_instance[ $key ] ) ), wp_kses_allowed_html( 'post' ) );
 				break;
 				case 'checkbox' :
-					$instance[ $key ] = is_null( $new_instance[ $key ] ) ? 0 : 1;
+					$instance[ $key ] = empty( $new_instance[ $key ] ) ? 0 : 1;
 				break;
 				default:
 					$instance[ $key ] = sanitize_text_field( $new_instance[ $key ] );
@@ -183,7 +186,7 @@ abstract class WC_Widget extends WP_Widget {
 	}
 
 	/**
-	 * form function.
+	 * Outputs the settings update form.
 	 *
 	 * @see   WP_Widget->form
 	 * @param array $instance
diff --git a/includes/admin/class-wc-admin-addons.php b/includes/admin/class-wc-admin-addons.php
index e1324f51efc..1be44189245 100644
--- a/includes/admin/class-wc-admin-addons.php
+++ b/includes/admin/class-wc-admin-addons.php
@@ -17,8 +17,31 @@ if ( ! defined( 'ABSPATH' ) ) {
  */
 class WC_Admin_Addons {
 
+	/**
+	 * Get featured for the addons screen
+	 *
+	 * @return array of objects
+	 */
+	public static function get_featured() {
+		if ( false === ( $featured = get_transient( 'wc_addons_featured' ) ) ) {
+			$raw_featured = wp_safe_remote_get( 'https://d3t0oesq8995hv.cloudfront.net/add-ons/featured.json', array( 'user-agent' => 'WooCommerce Addons Page' ) );
+			if ( ! is_wp_error( $raw_featured ) ) {
+				$featured = json_decode( wp_remote_retrieve_body( $raw_featured ) );
+				if ( $featured ) {
+					set_transient( 'wc_addons_featured', $featured, WEEK_IN_SECONDS );
+				}
+			}
+		}
+
+		if ( is_object( $featured ) ) {
+			self::output_featured_sections( $featured->sections );
+			return $featured;
+		}
+	}
+
 	/**
 	 * Get sections for the addons screen
+	 *
 	 * @return array of objects
 	 */
 	public static function get_sections() {
@@ -50,7 +73,10 @@ class WC_Admin_Addons {
 	}
 
 	/**
-	 * Get section for the addons screen
+	 * Get section for the addons screen.
+	 *
+	 * @param  string $section_id
+	 *
 	 * @return object|bool
 	 */
 	public static function get_section( $section_id ) {
@@ -62,7 +88,10 @@ class WC_Admin_Addons {
 	}
 
 	/**
-	 * Get section content for the addons screen
+	 * Get section content for the addons screen.
+	 *
+	 * @param  string $section_id
+	 *
 	 * @return array
 	 */
 	public static function get_section_data( $section_id ) {
@@ -95,30 +124,240 @@ class WC_Admin_Addons {
 
 		if ( 'storefront' === $template ) {
 			if ( 'storefront' === $stylesheet ) {
-				$url         = 'http:///www.woothemes.com/product-category/themes/storefront-child-theme-themes/';
+				$url         = 'https://woocommerce.com/product-category/themes/storefront-child-theme-themes/';
 				$text        = __( 'Need a fresh look? Try Storefront child themes', 'woocommerce' );
 				$utm_content = 'nostorefrontchildtheme';
 			} else {
-				$url         = 'http:///www.woothemes.com/product-category/themes/storefront-child-theme-themes/';
+				$url         = 'https://woocommerce.com/product-category/themes/storefront-child-theme-themes/';
 				$text        = __( 'View more Storefront child themes', 'woocommerce' );
 				$utm_content = 'hasstorefrontchildtheme';
 			}
 		} else {
-			$url         = 'http://www.woothemes.com/storefront/';
+			$url         = 'https://woocommerce.com/storefront/';
 			$text        = __( 'Need a theme? Try Storefront', 'woocommerce' );
 			$utm_content = 'nostorefront';
 		}
 
 		$url = add_query_arg( array(
-			'utm_source'   => 'product',
-			'utm_medium'   => 'upsell',
-			'utm_campaign' => 'wcaddons',
+			'utm_source'   => 'addons',
+			'utm_medium'   => 'product',
+			'utm_campaign' => 'woocommerceplugin',
 			'utm_content'  => $utm_content,
 		), $url );
 
 		echo '<a href="' . esc_url( $url ) . '" class="add-new-h2">' . esc_html( $text ) . '</a>' . "\n";
 	}
 
+	/**
+	 * Handles the outputting of a banner block.
+	 *
+	 * @param object $block
+	 */
+	public static function output_banner_block( $block ) {
+		?>
+		<div class="addons-banner-block">
+			<h1><?php echo esc_html( $block->title ); ?></h1>
+			<p><?php echo esc_html( $block->description ); ?></p>
+			<div class="addons-banner-block-items">
+				<?php foreach ( $block->items as $item ) : ?>
+					<div class="addons-banner-block-item">
+						<div class="addons-banner-block-item-icon">
+							<img class="addons-img" src="<?php echo esc_url( $item->image ); ?>" />
+						</div>
+						<div class="addons-banner-block-item-content">
+							<h3><?php echo esc_html( $item->title ); ?></h3>
+							<p><?php echo esc_html( $item->description ); ?></p>
+							<?php
+								self::output_button(
+									$item->href,
+									$item->button,
+									'addons-button-solid',
+									$item->plugin
+								);
+							?>
+						</div>
+					</div>
+				<?php endforeach; ?>
+			</div>
+		</div>
+		<?php
+	}
+
+	/**
+	 * Handles the outputting of a column.
+	 *
+	 * @param object $block
+	 */
+	public static function output_column( $block ) {
+		if ( isset( $block->container ) && 'column_container_start' === $block->container ) {
+			?>
+			<div class="addons-column-section">
+			<?php
+		}
+		if ( 'column_start' === $block->module ) {
+			?>
+			<div class="addons-column">
+			<?php
+		} else {
+			?>
+			</div>
+			<?php
+		}
+		if ( isset( $block->container ) && 'column_container_end' === $block->container ) {
+			?>
+			</div>
+			<?php
+		}
+	}
+
+	/**
+	 * Handles the outputting of a column block.
+	 *
+	 * @param object $block
+	 */
+	public static function output_column_block( $block ) {
+		?>
+		<div class="addons-column-block">
+			<h1><?php echo esc_html( $block->title ); ?></h1>
+			<p><?php echo esc_html( $block->description ); ?></p>
+			<?php foreach ( $block->items as $item ) : ?>
+				<div class="addons-column-block-item">
+					<div class="addons-column-block-item-icon">
+						<img class="addons-img" src="<?php echo esc_url( $item->image ); ?>" />
+					</div>
+
+					<div class="addons-column-block-item-content">
+						<h2><?php echo esc_html( $item->title ); ?></h2>
+						<?php
+							self::output_button(
+								$item->href,
+								$item->button,
+								'addons-button-solid',
+								$item->plugin
+							);
+						?>
+						<p><?php echo esc_html( $item->description ); ?></p>
+
+					</div>
+				</div>
+			<?php endforeach; ?>
+		</div>
+
+		<?php
+	}
+
+	/**
+	 * Handles the outputting of a small light block.
+	 *
+	 * @param object $block
+	 */
+	public static function output_small_light_block( $block ) {
+		?>
+		<div class="addons-small-light-block">
+			<img class="addons-img" src="<?php echo esc_url( $block->image ) ?>" />
+			<div class="addons-small-light-block-content">
+				<h1><?php echo esc_html( $block->title ); ?></h1>
+				<p><?php echo esc_html( $block->description ); ?></p>
+				<div class="addons-small-light-block-buttons">
+					<?php foreach ( $block->buttons as $button ) : ?>
+						<?php
+							self::output_button(
+								$button->href,
+								$button->text,
+								'addons-button-solid'
+							);
+						?>
+					<?php endforeach; ?>
+				</div>
+			</div>
+		</div>
+		<?php
+	}
+
+	/**
+	 * Handles the outputting of a small dark block.
+	 *
+	 * @param object $block
+	 */
+	public static function output_small_dark_block( $block ) {
+		?>
+		<div class="addons-small-dark-block">
+			<h1><?php echo esc_html( $block->title ); ?></h1>
+			<p><?php echo esc_html( $block->description ); ?></p>
+			<div class="addons-small-dark-items">
+				<?php foreach ( $block->items as $item ) : ?>
+					<div class="addons-small-dark-item">
+						<?php if ( ! empty( $item->image ) ) : ?>
+							<div class="addons-small-dark-item-icon">
+								<img class="addons-img" src="<?php echo esc_url( $item->image ); ?>" />
+							</div>
+						<?php endif; ?>
+						<?php
+							self::output_button(
+								$item->href,
+								$item->button,
+								'addons-button-outline-white'
+							);
+						?>
+					</div>
+				<?php endforeach; ?>
+			</div>
+		</div>
+		<?php
+	}
+
+	/**
+	 * Handles the outputting of featured sections
+	 *
+	 * @param array $sections
+	 */
+	public static function output_featured_sections( $sections ) {
+		foreach ( $sections as $section ) {
+			switch ( $section->module ) {
+				case 'banner_block':
+					self::output_banner_block( $section );
+					break;
+				case 'column_start':
+					self::output_column( $section );
+					break;
+				case 'column_end':
+					self::output_column( $section );
+					break;
+				case 'column_block':
+					self::output_column_block( $section );
+					break;
+				case 'small_light_block':
+					self::output_small_light_block( $section );
+					break;
+				case 'small_dark_block':
+					self::output_small_dark_block( $section );
+					break;
+			}
+		}
+	}
+
+	/**
+	 * Outputs a button.
+	 *
+	 * @param string $url
+	 * @param string $text
+	 * @param string $theme
+	 * @param string $plugin
+	 */
+	public static function output_button( $url, $text, $theme, $plugin = '' ) {
+		$theme = __( 'Free', 'woocommerce' ) === $text ? 'addons-button-outline-green' : $theme;
+		$theme = is_plugin_active( $plugin ) ? 'addons-button-installed' : $theme;
+		$text = is_plugin_active( $plugin ) ? __( 'Installed', 'woocommerce' ) : $text;
+		?>
+		<a
+			class="addons-button <?php echo esc_attr( $theme ); ?>"
+			href="<?php echo esc_url( $url ); ?>">
+			<?php echo esc_html( $text ); ?>
+		</a>
+		<?php
+	}
+
+
 	/**
 	 * Handles output of the addons page in admin.
 	 */
@@ -127,6 +366,6 @@ class WC_Admin_Addons {
 		$theme           = wp_get_theme();
 		$section_keys    = array_keys( $sections );
 		$current_section = isset( $_GET['section'] ) ? sanitize_text_field( $_GET['section'] ) : current( $section_keys );
-		include_once( 'views/html-admin-page-addons.php' );
+		include_once( dirname( __FILE__ ) . '/views/html-admin-page-addons.php' );
 	}
 }
diff --git a/includes/admin/class-wc-admin-api-keys-table-list.php b/includes/admin/class-wc-admin-api-keys-table-list.php
index 7d229e9e3aa..b4df72c7fa4 100644
--- a/includes/admin/class-wc-admin-api-keys-table-list.php
+++ b/includes/admin/class-wc-admin-api-keys-table-list.php
@@ -23,9 +23,9 @@ class WC_Admin_API_Keys_Table_List extends WP_List_Table {
 	 */
 	public function __construct() {
 		parent::__construct( array(
-			'singular' => __( 'key', 'woocommerce' ),
-			'plural'   => __( 'keys', 'woocommerce' ),
-			'ajax'     => false
+			'singular' => 'key',
+			'plural'   => 'keys',
+			'ajax'     => false,
 		) );
 	}
 
@@ -38,10 +38,10 @@ class WC_Admin_API_Keys_Table_List extends WP_List_Table {
 		return array(
 			'cb'            => '<input type="checkbox" />',
 			'description'   => __( 'Description', 'woocommerce' ),
-			'truncated_key' => __( 'Consumer Key Ending In', 'woocommerce' ),
+			'truncated_key' => __( 'Consumer key ending in', 'woocommerce' ),
 			'user'          => __( 'User', 'woocommerce' ),
 			'permissions'   => __( 'Permissions', 'woocommerce' ),
-			'last_access'   => __( 'Last Access', 'woocommerce' )
+			'last_access'   => __( 'Last access', 'woocommerce' ),
 		);
 	}
 
@@ -67,7 +67,7 @@ class WC_Admin_API_Keys_Table_List extends WP_List_Table {
 		$output = '<strong>';
 		$output .= '<a href="' . esc_url( $url ) . '" class="row-title">';
 		if ( empty( $key['description'] ) ) {
-			$output .= esc_html__( 'API Key', 'woocommerce' );
+			$output .= esc_html__( 'API key', 'woocommerce' );
 		} else {
 			$output .= esc_html( $key['description'] );
 		}
@@ -78,7 +78,7 @@ class WC_Admin_API_Keys_Table_List extends WP_List_Table {
 		$actions = array(
 			'id'    => sprintf( __( 'ID: %d', 'woocommerce' ), $key['key_id'] ),
 			'edit'  => '<a href="' . esc_url( $url ) . '">' . __( 'View/Edit', 'woocommerce' ) . '</a>',
-			'trash' => '<a class="submitdelete" title="' . esc_attr__( 'Revoke API Key', 'woocommerce' ) . '" href="' . esc_url( wp_nonce_url( add_query_arg( array( 'revoke-key' => $key['key_id'] ), admin_url( 'admin.php?page=wc-settings&tab=api&section=keys' ) ), 'revoke' ) ) . '">' . __( 'Revoke', 'woocommerce' ) . '</a>'
+			'trash' => '<a class="submitdelete" aria-label="' . esc_attr__( 'Revoke API key', 'woocommerce' ) . '" href="' . esc_url( wp_nonce_url( add_query_arg( array( 'revoke-key' => $key['key_id'] ), admin_url( 'admin.php?page=wc-settings&tab=api&section=keys' ) ), 'revoke' ) ) . '">' . __( 'Revoke', 'woocommerce' ) . '</a>',
 		);
 
 		$row_actions = array();
@@ -87,7 +87,7 @@ class WC_Admin_API_Keys_Table_List extends WP_List_Table {
 			$row_actions[] = '<span class="' . esc_attr( $action ) . '">' . $link . '</span>';
 		}
 
-		$output .= '<div class="row-actions">' . implode(  ' | ', $row_actions ) . '</div>';
+		$output .= '<div class="row-actions">' . implode( ' | ', $row_actions ) . '</div>';
 
 		return $output;
 	}
@@ -115,13 +115,11 @@ class WC_Admin_API_Keys_Table_List extends WP_List_Table {
 			return '';
 		}
 
-		$user_name = ! empty( $user->data->display_name ) ? $user->data->display_name : $user->data->user_login;
-
-		if ( current_user_can( 'edit_user' ) ) {
-			return '<a href="' . esc_url( add_query_arg( array( 'user_id' => $user->ID ), admin_url( 'user-edit.php' ) ) ) . '">' . esc_html( $user_name ) . '</a>';
+		if ( current_user_can( 'edit_user', $user->ID ) ) {
+			return '<a href="' . esc_url( add_query_arg( array( 'user_id' => $user->ID ), admin_url( 'user-edit.php' ) ) ) . '">' . esc_html( $user->display_name ) . '</a>';
 		}
 
-		return esc_html( $user_name );
+		return esc_html( $user->display_name );
 	}
 
 	/**
@@ -135,7 +133,7 @@ class WC_Admin_API_Keys_Table_List extends WP_List_Table {
 		$permissions    = array(
 			'read'       => __( 'Read', 'woocommerce' ),
 			'write'      => __( 'Write', 'woocommerce' ),
-			'read_write' => __( 'Read/Write', 'woocommerce' )
+			'read_write' => __( 'Read/Write', 'woocommerce' ),
 		);
 
 		if ( isset( $permissions[ $permission_key ] ) ) {
@@ -153,7 +151,8 @@ class WC_Admin_API_Keys_Table_List extends WP_List_Table {
 	 */
 	public function column_last_access( $key ) {
 		if ( ! empty( $key['last_access'] ) ) {
-			$date = sprintf( _x( '%1$s at %2$s', 'date and time', 'woocommerce' ), date_i18n( wc_date_format(), strtotime( $key['last_access'] ) ), date_i18n( wc_time_format(), strtotime( $key['last_access'] ) ) );
+			/* translators: 1: last access date 2: last access time */
+			$date = sprintf( __( '%1$s at %2$s', 'woocommerce' ), date_i18n( wc_date_format(), strtotime( $key['last_access'] ) ), date_i18n( wc_time_format(), strtotime( $key['last_access'] ) ) );
 
 			return apply_filters( 'woocommerce_api_key_last_access_datetime', $date, $key['last_access'] );
 		}
@@ -168,7 +167,7 @@ class WC_Admin_API_Keys_Table_List extends WP_List_Table {
 	 */
 	protected function get_bulk_actions() {
 		return array(
-			'revoke' => __( 'Revoke', 'woocommerce' )
+			'revoke' => __( 'Revoke', 'woocommerce' ),
 		);
 	}
 
@@ -213,7 +212,7 @@ class WC_Admin_API_Keys_Table_List extends WP_List_Table {
 		$this->set_pagination_args( array(
 			'total_items' => $count,
 			'per_page'    => $per_page,
-			'total_pages' => ceil( $count / $per_page )
+			'total_pages' => ceil( $count / $per_page ),
 		) );
 	}
 }
diff --git a/includes/admin/class-wc-admin-api-keys.php b/includes/admin/class-wc-admin-api-keys.php
index 04f3ec2d58e..6df9aa252ea 100644
--- a/includes/admin/class-wc-admin-api-keys.php
+++ b/includes/admin/class-wc-admin-api-keys.php
@@ -26,16 +26,15 @@ class WC_Admin_API_Keys {
 
 	/**
 	 * Check if is API Keys settings page.
-	 *
 	 * @return bool
 	 */
 	private function is_api_keys_settings_page() {
 		return isset( $_GET['page'] )
-			&& 'wc-settings' == $_GET['page']
+			&& 'wc-settings' === $_GET['page']
 			&& isset( $_GET['tab'] )
-			&& 'api' == $_GET['tab']
+			&& 'api' === $_GET['tab']
 			&& isset( $_GET['section'] )
-			&& 'keys' == isset( $_GET['section'] );
+			&& 'keys' === $_GET['section'];
 	}
 
 	/**
@@ -59,18 +58,33 @@ class WC_Admin_API_Keys {
 	 * Table list output.
 	 */
 	private static function table_list_output() {
-		echo '<h3>' . __( 'Keys/Apps', 'woocommerce' ) . ' <a href="' . esc_url( admin_url( 'admin.php?page=wc-settings&tab=api&section=keys&create-key=1' ) ) . '" class="add-new-h2">' . __( 'Add Key', 'woocommerce' ) . '</a></h3>';
 
-		$keys_table_list = new WC_Admin_API_Keys_Table_List();
-		$keys_table_list->prepare_items();
+		global $wpdb;
 
-		echo '<input type="hidden" name="page" value="wc-settings" />';
-		echo '<input type="hidden" name="tab" value="api" />';
-		echo '<input type="hidden" name="section" value="keys" />';
+		echo '<h2>' . __( 'Keys/Apps', 'woocommerce' ) . ' <a href="' . esc_url( admin_url( 'admin.php?page=wc-settings&tab=api&section=keys&create-key=1' ) ) . '" class="add-new-h2">' . __( 'Add key', 'woocommerce' ) . '</a></h2>';
 
-		$keys_table_list->views();
-		$keys_table_list->search_box( __( 'Search Key', 'woocommerce' ), 'key' );
-		$keys_table_list->display();
+		// Get the API keys count
+		$count = $wpdb->get_var( "SELECT COUNT(key_id) FROM {$wpdb->prefix}woocommerce_api_keys WHERE 1 = 1;" );
+
+		if ( absint( $count ) && $count > 0 ) {
+			$keys_table_list = new WC_Admin_API_Keys_Table_List();
+			$keys_table_list->prepare_items();
+
+			echo '<input type="hidden" name="page" value="wc-settings" />';
+			echo '<input type="hidden" name="tab" value="api" />';
+			echo '<input type="hidden" name="section" value="keys" />';
+
+			$keys_table_list->views();
+			$keys_table_list->search_box( __( 'Search key', 'woocommerce' ), 'key' );
+			$keys_table_list->display();
+		} else {
+			echo '<div class="woocommerce-BlankState woocommerce-BlankState--api">';
+			?>
+			<h2 class="woocommerce-BlankState-message"><?php _e( 'The WooCommerce REST API allows external apps to view and manage store data. Access is granted only to those with valid API keys.', 'woocommerce' ); ?></h2>
+			<a class="woocommerce-BlankState-cta button-primary button" href="<?php echo esc_url( admin_url( 'admin.php?page=wc-settings&tab=api&section=keys&create-key=1' ) ); ?>"><?php _e( 'Create an API key', 'woocommerce' ); ?></a>
+
+			<?php echo '<style type="text/css">#posts-filter .wp-list-table, #posts-filter .tablenav.top, .tablenav.bottom .actions  { display: none; } </style></div>';
+		}
 	}
 
 	/**
@@ -88,7 +102,7 @@ class WC_Admin_API_Keys {
 			'description'   => '',
 			'permissions'   => '',
 			'truncated_key' => '',
-			'last_access'   => ''
+			'last_access'   => '',
 		);
 
 		if ( 0 == $key_id ) {
@@ -130,7 +144,7 @@ class WC_Admin_API_Keys {
 	 */
 	public static function notices() {
 		if ( isset( $_GET['revoked'] ) && 1 == $_GET['revoked'] ) {
-			WC_Admin_Settings::add_message( __( 'API Key revoked successfully.', 'woocommerce' ) );
+			WC_Admin_Settings::add_message( __( 'API key revoked successfully.', 'woocommerce' ) );
 		}
 	}
 
diff --git a/includes/admin/class-wc-admin-assets.php b/includes/admin/class-wc-admin-assets.php
index 6c20089c771..95294b0ee9a 100644
--- a/includes/admin/class-wc-admin-assets.php
+++ b/includes/admin/class-wc-admin-assets.php
@@ -12,7 +12,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
-if ( ! class_exists( 'WC_Admin_Assets' ) ) :
+if ( ! class_exists( 'WC_Admin_Assets', false ) ) :
 
 /**
  * WC_Admin_Assets Class.
@@ -35,30 +35,37 @@ class WC_Admin_Assets {
 		global $wp_scripts;
 
 		$screen         = get_current_screen();
-		$jquery_version = isset( $wp_scripts->registered['jquery-ui-core']->ver ) ? $wp_scripts->registered['jquery-ui-core']->ver : '1.9.2';
+		$screen_id      = $screen ? $screen->id : '';
+		$jquery_version = isset( $wp_scripts->registered['jquery-ui-core']->ver ) ? $wp_scripts->registered['jquery-ui-core']->ver : '1.11.4';
 
 		// Register admin styles
 		wp_register_style( 'woocommerce_admin_menu_styles', WC()->plugin_url() . '/assets/css/menu.css', array(), WC_VERSION );
 		wp_register_style( 'woocommerce_admin_styles', WC()->plugin_url() . '/assets/css/admin.css', array(), WC_VERSION );
-		wp_register_style( 'jquery-ui-style', '//code.jquery.com/ui/' . $jquery_version . '/themes/smoothness/jquery-ui.css', array(), $jquery_version );
+		wp_register_style( 'jquery-ui-style', '//code.jquery.com/ui/' . $jquery_version . '/themes/smoothness/jquery-ui.min.css', array(), $jquery_version );
 		wp_register_style( 'woocommerce_admin_dashboard_styles', WC()->plugin_url() . '/assets/css/dashboard.css', array(), WC_VERSION );
 		wp_register_style( 'woocommerce_admin_print_reports_styles', WC()->plugin_url() . '/assets/css/reports-print.css', array(), WC_VERSION, 'print' );
 
+		// Add RTL support for admin styles
+		wp_style_add_data( 'woocommerce_admin_menu_styles', 'rtl', 'replace' );
+		wp_style_add_data( 'woocommerce_admin_styles', 'rtl', 'replace' );
+		wp_style_add_data( 'woocommerce_admin_dashboard_styles', 'rtl', 'replace' );
+		wp_style_add_data( 'woocommerce_admin_print_reports_styles', 'rtl', 'replace' );
+
 		// Sitewide menu CSS
 		wp_enqueue_style( 'woocommerce_admin_menu_styles' );
 
 		// Admin styles for WC pages only
-		if ( in_array( $screen->id, wc_get_screen_ids() ) ) {
+		if ( in_array( $screen_id, wc_get_screen_ids() ) ) {
 			wp_enqueue_style( 'woocommerce_admin_styles' );
 			wp_enqueue_style( 'jquery-ui-style' );
 			wp_enqueue_style( 'wp-color-picker' );
 		}
 
-		if ( in_array( $screen->id, array( 'dashboard' ) ) ) {
+		if ( in_array( $screen_id, array( 'dashboard' ) ) ) {
 			wp_enqueue_style( 'woocommerce_admin_dashboard_styles' );
 		}
 
-		if ( in_array( $screen->id, array( 'woocommerce_page_wc-reports', 'toplevel_page_wc-reports' ) ) ) {
+		if ( in_array( $screen_id, array( 'woocommerce_page_wc-reports', 'toplevel_page_wc-reports' ) ) ) {
 			wp_enqueue_style( 'woocommerce_admin_print_reports_styles' );
 		}
 
@@ -68,7 +75,7 @@ class WC_Admin_Assets {
 
 		if ( has_action( 'woocommerce_admin_css' ) ) {
 			do_action( 'woocommerce_admin_css' );
-			_deprecated_function( 'The woocommerce_admin_css action', '2.3', 'admin_enqueue_scripts' );
+			wc_deprecated_function( 'The woocommerce_admin_css action', '2.3', 'admin_enqueue_scripts' );
 		}
 	}
 
@@ -77,11 +84,10 @@ class WC_Admin_Assets {
 	 * Enqueue scripts.
 	 */
 	public function admin_scripts() {
-		global $wp_query, $post, $current_user;
-
-		get_currentuserinfo();
+		global $wp_query, $post;
 
 		$screen       = get_current_screen();
+		$screen_id    = $screen ? $screen->id : '';
 		$wc_screen_id = sanitize_title( __( 'WooCommerce', 'woocommerce' ) );
 		$suffix       = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
 
@@ -102,17 +108,13 @@ class WC_Admin_Assets {
 		wp_register_script( 'flot-pie', WC()->plugin_url() . '/assets/js/jquery-flot/jquery.flot.pie' . $suffix . '.js', array( 'jquery', 'flot' ), WC_VERSION );
 		wp_register_script( 'flot-stack', WC()->plugin_url() . '/assets/js/jquery-flot/jquery.flot.stack' . $suffix . '.js', array( 'jquery', 'flot' ), WC_VERSION );
 		wp_register_script( 'wc-settings-tax', WC()->plugin_url() . '/assets/js/admin/settings-views-html-settings-tax' . $suffix . '.js', array( 'jquery', 'wp-util', 'underscore', 'backbone', 'jquery-blockui' ), WC_VERSION );
-
-		// Chosen is @deprecated (2.3) in favour of select2, but is registered for backwards compat
-		wp_register_script( 'ajax-chosen', WC()->plugin_url() . '/assets/js/chosen/ajax-chosen.jquery' . $suffix . '.js', array( 'jquery', 'chosen' ), WC_VERSION );
-		wp_register_script( 'chosen', WC()->plugin_url() . '/assets/js/chosen/chosen.jquery' . $suffix . '.js', array( 'jquery' ), WC_VERSION );
-
-		// Select2 is the replacement for chosen
-		wp_register_script( 'select2', WC()->plugin_url() . '/assets/js/select2/select2' . $suffix . '.js', array( 'jquery' ), '3.5.4' );
+		wp_register_script( 'wc-backbone-modal', WC()->plugin_url() . '/assets/js/admin/backbone-modal' . $suffix . '.js', array( 'underscore', 'backbone', 'wp-util' ), WC_VERSION );
+		wp_register_script( 'wc-shipping-zones', WC()->plugin_url() . '/assets/js/admin/wc-shipping-zones' . $suffix . '.js', array( 'jquery', 'wp-util', 'underscore', 'backbone', 'jquery-ui-sortable', 'wc-enhanced-select', 'wc-backbone-modal' ), WC_VERSION );
+		wp_register_script( 'wc-shipping-zone-methods', WC()->plugin_url() . '/assets/js/admin/wc-shipping-zone-methods' . $suffix . '.js', array( 'jquery', 'wp-util', 'underscore', 'backbone', 'jquery-ui-sortable', 'wc-backbone-modal' ), WC_VERSION );
+		wp_register_script( 'wc-shipping-classes', WC()->plugin_url() . '/assets/js/admin/wc-shipping-classes' . $suffix . '.js', array( 'jquery', 'wp-util', 'underscore', 'backbone' ), WC_VERSION );
+		wp_register_script( 'select2', WC()->plugin_url() . '/assets/js/select2/select2.full' . $suffix . '.js', array( 'jquery' ), '4.0.3' );
 		wp_register_script( 'wc-enhanced-select', WC()->plugin_url() . '/assets/js/admin/wc-enhanced-select' . $suffix . '.js', array( 'jquery', 'select2' ), WC_VERSION );
 		wp_localize_script( 'wc-enhanced-select', 'wc_enhanced_select_params', array(
-			'i18n_matches_1'            => _x( 'One result is available, press enter to select it.', 'enhanced select', 'woocommerce' ),
-			'i18n_matches_n'            => _x( '%qty% results are available, use up and down arrow keys to navigate.', 'enhanced select', 'woocommerce' ),
 			'i18n_no_matches'           => _x( 'No matches found', 'enhanced select', 'woocommerce' ),
 			'i18n_ajax_error'           => _x( 'Loading failed', 'enhanced select', 'woocommerce' ),
 			'i18n_input_too_short_1'    => _x( 'Please enter 1 or more characters', 'enhanced select', 'woocommerce' ),
@@ -125,16 +127,16 @@ class WC_Admin_Assets {
 			'i18n_searching'            => _x( 'Searching&hellip;', 'enhanced select', 'woocommerce' ),
 			'ajax_url'                  => admin_url( 'admin-ajax.php' ),
 			'search_products_nonce'     => wp_create_nonce( 'search-products' ),
-			'search_customers_nonce'    => wp_create_nonce( 'search-customers' )
+			'search_customers_nonce'    => wp_create_nonce( 'search-customers' ),
 		) );
 
 		// Accounting
 		wp_localize_script( 'accounting', 'accounting_params', array(
-			'mon_decimal_point' => wc_get_price_decimal_separator()
+			'mon_decimal_point' => wc_get_price_decimal_separator(),
 		) );
 
 		// WooCommerce admin pages
-		if ( in_array( $screen->id, wc_get_screen_ids() ) ) {
+		if ( in_array( $screen_id, wc_get_screen_ids() ) ) {
 			wp_enqueue_script( 'iris' );
 			wp_enqueue_script( 'woocommerce_admin' );
 			wp_enqueue_script( 'wc-enhanced-select' );
@@ -145,33 +147,35 @@ class WC_Admin_Assets {
 			$decimal = isset( $locale['decimal_point'] ) ? $locale['decimal_point'] : '.';
 
 			$params = array(
+				/* translators: %s: decimal */
 				'i18n_decimal_error'                => sprintf( __( 'Please enter in decimal (%s) format without thousand separators.', 'woocommerce' ), $decimal ),
+				/* translators: %s: price decimal separator */
 				'i18n_mon_decimal_error'            => sprintf( __( 'Please enter in monetary decimal (%s) format without thousand separators and currency symbols.', 'woocommerce' ), wc_get_price_decimal_separator() ),
 				'i18n_country_iso_error'            => __( 'Please enter in country code with two capital letters.', 'woocommerce' ),
 				'i18_sale_less_than_regular_error'  => __( 'Please enter in a value less than the regular price.', 'woocommerce' ),
 				'decimal_point'                     => $decimal,
-				'mon_decimal_point'                 => wc_get_price_decimal_separator()
+				'mon_decimal_point'                 => wc_get_price_decimal_separator(),
 			);
 
 			wp_localize_script( 'woocommerce_admin', 'woocommerce_admin', $params );
 		}
 
 		// Edit product category pages
-		if ( in_array( $screen->id, array( 'edit-product_cat' ) ) ) {
+		if ( in_array( $screen_id, array( 'edit-product_cat' ) ) ) {
 			wp_enqueue_media();
 		}
 
 		// Products
-		if ( in_array( $screen->id, array( 'edit-product' ) ) ) {
-			wp_register_script( 'woocommerce_quick-edit', WC()->plugin_url() . '/assets/js/admin/quick-edit' . $suffix . '.js', array( 'jquery' ), WC_VERSION );
+		if ( in_array( $screen_id, array( 'edit-product' ) ) ) {
+			wp_register_script( 'woocommerce_quick-edit', WC()->plugin_url() . '/assets/js/admin/quick-edit' . $suffix . '.js', array( 'jquery', 'woocommerce_admin' ), WC_VERSION );
 			wp_enqueue_script( 'woocommerce_quick-edit' );
 		}
 
 		// Meta boxes
-		if ( in_array( $screen->id, array( 'product', 'edit-product' ) ) ) {
+		if ( in_array( $screen_id, array( 'product', 'edit-product' ) ) ) {
 			wp_enqueue_media();
-			wp_register_script( 'wc-admin-product-meta-boxes', WC()->plugin_url() . '/assets/js/admin/meta-boxes-product' . $suffix . '.js', array( 'wc-admin-meta-boxes' ), WC_VERSION );
-			wp_register_script( 'wc-admin-variation-meta-boxes', WC()->plugin_url() . '/assets/js/admin/meta-boxes-product-variation' . $suffix . '.js', array( 'wc-admin-meta-boxes', 'serializejson' ), WC_VERSION );
+			wp_register_script( 'wc-admin-product-meta-boxes', WC()->plugin_url() . '/assets/js/admin/meta-boxes-product' . $suffix . '.js', array( 'wc-admin-meta-boxes', 'media-models' ), WC_VERSION );
+			wp_register_script( 'wc-admin-variation-meta-boxes', WC()->plugin_url() . '/assets/js/admin/meta-boxes-product-variation' . $suffix . '.js', array( 'wc-admin-meta-boxes', 'serializejson', 'media-models' ), WC_VERSION );
 
 			wp_enqueue_script( 'wc-admin-product-meta-boxes' );
 			wp_enqueue_script( 'wc-admin-variation-meta-boxes' );
@@ -187,7 +191,7 @@ class WC_Admin_Assets {
 				'load_variations_nonce'               => wp_create_nonce( 'load-variations' ),
 				'save_variations_nonce'               => wp_create_nonce( 'save-variations' ),
 				'bulk_edit_variations_nonce'          => wp_create_nonce( 'bulk-edit-variations' ),
-				'i18n_link_all_variations'            => esc_js( __( 'Are you sure you want to link all variations? This will create a new variation for each and every possible combination of variation attributes (max 50 per run).', 'woocommerce' ) ),
+				'i18n_link_all_variations'            => esc_js( sprintf( __( 'Are you sure you want to link all variations? This will create a new variation for each and every possible combination of variation attributes (max %d per run).', 'woocommerce' ), defined( 'WC_MAX_LINKED_VARIATIONS' ) ? WC_MAX_LINKED_VARIATIONS : 50 ) ),
 				'i18n_enter_a_value'                  => esc_js( __( 'Enter a value', 'woocommerce' ) ),
 				'i18n_enter_menu_order'               => esc_js( __( 'Variation menu order (determines position in the list of variations)', 'woocommerce' ) ),
 				'i18n_enter_a_value_fixed_or_percent' => esc_js( __( 'Enter a value (fixed or %)', 'woocommerce' ) ),
@@ -204,32 +208,38 @@ class WC_Admin_Assets {
 				'i18n_edited_variations'              => esc_js( __( 'Save changes before changing page?', 'woocommerce' ) ),
 				'i18n_variation_count_single'         => esc_js( __( '%qty% variation', 'woocommerce' ) ),
 				'i18n_variation_count_plural'         => esc_js( __( '%qty% variations', 'woocommerce' ) ),
-				'variations_per_page'                 => absint( apply_filters( 'woocommerce_admin_meta_boxes_variations_per_page', 15 ) )
+				'variations_per_page'                 => absint( apply_filters( 'woocommerce_admin_meta_boxes_variations_per_page', 15 ) ),
 			);
 
 			wp_localize_script( 'wc-admin-variation-meta-boxes', 'woocommerce_admin_meta_boxes_variations', $params );
 		}
-		if ( in_array( str_replace( 'edit-', '', $screen->id ), wc_get_order_types( 'order-meta-boxes' ) ) ) {
-			wp_register_script( 'wc-admin-order-meta-boxes', WC()->plugin_url() . '/assets/js/admin/meta-boxes-order' . $suffix . '.js', array( 'wc-admin-meta-boxes' ), WC_VERSION );
-			wp_register_script( 'wc-admin-order-meta-boxes-modal', WC()->plugin_url() . '/assets/js/admin/order-backbone-modal' . $suffix . '.js', array( 'underscore', 'backbone', 'wp-util', 'wc-admin-order-meta-boxes' ), WC_VERSION );
+		if ( in_array( str_replace( 'edit-', '', $screen_id ), wc_get_order_types( 'order-meta-boxes' ) ) ) {
+			$default_location = wc_get_customer_default_location();
 
-			wp_enqueue_script( 'wc-admin-order-meta-boxes' );
-			wp_enqueue_script( 'wc-admin-order-meta-boxes-modal' );
-
-			$params = array(
+			wp_enqueue_script( 'wc-admin-order-meta-boxes', WC()->plugin_url() . '/assets/js/admin/meta-boxes-order' . $suffix . '.js', array( 'wc-admin-meta-boxes', 'wc-backbone-modal' ), WC_VERSION );
+			wp_localize_script( 'wc-admin-order-meta-boxes', 'woocommerce_admin_meta_boxes_order', array(
 				'countries'              => json_encode( array_merge( WC()->countries->get_allowed_country_states(), WC()->countries->get_shipping_country_states() ) ),
-				'i18n_select_state_text' => esc_attr__( 'Select an option&hellip;', 'woocommerce' )
-			);
+				'i18n_select_state_text' => esc_attr__( 'Select an option&hellip;', 'woocommerce' ),
+				'default_country'        => isset( $default_location['country'] ) ? $default_location['country'] : '',
+				'default_state'          => isset( $default_location['state'] ) ? $default_location['state'] : '',
+				'placeholder_name'       => esc_attr__( 'Name (required)', 'woocommerce' ),
+				'placeholder_value'      => esc_attr__( 'Value (required)', 'woocommerce' ),
+			) );
+		}
+		if ( in_array( $screen_id, array( 'shop_coupon', 'edit-shop_coupon' ) ) ) {
+			wp_enqueue_script( 'wc-admin-coupon-meta-boxes', WC()->plugin_url() . '/assets/js/admin/meta-boxes-coupon' . $suffix . '.js', array( 'wc-admin-meta-boxes' ), WC_VERSION );
+		}
+		if ( in_array( str_replace( 'edit-', '', $screen_id ), array_merge( array( 'shop_coupon', 'product' ), wc_get_order_types( 'order-meta-boxes' ) ) ) ) {
+			$post_id  = isset( $post->ID ) ? $post->ID : '';
+			$currency = '';
+
+			if ( $post_id && in_array( get_post_type( $post_id ), wc_get_order_types( 'order-meta-boxes' ) ) ) {
+				$order    = wc_get_order( $post_id );
+				$currency = $order->get_currency();
+			}
 
-			wp_localize_script( 'wc-admin-order-meta-boxes', 'woocommerce_admin_meta_boxes_order', $params );
-		}
-		if ( in_array( $screen->id, array( 'shop_coupon', 'edit-shop_coupon' ) ) ) {
-			wp_register_script( 'wc-admin-coupon-meta-boxes', WC()->plugin_url() . '/assets/js/admin/meta-boxes-coupon' . $suffix . '.js', array( 'wc-admin-meta-boxes' ), WC_VERSION );
-			wp_enqueue_script( 'wc-admin-coupon-meta-boxes' );
-		}
-		if ( in_array( str_replace( 'edit-', '', $screen->id ), array_merge( array( 'shop_coupon', 'product' ), wc_get_order_types( 'order-meta-boxes' ) ) ) ) {
 			$params = array(
-				'remove_item_notice'            => __( 'Are you sure you want to remove the selected items? If you have previously reduced this item\'s stock, or this order was submitted by a customer, you will need to manually restore the item\'s stock.', 'woocommerce' ),
+				'remove_item_notice'            => __( "Are you sure you want to remove the selected items? If you have previously reduced this item's stock, or this order was submitted by a customer, you will need to manually restore the item's stock.", 'woocommerce' ),
 				'i18n_select_items'             => __( 'Please select some items.', 'woocommerce' ),
 				'i18n_do_refund'                => __( 'Are you sure you wish to process this refund? This action cannot be undone.', 'woocommerce' ),
 				'i18n_delete_refund'            => __( 'Are you sure you wish to delete this refund? This action cannot be undone.', 'woocommerce' ),
@@ -244,11 +254,10 @@ class WC_Admin_Assets {
 				'visible_label'                 => __( 'Visible on the product page', 'woocommerce' ),
 				'used_for_variations_label'     => __( 'Used for variations', 'woocommerce' ),
 				'new_attribute_prompt'          => __( 'Enter a name for the new attribute term:', 'woocommerce' ),
-				'calc_totals'                   => __( 'Calculate totals based on order items, discounts, and shipping?', 'woocommerce' ),
-				'calc_line_taxes'               => __( 'Calculate line taxes? This will calculate taxes based on the customers country. If no billing/shipping is set it will use the store base country.', 'woocommerce' ),
+				'calc_totals'                   => __( 'Recalculate totals? This will calculate taxes based on the customers country (or the store base country) and update totals.', 'woocommerce' ),
 				'copy_billing'                  => __( 'Copy billing information to shipping information? This will remove any currently entered shipping information.', 'woocommerce' ),
-				'load_billing'                  => __( 'Load the customer\'s billing information? This will remove any currently entered billing information.', 'woocommerce' ),
-				'load_shipping'                 => __( 'Load the customer\'s shipping information? This will remove any currently entered shipping information.', 'woocommerce' ),
+				'load_billing'                  => __( "Load the customer's billing information? This will remove any currently entered billing information.", 'woocommerce' ),
+				'load_shipping'                 => __( "Load the customer's shipping information? This will remove any currently entered shipping information.", 'woocommerce' ),
 				'featured_label'                => __( 'Featured', 'woocommerce' ),
 				'prices_include_tax'            => esc_attr( get_option( 'woocommerce_prices_include_tax' ) ),
 				'tax_based_on'                  => esc_attr( get_option( 'woocommerce_tax_based_on' ) ),
@@ -266,28 +275,28 @@ class WC_Admin_Assets {
 				'revoke_access_nonce'           => wp_create_nonce( 'revoke-access' ),
 				'add_order_note_nonce'          => wp_create_nonce( 'add-order-note' ),
 				'delete_order_note_nonce'       => wp_create_nonce( 'delete-order-note' ),
-				'calendar_image'                => WC()->plugin_url().'/assets/images/calendar.png',
+				'calendar_image'                => WC()->plugin_url() . '/assets/images/calendar.png',
 				'post_id'                       => isset( $post->ID ) ? $post->ID : '',
 				'base_country'                  => WC()->countries->get_base_country(),
 				'currency_format_num_decimals'  => wc_get_price_decimals(),
-				'currency_format_symbol'        => get_woocommerce_currency_symbol(),
+				'currency_format_symbol'        => get_woocommerce_currency_symbol( $currency ),
 				'currency_format_decimal_sep'   => esc_attr( wc_get_price_decimal_separator() ),
 				'currency_format_thousand_sep'  => esc_attr( wc_get_price_thousand_separator() ),
 				'currency_format'               => esc_attr( str_replace( array( '%1$s', '%2$s' ), array( '%s', '%v' ), get_woocommerce_price_format() ) ), // For accounting JS
-				'rounding_precision'            => WC_ROUNDING_PRECISION,
+				'rounding_precision'            => wc_get_rounding_precision(),
 				'tax_rounding_mode'             => WC_TAX_ROUNDING_MODE,
-				'product_types'                 => array_map( 'sanitize_title', get_terms( 'product_type', array( 'hide_empty' => false, 'fields' => 'names' ) ) ),
+				'product_types'                 => array_unique( array_merge( array( 'simple', 'grouped', 'variable', 'external' ), array_keys( wc_get_product_types() ) ) ),
 				'i18n_download_permission_fail' => __( 'Could not grant access - the user may already have permission for this file or billing email is not set. Ensure the billing email is set, and the order has been saved.', 'woocommerce' ),
 				'i18n_permission_revoke'        => __( 'Are you sure you want to revoke access to this download?', 'woocommerce' ),
 				'i18n_tax_rate_already_exists'  => __( 'You cannot add the same tax rate twice!', 'woocommerce' ),
-				'i18n_product_type_alert'       => __( 'Your product has variations! Before changing the product type, it is a good idea to delete the variations to avoid errors in the stock reports.', 'woocommerce' )
+				'i18n_delete_note'              => __( 'Are you sure you wish to delete this note? This action cannot be undone.', 'woocommerce' ),
 			);
 
 			wp_localize_script( 'wc-admin-meta-boxes', 'woocommerce_admin_meta_boxes', $params );
 		}
 
 		// Term ordering - only when sorting by term_order
-		if ( ( strstr( $screen->id, 'edit-pa_' ) || ( ! empty( $_GET['taxonomy'] ) && in_array( $_GET['taxonomy'], apply_filters( 'woocommerce_sortable_taxonomies', array( 'product_cat' ) ) ) ) ) && ! isset( $_GET['orderby'] ) ) {
+		if ( ( strstr( $screen_id, 'edit-pa_' ) || ( ! empty( $_GET['taxonomy'] ) && in_array( $_GET['taxonomy'], apply_filters( 'woocommerce_sortable_taxonomies', array( 'product_cat' ) ) ) ) ) && ! isset( $_GET['orderby'] ) ) {
 
 			wp_register_script( 'woocommerce_term_ordering', WC()->plugin_url() . '/assets/js/admin/term-ordering' . $suffix . '.js', array( 'jquery-ui-sortable' ), WC_VERSION );
 			wp_enqueue_script( 'woocommerce_term_ordering' );
@@ -295,20 +304,20 @@ class WC_Admin_Assets {
 			$taxonomy = isset( $_GET['taxonomy'] ) ? wc_clean( $_GET['taxonomy'] ) : '';
 
 			$woocommerce_term_order_params = array(
-				'taxonomy' => $taxonomy
+				'taxonomy' => $taxonomy,
 			);
 
 			wp_localize_script( 'woocommerce_term_ordering', 'woocommerce_term_ordering_params', $woocommerce_term_order_params );
 		}
 
 		// Product sorting - only when sorting by menu order on the products page
-		if ( current_user_can( 'edit_others_pages' ) && $screen->id == 'edit-product' && isset( $wp_query->query['orderby'] ) && $wp_query->query['orderby'] == 'menu_order title' ) {
+		if ( current_user_can( 'edit_others_pages' ) && 'edit-product' === $screen_id && isset( $wp_query->query['orderby'] ) && 'menu_order title' === $wp_query->query['orderby'] ) {
 			wp_register_script( 'woocommerce_product_ordering', WC()->plugin_url() . '/assets/js/admin/product-ordering' . $suffix . '.js', array( 'jquery-ui-sortable' ), WC_VERSION, true );
 			wp_enqueue_script( 'woocommerce_product_ordering' );
 		}
 
 		// Reports Pages
-		if ( in_array( $screen->id, apply_filters( 'woocommerce_reports_screen_ids', array( $wc_screen_id . '_page_wc-reports', 'toplevel_page_wc-reports', 'dashboard' ) ) ) ) {
+		if ( in_array( $screen_id, apply_filters( 'woocommerce_reports_screen_ids', array( $wc_screen_id . '_page_wc-reports', 'toplevel_page_wc-reports', 'dashboard' ) ) ) ) {
 			wp_register_script( 'wc-reports', WC()->plugin_url() . '/assets/js/admin/reports' . $suffix . '.js', array( 'jquery', 'jquery-ui-datepicker' ), WC_VERSION );
 
 			wp_enqueue_script( 'wc-reports' );
@@ -320,7 +329,7 @@ class WC_Admin_Assets {
 		}
 
 		// API settings
-		if ( $wc_screen_id . '_page_wc-settings' === $screen->id && isset( $_GET['section'] ) && 'keys' == $_GET['section'] ) {
+		if ( $wc_screen_id . '_page_wc-settings' === $screen_id && isset( $_GET['section'] ) && 'keys' == $_GET['section'] ) {
 			wp_register_script( 'wc-api-keys', WC()->plugin_url() . '/assets/js/admin/api-keys' . $suffix . '.js', array( 'jquery', 'woocommerce_admin', 'underscore', 'backbone', 'wp-util', 'qrcode', 'zeroclipboard' ), WC_VERSION, true );
 			wp_enqueue_script( 'wc-api-keys' );
 			wp_localize_script(
@@ -328,17 +337,26 @@ class WC_Admin_Assets {
 				'woocommerce_admin_api_keys',
 				array(
 					'ajax_url'         => admin_url( 'admin-ajax.php' ),
-					'update_api_nonce' => wp_create_nonce( 'update-api-key' )
+					'update_api_nonce' => wp_create_nonce( 'update-api-key' ),
+					'clipboard_failed' => esc_html__( 'Copying to clipboard failed. Please press Ctrl/Cmd+C to copy.', 'woocommerce' ),
 				)
 			);
 		}
 
-		// System status
-		if ( $wc_screen_id . '_page_wc-status' === $screen->id ) {
-			wp_enqueue_script( 'zeroclipboard' );
+		// System status.
+		if ( $wc_screen_id . '_page_wc-status' === $screen_id ) {
+			wp_register_script( 'wc-admin-system-status', WC()->plugin_url() . '/assets/js/admin/system-status' . $suffix . '.js', array( 'zeroclipboard' ), WC_VERSION );
+			wp_enqueue_script( 'wc-admin-system-status' );
+			wp_localize_script(
+				'wc-admin-system-status',
+				'woocommerce_admin_system_status',
+				array(
+					'delete_log_confirmation' => esc_js( __( 'Are you sure you want to delete this log?', 'woocommerce' ) ),
+				)
+			);
 		}
 
-		if ( in_array( $screen->id, array( 'user-edit', 'profile' ) ) ) {
+		if ( in_array( $screen_id, array( 'user-edit', 'profile' ) ) ) {
 			wp_register_script( 'wc-users', WC()->plugin_url() . '/assets/js/admin/users' . $suffix . '.js', array( 'jquery', 'wc-enhanced-select' ), WC_VERSION, true );
 			wp_enqueue_script( 'wc-users' );
 			wp_localize_script(
@@ -359,12 +377,14 @@ class WC_Admin_Assets {
 	 */
 	public function product_taxonomy_styles() {
 
-		if ( ! current_user_can( 'manage_woocommerce' ) ) return;
+		if ( ! current_user_can( 'manage_woocommerce' ) ) {
+			return;
+		}
 		?>
 		<style type="text/css">
-			<?php if ( isset($_GET['taxonomy']) && $_GET['taxonomy']=='product_cat' ) : ?>
+			<?php if ( isset( $_GET['taxonomy'] ) && 'product_cat' === $_GET['taxonomy'] ) : ?>
 				.icon32-posts-product { background-position: -243px -5px !important; }
-			<?php elseif ( isset($_GET['taxonomy']) && $_GET['taxonomy']=='product_tag' ) : ?>
+			<?php elseif ( isset( $_GET['taxonomy'] ) && 'product_tag' === $_GET['taxonomy'] ) : ?>
 				.icon32-posts-product { background-position: -301px -5px !important; }
 			<?php endif; ?>
 		</style>
diff --git a/includes/admin/class-wc-admin-attributes.php b/includes/admin/class-wc-admin-attributes.php
index 0dbea46c42c..ab912feca1f 100644
--- a/includes/admin/class-wc-admin-attributes.php
+++ b/includes/admin/class-wc-admin-attributes.php
@@ -51,7 +51,7 @@ class WC_Admin_Attributes {
 		}
 
 		if ( is_wp_error( $result ) ) {
-			echo '<div id="woocommerce_errors" class="error"><p>' . $result->get_error_message() . '</p></div>';
+			echo '<div id="woocommerce_errors" class="error"><p>' . wp_kses_post( $result->get_error_message() ) . '</p></div>';
 		}
 
 		// Show admin interface
@@ -72,7 +72,7 @@ class WC_Admin_Attributes {
 			'attribute_name'    => isset( $_POST['attribute_name'] )    ? wc_sanitize_taxonomy_name( stripslashes( $_POST['attribute_name'] ) ) : '',
 			'attribute_type'    => isset( $_POST['attribute_type'] )    ? wc_clean( $_POST['attribute_type'] ) : 'select',
 			'attribute_orderby' => isset( $_POST['attribute_orderby'] ) ? wc_clean( $_POST['attribute_orderby'] ) : '',
-			'attribute_public'  => isset( $_POST['attribute_public'] )  ? 1 : 0
+			'attribute_public'  => isset( $_POST['attribute_public'] )  ? 1 : 0,
 		);
 
 		if ( empty( $attribute['attribute_type'] ) ) {
@@ -94,9 +94,11 @@ class WC_Admin_Attributes {
 	 * @return bool|WP_error result
 	 */
 	private static function valid_attribute_name( $attribute_name ) {
-		if ( strlen( $attribute_name ) >= 28 ) {
+		if ( strlen( $attribute_name ) > 28 ) {
+			/* translators: %s: attribute name */
 			return new WP_Error( 'error', sprintf( __( 'Slug "%s" is too long (28 characters max). Shorten it, please.', 'woocommerce' ), sanitize_title( $attribute_name ) ) );
 		} elseif ( wc_check_if_attribute_name_is_reserved( $attribute_name ) ) {
+			/* translators: %s: attribute name */
 			return new WP_Error( 'error', sprintf( __( 'Slug "%s" is not allowed because it is a reserved term. Change it, please.', 'woocommerce' ), sanitize_title( $attribute_name ) ) );
 		}
 
@@ -118,6 +120,7 @@ class WC_Admin_Attributes {
 		} elseif ( ( $valid_attribute_name = self::valid_attribute_name( $attribute['attribute_name'] ) ) && is_wp_error( $valid_attribute_name ) ) {
 			return $valid_attribute_name;
 		} elseif ( taxonomy_exists( wc_attribute_taxonomy_name( $attribute['attribute_name'] ) ) ) {
+			/* translators: %s: attribute name */
 			return new WP_Error( 'error', sprintf( __( 'Slug "%s" is already in use. Change it, please.', 'woocommerce' ), sanitize_title( $attribute['attribute_name'] ) ) );
 		}
 
@@ -125,7 +128,7 @@ class WC_Admin_Attributes {
 
 		do_action( 'woocommerce_attribute_added', $wpdb->insert_id, $attribute );
 
-		flush_rewrite_rules();
+		wp_schedule_single_event( time(), 'woocommerce_flush_rewrite_rules' );
 		delete_transient( 'wc_attribute_taxonomies' );
 
 		return true;
@@ -151,6 +154,7 @@ class WC_Admin_Attributes {
 		$taxonomy_exists    = taxonomy_exists( wc_attribute_taxonomy_name( $attribute['attribute_name'] ) );
 		$old_attribute_name = $wpdb->get_var( "SELECT attribute_name FROM {$wpdb->prefix}woocommerce_attribute_taxonomies WHERE attribute_id = $attribute_id" );
 		if ( $old_attribute_name != $attribute['attribute_name'] && wc_sanitize_taxonomy_name( $old_attribute_name ) != $attribute['attribute_name'] && $taxonomy_exists ) {
+			/* translators: %s: attribute name */
 			return new WP_Error( 'error', sprintf( __( 'Slug "%s" is already in use. Change it, please.', 'woocommerce' ), sanitize_title( $attribute['attribute_name'] ) ) );
 		}
 
@@ -167,11 +171,19 @@ class WC_Admin_Attributes {
 			);
 
 			// Update taxonomy ordering term meta
-			$wpdb->update(
-				$wpdb->prefix . 'woocommerce_termmeta',
-				array( 'meta_key' => 'order_pa_' . sanitize_title( $attribute['attribute_name'] ) ),
-				array( 'meta_key' => 'order_pa_' . sanitize_title( $old_attribute_name ) )
-			);
+			if ( get_option( 'db_version' ) < 34370 ) {
+				$wpdb->update(
+					$wpdb->prefix . 'woocommerce_termmeta',
+					array( 'meta_key' => 'order_pa_' . sanitize_title( $attribute['attribute_name'] ) ),
+					array( 'meta_key' => 'order_pa_' . sanitize_title( $old_attribute_name ) )
+				);
+			} else {
+				$wpdb->update(
+					$wpdb->termmeta,
+					array( 'meta_key' => 'order_pa_' . sanitize_title( $attribute['attribute_name'] ) ),
+					array( 'meta_key' => 'order_pa_' . sanitize_title( $old_attribute_name ) )
+				);
+			}
 
 			// Update product attributes which use this taxonomy
 			$old_attribute_name_length = strlen( $old_attribute_name ) + 3;
@@ -192,7 +204,7 @@ class WC_Admin_Attributes {
 
 		echo '<div class="updated"><p>' . __( 'Attribute updated successfully', 'woocommerce' ) . '</p></div>';
 
-		flush_rewrite_rules();
+		wp_schedule_single_event( time(), 'woocommerce_flush_rewrite_rules' );
 		delete_transient( 'wc_attribute_taxonomies' );
 
 		return true;
@@ -204,15 +216,17 @@ class WC_Admin_Attributes {
 	 */
 	private static function process_delete_attribute() {
 		global $wpdb;
+
 		$attribute_id = absint( $_GET['delete'] );
+
 		check_admin_referer( 'woocommerce-delete-attribute_' . $attribute_id );
 
 		$attribute_name = $wpdb->get_var( "SELECT attribute_name FROM {$wpdb->prefix}woocommerce_attribute_taxonomies WHERE attribute_id = $attribute_id" );
+		$taxonomy       = wc_attribute_taxonomy_name( $attribute_name );
+
+		do_action( 'woocommerce_before_attribute_delete', $attribute_id, $attribute_name, $taxonomy );
 
 		if ( $attribute_name && $wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_attribute_taxonomies WHERE attribute_id = $attribute_id" ) ) {
-
-			$taxonomy = wc_attribute_taxonomy_name( $attribute_name );
-
 			if ( taxonomy_exists( $taxonomy ) ) {
 				$terms = get_terms( $taxonomy, 'orderby=name&hide_empty=0' );
 				foreach ( $terms as $term ) {
@@ -222,7 +236,6 @@ class WC_Admin_Attributes {
 
 			do_action( 'woocommerce_attribute_deleted', $attribute_id, $attribute_name, $taxonomy );
 			delete_transient( 'wc_attribute_taxonomies' );
-
 			return true;
 		}
 
@@ -239,12 +252,11 @@ class WC_Admin_Attributes {
 
 		$edit = absint( $_GET['edit'] );
 
-		$attribute_to_edit = $wpdb->get_row( "SELECT * FROM " . $wpdb->prefix . "woocommerce_attribute_taxonomies WHERE attribute_id = '$edit'" );
+		$attribute_to_edit = $wpdb->get_row( "SELECT attribute_type, attribute_label, attribute_name, attribute_orderby, attribute_public FROM " . $wpdb->prefix . "woocommerce_attribute_taxonomies WHERE attribute_id = '$edit'" );
 
 		?>
 		<div class="wrap woocommerce">
-			<div class="icon32 icon32-attributes" id="icon-woocommerce"><br/></div>
-			<h1><?php _e( 'Edit Attribute', 'woocommerce' ) ?></h1>
+			<h1><?php _e( 'Edit attribute', 'woocommerce' ) ?></h1>
 
 			<?php
 
@@ -262,6 +274,7 @@ class WC_Admin_Attributes {
 				<form action="edit.php?post_type=product&amp;page=product_attributes&amp;edit=<?php echo absint( $edit ); ?>" method="post">
 					<table class="form-table">
 						<tbody>
+							<?php do_action( 'woocommerce_before_edit_attribute_fields' ); ?>
 							<tr class="form-field form-required">
 								<th scope="row" valign="top">
 									<label for="attribute_label"><?php _e( 'Name', 'woocommerce' ); ?></label>
@@ -277,12 +290,12 @@ class WC_Admin_Attributes {
 								</th>
 								<td>
 									<input name="attribute_name" id="attribute_name" type="text" value="<?php echo esc_attr( $att_name ); ?>" maxlength="28" />
-									<p class="description"><?php _e( 'Unique slug/reference for the attribute; must be shorter than 28 characters.', 'woocommerce' ); ?></p>
+									<p class="description"><?php _e( 'Unique slug/reference for the attribute; must be no more than 28 characters.', 'woocommerce' ); ?></p>
 								</td>
 							</tr>
 							<tr class="form-field form-required">
 								<th scope="row" valign="top">
-									<label for="attribute_public"><?php _e( 'Enable Archives?', 'woocommerce' ); ?></label>
+									<label for="attribute_public"><?php _e( 'Enable archives?', 'woocommerce' ); ?></label>
 								</th>
 								<td>
 									<input name="attribute_public" id="attribute_public" type="checkbox" value="1" <?php checked( $att_public, 1 ); ?> />
@@ -300,7 +313,6 @@ class WC_Admin_Attributes {
 										<?php endforeach; ?>
 
 										<?php
-
 											/**
 											 * Deprecated action in favor of product_attributes_type_selector filter.
 											 *
@@ -326,6 +338,7 @@ class WC_Admin_Attributes {
 									<p class="description"><?php _e( 'Determines the sort order of the terms on the frontend shop product pages. If using custom ordering, you can drag and drop the terms in this attribute.', 'woocommerce' ); ?></p>
 								</td>
 							</tr>
+							<?php do_action( 'woocommerce_after_edit_attribute_fields' ) ?>
 						</tbody>
 					</table>
 					<p class="submit"><input type="submit" name="save_attribute" id="submit" class="button-primary" value="<?php esc_attr_e( 'Update', 'woocommerce' ); ?>"></p>
@@ -344,8 +357,8 @@ class WC_Admin_Attributes {
 	public static function add_attribute() {
 		?>
 		<div class="wrap woocommerce">
-			<div class="icon32 icon32-attributes" id="icon-woocommerce"><br/></div>
-			<h1><?php _e( 'Attributes', 'woocommerce' ); ?></h1>
+			<h1><?php echo get_admin_page_title(); ?></h1>
+
 			<br class="clear" />
 			<div id="col-container">
 				<div id="col-right">
@@ -357,7 +370,7 @@ class WC_Admin_Attributes {
 									<th scope="col"><?php _e( 'Slug', 'woocommerce' ); ?></th>
 									<th scope="col"><?php _e( 'Type', 'woocommerce' ); ?></th>
 									<th scope="col"><?php _e( 'Order by', 'woocommerce' ); ?></th>
-									<th scope="col" colspan="2"><?php _e( 'Terms', 'woocommerce' ); ?></th>
+									<th scope="col"><?php _e( 'Terms', 'woocommerce' ); ?></th>
 								</tr>
 							</thead>
 							<tbody>
@@ -365,14 +378,13 @@ class WC_Admin_Attributes {
 									if ( $attribute_taxonomies = wc_get_attribute_taxonomies() ) :
 										foreach ( $attribute_taxonomies as $tax ) :
 											?><tr>
-
 												<td>
 													<strong><a href="edit-tags.php?taxonomy=<?php echo esc_html( wc_attribute_taxonomy_name( $tax->attribute_name ) ); ?>&amp;post_type=product"><?php echo esc_html( $tax->attribute_label ); ?></a></strong>
 
 													<div class="row-actions"><span class="edit"><a href="<?php echo esc_url( add_query_arg( 'edit', $tax->attribute_id, 'edit.php?post_type=product&amp;page=product_attributes' ) ); ?>"><?php _e( 'Edit', 'woocommerce' ); ?></a> | </span><span class="delete"><a class="delete" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'delete', $tax->attribute_id, 'edit.php?post_type=product&amp;page=product_attributes' ), 'woocommerce-delete-attribute_' . $tax->attribute_id ) ); ?>"><?php _e( 'Delete', 'woocommerce' ); ?></a></span></div>
 												</td>
 												<td><?php echo esc_html( $tax->attribute_name ); ?></td>
-												<td><?php echo esc_html( ucfirst( $tax->attribute_type ) ); ?> <?php echo $tax->attribute_public ? '(' . __( 'Public', 'woocommerce' ) . ')' : ''; ?></td>
+												<td><?php echo esc_html( wc_get_attribute_type_label( $tax->attribute_type ) ); ?> <?php echo $tax->attribute_public ? __( '(Public)', 'woocommerce' ) : ''; ?></td>
 												<td><?php
 													switch ( $tax->attribute_orderby ) {
 														case 'name' :
@@ -393,7 +405,11 @@ class WC_Admin_Attributes {
 													$taxonomy = wc_attribute_taxonomy_name( $tax->attribute_name );
 
 													if ( taxonomy_exists( $taxonomy ) ) {
-														$terms = get_terms( $taxonomy, 'hide_empty=0' );
+														if ( 'menu_order' === wc_attribute_orderby( $taxonomy ) ) {
+															$terms = get_terms( $taxonomy, 'hide_empty=0&menu_order=ASC' );
+														} else {
+															$terms = get_terms( $taxonomy, 'hide_empty=0&menu_order=false' );
+														}
 
 														switch ( $tax->attribute_orderby ) {
 															case 'name_num' :
@@ -413,8 +429,9 @@ class WC_Admin_Attributes {
 													} else {
 														echo '<span class="na">&ndash;</span>';
 													}
-												?></td>
-												<td class="attribute-actions"><a href="edit-tags.php?taxonomy=<?php echo esc_html( wc_attribute_taxonomy_name( $tax->attribute_name ) ); ?>&amp;post_type=product" class="button alignright tips configure-terms" data-tip="<?php esc_attr_e( 'Configure terms', 'woocommerce' ); ?>"><?php _e( 'Configure terms', 'woocommerce' ); ?></a></td>
+												?>
+												<br /><a href="edit-tags.php?taxonomy=<?php echo esc_html( wc_attribute_taxonomy_name( $tax->attribute_name ) ); ?>&amp;post_type=product" class="configure-terms"><?php _e( 'Configure terms', 'woocommerce' ); ?></a>
+												</td>
 											</tr><?php
 										endforeach;
 									else :
@@ -428,9 +445,11 @@ class WC_Admin_Attributes {
 				<div id="col-left">
 					<div class="col-wrap">
 						<div class="form-wrap">
-							<h3><?php _e( 'Add New Attribute', 'woocommerce' ); ?></h3>
-							<p><?php _e( 'Attributes let you define extra product data, such as size or colour. You can use these attributes in the shop sidebar using the "layered nav" widgets. Please note: you cannot rename an attribute later on.', 'woocommerce' ); ?></p>
+							<h2><?php _e( 'Add new attribute', 'woocommerce' ); ?></h2>
+							<p><?php _e( 'Attributes let you define extra product data, such as size or color. You can use these attributes in the shop sidebar using the "layered nav" widgets. Please note: you cannot rename an attribute later on.', 'woocommerce' ); ?></p>
 							<form action="edit.php?post_type=product&amp;page=product_attributes" method="post">
+								<?php do_action( 'woocommerce_before_add_attribute_fields' ) ?>
+
 								<div class="form-field">
 									<label for="attribute_label"><?php _e( 'Name', 'woocommerce' ); ?></label>
 									<input name="attribute_label" id="attribute_label" type="text" value="" />
@@ -440,7 +459,7 @@ class WC_Admin_Attributes {
 								<div class="form-field">
 									<label for="attribute_name"><?php _e( 'Slug', 'woocommerce' ); ?></label>
 									<input name="attribute_name" id="attribute_name" type="text" value="" maxlength="28" />
-									<p class="description"><?php _e( 'Unique slug/reference for the attribute; must be shorter than 28 characters.', 'woocommerce' ); ?></p>
+									<p class="description"><?php _e( 'Unique slug/reference for the attribute; must be no more than 28 characters.', 'woocommerce' ); ?></p>
 								</div>
 
 								<div class="form-field">
@@ -480,7 +499,9 @@ class WC_Admin_Attributes {
 									<p class="description"><?php _e( 'Determines the sort order of the terms on the frontend shop product pages. If using custom ordering, you can drag and drop the terms in this attribute.', 'woocommerce' ); ?></p>
 								</div>
 
-								<p class="submit"><input type="submit" name="add_new_attribute" id="submit" class="button button-primary" value="<?php esc_attr_e( 'Add Attribute', 'woocommerce' ); ?>"></p>
+								<?php do_action( 'woocommerce_after_add_attribute_fields' ) ?>
+
+								<p class="submit"><input type="submit" name="add_new_attribute" id="submit" class="button button-primary" value="<?php esc_attr_e( 'Add attribute', 'woocommerce' ); ?>"></p>
 								<?php wp_nonce_field( 'woocommerce-add-new_attribute' ); ?>
 							</form>
 						</div>
diff --git a/includes/admin/class-wc-admin-customize.php b/includes/admin/class-wc-admin-customize.php
new file mode 100644
index 00000000000..1c4f81d6db6
--- /dev/null
+++ b/includes/admin/class-wc-admin-customize.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Setup customize items.
+ *
+ * @author   WooCommerce
+ * @category Admin
+ * @package  WooCommerce/Admin/Customize
+ * @version  3.1.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+if ( ! class_exists( 'WC_Admin_Customize', false ) ) :
+
+/**
+ * WC_Admin_Customize Class.
+ */
+class WC_Admin_Customize {
+
+	/**
+	 * Initialize customize actions.
+	 */
+	public function __construct() {
+		// Include custom items to customizer nav menu settings.
+		add_filter( 'customize_nav_menu_available_item_types', array( $this, 'register_customize_nav_menu_item_types' ) );
+		add_filter( 'customize_nav_menu_available_items', array( $this, 'register_customize_nav_menu_items' ), 10, 4 );
+	}
+
+	/**
+	 * Register customize new nav menu item types.
+	 * This will register WooCommerce account endpoints as a nav menu item type.
+	 *
+	 * @since  3.1.0
+	 * @param  array $item_types Menu item types.
+	 * @return array
+	 */
+	public function register_customize_nav_menu_item_types( $item_types  ) {
+		$item_types[] = array(
+			'title'      => __( 'WooCommerce endpoints', 'woocommerce' ),
+			'type_label' => __( 'WooCommerce endpoint', 'woocommerce' ),
+			'type'       => 'woocommerce_nav',
+			'object'     => 'woocommerce_endpoint',
+		);
+
+		return $item_types;
+	}
+
+	/**
+	 * Register account endpoints to customize nav menu items.
+	 *
+	 * @since  3.1.0
+	 * @param  array   $items  List of nav menu items.
+	 * @param  string  $type   Nav menu type.
+	 * @param  string  $object Nav menu object.
+	 * @param  integer $page   Page number.
+	 * @return array
+	 */
+	public function register_customize_nav_menu_items( $items = array(), $type = '', $object = '', $page = 0 ) {
+		if ( 'woocommerce_endpoint' !== $object ) {
+			return $items;
+		}
+
+		// Don't allow pagination since all items are loaded at once.
+		if ( 0 < $page ) {
+			return $items;
+		}
+
+		// Get items from account menu.
+		$endpoints = wc_get_account_menu_items();
+
+		// Remove dashboard item.
+		if ( isset( $endpoints['dashboard'] ) ) {
+			unset( $endpoints['dashboard'] );
+		}
+
+		// Include missing lost password.
+		$endpoints['lost-password'] = __( 'Lost password', 'woocommerce' );
+
+		$endpoints = apply_filters( 'woocommerce_custom_nav_menu_items', $endpoints );
+
+		foreach ( $endpoints as $endpoint => $title ) {
+			$items[] = array(
+				'id'         => $endpoint,
+				'title'      => $title,
+				'type_label' => __( 'Custom Link', 'woocommerce' ),
+				'url'        => esc_url_raw( wc_get_account_endpoint_url( $endpoint ) ),
+			);
+		}
+
+		return $items;
+	}
+}
+
+endif;
+
+return new WC_Admin_Customize();
diff --git a/includes/admin/class-wc-admin-dashboard.php b/includes/admin/class-wc-admin-dashboard.php
index b8162afa28b..24987d70b4c 100644
--- a/includes/admin/class-wc-admin-dashboard.php
+++ b/includes/admin/class-wc-admin-dashboard.php
@@ -12,7 +12,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
 
-if ( ! class_exists( 'WC_Admin_Dashboard' ) ) :
+if ( ! class_exists( 'WC_Admin_Dashboard', false ) ) :
 
 /**
  * WC_Admin_Dashboard Class.
@@ -34,36 +34,18 @@ class WC_Admin_Dashboard {
 	 */
 	public function init() {
 		if ( current_user_can( 'publish_shop_orders' ) ) {
-			wp_add_dashboard_widget( 'woocommerce_dashboard_recent_reviews', __( 'WooCommerce Recent Reviews', 'woocommerce' ), array( $this, 'recent_reviews' ) );
+			wp_add_dashboard_widget( 'woocommerce_dashboard_recent_reviews', __( 'WooCommerce recent reviews', 'woocommerce' ), array( $this, 'recent_reviews' ) );
 		}
-
-		wp_add_dashboard_widget( 'woocommerce_dashboard_status', __( 'WooCommerce Status', 'woocommerce' ), array( $this, 'status_widget' ) );
+		wp_add_dashboard_widget( 'woocommerce_dashboard_status', __( 'WooCommerce status', 'woocommerce' ), array( $this, 'status_widget' ) );
 	}
 
 	/**
-	 * Show status widget.
+	 * Get top seller from DB.
+	 * @return object
 	 */
-	public function status_widget() {
+	private function get_top_seller() {
 		global $wpdb;
 
-		include_once( 'reports/class-wc-admin-report.php' );
-
-		$reports = new WC_Admin_Report();
-
-		// Sales
-		$query            = array();
-		$query['fields']  = "SELECT SUM( postmeta.meta_value ) FROM {$wpdb->posts} as posts";
-		$query['join']    = "INNER JOIN {$wpdb->postmeta} AS postmeta ON posts.ID = postmeta.post_id LEFT JOIN {$wpdb->posts} AS parent ON posts.post_parent = parent.ID";
-		$query['where']   = "WHERE posts.post_type IN ( '" . implode( "','", array_merge( wc_get_order_types( 'sales-reports' ), array( 'shop_order_refund' ) ) ) . "' ) ";
-		$query['where']  .= "AND posts.post_status IN ( 'wc-" . implode( "','wc-", apply_filters( 'woocommerce_reports_order_statuses', array( 'completed', 'processing', 'on-hold' ) ) ) . "' ) ";
-		$query['where']  .= "AND ( parent.post_status IN ( 'wc-" . implode( "','wc-", apply_filters( 'woocommerce_reports_order_statuses', array( 'completed', 'processing', 'on-hold' ) ) ) . "' ) OR parent.ID IS NULL ) ";
-		$query['where']  .= "AND postmeta.meta_key   = '_order_total' ";
-		$query['where']  .= "AND posts.post_date >= '" . date( 'Y-m-01', current_time( 'timestamp' ) ) . "' ";
-		$query['where']  .= "AND posts.post_date <= '" . date( 'Y-m-d H:i:s', current_time( 'timestamp' ) ) . "' ";
-
-		$sales = $wpdb->get_var( implode( ' ', apply_filters( 'woocommerce_dashboard_status_widget_sales_query', $query ) ) );
-
-		// Get top seller
 		$query            = array();
 		$query['fields']  = "SELECT SUM( order_item_meta.meta_value ) as qty, order_item_meta_2.meta_value as product_id
 			FROM {$wpdb->posts} as posts";
@@ -80,9 +62,84 @@ class WC_Admin_Dashboard {
 		$query['orderby'] = "ORDER BY qty DESC";
 		$query['limits']  = "LIMIT 1";
 
-		$top_seller = $wpdb->get_row( implode( ' ', apply_filters( 'woocommerce_dashboard_status_widget_top_seller_query', $query ) ) );
+		return $wpdb->get_row( implode( ' ', apply_filters( 'woocommerce_dashboard_status_widget_top_seller_query', $query ) ) );
+	}
 
-		// Counts
+	/**
+	 * Get sales report data.
+	 * @return object
+	 */
+	private function get_sales_report_data() {
+		include_once( dirname( __FILE__ ) . '/reports/class-wc-report-sales-by-date.php' );
+
+		$sales_by_date                 = new WC_Report_Sales_By_Date();
+		$sales_by_date->start_date     = strtotime( date( 'Y-m-01', current_time( 'timestamp' ) ) );
+		$sales_by_date->end_date       = current_time( 'timestamp' );
+		$sales_by_date->chart_groupby  = 'day';
+		$sales_by_date->group_by_query = 'YEAR(posts.post_date), MONTH(posts.post_date), DAY(posts.post_date)';
+
+		return $sales_by_date->get_report_data();
+	}
+
+	/**
+	 * Show status widget.
+	 */
+	public function status_widget() {
+		include_once( dirname( __FILE__ ) . '/reports/class-wc-admin-report.php' );
+
+		$reports = new WC_Admin_Report();
+
+		echo '<ul class="wc_status_list">';
+
+		if ( current_user_can( 'view_woocommerce_reports' ) && ( $report_data = $this->get_sales_report_data() ) ) {
+			?>
+			<li class="sales-this-month">
+				<a href="<?php echo admin_url( 'admin.php?page=wc-reports&tab=orders&range=month' ); ?>">
+					<?php echo $reports->sales_sparkline( '', max( 7, date( 'd', current_time( 'timestamp' ) ) ) ); ?>
+					<?php
+						/* translators: %s: net sales */
+						printf(
+							__( '%s net sales this month', 'woocommerce' ),
+							'<strong>' . wc_price( $report_data->net_sales ) . '</strong>'
+							);
+					?>
+				</a>
+			</li>
+			<?php
+		}
+
+		if ( current_user_can( 'view_woocommerce_reports' ) && ( $top_seller = $this->get_top_seller() ) && $top_seller->qty ) {
+			?>
+			<li class="best-seller-this-month">
+				<a href="<?php echo admin_url( 'admin.php?page=wc-reports&tab=orders&report=sales_by_product&range=month&product_ids=' . $top_seller->product_id ); ?>">
+					<?php echo $reports->sales_sparkline( $top_seller->product_id, max( 7, date( 'd', current_time( 'timestamp' ) ) ), 'count' ); ?>
+					<?php
+						/* translators: 1: top seller product title 2: top seller quantity */
+						printf(
+							__( '%1$s top seller this month (sold %2$d)', 'woocommerce' ),
+							'<strong>' . get_the_title( $top_seller->product_id ) . '</strong>',
+							$top_seller->qty
+						);
+					?>
+				</a>
+			</li>
+			<?php
+		}
+
+		$this->status_widget_order_rows();
+		$this->status_widget_stock_rows();
+
+		do_action( 'woocommerce_after_dashboard_status_widget', $reports );
+		echo '</ul>';
+	}
+
+	/**
+	 * Show order data is status widget.
+	 */
+	private function status_widget_order_rows() {
+		if ( ! current_user_can( 'edit_shop_orders' ) ) {
+			return;
+		}
 		$on_hold_count    = 0;
 		$processing_count = 0;
 
@@ -91,6 +148,37 @@ class WC_Admin_Dashboard {
 			$on_hold_count    += isset( $counts['wc-on-hold'] ) ? $counts['wc-on-hold'] : 0;
 			$processing_count += isset( $counts['wc-processing'] ) ? $counts['wc-processing'] : 0;
 		}
+		?>
+		<li class="processing-orders">
+			<a href="<?php echo admin_url( 'edit.php?post_status=wc-processing&post_type=shop_order' ); ?>">
+				<?php
+					/* translators: %s: order count */
+					printf(
+						_n( '<strong>%s order</strong> awaiting processing', '<strong>%s orders</strong> awaiting processing', $processing_count, 'woocommerce' ),
+						$processing_count
+					);
+				?>
+			</a>
+		</li>
+		<li class="on-hold-orders">
+			<a href="<?php echo admin_url( 'edit.php?post_status=wc-on-hold&post_type=shop_order' ); ?>">
+				<?php
+					/* translators: %s: order count */
+					printf(
+						_n( '<strong>%s order</strong> on-hold', '<strong>%s orders</strong> on-hold', $on_hold_count, 'woocommerce' ),
+						$on_hold_count
+					);
+				?>
+			</a>
+		</li>
+		<?php
+	}
+
+	/**
+	 * Show stock data is status widget.
+	 */
+	private function status_widget_stock_rows() {
+		global $wpdb;
 
 		// Get products using a query - this is too advanced for get_posts :(
 		$stock          = absint( max( get_option( 'woocommerce_notify_low_stock_amount' ), 1 ) );
@@ -128,44 +216,28 @@ class WC_Admin_Dashboard {
 			set_transient( $transient_name, $outofstock_count, DAY_IN_SECONDS * 30 );
 		}
 		?>
-		<ul class="wc_status_list">
-			<li class="sales-this-month">
-				<a href="<?php echo admin_url( 'admin.php?page=wc-reports&tab=orders&range=month' ); ?>">
-					<?php echo $reports->sales_sparkline( '', max( 7, date( 'd', current_time( 'timestamp' ) ) ) ); ?>
-					<?php printf( __( "<strong>%s</strong> sales this month", 'woocommerce' ), wc_price( $sales ) ); ?>
-				</a>
-			</li>
-			<?php if ( $top_seller && $top_seller->qty ) : ?>
-				<li class="best-seller-this-month">
-					<a href="<?php echo admin_url( 'admin.php?page=wc-reports&tab=orders&report=sales_by_product&range=month&product_ids=' . $top_seller->product_id ); ?>">
-						<?php echo $reports->sales_sparkline( $top_seller->product_id, max( 7, date( 'd', current_time( 'timestamp' ) ) ), 'count' ); ?>
-						<?php printf( __( "%s top seller this month (sold %d)", 'woocommerce' ), "<strong>" . get_the_title( $top_seller->product_id ) . "</strong>", $top_seller->qty ); ?>
-					</a>
-				</li>
-			<?php endif; ?>
-			<li class="processing-orders">
-				<a href="<?php echo admin_url( 'edit.php?post_status=wc-processing&post_type=shop_order' ); ?>">
-					<?php printf( _n( "<strong>%s order</strong> awaiting processing", "<strong>%s orders</strong> awaiting processing", $processing_count, 'woocommerce' ), $processing_count ); ?>
-				</a>
-			</li>
-			<li class="on-hold-orders">
-				<a href="<?php echo admin_url( 'edit.php?post_status=wc-on-hold&post_type=shop_order' ); ?>">
-					<?php printf( _n( "<strong>%s order</strong> on-hold", "<strong>%s orders</strong> on-hold", $on_hold_count, 'woocommerce' ), $on_hold_count ); ?>
-				</a>
-			</li>
-			<li class="low-in-stock">
-				<a href="<?php echo admin_url( 'admin.php?page=wc-reports&tab=stock&report=low_in_stock' ); ?>">
-					<?php printf( _n( "<strong>%s product</strong> low in stock", "<strong>%s products</strong> low in stock", $lowinstock_count, 'woocommerce' ), $lowinstock_count ); ?>
-				</a>
-			</li>
-			<li class="out-of-stock">
-				<a href="<?php echo admin_url( 'admin.php?page=wc-reports&tab=stock&report=out_of_stock' ); ?>">
-					<?php printf( _n( "<strong>%s product</strong> out of stock", "<strong>%s products</strong> out of stock", $outofstock_count, 'woocommerce' ), $outofstock_count ); ?>
-				</a>
-			</li>
-
-			<?php do_action( 'woocommerce_after_dashboard_status_widget', $reports ); ?>
-		</ul>
+		<li class="low-in-stock">
+			<a href="<?php echo admin_url( 'admin.php?page=wc-reports&tab=stock&report=low_in_stock' ); ?>">
+				<?php
+					/* translators: %s: order count */
+					printf(
+						_n( '<strong>%s product</strong> low in stock', '<strong>%s products</strong> low in stock', $lowinstock_count, 'woocommerce' ),
+						$lowinstock_count
+					);
+				?>
+			</a>
+		</li>
+		<li class="out-of-stock">
+			<a href="<?php echo admin_url( 'admin.php?page=wc-reports&tab=stock&report=out_of_stock' ); ?>">
+				<?php
+					/* translators: %s: order count */
+					printf(
+						_n( '<strong>%s product</strong> out of stock', '<strong>%s products</strong> out of stock', $outofstock_count, 'woocommerce' ),
+						$outofstock_count
+					);
+				?>
+			</a>
+		</li>
 		<?php
 	}
 
@@ -174,15 +246,19 @@ class WC_Admin_Dashboard {
 	 */
 	public function recent_reviews() {
 		global $wpdb;
-		$comments = $wpdb->get_results( "SELECT *, SUBSTRING(comment_content,1,100) AS comment_excerpt
-		FROM $wpdb->comments
-		LEFT JOIN $wpdb->posts ON ($wpdb->comments.comment_post_ID = $wpdb->posts.ID)
-		WHERE comment_approved = '1'
-		AND comment_type = ''
-		AND post_password = ''
-		AND post_type = 'product'
-		ORDER BY comment_date_gmt DESC
-		LIMIT 8" );
+		$query_from = apply_filters( 'woocommerce_report_recent_reviews_query_from', "FROM {$wpdb->comments} comments
+			LEFT JOIN {$wpdb->posts} posts ON (comments.comment_post_ID = posts.ID)
+			WHERE comments.comment_approved = '1'
+			AND comments.comment_type = ''
+			AND posts.post_password = ''
+			AND posts.post_type = 'product'
+			ORDER BY comments.comment_date_gmt DESC
+			LIMIT 5
+		" );
+		$comments = $wpdb->get_results( "
+			SELECT posts.ID, posts.post_title, comments.comment_author, comments.comment_ID, SUBSTRING(comments.comment_content,1,100) AS comment_excerpt
+			{$query_from};
+		" );
 
 		if ( $comments ) {
 			echo '<ul>';
@@ -194,10 +270,11 @@ class WC_Admin_Dashboard {
 
 				$rating = intval( get_comment_meta( $comment->comment_ID, 'rating', true ) );
 
-				echo '<div class="star-rating" title="' . esc_attr( $rating ) . '">
-					<span style="width:' . ( $rating * 20 ) . '%">' . $rating . ' ' . __( 'out of 5', 'woocommerce' ) . '</span></div>';
+				/* translators: %s: rating */
+				echo '<div class="star-rating"><span style="width:' . ( $rating * 20 ) . '%">' . sprintf( __( '%s out of 5', 'woocommerce' ), $rating ) . '</span></div>';
 
-				echo '<h4 class="meta"><a href="' . get_permalink( $comment->ID ) . '#comment-' . absint( $comment->comment_ID ) .'">' . esc_html( apply_filters( 'woocommerce_admin_dashboard_recent_reviews', $comment->post_title, $comment ) ) . '</a> ' . __( 'reviewed by', 'woocommerce' ) . ' ' . esc_html( $comment->comment_author ) .'</h4>';
+				/* translators: %s: review author */
+				echo '<h4 class="meta"><a href="' . get_permalink( $comment->ID ) . '#comment-' . absint( $comment->comment_ID ) . '">' . esc_html( apply_filters( 'woocommerce_admin_dashboard_recent_reviews', $comment->post_title, $comment ) ) . '</a> ' . sprintf( __( 'reviewed by %s', 'woocommerce' ), esc_html( $comment->comment_author ) ) . '</h4>';
 				echo '<blockquote>' . wp_kses_data( $comment->comment_excerpt ) . ' [...]</blockquote></li>';
 
 			}
@@ -206,7 +283,6 @@ class WC_Admin_Dashboard {
 			echo '<p>' . __( 'There are no product reviews yet.', 'woocommerce' ) . '</p>';
 		}
 	}
-
 }
 
 endif;
diff --git a/includes/admin/class-wc-admin-duplicate-product.php b/includes/admin/class-wc-admin-duplicate-product.php
index 6c86e2cccd0..bfb029a0a9a 100644
--- a/includes/admin/class-wc-admin-duplicate-product.php
+++ b/includes/admin/class-wc-admin-duplicate-product.php
@@ -1,18 +1,18 @@
 <?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
 /**
  * Duplicate product functionality
  *
- * @author      WooThemes
+ * @author      WooCommerce
  * @category    Admin
  * @package     WooCommerce/Admin
- * @version     2.1.0
+ * @version     3.0.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
-}
-
-if ( ! class_exists( 'WC_Admin_Duplicate_Product' ) ) :
+if ( ! class_exists( 'WC_Admin_Duplicate_Product', false ) ) :
 
 /**
  * WC_Admin_Duplicate_Product Class.
@@ -25,7 +25,6 @@ class WC_Admin_Duplicate_Product {
 	public function __construct() {
 		add_action( 'admin_action_duplicate_product', array( $this, 'duplicate_product_action' ) );
 		add_filter( 'post_row_actions', array( $this, 'dupe_link' ), 10, 2 );
-		add_filter( 'page_row_actions', array( $this, 'dupe_link' ), 10, 2 );
 		add_action( 'post_submitbox_start', array( $this, 'dupe_button' ) );
 	}
 
@@ -40,12 +39,12 @@ class WC_Admin_Duplicate_Product {
 			return $actions;
 		}
 
-		if ( $post->post_type != 'product' ) {
+		if ( 'product' !== $post->post_type ) {
 			return $actions;
 		}
 
-		$actions['duplicate'] = '<a href="' . wp_nonce_url( admin_url( 'edit.php?post_type=product&action=duplicate_product&amp;post=' . $post->ID ), 'woocommerce-duplicate-product_' . $post->ID ) . '" title="' . esc_attr__( 'Make a duplicate from this product', 'woocommerce' )
-			. '" rel="permalink">' .  __( 'Duplicate', 'woocommerce' ) . '</a>';
+		$actions['duplicate'] = '<a href="' . wp_nonce_url( admin_url( 'edit.php?post_type=product&action=duplicate_product&amp;post=' . $post->ID ), 'woocommerce-duplicate-product_' . $post->ID ) . '" aria-label="' . esc_attr__( 'Make a duplicate from this product', 'woocommerce' )
+			. '" rel="permalink">' . __( 'Duplicate', 'woocommerce' ) . '</a>';
 
 		return $actions;
 	}
@@ -64,14 +63,14 @@ class WC_Admin_Duplicate_Product {
 			return;
 		}
 
-		if ( $post->post_type != 'product' ) {
+		if ( 'product' !== $post->post_type ) {
 			return;
 		}
 
 		if ( isset( $_GET['post'] ) ) {
-			$notifyUrl = wp_nonce_url( admin_url( "edit.php?post_type=product&action=duplicate_product&post=" . absint( $_GET['post'] ) ), 'woocommerce-duplicate-product_' . $_GET['post'] );
+			$notify_url = wp_nonce_url( admin_url( "edit.php?post_type=product&action=duplicate_product&post=" . absint( $_GET['post'] ) ), 'woocommerce-duplicate-product_' . $_GET['post'] );
 			?>
-			<div id="duplicate-action"><a class="submitduplicate duplication" href="<?php echo esc_url( $notifyUrl ); ?>"><?php _e( 'Copy to a new draft', 'woocommerce' ); ?></a></div>
+			<div id="duplicate-action"><a class="submitduplicate duplication" href="<?php echo esc_url( $notify_url ); ?>"><?php _e( 'Copy to a new draft', 'woocommerce' ); ?></a></div>
 			<?php
 		}
 	}
@@ -80,111 +79,98 @@ class WC_Admin_Duplicate_Product {
 	 * Duplicate a product action.
 	 */
 	public function duplicate_product_action() {
-
 		if ( empty( $_REQUEST['post'] ) ) {
 			wp_die( __( 'No product to duplicate has been supplied!', 'woocommerce' ) );
 		}
 
-		// Get the original page
-		$id = isset( $_REQUEST['post'] ) ? absint( $_REQUEST['post'] ) : '';
+		$product_id = isset( $_REQUEST['post'] ) ? absint( $_REQUEST['post'] ) : '';
 
-		check_admin_referer( 'woocommerce-duplicate-product_' . $id );
+		check_admin_referer( 'woocommerce-duplicate-product_' . $product_id );
 
-		$post = $this->get_product_to_duplicate( $id );
+		$product = wc_get_product( $product_id );
 
-		// Copy the page and insert it
-		if ( ! empty( $post ) ) {
-			$new_id = $this->duplicate_product( $post );
-
-			// If you have written a plugin which uses non-WP database tables to save
-			// information about a page you can hook this action to dupe that data.
-			do_action( 'woocommerce_duplicate_product', $new_id, $post );
-
-			// Redirect to the edit screen for the new draft page
-			wp_redirect( admin_url( 'post.php?action=edit&post=' . $new_id ) );
-			exit;
-		} else {
-			wp_die( __( 'Product creation failed, could not find original product:', 'woocommerce' ) . ' ' . $id );
+		if ( false === $product ) {
+			/* translators: %s: product id */
+			wp_die( sprintf( __( 'Product creation failed, could not find original product: %s', 'woocommerce' ), $product_id ) );
 		}
+
+		$duplicate = $this->product_duplicate( $product );
+
+		// Hook rename to match other woocommerce_product_* hooks, and to move away from depending on a response from the wp_posts table.
+		do_action( 'woocommerce_product_duplicate', $duplicate, $product );
+		wc_do_deprecated_action( 'woocommerce_duplicate_product', array( $duplicate->get_id(), $this->get_product_to_duplicate( $product_id ) ), '3.0', 'Use woocommerce_product_duplicate action instead.' );
+
+		// Redirect to the edit screen for the new draft page
+		wp_redirect( admin_url( 'post.php?action=edit&post=' . $duplicate->get_id() ) );
+		exit;
 	}
 
 	/**
 	 * Function to create the duplicate of the product.
 	 *
-	 * @param mixed $post
-	 * @param int $parent (default: 0)
-	 * @param string $post_status (default: '')
-	 * @return int
+	 * @param WC_Product $product
+	 * @return WC_Product
 	 */
-	public function duplicate_product( $post, $parent = 0, $post_status = '' ) {
-		global $wpdb;
+	public function product_duplicate( $product ) {
+		// Filter to allow us to unset/remove data we don't want to copy to the duplicate. @since 2.6
+		$meta_to_exclude = array_filter( apply_filters( 'woocommerce_duplicate_product_exclude_meta', array() ) );
 
-		$new_post_author    = wp_get_current_user();
-		$new_post_date      = current_time( 'mysql' );
-		$new_post_date_gmt  = get_gmt_from_date( $new_post_date );
+		$duplicate = clone $product;
+		$duplicate->set_id( 0 );
+		$duplicate->set_name( sprintf( __( '%s (Copy)', 'woocommerce' ), $duplicate->get_name() ) );
+		$duplicate->set_total_sales( 0 );
+		if ( '' !== $product->get_sku( 'edit' ) ) {
+			$duplicate->set_sku( wc_product_generate_unique_sku( 0, $product->get_sku( 'edit' ) ) );
+		}
+		$duplicate->set_status( 'draft' );
+		$duplicate->set_date_created( null );
+		$duplicate->set_slug( '' );
+		$duplicate->set_rating_counts( 0 );
+		$duplicate->set_average_rating( 0 );
+		$duplicate->set_review_count( 0 );
 
-		if ( $parent > 0 ) {
-			$post_parent        = $parent;
-			$post_status        = $post_status ? $post_status : 'publish';
-			$suffix             = '';
-		} else {
-			$post_parent        = $post->post_parent;
-			$post_status        = $post_status ? $post_status : 'draft';
-			$suffix             = ' ' . __( '(Copy)', 'woocommerce' );
+		foreach ( $meta_to_exclude as $meta_key ) {
+			$duplicate->delete_meta_data( $meta_key );
 		}
 
-		// Insert the new template in the post table
-		$wpdb->insert(
-			$wpdb->posts,
-			array(
-				'post_author'               => $new_post_author->ID,
-				'post_date'                 => $new_post_date,
-				'post_date_gmt'             => $new_post_date_gmt,
-				'post_content'              => $post->post_content,
-				'post_content_filtered'     => $post->post_content_filtered,
-				'post_title'                => $post->post_title . $suffix,
-				'post_excerpt'              => $post->post_excerpt,
-				'post_status'               => $post_status,
-				'post_type'                 => $post->post_type,
-				'comment_status'            => $post->comment_status,
-				'ping_status'               => $post->ping_status,
-				'post_password'             => $post->post_password,
-				'to_ping'                   => $post->to_ping,
-				'pinged'                    => $post->pinged,
-				'post_modified'             => $new_post_date,
-				'post_modified_gmt'         => $new_post_date_gmt,
-				'post_parent'               => $post_parent,
-				'menu_order'                => $post->menu_order,
-				'post_mime_type'            => $post->post_mime_type
-			)
-		);
+		// This action can be used to modify the object further before it is created - it will be passed by reference. @since 3.0
+		do_action( 'woocommerce_product_duplicate_before_save', $duplicate, $product );
 
-		$new_post_id = $wpdb->insert_id;
+		// Save parent product.
+		$duplicate->save();
 
-		// Copy the taxonomies
-		$this->duplicate_post_taxonomies( $post->ID, $new_post_id, $post->post_type );
+		// Duplicate children of a variable product.
+		if ( ! apply_filters( 'woocommerce_duplicate_product_exclude_children', false ) && $product->is_type( 'variable' ) ) {
+			foreach ( $product->get_children() as $child_id ) {
+				$child           = wc_get_product( $child_id );
+				$child_duplicate = clone $child;
+				$child_duplicate->set_parent_id( $duplicate->get_id() );
+				$child_duplicate->set_id( 0 );
 
-		// Copy the meta information
-		$this->duplicate_post_meta( $post->ID, $new_post_id );
+				if ( '' !== $child->get_sku( 'edit' ) ) {
+					$child_duplicate->set_sku( wc_product_generate_unique_sku( 0, $child->get_sku( 'edit' ) ) );
+				}
 
-		// Copy the children (variations)
-		$exclude = apply_filters( 'woocommerce_duplicate_product_exclude_children', false );
+				foreach ( $meta_to_exclude as $meta_key ) {
+					$child_duplicate->delete_meta_data( $meta_key );
+				}
 
-		if ( ! $exclude && ( $children_products = get_children( 'post_parent=' . $post->ID . '&post_type=product_variation' ) ) ) {
-			foreach ( $children_products as $child ) {
-				$this->duplicate_product( $this->get_product_to_duplicate( $child->ID ), $new_post_id, $child->post_status );
+				// This action can be used to modify the object further before it is created - it will be passed by reference. @since 3.0
+				do_action( 'woocommerce_product_duplicate_before_save', $child_duplicate, $child );
+
+				$child_duplicate->save();
 			}
 		}
 
-		return $new_post_id;
+		return $duplicate;
 	}
 
 	/**
 	 * Get a product from the database to duplicate.
 	 *
+	 * @deprecated 3.0.0
 	 * @param mixed $id
 	 * @return WP_Post|bool
-	 * @todo Returning false? Need to check for it in...
 	 * @see duplicate_product
 	 */
 	private function get_product_to_duplicate( $id ) {
@@ -196,66 +182,14 @@ class WC_Admin_Duplicate_Product {
 			return false;
 		}
 
-		$post = $wpdb->get_results( "SELECT * FROM $wpdb->posts WHERE ID=$id" );
+		$post = $wpdb->get_row( $wpdb->prepare( "SELECT {$wpdb->posts}.* FROM {$wpdb->posts} WHERE ID = %d", $id ) );
 
-		if ( isset( $post->post_type ) && $post->post_type == "revision" ) {
+		if ( isset( $post->post_type ) && 'revision' === $post->post_type ) {
 			$id   = $post->post_parent;
-			$post = $wpdb->get_results( "SELECT * FROM $wpdb->posts WHERE ID=$id" );
+			$post = $wpdb->get_row( $wpdb->prepare( "SELECT {$wpdb->posts}.* FROM {$wpdb->posts} WHERE ID = %d", $id ) );
 		}
 
-		return $post[0];
-	}
-
-	/**
-	 * Copy the taxonomies of a post to another post.
-	 *
-	 * @param mixed $id
-	 * @param mixed $new_id
-	 * @param mixed $post_type
-	 */
-	private function duplicate_post_taxonomies( $id, $new_id, $post_type ) {
-		$exclude    = array_filter( apply_filters( 'woocommerce_duplicate_product_exclude_taxonomies', array() ) );
-		$taxonomies = array_diff( get_object_taxonomies( $post_type ), $exclude );
-
-		foreach ( $taxonomies as $taxonomy ) {
-			$post_terms       = wp_get_object_terms( $id, $taxonomy );
-			$post_terms_count = sizeof( $post_terms );
-
-			for ( $i = 0; $i < $post_terms_count; $i++ ) {
-				wp_set_object_terms( $new_id, $post_terms[ $i ]->slug, $taxonomy, true );
-			}
-		}
-	}
-
-	/**
-	 * Copy the meta information of a post to another post.
-	 *
-	 * @param mixed $id
-	 * @param mixed $new_id
-	 */
-	private function duplicate_post_meta( $id, $new_id ) {
-		global $wpdb;
-
-		$sql     = $wpdb->prepare( "SELECT meta_key, meta_value FROM $wpdb->postmeta WHERE post_id = %d", absint( $id ) );
-		$exclude = array_map( 'esc_sql', array_filter( apply_filters( 'woocommerce_duplicate_product_exclude_meta', array( 'total_sales' ) ) ) );
-
-		if ( sizeof( $exclude ) ) {
-			$sql .= " AND meta_key NOT IN ( '" . implode( "','", $exclude ) . "' )";
-		}
-
-		$post_meta = $wpdb->get_results( $sql );
-
-		if ( sizeof( $post_meta ) ) {
-			$sql_query_sel = array();
-			$sql_query     = "INSERT INTO $wpdb->postmeta (post_id, meta_key, meta_value) ";
-
-			foreach ( $post_meta as $post_meta_row ) {
-				$sql_query_sel[] = $wpdb->prepare( "SELECT %d, %s, %s", $new_id, $post_meta_row->meta_key, $post_meta_row->meta_value );
-			}
-
-			$sql_query .= implode( " UNION ALL ", $sql_query_sel );
-			$wpdb->query( $sql_query );
-		}
+		return $post;
 	}
 }
 
diff --git a/includes/admin/class-wc-admin-help.php b/includes/admin/class-wc-admin-help.php
index 4042c0730b9..bbae7ef2621 100644
--- a/includes/admin/class-wc-admin-help.php
+++ b/includes/admin/class-wc-admin-help.php
@@ -12,7 +12,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
 
-if ( ! class_exists( 'WC_Admin_Help' ) ) :
+if ( ! class_exists( 'WC_Admin_Help', false ) ) :
 
 /**
  * WC_Admin_Help Class.
@@ -23,7 +23,7 @@ class WC_Admin_Help {
 	 * Hook in tabs.
 	 */
 	public function __construct() {
-		add_action( "current_screen", array( $this, 'add_tabs' ), 50 );
+		add_action( 'current_screen', array( $this, 'add_tabs' ), 50 );
 	}
 
 	/**
@@ -32,111 +32,135 @@ class WC_Admin_Help {
 	public function add_tabs() {
 		$screen = get_current_screen();
 
-		if ( ! in_array( $screen->id, wc_get_screen_ids() ) ) {
+		if ( ! $screen || ! in_array( $screen->id, wc_get_screen_ids() ) ) {
 			return;
 		}
 
 		$video_map = array(
 			'wc-settings' => array(
 				'title' => __( 'General Settings', 'woocommerce' ),
-				'url'   => '//fast.wistia.net/embed/iframe/mz2l10u5f6?videoFoam=true'
+				'url'   => '//fast.wistia.net/embed/iframe/mz2l10u5f6.jsonp?',
 			),
 			'wc-settings-general' => array(
 				'title' => __( 'General Settings', 'woocommerce' ),
-				'url'   => '//fast.wistia.net/embed/iframe/mz2l10u5f6?videoFoam=true'
+				'url'   => '//fast.wistia.net/embed/iframe/mz2l10u5f6.jsonp?',
 			),
 			'wc-settings-products' => array(
 				'title' => __( 'Product Settings', 'woocommerce' ),
-				'url'   => '//fast.wistia.net/embed/iframe/lolkan4fxf?videoFoam=true'
+				'url'   => '//fast.wistia.net/embed/iframe/lolkan4fxf.jsonp?',
 			),
 			'wc-settings-tax' => array(
 				'title' => __( 'Tax Settings', 'woocommerce' ),
-				'url'   => '//fast.wistia.net/embed/iframe/qp1v19dwrh?videoFoam=true'
+				'url'   => '//fast.wistia.net/embed/iframe/qp1v19dwrh.jsonp?',
+			),
+			'wc-settings-tax-standard' => array(
+				'title' => __( 'Tax Rate Example', 'woocommerce' ),
+				'url'   => '//fast.wistia.net/embed/iframe/2p903vptwa.jsonp?',
+			),
+			'wc-settings-tax-reduced-rate' => array(
+				'title' => __( 'Tax Rate Example', 'woocommerce' ),
+				'url'   => '//fast.wistia.net/embed/iframe/2p903vptwa.jsonp?',
+			),
+			'wc-settings-tax-zero-rate' => array(
+				'title' => __( 'Tax Rate Example', 'woocommerce' ),
+				'url'   => '//fast.wistia.net/embed/iframe/2p903vptwa.jsonp?',
+			),
+			'wc-settings-shipping' => array(
+				'title' => __( 'Shipping Zones', 'woocommerce' ),
+				'url'   => '//fast.wistia.net/embed/iframe/95yiocro6p.jsonp?',
+			),
+			'wc-settings-shipping-options' => array(
+				'title' => __( 'Shipping Options', 'woocommerce' ),
+				'url'   => '//fast.wistia.net/embed/iframe/9c9008dxnr.jsonp?',
+			),
+			'wc-settings-shipping-classes' => array(
+				'title' => __( 'Shipping Classes', 'woocommerce' ),
+				'url'   => '//fast.wistia.net/embed/iframe/tpqg17aq99.jsonp?',
 			),
 			'wc-settings-checkout' => array(
 				'title' => __( 'Checkout Settings', 'woocommerce' ),
-				'url'   => '//fast.wistia.net/embed/iframe/65yjv96z51?videoFoam=true'
+				'url'   => '//fast.wistia.net/embed/iframe/65yjv96z51.jsonp?',
+			),
+			'wc-settings-checkout-bacs' => array(
+				'title' => __( 'Bank Transfer (BACS) Payment Method', 'woocommerce' ),
+				'url'   => '//fast.wistia.net/embed/iframe/dh4piy3sek.jsonp?',
+			),
+			'wc-settings-checkout-cheque' => array(
+				'title' => __( 'Check Payment Method', 'woocommerce' ),
+				'url'   => '//fast.wistia.net/embed/iframe/u2m2kcakea.jsonp?',
+			),
+			'wc-settings-checkout-cod' => array(
+				'title' => __( 'Cash on Delivery (COD) Payment Method', 'woocommerce' ),
+				'url'   => '//fast.wistia.net/embed/iframe/8hyli8wu5f.jsonp?',
+			),
+			'wc-settings-checkout-paypal' => array(
+				'title' => __( 'PayPal Standard Method', 'woocommerce' ),
+				'url'   => '//fast.wistia.net/embed/iframe/rbl7e7l4k2.jsonp?',
+			),
+			'wc-settings-checkout-paypalbraintree_cards' => array(
+				'title' => __( 'PayPal by Braintree Payment Method', 'woocommerce' ),
+				'url'   => '//fast.wistia.net/embed/iframe/oyksirgn40.jsonp?',
+			),
+			'wc-settings-checkout-stripe' => array(
+				'title' => __( 'Stripe Payment Method', 'woocommerce' ),
+				'url'   => '//fast.wistia.net/embed/iframe/mf975hx5de.jsonp?',
 			),
 			'wc-settings-account' => array(
 				'title' => __( 'Account Settings', 'woocommerce' ),
-				'url'   => '//fast.wistia.net/embed/iframe/35mazq7il2?videoFoam=true'
+				'url'   => '//fast.wistia.net/embed/iframe/35mazq7il2.jsonp?',
 			),
 			'wc-settings-email' => array(
 				'title' => __( 'Email Settings', 'woocommerce' ),
-				'url'   => '//fast.wistia.net/embed/iframe/svcaftq4xv?videoFoam=true'
+				'url'   => '//fast.wistia.net/embed/iframe/svcaftq4xv.jsonp?',
 			),
 			'wc-settings-api' => array(
-				'title' => __( 'Webhook Settings', 'woocommerce' ),
-				'url'   => '//fast.wistia.net/embed/iframe/1q0ny74vvq?videoFoam=true'
+				'title' => __( 'API Settings', 'woocommerce' ),
+				'url'   => '//fast.wistia.net/embed/iframe/1q0ny74vvq.jsonp?',
 			),
-			'wc-settings-checkout-wc_gateway_paypal' => array(
-				'title' => __( 'PayPal Standard', 'woocommerce' ),
-				'url'   => '//fast.wistia.net/embed/iframe/rbl7e7l4k2?videoFoam=true'
-			),
-			'wc-settings-checkout-wc_gateway_simplify_commerce' => array(
-				'title' => __( 'Simplify Commerce', 'woocommerce' ),
-				'url'   => '//fast.wistia.net/embed/iframe/jdfzjiiw61?videoFoam=true'
-			),
-			'wc-settings-shipping' => array(
-				'title' => __( 'Shipping Settings', 'woocommerce' ),
-				'url'   => '//fast.wistia.net/embed/iframe/9c9008dxnr?videoFoam=true'
-			),
-			'wc-settings-shipping-wc_shipping_free_shipping' => array(
-				'title' => __( 'Free Shipping', 'woocommerce' ),
-				'url'   => '//fast.wistia.net/embed/iframe/po191fmvy9?videoFoam=true'
-			),
-			'wc-settings-shipping-wc_shipping_local_delivery' => array(
-				'title' => __( 'Local Delivery', 'woocommerce' ),
-				'url'   => '//fast.wistia.net/embed/iframe/5qjepx9ozj?videoFoam=true'
-			),
-			'wc-settings-shipping-wc_shipping_local_pickup' => array(
-				'title' => __( 'Local Pickup', 'woocommerce' ),
-				'url'   => '//fast.wistia.net/embed/iframe/pe95ph0apb?videoFoam=true'
-			),
-			'edit-product_cat' => array(
-				'title' => __( 'Product Categories, Tags, Shipping Classes, &amp; Attributes', 'woocommerce' ),
-				'url'   => '//fast.wistia.net/embed/iframe/f0j5gzqigg?videoFoam=true'
-			),
-			'edit-product_tag' => array(
-				'title' => __( 'Product Categories, Tags, Shipping Classes, &amp; Attributes', 'woocommerce' ),
-				'url'   => '//fast.wistia.net/embed/iframe/f0j5gzqigg?videoFoam=true'
-			),
-			'edit-product_shipping_class' => array(
-				'title' => __( 'Product Categories, Tags, Shipping Classes, &amp; Attributes', 'woocommerce' ),
-				'url'   => '//fast.wistia.net/embed/iframe/f0j5gzqigg?videoFoam=true'
-			),
-			'product_attributes' => array(
-				'title' => __( 'Product Categories, Tags, Shipping Classes, &amp; Attributes', 'woocommerce' ),
-				'url'   => '//fast.wistia.net/embed/iframe/f0j5gzqigg?videoFoam=true'
+			'wc-settings-api' => array(
+				'title' => __( 'API Settings', 'woocommerce' ),
+				'url'   => '//fast.wistia.net/embed/iframe/1q0ny74vvq.jsonp?',
 			),
 			'product' => array(
-				'title' => __( 'Simple Products', 'woocommerce' ),
-				'url'   => '//fast.wistia.net/embed/iframe/ziyjmd4kut?videoFoam=true'
+				'title' => __( 'Creating Products', 'woocommerce' ),
+				'url'   => '//fast.wistia.net/embed/iframe/fw0477t6wr.jsonp?',
+			),
+			'edit-product_cat' => array(
+				'title' => __( 'Product Categories', 'woocommerce' ),
+				'url'   => '//fast.wistia.net/embed/iframe/f0j5gzqigg.jsonp?',
+			),
+			'edit-product_tag' => array(
+				'title' => __( 'Product Tags', 'woocommerce' ),
+				'url'   => '//fast.wistia.net/embed/iframe/f0j5gzqigg.jsonp?',
+			),
+			'product_attributes' => array(
+				'title' => __( 'Product Attributes', 'woocommerce' ),
+				'url'   => '//fast.wistia.net/embed/iframe/f0j5gzqigg.jsonp?',
 			),
 			'wc-status' => array(
 				'title' => __( 'System Status', 'woocommerce' ),
-				'url'   => '//fast.wistia.net/embed/iframe/xdn733nnhi?videoFoam=true'
+				'url'   => '//fast.wistia.net/embed/iframe/xdn733nnhi.jsonp?',
 			),
 			'wc-reports' => array(
 				'title' => __( 'Reports', 'woocommerce' ),
-				'url'   => '//fast.wistia.net/embed/iframe/6aasex0w99?videoFoam=true'
+				'url'   => '//fast.wistia.net/embed/iframe/6aasex0w99.jsonp?',
 			),
 			'edit-shop_coupon' => array(
 				'title' => __( 'Coupons', 'woocommerce' ),
-				'url'   => '//fast.wistia.net/embed/iframe/gupd4h8sit?videoFoam=true'
+				'url'   => '//fast.wistia.net/embed/iframe/gupd4h8sit.jsonp?',
 			),
 			'shop_coupon' => array(
 				'title' => __( 'Coupons', 'woocommerce' ),
-				'url'   => '//fast.wistia.net/embed/iframe/gupd4h8sit?videoFoam=true'
+				'url'   => '//fast.wistia.net/embed/iframe/gupd4h8sit.jsonp?',
 			),
 			'edit-shop_order' => array(
 				'title' => __( 'Managing Orders', 'woocommerce' ),
-				'url'   => '//fast.wistia.net/embed/iframe/n8n0sa8hee?videoFoam=true'
+				'url'   => '//fast.wistia.net/embed/iframe/n8n0sa8hee.jsonp?',
 			),
 			'shop_order' => array(
 				'title' => __( 'Managing Orders', 'woocommerce' ),
-				'url'   => '//fast.wistia.net/embed/iframe/n8n0sa8hee?videoFoam=true'
-			)
+				'url'   => '//fast.wistia.net/embed/iframe/n8n0sa8hee.jsonp?',
+			),
 		);
 
 		$page      = empty( $_GET['page'] ) ? '' : sanitize_title( $_GET['page'] );
@@ -156,41 +180,34 @@ class WC_Admin_Help {
 
 		if ( isset( $video_map[ $video_key ] ) ) {
 			$screen->add_help_tab( array(
-				'id'        => 'woocommerce_101_tab',
-				'title'     => __( 'WooCommerce 101', 'woocommerce' ),
+				'id'        => 'woocommerce_guided_tour_tab',
+				'title'     => __( 'Guided Tour', 'woocommerce' ),
 				'content'   =>
-					'<h2><a href="http://docs.woothemes.com/document/woocommerce-101-video-series/?utm_source=WooCommercePlugin&utm_medium=Help&utm_content=Videos&utm_campaign=Onboarding">' . __( 'WooCommerce 101', 'woocommerce' ) . '</a> &ndash; ' . esc_html( $video_map[ $video_key ]['title'] ) . '</h2>' .
-					'<iframe src="' . esc_url( $video_map[ $video_key ]['url'] ) . '" allowtransparency="true" frameborder="0" scrolling="no" class="wistia_embed" name="wistia_embed" allowfullscreen mozallowfullscreen webkitallowfullscreen oallowfullscreen msallowfullscreen width="480" height="298"></iframe>'
+					'<h2><a href="https://docs.woocommerce.com/document/woocommerce-guided-tour-videos/?utm_source=helptab&utm_medium=product&utm_content=videos&utm_campaign=woocommerceplugin">' . __( 'Guided Tour', 'woocommerce' ) . '</a> &ndash; ' . esc_html( $video_map[ $video_key ]['title'] ) . '</h2>' .
+					'<div class="wistia_responsive_padding" style="padding:56.25% 0 0 0;position:relative;">
+					<div class="wistia_responsive_wrapper" style="height:100%;left:0;position:absolute;top:0;width:100%;">
+					<iframe src="' . esc_url( $video_map[ $video_key ]['url'] ) . 'seo=false&videoFoam=true" title="Wistia video player" allowtransparency="true" frameborder="0" scrolling="no" class="wistia_embed" name="wistia_embed" allowfullscreen mozallowfullscreen webkitallowfullscreen oallowfullscreen msallowfullscreen width="100%" height="100%"></iframe>
+					</div></div>
+					<script src="//fast.wistia.net/assets/external/E-v1.js" async></script>',
 			) );
 		}
 
-		$screen->add_help_tab( array(
-			'id'        => 'woocommerce_docs_tab',
-			'title'     => __( 'Documentation', 'woocommerce' ),
-			'content'   =>
-				'<h2>' . __( 'Documentation', 'woocommerce' ) . '</h2>' .
-				'<p>' . __( 'Should you need help understanding, using, or extending WooCommerce, please read our documentation. You will find all kinds of resources including snippets, tutorials and much more.' , 'woocommerce' ) . '</p>' .
-				'<p><a href="' . 'http://docs.woothemes.com/documentation/plugins/woocommerce/?utm_source=WooCommercePlugin&utm_medium=Help&utm_content=Docs&utm_campaign=Onboarding' . '" class="button button-primary">' . __( 'WooCommerce Documentation', 'woocommerce' ) . '</a> <a href="' . 'http://docs.woothemes.com/wc-apidocs/?utm_source=WooCommercePlugin&utm_medium=Help&utm_content=APIDocs&utm_campaign=Onboarding' . '" class="button">' . __( 'Developer API Docs', 'woocommerce' ) . '</a></p>'
-
-		) );
-
 		$screen->add_help_tab( array(
 			'id'        => 'woocommerce_support_tab',
-			'title'     => __( 'Support', 'woocommerce' ),
+			'title'     => __( 'Help &amp; Support', 'woocommerce' ),
 			'content'   =>
-				'<h2>' . __( 'Support', 'woocommerce' ) . '</h2>' .
-				'<p>' . sprintf( __( 'After %sreading the documentation%s, for further assistance you can use the %scommunity forums%s on WordPress.org to talk with other users. If however you are a WooThemes customer, or need help with premium add-ons sold by WooThemes, please %suse our helpdesk%s.', 'woocommerce' ), '<a href="http://docs.woothemes.com/documentation/plugins/woocommerce/?utm_source=WooCommercePlugin&utm_medium=Help&utm_content=Docs&utm_campaign=Onboarding">', '</a>', '<a href="https://wordpress.org/support/plugin/woocommerce">', '</a>', '<a href="http://www.woothemes.com/my-account/tickets/?utm_source=WooCommercePlugin&utm_medium=Help&utm_content=Tickets&utm_campaign=Onboarding">', '</a>' ) . '</p>' .
+				'<h2>' . __( 'Help &amp; Support', 'woocommerce' ) . '</h2>' .
+				'<p>' . sprintf(
+					__( 'Should you need help understanding, using, or extending WooCommerce, <a href="%s">please read our documentation</a>. You will find all kinds of resources including snippets, tutorials and much more.' , 'woocommerce' ),
+					'https://docs.woocommerce.com/documentation/plugins/woocommerce/?utm_source=helptab&utm_medium=product&utm_content=docs&utm_campaign=woocommerceplugin'
+				) . '</p>' .
+				'<p>' . sprintf(
+					__( 'For further assistance with WooCommerce core you can use the <a href="%1$s">community forum</a>. If you need help with premium extensions sold by WooCommerce, please <a href="%2$s">use our helpdesk</a>.', 'woocommerce' ),
+					'https://wordpress.org/support/plugin/woocommerce',
+					'https://woocommerce.com/my-account/tickets/?utm_source=helptab&utm_medium=product&utm_content=tickets&utm_campaign=woocommerceplugin'
+				) . '</p>' .
 				'<p>' . __( 'Before asking for help we recommend checking the system status page to identify any problems with your configuration.', 'woocommerce' ) . '</p>' .
-				'<p><a href="' . admin_url( 'admin.php?page=wc-status' ) . '" class="button button-primary">' . __( 'System Status', 'woocommerce' ) . '</a> <a href="' . 'https://wordpress.org/support/plugin/woocommerce' . '" class="button">' . __( 'WordPress.org Forums', 'woocommerce' ) . '</a> <a href="' . 'http://www.woothemes.com/my-account/tickets/?utm_source=WooCommercePlugin&utm_medium=Help&utm_content=Tickets&utm_campaign=Onboarding' . '" class="button">' . __( 'WooThemes Customer Support', 'woocommerce' ) . '</a></p>'
-		) );
-
-		$screen->add_help_tab( array(
-			'id'        => 'woocommerce_education_tab',
-			'title'     => __( 'Education', 'woocommerce' ),
-			'content'   =>
-				'<h2>' . __( 'Education', 'woocommerce' ) . '</h2>' .
-				'<p>' . __( 'If you would like to learn about using WooCommerce from an expert, consider following a WooCommerce course ran by one of our educational partners.', 'woocommerce' ) . '</p>' .
-				'<p><a href="' . 'http://www.woothemes.com/educational-partners/?utm_source=WooCommercePlugin&utm_medium=Help&utm_content=EduPartners&utm_campaign=Onboarding' . '" class="button button-primary">' . __( 'View Education Partners', 'woocommerce' ) . '</a></p>'
+				'<p><a href="' . admin_url( 'admin.php?page=wc-status' ) . '" class="button button-primary">' . __( 'System status', 'woocommerce' ) . '</a> <a href="' . 'https://wordpress.org/support/plugin/woocommerce' . '" class="button">' . __( 'Community forum', 'woocommerce' ) . '</a> <a href="' . 'https://woocommerce.com/my-account/tickets/?utm_source=helptab&utm_medium=product&utm_content=tickets&utm_campaign=woocommerceplugin' . '" class="button">' . __( 'WooCommerce helpdesk', 'woocommerce' ) . '</a></p>',
 		) );
 
 		$screen->add_help_tab( array(
@@ -198,31 +215,39 @@ class WC_Admin_Help {
 			'title'     => __( 'Found a bug?', 'woocommerce' ),
 			'content'   =>
 				'<h2>' . __( 'Found a bug?', 'woocommerce' ) . '</h2>' .
-				'<p>' . sprintf( __( 'If you find a bug within WooCommerce core you can create a ticket via <a href="%s">Github issues</a>. Ensure you read the <a href="%s">contribution guide</a> prior to submitting your report. To help us solve your issue, please be as descriptive as possible and include your <a href="%s">system status report</a>.', 'woocommerce' ), 'https://github.com/woothemes/woocommerce/issues?state=open', 'https://github.com/woothemes/woocommerce/blob/master/CONTRIBUTING.md', admin_url( 'admin.php?page=wc-status' ) ) . '</p>' .
-				'<p><a href="' . 'https://github.com/woothemes/woocommerce/issues?state=open' . '" class="button button-primary">' . __( 'Report a bug', 'woocommerce' ) . '</a> <a href="' . admin_url( 'admin.php?page=wc-status' ) . '" class="button">' . __( 'System Status', 'woocommerce' ) . '</a></p>'
+				'<p>' . sprintf( __( 'If you find a bug within WooCommerce core you can create a ticket via <a href="%1$s">Github issues</a>. Ensure you read the <a href="%2$s">contribution guide</a> prior to submitting your report. To help us solve your issue, please be as descriptive as possible and include your <a href="%3$s">system status report</a>.', 'woocommerce' ), 'https://github.com/woocommerce/woocommerce/issues?state=open', 'https://github.com/woocommerce/woocommerce/blob/master/.github/CONTRIBUTING.md', admin_url( 'admin.php?page=wc-status' ) ) . '</p>' .
+				'<p><a href="' . 'https://github.com/woocommerce/woocommerce/issues?state=open' . '" class="button button-primary">' . __( 'Report a bug', 'woocommerce' ) . '</a> <a href="' . admin_url( 'admin.php?page=wc-status' ) . '" class="button">' . __( 'System status', 'woocommerce' ) . '</a></p>',
 
 		) );
 
 		$screen->add_help_tab( array(
-			'id'        => 'woocommerce_onboard_tab',
-			'title'     => __( 'Setup Wizard', 'woocommerce' ),
+			'id'        => 'woocommerce_education_tab',
+			'title'     => __( 'Education', 'woocommerce' ),
 			'content'   =>
-				'<h2>' . __( 'Setup Wizard', 'woocommerce' ) . '</h2>' .
+				'<h2>' . __( 'Education', 'woocommerce' ) . '</h2>' .
+				'<p>' . __( 'If you would like to learn about using WooCommerce from an expert, consider following a WooCommerce course offered by one of our educational partners.', 'woocommerce' ) . '</p>' .
+				'<p><a href="' . 'https://woocommerce.com/educational-partners/?utm_source=helptab&utm_medium=product&utm_content=edupartners&utm_campaign=woocommerceplugin' . '" class="button button-primary">' . __( 'View education partners', 'woocommerce' ) . '</a></p>',
+		) );
+
+		$screen->add_help_tab( array(
+			'id'        => 'woocommerce_onboard_tab',
+			'title'     => __( 'Setup wizard', 'woocommerce' ),
+			'content'   =>
+				'<h2>' . __( 'Setup wizard', 'woocommerce' ) . '</h2>' .
 				'<p>' . __( 'If you need to access the setup wizard again, please click on the button below.', 'woocommerce' ) . '</p>' .
-				'<p><a href="' . admin_url( 'index.php?page=wc-setup' ) . '" class="button button-primary">' . __( 'Setup Wizard', 'woocommerce' ) . '</a></p>'
+				'<p><a href="' . admin_url( 'index.php?page=wc-setup' ) . '" class="button button-primary">' . __( 'Setup wizard', 'woocommerce' ) . '</a></p>',
 
 		) );
 
 		$screen->set_help_sidebar(
 			'<p><strong>' . __( 'For more information:', 'woocommerce' ) . '</strong></p>' .
-			'<p><a href="' . 'http://www.woothemes.com/woocommerce/?utm_source=WooCommercePlugin&utm_medium=Help&utm_content=WooCommerceProductPage&utm_campaign=Onboarding' . '" target="_blank">' . __( 'About WooCommerce', 'woocommerce' ) . '</a></p>' .
-			'<p><a href="' . 'http://wordpress.org/extend/plugins/woocommerce/' . '" target="_blank">' . __( 'WordPress.org Project', 'woocommerce' ) . '</a></p>' .
-			'<p><a href="' . 'https://github.com/woothemes/woocommerce' . '" target="_blank">' . __( 'Github Project', 'woocommerce' ) . '</a></p>' .
-			'<p><a href="' . 'http://www.woothemes.com/product-category/themes/woocommerce/?utm_source=WooCommercePlugin&utm_medium=Help&utm_content=WCThemes&utm_campaign=Onboarding' . '" target="_blank">' . __( 'Official Themes', 'woocommerce' ) . '</a></p>' .
-			'<p><a href="' . 'http://www.woothemes.com/product-category/woocommerce-extensions/?utm_source=WooCommercePlugin&utm_medium=Help&utm_content=WCExtensions&utm_campaign=Onboarding' . '" target="_blank">' . __( 'Official Extensions', 'woocommerce' ) . '</a></p>'
+			'<p><a href="' . 'https://woocommerce.com/?utm_source=helptab&utm_medium=product&utm_content=about&utm_campaign=woocommerceplugin' . '" target="_blank">' . __( 'About WooCommerce', 'woocommerce' ) . '</a></p>' .
+			'<p><a href="' . 'https://wordpress.org/plugins/woocommerce/' . '" target="_blank">' . __( 'WordPress.org project', 'woocommerce' ) . '</a></p>' .
+			'<p><a href="' . 'https://github.com/woocommerce/woocommerce' . '" target="_blank">' . __( 'Github project', 'woocommerce' ) . '</a></p>' .
+			'<p><a href="' . 'https://woocommerce.com/product-category/themes/woocommerce/?utm_source=helptab&utm_medium=product&utm_content=wcthemes&utm_campaign=woocommerceplugin' . '" target="_blank">' . __( 'Official themes', 'woocommerce' ) . '</a></p>' .
+			'<p><a href="' . 'https://woocommerce.com/product-category/woocommerce-extensions/?utm_source=helptab&utm_medium=product&utm_content=wcextensions&utm_campaign=woocommerceplugin' . '" target="_blank">' . __( 'Official extensions', 'woocommerce' ) . '</a></p>'
 		);
 	}
-
 }
 
 endif;
diff --git a/includes/admin/class-wc-admin-importers.php b/includes/admin/class-wc-admin-importers.php
index 6920abb0d99..0ed3c2fd9ed 100644
--- a/includes/admin/class-wc-admin-importers.php
+++ b/includes/admin/class-wc-admin-importers.php
@@ -12,7 +12,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
-if ( ! class_exists( 'WC_Admin_Importers' ) ) :
+if ( ! class_exists( 'WC_Admin_Importers', false ) ) :
 
 /**
  * WC_Admin_Importers Class.
@@ -31,7 +31,7 @@ class WC_Admin_Importers {
 	 * Add menu items.
 	 */
 	public function register_importers() {
-		register_importer( 'woocommerce_tax_rate_csv', __( 'WooCommerce Tax Rates (CSV)', 'woocommerce' ), __( 'Import <strong>tax rates</strong> to your store via a csv file.', 'woocommerce'), array( $this, 'tax_rates_importer' ) );
+		register_importer( 'woocommerce_tax_rate_csv', __( 'WooCommerce tax rates (CSV)', 'woocommerce' ), __( 'Import <strong>tax rates</strong> to your store via a csv file.', 'woocommerce' ), array( $this, 'tax_rates_importer' ) );
 	}
 
 	/**
@@ -50,7 +50,7 @@ class WC_Admin_Importers {
 		}
 
 		// includes
-		require 'importers/class-wc-tax-rate-importer.php';
+		require( dirname( __FILE__ ) . '/importers/class-wc-tax-rate-importer.php' );
 
 		// Dispatch
 		$importer = new WC_Tax_Rate_Importer();
@@ -94,7 +94,7 @@ class WC_Admin_Importers {
 												'attribute_name'    => $attribute_name,
 												'attribute_type'    => 'select',
 												'attribute_orderby' => 'menu_order',
-												'attribute_public'  => 0
+												'attribute_public'  => 0,
 											);
 											$wpdb->insert( $wpdb->prefix . 'woocommerce_attribute_taxonomies', $attribute );
 											delete_transient( 'wc_attribute_taxonomies' );
diff --git a/includes/admin/class-wc-admin-log-table-list.php b/includes/admin/class-wc-admin-log-table-list.php
new file mode 100644
index 00000000000..1016705a8ce
--- /dev/null
+++ b/includes/admin/class-wc-admin-log-table-list.php
@@ -0,0 +1,355 @@
+<?php
+/**
+ * WooCommerce Log Table List
+ *
+ * @author   WooThemes
+ * @category Admin
+ * @package  WooCommerce/Admin
+ * @version  1.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+if ( ! class_exists( 'WP_List_Table' ) ) {
+	require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
+}
+
+class WC_Admin_Log_Table_List extends WP_List_Table {
+
+	/**
+	 * Initialize the log table list.
+	 */
+	public function __construct() {
+		parent::__construct( array(
+			'singular' => 'log',
+			'plural'   => 'logs',
+			'ajax'     => false,
+		) );
+	}
+
+	/**
+	 * Display level dropdown
+	 *
+	 * @global wpdb $wpdb
+	 */
+	public function level_dropdown() {
+
+		$levels = array(
+			array( 'value' => WC_Log_Levels::EMERGENCY, 'label' => __( 'Emergency', 'woocommerce' ) ),
+			array( 'value' => WC_Log_Levels::ALERT,     'label' => __( 'Alert',     'woocommerce' ) ),
+			array( 'value' => WC_Log_Levels::CRITICAL,  'label' => __( 'Critical',  'woocommerce' ) ),
+			array( 'value' => WC_Log_Levels::ERROR,     'label' => __( 'Error',     'woocommerce' ) ),
+			array( 'value' => WC_Log_Levels::WARNING,   'label' => __( 'Warning',   'woocommerce' ) ),
+			array( 'value' => WC_Log_Levels::NOTICE,    'label' => __( 'Notice',    'woocommerce' ) ),
+			array( 'value' => WC_Log_Levels::INFO,      'label' => __( 'Info',      'woocommerce' ) ),
+			array( 'value' => WC_Log_Levels::DEBUG,     'label' => __( 'Debug',     'woocommerce' ) ),
+		);
+
+		$selected_level = isset( $_REQUEST['level'] ) ? $_REQUEST['level'] : '';
+		?>
+			<label for="filter-by-level" class="screen-reader-text"><?php _e( 'Filter by level', 'woocommerce' ); ?></label>
+			<select name="level" id="filter-by-level">
+				<option<?php selected( $selected_level, '' ); ?> value=""><?php _e( 'All levels', 'woocommerce' ); ?></option>
+				<?php foreach ( $levels as $l ) {
+					printf( '<option%1$s value="%2$s">%3$s</option>',
+						selected( $selected_level, $l['value'], false ),
+						esc_attr( $l['value'] ),
+						esc_html( $l['label'] )
+					);
+				} ?>
+			</select>
+		<?php
+	}
+
+	/**
+	 * Get list columns.
+	 *
+	 * @return array
+	 */
+	public function get_columns() {
+		return array(
+			'cb'        => '<input type="checkbox" />',
+			'timestamp' => __( 'Timestamp', 'woocommerce' ),
+			'level'     => __( 'Level',     'woocommerce' ),
+			'message'   => __( 'Message',   'woocommerce' ),
+			'source'    => __( 'Source',    'woocommerce' ),
+		);
+	}
+
+	/**
+	 * Column cb.
+	 *
+	 * @param  array $log
+	 * @return string
+	 */
+	public function column_cb( $log ) {
+		return sprintf( '<input type="checkbox" name="log[]" value="%1$s" />', esc_attr( $log['log_id'] ) );
+	}
+
+	/**
+	 * Timestamp column.
+	 *
+	 * @param  array $log
+	 * @return string
+	 */
+	public function column_timestamp( $log ) {
+		return esc_html( mysql2date(
+			get_option( 'date_format' ) . ' ' . get_option( 'time_format' ),
+			$log['timestamp']
+		) );
+	}
+
+	/**
+	 * Level column.
+	 *
+	 * @param  array $log
+	 * @return string
+	 */
+	public function column_level( $log ) {
+		$level_key = WC_Log_Levels::get_severity_level( $log['level'] );
+		$levels    = array(
+			'emergency' => __( 'Emergency', 'woocommerce' ),
+			'alert'     => __( 'Alert',     'woocommerce' ),
+			'critical'  => __( 'Critical',  'woocommerce' ),
+			'error'     => __( 'Error',     'woocommerce' ),
+			'warning'   => __( 'Warning',   'woocommerce' ),
+			'notice'    => __( 'Notice',    'woocommerce' ),
+			'info'      => __( 'Info',      'woocommerce' ),
+			'debug'     => __( 'Debug',     'woocommerce' ),
+		);
+
+		if ( isset( $levels[ $level_key ] ) ) {
+			$level = $levels[ $level_key ];
+			$level_class = sanitize_html_class( 'log-level--' . $level_key );
+			return '<span class="log-level ' . $level_class . '">' . esc_html( $level ) . '</span>';
+		} else {
+			return '';
+		}
+	}
+
+	/**
+	 * Message column.
+	 *
+	 * @param  array $log
+	 * @return string
+	 */
+	public function column_message( $log ) {
+		return esc_html( $log['message'] );
+	}
+
+	/**
+	 * Source column.
+	 *
+	 * @param  array $log
+	 * @return string
+	 */
+	public function column_source( $log ) {
+		return esc_html( $log['source'] );
+	}
+
+	/**
+	 * Get bulk actions.
+	 *
+	 * @return array
+	 */
+	protected function get_bulk_actions() {
+		return array(
+			'delete' => __( 'Delete', 'woocommerce' ),
+		);
+	}
+
+	/**
+	 * Extra controls to be displayed between bulk actions and pagination.
+	 *
+	 * @param string $which
+	 */
+	protected function extra_tablenav( $which ) {
+		if ( 'top' === $which ) {
+			echo '<div class="alignleft actions">';
+				$this->level_dropdown();
+				$this->source_dropdown();
+				submit_button( __( 'Filter', 'woocommerce' ), '', 'filter-action', false );
+			echo '</div>';
+		}
+	}
+
+	/**
+	 * Get a list of sortable columns.
+	 *
+	 * @return array
+	 */
+	protected function get_sortable_columns() {
+		return array(
+			'timestamp' => array( 'timestamp', true ),
+			'level'     => array( 'level',     true ),
+			'source'    => array( 'source',    true ),
+		);
+	}
+
+	/**
+	 * Display source dropdown
+	 *
+	 * @global wpdb $wpdb
+	 */
+	protected function source_dropdown() {
+		global $wpdb;
+
+		$sources = $wpdb->get_col( "
+			SELECT DISTINCT source
+			FROM {$wpdb->prefix}woocommerce_log
+			WHERE source != ''
+			ORDER BY source ASC
+		" );
+
+		if ( ! empty( $sources ) ) {
+			$selected_source = isset( $_REQUEST['source'] ) ? $_REQUEST['source'] : '';
+			?>
+				<label for="filter-by-source" class="screen-reader-text"><?php _e( 'Filter by source', 'woocommerce' ); ?></label>
+				<select name="source" id="filter-by-source">
+					<option<?php selected( $selected_source, '' ); ?> value=""><?php _e( 'All sources', 'woocommerce' ); ?></option>
+					<?php foreach ( $sources as $s ) {
+						printf( '<option%1$s value="%2$s">%3$s</option>',
+							selected( $selected_source, $s, false ),
+							esc_attr( $s ),
+							esc_html( $s )
+						);
+					} ?>
+				</select>
+			<?php
+		}
+	}
+
+	/**
+	 * Prepare table list items.
+	 *
+	 * @global wpdb $wpdb
+	 */
+	public function prepare_items() {
+		global $wpdb;
+
+		$this->prepare_column_headers();
+
+		$per_page = $this->get_items_per_page( 'woocommerce_status_log_items_per_page', 10 );
+
+		$where  = $this->get_items_query_where();
+		$order  = $this->get_items_query_order();
+		$limit  = $this->get_items_query_limit();
+		$offset = $this->get_items_query_offset();
+
+		$query_items = "
+			SELECT log_id, timestamp, level, message, source
+			FROM {$wpdb->prefix}woocommerce_log
+			{$where} {$order} {$limit} {$offset}
+		";
+
+		$this->items = $wpdb->get_results( $query_items, ARRAY_A );
+
+		$query_count = "SELECT COUNT(log_id) FROM {$wpdb->prefix}woocommerce_log {$where}";
+		$total_items = $wpdb->get_var( $query_count );
+
+		$this->set_pagination_args( array(
+			'total_items' => $total_items,
+			'per_page'    => $per_page,
+			'total_pages' => ceil( $total_items / $per_page ),
+		) );
+	}
+
+	/**
+	 * Get prepared LIMIT clause for items query
+	 *
+	 * @global wpdb $wpdb
+	 *
+	 * @return string Prepared LIMIT clause for items query.
+	 */
+	protected function get_items_query_limit() {
+		global $wpdb;
+
+		$per_page = $this->get_items_per_page( 'woocommerce_status_log_items_per_page', 10 );
+		return $wpdb->prepare( 'LIMIT %d', $per_page );
+	}
+
+	/**
+	 * Get prepared OFFSET clause for items query
+	 *
+	 * @global wpdb $wpdb
+	 *
+	 * @return string Prepared OFFSET clause for items query.
+	 */
+	protected function get_items_query_offset() {
+		global $wpdb;
+
+		$per_page = $this->get_items_per_page( 'woocommerce_status_log_items_per_page', 10 );
+		$current_page = $this->get_pagenum();
+		if ( 1 < $current_page ) {
+			$offset = $per_page * ( $current_page - 1 );
+		} else {
+			$offset = 0;
+		}
+
+		return $wpdb->prepare( 'OFFSET %d', $offset );
+	}
+
+	/**
+	 * Get prepared ORDER BY clause for items query
+	 *
+	 * @return string Prepared ORDER BY clause for items query.
+	 */
+	protected function get_items_query_order() {
+		$valid_orders = array( 'level', 'source', 'timestamp' );
+		if ( ! empty( $_REQUEST['orderby'] ) && in_array( $_REQUEST['orderby'], $valid_orders ) ) {
+			$by = wc_clean( $_REQUEST['orderby'] );
+		} else {
+			$by = 'timestamp';
+		}
+		$by = esc_sql( $by );
+
+		if ( ! empty( $_REQUEST['order'] ) && 'asc' === strtolower( $_REQUEST['order'] ) ) {
+			$order = 'ASC';
+		} else {
+			$order = 'DESC';
+		}
+
+		return "ORDER BY {$by} {$order}";
+	}
+
+	/**
+	 * Get prepared WHERE clause for items query
+	 *
+	 * @global wpdb $wpdb
+	 *
+	 * @return string Prepared WHERE clause for items query.
+	 */
+	protected function get_items_query_where() {
+		global $wpdb;
+
+		$where_conditions = array();
+		$where_values     = array();
+		if ( ! empty( $_REQUEST['level'] ) && WC_Log_Levels::is_valid_level( $_REQUEST['level'] ) ) {
+			$where_conditions[] = 'level >= %d';
+			$where_values[]     = WC_Log_Levels::get_level_severity( $_REQUEST['level'] );
+		}
+		if ( ! empty( $_REQUEST['source'] ) ) {
+			$where_conditions[] = 'source = %s';
+			$where_values[]     = wc_clean( $_REQUEST['source'] );
+		}
+
+		if ( ! empty( $where_conditions ) ) {
+			return $wpdb->prepare( 'WHERE 1 = 1 AND ' . implode( ' AND ', $where_conditions ), $where_values );
+		} else {
+			return '';
+		}
+	}
+
+	/**
+	 * Set _column_headers property for table list
+	 */
+	protected function prepare_column_headers() {
+		$this->_column_headers = array(
+			$this->get_columns(),
+			array(),
+			$this->get_sortable_columns(),
+		);
+	}
+}
diff --git a/includes/admin/class-wc-admin-menus.php b/includes/admin/class-wc-admin-menus.php
index bfde5b84380..09aee416b64 100644
--- a/includes/admin/class-wc-admin-menus.php
+++ b/includes/admin/class-wc-admin-menus.php
@@ -12,7 +12,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
-if ( ! class_exists( 'WC_Admin_Menus' ) ) :
+if ( ! class_exists( 'WC_Admin_Menus', false ) ) :
 
 /**
  * WC_Admin_Menus Class.
@@ -38,8 +38,8 @@ class WC_Admin_Menus {
 		add_filter( 'menu_order', array( $this, 'menu_order' ) );
 		add_filter( 'custom_menu_order', array( $this, 'custom_menu_order' ) );
 
-		// Add endpoints custom URLs in Appearance > Menus > Pages
-		add_action( 'admin_init', array( $this, 'add_nav_menu_meta_boxes' ) );
+		// Add endpoints custom URLs in Appearance > Menus > Pages.
+		add_action( 'admin_head-nav-menus.php', array( $this, 'add_nav_menu_meta_boxes' ) );
 
 		// Admin bar menus
 		if ( apply_filters( 'woocommerce_show_admin_bar_visit_store', true ) ) {
@@ -69,7 +69,7 @@ class WC_Admin_Menus {
 		if ( current_user_can( 'manage_woocommerce' ) ) {
 			add_submenu_page( 'woocommerce', __( 'Reports', 'woocommerce' ),  __( 'Reports', 'woocommerce' ) , 'view_woocommerce_reports', 'wc-reports', array( $this, 'reports_page' ) );
 		} else {
-			add_menu_page( __( 'Sales Reports', 'woocommerce' ),  __( 'Sales Reports', 'woocommerce' ) , 'view_woocommerce_reports', 'wc-reports', array( $this, 'reports_page' ), null, '55.6' );
+			add_menu_page( __( 'Sales reports', 'woocommerce' ),  __( 'Sales reports', 'woocommerce' ) , 'view_woocommerce_reports', 'wc-reports', array( $this, 'reports_page' ), null, '55.6' );
 		}
 	}
 
@@ -77,7 +77,7 @@ class WC_Admin_Menus {
 	 * Add menu item.
 	 */
 	public function settings_menu() {
-		$settings_page = add_submenu_page( 'woocommerce', __( 'WooCommerce Settings', 'woocommerce' ),  __( 'Settings', 'woocommerce' ) , 'manage_woocommerce', 'wc-settings', array( $this, 'settings_page' ) );
+		$settings_page = add_submenu_page( 'woocommerce', __( 'WooCommerce settings', 'woocommerce' ),  __( 'Settings', 'woocommerce' ) , 'manage_woocommerce', 'wc-settings', array( $this, 'settings_page' ) );
 
 		add_action( 'load-' . $settings_page, array( $this, 'settings_page_init' ) );
 	}
@@ -94,15 +94,14 @@ class WC_Admin_Menus {
 	 * Add menu item.
 	 */
 	public function status_menu() {
-		add_submenu_page( 'woocommerce', __( 'WooCommerce Status', 'woocommerce' ),  __( 'System Status', 'woocommerce' ) , 'manage_woocommerce', 'wc-status', array( $this, 'status_page' ) );
-		register_setting( 'woocommerce_status_settings_fields', 'woocommerce_status_options' );
+		add_submenu_page( 'woocommerce', __( 'WooCommerce status', 'woocommerce' ),  __( 'Status', 'woocommerce' ) , 'manage_woocommerce', 'wc-status', array( $this, 'status_page' ) );
 	}
 
 	/**
 	 * Addons menu item.
 	 */
 	public function addons_menu() {
-		add_submenu_page( 'woocommerce', __( 'WooCommerce Add-ons/Extensions', 'woocommerce' ),  __( 'Add-ons', 'woocommerce' ) , 'manage_woocommerce', 'wc-addons', array( $this, 'addons_page' ) );
+		add_submenu_page( 'woocommerce', __( 'WooCommerce extensions', 'woocommerce' ),  __( 'Extensions', 'woocommerce' ) , 'manage_woocommerce', 'wc-addons', array( $this, 'addons_page' ) );
 	}
 
 	/**
@@ -118,7 +117,7 @@ class WC_Admin_Menus {
 			break;
 			case 'product' :
 				$screen = get_current_screen();
-				if ( taxonomy_is_product_attribute( $screen->taxonomy ) ) {
+				if ( $screen && taxonomy_is_product_attribute( $screen->taxonomy ) ) {
 					$submenu_file = 'product_attributes';
 					$parent_file  = 'edit.php?post_type=product';
 				}
@@ -173,10 +172,9 @@ class WC_Admin_Menus {
 				$woocommerce_menu_order[] = 'edit.php?post_type=product';
 				unset( $menu_order[ $woocommerce_separator ] );
 				unset( $menu_order[ $woocommerce_product ] );
-			} elseif ( !in_array( $item, array( 'separator-woocommerce' ) ) ) {
+			} elseif ( ! in_array( $item, array( 'separator-woocommerce' ) ) ) {
 				$woocommerce_menu_order[] = $item;
 			}
-
 		}
 
 		// Return order
@@ -233,43 +231,55 @@ class WC_Admin_Menus {
 	 * Adapted from http://www.johnmorrisonline.com/how-to-add-a-fully-functional-custom-meta-box-to-wordpress-navigation-menus/.
 	 */
 	public function add_nav_menu_meta_boxes() {
-		add_meta_box( 'woocommerce_endpoints_nav_link', __( 'WooCommerce Endpoints', 'woocommerce' ), array( $this, 'nav_menu_links' ), 'nav-menus', 'side', 'low' );
+		add_meta_box( 'woocommerce_endpoints_nav_link', __( 'WooCommerce endpoints', 'woocommerce' ), array( $this, 'nav_menu_links' ), 'nav-menus', 'side', 'low' );
 	}
 
+	/**
+	 * Output menu links.
+	 */
 	public function nav_menu_links() {
-		$exclude = array( 'view-order', 'add-payment-method', 'order-pay', 'order-received' );
+		// Get items from account menu.
+		$endpoints = wc_get_account_menu_items();
+
+		// Remove dashboard item.
+		if ( isset( $endpoints['dashboard'] ) ) {
+			unset( $endpoints['dashboard'] );
+		}
+
+		// Include missing lost password.
+		$endpoints['lost-password'] = __( 'Lost password', 'woocommerce' );
+
+		$endpoints = apply_filters( 'woocommerce_custom_nav_menu_items', $endpoints );
+
 		?>
 		<div id="posttype-woocommerce-endpoints" class="posttypediv">
 			<div id="tabs-panel-woocommerce-endpoints" class="tabs-panel tabs-panel-active">
 				<ul id="woocommerce-endpoints-checklist" class="categorychecklist form-no-clear">
 					<?php
 					$i = -1;
-					foreach ( WC()->query->query_vars as $key => $value ) {
-						if ( in_array( $key, $exclude ) ) {
-							continue;
-						}
+					foreach ( $endpoints as $key => $value ) :
 						?>
 						<li>
 							<label class="menu-item-title">
-								<input type="checkbox" class="menu-item-checkbox" name="menu-item[<?php echo esc_attr( $i ); ?>][menu-item-object-id]" value="<?php echo esc_attr( $i ); ?>" /> <?php echo esc_html( $key ); ?>
+								<input type="checkbox" class="menu-item-checkbox" name="menu-item[<?php echo esc_attr( $i ); ?>][menu-item-object-id]" value="<?php echo esc_attr( $i ); ?>" /> <?php echo esc_html( $value ); ?>
 							</label>
 							<input type="hidden" class="menu-item-type" name="menu-item[<?php echo esc_attr( $i ); ?>][menu-item-type]" value="custom" />
-							<input type="hidden" class="menu-item-title" name="menu-item[<?php echo esc_attr( $i ); ?>][menu-item-title]" value="<?php echo esc_html( $key ); ?>" />
-							<input type="hidden" class="menu-item-url" name="menu-item[<?php echo esc_attr( $i ); ?>][menu-item-url]" value="<?php echo esc_url( wc_get_endpoint_url( $key, '', wc_get_page_permalink( 'myaccount' ) ) ); ?>" />
+							<input type="hidden" class="menu-item-title" name="menu-item[<?php echo esc_attr( $i ); ?>][menu-item-title]" value="<?php echo esc_html( $value ); ?>" />
+							<input type="hidden" class="menu-item-url" name="menu-item[<?php echo esc_attr( $i ); ?>][menu-item-url]" value="<?php echo esc_url( wc_get_account_endpoint_url( $key ) ); ?>" />
 							<input type="hidden" class="menu-item-classes" name="menu-item[<?php echo esc_attr( $i ); ?>][menu-item-classes]" />
 						</li>
 						<?php
-						$i --;
-					}
+						$i--;
+					endforeach;
 					?>
 				</ul>
 			</div>
 			<p class="button-controls">
 				<span class="list-controls">
-					<a href="<?php echo admin_url( 'nav-menus.php?page-tab=all&selectall=1#posttype-woocommerce-endpoints' ); ?>" class="select-all"><?php _e( 'Select All', 'woocommerce' ); ?></a>
+					<a href="<?php echo admin_url( 'nav-menus.php?page-tab=all&selectall=1#posttype-woocommerce-endpoints' ); ?>" class="select-all"><?php _e( 'Select all', 'woocommerce' ); ?></a>
 				</span>
 				<span class="add-to-menu">
-					<input type="submit" class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu', 'woocommerce' ); ?>" name="add-post-type-menu-item" id="submit-posttype-woocommerce-endpoints">
+					<input type="submit" class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to menu', 'woocommerce' ); ?>" name="add-post-type-menu-item" id="submit-posttype-woocommerce-endpoints">
 					<span class="spinner"></span>
 				</span>
 			</p>
@@ -303,7 +313,7 @@ class WC_Admin_Menus {
 			'parent' => 'site-name',
 			'id'     => 'view-store',
 			'title'  => __( 'Visit Store', 'woocommerce' ),
-			'href'   => wc_get_page_permalink( 'shop' )
+			'href'   => wc_get_page_permalink( 'shop' ),
 		) );
 	}
 }
diff --git a/includes/admin/class-wc-admin-meta-boxes.php b/includes/admin/class-wc-admin-meta-boxes.php
index 2936f602a8a..2b3eb957e90 100644
--- a/includes/admin/class-wc-admin-meta-boxes.php
+++ b/includes/admin/class-wc-admin-meta-boxes.php
@@ -19,7 +19,18 @@ if ( ! defined( 'ABSPATH' ) ) {
  */
 class WC_Admin_Meta_Boxes {
 
+	/**
+	 * Is meta boxes saved once?
+	 *
+	 * @var boolean
+	 */
 	private static $saved_meta_boxes = false;
+
+	/**
+	 * Meta box error messages.
+	 *
+	 * @var array
+	 */
 	public static $meta_box_errors  = array();
 
 	/**
@@ -46,17 +57,17 @@ class WC_Admin_Meta_Boxes {
 		add_action( 'woocommerce_process_shop_order_meta', 'WC_Meta_Box_Order_Data::save', 40, 2 );
 		add_action( 'woocommerce_process_shop_order_meta', 'WC_Meta_Box_Order_Actions::save', 50, 2 );
 
-		// Save Product Meta Boxes
+		// Save Product Meta Boxes.
 		add_action( 'woocommerce_process_product_meta', 'WC_Meta_Box_Product_Data::save', 10, 2 );
 		add_action( 'woocommerce_process_product_meta', 'WC_Meta_Box_Product_Images::save', 20, 2 );
 
-		// Save Coupon Meta Boxes
+		// Save Coupon Meta Boxes.
 		add_action( 'woocommerce_process_shop_coupon_meta', 'WC_Meta_Box_Coupon_Data::save', 10, 2 );
 
-		// Save Rating Meta Boxes
-		add_action( 'comment_edit_redirect', 'WC_Meta_Box_Order_Reviews::save', 1, 2 );
+		// Save Rating Meta Boxes.
+		add_action( 'comment_edit_redirect', 'WC_Meta_Box_Product_Reviews::save', 1, 2 );
 
-		// Error handling (for showing errors from meta boxes on next page load)
+		// Error handling (for showing errors from meta boxes on next page load).
 		add_action( 'admin_notices', array( $this, 'output_errors' ) );
 		add_action( 'shutdown', array( $this, 'save_errors' ) );
 	}
@@ -80,7 +91,7 @@ class WC_Admin_Meta_Boxes {
 	 * Show any stored error messages.
 	 */
 	public function output_errors() {
-		$errors = maybe_unserialize( get_option( 'woocommerce_meta_box_errors' ) );
+		$errors = array_filter( (array) get_option( 'woocommerce_meta_box_errors' ) );
 
 		if ( ! empty( $errors ) ) {
 
@@ -101,30 +112,30 @@ class WC_Admin_Meta_Boxes {
 	 * Add WC Meta boxes.
 	 */
 	public function add_meta_boxes() {
-		// Products
-		add_meta_box( 'postexcerpt', __( 'Product Short Description', 'woocommerce' ), 'WC_Meta_Box_Product_Short_Description::output', 'product', 'normal' );
-		add_meta_box( 'woocommerce-product-data', __( 'Product Data', 'woocommerce' ), 'WC_Meta_Box_Product_Data::output', 'product', 'normal', 'high' );
-		add_meta_box( 'woocommerce-product-images', __( 'Product Gallery', 'woocommerce' ), 'WC_Meta_Box_Product_Images::output', 'product', 'side', 'low' );
+		$screen    = get_current_screen();
+		$screen_id = $screen ? $screen->id : '';
 
-		// Orders
+		// Products.
+		add_meta_box( 'postexcerpt', __( 'Product short description', 'woocommerce' ), 'WC_Meta_Box_Product_Short_Description::output', 'product', 'normal' );
+		add_meta_box( 'woocommerce-product-data', __( 'Product data', 'woocommerce' ), 'WC_Meta_Box_Product_Data::output', 'product', 'normal', 'high' );
+		add_meta_box( 'woocommerce-product-images', __( 'Product gallery', 'woocommerce' ), 'WC_Meta_Box_Product_Images::output', 'product', 'side', 'low' );
+
+		// Orders.
 		foreach ( wc_get_order_types( 'order-meta-boxes' ) as $type ) {
 			$order_type_object = get_post_type_object( $type );
-			add_meta_box( 'woocommerce-order-data', sprintf( __( '%s Data', 'woocommerce' ), $order_type_object->labels->singular_name ), 'WC_Meta_Box_Order_Data::output', $type, 'normal', 'high' );
-			add_meta_box( 'woocommerce-order-items', sprintf( __( '%s Items', 'woocommerce' ), $order_type_object->labels->singular_name ), 'WC_Meta_Box_Order_Items::output', $type, 'normal', 'high' );
-			add_meta_box( 'woocommerce-order-notes', sprintf( __( '%s Notes', 'woocommerce' ), $order_type_object->labels->singular_name ), 'WC_Meta_Box_Order_Notes::output', $type, 'side', 'default' );
-			add_meta_box( 'woocommerce-order-downloads', __( 'Downloadable Product Permissions', 'woocommerce' ) . wc_help_tip( __( 'Note: Permissions for order items will automatically be granted when the order status changes to processing/completed.', 'woocommerce' ) ), 'WC_Meta_Box_Order_Downloads::output', $type, 'normal', 'default' );
-			add_meta_box( 'woocommerce-order-actions', sprintf( __( '%s Actions', 'woocommerce' ), $order_type_object->labels->singular_name ), 'WC_Meta_Box_Order_Actions::output', $type, 'side', 'high' );
-			remove_meta_box( 'submitdiv', $type, 'side' );
+			add_meta_box( 'woocommerce-order-data', sprintf( __( '%s data', 'woocommerce' ), $order_type_object->labels->singular_name ), 'WC_Meta_Box_Order_Data::output', $type, 'normal', 'high' );
+			add_meta_box( 'woocommerce-order-items', __( 'Items', 'woocommerce' ), 'WC_Meta_Box_Order_Items::output', $type, 'normal', 'high' );
+			add_meta_box( 'woocommerce-order-notes', sprintf( __( '%s notes', 'woocommerce' ), $order_type_object->labels->singular_name ), 'WC_Meta_Box_Order_Notes::output', $type, 'side', 'default' );
+			add_meta_box( 'woocommerce-order-downloads', __( 'Downloadable product permissions', 'woocommerce' ) . wc_help_tip( __( 'Note: Permissions for order items will automatically be granted when the order status changes to processing/completed.', 'woocommerce' ) ), 'WC_Meta_Box_Order_Downloads::output', $type, 'normal', 'default' );
+			add_meta_box( 'woocommerce-order-actions', sprintf( __( '%s actions', 'woocommerce' ), $order_type_object->labels->singular_name ), 'WC_Meta_Box_Order_Actions::output', $type, 'side', 'high' );
 		}
 
-		// Coupons
-		add_meta_box( 'woocommerce-coupon-data', __( 'Coupon Data', 'woocommerce' ), 'WC_Meta_Box_Coupon_Data::output', 'shop_coupon', 'normal', 'high' );
+		// Coupons.
+		add_meta_box( 'woocommerce-coupon-data', __( 'Coupon data', 'woocommerce' ), 'WC_Meta_Box_Coupon_Data::output', 'shop_coupon', 'normal', 'high' );
 
-		// Reviews
-		if ( 'comment' == get_current_screen()->id && isset( $_GET['c'] ) ) {
-			if ( get_comment_meta( intval( $_GET['c'] ), 'rating', true ) ) {
-				add_meta_box( 'woocommerce-rating', __( 'Rating', 'woocommerce' ), 'WC_Meta_Box_Order_Reviews::output', 'comment', 'normal', 'high' );
-			}
+		// Comment rating.
+		if ( 'comment' === $screen_id && isset( $_GET['c'] ) && metadata_exists( 'comment', $_GET['c'], 'rating' ) ) {
+			add_meta_box( 'woocommerce-rating', __( 'Rating', 'woocommerce' ), 'WC_Meta_Box_Product_Reviews::output', 'comment', 'normal', 'high' );
 		}
 	}
 
@@ -134,9 +145,9 @@ class WC_Admin_Meta_Boxes {
 	public function remove_meta_boxes() {
 		remove_meta_box( 'postexcerpt', 'product', 'normal' );
 		remove_meta_box( 'product_shipping_classdiv', 'product', 'side' );
-		remove_meta_box( 'pageparentdiv', 'product', 'side' );
-		remove_meta_box( 'commentstatusdiv', 'product', 'normal' );
+		remove_meta_box( 'commentsdiv', 'product', 'normal' );
 		remove_meta_box( 'commentstatusdiv', 'product', 'side' );
+		remove_meta_box( 'commentstatusdiv', 'product', 'normal' );
 		remove_meta_box( 'woothemes-settings', 'shop_coupon', 'normal' );
 		remove_meta_box( 'commentstatusdiv', 'shop_coupon', 'normal' );
 		remove_meta_box( 'slugdiv', 'shop_coupon', 'normal' );
@@ -146,6 +157,7 @@ class WC_Admin_Meta_Boxes {
 			remove_meta_box( 'woothemes-settings', $type, 'normal' );
 			remove_meta_box( 'commentstatusdiv', $type, 'normal' );
 			remove_meta_box( 'slugdiv', $type, 'normal' );
+			remove_meta_box( 'submitdiv', $type, 'side' );
 		}
 	}
 
@@ -196,9 +208,9 @@ class WC_Admin_Meta_Boxes {
 		}
 
 		// We need this save event to run once to avoid potential endless loops. This would have been perfect:
-		//	remove_action( current_filter(), __METHOD__ );
-		// But cannot be used due to https://github.com/woothemes/woocommerce/issues/6485
-		// When that is patched in core we cna use the above. For now:
+		// remove_action( current_filter(), __METHOD__ );
+		// But cannot be used due to https://github.com/woocommerce/woocommerce/issues/6485
+		// When that is patched in core we can use the above. For now:
 		self::$saved_meta_boxes = true;
 
 		// Check the post type
@@ -208,7 +220,6 @@ class WC_Admin_Meta_Boxes {
 			do_action( 'woocommerce_process_' . $post->post_type . '_meta', $post_id, $post );
 		}
 	}
-
 }
 
 new WC_Admin_Meta_Boxes();
diff --git a/includes/admin/class-wc-admin-notices.php b/includes/admin/class-wc-admin-notices.php
index 6bcb66d21d1..45020eb38f6 100644
--- a/includes/admin/class-wc-admin-notices.php
+++ b/includes/admin/class-wc-admin-notices.php
@@ -17,54 +17,88 @@ if ( ! defined( 'ABSPATH' ) ) {
  */
 class WC_Admin_Notices {
 
+	/**
+	 * Stores notices.
+	 * @var array
+	 */
+	private static $notices = array();
+
 	/**
 	 * Array of notices - name => callback.
 	 * @var array
 	 */
-	private $core_notices = array(
-		'install'        => 'install_notice',
-		'update'         => 'update_notice',
-		'template_files' => 'template_file_check_notice',
-		'theme_support'  => 'theme_check_notice'
+	private static $core_notices = array(
+		'install'             => 'install_notice',
+		'update'              => 'update_notice',
+		'template_files'      => 'template_file_check_notice',
+		'theme_support'       => 'theme_check_notice',
+		'legacy_shipping'     => 'legacy_shipping_notice',
+		'no_shipping_methods' => 'no_shipping_methods_notice',
+		'simplify_commerce'   => 'simplify_commerce_notice',
 	);
 
 	/**
 	 * Constructor.
 	 */
-	public function __construct() {
-		add_action( 'switch_theme', array( $this, 'reset_admin_notices' ) );
-		add_action( 'woocommerce_installed', array( $this, 'reset_admin_notices' ) );
-		add_action( 'wp_loaded', array( $this, 'hide_notices' ) );
+	public static function init() {
+		self::$notices = get_option( 'woocommerce_admin_notices', array() );
+
+		add_action( 'switch_theme', array( __CLASS__, 'reset_admin_notices' ) );
+		add_action( 'woocommerce_installed', array( __CLASS__, 'reset_admin_notices' ) );
+		add_action( 'wp_loaded', array( __CLASS__, 'hide_notices' ) );
+		add_action( 'shutdown', array( __CLASS__, 'store_notices' ) );
 
 		if ( current_user_can( 'manage_woocommerce' ) ) {
-			add_action( 'admin_print_styles', array( $this, 'add_notices' ) );
+			add_action( 'admin_print_styles', array( __CLASS__, 'add_notices' ) );
 		}
 	}
 
+	/**
+	 * Store notices to DB
+	 */
+	public static function store_notices() {
+		update_option( 'woocommerce_admin_notices', self::get_notices() );
+	}
+
+	/**
+	 * Get notices
+	 * @return array
+	 */
+	public static function get_notices() {
+		return self::$notices;
+	}
+
 	/**
 	 * Remove all notices.
 	 */
 	public static function remove_all_notices() {
-		delete_option( 'woocommerce_admin_notices' );
+		self::$notices = array();
 	}
 
 	/**
 	 * Reset notices for themes when switched or a new version of WC is installed.
 	 */
-	public function reset_admin_notices() {
+	public static function reset_admin_notices() {
 		if ( ! current_theme_supports( 'woocommerce' ) && ! in_array( get_option( 'template' ), wc_get_core_supported_themes() ) ) {
 			self::add_notice( 'theme_support' );
 		}
+
+		$simplify_options = get_option( 'woocommerce_simplify_commerce_settings', array() );
+		$location         = wc_get_base_location();
+
+		if ( ! class_exists( 'WC_Gateway_Simplify_Commerce_Loader' ) && ! empty( $simplify_options['enabled'] ) && 'yes' === $simplify_options['enabled'] && in_array( $location['country'], apply_filters( 'woocommerce_gateway_simplify_commerce_supported_countries', array( 'US', 'IE' ) ) ) ) {
+			WC_Admin_Notices::add_notice( 'simplify_commerce' );
+		}
+
 		self::add_notice( 'template_files' );
 	}
 
 	/**
 	 * Show a notice.
-	 * @param  string $name
+	 * @param string $name
 	 */
 	public static function add_notice( $name ) {
-		$notices = array_unique( array_merge( get_option( 'woocommerce_admin_notices', array() ), array( $name ) ) );
-		update_option( 'woocommerce_admin_notices', $notices );
+		self::$notices = array_unique( array_merge( self::get_notices(), array( $name ) ) );
 	}
 
 	/**
@@ -72,8 +106,8 @@ class WC_Admin_Notices {
 	 * @param  string $name
 	 */
 	public static function remove_notice( $name ) {
-		$notices = array_diff( get_option( 'woocommerce_admin_notices', array() ), array( $name ) );
-		update_option( 'woocommerce_admin_notices', $notices );
+		self::$notices = array_diff( self::get_notices(), array( $name ) );
+		delete_option( 'woocommerce_admin_notice_' . $name );
 	}
 
 	/**
@@ -82,13 +116,13 @@ class WC_Admin_Notices {
 	 * @return boolean
 	 */
 	public static function has_notice( $name ) {
-		return in_array( $name, get_option( 'woocommerce_admin_notices', array() ) );
+		return in_array( $name, self::get_notices() );
 	}
 
 	/**
 	 * Hide a notice if the GET variable is set.
 	 */
-	public function hide_notices() {
+	public static function hide_notices() {
 		if ( isset( $_GET['wc-hide-notice'] ) && isset( $_GET['_wc_notice_nonce'] ) ) {
 			if ( ! wp_verify_nonce( $_GET['_wc_notice_nonce'], 'woocommerce_hide_notices_nonce' ) ) {
 				wp_die( __( 'Action failed. Please refresh the page and retry.', 'woocommerce' ) );
@@ -107,14 +141,45 @@ class WC_Admin_Notices {
 	/**
 	 * Add notices + styles if needed.
 	 */
-	public function add_notices() {
-		$notices = get_option( 'woocommerce_admin_notices', array() );
+	public static function add_notices() {
+		$notices = self::get_notices();
 
-		if ( $notices ) {
-			wp_enqueue_style( 'woocommerce-activation', plugins_url(  '/assets/css/activation.css', WC_PLUGIN_FILE ) );
+		if ( ! empty( $notices ) ) {
+			wp_enqueue_style( 'woocommerce-activation', plugins_url( '/assets/css/activation.css', WC_PLUGIN_FILE ) );
 			foreach ( $notices as $notice ) {
-				if ( ! empty( $this->core_notices[ $notice ] ) && apply_filters( 'woocommerce_show_admin_notice', true, $notice ) ) {
-					add_action( 'admin_notices', array( $this, $this->core_notices[ $notice ] ) );
+				if ( ! empty( self::$core_notices[ $notice ] ) && apply_filters( 'woocommerce_show_admin_notice', true, $notice ) ) {
+					add_action( 'admin_notices', array( __CLASS__, self::$core_notices[ $notice ] ) );
+				} else {
+					add_action( 'admin_notices', array( __CLASS__, 'output_custom_notices' ) );
+				}
+			}
+		}
+	}
+
+	/**
+	 * Add a custom notice.
+	 * @param string $name
+	 * @param string $notice_html
+	 */
+	public static function add_custom_notice( $name, $notice_html ) {
+		self::add_notice( $name );
+		update_option( 'woocommerce_admin_notice_' . $name, wp_kses_post( $notice_html ) );
+	}
+
+	/**
+	 * Output any stored custom notices.
+	 */
+	public static function output_custom_notices() {
+		$notices = self::get_notices();
+
+		if ( ! empty( $notices ) ) {
+			foreach ( $notices as $notice ) {
+				if ( empty( self::$core_notices[ $notice ] ) ) {
+					$notice_html = get_option( 'woocommerce_admin_notice_' . $notice );
+
+					if ( $notice_html ) {
+						include( 'views/html-notice-custom.php' );
+					}
 				}
 			}
 		}
@@ -123,21 +188,30 @@ class WC_Admin_Notices {
 	/**
 	 * If we need to update, include a message with the update button.
 	 */
-	public function update_notice() {
-		include( 'views/html-notice-update.php' );
+	public static function update_notice() {
+		if ( version_compare( get_option( 'woocommerce_db_version' ), WC_VERSION, '<' ) ) {
+			$updater = new WC_Background_Updater();
+			if ( $updater->is_updating() || ! empty( $_GET['do_update_woocommerce'] ) ) {
+				include( 'views/html-notice-updating.php' );
+			} else {
+				include( 'views/html-notice-update.php' );
+			}
+		} else {
+			include( 'views/html-notice-updated.php' );
+		}
 	}
 
 	/**
 	 * If we have just installed, show a message with the install pages button.
 	 */
-	public function install_notice() {
+	public static function install_notice() {
 		include( 'views/html-notice-install.php' );
 	}
 
 	/**
 	 * Show the Theme Check notice.
 	 */
-	public function theme_check_notice() {
+	public static function theme_check_notice() {
 		if ( ! current_theme_supports( 'woocommerce' ) && ! in_array( get_option( 'template' ), wc_get_core_supported_themes() ) ) {
 			include( 'views/html-notice-theme-support.php' );
 		} else {
@@ -148,7 +222,7 @@ class WC_Admin_Notices {
 	/**
 	 * Show a notice highlighting bad template files.
 	 */
-	public function template_file_check_notice() {
+	public static function template_file_check_notice() {
 		$core_templates = WC_Admin_Status::scan_template_files( WC()->plugin_path() . '/templates' );
 		$outdated       = false;
 
@@ -161,11 +235,11 @@ class WC_Admin_Notices {
 				$theme_file = get_stylesheet_directory() . '/woocommerce/' . $file;
 			} elseif ( file_exists( get_template_directory() . '/' . $file ) ) {
 				$theme_file = get_template_directory() . '/' . $file;
-			} elseif( file_exists( get_template_directory() . '/woocommerce/' . $file ) ) {
+			} elseif ( file_exists( get_template_directory() . '/woocommerce/' . $file ) ) {
 				$theme_file = get_template_directory() . '/woocommerce/' . $file;
 			}
 
-			if ( $theme_file !== false ) {
+			if ( false !== $theme_file ) {
 				$core_version  = WC_Admin_Status::get_file_version( WC()->plugin_path() . '/templates/' . $file );
 				$theme_version = WC_Admin_Status::get_file_version( $theme_file );
 
@@ -182,6 +256,62 @@ class WC_Admin_Notices {
 			self::remove_notice( 'template_files' );
 		}
 	}
+
+	/**
+	 * Show a notice asking users to convert to shipping zones.
+	 */
+	public static function legacy_shipping_notice() {
+		$maybe_load_legacy_methods = array( 'flat_rate', 'free_shipping', 'international_delivery', 'local_delivery', 'local_pickup' );
+		$enabled                   = false;
+
+		foreach ( $maybe_load_legacy_methods as $method ) {
+			$options = get_option( 'woocommerce_' . $method . '_settings' );
+			if ( $options && isset( $options['enabled'] ) && 'yes' === $options['enabled'] ) {
+				$enabled = true;
+			}
+		}
+
+		if ( $enabled ) {
+			include( 'views/html-notice-legacy-shipping.php' );
+		} else {
+			self::remove_notice( 'template_files' );
+		}
+	}
+
+	/**
+	 * No shipping methods.
+	 */
+	public static function no_shipping_methods_notice() {
+		if ( wc_shipping_enabled() && ( empty( $_GET['page'] ) || empty( $_GET['tab'] ) || 'wc-settings' !== $_GET['page'] || 'shipping' !== $_GET['tab'] ) ) {
+			global $wpdb;
+
+			$product_count = wp_count_posts( 'product' );
+			$method_count  = wc_get_shipping_method_count();
+
+			if ( $product_count->publish > 0 && 0 === $method_count ) {
+				include( 'views/html-notice-no-shipping-methods.php' );
+			}
+
+			if ( $method_count > 0 ) {
+				self::remove_notice( 'no_shipping_methods' );
+			}
+		}
+	}
+
+	/**
+	 * Simplify Commerce is being removed from core.
+	 */
+	public static function simplify_commerce_notice() {
+		$location = wc_get_base_location();
+
+		if ( class_exists( 'WC_Gateway_Simplify_Commerce_Loader' ) || ! in_array( $location['country'], apply_filters( 'woocommerce_gateway_simplify_commerce_supported_countries', array( 'US', 'IE' ) ) ) ) {
+			self::remove_notice( 'simplify_commerce' );
+			return;
+		}
+		if ( empty( $_GET['action'] ) ) {
+			include( 'views/html-notice-simplify-commerce.php' );
+		}
+	}
 }
 
-new WC_Admin_Notices();
+WC_Admin_Notices::init();
diff --git a/includes/admin/class-wc-admin-permalink-settings.php b/includes/admin/class-wc-admin-permalink-settings.php
index 9b569e43457..ad50c0ebd43 100644
--- a/includes/admin/class-wc-admin-permalink-settings.php
+++ b/includes/admin/class-wc-admin-permalink-settings.php
@@ -13,13 +13,20 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
-if ( ! class_exists( 'WC_Admin_Permalink_Settings' ) ) :
+if ( ! class_exists( 'WC_Admin_Permalink_Settings', false ) ) :
 
 /**
  * WC_Admin_Permalink_Settings Class.
  */
 class WC_Admin_Permalink_Settings {
 
+	/**
+	 * Permalink settings.
+	 *
+	 * @var array
+	 */
+	private $permalinks = array();
+
 	/**
 	 * Hook in tabs.
 	 */
@@ -33,7 +40,7 @@ class WC_Admin_Permalink_Settings {
 	 */
 	public function settings_init() {
 		// Add a section to the permalinks page
-		add_settings_section( 'woocommerce-permalink', __( 'Product Permalinks', 'woocommerce' ), array( $this, 'settings' ), 'permalink' );
+		add_settings_section( 'woocommerce-permalink', __( 'Product permalinks', 'woocommerce' ), array( $this, 'settings' ), 'permalink' );
 
 		// Add our settings
 		add_settings_field(
@@ -57,15 +64,16 @@ class WC_Admin_Permalink_Settings {
 			'permalink',                                    // settings page
 			'optional'                                      // settings section
 		);
+
+		$this->permalinks = wc_get_permalink_structure();
 	}
 
 	/**
 	 * Show a slug input box.
 	 */
 	public function product_category_slug_input() {
-		$permalinks = get_option( 'woocommerce_permalinks' );
 		?>
-		<input name="woocommerce_product_category_slug" type="text" class="regular-text code" value="<?php if ( isset( $permalinks['category_base'] ) ) echo esc_attr( $permalinks['category_base'] ); ?>" placeholder="<?php echo esc_attr_x('product-category', 'slug', 'woocommerce') ?>" />
+		<input name="woocommerce_product_category_slug" type="text" class="regular-text code" value="<?php echo esc_attr( $this->permalinks['category_base'] ); ?>" placeholder="<?php echo esc_attr_x( 'product-category', 'slug', 'woocommerce' ) ?>" />
 		<?php
 	}
 
@@ -73,9 +81,8 @@ class WC_Admin_Permalink_Settings {
 	 * Show a slug input box.
 	 */
 	public function product_tag_slug_input() {
-		$permalinks = get_option( 'woocommerce_permalinks' );
 		?>
-		<input name="woocommerce_product_tag_slug" type="text" class="regular-text code" value="<?php if ( isset( $permalinks['tag_base'] ) ) echo esc_attr( $permalinks['tag_base'] ); ?>" placeholder="<?php echo esc_attr_x('product-tag', 'slug', 'woocommerce') ?>" />
+		<input name="woocommerce_product_tag_slug" type="text" class="regular-text code" value="<?php echo esc_attr( $this->permalinks['tag_base'] ); ?>" placeholder="<?php echo esc_attr_x( 'product-tag', 'slug', 'woocommerce' ) ?>" />
 		<?php
 	}
 
@@ -83,9 +90,8 @@ class WC_Admin_Permalink_Settings {
 	 * Show a slug input box.
 	 */
 	public function product_attribute_slug_input() {
-		$permalinks = get_option( 'woocommerce_permalinks' );
 		?>
-		<input name="woocommerce_product_attribute_slug" type="text" class="regular-text code" value="<?php if ( isset( $permalinks['attribute_base'] ) ) echo esc_attr( $permalinks['attribute_base'] ); ?>" /><code>/attribute-name/attribute/</code>
+		<input name="woocommerce_product_attribute_slug" type="text" class="regular-text code" value="<?php echo esc_attr( $this->permalinks['attribute_base'] ); ?>" /><code>/attribute-name/attribute/</code>
 		<?php
 	}
 
@@ -95,9 +101,6 @@ class WC_Admin_Permalink_Settings {
 	public function settings() {
 		echo wpautop( __( 'These settings control the permalinks used specifically for products.', 'woocommerce' ) );
 
-		$permalinks        = get_option( 'woocommerce_permalinks' );
-		$product_permalink = $permalinks['product_base'];
-
 		// Get shop page
 		$shop_page_id   = wc_get_page_id( 'shop' );
 		$base_slug      = urldecode( ( $shop_page_id > 0 && get_post( $shop_page_id ) ) ? get_page_uri( $shop_page_id ) : _x( 'shop', 'default-slug', 'woocommerce' ) );
@@ -106,30 +109,30 @@ class WC_Admin_Permalink_Settings {
 		$structures = array(
 			0 => '',
 			1 => '/' . trailingslashit( $base_slug ),
-			2 => '/' . trailingslashit( $base_slug ) . trailingslashit( '%product_cat%' )
+			2 => '/' . trailingslashit( $base_slug ) . trailingslashit( '%product_cat%' ),
 		);
 		?>
 		<table class="form-table wc-permalink-structure">
 			<tbody>
 				<tr>
-					<th><label><input name="product_permalink" type="radio" value="<?php echo esc_attr( $structures[0] ); ?>" class="wctog" <?php checked( $structures[0], $product_permalink ); ?> /> <?php _e( 'Default', 'woocommerce' ); ?></label></th>
+					<th><label><input name="product_permalink" type="radio" value="<?php echo esc_attr( $structures[0] ); ?>" class="wctog" <?php checked( $structures[0], $this->permalinks['product_base'] ); ?> /> <?php _e( 'Default', 'woocommerce' ); ?></label></th>
 					<td><code class="default-example"><?php echo esc_html( home_url() ); ?>/?product=sample-product</code> <code class="non-default-example"><?php echo esc_html( home_url() ); ?>/<?php echo esc_html( $product_base ); ?>/sample-product/</code></td>
 				</tr>
 				<?php if ( $shop_page_id ) : ?>
 					<tr>
-						<th><label><input name="product_permalink" type="radio" value="<?php echo esc_attr( $structures[1] ); ?>" class="wctog" <?php checked( $structures[1], $product_permalink ); ?> /> <?php _e( 'Shop base', 'woocommerce' ); ?></label></th>
+						<th><label><input name="product_permalink" type="radio" value="<?php echo esc_attr( $structures[1] ); ?>" class="wctog" <?php checked( $structures[1], $this->permalinks['product_base'] ); ?> /> <?php _e( 'Shop base', 'woocommerce' ); ?></label></th>
 						<td><code><?php echo esc_html( home_url() ); ?>/<?php echo esc_html( $base_slug ); ?>/sample-product/</code></td>
 					</tr>
 					<tr>
-						<th><label><input name="product_permalink" type="radio" value="<?php echo esc_attr( $structures[2] ); ?>" class="wctog" <?php checked( $structures[2], $product_permalink ); ?> /> <?php _e( 'Shop base with category', 'woocommerce' ); ?></label></th>
+						<th><label><input name="product_permalink" type="radio" value="<?php echo esc_attr( $structures[2] ); ?>" class="wctog" <?php checked( $structures[2], $this->permalinks['product_base'] ); ?> /> <?php _e( 'Shop base with category', 'woocommerce' ); ?></label></th>
 						<td><code><?php echo esc_html( home_url() ); ?>/<?php echo esc_html( $base_slug ); ?>/product-category/sample-product/</code></td>
 					</tr>
 				<?php endif; ?>
 				<tr>
-					<th><label><input name="product_permalink" id="woocommerce_custom_selection" type="radio" value="custom" class="tog" <?php checked( in_array( $product_permalink, $structures ), false ); ?> />
-						<?php _e( 'Custom Base', 'woocommerce' ); ?></label></th>
+					<th><label><input name="product_permalink" id="woocommerce_custom_selection" type="radio" value="custom" class="tog" <?php checked( in_array( $this->permalinks['product_base'], $structures ), false ); ?> />
+						<?php _e( 'Custom base', 'woocommerce' ); ?></label></th>
 					<td>
-						<input name="product_permalink_structure" id="woocommerce_permalink_structure" type="text" value="<?php echo esc_attr( $product_permalink ); ?>" class="regular-text code"> <span class="description"><?php _e( 'Enter a custom base to use. A base <strong>must</strong> be set or WordPress will use default instead.', 'woocommerce' ); ?></span>
+						<input name="product_permalink_structure" id="woocommerce_permalink_structure" type="text" value="<?php echo esc_attr( $this->permalinks['product_base'] ? trailingslashit( $this->permalinks['product_base'] ) : '' ); ?>" class="regular-text code"> <span class="description"><?php _e( 'Enter a custom base to use. A base <strong>must</strong> be set or WordPress will use default instead.', 'woocommerce' ); ?></span>
 					</td>
 				</tr>
 			</tbody>
@@ -163,48 +166,42 @@ class WC_Admin_Permalink_Settings {
 	 * Save the settings.
 	 */
 	public function settings_save() {
-
 		if ( ! is_admin() ) {
 			return;
 		}
 
-		// We need to save the options ourselves; settings api does not trigger save for the permalinks page
-		if ( isset( $_POST['permalink_structure'] ) || isset( $_POST['category_base'] ) && isset( $_POST['product_permalink'] ) ) {
-			// Cat and tag bases
-			$woocommerce_product_category_slug  = wc_clean( $_POST['woocommerce_product_category_slug'] );
-			$woocommerce_product_tag_slug       = wc_clean( $_POST['woocommerce_product_tag_slug'] );
-			$woocommerce_product_attribute_slug = wc_clean( $_POST['woocommerce_product_attribute_slug'] );
-			$permalinks                         = get_option( 'woocommerce_permalinks' );
-
-			if ( ! $permalinks ) {
-				$permalinks = array();
+		// We need to save the options ourselves; settings api does not trigger save for the permalinks page.
+		if ( isset( $_POST['permalink_structure'] ) ) {
+			if ( function_exists( 'switch_to_locale' ) ) {
+				switch_to_locale( get_locale() );
 			}
 
-			$permalinks['category_base']    = untrailingslashit( $woocommerce_product_category_slug );
-			$permalinks['tag_base']         = untrailingslashit( $woocommerce_product_tag_slug );
-			$permalinks['attribute_base']   = untrailingslashit( $woocommerce_product_attribute_slug );
+			$permalinks                   = (array) get_option( 'woocommerce_permalinks', array() );
+			$permalinks['category_base']  = wc_sanitize_permalink( trim( $_POST['woocommerce_product_category_slug'] ) );
+			$permalinks['tag_base']       = wc_sanitize_permalink( trim( $_POST['woocommerce_product_tag_slug'] ) );
+			$permalinks['attribute_base'] = wc_sanitize_permalink( trim( $_POST['woocommerce_product_attribute_slug'] ) );
 
-			// Product base
-			$product_permalink = wc_clean( $_POST['product_permalink'] );
+			// Generate product base.
+			$product_base = isset( $_POST['product_permalink'] ) ? wc_clean( $_POST['product_permalink'] ) : '';
 
-			if ( 'custom' === $product_permalink ) {
-				// Get permalink without slashes
-				$product_permalink = trim( wc_clean( $_POST['product_permalink_structure'] ), '/' );
-
-				// This is an invalid base structure and breaks pages
-				if ( '%product_cat%' == $product_permalink ) {
-					$product_permalink = _x( 'product', 'slug', 'woocommerce' ) . '/' . $product_permalink;
+			if ( 'custom' === $product_base ) {
+				if ( isset( $_POST['product_permalink_structure'] ) ) {
+					$product_base = preg_replace( '#/+#', '/', '/' . str_replace( '#', '', trim( $_POST['product_permalink_structure'] ) ) );
+				} else {
+					$product_base = '/';
 				}
 
-				// Prepending slash
-				$product_permalink = '/' . $product_permalink;
-			} elseif ( empty( $product_permalink ) ) {
-				$product_permalink = false;
+				// This is an invalid base structure and breaks pages.
+				if ( '/%product_cat%/' === trailingslashit( $product_base ) ) {
+					$product_base = '/' . _x( 'product', 'slug', 'woocommerce' ) . $product_base;
+				}
+			} elseif ( empty( $product_base ) ) {
+				$product_base = false;
 			}
 
-			$permalinks['product_base'] = untrailingslashit( $product_permalink );
+			$permalinks['product_base'] = wc_sanitize_permalink( $product_base );
 
-			// Shop base may require verbose page rules if nesting pages
+			// Shop base may require verbose page rules if nesting pages.
 			$shop_page_id   = wc_get_page_id( 'shop' );
 			$shop_permalink = ( $shop_page_id > 0 && get_post( $shop_page_id ) ) ? get_page_uri( $shop_page_id ) : _x( 'shop', 'default-slug', 'woocommerce' );
 
@@ -213,6 +210,10 @@ class WC_Admin_Permalink_Settings {
 			}
 
 			update_option( 'woocommerce_permalinks', $permalinks );
+
+			if ( function_exists( 'restore_current_locale' ) ) {
+				restore_current_locale();
+			}
 		}
 	}
 }
diff --git a/includes/admin/class-wc-admin-pointers.php b/includes/admin/class-wc-admin-pointers.php
index 6827a8a6752..187606c8001 100644
--- a/includes/admin/class-wc-admin-pointers.php
+++ b/includes/admin/class-wc-admin-pointers.php
@@ -28,7 +28,9 @@ class WC_Admin_Pointers {
 	 * Setup pointers for screen.
 	 */
 	public function setup_pointers_for_screen() {
-		$screen = get_current_screen();
+		if ( ! $screen = get_current_screen() ) {
+			return;
+		}
 
 		switch ( $screen->id ) {
 			case 'product' :
@@ -52,162 +54,162 @@ class WC_Admin_Pointers {
 					'next'         => 'content',
 					'next_trigger' => array(
 						'target' => '#title',
-						'event'  => 'input'
+						'event'  => 'input',
 					),
 					'options'      => array(
-						'content'  => 	'<h3>' . esc_html__( 'Product Name', 'woocommerce' ) . '</h3>' .
+						'content'  => '<h3>' . esc_html__( 'Product name', 'woocommerce' ) . '</h3>' .
 										'<p>' . esc_html__( 'Give your new product a name here. This is a required field and will be what your customers will see in your store.', 'woocommerce' ) . '</p>',
 						'position' => array(
 							'edge'  => 'top',
-							'align' => 'left'
-						)
-					)
+							'align' => 'left',
+						),
+					),
 				),
 				'content' => array(
 					'target'       => "#wp-content-editor-container",
 					'next'         => 'product-type',
 					'next_trigger' => array(),
 					'options'      => array(
-						'content'  => 	'<h3>' . esc_html__( 'Product Description', 'woocommerce' ) . '</h3>' .
+						'content'  => '<h3>' . esc_html__( 'Product description', 'woocommerce' ) . '</h3>' .
 										'<p>' . esc_html__( 'This is your products main body of content. Here you should describe your product in detail.', 'woocommerce' ) . '</p>',
 						'position' => array(
 							'edge'  => 'bottom',
-							'align' => 'middle'
-						)
-					)
+							'align' => 'middle',
+						),
+					),
 				),
 				'product-type' => array(
 					'target'       => "#product-type",
 					'next'         => 'virtual',
 					'next_trigger' => array(
 						'target' => "#product-type",
-						'event'  => 'change blur click'
+						'event'  => 'change blur click',
 					),
 					'options'  => array(
-						'content'  => 	'<h3>' . esc_html__( 'Choose Product Type', 'woocommerce' ) . '</h3>' .
+						'content'  => '<h3>' . esc_html__( 'Choose product type', 'woocommerce' ) . '</h3>' .
 										'<p>' . esc_html__( 'Choose a type for this product. Simple is suitable for most physical goods and services (we recommend setting up a simple product for now).', 'woocommerce' ) . '</p>' .
 										'<p>' . esc_html__( 'Variable is for more complex products such as t-shirts with multiple sizes.', 'woocommerce' ) . '</p>' .
 										'<p>' . esc_html__( 'Grouped products are for grouping several simple products into one.', 'woocommerce' ) . '</p>' .
 										'<p>' . esc_html__( 'Finally, external products are for linking off-site.', 'woocommerce' ) . '</p>',
 						'position' => array(
 							'edge'  => 'bottom',
-							'align' => 'middle'
-						)
-					)
+							'align' => 'middle',
+						),
+					),
 				),
 				'virtual' => array(
 					'target'       => "#_virtual",
 					'next'         => 'downloadable',
 					'next_trigger' => array(
 						'target' => "#_virtual",
-						'event'  => 'change'
+						'event'  => 'change',
 					),
 					'options' => array(
-						'content'  => 	'<h3>' . esc_html__( 'Virtual Products', 'woocommerce' ) . '</h3>' .
+						'content'  => '<h3>' . esc_html__( 'Virtual products', 'woocommerce' ) . '</h3>' .
 										'<p>' . esc_html__( 'Check the "Virtual" box if this is a non-physical item, for example a service, which does not need shipping.', 'woocommerce' ) . '</p>',
 						'position' => array(
 							'edge'  => 'bottom',
-							'align' => 'middle'
-						)
-					)
+							'align' => 'middle',
+						),
+					),
 				),
 				'downloadable' => array(
 					'target'       => "#_downloadable",
 					'next'         => 'regular_price',
 					'next_trigger' => array(
 						'target' => "#_downloadable",
-						'event'  => 'change'
+						'event'  => 'change',
 					),
 					'options' => array(
-						'content'  => 	'<h3>' . esc_html__( 'Downloadable Products', 'woocommerce' ) . '</h3>' .
+						'content'  => '<h3>' . esc_html__( 'Downloadable products', 'woocommerce' ) . '</h3>' .
 										'<p>' . esc_html__( 'If purchasing this product gives a customer access to a downloadable file, e.g. software, check this box.', 'woocommerce' ) . '</p>',
 						'position' => array(
 							'edge'  => 'bottom',
-							'align' => 'middle'
-						)
-					)
+							'align' => 'middle',
+						),
+					),
 				),
 				'regular_price' => array(
 					'target'       => "#_regular_price",
 					'next'         => 'postexcerpt',
 					'next_trigger' => array(
 						'target' => "#_regular_price",
-						'event'  => 'input'
+						'event'  => 'input',
 					),
 					'options' => array(
-						'content'  => 	'<h3>' . esc_html__( 'Prices', 'woocommerce' ) . '</h3>' .
-										'<p>' . esc_html__( 'Next you\'ll need to give your product a price.', 'woocommerce' ) . '</p>',
+						'content'  => '<h3>' . esc_html__( 'Prices', 'woocommerce' ) . '</h3>' .
+										'<p>' . esc_html__( 'Next you need to give your product a price.', 'woocommerce' ) . '</p>',
 						'position' => array(
 							'edge'  => 'bottom',
-							'align' => 'middle'
-						)
-					)
+							'align' => 'middle',
+						),
+					),
 				),
 				'postexcerpt' => array(
 					'target'       => "#postexcerpt",
 					'next'         => 'postimagediv',
 					'next_trigger' => array(
 						'target' => "#postexcerpt",
-						'event'  => 'input'
+						'event'  => 'input',
 					),
 					'options' => array(
-						'content'  => 	'<h3>' . esc_html__( 'Product Short Description', 'woocommerce' ) . '</h3>' .
+						'content'  => '<h3>' . esc_html__( 'Product short description', 'woocommerce' ) . '</h3>' .
 										'<p>' . esc_html__( 'Add a quick summary for your product here. This will appear on the product page under the product name.', 'woocommerce' ) . '</p>',
 						'position' => array(
 							'edge'  => 'bottom',
-							'align' => 'middle'
-						)
-					)
+							'align' => 'middle',
+						),
+					),
 				),
 				'postimagediv' => array(
 					'target'       => "#postimagediv",
 					'next'         => 'product_tag',
 					'options' => array(
-						'content'  => 	'<h3>' . esc_html__( 'Product Images', 'woocommerce' ) . '</h3>' .
-										'<p>' . esc_html__( 'Upload or assign an image to your product here. This image will be shown in your store\'s catalog.', 'woocommerce' ) . '</p>',
+						'content'  => '<h3>' . esc_html__( 'Product images', 'woocommerce' ) . '</h3>' .
+										'<p>' . esc_html__( "Upload or assign an image to your product here. This image will be shown in your store's catalog.", 'woocommerce' ) . '</p>',
 						'position' => array(
 							'edge'  => 'right',
-							'align' => 'middle'
-						)
-					)
+							'align' => 'middle',
+						),
+					),
 				),
 				'product_tag' => array(
 					'target'       => "#tagsdiv-product_tag",
 					'next'         => 'product_catdiv',
 					'options' => array(
-						'content'  => 	'<h3>' . esc_html__( 'Product Tags', 'woocommerce' ) . '</h3>' .
+						'content'  => '<h3>' . esc_html__( 'Product tags', 'woocommerce' ) . '</h3>' .
 										'<p>' . esc_html__( 'You can optionally "tag" your products here. Tags as a method of labeling your products to make them easier for customers to find.', 'woocommerce' ) . '</p>',
 						'position' => array(
 							'edge'  => 'right',
-							'align' => 'middle'
-						)
-					)
+							'align' => 'middle',
+						),
+					),
 				),
 				'product_catdiv' => array(
 					'target'       => "#product_catdiv",
 					'next'         => 'submitdiv',
 					'options' => array(
-						'content'  => 	'<h3>' . esc_html__( 'Product Categories', 'woocommerce' ) . '</h3>' .
+						'content'  => '<h3>' . esc_html__( 'Product categories', 'woocommerce' ) . '</h3>' .
 										'<p>' . esc_html__( 'Optionally assign categories to your products to make them easier to browse through and find in your store.', 'woocommerce' ) . '</p>',
 						'position' => array(
 							'edge'  => 'right',
-							'align' => 'middle'
-						)
-					)
+							'align' => 'middle',
+						),
+					),
 				),
 				'submitdiv' => array(
 					'target'       => "#submitdiv",
 					'next'         => '',
 					'options' => array(
-						'content'  => 	'<h3>' . esc_html__( 'Publish Your Product!', 'woocommerce' ) . '</h3>' .
+						'content'  => '<h3>' . esc_html__( 'Publish your product!', 'woocommerce' ) . '</h3>' .
 										'<p>' . esc_html__( 'When you are finished editing your product, hit the "Publish" button to publish your product to your store.', 'woocommerce' ) . '</p>',
 						'position' => array(
 							'edge'  => 'right',
-							'align' => 'middle'
-						)
-					)
-				)
-			)
+							'align' => 'middle',
+						),
+					),
+				),
+			),
 		);
 
 		$this->enqueue_pointers( $pointers );
@@ -218,7 +220,7 @@ class WC_Admin_Pointers {
 	 * @param array $pointers
 	 */
 	public function enqueue_pointers( $pointers ) {
-		$pointers = json_encode( $pointers );
+		$pointers = wp_json_encode( $pointers );
 		wp_enqueue_style( 'wp-pointer' );
 		wp_enqueue_script( 'wp-pointer' );
 		wc_enqueue_js( "
diff --git a/includes/admin/class-wc-admin-post-types.php b/includes/admin/class-wc-admin-post-types.php
index 74065660d0e..5dafedee3d6 100644
--- a/includes/admin/class-wc-admin-post-types.php
+++ b/includes/admin/class-wc-admin-post-types.php
@@ -2,17 +2,17 @@
 /**
  * Post Types Admin
  *
- * @author   WooThemes
+ * @author   WooCommerce
  * @category Admin
  * @package  WooCommerce/Admin
- * @version  2.4.0
+ * @version  3.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
-if ( ! class_exists( 'WC_Admin_Post_Types' ) ) :
+if ( ! class_exists( 'WC_Admin_Post_Types', false ) ) :
 
 /**
  * WC_Admin_Post_Types Class.
@@ -31,6 +31,9 @@ class WC_Admin_Post_Types {
 		// Disable Auto Save
 		add_action( 'admin_print_scripts', array( $this, 'disable_autosave' ) );
 
+		// Extra post data.
+		add_action( 'edit_form_top', array( $this, 'edit_form_top' ) );
+
 		// WP List table columns. Defined here so they are always available for events such as inline editing.
 		add_filter( 'manage_product_posts_columns', array( $this, 'product_columns' ) );
 		add_filter( 'manage_shop_coupon_posts_columns', array( $this, 'shop_coupon_columns' ) );
@@ -44,8 +47,6 @@ class WC_Admin_Post_Types {
 		add_filter( 'manage_edit-shop_coupon_sortable_columns', array( $this, 'shop_coupon_sortable_columns' ) );
 		add_filter( 'manage_edit-shop_order_sortable_columns', array( $this, 'shop_order_sortable_columns' ) );
 
-		add_filter( 'bulk_actions-edit-shop_order', array( $this, 'shop_order_bulk_actions' ) );
-
 		add_filter( 'list_table_primary_column', array( $this, 'list_table_primary_column' ), 10, 2 );
 		add_filter( 'post_row_actions', array( $this, 'row_actions' ), 2, 100 );
 
@@ -55,9 +56,10 @@ class WC_Admin_Post_Types {
 		// Bulk / quick edit
 		add_action( 'bulk_edit_custom_box', array( $this, 'bulk_edit' ), 10, 2 );
 		add_action( 'quick_edit_custom_box',  array( $this, 'quick_edit' ), 10, 2 );
-		add_action( 'save_post', array( $this, 'bulk_and_quick_edit_save_post' ), 10, 2 );
-		add_action( 'admin_footer', array( $this, 'bulk_admin_footer' ), 10 );
-		add_action( 'load-edit.php', array( $this, 'bulk_action' ) );
+		add_action( 'save_post', array( $this, 'bulk_and_quick_edit_hook' ), 10, 2 );
+		add_action( 'woocommerce_product_bulk_and_quick_edit', array( $this, 'bulk_and_quick_edit_save_post' ), 10, 2 );
+		add_filter( 'bulk_actions-edit-shop_order', array( $this, 'shop_order_bulk_actions' ) );
+		add_filter( 'handle_bulk_actions-edit-shop_order', array( $this, 'handle_shop_order_bulk_actions' ), 10, 3 );
 		add_action( 'admin_notices', array( $this, 'bulk_admin_notices' ) );
 
 		// Order Search
@@ -71,17 +73,9 @@ class WC_Admin_Post_Types {
 		add_filter( 'parse_query', array( $this, 'product_filters_query' ) );
 		add_filter( 'posts_search', array( $this, 'product_search' ) );
 
-		// Status transitions
-		add_action( 'delete_post', array( $this, 'delete_post' ) );
-		add_action( 'wp_trash_post', array( $this, 'trash_post' ) );
-		add_action( 'untrash_post', array( $this, 'untrash_post' ) );
-		add_action( 'before_delete_post', array( $this, 'delete_order_items' ) );
-		add_action( 'before_delete_post', array( $this, 'delete_order_downloadable_permissions' ) );
-
 		// Edit post screens
 		add_filter( 'enter_title_here', array( $this, 'enter_title_here' ), 1, 2 );
 		add_action( 'edit_form_after_title', array( $this, 'edit_form_after_title' ) );
-		add_filter( 'media_view_strings', array( $this, 'change_insert_into_post' ) );
 		add_filter( 'default_hidden_meta_boxes', array( $this, 'hidden_meta_boxes' ), 10, 2 );
 		add_action( 'post_submitbox_misc_actions', array( $this, 'product_data_visibility' ) );
 
@@ -93,20 +87,37 @@ class WC_Admin_Post_Types {
 			include( 'class-wc-admin-duplicate-product.php' );
 		}
 
-		// Meta-Box Class
-		include_once( 'class-wc-admin-meta-boxes.php' );
-
-		// Download permissions
-		add_action( 'woocommerce_process_product_file_download_paths', array( $this, 'process_product_file_download_paths' ), 10, 3 );
+		include_once( dirname( __FILE__ ) . '/class-wc-admin-meta-boxes.php' );
 
 		// Disable DFW feature pointer
 		add_action( 'admin_footer', array( $this, 'disable_dfw_feature_pointer' ) );
 
-		// If first time editing, disable columns by default.
-		if ( false === get_user_option( 'manageedit-shop_ordercolumnshidden' ) ) {
-			$user = wp_get_current_user();
-			update_user_option( $user->ID, 'manageedit-shop_ordercolumnshidden', array( 0 => 'billing_address' ), true );
+		// Disable post type view mode options
+		add_filter( 'view_mode_post_types', array( $this, 'disable_view_mode_options' ) );
+
+		// Update the screen options.
+		add_filter( 'default_hidden_columns', array( $this, 'adjust_shop_order_columns' ), 10, 2 );
+
+		// Show blank state
+		add_action( 'manage_posts_extra_tablenav', array( $this, 'maybe_render_blank_state' ) );
+
+		// Hide template for CPT archive.
+		add_filter( 'theme_page_templates', array( $this, 'hide_cpt_archive_templates' ), 10, 3 );
+		add_action( 'edit_form_top', array( $this, 'show_cpt_archive_notice' ) );
+	}
+
+	/**
+	 * Adjust shop order columns for the user on certain conditions.
+	 */
+	public function adjust_shop_order_columns( $hidden, $screen ) {
+		if ( isset( $screen->id ) && 'edit-shop_order' === $screen->id ) {
+			if ( 'disabled' === get_option( 'woocommerce_ship_to_countries' ) ) {
+				$hidden[] = 'shipping_address';
+			} else {
+				$hidden[] = 'billing_address';
+			}
 		}
+		return $hidden;
 	}
 
 	/**
@@ -123,13 +134,18 @@ class WC_Admin_Post_Types {
 			2 => __( 'Custom field updated.', 'woocommerce' ),
 			3 => __( 'Custom field deleted.', 'woocommerce' ),
 			4 => __( 'Product updated.', 'woocommerce' ),
+			/* translators: %s: revision title */
 			5 => isset( $_GET['revision'] ) ? sprintf( __( 'Product restored to revision from %s', 'woocommerce' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
+			/* translators: %s: product url */
 			6 => sprintf( __( 'Product published. <a href="%s">View Product</a>', 'woocommerce' ), esc_url( get_permalink( $post_ID ) ) ),
 			7 => __( 'Product saved.', 'woocommerce' ),
-			8 => sprintf( __( 'Product submitted. <a target="_blank" href="%s">Preview Product</a>', 'woocommerce' ), esc_url( add_query_arg( 'preview', 'true', get_permalink( $post_ID ) ) ) ),
-			9 => sprintf( __( 'Product scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview Product</a>', 'woocommerce' ),
+			/* translators: %s: product url */
+			8 => sprintf( __( 'Product submitted. <a target="_blank" href="%s">Preview product</a>', 'woocommerce' ), esc_url( add_query_arg( 'preview', 'true', get_permalink( $post_ID ) ) ) ),
+			/* translators: 1: date 2: product url */
+			9 => sprintf( __( 'Product scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview product</a>', 'woocommerce' ),
 			  date_i18n( __( 'M j, Y @ G:i', 'woocommerce' ), strtotime( $post->post_date ) ), esc_url( get_permalink( $post_ID ) ) ),
-			10 => sprintf( __( 'Product draft updated. <a target="_blank" href="%s">Preview Product</a>', 'woocommerce' ), esc_url( add_query_arg( 'preview', 'true', get_permalink( $post_ID ) ) ) ),
+			/* translators: %s: product url */
+			10 => sprintf( __( 'Product draft updated. <a target="_blank" href="%s">Preview product</a>', 'woocommerce' ), esc_url( add_query_arg( 'preview', 'true', get_permalink( $post_ID ) ) ) ),
 		);
 
 		$messages['shop_order'] = array(
@@ -138,14 +154,16 @@ class WC_Admin_Post_Types {
 			2 => __( 'Custom field updated.', 'woocommerce' ),
 			3 => __( 'Custom field deleted.', 'woocommerce' ),
 			4 => __( 'Order updated.', 'woocommerce' ),
+			/* translators: %s: revision title */
 			5 => isset( $_GET['revision'] ) ? sprintf( __( 'Order restored to revision from %s', 'woocommerce' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
 			6 => __( 'Order updated.', 'woocommerce' ),
 			7 => __( 'Order saved.', 'woocommerce' ),
 			8 => __( 'Order submitted.', 'woocommerce' ),
+			/* translators: %s: date */
 			9 => sprintf( __( 'Order scheduled for: <strong>%1$s</strong>.', 'woocommerce' ),
 			  date_i18n( __( 'M j, Y @ G:i', 'woocommerce' ), strtotime( $post->post_date ) ) ),
 			10 => __( 'Order draft updated.', 'woocommerce' ),
-			11 => __( 'Order updated and email sent.', 'woocommerce' )
+			11 => __( 'Order updated and email sent.', 'woocommerce' ),
 		);
 
 		$messages['shop_coupon'] = array(
@@ -154,13 +172,15 @@ class WC_Admin_Post_Types {
 			2 => __( 'Custom field updated.', 'woocommerce' ),
 			3 => __( 'Custom field deleted.', 'woocommerce' ),
 			4 => __( 'Coupon updated.', 'woocommerce' ),
+			/* translators: %s: revision title */
 			5 => isset( $_GET['revision'] ) ? sprintf( __( 'Coupon restored to revision from %s', 'woocommerce' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
 			6 => __( 'Coupon updated.', 'woocommerce' ),
 			7 => __( 'Coupon saved.', 'woocommerce' ),
 			8 => __( 'Coupon submitted.', 'woocommerce' ),
+			/* translators: %s: date */
 			9 => sprintf( __( 'Coupon scheduled for: <strong>%1$s</strong>.', 'woocommerce' ),
 			  date_i18n( __( 'M j, Y @ G:i', 'woocommerce' ), strtotime( $post->post_date ) ) ),
-			10 => __( 'Coupon draft updated.', 'woocommerce' )
+			10 => __( 'Coupon draft updated.', 'woocommerce' ),
 		);
 
 		return $messages;
@@ -175,26 +195,41 @@ class WC_Admin_Post_Types {
 	public function bulk_post_updated_messages( $bulk_messages, $bulk_counts ) {
 
 		$bulk_messages['product'] = array(
+			/* translators: %s: product count */
 			'updated'   => _n( '%s product updated.', '%s products updated.', $bulk_counts['updated'], 'woocommerce' ),
+			/* translators: %s: product count */
 			'locked'    => _n( '%s product not updated, somebody is editing it.', '%s products not updated, somebody is editing them.', $bulk_counts['locked'], 'woocommerce' ),
+			/* translators: %s: product count */
 			'deleted'   => _n( '%s product permanently deleted.', '%s products permanently deleted.', $bulk_counts['deleted'], 'woocommerce' ),
+			/* translators: %s: product count */
 			'trashed'   => _n( '%s product moved to the Trash.', '%s products moved to the Trash.', $bulk_counts['trashed'], 'woocommerce' ),
+			/* translators: %s: product count */
 			'untrashed' => _n( '%s product restored from the Trash.', '%s products restored from the Trash.', $bulk_counts['untrashed'], 'woocommerce' ),
 		);
 
 		$bulk_messages['shop_order'] = array(
+			/* translators: %s: order count */
 			'updated'   => _n( '%s order updated.', '%s orders updated.', $bulk_counts['updated'], 'woocommerce' ),
+			/* translators: %s: order count */
 			'locked'    => _n( '%s order not updated, somebody is editing it.', '%s orders not updated, somebody is editing them.', $bulk_counts['locked'], 'woocommerce' ),
+			/* translators: %s: order count */
 			'deleted'   => _n( '%s order permanently deleted.', '%s orders permanently deleted.', $bulk_counts['deleted'], 'woocommerce' ),
+			/* translators: %s: order count */
 			'trashed'   => _n( '%s order moved to the Trash.', '%s orders moved to the Trash.', $bulk_counts['trashed'], 'woocommerce' ),
+			/* translators: %s: order count */
 			'untrashed' => _n( '%s order restored from the Trash.', '%s orders restored from the Trash.', $bulk_counts['untrashed'], 'woocommerce' ),
 		);
 
 		$bulk_messages['shop_coupon'] = array(
+			/* translators: %s: coupon count */
 			'updated'   => _n( '%s coupon updated.', '%s coupons updated.', $bulk_counts['updated'], 'woocommerce' ),
+			/* translators: %s: coupon count */
 			'locked'    => _n( '%s coupon not updated, somebody is editing it.', '%s coupons not updated, somebody is editing them.', $bulk_counts['locked'], 'woocommerce' ),
+			/* translators: %s: coupon count */
 			'deleted'   => _n( '%s coupon permanently deleted.', '%s coupons permanently deleted.', $bulk_counts['deleted'], 'woocommerce' ),
+			/* translators: %s: coupon count */
 			'trashed'   => _n( '%s coupon moved to the Trash.', '%s coupons moved to the Trash.', $bulk_counts['trashed'], 'woocommerce' ),
+			/* translators: %s: coupon count */
 			'untrashed' => _n( '%s coupon restored from the Trash.', '%s coupons restored from the Trash.', $bulk_counts['untrashed'], 'woocommerce' ),
 		);
 
@@ -222,7 +257,7 @@ class WC_Admin_Post_Types {
 			$columns['sku'] = __( 'SKU', 'woocommerce' );
 		}
 
-		if ( 'yes' == get_option( 'woocommerce_manage_stock' ) ) {
+		if ( 'yes' === get_option( 'woocommerce_manage_stock' ) ) {
 			$columns['is_in_stock'] = __( 'Stock', 'woocommerce' );
 		}
 
@@ -266,11 +301,10 @@ class WC_Admin_Post_Types {
 		$columns['cb']               = $existing_columns['cb'];
 		$columns['order_status']     = '<span class="status_head tips" data-tip="' . esc_attr__( 'Status', 'woocommerce' ) . '">' . esc_attr__( 'Status', 'woocommerce' ) . '</span>';
 		$columns['order_title']      = __( 'Order', 'woocommerce' );
-		$columns['order_items']      = __( 'Purchased', 'woocommerce' );
 		$columns['billing_address']  = __( 'Billing', 'woocommerce' );
 		$columns['shipping_address'] = __( 'Ship to', 'woocommerce' );
-		$columns['customer_message'] = '<span class="notes_head tips" data-tip="' . esc_attr__( 'Customer Message', 'woocommerce' ) . '">' . esc_attr__( 'Customer Message', 'woocommerce' ) . '</span>';
-		$columns['order_notes']      = '<span class="order-notes_head tips" data-tip="' . esc_attr__( 'Order Notes', 'woocommerce' ) . '">' . esc_attr__( 'Order Notes', 'woocommerce' ) . '</span>';
+		$columns['customer_message'] = '<span class="notes_head tips" data-tip="' . esc_attr__( 'Customer message', 'woocommerce' ) . '">' . esc_attr__( 'Customer message', 'woocommerce' ) . '</span>';
+		$columns['order_notes']      = '<span class="order-notes_head tips" data-tip="' . esc_attr__( 'Order notes', 'woocommerce' ) . '">' . esc_attr__( 'Order notes', 'woocommerce' ) . '</span>';
 		$columns['order_date']       = __( 'Date', 'woocommerce' );
 		$columns['order_total']      = __( 'Total', 'woocommerce' );
 		$columns['order_actions']    = __( 'Actions', 'woocommerce' );
@@ -286,13 +320,18 @@ class WC_Admin_Post_Types {
 	public function render_product_columns( $column ) {
 		global $post, $the_product;
 
-		if ( empty( $the_product ) || $the_product->id != $post->ID ) {
+		if ( empty( $the_product ) || $the_product->get_id() != $post->ID ) {
 			$the_product = wc_get_product( $post );
 		}
 
+		// Only continue if we have a product.
+		if ( empty( $the_product ) ) {
+			return;
+		}
+
 		switch ( $column ) {
 			case 'thumb' :
-				echo '<a href="' . get_edit_post_link( $post->ID ) . '">' . $the_product->get_image( 'post-thumbnail' ) . '</a>';
+				echo '<a href="' . get_edit_post_link( $post->ID ) . '">' . $the_product->get_image( 'thumbnail' ) . '</a>';
 				break;
 			case 'name' :
 				$edit_link = get_edit_post_link( $post->ID );
@@ -305,7 +344,7 @@ class WC_Admin_Post_Types {
 				echo '</strong>';
 
 				if ( $post->post_parent > 0 ) {
-					echo '&nbsp;&nbsp;&larr; <a href="'. get_edit_post_link( $post->post_parent ) .'">'. get_the_title( $post->post_parent ) .'</a>';
+					echo '&nbsp;&nbsp;&larr; <a href="' . get_edit_post_link( $post->post_parent ) . '">' . get_the_title( $post->post_parent ) . '</a>';
 				}
 
 				// Excerpt view
@@ -313,45 +352,43 @@ class WC_Admin_Post_Types {
 					echo apply_filters( 'the_excerpt', $post->post_excerpt );
 				}
 
-				$this->_render_product_row_actions( $post, $title );
-
 				get_inline_data( $post );
 
 				/* Custom inline data for woocommerce. */
 				echo '
-					<div class="hidden" id="woocommerce_inline_' . $post->ID . '">
-						<div class="menu_order">' . $post->menu_order . '</div>
-						<div class="sku">' . $the_product->sku . '</div>
-						<div class="regular_price">' . $the_product->regular_price . '</div>
-						<div class="sale_price">' . $the_product->sale_price . '</div>
-						<div class="weight">' . $the_product->weight . '</div>
-						<div class="length">' . $the_product->length . '</div>
-						<div class="width">' . $the_product->width . '</div>
-						<div class="height">' . $the_product->height . '</div>
-						<div class="shipping_class">' . $the_product->get_shipping_class() . '</div>
-						<div class="visibility">' . $the_product->visibility . '</div>
-						<div class="stock_status">' . $the_product->stock_status . '</div>
-						<div class="stock">' . $the_product->stock . '</div>
-						<div class="manage_stock">' . $the_product->manage_stock . '</div>
-						<div class="featured">' . $the_product->featured . '</div>
-						<div class="product_type">' . $the_product->product_type . '</div>
-						<div class="product_is_virtual">' . $the_product->virtual . '</div>
-						<div class="tax_status">' . $the_product->tax_status . '</div>
-						<div class="tax_class">' . $the_product->tax_class . '</div>
-						<div class="backorders">' . $the_product->backorders . '</div>
+					<div class="hidden" id="woocommerce_inline_' . absint( $post->ID ) . '">
+						<div class="menu_order">' . absint( $the_product->get_menu_order() ) . '</div>
+						<div class="sku">' . esc_html( $the_product->get_sku() ) . '</div>
+						<div class="regular_price">' . esc_html( $the_product->get_regular_price() ) . '</div>
+						<div class="sale_price">' . esc_html( $the_product->get_sale_price() ) . '</div>
+						<div class="weight">' . esc_html( $the_product->get_weight() ) . '</div>
+						<div class="length">' . esc_html( $the_product->get_length() ) . '</div>
+						<div class="width">' . esc_html( $the_product->get_width() ) . '</div>
+						<div class="height">' . esc_html( $the_product->get_height() ) . '</div>
+						<div class="shipping_class">' . esc_html( $the_product->get_shipping_class() ) . '</div>
+						<div class="visibility">' . esc_html( $the_product->get_catalog_visibility() ) . '</div>
+						<div class="stock_status">' . esc_html( $the_product->get_stock_status() ) . '</div>
+						<div class="stock">' . esc_html( $the_product->get_stock_quantity() ) . '</div>
+						<div class="manage_stock">' . esc_html( wc_bool_to_string( $the_product->get_manage_stock() ) ) . '</div>
+						<div class="featured">' . esc_html( wc_bool_to_string( $the_product->get_featured() ) ) . '</div>
+						<div class="product_type">' . esc_html( $the_product->get_type() ) . '</div>
+						<div class="product_is_virtual">' . esc_html( wc_bool_to_string( $the_product->get_virtual() ) ) . '</div>
+						<div class="tax_status">' . esc_html( $the_product->get_tax_status() ) . '</div>
+						<div class="tax_class">' . esc_html( $the_product->get_tax_class() ) . '</div>
+						<div class="backorders">' . esc_html( $the_product->get_backorders() ) . '</div>
 					</div>
 				';
 
 			break;
 			case 'sku' :
-				echo $the_product->get_sku() ? $the_product->get_sku() : '<span class="na">&ndash;</span>';
+				echo $the_product->get_sku() ? esc_html( $the_product->get_sku() ) : '<span class="na">&ndash;</span>';
 				break;
 			case 'product_type' :
-				if ( 'grouped' == $the_product->product_type ) {
+				if ( $the_product->is_type( 'grouped' ) ) {
 					echo '<span class="product-type tips grouped" data-tip="' . esc_attr__( 'Grouped', 'woocommerce' ) . '"></span>';
-				} elseif ( 'external' == $the_product->product_type ) {
+				} elseif ( $the_product->is_type( 'external' ) ) {
 					echo '<span class="product-type tips external" data-tip="' . esc_attr__( 'External/Affiliate', 'woocommerce' ) . '"></span>';
-				} elseif ( 'simple' == $the_product->product_type ) {
+				} elseif ( $the_product->is_type( 'simple' ) ) {
 
 					if ( $the_product->is_virtual() ) {
 						echo '<span class="product-type tips virtual" data-tip="' . esc_attr__( 'Virtual', 'woocommerce' ) . '"></span>';
@@ -360,12 +397,11 @@ class WC_Admin_Post_Types {
 					} else {
 						echo '<span class="product-type tips simple" data-tip="' . esc_attr__( 'Simple', 'woocommerce' ) . '"></span>';
 					}
-
-				} elseif ( 'variable' == $the_product->product_type ) {
+				} elseif ( $the_product->is_type( 'variable' ) ) {
 					echo '<span class="product-type tips variable" data-tip="' . esc_attr__( 'Variable', 'woocommerce' ) . '"></span>';
 				} else {
 					// Assuming that we have other types in future
-					echo '<span class="product-type tips ' . $the_product->product_type . '" data-tip="' . ucfirst( $the_product->product_type ) . '"></span>';
+					echo '<span class="product-type tips ' . esc_attr( sanitize_html_class( $the_product->get_type() ) ) . '" data-tip="' . esc_attr( ucfirst( $the_product->get_type() ) ) . '"></span>';
 				}
 				break;
 			case 'price' :
@@ -386,7 +422,7 @@ class WC_Admin_Post_Types {
 				break;
 			case 'featured' :
 				$url = wp_nonce_url( admin_url( 'admin-ajax.php?action=woocommerce_feature_product&product_id=' . $post->ID ), 'woocommerce-feature-product' );
-				echo '<a href="' . esc_url( $url ) . '" title="'. __( 'Toggle featured', 'woocommerce' ) . '">';
+				echo '<a href="' . esc_url( $url ) . '" aria-label="' . __( 'Toggle featured', 'woocommerce' ) . '">';
 				if ( $the_product->is_featured() ) {
 					echo '<span class="wc-featured tips" data-tip="' . esc_attr__( 'Yes', 'woocommerce' ) . '">' . __( 'Yes', 'woocommerce' ) . '</span>';
 				} else {
@@ -397,113 +433,52 @@ class WC_Admin_Post_Types {
 			case 'is_in_stock' :
 
 				if ( $the_product->is_in_stock() ) {
-					echo '<mark class="instock">' . __( 'In stock', 'woocommerce' ) . '</mark>';
+					$stock_html = '<mark class="instock">' . __( 'In stock', 'woocommerce' ) . '</mark>';
 				} else {
-					echo '<mark class="outofstock">' . __( 'Out of stock', 'woocommerce' ) . '</mark>';
+					$stock_html = '<mark class="outofstock">' . __( 'Out of stock', 'woocommerce' ) . '</mark>';
 				}
 
 				if ( $the_product->managing_stock() ) {
-					echo ' &times; ' . $the_product->get_total_stock();
+					$stock_html .= ' (' . wc_stock_amount( $the_product->get_stock_quantity() ) . ')';
 				}
 
-				break;
+				echo apply_filters( 'woocommerce_admin_stock_html', $stock_html, $the_product );
 
+				break;
 			default :
 				break;
 		}
 	}
 
-	/**
-	 * Render product row actions for old version of WordPress.
-	 * Since WordPress 4.3 we don't have to build the row actions.
-	 *
-	 * @param WP_Post $post
-	 * @param string $title
-	 */
-	private function _render_product_row_actions( $post, $title ) {
-		global $wp_version;
-
-		if ( version_compare( $wp_version, '4.3-beta', '>=' ) ) {
-			return;
-		}
-
-		$post_type_object = get_post_type_object( $post->post_type );
-		$can_edit_post    = current_user_can( $post_type_object->cap->edit_post, $post->ID );
-
-		// Get actions
-		$actions = array();
-
-		$actions['id'] = 'ID: ' . $post->ID;
-
-		if ( $can_edit_post && 'trash' != $post->post_status ) {
-			$actions['edit'] = '<a href="' . get_edit_post_link( $post->ID, true ) . '" title="' . esc_attr( __( 'Edit this item', 'woocommerce' ) ) . '">' . __( 'Edit', 'woocommerce' ) . '</a>';
-			$actions['inline hide-if-no-js'] = '<a href="#" class="editinline" title="' . esc_attr( __( 'Edit this item inline', 'woocommerce' ) ) . '">' . __( 'Quick&nbsp;Edit', 'woocommerce' ) . '</a>';
-		}
-		if ( current_user_can( $post_type_object->cap->delete_post, $post->ID ) ) {
-			if ( 'trash' == $post->post_status ) {
-				$actions['untrash'] = '<a title="' . esc_attr( __( 'Restore this item from the Trash', 'woocommerce' ) ) . '" href="' . wp_nonce_url( admin_url( sprintf( $post_type_object->_edit_link . '&amp;action=untrash', $post->ID ) ), 'untrash-post_' . $post->ID ) . '">' . __( 'Restore', 'woocommerce' ) . '</a>';
-			} elseif ( EMPTY_TRASH_DAYS ) {
-				$actions['trash'] = '<a class="submitdelete" title="' . esc_attr( __( 'Move this item to the Trash', 'woocommerce' ) ) . '" href="' . get_delete_post_link( $post->ID ) . '">' . __( 'Trash', 'woocommerce' ) . '</a>';
-			}
-
-			if ( 'trash' == $post->post_status || ! EMPTY_TRASH_DAYS ) {
-				$actions['delete'] = '<a class="submitdelete" title="' . esc_attr( __( 'Delete this item permanently', 'woocommerce' ) ) . '" href="' . get_delete_post_link( $post->ID, '', true ) . '">' . __( 'Delete Permanently', 'woocommerce' ) . '</a>';
-			}
-		}
-		if ( $post_type_object->public ) {
-			if ( in_array( $post->post_status, array( 'pending', 'draft', 'future' ) ) ) {
-				if ( $can_edit_post )
-					$actions['view'] = '<a href="' . esc_url( add_query_arg( 'preview', 'true', get_permalink( $post->ID ) ) ) . '" title="' . esc_attr( sprintf( __( 'Preview &#8220;%s&#8221;', 'woocommerce' ), $title ) ) . '" rel="permalink">' . __( 'Preview', 'woocommerce' ) . '</a>';
-			} elseif ( 'trash' != $post->post_status ) {
-				$actions['view'] = '<a href="' . get_permalink( $post->ID ) . '" title="' . esc_attr( sprintf( __( 'View &#8220;%s&#8221;', 'woocommerce' ), $title ) ) . '" rel="permalink">' . __( 'View', 'woocommerce' ) . '</a>';
-			}
-		}
-
-		$actions = apply_filters( 'post_row_actions', $actions, $post );
-
-		echo '<div class="row-actions">';
-
-		$i = 0;
-		$action_count = sizeof( $actions );
-
-		foreach ( $actions as $action => $link ) {
-			++$i;
-			( $i == $action_count ) ? $sep = '' : $sep = ' | ';
-			echo '<span class="' . $action . '">' . $link . $sep . '</span>';
-		}
-		echo '</div>';
-	}
-
 	/**
 	 * Output custom columns for coupons.
 	 *
 	 * @param string $column
 	 */
 	public function render_shop_coupon_columns( $column ) {
-		global $post, $woocommerce;
+		global $post, $the_coupon;
+
+		if ( empty( $the_coupon ) || $the_coupon->get_id() !== $post->ID ) {
+			$the_coupon = new WC_Coupon( $post->ID );
+		}
 
 		switch ( $column ) {
 			case 'coupon_code' :
 				$edit_link = get_edit_post_link( $post->ID );
-				$title     = _draft_or_post_title();
+				$title     = $the_coupon->get_code();
 
 				echo '<strong><a class="row-title" href="' . esc_url( $edit_link ) . '">' . esc_html( $title ) . '</a>';
-
 				_post_states( $post );
-
 				echo '</strong>';
-
-				$this->_render_shop_coupon_row_actions( $post, $title );
 			break;
 			case 'type' :
-				echo esc_html( wc_get_coupon_type( get_post_meta( $post->ID, 'discount_type', true ) ) );
+				echo esc_html( wc_get_coupon_type( $the_coupon->get_discount_type() ) );
 			break;
 			case 'amount' :
-				echo esc_html( get_post_meta( $post->ID, 'coupon_amount', true ) );
+				echo esc_html( wc_format_localized_price( $the_coupon->get_amount() ) );
 			break;
 			case 'products' :
-				$product_ids = get_post_meta( $post->ID, 'product_ids', true );
-				$product_ids = $product_ids ? array_map( 'absint', explode( ',', $product_ids ) ) : array();
+				$product_ids = $the_coupon->get_product_ids();
 
 				if ( sizeof( $product_ids ) > 0 ) {
 					echo esc_html( implode( ', ', $product_ids ) );
@@ -512,7 +487,7 @@ class WC_Admin_Post_Types {
 				}
 			break;
 			case 'usage_limit' :
-				$usage_limit = get_post_meta( $post->ID, 'usage_limit', true );
+				$usage_limit = $the_coupon->get_usage_limit();
 
 				if ( $usage_limit ) {
 					echo esc_html( $usage_limit );
@@ -521,152 +496,57 @@ class WC_Admin_Post_Types {
 				}
 			break;
 			case 'usage' :
-				$usage_count = absint( get_post_meta( $post->ID, 'usage_count', true ) );
-				$usage_limit = esc_html( get_post_meta( $post->ID, 'usage_limit', true ) );
-				$usage_url   = sprintf( '<a href="%s">%s</a>', admin_url( sprintf( 'edit.php?s=%s&post_status=all&post_type=shop_order', esc_html( $post->post_title ) ) ), $usage_count );
+				$usage_count = $the_coupon->get_usage_count();
+				$usage_limit = $the_coupon->get_usage_limit();
 
-				if ( $usage_limit ) {
-					printf( __( '%s / %s', 'woocommerce' ), $usage_url, $usage_limit );
-				} else {
-					printf( __( '%s / &infin;', 'woocommerce' ), $usage_url );
-				}
+				/* translators: 1: count 2: limit */
+				printf(
+					__( '%1$s / %2$s', 'woocommerce' ),
+					esc_html( $usage_count ),
+					esc_html( $usage_limit ? $usage_limit : '&infin;' )
+				);
 			break;
 			case 'expiry_date' :
-				$expiry_date = get_post_meta( $post->ID, 'expiry_date', true );
+				$expiry_date = $the_coupon->get_date_expires();
 
 				if ( $expiry_date ) {
-					echo esc_html( date_i18n( 'F j, Y', strtotime( $expiry_date ) ) );
+					echo esc_html( $expiry_date->date_i18n( 'F j, Y' ) );
 				} else {
 					echo '&ndash;';
 				}
 			break;
 			case 'description' :
-				echo wp_kses_post( $post->post_excerpt );
+				echo wp_kses_post( $the_coupon->get_description() ? $the_coupon->get_description() : '&ndash;' );
 			break;
 		}
 	}
 
-	/**
-	 * Render shop_coupon row actions for old version of WordPress.
-	 * Since WordPress 4.3 we don't have to build the row actions.
-	 *
-	 * @param WP_Post $post
-	 * @param string $title
-	 */
-	private function _render_shop_coupon_row_actions( $post, $title ) {
-		global $wp_version;
-
-		if ( version_compare( $wp_version, '4.3-beta', '>=' ) ) {
-			return;
-		}
-
-		$post_type_object = get_post_type_object( $post->post_type );
-
-		// Get actions
-		$actions = array();
-
-		if ( current_user_can( $post_type_object->cap->edit_post, $post->ID ) ) {
-			$actions['edit'] = '<a href="' . admin_url( sprintf( $post_type_object->_edit_link . '&amp;action=edit', $post->ID ) ) . '">' . __( 'Edit', 'woocommerce' ) . '</a>';
-		}
-
-		if ( current_user_can( $post_type_object->cap->delete_post, $post->ID ) ) {
-
-			if ( 'trash' == $post->post_status ) {
-				$actions['untrash'] = "<a title='" . esc_attr( __( 'Restore this item from the Trash', 'woocommerce' ) ) . "' href='" . wp_nonce_url( admin_url( sprintf( $post_type_object->_edit_link . '&amp;action=untrash', $post->ID ) ), 'untrash-post_' . $post->ID ) . "'>" . __( 'Restore', 'woocommerce' ) . "</a>";
-			} elseif ( EMPTY_TRASH_DAYS ) {
-				$actions['trash'] = "<a class='submitdelete' title='" . esc_attr( __( 'Move this item to the Trash', 'woocommerce' ) ) . "' href='" . get_delete_post_link( $post->ID ) . "'>" . __( 'Trash', 'woocommerce' ) . "</a>";
-			}
-
-			if ( 'trash' == $post->post_status || ! EMPTY_TRASH_DAYS ) {
-				$actions['delete'] = "<a class='submitdelete' title='" . esc_attr( __( 'Delete this item permanently', 'woocommerce' ) ) . "' href='" . get_delete_post_link( $post->ID, '', true ) . "'>" . __( 'Delete Permanently', 'woocommerce' ) . "</a>";
-			}
-		}
-
-		$actions = apply_filters( 'post_row_actions', $actions, $post );
-
-		echo '<div class="row-actions">';
-
-		$i = 0;
-		$action_count = sizeof( $actions );
-
-		foreach ( $actions as $action => $link ) {
-			++$i;
-			( $i == $action_count ) ? $sep = '' : $sep = ' | ';
-			echo "<span class='$action'>$link$sep</span>";
-		}
-		echo '</div>';
-	}
-
 	/**
 	 * Output custom columns for coupons.
-	 * @param  string $column
+	 * @param string $column
 	 */
 	public function render_shop_order_columns( $column ) {
-		global $post, $woocommerce, $the_order;
+		global $post, $the_order;
 
-		if ( empty( $the_order ) || $the_order->id != $post->ID ) {
+		if ( empty( $the_order ) || $the_order->get_id() !== $post->ID ) {
 			$the_order = wc_get_order( $post->ID );
 		}
 
 		switch ( $column ) {
 			case 'order_status' :
-
-				printf( '<mark class="%s tips" data-tip="%s">%s</mark>', sanitize_title( $the_order->get_status() ), wc_get_order_status_name( $the_order->get_status() ), wc_get_order_status_name( $the_order->get_status() ) );
-
+				printf( '<mark class="%s tips" data-tip="%s">%s</mark>', esc_attr( sanitize_html_class( $the_order->get_status() ) ), esc_attr( wc_get_order_status_name( $the_order->get_status() ) ), esc_html( wc_get_order_status_name( $the_order->get_status() ) ) );
 			break;
 			case 'order_date' :
-
-				if ( '0000-00-00 00:00:00' == $post->post_date ) {
-					$t_time = $h_time = __( 'Unpublished', 'woocommerce' );
-				} else {
-					$t_time = get_the_time( __( 'Y/m/d g:i:s A', 'woocommerce' ), $post );
-					$h_time = get_the_time( __( 'Y/m/d', 'woocommerce' ), $post );
-				}
-
-				echo '<abbr title="' . esc_attr( $t_time ) . '">' . esc_html( apply_filters( 'post_date_column_time', $h_time, $post ) ) . '</abbr>';
-
+				printf( '<time datetime="%s">%s</time>', esc_attr( $the_order->get_date_created()->date( 'c' ) ), esc_html( $the_order->get_date_created()->date_i18n( apply_filters( 'woocommerce_admin_order_date_format', __( 'Y-m-d', 'woocommerce' ) ) ) ) );
 			break;
 			case 'customer_message' :
-				if ( $the_order->customer_message ) {
-					echo '<span class="note-on tips" data-tip="' . wc_sanitize_tooltip( $the_order->customer_message ) . '">' . __( 'Yes', 'woocommerce' ) . '</span>';
+				if ( $the_order->get_customer_note() ) {
+					echo '<span class="note-on tips" data-tip="' . wc_sanitize_tooltip( $the_order->get_customer_note() ) . '">' . __( 'Yes', 'woocommerce' ) . '</span>';
 				} else {
 					echo '<span class="na">&ndash;</span>';
 				}
 
 			break;
-			case 'order_items' :
-
-				echo '<a href="#" class="show_order_items">' . apply_filters( 'woocommerce_admin_order_item_count', sprintf( _n( '%d item', '%d items', $the_order->get_item_count(), 'woocommerce' ), $the_order->get_item_count() ), $the_order ) . '</a>';
-
-				if ( sizeof( $the_order->get_items() ) > 0 ) {
-
-					echo '<table class="order_items" cellspacing="0">';
-
-					foreach ( $the_order->get_items() as $item ) {
-						$product        = apply_filters( 'woocommerce_order_item_product', $the_order->get_product_from_item( $item ), $item );
-						$item_meta      = new WC_Order_Item_Meta( $item, $product );
-						$item_meta_html = $item_meta->display( true, true );
-						?>
-						<tr class="<?php echo apply_filters( 'woocommerce_admin_order_item_class', '', $item ); ?>">
-							<td class="qty"><?php echo absint( $item['qty'] ); ?></td>
-							<td class="name">
-								<?php  if ( $product ) : ?>
-									<?php echo ( wc_product_sku_enabled() && $product->get_sku() ) ? $product->get_sku() . ' - ' : ''; ?><a href="<?php echo get_edit_post_link( $product->id ); ?>" title="<?php echo apply_filters( 'woocommerce_order_item_name', $item['name'], $item, false ); ?>"><?php echo apply_filters( 'woocommerce_order_item_name', $item['name'], $item, false ); ?></a>
-								<?php else : ?>
-									<?php echo apply_filters( 'woocommerce_order_item_name', $item['name'], $item, false ); ?>
-								<?php endif; ?>
-								<?php if ( ! empty( $item_meta_html ) ) : ?>
-									<?php echo wc_help_tip( $item_meta_html ); ?>
-								<?php endif; ?>
-							</td>
-						</tr>
-						<?php
-					}
-
-					echo '</table>';
-
-				} else echo '&ndash;';
-			break;
 			case 'billing_address' :
 
 				if ( $address = $the_order->get_formatted_billing_address() ) {
@@ -675,15 +555,15 @@ class WC_Admin_Post_Types {
 					echo '&ndash;';
 				}
 
-				if ( $the_order->billing_phone ) {
-					echo '<small class="meta">' . __( 'Tel:', 'woocommerce' ) . ' ' . esc_html( $the_order->billing_phone ) . '</small>';
+				if ( $the_order->get_billing_phone() ) {
+					echo '<small class="meta">' . __( 'Phone:', 'woocommerce' ) . ' ' . esc_html( $the_order->get_billing_phone() ) . '</small>';
 				}
 
 			break;
 			case 'shipping_address' :
 
 				if ( $address = $the_order->get_formatted_shipping_address() ) {
-					echo '<a target="_blank" href="' . esc_url( $the_order->get_shipping_address_map_url() ) . '">'. esc_html( preg_replace( '#<br\s*/?>#i', ', ', $address ) ) .'</a>';
+					echo '<a target="_blank" href="' . esc_url( $the_order->get_shipping_address_map_url() ) . '">' . esc_html( preg_replace( '#<br\s*/?>#i', ', ', $address ) ) . '</a>';
 				} else {
 					echo '&ndash;';
 				}
@@ -703,19 +583,20 @@ class WC_Admin_Post_Types {
 					$latest_notes = get_comments( array(
 						'post_id'   => $post->ID,
 						'number'    => 1,
-						'status'    => $status
+						'status'    => $status,
 					) );
 
 					$latest_note = current( $latest_notes );
 
-					if ( $post->comment_count == 1 ) {
+					if ( isset( $latest_note->comment_content ) && 1 == $post->comment_count ) {
 						echo '<span class="note-on tips" data-tip="' . wc_sanitize_tooltip( $latest_note->comment_content ) . '">' . __( 'Yes', 'woocommerce' ) . '</span>';
 					} elseif ( isset( $latest_note->comment_content ) ) {
+						/* translators: %d: notes count */
 						echo '<span class="note-on tips" data-tip="' . wc_sanitize_tooltip( $latest_note->comment_content . '<br/><small style="display:block">' . sprintf( _n( 'plus %d other note', 'plus %d other notes', ( $post->comment_count - 1 ), 'woocommerce' ), $post->comment_count - 1 ) . '</small>' ) . '">' . __( 'Yes', 'woocommerce' ) . '</span>';
 					} else {
+						/* translators: %d: notes count */
 						echo '<span class="note-on tips" data-tip="' . wc_sanitize_tooltip( sprintf( _n( '%d note', '%d notes', $post->comment_count, 'woocommerce' ), $post->comment_count ) ) . '">' . __( 'Yes', 'woocommerce' ) . '</span>';
 					}
-
 				} else {
 					echo '<span class="na">&ndash;</span>';
 				}
@@ -724,40 +605,35 @@ class WC_Admin_Post_Types {
 			case 'order_total' :
 				echo $the_order->get_formatted_order_total();
 
-				if ( $the_order->payment_method_title ) {
-					echo '<small class="meta">' . __( 'Via', 'woocommerce' ) . ' ' . esc_html( $the_order->payment_method_title ) . '</small>';
+				if ( $the_order->get_payment_method_title() ) {
+					echo '<small class="meta">' . __( 'Via', 'woocommerce' ) . ' ' . esc_html( $the_order->get_payment_method_title() ) . '</small>';
 				}
 			break;
 			case 'order_title' :
 
-				if ( $the_order->user_id ) {
-					$user_info = get_userdata( $the_order->user_id );
-				}
-
-				if ( ! empty( $user_info ) ) {
-
-					$username = '<a href="user-edit.php?user_id=' . absint( $user_info->ID ) . '">';
-
-					if ( $user_info->first_name || $user_info->last_name ) {
-						$username .= esc_html( sprintf( _x( '%1$s %2$s', 'full name', 'woocommerce' ), ucfirst( $user_info->first_name ), ucfirst( $user_info->last_name ) ) );
-					} else {
-						$username .= esc_html( ucfirst( $user_info->display_name ) );
-					}
-
+				if ( $the_order->get_customer_id() ) {
+					$user     = get_user_by( 'id', $the_order->get_customer_id() );
+					$username = '<a href="user-edit.php?user_id=' . absint( $the_order->get_customer_id() ) . '">';
+					$username .= esc_html( ucwords( $user->display_name ) );
 					$username .= '</a>';
-
+				} elseif ( $the_order->get_billing_first_name() || $the_order->get_billing_last_name() ) {
+					/* translators: 1: first name 2: last name */
+					$username = trim( sprintf( _x( '%1$s %2$s', 'full name', 'woocommerce' ), $the_order->get_billing_first_name(), $the_order->get_billing_last_name() ) );
+				} elseif ( $the_order->get_billing_company() ) {
+					$username = trim( $the_order->get_billing_company() );
 				} else {
-					if ( $the_order->billing_first_name || $the_order->billing_last_name ) {
-						$username = trim( sprintf( _x( '%1$s %2$s', 'full name', 'woocommerce' ), $the_order->billing_first_name, $the_order->billing_last_name ) );
-					} else {
-						$username = __( 'Guest', 'woocommerce' );
-					}
+					$username = __( 'Guest', 'woocommerce' );
 				}
 
-				printf( _x( '%s by %s', 'Order number by X', 'woocommerce' ), '<a href="' . admin_url( 'post.php?post=' . absint( $post->ID ) . '&action=edit' ) . '" class="row-title"><strong>#' . esc_attr( $the_order->get_order_number() ) . '</strong></a>', $username );
+				/* translators: 1: order and number (i.e. Order #13) 2: user name */
+				printf(
+					__( '%1$s by %2$s', 'woocommerce' ),
+					'<a href="' . admin_url( 'post.php?post=' . absint( $post->ID ) . '&action=edit' ) . '" class="row-title"><strong>#' . esc_attr( $the_order->get_order_number() ) . '</strong></a>',
+					$username
+				);
 
-				if ( $the_order->billing_email ) {
-					echo '<small class="meta email"><a href="' . esc_url( 'mailto:' . $the_order->billing_email ) . '">' . esc_html( $the_order->billing_email ) . '</a></small>';
+				if ( $the_order->get_billing_email() ) {
+					echo '<small class="meta email"><a href="' . esc_url( 'mailto:' . $the_order->get_billing_email() ) . '">' . esc_html( $the_order->get_billing_email() ) . '</a></small>';
 				}
 
 				echo '<button type="button" class="toggle-row"><span class="screen-reader-text">' . __( 'Show more details', 'woocommerce' ) . '</span></button>';
@@ -775,7 +651,7 @@ class WC_Admin_Post_Types {
 							$actions['processing'] = array(
 								'url'       => wp_nonce_url( admin_url( 'admin-ajax.php?action=woocommerce_mark_order_status&status=processing&order_id=' . $post->ID ), 'woocommerce-mark-order-status' ),
 								'name'      => __( 'Processing', 'woocommerce' ),
-								'action'    => "processing"
+								'action'    => "processing",
 							);
 						}
 
@@ -783,14 +659,14 @@ class WC_Admin_Post_Types {
 							$actions['complete'] = array(
 								'url'       => wp_nonce_url( admin_url( 'admin-ajax.php?action=woocommerce_mark_order_status&status=completed&order_id=' . $post->ID ), 'woocommerce-mark-order-status' ),
 								'name'      => __( 'Complete', 'woocommerce' ),
-								'action'    => "complete"
+								'action'    => "complete",
 							);
 						}
 
 						$actions['view'] = array(
 							'url'       => admin_url( 'post.php?post=' . $post->ID . '&action=edit' ),
 							'name'      => __( 'View', 'woocommerce' ),
-							'action'    => "view"
+							'action'    => "view",
 						);
 
 						$actions = apply_filters( 'woocommerce_admin_order_actions', $actions, $the_order );
@@ -810,15 +686,14 @@ class WC_Admin_Post_Types {
 	/**
 	 * Make columns sortable - https://gist.github.com/906872.
 	 *
-	 * @param array $columns
+	 * @param  array $columns
 	 * @return array
 	 */
 	public function product_sortable_columns( $columns ) {
 		$custom = array(
 			'price'    => 'price',
-			'featured' => 'featured',
 			'sku'      => 'sku',
-			'name'     => 'title'
+			'name'     => 'title',
 		);
 		return wp_parse_args( $custom, $columns );
 	}
@@ -826,7 +701,7 @@ class WC_Admin_Post_Types {
 	/**
 	 * Make columns sortable - https://gist.github.com/906872.
 	 *
-	 * @param array $columns
+	 * @param  array $columns
 	 * @return array
 	 */
 	public function shop_coupon_sortable_columns( $columns ) {
@@ -836,35 +711,20 @@ class WC_Admin_Post_Types {
 	/**
 	 * Make columns sortable - https://gist.github.com/906872.
 	 *
-	 * @param array $columns
+	 * @param  array $columns
 	 * @return array
 	 */
 	public function shop_order_sortable_columns( $columns ) {
 		$custom = array(
 			'order_title' => 'ID',
 			'order_total' => 'order_total',
-			'order_date'  => 'date'
+			'order_date'  => 'date',
 		);
 		unset( $columns['comments'] );
 
 		return wp_parse_args( $custom, $columns );
 	}
 
-	/**
-	 * Remove edit from the bulk actions.
-	 *
-	 * @param array $actions
-	 * @return array
-	 */
-	public function shop_order_bulk_actions( $actions ) {
-
-		if ( isset( $actions['edit'] ) ) {
-			unset( $actions['edit'] );
-		}
-
-		return $actions;
-	}
-
 	/**
 	 * Set list table primary column for products and orders.
 	 * Support for WordPress 4.3.
@@ -904,11 +764,7 @@ class WC_Admin_Post_Types {
 			return array_merge( array( 'id' => 'ID: ' . $post->ID ), $actions );
 		}
 
-		if ( 'shop_order' === $post->post_type ) {
-			return array();
-		}
-
-		if ( 'shop_coupon' === $post->post_type ) {
+		if ( in_array( $post->post_type, array( 'shop_order', 'shop_coupon' ) ) ) {
 			if ( isset( $actions['inline hide-if-no-js'] ) ) {
 				unset( $actions['inline hide-if-no-js'] );
 			}
@@ -920,23 +776,23 @@ class WC_Admin_Post_Types {
 	/**
 	 * Product sorting link.
 	 *
-	 * Based on Simple Page Ordering by 10up (http://wordpress.org/extend/plugins/simple-page-ordering/).
+	 * Based on Simple Page Ordering by 10up (https://wordpress.org/plugins/simple-page-ordering/).
 	 *
-	 * @param array $views
+	 * @param  array $views
 	 * @return array
 	 */
 	public function product_sorting_link( $views ) {
 		global $post_type, $wp_query;
 
-		if ( ! current_user_can('edit_others_pages') ) {
+		if ( ! current_user_can( 'edit_others_pages' ) ) {
 			return $views;
 		}
 
-		$class            = ( isset( $wp_query->query['orderby'] ) && $wp_query->query['orderby'] == 'menu_order title' ) ? 'current' : '';
-		$query_string     = remove_query_arg(array( 'orderby', 'order' ));
-		$query_string     = add_query_arg( 'orderby', urlencode('menu_order title'), $query_string );
-		$query_string     = add_query_arg( 'order', urlencode('ASC'), $query_string );
-		$views['byorder'] = '<a href="' . esc_url( $query_string ) . '" class="' . esc_attr( $class ) . '">' . __( 'Sort Products', 'woocommerce' ) . '</a>';
+		$class            = ( isset( $wp_query->query['orderby'] ) && 'menu_order title' === $wp_query->query['orderby'] ) ? 'current' : '';
+		$query_string     = remove_query_arg( array( 'orderby', 'order' ) );
+		$query_string     = add_query_arg( 'orderby', urlencode( 'menu_order title' ), $query_string );
+		$query_string     = add_query_arg( 'order', urlencode( 'ASC' ), $query_string );
+		$views['byorder'] = '<a href="' . esc_url( $query_string ) . '" class="' . esc_attr( $class ) . '">' . __( 'Sort products', 'woocommerce' ) . '</a>';
 
 		return $views;
 	}
@@ -979,6 +835,20 @@ class WC_Admin_Post_Types {
 		include( WC()->plugin_path() . '/includes/admin/views/html-quick-edit-product.php' );
 	}
 
+	/**
+	 * Offers a way to hook into save post without causing an infinite loop
+	 * when quick/bulk saving product info.
+	 *
+	 * @since 3.0.0
+	 * @param int    $post_id
+	 * @param object $post
+	 */
+	public function bulk_and_quick_edit_hook( $post_id, $post ) {
+		remove_action( 'save_post', array( $this, 'bulk_and_quick_edit_hook' ) );
+		do_action( 'woocommerce_product_bulk_and_quick_edit', $post_id, $post );
+		add_action( 'save_post', array( $this, 'bulk_and_quick_edit_hook' ), 10, 2 );
+	}
+
 	/**
 	 * Quick and bulk edit saving.
 	 *
@@ -987,7 +857,6 @@ class WC_Admin_Post_Types {
 	 * @return int
 	 */
 	public function bulk_and_quick_edit_save_post( $post_id, $post ) {
-
 		// If this is an autosave, our form has not been submitted, so we don't want to do anything.
 		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
 			return $post_id;
@@ -1028,98 +897,91 @@ class WC_Admin_Post_Types {
 			$this->bulk_edit_save( $post_id, $product );
 		}
 
-		// Clear transient
-		wc_delete_product_transients( $post_id );
-
 		return $post_id;
 	}
 
 	/**
 	 * Quick edit.
 	 *
-	 * @param integer $post_id
+	 * @param integer    $post_id
 	 * @param WC_Product $product
 	 */
 	private function quick_edit_save( $post_id, $product ) {
-		global $wpdb;
-
-		$old_regular_price = $product->regular_price;
-		$old_sale_price    = $product->sale_price;
+		$data_store        = $product->get_data_store();
+		$old_regular_price = $product->get_regular_price();
+		$old_sale_price    = $product->get_sale_price();
 
 		// Save fields
 		if ( isset( $_REQUEST['_sku'] ) ) {
-			$sku     = get_post_meta( $post_id, '_sku', true );
-			$new_sku = wc_clean( $_REQUEST['_sku'] );
+			$sku     = $product->get_sku();
+			$new_sku = (string) wc_clean( $_REQUEST['_sku'] );
 
 			if ( $new_sku !== $sku ) {
 				if ( ! empty( $new_sku ) ) {
 					$unique_sku = wc_product_has_unique_sku( $post_id, $new_sku );
 					if ( $unique_sku ) {
-						update_post_meta( $post_id, '_sku', $new_sku );
+						$product->set_sku( $new_sku );
 					}
 				} else {
-					update_post_meta( $post_id, '_sku', '' );
+					$product->set_sku( '' );
 				}
 			}
 		}
 
 		if ( isset( $_REQUEST['_weight'] ) ) {
-			update_post_meta( $post_id, '_weight', wc_clean( $_REQUEST['_weight'] ) );
+			$product->set_weight( wc_clean( $_REQUEST['_weight'] ) );
 		}
 
 		if ( isset( $_REQUEST['_length'] ) ) {
-			update_post_meta( $post_id, '_length', wc_clean( $_REQUEST['_length'] ) );
+			$product->set_length( wc_clean( $_REQUEST['_length'] ) );
 		}
 
 		if ( isset( $_REQUEST['_width'] ) ) {
-			update_post_meta( $post_id, '_width', wc_clean( $_REQUEST['_width'] ) );
+			$product->set_width( wc_clean( $_REQUEST['_width'] ) );
 		}
 
 		if ( isset( $_REQUEST['_height'] ) ) {
-			update_post_meta( $post_id, '_height', wc_clean( $_REQUEST['_height'] ) );
+			$product->set_height( wc_clean( $_REQUEST['_height'] ) );
 		}
 
 		if ( ! empty( $_REQUEST['_shipping_class'] ) ) {
-			$shipping_class = '_no_shipping_class' == $_REQUEST['_shipping_class'] ? '' : wc_clean( $_REQUEST['_shipping_class'] );
-
-			wp_set_object_terms( $post_id, $shipping_class, 'product_shipping_class' );
+			if ( '_no_shipping_class' === $_REQUEST['_shipping_class'] ) {
+				$product->set_shipping_class_id( 0 );
+			} else {
+				$shipping_class_id = $data_store->get_shipping_class_id_by_slug( wc_clean( $_REQUEST['_shipping_class'] ) );
+				$product->set_shipping_class_id( $shipping_class_id );
+			}
 		}
 
 		if ( isset( $_REQUEST['_visibility'] ) ) {
-			if ( update_post_meta( $post_id, '_visibility', wc_clean( $_REQUEST['_visibility'] ) ) ) {
-				do_action( 'woocommerce_product_set_visibility', $post_id, wc_clean( $_REQUEST['_visibility'] ) );
-			}
+			$product->set_catalog_visibility( wc_clean( $_REQUEST['_visibility'] ) );
 		}
 
 		if ( isset( $_REQUEST['_featured'] ) ) {
-			if ( update_post_meta( $post_id, '_featured', 'yes' ) ) {
-				delete_transient( 'wc_featured_products' );
-			}
+			$product->set_featured( true );
 		} else {
-			if ( update_post_meta( $post_id, '_featured', 'no' ) ) {
-				delete_transient( 'wc_featured_products' );
-			}
+			$product->set_featured( false );
 		}
 
 		if ( isset( $_REQUEST['_tax_status'] ) ) {
-			update_post_meta( $post_id, '_tax_status', wc_clean( $_REQUEST['_tax_status'] ) );
+			$product->set_tax_status( wc_clean( $_REQUEST['_tax_status'] ) );
 		}
 
 		if ( isset( $_REQUEST['_tax_class'] ) ) {
-			update_post_meta( $post_id, '_tax_class', wc_clean( $_REQUEST['_tax_class'] ) );
+			$product->set_tax_class( wc_clean( $_REQUEST['_tax_class'] ) );
 		}
 
-		if ( $product->is_type('simple') || $product->is_type('external') ) {
+		if ( $product->is_type( 'simple' ) || $product->is_type( 'external' ) ) {
 
 			if ( isset( $_REQUEST['_regular_price'] ) ) {
-				$new_regular_price = $_REQUEST['_regular_price'] === '' ? '' : wc_format_decimal( $_REQUEST['_regular_price'] );
-				update_post_meta( $post_id, '_regular_price', $new_regular_price );
+				$new_regular_price = ( '' === $_REQUEST['_regular_price'] ) ? '' : wc_format_decimal( $_REQUEST['_regular_price'] );
+				$product->set_regular_price( $new_regular_price );
 			} else {
 				$new_regular_price = null;
 			}
 			if ( isset( $_REQUEST['_sale_price'] ) ) {
-				$new_sale_price = $_REQUEST['_sale_price'] === '' ? '' : wc_format_decimal( $_REQUEST['_sale_price'] );
-				update_post_meta( $post_id, '_sale_price', $new_sale_price );
+				$new_sale_price = ( '' === $_REQUEST['_sale_price'] ) ? '' : wc_format_decimal( $_REQUEST['_sale_price'] );
+				$product->set_sale_price( $new_sale_price );
 			} else {
 				$new_sale_price = null;
 			}
@@ -1134,47 +996,49 @@ class WC_Admin_Post_Types {
 			}
 
 			if ( $price_changed ) {
-				update_post_meta( $post_id, '_sale_price_dates_from', '' );
-				update_post_meta( $post_id, '_sale_price_dates_to', '' );
-
-				if ( ! is_null( $new_sale_price ) && $new_sale_price !== '' ) {
-					update_post_meta( $post_id, '_price', $new_sale_price );
-				} else {
-					update_post_meta( $post_id, '_price', $new_regular_price );
-				}
+				$product->set_date_on_sale_to( '' );
+				$product->set_date_on_sale_from( '' );
 			}
 		}
 
-		// Handle stock status
-		if ( isset( $_REQUEST['_stock_status'] ) ) {
-			$stock_status = wc_clean( $_REQUEST['_stock_status'] );
+		// Handle Stock Data
+		$manage_stock = ! empty( $_REQUEST['_manage_stock'] ) && 'grouped' !== $product->get_type() ? 'yes' : 'no';
+		$backorders   = ! empty( $_REQUEST['_backorders'] ) ? wc_clean( $_REQUEST['_backorders'] ) : 'no';
+		$stock_status = ! empty( $_REQUEST['_stock_status'] ) ? wc_clean( $_REQUEST['_stock_status'] ) : 'instock';
+		$stock_amount = 'yes' === $manage_stock ? wc_stock_amount( $_REQUEST['_stock'] ) : '';
 
-			if ( $product->is_type( 'variable' ) ) {
+		if ( 'yes' === get_option( 'woocommerce_manage_stock' ) ) {
+
+			// Apply product type constraints to stock status
+			if ( $product->is_type( 'external' ) ) {
+				// External always in stock
+				$stock_status = 'instock';
+			} elseif ( $product->is_type( 'variable' ) ) {
+				// Stock status is always determined by children
 				foreach ( $product->get_children() as $child_id ) {
-					if ( 'yes' !== get_post_meta( $child_id, '_manage_stock', true ) ) {
-						wc_update_product_stock_status( $child_id, $stock_status );
+					$child = wc_get_product( $child_id );
+					if ( ! $product->get_manage_stock() ) {
+						$child->set_stock_status( $stock_status );
+						$child->save();
 					}
 				}
 
-				WC_Product_Variable::sync_stock_status( $post_id );
-			} else {
+				$product = WC_Product_Variable::sync( $product, false );
+			}
+
+			$product->set_manage_stock( $manage_stock );
+			$product->set_backorders( $backorders );
+			$product->save();
+
+			if ( ! $product->is_type( 'variable' ) ) {
 				wc_update_product_stock_status( $post_id, $stock_status );
 			}
-		}
 
-		// Handle stock
-		if ( ! $product->is_type('grouped') ) {
-			if ( isset( $_REQUEST['_manage_stock'] ) ) {
-				update_post_meta( $post_id, '_manage_stock', 'yes' );
-				wc_update_product_stock( $post_id, wc_stock_amount( $_REQUEST['_stock'] ) );
-			} else {
-				update_post_meta( $post_id, '_manage_stock', 'no' );
-				wc_update_product_stock( $post_id, 0 );
-			}
+			wc_update_product_stock( $post_id, $stock_amount );
 
-			if ( ! empty( $_REQUEST['_backorders'] ) ) {
-				update_post_meta( $post_id, '_backorders', wc_clean( $_REQUEST['_backorders'] ) );
-			}
+		} else {
+			$product->save();
+			wc_update_product_stock_status( $post_id, $stock_status );
 		}
 
 		do_action( 'woocommerce_product_quick_edit_save', $product );
@@ -1182,33 +1046,34 @@ class WC_Admin_Post_Types {
 
 	/**
 	 * Bulk edit.
+	 *
 	 * @param integer $post_id
 	 * @param WC_Product $product
 	 */
 	public function bulk_edit_save( $post_id, $product ) {
-
-		$old_regular_price = $product->regular_price;
-		$old_sale_price    = $product->sale_price;
+		$data_store        = $product->get_data_store();
+		$old_regular_price = $product->get_regular_price();
+		$old_sale_price    = $product->get_sale_price();
 
 		// Save fields
 		if ( ! empty( $_REQUEST['change_weight'] ) && isset( $_REQUEST['_weight'] ) ) {
-			update_post_meta( $post_id, '_weight', wc_clean( stripslashes( $_REQUEST['_weight'] ) ) );
+			$product->set_weight( wc_clean( stripslashes( $_REQUEST['_weight'] ) ) );
 		}
 
 		if ( ! empty( $_REQUEST['change_dimensions'] ) ) {
 			if ( isset( $_REQUEST['_length'] ) ) {
-				update_post_meta( $post_id, '_length', wc_clean( stripslashes( $_REQUEST['_length'] ) ) );
+				$product->set_length( wc_clean( stripslashes( $_REQUEST['_length'] ) ) );
 			}
 			if ( isset( $_REQUEST['_width'] ) ) {
-				update_post_meta( $post_id, '_width', wc_clean( stripslashes( $_REQUEST['_width'] ) ) );
+				$product->set_width( wc_clean( stripslashes( $_REQUEST['_width'] ) ) );
 			}
 			if ( isset( $_REQUEST['_height'] ) ) {
-				update_post_meta( $post_id, '_height', wc_clean( stripslashes( $_REQUEST['_height'] ) ) );
+				$product->set_height( wc_clean( stripslashes( $_REQUEST['_height'] ) ) );
 			}
 		}
 
 		if ( ! empty( $_REQUEST['_tax_status'] ) ) {
-			update_post_meta( $post_id, '_tax_status', wc_clean( $_REQUEST['_tax_status'] ) );
+			$product->set_tax_status( wc_clean( $_REQUEST['_tax_status'] ) );
 		}
 
 		if ( ! empty( $_REQUEST['_tax_class'] ) ) {
@@ -1216,50 +1081,32 @@ class WC_Admin_Post_Types {
 			if ( 'standard' == $tax_class ) {
 				$tax_class = '';
 			}
-			update_post_meta( $post_id, '_tax_class', $tax_class );
-		}
-
-		if ( ! empty( $_REQUEST['_stock_status'] ) ) {
-			$stock_status = wc_clean( $_REQUEST['_stock_status'] );
-
-			if ( $product->is_type( 'variable' ) ) {
-				foreach ( $product->get_children() as $child_id ) {
-					if ( 'yes' !== get_post_meta( $child_id, '_manage_stock', true ) ) {
-						wc_update_product_stock_status( $child_id, $stock_status );
-					}
-				}
-
-				WC_Product_Variable::sync_stock_status( $post_id );
-			} else {
-				wc_update_product_stock_status( $post_id, $stock_status );
-			}
+			$product->set_tax_class( $tax_class );
 		}
 
 		if ( ! empty( $_REQUEST['_shipping_class'] ) ) {
-			$shipping_class = '_no_shipping_class' == $_REQUEST['_shipping_class'] ? '' : wc_clean( $_REQUEST['_shipping_class'] );
-
-			wp_set_object_terms( $post_id, $shipping_class, 'product_shipping_class' );
+			if ( '_no_shipping_class' === $_REQUEST['_shipping_class'] ) {
+				$product->set_shipping_class_id( 0 );
+			} else {
+				$shipping_class_id = $data_store->get_shipping_class_id_by_slug( wc_clean( $_REQUEST['_shipping_class'] ) );
+				$product->set_shipping_class_id( $shipping_class_id );
+			}
 		}
 
 		if ( ! empty( $_REQUEST['_visibility'] ) ) {
-			if ( update_post_meta( $post_id, '_visibility', wc_clean( $_REQUEST['_visibility'] ) ) ) {
-				do_action( 'woocommerce_product_set_visibility', $post_id, wc_clean( $_REQUEST['_visibility'] ) );
-			}
+			$product->set_catalog_visibility( wc_clean( $_REQUEST['_visibility'] ) );
 		}
 
 		if ( ! empty( $_REQUEST['_featured'] ) ) {
-			if ( update_post_meta( $post_id, '_featured', stripslashes( $_REQUEST['_featured'] ) ) ) {
-				delete_transient( 'wc_featured_products' );
-			}
+			$product->set_featured( stripslashes( $_REQUEST['_featured'] ) );
 		}
 
 		// Sold Individually
 		if ( ! empty( $_REQUEST['_sold_individually'] ) ) {
-			if ( $_REQUEST['_sold_individually'] == 'yes' ) {
-				update_post_meta( $post_id, '_sold_individually', 'yes' );
-			}
-			else {
-				update_post_meta( $post_id, '_sold_individually', '' );
+			if ( 'yes' === $_REQUEST['_sold_individually'] ) {
+				$product->set_sold_individually( 'yes' );
+			} else {
+				$product->set_sold_individually( '' );
 			}
 		}
 
@@ -1278,7 +1125,6 @@ class WC_Admin_Post_Types {
 			$price_changed = false;
 
 			if ( ! empty( $_REQUEST['change_regular_price'] ) ) {
-
 				$change_regular_price = absint( $_REQUEST['change_regular_price'] );
 				$regular_price = esc_attr( stripslashes( $_REQUEST['_regular_price'] ) );
 
@@ -1297,7 +1143,7 @@ class WC_Admin_Post_Types {
 					case 3 :
 						if ( strstr( $regular_price, '%' ) ) {
 							$percent = str_replace( '%', '', $regular_price ) / 100;
-							$new_price = max( 0, $old_regular_price - ( round ( $old_regular_price * $percent, wc_get_price_decimals() ) ) );
+							$new_price = max( 0, $old_regular_price - ( round( $old_regular_price * $percent, wc_get_price_decimals() ) ) );
 						} else {
 							$new_price = max( 0, $old_regular_price - $regular_price );
 						}
@@ -1310,13 +1156,11 @@ class WC_Admin_Post_Types {
 				if ( isset( $new_price ) && $new_price != $old_regular_price ) {
 					$price_changed = true;
 					$new_price = round( $new_price, wc_get_price_decimals() );
-					update_post_meta( $post_id, '_regular_price', $new_price );
-					$product->regular_price = $new_price;
+					$product->set_regular_price( $new_price );
 				}
 			}
 
 			if ( ! empty( $_REQUEST['change_sale_price'] ) ) {
-
 				$change_sale_price = absint( $_REQUEST['change_sale_price'] );
 				$sale_price        = esc_attr( stripslashes( $_REQUEST['_sale_price'] ) );
 
@@ -1356,123 +1200,134 @@ class WC_Admin_Post_Types {
 				if ( isset( $new_price ) && $new_price != $old_sale_price ) {
 					$price_changed = true;
 					$new_price = ! empty( $new_price ) || '0' === $new_price ? round( $new_price, wc_get_price_decimals() ) : '';
-					update_post_meta( $post_id, '_sale_price', $new_price );
-					$product->sale_price = $new_price;
+					$product->set_sale_price( $new_price );
 				}
 			}
 
 			if ( $price_changed ) {
-				update_post_meta( $post_id, '_sale_price_dates_from', '' );
-				update_post_meta( $post_id, '_sale_price_dates_to', '' );
+				$product->set_date_on_sale_to( '' );
+				$product->set_date_on_sale_from( '' );
 
-				if ( $product->regular_price < $product->sale_price ) {
-					$product->sale_price = '';
-					update_post_meta( $post_id, '_sale_price', '' );
-				}
-
-				if ( $product->sale_price ) {
-					update_post_meta( $post_id, '_price', $product->sale_price );
-				} else {
-					update_post_meta( $post_id, '_price', $product->regular_price );
+				if ( $product->get_regular_price() < $product->get_sale_price() ) {
+					$product->set_sale_price( '' );
 				}
 			}
 		}
 
-		// Handle stock
-		if ( ! $product->is_type( 'grouped' ) ) {
+		// Handle Stock Data
+		$was_managing_stock = $product->get_manage_stock() ? 'yes' : 'no';
+		$stock_status       = $product->get_stock_status();
+		$backorders         = $product->get_backorders();
 
-			if ( ! empty( $_REQUEST['change_stock'] ) ) {
-				update_post_meta( $post_id, '_manage_stock', 'yes' );
-				wc_update_product_stock( $post_id, wc_stock_amount( $_REQUEST['_stock'] ) );
-			}
+		$backorders   = ! empty( $_REQUEST['_backorders'] ) ? wc_clean( $_REQUEST['_backorders'] ) : $backorders;
+		$stock_status = ! empty( $_REQUEST['_stock_status'] ) ? wc_clean( $_REQUEST['_stock_status'] ) : $stock_status;
 
-			if ( ! empty( $_REQUEST['_manage_stock'] ) ) {
+		if ( ! empty( $_REQUEST['_manage_stock'] ) ) {
+			$manage_stock = 'yes' === wc_clean( $_REQUEST['_manage_stock'] ) && 'grouped' !== $product->product_type ? 'yes' : 'no';
+		} else {
+			$manage_stock = $was_managing_stock;
+		}
 
-				if ( $_REQUEST['_manage_stock'] == 'yes' ) {
-					update_post_meta( $post_id, '_manage_stock', 'yes' );
-				} else {
-					update_post_meta( $post_id, '_manage_stock', 'no' );
-					wc_update_product_stock( $post_id, 0 );
+		$stock_amount = 'yes' === $manage_stock && ! empty( $_REQUEST['change_stock'] ) ? wc_stock_amount( $_REQUEST['_stock'] ) : $product->get_stock_quantity();
+
+		if ( 'yes' === get_option( 'woocommerce_manage_stock' ) ) {
+
+			// Apply product type constraints to stock status
+			if ( $product->is_type( 'external' ) ) {
+				// External always in stock
+				$stock_status = 'instock';
+			} elseif ( $product->is_type( 'variable' ) ) {
+				// Stock status is always determined by children
+				foreach ( $product->get_children() as $child_id ) {
+					$child = wc_get_product( $child_id );
+					if ( ! $product->get_manage_stock() ) {
+						$child->set_stock_status( $stock_status );
+						$child->save();
+					}
 				}
+
+				$product = WC_Product_Variable::sync( $product, false );
 			}
 
-			if ( ! empty( $_REQUEST['_backorders'] ) ) {
-				update_post_meta( $post_id, '_backorders', wc_clean( $_REQUEST['_backorders'] ) );
+			$product->set_manage_stock( $manage_stock );
+			$product->set_backorders( $backorders );
+			$product->save();
+
+			if ( ! $product->is_type( 'variable' ) ) {
+				wc_update_product_stock_status( $post_id, $stock_status );
 			}
 
+			wc_update_product_stock( $post_id, $stock_amount );
+
+		} else {
+			$product->save();
+			wc_update_product_stock_status( $post_id, $stock_status );
 		}
 
 		do_action( 'woocommerce_product_bulk_edit_save', $product );
 	}
 
 	/**
-	 * Add extra bulk action options to mark orders as complete or processing.
+	 * Manipulate shop order bulk actions.
 	 *
-	 * Using Javascript until WordPress core fixes: http://core.trac.wordpress.org/ticket/16031.
+	 * @param  array $actions List of actions.
+	 * @return array
 	 */
-	public function bulk_admin_footer() {
-		global $post_type;
-
-		if ( 'shop_order' == $post_type ) {
-			?>
-			<script type="text/javascript">
-			jQuery(function() {
-				jQuery('<option>').val('mark_processing').text('<?php _e( 'Mark processing', 'woocommerce' )?>').appendTo('select[name="action"]');
-				jQuery('<option>').val('mark_processing').text('<?php _e( 'Mark processing', 'woocommerce' )?>').appendTo('select[name="action2"]');
-
-				jQuery('<option>').val('mark_on-hold').text('<?php _e( 'Mark on-hold', 'woocommerce' )?>').appendTo('select[name="action"]');
-				jQuery('<option>').val('mark_on-hold').text('<?php _e( 'Mark on-hold', 'woocommerce' )?>').appendTo('select[name="action2"]');
-
-				jQuery('<option>').val('mark_completed').text('<?php _e( 'Mark complete', 'woocommerce' )?>').appendTo('select[name="action"]');
-				jQuery('<option>').val('mark_completed').text('<?php _e( 'Mark complete', 'woocommerce' )?>').appendTo('select[name="action2"]');
-			});
-			</script>
-			<?php
+	public function shop_order_bulk_actions( $actions ) {
+		if ( isset( $actions['edit'] ) ) {
+			unset( $actions['edit'] );
 		}
+
+		$actions['mark_processing'] = __( 'Mark processing', 'woocommerce' );
+		$actions['mark_on-hold']    = __( 'Mark on-hold', 'woocommerce' );
+		$actions['mark_completed']  = __( 'Mark complete', 'woocommerce' );
+
+		return $actions;
 	}
 
 	/**
-	 * Process the new bulk actions for changing order status.
+	 * Handle shop order bulk actions.
+	 *
+	 * @since  3.0.0
+	 * @param  string $redirect_to URL to redirect to.
+	 * @param  string $action      Action name.
+	 * @param  array  $ids         List of ids.
+	 * @return string
 	 */
-	public function bulk_action() {
-		$wp_list_table = _get_list_table( 'WP_Posts_List_Table' );
-		$action        = $wp_list_table->current_action();
-
-		// Bail out if this is not a status-changing action
-		if ( strpos( $action, 'mark_' ) === false ) {
-			return;
+	public function handle_shop_order_bulk_actions( $redirect_to, $action, $ids ) {
+		// Bail out if this is not a status-changing action.
+		if ( false === strpos( $action, 'mark_' ) ) {
+			return $redirect_to;
 		}
 
 		$order_statuses = wc_get_order_statuses();
-
-		$new_status    = substr( $action, 5 ); // get the status name from action
-		$report_action = 'marked_' . $new_status;
+		$new_status     = substr( $action, 5 ); // Get the status name from action.
+		$report_action  = 'marked_' . $new_status;
 
 		// Sanity check: bail out if this is actually not a status, or is
-		// not a registered status
+		// not a registered status.
 		if ( ! isset( $order_statuses[ 'wc-' . $new_status ] ) ) {
-			return;
+			return $redirect_to;
 		}
 
 		$changed = 0;
+		$ids = array_map( 'absint', $ids );
 
-		$post_ids = array_map( 'absint', (array) $_REQUEST['post'] );
-
-		foreach ( $post_ids as $post_id ) {
-			$order = wc_get_order( $post_id );
+		foreach ( $ids as $id ) {
+			$order = wc_get_order( $id );
 			$order->update_status( $new_status, __( 'Order status changed by bulk edit:', 'woocommerce' ), true );
-			do_action( 'woocommerce_order_edit_status', $post_id, $new_status );
+			do_action( 'woocommerce_order_edit_status', $id, $new_status );
 			$changed++;
 		}
 
-		$sendback = add_query_arg( array( 'post_type' => 'shop_order', $report_action => true, 'changed' => $changed, 'ids' => join( ',', $post_ids ) ), '' );
+		$redirect_to = add_query_arg( array(
+			'post_type'    => 'shop_order',
+			$report_action => true,
+			'changed'      => $changed,
+			'ids'          => join( ',', $ids ),
+		), $redirect_to );
 
-		if ( isset( $_GET['post_status'] ) ) {
-			$sendback = add_query_arg( 'post_status', sanitize_text_field( $_GET['post_status'] ), $sendback );
-		}
-
-		wp_redirect( esc_url_raw( $sendback ) );
-		exit();
+		return esc_url_raw( $redirect_to );
 	}
 
 	/**
@@ -1494,6 +1349,7 @@ class WC_Admin_Post_Types {
 			if ( isset( $_REQUEST[ 'marked_' . str_replace( 'wc-', '', $slug ) ] ) ) {
 
 				$number = isset( $_REQUEST['changed'] ) ? absint( $_REQUEST['changed'] ) : 0;
+				/* translators: %s: orders count */
 				$message = sprintf( _n( 'Order status changed.', '%s order statuses changed.', $number, 'woocommerce' ), number_format_i18n( $number ) );
 				echo '<div class="updated"><p>' . $message . '</p></div>';
 
@@ -1507,73 +1363,24 @@ class WC_Admin_Post_Types {
 	 * @param WP_Query $wp
 	 */
 	public function shop_order_search_custom_fields( $wp ) {
-		global $pagenow, $wpdb;
+		global $pagenow;
 
-		if ( 'edit.php' != $pagenow || empty( $wp->query_vars['s'] ) || $wp->query_vars['post_type'] != 'shop_order' ) {
+		if ( 'edit.php' != $pagenow || empty( $wp->query_vars['s'] ) || 'shop_order' !== $wp->query_vars['post_type'] ) {
 			return;
 		}
 
-		$search_fields = array_map( 'wc_clean', apply_filters( 'woocommerce_shop_order_search_fields', array(
-			'_order_key',
-			'_billing_company',
-			'_billing_address_1',
-			'_billing_address_2',
-			'_billing_city',
-			'_billing_postcode',
-			'_billing_country',
-			'_billing_state',
-			'_billing_email',
-			'_billing_phone',
-			'_shipping_address_1',
-			'_shipping_address_2',
-			'_shipping_city',
-			'_shipping_postcode',
-			'_shipping_country',
-			'_shipping_state'
-		) ) );
+		$post_ids = wc_order_search( $_GET['s'] );
 
-		$search_order_id = str_replace( 'Order #', '', $_GET['s'] );
-		if ( ! is_numeric( $search_order_id ) ) {
-			$search_order_id = 0;
+		if ( ! empty( $post_ids ) ) {
+			// Remove "s" - we don't want to search order name.
+			unset( $wp->query_vars['s'] );
+
+			// so we know we're doing this.
+			$wp->query_vars['shop_order_search'] = true;
+
+			// Search by found posts.
+			$wp->query_vars['post__in'] = array_merge( $post_ids, array( 0 ) );
 		}
-
-		// Search orders
-		$post_ids = array_unique( array_merge(
-			$wpdb->get_col(
-				$wpdb->prepare( "
-					SELECT DISTINCT p1.post_id
-					FROM {$wpdb->postmeta} p1
-					INNER JOIN {$wpdb->postmeta} p2 ON p1.post_id = p2.post_id
-					WHERE
-						( p1.meta_key = '_billing_first_name' AND p2.meta_key = '_billing_last_name' AND CONCAT(p1.meta_value, ' ', p2.meta_value) LIKE '%%%s%%' )
-					OR
-						( p1.meta_key = '_shipping_first_name' AND p2.meta_key = '_shipping_last_name' AND CONCAT(p1.meta_value, ' ', p2.meta_value) LIKE '%%%s%%' )
-					OR
-						( p1.meta_key IN ('" . implode( "','", $search_fields ) . "') AND p1.meta_value LIKE '%%%s%%' )
-					",
-					esc_attr( $_GET['s'] ), esc_attr( $_GET['s'] ), esc_attr( $_GET['s'] )
-				)
-			),
-			$wpdb->get_col(
-				$wpdb->prepare( "
-					SELECT order_id
-					FROM {$wpdb->prefix}woocommerce_order_items as order_items
-					WHERE order_item_name LIKE '%%%s%%'
-					",
-					esc_attr( $_GET['s'] )
-				)
-			),
-			array( $search_order_id )
-		) );
-
-		// Remove s - we don't want to search order name
-		unset( $wp->query_vars['s'] );
-
-		// so we know we're doing this
-		$wp->query_vars['shop_order_search'] = true;
-
-		// Search by found posts
-		$wp->query_vars['post__in'] = $post_ids;
 	}
 
 	/**
@@ -1589,7 +1396,7 @@ class WC_Admin_Post_Types {
 			return $query;
 		}
 
-		if ( $typenow != 'shop_order' ) {
+		if ( 'shop_order' !== $typenow ) {
 			return $query;
 		}
 
@@ -1623,7 +1430,7 @@ class WC_Admin_Post_Types {
 			$this->shop_order_filters();
 		} elseif ( 'product' == $typenow ) {
 			$this->product_filters();
-		} elseif( 'shop_coupon' == $typenow ) {
+		} elseif ( 'shop_coupon' == $typenow ) {
 			$this->shop_coupon_filters();
 		}
 	}
@@ -1680,7 +1487,7 @@ class WC_Admin_Post_Types {
 					$output .= selected( 'downloadable', $wp_query->query['product_type'], false );
 				}
 
-				$output .= '> &rarr; ' . __( 'Downloadable', 'woocommerce' ) . '</option>';
+				$output .= '> ' . ( is_rtl() ? '&larr;' : '&rarr;' ) . ' ' . __( 'Downloadable', 'woocommerce' ) . '</option>';
 
 				$output .= '<option value="virtual" ';
 
@@ -1688,7 +1495,7 @@ class WC_Admin_Post_Types {
 					$output .= selected( 'virtual', $wp_query->query['product_type'], false );
 				}
 
-				$output .= '> &rarr;  ' . __( 'Virtual', 'woocommerce' ) . '</option>';
+				$output .= '> ' . ( is_rtl() ? '&larr;' : '&rarr;' ) . ' ' . __( 'Virtual', 'woocommerce' ) . '</option>';
 			}
 		}
 
@@ -1710,10 +1517,11 @@ class WC_Admin_Post_Types {
 				foreach ( $types as $name => $type ) {
 					echo '<option value="' . esc_attr( $name ) . '"';
 
-					if ( isset( $_GET['coupon_type'] ) )
+					if ( isset( $_GET['coupon_type'] ) ) {
 						selected( $name, $_GET['coupon_type'] );
+					}
 
-					echo '>' . esc_html__( $type, 'woocommerce' ) . '</option>';
+					echo '>' . esc_html( $type ) . '</option>';
 				}
 			?>
 		</select>
@@ -1729,10 +1537,18 @@ class WC_Admin_Post_Types {
 		if ( ! empty( $_GET['_customer_user'] ) ) {
 			$user_id     = absint( $_GET['_customer_user'] );
 			$user        = get_user_by( 'id', $user_id );
-			$user_string = esc_html( $user->display_name ) . ' (#' . absint( $user->ID ) . ' &ndash; ' . esc_html( $user->user_email ) . ')';
+			/* translators: 1: user display name 2: user ID 3: user email */
+			$user_string = sprintf(
+				esc_html__( '%1$s (#%2$s &ndash; %3$s)', 'woocommerce' ),
+				$user->display_name,
+				absint( $user->ID ),
+				$user->user_email
+			);
 		}
 		?>
-		<input type="hidden" class="wc-customer-search" name="_customer_user" data-placeholder="<?php esc_attr_e( 'Search for a customer&hellip;', 'woocommerce' ); ?>" data-selected="<?php echo htmlspecialchars( $user_string ); ?>" value="<?php echo $user_id; ?>" data-allow_clear="true" />
+		<select class="wc-customer-search" name="_customer_user" data-placeholder="<?php esc_attr_e( 'Search for a customer&hellip;', 'woocommerce' ); ?>" data-allow_clear="true">
+			<option value="<?php echo esc_attr( $user_id ); ?>" selected="selected"><?php echo htmlspecialchars( $user_string ); ?><option>
+		</select>
 		<?php
 	}
 
@@ -1751,30 +1567,22 @@ class WC_Admin_Post_Types {
 				if ( 'price' == $vars['orderby'] ) {
 					$vars = array_merge( $vars, array(
 						'meta_key'  => '_price',
-						'orderby'   => 'meta_value_num'
-					) );
-				}
-				if ( 'featured' == $vars['orderby'] ) {
-					$vars = array_merge( $vars, array(
-						'meta_key'  => '_featured',
-						'orderby'   => 'meta_value'
+						'orderby'   => 'meta_value_num',
 					) );
 				}
 				if ( 'sku' == $vars['orderby'] ) {
 					$vars = array_merge( $vars, array(
 						'meta_key'  => '_sku',
-						'orderby'   => 'meta_value'
+						'orderby'   => 'meta_value',
 					) );
 				}
 			}
-
 		} elseif ( 'shop_coupon' === $typenow ) {
 
 			if ( ! empty( $_GET['coupon_type'] ) ) {
 				$vars['meta_key']   = 'discount_type';
 				$vars['meta_value'] = wc_clean( $_GET['coupon_type'] );
 			}
-
 		} elseif ( in_array( $typenow, wc_get_order_types( 'order-meta-boxes' ) ) ) {
 
 			// Filter the orders by the posted customer.
@@ -1783,8 +1591,8 @@ class WC_Admin_Post_Types {
 					array(
 						'key'   => '_customer_user',
 						'value' => (int) $_GET['_customer_user'],
-						'compare' => '='
-					)
+						'compare' => '=',
+					),
 				);
 			}
 
@@ -1793,7 +1601,7 @@ class WC_Admin_Post_Types {
 				if ( 'order_total' == $vars['orderby'] ) {
 					$vars = array_merge( $vars, array(
 						'meta_key'  => '_order_total',
-						'orderby'   => 'meta_value_num'
+						'orderby'   => 'meta_value_num',
 					) );
 				}
 			}
@@ -1841,12 +1649,22 @@ class WC_Admin_Post_Types {
 			}
 
 			// Categories
-			if ( isset( $_GET['product_cat'] ) && '0' == $_GET['product_cat'] ) {
+			if ( isset( $_GET['product_cat'] ) && '0' === $_GET['product_cat'] ) {
 				$query->query_vars['tax_query'][] = array(
 					'taxonomy' => 'product_cat',
 					'field'    => 'id',
 					'terms'    => get_terms( 'product_cat', array( 'fields' => 'ids' ) ),
-					'operator' => 'NOT IN'
+					'operator' => 'NOT IN',
+				);
+			}
+
+			// Shipping classes
+			if ( isset( $_GET['product_shipping_class'] ) && '0' === $_GET['product_shipping_class'] ) {
+				$query->query_vars['tax_query'][] = array(
+					'taxonomy' => 'product_shipping_class',
+					'field'    => 'id',
+					'terms'    => get_terms( 'product_shipping_class', array( 'fields' => 'ids' ) ),
+					'operator' => 'NOT IN',
 				);
 			}
 		}
@@ -1877,7 +1695,7 @@ class WC_Admin_Post_Types {
 			$sku_to_id = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_parent FROM {$wpdb->posts} LEFT JOIN {$wpdb->postmeta} ON {$wpdb->posts}.ID = {$wpdb->postmeta}.post_id WHERE meta_key='_sku' AND meta_value LIKE %s;", '%' . $wpdb->esc_like( wc_clean( $term ) ) . '%' ) );
 			$sku_to_id = array_merge( wp_list_pluck( $sku_to_id, 'ID' ), wp_list_pluck( $sku_to_id, 'post_parent' ) );
 
-			if ( $sku_to_id && sizeof( $sku_to_id ) > 0 ) {
+			if ( sizeof( $sku_to_id ) > 0 ) {
 				$search_ids = array_merge( $search_ids, $sku_to_id );
 			}
 		}
@@ -1903,169 +1721,11 @@ class WC_Admin_Post_Types {
 	}
 
 	/**
-	 * Removes variations etc belonging to a deleted post, and clears transients.
-	 *
-	 * @param mixed $id ID of post being deleted
+	 * Output extra data on post forms.
+	 * @param  WP_Post $post
 	 */
-	public function delete_post( $id ) {
-		global $woocommerce, $wpdb;
-
-		if ( ! current_user_can( 'delete_posts' ) ) {
-			return;
-		}
-
-		if ( $id > 0 ) {
-
-			$post_type = get_post_type( $id );
-
-			switch ( $post_type ) {
-				case 'product' :
-
-					$child_product_variations = get_children( 'post_parent=' . $id . '&post_type=product_variation' );
-
-					if ( ! empty( $child_product_variations ) ) {
-						foreach ( $child_product_variations as $child ) {
-							wp_delete_post( $child->ID, true );
-						}
-					}
-
-					$child_products = get_children( 'post_parent=' . $id . '&post_type=product' );
-
-					if ( ! empty( $child_products ) ) {
-						foreach ( $child_products as $child ) {
-							$child_post                = array();
-							$child_post['ID']          = $child->ID;
-							$child_post['post_parent'] = 0;
-							wp_update_post( $child_post );
-						}
-					}
-
-					if ( $parent_id = wp_get_post_parent_id( $id ) ) {
-						wc_delete_product_transients( $parent_id );
-					}
-
-				break;
-				case 'product_variation' :
-					wc_delete_product_transients( wp_get_post_parent_id( $id ) );
-				break;
-				case 'shop_order' :
-					$refunds = $wpdb->get_results( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = 'shop_order_refund' AND post_parent = %d", $id ) );
-
-					if ( ! is_null( $refunds ) ) {
-						foreach ( $refunds as $refund ) {
-							wp_delete_post( $refund->ID, true );
-						}
-					}
-				break;
-			}
-		}
-	}
-
-	/**
-	 * woocommerce_trash_post function.
-	 *
-	 * @param mixed $id
-	 */
-	public function trash_post( $id ) {
-		global $wpdb;
-
-		if ( $id > 0 ) {
-
-			$post_type = get_post_type( $id );
-
-			if ( in_array( $post_type, wc_get_order_types( 'order-count' ) ) ) {
-
-				// Delete count - meta doesn't work on trashed posts
-				$user_id = get_post_meta( $id, '_customer_user', true );
-
-				if ( $user_id > 0 ) {
-					update_user_meta( $user_id, '_order_count', '' );
-					update_user_meta( $user_id, '_money_spent', '' );
-				}
-
-				$refunds = $wpdb->get_results( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = 'shop_order_refund' AND post_parent = %d", $id ) );
-
-				foreach ( $refunds as $refund ) {
-					$wpdb->update( $wpdb->posts, array( 'post_status' => 'trash' ), array( 'ID' => $refund->ID ) );
-				}
-
-				delete_transient( 'woocommerce_processing_order_count' );
-				wc_delete_shop_order_transients( $id );
-			}
-
-		}
-	}
-
-	/**
-	 * woocommerce_untrash_post function.
-	 *
-	 * @param mixed $id
-	 */
-	public function untrash_post( $id ) {
-		global $wpdb;
-
-		if ( $id > 0 ) {
-
-			$post_type = get_post_type( $id );
-
-			if ( in_array( $post_type, wc_get_order_types( 'order-count' ) ) ) {
-
-				// Delete count - meta doesn't work on trashed posts
-				$user_id = get_post_meta( $id, '_customer_user', true );
-
-				if ( $user_id > 0 ) {
-					update_user_meta( $user_id, '_order_count', '' );
-					update_user_meta( $user_id, '_money_spent', '' );
-				}
-
-				$refunds = $wpdb->get_results( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = 'shop_order_refund' AND post_parent = %d", $id ) );
-
-				foreach ( $refunds as $refund ) {
-					$wpdb->update( $wpdb->posts, array( 'post_status' => 'wc-completed' ), array( 'ID' => $refund->ID ) );
-				}
-
-				delete_transient( 'woocommerce_processing_order_count' );
-				wc_delete_shop_order_transients( $id );
-			}
-		}
-	}
-
-	/**
-	 * Remove item meta on permanent deletion.
-	 */
-	public function delete_order_items( $postid ) {
-		global $wpdb;
-
-		if ( in_array( get_post_type( $postid ), wc_get_order_types() ) ) {
-			do_action( 'woocommerce_delete_order_items', $postid );
-
-			$wpdb->query( "
-				DELETE {$wpdb->prefix}woocommerce_order_items, {$wpdb->prefix}woocommerce_order_itemmeta
-				FROM {$wpdb->prefix}woocommerce_order_items
-				JOIN {$wpdb->prefix}woocommerce_order_itemmeta ON {$wpdb->prefix}woocommerce_order_items.order_item_id = {$wpdb->prefix}woocommerce_order_itemmeta.order_item_id
-				WHERE {$wpdb->prefix}woocommerce_order_items.order_id = '{$postid}';
-				" );
-
-			do_action( 'woocommerce_deleted_order_items', $postid );
-		}
-	}
-
-	/**
-	 * Remove downloadable permissions on permanent order deletion.
-	 */
-	public function delete_order_downloadable_permissions( $postid ) {
-		global $wpdb;
-
-		if ( in_array( get_post_type( $postid ), wc_get_order_types() ) ) {
-			do_action( 'woocommerce_delete_order_downloadable_permissions', $postid );
-
-			$wpdb->query( $wpdb->prepare( "
-				DELETE FROM {$wpdb->prefix}woocommerce_downloadable_product_permissions
-				WHERE order_id = %d
-			", $postid ) );
-
-			do_action( 'woocommerce_deleted_order_downloadable_permissions', $postid );
-		}
+	public function edit_form_top( $post ) {
+		echo '<input type="hidden" id="original_post_title" name="original_post_title" value="' . esc_attr( $post->post_title ) . '" />';
 	}
 
 	/**
@@ -2099,24 +1759,6 @@ class WC_Admin_Post_Types {
 		}
 	}
 
-	/**
-	 * Change label for insert buttons.
-	 * @param  array $strings
-	 * @return array
-	 */
-	public function change_insert_into_post( $strings ) {
-		global $post_type;
-
-		if ( in_array( $post_type, array( 'product', 'shop_coupon' ) ) || in_array( $post_type, wc_get_order_types() ) ) {
-			$obj = get_post_type_object( $post_type );
-
-			$strings['insertIntoPost']     = sprintf( __( 'Insert into %s', 'woocommerce' ), $obj->labels->singular_name );
-			$strings['uploadedToThisPost'] = sprintf( __( 'Uploaded to this %s', 'woocommerce' ), $obj->labels->singular_name );
-		}
-
-		return $strings;
-	}
-
 	/**
 	 * Hidden default Meta-Boxes.
 	 * @param  array  $hidden
@@ -2135,27 +1777,23 @@ class WC_Admin_Post_Types {
 	 * Output product visibility options.
 	 */
 	public function product_data_visibility() {
-		global $post;
+		global $post, $thepostid, $product_object;
 
-		if ( 'product' != $post->post_type ) {
+		if ( 'product' !== $post->post_type ) {
 			return;
 		}
 
-		$current_visibility = ( $current_visibility = get_post_meta( $post->ID, '_visibility', true ) ) ? $current_visibility : apply_filters( 'woocommerce_product_visibility_default' , 'visible' );
-		$current_featured   = ( $current_featured = get_post_meta( $post->ID, '_featured', true ) ) ? $current_featured : 'no';
-
-		$visibility_options = apply_filters( 'woocommerce_product_visibility_options', array(
-			'visible' => __( 'Catalog/search', 'woocommerce' ),
-			'catalog' => __( 'Catalog', 'woocommerce' ),
-			'search'  => __( 'Search', 'woocommerce' ),
-			'hidden'  => __( 'Hidden', 'woocommerce' )
-		) );
+		$thepostid          = $post->ID;
+		$product_object     = $thepostid ? wc_get_product( $thepostid ) : new WC_Product;
+		$current_visibility = $product_object->get_catalog_visibility();
+		$current_featured   = wc_bool_to_string( $product_object->get_featured() );
+		$visibility_options = wc_get_product_visibility_options();
 		?>
 		<div class="misc-pub-section" id="catalog-visibility">
 			<?php _e( 'Catalog visibility:', 'woocommerce' ); ?> <strong id="catalog-visibility-display"><?php
-				echo isset( $visibility_options[ $current_visibility ]  ) ? esc_html( $visibility_options[ $current_visibility ] ) : esc_html( $current_visibility );
+				echo isset( $visibility_options[ $current_visibility ] ) ? esc_html( $visibility_options[ $current_visibility ] ) : esc_html( $current_visibility );
 
-				if ( 'yes' == $current_featured ) {
+				if ( 'yes' === $current_featured ) {
 					echo ', ' . __( 'Featured', 'woocommerce' );
 				}
 			?></strong>
@@ -2176,7 +1814,7 @@ class WC_Admin_Post_Types {
 
 					echo '<p>' . __( 'Enable this option to feature this product.', 'woocommerce' ) . '</p>';
 
-					echo '<input type="checkbox" name="_featured" id="_featured" ' . checked( $current_featured, 'yes', false ) . ' /> <label for="_featured">' . __( 'Featured Product', 'woocommerce' ) . '</label><br />';
+					echo '<input type="checkbox" name="_featured" id="_featured" ' . checked( $current_featured, 'yes', false ) . ' /> <label for="_featured">' . __( 'Featured product', 'woocommerce' ) . '</label><br />';
 				?>
 				<p>
 					<a href="#catalog-visibility" class="save-post-visibility hide-if-no-js button"><?php _e( 'OK', 'woocommerce' ); ?></a>
@@ -2200,7 +1838,7 @@ class WC_Admin_Post_Types {
 
 			if ( empty( $pathdata['subdir'] ) ) {
 				$pathdata['path']   = $pathdata['path'] . '/woocommerce_uploads';
-				$pathdata['url']    = $pathdata['url']. '/woocommerce_uploads';
+				$pathdata['url']    = $pathdata['url'] . '/woocommerce_uploads';
 				$pathdata['subdir'] = '/woocommerce_uploads';
 			} else {
 				$new_subdir = '/woocommerce_uploads' . $pathdata['subdir'];
@@ -2228,66 +1866,107 @@ class WC_Admin_Post_Types {
 	 * @param int $product_id product identifier
 	 * @param int $variation_id optional product variation identifier
 	 * @param array $downloadable_files newly set files
+	 * @deprecated and moved to post-data class.
 	 */
 	public function process_product_file_download_paths( $product_id, $variation_id, $downloadable_files ) {
-		global $wpdb;
-
-		if ( $variation_id ) {
-			$product_id = $variation_id;
-		}
-
-		$product               = wc_get_product( $product_id );
-		$existing_download_ids = array_keys( (array) $product->get_files() );
-		$updated_download_ids  = array_keys( (array) $downloadable_files );
-
-		$new_download_ids      = array_filter( array_diff( $updated_download_ids, $existing_download_ids ) );
-		$removed_download_ids  = array_filter( array_diff( $existing_download_ids, $updated_download_ids ) );
-
-		if ( ! empty( $new_download_ids ) || ! empty( $removed_download_ids ) ) {
-			// determine whether downloadable file access has been granted via the typical order completion, or via the admin ajax method
-			$existing_permissions = $wpdb->get_results( $wpdb->prepare( "SELECT * from {$wpdb->prefix}woocommerce_downloadable_product_permissions WHERE product_id = %d GROUP BY order_id", $product_id ) );
-
-			foreach ( $existing_permissions as $existing_permission ) {
-				$order = wc_get_order( $existing_permission->order_id );
-
-				if ( ! empty( $order->id ) ) {
-					// Remove permissions
-					if ( ! empty( $removed_download_ids ) ) {
-						foreach ( $removed_download_ids as $download_id ) {
-							if ( apply_filters( 'woocommerce_process_product_file_download_paths_remove_access_to_old_file', true, $download_id, $product_id, $order ) ) {
-								$wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->prefix}woocommerce_downloadable_product_permissions WHERE order_id = %d AND product_id = %d AND download_id = %s", $order->id, $product_id, $download_id ) );
-							}
-						}
-					}
-					// Add permissions
-					if ( ! empty( $new_download_ids ) ) {
-
-						foreach ( $new_download_ids as $download_id ) {
-
-							if ( apply_filters( 'woocommerce_process_product_file_download_paths_grant_access_to_new_file', true, $download_id, $product_id, $order ) ) {
-								// grant permission if it doesn't already exist
-								if ( ! $wpdb->get_var( $wpdb->prepare( "SELECT 1=1 FROM {$wpdb->prefix}woocommerce_downloadable_product_permissions WHERE order_id = %d AND product_id = %d AND download_id = %s", $order->id, $product_id, $download_id ) ) ) {
-									wc_downloadable_file_permission( $download_id, $product_id, $order );
-								}
-							}
-						}
-					}
-				}
-			}
-		}
+		WC_Post_Data::process_product_file_download_paths( $product_id, $variation_id, $downloadable_files );
 	}
 
-
 	/**
 	 * Disable DFW feature pointer.
 	 */
 	public function disable_dfw_feature_pointer() {
 		$screen = get_current_screen();
 
-		if ( 'product' === $screen->id && 'post' === $screen->base ) {
+		if ( $screen && 'product' === $screen->id && 'post' === $screen->base ) {
 			remove_action( 'admin_print_footer_scripts', array( 'WP_Internal_Pointers', 'pointer_wp410_dfw' ) );
 		}
 	}
+
+	/**
+	 * Removes products, orders, and coupons from the list of post types that support "View Mode" switching.
+	 * View mode is seen on posts where you can switch between list or excerpt. Our post types don't support
+	 * it, so we want to hide the useless UI from the screen options tab.
+	 *
+	 * @since 2.6
+	 * @param  array $post_types Array of post types supporting view mode
+	 * @return array             Array of post types supporting view mode, without products, orders, and coupons
+	 */
+	public function disable_view_mode_options( $post_types ) {
+		unset( $post_types['product'], $post_types['shop_order'], $post_types['shop_coupon'] );
+		return $post_types;
+	}
+
+	/**
+	 * Show blank slate.
+	 */
+	public function maybe_render_blank_state( $which ) {
+		global $post_type;
+
+		if ( in_array( $post_type, array( 'shop_order', 'product', 'shop_coupon' ) ) && 'bottom' === $which ) {
+			$counts = (array) wp_count_posts( $post_type );
+			unset( $counts['auto-draft'] );
+			$count  = array_sum( $counts );
+
+			if ( 0 < $count ) {
+				return;
+			}
+
+			echo '<div class="woocommerce-BlankState">';
+
+			switch ( $post_type ) {
+				case 'shop_order' :
+					?>
+					<h2 class="woocommerce-BlankState-message"><?php _e( 'When you receive a new order, it will appear here.', 'woocommerce' ); ?></h2>
+					<a class="woocommerce-BlankState-cta button-primary button" target="_blank" href="https://docs.woocommerce.com/document/managing-orders/?utm_source=blankslate&utm_medium=product&utm_content=ordersdoc&utm_campaign=woocommerceplugin"><?php _e( 'Learn more about orders', 'woocommerce' ); ?></a>
+					<?php
+				break;
+				case 'shop_coupon' :
+					?>
+					<h2 class="woocommerce-BlankState-message"><?php _e( 'Coupons are a great way to offer discounts and rewards to your customers. They will appear here once created.', 'woocommerce' ); ?></h2>
+					<a class="woocommerce-BlankState-cta button-primary button" target="_blank" href="https://docs.woocommerce.com/document/coupon-management/?utm_source=blankslate&utm_medium=product&utm_content=couponsdoc&utm_campaign=woocommerceplugin"><?php _e( 'Learn more about coupons', 'woocommerce' ); ?></a>
+					<?php
+				break;
+				case 'product' :
+					?>
+					<h2 class="woocommerce-BlankState-message"><?php _e( 'Ready to start selling something awesome?', 'woocommerce' ); ?></h2>
+					<a class="woocommerce-BlankState-cta button-primary button" href="<?php echo esc_url( admin_url( 'post-new.php?post_type=product&tutorial=true' ) ); ?>"><?php _e( 'Create your first product!', 'woocommerce' ); ?></a>
+					<?php
+				break;
+			}
+
+			echo '<style type="text/css">#posts-filter .wp-list-table, #posts-filter .tablenav.top, .tablenav.bottom .actions, .wrap .subsubsub  { display: none; } </style></div>';
+		}
+	}
+
+	/**
+	 * When editing the shop page, we should hide templates.
+	 * @return array
+	 */
+	public function hide_cpt_archive_templates( $page_templates, $class, $post ) {
+		$shop_page_id = wc_get_page_id( 'shop' );
+
+		if ( $post && absint( $shop_page_id ) === absint( $post->ID ) ) {
+			$page_templates = array();
+		}
+
+		return $page_templates;
+	}
+
+	/**
+	 * Show a notice above the CPT archive.
+	 */
+	public function show_cpt_archive_notice( $post ) {
+		$shop_page_id = wc_get_page_id( 'shop' );
+
+		if ( $post && absint( $shop_page_id ) === absint( $post->ID ) ) {
+			?>
+			<div class="notice notice-info">
+				<p><?php printf( __( 'This is the WooCommerce shop page. The shop page is a special archive that lists your products. <a href="%s">You can read more about this here</a>.', 'woocommerce' ), 'https://docs.woocommerce.com/document/woocommerce-pages/#section-4' ); ?></p>
+			</div>
+			<?php
+		}
+	}
 }
 
 endif;
diff --git a/includes/admin/class-wc-admin-profile.php b/includes/admin/class-wc-admin-profile.php
index 65e22f72444..04f4ed6856f 100644
--- a/includes/admin/class-wc-admin-profile.php
+++ b/includes/admin/class-wc-admin-profile.php
@@ -12,7 +12,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
 
-if ( ! class_exists( 'WC_Admin_Profile' ) ) :
+if ( ! class_exists( 'WC_Admin_Profile', false ) ) :
 
 /**
  * WC_Admin_Profile Class.
@@ -38,103 +38,103 @@ class WC_Admin_Profile {
 	public function get_customer_meta_fields() {
 		$show_fields = apply_filters('woocommerce_customer_meta_fields', array(
 			'billing' => array(
-				'title' => __( 'Customer Billing Address', 'woocommerce' ),
+				'title' => __( 'Customer billing address', 'woocommerce' ),
 				'fields' => array(
 					'billing_first_name' => array(
 						'label'       => __( 'First name', 'woocommerce' ),
-						'description' => ''
+						'description' => '',
 					),
 					'billing_last_name' => array(
 						'label'       => __( 'Last name', 'woocommerce' ),
-						'description' => ''
+						'description' => '',
 					),
 					'billing_company' => array(
 						'label'       => __( 'Company', 'woocommerce' ),
-						'description' => ''
+						'description' => '',
 					),
 					'billing_address_1' => array(
-						'label'       => __( 'Address 1', 'woocommerce' ),
-						'description' => ''
+						'label'       => __( 'Address line 1', 'woocommerce' ),
+						'description' => '',
 					),
 					'billing_address_2' => array(
-						'label'       => __( 'Address 2', 'woocommerce' ),
-						'description' => ''
+						'label'       => __( 'Address line 2', 'woocommerce' ),
+						'description' => '',
 					),
 					'billing_city' => array(
 						'label'       => __( 'City', 'woocommerce' ),
-						'description' => ''
+						'description' => '',
 					),
 					'billing_postcode' => array(
-						'label'       => __( 'Postcode', 'woocommerce' ),
-						'description' => ''
+						'label'       => __( 'Postcode / ZIP', 'woocommerce' ),
+						'description' => '',
 					),
 					'billing_country' => array(
 						'label'       => __( 'Country', 'woocommerce' ),
 						'description' => '',
 						'class'       => 'js_field-country',
 						'type'        => 'select',
-						'options'     => array( '' => __( 'Select a country&hellip;', 'woocommerce' ) ) + WC()->countries->get_allowed_countries()
+						'options'     => array( '' => __( 'Select a country&hellip;', 'woocommerce' ) ) + WC()->countries->get_allowed_countries(),
 					),
 					'billing_state' => array(
-						'label'       => __( 'State/County', 'woocommerce' ),
-						'description' => __( 'State/County or state code', 'woocommerce' ),
-						'class'       => 'js_field-state'
+						'label'       => __( 'State / County', 'woocommerce' ),
+						'description' => __( 'State / County or state code', 'woocommerce' ),
+						'class'       => 'js_field-state',
 					),
 					'billing_phone' => array(
-						'label'       => __( 'Telephone', 'woocommerce' ),
-						'description' => ''
+						'label'       => __( 'Phone', 'woocommerce' ),
+						'description' => '',
 					),
 					'billing_email' => array(
-						'label'       => __( 'Email', 'woocommerce' ),
-						'description' => ''
-					)
-				)
+						'label'       => __( 'Email address', 'woocommerce' ),
+						'description' => '',
+					),
+				),
 			),
 			'shipping' => array(
-				'title' => __( 'Customer Shipping Address', 'woocommerce' ),
+				'title' => __( 'Customer shipping address', 'woocommerce' ),
 				'fields' => array(
 					'shipping_first_name' => array(
 						'label'       => __( 'First name', 'woocommerce' ),
-						'description' => ''
+						'description' => '',
 					),
 					'shipping_last_name' => array(
 						'label'       => __( 'Last name', 'woocommerce' ),
-						'description' => ''
+						'description' => '',
 					),
 					'shipping_company' => array(
 						'label'       => __( 'Company', 'woocommerce' ),
-						'description' => ''
+						'description' => '',
 					),
 					'shipping_address_1' => array(
-						'label'       => __( 'Address 1', 'woocommerce' ),
-						'description' => ''
+						'label'       => __( 'Address line 1', 'woocommerce' ),
+						'description' => '',
 					),
 					'shipping_address_2' => array(
-						'label'       => __( 'Address 2', 'woocommerce' ),
-						'description' => ''
+						'label'       => __( 'Address line 2', 'woocommerce' ),
+						'description' => '',
 					),
 					'shipping_city' => array(
 						'label'       => __( 'City', 'woocommerce' ),
-						'description' => ''
+						'description' => '',
 					),
 					'shipping_postcode' => array(
-						'label'       => __( 'Postcode', 'woocommerce' ),
-						'description' => ''
+						'label'       => __( 'Postcode / ZIP', 'woocommerce' ),
+						'description' => '',
 					),
 					'shipping_country' => array(
 						'label'       => __( 'Country', 'woocommerce' ),
 						'description' => '',
 						'class'       => 'js_field-country',
 						'type'        => 'select',
-						'options'     => array( '' => __( 'Select a country&hellip;', 'woocommerce' ) ) + WC()->countries->get_allowed_countries()
+						'options'     => array( '' => __( 'Select a country&hellip;', 'woocommerce' ) ) + WC()->countries->get_allowed_countries(),
 					),
 					'shipping_state' => array(
-						'label'       => __( 'State/County', 'woocommerce' ),
-						'description' => __( 'State/County or state code', 'woocommerce' ),
-						'class'       => 'js_field-state'
-					)
-				)
-			)
+						'label'       => __( 'State / County', 'woocommerce' ),
+						'description' => __( 'State / County or state code', 'woocommerce' ),
+						'class'       => 'js_field-state',
+					),
+				),
+			),
 		) );
 		return $show_fields;
 	}
@@ -153,7 +153,7 @@ class WC_Admin_Profile {
 
 		foreach ( $show_fields as $fieldset ) :
 			?>
-			<h3><?php echo $fieldset['title']; ?></h3>
+			<h2><?php echo $fieldset['title']; ?></h2>
 			<table class="form-table">
 				<?php
 				foreach ( $fieldset['fields'] as $key => $field ) :
@@ -161,7 +161,7 @@ class WC_Admin_Profile {
 					<tr>
 						<th><label for="<?php echo esc_attr( $key ); ?>"><?php echo esc_html( $field['label'] ); ?></label></th>
 						<td>
-							<?php if ( ! empty( $field['type'] ) && 'select' == $field['type'] ) : ?>
+							<?php if ( ! empty( $field['type'] ) && 'select' === $field['type'] ) : ?>
 								<select name="<?php echo esc_attr( $key ); ?>" id="<?php echo esc_attr( $key ); ?>" class="<?php echo ( ! empty( $field['class'] ) ? $field['class'] : '' ); ?>" style="width: 25em;">
 									<?php
 										$selected = esc_attr( get_user_meta( $user->ID, $key, true ) );
@@ -169,8 +169,10 @@ class WC_Admin_Profile {
 										<option value="<?php echo esc_attr( $option_key ); ?>" <?php selected( $selected, $option_key, true ); ?>><?php echo esc_attr( $option_value ); ?></option>
 									<?php endforeach; ?>
 								</select>
+							<?php elseif ( ! empty( $field['type'] ) && 'checkbox' === $field['type'] ) : ?>
+								<input type="checkbox" name="<?php echo esc_attr( $key ); ?>" id="<?php echo esc_attr( $key ); ?>" value="1" class="<?php echo ( ! empty( $field['class'] ) ? $field['class'] : '' ); ?>" <?php checked( (int) get_user_meta( $user->ID, $key, true ), 1, true ); ?> />
 							<?php else : ?>
-							<input type="text" name="<?php echo esc_attr( $key ); ?>" id="<?php echo esc_attr( $key ); ?>" value="<?php echo esc_attr( get_user_meta( $user->ID, $key, true ) ); ?>" class="<?php echo ( ! empty( $field['class'] ) ? $field['class'] : 'regular-text' ); ?>" />
+								<input type="text" name="<?php echo esc_attr( $key ); ?>" id="<?php echo esc_attr( $key ); ?>" value="<?php echo esc_attr( get_user_meta( $user->ID, $key, true ) ); ?>" class="<?php echo ( ! empty( $field['class'] ) ? $field['class'] : 'regular-text' ); ?>" />
 							<?php endif; ?>
 							<br/>
 							<span class="description"><?php echo wp_kses_post( $field['description'] ); ?></span>
@@ -196,7 +198,9 @@ class WC_Admin_Profile {
 
 			foreach ( $fieldset['fields'] as $key => $field ) {
 
-				if ( isset( $_POST[ $key ] ) ) {
+				if ( isset( $field['type'] ) && 'checkbox' === $field['type'] ) {
+					update_user_meta( $user_id, $key, isset( $_POST[ $key ] ) );
+				} elseif ( isset( $_POST[ $key ] ) ) {
 					update_user_meta( $user_id, $key, wc_clean( $_POST[ $key ] ) );
 				}
 			}
diff --git a/includes/admin/class-wc-admin-reports.php b/includes/admin/class-wc-admin-reports.php
index e43bba6571d..b37c39d289e 100644
--- a/includes/admin/class-wc-admin-reports.php
+++ b/includes/admin/class-wc-admin-reports.php
@@ -14,7 +14,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
 
-if ( ! class_exists( 'WC_Admin_Reports' ) ) :
+if ( ! class_exists( 'WC_Admin_Reports', false ) ) :
 
 /**
  * WC_Admin_Reports Class.
@@ -30,8 +30,8 @@ class WC_Admin_Reports {
 		$current_tab    = ! empty( $_GET['tab'] ) ? sanitize_title( $_GET['tab'] ) : $first_tab[0];
 		$current_report = isset( $_GET['report'] ) ? sanitize_title( $_GET['report'] ) : current( array_keys( $reports[ $current_tab ]['reports'] ) );
 
-		include_once( 'reports/class-wc-admin-report.php' );
-		include_once( 'views/html-admin-page-reports.php' );
+		include_once( dirname( __FILE__ ) . '/reports/class-wc-admin-report.php' );
+		include_once( dirname( __FILE__ ) . '/views/html-admin-page-reports.php' );
 	}
 
 	/**
@@ -48,44 +48,44 @@ class WC_Admin_Reports {
 						'title'       => __( 'Sales by date', 'woocommerce' ),
 						'description' => '',
 						'hide_title'  => true,
-						'callback'    => array( __CLASS__, 'get_report' )
+						'callback'    => array( __CLASS__, 'get_report' ),
 					),
 					"sales_by_product" => array(
 						'title'       => __( 'Sales by product', 'woocommerce' ),
 						'description' => '',
 						'hide_title'  => true,
-						'callback'    => array( __CLASS__, 'get_report' )
+						'callback'    => array( __CLASS__, 'get_report' ),
 					),
 					"sales_by_category" => array(
 						'title'       => __( 'Sales by category', 'woocommerce' ),
 						'description' => '',
 						'hide_title'  => true,
-						'callback'    => array( __CLASS__, 'get_report' )
+						'callback'    => array( __CLASS__, 'get_report' ),
 					),
 					"coupon_usage" => array(
 						'title'       => __( 'Coupons by date', 'woocommerce' ),
 						'description' => '',
 						'hide_title'  => true,
-						'callback'    => array( __CLASS__, 'get_report' )
-					)
-				)
+						'callback'    => array( __CLASS__, 'get_report' ),
+					),
+				),
 			),
 			'customers' => array(
 				'title'  => __( 'Customers', 'woocommerce' ),
 				'reports' => array(
 					"customers" => array(
-						'title'       => __( 'Customers vs. Guests', 'woocommerce' ),
+						'title'       => __( 'Customers vs. guests', 'woocommerce' ),
 						'description' => '',
 						'hide_title'  => true,
-						'callback'    => array( __CLASS__, 'get_report' )
+						'callback'    => array( __CLASS__, 'get_report' ),
 					),
 					"customer_list" => array(
-						'title'       => __( 'Customer List', 'woocommerce' ),
+						'title'       => __( 'Customer list', 'woocommerce' ),
 						'description' => '',
 						'hide_title'  => true,
-						'callback'    => array( __CLASS__, 'get_report' )
+						'callback'    => array( __CLASS__, 'get_report' ),
 					),
-				)
+				),
 			),
 			'stock'     => array(
 				'title'  => __( 'Stock', 'woocommerce' ),
@@ -94,22 +94,22 @@ class WC_Admin_Reports {
 						'title'       => __( 'Low in stock', 'woocommerce' ),
 						'description' => '',
 						'hide_title'  => true,
-						'callback'    => array( __CLASS__, 'get_report' )
+						'callback'    => array( __CLASS__, 'get_report' ),
 					),
 					"out_of_stock" => array(
 						'title'       => __( 'Out of stock', 'woocommerce' ),
 						'description' => '',
 						'hide_title'  => true,
-						'callback'    => array( __CLASS__, 'get_report' )
+						'callback'    => array( __CLASS__, 'get_report' ),
 					),
 					"most_stocked" => array(
 						'title'       => __( 'Most Stocked', 'woocommerce' ),
 						'description' => '',
 						'hide_title'  => true,
-						'callback'    => array( __CLASS__, 'get_report' )
+						'callback'    => array( __CLASS__, 'get_report' ),
 					),
-				)
-			)
+				),
+			),
 		);
 
 		if ( wc_tax_enabled() ) {
@@ -120,15 +120,15 @@ class WC_Admin_Reports {
 						'title'       => __( 'Taxes by code', 'woocommerce' ),
 						'description' => '',
 						'hide_title'  => true,
-						'callback'    => array( __CLASS__, 'get_report' )
+						'callback'    => array( __CLASS__, 'get_report' ),
 					),
 					"taxes_by_date" => array(
 						'title'       => __( 'Taxes by date', 'woocommerce' ),
 						'description' => '',
 						'hide_title'  => true,
-						'callback'    => array( __CLASS__, 'get_report' )
+						'callback'    => array( __CLASS__, 'get_report' ),
 					),
-				)
+				),
 			);
 		}
 
@@ -159,8 +159,9 @@ class WC_Admin_Reports {
 
 		include_once( apply_filters( 'wc_admin_reports_path', 'reports/class-wc-report-' . $name . '.php', $name, $class ) );
 
-		if ( ! class_exists( $class ) )
+		if ( ! class_exists( $class ) ) {
 			return;
+		}
 
 		$report = new $class();
 		$report->output_report();
diff --git a/includes/admin/class-wc-admin-settings.php b/includes/admin/class-wc-admin-settings.php
index 70848e21532..5488c8b8823 100644
--- a/includes/admin/class-wc-admin-settings.php
+++ b/includes/admin/class-wc-admin-settings.php
@@ -9,18 +9,35 @@
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
-if ( ! class_exists( 'WC_Admin_Settings' ) ) :
+if ( ! class_exists( 'WC_Admin_Settings', false ) ) :
 
 /**
- * WC_Admin_Settings.
+ * WC_Admin_Settings Class.
  */
 class WC_Admin_Settings {
 
+	/**
+	 * Setting pages.
+	 *
+	 * @var array
+	 */
 	private static $settings = array();
+
+	/**
+	 * Error messages.
+	 *
+	 * @var array
+	 */
 	private static $errors   = array();
+
+	/**
+	 * Update messages.
+	 *
+	 * @var array
+	 */
 	private static $messages = array();
 
 	/**
@@ -30,13 +47,13 @@ class WC_Admin_Settings {
 		if ( empty( self::$settings ) ) {
 			$settings = array();
 
-			include_once( 'settings/class-wc-settings-page.php' );
+			include_once( dirname( __FILE__ ) . '/settings/class-wc-settings-page.php' );
 
 			$settings[] = include( 'settings/class-wc-settings-general.php' );
 			$settings[] = include( 'settings/class-wc-settings-products.php' );
 			$settings[] = include( 'settings/class-wc-settings-tax.php' );
-			$settings[] = include( 'settings/class-wc-settings-checkout.php' );
 			$settings[] = include( 'settings/class-wc-settings-shipping.php' );
+			$settings[] = include( 'settings/class-wc-settings-checkout.php' );
 			$settings[] = include( 'settings/class-wc-settings-accounts.php' );
 			$settings[] = include( 'settings/class-wc-settings-emails.php' );
 			$settings[] = include( 'settings/class-wc-settings-integrations.php' );
@@ -63,16 +80,14 @@ class WC_Admin_Settings {
 		do_action( 'woocommerce_update_options_' . $current_tab );
 		do_action( 'woocommerce_update_options' );
 
-		// Clear any unwanted data
-		delete_transient( 'woocommerce_cache_excluded_uris' );
-
 		self::add_message( __( 'Your settings have been saved.', 'woocommerce' ) );
 		self::check_download_folder_protection();
 
-		// Re-add endpoints and flush rules
+		// Clear any unwanted data and flush rules
+		delete_transient( 'woocommerce_cache_excluded_uris' );
 		WC()->query->init_query_vars();
 		WC()->query->add_endpoints();
-		flush_rewrite_rules();
+		wp_schedule_single_event( time(), 'woocommerce_flush_rewrite_rules' );
 
 		do_action( 'woocommerce_settings_saved' );
 	}
@@ -100,11 +115,11 @@ class WC_Admin_Settings {
 	public static function show_messages() {
 		if ( sizeof( self::$errors ) > 0 ) {
 			foreach ( self::$errors as $error ) {
-				echo '<div id="message" class="error"><p><strong>' . esc_html( $error ) . '</strong></p></div>';
+				echo '<div id="message" class="error inline"><p><strong>' . esc_html( $error ) . '</strong></p></div>';
 			}
 		} elseif ( sizeof( self::$messages ) > 0 ) {
 			foreach ( self::$messages as $message ) {
-				echo '<div id="message" class="updated"><p><strong>' . esc_html( $message ) . '</strong></p></div>';
+				echo '<div id="message" class="updated inline"><p><strong>' . esc_html( $message ) . '</strong></p></div>';
 			}
 		}
 	}
@@ -124,7 +139,7 @@ class WC_Admin_Settings {
 		wp_enqueue_script( 'woocommerce_settings', WC()->plugin_url() . '/assets/js/admin/settings' . $suffix . '.js', array( 'jquery', 'jquery-ui-datepicker', 'jquery-ui-sortable', 'iris', 'select2' ), WC()->version, true );
 
 		wp_localize_script( 'woocommerce_settings', 'woocommerce_settings_params', array(
-			'i18n_nav_warning' => __( 'The changes you made will be lost if you navigate away from this page.', 'woocommerce' )
+			'i18n_nav_warning' => __( 'The changes you made will be lost if you navigate away from this page.', 'woocommerce' ),
 		) );
 
 		// Include settings pages
@@ -151,7 +166,7 @@ class WC_Admin_Settings {
 		// Get tabs for the settings page
 		$tabs = apply_filters( 'woocommerce_settings_tabs_array', array() );
 
-		include 'views/html-admin-settings.php';
+		include( dirname( __FILE__ ) . '/views/html-admin-settings.php' );
 	}
 
 	/**
@@ -191,7 +206,7 @@ class WC_Admin_Settings {
 			$option_value = stripslashes( $option_value );
 		}
 
-		return $option_value === null ? $default : $option_value;
+		return ( null === $option_value ) ? $default : $option_value;
 	}
 
 	/**
@@ -250,12 +265,12 @@ class WC_Admin_Settings {
 				// Section Titles
 				case 'title':
 					if ( ! empty( $value['title'] ) ) {
-						echo '<h3>' . esc_html( $value['title'] ) . '</h3>';
+						echo '<h2>' . esc_html( $value['title'] ) . '</h2>';
 					}
 					if ( ! empty( $value['desc'] ) ) {
 						echo wpautop( wptexturize( wp_kses_post( $value['desc'] ) ) );
 					}
-					echo '<table class="form-table">'. "\n\n";
+					echo '<table class="form-table">' . "\n\n";
 					if ( ! empty( $value['id'] ) ) {
 						do_action( 'woocommerce_settings_' . sanitize_title( $value['id'] ) );
 					}
@@ -276,33 +291,19 @@ class WC_Admin_Settings {
 				case 'text':
 				case 'email':
 				case 'number':
-				case 'color' :
 				case 'password' :
-
-					$type         = $value['type'];
 					$option_value = self::get_option( $value['id'], $value['default'] );
 
-					if ( $value['type'] == 'color' ) {
-						$type = 'text';
-						$value['class'] .= 'colorpick';
-						$description .= '<div id="colorPickerDiv_' . esc_attr( $value['id'] ) . '" class="colorpickdiv" style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;display:none;"></div>';
-					}
-
 					?><tr valign="top">
 						<th scope="row" class="titledesc">
 							<label for="<?php echo esc_attr( $value['id'] ); ?>"><?php echo esc_html( $value['title'] ); ?></label>
 							<?php echo $tooltip_html; ?>
 						</th>
 						<td class="forminp forminp-<?php echo sanitize_title( $value['type'] ) ?>">
-							<?php
-							if ( 'color' == $value['type'] ) {
-								echo '<span class="colorpickpreview" style="background: ' . esc_attr( $option_value ) . ';"></span>';
-							}
-							?>
 							<input
 								name="<?php echo esc_attr( $value['id'] ); ?>"
 								id="<?php echo esc_attr( $value['id'] ); ?>"
-								type="<?php echo esc_attr( $type ); ?>"
+								type="<?php echo esc_attr( $value['type'] ); ?>"
 								style="<?php echo esc_attr( $value['css'] ); ?>"
 								value="<?php echo esc_attr( $option_value ); ?>"
 								class="<?php echo esc_attr( $value['class'] ); ?>"
@@ -313,6 +314,33 @@ class WC_Admin_Settings {
 					</tr><?php
 					break;
 
+				// Color picker.
+				case 'color' :
+					$option_value = self::get_option( $value['id'], $value['default'] );
+
+					?><tr valign="top">
+						<th scope="row" class="titledesc">
+							<label for="<?php echo esc_attr( $value['id'] ); ?>"><?php echo esc_html( $value['title'] ); ?></label>
+							<?php echo $tooltip_html; ?>
+						</th>
+						<td class="forminp forminp-<?php echo sanitize_title( $value['type'] ) ?>">&lrm;
+							<span class="colorpickpreview" style="background: <?php echo esc_attr( $option_value ); ?>"></span>
+							<input
+								name="<?php echo esc_attr( $value['id'] ); ?>"
+								id="<?php echo esc_attr( $value['id'] ); ?>"
+								type="text"
+								dir="ltr"
+								style="<?php echo esc_attr( $value['css'] ); ?>"
+								value="<?php echo esc_attr( $option_value ); ?>"
+								class="<?php echo esc_attr( $value['class'] ); ?>colorpick"
+								placeholder="<?php echo esc_attr( $value['placeholder'] ); ?>"
+								<?php echo implode( ' ', $custom_attributes ); ?>
+								/>&lrm; <?php echo $description; ?>
+								<div id="colorPickerDiv_<?php echo esc_attr( $value['id'] ); ?>" class="colorpickdiv" style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;display:none;"></div>
+						</td>
+					</tr><?php
+					break;
+
 				// Textarea
 				case 'textarea':
 
@@ -351,7 +379,7 @@ class WC_Admin_Settings {
 						</th>
 						<td class="forminp forminp-<?php echo sanitize_title( $value['type'] ) ?>">
 							<select
-								name="<?php echo esc_attr( $value['id'] ); ?><?php if ( $value['type'] == 'multiselect' ) echo '[]'; ?>"
+								name="<?php echo esc_attr( $value['id'] ); ?><?php echo ( 'multiselect' === $value['type'] ) ? '[]' : ''; ?>"
 								id="<?php echo esc_attr( $value['id'] ); ?>"
 								style="<?php echo esc_attr( $value['css'] ); ?>"
 								class="<?php echo esc_attr( $value['class'] ); ?>"
@@ -373,7 +401,7 @@ class WC_Admin_Settings {
 										<?php
 									}
 								?>
-						   </select> <?php echo $description; ?>
+							</select> <?php echo $description; ?>
 						</td>
 					</tr><?php
 					break;
@@ -462,9 +490,9 @@ class WC_Admin_Settings {
 								name="<?php echo esc_attr( $value['id'] ); ?>"
 								id="<?php echo esc_attr( $value['id'] ); ?>"
 								type="checkbox"
-							 	class="<?php echo esc_attr(isset($value['class']) ? $value['class'] : ''); ?>"
+								class="<?php echo esc_attr( isset( $value['class'] ) ? $value['class'] : '' ); ?>"
 								value="1"
-								<?php checked( $option_value, 'yes'); ?>
+								<?php checked( $option_value, 'yes' ); ?>
 								<?php echo implode( ' ', $custom_attributes ); ?>
 							/> <?php echo $description ?>
 						</label> <?php echo $tooltip_html; ?>
@@ -486,11 +514,11 @@ class WC_Admin_Settings {
 				// Image width settings
 				case 'image_width' :
 
-					$image_size       = str_replace( '_image_size', '', $value[ 'id' ] );
+					$image_size       = str_replace( '_image_size', '', $value['id'] );
 					$size             = wc_get_image_size( $image_size );
-					$width            = isset( $size[ 'width' ] ) ? $size[ 'width' ] : $value[ 'default' ][ 'width' ];
-					$height           = isset( $size[ 'height' ] ) ? $size[ 'height' ] : $value[ 'default' ][ 'height' ];
-					$crop             = isset( $size[ 'crop' ] ) ? $size[ 'crop' ] : $value[ 'default' ][ 'crop' ];
+					$width            = isset( $size['width'] ) ? $size['width'] : $value['default']['width'];
+					$height           = isset( $size['height'] ) ? $size['height'] : $value['default']['height'];
+					$crop             = isset( $size['crop'] ) ? $size['crop'] : $value['default']['crop'];
 					$disabled_attr    = '';
 					$disabled_message = '';
 
@@ -500,12 +528,12 @@ class WC_Admin_Settings {
 					}
 
 					?><tr valign="top">
-						<th scope="row" class="titledesc"><?php echo esc_html( $value['title'] ) ?> <?php echo $tooltip_html; echo $disabled_message; ?></th>
+						<th scope="row" class="titledesc"><?php echo esc_html( $value['title'] ) ?> <?php echo $tooltip_html . $disabled_message; ?></th>
 						<td class="forminp image_width_settings">
 
 							<input name="<?php echo esc_attr( $value['id'] ); ?>[width]" <?php echo $disabled_attr; ?> id="<?php echo esc_attr( $value['id'] ); ?>-width" type="text" size="3" value="<?php echo $width; ?>" /> &times; <input name="<?php echo esc_attr( $value['id'] ); ?>[height]" <?php echo $disabled_attr; ?> id="<?php echo esc_attr( $value['id'] ); ?>-height" type="text" size="3" value="<?php echo $height; ?>" />px
 
-							<label><input name="<?php echo esc_attr( $value['id'] ); ?>[crop]" <?php echo $disabled_attr; ?> id="<?php echo esc_attr( $value['id'] ); ?>-crop" type="checkbox" value="1" <?php checked( 1, $crop ); ?> /> <?php _e( 'Hard Crop?', 'woocommerce' ); ?></label>
+							<label><input name="<?php echo esc_attr( $value['id'] ); ?>[crop]" <?php echo $disabled_attr; ?> id="<?php echo esc_attr( $value['id'] ); ?>-crop" type="checkbox" value="1" <?php checked( 1, $crop ); ?> /> <?php _e( 'Hard crop?', 'woocommerce' ); ?></label>
 
 							</td>
 					</tr><?php
@@ -522,7 +550,7 @@ class WC_Admin_Settings {
 						'show_option_none' => ' ',
 						'class'            => $value['class'],
 						'echo'             => false,
-						'selected'         => absint( self::get_option( $value['id'] ) )
+						'selected'         => absint( self::get_option( $value['id'] ) ),
 					);
 
 					if ( isset( $value['args'] ) ) {
@@ -532,7 +560,7 @@ class WC_Admin_Settings {
 					?><tr valign="top" class="single_select_page">
 						<th scope="row" class="titledesc"><?php echo esc_html( $value['title'] ) ?> <?php echo $tooltip_html; ?></th>
 						<td class="forminp">
-							<?php echo str_replace(' id=', " data-placeholder='" . esc_attr__( 'Select a page&hellip;', 'woocommerce' ) .  "' style='" . $value['css'] . "' class='" . $value['class'] . "' id=", wp_dropdown_pages( $args ) ); ?> <?php echo $description; ?>
+							<?php echo str_replace( ' id=', " data-placeholder='" . esc_attr__( 'Select a page&hellip;', 'woocommerce' ) . "' style='" . $value['css'] . "' class='" . $value['class'] . "' id=", wp_dropdown_pages( $args ) ); ?> <?php echo $description; ?>
 						</td>
 					</tr><?php
 					break;
@@ -554,7 +582,7 @@ class WC_Admin_Settings {
 							<label for="<?php echo esc_attr( $value['id'] ); ?>"><?php echo esc_html( $value['title'] ); ?></label>
 							<?php echo $tooltip_html; ?>
 						</th>
-						<td class="forminp"><select name="<?php echo esc_attr( $value['id'] ); ?>" style="<?php echo esc_attr( $value['css'] ); ?>" data-placeholder="<?php esc_attr_e( 'Choose a country&hellip;', 'woocommerce' ); ?>" title="<?php esc_attr_e( 'Country', 'woocommerce' ) ?>" class="wc-enhanced-select">
+						<td class="forminp"><select name="<?php echo esc_attr( $value['id'] ); ?>" style="<?php echo esc_attr( $value['css'] ); ?>" data-placeholder="<?php esc_attr_e( 'Choose a country&hellip;', 'woocommerce' ); ?>" aria-label="<?php esc_attr_e( 'Country', 'woocommerce' ) ?>" class="wc-enhanced-select">
 							<?php WC()->countries->country_dropdown_options( $country, $state ); ?>
 						</select> <?php echo $description; ?>
 						</td>
@@ -579,15 +607,15 @@ class WC_Admin_Settings {
 							<?php echo $tooltip_html; ?>
 						</th>
 						<td class="forminp">
-							<select multiple="multiple" name="<?php echo esc_attr( $value['id'] ); ?>[]" style="width:350px" data-placeholder="<?php esc_attr_e( 'Choose countries&hellip;', 'woocommerce' ); ?>" title="<?php esc_attr_e( 'Country', 'woocommerce' ) ?>" class="wc-enhanced-select">
+							<select multiple="multiple" name="<?php echo esc_attr( $value['id'] ); ?>[]" style="width:350px" data-placeholder="<?php esc_attr_e( 'Choose countries&hellip;', 'woocommerce' ); ?>" aria-label="<?php esc_attr_e( 'Country', 'woocommerce' ) ?>" class="wc-enhanced-select">
 								<?php
 									if ( ! empty( $countries ) ) {
 										foreach ( $countries as $key => $val ) {
-											echo '<option value="' . esc_attr( $key ) . '" ' . selected( in_array( $key, $selections ), true, false ).'>' . $val . '</option>';
+											echo '<option value="' . esc_attr( $key ) . '" ' . selected( in_array( $key, $selections ), true, false ) . '>' . $val . '</option>';
 										}
 									}
 								?>
-							</select> <?php echo ( $description ) ? $description : ''; ?> </br><a class="select_all button" href="#"><?php _e( 'Select all', 'woocommerce' ); ?></a> <a class="select_none button" href="#"><?php _e( 'Select none', 'woocommerce' ); ?></a>
+							</select> <?php echo ( $description ) ? $description : ''; ?> <br /><a class="select_all button" href="#"><?php _e( 'Select all', 'woocommerce' ); ?></a> <a class="select_none button" href="#"><?php _e( 'Select none', 'woocommerce' ); ?></a>
 						</td>
 					</tr><?php
 					break;
@@ -601,12 +629,12 @@ class WC_Admin_Settings {
 	}
 
 	/**
-	 * Helper function to get the formated description and tip HTML for a
+	 * Helper function to get the formatted description and tip HTML for a
 	 * given form field. Plugins can call this when implementing their own custom
 	 * settings types.
 	 *
-	 * @param array $value The form field value array
-	 * @returns array The description and tip as a 2 element array
+	 * @param  array $value The form field value array
+	 * @return array The description and tip as a 2 element array
 	 */
 	public static function get_field_description( $value ) {
 		$description  = '';
@@ -637,7 +665,7 @@ class WC_Admin_Settings {
 
 		return array(
 			'description'  => $description,
-			'tooltip_html' => $tooltip_html
+			'tooltip_html' => $tooltip_html,
 		);
 	}
 
@@ -646,39 +674,43 @@ class WC_Admin_Settings {
 	 *
 	 * Loops though the woocommerce options array and outputs each field.
 	 *
-	 * @param array $options Opens array to output
+	 * @param array $options Options array to output
+	 * @param array $data Optional. Data to use for saving. Defaults to $_POST.
 	 * @return bool
 	 */
-	public static function save_fields( $options ) {
-		if ( empty( $_POST ) ) {
+	public static function save_fields( $options, $data = null ) {
+		if ( is_null( $data ) ) {
+			$data = $_POST;
+		}
+		if ( empty( $data ) ) {
 			return false;
 		}
 
-		// Options to update will be stored here and saved later
+		// Options to update will be stored here and saved later.
 		$update_options = array();
 
-		// Loop options and get values to save
+		// Loop options and get values to save.
 		foreach ( $options as $option ) {
 			if ( ! isset( $option['id'] ) || ! isset( $option['type'] ) ) {
 				continue;
 			}
 
-			// Get posted value
+			// Get posted value.
 			if ( strstr( $option['id'], '[' ) ) {
 				parse_str( $option['id'], $option_name_array );
 				$option_name  = current( array_keys( $option_name_array ) );
 				$setting_name = key( $option_name_array[ $option_name ] );
-				$raw_value    = isset( $_POST[ $option_name ][ $setting_name ] ) ? wp_unslash( $_POST[ $option_name ][ $setting_name ] ) : null;
+				$raw_value    = isset( $data[ $option_name ][ $setting_name ] ) ? wp_unslash( $data[ $option_name ][ $setting_name ] ) : null;
 			} else {
 				$option_name  = $option['id'];
 				$setting_name = '';
-				$raw_value    = isset( $_POST[ $option['id'] ] ) ? wp_unslash( $_POST[ $option['id'] ] ) : null;
+				$raw_value    = isset( $data[ $option['id'] ] ) ? wp_unslash( $data[ $option['id'] ] ) : null;
 			}
 
-			// Format the value based on option type
+			// Format the value based on option type.
 			switch ( $option['type'] ) {
 				case 'checkbox' :
-					$value = is_null( $raw_value ) ? 'no' : 'yes';
+					$value = '1' === $raw_value || 'yes' === $raw_value ? 'yes' : 'no';
 					break;
 				case 'textarea' :
 					$value = wp_kses_post( trim( $raw_value ) );
@@ -699,6 +731,15 @@ class WC_Admin_Settings {
 						$value['crop']   = $option['default']['crop'];
 					}
 					break;
+				case 'select':
+					$allowed_values = empty( $option['options'] ) ? array() : array_keys( $option['options'] );
+					if ( empty( $option['default'] ) && empty( $allowed_values ) ) {
+						$value = null;
+						break;
+					}
+					$default = ( empty( $option['default'] ) ? $allowed_values[0] : $option['default'] );
+					$value   = in_array( $raw_value, $allowed_values ) ? $raw_value : $default;
+					break;
 				default :
 					$value = wc_clean( $raw_value );
 					break;
@@ -709,7 +750,7 @@ class WC_Admin_Settings {
 			 * @deprecated 2.4.0 - doesn't allow manipulation of values!
 			 */
 			if ( has_action( 'woocommerce_update_option_' . sanitize_title( $option['type'] ) ) ) {
-				_deprecated_function( 'The woocommerce_update_option_X action', '2.4.0', 'woocommerce_admin_settings_sanitize_option filter' );
+				wc_deprecated_function( 'The woocommerce_update_option_X action', '2.4.0', 'woocommerce_admin_settings_sanitize_option filter' );
 				do_action( 'woocommerce_update_option_' . sanitize_title( $option['type'] ), $option );
 				continue;
 			}
@@ -744,13 +785,13 @@ class WC_Admin_Settings {
 			}
 
 			/**
-			 * Fire an action before saved..
+			 * Fire an action before saved.
 			 * @deprecated 2.4.0 - doesn't allow manipulation of values!
 			 */
 			do_action( 'woocommerce_update_option', $option );
 		}
 
-		// Save all options in our array
+		// Save all options in our array.
 		foreach ( $update_options as $name => $value ) {
 			update_option( $name, $value );
 		}
@@ -774,7 +815,6 @@ class WC_Admin_Settings {
 			if ( file_exists( $downloads_url . '/.htaccess' ) ) {
 				unlink( $downloads_url . '/.htaccess' );
 			}
-
 		} else {
 
 			// Force method - protect, add rules to the htaccess file
diff --git a/includes/admin/class-wc-admin-setup-wizard.php b/includes/admin/class-wc-admin-setup-wizard.php
index 6b203e9f428..f789800428e 100644
--- a/includes/admin/class-wc-admin-setup-wizard.php
+++ b/includes/admin/class-wc-admin-setup-wizard.php
@@ -7,8 +7,8 @@
  * @author      WooThemes
  * @category    Admin
  * @package     WooCommerce/Admin
- * @version     2.4.0
-*/
+ * @version     2.6.0
+ */
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
@@ -27,7 +27,7 @@ class WC_Admin_Setup_Wizard {
 	/** @var array Tweets user can optionally send after install */
 	private $tweets = array(
 		'Someone give me woo-t, I just set up a new store with #WordPress and @WooCommerce!',
-		'Someone give me high five, I just set up a new store with #WordPress and @WooCommerce!'
+		'Someone give me high five, I just set up a new store with #WordPress and @WooCommerce!',
 	);
 
 	/**
@@ -54,47 +54,47 @@ class WC_Admin_Setup_Wizard {
 		if ( empty( $_GET['page'] ) || 'wc-setup' !== $_GET['page'] ) {
 			return;
 		}
-		$this->steps = array(
+		$default_steps = array(
 			'introduction' => array(
-				'name'    =>  __( 'Introduction', 'woocommerce' ),
+				'name'    => __( 'Introduction', 'woocommerce' ),
 				'view'    => array( $this, 'wc_setup_introduction' ),
-				'handler' => ''
+				'handler' => '',
 			),
 			'pages' => array(
-				'name'    =>  __( 'Page Setup', 'woocommerce' ),
+				'name'    => __( 'Page setup', 'woocommerce' ),
 				'view'    => array( $this, 'wc_setup_pages' ),
-				'handler' => array( $this, 'wc_setup_pages_save' )
+				'handler' => array( $this, 'wc_setup_pages_save' ),
 			),
 			'locale' => array(
-				'name'    =>  __( 'Store Locale', 'woocommerce' ),
+				'name'    => __( 'Store locale', 'woocommerce' ),
 				'view'    => array( $this, 'wc_setup_locale' ),
-				'handler' => array( $this, 'wc_setup_locale_save' )
+				'handler' => array( $this, 'wc_setup_locale_save' ),
 			),
 			'shipping_taxes' => array(
-				'name'    =>  __( 'Shipping &amp; Tax', 'woocommerce' ),
+				'name'    => __( 'Shipping &amp; tax', 'woocommerce' ),
 				'view'    => array( $this, 'wc_setup_shipping_taxes' ),
 				'handler' => array( $this, 'wc_setup_shipping_taxes_save' ),
 			),
 			'payments' => array(
-				'name'    =>  __( 'Payments', 'woocommerce' ),
+				'name'    => __( 'Payments', 'woocommerce' ),
 				'view'    => array( $this, 'wc_setup_payments' ),
 				'handler' => array( $this, 'wc_setup_payments_save' ),
 			),
 			'next_steps' => array(
-				'name'    =>  __( 'Ready!', 'woocommerce' ),
+				'name'    => __( 'Ready!', 'woocommerce' ),
 				'view'    => array( $this, 'wc_setup_ready' ),
-				'handler' => ''
-			)
+				'handler' => '',
+			),
 		);
+
+		$this->steps = apply_filters( 'woocommerce_setup_wizard_steps', $default_steps );
 		$this->step = isset( $_GET['step'] ) ? sanitize_key( $_GET['step'] ) : current( array_keys( $this->steps ) );
 		$suffix     = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
 
 		wp_register_script( 'jquery-blockui', WC()->plugin_url() . '/assets/js/jquery-blockui/jquery.blockUI' . $suffix . '.js', array( 'jquery' ), '2.70', true );
-		wp_register_script( 'select2', WC()->plugin_url() . '/assets/js/select2/select2' . $suffix . '.js', array( 'jquery' ), '3.5.2' );
+		wp_register_script( 'select2', WC()->plugin_url() . '/assets/js/select2/select2.full' . $suffix . '.js', array( 'jquery' ), '4.0.3' );
 		wp_register_script( 'wc-enhanced-select', WC()->plugin_url() . '/assets/js/admin/wc-enhanced-select' . $suffix . '.js', array( 'jquery', 'select2' ), WC_VERSION );
 		wp_localize_script( 'wc-enhanced-select', 'wc_enhanced_select_params', array(
-			'i18n_matches_1'            => _x( 'One result is available, press enter to select it.', 'enhanced select', 'woocommerce' ),
-			'i18n_matches_n'            => _x( '%qty% results are available, use up and down arrow keys to navigate.', 'enhanced select', 'woocommerce' ),
 			'i18n_no_matches'           => _x( 'No matches found', 'enhanced select', 'woocommerce' ),
 			'i18n_ajax_error'           => _x( 'Loading failed', 'enhanced select', 'woocommerce' ),
 			'i18n_input_too_short_1'    => _x( 'Please enter 1 or more characters', 'enhanced select', 'woocommerce' ),
@@ -107,18 +107,18 @@ class WC_Admin_Setup_Wizard {
 			'i18n_searching'            => _x( 'Searching&hellip;', 'enhanced select', 'woocommerce' ),
 			'ajax_url'                  => admin_url( 'admin-ajax.php' ),
 			'search_products_nonce'     => wp_create_nonce( 'search-products' ),
-			'search_customers_nonce'    => wp_create_nonce( 'search-customers' )
+			'search_customers_nonce'    => wp_create_nonce( 'search-customers' ),
 		) );
 		wp_enqueue_style( 'woocommerce_admin_styles', WC()->plugin_url() . '/assets/css/admin.css', array(), WC_VERSION );
 		wp_enqueue_style( 'wc-setup', WC()->plugin_url() . '/assets/css/wc-setup.css', array( 'dashicons', 'install' ), WC_VERSION );
 
 		wp_register_script( 'wc-setup', WC()->plugin_url() . '/assets/js/admin/wc-setup.min.js', array( 'jquery', 'wc-enhanced-select', 'jquery-blockui' ), WC_VERSION );
 		wp_localize_script( 'wc-setup', 'wc_setup_params', array(
-			'locale_info' => json_encode( include( WC()->plugin_path() . '/i18n/locale-info.php' ) )
+			'locale_info' => json_encode( include( WC()->plugin_path() . '/i18n/locale-info.php' ) ),
 		) );
 
 		if ( ! empty( $_POST['save_step'] ) && isset( $this->steps[ $this->step ]['handler'] ) ) {
-			call_user_func( $this->steps[ $this->step ]['handler'] );
+			call_user_func( $this->steps[ $this->step ]['handler'], $this );
 		}
 
 		ob_start();
@@ -129,9 +129,30 @@ class WC_Admin_Setup_Wizard {
 		exit;
 	}
 
-	public function get_next_step_link() {
+	/**
+	 * Get the URL for the next step's screen.
+	 * @param string step   slug (default: current step)
+	 * @return string       URL for next step if a next step exists.
+	 *                      Admin URL if it's the last step.
+	 *                      Empty string on failure.
+	 * @since 3.0.0
+	 */
+	public function get_next_step_link( $step = '' ) {
+		if ( ! $step ) {
+			$step = $this->step;
+		}
+
 		$keys = array_keys( $this->steps );
-		return add_query_arg( 'step', $keys[ array_search( $this->step, array_keys( $this->steps ) ) + 1 ] );
+		if ( end( $keys ) === $step ) {
+			return admin_url();
+		}
+
+		$step_index = array_search( $step, $keys );
+		if ( false === $step_index ) {
+			return '';
+		}
+
+		return add_query_arg( 'step', $keys[ $step_index + 1 ] );
 	}
 
 	/**
@@ -140,17 +161,17 @@ class WC_Admin_Setup_Wizard {
 	public function setup_wizard_header() {
 		?>
 		<!DOCTYPE html>
-		<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
+		<html <?php language_attributes(); ?>>
 		<head>
 			<meta name="viewport" content="width=device-width" />
 			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-			<title><?php _e( 'WooCommerce &rsaquo; Setup Wizard', 'woocommerce' ); ?></title>
+			<title><?php esc_html_e( 'WooCommerce &rsaquo; Setup Wizard', 'woocommerce' ); ?></title>
 			<?php wp_print_scripts( 'wc-setup' ); ?>
 			<?php do_action( 'admin_print_styles' ); ?>
 			<?php do_action( 'admin_head' ); ?>
 		</head>
 		<body class="wc-setup wp-core-ui">
-			<h1 id="wc-logo"><a href="http://woothemes.com/woocommerce"><img src="<?php echo WC()->plugin_url(); ?>/assets/images/woocommerce_logo.png" alt="WooCommerce" /></a></h1>
+			<h1 id="wc-logo"><a href="https://woocommerce.com/"><img src="<?php echo WC()->plugin_url(); ?>/assets/images/woocommerce_logo.png" alt="WooCommerce" /></a></h1>
 		<?php
 	}
 
@@ -160,7 +181,7 @@ class WC_Admin_Setup_Wizard {
 	public function setup_wizard_footer() {
 		?>
 			<?php if ( 'next_steps' === $this->step ) : ?>
-				<a class="wc-return-to-dashboard" href="<?php echo esc_url( admin_url() ); ?>"><?php _e( 'Return to the WordPress Dashboard', 'woocommerce' ); ?></a>
+				<a class="wc-return-to-dashboard" href="<?php echo esc_url( admin_url() ); ?>"><?php esc_html_e( 'Return to the WordPress Dashboard', 'woocommerce' ); ?></a>
 			<?php endif; ?>
 			</body>
 		</html>
@@ -193,7 +214,7 @@ class WC_Admin_Setup_Wizard {
 	 */
 	public function setup_wizard_content() {
 		echo '<div class="wc-setup-content">';
-		call_user_func( $this->steps[ $this->step ]['view'] );
+		call_user_func( $this->steps[ $this->step ]['view'], $this );
 		echo '</div>';
 	}
 
@@ -202,12 +223,12 @@ class WC_Admin_Setup_Wizard {
 	 */
 	public function wc_setup_introduction() {
 		?>
-		<h1><?php _e( 'Welcome to the world of WooCommerce!', 'woocommerce' ); ?></h1>
+		<h1><?php esc_html_e( 'Welcome to the world of WooCommerce!', 'woocommerce' ); ?></h1>
 		<p><?php _e( 'Thank you for choosing WooCommerce to power your online store! This quick setup wizard will help you configure the basic settings. <strong>It’s completely optional and shouldn’t take longer than five minutes.</strong>', 'woocommerce' ); ?></p>
-		<p><?php _e( 'No time right now? If you don’t want to go through the wizard, you can skip and return to the WordPress dashboard. Come back anytime if you change your mind!', 'woocommerce' ); ?></p>
+		<p><?php esc_html_e( 'No time right now? If you don’t want to go through the wizard, you can skip and return to the WordPress dashboard. Come back anytime if you change your mind!', 'woocommerce' ); ?></p>
 		<p class="wc-setup-actions step">
-			<a href="<?php echo esc_url( $this->get_next_step_link() ); ?>" class="button-primary button button-large button-next"><?php _e( 'Let\'s Go!', 'woocommerce' ); ?></a>
-			<a href="<?php echo esc_url( admin_url() ); ?>" class="button button-large"><?php _e( 'Not right now', 'woocommerce' ); ?></a>
+			<a href="<?php echo esc_url( $this->get_next_step_link() ); ?>" class="button-primary button button-large button-next"><?php esc_html_e( "Let's go!", 'woocommerce' ); ?></a>
+			<a href="<?php echo esc_url( admin_url() ); ?>" class="button button-large"><?php esc_html_e( 'Not right now', 'woocommerce' ); ?></a>
 		</p>
 		<?php
 	}
@@ -217,45 +238,45 @@ class WC_Admin_Setup_Wizard {
 	 */
 	public function wc_setup_pages() {
 		?>
-		<h1><?php _e( 'Page Setup', 'woocommerce' ); ?></h1>
+		<h1><?php esc_html_e( 'Page setup', 'woocommerce' ); ?></h1>
 		<form method="post">
-			<p><?php printf( __( 'Your store needs a few essential %spages%s. The following will be created automatically (if they do not already exist):', 'woocommerce' ), '<a href="' . esc_url( admin_url( 'edit.php?post_type=page' ) ) . '" target="_blank">', '</a>' ); ?></p>
+			<p><?php printf( __( 'Your store needs a few essential <a href="%s" target="_blank">pages</a>. The following will be created automatically (if they do not already exist):', 'woocommerce' ), esc_url( admin_url( 'edit.php?post_type=page' ) ) ); ?></p>
 			<table class="wc-setup-pages" cellspacing="0">
 				<thead>
 					<tr>
-						<th class="page-name"><?php _e( 'Page Name', 'woocommerce' ); ?></th>
-						<th class="page-description"><?php _e( 'Description', 'woocommerce' ); ?></th>
+						<th class="page-name"><?php esc_html_e( 'Page name', 'woocommerce' ); ?></th>
+						<th class="page-description"><?php esc_html_e( 'Description', 'woocommerce' ); ?></th>
 					</tr>
 				</thead>
 				<tbody>
 					<tr>
 						<td class="page-name"><?php echo _x( 'Shop', 'Page title', 'woocommerce' ); ?></td>
-						<td><?php _e( 'The shop page will display your products.', 'woocommerce' ); ?></td>
+						<td><?php esc_html_e( 'The shop page will display your products.', 'woocommerce' ); ?></td>
 					</tr>
 					<tr>
 						<td class="page-name"><?php echo _x( 'Cart', 'Page title', 'woocommerce' ); ?></td>
-						<td><?php _e( 'The cart page will be where the customers go to view their cart and begin checkout.', 'woocommerce' ); ?></td>
+						<td><?php esc_html_e( 'The cart page will be where the customers go to view their cart and begin checkout.', 'woocommerce' ); ?></td>
 					</tr>
 					<tr>
 						<td class="page-name"><?php echo _x( 'Checkout', 'Page title', 'woocommerce' ); ?></td>
 						<td>
-							<?php _e( 'The checkout page will be where the customers go to pay for their items.', 'woocommerce' ); ?>
+							<?php esc_html_e( 'The checkout page will be where the customers go to pay for their items.', 'woocommerce' ); ?>
 						</td>
 					</tr>
 					<tr>
-						<td class="page-name"><?php echo _x( 'My Account', 'Page title', 'woocommerce' ); ?></td>
+						<td class="page-name"><?php echo _x( 'My account', 'Page title', 'woocommerce' ); ?></td>
 						<td>
-							<?php _e( 'Registered customers will be able to manage their account details and view past orders on this page.', 'woocommerce' ); ?>
+							<?php esc_html_e( 'Registered customers will be able to manage their account details and view past orders on this page.', 'woocommerce' ); ?>
 						</td>
 					</tr>
 				</tbody>
 			</table>
 
-			<p><?php printf( __( 'Once created, these pages can be managed from your admin dashboard on the %sPages screen%s. You can control which pages are shown on your website via %sAppearance > Menus%s.', 'woocommerce' ), '<a href="' . esc_url( admin_url( 'edit.php?post_type=page' ) ) . '" target="_blank">', '</a>', '<a href="' . esc_url( admin_url( 'nav-menus.php' ) ) . '" target="_blank">', '</a>' ); ?></p>
+			<p><?php printf( __( 'Once created, these pages can be managed from your admin dashboard on the <a href="%1$s" target="_blank">Pages screen</a>. You can control which pages are shown on your website via <a href="%2$s" target="_blank">Appearance > Menus</a>.', 'woocommerce' ), esc_url( admin_url( 'edit.php?post_type=page' ) ), esc_url( admin_url( 'nav-menus.php' ) ) ); ?></p>
 
 			<p class="wc-setup-actions step">
 				<input type="submit" class="button-primary button button-large button-next" value="<?php esc_attr_e( 'Continue', 'woocommerce' ); ?>" name="save_step" />
-				<a href="<?php echo esc_url( $this->get_next_step_link() ); ?>" class="button button-large button-next"><?php _e( 'Skip this step', 'woocommerce' ); ?></a>
+				<a href="<?php echo esc_url( $this->get_next_step_link() ); ?>" class="button button-large button-next"><?php esc_html_e( 'Skip this step', 'woocommerce' ); ?></a>
 				<?php wp_nonce_field( 'wc-setup' ); ?>
 			</p>
 		</form>
@@ -286,15 +307,16 @@ class WC_Admin_Setup_Wizard {
 		$currency       = get_option( 'woocommerce_currency', 'GBP' );
 		$currency_pos   = get_option( 'woocommerce_currency_pos', 'left' );
 		$decimal_sep    = get_option( 'woocommerce_price_decimal_sep', '.' );
+		$num_decimals   = get_option( 'woocommerce_price_num_decimals', '2' );
 		$thousand_sep   = get_option( 'woocommerce_price_thousand_sep', ',' );
 		$dimension_unit = get_option( 'woocommerce_dimension_unit', 'cm' );
 		$weight_unit    = get_option( 'woocommerce_weight_unit', 'kg' );
 		?>
-		<h1><?php _e( 'Store Locale Setup', 'woocommerce' ); ?></h1>
+		<h1><?php esc_html_e( 'Store locale setup', 'woocommerce' ); ?></h1>
 		<form method="post">
 			<table class="form-table">
 				<tr>
-					<th scope="row"><label for="store_location"><?php _e( 'Where is your store based?', 'woocommerce' ); ?></label></th>
+					<th scope="row"><label for="store_location"><?php esc_html_e( 'Where is your store based?', 'woocommerce' ); ?></label></th>
 					<td>
 					<select id="store_location" name="store_location" style="width:100%;" required data-placeholder="<?php esc_attr_e( 'Choose a country&hellip;', 'woocommerce' ); ?>" class="wc-enhanced-select">
 							<?php WC()->countries->country_dropdown_options( $country, $state ); ?>
@@ -302,69 +324,75 @@ class WC_Admin_Setup_Wizard {
 					</td>
 				</tr>
 				<tr>
-					<th scope="row"><label for="currency_code"><?php _e( 'Which currency will your store use?', 'woocommerce' ); ?></label></th>
+					<th scope="row"><label for="currency_code"><?php esc_html_e( 'Which currency will your store use?', 'woocommerce' ); ?></label></th>
 					<td>
 						<select id="currency_code" name="currency_code" style="width:100%;" data-placeholder="<?php esc_attr_e( 'Choose a currency&hellip;', 'woocommerce' ); ?>" class="wc-enhanced-select">
-							<option value=""><?php _e( 'Choose a currency&hellip;', 'woocommerce' ); ?></option>
+							<option value=""><?php esc_html_e( 'Choose a currency&hellip;', 'woocommerce' ); ?></option>
 							<?php
 							foreach ( get_woocommerce_currencies() as $code => $name ) {
-								echo '<option value="' . esc_attr( $code ) . '" ' . checked( $currency, $code, false ) . '>' . esc_html( $name . ' (' . get_woocommerce_currency_symbol( $code ) . ')' ) . '</option>';
+								echo '<option value="' . esc_attr( $code ) . '" ' . selected( $currency, $code, false ) . '>' . sprintf( esc_html__( '%1$s (%2$s)', 'woocommerce' ), $name, get_woocommerce_currency_symbol( $code ) ) . '</option>';
 							}
 							?>
 						</select>
-						<span class="description"><?php printf( __( 'If your currency is not listed you can %sadd it later%s.', 'woocommerce' ), '<a href="http://docs.woothemes.com/document/add-a-custom-currency-symbol/" target="_blank">', '</a>' ); ?></span>
+						<span class="description"><?php printf( __( 'If your currency is not listed you can <a href="%s" target="_blank">add it later</a>.', 'woocommerce' ), 'https://docs.woocommerce.com/document/add-a-custom-currency-symbol/' ); ?></span>
 					</td>
 				</tr>
 				<tr>
-					<th scope="row"><label for="currency_pos"><?php _e( 'Currency Position', 'woocommerce' ); ?></label></th>
+					<th scope="row"><label for="currency_pos"><?php esc_html_e( 'Currency position', 'woocommerce' ); ?></label></th>
 					<td>
 						<select id="currency_pos" name="currency_pos" class="wc-enhanced-select">
-							<option value="left" <?php selected( $currency_pos, 'left' ); ?>><?php echo __( 'Left', 'woocommerce' ); ?></option>
-							<option value="right" <?php selected( $currency_pos, 'right' ); ?>><?php echo __( 'Right', 'woocommerce' ); ?></option>
-							<option value="left_space" <?php selected( $currency_pos, 'left_space' ); ?>><?php echo __( 'Left with space', 'woocommerce' ); ?></option>
-							<option value="right_space" <?php selected( $currency_pos, 'right_space' ); ?>><?php echo __( 'Right with space', 'woocommerce' ); ?></option>
+							<option value="left" <?php selected( $currency_pos, 'left' ); ?>><?php esc_html_e( 'Left', 'woocommerce' ); ?></option>
+							<option value="right" <?php selected( $currency_pos, 'right' ); ?>><?php esc_html_e( 'Right', 'woocommerce' ); ?></option>
+							<option value="left_space" <?php selected( $currency_pos, 'left_space' ); ?>><?php esc_html_e( 'Left with space', 'woocommerce' ); ?></option>
+							<option value="right_space" <?php selected( $currency_pos, 'right_space' ); ?>><?php esc_html_e( 'Right with space', 'woocommerce' ); ?></option>
 						</select>
 					</td>
 				</tr>
 				<tr>
-					<th scope="row"><label for="thousand_sep"><?php _e( 'Thousand Separator', 'woocommerce' ); ?></label></th>
+					<th scope="row"><label for="thousand_sep"><?php esc_html_e( 'Thousand separator', 'woocommerce' ); ?></label></th>
 					<td>
-						<input type="text" id="thousand_sep" name="thousand_sep" size="2" value="<?php echo esc_attr( $thousand_sep ) ; ?>" />
+						<input type="text" id="thousand_sep" name="thousand_sep" size="2" value="<?php echo esc_attr( $thousand_sep ); ?>" />
 					</td>
 				</tr>
 				<tr>
-					<th scope="row"><label for="decimal_sep"><?php _e( 'Decimal Separator', 'woocommerce' ); ?></label></th>
+					<th scope="row"><label for="decimal_sep"><?php esc_html_e( 'Decimal separator', 'woocommerce' ); ?></label></th>
 					<td>
-						<input type="text" id="decimal_sep" name="decimal_sep" size="2" value="<?php echo esc_attr( $decimal_sep ) ; ?>" />
+						<input type="text" id="decimal_sep" name="decimal_sep" size="2" value="<?php echo esc_attr( $decimal_sep ); ?>" />
 					</td>
 				</tr>
 				<tr>
-					<th scope="row"><label for="weight_unit"><?php _e( 'Which unit should be used for product weights?', 'woocommerce' ); ?></label></th>
+					<th scope="row"><label for="num_decimals"><?php esc_html_e( 'Number of decimals', 'woocommerce' ); ?></label></th>
+					<td>
+						<input type="text" id="num_decimals" name="num_decimals" size="2" value="<?php echo esc_attr( $num_decimals ); ?>" />
+					</td>
+				</tr>
+				<tr>
+					<th scope="row"><label for="weight_unit"><?php esc_html_e( 'Which unit should be used for product weights?', 'woocommerce' ); ?></label></th>
 					<td>
 						<select id="weight_unit" name="weight_unit" class="wc-enhanced-select">
-							<option value="kg" <?php selected( $weight_unit, 'kg' ); ?>><?php echo __( 'kg', 'woocommerce' ); ?></option>
-							<option value="g" <?php selected( $weight_unit, 'g' ); ?>><?php echo __( 'g', 'woocommerce' ); ?></option>
-							<option value="lbs" <?php selected( $weight_unit, 'lbs' ); ?>><?php echo __( 'lbs', 'woocommerce' ); ?></option>
-							<option value="oz" <?php selected( $weight_unit, 'oz' ); ?>><?php echo __( 'oz', 'woocommerce' ); ?></option>
+							<option value="kg" <?php selected( $weight_unit, 'kg' ); ?>><?php esc_html_e( 'kg', 'woocommerce' ); ?></option>
+							<option value="g" <?php selected( $weight_unit, 'g' ); ?>><?php esc_html_e( 'g', 'woocommerce' ); ?></option>
+							<option value="lbs" <?php selected( $weight_unit, 'lbs' ); ?>><?php esc_html_e( 'lbs', 'woocommerce' ); ?></option>
+							<option value="oz" <?php selected( $weight_unit, 'oz' ); ?>><?php esc_html_e( 'oz', 'woocommerce' ); ?></option>
 						</select>
 					</td>
 				</tr>
 				<tr>
-					<th scope="row"><label for="dimension_unit"><?php _e( 'Which unit should be used for product dimensions?', 'woocommerce' ); ?></label></th>
+					<th scope="row"><label for="dimension_unit"><?php esc_html_e( 'Which unit should be used for product dimensions?', 'woocommerce' ); ?></label></th>
 					<td>
 						<select id="dimension_unit" name="dimension_unit" class="wc-enhanced-select">
-							<option value="m" <?php selected( $dimension_unit, 'm' ); ?>><?php echo __( 'm', 'woocommerce' ); ?></option>
-							<option value="cm" <?php selected( $dimension_unit, 'cm' ); ?>><?php echo __( 'cm', 'woocommerce' ); ?></option>
-							<option value="mm" <?php selected( $dimension_unit, 'mm' ); ?>><?php echo __( 'mm', 'woocommerce' ); ?></option>
-							<option value="in" <?php selected( $dimension_unit, 'in' ); ?>><?php echo __( 'in', 'woocommerce' ); ?></option>
-							<option value="yd" <?php selected( $dimension_unit, 'yd' ); ?>><?php echo __( 'yd', 'woocommerce' ); ?></option>
+							<option value="m" <?php selected( $dimension_unit, 'm' ); ?>><?php esc_html_e( 'm', 'woocommerce' ); ?></option>
+							<option value="cm" <?php selected( $dimension_unit, 'cm' ); ?>><?php esc_html_e( 'cm', 'woocommerce' ); ?></option>
+							<option value="mm" <?php selected( $dimension_unit, 'mm' ); ?>><?php esc_html_e( 'mm', 'woocommerce' ); ?></option>
+							<option value="in" <?php selected( $dimension_unit, 'in' ); ?>><?php esc_html_e( 'in', 'woocommerce' ); ?></option>
+							<option value="yd" <?php selected( $dimension_unit, 'yd' ); ?>><?php esc_html_e( 'yd', 'woocommerce' ); ?></option>
 						</select>
 					</td>
 				</tr>
 			</table>
 			<p class="wc-setup-actions step">
 				<input type="submit" class="button-primary button button-large button-next" value="<?php esc_attr_e( 'Continue', 'woocommerce' ); ?>" name="save_step" />
-				<a href="<?php echo esc_url( $this->get_next_step_link() ); ?>" class="button button-large button-next"><?php _e( 'Skip this step', 'woocommerce' ); ?></a>
+				<a href="<?php echo esc_url( $this->get_next_step_link() ); ?>" class="button button-large button-next"><?php esc_html_e( 'Skip this step', 'woocommerce' ); ?></a>
 				<?php wp_nonce_field( 'wc-setup' ); ?>
 			</p>
 		</form>
@@ -381,6 +409,7 @@ class WC_Admin_Setup_Wizard {
 		$currency_code  = sanitize_text_field( $_POST['currency_code'] );
 		$currency_pos   = sanitize_text_field( $_POST['currency_pos'] );
 		$decimal_sep    = sanitize_text_field( $_POST['decimal_sep'] );
+		$num_decimals   = sanitize_text_field( $_POST['num_decimals'] );
 		$thousand_sep   = sanitize_text_field( $_POST['thousand_sep'] );
 		$weight_unit    = sanitize_text_field( $_POST['weight_unit'] );
 		$dimension_unit = sanitize_text_field( $_POST['dimension_unit'] );
@@ -389,6 +418,7 @@ class WC_Admin_Setup_Wizard {
 		update_option( 'woocommerce_currency', $currency_code );
 		update_option( 'woocommerce_currency_pos', $currency_pos );
 		update_option( 'woocommerce_price_decimal_sep', $decimal_sep );
+		update_option( 'woocommerce_price_num_decimals', $num_decimals );
 		update_option( 'woocommerce_price_thousand_sep', $thousand_sep );
 		update_option( 'woocommerce_weight_unit', $weight_unit );
 		update_option( 'woocommerce_dimension_unit', $dimension_unit );
@@ -401,64 +431,30 @@ class WC_Admin_Setup_Wizard {
 	 * Shipping and taxes.
 	 */
 	public function wc_setup_shipping_taxes() {
-		$domestic                         = new WC_Shipping_Flat_Rate();
-		$international                    = new WC_Shipping_International_Delivery();
-		$shipping_cost_domestic           = '';
-		$shipping_cost_international      = '';
-
-		if ( 'yes' === $domestic->get_option( 'enabled' ) ) {
-			$shipping_cost_domestic      = $domestic->get_option( 'cost' );
-		}
-
-		if ( 'yes' === $international->get_option( 'enabled' ) ) {
-			$shipping_cost_international      = $international->get_option( 'cost' );
-		}
 		?>
-		<h1><?php _e( 'Shipping &amp; Tax Setup', 'woocommerce' ); ?></h1>
+		<h1><?php esc_html_e( 'Shipping &amp; Tax setup', 'woocommerce' ); ?></h1>
 		<form method="post">
-			<p><?php printf( __( 'If you will be charging sales tax, or shipping physical goods to customers, you can configure the basic options below. This is optional and can be changed later via %1$sWooCommerce > Settings > Tax%3$s and %2$sWooCommerce > Settings > Shipping%3$s.', 'woocommerce' ), '<a href="' . admin_url( 'admin.php?page=wc-settings&tab=tax' ) . '" target="_blank">', '<a href="' . admin_url( 'admin.php?page=wc-settings&tab=shipping' ) . '" target="_blank">', '</a>' ); ?></p>
+			<p><?php esc_html_e( 'If you will be charging sales tax, or shipping physical goods to customers, you can enable these below. This is optional and can be changed later.', 'woocommerce' ); ?></p>
 			<table class="form-table">
-				<tr class="section_title">
-					<td colspan="2">
-						<h2><?php _e( 'Basic Shipping Setup', 'woocommerce' ); ?></h2>
-					</td>
-				</tr>
 				<tr>
-					<th scope="row"><label for="woocommerce_calc_shipping"><?php _e( 'Will you be shipping products?', 'woocommerce' ); ?></label></th>
+					<th scope="row"><label for="woocommerce_calc_shipping"><?php esc_html_e( 'Will you be shipping products?', 'woocommerce' ); ?></label></th>
 					<td>
-						<input type="checkbox" id="woocommerce_calc_shipping" <?php checked( get_option( 'woocommerce_calc_shipping', 'no' ), 'yes' ); ?> name="woocommerce_calc_shipping" class="input-checkbox" value="1" />
-						<label for="woocommerce_calc_shipping"><?php _e( 'Yes, I will be shipping physical goods to customers', 'woocommerce' ); ?></label>
+						<input type="checkbox" id="woocommerce_calc_shipping" <?php checked( get_option( 'woocommerce_ship_to_countries', '' ) !== 'disabled', true ); ?> name="woocommerce_calc_shipping" class="input-checkbox" value="1" />
+						<label for="woocommerce_calc_shipping"><?php esc_html_e( 'Yes, I will be shipping physical goods to customers', 'woocommerce' ); ?></label>
 					</td>
 				</tr>
 				<tr>
-					<th scope="row"><label for="shipping_cost_domestic"><?php _e( '<strong>Domestic</strong> shipping costs:', 'woocommerce' ); ?></label></th>
-					<td>
-						<?php printf( __( 'A total of %s per order and/or %s per item', 'woocommerce' ), get_woocommerce_currency_symbol() . ' <input type="text" id="shipping_cost_domestic" name="shipping_cost_domestic" size="5" value="' . esc_attr( $shipping_cost_domestic ) . '" />', get_woocommerce_currency_symbol() . ' <input type="text" id="shipping_cost_domestic_item" name="shipping_cost_domestic_item" size="5" />' ); ?>
-					</td>
-				</tr>
-				<tr>
-					<th scope="row"><label for="shipping_cost_international"><?php _e( '<strong>International</strong> shipping costs:', 'woocommerce' ); ?></label></th>
-					<td>
-						<?php printf( __( 'A total of %s per order and/or %s per item', 'woocommerce' ), get_woocommerce_currency_symbol() . ' <input type="text" id="shipping_cost_international" name="shipping_cost_international" size="5" value="' . esc_attr( $shipping_cost_international ) . '" />', get_woocommerce_currency_symbol() . ' <input type="text" id="shipping_cost_international_item" name="shipping_cost_international_item" size="5" />' ); ?>
-					</td>
-				</tr>
-				<tr class="section_title">
-					<td colspan="2">
-						<h2><?php _e( 'Basic Tax Setup', 'woocommerce' ); ?></h2>
-					</td>
-				</tr>
-				<tr>
-					<th scope="row"><label for="woocommerce_calc_taxes"><?php _e( 'Will you be charging sales tax?', 'woocommerce' ); ?></label></th>
+					<th scope="row"><label for="woocommerce_calc_taxes"><?php esc_html_e( 'Will you be charging sales tax?', 'woocommerce' ); ?></label></th>
 					<td>
 						<input type="checkbox" <?php checked( get_option( 'woocommerce_calc_taxes', 'no' ), 'yes' ); ?> id="woocommerce_calc_taxes" name="woocommerce_calc_taxes" class="input-checkbox" value="1" />
-						<label for="woocommerce_calc_taxes"><?php _e( 'Yes, I will be charging sales tax', 'woocommerce' ); ?></label>
+						<label for="woocommerce_calc_taxes"><?php esc_html_e( 'Yes, I will be charging sales tax', 'woocommerce' ); ?></label>
 					</td>
 				</tr>
 				<tr>
-					<th scope="row"><label for="woocommerce_prices_include_tax"><?php _e( 'How will you enter product prices?', 'woocommerce' ); ?></label></th>
+					<th scope="row"><label for="woocommerce_prices_include_tax"><?php esc_html_e( 'How will you enter product prices?', 'woocommerce' ); ?></label></th>
 					<td>
-						<label><input type="radio" <?php checked( get_option( 'woocommerce_prices_include_tax', 'no' ), 'yes' ); ?> id="woocommerce_prices_include_tax" name="woocommerce_prices_include_tax" class="input-radio" value="yes" /> <?php _e( 'I will enter prices inclusive of tax', 'woocommerce' ); ?></label><br/>
-						<label><input type="radio" <?php checked( get_option( 'woocommerce_prices_include_tax', 'no' ), 'no' ); ?> id="woocommerce_prices_include_tax" name="woocommerce_prices_include_tax" class="input-radio" value="no" /> <?php _e( 'I will enter prices exclusive of tax', 'woocommerce' ); ?></label>
+						<label><input type="radio" <?php checked( get_option( 'woocommerce_prices_include_tax', 'no' ), 'yes' ); ?> id="woocommerce_prices_include_tax" name="woocommerce_prices_include_tax" class="input-radio" value="yes" /> <?php esc_html_e( 'I will enter prices inclusive of tax', 'woocommerce' ); ?></label><br/>
+						<label><input type="radio" <?php checked( get_option( 'woocommerce_prices_include_tax', 'no' ), 'no' ); ?> id="woocommerce_prices_include_tax" name="woocommerce_prices_include_tax" class="input-radio" value="no" /> <?php esc_html_e( 'I will enter prices exclusive of tax', 'woocommerce' ); ?></label>
 					</td>
 				</tr>
 				<?php
@@ -479,19 +475,17 @@ class WC_Admin_Setup_Wizard {
 					}
 					if ( $tax_rates ) {
 						?>
-						<tr>
-							<th scope="row"><label for="woocommerce_import_tax_rates"><?php _e( 'Import Tax Rates?', 'woocommerce' ); ?></label></th>
-							<td>
-								<label><input type="checkbox" id="woocommerce_import_tax_rates" name="woocommerce_import_tax_rates" class="input-checkbox" value="yes" /> <?php _e( 'Yes, please import some starter tax rates', 'woocommerce' ); ?></label>
+						<tr class="tax-rates">
+							<td colspan="2">
+								<p><?php printf( __( 'The following tax rates will be imported automatically for you. You can read more about taxes in <a href="%s" target="_blank">our documentation</a>.', 'woocommerce' ), 'https://docs.woocommerce.com/document/setting-up-taxes-in-woocommerce/' ); ?></p>
 								<div class="importing-tax-rates">
 									<table class="tax-rates">
 										<thead>
 											<tr>
-												<th><?php _e( 'Country', 'woocommerce' ); ?></th>
-												<th><?php _e( 'State', 'woocommerce' ); ?></th>
-												<th><?php _e( 'Rate (%)', 'woocommerce' ); ?></th>
-												<th><?php _e( 'Name', 'woocommerce' ); ?></th>
-												<th><?php _e( 'Tax Shipping', 'woocommerce' ); ?></th>
+												<th><?php esc_html_e( 'Country', 'woocommerce' ); ?></th>
+												<th><?php esc_html_e( 'State', 'woocommerce' ); ?></th>
+												<th><?php esc_html_e( 'Rate (%)', 'woocommerce' ); ?></th>
+												<th><?php esc_html_e( 'Name', 'woocommerce' ); ?></th>
 											</tr>
 										</thead>
 										<tbody>
@@ -499,20 +493,18 @@ class WC_Admin_Setup_Wizard {
 												foreach ( $tax_rates as $rate ) {
 													?>
 													<tr>
-														<td><?php echo esc_attr( $rate['country'] ); ?></td>
-														<td><?php echo esc_attr( $rate['state'] ? $rate['state'] : '*' ); ?></td>
-														<td><?php echo esc_attr( $rate['rate'] ); ?></td>
-														<td><?php echo esc_attr( $rate['name'] ); ?></td>
-														<td><?php echo empty( $rate['shipping'] ) ? '-' : '&#10004;'; ?></td>
+														<td class="readonly"><?php echo esc_attr( $rate['country'] ); ?></td>
+														<td class="readonly"><?php echo esc_attr( $rate['state'] ? $rate['state'] : '*' ); ?></td>
+														<td class="readonly"><?php echo esc_attr( $rate['rate'] ); ?></td>
+														<td class="readonly"><?php echo esc_attr( $rate['name'] ); ?></td>
 													</tr>
 													<?php
 												}
 											?>
 										</tbody>
 									</table>
-									<p class="description"><?php _e( 'Please note: you may still need to add local and product specific tax rates depending on your business location. If in doubt, speak to an accountant.', 'woocommerce' ); ?></p>
 								</div>
-								<p class="description"><?php printf( __( 'You can edit tax rates later from the %1$stax settings%3$s screen and read more about taxes in %2$sour documentation%3$s.', 'woocommerce' ), '<a href="' . admin_url( 'admin.php?page=wc-settings&tab=tax' ) . '" target="_blank">', '<a href="http://docs.woothemes.com/document/setting-up-taxes-in-woocommerce/" target="_blank">', '</a>' ); ?></p>
+								<p class="description"><?php printf( __( 'You may need to add/edit rates based on your products or business location which can be done from the <a href="%s" target="_blank">tax settings</a> screen. If in doubt, speak to an accountant.', 'woocommerce' ), esc_url( admin_url( 'admin.php?page=wc-settings&tab=tax' ) ) ); ?></p>
 							</td>
 						</tr>
 						<?php
@@ -521,7 +513,7 @@ class WC_Admin_Setup_Wizard {
 			</table>
 			<p class="wc-setup-actions step">
 				<input type="submit" class="button-primary button button-large button-next" value="<?php esc_attr_e( 'Continue', 'woocommerce' ); ?>" name="save_step" />
-				<a href="<?php echo esc_url( $this->get_next_step_link() ); ?>" class="button button-large button-next"><?php _e( 'Skip this step', 'woocommerce' ); ?></a>
+				<a href="<?php echo esc_url( $this->get_next_step_link() ); ?>" class="button button-large button-next"><?php esc_html_e( 'Skip this step', 'woocommerce' ); ?></a>
 				<?php wp_nonce_field( 'wc-setup' ); ?>
 			</p>
 		</form>
@@ -534,56 +526,38 @@ class WC_Admin_Setup_Wizard {
 	public function wc_setup_shipping_taxes_save() {
 		check_admin_referer( 'wc-setup' );
 
-		$woocommerce_calc_shipping = isset( $_POST['woocommerce_calc_shipping'] ) ? 'yes' : 'no';
-		$woocommerce_calc_taxes    = isset( $_POST['woocommerce_calc_taxes'] ) ? 'yes' : 'no';
+		$enable_shipping  = isset( $_POST['woocommerce_calc_shipping'] );
+		$enable_taxes     = isset( $_POST['woocommerce_calc_taxes'] );
+		$current_shipping = get_option( 'woocommerce_ship_to_countries' );
 
-		update_option( 'woocommerce_calc_shipping', $woocommerce_calc_shipping );
-		update_option( 'woocommerce_calc_taxes', $woocommerce_calc_taxes );
+		if ( $enable_shipping ) {
+			update_option( 'woocommerce_ship_to_countries', '' );
+			WC_Admin_Notices::add_notice( 'no_shipping_methods' );
+
+			/*
+			 * If this is the initial shipping setup, create a shipping
+			 * zone containing the country the store is located in, with
+			 * a "free shipping" method preconfigured.
+			 */
+			if ( false === $current_shipping ) {
+				$default_country = get_option( 'woocommerce_default_country' );
+				$location        = wc_format_country_state_string( $default_country );
+
+				$zone = new WC_Shipping_Zone( null );
+				$zone->set_zone_order( 0 );
+				$zone->add_location( $location['country'], 'country' );
+				$zone->set_zone_name( $zone->get_formatted_location() );
+				$zone->add_shipping_method( 'free_shipping' );
+				$zone->save();
+			}
+		} else {
+			update_option( 'woocommerce_ship_to_countries', 'disabled' );
+		}
+
+		update_option( 'woocommerce_calc_taxes', $enable_taxes ? 'yes' : 'no' );
 		update_option( 'woocommerce_prices_include_tax', sanitize_text_field( $_POST['woocommerce_prices_include_tax'] ) );
 
-		if ( 'yes' === $woocommerce_calc_shipping && ! empty( $_POST['shipping_cost_domestic'] ) ) {
-			// Delete existing settings if they exist
-			delete_option( 'woocommerce_flat_rate_settings' );
-
-			// Init rate and settings
-			$shipping_method = new WC_Shipping_Flat_Rate();
-			$costs           = array();
-			$costs[]         = wc_format_decimal( sanitize_text_field( $_POST['shipping_cost_domestic'] ) );
-			if ( $item_cost = sanitize_text_field( $_POST['shipping_cost_domestic_item'] ) ) {
-				$costs[] = $item_cost . ' * [qty]';
-			}
-			$shipping_method->settings['cost']         = implode( ' + ', array_filter( $costs ) );
-			$shipping_method->settings['enabled']      = 'yes';
-			$shipping_method->settings['type']         = 'order';
-			$shipping_method->settings['availability'] = 'specific';
-			$shipping_method->settings['countries']    = array( WC()->countries->get_base_country() );
-
-			update_option( $shipping_method->plugin_id . $shipping_method->id . '_settings', $shipping_method->settings );
-		}
-
-		if ( 'yes' === $woocommerce_calc_shipping && ! empty( $_POST['shipping_cost_international'] ) ) {
-			// Delete existing settings if they exist
-			delete_option( 'woocommerce_international_delivery_settings' );
-
-			// Init rate and settings
-			$shipping_method = new WC_Shipping_International_Delivery();
-			$costs           = array();
-			$costs[]         = wc_format_decimal( sanitize_text_field( $_POST['shipping_cost_international'] ) );
-			if ( $item_cost = sanitize_text_field( $_POST['shipping_cost_international_item'] ) ) {
-				$costs[] = $item_cost . ' * [qty]';
-			}
-			$shipping_method->settings['cost']         = implode( ' + ', array_filter( $costs ) );
-			$shipping_method->settings['enabled']      = 'yes';
-			$shipping_method->settings['type']         = 'order';
-			if ( ! empty( $_POST['shipping_cost_domestic'] ) ) {
-				$shipping_method->settings['availability'] = 'excluding';
-				$shipping_method->settings['countries']    = array( WC()->countries->get_base_country() );
-			}
-
-			update_option( $shipping_method->plugin_id . $shipping_method->id . '_settings', $shipping_method->settings );
-		}
-
-		if ( 'yes' === $woocommerce_calc_taxes && ! empty( $_POST['woocommerce_import_tax_rates'] ) ) {
+		if ( $enable_taxes ) {
 			$locale_info = include( WC()->plugin_path() . '/i18n/locale-info.php' );
 			$tax_rates   = array();
 			$country     = WC()->countries->get_base_country();
@@ -611,7 +585,7 @@ class WC_Admin_Setup_Wizard {
 						'tax_rate_compound' => 0,
 						'tax_rate_shipping' => $rate['shipping'] ? 1 : 0,
 						'tax_rate_order'    => $loop ++,
-						'tax_rate_class'    => ''
+						'tax_rate_class'    => '',
 					);
 					WC_Tax::_insert_tax_rate( $tax_rate );
 				}
@@ -622,59 +596,135 @@ class WC_Admin_Setup_Wizard {
 		exit;
 	}
 
+	/**
+	 * Simple array of gateways to show in wizard.
+	 * @return array
+	 */
+	protected function get_wizard_payment_gateways() {
+		$gateways = array(
+			'paypal-braintree' => array(
+				'name'        => __( 'PayPal by Braintree', 'woocommerce' ),
+				'image'       => WC()->plugin_url() . '/assets/images/paypal-braintree.png',
+				'description' => __( "Safe and secure payments using credit cards or your customer's PayPal account.", 'woocommerce' ) . ' <a href="https://wordpress.org/plugins/woocommerce-gateway-paypal-powered-by-braintree/" target="_blank">' . __( 'Learn more about PayPal', 'woocommerce' ) . '</a>',
+				'class'       => 'featured featured-row-last',
+				'repo-slug'   => 'woocommerce-gateway-paypal-powered-by-braintree',
+			),
+			'paypal-ec' => array(
+				'name'        => __( 'PayPal Express Checkout', 'woocommerce' ),
+				'image'       => WC()->plugin_url() . '/assets/images/paypal.png',
+				'description' => __( "Safe and secure payments using credit cards or your customer's PayPal account.", 'woocommerce' ) . ' <a href="https://wordpress.org/plugins/woocommerce-gateway-paypal-express-checkout/" target="_blank">' . __( 'Learn more about PayPal', 'woocommerce' ) . '</a>',
+				'class'       => 'featured featured-row-last',
+				'repo-slug'   => 'woocommerce-gateway-paypal-express-checkout',
+			),
+			'stripe' => array(
+				'name'        => __( 'Stripe', 'woocommerce' ),
+				'image'       => WC()->plugin_url() . '/assets/images/stripe.png',
+				'description' => sprintf( __( 'A modern and robust way to accept credit card payments on your store. <a href="%s" target="_blank">Learn more about Stripe</a>.', 'woocommerce' ), 'https://wordpress.org/plugins/woocommerce-gateway-stripe/' ),
+				'class'       => 'featured featured-row-first',
+				'repo-slug'   => 'woocommerce-gateway-stripe',
+			),
+			'paypal' => array(
+				'name'        => __( 'PayPal Standard', 'woocommerce' ),
+				'description' => __( 'Accept payments via PayPal using account balance or credit card.', 'woocommerce' ),
+				'image'       => '',
+				'class'       => '',
+				'settings'    => array(
+					'email' => array(
+						'label'       => __( 'PayPal email address', 'woocommerce' ),
+						'type'        => 'email',
+						'value'       => get_option( 'admin_email' ),
+						'placeholder' => __( 'PayPal email address', 'woocommerce' ),
+					),
+				),
+			),
+			'cheque' => array(
+				'name'        => _x( 'Check payments', 'Check payment method', 'woocommerce' ),
+				'description' => __( 'A simple offline gateway that lets you accept a check as method of payment.', 'woocommerce' ),
+				'image'       => '',
+				'class'       => '',
+			),
+			'bacs' => array(
+				'name'        => __( 'Bank transfer (BACS) payments', 'woocommerce' ),
+				'description' => __( 'A simple offline gateway that lets you accept BACS payment.', 'woocommerce' ),
+				'image'       => '',
+				'class'       => '',
+			),
+			'cod' => array(
+				'name'        => __( 'Cash on delivery', 'woocommerce' ),
+				'description' => __( 'A simple offline gateway that lets you accept cash on delivery.', 'woocommerce' ),
+				'image'       => '',
+				'class'       => '',
+			),
+		);
+
+		$country = WC()->countries->get_base_country();
+
+		if ( 'US' === $country ) {
+			unset( $gateways['paypal-ec'] );
+		} else {
+			unset( $gateways['paypal-braintree'] );
+		}
+
+		if ( ! current_user_can( 'install_plugins' ) ) {
+			unset( $gateways['paypal-braintree'] );
+			unset( $gateways['paypal-ec'] );
+			unset( $gateways['stripe'] );
+		}
+
+		return $gateways;
+	}
+
 	/**
 	 * Payments Step.
 	 */
 	public function wc_setup_payments() {
-		$paypal_settings = array_filter( (array) get_option( 'woocommerce_paypal_settings', array() ) );
-		$cheque_settings = array_filter( (array) get_option( 'woocommerce_cheque_settings', array() ) );
-		$cod_settings    = array_filter( (array) get_option( 'woocommerce_cod_settings', array() ) );
-		$bacs_settings   = array_filter( (array) get_option( 'woocommerce_bacs_settings', array() ) );
+		$gateways = $this->get_wizard_payment_gateways();
 		?>
-		<h1><?php _e( 'Payments', 'woocommerce' ); ?></h1>
-		<form method="post">
-			<p><?php printf( __( 'WooCommerce can accept both online and offline payments. %2$sAdditional payment methods%3$s can be installed later and managed from the %1$scheckout settings%3$s screen.', 'woocommerce' ), '<a href="' . admin_url( 'admin.php?page=wc-settings&tab=checkout' ) . '" target="_blank">', '<a href="' . admin_url( 'admin.php?page=wc-addons&view=payment-gateways' ) . '" target="_blank">', '</a>' ); ?></p>
-			<table class="form-table">
-				<tr class="section_title">
-					<td colspan="2">
-						<h2><?php _e( 'PayPal Standard', 'woocommerce' ); ?></h2>
-						<p><?php _e( 'To accept payments via PayPal on your store, simply enter your PayPal email address below.', 'woocommerce' ); ?></p>
-					</td>
-				</tr>
-				<tr>
-					<th scope="row"><label for="woocommerce_paypal_email"><?php _e( 'PayPal Email Address:', 'woocommerce' ); ?></label></th>
-					<td>
-						<input type="email" id="woocommerce_paypal_email" name="woocommerce_paypal_email" class="input-text" value="<?php echo esc_attr( isset( $paypal_settings['email'] ) ? $paypal_settings['email'] : '' ); ?>" />
-					</td>
-				</tr>
-				<tr class="section_title">
-					<td colspan="2">
-						<h2><?php _e( 'Offline Payments', 'woocommerce' ); ?></h2>
-						<p><?php _e( 'Offline gateways require manual processing, but can be useful in certain circumstances or for testing payments.', 'woocommerce' ); ?></p>
-					</td>
-				</tr>
-				<tr>
-					<th scope="row"><label for="woocommerce_enable_cheque"><?php _e( 'Cheque Payments', 'woocommerce' ); ?></label></th>
-					<td>
-						<label><input type="checkbox" id="woocommerce_enable_cheque" name="woocommerce_enable_cheque" class="input-checkbox" value="yes" <?php checked( ( isset( $cheque_settings['enabled'] ) && 'yes' === $cheque_settings['enabled'] ), true ); ?> /> <?php _e( 'Enable payment via Cheques', 'woocommerce' ); ?></label>
-					</td>
-				</tr>
-				<tr>
-					<th scope="row"><label for="woocommerce_enable_cod"><?php _e( 'Cash on Delivery', 'woocommerce' ); ?></label></th>
-					<td>
-						<label><input type="checkbox" id="woocommerce_enable_cod" name="woocommerce_enable_cod" class="input-checkbox" value="yes" <?php checked( ( isset( $cod_settings['enabled'] ) && 'yes' === $cod_settings['enabled'] ), true ); ?> /> <?php _e( 'Enable cash on delivery', 'woocommerce' ); ?></label>
-					</td>
-				</tr>
-				<tr>
-					<th scope="row"><label for="woocommerce_enable_bacs"><?php _e( 'Bank Transfer (BACS)', 'woocommerce' ); ?></label></th>
-					<td>
-						<label><input type="checkbox" id="woocommerce_enable_bacs" name="woocommerce_enable_bacs" class="input-checkbox" value="yes" <?php checked( ( isset( $bacs_settings['enabled'] ) && 'yes' === $bacs_settings['enabled'] ), true ); ?> /> <?php _e( 'Enable BACS payments', 'woocommerce' ); ?></label>
-					</td>
-				</tr>
-			</table>
+		<h1><?php esc_html_e( 'Payments', 'woocommerce' ); ?></h1>
+		<form method="post" class="wc-wizard-payment-gateway-form">
+			<p><?php printf( __( 'WooCommerce can accept both online and offline payments. <a href="%1$s" target="_blank">Additional payment methods</a> can be installed later and managed from the <a href="%2$s" target="_blank">checkout settings</a> screen.', 'woocommerce' ), esc_url( admin_url( 'admin.php?page=wc-addons&view=payment-gateways' ) ), esc_url( admin_url( 'admin.php?page=wc-settings&tab=checkout' ) ) ); ?></p>
+
+			<ul class="wc-wizard-payment-gateways">
+				<?php foreach ( $gateways as $gateway_id => $gateway ) : ?>
+					<li class="wc-wizard-gateway wc-wizard-gateway-<?php echo esc_attr( $gateway_id ); ?> <?php echo esc_attr( $gateway['class'] ); ?>">
+						<div class="wc-wizard-gateway-enable">
+							<input type="checkbox" name="wc-wizard-gateway-<?php echo esc_attr( $gateway_id ); ?>-enabled" class="input-checkbox" value="yes" />
+							<label>
+								<?php if ( $gateway['image'] ) : ?>
+									<img src="<?php echo esc_attr( $gateway['image'] ); ?>" alt="<?php echo esc_attr( $gateway['name'] ); ?>" />
+								<?php else : ?>
+									<?php echo esc_html( $gateway['name'] ); ?>
+								<?php endif; ?>
+							</label>
+						</div>
+						<div class="wc-wizard-gateway-description">
+							<?php echo wp_kses_post( wpautop( $gateway['description'] ) ); ?>
+						</div>
+						<?php if ( ! empty( $gateway['settings'] ) ) : ?>
+							<table class="form-table wc-wizard-gateway-settings">
+								<?php foreach ( $gateway['settings'] as $setting_id => $setting ) : ?>
+									<tr>
+										<th scope="row"><label for="<?php echo esc_attr( $gateway_id ); ?>_<?php echo esc_attr( $setting_id ); ?>"><?php echo esc_html( $setting['label'] ); ?>:</label></th>
+										<td>
+											<input
+												type="<?php echo esc_attr( $setting['type'] ); ?>"
+												id="<?php echo esc_attr( $gateway_id ); ?>_<?php echo esc_attr( $setting_id ); ?>"
+												name="<?php echo esc_attr( $gateway_id ); ?>_<?php echo esc_attr( $setting_id ); ?>"
+												class="input-text"
+												value="<?php echo esc_attr( $setting['value'] ); ?>"
+												placeholder="<?php echo esc_attr( $setting['placeholder'] ); ?>"
+												/>
+										</td>
+									</tr>
+								<?php endforeach; ?>
+							</table>
+						<?php endif; ?>
+					</li>
+				<?php endforeach; ?>
+			</ul>
 			<p class="wc-setup-actions step">
 				<input type="submit" class="button-primary button button-large button-next" value="<?php esc_attr_e( 'Continue', 'woocommerce' ); ?>" name="save_step" />
-				<a href="<?php echo esc_url( $this->get_next_step_link() ); ?>" class="button button-large button-next"><?php _e( 'Skip this step', 'woocommerce' ); ?></a>
+				<a href="<?php echo esc_url( $this->get_next_step_link() ); ?>" class="button button-large button-next"><?php esc_html_e( 'Skip this step', 'woocommerce' ); ?></a>
 				<?php wp_nonce_field( 'wc-setup' ); ?>
 			</p>
 		</form>
@@ -687,25 +737,27 @@ class WC_Admin_Setup_Wizard {
 	public function wc_setup_payments_save() {
 		check_admin_referer( 'wc-setup' );
 
-		$paypal_settings            = array_filter( (array) get_option( 'woocommerce_paypal_settings', array() ) );
-		$cheque_settings            = array_filter( (array) get_option( 'woocommerce_cheque_settings', array() ) );
-		$cod_settings               = array_filter( (array) get_option( 'woocommerce_cod_settings', array() ) );
-		$bacs_settings              = array_filter( (array) get_option( 'woocommerce_bacs_settings', array() ) );
+		$gateways = $this->get_wizard_payment_gateways();
 
-		$paypal_settings['enabled'] = ! empty( $_POST['woocommerce_paypal_email'] ) ? 'yes' : 'no';
-		$cheque_settings['enabled'] = isset( $_POST['woocommerce_enable_cheque'] ) ? 'yes' : 'no';
-		$cod_settings['enabled']    = isset( $_POST['woocommerce_enable_cod'] ) ? 'yes' : 'no';
-		$bacs_settings['enabled']   = isset( $_POST['woocommerce_enable_bacs'] ) ? 'yes' : 'no';
+		foreach ( $gateways as $gateway_id => $gateway ) {
+			// If repo-slug is defined, download and install plugin from .org.
+			if ( ! empty( $gateway['repo-slug'] ) && ! empty( $_POST[ 'wc-wizard-gateway-' . $gateway_id . '-enabled' ] ) ) {
+				wp_schedule_single_event( time() + 10, 'woocommerce_plugin_background_installer', array( $gateway_id, $gateway ) );
+			}
 
-		if ( ! empty( $_POST['woocommerce_paypal_email'] ) ) {
-			$paypal_settings['email'] = wc_clean( $_POST['woocommerce_paypal_email'] );
+			$settings_key        = 'woocommerce_' . $gateway_id . '_settings';
+			$settings            = array_filter( (array) get_option( $settings_key, array() ) );
+			$settings['enabled'] = ! empty( $_POST[ 'wc-wizard-gateway-' . $gateway_id . '-enabled' ] ) ? 'yes' : 'no';
+
+			if ( ! empty( $gateway['settings'] ) ) {
+				foreach ( $gateway['settings'] as $setting_id => $setting ) {
+					$settings[ $setting_id ] = wc_clean( $_POST[ $gateway_id . '_' . $setting_id ] );
+				}
+			}
+
+			update_option( $settings_key, $settings );
 		}
 
-		update_option( 'woocommerce_paypal_settings', $paypal_settings );
-		update_option( 'woocommerce_cheque_settings', $cheque_settings );
-		update_option( 'woocommerce_cod_settings', $cod_settings );
-		update_option( 'woocommerce_bacs_settings', $bacs_settings );
-
 		wp_redirect( esc_url_raw( $this->get_next_step_link() ) );
 		exit;
 	}
@@ -732,35 +784,34 @@ class WC_Admin_Setup_Wizard {
 		$this->wc_setup_ready_actions();
 		shuffle( $this->tweets );
 		?>
-		<a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.woothemes.com/woocommerce/" data-text="<?php echo esc_attr( $this->tweets[0] ); ?>" data-via="WooThemes" data-size="large">Tweet</a>
+		<a href="https://twitter.com/share" class="twitter-share-button" data-url="https://woocommerce.com/" data-text="<?php echo esc_attr( $this->tweets[0] ); ?>" data-via="WooCommerce" data-size="large">Tweet</a>
 		<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
 
-		<h1><?php _e( 'Your Store is Ready!', 'woocommerce' ); ?></h1>
+		<h1><?php esc_html_e( 'Your store is ready!', 'woocommerce' ); ?></h1>
 
 		<?php if ( 'unknown' === get_option( 'woocommerce_allow_tracking', 'unknown' ) ) : ?>
 			<div class="woocommerce-message woocommerce-tracker">
-				<p><?php printf( __( 'Want to help make WooCommerce even more awesome? Allow WooThemes to collect non-sensitive diagnostic data and usage information, and get %s discount on your next WooThemes purchase. %sFind out more%s.', 'woocommerce' ), '20%', '<a href="http://www.woothemes.com/woocommerce/usage-tracking/" target="_blank">', '</a>' ); ?></p>
+				<p><?php printf( __( 'Want to help make WooCommerce even more awesome? Allow WooCommerce to collect non-sensitive diagnostic data and usage information. %1$sFind out more%2$s.', 'woocommerce' ), '<a href="https://woocommerce.com/usage-tracking/" target="_blank">', '</a>' ); ?></p>
 				<p class="submit">
-					<a class="button-primary button button-large" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wc_tracker_optin', 'true' ), 'wc_tracker_optin', 'wc_tracker_nonce' ) ); ?>"><?php _e( 'Allow', 'woocommerce' ); ?></a>
-					<a class="button-secondary button button-large skip"  href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wc_tracker_optout', 'true' ), 'wc_tracker_optout', 'wc_tracker_nonce' ) ); ?>"><?php _e( 'No thanks', 'woocommerce' ); ?></a>
+					<a class="button-primary button button-large" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wc_tracker_optin', 'true' ), 'wc_tracker_optin', 'wc_tracker_nonce' ) ); ?>"><?php esc_html_e( 'Allow', 'woocommerce' ); ?></a>
+					<a class="button-secondary button button-large skip"  href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wc_tracker_optout', 'true' ), 'wc_tracker_optout', 'wc_tracker_nonce' ) ); ?>"><?php esc_html_e( 'No thanks', 'woocommerce' ); ?></a>
 				</p>
 			</div>
 		<?php endif; ?>
 
 		<div class="wc-setup-next-steps">
 			<div class="wc-setup-next-steps-first">
-				<h2><?php _e( 'Next Steps', 'woocommerce' ); ?></h2>
+				<h2><?php esc_html_e( 'Next steps', 'woocommerce' ); ?></h2>
 				<ul>
-					<li class="setup-product"><a class="button button-primary button-large" href="<?php echo esc_url( admin_url( 'post-new.php?post_type=product&tutorial=true' ) ); ?>"><?php _e( 'Create your first product!', 'woocommerce' ); ?></a></li>
+					<li class="setup-product"><a class="button button-primary button-large" href="<?php echo esc_url( admin_url( 'post-new.php?post_type=product&tutorial=true' ) ); ?>"><?php esc_html_e( 'Create your first product!', 'woocommerce' ); ?></a></li>
 				</ul>
 			</div>
 			<div class="wc-setup-next-steps-last">
-				<h2><?php _e( 'Learn More', 'woocommerce' ); ?></h2>
+				<h2><?php _e( 'Learn more', 'woocommerce' ); ?></h2>
 				<ul>
-					<li class="video-walkthrough"><a href="http://docs.woothemes.com/document/woocommerce-101-video-series/?utm_source=WooCommercePlugin&amp;utm_medium=Wizard&amp;utm_content=Videos&amp;utm_campaign=Onboarding"><?php _e( 'Watch the WC 101 video walkthroughs', 'woocommerce' ); ?></a></li>
-					<li class="newsletter"><a href="http://www.woothemes.com/woocommerce-onboarding-email/?utm_source=WooCommercePlugin&amp;utm_medium=Wizard&amp;utm_content=Newsletter&amp;utm_campaign=Onboarding"><?php _e( 'Get eCommerce advice in your inbox', 'woocommerce' ); ?></a></li>
-					<li class="sidekick"><a href="http://www.woothemes.com/sidekick/"><?php _e( 'Follow Sidekick interactive walkthroughs', 'woocommerce' ); ?></a></li>
-					<li class="learn-more"><a href="http://docs.woothemes.com/documentation/plugins/woocommerce/getting-started/?utm_source=WooCommercePlugin&amp;utm_medium=Wizard&amp;utm_content=Docs&amp;utm_campaign=Onboarding"><?php _e( 'Read more about getting started', 'woocommerce' ); ?></a></li>
+					<li class="video-walkthrough"><a href="https://docs.woocommerce.com/document/woocommerce-guided-tour-videos/?utm_source=setupwizard&utm_medium=product&utm_content=videos&utm_campaign=woocommerceplugin"><?php esc_html_e( 'Watch the Guided Tour videos', 'woocommerce' ); ?></a></li>
+					<li class="newsletter"><a href="https://woocommerce.com/woocommerce-onboarding-email/?utm_source=setupwizard&utm_medium=product&utm_content=newsletter&utm_campaign=woocommerceplugin"><?php esc_html_e( 'Get eCommerce advice in your inbox', 'woocommerce' ); ?></a></li>
+					<li class="learn-more"><a href="https://docs.woocommerce.com/documentation/plugins/woocommerce/getting-started/?utm_source=setupwizard&utm_medium=product&utm_content=docs&utm_campaign=woocommerceplugin"><?php esc_html_e( 'Learn more about getting started', 'woocommerce' ); ?></a></li>
 				</ul>
 			</div>
 		</div>
diff --git a/includes/admin/class-wc-admin-status.php b/includes/admin/class-wc-admin-status.php
index 4349cc81b81..c2053bac2b9 100644
--- a/includes/admin/class-wc-admin-status.php
+++ b/includes/admin/class-wc-admin-status.php
@@ -21,14 +21,14 @@ class WC_Admin_Status {
 	 * Handles output of the reports page in admin.
 	 */
 	public static function output() {
-		include_once( 'views/html-admin-page-status.php' );
+		include_once( dirname( __FILE__ ) . '/views/html-admin-page-status.php' );
 	}
 
 	/**
 	 * Handles output of report.
 	 */
 	public static function status_report() {
-		include_once( 'views/html-admin-page-status-report.php' );
+		include_once( dirname( __FILE__ ) . '/views/html-admin-page-status-report.php' );
 	}
 
 	/**
@@ -40,110 +40,28 @@ class WC_Admin_Status {
 		$tools = self::get_tools();
 
 		if ( ! empty( $_GET['action'] ) && ! empty( $_REQUEST['_wpnonce'] ) && wp_verify_nonce( $_REQUEST['_wpnonce'], 'debug_action' ) ) {
+			$tools_controller = new WC_REST_System_Status_Tools_Controller;
+			$action           = wc_clean( $_GET['action'] );
 
-			switch ( $_GET['action'] ) {
-				case 'clear_transients' :
-					wc_delete_product_transients();
-					wc_delete_shop_order_transients();
-					WC_Cache_Helper::get_transient_version( 'shipping', true );
+			if ( array_key_exists( $action, $tools ) ) {
+				$response = $tools_controller->execute_tool( $action );
+			} else {
+				$response = array( 'success' => false, 'message' => __( 'Tool does not exist.', 'woocommerce' ) );
+			}
 
-					echo '<div class="updated"><p>' . __( 'Product Transients Cleared', 'woocommerce' ) . '</p></div>';
-				break;
-				case 'clear_expired_transients' :
-
-					/*
-					 * Deletes all expired transients. The multi-table delete syntax is used.
-					 * to delete the transient record from table a, and the corresponding.
-					 * transient_timeout record from table b.
-					 *
-					 * Based on code inside core's upgrade_network() function.
-					 */
-					$sql = "DELETE a, b FROM $wpdb->options a, $wpdb->options b
-						WHERE a.option_name LIKE %s
-						AND a.option_name NOT LIKE %s
-						AND b.option_name = CONCAT( '_transient_timeout_', SUBSTRING( a.option_name, 12 ) )
-						AND b.option_value < %d";
-					$rows = $wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( '_transient_' ) . '%', $wpdb->esc_like( '_transient_timeout_' ) . '%', time() ) );
-
-					$sql = "DELETE a, b FROM $wpdb->options a, $wpdb->options b
-						WHERE a.option_name LIKE %s
-						AND a.option_name NOT LIKE %s
-						AND b.option_name = CONCAT( '_site_transient_timeout_', SUBSTRING( a.option_name, 17 ) )
-						AND b.option_value < %d";
-					$rows2 = $wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( '_site_transient_' ) . '%', $wpdb->esc_like( '_site_transient_timeout_' ) . '%', time() ) );
-
-					echo '<div class="updated"><p>' . sprintf( __( '%d Transients Rows Cleared', 'woocommerce' ), $rows + $rows2 ) . '</p></div>';
-
-				break;
-				case 'reset_roles' :
-					// Remove then re-add caps and roles
-					WC_Install::remove_roles();
-					WC_Install::create_roles();
-
-					echo '<div class="updated"><p>' . __( 'Roles successfully reset', 'woocommerce' ) . '</p></div>';
-				break;
-				case 'recount_terms' :
-
-					$product_cats = get_terms( 'product_cat', array( 'hide_empty' => false, 'fields' => 'id=>parent' ) );
-
-					_wc_term_recount( $product_cats, get_taxonomy( 'product_cat' ), true, false );
-
-					$product_tags = get_terms( 'product_tag', array( 'hide_empty' => false, 'fields' => 'id=>parent' ) );
-
-					_wc_term_recount( $product_tags, get_taxonomy( 'product_tag' ), true, false );
-
-					echo '<div class="updated"><p>' . __( 'Terms successfully recounted', 'woocommerce' ) . '</p></div>';
-				break;
-				case 'clear_sessions' :
-
-					$wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_sessions" );
-
-					wp_cache_flush();
-
-					echo '<div class="updated"><p>' . __( 'Sessions successfully cleared', 'woocommerce' ) . '</p></div>';
-				break;
-				case 'install_pages' :
-					WC_Install::create_pages();
-					echo '<div class="updated"><p>' . __( 'All missing WooCommerce pages was installed successfully.', 'woocommerce' ) . '</p></div>';
-				break;
-				case 'delete_taxes' :
-
-					$wpdb->query( "TRUNCATE " . $wpdb->prefix . "woocommerce_tax_rates" );
-					$wpdb->query( "TRUNCATE " . $wpdb->prefix . "woocommerce_tax_rate_locations" );
-					WC_Cache_Helper::incr_cache_prefix( 'taxes' );
-
-					echo '<div class="updated"><p>' . __( 'Tax rates successfully deleted', 'woocommerce' ) . '</p></div>';
-				break;
-				case 'reset_tracking' :
-					delete_option( 'woocommerce_allow_tracking' );
-					WC_Admin_Notices::add_notice( 'tracking' );
-
-					echo '<div class="updated"><p>' . __( 'Usage tracking settings successfully reset.', 'woocommerce' ) . '</p></div>';
-				break;
-				default :
-					$action = esc_attr( $_GET['action'] );
-					if ( isset( $tools[ $action ]['callback'] ) ) {
-						$callback = $tools[ $action ]['callback'];
-						$return = call_user_func( $callback );
-						if ( $return === false ) {
-							if ( is_array( $callback ) ) {
-								echo '<div class="error"><p>' . sprintf( __( 'There was an error calling %s::%s', 'woocommerce' ), get_class( $callback[0] ), $callback[1] ) . '</p></div>';
-
-							} else {
-								echo '<div class="error"><p>' . sprintf( __( 'There was an error calling %s', 'woocommerce' ), $callback ) . '</p></div>';
-							}
-						}
-					}
-				break;
+			if ( $response['success'] ) {
+				echo '<div class="updated inline"><p>' . esc_html( $response['message'] ) . '</p></div>';
+			} else {
+				echo '<div class="error inline"><p>' . esc_html( $response['message'] ) . '</p></div>';
 			}
 		}
 
 		// Display message if settings settings have been saved
 		if ( isset( $_REQUEST['settings-updated'] ) ) {
-			echo '<div class="updated"><p>' . __( 'Your changes have been saved.', 'woocommerce' ) . '</p></div>';
+			echo '<div class="updated inline"><p>' . __( 'Your changes have been saved.', 'woocommerce' ) . '</p></div>';
 		}
 
-		include_once( 'views/html-admin-page-status-tools.php' );
+		include_once( dirname( __FILE__ ) . '/views/html-admin-page-status-tools.php' );
 	}
 
 	/**
@@ -151,56 +69,25 @@ class WC_Admin_Status {
 	 * @return array of tools
 	 */
 	public static function get_tools() {
-		$tools = array(
-			'clear_transients' => array(
-				'name'    => __( 'WC Transients', 'woocommerce' ),
-				'button'  => __( 'Clear transients', 'woocommerce' ),
-				'desc'    => __( 'This tool will clear the product/shop transients cache.', 'woocommerce' ),
-			),
-			'clear_expired_transients' => array(
-				'name'    => __( 'Expired Transients', 'woocommerce' ),
-				'button'  => __( 'Clear expired transients', 'woocommerce' ),
-				'desc'    => __( 'This tool will clear ALL expired transients from WordPress.', 'woocommerce' ),
-			),
-			'recount_terms' => array(
-				'name'    => __( 'Term counts', 'woocommerce' ),
-				'button'  => __( 'Recount terms', 'woocommerce' ),
-				'desc'    => __( 'This tool will recount product terms - useful when changing your settings in a way which hides products from the catalog.', 'woocommerce' ),
-			),
-			'reset_roles' => array(
-				'name'    => __( 'Capabilities', 'woocommerce' ),
-				'button'  => __( 'Reset capabilities', 'woocommerce' ),
-				'desc'    => __( 'This tool will reset the admin, customer and shop_manager roles to default. Use this if your users cannot access all of the WooCommerce admin pages.', 'woocommerce' ),
-			),
-			'clear_sessions' => array(
-				'name'    => __( 'Customer Sessions', 'woocommerce' ),
-				'button'  => __( 'Clear all sessions', 'woocommerce' ),
-				'desc'    => __( '<strong class="red">Warning:</strong> This tool will delete all customer session data from the database, including any current live carts.', 'woocommerce' ),
-			),
-			'install_pages' => array(
-				'name'    => __( 'Install WooCommerce Pages', 'woocommerce' ),
-				'button'  => __( 'Install pages', 'woocommerce' ),
-				'desc'    => __( '<strong class="red">Note:</strong> This tool will install all the missing WooCommerce pages. Pages already defined and set up will not be replaced.', 'woocommerce' ),
-			),
-			'delete_taxes' => array(
-				'name'    => __( 'Delete all WooCommerce tax rates', 'woocommerce' ),
-				'button'  => __( 'Delete ALL tax rates', 'woocommerce' ),
-				'desc'    => __( '<strong class="red">Note:</strong> This option will delete ALL of your tax rates, use with caution.', 'woocommerce' ),
-			),
-			'reset_tracking' => array(
-				'name'    => __( 'Reset Usage Tracking Settings', 'woocommerce' ),
-				'button'  => __( 'Reset usage tracking settings', 'woocommerce' ),
-				'desc'    => __( 'This will reset your usage tracking settings, causing it to show the opt-in banner again and not sending any data.', 'woocommerce' ),
-			)
-		);
-
-		return apply_filters( 'woocommerce_debug_tools', $tools );
+		$tools_controller = new WC_REST_System_Status_Tools_Controller;
+		return $tools_controller->get_tools();
 	}
 
 	/**
 	 * Show the logs page.
 	 */
 	public static function status_logs() {
+		if ( defined( 'WC_LOG_HANDLER' ) && 'WC_Log_Handler_DB' === WC_LOG_HANDLER ) {
+			self::status_logs_db();
+		} else {
+			self::status_logs_file();
+		}
+	}
+
+	/**
+	 * Show the log page contents for file log handler.
+	 */
+	public static function status_logs_file() {
 
 		$logs = self::scan_log_files();
 
@@ -210,9 +97,36 @@ class WC_Admin_Status {
 			$viewed_log = current( $logs );
 		}
 
+		$handle = ! empty( $viewed_log ) ? self::get_log_file_handle( $viewed_log ) : '';
+
+		if ( ! empty( $_REQUEST['handle'] ) ) {
+			self::remove_log();
+		}
+
 		include_once( 'views/html-admin-page-status-logs.php' );
 	}
 
+	/**
+	 * Show the log page contents for db log handler.
+	 */
+	public static function status_logs_db() {
+
+		// Flush
+		if ( ! empty( $_REQUEST['flush-logs'] ) ) {
+			self::flush_db_logs();
+		}
+
+		// Bulk actions
+		if ( isset( $_GET['action'] ) && isset( $_GET['log'] ) ) {
+			self::log_table_bulk_actions();
+		}
+
+		$log_table_list = new WC_Admin_Log_Table_List();
+		$log_table_list->prepare_items();
+
+		include_once( 'views/html-admin-page-status-logs-db.php' );
+	}
+
 	/**
 	 * Retrieve metadata from a file. Based on WP Core's get_file_data function.
 	 * @since  2.1.1
@@ -239,12 +153,23 @@ class WC_Admin_Status {
 		$file_data = str_replace( "\r", "\n", $file_data );
 		$version   = '';
 
-		if ( preg_match( '/^[ \t\/*#@]*' . preg_quote( '@version', '/' ) . '(.*)$/mi', $file_data, $match ) && $match[1] )
+		if ( preg_match( '/^[ \t\/*#@]*' . preg_quote( '@version', '/' ) . '(.*)$/mi', $file_data, $match ) && $match[1] ) {
 			$version = _cleanup_header_comment( $match[1] );
+		}
 
 		return $version ;
 	}
 
+	/**
+	 * Return the log file handle.
+	 *
+	 * @param string $filename
+	 * @return string
+	 */
+	public static function get_log_file_handle( $filename ) {
+		return substr( $filename, 0, strlen( $filename ) > 37 ? strlen( $filename ) - 37 : strlen( $filename ) - 4 );
+	}
+
 	/**
 	 * Scan the template files.
 	 * @param  string $template_path
@@ -259,7 +184,7 @@ class WC_Admin_Status {
 
 			foreach ( $files as $key => $value ) {
 
-				if ( ! in_array( $value, array( ".",".." ) ) ) {
+				if ( ! in_array( $value, array( ".", ".." ) ) ) {
 
 					if ( is_dir( $template_path . DIRECTORY_SEPARATOR . $value ) ) {
 						$sub_files = self::scan_template_files( $template_path . DIRECTORY_SEPARATOR . $value );
@@ -283,7 +208,7 @@ class WC_Admin_Status {
 		$files  = @scandir( WC_LOG_DIR );
 		$result = array();
 
-		if ( $files ) {
+		if ( ! empty( $files ) ) {
 
 			foreach ( $files as $key => $value ) {
 
@@ -293,7 +218,6 @@ class WC_Admin_Status {
 					}
 				}
 			}
-
 		}
 
 		return $result;
@@ -301,24 +225,27 @@ class WC_Admin_Status {
 
 	/**
 	 * Get latest version of a theme by slug.
-	 * @param  object $theme WP_Theme object
-	 * @return string Version number if found
+	 * @param  object $theme WP_Theme object.
+	 * @return string Version number if found.
 	 */
 	public static function get_latest_theme_version( $theme ) {
+		include_once( ABSPATH . 'wp-admin/includes/theme.php' );
+
 		$api = themes_api( 'theme_information', array(
 			'slug'     => $theme->get_stylesheet(),
 			'fields'   => array(
-			'sections' => false,
-			'tags'     => false
-		) ) );
+				'sections' => false,
+				'tags'     => false,
+			),
+		) );
 
 		$update_theme_version = 0;
 
-		// Check .org for updates
-		if ( $api && ! is_wp_error( $api ) ) {
+		// Check .org for updates.
+		if ( is_object( $api ) && ! is_wp_error( $api ) ) {
 			$update_theme_version = $api->version;
 
-		// Check WooThemes Theme Version
+		// Check WooThemes Theme Version.
 		} elseif ( strstr( $theme->{'Author URI'}, 'woothemes' ) ) {
 			$theme_dir = substr( strtolower( str_replace( ' ','', $theme->Name ) ), 0, 45 );
 
@@ -346,4 +273,56 @@ class WC_Admin_Status {
 
 		return $update_theme_version;
 	}
+
+	/**
+	 * Remove/delete the chosen file.
+	 */
+	public static function remove_log() {
+		if ( empty( $_REQUEST['_wpnonce'] ) || ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'remove_log' ) ) {
+			wp_die( __( 'Action failed. Please refresh the page and retry.', 'woocommerce' ) );
+		}
+
+		if ( ! empty( $_REQUEST['handle'] ) ) {
+			$log_handler = new WC_Log_Handler_File();
+			$log_handler->remove( $_REQUEST['handle'] );
+		}
+
+		wp_safe_redirect( esc_url_raw( admin_url( 'admin.php?page=wc-status&tab=logs' ) ) );
+		exit();
+	}
+
+	/**
+	 * Clear DB log table.
+	 *
+	 * @since 3.0.0
+	 */
+	private static function flush_db_logs() {
+		if ( empty( $_REQUEST['_wpnonce'] ) || ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'woocommerce-status-logs' ) ) {
+			wp_die( __( 'Action failed. Please refresh the page and retry.', 'woocommerce' ) );
+		}
+
+		WC_Log_Handler_DB::flush();
+
+		wp_safe_redirect( esc_url_raw( admin_url( 'admin.php?page=wc-status&tab=logs' ) ) );
+		exit();
+	}
+
+	/**
+	 * Bulk DB log table actions.
+	 *
+	 * @since 3.0.0
+	 */
+	private static function log_table_bulk_actions() {
+		if ( empty( $_REQUEST['_wpnonce'] ) || ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'woocommerce-status-logs' ) ) {
+			wp_die( __( 'Action failed. Please refresh the page and retry.', 'woocommerce' ) );
+		}
+
+		$log_ids = array_map( 'absint', (array) $_GET['log'] );
+
+		if ( 'delete' === $_GET['action'] || 'delete' === $_GET['action2'] ) {
+			WC_Log_Handler_DB::delete( $log_ids );
+			wp_safe_redirect( esc_url_raw( admin_url( 'admin.php?page=wc-status&tab=logs' ) ) );
+			exit();
+		}
+	}
 }
diff --git a/includes/admin/class-wc-admin-taxonomies.php b/includes/admin/class-wc-admin-taxonomies.php
index e52758d79f9..0c2f4a45ad3 100644
--- a/includes/admin/class-wc-admin-taxonomies.php
+++ b/includes/admin/class-wc-admin-taxonomies.php
@@ -38,13 +38,12 @@ class WC_Admin_Taxonomies {
 
 		// Taxonomy page descriptions
 		add_action( 'product_cat_pre_add_form', array( $this, 'product_cat_description' ) );
-		add_action( 'product_shipping_class_pre_add_form', array( $this, 'shipping_class_description' ) );
 
 		$attribute_taxonomies = wc_get_attribute_taxonomies();
 
-		if ( $attribute_taxonomies ) {
-			foreach ( array_keys( $attribute_taxonomies ) as $attribute ) {
-				add_action( $attribute . '_pre_add_form', array( $this, 'product_attribute_description' ) );
+		if ( ! empty( $attribute_taxonomies ) ) {
+			foreach ( $attribute_taxonomies as $attribute ) {
+				add_action( 'pa_' . $attribute->attribute_name . '_pre_add_form', array( $this, 'product_attribute_description' ) );
 			}
 		}
 
@@ -57,7 +56,7 @@ class WC_Admin_Taxonomies {
 	 *
 	 * @param mixed $term_id
 	 * @param mixed $tt_id
-	 * @param mixed $taxonomy
+	 * @param string $taxonomy
 	 */
 	public function create_term( $term_id, $tt_id = '', $taxonomy = '' ) {
 		if ( 'product_cat' != $taxonomy && ! taxonomy_is_product_attribute( $taxonomy ) ) {
@@ -79,7 +78,7 @@ class WC_Admin_Taxonomies {
 
 		$term_id = absint( $term_id );
 
-		if ( $term_id ) {
+		if ( $term_id && get_option( 'db_version' ) < 34370 ) {
 			$wpdb->delete( $wpdb->woocommerce_termmeta, array( 'woocommerce_term_id' => $term_id ), array( '%d' ) );
 		}
 	}
@@ -89,7 +88,7 @@ class WC_Admin_Taxonomies {
 	 */
 	public function add_category_fields() {
 		?>
-		<div class="form-field">
+		<div class="form-field term-display-type-wrap">
 			<label for="display_type"><?php _e( 'Display type', 'woocommerce' ); ?></label>
 			<select id="display_type" name="display_type" class="postform">
 				<option value=""><?php _e( 'Default', 'woocommerce' ); ?></option>
@@ -98,7 +97,7 @@ class WC_Admin_Taxonomies {
 				<option value="both"><?php _e( 'Both', 'woocommerce' ); ?></option>
 			</select>
 		</div>
-		<div class="form-field">
+		<div class="form-field term-thumbnail-wrap">
 			<label><?php _e( 'Thumbnail', 'woocommerce' ); ?></label>
 			<div id="product_cat_thumbnail" style="float: left; margin-right: 10px;"><img src="<?php echo esc_url( wc_placeholder_img_src() ); ?>" width="60px" height="60px" /></div>
 			<div style="line-height: 60px;">
@@ -137,10 +136,11 @@ class WC_Admin_Taxonomies {
 
 					// When an image is selected, run a callback.
 					file_frame.on( 'select', function() {
-						var attachment = file_frame.state().get( 'selection' ).first().toJSON();
+						var attachment           = file_frame.state().get( 'selection' ).first().toJSON();
+						var attachment_thumbnail = attachment.sizes.thumbnail || attachment.sizes.full;
 
 						jQuery( '#product_cat_thumbnail_id' ).val( attachment.id );
-						jQuery( '#product_cat_thumbnail' ).find( 'img' ).attr( 'src', attachment.sizes.thumbnail.url );
+						jQuery( '#product_cat_thumbnail' ).find( 'img' ).attr( 'src', attachment_thumbnail.url );
 						jQuery( '.remove_image_button' ).show();
 					});
 
@@ -155,6 +155,24 @@ class WC_Admin_Taxonomies {
 					return false;
 				});
 
+				jQuery( document ).ajaxComplete( function( event, request, options ) {
+					if ( request && 4 === request.readyState && 200 === request.status
+						&& options.data && 0 <= options.data.indexOf( 'action=add-tag' ) ) {
+
+						var res = wpAjax.parseAjaxResponse( request.responseXML, 'ajax-response' );
+						if ( ! res || res.errors ) {
+							return;
+						}
+						// Clear Thumbnail fields on submit
+						jQuery( '#product_cat_thumbnail' ).find( 'img' ).attr( 'src', '<?php echo esc_js( wc_placeholder_img_src() ); ?>' );
+						jQuery( '#product_cat_thumbnail_id' ).val( '' );
+						jQuery( '.remove_image_button' ).hide();
+						// Clear Display type field on submit
+						jQuery( '#display_type' ).val( '' );
+						return;
+					}
+				} );
+
 			</script>
 			<div class="clear"></div>
 		</div>
@@ -228,10 +246,11 @@ class WC_Admin_Taxonomies {
 
 						// When an image is selected, run a callback.
 						file_frame.on( 'select', function() {
-							var attachment = file_frame.state().get( 'selection' ).first().toJSON();
+							var attachment           = file_frame.state().get( 'selection' ).first().toJSON();
+							var attachment_thumbnail = attachment.sizes.thumbnail || attachment.sizes.full;
 
 							jQuery( '#product_cat_thumbnail_id' ).val( attachment.id );
-							jQuery( '#product_cat_thumbnail' ).find( 'img' ).attr( 'src', attachment.sizes.thumbnail.url );
+							jQuery( '#product_cat_thumbnail' ).find( 'img' ).attr( 'src', attachment_thumbnail.url );
 							jQuery( '.remove_image_button' ).show();
 						});
 
@@ -257,6 +276,8 @@ class WC_Admin_Taxonomies {
 	 * save_category_fields function.
 	 *
 	 * @param mixed $term_id Term ID being saved
+	 * @param mixed $tt_id
+	 * @param string $taxonomy
 	 */
 	public function save_category_fields( $term_id, $tt_id = '', $taxonomy = '' ) {
 		if ( isset( $_POST['display_type'] ) && 'product_cat' === $taxonomy ) {
@@ -271,14 +292,7 @@ class WC_Admin_Taxonomies {
 	 * Description for product_cat page to aid users.
 	 */
 	public function product_cat_description() {
-		echo wpautop( __( 'Product categories for your store can be managed here. To change the order of categories on the front-end you can drag and drop to sort them. To see more categories listed click the "screen options" link at the top of the page.', 'woocommerce' ) );
-	}
-
-	/**
-	 * Description for shipping class page to aid users.
-	 */
-	public function shipping_class_description() {
-		echo wpautop( __( 'Shipping classes can be used to group products of similar type. These groups can then be used by certain shipping methods to provide different rates to different products.', 'woocommerce' ) );
+		echo wpautop( __( 'Product categories for your store can be managed here. To change the order of categories on the front-end you can drag and drop to sort them. To see more categories listed click the "screen options" link at the top-right of this page.', 'woocommerce' ) );
 	}
 
 	/**
@@ -295,11 +309,14 @@ class WC_Admin_Taxonomies {
 	 * @return array
 	 */
 	public function product_cat_columns( $columns ) {
-		$new_columns          = array();
-		$new_columns['cb']    = $columns['cb'];
-		$new_columns['thumb'] = __( 'Image', 'woocommerce' );
+		$new_columns = array();
 
-		unset( $columns['cb'] );
+		if ( isset( $columns['cb'] ) ) {
+			$new_columns['cb'] = $columns['cb'];
+			unset( $columns['cb'] );
+		}
+
+		$new_columns['thumb'] = __( 'Image', 'woocommerce' );
 
 		return array_merge( $new_columns, $columns );
 	}
@@ -307,9 +324,9 @@ class WC_Admin_Taxonomies {
 	/**
 	 * Thumbnail column value added to category admin.
 	 *
-	 * @param mixed $columns
-	 * @param mixed $column
-	 * @param mixed $id
+	 * @param string $columns
+	 * @param string $column
+	 * @param int $id
 	 * @return array
 	 */
 	public function product_cat_column( $columns, $column, $id ) {
@@ -325,7 +342,7 @@ class WC_Admin_Taxonomies {
 			}
 
 			// Prevent esc_url from breaking spaces in urls for image embeds
-			// Ref: http://core.trac.wordpress.org/ticket/23605
+			// Ref: https://core.trac.wordpress.org/ticket/23605
 			$image = str_replace( ' ', '%20', $image );
 
 			$columns .= '<img src="' . esc_url( $image ) . '" alt="' . esc_attr__( 'Thumbnail', 'woocommerce' ) . '" class="wp-post-image" height="48" width="48" />';
@@ -342,11 +359,9 @@ class WC_Admin_Taxonomies {
 	 * @return array
 	 */
 	public function disable_checked_ontop( $args ) {
-
-		if ( 'product_cat' == $args['taxonomy'] ) {
+		if ( ! empty( $args['taxonomy'] ) && 'product_cat' === $args['taxonomy'] ) {
 			$args['checked_ontop'] = false;
 		}
-
 		return $args;
 	}
 }
diff --git a/includes/admin/class-wc-admin-webhooks-table-list.php b/includes/admin/class-wc-admin-webhooks-table-list.php
index 16ccf3066c6..8a6b54e6b70 100644
--- a/includes/admin/class-wc-admin-webhooks-table-list.php
+++ b/includes/admin/class-wc-admin-webhooks-table-list.php
@@ -23,9 +23,9 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table {
 	 */
 	public function __construct() {
 		parent::__construct( array(
-			'singular' => __( 'webhook', 'woocommerce' ),
-			'plural'   => __( 'webhooks', 'woocommerce' ),
-			'ajax'     => false
+			'singular' => 'webhook',
+			'plural'   => 'webhooks',
+			'ajax'     => false,
 		) );
 	}
 
@@ -92,7 +92,7 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table {
 
 		// Get actions
 		$actions = array(
-			'id' => sprintf( __( 'ID: %d', 'woocommerce' ), $the_webhook->id )
+			'id' => sprintf( __( 'ID: %d', 'woocommerce' ), $the_webhook->id ),
 		);
 
 		if ( current_user_can( $post_type_object->cap->edit_post, $the_webhook->id ) && 'trash' !== $post_status ) {
@@ -101,12 +101,12 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table {
 
 		if ( current_user_can( $post_type_object->cap->delete_post, $the_webhook->id ) ) {
 			if ( 'trash' == $post_status ) {
-				$actions['untrash'] = '<a title="' . esc_attr__( 'Restore this item from the Trash', 'woocommerce' ) . '" href="' . wp_nonce_url( admin_url( sprintf( $post_type_object->_edit_link . '&amp;action=untrash', $the_webhook->id ) ), 'untrash-post_' . $the_webhook->id ) . '">' . __( 'Restore', 'woocommerce' ) . '</a>';
+				$actions['untrash'] = '<a aria-label="' . esc_attr__( 'Restore this item from the Trash', 'woocommerce' ) . '" href="' . wp_nonce_url( admin_url( sprintf( $post_type_object->_edit_link . '&amp;action=untrash', $the_webhook->id ) ), 'untrash-post_' . $the_webhook->id ) . '">' . esc_html__( 'Restore', 'woocommerce' ) . '</a>';
 			} elseif ( EMPTY_TRASH_DAYS ) {
-				$actions['trash'] = '<a class="submitdelete" title="' . esc_attr( __( 'Move this item to the Trash', 'woocommerce' ) ) . '" href="' . get_delete_post_link( $the_webhook->id ) . '">' . __( 'Trash', 'woocommerce' ) . '</a>';
+				$actions['trash'] = '<a class="submitdelete" aria-label="' . esc_attr__( 'Move this item to the Trash', 'woocommerce' ) . '" href="' . get_delete_post_link( $the_webhook->id ) . '">' . esc_html__( 'Trash', 'woocommerce' ) . '</a>';
 			}
 			if ( 'trash' == $post_status || ! EMPTY_TRASH_DAYS ) {
-				$actions['delete'] = '<a class="submitdelete" title="' . esc_attr( __( 'Delete this item permanently', 'woocommerce' ) ) . '" href="' . get_delete_post_link( $the_webhook->id, '', true ) . '">' . __( 'Delete Permanently', 'woocommerce' ) . '</a>';
+				$actions['delete'] = '<a class="submitdelete" aria-label="' . esc_attr__( 'Delete this item permanently', 'woocommerce' ) . '" href="' . get_delete_post_link( $the_webhook->id, '', true ) . '">' . esc_html__( 'Delete permanently', 'woocommerce' ) . '</a>';
 			}
 		}
 
@@ -117,7 +117,7 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table {
 			$row_actions[] = '<span class="' . esc_attr( $action ) . '">' . $link . '</span>';
 		}
 
-		$output .= '<div class="row-actions">' . implode(  ' | ', $row_actions ) . '</div>';
+		$output .= '<div class="row-actions">' . implode( ' | ', $row_actions ) . '</div>';
 
 		return $output;
 	}
@@ -160,6 +160,7 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table {
 	private function get_status_label( $status_name, $status ) {
 		switch ( $status_name ) {
 			case 'publish' :
+				/* translators: %s: count */
 				$label = array(
 					'singular' => __( 'Activated <span class="count">(%s)</span>', 'woocommerce' ),
 					'plural'   => __( 'Activated <span class="count">(%s)</span>', 'woocommerce' ),
@@ -168,6 +169,7 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table {
 				);
 				break;
 			case 'draft' :
+				/* translators: %s: count */
 				$label = array(
 					'singular' => __( 'Paused <span class="count">(%s)</span>', 'woocommerce' ),
 					'plural'   => __( 'Paused <span class="count">(%s)</span>', 'woocommerce' ),
@@ -176,6 +178,7 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table {
 				);
 				break;
 			case 'pending' :
+				/* translators: %s: count */
 				$label = array(
 					'singular' => __( 'Disabled <span class="count">(%s)</span>', 'woocommerce' ),
 					'plural'   => __( 'Disabled <span class="count">(%s)</span>', 'woocommerce' ),
@@ -209,6 +212,7 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table {
 		}
 
 		$class = empty( $class ) && empty( $_REQUEST['status'] ) ? ' class="current"' : '';
+		/* translators: %s: count */
 		$status_links['all'] = "<a href='admin.php?page=wc-settings&amp;tab=api&amp;section=webhooks'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_posts, 'posts', 'woocommerce' ), number_format_i18n( $total_posts ) ) . '</a>';
 
 		foreach ( get_post_stati( array( 'show_in_admin_status_list' => true ), 'objects' ) as $status ) {
@@ -244,12 +248,12 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table {
 		if ( isset( $_GET['status'] ) && 'trash' == $_GET['status'] ) {
 			return array(
 				'untrash' => __( 'Restore', 'woocommerce' ),
-				'delete'  => __( 'Delete Permanently', 'woocommerce' )
+				'delete'  => __( 'Delete permanently', 'woocommerce' ),
 			);
 		}
 
 		return array(
-			'trash' => __( 'Move to Trash', 'woocommerce' )
+			'trash' => __( 'Move to trash', 'woocommerce' ),
 		);
 	}
 
@@ -260,7 +264,7 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table {
 	 */
 	protected function extra_tablenav( $which ) {
 		if ( 'top' == $which && isset( $_GET['status'] ) && 'trash' == $_GET['status'] && current_user_can( 'delete_shop_webhooks' ) ) {
-			echo '<div class="alignleft actions"><a class="button apply" href="' . esc_url( wp_nonce_url( admin_url( 'admin.php?page=wc-settings&tab=api&section=webhooks&status=trash&empty_trash=1' ), 'empty_trash' ) ) . '">' . __( 'Empty Trash', 'woocommerce' ) . '</a></div>';
+			echo '<div class="alignleft actions"><a class="button apply" href="' . esc_url( wp_nonce_url( admin_url( 'admin.php?page=wc-settings&tab=api&section=webhooks&status=trash&empty_trash=1' ), 'empty_trash' ) ) . '">' . __( 'Empty trash', 'woocommerce' ) . '</a></div>';
 		}
 	}
 
@@ -283,7 +287,7 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table {
 			'post_type'           => 'shop_webhook',
 			'posts_per_page'      => $per_page,
 			'ignore_sticky_posts' => true,
-			'paged'               => $current_page
+			'paged'               => $current_page,
 		);
 
 		// Handle the status query
@@ -303,7 +307,7 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table {
 		$this->set_pagination_args( array(
 			'total_items' => $webhooks->found_posts,
 			'per_page'    => $per_page,
-			'total_pages' => $webhooks->max_num_pages
+			'total_pages' => $webhooks->max_num_pages,
 		) );
 	}
 }
diff --git a/includes/admin/class-wc-admin-webhooks.php b/includes/admin/class-wc-admin-webhooks.php
index 277d63b82d6..487b9bcb6ec 100644
--- a/includes/admin/class-wc-admin-webhooks.php
+++ b/includes/admin/class-wc-admin-webhooks.php
@@ -46,7 +46,10 @@ class WC_Admin_Webhooks {
 	private function update_name( $webhook_id ) {
 		global $wpdb;
 
+		// @codingStandardsIgnoreStart
+		/* translators: %s: date` */
 		$name = ! empty( $_POST['webhook_name'] ) ? $_POST['webhook_name'] : sprintf( __( 'Webhook created on %s', 'woocommerce' ), strftime( _x( '%b %d, %Y @ %I:%M %p', 'Webhook created on date parsed by strftime', 'woocommerce' ) ) );
+		// @codingStandardsIgnoreEnd
 		$wpdb->update( $wpdb->posts, array( 'post_title' => $name ), array( 'ID' => $webhook_id ) );
 	}
 
@@ -80,7 +83,7 @@ class WC_Admin_Webhooks {
 	 * @param WC_Webhook $webhook
 	 */
 	private function update_secret( $webhook ) {
-		$secret = ! empty( $_POST['webhook_secret'] ) ? $_POST['webhook_secret'] : get_user_meta( get_current_user_id(), 'woocommerce_api_consumer_secret', true );
+		$secret = ! empty( $_POST['webhook_secret'] ) ? $_POST['webhook_secret'] : wp_generate_password( 50, true, true );
 
 		$webhook->set_secret( $secret );
 	}
@@ -120,6 +123,17 @@ class WC_Admin_Webhooks {
 		}
 	}
 
+	/**
+	 * Update webhook api version.
+	 *
+	 * @param WC_Webhook $webhook Webhook instance.
+	 */
+	private function update_api_version( $webhook ) {
+		$version = ! empty( $_POST['webhook_api_version'] ) ? wc_clean( $_POST['webhook_api_version'] ) : 'wp_api_v2';
+
+		$webhook->set_api_version( $version );
+	}
+
 	/**
 	 * Save method.
 	 */
@@ -151,6 +165,12 @@ class WC_Admin_Webhooks {
 		// Topic
 		$this->update_topic( $webhook );
 
+		// API version.
+		$this->update_api_version( $webhook );
+
+		// Update date.
+		wp_update_post( array( 'ID' => $webhook->id, 'post_modified' => current_time( 'mysql' ) ) );
+
 		// Run actions
 		do_action( 'woocommerce_webhook_options_save', $webhook->id );
 
@@ -183,7 +203,7 @@ class WC_Admin_Webhooks {
 		}
 
 		if ( ! current_user_can( 'publish_shop_webhooks' ) ) {
-			wp_die( __( 'You don\'t have permissions to create Webhooks!', 'woocommerce' ) );
+			wp_die( __( 'You do not have permissions to create Webhooks!', 'woocommerce' ) );
 		}
 
 		$webhook_id = wp_insert_post( array(
@@ -192,8 +212,11 @@ class WC_Admin_Webhooks {
 			'ping_status'   => 'closed',
 			'post_author'   => get_current_user_id(),
 			'post_password' => strlen( ( $password = uniqid( 'webhook_' ) ) ) > 20 ? substr( $password, 0, 20 ) : $password,
+			// @codingStandardsIgnoreStart
+			/* translators: %s: date */
 			'post_title'    => sprintf( __( 'Webhook created on %s', 'woocommerce' ), strftime( _x( '%b %d, %Y @ %I:%M %p', 'Webhook created on date parsed by strftime', 'woocommerce' ) ) ),
-			'comment_status' => 'open'
+			// @codingStandardsIgnoreEnd
+			'comment_status' => 'open',
 		) );
 
 		if ( is_wp_error( $webhook_id ) ) {
@@ -201,6 +224,8 @@ class WC_Admin_Webhooks {
 		}
 
 		update_post_meta( $webhook_id, '_webhook_pending_delivery', true );
+		$webhook = new WC_Webhook( $webhook_id );
+		$webhook->set_api_version( 'wp_api_v2' );
 
 		delete_transient( 'woocommerce_webhook_ids' );
 
@@ -263,7 +288,7 @@ class WC_Admin_Webhooks {
 		}
 
 		if ( ! current_user_can( 'edit_shop_webhooks' ) ) {
-			wp_die( __( 'You don\'t have permissions to edit Webhooks!', 'woocommerce' ) );
+			wp_die( __( 'You do not have permissions to edit Webhooks!', 'woocommerce' ) );
 		}
 
 		$webhooks = array_map( 'absint', (array) $_GET['webhook'] );
@@ -292,7 +317,7 @@ class WC_Admin_Webhooks {
 		}
 
 		if ( ! current_user_can( 'delete_shop_webhooks' ) ) {
-			wp_die( __( 'You don\'t have permissions to delete Webhooks!', 'woocommerce' ) );
+			wp_die( __( 'You do not have permissions to delete Webhooks!', 'woocommerce' ) );
 		}
 
 		$webhooks = get_posts( array(
@@ -300,7 +325,7 @@ class WC_Admin_Webhooks {
 			'ignore_sticky_posts' => true,
 			'nopaging'            => true,
 			'post_status'         => 'trash',
-			'fields'              => 'ids'
+			'fields'              => 'ids',
 		) );
 
 		foreach ( $webhooks as $webhook_id ) {
@@ -368,19 +393,22 @@ class WC_Admin_Webhooks {
 		if ( isset( $_GET['trashed'] ) ) {
 			$trashed = absint( $_GET['trashed'] );
 
-			WC_Admin_Settings::add_message( sprintf( _n( '1 webhook moved to the Trash.', '%d webhooks moved to the Trash.', $trashed, 'woocommerce' ), $trashed ) );
+			/* translators: %d: count */
+			WC_Admin_Settings::add_message( sprintf( _n( '%d webhook moved to the Trash.', '%d webhooks moved to the Trash.', $trashed, 'woocommerce' ), $trashed ) );
 		}
 
 		if ( isset( $_GET['untrashed'] ) ) {
 			$untrashed = absint( $_GET['untrashed'] );
 
-			WC_Admin_Settings::add_message( sprintf( _n( '1 webhook restored from the Trash.', '%d webhooks restored from the Trash.', $untrashed, 'woocommerce' ), $untrashed ) );
+			/* translators: %d: count */
+			WC_Admin_Settings::add_message( sprintf( _n( '%d webhook restored from the Trash.', '%d webhooks restored from the Trash.', $untrashed, 'woocommerce' ), $untrashed ) );
 		}
 
 		if ( isset( $_GET['deleted'] ) ) {
 			$deleted = absint( $_GET['deleted'] );
 
-			WC_Admin_Settings::add_message( sprintf( _n( '1 webhook permanently deleted.', '%d webhooks permanently deleted.', $deleted, 'woocommerce' ), $deleted ) );
+			/* translators: %d: count */
+			WC_Admin_Settings::add_message( sprintf( _n( '%d webhook permanently deleted.', '%d webhooks permanently deleted.', $deleted, 'woocommerce' ), $deleted ) );
 		}
 
 		if ( isset( $_GET['updated'] ) ) {
@@ -400,18 +428,33 @@ class WC_Admin_Webhooks {
 	 * Table list output.
 	 */
 	private static function table_list_output() {
-		echo '<h3>' . __( 'Webhooks', 'woocommerce' ) . ' <a href="' . esc_url( wp_nonce_url( admin_url( 'admin.php?page=wc-settings&tab=api&section=webhooks&create-webhook=1' ), 'create-webhook' ) ) . '" class="add-new-h2">' . __( 'Add Webhook', 'woocommerce' ) . '</a></h3>';
 
-		$webhooks_table_list = new WC_Admin_Webhooks_Table_List();
-		$webhooks_table_list->prepare_items();
+		global $wpdb;
 
-		echo '<input type="hidden" name="page" value="wc-settings" />';
-		echo '<input type="hidden" name="tab" value="api" />';
-		echo '<input type="hidden" name="section" value="webhooks" />';
+		echo '<h2>' . __( 'Webhooks', 'woocommerce' ) . ' <a href="' . esc_url( wp_nonce_url( admin_url( 'admin.php?page=wc-settings&tab=api&section=webhooks&create-webhook=1' ), 'create-webhook' ) ) . '" class="add-new-h2">' . __( 'Add webhook', 'woocommerce' ) . '</a></h2>';
 
-		$webhooks_table_list->views();
-		$webhooks_table_list->search_box( __( 'Search Webhooks', 'woocommerce' ), 'webhook' );
-		$webhooks_table_list->display();
+		// Get the webhooks count
+		$count = array_sum( (array) wp_count_posts( 'shop_webhook', 'readable' ) );
+
+		if ( absint( $count ) && $count > 0 ) {
+			$webhooks_table_list = new WC_Admin_Webhooks_Table_List();
+			$webhooks_table_list->prepare_items();
+
+			echo '<input type="hidden" name="page" value="wc-settings" />';
+			echo '<input type="hidden" name="tab" value="api" />';
+			echo '<input type="hidden" name="section" value="webhooks" />';
+
+			$webhooks_table_list->views();
+			$webhooks_table_list->search_box( __( 'Search webhooks', 'woocommerce' ), 'webhook' );
+			$webhooks_table_list->display();
+		} else {
+			echo '<div class="woocommerce-BlankState woocommerce-BlankState--webhooks">';
+			?>
+			<h2 class="woocommerce-BlankState-message"><?php _e( 'Webhooks are event notifications sent to URLs of your choice. They can be used to integrate with third-party services which support them.', 'woocommerce' ); ?></h2>
+			<a class="woocommerce-BlankState-cta button-primary button" href="<?php echo esc_url( wp_nonce_url( admin_url( 'admin.php?page=wc-settings&tab=api&section=webhooks&create-webhook=1' ), 'create-webhook' ) ); ?>"><?php _e( 'Create a new webhook', 'woocommerce' ); ?></a>
+
+			<?php echo '<style type="text/css">#posts-filter .wp-list-table, #posts-filter .tablenav.top, .tablenav.bottom .actions  { display: none; } </style></div>';
+		}
 	}
 
 	/**
@@ -425,7 +468,7 @@ class WC_Admin_Webhooks {
 			'post_id' => $webhook->id,
 			'status'  => 'approve',
 			'type'    => 'webhook_delivery',
-			'number'  => 10
+			'number'  => 10,
 		);
 
 		if ( 1 < $current ) {
@@ -439,7 +482,7 @@ class WC_Admin_Webhooks {
 		add_filter( 'comments_clauses', array( 'WC_Comments', 'exclude_webhook_comments' ), 10, 1 );
 
 		if ( $logs ) {
-			include_once( 'settings/views/html-webhook-logs.php' );
+			include_once( dirname( __FILE__ ) . '/settings/views/html-webhook-logs.php' );
 		} else {
 			echo '<p>' . __( 'This Webhook has no log yet.', 'woocommerce' ) . '</p>';
 		}
@@ -460,7 +503,7 @@ class WC_Admin_Webhooks {
 
 			if ( 'action' === $resource ) {
 				$topic = 'action';
-			} else if ( ! in_array( $resource, array( 'coupon', 'customer', 'order', 'product' ) ) ) {
+			} elseif ( ! in_array( $resource, array( 'coupon', 'customer', 'order', 'product' ) ) ) {
 				$topic = 'custom';
 			}
 		}
@@ -468,7 +511,7 @@ class WC_Admin_Webhooks {
 		return array(
 			'topic'    => $topic,
 			'event'    => $event,
-			'resource' => $resource
+			'resource' => $resource,
 		);
 	}
 
@@ -486,7 +529,13 @@ class WC_Admin_Webhooks {
 		$html = '<div class="webhook-logs-navigation">';
 
 			$html .= '<p class="info" style="float: left;"><strong>';
-			$html .= sprintf( '%s &ndash; Page %d of %d', _n( '1 item', sprintf( '%d items', $total ), $total, 'woocommerce' ), $current, $pages );
+			/* translators: 1: items count (i.e. 8 items) 2: current page 3: total pages */
+			$html .= sprintf(
+				__( '%1$s &ndash; Page %2$d of %3$d', 'woocommerce' ),
+				sprintf( _n( '%d item', '%d items', $total, 'woocommerce' ), $total ),
+				$current,
+				$pages
+			);
 			$html .= '</strong></p>';
 
 			if ( 1 < $pages ) {
diff --git a/includes/admin/class-wc-admin.php b/includes/admin/class-wc-admin.php
index 61599dc2dd0..0a73b97efb9 100644
--- a/includes/admin/class-wc-admin.php
+++ b/includes/admin/class-wc-admin.php
@@ -2,11 +2,11 @@
 /**
  * WooCommerce Admin
  *
- * @class       WC_Admin
- * @author      WooThemes
- * @category    Admin
- * @package     WooCommerce/Admin
- * @version     2.3
+ * @class    WC_Admin
+ * @author   WooThemes
+ * @category Admin
+ * @package  WooCommerce/Admin
+ * @version  2.6.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -24,6 +24,7 @@ class WC_Admin {
 	public function __construct() {
 		add_action( 'init', array( $this, 'includes' ) );
 		add_action( 'current_screen', array( $this, 'conditional_includes' ) );
+		add_action( 'admin_init', array( $this, 'buffer' ), 1 );
 		add_action( 'admin_init', array( $this, 'preview_emails' ) );
 		add_action( 'admin_init', array( $this, 'prevent_admin_access' ) );
 		add_action( 'admin_init', array( $this, 'admin_redirects' ) );
@@ -31,38 +32,46 @@ class WC_Admin {
 		add_filter( 'admin_footer_text', array( $this, 'admin_footer_text' ), 1 );
 	}
 
+	/**
+	 * Output buffering allows admin screens to make redirects later on.
+	 */
+	public function buffer() {
+		ob_start();
+	}
+
 	/**
 	 * Include any classes we need within admin.
 	 */
 	public function includes() {
-		include_once( 'wc-admin-functions.php' );
-		include_once( 'wc-meta-box-functions.php' );
-		include_once( 'class-wc-admin-post-types.php' );
-		include_once( 'class-wc-admin-taxonomies.php' );
-		include_once( 'class-wc-admin-menus.php' );
-		include_once( 'class-wc-admin-notices.php' );
-		include_once( 'class-wc-admin-assets.php' );
-		include_once( 'class-wc-admin-api-keys.php' );
-		include_once( 'class-wc-admin-webhooks.php' );
-		include_once( 'class-wc-admin-pointers.php' );
+		include_once( dirname( __FILE__ ) . '/wc-admin-functions.php' );
+		include_once( dirname( __FILE__ ) . '/wc-meta-box-functions.php' );
+		include_once( dirname( __FILE__ ) . '/class-wc-admin-post-types.php' );
+		include_once( dirname( __FILE__ ) . '/class-wc-admin-taxonomies.php' );
+		include_once( dirname( __FILE__ ) . '/class-wc-admin-menus.php' );
+		include_once( dirname( __FILE__ ) . '/class-wc-admin-customize.php' );
+		include_once( dirname( __FILE__ ) . '/class-wc-admin-notices.php' );
+		include_once( dirname( __FILE__ ) . '/class-wc-admin-assets.php' );
+		include_once( dirname( __FILE__ ) . '/class-wc-admin-api-keys.php' );
+		include_once( dirname( __FILE__ ) . '/class-wc-admin-webhooks.php' );
+		include_once( dirname( __FILE__ ) . '/class-wc-admin-pointers.php' );
 
 		// Help Tabs
 		if ( apply_filters( 'woocommerce_enable_admin_help_tab', true ) ) {
-			include_once( 'class-wc-admin-help.php' );
+			include_once( dirname( __FILE__ ) . '/class-wc-admin-help.php' );
 		}
 
 		// Setup/welcome
 		if ( ! empty( $_GET['page'] ) ) {
 			switch ( $_GET['page'] ) {
 				case 'wc-setup' :
-					include_once( 'class-wc-admin-setup-wizard.php' );
+					include_once( dirname( __FILE__ ) . '/class-wc-admin-setup-wizard.php' );
 				break;
 			}
 		}
 
 		// Importers
 		if ( defined( 'WP_LOAD_IMPORTERS' ) ) {
-			include_once( 'class-wc-admin-importers.php' );
+			include_once( dirname( __FILE__ ) . '/class-wc-admin-importers.php' );
 		}
 	}
 
@@ -70,7 +79,9 @@ class WC_Admin {
 	 * Include admin files conditionally.
 	 */
 	public function conditional_includes() {
-		$screen = get_current_screen();
+		if ( ! $screen = get_current_screen() ) {
+			return;
+		}
 
 		switch ( $screen->id ) {
 			case 'dashboard' :
@@ -91,24 +102,38 @@ class WC_Admin {
 	/**
 	 * Handle redirects to setup/welcome page after install and updates.
 	 *
-	 * Transient must be present, the user must have access rights, and we must ignore the network/bulk plugin updaters.
+	 * For setup wizard, transient must be present, the user must have access rights, and we must ignore the network/bulk plugin updaters.
 	 */
 	public function admin_redirects() {
-		if ( ! get_transient( '_wc_activation_redirect' ) ) {
-			return;
-		}
+		// Nonced plugin install redirects (whitelisted)
+		if ( ! empty( $_GET['wc-install-plugin-redirect'] ) ) {
+			$plugin_slug = wc_clean( $_GET['wc-install-plugin-redirect'] );
 
-		delete_transient( '_wc_activation_redirect' );
+			if ( current_user_can( 'install_plugins' ) && in_array( $plugin_slug, array( 'woocommerce-gateway-stripe' ) ) ) {
+				$nonce = wp_create_nonce( 'install-plugin_' . $plugin_slug );
+				$url   = self_admin_url( 'update.php?action=install-plugin&plugin=' . $plugin_slug . '&_wpnonce=' . $nonce );
+			} else {
+				$url = admin_url( 'plugin-install.php?tab=search&type=term&s=' . $plugin_slug );
+			}
 
-		if ( ( ! empty( $_GET['page'] ) && in_array( $_GET['page'], array( 'wc-setup' ) ) ) || is_network_admin() || isset( $_GET['activate-multi'] ) || ! current_user_can( 'manage_woocommerce' ) || apply_filters( 'woocommerce_prevent_automatic_wizard_redirect', false ) ) {
-			return;
-		}
-
-		// If the user needs to install, send them to the setup wizard
-		if ( WC_Admin_Notices::has_notice( 'install' ) ) {
-			wp_safe_redirect( admin_url( 'index.php?page=wc-setup' ) );
+			wp_safe_redirect( $url );
 			exit;
 		}
+
+		// Setup wizard redirect
+		if ( get_transient( '_wc_activation_redirect' ) ) {
+			delete_transient( '_wc_activation_redirect' );
+
+			if ( ( ! empty( $_GET['page'] ) && in_array( $_GET['page'], array( 'wc-setup' ) ) ) || is_network_admin() || isset( $_GET['activate-multi'] ) || ! current_user_can( 'manage_woocommerce' ) || apply_filters( 'woocommerce_prevent_automatic_wizard_redirect', false ) ) {
+				return;
+			}
+
+			// If the user needs to install, send them to the setup wizard
+			if ( WC_Admin_Notices::has_notice( 'install' ) ) {
+				wp_safe_redirect( admin_url( 'index.php?page=wc-setup' ) );
+				exit;
+			}
+		}
 	}
 
 	/**
@@ -117,13 +142,23 @@ class WC_Admin {
 	public function prevent_admin_access() {
 		$prevent_access = false;
 
-		if ( 'yes' === get_option( 'woocommerce_lock_down_admin', 'yes' ) && ! is_ajax() && basename( $_SERVER["SCRIPT_FILENAME"] ) !== 'admin-post.php' && ! current_user_can( 'edit_posts' ) && ! current_user_can( 'manage_woocommerce' ) ) {
-			$prevent_access = true;
+		if ( 'yes' === get_option( 'woocommerce_lock_down_admin', 'yes' ) && ! is_ajax() && basename( $_SERVER["SCRIPT_FILENAME"] ) !== 'admin-post.php' ) {
+			$has_cap     = false;
+			$access_caps = array( 'edit_posts', 'manage_woocommerce', 'view_admin_dashboard' );
+
+			foreach ( $access_caps as $access_cap ) {
+				if ( current_user_can( $access_cap ) ) {
+					$has_cap = true;
+					break;
+				}
+			}
+
+			if ( ! $has_cap ) {
+				$prevent_access = true;
+			}
 		}
 
-		$prevent_access = apply_filters( 'woocommerce_prevent_admin_access', $prevent_access );
-
-		if ( $prevent_access ) {
+		if ( apply_filters( 'woocommerce_prevent_admin_access', $prevent_access ) ) {
 			wp_safe_redirect( wc_get_page_permalink( 'myaccount' ) );
 			exit;
 		}
@@ -137,7 +172,7 @@ class WC_Admin {
 	public function preview_emails() {
 
 		if ( isset( $_GET['preview_woocommerce_mail'] ) ) {
-			if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'preview-mail') ) {
+			if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'preview-mail' ) ) {
 				die( 'Security check' );
 			}
 
@@ -145,7 +180,7 @@ class WC_Admin {
 			$mailer        = WC()->mailer();
 
 			// get the preview email subject
-			$email_heading = __( 'HTML Email Template', 'woocommerce' );
+			$email_heading = __( 'HTML email template', 'woocommerce' );
 
 			// get the preview email content
 			ob_start();
@@ -156,7 +191,7 @@ class WC_Admin {
 			$email         = new WC_Email();
 
 			// wrap the content with the email template and then add styles
-			$message       = $email->style_inline( $mailer->wrap_message( $email_heading, $message ) );
+			$message       = apply_filters( 'woocommerce_mail_content', $email->style_inline( $mailer->wrap_message( $email_heading, $message ) ) );
 
 			// print the preview email
 			echo $message;
@@ -172,27 +207,21 @@ class WC_Admin {
 	 * @return string
 	 */
 	public function admin_footer_text( $footer_text ) {
-		if ( ! current_user_can( 'manage_woocommerce' ) ) {
-			return;
+		if ( ! current_user_can( 'manage_woocommerce' ) || ! function_exists( 'wc_get_screen_ids' ) ) {
+			return $footer_text;
 		}
 		$current_screen = get_current_screen();
 		$wc_pages       = wc_get_screen_ids();
 
-		// Set only wc pages
-		$wc_pages = array_flip( $wc_pages );
-		if ( isset( $wc_pages['profile'] ) ) {
-			unset( $wc_pages['profile'] );
-		}
-		if ( isset( $wc_pages['user-edit'] ) ) {
-			unset( $wc_pages['user-edit'] );
-		}
-		$wc_pages = array_flip( $wc_pages );
+		// Set only WC pages.
+		$wc_pages = array_diff( $wc_pages, array( 'profile', 'user-edit' ) );
 
-		// Check to make sure we're on a WooCommerce admin page
+		// Check to make sure we're on a WooCommerce admin page.
 		if ( isset( $current_screen->id ) && apply_filters( 'woocommerce_display_admin_footer_text', in_array( $current_screen->id, $wc_pages ) ) ) {
 			// Change the footer text
 			if ( ! get_option( 'woocommerce_admin_footer_text_rated' ) ) {
-				$footer_text = sprintf( __( 'If you like <strong>WooCommerce</strong> please leave us a %s&#9733;&#9733;&#9733;&#9733;&#9733;%s rating. A huge thank you from WooThemes in advance!', 'woocommerce' ), '<a href="https://wordpress.org/support/view/plugin-reviews/woocommerce?filter=5#postform" target="_blank" class="wc-rating-link" data-rated="' . esc_attr__( 'Thanks :)', 'woocommerce' ) . '">', '</a>' );
+				/* translators: %s: five stars */
+				$footer_text = sprintf( __( 'If you like <strong>WooCommerce</strong> please leave us a %s rating. A huge thanks in advance!', 'woocommerce' ), '<a href="https://wordpress.org/support/plugin/woocommerce/reviews?rate=5#new-post" target="_blank" class="wc-rating-link" data-rated="' . esc_attr__( 'Thanks :)', 'woocommerce' ) . '">&#9733;&#9733;&#9733;&#9733;&#9733;</a>' );
 				wc_enqueue_js( "
 					jQuery( 'a.wc-rating-link' ).click( function() {
 						jQuery.post( '" . WC()->ajax_url() . "', { action: 'woocommerce_rated' } );
@@ -206,7 +235,6 @@ class WC_Admin {
 
 		return $footer_text;
 	}
-
 }
 
 return new WC_Admin();
diff --git a/includes/admin/importers/class-wc-tax-rate-importer.php b/includes/admin/importers/class-wc-tax-rate-importer.php
index c5655084d9a..61fdacbc704 100644
--- a/includes/admin/importers/class-wc-tax-rate-importer.php
+++ b/includes/admin/importers/class-wc-tax-rate-importer.php
@@ -17,9 +17,32 @@ if ( ! class_exists( 'WP_Importer' ) ) {
  */
 class WC_Tax_Rate_Importer extends WP_Importer {
 
+	/**
+	 * The current file id.
+	 *
+	 * @var int
+	 */
 	public $id;
+
+	/**
+	 * The current file url.
+	 *
+	 * @var string
+	 */
 	public $file_url;
+
+	/**
+	 * The current import page.
+	 *
+	 * @var string
+	 */
 	public $import_page;
+
+	/**
+	 * The current delimiter.
+	 *
+	 * @var string
+	 */
 	public $delimiter;
 
 	/**
@@ -27,7 +50,7 @@ class WC_Tax_Rate_Importer extends WP_Importer {
 	 */
 	public function __construct() {
 		$this->import_page = 'woocommerce_tax_rate_csv';
-		$this->delimiter   = empty( $_POST['delimiter'] ) ? ',' : wc_clean( $_POST['delimiter'] );
+		$this->delimiter   = empty( $_POST['delimiter'] ) ? ',' : (string) wc_clean( $_POST['delimiter'] );
 	}
 
 	/**
@@ -75,27 +98,25 @@ class WC_Tax_Rate_Importer extends WP_Importer {
 		if ( function_exists( 'gc_enable' ) ) {
 			gc_enable();
 		}
-		if ( function_exists( 'set_time_limit' ) && false === strpos( ini_get( 'disable_functions' ), 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-			@set_time_limit( 0 );
-		}
+		wc_set_time_limit( 0 );
 		@ob_flush();
 		@flush();
 		@ini_set( 'auto_detect_line_endings', '1' );
 	}
 
 	/**
-	 * format_data_from_csv function.
+	 * UTF-8 encode the data if `$enc` value isn't UTF-8.
 	 *
 	 * @param mixed $data
 	 * @param string $enc
 	 * @return string
 	 */
 	public function format_data_from_csv( $data, $enc ) {
-		return ( $enc == 'UTF-8' ) ? $data : utf8_encode( $data );
+		return ( 'UTF-8' === $enc ) ? $data : utf8_encode( $data );
 	}
 
 	/**
-	 * import function.
+	 * Import the file if it exists and is valid.
 	 *
 	 * @param mixed $file
 	 */
@@ -127,14 +148,13 @@ class WC_Tax_Rate_Importer extends WP_Importer {
 						'tax_rate_compound' => $compound ? 1 : 0,
 						'tax_rate_shipping' => $shipping ? 1 : 0,
 						'tax_rate_order'    => $loop ++,
-						'tax_rate_class'    => $class
+						'tax_rate_class'    => $class,
 					);
 
 					$tax_rate_id = WC_Tax::_insert_tax_rate( $tax_rate );
 					WC_Tax::_update_tax_rate_postcodes( $tax_rate_id, wc_clean( $postcode ) );
 					WC_Tax::_update_tax_rate_cities( $tax_rate_id, wc_clean( $city ) );
 				}
-
 			} else {
 				$this->import_error( __( 'The CSV is invalid.', 'woocommerce' ) );
 			}
@@ -143,9 +163,13 @@ class WC_Tax_Rate_Importer extends WP_Importer {
 		}
 
 		// Show Result
-		echo '<div class="updated settings-error below-h2"><p>
-			' . sprintf( __( 'Import complete - imported <strong>%s</strong> tax rates.', 'woocommerce' ), $loop ) . '
-		</p></div>';
+		echo '<div class="updated settings-error"><p>';
+		/* translators: %s: tax rates count */
+		printf(
+			__( 'Import complete - imported %s tax rates.', 'woocommerce' ),
+			'<strong>' . $loop . '</strong>'
+		);
+		echo '</p></div>';
 
 		$this->import_end();
 	}
@@ -154,7 +178,7 @@ class WC_Tax_Rate_Importer extends WP_Importer {
 	 * Performs post-import cleanup of files and the cache.
 	 */
 	public function import_end() {
-		echo '<p>' . __( 'All done!', 'woocommerce' ) . ' <a href="' . admin_url('admin.php?page=wc-settings&tab=tax') . '">' . __( 'View Tax Rates', 'woocommerce' ) . '</a>' . '</p>';
+		echo '<p>' . __( 'All done!', 'woocommerce' ) . ' <a href="' . admin_url( 'admin.php?page=wc-settings&tab=tax' ) . '">' . __( 'View tax rates', 'woocommerce' ) . '</a>' . '</p>';
 
 		do_action( 'import_end' );
 	}
@@ -186,27 +210,27 @@ class WC_Tax_Rate_Importer extends WP_Importer {
 	}
 
 	/**
-	 * header function.
+	 * Output header html.
 	 */
 	public function header() {
-		echo '<div class="wrap"><div class="icon32 icon32-woocommerce-importer" id="icon-woocommerce"><br></div>';
-		echo '<h1>' . __( 'Import Tax Rates', 'woocommerce' ) . '</h1>';
+		echo '<div class="wrap">';
+		echo '<h1>' . __( 'Import tax rates', 'woocommerce' ) . '</h1>';
 	}
 
 	/**
-	 * footer function.
+	 * Output footer html.
 	 */
 	public function footer() {
 		echo '</div>';
 	}
 
 	/**
-	 * greet function.
+	 * Output information about the uploading process.
 	 */
 	public function greet() {
 
 		echo '<div class="narrow">';
-		echo '<p>' . __( 'Hi there! Upload a CSV file containing tax rates to import the contents into your shop. Choose a .csv file to upload, then click "Upload file and import".', 'woocommerce' ).'</p>';
+		echo '<p>' . __( 'Hi there! Upload a CSV file containing tax rates to import the contents into your shop. Choose a .csv file to upload, then click "Upload file and import".', 'woocommerce' ) . '</p>';
 
 		echo '<p>' . sprintf( __( 'Tax rates need to be defined with columns in a specific order (10 columns). <a href="%s">Click here to download a sample</a>.', 'woocommerce' ), WC()->plugin_url() . '/dummy-data/sample_tax_rates.csv' ) . '</p>';
 
@@ -220,7 +244,7 @@ class WC_Tax_Rate_Importer extends WP_Importer {
 			<p><strong><?php echo $upload_dir['error']; ?></strong></p></div><?php
 		else :
 			?>
-			<form enctype="multipart/form-data" id="import-upload-form" method="post" action="<?php echo esc_attr(wp_nonce_url($action, 'import-upload')); ?>">
+			<form enctype="multipart/form-data" id="import-upload-form" method="post" action="<?php echo esc_attr( wp_nonce_url( $action, 'import-upload' ) ); ?>">
 				<table class="form-table">
 					<tbody>
 						<tr>
@@ -231,7 +255,13 @@ class WC_Tax_Rate_Importer extends WP_Importer {
 								<input type="file" id="upload" name="import" size="25" />
 								<input type="hidden" name="action" value="save" />
 								<input type="hidden" name="max_file_size" value="<?php echo $bytes; ?>" />
-								<small><?php printf( __('Maximum size: %s', 'woocommerce' ), $size ); ?></small>
+								<small><?php
+									/* translators: %s: maximum upload size */
+									printf(
+										__( 'Maximum size: %s', 'woocommerce' ),
+										$size
+									);
+								?></small>
 							</td>
 						</tr>
 						<tr>
diff --git a/includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php b/includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php
index dd4b3527d78..57565681cba 100644
--- a/includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php
+++ b/includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php
@@ -21,9 +21,13 @@ class WC_Meta_Box_Coupon_Data {
 
 	/**
 	 * Output the metabox.
+	 *
+	 * @param WP_Post $post
 	 */
 	public static function output( $post ) {
 		wp_nonce_field( 'woocommerce_save_data', 'woocommerce_meta_nonce' );
+
+		$coupon = new WC_Coupon( $post->ID );
 		?>
 		<style type="text/css">
 			#edit-slug-box, #minor-publishing-actions { display:none }
@@ -41,20 +45,20 @@ class WC_Meta_Box_Coupon_Data {
 							'class'  => 'general_coupon_data',
 						),
 						'usage_restriction' => array(
-							'label'  => __( 'Usage Restriction', 'woocommerce' ),
+							'label'  => __( 'Usage restriction', 'woocommerce' ),
 							'target' => 'usage_restriction_coupon_data',
 							'class'  => '',
 						),
 						'usage_limit' => array(
-							'label'  => __( 'Usage Limits', 'woocommerce' ),
+							'label'  => __( 'Usage limits', 'woocommerce' ),
 							'target' => 'usage_limit_coupon_data',
 							'class'  => '',
-						)
+						),
 					) );
 
 					foreach ( $coupon_data_tabs as $key => $tab ) {
 						?><li class="<?php echo $key; ?>_options <?php echo $key; ?>_tab <?php echo implode( ' ' , (array) $tab['class'] ); ?>">
-							<a href="#<?php echo $tab['target']; ?>"><?php echo esc_html( $tab['label'] ); ?></a>
+							<a href="#<?php echo $tab['target']; ?>"><span><?php echo esc_html( $tab['label'] ); ?></span></a>
 						</li><?php
 					}
 				?>
@@ -62,18 +66,46 @@ class WC_Meta_Box_Coupon_Data {
 			<div id="general_coupon_data" class="panel woocommerce_options_panel"><?php
 
 				// Type
-				woocommerce_wp_select( array( 'id' => 'discount_type', 'label' => __( 'Discount type', 'woocommerce' ), 'options' => wc_get_coupon_types() ) );
+				woocommerce_wp_select( array(
+					'id'      => 'discount_type',
+					'label'   => __( 'Discount type', 'woocommerce' ),
+					'options' => wc_get_coupon_types(),
+				) );
 
 				// Amount
-				woocommerce_wp_text_input( array( 'id' => 'coupon_amount', 'label' => __( 'Coupon amount', 'woocommerce' ), 'placeholder' => wc_format_localized_price( 0 ), 'description' => __( 'Value of the coupon.', 'woocommerce' ), 'data_type' => 'price', 'desc_tip' => true ) );
+				woocommerce_wp_text_input( array(
+					'id'          => 'coupon_amount',
+					'label'       => __( 'Coupon amount', 'woocommerce' ),
+					'placeholder' => wc_format_localized_price( 0 ),
+					'description' => __( 'Value of the coupon.', 'woocommerce' ),
+					'data_type'   => 'price',
+					'desc_tip'    => true,
+				) );
 
 				// Free Shipping
-				woocommerce_wp_checkbox( array( 'id' => 'free_shipping', 'label' => __( 'Allow free shipping', 'woocommerce' ), 'description' => sprintf( __( 'Check this box if the coupon grants free shipping. The <a href="%s">free shipping method</a> must be enabled and be set to require "a valid free shipping coupon" (see the "Free Shipping Requires" setting).', 'woocommerce' ), admin_url('admin.php?page=wc-settings&tab=shipping&section=WC_Shipping_Free_Shipping')) ) );
+				if ( wc_shipping_enabled() ) {
+					woocommerce_wp_checkbox( array(
+						'id'          => 'free_shipping',
+						'label'       => __( 'Allow free shipping', 'woocommerce' ),
+						'description' => sprintf( __( 'Check this box if the coupon grants free shipping. A <a href="%s" target="_blank">free shipping method</a> must be enabled in your shipping zone and be set to require "a valid free shipping coupon" (see the "Free Shipping Requires" setting).', 'woocommerce' ), 'https://docs.woocommerce.com/document/free-shipping/' ),
+					) );
+				}
 
 				// Expiry date
-				woocommerce_wp_text_input( array( 'id' => 'expiry_date', 'label' => __( 'Coupon expiry date', 'woocommerce' ), 'placeholder' => _x( 'YYYY-MM-DD', 'placeholder', 'woocommerce' ), 'description' => '', 'class' => 'date-picker', 'custom_attributes' => array( 'pattern' => "[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|1[0-9]|2[0-9]|3[01])" ) ) );
+				$expiry_date = $coupon->get_date_expires() ? $coupon->get_date_expires()->date( 'Y-m-d' ) : '';
+				woocommerce_wp_text_input( array(
+					'id'                => 'expiry_date',
+					'value'             => esc_attr( $expiry_date ),
+					'label'             => __( 'Coupon expiry date', 'woocommerce' ),
+					'placeholder'       => 'YYYY-MM-DD',
+					'description'       => '',
+					'class'             => 'date-picker',
+					'custom_attributes' => array(
+						'pattern' => apply_filters( 'woocommerce_date_input_html_pattern', '[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|1[0-9]|2[0-9]|3[01])' ),
+					),
+				) );
 
-				do_action( 'woocommerce_coupon_options' );
+				do_action( 'woocommerce_coupon_options', $coupon->get_id(), $coupon );
 
 			?></div>
 			<div id="usage_restriction_coupon_data" class="panel woocommerce_options_panel"><?php
@@ -81,53 +113,73 @@ class WC_Meta_Box_Coupon_Data {
 				echo '<div class="options_group">';
 
 				// minimum spend
-				woocommerce_wp_text_input( array( 'id' => 'minimum_amount', 'label' => __( 'Minimum spend', 'woocommerce' ), 'placeholder' => __( 'No minimum', 'woocommerce' ), 'description' => __( 'This field allows you to set the minimum spend (subtotal, including taxes) allowed to use the coupon.', 'woocommerce' ), 'data_type' => 'price', 'desc_tip' => true ) );
+				woocommerce_wp_text_input( array(
+					'id'          => 'minimum_amount',
+					'label'       => __( 'Minimum spend', 'woocommerce' ),
+					'placeholder' => __( 'No minimum', 'woocommerce' ),
+					'description' => __( 'This field allows you to set the minimum spend (subtotal, including taxes) allowed to use the coupon.', 'woocommerce' ),
+					'data_type'   => 'price',
+					'desc_tip'    => true,
+				) );
 
 				// maximum spend
-				woocommerce_wp_text_input( array( 'id' => 'maximum_amount', 'label' => __( 'Maximum spend', 'woocommerce' ), 'placeholder' => __( 'No maximum', 'woocommerce' ), 'description' => __( 'This field allows you to set the maximum spend (subtotal, including taxes) allowed when using the coupon.', 'woocommerce' ), 'data_type' => 'price', 'desc_tip' => true ) );
+				woocommerce_wp_text_input( array(
+					'id'          => 'maximum_amount',
+					'label'       => __( 'Maximum spend', 'woocommerce' ),
+					'placeholder' => __( 'No maximum', 'woocommerce' ),
+					'description' => __( 'This field allows you to set the maximum spend (subtotal, including taxes) allowed when using the coupon.', 'woocommerce' ),
+					'data_type'   => 'price',
+					'desc_tip'    => true,
+				) );
 
 				// Individual use
-				woocommerce_wp_checkbox( array( 'id' => 'individual_use', 'label' => __( 'Individual use only', 'woocommerce' ), 'description' => __( 'Check this box if the coupon cannot be used in conjunction with other coupons.', 'woocommerce' ) ) );
+				woocommerce_wp_checkbox( array(
+					'id'          => 'individual_use',
+					'label'       => __( 'Individual use only', 'woocommerce' ),
+					'description' => __( 'Check this box if the coupon cannot be used in conjunction with other coupons.', 'woocommerce' ),
+				) );
 
 				// Exclude Sale Products
-				woocommerce_wp_checkbox( array( 'id' => 'exclude_sale_items', 'label' => __( 'Exclude sale items', 'woocommerce' ), 'description' => __( 'Check this box if the coupon should not apply to items on sale. Per-item coupons will only work if the item is not on sale. Per-cart coupons will only work if there are no sale items in the cart.', 'woocommerce' ) ) );
+				woocommerce_wp_checkbox( array(
+					'id'          => 'exclude_sale_items',
+					'label'       => __( 'Exclude sale items', 'woocommerce' ),
+					'description' => __( 'Check this box if the coupon should not apply to items on sale. Per-item coupons will only work if the item is not on sale. Per-cart coupons will only work if there are no sale items in the cart.', 'woocommerce' ),
+				) );
 
 				echo '</div><div class="options_group">';
 
 				// Product ids
 				?>
 				<p class="form-field"><label><?php _e( 'Products', 'woocommerce' ); ?></label>
-				<input type="hidden" class="wc-product-search" data-multiple="true" style="width: 50%;" name="product_ids" data-placeholder="<?php esc_attr_e( 'Search for a product&hellip;', 'woocommerce' ); ?>" data-action="woocommerce_json_search_products_and_variations" data-selected="<?php
-					$product_ids = array_filter( array_map( 'absint', explode( ',', get_post_meta( $post->ID, 'product_ids', true ) ) ) );
-					$json_ids    = array();
+				<select class="wc-product-search" multiple="multiple" style="width: 50%;" name="product_ids[]" data-placeholder="<?php esc_attr_e( 'Search for a product&hellip;', 'woocommerce' ); ?>" data-action="woocommerce_json_search_products_and_variations">
+					<?php
+						$product_ids = $coupon->get_product_ids();
 
-					foreach ( $product_ids as $product_id ) {
-						$product = wc_get_product( $product_id );
-						if ( is_object( $product ) ) {
-							$json_ids[ $product_id ] = wp_kses_post( $product->get_formatted_name() );
+						foreach ( $product_ids as $product_id ) {
+							$product = wc_get_product( $product_id );
+							if ( is_object( $product ) ) {
+								echo '<option value="' . esc_attr( $product_id ) . '"' . selected( true, true, false ) . '>' . wp_kses_post( $product->get_formatted_name() ) . '</option>';
+							}
 						}
-					}
-
-					echo esc_attr( json_encode( $json_ids ) );
-					?>" value="<?php echo implode( ',', array_keys( $json_ids ) ); ?>" /> <?php echo wc_help_tip( __( 'Products which need to be in the cart to use this coupon or, for "Product Discounts", which products are discounted.', 'woocommerce' ) ); ?></p>
+					?>
+				</select> <?php echo wc_help_tip( __( 'Products which need to be in the cart to use this coupon or, for "Product Discounts", which products are discounted.', 'woocommerce' ) ); ?></p>
 				<?php
 
 				// Exclude Product ids
 				?>
 				<p class="form-field"><label><?php _e( 'Exclude products', 'woocommerce' ); ?></label>
-				<input type="hidden" class="wc-product-search" data-multiple="true" style="width: 50%;" name="exclude_product_ids" data-placeholder="<?php esc_attr_e( 'Search for a product&hellip;', 'woocommerce' ); ?>" data-action="woocommerce_json_search_products_and_variations" data-selected="<?php
-					$product_ids = array_filter( array_map( 'absint', explode( ',', get_post_meta( $post->ID, 'exclude_product_ids', true ) ) ) );
-					$json_ids    = array();
+				<select class="wc-product-search" multiple="multiple" style="width: 50%;" name="exclude_product_ids[]" data-placeholder="<?php esc_attr_e( 'Search for a product&hellip;', 'woocommerce' ); ?>" data-action="woocommerce_json_search_products_and_variations">
+					<?php
+						$product_ids = $coupon->get_excluded_product_ids();
 
-					foreach ( $product_ids as $product_id ) {
-						$product = wc_get_product( $product_id );
-						if ( is_object( $product ) ) {
-							$json_ids[ $product_id ] = wp_kses_post( $product->get_formatted_name() );
+						foreach ( $product_ids as $product_id ) {
+							$product = wc_get_product( $product_id );
+							if ( is_object( $product ) ) {
+								echo '<option value="' . esc_attr( $product_id ) . '"' . selected( true, true, false ) . '>' . wp_kses_post( $product->get_formatted_name() ) . '</option>';
+							}
 						}
-					}
-
-					echo esc_attr( json_encode( $json_ids ) );
-				?>" value="<?php echo implode( ',', array_keys( $json_ids ) ); ?>" /> <?php echo wc_help_tip( __( 'Products which must not be in the cart to use this coupon or, for "Product Discounts", which products are not discounted.', 'woocommerce' ) ); ?></p>
+					?>
+				</select> <?php echo wc_help_tip( __( 'Products which must not be in the cart to use this coupon or, for "Product Discounts", which products are not discounted.', 'woocommerce' ) ); ?></p>
 				<?php
 
 				echo '</div><div class="options_group">';
@@ -137,11 +189,13 @@ class WC_Meta_Box_Coupon_Data {
 				<p class="form-field"><label for="product_categories"><?php _e( 'Product categories', 'woocommerce' ); ?></label>
 				<select id="product_categories" name="product_categories[]" style="width: 50%;"  class="wc-enhanced-select" multiple="multiple" data-placeholder="<?php esc_attr_e( 'Any category', 'woocommerce' ); ?>">
 					<?php
-						$category_ids = (array) get_post_meta( $post->ID, 'product_categories', true );
+						$category_ids = $coupon->get_product_categories();
 						$categories   = get_terms( 'product_cat', 'orderby=name&hide_empty=0' );
 
-						if ( $categories ) foreach ( $categories as $cat ) {
-							echo '<option value="' . esc_attr( $cat->term_id ) . '"' . selected( in_array( $cat->term_id, $category_ids ), true, false ) . '>' . esc_html( $cat->name ) . '</option>';
+						if ( $categories ) {
+							foreach ( $categories as $cat ) {
+								echo '<option value="' . esc_attr( $cat->term_id ) . '"' . selected( in_array( $cat->term_id, $category_ids ), true, false ) . '>' . esc_html( $cat->name ) . '</option>';
+							}
 						}
 					?>
 				</select> <?php echo wc_help_tip( __( 'A product must be in this category for the coupon to remain valid or, for "Product Discounts", products in these categories will be discounted.', 'woocommerce' ) ); ?></p>
@@ -152,11 +206,13 @@ class WC_Meta_Box_Coupon_Data {
 				<p class="form-field"><label for="exclude_product_categories"><?php _e( 'Exclude categories', 'woocommerce' ); ?></label>
 				<select id="exclude_product_categories" name="exclude_product_categories[]" style="width: 50%;"  class="wc-enhanced-select" multiple="multiple" data-placeholder="<?php esc_attr_e( 'No categories', 'woocommerce' ); ?>">
 					<?php
-						$category_ids = (array) get_post_meta( $post->ID, 'exclude_product_categories', true );
+						$category_ids = $coupon->get_excluded_product_categories();
 						$categories   = get_terms( 'product_cat', 'orderby=name&hide_empty=0' );
 
-						if ( $categories ) foreach ( $categories as $cat ) {
-							echo '<option value="' . esc_attr( $cat->term_id ) . '"' . selected( in_array( $cat->term_id, $category_ids ), true, false ) . '>' . esc_html( $cat->name ) . '</option>';
+						if ( $categories ) {
+							foreach ( $categories as $cat ) {
+								echo '<option value="' . esc_attr( $cat->term_id ) . '"' . selected( in_array( $cat->term_id, $category_ids ), true, false ) . '>' . esc_html( $cat->name ) . '</option>';
+							}
 						}
 					?>
 				</select> <?php echo wc_help_tip( __( 'Product must not be in this category for the coupon to remain valid or, for "Product Discounts", products in these categories will not be discounted.', 'woocommerce' ) ); ?></p>
@@ -165,13 +221,23 @@ class WC_Meta_Box_Coupon_Data {
 				echo '</div><div class="options_group">';
 
 				// Customers
-				woocommerce_wp_text_input( array( 'id' => 'customer_email', 'label' => __( 'Email restrictions', 'woocommerce' ), 'placeholder' => __( 'No restrictions', 'woocommerce' ), 'description' => __( 'List of allowed emails to check against the customer\'s billing email when an order is placed. Separate email addresses with commas.', 'woocommerce' ), 'value' => implode(', ', (array) get_post_meta( $post->ID, 'customer_email', true ) ), 'desc_tip' => true, 'type' => 'email', 'class' => '', 'custom_attributes' => array(
-						'multiple' 	=> 'multiple'
-				) ) );
+				woocommerce_wp_text_input( array(
+					'id'                => 'customer_email',
+					'label'             => __( 'Email restrictions', 'woocommerce' ),
+					'placeholder'       => __( 'No restrictions', 'woocommerce' ),
+					'description'       => __( 'List of allowed emails to check against the customer billing email when an order is placed. Separate email addresses with commas.', 'woocommerce' ),
+					'value'             => implode( ', ', (array) get_post_meta( $post->ID, 'customer_email', true ) ),
+					'desc_tip'          => true,
+					'type'              => 'email',
+					'class'             => '',
+					'custom_attributes' => array(
+						'multiple' 	=> 'multiple',
+					),
+				) );
 
 				echo '</div>';
 
-				do_action( 'woocommerce_coupon_options_usage_restriction' );
+				do_action( 'woocommerce_coupon_options_usage_restriction', $coupon->get_id(), $coupon );
 
 			?></div>
 			<div id="usage_limit_coupon_data" class="panel woocommerce_options_panel"><?php
@@ -179,29 +245,59 @@ class WC_Meta_Box_Coupon_Data {
 				echo '<div class="options_group">';
 
 				// Usage limit per coupons
-				woocommerce_wp_text_input( array( 'id' => 'usage_limit', 'label' => __( 'Usage limit per coupon', 'woocommerce' ), 'placeholder' => _x('Unlimited usage', 'placeholder', 'woocommerce'), 'description' => __( 'How many times this coupon can be used before it is void.', 'woocommerce' ), 'type' => 'number', 'desc_tip' => true, 'class' => 'short', 'custom_attributes' => array(
-						'step' 	=> '1',
-						'min'	=> '0'
-				) ) );
+				woocommerce_wp_text_input( array(
+					'id'                => 'usage_limit',
+					'label'             => __( 'Usage limit per coupon', 'woocommerce' ),
+					'placeholder'       => esc_attr__( 'Unlimited usage', 'woocommerce' ),
+					'description'       => __( 'How many times this coupon can be used before it is void.', 'woocommerce' ),
+					'type'              => 'number',
+					'desc_tip'          => true,
+					'class'             => 'short',
+					'custom_attributes' => array(
+						'step' 	=> 1,
+						'min'	=> 0,
+					),
+					'value' => $coupon->get_usage_limit() ? $coupon->get_usage_limit() : '',
+				) );
 
 				// Usage limit per product
-				woocommerce_wp_text_input( array( 'id' => 'limit_usage_to_x_items', 'label' => __( 'Limit usage to X items', 'woocommerce' ), 'placeholder' => _x( 'Apply to all qualifying items in cart', 'placeholder', 'woocommerce' ), 'description' => __( 'The maximum number of individual items this coupon can apply to when using product discounts. Leave blank to apply to all qualifying items in cart.', 'woocommerce' ), 'desc_tip' => true, 'class' => 'short', 'type' => 'number', 'custom_attributes' => array(
-						'step' 	=> '1',
-						'min'	=> '0'
-				) ) );
+				woocommerce_wp_text_input( array(
+					'id'                => 'limit_usage_to_x_items',
+					'label'             => __( 'Limit usage to X items', 'woocommerce' ),
+					'placeholder'       => esc_attr__( 'Apply to all qualifying items in cart', 'woocommerce' ),
+					'description'       => __( 'The maximum number of individual items this coupon can apply to when using product discounts. Leave blank to apply to all qualifying items in cart.', 'woocommerce' ),
+					'desc_tip'          => true,
+					'class'             => 'short',
+					'type'              => 'number',
+					'custom_attributes' => array(
+						'step' 	=> 1,
+						'min'	=> 0,
+					),
+					'value' => $coupon->get_limit_usage_to_x_items() ? $coupon->get_limit_usage_to_x_items() : '',
+				) );
 
 				// Usage limit per users
-				woocommerce_wp_text_input( array( 'id' => 'usage_limit_per_user', 'label' => __( 'Usage limit per user', 'woocommerce' ), 'placeholder' => _x( 'Unlimited usage', 'placeholder', 'woocommerce' ), 'description' => __( 'How many times this coupon can be used by an invidual user. Uses billing email for guests, and user ID for logged in users.', 'woocommerce' ), 'desc_tip' => true, 'class' => 'short', 'type' => 'number', 'custom_attributes' => array(
-						'step' 	=> '1',
-						'min'	=> '0'
-				) ) );
+				woocommerce_wp_text_input( array(
+					'id'                => 'usage_limit_per_user',
+					'label'             => __( 'Usage limit per user', 'woocommerce' ),
+					'placeholder'       => esc_attr__( 'Unlimited usage', 'woocommerce' ),
+					'description'       => __( 'How many times this coupon can be used by an individual user. Uses billing email for guests, and user ID for logged in users.', 'woocommerce' ),
+					'desc_tip'          => true,
+					'class'             => 'short',
+					'type'              => 'number',
+					'custom_attributes' => array(
+						'step' 	=> 1,
+						'min'	=> 0,
+					),
+					'value' => $coupon->get_usage_limit_per_user() ? $coupon->get_usage_limit_per_user() : '',
+				) );
 
 				echo '</div>';
 
-				do_action( 'woocommerce_coupon_options_usage_limit' );
+				do_action( 'woocommerce_coupon_options_usage_limit', $coupon->get_id(), $coupon );
 
 			?></div>
-			<?php do_action( 'woocommerce_coupon_data_panels' ); ?>
+			<?php do_action( 'woocommerce_coupon_data_panels', $coupon->get_id(), $coupon ); ?>
 			<div class="clear"></div>
 		</div>
 		<?php
@@ -209,68 +305,45 @@ class WC_Meta_Box_Coupon_Data {
 
 	/**
 	 * Save meta box data.
+	 *
+	 * @param int $post_id
+	 * @param WP_Post $post
 	 */
 	public static function save( $post_id, $post ) {
 		global $wpdb;
 
-		// Ensure coupon code is correctly formatted
-		$post->post_title = apply_filters( 'woocommerce_coupon_code', $post->post_title );
-		$wpdb->update( $wpdb->posts, array( 'post_title' => $post->post_title ), array( 'ID' => $post_id ) );
-
 		// Check for dupe coupons
-		$coupon_found = $wpdb->get_var( $wpdb->prepare( "
-			SELECT $wpdb->posts.ID
-			FROM $wpdb->posts
-			WHERE $wpdb->posts.post_type = 'shop_coupon'
-			AND $wpdb->posts.post_status = 'publish'
-			AND $wpdb->posts.post_title = '%s'
-			AND $wpdb->posts.ID != %s
-		 ", $post->post_title, $post_id ) );
+		$coupon_code  = wc_format_coupon_code( $post->post_title );
+		$id_from_code = wc_get_coupon_id_by_code( $coupon_code, $post_id );
 
-		if ( $coupon_found ) {
+		if ( $id_from_code ) {
 			WC_Admin_Meta_Boxes::add_error( __( 'Coupon code already exists - customers will use the latest coupon with this code.', 'woocommerce' ) );
 		}
 
-		// Add/Replace data to array
-		$type                   = wc_clean( $_POST['discount_type'] );
-		$amount                 = wc_format_decimal( $_POST['coupon_amount'] );
-		$usage_limit            = empty( $_POST['usage_limit'] ) ? '' : absint( $_POST['usage_limit'] );
-		$usage_limit_per_user   = empty( $_POST['usage_limit_per_user'] ) ? '' : absint( $_POST['usage_limit_per_user'] );
-		$limit_usage_to_x_items = empty( $_POST['limit_usage_to_x_items'] ) ? '' : absint( $_POST['limit_usage_to_x_items'] );
-		$individual_use         = isset( $_POST['individual_use'] ) ? 'yes' : 'no';
-		$expiry_date            = wc_clean( $_POST['expiry_date'] );
-		$free_shipping          = isset( $_POST['free_shipping'] ) ? 'yes' : 'no';
-		$exclude_sale_items     = isset( $_POST['exclude_sale_items'] ) ? 'yes' : 'no';
-		$minimum_amount         = wc_format_decimal( $_POST['minimum_amount'] );
-		$maximum_amount         = wc_format_decimal( $_POST['maximum_amount'] );
-		$customer_email         = array_filter( array_map( 'trim', explode( ',', wc_clean( $_POST['customer_email'] ) ) ) );
-		$product_ids            = implode( ',', array_filter( array_map( 'intval', explode( ',', $_POST['product_ids'] ) ) ) );
-		$exclude_product_ids    = implode( ',', array_filter( array_map( 'intval', explode( ',', $_POST['exclude_product_ids'] ) ) ) );
+		$product_categories         = isset( $_POST['product_categories'] ) ? (array) $_POST['product_categories'] : array();
+		$exclude_product_categories = isset( $_POST['exclude_product_categories'] ) ? (array) $_POST['exclude_product_categories'] : array();
 
-		$product_categories         = isset( $_POST['product_categories'] ) ? array_map( 'intval', $_POST['product_categories'] ) : array();
-		$exclude_product_categories = isset( $_POST['exclude_product_categories'] ) ? array_map( 'intval', $_POST['exclude_product_categories'] ) : array();
-
-		// Save
-		update_post_meta( $post_id, 'discount_type', $type );
-		update_post_meta( $post_id, 'coupon_amount', $amount );
-		update_post_meta( $post_id, 'individual_use', $individual_use );
-		update_post_meta( $post_id, 'product_ids', $product_ids );
-		update_post_meta( $post_id, 'exclude_product_ids', $exclude_product_ids );
-		update_post_meta( $post_id, 'usage_limit', $usage_limit );
-		update_post_meta( $post_id, 'usage_limit_per_user', $usage_limit_per_user );
-		update_post_meta( $post_id, 'limit_usage_to_x_items', $limit_usage_to_x_items );
-		update_post_meta( $post_id, 'expiry_date', $expiry_date );
-		update_post_meta( $post_id, 'free_shipping', $free_shipping );
-		update_post_meta( $post_id, 'exclude_sale_items', $exclude_sale_items );
-		update_post_meta( $post_id, 'product_categories', $product_categories );
-		update_post_meta( $post_id, 'exclude_product_categories', $exclude_product_categories );
-		update_post_meta( $post_id, 'minimum_amount', $minimum_amount );
-		update_post_meta( $post_id, 'maximum_amount', $maximum_amount );
-		update_post_meta( $post_id, 'customer_email', $customer_email );
-
-		// Clear cache
-		WC_Cache_Helper::incr_cache_prefix( 'coupons' );
-
-		do_action( 'woocommerce_coupon_options_save', $post_id );
+		$coupon = new WC_Coupon( $post_id );
+		$coupon->set_props( array(
+			'code'                        => $post->post_title,
+			'discount_type'               => wc_clean( $_POST['discount_type'] ),
+			'amount'                      => wc_format_decimal( $_POST['coupon_amount'] ),
+			'date_expires'                => wc_clean( $_POST['expiry_date'] ),
+			'individual_use'              => isset( $_POST['individual_use'] ),
+			'product_ids'                 => isset( $_POST['product_ids'] ) ? array_filter( array_map( 'intval', (array) $_POST['product_ids'] ) ) : array(),
+			'excluded_product_ids'        => isset( $_POST['exclude_product_ids'] ) ? array_filter( array_map( 'intval', (array) $_POST['exclude_product_ids'] ) ) : array(),
+			'usage_limit'                 => absint( $_POST['usage_limit'] ),
+			'usage_limit_per_user'        => absint( $_POST['usage_limit_per_user'] ),
+			'limit_usage_to_x_items'      => absint( $_POST['limit_usage_to_x_items'] ),
+			'free_shipping'               => isset( $_POST['free_shipping'] ),
+			'product_categories'          => array_filter( array_map( 'intval', $product_categories ) ),
+			'excluded_product_categories' => array_filter( array_map( 'intval', $exclude_product_categories ) ),
+			'exclude_sale_items'          => isset( $_POST['exclude_sale_items'] ),
+			'minimum_amount'              => wc_format_decimal( $_POST['minimum_amount'] ),
+			'maximum_amount'              => wc_format_decimal( $_POST['maximum_amount'] ),
+			'email_restrictions'          => array_filter( array_map( 'trim', explode( ',', wc_clean( $_POST['customer_email'] ) ) ) ),
+		) );
+		$coupon->save();
+		do_action( 'woocommerce_coupon_options_save', $post_id, $coupon );
 	}
 }
diff --git a/includes/admin/meta-boxes/class-wc-meta-box-order-actions.php b/includes/admin/meta-boxes/class-wc-meta-box-order-actions.php
index fd10bdf217a..41dc1fb9ed3 100644
--- a/includes/admin/meta-boxes/class-wc-meta-box-order-actions.php
+++ b/includes/admin/meta-boxes/class-wc-meta-box-order-actions.php
@@ -21,6 +21,8 @@ class WC_Meta_Box_Order_Actions {
 
 	/**
 	 * Output the metabox.
+	 *
+	 * @param WP_Post $post
 	 */
 	public static function output( $post ) {
 		global $theorder;
@@ -39,30 +41,32 @@ class WC_Meta_Box_Order_Actions {
 			<li class="wide" id="actions">
 				<select name="wc_order_action">
 					<option value=""><?php _e( 'Actions', 'woocommerce' ); ?></option>
-					<optgroup label="<?php esc_attr_e( 'Resend order emails', 'woocommerce' ); ?>">
 						<?php
 						$mailer           = WC()->mailer();
-						$available_emails = apply_filters( 'woocommerce_resend_order_emails_available', array( 'new_order', 'cancelled_order', 'customer_processing_order', 'customer_completed_order', 'customer_invoice', 'customer_refunded_order' ) );
+						$available_emails = apply_filters( 'woocommerce_resend_order_emails_available', array( 'new_order', 'cancelled_order', 'customer_processing_order', 'customer_completed_order', 'customer_invoice' ) );
 						$mails            = $mailer->get_emails();
 
-						if ( ! empty( $mails ) ) {
+						if ( ! empty( $mails ) && ! empty( $available_emails ) ) { ?>
+							<optgroup label="<?php esc_attr_e( 'Resend order emails', 'woocommerce' ); ?>">
+							<?php
 							foreach ( $mails as $mail ) {
-								if ( in_array( $mail->id, $available_emails ) ) {
-									echo '<option value="send_email_'. esc_attr( $mail->id ) .'">' . esc_html( $mail->title ) . '</option>';
+								if ( in_array( $mail->id, $available_emails ) && 'no' !== $mail->enabled ) {
+									echo '<option value="send_email_' . esc_attr( $mail->id ) . '">' . sprintf( __( 'Resend %s', 'woocommerce' ), esc_html( $mail->title ) ) . '</option>';
 								}
-							}
+							} ?>
+							</optgroup>
+							<?php
 						}
 						?>
-					</optgroup>
 
-					<option value="regenerate_download_permissions"><?php _e( 'Generate download permissions', 'woocommerce' ); ?></option>
+					<option value="regenerate_download_permissions"><?php _e( 'Regenerate download permissions', 'woocommerce' ); ?></option>
 
-					<?php foreach( apply_filters( 'woocommerce_order_actions', array() ) as $action => $title ) { ?>
+					<?php foreach ( apply_filters( 'woocommerce_order_actions', array() ) as $action => $title ) { ?>
 						<option value="<?php echo $action; ?>"><?php echo $title; ?></option>
 					<?php } ?>
 				</select>
 
-				<button class="button wc-reload" title="<?php esc_attr_e( 'Apply', 'woocommerce' ); ?>"><span><?php _e( 'Apply', 'woocommerce' ); ?></span></button>
+				<button class="button wc-reload"><span><?php _e( 'Apply', 'woocommerce' ); ?></span></button>
 			</li>
 
 			<li class="wide">
@@ -71,15 +75,15 @@ class WC_Meta_Box_Order_Actions {
 					if ( current_user_can( 'delete_post', $post->ID ) ) {
 
 						if ( ! EMPTY_TRASH_DAYS ) {
-							$delete_text = __( 'Delete Permanently', 'woocommerce' );
+							$delete_text = __( 'Delete permanently', 'woocommerce' );
 						} else {
-							$delete_text = __( 'Move to Trash', 'woocommerce' );
+							$delete_text = __( 'Move to trash', 'woocommerce' );
 						}
 						?><a class="submitdelete deletion" href="<?php echo esc_url( get_delete_post_link( $post->ID ) ); ?>"><?php echo $delete_text; ?></a><?php
 					}
 				?></div>
 
-				<input type="submit" class="button save_order button-primary tips" name="save" value="<?php printf( __( 'Save %s', 'woocommerce' ), $order_type_object->labels->singular_name ); ?>" data-tip="<?php printf( __( 'Save/update the %s', 'woocommerce' ), $order_type_object->labels->singular_name ); ?>" />
+				<input type="submit" class="button save_order button-primary" name="save" value="<?php echo 'auto-draft' === $post->post_status ? esc_attr__( 'Create', 'woocommerce' ) : esc_attr__( 'Update', 'woocommerce' ); ?>" />
 			</li>
 
 			<?php do_action( 'woocommerce_order_actions_end', $post->ID ); ?>
@@ -90,8 +94,12 @@ class WC_Meta_Box_Order_Actions {
 
 	/**
 	 * Save meta box data.
+	 *
+	 * @param int $post_id
+	 * @param WP_Post $post
 	 */
 	public static function save( $post_id, $post ) {
+		global $wpdb;
 
 		// Order data saved, now get it so we can manipulate status
 		$order = wc_get_order( $post_id );
@@ -103,23 +111,27 @@ class WC_Meta_Box_Order_Actions {
 
 			if ( strstr( $action, 'send_email_' ) ) {
 
+				// Switch back to the site locale.
+				if ( function_exists( 'switch_to_locale' ) ) {
+					switch_to_locale( get_locale() );
+				}
+
 				do_action( 'woocommerce_before_resend_order_emails', $order );
 
-				// Ensure gateways are loaded in case they need to insert data into the emails
+				// Ensure gateways are loaded in case they need to insert data into the emails.
 				WC()->payment_gateways();
 				WC()->shipping();
 
-				// Load mailer
+				// Load mailer.
 				$mailer = WC()->mailer();
-
 				$email_to_send = str_replace( 'send_email_', '', $action );
-
 				$mails = $mailer->get_emails();
 
 				if ( ! empty( $mails ) ) {
 					foreach ( $mails as $mail ) {
 						if ( $mail->id == $email_to_send ) {
-							$mail->trigger( $order->id );
+							$mail->trigger( $order->get_id(), $order );
+							/* translators: %s: email title */
 							$order->add_order_note( sprintf( __( '%s email notification manually sent.', 'woocommerce' ), $mail->title ), false, true );
 						}
 					}
@@ -127,13 +139,19 @@ class WC_Meta_Box_Order_Actions {
 
 				do_action( 'woocommerce_after_resend_order_email', $order, $email_to_send );
 
-				// Change the post saved message
+				// Restore user locale.
+				if ( function_exists( 'restore_current_locale' ) ) {
+					restore_current_locale();
+				}
+
+				// Change the post saved message.
 				add_filter( 'redirect_post_location', array( __CLASS__, 'set_email_sent_message' ) );
 
-			} elseif ( $action == 'regenerate_download_permissions' ) {
+			} elseif ( 'regenerate_download_permissions' === $action ) {
 
-				delete_post_meta( $post_id, '_download_permissions_granted' );
-				wc_downloadable_product_permissions( $post_id );
+				$data_store = WC_Data_Store::load( 'customer-download' );
+				$data_store->delete_by_order_id( $post_id );
+				wc_downloadable_product_permissions( $post_id, true );
 
 			} else {
 
@@ -147,7 +165,7 @@ class WC_Meta_Box_Order_Actions {
 	/**
 	 * Set the correct message ID.
 	 *
-	 * @param $location
+	 * @param string $location
 	 *
 	 * @since  2.3.0
 	 *
@@ -158,5 +176,4 @@ class WC_Meta_Box_Order_Actions {
 	public static function set_email_sent_message( $location ) {
 		return add_query_arg( 'message', 11, $location );
 	}
-
 }
diff --git a/includes/admin/meta-boxes/class-wc-meta-box-order-data.php b/includes/admin/meta-boxes/class-wc-meta-box-order-data.php
index c7b31fe3e8d..3cf5527b52d 100644
--- a/includes/admin/meta-boxes/class-wc-meta-box-order-data.php
+++ b/includes/admin/meta-boxes/class-wc-meta-box-order-data.php
@@ -40,47 +40,47 @@ class WC_Meta_Box_Order_Data {
 
 		self::$billing_fields = apply_filters( 'woocommerce_admin_billing_fields', array(
 			'first_name' => array(
-				'label' => __( 'First Name', 'woocommerce' ),
-				'show'  => false
+				'label' => __( 'First name', 'woocommerce' ),
+				'show'  => false,
 			),
 			'last_name' => array(
-				'label' => __( 'Last Name', 'woocommerce' ),
-				'show'  => false
+				'label' => __( 'Last name', 'woocommerce' ),
+				'show'  => false,
 			),
 			'company' => array(
 				'label' => __( 'Company', 'woocommerce' ),
-				'show'  => false
+				'show'  => false,
 			),
 			'address_1' => array(
-				'label' => __( 'Address 1', 'woocommerce' ),
-				'show'  => false
+				'label' => __( 'Address line 1', 'woocommerce' ),
+				'show'  => false,
 			),
 			'address_2' => array(
-				'label' => __( 'Address 2', 'woocommerce' ),
-				'show'  => false
+				'label' => __( 'Address line 2', 'woocommerce' ),
+				'show'  => false,
 			),
 			'city' => array(
 				'label' => __( 'City', 'woocommerce' ),
-				'show'  => false
+				'show'  => false,
 			),
 			'postcode' => array(
-				'label' => __( 'Postcode', 'woocommerce' ),
-				'show'  => false
+				'label' => __( 'Postcode / ZIP', 'woocommerce' ),
+				'show'  => false,
 			),
 			'country' => array(
 				'label'   => __( 'Country', 'woocommerce' ),
 				'show'    => false,
 				'class'   => 'js_field-country select short',
 				'type'    => 'select',
-				'options' => array( '' => __( 'Select a country&hellip;', 'woocommerce' ) ) + WC()->countries->get_allowed_countries()
+				'options' => array( '' => __( 'Select a country&hellip;', 'woocommerce' ) ) + WC()->countries->get_allowed_countries(),
 			),
 			'state' => array(
-				'label' => __( 'State/County', 'woocommerce' ),
+				'label' => __( 'State / County', 'woocommerce' ),
 				'class'   => 'js_field-state select short',
-				'show'  => false
+				'show'  => false,
 			),
 			'email' => array(
-				'label' => __( 'Email', 'woocommerce' ),
+				'label' => __( 'Email address', 'woocommerce' ),
 			),
 			'phone' => array(
 				'label' => __( 'Phone', 'woocommerce' ),
@@ -89,50 +89,52 @@ class WC_Meta_Box_Order_Data {
 
 		self::$shipping_fields = apply_filters( 'woocommerce_admin_shipping_fields', array(
 			'first_name' => array(
-				'label' => __( 'First Name', 'woocommerce' ),
-				'show'  => false
+				'label' => __( 'First name', 'woocommerce' ),
+				'show'  => false,
 			),
 			'last_name' => array(
-				'label' => __( 'Last Name', 'woocommerce' ),
-				'show'  => false
+				'label' => __( 'Last name', 'woocommerce' ),
+				'show'  => false,
 			),
 			'company' => array(
 				'label' => __( 'Company', 'woocommerce' ),
-				'show'  => false
+				'show'  => false,
 			),
 			'address_1' => array(
-				'label' => __( 'Address 1', 'woocommerce' ),
-				'show'  => false
+				'label' => __( 'Address line 1', 'woocommerce' ),
+				'show'  => false,
 			),
 			'address_2' => array(
-				'label' => __( 'Address 2', 'woocommerce' ),
-				'show'  => false
+				'label' => __( 'Address line 2', 'woocommerce' ),
+				'show'  => false,
 			),
 			'city' => array(
 				'label' => __( 'City', 'woocommerce' ),
-				'show'  => false
+				'show'  => false,
 			),
 			'postcode' => array(
-				'label' => __( 'Postcode', 'woocommerce' ),
-				'show'  => false
+				'label' => __( 'Postcode / ZIP', 'woocommerce' ),
+				'show'  => false,
 			),
 			'country' => array(
 				'label'   => __( 'Country', 'woocommerce' ),
 				'show'    => false,
 				'type'    => 'select',
 				'class'   => 'js_field-country select short',
-				'options' => array( '' => __( 'Select a country&hellip;', 'woocommerce' ) ) + WC()->countries->get_shipping_countries()
+				'options' => array( '' => __( 'Select a country&hellip;', 'woocommerce' ) ) + WC()->countries->get_shipping_countries(),
 			),
 			'state' => array(
-				'label' => __( 'State/County', 'woocommerce' ),
+				'label' => __( 'State / County', 'woocommerce' ),
 				'class'   => 'js_field-state select short',
-				'show'  => false
+				'show'  => false,
 			),
 		) );
 	}
 
 	/**
 	 * Output the metabox.
+	 *
+	 * @param WP_Post $post
 	 */
 	public static function output( $post ) {
 		global $theorder;
@@ -151,7 +153,7 @@ class WC_Meta_Box_Order_Data {
 			$payment_gateways = array();
 		}
 
-		$payment_method = ! empty( $order->payment_method ) ? $order->payment_method : '';
+		$payment_method = $order->get_payment_method();
 
 		$order_type_object = get_post_type_object( $post->post_type );
 		wp_nonce_field( 'woocommerce_save_data', 'woocommerce_meta_nonce' );
@@ -164,11 +166,22 @@ class WC_Meta_Box_Order_Data {
 			<input name="post_status" type="hidden" value="<?php echo esc_attr( $post->post_status ); ?>" />
 			<div id="order_data" class="panel">
 
-				<h2><?php echo esc_html( sprintf( _x( '%s #%s details', 'Order #123 details', 'woocommerce' ), $order_type_object->labels->singular_name, $order->get_order_number() ) ); ?></h2>
+				<h2><?php
+					/* translators: 1: order type 2: order number */
+					printf(
+						esc_html__( '%1$s #%2$s details', 'woocommerce' ),
+						$order_type_object->labels->singular_name,
+						$order->get_order_number()
+					);
+				?></h2>
 				<p class="order_number"><?php
 
 					if ( $payment_method ) {
-						printf( __( 'Payment via %s', 'woocommerce' ), ( isset( $payment_gateways[ $payment_method ] ) ? esc_html( $payment_gateways[ $payment_method ]->get_title() ) : esc_html( $payment_method ) ) );
+						/* translators: %s: payment method */
+						printf(
+							__( 'Payment via %s', 'woocommerce' ),
+							( isset( $payment_gateways[ $payment_method ] ) ? esc_html( $payment_gateways[ $payment_method ]->get_title() ) : esc_html( $payment_method ) )
+						);
 
 						if ( $transaction_id = $order->get_transaction_id() ) {
 								if ( isset( $payment_gateways[ $payment_method ] ) && ( $url = $payment_gateways[ $payment_method ]->get_transaction_url( $order ) ) ) {
@@ -177,27 +190,37 @@ class WC_Meta_Box_Order_Data {
 								echo ' (' . esc_html( $transaction_id ) . ')';
 							}
 						}
+
+						if ( $order->get_date_paid() ) {
+							/* translators: 1: date 2: time */
+							printf( ' ' . __( 'on %1$s @ %2$s', 'woocommerce' ), wc_format_datetime( $order->get_date_paid() ), wc_format_datetime( $order->get_date_paid(), get_option( 'time_format' ) ) );
+						}
+
 						echo '. ';
 					}
 
-					if ( $ip_address = get_post_meta( $post->ID, '_customer_ip_address', true ) ) {
-						echo __( 'Customer IP', 'woocommerce' ) . ': ' . esc_html( $ip_address );
+					if ( $ip_address = $order->get_customer_ip_address() ) {
+						/* translators: %s: IP address */
+						printf(
+							__( 'Customer IP: %s', 'woocommerce' ),
+							'<span class="woocommerce-Order-customerIP">' . esc_html( $ip_address ) . '</span>'
+						);
 					}
 				?></p>
 
 				<div class="order_data_column_container">
 					<div class="order_data_column">
-						<h4><?php _e( 'General Details', 'woocommerce' ); ?></h4>
+						<h3><?php _e( 'General Details', 'woocommerce' ); ?></h3>
 
 						<p class="form-field form-field-wide"><label for="order_date"><?php _e( 'Order date:', 'woocommerce' ) ?></label>
-							<input type="text" class="date-picker" name="order_date" id="order_date" maxlength="10" value="<?php echo date_i18n( 'Y-m-d', strtotime( $post->post_date ) ); ?>" pattern="[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|1[0-9]|2[0-9]|3[01])" />@<input type="text" class="hour" placeholder="<?php esc_attr_e( 'h', 'woocommerce' ) ?>" name="order_date_hour" id="order_date_hour" maxlength="2" size="2" value="<?php echo date_i18n( 'H', strtotime( $post->post_date ) ); ?>" pattern="\-?\d+(\.\d{0,})?" />:<input type="text" class="minute" placeholder="<?php esc_attr_e( 'm', 'woocommerce' ) ?>" name="order_date_minute" id="order_date_minute" maxlength="2" size="2" value="<?php echo date_i18n( 'i', strtotime( $post->post_date ) ); ?>" pattern="\-?\d+(\.\d{0,})?" />
+							<input type="text" class="date-picker" name="order_date" id="order_date" maxlength="10" value="<?php echo date_i18n( 'Y-m-d', strtotime( $post->post_date ) ); ?>" pattern="<?php echo esc_attr( apply_filters( 'woocommerce_date_input_html_pattern', '[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|1[0-9]|2[0-9]|3[01])' ) ); ?>" />@&lrm;<input type="number" class="hour" placeholder="<?php esc_attr_e( 'h', 'woocommerce' ) ?>" name="order_date_hour" id="order_date_hour" min="0" max="23" step="1" value="<?php echo date_i18n( 'H', strtotime( $post->post_date ) ); ?>" pattern="([01]?[0-9]{1}|2[0-3]{1})" />:<input type="number" class="minute" placeholder="<?php esc_attr_e( 'm', 'woocommerce' ) ?>" name="order_date_minute" id="order_date_minute" min="0" max="59" step="1" value="<?php echo date_i18n( 'i', strtotime( $post->post_date ) ); ?>" pattern="[0-5]{1}[0-9]{1}" />&lrm;
 						</p>
 
 						<p class="form-field form-field-wide wc-order-status"><label for="order_status"><?php _e( 'Order status:', 'woocommerce' ) ?> <?php
-							if ( $order->has_status( 'pending' ) ) {
-								printf( '<a href="%s">%s &rarr;</a>',
+							if ( $order->needs_payment() ) {
+								printf( '<a href="%s">%s</a>',
 									esc_url( $order->get_checkout_payment_url() ),
-									__( 'Pay', 'woocommerce' )
+									__( 'Customer payment page &rarr;', 'woocommerce' )
 								);
 							}
 						?></label>
@@ -205,51 +228,62 @@ class WC_Meta_Box_Order_Data {
 							<?php
 								$statuses = wc_get_order_statuses();
 								foreach ( $statuses as $status => $status_name ) {
-									echo '<option value="' . esc_attr( $status ) . '" ' . selected( $status, 'wc-' . $order->get_status(), false ) . '>' . esc_html( $status_name ) . '</option>';
+									echo '<option value="' . esc_attr( $status ) . '" ' . selected( $status, 'wc-' . $order->get_status( 'edit' ), false ) . '>' . esc_html( $status_name ) . '</option>';
 								}
 							?>
 						</select></p>
 
 						<p class="form-field form-field-wide wc-customer-user">
 							<label for="customer_user"><?php _e( 'Customer:', 'woocommerce' ) ?> <?php
-								if ( ! empty( $order->customer_user ) ) {
-									$args = array( 'post_status' => 'all',
+								if ( $order->get_user_id( 'edit' ) ) {
+									$args = array(
+										'post_status'    => 'all',
 										'post_type'      => 'shop_order',
-										'_customer_user' => absint( $order->customer_user )
+										'_customer_user' => $order->get_user_id( 'edit' ),
 									);
-									printf( '<a href="%s">%s &rarr;</a>',
+									printf( '<a href="%s">%s</a>',
 										esc_url( add_query_arg( $args, admin_url( 'edit.php' ) ) ),
-										__( 'View other orders', 'woocommerce' )
+										__( 'View other orders &rarr;', 'woocommerce' )
 									);
 								}
 							?></label>
 							<?php
 							$user_string = '';
 							$user_id     = '';
-							if ( ! empty( $order->customer_user ) ) {
-								$user_id     = absint( $order->customer_user );
+							if ( $order->get_user_id() ) {
+								$user_id     = absint( $order->get_user_id() );
 								$user        = get_user_by( 'id', $user_id );
-								$user_string = esc_html( $user->display_name ) . ' (#' . absint( $user->ID ) . ' &ndash; ' . esc_html( $user->user_email ) . ')';
+								/* translators: 1: user display name 2: user ID 3: user email */
+								$user_string = sprintf(
+									esc_html__( '%1$s (#%2$s &ndash; %3$s)', 'woocommerce' ),
+									$user->display_name,
+									absint( $user->ID ),
+									$user->user_email
+								);
 							}
 							?>
-							<input type="hidden" class="wc-customer-search" id="customer_user" name="customer_user" data-placeholder="<?php esc_attr_e( 'Guest', 'woocommerce' ); ?>" data-selected="<?php echo htmlspecialchars( $user_string ); ?>" value="<?php echo $user_id; ?>" data-allow_clear="true" />
+							<select class="wc-customer-search" id="customer_user" name="customer_user" data-placeholder="<?php esc_attr_e( 'Guest', 'woocommerce' ); ?>" data-allow_clear="true">
+								<option value="<?php echo esc_attr( $user_id ); ?>" selected="selected"><?php echo htmlspecialchars( $user_string ); ?></option>
+							</select>
 						</p>
 						<?php do_action( 'woocommerce_admin_order_data_after_order_details', $order ); ?>
 					</div>
 					<div class="order_data_column">
-						<h4>
-							<?php _e( 'Billing Details', 'woocommerce' ); ?>
+						<h3>
+							<?php _e( 'Billing details', 'woocommerce' ); ?>
 							<a href="#" class="edit_address"><?php _e( 'Edit', 'woocommerce' ); ?></a>
-							<a href="#" class="tips load_customer_billing" data-tip="<?php esc_attr_e( 'Load billing address', 'woocommerce' ); ?>" style="display:none;"><?php _e( 'Load billing address', 'woocommerce' ); ?></a>
-						</h4>
+							<span>
+								<a href="#" class="load_customer_billing" style="display:none;"><?php _e( 'Load billing address', 'woocommerce' ); ?></a>
+							</span>
+						</h3>
 						<?php
 							// Display values
 							echo '<div class="address">';
 
 								if ( $order->get_formatted_billing_address() ) {
-									echo '<p><strong>' . __( 'Address', 'woocommerce' ) . ':</strong>' . wp_kses( $order->get_formatted_billing_address(), array( 'br' => array() ) ) . '</p>';
+									echo '<p><strong>' . __( 'Address:', 'woocommerce' ) . '</strong>' . wp_kses( $order->get_formatted_billing_address(), array( 'br' => array() ) ) . '</p>';
 								} else {
-									echo '<p class="none_set"><strong>' . __( 'Address', 'woocommerce' ) . ':</strong> ' . __( 'No billing address set.', 'woocommerce' ) . '</p>';
+									echo '<p class="none_set"><strong>' . __( 'Address:', 'woocommerce' ) . '</strong> ' . __( 'No billing address set.', 'woocommerce' ) . '</p>';
 								}
 
 								foreach ( self::$billing_fields as $key => $field ) {
@@ -259,9 +293,13 @@ class WC_Meta_Box_Order_Data {
 
 									$field_name = 'billing_' . $key;
 
-									if ( $order->$field_name ) {
-										echo '<p><strong>' . esc_html( $field['label'] ) . ':</strong> ' . make_clickable( esc_html( $order->$field_name ) ) . '</p>';
+									if ( is_callable( array( $order, 'get_' . $field_name ) ) ) {
+										$field_value = $order->{"get_$field_name"}( 'edit' );
+									} else {
+										$field_value = $order->get_meta( '_' . $field_name );
 									}
+
+									echo '<p><strong>' . esc_html( $field['label'] ) . ':</strong> ' . make_clickable( esc_html( $field_value ) ) . '</p>';
 								}
 
 							echo '</div>';
@@ -273,7 +311,7 @@ class WC_Meta_Box_Order_Data {
 								if ( ! isset( $field['type'] ) ) {
 									$field['type'] = 'text';
 								}
-								if ( ! isset( $field['id'] ) ){
+								if ( ! isset( $field['id'] ) ) {
 									$field['id'] = '_billing_' . $key;
 								}
 								switch ( $field['type'] ) {
@@ -287,14 +325,14 @@ class WC_Meta_Box_Order_Data {
 							}
 							?>
 							<p class="form-field form-field-wide">
-								<label><?php _e( 'Payment Method:', 'woocommerce' ); ?></label>
+								<label><?php _e( 'Payment method:', 'woocommerce' ); ?></label>
 								<select name="_payment_method" id="_payment_method" class="first">
 									<option value=""><?php _e( 'N/A', 'woocommerce' ); ?></option>
 									<?php
 										$found_method 	= false;
 
 										foreach ( $payment_gateways as $gateway ) {
-											if ( $gateway->enabled == "yes" ) {
+											if ( 'yes' === $gateway->enabled ) {
 												echo '<option value="' . esc_attr( $gateway->id ) . '" ' . selected( $payment_method, $gateway->id, false ) . '>' . esc_html( $gateway->get_title() ) . '</option>';
 												if ( $payment_method == $gateway->id ) {
 													$found_method = true;
@@ -321,20 +359,22 @@ class WC_Meta_Box_Order_Data {
 					</div>
 					<div class="order_data_column">
 
-						<h4>
-							<?php _e( 'Shipping Details', 'woocommerce' ); ?>
+						<h3>
+							<?php _e( 'Shipping details', 'woocommerce' ); ?>
 							<a href="#" class="edit_address"><?php _e( 'Edit', 'woocommerce' ); ?></a>
-							<a href="#" class="tips billing-same-as-shipping" data-tip="<?php esc_attr_e( 'Copy from billing', 'woocommerce' ); ?>" style="display:none;"><?php _e( 'Copy from billing', 'woocommerce' ); ?></a>
-							<a href="#" class="tips load_customer_shipping" data-tip="<?php esc_attr_e( 'Load shipping address', 'woocommerce' ); ?>" style="display:none;"><?php _e( 'Load shipping address', 'woocommerce' ); ?></a>
-						</h4>
+							<span>
+								<a href="#" class="load_customer_shipping" style="display:none;"><?php _e( 'Load shipping address', 'woocommerce' ); ?></a>
+								<a href="#" class="billing-same-as-shipping" style="display:none;"><?php _e( 'Copy billing address', 'woocommerce' ); ?></a>
+							</span>
+						</h3>
 						<?php
 							// Display values
 							echo '<div class="address">';
 
 								if ( $order->get_formatted_shipping_address() ) {
-									echo '<p><strong>' . __( 'Address', 'woocommerce' ) . ':</strong>' . wp_kses( $order->get_formatted_shipping_address(), array( 'br' => array() ) ) . '</p>';
+									echo '<p><strong>' . __( 'Address:', 'woocommerce' ) . '</strong>' . wp_kses( $order->get_formatted_shipping_address(), array( 'br' => array() ) ) . '</p>';
 								} else {
-									echo '<p class="none_set"><strong>' . __( 'Address', 'woocommerce' ) . ':</strong> ' . __( 'No shipping address set.', 'woocommerce' ) . '</p>';
+									echo '<p class="none_set"><strong>' . __( 'Address:', 'woocommerce' ) . '</strong> ' . __( 'No shipping address set.', 'woocommerce' ) . '</p>';
 								}
 
 								if ( ! empty( self::$shipping_fields ) ) {
@@ -345,14 +385,18 @@ class WC_Meta_Box_Order_Data {
 
 										$field_name = 'shipping_' . $key;
 
-										if ( ! empty( $order->$field_name ) ) {
-											echo '<p><strong>' . esc_html( $field['label'] ) . ':</strong> ' . make_clickable( esc_html( $order->$field_name ) ) . '</p>';
+										if ( is_callable( array( $order, 'get_' . $field_name ) ) ) {
+											$field_value = $order->{"get_$field_name"}( 'edit' );
+										} else {
+											$field_value = $order->get_meta( '_' . $field_name );
 										}
+
+										echo '<p><strong>' . esc_html( $field['label'] ) . ':</strong> ' . make_clickable( esc_html( $field_value ) ) . '</p>';
 									}
 								}
 
 								if ( apply_filters( 'woocommerce_enable_order_notes_field', 'yes' == get_option( 'woocommerce_enable_order_comments', 'yes' ) ) && $post->post_excerpt ) {
-									echo '<p><strong>' . __( 'Customer Provided Note', 'woocommerce' ) . ':</strong> ' . nl2br( esc_html( $post->post_excerpt ) ) . '</p>';
+									echo '<p><strong>' . __( 'Customer provided note:', 'woocommerce' ) . '</strong> ' . nl2br( esc_html( $post->post_excerpt ) ) . '</p>';
 								}
 
 							echo '</div>';
@@ -365,7 +409,7 @@ class WC_Meta_Box_Order_Data {
 									if ( ! isset( $field['type'] ) ) {
 										$field['type'] = 'text';
 									}
-									if ( ! isset( $field['id'] ) ){
+									if ( ! isset( $field['id'] ) ) {
 										$field['id'] = '_shipping_' . $key;
 									}
 
@@ -382,8 +426,8 @@ class WC_Meta_Box_Order_Data {
 
 							if ( apply_filters( 'woocommerce_enable_order_notes_field', 'yes' == get_option( 'woocommerce_enable_order_comments', 'yes' ) ) ) {
 								?>
-								<p class="form-field form-field-wide"><label for="excerpt"><?php _e( 'Customer Provided Note', 'woocommerce' ) ?>:</label>
-								<textarea rows="1" cols="40" name="excerpt" tabindex="6" id="excerpt" placeholder="<?php esc_attr_e( 'Customer\'s notes about the order', 'woocommerce' ); ?>"><?php echo wp_kses_post( $post->post_excerpt ); ?></textarea></p>
+								<p class="form-field form-field-wide"><label for="excerpt"><?php _e( 'Customer provided note', 'woocommerce' ) ?>:</label>
+								<textarea rows="1" cols="40" name="excerpt" tabindex="6" id="excerpt" placeholder="<?php esc_attr_e( 'Customer notes about the order', 'woocommerce' ); ?>"><?php echo wp_kses_post( $post->post_excerpt ); ?></textarea></p>
 								<?php
 							}
 
@@ -401,72 +445,100 @@ class WC_Meta_Box_Order_Data {
 
 	/**
 	 * Save meta box data.
+	 *
+	 * @param int $order_id Order ID.
 	 */
-	public static function save( $post_id, $post ) {
+	public static function save( $order_id ) {
 		global $wpdb;
 
 		self::init_address_fields();
 
-		// Add key
-		add_post_meta( $post_id, '_order_key', uniqid( 'order_' ), true );
+		// Ensure gateways are loaded in case they need to insert data into the emails.
+		WC()->payment_gateways();
+		WC()->shipping();
 
-		// Update meta
-		update_post_meta( $post_id, '_customer_user', absint( $_POST['customer_user'] ) );
+		// Get order object.
+		$order = wc_get_order( $order_id );
+		$props = array( 'status' => wc_clean( $_POST['order_status'] ) );
 
+		// Create order key.
+		if ( ! $order->get_order_key() ) {
+			$props['order_key'] = 'wc_' . apply_filters( 'woocommerce_generate_order_key', uniqid( 'order_' ) );
+		}
+
+		// Update customer.
+		$customer_id = isset( $_POST['customer_user'] ) ? absint( $_POST['customer_user'] ) : 0;
+		if ( $customer_id !== $order->get_customer_id() ) {
+			$props['customer_id'] = $customer_id;
+		}
+
+		// Update billing fields.
 		if ( ! empty( self::$billing_fields ) ) {
 			foreach ( self::$billing_fields as $key => $field ) {
-				if ( ! isset( $field['id'] ) ){
+				if ( ! isset( $field['id'] ) ) {
 					$field['id'] = '_billing_' . $key;
 				}
-				update_post_meta( $post_id, $field['id'], wc_clean( $_POST[ $field['id'] ] ) );
+
+				if ( ! isset( $_POST[ $field['id'] ] ) ) {
+					continue;
+				}
+
+				if ( is_callable( array( $order, 'set_billing_' . $key ) ) ) {
+					$props[ 'billing_' . $key ] = wc_clean( $_POST[ $field['id'] ] );
+				} else {
+					$order->update_meta_data( $field['id'], wc_clean( $_POST[ $field['id'] ] ) );
+				}
 			}
 		}
 
+		// Update shipping fields.
 		if ( ! empty( self::$shipping_fields ) ) {
 			foreach ( self::$shipping_fields as $key => $field ) {
-				if ( ! isset( $field['id'] ) ){
+				if ( ! isset( $field['id'] ) ) {
 					$field['id'] = '_shipping_' . $key;
 				}
-				update_post_meta( $post_id, $field['id'], wc_clean( $_POST[ $field['id'] ] ) );
+
+				if ( ! isset( $_POST[ $field['id'] ] ) ) {
+					continue;
+				}
+
+				if ( is_callable( array( $order, 'set_shipping_' . $key ) ) ) {
+					$props[ 'shipping_' . $key ] = wc_clean( $_POST[ $field['id'] ] );
+				} else {
+					$order->update_meta_data( $field['id'], wc_clean( $_POST[ $field['id'] ] ) );
+				}
 			}
 		}
 
 		if ( isset( $_POST['_transaction_id'] ) ) {
-			update_post_meta( $post_id, '_transaction_id', wc_clean( $_POST[ '_transaction_id' ] ) );
+			$props['transaction_id'] = wc_clean( $_POST['_transaction_id'] );
 		}
 
-		// Payment method handling
-		if ( get_post_meta( $post_id, '_payment_method', true ) !== stripslashes( $_POST['_payment_method'] ) ) {
-
+		// Payment method handling.
+		if ( $order->get_payment_method() !== wp_unslash( $_POST['_payment_method'] ) ) {
 			$methods              = WC()->payment_gateways->payment_gateways();
 			$payment_method       = wc_clean( $_POST['_payment_method'] );
 			$payment_method_title = $payment_method;
 
-			if ( isset( $methods) && isset( $methods[ $payment_method ] ) ) {
+			if ( isset( $methods ) && isset( $methods[ $payment_method ] ) ) {
 				$payment_method_title = $methods[ $payment_method ]->get_title();
 			}
 
-			update_post_meta( $post_id, '_payment_method', $payment_method );
-			update_post_meta( $post_id, '_payment_method_title', $payment_method_title );
+			$props['payment_method'] = $payment_method;
+			$props['payment_method_title'] = $payment_method_title;
 		}
 
-		// Update date
+		// Update date.
 		if ( empty( $_POST['order_date'] ) ) {
-			$date = current_time('timestamp');
+			$date = current_time( 'timestamp', true );
 		} else {
-			$date = strtotime( $_POST['order_date'] . ' ' . (int) $_POST['order_date_hour'] . ':' . (int) $_POST['order_date_minute'] . ':00' );
+			$date = gmdate( 'Y-m-d H:i:s', strtotime( $_POST['order_date'] . ' ' . (int) $_POST['order_date_hour'] . ':' . (int) $_POST['order_date_minute'] . ':00' ) );
 		}
 
-		$date = date_i18n( 'Y-m-d H:i:s', $date );
+		$props['date_created'] = $date;
 
-		$wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET post_date = %s, post_date_gmt = %s WHERE ID = %s", $date, get_gmt_from_date( $date ), $post_id ) );
-
-		// Order data saved, now get it so we can manipulate status
-		$order = wc_get_order( $post_id );
-
-		// Order status
-		$order->update_status( $_POST['order_status'], '', true );
-
-		wc_delete_shop_order_transients( $post_id );
+		// Save order data.
+		$order->set_props( $props );
+		$order->save();
 	}
 }
diff --git a/includes/admin/meta-boxes/class-wc-meta-box-order-downloads.php b/includes/admin/meta-boxes/class-wc-meta-box-order-downloads.php
index a9481285779..f965f4a77b2 100644
--- a/includes/admin/meta-boxes/class-wc-meta-box-order-downloads.php
+++ b/includes/admin/meta-boxes/class-wc-meta-box-order-downloads.php
@@ -19,54 +19,53 @@ class WC_Meta_Box_Order_Downloads {
 
 	/**
 	 * Output the metabox.
+	 *
+	 * @param WP_Post $post
 	 */
 	public static function output( $post ) {
 		global $post, $wpdb;
 		?>
 		<div class="order_download_permissions wc-metaboxes-wrapper">
 
-			<div class="wc-metaboxes">
-				<?php
-					$download_permissions = $wpdb->get_results( $wpdb->prepare( "
-						SELECT * FROM {$wpdb->prefix}woocommerce_downloadable_product_permissions
-						WHERE order_id = %d ORDER BY product_id
-					", $post->ID ) );
+			<div class="wc-metaboxes"><?php
+				$data_store = WC_Data_Store::load( 'customer-download' );
+				$download_permissions = $data_store->get_downloads( array(
+					'order_id' => $post->ID,
+					'orderby'  => 'product_id',
+				) );
 
-					$product      = null;
-					$loop         = 0;
-					$file_counter = 1;
+				$product      = null;
+				$loop         = 0;
+				$file_counter = 1;
 
-					if ( $download_permissions && sizeof( $download_permissions ) > 0 ) foreach ( $download_permissions as $download ) {
-
-						if ( ! $product || $product->id != $download->product_id ) {
-							$product      = wc_get_product( absint( $download->product_id ) );
+				if ( $download_permissions && sizeof( $download_permissions ) > 0 ) {
+					foreach ( $download_permissions as $download ) {
+						if ( ! $product || $product->get_id() !== $download->get_product_id() ) {
+							$product      = wc_get_product( $download->get_product_id() );
 							$file_counter = 1;
 						}
 
 						// don't show permissions to files that have since been removed
-						if ( ! $product || ! $product->exists() || ! $product->has_file( $download->download_id ) )
+						if ( ! $product || ! $product->exists() || ! $product->has_file( $download->get_download_id() ) ) {
 							continue;
+						}
 
 						// Show file title instead of count if set
-						$file = $product->get_file( $download->download_id );
-						if ( isset( $file['name'] ) ) {
-							$file_count = $file['name'];
-						} else {
-							$file_count = sprintf( __( 'File %d', 'woocommerce' ), $file_counter );
-						}
+						$file       = $product->get_file( $download->get_download_id() );
+						$file_count = isset( $file['name'] ) ? $file['name'] : sprintf( __( 'File %d', 'woocommerce' ), $file_counter );
 
 						include( 'views/html-order-download-permission.php' );
 
 						$loop++;
 						$file_counter++;
 					}
-				?>
-			</div>
+				}
+			?></div>
 
 			<div class="toolbar">
 				<p class="buttons">
-					<input type="hidden" id="grant_access_id" name="grant_access_id" data-multiple="true" class="wc-product-search" style="width: 400px;" data-placeholder="<?php esc_attr_e( 'Search for a downloadable product&hellip;', 'woocommerce' ); ?>" data-action="woocommerce_json_search_downloadable_products_and_variations" />
-					<button type="button" class="button grant_access"><?php _e( 'Grant Access', 'woocommerce' ); ?></button>
+					<select id="grant_access_id" class="wc-product-search" name="grant_access_id[]" multiple="multiple" style="width: 400px;" data-placeholder="<?php esc_attr_e( 'Search for a downloadable product&hellip;', 'woocommerce' ); ?>" data-action="woocommerce_json_search_downloadable_products_and_variations"></select>
+					<button type="button" class="button grant_access"><?php _e( 'Grant access', 'woocommerce' ); ?></button>
 				</p>
 				<div class="clear"></div>
 			</div>
@@ -77,51 +76,25 @@ class WC_Meta_Box_Order_Downloads {
 
 	/**
 	 * Save meta box data.
+	 *
+	 * @param int $post_id
+	 * @param WP_Post $post
 	 */
 	public static function save( $post_id, $post ) {
-		global $wpdb;
+		if ( isset( $_POST['permission_id'] ) ) {
+			$permission_ids      = $_POST['permission_id'];
+			$downloads_remaining = $_POST['downloads_remaining'];
+			$access_expires      = $_POST['access_expires'];
+			$max                 = max( array_keys( $permission_ids ) );
 
-		if ( isset( $_POST['download_id'] ) ) {
-
-			// Download data
-			$download_ids           = $_POST['download_id'];
-			$product_ids            = $_POST['product_id'];
-			$downloads_remaining    = $_POST['downloads_remaining'];
-			$access_expires         = $_POST['access_expires'];
-
-			// Order data
-			$customer_email  = get_post_meta( $post->ID, '_billing_email', true );
-			$customer_user   = get_post_meta( $post->ID, '_customer_user', true );
-			$product_ids_max = max( array_keys( $product_ids ) );
-
-			for ( $i = 0; $i <= $product_ids_max; $i ++ ) {
-
-				if ( ! isset( $product_ids[ $i ] ) ) {
+			for ( $i = 0; $i <= $max; $i ++ ) {
+				if ( ! isset( $permission_ids[ $i ] ) ) {
 					continue;
 				}
-
-				$data = array(
-					'user_id'				=> absint( $customer_user ),
-					'user_email' 			=> wc_clean( $customer_email ),
-					'downloads_remaining'	=> wc_clean( $downloads_remaining[ $i ] )
-				);
-
-				$format = array( '%d', '%s', '%s' );
-
-				$expiry  = ( array_key_exists( $i, $access_expires ) && '' != $access_expires[ $i ] ) ? date_i18n( 'Y-m-d', strtotime( $access_expires[ $i ] ) ) : null;
-
-				$data['access_expires'] = $expiry;
-				$format[]               = '%s';
-
-				$wpdb->update( $wpdb->prefix . "woocommerce_downloadable_product_permissions",
-					$data,
-					array(
-						'order_id' 		=> $post_id,
-						'product_id' 	=> absint( $product_ids[ $i ] ),
-						'download_id'	=> wc_clean( $download_ids[ $i ] )
-						),
-					$format, array( '%d', '%d', '%s' )
-				);
+				$download = new WC_Customer_Download( $permission_ids[ $i ] );
+				$download->set_downloads_remaining( wc_clean( $downloads_remaining[ $i ] ) );
+				$download->set_access_expires( array_key_exists( $i, $access_expires ) && '' !== $access_expires[ $i ] ? strtotime( $access_expires[ $i ] ) : '' );
+				$download->save();
 			}
 		}
 	}
diff --git a/includes/admin/meta-boxes/class-wc-meta-box-order-items.php b/includes/admin/meta-boxes/class-wc-meta-box-order-items.php
index 3c848ccd855..5303d209d96 100644
--- a/includes/admin/meta-boxes/class-wc-meta-box-order-items.php
+++ b/includes/admin/meta-boxes/class-wc-meta-box-order-items.php
@@ -21,6 +21,8 @@ class WC_Meta_Box_Order_Items {
 
 	/**
 	 * Output the metabox.
+	 *
+	 * @param WP_Post $post
 	 */
 	public static function output( $post ) {
 		global $post, $thepostid, $theorder;
@@ -41,6 +43,9 @@ class WC_Meta_Box_Order_Items {
 
 	/**
 	 * Save meta box data.
+	 *
+	 * @param int $post_id
+	 * @param WP_Post $post
 	 */
 	public static function save( $post_id, $post ) {
 		wc_save_order_items( $post_id, $_POST );
diff --git a/includes/admin/meta-boxes/class-wc-meta-box-order-notes.php b/includes/admin/meta-boxes/class-wc-meta-box-order-notes.php
index 13ce7d5ca99..4e269154c55 100644
--- a/includes/admin/meta-boxes/class-wc-meta-box-order-notes.php
+++ b/includes/admin/meta-boxes/class-wc-meta-box-order-notes.php
@@ -19,6 +19,8 @@ class WC_Meta_Box_Order_Notes {
 
 	/**
 	 * Output the metabox.
+	 *
+	 * @param WP_Post $post
 	 */
 	public static function output( $post ) {
 		global $post;
@@ -28,7 +30,7 @@ class WC_Meta_Box_Order_Notes {
 			'orderby'   => 'comment_ID',
 			'order'     => 'DESC',
 			'approve'   => 'approve',
-			'type'      => 'order_note'
+			'type'      => 'order_note',
 		);
 
 		remove_filter( 'comments_clauses', array( 'WC_Comments', 'exclude_order_comments' ), 10, 1 );
@@ -41,25 +43,30 @@ class WC_Meta_Box_Order_Notes {
 
 		if ( $notes ) {
 
-			foreach( $notes as $note ) {
-
-				$note_classes = get_comment_meta( $note->comment_ID, 'is_customer_note', true ) ? array( 'customer-note', 'note' ) : array( 'note' );
-				$note_classes = apply_filters( 'woocommerce_order_note_class', $note_classes, $note );
+			foreach ( $notes as $note ) {
 
+				$note_classes   = array( 'note' );
+				$note_classes[] = get_comment_meta( $note->comment_ID, 'is_customer_note', true ) ? 'customer-note' : '';
+				$note_classes[] = ( __( 'WooCommerce', 'woocommerce' ) === $note->comment_author ) ? 'system-note' : '';
+				$note_classes   = apply_filters( 'woocommerce_order_note_class', array_filter( $note_classes ), $note );
 				?>
-				<li rel="<?php echo absint( $note->comment_ID ) ; ?>" class="<?php echo esc_attr( implode( ' ', $note_classes ) ); ?>">
+				<li rel="<?php echo absint( $note->comment_ID ); ?>" class="<?php echo esc_attr( implode( ' ', $note_classes ) ); ?>">
 					<div class="note_content">
 						<?php echo wpautop( wptexturize( wp_kses_post( $note->comment_content ) ) ); ?>
 					</div>
 					<p class="meta">
 						<abbr class="exact-date" title="<?php echo $note->comment_date; ?>"><?php printf( __( 'added on %1$s at %2$s', 'woocommerce' ), date_i18n( wc_date_format(), strtotime( $note->comment_date ) ), date_i18n( wc_time_format(), strtotime( $note->comment_date ) ) ); ?></abbr>
-						<?php if ( $note->comment_author !== __( 'WooCommerce', 'woocommerce' ) ) printf( ' ' . __( 'by %s', 'woocommerce' ), $note->comment_author ); ?>
-						<a href="#" class="delete_note"><?php _e( 'Delete note', 'woocommerce' ); ?></a>
+						<?php
+						if ( __( 'WooCommerce', 'woocommerce' ) !== $note->comment_author ) :
+							/* translators: %s: note author */
+							printf( ' ' . __( 'by %s', 'woocommerce' ), $note->comment_author );
+						endif;
+						?>
+						<a href="#" class="delete_note" role="button"><?php _e( 'Delete note', 'woocommerce' ); ?></a>
 					</p>
 				</li>
 				<?php
 			}
-
 		} else {
 			echo '<li>' . __( 'There are no notes yet.', 'woocommerce' ) . '</li>';
 		}
@@ -67,16 +74,17 @@ class WC_Meta_Box_Order_Notes {
 		echo '</ul>';
 		?>
 		<div class="add_note">
-			<h4><?php _e( 'Add note', 'woocommerce' ); ?> <?php echo wc_help_tip( __( 'Add a note for your reference, or add a customer note (the user will be notified).', 'woocommerce' ) ); ?></h4>
 			<p>
+				<label for="add_order_note"><?php _e( 'Add note', 'woocommerce' ); ?> <?php echo wc_help_tip( __( 'Add a note for your reference, or add a customer note (the user will be notified).', 'woocommerce' ) ); ?></label>
 				<textarea type="text" name="order_note" id="add_order_note" class="input-text" cols="20" rows="5"></textarea>
 			</p>
 			<p>
+				<label for="order_note_type" class="screen-reader-text"><?php _e( 'Note type', 'woocommerce' ); ?></label>
 				<select name="order_note_type" id="order_note_type">
 					<option value=""><?php _e( 'Private note', 'woocommerce' ); ?></option>
 					<option value="customer"><?php _e( 'Note to customer', 'woocommerce' ); ?></option>
 				</select>
-				<a href="#" class="add_note button"><?php _e( 'Add', 'woocommerce' ); ?></a>
+				<button type="button" class="add_note button"><?php _e( 'Add', 'woocommerce' ); ?></button>
 			</p>
 		</div>
 		<?php
diff --git a/includes/admin/meta-boxes/class-wc-meta-box-product-data.php b/includes/admin/meta-boxes/class-wc-meta-box-product-data.php
index 5ef07b777d5..2d7fc3bf4c6 100644
--- a/includes/admin/meta-boxes/class-wc-meta-box-product-data.php
+++ b/includes/admin/meta-boxes/class-wc-meta-box-product-data.php
@@ -7,11 +7,11 @@
  * @author   WooThemes
  * @category Admin
  * @package  WooCommerce/Admin/Meta Boxes
- * @version  2.4.0
+ * @version  3.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
 /**
@@ -21,1532 +21,405 @@ class WC_Meta_Box_Product_Data {
 
 	/**
 	 * Output the metabox.
+	 *
+	 * @param WP_Post $post
 	 */
 	public static function output( $post ) {
-		global $post, $thepostid;
+		global $post, $thepostid, $product_object;
 
-		wp_nonce_field( 'woocommerce_save_data', 'woocommerce_meta_nonce' );
+		$thepostid      = $post->ID;
+		$product_object = $thepostid ? wc_get_product( $thepostid ) : new WC_Product;
 
-		$thepostid = $post->ID;
+		include( 'views/html-product-data-panel.php' );
+	}
 
-		if ( $terms = wp_get_object_terms( $post->ID, 'product_type' ) ) {
-			$product_type = sanitize_title( current( $terms )->name );
-		} else {
-			$product_type = apply_filters( 'default_product_type', 'simple' );
-		}
+	/**
+	 * Show tab content/settings.
+	 */
+	private static function output_tabs() {
+		global $post, $thepostid, $product_object;
 
-		$product_type_selector = apply_filters( 'product_type_selector', array(
-			'simple'   => __( 'Simple product', 'woocommerce' ),
-			'grouped'  => __( 'Grouped product', 'woocommerce' ),
-			'external' => __( 'External/Affiliate product', 'woocommerce' ),
-			'variable' => __( 'Variable product', 'woocommerce' )
-		), $product_type );
+		include( 'views/html-product-data-general.php' );
+		include( 'views/html-product-data-inventory.php' );
+		include( 'views/html-product-data-shipping.php' );
+		include( 'views/html-product-data-linked-products.php' );
+		include( 'views/html-product-data-attributes.php' );
+		include( 'views/html-product-data-advanced.php' );
+	}
 
-		$type_box = '<label for="product-type"><select id="product-type" name="product-type"><optgroup label="' . esc_attr__( 'Product Type', 'woocommerce' ) . '">';
-
-		foreach ( $product_type_selector as $value => $label ) {
-			$type_box .= '<option value="' . esc_attr( $value ) . '" ' . selected( $product_type, $value, false ) .'>' . esc_html( $label ) . '</option>';
-		}
-
-		$type_box .= '</optgroup></select></label>';
-
-		$product_type_options = apply_filters( 'product_type_options', array(
+	/**
+	 * Return array of product type options.
+	 * @return array
+	 */
+	private static function get_product_type_options() {
+		return apply_filters( 'product_type_options', array(
 			'virtual' => array(
 				'id'            => '_virtual',
 				'wrapper_class' => 'show_if_simple',
 				'label'         => __( 'Virtual', 'woocommerce' ),
-				'description'   => __( 'Virtual products are intangible and aren\'t shipped.', 'woocommerce' ),
-				'default'       => 'no'
+				'description'   => __( 'Virtual products are intangible and are not shipped.', 'woocommerce' ),
+				'default'       => 'no',
 			),
 			'downloadable' => array(
 				'id'            => '_downloadable',
 				'wrapper_class' => 'show_if_simple',
 				'label'         => __( 'Downloadable', 'woocommerce' ),
 				'description'   => __( 'Downloadable products give access to a file upon purchase.', 'woocommerce' ),
-				'default'       => 'no'
-			)
+				'default'       => 'no',
+			),
+		) );
+	}
+
+	/**
+	 * Return array of tabs to show.
+	 * @return array
+	 */
+	private static function get_product_data_tabs() {
+		$tabs = apply_filters( 'woocommerce_product_data_tabs', array(
+			'general' => array(
+				'label'    => __( 'General', 'woocommerce' ),
+				'target'   => 'general_product_data',
+				'class'    => array( 'hide_if_grouped' ),
+				'priority' => 10,
+			),
+			'inventory' => array(
+				'label'    => __( 'Inventory', 'woocommerce' ),
+				'target'   => 'inventory_product_data',
+				'class'    => array( 'show_if_simple', 'show_if_variable', 'show_if_grouped', 'show_if_external' ),
+				'priority' => 20,
+			),
+			'shipping' => array(
+				'label'    => __( 'Shipping', 'woocommerce' ),
+				'target'   => 'shipping_product_data',
+				'class'    => array( 'hide_if_virtual', 'hide_if_grouped', 'hide_if_external' ),
+				'priority' => 30,
+			),
+			'linked_product' => array(
+				'label'    => __( 'Linked Products', 'woocommerce' ),
+				'target'   => 'linked_product_data',
+				'class'    => array(),
+				'priority' => 40,
+			),
+			'attribute' => array(
+				'label'    => __( 'Attributes', 'woocommerce' ),
+				'target'   => 'product_attributes',
+				'class'    => array(),
+				'priority' => 50,
+			),
+			'variations' => array(
+				'label'    => __( 'Variations', 'woocommerce' ),
+				'target'   => 'variable_product_options',
+				'class'    => array( 'variations_tab', 'show_if_variable' ),
+				'priority' => 60,
+			),
+			'advanced' => array(
+				'label'    => __( 'Advanced', 'woocommerce' ),
+				'target'   => 'advanced_product_data',
+				'class'    => array(),
+				'priority' => 70,
+			),
 		) );
 
-		foreach ( $product_type_options as $key => $option ) {
-			$selected_value = get_post_meta( $post->ID, '_' . $key, true );
+		// Sort tabs based on priority.
+		uasort( $tabs, array( __CLASS__, 'product_data_tabs_sort' ) );
 
-			if ( '' == $selected_value && isset( $option['default'] ) ) {
-				$selected_value = $option['default'];
-			}
+		return $tabs;
+	}
 
-			$type_box .= '<label for="' . esc_attr( $option['id'] ) . '" class="'. esc_attr( $option['wrapper_class'] ) . ' tips" data-tip="' . esc_attr( $option['description'] ) . '">' . esc_html( $option['label'] ) . ': <input type="checkbox" name="' . esc_attr( $option['id'] ) . '" id="' . esc_attr( $option['id'] ) . '" ' . checked( $selected_value, 'yes', false ) .' /></label>';
+	/**
+	 * Callback to sort product data tabs on priority.
+	 *
+	 * @since 3.1.0
+	 * @param int $a First item.
+	 * @param int $b Second item.
+	 *
+	 * @return bool
+	 */
+	private static function product_data_tabs_sort( $a, $b ) {
+		if ( ! isset( $a['priority'], $b['priority'] ) ) {
+			return -1;
 		}
 
-		?>
-		<div class="panel-wrap product_data">
-
-			<span class="type_box"> &mdash; <?php echo $type_box; ?></span>
-
-			<ul class="product_data_tabs wc-tabs" style="display:none;">
-				<?php
-					$product_data_tabs = apply_filters( 'woocommerce_product_data_tabs', array(
-						'general' => array(
-							'label'  => __( 'General', 'woocommerce' ),
-							'target' => 'general_product_data',
-							'class'  => array( 'hide_if_grouped' ),
-						),
-						'inventory' => array(
-							'label'  => __( 'Inventory', 'woocommerce' ),
-							'target' => 'inventory_product_data',
-							'class'  => array( 'show_if_simple', 'show_if_variable', 'show_if_grouped' ),
-						),
-						'shipping' => array(
-							'label'  => __( 'Shipping', 'woocommerce' ),
-							'target' => 'shipping_product_data',
-							'class'  => array( 'hide_if_virtual', 'hide_if_grouped', 'hide_if_external' ),
-						),
-						'linked_product' => array(
-							'label'  => __( 'Linked Products', 'woocommerce' ),
-							'target' => 'linked_product_data',
-							'class'  => array(),
-						),
-						'attribute' => array(
-							'label'  => __( 'Attributes', 'woocommerce' ),
-							'target' => 'product_attributes',
-							'class'  => array(),
-						),
-						'variations' => array(
-							'label'  => __( 'Variations', 'woocommerce' ),
-							'target' => 'variable_product_options',
-							'class'  => array( 'variations_tab', 'show_if_variable' ),
-						),
-						'advanced' => array(
-							'label'  => __( 'Advanced', 'woocommerce' ),
-							'target' => 'advanced_product_data',
-							'class'  => array(),
-						)
-					) );
-
-					foreach ( $product_data_tabs as $key => $tab ) {
-						?><li class="<?php echo $key; ?>_options <?php echo $key; ?>_tab <?php echo implode( ' ' , $tab['class'] ); ?>">
-							<a href="#<?php echo $tab['target']; ?>"><?php echo esc_html( $tab['label'] ); ?></a>
-						</li><?php
-					}
-
-					do_action( 'woocommerce_product_write_panel_tabs' );
-				?>
-			</ul>
-			<div id="general_product_data" class="panel woocommerce_options_panel"><?php
-
-				echo '<div class="options_group hide_if_grouped">';
-
-					// SKU
-					if ( wc_product_sku_enabled() ) {
-						woocommerce_wp_text_input( array( 'id' => '_sku', 'label' => '<abbr title="'. __( 'Stock Keeping Unit', 'woocommerce' ) .'">' . __( 'SKU', 'woocommerce' ) . '</abbr>', 'desc_tip' => 'true', 'description' => __( 'SKU refers to a Stock-keeping unit, a unique identifier for each distinct product and service that can be purchased.', 'woocommerce' ) ) );
-					} else {
-						echo '<input type="hidden" name="_sku" value="' . esc_attr( get_post_meta( $thepostid, '_sku', true ) ) . '" />';
-					}
-
-					do_action( 'woocommerce_product_options_sku' );
-
-				echo '</div>';
-
-				echo '<div class="options_group show_if_external">';
-
-					// External URL
-					woocommerce_wp_text_input( array( 'id' => '_product_url', 'label' => __( 'Product URL', 'woocommerce' ), 'placeholder' => 'http://', 'description' => __( 'Enter the external URL to the product.', 'woocommerce' ) ) );
-
-					// Button text
-					woocommerce_wp_text_input( array( 'id' => '_button_text', 'label' => __( 'Button text', 'woocommerce' ), 'placeholder' => _x('Buy product', 'placeholder', 'woocommerce'), 'description' => __( 'This text will be shown on the button linking to the external product.', 'woocommerce' ) ) );
-
-				echo '</div>';
-
-				echo '<div class="options_group pricing show_if_simple show_if_external">';
-
-					// Price
-					woocommerce_wp_text_input( array( 'id' => '_regular_price', 'label' => __( 'Regular Price', 'woocommerce' ) . ' (' . get_woocommerce_currency_symbol() . ')', 'data_type' => 'price' ) );
-
-					// Special Price
-					woocommerce_wp_text_input( array( 'id' => '_sale_price', 'data_type' => 'price', 'label' => __( 'Sale Price', 'woocommerce' ) . ' ('.get_woocommerce_currency_symbol().')', 'description' => '<a href="#" class="sale_schedule">' . __( 'Schedule', 'woocommerce' ) . '</a>' ) );
-
-					// Special Price date range
-					$sale_price_dates_from = ( $date = get_post_meta( $thepostid, '_sale_price_dates_from', true ) ) ? date_i18n( 'Y-m-d', $date ) : '';
-					$sale_price_dates_to   = ( $date = get_post_meta( $thepostid, '_sale_price_dates_to', true ) ) ? date_i18n( 'Y-m-d', $date ) : '';
-
-					echo '<p class="form-field sale_price_dates_fields">
-								<label for="_sale_price_dates_from">' . __( 'Sale Price Dates', 'woocommerce' ) . '</label>
-								<input type="text" class="short" name="_sale_price_dates_from" id="_sale_price_dates_from" value="' . esc_attr( $sale_price_dates_from ) . '" placeholder="' . _x( 'From&hellip;', 'placeholder', 'woocommerce' ) . ' YYYY-MM-DD" maxlength="10" pattern="[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|1[0-9]|2[0-9]|3[01])" />
-								<input type="text" class="short" name="_sale_price_dates_to" id="_sale_price_dates_to" value="' . esc_attr( $sale_price_dates_to ) . '" placeholder="' . _x( 'To&hellip;', 'placeholder', 'woocommerce' ) . '  YYYY-MM-DD" maxlength="10" pattern="[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|1[0-9]|2[0-9]|3[01])" />
-								<a href="#" class="cancel_sale_schedule">'. __( 'Cancel', 'woocommerce' ) . '</a>' . wc_help_tip( __( 'The sale will end at the beginning of the set date.', 'woocommerce' ) ) . '
-							</p>';
-
-					do_action( 'woocommerce_product_options_pricing' );
-
-				echo '</div>';
-
-				echo '<div class="options_group show_if_downloadable">';
-
-					?>
-					<div class="form-field downloadable_files">
-						<label><?php _e( 'Downloadable Files', 'woocommerce' ); ?>:</label>
-						<table class="widefat">
-							<thead>
-								<tr>
-									<th class="sort">&nbsp;</th>
-									<th><?php _e( 'Name', 'woocommerce' ); ?> <?php echo wc_help_tip( __( 'This is the name of the download shown to the customer.', 'woocommerce' ) ); ?></th>
-									<th colspan="2"><?php _e( 'File URL', 'woocommerce' ); ?> <?php echo wc_help_tip( __( 'This is the URL or absolute path to the file which customers will get access to. URLs entered here should already be encoded.', 'woocommerce' ) ); ?></th>
-									<th>&nbsp;</th>
-								</tr>
-							</thead>
-							<tbody>
-								<?php
-								$downloadable_files = get_post_meta( $post->ID, '_downloadable_files', true );
-
-								if ( $downloadable_files ) {
-									foreach ( $downloadable_files as $key => $file ) {
-										include( 'views/html-product-download.php' );
-									}
-								}
-								?>
-							</tbody>
-							<tfoot>
-								<tr>
-									<th colspan="5">
-										<a href="#" class="button insert" data-row="<?php
-											$file = array(
-												'file' => '',
-												'name' => ''
-											);
-											ob_start();
-											include( 'views/html-product-download.php' );
-											echo esc_attr( ob_get_clean() );
-										?>"><?php _e( 'Add File', 'woocommerce' ); ?></a>
-									</th>
-								</tr>
-							</tfoot>
-						</table>
-					</div>
-					<?php
-
-					// Download Limit
-					woocommerce_wp_text_input( array( 'id' => '_download_limit', 'label' => __( 'Download Limit', 'woocommerce' ), 'placeholder' => __( 'Unlimited', 'woocommerce' ), 'description' => __( 'Leave blank for unlimited re-downloads.', 'woocommerce' ), 'type' => 'number', 'custom_attributes' => array(
-						'step' 	=> '1',
-						'min'	=> '0'
-					) ) );
-
-					// Expirey
-					woocommerce_wp_text_input( array( 'id' => '_download_expiry', 'label' => __( 'Download Expiry', 'woocommerce' ), 'placeholder' => __( 'Never', 'woocommerce' ), 'description' => __( 'Enter the number of days before a download link expires, or leave blank.', 'woocommerce' ), 'type' => 'number', 'custom_attributes' => array(
-						'step' 	=> '1',
-						'min'	=> '0'
-					) ) );
-
-					 // Download Type
-					woocommerce_wp_select( array( 'id' => '_download_type', 'label' => __( 'Download Type', 'woocommerce' ), 'description' => sprintf( __( 'Choose a download type - this controls the <a href="%s">schema</a>.', 'woocommerce' ), 'http://schema.org/' ), 'options' => array(
-						''            => __( 'Standard Product', 'woocommerce' ),
-						'application' => __( 'Application/Software', 'woocommerce' ),
-						'music'       => __( 'Music', 'woocommerce' ),
-					) ) );
-
-					do_action( 'woocommerce_product_options_downloads' );
-
-				echo '</div>';
-
-				if ( wc_tax_enabled() ) {
-
-					echo '<div class="options_group show_if_simple show_if_external show_if_variable">';
-
-						// Tax
-						woocommerce_wp_select( array(
-							'id'      => '_tax_status',
-							'label'   => __( 'Tax Status', 'woocommerce' ),
-							'options' => array(
-								'taxable' 	=> __( 'Taxable', 'woocommerce' ),
-								'shipping' 	=> __( 'Shipping only', 'woocommerce' ),
-								'none' 		=> _x( 'None', 'Tax status', 'woocommerce' )
-							),
-							'desc_tip'    => 'true',
-							'description' => __( 'Define whether or not the entire product is taxable, or just the cost of shipping it.', 'woocommerce' )
-						) );
-
-						$tax_classes         = WC_Tax::get_tax_classes();
-						$classes_options     = array();
-						$classes_options[''] = __( 'Standard', 'woocommerce' );
-
-						if ( ! empty( $tax_classes ) ) {
-							foreach ( $tax_classes as $class ) {
-								$classes_options[ sanitize_title( $class ) ] = esc_html( $class );
-							}
-						}
-
-						woocommerce_wp_select( array(
-							'id'          => '_tax_class',
-							'label'       => __( 'Tax Class', 'woocommerce' ),
-							'options'     => $classes_options,
-							'desc_tip'    => 'true',
-							'description' => __( 'Choose a tax class for this product. Tax classes are used to apply different tax rates specific to certain types of product.', 'woocommerce' )
-						) );
-
-						do_action( 'woocommerce_product_options_tax' );
-
-					echo '</div>';
-
-				}
-
-				do_action( 'woocommerce_product_options_general_product_data' );
-				?>
-			</div>
-
-			<div id="inventory_product_data" class="panel woocommerce_options_panel">
-
-				<?php
-
-				echo '<div class="options_group">';
-
-				if ( 'yes' == get_option( 'woocommerce_manage_stock' ) ) {
-
-					// manage stock
-					woocommerce_wp_checkbox( array( 'id' => '_manage_stock', 'wrapper_class' => 'show_if_simple show_if_variable', 'label' => __( 'Manage stock?', 'woocommerce' ), 'description' => __( 'Enable stock management at product level', 'woocommerce' ) ) );
-
-					do_action( 'woocommerce_product_options_stock' );
-
-					echo '<div class="stock_fields show_if_simple show_if_variable">';
-
-					// Stock
-					woocommerce_wp_text_input( array(
-						'id'                => '_stock',
-						'label'             => __( 'Stock Qty', 'woocommerce' ),
-						'desc_tip'          => true,
-						'description'       => __( 'Stock quantity. If this is a variable product this value will be used to control stock for all variations, unless you define stock at variation level.', 'woocommerce' ),
-						'type'              => 'number',
-						'custom_attributes' => array(
-							'step' => 'any'
-						),
-						'data_type'         => 'stock'
-					) );
-
-					// Backorders?
-					woocommerce_wp_select( array( 'id' => '_backorders', 'label' => __( 'Allow Backorders?', 'woocommerce' ), 'options' => array(
-						'no'     => __( 'Do not allow', 'woocommerce' ),
-						'notify' => __( 'Allow, but notify customer', 'woocommerce' ),
-						'yes'    => __( 'Allow', 'woocommerce' )
-					), 'desc_tip' => true, 'description' => __( 'If managing stock, this controls whether or not backorders are allowed. If enabled, stock quantity can go below 0.', 'woocommerce' ) ) );
-
-					do_action( 'woocommerce_product_options_stock_fields' );
-
-					echo '</div>';
-
-				}
-
-				// Stock status
-				woocommerce_wp_select( array( 'id' => '_stock_status', 'wrapper_class' => 'hide_if_variable', 'label' => __( 'Stock status', 'woocommerce' ), 'options' => array(
-					'instock' => __( 'In stock', 'woocommerce' ),
-					'outofstock' => __( 'Out of stock', 'woocommerce' )
-				), 'desc_tip' => true, 'description' => __( 'Controls whether or not the product is listed as "in stock" or "out of stock" on the frontend.', 'woocommerce' ) ) );
-
-				do_action( 'woocommerce_product_options_stock_status' );
-
-				echo '</div>';
-
-				echo '<div class="options_group show_if_simple show_if_variable">';
-
-				// Individual product
-				woocommerce_wp_checkbox( array( 'id' => '_sold_individually', 'wrapper_class' => 'show_if_simple show_if_variable', 'label' => __( 'Sold Individually', 'woocommerce' ), 'description' => __( 'Enable this to only allow one of this item to be bought in a single order', 'woocommerce' ) ) );
-
-				do_action( 'woocommerce_product_options_sold_individually' );
-
-				echo '</div>';
-
-				do_action( 'woocommerce_product_options_inventory_product_data' );
-				?>
-
-			</div>
-
-			<div id="shipping_product_data" class="panel woocommerce_options_panel">
-
-				<?php
-
-				echo '<div class="options_group">';
-
-					// Weight
-					if ( wc_product_weight_enabled() ) {
-						woocommerce_wp_text_input( array( 'id' => '_weight', 'label' => __( 'Weight', 'woocommerce' ) . ' (' . get_option( 'woocommerce_weight_unit' ) . ')', 'placeholder' => wc_format_localized_decimal( 0 ), 'desc_tip' => 'true', 'description' => __( 'Weight in decimal form', 'woocommerce' ), 'type' => 'text', 'data_type' => 'decimal' ) );
-					}
-
-					// Size fields
-					if ( wc_product_dimensions_enabled() ) {
-						?><p class="form-field dimensions_field">
-							<label for="product_length"><?php echo __( 'Dimensions', 'woocommerce' ) . ' (' . get_option( 'woocommerce_dimension_unit' ) . ')'; ?></label>
-							<span class="wrap">
-								<input id="product_length" placeholder="<?php esc_attr_e( 'Length', 'woocommerce' ); ?>" class="input-text wc_input_decimal" size="6" type="text" name="_length" value="<?php echo esc_attr( wc_format_localized_decimal( get_post_meta( $thepostid, '_length', true ) ) ); ?>" />
-								<input placeholder="<?php esc_attr_e( 'Width', 'woocommerce' ); ?>" class="input-text wc_input_decimal" size="6" type="text" name="_width" value="<?php echo esc_attr( wc_format_localized_decimal( get_post_meta( $thepostid, '_width', true ) ) ); ?>" />
-								<input placeholder="<?php esc_attr_e( 'Height', 'woocommerce' ); ?>" class="input-text wc_input_decimal last" size="6" type="text" name="_height" value="<?php echo esc_attr( wc_format_localized_decimal( get_post_meta( $thepostid, '_height', true ) ) ); ?>" />
-							</span>
-							<?php echo wc_help_tip( __( 'LxWxH in decimal form', 'woocommerce' ) ); ?>
-						</p><?php
-					}
-
-					do_action( 'woocommerce_product_options_dimensions' );
-
-				echo '</div>';
-
-				echo '<div class="options_group">';
-
-					// Shipping Class
-					$classes = get_the_terms( $thepostid, 'product_shipping_class' );
-					if ( $classes && ! is_wp_error( $classes ) ) {
-						$current_shipping_class = current( $classes )->term_id;
-					} else {
-						$current_shipping_class = '';
-					}
-
-					$args = array(
-						'taxonomy'         => 'product_shipping_class',
-						'hide_empty'       => 0,
-						'show_option_none' => __( 'No shipping class', 'woocommerce' ),
-						'name'             => 'product_shipping_class',
-						'id'               => 'product_shipping_class',
-						'selected'         => $current_shipping_class,
-						'class'            => 'select short'
-					);
-					?><p class="form-field dimensions_field"><label for="product_shipping_class"><?php _e( 'Shipping class', 'woocommerce' ); ?></label> <?php wp_dropdown_categories( $args ); ?> <?php echo wc_help_tip( __( 'Shipping classes are used by certain shipping methods to group similar products.', 'woocommerce' ) ); ?></p><?php
-
-					do_action( 'woocommerce_product_options_shipping' );
-
-				echo '</div>';
-				?>
-
-			</div>
-
-			<div id="product_attributes" class="panel wc-metaboxes-wrapper">
-				<div class="toolbar toolbar-top">
-					<span class="expand-close">
-						<a href="#" class="expand_all"><?php _e( 'Expand', 'woocommerce' ); ?></a> / <a href="#" class="close_all"><?php _e( 'Close', 'woocommerce' ); ?></a>
-					</span>
-					<select name="attribute_taxonomy" class="attribute_taxonomy">
-						<option value=""><?php _e( 'Custom product attribute', 'woocommerce' ); ?></option>
-						<?php
-							global $wc_product_attributes;
-
-							// Array of defined attribute taxonomies
-							$attribute_taxonomies = wc_get_attribute_taxonomies();
-
-							if ( $attribute_taxonomies ) {
-								foreach ( $attribute_taxonomies as $tax ) {
-									$attribute_taxonomy_name = wc_attribute_taxonomy_name( $tax->attribute_name );
-									$label = $tax->attribute_label ? $tax->attribute_label : $tax->attribute_name;
-									echo '<option value="' . esc_attr( $attribute_taxonomy_name ) . '">' . esc_html( $label ) . '</option>';
-								}
-							}
-						?>
-					</select>
-					<button type="button" class="button add_attribute"><?php _e( 'Add', 'woocommerce' ); ?></button>
-				</div>
-				<div class="product_attributes wc-metaboxes">
-					<?php
-						// Product attributes - taxonomies and custom, ordered, with visibility and variation attributes set
-						$attributes           = maybe_unserialize( get_post_meta( $thepostid, '_product_attributes', true ) );
-
-						// Output All Set Attributes
-						if ( ! empty( $attributes ) ) {
-							$attribute_keys  = array_keys( $attributes );
-							$attribute_total = sizeof( $attribute_keys );
-
-							for ( $i = 0; $i < $attribute_total; $i ++ ) {
-								$attribute     = $attributes[ $attribute_keys[ $i ] ];
-								$position      = empty( $attribute['position'] ) ? 0 : absint( $attribute['position'] );
-								$taxonomy      = '';
-								$metabox_class = array();
-
-								if ( $attribute['is_taxonomy'] ) {
-									$taxonomy = $attribute['name'];
-
-									if ( ! taxonomy_exists( $taxonomy ) ) {
-										continue;
-									}
-
-									$attribute_taxonomy = $wc_product_attributes[ $taxonomy ];
-									$metabox_class[]    = 'taxonomy';
-									$metabox_class[]    = $taxonomy;
-									$attribute_label    = wc_attribute_label( $taxonomy );
-								} else {
-									$attribute_label    = apply_filters( 'woocommerce_attribute_label', $attribute['name'], $attribute['name'] );
-								}
-
-								include( 'views/html-product-attribute.php' );
-							}
-						}
-					?>
-				</div>
-				<div class="toolbar">
-					<span class="expand-close">
-						<a href="#" class="expand_all"><?php _e( 'Expand', 'woocommerce' ); ?></a> / <a href="#" class="close_all"><?php _e( 'Close', 'woocommerce' ); ?></a>
-					</span>
-					<button type="button" class="button save_attributes button-primary"><?php _e( 'Save Attributes', 'woocommerce' ); ?></button>
-				</div>
-				<?php do_action( 'woocommerce_product_options_attributes' ); ?>
-			</div>
-			<div id="linked_product_data" class="panel woocommerce_options_panel">
-
-				<div class="options_group">
-
-					<p class="form-field">
-						<label for="upsell_ids"><?php _e( 'Up-Sells', 'woocommerce' ); ?></label>
-						<input type="hidden" class="wc-product-search" style="width: 50%;" id="upsell_ids" name="upsell_ids" data-placeholder="<?php esc_attr_e( 'Search for a product&hellip;', 'woocommerce' ); ?>" data-action="woocommerce_json_search_products" data-multiple="true" data-exclude="<?php echo intval( $post->ID ); ?>" data-selected="<?php
-							$product_ids = array_filter( array_map( 'absint', (array) get_post_meta( $post->ID, '_upsell_ids', true ) ) );
-							$json_ids    = array();
-
-							foreach ( $product_ids as $product_id ) {
-								$product = wc_get_product( $product_id );
-								if ( is_object( $product ) ) {
-									$json_ids[ $product_id ] = wp_kses_post( html_entity_decode( $product->get_formatted_name(), ENT_QUOTES, get_bloginfo( 'charset' ) ) );
-								}
-							}
-
-							echo esc_attr( json_encode( $json_ids ) );
-						?>" value="<?php echo implode( ',', array_keys( $json_ids ) ); ?>" /> <?php echo wc_help_tip( __( 'Up-sells are products which you recommend instead of the currently viewed product, for example, products that are more profitable or better quality or more expensive.', 'woocommerce' ) ); ?>
-					</p>
-
-					<p class="form-field">
-						<label for="crosssell_ids"><?php _e( 'Cross-Sells', 'woocommerce' ); ?></label>
-						<input type="hidden" class="wc-product-search" style="width: 50%;" id="crosssell_ids" name="crosssell_ids" data-placeholder="<?php esc_attr_e( 'Search for a product&hellip;', 'woocommerce' ); ?>" data-action="woocommerce_json_search_products" data-multiple="true" data-exclude="<?php echo intval( $post->ID ); ?>" data-selected="<?php
-							$product_ids = array_filter( array_map( 'absint', (array) get_post_meta( $post->ID, '_crosssell_ids', true ) ) );
-							$json_ids    = array();
-
-							foreach ( $product_ids as $product_id ) {
-								$product = wc_get_product( $product_id );
-								if ( is_object( $product ) ) {
-									$json_ids[ $product_id ] = wp_kses_post( html_entity_decode( $product->get_formatted_name(), ENT_QUOTES, get_bloginfo( 'charset' ) ) );
-								}
-							}
-
-							echo esc_attr( json_encode( $json_ids ) );
-						?>" value="<?php echo implode( ',', array_keys( $json_ids ) ); ?>" /> <?php echo wc_help_tip( __( 'Cross-sells are products which you promote in the cart, based on the current product.', 'woocommerce' ) ); ?>
-					</p>
-				</div>
-
-				<div class="options_group grouping show_if_simple show_if_external">
-
-					<p class="form-field">
-						<label for="parent_id"><?php _e( 'Grouping', 'woocommerce' ); ?></label>
-						<input type="hidden" class="wc-product-search" style="width: 50%;" id="parent_id" name="parent_id" data-placeholder="<?php esc_attr_e( 'Search for a product&hellip;', 'woocommerce' ); ?>" data-action="woocommerce_json_search_grouped_products" data-allow_clear="true" data-multiple="false" data-exclude="<?php echo intval( $post->ID ); ?>" data-selected="<?php
-							$parent_id = absint( $post->post_parent );
-
-							if ( $parent_id ) {
-								$parent    = wc_get_product( $parent_id );
-								if ( is_object( $parent ) ) {
-									$parent_title = wp_kses_post( html_entity_decode( $parent->get_formatted_name(), ENT_QUOTES, get_bloginfo( 'charset' ) ) );
-								}
-
-								echo esc_attr( $parent_title );
-							}
-						?>" value="<?php echo $parent_id ? $parent_id : ''; ?>" /> <?php echo wc_help_tip( __( 'Set this option to make this product part of a grouped product.', 'woocommerce' ) ); ?>
-					</p>
-
-					<?php
-						woocommerce_wp_hidden_input( array( 'id' => 'previous_parent_id', 'value' => absint( $post->post_parent ) ) );
-
-						do_action( 'woocommerce_product_options_grouping' );
-					?>
-				</div>
-
-				<?php do_action( 'woocommerce_product_options_related' ); ?>
-			</div>
-
-			<div id="advanced_product_data" class="panel woocommerce_options_panel">
-
-				<div class="options_group hide_if_external">
-					<?php
-						// Purchase note
-						woocommerce_wp_textarea_input(  array( 'id' => '_purchase_note', 'label' => __( 'Purchase Note', 'woocommerce' ), 'desc_tip' => 'true', 'description' => __( 'Enter an optional note to send the customer after purchase.', 'woocommerce' ) ) );
-					?>
-				</div>
-
-				<div class="options_group">
-					<?php
-						// menu_order
-						woocommerce_wp_text_input(  array( 'id' => 'menu_order', 'label' => __( 'Menu order', 'woocommerce' ), 'desc_tip' => 'true', 'description' => __( 'Custom ordering position.', 'woocommerce' ), 'value' => intval( $post->menu_order ), 'type' => 'number', 'custom_attributes' => array(
-							'step' 	=> '1'
-						)  ) );
-					?>
-				</div>
-
-				<div class="options_group reviews">
-					<?php
-						woocommerce_wp_checkbox( array( 'id' => 'comment_status', 'label' => __( 'Enable reviews', 'woocommerce' ), 'cbvalue' => 'open', 'value' => esc_attr( $post->comment_status ) ) );
-
-						do_action( 'woocommerce_product_options_reviews' );
-					?>
-				</div>
-
-				<?php do_action( 'woocommerce_product_options_advanced' ); ?>
-
-			</div>
-
-			<?php
-				self::output_variations();
-
-				do_action( 'woocommerce_product_data_panels' );
-				do_action( 'woocommerce_product_write_panels' ); // _deprecated
-			?>
-
-			<div class="clear"></div>
-
-		</div>
-		<?php
+		if ( $a['priority'] == $b['priority'] ) {
+			return 0;
+		}
+
+		return $a['priority'] < $b['priority'] ? -1 : 1;
+	}
+
+	/**
+	 * Filter callback for finding variation attributes.
+	 * @param  WC_Product_Attribute $attribute
+	 * @return bool
+	 */
+	private static function filter_variation_attributes( $attribute ) {
+		return true === $attribute->get_variation();
 	}
 
 	/**
 	 * Show options for the variable product type.
 	 */
 	public static function output_variations() {
-		global $post, $wpdb;
+		global $post, $wpdb, $product_object;
 
-		// Get attributes
-		$attributes = maybe_unserialize( get_post_meta( $post->ID, '_product_attributes', true ) );
+		$variation_attributes   = array_filter( $product_object->get_attributes(), array( __CLASS__, 'filter_variation_attributes' ) );
+		$default_attributes     = $product_object->get_default_attributes();
+		$variations_count       = absint( $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(ID) FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'product_variation' AND post_status IN ('publish', 'private')", $post->ID ) ) );
+		$variations_per_page    = absint( apply_filters( 'woocommerce_admin_meta_boxes_variations_per_page', 15 ) );
+		$variations_total_pages = ceil( $variations_count / $variations_per_page );
 
-		// See if any are set
-		$variation_attribute_found = false;
+		include( 'views/html-product-data-variations.php' );
+	}
 
-		if ( $attributes ) {
-			foreach ( $attributes as $attribute ) {
-				if ( ! empty( $attribute['is_variation'] ) ) {
-					$variation_attribute_found = true;
-					break;
+	/**
+	 * Prepare downloads for save.
+	 * @return array
+	 */
+	private static function prepare_downloads( $file_names, $file_urls, $file_hashes ) {
+		$downloads = array();
+
+		if ( ! empty( $file_urls ) ) {
+			$file_url_size = sizeof( $file_urls );
+
+			for ( $i = 0; $i < $file_url_size; $i ++ ) {
+				if ( ! empty( $file_urls[ $i ] ) ) {
+					$downloads[] = array(
+						'name'          => wc_clean( $file_names[ $i ] ),
+						'file'          => wp_unslash( trim( $file_urls[ $i ] ) ),
+						'previous_hash' => wc_clean( $file_hashes[ $i ] ),
+					);
+				}
+			}
+		}
+		return $downloads;
+	}
+
+	/**
+	 * Prepare children for save.
+	 * @return array
+	 */
+	private static function prepare_children() {
+		return isset( $_POST['grouped_products'] ) ? array_filter( array_map( 'intval', (array) $_POST['grouped_products'] ) ) : array();
+	}
+
+	/**
+	 * Prepare attributes for save.
+	 * @return array
+	 */
+	public static function prepare_attributes( $data = false ) {
+		$attributes = array();
+
+		if ( ! $data ) {
+			$data = $_POST;
+		}
+
+		if ( isset( $data['attribute_names'], $data['attribute_values'] ) ) {
+			$attribute_names         = $data['attribute_names'];
+			$attribute_values        = $data['attribute_values'];
+			$attribute_visibility    = isset( $data['attribute_visibility'] ) ? $data['attribute_visibility'] : array();
+			$attribute_variation     = isset( $data['attribute_variation'] ) ? $data['attribute_variation'] : array();
+			$attribute_position      = $data['attribute_position'];
+			$attribute_names_max_key = max( array_keys( $attribute_names ) );
+
+			for ( $i = 0; $i <= $attribute_names_max_key; $i++ ) {
+				if ( empty( $attribute_names[ $i ] ) || ! isset( $attribute_values[ $i ] ) ) {
+					continue;
+				}
+				$attribute_id   = 0;
+				$attribute_name = wc_clean( $attribute_names[ $i ] );
+
+				if ( 'pa_' === substr( $attribute_name, 0, 3 ) ) {
+					$attribute_id = wc_attribute_taxonomy_id_by_name( $attribute_name );
+				}
+
+				$options = isset( $attribute_values[ $i ] ) ? $attribute_values[ $i ] : '';
+
+				if ( is_array( $options ) ) {
+					// Term ids sent as array.
+					$options = wp_parse_id_list( $options );
+				} else {
+					// Terms or text sent in textarea.
+					$options = 0 < $attribute_id ? wc_sanitize_textarea( wc_sanitize_term_text_based( $options ) ) : wc_sanitize_textarea( $options );
+					$options = wc_get_text_attributes( $options );
+				}
+
+				if ( empty( $options ) ) {
+					continue;
+				}
+
+				$attribute = new WC_Product_Attribute();
+				$attribute->set_id( $attribute_id );
+				$attribute->set_name( $attribute_name );
+				$attribute->set_options( $options );
+				$attribute->set_position( $attribute_position[ $i ] );
+				$attribute->set_visible( isset( $attribute_visibility[ $i ] ) );
+				$attribute->set_variation( isset( $attribute_variation[ $i ] ) );
+				$attributes[] = $attribute;
+			}
+		}
+		return $attributes;
+	}
+
+	/**
+	 * Prepare attributes for a specific variation or defaults.
+	 * @param  array $all_attributes
+	 * @param  string $key_prefix
+	 * @param  int $index
+	 * @return array
+	 */
+	private static function prepare_set_attributes( $all_attributes, $key_prefix = 'attribute_', $index = null ) {
+		$attributes = array();
+
+		if ( $all_attributes ) {
+			foreach ( $all_attributes as $attribute ) {
+				if ( $attribute->get_variation() ) {
+					$attribute_key = sanitize_title( $attribute->get_name() );
+
+					if ( ! is_null( $index ) ) {
+						$value = isset( $_POST[ $key_prefix . $attribute_key ][ $index ] ) ? stripslashes( $_POST[ $key_prefix . $attribute_key ][ $index ] ) : '';
+					} else {
+						$value = isset( $_POST[ $key_prefix . $attribute_key ] ) ? stripslashes( $_POST[ $key_prefix . $attribute_key ] ) : '';
+					}
+
+					$value                        = $attribute->is_taxonomy() ? sanitize_title( $value ) : wc_clean( $value ); // Don't use wc_clean as it destroys sanitized characters in terms.
+					$attributes[ $attribute_key ] = $value;
 				}
 			}
 		}
 
-		$variations_count       = absint( $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(ID) FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'product_variation' AND post_status IN ('publish', 'private')", $post->ID ) ) );
-		$variations_per_page    = absint( apply_filters( 'woocommerce_admin_meta_boxes_variations_per_page', 15 ) );
-		$variations_total_pages = ceil( $variations_count / $variations_per_page );
-		?>
-		<div id="variable_product_options" class="panel wc-metaboxes-wrapper"><div id="variable_product_options_inner">
-
-			<?php if ( ! $variation_attribute_found ) : ?>
-
-				<div id="message" class="inline notice woocommerce-message">
-					<p><?php _e( 'Before you can add a variation you need to add some variation attributes on the <strong>Attributes</strong> tab.', 'woocommerce' ); ?></p>
-					<p>
-						<a class="button-primary" href="<?php echo esc_url( apply_filters( 'woocommerce_docs_url', 'http://docs.woothemes.com/document/variable-product/', 'product-variations' ) ); ?>" target="_blank"><?php _e( 'Learn more', 'woocommerce' ); ?></a>
-					</p>
-				</div>
-
-			<?php else : ?>
-
-				<div class="toolbar toolbar-variations-defaults">
-					<div class="variations-defaults">
-						<strong><?php _e( 'Default Form Values', 'woocommerce' ); ?>: <?php echo wc_help_tip( __( 'These are the attributes that will be pre-selected on the frontend.', 'woocommerce' ) ); ?></strong>
-						<?php
-							$default_attributes = maybe_unserialize( get_post_meta( $post->ID, '_default_attributes', true ) );
-
-							foreach ( $attributes as $attribute ) {
-
-								// Only deal with attributes that are variations
-								if ( ! $attribute['is_variation'] ) {
-									continue;
-								}
-
-								// Get current value for variation (if set)
-								$variation_selected_value = isset( $default_attributes[ sanitize_title( $attribute['name'] ) ] ) ? $default_attributes[ sanitize_title( $attribute['name'] ) ] : '';
-
-								// Name will be something like attribute_pa_color
-								echo '<select name="default_attribute_' . sanitize_title( $attribute['name'] ) . '" data-current="' . esc_attr( $variation_selected_value ) . '"><option value="">' . __( 'No default', 'woocommerce' ) . ' ' . esc_html( wc_attribute_label( $attribute['name'] ) ) . '&hellip;</option>';
-
-								// Get terms for attribute taxonomy or value if its a custom attribute
-								if ( $attribute['is_taxonomy'] ) {
-									$post_terms = wp_get_post_terms( $post->ID, $attribute['name'] );
-
-									foreach ( $post_terms as $term ) {
-										echo '<option ' . selected( $variation_selected_value, $term->slug, false ) . ' value="' . esc_attr( $term->slug ) . '">' . esc_html( apply_filters( 'woocommerce_variation_option_name', $term->name ) ) . '</option>';
-									}
-
-								} else {
-									$options = wc_get_text_attributes( $attribute['value'] );
-
-									foreach ( $options as $option ) {
-										$selected = sanitize_title( $variation_selected_value ) === $variation_selected_value ? selected( $variation_selected_value, sanitize_title( $option ), false ) : selected( $variation_selected_value, $option, false );
-										echo '<option ' . $selected . ' value="' . esc_attr( $option ) . '">' . esc_html( apply_filters( 'woocommerce_variation_option_name', $option ) )  . '</option>';
-									}
-
-								}
-
-								echo '</select>';
-							}
-						?>
-					</div>
-					<div class="clear"></div>
-				</div>
-
-				<div class="toolbar toolbar-top">
-					<select id="field_to_edit" class="variation_actions">
-						<option data-global="true" value="add_variation"><?php _e( 'Add variation', 'woocommerce' ); ?></option>
-						<option data-global="true" value="link_all_variations"><?php _e( 'Create variations from all attributes', 'woocommerce' ); ?></option>
-						<option value="delete_all"><?php _e( 'Delete all variations', 'woocommerce' ); ?></option>
-						<optgroup label="<?php esc_attr_e( 'Status', 'woocommerce' ); ?>">
-							<option value="toggle_enabled"><?php _e( 'Toggle &quot;Enabled&quot;', 'woocommerce' ); ?></option>
-							<option value="toggle_downloadable"><?php _e( 'Toggle &quot;Downloadable&quot;', 'woocommerce' ); ?></option>
-							<option value="toggle_virtual"><?php _e( 'Toggle &quot;Virtual&quot;', 'woocommerce' ); ?></option>
-						</optgroup>
-						<optgroup label="<?php esc_attr_e( 'Pricing', 'woocommerce' ); ?>">
-							<option value="variable_regular_price"><?php _e( 'Set regular prices', 'woocommerce' ); ?></option>
-							<option value="variable_regular_price_increase"><?php _e( 'Increase regular prices (fixed amount or percentage)', 'woocommerce' ); ?></option>
-							<option value="variable_regular_price_decrease"><?php _e( 'Decrease regular prices (fixed amount or percentage)', 'woocommerce' ); ?></option>
-							<option value="variable_sale_price"><?php _e( 'Set sale prices', 'woocommerce' ); ?></option>
-							<option value="variable_sale_price_increase"><?php _e( 'Increase sale prices (fixed amount or percentage)', 'woocommerce' ); ?></option>
-							<option value="variable_sale_price_decrease"><?php _e( 'Decrease sale prices (fixed amount or percentage)', 'woocommerce' ); ?></option>
-							<option value="variable_sale_schedule"><?php _e( 'Set scheduled sale dates', 'woocommerce' ); ?></option>
-						</optgroup>
-						<optgroup label="<?php esc_attr_e( 'Inventory', 'woocommerce' ); ?>">
-							<option value="toggle_manage_stock"><?php _e( 'Toggle &quot;Manage stock&quot;', 'woocommerce' ); ?></option>
-							<option value="variable_stock"><?php _e( 'Stock', 'woocommerce' ); ?></option>
-						</optgroup>
-						<optgroup label="<?php esc_attr_e( 'Shipping', 'woocommerce' ); ?>">
-							<option value="variable_length"><?php _e( 'Length', 'woocommerce' ); ?></option>
-							<option value="variable_width"><?php _e( 'Width', 'woocommerce' ); ?></option>
-							<option value="variable_height"><?php _e( 'Height', 'woocommerce' ); ?></option>
-							<option value="variable_weight"><?php _e( 'Weight', 'woocommerce' ); ?></option>
-						</optgroup>
-						<optgroup label="<?php esc_attr_e( 'Downloadable products', 'woocommerce' ); ?>">
-							<option value="variable_download_limit"><?php _e( 'Download limit', 'woocommerce' ); ?></option>
-							<option value="variable_download_expiry"><?php _e( 'Download expiry', 'woocommerce' ); ?></option>
-						</optgroup>
-						<?php do_action( 'woocommerce_variable_product_bulk_edit_actions' ); ?>
-					</select>
-					<a class="button bulk_edit do_variation_action"><?php _e( 'Go', 'woocommerce' ); ?></a>
-
-					<div class="variations-pagenav">
-						<span class="displaying-num"><?php printf( _n( '%s item', '%s items', $variations_count, 'woocommerce' ), $variations_count ); ?></span>
-						<span class="expand-close">
-							(<a href="#" class="expand_all"><?php _e( 'Expand', 'woocommerce' ); ?></a> / <a href="#" class="close_all"><?php _e( 'Close', 'woocommerce' ); ?></a>)
-						</span>
-						<span class="pagination-links">
-							<a class="first-page disabled" title="<?php esc_attr_e( 'Go to the first page', 'woocommerce' ); ?>" href="#">&laquo;</a>
-							<a class="prev-page disabled" title="<?php esc_attr_e( 'Go to the previous page', 'woocommerce' ); ?>" href="#">&lsaquo;</a>
-							<span class="paging-select">
-								<label for="current-page-selector-1" class="screen-reader-text"><?php _e( 'Select Page', 'woocommerce' ); ?></label>
-								<select class="page-selector" id="current-page-selector-1" title="<?php esc_attr_e( 'Current page', 'woocommerce' ); ?>">
-									<?php for ( $i = 1; $i <= $variations_total_pages; $i++ ) : ?>
-										<option value="<?php echo $i; ?>"><?php echo $i; ?></option>
-									<?php endfor; ?>
-								</select>
-								 <?php _ex( 'of', 'number of pages', 'woocommerce' ); ?> <span class="total-pages"><?php echo $variations_total_pages; ?></span>
-							</span>
-							<a class="next-page" title="<?php esc_attr_e( 'Go to the next page', 'woocommerce' ); ?>" href="#">&rsaquo;</a>
-							<a class="last-page" title="<?php esc_attr_e( 'Go to the last page', 'woocommerce' ); ?>" href="#">&raquo;</a>
-						</span>
-					</div>
-					<div class="clear"></div>
-				</div>
-
-				<div class="woocommerce_variations wc-metaboxes" data-attributes="<?php
-					// esc_attr does not double encode - htmlspecialchars does
-					echo htmlspecialchars( json_encode( $attributes ) );
-				?>" data-total="<?php echo $variations_count; ?>" data-total_pages="<?php echo $variations_total_pages; ?>" data-page="1" data-edited="false">
-				</div>
-
-				<div class="toolbar">
-					<button type="button" class="button-primary save-variation-changes" disabled="disabled"><?php _e( 'Save Changes', 'woocommerce' ); ?></button>
-					<button type="button" class="button cancel-variation-changes" disabled="disabled"><?php _e( 'Cancel', 'woocommerce' ); ?></button>
-
-					<div class="variations-pagenav">
-						<span class="displaying-num"><?php printf( _n( '%s item', '%s items', $variations_count, 'woocommerce' ), $variations_count ); ?></span>
-						<span class="expand-close">
-							(<a href="#" class="expand_all"><?php _e( 'Expand', 'woocommerce' ); ?></a> / <a href="#" class="close_all"><?php _e( 'Close', 'woocommerce' ); ?></a>)
-						</span>
-						<span class="pagination-links">
-							<a class="first-page disabled" title="<?php esc_attr_e( 'Go to the first page', 'woocommerce' ); ?>" href="#">&laquo;</a>
-							<a class="prev-page disabled" title="<?php esc_attr_e( 'Go to the previous page', 'woocommerce' ); ?>" href="#">&lsaquo;</a>
-							<span class="paging-select">
-								<label for="current-page-selector-1" class="screen-reader-text"><?php _e( 'Select Page', 'woocommerce' ); ?></label>
-								<select class="page-selector" id="current-page-selector-1" title="<?php esc_attr_e( 'Current page', 'woocommerce' ); ?>">
-									<?php for ( $i = 1; $i <= $variations_total_pages; $i++ ) : ?>
-										<option value="<?php echo $i; ?>"><?php echo $i; ?></option>
-									<?php endfor; ?>
-								</select>
-								 <?php _ex( 'of', 'number of pages', 'woocommerce' ); ?> <span class="total-pages"><?php echo $variations_total_pages; ?></span>
-							</span>
-							<a class="next-page" title="<?php esc_attr_e( 'Go to the next page', 'woocommerce' ); ?>" href="#">&rsaquo;</a>
-							<a class="last-page" title="<?php esc_attr_e( 'Go to the last page', 'woocommerce' ); ?>" href="#">&raquo;</a>
-						</span>
-					</div>
-
-					<div class="clear"></div>
-				</div>
-
-			<?php endif; ?>
-		</div></div>
-		<?php
+		return $attributes;
 	}
 
 	/**
 	 * Save meta box data.
 	 */
 	public static function save( $post_id, $post ) {
-		global $wpdb;
+		// Process product type first so we have the correct class to run setters.
+		$product_type = empty( $_POST['product-type'] ) ? WC_Product_Factory::get_product_type( $post_id ) : sanitize_title( stripslashes( $_POST['product-type'] ) );
+		$classname    = WC_Product_Factory::get_product_classname( $post_id, $product_type ? $product_type : 'simple' );
+		$product      = new $classname( $post_id );
+		$attributes   = self::prepare_attributes();
+		$errors       = $product->set_props( array(
+			'sku'                => isset( $_POST['_sku'] ) ? wc_clean( $_POST['_sku'] ) : null,
+			'purchase_note'      => wp_kses_post( stripslashes( $_POST['_purchase_note'] ) ),
+			'downloadable'       => isset( $_POST['_downloadable'] ),
+			'virtual'            => isset( $_POST['_virtual'] ),
+			'featured'           => isset( $_POST['_featured'] ),
+			'catalog_visibility' => wc_clean( $_POST['_visibility'] ),
+			'tax_status'         => isset( $_POST['_tax_status'] ) ? wc_clean( $_POST['_tax_status'] ) : null,
+			'tax_class'          => isset( $_POST['_tax_class'] ) ? wc_clean( $_POST['_tax_class'] ) : null,
+			'weight'             => wc_clean( $_POST['_weight'] ),
+			'length'             => wc_clean( $_POST['_length'] ),
+			'width'              => wc_clean( $_POST['_width'] ),
+			'height'             => wc_clean( $_POST['_height'] ),
+			'shipping_class_id'  => absint( $_POST['product_shipping_class'] ),
+			'sold_individually'  => ! empty( $_POST['_sold_individually'] ),
+			'upsell_ids'         => isset( $_POST['upsell_ids'] ) ? array_map( 'intval', (array) $_POST['upsell_ids'] ) : array(),
+			'cross_sell_ids'     => isset( $_POST['crosssell_ids'] ) ? array_map( 'intval', (array) $_POST['crosssell_ids'] ) : array(),
+			'regular_price'      => wc_clean( $_POST['_regular_price'] ),
+			'sale_price'         => wc_clean( $_POST['_sale_price'] ),
+			'date_on_sale_from'  => wc_clean( $_POST['_sale_price_dates_from'] ),
+			'date_on_sale_to'    => wc_clean( $_POST['_sale_price_dates_to'] ),
+			'manage_stock'       => ! empty( $_POST['_manage_stock'] ),
+			'backorders'         => wc_clean( $_POST['_backorders'] ),
+			'stock_status'       => wc_clean( $_POST['_stock_status'] ),
+			'stock_quantity'     => wc_stock_amount( $_POST['_stock'] ),
+			'download_limit'     => '' === $_POST['_download_limit'] ? '' : absint( $_POST['_download_limit'] ),
+			'download_expiry'    => '' === $_POST['_download_expiry'] ? '' : absint( $_POST['_download_expiry'] ),
+			'downloads'          => self::prepare_downloads(
+				isset( $_POST['_wc_file_names'] ) ? $_POST['_wc_file_names'] : array(),
+				isset( $_POST['_wc_file_urls'] ) ? $_POST['_wc_file_urls'] : array(),
+				isset( $_POST['_wc_file_hashes'] ) ? $_POST['_wc_file_hashes'] : array()
+			),
+			'product_url'        => esc_url_raw( $_POST['_product_url'] ),
+			'button_text'        => wc_clean( $_POST['_button_text'] ),
+			'children'           => 'grouped' === $product_type ? self::prepare_children() : null,
+			'reviews_allowed'    => ! empty( $_POST['_reviews_allowed'] ),
+			'attributes'         => $attributes,
+			'default_attributes' => self::prepare_set_attributes( $attributes, 'default_attribute_' ),
+		) );
 
-		// Add any default post meta
-		add_post_meta( $post_id, 'total_sales', '0', true );
-
-		// Get types
-		$product_type    = empty( $_POST['product-type'] ) ? 'simple' : sanitize_title( stripslashes( $_POST['product-type'] ) );
-		$is_downloadable = isset( $_POST['_downloadable'] ) ? 'yes' : 'no';
-		$is_virtual      = isset( $_POST['_virtual'] ) ? 'yes' : 'no';
-
-		// Product type + Downloadable/Virtual
-		wp_set_object_terms( $post_id, $product_type, 'product_type' );
-		update_post_meta( $post_id, '_downloadable', $is_downloadable );
-		update_post_meta( $post_id, '_virtual', $is_virtual );
-
-		// Update post meta
-		if ( isset( $_POST['_tax_status'] ) ) {
-			update_post_meta( $post_id, '_tax_status', wc_clean( $_POST['_tax_status'] ) );
+		if ( is_wp_error( $errors ) ) {
+			WC_Admin_Meta_Boxes::add_error( $errors->get_error_message() );
 		}
 
-		if ( isset( $_POST['_tax_class'] ) ) {
-			update_post_meta( $post_id, '_tax_class', wc_clean( $_POST['_tax_class'] ) );
+		/**
+		 * @since 3.0.0 to set props before save.
+		 */
+		do_action( 'woocommerce_admin_process_product_object', $product );
+
+		$product->save();
+
+		if ( $product->is_type( 'variable' ) ) {
+			$product->get_data_store()->sync_variation_names( $product, wc_clean( $_POST['original_post_title'] ), wc_clean( $_POST['post_title'] ) );
 		}
 
-		if ( isset( $_POST['_purchase_note'] ) ) {
-			update_post_meta( $post_id, '_purchase_note', wp_kses_post( stripslashes( $_POST['_purchase_note'] ) ) );
-		}
-
-		// Featured
-		if ( update_post_meta( $post_id, '_featured', isset( $_POST['_featured'] ) ? 'yes' : 'no' ) ) {
-			delete_transient( 'wc_featured_products' );
-		}
-
-		// Dimensions
-		if ( 'no' == $is_virtual ) {
-
-			if ( isset( $_POST['_weight'] ) ) {
-				update_post_meta( $post_id, '_weight', ( '' === $_POST['_weight'] ) ? '' : wc_format_decimal( $_POST['_weight'] ) );
-			}
-
-			if ( isset( $_POST['_length'] ) ) {
-				update_post_meta( $post_id, '_length', ( '' === $_POST['_length'] ) ? '' : wc_format_decimal( $_POST['_length'] ) );
-			}
-
-			if ( isset( $_POST['_width'] ) ) {
-				update_post_meta( $post_id, '_width', ( '' === $_POST['_width'] ) ? '' : wc_format_decimal( $_POST['_width'] ) );
-			}
-
-			if ( isset( $_POST['_height'] ) ) {
-				update_post_meta( $post_id, '_height', ( '' === $_POST['_height'] ) ? '' : wc_format_decimal( $_POST['_height'] ) );
-			}
-
-		} else {
-			update_post_meta( $post_id, '_weight', '' );
-			update_post_meta( $post_id, '_length', '' );
-			update_post_meta( $post_id, '_width', '' );
-			update_post_meta( $post_id, '_height', '' );
-		}
-
-		// Save shipping class
-		$product_shipping_class = $_POST['product_shipping_class'] > 0 && $product_type != 'external' ? absint( $_POST['product_shipping_class'] ) : '';
-		wp_set_object_terms( $post_id, $product_shipping_class, 'product_shipping_class');
-
-		// Unique SKU
-		$sku     = get_post_meta( $post_id, '_sku', true );
-		$new_sku = wc_clean( $_POST['_sku'] );
-
-		if ( '' == $new_sku ) {
-			update_post_meta( $post_id, '_sku', '' );
-		} elseif ( $new_sku !== $sku ) {
-			if ( ! empty( $new_sku ) ) {
-				$unique_sku = wc_product_has_unique_sku( $post_id, $new_sku );
-
-				if ( ! $unique_sku ) {
-					WC_Admin_Meta_Boxes::add_error( __( 'Product SKU must be unique.', 'woocommerce' ) );
-				} else {
-					update_post_meta( $post_id, '_sku', $new_sku );
-				}
-			} else {
-				update_post_meta( $post_id, '_sku', '' );
-			}
-		}
-
-		// Save Attributes
-		$attributes = array();
-
-		if ( isset( $_POST['attribute_names'] ) && isset( $_POST['attribute_values'] ) ) {
-
-			$attribute_names  = $_POST['attribute_names'];
-			$attribute_values = $_POST['attribute_values'];
-
-			if ( isset( $_POST['attribute_visibility'] ) ) {
-				$attribute_visibility = $_POST['attribute_visibility'];
-			}
-
-			if ( isset( $_POST['attribute_variation'] ) ) {
-				$attribute_variation = $_POST['attribute_variation'];
-			}
-
-			$attribute_is_taxonomy   = $_POST['attribute_is_taxonomy'];
-			$attribute_position      = $_POST['attribute_position'];
-			$attribute_names_max_key = max( array_keys( $attribute_names ) );
-
-			for ( $i = 0; $i <= $attribute_names_max_key; $i++ ) {
-				if ( empty( $attribute_names[ $i ] ) ) {
-					continue;
-				}
-
-				$is_visible   = isset( $attribute_visibility[ $i ] ) ? 1 : 0;
-				$is_variation = isset( $attribute_variation[ $i ] ) ? 1 : 0;
-				$is_taxonomy  = $attribute_is_taxonomy[ $i ] ? 1 : 0;
-
-				if ( $is_taxonomy ) {
-
-					$values_are_slugs = false;
-
-					if ( isset( $attribute_values[ $i ] ) ) {
-
-						// Select based attributes - Format values (posted values are slugs)
-						if ( is_array( $attribute_values[ $i ] ) ) {
-							$values           = array_map( 'sanitize_title', $attribute_values[ $i ] );
-							$values_are_slugs = true;
-
-						// Text based attributes - Posted values are term names - don't change to slugs
-						} else {
-							$values           = array_map( 'stripslashes', array_map( 'strip_tags', explode( WC_DELIMITER, $attribute_values[ $i ] ) ) );
-						}
-
-						// Remove empty items in the array
-						$values = array_filter( $values, 'strlen' );
-
-					} else {
-						$values = array();
-					}
-
-					// Update post terms
-					if ( taxonomy_exists( $attribute_names[ $i ] ) ) {
-
-						foreach( $values as $key => $value ) {
-							$term = get_term_by( $values_are_slugs ? 'slug' : 'name', trim( $value ), $attribute_names[ $i ] );
-
-							if ( $term ) {
-								$values[ $key ] = intval( $term->term_id );
-							} else {
-								$term = wp_insert_term( trim( $value ), $attribute_names[ $i ] );
-								if ( isset( $term->term_id ) ) {
-									$values[ $key ] = intval($term->term_id);
-								}
-							}
-						}
-
-						wp_set_object_terms( $post_id, $values, $attribute_names[ $i ] );
-					}
-
-					if ( ! empty( $values ) ) {
-						// Add attribute to array, but don't set values
-						$attributes[ sanitize_title( $attribute_names[ $i ] ) ] = array(
-							'name'         => wc_clean( $attribute_names[ $i ] ),
-							'value'        => '',
-							'position'     => $attribute_position[ $i ],
-							'is_visible'   => $is_visible,
-							'is_variation' => $is_variation,
-							'is_taxonomy'  => $is_taxonomy
-						);
-					}
-
-				} elseif ( isset( $attribute_values[ $i ] ) ) {
-
-					// Text based, possibly separated by pipes (WC_DELIMITER). Preserve line breaks in non-variation attributes.
-					$values = $is_variation ? wc_clean( $attribute_values[ $i ] ) : implode( "\n", array_map( 'wc_clean', explode( "\n", $attribute_values[ $i ] ) ) );
-					$values = implode( ' ' . WC_DELIMITER . ' ', wc_get_text_attributes( $values ) );
-
-					// Custom attribute - Add attribute to array and set the values
-					$attributes[ sanitize_title( $attribute_names[ $i ] ) ] = array(
-						'name'         => wc_clean( $attribute_names[ $i ] ),
-						'value'        => $values,
-						'position'     => $attribute_position[ $i ],
-						'is_visible'   => $is_visible,
-						'is_variation' => $is_variation,
-						'is_taxonomy'  => $is_taxonomy
-					);
-				}
-
-			 }
-		}
-
-		if ( ! function_exists( 'attributes_cmp' ) ) {
-			function attributes_cmp( $a, $b ) {
-				if ( $a['position'] == $b['position'] ) {
-					return 0;
-				}
-
-				return ( $a['position'] < $b['position'] ) ? -1 : 1;
-			}
-		}
-		uasort( $attributes, 'attributes_cmp' );
-
-		update_post_meta( $post_id, '_product_attributes', $attributes );
-
-		// Sales and prices
-		if ( in_array( $product_type, array( 'variable', 'grouped' ) ) ) {
-
-			// Variable and grouped products have no prices
-			update_post_meta( $post_id, '_regular_price', '' );
-			update_post_meta( $post_id, '_sale_price', '' );
-			update_post_meta( $post_id, '_sale_price_dates_from', '' );
-			update_post_meta( $post_id, '_sale_price_dates_to', '' );
-
-		} else {
-			$date_from     = isset( $_POST['_sale_price_dates_from'] ) ? wc_clean( $_POST['_sale_price_dates_from'] ) : '';
-			$date_to       = isset( $_POST['_sale_price_dates_to'] ) ? wc_clean( $_POST['_sale_price_dates_to'] )     : '';
-			$regular_price = isset( $_POST['_regular_price'] ) ? wc_clean( $_POST['_regular_price'] )                 : '';
-			$sale_price    = isset( $_POST['_sale_price'] ) ? wc_clean( $_POST['_sale_price'] )                       : '';
-
-			update_post_meta( $post_id, '_regular_price', '' === $regular_price ? '' : wc_format_decimal( $regular_price ) );
-			update_post_meta( $post_id, '_sale_price', '' === $sale_price ? '' : wc_format_decimal( $sale_price ) );
-
-			// Dates
-			update_post_meta( $post_id, '_sale_price_dates_from', $date_from ? strtotime( $date_from ) : '' );
-			update_post_meta( $post_id, '_sale_price_dates_to', $date_to ? strtotime( $date_to ) : '' );
-
-			if ( $date_to && ! $date_from ) {
-				$date_from = date( 'Y-m-d' );
-				update_post_meta( $post_id, '_sale_price_dates_from', strtotime( $date_from ) );
-			}
-
-			// Update price if on sale
-			if ( '' !== $sale_price && '' === $date_to && '' === $date_from ) {
-				update_post_meta( $post_id, '_price', wc_format_decimal( $sale_price ) );
-			} elseif ( '' !== $sale_price && $date_from && strtotime( $date_from ) <= strtotime( 'NOW', current_time( 'timestamp' ) ) ) {
-				update_post_meta( $post_id, '_price', wc_format_decimal( $sale_price ) );
-			} else {
-				update_post_meta( $post_id, '_price', '' === $regular_price ? '' : wc_format_decimal( $regular_price ) );
-			}
-
-			if ( $date_to && strtotime( $date_to ) < strtotime( 'NOW', current_time( 'timestamp' ) ) ) {
-				update_post_meta( $post_id, '_price', '' === $regular_price ? '' : wc_format_decimal( $regular_price ) );
-				update_post_meta( $post_id, '_sale_price_dates_from', '' );
-				update_post_meta( $post_id, '_sale_price_dates_to', '' );
-			}
-		}
-
-		// Update parent if grouped so price sorting works and stays in sync with the cheapest child
-		if ( $post->post_parent > 0 || 'grouped' == $product_type || $_POST['previous_parent_id'] > 0 ) {
-
-			$clear_parent_ids = array();
-
-			if ( $post->post_parent > 0 ) {
-				$clear_parent_ids[] = $post->post_parent;
-			}
-
-			if ( 'grouped' == $product_type ) {
-				$clear_parent_ids[] = $post_id;
-			}
-
-			if ( $_POST['previous_parent_id'] > 0 ) {
-				$clear_parent_ids[] = absint( $_POST['previous_parent_id'] );
-			}
-
-			if ( ! empty( $clear_parent_ids ) ) {
-				foreach ( $clear_parent_ids as $clear_id ) {
-					$children_by_price = get_posts( array(
-						'post_parent'    => $clear_id,
-						'orderby'        => 'meta_value_num',
-						'order'          => 'asc',
-						'meta_key'       => '_price',
-						'posts_per_page' => 1,
-						'post_type'      => 'product',
-						'fields'         => 'ids'
-					) );
-
-					if ( $children_by_price ) {
-						foreach ( $children_by_price as $child ) {
-							$child_price = get_post_meta( $child, '_price', true );
-							update_post_meta( $clear_id, '_price', $child_price );
-						}
-					}
-
-					wc_delete_product_transients( $clear_id );
-				}
-			}
-		}
-
-		// Sold Individually
-		if ( ! empty( $_POST['_sold_individually'] ) ) {
-			update_post_meta( $post_id, '_sold_individually', 'yes' );
-		} else {
-			update_post_meta( $post_id, '_sold_individually', '' );
-		}
-
-		// Stock Data
-		if ( 'yes' === get_option( 'woocommerce_manage_stock' ) ) {
-
-			$manage_stock = 'no';
-			$backorders   = 'no';
-			$stock_status = wc_clean( $_POST['_stock_status'] );
-
-			if ( 'external' === $product_type ) {
-
-				$stock_status = 'instock';
-
-			} elseif ( 'variable' === $product_type ) {
-
-				// Stock status is always determined by children so sync later
-				$stock_status = '';
-
-				if ( ! empty( $_POST['_manage_stock'] ) ) {
-					$manage_stock = 'yes';
-					$backorders   = wc_clean( $_POST['_backorders'] );
-				}
-
-			} elseif ( 'grouped' !== $product_type && ! empty( $_POST['_manage_stock'] ) ) {
-				$manage_stock = 'yes';
-				$backorders   = wc_clean( $_POST['_backorders'] );
-			}
-
-			update_post_meta( $post_id, '_manage_stock', $manage_stock );
-			update_post_meta( $post_id, '_backorders', $backorders );
-
-			if ( $stock_status ) {
-				wc_update_product_stock_status( $post_id, $stock_status );
-			}
-
-			if ( ! empty( $_POST['_manage_stock'] ) ) {
-				wc_update_product_stock( $post_id, wc_stock_amount( $_POST['_stock'] ) );
-			} else {
-				update_post_meta( $post_id, '_stock', '' );
-			}
-
-		} elseif ( 'variable' !== $product_type ) {
-			wc_update_product_stock_status( $post_id, wc_clean( $_POST['_stock_status'] ) );
-		}
-
-		// Cross sells and upsells
-		$upsells    = isset( $_POST['upsell_ids'] ) ? array_filter( array_map( 'intval', explode( ',', $_POST['upsell_ids'] ) ) ) : array();
-		$crosssells = isset( $_POST['crosssell_ids'] ) ? array_filter( array_map( 'intval', explode( ',', $_POST['crosssell_ids'] ) ) ) : array();
-
-		update_post_meta( $post_id, '_upsell_ids', $upsells );
-		update_post_meta( $post_id, '_crosssell_ids', $crosssells );
-
-		// Downloadable options
-		if ( 'yes' == $is_downloadable ) {
-
-			$_download_limit = absint( $_POST['_download_limit'] );
-			if ( ! $_download_limit ) {
-				$_download_limit = ''; // 0 or blank = unlimited
-			}
-
-			$_download_expiry = absint( $_POST['_download_expiry'] );
-			if ( ! $_download_expiry ) {
-				$_download_expiry = ''; // 0 or blank = unlimited
-			}
-
-			// file paths will be stored in an array keyed off md5(file path)
-			$files = array();
-
-			if ( isset( $_POST['_wc_file_urls'] ) ) {
-				$file_names         = isset( $_POST['_wc_file_names'] ) ? $_POST['_wc_file_names'] : array();
-				$file_urls          = isset( $_POST['_wc_file_urls'] )  ? wp_unslash( array_map( 'trim', $_POST['_wc_file_urls'] ) ) : array();
-				$file_url_size      = sizeof( $file_urls );
-				$allowed_file_types = apply_filters( 'woocommerce_downloadable_file_allowed_mime_types', get_allowed_mime_types() );
-
-				for ( $i = 0; $i < $file_url_size; $i ++ ) {
-					if ( ! empty( $file_urls[ $i ] ) ) {
-						// Find type and file URL
-						if ( 0 === strpos( $file_urls[ $i ], 'http' ) ) {
-							$file_is  = 'absolute';
-							$file_url = esc_url_raw( $file_urls[ $i ] );
-						} elseif ( '[' === substr( $file_urls[ $i ], 0, 1 ) && ']' === substr( $file_urls[ $i ], -1 ) ) {
-							$file_is  = 'shortcode';
-							$file_url = wc_clean( $file_urls[ $i ] );
-						} else {
-							$file_is = 'relative';
-							$file_url = wc_clean( $file_urls[ $i ] );
-						}
-
-						$file_name = wc_clean( $file_names[ $i ] );
-						$file_hash = md5( $file_url );
-
-						// Validate the file extension
-						if ( in_array( $file_is, array( 'absolute', 'relative' ) ) ) {
-							$file_type  = wp_check_filetype( strtok( $file_url, '?' ), $allowed_file_types );
-							$parsed_url = parse_url( $file_url, PHP_URL_PATH );
-							$extension  = pathinfo( $parsed_url, PATHINFO_EXTENSION );
-
-							if ( ! empty( $extension ) && ! in_array( $file_type['type'], $allowed_file_types ) ) {
-								WC_Admin_Meta_Boxes::add_error( sprintf( __( 'The downloadable file %s cannot be used as it does not have an allowed file type. Allowed types include: %s', 'woocommerce' ), '<code>' . basename( $file_url ) . '</code>', '<code>' . implode( ', ', array_keys( $allowed_file_types ) ) . '</code>' ) );
-								continue;
-							}
-						}
-
-						// Validate the file exists
-						if ( 'relative' === $file_is ) {
-							$_file_url = $file_url;
-							if ( '..' === substr( $file_url, 0, 2 ) || '/' !== substr( $file_url, 0, 1 ) ) {
-								$_file_url = realpath( ABSPATH . $file_url );
-							}
-
-							if ( ! apply_filters( 'woocommerce_downloadable_file_exists', file_exists( $_file_url ), $file_url ) ) {
-								WC_Admin_Meta_Boxes::add_error( sprintf( __( 'The downloadable file %s cannot be used as it does not exist on the server.', 'woocommerce' ), '<code>' . $file_url . '</code>' ) );
-								continue;
-							}
-						}
-
-						$files[ $file_hash ] = array(
-							'name' => $file_name,
-							'file' => $file_url
-						);
-					}
-				}
-			}
-
-			// grant permission to any newly added files on any existing orders for this product prior to saving
-			do_action( 'woocommerce_process_product_file_download_paths', $post_id, 0, $files );
-
-			update_post_meta( $post_id, '_downloadable_files', $files );
-			update_post_meta( $post_id, '_download_limit', $_download_limit );
-			update_post_meta( $post_id, '_download_expiry', $_download_expiry );
-
-			if ( isset( $_POST['_download_type'] ) ) {
-				update_post_meta( $post_id, '_download_type', wc_clean( $_POST['_download_type'] ) );
-			}
-		}
-
-		// Product url
-		if ( 'external' == $product_type ) {
-
-			if ( isset( $_POST['_product_url'] ) ) {
-				update_post_meta( $post_id, '_product_url', esc_url_raw( $_POST['_product_url'] ) );
-			}
-
-			if ( isset( $_POST['_button_text'] ) ) {
-				update_post_meta( $post_id, '_button_text', wc_clean( $_POST['_button_text'] ) );
-			}
-		}
-
-		// Save variations
-		if ( 'variable' == $product_type ) {
-			// Update parent if variable so price sorting works and stays in sync with the cheapest child
-			WC_Product_Variable::sync( $post_id );
-			WC_Product_Variable::sync_stock_status( $post_id );
-		}
-
-		// Update version after saving
-		update_post_meta( $post_id, '_product_version', WC_VERSION );
-
-		// Do action for product type
 		do_action( 'woocommerce_process_product_meta_' . $product_type, $post_id );
-
-		// Clear cache/transients
-		wc_delete_product_transients( $post_id );
 	}
 
 	/**
 	 * Save meta box data.
 	 *
+	 * @param int $post_id
+	 * @param WP_Post $post
 	 */
 	public static function save_variations( $post_id, $post ) {
-		global $wpdb;
+		if ( isset( $_POST['variable_post_id'] ) ) {
+			$parent     = wc_get_product( $post_id );
+			$parent->set_default_attributes( self::prepare_set_attributes( $parent->get_attributes(), 'default_attribute_' ) );
+			$parent->save();
 
-		$attributes = (array) maybe_unserialize( get_post_meta( $post_id, '_product_attributes', true ) );
-
-		if ( isset( $_POST['variable_sku'] ) ) {
-			$variable_post_id               = $_POST['variable_post_id'];
-			$variable_sku                   = $_POST['variable_sku'];
-			$variable_regular_price         = $_POST['variable_regular_price'];
-			$variable_sale_price            = $_POST['variable_sale_price'];
-			$upload_image_id                = $_POST['upload_image_id'];
-			$variable_download_limit        = $_POST['variable_download_limit'];
-			$variable_download_expiry       = $_POST['variable_download_expiry'];
-			$variable_shipping_class        = $_POST['variable_shipping_class'];
-			$variable_tax_class             = isset( $_POST['variable_tax_class'] ) ? $_POST['variable_tax_class'] : array();
-			$variable_menu_order            = $_POST['variation_menu_order'];
-			$variable_sale_price_dates_from = $_POST['variable_sale_price_dates_from'];
-			$variable_sale_price_dates_to   = $_POST['variable_sale_price_dates_to'];
-
-			$variable_weight                = isset( $_POST['variable_weight'] ) ? $_POST['variable_weight'] : array();
-			$variable_length                = isset( $_POST['variable_length'] ) ? $_POST['variable_length'] : array();
-			$variable_width                 = isset( $_POST['variable_width'] ) ? $_POST['variable_width'] : array();
-			$variable_height                = isset( $_POST['variable_height'] ) ? $_POST['variable_height'] : array();
-			$variable_enabled               = isset( $_POST['variable_enabled'] ) ? $_POST['variable_enabled'] : array();
-			$variable_is_virtual            = isset( $_POST['variable_is_virtual'] ) ? $_POST['variable_is_virtual'] : array();
-			$variable_is_downloadable       = isset( $_POST['variable_is_downloadable'] ) ? $_POST['variable_is_downloadable'] : array();
-
-			$variable_manage_stock          = isset( $_POST['variable_manage_stock'] ) ? $_POST['variable_manage_stock'] : array();
-			$variable_stock                 = isset( $_POST['variable_stock'] ) ? $_POST['variable_stock'] : array();
-			$variable_backorders            = isset( $_POST['variable_backorders'] ) ? $_POST['variable_backorders'] : array();
-			$variable_stock_status          = isset( $_POST['variable_stock_status'] ) ? $_POST['variable_stock_status'] : array();
-
-			$variable_description           = isset( $_POST['variable_description'] ) ? $_POST['variable_description'] : array();
-
-			$max_loop = max( array_keys( $_POST['variable_post_id'] ) );
+			$max_loop   = max( array_keys( $_POST['variable_post_id'] ) );
+			$data_store = $parent->get_data_store();
+			$data_store->sort_all_product_variations( $parent->get_id() );
 
 			for ( $i = 0; $i <= $max_loop; $i ++ ) {
 
-				if ( ! isset( $variable_post_id[ $i ] ) ) {
+				if ( ! isset( $_POST['variable_post_id'][ $i ] ) ) {
 					continue;
 				}
+				$variation_id = absint( $_POST['variable_post_id'][ $i ] );
+				$variation    = new WC_Product_Variation( $variation_id );
+				$errors       = $variation->set_props( array(
+					'status'            => isset( $_POST['variable_enabled'][ $i ] ) ? 'publish' : 'private',
+					'menu_order'        => wc_clean( $_POST['variation_menu_order'][ $i ] ),
+					'regular_price'     => wc_clean( $_POST['variable_regular_price'][ $i ] ),
+					'sale_price'        => wc_clean( $_POST['variable_sale_price'][ $i ] ),
+					'virtual'           => isset( $_POST['variable_is_virtual'][ $i ] ),
+					'downloadable'      => isset( $_POST['variable_is_downloadable'][ $i ] ),
+					'date_on_sale_from' => wc_clean( $_POST['variable_sale_price_dates_from'][ $i ] ),
+					'date_on_sale_to'   => wc_clean( $_POST['variable_sale_price_dates_to'][ $i ] ),
+					'description'       => wp_kses_post( $_POST['variable_description'][ $i ] ),
+					'download_limit'    => wc_clean( $_POST['variable_download_limit'][ $i ] ),
+					'download_expiry'   => wc_clean( $_POST['variable_download_expiry'][ $i ] ),
+					'downloads'         => self::prepare_downloads(
+						isset( $_POST['_wc_variation_file_names'][ $variation_id ] ) ? $_POST['_wc_variation_file_names'][ $variation_id ] : array(),
+						isset( $_POST['_wc_variation_file_urls'][ $variation_id ] ) ? $_POST['_wc_variation_file_urls'][ $variation_id ] : array(),
+						isset( $_POST['_wc_variation_file_hashes'][ $variation_id ] ) ? $_POST['_wc_variation_file_hashes'][ $variation_id ] : array()
+					),
+					'manage_stock'      => isset( $_POST['variable_manage_stock'][ $i ] ),
+					'stock_quantity'    => wc_clean( $_POST['variable_stock'][ $i ] ),
+					'backorders'        => wc_clean( $_POST['variable_backorders'][ $i ] ),
+					'stock_status'      => wc_clean( $_POST['variable_stock_status'][ $i ] ),
+					'image_id'          => wc_clean( $_POST['upload_image_id'][ $i ] ),
+					'attributes'        => self::prepare_set_attributes( $parent->get_attributes(), 'attribute_', $i ),
+					'sku'               => isset( $_POST['variable_sku'][ $i ] ) ? wc_clean( $_POST['variable_sku'][ $i ] )       : '',
+					'weight'            => isset( $_POST['variable_weight'][ $i ] ) ? wc_clean( $_POST['variable_weight'][ $i ] ) : '',
+					'length'            => isset( $_POST['variable_length'][ $i ] ) ? wc_clean( $_POST['variable_length'][ $i ] ) : '',
+					'width'             => isset( $_POST['variable_width'][ $i ] ) ? wc_clean( $_POST['variable_width'][ $i ] )   : '',
+					'height'            => isset( $_POST['variable_height'][ $i ] ) ? wc_clean( $_POST['variable_height'][ $i ] ) : '',
+					'shipping_class_id' => wc_clean( $_POST['variable_shipping_class'][ $i ] ),
+					'tax_class'         => isset( $_POST['variable_tax_class'][ $i ] ) ? wc_clean( $_POST['variable_tax_class'][ $i ] ) : null,
+				) );
 
-				$variation_id = absint( $variable_post_id[ $i ] );
-
-				// Checkboxes
-				$is_virtual      = isset( $variable_is_virtual[ $i ] ) ? 'yes' : 'no';
-				$is_downloadable = isset( $variable_is_downloadable[ $i ] ) ? 'yes' : 'no';
-				$post_status     = isset( $variable_enabled[ $i ] ) ? 'publish' : 'private';
-				$manage_stock    = isset( $variable_manage_stock[ $i ] ) ? 'yes' : 'no';
-
-				// Generate a useful post title
-				$variation_post_title = sprintf( __( 'Variation #%s of %s', 'woocommerce' ), absint( $variation_id ), esc_html( get_the_title( $post_id ) ) );
-
-				// Update or Add post
-				if ( ! $variation_id ) {
-
-					$variation = array(
-						'post_title'   => $variation_post_title,
-						'post_content' => '',
-						'post_status'  => $post_status,
-						'post_author'  => get_current_user_id(),
-						'post_parent'  => $post_id,
-						'post_type'    => 'product_variation',
-						'menu_order'   => $variable_menu_order[ $i ]
-					);
-
-					$variation_id = wp_insert_post( $variation );
-
-					do_action( 'woocommerce_create_product_variation', $variation_id );
-
-				} else {
-
-					$modified_date = date_i18n( 'Y-m-d H:i:s', current_time( 'timestamp' ) );
-
-					$wpdb->update( $wpdb->posts, array(
-							'post_status'       => $post_status,
-							'post_title'        => $variation_post_title,
-							'menu_order'        => $variable_menu_order[ $i ],
-							'post_modified'     => $modified_date,
-							'post_modified_gmt' => get_gmt_from_date( $modified_date )
-					), array( 'ID' => $variation_id ) );
-
-					clean_post_cache( $variation_id );
-
-					do_action( 'woocommerce_update_product_variation', $variation_id );
-
+				if ( is_wp_error( $errors ) ) {
+					WC_Admin_Meta_Boxes::add_error( $errors->get_error_message() );
 				}
 
-				// Only continue if we have a variation ID
-				if ( ! $variation_id ) {
-					continue;
-				}
-
-				// Unique SKU
-				$sku     = get_post_meta( $variation_id, '_sku', true );
-				$new_sku = wc_clean( $variable_sku[ $i ] );
-
-				if ( '' == $new_sku ) {
-					update_post_meta( $variation_id, '_sku', '' );
-				} elseif ( $new_sku !== $sku ) {
-					if ( ! empty( $new_sku ) ) {
-						$unique_sku = wc_product_has_unique_sku( $variation_id, $new_sku );
-
-						if ( ! $unique_sku ) {
-							WC_Admin_Meta_Boxes::add_error( sprintf( __( '#%s &ndash; Variation SKU must be unique.', 'woocommerce' ), $variation_id ) );
-						} else {
-							update_post_meta( $variation_id, '_sku', $new_sku );
-						}
-					} else {
-						update_post_meta( $variation_id, '_sku', '' );
-					}
-				}
-
-				// Update post meta
-				update_post_meta( $variation_id, '_thumbnail_id', absint( $upload_image_id[ $i ] ) );
-				update_post_meta( $variation_id, '_virtual', wc_clean( $is_virtual ) );
-				update_post_meta( $variation_id, '_downloadable', wc_clean( $is_downloadable ) );
-
-				if ( isset( $variable_weight[ $i ] ) ) {
-					update_post_meta( $variation_id, '_weight', ( '' === $variable_weight[ $i ] ) ? '' : wc_format_decimal( $variable_weight[ $i ] ) );
-				}
-
-				if ( isset( $variable_length[ $i ] ) ) {
-					update_post_meta( $variation_id, '_length', ( '' === $variable_length[ $i ] ) ? '' : wc_format_decimal( $variable_length[ $i ] ) );
-				}
-
-				if ( isset( $variable_width[ $i ] ) ) {
-					update_post_meta( $variation_id, '_width', ( '' === $variable_width[ $i ] ) ? '' : wc_format_decimal( $variable_width[ $i ] ) );
-				}
-
-				if ( isset( $variable_height[ $i ] ) ) {
-					update_post_meta( $variation_id, '_height', ( '' === $variable_height[ $i ] ) ? '' : wc_format_decimal( $variable_height[ $i ] ) );
-				}
-
-				// Stock handling
-				update_post_meta( $variation_id, '_manage_stock', $manage_stock );
-
-				// Only update stock status to user setting if changed by the user, but do so before looking at stock levels at variation level
-				if ( ! empty( $variable_stock_status[ $i ] ) ) {
-					wc_update_product_stock_status( $variation_id, $variable_stock_status[ $i ] );
-				}
-
-				if ( 'yes' === $manage_stock ) {
-					update_post_meta( $variation_id, '_backorders', wc_clean( $variable_backorders[ $i ] ) );
-					wc_update_product_stock( $variation_id, wc_stock_amount( $variable_stock[ $i ] ) );
-				} else {
-					delete_post_meta( $variation_id, '_backorders' );
-					delete_post_meta( $variation_id, '_stock' );
-				}
-
-				// Price handling
-				$regular_price = wc_format_decimal( $variable_regular_price[ $i ] );
-				$sale_price    = $variable_sale_price[ $i ] === '' ? '' : wc_format_decimal( $variable_sale_price[ $i ] );
-				$date_from     = wc_clean( $variable_sale_price_dates_from[ $i ] );
-				$date_to       = wc_clean( $variable_sale_price_dates_to[ $i ] );
-
-				update_post_meta( $variation_id, '_regular_price', $regular_price );
-				update_post_meta( $variation_id, '_sale_price', $sale_price );
-
-				// Save Dates
-				update_post_meta( $variation_id, '_sale_price_dates_from', $date_from ? strtotime( $date_from ) : '' );
-				update_post_meta( $variation_id, '_sale_price_dates_to', $date_to ? strtotime( $date_to ) : '' );
-
-				if ( $date_to && ! $date_from ) {
-					update_post_meta( $variation_id, '_sale_price_dates_from', strtotime( 'NOW', current_time( 'timestamp' ) ) );
-				}
-
-				// Update price if on sale
-				if ( '' !== $sale_price && '' === $date_to && '' === $date_from ) {
-					update_post_meta( $variation_id, '_price', $sale_price );
-				} else {
-					update_post_meta( $variation_id, '_price', $regular_price );
-				}
-
-				if ( '' !== $sale_price && $date_from && strtotime( $date_from ) < strtotime( 'NOW', current_time( 'timestamp' ) ) ) {
-					update_post_meta( $variation_id, '_price', $sale_price );
-				}
-
-				if ( $date_to && strtotime( $date_to ) < strtotime( 'NOW', current_time( 'timestamp' ) ) ) {
-					update_post_meta( $variation_id, '_price', $regular_price );
-					update_post_meta( $variation_id, '_sale_price_dates_from', '' );
-					update_post_meta( $variation_id, '_sale_price_dates_to', '' );
-				}
-
-				if ( isset( $variable_tax_class[ $i ] ) && $variable_tax_class[ $i ] !== 'parent' ) {
-					update_post_meta( $variation_id, '_tax_class', wc_clean( $variable_tax_class[ $i ] ) );
-				} else {
-					delete_post_meta( $variation_id, '_tax_class' );
-				}
-
-				if ( 'yes' == $is_downloadable ) {
-					update_post_meta( $variation_id, '_download_limit', wc_clean( $variable_download_limit[ $i ] ) );
-					update_post_meta( $variation_id, '_download_expiry', wc_clean( $variable_download_expiry[ $i ] ) );
-
-					$files              = array();
-					$file_names         = isset( $_POST['_wc_variation_file_names'][ $variation_id ] ) ? array_map( 'wc_clean', $_POST['_wc_variation_file_names'][ $variation_id ] ) : array();
-					$file_urls          = isset( $_POST['_wc_variation_file_urls'][ $variation_id ] ) ? array_map( 'wc_clean', $_POST['_wc_variation_file_urls'][ $variation_id ] ) : array();
-					$file_url_size      = sizeof( $file_urls );
-					$allowed_file_types = get_allowed_mime_types();
-
-					for ( $ii = 0; $ii < $file_url_size; $ii ++ ) {
-						if ( ! empty( $file_urls[ $ii ] ) ) {
-							// Find type and file URL
-							if ( 0 === strpos( $file_urls[ $ii ], 'http' ) ) {
-								$file_is  = 'absolute';
-								$file_url = esc_url_raw( $file_urls[ $ii ] );
-							} elseif ( '[' === substr( $file_urls[ $ii ], 0, 1 ) && ']' === substr( $file_urls[ $ii ], -1 ) ) {
-								$file_is  = 'shortcode';
-								$file_url = wc_clean( $file_urls[ $ii ] );
-							} else {
-								$file_is = 'relative';
-								$file_url = wc_clean( $file_urls[ $ii ] );
-							}
-
-							$file_name = wc_clean( $file_names[ $ii ] );
-							$file_hash = md5( $file_url );
-
-							// Validate the file extension
-							if ( in_array( $file_is, array( 'absolute', 'relative' ) ) ) {
-								$file_type  = wp_check_filetype( strtok( $file_url, '?' ), $allowed_file_types );
-								$parsed_url = parse_url( $file_url, PHP_URL_PATH );
-								$extension  = pathinfo( $parsed_url, PATHINFO_EXTENSION );
-
-								if ( ! empty( $extension ) && ! in_array( $file_type['type'], $allowed_file_types ) ) {
-									WC_Admin_Meta_Boxes::add_error( sprintf( __( '#%s &ndash; The downloadable file %s cannot be used as it does not have an allowed file type. Allowed types include: %s', 'woocommerce' ), $variation_id, '<code>' . basename( $file_url ) . '</code>', '<code>' . implode( ', ', array_keys( $allowed_file_types ) ) . '</code>' ) );
-									continue;
-								}
-							}
-
-							// Validate the file exists
-							if ( 'relative' === $file_is && ! apply_filters( 'woocommerce_downloadable_file_exists', file_exists( $file_url ), $file_url ) ) {
-								WC_Admin_Meta_Boxes::add_error( sprintf( __( '#%s &ndash; The downloadable file %s cannot be used as it does not exist on the server.', 'woocommerce' ), $variation_id, '<code>' . $file_url . '</code>' ) );
-								continue;
-							}
-
-							$files[ $file_hash ] = array(
-								'name' => $file_name,
-								'file' => $file_url
-							);
-						}
-					}
-
-					// grant permission to any newly added files on any existing orders for this product prior to saving
-					do_action( 'woocommerce_process_product_file_download_paths', $post_id, $variation_id, $files );
-
-					update_post_meta( $variation_id, '_downloadable_files', $files );
-				} else {
-					update_post_meta( $variation_id, '_download_limit', '' );
-					update_post_meta( $variation_id, '_download_expiry', '' );
-					update_post_meta( $variation_id, '_downloadable_files', '' );
-				}
-
-				update_post_meta( $variation_id, '_variation_description', wp_kses_post( $variable_description[ $i ] ) );
-
-				// Save shipping class
-				$variable_shipping_class[ $i ] = ! empty( $variable_shipping_class[ $i ] ) ? (int) $variable_shipping_class[ $i ] : '';
-				wp_set_object_terms( $variation_id, $variable_shipping_class[ $i ], 'product_shipping_class');
-
-				// Update Attributes
-				$updated_attribute_keys = array();
-				foreach ( $attributes as $attribute ) {
-					if ( $attribute['is_variation'] ) {
-						$attribute_key            = 'attribute_' . sanitize_title( $attribute['name'] );
-						$updated_attribute_keys[] = $attribute_key;
-
-						if ( $attribute['is_taxonomy'] ) {
-							// Don't use wc_clean as it destroys sanitized characters
-							$value = isset( $_POST[ $attribute_key ][ $i ] ) ? sanitize_title( stripslashes( $_POST[ $attribute_key ][ $i ] ) ) : '';
-						} else {
-							$value = isset( $_POST[ $attribute_key ][ $i ] ) ? wc_clean( stripslashes( $_POST[ $attribute_key ][ $i ] ) ) : '';
-						}
-
-						update_post_meta( $variation_id, $attribute_key, $value );
-					}
-				}
-
-				// Remove old taxonomies attributes so data is kept up to date - first get attribute key names
-				$delete_attribute_keys = $wpdb->get_col( $wpdb->prepare( "SELECT meta_key FROM {$wpdb->postmeta} WHERE meta_key LIKE 'attribute_%%' AND meta_key NOT IN ( '" . implode( "','", $updated_attribute_keys ) . "' ) AND post_id = %d;", $variation_id ) );
-
-				foreach ( $delete_attribute_keys as $key ) {
-					delete_post_meta( $variation_id, $key );
-				}
+				$variation->save();
 
 				do_action( 'woocommerce_save_product_variation', $variation_id, $i );
 			}
 		}
-
-		// Update parent if variable so price sorting works and stays in sync with the cheapest child
-		WC_Product_Variable::sync( $post_id );
-
-		// Update default attribute options setting
-		$default_attributes = array();
-
-		foreach ( $attributes as $attribute ) {
-
-			if ( $attribute['is_variation'] ) {
-				$value = '';
-
-				if ( isset( $_POST[ 'default_attribute_' . sanitize_title( $attribute['name'] ) ] ) ) {
-					if ( $attribute['is_taxonomy'] ) {
-						// Don't use wc_clean as it destroys sanitized characters
-						$value = sanitize_title( trim( stripslashes( $_POST[ 'default_attribute_' . sanitize_title( $attribute['name'] ) ] ) ) );
-					} else {
-						$value = wc_clean( trim( stripslashes( $_POST[ 'default_attribute_' . sanitize_title( $attribute['name'] ) ] ) ) );
-					}
-				}
-
-				if ( $value ) {
-					$default_attributes[ sanitize_title( $attribute['name'] ) ] = $value;
-				}
-			}
-		}
-
-		update_post_meta( $post_id, '_default_attributes', $default_attributes );
 	}
 }
diff --git a/includes/admin/meta-boxes/class-wc-meta-box-product-images.php b/includes/admin/meta-boxes/class-wc-meta-box-product-images.php
index d7a873f99c6..5ac7cca74bd 100644
--- a/includes/admin/meta-boxes/class-wc-meta-box-product-images.php
+++ b/includes/admin/meta-boxes/class-wc-meta-box-product-images.php
@@ -21,6 +21,8 @@ class WC_Meta_Box_Product_Images {
 
 	/**
 	 * Output the metabox.
+	 *
+	 * @param WP_Post $post
 	 */
 	public static function output( $post ) {
 		?>
@@ -36,9 +38,9 @@ class WC_Meta_Box_Product_Images {
 						$product_image_gallery = implode( ',', $attachment_ids );
 					}
 
-					$attachments = array_filter( explode( ',', $product_image_gallery ) );
-
-					$update_meta = false;
+					$attachments         = array_filter( explode( ',', $product_image_gallery ) );
+					$update_meta         = false;
+					$updated_gallery_ids = array();
 
 					if ( ! empty( $attachments ) ) {
 						foreach ( $attachments as $attachment_id ) {
@@ -47,7 +49,6 @@ class WC_Meta_Box_Product_Images {
 							// if attachment is empty skip
 							if ( empty( $attachment ) ) {
 								$update_meta = true;
-
 								continue;
 							}
 
@@ -74,13 +75,16 @@ class WC_Meta_Box_Product_Images {
 
 		</div>
 		<p class="add_product_images hide-if-no-js">
-			<a href="#" data-choose="<?php esc_attr_e( 'Add Images to Product Gallery', 'woocommerce' ); ?>" data-update="<?php esc_attr_e( 'Add to gallery', 'woocommerce' ); ?>" data-delete="<?php esc_attr_e( 'Delete image', 'woocommerce' ); ?>" data-text="<?php esc_attr_e( 'Delete', 'woocommerce' ); ?>"><?php _e( 'Add product gallery images', 'woocommerce' ); ?></a>
+			<a href="#" data-choose="<?php esc_attr_e( 'Add images to product gallery', 'woocommerce' ); ?>" data-update="<?php esc_attr_e( 'Add to gallery', 'woocommerce' ); ?>" data-delete="<?php esc_attr_e( 'Delete image', 'woocommerce' ); ?>" data-text="<?php esc_attr_e( 'Delete', 'woocommerce' ); ?>"><?php _e( 'Add product gallery images', 'woocommerce' ); ?></a>
 		</p>
 		<?php
 	}
 
 	/**
 	 * Save meta box data.
+	 *
+	 * @param int $post_id
+	 * @param WP_Post $post
 	 */
 	public static function save( $post_id, $post ) {
 		$attachment_ids = isset( $_POST['product_image_gallery'] ) ? array_filter( explode( ',', wc_clean( $_POST['product_image_gallery'] ) ) ) : array();
diff --git a/includes/admin/meta-boxes/class-wc-meta-box-order-reviews.php b/includes/admin/meta-boxes/class-wc-meta-box-product-reviews.php
similarity index 56%
rename from includes/admin/meta-boxes/class-wc-meta-box-order-reviews.php
rename to includes/admin/meta-boxes/class-wc-meta-box-product-reviews.php
index 2e34bd81a3a..2cd82daeaab 100644
--- a/includes/admin/meta-boxes/class-wc-meta-box-order-reviews.php
+++ b/includes/admin/meta-boxes/class-wc-meta-box-product-reviews.php
@@ -1,26 +1,24 @@
 <?php
 /**
- * Order Reviews
+ * Product Reviews
  *
- * Functions for displaying the order reviews data meta box.
+ * Functions for displaying product reviews data meta box.
  *
  * @author      WooThemes
  * @category    Admin
  * @package     WooCommerce/Admin/Meta Boxes
- * @version     2.1.0
  */
-
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
 /**
- * WC_Meta_Box_Order_Reviews Class.
+ * WC_Meta_Box_Product_Reviews
  */
-class WC_Meta_Box_Order_Reviews {
+class WC_Meta_Box_Product_Reviews {
 
 	/**
-	 * Output the metabox.
+	 * Output the metabox
 	 */
 	public static function output( $comment ) {
 		wp_nonce_field( 'woocommerce_save_data', 'woocommerce_meta_nonce' );
@@ -28,19 +26,19 @@ class WC_Meta_Box_Order_Reviews {
 		$current = get_comment_meta( $comment->comment_ID, 'rating', true );
 		?>
 		<select name="rating" id="rating">
-			<?php for ( $rating = 0; $rating <= 5; $rating++ ) {
-				echo sprintf( '<option value="%1$s"%2$s>%1$s</option>', $rating, selected( $current, $rating, false ) );
+			<?php for ( $rating = 1; $rating <= 5; $rating ++ ) {
+				printf( '<option value="%1$s"%2$s>%1$s</option>', $rating, selected( $current, $rating, false ) );
 			} ?>
 		</select>
 		<?php
 	}
 
 	/**
-	 * Save meta box data.
+	 * Save meta box data
 	 */
 	public static function save( $location, $comment_id ) {
 		// Not allowed, return regular value without updating meta
-		if ( empty( $_POST['woocommerce_meta_nonce'] ) || ( ! wp_verify_nonce( $_POST['woocommerce_meta_nonce'], 'woocommerce_save_data' ) && ! isset( $_POST['rating'] ) ) ) {
+		if ( ! wp_verify_nonce( $_POST['woocommerce_meta_nonce'], 'woocommerce_save_data' ) && ! isset( $_POST['rating'] ) ) {
 			return $location;
 		}
 
diff --git a/includes/admin/meta-boxes/class-wc-meta-box-product-short-description.php b/includes/admin/meta-boxes/class-wc-meta-box-product-short-description.php
index afe2170f4f2..7bc9f286238 100644
--- a/includes/admin/meta-boxes/class-wc-meta-box-product-short-description.php
+++ b/includes/admin/meta-boxes/class-wc-meta-box-product-short-description.php
@@ -21,6 +21,8 @@ class WC_Meta_Box_Product_Short_Description {
 
 	/**
 	 * Output the metabox.
+	 *
+	 * @param WP_Post $post
 	 */
 	public static function output( $post ) {
 
@@ -31,10 +33,9 @@ class WC_Meta_Box_Product_Short_Description {
 				'theme_advanced_buttons1' => 'bold,italic,strikethrough,separator,bullist,numlist,separator,blockquote,separator,justifyleft,justifycenter,justifyright,separator,link,unlink,separator,undo,redo,separator',
 				'theme_advanced_buttons2' => '',
 			),
-			'editor_css'    => '<style>#wp-excerpt-editor-container .wp-editor-area{height:175px; width:100%;}</style>'
+			'editor_css'    => '<style>#wp-excerpt-editor-container .wp-editor-area{height:175px; width:100%;}</style>',
 		);
 
 		wp_editor( htmlspecialchars_decode( $post->post_excerpt ), 'excerpt', apply_filters( 'woocommerce_product_short_description_editor_settings', $settings ) );
 	}
-
 }
diff --git a/includes/admin/meta-boxes/views/html-order-download-permission.php b/includes/admin/meta-boxes/views/html-order-download-permission.php
index c4fd6d0da19..3a97797dc2d 100644
--- a/includes/admin/meta-boxes/views/html-order-download-permission.php
+++ b/includes/admin/meta-boxes/views/html-order-download-permission.php
@@ -1,30 +1,48 @@
 <?php
-
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
 ?>
 <div class="wc-metabox closed">
 	<h3 class="fixed">
-		<button type="button" rel="<?php echo absint( $download->product_id ) . ',' . esc_attr( $download->download_id ); ?>" class="revoke_access button"><?php _e( 'Revoke Access', 'woocommerce' ); ?></button>
-		<div class="handlediv" title="<?php esc_attr_e( 'Click to toggle', 'woocommerce' ); ?>"></div>
-		<strong>
-			<?php echo '#' . absint( $product->id ) . ' &mdash; ' . apply_filters( 'woocommerce_admin_download_permissions_title', $product->get_title(), $download->product_id, $download->order_id, $download->order_key, $download->download_id ) . ' &mdash; ' . sprintf( __( '%s: %s', 'woocommerce' ), $file_count, wc_get_filename_from_url( $product->get_file_download_path( $download->download_id ) ) ) . ' &mdash; ' . sprintf( _n('Downloaded %s time', 'Downloaded %s times', absint( $download->download_count ), 'woocommerce'), absint( $download->download_count ) ); ?>
-		</strong>
+		<button type="button" data-permission_id="<?php echo esc_attr( $download->get_id() ); ?>" rel="<?php echo esc_attr( $download->get_product_id() ) . ',' . esc_attr( $download->get_download_id() ); ?>" class="revoke_access button"><?php _e( 'Revoke access', 'woocommerce' ); ?></button>
+		<div class="handlediv" aria-label="<?php esc_attr_e( 'Click to toggle', 'woocommerce' ); ?>"></div>
+		<strong><?php
+			printf(
+				'#%s &mdash; %s &mdash; %s: %s &mdash; ',
+				esc_html( $product->get_id() ),
+				esc_html( apply_filters( 'woocommerce_admin_download_permissions_title', $product->get_name(), $download->get_product_id(), $download->get_order_id(), $download->get_order_key(), $download->get_download_id() ) ),
+				esc_html( $file_count ),
+				esc_html( wc_get_filename_from_url( $product->get_file_download_path( $download->get_download_id() ) ) )
+			);
+			printf( _n( 'Downloaded %s time', 'Downloaded %s times', $download->get_download_count(), 'woocommerce' ), esc_html( $download->get_download_count() ) )
+		?></strong>
 	</h3>
 	<table cellpadding="0" cellspacing="0" class="wc-metabox-content">
 		<tbody>
 			<tr>
 				<td>
-					<label><?php _e( 'Downloads Remaining', 'woocommerce' ); ?>:</label>
-					<input type="hidden" name="product_id[<?php echo $loop; ?>]" value="<?php echo absint( $download->product_id ); ?>" />
-					<input type="hidden" name="download_id[<?php echo $loop; ?>]" value="<?php echo esc_attr( $download->download_id ); ?>" />
-					<input type="number" step="1" min="0" class="short" name="downloads_remaining[<?php echo $loop; ?>]" value="<?php echo esc_attr( $download->downloads_remaining ); ?>" placeholder="<?php esc_attr_e( 'Unlimited', 'woocommerce' ); ?>" />
+					<label><?php _e( 'Downloads remaining', 'woocommerce' ); ?></label>
+					<input type="hidden" name="permission_id[<?php echo $loop; ?>]" value="<?php echo esc_attr( $download->get_id() ); ?>" />
+					<input type="number" step="1" min="0" class="short" name="downloads_remaining[<?php echo $loop; ?>]" value="<?php echo esc_attr( $download->get_downloads_remaining() ); ?>" placeholder="<?php esc_attr_e( 'Unlimited', 'woocommerce' ); ?>" />
 				</td>
 				<td>
-					<label><?php _e( 'Access Expires', 'woocommerce' ); ?>:</label>
-					<input type="text" class="short date-picker" name="access_expires[<?php echo $loop; ?>]" value="<?php echo $download->access_expires > 0 ? date_i18n( 'Y-m-d', strtotime( $download->access_expires ) ) : ''; ?>" maxlength="10" placeholder="<?php esc_attr_e( 'Never', 'woocommerce' ); ?>" pattern="[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|1[0-9]|2[0-9]|3[01])" />
+					<label><?php _e( 'Access expires', 'woocommerce' ); ?></label>
+					<input type="text" class="short date-picker" name="access_expires[<?php echo $loop; ?>]" value="<?php echo ! is_null( $download->get_access_expires() ) ? date_i18n( 'Y-m-d', $download->get_access_expires()->getTimestamp() ) : ''; ?>" maxlength="10" placeholder="<?php esc_attr_e( 'Never', 'woocommerce' ); ?>" pattern="<?php echo esc_attr( apply_filters( 'woocommerce_date_input_html_pattern', '[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|1[0-9]|2[0-9]|3[01])' ) ); ?>" />
+				</td>
+				<td>
+					<label><?php _e( 'Customer download link', 'woocommerce' ); ?></label>
+					<?php
+						$download_link = add_query_arg( array(
+							'download_file' => $download->get_product_id(),
+							'order'         => $download->get_order_key(),
+							'email'         => urlencode( $download->get_user_email() ),
+							'key'           => $download->get_download_id(),
+						), trailingslashit( home_url() ) );
+
+						echo '<a href="' . esc_url( $download_link ) . '">' . esc_html( $file_count ) . '</a>';
+					?>
 				</td>
 			</tr>
 		</tbody>
diff --git a/includes/admin/meta-boxes/views/html-order-fee.php b/includes/admin/meta-boxes/views/html-order-fee.php
index cfecadfeafb..f7e823b7274 100644
--- a/includes/admin/meta-boxes/views/html-order-fee.php
+++ b/includes/admin/meta-boxes/views/html-order-fee.php
@@ -10,19 +10,17 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 ?>
-<tr class="fee <?php echo ( ! empty( $class ) ) ? $class : ''; ?>" data-order_item_id="<?php echo $item_id; ?>">
-	<td class="check-column"><input type="checkbox" /></td>
-
+<tr class="fee <?php echo ( ! empty( $class ) ) ? $class : ''; ?>" data-order_item_id="<?php echo esc_attr( $item_id ); ?>">
 	<td class="thumb"><div></div></td>
 
 	<td class="name">
 		<div class="view">
-			<?php echo ! empty( $item['name'] ) ? esc_html( $item['name'] ) : __( 'Fee', 'woocommerce' ); ?>
+			<?php echo esc_html( $item->get_name() ? $item->get_name() : __( 'Fee', 'woocommerce' ) ); ?>
 		</div>
 		<div class="edit" style="display: none;">
-			<input type="text" placeholder="<?php esc_attr_e( 'Fee Name', 'woocommerce' ); ?>" name="order_item_name[<?php echo absint( $item_id ); ?>]" value="<?php echo ( isset( $item['name'] ) ) ? esc_attr( $item['name'] ) : ''; ?>" />
+			<input type="text" placeholder="<?php esc_attr_e( 'Fee name', 'woocommerce' ); ?>" name="order_item_name[<?php echo absint( $item_id ); ?>]" value="<?php echo ( $item->get_name() ) ? esc_attr( $item->get_name() ) : ''; ?>" />
 			<input type="hidden" class="order_item_id" name="order_item_id[]" value="<?php echo esc_attr( $item_id ); ?>" />
-			<input type="hidden" name="order_item_tax_class[<?php echo absint( $item_id ); ?>]" value="<?php echo isset( $item['tax_class'] ) ? esc_attr( $item['tax_class'] ) : ''; ?>" />
+			<input type="hidden" name="order_item_tax_class[<?php echo absint( $item_id ); ?>]" value="<?php echo esc_attr( $item->get_tax_class() ); ?>" />
 		</div>
 	</td>
 
@@ -34,15 +32,15 @@ if ( ! defined( 'ABSPATH' ) ) {
 	<td class="line_cost" width="1%">
 		<div class="view">
 			<?php
-				echo ( isset( $item['line_total'] ) ) ? wc_price( wc_round_tax_total( $item['line_total'] ) ) : '';
+				echo wc_price( $item->get_total(), array( 'currency' => $order->get_currency() ) );
 
 				if ( $refunded = $order->get_total_refunded_for_item( $item_id, 'fee' ) ) {
-					echo '<small class="refunded">-' . wc_price( $refunded ) . '</small>';
+					echo '<small class="refunded">-' . wc_price( $refunded, array( 'currency' => $order->get_currency() ) ) . '</small>';
 				}
 			?>
 		</div>
 		<div class="edit" style="display: none;">
-			<input type="text" name="line_total[<?php echo absint( $item_id ); ?>]" placeholder="<?php echo wc_format_localized_price( 0 ); ?>" value="<?php echo ( isset( $item['line_total'] ) ) ? esc_attr( wc_format_localized_price( $item['line_total'] ) ) : ''; ?>" class="line_total wc_input_price" />
+			<input type="text" name="line_total[<?php echo absint( $item_id ); ?>]" placeholder="<?php echo wc_format_localized_price( 0 ); ?>" value="<?php echo esc_attr( wc_format_localized_price( $item->get_total() ) ); ?>" class="line_total wc_input_price" />
 		</div>
 		<div class="refund" style="display: none;">
 			<input type="text" name="refund_line_total[<?php echo absint( $item_id ); ?>]" placeholder="<?php echo wc_format_localized_price( 0 ); ?>" class="refund_line_total wc_input_price" />
@@ -50,21 +48,18 @@ if ( ! defined( 'ABSPATH' ) ) {
 	</td>
 
 	<?php
-		if ( empty( $legacy_order ) && wc_tax_enabled() ) :
-			$line_tax_data = isset( $item['line_tax_data'] ) ? $item['line_tax_data'] : '';
-			$tax_data      = maybe_unserialize( $line_tax_data );
-
-			foreach ( $order_taxes as $tax_item ) :
-				$tax_item_id       = $tax_item['rate_id'];
-				$tax_item_total    = isset( $tax_data['total'][ $tax_item_id ] ) ? $tax_data['total'][ $tax_item_id ] : '';
+		if ( ( $tax_data = $item->get_taxes() ) && wc_tax_enabled() ) {
+			foreach ( $order_taxes as $tax_item ) {
+				$tax_item_id    = $tax_item->get_rate_id();
+				$tax_item_total = isset( $tax_data['total'][ $tax_item_id ] ) ? $tax_data['total'][ $tax_item_id ] : '';
 				?>
 					<td class="line_tax" width="1%">
 						<div class="view">
 							<?php
-								echo ( '' != $tax_item_total ) ? wc_price( wc_round_tax_total( $tax_item_total ) ) : '&ndash;';
+								echo ( '' !== $tax_item_total ) ? wc_price( wc_round_tax_total( $tax_item_total ), array( 'currency' => $order->get_currency() ) ) : '&ndash;';
 
 								if ( $refunded = $order->get_tax_refunded_for_item( $item_id, $tax_item_id, 'fee' ) ) {
-									echo '<small class="refunded">-' . wc_price( $refunded ) . '</small>';
+									echo '<small class="refunded">-' . wc_price( $refunded, array( 'currency' => $order->get_currency() ) ) . '</small>';
 								}
 							?>
 						</div>
@@ -77,10 +72,9 @@ if ( ! defined( 'ABSPATH' ) ) {
 					</td>
 
 				<?php
-			endforeach;
-		endif;
+			}
+		}
 	?>
-
 	<td class="wc-order-edit-line-item">
 		<?php if ( $order->is_editable() ) : ?>
 			<div class="wc-order-edit-line-item-actions">
diff --git a/includes/admin/meta-boxes/views/html-order-item-meta.php b/includes/admin/meta-boxes/views/html-order-item-meta.php
new file mode 100644
index 00000000000..d4f35c2b999
--- /dev/null
+++ b/includes/admin/meta-boxes/views/html-order-item-meta.php
@@ -0,0 +1,55 @@
+<?php
+$hidden_order_itemmeta = apply_filters( 'woocommerce_hidden_order_itemmeta', array(
+	'_qty',
+	'_tax_class',
+	'_product_id',
+	'_variation_id',
+	'_line_subtotal',
+	'_line_subtotal_tax',
+	'_line_total',
+	'_line_tax',
+	'method_id',
+	'cost',
+) );
+?><div class="view">
+	<?php if ( $meta_data = $item->get_formatted_meta_data( '' ) ) : ?>
+		<table cellspacing="0" class="display_meta">
+			<?php foreach ( $meta_data as $meta_id => $meta ) :
+				if ( in_array( $meta->key, $hidden_order_itemmeta ) ) {
+					continue;
+				}
+				?>
+				<tr>
+					<th><?php echo wp_kses_post( $meta->display_key ); ?>:</th>
+					<td><?php echo wp_kses_post( force_balance_tags( $meta->display_value ) ); ?></td>
+				</tr>
+			<?php endforeach; ?>
+		</table>
+	<?php endif; ?>
+</div>
+<div class="edit" style="display: none;">
+	<table class="meta" cellspacing="0">
+		<tbody class="meta_items">
+			<?php if ( $meta_data = $item->get_formatted_meta_data( '' ) ) : ?>
+				<?php foreach ( $meta_data as $meta_id => $meta ) :
+					if ( in_array( $meta->key, $hidden_order_itemmeta ) ) {
+						continue;
+					}
+					?>
+					<tr data-meta_id="<?php echo esc_attr( $meta_id ); ?>">
+						<td>
+							<input type="text" placeholder="<?php esc_attr_e( 'Name (required)', 'woocommerce' ); ?>" name="meta_key[<?php echo esc_attr( $item_id ); ?>][<?php echo esc_attr( $meta_id ); ?>]" value="<?php echo esc_attr( $meta->key ); ?>" />
+							<textarea placeholder="<?php esc_attr_e( 'Value (required)', 'woocommerce' ); ?>" name="meta_value[<?php echo esc_attr( $item_id ); ?>][<?php echo esc_attr( $meta_id ); ?>]"><?php echo esc_textarea( rawurldecode( $meta->value ) ); ?></textarea>
+						</td>
+						<td width="1%"><button class="remove_order_item_meta button">&times;</button></td>
+					</tr>
+				<?php endforeach; ?>
+			<?php endif; ?>
+		</tbody>
+		<tfoot>
+			<tr>
+				<td colspan="4"><button class="add_order_item_meta button"><?php _e( 'Add&nbsp;meta', 'woocommerce' ); ?></button></td>
+			</tr>
+		</tfoot>
+	</table>
+</div>
diff --git a/includes/admin/meta-boxes/views/html-order-item.php b/includes/admin/meta-boxes/views/html-order-item.php
index 7c26bbf403e..2e5bbbda402 100644
--- a/includes/admin/meta-boxes/views/html-order-item.php
+++ b/includes/admin/meta-boxes/views/html-order-item.php
@@ -5,206 +5,98 @@
  * @var object $item The item being displayed
  * @var int $item_id The id of the item being displayed
  */
-
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
+$product      = $item->get_product();
+$product_link = $product ? admin_url( 'post.php?post=' . $item->get_product_id() . '&action=edit' ) : '';
+$thumbnail    = $product ? apply_filters( 'woocommerce_admin_order_item_thumbnail', $product->get_image( 'thumbnail', array( 'title' => '' ), false ), $item_id, $item ) : '';
 ?>
-<tr class="item <?php echo apply_filters( 'woocommerce_admin_html_order_item_class', ( ! empty( $class ) ? $class : '' ), $item ); ?>" data-order_item_id="<?php echo $item_id; ?>">
-	<td class="check-column"><input type="checkbox" /></td>
+<tr class="item <?php echo apply_filters( 'woocommerce_admin_html_order_item_class', ( ! empty( $class ) ? $class : '' ), $item, $order ); ?>" data-order_item_id="<?php echo esc_attr( $item_id ); ?>">
 	<td class="thumb">
-		<?php if ( $_product ) : ?>
-			<a href="<?php echo esc_url( admin_url( 'post.php?post=' . absint( $_product->id ) . '&action=edit' ) ); ?>" class="tips" data-tip="<?php
-
-				echo '<strong>' . __( 'Product ID:', 'woocommerce' ) . '</strong> ' . absint( $item['product_id'] );
-
-				if ( ! empty( $item['variation_id'] ) && 'product_variation' === get_post_type( $item['variation_id'] ) ) {
-					echo '<br/><strong>' . __( 'Variation ID:', 'woocommerce' ) . '</strong> ' . absint( $item['variation_id'] );
-				} elseif ( ! empty( $item['variation_id'] ) ) {
-					echo '<br/><strong>' . __( 'Variation ID:', 'woocommerce' ) . '</strong> ' . absint( $item['variation_id'] ) . ' (' . __( 'No longer exists', 'woocommerce' ) . ')';
-				}
-
-				if ( $_product && $_product->get_sku() ) {
-					echo '<br/><strong>' . __( 'Product SKU:', 'woocommerce' ).'</strong> ' . esc_html( $_product->get_sku() );
-				}
-
-				if ( $_product && isset( $_product->variation_data ) ) {
-					echo '<br/>' . wc_get_formatted_variation( $_product->variation_data, true );
-				}
-
-			?>"><?php echo apply_filters( 'woocommerce_admin_order_item_thumbnail', $_product->get_image( 'shop_thumbnail', array( 'title' => '' ) ), $item_id, $item ); ?></a>
-		<?php else : ?>
-			<?php echo wc_placeholder_img( 'shop_thumbnail' ); ?>
-		<?php endif; ?>
+		<?php echo '<div class="wc-order-item-thumbnail">' . wp_kses_post( $thumbnail ) . '</div>'; ?>
 	</td>
-	<td class="name" data-sort-value="<?php echo esc_attr( $item['name'] ); ?>">
+	<td class="name" data-sort-value="<?php echo esc_attr( $item->get_name() ); ?>">
+		<?php
+			echo $product_link ? '<a href="' . esc_url( $product_link ) . '" class="wc-order-item-name">' . esc_html( $item->get_name() ) . '</a>' : '<div class="class="wc-order-item-name"">' . esc_html( $item->get_name() ) . '</div>';
 
-		<?php echo ( $_product && $_product->get_sku() ) ? esc_html( $_product->get_sku() ) . ' &ndash; ' : ''; ?>
-
-		<?php if ( $_product ) : ?>
-			<a target="_blank" href="<?php echo esc_url( admin_url( 'post.php?post=' . absint( $_product->id ) . '&action=edit' ) ); ?>">
-				<?php echo esc_html( $item['name'] ); ?>
-			</a>
-		<?php else : ?>
-			<?php echo esc_html( $item['name'] ); ?>
-		<?php endif; ?>
+			if ( $product && $product->get_sku() ) {
+				echo '<div class="wc-order-item-sku"><strong>' . __( 'SKU:', 'woocommerce' ) . '</strong> ' . esc_html( $product->get_sku() ) . '</div>';
+			}
 
+			if ( $item->get_variation_id() ) {
+				echo '<div class="wc-order-item-variation"><strong>' . __( 'Variation ID:', 'woocommerce' ) . '</strong> ';
+				if ( 'product_variation' === get_post_type( $item->get_variation_id() ) ) {
+					echo esc_html( $item->get_variation_id() );
+				} else {
+					/* translators: %s: variation id */
+					printf( esc_html__( '%s (No longer exists)', 'woocommerce' ), $item->get_variation_id() );
+				}
+				echo '</div>';
+			}
+		?>
 		<input type="hidden" class="order_item_id" name="order_item_id[]" value="<?php echo esc_attr( $item_id ); ?>" />
-		<input type="hidden" name="order_item_tax_class[<?php echo absint( $item_id ); ?>]" value="<?php echo isset( $item['tax_class'] ) ? esc_attr( $item['tax_class'] ) : ''; ?>" />
-
-		<?php do_action( 'woocommerce_before_order_itemmeta', $item_id, $item, $_product ) ?>
-
-		<div class="view">
-			<?php
-				global $wpdb;
-
-				if ( $metadata = $order->has_meta( $item_id ) ) {
-					echo '<table cellspacing="0" class="display_meta">';
-					foreach ( $metadata as $meta ) {
-
-						// Skip hidden core fields
-						if ( in_array( $meta['meta_key'], apply_filters( 'woocommerce_hidden_order_itemmeta', array(
-							'_qty',
-							'_tax_class',
-							'_product_id',
-							'_variation_id',
-							'_line_subtotal',
-							'_line_subtotal_tax',
-							'_line_total',
-							'_line_tax',
-						) ) ) ) {
-							continue;
-						}
-
-						// Skip serialised meta
-						if ( is_serialized( $meta['meta_value'] ) ) {
-							continue;
-						}
-
-						// Get attribute data
-						if ( taxonomy_exists( wc_sanitize_taxonomy_name( $meta['meta_key'] ) ) ) {
-							$term               = get_term_by( 'slug', $meta['meta_value'], wc_sanitize_taxonomy_name( $meta['meta_key'] ) );
-							$meta['meta_key']   = wc_attribute_label( wc_sanitize_taxonomy_name( $meta['meta_key'] ) );
-							$meta['meta_value'] = isset( $term->name ) ? $term->name : $meta['meta_value'];
-						} else {
-							$meta['meta_key']   = apply_filters( 'woocommerce_attribute_label', wc_attribute_label( $meta['meta_key'], $_product ), $meta['meta_key'] );
-						}
-
-						echo '<tr><th>' . wp_kses_post( rawurldecode( $meta['meta_key'] ) ) . ':</th><td>' . wp_kses_post( wpautop( make_clickable( rawurldecode( $meta['meta_value'] ) ) ) ) . '</td></tr>';
-					}
-					echo '</table>';
-				}
-			?>
-		</div>
-		<div class="edit" style="display: none;">
-			<table class="meta" cellspacing="0">
-				<tbody class="meta_items">
-				<?php
-					if ( $metadata = $order->has_meta( $item_id )) {
-						foreach ( $metadata as $meta ) {
-
-							// Skip hidden core fields
-							if ( in_array( $meta['meta_key'], apply_filters( 'woocommerce_hidden_order_itemmeta', array(
-								'_qty',
-								'_tax_class',
-								'_product_id',
-								'_variation_id',
-								'_line_subtotal',
-								'_line_subtotal_tax',
-								'_line_total',
-								'_line_tax',
-							) ) ) ) {
-								continue;
-							}
-
-							// Skip serialised meta
-							if ( is_serialized( $meta['meta_value'] ) ) {
-								continue;
-							}
-
-							$meta['meta_key']   = rawurldecode( $meta['meta_key'] );
-							$meta['meta_value'] = esc_textarea( rawurldecode( $meta['meta_value'] ) ); // using a <textarea />
-							$meta['meta_id']    = absint( $meta['meta_id'] );
-
-							echo '<tr data-meta_id="' . esc_attr( $meta['meta_id'] ) . '">
-								<td>
-									<input type="text" name="meta_key[' . $meta['meta_id'] . ']" value="' . esc_attr( $meta['meta_key'] ) . '" />
-									<textarea name="meta_value[' . $meta['meta_id'] . ']">' . $meta['meta_value'] . '</textarea>
-								</td>
-								<td width="1%"><button class="remove_order_item_meta button">&times;</button></td>
-							</tr>';
-						}
-					}
-				?>
-				</tbody>
-				<tfoot>
-					<tr>
-						<td colspan="4"><button class="add_order_item_meta button"><?php _e( 'Add&nbsp;meta', 'woocommerce' ); ?></button></td>
-					</tr>
-				</tfoot>
-			</table>
-		</div>
-
-		<?php do_action( 'woocommerce_after_order_itemmeta', $item_id, $item, $_product ) ?>
+		<input type="hidden" name="order_item_tax_class[<?php echo absint( $item_id ); ?>]" value="<?php echo esc_attr( $item->get_tax_class() ); ?>" />
 
+		<?php do_action( 'woocommerce_before_order_itemmeta', $item_id, $item, $product ) ?>
+		<?php include( 'html-order-item-meta.php' ); ?>
+		<?php do_action( 'woocommerce_after_order_itemmeta', $item_id, $item, $product ) ?>
 	</td>
 
-	<?php do_action( 'woocommerce_admin_order_item_values', $_product, $item, absint( $item_id ) ); ?>
+	<?php do_action( 'woocommerce_admin_order_item_values', $product, $item, absint( $item_id ) ); ?>
 
 	<td class="item_cost" width="1%" data-sort-value="<?php echo esc_attr( $order->get_item_subtotal( $item, false, true ) ); ?>">
 		<div class="view">
 			<?php
-				if ( isset( $item['line_total'] ) ) {
-					if ( isset( $item['line_subtotal'] ) && $item['line_subtotal'] != $item['line_total'] ) {
-						echo '<del>' . wc_price( $order->get_item_subtotal( $item, false, true ), array( 'currency' => $order->get_order_currency() ) ) . '</del> ';
-					}
-					echo wc_price( $order->get_item_total( $item, false, true ), array( 'currency' => $order->get_order_currency() ) );
+				echo wc_price( $order->get_item_total( $item, false, true ), array( 'currency' => $order->get_currency() ) );
+
+				if ( $item->get_subtotal() !== $item->get_total() ) {
+					echo '<span class="wc-order-item-discount">-' . wc_price( wc_format_decimal( $order->get_item_subtotal( $item, false, false ) - $order->get_item_total( $item, false, false ), '' ), array( 'currency' => $order->get_currency() ) ) . '</span>';
 				}
 			?>
 		</div>
 	</td>
-
 	<td class="quantity" width="1%">
 		<div class="view">
 			<?php
-				echo ( isset( $item['qty'] ) ) ? esc_html( $item['qty'] ) : '';
+				echo '<small class="times">&times;</small> ' . esc_html( $item->get_quantity() );
 
 				if ( $refunded_qty = $order->get_qty_refunded_for_item( $item_id ) ) {
-					echo '<small class="refunded">-' . $refunded_qty . '</small>';
+					echo '<small class="refunded">' . ( $refunded_qty * -1 ) . '</small>';
 				}
 			?>
 		</div>
 		<div class="edit" style="display: none;">
-			<?php $item_qty = esc_attr( $item['qty'] ); ?>
-			<input type="number" step="<?php echo apply_filters( 'woocommerce_quantity_input_step', '1', $_product ); ?>" min="0" autocomplete="off" name="order_item_qty[<?php echo absint( $item_id ); ?>]" placeholder="0" value="<?php echo $item_qty; ?>" data-qty="<?php echo $item_qty; ?>" size="4" class="quantity" />
+			<input type="number" step="<?php echo apply_filters( 'woocommerce_quantity_input_step', '1', $product ); ?>" min="0" autocomplete="off" name="order_item_qty[<?php echo absint( $item_id ); ?>]" placeholder="0" value="<?php echo esc_attr( $item->get_quantity() ); ?>" data-qty="<?php echo esc_attr( $item->get_quantity() ); ?>" size="4" class="quantity" />
 		</div>
 		<div class="refund" style="display: none;">
-			<input type="number" step="<?php echo apply_filters( 'woocommerce_quantity_input_step', '1', $_product ); ?>" min="0" max="<?php echo $item['qty']; ?>" autocomplete="off" name="refund_order_item_qty[<?php echo absint( $item_id ); ?>]" placeholder="0" size="4" class="refund_order_item_qty" />
+			<input type="number" step="<?php echo apply_filters( 'woocommerce_quantity_input_step', '1', $product ); ?>" min="0" max="<?php echo $item->get_quantity(); ?>" autocomplete="off" name="refund_order_item_qty[<?php echo absint( $item_id ); ?>]" placeholder="0" size="4" class="refund_order_item_qty" />
 		</div>
 	</td>
-
-	<td class="line_cost" width="1%" data-sort-value="<?php echo esc_attr( isset( $item['line_total'] ) ? $item['line_total'] : '' ); ?>">
+	<td class="line_cost" width="1%" data-sort-value="<?php echo esc_attr( $item->get_total() ); ?>">
 		<div class="view">
 			<?php
-				if ( isset( $item['line_total'] ) ) {
-					if ( isset( $item['line_subtotal'] ) && $item['line_subtotal'] != $item['line_total'] ) {
-						echo '<del>' . wc_price( $item['line_subtotal'], array( 'currency' => $order->get_order_currency() ) ) . '</del> ';
-					}
-					echo wc_price( $item['line_total'], array( 'currency' => $order->get_order_currency() ) );
+				echo wc_price( $item->get_total(), array( 'currency' => $order->get_currency() ) );
+
+				if ( $item->get_subtotal() !== $item->get_total() ) {
+					echo '<span class="wc-order-item-discount">-' . wc_price( wc_format_decimal( $item->get_subtotal() - $item->get_total(), '' ), array( 'currency' => $order->get_currency() ) ) . '</span>';
 				}
 
 				if ( $refunded = $order->get_total_refunded_for_item( $item_id ) ) {
-					echo '<small class="refunded">-' . wc_price( $refunded, array( 'currency' => $order->get_order_currency() ) ) . '</small>';
+					echo '<small class="refunded">' . wc_price( $refunded, array( 'currency' => $order->get_currency() ) ) . '</small>';
 				}
 			?>
 		</div>
 		<div class="edit" style="display: none;">
 			<div class="split-input">
-				<?php $item_total = ( isset( $item['line_total'] ) ) ? esc_attr( wc_format_localized_price( $item['line_total'] ) ) : ''; ?>
-				<input type="text" name="line_total[<?php echo absint( $item_id ); ?>]" placeholder="<?php echo wc_format_localized_price( 0 ); ?>" value="<?php echo $item_total; ?>" class="line_total wc_input_price tips" data-tip="<?php esc_attr_e( 'After pre-tax discounts.', 'woocommerce' ); ?>" data-total="<?php echo $item_total; ?>" />
-
-				<?php $item_subtotal = ( isset( $item['line_subtotal'] ) ) ? esc_attr( wc_format_localized_price( $item['line_subtotal'] ) ) : ''; ?>
-				<input type="text" name="line_subtotal[<?php echo absint( $item_id ); ?>]" value="<?php echo $item_subtotal; ?>" class="line_subtotal wc_input_price tips" data-tip="<?php esc_attr_e( 'Before pre-tax discounts.', 'woocommerce' ); ?>" data-subtotal="<?php echo $item_subtotal; ?>" />
+				<div class="input">
+					<label><?php esc_attr_e( 'Pre-discount:', 'woocommerce' ); ?></label>
+					<input type="text" name="line_subtotal[<?php echo absint( $item_id ); ?>]" placeholder="<?php echo wc_format_localized_price( 0 ); ?>" value="<?php echo esc_attr( wc_format_localized_price( $item->get_subtotal() ) ); ?>" class="line_subtotal wc_input_price" data-subtotal="<?php echo esc_attr( wc_format_localized_price( $item->get_subtotal() ) ); ?>" />
+				</div>
+				<div class="input">
+					<label><?php esc_attr_e( 'Total:', 'woocommerce' ); ?></label>
+					<input type="text" name="line_total[<?php echo absint( $item_id ); ?>]" placeholder="<?php echo wc_format_localized_price( 0 ); ?>" value="<?php echo esc_attr( wc_format_localized_price( $item->get_total() ) ); ?>" class="line_total wc_input_price" data-tip="<?php esc_attr_e( 'After pre-tax discounts.', 'woocommerce' ); ?>" data-total="<?php echo esc_attr( wc_format_localized_price( $item->get_total() ) ); ?>" />
+				</div>
 			</div>
 		</div>
 		<div class="refund" style="display: none;">
@@ -213,57 +105,59 @@ if ( ! defined( 'ABSPATH' ) ) {
 	</td>
 
 	<?php
-		if ( empty( $legacy_order ) && wc_tax_enabled() ) :
-			$line_tax_data = isset( $item['line_tax_data'] ) ? $item['line_tax_data'] : '';
-			$tax_data      = maybe_unserialize( $line_tax_data );
-
-			foreach ( $order_taxes as $tax_item ) :
-				$tax_item_id       = $tax_item['rate_id'];
+		if ( ( $tax_data = $item->get_taxes() ) && wc_tax_enabled() ) {
+			foreach ( $order_taxes as $tax_item ) {
+				$tax_item_id       = $tax_item->get_rate_id();
 				$tax_item_total    = isset( $tax_data['total'][ $tax_item_id ] ) ? $tax_data['total'][ $tax_item_id ] : '';
 				$tax_item_subtotal = isset( $tax_data['subtotal'][ $tax_item_id ] ) ? $tax_data['subtotal'][ $tax_item_id ] : '';
-
 				?>
-					<td class="line_tax" width="1%">
-						<div class="view">
-							<?php
-								if ( '' != $tax_item_total ) {
-									if ( isset( $tax_item_subtotal ) && $tax_item_subtotal != $tax_item_total ) {
-										echo '<del>' . wc_price( wc_round_tax_total( $tax_item_subtotal ), array( 'currency' => $order->get_order_currency() ) ) . '</del> ';
-									}
+				<td class="line_tax" width="1%">
+					<div class="view">
+						<?php
+							if ( '' != $tax_item_total ) {
+								echo wc_price( wc_round_tax_total( $tax_item_total ), array( 'currency' => $order->get_currency() ) );
+							} else {
+								echo '&ndash;';
+							}
 
-									echo wc_price( wc_round_tax_total( $tax_item_total ), array( 'currency' => $order->get_order_currency() ) );
+							if ( $item->get_subtotal() !== $item->get_total() ) {
+								if ( '' === $tax_item_total ) {
+									echo '<span class="wc-order-item-discount">&ndash;</span>';
 								} else {
-									echo '&ndash;';
+									echo '<span class="wc-order-item-discount">-' . wc_price( wc_round_tax_total( $tax_item_subtotal - $tax_item_total ), array( 'currency' => $order->get_currency() ) ) . '</span>';
 								}
+							}
 
-								if ( $refunded = $order->get_tax_refunded_for_item( $item_id, $tax_item_id ) ) {
-									echo '<small class="refunded">-' . wc_price( $refunded, array( 'currency' => $order->get_order_currency() ) ) . '</small>';
-								}
-							?>
-						</div>
-						<div class="edit" style="display: none;">
-							<div class="split-input">
-								<?php $item_total_tax = ( isset( $tax_item_total ) ) ? esc_attr( wc_format_localized_price( $tax_item_total ) ) : ''; ?>
-								<input type="text" name="line_tax[<?php echo absint( $item_id ); ?>][<?php echo esc_attr( $tax_item_id ); ?>]" placeholder="<?php echo wc_format_localized_price( 0 ); ?>" value="<?php echo $item_total_tax; ?>" class="line_tax wc_input_price tips" data-tip="<?php esc_attr_e( 'After pre-tax discounts.', 'woocommerce' ); ?>" data-total_tax="<?php echo $item_total_tax; ?>" />
-
-								<?php $item_subtotal_tax = ( isset( $tax_item_subtotal ) ) ? esc_attr( wc_format_localized_price( $tax_item_subtotal ) ) : ''; ?>
-								<input type="text" name="line_subtotal_tax[<?php echo absint( $item_id ); ?>][<?php echo esc_attr( $tax_item_id ); ?>]" value="<?php echo $item_subtotal_tax; ?>" class="line_subtotal_tax wc_input_price tips" data-tip="<?php esc_attr_e( 'Before pre-tax discounts.', 'woocommerce' ); ?>" data-subtotal_tax="<?php echo $item_subtotal_tax; ?>" />
+							if ( $refunded = $order->get_tax_refunded_for_item( $item_id, $tax_item_id ) ) {
+								echo '<small class="refunded">' . wc_price( $refunded, array( 'currency' => $order->get_currency() ) ) . '</small>';
+							}
+						?>
+					</div>
+					<div class="edit" style="display: none;">
+						<div class="split-input">
+							<div class="input">
+								<label><?php esc_attr_e( 'Pre-discount:', 'woocommerce' ); ?></label>
+								<input type="text" name="line_subtotal_tax[<?php echo absint( $item_id ); ?>][<?php echo esc_attr( $tax_item_id ); ?>]" placeholder="<?php echo wc_format_localized_price( 0 ); ?>" value="<?php echo esc_attr( wc_format_localized_price( $tax_item_subtotal ) ); ?>" class="line_subtotal_tax wc_input_price" data-subtotal_tax="<?php echo esc_attr( wc_format_localized_price( $tax_item_subtotal ) ); ?>" data-tax_id="<?php echo esc_attr( $tax_item_id ); ?>" />
+							</div>
+							<div class="input">
+								<label><?php esc_attr_e( 'Total:', 'woocommerce' ); ?></label>
+								<input type="text" name="line_tax[<?php echo absint( $item_id ); ?>][<?php echo esc_attr( $tax_item_id ); ?>]" placeholder="<?php echo wc_format_localized_price( 0 ); ?>" value="<?php echo esc_attr( wc_format_localized_price( $tax_item_total ) ); ?>" class="line_tax wc_input_price" data-total_tax="<?php echo esc_attr( wc_format_localized_price( $tax_item_total ) ); ?>" data-tax_id="<?php echo esc_attr( $tax_item_id ); ?>" />
 							</div>
 						</div>
-						<div class="refund" style="display: none;">
-							<input type="text" name="refund_line_tax[<?php echo absint( $item_id ); ?>][<?php echo esc_attr( $tax_item_id ); ?>]" placeholder="<?php echo wc_format_localized_price( 0 ); ?>" class="refund_line_tax wc_input_price" data-tax_id="<?php echo esc_attr( $tax_item_id ); ?>" />
-						</div>
-					</td>
+					</div>
+					<div class="refund" style="display: none;">
+						<input type="text" name="refund_line_tax[<?php echo absint( $item_id ); ?>][<?php echo esc_attr( $tax_item_id ); ?>]" placeholder="<?php echo wc_format_localized_price( 0 ); ?>" class="refund_line_tax wc_input_price" data-tax_id="<?php echo esc_attr( $tax_item_id ); ?>" />
+					</div>
+				</td>
 				<?php
-			endforeach;
-		endif;
+			}
+		}
 	?>
-
-	<td class="wc-order-edit-line-item">
-		<?php if ( $order->is_editable() ) : ?>
-			<div class="wc-order-edit-line-item-actions">
-				<a class="edit-order-item" href="#"></a><a class="delete-order-item" href="#"></a>
-			</div>
-		<?php endif; ?>
+	<td class="wc-order-edit-line-item" width="1%">
+		<div class="wc-order-edit-line-item-actions">
+			<?php if ( $order->is_editable() ) : ?>
+				<a class="edit-order-item tips" href="#" data-tip="<?php esc_attr_e( 'Edit item', 'woocommerce' ); ?>"></a><a class="delete-order-item tips" href="#" data-tip="<?php esc_attr_e( 'Delete item', 'woocommerce' ); ?>"></a>
+			<?php endif; ?>
+		</div>
 	</td>
 </tr>
diff --git a/includes/admin/meta-boxes/views/html-order-items.php b/includes/admin/meta-boxes/views/html-order-items.php
index 92d09ccb759..008faa87336 100644
--- a/includes/admin/meta-boxes/views/html-order-items.php
+++ b/includes/admin/meta-boxes/views/html-order-items.php
@@ -15,61 +15,34 @@ $line_items_fee      = $order->get_items( 'fee' );
 $line_items_shipping = $order->get_items( 'shipping' );
 
 if ( wc_tax_enabled() ) {
-	$order_taxes         = $order->get_taxes();
-	$tax_classes         = WC_Tax::get_tax_classes();
-	$classes_options     = array();
-	$classes_options[''] = __( 'Standard', 'woocommerce' );
-
-	if ( ! empty( $tax_classes ) ) {
-		foreach ( $tax_classes as $class ) {
-			$classes_options[ sanitize_title( $class ) ] = $class;
-		}
-	}
-
-	// Older orders won't have line taxes so we need to handle them differently :(
-	$tax_data = '';
-	if ( $line_items ) {
-		$check_item = current( $line_items );
-		$tax_data   = maybe_unserialize( isset( $check_item['line_tax_data'] ) ? $check_item['line_tax_data'] : '' );
-	} elseif ( $line_items_shipping ) {
-		$check_item = current( $line_items_shipping );
-		$tax_data = maybe_unserialize( isset( $check_item['taxes'] ) ? $check_item['taxes'] : '' );
-	} elseif ( $line_items_fee ) {
-		$check_item = current( $line_items_fee );
-		$tax_data   = maybe_unserialize( isset( $check_item['line_tax_data'] ) ? $check_item['line_tax_data'] : '' );
-	}
-
-	$legacy_order     = ! empty( $order_taxes ) && empty( $tax_data ) && ! is_array( $tax_data );
-	$show_tax_columns = ! $legacy_order || sizeof( $order_taxes ) === 1;
+	$order_taxes      = $order->get_taxes();
+	$tax_classes      = WC_Tax::get_tax_classes();
+	$classes_options  = wc_get_product_tax_class_options();
+	$show_tax_columns = sizeof( $order_taxes ) === 1;
 }
 ?>
 <div class="woocommerce_order_items_wrapper wc-order-items-editable">
 	<table cellpadding="0" cellspacing="0" class="woocommerce_order_items">
 		<thead>
 			<tr>
-				<th><input type="checkbox" class="check-column" /></th>
 				<th class="item sortable" colspan="2" data-sort="string-ins"><?php _e( 'Item', 'woocommerce' ); ?></th>
-
 				<?php do_action( 'woocommerce_admin_order_item_headers', $order ); ?>
-
 				<th class="item_cost sortable" data-sort="float"><?php _e( 'Cost', 'woocommerce' ); ?></th>
 				<th class="quantity sortable" data-sort="int"><?php _e( 'Qty', 'woocommerce' ); ?></th>
 				<th class="line_cost sortable" data-sort="float"><?php _e( 'Total', 'woocommerce' ); ?></th>
-
 				<?php
-					if ( empty( $legacy_order ) && ! empty( $order_taxes ) ) :
+					if ( ! empty( $order_taxes ) ) :
 						foreach ( $order_taxes as $tax_id => $tax_item ) :
 							$tax_class      = wc_get_tax_class_by_tax_id( $tax_item['rate_id'] );
 							$tax_class_name = isset( $classes_options[ $tax_class ] ) ? $classes_options[ $tax_class ] : __( 'Tax', 'woocommerce' );
 							$column_label   = ! empty( $tax_item['label'] ) ? $tax_item['label'] : __( 'Tax', 'woocommerce' );
+							$column_tip     = sprintf( esc_html__( '%1$s (%2$s)', 'woocommerce' ), $tax_item['name'], $tax_class_name );
 							?>
-								<th class="line_tax tips" data-tip="<?php
-										echo esc_attr( $tax_item['name'] . ' (' . $tax_class_name . ')' );
-									?>">
-									<?php echo esc_attr( $column_label ); ?>
-									<input type="hidden" class="order-tax-id" name="order_taxes[<?php echo $tax_id; ?>]" value="<?php echo esc_attr( $tax_item['rate_id'] ); ?>">
-									<a class="delete-order-tax" href="#" data-rate_id="<?php echo $tax_id; ?>"></a>
-								</th>
+							<th class="line_tax tips" data-tip="<?php echo esc_attr( $column_tip ); ?>">
+								<?php echo esc_attr( $column_label ); ?>
+								<input type="hidden" class="order-tax-id" name="order_taxes[<?php echo $tax_id; ?>]" value="<?php echo esc_attr( $tax_item['rate_id'] ); ?>">
+								<a class="delete-order-tax" href="#" data-rate_id="<?php echo $tax_id; ?>"></a>
+							</th>
 							<?php
 						endforeach;
 					endif;
@@ -80,14 +53,13 @@ if ( wc_tax_enabled() ) {
 		<tbody id="order_line_items">
 		<?php
 			foreach ( $line_items as $item_id => $item ) {
-				$_product  = $order->get_product_from_item( $item );
-				$item_meta = $order->get_item_meta( $item_id );
+				do_action( 'woocommerce_before_order_item_' . $item->get_type() . '_html', $item_id, $item, $order );
 
 				include( 'html-order-item.php' );
 
-				do_action( 'woocommerce_order_item_' . $item['type'] . '_html', $item_id, $item, $order );
+				do_action( 'woocommerce_order_item_' . $item->get_type() . '_html', $item_id, $item, $order );
 			}
-			do_action( 'woocommerce_admin_order_items_after_line_items', $order->id );
+			do_action( 'woocommerce_admin_order_items_after_line_items', $order->get_id() );
 		?>
 		</tbody>
 		<tbody id="order_shipping_line_items">
@@ -96,7 +68,7 @@ if ( wc_tax_enabled() ) {
 			foreach ( $line_items_shipping as $item_id => $item ) {
 				include( 'html-order-shipping.php' );
 			}
-			do_action( 'woocommerce_admin_order_items_after_shipping', $order->id );
+			do_action( 'woocommerce_admin_order_items_after_shipping', $order->get_id() );
 		?>
 		</tbody>
 		<tbody id="order_fee_line_items">
@@ -104,7 +76,7 @@ if ( wc_tax_enabled() ) {
 			foreach ( $line_items_fee as $item_id => $item ) {
 				include( 'html-order-fee.php' );
 			}
-			do_action( 'woocommerce_admin_order_items_after_fees', $order->id );
+			do_action( 'woocommerce_admin_order_items_after_fees', $order->get_id() );
 		?>
 		</tbody>
 		<tbody id="order_refunds">
@@ -113,12 +85,18 @@ if ( wc_tax_enabled() ) {
 				foreach ( $refunds as $refund ) {
 					include( 'html-order-refund.php' );
 				}
-				do_action( 'woocommerce_admin_order_items_after_refunds', $order->id );
+				do_action( 'woocommerce_admin_order_items_after_refunds', $order->get_id() );
 			}
 		?>
 		</tbody>
 	</table>
 </div>
+<div class="wc-order-data-row wc-order-item-bulk-edit" style="display:none;">
+	<button type="button" class="button bulk-delete-items"><?php _e( 'Delete selected row(s)', 'woocommerce' ); ?></button>
+	<button type="button" class="button bulk-decrease-stock"><?php _e( 'Reduce stock', 'woocommerce' ); ?></button>
+	<button type="button" class="button bulk-increase-stock"><?php _e( 'Increase stock', 'woocommerce' ); ?></button>
+	<?php do_action( 'woocommerce_admin_order_item_bulk_actions', $order ); ?>
+</div>
 <div class="wc-order-data-row wc-order-totals-items wc-order-items-editable">
 	<?php
 		$coupons = $order->get_items( array( 'coupon' ) );
@@ -126,13 +104,12 @@ if ( wc_tax_enabled() ) {
 			?>
 			<div class="wc-used-coupons">
 				<ul class="wc_coupon_list"><?php
-					echo '<li><strong>' . __( 'Coupon(s) Used', 'woocommerce' ) . '</strong></li>';
+					echo '<li><strong>' . __( 'Coupon(s)', 'woocommerce' ) . '</strong></li>';
 					foreach ( $coupons as $item_id => $item ) {
-						$post_id = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_title = %s AND post_type = 'shop_coupon' AND post_status = 'publish' LIMIT 1;", $item['name'] ) );
+						$post_id = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_title = %s AND post_type = 'shop_coupon' AND post_status = 'publish' LIMIT 1;", $item->get_code() ) );
+						$link    = $post_id ? add_query_arg( array( 'post' => $post_id, 'action' => 'edit' ), admin_url( 'post.php' ) ) : add_query_arg( array( 's' => $item->get_code(), 'post_status' => 'all', 'post_type' => 'shop_coupon' ), admin_url( 'edit.php' ) );
 
-						$link = $post_id ? add_query_arg( array( 'post' => $post_id, 'action' => 'edit' ), admin_url( 'post.php' ) ) : add_query_arg( array( 's' => $item['name'], 'post_status' => 'all', 'post_type' => 'shop_coupon' ), admin_url( 'edit.php' ) );
-
-						echo '<li class="code"><a href="' . esc_url( $link ) . '" class="tips" data-tip="' . esc_attr( wc_price( $item['discount_amount'], array( 'currency' => $order->get_order_currency() ) ) ) . '"><span>' . esc_html( $item['name'] ). '</span></a></li>';
+						echo '<li class="code"><a href="' . esc_url( $link ) . '" class="tips" data-tip="' . esc_attr( wc_price( $item->get_discount(), array( 'currency' => $order->get_currency() ) ) ) . '"><span>' . esc_html( $item->get_code() ) . '</span></a></li>';
 					}
 				?></ul>
 			</div>
@@ -141,105 +118,79 @@ if ( wc_tax_enabled() ) {
 	?>
 	<table class="wc-order-totals">
 		<tr>
-			<td class="label"><?php echo wc_help_tip( __( 'This is the total discount. Discounts are defined per line item.', 'woocommerce' ) ); ?> <?php _e( 'Discount', 'woocommerce' ); ?>:</td>
-			<td class="total">
-				<?php echo wc_price( $order->get_total_discount(), array( 'currency' => $order->get_order_currency() ) ); ?>
-			</td>
+			<td class="label"><?php echo wc_help_tip( __( 'This is the total discount. Discounts are defined per line item.', 'woocommerce' ) ); ?> <?php _e( 'Discount:', 'woocommerce' ); ?></td>
 			<td width="1%"></td>
+			<td class="total">
+				<?php echo wc_price( $order->get_total_discount(), array( 'currency' => $order->get_currency() ) ); ?>
+			</td>
 		</tr>
 
-		<?php do_action( 'woocommerce_admin_order_totals_after_discount', $order->id ); ?>
+		<?php do_action( 'woocommerce_admin_order_totals_after_discount', $order->get_id() ); ?>
 
 		<tr>
-			<td class="label"><?php echo wc_help_tip( __( 'This is the shipping and handling total costs for the order.', 'woocommerce' ) ); ?> <?php _e( 'Shipping', 'woocommerce' ); ?>:</td>
+			<td class="label"><?php echo wc_help_tip( __( 'This is the shipping and handling total costs for the order.', 'woocommerce' ) ); ?> <?php _e( 'Shipping:', 'woocommerce' ); ?></td>
+			<td width="1%"></td>
 			<td class="total"><?php
 				if ( ( $refunded = $order->get_total_shipping_refunded() ) > 0 ) {
-					echo '<del>' . strip_tags( wc_price( $order->get_total_shipping(), array( 'currency' => $order->get_order_currency() ) ) ) . '</del> <ins>' . wc_price( $order->get_total_shipping() - $refunded, array( 'currency' => $order->get_order_currency() ) ) . '</ins>';
+					echo '<del>' . strip_tags( wc_price( $order->get_shipping_total(), array( 'currency' => $order->get_currency() ) ) ) . '</del> <ins>' . wc_price( $order->get_shipping_total() - $refunded, array( 'currency' => $order->get_currency() ) ) . '</ins>';
 				} else {
-					echo wc_price( $order->get_total_shipping(), array( 'currency' => $order->get_order_currency() ) );
+					echo wc_price( $order->get_shipping_total(), array( 'currency' => $order->get_currency() ) );
 				}
-
-
 			?></td>
-			<td width="1%"></td>
 		</tr>
 
-		<?php do_action( 'woocommerce_admin_order_totals_after_shipping', $order->id ); ?>
+		<?php do_action( 'woocommerce_admin_order_totals_after_shipping', $order->get_id() ); ?>
 
 		<?php if ( wc_tax_enabled() ) : ?>
 			<?php foreach ( $order->get_tax_totals() as $code => $tax ) : ?>
 				<tr>
 					<td class="label"><?php echo $tax->label; ?>:</td>
+					<td width="1%"></td>
 					<td class="total"><?php
 						if ( ( $refunded = $order->get_total_tax_refunded_by_rate_id( $tax->rate_id ) ) > 0 ) {
-							echo '<del>' . strip_tags( $tax->formatted_amount ) . '</del> <ins>' . wc_price( $tax->amount - $refunded, array( 'currency' => $order->get_order_currency() ) ) . '</ins>';
+							echo '<del>' . strip_tags( $tax->formatted_amount ) . '</del> <ins>' . wc_price( WC_Tax::round( $tax->amount, wc_get_price_decimals() ) - WC_Tax::round( $refunded, wc_get_price_decimals() ), array( 'currency' => $order->get_currency() ) ) . '</ins>';
 						} else {
 							echo $tax->formatted_amount;
 						}
 					?></td>
-					<td width="1%"></td>
 				</tr>
 			<?php endforeach; ?>
 		<?php endif; ?>
 
-		<?php do_action( 'woocommerce_admin_order_totals_after_tax', $order->id ); ?>
+		<?php do_action( 'woocommerce_admin_order_totals_after_tax', $order->get_id() ); ?>
 
 		<tr>
-			<td class="label"><?php _e( 'Order Total', 'woocommerce' ); ?>:</td>
-			<td class="total">
-				<div class="view"><?php echo $order->get_formatted_order_total(); ?></div>
-				<div class="edit" style="display: none;">
-					<input type="text" class="wc_input_price" id="_order_total" name="_order_total" placeholder="<?php echo wc_format_localized_price( 0 ); ?>" value="<?php echo ( isset( $data['_order_total'][0] ) ) ? esc_attr( wc_format_localized_price( $data['_order_total'][0] ) ) : ''; ?>" />
-					<div class="clear"></div>
-				</div>
-			</td>
-			<td>
-				<?php if ( $order->is_editable() ) : ?>
-					<div class="wc-order-edit-line-item-actions">
-						<a class="edit-order-item" href="#"></a>
-					</div>
-				<?php endif; ?>
-			</td>
-		</tr>
-
-		<?php do_action( 'woocommerce_admin_order_totals_after_total', $order->id ); ?>
-
-		<tr>
-			<td class="label refunded-total"><?php _e( 'Refunded', 'woocommerce' ); ?>:</td>
-			<td class="total refunded-total">-<?php echo wc_price( $order->get_total_refunded(), array( 'currency' => $order->get_order_currency() ) ); ?></td>
+			<td class="label"><?php _e( 'Order total', 'woocommerce' ); ?>:</td>
 			<td width="1%"></td>
+			<td class="total">
+				<?php echo $order->get_formatted_order_total(); ?>
+			</td>
 		</tr>
 
-		<?php do_action( 'woocommerce_admin_order_totals_after_refunded', $order->id ); ?>
+		<?php do_action( 'woocommerce_admin_order_totals_after_total', $order->get_id() ); ?>
+
+		<?php if ( $order->get_total_refunded() ) : ?>
+			<tr>
+				<td class="label refunded-total"><?php _e( 'Refunded', 'woocommerce' ); ?>:</td>
+				<td width="1%"></td>
+				<td class="total refunded-total">-<?php echo wc_price( $order->get_total_refunded(), array( 'currency' => $order->get_currency() ) ); ?></td>
+			</tr>
+		<?php endif; ?>
+
+		<?php do_action( 'woocommerce_admin_order_totals_after_refunded', $order->get_id() ); ?>
 
 	</table>
 	<div class="clear"></div>
 </div>
-<div class="wc-order-data-row wc-order-bulk-actions">
-	<p class="bulk-actions">
-		<select>
-			<option value=""><?php _e( 'Actions', 'woocommerce' ); ?></option>
-			<?php if ( $order->is_editable() ) : ?>
-				<optgroup label="<?php esc_attr_e( 'Edit', 'woocommerce' ); ?>">
-					<option value="delete"><?php _e( 'Delete selected line item(s)', 'woocommerce' ); ?></option>
-				</optgroup>
-			<?php endif; ?>
-			<optgroup label="<?php esc_attr_e( 'Stock Actions', 'woocommerce' ); ?>">
-				<option value="reduce_stock"><?php _e( 'Reduce line item stock', 'woocommerce' ); ?></option>
-				<option value="increase_stock"><?php _e( 'Increase line item stock', 'woocommerce' ); ?></option>
-			</optgroup>
-		</select>
-
-		<button type="button" class="button do_bulk_action wc-reload" title="<?php esc_attr_e( 'Apply', 'woocommerce' ); ?>"><span><?php _e( 'Apply', 'woocommerce' ); ?></span></button>
-	</p>
+<div class="wc-order-data-row wc-order-bulk-actions wc-order-data-row-toggle">
 	<p class="add-items">
 		<?php if ( $order->is_editable() ) : ?>
-			<button type="button" class="button add-line-item"><?php _e( 'Add line item(s)', 'woocommerce' ); ?></button>
+			<button type="button" class="button add-line-item"><?php _e( 'Add item(s)', 'woocommerce' ); ?></button>
 		<?php else : ?>
-			<span class="description tips" data-tip="<?php esc_attr_e( 'To edit this order change the status back to "Pending"', 'woocommerce' ); ?>"><?php _e( 'This order has been paid for and is no longer editable', 'woocommerce' ); ?></span>
+			<span class="description"><?php echo wc_help_tip( __( 'To edit this order change the status back to "Pending"', 'woocommerce' ) ); ?> <?php _e( 'This order is no longer editable.', 'woocommerce' ); ?></span>
 		<?php endif; ?>
 		<?php if ( wc_tax_enabled() && $order->is_editable() ) : ?>
-			<button type="button" class="button add-order-tax"><?php _e( 'Add Tax', 'woocommerce' ); ?></button>
+			<button type="button" class="button add-order-tax"><?php _e( 'Add tax', 'woocommerce' ); ?></button>
 		<?php endif; ?>
 		<?php if ( 0 < $order->get_total() - $order->get_total_refunded() || 0 < absint( $order->get_item_count() - $order->get_item_count_refunded() ) ) : ?>
 			<button type="button" class="button refund-items"><?php _e( 'Refund', 'woocommerce' ); ?></button>
@@ -249,24 +200,23 @@ if ( wc_tax_enabled() ) {
 			do_action( 'woocommerce_order_item_add_action_buttons', $order );
 		?>
 		<?php if ( $order->is_editable() ) : ?>
-			<button type="button" class="button button-primary calculate-tax-action"><?php _e( 'Calculate Taxes', 'woocommerce' ); ?></button>
-			<button type="button" class="button button-primary calculate-action"><?php _e( 'Calculate Total', 'woocommerce' ); ?></button>
+			<button type="button" class="button button-primary calculate-action"><?php _e( 'Recalculate', 'woocommerce' ); ?></button>
 		<?php endif; ?>
 	</p>
 </div>
-<div class="wc-order-data-row wc-order-add-item" style="display:none;">
+<div class="wc-order-data-row wc-order-add-item wc-order-data-row-toggle" style="display:none;">
 	<button type="button" class="button add-order-item"><?php _e( 'Add product(s)', 'woocommerce' ); ?></button>
 	<button type="button" class="button add-order-fee"><?php _e( 'Add fee', 'woocommerce' ); ?></button>
 	<button type="button" class="button add-order-shipping"><?php _e( 'Add shipping cost', 'woocommerce' ); ?></button>
-	<button type="button" class="button cancel-action"><?php _e( 'Cancel', 'woocommerce' ); ?></button>
-	<button type="button" class="button button-primary save-action"><?php _e( 'Save', 'woocommerce' ); ?></button>
 	<?php
 		// allow adding custom buttons
 		do_action( 'woocommerce_order_item_add_line_buttons', $order );
 	?>
+	<button type="button" class="button cancel-action"><?php _e( 'Cancel', 'woocommerce' ); ?></button>
+	<button type="button" class="button button-primary save-action"><?php _e( 'Save', 'woocommerce' ); ?></button>
 </div>
 <?php if ( 0 < $order->get_total() - $order->get_total_refunded() || 0 < absint( $order->get_item_count() - $order->get_item_count_refunded() ) ) : ?>
-<div class="wc-order-data-row wc-order-refund-items" style="display: none;">
+<div class="wc-order-data-row wc-order-refund-items wc-order-data-row-toggle" style="display: none;">
 	<table class="wc-order-totals">
 		<tr style="display:none;">
 			<td class="label"><label for="restock_refunded_items"><?php _e( 'Restock refunded items', 'woocommerce' ); ?>:</label></td>
@@ -274,11 +224,11 @@ if ( wc_tax_enabled() ) {
 		</tr>
 		<tr>
 			<td class="label"><?php _e( 'Amount already refunded', 'woocommerce' ); ?>:</td>
-			<td class="total">-<?php echo wc_price( $order->get_total_refunded(), array( 'currency' => $order->get_order_currency() ) ); ?></td>
+			<td class="total">-<?php echo wc_price( $order->get_total_refunded(), array( 'currency' => $order->get_currency() ) ); ?></td>
 		</tr>
 		<tr>
 			<td class="label"><?php _e( 'Total available to refund', 'woocommerce' ); ?>:</td>
-			<td class="total"><?php echo wc_price( $order->get_total() - $order->get_total_refunded(), array( 'currency' => $order->get_order_currency() ) ); ?></td>
+			<td class="total"><?php echo wc_price( $order->get_total() - $order->get_total_refunded(), array( 'currency' => $order->get_currency() ) ); ?></td>
 		</tr>
 		<tr>
 			<td class="label"><label for="refund_amount"><?php _e( 'Refund amount', 'woocommerce' ); ?>:</label></td>
@@ -288,7 +238,7 @@ if ( wc_tax_enabled() ) {
 			</td>
 		</tr>
 		<tr>
-			<td class="label"><label for="refund_reason"><?php _e( 'Reason for refund (optional)', 'woocommerce' ); ?>:</label></td>
+			<td class="label"><label for="refund_reason"><?php echo wc_help_tip( __( 'Note: the refund reason will be visible by the customer.', 'woocommerce' ) ); ?> <?php _e( 'Reason for refund (optional):', 'woocommerce' ); ?></label></td>
 			<td class="total">
 				<input type="text" class="text" id="refund_reason" name="refund_reason" />
 				<div class="clear"></div>
@@ -298,12 +248,12 @@ if ( wc_tax_enabled() ) {
 	<div class="clear"></div>
 	<div class="refund-actions">
 		<?php
-		$refund_amount            = '<span class="wc-order-refund-amount">' . wc_price( 0, array( 'currency' => $order->get_order_currency() ) ) . '</span>';
+		$refund_amount            = '<span class="wc-order-refund-amount">' . wc_price( 0, array( 'currency' => $order->get_currency() ) ) . '</span>';
 		$gateway_supports_refunds = false !== $payment_gateway && $payment_gateway->supports( 'refunds' );
-		$gateway_name             = false !== $payment_gateway ? ( ! empty( $payment_gateway->method_title ) ? $payment_gateway->method_title : $payment_gateway->get_title() ) : __( 'Payment Gateway', 'woocommerce' );
+		$gateway_name             = false !== $payment_gateway ? ( ! empty( $payment_gateway->method_title ) ? $payment_gateway->method_title : $payment_gateway->get_title() ) : __( 'Payment gateway', 'woocommerce' );
 		?>
-		<button type="button" class="button <?php echo $gateway_supports_refunds ? 'button-primary do-api-refund' : 'tips disabled'; ?>" <?php echo $gateway_supports_refunds ? '' : 'data-tip="' . esc_attr__( 'The payment gateway used to place this order does not support automatic refunds.', 'woocommerce' ) . '"'; ?>><?php printf( _x( 'Refund %s via %s', 'Refund $amount', 'woocommerce' ), $refund_amount, $gateway_name ); ?></button>
-		<button type="button" class="button button-primary do-manual-refund tips" data-tip="<?php esc_attr_e( 'You will need to manually issue a refund through your payment gateway after using this.', 'woocommerce' ); ?>"><?php printf( _x( 'Refund %s manually', 'Refund $amount manually', 'woocommerce' ), $refund_amount ); ?></button>
+		<button type="button" class="button <?php echo $gateway_supports_refunds ? 'button-primary do-api-refund' : 'tips disabled'; ?>" <?php echo $gateway_supports_refunds ? '' : 'data-tip="' . esc_attr__( 'The payment gateway used to place this order does not support automatic refunds.', 'woocommerce' ) . '"'; ?>><?php printf( __( 'Refund %1$s via %2$s', 'woocommerce' ), $refund_amount, $gateway_name ); ?></button>
+		<button type="button" class="button button-primary do-manual-refund tips" data-tip="<?php esc_attr_e( 'You will need to manually issue a refund through your payment gateway after using this.', 'woocommerce' ); ?>"><?php printf( __( 'Refund %s manually', 'woocommerce' ), $refund_amount ); ?></button>
 		<button type="button" class="button cancel-action"><?php _e( 'Cancel', 'woocommerce' ); ?></button>
 		<div class="clear"></div>
 	</div>
@@ -322,7 +272,7 @@ if ( wc_tax_enabled() ) {
 				</header>
 				<article>
 					<form action="" method="post">
-						<input type="hidden" id="add_item_id" name="add_order_items" class="wc-product-search" style="width: 100%;" data-placeholder="<?php esc_attr_e( 'Search for a product&hellip;', 'woocommerce' ); ?>" data-multiple="true" />
+						<select class="wc-product-search" multiple="multiple" style="width: 50%;" id="add_item_id" name="add_order_items[]" data-placeholder="<?php esc_attr_e( 'Search for a product&hellip;', 'woocommerce' ); ?>"></select>
 					</form>
 				</article>
 				<footer>
diff --git a/includes/admin/meta-boxes/views/html-order-refund.php b/includes/admin/meta-boxes/views/html-order-refund.php
index 3611eb49926..21f5ec59c90 100644
--- a/includes/admin/meta-boxes/views/html-order-refund.php
+++ b/includes/admin/meta-boxes/views/html-order-refund.php
@@ -6,43 +6,42 @@ if ( ! defined( 'ABSPATH' ) ) {
 /**
  * @var object $refund The refund object.
  */
-$who_refunded = new WP_User( $refund->post->post_author );
+$who_refunded = new WP_User( $refund->get_refunded_by() );
 ?>
-<tr class="refund <?php echo ( ! empty( $class ) ) ? $class : ''; ?>" data-order_refund_id="<?php echo $refund->id; ?>">
-	<td class="check-column"></td>
-
+<tr class="refund <?php echo ( ! empty( $class ) ) ? $class : ''; ?>" data-order_refund_id="<?php echo $refund->get_id(); ?>">
 	<td class="thumb"><div></div></td>
 
 	<td class="name">
 		<?php
-			echo esc_attr__( 'Refund', 'woocommerce' ) . ' #' . absint( $refund->id ) . ' - ' . esc_attr( date_i18n( get_option( 'date_format' ) . ', ' . get_option( 'time_format' ), strtotime( $refund->post->post_date ) ) );
+			/* translators: 1: refund id 2: date */
+			printf( __( 'Refund #%1$s - %2$s', 'woocommerce' ), $refund->get_id(), wc_format_datetime( $refund->get_date_created(), get_option( 'date_format' ) . ', ' . get_option( 'time_format' ) ) );
 
 			if ( $who_refunded->exists() ) {
-				echo ' ' . esc_attr_x( 'by', 'Ex: Refund - $date >by< $username', 'woocommerce' ) . ' ' . '<abbr class="refund_by" title="' . esc_attr__( 'ID: ', 'woocommerce' ) . absint( $who_refunded->ID ) . '">' . esc_attr( $who_refunded->display_name ) . '</abbr>' ;
+				echo ' ' . esc_attr_x( 'by', 'Ex: Refund - $date >by< $username', 'woocommerce' ) . ' ' . '<abbr class="refund_by" title="' . sprintf( esc_attr__( 'ID: %d', 'woocommerce' ), absint( $who_refunded->ID ) ) . '">' . esc_attr( $who_refunded->display_name ) . '</abbr>' ;
 			}
 		?>
-		<?php if ( $refund->get_refund_reason() ) : ?>
-			<p class="description"><?php echo esc_html( $refund->get_refund_reason() ); ?></p>
+		<?php if ( $refund->get_reason() ) : ?>
+			<p class="description"><?php echo esc_html( $refund->get_reason() ); ?></p>
 		<?php endif; ?>
-		<input type="hidden" class="order_refund_id" name="order_refund_id[]" value="<?php echo esc_attr( $refund->id ); ?>" />
+		<input type="hidden" class="order_refund_id" name="order_refund_id[]" value="<?php echo esc_attr( $refund->get_id() ); ?>" />
 	</td>
 
-	<?php do_action( 'woocommerce_admin_order_item_values', null, $refund, absint( $refund->id ) ); ?>
+	<?php do_action( 'woocommerce_admin_order_item_values', null, $refund, $refund->get_id() ); ?>
 
 	<td class="item_cost" width="1%">&nbsp;</td>
 	<td class="quantity" width="1%">&nbsp;</td>
 
 	<td class="line_cost" width="1%">
 		<div class="view">
-			<?php echo wc_price( '-' . $refund->get_refund_amount() ); ?>
+			<?php echo wc_price( '-' . $refund->get_amount() ); ?>
 		</div>
 	</td>
 
-	<?php if ( ( ! isset( $legacy_order ) || ! $legacy_order ) && wc_tax_enabled() ) : for ( $i = 0;  $i < count( $order_taxes ); $i++ ) : ?>
-
-		<td class="line_tax" width="1%"></td>
-
-	<?php endfor; endif; ?>
+	<?php if ( wc_tax_enabled() ) : $total_taxes = count( $order_taxes ); ?>
+		<?php for ( $i = 0;  $i < $total_taxes; $i++ ) : ?>
+			<td class="line_tax" width="1%"></td>
+		<?php endfor; ?>
+	<?php endif; ?>
 
 	<td class="wc-order-edit-line-item">
 		<div class="wc-order-edit-line-item-actions">
diff --git a/includes/admin/meta-boxes/views/html-order-shipping.php b/includes/admin/meta-boxes/views/html-order-shipping.php
index 0f57fe2b6dd..e81d1848364 100644
--- a/includes/admin/meta-boxes/views/html-order-shipping.php
+++ b/includes/admin/meta-boxes/views/html-order-shipping.php
@@ -5,49 +5,49 @@
  * @var object $item The item being displayed
  * @var int $item_id The id of the item being displayed
  */
-
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 ?>
-<tr class="shipping <?php echo ( ! empty( $class ) ) ? $class : ''; ?>" data-order_item_id="<?php echo $item_id; ?>">
-	<td class="check-column"><input type="checkbox" /></td>
-
+<tr class="shipping <?php echo ( ! empty( $class ) ) ? $class : ''; ?>" data-order_item_id="<?php echo esc_attr( $item_id ); ?>">
 	<td class="thumb"><div></div></td>
 
 	<td class="name">
 		<div class="view">
-			<?php echo ! empty( $item['name'] ) ? wc_clean( $item['name'] ) : __( 'Shipping', 'woocommerce' ); ?>
+			<?php echo esc_html( $item->get_name() ? $item->get_name() : __( 'Shipping', 'woocommerce' ) ); ?>
 		</div>
 		<div class="edit" style="display: none;">
-			<input type="text" placeholder="<?php esc_attr_e( 'Shipping Name', 'woocommerce' ); ?>" name="shipping_method_title[<?php echo $item_id; ?>]" value="<?php echo ( isset( $item['name'] ) ) ? wc_clean( $item['name'] ) : ''; ?>" />
-			<select name="shipping_method[<?php echo $item_id; ?>]">
-				<optgroup label="<?php esc_attr_e( 'Shipping Method', 'woocommerce' ); ?>">
+			<input type="hidden" name="shipping_method_id[]" value="<?php echo esc_attr( $item_id ); ?>" />
+			<input type="text" class="shipping_method_name" placeholder="<?php esc_attr_e( 'Shipping name', 'woocommerce' ); ?>" name="shipping_method_title[<?php echo esc_attr( $item_id ); ?>]" value="<?php echo esc_attr( $item->get_name() ); ?>" />
+			<select class="shipping_method" name="shipping_method[<?php echo esc_attr( $item_id ); ?>]">
+				<optgroup label="<?php esc_attr_e( 'Shipping method', 'woocommerce' ); ?>">
 					<option value=""><?php _e( 'N/A', 'woocommerce' ); ?></option>
 					<?php
 						$found_method = false;
 
 						foreach ( $shipping_methods as $method ) {
-							$method_id = isset( $item['method_id'] ) ? $item['method_id'] : '';
-							$current_method = ( 0 === strpos( $method_id, $method->id ) ) ? $method_id : $method->id;
+							$current_method = ( 0 === strpos( $item->get_method_id(), $method->id ) ) ? $item->get_method_id() : $method->id;
 
-							echo '<option value="' . esc_attr( $current_method ) . '" ' . selected( $method_id == $current_method, true, false ) . '>' . esc_html( $method->get_title() ) . '</option>';
+							echo '<option value="' . esc_attr( $current_method ) . '" ' . selected( $item->get_method_id() === $current_method, true, false ) . '>' . esc_html( $method->get_method_title() ) . '</option>';
 
-							if ( $method_id == $current_method ) {
+							if ( $item->get_method_id() === $current_method ) {
 								$found_method = true;
 							}
 						}
 
-						if ( ! $found_method && ! empty( $method_id ) ) {
-							echo '<option value="' . esc_attr( $method_id ) . '" selected="selected">' . __( 'Other', 'woocommerce' ) . '</option>';
+						if ( ! $found_method && $item->get_method_id() ) {
+							echo '<option value="' . esc_attr( $item->get_method_id() ) . '" selected="selected">' . __( 'Other', 'woocommerce' ) . '</option>';
 						} else {
 							echo '<option value="other">' . __( 'Other', 'woocommerce' ) . '</option>';
 						}
 					?>
 				</optgroup>
 			</select>
-			<input type="hidden" name="shipping_method_id[]" value="<?php echo esc_attr( $item_id ); ?>" />
 		</div>
+
+		<?php do_action( 'woocommerce_before_order_itemmeta', $item_id, $item, null ) ?>
+		<?php include( 'html-order-item-meta.php' ); ?>
+		<?php do_action( 'woocommerce_after_order_itemmeta', $item_id, $item, null ) ?>
 	</td>
 
 	<?php do_action( 'woocommerce_admin_order_item_values', null, $item, absint( $item_id ) ); ?>
@@ -58,15 +58,15 @@ if ( ! defined( 'ABSPATH' ) ) {
 	<td class="line_cost" width="1%">
 		<div class="view">
 			<?php
-				echo ( isset( $item['cost'] ) ) ? wc_price( wc_round_tax_total( $item['cost'] ), array( 'currency' => $order->get_order_currency() ) ) : '';
+				echo wc_price( $item->get_total(), array( 'currency' => $order->get_currency() ) );
 
 				if ( $refunded = $order->get_total_refunded_for_item( $item_id, 'shipping' ) ) {
-					echo '<small class="refunded">-' . wc_price( $refunded, array( 'currency' => $order->get_order_currency() ) ) . '</small>';
+					echo '<small class="refunded">-' . wc_price( $refunded, array( 'currency' => $order->get_currency() ) ) . '</small>';
 				}
 			?>
 		</div>
 		<div class="edit" style="display: none;">
-			<input type="text" name="shipping_cost[<?php echo $item_id; ?>]" placeholder="<?php echo wc_format_localized_price( 0 ); ?>" value="<?php echo ( isset( $item['cost'] ) ) ? esc_attr( wc_format_localized_price( $item['cost'] ) ) : ''; ?>" class="line_total wc_input_price" />
+			<input type="text" name="shipping_cost[<?php echo esc_attr( $item_id ); ?>]" placeholder="<?php echo wc_format_localized_price( 0 ); ?>" value="<?php echo esc_attr( wc_format_localized_price( $item->get_total() ) ); ?>" class="line_total wc_input_price" />
 		</div>
 		<div class="refund" style="display: none;">
 			<input type="text" name="refund_line_total[<?php echo absint( $item_id ); ?>]" placeholder="<?php echo wc_format_localized_price( 0 ); ?>" class="refund_line_total wc_input_price" />
@@ -74,21 +74,18 @@ if ( ! defined( 'ABSPATH' ) ) {
 	</td>
 
 	<?php
-		if ( empty( $legacy_order ) && wc_tax_enabled() ) :
-			$shipping_taxes = isset( $item['taxes'] ) ? $item['taxes'] : '';
-			$tax_data       = maybe_unserialize( $shipping_taxes );
-
-			foreach ( $order_taxes as $tax_item ) :
-				$tax_item_id       = $tax_item['rate_id'];
-				$tax_item_total    = isset( $tax_data[ $tax_item_id ] ) ? $tax_data[ $tax_item_id ] : '';
+		if ( ( $tax_data = $item->get_taxes() ) && wc_tax_enabled() ) {
+			foreach ( $order_taxes as $tax_item ) {
+				$tax_item_id    = $tax_item->get_rate_id();
+				$tax_item_total = isset( $tax_data['total'][ $tax_item_id ] ) ? $tax_data['total'][ $tax_item_id ] : '';
 				?>
 					<td class="line_tax" width="1%">
 						<div class="view">
 							<?php
-								echo ( '' != $tax_item_total ) ? wc_price( wc_round_tax_total( $tax_item_total ), array( 'currency' => $order->get_order_currency() ) ) : '&ndash;';
+								echo ( '' !== $tax_item_total ) ? wc_price( wc_round_tax_total( $tax_item_total ), array( 'currency' => $order->get_currency() ) ) : '&ndash;';
 
 								if ( $refunded = $order->get_tax_refunded_for_item( $item_id, $tax_item_id, 'shipping' ) ) {
-									echo '<small class="refunded">-' . wc_price( $refunded, array( 'currency' => $order->get_order_currency() ) ) . '</small>';
+									echo '<small class="refunded">-' . wc_price( $refunded, array( 'currency' => $order->get_currency() ) ) . '</small>';
 								}
 							?>
 						</div>
@@ -99,12 +96,10 @@ if ( ! defined( 'ABSPATH' ) ) {
 							<input type="text" name="refund_line_tax[<?php echo absint( $item_id ); ?>][<?php echo esc_attr( $tax_item_id ); ?>]" placeholder="<?php echo wc_format_localized_price( 0 ); ?>" class="refund_line_tax wc_input_price" data-tax_id="<?php echo esc_attr( $tax_item_id ); ?>" />
 						</div>
 					</td>
-
 				<?php
-			endforeach;
-		endif;
+			}
+		}
 	?>
-
 	<td class="wc-order-edit-line-item">
 		<?php if ( $order->is_editable() ) : ?>
 			<div class="wc-order-edit-line-item-actions">
diff --git a/includes/admin/meta-boxes/views/html-product-attribute.php b/includes/admin/meta-boxes/views/html-product-attribute.php
index 23d54e621d5..9fc7d996de9 100644
--- a/includes/admin/meta-boxes/views/html-product-attribute.php
+++ b/includes/admin/meta-boxes/views/html-product-attribute.php
@@ -1,8 +1,8 @@
-<div data-taxonomy="<?php echo esc_attr( $taxonomy ); ?>" class="woocommerce_attribute wc-metabox closed <?php echo esc_attr( implode( ' ', $metabox_class ) ); ?>" rel="<?php echo $position; ?>">
+<div data-taxonomy="<?php echo esc_attr( $attribute->get_taxonomy() ); ?>" class="woocommerce_attribute wc-metabox closed <?php echo esc_attr( implode( ' ', $metabox_class ) ); ?>" rel="<?php echo esc_attr( $attribute->get_position() ); ?>">
 	<h3>
 		<a href="#" class="remove_row delete"><?php _e( 'Remove', 'woocommerce' ); ?></a>
 		<div class="handlediv" title="<?php esc_attr_e( 'Click to toggle', 'woocommerce' ); ?>"></div>
-		<strong class="attribute_name"><?php echo esc_html( $attribute_label ); ?></strong>
+		<strong class="attribute_name"><?php echo esc_html( wc_attribute_label( $attribute->get_name() ) ); ?></strong>
 	</h3>
 	<div class="woocommerce_attribute_data wc-metabox-content">
 		<table cellpadding="0" cellspacing="0">
@@ -11,28 +11,33 @@
 					<td class="attribute_name">
 						<label><?php _e( 'Name', 'woocommerce' ); ?>:</label>
 
-						<?php if ( $attribute['is_taxonomy'] ) : ?>
-							<strong><?php echo esc_html( $attribute_label ); ?></strong>
-							<input type="hidden" name="attribute_names[<?php echo $i; ?>]" value="<?php echo esc_attr( $taxonomy ); ?>" />
+						<?php if ( $attribute->is_taxonomy() ) : ?>
+							<strong><?php echo esc_html( wc_attribute_label( $attribute->get_name() ) ); ?></strong>
+							<input type="hidden" name="attribute_names[<?php echo $i; ?>]" value="<?php echo esc_attr( $attribute->get_name() ); ?>" />
 						<?php else : ?>
-							<input type="text" class="attribute_name" name="attribute_names[<?php echo $i; ?>]" value="<?php echo esc_attr( $attribute['name'] ); ?>" />
+							<input type="text" class="attribute_name" name="attribute_names[<?php echo $i; ?>]" value="<?php echo esc_attr( $attribute->get_name() ); ?>" />
 						<?php endif; ?>
 
-						<input type="hidden" name="attribute_position[<?php echo $i; ?>]" class="attribute_position" value="<?php echo esc_attr( $position ); ?>" />
-						<input type="hidden" name="attribute_is_taxonomy[<?php echo $i; ?>]" value="<?php echo $attribute['is_taxonomy'] ? 1 : 0; ?>" />
+						<input type="hidden" name="attribute_position[<?php echo $i; ?>]" class="attribute_position" value="<?php echo esc_attr( $attribute->get_position() ); ?>" />
 					</td>
 					<td rowspan="3">
 						<label><?php _e( 'Value(s)', 'woocommerce' ); ?>:</label>
 
-						<?php if ( $attribute['is_taxonomy'] ) : ?>
+						<?php if ( $attribute->is_taxonomy() && ( $attribute_taxonomy = $attribute->get_taxonomy_object() ) ) : ?>
 							<?php if ( 'select' === $attribute_taxonomy->attribute_type ) : ?>
 
 								<select multiple="multiple" data-placeholder="<?php esc_attr_e( 'Select terms', 'woocommerce' ); ?>" class="multiselect attribute_values wc-enhanced-select" name="attribute_values[<?php echo $i; ?>][]">
 									<?php
-									$all_terms = get_terms( $taxonomy, 'orderby=name&hide_empty=0' );
+									$args = array(
+										'orderby'    => 'name',
+										'hide_empty' => 0,
+									);
+									$all_terms = get_terms( $attribute->get_taxonomy(), apply_filters( 'woocommerce_product_attribute_terms', $args ) );
 									if ( $all_terms ) {
 										foreach ( $all_terms as $term ) {
-											echo '<option value="' . esc_attr( $term->slug ) . '" ' . selected( has_term( absint( $term->term_id ), $taxonomy, $thepostid ), true, false ) . '>' . $term->name . '</option>';
+											$options = $attribute->get_options();
+											$options = ! empty( $options ) ? $options : array();
+											echo '<option value="' . esc_attr( $term->term_id ) . '" ' . selected( in_array( $term->term_id, $options ), true, false ) . '>' . esc_attr( apply_filters( 'woocommerce_product_attribute_term_name', $term->name, $term ) ) . '</option>';
 										}
 									}
 									?>
@@ -46,9 +51,14 @@
 								<input type="text" name="attribute_values[<?php echo $i; ?>]" value="<?php
 
 									// Text attributes should list terms pipe separated
-									echo esc_attr( implode( ' ' . WC_DELIMITER . ' ', wp_get_post_terms( $thepostid, $taxonomy, array( 'fields' => 'names' ) ) ) );
+									echo esc_attr( wc_implode_text_attributes( wp_list_pluck( $attribute->get_terms(), 'name' ) ) );
 
-								?>" placeholder="<?php echo esc_attr( sprintf( __( '"%s" separate terms', 'woocommerce' ), WC_DELIMITER ) ); ?>" />
+								?>" placeholder="<?php
+
+									/* translators: %s: WC_DELIMITER */
+									printf( esc_attr__( '"%s" separate terms', 'woocommerce' ), WC_DELIMITER );
+
+								?>" />
 
 							<?php endif; ?>
 
@@ -56,24 +66,25 @@
 
 						<?php else : ?>
 
-							<textarea name="attribute_values[<?php echo $i; ?>]" cols="5" rows="5" placeholder="<?php echo esc_attr( sprintf( __( 'Enter some text, or some attributes by "%s" separating values.', 'woocommerce' ), WC_DELIMITER ) ); ?>"><?php echo esc_textarea( $attribute['value'] ); ?></textarea>
+							<textarea name="attribute_values[<?php echo $i; ?>]" cols="5" rows="5" placeholder="<?php printf( esc_attr__( 'Enter some text, or some attributes by "%s" separating values.', 'woocommerce' ), WC_DELIMITER ); ?>"><?php echo esc_textarea( wc_implode_text_attributes( $attribute->get_options() ) ); ?></textarea>
 
 						<?php endif; ?>
 					</td>
 				</tr>
 				<tr>
 					<td>
-						<label><input type="checkbox" class="checkbox" <?php checked( $attribute['is_visible'], 1 ); ?> name="attribute_visibility[<?php echo $i; ?>]" value="1" /> <?php _e( 'Visible on the product page', 'woocommerce' ); ?></label>
+						<label><input type="checkbox" class="checkbox" <?php checked( $attribute->get_visible(), true ); ?> name="attribute_visibility[<?php echo $i; ?>]" value="1" /> <?php _e( 'Visible on the product page', 'woocommerce' ); ?></label>
 					</td>
 				</tr>
 				<tr>
 					<td>
 						<div class="enable_variation show_if_variable">
-							<label><input type="checkbox" class="checkbox" <?php checked( $attribute['is_variation'], 1 ); ?> name="attribute_variation[<?php echo $i; ?>]" value="1" /> <?php _e( 'Used for variations', 'woocommerce' ); ?></label>
+							<label><input type="checkbox" class="checkbox" <?php checked( $attribute->get_variation(), true ); ?> name="attribute_variation[<?php echo $i; ?>]" value="1" /> <?php _e( 'Used for variations', 'woocommerce' ); ?></label>
 						</div>
 					</td>
 				</tr>
+				<?php do_action( 'woocommerce_after_product_attribute_settings', $attribute, $i ); ?>
 			</tbody>
 		</table>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/includes/admin/meta-boxes/views/html-product-data-advanced.php b/includes/admin/meta-boxes/views/html-product-data-advanced.php
new file mode 100644
index 00000000000..b63eaef6e3e
--- /dev/null
+++ b/includes/admin/meta-boxes/views/html-product-data-advanced.php
@@ -0,0 +1,44 @@
+<div id="advanced_product_data" class="panel woocommerce_options_panel hidden">
+
+	<div class="options_group hide_if_external">
+		<?php
+			woocommerce_wp_textarea_input( array(
+				'id'          => '_purchase_note',
+				'value'       => $product_object->get_purchase_note( 'edit' ),
+				'label'       => __( 'Purchase note', 'woocommerce' ),
+				'desc_tip'    => true,
+				'description' => __( 'Enter an optional note to send the customer after purchase.', 'woocommerce' ),
+			) );
+		?>
+	</div>
+
+	<div class="options_group">
+		<?php
+			woocommerce_wp_text_input( array(
+				'id'                => 'menu_order',
+				'value'             => $product_object->get_menu_order( 'edit' ),
+				'label'             => __( 'Menu order', 'woocommerce' ),
+				'desc_tip'          => true,
+				'description'       => __( 'Custom ordering position.', 'woocommerce' ),
+				'type'              => 'number',
+				'custom_attributes' => array(
+					'step' 	=> '1',
+				),
+			) );
+		?>
+	</div>
+
+	<div class="options_group reviews">
+		<?php
+			woocommerce_wp_checkbox( array(
+				'id'      => '_reviews_allowed',
+				'value'   => $product_object->get_reviews_allowed( 'edit' ) ? 'open' : 'closed',
+				'label'   => __( 'Enable reviews', 'woocommerce' ),
+				'cbvalue' => 'open',
+			) );
+			do_action( 'woocommerce_product_options_reviews' );
+		?>
+	</div>
+
+	<?php do_action( 'woocommerce_product_options_advanced' ); ?>
+</div>
diff --git a/includes/admin/meta-boxes/views/html-product-data-attributes.php b/includes/admin/meta-boxes/views/html-product-data-attributes.php
new file mode 100644
index 00000000000..dae1a3761d6
--- /dev/null
+++ b/includes/admin/meta-boxes/views/html-product-data-attributes.php
@@ -0,0 +1,51 @@
+<div id="product_attributes" class="panel wc-metaboxes-wrapper hidden">
+	<div class="toolbar toolbar-top">
+		<span class="expand-close">
+			<a href="#" class="expand_all"><?php _e( 'Expand', 'woocommerce' ); ?></a> / <a href="#" class="close_all"><?php _e( 'Close', 'woocommerce' ); ?></a>
+		</span>
+		<select name="attribute_taxonomy" class="attribute_taxonomy">
+			<option value=""><?php _e( 'Custom product attribute', 'woocommerce' ); ?></option>
+			<?php
+				global $wc_product_attributes;
+
+				// Array of defined attribute taxonomies
+				$attribute_taxonomies = wc_get_attribute_taxonomies();
+
+				if ( ! empty( $attribute_taxonomies ) ) {
+					foreach ( $attribute_taxonomies as $tax ) {
+						$attribute_taxonomy_name = wc_attribute_taxonomy_name( $tax->attribute_name );
+						$label = $tax->attribute_label ? $tax->attribute_label : $tax->attribute_name;
+						echo '<option value="' . esc_attr( $attribute_taxonomy_name ) . '">' . esc_html( $label ) . '</option>';
+					}
+				}
+			?>
+		</select>
+		<button type="button" class="button add_attribute"><?php _e( 'Add', 'woocommerce' ); ?></button>
+	</div>
+	<div class="product_attributes wc-metaboxes">
+		<?php
+			// Product attributes - taxonomies and custom, ordered, with visibility and variation attributes set
+			$attributes = $product_object->get_attributes( 'edit' );
+			$i          = -1;
+
+			foreach ( $attributes as $attribute ) {
+				$i++;
+				$metabox_class = array();
+
+				if ( $attribute->is_taxonomy() ) {
+					$metabox_class[] = 'taxonomy';
+					$metabox_class[] = $attribute->get_name();
+				}
+
+				include( 'html-product-attribute.php' );
+			}
+		?>
+	</div>
+	<div class="toolbar">
+		<span class="expand-close">
+			<a href="#" class="expand_all"><?php _e( 'Expand', 'woocommerce' ); ?></a> / <a href="#" class="close_all"><?php _e( 'Close', 'woocommerce' ); ?></a>
+		</span>
+		<button type="button" class="button save_attributes button-primary"><?php _e( 'Save attributes', 'woocommerce' ); ?></button>
+	</div>
+	<?php do_action( 'woocommerce_product_options_attributes' ); ?>
+</div>
diff --git a/includes/admin/meta-boxes/views/html-product-data-general.php b/includes/admin/meta-boxes/views/html-product-data-general.php
new file mode 100644
index 00000000000..fb76c78856f
--- /dev/null
+++ b/includes/admin/meta-boxes/views/html-product-data-general.php
@@ -0,0 +1,155 @@
+<div id="general_product_data" class="panel woocommerce_options_panel">
+
+	<div class="options_group show_if_external">
+		<?php
+			woocommerce_wp_text_input( array(
+				'id'          => '_product_url',
+				'value'       => is_callable( array( $product_object, 'get_product_url' ) ) ? $product_object->get_product_url( 'edit' ) : '',
+				'label'       => __( 'Product URL', 'woocommerce' ),
+				'placeholder' => 'http://',
+				'description' => __( 'Enter the external URL to the product.', 'woocommerce' ),
+			) );
+
+			woocommerce_wp_text_input( array(
+				'id'          => '_button_text',
+				'value'       => is_callable( array( $product_object, 'get_button_text' ) ) ? $product_object->get_button_text( 'edit' ) : '',
+				'label'       => __( 'Button text', 'woocommerce' ),
+				'placeholder' => _x( 'Buy product', 'placeholder', 'woocommerce' ),
+				'description' => __( 'This text will be shown on the button linking to the external product.', 'woocommerce' ),
+			) );
+		?>
+	</div>
+
+	<div class="options_group pricing show_if_simple show_if_external hidden">
+		<?php
+			woocommerce_wp_text_input( array(
+				'id'        => '_regular_price',
+				'value'     => $product_object->get_regular_price( 'edit' ),
+				'label'     => __( 'Regular price', 'woocommerce' ) . ' (' . get_woocommerce_currency_symbol() . ')',
+				'data_type' => 'price',
+			) );
+
+			woocommerce_wp_text_input( array(
+				'id'          => '_sale_price',
+				'value'       => $product_object->get_sale_price( 'edit' ),
+				'data_type'   => 'price',
+				'label'       => __( 'Sale price', 'woocommerce' ) . ' (' . get_woocommerce_currency_symbol() . ')',
+				'description' => '<a href="#" class="sale_schedule">' . __( 'Schedule', 'woocommerce' ) . '</a>',
+			) );
+
+			$sale_price_dates_from = $product_object->get_date_on_sale_from( 'edit' ) && ( $date = $product_object->get_date_on_sale_from( 'edit' )->getOffsetTimestamp() ) ? date_i18n( 'Y-m-d', $date ) : '';
+			$sale_price_dates_to   = $product_object->get_date_on_sale_to( 'edit' ) && ( $date = $product_object->get_date_on_sale_to( 'edit' )->getOffsetTimestamp() ) ? date_i18n( 'Y-m-d', $date ) : '';
+
+			echo '<p class="form-field sale_price_dates_fields">
+					<label for="_sale_price_dates_from">' . __( 'Sale price dates', 'woocommerce' ) . '</label>
+					<input type="text" class="short" name="_sale_price_dates_from" id="_sale_price_dates_from" value="' . esc_attr( $sale_price_dates_from ) . '" placeholder="' . _x( 'From&hellip;', 'placeholder', 'woocommerce' ) . ' YYYY-MM-DD" maxlength="10" pattern="' . esc_attr( apply_filters( 'woocommerce_date_input_html_pattern', '[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|1[0-9]|2[0-9]|3[01])' ) ) . '" />
+					<input type="text" class="short" name="_sale_price_dates_to" id="_sale_price_dates_to" value="' . esc_attr( $sale_price_dates_to ) . '" placeholder="' . _x( 'To&hellip;', 'placeholder', 'woocommerce' ) . '  YYYY-MM-DD" maxlength="10" pattern="' . esc_attr( apply_filters( 'woocommerce_date_input_html_pattern', '[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|1[0-9]|2[0-9]|3[01])' ) ) . '" />
+					<a href="#" class="description cancel_sale_schedule">' . __( 'Cancel', 'woocommerce' ) . '</a>' . wc_help_tip( __( 'The sale will end at the beginning of the set date.', 'woocommerce' ) ) . '
+				</p>';
+
+			do_action( 'woocommerce_product_options_pricing' );
+		?>
+	</div>
+
+	<div class="options_group show_if_downloadable hidden">
+		<div class="form-field downloadable_files">
+			<label><?php _e( 'Downloadable files', 'woocommerce' ); ?></label>
+			<table class="widefat">
+				<thead>
+					<tr>
+						<th class="sort">&nbsp;</th>
+						<th><?php _e( 'Name', 'woocommerce' ); ?> <?php echo wc_help_tip( __( 'This is the name of the download shown to the customer.', 'woocommerce' ) ); ?></th>
+						<th colspan="2"><?php _e( 'File URL', 'woocommerce' ); ?> <?php echo wc_help_tip( __( 'This is the URL or absolute path to the file which customers will get access to. URLs entered here should already be encoded.', 'woocommerce' ) ); ?></th>
+						<th>&nbsp;</th>
+					</tr>
+				</thead>
+				<tbody>
+					<?php
+					if ( $downloadable_files = $product_object->get_downloads( 'edit' ) ) {
+						foreach ( $downloadable_files as $key => $file ) {
+							include( 'html-product-download.php' );
+						}
+					}
+					?>
+				</tbody>
+				<tfoot>
+					<tr>
+						<th colspan="5">
+							<a href="#" class="button insert" data-row="<?php
+								$key  = '';
+								$file = array(
+									'file' => '',
+									'name' => '',
+								);
+								ob_start();
+								include( 'html-product-download.php' );
+								echo esc_attr( ob_get_clean() );
+							?>"><?php _e( 'Add File', 'woocommerce' ); ?></a>
+						</th>
+					</tr>
+				</tfoot>
+			</table>
+		</div>
+		<?php
+			woocommerce_wp_text_input( array(
+				'id'                => '_download_limit',
+				'value'             => -1 === $product_object->get_download_limit( 'edit' ) ? '' : $product_object->get_download_limit( 'edit' ),
+				'label'             => __( 'Download limit', 'woocommerce' ),
+				'placeholder'       => __( 'Unlimited', 'woocommerce' ),
+				'description'       => __( 'Leave blank for unlimited re-downloads.', 'woocommerce' ),
+				'type'              => 'number',
+				'custom_attributes' => array(
+					'step' 	=> '1',
+					'min'	=> '0',
+				),
+			) );
+
+			woocommerce_wp_text_input( array(
+				'id'                => '_download_expiry',
+				'value'             => -1 === $product_object->get_download_expiry( 'edit' ) ? '' : $product_object->get_download_expiry( 'edit' ),
+				'label'             => __( 'Download expiry', 'woocommerce' ),
+				'placeholder'       => __( 'Never', 'woocommerce' ),
+				'description'       => __( 'Enter the number of days before a download link expires, or leave blank.', 'woocommerce' ),
+				'type'              => 'number',
+				'custom_attributes' => array(
+					'step' 	=> '1',
+					'min'	=> '0',
+				),
+			) );
+
+			do_action( 'woocommerce_product_options_downloads' );
+		?>
+	</div>
+
+	<?php if ( wc_tax_enabled() ) : ?>
+		<div class="options_group show_if_simple show_if_external show_if_variable">
+			<?php
+				woocommerce_wp_select( array(
+					'id'             => '_tax_status',
+					'value'          => $product_object->get_tax_status( 'edit' ),
+					'label'          => __( 'Tax status', 'woocommerce' ),
+					'options'        => array(
+						'taxable' 	 => __( 'Taxable', 'woocommerce' ),
+						'shipping' 	 => __( 'Shipping only', 'woocommerce' ),
+						'none' 		 => _x( 'None', 'Tax status', 'woocommerce' ),
+					),
+					'desc_tip'       => 'true',
+					'description'    => __( 'Define whether or not the entire product is taxable, or just the cost of shipping it.', 'woocommerce' ),
+				) );
+
+				woocommerce_wp_select( array(
+					'id'          => '_tax_class',
+					'value'       => $product_object->get_tax_class( 'edit' ),
+					'label'       => __( 'Tax class', 'woocommerce' ),
+					'options'     => wc_get_product_tax_class_options(),
+					'desc_tip'    => 'true',
+					'description' => __( 'Choose a tax class for this product. Tax classes are used to apply different tax rates specific to certain types of product.', 'woocommerce' ),
+				) );
+
+				do_action( 'woocommerce_product_options_tax' );
+			?>
+		</div>
+	<?php endif; ?>
+
+	<?php do_action( 'woocommerce_product_options_general_product_data' ); ?>
+</div>
diff --git a/includes/admin/meta-boxes/views/html-product-data-inventory.php b/includes/admin/meta-boxes/views/html-product-data-inventory.php
new file mode 100644
index 00000000000..bc37b5c878c
--- /dev/null
+++ b/includes/admin/meta-boxes/views/html-product-data-inventory.php
@@ -0,0 +1,87 @@
+<div id="inventory_product_data" class="panel woocommerce_options_panel hidden">
+
+	<div class="options_group">
+		<?php
+			if ( wc_product_sku_enabled() ) {
+				woocommerce_wp_text_input( array(
+					'id'          => '_sku',
+					'value'       => $product_object->get_sku( 'edit' ),
+					'label'       => '<abbr title="' . __( 'Stock Keeping Unit', 'woocommerce' ) . '">' . __( 'SKU', 'woocommerce' ) . '</abbr>',
+					'desc_tip'    => true,
+					'description' => __( 'SKU refers to a Stock-keeping unit, a unique identifier for each distinct product and service that can be purchased.', 'woocommerce' ),
+				) );
+			}
+
+			do_action( 'woocommerce_product_options_sku' );
+
+			if ( 'yes' === get_option( 'woocommerce_manage_stock' ) ) {
+
+				woocommerce_wp_checkbox( array(
+					'id'            => '_manage_stock',
+					'value'         => $product_object->get_manage_stock( 'edit' ) ? 'yes' : 'no',
+					'wrapper_class' => 'show_if_simple show_if_variable',
+					'label'         => __( 'Manage stock?', 'woocommerce' ),
+					'description'   => __( 'Enable stock management at product level', 'woocommerce' ),
+				) );
+
+				do_action( 'woocommerce_product_options_stock' );
+
+				echo '<div class="stock_fields show_if_simple show_if_variable">';
+
+				woocommerce_wp_text_input( array(
+					'id'                => '_stock',
+					'value'             => $product_object->get_stock_quantity( 'edit' ),
+					'label'             => __( 'Stock quantity', 'woocommerce' ),
+					'desc_tip'          => true,
+					'description'       => __( 'Stock quantity. If this is a variable product this value will be used to control stock for all variations, unless you define stock at variation level.', 'woocommerce' ),
+					'type'              => 'number',
+					'custom_attributes' => array(
+						'step'          => 'any',
+					),
+					'data_type'         => 'stock',
+				) );
+
+				woocommerce_wp_select( array(
+					'id'          => '_backorders',
+					'value'       => $product_object->get_backorders( 'edit' ),
+					'label'       => __( 'Allow backorders?', 'woocommerce' ),
+					'options'     => wc_get_product_backorder_options(),
+					'desc_tip'    => true,
+					'description' => __( 'If managing stock, this controls whether or not backorders are allowed. If enabled, stock quantity can go below 0.', 'woocommerce' ),
+				) );
+
+				do_action( 'woocommerce_product_options_stock_fields' );
+
+				echo '</div>';
+			}
+
+			woocommerce_wp_select( array(
+				'id'             => '_stock_status',
+				'value'          => $product_object->get_stock_status( 'edit' ),
+				'wrapper_class'  => 'hide_if_variable hide_if_external',
+				'label'          => __( 'Stock status', 'woocommerce' ),
+				'options'        => wc_get_product_stock_status_options(),
+				'desc_tip'       => true,
+				'description'    => __( 'Controls whether or not the product is listed as "in stock" or "out of stock" on the frontend.', 'woocommerce' ),
+			) );
+
+			do_action( 'woocommerce_product_options_stock_status' );
+		?>
+	</div>
+
+	<div class="options_group show_if_simple show_if_variable">
+		<?php
+			woocommerce_wp_checkbox( array(
+				'id'            => '_sold_individually',
+				'value'         => $product_object->get_sold_individually( 'edit' ) ? 'yes' : 'no',
+				'wrapper_class' => 'show_if_simple show_if_variable',
+				'label'         => __( 'Sold individually', 'woocommerce' ),
+				'description'   => __( 'Enable this to only allow one of this item to be bought in a single order', 'woocommerce' ),
+			) );
+
+			do_action( 'woocommerce_product_options_sold_individually' );
+		?>
+	</div>
+
+	<?php do_action( 'woocommerce_product_options_inventory_product_data' ); ?>
+</div>
diff --git a/includes/admin/meta-boxes/views/html-product-data-linked-products.php b/includes/admin/meta-boxes/views/html-product-data-linked-products.php
new file mode 100644
index 00000000000..72812591311
--- /dev/null
+++ b/includes/admin/meta-boxes/views/html-product-data-linked-products.php
@@ -0,0 +1,54 @@
+<div id="linked_product_data" class="panel woocommerce_options_panel hidden">
+
+	<div class="options_group">
+		<p class="form-field">
+			<label for="upsell_ids"><?php _e( 'Up-sells', 'woocommerce' ); ?></label>
+			<select class="wc-product-search" multiple="multiple" style="width: 50%;" id="upsell_ids" name="upsell_ids[]" data-placeholder="<?php esc_attr_e( 'Search for a product&hellip;', 'woocommerce' ); ?>" data-action="woocommerce_json_search_products_and_variations" data-exclude="<?php echo intval( $post->ID ); ?>">
+				<?php
+					$product_ids = $product_object->get_upsell_ids( 'edit' );
+
+					foreach ( $product_ids as $product_id ) {
+						$product = wc_get_product( $product_id );
+						if ( is_object( $product ) ) {
+							echo '<option value="' . esc_attr( $product_id ) . '"' . selected( true, true, false ) . '>' . wp_kses_post( $product->get_formatted_name() ) . '</option>';
+						}
+					}
+				?>
+			</select> <?php echo wc_help_tip( __( 'Up-sells are products which you recommend instead of the currently viewed product, for example, products that are more profitable or better quality or more expensive.', 'woocommerce' ) ); ?>
+		</p>
+
+		<p class="form-field">
+			<label for="crosssell_ids"><?php _e( 'Cross-sells', 'woocommerce' ); ?></label>
+			<select class="wc-product-search" multiple="multiple" style="width: 50%;" id="crosssell_ids" name="crosssell_ids[]" data-placeholder="<?php esc_attr_e( 'Search for a product&hellip;', 'woocommerce' ); ?>" data-action="woocommerce_json_search_products_and_variations" data-exclude="<?php echo intval( $post->ID ); ?>">
+				<?php
+					$product_ids = $product_object->get_cross_sell_ids( 'edit' );
+
+					foreach ( $product_ids as $product_id ) {
+						$product = wc_get_product( $product_id );
+						if ( is_object( $product ) ) {
+							echo '<option value="' . esc_attr( $product_id ) . '"' . selected( true, true, false ) . '>' . wp_kses_post( $product->get_formatted_name() ) . '</option>';
+						}
+					}
+				?>
+			</select> <?php echo wc_help_tip( __( 'Cross-sells are products which you promote in the cart, based on the current product.', 'woocommerce' ) ); ?>
+		</p>
+
+		<p class="form-field show_if_grouped">
+			<label for="grouped_products"><?php _e( 'Grouped products', 'woocommerce' ); ?></label>
+			<select class="wc-product-search" multiple="multiple" style="width: 50%;" id="grouped_products" name="grouped_products[]" data-placeholder="<?php esc_attr_e( 'Search for a product&hellip;', 'woocommerce' ); ?>" data-action="woocommerce_json_search_products" data-exclude="<?php echo intval( $post->ID ); ?>">
+				<?php
+					$product_ids = $product_object->get_children( 'edit' );
+
+					foreach ( $product_ids as $product_id ) {
+						$product = wc_get_product( $product_id );
+						if ( is_object( $product ) ) {
+							echo '<option value="' . esc_attr( $product_id ) . '"' . selected( true, true, false ) . '>' . wp_kses_post( $product->get_formatted_name() ) . '</option>';
+						}
+					}
+				?>
+			</select> <?php echo wc_help_tip( __( 'This lets you choose which products are part of this group.', 'woocommerce' ) ); ?>
+		</p>
+	</div>
+
+	<?php do_action( 'woocommerce_product_options_related' ); ?>
+</div>
diff --git a/includes/admin/meta-boxes/views/html-product-data-panel.php b/includes/admin/meta-boxes/views/html-product-data-panel.php
new file mode 100644
index 00000000000..f8dc6579c7e
--- /dev/null
+++ b/includes/admin/meta-boxes/views/html-product-data-panel.php
@@ -0,0 +1,45 @@
+<div class="panel-wrap product_data">
+
+	<span class="type_box hidden"> &mdash;
+		<label for="product-type">
+			<select id="product-type" name="product-type">
+				<optgroup label="<?php esc_attr_e( 'Product Type', 'woocommerce' ); ?>">
+				<?php foreach ( wc_get_product_types() as $value => $label ) : ?>
+					<option value="<?php echo esc_attr( $value ); ?>" <?php echo selected( $product_object->get_type(), $value, false ); ?>><?php echo esc_html( $label ); ?></option>
+				<?php endforeach; ?>
+				</optgroup>
+			</select>
+		</label>
+
+		<?php foreach ( self::get_product_type_options() as $key => $option ) :
+			if ( metadata_exists( 'post', $post->ID, '_' . $key ) ) {
+				$selected_value = is_callable( array( $product_object, "is_$key" ) ) ? $product_object->{"is_$key"}() : 'yes' === get_post_meta( $post->ID, '_' . $key, true );
+			} else {
+				$selected_value = 'yes' === ( isset( $option['default'] ) ? $option['default'] : 'no' );
+			}
+			?>
+			<label for="<?php echo esc_attr( $option['id'] ); ?>" class="<?php echo esc_attr( $option['wrapper_class'] ); ?> tips" data-tip="<?php echo esc_attr( $option['description'] ); ?>">
+				<?php echo esc_html( $option['label'] ); ?>:
+				<input type="checkbox" name="<?php echo esc_attr( $option['id'] ); ?>" id="<?php echo esc_attr( $option['id'] ); ?>" <?php echo checked( $selected_value, true, false ); ?> />
+			</label>
+		<?php endforeach; ?>
+	</span>
+
+	<ul class="product_data_tabs wc-tabs">
+		<?php foreach ( self::get_product_data_tabs() as $key => $tab ) : ?>
+			<li class="<?php echo $key; ?>_options <?php echo $key; ?>_tab <?php echo implode( ' ' , (array) $tab['class'] ); ?>">
+				<a href="#<?php echo $tab['target']; ?>"><span><?php echo esc_html( $tab['label'] ); ?></span></a>
+			</li>
+		<?php endforeach; ?>
+		<?php do_action( 'woocommerce_product_write_panel_tabs' ); ?>
+	</ul>
+
+	<?php
+		self::output_tabs();
+		self::output_variations();
+		do_action( 'woocommerce_product_data_panels' );
+		wc_do_deprecated_action( 'woocommerce_product_write_panels', array(), '2.6', 'Use woocommerce_product_data_panels action instead.' );
+		wp_nonce_field( 'woocommerce_save_data', 'woocommerce_meta_nonce' );
+	?>
+	<div class="clear"></div>
+</div>
diff --git a/includes/admin/meta-boxes/views/html-product-data-shipping.php b/includes/admin/meta-boxes/views/html-product-data-shipping.php
new file mode 100644
index 00000000000..e4240541f07
--- /dev/null
+++ b/includes/admin/meta-boxes/views/html-product-data-shipping.php
@@ -0,0 +1,53 @@
+<div id="shipping_product_data" class="panel woocommerce_options_panel hidden">
+	<div class="options_group">
+		<?php
+			if ( wc_product_weight_enabled() ) {
+				woocommerce_wp_text_input( array(
+					'id'          => '_weight',
+					'value'       => $product_object->get_weight( 'edit' ),
+					'label'       => __( 'Weight', 'woocommerce' ) . ' (' . get_option( 'woocommerce_weight_unit' ) . ')',
+					'placeholder' => wc_format_localized_decimal( 0 ),
+					'desc_tip'    => true,
+					'description' => __( 'Weight in decimal form', 'woocommerce' ),
+					'type'        => 'text',
+					'data_type'   => 'decimal',
+				) );
+			}
+
+			if ( wc_product_dimensions_enabled() ) {
+				?><p class="form-field dimensions_field">
+					<label for="product_length"><?php printf( __( 'Dimensions (%s)', 'woocommerce' ), get_option( 'woocommerce_dimension_unit' ) ); ?></label>
+					<span class="wrap">
+						<input id="product_length" placeholder="<?php esc_attr_e( 'Length', 'woocommerce' ); ?>" class="input-text wc_input_decimal" size="6" type="text" name="_length" value="<?php echo esc_attr( wc_format_localized_decimal( $product_object->get_length( 'edit' ) ) ); ?>" />
+						<input placeholder="<?php esc_attr_e( 'Width', 'woocommerce' ); ?>" class="input-text wc_input_decimal" size="6" type="text" name="_width" value="<?php echo esc_attr( wc_format_localized_decimal( $product_object->get_width( 'edit' ) ) ); ?>" />
+						<input placeholder="<?php esc_attr_e( 'Height', 'woocommerce' ); ?>" class="input-text wc_input_decimal last" size="6" type="text" name="_height" value="<?php echo esc_attr( wc_format_localized_decimal( $product_object->get_height( 'edit' ) ) ); ?>" />
+					</span>
+					<?php echo wc_help_tip( __( 'LxWxH in decimal form', 'woocommerce' ) ); ?>
+				</p><?php
+			}
+
+			do_action( 'woocommerce_product_options_dimensions' );
+		?>
+	</div>
+
+	<div class="options_group">
+		<?php
+			$args = array(
+				'taxonomy'         => 'product_shipping_class',
+				'hide_empty'       => 0,
+				'show_option_none' => __( 'No shipping class', 'woocommerce' ),
+				'name'             => 'product_shipping_class',
+				'id'               => 'product_shipping_class',
+				'selected'         => $product_object->get_shipping_class_id( 'edit' ),
+				'class'            => 'select short',
+			);
+			?><p class="form-field dimensions_field">
+				<label for="product_shipping_class"><?php _e( 'Shipping class', 'woocommerce' ); ?></label>
+				<?php wp_dropdown_categories( $args ); ?>
+				<?php echo wc_help_tip( __( 'Shipping classes are used by certain shipping methods to group similar products.', 'woocommerce' ) ); ?>
+			</p><?php
+
+			do_action( 'woocommerce_product_options_shipping' );
+		?>
+	</div>
+</div>
diff --git a/includes/admin/meta-boxes/views/html-product-data-variations.php b/includes/admin/meta-boxes/views/html-product-data-variations.php
new file mode 100644
index 00000000000..15ef83f5fa5
--- /dev/null
+++ b/includes/admin/meta-boxes/views/html-product-data-variations.php
@@ -0,0 +1,138 @@
+<div id="variable_product_options" class="panel wc-metaboxes-wrapper hidden">
+	<div id="variable_product_options_inner">
+
+		<?php if ( ! count( $variation_attributes ) ) : ?>
+
+			<div id="message" class="inline notice woocommerce-message">
+				<p><?php _e( 'Before you can add a variation you need to add some variation attributes on the <strong>Attributes</strong> tab.', 'woocommerce' ); ?></p>
+				<p><a class="button-primary" href="<?php echo esc_url( apply_filters( 'woocommerce_docs_url', 'https://docs.woocommerce.com/document/variable-product/', 'product-variations' ) ); ?>" target="_blank"><?php _e( 'Learn more', 'woocommerce' ); ?></a></p>
+			</div>
+
+		<?php else : ?>
+
+			<div class="toolbar toolbar-variations-defaults">
+				<div class="variations-defaults">
+					<strong><?php _e( 'Default Form Values', 'woocommerce' ); ?>: <?php echo wc_help_tip( __( 'These are the attributes that will be pre-selected on the frontend.', 'woocommerce' ) ); ?></strong>
+					<?php
+						foreach ( $variation_attributes as $attribute ) {
+							$selected_value = isset( $default_attributes[ sanitize_title( $attribute->get_name() ) ] ) ? $default_attributes[ sanitize_title( $attribute->get_name() ) ] : '';
+							?>
+							<select name="default_attribute_<?php echo sanitize_title( $attribute->get_name() ); ?>" data-current="<?php echo esc_attr( $selected_value ); ?>">
+								<option value=""><?php printf( esc_html__( 'No default %s&hellip;', 'woocommerce' ), wc_attribute_label( $attribute->get_name() ) ); ?></option>
+								<?php if ( $attribute->is_taxonomy() ) : ?>
+									<?php foreach ( $attribute->get_terms() as $option ) : ?>
+										<option <?php selected( $selected_value, $option->slug ); ?> value="<?php echo esc_attr( $option->slug ); ?>"><?php echo esc_html( apply_filters( 'woocommerce_variation_option_name', $option->name ) ); ?></option>
+									<?php endforeach; ?>
+								<?php else : ?>
+									<?php foreach ( $attribute->get_options() as $option ) : ?>
+										<option <?php selected( $selected_value, $option ); ?> value="<?php echo esc_attr( $option ); ?>"><?php echo esc_html( apply_filters( 'woocommerce_variation_option_name', $option ) ); ?></option>
+									<?php endforeach; ?>
+								<?php endif; ?>
+							</select>
+							<?php
+						}
+					?>
+				</div>
+				<div class="clear"></div>
+			</div>
+
+			<div class="toolbar toolbar-top">
+				<select id="field_to_edit" class="variation_actions">
+					<option data-global="true" value="add_variation"><?php _e( 'Add variation', 'woocommerce' ); ?></option>
+					<option data-global="true" value="link_all_variations"><?php _e( 'Create variations from all attributes', 'woocommerce' ); ?></option>
+					<option value="delete_all"><?php _e( 'Delete all variations', 'woocommerce' ); ?></option>
+					<optgroup label="<?php esc_attr_e( 'Status', 'woocommerce' ); ?>">
+						<option value="toggle_enabled"><?php _e( 'Toggle &quot;Enabled&quot;', 'woocommerce' ); ?></option>
+						<option value="toggle_downloadable"><?php _e( 'Toggle &quot;Downloadable&quot;', 'woocommerce' ); ?></option>
+						<option value="toggle_virtual"><?php _e( 'Toggle &quot;Virtual&quot;', 'woocommerce' ); ?></option>
+					</optgroup>
+					<optgroup label="<?php esc_attr_e( 'Pricing', 'woocommerce' ); ?>">
+						<option value="variable_regular_price"><?php _e( 'Set regular prices', 'woocommerce' ); ?></option>
+						<option value="variable_regular_price_increase"><?php _e( 'Increase regular prices (fixed amount or percentage)', 'woocommerce' ); ?></option>
+						<option value="variable_regular_price_decrease"><?php _e( 'Decrease regular prices (fixed amount or percentage)', 'woocommerce' ); ?></option>
+						<option value="variable_sale_price"><?php _e( 'Set sale prices', 'woocommerce' ); ?></option>
+						<option value="variable_sale_price_increase"><?php _e( 'Increase sale prices (fixed amount or percentage)', 'woocommerce' ); ?></option>
+						<option value="variable_sale_price_decrease"><?php _e( 'Decrease sale prices (fixed amount or percentage)', 'woocommerce' ); ?></option>
+						<option value="variable_sale_schedule"><?php _e( 'Set scheduled sale dates', 'woocommerce' ); ?></option>
+					</optgroup>
+					<optgroup label="<?php esc_attr_e( 'Inventory', 'woocommerce' ); ?>">
+						<option value="toggle_manage_stock"><?php _e( 'Toggle &quot;Manage stock&quot;', 'woocommerce' ); ?></option>
+						<option value="variable_stock"><?php _e( 'Stock', 'woocommerce' ); ?></option>
+                        <option value="variable_stock_status_instock"><?php _e( 'Set Status - In stock', 'woocommerce' ); ?></option>
+                        <option value="variable_stock_status_outofstock"><?php _e( 'Set Status - Out of stock', 'woocommerce' ); ?></option>
+					</optgroup>
+					<optgroup label="<?php esc_attr_e( 'Shipping', 'woocommerce' ); ?>">
+						<option value="variable_length"><?php _e( 'Length', 'woocommerce' ); ?></option>
+						<option value="variable_width"><?php _e( 'Width', 'woocommerce' ); ?></option>
+						<option value="variable_height"><?php _e( 'Height', 'woocommerce' ); ?></option>
+						<option value="variable_weight"><?php _e( 'Weight', 'woocommerce' ); ?></option>
+					</optgroup>
+					<optgroup label="<?php esc_attr_e( 'Downloadable products', 'woocommerce' ); ?>">
+						<option value="variable_download_limit"><?php _e( 'Download limit', 'woocommerce' ); ?></option>
+						<option value="variable_download_expiry"><?php _e( 'Download expiry', 'woocommerce' ); ?></option>
+					</optgroup>
+					<?php do_action( 'woocommerce_variable_product_bulk_edit_actions' ); ?>
+				</select>
+				<a class="button bulk_edit do_variation_action"><?php _e( 'Go', 'woocommerce' ); ?></a>
+
+				<div class="variations-pagenav">
+					<span class="displaying-num"><?php printf( _n( '%s item', '%s items', $variations_count, 'woocommerce' ), $variations_count ); ?></span>
+					<span class="expand-close">
+						(<a href="#" class="expand_all"><?php _e( 'Expand', 'woocommerce' ); ?></a> / <a href="#" class="close_all"><?php _e( 'Close', 'woocommerce' ); ?></a>)
+					</span>
+					<span class="pagination-links">
+						<a class="first-page disabled" title="<?php esc_attr_e( 'Go to the first page', 'woocommerce' ); ?>" href="#">&laquo;</a>
+						<a class="prev-page disabled" title="<?php esc_attr_e( 'Go to the previous page', 'woocommerce' ); ?>" href="#">&lsaquo;</a>
+						<span class="paging-select">
+							<label for="current-page-selector-1" class="screen-reader-text"><?php _e( 'Select Page', 'woocommerce' ); ?></label>
+							<select class="page-selector" id="current-page-selector-1" title="<?php esc_attr_e( 'Current page', 'woocommerce' ); ?>">
+								<?php for ( $i = 1; $i <= $variations_total_pages; $i++ ) : ?>
+									<option value="<?php echo $i; ?>"><?php echo $i; ?></option>
+								<?php endfor; ?>
+							</select>
+							 <?php _ex( 'of', 'number of pages', 'woocommerce' ); ?> <span class="total-pages"><?php echo $variations_total_pages; ?></span>
+						</span>
+						<a class="next-page" title="<?php esc_attr_e( 'Go to the next page', 'woocommerce' ); ?>" href="#">&rsaquo;</a>
+						<a class="last-page" title="<?php esc_attr_e( 'Go to the last page', 'woocommerce' ); ?>" href="#">&raquo;</a>
+					</span>
+				</div>
+				<div class="clear"></div>
+			</div>
+
+			<div class="woocommerce_variations wc-metaboxes" data-attributes="<?php
+				// esc_attr does not double encode - htmlspecialchars does
+				echo htmlspecialchars( json_encode( wc_list_pluck( $variation_attributes, 'get_data' ) ) );
+			?>" data-total="<?php echo $variations_count; ?>" data-total_pages="<?php echo $variations_total_pages; ?>" data-page="1" data-edited="false">
+			</div>
+
+			<div class="toolbar">
+				<button type="button" class="button-primary save-variation-changes" disabled="disabled"><?php _e( 'Save changes', 'woocommerce' ); ?></button>
+				<button type="button" class="button cancel-variation-changes" disabled="disabled"><?php _e( 'Cancel', 'woocommerce' ); ?></button>
+
+				<div class="variations-pagenav">
+					<span class="displaying-num"><?php printf( _n( '%s item', '%s items', $variations_count, 'woocommerce' ), $variations_count ); ?></span>
+					<span class="expand-close">
+						(<a href="#" class="expand_all"><?php _e( 'Expand', 'woocommerce' ); ?></a> / <a href="#" class="close_all"><?php _e( 'Close', 'woocommerce' ); ?></a>)
+					</span>
+					<span class="pagination-links">
+						<a class="first-page disabled" title="<?php esc_attr_e( 'Go to the first page', 'woocommerce' ); ?>" href="#">&laquo;</a>
+						<a class="prev-page disabled" title="<?php esc_attr_e( 'Go to the previous page', 'woocommerce' ); ?>" href="#">&lsaquo;</a>
+						<span class="paging-select">
+							<label for="current-page-selector-1" class="screen-reader-text"><?php _e( 'Select Page', 'woocommerce' ); ?></label>
+							<select class="page-selector" id="current-page-selector-1" title="<?php esc_attr_e( 'Current page', 'woocommerce' ); ?>">
+								<?php for ( $i = 1; $i <= $variations_total_pages; $i++ ) : ?>
+									<option value="<?php echo $i; ?>"><?php echo $i; ?></option>
+								<?php endfor; ?>
+							</select>
+							 <?php _ex( 'of', 'number of pages', 'woocommerce' ); ?> <span class="total-pages"><?php echo $variations_total_pages; ?></span>
+						</span>
+						<a class="next-page" title="<?php esc_attr_e( 'Go to the next page', 'woocommerce' ); ?>" href="#">&rsaquo;</a>
+						<a class="last-page" title="<?php esc_attr_e( 'Go to the last page', 'woocommerce' ); ?>" href="#">&raquo;</a>
+					</span>
+				</div>
+				<div class="clear"></div>
+			</div>
+
+		<?php endif; ?>
+	</div>
+</div>
diff --git a/includes/admin/meta-boxes/views/html-product-download.php b/includes/admin/meta-boxes/views/html-product-download.php
index 6ccc8f3b4d7..1e7cade40c3 100644
--- a/includes/admin/meta-boxes/views/html-product-download.php
+++ b/includes/admin/meta-boxes/views/html-product-download.php
@@ -1,7 +1,10 @@
 <tr>
 	<td class="sort"></td>
-	<td class="file_name"><input type="text" class="input_text" placeholder="<?php esc_attr_e( 'File Name', 'woocommerce' ); ?>" name="_wc_file_names[]" value="<?php echo esc_attr( $file['name'] ); ?>" /></td>
+	<td class="file_name">
+		<input type="text" class="input_text" placeholder="<?php esc_attr_e( 'File name', 'woocommerce' ); ?>" name="_wc_file_names[]" value="<?php echo esc_attr( $file['name'] ); ?>" />
+		<input type="hidden" name="_wc_file_hashes[]" value="<?php echo esc_attr( $key ); ?>" />
+	</td>
 	<td class="file_url"><input type="text" class="input_text" placeholder="<?php esc_attr_e( "http://", 'woocommerce' ); ?>" name="_wc_file_urls[]" value="<?php echo esc_attr( $file['file'] ); ?>" /></td>
 	<td class="file_url_choose" width="1%"><a href="#" class="button upload_file_button" data-choose="<?php esc_attr_e( 'Choose file', 'woocommerce' ); ?>" data-update="<?php esc_attr_e( 'Insert file URL', 'woocommerce' ); ?>"><?php echo str_replace( ' ', '&nbsp;', __( 'Choose file', 'woocommerce' ) ); ?></a></td>
 	<td width="1%"><a href="#" class="delete"><?php _e( 'Delete', 'woocommerce' ); ?></a></td>
-</tr>
\ No newline at end of file
+</tr>
diff --git a/includes/admin/meta-boxes/views/html-product-variation-download.php b/includes/admin/meta-boxes/views/html-product-variation-download.php
index ec55d24f392..4480d77629d 100644
--- a/includes/admin/meta-boxes/views/html-product-variation-download.php
+++ b/includes/admin/meta-boxes/views/html-product-variation-download.php
@@ -1,6 +1,9 @@
 <tr>
-	<td class="file_name"><input type="text" class="input_text" placeholder="<?php esc_attr_e( 'File Name', 'woocommerce' ); ?>" name="_wc_variation_file_names[<?php echo $variation_id; ?>][]" value="<?php echo esc_attr( $file['name'] ); ?>" /></td>
+	<td class="file_name">
+		<input type="text" class="input_text" placeholder="<?php esc_attr_e( 'File name', 'woocommerce' ); ?>" name="_wc_variation_file_names[<?php echo $variation_id; ?>][]" value="<?php echo esc_attr( $file['name'] ); ?>" />
+		<input type="hidden" name="_wc_variation_file_hashes[<?php echo $variation_id; ?>][]" value="<?php echo esc_attr( $key ); ?>" />
+	</td>
 	<td class="file_url"><input type="text" class="input_text" placeholder="<?php esc_attr_e( "http://", 'woocommerce' ); ?>" name="_wc_variation_file_urls[<?php echo $variation_id; ?>][]" value="<?php echo esc_attr( $file['file'] ); ?>" /></td>
 	<td class="file_url_choose" width="1%"><a href="#" class="button upload_file_button" data-choose="<?php esc_attr_e( 'Choose file', 'woocommerce' ); ?>" data-update="<?php esc_attr_e( 'Insert file URL', 'woocommerce' ); ?>"><?php echo str_replace( ' ', '&nbsp;', __( 'Choose file', 'woocommerce' ) ); ?></a></td>
 	<td width="1%"><a href="#" class="delete"><?php _e( 'Delete', 'woocommerce' ); ?></a></td>
-</tr>
\ No newline at end of file
+</tr>
diff --git a/includes/admin/meta-boxes/views/html-variation-admin.php b/includes/admin/meta-boxes/views/html-variation-admin.php
index 459ded2c736..64edc9d8644 100644
--- a/includes/admin/meta-boxes/views/html-variation-admin.php
+++ b/includes/admin/meta-boxes/views/html-variation-admin.php
@@ -1,115 +1,144 @@
 <?php
 /**
- * Outputs a variation
+ * Outputs a variation for editing.
  *
  * @var int $variation_id
  * @var WP_POST $variation
- * @var array $variation_data array of variation data
+ * @var WP_Product_Variation $variation_object
+ * @var array $variation_data array of variation data @deprecated.
  */
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
-
-extract( $variation_data );
 ?>
 <div class="woocommerce_variation wc-metabox closed">
 	<h3>
 		<a href="#" class="remove_variation delete" rel="<?php echo esc_attr( $variation_id ); ?>"><?php _e( 'Remove', 'woocommerce' ); ?></a>
-		<div class="handlediv" title="<?php esc_attr_e( 'Click to toggle', 'woocommerce' ); ?>"></div>
+		<div class="handlediv" aria-label="<?php esc_attr_e( 'Click to toggle', 'woocommerce' ); ?>"></div>
 		<div class="tips sort" data-tip="<?php esc_attr_e( 'Drag and drop, or click to set admin variation order', 'woocommerce' ); ?>"></div>
-		<strong>#<?php echo esc_html( $variation_id ); ?>: </strong>
+		<strong>#<?php echo esc_html( $variation_id ); ?> </strong>
 		<?php
-			foreach ( $parent_data['attributes'] as $attribute ) {
+			$attribute_values = $variation_object->get_attributes( 'edit' );
 
-				// Only deal with attributes that are variations
-				if ( ! $attribute['is_variation'] || 'false' === $attribute['is_variation'] ) {
+			foreach ( $product_object->get_attributes( 'edit' ) as $attribute ) {
+				if ( ! $attribute->get_variation() ) {
 					continue;
 				}
-
-				// Get current value for variation (if set)
-				$variation_selected_value = isset( $variation_data[ 'attribute_' . sanitize_title( $attribute['name'] ) ] ) ? $variation_data[ 'attribute_' . sanitize_title( $attribute['name'] ) ] : '';
-
-				// Name will be something like attribute_pa_color
-				echo '<select name="attribute_' . sanitize_title( $attribute['name'] ) . '[' . $loop . ']"><option value="">' . __( 'Any', 'woocommerce' ) . ' ' . esc_html( wc_attribute_label( $attribute['name'] ) ) . '&hellip;</option>';
-
-				// Get terms for attribute taxonomy or value if its a custom attribute
-				if ( $attribute['is_taxonomy'] ) {
-
-					$post_terms = wp_get_post_terms( $parent_data['id'], $attribute['name'] );
-
-					foreach ( $post_terms as $term ) {
-						echo '<option ' . selected( $variation_selected_value, $term->slug, false ) . ' value="' . esc_attr( $term->slug ) . '">' . esc_html( apply_filters( 'woocommerce_variation_option_name', $term->name ) ) . '</option>';
-					}
-
-				} else {
-
-					$options = wc_get_text_attributes( $attribute['value'] );
-
-					foreach ( $options as $option ) {
-						$selected = sanitize_title( $variation_selected_value ) === $variation_selected_value ? selected( $variation_selected_value, sanitize_title( $option ), false ) : selected( $variation_selected_value, $option, false );
-						echo '<option ' . $selected . ' value="' . esc_attr( $option ) . '">' . esc_html( apply_filters( 'woocommerce_variation_option_name', $option ) ) . '</option>';
-					}
-
-				}
-
-				echo '</select>';
+				$selected_value = isset( $attribute_values[ sanitize_title( $attribute->get_name() ) ] ) ? $attribute_values[ sanitize_title( $attribute->get_name() ) ] : '';
+				?>
+				<select name="attribute_<?php echo sanitize_title( $attribute->get_name() ) . "[{$loop}]"; ?>">
+					<option value=""><?php
+						/* translators: %s: attribute label */
+						printf( esc_html__( 'Any %s&hellip;', 'woocommerce' ), wc_attribute_label( $attribute->get_name() ) );
+						?></option>
+					<?php if ( $attribute->is_taxonomy() ) : ?>
+						<?php foreach ( $attribute->get_terms() as $option ) : ?>
+							<option <?php selected( $selected_value, $option->slug ); ?> value="<?php echo esc_attr( $option->slug ); ?>"><?php echo esc_html( apply_filters( 'woocommerce_variation_option_name', $option->name ) ); ?></option>
+						<?php endforeach; ?>
+					<?php else : ?>
+						<?php foreach ( $attribute->get_options() as $option ) : ?>
+							<option <?php selected( $selected_value, $option ); ?> value="<?php echo esc_attr( $option ); ?>"><?php echo esc_html( apply_filters( 'woocommerce_variation_option_name', $option ) ); ?></option>
+						<?php endforeach; ?>
+					<?php endif; ?>
+				</select>
+				<?php
 			}
 		?>
 		<input type="hidden" name="variable_post_id[<?php echo $loop; ?>]" value="<?php echo esc_attr( $variation_id ); ?>" />
-		<input type="hidden" class="variation_menu_order" name="variation_menu_order[<?php echo $loop; ?>]" value="<?php echo isset( $menu_order ) ? absint( $menu_order ) : 0; ?>" />
+		<input type="hidden" class="variation_menu_order" name="variation_menu_order[<?php echo $loop; ?>]" value="<?php echo esc_attr( $variation_object->get_menu_order( 'edit' ) ); ?>" />
 	</h3>
 	<div class="woocommerce_variable_attributes wc-metabox-content" style="display: none;">
 		<div class="data">
 			<p class="form-row form-row-first upload_image">
-				<a href="#" class="upload_image_button tips <?php if ( $_thumbnail_id > 0 ) echo 'remove'; ?>" data-tip="<?php if ( $_thumbnail_id > 0 ) { echo __( 'Remove this image', 'woocommerce' ); } else { echo __( 'Upload an image', 'woocommerce' ); } ?>" rel="<?php echo esc_attr( $variation_id ); ?>"><img src="<?php if ( ! empty( $image ) ) echo esc_attr( $image ); else echo esc_attr( wc_placeholder_img_src() ); ?>" /><input type="hidden" name="upload_image_id[<?php echo $loop; ?>]" class="upload_image_id" value="<?php echo esc_attr( $_thumbnail_id ); ?>" /></a>
+				<a href="#" class="upload_image_button tips <?php echo $variation_object->get_image_id( 'edit' ) ? 'remove' : ''; ?>" data-tip="<?php echo $variation_object->get_image_id( 'edit' ) ? esc_attr__( 'Remove this image', 'woocommerce' ) : esc_attr__( 'Upload an image', 'woocommerce' ); ?>" rel="<?php echo esc_attr( $variation_id ); ?>">
+					<img src="<?php echo $variation_object->get_image_id( 'edit' ) ? esc_url( wp_get_attachment_thumb_url( $variation_object->get_image_id( 'edit' ) ) ) : esc_url( wc_placeholder_img_src() ); ?>" /><input type="hidden" name="upload_image_id[<?php echo $loop; ?>]" class="upload_image_id" value="<?php echo esc_attr( $variation_object->get_image_id( 'edit' ) ); ?>" />
+				</a>
 			</p>
-			<?php if ( wc_product_sku_enabled() ) : ?>
-				<p class="sku form-row form-row-last">
-					<label><?php _e( 'SKU', 'woocommerce' ); ?>: <?php echo wc_help_tip( __( 'Enter a SKU for this variation or leave blank to use the parent product SKU.', 'woocommerce' ) ); ?></label>
-					<input type="text" size="5" name="variable_sku[<?php echo $loop; ?>]" value="<?php if ( isset( $_sku ) ) echo esc_attr( $_sku ); ?>" placeholder="<?php echo esc_attr( $parent_data['sku'] ); ?>" />
-				</p>
-			<?php else : ?>
-				<input type="hidden" name="variable_sku[<?php echo $loop; ?>]" value="<?php if ( isset( $_sku ) ) echo esc_attr( $_sku ); ?>" />
-			<?php endif; ?>
-
+			<?php
+				if ( wc_product_sku_enabled() ) {
+					woocommerce_wp_text_input( array(
+						'id'            => "variable_sku{$loop}",
+						'name'          => "variable_sku[{$loop}]",
+						'value'         => $variation_object->get_sku( 'edit' ),
+						'placeholder'   => $variation_object->get_sku(),
+						'label'         => '<abbr title="' . esc_attr__( 'Stock Keeping Unit', 'woocommerce' ) . '">' . esc_html__( 'SKU', 'woocommerce' ) . '</abbr>',
+						'desc_tip'      => true,
+						'description'   => __( 'SKU refers to a Stock-keeping unit, a unique identifier for each distinct product and service that can be purchased.', 'woocommerce' ),
+						'wrapper_class' => 'form-row form-row-last',
+					) );
+				}
+			?>
 			<p class="form-row form-row-full options">
-				<label><input type="checkbox" class="checkbox" name="variable_enabled[<?php echo $loop; ?>]" <?php checked( $variation->post_status, 'publish' ); ?> /> <?php _e( 'Enabled', 'woocommerce' ); ?></label>
-
-				<label><input type="checkbox" class="checkbox variable_is_downloadable" name="variable_is_downloadable[<?php echo $loop; ?>]" <?php checked( isset( $_downloadable ) ? $_downloadable : '', 'yes' ); ?> /> <?php _e( 'Downloadable', 'woocommerce' ); ?> <?php echo wc_help_tip( __( 'Enable this option if access is given to a downloadable file upon purchase of a product', 'woocommerce' ) ); ?></label>
-
-				<label><input type="checkbox" class="checkbox variable_is_virtual" name="variable_is_virtual[<?php echo $loop; ?>]" <?php checked( isset( $_virtual ) ? $_virtual : '', 'yes' ); ?> /> <?php _e( 'Virtual', 'woocommerce' ); ?> <?php echo wc_help_tip( __( 'Enable this option if a product is not shipped or there is no shipping cost', 'woocommerce' ) ); ?></label>
-
-				<?php if ( get_option( 'woocommerce_manage_stock' ) == 'yes' ) : ?>
-
-					<label><input type="checkbox" class="checkbox variable_manage_stock" name="variable_manage_stock[<?php echo $loop; ?>]" <?php checked( isset( $_manage_stock ) ? $_manage_stock : '', 'yes' ); ?> /> <?php _e( 'Manage stock?', 'woocommerce' ); ?> <?php echo wc_help_tip( __( 'Enable this option to enable stock management at variation level', 'woocommerce' ) ); ?></label>
+				<label>
+					<?php _e( 'Enabled', 'woocommerce' ); ?>:
+					<input type="checkbox" class="checkbox" name="variable_enabled[<?php echo $loop; ?>]" <?php checked( in_array( $variation_object->get_status( 'edit' ), array( 'publish', false ) ), true ); ?> />
+				</label>
+				<label class="tips" data-tip="<?php _e( 'Enable this option if access is given to a downloadable file upon purchase of a product', 'woocommerce' ); ?>">
+					<?php _e( 'Downloadable', 'woocommerce' ); ?>:
+					<input type="checkbox" class="checkbox variable_is_downloadable" name="variable_is_downloadable[<?php echo $loop; ?>]" <?php checked( $variation_object->get_downloadable( 'edit' ), true ); ?> />
+				</label>
+				<label class="tips" data-tip="<?php _e( 'Enable this option if a product is not shipped or there is no shipping cost', 'woocommerce' ); ?>">
+					<?php _e( 'Virtual', 'woocommerce' ); ?>:
+					<input type="checkbox" class="checkbox variable_is_virtual" name="variable_is_virtual[<?php echo $loop; ?>]" <?php checked( $variation_object->get_virtual( 'edit' ), true ); ?> />
+				</label>
 
+				<?php if ( 'yes' === get_option( 'woocommerce_manage_stock' ) ) : ?>
+					<label class="tips" data-tip="<?php _e( 'Enable this option to enable stock management at variation level', 'woocommerce' ); ?>">
+						<?php _e( 'Manage stock?', 'woocommerce' ); ?>
+						<input type="checkbox" class="checkbox variable_manage_stock" name="variable_manage_stock[<?php echo $loop; ?>]" <?php checked( $variation_object->get_manage_stock( 'edit' ), true ); ?> />
+					</label>
 				<?php endif; ?>
 
 				<?php do_action( 'woocommerce_variation_options', $loop, $variation_data, $variation ); ?>
 			</p>
 
 			<div class="variable_pricing">
-				<p class="form-row form-row-first">
-					<label><?php echo __( 'Regular Price:', 'woocommerce' ) . ' (' . get_woocommerce_currency_symbol() . ')'; ?></label>
-					<input type="text" size="5" name="variable_regular_price[<?php echo $loop; ?>]" value="<?php if ( isset( $_regular_price ) ) echo esc_attr( $_regular_price ); ?>" class="wc_input_price" placeholder="<?php esc_attr_e( 'Variation price (required)', 'woocommerce' ); ?>" />
-				</p>
-				<p class="form-row form-row-last">
-					<label><?php echo __( 'Sale Price:', 'woocommerce' ) . ' (' . get_woocommerce_currency_symbol() . ')'; ?> <a href="#" class="sale_schedule"><?php _e( 'Schedule', 'woocommerce' ); ?></a><a href="#" class="cancel_sale_schedule" style="display:none"><?php _e( 'Cancel schedule', 'woocommerce' ); ?></a></label>
-					<input type="text" size="5" name="variable_sale_price[<?php echo $loop; ?>]" value="<?php if ( isset( $_sale_price ) ) echo esc_attr( $_sale_price ); ?>" class="wc_input_price" />
-				</p>
-
-				<div class="sale_price_dates_fields" style="display: none">
-					<p class="form-row form-row-first">
-						<label><?php _e( 'Sale start date:', 'woocommerce' ); ?></label>
-						<input type="text" class="sale_price_dates_from" name="variable_sale_price_dates_from[<?php echo $loop; ?>]" value="<?php echo ! empty( $_sale_price_dates_from ) ? date_i18n( 'Y-m-d', $_sale_price_dates_from ) : ''; ?>" placeholder="<?php echo esc_attr_x( 'From&hellip;', 'placeholder', 'woocommerce' ) ?> YYYY-MM-DD" maxlength="10" pattern="[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|1[0-9]|2[0-9]|3[01])" />
-					</p>
-					<p class="form-row form-row-last">
-						<label><?php _e( 'Sale end date:', 'woocommerce' ); ?></label>
-						<input type="text" class="sale_price_dates_to" name="variable_sale_price_dates_to[<?php echo $loop; ?>]" value="<?php echo ! empty( $_sale_price_dates_to ) ? date_i18n( 'Y-m-d', $_sale_price_dates_to ) : ''; ?>" placeholder="<?php echo esc_attr_x('To&hellip;', 'placeholder', 'woocommerce') ?> YYYY-MM-DD" maxlength="10" pattern="[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|1[0-9]|2[0-9]|3[01])" />
-					</p>
-				</div>
-
 				<?php
+					/* translators: %s: currency symbol */
+					$label = sprintf(
+						__( 'Regular price (%s)', 'woocommerce' ),
+						get_woocommerce_currency_symbol()
+					);
+
+					woocommerce_wp_text_input( array(
+						'id'            => "variable_regular_price_{$loop}",
+						'name'          => "variable_regular_price[{$loop}]",
+						'value'         => wc_format_localized_price( $variation_object->get_regular_price( 'edit' ) ),
+						'label'         => $label,
+						'data_type'     => 'price',
+						'wrapper_class' => 'form-row form-row-first',
+						'placeholder'   => __( 'Variation price (required)', 'woocommerce' ),
+					) );
+
+					/* translators: %s: currency symbol */
+					$label = sprintf(
+						__( 'Sale price (%s)', 'woocommerce' ),
+						get_woocommerce_currency_symbol()
+					);
+
+					woocommerce_wp_text_input( array(
+						'id'            => "variable_sale_price{$loop}",
+						'name'          => "variable_sale_price[{$loop}]",
+						'value'         => wc_format_localized_price( $variation_object->get_sale_price( 'edit' ) ),
+						'data_type'     => 'price',
+						'label'         => $label . ' <a href="#" class="sale_schedule">' . __( 'Schedule', 'woocommerce' ) . '</a><a href="#" class="cancel_sale_schedule hidden">' . __( 'Cancel schedule', 'woocommerce' ) . '</a>',
+						'wrapper_class' => 'form-row form-row-last',
+					) );
+
+					$sale_price_dates_from = $variation_object->get_date_on_sale_from( 'edit' ) && ( $date = $variation_object->get_date_on_sale_from( 'edit' )->getOffsetTimestamp() ) ? date_i18n( 'Y-m-d', $date ) : '';
+					$sale_price_dates_to   = $variation_object->get_date_on_sale_to( 'edit' ) && ( $date = $variation_object->get_date_on_sale_to( 'edit' )->getOffsetTimestamp() ) ? date_i18n( 'Y-m-d', $date ) : '';
+
+					echo '<div class="form-field sale_price_dates_fields hidden">
+						<p class="form-row form-row-first">
+							<label>' . __( 'Sale start date', 'woocommerce' ) . '</label>
+							<input type="text" class="sale_price_dates_from" name="variable_sale_price_dates_from[' . $loop . ']" value="' . esc_attr( $sale_price_dates_from ) . '" placeholder="' . _x( 'From&hellip;', 'placeholder', 'woocommerce' ) . ' YYYY-MM-DD" maxlength="10" pattern="' . esc_attr( apply_filters( 'woocommerce_date_input_html_pattern', '[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|1[0-9]|2[0-9]|3[01])' ) ) . '" />
+						</p>
+						<p class="form-row form-row-last">
+							<label>' . __( 'Sale end date', 'woocommerce' ) . '</label>
+							<input type="text" class="sale_price_dates_to" name="variable_sale_price_dates_to[' . $loop . ']" value="' . esc_attr( $sale_price_dates_to ) . '" placeholder="' . _x( 'To&hellip;', 'placeholder', 'woocommerce' ) . '  YYYY-MM-DD" maxlength="10" pattern="' . esc_attr( apply_filters( 'woocommerce_date_input_html_pattern', '[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|1[0-9]|2[0-9]|3[01])' ) ) . '" />
+						</p>
+					</div>';
+
 					/**
 					 * woocommerce_variation_options_pricing action.
 					 *
@@ -123,24 +152,35 @@ extract( $variation_data );
 				?>
 			</div>
 
-			<?php if ( 'yes' == get_option( 'woocommerce_manage_stock' ) ) : ?>
+			<?php if ( 'yes' === get_option( 'woocommerce_manage_stock' ) ) : ?>
 				<div class="show_if_variation_manage_stock" style="display: none;">
-					<p class="form-row form-row-first">
-						<label><?php _e( 'Stock Qty:', 'woocommerce' ); ?> <?php echo wc_help_tip( __( 'Enter a quantity to enable stock management at variation level, or leave blank to use the parent product\'s options.', 'woocommerce' ) ); ?></label>
-						<input type="number" size="5" name="variable_stock[<?php echo $loop; ?>]" value="<?php if ( isset( $_stock ) ) echo esc_attr( wc_stock_amount( $_stock ) ); ?>" step="any" />
-					</p>
-					<p class="form-row form-row-last">
-						<label><?php _e( 'Allow Backorders?', 'woocommerce' ); ?></label>
-						<select name="variable_backorders[<?php echo $loop; ?>]">
-							<?php
-								foreach ( $parent_data['backorder_options'] as $key => $value ) {
-									echo '<option value="' . esc_attr( $key ) . '" ' . selected( $key === $_backorders, true, false ) . '>' . esc_html( $value ) . '</option>';
-								}
-							?>
-						</select>
-					</p>
-
 					<?php
+						woocommerce_wp_text_input( array(
+							'id'                => "variable_stock{$loop}",
+							'name'              => "variable_stock[{$loop}]",
+							'value'             => $variation_object->get_stock_quantity( 'edit' ),
+							'label'             => __( 'Stock quantity', 'woocommerce' ),
+							'desc_tip'          => true,
+							'description'       => __( "Enter a quantity to enable stock management at variation level, or leave blank to use the parent product's options.", 'woocommerce' ),
+							'type'              => 'number',
+							'custom_attributes' => array(
+								'step'          => 'any',
+							),
+							'data_type'         => 'stock',
+							'wrapper_class'     => 'form-row form-row-first',
+						) );
+
+						woocommerce_wp_select( array(
+							'id'            => "variable_backorders{$loop}",
+							'name'          => "variable_backorders[{$loop}]",
+							'value'         => $variation_object->get_backorders( 'edit' ),
+							'label'         => __( 'Allow backorders?', 'woocommerce' ),
+							'options'       => wc_get_product_backorder_options(),
+							'desc_tip'      => true,
+							'description'   => __( 'If managing stock, this controls whether or not backorders are allowed. If enabled, stock quantity can go below 0.', 'woocommerce' ),
+							'wrapper_class' => 'form-row form-row-last',
+						) );
+
 						/**
 						 * woocommerce_variation_options_inventory action.
 						 *
@@ -155,103 +195,125 @@ extract( $variation_data );
 				</div>
 			<?php endif; ?>
 
-			<div class="">
-				<p class="form-row form-row-full">
-					<label><?php _e( 'Stock status', 'woocommerce' ); ?> <?php echo wc_help_tip( __( 'Controls whether or not the product is listed as "in stock" or "out of stock" on the frontend.', 'woocommerce' ) ); ?></label>
-					<select name="variable_stock_status[<?php echo $loop; ?>]">
-						<?php
-							foreach ( $parent_data['stock_status_options'] as $key => $value ) {
-								echo '<option value="' . esc_attr( $key === $_stock_status ? '' : $key ) . '" ' . selected( $key === $_stock_status, true, false ) . '>' . esc_html( $value ) . '</option>';
-							}
-						?>
-					</select>
-				</p>
+			<div>
+				<?php
+					woocommerce_wp_select( array(
+						'id'            => "variable_stock_status{$loop}",
+						'name'          => "variable_stock_status[{$loop}]",
+						'value'         => $variation_object->get_stock_status( 'edit' ),
+						'label'         => __( 'Stock status', 'woocommerce' ),
+						'options'       => wc_get_product_stock_status_options(),
+						'desc_tip'      => true,
+						'description'   => __( 'Controls whether or not the product is listed as "in stock" or "out of stock" on the frontend.', 'woocommerce' ),
+						'wrapper_class' => 'form-row form-row-full',
+					) );
+
+					if ( wc_product_weight_enabled() ) {
+						/* translators: %s: weight unit */
+						$label = sprintf(
+							__( 'Weight (%s)', 'woocommerce' ),
+							esc_html( get_option( 'woocommerce_weight_unit' ) )
+						);
+
+						woocommerce_wp_text_input( array(
+							'id'            => "variable_weight{$loop}",
+							'name'          => "variable_weight[{$loop}]",
+							'value'         => wc_format_localized_decimal( $variation_object->get_weight( 'edit' ) ),
+							'placeholder'   => wc_format_localized_decimal( $product_object->get_weight() ),
+							'label'         => $label,
+							'desc_tip'      => true,
+							'description'   => __( 'Weight in decimal form', 'woocommerce' ),
+							'type'          => 'text',
+							'data_type'     => 'decimal',
+							'wrapper_class' => 'form-row form-row-first hide_if_variation_virtual',
+						) );
+					}
+
+					if ( wc_product_dimensions_enabled() ) {
+						?><p class="form-field form-row dimensions_field hide_if_variation_virtual form-row-last">
+							<label for="product_length"><?php
+								/* translators: %s: dimension unit */
+								printf(
+									__( 'Dimensions (L&times;W&times;H) (%s)', 'woocommerce' ),
+									get_option( 'woocommerce_dimension_unit' )
+								);
+							?></label>
+							<?php echo wc_help_tip( __( 'Length x width x height in decimal form', 'woocommerce' ) ); ?>
+							<span class="wrap">
+								<input id="product_length" placeholder="<?php esc_attr_e( 'Length', 'woocommerce' ); ?>" class="input-text wc_input_decimal" size="6" type="text" name="variable_length[<?php echo $loop; ?>]" value="<?php echo esc_attr( wc_format_localized_decimal( $variation_object->get_length( 'edit' ) ) ); ?>" />
+								<input placeholder="<?php esc_attr_e( 'Width', 'woocommerce' ); ?>" class="input-text wc_input_decimal" size="6" type="text" name="variable_width[<?php echo $loop; ?>]" value="<?php echo esc_attr( wc_format_localized_decimal( $variation_object->get_width( 'edit' ) ) ); ?>" />
+								<input placeholder="<?php esc_attr_e( 'Height', 'woocommerce' ); ?>" class="input-text wc_input_decimal last" size="6" type="text" name="variable_height[<?php echo $loop; ?>]" value="<?php echo esc_attr( wc_format_localized_decimal( $variation_object->get_height( 'edit' ) ) ); ?>" />
+							</span>
+						</p><?php
+					}
+
+					/**
+					 * woocommerce_variation_options_dimensions action.
+					 *
+					 * @since 2.5.0
+					 *
+					 * @param int     $loop
+					 * @param array   $variation_data
+					 * @param WP_Post $variation
+					 */
+					do_action( 'woocommerce_variation_options_dimensions', $loop, $variation_data, $variation );
+				?>
 			</div>
 
-			<?php if ( wc_product_weight_enabled() || wc_product_dimensions_enabled() ) : ?>
-				<div>
-					<?php if ( wc_product_weight_enabled() ) : ?>
-						<p class="form-row hide_if_variation_virtual form-row-first">
-							<label><?php echo __( 'Weight', 'woocommerce' ) . ' (' . esc_html( get_option( 'woocommerce_weight_unit' ) ) . '):'; ?> <?php echo wc_help_tip( __( 'Enter a weight for this variation or leave blank to use the parent product weight.', 'woocommerce' ) ); ?></a></label>
-							<input type="text" size="5" name="variable_weight[<?php echo $loop; ?>]" value="<?php if ( isset( $_weight ) ) echo esc_attr( $_weight ); ?>" placeholder="<?php echo esc_attr( $parent_data['weight'] ); ?>" class="wc_input_decimal" />
-						</p>
-					<?php else : ?>
-						<p>&nbsp;</p>
-					<?php endif; ?>
-					<?php if ( wc_product_dimensions_enabled() ) : ?>
-						<p class="form-row dimensions_field hide_if_variation_virtual form-row-last">
-							<label for="product_length"><?php echo __( 'Dimensions (L&times;W&times;H)', 'woocommerce' ) . ' (' . esc_html( get_option( 'woocommerce_dimension_unit' ) ) . '):'; ?></label>
-							<input id="product_length" class="input-text wc_input_decimal" size="6" type="text" name="variable_length[<?php echo $loop; ?>]" value="<?php if ( isset( $_length ) ) echo esc_attr( $_length ); ?>" placeholder="<?php echo esc_attr( $parent_data['length'] ); ?>" />
-							<input class="input-text wc_input_decimal" size="6" type="text" name="variable_width[<?php echo $loop; ?>]" value="<?php if ( isset( $_width ) ) echo esc_attr( $_width ); ?>" placeholder="<?php echo esc_attr( $parent_data['width'] ); ?>" />
-							<input class="input-text wc_input_decimal last" size="6" type="text" name="variable_height[<?php echo $loop; ?>]" value="<?php if ( isset( $_height ) ) echo esc_attr( $_height ); ?>" placeholder="<?php echo esc_attr( $parent_data['height'] ); ?>" />
-						</p>
-					<?php else : ?>
-						<p>&nbsp;</p>
-					<?php endif; ?>
-
-					<?php
-						/**
-						 * woocommerce_variation_options_dimensions action.
-						 *
-						 * @since 2.5.0
-						 *
-						 * @param int     $loop
-						 * @param array   $variation_data
-						 * @param WP_Post $variation
-						 */
-						do_action( 'woocommerce_variation_options_dimensions', $loop, $variation_data, $variation );
-					?>
-				</div>
-			<?php endif; ?>
 			<div>
-				<p class="form-row hide_if_variation_virtual form-row-full"><label><?php _e( 'Shipping class:', 'woocommerce' ); ?></label> <?php
-					$args = array(
-						'taxonomy' 			=> 'product_shipping_class',
-						'hide_empty'		=> 0,
-						'show_option_none' 	=> __( 'Same as parent', 'woocommerce' ),
-						'name' 				=> 'variable_shipping_class[' . $loop . ']',
-						'id'				=> '',
-						'selected'			=> isset( $shipping_class ) ? esc_attr( $shipping_class ) : '',
-						'echo'				=> 0
-					);
-
-					echo wp_dropdown_categories( $args );
+				<p class="form-row hide_if_variation_virtual form-row-full"><label><?php _e( 'Shipping class', 'woocommerce' ); ?></label> <?php
+					wp_dropdown_categories( array(
+						'taxonomy'         => 'product_shipping_class',
+						'hide_empty'       => 0,
+						'show_option_none' => __( 'Same as parent', 'woocommerce' ),
+						'name'             => 'variable_shipping_class[' . $loop . ']',
+						'id'               => '',
+						'selected'         => $variation_object->get_shipping_class_id( 'edit' ),
+					) );
 				?></p>
 
-				<?php if ( wc_tax_enabled() ) : ?>
-					<p class="form-row form-row-full">
-						<label><?php _e( 'Tax class:', 'woocommerce' ); ?></label>
-						<select name="variable_tax_class[<?php echo $loop; ?>]">
-							<option value="parent" <?php selected( is_null( $_tax_class ), true ); ?>><?php _e( 'Same as parent', 'woocommerce' ); ?></option>
-							<?php
-							foreach ( $parent_data['tax_class_options'] as $key => $value )
-								echo '<option value="' . esc_attr( $key ) . '" ' . selected( $key === $_tax_class, true, false ) . '>' . esc_html( $value ) . '</option>';
-						?></select>
-					</p>
+				<?php
+				if ( wc_tax_enabled() ) {
+					woocommerce_wp_select( array(
+						'id'            => "variable_tax_class{$loop}",
+						'name'          => "variable_tax_class[{$loop}]",
+						'value'         => $variation_object->get_tax_class( 'edit' ),
+						'label'         => __( 'Tax class', 'woocommerce' ),
+						'options'       => array_merge( array( 'parent' => __( 'Same as parent', 'woocommerce' ) ), wc_get_product_tax_class_options() ),
+						'desc_tip'      => 'true',
+						'description'   => __( 'Choose a tax class for this product. Tax classes are used to apply different tax rates specific to certain types of product.', 'woocommerce' ),
+						'wrapper_class' => 'form-row form-row-full',
+					) );
 
-					<?php
-						/**
-						 * woocommerce_variation_options_tax action.
-						 *
-						 * @since 2.5.0
-						 *
-						 * @param int     $loop
-						 * @param array   $variation_data
-						 * @param WP_Post $variation
-						 */
-						do_action( 'woocommerce_variation_options_tax', $loop, $variation_data, $variation );
-					?>
-				<?php endif; ?>
+					/**
+					 * woocommerce_variation_options_tax action.
+					 *
+					 * @since 2.5.0
+					 *
+					 * @param int     $loop
+					 * @param array   $variation_data
+					 * @param WP_Post $variation
+					 */
+					do_action( 'woocommerce_variation_options_tax', $loop, $variation_data, $variation );
+				}
+				?>
 			</div>
 			<div>
-				<p class="form-row form-row-full">
-					<label><?php _e( 'Variation Description:', 'woocommerce' ); ?></label>
-					<textarea name="variable_description[<?php echo $loop; ?>]" rows="3" style="width:100%;"><?php echo isset( $variation_data['_variation_description'] ) ? esc_textarea( $variation_data['_variation_description'] ) : ''; ?></textarea>
-				</p>
+				<?php
+					woocommerce_wp_textarea_input( array(
+						'id'            => "variable_description{$loop}",
+						'name'          => "variable_description[{$loop}]",
+						'value'         => $variation_object->get_description( 'edit' ),
+						'label'         => __( 'Description', 'woocommerce' ),
+						'desc_tip'      => true,
+						'description'   => __( 'Enter an optional description for this variation.', 'woocommerce' ),
+						'wrapper_class' => 'form-row form-row-full',
+					) );
+				?>
 			</div>
 			<div class="show_if_variation_downloadable" style="display: none;">
 				<div class="form-row form-row-full downloadable_files">
-					<label><?php _e( 'Downloadable Files', 'woocommerce' ); ?>:</label>
+					<label><?php _e( 'Downloadable files', 'woocommerce' ); ?></label>
 					<table class="widefat">
 						<thead>
 							<div>
@@ -262,14 +324,8 @@ extract( $variation_data );
 						</thead>
 						<tbody>
 							<?php
-							if ( $_downloadable_files ) {
-								foreach ( $_downloadable_files as $key => $file ) {
-									if ( ! is_array( $file ) ) {
-										$file = array(
-											'file' => $file,
-											'name' => ''
-										);
-									}
+							if ( $downloads = $variation_object->get_downloads( 'edit' ) ) {
+								foreach ( $downloads as $key => $file ) {
 									include( 'html-product-variation-download.php' );
 								}
 							}
@@ -279,14 +335,15 @@ extract( $variation_data );
 							<div>
 								<th colspan="4">
 									<a href="#" class="button insert" data-row="<?php
+										$key  = '';
 										$file = array(
 											'file' => '',
-											'name' => ''
+											'name' => '',
 										);
 										ob_start();
 										include( 'html-product-variation-download.php' );
 										echo esc_attr( ob_get_clean() );
-									?>"><?php _e( 'Add File', 'woocommerce' ); ?></a>
+									?>"><?php _e( 'Add file', 'woocommerce' ); ?></a>
 								</th>
 							</div>
 						</tfoot>
@@ -294,16 +351,39 @@ extract( $variation_data );
 				</div>
 			</div>
 			<div class="show_if_variation_downloadable" style="display: none;">
-				<p class="form-row form-row-first">
-					<label><?php _e( 'Download Limit:', 'woocommerce' ); ?> <?php echo wc_help_tip( __( 'Leave blank for unlimited re-downloads.', 'woocommerce' ) ); ?></a></label>
-					<input type="number" size="5" name="variable_download_limit[<?php echo $loop; ?>]" value="<?php if ( isset( $_download_limit ) ) echo esc_attr( $_download_limit ); ?>" placeholder="<?php esc_attr_e( 'Unlimited', 'woocommerce' ); ?>" step="1" min="0" />
-				</p>
-				<p class="form-row form-row-last">
-					<label><?php _e( 'Download Expiry:', 'woocommerce' ); ?> <?php echo wc_help_tip( __( 'Enter the number of days before a download link expires, or leave blank.', 'woocommerce' ) ); ?></a></label>
-					<input type="number" size="5" name="variable_download_expiry[<?php echo $loop; ?>]" value="<?php if ( isset( $_download_expiry ) ) echo esc_attr( $_download_expiry ); ?>" placeholder="<?php esc_attr_e( 'Unlimited', 'woocommerce' ); ?>" step="1" min="0" />
-				</p>
-
 				<?php
+					woocommerce_wp_text_input( array(
+						'id'                => "variable_download_limit{$loop}",
+						'name'              => "variable_download_limit[{$loop}]",
+						'value'             => $variation_object->get_download_limit( 'edit' ) < 0 ? '' : $variation_object->get_download_limit( 'edit' ),
+						'label'             => __( 'Download limit', 'woocommerce' ),
+						'placeholder'       => __( 'Unlimited', 'woocommerce' ),
+						'description'       => __( 'Leave blank for unlimited re-downloads.', 'woocommerce' ),
+						'type'              => 'number',
+						'desc_tip'          => true,
+						'custom_attributes' => array(
+							'step' 	        => '1',
+							'min'	        => '0',
+						),
+						'wrapper_class'     => 'form-row form-row-first',
+					) );
+
+					woocommerce_wp_text_input( array(
+						'id'                => "variable_download_expiry{$loop}",
+						'name'              => "variable_download_expiry[{$loop}]",
+						'value'             => $variation_object->get_download_expiry( 'edit' ) < 0 ? '' : $variation_object->get_download_expiry( 'edit' ),
+						'label'             => __( 'Download expiry', 'woocommerce' ),
+						'placeholder'       => __( 'Never', 'woocommerce' ),
+						'description'       => __( 'Enter the number of days before a download link expires, or leave blank.', 'woocommerce' ),
+						'type'              => 'number',
+						'desc_tip'          => true,
+						'custom_attributes' => array(
+							'step' 	        => '1',
+							'min'	        => '0',
+						),
+						'wrapper_class'     => 'form-row form-row-last',
+					) );
+
 					/**
 					 * woocommerce_variation_options_download action.
 					 *
diff --git a/includes/admin/reports/class-wc-admin-report.php b/includes/admin/reports/class-wc-admin-report.php
index bd3ef1a061a..1df22360e58 100644
--- a/includes/admin/reports/class-wc-admin-report.php
+++ b/includes/admin/reports/class-wc-admin-report.php
@@ -16,11 +16,46 @@ if ( ! defined( 'ABSPATH' ) ) {
  */
 class WC_Admin_Report {
 
+	/**
+	 * The chart interval.
+	 *
+	 * @var int
+	 */
 	public $chart_interval;
+
+	/**
+	 * Group by SQL query.
+	 *
+	 * @var string
+	 */
 	public $group_by_query;
+
+	/**
+	 * The bar width.
+	 *
+	 * @var int
+	 */
 	public $barwidth;
+
+	/**
+	 * Group chart item by day or month.
+	 *
+	 * @var string
+	 */
 	public $chart_groupby;
+
+	/**
+	 * The start date of the report.
+	 *
+	 * @var int timestamp
+	 */
 	public $start_date;
+
+	/**
+	 * The end date of the report.
+	 *
+	 * @var int timestamp
+	 */
 	public $end_date;
 
 	/**
@@ -117,10 +152,10 @@ class WC_Admin_Report {
 
 			switch ( $type ) {
 				case 'meta' :
-					$joins["meta_{$key}"] = "{$join_type} JOIN {$wpdb->postmeta} AS meta_{$key} ON ( posts.ID = meta_{$key}.post_id AND meta_{$key}.meta_key = '{$key}' )";
+					$joins[ "meta_{$key}" ] = "{$join_type} JOIN {$wpdb->postmeta} AS meta_{$key} ON ( posts.ID = meta_{$key}.post_id AND meta_{$key}.meta_key = '{$key}' )";
 					break;
 				case 'parent_meta' :
-					$joins["parent_meta_{$key}"] = "{$join_type} JOIN {$wpdb->postmeta} AS parent_meta_{$key} ON (posts.post_parent = parent_meta_{$key}.post_id) AND (parent_meta_{$key}.meta_key = '{$key}')";
+					$joins[ "parent_meta_{$key}" ] = "{$join_type} JOIN {$wpdb->postmeta} AS parent_meta_{$key} ON (posts.post_parent = parent_meta_{$key}.post_id) AND (parent_meta_{$key}.meta_key = '{$key}')";
 					break;
 				case 'order_item_meta' :
 					$joins["order_items"] = "{$join_type} JOIN {$wpdb->prefix}woocommerce_order_items AS order_items ON (posts.ID = order_items.order_id)";
@@ -129,7 +164,7 @@ class WC_Admin_Report {
 						$joins["order_items"] .= " AND (order_items.order_item_type = '{$value['order_item_type']}')";
 					}
 
-					$joins["order_item_meta_{$key}"]  = "{$join_type} JOIN {$wpdb->prefix}woocommerce_order_itemmeta AS order_item_meta_{$key} ON " .
+					$joins[ "order_item_meta_{$key}" ]  = "{$join_type} JOIN {$wpdb->prefix}woocommerce_order_itemmeta AS order_item_meta_{$key} ON " .
 														"(order_items.order_item_id = order_item_meta_{$key}.order_item_id) " .
 														" AND (order_item_meta_{$key}.meta_key = '{$key}')";
 					break;
@@ -151,11 +186,11 @@ class WC_Admin_Report {
 				if ( 'order_item_meta' === $type ) {
 
 					$joins["order_items"] = "{$join_type} JOIN {$wpdb->prefix}woocommerce_order_items AS order_items ON posts.ID = order_items.order_id";
-					$joins["order_item_meta_{$key}"] = "{$join_type} JOIN {$wpdb->prefix}woocommerce_order_itemmeta AS order_item_meta_{$key} ON order_items.order_item_id = order_item_meta_{$key}.order_item_id";
+					$joins[ "order_item_meta_{$key}" ] = "{$join_type} JOIN {$wpdb->prefix}woocommerce_order_itemmeta AS order_item_meta_{$key} ON order_items.order_item_id = order_item_meta_{$key}.order_item_id";
 
 				} else {
 					// If we have a where clause for meta, join the postmeta table
-					$joins["meta_{$key}"] = "{$join_type} JOIN {$wpdb->postmeta} AS meta_{$key} ON posts.ID = meta_{$key}.post_id";
+					$joins[ "meta_{$key}" ] = "{$join_type} JOIN {$wpdb->postmeta} AS meta_{$key} ON posts.ID = meta_{$key}.post_id";
 				}
 			}
 		}
@@ -185,14 +220,12 @@ class WC_Admin_Report {
 		}
 
 		if ( $filter_range ) {
-
 			$query['where'] .= "
-				AND 	posts.post_date >= '" . date('Y-m-d', $this->start_date ) . "'
-				AND 	posts.post_date < '" . date('Y-m-d', strtotime( '+1 DAY', $this->end_date ) ) . "'
+				AND 	posts.post_date >= '" . date( 'Y-m-d H:i:s', $this->start_date ) . "'
+				AND 	posts.post_date < '" . date( 'Y-m-d H:i:s', strtotime( '+1 DAY', $this->end_date ) ) . "'
 			";
 		}
 
-
 		if ( ! empty( $where_meta ) ) {
 
 			$relation = isset( $where_meta['relation'] ) ? $where_meta['relation'] : 'AND';
@@ -207,14 +240,14 @@ class WC_Admin_Report {
 
 				$key = is_array( $value['meta_key'] ) ? $value['meta_key'][0] . '_array' : $value['meta_key'];
 
-				if ( strtolower( $value['operator'] ) == 'in' ) {
+				if ( strtolower( $value['operator'] ) == 'in' || strtolower( $value['operator'] ) == 'not in' ) {
 
 					if ( is_array( $value['meta_value'] ) ) {
 						$value['meta_value'] = implode( "','", $value['meta_value'] );
 					}
 
 					if ( ! empty( $value['meta_value'] ) ) {
-						$where_value = "IN ('{$value['meta_value']}')";
+						$where_value = "{$value['operator']} ('{$value['meta_value']}')";
 					}
 				} else {
 					$where_value = "{$value['operator']} '{$value['meta_value']}'";
@@ -225,7 +258,7 @@ class WC_Admin_Report {
 						$query['where'] .= ' ' . $relation;
 					}
 
-					if ( isset( $value['type'] ) && $value['type'] == 'order_item_meta' ) {
+					if ( isset( $value['type'] ) && 'order_item_meta' === $value['type'] ) {
 
 						if ( is_array( $value['meta_key'] ) ) {
 							$query['where'] .= " ( order_item_meta_{$key}.meta_key   IN ('" . implode( "','", $value['meta_key'] ) . "')";
@@ -254,21 +287,22 @@ class WC_Admin_Report {
 
 			foreach ( $where as $value ) {
 
-				if ( strtolower( $value['operator'] ) == 'in' ) {
+				if ( strtolower( $value['operator'] ) == 'in' || strtolower( $value['operator'] ) == 'not in' ) {
 
 					if ( is_array( $value['value'] ) ) {
 						$value['value'] = implode( "','", $value['value'] );
 					}
 
 					if ( ! empty( $value['value'] ) ) {
-						$where_value = "IN ('{$value['value']}')";
+						$where_value = "{$value['operator']} ('{$value['value']}')";
 					}
 				} else {
 					$where_value = "{$value['operator']} '{$value['value']}'";
 				}
 
-				if ( ! empty( $where_value ) )
+				if ( ! empty( $where_value ) ) {
 					$query['where'] .= " AND {$value['key']} {$where_value}";
+				}
 			}
 		}
 
@@ -291,7 +325,7 @@ class WC_Admin_Report {
 
 		if ( $debug ) {
 			echo '<pre>';
-			print_r( $query );
+			wc_print_r( $query );
 			echo '</pre>';
 		}
 
@@ -316,25 +350,37 @@ class WC_Admin_Report {
 	 * @param  int $interval
 	 * @param  string $start_date
 	 * @param  string $group_by
-	 * @return string
+	 * @return array
 	 */
 	public function prepare_chart_data( $data, $date_key, $data_key, $interval, $start_date, $group_by ) {
 		$prepared_data = array();
 
-		// Ensure all days (or months) have values first in this range
-		for ( $i = 0; $i <= $interval; $i ++ ) {
-			switch ( $group_by ) {
-				case 'day' :
-					$time = strtotime( date( 'Ymd', strtotime( "+{$i} DAY", $start_date ) ) ) . '000';
-				break;
-				case 'month' :
-				default :
-					$time = strtotime( date( 'Ym', strtotime( "+{$i} MONTH", $start_date ) ) . '01' ) . '000';
-				break;
-			}
+		// Ensure all days (or months) have values in this range.
+		if ( 'day' === $group_by ) {
+			for ( $i = 0; $i <= $interval; $i ++ ) {
+				$time = strtotime( date( 'Ymd', strtotime( "+{$i} DAY", $start_date ) ) ) . '000';
 
-			if ( ! isset( $prepared_data[ $time ] ) ) {
-				$prepared_data[ $time ] = array( esc_js( $time ), 0 );
+				if ( ! isset( $prepared_data[ $time ] ) ) {
+					$prepared_data[ $time ] = array( esc_js( $time ), 0 );
+				}
+			}
+		} else {
+			$current_yearnum  = date( 'Y', $start_date );
+			$current_monthnum = date( 'm', $start_date );
+
+			for ( $i = 0; $i <= $interval; $i ++ ) {
+				$time = strtotime( $current_yearnum . str_pad( $current_monthnum, 2, '0', STR_PAD_LEFT ) . '01' ) . '000';
+
+				if ( ! isset( $prepared_data[ $time ] ) ) {
+					$prepared_data[ $time ] = array( esc_js( $time ), 0 );
+				}
+
+				$current_monthnum ++;
+
+				if ( $current_monthnum > 12 ) {
+					$current_monthnum = 1;
+					$current_yearnum  ++;
+				}
 			}
 		}
 
@@ -374,7 +420,7 @@ class WC_Admin_Report {
 	public function sales_sparkline( $id = '', $days = 7, $type = 'sales' ) {
 
 		if ( $id ) {
-			$meta_key = $type == 'sales' ? '_line_total' : '_qty';
+			$meta_key = ( 'sales' === $type ) ? '_line_total' : '_qty';
 
 			$data = $this->get_order_report_data( array(
 				'data' => array(
@@ -382,35 +428,35 @@ class WC_Admin_Report {
 						'type'            => 'order_item_meta',
 						'order_item_type' => 'line_item',
 						'function'        => '',
-						'name'            => 'product_id'
+						'name'            => 'product_id',
 					),
 					$meta_key => array(
 						'type'            => 'order_item_meta',
 						'order_item_type' => 'line_item',
 						'function'        => 'SUM',
-						'name'            => 'sparkline_value'
+						'name'            => 'sparkline_value',
 					),
 					'post_date' => array(
 						'type'     => 'post_data',
 						'function' => '',
-						'name'     => 'post_date'
+						'name'     => 'post_date',
 					),
 				),
 				'where' => array(
 					array(
 						'key'      => 'post_date',
 						'value'    => date( 'Y-m-d', strtotime( 'midnight -' . ( $days - 1 ) . ' days', current_time( 'timestamp' ) ) ),
-						'operator' => '>'
+						'operator' => '>',
 					),
 					array(
 						'key'      => 'order_item_meta__product_id.meta_value',
 						'value'    => $id,
-						'operator' => '='
-					)
+						'operator' => '=',
+					),
 				),
 				'group_by'     => 'YEAR(posts.post_date), MONTH(posts.post_date), DAY(posts.post_date)',
 				'query_type'   => 'get_results',
-				'filter_range' => false
+				'filter_range' => false,
 			) );
 		} else {
 
@@ -419,24 +465,24 @@ class WC_Admin_Report {
 					'_order_total' => array(
 						'type'     => 'meta',
 						'function' => 'SUM',
-						'name'     => 'sparkline_value'
+						'name'     => 'sparkline_value',
 					),
 					'post_date' => array(
 						'type'     => 'post_data',
 						'function' => '',
-						'name'     => 'post_date'
+						'name'     => 'post_date',
 					),
 				),
 				'where' => array(
 					array(
 						'key'      => 'post_date',
 						'value'    => date( 'Y-m-d', strtotime( 'midnight -' . ( $days - 1 ) . ' days', current_time( 'timestamp' ) ) ),
-						'operator' => '>'
-					)
+						'operator' => '>',
+					),
 				),
 				'group_by'     => 'YEAR(posts.post_date), MONTH(posts.post_date), DAY(posts.post_date)',
 				'query_type'   => 'get_results',
-				'filter_range' => false
+				'filter_range' => false,
 			) );
 		}
 
@@ -445,15 +491,17 @@ class WC_Admin_Report {
 			$total += $d->sparkline_value;
 		}
 
-		if ( $type == 'sales' ) {
-			$tooltip = sprintf( __( 'Sold %s worth in the last %d days', 'woocommerce' ), strip_tags( wc_price( $total ) ), $days );
+		if ( 'sales' === $type ) {
+			/* translators: 1: total income 2: days */
+			$tooltip = sprintf( __( 'Sold %1$s worth in the last %2$d days', 'woocommerce' ), strip_tags( wc_price( $total ) ), $days );
 		} else {
-			$tooltip = sprintf( _n( 'Sold 1 item in the last %d days', 'Sold %d items in the last %d days', $total, 'woocommerce' ), $total, $days );
+			/* translators: 1: total items sold 2: days */
+			$tooltip = sprintf( _n( 'Sold 1 item in the last %2$d days', 'Sold %1$d items in the last %2$d days', $total, 'woocommerce' ), $total, $days );
 		}
 
 		$sparkline_data = array_values( $this->prepare_chart_data( $data, 'post_date', 'sparkline_value', $days - 1, strtotime( 'midnight -' . ( $days - 1 ) . ' days', current_time( 'timestamp' ) ), 'day' ) );
 
-		return '<span class="wc_sparkline ' . ( $type == 'sales' ? 'lines' : 'bars' ) . ' tips" data-color="#777" data-tip="' . esc_attr( $tooltip ) . '" data-barwidth="' . 60*60*16*1000 . '" data-sparkline="' . esc_attr( json_encode( $sparkline_data ) ) . '"></span>';
+		return '<span class="wc_sparkline ' . ( ( 'sales' === $type ) ? 'lines' : 'bars' ) . ' tips" data-color="#777" data-tip="' . esc_attr( $tooltip ) . '" data-barwidth="' . 60 * 60 * 16 * 1000 . '" data-sparkline="' . esc_attr( json_encode( $sparkline_data ) ) . '"></span>';
 	}
 
 	/**
@@ -466,11 +514,13 @@ class WC_Admin_Report {
 		switch ( $current_range ) {
 
 			case 'custom' :
-				$this->start_date = strtotime( sanitize_text_field( $_GET['start_date'] ) );
-				$this->end_date   = strtotime( 'midnight', strtotime( sanitize_text_field( $_GET['end_date'] ) ) );
 
-				if ( ! $this->end_date ) {
-					$this->end_date = current_time('timestamp');
+				$this->start_date = max( strtotime( '-20 years' ), strtotime( sanitize_text_field( $_GET['start_date'] ) ) );
+
+				if ( empty( $_GET['end_date'] ) ) {
+					$this->end_date = strtotime( 'midnight', current_time( 'timestamp' ) );
+				} else {
+					$this->end_date = strtotime( 'midnight', strtotime( sanitize_text_field( $_GET['end_date'] ) ) );
 				}
 
 				$interval = 0;
@@ -489,7 +539,7 @@ class WC_Admin_Report {
 			break;
 
 			case 'year' :
-				$this->start_date    = strtotime( date( 'Y-01-01', current_time('timestamp') ) );
+				$this->start_date    = strtotime( date( 'Y-01-01', current_time( 'timestamp' ) ) );
 				$this->end_date      = strtotime( 'midnight', current_time( 'timestamp' ) );
 				$this->chart_groupby = 'month';
 			break;
@@ -502,7 +552,7 @@ class WC_Admin_Report {
 			break;
 
 			case 'month' :
-				$this->start_date    = strtotime( date( 'Y-m-01', current_time('timestamp') ) );
+				$this->start_date    = strtotime( date( 'Y-m-01', current_time( 'timestamp' ) ) );
 				$this->end_date      = strtotime( 'midnight', current_time( 'timestamp' ) );
 				$this->chart_groupby = 'day';
 			break;
@@ -519,16 +569,16 @@ class WC_Admin_Report {
 
 			case 'day' :
 				$this->group_by_query = 'YEAR(posts.post_date), MONTH(posts.post_date), DAY(posts.post_date)';
-				$this->chart_interval = ceil( max( 0, ( $this->end_date - $this->start_date ) / ( 60 * 60 * 24 ) ) );
+				$this->chart_interval = absint( ceil( max( 0, ( $this->end_date - $this->start_date ) / ( 60 * 60 * 24 ) ) ) );
 				$this->barwidth       = 60 * 60 * 24 * 1000;
 			break;
 
 			case 'month' :
 				$this->group_by_query = 'YEAR(posts.post_date), MONTH(posts.post_date)';
 				$this->chart_interval = 0;
-				$min_date             = $this->start_date;
+				$min_date             = strtotime( date( 'Y-m-01', $this->start_date ) );
 
-				while ( ( $min_date   = strtotime( "+1 MONTH", $min_date ) ) <= $this->end_date ) {
+				while ( ( $min_date = strtotime( "+1 MONTH", $min_date ) ) <= $this->end_date ) {
 					$this->chart_interval ++;
 				}
 
@@ -543,16 +593,20 @@ class WC_Admin_Report {
 	 * @return string
 	 */
 	public function get_currency_tooltip() {
-		switch( get_option( 'woocommerce_currency_pos' ) ) {
+		switch ( get_option( 'woocommerce_currency_pos' ) ) {
 			case 'right':
-				$currency_tooltip = 'append_tooltip: "' . get_woocommerce_currency_symbol() . '"'; break;
+				$currency_tooltip = 'append_tooltip: "' . get_woocommerce_currency_symbol() . '"';
+				break;
 			case 'right_space':
-				$currency_tooltip = 'append_tooltip: "&nbsp;' . get_woocommerce_currency_symbol() . '"'; break;
+				$currency_tooltip = 'append_tooltip: "&nbsp;' . get_woocommerce_currency_symbol() . '"';
+				break;
 			case 'left':
-				$currency_tooltip = 'prepend_tooltip: "' . get_woocommerce_currency_symbol() . '"'; break;
+				$currency_tooltip = 'prepend_tooltip: "' . get_woocommerce_currency_symbol() . '"';
+				break;
 			case 'left_space':
 			default:
-				$currency_tooltip = 'prepend_tooltip: "' . get_woocommerce_currency_symbol() . '&nbsp;"'; break;
+				$currency_tooltip = 'prepend_tooltip: "' . get_woocommerce_currency_symbol() . '&nbsp;"';
+				break;
 		}
 
 		return $currency_tooltip;
@@ -575,7 +629,7 @@ class WC_Admin_Report {
 	}
 
 	/**
-	 * [get_chart_widgets description].
+	 * Get chart widgets.
 	 *
 	 * @return array
 	 */
@@ -592,4 +646,21 @@ class WC_Admin_Report {
 	 * Output the report.
 	 */
 	public function output_report() {}
+
+	/**
+	 * Check nonce for current range.
+	 *
+	 * @since  3.0.4
+	 * @param  string $current_range Current range.
+	 */
+	public function check_current_range_nonce( $current_range ) {
+		if ( 'custom' !== $current_range ) {
+			return;
+		}
+
+		if ( ! isset( $_GET['wc_reports_nonce'] ) || ! wp_verify_nonce( $_GET['wc_reports_nonce'], 'custom_range' ) ) {
+			wp_safe_redirect( remove_query_arg( array( 'start_date', 'end_date', 'range', 'wc_reports_nonce' ) ) );
+			exit;
+		}
+	}
 }
diff --git a/includes/admin/reports/class-wc-report-coupon-usage.php b/includes/admin/reports/class-wc-report-coupon-usage.php
index 8aa1d030d10..2df70e25fb8 100644
--- a/includes/admin/reports/class-wc-report-coupon-usage.php
+++ b/includes/admin/reports/class-wc-report-coupon-usage.php
@@ -1,4 +1,9 @@
 <?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+
 /**
  * WC_Report_Coupon_Usage
  *
@@ -10,11 +15,15 @@
 class WC_Report_Coupon_Usage extends WC_Admin_Report {
 
 	/**
+	 * Chart colors.
+	 *
 	 * @var array
 	 */
 	public $chart_colours = array();
 
 	/**
+	 * Coupon codes.
+	 *
 	 * @var array
 	 */
 	public $coupon_codes = array();
@@ -44,15 +53,15 @@ class WC_Report_Coupon_Usage extends WC_Admin_Report {
 					'type'            => 'order_item_meta',
 					'order_item_type' => 'coupon',
 					'function'        => 'SUM',
-					'name'            => 'discount_amount'
-				)
+					'name'            => 'discount_amount',
+				),
 			),
 			'where' => array(
 				array(
 					'key'      => 'order_item_type',
 					'value'    => 'coupon',
-					'operator' => '='
-				)
+					'operator' => '=',
+				),
 			),
 			'query_type'   => 'get_var',
 			'filter_range' => true,
@@ -65,15 +74,15 @@ class WC_Report_Coupon_Usage extends WC_Admin_Report {
 					'type'            => 'order_item',
 					'order_item_type' => 'coupon',
 					'function'        => 'COUNT',
-					'name'            => 'order_coupon_count'
-				)
+					'name'            => 'order_coupon_count',
+				),
 			),
 			'where' => array(
 				array(
 					'key'      => 'order_item_type',
 					'value'    => 'coupon',
-					'operator' => '='
-				)
+					'operator' => '=',
+				),
 			),
 			'query_type'   => 'get_var',
 			'filter_range' => true,
@@ -85,7 +94,7 @@ class WC_Report_Coupon_Usage extends WC_Admin_Report {
 				'type'     => 'order_item',
 				'key'      => 'order_item_name',
 				'value'    => $this->coupon_codes,
-				'operator' => 'IN'
+				'operator' => 'IN',
 			);
 
 			$total_discount_query['where'][] = $coupon_code_query;
@@ -96,15 +105,17 @@ class WC_Report_Coupon_Usage extends WC_Admin_Report {
 		$total_coupons  = absint( $this->get_order_report_data( $total_coupons_query ) );
 
 		$legend[] = array(
+			/* translators: %s: discount amount */
 			'title' => sprintf( __( '%s discounts in total', 'woocommerce' ), '<strong>' . wc_price( $total_discount ) . '</strong>' ),
 			'color' => $this->chart_colours['discount_amount'],
-			'highlight_series' => 1
+			'highlight_series' => 1,
 		);
 
 		$legend[] = array(
-			'title' => sprintf( __( '%d coupons used in total', 'woocommerce' ), '<strong>' . $total_coupons . '</strong>' ),
-			'color' => $this->chart_colours['coupon_count' ],
-			'highlight_series' => 0
+			/* translators: %s: coupons amount */
+			'title' => sprintf( __( '%s coupons used in total', 'woocommerce' ), '<strong>' . $total_coupons . '</strong>' ),
+			'color' => $this->chart_colours['coupon_count'],
+			'highlight_series' => 0,
 		);
 
 		return $legend;
@@ -117,9 +128,9 @@ class WC_Report_Coupon_Usage extends WC_Admin_Report {
 
 		$ranges = array(
 			'year'         => __( 'Year', 'woocommerce' ),
-			'last_month'   => __( 'Last Month', 'woocommerce' ),
-			'month'        => __( 'This Month', 'woocommerce' ),
-			'7day'         => __( 'Last 7 Days', 'woocommerce' )
+			'last_month'   => __( 'Last month', 'woocommerce' ),
+			'month'        => __( 'This month', 'woocommerce' ),
+			'7day'         => __( 'Last 7 days', 'woocommerce' ),
 		);
 
 		$this->chart_colours = array(
@@ -133,13 +144,14 @@ class WC_Report_Coupon_Usage extends WC_Admin_Report {
 			$current_range = '7day';
 		}
 
+		$this->check_current_range_nonce( $current_range );
 		$this->calculate_current_range( $current_range );
 
-		include( WC()->plugin_path() . '/includes/admin/views/html-report-by-date.php');
+		include( WC()->plugin_path() . '/includes/admin/views/html-report-by-date.php' );
 	}
 
 	/**
-	 * [get_chart_widgets description].
+	 * Get chart widgets.
 	 *
 	 * @return array
 	 */
@@ -148,14 +160,14 @@ class WC_Report_Coupon_Usage extends WC_Admin_Report {
 
 		$widgets[] = array(
 			'title'    => '',
-			'callback' => array( $this, 'coupons_widget' )
+			'callback' => array( $this, 'coupons_widget' ),
 		);
 
 		return $widgets;
 	}
 
 	/**
-	 * Product selection.
+	 * Output coupons widget.
 	 */
 	public function coupons_widget() {
 		?>
@@ -171,21 +183,21 @@ class WC_Report_Coupon_Usage extends WC_Admin_Report {
 									'order_item_type' => 'coupon',
 									'function'        => '',
 									'distinct'        => true,
-									'name'            => 'order_item_name'
-								)
+									'name'            => 'order_item_name',
+								),
 							),
 							'where' => array(
 								array(
 									'key'      => 'order_item_type',
 									'value'    => 'coupon',
-									'operator' => '='
-								)
+									'operator' => '=',
+								),
 							),
 							'query_type'   => 'get_col',
-							'filter_range' => false
+							'filter_range' => false,
 						) );
 
-						if ( ! is_null( $used_coupons ) ) :
+						if ( ! empty( $used_coupons ) && is_array( $used_coupons ) ) :
 					?>
 						<select id="coupon_codes" name="coupon_codes" class="wc-enhanced-select" data-placeholder="<?php esc_attr_e( 'Choose coupons&hellip;', 'woocommerce' ); ?>" style="width:100%;">
 							<option value=""><?php _e( 'All coupons', 'woocommerce' ); ?></option>
@@ -196,19 +208,19 @@ class WC_Report_Coupon_Usage extends WC_Admin_Report {
 							 ?>
 						</select>
 						<input type="submit" class="submit button" value="<?php esc_attr_e( 'Show', 'woocommerce' ); ?>" />
-						<input type="hidden" name="range" value="<?php if ( ! empty( $_GET['range'] ) ) echo esc_attr( $_GET['range'] ) ?>" />
-						<input type="hidden" name="start_date" value="<?php if ( ! empty( $_GET['start_date'] ) ) echo esc_attr( $_GET['start_date'] ) ?>" />
-						<input type="hidden" name="end_date" value="<?php if ( ! empty( $_GET['end_date'] ) ) echo esc_attr( $_GET['end_date'] ) ?>" />
-						<input type="hidden" name="page" value="<?php if ( ! empty( $_GET['page'] ) ) echo esc_attr( $_GET['page'] ) ?>" />
-						<input type="hidden" name="tab" value="<?php if ( ! empty( $_GET['tab'] ) ) echo esc_attr( $_GET['tab'] ) ?>" />
-						<input type="hidden" name="report" value="<?php if ( ! empty( $_GET['report'] ) ) echo esc_attr( $_GET['report'] ) ?>" />
+						<input type="hidden" name="range" value="<?php echo ( ! empty( $_GET['range'] ) ) ? esc_attr( $_GET['range'] ) : ''; ?>" />
+						<input type="hidden" name="start_date" value="<?php echo ( ! empty( $_GET['start_date'] ) ) ? esc_attr( $_GET['start_date'] ) : ''; ?>" />
+						<input type="hidden" name="end_date" value="<?php echo ( ! empty( $_GET['end_date'] ) ) ? esc_attr( $_GET['end_date'] ) : ''; ?>" />
+						<input type="hidden" name="page" value="<?php echo ( ! empty( $_GET['page'] ) ) ? esc_attr( $_GET['page'] ) : ''; ?>" />
+						<input type="hidden" name="tab" value="<?php echo ( ! empty( $_GET['tab'] ) ) ? esc_attr( $_GET['tab'] ) : ''; ?>" />
+						<input type="hidden" name="report" value="<?php echo ( ! empty( $_GET['report'] ) ) ? esc_attr( $_GET['report'] ) : ''; ?>" />
 					<?php else : ?>
 						<span><?php _e( 'No used coupons found', 'woocommerce' ); ?></span>
 					<?php endif; ?>
 				</div>
 			</form>
 		</div>
-		<h4 class="section_title"><span><?php _e( 'Most Popular', 'woocommerce' ); ?></span></h4>
+		<h4 class="section_title"><span><?php _e( 'Most popular', 'woocommerce' ); ?></span></h4>
 		<div class="section">
 			<table cellspacing="0">
 				<?php
@@ -218,13 +230,13 @@ class WC_Report_Coupon_Usage extends WC_Admin_Report {
 							'type'            => 'order_item',
 							'order_item_type' => 'coupon',
 							'function'        => '',
-							'name'            => 'coupon_code'
+							'name'            => 'coupon_code',
 						),
 						'order_item_id' => array(
 							'type'            => 'order_item',
 							'order_item_type' => 'coupon',
 							'function'        => 'COUNT',
-							'name'            => 'coupon_count'
+							'name'            => 'coupon_count',
 						),
 					),
 					'where' => array(
@@ -232,17 +244,17 @@ class WC_Report_Coupon_Usage extends WC_Admin_Report {
 							'type'     => 'order_item',
 							'key'      => 'order_item_type',
 							'value'    => 'coupon',
-							'operator' => '='
-						)
+							'operator' => '=',
+						),
 					),
 					'order_by'     => 'coupon_count DESC',
 					'group_by'     => 'order_item_name',
 					'limit'        => 12,
 					'query_type'   => 'get_results',
-					'filter_range' => true
+					'filter_range' => true,
 				) );
 
-				if ( ! is_null( $most_popular ) ) {
+				if ( ! empty( $most_popular ) && is_array( $most_popular ) ) {
 					foreach ( $most_popular as $coupon ) {
 						echo '<tr class="' . ( in_array( $coupon->coupon_code, $this->coupon_codes ) ? 'active' : '' ) . '">
 							<td class="count" width="1%">' . $coupon->coupon_count . '</td>
@@ -255,7 +267,7 @@ class WC_Report_Coupon_Usage extends WC_Admin_Report {
 				?>
 			</table>
 		</div>
-		<h4 class="section_title"><span><?php _e( 'Most Discount', 'woocommerce' ); ?></span></h4>
+		<h4 class="section_title"><span><?php _e( 'Most discount', 'woocommerce' ); ?></span></h4>
 		<div class="section">
 			<table cellspacing="0">
 				<?php
@@ -265,32 +277,31 @@ class WC_Report_Coupon_Usage extends WC_Admin_Report {
 							'type'            => 'order_item',
 							'order_item_type' => 'coupon',
 							'function'        => '',
-							'name'            => 'coupon_code'
+							'name'            => 'coupon_code',
 						),
 						'discount_amount' => array(
 							'type'            => 'order_item_meta',
 							'order_item_type' => 'coupon',
 							'function'        => 'SUM',
-							'name'            => 'discount_amount'
-						)
+							'name'            => 'discount_amount',
+						),
 					),
 					'where' => array(
 						array(
 							'type'     => 'order_item',
 							'key'      => 'order_item_type',
 							'value'    => 'coupon',
-							'operator' => '='
-						)
+							'operator' => '=',
+						),
 					),
 					'order_by'     => 'discount_amount DESC',
 					'group_by'     => 'order_item_name',
 					'limit'        => 12,
 					'query_type'   => 'get_results',
-					'filter_range' => true
+					'filter_range' => true,
 				) );
 
-				if ( ! is_null( $most_discount ) ) {
-
+				if ( ! empty( $most_discount ) && is_array( $most_discount ) ) {
 					foreach ( $most_discount as $coupon ) {
 						echo '<tr class="' . ( in_array( $coupon->coupon_code, $this->coupon_codes ) ? 'active' : '' ) . '">
 							<td class="count" width="1%">' . wc_price( $coupon->discount_amount ) . '</td>
@@ -335,7 +346,7 @@ class WC_Report_Coupon_Usage extends WC_Admin_Report {
 		?>
 		<a
 			href="#"
-			download="report-<?php echo esc_attr( $current_range ); ?>-<?php echo date_i18n( 'Y-m-d', current_time('timestamp') ); ?>.csv"
+			download="report-<?php echo esc_attr( $current_range ); ?>-<?php echo date_i18n( 'Y-m-d', current_time( 'timestamp' ) ); ?>.csv"
 			class="export_csv"
 			data-export="chart"
 			data-xaxes="<?php esc_attr_e( 'Date', 'woocommerce' ); ?>"
@@ -361,26 +372,26 @@ class WC_Report_Coupon_Usage extends WC_Admin_Report {
 					'type'            => 'order_item',
 					'order_item_type' => 'coupon',
 					'function'        => 'COUNT',
-					'name'            => 'order_coupon_count'
+					'name'            => 'order_coupon_count',
 				),
 				'post_date' => array(
 					'type'     => 'post_data',
 					'function' => '',
-					'name'     => 'post_date'
+					'name'     => 'post_date',
 				),
 			),
 			'where' => array(
 				array(
 					'key'      => 'order_item_type',
 					'value'    => 'coupon',
-					'operator' => '='
-				)
+					'operator' => '=',
+				),
 			),
 			'group_by'     => $this->group_by_query,
 			'order_by'     => 'post_date ASC',
 			'query_type'   => 'get_results',
 			'filter_range' => true,
-			'order_types'  => wc_get_order_types( 'order-count' )
+			'order_types'  => wc_get_order_types( 'order-count' ),
 		);
 
 		$order_discount_amounts_query = array(
@@ -389,26 +400,26 @@ class WC_Report_Coupon_Usage extends WC_Admin_Report {
 					'type'            => 'order_item_meta',
 					'order_item_type' => 'coupon',
 					'function'        => 'SUM',
-					'name'            => 'discount_amount'
+					'name'            => 'discount_amount',
 				),
 				'post_date' => array(
 					'type'     => 'post_data',
 					'function' => '',
-					'name'     => 'post_date'
+					'name'     => 'post_date',
 				),
 			),
 			'where' => array(
 				array(
 					'key'      => 'order_item_type',
 					'value'    => 'coupon',
-					'operator' => '='
-				)
+					'operator' => '=',
+				),
 			),
 			'group_by'     => $this->group_by_query . ', order_item_name',
 			'order_by'     => 'post_date ASC',
 			'query_type'   => 'get_results',
 			'filter_range' => true,
-			'order_types'  => wc_get_order_types( 'order-count' )
+			'order_types'  => wc_get_order_types( 'order-count' ),
 		);
 
 		if ( ! empty( $this->coupon_codes ) ) {
@@ -416,7 +427,7 @@ class WC_Report_Coupon_Usage extends WC_Admin_Report {
 				'type'     => 'order_item',
 				'key'      => 'order_item_name',
 				'value'    => $this->coupon_codes,
-				'operator' => 'IN'
+				'operator' => 'IN',
 			);
 
 			$order_coupon_counts_query['where'][]    = $coupon_code_query;
@@ -433,7 +444,7 @@ class WC_Report_Coupon_Usage extends WC_Admin_Report {
 		// Encode in json format
 		$chart_data = json_encode( array(
 			'order_coupon_counts'    => array_values( $order_coupon_counts ),
-			'order_discount_amounts' => array_values( $order_discount_amounts )
+			'order_discount_amounts' => array_values( $order_discount_amounts ),
 		) );
 		?>
 		<div class="chart-container">
@@ -450,8 +461,8 @@ class WC_Report_Coupon_Usage extends WC_Admin_Report {
 						{
 							label: "<?php echo esc_js( __( 'Number of coupons used', 'woocommerce' ) ) ?>",
 							data: order_data.order_coupon_counts,
-							color: '<?php echo $this->chart_colours['coupon_count' ]; ?>',
-							bars: { fillColor: '<?php echo $this->chart_colours['coupon_count' ]; ?>', fill: true, show: true, lineWidth: 0, barWidth: <?php echo $this->barwidth; ?> * 0.5, align: 'center' },
+							color: '<?php echo $this->chart_colours['coupon_count']; ?>',
+							bars: { fillColor: '<?php echo $this->chart_colours['coupon_count']; ?>', fill: true, show: true, lineWidth: 0, barWidth: <?php echo $this->barwidth; ?> * 0.5, align: 'center' },
 							shadowSize: 0,
 							hoverable: false
 						},
@@ -498,7 +509,7 @@ class WC_Report_Coupon_Usage extends WC_Admin_Report {
 								position: "bottom",
 								tickColor: 'transparent',
 								mode: "time",
-								timeformat: "<?php if ( $this->chart_groupby == 'day' ) echo '%d %b'; else echo '%b'; ?>",
+								timeformat: "<?php echo ( 'day' === $this->chart_groupby ) ? '%d %b' : '%b'; ?>",
 								monthNames: <?php echo json_encode( array_values( $wp_locale->month_abbrev ) ) ?>,
 								tickLength: 1,
 								minTickSize: [1, "<?php echo $this->chart_groupby; ?>"],
diff --git a/includes/admin/reports/class-wc-report-customer-list.php b/includes/admin/reports/class-wc-report-customer-list.php
index c911c7ba177..96e0e7019b7 100644
--- a/includes/admin/reports/class-wc-report-customer-list.php
+++ b/includes/admin/reports/class-wc-report-customer-list.php
@@ -19,14 +19,14 @@ if ( ! class_exists( 'WP_List_Table' ) ) {
 class WC_Report_Customer_List extends WP_List_Table {
 
 	/**
-	 * __construct function.
+	 * Constructor.
 	 */
 	public function __construct() {
 
 		parent::__construct( array(
-			'singular'  => __( 'Customer', 'woocommerce' ),
-			'plural'    => __( 'Customers', 'woocommerce' ),
-			'ajax'      => false
+			'singular'  => 'customer',
+			'plural'    => 'customers',
+			'ajax'      => false,
 		) );
 	}
 
@@ -71,13 +71,13 @@ class WC_Report_Customer_List extends WP_List_Table {
 	}
 
 	/**
-	 * column_default function.
+	 * Get column value.
 	 *
 	 * @param WP_User $user
 	 * @param string $column_name
 	 * @return string
 	 */
-	function column_default( $user, $column_name ) {
+	public function column_default( $user, $column_name ) {
 		global $wpdb;
 
 		switch ( $column_name ) {
@@ -125,25 +125,15 @@ class WC_Report_Customer_List extends WP_List_Table {
 
 			case 'last_order' :
 
-				$order_ids = get_posts( array(
-					'posts_per_page' => 1,
-					'post_type'      => 'shop_order',
-					'orderby'        => 'date',
-					'order'          => 'desc',
-					'post_status'    => array( 'wc-completed', 'wc-processing' ),
-					'meta_query' => array(
-						array(
-							'key'     => '_customer_user',
-							'value'   => $user->ID
-						)
-					),
-					'fields' => 'ids'
+				$orders = wc_get_orders( array(
+					'limit'    => 1,
+					'status'   => array_map( 'wc_get_order_status_name', wc_get_is_paid_statuses() ),
+					'customer' => $user->ID,
 				) );
 
-				if ( $order_ids ) {
-					$order = wc_get_order( $order_ids[0] );
-
-					return '<a href="' . admin_url( 'post.php?post=' . $order->id . '&action=edit' ) . '">' . _x( '#', 'hash before order number', 'woocommerce' ) . $order->get_order_number() . '</a> &ndash; ' . date_i18n( get_option( 'date_format' ), strtotime( $order->order_date ) );
+				if ( ! empty( $orders ) ) {
+					$order = $orders[0];
+					return '<a href="' . admin_url( 'post.php?post=' . $order->get_id() . '&action=edit' ) . '">' . _x( '#', 'hash before order number', 'woocommerce' ) . $order->get_order_number() . '</a> &ndash; ' . wc_format_datetime( $order->get_date_created() );
 				} else {
 					return '-';
 				}
@@ -161,44 +151,32 @@ class WC_Report_Customer_List extends WP_List_Table {
 						$actions['refresh'] = array(
 							'url'       => wp_nonce_url( add_query_arg( 'refresh', $user->ID ), 'refresh' ),
 							'name'      => __( 'Refresh stats', 'woocommerce' ),
-							'action'    => "refresh"
+							'action'    => "refresh",
 						);
 
 						$actions['edit'] = array(
 							'url'       => admin_url( 'user-edit.php?user_id=' . $user->ID ),
 							'name'      => __( 'Edit', 'woocommerce' ),
-							'action'    => "edit"
+							'action'    => "edit",
 						);
 
 						$actions['view'] = array(
 							'url'       => admin_url( 'edit.php?post_type=shop_order&_customer_user=' . $user->ID ),
 							'name'      => __( 'View orders', 'woocommerce' ),
-							'action'    => "view"
+							'action'    => "view",
 						);
 
-						$order_ids = get_posts( array(
-							'posts_per_page' => 1,
-							'post_type'   => wc_get_order_types(),
-							'post_status' => array_keys( wc_get_order_statuses() ),
-							'meta_query' => array(
-								array(
-									'key'     => '_customer_user',
-									'value'   => array( 0, '' ),
-									'compare' => 'IN'
-								),
-								array(
-									'key'     => '_billing_email',
-									'value'   => $user->user_email
-								)
-							),
-							'fields' => 'ids'
+						$orders = wc_get_orders( array(
+							'limit'          => 1,
+							'status'         => array_map( 'wc_get_order_status_name', wc_get_is_paid_statuses() ),
+							'customer'       => array( array( 0, $user->user_email ) ),
 						) );
 
-						if ( $order_ids ) {
+						if ( $orders ) {
 							$actions['link'] = array(
 								'url'       => wp_nonce_url( add_query_arg( 'link_orders', $user->ID ), 'link_orders' ),
 								'name'      => __( 'Link previous orders', 'woocommerce' ),
-								'action'    => "link"
+								'action'    => "link",
 							);
 						}
 
@@ -221,18 +199,20 @@ class WC_Report_Customer_List extends WP_List_Table {
 	}
 
 	/**
-	 * get_columns function.
+	 * Get columns.
+	 *
+	 * @return array
 	 */
-	public function get_columns(){
+	public function get_columns() {
 		$columns = array(
 			'customer_name'   => __( 'Name (Last, First)', 'woocommerce' ),
 			'username'        => __( 'Username', 'woocommerce' ),
 			'email'           => __( 'Email', 'woocommerce' ),
 			'location'        => __( 'Location', 'woocommerce' ),
 			'orders'          => __( 'Orders', 'woocommerce' ),
-			'spent'           => __( 'Money Spent', 'woocommerce' ),
+			'spent'           => __( 'Money spent', 'woocommerce' ),
 			'last_order'      => __( 'Last order', 'woocommerce' ),
-			'user_actions'    => __( 'Actions', 'woocommerce' )
+			'user_actions'    => __( 'Actions', 'woocommerce' ),
 		);
 
 		return $columns;
@@ -240,6 +220,8 @@ class WC_Report_Customer_List extends WP_List_Table {
 
 	/**
 	 * Order users by name.
+	 *
+	 * @param WP_User_Query $query
 	 */
 	public function order_by_last_name( $query ) {
 		global $wpdb;
@@ -260,7 +242,7 @@ class WC_Report_Customer_List extends WP_List_Table {
 	}
 
 	/**
-	 * prepare_items function.
+	 * Prepare customer list items.
 	 */
 	public function prepare_items() {
 		global $wpdb;
@@ -281,21 +263,21 @@ class WC_Report_Customer_List extends WP_List_Table {
 		$admin_users = new WP_User_Query(
 			array(
 				'role'   => 'administrator1',
-				'fields' => 'ID'
+				'fields' => 'ID',
 			)
 		);
 
 		$manager_users = new WP_User_Query(
 			array(
 				'role'   => 'shop_manager',
-				'fields' => 'ID'
+				'fields' => 'ID',
 			)
 		);
 
 		$query = new WP_User_Query( array(
 			'exclude' => array_merge( $admin_users->get_results(), $manager_users->get_results() ),
 			'number'  => $per_page,
-			'offset'  => ( $current_page - 1 ) * $per_page
+			'offset'  => ( $current_page - 1 ) * $per_page,
 		) );
 
 		$this->items = $query->get_results();
@@ -308,7 +290,7 @@ class WC_Report_Customer_List extends WP_List_Table {
 		$this->set_pagination_args( array(
 			'total_items' => $query->total_users,
 			'per_page'    => $per_page,
-			'total_pages' => ceil( $query->total_users / $per_page )
+			'total_pages' => ceil( $query->total_users / $per_page ),
 		) );
 	}
 }
diff --git a/includes/admin/reports/class-wc-report-customers.php b/includes/admin/reports/class-wc-report-customers.php
index 4eb85d92a8d..2386e9dd326 100644
--- a/includes/admin/reports/class-wc-report-customers.php
+++ b/includes/admin/reports/class-wc-report-customers.php
@@ -1,4 +1,9 @@
 <?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+
 /**
  * WC_Report_Customers
  *
@@ -9,7 +14,18 @@
  */
 class WC_Report_Customers extends WC_Admin_Report {
 
+	/**
+	 * Chart colors.
+	 *
+	 * @var array
+	 */
 	public $chart_colours = array();
+
+	/**
+	 * Customers.
+	 *
+	 * @var array
+	 */
 	public $customers = array();
 
 	/**
@@ -21,16 +37,17 @@ class WC_Report_Customers extends WC_Admin_Report {
 		$legend   = array();
 
 		$legend[] = array(
+			/* translators: %s: signups amount */
 			'title' => sprintf( __( '%s signups in this period', 'woocommerce' ), '<strong>' . sizeof( $this->customers ) . '</strong>' ),
 			'color' => $this->chart_colours['signups'],
-			'highlight_series' => 2
+			'highlight_series' => 2,
 		);
 
 		return $legend;
 	}
 
 	/**
-	 * [get_chart_widgets description].
+	 * Get chart widgets.
 	 *
 	 * @return array
 	 */
@@ -39,14 +56,14 @@ class WC_Report_Customers extends WC_Admin_Report {
 
 		$widgets[] = array(
 			'title'    => '',
-			'callback' => array( $this, 'customers_vs_guests' )
+			'callback' => array( $this, 'customers_vs_guests' ),
 		);
 
 		return $widgets;
 	}
 
 	/**
-	 * customers_vs_guests.
+	 * Output customers vs guests chart.
 	 */
 	public function customers_vs_guests() {
 
@@ -55,17 +72,17 @@ class WC_Report_Customers extends WC_Admin_Report {
 				'ID' => array(
 					'type'     => 'post_data',
 					'function' => 'COUNT',
-					'name'     => 'total_orders'
-				)
+					'name'     => 'total_orders',
+				),
 			),
 			'where_meta' => array(
 				array(
 					'meta_key'   => '_customer_user',
 					'meta_value' => '0',
-					'operator'   => '>'
-				)
+					'operator'   => '>',
+				),
 			),
-			'filter_range' => true
+			'filter_range' => true,
 		) );
 
 		$guest_order_totals = $this->get_order_report_data( array(
@@ -73,24 +90,24 @@ class WC_Report_Customers extends WC_Admin_Report {
 				'ID' => array(
 					'type'     => 'post_data',
 					'function' => 'COUNT',
-					'name'     => 'total_orders'
-				)
+					'name'     => 'total_orders',
+				),
 			),
 			'where_meta' => array(
 				array(
 					'meta_key'   => '_customer_user',
 					'meta_value' => '0',
-					'operator'   => '='
-				)
+					'operator'   => '=',
+				),
 			),
-			'filter_range' => true
+			'filter_range' => true,
 		) );
 		?>
 		<div class="chart-container">
 			<div class="chart-placeholder customers_vs_guests pie-chart" style="height:200px"></div>
 			<ul class="pie-chart-legend">
-				<li style="border-color: <?php echo $this->chart_colours['customers']; ?>"><?php _e( 'Customer Sales', 'woocommerce' ); ?></li>
-				<li style="border-color: <?php echo $this->chart_colours['guests']; ?>"><?php _e( 'Guest Sales', 'woocommerce' ); ?></li>
+				<li style="border-color: <?php echo $this->chart_colours['customers']; ?>"><?php _e( 'Customer sales', 'woocommerce' ); ?></li>
+				<li style="border-color: <?php echo $this->chart_colours['guests']; ?>"><?php _e( 'Guest sales', 'woocommerce' ); ?></li>
 			</ul>
 		</div>
 		<script type="text/javascript">
@@ -99,12 +116,12 @@ class WC_Report_Customers extends WC_Admin_Report {
 					jQuery('.chart-placeholder.customers_vs_guests'),
 					[
 						{
-							label: '<?php _e( 'Customer Orders', 'woocommerce' ); ?>',
+							label: '<?php _e( 'Customer orders', 'woocommerce' ); ?>',
 							data:  "<?php echo $customer_order_totals->total_orders ?>",
 							color: '<?php echo $this->chart_colours['customers']; ?>'
 						},
 						{
-							label: '<?php _e( 'Guest Orders', 'woocommerce' ); ?>',
+							label: '<?php _e( 'Guest orders', 'woocommerce' ); ?>',
 							data:  "<?php echo $guest_order_totals->total_orders ?>",
 							color: '<?php echo $this->chart_colours['guests']; ?>'
 						}
@@ -144,15 +161,15 @@ class WC_Report_Customers extends WC_Admin_Report {
 
 		$ranges = array(
 			'year'         => __( 'Year', 'woocommerce' ),
-			'last_month'   => __( 'Last Month', 'woocommerce' ),
-			'month'        => __( 'This Month', 'woocommerce' ),
-			'7day'         => __( 'Last 7 Days', 'woocommerce' )
+			'last_month'   => __( 'Last month', 'woocommerce' ),
+			'month'        => __( 'This month', 'woocommerce' ),
+			'7day'         => __( 'Last 7 days', 'woocommerce' ),
 		);
 
 		$this->chart_colours = array(
 			'signups'   => '#3498db',
 			'customers' => '#1abc9c',
-			'guests'    => '#8fdece'
+			'guests'    => '#8fdece',
 		);
 
 		$current_range = ! empty( $_GET['range'] ) ? sanitize_text_field( $_GET['range'] ) : '7day';
@@ -161,26 +178,27 @@ class WC_Report_Customers extends WC_Admin_Report {
 			$current_range = '7day';
 		}
 
+		$this->check_current_range_nonce( $current_range );
 		$this->calculate_current_range( $current_range );
 
 		$admin_users = new WP_User_Query(
 			array(
 				'role'   => 'administrator',
-				'fields' => 'ID'
+				'fields' => 'ID',
 			)
 		);
 
 		$manager_users = new WP_User_Query(
 			array(
 				'role'   => 'shop_manager',
-				'fields' => 'ID'
+				'fields' => 'ID',
 			)
 		);
 
 		$users_query = new WP_User_Query(
 			array(
 				'fields'  => array( 'user_registered' ),
-				'exclude' => array_merge( $admin_users->get_results(), $manager_users->get_results() )
+				'exclude' => array_merge( $admin_users->get_results(), $manager_users->get_results() ),
 			)
 		);
 
@@ -204,7 +222,7 @@ class WC_Report_Customers extends WC_Admin_Report {
 		?>
 		<a
 			href="#"
-			download="report-<?php echo esc_attr( $current_range ); ?>-<?php echo date_i18n( 'Y-m-d', current_time('timestamp') ); ?>.csv"
+			download="report-<?php echo esc_attr( $current_range ); ?>-<?php echo date_i18n( 'Y-m-d', current_time( 'timestamp' ) ); ?>.csv"
 			class="export_csv"
 			data-export="chart"
 			data-xaxes="<?php esc_attr_e( 'Date', 'woocommerce' ); ?>"
@@ -216,9 +234,7 @@ class WC_Report_Customers extends WC_Admin_Report {
 	}
 
 	/**
-	 * Get the main chart.
-	 *
-	 * @return string
+	 * Output the main chart.
 	 */
 	public function get_main_chart() {
 		global $wp_locale;
@@ -228,25 +244,25 @@ class WC_Report_Customers extends WC_Admin_Report {
 				'ID' => array(
 					'type'     => 'post_data',
 					'function' => 'COUNT',
-					'name'     => 'total_orders'
+					'name'     => 'total_orders',
 				),
 				'post_date' => array(
 					'type'     => 'post_data',
 					'function' => '',
-					'name'     => 'post_date'
+					'name'     => 'post_date',
 				),
 			),
 			'where_meta' => array(
 				array(
 					'meta_key'   => '_customer_user',
 					'meta_value' => '0',
-					'operator'   => '>'
-				)
+					'operator'   => '>',
+				),
 			),
 			'group_by'     => $this->group_by_query,
 			'order_by'     => 'post_date ASC',
 			'query_type'   => 'get_results',
-			'filter_range' => true
+			'filter_range' => true,
 		) );
 
 		$guest_orders = $this->get_order_report_data( array(
@@ -254,25 +270,25 @@ class WC_Report_Customers extends WC_Admin_Report {
 				'ID' => array(
 					'type'     => 'post_data',
 					'function' => 'COUNT',
-					'name'     => 'total_orders'
+					'name'     => 'total_orders',
 				),
 				'post_date' => array(
 					'type'     => 'post_data',
 					'function' => '',
-					'name'     => 'post_date'
+					'name'     => 'post_date',
 				),
 			),
 			'where_meta' => array(
 				array(
 					'meta_key'   => '_customer_user',
 					'meta_value' => '0',
-					'operator'   => '='
-				)
+					'operator'   => '=',
+				),
 			),
 			'group_by'     => $this->group_by_query,
 			'order_by'     => 'post_date ASC',
 			'query_type'   => 'get_results',
-			'filter_range' => true
+			'filter_range' => true,
 		) );
 
 		$signups         = $this->prepare_chart_data( $this->customers, 'user_registered', '', $this->chart_interval, $this->start_date, $this->chart_groupby );
@@ -283,7 +299,7 @@ class WC_Report_Customers extends WC_Admin_Report {
 		$chart_data = json_encode( array(
 			'signups'         => array_values( $signups ),
 			'customer_orders' => array_values( $customer_orders ),
-			'guest_orders'    => array_values( $guest_orders )
+			'guest_orders'    => array_values( $guest_orders ),
 		) );
 		?>
 		<div class="chart-container">
@@ -298,7 +314,7 @@ class WC_Report_Customers extends WC_Admin_Report {
 				var drawGraph = function( highlight ) {
 					var series = [
 							{
-								label: "<?php echo esc_js( __( 'Customer Orders', 'woocommerce' ) ) ?>",
+								label: "<?php echo esc_js( __( 'Customer orders', 'woocommerce' ) ) ?>",
 								data: chart_data.customer_orders,
 								color: '<?php echo $this->chart_colours['customers']; ?>',
 								bars: { fillColor: '<?php echo $this->chart_colours['customers']; ?>', fill: true, show: true, lineWidth: 0, barWidth: <?php echo $this->barwidth; ?> * 0.5, align: 'center' },
@@ -308,7 +324,7 @@ class WC_Report_Customers extends WC_Admin_Report {
 								stack: true,
 							},
 							{
-								label: "<?php echo esc_js( __( 'Guest Orders', 'woocommerce' ) ) ?>",
+								label: "<?php echo esc_js( __( 'Guest orders', 'woocommerce' ) ) ?>",
 								data: chart_data.guest_orders,
 								color: '<?php echo $this->chart_colours['guests']; ?>',
 								bars: { fillColor: '<?php echo $this->chart_colours['guests']; ?>', fill: true, show: true, lineWidth: 0, barWidth: <?php echo $this->barwidth; ?> * 0.5, align: 'center' },
@@ -361,7 +377,7 @@ class WC_Report_Customers extends WC_Admin_Report {
 								position: "bottom",
 								tickColor: 'transparent',
 								mode: "time",
-								timeformat: "<?php if ( $this->chart_groupby == 'day' ) echo '%d %b'; else echo '%b'; ?>",
+								timeformat: "<?php echo ( 'day' === $this->chart_groupby ) ? '%d %b' : '%b'; ?>",
 								monthNames: <?php echo json_encode( array_values( $wp_locale->month_abbrev ) ) ?>,
 								tickLength: 1,
 								minTickSize: [1, "<?php echo $this->chart_groupby; ?>"],
diff --git a/includes/admin/reports/class-wc-report-low-in-stock.php b/includes/admin/reports/class-wc-report-low-in-stock.php
index 9c7d4028b99..48e047e5d9e 100644
--- a/includes/admin/reports/class-wc-report-low-in-stock.php
+++ b/includes/admin/reports/class-wc-report-low-in-stock.php
@@ -5,7 +5,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 }
 
 if ( ! class_exists( 'WC_Report_Stock' ) ) {
-	require_once( 'class-wc-report-stock.php' );
+	require_once( dirname( __FILE__ ) . '/class-wc-report-stock.php' );
 }
 
 /**
@@ -27,6 +27,9 @@ class WC_Report_Low_In_Stock extends WC_Report_Stock {
 
 	/**
 	 * Get Products matching stock criteria.
+	 *
+	 * @param int $current_page
+	 * @param int $per_page
 	 */
 	public function get_items( $current_page, $per_page ) {
 		global $wpdb;
diff --git a/includes/admin/reports/class-wc-report-most-stocked.php b/includes/admin/reports/class-wc-report-most-stocked.php
index 0fa0586571a..5ca160e2d5b 100644
--- a/includes/admin/reports/class-wc-report-most-stocked.php
+++ b/includes/admin/reports/class-wc-report-most-stocked.php
@@ -5,7 +5,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 }
 
 if ( ! class_exists( 'WC_Report_Stock' ) ) {
-	require_once( 'class-wc-report-stock.php' );
+	require_once( dirname( __FILE__ ) . '/class-wc-report-stock.php' );
 }
 
 /**
@@ -20,6 +20,9 @@ class WC_Report_Most_Stocked extends WC_Report_Stock {
 
 	/**
 	 * Get Products matching stock criteria.
+	 *
+	 * @param int $current_page
+	 * @param int $per_page
 	 */
 	public function get_items( $current_page, $per_page ) {
 		global $wpdb;
diff --git a/includes/admin/reports/class-wc-report-out-of-stock.php b/includes/admin/reports/class-wc-report-out-of-stock.php
index ca01b32ddf3..0205e954f37 100644
--- a/includes/admin/reports/class-wc-report-out-of-stock.php
+++ b/includes/admin/reports/class-wc-report-out-of-stock.php
@@ -5,7 +5,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 }
 
 if ( ! class_exists( 'WC_Report_Stock' ) ) {
-	require_once( 'class-wc-report-stock.php' );
+	require_once( dirname( __FILE__ ) . '/class-wc-report-stock.php' );
 }
 
 /**
@@ -27,6 +27,9 @@ class WC_Report_Out_Of_Stock extends WC_Report_Stock {
 
 	/**
 	 * Get Products matching stock criteria.
+	 *
+	 * @param int $current_page
+	 * @param int $per_page
 	 */
 	public function get_items( $current_page, $per_page ) {
 		global $wpdb;
diff --git a/includes/admin/reports/class-wc-report-sales-by-category.php b/includes/admin/reports/class-wc-report-sales-by-category.php
index ca7bb14ecaf..390a6b22210 100644
--- a/includes/admin/reports/class-wc-report-sales-by-category.php
+++ b/includes/admin/reports/class-wc-report-sales-by-category.php
@@ -1,4 +1,9 @@
 <?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+
 /**
  * WC_Report_Sales_By_Category
  *
@@ -9,9 +14,32 @@
  */
 class WC_Report_Sales_By_Category extends WC_Admin_Report {
 
+	/**
+	 * Chart colors.
+	 *
+	 * @var array
+	 */
 	public $chart_colours         = array();
+
+	/**
+	 * Categories ids.
+	 *
+	 * @var array
+	 */
 	public $show_categories       = array();
+
+	/**
+	 * Item sales.
+	 *
+	 * @var array
+	 */
 	private $item_sales           = array();
+
+	/**
+	 * Item sales and times.
+	 *
+	 * @var array
+	 */
 	private $item_sales_and_times = array();
 
 	/**
@@ -44,7 +72,7 @@ class WC_Report_Sales_By_Category extends WC_Admin_Report {
 	 */
 	public function get_chart_legend() {
 
-		if ( ! $this->show_categories ) {
+		if ( empty( $this->show_categories ) ) {
 			return array();
 		}
 
@@ -65,9 +93,10 @@ class WC_Report_Sales_By_Category extends WC_Admin_Report {
 			}
 
 			$legend[] = array(
-				'title'            => sprintf( __( '%s sales in %s', 'woocommerce' ), '<strong>' . wc_price( $total ) . '</strong>', $category->name ),
-				'color'            => isset( $this->chart_colours[ $index ] ) ? $this->chart_colours[ $index ] : $this->chart_colours[ 0 ],
-				'highlight_series' => $index
+				/* translators: 1: total items sold 2: category name */
+				'title'            => sprintf( __( '%1$s sales in %2$s', 'woocommerce' ), '<strong>' . wc_price( $total ) . '</strong>', $category->name ),
+				'color'            => isset( $this->chart_colours[ $index ] ) ? $this->chart_colours[ $index ] : $this->chart_colours[0],
+				'highlight_series' => $index,
 			);
 
 			$index++;
@@ -83,9 +112,9 @@ class WC_Report_Sales_By_Category extends WC_Admin_Report {
 
 		$ranges = array(
 			'year'         => __( 'Year', 'woocommerce' ),
-			'last_month'   => __( 'Last Month', 'woocommerce' ),
-			'month'        => __( 'This Month', 'woocommerce' ),
-			'7day'         => __( 'Last 7 Days', 'woocommerce' )
+			'last_month'   => __( 'Last month', 'woocommerce' ),
+			'month'        => __( 'This month', 'woocommerce' ),
+			'7day'         => __( 'Last 7 days', 'woocommerce' ),
 		);
 
 		$this->chart_colours = array( '#3498db', '#34495e', '#1abc9c', '#2ecc71', '#f1c40f', '#e67e22', '#e74c3c', '#2980b9', '#8e44ad', '#2c3e50', '#16a085', '#27ae60', '#f39c12', '#d35400', '#c0392b' );
@@ -96,33 +125,34 @@ class WC_Report_Sales_By_Category extends WC_Admin_Report {
 			$current_range = '7day';
 		}
 
+		$this->check_current_range_nonce( $current_range );
 		$this->calculate_current_range( $current_range );
 
 		// Get item sales data
-		if ( $this->show_categories ) {
+		if ( ! empty( $this->show_categories ) ) {
 			$order_items = $this->get_order_report_data( array(
 				'data' => array(
 					'_product_id' => array(
 						'type'            => 'order_item_meta',
 						'order_item_type' => 'line_item',
 						'function'        => '',
-						'name'            => 'product_id'
+						'name'            => 'product_id',
 					),
 					'_line_total' => array(
 						'type'            => 'order_item_meta',
 						'order_item_type' => 'line_item',
 						'function'        => 'SUM',
-						'name'            => 'order_item_amount'
+						'name'            => 'order_item_amount',
 					),
 					'post_date' => array(
 						'type'     => 'post_data',
 						'function' => '',
-						'name'     => 'post_date'
+						'name'     => 'post_date',
 					),
 				),
 				'group_by'     => 'ID, product_id, post_date',
 				'query_type'   => 'get_results',
-				'filter_range' => true
+				'filter_range' => true,
 			) );
 
 			$this->item_sales           = array();
@@ -153,7 +183,7 @@ class WC_Report_Sales_By_Category extends WC_Admin_Report {
 	}
 
 	/**
-	 * [get_chart_widgets description].
+	 * Get chart widgets.
 	 *
 	 * @return array
 	 */
@@ -162,13 +192,13 @@ class WC_Report_Sales_By_Category extends WC_Admin_Report {
 		return array(
 			array(
 				'title'    => __( 'Categories', 'woocommerce' ),
-				'callback' => array( $this, 'category_widget' )
-			)
+				'callback' => array( $this, 'category_widget' ),
+			),
 		);
 	}
 
 	/**
-	 * Category selection.
+	 * Output category widget.
 	 */
 	public function category_widget() {
 
@@ -193,16 +223,16 @@ class WC_Report_Sales_By_Category extends WC_Admin_Report {
 				<a href="#" class="select_none"><?php _e( 'None', 'woocommerce' ); ?></a>
 				<a href="#" class="select_all"><?php _e( 'All', 'woocommerce' ); ?></a>
 				<input type="submit" class="submit button" value="<?php esc_attr_e( 'Show', 'woocommerce' ); ?>" />
-				<input type="hidden" name="range" value="<?php if ( ! empty( $_GET['range'] ) ) echo esc_attr( $_GET['range'] ) ?>" />
-				<input type="hidden" name="start_date" value="<?php if ( ! empty( $_GET['start_date'] ) ) echo esc_attr( $_GET['start_date'] ) ?>" />
-				<input type="hidden" name="end_date" value="<?php if ( ! empty( $_GET['end_date'] ) ) echo esc_attr( $_GET['end_date'] ) ?>" />
-				<input type="hidden" name="page" value="<?php if ( ! empty( $_GET['page'] ) ) echo esc_attr( $_GET['page'] ) ?>" />
-				<input type="hidden" name="tab" value="<?php if ( ! empty( $_GET['tab'] ) ) echo esc_attr( $_GET['tab'] ) ?>" />
-				<input type="hidden" name="report" value="<?php if ( ! empty( $_GET['report'] ) ) echo esc_attr( $_GET['report'] ) ?>" />
+				<input type="hidden" name="range" value="<?php echo ( ! empty( $_GET['range'] ) ) ? esc_attr( $_GET['range'] ) : ''; ?>" />
+				<input type="hidden" name="start_date" value="<?php echo ( ! empty( $_GET['start_date'] ) ) ? esc_attr( $_GET['start_date'] ) : ''; ?>" />
+				<input type="hidden" name="end_date" value="<?php echo ( ! empty( $_GET['end_date'] ) ) ? esc_attr( $_GET['end_date'] ) : ''; ?>" />
+				<input type="hidden" name="page" value="<?php echo ( ! empty( $_GET['page'] ) ) ? esc_attr( $_GET['page'] ) : ''; ?>" />
+				<input type="hidden" name="tab" value="<?php echo ( ! empty( $_GET['tab'] ) ) ? esc_attr( $_GET['tab'] ) : ''; ?>" />
+				<input type="hidden" name="report" value="<?php echo ( ! empty( $_GET['report'] ) ) ? esc_attr( $_GET['report'] ) : ''; ?>" />
 			</div>
 			<script type="text/javascript">
 				jQuery(function(){
-					// Select all/none
+					// Select all/None
 					jQuery( '.chart-widget' ).on( 'click', '.select_all', function() {
 						jQuery(this).closest( 'div' ).find( 'select option' ).attr( 'selected', 'selected' );
 						jQuery(this).closest( 'div' ).find('select').change();
@@ -229,7 +259,7 @@ class WC_Report_Sales_By_Category extends WC_Admin_Report {
 		?>
 		<a
 			href="#"
-			download="report-<?php echo esc_attr( $current_range ); ?>-<?php echo date_i18n( 'Y-m-d', current_time('timestamp') ); ?>.csv"
+			download="report-<?php echo esc_attr( $current_range ); ?>-<?php echo date_i18n( 'Y-m-d', current_time( 'timestamp' ) ); ?>.csv"
 			class="export_csv"
 			data-export="chart"
 			data-xaxes="<?php esc_attr_e( 'Date', 'woocommerce' ); ?>"
@@ -248,10 +278,10 @@ class WC_Report_Sales_By_Category extends WC_Admin_Report {
 	public function get_main_chart() {
 		global $wp_locale;
 
-		if ( ! $this->show_categories ) {
+		if ( empty( $this->show_categories ) ) {
 			?>
 			<div class="chart-container">
-				<p class="chart-prompt"><?php _e( '&larr; Choose a category to view stats', 'woocommerce' ); ?></p>
+				<p class="chart-prompt"><?php _e( 'Choose a category to view stats', 'woocommerce' ); ?></p>
 			</div>
 			<?php
 		} else {
@@ -291,7 +321,7 @@ class WC_Report_Sales_By_Category extends WC_Admin_Report {
 				$chart_data[ $category->term_id ]['category'] = $category->name;
 				$chart_data[ $category->term_id ]['data'] = $category_chart_data;
 
-				$index ++;
+				$index++;
 			}
 			?>
 			<div class="chart-container">
@@ -368,7 +398,7 @@ class WC_Report_Sales_By_Category extends WC_Admin_Report {
 									position: "bottom",
 									tickColor: 'transparent',
 									mode: "time",
-									timeformat: "<?php if ( $this->chart_groupby == 'day' ) echo '%d %b'; else echo '%b'; ?>",
+									timeformat: "<?php echo ( 'day' === $this->chart_groupby ) ? '%d %b' : '%b'; ?>",
 									monthNames: <?php echo json_encode( array_values( $wp_locale->month_abbrev ) ); ?>,
 									tickLength: 1,
 									minTickSize: [1, "<?php echo $this->chart_groupby; ?>"],
diff --git a/includes/admin/reports/class-wc-report-sales-by-date.php b/includes/admin/reports/class-wc-report-sales-by-date.php
index 973ab70b543..df4ef13acdf 100644
--- a/includes/admin/reports/class-wc-report-sales-by-date.php
+++ b/includes/admin/reports/class-wc-report-sales-by-date.php
@@ -1,4 +1,9 @@
 <?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+
 /**
  * WC_Report_Sales_By_Date
  *
@@ -9,12 +14,23 @@
  */
 class WC_Report_Sales_By_Date extends WC_Admin_Report {
 
+	/**
+	 * Chart colors.
+	 *
+	 * @var array
+	 */
 	public $chart_colours = array();
+
+	/**
+	 * The report data.
+	 *
+	 * @var stdClass
+	 */
 	private $report_data;
 
 	/**
 	 * Get report data.
-	 * @return array
+	 * @return stdClass
 	 */
 	public function get_report_data() {
 		if ( empty( $this->report_data ) ) {
@@ -40,15 +56,15 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
 				'post_date' => array(
 					'type'     => 'post_data',
 					'function' => '',
-					'name'     => 'post_date'
-				)
+					'name'     => 'post_date',
+				),
 			),
 			'group_by'            => $this->group_by_query,
 			'order_by'            => 'post_date ASC',
 			'query_type'          => 'get_results',
 			'filter_range'        => true,
 			'order_types'         => wc_get_order_types( 'order-count' ),
-			'order_status'        => array( 'completed', 'processing', 'on-hold', 'refunded' )
+			'order_status'        => array( 'completed', 'processing', 'on-hold', 'refunded' ),
 		) );
 
 		$this->report_data->coupons = (array) $this->get_order_report_data( array(
@@ -56,33 +72,33 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
 				'order_item_name' => array(
 					'type'     => 'order_item',
 					'function' => '',
-					'name'     => 'order_item_name'
+					'name'     => 'order_item_name',
 				),
 				'discount_amount' => array(
 					'type'            => 'order_item_meta',
 					'order_item_type' => 'coupon',
 					'function'        => 'SUM',
-					'name'            => 'discount_amount'
+					'name'            => 'discount_amount',
 				),
 				'post_date' => array(
 					'type'     => 'post_data',
 					'function' => '',
-					'name'     => 'post_date'
+					'name'     => 'post_date',
 				),
 			),
 			'where' => array(
 				array(
 					'key'      => 'order_items.order_item_type',
 					'value'    => 'coupon',
-					'operator' => '='
-				)
+					'operator' => '=',
+				),
 			),
 			'group_by'     => $this->group_by_query . ', order_item_name',
 			'order_by'     => 'post_date ASC',
 			'query_type'   => 'get_results',
 			'filter_range' => true,
 			'order_types'  => wc_get_order_types( 'order-count' ),
-			'order_status' => array( 'completed', 'processing', 'on-hold', 'refunded' )
+			'order_status' => array( 'completed', 'processing', 'on-hold', 'refunded' ),
 		) );
 
 		// All items from orders - even those refunded
@@ -92,20 +108,20 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
 					'type'            => 'order_item_meta',
 					'order_item_type' => 'line_item',
 					'function'        => 'SUM',
-					'name'            => 'order_item_count'
+					'name'            => 'order_item_count',
 				),
 				'post_date' => array(
 					'type'     => 'post_data',
 					'function' => '',
-					'name'     => 'post_date'
+					'name'     => 'post_date',
 				),
 			),
 			'where' => array(
 				array(
 					'key'      => 'order_items.order_item_type',
 					'value'    => 'line_item',
-					'operator' => '='
-				)
+					'operator' => '=',
+				),
 			),
 			'group_by'            => $this->group_by_query,
 			'order_by'            => 'post_date ASC',
@@ -124,20 +140,20 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
 					'type'            => 'order_item_meta',
 					'order_item_type' => 'line_item',
 					'function'        => 'SUM',
-					'name'            => 'order_item_count'
-				)
+					'name'            => 'order_item_count',
+				),
 			),
 			'where' => array(
 				array(
 					'key'      => 'order_items.order_item_type',
 					'value'    => 'line_item',
-					'operator' => '='
-				)
+					'operator' => '=',
+				),
 			),
 			'query_type'          => 'get_var',
 			'filter_range'        => true,
 			'order_types'         => wc_get_order_types( 'order-count' ),
-			'order_status'        => array( 'refunded' )
+			'order_status'        => array( 'refunded' ),
 		) ) );
 
 		/**
@@ -148,35 +164,35 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
 				'_order_total' => array(
 					'type'     => 'meta',
 					'function' => 'SUM',
-					'name'     => 'total_sales'
+					'name'     => 'total_sales',
 				),
 				'_order_shipping' => array(
 					'type'     => 'meta',
 					'function' => 'SUM',
-					'name'     => 'total_shipping'
+					'name'     => 'total_shipping',
 				),
 				'_order_tax' => array(
 					'type'     => 'meta',
 					'function' => 'SUM',
-					'name'     => 'total_tax'
+					'name'     => 'total_tax',
 				),
 				'_order_shipping_tax' => array(
 					'type'     => 'meta',
 					'function' => 'SUM',
-					'name'     => 'total_shipping_tax'
+					'name'     => 'total_shipping_tax',
 				),
 				'post_date' => array(
 					'type'     => 'post_data',
 					'function' => '',
-					'name'     => 'post_date'
+					'name'     => 'post_date',
 				),
 			),
 			'group_by'            => $this->group_by_query,
 			'order_by'            => 'post_date ASC',
 			'query_type'          => 'get_results',
 			'filter_range'        => true,
-			'order_types'         => wc_get_order_types( 'sales-reports' ), // Orders, not refunds
-			'order_status'        => array( 'completed', 'processing', 'on-hold', 'refunded' )
+			'order_types'         => wc_get_order_types( 'sales-reports' ),
+			'order_status'        => array( 'completed', 'processing', 'on-hold', 'refunded' ),
 		) );
 
 		/**
@@ -188,34 +204,34 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
 				'_order_total' => array(
 					'type'     => 'parent_meta',
 					'function' => '',
-					'name'     => 'total_refund'
+					'name'     => 'total_refund',
 				),
 				'_order_shipping' => array(
 					'type'     => 'parent_meta',
 					'function' => '',
-					'name'     => 'total_shipping'
+					'name'     => 'total_shipping',
 				),
 				'_order_tax' => array(
 					'type'     => 'parent_meta',
 					'function' => '',
-					'name'     => 'total_tax'
+					'name'     => 'total_tax',
 				),
 				'_order_shipping_tax' => array(
 					'type'     => 'parent_meta',
 					'function' => '',
-					'name'     => 'total_shipping_tax'
+					'name'     => 'total_shipping_tax',
 				),
 				'post_date' => array(
 					'type'     => 'post_data',
 					'function' => '',
-					'name'     => 'post_date'
-				)
+					'name'     => 'post_date',
+				),
 			),
 			'group_by'            => 'posts.post_parent',
 			'query_type'          => 'get_results',
 			'filter_range'        => true,
 			'order_status'        => false,
-			'parent_order_status' => array( 'refunded' )
+			'parent_order_status' => array( 'refunded' ),
 		) );
 
 		/**
@@ -226,50 +242,53 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
 				'ID' => array(
 					'type'     => 'post_data',
 					'function' => '',
-					'name'     => 'refund_id'
+					'name'     => 'refund_id',
 				),
 				'_refund_amount' => array(
 					'type'     => 'meta',
 					'function' => '',
-					'name'     => 'total_refund'
+					'name'     => 'total_refund',
 				),
 				'post_date' => array(
 					'type'     => 'post_data',
 					'function' => '',
-					'name'     => 'post_date'
+					'name'     => 'post_date',
 				),
 				'order_item_type' => array(
 					'type'      => 'order_item',
 					'function'  => '',
 					'name'      => 'item_type',
-					'join_type' => 'LEFT'
+					'join_type' => 'LEFT',
 				),
 				'_order_total' => array(
 					'type'     => 'meta',
 					'function' => '',
-					'name'     => 'total_sales'
+					'name'     => 'total_sales',
 				),
 				'_order_shipping' => array(
-					'type'     => 'meta',
-					'function' => '',
-					'name'     => 'total_shipping'
+					'type'      => 'meta',
+					'function'  => '',
+					'name'      => 'total_shipping',
+					'join_type' => 'LEFT',
 				),
 				'_order_tax' => array(
-					'type'     => 'meta',
-					'function' => '',
-					'name'     => 'total_tax'
+					'type'      => 'meta',
+					'function'  => '',
+					'name'      => 'total_tax',
+					'join_type' => 'LEFT',
 				),
 				'_order_shipping_tax' => array(
-					'type'     => 'meta',
-					'function' => '',
-					'name'     => 'total_shipping_tax'
+					'type'      => 'meta',
+					'function'  => '',
+					'name'      => 'total_shipping_tax',
+					'join_type' => 'LEFT',
 				),
 				'_qty' => array(
 					'type'            => 'order_item_meta',
 					'function'        => 'SUM',
 					'name'            => 'order_item_count',
-					'join_type'       => 'LEFT'
-				)
+					'join_type'       => 'LEFT',
+				),
 			),
 			'group_by'            => 'refund_id',
 			'order_by'            => 'post_date ASC',
@@ -280,30 +299,88 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
 		) );
 
 		/**
-		 * Total up values by combining full refunds and partial refunds for line items.
+		 * Refund lines - all partial refunds on all order types so we can plot full AND partial refunds on the chart.
 		 */
-		$this->report_data->total_tax_refunded          = wc_format_decimal( array_sum( wp_list_pluck( $this->report_data->full_refunds, 'total_tax' ) ), 2 );
-		$this->report_data->total_shipping_refunded     = wc_format_decimal( array_sum( wp_list_pluck( $this->report_data->full_refunds, 'total_shipping' ) ), 2 );
-		$this->report_data->total_shipping_tax_refunded = wc_format_decimal( array_sum( wp_list_pluck( $this->report_data->full_refunds, 'total_shipping_tax' ) ), 2 );
-		$this->report_data->total_refunds               = wc_format_decimal( array_sum( wp_list_pluck( $this->report_data->full_refunds, 'total_refund' ) ), 2 );
+		$this->report_data->refund_lines = (array) $this->get_order_report_data( array(
+			'data' => array(
+				'ID' => array(
+					'type'     => 'post_data',
+					'function' => '',
+					'name'     => 'refund_id',
+				),
+				'_refund_amount' => array(
+					'type'     => 'meta',
+					'function' => '',
+					'name'     => 'total_refund',
+				),
+				'post_date' => array(
+					'type'     => 'post_data',
+					'function' => '',
+					'name'     => 'post_date',
+				),
+				'order_item_type' => array(
+					'type'      => 'order_item',
+					'function'  => '',
+					'name'      => 'item_type',
+					'join_type' => 'LEFT',
+				),
+				'_order_total' => array(
+					'type'     => 'meta',
+					'function' => '',
+					'name'     => 'total_sales',
+				),
+				'_order_shipping' => array(
+					'type'      => 'meta',
+					'function'  => '',
+					'name'      => 'total_shipping',
+					'join_type' => 'LEFT',
+				),
+				'_order_tax' => array(
+					'type'      => 'meta',
+					'function'  => '',
+					'name'      => 'total_tax',
+					'join_type' => 'LEFT',
+				),
+				'_order_shipping_tax' => array(
+					'type'      => 'meta',
+					'function'  => '',
+					'name'      => 'total_shipping_tax',
+					'join_type' => 'LEFT',
+				),
+				'_qty' => array(
+					'type'            => 'order_item_meta',
+					'function'        => 'SUM',
+					'name'            => 'order_item_count',
+					'join_type'       => 'LEFT',
+				),
+			),
+			'group_by'            => 'refund_id',
+			'order_by'            => 'post_date ASC',
+			'query_type'          => 'get_results',
+			'filter_range'        => true,
+			'order_status'        => false,
+			'parent_order_status' => array( 'completed', 'processing', 'on-hold', 'refunded' ),
+		) );
 
 		/**
-		 * Loop over partial refunds and increase the above values.
+		 * Total up refunds. Note: when an order is fully refunded, a refund line will be added.
 		 */
-		foreach ( $this->report_data->partial_refunds as $key => $value ) {
-			switch ( $value->item_type ) {
-				case 'shipping' :
-					$this->report_data->total_shipping_tax_refunded += ( $value->total_shipping_tax * -1 );
-					$this->report_data->total_shipping_refunded     += wc_format_decimal( $value->total_refund, 2 );
-					$this->report_data->total_refunds               += $value->total_refund;
+		$this->report_data->total_tax_refunded          = 0;
+		$this->report_data->total_shipping_refunded     = 0;
+		$this->report_data->total_shipping_tax_refunded = 0;
+		$this->report_data->total_refunds               = 0;
 
+		$refunded_orders = array_merge( $this->report_data->partial_refunds, $this->report_data->full_refunds );
 
-					break;
-				case 'line_item' :
-					$this->report_data->total_tax_refunded   += ( $value->total_tax * -1 );
-					$this->report_data->refunded_order_items += absint( $value->order_item_count );
-					$this->report_data->total_refunds        += $value->total_refund;
-					break;
+		foreach ( $refunded_orders as $key => $value ) {
+			$this->report_data->total_tax_refunded          += ( $value->total_tax < 0 ? $value->total_tax * -1 : $value->total_tax );
+			$this->report_data->total_refunds               += $value->total_refund;
+			$this->report_data->total_shipping_tax_refunded += ( $value->total_shipping_tax < 0 ? $value->total_shipping_tax * -1 : $value->total_shipping_tax );
+			$this->report_data->total_shipping_refunded     += ( $value->total_shipping < 0 ? $value->total_shipping * -1 : $value->total_shipping );
+
+			// Only applies to parial.
+			if ( isset( $value->order_item_count ) ) {
+				$this->report_data->refunded_order_items    += ( $value->order_item_count < 0 ? $value->order_item_count * -1 : $value->order_item_count );
 			}
 		}
 
@@ -312,7 +389,7 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
 		$this->report_data->total_shipping     = wc_format_decimal( array_sum( wp_list_pluck( $this->report_data->orders, 'total_shipping' ) ) - $this->report_data->total_shipping_refunded, 2 );
 		$this->report_data->total_shipping_tax = wc_format_decimal( array_sum( wp_list_pluck( $this->report_data->orders, 'total_shipping_tax' ) ) - $this->report_data->total_shipping_tax_refunded, 2 );
 
-		// Total the refunds and sales amounts. Sales subract refunds.
+		// Total the refunds and sales amounts. Sales subract refunds. Note - total_sales also includes shipping costs.
 		$this->report_data->total_sales = wc_format_decimal( array_sum( wp_list_pluck( $this->report_data->orders, 'total_sales' ) ) - $this->report_data->total_refunds, 2 );
 		$this->report_data->net_sales   = wc_format_decimal( $this->report_data->total_sales - $this->report_data->total_shipping - $this->report_data->total_tax - $this->report_data->total_shipping_tax, 2 );
 
@@ -321,12 +398,15 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
 		$this->report_data->average_total_sales = wc_format_decimal( $this->report_data->total_sales / ( $this->chart_interval + 1 ), 2 );
 
 		// Total orders and discounts also includes those which have been refunded at some point
-		$this->report_data->total_orders          = absint( array_sum( wp_list_pluck( $this->report_data->order_counts, 'count' ) ) );
 		$this->report_data->total_coupons         = number_format( array_sum( wp_list_pluck( $this->report_data->coupons, 'discount_amount' ) ), 2, '.', '' );
 		$this->report_data->total_refunded_orders = absint( count( $this->report_data->full_refunds ) );
+		$this->report_data->total_orders          = absint( array_sum( wp_list_pluck( $this->report_data->order_counts, 'count' ) ) ) - $this->report_data->total_refunded_orders;
 
 		// Item counts
-		$this->report_data->total_items = absint( array_sum( wp_list_pluck( $this->report_data->order_items, 'order_item_count' ) ) );
+		$this->report_data->total_items = absint( array_sum( wp_list_pluck( $this->report_data->order_items, 'order_item_count' ) ) ) - $this->report_data->refunded_order_items;
+
+		// 3rd party filtering of report data
+		$this->report_data = apply_filters( 'woocommerce_admin_report_data', $this->report_data );
 	}
 
 	/**
@@ -339,69 +419,115 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
 
 		switch ( $this->chart_groupby ) {
 			case 'day' :
-				$average_total_sales_title = sprintf( __( '%s average gross daily sales', 'woocommerce' ), '<strong>' . wc_price( $data->average_total_sales ) . '</strong>' );
-				$average_sales_title       = sprintf( __( '%s average net daily sales', 'woocommerce' ), '<strong>' . wc_price( $data->average_sales ) . '</strong>' );
+				/* translators: %s: average total sales */
+				$average_total_sales_title = sprintf(
+					__( '%s average gross daily sales', 'woocommerce' ),
+					'<strong>' . wc_price( $data->average_total_sales ) . '</strong>'
+				);
+				/* translators: %s: average sales */
+				$average_sales_title = sprintf(
+					__( '%s average net daily sales', 'woocommerce' ),
+					'<strong>' . wc_price( $data->average_sales ) . '</strong>'
+				);
 			break;
 			case 'month' :
 			default :
-				$average_total_sales_title = sprintf( __( '%s average gross monthly sales', 'woocommerce' ), '<strong>' . wc_price( $data->average_total_sales ) . '</strong>' );
-				$average_sales_title       = sprintf( __( '%s average net monthly sales', 'woocommerce' ), '<strong>' . wc_price( $data->average_sales ) . '</strong>' );
+				/* translators: %s: average total sales */
+				$average_total_sales_title = sprintf(
+					__( '%s average gross monthly sales', 'woocommerce' ),
+					'<strong>' . wc_price( $data->average_total_sales ) . '</strong>'
+				);
+				/* translators: %s: average sales */
+				$average_sales_title = sprintf(
+					__( '%s average net monthly sales', 'woocommerce' ),
+					'<strong>' . wc_price( $data->average_sales ) . '</strong>'
+				);
 			break;
 		}
 
 		$legend[] = array(
-			'title'            => sprintf( __( '%s gross sales in this period', 'woocommerce' ), '<strong>' . wc_price( $data->total_sales ) . '</strong>' ),
+			/* translators: %s: total sales */
+			'title' => sprintf(
+				__( '%s gross sales in this period', 'woocommerce' ),
+				'<strong>' . wc_price( $data->total_sales ) . '</strong>'
+			),
 			'placeholder'      => __( 'This is the sum of the order totals after any refunds and including shipping and taxes.', 'woocommerce' ),
 			'color'            => $this->chart_colours['sales_amount'],
-			'highlight_series' => 6
+			'highlight_series' => 6,
 		);
 		if ( $data->average_total_sales > 0 ) {
 			$legend[] = array(
 				'title' => $average_total_sales_title,
 				'color' => $this->chart_colours['average'],
-				'highlight_series' => 2
+				'highlight_series' => 2,
 			);
 		}
 
 		$legend[] = array(
-			'title'            => sprintf( __( '%s net sales in this period', 'woocommerce' ), '<strong>' . wc_price( $data->net_sales ) . '</strong>' ),
+			/* translators: %s: net sales */
+			'title' => sprintf(
+				__( '%s net sales in this period', 'woocommerce' ),
+				'<strong>' . wc_price( $data->net_sales ) . '</strong>'
+			),
 			'placeholder'      => __( 'This is the sum of the order totals after any refunds and excluding shipping and taxes.', 'woocommerce' ),
 			'color'            => $this->chart_colours['net_sales_amount'],
-			'highlight_series' => 7
+			'highlight_series' => 7,
 		);
 		if ( $data->average_sales > 0 ) {
 			$legend[] = array(
 				'title' => $average_sales_title,
 				'color' => $this->chart_colours['net_average'],
-				'highlight_series' => 3
+				'highlight_series' => 3,
 			);
 		}
 
 		$legend[] = array(
-			'title' => sprintf( __( '%s orders placed', 'woocommerce' ), '<strong>' . $data->total_orders . '</strong>' ),
+			/* translators: %s: total orders */
+			'title' => sprintf(
+				__( '%s orders placed', 'woocommerce' ),
+				'<strong>' . $data->total_orders . '</strong>'
+			),
 			'color' => $this->chart_colours['order_count'],
-			'highlight_series' => 1
+			'highlight_series' => 1,
 		);
 
 		$legend[] = array(
-			'title' => sprintf( __( '%s items purchased', 'woocommerce' ), '<strong>' . $data->total_items . '</strong>' ),
+			/* translators: %s: total items */
+			'title' => sprintf(
+				__( '%s items purchased', 'woocommerce' ),
+				'<strong>' . $data->total_items . '</strong>'
+			),
 			'color' => $this->chart_colours['item_count'],
-			'highlight_series' => 0
+			'highlight_series' => 0,
 		);
 		$legend[] = array(
-			'title' => sprintf( _nx( '%s refunded %d order', '%s refunded %d orders', $this->report_data->total_refunded_orders, '%s = amount of the refunds, %d = number of refunded orders.', 'woocommerce' ), '<strong>' . wc_price( $data->total_refunds ) . '</strong>', $this->report_data->total_refunded_orders ) . ' (' . sprintf( _n( '%d item', '%d items', $this->report_data->refunded_order_items, 'woocommerce' ), $this->report_data->refunded_order_items ) . ')',
+			/* translators: 1: total refunds 2: total refunded orders 3: refunded items */
+			'title' => sprintf(
+				_n( '%1$s refunded %2$d order (%3$d item)', '%1$s refunded %2$d orders (%3$d items)', $this->report_data->total_refunded_orders, 'woocommerce' ),
+				'<strong>' . wc_price( $data->total_refunds ) . '</strong>',
+				$this->report_data->total_refunded_orders,
+				$this->report_data->refunded_order_items
+			),
 			'color' => $this->chart_colours['refund_amount'],
-			'highlight_series' => 8
+			'highlight_series' => 8,
 		);
 		$legend[] = array(
-			'title' => sprintf( __( '%s charged for shipping', 'woocommerce' ), '<strong>' . wc_price( $data->total_shipping ) . '</strong>' ),
+			/* translators: %s: total shipping */
+			'title' => sprintf(
+				__( '%s charged for shipping', 'woocommerce' ),
+				'<strong>' . wc_price( $data->total_shipping ) . '</strong>'
+			),
 			'color' => $this->chart_colours['shipping_amount'],
-			'highlight_series' => 5
+			'highlight_series' => 5,
 		);
 		$legend[] = array(
-			'title' => sprintf( __( '%s worth of coupons used', 'woocommerce' ), '<strong>' . wc_price( $data->total_coupons ) . '</strong>' ),
+			/* translators: %s: total coupons */
+			'title' => sprintf(
+				__( '%s worth of coupons used', 'woocommerce' ),
+				'<strong>' . wc_price( $data->total_coupons ) . '</strong>'
+			),
 			'color' => $this->chart_colours['coupon_amount'],
-			'highlight_series' => 2
+			'highlight_series' => 4,
 		);
 
 		return $legend;
@@ -413,9 +539,9 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
 	public function output_report() {
 		$ranges = array(
 			'year'         => __( 'Year', 'woocommerce' ),
-			'last_month'   => __( 'Last Month', 'woocommerce' ),
-			'month'        => __( 'This Month', 'woocommerce' ),
-			'7day'         => __( 'Last 7 Days', 'woocommerce' )
+			'last_month'   => __( 'Last month', 'woocommerce' ),
+			'month'        => __( 'This month', 'woocommerce' ),
+			'7day'         => __( 'Last 7 days', 'woocommerce' ),
 		);
 
 		$this->chart_colours = array(
@@ -427,7 +553,7 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
 			'item_count'       => '#ecf0f1',
 			'shipping_amount'  => '#5cc488',
 			'coupon_amount'    => '#f1c40f',
-			'refund_amount'    => '#e74c3c'
+			'refund_amount'    => '#e74c3c',
 		);
 
 		$current_range = ! empty( $_GET['range'] ) ? sanitize_text_field( $_GET['range'] ) : '7day';
@@ -436,9 +562,10 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
 			$current_range = '7day';
 		}
 
+		$this->check_current_range_nonce( $current_range );
 		$this->calculate_current_range( $current_range );
 
-		include( WC()->plugin_path() . '/includes/admin/views/html-report-by-date.php');
+		include( WC()->plugin_path() . '/includes/admin/views/html-report-by-date.php' );
 	}
 
 	/**
@@ -449,7 +576,7 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
 		?>
 		<a
 			href="#"
-			download="report-<?php echo esc_attr( $current_range ); ?>-<?php echo date_i18n( 'Y-m-d', current_time('timestamp') ); ?>.csv"
+			download="report-<?php echo esc_attr( $current_range ); ?>-<?php echo date_i18n( 'Y-m-d', current_time( 'timestamp' ) ); ?>.csv"
 			class="export_csv"
 			data-export="chart"
 			data-xaxes="<?php esc_attr_e( 'Date', 'woocommerce' ); ?>"
@@ -483,36 +610,45 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
 		global $wp_locale;
 
 		// Prepare data for report
-		$order_counts         = $this->prepare_chart_data( $this->report_data->order_counts, 'post_date', 'count', $this->chart_interval, $this->start_date, $this->chart_groupby );
-		$order_item_counts    = $this->prepare_chart_data( $this->report_data->order_items, 'post_date', 'order_item_count', $this->chart_interval, $this->start_date, $this->chart_groupby );
-		$order_amounts        = $this->prepare_chart_data( $this->report_data->orders, 'post_date', 'total_sales', $this->chart_interval, $this->start_date, $this->chart_groupby );
-		$coupon_amounts       = $this->prepare_chart_data( $this->report_data->coupons, 'post_date', 'discount_amount', $this->chart_interval, $this->start_date, $this->chart_groupby );
-		$shipping_amounts     = $this->prepare_chart_data( $this->report_data->orders, 'post_date', 'total_shipping', $this->chart_interval, $this->start_date, $this->chart_groupby );
-		$refund_amounts       = $this->prepare_chart_data( array_merge( $this->report_data->partial_refunds, $this->report_data->full_refunds ), 'post_date', 'total_refund', $this->chart_interval, $this->start_date, $this->chart_groupby );
-		$shipping_tax_amounts = $this->prepare_chart_data( $this->report_data->orders, 'post_date', 'total_shipping_tax', $this->chart_interval, $this->start_date, $this->chart_groupby );
-		$tax_amounts          = $this->prepare_chart_data( $this->report_data->orders, 'post_date', 'total_tax', $this->chart_interval, $this->start_date, $this->chart_groupby );
+		$data = array(
+			'order_counts'         => $this->prepare_chart_data( $this->report_data->order_counts, 'post_date', 'count', $this->chart_interval, $this->start_date, $this->chart_groupby ),
+			'order_item_counts'    => $this->prepare_chart_data( $this->report_data->order_items, 'post_date', 'order_item_count', $this->chart_interval, $this->start_date, $this->chart_groupby ),
+			'order_amounts'        => $this->prepare_chart_data( $this->report_data->orders, 'post_date', 'total_sales', $this->chart_interval, $this->start_date, $this->chart_groupby ),
+			'coupon_amounts'       => $this->prepare_chart_data( $this->report_data->coupons, 'post_date', 'discount_amount', $this->chart_interval, $this->start_date, $this->chart_groupby ),
+			'shipping_amounts'     => $this->prepare_chart_data( $this->report_data->orders, 'post_date', 'total_shipping', $this->chart_interval, $this->start_date, $this->chart_groupby ),
+			'refund_amounts'       => $this->prepare_chart_data( $this->report_data->refund_lines, 'post_date', 'total_refund', $this->chart_interval, $this->start_date, $this->chart_groupby ),
+			'shipping_tax_amounts' => $this->prepare_chart_data( $this->report_data->orders, 'post_date', 'total_shipping_tax', $this->chart_interval, $this->start_date, $this->chart_groupby ),
+			'tax_amounts'          => $this->prepare_chart_data( $this->report_data->orders, 'post_date', 'total_tax', $this->chart_interval, $this->start_date, $this->chart_groupby ),
+			'net_order_amounts'    => array(),
+			'gross_order_amounts'  => array(),
+		);
 
-		$net_order_amounts   = array();
-		$gross_order_amounts = array();
+		foreach ( $data['order_amounts'] as $order_amount_key => $order_amount_value ) {
+			$data['gross_order_amounts'][ $order_amount_key ]    = $order_amount_value;
+			$data['gross_order_amounts'][ $order_amount_key ][1] -= $data['refund_amounts'][ $order_amount_key ][1];
 
-		foreach ( $order_amounts as $order_amount_key => $order_amount_value ) {
-			$gross_order_amounts[ $order_amount_key ]    = $order_amount_value;
-			$gross_order_amounts[ $order_amount_key ][1] = $gross_order_amounts[ $order_amount_key ][1] - $refund_amounts[ $order_amount_key ][1];
-
-			$net_order_amounts[ $order_amount_key ]    = $order_amount_value;
-			$net_order_amounts[ $order_amount_key ][1] = $net_order_amounts[ $order_amount_key ][1] - $refund_amounts[ $order_amount_key ][1] - $shipping_amounts[ $order_amount_key ][1] - $shipping_tax_amounts[ $order_amount_key ][1] - $tax_amounts[ $order_amount_key ][1];
+			$data['net_order_amounts'][ $order_amount_key ]    = $order_amount_value;
+			// subtract the sum of the values from net order amounts
+			$data['net_order_amounts'][ $order_amount_key ][1] -=
+				$data['refund_amounts'][ $order_amount_key ][1] +
+				$data['shipping_amounts'][ $order_amount_key ][1] +
+				$data['shipping_tax_amounts'][ $order_amount_key ][1] +
+				$data['tax_amounts'][ $order_amount_key ][1];
 		}
 
+		// 3rd party filtering of report data
+		$data = apply_filters( 'woocommerce_admin_report_chart_data', $data );
+
 		// Encode in json format
 		$chart_data = json_encode( array(
-			'order_counts'        => array_values( $order_counts ),
-			'order_item_counts'   => array_values( $order_item_counts ),
-			'order_amounts'       => array_map( array( $this, 'round_chart_totals' ), array_values( $order_amounts ) ),
-			'gross_order_amounts' => array_map( array( $this, 'round_chart_totals' ), array_values( $gross_order_amounts ) ),
-			'net_order_amounts'   => array_map( array( $this, 'round_chart_totals' ), array_values( $net_order_amounts ) ),
-			'shipping_amounts'    => array_map( array( $this, 'round_chart_totals' ), array_values( $shipping_amounts ) ),
-			'coupon_amounts'      => array_map( array( $this, 'round_chart_totals' ), array_values( $coupon_amounts ) ),
-			'refund_amounts'      => array_map( array( $this, 'round_chart_totals' ), array_values( $refund_amounts ) )
+			'order_counts'        => array_values( $data['order_counts'] ),
+			'order_item_counts'   => array_values( $data['order_item_counts'] ),
+			'order_amounts'       => array_map( array( $this, 'round_chart_totals' ), array_values( $data['order_amounts'] ) ),
+			'gross_order_amounts' => array_map( array( $this, 'round_chart_totals' ), array_values( $data['gross_order_amounts'] ) ),
+			'net_order_amounts'   => array_map( array( $this, 'round_chart_totals' ), array_values( $data['net_order_amounts'] ) ),
+			'shipping_amounts'    => array_map( array( $this, 'round_chart_totals' ), array_values( $data['shipping_amounts'] ) ),
+			'coupon_amounts'      => array_map( array( $this, 'round_chart_totals' ), array_values( $data['coupon_amounts'] ) ),
+			'refund_amounts'      => array_map( array( $this, 'round_chart_totals' ), array_values( $data['refund_amounts'] ) ),
 		) );
 		?>
 		<div class="chart-container">
@@ -544,7 +680,7 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
 						},
 						{
 							label: "<?php echo esc_js( __( 'Average gross sales amount', 'woocommerce' ) ) ?>",
-							data: [ [ <?php echo min( array_keys( $order_amounts ) ); ?>, <?php echo $this->report_data->average_total_sales; ?> ], [ <?php echo max( array_keys( $order_amounts ) ); ?>, <?php echo $this->report_data->average_total_sales; ?> ] ],
+							data: [ [ <?php echo min( array_keys( $data['order_amounts'] ) ); ?>, <?php echo $this->report_data->average_total_sales; ?> ], [ <?php echo max( array_keys( $data['order_amounts'] ) ); ?>, <?php echo $this->report_data->average_total_sales; ?> ] ],
 							yaxis: 2,
 							color: '<?php echo $this->chart_colours['average']; ?>',
 							points: { show: false },
@@ -554,7 +690,7 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
 						},
 						{
 							label: "<?php echo esc_js( __( 'Average net sales amount', 'woocommerce' ) ) ?>",
-							data: [ [ <?php echo min( array_keys( $order_amounts ) ); ?>, <?php echo $this->report_data->average_sales; ?> ], [ <?php echo max( array_keys( $order_amounts ) ); ?>, <?php echo $this->report_data->average_sales; ?> ] ],
+							data: [ [ <?php echo min( array_keys( $data['order_amounts'] ) ); ?>, <?php echo $this->report_data->average_sales; ?> ], [ <?php echo max( array_keys( $data['order_amounts'] ) ); ?>, <?php echo $this->report_data->average_sales; ?> ] ],
 							yaxis: 2,
 							color: '<?php echo $this->chart_colours['net_average']; ?>',
 							points: { show: false },
@@ -583,7 +719,7 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
 							prepend_tooltip: "<?php echo get_woocommerce_currency_symbol(); ?>"
 						},
 						{
-							label: "<?php echo esc_js( __( 'Gross Sales amount', 'woocommerce' ) ) ?>",
+							label: "<?php echo esc_js( __( 'Gross sales amount', 'woocommerce' ) ) ?>",
 							data: order_data.gross_order_amounts,
 							yaxis: 2,
 							color: '<?php echo $this->chart_colours['sales_amount']; ?>',
@@ -593,7 +729,7 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
 							<?php echo $this->get_currency_tooltip(); ?>
 						},
 						{
-							label: "<?php echo esc_js( __( 'Net Sales amount', 'woocommerce' ) ) ?>",
+							label: "<?php echo esc_js( __( 'Net sales amount', 'woocommerce' ) ) ?>",
 							data: order_data.net_order_amounts,
 							yaxis: 2,
 							color: '<?php echo $this->chart_colours['net_sales_amount']; ?>',
@@ -646,7 +782,7 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
 								position: "bottom",
 								tickColor: 'transparent',
 								mode: "time",
-								timeformat: "<?php if ( $this->chart_groupby == 'day' ) echo '%d %b'; else echo '%b'; ?>",
+								timeformat: "<?php echo ( 'day' === $this->chart_groupby ) ? '%d %b' : '%b'; ?>",
 								monthNames: <?php echo json_encode( array_values( $wp_locale->month_abbrev ) ) ?>,
 								tickLength: 1,
 								minTickSize: [1, "<?php echo $this->chart_groupby; ?>"],
diff --git a/includes/admin/reports/class-wc-report-sales-by-product.php b/includes/admin/reports/class-wc-report-sales-by-product.php
index 440a84c2bdf..5e086e92249 100644
--- a/includes/admin/reports/class-wc-report-sales-by-product.php
+++ b/includes/admin/reports/class-wc-report-sales-by-product.php
@@ -1,4 +1,9 @@
 <?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+
 /**
  * WC_Report_Sales_By_Product
  *
@@ -9,8 +14,25 @@
  */
 class WC_Report_Sales_By_Product extends WC_Admin_Report {
 
+	/**
+	 * Chart colors.
+	 *
+	 * @var array
+	 */
 	public $chart_colours      = array();
+
+	/**
+	 * Product ids.
+	 *
+	 * @var array
+	 */
 	public $product_ids        = array();
+
+	/**
+	 * Product ids with titles.
+	 *
+	 * @var array
+	 */
 	public $product_ids_titles = array();
 
 	/**
@@ -30,7 +52,7 @@ class WC_Report_Sales_By_Product extends WC_Admin_Report {
 	 */
 	public function get_chart_legend() {
 
-		if ( ! $this->product_ids ) {
+		if ( empty( $this->product_ids ) ) {
 			return array();
 		}
 
@@ -42,8 +64,8 @@ class WC_Report_Sales_By_Product extends WC_Admin_Report {
 					'type'            => 'order_item_meta',
 					'order_item_type' => 'line_item',
 					'function' => 'SUM',
-					'name'     => 'order_item_amount'
-				)
+					'name'     => 'order_item_amount',
+				),
 			),
 			'where_meta' => array(
 				'relation' => 'OR',
@@ -51,11 +73,11 @@ class WC_Report_Sales_By_Product extends WC_Admin_Report {
 					'type'       => 'order_item_meta',
 					'meta_key'   => array( '_product_id', '_variation_id' ),
 					'meta_value' => $this->product_ids,
-					'operator'   => 'IN'
+					'operator'   => 'IN',
 				)
 			),
 			'query_type'   => 'get_var',
-			'filter_range' => true
+			'filter_range' => true,
 		) );
 
 		$total_items = absint( $this->get_order_report_data( array(
@@ -64,8 +86,8 @@ class WC_Report_Sales_By_Product extends WC_Admin_Report {
 					'type'            => 'order_item_meta',
 					'order_item_type' => 'line_item',
 					'function'        => 'SUM',
-					'name'            => 'order_item_count'
-				)
+					'name'            => 'order_item_count',
+				),
 			),
 			'where_meta' => array(
 				'relation' => 'OR',
@@ -73,24 +95,25 @@ class WC_Report_Sales_By_Product extends WC_Admin_Report {
 					'type'       => 'order_item_meta',
 					'meta_key'   => array( '_product_id', '_variation_id' ),
 					'meta_value' => $this->product_ids,
-					'operator'   => 'IN'
+					'operator'   => 'IN',
 				)
 			),
 			'query_type'   => 'get_var',
-			'order_types'  => wc_get_order_types( 'order-count' ),
-			'filter_range' => true
+			'filter_range' => true,
 		) ) );
 
 		$legend[] = array(
+			/* translators: %s: total items sold */
 			'title' => sprintf( __( '%s sales for the selected items', 'woocommerce' ), '<strong>' . wc_price( $total_sales ) . '</strong>' ),
 			'color' => $this->chart_colours['sales_amount'],
-			'highlight_series' => 1
+			'highlight_series' => 1,
 		);
 
 		$legend[] = array(
-			'title' => sprintf( __( '%s purchases for the selected items', 'woocommerce' ), '<strong>' . $total_items . '</strong>' ),
+			/* translators: %s: total items purchased */
+			'title' => sprintf( __( '%s purchases for the selected items', 'woocommerce' ), '<strong>' . ( $total_items ) . '</strong>' ),
 			'color' => $this->chart_colours['item_count'],
-			'highlight_series' => 0
+			'highlight_series' => 0,
 		);
 
 		return $legend;
@@ -103,9 +126,9 @@ class WC_Report_Sales_By_Product extends WC_Admin_Report {
 
 		$ranges = array(
 			'year'         => __( 'Year', 'woocommerce' ),
-			'last_month'   => __( 'Last Month', 'woocommerce' ),
-			'month'        => __( 'This Month', 'woocommerce' ),
-			'7day'         => __( 'Last 7 Days', 'woocommerce' )
+			'last_month'   => __( 'Last month', 'woocommerce' ),
+			'month'        => __( 'This month', 'woocommerce' ),
+			'7day'         => __( 'Last 7 days', 'woocommerce' ),
 		);
 
 		$this->chart_colours = array(
@@ -115,16 +138,18 @@ class WC_Report_Sales_By_Product extends WC_Admin_Report {
 
 		$current_range = ! empty( $_GET['range'] ) ? sanitize_text_field( $_GET['range'] ) : '7day';
 
-		if ( ! in_array( $current_range, array( 'custom', 'year', 'last_month', 'month', '7day' ) ) )
+		if ( ! in_array( $current_range, array( 'custom', 'year', 'last_month', 'month', '7day' ) ) ) {
 			$current_range = '7day';
+		}
 
+		$this->check_current_range_nonce( $current_range );
 		$this->calculate_current_range( $current_range );
 
-		include( WC()->plugin_path() . '/includes/admin/views/html-report-by-date.php');
+		include( WC()->plugin_path() . '/includes/admin/views/html-report-by-date.php' );
 	}
 
 	/**
-	 * [get_chart_widgets description].
+	 * Get chart widgets.
 	 *
 	 * @return array
 	 */
@@ -135,20 +160,20 @@ class WC_Report_Sales_By_Product extends WC_Admin_Report {
 		if ( ! empty( $this->product_ids ) ) {
 			$widgets[] = array(
 				'title'    => __( 'Showing reports for:', 'woocommerce' ),
-				'callback' => array( $this, 'current_filters' )
+				'callback' => array( $this, 'current_filters' ),
 			);
 		}
 
 		$widgets[] = array(
 			'title'    => '',
-			'callback' => array( $this, 'products_widget' )
+			'callback' => array( $this, 'products_widget' ),
 		);
 
 		return $widgets;
 	}
 
 	/**
-	 * Show current filters.
+	 * Output current filters.
 	 */
 	public function current_filters() {
 
@@ -165,31 +190,31 @@ class WC_Report_Sales_By_Product extends WC_Admin_Report {
 			}
 		}
 
-		echo '<p>' . ' <strong>' . implode( ', ', $this->product_ids_titles ) . '</strong></p>';
+		echo '<p>' . ' <strong>' . esc_html( implode( ', ', $this->product_ids_titles ) ) . '</strong></p>';
 		echo '<p><a class="button" href="' . esc_url( remove_query_arg( 'product_ids' ) ) . '">' . __( 'Reset', 'woocommerce' ) . '</a></p>';
 	}
 
 	/**
-	 * Product selection.
+	 * Output products widget.
 	 */
 	public function products_widget() {
 		?>
-		<h4 class="section_title"><span><?php _e( 'Product Search', 'woocommerce' ); ?></span></h4>
+		<h4 class="section_title"><span><?php _e( 'Product search', 'woocommerce' ); ?></span></h4>
 		<div class="section">
 			<form method="GET">
 				<div>
-					<input type="hidden" class="wc-product-search" style="width:203px;" name="product_ids[]" data-placeholder="<?php esc_attr_e( 'Search for a product&hellip;', 'woocommerce' ); ?>" data-action="woocommerce_json_search_products_and_variations" />
+					<select class="wc-product-search" style="width:203px;" multiple="multiple" id="product_ids" name="product_ids[]" data-placeholder="<?php esc_attr_e( 'Search for a product&hellip;', 'woocommerce' ); ?>" data-action="woocommerce_json_search_products_and_variations"></select>
 					<input type="submit" class="submit button" value="<?php esc_attr_e( 'Show', 'woocommerce' ); ?>" />
-					<input type="hidden" name="range" value="<?php if ( ! empty( $_GET['range'] ) ) echo esc_attr( $_GET['range'] ) ?>" />
-					<input type="hidden" name="start_date" value="<?php if ( ! empty( $_GET['start_date'] ) ) echo esc_attr( $_GET['start_date'] ) ?>" />
-					<input type="hidden" name="end_date" value="<?php if ( ! empty( $_GET['end_date'] ) ) echo esc_attr( $_GET['end_date'] ) ?>" />
-					<input type="hidden" name="page" value="<?php if ( ! empty( $_GET['page'] ) ) echo esc_attr( $_GET['page'] ) ?>" />
-					<input type="hidden" name="tab" value="<?php if ( ! empty( $_GET['tab'] ) ) echo esc_attr( $_GET['tab'] ) ?>" />
-					<input type="hidden" name="report" value="<?php if ( ! empty( $_GET['report'] ) ) echo esc_attr( $_GET['report'] ) ?>" />
+					<input type="hidden" name="range" value="<?php echo ( ! empty( $_GET['range'] ) ) ? esc_attr( $_GET['range'] ) : ''; ?>" />
+					<input type="hidden" name="start_date" value="<?php echo ( ! empty( $_GET['start_date'] ) ) ? esc_attr( $_GET['start_date'] ) : ''; ?>" />
+					<input type="hidden" name="end_date" value="<?php echo ( ! empty( $_GET['end_date'] ) ) ? esc_attr( $_GET['end_date'] ) : ''; ?>" />
+					<input type="hidden" name="page" value="<?php echo ( ! empty( $_GET['page'] ) ) ? esc_attr( $_GET['page'] ) : ''; ?>" />
+					<input type="hidden" name="tab" value="<?php echo ( ! empty( $_GET['tab'] ) ) ? esc_attr( $_GET['tab'] ) : ''; ?>" />
+					<input type="hidden" name="report" value="<?php echo ( ! empty( $_GET['report'] ) ) ? esc_attr( $_GET['report'] ) : ''; ?>" />
 				</div>
 			</form>
 		</div>
-		<h4 class="section_title"><span><?php _e( 'Top Sellers', 'woocommerce' ); ?></span></h4>
+		<h4 class="section_title"><span><?php _e( 'Top sellers', 'woocommerce' ); ?></span></h4>
 		<div class="section">
 			<table cellspacing="0">
 				<?php
@@ -199,29 +224,20 @@ class WC_Report_Sales_By_Product extends WC_Admin_Report {
 							'type'            => 'order_item_meta',
 							'order_item_type' => 'line_item',
 							'function'        => '',
-							'name'            => 'product_id'
+							'name'            => 'product_id',
 						),
 						'_qty' => array(
 							'type'            => 'order_item_meta',
 							'order_item_type' => 'line_item',
 							'function'        => 'SUM',
-							'name'            => 'order_item_qty'
-						)
-					),
-					'where_meta'   => array(
-						array(
-							'type'       => 'order_item_meta',
-							'meta_key'   => '_line_subtotal',
-							'meta_value' => '0',
-							'operator'   => '>'
-						)
+							'name'            => 'order_item_qty',
+						),
 					),
 					'order_by'     => 'order_item_qty DESC',
 					'group_by'     => 'product_id',
 					'limit'        => 12,
 					'query_type'   => 'get_results',
 					'filter_range' => true,
-					'order_types'  => wc_get_order_types( 'order-count' ),
 				) );
 
 				if ( $top_sellers ) {
@@ -238,7 +254,7 @@ class WC_Report_Sales_By_Product extends WC_Admin_Report {
 				?>
 			</table>
 		</div>
-		<h4 class="section_title"><span><?php _e( 'Top Freebies', 'woocommerce' ); ?></span></h4>
+		<h4 class="section_title"><span><?php _e( 'Top freebies', 'woocommerce' ); ?></span></h4>
 		<div class="section">
 			<table cellspacing="0">
 				<?php
@@ -248,30 +264,28 @@ class WC_Report_Sales_By_Product extends WC_Admin_Report {
 							'type'            => 'order_item_meta',
 							'order_item_type' => 'line_item',
 							'function'        => '',
-							'name'            => 'product_id'
+							'name'            => 'product_id',
 						),
 						'_qty' => array(
 							'type'            => 'order_item_meta',
 							'order_item_type' => 'line_item',
 							'function'        => 'SUM',
-							'name'            => 'order_item_qty'
-						)
+							'name'            => 'order_item_qty',
+						),
 					),
 					'where_meta'   => array(
 						array(
 							'type'       => 'order_item_meta',
 							'meta_key'   => '_line_subtotal',
 							'meta_value' => '0',
-							'operator'   => '='
-						)
+							'operator'   => '=',
+						),
 					),
 					'order_by'     => 'order_item_qty DESC',
 					'group_by'     => 'product_id',
 					'limit'        => 12,
 					'query_type'   => 'get_results',
 					'filter_range' => true,
-					'order_types'  => wc_get_order_types( 'order-count' ),
-					'nocache' => true
 				) );
 
 				if ( $top_freebies ) {
@@ -288,7 +302,7 @@ class WC_Report_Sales_By_Product extends WC_Admin_Report {
 				?>
 			</table>
 		</div>
-		<h4 class="section_title"><span><?php _e( 'Top Earners', 'woocommerce' ); ?></span></h4>
+		<h4 class="section_title"><span><?php _e( 'Top earners', 'woocommerce' ); ?></span></h4>
 		<div class="section">
 			<table cellspacing="0">
 				<?php
@@ -298,20 +312,20 @@ class WC_Report_Sales_By_Product extends WC_Admin_Report {
 							'type'            => 'order_item_meta',
 							'order_item_type' => 'line_item',
 							'function'        => '',
-							'name'            => 'product_id'
+							'name'            => 'product_id',
 						),
 						'_line_total' => array(
 							'type'            => 'order_item_meta',
 							'order_item_type' => 'line_item',
 							'function'        => 'SUM',
-							'name'            => 'order_item_total'
-						)
+							'name'            => 'order_item_total',
+						),
 					),
 					'order_by'     => 'order_item_total DESC',
 					'group_by'     => 'product_id',
 					'limit'        => 12,
 					'query_type'   => 'get_results',
-					'filter_range' => true
+					'filter_range' => true,
 				) );
 
 				if ( $top_earners ) {
@@ -359,7 +373,7 @@ class WC_Report_Sales_By_Product extends WC_Admin_Report {
 		?>
 		<a
 			href="#"
-			download="report-<?php echo esc_attr( $current_range ); ?>-<?php echo date_i18n( 'Y-m-d', current_time('timestamp') ); ?>.csv"
+			download="report-<?php echo esc_attr( $current_range ); ?>-<?php echo date_i18n( 'Y-m-d', current_time( 'timestamp' ) ); ?>.csv"
 			class="export_csv"
 			data-export="chart"
 			data-xaxes="<?php esc_attr_e( 'Date', 'woocommerce' ); ?>"
@@ -378,10 +392,10 @@ class WC_Report_Sales_By_Product extends WC_Admin_Report {
 	public function get_main_chart() {
 		global $wp_locale;
 
-		if ( ! $this->product_ids ) {
+		if ( empty( $this->product_ids ) ) {
 			?>
 			<div class="chart-container">
-				<p class="chart-prompt"><?php _e( '&larr; Choose a product to view stats', 'woocommerce' ); ?></p>
+				<p class="chart-prompt"><?php _e( 'Choose a product to view stats', 'woocommerce' ); ?></p>
 			</div>
 			<?php
 		} else {
@@ -392,19 +406,19 @@ class WC_Report_Sales_By_Product extends WC_Admin_Report {
 						'type'            => 'order_item_meta',
 						'order_item_type' => 'line_item',
 						'function'        => 'SUM',
-						'name'            => 'order_item_count'
+						'name'            => 'order_item_count',
 					),
 					'post_date' => array(
 						'type'     => 'post_data',
 						'function' => '',
-						'name'     => 'post_date'
+						'name'     => 'post_date',
 					),
 					'_product_id' => array(
 						'type'            => 'order_item_meta',
 						'order_item_type' => 'line_item',
 						'function'        => '',
-						'name'            => 'product_id'
-					)
+						'name'            => 'product_id',
+					),
 				),
 				'where_meta' => array(
 					'relation' => 'OR',
@@ -412,13 +426,13 @@ class WC_Report_Sales_By_Product extends WC_Admin_Report {
 						'type'       => 'order_item_meta',
 						'meta_key'   => array( '_product_id', '_variation_id' ),
 						'meta_value' => $this->product_ids,
-						'operator'   => 'IN'
+						'operator'   => 'IN',
 					),
 				),
 				'group_by'     => 'product_id,' . $this->group_by_query,
 				'order_by'     => 'post_date ASC',
 				'query_type'   => 'get_results',
-				'filter_range' => true
+				'filter_range' => true,
 			) );
 
 			$order_item_amounts = $this->get_order_report_data( array(
@@ -427,18 +441,18 @@ class WC_Report_Sales_By_Product extends WC_Admin_Report {
 						'type'            => 'order_item_meta',
 						'order_item_type' => 'line_item',
 						'function' => 'SUM',
-						'name'     => 'order_item_amount'
+						'name'     => 'order_item_amount',
 					),
 					'post_date' => array(
 						'type'     => 'post_data',
 						'function' => '',
-						'name'     => 'post_date'
+						'name'     => 'post_date',
 					),
 					'_product_id' => array(
 						'type'            => 'order_item_meta',
 						'order_item_type' => 'line_item',
 						'function'        => '',
-						'name'            => 'product_id'
+						'name'            => 'product_id',
 					),
 				),
 				'where_meta' => array(
@@ -447,13 +461,13 @@ class WC_Report_Sales_By_Product extends WC_Admin_Report {
 						'type'       => 'order_item_meta',
 						'meta_key'   => array( '_product_id', '_variation_id' ),
 						'meta_value' => $this->product_ids,
-						'operator'   => 'IN'
+						'operator'   => 'IN',
 					),
 				),
 				'group_by'     => 'product_id, ' . $this->group_by_query,
 				'order_by'     => 'post_date ASC',
 				'query_type'   => 'get_results',
-				'filter_range' => true
+				'filter_range' => true,
 			) );
 
 			// Prepare data for report
@@ -463,7 +477,7 @@ class WC_Report_Sales_By_Product extends WC_Admin_Report {
 			// Encode in json format
 			$chart_data = json_encode( array(
 				'order_item_counts'  => array_values( $order_item_counts ),
-				'order_item_amounts' => array_values( $order_item_amounts )
+				'order_item_amounts' => array_values( $order_item_amounts ),
 			) );
 			?>
 			<div class="chart-container">
@@ -529,7 +543,7 @@ class WC_Report_Sales_By_Product extends WC_Admin_Report {
 									position: "bottom",
 									tickColor: 'transparent',
 									mode: "time",
-									timeformat: "<?php if ( $this->chart_groupby == 'day' ) echo '%d %b'; else echo '%b'; ?>",
+									timeformat: "<?php echo ( 'day' === $this->chart_groupby ) ? '%d %b' : '%b'; ?>",
 									monthNames: <?php echo json_encode( array_values( $wp_locale->month_abbrev ) ) ?>,
 									tickLength: 1,
 									minTickSize: [1, "<?php echo $this->chart_groupby; ?>"],
diff --git a/includes/admin/reports/class-wc-report-stock.php b/includes/admin/reports/class-wc-report-stock.php
index 37a52398d84..46bcc9f7f51 100644
--- a/includes/admin/reports/class-wc-report-stock.php
+++ b/includes/admin/reports/class-wc-report-stock.php
@@ -18,17 +18,22 @@ if ( ! class_exists( 'WP_List_Table' ) ) {
  */
 class WC_Report_Stock extends WP_List_Table {
 
+	/**
+	 * Max items.
+	 *
+	 * @var int
+	 */
 	protected $max_items;
 
 	/**
-	 * __construct function.
+	 * Constructor.
 	 */
 	public function __construct() {
 
 		parent::__construct( array(
-			'singular'  => __( 'Stock', 'woocommerce' ),
-			'plural'    => __( 'Stock', 'woocommerce' ),
-			'ajax'      => false
+			'singular'  => 'stock',
+			'plural'    => 'stock',
+			'ajax'      => false,
 		) );
 	}
 
@@ -41,10 +46,12 @@ class WC_Report_Stock extends WP_List_Table {
 
 	/**
 	 * Don't need this.
+	 *
+	 * @param string $position
 	 */
 	public function display_tablenav( $position ) {
 
-		if ( $position != 'top' ) {
+		if ( 'top' !== $position ) {
 			parent::display_tablenav( $position );
 		}
 	}
@@ -61,37 +68,34 @@ class WC_Report_Stock extends WP_List_Table {
 	}
 
 	/**
-	 * column_default function.
+	 * Get column value.
 	 *
 	 * @param mixed $item
-	 * @param mixed $column_name
+	 * @param string $column_name
 	 */
 	public function column_default( $item, $column_name ) {
 		global $product;
 
-		if ( ! $product || $product->id !== $item->id ) {
+		if ( ! $product || $product->get_id() !== $item->id ) {
 			$product = wc_get_product( $item->id );
 		}
 
-		switch( $column_name ) {
+		if ( ! $product ) {
+			return;
+		}
+
+		switch ( $column_name ) {
 
 			case 'product' :
 				if ( $sku = $product->get_sku() ) {
-					echo $sku . ' - ';
+					echo esc_html( $sku ) . ' - ';
 				}
 
-				echo $product->get_title();
+				echo esc_html( $product->get_name() );
 
-				// Get variation data
+				// Get variation data.
 				if ( $product->is_type( 'variation' ) ) {
-					$list_attributes = array();
-					$attributes = $product->get_variation_attributes();
-
-					foreach ( $attributes as $name => $attribute ) {
-						$list_attributes[] = wc_attribute_label( str_replace( 'attribute_', '', $name ) ) . ': <strong>' . $attribute . '</strong>';
-					}
-
-					echo '<div class="description">' . implode( ', ', $list_attributes ) . '</div>';
+					echo '<div class="description">' . wp_kses_post( wc_get_formatted_variation( $product, true ) ) . '</div>';
 				}
 			break;
 
@@ -105,14 +109,15 @@ class WC_Report_Stock extends WP_List_Table {
 
 			case 'stock_status' :
 				if ( $product->is_in_stock() ) {
-					echo '<mark class="instock">' . __( 'In stock', 'woocommerce' ) . '</mark>';
+					$stock_html = '<mark class="instock">' . __( 'In stock', 'woocommerce' ) . '</mark>';
 				} else {
-					echo '<mark class="outofstock">' . __( 'Out of stock', 'woocommerce' ) . '</mark>';
+					$stock_html = '<mark class="outofstock">' . __( 'Out of stock', 'woocommerce' ) . '</mark>';
 				}
+				echo apply_filters( 'woocommerce_admin_stock_html', $stock_html, $product );
 			break;
 
 			case 'stock_level' :
-				echo $product->get_stock_quantity();
+				echo esc_html( $product->get_stock_quantity() );
 			break;
 
 			case 'wc_actions' :
@@ -124,21 +129,27 @@ class WC_Report_Stock extends WP_List_Table {
 						$actions['edit'] = array(
 							'url'       => admin_url( 'post.php?post=' . $action_id . '&action=edit' ),
 							'name'      => __( 'Edit', 'woocommerce' ),
-							'action'    => "edit"
+							'action'    => "edit",
 						);
 
 						if ( $product->is_visible() ) {
 							$actions['view'] = array(
 								'url'       => get_permalink( $action_id ),
 								'name'      => __( 'View', 'woocommerce' ),
-								'action'    => "view"
+								'action'    => "view",
 							);
 						}
 
 						$actions = apply_filters( 'woocommerce_admin_stock_report_product_actions', $actions, $product );
 
 						foreach ( $actions as $action ) {
-							printf( '<a class="button tips %s" href="%s" data-tip="%s ' . __( 'product', 'woocommerce' ) . '">%s</a>', $action['action'], esc_url( $action['url'] ), esc_attr( $action['name'] ), esc_attr( $action['name'] ) );
+							printf(
+								'<a class="button tips %1$s" href="%2$s" data-tip="%3$s">%4$s</a>',
+								esc_attr( $action['action'] ),
+								esc_url( $action['url'] ),
+								sprintf( esc_attr__( '%s product', 'woocommerce' ), $action['name'] ),
+								esc_html( $action['name'] )
+							);
 						}
 					?>
 				</p><?php
@@ -147,7 +158,9 @@ class WC_Report_Stock extends WP_List_Table {
 	}
 
 	/**
-	 * get_columns function.
+	 * Get columns.
+	 *
+	 * @return array
 	 */
 	public function get_columns() {
 
@@ -163,7 +176,7 @@ class WC_Report_Stock extends WP_List_Table {
 	}
 
 	/**
-	 * prepare_items function.
+	 * Prepare customer list items.
 	 */
 	public function prepare_items() {
 
@@ -179,7 +192,7 @@ class WC_Report_Stock extends WP_List_Table {
 		$this->set_pagination_args( array(
 			'total_items' => $this->max_items,
 			'per_page'    => $per_page,
-			'total_pages' => ceil( $this->max_items / $per_page )
+			'total_pages' => ceil( $this->max_items / $per_page ),
 		) );
 	}
 }
diff --git a/includes/admin/reports/class-wc-report-taxes-by-code.php b/includes/admin/reports/class-wc-report-taxes-by-code.php
index d30016a45b6..7950e3bb002 100644
--- a/includes/admin/reports/class-wc-report-taxes-by-code.php
+++ b/includes/admin/reports/class-wc-report-taxes-by-code.php
@@ -1,4 +1,9 @@
 <?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+
 /**
  * WC_Report_Taxes_By_Code
  *
@@ -26,7 +31,7 @@ class WC_Report_Taxes_By_Code extends WC_Admin_Report {
 		?>
 		<a
 			href="#"
-			download="report-<?php echo esc_attr( $current_range ); ?>-<?php echo date_i18n( 'Y-m-d', current_time('timestamp') ); ?>.csv"
+			download="report-<?php echo esc_attr( $current_range ); ?>-<?php echo date_i18n( 'Y-m-d', current_time( 'timestamp' ) ); ?>.csv"
 			class="export_csv"
 			data-export="table"
 		>
@@ -42,8 +47,8 @@ class WC_Report_Taxes_By_Code extends WC_Admin_Report {
 
 		$ranges = array(
 			'year'         => __( 'Year', 'woocommerce' ),
-			'last_month'   => __( 'Last Month', 'woocommerce' ),
-			'month'        => __( 'This Month', 'woocommerce' ),
+			'last_month'   => __( 'Last month', 'woocommerce' ),
+			'month'        => __( 'This month', 'woocommerce' ),
 		);
 
 		$current_range = ! empty( $_GET['range'] ) ? sanitize_text_field( $_GET['range'] ) : 'last_month';
@@ -52,11 +57,12 @@ class WC_Report_Taxes_By_Code extends WC_Admin_Report {
 			$current_range = 'last_month';
 		}
 
+		$this->check_current_range_nonce( $current_range );
 		$this->calculate_current_range( $current_range );
 
 		$hide_sidebar = true;
 
-		include( WC()->plugin_path() . '/includes/admin/views/html-report-by-date.php');
+		include( WC()->plugin_path() . '/includes/admin/views/html-report-by-date.php' );
 	}
 
 	/**
@@ -71,30 +77,30 @@ class WC_Report_Taxes_By_Code extends WC_Admin_Report {
 			'order_item_name' => array(
 				'type'     => 'order_item',
 				'function' => '',
-				'name'     => 'tax_rate'
+				'name'     => 'tax_rate',
 			),
 			'tax_amount' => array(
 				'type'            => 'order_item_meta',
 				'order_item_type' => 'tax',
 				'function'        => '',
-				'name'            => 'tax_amount'
+				'name'            => 'tax_amount',
 			),
 			'shipping_tax_amount' => array(
 				'type'            => 'order_item_meta',
 				'order_item_type' => 'tax',
 				'function'        => '',
-				'name'            => 'shipping_tax_amount'
+				'name'            => 'shipping_tax_amount',
 			),
 			'rate_id' => array(
 				'type'            => 'order_item_meta',
 				'order_item_type' => 'tax',
 				'function'        => '',
-				'name'            => 'rate_id'
+				'name'            => 'rate_id',
 			),
 			'ID' => array(
 				'type'     => 'post_data',
 				'function' => '',
-				'name'     => 'post_id'
+				'name'     => 'post_id',
 			),
 		);
 
@@ -102,13 +108,13 @@ class WC_Report_Taxes_By_Code extends WC_Admin_Report {
 			array(
 				'key'      => 'order_item_type',
 				'value'    => 'tax',
-				'operator' => '='
+				'operator' => '=',
 			),
 			array(
 				'key'      => 'order_item_name',
 				'value'    => '',
-				'operator' => '!='
-			)
+				'operator' => '!=',
+			),
 		);
 
 		$tax_rows_orders = $this->get_order_report_data( array(
@@ -119,7 +125,7 @@ class WC_Report_Taxes_By_Code extends WC_Admin_Report {
 			'filter_range'        => true,
 			'order_types'         => array_merge( wc_get_order_types( 'sales-reports' ), array( 'shop_order_refund' ) ),
 			'order_status'        => array( 'completed', 'processing', 'on-hold' ),
-			'parent_order_status' => array( 'completed', 'processing', 'on-hold' ) // Partial refunds inside refunded orders should be ignored
+			'parent_order_status' => array( 'completed', 'processing', 'on-hold' ), // Partial refunds inside refunded orders should be ignored
 		) );
 
 		// Merge
@@ -143,13 +149,13 @@ class WC_Report_Taxes_By_Code extends WC_Admin_Report {
 				<tr>
 					<th><?php _e( 'Tax', 'woocommerce' ); ?></th>
 					<th><?php _e( 'Rate', 'woocommerce' ); ?></th>
-					<th class="total_row"><?php _e( 'Number of Orders', 'woocommerce' ); ?></th>
-					<th class="total_row"><?php _e( 'Tax Amount', 'woocommerce' ); ?> <?php echo wc_help_tip( __( 'This is the sum of the "Tax Rows" tax amount within your orders.', 'woocommerce' ) ); ?></th>
-					<th class="total_row"><?php _e( 'Shipping Tax Amount', 'woocommerce' ); ?> <?php echo wc_help_tip( __( 'This is the sum of the "Tax Rows" shipping tax amount within your orders.', 'woocommerce' ) ); ?></th>
-					<th class="total_row"><?php _e( 'Total Tax', 'woocommerce' ); ?> <?php echo wc_help_tip( __( 'This is the total tax for the rate (shipping tax + product tax).', 'woocommerce' ) ); ?></th>
+					<th class="total_row"><?php _e( 'Number of orders', 'woocommerce' ); ?></th>
+					<th class="total_row"><?php _e( 'Tax amount', 'woocommerce' ); ?> <?php echo wc_help_tip( __( 'This is the sum of the "Tax rows" tax amount within your orders.', 'woocommerce' ) ); ?></th>
+					<th class="total_row"><?php _e( 'Shipping tax amount', 'woocommerce' ); ?> <?php echo wc_help_tip( __( 'This is the sum of the "Tax rows" shipping tax amount within your orders.', 'woocommerce' ) ); ?></th>
+					<th class="total_row"><?php _e( 'Total tax', 'woocommerce' ); ?> <?php echo wc_help_tip( __( 'This is the total tax for the rate (shipping tax + product tax).', 'woocommerce' ) ); ?></th>
 				</tr>
 			</thead>
-			<?php if ( $tax_rows ) : ?>
+			<?php if ( ! empty( $tax_rows ) ) : ?>
 				<tbody>
 					<?php
 					foreach ( $tax_rows as $rate_id => $tax_row ) {
diff --git a/includes/admin/reports/class-wc-report-taxes-by-date.php b/includes/admin/reports/class-wc-report-taxes-by-date.php
index 2d21004d25b..2ffa0ea864e 100644
--- a/includes/admin/reports/class-wc-report-taxes-by-date.php
+++ b/includes/admin/reports/class-wc-report-taxes-by-date.php
@@ -1,4 +1,9 @@
 <?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+
 /**
  * WC_Report_Taxes_By_Date
  *
@@ -26,7 +31,7 @@ class WC_Report_Taxes_By_Date extends WC_Admin_Report {
 		?>
 		<a
 			href="#"
-			download="report-<?php echo esc_attr( $current_range ); ?>-<?php echo date_i18n( 'Y-m-d', current_time('timestamp') ); ?>.csv"
+			download="report-<?php echo esc_attr( $current_range ); ?>-<?php echo date_i18n( 'Y-m-d', current_time( 'timestamp' ) ); ?>.csv"
 			class="export_csv"
 			data-export="table"
 		>
@@ -42,8 +47,8 @@ class WC_Report_Taxes_By_Date extends WC_Admin_Report {
 
 		$ranges = array(
 			'year'         => __( 'Year', 'woocommerce' ),
-			'last_month'   => __( 'Last Month', 'woocommerce' ),
-			'month'        => __( 'This Month', 'woocommerce' ),
+			'last_month'   => __( 'Last month', 'woocommerce' ),
+			'month'        => __( 'This month', 'woocommerce' ),
 		);
 
 		$current_range = ! empty( $_GET['range'] ) ? sanitize_text_field( $_GET['range'] ) : 'last_month';
@@ -52,11 +57,12 @@ class WC_Report_Taxes_By_Date extends WC_Admin_Report {
 			$current_range = 'last_month';
 		}
 
+		$this->check_current_range_nonce( $current_range );
 		$this->calculate_current_range( $current_range );
 
 		$hide_sidebar = true;
 
-		include( WC()->plugin_path() . '/includes/admin/views/html-report-by-date.php');
+		include( WC()->plugin_path() . '/includes/admin/views/html-report-by-date.php' );
 	}
 
 	/**
@@ -69,22 +75,22 @@ class WC_Report_Taxes_By_Date extends WC_Admin_Report {
 			'_order_tax' => array(
 				'type'            => 'meta',
 				'function'        => 'SUM',
-				'name'            => 'tax_amount'
+				'name'            => 'tax_amount',
 			),
 			'_order_shipping_tax' => array(
 				'type'            => 'meta',
 				'function'        => 'SUM',
-				'name'            => 'shipping_tax_amount'
+				'name'            => 'shipping_tax_amount',
 			),
 			'_order_total' => array(
 				'type'     => 'meta',
 				'function' => 'SUM',
-				'name'     => 'total_sales'
+				'name'     => 'total_sales',
 			),
 			'_order_shipping' => array(
 				'type'     => 'meta',
 				'function' => 'SUM',
-				'name'     => 'total_shipping'
+				'name'     => 'total_shipping',
 			),
 			'ID' => array(
 				'type'     => 'post_data',
@@ -95,7 +101,7 @@ class WC_Report_Taxes_By_Date extends WC_Admin_Report {
 			'post_date' => array(
 				'type'     => 'post_data',
 				'function' => '',
-				'name'     => 'post_date'
+				'name'     => 'post_date',
 			),
 		);
 
@@ -106,7 +112,7 @@ class WC_Report_Taxes_By_Date extends WC_Admin_Report {
 			'query_type'   => 'get_results',
 			'filter_range' => true,
 			'order_types'  => wc_get_order_types( 'sales-reports' ),
-			'order_status' => array( 'completed', 'processing', 'on-hold' )
+			'order_status' => array( 'completed', 'processing', 'on-hold' ),
 		) );
 
 		$tax_rows_partial_refunds = $this->get_order_report_data( array(
@@ -116,14 +122,14 @@ class WC_Report_Taxes_By_Date extends WC_Admin_Report {
 			'query_type'          => 'get_results',
 			'filter_range'        => true,
 			'order_types'         => array( 'shop_order_refund' ),
-			'parent_order_status' => array( 'completed', 'processing', 'on-hold' ) // Partial refunds inside refunded orders should be ignored
+			'parent_order_status' => array( 'completed', 'processing', 'on-hold' ),// Partial refunds inside refunded orders should be ignored
 		) );
 
 		// Merge
 		$tax_rows = array();
 
 		foreach ( $tax_rows_orders as $tax_row ) {
-			$key                                   = date( $this->chart_groupby == 'month' ? 'Ym' : 'Ymd', strtotime( $tax_row->post_date ) );
+			$key                                   = date( ( 'month' === $this->chart_groupby ) ? 'Ym' : 'Ymd', strtotime( $tax_row->post_date ) );
 			$tax_rows[ $key ]                      = isset( $tax_rows[ $key ] ) ? $tax_rows[ $key ] : (object) array( 'tax_amount' => 0, 'shipping_tax_amount' => 0, 'total_sales' => 0, 'total_shipping' => 0, 'total_orders' => 0 );
 			$tax_rows[ $key ]->tax_amount          += $tax_row->tax_amount;
 			$tax_rows[ $key ]->shipping_tax_amount += $tax_row->shipping_tax_amount;
@@ -133,7 +139,7 @@ class WC_Report_Taxes_By_Date extends WC_Admin_Report {
 		}
 
 		foreach ( $tax_rows_partial_refunds as $tax_row ) {
-			$key                                   = date( $this->chart_groupby == 'month' ? 'Ym' : 'Ymd', strtotime( $tax_row->post_date ) );
+			$key                                   = date( ( 'month' === $this->chart_groupby ) ? 'Ym' : 'Ymd', strtotime( $tax_row->post_date ) );
 			$tax_rows[ $key ]                      = isset( $tax_rows[ $key ] ) ? $tax_rows[ $key ] : (object) array( 'tax_amount' => 0, 'shipping_tax_amount' => 0, 'total_sales' => 0, 'total_shipping' => 0, 'total_orders' => 0 );
 			$tax_rows[ $key ]->tax_amount          += $tax_row->tax_amount;
 			$tax_rows[ $key ]->shipping_tax_amount += $tax_row->shipping_tax_amount;
@@ -145,14 +151,14 @@ class WC_Report_Taxes_By_Date extends WC_Admin_Report {
 			<thead>
 				<tr>
 					<th><?php _e( 'Period', 'woocommerce' ); ?></th>
-					<th class="total_row"><?php _e( 'Number of Orders', 'woocommerce' ); ?></th>
-					<th class="total_row"><?php _e( 'Total Sales', 'woocommerce' ); ?> <?php echo wc_help_tip( __( "This is the sum of the 'Order Total' field within your orders.", 'woocommerce' ) ); ?></th>
-					<th class="total_row"><?php _e( 'Total Shipping', 'woocommerce' ); ?> <?php echo wc_help_tip( __( "This is the sum of the 'Shipping Total' field within your orders.", 'woocommerce' ) ); ?></th>
-					<th class="total_row"><?php _e( 'Total Tax', 'woocommerce' ); ?> <?php echo wc_help_tip( __( 'This is the total tax for the rate (shipping tax + product tax).', 'woocommerce' ) ); ?></th>
+					<th class="total_row"><?php _e( 'Number of orders', 'woocommerce' ); ?></th>
+					<th class="total_row"><?php _e( 'Total sales', 'woocommerce' ); ?> <?php echo wc_help_tip( __( "This is the sum of the 'Order total' field within your orders.", 'woocommerce' ) ); ?></th>
+					<th class="total_row"><?php _e( 'Total shipping', 'woocommerce' ); ?> <?php echo wc_help_tip( __( "This is the sum of the 'Shipping total' field within your orders.", 'woocommerce' ) ); ?></th>
+					<th class="total_row"><?php _e( 'Total tax', 'woocommerce' ); ?> <?php echo wc_help_tip( __( 'This is the total tax for the rate (shipping tax + product tax).', 'woocommerce' ) ); ?></th>
 					<th class="total_row"><?php _e( 'Net profit', 'woocommerce' ); ?> <?php echo wc_help_tip( __( "Total sales minus shipping and tax.", 'woocommerce' ) ); ?></th>
 				</tr>
 			</thead>
-			<?php if ( $tax_rows ) : ?>
+			<?php if ( ! empty( $tax_rows ) ) : ?>
 				<tbody>
 					<?php
 					foreach ( $tax_rows as $date => $tax_row ) {
@@ -160,12 +166,9 @@ class WC_Report_Taxes_By_Date extends WC_Admin_Report {
 						$total_tax = $tax_row->tax_amount + $tax_row->shipping_tax_amount;
 						?>
 						<tr>
-							<th scope="row"><?php
-								if ( $this->chart_groupby == 'month' )
-									echo date_i18n( 'F', strtotime( $date . '01' ) );
-								else
-									echo date_i18n( get_option( 'date_format' ), strtotime( $date ) );
-							?></th>
+							<th scope="row">
+								<?php echo ( 'month' === $this->chart_groupby ) ? date_i18n( 'F', strtotime( $date . '01' ) ) : date_i18n( get_option( 'date_format' ), strtotime( $date ) ); ?>
+							</th>
 							<td class="total_row"><?php echo $tax_row->total_orders; ?></td>
 							<td class="total_row"><?php echo wc_price( $gross ); ?></td>
 							<td class="total_row"><?php echo wc_price( $tax_row->total_shipping ); ?></td>
diff --git a/includes/admin/settings/class-wc-settings-accounts.php b/includes/admin/settings/class-wc-settings-accounts.php
index fba10618c7e..ea747d3d89e 100644
--- a/includes/admin/settings/class-wc-settings-accounts.php
+++ b/includes/admin/settings/class-wc-settings-accounts.php
@@ -12,7 +12,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
 
-if ( ! class_exists( 'WC_Settings_Accounts' ) ) :
+if ( ! class_exists( 'WC_Settings_Accounts', false ) ) :
 
 /**
  * WC_Settings_Accounts.
@@ -40,11 +40,11 @@ class WC_Settings_Accounts extends WC_Settings_Page {
 	public function get_settings() {
 		$settings = apply_filters( 'woocommerce_' . $this->id . '_settings', array(
 
-			array( 'title' => __( 'Account Pages', 'woocommerce' ), 'type' => 'title', 'desc' => __( 'These pages need to be set so that WooCommerce knows where to send users to access account related functionality.', 'woocommerce' ), 'id' => 'account_page_options' ),
+			array( 'title' => __( 'Account pages', 'woocommerce' ), 'type' => 'title', 'desc' => __( 'These pages need to be set so that WooCommerce knows where to send users to access account related functionality.', 'woocommerce' ), 'id' => 'account_page_options' ),
 
 			array(
-				'title'    => __( 'My Account Page', 'woocommerce' ),
-				'desc'     => __( 'Page contents:', 'woocommerce' ) . ' [' . apply_filters( 'woocommerce_my_account_shortcode_tag', 'woocommerce_my_account' ) . ']',
+				'title'    => __( 'My account page', 'woocommerce' ),
+				'desc'     => sprintf( __( 'Page contents: [%s]', 'woocommerce' ), apply_filters( 'woocommerce_my_account_shortcode_tag', 'woocommerce_my_account' ) ),
 				'id'       => 'woocommerce_myaccount_page_id',
 				'type'     => 'single_select_page',
 				'default'  => '',
@@ -55,93 +55,45 @@ class WC_Settings_Accounts extends WC_Settings_Page {
 
 			array( 'type' => 'sectionend', 'id' => 'account_page_options' ),
 
-			array( 'title' => __( 'My Account Endpoints', 'woocommerce' ), 'type' => 'title', 'desc' => __( 'Endpoints are appended to your page URLs to handle specific actions on the accounts pages. They should be unique.', 'woocommerce' ), 'id' => 'account_endpoint_options' ),
+			array( 'title' => '', 'type' => 'title', 'id' => 'account_registration_options' ),
 
 			array(
-				'title'    => __( 'View Order', 'woocommerce' ),
-				'desc'     => __( 'Endpoint for the My Account &rarr; View Order page', 'woocommerce' ),
-				'id'       => 'woocommerce_myaccount_view_order_endpoint',
-				'type'     => 'text',
-				'default'  => 'view-order',
-				'desc_tip' => true,
-			),
-
-			array(
-				'title'    => __( 'Edit Account', 'woocommerce' ),
-				'desc'     => __( 'Endpoint for the My Account &rarr; Edit Account page', 'woocommerce' ),
-				'id'       => 'woocommerce_myaccount_edit_account_endpoint',
-				'type'     => 'text',
-				'default'  => 'edit-account',
-				'desc_tip' => true,
-			),
-
-			array(
-				'title'    => __( 'Edit Address', 'woocommerce' ),
-				'desc'     => __( 'Endpoint for the My Account &rarr; Edit Address page', 'woocommerce' ),
-				'id'       => 'woocommerce_myaccount_edit_address_endpoint',
-				'type'     => 'text',
-				'default'  => 'edit-address',
-				'desc_tip' => true,
-			),
-
-			array(
-				'title'    => __( 'Lost Password', 'woocommerce' ),
-				'desc'     => __( 'Endpoint for the My Account &rarr; Lost Password page', 'woocommerce' ),
-				'id'       => 'woocommerce_myaccount_lost_password_endpoint',
-				'type'     => 'text',
-				'default'  => 'lost-password',
-				'desc_tip' => true,
-			),
-
-			array(
-				'title' => __( 'Logout', 'woocommerce' ),
-				'desc'     => __( 'Endpoint for the triggering logout. You can add this to your menus via a custom link: yoursite.com/?customer-logout=true', 'woocommerce' ),
-				'id'       => 'woocommerce_logout_endpoint',
-				'type'     => 'text',
-				'default'  => 'customer-logout',
-				'desc_tip' => true,
-			),
-
-			array( 'type' => 'sectionend', 'id' => 'account_endpoint_options' ),
-
-			array(	'title' => __( 'Registration Options', 'woocommerce' ), 'type' => 'title', 'id' => 'account_registration_options' ),
-
-			array(
-				'title'         => __( 'Enable Registration', 'woocommerce' ),
-				'desc'          => __( 'Enable registration on the "Checkout" page', 'woocommerce' ),
+				'title'         => __( 'Customer registration', 'woocommerce' ),
+				'desc'          => __( 'Enable customer registration on the "Checkout" page.', 'woocommerce' ),
 				'id'            => 'woocommerce_enable_signup_and_login_from_checkout',
 				'default'       => 'yes',
 				'type'          => 'checkbox',
 				'checkboxgroup' => 'start',
-				'autoload'      => false
+				'autoload'      => false,
 			),
 
 			array(
-				'desc'          => __( 'Enable registration on the "My Account" page', 'woocommerce' ),
+				'desc'          => __( 'Enable customer registration on the "My account" page.', 'woocommerce' ),
 				'id'            => 'woocommerce_enable_myaccount_registration',
 				'default'       => 'no',
 				'type'          => 'checkbox',
 				'checkboxgroup' => 'end',
-				'autoload'      => false
+				'autoload'      => false,
 			),
 
 			array(
-				'desc'          => __( 'Display returning customer login reminder on the "Checkout" page', 'woocommerce' ),
+				'title'         => __( 'Login', 'woocommerce' ),
+				'desc'          => __( 'Display returning customer login reminder on the "Checkout" page.', 'woocommerce' ),
 				'id'            => 'woocommerce_enable_checkout_login_reminder',
 				'default'       => 'yes',
 				'type'          => 'checkbox',
 				'checkboxgroup' => 'start',
-				'autoload'      => false
+				'autoload'      => false,
 			),
 
 			array(
-				'title'         => __( 'Account Creation', 'woocommerce' ),
-				'desc'          => __( 'Automatically generate username from customer email', 'woocommerce' ),
+				'title'         => __( 'Account creation', 'woocommerce' ),
+				'desc'          => __( 'Automatically generate username from customer email.', 'woocommerce' ),
 				'id'            => 'woocommerce_registration_generate_username',
 				'default'       => 'yes',
 				'type'          => 'checkbox',
 				'checkboxgroup' => 'start',
-				'autoload'      => false
+				'autoload'      => false,
 			),
 
 			array(
@@ -150,10 +102,86 @@ class WC_Settings_Accounts extends WC_Settings_Page {
 				'default'       => 'no',
 				'type'          => 'checkbox',
 				'checkboxgroup' => 'end',
-				'autoload'      => false
+				'autoload'      => false,
 			),
 
-			array( 'type' => 'sectionend', 'id' => 'account_registration_options'),
+			array( 'type' => 'sectionend', 'id' => 'account_registration_options' ),
+
+			array( 'title' => __( 'My account endpoints', 'woocommerce' ), 'type' => 'title', 'desc' => __( 'Endpoints are appended to your page URLs to handle specific actions on the accounts pages. They should be unique and can be left blank to disable the endpoint.', 'woocommerce' ), 'id' => 'account_endpoint_options' ),
+
+			array(
+				'title'    => __( 'Orders', 'woocommerce' ),
+				'desc'     => __( 'Endpoint for the "My account &rarr; Orders" page.', 'woocommerce' ),
+				'id'       => 'woocommerce_myaccount_orders_endpoint',
+				'type'     => 'text',
+				'default'  => 'orders',
+				'desc_tip' => true,
+			),
+
+			array(
+				'title'    => __( 'View order', 'woocommerce' ),
+				'desc'     => __( 'Endpoint for the "My account &rarr; View order" page.', 'woocommerce' ),
+				'id'       => 'woocommerce_myaccount_view_order_endpoint',
+				'type'     => 'text',
+				'default'  => 'view-order',
+				'desc_tip' => true,
+			),
+
+			array(
+				'title'    => __( 'Downloads', 'woocommerce' ),
+				'desc'     => __( 'Endpoint for the "My account &rarr; Downloads" page.', 'woocommerce' ),
+				'id'       => 'woocommerce_myaccount_downloads_endpoint',
+				'type'     => 'text',
+				'default'  => 'downloads',
+				'desc_tip' => true,
+			),
+
+			array(
+				'title'    => __( 'Edit account', 'woocommerce' ),
+				'desc'     => __( 'Endpoint for the "My account &rarr; Edit account" page.', 'woocommerce' ),
+				'id'       => 'woocommerce_myaccount_edit_account_endpoint',
+				'type'     => 'text',
+				'default'  => 'edit-account',
+				'desc_tip' => true,
+			),
+
+			array(
+				'title'    => __( 'Addresses', 'woocommerce' ),
+				'desc'     => __( 'Endpoint for the "My account &rarr; Addresses" page.', 'woocommerce' ),
+				'id'       => 'woocommerce_myaccount_edit_address_endpoint',
+				'type'     => 'text',
+				'default'  => 'edit-address',
+				'desc_tip' => true,
+			),
+
+			array(
+				'title'    => __( 'Payment methods', 'woocommerce' ),
+				'desc'     => __( 'Endpoint for the "My account &rarr; Payment methods" page.', 'woocommerce' ),
+				'id'       => 'woocommerce_myaccount_payment_methods_endpoint',
+				'type'     => 'text',
+				'default'  => 'payment-methods',
+				'desc_tip' => true,
+			),
+
+			array(
+				'title'    => __( 'Lost password', 'woocommerce' ),
+				'desc'     => __( 'Endpoint for the "My account &rarr; Lost password" page.', 'woocommerce' ),
+				'id'       => 'woocommerce_myaccount_lost_password_endpoint',
+				'type'     => 'text',
+				'default'  => 'lost-password',
+				'desc_tip' => true,
+			),
+
+			array(
+				'title'    => __( 'Logout', 'woocommerce' ),
+				'desc'     => __( 'Endpoint for the triggering logout. You can add this to your menus via a custom link: yoursite.com/?customer-logout=true', 'woocommerce' ),
+				'id'       => 'woocommerce_logout_endpoint',
+				'type'     => 'text',
+				'default'  => 'customer-logout',
+				'desc_tip' => true,
+			),
+
+			array( 'type' => 'sectionend', 'id' => 'account_endpoint_options' ),
 
 		) );
 
diff --git a/includes/admin/settings/class-wc-settings-api.php b/includes/admin/settings/class-wc-settings-api.php
index 2f22a515cde..281e03a6b5f 100644
--- a/includes/admin/settings/class-wc-settings-api.php
+++ b/includes/admin/settings/class-wc-settings-api.php
@@ -12,7 +12,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
 
-if ( ! class_exists( 'WC_Settings_Rest_API' ) ) :
+if ( ! class_exists( 'WC_Settings_Rest_API', false ) ) :
 
 /**
  * WC_Settings_Rest_API.
@@ -44,7 +44,7 @@ class WC_Settings_Rest_API extends WC_Settings_Page {
 		$sections = array(
 			''         => __( 'Settings', 'woocommerce' ),
 			'keys'     => __( 'Keys/Apps', 'woocommerce' ),
-			'webhooks' => __( 'Webhooks', 'woocommerce' )
+			'webhooks' => __( 'Webhooks', 'woocommerce' ),
 		);
 
 		return apply_filters( 'woocommerce_get_sections_' . $this->id, $sections );
@@ -58,10 +58,10 @@ class WC_Settings_Rest_API extends WC_Settings_Page {
 	public function get_settings() {
 		$settings = apply_filters( 'woocommerce_settings_rest_api', array(
 			array(
-				'title' => __( 'General Options', 'woocommerce' ),
+				'title' => __( 'General options', 'woocommerce' ),
 				'type'  => 'title',
 				'desc'  => '',
-				'id'    => 'general_options'
+				'id'    => 'general_options',
 			),
 
 			array(
@@ -74,7 +74,7 @@ class WC_Settings_Rest_API extends WC_Settings_Page {
 
 			array(
 				'type' => 'sectionend',
-				'id' => 'general_options'
+				'id' => 'general_options',
 			),
 		) );
 
@@ -135,7 +135,7 @@ class WC_Settings_Rest_API extends WC_Settings_Page {
 
 		if ( 'webhooks' == $current_section ) {
 			WC_Admin_Webhooks::page_output();
-		} else if ( 'keys' == $current_section ) {
+		} elseif ( 'keys' === $current_section ) {
 			WC_Admin_API_Keys::page_output();
 		} else {
 			$settings = $this->get_settings( $current_section );
diff --git a/includes/admin/settings/class-wc-settings-checkout.php b/includes/admin/settings/class-wc-settings-checkout.php
index aedf3cacc3a..96a752de3d5 100644
--- a/includes/admin/settings/class-wc-settings-checkout.php
+++ b/includes/admin/settings/class-wc-settings-checkout.php
@@ -12,7 +12,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
-if ( ! class_exists( 'WC_Settings_Payment_Gateways' ) ) :
+if ( ! class_exists( 'WC_Settings_Payment_Gateways', false ) ) :
 
 /**
  * WC_Settings_Payment_Gateways.
@@ -41,16 +41,15 @@ class WC_Settings_Payment_Gateways extends WC_Settings_Page {
 	 */
 	public function get_sections() {
 		$sections = array(
-			'' => __( 'Checkout Options', 'woocommerce' )
+			'' => __( 'Checkout options', 'woocommerce' ),
 		);
 
 		if ( ! defined( 'WC_INSTALLING' ) ) {
-			// Load shipping methods so we can show any global options they may have.
 			$payment_gateways = WC()->payment_gateways->payment_gateways();
 
 			foreach ( $payment_gateways as $gateway ) {
 				$title = empty( $gateway->method_title ) ? ucfirst( $gateway->id ) : $gateway->method_title;
-				$sections[ strtolower( get_class( $gateway ) ) ] = esc_html( $title );
+				$sections[ strtolower( $gateway->id ) ] = esc_html( $title );
 			}
 		}
 
@@ -62,170 +61,195 @@ class WC_Settings_Payment_Gateways extends WC_Settings_Page {
 	 *
 	 * @return array
 	 */
-	public function get_settings() {
-		$settings = apply_filters( 'woocommerce_payment_gateways_settings', array(
+	public function get_settings( $current_section = '' ) {
+		$settings = array();
 
-			array(
-				'title' => __( 'Checkout Process', 'woocommerce' ),
-				'type'  => 'title',
-				'id'    => 'checkout_process_options',
-			),
+		if ( '' === $current_section ) {
+			$settings = apply_filters( 'woocommerce_payment_gateways_settings', array(
 
-			array(
-				'title'         => __( 'Coupons', 'woocommerce' ),
-				'desc'          => __( 'Enable the use of coupons', 'woocommerce' ),
-				'id'            => 'woocommerce_enable_coupons',
-				'default'       => 'yes',
-				'type'          => 'checkbox',
-				'checkboxgroup' => 'start',
-				'desc_tip'      =>  __( 'Coupons can be applied from the cart and checkout pages.', 'woocommerce' ),
-				'autoload'      => false,
-			),
+				array(
+					'title' => __( 'Checkout process', 'woocommerce' ),
+					'type'  => 'title',
+					'id'    => 'checkout_process_options',
+				),
 
-			array(
-				'desc'          => __( 'Calculate coupon discounts sequentially', 'woocommerce' ),
-				'id'            => 'woocommerce_calc_discounts_sequentially',
-				'default'       => 'no',
-				'type'          => 'checkbox',
-				'desc_tip'      =>  __( 'When applying multiple coupons, apply the first coupon to the full price and the second coupon to the discounted price and so on.', 'woocommerce' ),
-				'checkboxgroup' => 'end',
-				'autoload'      => false,
-			),
+				array(
+					'title'         => __( 'Coupons', 'woocommerce' ),
+					'desc'          => __( 'Enable the use of coupons', 'woocommerce' ),
+					'id'            => 'woocommerce_enable_coupons',
+					'default'       => 'yes',
+					'type'          => 'checkbox',
+					'checkboxgroup' => 'start',
+					'desc_tip'      => __( 'Coupons can be applied from the cart and checkout pages.', 'woocommerce' ),
+				),
 
-			array(
-				'title'         => _x( 'Checkout', 'Settings group label', 'woocommerce' ),
-				'desc'          => __( 'Enable guest checkout', 'woocommerce' ),
-				'desc_tip'      =>  __( 'Allows customers to checkout without creating an account.', 'woocommerce' ),
-				'id'            => 'woocommerce_enable_guest_checkout',
-				'default'       => 'yes',
-				'type'          => 'checkbox',
-				'checkboxgroup' => 'start',
-				'autoload'      => false,
-			),
+				array(
+					'desc'          => __( 'Calculate coupon discounts sequentially', 'woocommerce' ),
+					'id'            => 'woocommerce_calc_discounts_sequentially',
+					'default'       => 'no',
+					'type'          => 'checkbox',
+					'desc_tip'      => __( 'When applying multiple coupons, apply the first coupon to the full price and the second coupon to the discounted price and so on.', 'woocommerce' ),
+					'checkboxgroup' => 'end',
+					'autoload'      => false,
+				),
 
-			array(
-				'desc'            => __( 'Force secure checkout', 'woocommerce' ),
-				'id'              => 'woocommerce_force_ssl_checkout',
-				'default'         => 'no',
-				'type'            => 'checkbox',
-				'checkboxgroup'   => '',
-				'show_if_checked' => 'option',
-				'desc_tip'        => __( 'Force SSL (HTTPS) on the checkout pages (a SSL Certificate is required).', 'woocommerce' ),
-			),
+				array(
+					'title'         => __( 'Checkout process', 'woocommerce' ),
+					'desc'          => __( 'Enable guest checkout', 'woocommerce' ),
+					'desc_tip'      => __( 'Allows customers to checkout without creating an account.', 'woocommerce' ),
+					'id'            => 'woocommerce_enable_guest_checkout',
+					'default'       => 'yes',
+					'type'          => 'checkbox',
+					'checkboxgroup' => 'start',
+					'autoload'      => false,
+				),
 
-			array(
-				'desc'            => __( 'Force HTTP when leaving the checkout', 'woocommerce' ),
-				'id'              => 'woocommerce_unforce_ssl_checkout',
-				'default'         => 'no',
-				'type'            => 'checkbox',
-				'checkboxgroup'   => 'end',
-				'show_if_checked' => 'yes',
-			),
+				array(
+					'desc'            => __( 'Force secure checkout', 'woocommerce' ),
+					'id'              => 'woocommerce_force_ssl_checkout',
+					'default'         => 'no',
+					'type'            => 'checkbox',
+					'checkboxgroup'   => '',
+					'show_if_checked' => 'option',
+					'desc_tip'        => sprintf( __( 'Force SSL (HTTPS) on the checkout pages (<a href="%s" target="_blank">an SSL Certificate is required</a>).', 'woocommerce' ), 'https://docs.woocommerce.com/document/ssl-and-https/#section-3' ),
+				),
 
-			array(
-				'type' => 'sectionend',
-				'id' => 'checkout_process_options',
-			),
+				'unforce_ssl_checkout' => array(
+					'desc'            => __( 'Force HTTP when leaving the checkout', 'woocommerce' ),
+					'id'              => 'woocommerce_unforce_ssl_checkout',
+					'default'         => 'no',
+					'type'            => 'checkbox',
+					'checkboxgroup'   => 'end',
+					'show_if_checked' => 'yes',
+				),
 
-			array(
-				'title' => __( 'Checkout Pages', 'woocommerce' ),
-				'desc'  => __( 'These pages need to be set so that WooCommerce knows where to send users to checkout.', 'woocommerce' ),
-				'type'  => 'title',
-				'id'    => 'checkout_page_options',
-			),
+				array(
+					'type' => 'sectionend',
+					'id' => 'checkout_process_options',
+				),
 
-			array(
-				'title'    => __( 'Cart Page', 'woocommerce' ),
-				'desc'     => __( 'Page contents:', 'woocommerce' ) . ' [' . apply_filters( 'woocommerce_cart_shortcode_tag', 'woocommerce_cart' ) . ']',
-				'id'       => 'woocommerce_cart_page_id',
-				'type'     => 'single_select_page',
-				'default'  => '',
-				'class'    => 'wc-enhanced-select-nostd',
-				'css'      => 'min-width:300px;',
-				'desc_tip' => true,
-			),
+				array(
+					'title' => __( 'Checkout pages', 'woocommerce' ),
+					'desc'  => __( 'These pages need to be set so that WooCommerce knows where to send users to checkout.', 'woocommerce' ),
+					'type'  => 'title',
+					'id'    => 'checkout_page_options',
+				),
 
-			array(
-				'title'    => __( 'Checkout Page', 'woocommerce' ),
-				'desc'     => __( 'Page contents:', 'woocommerce' ) . ' [' . apply_filters( 'woocommerce_checkout_shortcode_tag', 'woocommerce_checkout' ) . ']',
-				'id'       => 'woocommerce_checkout_page_id',
-				'type'     => 'single_select_page',
-				'default'  => '',
-				'class'    => 'wc-enhanced-select-nostd',
-				'css'      => 'min-width:300px;',
-				'desc_tip' => true,
-			),
+				array(
+					'title'    => __( 'Cart page', 'woocommerce' ),
+					'desc'     => sprintf( __( 'Page contents: [%s]', 'woocommerce' ), apply_filters( 'woocommerce_cart_shortcode_tag', 'woocommerce_cart' ) ),
+					'id'       => 'woocommerce_cart_page_id',
+					'type'     => 'single_select_page',
+					'default'  => '',
+					'class'    => 'wc-enhanced-select-nostd',
+					'css'      => 'min-width:300px;',
+					'desc_tip' => true,
+				),
 
-			array(
-				'title'    => __( 'Terms and Conditions', 'woocommerce' ),
-				'desc'     => __( 'If you define a "Terms" page the customer will be asked if they accept them when checking out.', 'woocommerce' ),
-				'id'       => 'woocommerce_terms_page_id',
-				'default'  => '',
-				'class'    => 'wc-enhanced-select-nostd',
-				'css'      => 'min-width:300px;',
-				'type'     => 'single_select_page',
-				'desc_tip' => true,
-				'autoload' => false,
-			),
+				array(
+					'title'    => __( 'Checkout page', 'woocommerce' ),
+					'desc'     => sprintf( __( 'Page contents: [%s]', 'woocommerce' ), apply_filters( 'woocommerce_checkout_shortcode_tag', 'woocommerce_checkout' ) ),
+					'id'       => 'woocommerce_checkout_page_id',
+					'type'     => 'single_select_page',
+					'default'  => '',
+					'class'    => 'wc-enhanced-select-nostd',
+					'css'      => 'min-width:300px;',
+					'desc_tip' => true,
+				),
 
-			array(
-				'type' => 'sectionend',
-				'id' => 'checkout_page_options',
-			),
+				array(
+					'title'    => __( 'Terms and conditions', 'woocommerce' ),
+					'desc'     => __( 'If you define a "Terms" page the customer will be asked if they accept them when checking out.', 'woocommerce' ),
+					'id'       => 'woocommerce_terms_page_id',
+					'default'  => '',
+					'class'    => 'wc-enhanced-select-nostd',
+					'css'      => 'min-width:300px;',
+					'type'     => 'single_select_page',
+					'desc_tip' => true,
+					'autoload' => false,
+				),
 
-			array( 'title' => __( 'Checkout Endpoints', 'woocommerce' ), 'type' => 'title', 'desc' => __( 'Endpoints are appended to your page URLs to handle specific actions during the checkout process. They should be unique.', 'woocommerce' ), 'id' => 'account_endpoint_options' ),
+				array(
+					'type' => 'sectionend',
+					'id' => 'checkout_page_options',
+				),
 
-			array(
-				'title'    => __( 'Pay', 'woocommerce' ),
-				'desc'     => __( 'Endpoint for the Checkout &rarr; Pay page', 'woocommerce' ),
-				'id'       => 'woocommerce_checkout_pay_endpoint',
-				'type'     => 'text',
-				'default'  => 'order-pay',
-				'desc_tip' => true,
-			),
+				array( 'title' => __( 'Checkout endpoints', 'woocommerce' ), 'type' => 'title', 'desc' => __( 'Endpoints are appended to your page URLs to handle specific actions during the checkout process. They should be unique.', 'woocommerce' ), 'id' => 'account_endpoint_options' ),
 
-			array(
-				'title'    => __( 'Order Received', 'woocommerce' ),
-				'desc'     => __( 'Endpoint for the Checkout &rarr; Order Received page', 'woocommerce' ),
-				'id'       => 'woocommerce_checkout_order_received_endpoint',
-				'type'     => 'text',
-				'default'  => 'order-received',
-				'desc_tip' => true,
-			),
+				array(
+					'title'    => __( 'Pay', 'woocommerce' ),
+					'desc'     => __( 'Endpoint for the "Checkout &rarr; Pay" page.', 'woocommerce' ),
+					'id'       => 'woocommerce_checkout_pay_endpoint',
+					'type'     => 'text',
+					'default'  => 'order-pay',
+					'desc_tip' => true,
+				),
 
-			array(
-				'title'    => __( 'Add Payment Method', 'woocommerce' ),
-				'desc'     => __( 'Endpoint for the Checkout &rarr; Add Payment Method page', 'woocommerce' ),
-				'id'       => 'woocommerce_myaccount_add_payment_method_endpoint',
-				'type'     => 'text',
-				'default'  => 'add-payment-method',
-				'desc_tip' => true,
-			),
+				array(
+					'title'    => __( 'Order received', 'woocommerce' ),
+					'desc'     => __( 'Endpoint for the "Checkout &rarr; Order received" page.', 'woocommerce' ),
+					'id'       => 'woocommerce_checkout_order_received_endpoint',
+					'type'     => 'text',
+					'default'  => 'order-received',
+					'desc_tip' => true,
+				),
 
-			array(
-				'type' => 'sectionend',
-				'id' => 'checkout_endpoint_options',
-			),
+				array(
+					'title'    => __( 'Add payment method', 'woocommerce' ),
+					'desc'     => __( 'Endpoint for the "Checkout &rarr; Add payment method" page.', 'woocommerce' ),
+					'id'       => 'woocommerce_myaccount_add_payment_method_endpoint',
+					'type'     => 'text',
+					'default'  => 'add-payment-method',
+					'desc_tip' => true,
+				),
 
-			array(
-				'title' => __( 'Payment Gateways', 'woocommerce' ),
-				'desc'  => __( 'Installed gateways are listed below. Drag and drop gateways to control their display order on the frontend.', 'woocommerce' ),
-				'type'  => 'title',
-				'id'    => 'payment_gateways_options',
-			),
+				array(
+					'title'    => __( 'Delete payment method', 'woocommerce' ),
+					'desc'     => __( 'Endpoint for the delete payment method page.', 'woocommerce' ),
+					'id'       => 'woocommerce_myaccount_delete_payment_method_endpoint',
+					'type'     => 'text',
+					'default'  => 'delete-payment-method',
+					'desc_tip' => true,
+				),
 
-			array(
-				'type' => 'payment_gateways',
-			),
+				array(
+					'title'    => __( 'Set default payment method', 'woocommerce' ),
+					'desc'     => __( 'Endpoint for the setting a default payment method page.', 'woocommerce' ),
+					'id'       => 'woocommerce_myaccount_set_default_payment_method_endpoint',
+					'type'     => 'text',
+					'default'  => 'set-default-payment-method',
+					'desc_tip' => true,
+				),
 
-			array(
-				'type' => 'sectionend',
-				'id' => 'payment_gateways_options',
-			),
+				array(
+					'type' => 'sectionend',
+					'id' => 'checkout_endpoint_options',
+				),
 
-		) );
+				array(
+					'title' => __( 'Payment gateways', 'woocommerce' ),
+					'desc'  => __( 'Installed gateways are listed below. Drag and drop gateways to control their display order on the frontend.', 'woocommerce' ),
+					'type'  => 'title',
+					'id'    => 'payment_gateways_options',
+				),
 
-		return apply_filters( 'woocommerce_get_settings_' . $this->id, $settings );
+				array(
+					'type' => 'payment_gateways',
+				),
+
+				array(
+					'type' => 'sectionend',
+					'id' => 'payment_gateways_options',
+				),
+
+			) );
+
+			if ( wc_site_is_https() ) {
+				unset( $settings['unforce_ssl_checkout'] );
+			}
+		}
+
+		return apply_filters( 'woocommerce_get_settings_' . $this->id, $settings, $current_section );
 	}
 
 	/**
@@ -238,10 +262,8 @@ class WC_Settings_Payment_Gateways extends WC_Settings_Page {
 		$payment_gateways = WC()->payment_gateways->payment_gateways();
 
 		if ( $current_section ) {
-
 			foreach ( $payment_gateways as $gateway ) {
-
-				if ( strtolower( get_class( $gateway ) ) == strtolower( $current_section ) ) {
+				if ( in_array( $current_section, array( $gateway->id, sanitize_title( get_class( $gateway ) ) ) ) ) {
 					$gateway->admin_options();
 					break;
 				}
@@ -259,7 +281,7 @@ class WC_Settings_Payment_Gateways extends WC_Settings_Page {
 	public function payment_gateways_setting() {
 		?>
 		<tr valign="top">
-			<th scope="row" class="titledesc"><?php _e( 'Gateway Display Order', 'woocommerce' ) ?></th>
+			<th scope="row" class="titledesc"><?php _e( 'Gateway display order', 'woocommerce' ) ?></th>
 			<td class="forminp">
 				<table class="wc_gateways widefat" cellspacing="0">
 					<thead>
@@ -269,7 +291,7 @@ class WC_Settings_Payment_Gateways extends WC_Settings_Page {
 									'sort'     => '',
 									'name'     => __( 'Gateway', 'woocommerce' ),
 									'id'       => __( 'Gateway ID', 'woocommerce' ),
-									'status'   => __( 'Enabled', 'woocommerce' )
+									'status'   => __( 'Enabled', 'woocommerce' ),
 								) );
 
 								foreach ( $columns as $key => $column ) {
@@ -297,7 +319,7 @@ class WC_Settings_Payment_Gateways extends WC_Settings_Page {
 									case 'name' :
 										$method_title = $gateway->get_title() ? $gateway->get_title() : __( '(no title)', 'woocommerce' );
 										echo '<td class="name">
-											<a href="' . admin_url( 'admin.php?page=wc-settings&tab=checkout&section=' . strtolower( get_class( $gateway ) ) ) . '">' . esc_html( $method_title ) . '</a>
+											<a href="' . admin_url( 'admin.php?page=wc-settings&tab=checkout&section=' . strtolower( $gateway->id ) ) . '">' . esc_html( $method_title ) . '</a>
 										</td>';
 										break;
 
@@ -307,12 +329,7 @@ class WC_Settings_Payment_Gateways extends WC_Settings_Page {
 
 									case 'status' :
 										echo '<td class="status">';
-
-										if ( $gateway->enabled == 'yes' )
-											echo '<span class="status-enabled tips" data-tip="' . __ ( 'Yes', 'woocommerce' ) . '">' . __ ( 'Yes', 'woocommerce' ) . '</span>';
-										else
-											echo '-';
-
+										echo ( 'yes' === $gateway->enabled ) ? '<span class="status-enabled tips" data-tip="' . esc_attr__( 'Yes', 'woocommerce' ) . '">' . esc_html__( 'Yes', 'woocommerce' ) . '</span>' : '-';
 										echo '</td>';
 										break;
 
@@ -346,7 +363,7 @@ class WC_Settings_Payment_Gateways extends WC_Settings_Page {
 
 		} else {
 			foreach ( $wc_payment_gateways->payment_gateways() as $gateway ) {
-				if ( $current_section === sanitize_title( get_class( $gateway ) ) ) {
+				if ( in_array( $current_section, array( $gateway->id, sanitize_title( get_class( $gateway ) ) ) ) ) {
 					do_action( 'woocommerce_update_options_payment_gateways_' . $gateway->id );
 					$wc_payment_gateways->init();
 				}
diff --git a/includes/admin/settings/class-wc-settings-emails.php b/includes/admin/settings/class-wc-settings-emails.php
index 270291caee6..79ce1838dbb 100644
--- a/includes/admin/settings/class-wc-settings-emails.php
+++ b/includes/admin/settings/class-wc-settings-emails.php
@@ -12,7 +12,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
 
-if ( ! class_exists( 'WC_Settings_Emails' ) ) :
+if ( ! class_exists( 'WC_Settings_Emails', false ) ) :
 
 /**
  * WC_Settings_Emails.
@@ -40,7 +40,7 @@ class WC_Settings_Emails extends WC_Settings_Page {
 	 */
 	public function get_sections() {
 		$sections = array(
-			'' => __( 'Email Options', 'woocommerce' )
+			'' => __( 'Email options', 'woocommerce' ),
 		);
 		return apply_filters( 'woocommerce_get_sections_' . $this->id, $sections );
 	}
@@ -53,7 +53,7 @@ class WC_Settings_Emails extends WC_Settings_Page {
 	public function get_settings() {
 		$settings = apply_filters( 'woocommerce_email_settings', array(
 
-			array( 'title' => __( 'Email Notifications', 'woocommerce' ),  'desc' => __( 'Email notifications sent from WooCommerce are listed below. Click on an email to configure it.', 'woocommerce' ), 'type' => 'title', 'id' => 'email_notification_settings' ),
+			array( 'title' => __( 'Email notifications', 'woocommerce' ),  'desc' => __( 'Email notifications sent from WooCommerce are listed below. Click on an email to configure it.', 'woocommerce' ), 'type' => 'title', 'id' => 'email_notification_settings' ),
 
 			array( 'type' => 'email_notification' ),
 
@@ -61,39 +61,39 @@ class WC_Settings_Emails extends WC_Settings_Page {
 
 			array( 'type' => 'sectionend', 'id' => 'email_recipient_options' ),
 
-			array( 'title' => __( 'Email Sender Options', 'woocommerce' ), 'type' => 'title', 'desc' => '', 'id' => 'email_options' ),
+			array( 'title' => __( 'Email sender options', 'woocommerce' ), 'type' => 'title', 'desc' => '', 'id' => 'email_options' ),
 
 			array(
-				'title'    => __( '"From" Name', 'woocommerce' ),
-				'desc'     => __( 'How the sender\'s name appears in outgoing WooCommerce emails.', 'woocommerce' ),
+				'title'    => __( '"From" name', 'woocommerce' ),
+				'desc'     => __( 'How the sender name appears in outgoing WooCommerce emails.', 'woocommerce' ),
 				'id'       => 'woocommerce_email_from_name',
 				'type'     => 'text',
 				'css'      => 'min-width:300px;',
 				'default'  => esc_attr( get_bloginfo( 'name', 'display' ) ),
 				'autoload' => false,
-				'desc_tip' => true
+				'desc_tip' => true,
 			),
 
 			array(
-				'title'             => __( '"From" Address', 'woocommerce' ),
-				'desc'              => __( 'How the sender\'s email appears in outgoing WooCommerce emails.', 'woocommerce' ),
+				'title'             => __( '"From" address', 'woocommerce' ),
+				'desc'              => __( 'How the sender email appears in outgoing WooCommerce emails.', 'woocommerce' ),
 				'id'                => 'woocommerce_email_from_address',
 				'type'              => 'email',
 				'custom_attributes' => array(
-					'multiple' => 'multiple'
+					'multiple' => 'multiple',
 				),
 				'css'               => 'min-width:300px;',
 				'default'           => get_option( 'admin_email' ),
 				'autoload'          => false,
-				'desc_tip'          => true
+				'desc_tip'          => true,
 			),
 
 			array( 'type' => 'sectionend', 'id' => 'email_options' ),
 
-			array( 'title' => __( 'Email Template', 'woocommerce' ), 'type' => 'title', 'desc' => sprintf(__( 'This section lets you customize the WooCommerce emails. <a href="%s" target="_blank">Click here to preview your email template</a>.', 'woocommerce' ), wp_nonce_url( admin_url( '?preview_woocommerce_mail=true' ), 'preview-mail' ) ), 'id' => 'email_template_options' ),
+			array( 'title' => __( 'Email template', 'woocommerce' ), 'type' => 'title', 'desc' => sprintf( __( 'This section lets you customize the WooCommerce emails. <a href="%s" target="_blank">Click here to preview your email template</a>.', 'woocommerce' ), wp_nonce_url( admin_url( '?preview_woocommerce_mail=true' ), 'preview-mail' ) ), 'id' => 'email_template_options' ),
 
 			array(
-				'title'       => __( 'Header Image', 'woocommerce' ),
+				'title'       => __( 'Header image', 'woocommerce' ),
 				'desc'        => __( 'URL to an image you want to show in the email header. Upload images using the media uploader (Admin > Media).', 'woocommerce' ),
 				'id'          => 'woocommerce_email_header_image',
 				'type'        => 'text',
@@ -101,66 +101,71 @@ class WC_Settings_Emails extends WC_Settings_Page {
 				'placeholder' => __( 'N/A', 'woocommerce' ),
 				'default'     => '',
 				'autoload'    => false,
-				'desc_tip'    => true
+				'desc_tip'    => true,
 			),
 
 			array(
-				'title'       => __( 'Footer Text', 'woocommerce' ),
+				'title'       => __( 'Footer text', 'woocommerce' ),
 				'desc'        => __( 'The text to appear in the footer of WooCommerce emails.', 'woocommerce' ),
 				'id'          => 'woocommerce_email_footer_text',
 				'css'         => 'width:300px; height: 75px;',
 				'placeholder' => __( 'N/A', 'woocommerce' ),
 				'type'        => 'textarea',
-				'default'     => get_bloginfo( 'name', 'display' ) . ' - ' . __( 'Powered by WooCommerce', 'woocommerce' ),
+				/* translators: %s: site name */
+				'default'     => sprintf( __( '%s - Powered by WooCommerce', 'woocommerce' ), get_bloginfo( 'name', 'display' ) ),
 				'autoload'    => false,
-				'desc_tip'    => true
+				'desc_tip'    => true,
 			),
 
 			array(
-				'title'    => __( 'Base Colour', 'woocommerce' ),
-				'desc'     => __( 'The base colour for WooCommerce email templates. Default <code>#557da1</code>.', 'woocommerce' ),
+				'title'    => __( 'Base color', 'woocommerce' ),
+				/* translators: %s: default color */
+				'desc'     => sprintf( __( 'The base color for WooCommerce email templates. Default %s.', 'woocommerce' ), '<code>#96588a</code>' ),
 				'id'       => 'woocommerce_email_base_color',
 				'type'     => 'color',
 				'css'      => 'width:6em;',
-				'default'  => '#557da1',
+				'default'  => '#96588a',
 				'autoload' => false,
-				'desc_tip' => true
+				'desc_tip' => true,
 			),
 
 			array(
-				'title'    => __( 'Background Colour', 'woocommerce' ),
-				'desc'     => __( 'The background colour for WooCommerce email templates. Default <code>#f5f5f5</code>.', 'woocommerce' ),
+				'title'    => __( 'Background color', 'woocommerce' ),
+				/* translators: %s: default color */
+				'desc'     => sprintf( __( 'The background color for WooCommerce email templates. Default %s.', 'woocommerce' ), '<code>#f7f7f7</code>' ),
 				'id'       => 'woocommerce_email_background_color',
 				'type'     => 'color',
 				'css'      => 'width:6em;',
-				'default'  => '#f5f5f5',
+				'default'  => '#f7f7f7',
 				'autoload' => false,
-				'desc_tip' => true
+				'desc_tip' => true,
 			),
 
 			array(
-				'title'    => __( 'Body Background Colour', 'woocommerce' ),
-				'desc'     => __( 'The main body background colour. Default <code>#fdfdfd</code>.', 'woocommerce' ),
+				'title'    => __( 'Body background color', 'woocommerce' ),
+				/* translators: %s: default color */
+				'desc'     => sprintf( __( 'The main body background color. Default %s.', 'woocommerce' ), '<code>#ffffff</code>' ),
 				'id'       => 'woocommerce_email_body_background_color',
 				'type'     => 'color',
 				'css'      => 'width:6em;',
-				'default'  => '#fdfdfd',
+				'default'  => '#ffffff',
 				'autoload' => false,
-				'desc_tip' => true
+				'desc_tip' => true,
 			),
 
 			array(
-				'title'    => __( 'Body Text Colour', 'woocommerce' ),
-				'desc'     => __( 'The main body text colour. Default <code>#505050</code>.', 'woocommerce' ),
+				'title'    => __( 'Body text color', 'woocommerce' ),
+				/* translators: %s: default color */
+				'desc'     => sprintf( __( 'The main body text color. Default %s.', 'woocommerce' ), '<code>#3c3c3c</code>' ),
 				'id'       => 'woocommerce_email_text_color',
 				'type'     => 'color',
 				'css'      => 'width:6em;',
-				'default'  => '#505050',
+				'default'  => '#3c3c3c',
 				'autoload' => false,
-				'desc_tip' => true
+				'desc_tip' => true,
 			),
 
-			array( 'type' => 'sectionend', 'id' => 'email_notification_settings' ),
+			array( 'type' => 'sectionend', 'id' => 'email_template_options' ),
 
 		) );
 
@@ -204,7 +209,7 @@ class WC_Settings_Emails extends WC_Settings_Page {
 
 			if ( in_array( $current_section, array_map( 'sanitize_title', array_keys( $wc_emails->get_emails() ) ) ) ) {
 				foreach ( $wc_emails->get_emails() as $email_id => $email ) {
-					if ( $current_section === sanitize_title( $email_id ) ) {
+					if ( sanitize_title( $email_id ) === $current_section ) {
 						do_action( 'woocommerce_update_options_' . $this->id . '_' . $email->id );
 					}
 				}
@@ -231,9 +236,9 @@ class WC_Settings_Emails extends WC_Settings_Page {
 								$columns = apply_filters( 'woocommerce_email_setting_columns', array(
 									'status'     => '',
 									'name'       => __( 'Email', 'woocommerce' ),
-									'email_type' => __( 'Content Type', 'woocommerce' ),
+									'email_type' => __( 'Content type', 'woocommerce' ),
 									'recipient'  => __( 'Recipient(s)', 'woocommerce' ),
-									'actions'    => ''
+									'actions'    => '',
 								) );
 								foreach ( $columns as $key => $column ) {
 									echo '<th class="wc-email-settings-table-' . esc_attr( $key ) . '">' . esc_html( $column ) . '</th>';
@@ -264,11 +269,11 @@ class WC_Settings_Emails extends WC_Settings_Page {
 										echo '<td class="wc-email-settings-table-' . esc_attr( $key ) . '">';
 
 										if ( $email->is_manual() ) {
-											echo '<span class="status-manual tips" data-tip="' . __( 'Manually sent', 'woocommerce' ) . '">' . __( 'Manual', 'woocommerce' ) . '</span>';
+											echo '<span class="status-manual tips" data-tip="' . esc_attr__( 'Manually sent', 'woocommerce' ) . '">' . esc_html__( 'Manual', 'woocommerce' ) . '</span>';
 										} elseif ( $email->is_enabled() ) {
-											echo '<span class="status-enabled tips" data-tip="' . __( 'Enabled', 'woocommerce' ) . '">' . __( 'Yes', 'woocommerce' ) . '</span>';
+											echo '<span class="status-enabled tips" data-tip="' . esc_attr__( 'Enabled', 'woocommerce' ) . '">' . esc_html__( 'Yes', 'woocommerce' ) . '</span>';
 										} else {
-											echo '<span class="status-disabled tips" data-tip="' . __( 'Disabled', 'woocommerce' ) . '">-</span>';
+											echo '<span class="status-disabled tips" data-tip="' . esc_attr__( 'Disabled', 'woocommerce' ) . '">-</span>';
 										}
 
 										echo '</td>';
@@ -280,7 +285,7 @@ class WC_Settings_Emails extends WC_Settings_Page {
 									break;
 									case 'actions' :
 										echo '<td class="wc-email-settings-table-' . esc_attr( $key ) . '">
-											<a class="button alignright tips" data-tip="' . __( 'Configure', 'woocommerce' ) . '" href="' . admin_url( 'admin.php?page=wc-settings&tab=email&section=' . strtolower( $email_key ) ) . '">' . __( 'Configure', 'woocommerce' ) . '</a>
+											<a class="button alignright tips" data-tip="' . esc_attr__( 'Configure', 'woocommerce' ) . '" href="' . admin_url( 'admin.php?page=wc-settings&tab=email&section=' . strtolower( $email_key ) ) . '">' . esc_html__( 'Configure', 'woocommerce' ) . '</a>
 										</td>';
 									break;
 									default :
diff --git a/includes/admin/settings/class-wc-settings-general.php b/includes/admin/settings/class-wc-settings-general.php
index 893d3e145df..e93da58efea 100644
--- a/includes/admin/settings/class-wc-settings-general.php
+++ b/includes/admin/settings/class-wc-settings-general.php
@@ -12,7 +12,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
 
-if ( ! class_exists( 'WC_Settings_General' ) ) :
+if ( ! class_exists( 'WC_Settings_General', false ) ) :
 
 /**
  * WC_Admin_Settings_General.
@@ -47,52 +47,86 @@ class WC_Settings_General extends WC_Settings_Page {
 
 		$settings = apply_filters( 'woocommerce_general_settings', array(
 
-			array( 'title' => __( 'General Options', 'woocommerce' ), 'type' => 'title', 'desc' => '', 'id' => 'general_options' ),
+			array( 'title' => __( 'General options', 'woocommerce' ), 'type' => 'title', 'desc' => '', 'id' => 'general_options' ),
 
 			array(
-				'title'    => __( 'Base Location', 'woocommerce' ),
+				'title'    => __( 'Base location', 'woocommerce' ),
 				'desc'     => __( 'This is the base location for your business. Tax rates will be based on this country.', 'woocommerce' ),
 				'id'       => 'woocommerce_default_country',
 				'css'      => 'min-width:350px;',
 				'default'  => 'GB',
 				'type'     => 'single_select_country',
-				'desc_tip' =>  true,
+				'desc_tip' => true,
 			),
 
 			array(
-				'title'    => __( 'Selling Location(s)', 'woocommerce' ),
+				'title'    => __( 'Selling location(s)', 'woocommerce' ),
 				'desc'     => __( 'This option lets you limit which countries you are willing to sell to.', 'woocommerce' ),
 				'id'       => 'woocommerce_allowed_countries',
 				'default'  => 'all',
 				'type'     => 'select',
 				'class'    => 'wc-enhanced-select',
 				'css'      => 'min-width: 350px;',
-				'desc_tip' =>  true,
+				'desc_tip' => true,
 				'options'  => array(
-					'all'      => __( 'Sell to all countries', 'woocommerce' ),
-					'specific' => __( 'Sell to specific countries only', 'woocommerce' )
-				)
+					'all'        => __( 'Sell to all countries', 'woocommerce' ),
+					'all_except' => __( 'Sell to all countries, except for&hellip;', 'woocommerce' ),
+					'specific'   => __( 'Sell to specific countries', 'woocommerce' ),
+				),
 			),
 
 			array(
-				'title'   => __( 'Specific Countries', 'woocommerce' ),
+				'title'   => __( 'Sell to all countries, except for&hellip;', 'woocommerce' ),
+				'desc'    => '',
+				'id'      => 'woocommerce_all_except_countries',
+				'css'     => 'min-width: 350px;',
+				'default' => '',
+				'type'    => 'multi_select_countries',
+			),
+
+			array(
+				'title'   => __( 'Sell to specific countries', 'woocommerce' ),
 				'desc'    => '',
 				'id'      => 'woocommerce_specific_allowed_countries',
 				'css'     => 'min-width: 350px;',
 				'default' => '',
-				'type'    => 'multi_select_countries'
+				'type'    => 'multi_select_countries',
 			),
 
 			array(
-				'title'    => __( 'Default Customer Address', 'woocommerce' ),
+				'title'    => __( 'Shipping location(s)', 'woocommerce' ),
+				'desc'     => __( 'Choose which countries you want to ship to, or choose to ship to all locations you sell to.', 'woocommerce' ),
+				'id'       => 'woocommerce_ship_to_countries',
+				'default'  => '',
+				'type'     => 'select',
+				'class'    => 'wc-enhanced-select',
+				'desc_tip' => true,
+				'options'  => array(
+					''         => __( 'Ship to all countries you sell to', 'woocommerce' ),
+					'all'      => __( 'Ship to all countries', 'woocommerce' ),
+					'specific' => __( 'Ship to specific countries only', 'woocommerce' ),
+					'disabled' => __( 'Disable shipping &amp; shipping calculations', 'woocommerce' ),
+				),
+			),
+
+			array(
+				'title'   => __( 'Ship to specific countries', 'woocommerce' ),
+				'desc'    => '',
+				'id'      => 'woocommerce_specific_ship_to_countries',
+				'css'     => '',
+				'default' => '',
+				'type'    => 'multi_select_countries',
+			),
+
+			array(
+				'title'    => __( 'Default customer location', 'woocommerce' ),
 				'id'       => 'woocommerce_default_customer_address',
-				'desc_tip' =>  __( 'This option determines the customers default address (before they input their details).', 'woocommerce' ),
-				'desc'     =>  sprintf( __( 'The %sMaxMind GeoLite Database%s will be periodically downloaded to your wp-content directory if using geolocation.', 'woocommerce' ), '<a href="http://dev.maxmind.com/geoip/legacy/geolite/">', '</a>' ),
+				'desc_tip' => __( 'This option determines a customers default location. The MaxMind GeoLite Database will be periodically downloaded to your wp-content directory if using geolocation.', 'woocommerce' ),
 				'default'  => 'geolocation',
 				'type'     => 'select',
 				'class'    => 'wc-enhanced-select',
 				'options'  => array(
-					''                 => __( 'No address', 'woocommerce' ),
+					''                 => __( 'No location by default', 'woocommerce' ),
 					'base'             => __( 'Shop base address', 'woocommerce' ),
 					'geolocation'      => __( 'Geolocate', 'woocommerce' ),
 					'geolocation_ajax' => __( 'Geolocate (with page caching support)', 'woocommerce' ),
@@ -100,26 +134,34 @@ class WC_Settings_General extends WC_Settings_Page {
 			),
 
 			array(
-				'title'   => __( 'Store Notice', 'woocommerce' ),
-				'desc'    => __( 'Enable site-wide store notice text', 'woocommerce' ),
-				'id'      => 'woocommerce_demo_store',
+				'title'   => __( 'Enable taxes', 'woocommerce' ),
+				'desc'    => __( 'Enable taxes and tax calculations', 'woocommerce' ),
+				'id'      => 'woocommerce_calc_taxes',
 				'default' => 'no',
-				'type'    => 'checkbox'
+				'type'    => 'checkbox',
 			),
 
 			array(
-				'title'    => __( 'Store Notice Text', 'woocommerce' ),
+				'title'   => __( 'Store notice', 'woocommerce' ),
+				'desc'    => __( 'Enable site-wide store notice text', 'woocommerce' ),
+				'id'      => 'woocommerce_demo_store',
+				'default' => 'no',
+				'type'    => 'checkbox',
+			),
+
+			array(
+				'title'    => __( 'Store notice text', 'woocommerce' ),
 				'desc'     => '',
 				'id'       => 'woocommerce_demo_store_notice',
 				'default'  => __( 'This is a demo store for testing purposes &mdash; no orders shall be fulfilled.', 'woocommerce' ),
 				'type'     => 'textarea',
 				'css'     => 'width:350px; height: 65px;',
-				'autoload' => false
+				'autoload' => false,
 			),
 
-			array( 'type' => 'sectionend', 'id' => 'general_options'),
+			array( 'type' => 'sectionend', 'id' => 'general_options' ),
 
-			array( 'title' => __( 'Currency Options', 'woocommerce' ), 'type' => 'title', 'desc' => __( 'The following options affect how prices are displayed on the frontend.', 'woocommerce' ), 'id' => 'pricing_options' ),
+			array( 'title' => __( 'Currency options', 'woocommerce' ), 'type' => 'title', 'desc' => __( 'The following options affect how prices are displayed on the frontend.', 'woocommerce' ), 'id' => 'pricing_options' ),
 
 			array(
 				'title'    => __( 'Currency', 'woocommerce' ),
@@ -129,12 +171,12 @@ class WC_Settings_General extends WC_Settings_Page {
 				'default'  => 'GBP',
 				'type'     => 'select',
 				'class'    => 'wc-enhanced-select',
-				'desc_tip' =>  true,
-				'options'  => $currency_code_options
+				'desc_tip' => true,
+				'options'  => $currency_code_options,
 			),
 
 			array(
-				'title'    => __( 'Currency Position', 'woocommerce' ),
+				'title'    => __( 'Currency position', 'woocommerce' ),
 				'desc'     => __( 'This controls the position of the currency symbol.', 'woocommerce' ),
 				'id'       => 'woocommerce_currency_pos',
 				'css'      => 'min-width:350px;',
@@ -145,46 +187,46 @@ class WC_Settings_General extends WC_Settings_Page {
 					'left'        => __( 'Left', 'woocommerce' ) . ' (' . get_woocommerce_currency_symbol() . '99.99)',
 					'right'       => __( 'Right', 'woocommerce' ) . ' (99.99' . get_woocommerce_currency_symbol() . ')',
 					'left_space'  => __( 'Left with space', 'woocommerce' ) . ' (' . get_woocommerce_currency_symbol() . ' 99.99)',
-					'right_space' => __( 'Right with space', 'woocommerce' ) . ' (99.99 ' . get_woocommerce_currency_symbol() . ')'
+					'right_space' => __( 'Right with space', 'woocommerce' ) . ' (99.99 ' . get_woocommerce_currency_symbol() . ')',
 				),
-				'desc_tip' =>  true,
+				'desc_tip' => true,
 			),
 
 			array(
-				'title'    => __( 'Thousand Separator', 'woocommerce' ),
+				'title'    => __( 'Thousand separator', 'woocommerce' ),
 				'desc'     => __( 'This sets the thousand separator of displayed prices.', 'woocommerce' ),
 				'id'       => 'woocommerce_price_thousand_sep',
 				'css'      => 'width:50px;',
 				'default'  => ',',
 				'type'     => 'text',
-				'desc_tip' =>  true,
+				'desc_tip' => true,
 			),
 
 			array(
-				'title'    => __( 'Decimal Separator', 'woocommerce' ),
+				'title'    => __( 'Decimal separator', 'woocommerce' ),
 				'desc'     => __( 'This sets the decimal separator of displayed prices.', 'woocommerce' ),
 				'id'       => 'woocommerce_price_decimal_sep',
 				'css'      => 'width:50px;',
 				'default'  => '.',
 				'type'     => 'text',
-				'desc_tip' =>  true,
+				'desc_tip' => true,
 			),
 
 			array(
-				'title'    => __( 'Number of Decimals', 'woocommerce' ),
+				'title'    => __( 'Number of decimals', 'woocommerce' ),
 				'desc'     => __( 'This sets the number of decimal points shown in displayed prices.', 'woocommerce' ),
 				'id'       => 'woocommerce_price_num_decimals',
 				'css'      => 'width:50px;',
 				'default'  => '2',
-				'desc_tip' =>  true,
+				'desc_tip' => true,
 				'type'     => 'number',
 				'custom_attributes' => array(
 					'min'  => 0,
-					'step' => 1
-				)
+					'step' => 1,
+				),
 			),
 
-			array( 'type' => 'sectionend', 'id' => 'pricing_options' )
+			array( 'type' => 'sectionend', 'id' => 'pricing_options' ),
 
 		) );
 
@@ -192,7 +234,7 @@ class WC_Settings_General extends WC_Settings_Page {
 	}
 
 	/**
-	 * Output a colour picker input box.
+	 * Output a color picker input box.
 	 *
 	 * @param mixed $name
 	 * @param string $id
@@ -201,7 +243,7 @@ class WC_Settings_General extends WC_Settings_Page {
 	 */
 	public function color_picker( $name, $id, $value, $desc = '' ) {
 		echo '<div class="color_box">' . wc_help_tip( $desc ) . '
-			<input name="' . esc_attr( $id ). '" id="' . esc_attr( $id ) . '" type="text" value="' . esc_attr( $value ) . '" class="colorpick" /> <div id="colorPickerDiv_' . esc_attr( $id ) . '" class="colorpickdiv"></div>
+			<input name="' . esc_attr( $id ) . '" id="' . esc_attr( $id ) . '" type="text" value="' . esc_attr( $value ) . '" class="colorpick" /> <div id="colorPickerDiv_' . esc_attr( $id ) . '" class="colorpickdiv"></div>
 		</div>';
 	}
 
@@ -213,7 +255,6 @@ class WC_Settings_General extends WC_Settings_Page {
 
 		WC_Admin_Settings::save_fields( $settings );
 	}
-
 }
 
 endif;
diff --git a/includes/admin/settings/class-wc-settings-integrations.php b/includes/admin/settings/class-wc-settings-integrations.php
index aecffe335bf..126844c85f6 100644
--- a/includes/admin/settings/class-wc-settings-integrations.php
+++ b/includes/admin/settings/class-wc-settings-integrations.php
@@ -12,7 +12,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
 
-if ( ! class_exists( 'WC_Settings_Integrations' ) ) :
+if ( ! class_exists( 'WC_Settings_Integrations', false ) ) :
 
 /**
  * WC_Settings_Integrations.
@@ -71,8 +71,9 @@ class WC_Settings_Integrations extends WC_Settings_Page {
 
 		$integrations = WC()->integrations->get_integrations();
 
-		if ( isset( $integrations[ $current_section ] ) )
+		if ( isset( $integrations[ $current_section ] ) ) {
 			$integrations[ $current_section ]->admin_options();
+		}
 	}
 }
 
diff --git a/includes/admin/settings/class-wc-settings-page.php b/includes/admin/settings/class-wc-settings-page.php
index 77ba97113c4..b1995981960 100644
--- a/includes/admin/settings/class-wc-settings-page.php
+++ b/includes/admin/settings/class-wc-settings-page.php
@@ -12,14 +12,25 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
 
-if ( ! class_exists( 'WC_Settings_Page' ) ) :
+if ( ! class_exists( 'WC_Settings_Page', false ) ) :
 
 /**
  * WC_Settings_Page.
  */
 abstract class WC_Settings_Page {
 
-	protected $id    = '';
+	/**
+	 * Setting page id.
+	 *
+	 * @var string
+	 */
+	protected $id = '';
+
+	/**
+	 * Setting page label.
+	 *
+	 * @var string
+	 */
 	protected $label = '';
 
 	/**
@@ -32,6 +43,24 @@ abstract class WC_Settings_Page {
 		add_action( 'woocommerce_settings_save_' . $this->id, array( $this, 'save' ) );
 	}
 
+	/**
+	 * Get settings page ID.
+	 * @since 3.0.0
+	 * @return string
+	 */
+	public function get_id() {
+		return $this->id;
+	}
+
+	/**
+	 * Get settings page label.
+	 * @since 3.0.0
+	 * @return string
+	 */
+	public function get_label() {
+		return $this->label;
+	}
+
 	/**
 	 * Add this page to settings.
 	 */
diff --git a/includes/admin/settings/class-wc-settings-products.php b/includes/admin/settings/class-wc-settings-products.php
index c965a261c5d..d781c872000 100644
--- a/includes/admin/settings/class-wc-settings-products.php
+++ b/includes/admin/settings/class-wc-settings-products.php
@@ -12,7 +12,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
 
-if ( ! class_exists( 'WC_Settings_Products' ) ) :
+if ( ! class_exists( 'WC_Settings_Products', false ) ) :
 
 /**
  * WC_Settings_Products.
@@ -44,7 +44,7 @@ class WC_Settings_Products extends WC_Settings_Page {
 			''          	=> __( 'General', 'woocommerce' ),
 			'display'       => __( 'Display', 'woocommerce' ),
 			'inventory' 	=> __( 'Inventory', 'woocommerce' ),
-			'downloadable' 	=> __( 'Downloadable Products', 'woocommerce' ),
+			'downloadable' 	=> __( 'Downloadable products', 'woocommerce' ),
 		);
 
 		return apply_filters( 'woocommerce_get_sections_' . $this->id, $sections );
@@ -82,14 +82,14 @@ class WC_Settings_Products extends WC_Settings_Page {
 			$settings = apply_filters( 'woocommerce_product_settings', array(
 
 				array(
-					'title' => __( 'Shop & Product Pages', 'woocommerce' ),
+					'title' => __( 'Shop &amp; product pages', 'woocommerce' ),
 					'type' 	=> 'title',
 					'desc' 	=> '',
-					'id' 	=> 'catalog_options'
+					'id' 	=> 'catalog_options',
 				),
 
 				array(
-					'title'    => __( 'Shop Page', 'woocommerce' ),
+					'title'    => __( 'Shop page', 'woocommerce' ),
 					'desc'     => '<br/>' . sprintf( __( 'The base page can also be used in your <a href="%s">product permalinks</a>.', 'woocommerce' ), admin_url( 'options-permalink.php' ) ),
 					'id'       => 'woocommerce_shop_page_id',
 					'type'     => 'single_select_page',
@@ -100,7 +100,7 @@ class WC_Settings_Products extends WC_Settings_Page {
 				),
 
 				array(
-					'title'    => __( 'Shop Page Display', 'woocommerce' ),
+					'title'    => __( 'Shop page display', 'woocommerce' ),
 					'desc'     => __( 'This controls what is shown on the product archive.', 'woocommerce' ),
 					'id'       => 'woocommerce_shop_page_display',
 					'class'    => 'wc-enhanced-select',
@@ -109,14 +109,14 @@ class WC_Settings_Products extends WC_Settings_Page {
 					'type'     => 'select',
 					'options'  => array(
 						''              => __( 'Show products', 'woocommerce' ),
-						'subcategories' => __( 'Show categories &amp; subcategories', 'woocommerce' ),
-						'both'          => __( 'Show both', 'woocommerce' ),
+						'subcategories' => __( 'Show categories', 'woocommerce' ),
+						'both'          => __( 'Show categories &amp; products', 'woocommerce' ),
 					),
-					'desc_tip' =>  true,
+					'desc_tip' => true,
 				),
 
 				array(
-					'title'    => __( 'Default Category Display', 'woocommerce' ),
+					'title'    => __( 'Default category display', 'woocommerce' ),
 					'desc'     => __( 'This controls what is shown on category archives.', 'woocommerce' ),
 					'id'       => 'woocommerce_category_archive_display',
 					'class'    => 'wc-enhanced-select',
@@ -126,13 +126,13 @@ class WC_Settings_Products extends WC_Settings_Page {
 					'options'  => array(
 						''              => __( 'Show products', 'woocommerce' ),
 						'subcategories' => __( 'Show subcategories', 'woocommerce' ),
-						'both'          => __( 'Show both', 'woocommerce' ),
+						'both'          => __( 'Show subcategories &amp; products', 'woocommerce' ),
 					),
-					'desc_tip' =>  true,
+					'desc_tip' => true,
 				),
 
 				array(
-					'title'    => __( 'Default Product Sorting', 'woocommerce' ),
+					'title'    => __( 'Default product sorting', 'woocommerce' ),
 					'desc'     => __( 'This controls the default sort order of the catalog.', 'woocommerce' ),
 					'id'       => 'woocommerce_default_catalog_orderby',
 					'class'    => 'wc-enhanced-select',
@@ -142,12 +142,12 @@ class WC_Settings_Products extends WC_Settings_Page {
 					'options'  => apply_filters( 'woocommerce_default_catalog_orderby_options', array(
 						'menu_order' => __( 'Default sorting (custom ordering + name)', 'woocommerce' ),
 						'popularity' => __( 'Popularity (sales)', 'woocommerce' ),
-						'rating'     => __( 'Average Rating', 'woocommerce' ),
+						'rating'     => __( 'Average rating', 'woocommerce' ),
 						'date'       => __( 'Sort by most recent', 'woocommerce' ),
 						'price'      => __( 'Sort by price (asc)', 'woocommerce' ),
 						'price-desc' => __( 'Sort by price (desc)', 'woocommerce' ),
 					) ),
-					'desc_tip' =>  true,
+					'desc_tip' => true,
 				),
 
 				array(
@@ -156,7 +156,7 @@ class WC_Settings_Products extends WC_Settings_Page {
 					'id'            => 'woocommerce_cart_redirect_after_add',
 					'default'       => 'no',
 					'type'          => 'checkbox',
-					'checkboxgroup' => 'start'
+					'checkboxgroup' => 'start',
 				),
 
 				array(
@@ -164,76 +164,67 @@ class WC_Settings_Products extends WC_Settings_Page {
 					'id'            => 'woocommerce_enable_ajax_add_to_cart',
 					'default'       => 'yes',
 					'type'          => 'checkbox',
-					'checkboxgroup' => 'end'
+					'checkboxgroup' => 'end',
 				),
 
 				array(
 					'type' 	=> 'sectionend',
-					'id' 	=> 'catalog_options'
+					'id' 	=> 'catalog_options',
 				),
 
 				array(
-					'title' => __( 'Product Images', 'woocommerce' ),
+					'title' => __( 'Product images', 'woocommerce' ),
 					'type' 	=> 'title',
-					'desc' 	=> sprintf( __( 'These settings affect the display and dimensions of images in your catalog - the display on the front-end will still be affected by CSS styles. After changing these settings you may need to <a href="%s">regenerate your thumbnails</a>.', 'woocommerce' ), 'http://wordpress.org/extend/plugins/regenerate-thumbnails/' ),
-					'id' 	=> 'image_options'
+					'desc' 	=> sprintf( __( 'These settings affect the display and dimensions of images in your catalog - the display on the front-end will still be affected by CSS styles. After changing these settings you may need to <a target="_blank" href="%s">regenerate your thumbnails</a>.', 'woocommerce' ), 'https://wordpress.org/plugins/regenerate-thumbnails/' ),
+					'id' 	=> 'image_options',
 				),
 
 				array(
-					'title'    => __( 'Catalog Images', 'woocommerce' ),
-					'desc'     => __( 'This size is usually used in product listings', 'woocommerce' ),
+					'title'    => __( 'Catalog images', 'woocommerce' ),
+					'desc'     => __( 'This size is usually used in product listings. (W x H)', 'woocommerce' ),
 					'id'       => 'shop_catalog_image_size',
 					'css'      => '',
 					'type'     => 'image_width',
 					'default'  => array(
 						'width'  => '300',
 						'height' => '300',
-						'crop'   => 1
+						'crop'   => 1,
 					),
-					'desc_tip' =>  true,
+					'desc_tip' => true,
 				),
 
 				array(
-					'title'    => __( 'Single Product Image', 'woocommerce' ),
-					'desc'     => __( 'This is the size used by the main image on the product page.', 'woocommerce' ),
+					'title'    => __( 'Single product image', 'woocommerce' ),
+					'desc'     => __( 'This is the size used by the main image on the product page. (W x H)', 'woocommerce' ),
 					'id'       => 'shop_single_image_size',
 					'css'      => '',
 					'type'     => 'image_width',
 					'default'  => array(
 						'width'  => '600',
 						'height' => '600',
-						'crop'   => 1
+						'crop'   => 1,
 					),
-					'desc_tip' =>  true,
+					'desc_tip' => true,
 				),
 
 				array(
-					'title'    => __( 'Product Thumbnails', 'woocommerce' ),
-					'desc'     => __( 'This size is usually used for the gallery of images on the product page.', 'woocommerce' ),
+					'title'    => __( 'Product thumbnails', 'woocommerce' ),
+					'desc'     => __( 'This size is usually used for the gallery of images on the product page. (W x H)', 'woocommerce' ),
 					'id'       => 'shop_thumbnail_image_size',
 					'css'      => '',
 					'type'     => 'image_width',
 					'default'  => array(
 						'width'  => '180',
 						'height' => '180',
-						'crop'   => 1
+						'crop'   => 1,
 					),
-					'desc_tip' =>  true,
-				),
-
-				array(
-					'title'         => __( 'Product Image Gallery', 'woocommerce' ),
-					'desc'          => __( 'Enable Lightbox for product images', 'woocommerce' ),
-					'id'            => 'woocommerce_enable_lightbox',
-					'default'       => 'yes',
-					'desc_tip'      => __( 'Include WooCommerce\'s lightbox. Product gallery images will open in a lightbox.', 'woocommerce' ),
-					'type'          => 'checkbox'
+					'desc_tip' => true,
 				),
 
 				array(
 					'type' 	=> 'sectionend',
-					'id' 	=> 'image_options'
-				)
+					'id' 	=> 'image_options',
+				),
 
 			));
 		} elseif ( 'inventory' == $current_section ) {
@@ -244,29 +235,30 @@ class WC_Settings_Products extends WC_Settings_Page {
 					'title' => __( 'Inventory', 'woocommerce' ),
 					'type' 	=> 'title',
 					'desc' 	=> '',
-					'id' 	=> 'product_inventory_options'
+					'id' 	=> 'product_inventory_options',
 				),
 
 				array(
-					'title'   => __( 'Manage Stock', 'woocommerce' ),
+					'title'   => __( 'Manage stock', 'woocommerce' ),
 					'desc'    => __( 'Enable stock management', 'woocommerce' ),
 					'id'      => 'woocommerce_manage_stock',
 					'default' => 'yes',
-					'type'    => 'checkbox'
+					'type'    => 'checkbox',
 				),
 
 				array(
-					'title'             => __( 'Hold Stock (minutes)', 'woocommerce' ),
+					'title'             => __( 'Hold stock (minutes)', 'woocommerce' ),
 					'desc'              => __( 'Hold stock (for unpaid orders) for x minutes. When this limit is reached, the pending order will be cancelled. Leave blank to disable.', 'woocommerce' ),
 					'id'                => 'woocommerce_hold_stock_minutes',
 					'type'              => 'number',
 					'custom_attributes' => array(
-						'min'  => 0,
-						'step' => 1
+						'min'           => 0,
+						'step'          => 1,
 					),
 					'css'               => 'width: 80px;',
 					'default'           => '60',
-					'autoload'          => false
+					'autoload'          => false,
+					'class'             => 'manage_stock_field',
 				),
 
 				array(
@@ -276,7 +268,8 @@ class WC_Settings_Products extends WC_Settings_Page {
 					'default'       => 'yes',
 					'type'          => 'checkbox',
 					'checkboxgroup' => 'start',
-					'autoload'      => false
+					'autoload'      => false,
+					'class'         => 'manage_stock_field',
 				),
 
 				array(
@@ -285,75 +278,80 @@ class WC_Settings_Products extends WC_Settings_Page {
 					'default'       => 'yes',
 					'type'          => 'checkbox',
 					'checkboxgroup' => 'end',
-					'autoload'      => false
+					'autoload'      => false,
+					'class'         => 'manage_stock_field',
 				),
 
 				array(
-					'title'    => __( 'Notification Recipient(s)', 'woocommerce' ),
+					'title'    => __( 'Notification recipient(s)', 'woocommerce' ),
 					'desc'     => __( 'Enter recipients (comma separated) that will receive this notification.', 'woocommerce' ),
 					'id'       => 'woocommerce_stock_email_recipient',
 					'type'     => 'text',
 					'default'  => get_option( 'admin_email' ),
 					'css'      => 'width: 250px;',
 					'autoload' => false,
-					'desc_tip' => true
+					'desc_tip' => true,
+					'class'    => 'manage_stock_field',
 				),
 
 				array(
-					'title'             => __( 'Low Stock Threshold', 'woocommerce' ),
-					'desc'              => '',
+					'title'             => __( 'Low stock threshold', 'woocommerce' ),
+					'desc'              => __( 'When product stock reaches this amount you will be notified via email.', 'woocommerce' ),
 					'id'                => 'woocommerce_notify_low_stock_amount',
 					'css'               => 'width:50px;',
 					'type'              => 'number',
 					'custom_attributes' => array(
-						'min'  => 0,
-						'step' => 1
+						'min'           => 0,
+						'step'          => 1,
 					),
 					'default'           => '2',
-					'autoload'          => false
+					'autoload'          => false,
+					'desc_tip'          => true,
+					'class'             => 'manage_stock_field',
 				),
 
 				array(
-					'title'             => __( 'Out Of Stock Threshold', 'woocommerce' ),
-					'desc'              => '',
+					'title'             => __( 'Out of stock threshold', 'woocommerce' ),
+					'desc'              => __( 'When product stock reaches this amount the stock status will change to "out of stock" and you will be notified via email. This setting does not affect existing "in stock" products.', 'woocommerce' ),
 					'id'                => 'woocommerce_notify_no_stock_amount',
 					'css'               => 'width:50px;',
 					'type'              => 'number',
 					'custom_attributes' => array(
-						'min'  => 0,
-						'step' => 1
+						'min'           => 0,
+						'step'          => 1,
 					),
 					'default'           => '0',
-					'autoload'          => false
+					'desc_tip'          => true,
+					'class'             => 'manage_stock_field',
 				),
 
 				array(
-					'title'    => __( 'Out Of Stock Visibility', 'woocommerce' ),
+					'title'    => __( 'Out of stock visibility', 'woocommerce' ),
 					'desc'     => __( 'Hide out of stock items from the catalog', 'woocommerce' ),
 					'id'       => 'woocommerce_hide_out_of_stock_items',
 					'default'  => 'no',
-					'type'     => 'checkbox'
+					'type'     => 'checkbox',
 				),
 
 				array(
-					'title'    => __( 'Stock Display Format', 'woocommerce' ),
-					'desc'     => __( 'This controls how stock is displayed on the frontend.', 'woocommerce' ),
+					'title'    => __( 'Stock display format', 'woocommerce' ),
+					'desc'     => __( 'This controls how stock quantities are displayed on the frontend.', 'woocommerce' ),
 					'id'       => 'woocommerce_stock_format',
 					'css'      => 'min-width:150px;',
 					'class'    => 'wc-enhanced-select',
 					'default'  => '',
 					'type'     => 'select',
 					'options'  => array(
-						''           => __( 'Always show stock e.g. "12 in stock"', 'woocommerce' ),
-						'low_amount' => __( 'Only show stock when low e.g. "Only 2 left in stock" vs. "In Stock"', 'woocommerce' ),
-						'no_amount'  => __( 'Never show stock amount', 'woocommerce' ),
+						''           => __( 'Always show quantity remaining in stock e.g. "12 in stock"', 'woocommerce' ),
+						'low_amount' => __( 'Only show quantity remaining in stock when low e.g. "Only 2 left in stock"', 'woocommerce' ),
+						'no_amount'  => __( 'Never show quantity remaining in stock', 'woocommerce' ),
 					),
-					'desc_tip' =>  true,
+					'desc_tip' => true,
 				),
 
 				array(
 					'type' 	=> 'sectionend',
-					'id' 	=> 'product_inventory_options'
+					'id' 	=> 'product_inventory_options',
 				),
 
 			));
@@ -361,37 +359,37 @@ class WC_Settings_Products extends WC_Settings_Page {
 		} elseif ( 'downloadable' == $current_section ) {
 			$settings = apply_filters( 'woocommerce_downloadable_products_settings', array(
 				array(
-					'title' => __( 'Downloadable Products', 'woocommerce' ),
+					'title' => __( 'Downloadable products', 'woocommerce' ),
 					'type' 	=> 'title',
-					'id' 	=> 'digital_download_options'
+					'id' 	=> 'digital_download_options',
 				),
 
 				array(
-					'title'    => __( 'File Download Method', 'woocommerce' ),
+					'title'    => __( 'File download method', 'woocommerce' ),
 					'desc'     => __( 'Forcing downloads will keep URLs hidden, but some servers may serve large files unreliably. If supported, <code>X-Accel-Redirect</code>/ <code>X-Sendfile</code> can be used to serve downloads instead (server requires <code>mod_xsendfile</code>).', 'woocommerce' ),
 					'id'       => 'woocommerce_file_download_method',
 					'type'     => 'select',
 					'class'    => 'wc-enhanced-select',
 					'css'      => 'min-width:300px;',
 					'default'  => 'force',
-					'desc_tip' =>  true,
+					'desc_tip' => true,
 					'options'  => array(
-						'force'     => __( 'Force Downloads', 'woocommerce' ),
+						'force'     => __( 'Force downloads', 'woocommerce' ),
 						'xsendfile' => __( 'X-Accel-Redirect/X-Sendfile', 'woocommerce' ),
 						'redirect'  => __( 'Redirect only', 'woocommerce' ),
 					),
-					'autoload' => false
+					'autoload' => false,
 				),
 
 				array(
-					'title'         => __( 'Access Restriction', 'woocommerce' ),
+					'title'         => __( 'Access restriction', 'woocommerce' ),
 					'desc'          => __( 'Downloads require login', 'woocommerce' ),
 					'id'            => 'woocommerce_downloads_require_login',
 					'type'          => 'checkbox',
 					'default'       => 'no',
 					'desc_tip'      => __( 'This setting does not apply to guest purchases.', 'woocommerce' ),
 					'checkboxgroup' => 'start',
-					'autoload'      => false
+					'autoload'      => false,
 				),
 
 				array(
@@ -401,12 +399,12 @@ class WC_Settings_Products extends WC_Settings_Page {
 					'default'       => 'yes',
 					'desc_tip'      => __( 'Enable this option to grant access to downloads when orders are "processing", rather than "completed".', 'woocommerce' ),
 					'checkboxgroup' => 'end',
-					'autoload'      => false
+					'autoload'      => false,
 				),
 
 				array(
 					'type' 	=> 'sectionend',
-					'id' 	=> 'digital_download_options'
+					'id' 	=> 'digital_download_options',
 				),
 
 			));
@@ -416,11 +414,11 @@ class WC_Settings_Products extends WC_Settings_Page {
 				array(
 					'title' 	=> __( 'Measurements', 'woocommerce' ),
 					'type' 		=> 'title',
-					'id' 		=> 'product_measurement_options'
+					'id' 		=> 'product_measurement_options',
 				),
 
 				array(
-					'title'    => __( 'Weight Unit', 'woocommerce' ),
+					'title'    => __( 'Weight unit', 'woocommerce' ),
 					'desc'     => __( 'This controls what unit you will define weights in.', 'woocommerce' ),
 					'id'       => 'woocommerce_weight_unit',
 					'class'    => 'wc-enhanced-select',
@@ -433,11 +431,11 @@ class WC_Settings_Products extends WC_Settings_Page {
 						'lbs' => __( 'lbs', 'woocommerce' ),
 						'oz'  => __( 'oz', 'woocommerce' ),
 					),
-					'desc_tip' =>  true,
+					'desc_tip' => true,
 				),
 
 				array(
-					'title'    => __( 'Dimensions Unit', 'woocommerce' ),
+					'title'    => __( 'Dimensions unit', 'woocommerce' ),
 					'desc'     => __( 'This controls what unit you will define lengths in.', 'woocommerce' ),
 					'id'       => 'woocommerce_dimension_unit',
 					'class'    => 'wc-enhanced-select',
@@ -451,30 +449,29 @@ class WC_Settings_Products extends WC_Settings_Page {
 						'in' => __( 'in', 'woocommerce' ),
 						'yd' => __( 'yd', 'woocommerce' ),
 					),
-					'desc_tip' =>  true,
+					'desc_tip' => true,
 				),
 
 				array(
 					'type' 	=> 'sectionend',
-					'id' 	=> 'product_measurement_options'
+					'id' 	=> 'product_measurement_options',
 				),
 
 				array(
 					'title' => __( 'Reviews', 'woocommerce' ),
 					'type' 	=> 'title',
 					'desc' 	=> '',
-					'id' 	=> 'product_rating_options'
+					'id' 	=> 'product_rating_options',
 				),
 
 				array(
-					'title'           => __( 'Product Ratings', 'woocommerce' ),
+					'title'           => __( 'Product ratings', 'woocommerce' ),
 					'desc'            => __( 'Enable ratings on reviews', 'woocommerce' ),
 					'id'              => 'woocommerce_enable_review_rating',
 					'default'         => 'yes',
 					'type'            => 'checkbox',
 					'checkboxgroup'   => 'start',
 					'show_if_checked' => 'option',
-					'autoload'        => false
 				),
 
 				array(
@@ -484,7 +481,7 @@ class WC_Settings_Products extends WC_Settings_Page {
 					'type'            => 'checkbox',
 					'checkboxgroup'   => '',
 					'show_if_checked' => 'yes',
-					'autoload'        => false
+					'autoload'        => false,
 				),
 
 				array(
@@ -494,7 +491,7 @@ class WC_Settings_Products extends WC_Settings_Page {
 					'type'            => 'checkbox',
 					'checkboxgroup'   => '',
 					'show_if_checked' => 'yes',
-					'autoload'        => false
+					'autoload'        => false,
 				),
 
 				array(
@@ -504,12 +501,12 @@ class WC_Settings_Products extends WC_Settings_Page {
 					'type'            => 'checkbox',
 					'checkboxgroup'   => 'end',
 					'show_if_checked' => 'yes',
-					'autoload'        => false
+					'autoload'        => false,
 				),
 
 				array(
 					'type' 	=> 'sectionend',
-					'id' 	=> 'product_rating_options'
+					'id' 	=> 'product_rating_options',
 				),
 
 			));
diff --git a/includes/admin/settings/class-wc-settings-shipping.php b/includes/admin/settings/class-wc-settings-shipping.php
index 4abde90b474..7aa27f3bad1 100644
--- a/includes/admin/settings/class-wc-settings-shipping.php
+++ b/includes/admin/settings/class-wc-settings-shipping.php
@@ -5,14 +5,14 @@
  * @author      WooThemes
  * @category    Admin
  * @package     WooCommerce/Admin
- * @version     2.1.0
+ * @version     2.6.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
-if ( ! class_exists( 'WC_Settings_Shipping' ) ) :
+if ( ! class_exists( 'WC_Settings_Shipping', false ) ) :
 
 /**
  * WC_Settings_Shipping.
@@ -25,14 +25,19 @@ class WC_Settings_Shipping extends WC_Settings_Page {
 	public function __construct() {
 		$this->id    = 'shipping';
 		$this->label = __( 'Shipping', 'woocommerce' );
-
 		add_filter( 'woocommerce_settings_tabs_array', array( $this, 'add_settings_page' ), 20 );
 		add_action( 'woocommerce_sections_' . $this->id, array( $this, 'output_sections' ) );
 		add_action( 'woocommerce_settings_' . $this->id, array( $this, 'output' ) );
-		add_action( 'woocommerce_admin_field_shipping_methods', array( $this, 'shipping_methods_setting' ) );
 		add_action( 'woocommerce_settings_save_' . $this->id, array( $this, 'save' ) );
 	}
 
+	/**
+	 * Add this page to settings.
+	 */
+	public function add_settings_page( $pages ) {
+		return wc_shipping_enabled() ? parent::add_settings_page( $pages ) : $pages;
+	}
+
 	/**
 	 * Get sections.
 	 *
@@ -40,7 +45,9 @@ class WC_Settings_Shipping extends WC_Settings_Page {
 	 */
 	public function get_sections() {
 		$sections = array(
-			'' => __( 'Shipping Options', 'woocommerce' )
+			''        => __( 'Shipping zones', 'woocommerce' ),
+			'options' => __( 'Shipping options', 'woocommerce' ),
+			'classes' => __( 'Shipping classes', 'woocommerce' ),
 		);
 
 		if ( ! defined( 'WC_INSTALLING' ) ) {
@@ -52,7 +59,7 @@ class WC_Settings_Shipping extends WC_Settings_Page {
 					continue;
 				}
 				$title = empty( $method->method_title ) ? ucfirst( $method->id ) : $method->method_title;
-				$sections[ strtolower( get_class( $method ) ) ] = esc_html( $title );
+				$sections[ strtolower( $method->id ) ] = esc_html( $title );
 			}
 		}
 
@@ -64,196 +71,281 @@ class WC_Settings_Shipping extends WC_Settings_Page {
 	 *
 	 * @return array
 	 */
-	public function get_settings() {
+	public function get_settings( $current_section = '' ) {
+		$settings = array();
 
-		$settings = apply_filters('woocommerce_shipping_settings', array(
+		if ( '' === $current_section ) {
+			$settings = apply_filters( 'woocommerce_shipping_settings', array(
 
-			array( 'title' => __( 'Shipping Options', 'woocommerce' ), 'type' => 'title', 'id' => 'shipping_options' ),
+				array( 'title' => __( 'Shipping options', 'woocommerce' ), 'type' => 'title', 'id' => 'shipping_options' ),
 
-			array(
-				'title'         => __( 'Shipping Calculations', 'woocommerce' ),
-				'desc'          => __( 'Enable shipping', 'woocommerce' ),
-				'id'            => 'woocommerce_calc_shipping',
-				'default'       => 'no',
-				'type'          => 'checkbox',
-				'checkboxgroup' => 'start'
-			),
-
-			array(
-				'desc'          => __( 'Enable the shipping calculator on the cart page', 'woocommerce' ),
-				'id'            => 'woocommerce_enable_shipping_calc',
-				'default'       => 'yes',
-				'type'          => 'checkbox',
-				'checkboxgroup' => '',
-				'autoload'      => false
-			),
-
-			array(
-				'desc'          => __( 'Hide shipping costs until an address is entered', 'woocommerce' ),
-				'id'            => 'woocommerce_shipping_cost_requires_address',
-				'default'       => 'no',
-				'type'          => 'checkbox',
-				'checkboxgroup' => 'end',
-				'autoload'      => false
-			),
-
-			array(
-				'title'   => __( 'Shipping Destination', 'woocommerce' ),
-				'desc'    => __( 'This controls which shipping address is used by default.', 'woocommerce' ),
-				'id'      => 'woocommerce_ship_to_destination',
-				'default' => 'billing',
-				'type'    => 'radio',
-				'options' => array(
-					'shipping'     => __( 'Default to shipping address', 'woocommerce' ),
-					'billing'      => __( 'Default to billing address', 'woocommerce' ),
-					'billing_only' => __( 'Only ship to the customer\'s billing address', 'woocommerce' ),
+				array(
+					'title'         => __( 'Calculations', 'woocommerce' ),
+					'desc'          => __( 'Enable the shipping calculator on the cart page', 'woocommerce' ),
+					'id'            => 'woocommerce_enable_shipping_calc',
+					'default'       => 'yes',
+					'type'          => 'checkbox',
+					'checkboxgroup' => 'start',
+					'autoload'      => false,
 				),
-				'autoload'        => false,
-				'desc_tip'        =>  true,
-				'show_if_checked' => 'option',
-			),
 
-			array(
-				'title'    => __( 'Restrict shipping to Location(s)', 'woocommerce' ),
-				'desc'     => sprintf( __( 'Choose which countries you want to ship to, or choose to ship to all <a href="%s">locations you sell to</a>.', 'woocommerce' ), admin_url( 'admin.php?page=wc-settings&tab=general' ) ),
-				'id'       => 'woocommerce_ship_to_countries',
-				'default'  => '',
-				'type'     => 'select',
-				'class'    => 'wc-enhanced-select',
-				'desc_tip' => false,
-				'options'  => array(
-					''         => __( 'Ship to all countries you sell to', 'woocommerce' ),
-					'all'      => __( 'Ship to all countries', 'woocommerce' ),
-					'specific' => __( 'Ship to specific countries only', 'woocommerce' )
-				)
-			),
+				array(
+					'desc'          => __( 'Hide shipping costs until an address is entered', 'woocommerce' ),
+					'id'            => 'woocommerce_shipping_cost_requires_address',
+					'default'       => 'no',
+					'type'          => 'checkbox',
+					'checkboxgroup' => 'end',
+					'autoload'      => false,
+				),
 
-			array(
-				'title'   => __( 'Specific Countries', 'woocommerce' ),
-				'desc'    => '',
-				'id'      => 'woocommerce_specific_ship_to_countries',
-				'css'     => '',
-				'default' => '',
-				'type'    => 'multi_select_countries'
-			),
+				array(
+					'title'   => __( 'Shipping destination', 'woocommerce' ),
+					'desc'    => __( 'This controls which shipping address is used by default.', 'woocommerce' ),
+					'id'      => 'woocommerce_ship_to_destination',
+					'default' => 'billing',
+					'type'    => 'radio',
+					'options' => array(
+						'shipping'     => __( 'Default to customer shipping address', 'woocommerce' ),
+						'billing'      => __( 'Default to customer billing address', 'woocommerce' ),
+						'billing_only' => __( 'Force shipping to the customer billing address', 'woocommerce' ),
+					),
+					'autoload'        => false,
+					'desc_tip'        => true,
+					'show_if_checked' => 'option',
+				),
 
-			array(
-				'type' => 'shipping_methods',
-			),
+				array(
+					'title'    => __( 'Debug mode', 'woocommerce' ),
+					'desc'     => __( 'Enable debug mode', 'woocommerce' ),
+					'desc_tip' => __( 'Enable shipping debug mode to show matching shipping zones and to bypass shipping rate cache.', 'woocommerce' ),
+					'id'       => 'woocommerce_shipping_debug_mode',
+					'default'  => 'no',
+					'type'     => 'checkbox',
+					'autoload' => false,
+				),
 
-			array( 'type' => 'sectionend', 'id' => 'shipping_options' ),
+				array( 'type' => 'sectionend', 'id' => 'shipping_options' ),
 
-		) );
+			) );
+		}
 
-		return apply_filters( 'woocommerce_get_settings_' . $this->id, $settings );
+		return apply_filters( 'woocommerce_get_settings_' . $this->id, $settings, $current_section );
 	}
 
 	/**
 	 * Output the settings.
 	 */
 	public function output() {
-		global $current_section;
+		global $current_section, $hide_save_button;
 
 		// Load shipping methods so we can show any global options they may have
 		$shipping_methods = WC()->shipping->load_shipping_methods();
 
-		if ( $current_section ) {
-
- 			foreach ( $shipping_methods as $method ) {
-
-				if ( strtolower( get_class( $method ) ) == strtolower( $current_section ) && $method->has_settings() ) {
+		if ( '' === $current_section ) {
+			$this->output_zones_screen();
+		} elseif ( 'options' === $current_section ) {
+			$settings = $this->get_settings();
+			WC_Admin_Settings::output_fields( $settings );
+		} elseif ( 'classes' === $current_section ) {
+			$hide_save_button = true;
+			$this->output_shipping_class_screen();
+		} else {
+			foreach ( $shipping_methods as $method ) {
+				if ( in_array( $current_section, array( $method->id, sanitize_title( get_class( $method ) ) ) ) && $method->has_settings() ) {
 					$method->admin_options();
-					break;
 				}
 			}
- 		} else {
-			$settings = $this->get_settings();
-
-			WC_Admin_Settings::output_fields( $settings );
 		}
 	}
 
-	/**
-	 * Output shipping method settings.
-	 */
-	public function shipping_methods_setting() {
-		$selection_priority = get_option( 'woocommerce_shipping_method_selection_priority', array() );
-		?>
-		<tr valign="top">
-			<th scope="row" class="titledesc"><?php _e( 'Shipping Methods', 'woocommerce' ) ?></th>
-			<td class="forminp">
-				<table class="wc_shipping widefat wp-list-table" cellspacing="0">
-					<thead>
-						<tr>
-							<th class="sort">&nbsp;</th>
-							<th class="name"><?php _e( 'Name', 'woocommerce' ); ?></th>
-							<th class="id"><?php _e( 'ID', 'woocommerce' ); ?></th>
-							<th class="status"><?php _e( 'Enabled', 'woocommerce' ); ?></th>
-							<th class="priority"><?php _e( 'Selection Priority', 'woocommerce' ); ?> <?php echo wc_help_tip( __( 'Available methods will be chosen by default in this order. If multiple methods have the same priority, they will be sorted by cost.', 'woocommerce' ) ); ?></th>
-						</tr>
-					</thead>
-					<tbody>
-						<?php foreach ( WC()->shipping->load_shipping_methods() as $key => $method ) : ?>
-							<tr>
-								<td width="1%" class="sort">
-									<input type="hidden" name="method_order[<?php echo esc_attr( $method->id ); ?>]" value="<?php echo esc_attr( $method->id ); ?>" />
-								</td>
-								<td class="name">
-									<?php if ( $method->has_settings ) : ?><a href="<?php echo esc_url( admin_url( 'admin.php?page=wc-settings&tab=shipping&section=' . strtolower( get_class( $method ) ) ) ); ?>"><?php endif; ?>
-									<?php echo esc_html( $method->get_title() ); ?>
-									<?php if ( $method->has_settings ) : ?></a><?php endif; ?>
-								</td>
-								<td class="id">
-									<?php echo esc_attr( $method->id ); ?>
-								</td>
-								<td class="status">
-									<?php if ( 'yes' === $method->enabled ) : ?>
-										<span class="status-enabled tips" data-tip="<?php esc_attr_e( 'Yes', 'woocommerce' ); ?>"><?php _e( 'Yes', 'woocommerce' ); ?></span>
-									<?php else : ?>
-										<span class="na">-</span>
-									<?php endif; ?>
-								</td>
-								<td width="1%" class="priority">
-									<input type="number" step="1" min="0" name="method_priority[<?php echo esc_attr( $method->id ); ?>]" value="<?php echo isset( $selection_priority[ $method->id ] ) ? absint( $selection_priority[ $method->id ] ) : 1; ?>" />
-								</td>
-							</tr>
-						<?php endforeach; ?>
-					</tbody>
-					<tfoot>
-						<tr>
-							<th>&nbsp;</th>
-							<th colspan="4"><span class="description"><?php _e( 'Drag and drop the above shipping methods to control their display order.', 'woocommerce' ); ?></span></th>
-						</tr>
-					</tfoot>
-				</table>
-			</td>
-		</tr>
-		<?php
-	}
-
 	/**
 	 * Save settings.
 	 */
 	public function save() {
 		global $current_section;
 
-		$wc_shipping = WC_Shipping::instance();
+		switch ( $current_section ) {
+			case 'options' :
+				WC_Admin_Settings::save_fields( $this->get_settings() );
+			break;
+			case 'classes' :
+			case '' :
+			break;
+			default :
+				$wc_shipping = WC_Shipping::instance();
 
-		if ( ! $current_section ) {
-			WC_Admin_Settings::save_fields( $this->get_settings() );
-			$wc_shipping->process_admin_options();
-
-		} else {
-			foreach ( $wc_shipping->get_shipping_methods() as $method_id => $method ) {
-				if ( $current_section === sanitize_title( get_class( $method ) ) ) {
-					do_action( 'woocommerce_update_options_' . $this->id . '_' . $method->id );
+				foreach ( $wc_shipping->get_shipping_methods() as $method_id => $method ) {
+					if ( in_array( $current_section, array( $method->id, sanitize_title( get_class( $method ) ) ) ) ) {
+						do_action( 'woocommerce_update_options_' . $this->id . '_' . $method->id );
+					}
 				}
-			}
+			break;
 		}
 
 		// Increments the transient version to invalidate cache
 		WC_Cache_Helper::get_transient_version( 'shipping', true );
 	}
+
+	/**
+	 * Handles output of the shipping zones page in admin.
+	 */
+	protected function output_zones_screen() {
+		global $hide_save_button;
+
+		if ( isset( $_REQUEST['zone_id'] ) ) {
+			$hide_save_button = true;
+			$this->zone_methods_screen( wc_clean( $_REQUEST['zone_id'] ) );
+		} elseif ( isset( $_REQUEST['instance_id'] ) ) {
+			$this->instance_settings_screen( absint( $_REQUEST['instance_id'] ) );
+		} else {
+			$hide_save_button = true;
+			$this->zones_screen();
+		}
+	}
+
+	/**
+	 * Show method for a zone
+	 * @param  int $zone_id
+	 */
+	protected function zone_methods_screen( $zone_id ) {
+		if ( 'new' === $zone_id ) {
+			$zone = new WC_Shipping_Zone();
+		} else {
+			$zone = WC_Shipping_Zones::get_zone( absint( $zone_id ) );
+		}
+
+		if ( ! $zone ) {
+			wp_die( __( 'Zone does not exist!', 'woocommerce' ) );
+		}
+
+		$allowed_countries = WC()->countries->get_allowed_countries();
+		$wc_shipping       = WC_Shipping ::instance();
+		$shipping_methods  = $wc_shipping->get_shipping_methods();
+		$continents        = WC()->countries->get_continents();
+
+		// Prepare locations
+		$locations = array();
+		$postcodes = array();
+
+		foreach ( $zone->get_zone_locations() as $location ) {
+			if ( 'postcode' === $location->type ) {
+				$postcodes[] = $location->code;
+			} else {
+				$locations[] = $location->type . ':' . $location->code;
+			}
+		}
+
+		wp_localize_script( 'wc-shipping-zone-methods', 'shippingZoneMethodsLocalizeScript', array(
+			'methods'                 => $zone->get_shipping_methods(),
+			'zone_name'               => $zone->get_zone_name(),
+			'zone_id'                 => $zone->get_id(),
+			'wc_shipping_zones_nonce' => wp_create_nonce( 'wc_shipping_zones_nonce' ),
+			'strings'                 => array(
+				'unload_confirmation_msg' => __( 'Your changed data will be lost if you leave this page without saving.', 'woocommerce' ),
+				'save_changes_prompt' => __( 'Do you wish to save your changes first? Your changed data will be discarded if you choose to cancel.', 'woocommerce' ),
+				'save_failed'         => __( 'Your changes were not saved. Please retry.', 'woocommerce' ),
+				'add_method_failed'   => __( 'Shipping method could not be added. Please retry.', 'woocommerce' ),
+				'yes'                 => __( 'Yes', 'woocommerce' ),
+				'no'                  => __( 'No', 'woocommerce' ),
+				'default_zone_name'   => __( 'Zone', 'woocommerce' ),
+			),
+		) );
+		wp_enqueue_script( 'wc-shipping-zone-methods' );
+
+		include_once( dirname( __FILE__ ) . '/views/html-admin-page-shipping-zone-methods.php' );
+	}
+
+	/**
+	 * Show zones
+	 */
+	protected function zones_screen() {
+		global $wpdb;
+
+		$allowed_countries = WC()->countries->get_allowed_countries();
+		$continents        = WC()->countries->get_continents();
+		$method_count      = wc_get_shipping_method_count();
+
+		wp_localize_script( 'wc-shipping-zones', 'shippingZonesLocalizeScript', array(
+			'zones'         => WC_Shipping_Zones::get_zones(),
+			'default_zone'  => array(
+				'zone_id'    => 0,
+				'zone_name'  => '',
+				'zone_order' => null,
+			),
+			'wc_shipping_zones_nonce'  => wp_create_nonce( 'wc_shipping_zones_nonce' ),
+			'strings'       => array(
+				'unload_confirmation_msg'     => __( 'Your changed data will be lost if you leave this page without saving.', 'woocommerce' ),
+				'delete_confirmation_msg'     => __( 'Are you sure you want to delete this zone? This action cannot be undone.', 'woocommerce' ),
+				'save_failed'                 => __( 'Your changes were not saved. Please retry.', 'woocommerce' ),
+				'no_shipping_methods_offered' => __( 'No shipping methods offered to this zone.', 'woocommerce' ),
+			),
+		) );
+		wp_enqueue_script( 'wc-shipping-zones' );
+
+		include_once( dirname( __FILE__ ) . '/views/html-admin-page-shipping-zones.php' );
+	}
+
+	/**
+	 * Show instance settings
+	 * @param  int $instance_id
+	 */
+	protected function instance_settings_screen( $instance_id ) {
+		$zone            = WC_Shipping_Zones::get_zone_by( 'instance_id', $instance_id );
+		$shipping_method = WC_Shipping_Zones::get_shipping_method( $instance_id );
+
+		if ( ! $shipping_method ) {
+			wp_die( __( 'Invalid shipping method!', 'woocommerce' ) );
+		}
+		if ( ! $zone ) {
+			wp_die( __( 'Zone does not exist!', 'woocommerce' ) );
+		}
+		if ( ! $shipping_method->has_settings() ) {
+			wp_die( __( 'This shipping method does not have any settings to configure.', 'woocommerce' ) );
+		}
+
+		if ( ! empty( $_POST['save'] ) ) {
+
+			if ( empty( $_REQUEST['_wpnonce'] ) || ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'woocommerce-settings' ) ) {
+				echo '<div class="updated error"><p>' . __( 'Edit failed. Please try again.', 'woocommerce' ) . '</p></div>';
+			}
+
+			$shipping_method->process_admin_options();
+			$shipping_method->display_errors();
+		}
+
+		include_once( dirname( __FILE__ ) . '/views/html-admin-page-shipping-zones-instance.php' );
+	}
+
+	/**
+	 * Handles output of the shipping class settings screen.
+	 */
+	protected function output_shipping_class_screen() {
+		$wc_shipping = WC_Shipping::instance();
+		wp_localize_script( 'wc-shipping-classes', 'shippingClassesLocalizeScript', array(
+			'classes'         => $wc_shipping->get_shipping_classes(),
+			'default_shipping_class'  => array(
+				'term_id'     => 0,
+				'name'        => '',
+				'description' => '',
+			),
+			'wc_shipping_classes_nonce' => wp_create_nonce( 'wc_shipping_classes_nonce' ),
+			'strings'       => array(
+				'unload_confirmation_msg' => __( 'Your changed data will be lost if you leave this page without saving.', 'woocommerce' ),
+				'save_failed'             => __( 'Your changes were not saved. Please retry.', 'woocommerce' ),
+			),
+		) );
+		wp_enqueue_script( 'wc-shipping-classes' );
+
+		// Extendable columns to show on the shipping classes screen.
+		$shipping_class_columns = apply_filters( 'woocommerce_shipping_classes_columns', array(
+			'wc-shipping-class-name'        => __( 'Shipping class', 'woocommerce' ),
+			'wc-shipping-class-slug'        => __( 'Slug', 'woocommerce' ),
+			'wc-shipping-class-description' => __( 'Description', 'woocommerce' ),
+			'wc-shipping-class-count'       => __( 'Product count', 'woocommerce' ),
+		) );
+
+		include_once( dirname( __FILE__ ) . '/views/html-admin-page-shipping-classes.php' );
+	}
 }
 
 endif;
diff --git a/includes/admin/settings/class-wc-settings-tax.php b/includes/admin/settings/class-wc-settings-tax.php
index 85ffc45db93..afaa3f77b06 100644
--- a/includes/admin/settings/class-wc-settings-tax.php
+++ b/includes/admin/settings/class-wc-settings-tax.php
@@ -12,13 +12,18 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
-if ( ! class_exists( 'WC_Settings_Tax' ) ) :
+if ( ! class_exists( 'WC_Settings_Tax', false ) ) :
 
 /**
  * WC_Settings_Tax.
  */
 class WC_Settings_Tax extends WC_Settings_Page {
 
+	/**
+	 * Setting page id.
+	 *
+	 * @var string
+	 */
 	protected $id = 'tax';
 
 	/**
@@ -29,6 +34,17 @@ class WC_Settings_Tax extends WC_Settings_Page {
 		parent::__construct();
 	}
 
+	/**
+	 * Add this page to settings.
+	 */
+	public function add_settings_page( $pages ) {
+		if ( wc_tax_enabled() ) {
+			return parent::add_settings_page( $pages );
+		} else {
+			return $pages;
+		}
+	}
+
 	/**
 	 * Get sections.
 	 *
@@ -36,15 +52,15 @@ class WC_Settings_Tax extends WC_Settings_Page {
 	 */
 	public function get_sections() {
 		$sections = array(
-			''         => __( 'Tax Options', 'woocommerce' ),
-			'standard' => __( 'Standard Rates', 'woocommerce' )
+			''         => __( 'Tax options', 'woocommerce' ),
+			'standard' => __( 'Standard rates', 'woocommerce' ),
 		);
 
 		// Get tax classes and display as links
 		$tax_classes = WC_Tax::get_tax_classes();
 
 		foreach ( $tax_classes as $class ) {
-			$sections[ sanitize_title( $class ) ] = sprintf( __( '%s Rates', 'woocommerce' ), $class );
+			$sections[ sanitize_title( $class ) ] = sprintf( __( '%s rates', 'woocommerce' ), $class );
 		}
 
 		return apply_filters( 'woocommerce_get_sections_' . $this->id, $sections );
@@ -56,13 +72,6 @@ class WC_Settings_Tax extends WC_Settings_Page {
 	 * @return array
 	 */
 	public function get_settings() {
-		$tax_classes     = WC_Tax::get_tax_classes();
-		$classes_options = array();
-
-		foreach ( $tax_classes as $class ) {
-			$classes_options[ sanitize_title( $class ) ] = esc_html( $class );
-		}
-
 		return apply_filters( 'woocommerce_get_settings_' . $this->id, include( 'views/settings-tax.php' ) );
 	}
 
@@ -72,9 +81,9 @@ class WC_Settings_Tax extends WC_Settings_Page {
 	public function output() {
 		global $current_section;
 
-		$tax_classes = WC_Tax::get_tax_classes();
+		$tax_classes = WC_Tax::get_tax_class_slugs();
 
-		if ( $current_section == 'standard' || in_array( $current_section, array_map( 'sanitize_title', $tax_classes ) ) ) {
+		if ( 'standard' === $current_section || in_array( $current_section, $tax_classes ) ) {
 			$this->output_tax_rates();
 		} else {
 			$settings = $this->get_settings();
@@ -104,16 +113,15 @@ class WC_Settings_Tax extends WC_Settings_Page {
 	 * Output tax rate tables.
 	 */
 	public function output_tax_rates() {
-		global $wpdb,
-				$current_section;
+		global $wpdb, $current_section;
 
 		$current_class = $this->get_current_tax_class();
 
 		$countries = array();
 		foreach ( WC()->countries->get_allowed_countries() as $value => $label ) {
 			$countries[] = array(
-				'label' => $label,
 				'value' => $value,
+				'label' => esc_js( html_entity_decode( $label ) ),
 			);
 		}
 
@@ -121,8 +129,8 @@ class WC_Settings_Tax extends WC_Settings_Page {
 		foreach ( WC()->countries->get_allowed_country_states() as $label ) {
 			foreach ( $label as $code => $state ) {
 				$states[] = array(
-					'label' => $state,
 					'value' => $code,
+					'label' => esc_js( html_entity_decode( $state ) ),
 				);
 			}
 		}
@@ -159,16 +167,16 @@ class WC_Settings_Tax extends WC_Settings_Page {
 				'no_rows_selected' => __( 'No row(s) selected', 'woocommerce' ),
 				'unload_confirmation_msg' => __( 'Your changed data will be lost if you leave this page without saving.', 'woocommerce' ),
 				'csv_data_cols' => array(
-					__( 'Country Code', 'woocommerce' ),
-					__( 'State Code', 'woocommerce' ),
-					__( 'ZIP/Postcode', 'woocommerce' ),
+					__( 'Country code', 'woocommerce' ),
+					__( 'State code', 'woocommerce' ),
+					__( 'Postcode / ZIP', 'woocommerce' ),
 					__( 'City', 'woocommerce' ),
 					__( 'Rate %', 'woocommerce' ),
-					__( 'Tax Name', 'woocommerce' ),
+					__( 'Tax name', 'woocommerce' ),
 					__( 'Priority', 'woocommerce' ),
 					__( 'Compound', 'woocommerce' ),
 					__( 'Shipping', 'woocommerce' ),
-					__( 'Tax Class', 'woocommerce' ),
+					__( 'Tax class', 'woocommerce' ),
 				),
 			),
 		) );
@@ -187,7 +195,7 @@ class WC_Settings_Tax extends WC_Settings_Page {
 		$tax_classes   = WC_Tax::get_tax_classes();
 		$current_class = '';
 
-		foreach( $tax_classes as $class ) {
+		foreach ( $tax_classes as $class ) {
 			if ( sanitize_title( $class ) == $current_section ) {
 				$current_class = $class;
 			}
@@ -210,7 +218,7 @@ class WC_Settings_Tax extends WC_Settings_Page {
 			'tax_rate_state',
 			'tax_rate',
 			'tax_rate_name',
-			'tax_rate_priority'
+			'tax_rate_priority',
 		);
 
 		foreach ( $tax_rate_keys as $tax_rate_key ) {
@@ -245,7 +253,7 @@ class WC_Settings_Tax extends WC_Settings_Page {
 
 		// Loop posted fields
 		foreach ( $_POST['tax_rate_country'] as $key => $value ) {
-			$mode        = 0 === strpos( $key, 'new-' ) ? 'insert' : 'update';
+			$mode        = ( 0 === strpos( $key, 'new-' ) ) ? 'insert' : 'update';
 			$tax_rate    = $this->get_posted_tax_rate( $key, $index ++, $current_class );
 
 			if ( 'insert' === $mode ) {
diff --git a/includes/admin/settings/views/html-admin-page-shipping-classes.php b/includes/admin/settings/views/html-admin-page-shipping-classes.php
new file mode 100644
index 00000000000..de8849e95f9
--- /dev/null
+++ b/includes/admin/settings/views/html-admin-page-shipping-classes.php
@@ -0,0 +1,84 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+?>
+
+<h2>
+	<?php _e( 'Shipping classes', 'woocommerce' ); ?>
+	<?php echo wc_help_tip( __( 'Shipping classes can be used to group products of similar type and can be used by some Shipping Methods (such as "Flat rate shipping") to provide different rates to different classes of product.', 'woocommerce' ) ); ?>
+</h2>
+
+<table class="wc-shipping-classes widefat">
+	<thead>
+		<tr>
+			<?php foreach ( $shipping_class_columns as $class => $heading ) : ?>
+				<th class="<?php echo esc_attr( $class ); ?>"><?php echo esc_html( $heading ); ?></th>
+			<?php endforeach; ?>
+		</tr>
+	</thead>
+	<tfoot>
+		<tr>
+			<td colspan="<?php echo absint( sizeof( $shipping_class_columns ) ); ?>">
+				<input type="submit" name="save" class="button button-primary wc-shipping-class-save" value="<?php esc_attr_e( 'Save shipping classes', 'woocommerce' ); ?>" disabled />
+				<a class="button button-secondary wc-shipping-class-add" href="#"><?php esc_html_e( 'Add shipping class', 'woocommerce' ); ?></a>
+			</td>
+		</tr>
+	</tfoot>
+	<tbody class="wc-shipping-class-rows"></tbody>
+</table>
+
+<script type="text/html" id="tmpl-wc-shipping-class-row-blank">
+	<tr>
+		<td class="wc-shipping-classes-blank-state" colspan="<?php echo absint( sizeof( $shipping_class_columns ) ); ?>"><p><?php _e( 'No shipping classes have been created.', 'woocommerce' ); ?></p></td>
+	</tr>
+</script>
+
+<script type="text/html" id="tmpl-wc-shipping-class-row">
+	<tr data-id="{{ data.term_id }}">
+		<?php
+			foreach ( $shipping_class_columns as $class => $heading ) {
+				echo '<td class="' . esc_attr( $class ) . '">';
+				switch ( $class ) {
+					case 'wc-shipping-class-name' :
+						?>
+						<div class="view">
+							{{ data.name }}
+							<div class="row-actions">
+								<a class="wc-shipping-class-edit" href="#"><?php _e( 'Edit', 'woocommerce' ); ?></a> | <a href="#" class="wc-shipping-class-delete"><?php _e( 'Remove', 'woocommerce' ); ?></a>
+							</div>
+						</div>
+						<div class="edit">
+							<input type="text" name="name[{{ data.term_id }}]" data-attribute="name" value="{{ data.name }}" placeholder="<?php esc_attr_e( 'Shipping class name', 'woocommerce' ); ?>" />
+							<div class="row-actions">
+								<a class="wc-shipping-class-cancel-edit" href="#"><?php _e( 'Cancel changes', 'woocommerce' ); ?></a>
+							</div>
+						</div>
+						<?php
+					break;
+					case 'wc-shipping-class-slug' :
+						?>
+						<div class="view">{{ data.slug }}</div>
+						<div class="edit"><input type="text" name="slug[{{ data.term_id }}]" data-attribute="slug" value="{{ data.slug }}" placeholder="<?php esc_attr_e( 'Slug', 'woocommerce' ); ?>" /></div>
+						<?php
+					break;
+					case 'wc-shipping-class-description' :
+						?>
+						<div class="view">{{ data.description }}</div>
+						<div class="edit"><input type="text" name="description[{{ data.term_id }}]" data-attribute="description" value="{{ data.description }}" placeholder="<?php esc_attr_e( 'Description for your reference', 'woocommerce' ); ?>" /></div>
+						<?php
+					break;
+					case 'wc-shipping-class-count' :
+						?>
+						<a href="<?php echo esc_url( admin_url( 'edit.php?post_type=product&product_shipping_class=' ) ); ?>{{data.slug}}">{{ data.count }}</a>
+						<?php
+					break;
+					default :
+						do_action( 'woocommerce_shipping_classes_column_' . $class );
+					break;
+				}
+				echo '</td>';
+			}
+		?>
+	</tr>
+</script>
diff --git a/includes/admin/settings/views/html-admin-page-shipping-zone-methods.php b/includes/admin/settings/views/html-admin-page-shipping-zone-methods.php
new file mode 100644
index 00000000000..aca9db2c312
--- /dev/null
+++ b/includes/admin/settings/views/html-admin-page-shipping-zone-methods.php
@@ -0,0 +1,188 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+?>
+
+<h2>
+	<a href="<?php echo admin_url( 'admin.php?page=wc-settings&tab=shipping' ); ?>"><?php _e( 'Shipping zones', 'woocommerce' ); ?></a> &gt;
+	<span class="wc-shipping-zone-name"><?php echo esc_html( $zone->get_zone_name() ? $zone->get_zone_name() : __( 'Zone', 'woocommerce' ) ); ?></span>
+</h2>
+
+<?php do_action( 'woocommerce_shipping_zone_before_methods_table' ); ?>
+
+<table class="form-table wc-shipping-zone-settings">
+	<tbody>
+		<?php if ( 0 !== $zone->get_id() ) : ?>
+			<tr valign="top" class="">
+				<th scope="row" class="titledesc">
+					<label for="zone_name"><?php esc_html_e( 'Zone name', 'woocommerce' ); ?></label>
+					<?php echo wc_help_tip( __( 'This is the name of the zone for your reference.', 'woocommerce' ) ); ?>
+				</th>
+				<td class="forminp">
+					<input type="text" data-attribute="zone_name" name="zone_name" id="zone_name" value="<?php echo esc_attr( $zone->get_zone_name( 'edit' ) ); ?>" placeholder="<?php _e( 'Zone name', 'woocommerce' ); ?>">
+				</td>
+			</tr>
+			<tr valign="top" class="">
+				<th scope="row" class="titledesc">
+					<label for="zone_locations"><?php esc_html_e( 'Zone regions', 'woocommerce' ); ?></label>
+					<?php echo wc_help_tip( __( 'These are regions inside this zone. Customers will be matched against these regions.', 'woocommerce' ) ); ?>
+				</th>
+				<td class="forminp">
+					<select multiple="multiple" data-attribute="zone_locations" id="zone_locations" name="zone_locations" data-placeholder="<?php _e( 'Select regions within this zone', 'woocommerce' ); ?>" class="wc-shipping-zone-region-select chosen_select">
+						<?php
+							foreach ( $continents as $continent_code => $continent ) {
+								echo '<option value="continent:' . esc_attr( $continent_code ) . '" ' . selected( in_array( "continent:$continent_code", $locations ), true, false ) . ' alt="">' . esc_html( $continent['name'] ) . '</option>';
+
+								$countries = array_intersect( array_keys( $allowed_countries ), $continent['countries'] );
+
+								foreach ( $countries as $country_code ) {
+									echo '<option value="country:' . esc_attr( $country_code ) . '" ' . selected( in_array( "country:$country_code", $locations ), true, false ) . ' alt="' . esc_attr( $continent['name'] ) . '">' . esc_html( '&nbsp;&nbsp; ' . $allowed_countries[ $country_code ] ) . '</option>';
+
+									if ( $states = WC()->countries->get_states( $country_code ) ) {
+										foreach ( $states as $state_code => $state_name ) {
+											echo '<option value="state:' . esc_attr( $country_code . ':' . $state_code ) . '" ' . selected( in_array( "state:$country_code:$state_code", $locations ), true, false ) . ' alt="' . esc_attr( $continent['name'] . ' ' . $allowed_countries[ $country_code ] ) . '">' . esc_html( '&nbsp;&nbsp;&nbsp;&nbsp; ' . $state_name ) . '</option>';
+										}
+									}
+								}
+							}
+						?>
+					</select>
+					<?php if ( empty( $postcodes ) ) : ?>
+						<a class="wc-shipping-zone-postcodes-toggle" href="#"><?php _e( 'Limit to specific ZIP/postcodes', 'woocommerce' ); ?></a>
+					<?php endif; ?>
+					<div class="wc-shipping-zone-postcodes">
+						<textarea name="zone_postcodes" data-attribute="zone_postcodes" id="zone_postcodes" placeholder="<?php esc_attr_e( 'List 1 postcode per line', 'woocommerce' ); ?>" class="input-text large-text" cols="25" rows="5"><?php echo esc_textarea( implode( "\n", $postcodes ) ); ?></textarea>
+						<span class="description"><?php _e( 'Postcodes containing wildcards (e.g. CB23*) and fully numeric ranges (e.g. <code>90210...99000</code>) are also supported.', 'woocommerce' ) ?></span>
+					</div>
+				</td>
+			<?php endif; ?>
+		</tr>
+		<tr valign="top" class="">
+			<th scope="row" class="titledesc">
+				<label><?php esc_html_e( 'Shipping methods', 'woocommerce' ); ?></label>
+				<?php echo wc_help_tip( __( 'The following shipping methods apply to customers with shipping addresses within this zone.', 'woocommerce' ) ); ?>
+			</th>
+			<td class="">
+				<table class="wc-shipping-zone-methods widefat">
+					<thead>
+						<tr>
+							<th class="wc-shipping-zone-method-sort"></th>
+							<th class="wc-shipping-zone-method-title"><?php esc_html_e( 'Shipping method title', 'woocommerce' ); ?></th>
+							<th class="wc-shipping-zone-method-enabled"><?php esc_html_e( 'Enabled', 'woocommerce' ); ?></th>
+							<th class="wc-shipping-zone-method-description"><?php esc_html_e( 'Description', 'woocommerce' ); ?></th>
+						</tr>
+					</thead>
+					<tfoot>
+						<tr>
+							<td colspan="4">
+								<input type="submit" class="button wc-shipping-zone-add-method" value="<?php esc_attr_e( 'Add shipping method', 'woocommerce' ); ?>" />
+							</td>
+						</tr>
+					</tfoot>
+					<tbody class="wc-shipping-zone-method-rows"></tbody>
+				</table>
+			</td>
+		</tr>
+	</tbody>
+</table>
+<p class="submit">
+	<input type="submit" name="submit" id="submit" class="button button-primary button-large wc-shipping-zone-method-save" value="<?php esc_attr_e( 'Save changes', 'woocommerce' ); ?>" disabled />
+</p>
+
+<script type="text/html" id="tmpl-wc-shipping-zone-method-row-blank">
+	<tr>
+		<td class="wc-shipping-zone-method-blank-state" colspan="4">
+			<p><?php _e( 'You can add multiple shipping methods within this zone. Only customers within the zone will see them.', 'woocommerce' ); ?></p>
+		</td>
+	</tr>
+</script>
+
+<script type="text/html" id="tmpl-wc-shipping-zone-method-row">
+	<tr data-id="{{ data.instance_id }}" data-enabled="{{ data.enabled }}">
+		<td width="1%" class="wc-shipping-zone-method-sort"></td>
+		<td class="wc-shipping-zone-method-title">
+			<a class="wc-shipping-zone-method-settings" href="admin.php?page=wc-settings&amp;tab=shipping&amp;instance_id={{ data.instance_id }}">{{ data.title }}</a>
+			<div class="row-actions">
+				<a class="wc-shipping-zone-method-settings" href="admin.php?page=wc-settings&amp;tab=shipping&amp;instance_id={{ data.instance_id }}"><?php _e( 'Edit', 'woocommerce' ); ?></a> | <a href="#" class="wc-shipping-zone-method-delete"><?php _e( 'Delete', 'woocommerce' ); ?></a>
+			</div>
+		</td>
+		<td width="1%" class="wc-shipping-zone-method-enabled"><a href="#">{{{ data.enabled_icon }}}</a></td>
+		<td class="wc-shipping-zone-method-description">
+			<strong class="wc-shipping-zone-method-type">{{ data.method_title }}</strong>
+			{{{ data.method_description }}}
+		</td>
+	</tr>
+</script>
+
+<script type="text/template" id="tmpl-wc-modal-shipping-method-settings">
+	<div class="wc-backbone-modal wc-backbone-modal-shipping-method-settings">
+		<div class="wc-backbone-modal-content">
+			<section class="wc-backbone-modal-main" role="main">
+				<header class="wc-backbone-modal-header">
+					<h1><?php
+						/* translators: %s: shipping method title */
+						printf(
+							esc_html__( '%s Settings', 'woocommerce' ),
+							'{{{ data.method.method_title }}}'
+						);
+					?></h1>
+					<button class="modal-close modal-close-link dashicons dashicons-no-alt">
+						<span class="screen-reader-text"><?php _e( 'Close modal panel', 'woocommerce' ); ?></span>
+					</button>
+				</header>
+				<article class="wc-modal-shipping-method-settings">
+					<form action="" method="post">
+						{{{ data.method.settings_html }}}
+						<input type="hidden" name="instance_id" value="{{{ data.instance_id }}}" />
+					</form>
+				</article>
+				<footer>
+					<div class="inner">
+						<button id="btn-ok" class="button button-primary button-large"><?php _e( 'Save changes', 'woocommerce' ); ?></button>
+					</div>
+				</footer>
+			</section>
+		</div>
+	</div>
+	<div class="wc-backbone-modal-backdrop modal-close"></div>
+</script>
+
+<script type="text/template" id="tmpl-wc-modal-add-shipping-method">
+	<div class="wc-backbone-modal">
+		<div class="wc-backbone-modal-content">
+			<section class="wc-backbone-modal-main" role="main">
+				<header class="wc-backbone-modal-header">
+					<h1><?php _e( 'Add shipping method', 'woocommerce' ); ?></h1>
+					<button class="modal-close modal-close-link dashicons dashicons-no-alt">
+						<span class="screen-reader-text"><?php _e( 'Close modal panel', 'woocommerce' ); ?></span>
+					</button>
+				</header>
+				<article>
+					<form action="" method="post">
+						<div class="wc-shipping-zone-method-selector">
+							<p><?php esc_html_e( 'Choose the shipping method you wish to add. Only shipping methods which support zones are listed.', 'woocommerce' ); ?></p>
+
+							<select name="add_method_id">
+								<?php
+									foreach ( WC()->shipping->load_shipping_methods() as $method ) {
+										if ( ! $method->supports( 'shipping-zones' ) ) {
+											continue;
+										}
+										echo '<option data-description="' . esc_attr( wp_kses_post( wpautop( $method->get_method_description() ) ) ) . '" value="' . esc_attr( $method->id ) . '">' . esc_attr( $method->get_method_title() ) . '</li>';
+									}
+								?>
+							</select>
+						</div>
+					</form>
+				</article>
+				<footer>
+					<div class="inner">
+						<button id="btn-ok" class="button button-primary button-large"><?php _e( 'Add shipping method', 'woocommerce' ); ?></button>
+					</div>
+				</footer>
+			</section>
+		</div>
+	</div>
+	<div class="wc-backbone-modal-backdrop modal-close"></div>
+</script>
diff --git a/includes/admin/settings/views/html-admin-page-shipping-zones-instance.php b/includes/admin/settings/views/html-admin-page-shipping-zones-instance.php
new file mode 100644
index 00000000000..82d273b53e4
--- /dev/null
+++ b/includes/admin/settings/views/html-admin-page-shipping-zones-instance.php
@@ -0,0 +1,12 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+?>
+<h2>
+	<a href="<?php echo admin_url( 'admin.php?page=wc-settings&tab=shipping' ); ?>"><?php _e( 'Shipping zones', 'woocommerce' ); ?></a> &gt;
+	<a href="<?php echo admin_url( 'admin.php?page=wc-settings&tab=shipping&zone_id=' . absint( $zone->get_id() ) ); ?>"><?php echo esc_html( $zone->get_zone_name() ); ?></a> &gt;
+	<?php echo esc_html( $shipping_method->get_method_title() ); ?>
+</h2>
+
+<?php $shipping_method->admin_options(); ?>
diff --git a/includes/admin/settings/views/html-admin-page-shipping-zones.php b/includes/admin/settings/views/html-admin-page-shipping-zones.php
new file mode 100644
index 00000000000..c113c70b4cf
--- /dev/null
+++ b/includes/admin/settings/views/html-admin-page-shipping-zones.php
@@ -0,0 +1,128 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+?>
+
+<h2 class="wc-shipping-zones-heading">
+	<?php _e( 'Shipping zones', 'woocommerce' ); ?>
+	<a href="<?php echo admin_url( 'admin.php?page=wc-settings&tab=shipping&zone_id=new' ); ?>" class="page-title-action"><?php esc_html_e( 'Add shipping zone', 'woocommerce' ); ?></a>
+</h2>
+<p><?php echo __( 'A shipping zone is a geographic region where a certain set of shipping methods are offered.', 'woocommerce' ) . ' ' . __( 'WooCommerce will match a customer to a single zone using their shipping address and present the shipping methods within that zone to them.', 'woocommerce' ); ?></p>
+<table class="wc-shipping-zones widefat">
+	<thead>
+		<tr>
+			<th class="wc-shipping-zone-sort"><?php echo wc_help_tip( __( 'Drag and drop to re-order your custom zones. This is the order in which they will be matched against the customer address.', 'woocommerce' ) ); ?></th>
+			<th class="wc-shipping-zone-name"><?php esc_html_e( 'Zone name', 'woocommerce' ); ?></th>
+			<th class="wc-shipping-zone-region"><?php esc_html_e( 'Region(s)', 'woocommerce' ); ?></th>
+			<th class="wc-shipping-zone-methods"><?php esc_html_e( 'Shipping method(s)', 'woocommerce' ); ?></th>
+		</tr>
+	</thead>
+	<tbody class="wc-shipping-zone-rows"></tbody>
+	<tbody>
+		<tr data-id="0">
+			<td width="1%" class="wc-shipping-zone-worldwide"></td>
+			<td class="wc-shipping-zone-name">
+				<a href="<?php echo esc_url( admin_url( 'admin.php?page=wc-settings&tab=shipping&zone_id=0' ) ); ?>"><?php esc_html_e( 'Rest of the World', 'woocommerce' ); ?></a>
+				<div class="row-actions">
+					<a href="admin.php?page=wc-settings&amp;tab=shipping&amp;zone_id=0"><?php _e( 'Edit', 'woocommerce' ); ?></a>
+				</div>
+			</td>
+			<td class="wc-shipping-zone-region"><?php _e( 'This zone is <b>optionally</b> used for regions that are not included in any other shipping zone.', 'woocommerce' ); ?></td>
+			<td class="wc-shipping-zone-methods">
+				<ul>
+					<?php
+						$worldwide = new WC_Shipping_Zone( 0 );
+						$methods   = $worldwide->get_shipping_methods();
+						uasort( $methods, 'wc_shipping_zone_method_order_uasort_comparison' );
+
+						if ( ! empty( $methods ) ) {
+							foreach ( $methods as $method ) {
+								$class_name = 'yes' === $method->enabled ? 'method_enabled' : 'method_disabled';
+								echo '<li class="wc-shipping-zone-method ' . esc_attr( $class_name ) . '">' . esc_html( $method->get_title() ) . '</li>';
+							}
+						} else {
+							echo '<li class="wc-shipping-zone-method">' . __( 'No shipping methods offered to this zone.', 'woocommerce' ) . '</li>';
+						}
+					?>
+				</ul>
+			</td>
+		</tr>
+	</tbody>
+</table>
+
+<script type="text/html" id="tmpl-wc-shipping-zone-row-blank">
+	<?php if ( 0 === $method_count ) : ?>
+		<tr>
+			<td class="wc-shipping-zones-blank-state" colspan="4">
+				<p class="main"><?php _e( 'A shipping zone is a geographic region where a certain set of shipping methods and rates apply.', 'woocommerce' ); ?></p>
+				<p><?php _e( 'For example:', 'woocommerce' ); ?></p>
+				<ul>
+					<li><?php _e( 'Local zone = California ZIP 90210 = Local pickup', 'woocommerce' ); ?>
+					<li><?php _e( 'US domestic zone = All US states = Flat rate shipping', 'woocommerce' ); ?>
+					<li><?php _e( 'Europe zone = Any country in Europe = Flat rate shipping', 'woocommerce' ); ?>
+				</ul>
+				<p><?php _e( 'Add as many zones as you need &ndash; customers will only see the methods available for their address.', 'woocommerce' ); ?></p>
+				<a class="button button-primary wc-shipping-zone-add" href="<?php echo esc_url( admin_url( 'admin.php?page=wc-settings&tab=shipping&zone_id=new' ) ); ?>"><?php _e( 'Add shipping zone', 'woocommerce' ); ?></a>
+			</td>
+		</tr>
+	<?php endif; ?>
+</script>
+
+<script type="text/html" id="tmpl-wc-shipping-zone-row">
+	<tr data-id="{{ data.zone_id }}">
+		<td width="1%" class="wc-shipping-zone-sort"></td>
+		<td class="wc-shipping-zone-name">
+			<a href="admin.php?page=wc-settings&amp;tab=shipping&amp;zone_id={{ data.zone_id }}">{{ data.zone_name }}</a>
+			<div class="row-actions">
+				<a href="admin.php?page=wc-settings&amp;tab=shipping&amp;zone_id={{ data.zone_id }}"><?php _e( 'Edit', 'woocommerce' ); ?></a> | <a href="#" class="wc-shipping-zone-delete"><?php _e( 'Delete', 'woocommerce' ); ?></a>
+			</div>
+		</td>
+		<td class="wc-shipping-zone-region">
+			{{ data.formatted_zone_location }}
+		</td>
+		<td class="wc-shipping-zone-methods">
+			<div><ul></ul></div>
+		</td>
+	</tr>
+</script>
+
+<script type="text/template" id="tmpl-wc-modal-add-shipping-method">
+	<div class="wc-backbone-modal">
+		<div class="wc-backbone-modal-content">
+			<section class="wc-backbone-modal-main" role="main">
+				<header class="wc-backbone-modal-header">
+					<h1><?php _e( 'Add shipping method', 'woocommerce' ); ?></h1>
+					<button class="modal-close modal-close-link dashicons dashicons-no-alt">
+						<span class="screen-reader-text"><?php _e( 'Close modal panel', 'woocommerce' ); ?></span>
+					</button>
+				</header>
+				<article>
+					<form action="" method="post">
+						<div class="wc-shipping-zone-method-selector">
+							<p><?php esc_html_e( 'Choose the shipping method you wish to add. Only shipping methods which support zones are listed.', 'woocommerce' ); ?></p>
+
+							<select name="add_method_id">
+								<?php
+									foreach ( WC()->shipping->load_shipping_methods() as $method ) {
+										if ( ! $method->supports( 'shipping-zones' ) ) {
+											continue;
+										}
+										echo '<option data-description="' . esc_attr( wp_kses_post( wpautop( $method->get_method_description() ) ) ) . '" value="' . esc_attr( $method->id ) . '">' . esc_attr( $method->get_method_title() ) . '</li>';
+									}
+								?>
+							</select>
+							<input type="hidden" name="zone_id" value="{{{ data.zone_id }}}" />
+						</div>
+					</form>
+				</article>
+				<footer>
+					<div class="inner">
+						<button id="btn-ok" class="button button-primary button-large"><?php _e( 'Add shipping method', 'woocommerce' ); ?></button>
+					</div>
+				</footer>
+			</section>
+		</div>
+	</div>
+	<div class="wc-backbone-modal-backdrop modal-close"></div>
+</script>
diff --git a/includes/admin/settings/views/html-keys-edit.php b/includes/admin/settings/views/html-keys-edit.php
index c94159b53f8..7b7d339251f 100644
--- a/includes/admin/settings/views/html-keys-edit.php
+++ b/includes/admin/settings/views/html-keys-edit.php
@@ -5,7 +5,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 ?>
 
 <div id="key-fields" class="settings-panel">
-	<h3><?php _e( 'Key Details', 'woocommerce' ); ?></h3>
+	<h2><?php _e( 'Key details', 'woocommerce' ); ?></h2>
 
 	<input type="hidden" id="key_id" value="<?php echo esc_attr( $key_id ); ?>" />
 
@@ -30,9 +30,17 @@ if ( ! defined( 'ABSPATH' ) ) {
 						$curent_user_id = get_current_user_id();
 						$user_id        = ! empty( $key_data['user_id'] ) ? absint( $key_data['user_id'] ) : $curent_user_id;
 						$user           = get_user_by( 'id', $user_id );
-						$user_string    = esc_html( $user->display_name ) . ' (#' . absint( $user->ID ) . ' &ndash; ' . esc_html( $user->user_email ) . ')';
+						/* translators: 1: user display name 2: user ID 3: user email */
+						$user_string    = sprintf(
+							esc_html__( '%1$s (#%2$s &ndash; %3$s)', 'woocommerce' ),
+							$user->display_name,
+							absint( $user->ID ),
+							$user->user_email
+						);
 					?>
-					<input type="hidden" class="wc-customer-search" id="key_user" data-placeholder="<?php esc_attr_e( 'Search for a customer&hellip;', 'woocommerce' ); ?>" data-selected="<?php echo esc_attr( $user_string ); ?>" value="<?php echo esc_attr( $user_id ); ?>" data-allow_clear="true" />
+					<select class="wc-customer-search" id="key_user" data-placeholder="<?php esc_attr_e( 'Search for a user&hellip;', 'woocommerce' ); ?>" data-allow_clear="true">
+						<option value="<?php echo esc_attr( $user_id ); ?>" selected="selected"><?php echo $user_string; ?><option>
+					</select>
 				</td>
 			</tr>
 			<tr valign="top">
@@ -59,7 +67,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 			<?php if ( 0 !== $key_id ) : ?>
 				<tr valign="top">
 					<th scope="row" class="titledesc">
-						<?php _e( 'Consumer Key Ending In', 'woocommerce' ); ?>
+						<?php _e( 'Consumer key ending in', 'woocommerce' ); ?>
 					</th>
 					<td class="forminp">
 						<code>&hellip;<?php echo esc_html( $key_data['truncated_key'] ); ?></code>
@@ -67,12 +75,13 @@ if ( ! defined( 'ABSPATH' ) ) {
 				</tr>
 				<tr valign="top">
 					<th scope="row" class="titledesc">
-						<?php _e( 'Last Access', 'woocommerce' ); ?>
+						<?php _e( 'Last access', 'woocommerce' ); ?>
 					</th>
 					<td class="forminp">
 						<span><?php
 							if ( ! empty( $key_data['last_access'] ) ) {
-								$date = sprintf( _x( '%1$s at %2$s', 'date and time', 'woocommerce' ), date_i18n( wc_date_format(), strtotime( $key_data['last_access'] ) ), date_i18n( wc_time_format(), strtotime( $key_data['last_access'] ) ) );
+								/* translators: 1: last access date 2: last access time */
+								$date = sprintf( __( '%1$s at %2$s', 'woocommerce' ), date_i18n( wc_date_format(), strtotime( $key_data['last_access'] ) ), date_i18n( wc_time_format(), strtotime( $key_data['last_access'] ) ) );
 
 								echo apply_filters( 'woocommerce_api_key_last_access_datetime', $date, $key_data['last_access'] );
 							} else {
@@ -89,12 +98,12 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 	<?php
 		if ( 0 == $key_id ) {
-			submit_button( __( 'Generate API Key', 'woocommerce' ), 'primary', 'update_api_key' );
+			submit_button( __( 'Generate API key', 'woocommerce' ), 'primary', 'update_api_key' );
 		} else {
 			?>
 			<p class="submit">
-				<?php submit_button( __( 'Save Changes', 'woocommerce' ), 'primary', 'update_api_key', false ); ?>
-				<a style="color: #a00; text-decoration: none; margin-left: 10px;" href="<?php echo esc_url( wp_nonce_url( add_query_arg( array( 'revoke-key' => $key_id ), admin_url( 'admin.php?page=wc-settings&tab=api&section=keys' ) ), 'revoke' ) ); ?>"><?php _e( 'Revoke Key', 'woocommerce' ); ?></a>
+				<?php submit_button( __( 'Save changes', 'woocommerce' ), 'primary', 'update_api_key', false ); ?>
+				<a style="color: #a00; text-decoration: none; margin-left: 10px;" href="<?php echo esc_url( wp_nonce_url( add_query_arg( array( 'revoke-key' => $key_id ), admin_url( 'admin.php?page=wc-settings&tab=api&section=keys' ) ), 'revoke' ) ); ?>"><?php _e( 'Revoke key', 'woocommerce' ); ?></a>
 			</p>
 			<?php
 		}
@@ -102,22 +111,23 @@ if ( ! defined( 'ABSPATH' ) ) {
 </div>
 
 <script type="text/template" id="tmpl-api-keys-template">
+	<p id="copy-error"></p>
 	<table class="form-table">
 		<tbody>
 			<tr valign="top">
 				<th scope="row" class="titledesc">
-					<?php _e( 'Consumer Key', 'woocommerce' ); ?>
+					<?php _e( 'Consumer key', 'woocommerce' ); ?>
 				</th>
 				<td class="forminp">
-					<code id="key_consumer_key">{{ data.consumer_key }}</code> <button type="button" class="button-secondary copy-key" data-tip="<?php esc_attr_e( 'Copied!', 'woocommerce' ); ?>"><?php _e( 'Copy', 'woocommerce' ); ?></button>
+					<input id="key_consumer_key" type="text" value="{{ data.consumer_key }}" size="55" readonly="readonly"> <button type="button" class="button-secondary copy-key" data-tip="<?php esc_attr_e( 'Copied!', 'woocommerce' ); ?>"><?php _e( 'Copy', 'woocommerce' ); ?></button>
 				</td>
 			</tr>
 			<tr valign="top">
 				<th scope="row" class="titledesc">
-					<?php _e( 'Consumer Secret', 'woocommerce' ); ?>
+					<?php _e( 'Consumer secret', 'woocommerce' ); ?>
 				</th>
 				<td class="forminp">
-					<code id="key_consumer_secret">{{ data.consumer_secret }}</code> <button type="button" class="button-secondary copy-key" data-tip="<?php esc_attr_e( 'Copied!', 'woocommerce' ); ?>"><?php _e( 'Copy', 'woocommerce' ); ?></button>
+					<input id="key_consumer_secret" type="text" value="{{ data.consumer_secret }}" size="55" readonly="readonly"> <button type="button" class="button-secondary copy-secret" data-tip="<?php esc_attr_e( 'Copied!', 'woocommerce' ); ?>"><?php _e( 'Copy', 'woocommerce' ); ?></button>
 				</td>
 			</tr>
 			<tr valign="top">
diff --git a/includes/admin/settings/views/html-settings-tax.php b/includes/admin/settings/views/html-settings-tax.php
index 278ff2ed485..f9d426cc301 100644
--- a/includes/admin/settings/views/html-settings-tax.php
+++ b/includes/admin/settings/views/html-settings-tax.php
@@ -5,21 +5,28 @@ if ( ! defined( 'ABSPATH' ) ) {
 ?>
 
 <div class="wc-tax-rates-search" id="rates-search">
-	<input type="search" class="wc-tax-rates-search-field" placeholder="<?php esc_attr_e( 'Search…', 'woocommerce' ); ?>" value="<?php if ( isset( $_GET['s'] ) ) { echo esc_attr( $_GET['s'] ); } ?>" />
+	<input type="search" class="wc-tax-rates-search-field" placeholder="<?php esc_attr_e( 'Search&hellip;', 'woocommerce' ); ?>" value="<?php if ( isset( $_GET['s'] ) ) { echo esc_attr( $_GET['s'] ); } ?>" />
 </div>
 
-<h3><?php printf( __( '"%s" Tax Rates', 'woocommerce' ), $current_class ? esc_html( $current_class ) : __( 'Standard', 'woocommerce' ) ); ?></h3>
+<div id="rates-pagination"></div>
 
-<table class="wc_tax_rates wc_input_table sortable widefat">
+<h3><?php
+	/* translators: %s: tax rate */
+	printf(
+		__( '"%s" tax rates', 'woocommerce' ),
+		$current_class ? esc_html( $current_class ) : __( 'Standard', 'woocommerce' )
+	);
+?></h3>
+
+<table class="wc_tax_rates wc_input_table widefat">
 	<thead>
 		<tr>
-			<th class="sort">&nbsp;</th>
-			<th width="8%"><a href="http://en.wikipedia.org/wiki/ISO_3166-1#Current_codes" target="_blank"><?php _e( 'Country&nbsp;Code', 'woocommerce' ); ?></a>&nbsp;<?php echo wc_help_tip( __( 'A 2 digit country code, e.g. US. Leave blank to apply to all.', 'woocommerce' ) ); ?></th>
-			<th width="8%"><?php _e( 'State&nbsp;Code', 'woocommerce' ); ?>&nbsp;<?php echo wc_help_tip( __( 'A 2 digit state code, e.g. AL. Leave blank to apply to all.', 'woocommerce' ) ); ?></th>
-			<th><?php _e( 'ZIP/Postcode', 'woocommerce' ); ?>&nbsp;<?php echo wc_help_tip( __( 'Postcode for this rule. Semi-colon (;) separate multiple values. Leave blank to apply to all areas. Wildcards (*) can be used. Ranges for numeric postcodes (e.g. 12345-12350) will be expanded into individual postcodes.', 'woocommerce' ) ); ?></th>
+			<th width="8%"><a href="https://en.wikipedia.org/wiki/ISO_3166-1#Current_codes" target="_blank"><?php _e( 'Country&nbsp;code', 'woocommerce' ); ?></a>&nbsp;<?php echo wc_help_tip( __( 'A 2 digit country code, e.g. US. Leave blank to apply to all.', 'woocommerce' ) ); ?></th>
+			<th width="8%"><?php _e( 'State code', 'woocommerce' ); ?>&nbsp;<?php echo wc_help_tip( __( 'A 2 digit state code, e.g. AL. Leave blank to apply to all.', 'woocommerce' ) ); ?></th>
+			<th><?php _e( 'Postcode / ZIP', 'woocommerce' ); ?>&nbsp;<?php echo wc_help_tip( __( 'Postcode for this rule. Semi-colon (;) separate multiple values. Leave blank to apply to all areas. Wildcards (*) and ranges for numeric postcodes (e.g. 12345...12350) can also be used.', 'woocommerce' ) ); ?></th>
 			<th><?php _e( 'City', 'woocommerce' ); ?>&nbsp;<?php echo wc_help_tip( __( 'Cities for this rule. Semi-colon (;) separate multiple values. Leave blank to apply to all cities.', 'woocommerce' ) ); ?></th>
 			<th width="8%"><?php _e( 'Rate&nbsp;%', 'woocommerce' ); ?>&nbsp;<?php echo wc_help_tip( __( 'Enter a tax rate (percentage) to 4 decimal places.', 'woocommerce' ) ); ?></th>
-			<th width="8%"><?php _e( 'Tax&nbsp;Name', 'woocommerce' ); ?>&nbsp;<?php echo wc_help_tip( __( 'Enter a name for this tax rate.', 'woocommerce' ) ); ?></th>
+			<th width="8%"><?php _e( 'Tax name', 'woocommerce' ); ?>&nbsp;<?php echo wc_help_tip( __( 'Enter a name for this tax rate.', 'woocommerce' ) ); ?></th>
 			<th width="8%"><?php _e( 'Priority', 'woocommerce' ); ?>&nbsp;<?php echo wc_help_tip( __( 'Choose a priority for this tax rate. Only 1 matching rate per priority will be used. To define multiple tax rates for a single area you need to specify a different priority per rate.', 'woocommerce' ) ); ?></th>
 			<th width="8%"><?php _e( 'Compound', 'woocommerce' ); ?>&nbsp;<?php echo wc_help_tip( __( 'Choose whether or not this is a compound rate. Compound tax rates are applied on top of other tax rates.', 'woocommerce' ) ); ?></th>
 			<th width="8%"><?php _e( 'Shipping', 'woocommerce' ); ?>&nbsp;<?php echo wc_help_tip( __( 'Choose whether or not this tax rate also gets applied to shipping.', 'woocommerce' ) ); ?></th>
@@ -27,7 +34,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	</thead>
 	<tfoot>
 		<tr>
-			<th colspan="10">
+			<th colspan="9">
 				<a href="#" class="button plus insert"><?php _e( 'Insert row', 'woocommerce' ); ?></a>
 				<a href="#" class="button minus remove_tax_rates"><?php _e( 'Remove selected row(s)', 'woocommerce' ); ?></a>
 				<a href="#" download="tax_rates.csv" class="button export"><?php _e( 'Export CSV', 'woocommerce' ); ?></a>
@@ -37,17 +44,15 @@ if ( ! defined( 'ABSPATH' ) ) {
 	</tfoot>
 	<tbody id="rates">
 		<tr>
-			<th colspan="10" style="text-align: center;"><?php esc_html_e( 'Loading…', 'woocommerce' ); ?></th>
+			<th colspan="9" style="text-align: center;"><?php esc_html_e( 'Loading&hellip;', 'woocommerce' ); ?></th>
 		</tr>
 	</tbody>
 </table>
 
 <script type="text/html" id="tmpl-wc-tax-table-row">
-	<tr class="tips" data-tip="<?php echo esc_attr( sprintf( __( 'Tax rate ID: %s', 'woocommerce' ), '{{ data.tax_rate_id }}' ) ); ?>" data-id="{{ data.tax_rate_id }}">
-		<td class="sort"></td>
-
+	<tr class="tips" data-tip="<?php printf( esc_attr__( 'Tax rate ID: %s', 'woocommerce' ), '{{ data.tax_rate_id }}' ); ?>" data-id="{{ data.tax_rate_id }}">
 		<td class="country">
-			<input type="text" value="{{ data.tax_rate_country }}" placeholder="*" name="tax_rate_country[{{ data.tax_rate_id }}]" class="wc_input_country_iso" data-attribute="tax_rate_country" />
+			<input type="text" value="{{ data.tax_rate_country }}" placeholder="*" name="tax_rate_country[{{ data.tax_rate_id }}]" class="wc_input_country_iso" data-attribute="tax_rate_country" style="text-transform:uppercase" />
 		</td>
 
 		<td class="state">
@@ -55,11 +60,11 @@ if ( ! defined( 'ABSPATH' ) ) {
 		</td>
 
 		<td class="postcode">
-			<input type="text" value="<# if ( data.postcode ) print( data.postcode.join( '; ' ) ); #>" placeholder="*" data-name="tax_rate_postcode[{{ data.tax_rate_id }}]" data-attribute="postcode" />
+			<input type="text" value="<# if ( data.postcode ) print( _.escape( data.postcode.join( '; ' ) ) ); #>" placeholder="*" data-name="tax_rate_postcode[{{ data.tax_rate_id }}]" data-attribute="postcode" />
 		</td>
 
 		<td class="city">
-			<input type="text" value="<# if ( data.city ) print( data.city.join( '; ' ) ); #>" placeholder="*" data-name="tax_rate_city[{{ data.tax_rate_id }}]" data-attribute="city" />
+			<input type="text" value="<# if ( data.city ) print( _.escape( data.city.join( '; ' ) ) ); #>" placeholder="*" data-name="tax_rate_city[{{ data.tax_rate_id }}]" data-attribute="city" />
 		</td>
 
 		<td class="rate">
@@ -86,14 +91,20 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 <script type="text/html" id="tmpl-wc-tax-table-row-empty">
 	<tr>
-		<th colspan="10" style="text-align:center"><?php esc_html_e( 'No Matching Tax Rates Found.', 'woocommerce' ); ?></th>
+		<th colspan="9" style="text-align:center"><?php esc_html_e( 'No matching tax rates found.', 'woocommerce' ); ?></th>
 	</tr>
 </script>
 
 <script type="text/html" id="tmpl-wc-tax-table-pagination">
 	<div class="tablenav">
 		<div class="tablenav-pages">
-			<span class="displaying-num"><?php printf( _x( '%s items', '%s will be a number eventually, but must be a string for now.', 'woocommerce' ), '{{ data.qty_rates }}' ); ?></span>
+			<span class="displaying-num"><?php
+				/* translators: %s: number */
+				printf(
+					__( '%s items', 'woocommerce' ), // %s will be a number eventually, but must be a string for now.
+					'{{ data.qty_rates }}'
+				);
+			?></span>
 			<span class="pagination-links">
 
 				<a class="tablenav-pages-navspan" data-goto="1">
@@ -106,10 +117,15 @@ if ( ! defined( 'ABSPATH' ) ) {
 				</a>
 
 				<span class="paging-input">
-					<label for="current-page-selector" class="screen-reader-text"><?php esc_html_e( 'Current Page', 'woocommerce' ); ?></label>
-					<?php printf( esc_html_x( '%1$s of %2$s', 'Pagination, like `1 of 3`', 'woocommerce' ),
-									'<input class="current-page" id="current-page-selector" type="text" name="paged" value="{{ data.current_page }}" size="<# print( data.qty_pages.toString().length ) #>" aria-describedby="table-paging">',
-									'<span class="total-pages">{{ data.qty_pages }}</span>' ); ?>
+					<label for="current-page-selector" class="screen-reader-text"><?php esc_html_e( 'Current page', 'woocommerce' ); ?></label>
+					<?php
+						/* translators: 1: current page 2: total pages */
+						printf(
+							esc_html_x( '%1$s of %2$s', 'Pagination', 'woocommerce' ),
+							'<input class="current-page" id="current-page-selector" type="text" name="paged" value="{{ data.current_page }}" size="<# print( data.qty_pages.toString().length ) #>" aria-describedby="table-paging">',
+							'<span class="total-pages">{{ data.qty_pages }}</span>'
+						);
+					?>
 				</span>
 
 				<a class="tablenav-pages-navspan" data-goto="<# print( Math.min( data.qty_pages, parseInt( data.current_page, 10 ) + 1 ) ) #>">
diff --git a/includes/admin/settings/views/html-webhook-log.php b/includes/admin/settings/views/html-webhook-log.php
index 03e2465c8ca..3c3be152c43 100644
--- a/includes/admin/settings/views/html-webhook-log.php
+++ b/includes/admin/settings/views/html-webhook-log.php
@@ -8,13 +8,13 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 <tr>
 	<td><?php echo date_i18n( __( 'M j, Y @ G:i', 'woocommerce' ), strtotime( $log['comment']->comment_date_gmt ), true ); ?></td>
-	<td><?php echo esc_attr( $log['duration'] ); ?></td>
+	<td><?php echo esc_attr( $log['request_url'] ); ?></td>
 	<td>
 		<p><strong><?php _e( 'Method', 'woocommerce' ); ?>: </strong><?php echo esc_html( $log['request_method'] ); ?></p>
-		<p><strong><?php _e( 'Duration', 'woocommerce' ); ?>: </strong><?php echo esc_html( $log['request_url'] ); ?></p>
+		<p><strong><?php _e( 'Duration', 'woocommerce' ); ?>: </strong><?php echo esc_html( $log['duration'] ); ?></p>
 		<p><strong><?php _e( 'Headers', 'woocommerce' ); ?>:</strong></p>
 		<ul>
-			<?php foreach ( ( array ) $log['request_headers'] as $key => $value ) : ?>
+			<?php foreach ( (array) $log['request_headers'] as $key => $value ) : ?>
 				<li><strong><em><?php echo strtolower( esc_html( $key ) ); ?>: </em></strong><code><?php echo esc_html( $value ); ?></code></li>
 			<?php endforeach ?>
 		</ul>
@@ -25,7 +25,8 @@ if ( ! defined( 'ABSPATH' ) ) {
 		<p><strong><?php _e( 'Status', 'woocommerce' ); ?>: </strong><?php echo esc_html( $log['summary'] ); ?></p>
 		<p><strong><?php _e( 'Headers', 'woocommerce' ); ?>:</strong></p>
 		<ul>
-			<?php foreach ( (array) $log['response_headers'] as $key => $value ) : ?>
+			<?php $response_headers = is_callable( array( $log['response_headers'], 'getAll' ) ) ? $log['response_headers']->getAll() : $log['response_headers']; ?>
+			<?php foreach ( (array) $response_headers as $key => $value ) : ?>
 				<li><strong><em><?php echo strtolower( esc_html( $key ) ); ?>: </em></strong><code><?php echo esc_html( $value ); ?></code></li>
 			<?php endforeach ?>
 		</ul>
diff --git a/includes/admin/settings/views/html-webhooks-edit.php b/includes/admin/settings/views/html-webhooks-edit.php
index 2d39cea7963..09d2701690d 100644
--- a/includes/admin/settings/views/html-webhooks-edit.php
+++ b/includes/admin/settings/views/html-webhooks-edit.php
@@ -7,13 +7,17 @@ if ( ! defined( 'ABSPATH' ) ) {
 <input type="hidden" name="webhook_id" value="<?php echo esc_attr( $webhook->id ); ?>" />
 
 <div id="webhook-options" class="settings-panel">
-	<h3><?php _e( 'Webhook Data', 'woocommerce' ); ?></h3>
+	<h2><?php _e( 'Webhook data', 'woocommerce' ); ?></h2>
 	<table class="form-table">
 		<tbody>
 			<tr valign="top">
 				<th scope="row" class="titledesc">
 					<label for="webhook_name"><?php _e( 'Name', 'woocommerce' ); ?></label>
-					<?php echo wc_help_tip( sprintf( __( 'Friendly name for identifying this webhook, defaults to Webhook created on %s.', 'woocommerce' ), strftime( _x( '%b %d, %Y @ %I:%M %p', 'Webhook created on date parsed by strftime', 'woocommerce' ) ) ) ); ?>
+					<?php
+					// @codingStandardsIgnoreStart
+					echo wc_help_tip( sprintf( __( 'Friendly name for identifying this webhook, defaults to Webhook created on %s.', 'woocommerce' ), strftime( _x( '%b %d, %Y @ %I:%M %p', 'Webhook created on date parsed by strftime', 'woocommerce' ) ) ) );
+					// @codingStandardsIgnoreEnd
+					?>
 				</th>
 				<td class="forminp">
 					<input name="webhook_name" id="webhook_name" type="text" class="input-text regular-input" value="<?php echo esc_attr( $webhook->get_name() ); ?>" />
@@ -47,21 +51,24 @@ if ( ! defined( 'ABSPATH' ) ) {
 							$topic_data = WC_Admin_Webhooks::get_topic_data( $webhook );
 
 							$topics = apply_filters( 'woocommerce_webhook_topics', array(
-								''                 => __( 'Select an option&hellip;', 'woocommerce' ),
-								'coupon.created'   => __( 'Coupon Created', 'woocommerce' ),
-								'coupon.updated'   => __( 'Coupon Updated', 'woocommerce' ),
-								'coupon.deleted'   => __( 'Coupon Deleted', 'woocommerce' ),
-								'customer.created' => __( 'Customer Created', 'woocommerce' ),
-								'customer.updated' => __( 'Customer Updated', 'woocommerce' ),
-								'customer.deleted' => __( 'Customer Deleted', 'woocommerce' ),
-								'order.created'    => __( 'Order Created', 'woocommerce' ),
-								'order.updated'    => __( 'Order Updated', 'woocommerce' ),
-								'order.deleted'    => __( 'Order Deleted', 'woocommerce' ),
-								'product.created'  => __( 'Product Created', 'woocommerce' ),
-								'product.updated'  => __( 'Product Updated', 'woocommerce' ),
-								'product.deleted'  => __( 'Product Deleted', 'woocommerce' ),
-								'action'           => __( 'Action', 'woocommerce' ),
-								'custom'           => __( 'Custom', 'woocommerce' )
+								''                  => __( 'Select an option&hellip;', 'woocommerce' ),
+								'coupon.created'    => __( 'Coupon created', 'woocommerce' ),
+								'coupon.updated'    => __( 'Coupon updated', 'woocommerce' ),
+								'coupon.deleted'    => __( 'Coupon deleted', 'woocommerce' ),
+								'coupon.restored'   => __( 'Coupon restored', 'woocommerce' ),
+								'customer.created'  => __( 'Customer created', 'woocommerce' ),
+								'customer.updated'  => __( 'Customer updated', 'woocommerce' ),
+								'customer.deleted'  => __( 'Customer deleted', 'woocommerce' ),
+								'order.created'     => __( 'Order created', 'woocommerce' ),
+								'order.updated'     => __( 'Order updated', 'woocommerce' ),
+								'order.deleted'     => __( 'Order deleted', 'woocommerce' ),
+								'order.restored'    => __( 'Order restored', 'woocommerce' ),
+								'product.created'   => __( 'Product created', 'woocommerce' ),
+								'product.updated'   => __( 'Product updated', 'woocommerce' ),
+								'product.deleted'   => __( 'Product deleted', 'woocommerce' ),
+								'product.restored'  => __( 'Product restored', 'woocommerce' ),
+								'action'            => __( 'Action', 'woocommerce' ),
+								'custom'            => __( 'Custom', 'woocommerce' ),
 							) );
 
 							foreach ( $topics as $topic_slug => $topic_name ) : ?>
@@ -72,8 +79,8 @@ if ( ! defined( 'ABSPATH' ) ) {
 			</tr>
 			<tr valign="top" id="webhook-action-event-wrap">
 				<th scope="row" class="titledesc">
-					<label for="webhook_action_event"><?php _e( 'Action Event', 'woocommerce' ); ?></label>
-					<?php echo wc_help_tip( __( 'Enter the Action that will trigger this webhook.', 'woocommerce' ) ); ?>
+					<label for="webhook_action_event"><?php _e( 'Action event', 'woocommerce' ); ?></label>
+					<?php echo wc_help_tip( __( 'Enter the action that will trigger this webhook.', 'woocommerce' ) ); ?>
 				</th>
 				<td class="forminp">
 					<input name="webhook_action_event" id="webhook_action_event" type="text" class="input-text regular-input" value="<?php echo esc_attr( $topic_data['event'] ); ?>" />
@@ -81,8 +88,8 @@ if ( ! defined( 'ABSPATH' ) ) {
 			</tr>
 			<tr valign="top" id="webhook-custom-topic-wrap">
 				<th scope="row" class="titledesc">
-					<label for="webhook_custom_topic"><?php _e( 'Custom Topic', 'woocommerce' ); ?></label>
-					<?php echo wc_help_tip( __( 'Enter the Custom Topic that will trigger this webhook.', 'woocommerce' ) ); ?>
+					<label for="webhook_custom_topic"><?php _e( 'Custom topic', 'woocommerce' ); ?></label>
+					<?php echo wc_help_tip( __( 'Enter the custom topic that will trigger this webhook.', 'woocommerce' ) ); ?>
 				</th>
 				<td class="forminp">
 					<input name="webhook_custom_topic" id="webhook_custom_topic" type="text" class="input-text regular-input" value="<?php echo esc_attr( $webhook->get_topic() ); ?>" />
@@ -100,12 +107,25 @@ if ( ! defined( 'ABSPATH' ) ) {
 			<tr valign="top">
 				<th scope="row" class="titledesc">
 					<label for="webhook_secret"><?php _e( 'Secret', 'woocommerce' ); ?></label>
-					<?php echo wc_help_tip( __( 'The Secret Key is used to generate a hash of the delivered webhook and provided in the request headers. This will default to the current API user\'s consumer secret if not provided.', 'woocommerce' ) ); ?>
+					<?php echo wc_help_tip( __( 'The secret key is used to generate a hash of the delivered webhook and provided in the request headers.', 'woocommerce' ) ); ?>
 				</th>
 				<td class="forminp">
 					<input name="webhook_secret" id="webhook_secret" type="text" class="input-text regular-input" value="<?php echo esc_attr( $webhook->get_secret() ); ?>" />
 				</td>
 			</tr>
+			<tr valign="top">
+				<th scope="row" class="titledesc">
+					<label for="webhook_api_version"><?php _e( 'API Version', 'woocommerce' ); ?></label>
+					<?php echo wc_help_tip( __( 'REST API version used in the webhook deliveries.', 'woocommerce' ) ); ?>
+				</th>
+				<td class="forminp">
+					<select name="webhook_api_version" id="webhook_api_version">
+						<option value="wp_api_v2" <?php selected( 'wp_api_v2', $webhook->get_api_version(), true ); ?>><?php _e( 'WP REST API Integration v2', 'woocommerce' ); ?></option>
+						<option value="wp_api_v1" <?php selected( 'wp_api_v1', $webhook->get_api_version(), true ); ?>><?php _e( 'WP REST API Integration v1', 'woocommerce' ); ?></option>
+						<option value="legacy_v3" <?php selected( 'legacy_v3', $webhook->get_api_version(), true ); ?>><?php _e( 'Legacy API v3 (deprecated)', 'woocommerce' ); ?></option>
+					</select>
+				</td>
+			</tr>
 		</tbody>
 	</table>
 
@@ -113,7 +133,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 </div>
 
 <div id="webhook-actions" class="settings-panel">
-	<h3><?php _e( 'Webhook Actions', 'woocommerce' ); ?></h3>
+	<h2><?php _e( 'Webhook actions', 'woocommerce' ); ?></h2>
 	<table class="form-table">
 		<tbody>
 			<?php if ( '0000-00-00 00:00:00' != $webhook->post_data->post_modified_gmt ) : ?>
@@ -148,9 +168,9 @@ if ( ! defined( 'ABSPATH' ) ) {
 			<tr valign="top">
 				<td colspan="2" scope="row" style="padding-left: 0;">
 					<p class="submit">
-						<input type="submit" class="button button-primary button-large" name="save" id="publish" accesskey="p" value="<?php esc_attr_e( 'Save Webhook', 'woocommerce' ); ?>" />
+						<input type="submit" class="button button-primary button-large" name="save" id="publish" accesskey="p" value="<?php esc_attr_e( 'Save webhook', 'woocommerce' ); ?>" />
 						<?php if ( current_user_can( 'delete_post', $webhook->id ) ) : ?>
-							<a style="color: #a00; text-decoration: none; margin-left: 10px;" href="<?php echo esc_url( get_delete_post_link( $webhook->id ) ); ?>"><?php echo ( ! EMPTY_TRASH_DAYS ) ? __( 'Delete Permanently', 'woocommerce' ) : __( 'Move to Trash', 'woocommerce' ); ?></a>
+							<a style="color: #a00; text-decoration: none; margin-left: 10px;" href="<?php echo esc_url( get_delete_post_link( $webhook->id ) ); ?>"><?php echo ( ! EMPTY_TRASH_DAYS ) ? __( 'Delete permanently', 'woocommerce' ) : __( 'Move to trash', 'woocommerce' ); ?></a>
 						<?php endif; ?>
 					</p>
 				</td>
@@ -160,7 +180,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 </div>
 
 <div id="webhook-logs" class="settings-panel">
-	<h3><?php _e( 'Webhook Logs', 'woocommerce' ); ?></h3>
+	<h2><?php _e( 'Webhook logs', 'woocommerce' ); ?></h2>
 
 	<?php WC_Admin_Webhooks::logs_output( $webhook ); ?>
 </div>
diff --git a/includes/admin/settings/views/settings-tax.php b/includes/admin/settings/views/settings-tax.php
index 77a6d82af0b..846a91cde69 100644
--- a/includes/admin/settings/views/settings-tax.php
+++ b/includes/admin/settings/views/settings-tax.php
@@ -4,54 +4,46 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
-return apply_filters( 'woocommerce_tax_settings', array(
+$settings = array(
 
-	array( 'title' => __( 'Tax Options', 'woocommerce' ), 'type' => 'title','desc' => '', 'id' => 'tax_options' ),
+	array( 'title' => __( 'Tax options', 'woocommerce' ), 'type' => 'title','desc' => '', 'id' => 'tax_options' ),
 
 	array(
-		'title'   => __( 'Enable Taxes', 'woocommerce' ),
-		'desc'    => __( 'Enable taxes and tax calculations', 'woocommerce' ),
-		'id'      => 'woocommerce_calc_taxes',
-		'default' => 'no',
-		'type'    => 'checkbox'
-	),
-
-	array(
-		'title'    => __( 'Prices Entered With Tax', 'woocommerce' ),
+		'title'    => __( 'Prices entered with tax', 'woocommerce' ),
 		'id'       => 'woocommerce_prices_include_tax',
 		'default'  => 'no',
 		'type'     => 'radio',
-		'desc_tip' =>  __( 'This option is important as it will affect how you input prices. Changing it will not update existing products.', 'woocommerce' ),
+		'desc_tip' => __( 'This option is important as it will affect how you input prices. Changing it will not update existing products.', 'woocommerce' ),
 		'options'  => array(
 			'yes' => __( 'Yes, I will enter prices inclusive of tax', 'woocommerce' ),
-			'no'  => __( 'No, I will enter prices exclusive of tax', 'woocommerce' )
+			'no'  => __( 'No, I will enter prices exclusive of tax', 'woocommerce' ),
 		),
 	),
 
 	array(
-		'title'    => __( 'Calculate Tax Based On:', 'woocommerce' ),
+		'title'    => __( 'Calculate tax based on', 'woocommerce' ),
 		'id'       => 'woocommerce_tax_based_on',
-		'desc_tip' =>  __( 'This option determines which address is used to calculate tax.', 'woocommerce' ),
+		'desc_tip' => __( 'This option determines which address is used to calculate tax.', 'woocommerce' ),
 		'default'  => 'shipping',
 		'type'     => 'select',
 		'class'    => 'wc-enhanced-select',
 		'options'  => array(
 			'shipping' => __( 'Customer shipping address', 'woocommerce' ),
 			'billing'  => __( 'Customer billing address', 'woocommerce' ),
-			'base'     => __( 'Shop base address', 'woocommerce' )
+			'base'     => __( 'Shop base address', 'woocommerce' ),
 		),
 	),
 
-	array(
-		'title'    => __( 'Shipping Tax Class:', 'woocommerce' ),
+	'shipping-tax-class' => array(
+		'title'    => __( 'Shipping tax class', 'woocommerce' ),
 		'desc'     => __( 'Optionally control which tax class shipping gets, or leave it so shipping tax is based on the cart items themselves.', 'woocommerce' ),
 		'id'       => 'woocommerce_shipping_tax_class',
 		'css'      => 'min-width:150px;',
-		'default'  => 'title',
+		'default'  => 'inherit',
 		'type'     => 'select',
 		'class'    => 'wc-enhanced-select',
-		'options'  => array( '' => __( 'Shipping tax class based on cart items', 'woocommerce' ), 'standard' => __( 'Standard', 'woocommerce' ) ) + $classes_options,
-		'desc_tip' =>  true,
+		'options'  => array_merge( array( 'inherit' => __( 'Shipping tax class based on cart items', 'woocommerce' ) ), wc_get_product_tax_class_options() ),
+		'desc_tip' => true,
 	),
 
 	array(
@@ -63,16 +55,16 @@ return apply_filters( 'woocommerce_tax_settings', array(
 	),
 
 	array(
-		'title'   => __( 'Additional Tax Classes', 'woocommerce' ),
-		'desc_tip'    => __( 'List additional tax classes below (1 per line). This is in addition to the default "Standard Rate".', 'woocommerce' ),
+		'title'   => __( 'Additional tax classes', 'woocommerce' ),
+		'desc_tip'    => __( 'List additional tax classes below (1 per line). This is in addition to the default "Standard rate".', 'woocommerce' ),
 		'id'      => 'woocommerce_tax_classes',
 		'css'     => 'width:100%; height: 65px;',
 		'type'    => 'textarea',
-		'default' => sprintf( __( 'Reduced Rate%sZero Rate', 'woocommerce' ), PHP_EOL )
+		'default' => sprintf( __( 'Reduced rate%sZero rate', 'woocommerce' ), PHP_EOL ),
 	),
 
 	array(
-		'title'   => __( 'Display Prices in the Shop:', 'woocommerce' ),
+		'title'   => __( 'Display prices in the shop', 'woocommerce' ),
 		'id'      => 'woocommerce_tax_display_shop',
 		'default' => 'excl',
 		'type'    => 'select',
@@ -80,11 +72,11 @@ return apply_filters( 'woocommerce_tax_settings', array(
 		'options' => array(
 			'incl'   => __( 'Including tax', 'woocommerce' ),
 			'excl'   => __( 'Excluding tax', 'woocommerce' ),
-		)
+		),
 	),
 
 	array(
-		'title'   => __( 'Display Prices During Cart and Checkout:', 'woocommerce' ),
+		'title'   => __( 'Display prices during cart and checkout', 'woocommerce' ),
 		'id'      => 'woocommerce_tax_display_cart',
 		'default' => 'excl',
 		'type'    => 'select',
@@ -93,11 +85,11 @@ return apply_filters( 'woocommerce_tax_settings', array(
 			'incl'   => __( 'Including tax', 'woocommerce' ),
 			'excl'   => __( 'Excluding tax', 'woocommerce' ),
 		),
-		'autoload'      => false
+		'autoload'      => false,
 	),
 
 	array(
-		'title'       => __( 'Price Display Suffix:', 'woocommerce' ),
+		'title'       => __( 'Price display suffix', 'woocommerce' ),
 		'id'          => 'woocommerce_price_display_suffix',
 		'default'     => '',
 		'placeholder' => __( 'N/A', 'woocommerce' ),
@@ -106,7 +98,7 @@ return apply_filters( 'woocommerce_tax_settings', array(
 	),
 
 	array(
-		'title'   => __( 'Display Tax Totals:', 'woocommerce' ),
+		'title'   => __( 'Display tax totals', 'woocommerce' ),
 		'id'      => 'woocommerce_tax_total_display',
 		'default' => 'itemized',
 		'type'    => 'select',
@@ -115,9 +107,15 @@ return apply_filters( 'woocommerce_tax_settings', array(
 			'single'     => __( 'As a single total', 'woocommerce' ),
 			'itemized'   => __( 'Itemized', 'woocommerce' ),
 		),
-		'autoload' => false
+		'autoload' => false,
 	),
 
 	array( 'type' => 'sectionend', 'id' => 'tax_options' ),
 
-) );
+);
+
+if ( ! wc_shipping_enabled() ) {
+	unset( $settings['shipping-tax-class'] );
+}
+
+return apply_filters( 'woocommerce_tax_settings', $settings );
diff --git a/includes/admin/views/html-admin-page-addons.php b/includes/admin/views/html-admin-page-addons.php
index d5b49cc963e..024e5af1ea3 100644
--- a/includes/admin/views/html-admin-page-addons.php
+++ b/includes/admin/views/html-admin-page-addons.php
@@ -8,22 +8,26 @@
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
+
 ?>
 <div class="wrap woocommerce wc_addons_wrap">
-	<div class="icon32 icon32-posts-product" id="icon-woocommerce"><br /></div>
-	<h1>
-		<?php _e( 'WooCommerce Add-ons/Extensions', 'woocommerce' ); ?>
-		<a href="http://www.woothemes.com/product-category/woocommerce-extensions/" class="add-new-h2"><?php _e( 'Browse all extensions', 'woocommerce' ); ?></a>
-		<?php WC_Admin_Addons::output_storefront_button(); ?>
-	</h1>
+	<h1><?php echo get_admin_page_title(); ?></h1>
+
 	<?php if ( $sections ) : ?>
 		<ul class="subsubsub">
 			<?php foreach ( $sections as $section_id => $section ) : ?>
-				<li><a class="<?php echo $current_section === $section_id ? 'current' : ''; ?>" href="<?php echo admin_url( 'admin.php?page=wc-addons&section=' . esc_attr( $section_id ) ); ?>"><?php echo esc_html( $section->title ); ?></a><?php if ( $section_id !== end( $section_keys ) ) echo ' |'; ?></li>
+				<li><a class="<?php echo $current_section === $section_id ? 'current' : ''; ?>" href="<?php echo admin_url( 'admin.php?page=wc-addons&section=' . esc_attr( $section_id ) ); ?>"><?php echo esc_html( $section->title ); ?></a><?php echo ( end( $section_keys ) !== $section_id ) ? ' |' : ''; ?></li>
 			<?php endforeach; ?>
 		</ul>
 		<br class="clear" />
-		<?php if ( $addons = WC_Admin_Addons::get_section_data( $current_section ) ) : ?>
+		<?php if ( 'featured' === $current_section ) : ?>
+			<div class="addons-featured">
+				<?php
+					$featured = WC_Admin_Addons::get_featured();
+				?>
+			</div>
+		<?php endif; ?>
+		<?php if ( 'featured' !== $current_section && $addons = WC_Admin_Addons::get_section_data( $current_section ) ) : ?>
 			<ul class="products">
 			<?php foreach ( $addons as $addon ) : ?>
 				<li class="product">
@@ -31,7 +35,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 						<?php if ( ! empty( $addon->image ) ) : ?>
 							<img src="<?php echo esc_attr( $addon->image ); ?>"/>
 						<?php else : ?>
-							<h3><?php echo esc_html( $addon->title ); ?></h3>
+							<h2><?php echo esc_html( $addon->title ); ?></h2>
 						<?php endif; ?>
 						<span class="price"><?php echo wp_kses_post( $addon->price ); ?></span>
 						<p><?php echo wp_kses_post( $addon->excerpt ); ?></p>
@@ -41,17 +45,17 @@ if ( ! defined( 'ABSPATH' ) ) {
 			</ul>
 		<?php endif; ?>
 	<?php else : ?>
-		<p><?php printf( __( 'Our catalog of WooCommerce Extensions can be found on WooThemes.com here: <a href="%s">WooCommerce Extensions Catalog</a>', 'woocommerce' ), 'http://www.woothemes.com/product-category/woocommerce-extensions/' ); ?></p>
+		<p><?php printf( __( 'Our catalog of WooCommerce Extensions can be found on WooCommerce.com here: <a href="%s">WooCommerce Extensions Catalog</a>', 'woocommerce' ), 'https://woocommerce.com/product-category/woocommerce-extensions/' ); ?></p>
 	<?php endif; ?>
 
-	<?php if ( 'Storefront' !== $theme['Name'] ) : ?>
+	<?php if ( 'Storefront' !== $theme['Name'] && 'featured' !== $current_section ) : ?>
 		<div class="storefront">
-			<img src="<?php echo WC()->plugin_url(); ?>/assets/images/storefront.jpg" alt="Storefront" />
-			<h3><?php _e( 'Looking for a WooCommerce theme?', 'woocommerce' ); ?></h3>
-			<p><?php printf( __( 'We recommend Storefront, the %sofficial%s WooCommerce theme.', 'woocommerce' ), '<em>', '</em>' ); ?></p>
-			<p><?php printf( __( 'Storefront is an intuitive &amp; flexible, %sfree%s WordPress theme offering deep integration with WooCommerce and many of the most popular customer-facing extensions.', 'woocommerce' ), '<strong>', '</strong>' ); ?></p>
+			<a href="<?php echo esc_url( 'https://woocommerce.com/storefront/' ); ?>" target="_blank"><img src="<?php echo WC()->plugin_url(); ?>/assets/images/storefront.png" alt="Storefront" /></a>
+			<h2><?php _e( 'Looking for a WooCommerce theme?', 'woocommerce' ); ?></h2>
+			<p><?php _e( 'We recommend Storefront, the <em>official</em> WooCommerce theme.', 'woocommerce' ); ?></p>
+			<p><?php _e( 'Storefront is an intuitive, flexible and <strong>free</strong> WordPress theme offering deep integration with WooCommerce and many of the most popular customer-facing extensions.', 'woocommerce' ); ?></p>
 			<p>
-				<a href="<?php echo esc_url( 'http://www.woothemes.com/storefront/' ); ?>" target="_blank" class="button"><?php _e( 'Read all about it', 'woocommerce' ) ?></a>
+				<a href="https://woocommerce.com/storefront/" target="_blank" class="button"><?php _e( 'Read all about it', 'woocommerce' ) ?></a>
 				<a href="<?php echo esc_url( wp_nonce_url( self_admin_url( 'update.php?action=install-theme&theme=storefront' ), 'install-theme_storefront' ) ); ?>" class="button button-primary"><?php _e( 'Download &amp; install', 'woocommerce' ); ?></a>
 			</p>
 		</div>
diff --git a/includes/admin/views/html-admin-page-reports.php b/includes/admin/views/html-admin-page-reports.php
index 959ebaeaab6..b8f5742eb51 100644
--- a/includes/admin/views/html-admin-page-reports.php
+++ b/includes/admin/views/html-admin-page-reports.php
@@ -4,23 +4,24 @@
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
 ?>
-
 <div class="wrap woocommerce">
-	<div class="icon32 icon32-woocommerce-reports" id="icon-woocommerce"><br /></div><h2 class="nav-tab-wrapper woo-nav-tab-wrapper">
+	<nav class="nav-tab-wrapper woo-nav-tab-wrapper">
 		<?php
 			foreach ( $reports as $key => $report_group ) {
-				echo '<a href="'.admin_url( 'admin.php?page=wc-reports&tab=' . urlencode( $key ) ).'" class="nav-tab ';
-				if ( $current_tab == $key ) echo 'nav-tab-active';
-				echo '">' . esc_html( $report_group[ 'title' ] ) . '</a>';
+				echo '<a href="' . admin_url( 'admin.php?page=wc-reports&tab=' . urlencode( $key ) ) . '" class="nav-tab ';
+				if ( $current_tab == $key ) {
+					echo 'nav-tab-active';
+				}
+				echo '">' . esc_html( $report_group['title'] ) . '</a>';
 			}
-		?>
-		<?php do_action('wc_reports_tabs'); ?>
-	</h2>
 
+			do_action( 'wc_reports_tabs' );
+		?>
+	</nav>
 	<?php if ( sizeof( $reports[ $current_tab ]['reports'] ) > 1 ) {
 		?>
 		<ul class="subsubsub">
@@ -32,7 +33,9 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 					$link = '<a href="admin.php?page=wc-reports&tab=' . urlencode( $current_tab ) . '&amp;report=' . urlencode( $key ) . '" class="';
 
-					if ( $key == $current_report ) $link .= 'current';
+					if ( $key == $current_report ) {
+						$link .= 'current';
+					}
 
 					$link .= '">' . $report['title'] . '</a>';
 
@@ -40,7 +43,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 				}
 
-				echo implode(' | </li><li>', $links);
+				echo implode( ' | </li><li>', $links );
 
 			?></li>
 		</ul>
@@ -48,18 +51,23 @@ if ( ! defined( 'ABSPATH' ) ) {
 		<?php
 	}
 
-	if ( isset( $reports[ $current_tab ][ 'reports' ][ $current_report ] ) ) {
+	if ( isset( $reports[ $current_tab ]['reports'][ $current_report ] ) ) {
 
-		$report = $reports[ $current_tab ][ 'reports' ][ $current_report ];
+		$report = $reports[ $current_tab ]['reports'][ $current_report ];
 
-		if ( ! isset( $report['hide_title'] ) || $report['hide_title'] != true )
-			echo '<h3>' . $report['title'] . '</h3>';
+		if ( ! isset( $report['hide_title'] ) || true != $report['hide_title'] ) {
+			echo '<h1>' . esc_html( $report['title'] ) . '</h1>';
+		} else {
+			echo '<h1 class="screen-reader-text">' . esc_html( $report['title'] ) . '</h1>';
+		}
 
-		if ( $report['description'] )
+		if ( $report['description'] ) {
 			echo '<p>' . $report['description'] . '</p>';
+		}
 
-		if ( $report['callback'] && ( is_callable( $report['callback'] ) ) )
+		if ( $report['callback'] && ( is_callable( $report['callback'] ) ) ) {
 			call_user_func( $report['callback'], $current_report );
+		}
 	}
 	?>
 </div>
diff --git a/includes/admin/views/html-admin-page-status-logs-db.php b/includes/admin/views/html-admin-page-status-logs-db.php
new file mode 100644
index 00000000000..c4b64377bda
--- /dev/null
+++ b/includes/admin/views/html-admin-page-status-logs-db.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Admin View: Page - Status Database Logs
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+?>
+<form method="get" id="mainform" action="">
+
+	<?php $log_table_list->display(); ?>
+
+	<input type="hidden" name="page" value="wc-status" />
+	<input type="hidden" name="tab" value="logs" />
+
+	<?php submit_button( __( 'Flush all logs', 'woocommerce' ), 'delete', 'flush-logs' ); ?>
+	<?php wp_nonce_field( 'woocommerce-status-logs' ); ?>
+</form>
+<?php
+wc_enqueue_js( "
+	jQuery( '#flush-logs' ).click( function() {
+		if ( window.confirm('" . esc_js( __( 'Are you sure you want to clear all logs from the database?', 'woocommerce' ) ) . "') ) {
+			return true;
+		}
+		return false;
+	});
+" );
diff --git a/includes/admin/views/html-admin-page-status-logs.php b/includes/admin/views/html-admin-page-status-logs.php
index a7b93eb5ccd..f16e64ac95d 100644
--- a/includes/admin/views/html-admin-page-status-logs.php
+++ b/includes/admin/views/html-admin-page-status-logs.php
@@ -8,17 +8,21 @@ if ( ! defined( 'ABSPATH' ) ) {
 }
 
 ?>
-
 <?php if ( $logs ) : ?>
 	<div id="log-viewer-select">
 		<div class="alignleft">
-			<h3><?php printf( __( 'Log file: %s (%s)', 'woocommerce' ), esc_html( $viewed_log ), date_i18n( get_option( 'date_format') . ' ' . get_option( 'time_format'), filemtime( WC_LOG_DIR . $viewed_log ) ) ); ?></h3>
+			<h2>
+				<?php echo esc_html( $viewed_log ); ?>
+				<?php if ( ! empty( $handle ) ) : ?>
+					<a class="page-title-action" href="<?php echo esc_url( wp_nonce_url( add_query_arg( array( 'handle' => $handle ), admin_url( 'admin.php?page=wc-status&tab=logs' ) ), 'remove_log' ) ); ?>" class="button"><?php esc_html_e( 'Delete log', 'woocommerce' );?></a>
+				<?php endif; ?>
+			</h2>
 		</div>
 		<div class="alignright">
 			<form action="<?php echo admin_url( 'admin.php?page=wc-status&tab=logs' ); ?>" method="post">
 				<select name="log_file">
 					<?php foreach ( $logs as $log_key => $log_file ) : ?>
-						<option value="<?php echo esc_attr( $log_key ); ?>" <?php selected( sanitize_title( $viewed_log ), $log_key ); ?>><?php echo esc_html( $log_file ); ?> (<?php echo date_i18n( get_option( 'date_format') . ' ' . get_option( 'time_format'), filemtime( WC_LOG_DIR . $log_file ) ); ?>)</option>
+						<option value="<?php echo esc_attr( $log_key ); ?>" <?php selected( sanitize_title( $viewed_log ), $log_key ); ?>><?php echo esc_html( $log_file ); ?> (<?php echo date_i18n( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), filemtime( WC_LOG_DIR . $log_file ) ); ?>)</option>
 					<?php endforeach; ?>
 				</select>
 				<input type="submit" class="button" value="<?php esc_attr_e( 'View', 'woocommerce' ); ?>" />
@@ -27,8 +31,8 @@ if ( ! defined( 'ABSPATH' ) ) {
 		<div class="clear"></div>
 	</div>
 	<div id="log-viewer">
-		<textarea cols="70" rows="25"><?php echo esc_textarea( file_get_contents( WC_LOG_DIR . $viewed_log ) ); ?></textarea>
+		<pre><?php echo esc_html( file_get_contents( WC_LOG_DIR . $viewed_log ) ); ?></pre>
 	</div>
 <?php else : ?>
-	<div class="updated woocommerce-message below-h2"><p><?php _e( 'There are currently no logs to view.', 'woocommerce' ); ?></p></div>
+	<div class="updated woocommerce-message inline"><p><?php _e( 'There are currently no logs to view.', 'woocommerce' ); ?></p></div>
 <?php endif; ?>
diff --git a/includes/admin/views/html-admin-page-status-report.php b/includes/admin/views/html-admin-page-status-report.php
index 8f04d2aa307..b1e06a17003 100644
--- a/includes/admin/views/html-admin-page-status-report.php
+++ b/includes/admin/views/html-admin-page-status-report.php
@@ -7,392 +7,423 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
+global $wpdb;
+
+if ( ! class_exists( 'WC_REST_System_Status_Controller', false ) ) {
+	wp_die( 'Cannot load the REST API to access WC_REST_System_Status_Controller.' );
+}
+
+$system_status  = new WC_REST_System_Status_Controller;
+$environment    = $system_status->get_environment_info();
+$database       = $system_status->get_database_info();
+$active_plugins = $system_status->get_active_plugins();
+$theme          = $system_status->get_theme_info();
+$security       = $system_status->get_security_info();
+$settings       = $system_status->get_settings();
+$pages          = $system_status->get_pages();
 ?>
-<div class="updated woocommerce-message">
+<div class="updated woocommerce-message inline">
 	<p><?php _e( 'Please copy and paste this information in your ticket when contacting support:', 'woocommerce' ); ?> </p>
-	<p class="submit"><a href="#" class="button-primary debug-report"><?php _e( 'Get System Report', 'woocommerce' ); ?></a>
-	<a class="button-secondary docs" href="http://docs.woothemes.com/document/understanding-the-woocommerce-system-status-report/" target="_blank"><?php _e( 'Understanding the Status Report', 'woocommerce' ); ?></a></p>
+	<p class="submit"><a href="#" class="button-primary debug-report"><?php _e( 'Get system report', 'woocommerce' ); ?></a>
+	<a class="button-secondary docs" href="https://docs.woocommerce.com/document/understanding-the-woocommerce-system-status-report/" target="_blank"><?php _e( 'Understanding the status report', 'woocommerce' ); ?></a></p>
 	<div id="debug-report">
 		<textarea readonly="readonly"></textarea>
-		<p class="submit"><button id="copy-for-support" class="button-primary" href="#" data-tip="<?php esc_attr_e( 'Copied!', 'woocommerce' ); ?>"><?php _e( 'Copy for Support', 'woocommerce' ); ?></button></p>
+		<p class="submit"><button id="copy-for-support" class="button-primary" href="#" data-tip="<?php esc_attr_e( 'Copied!', 'woocommerce' ); ?>"><?php _e( 'Copy for support', 'woocommerce' ); ?></button></p>
+		<p class="copy-error hidden"><?php _e( 'Copying to clipboard failed. Please press Ctrl/Cmd+C to copy.', 'woocommerce' ); ?></p>
 	</div>
 </div>
 <table class="wc_status_table widefat" cellspacing="0" id="status">
 	<thead>
 		<tr>
-			<th colspan="3" data-export-label="WordPress Environment"><?php _e( 'WordPress Environment', 'woocommerce' ); ?></th>
+			<th colspan="3" data-export-label="WordPress Environment"><h2><?php _e( 'WordPress environment', 'woocommerce' ); ?></h2></th>
 		</tr>
 	</thead>
 	<tbody>
 		<tr>
 			<td data-export-label="Home URL"><?php _e( 'Home URL', 'woocommerce' ); ?>:</td>
-			<td class="help"><?php echo wc_help_tip( __( 'The URL of your site\'s homepage.', 'woocommerce' ) ); ?></td>
-			<td><?php form_option( 'home' ); ?></td>
+			<td class="help"><?php echo wc_help_tip( __( 'The homepage URL of your site.', 'woocommerce' ) ); ?></td>
+			<td><?php echo esc_html( $environment['home_url'] ) ?></td>
 		</tr>
 		<tr>
 			<td data-export-label="Site URL"><?php _e( 'Site URL', 'woocommerce' ); ?>:</td>
 			<td class="help"><?php echo wc_help_tip( __( 'The root URL of your site.', 'woocommerce' ) ); ?></td>
-			<td><?php form_option( 'siteurl' ); ?></td>
+			<td><?php echo esc_html( $environment['site_url'] ) ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="WC Version"><?php _e( 'WC Version', 'woocommerce' ); ?>:</td>
+			<td data-export-label="WC Version"><?php _e( 'WC version', 'woocommerce' ); ?>:</td>
 			<td class="help"><?php echo wc_help_tip( __( 'The version of WooCommerce installed on your site.', 'woocommerce' ) ); ?></td>
-			<td><?php echo esc_html( WC()->version ); ?></td>
+			<td><?php echo esc_html( $environment['version'] ) ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="Log Directory Writable"><?php _e( 'Log Directory Writable', 'woocommerce' ); ?>:</td>
+			<td data-export-label="Log Directory Writable"><?php _e( 'Log directory writable', 'woocommerce' ); ?>:</td>
 			<td class="help"><?php echo wc_help_tip( __( 'Several WooCommerce extensions can write logs which makes debugging problems easier. The directory must be writable for this to happen.', 'woocommerce' ) ); ?></td>
 			<td><?php
-				if ( @fopen( WC_LOG_DIR . 'test-log.log', 'a' ) ) {
-					echo '<mark class="yes">&#10004; <code>' . WC_LOG_DIR . '</code></mark> ';
+				if ( $environment['log_directory_writable'] ) {
+					echo '<mark class="yes"><span class="dashicons dashicons-yes"></span> <code class="private">' . esc_html( $environment['log_directory'] ) . '</code></mark> ';
 				} else {
-					printf( '<mark class="error">&#10005; ' . __( 'To allow logging, make <code>%s</code> writable or define a custom <code>WC_LOG_DIR</code>.', 'woocommerce' ) . '</mark>', WC_LOG_DIR );
+					echo '<mark class="error"><span class="dashicons dashicons-warning"></span> ' . sprintf( __( 'To allow logging, make %1$s writable or define a custom %2$s.', 'woocommerce' ), '<code>' . $environment['log_directory'] . '</code>', '<code>WC_LOG_DIR</code>' ) . '</mark>';
 				}
 			?></td>
 		</tr>
 		<tr>
-			<td data-export-label="WP Version"><?php _e( 'WP Version', 'woocommerce' ); ?>:</td>
+			<td data-export-label="WP Version"><?php _e( 'WP version', 'woocommerce' ); ?>:</td>
 			<td class="help"><?php echo wc_help_tip( __( 'The version of WordPress installed on your site.', 'woocommerce' ) ); ?></td>
-			<td><?php bloginfo('version'); ?></td>
+			<td><?php echo esc_html( $environment['wp_version'] ) ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="WP Multisite"><?php _e( 'WP Multisite', 'woocommerce' ); ?>:</td>
+			<td data-export-label="WP Multisite"><?php _e( 'WP multisite', 'woocommerce' ); ?>:</td>
 			<td class="help"><?php echo wc_help_tip( __( 'Whether or not you have WordPress Multisite enabled.', 'woocommerce' ) ); ?></td>
-			<td><?php if ( is_multisite() ) echo '&#10004;'; else echo '&ndash;'; ?></td>
+			<td><?php echo ( $environment['wp_multisite'] ) ? '<span class="dashicons dashicons-yes"></span>' : '&ndash;'; ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="WP Memory Limit"><?php _e( 'WP Memory Limit', 'woocommerce' ); ?>:</td>
+			<td data-export-label="WP Memory Limit"><?php _e( 'WP memory limit', 'woocommerce' ); ?>:</td>
 			<td class="help"><?php echo wc_help_tip( __( 'The maximum amount of memory (RAM) that your site can use at one time.', 'woocommerce' ) ); ?></td>
 			<td><?php
-				$memory = wc_let_to_num( WP_MEMORY_LIMIT );
-
-				if ( function_exists( 'memory_get_usage' ) ) {
-					$system_memory = wc_let_to_num( @ini_get( 'memory_limit' ) );
-					$memory        = max( $memory, $system_memory );
-				}
-
-				if ( $memory < 67108864 ) {
-					echo '<mark class="error">' . sprintf( __( '%s - We recommend setting memory to at least 64MB. See: %s', 'woocommerce' ), size_format( $memory ), '<a href="http://codex.wordpress.org/Editing_wp-config.php#Increasing_memory_allocated_to_PHP" target="_blank">' . __( 'Increasing memory allocated to PHP', 'woocommerce' ) . '</a>' ) . '</mark>';
+				if ( $environment['wp_memory_limit'] < 67108864 ) {
+					echo '<mark class="error"><span class="dashicons dashicons-warning"></span> ' . sprintf( __( '%1$s - We recommend setting memory to at least 64MB. See: %2$s', 'woocommerce' ), size_format( $environment['wp_memory_limit'] ), '<a href="https://codex.wordpress.org/Editing_wp-config.php#Increasing_memory_allocated_to_PHP" target="_blank">' . __( 'Increasing memory allocated to PHP', 'woocommerce' ) . '</a>' ) . '</mark>';
 				} else {
-					echo '<mark class="yes">' . size_format( $memory ) . '</mark>';
+					echo '<mark class="yes">' . size_format( $environment['wp_memory_limit'] ) . '</mark>';
 				}
 			?></td>
 		</tr>
 		<tr>
-			<td data-export-label="WP Debug Mode"><?php _e( 'WP Debug Mode', 'woocommerce' ); ?>:</td>
+			<td data-export-label="WP Debug Mode"><?php _e( 'WP debug mode', 'woocommerce' ); ?>:</td>
 			<td class="help"><?php echo wc_help_tip( __( 'Displays whether or not WordPress is in Debug Mode.', 'woocommerce' ) ); ?></td>
-			<td><?php if ( defined('WP_DEBUG') && WP_DEBUG ) echo '<mark class="yes">&#10004;</mark>'; else echo '<mark class="no">&ndash;</mark>'; ?></td>
+			<td>
+				<?php if ( $environment['wp_debug_mode'] ) : ?>
+					<mark class="yes"><span class="dashicons dashicons-yes"></span></mark>
+				<?php else : ?>
+					<mark class="no">&ndash;</mark>
+				<?php endif; ?>
+			</td>
+		</tr>
+		<tr>
+			<td data-export-label="WP Cron"><?php _e( 'WP cron', 'woocommerce' ); ?>:</td>
+			<td class="help"><?php echo wc_help_tip( __( 'Displays whether or not WP Cron Jobs are enabled.', 'woocommerce' ) ); ?></td>
+			<td>
+				<?php if ( $environment['wp_cron'] ) : ?>
+					<mark class="yes"><span class="dashicons dashicons-yes"></span></mark>
+				<?php else : ?>
+					<mark class="no">&ndash;</mark>
+				<?php endif; ?>
+			</td>
 		</tr>
 		<tr>
 			<td data-export-label="Language"><?php _e( 'Language', 'woocommerce' ); ?>:</td>
 			<td class="help"><?php echo wc_help_tip( __( 'The current language used by WordPress. Default = English', 'woocommerce' ) ); ?></td>
-			<td><?php echo get_locale() ?></td>
+			<td><?php echo esc_html( $environment['language'] ) ?></td>
 		</tr>
 	</tbody>
 </table>
 <table class="wc_status_table widefat" cellspacing="0">
 	<thead>
 		<tr>
-			<th colspan="3" data-export-label="Server Environment"><?php _e( 'Server Environment', 'woocommerce' ); ?></th>
+			<th colspan="3" data-export-label="Server Environment"><h2><?php _e( 'Server environment', 'woocommerce' ); ?></h2></th>
 		</tr>
 	</thead>
 	<tbody>
 		<tr>
-			<td data-export-label="Server Info"><?php _e( 'Server Info', 'woocommerce' ); ?>:</td>
+			<td data-export-label="Server Info"><?php _e( 'Server info', 'woocommerce' ); ?>:</td>
 			<td class="help"><?php echo wc_help_tip( __( 'Information about the web server that is currently hosting your site.', 'woocommerce' ) ); ?></td>
-			<td><?php echo esc_html( $_SERVER['SERVER_SOFTWARE'] ); ?></td>
+			<td><?php echo esc_html( $environment['server_info'] ); ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="PHP Version"><?php _e( 'PHP Version', 'woocommerce' ); ?>:</td>
+			<td data-export-label="PHP Version"><?php _e( 'PHP version', 'woocommerce' ); ?>:</td>
 			<td class="help"><?php echo wc_help_tip( __( 'The version of PHP installed on your hosting server.', 'woocommerce' ) ); ?></td>
 			<td><?php
-				// Check if phpversion function exists.
-				if ( function_exists( 'phpversion' ) ) {
-					$php_version = phpversion();
-
-					if ( version_compare( $php_version, '5.4', '<' ) ) {
-						echo '<mark class="error">' . sprintf( __( '%s - We recommend a minimum PHP version of 5.4. See: %s', 'woocommerce' ), esc_html( $php_version ), '<a href="http://docs.woothemes.com/document/how-to-update-your-php-version/" target="_blank">' . __( 'How to update your PHP version', 'woocommerce' ) . '</a>' ) . '</mark>';
-					} else {
-						echo '<mark class="yes">' . esc_html( $php_version ) . '</mark>';
-					}
+				if ( version_compare( $environment['php_version'], '5.6', '<' ) ) {
+					echo '<mark class="error"><span class="dashicons dashicons-warning"></span> ' . sprintf( __( '%1$s - We recommend a minimum PHP version of 5.6. See: %2$s', 'woocommerce' ), esc_html( $environment['php_version'] ), '<a href="https://docs.woocommerce.com/document/how-to-update-your-php-version/" target="_blank">' . __( 'How to update your PHP version', 'woocommerce' ) . '</a>' ) . '</mark>';
 				} else {
-					_e( "Couldn't determine PHP version because phpversion() doesn't exist.", 'woocommerce' );
+					echo '<mark class="yes">' . esc_html( $environment['php_version'] ) . '</mark>';
 				}
 				?></td>
 		</tr>
 		<?php if ( function_exists( 'ini_get' ) ) : ?>
 			<tr>
-				<td data-export-label="PHP Post Max Size"><?php _e( 'PHP Post Max Size', 'woocommerce' ); ?>:</td>
+				<td data-export-label="PHP Post Max Size"><?php _e( 'PHP post max size', 'woocommerce' ); ?>:</td>
 				<td class="help"><?php echo wc_help_tip( __( 'The largest filesize that can be contained in one post.', 'woocommerce' ) ); ?></td>
-				<td><?php echo size_format( wc_let_to_num( ini_get( 'post_max_size' ) ) ); ?></td>
+				<td><?php echo esc_html( size_format( $environment['php_post_max_size'] ) ) ?></td>
 			</tr>
 			<tr>
-				<td data-export-label="PHP Time Limit"><?php _e( 'PHP Time Limit', 'woocommerce' ); ?>:</td>
+				<td data-export-label="PHP Time Limit"><?php _e( 'PHP time limit', 'woocommerce' ); ?>:</td>
 				<td class="help"><?php echo wc_help_tip( __( 'The amount of time (in seconds) that your site will spend on a single operation before timing out (to avoid server lockups)', 'woocommerce' ) ); ?></td>
-				<td><?php echo ini_get( 'max_execution_time' ); ?></td>
+				<td><?php echo esc_html( $environment['php_max_execution_time'] ) ?></td>
 			</tr>
 			<tr>
-				<td data-export-label="PHP Max Input Vars"><?php _e( 'PHP Max Input Vars', 'woocommerce' ); ?>:</td>
+				<td data-export-label="PHP Max Input Vars"><?php _e( 'PHP max input vars', 'woocommerce' ); ?>:</td>
 				<td class="help"><?php echo wc_help_tip( __( 'The maximum number of variables your server can use for a single function to avoid overloads.', 'woocommerce' ) ); ?></td>
-				<td><?php echo ini_get( 'max_input_vars' ); ?></td>
+				<td><?php echo esc_html( $environment['php_max_input_vars'] ) ?></td>
 			</tr>
 			<tr>
-				<td data-export-label="SUHOSIN Installed"><?php _e( 'SUHOSIN Installed', 'woocommerce' ); ?>:</td>
+				<td data-export-label="cURL Version"><?php _e( 'cURL version', 'woocommerce' ); ?>:</td>
+				<td class="help"><?php echo wc_help_tip( __( 'The version of cURL installed on your server.', 'woocommerce' ) ); ?></td>
+				<td><?php echo esc_html( $environment['curl_version'] ) ?></td>
+			</tr>
+			<tr>
+				<td data-export-label="SUHOSIN Installed"><?php _e( 'SUHOSIN installed', 'woocommerce' ); ?>:</td>
 				<td class="help"><?php echo wc_help_tip( __( 'Suhosin is an advanced protection system for PHP installations. It was designed to protect your servers on the one hand against a number of well known problems in PHP applications and on the other hand against potential unknown vulnerabilities within these applications or the PHP core itself. If enabled on your server, Suhosin may need to be configured to increase its data submission limits.', 'woocommerce' ) ); ?></td>
-				<td><?php echo extension_loaded( 'suhosin' ) ? '&#10004;' : '&ndash;'; ?></td>
+				<td><?php echo $environment['suhosin_installed'] ? '<span class="dashicons dashicons-yes"></span>' : '&ndash;'; ?></td>
+			</tr>
+		<?php endif;
+		if ( $wpdb->use_mysqli ) {
+			$ver = mysqli_get_server_info( $wpdb->dbh );
+		} else {
+			$ver = mysql_get_server_info();
+		}
+		if ( ! empty( $wpdb->is_mysql ) && ! stristr( $ver, 'MariaDB' ) ) : ?>
+			<tr>
+				<td data-export-label="MySQL Version"><?php _e( 'MySQL version', 'woocommerce' ); ?>:</td>
+				<td class="help"><?php echo wc_help_tip( __( 'The version of MySQL installed on your hosting server.', 'woocommerce' ) ); ?></td>
+				<td>
+					<?php
+					if ( version_compare( $environment['mysql_version'], '5.6', '<' ) ) {
+						echo '<mark class="error"><span class="dashicons dashicons-warning"></span> ' . sprintf( __( '%1$s - We recommend a minimum MySQL version of 5.6. See: %2$s', 'woocommerce' ), esc_html( $environment['mysql_version'] ), '<a href="https://wordpress.org/about/requirements/" target="_blank">' . __( 'WordPress requirements', 'woocommerce' ) . '</a>' ) . '</mark>';
+					} else {
+						echo '<mark class="yes">' . esc_html( $environment['mysql_version'] ) . '</mark>';
+					}
+					?>
+				</td>
 			</tr>
 		<?php endif; ?>
 		<tr>
-			<td data-export-label="MySQL Version"><?php _e( 'MySQL Version', 'woocommerce' ); ?>:</td>
-			<td class="help"><?php echo wc_help_tip( __( 'The version of MySQL installed on your hosting server.', 'woocommerce' ) ); ?></td>
-			<td>
-				<?php
-				/** @global wpdb $wpdb */
-				global $wpdb;
-				echo $wpdb->db_version();
-				?>
+			<td data-export-label="Max Upload Size"><?php _e( 'Max upload size', 'woocommerce' ); ?>:</td>
+			<td class="help"><?php echo wc_help_tip( __( 'The largest filesize that can be uploaded to your WordPress installation.', 'woocommerce' ) ); ?></td>
+			<td><?php echo size_format( $environment['max_upload_size'] ) ?></td>
+		</tr>
+		<tr>
+			<td data-export-label="Default Timezone is UTC"><?php _e( 'Default timezone is UTC', 'woocommerce' ); ?>:</td>
+			<td class="help"><?php echo wc_help_tip( __( 'The default timezone for your server.', 'woocommerce' ) ); ?></td>
+			<td><?php
+				if ( 'UTC' !== $environment['default_timezone'] ) {
+					echo '<mark class="error"><span class="dashicons dashicons-warning"></span> ' . sprintf( __( 'Default timezone is %s - it should be UTC', 'woocommerce' ), $environment['default_timezone'] ) . '</mark>';
+				} else {
+					echo '<mark class="yes"><span class="dashicons dashicons-yes"></span></mark>';
+				} ?>
 			</td>
 		</tr>
 		<tr>
-			<td data-export-label="Max Upload Size"><?php _e( 'Max Upload Size', 'woocommerce' ); ?>:</td>
-			<td class="help"><?php echo wc_help_tip( __( 'The largest filesize that can be uploaded to your WordPress installation.', 'woocommerce' ) ); ?></td>
-			<td><?php echo size_format( wp_max_upload_size() ); ?></td>
+			<td data-export-label="fsockopen/cURL"><?php _e( 'fsockopen/cURL', 'woocommerce' ); ?>:</td>
+			<td class="help"><?php echo wc_help_tip( __( 'Payment gateways can use cURL to communicate with remote servers to authorize payments, other plugins may also use it when communicating with remote services.', 'woocommerce' ) ); ?></td>
+			<td><?php
+				if ( $environment['fsockopen_or_curl_enabled'] ) {
+					echo '<mark class="yes"><span class="dashicons dashicons-yes"></span></mark>';
+				} else {
+					echo '<mark class="error"><span class="dashicons dashicons-warning"></span> ' . __( 'Your server does not have fsockopen or cURL enabled - PayPal IPN and other scripts which communicate with other servers will not work. Contact your hosting provider.', 'woocommerce' ) . '</mark>';
+				} ?>
+			</td>
 		</tr>
 		<tr>
-			<td data-export-label="Default Timezone is UTC"><?php _e( 'Default Timezone is UTC', 'woocommerce' ); ?>:</td>
-			<td class="help"><?php echo wc_help_tip( __( 'The default timezone for your server.', 'woocommerce' ) ); ?></td>
+			<td data-export-label="SoapClient"><?php _e( 'SoapClient', 'woocommerce' ); ?>:</td>
+			<td class="help"><?php echo wc_help_tip( __( 'Some webservices like shipping use SOAP to get information from remote servers, for example, live shipping quotes from FedEx require SOAP to be installed.', 'woocommerce' ) ); ?></td>
 			<td><?php
-				$default_timezone = date_default_timezone_get();
-				if ( 'UTC' !== $default_timezone ) {
-					echo '<mark class="error">&#10005; ' . sprintf( __( 'Default timezone is %s - it should be UTC', 'woocommerce' ), $default_timezone ) . '</mark>';
+				if ( $environment['soapclient_enabled'] ) {
+					echo '<mark class="yes"><span class="dashicons dashicons-yes"></span></mark>';
 				} else {
-					echo '<mark class="yes">&#10004;</mark>';
+					echo '<mark class="error"><span class="dashicons dashicons-warning"></span> ' . sprintf( __( 'Your server does not have the %s class enabled - some gateway plugins which use SOAP may not work as expected.', 'woocommerce' ), '<a href="https://php.net/manual/en/class.soapclient.php">SoapClient</a>' ) . '</mark>';
+				} ?>
+			</td>
+		</tr>
+		<tr>
+			<td data-export-label="DOMDocument"><?php _e( 'DOMDocument', 'woocommerce' ); ?>:</td>
+			<td class="help"><?php echo wc_help_tip( __( 'HTML/Multipart emails use DOMDocument to generate inline CSS in templates.', 'woocommerce' ) ); ?></td>
+			<td><?php
+				if ( $environment['domdocument_enabled'] ) {
+					echo '<mark class="yes"><span class="dashicons dashicons-yes"></span></mark>';
+				} else {
+					echo '<mark class="error"><span class="dashicons dashicons-warning"></span> ' . sprintf( __( 'Your server does not have the %s class enabled - HTML/Multipart emails, and also some extensions, will not work without DOMDocument.', 'woocommerce' ), '<a href="https://php.net/manual/en/class.domdocument.php">DOMDocument</a>' ) . '</mark>';
+				} ?>
+			</td>
+		</tr>
+		<tr>
+			<td data-export-label="GZip"><?php _e( 'GZip', 'woocommerce' ); ?>:</td>
+			<td class="help"><?php echo wc_help_tip( __( 'GZip (gzopen) is used to open the GEOIP database from MaxMind.', 'woocommerce' ) ); ?></td>
+			<td><?php
+				if ( $environment['gzip_enabled'] ) {
+					echo '<mark class="yes"><span class="dashicons dashicons-yes"></span></mark>';
+				} else {
+					echo '<mark class="error"><span class="dashicons dashicons-warning"></span> ' . sprintf( __( 'Your server does not support the %s function - this is required to use the GeoIP database from MaxMind.', 'woocommerce' ), '<a href="https://php.net/manual/en/zlib.installation.php">gzopen</a>' ) . '</mark>';
+				} ?>
+			</td>
+		</tr>
+		<tr>
+			<td data-export-label="Multibyte String"><?php _e( 'Multibyte string', 'woocommerce' ); ?>:</td>
+			<td class="help"><?php echo wc_help_tip( __( 'Multibyte String (mbstring) is used to convert character encoding, like for emails or converting characters to lowercase.', 'woocommerce' ) ); ?></td>
+			<td><?php
+				if ( $environment['mbstring_enabled'] ) {
+					echo '<mark class="yes"><span class="dashicons dashicons-yes"></span></mark>';
+				} else {
+					echo '<mark class="error"><span class="dashicons dashicons-warning"></span> ' . sprintf( __( 'Your server does not support the %s functions - this is required for better character encoding. Some fallbacks will be used instead for it.', 'woocommerce' ), '<a href="https://php.net/manual/en/mbstring.installation.php">mbstring</a>' ) . '</mark>';
+				} ?>
+			</td>
+		</tr>
+		<tr>
+			<td data-export-label="Remote Post"><?php _e( 'Remote post', 'woocommerce' ); ?>:</td>
+			<td class="help"><?php echo wc_help_tip( __( 'PayPal uses this method of communicating when sending back transaction information.', 'woocommerce' ) ); ?></td>
+			<td><?php
+				if ( $environment['remote_post_successful'] ) {
+					echo '<mark class="yes"><span class="dashicons dashicons-yes"></span></mark>';
+				} else {
+					echo '<mark class="error"><span class="dashicons dashicons-warning"></span> ' . __( 'wp_remote_post() failed. Contact your hosting provider.', 'woocommerce' ) . ' ' . esc_html( $environment['remote_post_response'] ) . '</mark>';
+				} ?>
+			</td>
+		</tr>
+		<tr>
+			<td data-export-label="Remote Get"><?php _e( 'Remote get', 'woocommerce' ); ?>:</td>
+			<td class="help"><?php echo wc_help_tip( __( 'WooCommerce plugins may use this method of communication when checking for plugin updates.', 'woocommerce' ) ); ?></td>
+			<td><?php
+				if ( $environment['remote_get_successful'] ) {
+					echo '<mark class="yes"><span class="dashicons dashicons-yes"></span></mark>';
+				} else {
+					echo '<mark class="error"><span class="dashicons dashicons-warning"></span> ' . __( 'wp_remote_get() failed. Contact your hosting provider.', 'woocommerce' ) . ' ' . esc_html( $environment['remote_get_response'] ) . '</mark>';
 				} ?>
 			</td>
 		</tr>
 		<?php
-			$posting = array();
-
-			// fsockopen/cURL.
-			$posting['fsockopen_curl']['name'] = 'fsockopen/cURL';
-			$posting['fsockopen_curl']['help'] = wc_help_tip( __( 'Payment gateways can use cURL to communicate with remote servers to authorize payments, other plugins may also use it when communicating with remote services.', 'woocommerce' ) );
-
-			if ( function_exists( 'fsockopen' ) || function_exists( 'curl_init' ) ) {
-				$posting['fsockopen_curl']['success'] = true;
+		$rows = apply_filters( 'woocommerce_system_status_environment_rows', array() );
+		foreach ( $rows as $row ) {
+			if ( ! empty( $row['success'] ) ) {
+				$css_class = 'yes';
+				$icon = '<span class="dashicons dashicons-yes"></span>';
 			} else {
-				$posting['fsockopen_curl']['success'] = false;
-				$posting['fsockopen_curl']['note']    = __( 'Your server does not have fsockopen or cURL enabled - PayPal IPN and other scripts which communicate with other servers will not work. Contact your hosting provider.', 'woocommerce' );
+				$css_class = 'error';
+				$icon = '<span class="dashicons dashicons-no-alt"></span>';
 			}
-
-			// SOAP.
-			$posting['soap_client']['name'] = 'SoapClient';
-			$posting['soap_client']['help'] = wc_help_tip( __( 'Some webservices like shipping use SOAP to get information from remote servers, for example, live shipping quotes from FedEx require SOAP to be installed.', 'woocommerce' ) );
-
-			if ( class_exists( 'SoapClient' ) ) {
-				$posting['soap_client']['success'] = true;
-			} else {
-				$posting['soap_client']['success'] = false;
-				$posting['soap_client']['note']    = sprintf( __( 'Your server does not have the %s class enabled - some gateway plugins which use SOAP may not work as expected.', 'woocommerce' ), '<a href="http://php.net/manual/en/class.soapclient.php">SoapClient</a>' );
-			}
-
-			// DOMDocument.
-			$posting['dom_document']['name'] = 'DOMDocument';
-			$posting['dom_document']['help'] = wc_help_tip( __( 'HTML/Multipart emails use DOMDocument to generate inline CSS in templates.', 'woocommerce' ) );
-
-			if ( class_exists( 'DOMDocument' ) ) {
-				$posting['dom_document']['success'] = true;
-			} else {
-				$posting['dom_document']['success'] = false;
-				$posting['dom_document']['note']    = sprintf( __( 'Your server does not have the %s class enabled - HTML/Multipart emails, and also some extensions, will not work without DOMDocument.', 'woocommerce' ), '<a href="http://php.net/manual/en/class.domdocument.php">DOMDocument</a>' );
-			}
-
-			// GZIP.
-			$posting['gzip']['name'] = 'GZip';
-			$posting['gzip']['help'] = wc_help_tip( __( 'GZip (gzopen) is used to open the GEOIP database from MaxMind.', 'woocommerce' ) );
-
-			if ( is_callable( 'gzopen' ) ) {
-				$posting['gzip']['success'] = true;
-			} else {
-				$posting['gzip']['success'] = false;
-				$posting['gzip']['note']    = sprintf( __( 'Your server does not support the %s function - this is required to use the GeoIP database from MaxMind. The API fallback will be used instead for geolocation.', 'woocommerce' ), '<a href="http://php.net/manual/en/zlib.installation.php">gzopen</a>' );
-			}
-
-			// Multibyte String.
-			$posting['mbstring']['name'] = 'Multibyte String';
-			$posting['mbstring']['help'] = wc_help_tip( __( 'Multibyte String (mbstring) is used to convert character encoding, like for emails or converting characters to lowercase.', 'woocommerce' ) );
-
-			if ( extension_loaded( 'mbstring' ) ) {
-				$posting['mbstring']['success'] = true;
-			} else {
-				$posting['mbstring']['success'] = false;
-				$posting['mbstring']['note']    = sprintf( __( 'Your server does not support the %s functions - this is required for better character encoding. Some fallbacks will be used instead for it.', 'woocommerce' ), '<a href="http://php.net/manual/en/mbstring.installation.php">mbstring</a>' );
-			}
-
-			// WP Remote Post Check.
-			$posting['wp_remote_post']['name'] = __( 'Remote Post', 'woocommerce');
-			$posting['wp_remote_post']['help'] = wc_help_tip( __( 'PayPal uses this method of communicating when sending back transaction information.', 'woocommerce' ) );
-
-			$response = wp_safe_remote_post( 'https://www.paypal.com/cgi-bin/webscr', array(
-				'timeout'    => 60,
-				'user-agent' => 'WooCommerce/' . WC()->version,
-				'body'       => array(
-					'cmd'    => '_notify-validate'
-				)
-			) );
-
-			if ( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
-				$posting['wp_remote_post']['success'] = true;
-			} else {
-				$posting['wp_remote_post']['note']    = __( 'wp_remote_post() failed. PayPal IPN won\'t work with your server. Contact your hosting provider.', 'woocommerce' );
-				if ( is_wp_error( $response ) ) {
-					$posting['wp_remote_post']['note'] .= ' ' . sprintf( __( 'Error: %s', 'woocommerce' ), wc_clean( $response->get_error_message() ) );
+			?>
+			<tr>
+				<td data-export-label="<?php echo esc_attr( $row['name'] ); ?>"><?php echo esc_html( $row['name'] ); ?>:</td>
+				<td class="help"><?php echo isset( $row['help'] ) ? $row['help'] : ''; ?></td>
+				<td>
+					<mark class="<?php echo esc_attr( $css_class ); ?>">
+						<?php echo $icon; ?>  <?php echo ! empty( $row['note'] ) ? wp_kses_data( $row['note'] ) : ''; ?>
+					</mark>
+				</td>
+			</tr><?php
+		} ?>
+	</tbody>
+</table>
+<table class="wc_status_table widefat" cellspacing="0">
+	<thead>
+		<tr>
+			<th colspan="3" data-export-label="Database"><h2><?php _e( 'Database', 'woocommerce' ); ?></h2></th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<td data-export-label="WC Database Version"><?php _e( 'WC database version', 'woocommerce' ); ?>:</td>
+			<td class="help"><?php echo wc_help_tip( __( 'The version of WooCommerce that the database is formatted for. This should be the same as your WooCommerce version.', 'woocommerce' ) ); ?></td>
+			<td><?php echo esc_html( $database['wc_database_version'] ); ?></td>
+		</tr>
+		<tr>
+			<td data-export-label="WC Database Prefix"><?php _e( 'Database prefix', 'woocommerce' ); ?></td>
+			<td class="help">&nbsp;</td>
+			<td><?php
+				if ( strlen( $database['database_prefix'] ) > 20 ) {
+					echo '<mark class="error"><span class="dashicons dashicons-warning"></span> ' . sprintf( __( '%1$s - We recommend using a prefix with less than 20 characters. See: %2$s', 'woocommerce' ), esc_html( $database['database_prefix'] ), '<a href="https://docs.woocommerce.com/document/completed-order-email-doesnt-contain-download-links/#section-2" target="_blank">' . __( 'How to update your database table prefix', 'woocommerce' ) . '</a>' ) . '</mark>';
 				} else {
-					$posting['wp_remote_post']['note'] .= ' ' . sprintf( __( 'Status code: %s', 'woocommerce' ), wc_clean( $response['response']['code'] ) );
+					echo '<mark class="yes">' . esc_html( $database['database_prefix'] ) . '</mark>';
 				}
-				$posting['wp_remote_post']['success'] = false;
-			}
-
-			// WP Remote Get Check.
-			$posting['wp_remote_get']['name'] = __( 'Remote Get', 'woocommerce');
-			$posting['wp_remote_get']['help'] = wc_help_tip( __( 'WooCommerce plugins may use this method of communication when checking for plugin updates.', 'woocommerce' ) );
-
-			$response = wp_safe_remote_get( 'http://www.woothemes.com/wc-api/product-key-api?request=ping&network=' . ( is_multisite() ? '1' : '0' ) );
-
-			if ( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
-				$posting['wp_remote_get']['success'] = true;
-			} else {
-				$posting['wp_remote_get']['note']    = __( 'wp_remote_get() failed. The WooCommerce plugin updater won\'t work with your server. Contact your hosting provider.', 'woocommerce' );
-				if ( is_wp_error( $response ) ) {
-					$posting['wp_remote_get']['note'] .= ' ' . sprintf( __( 'Error: %s', 'woocommerce' ), wc_clean( $response->get_error_message() ) );
-				} else {
-					$posting['wp_remote_get']['note'] .= ' ' . sprintf( __( 'Status code: %s', 'woocommerce' ), wc_clean( $response['response']['code'] ) );
-				}
-				$posting['wp_remote_get']['success'] = false;
-			}
-
-			$posting = apply_filters( 'woocommerce_debug_posting', $posting );
-
-			foreach ( $posting as $post ) {
-				$mark = ! empty( $post['success'] ) ? 'yes' : 'error';
 				?>
-				<tr>
-					<td data-export-label="<?php echo esc_html( $post['name'] ); ?>"><?php echo esc_html( $post['name'] ); ?>:</td>
-					<td class="help"><?php echo isset( $post['help'] ) ? $post['help'] : ''; ?></td>
-					<td>
-						<mark class="<?php echo $mark; ?>">
-							<?php echo ! empty( $post['success'] ) ? '&#10004' : '&#10005'; ?> <?php echo ! empty( $post['note'] ) ? wp_kses_data( $post['note'] ) : ''; ?>
-						</mark>
-					</td>
-				</tr>
-				<?php
-			}
+			</td>
+		</tr>
+		<?php
+		foreach ( $database['database_tables'] as $table => $table_exists ) {
+			?>
+			<tr>
+				<td><?php echo esc_html( $table ); ?></td>
+				<td class="help">&nbsp;</td>
+				<td><?php echo ! $table_exists ? '<mark class="error"><span class="dashicons dashicons-warning"></span> ' . __( 'Table does not exist', 'woocommerce' ) . '</mark>' : '<mark class="yes"><span class="dashicons dashicons-yes"></span></mark>'; ?></td>
+			</tr>
+			<?php
+		}
+
+		if ( $settings['geolocation_enabled'] ) {
+			?>
+			<tr>
+				<td data-export-label="MaxMind GeoIP Database"><?php _e( 'MaxMind GeoIP database', 'woocommerce' ); ?>:</td>
+				<td class="help"><?php echo wc_help_tip( __( 'The GeoIP database from MaxMind is used to geolocate customers.', 'woocommerce' ) ); ?></td>
+				<td><?php
+					if ( file_exists( $database['maxmind_geoip_database'] ) ) {
+						echo '<mark class="yes"><span class="dashicons dashicons-yes"></span> <code class="private">' . esc_html( $database['maxmind_geoip_database'] ) . '</code></mark> ';
+					} else {
+						printf( '<mark class="error"><span class="dashicons dashicons-warning"></span> ' . sprintf( __( 'The MaxMind GeoIP Database does not exist - Geolocation will not function. You can download and install it manually from %1$s to the path: %2$s. Scroll down to "Downloads" and download the "Binary / gzip" file next to "GeoLite Country". Please remember to uncompress GeoIP.dat.gz and upload the GeoIP.dat file only.', 'woocommerce' ), make_clickable( 'http://dev.maxmind.com/geoip/legacy/geolite/' ), '<code class="private">' . $database['maxmind_geoip_database'] . '</code>' ) . '</mark>', WC_LOG_DIR );
+					}
+				?></td>
+			</tr>
+			<?php
+		}
 		?>
 	</tbody>
 </table>
 <table class="wc_status_table widefat" cellspacing="0">
 	<thead>
 		<tr>
-			<th colspan="3" data-export-label="Database"><?php _e( 'Database', 'woocommerce' ); ?></th>
+			<th colspan="3" data-export-label="Security"><h2><?php _e( 'Security', 'woocommerce' ); ?></h2></th>
 		</tr>
 	</thead>
 	<tbody>
 		<tr>
-			<td data-export-label="WC Database Version"><?php _e( 'WC Database Version', 'woocommerce' ); ?>:</td>
-			<td class="help"><?php echo wc_help_tip( __( 'The version of WooCommerce that the database is formatted for. This should be the same as your WooCommerce Version.', 'woocommerce' ) ); ?></td>
-			<td><?php echo esc_html( get_option( 'woocommerce_db_version' ) ); ?></td>
+			<td data-export-label="Secure connection (HTTPS)"><?php _e( 'Secure connection (HTTPS)', 'woocommerce' ); ?>:</td>
+			<td class="help"><?php echo wc_help_tip( __( 'Is the connection to your store secure?', 'woocommerce' ) ); ?></td>
+			<td>
+				<?php if ( $security['secure_connection'] ) : ?>
+					<mark class="yes"><span class="dashicons dashicons-yes"></span></mark>
+				<?php else : ?>
+					<mark class="error"><span class="dashicons dashicons-warning"></span><?php printf( __( 'Your store is not using HTTPS. <a href="%s" target="_blank">Learn more about HTTPS and SSL Certificates</a>.', 'woocommerce' ), 'https://docs.woocommerce.com/document/ssl-and-https/' ); ?></mark>
+				<?php endif; ?>
+			</td>
 		</tr>
 		<tr>
-			<?php
-			$tables = array(
-				'woocommerce_sessions',
-				'woocommerce_api_keys',
-				'woocommerce_attribute_taxonomies',
-				'woocommerce_termmeta',
-				'woocommerce_downloadable_product_permissions',
-				'woocommerce_order_items',
-				'woocommerce_order_itemmeta',
-				'woocommerce_tax_rates',
-				'woocommerce_tax_rate_locations'
-			);
-
-			foreach ( $tables as $table ) {
-				?>
-				<tr>
-					<td><?php echo esc_html( $table ); ?></td>
-					<td class="help">&nbsp;</td>
-					<td><?php echo $wpdb->get_var( $wpdb->prepare( "SHOW TABLES LIKE %s;", $wpdb->prefix . $table ) ) !== $wpdb->prefix . $table ? '<mark class="error">' . __( 'Table does not exist', 'woocommerce' ) . '</mark>' : '&#10004'; ?></td>
-				</tr>
-				<?php
-			}
-			?>
+			<td data-export-label="Hide errors from visitors"><?php _e( 'Hide errors from visitors', 'woocommerce' ); ?></td>
+			<td class="help"><?php echo wc_help_tip( __( 'Error messages can contain sensitive information about your store environment. These should be hidden from untrusted visitors.', 'woocommerce' ) ); ?></td>
+			<td>
+				<?php if ( $security['hide_errors'] ) : ?>
+					<mark class="yes"><span class="dashicons dashicons-yes"></span></mark>
+				<?php else : ?>
+					<mark class="error"><span class="dashicons dashicons-warning"></span><?php _e( 'Error messages should not be shown to visitors.', 'woocommerce' ); ?></mark>
+				<?php endif; ?>
+			</td>
 		</tr>
 	</tbody>
 </table>
 <table class="wc_status_table widefat" cellspacing="0">
 	<thead>
 		<tr>
-			<th colspan="3" data-export-label="Active Plugins (<?php echo count( (array) get_option( 'active_plugins' ) ); ?>)"><?php _e( 'Active Plugins', 'woocommerce' ); ?> (<?php echo count( (array) get_option( 'active_plugins' ) ); ?>)</th>
+			<th colspan="3" data-export-label="Active Plugins (<?php echo count( $active_plugins ) ?>)"><h2><?php _e( 'Active plugins', 'woocommerce' ); ?> (<?php echo count( $active_plugins ) ?>)</h2></th>
 		</tr>
 	</thead>
 	<tbody>
 		<?php
-		$active_plugins = (array) get_option( 'active_plugins', array() );
-
-		if ( is_multisite() ) {
-			$network_activated_plugins = array_keys( get_site_option( 'active_sitewide_plugins', array() ) );
-			$active_plugins            = array_merge( $active_plugins, $network_activated_plugins );
-		}
-
 		foreach ( $active_plugins as $plugin ) {
-
-			$plugin_data    = @get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin );
-			$dirname        = dirname( $plugin );
-			$version_string = '';
-			$network_string = '';
-
-			if ( ! empty( $plugin_data['Name'] ) ) {
+			if ( ! empty( $plugin['name'] ) ) {
+				$dirname = dirname( $plugin['plugin'] );
 
 				// Link the plugin name to the plugin url if available.
-				$plugin_name = esc_html( $plugin_data['Name'] );
-
-				if ( ! empty( $plugin_data['PluginURI'] ) ) {
-					$plugin_name = '<a href="' . esc_url( $plugin_data['PluginURI'] ) . '" title="' . esc_attr__( 'Visit plugin homepage' , 'woocommerce' ) . '" target="_blank">' . $plugin_name . '</a>';
+				$plugin_name = esc_html( $plugin['name'] );
+				if ( ! empty( $plugin['url'] ) ) {
+					$plugin_name = '<a href="' . esc_url( $plugin['url'] ) . '" aria-label="' . esc_attr__( 'Visit plugin homepage' , 'woocommerce' ) . '" target="_blank">' . $plugin_name . '</a>';
 				}
 
-				if ( strstr( $dirname, 'woocommerce-' ) && strstr( $plugin_data['PluginURI'], 'woothemes.com' ) ) {
-
-					if ( false === ( $version_data = get_transient( md5( $plugin ) . '_version_data' ) ) ) {
-						$changelog = wp_safe_remote_get( 'http://dzv365zjfbd8v.cloudfront.net/changelogs/' . $dirname . '/changelog.txt' );
-						$cl_lines  = explode( "\n", wp_remote_retrieve_body( $changelog ) );
-						if ( ! empty( $cl_lines ) ) {
-							foreach ( $cl_lines as $line_num => $cl_line ) {
-								if ( preg_match( '/^[0-9]/', $cl_line ) ) {
-
-									$date         = str_replace( '.' , '-' , trim( substr( $cl_line , 0 , strpos( $cl_line , '-' ) ) ) );
-									$version      = preg_replace( '~[^0-9,.]~' , '' ,stristr( $cl_line , "version" ) );
-									$update       = trim( str_replace( "*" , "" , $cl_lines[ $line_num + 1 ] ) );
-									$version_data = array( 'date' => $date , 'version' => $version , 'update' => $update , 'changelog' => $changelog );
-									set_transient( md5( $plugin ) . '_version_data', $version_data, DAY_IN_SECONDS );
-									break;
-								}
-							}
-						}
+				$version_string = '';
+				$network_string = '';
+				if ( strstr( $plugin['url'], 'woothemes.com' ) || strstr( $plugin['url'], 'woocommerce.com' ) ) {
+					if ( ! empty( $plugin['version_latest'] ) && version_compare( $plugin['version_latest'], $plugin['version'], '>' ) ) {
+						/* translators: %s: plugin latest version */
+						$version_string = ' &ndash; <strong style="color:red;">' . sprintf( esc_html__( '%s is available', 'woocommerce' ), $plugin['version_latest'] ) . '</strong>';
 					}
 
-					if ( ! empty( $version_data['version'] ) && version_compare( $version_data['version'], $plugin_data['Version'], '>' ) ) {
-						$version_string = ' &ndash; <strong style="color:red;">' . esc_html( sprintf( _x( '%s is available', 'Version info', 'woocommerce' ), $version_data['version'] ) ) . '</strong>';
-					}
-
-					if ( $plugin_data['Network'] != false ) {
+					if ( false != $plugin['network_activated'] ) {
 						$network_string = ' &ndash; <strong style="color:black;">' . __( 'Network enabled', 'woocommerce' ) . '</strong>';
 					}
 				}
-
 				?>
 				<tr>
 					<td><?php echo $plugin_name; ?></td>
 					<td class="help">&nbsp;</td>
-					<td><?php echo sprintf( _x( 'by %s', 'by author', 'woocommerce' ), $plugin_data['Author'] ) . ' &ndash; ' . esc_html( $plugin_data['Version'] ) . $version_string . $network_string; ?></td>
+					<td><?php
+						/* translators: %s: plugin author */
+						printf( __( 'by %s', 'woocommerce' ), $plugin['author_name'] );
+						echo ' &ndash; ' . esc_html( $plugin['version'] ) . $version_string . $network_string;
+					?></td>
 				</tr>
 				<?php
 			}
@@ -403,154 +434,63 @@ if ( ! defined( 'ABSPATH' ) ) {
 <table class="wc_status_table widefat" cellspacing="0">
 	<thead>
 		<tr>
-			<th colspan="3" data-export-label="Settings"><?php _e( 'Settings', 'woocommerce' ); ?></th>
+			<th colspan="3" data-export-label="Settings"><h2><?php _e( 'Settings', 'woocommerce' ); ?></h2></th>
 		</tr>
 	</thead>
 	<tbody>
+		<tr>
+			<td data-export-label="API Enabled"><?php _e( 'API enabled', 'woocommerce' ); ?>:</td>
+			<td class="help"><?php echo wc_help_tip( __( 'Does your site have REST API enabled?', 'woocommerce' ) ); ?></td>
+			<td><?php echo $settings['api_enabled'] ? '<mark class="yes"><span class="dashicons dashicons-yes"></span></mark>' : '<mark class="no">&ndash;</mark>'; ?></td>
+		</tr>
 		<tr>
 			<td data-export-label="Force SSL"><?php _e( 'Force SSL', 'woocommerce' ); ?>:</td>
 			<td class="help"><?php echo wc_help_tip( __( 'Does your site force a SSL Certificate for transactions?', 'woocommerce' ) ); ?></td>
-			<td><?php echo 'yes' === get_option( 'woocommerce_force_ssl_checkout' ) ? '<mark class="yes">&#10004;</mark>' : '<mark class="no">&ndash;</mark>'; ?></td>
+			<td><?php echo $settings['force_ssl'] ? '<mark class="yes"><span class="dashicons dashicons-yes"></span></mark>' : '<mark class="no">&ndash;</mark>'; ?></td>
 		</tr>
 		<tr>
 			<td data-export-label="Currency"><?php _e( 'Currency', 'woocommerce' ) ?></td>
 			<td class="help"><?php echo wc_help_tip( __( 'What currency prices are listed at in the catalog and which currency gateways will take payments in.', 'woocommerce' ) ); ?></td>
-			<td><?php echo get_woocommerce_currency(); ?> (<?php echo get_woocommerce_currency_symbol() ?>)</td>
+			<td><?php echo esc_html( $settings['currency'] ) ?> (<?php echo esc_html( $settings['currency_symbol'] ) ?>)</td>
 		</tr>
 		<tr>
-			<td data-export-label="Currency Position"><?php _e( 'Currency Position', 'woocommerce' ) ?></td>
+			<td data-export-label="Currency Position"><?php _e( 'Currency position', 'woocommerce' ) ?></td>
 			<td class="help"><?php echo wc_help_tip( __( 'The position of the currency symbol.', 'woocommerce' ) ); ?></td>
-			<td><?php echo get_option( 'woocommerce_currency_pos' ); ?></td>
+			<td><?php echo esc_html( $settings['currency_position'] ) ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="Thousand Separator"><?php _e( 'Thousand Separator', 'woocommerce' ) ?></td>
+			<td data-export-label="Thousand Separator"><?php _e( 'Thousand separator', 'woocommerce' ) ?></td>
 			<td class="help"><?php echo wc_help_tip( __( 'The thousand separator of displayed prices.', 'woocommerce' ) ); ?></td>
-			<td><?php echo wc_get_price_thousand_separator(); ?></td>
+			<td><?php echo esc_html( $settings['thousand_separator'] ) ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="Decimal Separator"><?php _e( 'Decimal Separator', 'woocommerce' ) ?></td>
+			<td data-export-label="Decimal Separator"><?php _e( 'Decimal separator', 'woocommerce' ) ?></td>
 			<td class="help"><?php echo wc_help_tip( __( 'The decimal separator of displayed prices.', 'woocommerce' ) ); ?></td>
-			<td><?php echo wc_get_price_decimal_separator(); ?></td>
+			<td><?php echo esc_html( $settings['decimal_separator'] ) ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="Number of Decimals"><?php _e( 'Number of Decimals', 'woocommerce' ) ?></td>
+			<td data-export-label="Number of Decimals"><?php _e( 'Number of decimals', 'woocommerce' ) ?></td>
 			<td class="help"><?php echo wc_help_tip( __( 'The number of decimal points shown in displayed prices.', 'woocommerce' ) ); ?></td>
-			<td><?php echo wc_get_price_decimals(); ?></td>
-		</tr>
-	</tbody>
-</table>
-<table class="wc_status_table widefat" cellspacing="0">
-	<thead>
-		<tr>
-			<th colspan="3" data-export-label="API"><?php _e( 'API', 'woocommerce' ); ?></th>
-		</tr>
-	</thead>
-	<tbody>
-		<tr>
-			<td data-export-label="API Enabled"><?php _e( 'API Enabled', 'woocommerce' ); ?>:</td>
-			<td class="help"><?php echo wc_help_tip( __( 'Does your site have REST API enabled?', 'woocommerce' ) ); ?></td>
-			<td><?php echo 'yes' === get_option( 'woocommerce_api_enabled' ) ? '<mark class="yes">&#10004;</mark>' : '<mark class="no">&ndash;</mark>'; ?></td>
+			<td><?php echo esc_html( $settings['number_of_decimals'] ) ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="API Version"><?php _e( 'API Version', 'woocommerce' ); ?>:</td>
-			<td class="help"><?php echo wc_help_tip( __( 'What version of the REST API does your site use?', 'woocommerce' ) ); ?></td>
-			<td><?php echo esc_html( WC_API::VERSION ); ?></td>
-		</tr>
-	</tbody>
-</table>
-<table class="wc_status_table widefat" cellspacing="0">
-	<thead>
-		<tr>
-			<th colspan="3" data-export-label="WC Pages"><?php _e( 'WC Pages', 'woocommerce' ); ?></th>
-		</tr>
-	</thead>
-	<tbody>
-		<?php
-			$check_pages = array(
-				_x( 'Shop Base', 'Page setting', 'woocommerce' ) => array(
-						'option'    => 'woocommerce_shop_page_id',
-						'shortcode' => '',
-						'help'      => __( 'The URL of your WooCommerce shop\'s homepage (along with the Page ID).', 'woocommerce' ),
-					),
-				_x( 'Cart', 'Page setting', 'woocommerce' ) => array(
-						'option'    => 'woocommerce_cart_page_id',
-						'shortcode' => '[' . apply_filters( 'woocommerce_cart_shortcode_tag', 'woocommerce_cart' ) . ']',
-						'help'      => __( 'The URL of your WooCommerce shop\'s cart (along with the page ID).', 'woocommerce' ),
-					),
-				_x( 'Checkout', 'Page setting', 'woocommerce' ) => array(
-						'option'    => 'woocommerce_checkout_page_id',
-						'shortcode' => '[' . apply_filters( 'woocommerce_checkout_shortcode_tag', 'woocommerce_checkout' ) . ']',
-						'help'      => __( 'The URL of your WooCommerce shop\'s checkout (along with the page ID).', 'woocommerce' ),
-					),
-				_x( 'My Account', 'Page setting', 'woocommerce' ) => array(
-						'option'    => 'woocommerce_myaccount_page_id',
-						'shortcode' => '[' . apply_filters( 'woocommerce_my_account_shortcode_tag', 'woocommerce_my_account' ) . ']',
-						'help'      => __( 'The URL of your WooCommerce shop\'s “My Account” Page (along with the page ID).', 'woocommerce' ),
-					)
-			);
-
-			$alt = 1;
-
-			foreach ( $check_pages as $page_name => $values ) {
-				$error   = false;
-				$page_id = get_option( $values['option'] );
-
-				if ( $page_id ) {
-					$page_name = '<a href="' . get_edit_post_link( $page_id ) . '" title="' . sprintf( _x( 'Edit %s page', 'WC Pages links in the System Status', 'woocommerce' ), esc_html( $page_name ) ) . '">' . esc_html( $page_name ) . '</a>';
-				} else {
-					$page_name = esc_html( $page_name );
-				}
-
-				echo '<tr><td data-export-label="' . esc_attr( $page_name ) . '">' . $page_name . ':</td>';
-				echo '<td class="help">' . wc_help_tip( $values['help']  ) . '</td><td>';
-
-				// Page ID check.
-				if ( ! $page_id ) {
-					echo '<mark class="error">' . __( 'Page not set', 'woocommerce' ) . '</mark>';
-					$error = true;
-				} else {
-
-					// Shortcode check
-					if ( $values['shortcode'] ) {
-						$page = get_post( $page_id );
-
-						if ( empty( $page ) ) {
-
-							echo '<mark class="error">' . sprintf( __( 'Page does not exist', 'woocommerce' ) ) . '</mark>';
-							$error = true;
-
-						} else if ( ! strstr( $page->post_content, $values['shortcode'] ) ) {
-
-							echo '<mark class="error">' . sprintf( __( 'Page does not contain the shortcode: %s', 'woocommerce' ), $values['shortcode'] ) . '</mark>';
-							$error = true;
-
-						}
-					}
-
-				}
-
-				if ( ! $error ) echo '<mark class="yes">#' . absint( $page_id ) . ' - ' . str_replace( home_url(), '', get_permalink( $page_id ) ) . '</mark>';
-
-				echo '</td></tr>';
-			}
-		?>
-	</tbody>
-</table>
-<table class="wc_status_table widefat" cellspacing="0">
-	<thead>
-		<tr>
-			<th colspan="3" data-export-label="Taxonomies"><?php _e( 'Taxonomies', 'woocommerce' ); ?><?php echo wc_help_tip( __( 'A list of taxonomy terms that can be used in regard to order/product statuses.', 'woocommerce' ) ); ?></th>
-		</tr>
-	</thead>
-	<tbody>
-		<tr>
-			<td data-export-label="Product Types"><?php _e( 'Product Types', 'woocommerce' ); ?>:</td>
-			<td class="help">&nbsp;</td>
+			<td data-export-label="Taxonomies: Product Types"><?php _e( 'Taxonomies: Product types', 'woocommerce' ); ?></th>
+			<td class="help"><?php echo wc_help_tip( __( 'A list of taxonomy terms that can be used in regard to order/product statuses.', 'woocommerce' ) ); ?></td>
 			<td><?php
 				$display_terms = array();
-				$terms = get_terms( 'product_type', array( 'hide_empty' => 0 ) );
-				foreach ( $terms as $term ) {
-					$display_terms[] = strtolower( $term->name ) . ' (' . $term->slug . ')';
+				foreach ( $settings['taxonomies'] as $slug => $name ) {
+					$display_terms[] = strtolower( $name ) . ' (' . $slug . ')';
+				}
+				echo implode( ', ', array_map( 'esc_html', $display_terms ) );
+			?></td>
+		</tr>
+		<tr>
+			<td data-export-label="Taxonomies: Product Visibility"><?php _e( 'Taxonomies: Product visibility', 'woocommerce' ); ?></th>
+			<td class="help"><?php echo wc_help_tip( __( 'A list of taxonomy terms used for product visibility.', 'woocommerce' ) ); ?></td>
+			<td><?php
+				$display_terms = array();
+				foreach ( $settings['product_visibility_terms'] as $slug => $name ) {
+					$display_terms[] = strtolower( $name ) . ' (' . $slug . ')';
 				}
 				echo implode( ', ', array_map( 'esc_html', $display_terms ) );
 			?></td>
@@ -560,142 +500,170 @@ if ( ! defined( 'ABSPATH' ) ) {
 <table class="wc_status_table widefat" cellspacing="0">
 	<thead>
 		<tr>
-			<th colspan="3" data-export-label="Theme"><?php _e( 'Theme', 'woocommerce' ); ?></th>
+			<th colspan="3" data-export-label="WC Pages"><h2><?php _e( 'WC pages', 'woocommerce' ); ?></h2></th>
 		</tr>
 	</thead>
+	<tbody>
 		<?php
-		include_once( ABSPATH . 'wp-admin/includes/theme-install.php' );
+			$alt = 1;
+			foreach ( $pages as $page ) {
+				$error   = false;
 
-		$active_theme         = wp_get_theme();
-		$theme_version        = $active_theme->Version;
-		$update_theme_version = WC_Admin_Status::get_latest_theme_version( $active_theme );
+				if ( $page['page_id'] ) {
+					$page_name = '<a href="' . get_edit_post_link( $page['page_id'] ) . '" aria-label="' . sprintf( __( 'Edit %s page', 'woocommerce' ), esc_html( $page['page_name'] ) ) . '">' . esc_html( $page['page_name'] ) . '</a>';
+				} else {
+					$page_name = esc_html( $page['page_name'] );
+				}
+
+				echo '<tr><td data-export-label="' . esc_attr( $page_name ) . '">' . $page_name . ':</td>';
+				echo '<td class="help">' . wc_help_tip( sprintf( __( 'The URL of your %s page (along with the Page ID).', 'woocommerce' ), $page_name ) ) . '</td><td>';
+
+				// Page ID check.
+				if ( ! $page['page_set'] ) {
+					echo '<mark class="error"><span class="dashicons dashicons-warning"></span> ' . __( 'Page not set', 'woocommerce' ) . '</mark>';
+					$error = true;
+				} elseif ( ! $page['page_exists'] ) {
+					echo '<mark class="error"><span class="dashicons dashicons-warning"></span> ' . __( 'Page ID is set, but the page does not exist', 'woocommerce' ) . '</mark>';
+					$error = true;
+				} elseif ( ! $page['page_visible'] ) {
+					echo '<mark class="error"><span class="dashicons dashicons-warning"></span> ' . sprintf( __( 'Page visibility should be <a href="%s" target="_blank">public</a>', 'woocommerce' ), 'https://codex.wordpress.org/Content_Visibility' ) . '</mark>';
+					$error = true;
+				} else {
+					// Shortcode check
+					if ( $page['shortcode_required'] ) {
+						if ( ! $page['shortcode_present'] ) {
+							echo '<mark class="error"><span class="dashicons dashicons-warning"></span> ' . sprintf( __( 'Page does not contain the shortcode.', 'woocommerce' ), $page['shortcode'] ) . '</mark>';
+							$error = true;
+						}
+					}
+				}
+
+				if ( ! $error ) {
+					echo '<mark class="yes">#' . absint( $page['page_id'] ) . ' - ' . str_replace( home_url(), '', get_permalink( $page['page_id'] ) ) . '</mark>';
+				}
+
+				echo '</td></tr>';
+			}
 		?>
+	</tbody>
+</table>
+<table class="wc_status_table widefat" cellspacing="0">
+	<thead>
+		<tr>
+			<th colspan="3" data-export-label="Theme"><h2><?php _e( 'Theme', 'woocommerce' ); ?></h2></th>
+		</tr>
+	</thead>
 	<tbody>
 		<tr>
 			<td data-export-label="Name"><?php _e( 'Name', 'woocommerce' ); ?>:</td>
 			<td class="help"><?php echo wc_help_tip( __( 'The name of the current active theme.', 'woocommerce' ) ); ?></td>
-			<td><?php echo esc_html( $active_theme->Name ); ?></td>
+			<td><?php echo esc_html( $theme['name'] ) ?></td>
 		</tr>
 		<tr>
 			<td data-export-label="Version"><?php _e( 'Version', 'woocommerce' ); ?>:</td>
 			<td class="help"><?php echo wc_help_tip( __( 'The installed version of the current active theme.', 'woocommerce' ) ); ?></td>
 			<td><?php
-				echo esc_html( $theme_version );
-
-				if ( version_compare( $theme_version, $update_theme_version, '<' ) ) {
-					echo ' &ndash; <strong style="color:red;">' . sprintf( __( '%s is available', 'woocommerce' ), esc_html( $update_theme_version ) ) . '</strong>';
+				echo esc_html( $theme['version'] );
+				if ( version_compare( $theme['version'], $theme['version_latest'], '<' ) ) {
+					/* translators: %s: theme latest version */
+					echo ' &ndash; <strong style="color:red;">' . sprintf( __( '%s is available', 'woocommerce' ), esc_html( $theme['version_latest'] ) ) . '</strong>';
 				}
 			?></td>
 		</tr>
 		<tr>
 			<td data-export-label="Author URL"><?php _e( 'Author URL', 'woocommerce' ); ?>:</td>
 			<td class="help"><?php echo wc_help_tip( __( 'The theme developers URL.', 'woocommerce' ) ); ?></td>
-			<td><?php echo $active_theme->{'Author URI'}; ?></td>
+			<td><?php echo esc_html( $theme['author_url'] ) ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="Child Theme"><?php _e( 'Child Theme', 'woocommerce' ); ?>:</td>
+			<td data-export-label="Child Theme"><?php _e( 'Child theme', 'woocommerce' ); ?>:</td>
 			<td class="help"><?php echo wc_help_tip( __( 'Displays whether or not the current theme is a child theme.', 'woocommerce' ) ); ?></td>
 			<td><?php
-				echo is_child_theme() ? '<mark class="yes">&#10004;</mark>' : '&#10005; &ndash; ' . sprintf( __( 'If you\'re modifying WooCommerce on a parent theme you didn\'t build personally, then we recommend using a child theme. See: <a href="%s" target="_blank">How to create a child theme</a>', 'woocommerce' ), 'http://codex.wordpress.org/Child_Themes' );
+				echo $theme['is_child_theme'] ? '<mark class="yes"><span class="dashicons dashicons-yes"></span></mark>' : '<span class="dashicons dashicons-no-alt"></span> &ndash; ' . sprintf( __( 'If you are modifying WooCommerce on a parent theme that you did not build personally we recommend using a child theme. See: <a href="%s" target="_blank">How to create a child theme</a>', 'woocommerce' ), 'https://codex.wordpress.org/Child_Themes' );
 			?></td>
 		</tr>
 		<?php
-		if( is_child_theme() ) :
-			$parent_theme         = wp_get_theme( $active_theme->Template );
-			$update_theme_version = WC_Admin_Status::get_latest_theme_version( $parent_theme );
+		if ( $theme['is_child_theme'] ) :
 		?>
 		<tr>
-			<td data-export-label="Parent Theme Name"><?php _e( 'Parent Theme Name', 'woocommerce' ); ?>:</td>
+			<td data-export-label="Parent Theme Name"><?php _e( 'Parent theme name', 'woocommerce' ); ?>:</td>
 			<td class="help"><?php echo wc_help_tip( __( 'The name of the parent theme.', 'woocommerce' ) ); ?></td>
-			<td><?php echo esc_html( $parent_theme->Name ); ?></td>
+			<td><?php echo esc_html( $theme['parent_name'] ); ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="Parent Theme Version"><?php _e( 'Parent Theme Version', 'woocommerce' ); ?>:</td>
+			<td data-export-label="Parent Theme Version"><?php _e( 'Parent theme version', 'woocommerce' ); ?>:</td>
 			<td class="help"><?php echo wc_help_tip( __( 'The installed version of the parent theme.', 'woocommerce' ) ); ?></td>
 			<td><?php
-				echo esc_html( $parent_theme->Version );
-
-				if ( version_compare( $parent_theme->Version, $update_theme_version, '<' ) ) {
-					echo ' &ndash; <strong style="color:red;">' . sprintf( __( '%s is available', 'woocommerce' ), esc_html( $update_theme_version ) ) . '</strong>';
+				echo esc_html( $theme['parent_version'] );
+				if ( version_compare( $theme['parent_version'], $theme['parent_version_latest'], '<' ) ) {
+					/* translators: %s: parant theme latest version */
+					echo ' &ndash; <strong style="color:red;">' . sprintf( __( '%s is available', 'woocommerce' ), esc_html( $theme['parent_version_latest'] ) ) . '</strong>';
 				}
 			?></td>
 		</tr>
 		<tr>
-			<td data-export-label="Parent Theme Author URL"><?php _e( 'Parent Theme Author URL', 'woocommerce' ); ?>:</td>
+			<td data-export-label="Parent Theme Author URL"><?php _e( 'Parent theme author URL', 'woocommerce' ); ?>:</td>
 			<td class="help"><?php echo wc_help_tip( __( 'The parent theme developers URL.', 'woocommerce' ) ); ?></td>
-			<td><?php echo $parent_theme->{'Author URI'}; ?></td>
+			<td><?php echo esc_html( $theme['parent_author_url'] ) ?></td>
 		</tr>
 		<?php endif ?>
 		<tr>
-			<td data-export-label="WooCommerce Support"><?php _e( 'WooCommerce Support', 'woocommerce' ); ?>:</td>
+			<td data-export-label="WooCommerce Support"><?php _e( 'WooCommerce support', 'woocommerce' ); ?>:</td>
 			<td class="help"><?php echo wc_help_tip( __( 'Displays whether or not the current active theme declares WooCommerce support.', 'woocommerce' ) ); ?></td>
-			<td><?php
-				if ( ! current_theme_supports( 'woocommerce' ) && ! in_array( $active_theme->template, wc_get_core_supported_themes() ) ) {
-					echo '<mark class="error">' . __( 'Not Declared', 'woocommerce' ) . '</mark>';
+			<td>
+				<?php if ( ! $theme['has_woocommerce_support'] ) {
+					echo '<mark class="error"><span class="dashicons dashicons-warning"></span> ' . __( 'Not declared', 'woocommerce' ) . '</mark>';
 				} else {
-					echo '<mark class="yes">&#10004;</mark>';
-				}
-			?></td>
+					echo '<mark class="yes"><span class="dashicons dashicons-yes"></span></mark>';
+				} ?>
+			</td>
 		</tr>
 	</tbody>
 </table>
 <table class="wc_status_table widefat" cellspacing="0">
 	<thead>
 		<tr>
-			<th colspan="3" data-export-label="Templates"><?php _e( 'Templates', 'woocommerce' ); ?><?php echo wc_help_tip( __( 'This section shows any files that are overriding the default WooCommerce template pages.', 'woocommerce' ) ); ?></th>
+			<th colspan="3" data-export-label="Templates"><h2><?php _e( 'Templates', 'woocommerce' ); ?><?php echo wc_help_tip( __( 'This section shows any files that are overriding the default WooCommerce template pages.', 'woocommerce' ) ); ?></h2></th>
 		</tr>
 	</thead>
 	<tbody>
+		<?php if ( $theme['has_woocommerce_file'] ) : ?>
+		<tr>
+			<td data-export-label="Archive Template"><?php _e( 'Archive template', 'woocommerce' ); ?>:</td>
+			<td class="help">&nbsp;</td>
+			<td><?php _e( 'Your theme has a woocommerce.php file, you will not be able to override the woocommerce/archive-product.php custom template since woocommerce.php has priority over archive-product.php. This is intended to prevent display issues.', 'woocommerce' ); ?></td>
+		</tr>
+		<?php endif ?>
 		<?php
-
-			$template_paths     = apply_filters( 'woocommerce_template_overrides_scan_paths', array( 'WooCommerce' => WC()->plugin_path() . '/templates/' ) );
-			$scanned_files      = array();
-			$found_files        = array();
-			$outdated_templates = false;
-
-			foreach ( $template_paths as $plugin_name => $template_path ) {
-
-				$scanned_files = WC_Admin_Status::scan_template_files( $template_path );
-
-				foreach ( $scanned_files as $file ) {
-					if ( file_exists( get_stylesheet_directory() . '/' . $file ) ) {
-						$theme_file = get_stylesheet_directory() . '/' . $file;
-					} elseif ( file_exists( get_stylesheet_directory() . '/woocommerce/' . $file ) ) {
-						$theme_file = get_stylesheet_directory() . '/woocommerce/' . $file;
-					} elseif ( file_exists( get_template_directory() . '/' . $file ) ) {
-						$theme_file = get_template_directory() . '/' . $file;
-					} elseif( file_exists( get_template_directory() . '/woocommerce/' . $file ) ) {
-						$theme_file = get_template_directory() . '/woocommerce/' . $file;
-					} else {
-						$theme_file = false;
-					}
-
-					if ( ! empty( $theme_file ) ) {
-						$core_version  = WC_Admin_Status::get_file_version( $template_path . $file );
-						$theme_version = WC_Admin_Status::get_file_version( $theme_file );
-
-						if ( $core_version && ( empty( $theme_version ) || version_compare( $theme_version, $core_version, '<' ) ) ) {
-							if ( ! $outdated_templates ) {
-								$outdated_templates = true;
-							}
-							$found_files[ $plugin_name ][] = sprintf( __( '<code>%s</code> version <strong style="color:red">%s</strong> is out of date. The core version is %s', 'woocommerce' ), str_replace( WP_CONTENT_DIR . '/themes/', '', $theme_file ), $theme_version ? $theme_version : '-', $core_version );
-						} else {
-							$found_files[ $plugin_name ][] = sprintf( '<code>%s</code>', str_replace( WP_CONTENT_DIR . '/themes/', '', $theme_file ) );
-						}
-					}
-				}
-			}
-
-			if ( $found_files ) {
-				foreach ( $found_files as $plugin_name => $found_plugin_files ) {
-					?>
+			if ( ! empty( $theme['overrides'] ) ) { ?>
 					<tr>
-						<td data-export-label="Overrides"><?php _e( 'Overrides', 'woocommerce' ); ?> (<?php echo $plugin_name; ?>):</td>
+						<td data-export-label="Overrides"><?php _e( 'Overrides', 'woocommerce' ); ?></td>
 						<td class="help">&nbsp;</td>
-						<td><?php echo implode( ', <br/>', $found_plugin_files ); ?></td>
+						<td>
+							<?php
+							$total_overrides = count( $theme['overrides'] );
+							for ( $i = 0; $i < $total_overrides; $i++ ) {
+								$override = $theme['overrides'][ $i ];
+								if ( $override['core_version'] && ( empty( $override['version'] ) || version_compare( $override['version'], $override['core_version'], '<' ) ) ) {
+									$current_version = $override['version'] ? $override['version'] : '-';
+									printf(
+										__( '%1$s version %2$s is out of date. The core version is %3$s', 'woocommerce' ),
+										'<code>' . $override['file'] . '</code>',
+										'<strong style="color:red">' . $current_version . '</strong>',
+										$override['core_version']
+									);
+								} else {
+									echo esc_html( $override['file'] );
+								}
+								if ( ( count( $theme['overrides'] ) - 1 ) !== $i ) {
+									echo ', ';
+								}
+								echo '<br />';
+							}
+							?>
+						</td>
 					</tr>
 					<?php
-				}
 			} else {
 				?>
 				<tr>
@@ -706,12 +674,12 @@ if ( ! defined( 'ABSPATH' ) ) {
 				<?php
 			}
 
-			if ( true === $outdated_templates ) {
+			if ( true === $theme['has_outdated_templates'] ) {
 				?>
 				<tr>
-					<td>&nbsp;</td>
+					<td data-export-label="Outdated Templates"><?php _e( 'Outdated templates', 'woocommerce' ); ?>:</td>
 					<td class="help">&nbsp;</td>
-					<td><a href="http://docs.woothemes.com/document/fix-outdated-templates-woocommerce/" target="_blank"><?php _e( 'Learn how to update outdated templates', 'woocommerce' ) ?></a></td>
+					<td><mark class="error"><span class="dashicons dashicons-warning"></span></mark><a href="https://docs.woocommerce.com/document/fix-outdated-templates-woocommerce/" target="_blank"><?php _e( 'Learn how to update', 'woocommerce' ) ?></a></td>
 				</tr>
 				<?php
 			}
@@ -720,81 +688,3 @@ if ( ! defined( 'ABSPATH' ) ) {
 </table>
 
 <?php do_action( 'woocommerce_system_status_report' ); ?>
-
-<script type="text/javascript">
-
-	jQuery( 'a.help_tip, a.woocommerce-help-tip' ).click( function() {
-		return false;
-	});
-
-	jQuery( 'a.debug-report' ).click( function() {
-
-		var report = '';
-
-		jQuery( '.wc_status_table thead, .wc_status_table tbody' ).each( function() {
-
-			if ( jQuery( this ).is('thead') ) {
-
-				var label = jQuery( this ).find( 'th:eq(0)' ).data( 'export-label' ) || jQuery( this ).text();
-				report = report + '\n### ' + jQuery.trim( label ) + ' ###\n\n';
-
-			} else {
-
-				jQuery( 'tr', jQuery( this ) ).each( function() {
-
-					var label       = jQuery( this ).find( 'td:eq(0)' ).data( 'export-label' ) || jQuery( this ).find( 'td:eq(0)' ).text();
-					var the_name    = jQuery.trim( label ).replace( /(<([^>]+)>)/ig, '' ); // Remove HTML.
-					var image       = jQuery( this ).find( 'td:eq(2)' ).find( 'img' ); // Get WP 4.2 emojis.
-					var prefix      = ( undefined === image.attr( 'alt' ) ) ? '' : image.attr( 'alt' ) + ' '; // Remove WP 4.2 emojis.
-					var the_value   = jQuery.trim( prefix + jQuery( this ).find( 'td:eq(2)' ).text() );
-					var value_array = the_value.split( ', ' );
-
-					if ( value_array.length > 1 ) {
-
-						// If value have a list of plugins ','.
-						// Split to add new line.
-						var temp_line ='';
-						jQuery.each( value_array, function( key, line ) {
-							temp_line = temp_line + line + '\n';
-						});
-
-						the_value = temp_line;
-					}
-
-					report = report + '' + the_name + ': ' + the_value + '\n';
-				});
-
-			}
-		});
-
-		try {
-			jQuery( '#debug-report' ).slideDown();
-			jQuery( '#debug-report' ).find( 'textarea' ).val( report ).focus().select();
-			jQuery( this ).fadeOut();
-			return false;
-		} catch ( e ) {
-			/*jshint devel: true */
-			console.log( e );
-		}
-
-		return false;
-	});
-
-	jQuery( document ).ready( function( $ ) {
-		$( '#copy-for-support' ).tipTip({
-			'attribute':  'data-tip',
-			'activation': 'click',
-			'fadeIn':     50,
-			'fadeOut':    50,
-			'delay':      0
-		});
-
-		$( document.body ).on( 'copy', '#copy-for-support', function( e ) {
-			e.clipboardData.clearData();
-			e.clipboardData.setData( 'text/plain', $( '#debug-report' ).find( 'textarea' ).val() );
-			e.preventDefault();
-		});
-
-	});
-
-</script>
diff --git a/includes/admin/views/html-admin-page-status-tools.php b/includes/admin/views/html-admin-page-status-tools.php
index fda8b50da58..9c58c3dd957 100644
--- a/includes/admin/views/html-admin-page-status-tools.php
+++ b/includes/admin/views/html-admin-page-status-tools.php
@@ -8,64 +8,24 @@ if ( ! defined( 'ABSPATH' ) ) {
 }
 
 ?>
-
 <form method="post" action="options.php">
 	<?php settings_fields( 'woocommerce_status_settings_fields' ); ?>
-	<?php $options = wp_parse_args( get_option( 'woocommerce_status_options', array() ), array( 'uninstall_data' => 0, 'template_debug_mode' => 0, 'shipping_debug_mode' => 0 ) ); ?>
 	<table class="wc_status_table widefat" cellspacing="0">
-		<thead class="tools">
-			<tr>
-				<th colspan="2"><?php _e( 'Tools', 'woocommerce' ); ?></th>
-			</tr>
-		</thead>
 		<tbody class="tools">
 			<?php foreach ( $tools as $action => $tool ) : ?>
 				<tr class="<?php echo sanitize_html_class( $action ); ?>">
 					<td><?php echo esc_html( $tool['name'] ); ?></td>
 					<td>
 						<p>
-							<a href="<?php echo wp_nonce_url( admin_url('admin.php?page=wc-status&tab=tools&action=' . $action ), 'debug_action' ); ?>" class="button <?php echo esc_attr( $action ); ?>"><?php echo esc_html( $tool['button'] ); ?></a>
+							<a href="<?php echo wp_nonce_url( admin_url( 'admin.php?page=wc-status&tab=tools&action=' . $action ), 'debug_action' ); ?>" class="button <?php echo esc_attr( $action ); ?>"><?php echo esc_html( $tool['button'] ); ?></a>
 							<span class="description"><?php echo wp_kses_post( $tool['desc'] ); ?></span>
 						</p>
 					</td>
 				</tr>
 			<?php endforeach; ?>
-			<tr>
-				<td><?php _e( 'Shipping Debug Mode', 'woocommerce' ); ?></td>
-				<td>
-					<p>
-						<label><input type="checkbox" class="checkbox" name="woocommerce_status_options[shipping_debug_mode]" value="1" <?php checked( '1', $options['shipping_debug_mode'] ); ?> /> <?php _e( 'Enabled', 'woocommerce' ); ?></label>
-					</p>
-					<p>
-						<span class="description"><?php _e( 'This tool will disable shipping rate caching.', 'woocommerce' ); ?></span>
-					</p>
-				</td>
-			</tr>
-			<tr>
-				<td><?php _e( 'Template Debug Mode', 'woocommerce' ); ?></td>
-				<td>
-					<p>
-						<label><input type="checkbox" class="checkbox" name="woocommerce_status_options[template_debug_mode]" value="1" <?php checked( '1', $options['template_debug_mode'] ); ?> /> <?php _e( 'Enabled', 'woocommerce' ); ?></label>
-					</p>
-					<p>
-						<span class="description"><?php _e( 'This tool will disable template overrides for logged-in administrators for debugging purposes.', 'woocommerce' ); ?></span>
-					</p>
-				</td>
-			</tr>
-			<tr>
-				<td><?php _e( 'Remove All Data', 'woocommerce' ); ?></td>
-				<td>
-					<p>
-						<label><input type="checkbox" class="checkbox" name="woocommerce_status_options[uninstall_data]" value="1" <?php checked( '1', $options['uninstall_data'] ); ?> /> <?php _e( 'Enabled', 'woocommerce' ); ?></label>
-					</p>
-					<p>
-						<span class="description"><?php _e( 'This tool will remove all WooCommerce, Product and Order data when using the "Delete" link on the plugins screen. It will also remove any setting/option prepended with "woocommerce_" so may also affect installed WooCommerce Extensions.', 'woocommerce' ); ?></span>
-					</p>
-				</td>
-			</tr>
 		</tbody>
 	</table>
 	<p class="submit">
-		<input type="submit" class="button-primary" value="<?php esc_attr_e( 'Save Changes', 'woocommerce' ) ?>" />
+		<input type="submit" class="button-primary" value="<?php esc_attr_e( 'Save changes', 'woocommerce' ) ?>" />
 	</p>
 </form>
diff --git a/includes/admin/views/html-admin-page-status.php b/includes/admin/views/html-admin-page-status.php
index 617eb5b0bbf..911cbb370ba 100644
--- a/includes/admin/views/html-admin-page-status.php
+++ b/includes/admin/views/html-admin-page-status.php
@@ -8,22 +8,26 @@ if ( ! defined( 'ABSPATH' ) ) {
 }
 
 $current_tab = ! empty( $_REQUEST['tab'] ) ? sanitize_title( $_REQUEST['tab'] ) : 'status';
+$tabs        = array(
+	'status' => __( 'System status', 'woocommerce' ),
+	'tools'  => __( 'Tools', 'woocommerce' ),
+	'logs'   => __( 'Logs', 'woocommerce' ),
+);
+$tabs        = apply_filters( 'woocommerce_admin_status_tabs', $tabs );
 ?>
 <div class="wrap woocommerce">
-	<div class="icon32 icon32-woocommerce-status" id="icon-woocommerce"><br /></div><h2 class="nav-tab-wrapper woo-nav-tab-wrapper">
+	<nav class="nav-tab-wrapper woo-nav-tab-wrapper">
 		<?php
-			$tabs = array(
-				'status' => __( 'System Status', 'woocommerce' ),
-				'tools'  => __( 'Tools', 'woocommerce' ),
-				'logs'   => __( 'Logs', 'woocommerce' ),
-			);
 			foreach ( $tabs as $name => $label ) {
 				echo '<a href="' . admin_url( 'admin.php?page=wc-status&tab=' . $name ) . '" class="nav-tab ';
-				if ( $current_tab == $name ) echo 'nav-tab-active';
+				if ( $current_tab == $name ) {
+					echo 'nav-tab-active';
+				}
 				echo '">' . $label . '</a>';
 			}
 		?>
-	</h2>
+	</nav>
+	<h1 class="screen-reader-text"><?php echo esc_html( $tabs[ $current_tab ] ); ?></h1>
 	<?php
 		switch ( $current_tab ) {
 			case "tools" :
@@ -33,7 +37,11 @@ $current_tab = ! empty( $_REQUEST['tab'] ) ? sanitize_title( $_REQUEST['tab'] )
 				WC_Admin_Status::status_logs();
 			break;
 			default :
-				WC_Admin_Status::status_report();
+				if ( array_key_exists( $current_tab, $tabs ) && has_action( 'woocommerce_admin_status_content_' . $current_tab ) ) {
+					do_action( 'woocommerce_admin_status_content_' . $current_tab );
+				} else {
+					WC_Admin_Status::status_report();
+				}
 			break;
 		}
 	?>
diff --git a/includes/admin/views/html-admin-settings.php b/includes/admin/views/html-admin-settings.php
index 18ca6f7ec27..a4244710bc5 100644
--- a/includes/admin/views/html-admin-settings.php
+++ b/includes/admin/views/html-admin-settings.php
@@ -2,39 +2,34 @@
 /**
  * Admin View: Settings
  */
-
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
 ?>
-
 <div class="wrap woocommerce">
 	<form method="<?php echo esc_attr( apply_filters( 'woocommerce_settings_form_method_tab_' . $current_tab, 'post' ) ); ?>" id="mainform" action="" enctype="multipart/form-data">
-		<div class="icon32 icon32-woocommerce-settings" id="icon-woocommerce"><br /></div>
-		<h2 class="nav-tab-wrapper woo-nav-tab-wrapper">
+		<nav class="nav-tab-wrapper woo-nav-tab-wrapper">
 			<?php
 				foreach ( $tabs as $name => $label ) {
 					echo '<a href="' . admin_url( 'admin.php?page=wc-settings&tab=' . $name ) . '" class="nav-tab ' . ( $current_tab == $name ? 'nav-tab-active' : '' ) . '">' . $label . '</a>';
 				}
-
 				do_action( 'woocommerce_settings_tabs' );
 			?>
-		</h2>
-
+		</nav>
+		<h1 class="screen-reader-text"><?php echo esc_html( $tabs[ $current_tab ] ); ?></h1>
 		<?php
+			do_action( 'woocommerce_sections_' . $current_tab );
+
 			self::show_messages();
 
-			do_action( 'woocommerce_sections_' . $current_tab );
 			do_action( 'woocommerce_settings_' . $current_tab );
 			do_action( 'woocommerce_settings_tabs_' . $current_tab ); // @deprecated hook
 		?>
-
 		<p class="submit">
-			<?php if ( ! isset( $GLOBALS['hide_save_button'] ) ) : ?>
-				<input name="save" class="button-primary" type="submit" value="<?php esc_attr_e( 'Save changes', 'woocommerce' ); ?>" />
+			<?php if ( empty( $GLOBALS['hide_save_button'] ) ) : ?>
+				<input name="save" class="button-primary woocommerce-save-button" type="submit" value="<?php esc_attr_e( 'Save changes', 'woocommerce' ); ?>" />
 			<?php endif; ?>
-			<input type="hidden" name="subtab" id="last_tab" />
 			<?php wp_nonce_field( 'woocommerce-settings' ); ?>
 		</p>
 	</form>
diff --git a/includes/admin/views/html-bulk-edit-product.php b/includes/admin/views/html-bulk-edit-product.php
index 2911cfd6e71..c6cdc3eb852 100644
--- a/includes/admin/views/html-bulk-edit-product.php
+++ b/includes/admin/views/html-bulk-edit-product.php
@@ -12,7 +12,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 <fieldset class="inline-edit-col-right">
 	<div id="woocommerce-fields-bulk" class="inline-edit-col">
 
-		<h4><?php _e( 'Product Data', 'woocommerce' ); ?></h4>
+		<h4><?php _e( 'Product data', 'woocommerce' ); ?></h4>
 
 		<?php do_action( 'woocommerce_product_bulk_edit_start' ); ?>
 
@@ -23,12 +23,12 @@ if ( ! defined( 'ABSPATH' ) ) {
 					<select class="change_regular_price change_to" name="change_regular_price">
 					<?php
 						$options = array(
-							'' 	=> __( '— No Change —', 'woocommerce' ),
+							'' 	=> __( '— No change —', 'woocommerce' ),
 							'1' => __( 'Change to:', 'woocommerce' ),
-							'2' => __( 'Increase by (fixed amount or %):', 'woocommerce' ),
-							'3' => __( 'Decrease by (fixed amount or %):', 'woocommerce' )
+							'2' => __( 'Increase existing price by (fixed amount or %):', 'woocommerce' ),
+							'3' => __( 'Decrease existing price by (fixed amount or %):', 'woocommerce' ),
 						);
-						foreach ($options as $key => $value) {
+						foreach ( $options as $key => $value ) {
 							echo '<option value="' . esc_attr( $key ) . '">' . $value . '</option>';
 						}
 					?>
@@ -36,7 +36,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 				</span>
 			</label>
 			<label class="change-input">
-				<input type="text" name="_regular_price" class="text regular_price" placeholder="<?php echo sprintf( __( 'Enter price (%s)', 'woocommerce' ), get_woocommerce_currency_symbol() ); ?>" value="" />
+				<input type="text" name="_regular_price" class="text regular_price" placeholder="<?php printf( esc_attr__( 'Enter price (%s)', 'woocommerce' ), get_woocommerce_currency_symbol() ); ?>" value="" />
 			</label>
 		</div>
 
@@ -47,11 +47,11 @@ if ( ! defined( 'ABSPATH' ) ) {
 					<select class="change_sale_price change_to" name="change_sale_price">
 					<?php
 						$options = array(
-							'' 	=> __( '— No Change —', 'woocommerce' ),
+							'' 	=> __( '— No change —', 'woocommerce' ),
 							'1' => __( 'Change to:', 'woocommerce' ),
-							'2' => __( 'Increase by (fixed amount or %):', 'woocommerce' ),
-							'3' => __( 'Decrease by (fixed amount or %):', 'woocommerce' ),
-							'4' => __( 'Decrease regular price by (fixed amount or %):', 'woocommerce' )
+							'2' => __( 'Increase existing sale price by (fixed amount or %):', 'woocommerce' ),
+							'3' => __( 'Decrease existing sale price by (fixed amount or %):', 'woocommerce' ),
+							'4' => __( 'Set to regular price decreased by (fixed amount or %):', 'woocommerce' ),
 						);
 						foreach ( $options as $key => $value ) {
 							echo '<option value="' . esc_attr( $key ) . '">' . $value . '</option>';
@@ -61,23 +61,23 @@ if ( ! defined( 'ABSPATH' ) ) {
 				</span>
 			</label>
 			<label class="change-input">
-				<input type="text" name="_sale_price" class="text sale_price" placeholder="<?php echo sprintf( __( 'Enter sale price (%s)', 'woocommerce' ), get_woocommerce_currency_symbol() ); ?>" value="" />
+				<input type="text" name="_sale_price" class="text sale_price" placeholder="<?php printf( esc_attr__( 'Enter sale price (%s)', 'woocommerce' ), get_woocommerce_currency_symbol() ); ?>" value="" />
 			</label>
 		</div>
 
 		<?php if ( wc_tax_enabled() ) : ?>
 			<label>
-				<span class="title"><?php _e( 'Tax Status', 'woocommerce' ); ?></span>
+				<span class="title"><?php _e( 'Tax status', 'woocommerce' ); ?></span>
 				<span class="input-text-wrap">
 					<select class="tax_status" name="_tax_status">
 					<?php
 						$options = array(
-							''         => __( '— No Change —', 'woocommerce' ),
+							''         => __( '— No change —', 'woocommerce' ),
 							'taxable'  => __( 'Taxable', 'woocommerce' ),
 							'shipping' => __( 'Shipping only', 'woocommerce' ),
-							'none'     => _x( 'None', 'Tax status', 'woocommerce' )
+							'none'     => _x( 'None', 'Tax status', 'woocommerce' ),
 						);
-						foreach ($options as $key => $value) {
+						foreach ( $options as $key => $value ) {
 							echo '<option value="' . esc_attr( $key ) . '">' . $value . '</option>';
 						}
 					?>
@@ -86,21 +86,22 @@ if ( ! defined( 'ABSPATH' ) ) {
 			</label>
 
 			<label>
-				<span class="title"><?php _e( 'Tax Class', 'woocommerce' ); ?></span>
+				<span class="title"><?php _e( 'Tax class', 'woocommerce' ); ?></span>
 				<span class="input-text-wrap">
 					<select class="tax_class" name="_tax_class">
 					<?php
 						$options = array(
-							''         => __( '— No Change —', 'woocommerce' ),
-							'standard' => __( 'Standard', 'woocommerce' )
+							''         => __( '— No change —', 'woocommerce' ),
+							'standard' => __( 'Standard', 'woocommerce' ),
 						);
 
 						$tax_classes = WC_Tax::get_tax_classes();
 
-						if ( $tax_classes )
+						if ( ! empty( $tax_classes ) ) {
 							foreach ( $tax_classes as $class ) {
 								$options[ sanitize_title( $class ) ] = esc_html( $class );
 							}
+						}
 
 						foreach ( $options as $key => $value ) {
 							echo '<option value="' . esc_attr( $key ) . '">' . $value . '</option>';
@@ -119,18 +120,18 @@ if ( ! defined( 'ABSPATH' ) ) {
 						<select class="change_weight change_to" name="change_weight">
 						<?php
 							$options = array(
-								'' 	=> __( '— No Change —', 'woocommerce' ),
-								'1' => __( 'Change to:', 'woocommerce' )
+								'' 	=> __( '— No change —', 'woocommerce' ),
+								'1' => __( 'Change to:', 'woocommerce' ),
 							);
 							foreach ( $options as $key => $value ) {
-								echo '<option value="' . esc_attr( $key ) . '">'. $value .'</option>';
+								echo '<option value="' . esc_attr( $key ) . '">' . $value . '</option>';
 							}
 						?>
 						</select>
 					</span>
 				</label>
 				<label class="change-input">
-					<input type="text" name="_weight" class="text weight" placeholder="<?php echo sprintf( __( '%s (%s)', 'woocommerce' ), wc_format_localized_decimal( 0 ), get_option( 'woocommerce_weight_unit' ) ); ?>" value="">
+					<input type="text" name="_weight" class="text weight" placeholder="<?php printf( esc_attr__( '%1$s (%2$s)', 'woocommerce' ), wc_format_localized_decimal( 0 ), get_option( 'woocommerce_weight_unit' ) ); ?>" value="">
 				</label>
 			</div>
 		<?php endif; ?>
@@ -143,20 +144,20 @@ if ( ! defined( 'ABSPATH' ) ) {
 						<select class="change_dimensions change_to" name="change_dimensions">
 						<?php
 							$options = array(
-								'' 	=> __( '— No Change —', 'woocommerce' ),
-								'1' => __( 'Change to:', 'woocommerce' )
+								'' 	=> __( '— No change —', 'woocommerce' ),
+								'1' => __( 'Change to:', 'woocommerce' ),
 							);
 							foreach ( $options as $key => $value ) {
-								echo '<option value="' . esc_attr( $key ) . '">'. $value .'</option>';
+								echo '<option value="' . esc_attr( $key ) . '">' . $value . '</option>';
 							}
 						?>
 						</select>
 					</span>
 				</label>
 				<label class="change-input">
-					<input type="text" name="_length" class="text length" placeholder="<?php echo sprintf( __( 'Length (%s)', 'woocommerce' ), get_option( 'woocommerce_dimension_unit' ) ); ?>" value="">
-					<input type="text" name="_width" class="text width" placeholder="<?php echo sprintf( __( 'Width (%s)', 'woocommerce' ), get_option( 'woocommerce_dimension_unit' ) ); ?>" value="">
-					<input type="text" name="_height" class="text height" placeholder="<?php echo sprintf( __( 'Height (%s)', 'woocommerce' ), get_option( 'woocommerce_dimension_unit' ) ); ?>" value="">
+					<input type="text" name="_length" class="text length" placeholder="<?php printf( esc_attr__( 'Length (%s)', 'woocommerce' ), get_option( 'woocommerce_dimension_unit' ) ); ?>" value="">
+					<input type="text" name="_width" class="text width" placeholder="<?php printf( esc_attr__( 'Width (%s)', 'woocommerce' ), get_option( 'woocommerce_dimension_unit' ) ); ?>" value="">
+					<input type="text" name="_height" class="text height" placeholder="<?php printf( esc_attr__( 'Height (%s)', 'woocommerce' ), get_option( 'woocommerce_dimension_unit' ) ); ?>" value="">
 				</label>
 			</div>
 		<?php endif; ?>
@@ -165,11 +166,11 @@ if ( ! defined( 'ABSPATH' ) ) {
 			<span class="title"><?php _e( 'Shipping class', 'woocommerce' ); ?></span>
 			<span class="input-text-wrap">
 				<select class="shipping_class" name="_shipping_class">
-					<option value=""><?php _e( '— No Change —', 'woocommerce' ); ?></option>
+					<option value=""><?php _e( '— No change —', 'woocommerce' ); ?></option>
 					<option value="_no_shipping_class"><?php _e( 'No shipping class', 'woocommerce' ); ?></option>
 				<?php
 					foreach ( $shipping_class as $key => $value ) {
-						echo '<option value="' . esc_attr( $value->slug ) . '">'. $value->name .'</option>';
+						echo '<option value="' . esc_attr( $value->slug ) . '">' . $value->name . '</option>';
 					}
 				?>
 				</select>
@@ -182,14 +183,14 @@ if ( ! defined( 'ABSPATH' ) ) {
 				<select class="visibility" name="_visibility">
 				<?php
 					$options = array(
-						''        => __( '— No Change —', 'woocommerce' ),
+						''        => __( '— No change —', 'woocommerce' ),
 						'visible' => __( 'Catalog &amp; search', 'woocommerce' ),
 						'catalog' => __( 'Catalog', 'woocommerce' ),
 						'search'  => __( 'Search', 'woocommerce' ),
-						'hidden'  => __( 'Hidden', 'woocommerce' )
+						'hidden'  => __( 'Hidden', 'woocommerce' ),
 					);
 					foreach ( $options as $key => $value ) {
-						echo '<option value="' . esc_attr( $key ) . '">'. $value .'</option>';
+						echo '<option value="' . esc_attr( $key ) . '">' . $value . '</option>';
 					}
 				?>
 				</select>
@@ -201,12 +202,12 @@ if ( ! defined( 'ABSPATH' ) ) {
 				<select class="featured" name="_featured">
 				<?php
 					$options = array(
-						''    => __( '— No Change —', 'woocommerce' ),
+						''    => __( '— No change —', 'woocommerce' ),
 						'yes' => __( 'Yes', 'woocommerce' ),
-						'no'  => __( 'No', 'woocommerce' )
+						'no'  => __( 'No', 'woocommerce' ),
 					);
-					foreach ($options as $key => $value) {
-						echo '<option value="' . esc_attr( $key ) . '">'. $value .'</option>';
+					foreach ( $options as $key => $value ) {
+						echo '<option value="' . esc_attr( $key ) . '">' . $value . '</option>';
 					}
 				?>
 				</select>
@@ -218,13 +219,10 @@ if ( ! defined( 'ABSPATH' ) ) {
 			<span class="input-text-wrap">
 				<select class="stock_status" name="_stock_status">
 				<?php
-					$options = array(
-						''           => __( '— No Change —', 'woocommerce' ),
-						'instock'    => __( 'In stock', 'woocommerce' ),
-						'outofstock' => __( 'Out of stock', 'woocommerce' )
-					);
-					foreach ( $options as $key => $value ) {
-						echo '<option value="' . esc_attr( $key ) . '">'. $value .'</option>';
+					echo '<option value="">' . esc_html__( '— No Change —', 'woocommerce' ) . '</option>';
+
+					foreach ( wc_get_product_stock_status_options() as $key => $value ) {
+						echo '<option value="' . esc_attr( $key ) . '">' . $value . '</option>';
 					}
 				?>
 				</select>
@@ -238,12 +236,12 @@ if ( ! defined( 'ABSPATH' ) ) {
 					<select class="manage_stock" name="_manage_stock">
 					<?php
 						$options = array(
-							''    => __( '— No Change —', 'woocommerce' ),
+							''    => __( '— No change —', 'woocommerce' ),
 							'yes' => __( 'Yes', 'woocommerce' ),
-							'no'  => __( 'No', 'woocommerce' )
+							'no'  => __( 'No', 'woocommerce' ),
 						);
 						foreach ( $options as $key => $value ) {
-							echo '<option value="' . esc_attr( $key ) . '">'. $value .'</option>';
+							echo '<option value="' . esc_attr( $key ) . '">' . $value . '</option>';
 						}
 					?>
 					</select>
@@ -252,23 +250,23 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 			<div class="inline-edit-group">
 				<label class="alignleft stock_qty_field">
-					<span class="title"><?php _e( 'Stock Qty', 'woocommerce' ); ?></span>
+					<span class="title"><?php _e( 'Stock qty', 'woocommerce' ); ?></span>
 					<span class="input-text-wrap">
 						<select class="change_stock change_to" name="change_stock">
 						<?php
 							$options = array(
-								'' 	=> __( '— No Change —', 'woocommerce' ),
-								'1' => __( 'Change to:', 'woocommerce' )
+								'' 	=> __( '— No change —', 'woocommerce' ),
+								'1' => __( 'Change to:', 'woocommerce' ),
 							);
 							foreach ( $options as $key => $value ) {
-								echo '<option value="' . esc_attr( $key ) . '">'. $value .'</option>';
+								echo '<option value="' . esc_attr( $key ) . '">' . $value . '</option>';
 							}
 						?>
 						</select>
 					</span>
 				</label>
 				<label class="change-input">
-					<input type="text" name="_stock" class="text stock" placeholder="<?php esc_attr_e( 'Stock Qty', 'woocommerce' ); ?>" step="any" value="">
+					<input type="text" name="_stock" class="text stock" placeholder="<?php esc_attr_e( 'Stock qty', 'woocommerce' ); ?>" step="any" value="">
 				</label>
 			</div>
 
@@ -277,14 +275,10 @@ if ( ! defined( 'ABSPATH' ) ) {
 				<span class="input-text-wrap">
 					<select class="backorders" name="_backorders">
 					<?php
-						$options = array(
-							''       => __( '— No Change —', 'woocommerce' ),
-							'no'     => __( 'Do not allow', 'woocommerce' ),
-							'notify' => __( 'Allow, but notify customer', 'woocommerce' ),
-							'yes'    => __( 'Allow', 'woocommerce' )
-						);
-						foreach ( $options as $key => $value ) {
-							echo '<option value="' . esc_attr( $key ) . '">'. $value .'</option>';
+						echo '<option value="">' . esc_html__( '— No Change —', 'woocommerce' ) . '</option>';
+
+						foreach ( wc_get_product_backorder_options() as $key => $value ) {
+							echo '<option value="' . esc_attr( $key ) . '">' . $value . '</option>';
 						}
 					?>
 					</select>
@@ -294,14 +288,14 @@ if ( ! defined( 'ABSPATH' ) ) {
 		<?php endif; ?>
 
 		<label>
-			<span class="title"><?php esc_html_e( 'Sold Individually?', 'woocommerce' ); ?></span>
+			<span class="title"><?php esc_html_e( 'Sold individually?', 'woocommerce' ); ?></span>
 				<span class="input-text-wrap">
 					<select class="sold_individually" name="_sold_individually">
 					<?php
 					$options = array(
-						''    => __( '— No Change —', 'woocommerce' ),
+						''    => __( '— No change —', 'woocommerce' ),
 						'yes' => __( 'Yes', 'woocommerce' ),
-						'no'  => __( 'No', 'woocommerce' )
+						'no'  => __( 'No', 'woocommerce' ),
 					);
 					foreach ( $options as $key => $value ) {
 						echo '<option value="' . esc_attr( $key ) . '">' . esc_html( $value ) . '</option>';
diff --git a/includes/admin/views/html-notice-custom.php b/includes/admin/views/html-notice-custom.php
new file mode 100644
index 00000000000..a0ef2a9fa71
--- /dev/null
+++ b/includes/admin/views/html-notice-custom.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Admin View: Custom Notices
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+?>
+<div id="message" class="updated woocommerce-message">
+	<a class="woocommerce-message-close notice-dismiss" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wc-hide-notice', $notice ), 'woocommerce_hide_notices_nonce', '_wc_notice_nonce' ) ); ?>"><?php _e( 'Dismiss', 'woocommerce' ); ?></a>
+	<?php echo wp_kses_post( wpautop( $notice_html ) ); ?>
+</div>
diff --git a/includes/admin/views/html-notice-install.php b/includes/admin/views/html-notice-install.php
index 16c569931a6..0f735cc1e72 100644
--- a/includes/admin/views/html-notice-install.php
+++ b/includes/admin/views/html-notice-install.php
@@ -10,5 +10,5 @@ if ( ! defined( 'ABSPATH' ) ) {
 ?>
 <div id="message" class="updated woocommerce-message wc-connect">
 	<p><?php _e( '<strong>Welcome to WooCommerce</strong> &#8211; You&lsquo;re almost ready to start selling :)', 'woocommerce' ); ?></p>
-	<p class="submit"><a href="<?php echo esc_url( admin_url( 'admin.php?page=wc-setup' ) ); ?>" class="button-primary"><?php _e( 'Run the Setup Wizard', 'woocommerce' ); ?></a> <a class="button-secondary skip" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wc-hide-notice', 'install' ), 'woocommerce_hide_notices_nonce', '_wc_notice_nonce' ) ); ?>"><?php _e( 'Skip Setup', 'woocommerce' ); ?></a></p>
+	<p class="submit"><a href="<?php echo esc_url( admin_url( 'admin.php?page=wc-setup' ) ); ?>" class="button-primary"><?php _e( 'Run the Setup Wizard', 'woocommerce' ); ?></a> <a class="button-secondary skip" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wc-hide-notice', 'install' ), 'woocommerce_hide_notices_nonce', '_wc_notice_nonce' ) ); ?>"><?php _e( 'Skip setup', 'woocommerce' ); ?></a></p>
 </div>
diff --git a/includes/admin/views/html-notice-legacy-shipping.php b/includes/admin/views/html-notice-legacy-shipping.php
new file mode 100644
index 00000000000..19bf819b67e
--- /dev/null
+++ b/includes/admin/views/html-notice-legacy-shipping.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Admin View: Notice - Legacy Shipping.
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+?>
+<div id="message" class="updated woocommerce-message woocommerce-legacy-shipping-notice">
+	<a class="woocommerce-message-close notice-dismiss" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wc-hide-notice', 'legacy_shipping' ), 'woocommerce_hide_notices_nonce', '_wc_notice_nonce' ) ); ?>"><?php _e( 'Dismiss', 'woocommerce' ); ?></a>
+
+	<p class="main"><strong><?php _e( 'New:', 'woocommerce' ); ?> <?php _e( 'Shipping zones', 'woocommerce' ); ?></strong> &#8211; <?php _e( 'a group of regions that can be assigned different shipping methods and rates.', 'woocommerce' ); ?></p>
+	<p><?php _e( 'Legacy shipping methods (flat rate, international flat rate, local pickup and delivery, and free shipping) are deprecated but will continue to work as normal for now. <b><em>They will be removed in future versions of WooCommerce</em></b>. We recommend disabling these and setting up new rates within shipping zones as soon as possible.', 'woocommerce' ); ?></p>
+
+	<p class="submit">
+		<?php if ( empty( $_GET['page'] ) || empty( $_GET['tab'] ) || 'wc-settings' !== $_GET['page'] || 'shipping' !== $_GET['tab'] ) : ?>
+			<a class="button-primary" href="<?php echo esc_url( admin_url( 'admin.php?page=wc-settings&tab=shipping' ) ); ?>"><?php _e( 'Setup shipping zones', 'woocommerce' ); ?></a>
+		<?php endif; ?>
+		<a class="button-secondary" href="https://docs.woocommerce.com/document/setting-up-shipping-zones/"><?php _e( 'Learn more about shipping zones', 'woocommerce' ); ?></a>
+	</p>
+</div>
diff --git a/includes/admin/views/html-notice-no-shipping-methods.php b/includes/admin/views/html-notice-no-shipping-methods.php
new file mode 100644
index 00000000000..2c0e95ba7f5
--- /dev/null
+++ b/includes/admin/views/html-notice-no-shipping-methods.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Admin View: Notice - No Shipping methods.
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+?>
+<div id="message" class="updated woocommerce-message woocommerce-no-shipping-methods-notice">
+	<a class="woocommerce-message-close notice-dismiss" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wc-hide-notice', 'no_shipping_methods' ), 'woocommerce_hide_notices_nonce', '_wc_notice_nonce' ) ); ?>"><?php _e( 'Dismiss', 'woocommerce' ); ?></a>
+
+	<p class="main"><strong><?php _e( 'Add shipping methods &amp; zones', 'woocommerce' ); ?></strong></p>
+	<p><?php _e( 'Shipping is currently enabled, but you have not added any shipping methods to your shipping zones.', 'woocommerce' ); ?></p>
+	<p><?php _e( 'Customers will not be able to purchase physical goods from your store until a shipping method is available.', 'woocommerce' ); ?></p>
+
+	<p class="submit">
+		<a class="button-primary" href="<?php echo esc_url( admin_url( 'admin.php?page=wc-settings&tab=shipping' ) ); ?>"><?php _e( 'Setup shipping zones', 'woocommerce' ); ?></a>
+		<a class="button-secondary" href="https://docs.woocommerce.com/document/setting-up-shipping-zones/"><?php _e( 'Learn more about shipping zones', 'woocommerce' ); ?></a>
+	</p>
+</div>
diff --git a/includes/admin/views/html-notice-simplify-commerce.php b/includes/admin/views/html-notice-simplify-commerce.php
new file mode 100644
index 00000000000..8664b6b270a
--- /dev/null
+++ b/includes/admin/views/html-notice-simplify-commerce.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Admin View: Notice - Simplify Commerce.
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+$plugin_slug = 'woocommerce-gateway-simplify-commerce';
+
+if ( current_user_can( 'install_plugins' ) ) {
+	$url = wp_nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=' . $plugin_slug ), 'install-plugin_' . $plugin_slug );
+} else {
+	$url = 'https://wordpress.org/plugins/' . $plugin_slug;
+}
+?>
+<div id="message" class="updated woocommerce-message">
+	<a class="woocommerce-message-close notice-dismiss" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wc-hide-notice', 'simplify_commerce' ), 'woocommerce_hide_notices_nonce', '_wc_notice_nonce' ) ); ?>"><?php _e( 'Dismiss', 'woocommerce' ); ?></a>
+
+	<p><?php _e( '<strong>The Simplify Commerce payment gateway is deprecated</strong> &#8211; Please install our new free Simplify Commerce plugin from WordPress.org. Simplify Commerce will be removed from WooCommerce core in a future update.', 'woocommerce' ); ?></p>
+
+	<p class="submit"><a href="<?php echo esc_url( $url ); ?>" class="wc-update-now button-primary"><?php _e( 'Install our new Simplify Commerce plugin', 'woocommerce' ); ?></a></p>
+</div>
diff --git a/includes/admin/views/html-notice-template-check.php b/includes/admin/views/html-notice-template-check.php
index f996f0fa39a..e326a750461 100644
--- a/includes/admin/views/html-notice-template-check.php
+++ b/includes/admin/views/html-notice-template-check.php
@@ -10,6 +10,8 @@ if ( ! defined( 'ABSPATH' ) ) {
 $theme = wp_get_theme();
 ?>
 <div id="message" class="updated woocommerce-message">
-	<p><?php printf( __( '<strong>Your theme (%s) contains outdated copies of some WooCommerce template files.</strong> These files may need updating to ensure they are compatible with the current version of WooCommerce. You can see which files are affected from the %ssystem status page%s. If in doubt, check with the author of the theme.', 'woocommerce' ), esc_html( $theme['Name'] ), '<a href="' . esc_url( admin_url( 'admin.php?page=wc-status' ) ) . '">', '</a>' ); ?></p>
-	<p class="submit"><a class="button-primary" href="http://docs.woothemes.com/document/template-structure/" target="_blank"><?php _e( 'Learn More About Templates', 'woocommerce' ); ?></a> <a class="button-secondary skip" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wc-hide-notice', 'template_files' ), 'woocommerce_hide_notices_nonce', '_wc_notice_nonce' ) ); ?>"><?php _e( 'Hide This Notice', 'woocommerce' ); ?></a></p>
+	<a class="woocommerce-message-close notice-dismiss" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wc-hide-notice', 'template_files' ), 'woocommerce_hide_notices_nonce', '_wc_notice_nonce' ) ); ?>"><?php _e( 'Dismiss', 'woocommerce' ); ?></a>
+
+	<p><?php printf( __( '<strong>Your theme (%1$s) contains outdated copies of some WooCommerce template files.</strong> These files may need updating to ensure they are compatible with the current version of WooCommerce. You can see which files are affected from the <a href="%2$s">system status page</a>. If in doubt, check with the author of the theme.', 'woocommerce' ), esc_html( $theme['Name'] ), esc_url( admin_url( 'admin.php?page=wc-status' ) ) ); ?></p>
+	<p class="submit"><a class="button-primary" href="https://docs.woocommerce.com/document/template-structure/" target="_blank"><?php _e( 'Learn more about templates', 'woocommerce' ); ?></a></p>
 </div>
diff --git a/includes/admin/views/html-notice-theme-support.php b/includes/admin/views/html-notice-theme-support.php
index 71257765974..37987b27439 100644
--- a/includes/admin/views/html-notice-theme-support.php
+++ b/includes/admin/views/html-notice-theme-support.php
@@ -9,10 +9,11 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 ?>
 <div id="message" class="updated woocommerce-message wc-connect">
-	<p><?php printf( __( '<strong>Your theme does not declare WooCommerce support</strong> &#8211; Please read our %sintegration%s guide or check out our %sStorefront%s theme which is totally free to download and designed specifically for use with WooCommerce.', 'woocommerce' ), '<a href="' . esc_url( apply_filters( 'woocommerce_docs_url', 'http://docs.woothemes.com/document/third-party-custom-theme-compatibility/', 'theme-compatibility' ) ) . '">', '</a>', '<a href="' . esc_url( admin_url( 'theme-install.php?theme=storefront' ) ) . '">', '</a>' ); ?></p>
+	<a class="woocommerce-message-close notice-dismiss" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wc-hide-notice', 'theme_support' ), 'woocommerce_hide_notices_nonce', '_wc_notice_nonce' ) ); ?>"><?php _e( 'Dismiss', 'woocommerce' ); ?></a>
+
+	<p><?php printf( __( '<strong>Your theme does not declare WooCommerce support</strong> &#8211; Please read our <a href="%1$s" target="_blank">integration</a> guide or check out our <a href="%2$s" target="_blank">Storefront</a> theme which is totally free to download and designed specifically for use with WooCommerce.', 'woocommerce' ), esc_url( apply_filters( 'woocommerce_docs_url', 'https://docs.woocommerce.com/document/third-party-custom-theme-compatibility/', 'theme-compatibility' ) ), esc_url( admin_url( 'theme-install.php?theme=storefront' ) ) ); ?></p>
 	<p class="submit">
-		<a href="http://www.woothemes.com/storefront/?utm_source=wpadmin&amp;utm_medium=notice&amp;utm_campaign=Storefront" class="button-primary" target="_blank"><?php _e( 'Read More About Storefront', 'woocommerce' ); ?></a>
-		<a href="<?php echo esc_url( apply_filters( 'woocommerce_docs_url', 'http://docs.woothemes.com/document/third-party-custom-theme-compatibility/', 'theme-compatibility' ) ); ?>" class="button-secondary" target="_blank"><?php _e( 'Theme Integration Guide', 'woocommerce' ); ?></a>
-		<a class="button-secondary skip" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wc-hide-notice', 'theme_support' ), 'woocommerce_hide_notices_nonce', '_wc_notice_nonce' ) ); ?>"><?php _e( 'Hide This Notice', 'woocommerce' ); ?></a>
+		<a href="https://woocommerce.com/storefront/?utm_source=notice&amp;utm_medium=product&amp;utm_content=storefront&amp;utm_campaign=woocommerceplugin" class="button-primary" target="_blank"><?php _e( 'Read more about Storefront', 'woocommerce' ); ?></a>
+		<a href="<?php echo esc_url( apply_filters( 'woocommerce_docs_url', 'http://docs.woocommerce.com/document/third-party-custom-theme-compatibility/?utm_source=notice&utm_medium=product&utm_content=themecompatibility&utm_campaign=woocommerceplugin' ) ); ?>" class="button-secondary" target="_blank"><?php _e( 'Theme integration guide', 'woocommerce' ); ?></a>
 	</p>
 </div>
diff --git a/includes/admin/views/html-notice-tracking.php b/includes/admin/views/html-notice-tracking.php
index 15e2afba468..5ba3298d386 100644
--- a/includes/admin/views/html-notice-tracking.php
+++ b/includes/admin/views/html-notice-tracking.php
@@ -8,7 +8,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 ?>
 <div id="message" class="updated woocommerce-message woocommerce-tracker">
-	<p><?php printf( __( 'Want to help make WooCommerce even more awesome? Allow WooThemes to collect non-sensitive diagnostic data and usage information, and get %s discount on your next WooThemes purchase. %sFind out more%s.', 'woocommerce' ), '20%', '<a href="http://www.woothemes.com/woocommerce/usage-tracking/" target="_blank">', '</a>' ); ?></p>
+	<p><?php printf( __( 'Want to help make WooCommerce even more awesome? Allow WooCommerce to collect non-sensitive diagnostic data and usage information, and get %1$s discount on your next WooThemes purchase. <a href="%2$s" target="_blank">Find out more</a>.', 'woocommerce' ), '20%', 'https://woocommerce.com/usage-tracking/' ); ?></p>
 	<p class="submit">
 		<a class="button-primary" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wc_tracker_optin', 'true' ), 'wc_tracker_optin', 'wc_tracker_nonce' ) ); ?>"><?php _e( 'Allow', 'woocommerce' ); ?></a>
 		<a class="skip button-secondary" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wc-hide-notice', 'tracking' ), 'woocommerce_hide_notices_nonce', '_wc_notice_nonce' ) ); ?>"><?php _e( 'No, do not bother me again', 'woocommerce' ); ?></a>
diff --git a/includes/admin/views/html-notice-update.php b/includes/admin/views/html-notice-update.php
index 032be0f7493..f41c1674c5e 100644
--- a/includes/admin/views/html-notice-update.php
+++ b/includes/admin/views/html-notice-update.php
@@ -9,11 +9,11 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 ?>
 <div id="message" class="updated woocommerce-message wc-connect">
-	<p><?php _e( '<strong>WooCommerce Data Update Required</strong> &#8211; We just need to update your install to the latest version', 'woocommerce' ); ?></p>
+	<p><strong><?php _e( 'WooCommerce data update', 'woocommerce' ); ?></strong> &#8211; <?php _e( 'We need to update your store database to the latest version.', 'woocommerce' ); ?></p>
 	<p class="submit"><a href="<?php echo esc_url( add_query_arg( 'do_update_woocommerce', 'true', admin_url( 'admin.php?page=wc-settings' ) ) ); ?>" class="wc-update-now button-primary"><?php _e( 'Run the updater', 'woocommerce' ); ?></a></p>
 </div>
 <script type="text/javascript">
 	jQuery( '.wc-update-now' ).click( 'click', function() {
-		return window.confirm( '<?php echo esc_js( __( 'It is strongly recommended that you backup your database before proceeding. Are you sure you wish to run the updater now?', 'woocommerce' ) ); ?>' );
+		return window.confirm( '<?php echo esc_js( __( 'It is strongly recommended that you backup your database before proceeding. Are you sure you wish to run the updater now?', 'woocommerce' ) ); ?>' ); // jshint ignore:line
 	});
 </script>
diff --git a/includes/admin/views/html-notice-updated.php b/includes/admin/views/html-notice-updated.php
new file mode 100644
index 00000000000..03d81f7164d
--- /dev/null
+++ b/includes/admin/views/html-notice-updated.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Admin View: Notice - Updated
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+?>
+<div id="message" class="updated woocommerce-message wc-connect woocommerce-message--success">
+	<a class="woocommerce-message-close notice-dismiss" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wc-hide-notice', 'update', remove_query_arg( 'do_update_woocommerce' ) ), 'woocommerce_hide_notices_nonce', '_wc_notice_nonce' ) ); ?>"><?php _e( 'Dismiss', 'woocommerce' ); ?></a>
+
+	<p><?php _e( 'WooCommerce data update complete. Thank you for updating to the latest version!', 'woocommerce' ); ?></p>
+</div>
diff --git a/includes/admin/views/html-notice-updating.php b/includes/admin/views/html-notice-updating.php
new file mode 100644
index 00000000000..b77d86741ab
--- /dev/null
+++ b/includes/admin/views/html-notice-updating.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Admin View: Notice - Updating
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+?>
+<div id="message" class="updated woocommerce-message wc-connect">
+	<p><strong><?php _e( 'WooCommerce data update', 'woocommerce' ); ?></strong> &#8211; <?php _e( 'Your database is being updated in the background.', 'woocommerce' ); ?> <a href="<?php echo esc_url( add_query_arg( 'force_update_woocommerce', 'true', admin_url( 'admin.php?page=wc-settings' ) ) ); ?>"><?php _e( 'Taking a while? Click here to run it now.', 'woocommerce' ); ?></a></p>
+</div>
diff --git a/includes/admin/views/html-quick-edit-product.php b/includes/admin/views/html-quick-edit-product.php
index 25d98f26a3d..8e7144a5066 100644
--- a/includes/admin/views/html-quick-edit-product.php
+++ b/includes/admin/views/html-quick-edit-product.php
@@ -12,7 +12,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 <fieldset class="inline-edit-col-left">
 	<div id="woocommerce-fields" class="inline-edit-col">
 
-		<h4><?php _e( 'Product Data', 'woocommerce' ); ?></h4>
+		<h4><?php _e( 'Product data', 'woocommerce' ); ?></h4>
 
 		<?php do_action( 'woocommerce_product_quick_edit_start' ); ?>
 
@@ -32,14 +32,14 @@ if ( ! defined( 'ABSPATH' ) ) {
 			<label>
 				<span class="title"><?php _e( 'Price', 'woocommerce' ); ?></span>
 				<span class="input-text-wrap">
-					<input type="text" name="_regular_price" class="text wc_input_price regular_price" placeholder="<?php esc_attr_e( 'Regular Price', 'woocommerce' ); ?>" value="">
+					<input type="text" name="_regular_price" class="text wc_input_price regular_price" placeholder="<?php esc_attr_e( 'Regular price', 'woocommerce' ); ?>" value="">
 				</span>
 			</label>
 			<br class="clear" />
 			<label>
 				<span class="title"><?php _e( 'Sale', 'woocommerce' ); ?></span>
 				<span class="input-text-wrap">
-					<input type="text" name="_sale_price" class="text wc_input_price sale_price" placeholder="<?php esc_attr_e( 'Sale Price', 'woocommerce' ); ?>" value="">
+					<input type="text" name="_sale_price" class="text wc_input_price sale_price" placeholder="<?php esc_attr_e( 'Sale price', 'woocommerce' ); ?>" value="">
 				</span>
 			</label>
 			<br class="clear" />
@@ -47,14 +47,14 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 		<?php if ( wc_tax_enabled() ) : ?>
 			<label class="alignleft">
-				<span class="title"><?php _e( 'Tax Status', 'woocommerce' ); ?></span>
+				<span class="title"><?php _e( 'Tax status', 'woocommerce' ); ?></span>
 				<span class="input-text-wrap">
 					<select class="tax_status" name="_tax_status">
 					<?php
 						$options = array(
 							'taxable'  => __( 'Taxable', 'woocommerce' ),
 							'shipping' => __( 'Shipping only', 'woocommerce' ),
-							'none'     => _x( 'None', 'Tax status', 'woocommerce' )
+							'none'     => _x( 'None', 'Tax status', 'woocommerce' ),
 						);
 						foreach ( $options as $key => $value ) {
 							echo '<option value="' . esc_attr( $key ) . '">' . $value . '</option>';
@@ -65,20 +65,21 @@ if ( ! defined( 'ABSPATH' ) ) {
 			</label>
 			<br class="clear" />
 			<label class="alignleft">
-				<span class="title"><?php _e( 'Tax Class', 'woocommerce' ); ?></span>
+				<span class="title"><?php _e( 'Tax class', 'woocommerce' ); ?></span>
 				<span class="input-text-wrap">
 					<select class="tax_class" name="_tax_class">
 					<?php
 						$options = array(
-							'' => __( 'Standard', 'woocommerce' )
+							'' => __( 'Standard', 'woocommerce' ),
 						);
 
 						$tax_classes = WC_Tax::get_tax_classes();
 
-						if ( $tax_classes )
+						if ( ! empty( $tax_classes ) ) {
 							foreach ( $tax_classes as $class ) {
 								$options[ sanitize_title( $class ) ] = esc_html( $class );
 							}
+						}
 
 						foreach ( $options as $key => $value ) {
 							echo '<option value="' . esc_attr( $key ) . '">' . $value . '</option>';
@@ -126,7 +127,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 					<option value="_no_shipping_class"><?php _e( 'No shipping class', 'woocommerce' ); ?></option>
 				<?php
 					foreach ( $shipping_class as $key => $value ) {
-						echo '<option value="' . esc_attr( $value->slug ) . '">'. $value->name .'</option>';
+						echo '<option value="' . esc_attr( $value->slug ) . '">' . $value->name . '</option>';
 					}
 				?>
 				</select>
@@ -143,10 +144,10 @@ if ( ! defined( 'ABSPATH' ) ) {
 						'visible' => __( 'Catalog &amp; search', 'woocommerce' ),
 						'catalog' => __( 'Catalog', 'woocommerce' ),
 						'search'  => __( 'Search', 'woocommerce' ),
-						'hidden'  => __( 'Hidden', 'woocommerce' )
+						'hidden'  => __( 'Hidden', 'woocommerce' ),
 					) );
 					foreach ( $options as $key => $value ) {
-						echo '<option value="' . esc_attr( $key ) . '">'. $value .'</option>';
+						echo '<option value="' . esc_attr( $key ) . '">' . $value . '</option>';
 					}
 				?>
 				</select>
@@ -162,12 +163,8 @@ if ( ! defined( 'ABSPATH' ) ) {
 			<span class="input-text-wrap">
 				<select class="stock_status" name="_stock_status">
 				<?php
-					$options = array(
-						'instock'    => __( 'In stock', 'woocommerce' ),
-						'outofstock' => __( 'Out of stock', 'woocommerce' )
-					);
-					foreach ( $options as $key => $value ) {
-						echo '<option value="' . esc_attr( $key ) .'">'. $value .'</option>';
+					foreach ( wc_get_product_stock_status_options() as $key => $value ) {
+						echo '<option value="' . esc_attr( $key ) . '">' . $value . '</option>';
 					}
 				?>
 				</select>
@@ -176,14 +173,14 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 		<div class="stock_fields">
 
-			<?php if (get_option('woocommerce_manage_stock')=='yes') : ?>
+			<?php if ( get_option( 'woocommerce_manage_stock' ) == 'yes' ) : ?>
 				<label class="alignleft manage_stock">
 					<input type="checkbox" name="_manage_stock" value="1">
 					<span class="checkbox-title"><?php _e( 'Manage stock?', 'woocommerce' ); ?></span>
 				</label>
 				<br class="clear" />
 				<label class="stock_qty_field">
-					<span class="title"><?php _e( 'Stock Qty', 'woocommerce' ); ?></span>
+					<span class="title"><?php _e( 'Stock qty', 'woocommerce' ); ?></span>
 					<span class="input-text-wrap">
 						<input type="number" name="_stock" class="text stock" step="any" value="">
 					</span>
@@ -197,13 +194,8 @@ if ( ! defined( 'ABSPATH' ) ) {
 			<span class="input-text-wrap">
 				<select class="backorders" name="_backorders">
 				<?php
-					$options = array(
-						'no'     => __( 'Do not allow', 'woocommerce' ),
-						'notify' => __( 'Allow, but notify customer', 'woocommerce' ),
-						'yes'    => __( 'Allow', 'woocommerce' )
-					);
-					foreach ( $options as $key => $value ) {
-						echo '<option value="' . esc_attr( $key ) . '">'. $value .'</option>';
+					foreach ( wc_get_product_backorder_options() as $key => $value ) {
+						echo '<option value="' . esc_attr( $key ) . '">' . $value . '</option>';
 					}
 				?>
 				</select>
diff --git a/includes/admin/views/html-report-by-date.php b/includes/admin/views/html-report-by-date.php
index fb0216fce12..fc68eb33f47 100644
--- a/includes/admin/views/html-report-by-date.php
+++ b/includes/admin/views/html-report-by-date.php
@@ -11,7 +11,21 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 <div id="poststuff" class="woocommerce-reports-wide">
 	<div class="postbox">
-		<h3 class="stats_range">
+
+	<?php if ( 'custom' === $current_range && isset( $_GET['start_date'], $_GET['end_date'] ) ) : ?>
+		<h3 class="screen-reader-text"><?php
+			/* translators: 1: start date 2: end date */
+			printf(
+				esc_html__( 'From %1$s to %2$s', 'woocommerce' ),
+				esc_html( wc_clean( $_GET['start_date'] ) ),
+				esc_html( wc_clean( $_GET['end_date'] ) )
+			);
+		?></h3>
+	<?php else : ?>
+		<h3 class="screen-reader-text"><?php echo esc_html( $ranges[ $current_range ] ); ?></h3>
+	<?php endif; ?>
+
+		<div class="stats_range">
 			<?php $this->get_export_button(); ?>
 			<ul>
 				<?php
@@ -19,7 +33,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 						echo '<li class="' . ( $current_range == $range ? 'active' : '' ) . '"><a href="' . esc_url( remove_query_arg( array( 'start_date', 'end_date' ), add_query_arg( 'range', $range ) ) ) . '">' . $name . '</a></li>';
 					}
 				?>
-				<li class="custom <?php echo $current_range == 'custom' ? 'active' : ''; ?>">
+				<li class="custom <?php echo ( 'custom' === $current_range ) ? 'active' : ''; ?>">
 					<?php _e( 'Custom:', 'woocommerce' ); ?>
 					<form method="GET">
 						<div>
@@ -36,20 +50,23 @@ if ( ! defined( 'ABSPATH' ) ) {
 								}
 							?>
 							<input type="hidden" name="range" value="custom" />
-							<input type="text" size="9" placeholder="yyyy-mm-dd" value="<?php if ( ! empty( $_GET['start_date'] ) ) echo esc_attr( $_GET['start_date'] ); ?>" name="start_date" class="range_datepicker from" />
-							<input type="text" size="9" placeholder="yyyy-mm-dd" value="<?php if ( ! empty( $_GET['end_date'] ) ) echo esc_attr( $_GET['end_date'] ); ?>" name="end_date" class="range_datepicker to" />
+							<input type="text" size="11" placeholder="yyyy-mm-dd" value="<?php echo ( ! empty( $_GET['start_date'] ) ) ? esc_attr( $_GET['start_date'] ) : ''; ?>" name="start_date" class="range_datepicker from" />
+							<span>&ndash;</span>
+							<input type="text" size="11" placeholder="yyyy-mm-dd" value="<?php echo ( ! empty( $_GET['end_date'] ) ) ? esc_attr( $_GET['end_date'] ) : ''; ?>" name="end_date" class="range_datepicker to" />
 							<input type="submit" class="button" value="<?php esc_attr_e( 'Go', 'woocommerce' ); ?>" />
+							<?php wp_nonce_field( 'custom_range', 'wc_reports_nonce', false ); ?>
 						</div>
 					</form>
 				</li>
 			</ul>
-		</h3>
+		</div>
 		<?php if ( empty( $hide_sidebar ) ) : ?>
 			<div class="inside chart-with-sidebar">
 				<div class="chart-sidebar">
 					<?php if ( $legends = $this->get_chart_legend() ) : ?>
 						<ul class="chart-legend">
 							<?php foreach ( $legends as $legend ) : ?>
+								<?php // @codingStandardsIgnoreLine ?>
 								<li style="border-color: <?php echo $legend['color']; ?>" <?php if ( isset( $legend['highlight_series'] ) ) echo 'class="highlight_series ' . ( isset( $legend['placeholder'] ) ? 'tips' : '' ) . '" data-series="' . esc_attr( $legend['highlight_series'] ) . '"'; ?> data-tip="<?php echo isset( $legend['placeholder'] ) ? $legend['placeholder'] : ''; ?>">
 									<?php echo $legend['title']; ?>
 								</li>
diff --git a/includes/admin/wc-admin-functions.php b/includes/admin/wc-admin-functions.php
index d36d86a9c8a..7d026da55ff 100644
--- a/includes/admin/wc-admin-functions.php
+++ b/includes/admin/wc-admin-functions.php
@@ -23,6 +23,7 @@ function wc_get_screen_ids() {
 	$screen_ids   = array(
 		'toplevel_page_' . $wc_screen_id,
 		$wc_screen_id . '_page_wc-reports',
+		$wc_screen_id . '_page_wc-shipping',
 		$wc_screen_id . '_page_wc-settings',
 		$wc_screen_id . '_page_wc-status',
 		$wc_screen_id . '_page_wc-addons',
@@ -34,9 +35,8 @@ function wc_get_screen_ids() {
 		'shop_coupon',
 		'edit-product_cat',
 		'edit-product_tag',
-		'edit-product_shipping_class',
 		'profile',
-		'user-edit'
+		'user-edit',
 	);
 
 	foreach ( wc_get_order_types() as $type ) {
@@ -62,9 +62,7 @@ function wc_create_page( $slug, $option = '', $page_title = '', $page_content =
 
 	$option_value     = get_option( $option );
 
-	if ( $option_value > 0 ) {
-		$page_object = get_post( $option_value );
-
+	if ( $option_value > 0 && ( $page_object = get_post( $option_value ) ) ) {
 		if ( 'page' === $page_object->post_type && ! in_array( $page_object->post_status, array( 'pending', 'trash', 'future', 'auto-draft' ) ) ) {
 			// Valid page is already in place
 			return $page_object->ID;
@@ -113,7 +111,7 @@ function wc_create_page( $slug, $option = '', $page_title = '', $page_content =
 			'post_title'     => $page_title,
 			'post_content'   => $page_content,
 			'post_parent'    => $post_parent,
-			'comment_status' => 'closed'
+			'comment_status' => 'closed',
 		);
 		$page_id = wp_insert_post( $page_data );
 	}
@@ -134,8 +132,8 @@ function wc_create_page( $slug, $option = '', $page_title = '', $page_content =
  */
 function woocommerce_admin_fields( $options ) {
 
-	if ( ! class_exists( 'WC_Admin_Settings' ) ) {
-		include 'class-wc-admin-settings.php';
+	if ( ! class_exists( 'WC_Admin_Settings', false ) ) {
+		include( dirname( __FILE__ ) . '/class-wc-admin-settings.php' );
 	}
 
 	WC_Admin_Settings::output_fields( $options );
@@ -145,253 +143,160 @@ function woocommerce_admin_fields( $options ) {
  * Update all settings which are passed.
  *
  * @param array $options
+ * @param array $data
  */
-function woocommerce_update_options( $options ) {
+function woocommerce_update_options( $options, $data = null ) {
 
-	if ( ! class_exists( 'WC_Admin_Settings' ) ) {
-		include 'class-wc-admin-settings.php';
+	if ( ! class_exists( 'WC_Admin_Settings', false ) ) {
+		include( dirname( __FILE__ ) . '/class-wc-admin-settings.php' );
 	}
 
-	WC_Admin_Settings::save_fields( $options );
+	WC_Admin_Settings::save_fields( $options, $data );
 }
 
 /**
  * Get a setting from the settings API.
  *
  * @param mixed $option_name
+ * @param mixed $default
  * @return string
  */
 function woocommerce_settings_get_option( $option_name, $default = '' ) {
 
-	if ( ! class_exists( 'WC_Admin_Settings' ) ) {
-		include 'class-wc-admin-settings.php';
+	if ( ! class_exists( 'WC_Admin_Settings', false ) ) {
+		include( dirname( __FILE__ ) . '/class-wc-admin-settings.php' );
 	}
 
 	return WC_Admin_Settings::get_option( $option_name, $default );
 }
 
 /**
- * Save order items.
+ * Save order items. Uses the CRUD.
  *
  * @since 2.2
  * @param int $order_id Order ID
  * @param array $items Order items to save
  */
 function wc_save_order_items( $order_id, $items ) {
-	global $wpdb;
+	// Allow other plugins to check change in order items before they are saved
+	do_action( 'woocommerce_before_save_order_items', $order_id, $items );
 
-	// Order items + fees
-	$subtotal     = 0;
-	$total        = 0;
-	$subtotal_tax = 0;
-	$total_tax    = 0;
-	$taxes        = array( 'items' => array(), 'shipping' => array() );
+	$order = wc_get_order( $order_id );
 
+	// Line items and fees
 	if ( isset( $items['order_item_id'] ) ) {
-		$line_total = $line_subtotal = $line_tax = $line_subtotal_tax = array();
-
+		$data_keys = array(
+			'line_tax'             => array(),
+			'line_subtotal_tax'    => array(),
+			'order_item_name'      => null,
+			'order_item_qty'       => null,
+			'order_item_tax_class' => null,
+			'line_total'           => null,
+			'line_subtotal'        => null,
+		);
 		foreach ( $items['order_item_id'] as $item_id ) {
-
-			$item_id = absint( $item_id );
-
-			if ( isset( $items['order_item_name'][ $item_id ] ) ) {
-				$wpdb->update(
-					$wpdb->prefix . 'woocommerce_order_items',
-					array( 'order_item_name' => wc_clean( wp_unslash( $items['order_item_name'][ $item_id ] ) ) ),
-					array( 'order_item_id' => $item_id ),
-					array( '%s' ),
-					array( '%d' )
-				);
+			if ( ! $item = $order->get_item( absint( $item_id ) ) ) {
+				continue;
 			}
 
-			if ( isset( $items['order_item_qty'][ $item_id ] ) ) {
-				wc_update_order_item_meta( $item_id, '_qty', wc_stock_amount( $items['order_item_qty'][ $item_id ] ) );
+			$item_data = array();
+
+			foreach ( $data_keys as $key => $default ) {
+				$item_data[ $key ] = isset( $items[ $key ][ $item_id ] ) ? wc_clean( wp_unslash( $items[ $key ][ $item_id ] ) ) : $default;
 			}
 
-			if ( isset( $items['order_item_tax_class'][ $item_id ] ) ) {
-				wc_update_order_item_meta( $item_id, '_tax_class', wc_clean( $items['order_item_tax_class'][ $item_id ] ) );
+			if ( '0' === $item_data['order_item_qty'] ) {
+				$item->delete();
+				continue;
 			}
 
-			// Get values. Subtotals might not exist, in which case copy value from total field
-			$line_total[ $item_id ]        = isset( $items['line_total'][ $item_id ] ) ? $items['line_total'][ $item_id ] : 0;
-			$line_subtotal[ $item_id ]     = isset( $items['line_subtotal'][ $item_id ] ) ? $items['line_subtotal'][ $item_id ] : $line_total[ $item_id ];
-			$line_tax[ $item_id ]          = isset( $items['line_tax'][ $item_id ] ) ? $items['line_tax'][ $item_id ] : array();
-			$line_subtotal_tax[ $item_id ] = isset( $items['line_subtotal_tax'][ $item_id ] ) ? $items['line_subtotal_tax'][ $item_id ] : $line_tax[ $item_id ];
-
-			// Format taxes
-			$line_taxes          = array_map( 'wc_format_decimal', $line_tax[ $item_id ] );
-			$line_subtotal_taxes = array_map( 'wc_format_decimal', $line_subtotal_tax[ $item_id ] );
-
-			// Update values
-			wc_update_order_item_meta( $item_id, '_line_subtotal', wc_format_decimal( $line_subtotal[ $item_id ] ) );
-			wc_update_order_item_meta( $item_id, '_line_total', wc_format_decimal( $line_total[ $item_id ] ) );
-			wc_update_order_item_meta( $item_id, '_line_subtotal_tax', array_sum( $line_subtotal_taxes ) );
-			wc_update_order_item_meta( $item_id, '_line_tax', array_sum( $line_taxes ) );
-
-			// Save line tax data - Since 2.2
-			wc_update_order_item_meta( $item_id, '_line_tax_data', array( 'total' => $line_taxes, 'subtotal' => $line_subtotal_taxes ) );
-			$taxes['items'][] = $line_taxes;
-
-			// Total up
-			$subtotal     += wc_format_decimal( $line_subtotal[ $item_id ] );
-			$total        += wc_format_decimal( $line_total[ $item_id ] );
-			$subtotal_tax += array_sum( $line_subtotal_taxes );
-			$total_tax    += array_sum( $line_taxes );
-
-			// Clear meta cache
-			wp_cache_delete( $item_id, 'order_item_meta' );
-		}
-	}
-
-	// Save meta
-	$meta_keys   = isset( $items['meta_key'] ) ? $items['meta_key'] : array();
-	$meta_values = isset( $items['meta_value'] ) ? $items['meta_value'] : array();
-
-	foreach ( $meta_keys as $id => $meta_key ) {
-		$meta_value = ( empty( $meta_values[ $id ] ) && ! is_numeric( $meta_values[ $id ] ) ) ? '' : $meta_values[ $id ];
-
-		// Delele blank item meta entries
-		if ( $meta_key === '' && $meta_value === '' ) {
-			$wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->prefix}woocommerce_order_itemmeta WHERE meta_id = %d", $id ) );
-		} else {
-
-			$wpdb->update(
-				$wpdb->prefix . 'woocommerce_order_itemmeta',
-				array(
-					'meta_key'   => wp_unslash( $meta_key ),
-					'meta_value' => wp_unslash( $meta_value )
+			$item->set_props( array(
+				'name'         => $item_data['order_item_name'],
+				'quantity'     => $item_data['order_item_qty'],
+				'tax_class'    => $item_data['order_item_tax_class'],
+				'total'        => $item_data['line_total'],
+				'subtotal'     => $item_data['line_subtotal'],
+				'taxes'        => array(
+					'total'    => $item_data['line_tax'],
+					'subtotal' => $item_data['line_subtotal_tax'],
 				),
-				array( 'meta_id' => $id ),
-				array( '%s', '%s' ),
-				array( '%d' )
-			);
+			) );
+
+			if ( isset( $items['meta_key'][ $item_id ], $items['meta_value'][ $item_id ] ) ) {
+				foreach ( $items['meta_key'][ $item_id ] as $meta_id => $meta_key ) {
+					$meta_value = isset( $items['meta_value'][ $item_id ][ $meta_id ] ) ? wp_unslash( $items['meta_value'][ $item_id ][ $meta_id ] ) : '';
+
+					if ( '' === $meta_key && '' === $meta_value ) {
+						if ( ! strstr( $meta_id, 'new-' ) ) {
+							$item->delete_meta_data_by_mid( $meta_id );
+						}
+					} elseif ( strstr( $meta_id, 'new-' ) ) {
+						$item->add_meta_data( $meta_key, $meta_value, false );
+					} else {
+						$item->update_meta_data( $meta_key, $meta_value, $meta_id );
+					}
+				}
+			}
+
+			$item->save();
 		}
 	}
 
 	// Shipping Rows
-	$order_shipping = 0;
-
 	if ( isset( $items['shipping_method_id'] ) ) {
+		$data_keys = array(
+			'shipping_method'       => null,
+			'shipping_method_title' => null,
+			'shipping_cost'         => 0,
+			'shipping_taxes'        => array(),
+		);
 
 		foreach ( $items['shipping_method_id'] as $item_id ) {
-			$item_id      = absint( $item_id );
-			$method_id    = isset( $items['shipping_method'][ $item_id ] ) ? wc_clean( $items['shipping_method'][ $item_id ] ) : '';
-			$method_title = isset( $items['shipping_method_title'][ $item_id ] ) ? wc_clean( wp_unslash( $items['shipping_method_title'][ $item_id ] ) ) : '';
-			$cost         = isset( $items['shipping_cost'][ $item_id ] ) ? wc_format_decimal( $items['shipping_cost'][ $item_id ] ) : '';
-			$ship_taxes   = isset( $items['shipping_taxes'][ $item_id ] ) ? array_map( 'wc_format_decimal', $items['shipping_taxes'][ $item_id ] ) : array();
-
-			$wpdb->update(
-				$wpdb->prefix . 'woocommerce_order_items',
-				array( 'order_item_name' => $method_title ),
-				array( 'order_item_id' => $item_id ),
-				array( '%s' ),
-				array( '%d' )
-			);
-
-			wc_update_order_item_meta( $item_id, 'method_id', $method_id );
-			wc_update_order_item_meta( $item_id, 'cost', $cost );
-			wc_update_order_item_meta( $item_id, 'taxes', $ship_taxes );
-
-			$taxes['shipping'][] = $ship_taxes;
-
-			$order_shipping += $cost;
-		}
-	}
-
-	// Taxes
-	$order_taxes        = isset( $items['order_taxes'] ) ? $items['order_taxes'] : array();
-	$taxes_items        = array();
-	$taxes_shipping     = array();
-	$total_tax          = 0;
-	$total_shipping_tax = 0;
-
-	// Sum items taxes
-	foreach ( $taxes['items'] as $rates ) {
-
-		foreach ( $rates as $id => $value ) {
-
-			if ( isset( $taxes_items[ $id ] ) ) {
-				$taxes_items[ $id ] += $value;
-			} else {
-				$taxes_items[ $id ] = $value;
+			if ( ! $item = $order->get_item( absint( $item_id ) ) ) {
+				continue;
 			}
-		}
-	}
 
-	// Sum shipping taxes
-	foreach ( $taxes['shipping'] as $rates ) {
+			$item_data = array();
 
-		foreach ( $rates as $id => $value ) {
-
-			if ( isset( $taxes_shipping[ $id ] ) ) {
-				$taxes_shipping[ $id ] += $value;
-			} else {
-				$taxes_shipping[ $id ] = $value;
+			foreach ( $data_keys as $key => $default ) {
+				$item_data[ $key ] = isset( $items[ $key ][ $item_id ] ) ? wc_clean( wp_unslash( $items[ $key ][ $item_id ] ) ) : $default;
 			}
+
+			$item->set_props( array(
+				'method_id'    => $item_data['shipping_method'],
+				'method_title' => $item_data['shipping_method_title'],
+				'total'        => $item_data['shipping_cost'],
+				'taxes'        => array(
+					'total'    => $item_data['shipping_taxes'],
+				),
+			) );
+
+			if ( isset( $items['meta_key'][ $item_id ], $items['meta_value'][ $item_id ] ) ) {
+				foreach ( $items['meta_key'][ $item_id ] as $meta_id => $meta_key ) {
+					$meta_value = isset( $items['meta_value'][ $item_id ][ $meta_id ] ) ? wp_unslash( $items['meta_value'][ $item_id ][ $meta_id ] ) : '';
+
+					if ( '' === $meta_key && '' === $meta_value ) {
+						if ( ! strstr( $meta_id, 'new-' ) ) {
+							$item->delete_meta_data_by_mid( $meta_id );
+						}
+					} elseif ( strstr( $meta_id, 'new-' ) ) {
+						$item->add_meta_data( $meta_key, $meta_value, false );
+					} else {
+						$item->update_meta_data( $meta_key, $meta_value, $meta_id );
+					}
+				}
+			}
+
+			$item->save();
 		}
 	}
 
-	// Update order taxes
-	foreach ( $order_taxes as $item_id => $rate_id ) {
+	// Updates tax totals
+	$order->update_taxes();
 
-		if ( isset( $taxes_items[ $rate_id ] ) ) {
-			$_total = wc_format_decimal( $taxes_items[ $rate_id ] );
-			wc_update_order_item_meta( $item_id, 'tax_amount', $_total );
+	// Calc totals - this also triggers save
+	$order->calculate_totals( false );
 
-			$total_tax += $_total;
-		}
-
-		if ( isset( $taxes_shipping[ $rate_id ] ) ) {
-			$_total = wc_format_decimal( $taxes_shipping[ $rate_id ] );
-			wc_update_order_item_meta( $item_id, 'shipping_tax_amount', $_total );
-
-			$total_shipping_tax += $_total;
-		}
-	}
-
-	// Update order shipping total
-	update_post_meta( $order_id, '_order_shipping', $order_shipping );
-
-	// Update cart discount from item totals
-	update_post_meta( $order_id, '_cart_discount', $subtotal - $total );
-	update_post_meta( $order_id, '_cart_discount_tax', $subtotal_tax - $total_tax );
-
-	// Update totals
-	update_post_meta( $order_id, '_order_total', wc_format_decimal( $items['_order_total'] ) );
-
-	// Update tax
-	update_post_meta( $order_id, '_order_tax', wc_format_decimal( $total_tax ) );
-	update_post_meta( $order_id, '_order_shipping_tax', wc_format_decimal( $total_shipping_tax ) );
-
-	// Remove old values
-	delete_post_meta( $order_id, '_shipping_method' );
-	delete_post_meta( $order_id, '_shipping_method_title' );
-
-	// Set the currency
-	add_post_meta( $order_id, '_order_currency', get_woocommerce_currency(), true );
-
-	// Update version after saving
-	update_post_meta( $order_id, '_order_version', WC_VERSION );
-
-	// inform other plugins that the items have been saved
+	// Inform other plugins that the items have been saved
 	do_action( 'woocommerce_saved_order_items', $order_id, $items );
 }
-
-/**
- * Display a WooCommerce help tip.
- *
- * @since  2.5.0
- *
- * @param  string $tip        Help tip text
- * @param  bool   $allow_html Allow sanitized HTML if true or escape
- * @return string
- */
-function wc_help_tip( $tip, $allow_html = false ) {
-	if ( $allow_html ) {
-		$tip = wc_sanitize_tooltip( $tip );
-	} else {
-		$tip = esc_attr( $tip );
-	}
-
-	return '<span class="woocommerce-help-tip" data-tip="' . $tip . '"></span>';
-}
diff --git a/includes/admin/wc-meta-box-functions.php b/includes/admin/wc-meta-box-functions.php
index 8e69d38f13b..a429735979d 100644
--- a/includes/admin/wc-meta-box-functions.php
+++ b/includes/admin/wc-meta-box-functions.php
@@ -1,12 +1,12 @@
 <?php
 /**
-* WooCommerce Meta Box Functions
-*
-* @author      WooThemes
-* @category    Core
-* @package     WooCommerce/Admin/Functions
-* @version     2.3.0
-*/
+ * WooCommerce Meta Box Functions
+ *
+ * @author      WooThemes
+ * @category    Core
+ * @package     WooCommerce/Admin/Functions
+ * @version     2.3.0
+ */
 if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
@@ -27,6 +27,7 @@ function woocommerce_wp_text_input( $field ) {
 	$field['value']         = isset( $field['value'] ) ? $field['value'] : get_post_meta( $thepostid, $field['id'], true );
 	$field['name']          = isset( $field['name'] ) ? $field['name'] : $field['id'];
 	$field['type']          = isset( $field['type'] ) ? $field['type'] : 'text';
+	$field['desc_tip']      = isset( $field['desc_tip'] ) ? $field['desc_tip'] : false;
 	$data_type              = empty( $field['data_type'] ) ? '' : $field['data_type'];
 
 	switch ( $data_type ) {
@@ -56,21 +57,24 @@ function woocommerce_wp_text_input( $field ) {
 
 	if ( ! empty( $field['custom_attributes'] ) && is_array( $field['custom_attributes'] ) ) {
 
-		foreach ( $field['custom_attributes'] as $attribute => $value ){
+		foreach ( $field['custom_attributes'] as $attribute => $value ) {
 			$custom_attributes[] = esc_attr( $attribute ) . '="' . esc_attr( $value ) . '"';
 		}
 	}
 
-	echo '<p class="form-field ' . esc_attr( $field['id'] ) . '_field ' . esc_attr( $field['wrapper_class'] ) . '"><label for="' . esc_attr( $field['id'] ) . '">' . wp_kses_post( $field['label'] ) . '</label><input type="' . esc_attr( $field['type'] ) . '" class="' . esc_attr( $field['class'] ) . '" style="' . esc_attr( $field['style'] ) . '" name="' . esc_attr( $field['name'] ) . '" id="' . esc_attr( $field['id'] ) . '" value="' . esc_attr( $field['value'] ) . '" placeholder="' . esc_attr( $field['placeholder'] ) . '" ' . implode( ' ', $custom_attributes ) . ' /> ';
+	echo '<p class="form-field ' . esc_attr( $field['id'] ) . '_field ' . esc_attr( $field['wrapper_class'] ) . '">
+		<label for="' . esc_attr( $field['id'] ) . '">' . wp_kses_post( $field['label'] ) . '</label>';
 
-	if ( ! empty( $field['description'] ) ) {
-
-		if ( isset( $field['desc_tip'] ) && false !== $field['desc_tip'] ) {
-			echo wc_help_tip( $field['description'] );
-		} else {
-			echo '<span class="description">' . wp_kses_post( $field['description'] ) . '</span>';
-		}
+	if ( ! empty( $field['description'] ) && false !== $field['desc_tip'] ) {
+		echo wc_help_tip( $field['description'] );
 	}
+
+	echo '<input type="' . esc_attr( $field['type'] ) . '" class="' . esc_attr( $field['class'] ) . '" style="' . esc_attr( $field['style'] ) . '" name="' . esc_attr( $field['name'] ) . '" id="' . esc_attr( $field['id'] ) . '" value="' . esc_attr( $field['value'] ) . '" placeholder="' . esc_attr( $field['placeholder'] ) . '" ' . implode( ' ', $custom_attributes ) . ' /> ';
+
+	if ( ! empty( $field['description'] ) && false === $field['desc_tip'] ) {
+		echo '<span class="description">' . wp_kses_post( $field['description'] ) . '</span>';
+	}
+
 	echo '</p>';
 }
 
@@ -86,7 +90,7 @@ function woocommerce_wp_hidden_input( $field ) {
 	$field['value'] = isset( $field['value'] ) ? $field['value'] : get_post_meta( $thepostid, $field['id'], true );
 	$field['class'] = isset( $field['class'] ) ? $field['class'] : '';
 
-	echo '<input type="hidden" class="' . esc_attr( $field['class'] ) . '" name="' . esc_attr( $field['id'] ) . '" id="' . esc_attr( $field['id'] ) . '" value="' . esc_attr( $field['value'] ) .  '" /> ';
+	echo '<input type="hidden" class="' . esc_attr( $field['class'] ) . '" name="' . esc_attr( $field['id'] ) . '" id="' . esc_attr( $field['id'] ) . '" value="' . esc_attr( $field['value'] ) . '" /> ';
 }
 
 /**
@@ -103,27 +107,34 @@ function woocommerce_wp_textarea_input( $field ) {
 	$field['style']         = isset( $field['style'] ) ? $field['style'] : '';
 	$field['wrapper_class'] = isset( $field['wrapper_class'] ) ? $field['wrapper_class'] : '';
 	$field['value']         = isset( $field['value'] ) ? $field['value'] : get_post_meta( $thepostid, $field['id'], true );
+	$field['desc_tip']      = isset( $field['desc_tip'] ) ? $field['desc_tip'] : false;
+	$field['name']          = isset( $field['name'] ) ? $field['name'] : $field['id'];
+	$field['rows']          = isset( $field['rows'] ) ? $field['rows'] : 2;
+	$field['cols']          = isset( $field['cols'] ) ? $field['cols'] : 20;
 
 	// Custom attribute handling
 	$custom_attributes = array();
 
 	if ( ! empty( $field['custom_attributes'] ) && is_array( $field['custom_attributes'] ) ) {
 
-		foreach ( $field['custom_attributes'] as $attribute => $value ){
+		foreach ( $field['custom_attributes'] as $attribute => $value ) {
 			$custom_attributes[] = esc_attr( $attribute ) . '="' . esc_attr( $value ) . '"';
 		}
 	}
 
-	echo '<p class="form-field ' . esc_attr( $field['id'] ) . '_field ' . esc_attr( $field['wrapper_class'] ) . '"><label for="' . esc_attr( $field['id'] ) . '">' . wp_kses_post( $field['label'] ) . '</label><textarea class="' . esc_attr( $field['class'] ) . '" style="' . esc_attr( $field['style'] ) . '"  name="' . esc_attr( $field['id'] ) . '" id="' . esc_attr( $field['id'] ) . '" placeholder="' . esc_attr( $field['placeholder'] ) . '" rows="2" cols="20" ' . implode( ' ', $custom_attributes ) . '>' . esc_textarea( $field['value'] ) . '</textarea> ';
+	echo '<p class="form-field ' . esc_attr( $field['id'] ) . '_field ' . esc_attr( $field['wrapper_class'] ) . '">
+		<label for="' . esc_attr( $field['id'] ) . '">' . wp_kses_post( $field['label'] ) . '</label>';
 
-	if ( ! empty( $field['description'] ) ) {
-
-		if ( isset( $field['desc_tip'] ) && false !== $field['desc_tip'] ) {
-			echo wc_help_tip( $field['description'] );
-		} else {
-			echo '<span class="description">' . wp_kses_post( $field['description'] ) . '</span>';
-		}
+	if ( ! empty( $field['description'] ) && false !== $field['desc_tip'] ) {
+		echo wc_help_tip( $field['description'] );
 	}
+
+	echo '<textarea class="' . esc_attr( $field['class'] ) . '" style="' . esc_attr( $field['style'] ) . '"  name="' . esc_attr( $field['name'] ) . '" id="' . esc_attr( $field['id'] ) . '" placeholder="' . esc_attr( $field['placeholder'] ) . '" rows="' . esc_attr( $field['rows'] ) . '" cols="' . esc_attr( $field['cols'] ) . '" ' . implode( ' ', $custom_attributes ) . '>' . esc_textarea( $field['value'] ) . '</textarea> ';
+
+	if ( ! empty( $field['description'] ) && false === $field['desc_tip'] ) {
+		echo '<span class="description">' . wp_kses_post( $field['description'] ) . '</span>';
+	}
+
 	echo '</p>';
 }
 
@@ -142,26 +153,29 @@ function woocommerce_wp_checkbox( $field ) {
 	$field['value']         = isset( $field['value'] ) ? $field['value'] : get_post_meta( $thepostid, $field['id'], true );
 	$field['cbvalue']       = isset( $field['cbvalue'] ) ? $field['cbvalue'] : 'yes';
 	$field['name']          = isset( $field['name'] ) ? $field['name'] : $field['id'];
+	$field['desc_tip']      = isset( $field['desc_tip'] ) ? $field['desc_tip'] : false;
 
 	// Custom attribute handling
 	$custom_attributes = array();
 
 	if ( ! empty( $field['custom_attributes'] ) && is_array( $field['custom_attributes'] ) ) {
 
-		foreach ( $field['custom_attributes'] as $attribute => $value ){
+		foreach ( $field['custom_attributes'] as $attribute => $value ) {
 			$custom_attributes[] = esc_attr( $attribute ) . '="' . esc_attr( $value ) . '"';
 		}
 	}
 
-	echo '<p class="form-field ' . esc_attr( $field['id'] ) . '_field ' . esc_attr( $field['wrapper_class'] ) . '"><label for="' . esc_attr( $field['id'] ) . '">' . wp_kses_post( $field['label'] ) . '</label><input type="checkbox" class="' . esc_attr( $field['class'] ) . '" style="' . esc_attr( $field['style'] ) . '" name="' . esc_attr( $field['name'] ) . '" id="' . esc_attr( $field['id'] ) . '" value="' . esc_attr( $field['cbvalue'] ) . '" ' . checked( $field['value'], $field['cbvalue'], false ) . '  ' . implode( ' ', $custom_attributes ) . '/> ';
+	echo '<p class="form-field ' . esc_attr( $field['id'] ) . '_field ' . esc_attr( $field['wrapper_class'] ) . '">
+		<label for="' . esc_attr( $field['id'] ) . '">' . wp_kses_post( $field['label'] ) . '</label>';
 
-	if ( ! empty( $field['description'] ) ) {
+	if ( ! empty( $field['description'] ) && false !== $field['desc_tip'] ) {
+		echo wc_help_tip( $field['description'] );
+	}
 
-		if ( isset( $field['desc_tip'] ) && false !== $field['desc_tip'] ) {
-			echo wc_help_tip( $field['description'] );
-		} else {
-			echo '<span class="description">' . wp_kses_post( $field['description'] ) . '</span>';
-		}
+	echo '<input type="checkbox" class="' . esc_attr( $field['class'] ) . '" style="' . esc_attr( $field['style'] ) . '" name="' . esc_attr( $field['name'] ) . '" id="' . esc_attr( $field['id'] ) . '" value="' . esc_attr( $field['cbvalue'] ) . '" ' . checked( $field['value'], $field['cbvalue'], false ) . '  ' . implode( ' ', $custom_attributes ) . '/> ';
+
+	if ( ! empty( $field['description'] ) && false === $field['desc_tip'] ) {
+		echo '<span class="description">' . wp_kses_post( $field['description'] ) . '</span>';
 	}
 
 	echo '</p>';
@@ -181,18 +195,26 @@ function woocommerce_wp_select( $field ) {
 	$field['wrapper_class'] = isset( $field['wrapper_class'] ) ? $field['wrapper_class'] : '';
 	$field['value']         = isset( $field['value'] ) ? $field['value'] : get_post_meta( $thepostid, $field['id'], true );
 	$field['name']          = isset( $field['name'] ) ? $field['name'] : $field['id'];
+	$field['desc_tip']      = isset( $field['desc_tip'] ) ? $field['desc_tip'] : false;
 
 	// Custom attribute handling
 	$custom_attributes = array();
 
 	if ( ! empty( $field['custom_attributes'] ) && is_array( $field['custom_attributes'] ) ) {
 
-		foreach ( $field['custom_attributes'] as $attribute => $value ){
+		foreach ( $field['custom_attributes'] as $attribute => $value ) {
 			$custom_attributes[] = esc_attr( $attribute ) . '="' . esc_attr( $value ) . '"';
 		}
 	}
 
-	echo '<p class="form-field ' . esc_attr( $field['id'] ) . '_field ' . esc_attr( $field['wrapper_class'] ) . '"><label for="' . esc_attr( $field['id'] ) . '">' . wp_kses_post( $field['label'] ) . '</label><select id="' . esc_attr( $field['id'] ) . '" name="' . esc_attr( $field['name'] ) . '" class="' . esc_attr( $field['class'] ) . '" style="' . esc_attr( $field['style'] ) . '" ' . implode( ' ', $custom_attributes ) . '>';
+	echo '<p class="form-field ' . esc_attr( $field['id'] ) . '_field ' . esc_attr( $field['wrapper_class'] ) . '">
+		<label for="' . esc_attr( $field['id'] ) . '">' . wp_kses_post( $field['label'] ) . '</label>';
+
+	if ( ! empty( $field['description'] ) && false !== $field['desc_tip'] ) {
+		echo wc_help_tip( $field['description'] );
+	}
+
+	echo '<select id="' . esc_attr( $field['id'] ) . '" name="' . esc_attr( $field['name'] ) . '" class="' . esc_attr( $field['class'] ) . '" style="' . esc_attr( $field['style'] ) . '" ' . implode( ' ', $custom_attributes ) . '>';
 
 	foreach ( $field['options'] as $key => $value ) {
 		echo '<option value="' . esc_attr( $key ) . '" ' . selected( esc_attr( $field['value'] ), esc_attr( $key ), false ) . '>' . esc_html( $value ) . '</option>';
@@ -200,14 +222,10 @@ function woocommerce_wp_select( $field ) {
 
 	echo '</select> ';
 
-	if ( ! empty( $field['description'] ) ) {
-
-		if ( isset( $field['desc_tip'] ) && false !== $field['desc_tip'] ) {
-			echo wc_help_tip( $field['description'] );
-		} else {
-			echo '<span class="description">' . wp_kses_post( $field['description'] ) . '</span>';
-		}
+	if ( ! empty( $field['description'] ) && false === $field['desc_tip'] ) {
+		echo '<span class="description">' . wp_kses_post( $field['description'] ) . '</span>';
 	}
+
 	echo '</p>';
 }
 
@@ -225,8 +243,15 @@ function woocommerce_wp_radio( $field ) {
 	$field['wrapper_class'] = isset( $field['wrapper_class'] ) ? $field['wrapper_class'] : '';
 	$field['value']         = isset( $field['value'] ) ? $field['value'] : get_post_meta( $thepostid, $field['id'], true );
 	$field['name']          = isset( $field['name'] ) ? $field['name'] : $field['id'];
+	$field['desc_tip']      = isset( $field['desc_tip'] ) ? $field['desc_tip'] : false;
 
-	echo '<fieldset class="form-field ' . esc_attr( $field['id'] ) . '_field ' . esc_attr( $field['wrapper_class'] ) . '"><legend>' . wp_kses_post( $field['label'] ) . '</legend><ul class="wc-radios">';
+	echo '<fieldset class="form-field ' . esc_attr( $field['id'] ) . '_field ' . esc_attr( $field['wrapper_class'] ) . '"><legend>' . wp_kses_post( $field['label'] ) . '</legend>';
+
+	if ( ! empty( $field['description'] ) && false !== $field['desc_tip'] ) {
+		echo wc_help_tip( $field['description'] );
+	}
+
+	echo '<ul class="wc-radios">';
 
 	foreach ( $field['options'] as $key => $value ) {
 
@@ -242,13 +267,8 @@ function woocommerce_wp_radio( $field ) {
 	}
 	echo '</ul>';
 
-	if ( ! empty( $field['description'] ) ) {
-
-		if ( isset( $field['desc_tip'] ) && false !== $field['desc_tip'] ) {
-			echo wc_help_tip( $field['description'] );
-		} else {
-			echo '<span class="description">' . wp_kses_post( $field['description'] ) . '</span>';
-		}
+	if ( ! empty( $field['description'] ) && false === $field['desc_tip'] ) {
+		echo '<span class="description">' . wp_kses_post( $field['description'] ) . '</span>';
 	}
 
 	echo '</fieldset>';
diff --git a/includes/api/class-wc-rest-authentication.php b/includes/api/class-wc-rest-authentication.php
new file mode 100644
index 00000000000..bf871a35a8b
--- /dev/null
+++ b/includes/api/class-wc-rest-authentication.php
@@ -0,0 +1,549 @@
+<?php
+/**
+ * REST API Authentication
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+class WC_REST_Authentication {
+
+	/**
+	 * Initialize authentication actions.
+	 */
+	public function __construct() {
+		add_filter( 'determine_current_user', array( $this, 'authenticate' ), 15 );
+		add_filter( 'rest_authentication_errors', array( $this, 'check_authentication_error' ) );
+		add_filter( 'rest_post_dispatch', array( $this, 'send_unauthorized_headers' ), 50 );
+	}
+
+	/**
+	 * Check if is request to our REST API.
+	 *
+	 * @return bool
+	 */
+	protected function is_request_to_rest_api() {
+		if ( empty( $_SERVER['REQUEST_URI'] ) ) {
+			return false;
+		}
+
+		$rest_prefix = trailingslashit( rest_get_url_prefix() );
+
+		// Check if our endpoint.
+		$woocommerce = ( false !== strpos( $_SERVER['REQUEST_URI'], $rest_prefix . 'wc/' ) );
+
+		// Allow third party plugins use our authentication methods.
+		$third_party = ( false !== strpos( $_SERVER['REQUEST_URI'], $rest_prefix . 'wc-' ) );
+
+		return apply_filters( 'woocommerce_rest_is_request_to_rest_api', $woocommerce || $third_party );
+	}
+
+	/**
+	 * Authenticate user.
+	 *
+	 * @param int|false $user_id User ID if one has been determined, false otherwise.
+	 * @return int|false
+	 */
+	public function authenticate( $user_id ) {
+		// Do not authenticate twice and check if is a request to our endpoint in the WP REST API.
+		if ( ! empty( $user_id ) || ! $this->is_request_to_rest_api() ) {
+			return $user_id;
+		}
+
+		if ( is_ssl() ) {
+			return $this->perform_basic_authentication();
+		} else {
+			return $this->perform_oauth_authentication();
+		}
+	}
+
+	/**
+	 * Check for authentication error.
+	 *
+	 * @param WP_Error|null|bool $error
+	 * @return WP_Error|null|bool
+	 */
+	public function check_authentication_error( $error ) {
+		global $wc_rest_authentication_error;
+
+		// Passthrough other errors.
+		if ( ! empty( $error ) ) {
+			return $error;
+		}
+
+		return $wc_rest_authentication_error;
+	}
+
+	/**
+	 * Basic Authentication.
+	 *
+	 * SSL-encrypted requests are not subject to sniffing or man-in-the-middle
+	 * attacks, so the request can be authenticated by simply looking up the user
+	 * associated with the given consumer key and confirming the consumer secret
+	 * provided is valid.
+	 *
+	 * @return int|bool
+	 */
+	private function perform_basic_authentication() {
+		global $wc_rest_authentication_error;
+
+		$consumer_key    = '';
+		$consumer_secret = '';
+
+		// If the $_GET parameters are present, use those first.
+		if ( ! empty( $_GET['consumer_key'] ) && ! empty( $_GET['consumer_secret'] ) ) {
+			$consumer_key    = $_GET['consumer_key'];
+			$consumer_secret = $_GET['consumer_secret'];
+		}
+
+		// If the above is not present, we will do full basic auth.
+		if ( ! $consumer_key && ! empty( $_SERVER['PHP_AUTH_USER'] ) && ! empty( $_SERVER['PHP_AUTH_PW'] ) ) {
+			$consumer_key    = $_SERVER['PHP_AUTH_USER'];
+			$consumer_secret = $_SERVER['PHP_AUTH_PW'];
+		}
+
+		// Stop if don't have any key.
+		if ( ! $consumer_key || ! $consumer_secret ) {
+			return false;
+		}
+
+		// Get user data.
+		$user = $this->get_user_data_by_consumer_key( $consumer_key );
+		if ( empty( $user ) ) {
+			return false;
+		}
+
+		// Validate user secret.
+		if ( ! hash_equals( $user->consumer_secret, $consumer_secret ) ) {
+			$wc_rest_authentication_error = new WP_Error( 'woocommerce_rest_authentication_error', __( 'Consumer secret is invalid.', 'woocommerce' ), array( 'status' => 401 ) );
+
+			return false;
+		}
+
+		// Check API Key permissions.
+		if ( ! $this->check_permissions( $user->permissions ) ) {
+			return false;
+		}
+
+		// Update last access.
+		$this->update_last_access( $user->key_id );
+
+		return $user->user_id;
+	}
+
+	/**
+	 * Parse the Authorization header into parameters.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param string $header Authorization header value (not including "Authorization: " prefix).
+	 *
+	 * @return array Map of parameter values.
+	 */
+	public function parse_header( $header ) {
+		if ( 'OAuth ' !== substr( $header, 0, 6 ) ) {
+			return array();
+		}
+
+		// From OAuth PHP library, used under MIT license.
+		$params = array();
+		if ( preg_match_all( '/(oauth_[a-z_-]*)=(:?"([^"]*)"|([^,]*))/', $header, $matches ) ) {
+			foreach ( $matches[1] as $i => $h ) {
+				$params[ $h ] = urldecode( empty( $matches[3][ $i ] ) ? $matches[4][ $i ] : $matches[3][ $i ] );
+			}
+			if ( isset( $params['realm'] ) ) {
+				unset( $params['realm'] );
+			}
+		}
+
+		return $params;
+	}
+
+	/**
+	 * Get the authorization header.
+	 *
+	 * On certain systems and configurations, the Authorization header will be
+	 * stripped out by the server or PHP. Typically this is then used to
+	 * generate `PHP_AUTH_USER`/`PHP_AUTH_PASS` but not passed on. We use
+	 * `getallheaders` here to try and grab it out instead.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @return string Authorization header if set.
+	 */
+	public function get_authorization_header() {
+		if ( ! empty( $_SERVER['HTTP_AUTHORIZATION'] ) ) {
+			return wp_unslash( $_SERVER['HTTP_AUTHORIZATION'] );
+		}
+
+		if ( function_exists( 'getallheaders' ) ) {
+			$headers = getallheaders();
+			// Check for the authoization header case-insensitively.
+			foreach ( $headers as $key => $value ) {
+				if ( 'authorization' === strtolower( $key ) ) {
+					return $value;
+				}
+			}
+		}
+
+		return '';
+	}
+
+	/**
+	 * Get oAuth parameters from $_GET, $_POST or request header.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @return array|WP_Error
+	 */
+	public function get_oauth_parameters() {
+		global $wc_rest_authentication_error;
+
+		$params = array_merge( $_GET, $_POST );
+		$params = wp_unslash( $params );
+		$header = $this->get_authorization_header();
+
+		if ( ! empty( $header ) ) {
+			// Trim leading spaces.
+			$header = trim( $header );
+			$header_params = $this->parse_header( $header );
+
+			if ( ! empty( $header_params ) ) {
+				$params = array_merge( $params, $header_params );
+			}
+		}
+
+		$param_names = array(
+			'oauth_consumer_key',
+			'oauth_timestamp',
+			'oauth_nonce',
+			'oauth_signature',
+			'oauth_signature_method',
+		);
+
+		$errors   = array();
+		$have_one = false;
+
+		// Check for required OAuth parameters.
+		foreach ( $param_names as $param_name ) {
+			if ( empty( $params[ $param_name ] ) ) {
+				$errors[] = $param_name;
+			} else {
+				$have_one = true;
+			}
+		}
+
+		// All keys are missing, so we're probably not even trying to use OAuth.
+		if ( ! $have_one ) {
+			return array();
+		}
+
+		// If we have at least one supplied piece of data, and we have an error,
+		// then it's a failed authentication.
+		if ( ! empty( $errors ) ) {
+			$message = sprintf(
+				_n( 'Missing OAuth parameter %s', 'Missing OAuth parameters %s', count( $errors ), 'woocommerce' ),
+				implode( ', ', $errors )
+			);
+
+			$wc_rest_authentication_error = new WP_Error( 'woocommerce_rest_authentication_missing_parameter', $message, array( 'status' => 401 ) );
+
+			return array();
+		}
+
+		return $params;
+	}
+
+	/**
+	 * Perform OAuth 1.0a "one-legged" (http://oauthbible.com/#oauth-10a-one-legged) authentication for non-SSL requests.
+	 *
+	 * This is required so API credentials cannot be sniffed or intercepted when making API requests over plain HTTP.
+	 *
+	 * This follows the spec for simple OAuth 1.0a authentication (RFC 5849) as closely as possible, with two exceptions:
+	 *
+	 * 1) There is no token associated with request/responses, only consumer keys/secrets are used.
+	 *
+	 * 2) The OAuth parameters are included as part of the request query string instead of part of the Authorization header,
+	 *    This is because there is no cross-OS function within PHP to get the raw Authorization header.
+	 *
+	 * @link http://tools.ietf.org/html/rfc5849 for the full spec.
+	 *
+	 * @return int|bool
+	 */
+	private function perform_oauth_authentication() {
+		global $wc_rest_authentication_error;
+
+		$params = $this->get_oauth_parameters();
+		if ( empty( $params ) ) {
+			return false;
+		}
+
+		// Fetch WP user by consumer key.
+		$user = $this->get_user_data_by_consumer_key( $params['oauth_consumer_key'] );
+
+		if ( empty( $user ) ) {
+			$wc_rest_authentication_error = new WP_Error( 'woocommerce_rest_authentication_error', __( 'Consumer key is invalid.', 'woocommerce' ), array( 'status' => 401 ) );
+
+			return false;
+		}
+
+		// Perform OAuth validation.
+		$wc_rest_authentication_error = $this->check_oauth_signature( $user, $params );
+		if ( is_wp_error( $wc_rest_authentication_error ) ) {
+			return false;
+		}
+
+		$wc_rest_authentication_error = $this->check_oauth_timestamp_and_nonce( $user, $params['oauth_timestamp'], $params['oauth_nonce'] );
+		if ( is_wp_error( $wc_rest_authentication_error ) ) {
+			return false;
+		}
+
+		// Check API Key permissions.
+		if ( ! $this->check_permissions( $user->permissions ) ) {
+			return false;
+		}
+
+		// Update last access.
+		$this->update_last_access( $user->key_id );
+
+		return $user->user_id;
+	}
+
+	/**
+	 * Verify that the consumer-provided request signature matches our generated signature,
+	 * this ensures the consumer has a valid key/secret.
+	 *
+	 * @param stdClass $user
+	 * @param array $params The request parameters.
+	 * @return null|WP_Error
+	 */
+	private function check_oauth_signature( $user, $params ) {
+		$http_method  = strtoupper( $_SERVER['REQUEST_METHOD'] );
+		$request_path = parse_url( $_SERVER['REQUEST_URI'], PHP_URL_PATH );
+		$wp_base      = get_home_url( null, '/', 'relative' );
+		if ( substr( $request_path, 0, strlen( $wp_base ) ) === $wp_base ) {
+			$request_path = substr( $request_path, strlen( $wp_base ) );
+		}
+		$base_request_uri = rawurlencode( get_home_url( null, $request_path ) );
+
+		// Get the signature provided by the consumer and remove it from the parameters prior to checking the signature.
+		$consumer_signature = rawurldecode( str_replace( ' ', '+', $params['oauth_signature'] ) );
+		unset( $params['oauth_signature'] );
+
+		// Sort parameters.
+		if ( ! uksort( $params, 'strcmp' ) ) {
+			return new WP_Error( 'woocommerce_rest_authentication_error', __( 'Invalid signature - failed to sort parameters.', 'woocommerce' ), array( 'status' => 401 ) );
+		}
+
+		// Normalize parameter key/values.
+		$params           = $this->normalize_parameters( $params );
+		$query_parameters = array();
+		foreach ( $params as $param_key => $param_value ) {
+			if ( is_array( $param_value ) ) {
+				foreach ( $param_value as $param_key_inner => $param_value_inner ) {
+					$query_parameters[] = $param_key . '%255B' . $param_key_inner . '%255D%3D' . $param_value_inner;
+				}
+			} else {
+				$query_parameters[] = $param_key . '%3D' . $param_value; // Join with equals sign.
+			}
+		}
+		$query_string   = implode( '%26', $query_parameters ); // Join with ampersand.
+		$string_to_sign = $http_method . '&' . $base_request_uri . '&' . $query_string;
+
+		if ( 'HMAC-SHA1' !== $params['oauth_signature_method'] && 'HMAC-SHA256' !== $params['oauth_signature_method'] ) {
+			return new WP_Error( 'woocommerce_rest_authentication_error', __( 'Invalid signature - signature method is invalid.', 'woocommerce' ), array( 'status' => 401 ) );
+		}
+
+		$hash_algorithm = strtolower( str_replace( 'HMAC-', '', $params['oauth_signature_method'] ) );
+		$secret         = $user->consumer_secret . '&';
+		$signature      = base64_encode( hash_hmac( $hash_algorithm, $string_to_sign, $secret, true ) );
+
+		if ( ! hash_equals( $signature, $consumer_signature ) ) {
+			return new WP_Error( 'woocommerce_rest_authentication_error', __( 'Invalid signature - provided signature does not match.', 'woocommerce' ), array( 'status' => 401 ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Normalize each parameter by assuming each parameter may have already been
+	 * encoded, so attempt to decode, and then re-encode according to RFC 3986.
+	 *
+	 * Note both the key and value is normalized so a filter param like:
+	 *
+	 * 'filter[period]' => 'week'
+	 *
+	 * is encoded to:
+	 *
+	 * 'filter%5Bperiod%5D' => 'week'
+	 *
+	 * This conforms to the OAuth 1.0a spec which indicates the entire query string
+	 * should be URL encoded.
+	 *
+	 * @see rawurlencode()
+	 * @param array $parameters Un-normalized pararmeters.
+	 * @return array Normalized parameters.
+	 */
+	private function normalize_parameters( $parameters ) {
+		$keys       = wc_rest_urlencode_rfc3986( array_keys( $parameters ) );
+		$values     = wc_rest_urlencode_rfc3986( array_values( $parameters ) );
+		$parameters = array_combine( $keys, $values );
+
+		return $parameters;
+	}
+
+	/**
+	 * Verify that the timestamp and nonce provided with the request are valid. This prevents replay attacks where
+	 * an attacker could attempt to re-send an intercepted request at a later time.
+	 *
+	 * - A timestamp is valid if it is within 15 minutes of now.
+	 * - A nonce is valid if it has not been used within the last 15 minutes.
+	 *
+	 * @param stdClass $user
+	 * @param int $timestamp the unix timestamp for when the request was made
+	 * @param string $nonce a unique (for the given user) 32 alphanumeric string, consumer-generated
+	 * @return bool|WP_Error
+	 */
+	private function check_oauth_timestamp_and_nonce( $user, $timestamp, $nonce ) {
+		global $wpdb;
+
+		$valid_window = 15 * 60; // 15 minute window.
+
+		if ( ( $timestamp < time() - $valid_window ) || ( $timestamp > time() + $valid_window ) ) {
+			return new WP_Error( 'woocommerce_rest_authentication_error', __( 'Invalid timestamp.', 'woocommerce' ), array( 'status' => 401 ) );
+		}
+
+		$used_nonces = maybe_unserialize( $user->nonces );
+
+		if ( empty( $used_nonces ) ) {
+			$used_nonces = array();
+		}
+
+		if ( in_array( $nonce, $used_nonces ) ) {
+			return new WP_Error( 'woocommerce_rest_authentication_error', __( 'Invalid nonce - nonce has already been used.', 'woocommerce' ), array( 'status' => 401 ) );
+		}
+
+		$used_nonces[ $timestamp ] = $nonce;
+
+		// Remove expired nonces.
+		foreach ( $used_nonces as $nonce_timestamp => $nonce ) {
+			if ( $nonce_timestamp < ( time() - $valid_window ) ) {
+				unset( $used_nonces[ $nonce_timestamp ] );
+			}
+		}
+
+		$used_nonces = maybe_serialize( $used_nonces );
+
+		$wpdb->update(
+			$wpdb->prefix . 'woocommerce_api_keys',
+			array( 'nonces' => $used_nonces ),
+			array( 'key_id' => $user->key_id ),
+			array( '%s' ),
+			array( '%d' )
+		);
+
+		return true;
+	}
+
+	/**
+	 * Return the user data for the given consumer_key.
+	 *
+	 * @param string $consumer_key
+	 * @return array
+	 */
+	private function get_user_data_by_consumer_key( $consumer_key ) {
+		global $wpdb;
+
+		$consumer_key = wc_api_hash( sanitize_text_field( $consumer_key ) );
+		$user         = $wpdb->get_row( $wpdb->prepare( "
+			SELECT key_id, user_id, permissions, consumer_key, consumer_secret, nonces
+			FROM {$wpdb->prefix}woocommerce_api_keys
+			WHERE consumer_key = %s
+		", $consumer_key ) );
+
+		return $user;
+	}
+
+	/**
+	 * Check that the API keys provided have the proper key-specific permissions to either read or write API resources.
+	 *
+	 * @param string $permissions
+	 * @return bool
+	 */
+	private function check_permissions( $permissions ) {
+		global $wc_rest_authentication_error;
+
+		$valid = true;
+
+		if ( ! isset( $_SERVER['REQUEST_METHOD'] ) ) {
+			return false;
+		}
+
+		switch ( $_SERVER['REQUEST_METHOD'] ) {
+
+			case 'HEAD' :
+			case 'GET' :
+				if ( 'read' !== $permissions && 'read_write' !== $permissions ) {
+					$wc_rest_authentication_error = new WP_Error( 'woocommerce_rest_authentication_error', __( 'The API key provided does not have read permissions.', 'woocommerce' ), array( 'status' => 401 ) );
+					$valid = false;
+				}
+				break;
+
+			case 'POST' :
+			case 'PUT' :
+			case 'PATCH' :
+			case 'DELETE' :
+				if ( 'write' !== $permissions && 'read_write' !== $permissions ) {
+					$wc_rest_authentication_error = new WP_Error( 'woocommerce_rest_authentication_error', __( 'The API key provided does not have write permissions.', 'woocommerce' ), array( 'status' => 401 ) );
+					$valid = false;
+				}
+				break;
+		}
+
+		return $valid;
+	}
+
+	/**
+	 * Updated API Key last access datetime.
+	 *
+	 * @param int $key_id
+	 */
+	private function update_last_access( $key_id ) {
+		global $wpdb;
+
+		$wpdb->update(
+			$wpdb->prefix . 'woocommerce_api_keys',
+			array( 'last_access' => current_time( 'mysql' ) ),
+			array( 'key_id' => $key_id ),
+			array( '%s' ),
+			array( '%d' )
+		);
+	}
+
+	/**
+	 * If the consumer_key and consumer_secret $_GET parameters are NOT provided
+	 * and the Basic auth headers are either not present or the consumer secret does not match the consumer
+	 * key provided, then return the correct Basic headers and an error message.
+	 *
+	 * @param WP_REST_Response $response Current response being served.
+	 * @return WP_REST_Response
+	 */
+	public function send_unauthorized_headers( $response ) {
+		global $wc_rest_authentication_error;
+
+		if ( is_wp_error( $wc_rest_authentication_error ) && is_ssl() ) {
+			$auth_message = __( 'WooCommerce API. Use a consumer key in the username field and a consumer secret in the password field.', 'woocommerce' );
+			$response->header( 'WWW-Authenticate', 'Basic realm="' . $auth_message . '"', true );
+		}
+
+		return $response;
+	}
+}
+
+new WC_REST_Authentication();
diff --git a/includes/api/class-wc-rest-coupons-controller.php b/includes/api/class-wc-rest-coupons-controller.php
new file mode 100644
index 00000000000..796d0c02536
--- /dev/null
+++ b/includes/api/class-wc-rest-coupons-controller.php
@@ -0,0 +1,538 @@
+<?php
+/**
+ * REST API Coupons controller
+ *
+ * Handles requests to the /coupons endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Coupons controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_CRUD_Controller
+ */
+class WC_REST_Coupons_Controller extends WC_REST_Legacy_Coupons_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v2';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'coupons';
+
+	/**
+	 * Post type.
+	 *
+	 * @var string
+	 */
+	protected $post_type = 'shop_coupon';
+
+	/**
+	 * Register the routes for coupons.
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+				'args'                => $this->get_collection_params(),
+			),
+			array(
+				'methods'             => WP_REST_Server::CREATABLE,
+				'callback'            => array( $this, 'create_item' ),
+				'permission_callback' => array( $this, 'create_item_permissions_check' ),
+				'args'                => array_merge( $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ), array(
+					'code' => array(
+						'description' => __( 'Coupon code.', 'woocommerce' ),
+						'required'    => true,
+						'type'        => 'string',
+					),
+				) ),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
+			'args' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_item' ),
+				'permission_callback' => array( $this, 'get_item_permissions_check' ),
+				'args'                => array(
+					'context'         => $this->get_context_param( array( 'default' => 'view' ) ),
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'update_item' ),
+				'permission_callback' => array( $this, 'update_item_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			array(
+				'methods'             => WP_REST_Server::DELETABLE,
+				'callback'            => array( $this, 'delete_item' ),
+				'permission_callback' => array( $this, 'delete_item_permissions_check' ),
+				'args'                => array(
+					'force' => array(
+						'default'     => false,
+						'type'        => 'boolean',
+						'description' => __( 'Whether to bypass trash and force deletion.', 'woocommerce' ),
+					),
+				),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/batch', array(
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'batch_items' ),
+				'permission_callback' => array( $this, 'batch_items_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			'schema' => array( $this, 'get_public_batch_schema' ),
+		) );
+	}
+
+	/**
+	 * Get object.
+	 *
+	 * @since  3.0.0
+	 * @param  int $id Object ID.
+	 * @return WC_Data
+	 */
+	protected function get_object( $id ) {
+		return new WC_Coupon( $id );
+	}
+
+	/**
+	 * Get formatted item data.
+	 *
+	 * @since  3.0.0
+	 * @param  WC_Data $object WC_Data instance.
+	 * @return array
+	 */
+	protected function get_formatted_item_data( $object ) {
+		$data = $object->get_data();
+
+		$format_decimal = array( 'amount', 'minimum_amount', 'maximum_amount' );
+		$format_date    = array( 'date_created', 'date_modified', 'date_expires' );
+		$format_null    = array( 'usage_limit', 'usage_limit_per_user', 'limit_usage_to_x_items' );
+
+		// Format decimal values.
+		foreach ( $format_decimal as $key ) {
+			$data[ $key ] = wc_format_decimal( $data[ $key ], 2 );
+		}
+
+		// Format date values.
+		foreach ( $format_date as $key ) {
+			$datetime 	  			= $data[ $key ];
+			$data[ $key ] 			= wc_rest_prepare_date_response( $datetime, false );
+			$data[ $key . '_gmt' ] 	= wc_rest_prepare_date_response( $datetime );
+		}
+
+		// Format null values.
+		foreach ( $format_null as $key ) {
+			$data[ $key ] = $data[ $key ] ? $data[ $key ] : null;
+		}
+
+		return array(
+			'id'                          => $object->get_id(),
+			'code'                        => $data['code'],
+			'amount'                      => $data['amount'],
+			'date_created'                => $data['date_created'],
+			'date_created_gmt'            => $data['date_created_gmt'],
+			'date_modified'               => $data['date_modified'],
+			'date_modified_gmt'           => $data['date_modified_gmt'],
+			'discount_type'               => $data['discount_type'],
+			'description'                 => $data['description'],
+			'date_expires'                => $data['date_expires'],
+			'date_expires_gmt'            => $data['date_expires_gmt'],
+			'usage_count'                 => $data['usage_count'],
+			'individual_use'              => $data['individual_use'],
+			'product_ids'                 => $data['product_ids'],
+			'excluded_product_ids'        => $data['excluded_product_ids'],
+			'usage_limit'                 => $data['usage_limit'],
+			'usage_limit_per_user'        => $data['usage_limit_per_user'],
+			'limit_usage_to_x_items'      => $data['limit_usage_to_x_items'],
+			'free_shipping'               => $data['free_shipping'],
+			'product_categories'          => $data['product_categories'],
+			'excluded_product_categories' => $data['excluded_product_categories'],
+			'exclude_sale_items'          => $data['exclude_sale_items'],
+			'minimum_amount'              => $data['minimum_amount'],
+			'maximum_amount'              => $data['maximum_amount'],
+			'email_restrictions'          => $data['email_restrictions'],
+			'used_by'                     => $data['used_by'],
+			'meta_data'                   => $data['meta_data'],
+		);
+	}
+
+	/**
+	 * Prepare a single coupon output for response.
+	 *
+	 * @since  3.0.0
+	 * @param  WC_Data         $object  Object data.
+	 * @param  WP_REST_Request $request Request object.
+	 * @return WP_REST_Response
+	 */
+	public function prepare_object_for_response( $object, $request ) {
+		$data 	  = $this->get_formatted_item_data( $object );
+		$context  = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data     = $this->add_additional_fields_to_object( $data, $request );
+		$data     = $this->filter_response_by_context( $data, $context );
+		$response = rest_ensure_response( $data );
+		$response->add_links( $this->prepare_links( $object, $request ) );
+
+		/**
+		 * Filter the data for a response.
+		 *
+		 * The dynamic portion of the hook name, $this->post_type,
+		 * refers to object type being prepared for the response.
+		 *
+		 * @param WP_REST_Response $response The response object.
+		 * @param WC_Data          $object   Object data.
+		 * @param WP_REST_Request  $request  Request object.
+		 */
+		return apply_filters( "woocommerce_rest_prepare_{$this->post_type}_object", $response, $object, $request );
+	}
+
+	/**
+	 * Prepare objects query.
+	 *
+	 * @since  3.0.0
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return array
+	 */
+	protected function prepare_objects_query( $request ) {
+		$args = parent::prepare_objects_query( $request );
+
+		if ( ! empty( $request['code'] ) ) {
+			$id = wc_get_coupon_id_by_code( $request['code'] );
+			$args['post__in'] = array( $id );
+		}
+
+		// Get only ids.
+		$args['fields'] = 'ids';
+
+		return $args;
+	}
+
+	/**
+	 * Only reutrn writeable props from schema.
+	 *
+	 * @param  array $schema
+	 * @return bool
+	 */
+	protected function filter_writable_props( $schema ) {
+		return empty( $schema['readonly'] );
+	}
+
+	/**
+	 * Prepare a single coupon for create or update.
+	 *
+	 * @param  WP_REST_Request $request Request object.
+	 * @param  bool            $creating If is creating a new object.
+	 * @return WP_Error|WC_Data
+	 */
+	protected function prepare_object_for_database( $request, $creating = false ) {
+		$id        = isset( $request['id'] ) ? absint( $request['id'] ) : 0;
+		$coupon    = new WC_Coupon( $id );
+		$schema    = $this->get_item_schema();
+		$data_keys = array_keys( array_filter( $schema['properties'], array( $this, 'filter_writable_props' ) ) );
+
+		// Validate required POST fields.
+		if ( $creating && empty( $request['code'] ) ) {
+			return new WP_Error( 'woocommerce_rest_empty_coupon_code', sprintf( __( 'The coupon code cannot be empty.', 'woocommerce' ), 'code' ), array( 'status' => 400 ) );
+		}
+
+		// Handle all writable props.
+		foreach ( $data_keys as $key ) {
+			$value = $request[ $key ];
+
+			if ( ! is_null( $value ) ) {
+				switch ( $key ) {
+					case 'code' :
+						$coupon_code  = wc_format_coupon_code( $value );
+						$id           = $coupon->get_id() ? $coupon->get_id() : 0;
+						$id_from_code = wc_get_coupon_id_by_code( $coupon_code, $id );
+
+						if ( $id_from_code ) {
+							return new WP_Error( 'woocommerce_rest_coupon_code_already_exists', __( 'The coupon code already exists', 'woocommerce' ), array( 'status' => 400 ) );
+						}
+
+						$coupon->set_code( $coupon_code );
+						break;
+					case 'meta_data' :
+						if ( is_array( $value ) ) {
+							foreach ( $value as $meta ) {
+								$coupon->update_meta_data( $meta['key'], $meta['value'], isset( $meta['id'] ) ? $meta['id'] : '' );
+							}
+						}
+						break;
+					case 'description' :
+						$coupon->set_description( wp_filter_post_kses( $value ) );
+						break;
+					default :
+						if ( is_callable( array( $coupon, "set_{$key}" ) ) ) {
+							$coupon->{"set_{$key}"}( $value );
+						}
+						break;
+				}
+			}
+		}
+
+		/**
+		 * Filters an object before it is inserted via the REST API.
+		 *
+		 * The dynamic portion of the hook name, `$this->post_type`,
+		 * refers to the object type slug.
+		 *
+		 * @param WC_Data         $coupon   Object object.
+		 * @param WP_REST_Request $request  Request object.
+		 * @param bool            $creating If is creating a new object.
+		 */
+		return apply_filters( "woocommerce_rest_pre_insert_{$this->post_type}_object", $coupon, $request, $creating );
+	}
+
+	/**
+	 * Get the Coupon's schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => $this->post_type,
+			'type'       => 'object',
+			'properties' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the object.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'code' => array(
+					'description' => __( 'Coupon code.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'amount' => array(
+					'description' => __( 'The amount of discount. Should always be numeric, even if setting a percentage.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'date_created' => array(
+					'description' => __( "The date the coupon was created, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_created_gmt' => array(
+					'description' => __( 'The date the coupon was created, as GMT.', 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_modified' => array(
+					'description' => __( "The date the coupon was last modified, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_modified_gmt' => array(
+					'description' => __( 'The date the coupon was last modified, as GMT.', 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'discount_type' => array(
+					'description' => __( 'Determines the type of discount that will be applied.', 'woocommerce' ),
+					'type'        => 'string',
+					'default'     => 'fixed_cart',
+					'enum'        => array_keys( wc_get_coupon_types() ),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'description' => array(
+					'description' => __( 'Coupon description.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'date_expires' => array(
+					'description' => __( "The date the coupon expires, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'date_expires_gmt' => array(
+					'description' => __( "The date the coupon expires, as GMT.", 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'usage_count' => array(
+					'description' => __( 'Number of times the coupon has been used already.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'individual_use' => array(
+					'description' => __( 'If true, the coupon can only be used individually. Other applied coupons will be removed from the cart.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => false,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'product_ids' => array(
+					'description' => __( "List of product IDs the coupon can be used on.", 'woocommerce' ),
+					'type'        => 'array',
+					'items'       => array(
+						'type'    => 'integer',
+					),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'excluded_product_ids' => array(
+					'description' => __( "List of product IDs the coupon cannot be used on.", 'woocommerce' ),
+					'type'        => 'array',
+					'items'       => array(
+						'type'    => 'integer',
+					),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'usage_limit' => array(
+					'description' => __( 'How many times the coupon can be used in total.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'usage_limit_per_user' => array(
+					'description' => __( 'How many times the coupon can be used per customer.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'limit_usage_to_x_items' => array(
+					'description' => __( 'Max number of items in the cart the coupon can be applied to.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'free_shipping' => array(
+					'description' => __( 'If true and if the free shipping method requires a coupon, this coupon will enable free shipping.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => false,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'product_categories' => array(
+					'description' => __( "List of category IDs the coupon applies to.", 'woocommerce' ),
+					'type'        => 'array',
+					'items'       => array(
+						'type'    => 'integer',
+					),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'excluded_product_categories' => array(
+					'description' => __( "List of category IDs the coupon does not apply to.", 'woocommerce' ),
+					'type'        => 'array',
+					'items'       => array(
+						'type'    => 'integer',
+					),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'exclude_sale_items' => array(
+					'description' => __( 'If true, this coupon will not be applied to items that have sale prices.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => false,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'minimum_amount' => array(
+					'description' => __( 'Minimum order amount that needs to be in the cart before coupon applies.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'maximum_amount' => array(
+					'description' => __( 'Maximum order amount allowed when using the coupon.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'email_restrictions' => array(
+					'description' => __( 'List of email addresses that can use this coupon.', 'woocommerce' ),
+					'type'        => 'array',
+					'items'       => array(
+						'type'    => 'string',
+					),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'used_by' => array(
+					'description' => __( 'List of user IDs (or guest email addresses) that have used the coupon.', 'woocommerce' ),
+					'type'        => 'array',
+					'items'       => array(
+						'type'    => 'integer',
+					),
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'meta_data' => array(
+					'description' => __( 'Meta data.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Meta ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'key' => array(
+								'description' => __( 'Meta key.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'value' => array(
+								'description' => __( 'Meta value.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+						),
+					),
+				),
+			),
+		);
+		return $this->add_additional_fields_schema( $schema );
+	}
+
+	/**
+	 * Get the query params for collections of attachments.
+	 *
+	 * @return array
+	 */
+	public function get_collection_params() {
+		$params = parent::get_collection_params();
+
+		$params['code'] = array(
+			'description'       => __( 'Limit result set to resources with a specific code.', 'woocommerce' ),
+			'type'              => 'string',
+			'sanitize_callback' => 'sanitize_text_field',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+
+		return $params;
+	}
+}
diff --git a/includes/api/class-wc-rest-customer-downloads-controller.php b/includes/api/class-wc-rest-customer-downloads-controller.php
new file mode 100644
index 00000000000..9b39be99ea3
--- /dev/null
+++ b/includes/api/class-wc-rest-customer-downloads-controller.php
@@ -0,0 +1,169 @@
+<?php
+/**
+ * REST API Customer Downloads controller
+ *
+ * Handles requests to the /customers/<customer_id>/downloads endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Customers controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Customer_Downloads_V1_Controller
+ */
+class WC_REST_Customer_Downloads_Controller extends WC_REST_Customer_Downloads_V1_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v2';
+
+	/**
+	 * Prepare a single download output for response.
+	 *
+	 * @param stdClass $download Download object.
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response $response Response data.
+	 */
+	public function prepare_item_for_response( $download, $request ) {
+		$data = array(
+			'download_id'         => $download->download_id,
+			'download_url'        => $download->download_url,
+			'product_id'          => $download->product_id,
+			'product_name'        => $download->product_name,
+			'download_name'       => $download->download_name,
+			'order_id'            => $download->order_id,
+			'order_key'           => $download->order_key,
+			'downloads_remaining' => '' === $download->downloads_remaining ? 'unlimited' : $download->downloads_remaining,
+			'access_expires'      => $download->access_expires ? wc_rest_prepare_date_response( $download->access_expires ) : 'never',
+			'access_expires_gmt'  => $download->access_expires ? wc_rest_prepare_date_response( get_gmt_from_date( $download->access_expires ) ) : 'never',
+			'file'                => $download->file,
+		);
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		// Wrap the data in a response object.
+		$response = rest_ensure_response( $data );
+
+		$response->add_links( $this->prepare_links( $download, $request ) );
+
+		/**
+		 * Filter customer download data returned from the REST API.
+		 *
+		 * @param WP_REST_Response $response  The response object.
+		 * @param stdClass         $download  Download object used to create response.
+		 * @param WP_REST_Request  $request   Request object.
+		 */
+		return apply_filters( 'woocommerce_rest_prepare_customer_download', $response, $download, $request );
+	}
+
+	/**
+	 * Get the Customer Download's schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'customer_download',
+			'type'       => 'object',
+			'properties' => array(
+				'download_id' => array(
+					'description' => __( 'Download ID (MD5).', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'download_url' => array(
+					'description' => __( 'Download file URL.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'product_id' => array(
+					'description' => __( 'Downloadable product ID.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'product_name' => array(
+					'description' => __( 'Product name.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'download_name' => array(
+					'description' => __( 'Downloadable file name.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'order_id' => array(
+					'description' => __( 'Order ID.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'order_key' => array(
+					'description' => __( 'Order key.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'downloads_remaining' => array(
+					'description' => __( 'Number of downloads remaining.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'access_expires' => array(
+					'description' => __( "The date when download access expires, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'access_expires_gmt' => array(
+					'description' => __( "The date when download access expires, as GMT.", 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'file' => array(
+					'description' => __( 'File details.', 'woocommerce' ),
+					'type'        => 'object',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+					'properties' => array(
+						'name' => array(
+							'description' => __( 'File name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'file' => array(
+							'description' => __( 'File URL.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+					),
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+}
diff --git a/includes/api/class-wc-rest-customers-controller.php b/includes/api/class-wc-rest-customers-controller.php
new file mode 100644
index 00000000000..09bae50aaa6
--- /dev/null
+++ b/includes/api/class-wc-rest-customers-controller.php
@@ -0,0 +1,368 @@
+<?php
+/**
+ * REST API Customers controller
+ *
+ * Handles requests to the /customers endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Customers controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Customers_V1_Controller
+ */
+class WC_REST_Customers_Controller extends WC_REST_Customers_V1_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v2';
+
+	/**
+	 * Get formatted item data.
+	 *
+	 * @since  3.0.0
+	 * @param  WC_Data $object WC_Data instance.
+	 * @return array
+	 */
+	protected function get_formatted_item_data( $object ) {
+		$data        = $object->get_data();
+		$format_date = array( 'date_created', 'date_modified' );
+
+		// Format date values.
+		foreach ( $format_date as $key ) {
+			$datetime              = $data[ $key ];
+			$data[ $key ]          = wc_rest_prepare_date_response( $datetime, false );
+			$data[ $key . '_gmt' ] = wc_rest_prepare_date_response( $datetime );
+		}
+
+		return array(
+			'id'                 => $object->get_id(),
+			'date_created'       => $data['date_created'],
+			'date_created_gmt'   => $data['date_created_gmt'],
+			'date_modified'      => $data['date_modified'],
+			'date_modified_gmt'  => $data['date_modified_gmt'],
+			'email'              => $data['email'],
+			'first_name'         => $data['first_name'],
+			'last_name'          => $data['last_name'],
+			'role'               => $data['role'],
+			'username'           => $data['username'],
+			'billing'            => $data['billing'],
+			'shipping'           => $data['shipping'],
+			'is_paying_customer' => $data['is_paying_customer'],
+			'orders_count'       => $object->get_order_count(),
+			'total_spent'        => $object->get_total_spent(),
+			'avatar_url'         => $object->get_avatar_url(),
+			'meta_data'          => $data['meta_data'],
+		);
+	}
+
+	/**
+	 * Prepare a single customer output for response.
+	 *
+	 * @param  WP_User          $user_data User object.
+	 * @param  WP_REST_Request  $request   Request object.
+	 * @return WP_REST_Response $response  Response data.
+	 */
+	public function prepare_item_for_response( $user_data, $request ) {
+		$customer    = new WC_Customer( $user_data->ID );
+		$data        = $this->get_formatted_item_data( $customer );
+		$context     = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data        = $this->add_additional_fields_to_object( $data, $request );
+		$data        = $this->filter_response_by_context( $data, $context );
+		$response    = rest_ensure_response( $data );
+		$response->add_links( $this->prepare_links( $user_data ) );
+
+		/**
+		 * Filter customer data returned from the REST API.
+		 *
+		 * @param WP_REST_Response $response   The response object.
+		 * @param WP_User          $user_data  User object used to create response.
+		 * @param WP_REST_Request  $request    Request object.
+		 */
+		return apply_filters( 'woocommerce_rest_prepare_customer', $response, $user_data, $request );
+	}
+
+	/**
+	 * Update customer meta fields.
+	 *
+	 * @param WC_Customer $customer
+	 * @param WP_REST_Request $request
+	 */
+	protected function update_customer_meta_fields( $customer, $request ) {
+		parent::update_customer_meta_fields( $customer, $request );
+
+		// Meta data.
+		if ( isset( $request['meta_data'] ) ) {
+			if ( is_array( $request['meta_data'] ) ) {
+				foreach ( $request['meta_data'] as $meta ) {
+					$customer->update_meta_data( $meta['key'], $meta['value'], isset( $meta['id'] ) ? $meta['id'] : '' );
+				}
+			}
+		}
+	}
+
+	/**
+	 * Get the Customer's schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'customer',
+			'type'       => 'object',
+			'properties' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_created' => array(
+					'description' => __( "The date the customer was created, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_created_gmt' => array(
+					'description' => __( 'The date the order was created, as GMT.', 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_modified' => array(
+					'description' => __( "The date the customer was last modified, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_modified_gmt' => array(
+					'description' => __( 'The date the customer was last modified, as GMT.', 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'email' => array(
+					'description' => __( 'The email address for the customer.', 'woocommerce' ),
+					'type'        => 'string',
+					'format'      => 'email',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'first_name' => array(
+					'description' => __( 'Customer first name.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'arg_options' => array(
+						'sanitize_callback' => 'sanitize_text_field',
+					),
+				),
+				'last_name' => array(
+					'description' => __( 'Customer last name.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'arg_options' => array(
+						'sanitize_callback' => 'sanitize_text_field',
+					),
+				),
+				'role' => array(
+					'description' => __( 'Customer role.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'username' => array(
+					'description' => __( 'Customer login name.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'arg_options' => array(
+						'sanitize_callback' => 'sanitize_user',
+					),
+				),
+				'password' => array(
+					'description' => __( 'Customer password.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'edit' ),
+				),
+				'billing' => array(
+					'description' => __( 'List of billing address data.', 'woocommerce' ),
+					'type'        => 'object',
+					'context'     => array( 'view', 'edit' ),
+					'properties' => array(
+						'first_name' => array(
+							'description' => __( 'First name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'last_name' => array(
+							'description' => __( 'Last name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'company' => array(
+							'description' => __( 'Company name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'address_1' => array(
+							'description' => __( 'Address line 1', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'address_2' => array(
+							'description' => __( 'Address line 2', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'city' => array(
+							'description' => __( 'City name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'state' => array(
+							'description' => __( 'ISO code or name of the state, province or district.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'postcode' => array(
+							'description' => __( 'Postal code.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'country' => array(
+							'description' => __( 'ISO code of the country.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'email' => array(
+							'description' => __( 'Email address.', 'woocommerce' ),
+							'type'        => 'string',
+							'format'      => 'email',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'phone' => array(
+							'description' => __( 'Phone number.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+					),
+				),
+				'shipping' => array(
+					'description' => __( 'List of shipping address data.', 'woocommerce' ),
+					'type'        => 'object',
+					'context'     => array( 'view', 'edit' ),
+					'properties' => array(
+						'first_name' => array(
+							'description' => __( 'First name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'last_name' => array(
+							'description' => __( 'Last name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'company' => array(
+							'description' => __( 'Company name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'address_1' => array(
+							'description' => __( 'Address line 1', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'address_2' => array(
+							'description' => __( 'Address line 2', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'city' => array(
+							'description' => __( 'City name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'state' => array(
+							'description' => __( 'ISO code or name of the state, province or district.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'postcode' => array(
+							'description' => __( 'Postal code.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'country' => array(
+							'description' => __( 'ISO code of the country.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+					),
+				),
+				'is_paying_customer' => array(
+					'description' => __( 'Is the customer a paying customer?', 'woocommerce' ),
+					'type'        => 'bool',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'orders_count' => array(
+					'description' => __( 'Quantity of orders made by the customer.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'total_spent' => array(
+					'description' => __( 'Total amount spent.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'avatar_url' => array(
+					'description' => __( 'Avatar URL.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'meta_data' => array(
+					'description' => __( 'Meta data.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Meta ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'key' => array(
+								'description' => __( 'Meta key.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'value' => array(
+								'description' => __( 'Meta value.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+						),
+					),
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+}
diff --git a/includes/api/class-wc-rest-exception.php b/includes/api/class-wc-rest-exception.php
new file mode 100644
index 00000000000..4d575a225de
--- /dev/null
+++ b/includes/api/class-wc-rest-exception.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * WooCommerce REST Exception Class
+ *
+ * Extends Exception to provide additional data.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC_REST_Exception class.
+ */
+class WC_REST_Exception extends WC_Data_Exception {}
diff --git a/includes/api/class-wc-rest-order-notes-controller.php b/includes/api/class-wc-rest-order-notes-controller.php
new file mode 100644
index 00000000000..62085fd71a8
--- /dev/null
+++ b/includes/api/class-wc-rest-order-notes-controller.php
@@ -0,0 +1,185 @@
+<?php
+/**
+ * REST API Order Notes controller
+ *
+ * Handles requests to the /orders/<order_id>/notes endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Order Notes controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_ControllerWC_REST_Order_Notes_V1_Controller
+ */
+class WC_REST_Order_Notes_Controller extends WC_REST_Order_Notes_V1_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v2';
+
+	/**
+	 * Get order notes from an order.
+	 *
+	 * @param WP_REST_Request $request
+	 * @return array
+	 */
+	public function get_items( $request ) {
+		$order = wc_get_order( (int) $request['order_id'] );
+
+		if ( ! $order || $this->post_type !== $order->get_type() ) {
+			return new WP_Error( "woocommerce_rest_{$this->post_type}_invalid_id", __( 'Invalid order ID.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$args = array(
+			'post_id' => $order->get_id(),
+			'approve' => 'approve',
+			'type'    => 'order_note',
+		);
+
+		// Allow filter by order note type.
+		if ( 'customer' === $request['type'] ) {
+			$args['meta_query'] = array(
+				array(
+					'key'     => 'is_customer_note',
+					'value'   => 1,
+					'compare' => '=',
+				),
+			);
+		} elseif ( 'internal' === $request['type'] ) {
+			$args['meta_query'] = array(
+				array(
+					'key'     => 'is_customer_note',
+					'compare' => 'NOT EXISTS',
+				),
+			);
+		}
+
+		remove_filter( 'comments_clauses', array( 'WC_Comments', 'exclude_order_comments' ), 10, 1 );
+
+		$notes = get_comments( $args );
+
+		add_filter( 'comments_clauses', array( 'WC_Comments', 'exclude_order_comments' ), 10, 1 );
+
+		$data = array();
+		foreach ( $notes as $note ) {
+			$order_note = $this->prepare_item_for_response( $note, $request );
+			$order_note = $this->prepare_response_for_collection( $order_note );
+			$data[]     = $order_note;
+		}
+
+		return rest_ensure_response( $data );
+	}
+
+	/**
+	 * Prepare a single order note output for response.
+	 *
+	 * @param WP_Comment $note Order note object.
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response $response Response data.
+	 */
+	public function prepare_item_for_response( $note, $request ) {
+		$data = array(
+			'id'               => (int) $note->comment_ID,
+			'date_created'     => wc_rest_prepare_date_response( $note->comment_date ),
+			'date_created_gmt' => wc_rest_prepare_date_response( $note->comment_date_gmt ),
+			'note'             => $note->comment_content,
+			'customer_note'    => (bool) get_comment_meta( $note->comment_ID, 'is_customer_note', true ),
+		);
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		// Wrap the data in a response object.
+		$response = rest_ensure_response( $data );
+
+		$response->add_links( $this->prepare_links( $note ) );
+
+		/**
+		 * Filter order note object returned from the REST API.
+		 *
+		 * @param WP_REST_Response $response The response object.
+		 * @param WP_Comment       $note     Order note object used to create response.
+		 * @param WP_REST_Request  $request  Request object.
+		 */
+		return apply_filters( 'woocommerce_rest_prepare_order_note', $response, $note, $request );
+	}
+
+	/**
+	 * Get the Order Notes schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'order_note',
+			'type'       => 'object',
+			'properties' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_created' => array(
+					'description' => __( "The date the order note was created, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_created_gmt' => array(
+					'description' => __( "The date the order note was created, as GMT.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'note' => array(
+					'description' => __( 'Order note content.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'customer_note' => array(
+					'description' => __( 'If true, the note will be shown to customers and they will be notified. If false, the note will be for admin reference only.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => false,
+					'context'     => array( 'view', 'edit' ),
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+
+	/**
+	 * Get the query params for collections.
+	 *
+	 * @return array
+	 */
+	public function get_collection_params() {
+		$params            = array();
+		$params['context'] = $this->get_context_param( array( 'default' => 'view' ) );
+		$params['type']    = array(
+			'default'           => 'any',
+			'description'       => __( 'Limit result to customers or internal notes.', 'woocommerce' ),
+			'type'              => 'string',
+			'enum'              => array( 'any', 'customer', 'internal' ),
+			'sanitize_callback' => 'sanitize_key',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+
+		return $params;
+	}
+}
diff --git a/includes/api/class-wc-rest-order-refunds-controller.php b/includes/api/class-wc-rest-order-refunds-controller.php
new file mode 100644
index 00000000000..eb1aacea895
--- /dev/null
+++ b/includes/api/class-wc-rest-order-refunds-controller.php
@@ -0,0 +1,551 @@
+<?php
+/**
+ * REST API Order Refunds controller
+ *
+ * Handles requests to the /orders/<order_id>/refunds endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Order Refunds controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Orders_Controller
+ */
+class WC_REST_Order_Refunds_Controller extends WC_REST_Orders_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v2';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'orders/(?P<order_id>[\d]+)/refunds';
+
+	/**
+	 * Post type.
+	 *
+	 * @var string
+	 */
+	protected $post_type = 'shop_order_refund';
+
+	/**
+	 * Stores the request.
+	 * @var array
+	 */
+	protected $request = array();
+
+	/**
+	 * Order refunds actions.
+	 */
+	public function __construct() {
+		add_filter( "woocommerce_rest_{$this->post_type}_object_trashable", '__return_false' );
+	}
+
+	/**
+	 * Register the routes for order refunds.
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
+			'args' => array(
+				'order_id'  => array(
+					'description' => __( 'The order ID.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+				'args'                => $this->get_collection_params(),
+			),
+			array(
+				'methods'             => WP_REST_Server::CREATABLE,
+				'callback'            => array( $this, 'create_item' ),
+				'permission_callback' => array( $this, 'create_item_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
+			'args' => array(
+				'order_id'  => array(
+					'description' => __( 'The order ID.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_item' ),
+				'permission_callback' => array( $this, 'get_item_permissions_check' ),
+				'args'                => array(
+					'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::DELETABLE,
+				'callback'            => array( $this, 'delete_item' ),
+				'permission_callback' => array( $this, 'delete_item_permissions_check' ),
+				'args'                => array(
+					'force' => array(
+						'default'     => true,
+						'type'        => 'boolean',
+						'description' => __( 'Required to be true, as resource does not support trashing.', 'woocommerce' ),
+					),
+				),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+	}
+
+	/**
+	 * Get object.
+	 *
+	 * @since  3.0.0
+	 * @param  int $id Object ID.
+	 * @return WC_Data
+	 */
+	protected function get_object( $id ) {
+		return wc_get_order( $id );
+	}
+
+	/**
+	 * Get formatted item data.
+	 *
+	 * @since  3.0.0
+	 * @param  WC_Data $object WC_Data instance.
+	 * @return array
+	 */
+	protected function get_formatted_item_data( $object ) {
+		$data              = $object->get_data();
+		$format_decimal    = array( 'amount' );
+		$format_date       = array( 'date_created' );
+		$format_line_items = array( 'line_items' );
+
+		// Format decimal values.
+		foreach ( $format_decimal as $key ) {
+			$data[ $key ] = wc_format_decimal( $data[ $key ], $this->request['dp'] );
+		}
+
+		// Format date values.
+		foreach ( $format_date as $key ) {
+			$datetime              = $data[ $key ];
+			$data[ $key ]          = wc_rest_prepare_date_response( $datetime, false );
+			$data[ $key . '_gmt' ] = wc_rest_prepare_date_response( $datetime );
+		}
+
+		// Format line items.
+		foreach ( $format_line_items as $key ) {
+			$data[ $key ] = array_values( array_map( array( $this, 'get_order_item_data' ), $data[ $key ] ) );
+		}
+
+		return array(
+			'id'               => $object->get_id(),
+			'date_created'     => $data['date_created'],
+			'date_created_gmt' => $data['date_created_gmt'],
+			'amount'           => $data['amount'],
+			'reason'           => $data['reason'],
+			'refunded_by'      => $data['refunded_by'],
+			'meta_data'        => $data['meta_data'],
+			'line_items'       => $data['line_items'],
+		);
+	}
+
+	/**
+	 * Prepare a single order output for response.
+	 *
+	 * @since  3.0.0
+	 * @param  WC_Data         $object  Object data.
+	 * @param  WP_REST_Request $request Request object.
+	 * @return WP_REST_Response
+	 */
+	public function prepare_object_for_response( $object, $request ) {
+		$this->request = $request;
+		$order         = wc_get_order( (int) $request['order_id'] );
+
+		if ( ! $order ) {
+			return new WP_Error( 'woocommerce_rest_invalid_order_id', __( 'Invalid order ID.', 'woocommerce' ), 404 );
+		}
+
+		if ( ! $object || $object->get_parent_id() !== $order->get_id() ) {
+			return new WP_Error( 'woocommerce_rest_invalid_order_refund_id', __( 'Invalid order refund ID.', 'woocommerce' ), 404 );
+		}
+
+		$data    = $this->get_formatted_item_data( $object );
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		// Wrap the data in a response object.
+		$response = rest_ensure_response( $data );
+
+		$response->add_links( $this->prepare_links( $object, $request ) );
+
+		/**
+		 * Filter the data for a response.
+		 *
+		 * The dynamic portion of the hook name, $this->post_type,
+		 * refers to object type being prepared for the response.
+		 *
+		 * @param WP_REST_Response $response The response object.
+		 * @param WC_Data          $object   Object data.
+		 * @param WP_REST_Request  $request  Request object.
+		 */
+		return apply_filters( "woocommerce_rest_prepare_{$this->post_type}_object", $response, $object, $request );
+	}
+
+	/**
+	 * Prepare links for the request.
+	 *
+	 * @param WC_Data         $object  Object data.
+	 * @param WP_REST_Request $request Request object.
+	 * @return array                   Links for the given post.
+	 */
+	protected function prepare_links( $object, $request ) {
+		$base     = str_replace( '(?P<order_id>[\d]+)', $object->get_parent_id(), $this->rest_base );
+		$links    = array(
+			'self' => array(
+				'href' => rest_url( sprintf( '/%s/%s/%d', $this->namespace, $base, $object->get_id() ) ),
+			),
+			'collection' => array(
+				'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $base ) ),
+			),
+			'up' => array(
+				'href' => rest_url( sprintf( '/%s/orders/%d', $this->namespace, $object->get_parent_id() ) ),
+			),
+		);
+
+		return $links;
+	}
+
+	/**
+	 * Prepare objects query.
+	 *
+	 * @since  3.0.0
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return array
+	 */
+	protected function prepare_objects_query( $request ) {
+		$args = parent::prepare_objects_query( $request );
+
+		$args['post_status']     = array_keys( wc_get_order_statuses() );
+		$args['post_parent__in'] = array( absint( $request['order_id'] ) );
+
+		return $args;
+	}
+
+	/**
+	 * Prepares one object for create or update operation.
+	 *
+	 * @since  3.0.0
+	 * @param  WP_REST_Request $request Request object.
+	 * @param  bool            $creating If is creating a new object.
+	 * @return WP_Error|WC_Data The prepared item, or WP_Error object on failure.
+	 */
+	protected function prepare_object_for_database( $request, $creating = false ) {
+		$order = wc_get_order( (int) $request['order_id'] );
+
+		if ( ! $order ) {
+			return new WP_Error( 'woocommerce_rest_invalid_order_id', __( 'Invalid order ID.', 'woocommerce' ), 404 );
+		}
+
+		if ( 0 > $request['amount'] ) {
+			return new WP_Error( 'woocommerce_rest_invalid_order_refund', __( 'Refund amount must be greater than zero.', 'woocommerce' ), 400 );
+		}
+
+		// Create the refund.
+		$refund = wc_create_refund( array(
+			'order_id'       => $order->get_id(),
+			'amount'         => $request['amount'],
+			'reason'         => empty( $request['reason'] ) ? null : $request['reason'],
+			'line_items'     => $request['line_items'],
+			'refund_payment' => is_bool( $request['api_refund'] ) ? $request['api_refund'] : true,
+			'restock_items'  => true,
+		) );
+
+		if ( is_wp_error( $refund ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_create_order_refund', $refund->get_error_message(), 500 );
+		}
+
+		if ( ! $refund ) {
+			return new WP_Error( 'woocommerce_rest_cannot_create_order_refund', __( 'Cannot create order refund, please try again.', 'woocommerce' ), 500 );
+		}
+
+		/**
+		 * Filters an object before it is inserted via the REST API.
+		 *
+		 * The dynamic portion of the hook name, `$this->post_type`,
+		 * refers to the object type slug.
+		 *
+		 * @param WC_Data         $coupon   Object object.
+		 * @param WP_REST_Request $request  Request object.
+		 * @param bool            $creating If is creating a new object.
+		 */
+		return apply_filters( "woocommerce_rest_pre_insert_{$this->post_type}_object", $refund, $request, $creating );
+	}
+
+	/**
+	 * Save an object data.
+	 *
+	 * @since  3.0.0
+	 * @param  WP_REST_Request $request  Full details about the request.
+	 * @param  bool            $creating If is creating a new object.
+	 * @return WC_Data|WP_Error
+	 */
+	protected function save_object( $request, $creating = false ) {
+		try {
+			$object = $this->prepare_object_for_database( $request, $creating );
+
+			if ( is_wp_error( $object ) ) {
+				return $object;
+			}
+
+			return $this->get_object( $object->get_id() );
+		} catch ( WC_Data_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), $e->getErrorData() );
+		} catch ( WC_REST_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
+		}
+	}
+
+	/**
+	 * Get the Order's schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => $this->post_type,
+			'type'       => 'object',
+			'properties' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_created' => array(
+					'description' => __( "The date the order refund was created, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_created_gmt' => array(
+					'description' => __( "The date the order refund was created, as GMT.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'amount' => array(
+					'description' => __( 'Refund amount.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'reason' => array(
+					'description' => __( 'Reason for refund.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'refunded_by' => array(
+					'description' => __( 'User ID of user who created the refund.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'meta_data' => array(
+					'description' => __( 'Meta data.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Meta ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'key' => array(
+								'description' => __( 'Meta key.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'value' => array(
+								'description' => __( 'Meta value.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+						),
+					),
+				),
+				'line_items' => array(
+					'description' => __( 'Line items data.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Item ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'name' => array(
+								'description' => __( 'Product name.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'product_id' => array(
+								'description' => __( 'Product ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'variation_id' => array(
+								'description' => __( 'Variation ID, if applicable.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'quantity' => array(
+								'description' => __( 'Quantity ordered.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'tax_class' => array(
+								'description' => __( 'Tax class of product.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'subtotal' => array(
+								'description' => __( 'Line subtotal (before discounts).', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'subtotal_tax' => array(
+								'description' => __( 'Line subtotal tax (before discounts).', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'total' => array(
+								'description' => __( 'Line total (after discounts).', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'total_tax' => array(
+								'description' => __( 'Line total tax (after discounts).', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'taxes' => array(
+								'description' => __( 'Line taxes.', 'woocommerce' ),
+								'type'        => 'array',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+								'items'       => array(
+									'type'       => 'object',
+									'properties' => array(
+										'id' => array(
+											'description' => __( 'Tax rate ID.', 'woocommerce' ),
+											'type'        => 'integer',
+											'context'     => array( 'view', 'edit' ),
+										),
+										'total' => array(
+											'description' => __( 'Tax total.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+										),
+										'subtotal' => array(
+											'description' => __( 'Tax subtotal.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+										),
+									),
+								),
+							),
+							'meta_data' => array(
+								'description' => __( 'Meta data.', 'woocommerce' ),
+								'type'        => 'array',
+								'context'     => array( 'view', 'edit' ),
+								'items'       => array(
+									'type'       => 'object',
+									'properties' => array(
+										'id' => array(
+											'description' => __( 'Meta ID.', 'woocommerce' ),
+											'type'        => 'integer',
+											'context'     => array( 'view', 'edit' ),
+											'readonly'    => true,
+										),
+										'key' => array(
+											'description' => __( 'Meta key.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+										),
+										'value' => array(
+											'description' => __( 'Meta value.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+										),
+									),
+								),
+							),
+							'sku' => array(
+								'description' => __( 'Product SKU.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'price' => array(
+								'description' => __( 'Product price.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+						),
+					),
+				),
+				'api_refund' => array(
+					'description' => __( 'When true, the payment gateway API is used to generate the refund.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'context'     => array( 'edit' ),
+					'default'     => true,
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+
+	/**
+	 * Get the query params for collections.
+	 *
+	 * @return array
+	 */
+	public function get_collection_params() {
+		$params = parent::get_collection_params();
+
+		unset( $params['status'], $params['customer'], $params['product'] );
+
+		return $params;
+	}
+}
diff --git a/includes/api/class-wc-rest-orders-controller.php b/includes/api/class-wc-rest-orders-controller.php
new file mode 100644
index 00000000000..0c4501f5163
--- /dev/null
+++ b/includes/api/class-wc-rest-orders-controller.php
@@ -0,0 +1,1649 @@
+<?php
+/**
+ * REST API Orders controller
+ *
+ * Handles requests to the /orders endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Orders controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_CRUD_Controller
+ */
+class WC_REST_Orders_Controller extends WC_REST_Legacy_Orders_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v2';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'orders';
+
+	/**
+	 * Post type.
+	 *
+	 * @var string
+	 */
+	protected $post_type = 'shop_order';
+
+	/**
+	 * If object is hierarchical.
+	 *
+	 * @var bool
+	 */
+	protected $hierarchical = true;
+
+	/**
+	 * Stores the request.
+	 * @var array
+	 */
+	protected $request = array();
+
+	/**
+	 * Register the routes for orders.
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+				'args'                => $this->get_collection_params(),
+			),
+			array(
+				'methods'             => WP_REST_Server::CREATABLE,
+				'callback'            => array( $this, 'create_item' ),
+				'permission_callback' => array( $this, 'create_item_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
+			'args' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_item' ),
+				'permission_callback' => array( $this, 'get_item_permissions_check' ),
+				'args'                => array(
+					'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'update_item' ),
+				'permission_callback' => array( $this, 'update_item_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			array(
+				'methods'             => WP_REST_Server::DELETABLE,
+				'callback'            => array( $this, 'delete_item' ),
+				'permission_callback' => array( $this, 'delete_item_permissions_check' ),
+				'args'                => array(
+					'force' => array(
+						'default'     => false,
+						'type'        => 'boolean',
+						'description' => __( 'Whether to bypass trash and force deletion.', 'woocommerce' ),
+					),
+				),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/batch', array(
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'batch_items' ),
+				'permission_callback' => array( $this, 'batch_items_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			'schema' => array( $this, 'get_public_batch_schema' ),
+		) );
+	}
+
+	/**
+	 * Get object.
+	 *
+	 * @since  3.0.0
+	 * @param  int $id Object ID.
+	 * @return WC_Data
+	 */
+	protected function get_object( $id ) {
+		return wc_get_order( $id );
+	}
+
+	/**
+	 * Expands an order item to get its data.
+	 * @param WC_Order_item $item
+	 * @return array
+	 */
+	protected function get_order_item_data( $item ) {
+		$data           = $item->get_data();
+		$format_decimal = array( 'subtotal', 'subtotal_tax', 'total', 'total_tax', 'tax_total', 'shipping_tax_total' );
+
+		// Format decimal values.
+		foreach ( $format_decimal as $key ) {
+			if ( isset( $data[ $key ] ) ) {
+				$data[ $key ] = wc_format_decimal( $data[ $key ], $this->request['dp'] );
+			}
+		}
+
+		// Add SKU and PRICE to products.
+		if ( is_callable( array( $item, 'get_product' ) ) ) {
+			$data['sku']   = $item->get_product() ? $item->get_product()->get_sku(): null;
+			$data['price'] = $item->get_total() / max( 1, $item->get_quantity() );
+		}
+
+		// Format taxes.
+		if ( ! empty( $data['taxes']['total'] ) ) {
+			$taxes = array();
+
+			foreach ( $data['taxes']['total'] as $tax_rate_id => $tax ) {
+				$taxes[] = array(
+					'id'       => $tax_rate_id,
+					'total'    => $tax,
+					'subtotal' => isset( $data['taxes']['subtotal'][ $tax_rate_id ] ) ? $data['taxes']['subtotal'][ $tax_rate_id ] : '',
+				);
+			}
+			$data['taxes'] = $taxes;
+		} elseif ( isset( $data['taxes'] ) ) {
+			$data['taxes'] = array();
+		}
+
+		// Remove names for coupons, taxes and shipping.
+		if ( isset( $data['code'] ) || isset( $data['rate_code'] ) || isset( $data['method_title'] ) ) {
+			unset( $data['name'] );
+		}
+
+		// Remove props we don't want to expose.
+		unset( $data['order_id'] );
+		unset( $data['type'] );
+
+		return $data;
+	}
+
+	/**
+	 * Get formatted item data.
+	 *
+	 * @since  3.0.0
+	 * @param  WC_Data $object WC_Data instance.
+	 * @return array
+	 */
+	protected function get_formatted_item_data( $object ) {
+		$data              = $object->get_data();
+		$format_decimal    = array( 'discount_total', 'discount_tax', 'shipping_total', 'shipping_tax', 'shipping_total', 'shipping_tax', 'cart_tax', 'total', 'total_tax' );
+		$format_date       = array( 'date_created', 'date_modified', 'date_completed', 'date_paid' );
+		$format_line_items = array( 'line_items', 'tax_lines', 'shipping_lines', 'fee_lines', 'coupon_lines' );
+
+		// Format decimal values.
+		foreach ( $format_decimal as $key ) {
+			$data[ $key ] = wc_format_decimal( $data[ $key ], $this->request['dp'] );
+		}
+
+		// Format date values.
+		foreach ( $format_date as $key ) {
+			$datetime              = $data[ $key ];
+			$data[ $key ]          = wc_rest_prepare_date_response( $datetime, false );
+			$data[ $key . '_gmt' ] = wc_rest_prepare_date_response( $datetime );
+		}
+
+		// Format the order status.
+		$data['status'] = 'wc-' === substr( $data['status'], 0, 3 ) ? substr( $data['status'], 3 ) : $data['status'];
+
+		// Format line items.
+		foreach ( $format_line_items as $key ) {
+			$data[ $key ] = array_values( array_map( array( $this, 'get_order_item_data' ), $data[ $key ] ) );
+		}
+
+		// Refunds.
+		$data['refunds'] = array();
+		foreach ( $object->get_refunds() as $refund ) {
+			$data['refunds'][] = array(
+				'id'     => $refund->get_id(),
+				'refund' => $refund->get_reason() ? $refund->get_reason() : '',
+				'total'  => '-' . wc_format_decimal( $refund->get_amount(), $this->request['dp'] ),
+			);
+		}
+
+		return array(
+			'id'                   => $object->get_id(),
+			'parent_id'            => $data['parent_id'],
+			'number'               => $data['number'],
+			'order_key'            => $data['order_key'],
+			'created_via'          => $data['created_via'],
+			'version'              => $data['version'],
+			'status'               => $data['status'],
+			'currency'             => $data['currency'],
+			'date_created'         => $data['date_created'],
+			'date_created_gmt'     => $data['date_created_gmt'],
+			'date_modified'        => $data['date_modified'],
+			'date_modified_gmt'    => $data['date_modified_gmt'],
+			'discount_total'       => $data['discount_total'],
+			'discount_tax'         => $data['discount_tax'],
+			'shipping_total'       => $data['shipping_total'],
+			'shipping_tax'         => $data['shipping_tax'],
+			'cart_tax'             => $data['cart_tax'],
+			'total'                => $data['total'],
+			'total_tax'            => $data['total_tax'],
+			'prices_include_tax'   => $data['prices_include_tax'],
+			'customer_id'          => $data['customer_id'],
+			'customer_ip_address'  => $data['customer_ip_address'],
+			'customer_user_agent'  => $data['customer_user_agent'],
+			'customer_note'        => $data['customer_note'],
+			'billing'              => $data['billing'],
+			'shipping'             => $data['shipping'],
+			'payment_method'       => $data['payment_method'],
+			'payment_method_title' => $data['payment_method_title'],
+			'transaction_id'       => $data['transaction_id'],
+			'date_paid'            => $data['date_paid'],
+			'date_paid_gmt'        => $data['date_paid_gmt'],
+			'date_completed'       => $data['date_completed'],
+			'date_completed_gmt'   => $data['date_completed_gmt'],
+			'cart_hash'            => $data['cart_hash'],
+			'meta_data'            => $data['meta_data'],
+			'line_items'           => $data['line_items'],
+			'tax_lines'            => $data['tax_lines'],
+			'shipping_lines'       => $data['shipping_lines'],
+			'fee_lines'            => $data['fee_lines'],
+			'coupon_lines'         => $data['coupon_lines'],
+			'refunds'              => $data['refunds'],
+		);
+	}
+
+	/**
+	 * Prepare a single order output for response.
+	 *
+	 * @since  3.0.0
+	 * @param  WC_Data         $object  Object data.
+	 * @param  WP_REST_Request $request Request object.
+	 * @return WP_REST_Response
+	 */
+	public function prepare_object_for_response( $object, $request ) {
+		$this->request = $request;
+		$data          = $this->get_formatted_item_data( $object );
+		$context       = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data          = $this->add_additional_fields_to_object( $data, $request );
+		$data          = $this->filter_response_by_context( $data, $context );
+		$response      = rest_ensure_response( $data );
+		$response->add_links( $this->prepare_links( $object, $request ) );
+
+		/**
+		 * Filter the data for a response.
+		 *
+		 * The dynamic portion of the hook name, $this->post_type,
+		 * refers to object type being prepared for the response.
+		 *
+		 * @param WP_REST_Response $response The response object.
+		 * @param WC_Data          $object   Object data.
+		 * @param WP_REST_Request  $request  Request object.
+		 */
+		return apply_filters( "woocommerce_rest_prepare_{$this->post_type}_object", $response, $object, $request );
+	}
+
+	/**
+	 * Prepare links for the request.
+	 *
+	 * @param WC_Data         $object  Object data.
+	 * @param WP_REST_Request $request Request object.
+	 * @return array                   Links for the given post.
+	 */
+	protected function prepare_links( $object, $request ) {
+		$links = array(
+			'self' => array(
+				'href' => rest_url( sprintf( '/%s/%s/%d', $this->namespace, $this->rest_base, $object->get_id() ) ),
+			),
+			'collection' => array(
+				'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ),
+			),
+		);
+
+		if ( 0 !== (int) $object->get_customer_id() ) {
+			$links['customer'] = array(
+				'href' => rest_url( sprintf( '/%s/customers/%d', $this->namespace, $object->get_customer_id() ) ),
+			);
+		}
+
+		if ( 0 !== (int) $object->get_parent_id() ) {
+			$links['up'] = array(
+				'href' => rest_url( sprintf( '/%s/orders/%d', $this->namespace, $object->get_parent_id() ) ),
+			);
+		}
+
+		return $links;
+	}
+
+	/**
+	 * Prepare objects query.
+	 *
+	 * @since  3.0.0
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return array
+	 */
+	protected function prepare_objects_query( $request ) {
+		global $wpdb;
+
+		$args = parent::prepare_objects_query( $request );
+
+		// Set post_status.
+		if ( 'any' !== $request['status'] ) {
+			$args['post_status'] = 'wc-' . $request['status'];
+		} else {
+			$args['post_status'] = 'any';
+		}
+
+		if ( isset( $request['customer'] ) ) {
+			if ( ! empty( $args['meta_query'] ) ) {
+				$args['meta_query'] = array();
+			}
+
+			$args['meta_query'][] = array(
+				'key'   => '_customer_user',
+				'value' => $request['customer'],
+				'type'  => 'NUMERIC',
+			);
+		}
+
+		// Search by product.
+		if ( ! empty( $request['product'] ) ) {
+			$order_ids = $wpdb->get_col( $wpdb->prepare( "
+				SELECT order_id
+				FROM {$wpdb->prefix}woocommerce_order_items
+				WHERE order_item_id IN ( SELECT order_item_id FROM {$wpdb->prefix}woocommerce_order_itemmeta WHERE meta_key = '_product_id' AND meta_value = %d )
+				AND order_item_type = 'line_item'
+			 ", $request['product'] ) );
+
+			// Force WP_Query return empty if don't found any order.
+			$order_ids = ! empty( $order_ids ) ? $order_ids : array( 0 );
+
+			$args['post__in'] = $order_ids;
+		}
+
+		// Search.
+		if ( ! empty( $args['s'] ) ) {
+			$order_ids = wc_order_search( $args['s'] );
+
+			if ( ! empty( $order_ids ) ) {
+				unset( $args['s'] );
+				$args['post__in'] = array_merge( $order_ids, array( 0 ) );
+			}
+		}
+
+		return $args;
+	}
+
+	/**
+	 * Only reutrn writeable props from schema.
+	 *
+	 * @param  array $schema
+	 * @return bool
+	 */
+	protected function filter_writable_props( $schema ) {
+		return empty( $schema['readonly'] );
+	}
+
+	/**
+	 * Prepare a single order for create or update.
+	 *
+	 * @param  WP_REST_Request $request Request object.
+	 * @param  bool            $creating If is creating a new object.
+	 * @return WP_Error|WC_Data
+	 */
+	protected function prepare_object_for_database( $request, $creating = false ) {
+		$id        = isset( $request['id'] ) ? absint( $request['id'] ) : 0;
+		$order     = new WC_Order( $id );
+		$schema    = $this->get_item_schema();
+		$data_keys = array_keys( array_filter( $schema['properties'], array( $this, 'filter_writable_props' ) ) );
+
+		// Handle all writable props.
+		foreach ( $data_keys as $key ) {
+			$value = $request[ $key ];
+
+			if ( ! is_null( $value ) ) {
+				switch ( $key ) {
+					case 'billing' :
+					case 'shipping' :
+						$this->update_address( $order, $value, $key );
+						break;
+					case 'line_items' :
+					case 'shipping_lines' :
+					case 'fee_lines' :
+					case 'coupon_lines' :
+						if ( is_array( $value ) ) {
+							foreach ( $value as $item ) {
+								if ( is_array( $item ) ) {
+									if ( $this->item_is_null( $item ) || ( isset( $item['quantity'] ) && 0 === $item['quantity'] ) ) {
+										$order->remove_item( $item['id'] );
+									} else {
+										$this->set_item( $order, $key, $item );
+									}
+								}
+							}
+						}
+						break;
+					case 'meta_data' :
+						if ( is_array( $value ) ) {
+							foreach ( $value as $meta ) {
+								$order->update_meta_data( $meta['key'], $meta['value'], isset( $meta['id'] ) ? $meta['id'] : '' );
+							}
+						}
+						break;
+					default :
+						if ( is_callable( array( $order, "set_{$key}" ) ) ) {
+							$order->{"set_{$key}"}( $value );
+						}
+						break;
+				}
+			}
+		}
+
+		/**
+		 * Filters an object before it is inserted via the REST API.
+		 *
+		 * The dynamic portion of the hook name, `$this->post_type`,
+		 * refers to the object type slug.
+		 *
+		 * @param WC_Data         $order    Object object.
+		 * @param WP_REST_Request $request  Request object.
+		 * @param bool            $creating If is creating a new object.
+		 */
+		return apply_filters( "woocommerce_rest_pre_insert_{$this->post_type}_object", $order, $request, $creating );
+	}
+
+	/**
+	 * Save an object data.
+	 *
+	 * @since  3.0.0
+	 * @param  WP_REST_Request $request  Full details about the request.
+	 * @param  bool            $creating If is creating a new object.
+	 * @return WC_Data|WP_Error
+	 */
+	protected function save_object( $request, $creating = false ) {
+		try {
+			$object = $this->prepare_object_for_database( $request, $creating );
+
+			if ( is_wp_error( $object ) ) {
+				return $object;
+			}
+
+			if ( $creating ) {
+				// Make sure customer exists.
+				if ( ! is_null( $request['customer_id'] ) && 0 !== $request['customer_id'] && false === get_user_by( 'id', $request['customer_id'] ) ) {
+					throw new WC_REST_Exception( 'woocommerce_rest_invalid_customer_id',__( 'Customer ID is invalid.', 'woocommerce' ), 400 );
+				}
+
+				$object->set_created_via( 'rest-api' );
+				$object->set_prices_include_tax( 'yes' === get_option( 'woocommerce_prices_include_tax' ) );
+				$object->calculate_totals();
+			}
+
+			$object->save();
+
+			// Actions for after the order is saved.
+			if ( $creating ) {
+				if ( true === $request['set_paid'] ) {
+					$object->payment_complete( $request['transaction_id'] );
+				}
+			} else {
+				// Handle set paid.
+				if ( $object->needs_payment() && true === $request['set_paid'] ) {
+					$object->payment_complete( $request['transaction_id'] );
+				}
+
+				// If items have changed, recalculate order totals.
+				if ( isset( $request['billing'] ) || isset( $request['shipping'] ) || isset( $request['line_items'] ) || isset( $request['shipping_lines'] ) || isset( $request['fee_lines'] ) || isset( $request['coupon_lines'] ) ) {
+					$object->calculate_totals();
+				}
+			}
+
+			return $this->get_object( $object->get_id() );
+		} catch ( WC_Data_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), $e->getErrorData() );
+		} catch ( WC_REST_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
+		}
+	}
+
+	/**
+	 * Update address.
+	 *
+	 * @param WC_Order $order
+	 * @param array $posted
+	 * @param string $type
+	 */
+	protected function update_address( $order, $posted, $type = 'billing' ) {
+		foreach ( $posted as $key => $value ) {
+			if ( is_callable( array( $order, "set_{$type}_{$key}" ) ) ) {
+				$order->{"set_{$type}_{$key}"}( $value );
+			}
+		}
+	}
+
+	/**
+	 * Gets the product ID from the SKU or posted ID.
+	 *
+	 * @param array $posted Request data
+	 * @return int
+	 */
+	protected function get_product_id( $posted ) {
+		if ( ! empty( $posted['sku'] ) ) {
+			$product_id = (int) wc_get_product_id_by_sku( $posted['sku'] );
+		} elseif ( ! empty( $posted['product_id'] ) && empty( $posted['variation_id'] ) ) {
+			$product_id = (int) $posted['product_id'];
+		} elseif ( ! empty( $posted['variation_id'] ) ) {
+			$product_id = (int) $posted['variation_id'];
+		} else {
+			throw new WC_REST_Exception( 'woocommerce_rest_required_product_reference', __( 'Product ID or SKU is required.', 'woocommerce' ), 400 );
+		}
+		return $product_id;
+	}
+
+	/**
+	 * Maybe set an item prop if the value was posted.
+	 *
+	 * @param WC_Order_Item $item
+	 * @param string $prop
+	 * @param array $posted Request data.
+	 */
+	protected function maybe_set_item_prop( $item, $prop, $posted ) {
+		if ( isset( $posted[ $prop ] ) ) {
+			$item->{"set_$prop"}( $posted[ $prop ] );
+		}
+	}
+
+	/**
+	 * Maybe set item props if the values were posted.
+	 *
+	 * @param WC_Order_Item $item
+	 * @param string[] $props
+	 * @param array $posted Request data.
+	 */
+	protected function maybe_set_item_props( $item, $props, $posted ) {
+		foreach ( $props as $prop ) {
+			$this->maybe_set_item_prop( $item, $prop, $posted );
+		}
+	}
+
+	/**
+	 * Maybe set item meta if posted.
+	 *
+	 * @param WC_Order_Item $item
+	 * @param array $posted Request data.
+	 */
+	protected function maybe_set_item_meta_data( $item, $posted ) {
+		if ( ! empty( $posted['meta_data'] ) && is_array( $posted['meta_data'] ) ) {
+			foreach ( $posted['meta_data'] as $meta ) {
+				if ( isset( $meta['key'], $meta['value'] ) ) {
+					$item->update_meta_data( $meta['key'], $meta['value'], isset( $meta['id'] ) ? $meta['id'] : '' );
+				}
+			}
+		}
+	}
+
+	/**
+	 * Create or update a line item.
+	 *
+	 * @param array $posted Line item data.
+	 * @param string $action 'create' to add line item or 'update' to update it.
+	 * @throws WC_REST_Exception Invalid data, server error.
+	 */
+	protected function prepare_line_items( $posted, $action = 'create' ) {
+		$item    = new WC_Order_Item_Product( ! empty( $posted['id'] ) ? $posted['id'] : '' );
+		$product = wc_get_product( $this->get_product_id( $posted ) );
+
+		if ( $product !== $item->get_product() ) {
+			$item->set_product( $product );
+
+			if ( 'create' === $action ) {
+				$quantity = isset( $posted['quantity'] ) ? $posted['quantity'] : 1;
+				$total    = wc_get_price_excluding_tax( $product, array( 'qty' => $quantity ) );
+				$item->set_total( $total );
+				$item->set_subtotal( $total );
+			}
+		}
+
+		$this->maybe_set_item_props( $item, array( 'name', 'quantity', 'total', 'subtotal', 'tax_class' ), $posted );
+		$this->maybe_set_item_meta_data( $item, $posted );
+
+		return $item;
+	}
+
+	/**
+	 * Create or update an order shipping method.
+	 *
+	 * @param $posted $shipping Item data.
+	 * @param string $action 'create' to add shipping or 'update' to update it.
+	 * @throws WC_REST_Exception Invalid data, server error.
+	 */
+	protected function prepare_shipping_lines( $posted, $action ) {
+		$item = new WC_Order_Item_Shipping( ! empty( $posted['id'] ) ? $posted['id'] : '' );
+
+		if ( 'create' === $action ) {
+			if ( empty( $posted['method_id'] ) ) {
+				throw new WC_REST_Exception( 'woocommerce_rest_invalid_shipping_item', __( 'Shipping method ID is required.', 'woocommerce' ), 400 );
+			}
+		}
+
+		$this->maybe_set_item_props( $item, array( 'method_id', 'method_title', 'total' ), $posted );
+		$this->maybe_set_item_meta_data( $item, $posted );
+
+		return $item;
+	}
+
+	/**
+	 * Create or update an order fee.
+	 *
+	 * @param array $posted Item data.
+	 * @param string $action 'create' to add fee or 'update' to update it.
+	 * @throws WC_REST_Exception Invalid data, server error.
+	 */
+	protected function prepare_fee_lines( $posted, $action ) {
+		$item = new WC_Order_Item_Fee( ! empty( $posted['id'] ) ? $posted['id'] : '' );
+
+		if ( 'create' === $action ) {
+			if ( empty( $posted['name'] ) ) {
+				throw new WC_REST_Exception( 'woocommerce_rest_invalid_fee_item', __( 'Fee name is required.', 'woocommerce' ), 400 );
+			}
+		}
+
+		$this->maybe_set_item_props( $item, array( 'name', 'tax_class', 'tax_status', 'total' ), $posted );
+		$this->maybe_set_item_meta_data( $item, $posted );
+
+		return $item;
+	}
+
+	/**
+	 * Create or update an order coupon.
+	 *
+	 * @param array $posted Item data.
+	 * @param string $action 'create' to add coupon or 'update' to update it.
+	 * @throws WC_REST_Exception Invalid data, server error.
+	 */
+	protected function prepare_coupon_lines( $posted, $action ) {
+		$item = new WC_Order_Item_Coupon( ! empty( $posted['id'] ) ? $posted['id'] : '' );
+
+		if ( 'create' === $action ) {
+			if ( empty( $posted['code'] ) ) {
+				throw new WC_REST_Exception( 'woocommerce_rest_invalid_coupon_coupon', __( 'Coupon code is required.', 'woocommerce' ), 400 );
+			}
+		}
+
+		$this->maybe_set_item_props( $item, array( 'code', 'discount' ), $posted );
+		$this->maybe_set_item_meta_data( $item, $posted );
+
+		return $item;
+	}
+
+	/**
+	 * Wrapper method to create/update order items.
+	 * When updating, the item ID provided is checked to ensure it is associated
+	 * with the order.
+	 *
+	 * @param WC_Order $order order
+	 * @param string $item_type
+	 * @param array $posted item provided in the request body
+	 * @throws WC_REST_Exception If item ID is not associated with order
+	 */
+	protected function set_item( $order, $item_type, $posted ) {
+		global $wpdb;
+
+		if ( ! empty( $posted['id'] ) ) {
+			$action = 'update';
+		} else {
+			$action = 'create';
+		}
+
+		$method = 'prepare_' . $item_type;
+
+		// Verify provided line item ID is associated with order.
+		if ( 'update' === $action ) {
+			$result = $wpdb->get_row(
+				$wpdb->prepare( "SELECT * FROM {$wpdb->prefix}woocommerce_order_items WHERE order_item_id = %d AND order_id = %d",
+				absint( $posted['id'] ),
+				absint( $order->get_id() )
+			) );
+			if ( is_null( $result ) ) {
+				throw new WC_REST_Exception( 'woocommerce_rest_invalid_item_id', __( 'Order item ID provided is not associated with order.', 'woocommerce' ), 400 );
+			}
+		}
+
+		// Prepare item data
+		$item = $this->$method( $posted, $action );
+
+		/**
+		 * Action hook to adjust item before save.
+		 * @since 3.0.0
+		 */
+		do_action( 'woocommerce_rest_set_order_item', $item, $posted );
+
+		// Save or add to order
+		if ( 'create' === $action ) {
+			$order->add_item( $item );
+		} else {
+			$item->save();
+		}
+	}
+
+	/**
+	 * Helper method to check if the resource ID associated with the provided item is null.
+	 * Items can be deleted by setting the resource ID to null.
+	 *
+	 * @param array $item Item provided in the request body.
+	 * @return bool True if the item resource ID is null, false otherwise.
+	 */
+	protected function item_is_null( $item ) {
+		$keys = array( 'product_id', 'method_id', 'method_title', 'name', 'code' );
+
+		foreach ( $keys as $key ) {
+			if ( array_key_exists( $key, $item ) && is_null( $item[ $key ] ) ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Get order statuses without prefixes.
+	 * @return array
+	 */
+	protected function get_order_statuses() {
+		$order_statuses = array();
+
+		foreach ( array_keys( wc_get_order_statuses() ) as $status ) {
+			$order_statuses[] = str_replace( 'wc-', '', $status );
+		}
+
+		return $order_statuses;
+	}
+
+	/**
+	 * Get the Order's schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => $this->post_type,
+			'type'       => 'object',
+			'properties' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'parent_id' => array(
+					'description' => __( 'Parent order ID.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'number' => array(
+					'description' => __( 'Order number.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'order_key' => array(
+					'description' => __( 'Order key.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'created_via' => array(
+					'description' => __( 'Shows where the order was created.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'version' => array(
+					'description' => __( 'Version of WooCommerce which last updated the order.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'status' => array(
+					'description' => __( 'Order status.', 'woocommerce' ),
+					'type'        => 'string',
+					'default'     => 'pending',
+					'enum'        => $this->get_order_statuses(),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'currency' => array(
+					'description' => __( 'Currency the order was created with, in ISO format.', 'woocommerce' ),
+					'type'        => 'string',
+					'default'     => get_woocommerce_currency(),
+					'enum'        => array_keys( get_woocommerce_currencies() ),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'date_created' => array(
+					'description' => __( "The date the order was created, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_created_gmt' => array(
+					'description' => __( "The date the order was created, as GMT.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_modified' => array(
+					'description' => __( "The date the order was last modified, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_modified_gmt' => array(
+					'description' => __( "The date the order was last modified, as GMT.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'discount_total' => array(
+					'description' => __( 'Total discount amount for the order.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'discount_tax' => array(
+					'description' => __( 'Total discount tax amount for the order.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'shipping_total' => array(
+					'description' => __( 'Total shipping amount for the order.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'shipping_tax' => array(
+					'description' => __( 'Total shipping tax amount for the order.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'cart_tax' => array(
+					'description' => __( 'Sum of line item taxes only.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'total' => array(
+					'description' => __( 'Grand total.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'total_tax' => array(
+					'description' => __( 'Sum of all taxes.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'prices_include_tax' => array(
+					'description' => __( 'True the prices included tax during checkout.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'customer_id' => array(
+					'description' => __( 'User ID who owns the order. 0 for guests.', 'woocommerce' ),
+					'type'        => 'integer',
+					'default'     => 0,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'customer_ip_address' => array(
+					'description' => __( "Customer's IP address.", 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'customer_user_agent' => array(
+					'description' => __( 'User agent of the customer.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'customer_note' => array(
+					'description' => __( 'Note left by customer during checkout.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'billing' => array(
+					'description' => __( 'Billing address.', 'woocommerce' ),
+					'type'        => 'object',
+					'context'     => array( 'view', 'edit' ),
+					'properties'  => array(
+						'first_name' => array(
+							'description' => __( 'First name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'last_name' => array(
+							'description' => __( 'Last name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'company' => array(
+							'description' => __( 'Company name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'address_1' => array(
+							'description' => __( 'Address line 1', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'address_2' => array(
+							'description' => __( 'Address line 2', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'city' => array(
+							'description' => __( 'City name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'state' => array(
+							'description' => __( 'ISO code or name of the state, province or district.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'postcode' => array(
+							'description' => __( 'Postal code.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'country' => array(
+							'description' => __( 'Country code in ISO 3166-1 alpha-2 format.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'email' => array(
+							'description' => __( 'Email address.', 'woocommerce' ),
+							'type'        => 'string',
+							'format'      => 'email',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'phone' => array(
+							'description' => __( 'Phone number.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+					),
+				),
+				'shipping' => array(
+					'description' => __( 'Shipping address.', 'woocommerce' ),
+					'type'        => 'object',
+					'context'     => array( 'view', 'edit' ),
+					'properties'  => array(
+						'first_name' => array(
+							'description' => __( 'First name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'last_name' => array(
+							'description' => __( 'Last name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'company' => array(
+							'description' => __( 'Company name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'address_1' => array(
+							'description' => __( 'Address line 1', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'address_2' => array(
+							'description' => __( 'Address line 2', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'city' => array(
+							'description' => __( 'City name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'state' => array(
+							'description' => __( 'ISO code or name of the state, province or district.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'postcode' => array(
+							'description' => __( 'Postal code.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'country' => array(
+							'description' => __( 'Country code in ISO 3166-1 alpha-2 format.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+					),
+				),
+				'payment_method' => array(
+					'description' => __( 'Payment method ID.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'payment_method_title' => array(
+					'description' => __( 'Payment method title.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'transaction_id' => array(
+					'description' => __( 'Unique transaction ID.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'date_paid' => array(
+					'description' => __( "The date the order was paid, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_paid_gmt' => array(
+					'description' => __( "The date the order was paid, as GMT.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_completed' => array(
+					'description' => __( "The date the order was completed, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_completed_gmt' => array(
+					'description' => __( "The date the order was completed, as GMT.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'cart_hash' => array(
+					'description' => __( 'MD5 hash of cart items to ensure orders are not modified.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'meta_data' => array(
+					'description' => __( 'Meta data.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Meta ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'key' => array(
+								'description' => __( 'Meta key.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'value' => array(
+								'description' => __( 'Meta value.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+						),
+					),
+				),
+				'line_items' => array(
+					'description' => __( 'Line items data.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Item ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'name' => array(
+								'description' => __( 'Product name.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'product_id' => array(
+								'description' => __( 'Product ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'variation_id' => array(
+								'description' => __( 'Variation ID, if applicable.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'quantity' => array(
+								'description' => __( 'Quantity ordered.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'tax_class' => array(
+								'description' => __( 'Tax class of product.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'subtotal' => array(
+								'description' => __( 'Line subtotal (before discounts).', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'subtotal_tax' => array(
+								'description' => __( 'Line subtotal tax (before discounts).', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'total' => array(
+								'description' => __( 'Line total (after discounts).', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'total_tax' => array(
+								'description' => __( 'Line total tax (after discounts).', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'taxes' => array(
+								'description' => __( 'Line taxes.', 'woocommerce' ),
+								'type'        => 'array',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+								'items'       => array(
+									'type'       => 'object',
+									'properties' => array(
+										'id' => array(
+											'description' => __( 'Tax rate ID.', 'woocommerce' ),
+											'type'        => 'integer',
+											'context'     => array( 'view', 'edit' ),
+										),
+										'total' => array(
+											'description' => __( 'Tax total.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+										),
+										'subtotal' => array(
+											'description' => __( 'Tax subtotal.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+										),
+									),
+								),
+							),
+							'meta_data' => array(
+								'description' => __( 'Meta data.', 'woocommerce' ),
+								'type'        => 'array',
+								'context'     => array( 'view', 'edit' ),
+								'items'       => array(
+									'type'       => 'object',
+									'properties' => array(
+										'id' => array(
+											'description' => __( 'Meta ID.', 'woocommerce' ),
+											'type'        => 'integer',
+											'context'     => array( 'view', 'edit' ),
+											'readonly'    => true,
+										),
+										'key' => array(
+											'description' => __( 'Meta key.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+										),
+										'value' => array(
+											'description' => __( 'Meta value.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+										),
+									),
+								),
+							),
+							'sku' => array(
+								'description' => __( 'Product SKU.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'price' => array(
+								'description' => __( 'Product price.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+						),
+					),
+				),
+				'tax_lines' => array(
+					'description' => __( 'Tax lines data.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Item ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'rate_code' => array(
+								'description' => __( 'Tax rate code.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'rate_id' => array(
+								'description' => __( 'Tax rate ID.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'label' => array(
+								'description' => __( 'Tax rate label.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'compound' => array(
+								'description' => __( 'Show if is a compound tax rate.', 'woocommerce' ),
+								'type'        => 'boolean',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'tax_total' => array(
+								'description' => __( 'Tax total (not including shipping taxes).', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'shipping_tax_total' => array(
+								'description' => __( 'Shipping tax total.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'meta_data' => array(
+								'description' => __( 'Meta data.', 'woocommerce' ),
+								'type'        => 'array',
+								'context'     => array( 'view', 'edit' ),
+								'items'       => array(
+									'type'       => 'object',
+									'properties' => array(
+										'id' => array(
+											'description' => __( 'Meta ID.', 'woocommerce' ),
+											'type'        => 'integer',
+											'context'     => array( 'view', 'edit' ),
+											'readonly'    => true,
+										),
+										'key' => array(
+											'description' => __( 'Meta key.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+										),
+										'value' => array(
+											'description' => __( 'Meta value.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+										),
+									),
+								),
+							),
+						),
+					),
+				),
+				'shipping_lines' => array(
+					'description' => __( 'Shipping lines data.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Item ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'method_title' => array(
+								'description' => __( 'Shipping method name.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'method_id' => array(
+								'description' => __( 'Shipping method ID.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'total' => array(
+								'description' => __( 'Line total (after discounts).', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'total_tax' => array(
+								'description' => __( 'Line total tax (after discounts).', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'taxes' => array(
+								'description' => __( 'Line taxes.', 'woocommerce' ),
+								'type'        => 'array',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+								'items'       => array(
+									'type'       => 'object',
+									'properties' => array(
+										'id' => array(
+											'description' => __( 'Tax rate ID.', 'woocommerce' ),
+											'type'        => 'integer',
+											'context'     => array( 'view', 'edit' ),
+											'readonly'    => true,
+										),
+										'total' => array(
+											'description' => __( 'Tax total.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+											'readonly'    => true,
+										),
+									),
+								),
+							),
+							'meta_data' => array(
+								'description' => __( 'Meta data.', 'woocommerce' ),
+								'type'        => 'array',
+								'context'     => array( 'view', 'edit' ),
+								'items'       => array(
+									'type'       => 'object',
+									'properties' => array(
+										'id' => array(
+											'description' => __( 'Meta ID.', 'woocommerce' ),
+											'type'        => 'integer',
+											'context'     => array( 'view', 'edit' ),
+											'readonly'    => true,
+										),
+										'key' => array(
+											'description' => __( 'Meta key.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+										),
+										'value' => array(
+											'description' => __( 'Meta value.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+										),
+									),
+								),
+							),
+						),
+					),
+				),
+				'fee_lines' => array(
+					'description' => __( 'Fee lines data.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Item ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'name' => array(
+								'description' => __( 'Fee name.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'tax_class' => array(
+								'description' => __( 'Tax class of fee.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'tax_status' => array(
+								'description' => __( 'Tax status of fee.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'enum'        => array( 'taxable', 'none' ),
+							),
+							'total' => array(
+								'description' => __( 'Line total (after discounts).', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'total_tax' => array(
+								'description' => __( 'Line total tax (after discounts).', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'taxes' => array(
+								'description' => __( 'Line taxes.', 'woocommerce' ),
+								'type'        => 'array',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+								'items'       => array(
+									'type'       => 'object',
+									'properties' => array(
+										'id' => array(
+											'description' => __( 'Tax rate ID.', 'woocommerce' ),
+											'type'        => 'integer',
+											'context'     => array( 'view', 'edit' ),
+											'readonly'    => true,
+										),
+										'total' => array(
+											'description' => __( 'Tax total.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+											'readonly'    => true,
+										),
+										'subtotal' => array(
+											'description' => __( 'Tax subtotal.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+											'readonly'    => true,
+										),
+									),
+								),
+							),
+							'meta_data' => array(
+								'description' => __( 'Meta data.', 'woocommerce' ),
+								'type'        => 'array',
+								'context'     => array( 'view', 'edit' ),
+								'items'       => array(
+									'type'       => 'object',
+									'properties' => array(
+										'id' => array(
+											'description' => __( 'Meta ID.', 'woocommerce' ),
+											'type'        => 'integer',
+											'context'     => array( 'view', 'edit' ),
+											'readonly'    => true,
+										),
+										'key' => array(
+											'description' => __( 'Meta key.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+										),
+										'value' => array(
+											'description' => __( 'Meta value.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+										),
+									),
+								),
+							),
+						),
+					),
+				),
+				'coupon_lines' => array(
+					'description' => __( 'Coupons line data.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Item ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'code' => array(
+								'description' => __( 'Coupon code.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'discount' => array(
+								'description' => __( 'Discount total.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'discount_tax' => array(
+								'description' => __( 'Discount total tax.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'meta_data' => array(
+								'description' => __( 'Meta data.', 'woocommerce' ),
+								'type'        => 'array',
+								'context'     => array( 'view', 'edit' ),
+								'items'       => array(
+									'type'       => 'object',
+									'properties' => array(
+										'id' => array(
+											'description' => __( 'Meta ID.', 'woocommerce' ),
+											'type'        => 'integer',
+											'context'     => array( 'view', 'edit' ),
+											'readonly'    => true,
+										),
+										'key' => array(
+											'description' => __( 'Meta key.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+										),
+										'value' => array(
+											'description' => __( 'Meta value.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+										),
+									),
+								),
+							),
+						),
+					),
+				),
+				'refunds' => array(
+					'description' => __( 'List of refunds.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Refund ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'reason' => array(
+								'description' => __( 'Refund reason.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'total' => array(
+								'description' => __( 'Refund total.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+						),
+					),
+				),
+				'set_paid' => array(
+					'description' => __( 'Define if the order is paid. It will set the status to processing and reduce stock items.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => false,
+					'context'     => array( 'edit' ),
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+
+	/**
+	 * Get the query params for collections.
+	 *
+	 * @return array
+	 */
+	public function get_collection_params() {
+		$params = parent::get_collection_params();
+
+		$params['status'] = array(
+			'default'           => 'any',
+			'description'       => __( 'Limit result set to orders assigned a specific status.', 'woocommerce' ),
+			'type'              => 'string',
+			'enum'              => array_merge( array( 'any' ), $this->get_order_statuses() ),
+			'sanitize_callback' => 'sanitize_key',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+		$params['customer'] = array(
+			'description'       => __( 'Limit result set to orders assigned a specific customer.', 'woocommerce' ),
+			'type'              => 'integer',
+			'sanitize_callback' => 'absint',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+		$params['product'] = array(
+			'description'       => __( 'Limit result set to orders assigned a specific product.', 'woocommerce' ),
+			'type'              => 'integer',
+			'sanitize_callback' => 'absint',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+		$params['dp'] = array(
+			'default'           => 2,
+			'description'       => __( 'Number of decimal points to use in each resource.', 'woocommerce' ),
+			'type'              => 'integer',
+			'sanitize_callback' => 'absint',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+
+		return $params;
+	}
+}
diff --git a/includes/api/class-wc-rest-payment-gateways-controller.php b/includes/api/class-wc-rest-payment-gateways-controller.php
new file mode 100644
index 00000000000..d61721f5a33
--- /dev/null
+++ b/includes/api/class-wc-rest-payment-gateways-controller.php
@@ -0,0 +1,457 @@
+<?php
+/**
+ * REST API WC Payment gateways controller
+ *
+ * Handles requests to the /payment_gateways endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * @package WooCommerce/API
+ * @extends WC_REST_Controller
+ */
+class WC_REST_Payment_Gateways_Controller extends WC_REST_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v2';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'payment_gateways';
+
+	/**
+	 * Register the route for /payment_gateways and /payment_gateways/<id>
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+				'args'                => $this->get_collection_params(),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<id>[\w-]+)', array(
+			'args' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'string',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_item' ),
+				'permission_callback' => array( $this, 'get_item_permissions_check' ),
+				'args'                => array(
+					'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'update_item' ),
+				'permission_callback' => array( $this, 'update_items_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+	}
+
+	/**
+	 * Check whether a given request has permission to view payment gateways.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_items_permissions_check( $request ) {
+		if ( ! wc_rest_check_manager_permissions( 'payment_gateways', 'read' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot list resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access to read a payment gateway.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_item_permissions_check( $request ) {
+		if ( ! wc_rest_check_manager_permissions( 'payment_gateways', 'read' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot view this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+		return true;
+	}
+
+	/**
+	 * Check whether a given request has permission to edit payment gateways.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function update_items_permissions_check( $request ) {
+		if ( ! wc_rest_check_manager_permissions( 'payment_gateways', 'edit' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_edit', __( 'Sorry, you are not allowed to edit this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+		return true;
+	}
+
+	/**
+	 * Get payment gateways.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function get_items( $request ) {
+		$payment_gateways = WC()->payment_gateways->payment_gateways();
+		$response         = array();
+		foreach ( $payment_gateways as $payment_gateway_id => $payment_gateway ) {
+			$payment_gateway->id = $payment_gateway_id;
+			$gateway             = $this->prepare_item_for_response( $payment_gateway, $request );
+			$gateway             = $this->prepare_response_for_collection( $gateway );
+			$response[]          = $gateway;
+		}
+		return rest_ensure_response( $response );
+	}
+
+	/**
+	 * Get a single payment gateway.
+	 *
+	 * @param WP_REST_Request $request
+	 * @return WP_REST_Response|WP_Error
+	 */
+	public function get_item( $request ) {
+		$gateway = $this->get_gateway( $request );
+
+		if ( is_null( $gateway ) ) {
+			return new WP_Error( 'woocommerce_rest_payment_gateway_invalid', __( 'Resource does not exist.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$gateway = $this->prepare_item_for_response( $gateway, $request );
+		return rest_ensure_response( $gateway );
+	}
+
+	/**
+	 * Update A Single Shipping Zone Method.
+	 *
+	 * @param WP_REST_Request $request
+	 * @return WP_REST_Response|WP_Error
+	 */
+	public function update_item( $request ) {
+		$gateway = $this->get_gateway( $request );
+
+		if ( is_null( $gateway ) ) {
+			return new WP_Error( 'woocommerce_rest_payment_gateway_invalid', __( 'Resource does not exist.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		// Get settings.
+		$gateway->init_form_fields();
+		$settings = $gateway->settings;
+
+		// Update settings.
+		if ( isset( $request['settings'] ) ) {
+			$errors_found = false;
+			foreach ( $gateway->form_fields as $key => $field ) {
+				if ( isset( $request['settings'][ $key ] ) ) {
+					if ( is_callable( array( $this, 'validate_setting_' . $field['type'] . '_field' ) ) ) {
+						$value = $this->{'validate_setting_' . $field['type'] . '_field'}( $request['settings'][ $key ], $field );
+					} else {
+						$value = $this->validate_setting_text_field( $request['settings'][ $key ], $field );
+					}
+					if ( is_wp_error( $value ) ) {
+						$errors_found = true;
+						break;
+					}
+					$settings[ $key ] = $value;
+				}
+			}
+
+			if ( $errors_found ) {
+				return new WP_Error( 'rest_setting_value_invalid', __( 'An invalid setting value was passed.', 'woocommerce' ), array( 'status' => 400 ) );
+			}
+		}
+
+		// Update if this method is enabled or not.
+		if ( isset( $request['enabled'] ) ) {
+			$gateway->enabled = $settings['enabled'] = wc_bool_to_string( $request['enabled'] );
+		}
+
+		// Update title.
+		if ( isset( $request['title'] ) ) {
+			$gateway->title = $settings['title'] = $request['title'];
+		}
+
+		// Update description.
+		if ( isset( $request['description'] ) ) {
+			$gateway->description = $settings['description'] = $request['description'];
+		}
+
+		// Update options.
+		$gateway->settings = $settings;
+		update_option( $gateway->get_option_key(), apply_filters( 'woocommerce_gateway_' . $gateway->id . '_settings_values', $settings, $gateway ) );
+
+		// Update order
+		if ( isset( $request['order'] ) ) {
+			$order  = (array) get_option( 'woocommerce_gateway_order' );
+			$order[ $gateway->id ] = $request['order'];
+			update_option( 'woocommerce_gateway_order', $order );
+			$gateway->order = absint( $request['order'] );
+		}
+
+		$gateway = $this->prepare_item_for_response( $gateway, $request );
+		return rest_ensure_response( $gateway );
+	}
+
+	/**
+	 * Get a gateway based on the current request object.
+	 *
+	 * @param WP_REST_Request $request
+	 * @return WP_REST_Response|null
+	 */
+	public function get_gateway( $request ) {
+		$gateway          = null;
+		$payment_gateways = WC()->payment_gateways->payment_gateways();
+		foreach ( $payment_gateways as $payment_gateway_id => $payment_gateway ) {
+			if ( $request['id'] !== $payment_gateway_id ) {
+				continue;
+			}
+			$payment_gateway->id = $payment_gateway_id;
+			$gateway             = $payment_gateway;
+		}
+		return $gateway;
+	}
+
+	/**
+	 * Prepare a payment gateway for response.
+	 *
+	 * @param  WC_Payment_Gateway $gateway    Payment gateway object.
+	 * @param  WP_REST_Request    $request    Request object.
+	 * @return WP_REST_Response   $response   Response data.
+	 */
+	public function prepare_item_for_response( $gateway, $request ) {
+		$order  = (array) get_option( 'woocommerce_gateway_order' );
+		$item = array(
+			'id'                 => $gateway->id,
+			'title'              => $gateway->title,
+			'description'        => $gateway->description,
+			'order'              => isset( $order[ $gateway->id ] ) ? $order[ $gateway->id ] : '',
+			'enabled'            => ( 'yes' === $gateway->enabled ),
+			'method_title'       => $gateway->get_method_title(),
+			'method_description' => $gateway->get_method_description(),
+			'settings'           => $this->get_settings( $gateway ),
+		);
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $item, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		$response = rest_ensure_response( $data );
+		$response->add_links( $this->prepare_links( $gateway, $request ) );
+
+		/**
+		 * Filter payment gateway objects returned from the REST API.
+		 *
+		 * @param WP_REST_Response   $response The response object.
+		 * @param WC_Payment_Gateway $gateway  Payment gateway object.
+		 * @param WP_REST_Request    $request  Request object.
+		 */
+		return apply_filters( 'woocommerce_rest_prepare_payment_gateway', $response, $gateway, $request );
+	}
+
+	/**
+	 * Return settings associated with this payment gateway.
+	 */
+	public function get_settings( $gateway ) {
+		$settings = array();
+		$gateway->init_form_fields();
+		foreach ( $gateway->form_fields as $id => $field ) {
+			// Make sure we at least have a title and type
+			if ( empty( $field['title'] ) || empty( $field['type'] ) ) {
+				continue;
+			}
+			// Ignore 'title' settings/fields -- they are UI only
+			if ( 'title' === $field['type'] ) {
+				continue;
+			}
+			// Ignore 'enabled' and 'description' which get included elsewhere.
+			if ( in_array( $id, array( 'enabled', 'description' ) ) ) {
+				continue;
+			}
+			$data = array(
+				'id'          => $id,
+				'label'       => empty( $field['label'] ) ? $field['title'] : $field['label'],
+				'description' => empty( $field['description'] ) ? '' : $field['description'],
+				'type'        => $field['type'],
+				'value'       => empty( $gateway->settings[ $id ] ) ? '' : $gateway->settings[ $id ],
+				'default'     => empty( $field['default'] ) ? '' : $field['default'],
+				'tip'         => empty( $field['description'] ) ? '' : $field['description'],
+				'placeholder' => empty( $field['placeholder'] ) ? '' : $field['placeholder'],
+			);
+			if ( ! empty( $field['options'] ) ) {
+				$data['options'] = $field['options'];
+			}
+			$settings[ $id ] = $data;
+		}
+		return $settings;
+	}
+
+	/**
+	 * Prepare links for the request.
+	 *
+	 * @param  WC_Payment_Gateway $gateway    Payment gateway object.
+	 * @param  WP_REST_Request    $request    Request object.
+	 * @return array
+	 */
+	protected function prepare_links( $gateway, $request ) {
+		$links      = array(
+			'self' => array(
+				'href' => rest_url( sprintf( '/%s/%s/%s', $this->namespace, $this->rest_base, $gateway->id ) ),
+			),
+			'collection' => array(
+				'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ),
+			),
+		);
+
+		return $links;
+	}
+
+    /**
+	 * Get the payment gateway schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'payment_gateway',
+			'type'       => 'object',
+			'properties' => array(
+				'id' => array(
+					'description' => __( 'Payment gateway ID.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'title' => array(
+					'description' => __( 'Payment gateway title on checkout.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'description' => array(
+					'description' => __( 'Payment gateway description on checkout.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'order' => array(
+					'description' => __( 'Payment gateway sort order.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'arg_options' => array(
+						'sanitize_callback' => 'absint',
+					),
+				),
+				'enabled' => array(
+					'description' => __( 'Payment gateway enabled status.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'method_title' => array(
+					'description' => __( 'Payment gateway method title.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'method_description' => array(
+					'description' => __( 'Payment gateway method description.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'settings' => array(
+					'description' => __( 'Payment gateway settings.', 'woocommerce' ),
+					'type'        => 'object',
+					'context'     => array( 'view', 'edit' ),
+					'properties' => array(
+						'id' => array(
+							'description' => __( 'A unique identifier for the setting.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+							'readonly'    => true,
+						),
+						'label' => array(
+							'description' => __( 'A human readable label for the setting used in interfaces.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+							'readonly'    => true,
+						),
+						'description' => array(
+							'description' => __( 'A human readable description for the setting used in interfaces.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+							'readonly'    => true,
+						),
+						'type' => array(
+							'description' => __( 'Type of setting.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+							'enum'        => array( 'text', 'email', 'number', 'color', 'password', 'textarea', 'select', 'multiselect', 'radio', 'image_width', 'checkbox' ),
+							'readonly'    => true,
+						),
+						'value' => array(
+							'description' => __( 'Setting value.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'default' => array(
+							'description' => __( 'Default value for the setting.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+							'readonly'    => true,
+						),
+						'tip' => array(
+							'description' => __( 'Additional help text shown to the user about the setting.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+							'readonly'    => true,
+						),
+						'placeholder' => array(
+							'description' => __( 'Placeholder text to be displayed in text inputs.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+							'readonly'    => true,
+						),
+					),
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+
+	/**
+	 * Get any query params needed.
+	 *
+	 * @return array
+	 */
+	public function get_collection_params() {
+		return array(
+			'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+		);
+	}
+
+}
diff --git a/includes/api/class-wc-rest-product-attribute-terms-controller.php b/includes/api/class-wc-rest-product-attribute-terms-controller.php
new file mode 100644
index 00000000000..27f52acdbe5
--- /dev/null
+++ b/includes/api/class-wc-rest-product-attribute-terms-controller.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * REST API Product Attribute Terms controller
+ *
+ * Handles requests to the products/attributes/<attribute_id>/terms endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Product Attribute Terms controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Product_Attribute_Terms_V1_Controller
+ */
+class WC_REST_Product_Attribute_Terms_Controller extends WC_REST_Product_Attribute_Terms_V1_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v2';
+}
diff --git a/includes/api/class-wc-rest-product-attributes-controller.php b/includes/api/class-wc-rest-product-attributes-controller.php
new file mode 100644
index 00000000000..d8bb4410b5c
--- /dev/null
+++ b/includes/api/class-wc-rest-product-attributes-controller.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * REST API Product Attributes controller
+ *
+ * Handles requests to the products/attributes endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Product Attributes controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Product_Attributes_V1_Controller
+ */
+class WC_REST_Product_Attributes_Controller extends WC_REST_Product_Attributes_V1_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v2';
+}
diff --git a/includes/api/class-wc-rest-product-categories-controller.php b/includes/api/class-wc-rest-product-categories-controller.php
new file mode 100644
index 00000000000..599e2561340
--- /dev/null
+++ b/includes/api/class-wc-rest-product-categories-controller.php
@@ -0,0 +1,215 @@
+<?php
+/**
+ * REST API Product Categories controller
+ *
+ * Handles requests to the products/categories endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Product Categories controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Product_Categories_V1_Controller
+ */
+class WC_REST_Product_Categories_Controller extends WC_REST_Product_Categories_V1_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v2';
+
+	/**
+	 * Prepare a single product category output for response.
+	 *
+	 * @param WP_Term $item Term object.
+	 * @param WP_REST_Request $request
+	 * @return WP_REST_Response $response
+	 */
+	public function prepare_item_for_response( $item, $request ) {
+		// Get category display type.
+		$display_type = get_woocommerce_term_meta( $item->term_id, 'display_type' );
+
+		// Get category order.
+		$menu_order = get_woocommerce_term_meta( $item->term_id, 'order' );
+
+		$data = array(
+			'id'          => (int) $item->term_id,
+			'name'        => $item->name,
+			'slug'        => $item->slug,
+			'parent'      => (int) $item->parent,
+			'description' => $item->description,
+			'display'     => $display_type ? $display_type : 'default',
+			'image'       => array(),
+			'menu_order'  => (int) $menu_order,
+			'count'       => (int) $item->count,
+		);
+
+		// Get category image.
+		if ( $image_id = get_woocommerce_term_meta( $item->term_id, 'thumbnail_id' ) ) {
+			$attachment = get_post( $image_id );
+
+			$data['image'] = array(
+				'id'                => (int) $image_id,
+				'date_created'      => wc_rest_prepare_date_response( $attachment->post_date ),
+				'date_created_gmt'  => wc_rest_prepare_date_response( $attachment->post_date_gmt ),
+				'date_modified'     => wc_rest_prepare_date_response( $attachment->post_modified ),
+				'date_modified_gmt' => wc_rest_prepare_date_response( $attachment->post_modified_gmt ),
+				'src'               => wp_get_attachment_url( $image_id ),
+				'title'             => get_the_title( $attachment ),
+				'alt'               => get_post_meta( $image_id, '_wp_attachment_image_alt', true ),
+			);
+		}
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		$response = rest_ensure_response( $data );
+
+		$response->add_links( $this->prepare_links( $item, $request ) );
+
+		/**
+		 * Filter a term item returned from the API.
+		 *
+		 * Allows modification of the term data right before it is returned.
+		 *
+		 * @param WP_REST_Response  $response  The response object.
+		 * @param object            $item      The original term object.
+		 * @param WP_REST_Request   $request   Request used to generate the response.
+		 */
+		return apply_filters( "woocommerce_rest_prepare_{$this->taxonomy}", $response, $item, $request );
+	}
+
+	/**
+	 * Get the Category schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'              => 'http://json-schema.org/draft-04/schema#',
+			'title'                => $this->taxonomy,
+			'type'                 => 'object',
+			'properties'           => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'name' => array(
+					'description' => __( 'Category name.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'arg_options' => array(
+						'sanitize_callback' => 'sanitize_text_field',
+					),
+				),
+				'slug' => array(
+					'description' => __( 'An alphanumeric identifier for the resource unique to its type.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'arg_options' => array(
+						'sanitize_callback' => 'sanitize_title',
+					),
+				),
+				'parent' => array(
+					'description' => __( 'The ID for the parent of the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'description' => array(
+					'description' => __( 'HTML description of the resource.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'arg_options' => array(
+						'sanitize_callback' => 'wp_filter_post_kses',
+					),
+				),
+				'display' => array(
+					'description' => __( 'Category archive display type.', 'woocommerce' ),
+					'type'        => 'string',
+					'default'     => 'default',
+					'enum'        => array( 'default', 'products', 'subcategories', 'both' ),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'image' => array(
+					'description' => __( 'Image data.', 'woocommerce' ),
+					'type'        => 'object',
+					'context'     => array( 'view', 'edit' ),
+					'properties'  => array(
+						'id' => array(
+							'description' => __( 'Image ID.', 'woocommerce' ),
+							'type'        => 'integer',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'date_created' => array(
+							'description' => __( "The date the image was created, in the site's timezone.", 'woocommerce' ),
+							'type'        => 'date-time',
+							'context'     => array( 'view', 'edit' ),
+							'readonly'    => true,
+						),
+						'date_created_gmt' => array(
+							'description' => __( 'The date the image was created, as GMT.', 'woocommerce' ),
+							'type'        => 'date-time',
+							'context'     => array( 'view', 'edit' ),
+							'readonly'    => true,
+						),
+						'date_modified' => array(
+							'description' => __( "The date the image was last modified, in the site's timezone.", 'woocommerce' ),
+							'type'        => 'date-time',
+							'context'     => array( 'view', 'edit' ),
+							'readonly'    => true,
+						),
+						'date_modified_gmt' => array(
+							'description' => __( 'The date the image was last modified, as GMT.', 'woocommerce' ),
+							'type'        => 'date-time',
+							'context'     => array( 'view', 'edit' ),
+							'readonly'    => true,
+						),
+						'src' => array(
+							'description' => __( 'Image URL.', 'woocommerce' ),
+							'type'        => 'string',
+							'format'      => 'uri',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'name' => array(
+							'description' => __( 'Image name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'alt' => array(
+							'description' => __( 'Image alternative text.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+					),
+				),
+				'menu_order' => array(
+					'description' => __( 'Menu order, used to custom sort the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'count' => array(
+					'description' => __( 'Number of published products for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+}
diff --git a/includes/api/class-wc-rest-product-reviews-controller.php b/includes/api/class-wc-rest-product-reviews-controller.php
new file mode 100644
index 00000000000..9c49a1d8568
--- /dev/null
+++ b/includes/api/class-wc-rest-product-reviews-controller.php
@@ -0,0 +1,201 @@
+<?php
+/**
+ * REST API Product Reviews Controller
+ *
+ * Handles requests to /products/<product_id>/reviews.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Product Reviews Controller Class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Product_Reviews_V1_Controller
+ */
+class WC_REST_Product_Reviews_Controller extends WC_REST_Product_Reviews_V1_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v2';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'products/(?P<product_id>[\d]+)/reviews';
+
+	/**
+	 * Register the routes for product reviews.
+	 */
+	public function register_routes() {
+		parent::register_routes();
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/batch', array(
+			'args' => array(
+				'product_id' => array(
+					'description' => __( 'Unique identifier for the variable product.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'batch_items' ),
+				'permission_callback' => array( $this, 'batch_items_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			'schema' => array( $this, 'get_public_batch_schema' ),
+		) );
+	}
+
+	/**
+	 * Check if a given request has access to batch manage product reviews.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function batch_items_permissions_check( $request ) {
+		if ( ! wc_rest_check_post_permissions( 'product', 'batch' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_edit', __( 'Sorry, you are not allowed to batch manipulate this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+		return true;
+	}
+
+	/**
+	 * Prepare a single product review output for response.
+	 *
+	 * @param WP_Comment $review Product review object.
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response $response Response data.
+	 */
+	public function prepare_item_for_response( $review, $request ) {
+		$data = array(
+			'id'               => (int) $review->comment_ID,
+			'date_created'     => wc_rest_prepare_date_response( $review->comment_date ),
+			'date_created_gmt' => wc_rest_prepare_date_response( $review->comment_date_gmt ),
+			'review'           => $review->comment_content,
+			'rating'           => (int) get_comment_meta( $review->comment_ID, 'rating', true ),
+			'name'             => $review->comment_author,
+			'email'            => $review->comment_author_email,
+			'verified'         => wc_review_is_from_verified_owner( $review->comment_ID ),
+		);
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		// Wrap the data in a response object.
+		$response = rest_ensure_response( $data );
+
+		$response->add_links( $this->prepare_links( $review, $request ) );
+
+		/**
+		 * Filter product reviews object returned from the REST API.
+		 *
+		 * @param WP_REST_Response $response The response object.
+		 * @param WP_Comment       $review   Product review object used to create response.
+		 * @param WP_REST_Request  $request  Request object.
+		 */
+		return apply_filters( 'woocommerce_rest_prepare_product_review', $response, $review, $request );
+	}
+
+
+	/**
+	 * Bulk create, update and delete items.
+	 *
+	 * @since  3.0.0
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return array Of WP_Error or WP_REST_Response.
+	 */
+	public function batch_items( $request ) {
+		$items       = array_filter( $request->get_params() );
+		$params      = $request->get_url_params();
+		$product_id  = $params['product_id'];
+		$body_params = array();
+
+		foreach ( array( 'update', 'create', 'delete' ) as $batch_type ) {
+			if ( ! empty( $items[ $batch_type ] ) ) {
+				$injected_items = array();
+				foreach ( $items[ $batch_type ] as $item ) {
+					$injected_items[] = is_array( $item ) ? array_merge( array( 'product_id' => $product_id ), $item ) : $item;
+				}
+				$body_params[ $batch_type ] = $injected_items;
+			}
+		}
+
+		$request = new WP_REST_Request( $request->get_method() );
+		$request->set_body_params( $body_params );
+
+		return parent::batch_items( $request );
+	}
+
+	/**
+	 * Get the Product Review's schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'product_review',
+			'type'       => 'object',
+			'properties' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'review' => array(
+					'description' => __( 'The content of the review.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'date_created' => array(
+					'description' => __( "The date the review was created, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'date_created_gmt' => array(
+					'description' => __( "The date the review was created, as GMT.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'rating' => array(
+					'description' => __( 'Review rating (0 to 5).', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'name' => array(
+					'description' => __( 'Reviewer name.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'email' => array(
+					'description' => __( 'Reviewer email.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'verified' => array(
+					'description' => __( 'Shows if the reviewer bought the product or not.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+}
diff --git a/includes/api/class-wc-rest-product-shipping-classes-controller.php b/includes/api/class-wc-rest-product-shipping-classes-controller.php
new file mode 100644
index 00000000000..072ad524d30
--- /dev/null
+++ b/includes/api/class-wc-rest-product-shipping-classes-controller.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * REST API Product Shipping Classes controller
+ *
+ * Handles requests to the products/shipping_classes endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Product Shipping Classes controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Product_Shipping_Classes_V1_Controller
+ */
+class WC_REST_Product_Shipping_Classes_Controller extends WC_REST_Product_Shipping_Classes_V1_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v2';
+}
diff --git a/includes/api/class-wc-rest-product-tags-controller.php b/includes/api/class-wc-rest-product-tags-controller.php
new file mode 100644
index 00000000000..3ed2d051b61
--- /dev/null
+++ b/includes/api/class-wc-rest-product-tags-controller.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * REST API Product Tags controller
+ *
+ * Handles requests to the products/tags endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Product Tags controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Product_Tags_V1_Controller
+ */
+class WC_REST_Product_Tags_Controller extends WC_REST_Product_Tags_V1_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v2';
+}
diff --git a/includes/api/class-wc-rest-product-variations-controller.php b/includes/api/class-wc-rest-product-variations-controller.php
new file mode 100644
index 00000000000..d1a42fd7281
--- /dev/null
+++ b/includes/api/class-wc-rest-product-variations-controller.php
@@ -0,0 +1,943 @@
+<?php
+/**
+ * REST API variations controller
+ *
+ * Handles requests to the /products/<product_id>/variations endpoints.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API variations controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Products_Controller
+ */
+class WC_REST_Product_Variations_Controller extends WC_REST_Products_Controller {
+
+	/**
+ 	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v2';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'products/(?P<product_id>[\d]+)/variations';
+
+	/**
+	 * Post type.
+	 *
+	 * @var string
+	 */
+	protected $post_type = 'product_variation';
+
+	/**
+	 * Initialize product actions (parent).
+	 */
+	public function __construct() {
+		add_filter( "woocommerce_rest_{$this->post_type}_query", array( $this, 'add_product_id' ), 9, 2 );
+		parent::__construct();
+	}
+
+	/**
+	 * Register the routes for products.
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
+			'args' => array(
+				'product_id' => array(
+					'description' => __( 'Unique identifier for the variable product.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+				'args'                => $this->get_collection_params(),
+			),
+			array(
+				'methods'             => WP_REST_Server::CREATABLE,
+				'callback'            => array( $this, 'create_item' ),
+				'permission_callback' => array( $this, 'create_item_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
+			'args' => array(
+				'product_id' => array(
+					'description' => __( 'Unique identifier for the variable product.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+				'id' => array(
+					'description' => __( 'Unique identifier for the variation.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_item' ),
+				'permission_callback' => array( $this, 'get_item_permissions_check' ),
+				'args'                => array(
+					'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'update_item' ),
+				'permission_callback' => array( $this, 'update_item_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			array(
+				'methods'             => WP_REST_Server::DELETABLE,
+				'callback'            => array( $this, 'delete_item' ),
+				'permission_callback' => array( $this, 'delete_item_permissions_check' ),
+				'args'                => array(
+					'force' => array(
+						'default'     => false,
+						'type'        => 'boolean',
+						'description' => __( 'Whether to bypass trash and force deletion.', 'woocommerce' ),
+					),
+				),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/batch', array(
+			'args' => array(
+				'product_id' => array(
+					'description' => __( 'Unique identifier for the variable product.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'batch_items' ),
+				'permission_callback' => array( $this, 'batch_items_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			'schema' => array( $this, 'get_public_batch_schema' ),
+		) );
+	}
+
+	/**
+	 * Get object.
+	 *
+	 * @since  3.0.0
+	 * @param  int $id Object ID.
+	 * @return WC_Data
+	 */
+	protected function get_object( $id ) {
+		return wc_get_product( $id );
+	}
+
+	/**
+	 * Prepare a single variation output for response.
+	 *
+	 * @since  3.0.0
+	 * @param  WC_Data         $object  Object data.
+	 * @param  WP_REST_Request $request Request object.
+	 * @return WP_REST_Response
+	 */
+	public function prepare_object_for_response( $object, $request ) {
+		$data = array(
+			'id'                    => $object->get_id(),
+			'date_created'          => wc_rest_prepare_date_response( $object->get_date_created(), false ),
+			'date_created_gmt'      => wc_rest_prepare_date_response( $object->get_date_created() ),
+			'date_modified'         => wc_rest_prepare_date_response( $object->get_date_modified(), false ),
+			'date_modified_gmt'     => wc_rest_prepare_date_response( $object->get_date_modified() ),
+			'description'           => wc_format_content( $object->get_description() ),
+			'permalink'             => $object->get_permalink(),
+			'sku'                   => $object->get_sku(),
+			'price'                 => $object->get_price(),
+			'regular_price'         => $object->get_regular_price(),
+			'sale_price'            => $object->get_sale_price(),
+			'date_on_sale_from'     => wc_rest_prepare_date_response( $object->get_date_on_sale_from(), false ),
+			'date_on_sale_from_gmt' => wc_rest_prepare_date_response( $object->get_date_on_sale_from() ),
+			'date_on_sale_to'       => wc_rest_prepare_date_response( $object->get_date_on_sale_to(), false ),
+			'date_on_sale_to_gmt'   => wc_rest_prepare_date_response( $object->get_date_on_sale_to() ),
+			'on_sale'               => $object->is_on_sale(),
+			'visible'               => $object->is_visible(),
+			'purchasable'           => $object->is_purchasable(),
+			'virtual'               => $object->is_virtual(),
+			'downloadable'          => $object->is_downloadable(),
+			'downloads'             => $this->get_downloads( $object ),
+			'download_limit'        => '' !== $object->get_download_limit() ? (int) $object->get_download_limit() : -1,
+			'download_expiry'       => '' !== $object->get_download_expiry() ? (int) $object->get_download_expiry() : -1,
+			'tax_status'            => $object->get_tax_status(),
+			'tax_class'             => $object->get_tax_class(),
+			'manage_stock'          => $object->managing_stock(),
+			'stock_quantity'        => $object->get_stock_quantity(),
+			'in_stock'              => $object->is_in_stock(),
+			'backorders'            => $object->get_backorders(),
+			'backorders_allowed'    => $object->backorders_allowed(),
+			'backordered'           => $object->is_on_backorder(),
+			'weight'                => $object->get_weight(),
+			'dimensions'            => array(
+				'length'            => $object->get_length(),
+				'width'             => $object->get_width(),
+				'height'            => $object->get_height(),
+			),
+			'shipping_class'        => $object->get_shipping_class(),
+			'shipping_class_id'     => $object->get_shipping_class_id(),
+			'image'                 => current( $this->get_images( $object ) ),
+			'attributes'            => $this->get_attributes( $object ),
+			'menu_order'            => $object->get_menu_order(),
+			'meta_data'             => $object->get_meta_data(),
+		);
+
+		$context  = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data     = $this->add_additional_fields_to_object( $data, $request );
+		$data     = $this->filter_response_by_context( $data, $context );
+		$response = rest_ensure_response( $data );
+		$response->add_links( $this->prepare_links( $object, $request ) );
+
+		/**
+		 * Filter the data for a response.
+		 *
+		 * The dynamic portion of the hook name, $this->post_type,
+		 * refers to object type being prepared for the response.
+		 *
+		 * @param WP_REST_Response $response The response object.
+		 * @param WC_Data          $object   Object data.
+		 * @param WP_REST_Request  $request  Request object.
+		 */
+		return apply_filters( "woocommerce_rest_prepare_{$this->post_type}_object", $response, $object, $request );
+	}
+
+	/**
+	 * Prepare objects query.
+	 *
+	 * @since  3.0.0
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return array
+	 */
+	protected function prepare_objects_query( $request ) {
+		$args = parent::prepare_objects_query( $request );
+
+		$args['post_parent'] = $request['product_id'];
+
+		return $args;
+	}
+
+	/**
+	 * Prepare a single variation for create or update.
+	 *
+	 * @param  WP_REST_Request $request Request object.
+	 * @param  bool            $creating If is creating a new object.
+	 * @return WP_Error|WC_Data
+	 */
+	protected function prepare_object_for_database( $request, $creating = false ) {
+		if ( isset( $request['id'] ) ) {
+			$variation = wc_get_product( absint( $request['id'] ) );
+		} else {
+			$variation = new WC_Product_Variation();
+		}
+
+		$variation->set_parent_id( absint( $request['product_id'] ) );
+
+		// Status.
+		if ( isset( $request['visible'] ) ) {
+			$variation->set_status( false === $request['visible'] ? 'private' : 'publish' );
+		}
+
+		// SKU.
+		if ( isset( $request['sku'] ) ) {
+			$variation->set_sku( wc_clean( $request['sku'] ) );
+		}
+
+		// Thumbnail.
+		if ( isset( $request['image'] ) ) {
+			if ( is_array( $request['image'] ) ) {
+				$image = $request['image'];
+				if ( is_array( $image ) ) {
+					$image['position'] = 0;
+				}
+
+				$variation = $this->set_product_images( $variation, array( $image ) );
+			} else {
+				$variation->set_image_id( '' );
+			}
+		}
+
+		// Virtual variation.
+		if ( isset( $request['virtual'] ) ) {
+			$variation->set_virtual( $request['virtual'] );
+		}
+
+		// Downloadable variation.
+		if ( isset( $request['downloadable'] ) ) {
+			$variation->set_downloadable( $request['downloadable'] );
+		}
+
+		// Downloads.
+		if ( $variation->get_downloadable() ) {
+			// Downloadable files.
+			if ( isset( $request['downloads'] ) && is_array( $request['downloads'] ) ) {
+				$variation = $this->save_downloadable_files( $variation, $request['downloads'] );
+			}
+
+			// Download limit.
+			if ( isset( $request['download_limit'] ) ) {
+				$variation->set_download_limit( $request['download_limit'] );
+			}
+
+			// Download expiry.
+			if ( isset( $request['download_expiry'] ) ) {
+				$variation->set_download_expiry( $request['download_expiry'] );
+			}
+		}
+
+		// Shipping data.
+		$variation = $this->save_product_shipping_data( $variation, $request );
+
+		// Stock handling.
+		if ( isset( $request['manage_stock'] ) ) {
+			$variation->set_manage_stock( $request['manage_stock'] );
+		}
+
+		if ( isset( $request['in_stock'] ) ) {
+			$variation->set_stock_status( true === $request['in_stock'] ? 'instock' : 'outofstock' );
+		}
+
+		if ( isset( $request['backorders'] ) ) {
+			$variation->set_backorders( $request['backorders'] );
+		}
+
+		if ( $variation->get_manage_stock() ) {
+			if ( isset( $request['stock_quantity'] ) ) {
+				$variation->set_stock_quantity( $request['stock_quantity'] );
+			} elseif ( isset( $request['inventory_delta'] ) ) {
+				$stock_quantity  = wc_stock_amount( $variation->get_stock_quantity() );
+				$stock_quantity += wc_stock_amount( $request['inventory_delta'] );
+				$variation->set_stock_quantity( $stock_quantity );
+			}
+		} else {
+			$variation->set_backorders( 'no' );
+			$variation->set_stock_quantity( '' );
+		}
+
+		// Regular Price.
+		if ( isset( $request['regular_price'] ) ) {
+			$variation->set_regular_price( $request['regular_price'] );
+		}
+
+		// Sale Price.
+		if ( isset( $request['sale_price'] ) ) {
+			$variation->set_sale_price( $request['sale_price'] );
+		}
+
+		if ( isset( $request['date_on_sale_from'] ) ) {
+			$variation->set_date_on_sale_from( $request['date_on_sale_from'] );
+		}
+
+		if ( isset( $request['date_on_sale_from_gmt'] ) ) {
+			$variation->set_date_on_sale_from( $request['date_on_sale_from_gmt'] ? strtotime( $request['date_on_sale_from_gmt'] ) : null );
+		}
+
+		if ( isset( $request['date_on_sale_to'] ) ) {
+			$variation->set_date_on_sale_to( $request['date_on_sale_to'] );
+		}
+
+		if ( isset( $request['date_on_sale_to_gmt'] ) ) {
+			$variation->set_date_on_sale_to( $request['date_on_sale_to_gmt'] ? strtotime( $request['date_on_sale_to_gmt'] ) : null );
+		}
+
+		// Tax class.
+		if ( isset( $request['tax_class'] ) ) {
+			$variation->set_tax_class( $request['tax_class'] );
+		}
+
+		// Description.
+		if ( isset( $request['description'] ) ) {
+			$variation->set_description( wp_kses_post( $request['description'] ) );
+		}
+
+		// Update taxonomies.
+		if ( isset( $request['attributes'] ) ) {
+			$attributes        = array();
+			$parent            = wc_get_product( $variation->get_parent_id() );
+			$parent_attributes = $parent->get_attributes();
+
+			foreach ( $request['attributes'] as $attribute ) {
+				$attribute_id   = 0;
+				$attribute_name = '';
+
+				// Check ID for global attributes or name for product attributes.
+				if ( ! empty( $attribute['id'] ) ) {
+					$attribute_id   = absint( $attribute['id'] );
+					$attribute_name = wc_attribute_taxonomy_name_by_id( $attribute_id );
+				} elseif ( ! empty( $attribute['name'] ) ) {
+					$attribute_name = sanitize_title( $attribute['name'] );
+				}
+
+				if ( ! $attribute_id && ! $attribute_name ) {
+					continue;
+				}
+
+				if ( ! isset( $parent_attributes[ $attribute_name ] ) || ! $parent_attributes[ $attribute_name ]->get_variation() ) {
+					continue;
+				}
+
+				$attribute_key   = sanitize_title( $parent_attributes[ $attribute_name ]->get_name() );
+				$attribute_value = isset( $attribute['option'] ) ? wc_clean( stripslashes( $attribute['option'] ) ) : '';
+
+				if ( $parent_attributes[ $attribute_name ]->is_taxonomy() ) {
+					// If dealing with a taxonomy, we need to get the slug from the name posted to the API.
+					$term = get_term_by( 'name', $attribute_value, $attribute_name );
+
+					if ( $term && ! is_wp_error( $term ) ) {
+						$attribute_value = $term->slug;
+					} else {
+						$attribute_value = sanitize_title( $attribute_value );
+					}
+				}
+
+				$attributes[ $attribute_key ] = $attribute_value;
+			}
+
+			$variation->set_attributes( $attributes );
+		}
+
+		// Menu order.
+		if ( $request['menu_order'] ) {
+			$variation->set_menu_order( $request['menu_order'] );
+		}
+
+		// Meta data.
+		if ( is_array( $request['meta_data'] ) ) {
+			foreach ( $request['meta_data'] as $meta ) {
+				$variation->update_meta_data( $meta['key'], $meta['value'], isset( $meta['id'] ) ? $meta['id'] : '' );
+			}
+		}
+
+		/**
+		 * Filters an object before it is inserted via the REST API.
+		 *
+		 * The dynamic portion of the hook name, `$this->post_type`,
+		 * refers to the object type slug.
+		 *
+		 * @param WC_Data         $variation Object object.
+		 * @param WP_REST_Request $request   Request object.
+		 * @param bool            $creating  If is creating a new object.
+		 */
+		return apply_filters( "woocommerce_rest_pre_insert_{$this->post_type}_object", $variation, $request, $creating );
+	}
+
+	/**
+	 * Clear caches here so in sync with any new variations.
+	 *
+	 * @param WC_Data $object Object data.
+	 */
+	public function clear_transients( $object ) {
+		wc_delete_product_transients( $object->get_parent_id() );
+		wp_cache_delete( 'product-' . $object->get_parent_id(), 'products' );
+	}
+
+	/**
+	 * Delete a variation.
+	 *
+	 * @param WP_REST_Request $request Full details about the request
+	 * @return WP_Error|boolean
+	 */
+	public function delete_item( $request ) {
+		$id     = absint( is_array( $request['id'] ) ? $request['id']['id'] : $request['id'] );
+		$force  = (bool) $request['force'];
+		$object = $this->get_object( (int) $request['id'] );
+		$result = false;
+
+		if ( ! $object || 0 === $object->get_id() ) {
+			return new WP_Error( "woocommerce_rest_{$this->post_type}_invalid_id", __( 'Invalid ID.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$supports_trash = EMPTY_TRASH_DAYS > 0 && is_callable( array( $object, 'get_status' ) );
+
+		/**
+		 * Filter whether an object is trashable.
+		 *
+		 * Return false to disable trash support for the object.
+		 *
+		 * @param boolean $supports_trash Whether the object type support trashing.
+		 * @param WC_Data $object         The object being considered for trashing support.
+		 */
+		$supports_trash = apply_filters( "woocommerce_rest_{$this->post_type}_object_trashable", $supports_trash, $object );
+
+		if ( ! wc_rest_check_post_permissions( $this->post_type, 'delete', $object->get_id() ) ) {
+			/* translators: %s: post type */
+			return new WP_Error( "woocommerce_rest_user_cannot_delete_{$this->post_type}", sprintf( __( 'Sorry, you are not allowed to delete %s.', 'woocommerce' ), $this->post_type ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_object_for_response( $object, $request );
+
+		// If we're forcing, then delete permanently.
+		if ( $force ) {
+			$object->delete( true );
+			$result = 0 === $object->get_id();
+		} else {
+			// If we don't support trashing for this type, error out.
+			if ( ! $supports_trash ) {
+				/* translators: %s: post type */
+				return new WP_Error( 'woocommerce_rest_trash_not_supported', sprintf( __( 'The %s does not support trashing.', 'woocommerce' ), $this->post_type ), array( 'status' => 501 ) );
+			}
+
+			// Otherwise, only trash if we haven't already.
+			if ( is_callable( array( $object, 'get_status' ) ) ) {
+				if ( 'trash' === $object->get_status() ) {
+					/* translators: %s: post type */
+					return new WP_Error( 'woocommerce_rest_already_trashed', sprintf( __( 'The %s has already been deleted.', 'woocommerce' ), $this->post_type ), array( 'status' => 410 ) );
+				}
+
+				$object->delete();
+				$result = 'trash' === $object->get_status();
+			}
+		}
+
+		if ( ! $result ) {
+			/* translators: %s: post type */
+			return new WP_Error( 'woocommerce_rest_cannot_delete', sprintf( __( 'The %s cannot be deleted.', 'woocommerce' ), $this->post_type ), array( 'status' => 500 ) );
+		}
+
+		// Delete parent product transients.
+		if ( 0 !== $object->get_parent_id() ) {
+			wc_delete_product_transients( $object->get_parent_id() );
+		}
+
+		/**
+		 * Fires after a single object is deleted or trashed via the REST API.
+		 *
+		 * @param WC_Data          $object   The deleted or trashed object.
+		 * @param WP_REST_Response $response The response data.
+		 * @param WP_REST_Request  $request  The request sent to the API.
+		 */
+		do_action( "woocommerce_rest_delete_{$this->post_type}_object", $object, $response, $request );
+
+		return $response;
+	}
+
+	/**
+	 * Bulk create, update and delete items.
+	 *
+	 * @since  3.0.0
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return array Of WP_Error or WP_REST_Response.
+	 */
+	public function batch_items( $request ) {
+		$items       = array_filter( $request->get_params() );
+		$params      = $request->get_url_params();
+		$product_id  = $params['product_id'];
+		$body_params = array();
+
+		foreach ( array( 'update', 'create', 'delete' ) as $batch_type ) {
+			if ( ! empty( $items[ $batch_type ] ) ) {
+				$injected_items = array();
+				foreach ( $items[ $batch_type ] as $item ) {
+					$injected_items[] = is_array( $item ) ? array_merge( array( 'product_id' => $product_id ), $item ) : $item;
+				}
+				$body_params[ $batch_type ] = $injected_items;
+			}
+		}
+
+		$request = new WP_REST_Request( $request->get_method() );
+		$request->set_body_params( $body_params );
+
+		return parent::batch_items( $request );
+	}
+
+	/**
+	 * Prepare links for the request.
+	 *
+	 * @param WC_Data         $object  Object data.
+	 * @param WP_REST_Request $request Request object.
+	 * @return array                   Links for the given post.
+	 */
+	protected function prepare_links( $object, $request ) {
+		$product_id = (int) $request['product_id'];
+		$base       = str_replace( '(?P<product_id>[\d]+)', $product_id, $this->rest_base );
+		$links      = array(
+			'self' => array(
+				'href' => rest_url( sprintf( '/%s/%s/%d', $this->namespace, $base, $object->get_id() ) ),
+			),
+			'collection' => array(
+				'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $base ) ),
+			),
+			'up' => array(
+				'href' => rest_url( sprintf( '/%s/products/%d', $this->namespace, $product_id ) ),
+			),
+		);
+		return $links;
+	}
+
+	/**
+	 * Get the Variation's schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$weight_unit    = get_option( 'woocommerce_weight_unit' );
+		$dimension_unit = get_option( 'woocommerce_dimension_unit' );
+		$schema         = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => $this->post_type,
+			'type'       => 'object',
+			'properties' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_created' => array(
+					'description' => __( "The date the variation was created, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_modified' => array(
+					'description' => __( "The date the variation was last modified, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'description' => array(
+					'description' => __( 'Variation description.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'permalink' => array(
+					'description' => __( 'Variation URL.', 'woocommerce' ),
+					'type'        => 'string',
+					'format'      => 'uri',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'sku' => array(
+					'description' => __( 'Unique identifier.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'price' => array(
+					'description' => __( 'Current variation price.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'regular_price' => array(
+					'description' => __( 'Variation regular price.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'sale_price' => array(
+					'description' => __( 'Variation sale price.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'date_on_sale_from' => array(
+					'description' => __( "Start date of sale price, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'date_on_sale_from_gmt' => array(
+					'description' => __( 'Start date of sale price, as GMT.', 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'date_on_sale_to' => array(
+					'description' => __( "End date of sale price, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'date_on_sale_to_gmt' => array(
+					'description' => __( "End date of sale price, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'on_sale' => array(
+					'description' => __( 'Shows if the variation is on sale.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'visible' => array(
+					'description' => __( "Define if the attribute is visible on the \"Additional information\" tab in the product's page.", 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => true,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'purchasable' => array(
+					'description' => __( 'Shows if the variation can be bought.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'virtual' => array(
+					'description' => __( 'If the variation is virtual.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => false,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'downloadable' => array(
+					'description' => __( 'If the variation is downloadable.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => false,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'downloads' => array(
+					'description' => __( 'List of downloadable files.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'File MD5 hash.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'name' => array(
+								'description' => __( 'File name.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'file' => array(
+								'description' => __( 'File URL.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+						),
+					),
+				),
+				'download_limit' => array(
+					'description' => __( 'Number of times downloadable files can be downloaded after purchase.', 'woocommerce' ),
+					'type'        => 'integer',
+					'default'     => -1,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'download_expiry' => array(
+					'description' => __( 'Number of days until access to downloadable files expires.', 'woocommerce' ),
+					'type'        => 'integer',
+					'default'     => -1,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'tax_status' => array(
+					'description' => __( 'Tax status.', 'woocommerce' ),
+					'type'        => 'string',
+					'default'     => 'taxable',
+					'enum'        => array( 'taxable', 'shipping', 'none' ),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'tax_class' => array(
+					'description' => __( 'Tax class.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'manage_stock' => array(
+					'description' => __( 'Stock management at variation level.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => false,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'stock_quantity' => array(
+					'description' => __( 'Stock quantity.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'in_stock' => array(
+					'description' => __( 'Controls whether or not the variation is listed as "in stock" or "out of stock" on the frontend.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => true,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'backorders' => array(
+					'description' => __( 'If managing stock, this controls if backorders are allowed.', 'woocommerce' ),
+					'type'        => 'string',
+					'default'     => 'no',
+					'enum'        => array( 'no', 'notify', 'yes' ),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'backorders_allowed' => array(
+					'description' => __( 'Shows if backorders are allowed.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'backordered' => array(
+					'description' => __( 'Shows if the variation is on backordered.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'weight' => array(
+					/* translators: %s: weight unit */
+					'description' => sprintf( __( 'Variation weight (%s).', 'woocommerce' ), $weight_unit ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'dimensions' => array(
+					'description' => __( 'Variation dimensions.', 'woocommerce' ),
+					'type'        => 'object',
+					'context'     => array( 'view', 'edit' ),
+					'properties'  => array(
+						'length' => array(
+							/* translators: %s: dimension unit */
+							'description' => sprintf( __( 'Variation length (%s).', 'woocommerce' ), $dimension_unit ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'width' => array(
+							/* translators: %s: dimension unit */
+							'description' => sprintf( __( 'Variation width (%s).', 'woocommerce' ), $dimension_unit ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'height' => array(
+							/* translators: %s: dimension unit */
+							'description' => sprintf( __( 'Variation height (%s).', 'woocommerce' ), $dimension_unit ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+					),
+				),
+				'shipping_class' => array(
+					'description' => __( 'Shipping class slug.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'shipping_class_id' => array(
+					'description' => __( 'Shipping class ID.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'image' => array(
+					'description' => __( 'Variation image data.', 'woocommerce' ),
+					'type'        => 'object',
+					'context'     => array( 'view', 'edit' ),
+					'properties'  => array(
+						'id' => array(
+							'description' => __( 'Image ID.', 'woocommerce' ),
+							'type'        => 'integer',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'date_created' => array(
+							'description' => __( "The date the image was created, in the site's timezone.", 'woocommerce' ),
+							'type'        => 'date-time',
+							'context'     => array( 'view', 'edit' ),
+							'readonly'    => true,
+						),
+						'date_created_gmt' => array(
+							'description' => __( 'The date the image was created, as GMT.', 'woocommerce' ),
+							'type'        => 'date-time',
+							'context'     => array( 'view', 'edit' ),
+							'readonly'    => true,
+						),
+						'date_modified' => array(
+							'description' => __( "The date the image was last modified, in the site's timezone.", 'woocommerce' ),
+							'type'        => 'date-time',
+							'context'     => array( 'view', 'edit' ),
+							'readonly'    => true,
+						),
+						'date_modified_gmt' => array(
+							'description' => __( 'The date the image was last modified, as GMT.', 'woocommerce' ),
+							'type'        => 'date-time',
+							'context'     => array( 'view', 'edit' ),
+							'readonly'    => true,
+						),
+						'src' => array(
+							'description' => __( 'Image URL.', 'woocommerce' ),
+							'type'        => 'string',
+							'format'      => 'uri',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'name' => array(
+							'description' => __( 'Image name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'alt' => array(
+							'description' => __( 'Image alternative text.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'position' => array(
+							'description' => __( 'Image position. 0 means that the image is featured.', 'woocommerce' ),
+							'type'        => 'integer',
+							'context'     => array( 'view', 'edit' ),
+						),
+					),
+				),
+				'attributes' => array(
+					'description' => __( 'List of attributes.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Attribute ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'name' => array(
+								'description' => __( 'Attribute name.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'option' => array(
+								'description' => __( 'Selected attribute term name.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+						),
+					),
+				),
+				'menu_order' => array(
+					'description' => __( 'Menu order, used to custom sort products.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'meta_data' => array(
+					'description' => __( 'Meta data.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Meta ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'key' => array(
+								'description' => __( 'Meta key.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'value' => array(
+								'description' => __( 'Meta value.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+						),
+					),
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+}
diff --git a/includes/api/class-wc-rest-products-controller.php b/includes/api/class-wc-rest-products-controller.php
new file mode 100644
index 00000000000..8423d2b36c7
--- /dev/null
+++ b/includes/api/class-wc-rest-products-controller.php
@@ -0,0 +1,2077 @@
+<?php
+/**
+ * REST API Products controller
+ *
+ * Handles requests to the /products endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Products controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_CRUD_Controller
+ */
+class WC_REST_Products_Controller extends WC_REST_Legacy_Products_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v2';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'products';
+
+	/**
+	 * Post type.
+	 *
+	 * @var string
+	 */
+	protected $post_type = 'product';
+
+	/**
+	 * If object is hierarchical.
+	 *
+	 * @var bool
+	 */
+	protected $hierarchical = true;
+
+	/**
+	 * Initialize product actions.
+	 */
+	public function __construct() {
+		add_action( "woocommerce_rest_insert_{$this->post_type}_object", array( $this, 'clear_transients' ) );
+	}
+
+	/**
+	 * Register the routes for products.
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+				'args'                => $this->get_collection_params(),
+			),
+			array(
+				'methods'             => WP_REST_Server::CREATABLE,
+				'callback'            => array( $this, 'create_item' ),
+				'permission_callback' => array( $this, 'create_item_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
+			'args' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_item' ),
+				'permission_callback' => array( $this, 'get_item_permissions_check' ),
+				'args'                => array(
+					'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'update_item' ),
+				'permission_callback' => array( $this, 'update_item_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			array(
+				'methods'             => WP_REST_Server::DELETABLE,
+				'callback'            => array( $this, 'delete_item' ),
+				'permission_callback' => array( $this, 'delete_item_permissions_check' ),
+				'args'                => array(
+					'force' => array(
+						'default'     => false,
+						'description' => __( 'Whether to bypass trash and force deletion.', 'woocommerce' ),
+						'type'        => 'boolean',
+					),
+				),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/batch', array(
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'batch_items' ),
+				'permission_callback' => array( $this, 'batch_items_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			'schema' => array( $this, 'get_public_batch_schema' ),
+		) );
+	}
+
+	/**
+	 * Get object.
+	 *
+	 * @since  3.0.0
+	 * @param  int $id Object ID.
+	 * @return WC_Data
+	 */
+	protected function get_object( $id ) {
+		return wc_get_product( $id );
+	}
+
+	/**
+	 * Prepare a single product output for response.
+	 *
+	 * @since  3.0.0
+	 * @param  WC_Data         $object  Object data.
+	 * @param  WP_REST_Request $request Request object.
+	 * @return WP_REST_Response
+	 */
+	public function prepare_object_for_response( $object, $request ) {
+		$data = $this->get_product_data( $object );
+
+		// Add variations to variable products.
+		if ( $object->is_type( 'variable' ) && $object->has_child() ) {
+			$data['variations'] = $object->get_children();
+		}
+
+		// Add grouped products data.
+		if ( $object->is_type( 'grouped' ) && $object->has_child() ) {
+			$data['grouped_products'] = $object->get_children();
+		}
+
+		$context  = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data     = $this->add_additional_fields_to_object( $data, $request );
+		$data     = $this->filter_response_by_context( $data, $context );
+		$response = rest_ensure_response( $data );
+		$response->add_links( $this->prepare_links( $object, $request ) );
+
+		/**
+		 * Filter the data for a response.
+		 *
+		 * The dynamic portion of the hook name, $this->post_type,
+		 * refers to object type being prepared for the response.
+		 *
+		 * @param WP_REST_Response $response The response object.
+		 * @param WC_Data          $object   Object data.
+		 * @param WP_REST_Request  $request  Request object.
+		 */
+		return apply_filters( "woocommerce_rest_prepare_{$this->post_type}_object", $response, $object, $request );
+	}
+
+	/**
+	 * Prepare objects query.
+	 *
+	 * @since  3.0.0
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return array
+	 */
+	protected function prepare_objects_query( $request ) {
+		$args = parent::prepare_objects_query( $request );
+
+		// Set post_status.
+		$args['post_status'] = $request['status'];
+
+		// Taxonomy query to filter products by type, category,
+		// tag, shipping class, and attribute.
+		$tax_query = array();
+
+		// Map between taxonomy name and arg's key.
+		$taxonomies = array(
+			'product_cat'            => 'category',
+			'product_tag'            => 'tag',
+			'product_shipping_class' => 'shipping_class',
+		);
+
+		// Set tax_query for each passed arg.
+		foreach ( $taxonomies as $taxonomy => $key ) {
+			if ( ! empty( $request[ $key ] ) ) {
+				$tax_query[] = array(
+					'taxonomy' => $taxonomy,
+					'field'    => 'term_id',
+					'terms'    => $request[ $key ],
+				);
+			}
+		}
+
+		// Filter product type by slug.
+		if ( ! empty( $request['type'] ) ) {
+			$tax_query[] = array(
+				'taxonomy' => 'product_type',
+				'field'    => 'slug',
+				'terms'    => $request['type'],
+			);
+		}
+
+		// Filter by attribute and term.
+		if ( ! empty( $request['attribute'] ) && ! empty( $request['attribute_term'] ) ) {
+			if ( in_array( $request['attribute'], wc_get_attribute_taxonomy_names(), true ) ) {
+				$tax_query[] = array(
+					'taxonomy' => $request['attribute'],
+					'field'    => 'term_id',
+					'terms'    => $request['attribute_term'],
+				);
+			}
+		}
+
+		if ( ! empty( $tax_query ) ) {
+			$args['tax_query'] = $tax_query;
+		}
+
+		// Filter featured.
+		if ( is_bool( $request['featured'] ) ) {
+			$args['tax_query'][] = array(
+				'taxonomy' => 'product_visibility',
+				'field'    => 'name',
+				'terms'    => 'featured',
+			);
+		}
+
+		// Filter by sku.
+		if ( ! empty( $request['sku'] ) ) {
+			$skus = explode( ',', $request['sku'] );
+			// Include the current string as a SKU too.
+			if ( 1 < count( $skus ) ) {
+				$skus[] = $request['sku'];
+			}
+
+			$args['meta_query'] = $this->add_meta_query( $args, array(
+				'key'     => '_sku',
+				'value'   => $skus,
+				'compare' => 'IN',
+			) );
+		}
+
+		// Filter by tax class.
+		if ( ! empty( $request['tax_class'] ) ) {
+			$args['meta_query'] = $this->add_meta_query( $args, array(
+				'key'   => '_tax_class',
+				'value' => 'standard' !== $request['tax_class'] ? $request['tax_class'] : '',
+			) );
+		}
+
+		// Price filter.
+		if ( ! empty( $request['min_price'] ) || ! empty( $request['max_price'] ) ) {
+			$args['meta_query'] = $this->add_meta_query( $args, wc_get_min_max_price_meta_query( $request ) );
+		}
+
+		// Filter product in stock or out of stock.
+		if ( is_bool( $request['in_stock'] ) ) {
+			$args['meta_query'] = $this->add_meta_query( $args, array(
+				'key'   => '_stock_status',
+				'value' => true === $request['in_stock'] ? 'instock' : 'outofstock',
+			) );
+		}
+
+		// Filter by on sale products.
+		if ( is_bool( $request['on_sale'] ) ) {
+			$on_sale_key           = $request['on_sale'] ? 'post__in' : 'post__not_in';
+			$args[ $on_sale_key ] += wc_get_product_ids_on_sale();
+		}
+
+		// Force the post_type argument, since it's not a user input variable.
+		if ( ! empty( $request['sku'] ) ) {
+			$args['post_type'] = array( 'product', 'product_variation' );
+		} else {
+			$args['post_type'] = $this->post_type;
+		}
+
+		return $args;
+	}
+
+	/**
+	 * Get the downloads for a product or product variation.
+	 *
+	 * @param WC_Product|WC_Product_Variation $product Product instance.
+	 * @return array
+	 */
+	protected function get_downloads( $product ) {
+		$downloads = array();
+
+		if ( $product->is_downloadable() ) {
+			foreach ( $product->get_downloads() as $file_id => $file ) {
+				$downloads[] = array(
+					'id'   => $file_id, // MD5 hash.
+					'name' => $file['name'],
+					'file' => $file['file'],
+				);
+			}
+		}
+
+		return $downloads;
+	}
+
+	/**
+	 * Get taxonomy terms.
+	 *
+	 * @param WC_Product $product  Product instance.
+	 * @param string     $taxonomy Taxonomy slug.
+	 * @return array
+	 */
+	protected function get_taxonomy_terms( $product, $taxonomy = 'cat' ) {
+		$terms = array();
+
+		foreach ( wc_get_object_terms( $product->get_id(), 'product_' . $taxonomy ) as $term ) {
+			$terms[] = array(
+				'id'   => $term->term_id,
+				'name' => $term->name,
+				'slug' => $term->slug,
+			);
+		}
+
+		return $terms;
+	}
+
+	/**
+	 * Get the images for a product or product variation.
+	 *
+	 * @param WC_Product|WC_Product_Variation $product Product instance.
+	 * @return array
+	 */
+	protected function get_images( $product ) {
+		$images = array();
+		$attachment_ids = array();
+
+		// Add featured image.
+		if ( has_post_thumbnail( $product->get_id() ) ) {
+			$attachment_ids[] = $product->get_image_id();
+		}
+
+		// Add gallery images.
+		$attachment_ids = array_merge( $attachment_ids, $product->get_gallery_image_ids() );
+
+		// Build image data.
+		foreach ( $attachment_ids as $position => $attachment_id ) {
+			$attachment_post = get_post( $attachment_id );
+			if ( is_null( $attachment_post ) ) {
+				continue;
+			}
+
+			$attachment = wp_get_attachment_image_src( $attachment_id, 'full' );
+			if ( ! is_array( $attachment ) ) {
+				continue;
+			}
+
+			$images[] = array(
+				'id'                => (int) $attachment_id,
+				'date_created'      => wc_rest_prepare_date_response( $attachment_post->post_date, false ),
+				'date_created_gmt'  => wc_rest_prepare_date_response( strtotime( $attachment_post->post_date_gmt ) ),
+				'date_modified'     => wc_rest_prepare_date_response( $attachment_post->post_modified, false ),
+				'date_modified_gmt' => wc_rest_prepare_date_response( strtotime( $attachment_post->post_modified_gmt ) ),
+				'src'               => current( $attachment ),
+				'name'              => get_the_title( $attachment_id ),
+				'alt'               => get_post_meta( $attachment_id, '_wp_attachment_image_alt', true ),
+				'position'          => (int) $position,
+			);
+		}
+
+		// Set a placeholder image if the product has no images set.
+		if ( empty( $images ) ) {
+			$images[] = array(
+				'id'                => 0,
+				'date_created'      => wc_rest_prepare_date_response( current_time( 'mysql' ), false ), // Default to now.
+				'date_created_gmt'  => wc_rest_prepare_date_response( current_time( 'timestamp', true ) ), // Default to now.
+				'date_modified'     => wc_rest_prepare_date_response( current_time( 'mysql' ), false ),
+				'date_modified_gmt' => wc_rest_prepare_date_response( current_time( 'timestamp', true ) ),
+				'src'               => wc_placeholder_img_src(),
+				'name'              => __( 'Placeholder', 'woocommerce' ),
+				'alt'               => __( 'Placeholder', 'woocommerce' ),
+				'position'          => 0,
+			);
+		}
+
+		return $images;
+	}
+
+	/**
+	 * Get attribute taxonomy label.
+	 *
+	 * @deprecated 3.0.0
+	 *
+	 * @param  string $name Taxonomy name.
+	 * @return string
+	 */
+	protected function get_attribute_taxonomy_label( $name ) {
+		$tax    = get_taxonomy( $name );
+		$labels = get_taxonomy_labels( $tax );
+
+		return $labels->singular_name;
+	}
+
+	/**
+	 * Get product attribute taxonomy name.
+	 *
+	 * @since  3.0.0
+	 * @param  string     $slug    Taxonomy name.
+	 * @param  WC_Product $product Product data.
+	 * @return string
+	 */
+	protected function get_attribute_taxonomy_name( $slug, $product ) {
+		$attributes = $product->get_attributes();
+
+		if ( ! isset( $attributes[ $slug ] ) ) {
+			return str_replace( 'pa_', '', $slug );
+		}
+
+		$attribute = $attributes[ $slug ];
+
+		// Taxonomy attribute name.
+		if ( $attribute->is_taxonomy() ) {
+			$taxonomy = $attribute->get_taxonomy_object();
+			return $taxonomy->attribute_label;
+		}
+
+		// Custom product attribute name.
+		return $attribute->get_name();
+	}
+
+	/**
+	 * Get default attributes.
+	 *
+	 * @param WC_Product $product Product instance.
+	 * @return array
+	 */
+	protected function get_default_attributes( $product ) {
+		$default = array();
+
+		if ( $product->is_type( 'variable' ) ) {
+			foreach ( array_filter( (array) $product->get_default_attributes(), 'strlen' ) as $key => $value ) {
+				if ( 0 === strpos( $key, 'pa_' ) ) {
+					$default[] = array(
+						'id'     => wc_attribute_taxonomy_id_by_name( $key ),
+						'name'   => $this->get_attribute_taxonomy_name( $key, $product ),
+						'option' => $value,
+					);
+				} else {
+					$default[] = array(
+						'id'     => 0,
+						'name'   => $this->get_attribute_taxonomy_name( $key, $product ),
+						'option' => $value,
+					);
+				}
+			}
+		}
+
+		return $default;
+	}
+
+	/**
+	 * Get attribute options.
+	 *
+	 * @param int   $product_id Product ID.
+	 * @param array $attribute  Attribute data.
+	 * @return array
+	 */
+	protected function get_attribute_options( $product_id, $attribute ) {
+		if ( isset( $attribute['is_taxonomy'] ) && $attribute['is_taxonomy'] ) {
+			return wc_get_product_terms( $product_id, $attribute['name'], array( 'fields' => 'names' ) );
+		} elseif ( isset( $attribute['value'] ) ) {
+			return array_map( 'trim', explode( '|', $attribute['value'] ) );
+		}
+
+		return array();
+	}
+
+	/**
+	 * Get the attributes for a product or product variation.
+	 *
+	 * @param WC_Product|WC_Product_Variation $product Product instance.
+	 * @return array
+	 */
+	protected function get_attributes( $product ) {
+		$attributes = array();
+
+		if ( $product->is_type( 'variation' ) ) {
+			$_product = wc_get_product( $product->get_parent_id() );
+			foreach ( $product->get_variation_attributes() as $attribute_name => $attribute ) {
+				$name = str_replace( 'attribute_', '', $attribute_name );
+
+				if ( ! $attribute ) {
+					continue;
+				}
+
+				// Taxonomy-based attributes are prefixed with `pa_`, otherwise simply `attribute_`.
+				if ( 0 === strpos( $attribute_name, 'attribute_pa_' ) ) {
+					$option_term = get_term_by( 'slug', $attribute, $name );
+					$attributes[] = array(
+						'id'     => wc_attribute_taxonomy_id_by_name( $name ),
+						'name'   => $this->get_attribute_taxonomy_name( $name, $_product ),
+						'option' => $option_term && ! is_wp_error( $option_term ) ? $option_term->name : $attribute,
+					);
+				} else {
+					$attributes[] = array(
+						'id'     => 0,
+						'name'   => $this->get_attribute_taxonomy_name( $name, $_product ),
+						'option' => $attribute,
+					);
+				}
+			}
+		} else {
+			foreach ( $product->get_attributes() as $attribute ) {
+				$attributes[] = array(
+					'id'        => $attribute['is_taxonomy'] ? wc_attribute_taxonomy_id_by_name( $attribute['name'] ) : 0,
+					'name'      => $this->get_attribute_taxonomy_name( $attribute['name'], $product ),
+					'position'  => (int) $attribute['position'],
+					'visible'   => (bool) $attribute['is_visible'],
+					'variation' => (bool) $attribute['is_variation'],
+					'options'   => $this->get_attribute_options( $product->get_id(), $attribute ),
+				);
+			}
+		}
+
+		return $attributes;
+	}
+
+	/**
+	 * Get product data.
+	 *
+	 * @param WC_Product $product Product instance.
+	 * @return array
+	 */
+	protected function get_product_data( $product ) {
+		$data = array(
+			'id'                    => $product->get_id(),
+			'name'                  => $product->get_name(),
+			'slug'                  => $product->get_slug(),
+			'permalink'             => $product->get_permalink(),
+			'date_created'          => wc_rest_prepare_date_response( $product->get_date_created(), false ),
+			'date_created_gmt'      => wc_rest_prepare_date_response( $product->get_date_created() ),
+			'date_modified'         => wc_rest_prepare_date_response( $product->get_date_modified(), false ),
+			'date_modified_gmt'     => wc_rest_prepare_date_response( $product->get_date_modified() ),
+			'type'                  => $product->get_type(),
+			'status'                => $product->get_status(),
+			'featured'              => $product->is_featured(),
+			'catalog_visibility'    => $product->get_catalog_visibility(),
+			'description'           => wpautop( do_shortcode( $product->get_description() ) ),
+			'short_description'     => apply_filters( 'woocommerce_short_description', $product->get_short_description() ),
+			'sku'                   => $product->get_sku(),
+			'price'                 => $product->get_price(),
+			'regular_price'         => $product->get_regular_price(),
+			'sale_price'            => $product->get_sale_price() ? $product->get_sale_price() : '',
+			'date_on_sale_from'     => wc_rest_prepare_date_response( $product->get_date_on_sale_from(), false ),
+			'date_on_sale_from_gmt' => wc_rest_prepare_date_response( $product->get_date_on_sale_from() ),
+			'date_on_sale_to'       => wc_rest_prepare_date_response( $product->get_date_on_sale_to(), false ),
+			'date_on_sale_to_gmt'   => wc_rest_prepare_date_response( $product->get_date_on_sale_to() ),
+			'price_html'            => $product->get_price_html(),
+			'on_sale'               => $product->is_on_sale(),
+			'purchasable'           => $product->is_purchasable(),
+			'total_sales'           => $product->get_total_sales(),
+			'virtual'               => $product->is_virtual(),
+			'downloadable'          => $product->is_downloadable(),
+			'downloads'             => $this->get_downloads( $product ),
+			'download_limit'        => $product->get_download_limit(),
+			'download_expiry'       => $product->get_download_expiry(),
+			'external_url'          => $product->is_type( 'external' ) ? $product->get_product_url() : '',
+			'button_text'           => $product->is_type( 'external' ) ? $product->get_button_text() : '',
+			'tax_status'            => $product->get_tax_status(),
+			'tax_class'             => $product->get_tax_class(),
+			'manage_stock'          => $product->managing_stock(),
+			'stock_quantity'        => $product->get_stock_quantity(),
+			'in_stock'              => $product->is_in_stock(),
+			'backorders'            => $product->get_backorders(),
+			'backorders_allowed'    => $product->backorders_allowed(),
+			'backordered'           => $product->is_on_backorder(),
+			'sold_individually'     => $product->is_sold_individually(),
+			'weight'                => $product->get_weight(),
+			'dimensions'            => array(
+				'length' => $product->get_length(),
+				'width'  => $product->get_width(),
+				'height' => $product->get_height(),
+			),
+			'shipping_required'     => $product->needs_shipping(),
+			'shipping_taxable'      => $product->is_shipping_taxable(),
+			'shipping_class'        => $product->get_shipping_class(),
+			'shipping_class_id'     => $product->get_shipping_class_id(),
+			'reviews_allowed'       => $product->get_reviews_allowed(),
+			'average_rating'        => wc_format_decimal( $product->get_average_rating(), 2 ),
+			'rating_count'          => $product->get_rating_count(),
+			'related_ids'           => array_map( 'absint', array_values( wc_get_related_products( $product->get_id() ) ) ),
+			'upsell_ids'            => array_map( 'absint', $product->get_upsell_ids() ),
+			'cross_sell_ids'        => array_map( 'absint', $product->get_cross_sell_ids() ),
+			'parent_id'             => $product->get_parent_id(),
+			'purchase_note'         => wpautop( do_shortcode( wp_kses_post( $product->get_purchase_note() ) ) ),
+			'categories'            => $this->get_taxonomy_terms( $product ),
+			'tags'                  => $this->get_taxonomy_terms( $product, 'tag' ),
+			'images'                => $this->get_images( $product ),
+			'attributes'            => $this->get_attributes( $product ),
+			'default_attributes'    => $this->get_default_attributes( $product ),
+			'variations'            => array(),
+			'grouped_products'      => array(),
+			'menu_order'            => $product->get_menu_order(),
+			'meta_data'             => $product->get_meta_data(),
+		);
+
+		return $data;
+	}
+
+	/**
+	 * Prepare links for the request.
+	 *
+	 * @param WC_Data         $object  Object data.
+	 * @param WP_REST_Request $request Request object.
+	 * @return array                   Links for the given post.
+	 */
+	protected function prepare_links( $object, $request ) {
+		$links = array(
+			'self' => array(
+				'href' => rest_url( sprintf( '/%s/%s/%d', $this->namespace, $this->rest_base, $object->get_id() ) ),
+			),
+			'collection' => array(
+				'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ),
+			),
+		);
+
+		if ( $object->get_parent_id() ) {
+			$links['up'] = array(
+				'href' => rest_url( sprintf( '/%s/products/%d', $this->namespace, $object->get_parent_id() ) ),
+			);
+		}
+
+		return $links;
+	}
+
+	/**
+	 * Prepare a single product for create or update.
+	 *
+	 * @param  WP_REST_Request $request Request object.
+	 * @param  bool            $creating If is creating a new object.
+	 * @return WP_Error|WC_Data
+	 */
+	protected function prepare_object_for_database( $request, $creating = false ) {
+		$id = isset( $request['id'] ) ? absint( $request['id'] ) : 0;
+
+		// Type is the most important part here because we need to be using the correct class and methods.
+		if ( isset( $request['type'] ) ) {
+			$classname = WC_Product_Factory::get_classname_from_product_type( $request['type'] );
+
+			if ( ! class_exists( $classname ) ) {
+				$classname = 'WC_Product_Simple';
+			}
+
+			$product = new $classname( $id );
+		} elseif ( isset( $request['id'] ) ) {
+			$product = wc_get_product( $id );
+		} else {
+			$product = new WC_Product_Simple();
+		}
+
+		if ( 'variation' === $product->get_type() ) {
+			return new WP_Error( "woocommerce_rest_invalid_{$this->post_type}_id", __( 'To manipulate product variations you should use the /products/&lt;product_id&gt;/variations/&lt;id&gt; endpoint.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		// Post title.
+		if ( isset( $request['name'] ) ) {
+			$product->set_name( wp_filter_post_kses( $request['name'] ) );
+		}
+
+		// Post content.
+		if ( isset( $request['description'] ) ) {
+			$product->set_description( wp_filter_post_kses( $request['description'] ) );
+		}
+
+		// Post excerpt.
+		if ( isset( $request['short_description'] ) ) {
+			$product->set_short_description( wp_filter_post_kses( $request['short_description'] ) );
+		}
+
+		// Post status.
+		if ( isset( $request['status'] ) ) {
+			$product->set_status( get_post_status_object( $request['status'] ) ? $request['status'] : 'draft' );
+		}
+
+		// Post slug.
+		if ( isset( $request['slug'] ) ) {
+			$product->set_slug( $request['slug'] );
+		}
+
+		// Menu order.
+		if ( isset( $request['menu_order'] ) ) {
+			$product->set_menu_order( $request['menu_order'] );
+		}
+
+		// Comment status.
+		if ( isset( $request['reviews_allowed'] ) ) {
+			$product->set_reviews_allowed( $request['reviews_allowed'] );
+		}
+
+		// Virtual.
+		if ( isset( $request['virtual'] ) ) {
+			$product->set_virtual( $request['virtual'] );
+		}
+
+		// Tax status.
+		if ( isset( $request['tax_status'] ) ) {
+			$product->set_tax_status( $request['tax_status'] );
+		}
+
+		// Tax Class.
+		if ( isset( $request['tax_class'] ) ) {
+			$product->set_tax_class( $request['tax_class'] );
+		}
+
+		// Catalog Visibility.
+		if ( isset( $request['catalog_visibility'] ) ) {
+			$product->set_catalog_visibility( $request['catalog_visibility'] );
+		}
+
+		// Purchase Note.
+		if ( isset( $request['purchase_note'] ) ) {
+			$product->set_purchase_note( wc_clean( $request['purchase_note'] ) );
+		}
+
+		// Featured Product.
+		if ( isset( $request['featured'] ) ) {
+			$product->set_featured( $request['featured'] );
+		}
+
+		// Shipping data.
+		$product = $this->save_product_shipping_data( $product, $request );
+
+		// SKU.
+		if ( isset( $request['sku'] ) ) {
+			$product->set_sku( wc_clean( $request['sku'] ) );
+		}
+
+		// Attributes.
+		if ( isset( $request['attributes'] ) ) {
+			$attributes = array();
+
+			foreach ( $request['attributes'] as $attribute ) {
+				$attribute_id   = 0;
+				$attribute_name = '';
+
+				// Check ID for global attributes or name for product attributes.
+				if ( ! empty( $attribute['id'] ) ) {
+					$attribute_id   = absint( $attribute['id'] );
+					$attribute_name = wc_attribute_taxonomy_name_by_id( $attribute_id );
+				} elseif ( ! empty( $attribute['name'] ) ) {
+					$attribute_name = wc_clean( $attribute['name'] );
+				}
+
+				if ( ! $attribute_id && ! $attribute_name ) {
+					continue;
+				}
+
+				if ( $attribute_id ) {
+
+					if ( isset( $attribute['options'] ) ) {
+						$options = $attribute['options'];
+
+						if ( ! is_array( $attribute['options'] ) ) {
+							// Text based attributes - Posted values are term names.
+							$options = explode( WC_DELIMITER, $options );
+						}
+
+						$values = array_map( 'wc_sanitize_term_text_based', $options );
+						$values = array_filter( $values, 'strlen' );
+					} else {
+						$values = array();
+					}
+
+					if ( ! empty( $values ) ) {
+						// Add attribute to array, but don't set values.
+						$attribute_object = new WC_Product_Attribute();
+						$attribute_object->set_id( $attribute_id );
+						$attribute_object->set_name( $attribute_name );
+						$attribute_object->set_options( $values );
+						$attribute_object->set_position( isset( $attribute['position'] ) ? (string) absint( $attribute['position'] ) : '0' );
+						$attribute_object->set_visible( ( isset( $attribute['visible'] ) && $attribute['visible'] ) ? 1 : 0 );
+						$attribute_object->set_variation( ( isset( $attribute['variation'] ) && $attribute['variation'] ) ? 1 : 0 );
+						$attributes[] = $attribute_object;
+					}
+				} elseif ( isset( $attribute['options'] ) ) {
+					// Custom attribute - Add attribute to array and set the values.
+					if ( is_array( $attribute['options'] ) ) {
+						$values = $attribute['options'];
+					} else {
+						$values = explode( WC_DELIMITER, $attribute['options'] );
+					}
+					$attribute_object = new WC_Product_Attribute();
+					$attribute_object->set_name( $attribute_name );
+					$attribute_object->set_options( $values );
+					$attribute_object->set_position( isset( $attribute['position'] ) ? (string) absint( $attribute['position'] ) : '0' );
+					$attribute_object->set_visible( ( isset( $attribute['visible'] ) && $attribute['visible'] ) ? 1 : 0 );
+					$attribute_object->set_variation( ( isset( $attribute['variation'] ) && $attribute['variation'] ) ? 1 : 0 );
+					$attributes[] = $attribute_object;
+				}
+			}
+			$product->set_attributes( $attributes );
+		}
+
+		// Sales and prices.
+		if ( in_array( $product->get_type(), array( 'variable', 'grouped' ), true ) ) {
+			$product->set_regular_price( '' );
+			$product->set_sale_price( '' );
+			$product->set_date_on_sale_to( '' );
+			$product->set_date_on_sale_from( '' );
+			$product->set_price( '' );
+		} else {
+			// Regular Price.
+			if ( isset( $request['regular_price'] ) ) {
+				$product->set_regular_price( $request['regular_price'] );
+			}
+
+			// Sale Price.
+			if ( isset( $request['sale_price'] ) ) {
+				$product->set_sale_price( $request['sale_price'] );
+			}
+
+			if ( isset( $request['date_on_sale_from'] ) ) {
+				$product->set_date_on_sale_from( $request['date_on_sale_from'] );
+			}
+
+			if ( isset( $request['date_on_sale_from_gmt'] ) ) {
+				$product->set_date_on_sale_from( $request['date_on_sale_from_gmt'] ? strtotime( $request['date_on_sale_from_gmt'] ) : null );
+			}
+
+			if ( isset( $request['date_on_sale_to'] ) ) {
+				$product->set_date_on_sale_to( $request['date_on_sale_to'] );
+			}
+
+			if ( isset( $request['date_on_sale_to_gmt'] ) ) {
+				$product->set_date_on_sale_to( $request['date_on_sale_to_gmt'] ? strtotime( $request['date_on_sale_to_gmt'] ) : null );
+			}
+		}
+
+		// Product parent ID for groups.
+		if ( isset( $request['parent_id'] ) ) {
+			$product->set_parent_id( $request['parent_id'] );
+		}
+
+		// Sold individually.
+		if ( isset( $request['sold_individually'] ) ) {
+			$product->set_sold_individually( $request['sold_individually'] );
+		}
+
+		// Stock status.
+		if ( isset( $request['in_stock'] ) ) {
+			$stock_status = true === $request['in_stock'] ? 'instock' : 'outofstock';
+		} else {
+			$stock_status = $product->get_stock_status();
+		}
+
+		// Stock data.
+		if ( 'yes' === get_option( 'woocommerce_manage_stock' ) ) {
+			// Manage stock.
+			if ( isset( $request['manage_stock'] ) ) {
+				$product->set_manage_stock( $request['manage_stock'] );
+			}
+
+			// Backorders.
+			if ( isset( $request['backorders'] ) ) {
+				$product->set_backorders( $request['backorders'] );
+			}
+
+			if ( $product->is_type( 'grouped' ) ) {
+				$product->set_manage_stock( 'no' );
+				$product->set_backorders( 'no' );
+				$product->set_stock_quantity( '' );
+				$product->set_stock_status( $stock_status );
+			} elseif ( $product->is_type( 'external' ) ) {
+				$product->set_manage_stock( 'no' );
+				$product->set_backorders( 'no' );
+				$product->set_stock_quantity( '' );
+				$product->set_stock_status( 'instock' );
+			} elseif ( $product->get_manage_stock() ) {
+				// Stock status is always determined by children so sync later.
+				if ( ! $product->is_type( 'variable' ) ) {
+					$product->set_stock_status( $stock_status );
+				}
+
+				// Stock quantity.
+				if ( isset( $request['stock_quantity'] ) ) {
+					$product->set_stock_quantity( wc_stock_amount( $request['stock_quantity'] ) );
+				} elseif ( isset( $request['inventory_delta'] ) ) {
+					$stock_quantity  = wc_stock_amount( $product->get_stock_quantity() );
+					$stock_quantity += wc_stock_amount( $request['inventory_delta'] );
+					$product->set_stock_quantity( wc_stock_amount( $stock_quantity ) );
+				}
+			} else {
+				// Don't manage stock.
+				$product->set_manage_stock( 'no' );
+				$product->set_stock_quantity( '' );
+				$product->set_stock_status( $stock_status );
+			}
+		} elseif ( ! $product->is_type( 'variable' ) ) {
+			$product->set_stock_status( $stock_status );
+		}
+
+		// Upsells.
+		if ( isset( $request['upsell_ids'] ) ) {
+			$upsells = array();
+			$ids     = $request['upsell_ids'];
+
+			if ( ! empty( $ids ) ) {
+				foreach ( $ids as $id ) {
+					if ( $id && $id > 0 ) {
+						$upsells[] = $id;
+					}
+				}
+			}
+
+			$product->set_upsell_ids( $upsells );
+		}
+
+		// Cross sells.
+		if ( isset( $request['cross_sell_ids'] ) ) {
+			$crosssells = array();
+			$ids        = $request['cross_sell_ids'];
+
+			if ( ! empty( $ids ) ) {
+				foreach ( $ids as $id ) {
+					if ( $id && $id > 0 ) {
+						$crosssells[] = $id;
+					}
+				}
+			}
+
+			$product->set_cross_sell_ids( $crosssells );
+		}
+
+		// Product categories.
+		if ( isset( $request['categories'] ) && is_array( $request['categories'] ) ) {
+			$product = $this->save_taxonomy_terms( $product, $request['categories'] );
+		}
+
+		// Product tags.
+		if ( isset( $request['tags'] ) && is_array( $request['tags'] ) ) {
+			$product = $this->save_taxonomy_terms( $product, $request['tags'], 'tag' );
+		}
+
+		// Downloadable.
+		if ( isset( $request['downloadable'] ) ) {
+			$product->set_downloadable( $request['downloadable'] );
+		}
+
+		// Downloadable options.
+		if ( $product->get_downloadable() ) {
+
+			// Downloadable files.
+			if ( isset( $request['downloads'] ) && is_array( $request['downloads'] ) ) {
+				$product = $this->save_downloadable_files( $product, $request['downloads'] );
+			}
+
+			// Download limit.
+			if ( isset( $request['download_limit'] ) ) {
+				$product->set_download_limit( $request['download_limit'] );
+			}
+
+			// Download expiry.
+			if ( isset( $request['download_expiry'] ) ) {
+				$product->set_download_expiry( $request['download_expiry'] );
+			}
+		}
+
+		// Product url and button text for external products.
+		if ( $product->is_type( 'external' ) ) {
+			if ( isset( $request['external_url'] ) ) {
+				$product->set_product_url( $request['external_url'] );
+			}
+
+			if ( isset( $request['button_text'] ) ) {
+				$product->set_button_text( $request['button_text'] );
+			}
+		}
+
+		// Save default attributes for variable products.
+		if ( $product->is_type( 'variable' ) ) {
+			$product = $this->save_default_attributes( $product, $request );
+		}
+
+		// Check for featured/gallery images, upload it and set it.
+		if ( isset( $request['images'] ) ) {
+			$product = $this->set_product_images( $product, $request['images'] );
+		}
+
+		// Allow set meta_data.
+		if ( is_array( $request['meta_data'] ) ) {
+			foreach ( $request['meta_data'] as $meta ) {
+				$product->update_meta_data( $meta['key'], $meta['value'], isset( $meta['id'] ) ? $meta['id'] : '' );
+			}
+		}
+
+		/**
+		 * Filters an object before it is inserted via the REST API.
+		 *
+		 * The dynamic portion of the hook name, `$this->post_type`,
+		 * refers to the object type slug.
+		 *
+		 * @param WC_Data         $product  Object object.
+		 * @param WP_REST_Request $request  Request object.
+		 * @param bool            $creating If is creating a new object.
+		 */
+		return apply_filters( "woocommerce_rest_pre_insert_{$this->post_type}_object", $product, $request, $creating );
+	}
+
+	/**
+	 * Set product images.
+	 *
+	 * @throws WC_REST_Exception REST API exceptions.
+	 * @param WC_Product $product Product instance.
+	 * @param array      $images  Images data.
+	 * @return WC_Product
+	 */
+	protected function set_product_images( $product, $images ) {
+		if ( is_array( $images ) ) {
+			$gallery = array();
+
+			foreach ( $images as $image ) {
+				$attachment_id = isset( $image['id'] ) ? absint( $image['id'] ) : 0;
+
+				if ( 0 === $attachment_id && isset( $image['src'] ) ) {
+					$upload = wc_rest_upload_image_from_url( esc_url_raw( $image['src'] ) );
+
+					if ( is_wp_error( $upload ) ) {
+						if ( ! apply_filters( 'woocommerce_rest_suppress_image_upload_error', false, $upload, $product->get_id(), $images ) ) {
+							throw new WC_REST_Exception( 'woocommerce_product_image_upload_error', $upload->get_error_message(), 400 );
+						} else {
+							continue;
+						}
+					}
+
+					$attachment_id = wc_rest_set_uploaded_image_as_attachment( $upload, $product->get_id() );
+				}
+
+				if ( ! wp_attachment_is_image( $attachment_id ) ) {
+					throw new WC_REST_Exception( 'woocommerce_product_invalid_image_id', sprintf( __( '#%s is an invalid image ID.', 'woocommerce' ), $attachment_id ), 400 );
+				}
+
+				if ( isset( $image['position'] ) && 0 === absint( $image['position'] ) ) {
+					$product->set_image_id( $attachment_id );
+				} else {
+					$gallery[] = $attachment_id;
+				}
+
+				// Set the image alt if present.
+				if ( ! empty( $image['alt'] ) ) {
+					update_post_meta( $attachment_id, '_wp_attachment_image_alt', wc_clean( $image['alt'] ) );
+				}
+
+				// Set the image name if present.
+				if ( ! empty( $image['name'] ) ) {
+					wp_update_post( array( 'ID' => $attachment_id, 'post_title' => $image['name'] ) );
+				}
+			}
+
+			if ( ! empty( $gallery ) ) {
+				$product->set_gallery_image_ids( $gallery );
+			}
+		} else {
+			$product->set_image_id( '' );
+			$product->set_gallery_image_ids( array() );
+		}
+
+		return $product;
+	}
+
+	/**
+	 * Save product shipping data.
+	 *
+	 * @param WC_Product $product Product instance.
+	 * @param array      $data    Shipping data.
+	 * @return WC_Product
+	 */
+	protected function save_product_shipping_data( $product, $data ) {
+		// Virtual.
+		if ( isset( $data['virtual'] ) && true === $data['virtual'] ) {
+			$product->set_weight( '' );
+			$product->set_height( '' );
+			$product->set_length( '' );
+			$product->set_width( '' );
+		} else {
+			if ( isset( $data['weight'] ) ) {
+				$product->set_weight( $data['weight'] );
+			}
+
+			// Height.
+			if ( isset( $data['dimensions']['height'] ) ) {
+				$product->set_height( $data['dimensions']['height'] );
+			}
+
+			// Width.
+			if ( isset( $data['dimensions']['width'] ) ) {
+				$product->set_width( $data['dimensions']['width'] );
+			}
+
+			// Length.
+			if ( isset( $data['dimensions']['length'] ) ) {
+				$product->set_length( $data['dimensions']['length'] );
+			}
+		}
+
+		// Shipping class.
+		if ( isset( $data['shipping_class'] ) ) {
+			$shipping_class_term = get_term_by( 'slug', wc_clean( $data['shipping_class'] ), 'product_shipping_class' );
+
+			if ( $shipping_class_term ) {
+				$product->set_shipping_class_id( $shipping_class_term->term_id );
+			}
+		}
+
+		return $product;
+	}
+
+	/**
+	 * Save downloadable files.
+	 *
+	 * @param WC_Product $product    Product instance.
+	 * @param array      $downloads  Downloads data.
+	 * @param int        $deprecated Deprecated since 3.0.
+	 * @return WC_Product
+	 */
+	protected function save_downloadable_files( $product, $downloads, $deprecated = 0 ) {
+		if ( $deprecated ) {
+			wc_deprecated_argument( 'variation_id', '3.0', 'save_downloadable_files() not requires a variation_id anymore.' );
+		}
+
+		$files = array();
+		foreach ( $downloads as $key => $file ) {
+			if ( empty( $file['file'] ) ) {
+				continue;
+			}
+
+			$download = new WC_Product_Download();
+			$download->set_id( $key );
+			$download->set_name( $file['name'] ? $file['name'] : wc_get_filename_from_url( $file['file'] ) );
+			$download->set_file( apply_filters( 'woocommerce_file_download_path', $file['file'], $product, $key ) );
+			$files[]  = $download;
+		}
+		$product->set_downloads( $files );
+
+		return $product;
+	}
+
+	/**
+	 * Save taxonomy terms.
+	 *
+	 * @param WC_Product $product  Product instance.
+	 * @param array      $terms    Terms data.
+	 * @param string     $taxonomy Taxonomy name.
+	 * @return WC_Product
+	 */
+	protected function save_taxonomy_terms( $product, $terms, $taxonomy = 'cat' ) {
+		$term_ids = wp_list_pluck( $terms, 'id' );
+
+		if ( 'cat' === $taxonomy ) {
+			$product->set_category_ids( $term_ids );
+		} elseif ( 'tag' === $taxonomy ) {
+			$product->set_tag_ids( $term_ids );
+		}
+
+		return $product;
+	}
+
+	/**
+	 * Save default attributes.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param WC_Product      $product Product instance.
+	 * @param WP_REST_Request $request Request data.
+	 * @return WC_Product
+	 */
+	protected function save_default_attributes( $product, $request ) {
+		if ( isset( $request['default_attributes'] ) && is_array( $request['default_attributes'] ) ) {
+
+			$attributes         = $product->get_attributes();
+			$default_attributes = array();
+
+			foreach ( $request['default_attributes'] as $attribute ) {
+				$attribute_id   = 0;
+				$attribute_name = '';
+
+				// Check ID for global attributes or name for product attributes.
+				if ( ! empty( $attribute['id'] ) ) {
+					$attribute_id   = absint( $attribute['id'] );
+					$attribute_name = wc_attribute_taxonomy_name_by_id( $attribute_id );
+				} elseif ( ! empty( $attribute['name'] ) ) {
+					$attribute_name = sanitize_title( $attribute['name'] );
+				}
+
+				if ( ! $attribute_id && ! $attribute_name ) {
+					continue;
+				}
+
+				if ( isset( $attributes[ $attribute_name ] ) ) {
+					$_attribute = $attributes[ $attribute_name ];
+
+					if ( $_attribute['is_variation'] ) {
+						$value = isset( $attribute['option'] ) ? wc_clean( stripslashes( $attribute['option'] ) ) : '';
+
+						if ( ! empty( $_attribute['is_taxonomy'] ) ) {
+							// If dealing with a taxonomy, we need to get the slug from the name posted to the API.
+							$term = get_term_by( 'name', $value, $attribute_name );
+
+							if ( $term && ! is_wp_error( $term ) ) {
+								$value = $term->slug;
+							} else {
+								$value = sanitize_title( $value );
+							}
+						}
+
+						if ( $value ) {
+							$default_attributes[ $attribute_name ] = $value;
+						}
+					}
+				}
+			}
+
+			$product->set_default_attributes( $default_attributes );
+		}
+
+		return $product;
+	}
+
+	/**
+	 * Clear caches here so in sync with any new variations/children.
+	 *
+	 * @param WC_Data $object Object data.
+	 */
+	public function clear_transients( $object ) {
+		wc_delete_product_transients( $object->get_id() );
+		wp_cache_delete( 'product-' . $object->get_id(), 'products' );
+	}
+
+	/**
+	 * Delete a single item.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Response|WP_Error
+	 */
+	public function delete_item( $request ) {
+		$id     = (int) $request['id'];
+		$force  = (bool) $request['force'];
+		$object = $this->get_object( (int) $request['id'] );
+		$result = false;
+
+		if ( ! $object || 0 === $object->get_id() ) {
+			return new WP_Error( "woocommerce_rest_{$this->post_type}_invalid_id", __( 'Invalid ID.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		if ( 'variation' === $object->get_type() ) {
+			return new WP_Error( "woocommerce_rest_invalid_{$this->post_type}_id", __( 'To manipulate product variations you should use the /products/&lt;product_id&gt;/variations/&lt;id&gt; endpoint.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$supports_trash = EMPTY_TRASH_DAYS > 0 && is_callable( array( $object, 'get_status' ) );
+
+		/**
+		 * Filter whether an object is trashable.
+		 *
+		 * Return false to disable trash support for the object.
+		 *
+		 * @param boolean $supports_trash Whether the object type support trashing.
+		 * @param WC_Data $object         The object being considered for trashing support.
+		 */
+		$supports_trash = apply_filters( "woocommerce_rest_{$this->post_type}_object_trashable", $supports_trash, $object );
+
+		if ( ! wc_rest_check_post_permissions( $this->post_type, 'delete', $object->get_id() ) ) {
+			/* translators: %s: post type */
+			return new WP_Error( "woocommerce_rest_user_cannot_delete_{$this->post_type}", sprintf( __( 'Sorry, you are not allowed to delete %s.', 'woocommerce' ), $this->post_type ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_object_for_response( $object, $request );
+
+		// If we're forcing, then delete permanently.
+		if ( $force ) {
+			if ( $object->is_type( 'variable' ) ) {
+				foreach ( $object->get_children() as $child_id ) {
+					$child = wc_get_product( $child_id );
+					$child->delete( true );
+				}
+			} elseif ( $object->is_type( 'grouped' ) ) {
+				foreach ( $object->get_children() as $child_id ) {
+					$child = wc_get_product( $child_id );
+					$child->set_parent_id( 0 );
+					$child->save();
+				}
+			}
+
+			$object->delete( true );
+			$result = 0 === $object->get_id();
+		} else {
+			// If we don't support trashing for this type, error out.
+			if ( ! $supports_trash ) {
+				/* translators: %s: post type */
+				return new WP_Error( 'woocommerce_rest_trash_not_supported', sprintf( __( 'The %s does not support trashing.', 'woocommerce' ), $this->post_type ), array( 'status' => 501 ) );
+			}
+
+			// Otherwise, only trash if we haven't already.
+			if ( is_callable( array( $object, 'get_status' ) ) ) {
+				if ( 'trash' === $object->get_status() ) {
+					/* translators: %s: post type */
+					return new WP_Error( 'woocommerce_rest_already_trashed', sprintf( __( 'The %s has already been deleted.', 'woocommerce' ), $this->post_type ), array( 'status' => 410 ) );
+				}
+
+				$object->delete();
+				$result = 'trash' === $object->get_status();
+			}
+		}
+
+		if ( ! $result ) {
+			/* translators: %s: post type */
+			return new WP_Error( 'woocommerce_rest_cannot_delete', sprintf( __( 'The %s cannot be deleted.', 'woocommerce' ), $this->post_type ), array( 'status' => 500 ) );
+		}
+
+		// Delete parent product transients.
+		if ( 0 !== $object->get_parent_id() ) {
+			wc_delete_product_transients( $object->get_parent_id() );
+		}
+
+		/**
+		 * Fires after a single object is deleted or trashed via the REST API.
+		 *
+		 * @param WC_Data          $object   The deleted or trashed object.
+		 * @param WP_REST_Response $response The response data.
+		 * @param WP_REST_Request  $request  The request sent to the API.
+		 */
+		do_action( "woocommerce_rest_delete_{$this->post_type}_object", $object, $response, $request );
+
+		return $response;
+	}
+
+	/**
+	 * Get the Product's schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$weight_unit    = get_option( 'woocommerce_weight_unit' );
+		$dimension_unit = get_option( 'woocommerce_dimension_unit' );
+		$schema         = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => $this->post_type,
+			'type'       => 'object',
+			'properties' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'name' => array(
+					'description' => __( 'Product name.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'slug' => array(
+					'description' => __( 'Product slug.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'permalink' => array(
+					'description' => __( 'Product URL.', 'woocommerce' ),
+					'type'        => 'string',
+					'format'      => 'uri',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_created' => array(
+					'description' => __( "The date the product was created, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_created_gmt' => array(
+					'description' => __( "The date the product was created, as GMT.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_modified' => array(
+					'description' => __( "The date the product was last modified, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_modified_gmt' => array(
+					'description' => __( "The date the product was last modified, as GMT.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'type' => array(
+					'description' => __( 'Product type.', 'woocommerce' ),
+					'type'        => 'string',
+					'default'     => 'simple',
+					'enum'        => array_keys( wc_get_product_types() ),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'status' => array(
+					'description' => __( 'Product status (post status).', 'woocommerce' ),
+					'type'        => 'string',
+					'default'     => 'publish',
+					'enum'        => array_keys( get_post_statuses() ),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'featured' => array(
+					'description' => __( 'Featured product.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => false,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'catalog_visibility' => array(
+					'description' => __( 'Catalog visibility.', 'woocommerce' ),
+					'type'        => 'string',
+					'default'     => 'visible',
+					'enum'        => array( 'visible', 'catalog', 'search', 'hidden' ),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'description' => array(
+					'description' => __( 'Product description.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'short_description' => array(
+					'description' => __( 'Product short description.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'sku' => array(
+					'description' => __( 'Unique identifier.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'price' => array(
+					'description' => __( 'Current product price.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'regular_price' => array(
+					'description' => __( 'Product regular price.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'sale_price' => array(
+					'description' => __( 'Product sale price.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'date_on_sale_from' => array(
+					'description' => __( "Start date of sale price, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'date_on_sale_from_gmt' => array(
+					'description' => __( 'Start date of sale price, as GMT.', 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'date_on_sale_to' => array(
+					'description' => __( "End date of sale price, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'date_on_sale_to_gmt' => array(
+					'description' => __( "End date of sale price, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'price_html' => array(
+					'description' => __( 'Price formatted in HTML.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'on_sale' => array(
+					'description' => __( 'Shows if the product is on sale.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'purchasable' => array(
+					'description' => __( 'Shows if the product can be bought.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'total_sales' => array(
+					'description' => __( 'Amount of sales.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'virtual' => array(
+					'description' => __( 'If the product is virtual.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => false,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'downloadable' => array(
+					'description' => __( 'If the product is downloadable.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => false,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'downloads' => array(
+					'description' => __( 'List of downloadable files.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'File MD5 hash.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'name' => array(
+								'description' => __( 'File name.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'file' => array(
+								'description' => __( 'File URL.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+						),
+					),
+				),
+				'download_limit' => array(
+					'description' => __( 'Number of times downloadable files can be downloaded after purchase.', 'woocommerce' ),
+					'type'        => 'integer',
+					'default'     => -1,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'download_expiry' => array(
+					'description' => __( 'Number of days until access to downloadable files expires.', 'woocommerce' ),
+					'type'        => 'integer',
+					'default'     => -1,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'external_url' => array(
+					'description' => __( 'Product external URL. Only for external products.', 'woocommerce' ),
+					'type'        => 'string',
+					'format'      => 'uri',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'button_text' => array(
+					'description' => __( 'Product external button text. Only for external products.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'tax_status' => array(
+					'description' => __( 'Tax status.', 'woocommerce' ),
+					'type'        => 'string',
+					'default'     => 'taxable',
+					'enum'        => array( 'taxable', 'shipping', 'none' ),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'tax_class' => array(
+					'description' => __( 'Tax class.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'manage_stock' => array(
+					'description' => __( 'Stock management at product level.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => false,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'stock_quantity' => array(
+					'description' => __( 'Stock quantity.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'in_stock' => array(
+					'description' => __( 'Controls whether or not the product is listed as "in stock" or "out of stock" on the frontend.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => true,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'backorders' => array(
+					'description' => __( 'If managing stock, this controls if backorders are allowed.', 'woocommerce' ),
+					'type'        => 'string',
+					'default'     => 'no',
+					'enum'        => array( 'no', 'notify', 'yes' ),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'backorders_allowed' => array(
+					'description' => __( 'Shows if backorders are allowed.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'backordered' => array(
+					'description' => __( 'Shows if the product is on backordered.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'sold_individually' => array(
+					'description' => __( 'Allow one item to be bought in a single order.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => false,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'weight' => array(
+					/* translators: %s: weight unit */
+					'description' => sprintf( __( 'Product weight (%s).', 'woocommerce' ), $weight_unit ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'dimensions' => array(
+					'description' => __( 'Product dimensions.', 'woocommerce' ),
+					'type'        => 'object',
+					'context'     => array( 'view', 'edit' ),
+					'properties'  => array(
+						'length' => array(
+							/* translators: %s: dimension unit */
+							'description' => sprintf( __( 'Product length (%s).', 'woocommerce' ), $dimension_unit ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'width' => array(
+							/* translators: %s: dimension unit */
+							'description' => sprintf( __( 'Product width (%s).', 'woocommerce' ), $dimension_unit ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'height' => array(
+							/* translators: %s: dimension unit */
+							'description' => sprintf( __( 'Product height (%s).', 'woocommerce' ), $dimension_unit ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+					),
+				),
+				'shipping_required' => array(
+					'description' => __( 'Shows if the product need to be shipped.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'shipping_taxable' => array(
+					'description' => __( 'Shows whether or not the product shipping is taxable.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'shipping_class' => array(
+					'description' => __( 'Shipping class slug.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'shipping_class_id' => array(
+					'description' => __( 'Shipping class ID.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'reviews_allowed' => array(
+					'description' => __( 'Allow reviews.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => true,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'average_rating' => array(
+					'description' => __( 'Reviews average rating.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'rating_count' => array(
+					'description' => __( 'Amount of reviews that the product have.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'related_ids' => array(
+					'description' => __( 'List of related products IDs.', 'woocommerce' ),
+					'type'        => 'array',
+					'items'       => array(
+						'type'    => 'integer',
+					),
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'upsell_ids' => array(
+					'description' => __( 'List of up-sell products IDs.', 'woocommerce' ),
+					'type'        => 'array',
+					'items'       => array(
+						'type'    => 'integer',
+					),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'cross_sell_ids' => array(
+					'description' => __( 'List of cross-sell products IDs.', 'woocommerce' ),
+					'type'        => 'array',
+					'items'       => array(
+						'type'    => 'integer',
+					),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'parent_id' => array(
+					'description' => __( 'Product parent ID.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'purchase_note' => array(
+					'description' => __( 'Optional note to send the customer after purchase.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'categories' => array(
+					'description' => __( 'List of categories.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Category ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'name' => array(
+								'description' => __( 'Category name.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'slug' => array(
+								'description' => __( 'Category slug.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+						),
+					),
+				),
+				'tags' => array(
+					'description' => __( 'List of tags.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Tag ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'name' => array(
+								'description' => __( 'Tag name.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'slug' => array(
+								'description' => __( 'Tag slug.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+						),
+					),
+				),
+				'images' => array(
+					'description' => __( 'List of images.', 'woocommerce' ),
+					'type'        => 'object',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Image ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'date_created' => array(
+								'description' => __( "The date the image was created, in the site's timezone.", 'woocommerce' ),
+								'type'        => 'date-time',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'date_created_gmt' => array(
+								'description' => __( "The date the image was created, as GMT.", 'woocommerce' ),
+								'type'        => 'date-time',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'date_modified' => array(
+								'description' => __( "The date the image was last modified, in the site's timezone.", 'woocommerce' ),
+								'type'        => 'date-time',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'date_modified_gmt' => array(
+								'description' => __( "The date the image was last modified, as GMT.", 'woocommerce' ),
+								'type'        => 'date-time',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'src' => array(
+								'description' => __( 'Image URL.', 'woocommerce' ),
+								'type'        => 'string',
+								'format'      => 'uri',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'name' => array(
+								'description' => __( 'Image name.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'alt' => array(
+								'description' => __( 'Image alternative text.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'position' => array(
+								'description' => __( 'Image position. 0 means that the image is featured.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+							),
+						),
+					),
+				),
+				'attributes' => array(
+					'description' => __( 'List of attributes.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Attribute ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'name' => array(
+								'description' => __( 'Attribute name.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'position' => array(
+								'description' => __( 'Attribute position.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'visible' => array(
+								'description' => __( "Define if the attribute is visible on the \"Additional information\" tab in the product's page.", 'woocommerce' ),
+								'type'        => 'boolean',
+								'default'     => false,
+								'context'     => array( 'view', 'edit' ),
+							),
+							'variation' => array(
+								'description' => __( 'Define if the attribute can be used as variation.', 'woocommerce' ),
+								'type'        => 'boolean',
+								'default'     => false,
+								'context'     => array( 'view', 'edit' ),
+							),
+							'options' => array(
+								'description' => __( 'List of available term names of the attribute.', 'woocommerce' ),
+								'type'        => 'array',
+								'context'     => array( 'view', 'edit' ),
+							),
+						),
+					),
+				),
+				'default_attributes' => array(
+					'description' => __( 'Defaults variation attributes.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Attribute ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'name' => array(
+								'description' => __( 'Attribute name.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'option' => array(
+								'description' => __( 'Selected attribute term name.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+						),
+					),
+				),
+				'variations' => array(
+					'description' => __( 'List of variations IDs.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'    => 'integer',
+					),
+					'readonly'    => true,
+				),
+				'grouped_products' => array(
+					'description' => __( 'List of grouped products ID.', 'woocommerce' ),
+					'type'        => 'array',
+					'items'       => array(
+						'type'    => 'integer',
+					),
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'menu_order' => array(
+					'description' => __( 'Menu order, used to custom sort products.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'meta_data' => array(
+					'description' => __( 'Meta data.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Meta ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'key' => array(
+								'description' => __( 'Meta key.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'value' => array(
+								'description' => __( 'Meta value.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+						),
+					),
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+
+	/**
+	 * Get the query params for collections of attachments.
+	 *
+	 * @return array
+	 */
+	public function get_collection_params() {
+		$params = parent::get_collection_params();
+
+		$params['slug'] = array(
+			'description'       => __( 'Limit result set to products with a specific slug.', 'woocommerce' ),
+			'type'              => 'string',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+		$params['status'] = array(
+			'default'           => 'any',
+			'description'       => __( 'Limit result set to products assigned a specific status.', 'woocommerce' ),
+			'type'              => 'string',
+			'enum'              => array_merge( array( 'any' ), array_keys( get_post_statuses() ) ),
+			'sanitize_callback' => 'sanitize_key',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+		$params['type'] = array(
+			'description'       => __( 'Limit result set to products assigned a specific type.', 'woocommerce' ),
+			'type'              => 'string',
+			'enum'              => array_keys( wc_get_product_types() ),
+			'sanitize_callback' => 'sanitize_key',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+		$params['sku'] = array(
+			'description'       => __( 'Limit result set to products with a specific SKU.', 'woocommerce' ),
+			'type'              => 'string',
+			'sanitize_callback' => 'sanitize_text_field',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+		$params['featured'] = array(
+			'description'       => __( 'Limit result set to featured products.', 'woocommerce' ),
+			'type'              => 'boolean',
+			'sanitize_callback' => 'wc_string_to_bool',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+		$params['category'] = array(
+			'description'       => __( 'Limit result set to products assigned a specific category ID.', 'woocommerce' ),
+			'type'              => 'string',
+			'sanitize_callback' => 'wp_parse_id_list',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+		$params['tag'] = array(
+			'description'       => __( 'Limit result set to products assigned a specific tag ID.', 'woocommerce' ),
+			'type'              => 'string',
+			'sanitize_callback' => 'wp_parse_id_list',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+		$params['shipping_class'] = array(
+			'description'       => __( 'Limit result set to products assigned a specific shipping class ID.', 'woocommerce' ),
+			'type'              => 'string',
+			'sanitize_callback' => 'wp_parse_id_list',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+		$params['attribute'] = array(
+			'description'       => __( 'Limit result set to products with a specific attribute.', 'woocommerce' ),
+			'type'              => 'string',
+			'sanitize_callback' => 'sanitize_text_field',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+		$params['attribute_term'] = array(
+			'description'       => __( 'Limit result set to products with a specific attribute term ID (required an assigned attribute).', 'woocommerce' ),
+			'type'              => 'string',
+			'sanitize_callback' => 'wp_parse_id_list',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+
+		if ( wc_tax_enabled() ) {
+			$params['tax_class'] = array(
+				'description'       => __( 'Limit result set to products with a specific tax class.', 'woocommerce' ),
+				'type'              => 'string',
+				'enum'              => array_merge( array( 'standard' ), WC_Tax::get_tax_class_slugs() ),
+				'sanitize_callback' => 'sanitize_text_field',
+				'validate_callback' => 'rest_validate_request_arg',
+			);
+		}
+
+		$params['in_stock'] = array(
+			'description'       => __( 'Limit result set to products in stock or out of stock.', 'woocommerce' ),
+			'type'              => 'boolean',
+			'sanitize_callback' => 'wc_string_to_bool',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+		$params['on_sale'] = array(
+			'description'       => __( 'Limit result set to products on sale.', 'woocommerce' ),
+			'type'              => 'boolean',
+			'sanitize_callback' => 'wc_string_to_bool',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+		$params['min_price'] = array(
+			'description'       => __( 'Limit result set to products based on a minimum price.', 'woocommerce' ),
+			'type'              => 'string',
+			'sanitize_callback' => 'sanitize_text_field',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+		$params['max_price'] = array(
+			'description'       => __( 'Limit result set to products based on a maximum price.', 'woocommerce' ),
+			'type'              => 'string',
+			'sanitize_callback' => 'sanitize_text_field',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+
+		return $params;
+	}
+}
diff --git a/includes/api/class-wc-rest-report-sales-controller.php b/includes/api/class-wc-rest-report-sales-controller.php
new file mode 100644
index 00000000000..37565b87e47
--- /dev/null
+++ b/includes/api/class-wc-rest-report-sales-controller.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * REST API Reports controller
+ *
+ * Handles requests to the reports/sales endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Report Sales controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Report_Sales_V1_Controller
+ */
+class WC_REST_Report_Sales_Controller extends WC_REST_Report_Sales_V1_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v2';
+}
diff --git a/includes/api/class-wc-rest-report-top-sellers-controller.php b/includes/api/class-wc-rest-report-top-sellers-controller.php
new file mode 100644
index 00000000000..a5638063459
--- /dev/null
+++ b/includes/api/class-wc-rest-report-top-sellers-controller.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * REST API Reports controller
+ *
+ * Handles requests to the reports/top_sellers endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Report Top Sellers controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Report_Top_Sellers_V1_Controller
+ */
+class WC_REST_Report_Top_Sellers_Controller extends WC_REST_Report_Top_Sellers_V1_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v2';
+}
diff --git a/includes/api/class-wc-rest-reports-controller.php b/includes/api/class-wc-rest-reports-controller.php
new file mode 100644
index 00000000000..0d98a496346
--- /dev/null
+++ b/includes/api/class-wc-rest-reports-controller.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * REST API Reports controller
+ *
+ * Handles requests to the reports endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Reports controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Reports_V1_Controller
+ */
+class WC_REST_Reports_Controller extends WC_REST_Reports_V1_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v2';
+}
diff --git a/includes/api/class-wc-rest-setting-options-controller.php b/includes/api/class-wc-rest-setting-options-controller.php
new file mode 100644
index 00000000000..8b26ff5d2b8
--- /dev/null
+++ b/includes/api/class-wc-rest-setting-options-controller.php
@@ -0,0 +1,540 @@
+<?php
+/**
+ * REST API Setting Options controller
+ *
+ * Handles requests to the /settings/$group/$setting endpoints.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Setting Options controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Controller
+ */
+class WC_REST_Setting_Options_Controller extends WC_REST_Controller {
+
+	/**
+	 * WP REST API namespace/version.
+	 */
+	protected $namespace = 'wc/v2';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'settings/(?P<group_id>[\w-]+)';
+
+	/**
+	 * Register routes.
+	 *
+	 * @since 3.0.0
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
+			'args' => array(
+				'group' => array(
+					'description' => __( 'Settings group ID.', 'woocommerce' ),
+					'type'        => 'string',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/batch', array(
+			'args' => array(
+				'group' => array(
+					'description' => __( 'Settings group ID.', 'woocommerce' ),
+					'type'        => 'string',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'batch_items' ),
+				'permission_callback' => array( $this, 'update_items_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			'schema' => array( $this, 'get_public_batch_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<id>[\w-]+)', array(
+			'args' => array(
+				'group' => array(
+					'description' => __( 'Settings group ID.', 'woocommerce' ),
+					'type'        => 'string',
+				),
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'string',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_item' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+			),
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'update_item' ),
+				'permission_callback' => array( $this, 'update_items_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+	}
+
+	/**
+	 * Return a single setting.
+	 *
+	 * @since  3.0.0
+	 * @param  WP_REST_Request $request
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function get_item( $request ) {
+		$setting = $this->get_setting( $request['group_id'], $request['id'] );
+
+		if ( is_wp_error( $setting ) ) {
+			return $setting;
+		}
+
+		$response = $this->prepare_item_for_response( $setting, $request );
+
+		return rest_ensure_response( $response );
+	}
+
+	/**
+	 * Return all settings in a group.
+	 *
+	 * @since  3.0.0
+	 * @param  WP_REST_Request $request
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function get_items( $request ) {
+		$settings = $this->get_group_settings( $request['group_id'] );
+
+		if ( is_wp_error( $settings ) ) {
+			return $settings;
+		}
+
+		$data = array();
+
+		foreach ( $settings as $setting_obj ) {
+			$setting = $this->prepare_item_for_response( $setting_obj, $request );
+			$setting = $this->prepare_response_for_collection( $setting );
+			if ( $this->is_setting_type_valid( $setting['type'] ) ) {
+				$data[]  = $setting;
+			}
+		}
+
+		return rest_ensure_response( $data );
+	}
+
+	/**
+	 * Get all settings in a group.
+	 *
+	 * @since  3.0.0
+	 * @param string $group_id Group ID.
+	 * @return array|WP_Error
+	 */
+	public function get_group_settings( $group_id ) {
+		if ( empty( $group_id ) ) {
+			return new WP_Error( 'rest_setting_setting_group_invalid', __( 'Invalid setting group.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$settings = apply_filters( 'woocommerce_settings-' . $group_id, array() );
+
+		if ( empty( $settings ) ) {
+			return new WP_Error( 'rest_setting_setting_group_invalid', __( 'Invalid setting group.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$filtered_settings = array();
+		foreach ( $settings as $setting ) {
+			$option_key = $setting['option_key'];
+			$setting    = $this->filter_setting( $setting );
+			$default    = isset( $setting['default'] ) ? $setting['default'] : '';
+			// Get the option value
+			if ( is_array( $option_key ) ) {
+				$option           = get_option( $option_key[0] );
+				$setting['value'] = isset( $option[ $option_key[1] ] ) ? $option[ $option_key[1] ] : $default;
+			} else {
+				$admin_setting_value = WC_Admin_Settings::get_option( $option_key );
+				$setting['value']    = empty( $admin_setting_value ) ? $default : $admin_setting_value;
+			}
+
+			if ( 'multi_select_countries' === $setting['type'] ) {
+				$setting['options'] = WC()->countries->get_countries();
+				$setting['type']    = 'multiselect';
+			}
+
+			$filtered_settings[] = $setting;
+		}
+
+		return $filtered_settings;
+	}
+
+	/**
+	 * Get setting data.
+	 *
+	 * @since  3.0.0
+	 * @param string $group_id Group ID.
+	 * @param string $setting_id Setting ID.
+	 * @return stdClass|WP_Error
+	 */
+	public function get_setting( $group_id, $setting_id ) {
+		if ( empty( $setting_id ) ) {
+			return new WP_Error( 'rest_setting_setting_invalid', __( 'Invalid setting.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$settings = $this->get_group_settings( $group_id );
+
+		if ( is_wp_error( $settings ) ) {
+			return $settings;
+		}
+
+		$array_key = array_keys( wp_list_pluck( $settings, 'id' ), $setting_id );
+
+		if ( empty( $array_key ) ) {
+			return new WP_Error( 'rest_setting_setting_invalid', __( 'Invalid setting.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$setting = $settings[ $array_key[0] ];
+
+		if ( ! $this->is_setting_type_valid( $setting['type'] ) ) {
+			return new WP_Error( 'rest_setting_setting_invalid', __( 'Invalid setting.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		return $setting;
+	}
+
+	/**
+	 * Bulk create, update and delete items.
+	 *
+	 * @since  3.0.0
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return array Of WP_Error or WP_REST_Response.
+	 */
+	public function batch_items( $request ) {
+		// Get the request params.
+		$items = array_filter( $request->get_params() );
+
+		/*
+		 * Since our batch settings update is group-specific and matches based on the route,
+		 * we inject the URL parameters (containing group) into the batch items
+		 */
+		if ( ! empty( $items['update'] ) ) {
+			$to_update = array();
+			foreach ( $items['update'] as $item ) {
+				$to_update[] = array_merge( $request->get_url_params(), $item );
+			}
+			$request = new WP_REST_Request( $request->get_method() );
+			$request->set_body_params( array( 'update' => $to_update ) );
+		}
+
+		return parent::batch_items( $request );
+	}
+
+	/**
+	 * Update a single setting in a group.
+	 *
+	 * @since  3.0.0
+	 * @param  WP_REST_Request $request
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function update_item( $request ) {
+		$setting = $this->get_setting( $request['group_id'], $request['id'] );
+
+		if ( is_wp_error( $setting ) ) {
+			return $setting;
+		}
+
+		if ( is_callable( array( $this, 'validate_setting_' . $setting['type'] . '_field' ) ) ) {
+			$value = $this->{'validate_setting_' . $setting['type'] . '_field'}( $request['value'], $setting );
+		} else {
+			$value = $this->validate_setting_text_field( $request['value'], $setting );
+		}
+
+		if ( is_wp_error( $value ) ) {
+			return $value;
+		}
+
+		if ( is_array( $setting['option_key'] ) ) {
+			$setting['value']       = $value;
+			$option_key             = $setting['option_key'];
+			$prev                   = get_option( $option_key[0] );
+			$prev[ $option_key[1] ] = $request['value'];
+			update_option( $option_key[0], $prev );
+		} else {
+			$update_data = array();
+			$update_data[ $setting['option_key'] ] = $value;
+			$setting['value']                      = $value;
+			WC_Admin_Settings::save_fields( array( $setting ), $update_data );
+		}
+
+		$response = $this->prepare_item_for_response( $setting, $request );
+
+		return rest_ensure_response( $response );
+	}
+
+	/**
+	 * Prepare a single setting object for response.
+	 *
+	 * @since  3.0.0
+	 * @param object $item Setting object.
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response $response Response data.
+	 */
+	public function prepare_item_for_response( $item, $request ) {
+		unset( $item['option_key'] );
+		$data     = $this->filter_setting( $item );
+		$data     = $this->add_additional_fields_to_object( $data, $request );
+		$data     = $this->filter_response_by_context( $data, empty( $request['context'] ) ? 'view' : $request['context'] );
+		$response = rest_ensure_response( $data );
+		$response->add_links( $this->prepare_links( $data['id'], $request['group_id'] ) );
+		return $response;
+	}
+
+	/**
+	 * Prepare links for the request.
+	 *
+	 * @since  3.0.0
+	 * @param string $setting_id Setting ID.
+	 * @param string $group_id Group ID.
+	 * @return array Links for the given setting.
+	 */
+	protected function prepare_links( $setting_id, $group_id ) {
+		$base     = str_replace( '(?P<group_id>[\w-]+)', $group_id, $this->rest_base );
+		$links = array(
+			'self' => array(
+				'href' => rest_url( sprintf( '/%s/%s/%s', $this->namespace, $base, $setting_id ) ),
+			),
+			'collection' => array(
+				'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $base ) ),
+			),
+		);
+
+		return $links;
+	}
+
+	/**
+	 * Makes sure the current user has access to READ the settings APIs.
+	 *
+	 * @since  3.0.0
+	 * @param WP_REST_Request $request Full data about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_items_permissions_check( $request ) {
+		if ( ! wc_rest_check_manager_permissions( 'settings', 'read' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot list resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Makes sure the current user has access to WRITE the settings APIs.
+	 *
+	 * @since  3.0.0
+	 * @param WP_REST_Request $request Full data about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function update_items_permissions_check( $request ) {
+		if ( ! wc_rest_check_manager_permissions( 'settings', 'edit' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_edit', __( 'Sorry, you cannot edit this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Filters out bad values from the settings array/filter so we
+	 * only return known values via the API.
+	 *
+	 * @since 3.0.0
+	 * @param  array $setting
+	 * @return array
+	 */
+	public function filter_setting( $setting ) {
+		$setting = array_intersect_key(
+			$setting,
+			array_flip( array_filter( array_keys( $setting ), array( $this, 'allowed_setting_keys' ) ) )
+		);
+
+		if ( empty( $setting['options'] ) ) {
+			unset( $setting['options'] );
+		}
+
+		if ( 'image_width' === $setting['type'] ) {
+			$setting = $this->cast_image_width( $setting );
+		}
+
+		return $setting;
+	}
+
+	/**
+	 * For image_width, Crop can return "0" instead of false -- so we want
+	 * to make sure we return these consistently the same we accept them.
+	 *
+	 * @since 3.0.0
+	 * @param  array $setting
+	 * @return array
+	 */
+	public function cast_image_width( $setting ) {
+		foreach ( array( 'default', 'value' ) as $key ) {
+			if ( isset( $setting[ $key ] ) ) {
+				$setting[ $key ]['width']  = intval( $setting[ $key ]['width'] );
+				$setting[ $key ]['height'] = intval( $setting[ $key ]['height'] );
+				$setting[ $key ]['crop']   = (bool) $setting[ $key ]['crop'];
+			}
+		}
+		return $setting;
+	}
+
+	/**
+	 * Callback for allowed keys for each setting response.
+	 *
+	 * @since  3.0.0
+	 * @param  string $key Key to check
+	 * @return boolean
+	 */
+	public function allowed_setting_keys( $key ) {
+		return in_array( $key, array(
+			'id',
+			'label',
+			'description',
+			'default',
+			'tip',
+			'placeholder',
+			'type',
+			'options',
+			'value',
+			'option_key',
+		) );
+	}
+
+	/**
+	 * Boolean for if a setting type is a valid supported setting type.
+	 *
+	 * @since  3.0.0
+	 * @param  string $type
+	 * @return bool
+	 */
+	public function is_setting_type_valid( $type ) {
+		return in_array( $type, array(
+			'text',         // Validates with validate_setting_text_field.
+			'email',        // Validates with validate_setting_text_field.
+			'number',       // Validates with validate_setting_text_field.
+			'color',        // Validates with validate_setting_text_field.
+			'password',     // Validates with validate_setting_text_field.
+			'textarea',     // Validates with validate_setting_textarea_field.
+			'select',       // Validates with validate_setting_select_field.
+			'multiselect',  // Validates with validate_setting_multiselect_field.
+			'radio',        // Validates with validate_setting_radio_field (-> validate_setting_select_field).
+			'checkbox',     // Validates with validate_setting_checkbox_field.
+			'image_width',  // Validates with validate_setting_image_width_field.
+		) );
+	}
+
+	/**
+	 * Get the settings schema, conforming to JSON Schema.
+	 *
+	 * @since 3.0.0
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'              => 'http://json-schema.org/draft-04/schema#',
+			'title'                => 'setting',
+			'type'                 => 'object',
+			'properties'           => array(
+				'id'               => array(
+					'description'  => __( 'A unique identifier for the setting.', 'woocommerce' ),
+					'type'         => 'string',
+					'arg_options'  => array(
+						'sanitize_callback' => 'sanitize_title',
+					),
+					'context'      => array( 'view', 'edit' ),
+					'readonly'     => true,
+				),
+				'label'            => array(
+					'description'  => __( 'A human readable label for the setting used in interfaces.', 'woocommerce' ),
+					'type'         => 'string',
+					'arg_options'  => array(
+						'sanitize_callback' => 'sanitize_text_field',
+					),
+					'context'      => array( 'view', 'edit' ),
+					'readonly'     => true,
+				),
+				'description'      => array(
+					'description'  => __( 'A human readable description for the setting used in interfaces.', 'woocommerce' ),
+					'type'         => 'string',
+					'arg_options'  => array(
+						'sanitize_callback' => 'sanitize_text_field',
+					),
+					'context'      => array( 'view', 'edit' ),
+					'readonly'     => true,
+				),
+				'value'          => array(
+					'description'  => __( 'Setting value.', 'woocommerce' ),
+					'type'         => 'mixed',
+					'context'      => array( 'view', 'edit' ),
+				),
+				'default'          => array(
+					'description'  => __( 'Default value for the setting.', 'woocommerce' ),
+					'type'         => 'mixed',
+					'context'      => array( 'view', 'edit' ),
+					'readonly'     => true,
+				),
+				'tip'              => array(
+					'description'  => __( 'Additional help text shown to the user about the setting.', 'woocommerce' ),
+					'type'         => 'string',
+					'arg_options'  => array(
+						'sanitize_callback' => 'sanitize_text_field',
+					),
+					'context'      => array( 'view', 'edit' ),
+					'readonly'     => true,
+				),
+				'placeholder'      => array(
+					'description'  => __( 'Placeholder text to be displayed in text inputs.', 'woocommerce' ),
+					'type'         => 'string',
+					'arg_options'  => array(
+						'sanitize_callback' => 'sanitize_text_field',
+					),
+					'context'      => array( 'view', 'edit' ),
+					'readonly'     => true,
+				),
+				'type'             => array(
+					'description'  => __( 'Type of setting.', 'woocommerce' ),
+					'type'         => 'string',
+					'arg_options'  => array(
+						'sanitize_callback' => 'sanitize_text_field',
+					),
+					'context'      => array( 'view', 'edit' ),
+					'enum'         => array( 'text', 'email', 'number', 'color', 'password', 'textarea', 'select', 'multiselect', 'radio', 'image_width', 'checkbox' ),
+					'readonly'     => true,
+				),
+				'options'          => array(
+					'description' => __( 'Array of options (key value pairs) for inputs such as select, multiselect, and radio buttons.', 'woocommerce' ),
+					'type'        => 'object',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+}
diff --git a/includes/api/class-wc-rest-settings-controller.php b/includes/api/class-wc-rest-settings-controller.php
new file mode 100644
index 00000000000..02058ce519f
--- /dev/null
+++ b/includes/api/class-wc-rest-settings-controller.php
@@ -0,0 +1,232 @@
+<?php
+/**
+ * REST API Settings controller
+ *
+ * Handles requests to the /settings endpoints.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Settings controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Controller
+ */
+class WC_REST_Settings_Controller extends WC_REST_Controller {
+
+	/**
+	 * WP REST API namespace/version.
+	 */
+	protected $namespace = 'wc/v2';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'settings';
+
+	/**
+	 * Register routes.
+	 *
+	 * @since 3.0.0
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+	}
+
+	/**
+	 * Get all settings groups items.
+	 *
+	 * @since  3.0.0
+	 * @param  WP_REST_Request $request
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function get_items( $request ) {
+		$groups = apply_filters( 'woocommerce_settings_groups', array() );
+		if ( empty( $groups ) ) {
+			return new WP_Error( 'rest_setting_groups_empty', __( 'No setting groups have been registered.', 'woocommerce' ), array( 'status' => 500 ) );
+		}
+
+		$defaults        = $this->group_defaults();
+		$filtered_groups = array();
+		foreach ( $groups as $group ) {
+			$sub_groups = array();
+			foreach ( $groups as $_group ) {
+				if ( ! empty( $_group['parent_id'] ) && $group['id'] === $_group['parent_id'] ) {
+					$sub_groups[] = $_group['id'];
+				}
+			}
+			$group['sub_groups'] = $sub_groups;
+
+			$group = wp_parse_args( $group, $defaults );
+			if ( ! is_null( $group['id'] ) && ! is_null( $group['label'] ) ) {
+				$group_obj  = $this->filter_group( $group );
+				$group_data = $this->prepare_item_for_response( $group_obj, $request );
+				$group_data = $this->prepare_response_for_collection( $group_data );
+
+				$filtered_groups[] = $group_data;
+			}
+		}
+
+		$response = rest_ensure_response( $filtered_groups );
+		return $response;
+	}
+
+	/**
+	 * Prepare links for the request.
+	 *
+	 * @param string $group_id Group ID.
+	 * @return array Links for the given group.
+	 */
+	protected function prepare_links( $group_id ) {
+		$base  = '/' . $this->namespace . '/' . $this->rest_base;
+		$links = array(
+			'options' => array(
+				'href' => rest_url( trailingslashit( $base ) . $group_id ),
+			),
+		);
+
+		return $links;
+	}
+
+	/**
+	 * Prepare a report sales object for serialization.
+	 *
+	 * @since  3.0.0
+	 * @param array $item Group object.
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response $response Response data.
+	 */
+	public function prepare_item_for_response( $item, $request ) {
+		$context = empty( $request['context'] ) ? 'view' : $request['context'];
+		$data    = $this->add_additional_fields_to_object( $item, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		$response = rest_ensure_response( $data );
+
+		$response->add_links( $this->prepare_links( $item['id'] ) );
+
+		return $response;
+	}
+
+	/**
+	 * Filters out bad values from the groups array/filter so we
+	 * only return known values via the API.
+	 *
+	 * @since 3.0.0
+	 * @param  array $group
+	 * @return array
+	 */
+	public function filter_group( $group ) {
+		return array_intersect_key(
+			$group,
+			array_flip( array_filter( array_keys( $group ), array( $this, 'allowed_group_keys' ) ) )
+		);
+	}
+
+	/**
+	 * Callback for allowed keys for each group response.
+	 *
+	 * @since  3.0.0
+	 * @param  string $key Key to check
+	 * @return boolean
+	 */
+	public function allowed_group_keys( $key ) {
+		return in_array( $key, array( 'id', 'label', 'description', 'parent_id', 'sub_groups' ) );
+	}
+
+	/**
+	 * Returns default settings for groups. null means the field is required.
+	 *
+	 * @since  3.0.0
+	 * @return array
+	 */
+	protected function group_defaults() {
+		return array(
+			'id'          => null,
+			'label'       => null,
+			'description' => '',
+			'parent_id'   => '',
+			'sub_groups'  => array(),
+		);
+	}
+
+	/**
+	 * Makes sure the current user has access to READ the settings APIs.
+	 *
+	 * @since  3.0.0
+	 * @param WP_REST_Request $request Full data about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_items_permissions_check( $request ) {
+		if ( ! wc_rest_check_manager_permissions( 'settings', 'read' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot list resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get the groups schema, conforming to JSON Schema.
+	 *
+	 * @since  3.0.0
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'setting_group',
+			'type'       => 'object',
+			'properties' => array(
+				'id' => array(
+					'description' => __( 'A unique identifier that can be used to link settings together.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'label' => array(
+					'description' => __( 'A human readable label for the setting used in interfaces.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'description' => array(
+					'description' => __( 'A human readable description for the setting used in interfaces.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'parent_id' => array(
+					'description' => __( 'ID of parent grouping.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'sub_groups' => array(
+					'description' => __( 'IDs for settings sub groups.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+}
diff --git a/includes/api/class-wc-rest-shipping-methods-controller.php b/includes/api/class-wc-rest-shipping-methods-controller.php
new file mode 100644
index 00000000000..e5ef36a674a
--- /dev/null
+++ b/includes/api/class-wc-rest-shipping-methods-controller.php
@@ -0,0 +1,229 @@
+<?php
+/**
+ * REST API WC Shipping Methods controller
+ *
+ * Handles requests to the /shipping_methods endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * @package WooCommerce/API
+ * @extends WC_REST_Controller
+ */
+class WC_REST_Shipping_Methods_Controller extends WC_REST_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v2';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'shipping_methods';
+
+	/**
+	 * Register the route for /shipping_methods and /shipping_methods/<method>
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+				'args'                => $this->get_collection_params(),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<id>[\w-]+)', array(
+			'args' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'string',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_item' ),
+				'permission_callback' => array( $this, 'get_item_permissions_check' ),
+				'args'                => array(
+					'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+				),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+	}
+
+	/**
+	 * Check whether a given request has permission to view shipping methods.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_items_permissions_check( $request ) {
+		if ( ! wc_rest_check_manager_permissions( 'shipping_methods', 'read' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot list resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access to read a shipping method.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_item_permissions_check( $request ) {
+		if ( ! wc_rest_check_manager_permissions( 'shipping_methods', 'read' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot view this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+		return true;
+	}
+
+	/**
+	 * Get shipping methods.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function get_items( $request ) {
+		$wc_shipping = WC_Shipping::instance();
+		$response    = array();
+		foreach ( $wc_shipping->get_shipping_methods() as $id => $shipping_method ) {
+			$method = $this->prepare_item_for_response( $shipping_method, $request );
+			$method = $this->prepare_response_for_collection( $method );
+			$response[] = $method;
+		}
+		return rest_ensure_response( $response );
+	}
+
+	/**
+	 * Get a single Shipping Method.
+	 *
+	 * @param WP_REST_Request $request
+	 * @return WP_REST_Response|WP_Error
+	 */
+	public function get_item( $request ) {
+		$wc_shipping = WC_Shipping::instance();
+		$methods     = $wc_shipping->get_shipping_methods();
+		if ( empty( $methods[ $request['id'] ] ) ) {
+			return new WP_Error( 'woocommerce_rest_shipping_method_invalid', __( 'Resource does not exist.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$method   = $methods[ $request['id'] ];
+		$response = $this->prepare_item_for_response( $method, $request );
+
+		return rest_ensure_response( $response );
+	}
+
+	/**
+	 * Prepare a shipping method for response.
+	 *
+	 * @param  WC_Shipping_Method $method   Shipping method object.
+	 * @param  WP_REST_Request    $request  Request object.
+	 * @return WP_REST_Response   $response Response data.
+	 */
+	public function prepare_item_for_response( $method, $request ) {
+		$data = array(
+			'id'           => $method->id,
+			'title'        => $method->method_title,
+			'description'  => $method->method_description,
+		);
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		// Wrap the data in a response object.
+		$response = rest_ensure_response( $data );
+
+		$response->add_links( $this->prepare_links( $method, $request ) );
+
+		/**
+		 * Filter shipping methods object returned from the REST API.
+		 *
+		 * @param WP_REST_Response   $response The response object.
+		 * @param WC_Shipping_Method $method   Shipping method object used to create response.
+		 * @param WP_REST_Request    $request  Request object.
+		 */
+		return apply_filters( 'woocommerce_rest_prepare_shipping_method', $response, $method, $request );
+	}
+
+	/**
+	 * Prepare links for the request.
+	 *
+	 * @param WC_Shipping_Method $method Shipping method object.
+	 * @param WP_REST_Request   $request Request object.
+	 * @return array
+	 */
+	protected function prepare_links( $method, $request ) {
+		$links      = array(
+			'self' => array(
+				'href' => rest_url( sprintf( '/%s/%s/%s', $this->namespace, $this->rest_base, $method->id ) ),
+			),
+			'collection' => array(
+				'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ),
+			),
+		);
+
+		return $links;
+	}
+
+	/**
+	 * Get the shipping method schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'shipping_method',
+			'type'       => 'object',
+			'properties' => array(
+				'id' => array(
+					'description' => __( 'Method ID.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'title' => array(
+					'description' => __( 'Shipping method title.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'description' => array(
+					'description' => __( 'Shipping method description.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+
+	/**
+	 * Get any query params needed.
+	 *
+	 * @return array
+	 */
+	public function get_collection_params() {
+		return array(
+			'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+		);
+	}
+}
diff --git a/includes/api/class-wc-rest-shipping-zone-locations-controller.php b/includes/api/class-wc-rest-shipping-zone-locations-controller.php
new file mode 100644
index 00000000000..07c965456d0
--- /dev/null
+++ b/includes/api/class-wc-rest-shipping-zone-locations-controller.php
@@ -0,0 +1,188 @@
+<?php
+/**
+ * REST API Shipping Zone Locations controller
+ *
+ * Handles requests to the /shipping/zones/<id>/locations endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Shipping Zone Locations class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Shipping_Zones_Controller_Base
+ */
+class WC_REST_Shipping_Zone_Locations_Controller extends WC_REST_Shipping_Zones_Controller_Base {
+
+	/**
+	 * Register the routes for Shipping Zone Locations.
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)/locations', array(
+			'args' => array(
+				'id' => array(
+					'description' => __( 'Unique ID for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+			),
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'update_items' ),
+				'permission_callback' => array( $this, 'update_items_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+	}
+
+	/**
+	 * Get all Shipping Zone Locations.
+	 *
+	 * @param WP_REST_Request $request
+	 * @return WP_REST_Response|WP_Error
+	 */
+	public function get_items( $request ) {
+		$zone = $this->get_zone( (int) $request['id'] );
+
+		if ( is_wp_error( $zone ) ) {
+			return $zone;
+		}
+
+		$locations = $zone->get_zone_locations();
+		$data      = array();
+
+		foreach ( $locations as $location_obj ) {
+			$location = $this->prepare_item_for_response( $location_obj, $request );
+			$location = $this->prepare_response_for_collection( $location );
+			$data[]   = $location;
+		}
+
+		return rest_ensure_response( $data );
+	}
+
+	/**
+	 * Update all Shipping Zone Locations.
+	 *
+	 * @param WP_REST_Request $request
+	 * @return WP_REST_Response|WP_Error
+	 */
+	public function update_items( $request ) {
+		$zone = $this->get_zone( (int) $request['id'] );
+
+		if ( is_wp_error( $zone ) ) {
+			return $zone;
+		}
+
+		$raw_locations = $request->get_json_params();
+		$locations     = array();
+
+		foreach ( (array) $raw_locations as $raw_location ) {
+			if ( empty( $raw_location['code'] ) ) {
+				continue;
+			}
+
+			$type = ! empty( $raw_location['type'] ) ? sanitize_text_field( $raw_location['type'] ) : 'country';
+
+			if ( ! in_array( $type, array( 'postcode', 'state', 'country', 'continent' ), true ) ) {
+				continue;
+			}
+
+			$locations[] = array(
+				'code' => sanitize_text_field( $raw_location['code'] ),
+				'type' => sanitize_text_field( $type ),
+			);
+		}
+
+		$zone->set_locations( $locations );
+		$zone->save();
+
+		return $this->get_items( $request );
+	}
+
+	/**
+	 * Prepare the Shipping Zone Location for the REST response.
+	 *
+	 * @param array $item Shipping Zone Location.
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response $response
+	 */
+	public function prepare_item_for_response( $item, $request ) {
+		$context = empty( $request['context'] ) ? 'view' : $request['context'];
+		$data    = $this->add_additional_fields_to_object( $item, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		// Wrap the data in a response object.
+		$response = rest_ensure_response( $data );
+
+		$response->add_links( $this->prepare_links( (int) $request['id'] ) );
+
+		return $response;
+	}
+
+	/**
+	 * Prepare links for the request.
+	 *
+	 * @param int $zone_id Given Shipping Zone ID.
+	 * @return array Links for the given Shipping Zone Location.
+	 */
+	protected function prepare_links( $zone_id ) {
+		$base  = '/' . $this->namespace . '/' . $this->rest_base . '/' . $zone_id;
+		$links = array(
+			'collection' => array(
+				'href' => rest_url( $base . '/locations' ),
+			),
+			'describes'  => array(
+				'href' => rest_url( $base ),
+			),
+		);
+
+		return $links;
+	}
+
+	/**
+	 * Get the Shipping Zone Locations schema, conforming to JSON Schema
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'shipping_zone_location',
+			'type'       => 'object',
+			'properties' => array(
+				'code' => array(
+					'description' => __( 'Shipping zone location code.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'type' => array(
+					'description' => __( 'Shipping zone location type.', 'woocommerce' ),
+					'type'        => 'string',
+					'default'     => 'country',
+					'enum'        => array(
+						'postcode',
+						'state',
+						'country',
+						'continent',
+					),
+					'context'     => array( 'view', 'edit' ),
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+}
diff --git a/includes/api/class-wc-rest-shipping-zone-methods-controller.php b/includes/api/class-wc-rest-shipping-zone-methods-controller.php
new file mode 100644
index 00000000000..c584f790206
--- /dev/null
+++ b/includes/api/class-wc-rest-shipping-zone-methods-controller.php
@@ -0,0 +1,540 @@
+<?php
+/**
+ * REST API Shipping Zone Methods controller
+ *
+ * Handles requests to the /shipping/zones/<id>/methods endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Shipping Zone Methods class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Shipping_Zones_Controller_Base
+ */
+class WC_REST_Shipping_Zone_Methods_Controller extends WC_REST_Shipping_Zones_Controller_Base {
+
+	/**
+	 * Register the routes for Shipping Zone Methods.
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<zone_id>[\d]+)/methods', array(
+			'args' => array(
+				'zone_id' => array(
+					'description' => __( 'Unique ID for the zone.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+			),
+			array(
+				'methods'             => WP_REST_Server::CREATABLE,
+				'callback'            => array( $this, 'create_item' ),
+				'permission_callback' => array( $this, 'create_item_permissions_check' ),
+				'args'                => array_merge( $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ), array(
+					'method_id' => array(
+						'required'    => true,
+						'readonly'    => false,
+						'description' => __( 'Shipping method ID.', 'woocommerce' ),
+					),
+				) ),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<zone_id>[\d]+)/methods/(?P<instance_id>[\d]+)', array(
+			'args' => array(
+				'zone_id' => array(
+					'description' => __( 'Unique ID for the zone.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+				'instance_id' => array(
+					'description' => __( 'Unique ID for the instance.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_item' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+			),
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'update_item' ),
+				'permission_callback' => array( $this, 'update_items_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			array(
+				'methods'             => WP_REST_Server::DELETABLE,
+				'callback'            => array( $this, 'delete_item' ),
+				'permission_callback' => array( $this, 'delete_items_permissions_check' ),
+				'args'                => array(
+					'force' => array(
+						'default'     => false,
+						'type'        => 'boolean',
+						'description' => __( 'Whether to bypass trash and force deletion.', 'woocommerce' ),
+					),
+				),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+	}
+
+	/**
+	 * Get a single Shipping Zone Method.
+	 *
+	 * @param WP_REST_Request $request
+	 * @return WP_REST_Response|WP_Error
+	 */
+	public function get_item( $request ) {
+		$zone = $this->get_zone( $request['zone_id'] );
+
+		if ( is_wp_error( $zone ) ) {
+			return $zone;
+		}
+
+		$instance_id = (int) $request['instance_id'];
+		$methods     = $zone->get_shipping_methods();
+		$method      = false;
+
+		foreach ( $methods as $method_obj ) {
+			if ( $instance_id === $method_obj->instance_id ) {
+				$method = $method_obj;
+				break;
+			}
+		}
+
+		if ( false === $method ) {
+			return new WP_Error( 'woocommerce_rest_shipping_zone_method_invalid', __( 'Resource does not exist.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$data = $this->prepare_item_for_response( $method, $request );
+
+		return rest_ensure_response( $data );
+	}
+
+	/**
+	 * Get all Shipping Zone Methods.
+	 *
+	 * @param WP_REST_Request $request
+	 * @return WP_REST_Response|WP_Error
+	 */
+	public function get_items( $request ) {
+		$zone = $this->get_zone( $request['zone_id'] );
+
+		if ( is_wp_error( $zone ) ) {
+			return $zone;
+		}
+
+		$methods = $zone->get_shipping_methods();
+		$data    = array();
+
+		foreach ( $methods as $method_obj ) {
+			$method = $this->prepare_item_for_response( $method_obj, $request );
+			$data[] = $method;
+		}
+
+		return rest_ensure_response( $data );
+	}
+
+	/**
+	 * Create a new shipping zone method instance.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Request|WP_Error
+	 */
+	public function create_item( $request ) {
+		global $wpdb;
+
+		$method_id = $request['method_id'];
+		$zone      = $this->get_zone( $request['zone_id'] );
+		if ( is_wp_error( $zone ) ) {
+			return $zone;
+		}
+
+		$instance_id = $zone->add_shipping_method( $method_id );
+		$methods     = $zone->get_shipping_methods();
+		$method      = false;
+		foreach ( $methods as $method_obj ) {
+			if ( $instance_id === $method_obj->instance_id ) {
+				$method = $method_obj;
+				break;
+			}
+		}
+
+		if ( false === $method ) {
+			return new WP_Error( 'woocommerce_rest_shipping_zone_not_created', __( 'Resource cannot be created.', 'woocommerce' ), array( 'status' => 500 ) );
+		}
+
+		$method = $this->update_fields( $instance_id, $method, $request );
+		if ( is_wp_error( $method ) ) {
+			return $method;
+		}
+
+		$data = $this->prepare_item_for_response( $method, $request );
+		return rest_ensure_response( $data );
+	}
+
+	/**
+	 * Delete a shipping method instance.
+	 *
+	 * @param WP_REST_Request $request Full details about the request
+	 * @return WP_Error|boolean
+	 */
+	public function delete_item( $request ) {
+		global $wpdb;
+
+		$zone = $this->get_zone( $request['zone_id'] );
+		if ( is_wp_error( $zone ) ) {
+			return $zone;
+		}
+
+		$instance_id = (int) $request['instance_id'];
+		$force       = $request['force'];
+
+		$methods     = $zone->get_shipping_methods();
+		$method      = false;
+
+		foreach ( $methods as $method_obj ) {
+			if ( $instance_id === $method_obj->instance_id ) {
+				$method = $method_obj;
+				break;
+			}
+		}
+
+		if ( false === $method ) {
+			return new WP_Error( 'woocommerce_rest_shipping_zone_method_invalid', __( 'Resource does not exist.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$method = $this->update_fields( $instance_id, $method, $request );
+		if ( is_wp_error( $method ) ) {
+			return $method;
+		}
+
+		$request->set_param( 'context', 'view' );
+		$response = $this->prepare_item_for_response( $method, $request );
+
+		// Actually delete
+		if ( $force ) {
+			$zone->delete_shipping_method( $instance_id );
+		} else {
+			return new WP_Error( 'rest_trash_not_supported', __( 'Shipping methods do not support trashing.', 'woocommerce' ), array( 'status' => 501 ) );
+		}
+
+		/**
+		 * Fires after a product review is deleted via the REST API.
+		 *
+		 * @param object           $method
+		 * @param WP_REST_Response $response        The response data.
+		 * @param WP_REST_Request  $request         The request sent to the API.
+		 */
+		do_action( 'rest_delete_product_review', $method, $response, $request );
+
+		return $response;
+	}
+
+	/**
+	 * Update A Single Shipping Zone Method.
+	 *
+	 * @param WP_REST_Request $request
+	 * @return WP_REST_Response|WP_Error
+	 */
+	public function update_item( $request ) {
+		global $wpdb;
+
+		$zone = $this->get_zone( $request['zone_id'] );
+		if ( is_wp_error( $zone ) ) {
+			return $zone;
+		}
+
+		$instance_id = (int) $request['instance_id'];
+		$methods     = $zone->get_shipping_methods();
+		$method      = false;
+
+		foreach ( $methods as $method_obj ) {
+			if ( $instance_id === $method_obj->instance_id ) {
+				$method = $method_obj;
+				break;
+			}
+		}
+
+		if ( false === $method ) {
+			return new WP_Error( 'woocommerce_rest_shipping_zone_method_invalid', __( 'Resource does not exist.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$method = $this->update_fields( $instance_id, $method, $request );
+		if ( is_wp_error( $method ) ) {
+			return $method;
+		}
+
+		$data = $this->prepare_item_for_response( $method, $request );
+		return rest_ensure_response( $data );
+	}
+
+	/**
+	 * Updates settings, order, and enabled status on create.
+	 *
+	 * @param $instance_id integer
+	 * @param $method
+	 * @param WP_REST_Request $request
+	 * @return $method
+	 */
+	public function update_fields( $instance_id, $method, $request ) {
+		global $wpdb;
+
+		// Update settings if present
+		if ( isset( $request['settings'] ) ) {
+			$method->init_instance_settings();
+			$instance_settings = $method->instance_settings;
+			$errors_found      = false;
+			foreach ( $method->get_instance_form_fields() as $key => $field ) {
+				if ( isset( $request['settings'][ $key ] ) ) {
+					if ( is_callable( array( $this, 'validate_setting_' . $field['type'] . '_field' ) ) ) {
+						$value = $this->{'validate_setting_' . $field['type'] . '_field'}( $request['settings'][ $key ], $field );
+					} else {
+						$value = $this->validate_setting_text_field( $request['settings'][ $key ], $field );
+					}
+					if ( is_wp_error( $value ) ) {
+						$errors_found = true;
+						break;
+					}
+					$instance_settings[ $key ] = $value;
+				}
+			}
+
+			if ( $errors_found ) {
+				return new WP_Error( 'rest_setting_value_invalid', __( 'An invalid setting value was passed.', 'woocommerce' ), array( 'status' => 400 ) );
+			}
+
+			update_option( $method->get_instance_option_key(), apply_filters( 'woocommerce_shipping_' . $method->id . '_instance_settings_values', $instance_settings, $method ) );
+		}
+
+		// Update order
+		if ( isset( $request['order'] ) ) {
+			$wpdb->update( "{$wpdb->prefix}woocommerce_shipping_zone_methods", array( 'method_order' => absint( $request['order'] ) ), array( 'instance_id' => absint( $instance_id ) ) );
+			$method->method_order = absint( $request['order'] );
+		}
+
+		// Update if this method is enabled or not.
+		if ( isset( $request['enabled'] ) ) {
+			if ( $wpdb->update( "{$wpdb->prefix}woocommerce_shipping_zone_methods", array( 'is_enabled' => $request['enabled'] ), array( 'instance_id' => absint( $instance_id ) ) ) ) {
+				do_action( 'woocommerce_shipping_zone_method_status_toggled', $instance_id, $method->id, $request['zone_id'], $request['enabled'] );
+				$method->enabled = ( true === $request['enabled'] ? 'yes' : 'no' );
+			}
+		}
+
+		return $method;
+	}
+
+	/**
+	 * Prepare the Shipping Zone Method for the REST response.
+	 *
+	 * @param array $item Shipping Zone Method.
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response $response
+	 */
+	public function prepare_item_for_response( $item, $request ) {
+		$method = array(
+			'id'                 => $item->instance_id,
+			'instance_id'        => $item->instance_id,
+			'title'              => $item->instance_settings['title'],
+			'order'              => $item->method_order,
+			'enabled'            => ( 'yes' === $item->enabled ),
+			'method_id'          => $item->id,
+			'method_title'       => $item->method_title,
+			'method_description' => $item->method_description,
+			'settings'           => $this->get_settings( $item ),
+		);
+
+		$context = empty( $request['context'] ) ? 'view' : $request['context'];
+		$data    = $this->add_additional_fields_to_object( $method, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		// Wrap the data in a response object.
+		$response = rest_ensure_response( $data );
+
+		$response->add_links( $this->prepare_links( $request['zone_id'], $item->instance_id ) );
+
+		$response = $this->prepare_response_for_collection( $response );
+
+		return $response;
+	}
+
+	/**
+	 * Return settings associated with this shipping zone method instance.
+	 */
+	public function get_settings( $item ) {
+		$item->init_instance_settings();
+		$settings = array();
+		foreach ( $item->get_instance_form_fields() as $id => $field ) {
+			$data = array(
+				'id'          => $id,
+				'label'       => $field['title'],
+				'description' => empty( $field['description'] ) ? '' : $field['description'],
+				'type'        => $field['type'],
+				'value'       => $item->instance_settings[ $id ],
+				'default'     => empty( $field['default'] ) ? '' : $field['default'],
+				'tip'         => empty( $field['description'] ) ? '' : $field['description'],
+				'placeholder' => empty( $field['placeholder'] ) ? '' : $field['placeholder'],
+			);
+			if ( ! empty( $field['options'] ) ) {
+				$data['options'] = $field['options'];
+			}
+			$settings[ $id ] = $data;
+		}
+		return $settings;
+	}
+
+	/**
+	 * Prepare links for the request.
+	 *
+	 * @param int $zone_id Given Shipping Zone ID.
+	 * @param int $instance_id Given Shipping Zone Method Instance ID.
+	 * @return array Links for the given Shipping Zone Method.
+	 */
+	protected function prepare_links( $zone_id, $instance_id ) {
+		$base  = '/' . $this->namespace . '/' . $this->rest_base . '/' . $zone_id;
+		$links = array(
+			'self' => array(
+				'href' => rest_url( $base . '/methods/' . $instance_id ),
+			),
+			'collection' => array(
+				'href' => rest_url( $base . '/methods' ),
+			),
+			'describes'  => array(
+				'href' => rest_url( $base ),
+			),
+		);
+
+		return $links;
+	}
+
+	/**
+	 * Get the Shipping Zone Methods schema, conforming to JSON Schema
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'shipping_zone_method',
+			'type'       => 'object',
+			'properties' => array(
+				'id' => array(
+					'description' => __( 'Shipping method instance ID.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'instance_id' => array(
+					'description' => __( 'Shipping method instance ID.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'title' => array(
+					'description' => __( 'Shipping method customer facing title.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'order' => array(
+					'description' => __( 'Shipping method sort order.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'enabled' => array(
+					'description' => __( 'Shipping method enabled status.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'method_id' => array(
+					'description' => __( 'Shipping method ID.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'method_title' => array(
+					'description' => __( 'Shipping method title.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'method_description' => array(
+					'description' => __( 'Shipping method description.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'settings' => array(
+					'description' => __( 'Shipping method settings.', 'woocommerce' ),
+					'type'        => 'object',
+					'context'     => array( 'view', 'edit' ),
+					'properties' => array(
+						'id' => array(
+							'description' => __( 'A unique identifier for the setting.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+							'readonly'    => true,
+						),
+						'label' => array(
+							'description' => __( 'A human readable label for the setting used in interfaces.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+							'readonly'    => true,
+						),
+						'description' => array(
+							'description' => __( 'A human readable description for the setting used in interfaces.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+							'readonly'    => true,
+						),
+						'type' => array(
+							'description' => __( 'Type of setting.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+							'enum'        => array( 'text', 'email', 'number', 'color', 'password', 'textarea', 'select', 'multiselect', 'radio', 'image_width', 'checkbox' ),
+							'readonly'    => true,
+						),
+						'value' => array(
+							'description' => __( 'Setting value.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'default' => array(
+							'description' => __( 'Default value for the setting.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+							'readonly'    => true,
+						),
+						'tip' => array(
+							'description' => __( 'Additional help text shown to the user about the setting.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+							'readonly'    => true,
+						),
+						'placeholder' => array(
+							'description' => __( 'Placeholder text to be displayed in text inputs.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+							'readonly'    => true,
+						),
+					),
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+}
diff --git a/includes/api/class-wc-rest-shipping-zones-controller.php b/includes/api/class-wc-rest-shipping-zones-controller.php
new file mode 100644
index 00000000000..fe85cfcdbaa
--- /dev/null
+++ b/includes/api/class-wc-rest-shipping-zones-controller.php
@@ -0,0 +1,298 @@
+<?php
+/**
+ * REST API Shipping Zones controller
+ *
+ * Handles requests to the /shipping/zones endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Shipping Zones class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Shipping_Zones_Controller_Base
+ */
+class WC_REST_Shipping_Zones_Controller extends WC_REST_Shipping_Zones_Controller_Base {
+
+	/**
+	 * Register the routes for Shipping Zones.
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+			),
+			array(
+				'methods'             => WP_REST_Server::CREATABLE,
+				'callback'            => array( $this, 'create_item' ),
+				'permission_callback' => array( $this, 'create_item_permissions_check' ),
+				'args'                => array_merge( $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ), array(
+					'name' => array(
+						'required'    => true,
+						'type'        => 'string',
+						'description' => __( 'Shipping zone name.', 'woocommerce' ),
+					),
+				) ),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<id>[\d-]+)', array(
+			'args' => array(
+				'id' => array(
+					'description' => __( 'Unique ID for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_item' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+			),
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'update_item' ),
+				'permission_callback' => array( $this, 'update_items_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			array(
+				'methods'             => WP_REST_Server::DELETABLE,
+				'callback'            => array( $this, 'delete_item' ),
+				'permission_callback' => array( $this, 'delete_items_permissions_check' ),
+				'args'                => array(
+					'force' => array(
+						'default'     => false,
+						'type'        => 'boolean',
+						'description' => __( 'Whether to bypass trash and force deletion.', 'woocommerce' ),
+					),
+				),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+	}
+
+	/**
+	 * Get a single Shipping Zone.
+	 *
+	 * @param WP_REST_Request $request
+	 * @return WP_REST_Response
+	 */
+	public function get_item( $request ) {
+		$zone = $this->get_zone( $request->get_param( 'id' ) );
+
+		if ( is_wp_error( $zone ) ) {
+			return $zone;
+		}
+
+		$data = $zone->get_data();
+		$data = $this->prepare_item_for_response( $data, $request );
+		$data = $this->prepare_response_for_collection( $data );
+
+		return rest_ensure_response( $data );
+	}
+
+	/**
+	 * Get all Shipping Zones.
+	 *
+	 * @param WP_REST_Request $request
+	 * @return WP_REST_Response
+	 */
+	public function get_items( $request ) {
+		$rest_of_the_world = WC_Shipping_Zones::get_zone_by( 'zone_id', 0 );
+
+		$zones = WC_Shipping_Zones::get_zones();
+		array_unshift( $zones, $rest_of_the_world->get_data() );
+		$data  = array();
+
+		foreach ( $zones as $zone_obj ) {
+			$zone   = $this->prepare_item_for_response( $zone_obj, $request );
+			$zone   = $this->prepare_response_for_collection( $zone );
+			$data[] = $zone;
+		}
+
+		return rest_ensure_response( $data );
+	}
+
+	/**
+	 * Create a single Shipping Zone.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Request|WP_Error
+	 */
+	public function create_item( $request ) {
+		$zone = new WC_Shipping_Zone( null );
+
+		if ( ! is_null( $request->get_param( 'name' ) ) ) {
+			$zone->set_zone_name( $request->get_param( 'name' ) );
+		}
+
+		if ( ! is_null( $request->get_param( 'order' ) ) ) {
+			$zone->set_zone_order( $request->get_param( 'order' ) );
+		}
+
+		$zone->save();
+
+		if ( $zone->get_id() !== 0 ) {
+			$request->set_param( 'id', $zone->get_id() );
+			$response = $this->get_item( $request );
+			$response->set_status( 201 );
+			$response->header( 'Location', rest_url( sprintf( '/%s/%s/%d', $this->namespace, $this->rest_base, $zone->get_id() ) ) );
+			return $response;
+		} else {
+			return new WP_Error( 'woocommerce_rest_shipping_zone_not_created', __( "Resource cannot be created. Check to make sure 'order' and 'name' are present.", 'woocommerce' ), array( 'status' => 500 ) );
+		}
+	}
+
+	/**
+	 * Update a single Shipping Zone.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Request|WP_Error
+	 */
+	public function update_item( $request ) {
+		$zone = $this->get_zone( $request->get_param( 'id' ) );
+
+		if ( is_wp_error( $zone ) ) {
+			return $zone;
+		}
+
+		$zone_changed = false;
+
+		if ( ! is_null( $request->get_param( 'name' ) ) ) {
+			$zone->set_zone_name( $request->get_param( 'name' ) );
+			$zone_changed = true;
+		}
+
+		if ( ! is_null( $request->get_param( 'order' ) ) ) {
+			$zone->set_zone_order( $request->get_param( 'order' ) );
+			$zone_changed = true;
+		}
+
+		if ( $zone_changed ) {
+			$zone->save();
+		}
+
+		return $this->get_item( $request );
+	}
+
+	/**
+	 * Delete a single Shipping Zone.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Request|WP_Error
+	 */
+	public function delete_item( $request ) {
+		$zone = $this->get_zone( $request->get_param( 'id' ) );
+
+		if ( is_wp_error( $zone ) ) {
+			return $zone;
+		}
+
+		$force = $request['force'];
+
+		$response = $this->get_item( $request );
+
+		if ( $force ) {
+			$zone->delete();
+		} else {
+			return new WP_Error( 'rest_trash_not_supported', __( 'Shipping zones do not support trashing.', 'woocommerce' ), array( 'status' => 501 ) );
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Prepare the Shipping Zone for the REST response.
+	 *
+	 * @param array $item Shipping Zone.
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response $response
+	 */
+	public function prepare_item_for_response( $item, $request ) {
+		$data = array(
+			'id'    => (int) $item['id'],
+			'name'  => $item['zone_name'],
+			'order' => (int) $item['zone_order'],
+		);
+
+		$context = empty( $request['context'] ) ? 'view' : $request['context'];
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		// Wrap the data in a response object.
+		$response = rest_ensure_response( $data );
+
+		$response->add_links( $this->prepare_links( $data['id'] ) );
+
+		return $response;
+	}
+
+	/**
+	 * Prepare links for the request.
+	 *
+	 * @param int $zone_id Given Shipping Zone ID.
+	 * @return array Links for the given Shipping Zone.
+	 */
+	protected function prepare_links( $zone_id ) {
+		$base  = '/' . $this->namespace . '/' . $this->rest_base;
+		$links = array(
+			'self'       => array(
+				'href' => rest_url( trailingslashit( $base ) . $zone_id ),
+			),
+			'collection' => array(
+				'href' => rest_url( $base ),
+			),
+			'describedby' => array(
+				'href' => rest_url( trailingslashit( $base ) . $zone_id . '/locations' ),
+			),
+		);
+
+		return $links;
+	}
+
+	/**
+	 * Get the Shipping Zones schema, conforming to JSON Schema
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'shipping_zone',
+			'type'       => 'object',
+			'properties' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'name' => array(
+					'description' => __( 'Shipping zone name.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'arg_options' => array(
+						'sanitize_callback' => 'sanitize_text_field',
+					),
+				),
+				'order' => array(
+					'description' => __( 'Shipping zone order.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+}
diff --git a/includes/api/class-wc-rest-system-status-controller.php b/includes/api/class-wc-rest-system-status-controller.php
new file mode 100644
index 00000000000..62b2f43cc0d
--- /dev/null
+++ b/includes/api/class-wc-rest-system-status-controller.php
@@ -0,0 +1,964 @@
+<?php
+/**
+ * REST API WC System Status controller
+ *
+ * Handles requests to the /system_status endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * @package WooCommerce/API
+ * @extends WC_REST_Controller
+ */
+class WC_REST_System_Status_Controller extends WC_REST_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v2';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'system_status';
+
+	/**
+	 * Register the route for /system_status
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+				'args'                => $this->get_collection_params(),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+	}
+
+	/**
+	 * Check whether a given request has permission to view system status.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_items_permissions_check( $request ) {
+		if ( ! wc_rest_check_manager_permissions( 'system_status', 'read' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot list resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+		return true;
+	}
+
+	/**
+	 * Get a system status info, by section.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function get_items( $request ) {
+		$schema    = $this->get_item_schema();
+		$mappings  = $this->get_item_mappings();
+		$response  = array();
+
+		foreach ( $mappings as $section => $values ) {
+			foreach ( $values as $key => $value ) {
+				if ( isset( $schema['properties'][ $section ]['properties'][ $key ]['type'] ) ) {
+					settype( $values[ $key ], $schema['properties'][ $section ]['properties'][ $key ]['type'] );
+				}
+			}
+			settype( $values, $schema['properties'][ $section ]['type'] );
+			$response[ $section ] = $values;
+		}
+
+		$response = $this->prepare_item_for_response( $response, $request );
+
+		return rest_ensure_response( $response );
+	}
+
+	/**
+	 * Get the system status schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'system_status',
+			'type'       => 'object',
+			'properties' => array(
+				'environment' => array(
+					'description' => __( 'Environment.', 'woocommerce' ),
+					'type'        => 'object',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+					'properties'  => array(
+						'home_url' => array(
+							'description' => __( 'Home URL.', 'woocommerce' ),
+							'type'        => 'string',
+							'format'      => 'uri',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'site_url' => array(
+							'description' => __( 'Site URL.', 'woocommerce' ),
+							'type'        => 'string',
+							'format'      => 'uri',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'wc_version' => array(
+							'description' => __( 'WooCommerce version.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'log_directory' => array(
+							'description' => __( 'Log directory.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'log_directory_writable' => array(
+							'description' => __( 'Is log directory writable?', 'woocommerce' ),
+							'type'        => 'boolean',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'wp_version' => array(
+							'description' => __( 'WordPress version.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'wp_multisite' => array(
+							'description' => __( 'Is WordPress multisite?', 'woocommerce' ),
+							'type'        => 'boolean',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'wp_memory_limit' => array(
+							'description' => __( 'WordPress memory limit.', 'woocommerce' ),
+							'type'        => 'integer',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'wp_debug_mode' => array(
+							'description' => __( 'Is WordPress debug mode active?', 'woocommerce' ),
+							'type'        => 'boolean',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'wp_cron' => array(
+							'description' => __( 'Are WordPress cron jobs enabled?', 'woocommerce' ),
+							'type'        => 'boolean',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'language' => array(
+							'description' => __( 'WordPress language.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'server_info' => array(
+							'description' => __( 'Server info.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'php_version' => array(
+							'description' => __( 'PHP version.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'php_post_max_size' => array(
+							'description' => __( 'PHP post max size.', 'woocommerce' ),
+							'type'        => 'integer',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'php_max_execution_time' => array(
+							'description' => __( 'PHP max execution time.', 'woocommerce' ),
+							'type'        => 'integer',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'php_max_input_vars' => array(
+							'description' => __( 'PHP max input vars.', 'woocommerce' ),
+							'type'        => 'integer',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'curl_version' => array(
+							'description' => __( 'cURL version.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'suhosin_installed' => array(
+							'description' => __( 'Is SUHOSIN installed?', 'woocommerce' ),
+							'type'        => 'boolean',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'max_upload_size' => array(
+							'description' => __( 'Max upload size.', 'woocommerce' ),
+							'type'        => 'integer',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'mysql_version' => array(
+							'description' => __( 'MySQL version.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'default_timezone' => array(
+							'description' => __( 'Default timezone.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'fsockopen_or_curl_enabled' => array(
+							'description' => __( 'Is fsockopen/cURL enabled?', 'woocommerce' ),
+							'type'        => 'boolean',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'soapclient_enabled' => array(
+							'description' => __( 'Is SoapClient class enabled?', 'woocommerce' ),
+							'type'        => 'boolean',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'domdocument_enabled' => array(
+							'description' => __( 'Is DomDocument class enabled?', 'woocommerce' ),
+							'type'        => 'boolean',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'gzip_enabled' => array(
+							'description' => __( 'Is GZip enabled?', 'woocommerce' ),
+							'type'        => 'boolean',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'mbstring_enabled' => array(
+							'description' => __( 'Is mbstring enabled?', 'woocommerce' ),
+							'type'        => 'boolean',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'remote_post_successful' => array(
+							'description' => __( 'Remote POST successful?', 'woocommerce' ),
+							'type'        => 'boolean',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'remote_post_response' => array(
+							'description' => __( 'Remote POST response.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'remote_get_successful' => array(
+							'description' => __( 'Remote GET successful?', 'woocommerce' ),
+							'type'        => 'boolean',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'remote_get_response' => array(
+							'description' => __( 'Remote GET response.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+					),
+				),
+				'database' => array(
+					'description' => __( 'Database.', 'woocommerce' ),
+					'type'        => 'object',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+					'properties'  => array(
+						'wc_database_version' => array(
+							'description' => __( 'WC database version.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'database_prefix' => array(
+							'description' => __( 'Database prefix.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'maxmind_geoip_database' => array(
+							'description' => __( 'MaxMind GeoIP database.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'database_tables' => array(
+							'description' => __( 'Database tables.', 'woocommerce' ),
+							'type'        => 'array',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+							'items'       => array(
+								'type'    => 'string',
+							),
+						),
+					),
+				),
+				'active_plugins' => array(
+					'description' => __( 'Active plugins.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+					'items'       => array(
+						'type'    => 'string',
+					),
+				),
+				'theme' => array(
+					'description' => __( 'Theme.', 'woocommerce' ),
+					'type'        => 'object',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+					'properties'  => array(
+						'name' => array(
+							'description' => __( 'Theme name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'version' => array(
+							'description' => __( 'Theme version.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'version_latest' => array(
+							'description' => __( 'Latest version of theme.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'author_url' => array(
+							'description' => __( 'Theme author URL.', 'woocommerce' ),
+							'type'        => 'string',
+							'format'      => 'uri',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'is_child_theme' => array(
+							'description' => __( 'Is this theme a child theme?', 'woocommerce' ),
+							'type'        => 'boolean',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'has_woocommerce_support' => array(
+							'description' => __( 'Does the theme declare WooCommerce support?', 'woocommerce' ),
+							'type'        => 'boolean',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'has_woocommerce_file' => array(
+							'description' => __( 'Does the theme have a woocommerce.php file?', 'woocommerce' ),
+							'type'        => 'boolean',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'has_outdated_templates' => array(
+							'description' => __( 'Does this theme have outdated templates?', 'woocommerce' ),
+							'type'        => 'boolean',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'overrides' => array(
+							'description' => __( 'Template overrides.', 'woocommerce' ),
+							'type'        => 'array',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+							'items'       => array(
+								'type'    => 'string',
+							),
+						),
+						'parent_name' => array(
+							'description' => __( 'Parent theme name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'parent_version' => array(
+							'description' => __( 'Parent theme version.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'parent_author_url' => array(
+							'description' => __( 'Parent theme author URL.', 'woocommerce' ),
+							'type'        => 'string',
+							'format'      => 'uri',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+					),
+				),
+				'settings' => array(
+					'description' => __( 'Settings.', 'woocommerce' ),
+					'type'        => 'object',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+					'properties'  => array(
+						'api_enabled' => array(
+							'description' => __( 'REST API enabled?', 'woocommerce' ),
+							'type'        => 'boolean',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'force_ssl' => array(
+							'description' => __( 'SSL forced?', 'woocommerce' ),
+							'type'        => 'boolean',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'currency' => array(
+							'description' => __( 'Currency.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'currency_symbol' => array(
+							'description' => __( 'Currency symbol.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'currency_position' => array(
+							'description' => __( 'Currency position.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'thousand_separator' => array(
+							'description' => __( 'Thousand separator.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'decimal_separator' => array(
+							'description' => __( 'Decimal separator.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'number_of_decimals' => array(
+							'description' => __( 'Number of decimals.', 'woocommerce' ),
+							'type'        => 'integer',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'geolocation_enabled' => array(
+							'description' => __( 'Geolocation enabled?', 'woocommerce' ),
+							'type'        => 'boolean',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'taxonomies' => array(
+							'description' => __( 'Taxonomy terms for product/order statuses.', 'woocommerce' ),
+							'type'        => 'array',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+							'items'       => array(
+								'type'    => 'string',
+							),
+						),
+						'product_visibility_terms' => array(
+							'description' => __( 'Terms in the product visibility taxonomy.', 'woocommerce' ),
+							'type'        => 'array',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+							'items'       => array(
+								'type'    => 'string',
+							),
+						),
+					),
+				),
+				'security' => array(
+					'description' => __( 'Security.', 'woocommerce' ),
+					'type'        => 'object',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+					'properties'  => array(
+						'secure_connection' => array(
+							'description' => __( 'Is the connection to your store secure?', 'woocommerce' ),
+							'type'        => 'boolean',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'hide_errors' => array(
+							'description' => __( 'Hide errors from visitors?', 'woocommerce' ),
+							'type'        => 'boolean',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+					),
+				),
+				'pages' => array(
+					'description' => __( 'WooCommerce pages.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+					'items'       => array(
+						'type'    => 'string',
+					),
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+
+	/**
+	 * Return an array of sections and the data associated with each.
+	 *
+	 * @return array
+	 */
+	public function get_item_mappings() {
+		return array(
+			'environment'    => $this->get_environment_info(),
+			'database'       => $this->get_database_info(),
+			'active_plugins' => $this->get_active_plugins(),
+			'theme'          => $this->get_theme_info(),
+			'settings'       => $this->get_settings(),
+			'security'       => $this->get_security_info(),
+			'pages'          => $this->get_pages(),
+		);
+	}
+
+	/**
+	 * Get array of environment information. Includes thing like software
+	 * versions, and various server settings.
+	 *
+	 * @return array
+	 */
+	public function get_environment_info() {
+		global $wpdb;
+
+		// Figure out cURL version, if installed.
+		$curl_version = '';
+		if ( function_exists( 'curl_version' ) ) {
+			$curl_version = curl_version();
+			$curl_version = $curl_version['version'] . ', ' . $curl_version['ssl_version'];
+		}
+
+		// WP memory limit
+		$wp_memory_limit = wc_let_to_num( WP_MEMORY_LIMIT );
+		if ( function_exists( 'memory_get_usage' ) ) {
+			$wp_memory_limit = max( $wp_memory_limit, wc_let_to_num( @ini_get( 'memory_limit' ) ) );
+		}
+
+		// Test POST requests
+		$post_response = wp_safe_remote_post( 'https://www.paypal.com/cgi-bin/webscr', array(
+			'timeout'     => 10,
+			'user-agent'  => 'WooCommerce/' . WC()->version,
+			'httpversion' => '1.1',
+			'body'        => array(
+				'cmd'    => '_notify-validate',
+			),
+		) );
+		$post_response_successful = false;
+		if ( ! is_wp_error( $post_response ) && $post_response['response']['code'] >= 200 && $post_response['response']['code'] < 300 ) {
+			$post_response_successful = true;
+		}
+
+		// Test GET requests
+		$get_response = wp_safe_remote_get( 'https://woocommerce.com/wc-api/product-key-api?request=ping&network=' . ( is_multisite() ? '1' : '0' ) );
+		$get_response_successful = false;
+		if ( ! is_wp_error( $post_response ) && $post_response['response']['code'] >= 200 && $post_response['response']['code'] < 300 ) {
+			$get_response_successful = true;
+		}
+
+		// Return all environment info. Described by JSON Schema.
+		return array(
+			'home_url'                  => get_option( 'home' ),
+			'site_url'                  => get_option( 'siteurl' ),
+			'version'                => WC()->version,
+			'log_directory'             => WC_LOG_DIR,
+			'log_directory_writable'    => ( @fopen( WC_LOG_DIR . 'test-log.log', 'a' ) ? true : false ),
+			'wp_version'                => get_bloginfo( 'version' ),
+			'wp_multisite'              => is_multisite(),
+			'wp_memory_limit'           => $wp_memory_limit,
+			'wp_debug_mode'             => ( defined( 'WP_DEBUG' ) && WP_DEBUG ),
+			'wp_cron'                   => ! ( defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON ),
+			'language'                  => get_locale(),
+			'server_info'               => $_SERVER['SERVER_SOFTWARE'],
+			'php_version'               => phpversion(),
+			'php_post_max_size'         => wc_let_to_num( ini_get( 'post_max_size' ) ),
+			'php_max_execution_time'    => ini_get( 'max_execution_time' ),
+			'php_max_input_vars'        => ini_get( 'max_input_vars' ),
+			'curl_version'              => $curl_version,
+			'suhosin_installed'         => extension_loaded( 'suhosin' ),
+			'max_upload_size'           => wp_max_upload_size(),
+			'mysql_version'             => ( ! empty( $wpdb->is_mysql ) ? $wpdb->db_version() : '' ),
+			'default_timezone'          => date_default_timezone_get(),
+			'fsockopen_or_curl_enabled' => ( function_exists( 'fsockopen' ) || function_exists( 'curl_init' ) ),
+			'soapclient_enabled'        => class_exists( 'SoapClient' ),
+			'domdocument_enabled'       => class_exists( 'DOMDocument' ),
+			'gzip_enabled'              => is_callable( 'gzopen' ),
+			'mbstring_enabled'          => extension_loaded( 'mbstring' ),
+			'remote_post_successful'    => $post_response_successful,
+			'remote_post_response'      => ( is_wp_error( $post_response ) ? $post_response->get_error_message() : $post_response['response']['code'] ),
+			'remote_get_successful'     => $get_response_successful,
+			'remote_get_response'       => ( is_wp_error( $get_response ) ? $get_response->get_error_message() : $get_response['response']['code'] ),
+		);
+	}
+
+	/**
+	 * Get array of database information. Version, prefix, and table existence.
+	 *
+	 * @return array
+	 */
+	public function get_database_info() {
+		global $wpdb;
+
+		// WC Core tables to check existence of
+		$tables = apply_filters( 'woocommerce_database_tables', array(
+			'woocommerce_sessions',
+			'woocommerce_api_keys',
+			'woocommerce_attribute_taxonomies',
+			'woocommerce_downloadable_product_permissions',
+			'woocommerce_order_items',
+			'woocommerce_order_itemmeta',
+			'woocommerce_tax_rates',
+			'woocommerce_tax_rate_locations',
+			'woocommerce_shipping_zones',
+			'woocommerce_shipping_zone_locations',
+			'woocommerce_shipping_zone_methods',
+			'woocommerce_payment_tokens',
+			'woocommerce_payment_tokenmeta',
+		) );
+
+		if ( get_option( 'db_version' ) < 34370 ) {
+			$tables[] = 'woocommerce_termmeta';
+		}
+		$table_exists = array();
+		foreach ( $tables as $table ) {
+			$table_exists[ $table ] = ( $wpdb->get_var( $wpdb->prepare( "SHOW TABLES LIKE %s;", $wpdb->prefix . $table ) ) === $wpdb->prefix . $table );
+		}
+
+		// Return all database info. Described by JSON Schema.
+		return array(
+			'wc_database_version'    => get_option( 'woocommerce_db_version' ),
+			'database_prefix'        => $wpdb->prefix,
+			'maxmind_geoip_database' => WC_Geolocation::get_local_database_path(),
+			'database_tables'        => $table_exists,
+		);
+	}
+
+	/**
+	 * Get a list of plugins active on the site.
+	 *
+	 * @return array
+	 */
+	public function get_active_plugins() {
+		require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+
+		// Get both site plugins and network plugins
+		$active_plugins = (array) get_option( 'active_plugins', array() );
+		if ( is_multisite() ) {
+			$network_activated_plugins = array_keys( get_site_option( 'active_sitewide_plugins', array() ) );
+			$active_plugins            = array_merge( $active_plugins, $network_activated_plugins );
+		}
+
+		$active_plugins_data = array();
+		$available_updates   = get_plugin_updates();
+
+		foreach ( $active_plugins as $plugin ) {
+			$data           = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin );
+			$dirname        = dirname( $plugin );
+			$version_latest = '';
+			$slug           = explode( '/', $plugin );
+			$slug           = explode( '.', end( $slug ) );
+			$slug           = $slug[0];
+
+			if ( 'woocommerce' !== $slug && ( strstr( $data['PluginURI'], 'woothemes.com' ) || strstr( $data['PluginURI'], 'woocommerce.com' ) ) ) {
+				if ( false === ( $version_data = get_transient( md5( $plugin ) . '_version_data' ) ) ) {
+					$changelog = wp_safe_remote_get( 'http://dzv365zjfbd8v.cloudfront.net/changelogs/' . $dirname . '/changelog.txt' );
+					$cl_lines  = explode( "\n", wp_remote_retrieve_body( $changelog ) );
+					if ( ! empty( $cl_lines ) ) {
+						foreach ( $cl_lines as $line_num => $cl_line ) {
+							if ( preg_match( '/^[0-9]/', $cl_line ) ) {
+								$date         = str_replace( '.' , '-' , trim( substr( $cl_line , 0 , strpos( $cl_line , '-' ) ) ) );
+								$version      = preg_replace( '~[^0-9,.]~' , '' ,stristr( $cl_line , "version" ) );
+								$update       = trim( str_replace( "*" , "" , $cl_lines[ $line_num + 1 ] ) );
+								$version_data = array( 'date' => $date , 'version' => $version , 'update' => $update , 'changelog' => $changelog );
+								set_transient( md5( $plugin ) . '_version_data', $version_data, DAY_IN_SECONDS );
+								break;
+							}
+						}
+					}
+				}
+				$version_latest = $version_data['version'];
+			} elseif ( isset( $available_updates[ $plugin ]->update->new_version ) ) {
+				$version_latest = $available_updates[ $plugin ]->update->new_version;
+			}
+
+			// convert plugin data to json response format.
+			$active_plugins_data[] = array(
+				'plugin'            => $plugin,
+				'name'              => $data['Name'],
+				'version'           => $data['Version'],
+				'version_latest'    => $version_latest,
+				'url'               => $data['PluginURI'],
+				'author_name'       => $data['AuthorName'],
+				'author_url'        => esc_url_raw( $data['AuthorURI'] ),
+				'network_activated' => $data['Network'],
+			);
+		}
+
+		return $active_plugins_data;
+	}
+
+	/**
+	 * Get info on the current active theme, info on parent theme (if presnet)
+	 * and a list of template overrides.
+	 *
+	 * @return array
+	 */
+	public function get_theme_info() {
+		$active_theme = wp_get_theme();
+
+		// Get parent theme info if this theme is a child theme, otherwise
+		// pass empty info in the response.
+		if ( is_child_theme() ) {
+			$parent_theme      = wp_get_theme( $active_theme->Template );
+			$parent_theme_info = array(
+				'parent_name'           => $parent_theme->Name,
+				'parent_version'        => $parent_theme->Version,
+				'parent_version_latest' => WC_Admin_Status::get_latest_theme_version( $parent_theme ),
+				'parent_author_url'     => $parent_theme->{'Author URI'},
+			);
+		} else {
+			$parent_theme_info = array( 'parent_name' => '', 'parent_version' => '', 'parent_version_latest' => '', 'parent_author_url' => '' );
+		}
+
+		/**
+		 * Scan the theme directory for all WC templates to see if our theme
+		 * overrides any of them.
+		 */
+		$override_files     = array();
+		$outdated_templates = false;
+		$scan_files         = WC_Admin_Status::scan_template_files( WC()->plugin_path() . '/templates/' );
+		foreach ( $scan_files as $file ) {
+			if ( file_exists( get_stylesheet_directory() . '/' . $file ) ) {
+				$theme_file = get_stylesheet_directory() . '/' . $file;
+			} elseif ( file_exists( get_stylesheet_directory() . '/' . WC()->template_path() . $file ) ) {
+				$theme_file = get_stylesheet_directory() . '/' . WC()->template_path() . $file;
+			} elseif ( file_exists( get_template_directory() . '/' . $file ) ) {
+				$theme_file = get_template_directory() . '/' . $file;
+			} elseif ( file_exists( get_template_directory() . '/' . WC()->template_path() . $file ) ) {
+				$theme_file = get_template_directory() . '/' . WC()->template_path() . $file;
+			} else {
+				$theme_file = false;
+			}
+
+			if ( ! empty( $theme_file ) ) {
+				$core_version  = WC_Admin_Status::get_file_version( WC()->plugin_path() . '/templates/' . $file );
+				$theme_version = WC_Admin_Status::get_file_version( $theme_file );
+				if ( $core_version && ( empty( $theme_version ) || version_compare( $theme_version, $core_version, '<' ) ) ) {
+					if ( ! $outdated_templates ) {
+						$outdated_templates = true;
+					}
+				}
+				$override_files[] = array(
+					'file'         => str_replace( WP_CONTENT_DIR . '/themes/', '', $theme_file ),
+					'version'      => $theme_version,
+					'core_version' => $core_version,
+				);
+			}
+		}
+
+		$active_theme_info = array(
+			'name'                    => $active_theme->Name,
+			'version'                 => $active_theme->Version,
+			'version_latest'          => WC_Admin_Status::get_latest_theme_version( $active_theme ),
+			'author_url'              => esc_url_raw( $active_theme->{'Author URI'} ),
+			'is_child_theme'          => is_child_theme(),
+			'has_woocommerce_support' => ( current_theme_supports( 'woocommerce' ) || in_array( $active_theme->template, wc_get_core_supported_themes() ) ),
+			'has_woocommerce_file'    => ( file_exists( get_stylesheet_directory() . '/woocommerce.php' ) || file_exists( get_template_directory() . '/woocommerce.php' ) ),
+			'has_outdated_templates'  => $outdated_templates,
+			'overrides'               => $override_files,
+		);
+
+		return array_merge( $active_theme_info, $parent_theme_info );
+	}
+
+	/**
+	 * Get some setting values for the site that are useful for debugging
+	 * purposes. For full settings access, use the settings api.
+	 *
+	 * @return array
+	 */
+	public function get_settings() {
+		// Get a list of terms used for product/order taxonomies
+		$term_response = array();
+		$terms         = get_terms( 'product_type', array( 'hide_empty' => 0 ) );
+		foreach ( $terms as $term ) {
+			$term_response[ $term->slug ] = strtolower( $term->name );
+		}
+
+		// Get a list of terms used for product visibility.
+		$product_visibility_terms = array();
+		$terms                    = get_terms( 'product_visibility', array( 'hide_empty' => 0 ) );
+		foreach ( $terms as $term ) {
+			$product_visibility_terms[ $term->slug ] = strtolower( $term->name );
+		}
+
+		// Return array of useful settings for debugging.
+		return array(
+			'api_enabled'              => 'yes' === get_option( 'woocommerce_api_enabled' ),
+			'force_ssl'                => 'yes' === get_option( 'woocommerce_force_ssl_checkout' ),
+			'currency'                 => get_woocommerce_currency(),
+			'currency_symbol'          => get_woocommerce_currency_symbol(),
+			'currency_position'        => get_option( 'woocommerce_currency_pos' ),
+			'thousand_separator'       => wc_get_price_thousand_separator(),
+			'decimal_separator'        => wc_get_price_decimal_separator(),
+			'number_of_decimals'       => wc_get_price_decimals(),
+			'geolocation_enabled'      => in_array( get_option( 'woocommerce_default_customer_address' ), array( 'geolocation_ajax', 'geolocation' ) ),
+			'taxonomies'               => $term_response,
+			'product_visibility_terms' => $product_visibility_terms,
+		);
+	}
+
+	/**
+	 * Returns security tips.
+	 *
+	 * @return array
+	 */
+	public function get_security_info() {
+		$check_page = 0 < wc_get_page_id( 'shop' ) ? get_permalink( wc_get_page_id( 'shop' ) ) : get_home_url();
+		return array(
+			'secure_connection' => 'https' === substr( $check_page, 0, 5 ),
+			'hide_errors'       => ! ( defined( 'WP_DEBUG' ) && defined( 'WP_DEBUG_DISPLAY' ) && WP_DEBUG && WP_DEBUG_DISPLAY ) || 0 === intval( ini_get( 'display_errors' ) ),
+		);
+	}
+
+	/**
+	 * Returns a mini-report on WC pages and if they are configured correctly:
+	 * Present, visible, and including the correct shortcode.
+	 *
+	 * @return array
+	 */
+	public function get_pages() {
+		// WC pages to check against
+		$check_pages = array(
+			_x( 'Shop base', 'Page setting', 'woocommerce' ) => array(
+				'option'    => 'woocommerce_shop_page_id',
+				'shortcode' => '',
+			),
+			_x( 'Cart', 'Page setting', 'woocommerce' ) => array(
+				'option'    => 'woocommerce_cart_page_id',
+				'shortcode' => '[' . apply_filters( 'woocommerce_cart_shortcode_tag', 'woocommerce_cart' ) . ']',
+			),
+			_x( 'Checkout', 'Page setting', 'woocommerce' ) => array(
+				'option'    => 'woocommerce_checkout_page_id',
+				'shortcode' => '[' . apply_filters( 'woocommerce_checkout_shortcode_tag', 'woocommerce_checkout' ) . ']',
+			),
+			_x( 'My account', 'Page setting', 'woocommerce' ) => array(
+				'option'    => 'woocommerce_myaccount_page_id',
+				'shortcode' => '[' . apply_filters( 'woocommerce_my_account_shortcode_tag', 'woocommerce_my_account' ) . ']',
+			),
+		);
+
+		$pages_output = array();
+		foreach ( $check_pages as $page_name => $values ) {
+			$errors   = array();
+			$page_id  = get_option( $values['option'] );
+			$page_set = $page_exists = $page_visible = false;
+			$shortcode_present = $shortcode_required = false;
+
+			// Page checks
+			if ( $page_id ) {
+				$page_set = true;
+			}
+			if ( get_post( $page_id ) ) {
+				$page_exists = true;
+			}
+			if ( 'publish' === get_post_status( $page_id ) ) {
+				$page_visible = true;
+			}
+
+			// Shortcode checks
+			if ( $values['shortcode']  && get_post( $page_id ) ) {
+				$shortcode_required = true;
+				$page = get_post( $page_id );
+				if ( strstr( $page->post_content, $values['shortcode'] ) ) {
+					$shortcode_present = true;
+				}
+			}
+
+			// Wrap up our findings into an output array
+			$pages_output[] = array(
+				'page_name'          => $page_name,
+				'page_id'            => $page_id,
+				'page_set'           => $page_set,
+				'page_exists'        => $page_exists,
+				'page_visible'       => $page_visible,
+				'shortcode'          => $values['shortcode'],
+				'shortcode_required' => $shortcode_required,
+				'shortcode_present'  => $shortcode_present,
+			);
+		}
+
+		return $pages_output;
+	}
+
+	/**
+	 * Get any query params needed.
+	 *
+	 * @return array
+	 */
+	public function get_collection_params() {
+		return array(
+			'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+		);
+	}
+
+	/**
+	 * Prepare the system status response
+	 *
+	 * @param array $system_status
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response $response Response data.
+	 */
+	public function prepare_item_for_response( $system_status, $request ) {
+		$data = $this->add_additional_fields_to_object( $system_status, $request );
+		$data = $this->filter_response_by_context( $data, 'view' );
+
+		$response = rest_ensure_response( $data );
+
+		/**
+		 * Filter the system status returned from the REST API.
+		 *
+		 * @param WP_REST_Response   $response The response object.
+		 * @param mixed              $system_status System status
+		 * @param WP_REST_Request    $request  Request object.
+		 */
+		return apply_filters( 'woocommerce_rest_prepare_system_status', $response, $system_status, $request );
+	}
+}
diff --git a/includes/api/class-wc-rest-system-status-tools-controller.php b/includes/api/class-wc-rest-system-status-tools-controller.php
new file mode 100644
index 00000000000..d541f7dd47d
--- /dev/null
+++ b/includes/api/class-wc-rest-system-status-tools-controller.php
@@ -0,0 +1,465 @@
+<?php
+/**
+ * REST API WC System Status Tools Controller
+ *
+ * Handles requests to the /system_status/tools/* endpoints.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * @package WooCommerce/API
+ * @extends WC_REST_Controller
+ */
+class WC_REST_System_Status_Tools_Controller extends WC_REST_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v2';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'system_status/tools';
+
+	/**
+	 * Register the routes for /system_status/tools/*.
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+				'args'                => $this->get_collection_params(),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<id>[\w-]+)', array(
+			'args' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'string',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_item' ),
+				'permission_callback' => array( $this, 'get_item_permissions_check' ),
+			),
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'update_item' ),
+				'permission_callback' => array( $this, 'update_item_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+	}
+
+	/**
+	 * Check whether a given request has permission to view system status tools.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_items_permissions_check( $request ) {
+		if ( ! wc_rest_check_manager_permissions( 'system_status', 'read' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot list resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+		return true;
+	}
+
+	/**
+	 * Check whether a given request has permission to view a specific system status tool.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_item_permissions_check( $request ) {
+		if ( ! wc_rest_check_manager_permissions( 'system_status', 'read' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot view this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+		return true;
+	}
+
+	/**
+	 * Check whether a given request has permission to execute a specific system status tool.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function update_item_permissions_check( $request ) {
+		if ( ! wc_rest_check_manager_permissions( 'system_status', 'edit' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_update', __( 'Sorry, you cannot update resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+		return true;
+	}
+
+	/**
+	 * A list of avaiable tools for use in the system status section.
+	 * 'button' becomes 'action' in the API.
+	 *
+	 * @return array
+	 */
+	public function get_tools() {
+		$tools = array(
+			'clear_transients' => array(
+				'name'    => __( 'WC transients', 'woocommerce' ),
+				'button'  => __( 'Clear transients', 'woocommerce' ),
+				'desc'    => __( 'This tool will clear the product/shop transients cache.', 'woocommerce' ),
+			),
+			'clear_expired_transients' => array(
+				'name'    => __( 'Expired transients', 'woocommerce' ),
+				'button'  => __( 'Clear expired transients', 'woocommerce' ),
+				'desc'    => __( 'This tool will clear ALL expired transients from WordPress.', 'woocommerce' ),
+			),
+			'delete_orphaned_variations' => array(
+				'name'      => __( 'Orphaned variations', 'woocommerce' ),
+				'button'    => __( 'Delete orphaned variations', 'woocommerce' ),
+				'desc'      => __( 'This tool will delete all variations which have no parent.', 'woocommerce' ),
+			),
+			'recount_terms' => array(
+				'name'    => __( 'Term counts', 'woocommerce' ),
+				'button'  => __( 'Recount terms', 'woocommerce' ),
+				'desc'    => __( 'This tool will recount product terms - useful when changing your settings in a way which hides products from the catalog.', 'woocommerce' ),
+			),
+			'reset_roles' => array(
+				'name'    => __( 'Capabilities', 'woocommerce' ),
+				'button'  => __( 'Reset capabilities', 'woocommerce' ),
+				'desc'    => __( 'This tool will reset the admin, customer and shop_manager roles to default. Use this if your users cannot access all of the WooCommerce admin pages.', 'woocommerce' ),
+			),
+			'clear_sessions' => array(
+				'name'    => __( 'Customer sessions', 'woocommerce' ),
+				'button'  => __( 'Clear all sessions', 'woocommerce' ),
+				'desc'    => sprintf(
+					'<strong class="red">%1$s</strong> %2$s',
+					__( 'Note:', 'woocommerce' ),
+					__( 'This tool will delete all customer session data from the database, including any current live carts.', 'woocommerce' )
+				),
+			),
+			'install_pages' => array(
+				'name'    => __( 'Install WooCommerce pages', 'woocommerce' ),
+				'button'  => __( 'Install pages', 'woocommerce' ),
+				'desc'    => sprintf(
+					'<strong class="red">%1$s</strong> %2$s',
+					__( 'Note:', 'woocommerce' ),
+					__( 'This tool will install all the missing WooCommerce pages. Pages already defined and set up will not be replaced.', 'woocommerce' )
+				),
+			),
+			'delete_taxes' => array(
+				'name'    => __( 'Delete all WooCommerce tax rates', 'woocommerce' ),
+				'button'  => __( 'Delete ALL tax rates', 'woocommerce' ),
+				'desc'    => sprintf(
+					'<strong class="red">%1$s</strong> %2$s',
+					__( 'Note:', 'woocommerce' ),
+					__( 'This option will delete ALL of your tax rates, use with caution.', 'woocommerce' )
+				),
+			),
+			'reset_tracking' => array(
+				'name'    => __( 'Reset usage tracking settings', 'woocommerce' ),
+				'button'  => __( 'Reset usage tracking settings', 'woocommerce' ),
+				'desc'    => __( 'This will reset your usage tracking settings, causing it to show the opt-in banner again and not sending any data.', 'woocommerce' ),
+			),
+		);
+
+		return apply_filters( 'woocommerce_debug_tools', $tools );
+	}
+
+	/**
+	 * Get a list of system status tools.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function get_items( $request ) {
+		$tools = array();
+		foreach ( $this->get_tools() as $id => $tool ) {
+			$tools[] = $this->prepare_response_for_collection( $this->prepare_item_for_response( array(
+				'id'          => $id,
+				'name'        => $tool['name'],
+				'action'      => $tool['button'],
+				'description' => $tool['desc'],
+			), $request ) );
+		}
+
+		$response = rest_ensure_response( $tools );
+		return $response;
+	}
+
+	/**
+	 * Return a single tool.
+	 *
+	 * @param  WP_REST_Request $request
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function get_item( $request ) {
+		$tools = $this->get_tools();
+		if ( empty( $tools[ $request['id'] ] ) ) {
+			return new WP_Error( 'woocommerce_rest_system_status_tool_invalid_id', __( 'Invalid tool ID.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+		$tool = $tools[ $request['id'] ];
+		return rest_ensure_response( $this->prepare_item_for_response( array(
+		   'id'          => $request['id'],
+		   'name'        => $tool['name'],
+		   'action'      => $tool['button'],
+		   'description' => $tool['desc'],
+	   ), $request ) );
+	}
+
+	/**
+	 * Update (execute) a tool.
+	 * @param  WP_REST_Request $request
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function update_item( $request ) {
+		$tools = $this->get_tools();
+		if ( empty( $tools[ $request['id'] ] ) ) {
+			return new WP_Error( 'woocommerce_rest_system_status_tool_invalid_id', __( 'Invalid tool ID.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$tool = $tools[ $request['id'] ];
+		$tool = array(
+		   'id'          => $request['id'],
+		   'name'        => $tool['name'],
+		   'action'      => $tool['button'],
+		   'description' => $tool['desc'],
+		);
+
+		$execute_return = $this->execute_tool( $request['id'] );
+		$tool = array_merge( $tool, $execute_return );
+
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_item_for_response( $tool, $request );
+		return rest_ensure_response( $response );
+	}
+
+	/**
+	 * Prepare a tool item for serialization.
+	 *
+	 * @param  array $item Object.
+	 * @param  WP_REST_Request $request Request object.
+	 * @return WP_REST_Response $response Response data.
+	 */
+	public function prepare_item_for_response( $item, $request ) {
+		$context = empty( $request['context'] ) ? 'view' : $request['context'];
+		$data    = $this->add_additional_fields_to_object( $item, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		$response = rest_ensure_response( $data );
+
+		$response->add_links( $this->prepare_links( $item['id'] ) );
+
+		return $response;
+	}
+
+	/**
+	 * Get the system status tools schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'system_status_tool',
+			'type'       => 'object',
+			'properties' => array(
+				'id'               => array(
+					'description'  => __( 'A unique identifier for the tool.', 'woocommerce' ),
+					'type'         => 'string',
+					'context'      => array( 'view', 'edit' ),
+					'arg_options'  => array(
+						'sanitize_callback' => 'sanitize_title',
+					),
+				),
+				'name'            => array(
+					'description'  => __( 'Tool name.', 'woocommerce' ),
+					'type'         => 'string',
+					'context'      => array( 'view', 'edit' ),
+					'arg_options'  => array(
+						'sanitize_callback' => 'sanitize_text_field',
+					),
+				),
+				'action'            => array(
+					'description'  => __( 'What running the tool will do.', 'woocommerce' ),
+					'type'         => 'string',
+					'context'      => array( 'view', 'edit' ),
+					'arg_options'  => array(
+						'sanitize_callback' => 'sanitize_text_field',
+					),
+				),
+				'description'      => array(
+					'description'  => __( 'Tool description.', 'woocommerce' ),
+					'type'         => 'string',
+					'context'      => array( 'view', 'edit' ),
+					'arg_options'  => array(
+						'sanitize_callback' => 'sanitize_text_field',
+					),
+				),
+				'success'      => array(
+					'description'  => __( 'Did the tool run successfully?', 'woocommerce' ),
+					'type'         => 'boolean',
+					'context'      => array( 'edit' ),
+				),
+				'message'      => array(
+					'description'  => __( 'Tool return message.', 'woocommerce' ),
+					'type'         => 'string',
+					'context'      => array( 'edit' ),
+					'arg_options'  => array(
+						'sanitize_callback' => 'sanitize_text_field',
+					),
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+
+	/**
+	 * Prepare links for the request.
+	 *
+	 * @param string $id
+	 * @return array
+	 */
+	protected function prepare_links( $id ) {
+		$base  = '/' . $this->namespace . '/' . $this->rest_base;
+		$links = array(
+			'item' => array(
+				'href'       => rest_url( trailingslashit( $base ) . $id ),
+				'embeddable' => true,
+			),
+		);
+
+		return $links;
+	}
+
+	/**
+	 * Get any query params needed.
+	 *
+	 * @return array
+	 */
+	public function get_collection_params() {
+		return array(
+			'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+		);
+	}
+
+	/**
+	 * Actually executes a a tool.
+	 *
+	 * @param  string $tool
+	 * @return array
+	 */
+	public function execute_tool( $tool ) {
+		global $wpdb;
+		$ran = true;
+		switch ( $tool ) {
+			case 'clear_transients' :
+				wc_delete_product_transients();
+				wc_delete_shop_order_transients();
+				WC_Cache_Helper::get_transient_version( 'shipping', true );
+				$message = __( 'Product transients cleared', 'woocommerce' );
+			break;
+			case 'clear_expired_transients' :
+				/*
+				 * Deletes all expired transients. The multi-table delete syntax is used.
+				 * to delete the transient record from table a, and the corresponding.
+				 * transient_timeout record from table b.
+				 *
+				 * Based on code inside core's upgrade_network() function.
+				 */
+				$sql = "DELETE a, b FROM $wpdb->options a, $wpdb->options b
+					WHERE a.option_name LIKE %s
+					AND a.option_name NOT LIKE %s
+					AND b.option_name = CONCAT( '_transient_timeout_', SUBSTRING( a.option_name, 12 ) )
+					AND b.option_value < %d";
+				$rows = $wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( '_transient_' ) . '%', $wpdb->esc_like( '_transient_timeout_' ) . '%', time() ) );
+
+				$sql = "DELETE a, b FROM $wpdb->options a, $wpdb->options b
+					WHERE a.option_name LIKE %s
+					AND a.option_name NOT LIKE %s
+					AND b.option_name = CONCAT( '_site_transient_timeout_', SUBSTRING( a.option_name, 17 ) )
+					AND b.option_value < %d";
+				$rows2 = $wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( '_site_transient_' ) . '%', $wpdb->esc_like( '_site_transient_timeout_' ) . '%', time() ) );
+
+				$message = sprintf( __( '%d transients rows cleared', 'woocommerce' ), $rows + $rows2 );
+			break;
+			case 'delete_orphaned_variations' :
+				/**
+				 * Delete orphans
+				 */
+				$result = absint( $wpdb->query( "DELETE products
+					FROM {$wpdb->posts} products
+					LEFT JOIN {$wpdb->posts} wp ON wp.ID = products.post_parent
+					WHERE wp.ID IS NULL AND products.post_type = 'product_variation';" ) );
+				$message = sprintf( __( '%d orphaned variations deleted', 'woocommerce' ), $result );
+			break;
+			case 'reset_roles' :
+				// Remove then re-add caps and roles
+				WC_Install::remove_roles();
+				WC_Install::create_roles();
+				$message = __( 'Roles successfully reset', 'woocommerce' );
+			break;
+			case 'recount_terms' :
+				$product_cats = get_terms( 'product_cat', array( 'hide_empty' => false, 'fields' => 'id=>parent' ) );
+				_wc_term_recount( $product_cats, get_taxonomy( 'product_cat' ), true, false );
+				$product_tags = get_terms( 'product_tag', array( 'hide_empty' => false, 'fields' => 'id=>parent' ) );
+				_wc_term_recount( $product_tags, get_taxonomy( 'product_tag' ), true, false );
+				$message = __( 'Terms successfully recounted', 'woocommerce' );
+			break;
+			case 'clear_sessions' :
+				$wpdb->query( "TRUNCATE {$wpdb->prefix}woocommerce_sessions" );
+				wp_cache_flush();
+				$message = __( 'Sessions successfully cleared', 'woocommerce' );
+			break;
+			case 'install_pages' :
+				WC_Install::create_pages();
+				$message = __( 'All missing WooCommerce pages successfully installed', 'woocommerce' );
+			break;
+			case 'delete_taxes' :
+
+				$wpdb->query( "TRUNCATE TABLE {$wpdb->prefix}woocommerce_tax_rates;" );
+				$wpdb->query( "TRUNCATE TABLE {$wpdb->prefix}woocommerce_tax_rate_locations;" );
+				WC_Cache_Helper::incr_cache_prefix( 'taxes' );
+				$message = __( 'Tax rates successfully deleted', 'woocommerce' );
+			break;
+			case 'reset_tracking' :
+				delete_option( 'woocommerce_allow_tracking' );
+				WC_Admin_Notices::add_notice( 'tracking' );
+				$message = __( 'Usage tracking settings successfully reset.', 'woocommerce' );
+			break;
+			default :
+				$tools = $this->get_tools();
+				if ( isset( $tools[ $tool ]['callback'] ) ) {
+					$callback = $tools[ $tool ]['callback'];
+					$return = call_user_func( $callback );
+					if ( false === $return ) {
+						$callback_string = is_array( $callback ) ? get_class( $callback[0] ) . '::' . $callback[1] : $callback;
+						$ran = false;
+						$message = sprintf( __( 'There was an error calling %s', 'woocommerce' ), $callback_string );
+					} else {
+						$message = __( 'Tool ran.', 'woocommerce' );
+					}
+				} else {
+					$ran     = false;
+					$message = __( 'There was an error calling this tool. There is no callback present.', 'woocommerce' );
+				}
+			break;
+		}
+
+		return array( 'success' => $ran, 'message' => $message );
+	}
+}
diff --git a/includes/api/class-wc-rest-tax-classes-controller.php b/includes/api/class-wc-rest-tax-classes-controller.php
new file mode 100644
index 00000000000..7c454b53e0f
--- /dev/null
+++ b/includes/api/class-wc-rest-tax-classes-controller.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * REST API Tax Classes controller
+ *
+ * Handles requests to the /taxes/classes endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Tax Classes controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Tax_Classes_V1_Controller
+ */
+class WC_REST_Tax_Classes_Controller extends WC_REST_Tax_Classes_V1_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v2';
+}
diff --git a/includes/api/class-wc-rest-taxes-controller.php b/includes/api/class-wc-rest-taxes-controller.php
new file mode 100644
index 00000000000..b361c5d955b
--- /dev/null
+++ b/includes/api/class-wc-rest-taxes-controller.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * REST API Taxes controller
+ *
+ * Handles requests to the /taxes endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Taxes controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Taxes_V1_Controller
+ */
+class WC_REST_Taxes_Controller extends WC_REST_Taxes_V1_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v2';
+}
diff --git a/includes/api/class-wc-rest-webhook-deliveries.php b/includes/api/class-wc-rest-webhook-deliveries.php
new file mode 100644
index 00000000000..847005264a2
--- /dev/null
+++ b/includes/api/class-wc-rest-webhook-deliveries.php
@@ -0,0 +1,170 @@
+<?php
+/**
+ * REST API Webhooks controller
+ *
+ * Handles requests to the /webhooks/<webhook_id>/deliveries endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Webhook Deliveries controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Webhook_Deliveries_V1_Controller
+ */
+class WC_REST_Webhook_Deliveries_Controller extends WC_REST_Webhook_Deliveries_V1_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v2';
+
+	/**
+	 * Prepare a single webhook delivery output for response.
+	 *
+	 * @param stdClass $log Delivery log object.
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response $response Response data.
+	 */
+	public function prepare_item_for_response( $log, $request ) {
+		$data = (array) $log;
+
+		// Add timestamp.
+		$data['date_created'] = wc_rest_prepare_date_response( $log->comment->comment_date );
+		$data['date_created_gmt'] = wc_rest_prepare_date_response( $log->comment->comment_date_gmt );
+
+		// Remove comment object.
+		unset( $data['comment'] );
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		// Wrap the data in a response object.
+		$response = rest_ensure_response( $data );
+
+		$response->add_links( $this->prepare_links( $log ) );
+
+		/**
+		 * Filter webhook delivery object returned from the REST API.
+		 *
+		 * @param WP_REST_Response $response The response object.
+		 * @param stdClass         $log      Delivery log object used to create response.
+		 * @param WP_REST_Request  $request  Request object.
+		 */
+		return apply_filters( 'woocommerce_rest_prepare_webhook_delivery', $response, $log, $request );
+	}
+
+	/**
+	 * Get the Webhook's schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'webhook_delivery',
+			'type'       => 'object',
+			'properties' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'duration' => array(
+					'description' => __( 'The delivery duration, in seconds.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'summary' => array(
+					'description' => __( 'A friendly summary of the response including the HTTP response code, message, and body.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'request_url' => array(
+					'description' => __( 'The URL where the webhook was delivered.', 'woocommerce' ),
+					'type'        => 'string',
+					'format'      => 'uri',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'request_headers' => array(
+					'description' => __( 'The URL where the webhook was delivered.', 'woocommerce' ),
+					'type'        => 'string',
+					'format'      => 'uri',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'request_headers' => array(
+					'description' => __( 'Request headers.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+					'items'       => array(
+						'type'    => 'string',
+					),
+				),
+				'request_body' => array(
+					'description' => __( 'Request body.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'response_code' => array(
+					'description' => __( 'The HTTP response code from the receiving server.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'response_message' => array(
+					'description' => __( 'The HTTP response message from the receiving server.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'response_headers' => array(
+					'description' => __( 'Array of the response headers from the receiving server.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+					'items'       => array(
+						'type'    => 'string',
+					),
+				),
+				'response_body' => array(
+					'description' => __( 'The response body from the receiving server.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'date_created' => array(
+					'description' => __( "The date the webhook delivery was logged, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_created_gmt' => array(
+					'description' => __( 'The date the webhook delivery was logged, as GMT.', 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+}
diff --git a/includes/api/class-wc-rest-webhooks-controller.php b/includes/api/class-wc-rest-webhooks-controller.php
new file mode 100644
index 00000000000..45ca4e2e7c6
--- /dev/null
+++ b/includes/api/class-wc-rest-webhooks-controller.php
@@ -0,0 +1,184 @@
+<?php
+/**
+ * REST API Webhooks controller
+ *
+ * Handles requests to the /webhooks endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Webhooks controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Webhooks_V1_Controller
+ */
+class WC_REST_Webhooks_Controller extends WC_REST_Webhooks_V1_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v2';
+
+	/**
+	 * Prepare a single webhook output for response.
+	 *
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response $response Response data.
+	 */
+	public function prepare_item_for_response( $post, $request ) {
+		$id      = (int) $post->ID;
+		$webhook = new WC_Webhook( $id );
+		$data    = array(
+			'id'                => $webhook->id,
+			'name'              => $webhook->get_name(),
+			'status'            => $webhook->get_status(),
+			'topic'             => $webhook->get_topic(),
+			'resource'          => $webhook->get_resource(),
+			'event'             => $webhook->get_event(),
+			'hooks'             => $webhook->get_hooks(),
+			'delivery_url'      => $webhook->get_delivery_url(),
+			'date_created'      => wc_rest_prepare_date_response( $webhook->get_post_data()->post_date ),
+			'date_created_gmt'  => wc_rest_prepare_date_response( $webhook->get_post_data()->post_date_gmt ),
+			'date_modified'     => wc_rest_prepare_date_response( $webhook->get_post_data()->post_modified ),
+			'date_modified_gmt' => wc_rest_prepare_date_response( $webhook->get_post_data()->post_modified_gmt ),
+		);
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		// Wrap the data in a response object.
+		$response = rest_ensure_response( $data );
+
+		$response->add_links( $this->prepare_links( $post, $request ) );
+
+		/**
+		 * Filter webhook object returned from the REST API.
+		 *
+		 * @param WP_REST_Response $response The response object.
+		 * @param WC_Webhook       $webhook  Webhook object used to create response.
+		 * @param WP_REST_Request  $request  Request object.
+		 */
+		return apply_filters( "woocommerce_rest_prepare_{$this->post_type}", $response, $webhook, $request );
+	}
+
+	/**
+	 * Get the default REST API version.
+	 *
+	 * @since  3.0.0
+	 * @return string
+	 */
+	protected function get_default_api_version() {
+		return 'wp_api_v2';
+	}
+
+	/**
+	 * Get the Webhook's schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'webhook',
+			'type'       => 'object',
+			'properties' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'name' => array(
+					'description' => __( 'A friendly name for the webhook.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'status' => array(
+					'description' => __( 'Webhook status.', 'woocommerce' ),
+					'type'        => 'string',
+					'default'     => 'active',
+					'enum'        => array( 'active', 'paused', 'disabled' ),
+					'context'     => array( 'view', 'edit' ),
+					'arg_options' => array(
+						'sanitize_callback' => 'wc_is_webhook_valid_topic',
+					),
+				),
+				'topic' => array(
+					'description' => __( 'Webhook topic.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'resource' => array(
+					'description' => __( 'Webhook resource.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'event' => array(
+					'description' => __( 'Webhook event.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'hooks' => array(
+					'description' => __( 'WooCommerce action names associated with the webhook.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+					'items'       => array(
+						'type'    => 'string',
+					),
+				),
+				'delivery_url' => array(
+					'description' => __( 'The URL where the webhook payload is delivered.', 'woocommerce' ),
+					'type'        => 'string',
+					'format'      => 'uri',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'secret' => array(
+					'description' => __( "Secret key used to generate a hash of the delivered webhook and provided in the request headers. This will default is a MD5 hash from the current user's ID|username if not provided.", 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'edit' ),
+				),
+				'date_created' => array(
+					'description' => __( "The date the webhook was created, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_created_gmt' => array(
+					'description' => __( 'The date the webhook was created, as GMT.', 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_modified' => array(
+					'description' => __( "The date the webhook was last modified, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_modified_gmt' => array(
+					'description' => __( 'The date the webhook was last modified, as GMT.', 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+}
diff --git a/includes/api/legacy/class-wc-rest-legacy-coupons-controller.php b/includes/api/legacy/class-wc-rest-legacy-coupons-controller.php
new file mode 100644
index 00000000000..3378de41a40
--- /dev/null
+++ b/includes/api/legacy/class-wc-rest-legacy-coupons-controller.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * REST API Legacy Coupons controller
+ *
+ * Handles requests to the /coupons endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Legacy Coupons controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_CRUD_Controller
+ */
+class WC_REST_Legacy_Coupons_Controller extends WC_REST_CRUD_Controller {
+
+	/**
+	 * Query args.
+	 *
+	 * @deprecated 3.0.0
+	 *
+	 * @param array $args Query args
+	 * @param WP_REST_Request $request Request data.
+	 * @return array
+	 */
+	public function query_args( $args, $request ) {
+		if ( ! empty( $request['code'] ) ) {
+			$id = wc_get_coupon_id_by_code( $request['code'] );
+			$args['post__in'] = array( $id );
+		}
+
+		return $args;
+	}
+
+	/**
+	 * Prepare a single coupon output for response.
+	 *
+	 * @deprecated 3.0.0
+	 *
+	 * @param WP_Post $post Post object.
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response $data
+	 */
+	public function prepare_item_for_response( $post, $request ) {
+		$coupon = new WC_Coupon( (int) $post->ID );
+		$data   = $coupon->get_data();
+
+		$format_decimal = array( 'amount', 'minimum_amount', 'maximum_amount' );
+		$format_date    = array( 'date_created', 'date_modified', 'date_expires' );
+		$format_null    = array( 'usage_limit', 'usage_limit_per_user', 'limit_usage_to_x_items' );
+
+		// Format decimal values.
+		foreach ( $format_decimal as $key ) {
+			$data[ $key ] = wc_format_decimal( $data[ $key ], 2 );
+		}
+
+		// Format date values.
+		foreach ( $format_date as $key ) {
+			$data[ $key ] = $data[ $key ] ? wc_rest_prepare_date_response( get_gmt_from_date( date( 'Y-m-d H:i:s', $data[ $key ] ) ) ) : null;
+		}
+
+		// Format null values.
+		foreach ( $format_null as $key ) {
+			$data[ $key ] = $data[ $key ] ? $data[ $key ] : null;
+		}
+
+		$context  = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data     = $this->add_additional_fields_to_object( $data, $request );
+		$data     = $this->filter_response_by_context( $data, $context );
+		$response = rest_ensure_response( $data );
+		$response->add_links( $this->prepare_links( $post, $request ) );
+
+		/**
+		 * Filter the data for a response.
+		 *
+		 * The dynamic portion of the hook name, $this->post_type, refers to post_type of the post being
+		 * prepared for the response.
+		 *
+		 * @param WP_REST_Response   $response   The response object.
+		 * @param WP_Post            $post       Post object.
+		 * @param WP_REST_Request    $request    Request object.
+		 */
+		return apply_filters( "woocommerce_rest_prepare_{$this->post_type}", $response, $post, $request );
+	}
+
+	/**
+	 * Prepare a single coupon for create or update.
+	 *
+	 * @deprecated 3.0.0
+	 *
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_Error|stdClass $data Post object.
+	 */
+	protected function prepare_item_for_database( $request ) {
+		global $wpdb;
+
+		$id        = isset( $request['id'] ) ? absint( $request['id'] ) : 0;
+		$coupon    = new WC_Coupon( $id );
+		$schema    = $this->get_item_schema();
+		$data_keys = array_keys( array_filter( $schema['properties'], array( $this, 'filter_writable_props' ) ) );
+
+		// Validate required POST fields.
+		if ( 'POST' === $request->get_method() && 0 === $coupon->get_id() ) {
+			if ( empty( $request['code'] ) ) {
+				return new WP_Error( 'woocommerce_rest_empty_coupon_code', sprintf( __( 'The coupon code cannot be empty.', 'woocommerce' ), 'code' ), array( 'status' => 400 ) );
+			}
+		}
+
+		// Handle all writable props.
+		foreach ( $data_keys as $key ) {
+			$value = $request[ $key ];
+
+			if ( ! is_null( $value ) ) {
+				switch ( $key ) {
+					case 'code' :
+						$coupon_code = wc_format_coupon_code( $value );
+						$id          = $coupon->get_id() ? $coupon->get_id() : 0;
+						$id_from_code = wc_get_coupon_id_by_code( $coupon_code, $id );
+
+						if ( $id_from_code ) {
+							return new WP_Error( 'woocommerce_rest_coupon_code_already_exists', __( 'The coupon code already exists', 'woocommerce' ), array( 'status' => 400 ) );
+						}
+
+						$coupon->set_code( $coupon_code );
+						break;
+					case 'meta_data' :
+						if ( is_array( $value ) ) {
+							foreach ( $value as $meta ) {
+								$coupon->update_meta_data( $meta['key'], $meta['value'], isset( $meta['id'] ) ? $meta['id'] : '' );
+							}
+						}
+						break;
+					case 'description' :
+						$coupon->set_description( wp_filter_post_kses( $value ) );
+						break;
+					default :
+						if ( is_callable( array( $coupon, "set_{$key}" ) ) ) {
+							$coupon->{"set_{$key}"}( $value );
+						}
+						break;
+				}
+			}
+		}
+
+		/**
+		 * Filter the query_vars used in `get_items` for the constructed query.
+		 *
+		 * The dynamic portion of the hook name, $this->post_type, refers to post_type of the post being
+		 * prepared for insertion.
+		 *
+		 * @param WC_Coupon       $coupon        The coupon object.
+		 * @param WP_REST_Request $request       Request object.
+		 */
+		return apply_filters( "woocommerce_rest_pre_insert_{$this->post_type}", $coupon, $request );
+	}
+}
diff --git a/includes/api/legacy/class-wc-rest-legacy-orders-controller.php b/includes/api/legacy/class-wc-rest-legacy-orders-controller.php
new file mode 100644
index 00000000000..5b4e501c66d
--- /dev/null
+++ b/includes/api/legacy/class-wc-rest-legacy-orders-controller.php
@@ -0,0 +1,300 @@
+<?php
+/**
+ * REST API Legacy Orders controller
+ *
+ * Handles requests to the /orders endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Legacy Orders controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_CRUD_Controller
+ */
+class WC_REST_Legacy_Orders_Controller extends WC_REST_CRUD_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v2';
+
+	/**
+	 * Query args.
+	 *
+	 * @deprecated 3.0
+	 *
+	 * @param array $args
+	 * @param WP_REST_Request $request
+	 * @return array
+	 */
+	public function query_args( $args, $request ) {
+		global $wpdb;
+
+		// Set post_status.
+		if ( 'any' !== $request['status'] ) {
+			$args['post_status'] = 'wc-' . $request['status'];
+		} else {
+			$args['post_status'] = 'any';
+		}
+
+		if ( ! empty( $request['customer'] ) ) {
+			if ( ! empty( $args['meta_query'] ) ) {
+				$args['meta_query'] = array();
+			}
+
+			$args['meta_query'][] = array(
+				'key'   => '_customer_user',
+				'value' => $request['customer'],
+				'type'  => 'NUMERIC',
+			);
+		}
+
+		// Search by product.
+		if ( ! empty( $request['product'] ) ) {
+			$order_ids = $wpdb->get_col( $wpdb->prepare( "
+				SELECT order_id
+				FROM {$wpdb->prefix}woocommerce_order_items
+				WHERE order_item_id IN ( SELECT order_item_id FROM {$wpdb->prefix}woocommerce_order_itemmeta WHERE meta_key = '_product_id' AND meta_value = %d )
+				AND order_item_type = 'line_item'
+			 ", $request['product'] ) );
+
+			// Force WP_Query return empty if don't found any order.
+			$order_ids = ! empty( $order_ids ) ? $order_ids : array( 0 );
+
+			$args['post__in'] = $order_ids;
+		}
+
+		// Search.
+		if ( ! empty( $args['s'] ) ) {
+			$order_ids = wc_order_search( $args['s'] );
+
+			if ( ! empty( $order_ids ) ) {
+				unset( $args['s'] );
+				$args['post__in'] = array_merge( $order_ids, array( 0 ) );
+			}
+		}
+
+		return $args;
+	}
+
+	/**
+	 * Prepare a single order output for response.
+	 *
+	 * @deprecated 3.0
+	 *
+	 * @param WP_Post $post Post object.
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response $data
+	 */
+	public function prepare_item_for_response( $post, $request ) {
+		$this->request     = $request;
+		$statuses          = wc_get_order_statuses();
+		$order             = wc_get_order( $post );
+		$data              = array_merge( array( 'id' => $order->get_id() ), $order->get_data() );
+		$format_decimal    = array( 'discount_total', 'discount_tax', 'shipping_total', 'shipping_tax', 'shipping_total', 'shipping_tax', 'cart_tax', 'total', 'total_tax' );
+		$format_date       = array( 'date_created', 'date_modified', 'date_completed', 'date_paid' );
+		$format_line_items = array( 'line_items', 'tax_lines', 'shipping_lines', 'fee_lines', 'coupon_lines' );
+
+		// Format decimal values.
+		foreach ( $format_decimal as $key ) {
+			$data[ $key ] = wc_format_decimal( $data[ $key ], $this->request['dp'] );
+		}
+
+		// Format date values.
+		foreach ( $format_date as $key ) {
+			$data[ $key ] = $data[ $key ] ? wc_rest_prepare_date_response( get_gmt_from_date( date( 'Y-m-d H:i:s', $data[ $key ] ) ) ) : false;
+		}
+
+		// Format the order status.
+		$data['status'] = 'wc-' === substr( $data['status'], 0, 3 ) ? substr( $data['status'], 3 ) : $data['status'];
+
+		// Format line items.
+		foreach ( $format_line_items as $key ) {
+			$data[ $key ] = array_values( array_map( array( $this, 'get_order_item_data' ), $data[ $key ] ) );
+		}
+
+		// Refunds.
+		$data['refunds'] = array();
+		foreach ( $order->get_refunds() as $refund ) {
+			$data['refunds'][] = array(
+				'id'     => $refund->get_id(),
+				'refund' => $refund->get_reason() ? $refund->get_reason() : '',
+				'total'  => '-' . wc_format_decimal( $refund->get_amount(), $this->request['dp'] ),
+			);
+		}
+
+		$context  = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data     = $this->add_additional_fields_to_object( $data, $request );
+		$data     = $this->filter_response_by_context( $data, $context );
+		$response = rest_ensure_response( $data );
+		$response->add_links( $this->prepare_links( $order, $request ) );
+
+		/**
+		 * Filter the data for a response.
+		 *
+		 * The dynamic portion of the hook name, $this->post_type, refers to post_type of the post being
+		 * prepared for the response.
+		 *
+		 * @param WP_REST_Response   $response   The response object.
+		 * @param WP_Post            $post       Post object.
+		 * @param WP_REST_Request    $request    Request object.
+		 */
+		return apply_filters( "woocommerce_rest_prepare_{$this->post_type}", $response, $post, $request );
+	}
+
+	/**
+	 * Prepare a single order for create.
+	 *
+	 * @deprecated 3.0
+	 *
+	 * @param  WP_REST_Request $request Request object.
+	 * @return WP_Error|WC_Order $data Object.
+	 */
+	protected function prepare_item_for_database( $request ) {
+		$id        = isset( $request['id'] ) ? absint( $request['id'] ) : 0;
+		$order     = new WC_Order( $id );
+		$schema    = $this->get_item_schema();
+		$data_keys = array_keys( array_filter( $schema['properties'], array( $this, 'filter_writable_props' ) ) );
+
+		// Handle all writable props
+		foreach ( $data_keys as $key ) {
+			$value = $request[ $key ];
+
+			if ( ! is_null( $value ) ) {
+				switch ( $key ) {
+					case 'billing' :
+					case 'shipping' :
+						$this->update_address( $order, $value, $key );
+						break;
+					case 'line_items' :
+					case 'shipping_lines' :
+					case 'fee_lines' :
+					case 'coupon_lines' :
+						if ( is_array( $value ) ) {
+							foreach ( $value as $item ) {
+								if ( is_array( $item ) ) {
+									if ( $this->item_is_null( $item ) || ( isset( $item['quantity'] ) && 0 === $item['quantity'] ) ) {
+										$order->remove_item( $item['id'] );
+									} else {
+										$this->set_item( $order, $key, $item );
+									}
+								}
+							}
+						}
+						break;
+					case 'meta_data' :
+						if ( is_array( $value ) ) {
+							foreach ( $value as $meta ) {
+								$order->update_meta_data( $meta['key'], $meta['value'], isset( $meta['id'] ) ? $meta['id'] : '' );
+							}
+						}
+						break;
+					default :
+						if ( is_callable( array( $order, "set_{$key}" ) ) ) {
+							$order->{"set_{$key}"}( $value );
+						}
+						break;
+				}
+			}
+		}
+
+		/**
+		 * Filter the data for the insert.
+		 *
+		 * The dynamic portion of the hook name, $this->post_type, refers to post_type of the post being
+		 * prepared for the response.
+		 *
+		 * @param WC_Order           $order      The prder object.
+		 * @param WP_REST_Request    $request    Request object.
+		 */
+		return apply_filters( "woocommerce_rest_pre_insert_{$this->post_type}", $order, $request );
+	}
+
+	/**
+	 * Create base WC Order object.
+	 *
+	 * @deprecated 3.0.0
+	 *
+	 * @param array $data
+	 * @return WC_Order
+	 */
+	protected function create_base_order( $data ) {
+		return wc_create_order( $data );
+	}
+
+	/**
+	 * Create order.
+	 *
+	 * @deprecated 3.0.0
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return int|WP_Error
+	 */
+	protected function create_order( $request ) {
+		try {
+			// Make sure customer exists.
+			if ( ! is_null( $request['customer_id'] ) && 0 !== $request['customer_id'] && false === get_user_by( 'id', $request['customer_id'] ) ) {
+				throw new WC_REST_Exception( 'woocommerce_rest_invalid_customer_id',__( 'Customer ID is invalid.', 'woocommerce' ), 400 );
+			}
+
+			$order = $this->prepare_item_for_database( $request );
+			$order->set_created_via( 'rest-api' );
+			$order->set_prices_include_tax( 'yes' === get_option( 'woocommerce_prices_include_tax' ) );
+			$order->calculate_totals();
+			$order->save();
+
+			// Handle set paid.
+			if ( true === $request['set_paid'] ) {
+				$order->payment_complete( $request['transaction_id'] );
+			}
+
+			return $order->get_id();
+		} catch ( WC_Data_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), $e->getErrorData() );
+		} catch ( WC_REST_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
+		}
+	}
+
+	/**
+	 * Update order.
+	 *
+	 * @deprecated 3.0.0
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return int|WP_Error
+	 */
+	protected function update_order( $request ) {
+		try {
+			$order = $this->prepare_item_for_database( $request );
+			$order->save();
+
+			// Handle set paid.
+			if ( $order->needs_payment() && true === $request['set_paid'] ) {
+				$order->payment_complete( $request['transaction_id'] );
+			}
+
+			// If items have changed, recalculate order totals.
+			if ( isset( $request['billing'] ) || isset( $request['shipping'] ) || isset( $request['line_items'] ) || isset( $request['shipping_lines'] ) || isset( $request['fee_lines'] ) || isset( $request['coupon_lines'] ) ) {
+				$order->calculate_totals();
+			}
+
+			return $order->get_id();
+		} catch ( WC_Data_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), $e->getErrorData() );
+		} catch ( WC_REST_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
+		}
+	}
+}
diff --git a/includes/api/legacy/class-wc-rest-legacy-products-controller.php b/includes/api/legacy/class-wc-rest-legacy-products-controller.php
new file mode 100644
index 00000000000..3539febc6fc
--- /dev/null
+++ b/includes/api/legacy/class-wc-rest-legacy-products-controller.php
@@ -0,0 +1,803 @@
+<?php
+/**
+ * REST API Legacy Products controller
+ *
+ * Handles requests to the /products endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Legacy Products controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_CRUD_Controller
+ */
+class WC_REST_Legacy_Products_Controller extends WC_REST_CRUD_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v2';
+
+	/**
+	 * Query args.
+	 *
+	 * @deprecated 3.0.0
+	 *
+	 * @param array           $args    Request args.
+	 * @param WP_REST_Request $request Request data.
+	 * @return array
+	 */
+	public function query_args( $args, $request ) {
+		// Set post_status.
+		$args['post_status'] = $request['status'];
+
+		// Taxonomy query to filter products by type, category,
+		// tag, shipping class, and attribute.
+		$tax_query = array();
+
+		// Map between taxonomy name and arg's key.
+		$taxonomies = array(
+			'product_cat'            => 'category',
+			'product_tag'            => 'tag',
+			'product_shipping_class' => 'shipping_class',
+		);
+
+		// Set tax_query for each passed arg.
+		foreach ( $taxonomies as $taxonomy => $key ) {
+			if ( ! empty( $request[ $key ] ) ) {
+				$tax_query[] = array(
+					'taxonomy' => $taxonomy,
+					'field'    => 'term_id',
+					'terms'    => $request[ $key ],
+				);
+			}
+		}
+
+		// Filter product type by slug.
+		if ( ! empty( $request['type'] ) ) {
+			$tax_query[] = array(
+				'taxonomy' => 'product_type',
+				'field'    => 'slug',
+				'terms'    => $request['type'],
+			);
+		}
+
+		// Filter by attribute and term.
+		if ( ! empty( $request['attribute'] ) && ! empty( $request['attribute_term'] ) ) {
+			if ( in_array( $request['attribute'], wc_get_attribute_taxonomy_names(), true ) ) {
+				$tax_query[] = array(
+					'taxonomy' => $request['attribute'],
+					'field'    => 'term_id',
+					'terms'    => $request['attribute_term'],
+				);
+			}
+		}
+
+		if ( ! empty( $tax_query ) ) {
+			$args['tax_query'] = $tax_query;
+		}
+
+		// Filter featured.
+		if ( is_bool( $request['featured'] ) ) {
+			$args['tax_query'][] = array(
+				'taxonomy' => 'product_visibility',
+				'field'    => 'name',
+				'terms'    => 'featured',
+			);
+		}
+
+		// Filter by sku.
+		if ( ! empty( $request['sku'] ) ) {
+			$skus = explode( ',', $request['sku'] );
+			// Include the current string as a SKU too.
+			if ( 1 < count( $skus ) ) {
+				$skus[] = $request['sku'];
+			}
+
+			$args['meta_query'] = $this->add_meta_query( $args, array(
+				'key'     => '_sku',
+				'value'   => $skus,
+				'compare' => 'IN',
+			) );
+		}
+
+		// Filter by tax class.
+		if ( ! empty( $request['tax_class'] ) ) {
+			$args['meta_query'] = $this->add_meta_query( $args, array(
+				'key'   => '_tax_class',
+				'value' => 'standard' !== $request['tax_class'] ? $request['tax_class'] : '',
+			) );
+		}
+
+		// Price filter.
+		if ( ! empty( $request['min_price'] ) || ! empty( $request['max_price'] ) ) {
+			$args['meta_query'] = $this->add_meta_query( $args, wc_get_min_max_price_meta_query( $request ) );
+		}
+
+		// Filter product in stock or out of stock.
+		if ( is_bool( $request['in_stock'] ) ) {
+			$args['meta_query'] = $this->add_meta_query( $args, array(
+				'key'   => '_stock_status',
+				'value' => true === $request['in_stock'] ? 'instock' : 'outofstock',
+			) );
+		}
+
+		// Filter by on sale products.
+		if ( is_bool( $request['on_sale'] ) ) {
+			$on_sale_key           = $request['on_sale'] ? 'post__in' : 'post__not_in';
+			$args[ $on_sale_key ] += wc_get_product_ids_on_sale();
+		}
+
+		// Force the post_type argument, since it's not a user input variable.
+		if ( ! empty( $request['sku'] ) ) {
+			$args['post_type'] = array( 'product', 'product_variation' );
+		} else {
+			$args['post_type'] = $this->post_type;
+		}
+
+		return $args;
+	}
+
+	/**
+	 * Prepare a single product output for response.
+	 *
+	 * @deprecated 3.0.0
+	 *
+	 * @param WP_Post         $post    Post object.
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response
+	 */
+	public function prepare_item_for_response( $post, $request ) {
+		$product = wc_get_product( $post );
+		$data    = $this->get_product_data( $product );
+
+		// Add variations to variable products.
+		if ( $product->is_type( 'variable' ) && $product->has_child() ) {
+			$data['variations'] = $product->get_children();
+		}
+
+		// Add grouped products data.
+		if ( $product->is_type( 'grouped' ) && $product->has_child() ) {
+			$data['grouped_products'] = $product->get_children();
+		}
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		// Wrap the data in a response object.
+		$response = rest_ensure_response( $data );
+
+		$response->add_links( $this->prepare_links( $product, $request ) );
+
+		/**
+		 * Filter the data for a response.
+		 *
+		 * The dynamic portion of the hook name, $this->post_type, refers to post_type of the post being
+		 * prepared for the response.
+		 *
+		 * @param WP_REST_Response   $response   The response object.
+		 * @param WP_Post            $post       Post object.
+		 * @param WP_REST_Request    $request    Request object.
+		 */
+		return apply_filters( "woocommerce_rest_prepare_{$this->post_type}", $response, $post, $request );
+	}
+
+	/**
+	 * Get product menu order.
+	 *
+	 * @deprecated 3.0.0
+	 * @param WC_Product $product Product instance.
+	 * @return int
+	 */
+	protected function get_product_menu_order( $product ) {
+		return $product->get_menu_order();
+	}
+
+	/**
+	 * Save product meta.
+	 *
+	 * @deprecated 3.0.0
+	 * @param WC_Product $product
+	 * @param WP_REST_Request $request
+	 * @return bool
+	 * @throws WC_REST_Exception
+	 */
+	protected function save_product_meta( $product, $request ) {
+		$product = $this->set_product_meta( $product, $request );
+		$product->save();
+
+		return true;
+	}
+
+	/**
+	 * Set product meta.
+	 *
+	 * @deprecated 3.0.0
+	 *
+	 * @throws WC_REST_Exception REST API exceptions.
+	 * @param WC_Product      $product Product instance.
+	 * @param WP_REST_Request $request Request data.
+	 * @return WC_Product
+	 */
+	protected function set_product_meta( $product, $request ) {
+		// Virtual.
+		if ( isset( $request['virtual'] ) ) {
+			$product->set_virtual( $request['virtual'] );
+		}
+
+		// Tax status.
+		if ( isset( $request['tax_status'] ) ) {
+			$product->set_tax_status( $request['tax_status'] );
+		}
+
+		// Tax Class.
+		if ( isset( $request['tax_class'] ) ) {
+			$product->set_tax_class( $request['tax_class'] );
+		}
+
+		// Catalog Visibility.
+		if ( isset( $request['catalog_visibility'] ) ) {
+			$product->set_catalog_visibility( $request['catalog_visibility'] );
+		}
+
+		// Purchase Note.
+		if ( isset( $request['purchase_note'] ) ) {
+			$product->set_purchase_note( wc_clean( $request['purchase_note'] ) );
+		}
+
+		// Featured Product.
+		if ( isset( $request['featured'] ) ) {
+			$product->set_featured( $request['featured'] );
+		}
+
+		// Shipping data.
+		$product = $this->save_product_shipping_data( $product, $request );
+
+		// SKU.
+		if ( isset( $request['sku'] ) ) {
+			$product->set_sku( wc_clean( $request['sku'] ) );
+		}
+
+		// Attributes.
+		if ( isset( $request['attributes'] ) ) {
+			$attributes = array();
+
+			foreach ( $request['attributes'] as $attribute ) {
+				$attribute_id   = 0;
+				$attribute_name = '';
+
+				// Check ID for global attributes or name for product attributes.
+				if ( ! empty( $attribute['id'] ) ) {
+					$attribute_id   = absint( $attribute['id'] );
+					$attribute_name = wc_attribute_taxonomy_name_by_id( $attribute_id );
+				} elseif ( ! empty( $attribute['name'] ) ) {
+					$attribute_name = wc_clean( $attribute['name'] );
+				}
+
+				if ( ! $attribute_id && ! $attribute_name ) {
+					continue;
+				}
+
+				if ( $attribute_id ) {
+
+					if ( isset( $attribute['options'] ) ) {
+						$options = $attribute['options'];
+
+						if ( ! is_array( $attribute['options'] ) ) {
+							// Text based attributes - Posted values are term names.
+							$options = explode( WC_DELIMITER, $options );
+						}
+
+						$values = array_map( 'wc_sanitize_term_text_based', $options );
+						$values = array_filter( $values, 'strlen' );
+					} else {
+						$values = array();
+					}
+
+					if ( ! empty( $values ) ) {
+						// Add attribute to array, but don't set values.
+						$attribute_object = new WC_Product_Attribute();
+						$attribute_object->set_id( $attribute_id );
+						$attribute_object->set_name( $attribute_name );
+						$attribute_object->set_options( $values );
+						$attribute_object->set_position( isset( $attribute['position'] ) ? (string) absint( $attribute['position'] ) : '0' );
+						$attribute_object->set_visible( ( isset( $attribute['visible'] ) && $attribute['visible'] ) ? 1 : 0 );
+						$attribute_object->set_variation( ( isset( $attribute['variation'] ) && $attribute['variation'] ) ? 1 : 0 );
+						$attributes[] = $attribute_object;
+					}
+				} elseif ( isset( $attribute['options'] ) ) {
+					// Custom attribute - Add attribute to array and set the values.
+					if ( is_array( $attribute['options'] ) ) {
+						$values = $attribute['options'];
+					} else {
+						$values = explode( WC_DELIMITER, $attribute['options'] );
+					}
+					$attribute_object = new WC_Product_Attribute();
+					$attribute_object->set_name( $attribute_name );
+					$attribute_object->set_options( $values );
+					$attribute_object->set_position( isset( $attribute['position'] ) ? (string) absint( $attribute['position'] ) : '0' );
+					$attribute_object->set_visible( ( isset( $attribute['visible'] ) && $attribute['visible'] ) ? 1 : 0 );
+					$attribute_object->set_variation( ( isset( $attribute['variation'] ) && $attribute['variation'] ) ? 1 : 0 );
+					$attributes[] = $attribute_object;
+				}
+			}
+			$product->set_attributes( $attributes );
+		}
+
+		// Sales and prices.
+		if ( in_array( $product->get_type(), array( 'variable', 'grouped' ), true ) ) {
+			$product->set_regular_price( '' );
+			$product->set_sale_price( '' );
+			$product->set_date_on_sale_to( '' );
+			$product->set_date_on_sale_from( '' );
+			$product->set_price( '' );
+		} else {
+			// Regular Price.
+			if ( isset( $request['regular_price'] ) ) {
+				$product->set_regular_price( $request['regular_price'] );
+			}
+
+			// Sale Price.
+			if ( isset( $request['sale_price'] ) ) {
+				$product->set_sale_price( $request['sale_price'] );
+			}
+
+			if ( isset( $request['date_on_sale_from'] ) ) {
+				$product->set_date_on_sale_from( $request['date_on_sale_from'] );
+			}
+
+			if ( isset( $request['date_on_sale_to'] ) ) {
+				$product->set_date_on_sale_to( $request['date_on_sale_to'] );
+			}
+		}
+
+		// Product parent ID for groups.
+		if ( isset( $request['parent_id'] ) ) {
+			$product->set_parent_id( $request['parent_id'] );
+		}
+
+		// Sold individually.
+		if ( isset( $request['sold_individually'] ) ) {
+			$product->set_sold_individually( $request['sold_individually'] );
+		}
+
+		// Stock status.
+		if ( isset( $request['in_stock'] ) ) {
+			$stock_status = true === $request['in_stock'] ? 'instock' : 'outofstock';
+		} else {
+			$stock_status = $product->get_stock_status();
+		}
+
+		// Stock data.
+		if ( 'yes' === get_option( 'woocommerce_manage_stock' ) ) {
+			// Manage stock.
+			if ( isset( $request['manage_stock'] ) ) {
+				$product->set_manage_stock( $request['manage_stock'] );
+			}
+
+			// Backorders.
+			if ( isset( $request['backorders'] ) ) {
+				$product->set_backorders( $request['backorders'] );
+			}
+
+			if ( $product->is_type( 'grouped' ) ) {
+				$product->set_manage_stock( 'no' );
+				$product->set_backorders( 'no' );
+				$product->set_stock_quantity( '' );
+				$product->set_stock_status( $stock_status );
+			} elseif ( $product->is_type( 'external' ) ) {
+				$product->set_manage_stock( 'no' );
+				$product->set_backorders( 'no' );
+				$product->set_stock_quantity( '' );
+				$product->set_stock_status( 'instock' );
+			} elseif ( $product->get_manage_stock() ) {
+				// Stock status is always determined by children so sync later.
+				if ( ! $product->is_type( 'variable' ) ) {
+					$product->set_stock_status( $stock_status );
+				}
+
+				// Stock quantity.
+				if ( isset( $request['stock_quantity'] ) ) {
+					$product->set_stock_quantity( wc_stock_amount( $request['stock_quantity'] ) );
+				} elseif ( isset( $request['inventory_delta'] ) ) {
+					$stock_quantity  = wc_stock_amount( $product->get_stock_quantity() );
+					$stock_quantity += wc_stock_amount( $request['inventory_delta'] );
+					$product->set_stock_quantity( wc_stock_amount( $stock_quantity ) );
+				}
+			} else {
+				// Don't manage stock.
+				$product->set_manage_stock( 'no' );
+				$product->set_stock_quantity( '' );
+				$product->set_stock_status( $stock_status );
+			}
+		} elseif ( ! $product->is_type( 'variable' ) ) {
+			$product->set_stock_status( $stock_status );
+		}
+
+		// Upsells.
+		if ( isset( $request['upsell_ids'] ) ) {
+			$upsells = array();
+			$ids     = $request['upsell_ids'];
+
+			if ( ! empty( $ids ) ) {
+				foreach ( $ids as $id ) {
+					if ( $id && $id > 0 ) {
+						$upsells[] = $id;
+					}
+				}
+			}
+
+			$product->set_upsell_ids( $upsells );
+		}
+
+		// Cross sells.
+		if ( isset( $request['cross_sell_ids'] ) ) {
+			$crosssells = array();
+			$ids        = $request['cross_sell_ids'];
+
+			if ( ! empty( $ids ) ) {
+				foreach ( $ids as $id ) {
+					if ( $id && $id > 0 ) {
+						$crosssells[] = $id;
+					}
+				}
+			}
+
+			$product->set_cross_sell_ids( $crosssells );
+		}
+
+		// Product categories.
+		if ( isset( $request['categories'] ) && is_array( $request['categories'] ) ) {
+			$product = $this->save_taxonomy_terms( $product, $request['categories'] );
+		}
+
+		// Product tags.
+		if ( isset( $request['tags'] ) && is_array( $request['tags'] ) ) {
+			$product = $this->save_taxonomy_terms( $product, $request['tags'], 'tag' );
+		}
+
+		// Downloadable.
+		if ( isset( $request['downloadable'] ) ) {
+			$product->set_downloadable( $request['downloadable'] );
+		}
+
+		// Downloadable options.
+		if ( $product->get_downloadable() ) {
+
+			// Downloadable files.
+			if ( isset( $request['downloads'] ) && is_array( $request['downloads'] ) ) {
+				$product = $this->save_downloadable_files( $product, $request['downloads'] );
+			}
+
+			// Download limit.
+			if ( isset( $request['download_limit'] ) ) {
+				$product->set_download_limit( $request['download_limit'] );
+			}
+
+			// Download expiry.
+			if ( isset( $request['download_expiry'] ) ) {
+				$product->set_download_expiry( $request['download_expiry'] );
+			}
+		}
+
+		// Product url and button text for external products.
+		if ( $product->is_type( 'external' ) ) {
+			if ( isset( $request['external_url'] ) ) {
+				$product->set_product_url( $request['external_url'] );
+			}
+
+			if ( isset( $request['button_text'] ) ) {
+				$product->set_button_text( $request['button_text'] );
+			}
+		}
+
+		// Save default attributes for variable products.
+		if ( $product->is_type( 'variable' ) ) {
+			$product = $this->save_default_attributes( $product, $request );
+		}
+
+		return $product;
+	}
+
+	/**
+	 * Save variations.
+	 *
+	 * @deprecated 3.0.0
+	 *
+	 * @throws WC_REST_Exception REST API exceptions.
+	 * @param WC_Product      $product          Product instance.
+	 * @param WP_REST_Request $request          Request data.
+	 * @return bool
+	 */
+	protected function save_variations_data( $product, $request ) {
+		foreach ( $request['variations'] as $menu_order => $data ) {
+			$variation = new WC_Product_Variation( isset( $data['id'] ) ? absint( $data['id'] ) : 0 );
+
+			// Create initial name and status.
+			if ( ! $variation->get_slug() ) {
+				/* translators: 1: variation id 2: product name */
+				$variation->set_name( sprintf( __( 'Variation #%1$s of %2$s', 'woocommerce' ), $variation->get_id(), $product->get_name() ) );
+				$variation->set_status( isset( $data['visible'] ) && false === $data['visible'] ? 'private' : 'publish' );
+			}
+
+			// Parent ID.
+			$variation->set_parent_id( $product->get_id() );
+
+			// Menu order.
+			$variation->set_menu_order( $menu_order );
+
+			// Status.
+			if ( isset( $data['visible'] ) ) {
+				$variation->set_status( false === $data['visible'] ? 'private' : 'publish' );
+			}
+
+			// SKU.
+			if ( isset( $data['sku'] ) ) {
+				$variation->set_sku( wc_clean( $data['sku'] ) );
+			}
+
+			// Thumbnail.
+			if ( isset( $data['image'] ) && is_array( $data['image'] ) ) {
+				$image = $data['image'];
+				$image = current( $image );
+				if ( is_array( $image ) ) {
+					$image['position'] = 0;
+				}
+
+				$variation = $this->set_product_images( $variation, array( $image ) );
+			}
+
+			// Virtual variation.
+			if ( isset( $data['virtual'] ) ) {
+				$variation->set_virtual( $data['virtual'] );
+			}
+
+			// Downloadable variation.
+			if ( isset( $data['downloadable'] ) ) {
+				$variation->set_downloadable( $data['downloadable'] );
+			}
+
+			// Downloads.
+			if ( $variation->get_downloadable() ) {
+				// Downloadable files.
+				if ( isset( $data['downloads'] ) && is_array( $data['downloads'] ) ) {
+					$variation = $this->save_downloadable_files( $variation, $data['downloads'] );
+				}
+
+				// Download limit.
+				if ( isset( $data['download_limit'] ) ) {
+					$variation->set_download_limit( $data['download_limit'] );
+				}
+
+				// Download expiry.
+				if ( isset( $data['download_expiry'] ) ) {
+					$variation->set_download_expiry( $data['download_expiry'] );
+				}
+			}
+
+			// Shipping data.
+			$variation = $this->save_product_shipping_data( $variation, $data );
+
+			// Stock handling.
+			if ( isset( $data['manage_stock'] ) ) {
+				$variation->set_manage_stock( $data['manage_stock'] );
+			}
+
+			if ( isset( $data['in_stock'] ) ) {
+				$variation->set_stock_status( true === $data['in_stock'] ? 'instock' : 'outofstock' );
+			}
+
+			if ( isset( $data['backorders'] ) ) {
+				$variation->set_backorders( $data['backorders'] );
+			}
+
+			if ( $variation->get_manage_stock() ) {
+				if ( isset( $data['stock_quantity'] ) ) {
+					$variation->set_stock_quantity( $data['stock_quantity'] );
+				} elseif ( isset( $data['inventory_delta'] ) ) {
+					$stock_quantity  = wc_stock_amount( $variation->get_stock_quantity() );
+					$stock_quantity += wc_stock_amount( $data['inventory_delta'] );
+					$variation->set_stock_quantity( $stock_quantity );
+				}
+			} else {
+				$variation->set_backorders( 'no' );
+				$variation->set_stock_quantity( '' );
+			}
+
+			// Regular Price.
+			if ( isset( $data['regular_price'] ) ) {
+				$variation->set_regular_price( $data['regular_price'] );
+			}
+
+			// Sale Price.
+			if ( isset( $data['sale_price'] ) ) {
+				$variation->set_sale_price( $data['sale_price'] );
+			}
+
+			if ( isset( $data['date_on_sale_from'] ) ) {
+				$variation->set_date_on_sale_from( $data['date_on_sale_from'] );
+			}
+
+			if ( isset( $data['date_on_sale_to'] ) ) {
+				$variation->set_date_on_sale_to( $data['date_on_sale_to'] );
+			}
+
+			// Tax class.
+			if ( isset( $data['tax_class'] ) ) {
+				$variation->set_tax_class( $data['tax_class'] );
+			}
+
+			// Description.
+			if ( isset( $data['description'] ) ) {
+				$variation->set_description( wp_kses_post( $data['description'] ) );
+			}
+
+			// Update taxonomies.
+			if ( isset( $data['attributes'] ) ) {
+				$attributes = array();
+				$parent_attributes = $product->get_attributes();
+
+				foreach ( $data['attributes'] as $attribute ) {
+					$attribute_id   = 0;
+					$attribute_name = '';
+
+					// Check ID for global attributes or name for product attributes.
+					if ( ! empty( $attribute['id'] ) ) {
+						$attribute_id   = absint( $attribute['id'] );
+						$attribute_name = wc_attribute_taxonomy_name_by_id( $attribute_id );
+					} elseif ( ! empty( $attribute['name'] ) ) {
+						$attribute_name = sanitize_title( $attribute['name'] );
+					}
+
+					if ( ! $attribute_id && ! $attribute_name ) {
+						continue;
+					}
+
+					if ( ! isset( $parent_attributes[ $attribute_name ] ) || ! $parent_attributes[ $attribute_name ]->get_variation() ) {
+						continue;
+					}
+
+					$attribute_key   = sanitize_title( $parent_attributes[ $attribute_name ]->get_name() );
+					$attribute_value = isset( $attribute['option'] ) ? wc_clean( stripslashes( $attribute['option'] ) ) : '';
+
+					if ( $parent_attributes[ $attribute_name ]->is_taxonomy() ) {
+						// If dealing with a taxonomy, we need to get the slug from the name posted to the API.
+						$term = get_term_by( 'name', $attribute_value, $attribute_name );
+
+						if ( $term && ! is_wp_error( $term ) ) {
+							$attribute_value = $term->slug;
+						} else {
+							$attribute_value = sanitize_title( $attribute_value );
+						}
+					}
+
+					$attributes[ $attribute_key ] = $attribute_value;
+				}
+
+				$variation->set_attributes( $attributes );
+			}
+
+			$variation->save();
+
+			do_action( 'woocommerce_rest_save_product_variation', $variation->get_id(), $menu_order, $data );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Add post meta fields.
+	 *
+	 * @deprecated 3.0.0
+	 *
+	 * @param WP_Post         $post    Post data.
+	 * @param WP_REST_Request $request Request data.
+	 * @return bool|WP_Error
+	 */
+	protected function add_post_meta_fields( $post, $request ) {
+		return $this->update_post_meta_fields( $post, $request );
+	}
+
+	/**
+	 * Update post meta fields.
+	 *
+	 * @param WP_Post         $post    Post data.
+	 * @param WP_REST_Request $request Request data.
+	 * @return bool|WP_Error
+	 */
+	protected function update_post_meta_fields( $post, $request ) {
+		$product = wc_get_product( $post );
+
+		// Check for featured/gallery images, upload it and set it.
+		if ( isset( $request['images'] ) ) {
+			$product = $this->set_product_images( $product, $request['images'] );
+		}
+
+		// Save product meta fields.
+		$product = $this->set_product_meta( $product, $request );
+
+		// Save the product data.
+		$product->save();
+
+		// Save variations.
+		if ( $product->is_type( 'variable' ) ) {
+			if ( isset( $request['variations'] ) && is_array( $request['variations'] ) ) {
+				$this->save_variations_data( $product, $request );
+			}
+		}
+
+		// Clear caches here so in sync with any new variations/children.
+		wc_delete_product_transients( $product->get_id() );
+		wp_cache_delete( 'product-' . $product->get_id(), 'products' );
+
+		return true;
+	}
+
+	/**
+	 * Delete post.
+	 *
+	 * @deprecated 3.0.0
+	 *
+	 * @param int|WP_Post $id Post ID or WP_Post instance.
+	 */
+	protected function delete_post( $id ) {
+		if ( ! empty( $id->ID ) ) {
+			$id = $id->ID;
+		} elseif ( ! is_numeric( $id ) || 0 >= $id ) {
+			return;
+		}
+
+		// Delete product attachments.
+		$attachments = get_posts( array(
+			'post_parent' => $id,
+			'post_status' => 'any',
+			'post_type'   => 'attachment',
+		) );
+
+		foreach ( (array) $attachments as $attachment ) {
+			wp_delete_attachment( $attachment->ID, true );
+		}
+
+		// Delete product.
+		$product = wc_get_product( $id );
+		$product->delete( true );
+	}
+
+	/**
+	 * Get post types.
+	 *
+	 * @deprecated 3.0.0
+	 *
+	 * @return array
+	 */
+	protected function get_post_types() {
+		return array( 'product', 'product_variation' );
+	}
+
+	/**
+	 * Save product images.
+	 *
+	 * @deprecated 3.0.0
+	 *
+	 * @param int $product_id
+	 * @param array $images
+	 * @throws WC_REST_Exception
+	 */
+	protected function save_product_images( $product_id, $images ) {
+		$product = wc_get_product( $product_id );
+
+		return set_product_images( $product, $images );
+	}
+}
diff --git a/includes/api/v1/class-wc-api-authentication.php b/includes/api/legacy/v1/class-wc-api-authentication.php
similarity index 89%
rename from includes/api/v1/class-wc-api-authentication.php
rename to includes/api/legacy/v1/class-wc-api-authentication.php
index 1d877572617..12ae6bb42e8 100644
--- a/includes/api/v1/class-wc-api-authentication.php
+++ b/includes/api/legacy/v1/class-wc-api-authentication.php
@@ -90,7 +90,7 @@ class WC_API_Authentication {
 
 		} else {
 
-			throw new Exception( __( 'Consumer Key is missing', 'woocommerce' ), 404 );
+			throw new Exception( __( 'Consumer key is missing.', 'woocommerce' ), 404 );
 		}
 
 		// Get consumer secret
@@ -106,13 +106,13 @@ class WC_API_Authentication {
 
 		} else {
 
-			throw new Exception( __( 'Consumer Secret is missing', 'woocommerce' ), 404 );
+			throw new Exception( __( 'Consumer secret is missing.', 'woocommerce' ), 404 );
 		}
 
 		$keys = $this->get_keys_by_consumer_key( $consumer_key );
 
 		if ( ! $this->is_consumer_secret_valid( $keys['consumer_secret'], $consumer_secret ) ) {
-			throw new Exception( __( 'Consumer Secret is invalid', 'woocommerce' ), 401 );
+			throw new Exception( __( 'Consumer secret is invalid.', 'woocommerce' ), 401 );
 		}
 
 		return $keys;
@@ -139,12 +139,13 @@ class WC_API_Authentication {
 
 		$params = WC()->api->server->params['GET'];
 
-		$param_names =  array( 'oauth_consumer_key', 'oauth_timestamp', 'oauth_nonce', 'oauth_signature', 'oauth_signature_method' );
+		$param_names = array( 'oauth_consumer_key', 'oauth_timestamp', 'oauth_nonce', 'oauth_signature', 'oauth_signature_method' );
 
 		// Check for required OAuth parameters
 		foreach ( $param_names as $param_name ) {
 
 			if ( empty( $params[ $param_name ] ) ) {
+				/* translators: %s: parameter name */
 				throw new Exception( sprintf( __( '%s parameter is missing', 'woocommerce' ), $param_name ), 404 );
 			}
 		}
@@ -180,7 +181,7 @@ class WC_API_Authentication {
 		", $consumer_key ), ARRAY_A );
 
 		if ( empty( $keys ) ) {
-			throw new Exception( __( 'Consumer Key is invalid', 'woocommerce' ), 401 );
+			throw new Exception( __( 'Consumer key is invalid.', 'woocommerce' ), 401 );
 		}
 
 		return $keys;
@@ -231,7 +232,7 @@ class WC_API_Authentication {
 		$base_request_uri = rawurlencode( untrailingslashit( get_woocommerce_api_url( '' ) ) . WC()->api->server->path );
 
 		// Get the signature provided by the consumer and remove it from the parameters prior to checking the signature
-		$consumer_signature = rawurldecode( $params['oauth_signature'] );
+		$consumer_signature = rawurldecode( str_replace( ' ', '+', $params['oauth_signature'] ) );
 		unset( $params['oauth_signature'] );
 
 		// Remove filters and convert them from array to strings to void normalize issues
@@ -239,7 +240,7 @@ class WC_API_Authentication {
 			$filters = $params['filter'];
 			unset( $params['filter'] );
 			foreach ( $filters as $filter => $filter_value ) {
-				$params['filter[' . $filter . ']'] = $filter_value;
+				$params[ 'filter[' . $filter . ']' ] = $filter_value;
 			}
 		}
 
@@ -248,7 +249,7 @@ class WC_API_Authentication {
 
 		// Sort parameters
 		if ( ! uksort( $params, 'strcmp' ) ) {
-			throw new Exception( __( 'Invalid Signature - failed to sort parameters', 'woocommerce' ), 401 );
+			throw new Exception( __( 'Invalid signature - failed to sort parameters.', 'woocommerce' ), 401 );
 		}
 
 		// Form query string
@@ -261,8 +262,8 @@ class WC_API_Authentication {
 
 		$string_to_sign = $http_method . '&' . $base_request_uri . '&' . $query_string;
 
-		if ( $params['oauth_signature_method'] !== 'HMAC-SHA1' && $params['oauth_signature_method'] !== 'HMAC-SHA256' ) {
-			throw new Exception( __( 'Invalid Signature - signature method is invalid', 'woocommerce' ), 401 );
+		if ( 'HMAC-SHA1' !== $params['oauth_signature_method'] && 'HMAC-SHA256' !== $params['oauth_signature_method'] ) {
+			throw new Exception( __( 'Invalid signature - signature method is invalid.', 'woocommerce' ), 401 );
 		}
 
 		$hash_algorithm = strtolower( str_replace( 'HMAC-', '', $params['oauth_signature_method'] ) );
@@ -270,7 +271,7 @@ class WC_API_Authentication {
 		$signature = base64_encode( hash_hmac( $hash_algorithm, $string_to_sign, $keys['consumer_secret'], true ) );
 
 		if ( ! hash_equals( $signature, $consumer_signature ) ) {
-			throw new Exception( __( 'Invalid Signature - provided signature does not match', 'woocommerce' ), 401 );
+			throw new Exception( __( 'Invalid signature - provided signature does not match.', 'woocommerce' ), 401 );
 		}
 	}
 
@@ -328,7 +329,7 @@ class WC_API_Authentication {
 		$valid_window = 15 * 60; // 15 minute window
 
 		if ( ( $timestamp < time() - $valid_window ) || ( $timestamp > time() + $valid_window ) ) {
-			throw new Exception( __( 'Invalid timestamp', 'woocommerce' ) );
+			throw new Exception( __( 'Invalid timestamp.', 'woocommerce' ) );
 		}
 
 		$used_nonces = maybe_unserialize( $keys['nonces'] );
@@ -338,7 +339,7 @@ class WC_API_Authentication {
 		}
 
 		if ( in_array( $nonce, $used_nonces ) ) {
-			throw new Exception( __( 'Invalid nonce - nonce has already been used', 'woocommerce' ), 401 );
+			throw new Exception( __( 'Invalid nonce - nonce has already been used.', 'woocommerce' ), 401 );
 		}
 
 		$used_nonces[ $timestamp ] = $nonce;
@@ -373,7 +374,7 @@ class WC_API_Authentication {
 			case 'HEAD':
 			case 'GET':
 				if ( 'read' !== $key_permissions && 'read_write' !== $key_permissions ) {
-					throw new Exception( __( 'The API key provided does not have read permissions', 'woocommerce' ), 401 );
+					throw new Exception( __( 'The API key provided does not have read permissions.', 'woocommerce' ), 401 );
 				}
 				break;
 
@@ -382,7 +383,7 @@ class WC_API_Authentication {
 			case 'PATCH':
 			case 'DELETE':
 				if ( 'write' !== $key_permissions && 'read_write' !== $key_permissions ) {
-					throw new Exception( __( 'The API key provided does not have write permissions', 'woocommerce' ), 401 );
+					throw new Exception( __( 'The API key provided does not have write permissions.', 'woocommerce' ), 401 );
 				}
 				break;
 		}
diff --git a/includes/api/v1/class-wc-api-coupons.php b/includes/api/legacy/v1/class-wc-api-coupons.php
similarity index 72%
rename from includes/api/v1/class-wc-api-coupons.php
rename to includes/api/legacy/v1/class-wc-api-coupons.php
index 1056206c492..5257652cff6 100644
--- a/includes/api/v1/class-wc-api-coupons.php
+++ b/includes/api/legacy/v1/class-wc-api-coupons.php
@@ -39,7 +39,7 @@ class WC_API_Coupons extends WC_API_Resource {
 		);
 
 		# GET /coupons/count
-		$routes[ $this->base . '/count'] = array(
+		$routes[ $this->base . '/count' ] = array(
 			array( array( $this, 'get_coupons_count' ), WC_API_Server::READABLE ),
 		);
 
@@ -73,10 +73,11 @@ class WC_API_Coupons extends WC_API_Resource {
 
 		$coupons = array();
 
-		foreach( $query->posts as $coupon_id ) {
+		foreach ( $query->posts as $coupon_id ) {
 
-			if ( ! $this->is_readable( $coupon_id ) )
+			if ( ! $this->is_readable( $coupon_id ) ) {
 				continue;
+			}
 
 			$coupons[] = current( $this->get_coupon( $coupon_id, $fields ) );
 		}
@@ -95,44 +96,39 @@ class WC_API_Coupons extends WC_API_Resource {
 	 * @return array|WP_Error
 	 */
 	public function get_coupon( $id, $fields = null ) {
-		global $wpdb;
-
 		$id = $this->validate_request( $id, 'shop_coupon', 'read' );
 
-		if ( is_wp_error( $id ) )
+		if ( is_wp_error( $id ) ) {
 			return $id;
+		}
 
-		// get the coupon code
-		$code = $wpdb->get_var( $wpdb->prepare( "SELECT post_title FROM $wpdb->posts WHERE id = %s AND post_type = 'shop_coupon' AND post_status = 'publish'", $id ) );
+		$coupon = new WC_Coupon( $id );
 
-		if ( is_null( $code ) )
-			return new WP_Error( 'woocommerce_api_invalid_coupon_id', __( 'Invalid coupon ID', 'woocommerce' ), array( 'status' => 404 ) );
-
-		$coupon = new WC_Coupon( $code );
-
-		$coupon_post = get_post( $coupon->id );
+		if ( 0 === $coupon->get_id() ) {
+			throw new WC_API_Exception( 'woocommerce_api_invalid_coupon_id', __( 'Invalid coupon ID', 'woocommerce' ), 404 );
+		}
 
 		$coupon_data = array(
-			'id'                           => $coupon->id,
-			'code'                         => $coupon->code,
-			'type'                         => $coupon->type,
-			'created_at'                   => $this->server->format_datetime( $coupon_post->post_date_gmt ),
-			'updated_at'                   => $this->server->format_datetime( $coupon_post->post_modified_gmt ),
-			'amount'                       => wc_format_decimal( $coupon->amount, 2 ),
-			'individual_use'               => ( 'yes' === $coupon->individual_use ),
-			'product_ids'                  => array_map( 'absint', (array) $coupon->product_ids ),
-			'exclude_product_ids'          => array_map( 'absint', (array) $coupon->exclude_product_ids ),
-			'usage_limit'                  => ( ! empty( $coupon->usage_limit ) ) ? $coupon->usage_limit : null,
-			'usage_limit_per_user'         => ( ! empty( $coupon->usage_limit_per_user ) ) ? $coupon->usage_limit_per_user : null,
-			'limit_usage_to_x_items'       => (int) $coupon->limit_usage_to_x_items,
-			'usage_count'                  => (int) $coupon->usage_count,
-			'expiry_date'                  => $this->server->format_datetime( $coupon->expiry_date ),
-			'enable_free_shipping'         => $coupon->enable_free_shipping(),
-			'product_category_ids'         => array_map( 'absint', (array) $coupon->product_categories ),
-			'exclude_product_category_ids' => array_map( 'absint', (array) $coupon->exclude_product_categories ),
-			'exclude_sale_items'           => $coupon->exclude_sale_items(),
-			'minimum_amount'               => wc_format_decimal( $coupon->minimum_amount, 2 ),
-			'customer_emails'              => $coupon->customer_email,
+			'id'                           => $coupon->get_id(),
+			'code'                         => $coupon->get_code(),
+			'type'                         => $coupon->get_discount_type(),
+			'created_at'                   => $this->server->format_datetime( $coupon->get_date_created() ? $coupon->get_date_created()->getTimestamp() : 0 ), // API gives UTC times.
+			'updated_at'                   => $this->server->format_datetime( $coupon->get_date_modified() ? $coupon->get_date_modified()->getTimestamp() : 0 ), // API gives UTC times.
+			'amount'                       => wc_format_decimal( $coupon->get_amount(), 2 ),
+			'individual_use'               => $coupon->get_individual_use(),
+			'product_ids'                  => array_map( 'absint', (array) $coupon->get_product_ids() ),
+			'exclude_product_ids'          => array_map( 'absint', (array) $coupon->get_excluded_product_ids() ),
+			'usage_limit'                  => $coupon->get_usage_limit() ? $coupon->get_usage_limit() : null,
+			'usage_limit_per_user'         => $coupon->get_usage_limit_per_user() ? $coupon->get_usage_limit_per_user() : null,
+			'limit_usage_to_x_items'       => (int) $coupon->get_limit_usage_to_x_items(),
+			'usage_count'                  => (int) $coupon->get_usage_count(),
+			'expiry_date'                  => $this->server->format_datetime( $coupon->get_date_expires() ? $coupon->get_date_expires()->getTimestamp() : 0 ), // API gives UTC times.
+			'enable_free_shipping'         => $coupon->get_free_shipping(),
+			'product_category_ids'         => array_map( 'absint', (array) $coupon->get_product_categories() ),
+			'exclude_product_category_ids' => array_map( 'absint', (array) $coupon->get_excluded_product_categories() ),
+			'exclude_sale_items'           => $coupon->get_exclude_sale_items(),
+			'minimum_amount'               => wc_format_decimal( $coupon->get_minimum_amount(), 2 ),
+			'customer_emails'              => $coupon->get_email_restrictions(),
 		);
 
 		return array( 'coupon' => apply_filters( 'woocommerce_api_coupon_response', $coupon_data, $coupon, $fields, $this->server ) );
@@ -149,8 +145,9 @@ class WC_API_Coupons extends WC_API_Resource {
 
 		$query = $this->query_coupons( $filter );
 
-		if ( ! current_user_can( 'read_private_shop_coupons' ) )
+		if ( ! current_user_can( 'read_private_shop_coupons' ) ) {
 			return new WP_Error( 'woocommerce_api_user_cannot_read_coupons_count', __( 'You do not have permission to read the coupons count', 'woocommerce' ), array( 'status' => 401 ) );
+		}
 
 		return array( 'count' => (int) $query->found_posts );
 	}
@@ -166,10 +163,11 @@ class WC_API_Coupons extends WC_API_Resource {
 	public function get_coupon_by_code( $code, $fields = null ) {
 		global $wpdb;
 
-		$id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->posts WHERE post_title = %s AND post_type = 'shop_coupon' AND post_status = 'publish'", $code ) );
+		$id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->posts WHERE post_title = %s AND post_type = 'shop_coupon' AND post_status = 'publish' ORDER BY post_date DESC LIMIT 1;", $code ) );
 
-		if ( is_null( $id ) )
+		if ( is_null( $id ) ) {
 			return new WP_Error( 'woocommerce_api_invalid_coupon_code', __( 'Invalid coupon code', 'woocommerce' ), array( 'status' => 404 ) );
+		}
 
 		return $this->get_coupon( $id, $fields );
 	}
@@ -177,7 +175,6 @@ class WC_API_Coupons extends WC_API_Resource {
 	/**
 	 * Create a coupon
 	 *
-	 * @TODO implement in 2.2
 	 * @param array $data
 	 * @return array
 	 */
@@ -189,7 +186,6 @@ class WC_API_Coupons extends WC_API_Resource {
 	/**
 	 * Edit a coupon
 	 *
-	 * @TODO implement in 2.2
 	 * @param int $id the coupon ID
 	 * @param array $data
 	 * @return array
@@ -198,8 +194,9 @@ class WC_API_Coupons extends WC_API_Resource {
 
 		$id = $this->validate_request( $id, 'shop_coupon', 'edit' );
 
-		if ( is_wp_error( $id ) )
+		if ( is_wp_error( $id ) ) {
 			return $id;
+		}
 
 		return $this->get_coupon( $id );
 	}
@@ -207,7 +204,6 @@ class WC_API_Coupons extends WC_API_Resource {
 	/**
 	 * Delete a coupon
 	 *
-	 * @TODO enable along with PUT/POST in 2.2
 	 * @param int $id the coupon ID
 	 * @param bool $force true to permanently delete coupon, false to move to trash
 	 * @return array
@@ -216,8 +212,9 @@ class WC_API_Coupons extends WC_API_Resource {
 
 		$id = $this->validate_request( $id, 'shop_coupon', 'delete' );
 
-		if ( is_wp_error( $id ) )
+		if ( is_wp_error( $id ) ) {
 			return $id;
+		}
 
 		return $this->delete( $id, 'shop_coupon', ( 'true' === $force ) );
 	}
@@ -242,5 +239,4 @@ class WC_API_Coupons extends WC_API_Resource {
 
 		return new WP_Query( $query_args );
 	}
-
 }
diff --git a/includes/api/v1/class-wc-api-customers.php b/includes/api/legacy/v1/class-wc-api-customers.php
similarity index 66%
rename from includes/api/v1/class-wc-api-customers.php
rename to includes/api/legacy/v1/class-wc-api-customers.php
index b896e7b744a..60fcd809f36 100644
--- a/includes/api/v1/class-wc-api-customers.php
+++ b/includes/api/legacy/v1/class-wc-api-customers.php
@@ -64,7 +64,7 @@ class WC_API_Customers extends WC_API_Resource {
 		);
 
 		# GET /customers/count
-		$routes[ $this->base . '/count'] = array(
+		$routes[ $this->base . '/count' ] = array(
 			array( array( $this, 'get_customers_count' ), WC_API_SERVER::READABLE ),
 		);
 
@@ -98,10 +98,11 @@ class WC_API_Customers extends WC_API_Resource {
 
 		$customers = array();
 
-		foreach( $query->get_results() as $user_id ) {
+		foreach ( $query->get_results() as $user_id ) {
 
-			if ( ! $this->is_readable( $user_id ) )
+			if ( ! $this->is_readable( $user_id ) ) {
 				continue;
+			}
 
 			$customers[] = current( $this->get_customer( $user_id, $fields ) );
 		}
@@ -124,56 +125,47 @@ class WC_API_Customers extends WC_API_Resource {
 
 		$id = $this->validate_request( $id, 'customer', 'read' );
 
-		if ( is_wp_error( $id ) )
+		if ( is_wp_error( $id ) ) {
 			return $id;
+		}
 
-		$customer = new WP_User( $id );
-
-		// get info about user's last order
-		$last_order = $wpdb->get_row( "SELECT id, post_date_gmt
-						FROM $wpdb->posts AS posts
-						LEFT JOIN {$wpdb->postmeta} AS meta on posts.ID = meta.post_id
-						WHERE meta.meta_key = '_customer_user'
-						AND   meta.meta_value = {$customer->ID}
-						AND   posts.post_type = 'shop_order'
-						AND   posts.post_status IN ( '" . implode( "','", array_keys( wc_get_order_statuses() ) ) . "' )
-					" );
-
+		$customer      = new WC_Customer( $id );
+		$last_order    = $customer->get_last_order();
 		$customer_data = array(
-			'id'               => $customer->ID,
-			'created_at'       => $this->server->format_datetime( $customer->user_registered ),
-			'email'            => $customer->user_email,
-			'first_name'       => $customer->first_name,
-			'last_name'        => $customer->last_name,
-			'username'         => $customer->user_login,
-			'last_order_id'    => is_object( $last_order ) ? $last_order->id : null,
-			'last_order_date'  => is_object( $last_order ) ? $this->server->format_datetime( $last_order->post_date_gmt ) : null,
-			'orders_count'     => (int) $customer->_order_count,
-			'total_spent'      => wc_format_decimal( $customer->_money_spent, 2 ),
-			'avatar_url'       => $this->get_avatar_url( $customer->customer_email ),
+			'id'               => $customer->get_id(),
+			'created_at'       => $this->server->format_datetime( $customer->get_date_created() ? $customer->get_date_created()->getTimestamp() : 0 ), // API gives UTC times.
+			'email'            => $customer->get_email(),
+			'first_name'       => $customer->get_first_name(),
+			'last_name'        => $customer->get_last_name(),
+			'username'         => $customer->get_username(),
+			'last_order_id'    => is_object( $last_order ) ? $last_order->get_id() : null,
+			'last_order_date'  => is_object( $last_order ) ? $this->server->format_datetime( $last_order->get_date_created() ? $last_order->get_date_created()->getTimestamp() : 0 ) : null, // API gives UTC times.
+			'orders_count'     => $customer->get_order_count(),
+			'total_spent'      => wc_format_decimal( $customer->get_total_spent(), 2 ),
+			'avatar_url'       => $customer->get_avatar_url(),
 			'billing_address'  => array(
-				'first_name' => $customer->billing_first_name,
-				'last_name'  => $customer->billing_last_name,
-				'company'    => $customer->billing_company,
-				'address_1'  => $customer->billing_address_1,
-				'address_2'  => $customer->billing_address_2,
-				'city'       => $customer->billing_city,
-				'state'      => $customer->billing_state,
-				'postcode'   => $customer->billing_postcode,
-				'country'    => $customer->billing_country,
-				'email'      => $customer->billing_email,
-				'phone'      => $customer->billing_phone,
+				'first_name' => $customer->get_billing_first_name(),
+				'last_name'  => $customer->get_billing_last_name(),
+				'company'    => $customer->get_billing_company(),
+				'address_1'  => $customer->get_billing_address_1(),
+				'address_2'  => $customer->get_billing_address_2(),
+				'city'       => $customer->get_billing_city(),
+				'state'      => $customer->get_billing_state(),
+				'postcode'   => $customer->get_billing_postcode(),
+				'country'    => $customer->get_billing_country(),
+				'email'      => $customer->get_billing_email(),
+				'phone'      => $customer->get_billing_phone(),
 			),
 			'shipping_address' => array(
-				'first_name' => $customer->shipping_first_name,
-				'last_name'  => $customer->shipping_last_name,
-				'company'    => $customer->shipping_company,
-				'address_1'  => $customer->shipping_address_1,
-				'address_2'  => $customer->shipping_address_2,
-				'city'       => $customer->shipping_city,
-				'state'      => $customer->shipping_state,
-				'postcode'   => $customer->shipping_postcode,
-				'country'    => $customer->shipping_country,
+				'first_name' => $customer->get_shipping_first_name(),
+				'last_name'  => $customer->get_shipping_last_name(),
+				'company'    => $customer->get_shipping_company(),
+				'address_1'  => $customer->get_shipping_address_1(),
+				'address_2'  => $customer->get_shipping_address_2(),
+				'city'       => $customer->get_shipping_city(),
+				'state'      => $customer->get_shipping_state(),
+				'postcode'   => $customer->get_shipping_postcode(),
+				'country'    => $customer->get_shipping_country(),
 			),
 		);
 
@@ -191,8 +183,9 @@ class WC_API_Customers extends WC_API_Resource {
 
 		$query = $this->query_customers( $filter );
 
-		if ( ! current_user_can( 'list_users' ) )
+		if ( ! current_user_can( 'list_users' ) ) {
 			return new WP_Error( 'woocommerce_api_user_cannot_read_customers_count', __( 'You do not have permission to read the customers count', 'woocommerce' ), array( 'status' => 401 ) );
+		}
 
 		return array( 'count' => count( $query->get_results() ) );
 	}
@@ -201,14 +194,14 @@ class WC_API_Customers extends WC_API_Resource {
 	/**
 	 * Create a customer
 	 *
-	 * @TODO implement in 2.2 with woocommerce_create_new_customer()
 	 * @param array $data
 	 * @return array
 	 */
 	public function create_customer( $data ) {
 
-		if ( ! current_user_can( 'create_users' ) )
+		if ( ! current_user_can( 'create_users' ) ) {
 			return new WP_Error( 'woocommerce_api_user_cannot_create_customer', __( 'You do not have permission to create this customer', 'woocommerce' ), array( 'status' => 401 ) );
+		}
 
 		return array();
 	}
@@ -216,7 +209,6 @@ class WC_API_Customers extends WC_API_Resource {
 	/**
 	 * Edit a customer
 	 *
-	 * @TODO implement in 2.2
 	 * @param int $id the customer ID
 	 * @param array $data
 	 * @return array
@@ -225,8 +217,9 @@ class WC_API_Customers extends WC_API_Resource {
 
 		$id = $this->validate_request( $id, 'customer', 'edit' );
 
-		if ( ! is_wp_error( $id ) )
+		if ( ! is_wp_error( $id ) ) {
 			return $id;
+		}
 
 		return $this->get_customer( $id );
 	}
@@ -234,7 +227,6 @@ class WC_API_Customers extends WC_API_Resource {
 	/**
 	 * Delete a customer
 	 *
-	 * @TODO enable along with PUT/POST in 2.2
 	 * @param int $id the customer ID
 	 * @return array
 	 */
@@ -242,8 +234,9 @@ class WC_API_Customers extends WC_API_Resource {
 
 		$id = $this->validate_request( $id, 'customer', 'delete' );
 
-		if ( ! is_wp_error( $id ) )
+		if ( ! is_wp_error( $id ) ) {
 			return $id;
+		}
 
 		return $this->delete( $id, 'customer' );
 	}
@@ -261,20 +254,21 @@ class WC_API_Customers extends WC_API_Resource {
 
 		$id = $this->validate_request( $id, 'customer', 'read' );
 
-		if ( is_wp_error( $id ) )
+		if ( is_wp_error( $id ) ) {
 			return $id;
+		}
 
-		$order_ids = $wpdb->get_col( $wpdb->prepare( "SELECT id
-						FROM $wpdb->posts AS posts
-						LEFT JOIN {$wpdb->postmeta} AS meta on posts.ID = meta.post_id
-						WHERE meta.meta_key = '_customer_user'
-						AND   meta.meta_value = '%s'
-						AND   posts.post_type = 'shop_order'
-						AND   posts.post_status = IN ( '" . implode( "','", array_keys( wc_get_order_statuses() ) ) . "' )
-					", $id ) );
+		$order_ids = wc_get_orders( array(
+			'customer' => $id,
+			'limit'    => -1,
+			'orderby'  => 'date',
+			'order'    => 'ASC',
+			'return'   => 'ids',
+		) );
 
-		if ( empty( $order_ids ) )
+		if ( empty( $order_ids ) ) {
 			return array( 'orders' => array() );
+		}
 
 		$orders = array();
 
@@ -359,43 +353,43 @@ class WC_API_Customers extends WC_API_Resource {
 	 */
 	public function add_customer_data( $order_data, $order ) {
 
-		if ( 0 == $order->customer_user ) {
+		if ( 0 == $order->get_user_id() ) {
 
 			// add customer data from order
 			$order_data['customer'] = array(
 				'id'               => 0,
-				'email'            => $order->billing_email,
-				'first_name'       => $order->billing_first_name,
-				'last_name'        => $order->billing_last_name,
+				'email'            => $order->get_billing_email(),
+				'first_name'       => $order->get_billing_first_name(),
+				'last_name'        => $order->get_billing_last_name(),
 				'billing_address'  => array(
-					'first_name' => $order->billing_first_name,
-					'last_name'  => $order->billing_last_name,
-					'company'    => $order->billing_company,
-					'address_1'  => $order->billing_address_1,
-					'address_2'  => $order->billing_address_2,
-					'city'       => $order->billing_city,
-					'state'      => $order->billing_state,
-					'postcode'   => $order->billing_postcode,
-					'country'    => $order->billing_country,
-					'email'      => $order->billing_email,
-					'phone'      => $order->billing_phone,
+					'first_name' => $order->get_billing_first_name(),
+					'last_name'  => $order->get_billing_last_name(),
+					'company'    => $order->get_billing_company(),
+					'address_1'  => $order->get_billing_address_1(),
+					'address_2'  => $order->get_billing_address_2(),
+					'city'       => $order->get_billing_city(),
+					'state'      => $order->get_billing_state(),
+					'postcode'   => $order->get_billing_postcode(),
+					'country'    => $order->get_billing_country(),
+					'email'      => $order->get_billing_email(),
+					'phone'      => $order->get_billing_phone(),
 				),
 				'shipping_address' => array(
-					'first_name' => $order->shipping_first_name,
-					'last_name'  => $order->shipping_last_name,
-					'company'    => $order->shipping_company,
-					'address_1'  => $order->shipping_address_1,
-					'address_2'  => $order->shipping_address_2,
-					'city'       => $order->shipping_city,
-					'state'      => $order->shipping_state,
-					'postcode'   => $order->shipping_postcode,
-					'country'    => $order->shipping_country,
+					'first_name' => $order->get_shipping_first_name(),
+					'last_name'  => $order->get_shipping_last_name(),
+					'company'    => $order->get_shipping_company(),
+					'address_1'  => $order->get_shipping_address_1(),
+					'address_2'  => $order->get_shipping_address_2(),
+					'city'       => $order->get_shipping_city(),
+					'state'      => $order->get_shipping_state(),
+					'postcode'   => $order->get_shipping_postcode(),
+					'country'    => $order->get_shipping_country(),
 				),
 			);
 
 		} else {
 
-			$order_data['customer'] = current( $this->get_customer( $order->customer_user ) );
+			$order_data['customer'] = current( $this->get_customer( $order->get_user_id() ) );
 		}
 
 		return $order_data;
@@ -409,33 +403,13 @@ class WC_API_Customers extends WC_API_Resource {
 	 */
 	public function modify_user_query( $query ) {
 
-		if ( $this->created_at_min )
+		if ( $this->created_at_min ) {
 			$query->query_where .= sprintf( " AND user_registered >= STR_TO_DATE( '%s', '%%Y-%%m-%%d %%h:%%i:%%s' )", esc_sql( $this->created_at_min ) );
-
-		if ( $this->created_at_max )
-			$query->query_where .= sprintf( " AND user_registered <= STR_TO_DATE( '%s', '%%Y-%%m-%%d %%h:%%i:%%s' )", esc_sql( $this->created_at_max ) );
-	}
-
-	/**
-	 * Wrapper for @see get_avatar() which doesn't simply return
-	 * the URL so we need to pluck it from the HTML img tag
-	 *
-	 * @since 2.1
-	 * @param string $email the customer's email
-	 * @return string the URL to the customer's avatar
-	 */
-	private function get_avatar_url( $email ) {
-
-		$avatar_html = get_avatar( $email );
-
-		// Get the URL of the avatar from the provided HTML
-		preg_match( '/src=["|\'](.+)[\&|"|\']/U', $avatar_html, $matches );
-
-		if ( isset( $matches[1] ) && ! empty( $matches[1] ) ) {
-			return esc_url_raw( $matches[1] );
 		}
 
-		return null;
+		if ( $this->created_at_max ) {
+			$query->query_where .= sprintf( " AND user_registered <= STR_TO_DATE( '%s', '%%Y-%%m-%%d %%h:%%i:%%s' )", esc_sql( $this->created_at_max ) );
+		}
 	}
 
 	/**
@@ -457,31 +431,36 @@ class WC_API_Customers extends WC_API_Resource {
 		$id = absint( $id );
 
 		// validate ID
-		if ( empty( $id ) )
+		if ( empty( $id ) ) {
 			return new WP_Error( 'woocommerce_api_invalid_customer_id', __( 'Invalid customer ID', 'woocommerce' ), array( 'status' => 404 ) );
+		}
 
 		// non-existent IDs return a valid WP_User object with the user ID = 0
 		$customer = new WP_User( $id );
 
-		if ( 0 === $customer->ID )
+		if ( 0 === $customer->ID ) {
 			return new WP_Error( 'woocommerce_api_invalid_customer', __( 'Invalid customer', 'woocommerce' ), array( 'status' => 404 ) );
+		}
 
 		// validate permissions
 		switch ( $context ) {
 
 			case 'read':
-				if ( ! current_user_can( 'list_users' ) )
+				if ( ! current_user_can( 'list_users' ) ) {
 					return new WP_Error( 'woocommerce_api_user_cannot_read_customer', __( 'You do not have permission to read this customer', 'woocommerce' ), array( 'status' => 401 ) );
+				}
 				break;
 
 			case 'edit':
-				if ( ! current_user_can( 'edit_users' ) )
+				if ( ! current_user_can( 'edit_users' ) ) {
 					return new WP_Error( 'woocommerce_api_user_cannot_edit_customer', __( 'You do not have permission to edit this customer', 'woocommerce' ), array( 'status' => 401 ) );
+				}
 				break;
 
 			case 'delete':
-				if ( ! current_user_can( 'delete_users' ) )
+				if ( ! current_user_can( 'delete_users' ) ) {
 					return new WP_Error( 'woocommerce_api_user_cannot_delete_customer', __( 'You do not have permission to delete this customer', 'woocommerce' ), array( 'status' => 401 ) );
+				}
 				break;
 		}
 
@@ -500,5 +479,4 @@ class WC_API_Customers extends WC_API_Resource {
 
 		return current_user_can( 'list_users' );
 	}
-
 }
diff --git a/includes/api/v1/class-wc-api-json-handler.php b/includes/api/legacy/v1/class-wc-api-json-handler.php
similarity index 99%
rename from includes/api/v1/class-wc-api-json-handler.php
rename to includes/api/legacy/v1/class-wc-api-json-handler.php
index f1d6fcb9143..adc51290673 100644
--- a/includes/api/v1/class-wc-api-json-handler.php
+++ b/includes/api/legacy/v1/class-wc-api-json-handler.php
@@ -76,5 +76,4 @@ class WC_API_JSON_Handler implements WC_API_Handler {
 
 		return json_encode( $data );
 	}
-
 }
diff --git a/includes/api/v1/class-wc-api-orders.php b/includes/api/legacy/v1/class-wc-api-orders.php
similarity index 72%
rename from includes/api/v1/class-wc-api-orders.php
rename to includes/api/legacy/v1/class-wc-api-orders.php
index 4d9c2f9acd2..53c5ed1802c 100644
--- a/includes/api/v1/class-wc-api-orders.php
+++ b/includes/api/legacy/v1/class-wc-api-orders.php
@@ -40,7 +40,7 @@ class WC_API_Orders extends WC_API_Resource {
 		);
 
 		# GET /orders/count
-		$routes[ $this->base . '/count'] = array(
+		$routes[ $this->base . '/count' ] = array(
 			array( array( $this, 'get_orders_count' ), WC_API_Server::READABLE ),
 		);
 
@@ -70,8 +70,9 @@ class WC_API_Orders extends WC_API_Resource {
 	 */
 	public function get_orders( $fields = null, $filter = array(), $status = null, $page = 1 ) {
 
-		if ( ! empty( $status ) )
+		if ( ! empty( $status ) ) {
 			$filter['status'] = $status;
+		}
 
 		$filter['page'] = $page;
 
@@ -79,10 +80,11 @@ class WC_API_Orders extends WC_API_Resource {
 
 		$orders = array();
 
-		foreach( $query->posts as $order_id ) {
+		foreach ( $query->posts as $order_id ) {
 
-			if ( ! $this->is_readable( $order_id ) )
+			if ( ! $this->is_readable( $order_id ) ) {
 				continue;
+			}
 
 			$orders[] = current( $this->get_order( $order_id, $fields ) );
 		}
@@ -106,65 +108,63 @@ class WC_API_Orders extends WC_API_Resource {
 		// ensure order ID is valid & user has permission to read
 		$id = $this->validate_request( $id, 'shop_order', 'read' );
 
-		if ( is_wp_error( $id ) )
+		if ( is_wp_error( $id ) ) {
 			return $id;
+		}
 
-		$order = wc_get_order( $id );
-
-		$order_post = get_post( $id );
-
+		$order      = wc_get_order( $id );
 		$order_data = array(
-			'id'                        => $order->id,
+			'id'                        => $order->get_id(),
 			'order_number'              => $order->get_order_number(),
-			'created_at'                => $this->server->format_datetime( $order_post->post_date_gmt ),
-			'updated_at'                => $this->server->format_datetime( $order_post->post_modified_gmt ),
-			'completed_at'              => $this->server->format_datetime( $order->completed_date, true ),
+			'created_at'                => $this->server->format_datetime( $order->get_date_created() ? $order->get_date_created()->getTimestamp() : 0, false, false ), // API gives UTC times.
+			'updated_at'                => $this->server->format_datetime( $order->get_date_modified() ? $order->get_date_modified()->getTimestamp() : 0, false, false ), // API gives UTC times.
+			'completed_at'              => $this->server->format_datetime( $order->get_date_completed() ? $order->get_date_completed()->getTimestamp() : 0, false, false ), // API gives UTC times.
 			'status'                    => $order->get_status(),
-			'currency'                  => $order->order_currency,
+			'currency'                  => $order->get_currency(),
 			'total'                     => wc_format_decimal( $order->get_total(), 2 ),
 			'subtotal'                  => wc_format_decimal( $this->get_order_subtotal( $order ), 2 ),
 			'total_line_items_quantity' => $order->get_item_count(),
 			'total_tax'                 => wc_format_decimal( $order->get_total_tax(), 2 ),
-			'total_shipping'            => wc_format_decimal( $order->get_total_shipping(), 2 ),
+			'total_shipping'            => wc_format_decimal( $order->get_shipping_total(), 2 ),
 			'cart_tax'                  => wc_format_decimal( $order->get_cart_tax(), 2 ),
 			'shipping_tax'              => wc_format_decimal( $order->get_shipping_tax(), 2 ),
 			'total_discount'            => wc_format_decimal( $order->get_total_discount(), 2 ),
-			'cart_discount'             => wc_format_decimal( $order->get_cart_discount(), 2 ),
-			'order_discount'            => wc_format_decimal( $order->get_order_discount(), 2 ),
+			'cart_discount'             => wc_format_decimal( 0, 2 ),
+			'order_discount'            => wc_format_decimal( 0, 2 ),
 			'shipping_methods'          => $order->get_shipping_method(),
 			'payment_details' => array(
-				'method_id'    => $order->payment_method,
-				'method_title' => $order->payment_method_title,
-				'paid'         => isset( $order->paid_date ),
+				'method_id'    => $order->get_payment_method(),
+				'method_title' => $order->get_payment_method_title(),
+				'paid'         => ! is_null( $order->get_date_paid() ),
 			),
 			'billing_address' => array(
-				'first_name' => $order->billing_first_name,
-				'last_name'  => $order->billing_last_name,
-				'company'    => $order->billing_company,
-				'address_1'  => $order->billing_address_1,
-				'address_2'  => $order->billing_address_2,
-				'city'       => $order->billing_city,
-				'state'      => $order->billing_state,
-				'postcode'   => $order->billing_postcode,
-				'country'    => $order->billing_country,
-				'email'      => $order->billing_email,
-				'phone'      => $order->billing_phone,
+				'first_name' => $order->get_billing_first_name(),
+				'last_name'  => $order->get_billing_last_name(),
+				'company'    => $order->get_billing_company(),
+				'address_1'  => $order->get_billing_address_1(),
+				'address_2'  => $order->get_billing_address_2(),
+				'city'       => $order->get_billing_city(),
+				'state'      => $order->get_billing_state(),
+				'postcode'   => $order->get_billing_postcode(),
+				'country'    => $order->get_billing_country(),
+				'email'      => $order->get_billing_email(),
+				'phone'      => $order->get_billing_phone(),
 			),
 			'shipping_address' => array(
-				'first_name' => $order->shipping_first_name,
-				'last_name'  => $order->shipping_last_name,
-				'company'    => $order->shipping_company,
-				'address_1'  => $order->shipping_address_1,
-				'address_2'  => $order->shipping_address_2,
-				'city'       => $order->shipping_city,
-				'state'      => $order->shipping_state,
-				'postcode'   => $order->shipping_postcode,
-				'country'    => $order->shipping_country,
+				'first_name' => $order->get_shipping_first_name(),
+				'last_name'  => $order->get_shipping_last_name(),
+				'company'    => $order->get_shipping_company(),
+				'address_1'  => $order->get_shipping_address_1(),
+				'address_2'  => $order->get_shipping_address_2(),
+				'city'       => $order->get_shipping_city(),
+				'state'      => $order->get_shipping_state(),
+				'postcode'   => $order->get_shipping_postcode(),
+				'country'    => $order->get_shipping_country(),
 			),
-			'note'                      => $order->customer_note,
-			'customer_ip'               => $order->customer_ip_address,
-			'customer_user_agent'       => $order->customer_user_agent,
-			'customer_id'               => $order->customer_user,
+			'note'                      => $order->get_customer_note(),
+			'customer_ip'               => $order->get_customer_ip_address(),
+			'customer_user_agent'       => $order->get_customer_user_agent(),
+			'customer_id'               => $order->get_user_id(),
 			'view_order_url'            => $order->get_view_order_url(),
 			'line_items'                => array(),
 			'shipping_lines'            => array(),
@@ -174,38 +174,34 @@ class WC_API_Orders extends WC_API_Resource {
 		);
 
 		// add line items
-		foreach( $order->get_items() as $item_id => $item ) {
-
-			$product = $order->get_product_from_item( $item );
-
+		foreach ( $order->get_items() as $item_id => $item ) {
+			$product                    = $item->get_product();
 			$order_data['line_items'][] = array(
 				'id'         => $item_id,
 				'subtotal'   => wc_format_decimal( $order->get_line_subtotal( $item ), 2 ),
 				'total'      => wc_format_decimal( $order->get_line_total( $item ), 2 ),
 				'total_tax'  => wc_format_decimal( $order->get_line_tax( $item ), 2 ),
 				'price'      => wc_format_decimal( $order->get_item_total( $item ), 2 ),
-				'quantity'   => (int) $item['qty'],
-				'tax_class'  => ( ! empty( $item['tax_class'] ) ) ? $item['tax_class'] : null,
-				'name'       => $item['name'],
-				'product_id' => ( isset( $product->variation_id ) ) ? $product->variation_id : $product->id,
+				'quantity'   => $item->get_quantity(),
+				'tax_class'  => $item->get_tax_class(),
+				'name'       => $item->get_name(),
+				'product_id' => $item->get_variation_id() ? $item->get_variation_id() : $item->get_product_id(),
 				'sku'        => is_object( $product ) ? $product->get_sku() : null,
 			);
 		}
 
 		// add shipping
 		foreach ( $order->get_shipping_methods() as $shipping_item_id => $shipping_item ) {
-
 			$order_data['shipping_lines'][] = array(
 				'id'           => $shipping_item_id,
-				'method_id'    => $shipping_item['method_id'],
-				'method_title' => $shipping_item['name'],
-				'total'        => wc_format_decimal( $shipping_item['cost'], 2 ),
+				'method_id'    => $shipping_item->get_method_id(),
+				'method_title' => $shipping_item->get_name(),
+				'total'        => wc_format_decimal( $shipping_item->get_total(), 2 ),
 			);
 		}
 
 		// add taxes
 		foreach ( $order->get_tax_totals() as $tax_code => $tax ) {
-
 			$order_data['tax_lines'][] = array(
 				'code'     => $tax_code,
 				'title'    => $tax->label,
@@ -216,11 +212,10 @@ class WC_API_Orders extends WC_API_Resource {
 
 		// add fees
 		foreach ( $order->get_fees() as $fee_item_id => $fee_item ) {
-
 			$order_data['fee_lines'][] = array(
 				'id'        => $fee_item_id,
-				'title'     => $fee_item['name'],
-				'tax_class' => ( ! empty( $fee_item['tax_class'] ) ) ? $fee_item['tax_class'] : null,
+				'title'     => $fee_item->get_name(),
+				'tax_class' => $fee_item->get_tax_class(),
 				'total'     => wc_format_decimal( $order->get_line_total( $fee_item ), 2 ),
 				'total_tax' => wc_format_decimal( $order->get_line_tax( $fee_item ), 2 ),
 			);
@@ -228,11 +223,10 @@ class WC_API_Orders extends WC_API_Resource {
 
 		// add coupons
 		foreach ( $order->get_items( 'coupon' ) as $coupon_item_id => $coupon_item ) {
-
 			$order_data['coupon_lines'][] = array(
 				'id'     => $coupon_item_id,
-				'code'   => $coupon_item['name'],
-				'amount' => wc_format_decimal( $coupon_item['discount_amount'], 2 ),
+				'code'   => $coupon_item->get_code(),
+				'amount' => wc_format_decimal( $coupon_item->get_discount(), 2 ),
 			);
 		}
 
@@ -249,13 +243,15 @@ class WC_API_Orders extends WC_API_Resource {
 	 */
 	public function get_orders_count( $status = null, $filter = array() ) {
 
-		if ( ! empty( $status ) )
+		if ( ! empty( $status ) ) {
 			$filter['status'] = $status;
+		}
 
 		$query = $this->query_orders( $filter );
 
-		if ( ! current_user_can( 'read_private_shop_orders' ) )
+		if ( ! current_user_can( 'read_private_shop_orders' ) ) {
 			return new WP_Error( 'woocommerce_api_user_cannot_read_orders_count', __( 'You do not have permission to read the orders count', 'woocommerce' ), array( 'status' => 401 ) );
+		}
 
 		return array( 'count' => (int) $query->found_posts );
 	}
@@ -274,8 +270,9 @@ class WC_API_Orders extends WC_API_Resource {
 
 		$id = $this->validate_request( $id, 'shop_order', 'edit' );
 
-		if ( is_wp_error( $id ) )
+		if ( is_wp_error( $id ) ) {
 			return $id;
+		}
 
 		$order = wc_get_order( $id );
 
@@ -290,7 +287,6 @@ class WC_API_Orders extends WC_API_Resource {
 	/**
 	 * Delete an order
 	 *
-	 * @TODO enable along with POST in 2.2
 	 * @param int $id the order ID
 	 * @param bool $force true to permanently delete order, false to move to trash
 	 * @return array
@@ -315,13 +311,14 @@ class WC_API_Orders extends WC_API_Resource {
 		// ensure ID is valid order ID
 		$id = $this->validate_request( $id, 'shop_order', 'read' );
 
-		if ( is_wp_error( $id ) )
+		if ( is_wp_error( $id ) ) {
 			return $id;
+		}
 
 		$args = array(
 			'post_id' => $id,
 			'approve' => 'approve',
-			'type'    => 'order_note'
+			'type'    => 'order_note',
 		);
 
 		remove_filter( 'comments_clauses', array( 'WC_Comments', 'exclude_order_comments' ), 10, 1 );
@@ -358,7 +355,7 @@ class WC_API_Orders extends WC_API_Resource {
 		$query_args = array(
 			'fields'      => 'ids',
 			'post_type'   => 'shop_order',
-			'post_status' => array_keys( wc_get_order_statuses() )
+			'post_status' => array_keys( wc_get_order_statuses() ),
 		);
 
 		// add status argument
@@ -385,16 +382,13 @@ class WC_API_Orders extends WC_API_Resource {
 	 * @return float
 	 */
 	private function get_order_subtotal( $order ) {
-
 		$subtotal = 0;
 
 		// subtotal
 		foreach ( $order->get_items() as $item ) {
-
-			$subtotal += ( isset( $item['line_subtotal'] ) ) ? $item['line_subtotal'] : 0;
+			$subtotal += $item->get_subtotal();
 		}
 
 		return $subtotal;
 	}
-
 }
diff --git a/includes/api/v1/class-wc-api-products.php b/includes/api/legacy/v1/class-wc-api-products.php
similarity index 77%
rename from includes/api/v1/class-wc-api-products.php
rename to includes/api/legacy/v1/class-wc-api-products.php
index 37aac28f204..cd64ab91341 100644
--- a/includes/api/v1/class-wc-api-products.php
+++ b/includes/api/legacy/v1/class-wc-api-products.php
@@ -8,7 +8,7 @@
  * @category    API
  * @package     WooCommerce/API
  * @since       2.1
- * @version     2.1
+ * @version     3.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -40,7 +40,7 @@ class WC_API_Products extends WC_API_Resource {
 		);
 
 		# GET /products/count
-		$routes[ $this->base . '/count'] = array(
+		$routes[ $this->base . '/count' ] = array(
 			array( array( $this, 'get_products_count' ), WC_API_Server::READABLE ),
 		);
 
@@ -69,8 +69,9 @@ class WC_API_Products extends WC_API_Resource {
 	 */
 	public function get_products( $fields = null, $type = null, $filter = array(), $page = 1 ) {
 
-		if ( ! empty( $type ) )
+		if ( ! empty( $type ) ) {
 			$filter['type'] = $type;
+		}
 
 		$filter['page'] = $page;
 
@@ -78,10 +79,11 @@ class WC_API_Products extends WC_API_Resource {
 
 		$products = array();
 
-		foreach( $query->posts as $product_id ) {
+		foreach ( $query->posts as $product_id ) {
 
-			if ( ! $this->is_readable( $product_id ) )
+			if ( ! $this->is_readable( $product_id ) ) {
 				continue;
+			}
 
 			$products[] = current( $this->get_product( $product_id, $fields ) );
 		}
@@ -103,8 +105,9 @@ class WC_API_Products extends WC_API_Resource {
 
 		$id = $this->validate_request( $id, 'product', 'read' );
 
-		if ( is_wp_error( $id ) )
+		if ( is_wp_error( $id ) ) {
 			return $id;
+		}
 
 		$product = wc_get_product( $id );
 
@@ -113,14 +116,12 @@ class WC_API_Products extends WC_API_Resource {
 
 		// add variations to variable products
 		if ( $product->is_type( 'variable' ) && $product->has_child() ) {
-
 			$product_data['variations'] = $this->get_variation_data( $product );
 		}
 
 		// add the parent product data to an individual variation
 		if ( $product->is_type( 'variation' ) ) {
-
-			$product_data['parent'] = $this->get_product_data( $product->parent );
+			$product_data['parent'] = $this->get_product_data( $product->get_parent_id() );
 		}
 
 		return array( 'product' => apply_filters( 'woocommerce_api_product_response', $product_data, $product, $fields, $this->server ) );
@@ -136,11 +137,13 @@ class WC_API_Products extends WC_API_Resource {
 	 */
 	public function get_products_count( $type = null, $filter = array() ) {
 
-		if ( ! empty( $type ) )
+		if ( ! empty( $type ) ) {
 			$filter['type'] = $type;
+		}
 
-		if ( ! current_user_can( 'read_private_products' ) )
+		if ( ! current_user_can( 'read_private_products' ) ) {
 			return new WP_Error( 'woocommerce_api_user_cannot_read_products_count', __( 'You do not have permission to read the products count', 'woocommerce' ), array( 'status' => 401 ) );
+		}
 
 		$query = $this->query_products( $filter );
 
@@ -150,7 +153,6 @@ class WC_API_Products extends WC_API_Resource {
 	/**
 	 * Edit a product
 	 *
-	 * @TODO implement in 2.2
 	 * @param int $id the product ID
 	 * @param array $data
 	 * @return array
@@ -159,8 +161,9 @@ class WC_API_Products extends WC_API_Resource {
 
 		$id = $this->validate_request( $id, 'product', 'edit' );
 
-		if ( is_wp_error( $id ) )
+		if ( is_wp_error( $id ) ) {
 			return $id;
+		}
 
 		return $this->get_product( $id );
 	}
@@ -168,7 +171,6 @@ class WC_API_Products extends WC_API_Resource {
 	/**
 	 * Delete a product
 	 *
-	 * @TODO enable along with PUT/POST in 2.2
 	 * @param int $id the product ID
 	 * @param bool $force true to permanently delete order, false to move to trash
 	 * @return array
@@ -177,8 +179,9 @@ class WC_API_Products extends WC_API_Resource {
 
 		$id = $this->validate_request( $id, 'product', 'delete' );
 
-		if ( is_wp_error( $id ) )
+		if ( is_wp_error( $id ) ) {
 			return $id;
+		}
 
 		return $this->delete( $id, 'product', ( 'true' === $force ) );
 	}
@@ -195,8 +198,9 @@ class WC_API_Products extends WC_API_Resource {
 
 		$id = $this->validate_request( $id, 'product', 'read' );
 
-		if ( is_wp_error( $id ) )
+		if ( is_wp_error( $id ) ) {
 			return $id;
+		}
 
 		$args = array(
 			'post_id' => $id,
@@ -264,18 +268,21 @@ class WC_API_Products extends WC_API_Resource {
 	 * Get standard product data that applies to every product type
 	 *
 	 * @since 2.1
-	 * @param WC_Product $product
+	 * @param WC_Product|int $product
 	 * @return array
 	 */
 	private function get_product_data( $product ) {
+		if ( is_numeric( $product ) ) {
+			$product = wc_get_product( $product );
+		}
 
 		return array(
-			'title'              => $product->get_title(),
-			'id'                 => (int) $product->is_type( 'variation' ) ? $product->get_variation_id() : $product->id,
-			'created_at'         => $this->server->format_datetime( $product->get_post_data()->post_date_gmt ),
-			'updated_at'         => $this->server->format_datetime( $product->get_post_data()->post_modified_gmt ),
-			'type'               => $product->product_type,
-			'status'             => $product->get_post_data()->post_status,
+			'title'              => $product->get_name(),
+			'id'                 => $product->get_id(),
+			'created_at'         => $this->server->format_datetime( $product->get_date_created(), false, true ),
+			'updated_at'         => $this->server->format_datetime( $product->get_date_modified(), false, true ),
+			'type'               => $product->get_type(),
+			'status'             => $product->get_status(),
 			'downloadable'       => $product->is_downloadable(),
 			'virtual'            => $product->is_virtual(),
 			'permalink'          => $product->get_permalink(),
@@ -288,7 +295,7 @@ class WC_API_Products extends WC_API_Resource {
 			'tax_status'         => $product->get_tax_status(),
 			'tax_class'          => $product->get_tax_class(),
 			'managing_stock'     => $product->managing_stock(),
-			'stock_quantity'     => (int) $product->get_stock_quantity(),
+			'stock_quantity'     => $product->get_stock_quantity(),
 			'in_stock'           => $product->is_in_stock(),
 			'backorders_allowed' => $product->backorders_allowed(),
 			'backordered'        => $product->is_on_backorder(),
@@ -296,38 +303,38 @@ class WC_API_Products extends WC_API_Resource {
 			'purchaseable'       => $product->is_purchasable(),
 			'featured'           => $product->is_featured(),
 			'visible'            => $product->is_visible(),
-			'catalog_visibility' => $product->visibility,
+			'catalog_visibility' => $product->get_catalog_visibility(),
 			'on_sale'            => $product->is_on_sale(),
 			'weight'             => $product->get_weight() ? wc_format_decimal( $product->get_weight(), 2 ) : null,
 			'dimensions'         => array(
-				'length' => $product->length,
-				'width'  => $product->width,
-				'height' => $product->height,
+				'length' => $product->get_length(),
+				'width'  => $product->get_width(),
+				'height' => $product->get_height(),
 				'unit'   => get_option( 'woocommerce_dimension_unit' ),
 			),
 			'shipping_required'  => $product->needs_shipping(),
 			'shipping_taxable'   => $product->is_shipping_taxable(),
 			'shipping_class'     => $product->get_shipping_class(),
 			'shipping_class_id'  => ( 0 !== $product->get_shipping_class_id() ) ? $product->get_shipping_class_id() : null,
-			'description'        => apply_filters( 'the_content', $product->get_post_data()->post_content ),
-			'short_description'  => apply_filters( 'woocommerce_short_description', $product->get_post_data()->post_excerpt ),
-			'reviews_allowed'    => ( 'open' === $product->get_post_data()->comment_status ),
+			'description'        => apply_filters( 'the_content', $product->get_description() ),
+			'short_description'  => apply_filters( 'woocommerce_short_description', $product->get_short_description() ),
+			'reviews_allowed'    => $product->get_reviews_allowed(),
 			'average_rating'     => wc_format_decimal( $product->get_average_rating(), 2 ),
-			'rating_count'       => (int) $product->get_rating_count(),
-			'related_ids'        => array_map( 'absint', array_values( $product->get_related() ) ),
-			'upsell_ids'         => array_map( 'absint', $product->get_upsells() ),
-			'cross_sell_ids'     => array_map( 'absint', $product->get_cross_sells() ),
-			'categories'         => wp_get_post_terms( $product->id, 'product_cat', array( 'fields' => 'names' ) ),
-			'tags'               => wp_get_post_terms( $product->id, 'product_tag', array( 'fields' => 'names' ) ),
+			'rating_count'       => $product->get_rating_count(),
+			'related_ids'        => array_map( 'absint', array_values( wc_get_related_products( $product->get_id() ) ) ),
+			'upsell_ids'         => array_map( 'absint', $product->get_upsell_ids() ),
+			'cross_sell_ids'     => array_map( 'absint', $product->get_cross_sell_ids() ),
+			'categories'         => wc_get_object_terms( $product->get_id(), 'product_cat', 'name' ),
+			'tags'               => wc_get_object_terms( $product->get_id(), 'product_tag', 'name' ),
 			'images'             => $this->get_images( $product ),
-			'featured_src'       => wp_get_attachment_url( get_post_thumbnail_id( $product->is_type( 'variation' ) ? $product->variation_id : $product->id ) ),
+			'featured_src'       => wp_get_attachment_url( get_post_thumbnail_id( $product->get_id() ) ),
 			'attributes'         => $this->get_attributes( $product ),
 			'downloads'          => $this->get_downloads( $product ),
-			'download_limit'     => (int) $product->download_limit,
-			'download_expiry'    => (int) $product->download_expiry,
-			'download_type'      => $product->download_type,
-			'purchase_note'      => apply_filters( 'the_content', $product->purchase_note ),
-			'total_sales'        => metadata_exists( 'post', $product->id, 'total_sales' ) ? (int) get_post_meta( $product->id, 'total_sales', true ) : 0,
+			'download_limit'     => $product->get_download_limit(),
+			'download_expiry'    => $product->get_download_expiry(),
+			'download_type'      => 'standard',
+			'purchase_note'      => apply_filters( 'the_content', $product->get_purchase_note() ),
+			'total_sales'        => $product->get_total_sales(),
 			'variations'         => array(),
 			'parent'             => array(),
 		);
@@ -341,20 +348,19 @@ class WC_API_Products extends WC_API_Resource {
 	 * @return array
 	 */
 	private function get_variation_data( $product ) {
-
 		$variations = array();
 
 		foreach ( $product->get_children() as $child_id ) {
+			$variation = wc_get_product( $child_id );
 
-			$variation = $product->get_child( $child_id );
-
-			if ( ! $variation->exists() )
+			if ( ! $variation || ! $variation->exists() ) {
 				continue;
+			}
 
 			$variations[] = array(
-				'id'                => $variation->get_variation_id(),
-				'created_at'        => $this->server->format_datetime( $variation->get_post_data()->post_date_gmt ),
-				'updated_at'        => $this->server->format_datetime( $variation->get_post_data()->post_modified_gmt ),
+				'id'                => $variation->get_id(),
+				'created_at'        => $this->server->format_datetime( $variation->get_date_created(), false, true ),
+				'updated_at'        => $this->server->format_datetime( $variation->get_date_modified(), false, true ),
 				'downloadable'      => $variation->is_downloadable(),
 				'virtual'           => $variation->is_virtual(),
 				'permalink'         => $variation->get_permalink(),
@@ -373,9 +379,9 @@ class WC_API_Products extends WC_API_Resource {
 				'on_sale'           => $variation->is_on_sale(),
 				'weight'            => $variation->get_weight() ? wc_format_decimal( $variation->get_weight(), 2 ) : null,
 				'dimensions'        => array(
-					'length' => $variation->length,
-					'width'  => $variation->width,
-					'height' => $variation->height,
+					'length' => $variation->get_length(),
+					'width'  => $variation->get_width(),
+					'height' => $variation->get_height(),
 					'unit'   => get_option( 'woocommerce_dimension_unit' ),
 				),
 				'shipping_class'    => $variation->get_shipping_class(),
@@ -383,8 +389,8 @@ class WC_API_Products extends WC_API_Resource {
 				'image'             => $this->get_images( $variation ),
 				'attributes'        => $this->get_attributes( $variation ),
 				'downloads'         => $this->get_downloads( $variation ),
-				'download_limit'    => (int) $product->download_limit,
-				'download_expiry'   => (int) $product->download_expiry,
+				'download_limit'    => (int) $product->get_download_limit(),
+				'download_expiry'   => (int) $product->get_download_expiry(),
 			);
 		}
 
@@ -399,45 +405,31 @@ class WC_API_Products extends WC_API_Resource {
 	 * @return array
 	 */
 	private function get_images( $product ) {
+		$images        = $attachment_ids = array();
+		$product_image = $product->get_image_id();
 
-		$images = $attachment_ids = array();
-
-		if ( $product->is_type( 'variation' ) ) {
-
-			if ( has_post_thumbnail( $product->get_variation_id() ) ) {
-
-				// add variation image if set
-				$attachment_ids[] = get_post_thumbnail_id( $product->get_variation_id() );
-
-			} elseif ( has_post_thumbnail( $product->id ) ) {
-
-				// otherwise use the parent product featured image if set
-				$attachment_ids[] = get_post_thumbnail_id( $product->id );
-			}
-
-		} else {
-
-			// add featured image
-			if ( has_post_thumbnail( $product->id ) ) {
-				$attachment_ids[] = get_post_thumbnail_id( $product->id );
-			}
-
-			// add gallery images
-			$attachment_ids = array_merge( $attachment_ids, $product->get_gallery_attachment_ids() );
+		// Add featured image.
+		if ( ! empty( $product_image ) ) {
+			$attachment_ids[] = $product_image;
 		}
 
-		// build image data
+		// add gallery images.
+		$attachment_ids = array_merge( $attachment_ids, $product->get_gallery_image_ids() );
+
+		// Build image data.
 		foreach ( $attachment_ids as $position => $attachment_id ) {
 
 			$attachment_post = get_post( $attachment_id );
 
-			if ( is_null( $attachment_post ) )
+			if ( is_null( $attachment_post ) ) {
 				continue;
+			}
 
 			$attachment = wp_get_attachment_image_src( $attachment_id, 'full' );
 
-			if ( ! is_array( $attachment ) )
+			if ( ! is_array( $attachment ) ) {
 				continue;
+			}
 
 			$images[] = array(
 				'id'         => (int) $attachment_id,
@@ -450,7 +442,7 @@ class WC_API_Products extends WC_API_Resource {
 			);
 		}
 
-		// set a placeholder image if the product has no images set
+		// Set a placeholder image if the product has no images set.
 		if ( empty( $images ) ) {
 
 			$images[] = array(
@@ -467,6 +459,23 @@ class WC_API_Products extends WC_API_Resource {
 		return $images;
 	}
 
+	/**
+	 * Get attribute options.
+	 *
+	 * @param int $product_id
+	 * @param array $attribute
+	 * @return array
+	 */
+	protected function get_attribute_options( $product_id, $attribute ) {
+		if ( isset( $attribute['is_taxonomy'] ) && $attribute['is_taxonomy'] ) {
+			return wc_get_product_terms( $product_id, $attribute['name'], array( 'fields' => 'names' ) );
+		} elseif ( isset( $attribute['value'] ) ) {
+			return array_map( 'trim', explode( '|', $attribute['value'] ) );
+		}
+
+		return array();
+	}
+
 	/**
 	 * Get the attributes for a product or product variation
 	 *
@@ -489,23 +498,15 @@ class WC_API_Products extends WC_API_Resource {
 					'option' => $attribute,
 				);
 			}
-
 		} else {
 
 			foreach ( $product->get_attributes() as $attribute ) {
-
-				// taxonomy-based attributes are comma-separated, others are pipe (|) separated
-				if ( $attribute['is_taxonomy'] )
-					$options = explode( ',', $product->get_attribute( $attribute['name'] ) );
-				else
-					$options = explode( '|', $product->get_attribute( $attribute['name'] ) );
-
 				$attributes[] = array(
 					'name'      => ucwords( str_replace( 'pa_', '', $attribute['name'] ) ),
 					'position'  => $attribute['position'],
 					'visible'   => (bool) $attribute['is_visible'],
 					'variation' => (bool) $attribute['is_variation'],
-					'options'   => array_map( 'trim', $options ),
+					'options'   => $this->get_attribute_options( $product->get_id(), $attribute ),
 				);
 			}
 		}
@@ -526,7 +527,7 @@ class WC_API_Products extends WC_API_Resource {
 
 		if ( $product->is_downloadable() ) {
 
-			foreach ( $product->get_files() as $file_id => $file ) {
+			foreach ( $product->get_downloads() as $file_id => $file ) {
 
 				$downloads[] = array(
 					'id'   => $file_id, // do not cast as int as this is a hash
@@ -538,5 +539,4 @@ class WC_API_Products extends WC_API_Resource {
 
 		return $downloads;
 	}
-
 }
diff --git a/includes/api/v1/class-wc-api-reports.php b/includes/api/legacy/v1/class-wc-api-reports.php
similarity index 91%
rename from includes/api/v1/class-wc-api-reports.php
rename to includes/api/legacy/v1/class-wc-api-reports.php
index c8be0cd31bc..27c8a33fee5 100644
--- a/includes/api/v1/class-wc-api-reports.php
+++ b/includes/api/legacy/v1/class-wc-api-reports.php
@@ -41,7 +41,7 @@ class WC_API_Reports extends WC_API_Resource {
 		);
 
 		# GET /reports/sales
-		$routes[ $this->base . '/sales'] = array(
+		$routes[ $this->base . '/sales' ] = array(
 			array( array( $this, 'get_sales_report' ), WC_API_Server::READABLE ),
 		);
 
@@ -77,8 +77,9 @@ class WC_API_Reports extends WC_API_Resource {
 		// check user permissions
 		$check = $this->validate_request();
 
-		if ( is_wp_error( $check ) )
+		if ( is_wp_error( $check ) ) {
 			return $check;
+		}
 
 		// set date filtering
 		$this->setup_report( $filter );
@@ -89,28 +90,28 @@ class WC_API_Reports extends WC_API_Resource {
 				'_order_total' => array(
 					'type'     => 'meta',
 					'function' => 'SUM',
-					'name'     => 'sales'
+					'name'     => 'sales',
 				),
 				'_order_tax' => array(
 					'type'            => 'meta',
 					'function'        => 'SUM',
-					'name'            => 'tax'
+					'name'            => 'tax',
 				),
 				'_order_shipping_tax' => array(
 					'type'            => 'meta',
 					'function'        => 'SUM',
-					'name'            => 'shipping_tax'
+					'name'            => 'shipping_tax',
 				),
 				'_order_shipping' => array(
 					'type'     => 'meta',
 					'function' => 'SUM',
-					'name'     => 'shipping'
+					'name'     => 'shipping',
 				),
 				'ID' => array(
 					'type'     => 'post_data',
 					'function' => 'COUNT',
-					'name'     => 'order_count'
-				)
+					'name'     => 'order_count',
+				),
 			),
 			'filter_range' => true,
 		) );
@@ -122,8 +123,8 @@ class WC_API_Reports extends WC_API_Resource {
 					'type'            => 'order_item_meta',
 					'order_item_type' => 'line_item',
 					'function'        => 'SUM',
-					'name'            => 'order_item_qty'
-				)
+					'name'            => 'order_item_qty',
+				),
 			),
 			'query_type' => 'get_var',
 			'filter_range' => true,
@@ -136,15 +137,15 @@ class WC_API_Reports extends WC_API_Resource {
 					'type'            => 'order_item_meta',
 					'order_item_type' => 'coupon',
 					'function'        => 'SUM',
-					'name'            => 'discount_amount'
-				)
+					'name'            => 'discount_amount',
+				),
 			),
 			'where' => array(
 				array(
 					'key'      => 'order_item_type',
 					'value'    => 'coupon',
-					'operator' => '='
-				)
+					'operator' => '=',
+				),
 			),
 			'query_type' => 'get_var',
 			'filter_range' => true,
@@ -161,8 +162,9 @@ class WC_API_Reports extends WC_API_Resource {
 		$customers = $users_query->get_results();
 
 		foreach ( $customers as $key => $customer ) {
-			if ( strtotime( $customer->user_registered ) < $this->report->start_date || strtotime( $customer->user_registered ) > $this->report->end_date )
+			if ( strtotime( $customer->user_registered ) < $this->report->start_date || strtotime( $customer->user_registered ) > $this->report->end_date ) {
 				unset( $customers[ $key ] );
+			}
 		}
 
 		$total_customers = count( $customers );
@@ -173,22 +175,22 @@ class WC_API_Reports extends WC_API_Resource {
 				'_order_total' => array(
 					'type'     => 'meta',
 					'function' => 'SUM',
-					'name'     => 'total_sales'
+					'name'     => 'total_sales',
 				),
 				'_order_shipping' => array(
 					'type'     => 'meta',
 					'function' => 'SUM',
-					'name'     => 'total_shipping'
+					'name'     => 'total_shipping',
 				),
 				'_order_tax' => array(
 					'type'     => 'meta',
 					'function' => 'SUM',
-					'name'     => 'total_tax'
+					'name'     => 'total_tax',
 				),
 				'_order_shipping_tax' => array(
 					'type'     => 'meta',
 					'function' => 'SUM',
-					'name'     => 'total_shipping_tax'
+					'name'     => 'total_shipping_tax',
 				),
 				'ID' => array(
 					'type'     => 'post_data',
@@ -199,7 +201,7 @@ class WC_API_Reports extends WC_API_Resource {
 				'post_date' => array(
 					'type'     => 'post_data',
 					'function' => '',
-					'name'     => 'post_date'
+					'name'     => 'post_date',
 				),
 			),
 			'group_by'     => $this->report->group_by_query,
@@ -215,20 +217,20 @@ class WC_API_Reports extends WC_API_Resource {
 					'type'            => 'order_item_meta',
 					'order_item_type' => 'line_item',
 					'function'        => 'SUM',
-					'name'            => 'order_item_count'
+					'name'            => 'order_item_count',
 				),
 				'post_date' => array(
 					'type'     => 'post_data',
 					'function' => '',
-					'name'     => 'post_date'
+					'name'     => 'post_date',
 				),
 			),
 			'where' => array(
 				array(
 					'key'      => 'order_item_type',
 					'value'    => 'line_item',
-					'operator' => '='
-				)
+					'operator' => '=',
+				),
 			),
 			'group_by'     => $this->report->group_by_query,
 			'order_by'     => 'post_date ASC',
@@ -243,20 +245,20 @@ class WC_API_Reports extends WC_API_Resource {
 					'type'            => 'order_item_meta',
 					'order_item_type' => 'coupon',
 					'function'        => 'SUM',
-					'name'            => 'discount_amount'
+					'name'            => 'discount_amount',
 				),
 				'post_date' => array(
 					'type'     => 'post_data',
 					'function' => '',
-					'name'     => 'post_date'
+					'name'     => 'post_date',
 				),
 			),
 			'where' => array(
 				array(
 					'key'      => 'order_item_type',
 					'value'    => 'coupon',
-					'operator' => '='
-				)
+					'operator' => '=',
+				),
 			),
 			'group_by'     => $this->report->group_by_query . ', order_item_name',
 			'order_by'     => 'post_date ASC',
@@ -303,8 +305,9 @@ class WC_API_Reports extends WC_API_Resource {
 
 			$time = ( 'day' === $this->report->chart_groupby ) ? date( 'Y-m-d', strtotime( $order->post_date ) ) : date( 'Y-m', strtotime( $order->post_date ) );
 
-			if ( ! isset( $period_totals[ $time ] ) )
+			if ( ! isset( $period_totals[ $time ] ) ) {
 				continue;
+			}
 
 			$period_totals[ $time ]['sales']    = wc_format_decimal( $order->total_sales, 2 );
 			$period_totals[ $time ]['orders']   = (int) $order->total_orders;
@@ -317,8 +320,9 @@ class WC_API_Reports extends WC_API_Resource {
 
 			$time = ( 'day' === $this->report->chart_groupby ) ? date( 'Y-m-d', strtotime( $order_item->post_date ) ) : date( 'Y-m', strtotime( $order_item->post_date ) );
 
-			if ( ! isset( $period_totals[ $time ] ) )
+			if ( ! isset( $period_totals[ $time ] ) ) {
 				continue;
+			}
 
 			$period_totals[ $time ]['items'] = (int) $order_item->order_item_count;
 		}
@@ -328,8 +332,9 @@ class WC_API_Reports extends WC_API_Resource {
 
 			$time = ( 'day' === $this->report->chart_groupby ) ? date( 'Y-m-d', strtotime( $discount->post_date ) ) : date( 'Y-m', strtotime( $discount->post_date ) );
 
-			if ( ! isset( $period_totals[ $time ] ) )
+			if ( ! isset( $period_totals[ $time ] ) ) {
 				continue;
+			}
 
 			$period_totals[ $time ]['discount'] = wc_format_decimal( $discount->discount_amount, 2 );
 		}
@@ -376,14 +381,14 @@ class WC_API_Reports extends WC_API_Resource {
 					'type'            => 'order_item_meta',
 					'order_item_type' => 'line_item',
 					'function'        => '',
-					'name'            => 'product_id'
+					'name'            => 'product_id',
 				),
 				'_qty' => array(
 					'type'            => 'order_item_meta',
 					'order_item_type' => 'line_item',
 					'function'        => 'SUM',
-					'name'            => 'order_item_qty'
-				)
+					'name'            => 'order_item_qty',
+				),
 			),
 			'order_by'     => 'order_item_qty DESC',
 			'group_by'     => 'product_id',
@@ -399,7 +404,7 @@ class WC_API_Reports extends WC_API_Resource {
 			$product = wc_get_product( $top_seller->product_id );
 
 			$top_sellers_data[] = array(
-				'title'      => $product->get_title(),
+				'title'      => $product->get_name(),
 				'product_id' => $top_seller->product_id,
 				'quantity'   => $top_seller->order_item_qty,
 			);
@@ -436,7 +441,6 @@ class WC_API_Reports extends WC_API_Resource {
 				// default custom range to today
 				$_GET['start_date'] = $_GET['end_date'] = date( 'Y-m-d', current_time( 'timestamp' ) );
 			}
-
 		} else {
 
 			// ensure period is valid
diff --git a/includes/api/v1/class-wc-api-resource.php b/includes/api/legacy/v1/class-wc-api-resource.php
similarity index 90%
rename from includes/api/v1/class-wc-api-resource.php
rename to includes/api/legacy/v1/class-wc-api-resource.php
index 11c548c7ba4..68e22372dd3 100644
--- a/includes/api/v1/class-wc-api-resource.php
+++ b/includes/api/legacy/v1/class-wc-api-resource.php
@@ -62,16 +62,18 @@ class WC_API_Resource {
 	 */
 	protected function validate_request( $id, $type, $context ) {
 
-		if ( 'shop_order' === $type || 'shop_coupon' === $type )
+		if ( 'shop_order' === $type || 'shop_coupon' === $type ) {
 			$resource_name = str_replace( 'shop_', '', $type );
-		else
+		} else {
 			$resource_name = $type;
+		}
 
 		$id = absint( $id );
 
 		// validate ID
-		if ( empty( $id ) )
+		if ( empty( $id ) ) {
 			return new WP_Error( "woocommerce_api_invalid_{$resource_name}_id", sprintf( __( 'Invalid %s ID', 'woocommerce' ), $type ), array( 'status' => 404 ) );
+		}
 
 		// only custom post types have per-post type/permission checks
 		if ( 'customer' !== $type ) {
@@ -82,25 +84,29 @@ class WC_API_Resource {
 			$post_type = ( 'product_variation' === $post->post_type ) ? 'product' : $post->post_type;
 
 			// validate post type
-			if ( $type !== $post_type )
+			if ( $type !== $post_type ) {
 				return new WP_Error( "woocommerce_api_invalid_{$resource_name}", sprintf( __( 'Invalid %s', 'woocommerce' ), $resource_name ), array( 'status' => 404 ) );
+			}
 
 			// validate permissions
 			switch ( $context ) {
 
 				case 'read':
-					if ( ! $this->is_readable( $post ) )
+					if ( ! $this->is_readable( $post ) ) {
 						return new WP_Error( "woocommerce_api_user_cannot_read_{$resource_name}", sprintf( __( 'You do not have permission to read this %s', 'woocommerce' ), $resource_name ), array( 'status' => 401 ) );
+					}
 					break;
 
 				case 'edit':
-					if ( ! $this->is_editable( $post ) )
+					if ( ! $this->is_editable( $post ) ) {
 						return new WP_Error( "woocommerce_api_user_cannot_edit_{$resource_name}", sprintf( __( 'You do not have permission to edit this %s', 'woocommerce' ), $resource_name ), array( 'status' => 401 ) );
+					}
 					break;
 
 				case 'delete':
-					if ( ! $this->is_deletable( $post ) )
+					if ( ! $this->is_deletable( $post ) ) {
 						return new WP_Error( "woocommerce_api_user_cannot_delete_{$resource_name}", sprintf( __( 'You do not have permission to delete this %s', 'woocommerce' ), $resource_name ), array( 'status' => 401 ) );
+					}
 					break;
 			}
 		}
@@ -126,33 +132,40 @@ class WC_API_Resource {
 			$args['date_query'] = array();
 
 			// resources created after specified date
-			if ( ! empty( $request_args['created_at_min'] ) )
+			if ( ! empty( $request_args['created_at_min'] ) ) {
 				$args['date_query'][] = array( 'column' => 'post_date_gmt', 'after' => $this->server->parse_datetime( $request_args['created_at_min'] ), 'inclusive' => true );
+			}
 
 			// resources created before specified date
-			if ( ! empty( $request_args['created_at_max'] ) )
+			if ( ! empty( $request_args['created_at_max'] ) ) {
 				$args['date_query'][] = array( 'column' => 'post_date_gmt', 'before' => $this->server->parse_datetime( $request_args['created_at_max'] ), 'inclusive' => true );
+			}
 
 			// resources updated after specified date
-			if ( ! empty( $request_args['updated_at_min'] ) )
+			if ( ! empty( $request_args['updated_at_min'] ) ) {
 				$args['date_query'][] = array( 'column' => 'post_modified_gmt', 'after' => $this->server->parse_datetime( $request_args['updated_at_min'] ), 'inclusive' => true );
+			}
 
 			// resources updated before specified date
-			if ( ! empty( $request_args['updated_at_max'] ) )
+			if ( ! empty( $request_args['updated_at_max'] ) ) {
 				$args['date_query'][] = array( 'column' => 'post_modified_gmt', 'before' => $this->server->parse_datetime( $request_args['updated_at_max'] ), 'inclusive' => true );
+			}
 		}
 
 		// search
-		if ( ! empty( $request_args['q'] ) )
+		if ( ! empty( $request_args['q'] ) ) {
 			$args['s'] = $request_args['q'];
+		}
 
 		// resources per response
-		if ( ! empty( $request_args['limit'] ) )
+		if ( ! empty( $request_args['limit'] ) ) {
 			$args['posts_per_page'] = $request_args['limit'];
+		}
 
 		// resource offset
-		if ( ! empty( $request_args['offset'] ) )
+		if ( ! empty( $request_args['offset'] ) ) {
 			$args['offset'] = $request_args['offset'];
+		}
 
 		// resource page
 		$args['paged'] = ( isset( $request_args['page'] ) ) ? absint( $request_args['page'] ) : 1;
@@ -174,8 +187,9 @@ class WC_API_Resource {
 		if ( isset( $this->server->params['GET']['filter']['meta'] ) && 'true' === $this->server->params['GET']['filter']['meta'] && is_object( $resource ) ) {
 
 			// don't attempt to add meta more than once
-			if ( preg_grep( '/[a-z]+_meta/', array_keys( $data ) ) )
+			if ( preg_grep( '/[a-z]+_meta/', array_keys( $data ) ) ) {
 				return $data;
+			}
 
 			// define the top-level property name for the meta
 			switch ( get_class( $resource ) ) {
@@ -213,14 +227,13 @@ class WC_API_Resource {
 				$meta = (array) get_post_meta( $resource->id );
 			}
 
-			foreach( $meta as $meta_key => $meta_value ) {
+			foreach ( $meta as $meta_key => $meta_value ) {
 
 				// don't add hidden meta by default
 				if ( ! is_protected_meta( $meta_key ) ) {
 					$data[ $meta_name ][ $meta_key ] = maybe_unserialize( $meta_value[0] );
 				}
 			}
-
 		}
 
 		return $data;
@@ -237,8 +250,9 @@ class WC_API_Resource {
 	 */
 	public function filter_response_fields( $data, $resource, $fields ) {
 
-		if ( ! is_array( $data ) || empty( $fields ) )
+		if ( ! is_array( $data ) || empty( $fields ) ) {
 			return $data;
+		}
 
 		$fields = explode( ',', $fields );
 		$sub_fields = array();
@@ -268,7 +282,6 @@ class WC_API_Resource {
 						unset( $data[ $data_field ][ $sub_field ] );
 					}
 				}
-
 			} else {
 
 				// remove non-matching top-level fields
@@ -292,28 +305,29 @@ class WC_API_Resource {
 	 */
 	protected function delete( $id, $type, $force = false ) {
 
-		if ( 'shop_order' === $type || 'shop_coupon' === $type )
+		if ( 'shop_order' === $type || 'shop_coupon' === $type ) {
 			$resource_name = str_replace( 'shop_', '', $type );
-		else
+		} else {
 			$resource_name = $type;
+		}
 
 		if ( 'customer' === $type ) {
 
 			$result = wp_delete_user( $id );
 
-			if ( $result )
+			if ( $result ) {
 				return array( 'message' => __( 'Permanently deleted customer', 'woocommerce' ) );
-			else
+			} else {
 				return new WP_Error( 'woocommerce_api_cannot_delete_customer', __( 'The customer cannot be deleted', 'woocommerce' ), array( 'status' => 500 ) );
-
+			}
 		} else {
 
 			// delete order/coupon/product
-
 			$result = ( $force ) ? wp_delete_post( $id, true ) : wp_trash_post( $id );
 
-			if ( ! $result )
+			if ( ! $result ) {
 				return new WP_Error( "woocommerce_api_cannot_delete_{$resource_name}", sprintf( __( 'This %s cannot be deleted', 'woocommerce' ), $resource_name ), array( 'status' => 500 ) );
+			}
 
 			if ( $force ) {
 				return array( 'message' => sprintf( __( 'Permanently deleted %s', 'woocommerce' ), $resource_name ) );
@@ -378,25 +392,24 @@ class WC_API_Resource {
 	 */
 	private function check_permission( $post, $context ) {
 
-		if ( ! is_a( $post, 'WP_Post' ) )
+		if ( ! is_a( $post, 'WP_Post' ) ) {
 			$post = get_post( $post );
+		}
 
-		if ( is_null( $post ) )
+		if ( is_null( $post ) ) {
 			return false;
+		}
 
 		$post_type = get_post_type_object( $post->post_type );
 
-		if ( 'read' === $context )
+		if ( 'read' === $context ) {
 			return current_user_can( $post_type->cap->read_private_posts, $post->ID );
-
-		elseif ( 'edit' === $context )
+		} elseif ( 'edit' === $context ) {
 			return current_user_can( $post_type->cap->edit_post, $post->ID );
-
-		elseif ( 'delete' === $context )
+		} elseif ( 'delete' === $context ) {
 			return current_user_can( $post_type->cap->delete_post, $post->ID );
-
-		else
+		} else {
 			return false;
+		}
 	}
-
 }
diff --git a/includes/api/v1/class-wc-api-server.php b/includes/api/legacy/v1/class-wc-api-server.php
similarity index 88%
rename from includes/api/v1/class-wc-api-server.php
rename to includes/api/legacy/v1/class-wc-api-server.php
index a93541e6d24..e97498ed8ab 100644
--- a/includes/api/v1/class-wc-api-server.php
+++ b/includes/api/legacy/v1/class-wc-api-server.php
@@ -117,10 +117,11 @@ class WC_API_Server {
 	public function __construct( $path ) {
 
 		if ( empty( $path ) ) {
-			if ( isset( $_SERVER['PATH_INFO'] ) )
+			if ( isset( $_SERVER['PATH_INFO'] ) ) {
 				$path = $_SERVER['PATH_INFO'];
-			else
+			} else {
 				$path = '/';
+			}
 		}
 
 		$this->path           = $path;
@@ -138,14 +139,13 @@ class WC_API_Server {
 		}
 
 		// determine type of request/response and load handler, JSON by default
-		if ( $this->is_json_request() )
+		if ( $this->is_json_request() ) {
 			$handler_class = 'WC_API_JSON_Handler';
-
-		elseif ( $this->is_xml_request() )
+		} elseif ( $this->is_xml_request() ) {
 			$handler_class = 'WC_API_XML_Handler';
-
-		else
+		} else {
 			$handler_class = apply_filters( 'woocommerce_api_default_response_handler', 'WC_API_JSON_Handler', $this->path, $this );
+		}
 
 		$this->handler = new $handler_class();
 	}
@@ -162,12 +162,12 @@ class WC_API_Server {
 		$user = apply_filters( 'woocommerce_api_check_authentication', null, $this );
 
 		// API requests run under the context of the authenticated user
-		if ( is_a( $user, 'WP_User' ) )
+		if ( is_a( $user, 'WP_User' ) ) {
 			wp_set_current_user( $user->ID );
-
-		// WP_Errors are handled in serve_request()
-		elseif ( ! is_wp_error( $user ) )
+		} elseif ( ! is_wp_error( $user ) ) {
+			// WP_Errors are handled in serve_request()
 			$user = new WP_Error( 'woocommerce_api_authentication_error', __( 'Invalid authentication method', 'woocommerce' ), array( 'code' => 500 ) );
+		}
 
 		return $user;
 	}
@@ -241,8 +241,9 @@ class WC_API_Server {
 
 		if ( ! $served ) {
 
-			if ( 'HEAD' === $this->method )
+			if ( 'HEAD' === $this->method ) {
 				return;
+			}
 
 			echo $this->handler->generate_response( $result );
 		}
@@ -326,16 +327,19 @@ class WC_API_Server {
 				$callback = $handler[0];
 				$supported = isset( $handler[1] ) ? $handler[1] : self::METHOD_GET;
 
-				if ( !( $supported & $method ) )
+				if ( ! ( $supported & $method ) ) {
 					continue;
+				}
 
 				$match = preg_match( '@^' . $route . '$@i', urldecode( $this->path ), $args );
 
-				if ( !$match )
+				if ( ! $match ) {
 					continue;
+				}
 
-				if ( ! is_callable( $callback ) )
+				if ( ! is_callable( $callback ) ) {
 					return new WP_Error( 'woocommerce_api_invalid_handler', __( 'The handler for the route is invalid', 'woocommerce' ), array( 'status' => 500 ) );
+				}
 
 				$args = array_merge( $args, $this->params['GET'] );
 				if ( $method & self::METHOD_POST ) {
@@ -344,8 +348,7 @@ class WC_API_Server {
 				if ( $supported & self::ACCEPT_DATA ) {
 					$data = $this->handler->parse_body( $this->get_raw_data() );
 					$args = array_merge( $args, array( 'data' => $data ) );
-				}
-				elseif ( $supported & self::ACCEPT_RAW_DATA ) {
+				} elseif ( $supported & self::ACCEPT_RAW_DATA ) {
 					$data = $this->get_raw_data();
 					$args = array_merge( $args, array( 'data' => $data ) );
 				}
@@ -364,8 +367,9 @@ class WC_API_Server {
 				}
 
 				$params = $this->sort_callback_params( $callback, $args );
-				if ( is_wp_error( $params ) )
+				if ( is_wp_error( $params ) ) {
 					return $params;
+				}
 
 				return call_user_func_array( $callback, $params );
 			}
@@ -386,10 +390,11 @@ class WC_API_Server {
 	 * @return array
 	 */
 	protected function sort_callback_params( $callback, $provided ) {
-		if ( is_array( $callback ) )
+		if ( is_array( $callback ) ) {
 			$ref_func = new ReflectionMethod( $callback[0], $callback[1] );
-		else
+		} else {
 			$ref_func = new ReflectionFunction( $callback );
+		}
 
 		$wanted = $ref_func->getParameters();
 		$ordered_parameters = array();
@@ -397,14 +402,11 @@ class WC_API_Server {
 		foreach ( $wanted as $param ) {
 			if ( isset( $provided[ $param->getName() ] ) ) {
 				// We have this parameters in the list to choose from
-
 				$ordered_parameters[] = is_array( $provided[ $param->getName() ] ) ? array_map( 'urldecode', $provided[ $param->getName() ] ) : urldecode( $provided[ $param->getName() ] );
-			}
-			elseif ( $param->isDefaultValueAvailable() ) {
+			} elseif ( $param->isDefaultValueAvailable() ) {
 				// We don't have this parameter, but it's optional
 				$ordered_parameters[] = $param->getDefaultValue();
-			}
-			else {
+			} else {
 				// We don't have this parameter and it wasn't optional, abort!
 				return new WP_Error( 'woocommerce_api_missing_callback_param', sprintf( __( 'Missing parameter %s', 'woocommerce' ), $param->getName() ), array( 'status' => 400 ) );
 			}
@@ -423,26 +425,28 @@ class WC_API_Server {
 	public function get_index() {
 
 		// General site data
-		$available = array( 'store' => array(
-			'name'        => get_option( 'blogname' ),
-			'description' => get_option( 'blogdescription' ),
-			'URL'         => get_option( 'siteurl' ),
-			'wc_version'  => WC()->version,
-			'routes'      => array(),
-			'meta'        => array(
-				'timezone'			 => wc_timezone_string(),
-				'currency'       	 => get_woocommerce_currency(),
-				'currency_format'    => get_woocommerce_currency_symbol(),
-				'tax_included'   	 => wc_prices_include_tax(),
-				'weight_unit'    	 => get_option( 'woocommerce_weight_unit' ),
-				'dimension_unit' 	 => get_option( 'woocommerce_dimension_unit' ),
-				'ssl_enabled'    	 => ( 'yes' === get_option( 'woocommerce_force_ssl_checkout' ) ),
-				'permalinks_enabled' => ( '' !== get_option( 'permalink_structure' ) ),
-				'links'          	 => array(
-					'help' => 'http://woothemes.github.io/woocommerce/rest-api/',
+		$available = array(
+			'store' => array(
+				'name'        => get_option( 'blogname' ),
+				'description' => get_option( 'blogdescription' ),
+				'URL'         => get_option( 'siteurl' ),
+				'wc_version'  => WC()->version,
+				'routes'      => array(),
+				'meta'        => array(
+					'timezone'			 => wc_timezone_string(),
+					'currency'       	 => get_woocommerce_currency(),
+					'currency_format'    => get_woocommerce_currency_symbol(),
+					'tax_included'   	 => wc_prices_include_tax(),
+					'weight_unit'    	 => get_option( 'woocommerce_weight_unit' ),
+					'dimension_unit' 	 => get_option( 'woocommerce_dimension_unit' ),
+					'ssl_enabled'    	 => ( 'yes' === get_option( 'woocommerce_force_ssl_checkout' ) ),
+					'permalinks_enabled' => ( '' !== get_option( 'permalink_structure' ) ),
+					'links'          	 => array(
+						'help' => 'https://woocommerce.github.io/woocommerce/rest-api/',
+					),
 				),
 			),
-		) );
+		);
 
 		// Find the available routes
 		foreach ( $this->get_routes() as $route => $callbacks ) {
@@ -453,14 +457,17 @@ class WC_API_Server {
 			foreach ( self::$method_map as $name => $bitmask ) {
 				foreach ( $callbacks as $callback ) {
 					// Skip to the next route if any callback is hidden
-					if ( $callback[1] & self::HIDDEN_ENDPOINT )
+					if ( $callback[1] & self::HIDDEN_ENDPOINT ) {
 						continue 3;
+					}
 
-					if ( $callback[1] & $bitmask )
+					if ( $callback[1] & $bitmask ) {
 						$data['supports'][] = $name;
+					}
 
-					if ( $callback[1] & self::ACCEPT_DATA )
+					if ( $callback[1] & self::ACCEPT_DATA ) {
 						$data['accepts_data'] = true;
+					}
 
 					// For non-variable routes, generate links
 					if ( strpos( $route, '<' ) === false ) {
@@ -552,8 +559,9 @@ class WC_API_Server {
 			$total_pages = $query->max_num_pages;
 		}
 
-		if ( ! $page )
+		if ( ! $page ) {
 			$page = 1;
+		}
 
 		$next_page = absint( $page ) + 1;
 
@@ -571,8 +579,9 @@ class WC_API_Server {
 			}
 
 			// last
-			if ( $page != $total_pages )
+			if ( $page != $total_pages ) {
 				$this->link_header( 'last', $this->get_paginated_url( $total_pages ) );
+			}
 		}
 
 		$this->header( 'X-WC-Total', $total );
@@ -663,9 +672,17 @@ class WC_API_Server {
 	 * @since 2.1
 	 * @param int|string $timestamp unix timestamp or MySQL datetime
 	 * @param bool $convert_to_utc
+	 * @param bool $convert_to_gmt Use GMT timezone.
 	 * @return string RFC3339 datetime
 	 */
-	public function format_datetime( $timestamp, $convert_to_utc = false ) {
+	public function format_datetime( $timestamp, $convert_to_utc = false, $convert_to_gmt = false ) {
+		if ( $convert_to_gmt ) {
+			if ( is_numeric( $timestamp ) ) {
+				$timestamp = date( 'Y-m-d H:i:s', $timestamp );
+			}
+
+			$timestamp = get_gmt_from_date( $timestamp );
+		}
 
 		if ( $convert_to_utc ) {
 			$timezone = new DateTimeZone( wc_timezone_string() );
@@ -685,7 +702,6 @@ class WC_API_Server {
 			if ( $convert_to_utc ) {
 				$date->modify( -1 * $date->getOffset() . ' seconds' );
 			}
-
 		} catch ( Exception $e ) {
 
 			$date = new DateTime( '@0' );
@@ -701,16 +717,15 @@ class WC_API_Server {
 	 * @param array $server Associative array similar to $_SERVER
 	 * @return array Headers extracted from the input
 	 */
-	public function get_headers($server) {
+	public function get_headers( $server ) {
 		$headers = array();
 		// CONTENT_* headers are not prefixed with HTTP_
-		$additional = array('CONTENT_LENGTH' => true, 'CONTENT_MD5' => true, 'CONTENT_TYPE' => true);
+		$additional = array( 'CONTENT_LENGTH' => true, 'CONTENT_MD5' => true, 'CONTENT_TYPE' => true );
 
-		foreach ($server as $key => $value) {
-			if ( strpos( $key, 'HTTP_' ) === 0) {
+		foreach ( $server as $key => $value ) {
+			if ( strpos( $key, 'HTTP_' ) === 0 ) {
 				$headers[ substr( $key, 5 ) ] = $value;
-			}
-			elseif ( isset( $additional[ $key ] ) ) {
+			} elseif ( isset( $additional[ $key ] ) ) {
 				$headers[ $key ] = $value;
 			}
 		}
@@ -728,12 +743,14 @@ class WC_API_Server {
 	private function is_json_request() {
 
 		// check path
-		if ( false !== stripos( $this->path, '.json' ) )
+		if ( false !== stripos( $this->path, '.json' ) ) {
 			return true;
+		}
 
 		// check ACCEPT header, only 'application/json' is acceptable, see RFC 4627
-		if ( isset( $this->headers['ACCEPT'] ) && 'application/json' == $this->headers['ACCEPT'] )
+		if ( isset( $this->headers['ACCEPT'] ) && 'application/json' == $this->headers['ACCEPT'] ) {
 			return true;
+		}
 
 		return false;
 	}
@@ -748,12 +765,14 @@ class WC_API_Server {
 	private function is_xml_request() {
 
 		// check path
-		if ( false !== stripos( $this->path, '.xml' ) )
+		if ( false !== stripos( $this->path, '.xml' ) ) {
 			return true;
+		}
 
 		// check headers, 'application/xml' or 'text/xml' are acceptable, see RFC 2376
-		if ( isset( $this->headers['ACCEPT'] ) && ( 'application/xml' == $this->headers['ACCEPT'] || 'text/xml' == $this->headers['ACCEPT'] ) )
+		if ( isset( $this->headers['ACCEPT'] ) && ( 'application/xml' == $this->headers['ACCEPT'] || 'text/xml' == $this->headers['ACCEPT'] ) ) {
 			return true;
+		}
 
 		return false;
 	}
diff --git a/includes/api/v1/class-wc-api-xml-handler.php b/includes/api/legacy/v1/class-wc-api-xml-handler.php
similarity index 99%
rename from includes/api/v1/class-wc-api-xml-handler.php
rename to includes/api/legacy/v1/class-wc-api-xml-handler.php
index 4cde9132fd3..04f47e669e4 100644
--- a/includes/api/v1/class-wc-api-xml-handler.php
+++ b/includes/api/legacy/v1/class-wc-api-xml-handler.php
@@ -70,7 +70,7 @@ class WC_API_XML_Handler implements WC_API_Handler {
 
 		$this->xml->openMemory();
 
-		$this->xml->setIndent(true);
+		$this->xml->setIndent( true );
 
 		$this->xml->startDocument( '1.0', 'UTF-8' );
 
@@ -154,7 +154,6 @@ class WC_API_XML_Handler implements WC_API_Handler {
 
 					$this->xml->endElement();
 				}
-
 			} else {
 
 				// start root element
@@ -168,7 +167,6 @@ class WC_API_XML_Handler implements WC_API_Handler {
 				// end root element
 				$this->xml->endElement();
 			}
-
 		} else {
 
 			// handle single elements
@@ -189,7 +187,6 @@ class WC_API_XML_Handler implements WC_API_Handler {
 
 					$this->xml->writeElement( $element_key, $element_value );
 				}
-
 			}
 
 			return;
@@ -255,7 +252,7 @@ class WC_API_XML_Handler implements WC_API_Handler {
 			'upsell_ids'     => 'upsell_id',
 			'cross_sell_ids' => 'cross_sell_id',
 			'categories'     => 'category',
-			'tags'           => 'tag'
+			'tags'           => 'tag',
 		);
 
 		foreach ( $fields_to_fix as $parent_field_name => $child_field_name ) {
@@ -308,5 +305,4 @@ class WC_API_XML_Handler implements WC_API_Handler {
 
 		return $data;
 	}
-
 }
diff --git a/includes/api/v1/interface-wc-api-handler.php b/includes/api/legacy/v1/interface-wc-api-handler.php
similarity index 100%
rename from includes/api/v1/interface-wc-api-handler.php
rename to includes/api/legacy/v1/interface-wc-api-handler.php
diff --git a/includes/api/v2/class-wc-api-authentication.php b/includes/api/legacy/v2/class-wc-api-authentication.php
similarity index 89%
rename from includes/api/v2/class-wc-api-authentication.php
rename to includes/api/legacy/v2/class-wc-api-authentication.php
index 69f56e9b6fd..69599ed4af0 100644
--- a/includes/api/v2/class-wc-api-authentication.php
+++ b/includes/api/legacy/v2/class-wc-api-authentication.php
@@ -90,7 +90,7 @@ class WC_API_Authentication {
 
 		} else {
 
-			throw new Exception( __( 'Consumer Key is missing', 'woocommerce' ), 404 );
+			throw new Exception( __( 'Consumer key is missing.', 'woocommerce' ), 404 );
 		}
 
 		// Get consumer secret
@@ -106,13 +106,13 @@ class WC_API_Authentication {
 
 		} else {
 
-			throw new Exception( __( 'Consumer Secret is missing', 'woocommerce' ), 404 );
+			throw new Exception( __( 'Consumer secret is missing.', 'woocommerce' ), 404 );
 		}
 
 		$keys = $this->get_keys_by_consumer_key( $consumer_key );
 
 		if ( ! $this->is_consumer_secret_valid( $keys['consumer_secret'], $consumer_secret ) ) {
-			throw new Exception( __( 'Consumer Secret is invalid', 'woocommerce' ), 401 );
+			throw new Exception( __( 'Consumer secret is invalid.', 'woocommerce' ), 401 );
 		}
 
 		return $keys;
@@ -139,7 +139,7 @@ class WC_API_Authentication {
 
 		$params = WC()->api->server->params['GET'];
 
-		$param_names =  array( 'oauth_consumer_key', 'oauth_timestamp', 'oauth_nonce', 'oauth_signature', 'oauth_signature_method' );
+		$param_names = array( 'oauth_consumer_key', 'oauth_timestamp', 'oauth_nonce', 'oauth_signature', 'oauth_signature_method' );
 
 		// Check for required OAuth parameters
 		foreach ( $param_names as $param_name ) {
@@ -180,7 +180,7 @@ class WC_API_Authentication {
 		", $consumer_key ), ARRAY_A );
 
 		if ( empty( $keys ) ) {
-			throw new Exception( __( 'Consumer Key is invalid', 'woocommerce' ), 401 );
+			throw new Exception( __( 'Consumer key is invalid.', 'woocommerce' ), 401 );
 		}
 
 		return $keys;
@@ -231,7 +231,7 @@ class WC_API_Authentication {
 		$base_request_uri = rawurlencode( untrailingslashit( get_woocommerce_api_url( '' ) ) . WC()->api->server->path );
 
 		// Get the signature provided by the consumer and remove it from the parameters prior to checking the signature
-		$consumer_signature = rawurldecode( $params['oauth_signature'] );
+		$consumer_signature = rawurldecode( str_replace( ' ', '+', $params['oauth_signature'] ) );
 		unset( $params['oauth_signature'] );
 
 		// Remove filters and convert them from array to strings to void normalize issues
@@ -239,7 +239,7 @@ class WC_API_Authentication {
 			$filters = $params['filter'];
 			unset( $params['filter'] );
 			foreach ( $filters as $filter => $filter_value ) {
-				$params['filter[' . $filter . ']'] = $filter_value;
+				$params[ 'filter[' . $filter . ']' ] = $filter_value;
 			}
 		}
 
@@ -248,7 +248,7 @@ class WC_API_Authentication {
 
 		// Sort parameters
 		if ( ! uksort( $params, 'strcmp' ) ) {
-			throw new Exception( __( 'Invalid Signature - failed to sort parameters', 'woocommerce' ), 401 );
+			throw new Exception( __( 'Invalid signature - failed to sort parameters.', 'woocommerce' ), 401 );
 		}
 
 		// Form query string
@@ -261,8 +261,8 @@ class WC_API_Authentication {
 
 		$string_to_sign = $http_method . '&' . $base_request_uri . '&' . $query_string;
 
-		if ( $params['oauth_signature_method'] !== 'HMAC-SHA1' && $params['oauth_signature_method'] !== 'HMAC-SHA256' ) {
-			throw new Exception( __( 'Invalid Signature - signature method is invalid', 'woocommerce' ), 401 );
+		if ( 'HMAC-SHA1' !== $params['oauth_signature_method'] && 'HMAC-SHA256' !== $params['oauth_signature_method'] ) {
+			throw new Exception( __( 'Invalid signature - signature method is invalid.', 'woocommerce' ), 401 );
 		}
 
 		$hash_algorithm = strtolower( str_replace( 'HMAC-', '', $params['oauth_signature_method'] ) );
@@ -270,7 +270,7 @@ class WC_API_Authentication {
 		$signature = base64_encode( hash_hmac( $hash_algorithm, $string_to_sign, $keys['consumer_secret'], true ) );
 
 		if ( ! hash_equals( $signature, $consumer_signature ) ) {
-			throw new Exception( __( 'Invalid Signature - provided signature does not match', 'woocommerce' ), 401 );
+			throw new Exception( __( 'Invalid signature - provided signature does not match.', 'woocommerce' ), 401 );
 		}
 	}
 
@@ -328,7 +328,7 @@ class WC_API_Authentication {
 		$valid_window = 15 * 60; // 15 minute window
 
 		if ( ( $timestamp < time() - $valid_window ) || ( $timestamp > time() + $valid_window ) ) {
-			throw new Exception( __( 'Invalid timestamp', 'woocommerce' ), 401 );
+			throw new Exception( __( 'Invalid timestamp.', 'woocommerce' ), 401 );
 		}
 
 		$used_nonces = maybe_unserialize( $keys['nonces'] );
@@ -338,7 +338,7 @@ class WC_API_Authentication {
 		}
 
 		if ( in_array( $nonce, $used_nonces ) ) {
-			throw new Exception( __( 'Invalid nonce - nonce has already been used', 'woocommerce' ), 401 );
+			throw new Exception( __( 'Invalid nonce - nonce has already been used.', 'woocommerce' ), 401 );
 		}
 
 		$used_nonces[ $timestamp ] = $nonce;
@@ -373,7 +373,7 @@ class WC_API_Authentication {
 			case 'HEAD':
 			case 'GET':
 				if ( 'read' !== $key_permissions && 'read_write' !== $key_permissions ) {
-					throw new Exception( __( 'The API key provided does not have read permissions', 'woocommerce' ), 401 );
+					throw new Exception( __( 'The API key provided does not have read permissions.', 'woocommerce' ), 401 );
 				}
 				break;
 
@@ -382,7 +382,7 @@ class WC_API_Authentication {
 			case 'PATCH':
 			case 'DELETE':
 				if ( 'write' !== $key_permissions && 'read_write' !== $key_permissions ) {
-					throw new Exception( __( 'The API key provided does not have write permissions', 'woocommerce' ), 401 );
+					throw new Exception( __( 'The API key provided does not have write permissions.', 'woocommerce' ), 401 );
 				}
 				break;
 		}
diff --git a/includes/api/class-wc-api-coupons.php b/includes/api/legacy/v2/class-wc-api-coupons.php
similarity index 85%
rename from includes/api/class-wc-api-coupons.php
rename to includes/api/legacy/v2/class-wc-api-coupons.php
index 43f71b6d37c..d4e4877ebee 100644
--- a/includes/api/class-wc-api-coupons.php
+++ b/includes/api/legacy/v2/class-wc-api-coupons.php
@@ -39,7 +39,7 @@ class WC_API_Coupons extends WC_API_Resource {
 		);
 
 		# GET /coupons/count
-		$routes[ $this->base . '/count'] = array(
+		$routes[ $this->base . '/count' ] = array(
 			array( array( $this, 'get_coupons_count' ), WC_API_Server::READABLE ),
 		);
 
@@ -103,8 +103,6 @@ class WC_API_Coupons extends WC_API_Resource {
 	 * @return array|WP_Error
 	 */
 	public function get_coupon( $id, $fields = null ) {
-		global $wpdb;
-
 		try {
 
 			$id = $this->validate_request( $id, 'shop_coupon', 'read' );
@@ -113,38 +111,35 @@ class WC_API_Coupons extends WC_API_Resource {
 				return $id;
 			}
 
-			// get the coupon code
-			$code = $wpdb->get_var( $wpdb->prepare( "SELECT post_title FROM $wpdb->posts WHERE id = %s AND post_type = 'shop_coupon' AND post_status = 'publish'", $id ) );
+			$coupon = new WC_Coupon( $id );
 
-			if ( is_null( $code ) ) {
+			if ( 0 === $coupon->get_id() ) {
 				throw new WC_API_Exception( 'woocommerce_api_invalid_coupon_id', __( 'Invalid coupon ID', 'woocommerce' ), 404 );
 			}
 
-			$coupon      = new WC_Coupon( $code );
-			$coupon_post = get_post( $coupon->id );
 			$coupon_data = array(
-				'id'                           => $coupon->id,
-				'code'                         => $coupon->code,
-				'type'                         => $coupon->type,
-				'created_at'                   => $this->server->format_datetime( $coupon_post->post_date_gmt ),
-				'updated_at'                   => $this->server->format_datetime( $coupon_post->post_modified_gmt ),
-				'amount'                       => wc_format_decimal( $coupon->coupon_amount, 2 ),
-				'individual_use'               => ( 'yes' === $coupon->individual_use ),
-				'product_ids'                  => array_map( 'absint', (array) $coupon->product_ids ),
-				'exclude_product_ids'          => array_map( 'absint', (array) $coupon->exclude_product_ids ),
-				'usage_limit'                  => ( ! empty( $coupon->usage_limit ) ) ? $coupon->usage_limit : null,
-				'usage_limit_per_user'         => ( ! empty( $coupon->usage_limit_per_user ) ) ? $coupon->usage_limit_per_user : null,
-				'limit_usage_to_x_items'       => (int) $coupon->limit_usage_to_x_items,
-				'usage_count'                  => (int) $coupon->usage_count,
-				'expiry_date'                  => ( ! empty( $coupon->expiry_date ) ) ? $this->server->format_datetime( $coupon->expiry_date ) : null,
-				'enable_free_shipping'         => $coupon->enable_free_shipping(),
-				'product_category_ids'         => array_map( 'absint', (array) $coupon->product_categories ),
-				'exclude_product_category_ids' => array_map( 'absint', (array) $coupon->exclude_product_categories ),
-				'exclude_sale_items'           => $coupon->exclude_sale_items(),
-				'minimum_amount'               => wc_format_decimal( $coupon->minimum_amount, 2 ),
-				'maximum_amount'               => wc_format_decimal( $coupon->maximum_amount, 2 ),
-				'customer_emails'              => $coupon->customer_email,
-				'description'                  => $coupon_post->post_excerpt,
+				'id'                           => $coupon->get_id(),
+				'code'                         => $coupon->get_code(),
+				'type'                         => $coupon->get_discount_type(),
+				'created_at'                   => $this->server->format_datetime( $coupon->get_date_created() ? $coupon->get_date_created()->getTimestamp() : 0 ), // API gives UTC times.
+				'updated_at'                   => $this->server->format_datetime( $coupon->get_date_modified() ? $coupon->get_date_modified()->getTimestamp() : 0 ), // API gives UTC times.
+				'amount'                       => wc_format_decimal( $coupon->get_amount(), 2 ),
+				'individual_use'               => $coupon->get_individual_use(),
+				'product_ids'                  => array_map( 'absint', (array) $coupon->get_product_ids() ),
+				'exclude_product_ids'          => array_map( 'absint', (array) $coupon->get_excluded_product_ids() ),
+				'usage_limit'                  => $coupon->get_usage_limit() ? $coupon->get_usage_limit() : null,
+				'usage_limit_per_user'         => $coupon->get_usage_limit_per_user() ? $coupon->get_usage_limit_per_user() : null,
+				'limit_usage_to_x_items'       => (int) $coupon->get_limit_usage_to_x_items(),
+				'usage_count'                  => (int) $coupon->get_usage_count(),
+				'expiry_date'                  => $coupon->get_date_expires() ? $this->server->format_datetime( $coupon->get_date_expires()->getTimestamp() ) : null, // API gives UTC times.
+				'enable_free_shipping'         => $coupon->get_free_shipping(),
+				'product_category_ids'         => array_map( 'absint', (array) $coupon->get_product_categories() ),
+				'exclude_product_category_ids' => array_map( 'absint', (array) $coupon->get_excluded_product_categories() ),
+				'exclude_sale_items'           => $coupon->get_exclude_sale_items(),
+				'minimum_amount'               => wc_format_decimal( $coupon->get_minimum_amount(), 2 ),
+				'maximum_amount'               => wc_format_decimal( $coupon->get_maximum_amount(), 2 ),
+				'customer_emails'              => $coupon->get_email_restrictions(),
+				'description'                  => $coupon->get_description(),
 			);
 
 			return array( 'coupon' => apply_filters( 'woocommerce_api_coupon_response', $coupon_data, $coupon, $fields, $this->server ) );
@@ -186,7 +181,7 @@ class WC_API_Coupons extends WC_API_Resource {
 		global $wpdb;
 
 		try {
-			$id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->posts WHERE post_title = %s AND post_type = 'shop_coupon' AND post_status = 'publish'", $code ) );
+			$id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->posts WHERE post_title = %s AND post_type = 'shop_coupon' AND post_status = 'publish' ORDER BY post_date DESC LIMIT 1;", $code ) );
 
 			if ( is_null( $id ) ) {
 				throw new WC_API_Exception( 'woocommerce_api_invalid_coupon_code', __( 'Invalid coupon code', 'woocommerce' ), 404 );
@@ -227,18 +222,10 @@ class WC_API_Coupons extends WC_API_Resource {
 				throw new WC_API_Exception( 'woocommerce_api_missing_coupon_code', sprintf( __( 'Missing parameter %s', 'woocommerce' ), 'code' ), 400 );
 			}
 
-			$coupon_code = apply_filters( 'woocommerce_coupon_code', $data['code'] );
+			$coupon_code  = wc_format_coupon_code( $data['code'] );
+			$id_from_code = wc_get_coupon_id_by_code( $coupon_code );
 
-			// Check for duplicate coupon codes
-			$coupon_found = $wpdb->get_var( $wpdb->prepare( "
-				SELECT $wpdb->posts.ID
-				FROM $wpdb->posts
-				WHERE $wpdb->posts.post_type = 'shop_coupon'
-				AND $wpdb->posts.post_status = 'publish'
-				AND $wpdb->posts.post_title = '%s'
-			 ", $coupon_code ) );
-
-			if ( $coupon_found ) {
+			if ( $id_from_code ) {
 				throw new WC_API_Exception( 'woocommerce_api_coupon_code_already_exists', __( 'The coupon code already exists', 'woocommerce' ), 400 );
 			}
 
@@ -260,7 +247,7 @@ class WC_API_Coupons extends WC_API_Resource {
 				'minimum_amount'               => '',
 				'maximum_amount'               => '',
 				'customer_emails'              => array(),
-				'description'                  => ''
+				'description'                  => '',
 			);
 
 			$coupon_data = wp_parse_args( $data, $defaults );
@@ -276,10 +263,10 @@ class WC_API_Coupons extends WC_API_Resource {
 				'post_status'  => 'publish',
 				'post_author'  => get_current_user_id(),
 				'post_type'    => 'shop_coupon',
-				'post_excerpt' => $coupon_data['description']
+				'post_excerpt' => $coupon_data['description'],
 	 		);
 
-			$id = wp_insert_post( $new_coupon, $wp_error = false );
+			$id = wp_insert_post( $new_coupon, true );
 
 			if ( is_wp_error( $id ) ) {
 				throw new WC_API_Exception( 'woocommerce_api_cannot_create_coupon', $id->get_error_message(), 400 );
@@ -296,6 +283,7 @@ class WC_API_Coupons extends WC_API_Resource {
 			update_post_meta( $id, 'limit_usage_to_x_items', absint( $coupon_data['limit_usage_to_x_items'] ) );
 			update_post_meta( $id, 'usage_count', absint( $coupon_data['usage_count'] ) );
 			update_post_meta( $id, 'expiry_date', $this->get_coupon_expiry_date( wc_clean( $coupon_data['expiry_date'] ) ) );
+			update_post_meta( $id, 'date_expires', $this->get_coupon_expiry_date( wc_clean( $coupon_data['expiry_date'] ), true ) );
 			update_post_meta( $id, 'free_shipping', ( true === $coupon_data['enable_free_shipping'] ) ? 'yes' : 'no' );
 			update_post_meta( $id, 'product_categories', array_filter( array_map( 'intval', $coupon_data['product_category_ids'] ) ) );
 			update_post_meta( $id, 'exclude_product_categories', array_filter( array_map( 'intval', $coupon_data['exclude_product_category_ids'] ) ) );
@@ -342,19 +330,10 @@ class WC_API_Coupons extends WC_API_Resource {
 			if ( isset( $data['code'] ) ) {
 				global $wpdb;
 
-				$coupon_code = apply_filters( 'woocommerce_coupon_code', $data['code'] );
+				$coupon_code  = wc_format_coupon_code( $data['code'] );
+				$id_from_code = wc_get_coupon_id_by_code( $coupon_code, $id );
 
-				// Check for duplicate coupon codes
-				$coupon_found = $wpdb->get_var( $wpdb->prepare( "
-					SELECT $wpdb->posts.ID
-					FROM $wpdb->posts
-					WHERE $wpdb->posts.post_type = 'shop_coupon'
-					AND $wpdb->posts.post_status = 'publish'
-					AND $wpdb->posts.post_title = '%s'
-					AND $wpdb->posts.ID != %s
-				 ", $coupon_code, $id ) );
-
-				if ( $coupon_found ) {
+				if ( $id_from_code ) {
 					throw new WC_API_Exception( 'woocommerce_api_coupon_code_already_exists', __( 'The coupon code already exists', 'woocommerce' ), 400 );
 				}
 
@@ -415,6 +394,7 @@ class WC_API_Coupons extends WC_API_Resource {
 
 			if ( isset( $data['expiry_date'] ) ) {
 				update_post_meta( $id, 'expiry_date', $this->get_coupon_expiry_date( wc_clean( $data['expiry_date'] ) ) );
+				update_post_meta( $id, 'date_expires', $this->get_coupon_expiry_date( wc_clean( $data['expiry_date'] ), true ) );
 			}
 
 			if ( isset( $data['enable_free_shipping'] ) ) {
@@ -479,10 +459,15 @@ class WC_API_Coupons extends WC_API_Resource {
 	 *
 	 * @since  2.3.0
 	 * @param  string $expiry_date
-	 * @return string
+	 * @param bool $as_timestamp (default: false)
+	 * @return string|int
 	 */
-	protected function get_coupon_expiry_date( $expiry_date ) {
+	protected function get_coupon_expiry_date( $expiry_date, $as_timestamp = false ) {
 		if ( '' != $expiry_date ) {
+			if ( $as_timestamp ) {
+				return strtotime( $expiry_date );
+			}
+
 			return date( 'Y-m-d', strtotime( $expiry_date ) );
 		}
 
@@ -531,7 +516,7 @@ class WC_API_Coupons extends WC_API_Resource {
 
 			// Limit bulk operation
 			if ( count( $data ) > $limit ) {
-				throw new WC_API_Exception( 'woocommerce_api_coupons_request_entity_too_large', sprintf( __( 'Unable to accept more than %s items for this request', 'woocommerce' ), $limit ), 413 );
+				throw new WC_API_Exception( 'woocommerce_api_coupons_request_entity_too_large', sprintf( __( 'Unable to accept more than %s items for this request.', 'woocommerce' ), $limit ), 413 );
 			}
 
 			$coupons = array();
@@ -551,21 +536,20 @@ class WC_API_Coupons extends WC_API_Resource {
 					if ( is_wp_error( $edit ) ) {
 						$coupons[] = array(
 							'id'    => $coupon_id,
-							'error' => array( 'code' => $edit->get_error_code(), 'message' => $edit->get_error_message() )
+							'error' => array( 'code' => $edit->get_error_code(), 'message' => $edit->get_error_message() ),
 						);
 					} else {
 						$coupons[] = $edit['coupon'];
 					}
-				}
+				} else {
 
-				// Coupon don't exists / create coupon
-				else {
+					// Coupon don't exists / create coupon
 					$new = $this->create_coupon( array( 'coupon' => $_coupon ) );
 
 					if ( is_wp_error( $new ) ) {
 						$coupons[] = array(
 							'id'    => $coupon_id,
-							'error' => array( 'code' => $new->get_error_code(), 'message' => $new->get_error_message() )
+							'error' => array( 'code' => $new->get_error_code(), 'message' => $new->get_error_message() ),
 						);
 					} else {
 						$coupons[] = $new['coupon'];
diff --git a/includes/api/v2/class-wc-api-customers.php b/includes/api/legacy/v2/class-wc-api-customers.php
similarity index 73%
rename from includes/api/v2/class-wc-api-customers.php
rename to includes/api/legacy/v2/class-wc-api-customers.php
index 16d083cbb58..3756c1428ce 100644
--- a/includes/api/v2/class-wc-api-customers.php
+++ b/includes/api/legacy/v2/class-wc-api-customers.php
@@ -64,7 +64,7 @@ class WC_API_Customers extends WC_API_Resource {
 		);
 
 		# GET /customers/count
-		$routes[ $this->base . '/count'] = array(
+		$routes[ $this->base . '/count' ] = array(
 			array( array( $this, 'get_customers_count' ), WC_API_SERVER::READABLE ),
 		);
 
@@ -146,55 +146,44 @@ class WC_API_Customers extends WC_API_Resource {
 			return $id;
 		}
 
-		$customer = new WP_User( $id );
-
-		// Get info about user's last order
-		$last_order = $wpdb->get_row( "SELECT id, post_date_gmt
-						FROM $wpdb->posts AS posts
-						LEFT JOIN {$wpdb->postmeta} AS meta on posts.ID = meta.post_id
-						WHERE meta.meta_key = '_customer_user'
-						AND   meta.meta_value = {$customer->ID}
-						AND   posts.post_type = 'shop_order'
-						AND   posts.post_status IN ( '" . implode( "','", array_keys( wc_get_order_statuses() ) ) . "' )
-						ORDER BY posts.ID DESC
-					" );
-
+		$customer      = new WC_Customer( $id );
+		$last_order    = $customer->get_last_order();
 		$customer_data = array(
-			'id'               => $customer->ID,
-			'created_at'       => $this->server->format_datetime( $customer->user_registered ),
-			'email'            => $customer->user_email,
-			'first_name'       => $customer->first_name,
-			'last_name'        => $customer->last_name,
-			'username'         => $customer->user_login,
-			'role'             => $customer->roles[0],
-			'last_order_id'    => is_object( $last_order ) ? $last_order->id : null,
-			'last_order_date'  => is_object( $last_order ) ? $this->server->format_datetime( $last_order->post_date_gmt ) : null,
-			'orders_count'     => wc_get_customer_order_count( $customer->ID ),
-			'total_spent'      => wc_format_decimal( wc_get_customer_total_spent( $customer->ID ), 2 ),
-			'avatar_url'       => $this->get_avatar_url( $customer->customer_email ),
+			'id'               => $customer->get_id(),
+			'created_at'       => $this->server->format_datetime( $customer->get_date_created() ? $customer->get_date_created()->getTimestamp() : 0 ), // API gives UTC times.
+			'email'            => $customer->get_email(),
+			'first_name'       => $customer->get_first_name(),
+			'last_name'        => $customer->get_last_name(),
+			'username'         => $customer->get_username(),
+			'role'             => $customer->get_role(),
+			'last_order_id'    => is_object( $last_order ) ? $last_order->get_id() : null,
+			'last_order_date'  => is_object( $last_order ) ? $this->server->format_datetime( $last_order->get_date_created() ? $last_order->get_date_created()->getTimestamp() : 0 ) : null, // API gives UTC times.
+			'orders_count'     => $customer->get_order_count(),
+			'total_spent'      => wc_format_decimal( $customer->get_total_spent(), 2 ),
+			'avatar_url'       => $customer->get_avatar_url(),
 			'billing_address'  => array(
-				'first_name' => $customer->billing_first_name,
-				'last_name'  => $customer->billing_last_name,
-				'company'    => $customer->billing_company,
-				'address_1'  => $customer->billing_address_1,
-				'address_2'  => $customer->billing_address_2,
-				'city'       => $customer->billing_city,
-				'state'      => $customer->billing_state,
-				'postcode'   => $customer->billing_postcode,
-				'country'    => $customer->billing_country,
-				'email'      => $customer->billing_email,
-				'phone'      => $customer->billing_phone,
+				'first_name' => $customer->get_billing_first_name(),
+				'last_name'  => $customer->get_billing_last_name(),
+				'company'    => $customer->get_billing_company(),
+				'address_1'  => $customer->get_billing_address_1(),
+				'address_2'  => $customer->get_billing_address_2(),
+				'city'       => $customer->get_billing_city(),
+				'state'      => $customer->get_billing_state(),
+				'postcode'   => $customer->get_billing_postcode(),
+				'country'    => $customer->get_billing_country(),
+				'email'      => $customer->get_billing_email(),
+				'phone'      => $customer->get_billing_phone(),
 			),
 			'shipping_address' => array(
-				'first_name' => $customer->shipping_first_name,
-				'last_name'  => $customer->shipping_last_name,
-				'company'    => $customer->shipping_company,
-				'address_1'  => $customer->shipping_address_1,
-				'address_2'  => $customer->shipping_address_2,
-				'city'       => $customer->shipping_city,
-				'state'      => $customer->shipping_state,
-				'postcode'   => $customer->shipping_postcode,
-				'country'    => $customer->shipping_country,
+				'first_name' => $customer->get_shipping_first_name(),
+				'last_name'  => $customer->get_shipping_last_name(),
+				'company'    => $customer->get_shipping_company(),
+				'address_1'  => $customer->get_shipping_address_1(),
+				'address_2'  => $customer->get_shipping_address_2(),
+				'city'       => $customer->get_shipping_city(),
+				'state'      => $customer->get_shipping_state(),
+				'postcode'   => $customer->get_shipping_postcode(),
+				'country'    => $customer->get_shipping_country(),
 			),
 		);
 
@@ -214,10 +203,10 @@ class WC_API_Customers extends WC_API_Resource {
 			if ( is_email( $email ) ) {
 				$customer = get_user_by( 'email', $email );
 				if ( ! is_object( $customer ) ) {
-					throw new WC_API_Exception( 'woocommerce_api_invalid_customer_email', __( 'Invalid customer Email', 'woocommerce' ), 404 );
+					throw new WC_API_Exception( 'woocommerce_api_invalid_customer_email', __( 'Invalid customer email', 'woocommerce' ), 404 );
 				}
 			} else {
-				throw new WC_API_Exception( 'woocommerce_api_invalid_customer_email', __( 'Invalid customer Email', 'woocommerce' ), 404 );
+				throw new WC_API_Exception( 'woocommerce_api_invalid_customer_email', __( 'Invalid customer email', 'woocommerce' ), 404 );
 			}
 
 			return $this->get_customer( $customer->ID, $fields );
@@ -299,37 +288,47 @@ class WC_API_Customers extends WC_API_Resource {
 	 * @since 2.2
 	 * @param int $id the customer ID
 	 * @param array $data
+	 * @param WC_Customer $customer
 	 */
-	protected function update_customer_data( $id, $data ) {
+	protected function update_customer_data( $id, $data, $customer ) {
+
 		// Customer first name.
 		if ( isset( $data['first_name'] ) ) {
-			update_user_meta( $id, 'first_name', wc_clean( $data['first_name'] ) );
+			$customer->set_first_name( wc_clean( $data['first_name'] ) );
 		}
 
 		// Customer last name.
 		if ( isset( $data['last_name'] ) ) {
-			update_user_meta( $id, 'last_name', wc_clean( $data['last_name'] ) );
+			$customer->set_last_name( wc_clean( $data['last_name'] ) );
 		}
 
 		// Customer billing address.
 		if ( isset( $data['billing_address'] ) ) {
-			foreach ( $this->get_customer_billing_address() as $address ) {
-				if ( isset( $data['billing_address'][ $address ] ) ) {
-					update_user_meta( $id, 'billing_' . $address, wc_clean( $data['billing_address'][ $address ] ) );
+			foreach ( $this->get_customer_billing_address() as $field ) {
+				if ( isset( $data['billing_address'][ $field ] ) ) {
+					if ( is_callable( array( $customer, "set_billing_{$field}" ) ) ) {
+						$customer->{"set_billing_{$field}"}( $data['billing_address'][ $field ] );
+					} else {
+						$customer->update_meta_data( 'billing_' . $field, wc_clean( $data['billing_address'][ $field ] ) );
+					}
 				}
 			}
 		}
 
 		// Customer shipping address.
 		if ( isset( $data['shipping_address'] ) ) {
-			foreach ( $this->get_customer_shipping_address() as $address ) {
-				if ( isset( $data['shipping_address'][ $address ] ) ) {
-					update_user_meta( $id, 'shipping_' . $address, wc_clean( $data['shipping_address'][ $address ] ) );
+			foreach ( $this->get_customer_shipping_address() as $field ) {
+				if ( isset( $data['shipping_address'][ $field ] ) ) {
+					if ( is_callable( array( $customer, "set_shipping_{$field}" ) ) ) {
+						$customer->{"set_shipping_{$field}"}( $data['shipping_address'][ $field ] );
+					} else {
+						$customer->update_meta_data( 'shipping_' . $field, wc_clean( $data['shipping_address'][ $field ] ) );
+					}
 				}
 			}
 		}
 
-		do_action( 'woocommerce_api_update_customer_data', $id, $data );
+		do_action( 'woocommerce_api_update_customer_data', $id, $data, $customer );
 	}
 
 	/**
@@ -359,29 +358,27 @@ class WC_API_Customers extends WC_API_Resource {
 				throw new WC_API_Exception( 'woocommerce_api_missing_customer_email', sprintf( __( 'Missing parameter %s', 'woocommerce' ), 'email' ), 400 );
 			}
 
-			// Sets the username.
-			$data['username'] = ! empty( $data['username'] ) ? $data['username'] : '';
+			// Create customer.
+			$customer = new WC_Customer;
+			$customer->set_username( ! empty( $data['username'] ) ? $data['username'] : '' );
+			$customer->set_password( ! empty( $data['password'] ) ? $data['password'] : '' );
+			$customer->set_email( $data['email'] );
+			$customer->save();
 
-			// Sets the password.
-			$data['password'] = ! empty( $data['password'] ) ? $data['password'] : '';
-
-			// Attempts to create the new customer
-			$id = wc_create_new_customer( $data['email'], $data['username'], $data['password'] );
-
-			// Checks for an error in the customer creation.
-			if ( is_wp_error( $id ) ) {
-				throw new WC_API_Exception( $id->get_error_code(), $id->get_error_message(), 400 );
+			if ( ! $customer->get_id() ) {
+				throw new WC_API_Exception( 'woocommerce_api_user_cannot_create_customer', __( 'This resource cannot be created.', 'woocommerce' ), 400 );
 			}
 
 			// Added customer data.
-			$this->update_customer_data( $id, $data );
+			$this->update_customer_data( $customer->get_id(), $data, $customer );
+			$customer->save();
 
-			do_action( 'woocommerce_api_create_customer', $id, $data );
+			do_action( 'woocommerce_api_create_customer', $customer->get_id(), $data );
 
 			$this->server->send_status( 201 );
 
-			return $this->get_customer( $id );
-		} catch ( WC_API_Exception $e ) {
+			return $this->get_customer( $customer->get_id() );
+		} catch ( Exception $e ) {
 			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
 		}
 	}
@@ -412,23 +409,27 @@ class WC_API_Customers extends WC_API_Resource {
 
 			$data = apply_filters( 'woocommerce_api_edit_customer_data', $data, $this );
 
+			$customer = new WC_Customer( $id );
+
 			// Customer email.
 			if ( isset( $data['email'] ) ) {
-				wp_update_user( array( 'ID' => $id, 'user_email' => sanitize_email( $data['email'] ) ) );
+				$customer->set_email( $data['email'] );
 			}
 
 			// Customer password.
 			if ( isset( $data['password'] ) ) {
-				wp_update_user( array( 'ID' => $id, 'user_pass' => wc_clean( $data['password'] ) ) );
+				$customer->set_password( $data['password'] );
 			}
 
 			// Update customer data.
-			$this->update_customer_data( $id, $data );
+			$this->update_customer_data( $customer->get_id(), $data, $customer );
 
-			do_action( 'woocommerce_api_edit_customer', $id, $data );
+			$customer->save();
 
-			return $this->get_customer( $id );
-		} catch ( WC_API_Exception $e ) {
+			do_action( 'woocommerce_api_edit_customer', $customer->get_id(), $data );
+
+			return $this->get_customer( $customer->get_id() );
+		} catch ( Exception $e ) {
 			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
 		}
 	}
@@ -472,14 +473,13 @@ class WC_API_Customers extends WC_API_Resource {
 			return $id;
 		}
 
-		$order_ids = $wpdb->get_col( $wpdb->prepare( "SELECT id
-						FROM $wpdb->posts AS posts
-						LEFT JOIN {$wpdb->postmeta} AS meta on posts.ID = meta.post_id
-						WHERE meta.meta_key = '_customer_user'
-						AND   meta.meta_value = '%s'
-						AND   posts.post_type = 'shop_order'
-						AND   posts.post_status IN ( '" . implode( "','", array_keys( wc_get_order_statuses() ) ) . "' )
-					", $id ) );
+		$order_ids = wc_get_orders( array(
+			'customer' => $id,
+			'limit'    => -1,
+			'orderby'  => 'date',
+			'order'    => 'ASC',
+			'return'   => 'ids',
+		) );
 
 		if ( empty( $order_ids ) ) {
 			return array( 'orders' => array() );
@@ -513,8 +513,17 @@ class WC_API_Customers extends WC_API_Resource {
 		$_downloads = wc_get_customer_available_downloads( $id );
 
 		foreach ( $_downloads as $key => $download ) {
-			$downloads[ $key ] = $download;
-			$downloads[ $key ]['access_expires'] = $this->server->format_datetime( $downloads[ $key ]['access_expires'] );
+			$downloads[] = array(
+				'download_url'        => $download['download_url'],
+				'download_id'         => $download['download_id'],
+				'product_id'          => $download['product_id'],
+				'download_name'       => $download['download_name'],
+				'order_id'            => $download['order_id'],
+				'order_key'           => $download['order_key'],
+				'downloads_remaining' => $download['downloads_remaining'],
+				'access_expires'      => $download['access_expires'] ? $this->server->format_datetime( $download['access_expires'] ) : null,
+				'file'                => $download['file'],
+			);
 		}
 
 		return array( 'downloads' => apply_filters( 'woocommerce_api_customer_downloads_response', $downloads, $id, $fields, $this->server ) );
@@ -557,7 +566,7 @@ class WC_API_Customers extends WC_API_Resource {
 
 		// Limit number of users returned
 		if ( ! empty( $args['limit'] ) ) {
-			if ( $args['limit'] == -1 ) {
+			if ( -1 == $args['limit'] ) {
 				unset( $query_args['number'] );
 			} else {
 				$query_args['number'] = absint( $args['limit'] );
@@ -604,7 +613,7 @@ class WC_API_Customers extends WC_API_Resource {
 		$query = new WP_User_Query( $query_args );
 
 		// Helper members for pagination headers
-		$query->total_pages = ( $args['limit'] == -1 ) ? 1 : ceil( $query->get_total() / $users_per_page );
+		$query->total_pages = ( -1 == $args['limit'] ) ? 1 : ceil( $query->get_total() / $users_per_page );
 		$query->page = $page;
 
 		return $query;
@@ -620,43 +629,43 @@ class WC_API_Customers extends WC_API_Resource {
 	 */
 	public function add_customer_data( $order_data, $order ) {
 
-		if ( 0 == $order->customer_user ) {
+		if ( 0 == $order->get_user_id() ) {
 
 			// add customer data from order
 			$order_data['customer'] = array(
 				'id'               => 0,
-				'email'            => $order->billing_email,
-				'first_name'       => $order->billing_first_name,
-				'last_name'        => $order->billing_last_name,
+				'email'            => $order->get_billing_email(),
+				'first_name'       => $order->get_billing_first_name(),
+				'last_name'        => $order->get_billing_last_name(),
 				'billing_address'  => array(
-					'first_name' => $order->billing_first_name,
-					'last_name'  => $order->billing_last_name,
-					'company'    => $order->billing_company,
-					'address_1'  => $order->billing_address_1,
-					'address_2'  => $order->billing_address_2,
-					'city'       => $order->billing_city,
-					'state'      => $order->billing_state,
-					'postcode'   => $order->billing_postcode,
-					'country'    => $order->billing_country,
-					'email'      => $order->billing_email,
-					'phone'      => $order->billing_phone,
+					'first_name' => $order->get_billing_first_name(),
+					'last_name'  => $order->get_billing_last_name(),
+					'company'    => $order->get_billing_company(),
+					'address_1'  => $order->get_billing_address_1(),
+					'address_2'  => $order->get_billing_address_2(),
+					'city'       => $order->get_billing_city(),
+					'state'      => $order->get_billing_state(),
+					'postcode'   => $order->get_billing_postcode(),
+					'country'    => $order->get_billing_country(),
+					'email'      => $order->get_billing_email(),
+					'phone'      => $order->get_billing_phone(),
 				),
 				'shipping_address' => array(
-					'first_name' => $order->shipping_first_name,
-					'last_name'  => $order->shipping_last_name,
-					'company'    => $order->shipping_company,
-					'address_1'  => $order->shipping_address_1,
-					'address_2'  => $order->shipping_address_2,
-					'city'       => $order->shipping_city,
-					'state'      => $order->shipping_state,
-					'postcode'   => $order->shipping_postcode,
-					'country'    => $order->shipping_country,
+					'first_name' => $order->get_shipping_first_name(),
+					'last_name'  => $order->get_shipping_last_name(),
+					'company'    => $order->get_shipping_company(),
+					'address_1'  => $order->get_shipping_address_1(),
+					'address_2'  => $order->get_shipping_address_2(),
+					'city'       => $order->get_shipping_city(),
+					'state'      => $order->get_shipping_state(),
+					'postcode'   => $order->get_shipping_postcode(),
+					'country'    => $order->get_shipping_country(),
 				),
 			);
 
 		} else {
 
-			$order_data['customer'] = current( $this->get_customer( $order->customer_user ) );
+			$order_data['customer'] = current( $this->get_customer( $order->get_user_id() ) );
 		}
 
 		return $order_data;
@@ -679,29 +688,6 @@ class WC_API_Customers extends WC_API_Resource {
 		}
 	}
 
-	/**
-	 * Wrapper for @see get_avatar() which doesn't simply return
-	 * the URL so we need to pluck it from the HTML img tag
-	 *
-	 * Kudos to https://github.com/WP-API/WP-API for offering a better solution
-	 *
-	 * @since 2.1
-	 * @param string $email the customer's email
-	 * @return string the URL to the customer's avatar
-	 */
-	private function get_avatar_url( $email ) {
-		$avatar_html = get_avatar( $email );
-
-		// Get the URL of the avatar from the provided HTML
-		preg_match( '/src=["|\'](.+)[\&|"|\']/U', $avatar_html, $matches );
-
-		if ( isset( $matches[1] ) && ! empty( $matches[1] ) ) {
-			return esc_url_raw( $matches[1] );
-		}
-
-		return null;
-	}
-
 	/**
 	 * Validate the request by checking:
 	 *
@@ -794,7 +780,7 @@ class WC_API_Customers extends WC_API_Resource {
 
 			// Limit bulk operation
 			if ( count( $data ) > $limit ) {
-				throw new WC_API_Exception( 'woocommerce_api_customers_request_entity_too_large', sprintf( __( 'Unable to accept more than %s items for this request', 'woocommerce' ), $limit ), 413 );
+				throw new WC_API_Exception( 'woocommerce_api_customers_request_entity_too_large', sprintf( __( 'Unable to accept more than %s items for this request.', 'woocommerce' ), $limit ), 413 );
 			}
 
 			$customers = array();
@@ -814,21 +800,19 @@ class WC_API_Customers extends WC_API_Resource {
 					if ( is_wp_error( $edit ) ) {
 						$customers[] = array(
 							'id'    => $customer_id,
-							'error' => array( 'code' => $edit->get_error_code(), 'message' => $edit->get_error_message() )
+							'error' => array( 'code' => $edit->get_error_code(), 'message' => $edit->get_error_message() ),
 						);
 					} else {
 						$customers[] = $edit['customer'];
 					}
-				}
-
-				// Customer don't exists / create customer
-				else {
+				} else {
+					// Customer don't exists / create customer
 					$new = $this->create_customer( array( 'customer' => $_customer ) );
 
 					if ( is_wp_error( $new ) ) {
 						$customers[] = array(
 							'id'    => $customer_id,
-							'error' => array( 'code' => $new->get_error_code(), 'message' => $new->get_error_message() )
+							'error' => array( 'code' => $new->get_error_code(), 'message' => $new->get_error_message() ),
 						);
 					} else {
 						$customers[] = $new['customer'];
diff --git a/includes/api/class-wc-api-exception.php b/includes/api/legacy/v2/class-wc-api-exception.php
similarity index 100%
rename from includes/api/class-wc-api-exception.php
rename to includes/api/legacy/v2/class-wc-api-exception.php
diff --git a/includes/api/class-wc-api-json-handler.php b/includes/api/legacy/v2/class-wc-api-json-handler.php
similarity index 99%
rename from includes/api/class-wc-api-json-handler.php
rename to includes/api/legacy/v2/class-wc-api-json-handler.php
index bef3f1e82b4..e19ac15d371 100644
--- a/includes/api/class-wc-api-json-handler.php
+++ b/includes/api/legacy/v2/class-wc-api-json-handler.php
@@ -75,5 +75,4 @@ class WC_API_JSON_Handler implements WC_API_Handler {
 
 		return json_encode( $data );
 	}
-
 }
diff --git a/includes/api/v2/class-wc-api-orders.php b/includes/api/legacy/v2/class-wc-api-orders.php
similarity index 78%
rename from includes/api/v2/class-wc-api-orders.php
rename to includes/api/legacy/v2/class-wc-api-orders.php
index bf8ef97fbb8..4297d5ecf46 100644
--- a/includes/api/v2/class-wc-api-orders.php
+++ b/includes/api/legacy/v2/class-wc-api-orders.php
@@ -151,57 +151,55 @@ class WC_API_Orders extends WC_API_Resource {
 		// Get the decimal precession
 		$dp         = ( isset( $filter['dp'] ) ? intval( $filter['dp'] ) : 2 );
 		$order      = wc_get_order( $id );
-		$order_post = get_post( $id );
-
 		$order_data = array(
-			'id'                        => $order->id,
+			'id'                        => $order->get_id(),
 			'order_number'              => $order->get_order_number(),
-			'created_at'                => $this->server->format_datetime( $order_post->post_date_gmt ),
-			'updated_at'                => $this->server->format_datetime( $order_post->post_modified_gmt ),
-			'completed_at'              => $this->server->format_datetime( $order->completed_date, true ),
+			'created_at'                => $this->server->format_datetime( $order->get_date_created() ? $order->get_date_created()->getTimestamp() : 0, false, false ), // API gives UTC times.
+			'updated_at'                => $this->server->format_datetime( $order->get_date_modified() ? $order->get_date_modified()->getTimestamp() : 0, false, false ), // API gives UTC times.
+			'completed_at'              => $this->server->format_datetime( $order->get_date_completed() ? $order->get_date_completed()->getTimestamp() : 0, false, false ), // API gives UTC times.
 			'status'                    => $order->get_status(),
-			'currency'                  => $order->get_order_currency(),
+			'currency'                  => $order->get_currency(),
 			'total'                     => wc_format_decimal( $order->get_total(), $dp ),
 			'subtotal'                  => wc_format_decimal( $order->get_subtotal(), $dp ),
 			'total_line_items_quantity' => $order->get_item_count(),
 			'total_tax'                 => wc_format_decimal( $order->get_total_tax(), $dp ),
-			'total_shipping'            => wc_format_decimal( $order->get_total_shipping(), $dp ),
+			'total_shipping'            => wc_format_decimal( $order->get_shipping_total(), $dp ),
 			'cart_tax'                  => wc_format_decimal( $order->get_cart_tax(), $dp ),
 			'shipping_tax'              => wc_format_decimal( $order->get_shipping_tax(), $dp ),
 			'total_discount'            => wc_format_decimal( $order->get_total_discount(), $dp ),
 			'shipping_methods'          => $order->get_shipping_method(),
 			'payment_details' => array(
-				'method_id'    => $order->payment_method,
-				'method_title' => $order->payment_method_title,
-				'paid'         => isset( $order->paid_date ),
+				'method_id'    => $order->get_payment_method(),
+				'method_title' => $order->get_payment_method_title(),
+				'paid'         => ! is_null( $order->get_date_paid() ),
 			),
 			'billing_address' => array(
-				'first_name' => $order->billing_first_name,
-				'last_name'  => $order->billing_last_name,
-				'company'    => $order->billing_company,
-				'address_1'  => $order->billing_address_1,
-				'address_2'  => $order->billing_address_2,
-				'city'       => $order->billing_city,
-				'state'      => $order->billing_state,
-				'postcode'   => $order->billing_postcode,
-				'country'    => $order->billing_country,
-				'email'      => $order->billing_email,
-				'phone'      => $order->billing_phone,
+				'first_name' => $order->get_billing_first_name(),
+				'last_name'  => $order->get_billing_last_name(),
+				'company'    => $order->get_billing_company(),
+				'address_1'  => $order->get_billing_address_1(),
+				'address_2'  => $order->get_billing_address_2(),
+				'city'       => $order->get_billing_city(),
+				'state'      => $order->get_billing_state(),
+				'postcode'   => $order->get_billing_postcode(),
+				'country'    => $order->get_billing_country(),
+				'email'      => $order->get_billing_email(),
+				'phone'      => $order->get_billing_phone(),
 			),
 			'shipping_address' => array(
-				'first_name' => $order->shipping_first_name,
-				'last_name'  => $order->shipping_last_name,
-				'company'    => $order->shipping_company,
-				'address_1'  => $order->shipping_address_1,
-				'address_2'  => $order->shipping_address_2,
-				'city'       => $order->shipping_city,
-				'state'      => $order->shipping_state,
-				'postcode'   => $order->shipping_postcode,
-				'country'    => $order->shipping_country,
+				'first_name' => $order->get_shipping_first_name(),
+				'last_name'  => $order->get_shipping_last_name(),
+				'company'    => $order->get_shipping_company(),
+				'address_1'  => $order->get_shipping_address_1(),
+				'address_2'  => $order->get_shipping_address_2(),
+				'city'       => $order->get_shipping_city(),
+				'state'      => $order->get_shipping_state(),
+				'postcode'   => $order->get_shipping_postcode(),
+				'country'    => $order->get_shipping_country(),
 			),
-			'note'                      => $order->customer_note,
-			'customer_ip'               => $order->customer_ip_address,
-			'customer_user_agent'       => $order->customer_user_agent,
+			'note'                      => $order->get_customer_note(),
+			'customer_ip'               => $order->get_customer_ip_address(),
+			'customer_user_agent'       => $order->get_customer_user_agent(),
 			'customer_id'               => $order->get_user_id(),
 			'view_order_url'            => $order->get_view_order_url(),
 			'line_items'                => array(),
@@ -213,61 +211,44 @@ class WC_API_Orders extends WC_API_Resource {
 
 		// add line items
 		foreach ( $order->get_items() as $item_id => $item ) {
+			$product    = $item->get_product();
+			$hideprefix = ( isset( $filter['all_item_meta'] ) && 'true' === $filter['all_item_meta'] ) ? null : '_';
+			$item_meta  = $item->get_formatted_meta_data( $hideprefix );
 
-			$product     = $order->get_product_from_item( $item );
-			$product_id  = null;
-			$product_sku = null;
-
-			// Check if the product exists.
-			if ( is_object( $product ) ) {
-				$product_id  = ( isset( $product->variation_id ) ) ? $product->variation_id : $product->id;
-				$product_sku = $product->get_sku();
-			}
-
-			$meta = new WC_Order_Item_Meta( $item, $product );
-
-			$item_meta = array();
-
-			$hideprefix = ( isset( $filter['all_item_meta'] ) && $filter['all_item_meta'] === 'true' ) ? null : '_';
-
-			foreach ( $meta->get_formatted( $hideprefix ) as $meta_key => $formatted_meta ) {
-				$item_meta[] = array(
-					'key'   => $formatted_meta['key'],
-					'label' => $formatted_meta['label'],
-					'value' => $formatted_meta['value'],
-				);
+			foreach ( $item_meta as $key => $values ) {
+				$item_meta[ $key ]->label = $values->display_key;
+				unset( $item_meta[ $key ]->display_key );
+				unset( $item_meta[ $key ]->display_value );
 			}
 
 			$order_data['line_items'][] = array(
 				'id'           => $item_id,
 				'subtotal'     => wc_format_decimal( $order->get_line_subtotal( $item, false, false ), $dp ),
-				'subtotal_tax' => wc_format_decimal( $item['line_subtotal_tax'], $dp ),
+				'subtotal_tax' => wc_format_decimal( $item->get_subtotal_tax(), $dp ),
 				'total'        => wc_format_decimal( $order->get_line_total( $item, false, false ), $dp ),
-				'total_tax'    => wc_format_decimal( $item['line_tax'], $dp ),
+				'total_tax'    => wc_format_decimal( $item->get_total_tax(), $dp ),
 				'price'        => wc_format_decimal( $order->get_item_total( $item, false, false ), $dp ),
-				'quantity'     => wc_stock_amount( $item['qty'] ),
-				'tax_class'    => ( ! empty( $item['tax_class'] ) ) ? $item['tax_class'] : null,
-				'name'         => $item['name'],
-				'product_id'   => $product_id,
-				'sku'          => $product_sku,
-				'meta'         => $item_meta,
+				'quantity'     => $item->get_quantity(),
+				'tax_class'    => $item->get_tax_class(),
+				'name'         => $item->get_name(),
+				'product_id'   => $item->get_variation_id() ? $item->get_variation_id() : $item->get_product_id(),
+				'sku'          => is_object( $product ) ? $product->get_sku() : null,
+				'meta'         => array_values( $item_meta ),
 			);
 		}
 
 		// add shipping
 		foreach ( $order->get_shipping_methods() as $shipping_item_id => $shipping_item ) {
-
 			$order_data['shipping_lines'][] = array(
 				'id'           => $shipping_item_id,
-				'method_id'    => $shipping_item['method_id'],
-				'method_title' => $shipping_item['name'],
-				'total'        => wc_format_decimal( $shipping_item['cost'], $dp ),
+				'method_id'    => $shipping_item->get_method_id(),
+				'method_title' => $shipping_item->get_name(),
+				'total'        => wc_format_decimal( $shipping_item->get_total(), $dp ),
 			);
 		}
 
 		// add taxes
 		foreach ( $order->get_tax_totals() as $tax_code => $tax ) {
-
 			$order_data['tax_lines'][] = array(
 				'id'       => $tax->id,
 				'rate_id'  => $tax->rate_id,
@@ -280,11 +261,10 @@ class WC_API_Orders extends WC_API_Resource {
 
 		// add fees
 		foreach ( $order->get_fees() as $fee_item_id => $fee_item ) {
-
 			$order_data['fee_lines'][] = array(
 				'id'        => $fee_item_id,
-				'title'     => $fee_item['name'],
-				'tax_class' => ( ! empty( $fee_item['tax_class'] ) ) ? $fee_item['tax_class'] : null,
+				'title'     => $fee_item->get_name(),
+				'tax_class' => $fee_item->get_tax_class(),
 				'total'     => wc_format_decimal( $order->get_line_total( $fee_item ), $dp ),
 				'total_tax' => wc_format_decimal( $order->get_line_tax( $fee_item ), $dp ),
 			);
@@ -292,11 +272,10 @@ class WC_API_Orders extends WC_API_Resource {
 
 		// add coupons
 		foreach ( $order->get_items( 'coupon' ) as $coupon_item_id => $coupon_item ) {
-
 			$order_data['coupon_lines'][] = array(
 				'id'     => $coupon_item_id,
-				'code'   => $coupon_item['name'],
-				'amount' => wc_format_decimal( $coupon_item['discount_amount'], $dp ),
+				'code'   => $coupon_item->get_code(),
+				'amount' => wc_format_decimal( $coupon_item->get_discount(), $dp ),
 			);
 		}
 
@@ -320,7 +299,7 @@ class WC_API_Orders extends WC_API_Resource {
 
 			if ( ! empty( $status ) ) {
 
-				if ( $status == 'any' ) {
+				if ( 'any' === $status ) {
 
 					$order_statuses = array();
 
@@ -404,7 +383,7 @@ class WC_API_Orders extends WC_API_Resource {
 
 				// make sure customer exists
 				if ( false === get_user_by( 'id', $data['customer_id'] ) ) {
-					throw new WC_API_Exception( 'woocommerce_api_invalid_customer_id', __( 'Customer ID is invalid', 'woocommerce' ), 400 );
+					throw new WC_API_Exception( 'woocommerce_api_invalid_customer_id', __( 'Customer ID is invalid.', 'woocommerce' ), 400 );
 				}
 
 				$default_order_args['customer_id'] = $data['customer_id'];
@@ -451,8 +430,8 @@ class WC_API_Orders extends WC_API_Resource {
 					throw new WC_API_Exception( 'woocommerce_invalid_payment_details', __( 'Payment method ID and title are required', 'woocommerce' ), 400 );
 				}
 
-				update_post_meta( $order->id, '_payment_method', $data['payment_details']['method_id'] );
-				update_post_meta( $order->id, '_payment_method_title', $data['payment_details']['method_title'] );
+				update_post_meta( $order->get_id(), '_payment_method', $data['payment_details']['method_id'] );
+				update_post_meta( $order->get_id(), '_payment_method_title', $data['payment_details']['method_title'] );
 
 				// mark as paid if set
 				if ( isset( $data['payment_details']['paid'] ) && true === $data['payment_details']['paid'] ) {
@@ -464,32 +443,33 @@ class WC_API_Orders extends WC_API_Resource {
 			if ( isset( $data['currency'] ) ) {
 
 				if ( ! array_key_exists( $data['currency'], get_woocommerce_currencies() ) ) {
-					throw new WC_API_Exception( 'woocommerce_invalid_order_currency', __( 'Provided order currency is invalid', 'woocommerce'), 400 );
+					throw new WC_API_Exception( 'woocommerce_invalid_order_currency', __( 'Provided order currency is invalid.', 'woocommerce' ), 400 );
 				}
 
-				update_post_meta( $order->id, '_order_currency', $data['currency'] );
+				update_post_meta( $order->get_id(), '_order_currency', $data['currency'] );
 			}
 
 			// set order meta
 			if ( isset( $data['order_meta'] ) && is_array( $data['order_meta'] ) ) {
-				$this->set_order_meta( $order->id, $data['order_meta'] );
+				$this->set_order_meta( $order->get_id(), $data['order_meta'] );
 			}
 
 			// HTTP 201 Created
 			$this->server->send_status( 201 );
 
-			wc_delete_shop_order_transients( $order->id );
+			wc_delete_shop_order_transients( $order );
 
-			do_action( 'woocommerce_api_create_order', $order->id, $data, $this );
+			do_action( 'woocommerce_api_create_order', $order->get_id(), $data, $this );
 
 			wc_transaction_query( 'commit' );
 
-			return $this->get_order( $order->id );
-
-		} catch ( WC_API_Exception $e ) {
+			return $this->get_order( $order->get_id() );
 
+		} catch ( WC_Data_Exception $e ) {
+			wc_transaction_query( 'rollback' );
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => 400 ) );
+		} catch ( WC_API_Exception $e ) {
 			wc_transaction_query( 'rollback' );
-
 			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
 		}
 	}
@@ -538,7 +518,7 @@ class WC_API_Orders extends WC_API_Resource {
 				throw new WC_API_Exception( 'woocommerce_api_invalid_order_id', __( 'Order ID is invalid', 'woocommerce' ), 400 );
 			}
 
-			$order_args = array( 'order_id' => $order->id );
+			$order_args = array( 'order_id' => $order->get_id() );
 
 			// Customer note.
 			if ( isset( $data['note'] ) ) {
@@ -549,10 +529,10 @@ class WC_API_Orders extends WC_API_Resource {
 			if ( isset( $data['customer_id'] ) && $data['customer_id'] != $order->get_user_id() ) {
 				// Make sure customer exists.
 				if ( false === get_user_by( 'id', $data['customer_id'] ) ) {
-					throw new WC_API_Exception( 'woocommerce_api_invalid_customer_id', __( 'Customer ID is invalid', 'woocommerce' ), 400 );
+					throw new WC_API_Exception( 'woocommerce_api_invalid_customer_id', __( 'Customer ID is invalid.', 'woocommerce' ), 400 );
 				}
 
-				update_post_meta( $order->id, '_customer_user', $data['customer_id'] );
+				update_post_meta( $order->get_id(), '_customer_user', $data['customer_id'] );
 			}
 
 			// Billing/shipping address.
@@ -575,7 +555,7 @@ class WC_API_Orders extends WC_API_Resource {
 
 						// Item ID is always required.
 						if ( ! array_key_exists( 'id', $item ) ) {
-							throw new WC_API_Exception( 'woocommerce_invalid_item_id', __( 'Order item ID is required', 'woocommerce' ), 400 );
+							$item['id'] = null;
 						}
 
 						// Create item.
@@ -597,12 +577,12 @@ class WC_API_Orders extends WC_API_Resource {
 
 				// Method ID.
 				if ( isset( $data['payment_details']['method_id'] ) ) {
-					update_post_meta( $order->id, '_payment_method', $data['payment_details']['method_id'] );
+					update_post_meta( $order->get_id(), '_payment_method', $data['payment_details']['method_id'] );
 				}
 
 				// Method title.
 				if ( isset( $data['payment_details']['method_title'] ) ) {
-					update_post_meta( $order->id, '_payment_method_title', $data['payment_details']['method_title'] );
+					update_post_meta( $order->get_id(), '_payment_method_title', $data['payment_details']['method_title'] );
 				}
 
 				// Mark as paid if set.
@@ -614,10 +594,10 @@ class WC_API_Orders extends WC_API_Resource {
 			// Set order currency.
 			if ( isset( $data['currency'] ) ) {
 				if ( ! array_key_exists( $data['currency'], get_woocommerce_currencies() ) ) {
-					throw new WC_API_Exception( 'woocommerce_invalid_order_currency', __( 'Provided order currency is invalid', 'woocommerce' ), 400 );
+					throw new WC_API_Exception( 'woocommerce_invalid_order_currency', __( 'Provided order currency is invalid.', 'woocommerce' ), 400 );
 				}
 
-				update_post_meta( $order->id, '_order_currency', $data['currency'] );
+				update_post_meta( $order->get_id(), '_order_currency', $data['currency'] );
 			}
 
 			// If items have changed, recalculate order totals.
@@ -627,7 +607,7 @@ class WC_API_Orders extends WC_API_Resource {
 
 			// Update order meta.
 			if ( isset( $data['order_meta'] ) && is_array( $data['order_meta'] ) ) {
-				$this->set_order_meta( $order->id, $data['order_meta'] );
+				$this->set_order_meta( $order->get_id(), $data['order_meta'] );
 			}
 
 			// Update the order post to set customer note/modified date.
@@ -635,17 +615,20 @@ class WC_API_Orders extends WC_API_Resource {
 
 			// Order status.
 			if ( ! empty( $data['status'] ) ) {
-				$order->update_status( $data['status'], isset( $data['status_note'] ) ? $data['status_note'] : '' );
+				// Refresh the order instance.
+				$order = wc_get_order( $order->get_id() );
+				$order->update_status( $data['status'], isset( $data['status_note'] ) ? $data['status_note'] : '', true );
 			}
 
-			wc_delete_shop_order_transients( $order->id );
+			wc_delete_shop_order_transients( $order );
 
-			do_action( 'woocommerce_api_edit_order', $order->id, $data, $this );
+			do_action( 'woocommerce_api_edit_order', $order->get_id(), $data, $this );
 
 			return $this->get_order( $id );
 
+		} catch ( WC_Data_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => 400 ) );
 		} catch ( WC_API_Exception $e ) {
-
 			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
 		}
 	}
@@ -685,7 +668,7 @@ class WC_API_Orders extends WC_API_Resource {
 		$query_args = array(
 			'fields'      => 'ids',
 			'post_type'   => $this->post_type,
-			'post_status' => array_keys( wc_get_order_statuses() )
+			'post_status' => array_keys( wc_get_order_statuses() ),
 		);
 
 		// add status argument
@@ -755,8 +738,8 @@ class WC_API_Orders extends WC_API_Resource {
 			}
 		}
 
-		$order->set_address( $billing_address, 'billing' );
-		$order->set_address( $shipping_address, 'shipping' );
+		$this->update_address( $order, $billing_address, 'billing' );
+		$this->update_address( $order, $shipping_address, 'shipping' );
 
 		// update user meta
 		if ( $order->get_user_id() ) {
@@ -769,6 +752,21 @@ class WC_API_Orders extends WC_API_Resource {
 		}
 	}
 
+	/**
+	 * Update address.
+	 *
+	 * @param WC_Order $order
+	 * @param array $posted
+	 * @param string $type
+	 */
+	protected function update_address( $order, $posted, $type = 'billing' ) {
+		foreach ( $posted as $key => $value ) {
+			if ( is_callable( array( $order, "set_{$type}_{$key}" ) ) ) {
+				$order->{"set_{$type}_{$key}"}( $value );
+			}
+		}
+	}
+
 	/**
 	 * Helper method to add/update order meta, with two restrictions:
 	 *
@@ -783,7 +781,7 @@ class WC_API_Orders extends WC_API_Resource {
 
 		foreach ( $order_meta as $meta_key => $meta_value ) {
 
-			if ( is_string( $meta_key) && ! is_protected_meta( $meta_key ) && is_scalar( $meta_value ) ) {
+			if ( is_string( $meta_key ) && ! is_protected_meta( $meta_key ) && is_scalar( $meta_value ) ) {
 				update_post_meta( $order_id, $meta_key, $meta_value );
 			}
 		}
@@ -835,11 +833,11 @@ class WC_API_Orders extends WC_API_Resource {
 			$result = $wpdb->get_row(
 				$wpdb->prepare( "SELECT * FROM {$wpdb->prefix}woocommerce_order_items WHERE order_item_id = %d AND order_id = %d",
 				absint( $item['id'] ),
-				absint( $order->id )
+				absint( $order->get_id() )
 			) );
 
 			if ( is_null( $result ) ) {
-				throw new WC_API_Exception( 'woocommerce_invalid_item_id', __( 'Order item ID provided is not associated with order', 'woocommerce' ), 400 );
+				throw new WC_API_Exception( 'woocommerce_invalid_item_id', __( 'Order item ID provided is not associated with order.', 'woocommerce' ), 400 );
 			}
 		}
 
@@ -856,9 +854,7 @@ class WC_API_Orders extends WC_API_Resource {
 	 * @throws WC_API_Exception invalid data, server error
 	 */
 	protected function set_line_item( $order, $item, $action ) {
-
 		$creating  = ( 'create' === $action );
-		$item_args = array();
 
 		// product is always required
 		if ( ! isset( $item['product_id'] ) && ! isset( $item['sku'] ) ) {
@@ -890,67 +886,63 @@ class WC_API_Orders extends WC_API_Resource {
 					throw new WC_API_Exception( 'woocommerce_api_invalid_product_variation', __( 'The product variation is invalid', 'woocommerce' ), 400 );
 				}
 			}
-			$item_args['variation'] = $item['variations'];
-			$variation_id = $this->get_variation_id( wc_get_product( $product_id ), $item_args['variation'] );
+			$variation_id = $this->get_variation_id( wc_get_product( $product_id ), $item['variations'] );
 		}
 
 		$product = wc_get_product( $variation_id ? $variation_id : $product_id );
 
 		// must be a valid WC_Product
 		if ( ! is_object( $product ) ) {
-			throw new WC_API_Exception( 'woocommerce_api_invalid_product', __( 'Product is invalid', 'woocommerce' ), 400 );
+			throw new WC_API_Exception( 'woocommerce_api_invalid_product', __( 'Product is invalid.', 'woocommerce' ), 400 );
 		}
 
 		// quantity must be positive float
 		if ( isset( $item['quantity'] ) && floatval( $item['quantity'] ) <= 0 ) {
-			throw new WC_API_Exception( 'woocommerce_api_invalid_product_quantity', __( 'Product quantity must be a positive float', 'woocommerce' ), 400 );
+			throw new WC_API_Exception( 'woocommerce_api_invalid_product_quantity', __( 'Product quantity must be a positive float.', 'woocommerce' ), 400 );
 		}
 
 		// quantity is required when creating
 		if ( $creating && ! isset( $item['quantity'] ) ) {
-			throw new WC_API_Exception( 'woocommerce_api_invalid_product_quantity', __( 'Product quantity is required', 'woocommerce' ), 400 );
-		}
-
-		// quantity
-		if ( isset( $item['quantity'] ) ) {
-			$item_args['qty'] = $item['quantity'];
-		}
-
-		// total
-		if ( isset( $item['total'] ) ) {
-			$item_args['totals']['total'] = floatval( $item['total'] );
-		}
-
-		// total tax
-		if ( isset( $item['total_tax'] ) ) {
-			$item_args['totals']['tax'] = floatval( $item['total_tax'] );
-		}
-
-		// subtotal
-		if ( isset( $item['subtotal'] ) ) {
-			$item_args['totals']['subtotal'] = floatval( $item['subtotal'] );
-		}
-
-		// subtotal tax
-		if ( isset( $item['subtotal_tax'] ) ) {
-			$item_args['totals']['subtotal_tax'] = floatval( $item['subtotal_tax'] );
+			throw new WC_API_Exception( 'woocommerce_api_invalid_product_quantity', __( 'Product quantity is required.', 'woocommerce' ), 400 );
 		}
 
 		if ( $creating ) {
-
-			$item_id = $order->add_product( $product, $item_args['qty'], $item_args );
-
-			if ( ! $item_id ) {
-				throw new WC_API_Exception( 'woocommerce_cannot_create_line_item', __( 'Cannot create line item, try again', 'woocommerce' ), 500 );
-			}
-
+			$line_item = new WC_Order_Item_Product();
 		} else {
+			$line_item = new WC_Order_Item_Product( $item['id'] );
+		}
 
-			$item_id = $order->update_product( $item['id'], $product, $item_args );
+		$line_item->set_product( $product );
+		$line_item->set_order_id( $order->get_id() );
 
-			if ( ! $item_id ) {
-				throw new WC_API_Exception( 'woocommerce_cannot_update_line_item', __( 'Cannot update line item, try again', 'woocommerce' ), 500 );
-			}
+		if ( isset( $item['quantity'] ) ) {
+			$line_item->set_quantity( $item['quantity'] );
+		}
+		if ( isset( $item['total'] ) ) {
+			$line_item->set_total( floatval( $item['total'] ) );
+		} elseif ( $creating ) {
+			$total = wc_get_price_excluding_tax( $product, array( 'qty' => $line_item->get_quantity() ) );
+			$line_item->set_total( $total );
+			$line_item->set_subtotal( $total );
+		}
+		if ( isset( $item['total_tax'] ) ) {
+			$line_item->set_total_tax( floatval( $item['total_tax'] ) );
+		}
+		if ( isset( $item['subtotal'] ) ) {
+			$line_item->set_subtotal( floatval( $item['subtotal'] ) );
+		}
+		if ( isset( $item['subtotal_tax'] ) ) {
+			$line_item->set_subtotal_tax( floatval( $item['subtotal_tax'] ) );
+		}
+		if ( $variation_id ) {
+			$line_item->set_variation_id( $variation_id );
+			$line_item->set_variation( $item['variations'] );
+		}
+
+		$item_id = $line_item->save();
+
+		if ( ! $item_id ) {
+			throw new WC_API_Exception( 'woocommerce_cannot_create_line_item', __( 'Cannot create line item, try again.', 'woocommerce' ), 500 );
 		}
 	}
 
@@ -1017,44 +1009,45 @@ class WC_API_Orders extends WC_API_Resource {
 
 		// total must be a positive float
 		if ( isset( $shipping['total'] ) && floatval( $shipping['total'] ) < 0 ) {
-			throw new WC_API_Exception( 'woocommerce_invalid_shipping_total', __( 'Shipping total must be a positive amount', 'woocommerce' ), 400 );
+			throw new WC_API_Exception( 'woocommerce_invalid_shipping_total', __( 'Shipping total must be a positive amount.', 'woocommerce' ), 400 );
 		}
 
 		if ( 'create' === $action ) {
 
 			// method ID is required
 			if ( ! isset( $shipping['method_id'] ) ) {
-				throw new WC_API_Exception( 'woocommerce_invalid_shipping_item', __( 'Shipping method ID is required', 'woocommerce' ), 400 );
+				throw new WC_API_Exception( 'woocommerce_invalid_shipping_item', __( 'Shipping method ID is required.', 'woocommerce' ), 400 );
 			}
 
 			$rate = new WC_Shipping_Rate( $shipping['method_id'], isset( $shipping['method_title'] ) ? $shipping['method_title'] : '', isset( $shipping['total'] ) ? floatval( $shipping['total'] ) : 0, array(), $shipping['method_id'] );
-
-			$shipping_id = $order->add_shipping( $rate );
+			$item = new WC_Order_Item_Shipping();
+			$item->set_order_id( $order->get_id() );
+			$item->set_shipping_rate( $rate );
+			$shipping_id = $item->save();
 
 			if ( ! $shipping_id ) {
-				throw new WC_API_Exception( 'woocommerce_cannot_create_shipping', __( 'Cannot create shipping method, try again', 'woocommerce' ), 500 );
+				throw new WC_API_Exception( 'woocommerce_cannot_create_shipping', __( 'Cannot create shipping method, try again.', 'woocommerce' ), 500 );
 			}
-
 		} else {
 
-			$shipping_args = array();
+			$item = new WC_Order_Item_Shipping( $shipping['id'] );
 
 			if ( isset( $shipping['method_id'] ) ) {
-				$shipping_args['method_id'] = $shipping['method_id'];
+				$item->set_method_id( $shipping['method_id'] );
 			}
 
 			if ( isset( $shipping['method_title'] ) ) {
-				$shipping_args['method_title'] = $shipping['method_title'];
+				$item->set_method_title( $shipping['method_title'] );
 			}
 
 			if ( isset( $shipping['total'] ) ) {
-				$shipping_args['cost'] = floatval( $shipping['total'] );
+				$item->set_total( floatval( $shipping['total'] ) );
 			}
 
-			$shipping_id = $order->update_shipping( $shipping['id'], $shipping_args );
+			$shipping_id = $item->save();
 
 			if ( ! $shipping_id ) {
-				throw new WC_API_Exception( 'woocommerce_cannot_update_shipping', __( 'Cannot update shipping method, try again', 'woocommerce' ), 500 );
+				throw new WC_API_Exception( 'woocommerce_cannot_update_shipping', __( 'Cannot update shipping method, try again.', 'woocommerce' ), 500 );
 			}
 		}
 	}
@@ -1077,65 +1070,59 @@ class WC_API_Orders extends WC_API_Resource {
 				throw new WC_API_Exception( 'woocommerce_invalid_fee_item', __( 'Fee title is required', 'woocommerce' ), 400 );
 			}
 
-			$order_fee            = new stdClass();
-			$order_fee->id        = sanitize_title( $fee['title'] );
-			$order_fee->name      = $fee['title'];
-			$order_fee->amount    = isset( $fee['total'] ) ? floatval( $fee['total'] ) : 0;
-			$order_fee->taxable   = false;
-			$order_fee->tax       = 0;
-			$order_fee->tax_data  = array();
-			$order_fee->tax_class = '';
+			$item = new WC_Order_Item_Fee();
+			$item->set_order_id( $order->get_id() );
+			$item->set_name( wc_clean( $fee['title'] ) );
+			$item->set_total( isset( $fee['total'] ) ? floatval( $fee['total'] ) : 0 );
 
 			// if taxable, tax class and total are required
-			if ( isset( $fee['taxable'] ) && $fee['taxable'] ) {
-
+			if ( ! empty( $fee['taxable'] ) ) {
 				if ( ! isset( $fee['tax_class'] ) ) {
-					throw new WC_API_Exception( 'woocommerce_invalid_fee_item', __( 'Fee tax class is required when fee is taxable', 'woocommerce' ), 400 );
+					throw new WC_API_Exception( 'woocommerce_invalid_fee_item', __( 'Fee tax class is required when fee is taxable.', 'woocommerce' ), 400 );
 				}
 
-				$order_fee->taxable   = true;
-				$order_fee->tax_class = $fee['tax_class'];
+				$item->set_tax_status( 'taxable' );
+				$item->set_tax_class( $fee['tax_class'] );
 
 				if ( isset( $fee['total_tax'] ) ) {
-					$order_fee->tax = isset( $fee['total_tax'] ) ? wc_format_refund_total( $fee['total_tax'] ) : 0;
+					$item->set_total_tax( isset( $fee['total_tax'] ) ? wc_format_refund_total( $fee['total_tax'] ) : 0 );
 				}
 
 				if ( isset( $fee['tax_data'] ) ) {
-					$order_fee->tax      = wc_format_refund_total( array_sum( $fee['tax_data'] ) );
-					$order_fee->tax_data = array_map( 'wc_format_refund_total', $fee['tax_data'] );
+					$item->set_total_tax( wc_format_refund_total( array_sum( $fee['tax_data'] ) ) );
+					$item->set_taxes( array_map( 'wc_format_refund_total', $fee['tax_data'] ) );
 				}
 			}
 
-			$fee_id = $order->add_fee( $order_fee );
+			$fee_id = $item->save();
 
 			if ( ! $fee_id ) {
-				throw new WC_API_Exception( 'woocommerce_cannot_create_fee', __( 'Cannot create fee, try again', 'woocommerce' ), 500 );
+				throw new WC_API_Exception( 'woocommerce_cannot_create_fee', __( 'Cannot create fee, try again.', 'woocommerce' ), 500 );
 			}
-
 		} else {
 
-			$fee_args = array();
+			$item = new WC_Order_Item_Fee( $fee['id'] );
 
 			if ( isset( $fee['title'] ) ) {
-				$fee_args['name'] = $fee['title'];
+				$item->set_name( wc_clean( $fee['title'] ) );
 			}
 
 			if ( isset( $fee['tax_class'] ) ) {
-				$fee_args['tax_class'] = $fee['tax_class'];
+				$item->set_tax_class( $fee['tax_class'] );
 			}
 
 			if ( isset( $fee['total'] ) ) {
-				$fee_args['line_total'] = floatval( $fee['total'] );
+				$item->set_total( floatval( $fee['total'] ) );
 			}
 
 			if ( isset( $fee['total_tax'] ) ) {
-				$fee_args['line_tax'] = floatval( $fee['total_tax'] );
+				$item->set_total_tax( floatval( $fee['total_tax'] ) );
 			}
 
-			$fee_id = $order->update_fee( $fee['id'], $fee_args );
+			$fee_id = $item->save();
 
 			if ( ! $fee_id ) {
-				throw new WC_API_Exception( 'woocommerce_cannot_update_fee', __( 'Cannot update fee, try again', 'woocommerce' ), 500 );
+				throw new WC_API_Exception( 'woocommerce_cannot_update_fee', __( 'Cannot update fee, try again.', 'woocommerce' ), 500 );
 			}
 		}
 	}
@@ -1153,38 +1140,44 @@ class WC_API_Orders extends WC_API_Resource {
 
 		// coupon amount must be positive float
 		if ( isset( $coupon['amount'] ) && floatval( $coupon['amount'] ) < 0 ) {
-			throw new WC_API_Exception( 'woocommerce_invalid_coupon_total', __( 'Coupon discount total must be a positive amount', 'woocommerce' ), 400 );
+			throw new WC_API_Exception( 'woocommerce_invalid_coupon_total', __( 'Coupon discount total must be a positive amount.', 'woocommerce' ), 400 );
 		}
 
 		if ( 'create' === $action ) {
 
 			// coupon code is required
 			if ( empty( $coupon['code'] ) ) {
-				throw new WC_API_Exception( 'woocommerce_invalid_coupon_coupon', __( 'Coupon code is required', 'woocommerce' ), 400 );
+				throw new WC_API_Exception( 'woocommerce_invalid_coupon_coupon', __( 'Coupon code is required.', 'woocommerce' ), 400 );
 			}
 
-			$coupon_id = $order->add_coupon( $coupon['code'], isset( $coupon['amount'] ) ? floatval( $coupon['amount'] ) : 0 );
+			$item = new WC_Order_Item_Coupon();
+			$item->set_props( array(
+				'code'         => $coupon['code'],
+				'discount'     => isset( $coupon['amount'] ) ? floatval( $coupon['amount'] ) : 0,
+				'discount_tax' => 0,
+				'order_id'     => $order->get_id(),
+			) );
+			$coupon_id = $item->save();
 
 			if ( ! $coupon_id ) {
-				throw new WC_API_Exception( 'woocommerce_cannot_create_order_coupon', __( 'Cannot create coupon, try again', 'woocommerce' ), 500 );
+				throw new WC_API_Exception( 'woocommerce_cannot_create_order_coupon', __( 'Cannot create coupon, try again.', 'woocommerce' ), 500 );
 			}
-
 		} else {
 
-			$coupon_args = array();
+			$item = new WC_Order_Item_Coupon( $coupon['id'] );
 
 			if ( isset( $coupon['code'] ) ) {
-				$coupon_args['code'] = $coupon['code'];
+				$item->set_code( $coupon['code'] );
 			}
 
 			if ( isset( $coupon['amount'] ) ) {
-				$coupon_args['discount_amount'] = floatval( $coupon['amount'] );
+				$item->set_discount( floatval( $coupon['amount'] ) );
 			}
 
-			$coupon_id = $order->update_coupon( $coupon['id'], $coupon_args );
+			$coupon_id = $item->save();
 
 			if ( ! $coupon_id ) {
-				throw new WC_API_Exception( 'woocommerce_cannot_update_order_coupon', __( 'Cannot update coupon, try again', 'woocommerce' ), 500 );
+				throw new WC_API_Exception( 'woocommerce_cannot_update_order_coupon', __( 'Cannot update coupon, try again.', 'woocommerce' ), 500 );
 			}
 		}
 	}
@@ -1209,7 +1202,7 @@ class WC_API_Orders extends WC_API_Resource {
 		$args = array(
 			'post_id' => $order_id,
 			'approve' => 'approve',
-			'type'    => 'order_note'
+			'type'    => 'order_note',
 		);
 
 		remove_filter( 'comments_clauses', array( 'WC_Comments', 'exclude_order_comments' ), 10, 1 );
@@ -1313,7 +1306,7 @@ class WC_API_Orders extends WC_API_Resource {
 			$note_id = $order->add_order_note( $data['note'], $is_customer_note );
 
 			if ( ! $note_id ) {
-				throw new WC_API_Exception( 'woocommerce_api_cannot_create_order_note', __( 'Cannot create order note, please try again', 'woocommerce' ), 500 );
+				throw new WC_API_Exception( 'woocommerce_api_cannot_create_order_note', __( 'Cannot create order note, please try again.', 'woocommerce' ), 500 );
 			}
 
 			// HTTP 201 Created
@@ -1321,7 +1314,9 @@ class WC_API_Orders extends WC_API_Resource {
 
 			do_action( 'woocommerce_api_create_order_note', $note_id, $order_id, $this );
 
-			return $this->get_order_note( $order->id, $note_id );
+			return $this->get_order_note( $order->get_id(), $note_id );
+		} catch ( WC_Data_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => 400 ) );
 		} catch ( WC_API_Exception $e ) {
 			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
 		}
@@ -1368,11 +1363,11 @@ class WC_API_Orders extends WC_API_Resource {
 			}
 
 			// Ensure note ID is associated with given order
-			if ( $note->comment_post_ID != $order->id ) {
+			if ( $note->comment_post_ID != $order->get_id() ) {
 				throw new WC_API_Exception( 'woocommerce_api_invalid_order_note_id', __( 'The order note ID provided is not associated with the order', 'woocommerce' ), 400 );
 			}
 
-			$data = apply_filters( 'woocommerce_api_edit_order_note_data', $data, $note->comment_ID, $order->id, $this );
+			$data = apply_filters( 'woocommerce_api_edit_order_note_data', $data, $note->comment_ID, $order->get_id(), $this );
 
 			// Note content
 			if ( isset( $data['note'] ) ) {
@@ -1391,9 +1386,11 @@ class WC_API_Orders extends WC_API_Resource {
 				update_comment_meta( $note->comment_ID, 'is_customer_note', true === $data['customer_note'] ? 1 : 0 );
 			}
 
-			do_action( 'woocommerce_api_edit_order_note', $note->comment_ID, $order->id, $this );
+			do_action( 'woocommerce_api_edit_order_note', $note->comment_ID, $order->get_id(), $this );
 
-			return $this->get_order_note( $order->id, $note->comment_ID );
+			return $this->get_order_note( $order->get_id(), $note->comment_ID );
+		} catch ( WC_Data_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => 400 ) );
 		} catch ( WC_API_Exception $e ) {
 			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
 		}
@@ -1466,15 +1463,12 @@ class WC_API_Orders extends WC_API_Resource {
 			return $order_id;
 		}
 
-		$refund_items = get_posts(
-			array(
-				'post_type'      => 'shop_order_refund',
-				'post_parent'    => $order_id,
-				'posts_per_page' => -1,
-				'post_status'    => 'any',
-				'fields'         => 'ids'
-			)
-		);
+		$refund_items = wc_get_orders( array(
+			'type'   => 'shop_order_refund',
+			'parent' => $order_id,
+			'limit'  => -1,
+			'return' => 'ids',
+		) );
 		$order_refunds = array();
 
 		foreach ( $refund_items as $refund_id ) {
@@ -1504,56 +1498,53 @@ class WC_API_Orders extends WC_API_Resource {
 			$id = absint( $id );
 
 			if ( empty( $id ) ) {
-				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'Invalid order refund ID', 'woocommerce' ), 400 );
+				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'Invalid order refund ID.', 'woocommerce' ), 400 );
 			}
 
-			$order  = wc_get_order( $id );
+			$order  = wc_get_order( $order_id );
 			$refund = wc_get_order( $id );
 
 			if ( ! $refund ) {
-				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'An order refund with the provided ID could not be found', 'woocommerce' ), 404 );
+				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'An order refund with the provided ID could not be found.', 'woocommerce' ), 404 );
 			}
 
 			$line_items = array();
 
 			// Add line items
 			foreach ( $refund->get_items( 'line_item' ) as $item_id => $item ) {
+				$product    = $item->get_product();
+				$hideprefix = ( isset( $filter['all_item_meta'] ) && 'true' === $filter['all_item_meta'] ) ? null : '_';
+				$item_meta  = $item->get_formatted_meta_data( $hideprefix );
 
-				$product   = $order->get_product_from_item( $item );
-				$meta      = new WC_Order_Item_Meta( $item, $product );
-				$item_meta = array();
-
-				foreach ( $meta->get_formatted() as $meta_key => $formatted_meta ) {
-					$item_meta[] = array(
-						'key' => $meta_key,
-						'label' => $formatted_meta['label'],
-						'value' => $formatted_meta['value'],
-					);
+				foreach ( $item_meta as $key => $values ) {
+					$item_meta[ $key ]->label = $values->display_key;
+					unset( $item_meta[ $key ]->display_key );
+					unset( $item_meta[ $key ]->display_value );
 				}
 
 				$line_items[] = array(
 					'id'               => $item_id,
 					'subtotal'         => wc_format_decimal( $order->get_line_subtotal( $item ), 2 ),
-					'subtotal_tax'     => wc_format_decimal( $item['line_subtotal_tax'], 2 ),
+					'subtotal_tax'     => wc_format_decimal( $item->get_subtotal_tax(), 2 ),
 					'total'            => wc_format_decimal( $order->get_line_total( $item ), 2 ),
 					'total_tax'        => wc_format_decimal( $order->get_line_tax( $item ), 2 ),
 					'price'            => wc_format_decimal( $order->get_item_total( $item ), 2 ),
-					'quantity'         => (int) $item['qty'],
-					'tax_class'        => ( ! empty( $item['tax_class'] ) ) ? $item['tax_class'] : null,
-					'name'             => $item['name'],
-					'product_id'       => ( isset( $product->variation_id ) ) ? $product->variation_id : $product->id,
+					'quantity'         => $item->get_quantity(),
+					'tax_class'        => $item->get_tax_class(),
+					'name'             => $item->get_name(),
+					'product_id'       => $item->get_variation_id() ? $item->get_variation_id() : $item->get_product_id(),
 					'sku'              => is_object( $product ) ? $product->get_sku() : null,
-					'meta'             => $item_meta,
-					'refunded_item_id' => (int) $item['refunded_item_id'],
+					'meta'             => array_values( $item_meta ),
+					'refunded_item_id' => (int) $item->get_meta( 'refunded_item_id' ),
 				);
 			}
 
 			$order_refund = array(
 				'id'         => $refund->id,
-				'created_at' => $this->server->format_datetime( $refund->date ),
-				'amount'     => wc_format_decimal( $refund->get_refund_amount(), 2 ),
-				'reason'     => $refund->get_refund_reason(),
-				'line_items' => $line_items
+				'created_at' => $this->server->format_datetime( $refund->get_date_created() ? $refund->get_date_created()->getTimestamp() : 0, false, false ),
+				'amount'     => wc_format_decimal( $refund->get_amount(), 2 ),
+				'reason'     => $refund->get_reason(),
+				'line_items' => $line_items,
 			);
 
 			return array( 'order_refund' => apply_filters( 'woocommerce_api_order_refund_response', $order_refund, $id, $fields, $refund, $order_id, $this ) );
@@ -1594,9 +1585,9 @@ class WC_API_Orders extends WC_API_Resource {
 
 			// Refund amount is required
 			if ( ! isset( $data['amount'] ) ) {
-				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund', __( 'Refund amount is required', 'woocommerce' ), 400 );
+				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund', __( 'Refund amount is required.', 'woocommerce' ), 400 );
 			} elseif ( 0 > $data['amount'] ) {
-				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund', __( 'Refund amount must be positive', 'woocommerce' ), 400 );
+				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund', __( 'Refund amount must be positive.', 'woocommerce' ), 400 );
 			}
 
 			$data['order_id']  = $order_id;
@@ -1606,7 +1597,7 @@ class WC_API_Orders extends WC_API_Resource {
 			$refund = wc_create_refund( $data );
 
 			if ( ! $refund ) {
-				throw new WC_API_Exception( 'woocommerce_api_cannot_create_order_refund', __( 'Cannot create order refund, please try again', 'woocommerce' ), 500 );
+				throw new WC_API_Exception( 'woocommerce_api_cannot_create_order_refund', __( 'Cannot create order refund, please try again.', 'woocommerce' ), 500 );
 			}
 
 			// Refund via API
@@ -1617,13 +1608,13 @@ class WC_API_Orders extends WC_API_Resource {
 
 				$order = wc_get_order( $order_id );
 
-				if ( isset( $payment_gateways[ $order->payment_method ] ) && $payment_gateways[ $order->payment_method ]->supports( 'refunds' ) ) {
-					$result = $payment_gateways[ $order->payment_method ]->process_refund( $order_id, $refund->get_refund_amount(), $refund->get_refund_reason() );
+				if ( isset( $payment_gateways[ $order->get_payment_method() ] ) && $payment_gateways[ $order->get_payment_method() ]->supports( 'refunds' ) ) {
+					$result = $payment_gateways[ $order->get_payment_method() ]->process_refund( $order_id, $refund->get_amount(), $refund->get_reason() );
 
 					if ( is_wp_error( $result ) ) {
 						return $result;
 					} elseif ( ! $result ) {
-						throw new WC_API_Exception( 'woocommerce_api_create_order_refund_api_failed', __( 'An error occurred while attempting to create the refund using the payment gateway API', 'woocommerce' ), 500 );
+						throw new WC_API_Exception( 'woocommerce_api_create_order_refund_api_failed', __( 'An error occurred while attempting to create the refund using the payment gateway API.', 'woocommerce' ), 500 );
 					}
 				}
 			}
@@ -1634,6 +1625,8 @@ class WC_API_Orders extends WC_API_Resource {
 			do_action( 'woocommerce_api_create_order_refund', $refund->id, $order_id, $this );
 
 			return $this->get_order_refund( $order_id, $refund->id );
+		} catch ( WC_Data_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => 400 ) );
 		} catch ( WC_API_Exception $e ) {
 			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
 		}
@@ -1667,19 +1660,19 @@ class WC_API_Orders extends WC_API_Resource {
 			$id = absint( $id );
 
 			if ( empty( $id ) ) {
-				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'Invalid order refund ID', 'woocommerce' ), 400 );
+				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'Invalid order refund ID.', 'woocommerce' ), 400 );
 			}
 
 			// Ensure order ID is valid
 			$refund = get_post( $id );
 
 			if ( ! $refund ) {
-				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'An order refund with the provided ID could not be found', 'woocommerce' ), 404 );
+				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'An order refund with the provided ID could not be found.', 'woocommerce' ), 404 );
 			}
 
 			// Ensure refund ID is associated with given order
 			if ( $refund->post_parent != $order_id ) {
-				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'The order refund ID provided is not associated with the order', 'woocommerce' ), 400 );
+				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'The order refund ID provided is not associated with the order.', 'woocommerce' ), 400 );
 			}
 
 			$data = apply_filters( 'woocommerce_api_edit_order_refund_data', $data, $refund->ID, $order_id, $this );
@@ -1701,6 +1694,8 @@ class WC_API_Orders extends WC_API_Resource {
 			do_action( 'woocommerce_api_edit_order_refund', $refund->ID, $order_id, $this );
 
 			return $this->get_order_refund( $order_id, $refund->ID );
+		} catch ( WC_Data_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => 400 ) );
 		} catch ( WC_API_Exception $e ) {
 			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
 		}
@@ -1726,19 +1721,19 @@ class WC_API_Orders extends WC_API_Resource {
 			$id = absint( $id );
 
 			if ( empty( $id ) ) {
-				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'Invalid order refund ID', 'woocommerce' ), 400 );
+				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'Invalid order refund ID.', 'woocommerce' ), 400 );
 			}
 
 			// Ensure refund ID is valid
 			$refund = get_post( $id );
 
 			if ( ! $refund ) {
-				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'An order refund with the provided ID could not be found', 'woocommerce' ), 404 );
+				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'An order refund with the provided ID could not be found.', 'woocommerce' ), 404 );
 			}
 
 			// Ensure refund ID is associated with given order
 			if ( $refund->post_parent != $order_id ) {
-				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'The order refund ID provided is not associated with the order', 'woocommerce' ), 400 );
+				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'The order refund ID provided is not associated with the order.', 'woocommerce' ), 400 );
 			}
 
 			wc_delete_shop_order_transients( $order_id );
@@ -1772,7 +1767,7 @@ class WC_API_Orders extends WC_API_Resource {
 
 			// Limit bulk operation
 			if ( count( $data ) > $limit ) {
-				throw new WC_API_Exception( 'woocommerce_api_orders_request_entity_too_large', sprintf( __( 'Unable to accept more than %s items for this request', 'woocommerce' ), $limit ), 413 );
+				throw new WC_API_Exception( 'woocommerce_api_orders_request_entity_too_large', sprintf( __( 'Unable to accept more than %s items for this request.', 'woocommerce' ), $limit ), 413 );
 			}
 
 			$orders = array();
@@ -1792,21 +1787,19 @@ class WC_API_Orders extends WC_API_Resource {
 					if ( is_wp_error( $edit ) ) {
 						$orders[] = array(
 							'id'    => $order_id,
-							'error' => array( 'code' => $edit->get_error_code(), 'message' => $edit->get_error_message() )
+							'error' => array( 'code' => $edit->get_error_code(), 'message' => $edit->get_error_message() ),
 						);
 					} else {
 						$orders[] = $edit['order'];
 					}
-				}
-
-				// Order don't exists / create order
-				else {
+				} else {
+					// Order don't exists / create order
 					$new = $this->create_order( array( 'order' => $_order ) );
 
 					if ( is_wp_error( $new ) ) {
 						$orders[] = array(
 							'id'    => $order_id,
-							'error' => array( 'code' => $new->get_error_code(), 'message' => $new->get_error_message() )
+							'error' => array( 'code' => $new->get_error_code(), 'message' => $new->get_error_message() ),
 						);
 					} else {
 						$orders[] = $new['order'];
@@ -1815,6 +1808,8 @@ class WC_API_Orders extends WC_API_Resource {
 			}
 
 			return array( 'orders' => apply_filters( 'woocommerce_api_orders_bulk_response', $orders, $this ) );
+		} catch ( WC_Data_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => 400 ) );
 		} catch ( WC_API_Exception $e ) {
 			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
 		}
diff --git a/includes/api/v2/class-wc-api-products.php b/includes/api/legacy/v2/class-wc-api-products.php
similarity index 63%
rename from includes/api/v2/class-wc-api-products.php
rename to includes/api/legacy/v2/class-wc-api-products.php
index c8bd587f2ff..ca27e67f376 100644
--- a/includes/api/v2/class-wc-api-products.php
+++ b/includes/api/legacy/v2/class-wc-api-products.php
@@ -8,6 +8,7 @@
  * @category    API
  * @package     WooCommerce/API
  * @since       2.1
+ * @version     3.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -40,7 +41,7 @@ class WC_API_Products extends WC_API_Resource {
 		);
 
 		# GET /products/count
-		$routes[ $this->base . '/count'] = array(
+		$routes[ $this->base . '/count' ] = array(
 			array( array( $this, 'get_products_count' ), WC_API_Server::READABLE ),
 		);
 
@@ -156,14 +157,13 @@ class WC_API_Products extends WC_API_Resource {
 
 		// add variations to variable products
 		if ( $product->is_type( 'variable' ) && $product->has_child() ) {
-
 			$product_data['variations'] = $this->get_variation_data( $product );
 		}
 
 		// add the parent product data to an individual variation
-		if ( $product->is_type( 'variation' ) && $product->parent ) {
-
-			$product_data['parent'] = $this->get_product_data( $product->parent );
+		if ( $product->is_type( 'variation' ) && $product->get_parent_id() ) {
+			$_product = wc_get_product( $product->get_parent_id() );
+			$product_data['parent'] = $this->get_product_data( $_product );
 		}
 
 		return array( 'product' => apply_filters( 'woocommerce_api_product_response', $product_data, $product, $fields, $this->server ) );
@@ -252,34 +252,38 @@ class WC_API_Products extends WC_API_Resource {
 				$post_excerpt = $data['short_description'];
 			}
 
-			$new_product = array(
-				'post_title'   => wc_clean( $data['title'] ),
-				'post_status'  => ( isset( $data['status'] ) ? wc_clean( $data['status'] ) : 'publish' ),
-				'post_type'    => 'product',
-				'post_excerpt' => ( isset( $data['short_description'] ) ? $post_excerpt : '' ),
-				'post_content' => ( isset( $data['description'] ) ? $post_content : '' ),
-				'post_author'  => get_current_user_id(),
-			);
+			$classname = WC_Product_Factory::get_classname_from_product_type( $data['type'] );
+			if ( ! class_exists( $classname ) ) {
+				$classname = 'WC_Product_Simple';
+			}
+			$product = new $classname();
 
-			// Attempts to create the new product
-			$id = wp_insert_post( $new_product, true );
+			$product->set_name( wc_clean( $data['title'] ) );
+			$product->set_status( isset( $data['status'] ) ? wc_clean( $data['status'] ) : 'publish' );
+			$product->set_short_description( isset( $data['short_description'] ) ? $post_excerpt : '' );
+			$product->set_description( isset( $data['description'] ) ? $post_content : '' );
+
+			// Attempts to create the new product.
+			$product->save();
+			$id = $product->get_id();
 
 			// Checks for an error in the product creation
-			if ( is_wp_error( $id ) ) {
+			if ( 0 >= $id ) {
 				throw new WC_API_Exception( 'woocommerce_api_cannot_create_product', $id->get_error_message(), 400 );
 			}
 
 			// Check for featured/gallery images, upload it and set it
 			if ( isset( $data['images'] ) ) {
-				$this->save_product_images( $id, $data['images'] );
+				$product = $this->save_product_images( $product, $data['images'] );
 			}
 
 			// Save product meta fields
-			$this->save_product_meta( $id, $data );
+			$product = $this->save_product_meta( $product, $data );
+			$product->save();
 
 			// Save variations
 			if ( isset( $data['type'] ) && 'variable' == $data['type'] && isset( $data['variations'] ) && is_array( $data['variations'] ) ) {
-				$this->save_variations( $id, $data );
+				$this->save_variations( $product, $data );
 			}
 
 			do_action( 'woocommerce_api_create_product', $id, $data );
@@ -290,10 +294,11 @@ class WC_API_Products extends WC_API_Resource {
 			$this->server->send_status( 201 );
 
 			return $this->get_product( $id );
-		} catch ( WC_API_Exception $e ) {
-			// Remove the product when fails
+		} catch ( WC_Data_Exception $e ) {
+			$this->clear_product( $id );
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
+		} catch ( WC_API_Exception $e ) {
 			$this->clear_product( $id );
-
 			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
 		}
 	}
@@ -320,69 +325,72 @@ class WC_API_Products extends WC_API_Resource {
 				return $id;
 			}
 
+			$product = wc_get_product( $id );
+
 			$data = apply_filters( 'woocommerce_api_edit_product_data', $data, $this );
 
 			// Product title.
 			if ( isset( $data['title'] ) ) {
-				wp_update_post( array( 'ID' => $id, 'post_title' => wc_clean( $data['title'] ) ) );
+				$product->set_name( wc_clean( $data['title'] ) );
 			}
 
 			// Product name (slug).
 			if ( isset( $data['name'] ) ) {
-				wp_update_post( array( 'ID' => $id, 'post_name' => sanitize_title( $data['name'] ) ) );
+				$product->set_slug( wc_clean( $data['name'] ) );
 			}
 
 			// Product status.
 			if ( isset( $data['status'] ) ) {
-				wp_update_post( array( 'ID' => $id, 'post_status' => wc_clean( $data['status'] ) ) );
+				$product->set_status( wc_clean( $data['status'] ) );
 			}
 
 			// Product short description.
 			if ( isset( $data['short_description'] ) ) {
 				// Enable short description html tags.
 				$post_excerpt = ( isset( $data['enable_html_short_description'] ) && true === $data['enable_html_short_description'] ) ? $data['short_description'] : wc_clean( $data['short_description'] );
-
-				wp_update_post( array( 'ID' => $id, 'post_excerpt' => $post_excerpt ) );
+				$product->set_short_description( $post_excerpt );
 			}
 
 			// Product description.
 			if ( isset( $data['description'] ) ) {
 				// Enable description html tags.
 				$post_content = ( isset( $data['enable_html_description'] ) && true === $data['enable_html_description'] ) ? $data['description'] : wc_clean( $data['description'] );
-
-				wp_update_post( array( 'ID' => $id, 'post_content' => $post_content ) );
+				$product->set_description( $post_content );
 			}
 
-			// Validate the product type
+			// Validate the product type.
 			if ( isset( $data['type'] ) && ! in_array( wc_clean( $data['type'] ), array_keys( wc_get_product_types() ) ) ) {
 				throw new WC_API_Exception( 'woocommerce_api_invalid_product_type', sprintf( __( 'Invalid product type - the product type must be any of these: %s', 'woocommerce' ), implode( ', ', array_keys( wc_get_product_types() ) ) ), 400 );
 			}
 
-			// Check for featured/gallery images, upload it and set it
+			// Check for featured/gallery images, upload it and set it.
 			if ( isset( $data['images'] ) ) {
-				$this->save_product_images( $id, $data['images'] );
+				$product = $this->save_product_images( $product, $data['images'] );
 			}
 
-			// Save product meta fields
-			$this->save_product_meta( $id, $data );
+			// Save product meta fields.
+			$product = $this->save_product_meta( $product, $data );
 
-			// Save variations
-			$product = get_product( $id );
+			// Save variations.
 			if ( $product->is_type( 'variable' ) ) {
 				if ( isset( $data['variations'] ) && is_array( $data['variations'] ) ) {
-					$this->save_variations( $id, $data );
+					$this->save_variations( $product, $data );
 				} else {
-					// Just sync variations
-					WC_Product_Variable::sync( $id );
+					// Just sync variations.
+					$product = WC_Product_Variable::sync( $product, false );
 				}
 			}
 
+			$product->save();
+
 			do_action( 'woocommerce_api_edit_product', $id, $data );
 
-			// Clear cache/transients
+			// Clear cache/transients.
 			wc_delete_product_transients( $id );
 
 			return $this->get_product( $id );
+		} catch ( WC_Data_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
 		} catch ( WC_API_Exception $e ) {
 			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
 		}
@@ -404,17 +412,38 @@ class WC_API_Products extends WC_API_Resource {
 			return $id;
 		}
 
+		$product = wc_get_product( $id );
+
 		do_action( 'woocommerce_api_delete_product', $id, $this );
 
-		$parent_id = wp_get_post_parent_id( $id );
-		$result    = ( $force ) ? wp_delete_post( $id, true ) : wp_trash_post( $id );
+		// If we're forcing, then delete permanently.
+		if ( $force ) {
+			if ( $product->is_type( 'variable' ) ) {
+				foreach ( $product->get_children() as $child_id ) {
+					$child = wc_get_product( $child_id );
+					$child->delete( true );
+				}
+			} elseif ( $product->is_type( 'grouped' ) ) {
+				foreach ( $product->get_children() as $child_id ) {
+					$child = wc_get_product( $child_id );
+					$child->set_parent_id( 0 );
+					$child->save();
+				}
+			}
+
+			$product->delete( true );
+			$result = $product->get_id() > 0 ? false : true;
+		} else {
+			$product->delete();
+			$result = 'trash' === $product->get_status();
+		}
 
 		if ( ! $result ) {
 			return new WP_Error( 'woocommerce_api_cannot_delete_product', sprintf( __( 'This %s cannot be deleted', 'woocommerce' ), 'product' ), array( 'status' => 500 ) );
 		}
 
 		// Delete parent product transients.
-		if ( $parent_id ) {
+		if ( $parent_id = wp_get_post_parent_id( $id ) ) {
 			wc_delete_product_transients( $parent_id );
 		}
 
@@ -494,7 +523,7 @@ class WC_API_Products extends WC_API_Resource {
 		}
 
 		$filter = array_merge( $filter, array(
-			'in' => implode( ',', $order_ids )
+			'in' => implode( ',', $order_ids ),
 		) );
 
 		$orders = WC()->api->WC_API_Orders->get_orders( $fields, $filter, $status, $page );
@@ -577,7 +606,7 @@ class WC_API_Products extends WC_API_Resource {
 				'description' => $term->description,
 				'display'     => $display_type ? $display_type : 'default',
 				'image'       => $image ? esc_url( $image ) : '',
-				'count'       => intval( $term->count )
+				'count'       => intval( $term->count ),
 			);
 
 			return array( 'product_category' => apply_filters( 'woocommerce_api_product_category_response', $product_category, $id, $fields, $term, $this ) );
@@ -632,7 +661,7 @@ class WC_API_Products extends WC_API_Resource {
 			$query_args['meta_query'][] = array(
 				'key'     => '_sku',
 				'value'   => $args['sku'],
-				'compare' => '='
+				'compare' => '=',
 			);
 
 			$query_args['post_type'] = array( 'product', 'product_variation' );
@@ -647,19 +676,22 @@ class WC_API_Products extends WC_API_Resource {
 	 * Get standard product data that applies to every product type
 	 *
 	 * @since 2.1
-	 * @param WC_Product $product
+	 * @param WC_Product|int $product
 	 * @return WC_Product
 	 */
 	private function get_product_data( $product ) {
-		$prices_precision = wc_get_price_decimals();
+		if ( is_numeric( $product ) ) {
+			$product = wc_get_product( $product );
+		}
 
+		$prices_precision = wc_get_price_decimals();
 		return array(
-			'title'              => $product->get_title(),
-			'id'                 => (int) $product->is_type( 'variation' ) ? $product->get_variation_id() : $product->id,
-			'created_at'         => $this->server->format_datetime( $product->get_post_data()->post_date_gmt ),
-			'updated_at'         => $this->server->format_datetime( $product->get_post_data()->post_modified_gmt ),
-			'type'               => $product->product_type,
-			'status'             => $product->get_post_data()->post_status,
+			'title'              => $product->get_name(),
+			'id'                 => $product->get_id(),
+			'created_at'         => $this->server->format_datetime( $product->get_date_created(), false, true ),
+			'updated_at'         => $this->server->format_datetime( $product->get_date_modified(), false, true ),
+			'type'               => $product->get_type(),
+			'status'             => $product->get_status(),
 			'downloadable'       => $product->is_downloadable(),
 			'virtual'            => $product->is_virtual(),
 			'permalink'          => $product->get_permalink(),
@@ -672,7 +704,7 @@ class WC_API_Products extends WC_API_Resource {
 			'tax_status'         => $product->get_tax_status(),
 			'tax_class'          => $product->get_tax_class(),
 			'managing_stock'     => $product->managing_stock(),
-			'stock_quantity'     => (int) $product->get_stock_quantity(),
+			'stock_quantity'     => $product->get_stock_quantity(),
 			'in_stock'           => $product->is_in_stock(),
 			'backorders_allowed' => $product->backorders_allowed(),
 			'backordered'        => $product->is_on_backorder(),
@@ -680,41 +712,41 @@ class WC_API_Products extends WC_API_Resource {
 			'purchaseable'       => $product->is_purchasable(),
 			'featured'           => $product->is_featured(),
 			'visible'            => $product->is_visible(),
-			'catalog_visibility' => $product->visibility,
+			'catalog_visibility' => $product->get_catalog_visibility(),
 			'on_sale'            => $product->is_on_sale(),
 			'product_url'        => $product->is_type( 'external' ) ? $product->get_product_url() : '',
 			'button_text'        => $product->is_type( 'external' ) ? $product->get_button_text() : '',
 			'weight'             => $product->get_weight() ? wc_format_decimal( $product->get_weight(), 2 ) : null,
 			'dimensions'         => array(
-				'length' => $product->length,
-				'width'  => $product->width,
-				'height' => $product->height,
+				'length' => $product->get_length(),
+				'width'  => $product->get_width(),
+				'height' => $product->get_height(),
 				'unit'   => get_option( 'woocommerce_dimension_unit' ),
 			),
 			'shipping_required'  => $product->needs_shipping(),
 			'shipping_taxable'   => $product->is_shipping_taxable(),
 			'shipping_class'     => $product->get_shipping_class(),
 			'shipping_class_id'  => ( 0 !== $product->get_shipping_class_id() ) ? $product->get_shipping_class_id() : null,
-			'description'        => wpautop( do_shortcode( $product->get_post_data()->post_content ) ),
-			'short_description'  => apply_filters( 'woocommerce_short_description', $product->get_post_data()->post_excerpt ),
-			'reviews_allowed'    => ( 'open' === $product->get_post_data()->comment_status ),
+			'description'        => wpautop( do_shortcode( $product->get_description() ) ),
+			'short_description'  => apply_filters( 'woocommerce_short_description', $product->get_short_description() ),
+			'reviews_allowed'    => $product->get_reviews_allowed(),
 			'average_rating'     => wc_format_decimal( $product->get_average_rating(), 2 ),
-			'rating_count'       => (int) $product->get_rating_count(),
-			'related_ids'        => array_map( 'absint', array_values( $product->get_related() ) ),
-			'upsell_ids'         => array_map( 'absint', $product->get_upsells() ),
-			'cross_sell_ids'     => array_map( 'absint', $product->get_cross_sells() ),
-			'parent_id'          => $product->post->post_parent,
-			'categories'         => wp_get_post_terms( $product->id, 'product_cat', array( 'fields' => 'names' ) ),
-			'tags'               => wp_get_post_terms( $product->id, 'product_tag', array( 'fields' => 'names' ) ),
+			'rating_count'       => $product->get_rating_count(),
+			'related_ids'        => array_map( 'absint', array_values( wc_get_related_products( $product->get_id() ) ) ),
+			'upsell_ids'         => array_map( 'absint', $product->get_upsell_ids() ),
+			'cross_sell_ids'     => array_map( 'absint', $product->get_cross_sell_ids() ),
+			'parent_id'          => $product->get_parent_id(),
+			'categories'         => wc_get_object_terms( $product->get_id(), 'product_cat', 'name' ),
+			'tags'               => wc_get_object_terms( $product->get_id(), 'product_tag', 'name' ),
 			'images'             => $this->get_images( $product ),
-			'featured_src'       => (string) wp_get_attachment_url( get_post_thumbnail_id( $product->is_type( 'variation' ) ? $product->variation_id : $product->id ) ),
+			'featured_src'       => wp_get_attachment_url( get_post_thumbnail_id( $product->get_id() ) ),
 			'attributes'         => $this->get_attributes( $product ),
 			'downloads'          => $this->get_downloads( $product ),
-			'download_limit'     => (int) $product->download_limit,
-			'download_expiry'    => (int) $product->download_expiry,
-			'download_type'      => $product->download_type,
-			'purchase_note'      => wpautop( do_shortcode( wp_kses_post( $product->purchase_note ) ) ),
-			'total_sales'        => metadata_exists( 'post', $product->id, 'total_sales' ) ? (int) get_post_meta( $product->id, 'total_sales', true ) : 0,
+			'download_limit'     => $product->get_download_limit(),
+			'download_expiry'    => $product->get_download_expiry(),
+			'download_type'      => 'standard',
+			'purchase_note'      => wpautop( do_shortcode( wp_kses_post( $product->get_purchase_note() ) ) ),
+			'total_sales'        => $product->get_total_sales(),
 			'variations'         => array(),
 			'parent'             => array(),
 		);
@@ -733,128 +765,172 @@ class WC_API_Products extends WC_API_Resource {
 
 		foreach ( $product->get_children() as $child_id ) {
 
-			$variation = $product->get_child( $child_id );
+			$variation = wc_get_product( $child_id );
 
-			if ( ! $variation->exists() ) {
+			if ( ! $variation || ! $variation->exists() ) {
 				continue;
 			}
 
 			$variations[] = array(
-					'id'                => $variation->get_variation_id(),
-					'created_at'        => $this->server->format_datetime( $variation->get_post_data()->post_date_gmt ),
-					'updated_at'        => $this->server->format_datetime( $variation->get_post_data()->post_modified_gmt ),
-					'downloadable'      => $variation->is_downloadable(),
-					'virtual'           => $variation->is_virtual(),
-					'permalink'         => $variation->get_permalink(),
-					'sku'               => $variation->get_sku(),
-					'price'             => wc_format_decimal( $variation->get_price(), $prices_precision ),
-					'regular_price'     => wc_format_decimal( $variation->get_regular_price(), $prices_precision ),
-					'sale_price'        => $variation->get_sale_price() ? wc_format_decimal( $variation->get_sale_price(), $prices_precision ) : null,
-					'taxable'           => $variation->is_taxable(),
-					'tax_status'        => $variation->get_tax_status(),
-					'tax_class'         => $variation->get_tax_class(),
-					'managing_stock'    => $variation->managing_stock(),
-					'stock_quantity'    => (int) $variation->get_stock_quantity(),
-					'in_stock'          => $variation->is_in_stock(),
-					'backordered'       => $variation->is_on_backorder(),
-					'purchaseable'      => $variation->is_purchasable(),
-					'visible'           => $variation->variation_is_visible(),
-					'on_sale'           => $variation->is_on_sale(),
-					'weight'            => $variation->get_weight() ? wc_format_decimal( $variation->get_weight(), 2 ) : null,
-					'dimensions'        => array(
-						'length' => $variation->length,
-						'width'  => $variation->width,
-						'height' => $variation->height,
-						'unit'   => get_option( 'woocommerce_dimension_unit' ),
-					),
-					'shipping_class'    => $variation->get_shipping_class(),
-					'shipping_class_id' => ( 0 !== $variation->get_shipping_class_id() ) ? $variation->get_shipping_class_id() : null,
-					'image'             => $this->get_images( $variation ),
-					'attributes'        => $this->get_attributes( $variation ),
-					'downloads'         => $this->get_downloads( $variation ),
-					'download_limit'    => (int) $product->download_limit,
-					'download_expiry'   => (int) $product->download_expiry,
+				'id'                => $variation->get_id(),
+				'created_at'        => $this->server->format_datetime( $variation->get_date_created(), false, true ),
+				'updated_at'        => $this->server->format_datetime( $variation->get_date_modified(), false, true ),
+				'downloadable'      => $variation->is_downloadable(),
+				'virtual'           => $variation->is_virtual(),
+				'permalink'         => $variation->get_permalink(),
+				'sku'               => $variation->get_sku(),
+				'price'             => wc_format_decimal( $variation->get_price(), $prices_precision ),
+				'regular_price'     => wc_format_decimal( $variation->get_regular_price(), $prices_precision ),
+				'sale_price'        => $variation->get_sale_price() ? wc_format_decimal( $variation->get_sale_price(), $prices_precision ) : null,
+				'taxable'           => $variation->is_taxable(),
+				'tax_status'        => $variation->get_tax_status(),
+				'tax_class'         => $variation->get_tax_class(),
+				'managing_stock'    => $variation->managing_stock(),
+				'stock_quantity'    => (int) $variation->get_stock_quantity(),
+				'in_stock'          => $variation->is_in_stock(),
+				'backordered'       => $variation->is_on_backorder(),
+				'purchaseable'      => $variation->is_purchasable(),
+				'visible'           => $variation->variation_is_visible(),
+				'on_sale'           => $variation->is_on_sale(),
+				'weight'            => $variation->get_weight() ? wc_format_decimal( $variation->get_weight(), 2 ) : null,
+				'dimensions'        => array(
+					'length' => $variation->get_length(),
+					'width'  => $variation->get_width(),
+					'height' => $variation->get_height(),
+					'unit'   => get_option( 'woocommerce_dimension_unit' ),
+				),
+				'shipping_class'    => $variation->get_shipping_class(),
+				'shipping_class_id' => ( 0 !== $variation->get_shipping_class_id() ) ? $variation->get_shipping_class_id() : null,
+				'image'             => $this->get_images( $variation ),
+				'attributes'        => $this->get_attributes( $variation ),
+				'downloads'         => $this->get_downloads( $variation ),
+				'download_limit'    => (int) $product->get_download_limit(),
+				'download_expiry'   => (int) $product->get_download_expiry(),
 			);
 		}
 
 		return $variations;
 	}
 
+	/**
+	 * Save default attributes.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Product $product
+	 * @param array $request
+	 * @return WC_Product
+	 */
+	protected function save_default_attributes( $product, $request ) {
+		// Update default attributes options setting.
+		if ( isset( $request['default_attribute'] ) ) {
+			$request['default_attributes'] = $request['default_attribute'];
+		}
+
+		if ( isset( $request['default_attributes'] ) && is_array( $request['default_attributes'] ) ) {
+			$attributes         = $product->get_attributes();
+			$default_attributes = array();
+
+			foreach ( $request['default_attributes'] as $default_attr_key => $default_attr ) {
+				if ( ! isset( $default_attr['name'] ) ) {
+					continue;
+				}
+
+				$taxonomy = sanitize_title( $default_attr['name'] );
+
+				if ( isset( $default_attr['slug'] ) ) {
+					$taxonomy = $this->get_attribute_taxonomy_by_slug( $default_attr['slug'] );
+				}
+
+				if ( isset( $attributes[ $taxonomy ] ) ) {
+					$_attribute = $attributes[ $taxonomy ];
+
+					if ( $_attribute['is_variation'] ) {
+						$value = '';
+
+						if ( isset( $default_attr['option'] ) ) {
+							if ( $_attribute['is_taxonomy'] ) {
+								// Don't use wc_clean as it destroys sanitized characters.
+								$value = sanitize_title( trim( stripslashes( $default_attr['option'] ) ) );
+							} else {
+								$value = wc_clean( trim( stripslashes( $default_attr['option'] ) ) );
+							}
+						}
+
+						if ( $value ) {
+							$default_attributes[ $taxonomy ] = $value;
+						}
+					}
+				}
+			}
+
+			$product->set_default_attributes( $default_attributes );
+		}
+
+		return $product;
+	}
+
 	/**
 	 * Save product meta
 	 *
 	 * @since  2.2
-	 * @param  int $product_id
+	 * @param  WC_Product $product
 	 * @param  array $data
-	 * @return bool
+	 * @return WC_Product
 	 * @throws WC_API_Exception
 	 */
-	protected function save_product_meta( $product_id, $data ) {
+	protected function save_product_meta( $product, $data ) {
 		global $wpdb;
 
-		// Product Type
-		$product_type = null;
-		if ( isset( $data['type'] ) ) {
-			$product_type = wc_clean( $data['type'] );
-			wp_set_object_terms( $product_id, $product_type, 'product_type' );
-		} else {
-			$_product_type = get_the_terms( $product_id, 'product_type' );
-			if ( is_array( $_product_type ) ) {
-				$_product_type = current( $_product_type );
-				$product_type  = $_product_type->slug;
-			}
-		}
-
 		// Virtual
 		if ( isset( $data['virtual'] ) ) {
-			update_post_meta( $product_id, '_virtual', ( true === $data['virtual'] ) ? 'yes' : 'no' );
+			$product->set_virtual( $data['virtual'] );
 		}
 
 		// Tax status
 		if ( isset( $data['tax_status'] ) ) {
-			update_post_meta( $product_id, '_tax_status', wc_clean( $data['tax_status'] ) );
+			$product->set_tax_status( wc_clean( $data['tax_status'] ) );
 		}
 
 		// Tax Class
 		if ( isset( $data['tax_class'] ) ) {
-			update_post_meta( $product_id, '_tax_class', wc_clean( $data['tax_class'] ) );
+			$product->set_tax_class( wc_clean( $data['tax_class'] ) );
 		}
 
 		// Catalog Visibility
 		if ( isset( $data['catalog_visibility'] ) ) {
-			update_post_meta( $product_id, '_visibility', wc_clean( $data['catalog_visibility'] ) );
+			$product->set_catalog_visibility( wc_clean( $data['catalog_visibility'] ) );
 		}
 
 		// Purchase Note
 		if ( isset( $data['purchase_note'] ) ) {
-			update_post_meta( $product_id, '_purchase_note', wc_clean( $data['purchase_note'] ) );
+			$product->set_purchase_note( wc_clean( $data['purchase_note'] ) );
 		}
 
 		// Featured Product
 		if ( isset( $data['featured'] ) ) {
-			update_post_meta( $product_id, '_featured', ( true === $data['featured'] ) ? 'yes' : 'no' );
+			$product->set_featured( $data['featured'] );
 		}
 
 		// Shipping data
-		$this->save_product_shipping_data( $product_id, $data );
+		$product = $this->save_product_shipping_data( $product, $data );
 
 		// SKU
 		if ( isset( $data['sku'] ) ) {
-			$sku     = get_post_meta( $product_id, '_sku', true );
+			$sku     = $product->get_sku();
 			$new_sku = wc_clean( $data['sku'] );
 
 			if ( '' == $new_sku ) {
-				update_post_meta( $product_id, '_sku', '' );
+				$product->set_sku( '' );
 			} elseif ( $new_sku !== $sku ) {
 				if ( ! empty( $new_sku ) ) {
-					$unique_sku = wc_product_has_unique_sku( $product_id, $new_sku );
+					$unique_sku = wc_product_has_unique_sku( $product->get_id(), $new_sku );
 					if ( ! $unique_sku ) {
-						throw new WC_API_Exception( 'woocommerce_api_product_sku_already_exists', __( 'The SKU already exists on another product', 'woocommerce' ), 400 );
+						throw new WC_API_Exception( 'woocommerce_api_product_sku_already_exists', __( 'The SKU already exists on another product.', 'woocommerce' ), 400 );
 					} else {
-						update_post_meta( $product_id, '_sku', $new_sku );
+						$product->set_sku( $new_sku );
 					}
 				} else {
-					update_post_meta( $product_id, '_sku', '' );
+					$product->set_sku( '' );
 				}
 			}
 		}
@@ -884,6 +960,8 @@ class WC_API_Products extends WC_API_Resource {
 
 				if ( $is_taxonomy ) {
 
+					$attribute_id = wc_attribute_taxonomy_id_by_name( $attribute['name'] );
+
 					if ( isset( $attribute['options'] ) ) {
 						$options = $attribute['options'];
 
@@ -900,176 +978,115 @@ class WC_API_Products extends WC_API_Resource {
 
 					// Update post terms
 					if ( taxonomy_exists( $taxonomy ) ) {
-						wp_set_object_terms( $product_id, $values, $taxonomy );
+						wp_set_object_terms( $product->get_id(), $values, $taxonomy );
 					}
 
-					if ( $values ) {
-						// Add attribute to array, but don't set values
-						$attributes[ $taxonomy ] = array(
-							'name'         => $taxonomy,
-							'value'        => '',
-							'position'     => isset( $attribute['position'] ) ? absint( $attribute['position'] ) : 0,
-							'is_visible'   => ( isset( $attribute['visible'] ) && $attribute['visible'] ) ? 1 : 0,
-							'is_variation' => ( isset( $attribute['variation'] ) && $attribute['variation'] ) ? 1 : 0,
-							'is_taxonomy'  => $is_taxonomy
-						);
+					if ( ! empty( $values ) ) {
+						// Add attribute to array, but don't set values.
+						$attribute_object = new WC_Product_Attribute();
+						$attribute_object->set_id( $attribute_id );
+						$attribute_object->set_name( $taxonomy );
+						$attribute_object->set_options( $values );
+						$attribute_object->set_position( isset( $attribute['position'] ) ? absint( $attribute['position'] ) : 0 );
+						$attribute_object->set_visible( ( isset( $attribute['visible'] ) && $attribute['visible'] ) ? 1 : 0 );
+						$attribute_object->set_variation( ( isset( $attribute['variation'] ) && $attribute['variation'] ) ? 1 : 0 );
+						$attributes[] = $attribute_object;
 					}
-
 				} elseif ( isset( $attribute['options'] ) ) {
 					// Array based
 					if ( is_array( $attribute['options'] ) ) {
-						$values = implode( ' ' . WC_DELIMITER . ' ', array_map( 'wc_clean', $attribute['options'] ) );
+						$values = $attribute['options'];
 
 					// Text based, separate by pipe
 					} else {
-						$values = implode( ' ' . WC_DELIMITER . ' ', array_map( 'wc_clean', explode( WC_DELIMITER, $attribute['options'] ) ) );
+						$values = array_map( 'wc_clean', explode( WC_DELIMITER, $attribute['options'] ) );
 					}
 
-					// Custom attribute - Add attribute to array and set the values
-					$attributes[ $attribute_slug ] = array(
-						'name'         => wc_clean( $attribute['name'] ),
-						'value'        => $values,
-						'position'     => isset( $attribute['position'] ) ? absint( $attribute['position'] ) : 0,
-						'is_visible'   => ( isset( $attribute['visible'] ) && $attribute['visible'] ) ? 1 : 0,
-						'is_variation' => ( isset( $attribute['variation'] ) && $attribute['variation'] ) ? 1 : 0,
-						'is_taxonomy'  => $is_taxonomy
-					);
+					// Custom attribute - Add attribute to array and set the values.
+					$attribute_object = new WC_Product_Attribute();
+					$attribute_object->set_name( $attribute['name'] );
+					$attribute_object->set_options( $values );
+					$attribute_object->set_position( isset( $attribute['position'] ) ? absint( $attribute['position'] ) : 0 );
+					$attribute_object->set_visible( ( isset( $attribute['visible'] ) && $attribute['visible'] ) ? 1 : 0 );
+					$attribute_object->set_variation( ( isset( $attribute['variation'] ) && $attribute['variation'] ) ? 1 : 0 );
+					$attributes[] = $attribute_object;
 				}
 			}
 
-			if ( ! function_exists( 'attributes_cmp' ) ) {
-				function attributes_cmp( $a, $b ) {
-					if ( $a['position'] == $b['position'] ) {
-						return 0;
-					}
+			uasort( $attributes, 'wc_product_attribute_uasort_comparison' );
 
-					return ( $a['position'] < $b['position'] ) ? -1 : 1;
-				}
-			}
-			uasort( $attributes, 'attributes_cmp' );
-
-			update_post_meta( $product_id, '_product_attributes', $attributes );
+			$product->set_attributes( $attributes );
 		}
 
 		// Sales and prices
-		if ( in_array( $product_type, array( 'variable', 'grouped' ) ) ) {
+		if ( in_array( $product->get_type(), array( 'variable', 'grouped' ) ) ) {
 
-			// Variable and grouped products have no prices
-			update_post_meta( $product_id, '_regular_price', '' );
-			update_post_meta( $product_id, '_sale_price', '' );
-			update_post_meta( $product_id, '_sale_price_dates_from', '' );
-			update_post_meta( $product_id, '_sale_price_dates_to', '' );
-			update_post_meta( $product_id, '_price', '' );
+			// Variable and grouped products have no prices.
+			$product->set_regular_price( '' );
+			$product->set_sale_price( '' );
+			$product->set_date_on_sale_to( '' );
+			$product->set_date_on_sale_from( '' );
+			$product->set_price( '' );
 
 		} else {
 
 			// Regular Price
 			if ( isset( $data['regular_price'] ) ) {
-				$regular_price = ( '' === $data['regular_price'] ) ? '' : wc_format_decimal( $data['regular_price'] );
-				update_post_meta( $product_id, '_regular_price', $regular_price );
+				$regular_price = ( '' === $data['regular_price'] ) ? '' : $data['regular_price'];
 			} else {
-				$regular_price = get_post_meta( $product_id, '_regular_price', true );
+				$regular_price = $product->get_regular_price();
 			}
 
 			// Sale Price
 			if ( isset( $data['sale_price'] ) ) {
-				$sale_price = ( '' === $data['sale_price'] ) ? '' : wc_format_decimal( $data['sale_price'] );
-				update_post_meta( $product_id, '_sale_price', $sale_price );
+				$sale_price = ( '' === $data['sale_price'] ) ? '' : $data['sale_price'];
 			} else {
-				$sale_price = get_post_meta( $product_id, '_sale_price', true );
+				$sale_price = $product->get_sale_price();
 			}
 
-			$date_from = isset( $data['sale_price_dates_from'] ) ? strtotime( $data['sale_price_dates_from'] ) : get_post_meta( $product_id, '_sale_price_dates_from', true );
-			$date_to   = isset( $data['sale_price_dates_to'] ) ? strtotime( $data['sale_price_dates_to'] ) : get_post_meta( $product_id, '_sale_price_dates_to', true );
+			$product->set_regular_price( $regular_price );
+			$product->set_sale_price( $sale_price );
 
-			// Dates
-			if ( $date_from ) {
-				update_post_meta( $product_id, '_sale_price_dates_from', $date_from );
+			if ( isset( $data['sale_price_dates_from'] ) ) {
+				$date_from = $data['sale_price_dates_from'];
 			} else {
-				update_post_meta( $product_id, '_sale_price_dates_from', '' );
+				$date_from = $product->get_date_on_sale_from() ? date( 'Y-m-d', $product->get_date_on_sale_from()->getTimestamp() ) : '';
 			}
 
-			if ( $date_to ) {
-				update_post_meta( $product_id, '_sale_price_dates_to', $date_to );
+			if ( isset( $data['sale_price_dates_to'] ) ) {
+				$date_to = $data['sale_price_dates_to'];
 			} else {
-				update_post_meta( $product_id, '_sale_price_dates_to', '' );
+				$date_to = $product->get_date_on_sale_to() ? date( 'Y-m-d', $product->get_date_on_sale_to()->getTimestamp() ) : '';
 			}
 
 			if ( $date_to && ! $date_from ) {
-				$date_from = strtotime( 'NOW', current_time( 'timestamp' ) );
-				update_post_meta( $product_id, '_sale_price_dates_from', $date_from );
+				$date_from = strtotime( 'NOW', current_time( 'timestamp', true ) );
 			}
 
-			// Update price if on sale
-			if ( '' !== $sale_price && '' == $date_to && '' == $date_from ) {
-				update_post_meta( $product_id, '_price', wc_format_decimal( $sale_price ) );
+			$product->set_date_on_sale_to( $date_to );
+			$product->set_date_on_sale_from( $date_from );
+			if ( $product->is_on_sale() ) {
+				$product->set_price( $product->get_sale_price() );
 			} else {
-				update_post_meta( $product_id, '_price', $regular_price );
-			}
-
-			if ( '' !== $sale_price && $date_from && $date_from <= strtotime( 'NOW', current_time( 'timestamp' ) ) ) {
-				update_post_meta( $product_id, '_price', wc_format_decimal( $sale_price ) );
-			}
-
-			if ( $date_to && $date_to < strtotime( 'NOW', current_time( 'timestamp' ) ) ) {
-				update_post_meta( $product_id, '_price', $regular_price );
-				update_post_meta( $product_id, '_sale_price_dates_from', '' );
-				update_post_meta( $product_id, '_sale_price_dates_to', '' );
+				$product->set_price( $product->get_regular_price() );
 			}
 		}
 
 		// Product parent ID for groups
 		if ( isset( $data['parent_id'] ) ) {
-			wp_update_post( array( 'ID' => $product_id, 'post_parent' => absint( $data['parent_id'] ) ) );
-		}
-
-		// Update parent if grouped so price sorting works and stays in sync with the cheapest child
-		$_product = wc_get_product( $product_id );
-		if ( $_product->post->post_parent > 0 || $product_type == 'grouped' ) {
-
-			$clear_parent_ids = array();
-
-			if ( $_product->post->post_parent > 0 ) {
-				$clear_parent_ids[] = $_product->post->post_parent;
-			}
-
-			if ( $product_type == 'grouped' ) {
-				$clear_parent_ids[] = $product_id;
-			}
-
-			if ( $clear_parent_ids ) {
-				foreach ( $clear_parent_ids as $clear_id ) {
-
-					$children_by_price = get_posts( array(
-						'post_parent'    => $clear_id,
-						'orderby'        => 'meta_value_num',
-						'order'          => 'asc',
-						'meta_key'       => '_price',
-						'posts_per_page' => 1,
-						'post_type'      => 'product',
-						'fields'         => 'ids'
-					) );
-
-					if ( $children_by_price ) {
-						foreach ( $children_by_price as $child ) {
-							$child_price = get_post_meta( $child, '_price', true );
-							update_post_meta( $clear_id, '_price', $child_price );
-						}
-					}
-				}
-			}
+			$product->set_parent_id( absint( $data['parent_id'] ) );
 		}
 
 		// Sold Individually
 		if ( isset( $data['sold_individually'] ) ) {
-			update_post_meta( $product_id, '_sold_individually', ( true === $data['sold_individually'] ) ? 'yes' : '' );
+			$product->set_sold_individually( true === $data['sold_individually'] ? 'yes' : '' );
 		}
 
 		// Stock status
 		if ( isset( $data['in_stock'] ) ) {
 			$stock_status = ( true === $data['in_stock'] ) ? 'instock' : 'outofstock';
 		} else {
-			$stock_status = get_post_meta( $product_id, '_stock_status', true );
+			$stock_status = $product->get_stock_status();
 
 			if ( '' === $stock_status ) {
 				$stock_status = 'instock';
@@ -1081,9 +1098,9 @@ class WC_API_Products extends WC_API_Resource {
 			// Manage stock
 			if ( isset( $data['managing_stock'] ) ) {
 				$managing_stock = ( true === $data['managing_stock'] ) ? 'yes' : 'no';
-				update_post_meta( $product_id, '_manage_stock', $managing_stock );
+				$product->set_manage_stock( $managing_stock );
 			} else {
-				$managing_stock = get_post_meta( $product_id, '_manage_stock', true );
+				$managing_stock = $product->get_manage_stock() ? 'yes' : 'no';
 			}
 
 			// Backorders
@@ -1094,48 +1111,42 @@ class WC_API_Products extends WC_API_Resource {
 					$backorders = ( true === $data['backorders'] ) ? 'yes' : 'no';
 				}
 
-				update_post_meta( $product_id, '_backorders', $backorders );
+				$product->set_backorders( $backorders );
 			} else {
-				$backorders = get_post_meta( $product_id, '_backorders', true );
+				$backorders = $product->get_backorders();
 			}
 
-			if ( 'grouped' == $product_type ) {
-
-				update_post_meta( $product_id, '_manage_stock', 'no' );
-				update_post_meta( $product_id, '_backorders', 'no' );
-				update_post_meta( $product_id, '_stock', '' );
-
-				wc_update_product_stock_status( $product_id, $stock_status );
-
-			} elseif ( 'external' == $product_type ) {
-
-				update_post_meta( $product_id, '_manage_stock', 'no' );
-				update_post_meta( $product_id, '_backorders', 'no' );
-				update_post_meta( $product_id, '_stock', '' );
-
-				wc_update_product_stock_status( $product_id, 'instock' );
-
+			if ( $product->is_type( 'grouped' ) ) {
+				$product->set_manage_stock( 'no' );
+				$product->set_backorders( 'no' );
+				$product->set_stock_quantity( '' );
+				$product->set_stock_status( $stock_status );
+			} elseif ( $product->is_type( 'external' ) ) {
+				$product->set_manage_stock( 'no' );
+				$product->set_backorders( 'no' );
+				$product->set_stock_quantity( '' );
+				$product->set_stock_status( 'instock' );
 			} elseif ( 'yes' == $managing_stock ) {
-				update_post_meta( $product_id, '_backorders', $backorders );
+				$product->set_backorders( $backorders );
 
-				wc_update_product_stock_status( $product_id, $stock_status );
+				// Stock status is always determined by children so sync later.
+				if ( ! $product->is_type( 'variable' ) ) {
+					$product->set_stock_status( $stock_status );
+				}
 
 				// Stock quantity
 				if ( isset( $data['stock_quantity'] ) ) {
-					wc_update_product_stock( $product_id, intval( $data['stock_quantity'] ) );
+					$product->set_stock_quantity( wc_stock_amount( $data['stock_quantity'] ) );
 				}
 			} else {
-
-				// Don't manage stock
-				update_post_meta( $product_id, '_manage_stock', 'no' );
-				update_post_meta( $product_id, '_backorders', $backorders );
-				update_post_meta( $product_id, '_stock', '' );
-
-				wc_update_product_stock_status( $product_id, $stock_status );
+				// Don't manage stock.
+				$product->set_manage_stock( 'no' );
+				$product->set_backorders( $backorders );
+				$product->set_stock_quantity( '' );
+				$product->set_stock_status( $stock_status );
 			}
-
-		} else {
-			wc_update_product_stock_status( $product_id, $stock_status );
+		} elseif ( ! $product->is_type( 'variable' ) ) {
+			$product->set_stock_status( $stock_status );
 		}
 
 		// Upsells
@@ -1150,9 +1161,9 @@ class WC_API_Products extends WC_API_Resource {
 					}
 				}
 
-				update_post_meta( $product_id, '_upsell_ids', $upsells );
+				$product->set_upsell_ids( $upsells );
 			} else {
-				delete_post_meta( $product_id, '_upsell_ids' );
+				$product->set_upsell_ids( array() );
 			}
 		}
 
@@ -1168,30 +1179,28 @@ class WC_API_Products extends WC_API_Resource {
 					}
 				}
 
-				update_post_meta( $product_id, '_crosssell_ids', $crosssells );
+				$product->set_cross_sell_ids( $crosssells );
 			} else {
-				delete_post_meta( $product_id, '_crosssell_ids' );
+				$product->set_cross_sell_ids( array() );
 			}
 		}
 
 		// Product categories
 		if ( isset( $data['categories'] ) && is_array( $data['categories'] ) ) {
-			$term_ids = array_unique( array_map( 'intval', $data['categories'] ) );
-			wp_set_object_terms( $product_id, $term_ids, 'product_cat' );
+			$product->set_category_ids( $data['categories'] );
 		}
 
 		// Product tags
 		if ( isset( $data['tags'] ) && is_array( $data['tags'] ) ) {
-			$term_ids = array_unique( array_map( 'intval', $data['tags'] ) );
-			wp_set_object_terms( $product_id, $term_ids, 'product_tag' );
+			$product->set_tag_ids( $data['tags'] );
 		}
 
 		// Downloadable
 		if ( isset( $data['downloadable'] ) ) {
 			$is_downloadable = ( true === $data['downloadable'] ) ? 'yes' : 'no';
-			update_post_meta( $product_id, '_downloadable', $is_downloadable );
+			$product->set_downloadable( $is_downloadable );
 		} else {
-			$is_downloadable = get_post_meta( $product_id, '_downloadable', true );
+			$is_downloadable = $product->get_downloadable() ? 'yes' : 'no';
 		}
 
 		// Downloadable options
@@ -1199,285 +1208,189 @@ class WC_API_Products extends WC_API_Resource {
 
 			// Downloadable files
 			if ( isset( $data['downloads'] ) && is_array( $data['downloads'] ) ) {
-				$this->save_downloadable_files( $product_id, $data['downloads'] );
+				$product = $this->save_downloadable_files( $product, $data['downloads'] );
 			}
 
 			// Download limit
 			if ( isset( $data['download_limit'] ) ) {
-				update_post_meta( $product_id, '_download_limit', ( '' === $data['download_limit'] ) ? '' : absint( $data['download_limit'] ) );
+				$product->set_download_limit( $data['download_limit'] );
 			}
 
 			// Download expiry
 			if ( isset( $data['download_expiry'] ) ) {
-				update_post_meta( $product_id, '_download_expiry', ( '' === $data['download_expiry'] ) ? '' : absint( $data['download_expiry'] ) );
-			}
-
-			// Download type
-			if ( isset( $data['download_type'] ) ) {
-				update_post_meta( $product_id, '_download_type', wc_clean( $data['download_type'] ) );
+				$product->set_download_expiry( $data['download_expiry'] );
 			}
 		}
 
 		// Product url
-		if ( $product_type == 'external' ) {
+		if ( $product->is_type( 'external' ) ) {
 			if ( isset( $data['product_url'] ) ) {
-				update_post_meta( $product_id, '_product_url', wc_clean( $data['product_url'] ) );
+				$product->set_product_url( $data['product_url'] );
 			}
 
 			if ( isset( $data['button_text'] ) ) {
-				update_post_meta( $product_id, '_button_text', wc_clean( $data['button_text'] ) );
+				$product->set_button_text( $data['button_text'] );
 			}
 		}
 
 		// Reviews allowed
 		if ( isset( $data['reviews_allowed'] ) ) {
-			$reviews_allowed = ( true === $data['reviews_allowed'] ) ? 'open' : 'closed';
+			$product->set_reviews_allowed( $data['reviews_allowed'] );
+		}
 
-			$wpdb->update( $wpdb->posts, array( 'comment_status' => $reviews_allowed ), array( 'ID' => $product_id ) );
+		// Save default attributes for variable products.
+		if ( $product->is_type( 'variable' ) ) {
+			$product = $this->save_default_attributes( $product, $data );
 		}
 
 		// Do action for product type
-		do_action( 'woocommerce_api_process_product_meta_' . $product_type, $product_id, $data );
+		do_action( 'woocommerce_api_process_product_meta_' . $product->get_type(), $product->get_id(), $data );
 
-		return true;
+		return $product;
 	}
 
 	/**
 	 * Save variations
 	 *
 	 * @since  2.2
-	 * @param  int $id
-	 * @param  array $data
-	 * @return bool
+	 * @param  WC_Product $product
+	 * @param  array $request
+	 * @return WC_Product
 	 * @throws WC_API_Exception
 	 */
-	protected function save_variations( $id, $data ) {
+	protected function save_variations( $product, $request ) {
 		global $wpdb;
 
-		$variations = $data['variations'];
-		$attributes = (array) maybe_unserialize( get_post_meta( $id, '_product_attributes', true ) );
+		$id         = $product->get_id();
+		$attributes = $product->get_attributes();
 
-		foreach ( $variations as $menu_order => $variation ) {
-			$variation_id = isset( $variation['id'] ) ? absint( $variation['id'] ) : 0;
+		foreach ( $request['variations'] as $menu_order => $data ) {
+			$variation_id = isset( $data['id'] ) ? absint( $data['id'] ) : 0;
+			$variation    = new WC_Product_Variation( $variation_id );
 
-			// Generate a useful post title
-			$variation_post_title = sprintf( __( 'Variation #%s of %s', 'woocommerce' ), $variation_id, esc_html( get_the_title( $id ) ) );
+			// Create initial name and status.
+			if ( ! $variation->get_slug() ) {
+				/* translators: 1: variation id 2: product name */
+				$variation->set_name( sprintf( __( 'Variation #%1$s of %2$s', 'woocommerce' ), $variation->get_id(), $product->get_name() ) );
+				$variation->set_status( isset( $data['visible'] ) && false === $data['visible'] ? 'private' : 'publish' );
+			}
 
-			// Update or Add post
-			if ( ! $variation_id ) {
-				$post_status = ( isset( $variation['visible'] ) && false === $variation['visible'] ) ? 'private' : 'publish';
+			// Parent ID.
+			$variation->set_parent_id( $product->get_id() );
 
-				$new_variation = array(
-					'post_title'   => $variation_post_title,
-					'post_content' => '',
-					'post_status'  => $post_status,
-					'post_author'  => get_current_user_id(),
-					'post_parent'  => $id,
-					'post_type'    => 'product_variation',
-					'menu_order'   => $menu_order
-				);
+			// Menu order.
+			$variation->set_menu_order( $menu_order );
 
-				$variation_id = wp_insert_post( $new_variation );
+			// Status.
+			if ( isset( $data['visible'] ) ) {
+				$variation->set_status( false === $data['visible'] ? 'private' : 'publish' );
+			}
 
-				do_action( 'woocommerce_create_product_variation', $variation_id );
-			} else {
-				$update_variation = array( 'post_title' => $variation_post_title, 'menu_order' => $menu_order );
-				if ( isset( $variation['visible'] ) ) {
-					$post_status = ( false === $variation['visible'] ) ? 'private' : 'publish';
-					$update_variation['post_status'] = $post_status;
+			// SKU.
+			if ( isset( $data['sku'] ) ) {
+				$variation->set_sku( wc_clean( $data['sku'] ) );
+			}
+
+			// Thumbnail.
+			if ( isset( $data['image'] ) && is_array( $data['image'] ) ) {
+				$image = current( $data['image'] );
+				if ( is_array( $image ) ) {
+					$image['position'] = 0;
 				}
 
-				$wpdb->update( $wpdb->posts, $update_variation, array( 'ID' => $variation_id ) );
-
-				do_action( 'woocommerce_update_product_variation', $variation_id );
+				$variation = $this->save_product_images( $variation, array( $image ) );
 			}
 
-			// Stop with we don't have a variation ID
-			if ( is_wp_error( $variation_id ) ) {
-				throw new WC_API_Exception( 'woocommerce_api_cannot_save_product_variation', $variation_id->get_error_message(), 400 );
+			// Virtual variation.
+			if ( isset( $data['virtual'] ) ) {
+				$variation->set_virtual( $data['virtual'] );
 			}
 
-			// SKU
-			if ( isset( $variation['sku'] ) ) {
-				$sku     = get_post_meta( $variation_id, '_sku', true );
-				$new_sku = wc_clean( $variation['sku'] );
+			// Downloadable variation.
+			if ( isset( $data['downloadable'] ) ) {
+				$is_downloadable = $data['downloadable'];
+				$variation->set_downloadable( $is_downloadable );
+			} else {
+				$is_downloadable = $variation->get_downloadable();
+			}
 
-				if ( '' == $new_sku ) {
-					update_post_meta( $variation_id, '_sku', '' );
-				} elseif ( $new_sku !== $sku ) {
-					if ( ! empty( $new_sku ) ) {
-						$unique_sku = wc_product_has_unique_sku( $variation_id, $new_sku );
-						if ( ! $unique_sku ) {
-							throw new WC_API_Exception( 'woocommerce_api_product_sku_already_exists', __( 'The SKU already exists on another product', 'woocommerce' ), 400 );
-						} else {
-							update_post_meta( $variation_id, '_sku', $new_sku );
-						}
-					} else {
-						update_post_meta( $variation_id, '_sku', '' );
-					}
+			// Downloads.
+			if ( $is_downloadable ) {
+				// Downloadable files.
+				if ( isset( $data['downloads'] ) && is_array( $data['downloads'] ) ) {
+					$variation = $this->save_downloadable_files( $variation, $data['downloads'] );
+				}
+
+				// Download limit.
+				if ( isset( $data['download_limit'] ) ) {
+					$variation->set_download_limit( $data['download_limit'] );
+				}
+
+				// Download expiry.
+				if ( isset( $data['download_expiry'] ) ) {
+					$variation->set_download_expiry( $data['download_expiry'] );
 				}
 			}
 
-			// Thumbnail
-			if ( isset( $variation['image'] ) && is_array( $variation['image'] ) ) {
-				$image = current( $variation['image'] );
-				if ( $image && is_array( $image ) ) {
-					if ( isset( $image['position'] ) && isset( $image['src'] ) && $image['position'] == 0 ) {
-						$upload = $this->upload_product_image( wc_clean( $image['src'] ) );
-						if ( is_wp_error( $upload ) ) {
-							throw new WC_API_Exception( 'woocommerce_api_cannot_upload_product_image', $upload->get_error_message(), 400 );
-						}
-						$attachment_id = $this->set_product_image_as_attachment( $upload, $id );
-						update_post_meta( $variation_id, '_thumbnail_id', $attachment_id );
-					}
-				} else {
-					delete_post_meta( $variation_id, '_thumbnail_id' );
-				}
+			// Shipping data.
+			$variation = $this->save_product_shipping_data( $variation, $data );
+
+			// Stock handling.
+			$manage_stock = (bool) $variation->get_manage_stock();
+			if ( isset( $data['managing_stock'] ) ) {
+				$manage_stock = $data['managing_stock'];
 			}
+			$variation->set_manage_stock( $manage_stock );
 
-			// Virtual variation
-			if ( isset( $variation['virtual'] ) ) {
-				$is_virtual = ( true === $variation['virtual'] ) ? 'yes' : 'no';
-				update_post_meta( $variation_id, '_virtual', $is_virtual );
+			$stock_status = $variation->get_stock_status();
+			if ( isset( $data['in_stock'] ) ) {
+				$stock_status = true === $data['in_stock'] ? 'instock' : 'outofstock';
 			}
+			$variation->set_stock_status( $stock_status );
 
-			// Downloadable variation
-			if ( isset( $variation['downloadable'] ) ) {
-				$is_downloadable = ( true === $variation['downloadable'] ) ? 'yes' : 'no';
-				update_post_meta( $variation_id, '_downloadable', $is_downloadable );
-			} else {
-				$is_downloadable = get_post_meta( $variation_id, '_downloadable', true );
+			$backorders = $variation->get_backorders();
+			if ( isset( $data['backorders'] ) ) {
+				$backorders = $data['backorders'];
 			}
+			$variation->set_backorders( $backorders );
 
-			// Shipping data
-			$this->save_product_shipping_data( $variation_id, $variation );
-
-			// Stock handling
-			if ( isset( $variation['managing_stock'] ) ) {
-				$managing_stock = ( true === $variation['managing_stock'] ) ? 'yes' : 'no';
-				update_post_meta( $variation_id, '_manage_stock', $managing_stock );
-			} else {
-				$managing_stock = get_post_meta( $variation_id, '_manage_stock', true );
-			}
-
-			// Only update stock status to user setting if changed by the user, but do so before looking at stock levels at variation level
-			if ( isset( $variation['in_stock'] ) ) {
-				$stock_status = ( true === $variation['in_stock'] ) ? 'instock' : 'outofstock';
-				wc_update_product_stock_status( $variation_id, $stock_status );
-			}
-
-			if ( 'yes' === $managing_stock ) {
-				$backorders = get_post_meta( $variation_id, '_backorders', true );
-
-				if ( isset( $variation['backorders'] ) ) {
-					if ( 'notify' == $variation['backorders'] ) {
-						$backorders = 'notify';
-					} else {
-						$backorders = ( true === $variation['backorders'] ) ? 'yes' : 'no';
-					}
-				}
-
-				update_post_meta( $variation_id, '_backorders', '' === $backorders ? 'no' : $backorders );
-
-				if ( isset( $variation['stock_quantity'] ) ) {
-					wc_update_product_stock( $variation_id, wc_stock_amount( $variation['stock_quantity'] ) );
+			if ( $manage_stock ) {
+				if ( isset( $data['stock_quantity'] ) ) {
+					$variation->set_stock_quantity( $data['stock_quantity'] );
 				}
 			} else {
-				delete_post_meta( $variation_id, '_backorders' );
-				delete_post_meta( $variation_id, '_stock' );
+				$variation->set_backorders( 'no' );
+				$variation->set_stock_quantity( '' );
 			}
 
-			// Regular Price
-			if ( isset( $variation['regular_price'] ) ) {
-				$regular_price = ( '' === $variation['regular_price'] ) ? '' : wc_format_decimal( $variation['regular_price'] );
-				update_post_meta( $variation_id, '_regular_price', $regular_price );
-			} else {
-				$regular_price = get_post_meta( $variation_id, '_regular_price', true );
+			// Regular Price.
+			if ( isset( $data['regular_price'] ) ) {
+				$variation->set_regular_price( $data['regular_price'] );
 			}
 
-			// Sale Price
-			if ( isset( $variation['sale_price'] ) ) {
-				$sale_price = ( '' === $variation['sale_price'] ) ? '' : wc_format_decimal( $variation['sale_price'] );
-				update_post_meta( $variation_id, '_sale_price', $sale_price );
-			} else {
-				$sale_price = get_post_meta( $variation_id, '_sale_price', true );
+			// Sale Price.
+			if ( isset( $data['sale_price'] ) ) {
+				$variation->set_sale_price( $data['sale_price'] );
 			}
 
-			$date_from = isset( $variation['sale_price_dates_from'] ) ? strtotime( $variation['sale_price_dates_from'] ) : get_post_meta( $variation_id, '_sale_price_dates_from', true );
-			$date_to   = isset( $variation['sale_price_dates_to'] ) ? strtotime( $variation['sale_price_dates_to'] ) : get_post_meta( $variation_id, '_sale_price_dates_to', true );
-
-			// Save Dates
-			if ( $date_from ) {
-				update_post_meta( $variation_id, '_sale_price_dates_from', $date_from );
-			} else {
-				update_post_meta( $variation_id, '_sale_price_dates_from', '' );
+			if ( isset( $data['sale_price_dates_from'] ) ) {
+				$variation->set_date_on_sale_from( $data['sale_price_dates_from'] );
 			}
 
-			if ( $date_to ) {
-				update_post_meta( $variation_id, '_sale_price_dates_to', $date_to );
-			} else {
-				update_post_meta( $variation_id, '_sale_price_dates_to', '' );
+			if ( isset( $data['sale_price_dates_to'] ) ) {
+				$variation->set_date_on_sale_to( $data['sale_price_dates_to'] );
 			}
 
-			if ( $date_to && ! $date_from ) {
-				update_post_meta( $variation_id, '_sale_price_dates_from', strtotime( 'NOW', current_time( 'timestamp' ) ) );
+			// Tax class.
+			if ( isset( $data['tax_class'] ) ) {
+				$variation->set_tax_class( $data['tax_class'] );
 			}
 
-			// Update price if on sale
-			if ( '' != $sale_price && '' == $date_to && '' == $date_from ) {
-				update_post_meta( $variation_id, '_price', $sale_price );
-			} else {
-				update_post_meta( $variation_id, '_price', $regular_price );
-			}
+			// Update taxonomies.
+			if ( isset( $data['attributes'] ) ) {
+				$_attributes = array();
 
-			if ( '' != $sale_price && $date_from && $date_from < strtotime( 'NOW', current_time( 'timestamp' ) ) ) {
-				update_post_meta( $variation_id, '_price', $sale_price );
-			}
-
-			if ( $date_to && $date_to < strtotime( 'NOW', current_time( 'timestamp' ) ) ) {
-				update_post_meta( $variation_id, '_price', $regular_price );
-				update_post_meta( $variation_id, '_sale_price_dates_from', '' );
-				update_post_meta( $variation_id, '_sale_price_dates_to', '' );
-			}
-
-			// Tax class
-			if ( isset( $variation['tax_class'] ) ) {
-				if ( $variation['tax_class'] !== 'parent' ) {
-					update_post_meta( $variation_id, '_tax_class', wc_clean( $variation['tax_class'] ) );
-				} else {
-					delete_post_meta( $variation_id, '_tax_class' );
-				}
-			}
-
-			// Downloads
-			if ( 'yes' == $is_downloadable ) {
-				// Downloadable files
-				if ( isset( $variation['downloads'] ) && is_array( $variation['downloads'] ) ) {
-					$this->save_downloadable_files( $id, $variation['downloads'], $variation_id );
-				}
-
-				// Download limit
-				if ( isset( $variation['download_limit'] ) ) {
-					$download_limit = absint( $variation['download_limit'] );
-					update_post_meta( $variation_id, '_download_limit', ( ! $download_limit ) ? '' : $download_limit );
-				}
-
-				// Download expiry
-				if ( isset( $variation['download_expiry'] ) ) {
-					$download_expiry = absint( $variation['download_expiry'] );
-					update_post_meta( $variation_id, '_download_expiry', ( ! $download_expiry ) ? '' : $download_expiry );
-				}
-			} else {
-				update_post_meta( $variation_id, '_download_limit', '' );
-				update_post_meta( $variation_id, '_download_expiry', '' );
-				update_post_meta( $variation_id, '_downloadable_files', '' );
-			}
-
-			// Update taxonomies
-			if ( isset( $variation['attributes'] ) ) {
-				$updated_attribute_keys = array();
-
-				foreach ( $variation['attributes'] as $attribute_key => $attribute ) {
+				foreach ( $data['attributes'] as $attribute_key => $attribute ) {
 					if ( ! isset( $attribute['name'] ) ) {
 						continue;
 					}
@@ -1498,8 +1411,7 @@ class WC_API_Products extends WC_API_Resource {
 					}
 
 					if ( isset( $_attribute['is_variation'] ) && $_attribute['is_variation'] ) {
-						$_attribute_key           = 'attribute_' . sanitize_title( $_attribute['name'] );
-						$updated_attribute_keys[] = $_attribute_key;
+						$_attribute_key = sanitize_title( $_attribute['name'] );
 
 						if ( isset( $_attribute['is_taxonomy'] ) && $_attribute['is_taxonomy'] ) {
 							// Don't use wc_clean as it destroys sanitized characters
@@ -1508,68 +1420,18 @@ class WC_API_Products extends WC_API_Resource {
 							$_attribute_value = isset( $attribute['option'] ) ? wc_clean( stripslashes( $attribute['option'] ) ) : '';
 						}
 
-						update_post_meta( $variation_id, $_attribute_key, $_attribute_value );
+						$_attributes[ $_attribute_key ] = $_attribute_value;
 					}
 				}
 
-				// Remove old taxonomies attributes so data is kept up to date - first get attribute key names
-				$delete_attribute_keys = $wpdb->get_col( $wpdb->prepare( "SELECT meta_key FROM {$wpdb->postmeta} WHERE meta_key LIKE 'attribute_%%' AND meta_key NOT IN ( '" . implode( "','", $updated_attribute_keys ) . "' ) AND post_id = %d;", $variation_id ) );
-
-				foreach ( $delete_attribute_keys as $key ) {
-					delete_post_meta( $variation_id, $key );
-				}
+				$variation->set_attributes( $_attributes );
 			}
 
+			$variation->save();
+
 			do_action( 'woocommerce_api_save_product_variation', $variation_id, $menu_order, $variation );
 		}
 
-		// Update parent if variable so price sorting works and stays in sync with the cheapest child
-		WC_Product_Variable::sync( $id );
-
-		// Update default attributes options setting
-		if ( isset( $data['default_attribute'] ) ) {
-			$data['default_attributes'] = $data['default_attribute'];
-		}
-
-		if ( isset( $data['default_attributes'] ) && is_array( $data['default_attributes'] ) ) {
-			$default_attributes = array();
-
-			foreach ( $data['default_attributes'] as $default_attr_key => $default_attr ) {
-				if ( ! isset( $default_attr['name'] ) ) {
-					continue;
-				}
-
-				$taxonomy = sanitize_title( $default_attr['name'] );
-
-				if ( isset( $default_attr['slug'] ) ) {
-					$taxonomy = $this->get_attribute_taxonomy_by_slug( $default_attr['slug'] );
-				}
-
-				if ( isset( $attributes[ $taxonomy ] ) ) {
-					$_attribute = $attributes[ $taxonomy ];
-
-					if ( $_attribute['is_variation'] ) {
-						$value = '';
-
-						if ( isset( $default_attr['option'] ) ) {
-							if ( $_attribute['is_taxonomy'] ) {
-								// Don't use wc_clean as it destroys sanitized characters
-								$value = sanitize_title( trim( stripslashes( $default_attr['option'] ) ) );
-							} else {
-								$value = wc_clean( trim( stripslashes( $default_attr['option'] ) ) );
-							}
-						}
-
-						if ( $value ) {
-							$default_attributes[ $taxonomy ] = $value;
-						}
-					}
-				}
-			}
-
-			update_post_meta( $id, '_default_attributes', $default_attributes );
-		}
-
 		return true;
 	}
 
@@ -1577,29 +1439,30 @@ class WC_API_Products extends WC_API_Resource {
 	 * Save product shipping data
 	 *
 	 * @since 2.2
-	 * @param int $id
+	 * @param WC_Product $product
 	 * @param array $data
+	 * @return WC_Product
 	 */
-	private function save_product_shipping_data( $id, $data ) {
+	private function save_product_shipping_data( $product, $data ) {
 		if ( isset( $data['weight'] ) ) {
-			update_post_meta( $id, '_weight', ( '' === $data['weight'] ) ? '' : wc_format_decimal( $data['weight'] ) );
+			$product->set_weight( '' === $data['weight'] ? '' : wc_format_decimal( $data['weight'] ) );
 		}
 
 		// Product dimensions
 		if ( isset( $data['dimensions'] ) ) {
 			// Height
 			if ( isset( $data['dimensions']['height'] ) ) {
-				update_post_meta( $id, '_height', ( '' === $data['dimensions']['height'] ) ? '' : wc_format_decimal( $data['dimensions']['height'] ) );
+				$product->set_height( '' === $data['dimensions']['height'] ? '' : wc_format_decimal( $data['dimensions']['height'] ) );
 			}
 
 			// Width
 			if ( isset( $data['dimensions']['width'] ) ) {
-				update_post_meta( $id, '_width', ( '' === $data['dimensions']['width'] ) ? '' : wc_format_decimal($data['dimensions']['width'] ) );
+				$product->set_width( '' === $data['dimensions']['width'] ? '' : wc_format_decimal( $data['dimensions']['width'] ) );
 			}
 
 			// Length
 			if ( isset( $data['dimensions']['length'] ) ) {
-				update_post_meta( $id, '_length', ( '' === $data['dimensions']['length'] ) ? '' : wc_format_decimal( $data['dimensions']['length'] ) );
+				$product->set_length( '' === $data['dimensions']['length'] ? '' : wc_format_decimal( $data['dimensions']['length'] ) );
 			}
 		}
 
@@ -1608,59 +1471,58 @@ class WC_API_Products extends WC_API_Resource {
 			$virtual = ( true === $data['virtual'] ) ? 'yes' : 'no';
 
 			if ( 'yes' == $virtual ) {
-				update_post_meta( $id, '_weight', '' );
-				update_post_meta( $id, '_length', '' );
-				update_post_meta( $id, '_width', '' );
-				update_post_meta( $id, '_height', '' );
+				$product->set_weight( '' );
+				$product->set_height( '' );
+				$product->set_length( '' );
+				$product->set_width( '' );
 			}
 		}
 
 		// Shipping class
 		if ( isset( $data['shipping_class'] ) ) {
-			wp_set_object_terms( $id, wc_clean( $data['shipping_class'] ), 'product_shipping_class' );
+			$data_store         = $product->get_data_store();
+			$shipping_class_id  = $data_store->get_shipping_class_id_by_slug( wc_clean( $data['shipping_class'] ) );
+			if ( $shipping_class_id ) {
+				$product->set_shipping_class_id( $shipping_class_id );
+			}
 		}
+
+		return $product;
 	}
 
 	/**
 	 * Save downloadable files
 	 *
 	 * @since 2.2
-	 * @param int $product_id
+	 * @param WC_Product $product
 	 * @param array $downloads
-	 * @param int $variation_id
+	 * @param int $deprecated Deprecated since 3.0.
+	 * @return WC_Product
 	 */
-	private function save_downloadable_files( $product_id, $downloads, $variation_id = 0 ) {
-		$files = array();
+	private function save_downloadable_files( $product, $downloads, $deprecated = 0 ) {
+		if ( $deprecated ) {
+			wc_deprecated_argument( 'variation_id', '3.0', 'save_downloadable_files() does not require a variation_id anymore.' );
+		}
 
-		// File paths will be stored in an array keyed off md5(file path)
+		$files = array();
 		foreach ( $downloads as $key => $file ) {
 			if ( isset( $file['url'] ) ) {
 				$file['file'] = $file['url'];
 			}
 
-			if ( ! isset( $file['file'] ) ) {
+			if ( empty( $file['file'] ) ) {
 				continue;
 			}
 
-			$file_name = isset( $file['name'] ) ? wc_clean( $file['name'] ) : '';
-
-			if ( 0 === strpos( $file['file'], 'http' ) ) {
-				$file_url = esc_url_raw( $file['file'] );
-			} else {
-				$file_url = wc_clean( $file['file'] );
-			}
-
-			$files[ md5( $file_url ) ] = array(
-				'name' => $file_name,
-				'file' => $file_url
-			);
+			$download = new WC_Product_Download();
+			$download->set_id( $key );
+			$download->set_name( $file['name'] ? $file['name'] : wc_get_filename_from_url( $file['file'] ) );
+			$download->set_file( apply_filters( 'woocommerce_file_download_path', $file['file'], $product, $key ) );
+			$files[]  = $download;
 		}
+		$product->set_downloads( $files );
 
-		// Grant permission to any newly added files on any existing orders for this product prior to saving
-		do_action( 'woocommerce_process_product_file_download_paths', $product_id, $variation_id, $files );
-
-		$id = ( 0 === $variation_id ) ? $product_id : $variation_id;
-		update_post_meta( $id, '_downloadable_files', $files );
+		return $product;
 	}
 
 	/**
@@ -1693,34 +1555,18 @@ class WC_API_Products extends WC_API_Resource {
 	 * @return array
 	 */
 	private function get_images( $product ) {
+		$images        = $attachment_ids = array();
+		$product_image = $product->get_image_id();
 
-		$images = $attachment_ids = array();
-
-		if ( $product->is_type( 'variation' ) ) {
-
-			if ( has_post_thumbnail( $product->get_variation_id() ) ) {
-
-				// Add variation image if set
-				$attachment_ids[] = get_post_thumbnail_id( $product->get_variation_id() );
-
-			} elseif ( has_post_thumbnail( $product->id ) ) {
-
-				// Otherwise use the parent product featured image if set
-				$attachment_ids[] = get_post_thumbnail_id( $product->id );
-			}
-
-		} else {
-
-			// Add featured image
-			if ( has_post_thumbnail( $product->id ) ) {
-				$attachment_ids[] = get_post_thumbnail_id( $product->id );
-			}
-
-			// Add gallery images
-			$attachment_ids = array_merge( $attachment_ids, $product->get_gallery_attachment_ids() );
+		// Add featured image.
+		if ( ! empty( $product_image ) ) {
+			$attachment_ids[] = $product_image;
 		}
 
-		// Build image data
+		// Add gallery images.
+		$attachment_ids = array_merge( $attachment_ids, $product->get_gallery_image_ids() );
+
+		// Build image data.
 		foreach ( $attachment_ids as $position => $attachment_id ) {
 
 			$attachment_post = get_post( $attachment_id );
@@ -1746,12 +1592,12 @@ class WC_API_Products extends WC_API_Resource {
 			);
 		}
 
-		// Set a placeholder image if the product has no images set
+		// Set a placeholder image if the product has no images set.
 		if ( empty( $images ) ) {
 
 			$images[] = array(
 				'id'         => 0,
-				'created_at' => $this->server->format_datetime( time() ), // Default to now
+				'created_at' => $this->server->format_datetime( time() ), // Default to now.
 				'updated_at' => $this->server->format_datetime( time() ),
 				'src'        => wc_placeholder_img_src(),
 				'title'      => __( 'Placeholder', 'woocommerce' ),
@@ -1767,16 +1613,16 @@ class WC_API_Products extends WC_API_Resource {
 	 * Save product images
 	 *
 	 * @since  2.2
+	 * @param WC_Product $product
 	 * @param  array $images
-	 * @param  int $id
 	 * @throws WC_API_Exception
 	 */
-	protected function save_product_images( $id, $images ) {
+	protected function save_product_images( $product, $images ) {
 		if ( is_array( $images ) ) {
 			$gallery = array();
 
 			foreach ( $images as $image ) {
-				if ( isset( $image['position'] ) && $image['position'] == 0 ) {
+				if ( isset( $image['position'] ) && 0 == $image['position'] ) {
 					$attachment_id = isset( $image['id'] ) ? absint( $image['id'] ) : 0;
 
 					if ( 0 === $attachment_id && isset( $image['src'] ) ) {
@@ -1786,10 +1632,10 @@ class WC_API_Products extends WC_API_Resource {
 							throw new WC_API_Exception( 'woocommerce_api_cannot_upload_product_image', $upload->get_error_message(), 400 );
 						}
 
-						$attachment_id = $this->set_product_image_as_attachment( $upload, $id );
+						$attachment_id = $this->set_product_image_as_attachment( $upload, $product->get_id() );
 					}
 
-					set_post_thumbnail( $id, $attachment_id );
+					$product->set_image_id( $attachment_id );
 				} else {
 					$attachment_id = isset( $image['id'] ) ? absint( $image['id'] ) : 0;
 
@@ -1800,7 +1646,7 @@ class WC_API_Products extends WC_API_Resource {
 							throw new WC_API_Exception( 'woocommerce_api_cannot_upload_product_image', $upload->get_error_message(), 400 );
 						}
 
-						$gallery[] = $this->set_product_image_as_attachment( $upload, $id );
+						$gallery[] = $this->set_product_image_as_attachment( $upload, $product->get_id() );
 					} else {
 						$gallery[] = $attachment_id;
 					}
@@ -1808,12 +1654,14 @@ class WC_API_Products extends WC_API_Resource {
 			}
 
 			if ( ! empty( $gallery ) ) {
-				update_post_meta( $id, '_product_image_gallery', implode( ',', $gallery ) );
+				$product->set_gallery_image_ids( $gallery );
 			}
 		} else {
-			delete_post_thumbnail( $id );
-			update_post_meta( $id, '_product_image_gallery', '' );
+			$product->set_image_id( '' );
+			$product->set_gallery_image_ids( array() );
 		}
+
+		return $product;
 	}
 
 	/**
@@ -1825,13 +1673,12 @@ class WC_API_Products extends WC_API_Resource {
 	 * @throws WC_API_Exception
 	 */
 	public function upload_product_image( $image_url ) {
-		$file_name 		= basename( current( explode( '?', $image_url ) ) );
-		$wp_filetype 	= wp_check_filetype( $file_name, null );
-		$parsed_url 	= @parse_url( $image_url );
+		$file_name  = basename( current( explode( '?', $image_url ) ) );
+		$parsed_url = @parse_url( $image_url );
 
 		// Check parsed URL
 		if ( ! $parsed_url || ! is_array( $parsed_url ) ) {
-			throw new WC_API_Exception( 'woocommerce_api_invalid_product_image', sprintf( __( 'Invalid URL %s', 'woocommerce' ), $image_url ), 400 );
+			throw new WC_API_Exception( 'woocommerce_api_invalid_product_image', sprintf( __( 'Invalid URL %s.', 'woocommerce' ), $image_url ), 400 );
 		}
 
 		// Ensure url is valid
@@ -1839,14 +1686,18 @@ class WC_API_Products extends WC_API_Resource {
 
 		// Get the file
 		$response = wp_safe_remote_get( $image_url, array(
-			'timeout' => 10
+			'timeout' => 10,
 		) );
 
-		if ( is_wp_error( $response ) || 200 !== wp_remote_retrieve_response_code( $response ) ) {
-			throw new WC_API_Exception( 'woocommerce_api_invalid_remote_product_image', sprintf( __( 'Error getting remote image %s', 'woocommerce' ), $image_url ), 400 );
+		if ( is_wp_error( $response ) ) {
+			throw new WC_API_Exception( 'woocommerce_api_invalid_remote_product_image', sprintf( __( 'Error getting remote image %s.', 'woocommerce' ), $image_url ) . ' ' . sprintf( __( 'Error: %s.', 'woocommerce' ), $response->get_error_message() ), 400 );
+		} elseif ( 200 !== wp_remote_retrieve_response_code( $response ) ) {
+			throw new WC_API_Exception( 'woocommerce_api_invalid_remote_product_image', sprintf( __( 'Error getting remote image %s.', 'woocommerce' ), $image_url ), 400 );
 		}
 
 		// Ensure we have a file name and type
+		$wp_filetype = wp_check_filetype( $file_name, wc_rest_allowed_image_mime_types() );
+
 		if ( ! $wp_filetype['type'] ) {
 			$headers = wp_remote_retrieve_headers( $response );
 			if ( isset( $headers['content-disposition'] ) && strstr( $headers['content-disposition'], 'filename=' ) ) {
@@ -1857,6 +1708,13 @@ class WC_API_Products extends WC_API_Resource {
 				$file_name = 'image.' . str_replace( 'image/', '', $headers['content-type'] );
 			}
 			unset( $headers );
+
+			// Recheck filetype
+			$wp_filetype = wp_check_filetype( $file_name, wc_rest_allowed_image_mime_types() );
+
+			if ( ! $wp_filetype['type'] ) {
+				throw new WC_API_Exception( 'woocommerce_api_invalid_product_image', __( 'Invalid image type.', 'woocommerce' ), 400 );
+			}
 		}
 
 		// Upload the file
@@ -1872,7 +1730,7 @@ class WC_API_Products extends WC_API_Resource {
 		if ( 0 == $filesize ) {
 			@unlink( $upload['file'] );
 			unset( $upload );
-			throw new WC_API_Exception( 'woocommerce_api_product_image_upload_file_error', __( 'Zero size file downloaded', 'woocommerce' ), 400 );
+			throw new WC_API_Exception( 'woocommerce_api_product_image_upload_file_error', __( 'Zero size file downloaded.', 'woocommerce' ), 400 );
 		}
 
 		unset( $response );
@@ -1881,10 +1739,10 @@ class WC_API_Products extends WC_API_Resource {
 	}
 
 	/**
-	 * Get product image as attachment
+	 * Sets product image as attachment and returns the attachment ID.
 	 *
 	 * @since 2.2
-	 * @param integer $upload
+	 * @param array $upload
 	 * @param int $id
 	 * @return int
 	 */
@@ -1895,10 +1753,10 @@ class WC_API_Products extends WC_API_Resource {
 
 		if ( $image_meta = @wp_read_image_metadata( $upload['file'] ) ) {
 			if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
-				$title = $image_meta['title'];
+				$title = wc_clean( $image_meta['title'] );
 			}
 			if ( trim( $image_meta['caption'] ) ) {
-				$content = $image_meta['caption'];
+				$content = wc_clean( $image_meta['caption'] );
 			}
 		}
 
@@ -1907,7 +1765,7 @@ class WC_API_Products extends WC_API_Resource {
 			'guid'           => $upload['url'],
 			'post_parent'    => $id,
 			'post_title'     => $title,
-			'post_content'   => $content
+			'post_content'   => $content,
 		);
 
 		$attachment_id = wp_insert_attachment( $attachment, $upload['file'], $id );
@@ -1918,6 +1776,23 @@ class WC_API_Products extends WC_API_Resource {
 		return $attachment_id;
 	}
 
+	/**
+	 * Get attribute options.
+	 *
+	 * @param int $product_id
+	 * @param array $attribute
+	 * @return array
+	 */
+	protected function get_attribute_options( $product_id, $attribute ) {
+		if ( isset( $attribute['is_taxonomy'] ) && $attribute['is_taxonomy'] ) {
+			return wc_get_product_terms( $product_id, $attribute['name'], array( 'fields' => 'names' ) );
+		} elseif ( isset( $attribute['value'] ) ) {
+			return array_map( 'trim', explode( '|', $attribute['value'] ) );
+		}
+
+		return array();
+	}
+
 	/**
 	 * Get the attributes for a product or product variation
 	 *
@@ -1941,25 +1816,16 @@ class WC_API_Products extends WC_API_Resource {
 					'option' => $attribute,
 				);
 			}
-
 		} else {
 
 			foreach ( $product->get_attributes() as $attribute ) {
-
-				// taxonomy-based attributes are comma-separated, others are pipe (|) separated
-				if ( $attribute['is_taxonomy'] ) {
-					$options = explode( ',', $product->get_attribute( $attribute['name'] ) );
-				} else {
-					$options = explode( '|', $product->get_attribute( $attribute['name'] ) );
-				}
-
 				$attributes[] = array(
 					'name'      => wc_attribute_label( $attribute['name'] ),
 					'slug'      => str_replace( 'pa_', '', $attribute['name'] ),
 					'position'  => (int) $attribute['position'],
 					'visible'   => (bool) $attribute['is_visible'],
 					'variation' => (bool) $attribute['is_variation'],
-					'options'   => array_map( 'trim', $options ),
+					'options'   => $this->get_attribute_options( $product->get_id(), $attribute ),
 				);
 			}
 		}
@@ -1980,7 +1846,7 @@ class WC_API_Products extends WC_API_Resource {
 
 		if ( $product->is_downloadable() ) {
 
-			foreach ( $product->get_files() as $file_id => $file ) {
+			foreach ( $product->get_downloads() as $file_id => $file ) {
 
 				$downloads[] = array(
 					'id'   => $file_id, // do not cast as int as this is a hash
@@ -2017,7 +1883,7 @@ class WC_API_Products extends WC_API_Resource {
 					'slug'         => wc_attribute_taxonomy_name( $attribute->attribute_name ),
 					'type'         => $attribute->attribute_type,
 					'order_by'     => $attribute->attribute_orderby,
-					'has_archives' => (bool) $attribute->attribute_public
+					'has_archives' => (bool) $attribute->attribute_public,
 				);
 			}
 
@@ -2067,7 +1933,7 @@ class WC_API_Products extends WC_API_Resource {
 				'slug'         => wc_attribute_taxonomy_name( $attribute->attribute_name ),
 				'type'         => $attribute->attribute_type,
 				'order_by'     => $attribute->attribute_orderby,
-				'has_archives' => (bool) $attribute->attribute_public
+				'has_archives' => (bool) $attribute->attribute_public,
 			);
 
 			return array( 'product_attribute' => apply_filters( 'woocommerce_api_product_attribute_response', $product_attribute, $id, $fields, $attribute, $this ) );
@@ -2095,9 +1961,9 @@ class WC_API_Products extends WC_API_Resource {
 
 		if ( strlen( $slug ) >= 28 ) {
 			throw new WC_API_Exception( 'woocommerce_api_invalid_product_attribute_slug_too_long', sprintf( __( 'Slug "%s" is too long (28 characters max). Shorten it, please.', 'woocommerce' ), $slug ), 400 );
-		} else if ( wc_check_if_attribute_name_is_reserved( $slug ) ) {
+		} elseif ( wc_check_if_attribute_name_is_reserved( $slug ) ) {
 			throw new WC_API_Exception( 'woocommerce_api_invalid_product_attribute_slug_reserved_name', sprintf( __( 'Slug "%s" is not allowed because it is a reserved term. Change it, please.', 'woocommerce' ), $slug ), 400 );
-		} else if ( $new_data && taxonomy_exists( wc_attribute_taxonomy_name( $slug ) ) ) {
+		} elseif ( $new_data && taxonomy_exists( wc_attribute_taxonomy_name( $slug ) ) ) {
 			throw new WC_API_Exception( 'woocommerce_api_invalid_product_attribute_slug_already_exists', sprintf( __( 'Slug "%s" is already in use. Change it, please.', 'woocommerce' ), $slug ), 400 );
 		}
 
@@ -2169,7 +2035,7 @@ class WC_API_Products extends WC_API_Resource {
 					'attribute_name'    => $data['slug'],
 					'attribute_type'    => $data['type'],
 					'attribute_orderby' => $data['order_by'],
-					'attribute_public'  => isset( $data['has_archives'] ) && true === $data['has_archives'] ? 1 : 0
+					'attribute_public'  => isset( $data['has_archives'] ) && true === $data['has_archives'] ? 1 : 0,
 				),
 				array( '%s', '%s', '%s', '%s', '%d' )
 			);
@@ -2252,7 +2118,7 @@ class WC_API_Products extends WC_API_Resource {
 					'attribute_name'    => $attribute_slug,
 					'attribute_type'    => $attribute_type,
 					'attribute_orderby' => $attribute_order_by,
-					'attribute_public'  => $attribute_public
+					'attribute_public'  => $attribute_public,
 				),
 				array( 'attribute_id' => $id ),
 				array( '%s', '%s', '%s', '%s', '%d' ),
@@ -2378,7 +2244,8 @@ class WC_API_Products extends WC_API_Resource {
 		}
 
 		// Delete product
-		wp_delete_post( $product_id, true );
+		$product = wc_get_product( $product_id );
+		$product->delete();
 	}
 
 	/**
@@ -2402,7 +2269,7 @@ class WC_API_Products extends WC_API_Resource {
 
 			// Limit bulk operation
 			if ( count( $data ) > $limit ) {
-				throw new WC_API_Exception( 'woocommerce_api_products_request_entity_too_large', sprintf( __( 'Unable to accept more than %s items for this request', 'woocommerce' ), $limit ), 413 );
+				throw new WC_API_Exception( 'woocommerce_api_products_request_entity_too_large', sprintf( __( 'Unable to accept more than %s items for this request.', 'woocommerce' ), $limit ), 413 );
 			}
 
 			$products = array();
@@ -2421,30 +2288,30 @@ class WC_API_Products extends WC_API_Resource {
 					$product_id  = wc_get_product_id_by_sku( $product_sku );
 				}
 
-				// Product exists / edit product
 				if ( $product_id ) {
+
+					// Product exists / edit product
 					$edit = $this->edit_product( $product_id, array( 'product' => $_product ) );
 
 					if ( is_wp_error( $edit ) ) {
 						$products[] = array(
 							'id'    => $product_id,
 							'sku'   => $product_sku,
-							'error' => array( 'code' => $edit->get_error_code(), 'message' => $edit->get_error_message() )
+							'error' => array( 'code' => $edit->get_error_code(), 'message' => $edit->get_error_message() ),
 						);
 					} else {
 						$products[] = $edit['product'];
 					}
-				}
+				} else {
 
-				// Product don't exists / create product
-				else {
+					// Product don't exists / create product
 					$new = $this->create_product( array( 'product' => $_product ) );
 
 					if ( is_wp_error( $new ) ) {
 						$products[] = array(
 							'id'    => $product_id,
 							'sku'   => $product_sku,
-							'error' => array( 'code' => $new->get_error_code(), 'message' => $new->get_error_message() )
+							'error' => array( 'code' => $new->get_error_code(), 'message' => $new->get_error_message() ),
 						);
 					} else {
 						$products[] = $new['product'];
diff --git a/includes/api/v2/class-wc-api-reports.php b/includes/api/legacy/v2/class-wc-api-reports.php
similarity index 98%
rename from includes/api/v2/class-wc-api-reports.php
rename to includes/api/legacy/v2/class-wc-api-reports.php
index e981f8b7307..834ecd105af 100644
--- a/includes/api/v2/class-wc-api-reports.php
+++ b/includes/api/legacy/v2/class-wc-api-reports.php
@@ -40,7 +40,7 @@ class WC_API_Reports extends WC_API_Resource {
 		);
 
 		# GET /reports/sales
-		$routes[ $this->base . '/sales'] = array(
+		$routes[ $this->base . '/sales' ] = array(
 			array( array( $this, 'get_sales_report' ), WC_API_Server::READABLE ),
 		);
 
@@ -223,14 +223,14 @@ class WC_API_Reports extends WC_API_Resource {
 					'type'            => 'order_item_meta',
 					'order_item_type' => 'line_item',
 					'function'        => '',
-					'name'            => 'product_id'
+					'name'            => 'product_id',
 				),
 				'_qty' => array(
 					'type'            => 'order_item_meta',
 					'order_item_type' => 'line_item',
 					'function'        => 'SUM',
-					'name'            => 'order_item_qty'
-				)
+					'name'            => 'order_item_qty',
+				),
 			),
 			'order_by'     => 'order_item_qty DESC',
 			'group_by'     => 'product_id',
@@ -247,7 +247,7 @@ class WC_API_Reports extends WC_API_Resource {
 
 			if ( $product ) {
 				$top_sellers_data[] = array(
-					'title'      => $product->get_title(),
+					'title'      => $product->get_name(),
 					'product_id' => $top_seller->product_id,
 					'quantity'   => $top_seller->order_item_qty,
 				);
@@ -286,7 +286,6 @@ class WC_API_Reports extends WC_API_Resource {
 				// default custom range to today
 				$_GET['start_date'] = $_GET['end_date'] = date( 'Y-m-d', current_time( 'timestamp' ) );
 			}
-
 		} else {
 
 			// ensure period is valid
diff --git a/includes/api/v2/class-wc-api-resource.php b/includes/api/legacy/v2/class-wc-api-resource.php
similarity index 95%
rename from includes/api/v2/class-wc-api-resource.php
rename to includes/api/legacy/v2/class-wc-api-resource.php
index 3377478aeb7..a5830db8672 100644
--- a/includes/api/v2/class-wc-api-resource.php
+++ b/includes/api/legacy/v2/class-wc-api-resource.php
@@ -41,14 +41,24 @@ class WC_API_Resource {
 			add_filter( "woocommerce_api_{$resource}_response", array( $this, 'maybe_add_meta' ), 15, 2 );
 		}
 
-		$response_names = array( 'order', 'coupon', 'customer', 'product', 'report',
-			'customer_orders', 'customer_downloads', 'order_note', 'order_refund',
-			'product_reviews', 'product_category'
+		$response_names = array(
+			'order',
+			'coupon',
+			'customer',
+			'product',
+			'report',
+			'customer_orders',
+			'customer_downloads',
+			'order_note',
+			'order_refund',
+			'product_reviews',
+			'product_category',
 		);
 
 		foreach ( $response_names as $name ) {
 
-			/* remove fields from responses when requests specify certain fields
+			/**
+			 * Remove fields from responses when requests specify certain fields
 			 * note these are hooked at a later priority so data added via
 			 * filters (e.g. customer data to the order response) still has the
 			 * fields filtered properly
@@ -91,7 +101,7 @@ class WC_API_Resource {
 			$post = get_post( $id );
 
 			if ( null === $post ) {
-				return new WP_Error( "woocommerce_api_no_{$resource_name}_found", sprintf( __( 'No %s found with the ID equal to %s', 'woocommerce' ), $resource_name, $id ), array( 'status' => 404 ) );
+				return new WP_Error( "woocommerce_api_no_{$resource_name}_found", sprintf( __( 'No %1$s found with the ID equal to %2$s', 'woocommerce' ), $resource_name, $id ), array( 'status' => 404 ) );
 			}
 
 			// For checking permissions, product variations are the same as the product post type
@@ -106,18 +116,21 @@ class WC_API_Resource {
 			switch ( $context ) {
 
 				case 'read':
-					if ( ! $this->is_readable( $post ) )
+					if ( ! $this->is_readable( $post ) ) {
 						return new WP_Error( "woocommerce_api_user_cannot_read_{$resource_name}", sprintf( __( 'You do not have permission to read this %s', 'woocommerce' ), $resource_name ), array( 'status' => 401 ) );
+					}
 					break;
 
 				case 'edit':
-					if ( ! $this->is_editable( $post ) )
+					if ( ! $this->is_editable( $post ) ) {
 						return new WP_Error( "woocommerce_api_user_cannot_edit_{$resource_name}", sprintf( __( 'You do not have permission to edit this %s', 'woocommerce' ), $resource_name ), array( 'status' => 401 ) );
+					}
 					break;
 
 				case 'delete':
-					if ( ! $this->is_deletable( $post ) )
+					if ( ! $this->is_deletable( $post ) ) {
 						return new WP_Error( "woocommerce_api_user_cannot_delete_{$resource_name}", sprintf( __( 'You do not have permission to delete this %s', 'woocommerce' ), $resource_name ), array( 'status' => 401 ) );
+					}
 					break;
 			}
 		}
@@ -233,8 +246,9 @@ class WC_API_Resource {
 		if ( isset( $this->server->params['GET']['filter']['meta'] ) && 'true' === $this->server->params['GET']['filter']['meta'] && is_object( $resource ) ) {
 
 			// don't attempt to add meta more than once
-			if ( preg_grep( '/[a-z]+_meta/', array_keys( $data ) ) )
+			if ( preg_grep( '/[a-z]+_meta/', array_keys( $data ) ) ) {
 				return $data;
+			}
 
 			// define the top-level property name for the meta
 			switch ( get_class( $resource ) ) {
@@ -272,14 +286,13 @@ class WC_API_Resource {
 				$meta = (array) get_post_meta( $resource->id );
 			}
 
-			foreach( $meta as $meta_key => $meta_value ) {
+			foreach ( $meta as $meta_key => $meta_value ) {
 
 				// don't add hidden meta by default
 				if ( ! is_protected_meta( $meta_key ) ) {
 					$data[ $meta_name ][ $meta_key ] = maybe_unserialize( $meta_value[0] );
 				}
 			}
-
 		}
 
 		return $data;
@@ -328,7 +341,6 @@ class WC_API_Resource {
 						unset( $data[ $data_field ][ $sub_field ] );
 					}
 				}
-
 			} else {
 
 				// remove non-matching top-level fields
@@ -367,11 +379,9 @@ class WC_API_Resource {
 			} else {
 				return new WP_Error( 'woocommerce_api_cannot_delete_customer', __( 'The customer cannot be deleted', 'woocommerce' ), array( 'status' => 500 ) );
 			}
-
 		} else {
 
 			// delete order/coupon/webhook
-
 			$result = ( $force ) ? wp_delete_post( $id, true ) : wp_trash_post( $id );
 
 			if ( ! $result ) {
@@ -459,5 +469,4 @@ class WC_API_Resource {
 			return false;
 		}
 	}
-
 }
diff --git a/includes/api/v2/class-wc-api-server.php b/includes/api/legacy/v2/class-wc-api-server.php
similarity index 90%
rename from includes/api/v2/class-wc-api-server.php
rename to includes/api/legacy/v2/class-wc-api-server.php
index 8ed3013ac1f..1251cd23162 100644
--- a/includes/api/v2/class-wc-api-server.php
+++ b/includes/api/legacy/v2/class-wc-api-server.php
@@ -154,14 +154,16 @@ class WC_API_Server {
 		// allow plugins to remove default authentication or add their own authentication
 		$user = apply_filters( 'woocommerce_api_check_authentication', null, $this );
 
-		// API requests run under the context of the authenticated user
 		if ( is_a( $user, 'WP_User' ) ) {
-			wp_set_current_user( $user->ID );
-		}
 
-		// WP_Errors are handled in serve_request()
-		elseif ( ! is_wp_error( $user ) ) {
+			// API requests run under the context of the authenticated user
+			wp_set_current_user( $user->ID );
+
+		} elseif ( ! is_wp_error( $user ) ) {
+
+			// WP_Errors are handled in serve_request()
 			$user = new WP_Error( 'woocommerce_api_authentication_error', __( 'Invalid authentication method', 'woocommerce' ), array( 'code' => 500 ) );
+
 		}
 
 		return $user;
@@ -442,31 +444,33 @@ class WC_API_Server {
 	public function get_index() {
 
 		// General site data
-		$available = array( 'store' => array(
-			'name'        => get_option( 'blogname' ),
-			'description' => get_option( 'blogdescription' ),
-			'URL'         => get_option( 'siteurl' ),
-			'wc_version'  => WC()->version,
-			'routes'      => array(),
-			'meta'        => array(
-				'timezone'           => wc_timezone_string(),
-				'currency'           => get_woocommerce_currency(),
-				'currency_format'    => get_woocommerce_currency_symbol(),
-				'currency_position'  => get_option( 'woocommerce_currency_pos' ),
-				'thousand_separator' => get_option( 'woocommerce_price_decimal_sep' ),
-				'decimal_separator'  => get_option( 'woocommerce_price_thousand_sep' ),
-				'price_num_decimals' => wc_get_price_decimals(),
-				'tax_included'       => wc_prices_include_tax(),
-				'weight_unit'        => get_option( 'woocommerce_weight_unit' ),
-				'dimension_unit'     => get_option( 'woocommerce_dimension_unit' ),
-				'ssl_enabled'        => ( 'yes' === get_option( 'woocommerce_force_ssl_checkout' ) ),
-				'permalinks_enabled' => ( '' !== get_option( 'permalink_structure' ) ),
-				'generate_password'  => ( 'yes' === get_option( 'woocommerce_registration_generate_password' ) ),
-				'links'              => array(
-					'help' => 'http://woothemes.github.io/woocommerce-rest-api-docs/',
+		$available = array(
+			'store' => array(
+				'name'        => get_option( 'blogname' ),
+				'description' => get_option( 'blogdescription' ),
+				'URL'         => get_option( 'siteurl' ),
+				'wc_version'  => WC()->version,
+				'routes'      => array(),
+				'meta'        => array(
+					'timezone'           => wc_timezone_string(),
+					'currency'           => get_woocommerce_currency(),
+					'currency_format'    => get_woocommerce_currency_symbol(),
+					'currency_position'  => get_option( 'woocommerce_currency_pos' ),
+					'thousand_separator' => get_option( 'woocommerce_price_thousand_sep' ),
+					'decimal_separator'  => get_option( 'woocommerce_price_decimal_sep' ),
+					'price_num_decimals' => wc_get_price_decimals(),
+					'tax_included'       => wc_prices_include_tax(),
+					'weight_unit'        => get_option( 'woocommerce_weight_unit' ),
+					'dimension_unit'     => get_option( 'woocommerce_dimension_unit' ),
+					'ssl_enabled'        => ( 'yes' === get_option( 'woocommerce_force_ssl_checkout' ) ),
+					'permalinks_enabled' => ( '' !== get_option( 'permalink_structure' ) ),
+					'generate_password'  => ( 'yes' === get_option( 'woocommerce_registration_generate_password' ) ),
+					'links'              => array(
+						'help' => 'https://woocommerce.github.io/woocommerce-rest-api-docs/',
+					),
 				),
 			),
-		) );
+		);
 
 		// Find the available routes
 		foreach ( $this->get_routes() as $route => $callbacks ) {
@@ -570,7 +574,7 @@ class WC_API_Server {
 			$single      = count( $query->get_results() ) == 1;
 			$total       = $query->get_total();
 
-			if( $query->get( 'number' ) > 0 ) {
+			if ( $query->get( 'number' ) > 0 ) {
 				$page = ( $query->get( 'offset' ) / $query->get( 'number' ) ) + 1;
 				$total_pages = ceil( $total / $query->get( 'number' ) );
 			} else {
@@ -700,9 +704,17 @@ class WC_API_Server {
 	 * @since 2.1
 	 * @param int|string $timestamp unix timestamp or MySQL datetime
 	 * @param bool $convert_to_utc
+	 * @param bool $convert_to_gmt Use GMT timezone.
 	 * @return string RFC3339 datetime
 	 */
-	public function format_datetime( $timestamp, $convert_to_utc = false ) {
+	public function format_datetime( $timestamp, $convert_to_utc = false, $convert_to_gmt = false ) {
+		if ( $convert_to_gmt ) {
+			if ( is_numeric( $timestamp ) ) {
+				$timestamp = date( 'Y-m-d H:i:s', $timestamp );
+			}
+
+			$timestamp = get_gmt_from_date( $timestamp );
+		}
 
 		if ( $convert_to_utc ) {
 			$timezone = new DateTimeZone( wc_timezone_string() );
@@ -722,7 +734,6 @@ class WC_API_Server {
 			if ( $convert_to_utc ) {
 				$date->modify( -1 * $date->getOffset() . ' seconds' );
 			}
-
 		} catch ( Exception $e ) {
 
 			$date = new DateTime( '@0' );
@@ -738,13 +749,13 @@ class WC_API_Server {
 	 * @param array $server Associative array similar to $_SERVER
 	 * @return array Headers extracted from the input
 	 */
-	public function get_headers($server) {
+	public function get_headers( $server ) {
 		$headers = array();
 		// CONTENT_* headers are not prefixed with HTTP_
-		$additional = array('CONTENT_LENGTH' => true, 'CONTENT_MD5' => true, 'CONTENT_TYPE' => true);
+		$additional = array( 'CONTENT_LENGTH' => true, 'CONTENT_MD5' => true, 'CONTENT_TYPE' => true );
 
-		foreach ($server as $key => $value) {
-			if ( strpos( $key, 'HTTP_' ) === 0) {
+		foreach ( $server as $key => $value ) {
+			if ( strpos( $key, 'HTTP_' ) === 0 ) {
 				$headers[ substr( $key, 5 ) ] = $value;
 			} elseif ( isset( $additional[ $key ] ) ) {
 				$headers[ $key ] = $value;
@@ -753,5 +764,4 @@ class WC_API_Server {
 
 		return $headers;
 	}
-
 }
diff --git a/includes/api/v2/class-wc-api-webhooks.php b/includes/api/legacy/v2/class-wc-api-webhooks.php
similarity index 95%
rename from includes/api/v2/class-wc-api-webhooks.php
rename to includes/api/legacy/v2/class-wc-api-webhooks.php
index 18d545e8ca2..a774e38f1f2 100644
--- a/includes/api/v2/class-wc-api-webhooks.php
+++ b/includes/api/legacy/v2/class-wc-api-webhooks.php
@@ -35,7 +35,7 @@ class WC_API_Webhooks extends WC_API_Resource {
 		);
 
 		# GET /webhooks/count
-		$routes[ $this->base . '/count'] = array(
+		$routes[ $this->base . '/count' ] = array(
 			array( array( $this, 'get_webhooks_count' ), WC_API_Server::READABLE ),
 		);
 
@@ -173,14 +173,14 @@ class WC_API_Webhooks extends WC_API_Resource {
 
 			// permission check
 			if ( ! current_user_can( 'publish_shop_webhooks' ) ) {
-				throw new WC_API_Exception( 'woocommerce_api_user_cannot_create_webhooks', __( 'You do not have permission to create webhooks', 'woocommerce' ), 401 );
+				throw new WC_API_Exception( 'woocommerce_api_user_cannot_create_webhooks', __( 'You do not have permission to create webhooks.', 'woocommerce' ), 401 );
 			}
 
 			$data = apply_filters( 'woocommerce_api_create_webhook_data', $data, $this );
 
 			// validate topic
 			if ( empty( $data['topic'] ) || ! wc_is_webhook_valid_topic( strtolower( $data['topic'] ) ) ) {
-				throw new WC_API_Exception( 'woocommerce_api_invalid_webhook_topic', __( 'Webhook topic is required and must be valid', 'woocommerce' ), 400 );
+				throw new WC_API_Exception( 'woocommerce_api_invalid_webhook_topic', __( 'Webhook topic is required and must be valid.', 'woocommerce' ), 400 );
 			}
 
 			// validate delivery URL
@@ -194,7 +194,9 @@ class WC_API_Webhooks extends WC_API_Resource {
 				'ping_status'   => 'closed',
 				'post_author'   => get_current_user_id(),
 				'post_password' => strlen( ( $password = uniqid( 'webhook_' ) ) ) > 20 ? substr( $password, 0, 20 ) : $password,
+				// @codingStandardsIgnoreStart
 				'post_title'    => ! empty( $data['name'] ) ? $data['name'] : sprintf( __( 'Webhook created on %s', 'woocommerce' ), strftime( _x( '%b %d, %Y @ %I:%M %p', 'Webhook created on date parsed by strftime', 'woocommerce' ) ) ),
+				// @codingStandardsIgnoreEnd
 			), $data, $this );
 
 			$webhook_id = wp_insert_post( $webhook_data );
@@ -210,7 +212,10 @@ class WC_API_Webhooks extends WC_API_Resource {
 			$webhook->set_delivery_url( $data['delivery_url'] );
 
 			// set secret if provided, defaults to API users consumer secret
-			$webhook->set_secret( ! empty( $data['secret'] ) ? $data['secret'] : get_user_meta( get_current_user_id(), 'woocommerce_api_consumer_secret', true ) );
+			$webhook->set_secret( ! empty( $data['secret'] ) ? $data['secret'] : '' );
+
+			// Set API version to legacy v3.
+			$webhook->set_api_version( 'legacy_v3' );
 
 			// send ping
 			$webhook->deliver_ping();
@@ -265,7 +270,7 @@ class WC_API_Webhooks extends WC_API_Resource {
 					$webhook->set_topic( $data['topic'] );
 
 				} else {
-					throw new WC_API_Exception( 'woocommerce_api_invalid_webhook_topic', __( 'Webhook topic must be valid', 'woocommerce' ), 400 );
+					throw new WC_API_Exception( 'woocommerce_api_invalid_webhook_topic', __( 'Webhook topic must be valid.', 'woocommerce' ), 400 );
 				}
 			}
 
@@ -293,7 +298,7 @@ class WC_API_Webhooks extends WC_API_Resource {
 			// update user ID
 			$webhook_data = array(
 				'ID'          => $webhook->id,
-				'post_author' => get_current_user_id()
+				'post_author' => get_current_user_id(),
 			);
 
 			// update name
@@ -434,7 +439,7 @@ class WC_API_Webhooks extends WC_API_Resource {
 			$id = absint( $id );
 
 			if ( empty( $id ) ) {
-				throw new WC_API_Exception( 'woocommerce_api_invalid_webhook_delivery_id', __( 'Invalid webhook delivery ID', 'woocommerce' ), 404 );
+				throw new WC_API_Exception( 'woocommerce_api_invalid_webhook_delivery_id', __( 'Invalid webhook delivery ID.', 'woocommerce' ), 404 );
 			}
 
 			$webhook = new WC_Webhook( $webhook_id );
@@ -442,7 +447,7 @@ class WC_API_Webhooks extends WC_API_Resource {
 			$log = $webhook->get_delivery_log( $id );
 
 			if ( ! $log ) {
-				throw new WC_API_Exception( 'woocommerce_api_invalid_webhook_delivery_id', __( 'Invalid webhook delivery', 'woocommerce' ), 400 );
+				throw new WC_API_Exception( 'woocommerce_api_invalid_webhook_delivery_id', __( 'Invalid webhook delivery.', 'woocommerce' ), 400 );
 			}
 
 			$delivery_log = $log;
@@ -458,5 +463,4 @@ class WC_API_Webhooks extends WC_API_Resource {
 			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
 		}
 	}
-
 }
diff --git a/includes/api/interface-wc-api-handler.php b/includes/api/legacy/v2/interface-wc-api-handler.php
similarity index 100%
rename from includes/api/interface-wc-api-handler.php
rename to includes/api/legacy/v2/interface-wc-api-handler.php
diff --git a/includes/api/class-wc-api-authentication.php b/includes/api/legacy/v3/class-wc-api-authentication.php
similarity index 90%
rename from includes/api/class-wc-api-authentication.php
rename to includes/api/legacy/v3/class-wc-api-authentication.php
index 534b307129a..57b738fa52f 100644
--- a/includes/api/class-wc-api-authentication.php
+++ b/includes/api/legacy/v3/class-wc-api-authentication.php
@@ -80,14 +80,13 @@ class WC_API_Authentication {
 			$keys = $this->get_keys_by_consumer_key( $params['consumer_key'] );
 
 			if ( ! $this->is_consumer_secret_valid( $keys['consumer_secret'], $params['consumer_secret'] ) ) {
-				throw new Exception( __( 'Consumer Secret is invalid', 'woocommerce' ), 401 );
+				throw new Exception( __( 'Consumer secret is invalid.', 'woocommerce' ), 401 );
 			}
 
 			return $keys;
 		}
 
 		// if the above is not present, we will do full basic auth
-
 		if ( empty( $_SERVER['PHP_AUTH_USER'] ) || empty( $_SERVER['PHP_AUTH_PW'] ) ) {
 			$this->exit_with_unauthorized_headers();
 		}
@@ -109,10 +108,10 @@ class WC_API_Authentication {
 	 * @since 2.4
 	 */
 	private function exit_with_unauthorized_headers() {
-		$auth_message = __( 'WooCommerce API. Use a consumer key in the username field and a consumer secret in the password field', 'woocommerce' );
+		$auth_message = __( 'WooCommerce API. Use a consumer key in the username field and a consumer secret in the password field.', 'woocommerce' );
 		header( 'WWW-Authenticate: Basic realm="' . $auth_message . '"' );
 		header( 'HTTP/1.0 401 Unauthorized' );
-		throw new Exception( __( 'Consumer Secret is invalid', 'woocommerce' ), 401 );
+		throw new Exception( __( 'Consumer Secret is invalid.', 'woocommerce' ), 401 );
 	}
 
 	/**
@@ -136,7 +135,7 @@ class WC_API_Authentication {
 
 		$params = WC()->api->server->params['GET'];
 
-		$param_names =  array( 'oauth_consumer_key', 'oauth_timestamp', 'oauth_nonce', 'oauth_signature', 'oauth_signature_method' );
+		$param_names = array( 'oauth_consumer_key', 'oauth_timestamp', 'oauth_nonce', 'oauth_signature', 'oauth_signature_method' );
 
 		// Check for required OAuth parameters
 		foreach ( $param_names as $param_name ) {
@@ -177,7 +176,7 @@ class WC_API_Authentication {
 		", $consumer_key ), ARRAY_A );
 
 		if ( empty( $keys ) ) {
-			throw new Exception( __( 'Consumer Key is invalid', 'woocommerce' ), 401 );
+			throw new Exception( __( 'Consumer key is invalid.', 'woocommerce' ), 401 );
 		}
 
 		return $keys;
@@ -234,12 +233,12 @@ class WC_API_Authentication {
 		$base_request_uri = rawurlencode( untrailingslashit( get_woocommerce_api_url( '' ) ) . $server_path );
 
 		// Get the signature provided by the consumer and remove it from the parameters prior to checking the signature
-		$consumer_signature = rawurldecode( $params['oauth_signature'] );
+		$consumer_signature = rawurldecode( str_replace( ' ', '+', $params['oauth_signature'] ) );
 		unset( $params['oauth_signature'] );
 
 		// Sort parameters
 		if ( ! uksort( $params, 'strcmp' ) ) {
-			throw new Exception( __( 'Invalid Signature - failed to sort parameters', 'woocommerce' ), 401 );
+			throw new Exception( __( 'Invalid signature - failed to sort parameters.', 'woocommerce' ), 401 );
 		}
 
 		// Normalize parameter key/values
@@ -258,8 +257,8 @@ class WC_API_Authentication {
 
 		$string_to_sign = $http_method . '&' . $base_request_uri . '&' . $query_string;
 
-		if ( $params['oauth_signature_method'] !== 'HMAC-SHA1' && $params['oauth_signature_method'] !== 'HMAC-SHA256' ) {
-			throw new Exception( __( 'Invalid Signature - signature method is invalid', 'woocommerce' ), 401 );
+		if ( 'HMAC-SHA1' !== $params['oauth_signature_method'] && 'HMAC-SHA256' !== $params['oauth_signature_method'] ) {
+			throw new Exception( __( 'Invalid signature - signature method is invalid.', 'woocommerce' ), 401 );
 		}
 
 		$hash_algorithm = strtolower( str_replace( 'HMAC-', '', $params['oauth_signature_method'] ) );
@@ -268,7 +267,7 @@ class WC_API_Authentication {
 		$signature = base64_encode( hash_hmac( $hash_algorithm, $string_to_sign, $secret, true ) );
 
 		if ( ! hash_equals( $signature, $consumer_signature ) ) {
-			throw new Exception( __( 'Invalid Signature - provided signature does not match', 'woocommerce' ), 401 );
+			throw new Exception( __( 'Invalid signature - provided signature does not match.', 'woocommerce' ), 401 );
 		}
 	}
 
@@ -333,7 +332,7 @@ class WC_API_Authentication {
 		$valid_window = 15 * 60; // 15 minute window
 
 		if ( ( $timestamp < time() - $valid_window ) || ( $timestamp > time() + $valid_window ) ) {
-			throw new Exception( __( 'Invalid timestamp', 'woocommerce' ), 401 );
+			throw new Exception( __( 'Invalid timestamp.', 'woocommerce' ), 401 );
 		}
 
 		$used_nonces = maybe_unserialize( $keys['nonces'] );
@@ -343,7 +342,7 @@ class WC_API_Authentication {
 		}
 
 		if ( in_array( $nonce, $used_nonces ) ) {
-			throw new Exception( __( 'Invalid nonce - nonce has already been used', 'woocommerce' ), 401 );
+			throw new Exception( __( 'Invalid nonce - nonce has already been used.', 'woocommerce' ), 401 );
 		}
 
 		$used_nonces[ $timestamp ] = $nonce;
@@ -378,7 +377,7 @@ class WC_API_Authentication {
 			case 'HEAD':
 			case 'GET':
 				if ( 'read' !== $key_permissions && 'read_write' !== $key_permissions ) {
-					throw new Exception( __( 'The API key provided does not have read permissions', 'woocommerce' ), 401 );
+					throw new Exception( __( 'The API key provided does not have read permissions.', 'woocommerce' ), 401 );
 				}
 				break;
 
@@ -387,7 +386,7 @@ class WC_API_Authentication {
 			case 'PATCH':
 			case 'DELETE':
 				if ( 'write' !== $key_permissions && 'read_write' !== $key_permissions ) {
-					throw new Exception( __( 'The API key provided does not have write permissions', 'woocommerce' ), 401 );
+					throw new Exception( __( 'The API key provided does not have write permissions.', 'woocommerce' ), 401 );
 				}
 				break;
 		}
diff --git a/includes/api/v2/class-wc-api-coupons.php b/includes/api/legacy/v3/class-wc-api-coupons.php
similarity index 85%
rename from includes/api/v2/class-wc-api-coupons.php
rename to includes/api/legacy/v3/class-wc-api-coupons.php
index 43f71b6d37c..25e285de38b 100644
--- a/includes/api/v2/class-wc-api-coupons.php
+++ b/includes/api/legacy/v3/class-wc-api-coupons.php
@@ -39,7 +39,7 @@ class WC_API_Coupons extends WC_API_Resource {
 		);
 
 		# GET /coupons/count
-		$routes[ $this->base . '/count'] = array(
+		$routes[ $this->base . '/count' ] = array(
 			array( array( $this, 'get_coupons_count' ), WC_API_Server::READABLE ),
 		);
 
@@ -103,8 +103,6 @@ class WC_API_Coupons extends WC_API_Resource {
 	 * @return array|WP_Error
 	 */
 	public function get_coupon( $id, $fields = null ) {
-		global $wpdb;
-
 		try {
 
 			$id = $this->validate_request( $id, 'shop_coupon', 'read' );
@@ -113,38 +111,35 @@ class WC_API_Coupons extends WC_API_Resource {
 				return $id;
 			}
 
-			// get the coupon code
-			$code = $wpdb->get_var( $wpdb->prepare( "SELECT post_title FROM $wpdb->posts WHERE id = %s AND post_type = 'shop_coupon' AND post_status = 'publish'", $id ) );
+			$coupon = new WC_Coupon( $id );
 
-			if ( is_null( $code ) ) {
+			if ( 0 === $coupon->get_id() ) {
 				throw new WC_API_Exception( 'woocommerce_api_invalid_coupon_id', __( 'Invalid coupon ID', 'woocommerce' ), 404 );
 			}
 
-			$coupon      = new WC_Coupon( $code );
-			$coupon_post = get_post( $coupon->id );
 			$coupon_data = array(
-				'id'                           => $coupon->id,
-				'code'                         => $coupon->code,
-				'type'                         => $coupon->type,
-				'created_at'                   => $this->server->format_datetime( $coupon_post->post_date_gmt ),
-				'updated_at'                   => $this->server->format_datetime( $coupon_post->post_modified_gmt ),
-				'amount'                       => wc_format_decimal( $coupon->coupon_amount, 2 ),
-				'individual_use'               => ( 'yes' === $coupon->individual_use ),
-				'product_ids'                  => array_map( 'absint', (array) $coupon->product_ids ),
-				'exclude_product_ids'          => array_map( 'absint', (array) $coupon->exclude_product_ids ),
-				'usage_limit'                  => ( ! empty( $coupon->usage_limit ) ) ? $coupon->usage_limit : null,
-				'usage_limit_per_user'         => ( ! empty( $coupon->usage_limit_per_user ) ) ? $coupon->usage_limit_per_user : null,
-				'limit_usage_to_x_items'       => (int) $coupon->limit_usage_to_x_items,
-				'usage_count'                  => (int) $coupon->usage_count,
-				'expiry_date'                  => ( ! empty( $coupon->expiry_date ) ) ? $this->server->format_datetime( $coupon->expiry_date ) : null,
-				'enable_free_shipping'         => $coupon->enable_free_shipping(),
-				'product_category_ids'         => array_map( 'absint', (array) $coupon->product_categories ),
-				'exclude_product_category_ids' => array_map( 'absint', (array) $coupon->exclude_product_categories ),
-				'exclude_sale_items'           => $coupon->exclude_sale_items(),
-				'minimum_amount'               => wc_format_decimal( $coupon->minimum_amount, 2 ),
-				'maximum_amount'               => wc_format_decimal( $coupon->maximum_amount, 2 ),
-				'customer_emails'              => $coupon->customer_email,
-				'description'                  => $coupon_post->post_excerpt,
+				'id'                           => $coupon->get_id(),
+				'code'                         => $coupon->get_code(),
+				'type'                         => $coupon->get_discount_type(),
+				'created_at'                   => $this->server->format_datetime( $coupon->get_date_created() ? $coupon->get_date_created()->getTimestamp() : 0 ), // API gives UTC times.
+				'updated_at'                   => $this->server->format_datetime( $coupon->get_date_modified() ? $coupon->get_date_modified()->getTimestamp() : 0 ), // API gives UTC times.
+				'amount'                       => wc_format_decimal( $coupon->get_amount(), 2 ),
+				'individual_use'               => $coupon->get_individual_use(),
+				'product_ids'                  => array_map( 'absint', (array) $coupon->get_product_ids() ),
+				'exclude_product_ids'          => array_map( 'absint', (array) $coupon->get_excluded_product_ids() ),
+				'usage_limit'                  => $coupon->get_usage_limit() ? $coupon->get_usage_limit() : null,
+				'usage_limit_per_user'         => $coupon->get_usage_limit_per_user() ? $coupon->get_usage_limit_per_user() : null,
+				'limit_usage_to_x_items'       => (int) $coupon->get_limit_usage_to_x_items(),
+				'usage_count'                  => (int) $coupon->get_usage_count(),
+				'expiry_date'                  => $coupon->get_date_expires() ? $this->server->format_datetime( $coupon->get_date_expires()->getTimestamp() ) : null, // API gives UTC times.
+				'enable_free_shipping'         => $coupon->get_free_shipping(),
+				'product_category_ids'         => array_map( 'absint', (array) $coupon->get_product_categories() ),
+				'exclude_product_category_ids' => array_map( 'absint', (array) $coupon->get_excluded_product_categories() ),
+				'exclude_sale_items'           => $coupon->get_exclude_sale_items(),
+				'minimum_amount'               => wc_format_decimal( $coupon->get_minimum_amount(), 2 ),
+				'maximum_amount'               => wc_format_decimal( $coupon->get_maximum_amount(), 2 ),
+				'customer_emails'              => $coupon->get_email_restrictions(),
+				'description'                  => $coupon->get_description(),
 			);
 
 			return array( 'coupon' => apply_filters( 'woocommerce_api_coupon_response', $coupon_data, $coupon, $fields, $this->server ) );
@@ -186,7 +181,7 @@ class WC_API_Coupons extends WC_API_Resource {
 		global $wpdb;
 
 		try {
-			$id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->posts WHERE post_title = %s AND post_type = 'shop_coupon' AND post_status = 'publish'", $code ) );
+			$id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->posts WHERE post_title = %s AND post_type = 'shop_coupon' AND post_status = 'publish' ORDER BY post_date DESC LIMIT 1;", $code ) );
 
 			if ( is_null( $id ) ) {
 				throw new WC_API_Exception( 'woocommerce_api_invalid_coupon_code', __( 'Invalid coupon code', 'woocommerce' ), 404 );
@@ -227,18 +222,10 @@ class WC_API_Coupons extends WC_API_Resource {
 				throw new WC_API_Exception( 'woocommerce_api_missing_coupon_code', sprintf( __( 'Missing parameter %s', 'woocommerce' ), 'code' ), 400 );
 			}
 
-			$coupon_code = apply_filters( 'woocommerce_coupon_code', $data['code'] );
+			$coupon_code  = wc_format_coupon_code( $data['code'] );
+			$id_from_code = wc_get_coupon_id_by_code( $coupon_code );
 
-			// Check for duplicate coupon codes
-			$coupon_found = $wpdb->get_var( $wpdb->prepare( "
-				SELECT $wpdb->posts.ID
-				FROM $wpdb->posts
-				WHERE $wpdb->posts.post_type = 'shop_coupon'
-				AND $wpdb->posts.post_status = 'publish'
-				AND $wpdb->posts.post_title = '%s'
-			 ", $coupon_code ) );
-
-			if ( $coupon_found ) {
+			if ( $id_from_code ) {
 				throw new WC_API_Exception( 'woocommerce_api_coupon_code_already_exists', __( 'The coupon code already exists', 'woocommerce' ), 400 );
 			}
 
@@ -260,7 +247,7 @@ class WC_API_Coupons extends WC_API_Resource {
 				'minimum_amount'               => '',
 				'maximum_amount'               => '',
 				'customer_emails'              => array(),
-				'description'                  => ''
+				'description'                  => '',
 			);
 
 			$coupon_data = wp_parse_args( $data, $defaults );
@@ -276,10 +263,10 @@ class WC_API_Coupons extends WC_API_Resource {
 				'post_status'  => 'publish',
 				'post_author'  => get_current_user_id(),
 				'post_type'    => 'shop_coupon',
-				'post_excerpt' => $coupon_data['description']
+				'post_excerpt' => $coupon_data['description'],
 	 		);
 
-			$id = wp_insert_post( $new_coupon, $wp_error = false );
+			$id = wp_insert_post( $new_coupon, true );
 
 			if ( is_wp_error( $id ) ) {
 				throw new WC_API_Exception( 'woocommerce_api_cannot_create_coupon', $id->get_error_message(), 400 );
@@ -296,6 +283,7 @@ class WC_API_Coupons extends WC_API_Resource {
 			update_post_meta( $id, 'limit_usage_to_x_items', absint( $coupon_data['limit_usage_to_x_items'] ) );
 			update_post_meta( $id, 'usage_count', absint( $coupon_data['usage_count'] ) );
 			update_post_meta( $id, 'expiry_date', $this->get_coupon_expiry_date( wc_clean( $coupon_data['expiry_date'] ) ) );
+			update_post_meta( $id, 'date_expires', $this->get_coupon_expiry_date( wc_clean( $coupon_data['expiry_date'] ), true ) );
 			update_post_meta( $id, 'free_shipping', ( true === $coupon_data['enable_free_shipping'] ) ? 'yes' : 'no' );
 			update_post_meta( $id, 'product_categories', array_filter( array_map( 'intval', $coupon_data['product_category_ids'] ) ) );
 			update_post_meta( $id, 'exclude_product_categories', array_filter( array_map( 'intval', $coupon_data['exclude_product_category_ids'] ) ) );
@@ -342,19 +330,10 @@ class WC_API_Coupons extends WC_API_Resource {
 			if ( isset( $data['code'] ) ) {
 				global $wpdb;
 
-				$coupon_code = apply_filters( 'woocommerce_coupon_code', $data['code'] );
+				$coupon_code  = wc_format_coupon_code( $data['code'] );
+				$id_from_code = wc_get_coupon_id_by_code( $coupon_code, $id );
 
-				// Check for duplicate coupon codes
-				$coupon_found = $wpdb->get_var( $wpdb->prepare( "
-					SELECT $wpdb->posts.ID
-					FROM $wpdb->posts
-					WHERE $wpdb->posts.post_type = 'shop_coupon'
-					AND $wpdb->posts.post_status = 'publish'
-					AND $wpdb->posts.post_title = '%s'
-					AND $wpdb->posts.ID != %s
-				 ", $coupon_code, $id ) );
-
-				if ( $coupon_found ) {
+				if ( $id_from_code ) {
 					throw new WC_API_Exception( 'woocommerce_api_coupon_code_already_exists', __( 'The coupon code already exists', 'woocommerce' ), 400 );
 				}
 
@@ -415,6 +394,7 @@ class WC_API_Coupons extends WC_API_Resource {
 
 			if ( isset( $data['expiry_date'] ) ) {
 				update_post_meta( $id, 'expiry_date', $this->get_coupon_expiry_date( wc_clean( $data['expiry_date'] ) ) );
+				update_post_meta( $id, 'date_expires', $this->get_coupon_expiry_date( wc_clean( $data['expiry_date'] ), true ) );
 			}
 
 			if ( isset( $data['enable_free_shipping'] ) ) {
@@ -479,10 +459,15 @@ class WC_API_Coupons extends WC_API_Resource {
 	 *
 	 * @since  2.3.0
 	 * @param  string $expiry_date
-	 * @return string
+	 * @param bool $as_timestamp (default: false)
+	 * @return string|int
 	 */
-	protected function get_coupon_expiry_date( $expiry_date ) {
+	protected function get_coupon_expiry_date( $expiry_date, $as_timestamp = false ) {
 		if ( '' != $expiry_date ) {
+			if ( $as_timestamp ) {
+				return strtotime( $expiry_date );
+			}
+
 			return date( 'Y-m-d', strtotime( $expiry_date ) );
 		}
 
@@ -531,7 +516,7 @@ class WC_API_Coupons extends WC_API_Resource {
 
 			// Limit bulk operation
 			if ( count( $data ) > $limit ) {
-				throw new WC_API_Exception( 'woocommerce_api_coupons_request_entity_too_large', sprintf( __( 'Unable to accept more than %s items for this request', 'woocommerce' ), $limit ), 413 );
+				throw new WC_API_Exception( 'woocommerce_api_coupons_request_entity_too_large', sprintf( __( 'Unable to accept more than %s items for this request.', 'woocommerce' ), $limit ), 413 );
 			}
 
 			$coupons = array();
@@ -544,28 +529,28 @@ class WC_API_Coupons extends WC_API_Resource {
 					$coupon_id = intval( $_coupon['id'] );
 				}
 
-				// Coupon exists / edit coupon
 				if ( $coupon_id ) {
+
+					// Coupon exists / edit coupon
 					$edit = $this->edit_coupon( $coupon_id, array( 'coupon' => $_coupon ) );
 
 					if ( is_wp_error( $edit ) ) {
 						$coupons[] = array(
 							'id'    => $coupon_id,
-							'error' => array( 'code' => $edit->get_error_code(), 'message' => $edit->get_error_message() )
+							'error' => array( 'code' => $edit->get_error_code(), 'message' => $edit->get_error_message() ),
 						);
 					} else {
 						$coupons[] = $edit['coupon'];
 					}
-				}
+				} else {
 
-				// Coupon don't exists / create coupon
-				else {
+					// Coupon don't exists / create coupon
 					$new = $this->create_coupon( array( 'coupon' => $_coupon ) );
 
 					if ( is_wp_error( $new ) ) {
 						$coupons[] = array(
 							'id'    => $coupon_id,
-							'error' => array( 'code' => $new->get_error_code(), 'message' => $new->get_error_message() )
+							'error' => array( 'code' => $new->get_error_code(), 'message' => $new->get_error_message() ),
 						);
 					} else {
 						$coupons[] = $new['coupon'];
diff --git a/includes/api/class-wc-api-customers.php b/includes/api/legacy/v3/class-wc-api-customers.php
similarity index 73%
rename from includes/api/class-wc-api-customers.php
rename to includes/api/legacy/v3/class-wc-api-customers.php
index 46b57084bac..3e9d0d10648 100644
--- a/includes/api/class-wc-api-customers.php
+++ b/includes/api/legacy/v3/class-wc-api-customers.php
@@ -64,7 +64,7 @@ class WC_API_Customers extends WC_API_Resource {
 		);
 
 		# GET /customers/count
-		$routes[ $this->base . '/count'] = array(
+		$routes[ $this->base . '/count' ] = array(
 			array( array( $this, 'get_customers_count' ), WC_API_SERVER::READABLE ),
 		);
 
@@ -146,55 +146,45 @@ class WC_API_Customers extends WC_API_Resource {
 			return $id;
 		}
 
-		$customer = new WP_User( $id );
-
-		// Get info about user's last order
-		$last_order = $wpdb->get_row( "SELECT id, post_date_gmt
-						FROM $wpdb->posts AS posts
-						LEFT JOIN {$wpdb->postmeta} AS meta on posts.ID = meta.post_id
-						WHERE meta.meta_key = '_customer_user'
-						AND   meta.meta_value = {$customer->ID}
-						AND   posts.post_type = 'shop_order'
-						AND   posts.post_status IN ( '" . implode( "','", array_keys( wc_get_order_statuses() ) ) . "' )
-						ORDER BY posts.ID DESC
-					" );
-
+		$customer      = new WC_Customer( $id );
+		$last_order    = $customer->get_last_order();
 		$customer_data = array(
-			'id'               => $customer->ID,
-			'created_at'       => $this->server->format_datetime( $customer->user_registered ),
-			'email'            => $customer->user_email,
-			'first_name'       => $customer->first_name,
-			'last_name'        => $customer->last_name,
-			'username'         => $customer->user_login,
-			'role'             => $customer->roles[0],
-			'last_order_id'    => is_object( $last_order ) ? $last_order->id : null,
-			'last_order_date'  => is_object( $last_order ) ? $this->server->format_datetime( $last_order->post_date_gmt ) : null,
-			'orders_count'     => wc_get_customer_order_count( $customer->ID ),
-			'total_spent'      => wc_format_decimal( wc_get_customer_total_spent( $customer->ID ), 2 ),
-			'avatar_url'       => $this->get_avatar_url( $customer->customer_email ),
+			'id'               => $customer->get_id(),
+			'created_at'       => $this->server->format_datetime( $customer->get_date_created() ? $customer->get_date_created()->getTimestamp() : 0 ), // API gives UTC times.
+			'last_update'      => $this->server->format_datetime( $customer->get_date_modified() ? $customer->get_date_modified()->getTimestamp() : 0 ), // API gives UTC times.
+			'email'            => $customer->get_email(),
+			'first_name'       => $customer->get_first_name(),
+			'last_name'        => $customer->get_last_name(),
+			'username'         => $customer->get_username(),
+			'role'             => $customer->get_role(),
+			'last_order_id'    => is_object( $last_order ) ? $last_order->get_id() : null,
+			'last_order_date'  => is_object( $last_order ) ? $this->server->format_datetime( $last_order->get_date_created() ? $last_order->get_date_created()->getTimestamp() : 0 ) : null, // API gives UTC times.
+			'orders_count'     => $customer->get_order_count(),
+			'total_spent'      => wc_format_decimal( $customer->get_total_spent(), 2 ),
+			'avatar_url'       => $customer->get_avatar_url(),
 			'billing_address'  => array(
-				'first_name' => $customer->billing_first_name,
-				'last_name'  => $customer->billing_last_name,
-				'company'    => $customer->billing_company,
-				'address_1'  => $customer->billing_address_1,
-				'address_2'  => $customer->billing_address_2,
-				'city'       => $customer->billing_city,
-				'state'      => $customer->billing_state,
-				'postcode'   => $customer->billing_postcode,
-				'country'    => $customer->billing_country,
-				'email'      => $customer->billing_email,
-				'phone'      => $customer->billing_phone,
+				'first_name' => $customer->get_billing_first_name(),
+				'last_name'  => $customer->get_billing_last_name(),
+				'company'    => $customer->get_billing_company(),
+				'address_1'  => $customer->get_billing_address_1(),
+				'address_2'  => $customer->get_billing_address_2(),
+				'city'       => $customer->get_billing_city(),
+				'state'      => $customer->get_billing_state(),
+				'postcode'   => $customer->get_billing_postcode(),
+				'country'    => $customer->get_billing_country(),
+				'email'      => $customer->get_billing_email(),
+				'phone'      => $customer->get_billing_phone(),
 			),
 			'shipping_address' => array(
-				'first_name' => $customer->shipping_first_name,
-				'last_name'  => $customer->shipping_last_name,
-				'company'    => $customer->shipping_company,
-				'address_1'  => $customer->shipping_address_1,
-				'address_2'  => $customer->shipping_address_2,
-				'city'       => $customer->shipping_city,
-				'state'      => $customer->shipping_state,
-				'postcode'   => $customer->shipping_postcode,
-				'country'    => $customer->shipping_country,
+				'first_name' => $customer->get_shipping_first_name(),
+				'last_name'  => $customer->get_shipping_last_name(),
+				'company'    => $customer->get_shipping_company(),
+				'address_1'  => $customer->get_shipping_address_1(),
+				'address_2'  => $customer->get_shipping_address_2(),
+				'city'       => $customer->get_shipping_city(),
+				'state'      => $customer->get_shipping_state(),
+				'postcode'   => $customer->get_shipping_postcode(),
+				'country'    => $customer->get_shipping_country(),
 			),
 		);
 
@@ -214,10 +204,10 @@ class WC_API_Customers extends WC_API_Resource {
 			if ( is_email( $email ) ) {
 				$customer = get_user_by( 'email', $email );
 				if ( ! is_object( $customer ) ) {
-					throw new WC_API_Exception( 'woocommerce_api_invalid_customer_email', __( 'Invalid customer Email', 'woocommerce' ), 404 );
+					throw new WC_API_Exception( 'woocommerce_api_invalid_customer_email', __( 'Invalid customer email', 'woocommerce' ), 404 );
 				}
 			} else {
-				throw new WC_API_Exception( 'woocommerce_api_invalid_customer_email', __( 'Invalid customer Email', 'woocommerce' ), 404 );
+				throw new WC_API_Exception( 'woocommerce_api_invalid_customer_email', __( 'Invalid customer email', 'woocommerce' ), 404 );
 			}
 
 			return $this->get_customer( $customer->ID, $fields );
@@ -299,37 +289,47 @@ class WC_API_Customers extends WC_API_Resource {
 	 * @since 2.2
 	 * @param int $id the customer ID
 	 * @param array $data
+	 * @param WC_Customer $customer
 	 */
-	protected function update_customer_data( $id, $data ) {
+	protected function update_customer_data( $id, $data, $customer ) {
+
 		// Customer first name.
 		if ( isset( $data['first_name'] ) ) {
-			update_user_meta( $id, 'first_name', wc_clean( $data['first_name'] ) );
+			$customer->set_first_name( wc_clean( $data['first_name'] ) );
 		}
 
 		// Customer last name.
 		if ( isset( $data['last_name'] ) ) {
-			update_user_meta( $id, 'last_name', wc_clean( $data['last_name'] ) );
+			$customer->set_last_name( wc_clean( $data['last_name'] ) );
 		}
 
 		// Customer billing address.
 		if ( isset( $data['billing_address'] ) ) {
-			foreach ( $this->get_customer_billing_address() as $address ) {
-				if ( isset( $data['billing_address'][ $address ] ) ) {
-					update_user_meta( $id, 'billing_' . $address, wc_clean( $data['billing_address'][ $address ] ) );
+			foreach ( $this->get_customer_billing_address() as $field ) {
+				if ( isset( $data['billing_address'][ $field ] ) ) {
+					if ( is_callable( array( $customer, "set_billing_{$field}" ) ) ) {
+						$customer->{"set_billing_{$field}"}( $data['billing_address'][ $field ] );
+					} else {
+						$customer->update_meta_data( 'billing_' . $field, wc_clean( $data['billing_address'][ $field ] ) );
+					}
 				}
 			}
 		}
 
 		// Customer shipping address.
 		if ( isset( $data['shipping_address'] ) ) {
-			foreach ( $this->get_customer_shipping_address() as $address ) {
-				if ( isset( $data['shipping_address'][ $address ] ) ) {
-					update_user_meta( $id, 'shipping_' . $address, wc_clean( $data['shipping_address'][ $address ] ) );
+			foreach ( $this->get_customer_shipping_address() as $field ) {
+				if ( isset( $data['shipping_address'][ $field ] ) ) {
+					if ( is_callable( array( $customer, "set_shipping_{$field}" ) ) ) {
+						$customer->{"set_shipping_{$field}"}( $data['shipping_address'][ $field ] );
+					} else {
+						$customer->update_meta_data( 'shipping_' . $field, wc_clean( $data['shipping_address'][ $field ] ) );
+					}
 				}
 			}
 		}
 
-		do_action( 'woocommerce_api_update_customer_data', $id, $data );
+		do_action( 'woocommerce_api_update_customer_data', $id, $data, $customer );
 	}
 
 	/**
@@ -359,29 +359,27 @@ class WC_API_Customers extends WC_API_Resource {
 				throw new WC_API_Exception( 'woocommerce_api_missing_customer_email', sprintf( __( 'Missing parameter %s', 'woocommerce' ), 'email' ), 400 );
 			}
 
-			// Sets the username.
-			$data['username'] = ! empty( $data['username'] ) ? $data['username'] : '';
+			// Create customer.
+			$customer = new WC_Customer;
+			$customer->set_username( ! empty( $data['username'] ) ? $data['username'] : '' );
+			$customer->set_password( ! empty( $data['password'] ) ? $data['password'] : '' );
+			$customer->set_email( $data['email'] );
+			$customer->save();
 
-			// Sets the password.
-			$data['password'] = ! empty( $data['password'] ) ? $data['password'] : '';
-
-			// Attempts to create the new customer
-			$id = wc_create_new_customer( $data['email'], $data['username'], $data['password'] );
-
-			// Checks for an error in the customer creation.
-			if ( is_wp_error( $id ) ) {
-				throw new WC_API_Exception( $id->get_error_code(), $id->get_error_message(), 400 );
+			if ( ! $customer->get_id() ) {
+				throw new WC_API_Exception( 'woocommerce_api_user_cannot_create_customer', __( 'This resource cannot be created.', 'woocommerce' ), 400 );
 			}
 
 			// Added customer data.
-			$this->update_customer_data( $id, $data );
+			$this->update_customer_data( $customer->get_id(), $data, $customer );
+			$customer->save();
 
-			do_action( 'woocommerce_api_create_customer', $id, $data );
+			do_action( 'woocommerce_api_create_customer', $customer->get_id(), $data );
 
 			$this->server->send_status( 201 );
 
-			return $this->get_customer( $id );
-		} catch ( WC_API_Exception $e ) {
+			return $this->get_customer( $customer->get_id() );
+		} catch ( Exception $e ) {
 			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
 		}
 	}
@@ -412,23 +410,27 @@ class WC_API_Customers extends WC_API_Resource {
 
 			$data = apply_filters( 'woocommerce_api_edit_customer_data', $data, $this );
 
+			$customer = new WC_Customer( $id );
+
 			// Customer email.
 			if ( isset( $data['email'] ) ) {
-				wp_update_user( array( 'ID' => $id, 'user_email' => sanitize_email( $data['email'] ) ) );
+				$customer->set_email( $data['email'] );
 			}
 
 			// Customer password.
 			if ( isset( $data['password'] ) ) {
-				wp_update_user( array( 'ID' => $id, 'user_pass' => wc_clean( $data['password'] ) ) );
+				$customer->set_password( $data['password'] );
 			}
 
 			// Update customer data.
-			$this->update_customer_data( $id, $data );
+			$this->update_customer_data( $customer->get_id(), $data, $customer );
 
-			do_action( 'woocommerce_api_edit_customer', $id, $data );
+			$customer->save();
 
-			return $this->get_customer( $id );
-		} catch ( WC_API_Exception $e ) {
+			do_action( 'woocommerce_api_edit_customer', $customer->get_id(), $data );
+
+			return $this->get_customer( $customer->get_id() );
+		} catch ( Exception $e ) {
 			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
 		}
 	}
@@ -496,8 +498,17 @@ class WC_API_Customers extends WC_API_Resource {
 		$_downloads = wc_get_customer_available_downloads( $id );
 
 		foreach ( $_downloads as $key => $download ) {
-			$downloads[ $key ] = $download;
-			$downloads[ $key ]['access_expires'] = $this->server->format_datetime( $downloads[ $key ]['access_expires'] );
+			$downloads[] = array(
+				'download_url'        => $download['download_url'],
+				'download_id'         => $download['download_id'],
+				'product_id'          => $download['product_id'],
+				'download_name'       => $download['download_name'],
+				'order_id'            => $download['order_id'],
+				'order_key'           => $download['order_key'],
+				'downloads_remaining' => $download['downloads_remaining'],
+				'access_expires'      => $download['access_expires'] ? $this->server->format_datetime( $download['access_expires'] ) : null,
+				'file'                => $download['file'],
+			);
 		}
 
 		return array( 'downloads' => apply_filters( 'woocommerce_api_customer_downloads_response', $downloads, $id, $fields, $this->server ) );
@@ -545,7 +556,7 @@ class WC_API_Customers extends WC_API_Resource {
 
 		// Limit number of users returned
 		if ( ! empty( $args['limit'] ) ) {
-			if ( $args['limit'] == -1 ) {
+			if ( -1 == $args['limit'] ) {
 				unset( $query_args['number'] );
 			} else {
 				$query_args['number'] = absint( $args['limit'] );
@@ -592,7 +603,7 @@ class WC_API_Customers extends WC_API_Resource {
 		$query = new WP_User_Query( $query_args );
 
 		// Helper members for pagination headers
-		$query->total_pages = ( $args['limit'] == -1 ) ? 1 : ceil( $query->get_total() / $users_per_page );
+		$query->total_pages = ( -1 == $args['limit'] ) ? 1 : ceil( $query->get_total() / $users_per_page );
 		$query->page = $page;
 
 		return $query;
@@ -608,43 +619,43 @@ class WC_API_Customers extends WC_API_Resource {
 	 */
 	public function add_customer_data( $order_data, $order ) {
 
-		if ( 0 == $order->customer_user ) {
+		if ( 0 == $order->get_user_id() ) {
 
 			// add customer data from order
 			$order_data['customer'] = array(
 				'id'               => 0,
-				'email'            => $order->billing_email,
-				'first_name'       => $order->billing_first_name,
-				'last_name'        => $order->billing_last_name,
+				'email'            => $order->get_billing_email(),
+				'first_name'       => $order->get_billing_first_name(),
+				'last_name'        => $order->get_billing_last_name(),
 				'billing_address'  => array(
-					'first_name' => $order->billing_first_name,
-					'last_name'  => $order->billing_last_name,
-					'company'    => $order->billing_company,
-					'address_1'  => $order->billing_address_1,
-					'address_2'  => $order->billing_address_2,
-					'city'       => $order->billing_city,
-					'state'      => $order->billing_state,
-					'postcode'   => $order->billing_postcode,
-					'country'    => $order->billing_country,
-					'email'      => $order->billing_email,
-					'phone'      => $order->billing_phone,
+					'first_name' => $order->get_billing_first_name(),
+					'last_name'  => $order->get_billing_last_name(),
+					'company'    => $order->get_billing_company(),
+					'address_1'  => $order->get_billing_address_1(),
+					'address_2'  => $order->get_billing_address_2(),
+					'city'       => $order->get_billing_city(),
+					'state'      => $order->get_billing_state(),
+					'postcode'   => $order->get_billing_postcode(),
+					'country'    => $order->get_billing_country(),
+					'email'      => $order->get_billing_email(),
+					'phone'      => $order->get_billing_phone(),
 				),
 				'shipping_address' => array(
-					'first_name' => $order->shipping_first_name,
-					'last_name'  => $order->shipping_last_name,
-					'company'    => $order->shipping_company,
-					'address_1'  => $order->shipping_address_1,
-					'address_2'  => $order->shipping_address_2,
-					'city'       => $order->shipping_city,
-					'state'      => $order->shipping_state,
-					'postcode'   => $order->shipping_postcode,
-					'country'    => $order->shipping_country,
+					'first_name' => $order->get_shipping_first_name(),
+					'last_name'  => $order->get_shipping_last_name(),
+					'company'    => $order->get_shipping_company(),
+					'address_1'  => $order->get_shipping_address_1(),
+					'address_2'  => $order->get_shipping_address_2(),
+					'city'       => $order->get_shipping_city(),
+					'state'      => $order->get_shipping_state(),
+					'postcode'   => $order->get_shipping_postcode(),
+					'country'    => $order->get_shipping_country(),
 				),
 			);
 
 		} else {
 
-			$order_data['customer'] = current( $this->get_customer( $order->customer_user ) );
+			$order_data['customer'] = current( $this->get_customer( $order->get_user_id() ) );
 		}
 
 		return $order_data;
@@ -667,29 +678,6 @@ class WC_API_Customers extends WC_API_Resource {
 		}
 	}
 
-	/**
-	 * Wrapper for @see get_avatar() which doesn't simply return
-	 * the URL so we need to pluck it from the HTML img tag
-	 *
-	 * Kudos to https://github.com/WP-API/WP-API for offering a better solution
-	 *
-	 * @since 2.1
-	 * @param string $email the customer's email
-	 * @return string the URL to the customer's avatar
-	 */
-	private function get_avatar_url( $email ) {
-		$avatar_html = get_avatar( $email );
-
-		// Get the URL of the avatar from the provided HTML
-		preg_match( '/src=["|\'](.+)[\&|"|\']/U', $avatar_html, $matches );
-
-		if ( isset( $matches[1] ) && ! empty( $matches[1] ) ) {
-			return esc_url_raw( $matches[1] );
-		}
-
-		return null;
-	}
-
 	/**
 	 * Validate the request by checking:
 	 *
@@ -782,7 +770,7 @@ class WC_API_Customers extends WC_API_Resource {
 
 			// Limit bulk operation
 			if ( count( $data ) > $limit ) {
-				throw new WC_API_Exception( 'woocommerce_api_customers_request_entity_too_large', sprintf( __( 'Unable to accept more than %s items for this request', 'woocommerce' ), $limit ), 413 );
+				throw new WC_API_Exception( 'woocommerce_api_customers_request_entity_too_large', sprintf( __( 'Unable to accept more than %s items for this request.', 'woocommerce' ), $limit ), 413 );
 			}
 
 			$customers = array();
@@ -795,28 +783,28 @@ class WC_API_Customers extends WC_API_Resource {
 					$customer_id = intval( $_customer['id'] );
 				}
 
-				// Customer exists / edit customer
 				if ( $customer_id ) {
+
+					// Customer exists / edit customer
 					$edit = $this->edit_customer( $customer_id, array( 'customer' => $_customer ) );
 
 					if ( is_wp_error( $edit ) ) {
 						$customers[] = array(
 							'id'    => $customer_id,
-							'error' => array( 'code' => $edit->get_error_code(), 'message' => $edit->get_error_message() )
+							'error' => array( 'code' => $edit->get_error_code(), 'message' => $edit->get_error_message() ),
 						);
 					} else {
 						$customers[] = $edit['customer'];
 					}
-				}
+				} else {
 
-				// Customer don't exists / create customer
-				else {
+					// Customer don't exists / create customer
 					$new = $this->create_customer( array( 'customer' => $_customer ) );
 
 					if ( is_wp_error( $new ) ) {
 						$customers[] = array(
 							'id'    => $customer_id,
-							'error' => array( 'code' => $new->get_error_code(), 'message' => $new->get_error_message() )
+							'error' => array( 'code' => $new->get_error_code(), 'message' => $new->get_error_message() ),
 						);
 					} else {
 						$customers[] = $new['customer'];
diff --git a/includes/api/v2/class-wc-api-exception.php b/includes/api/legacy/v3/class-wc-api-exception.php
similarity index 100%
rename from includes/api/v2/class-wc-api-exception.php
rename to includes/api/legacy/v3/class-wc-api-exception.php
diff --git a/includes/api/v2/class-wc-api-json-handler.php b/includes/api/legacy/v3/class-wc-api-json-handler.php
similarity index 99%
rename from includes/api/v2/class-wc-api-json-handler.php
rename to includes/api/legacy/v3/class-wc-api-json-handler.php
index bef3f1e82b4..e19ac15d371 100644
--- a/includes/api/v2/class-wc-api-json-handler.php
+++ b/includes/api/legacy/v3/class-wc-api-json-handler.php
@@ -75,5 +75,4 @@ class WC_API_JSON_Handler implements WC_API_Handler {
 
 		return json_encode( $data );
 	}
-
 }
diff --git a/includes/api/class-wc-api-orders.php b/includes/api/legacy/v3/class-wc-api-orders.php
similarity index 78%
rename from includes/api/class-wc-api-orders.php
rename to includes/api/legacy/v3/class-wc-api-orders.php
index b7c81165252..c76150e4998 100644
--- a/includes/api/class-wc-api-orders.php
+++ b/includes/api/legacy/v3/class-wc-api-orders.php
@@ -149,65 +149,64 @@ class WC_API_Orders extends WC_API_Resource {
 		}
 
 		// Get the decimal precession.
-		$dp         = ( isset( $filter['dp'] ) ? intval( $filter['dp'] ) : 2 );
-		$order      = wc_get_order( $id );
-		$order_post = get_post( $id );
-		$expand     = array();
+		$dp     = ( isset( $filter['dp'] ) ? intval( $filter['dp'] ) : 2 );
+		$order  = wc_get_order( $id );
+		$expand = array();
 
 		if ( ! empty( $filter['expand'] ) ) {
 			$expand = explode( ',', $filter['expand'] );
 		}
 
 		$order_data = array(
-			'id'                        => $order->id,
+			'id'                        => $order->get_id(),
 			'order_number'              => $order->get_order_number(),
-			'order_key'                 => $order->order_key,
-			'created_at'                => $this->server->format_datetime( $order_post->post_date_gmt ),
-			'updated_at'                => $this->server->format_datetime( $order_post->post_modified_gmt ),
-			'completed_at'              => $this->server->format_datetime( $order->completed_date, true ),
+			'order_key'                 => $order->get_order_key(),
+			'created_at'                => $this->server->format_datetime( $order->get_date_created() ? $order->get_date_created()->getTimestamp() : 0, false, false ), // API gives UTC times.
+			'updated_at'                => $this->server->format_datetime( $order->get_date_modified() ? $order->get_date_modified()->getTimestamp() : 0, false, false ), // API gives UTC times.
+			'completed_at'              => $this->server->format_datetime( $order->get_date_completed() ? $order->get_date_completed()->getTimestamp() : 0, false, false ), // API gives UTC times.
 			'status'                    => $order->get_status(),
-			'currency'                  => $order->get_order_currency(),
+			'currency'                  => $order->get_currency(),
 			'total'                     => wc_format_decimal( $order->get_total(), $dp ),
 			'subtotal'                  => wc_format_decimal( $order->get_subtotal(), $dp ),
 			'total_line_items_quantity' => $order->get_item_count(),
 			'total_tax'                 => wc_format_decimal( $order->get_total_tax(), $dp ),
-			'total_shipping'            => wc_format_decimal( $order->get_total_shipping(), $dp ),
+			'total_shipping'            => wc_format_decimal( $order->get_shipping_total(), $dp ),
 			'cart_tax'                  => wc_format_decimal( $order->get_cart_tax(), $dp ),
 			'shipping_tax'              => wc_format_decimal( $order->get_shipping_tax(), $dp ),
 			'total_discount'            => wc_format_decimal( $order->get_total_discount(), $dp ),
 			'shipping_methods'          => $order->get_shipping_method(),
 			'payment_details' => array(
-				'method_id'    => $order->payment_method,
-				'method_title' => $order->payment_method_title,
-				'paid'         => isset( $order->paid_date ),
+				'method_id'    => $order->get_payment_method(),
+				'method_title' => $order->get_payment_method_title(),
+				'paid'         => ! is_null( $order->get_date_paid() ),
 			),
 			'billing_address' => array(
-				'first_name' => $order->billing_first_name,
-				'last_name'  => $order->billing_last_name,
-				'company'    => $order->billing_company,
-				'address_1'  => $order->billing_address_1,
-				'address_2'  => $order->billing_address_2,
-				'city'       => $order->billing_city,
-				'state'      => $order->billing_state,
-				'postcode'   => $order->billing_postcode,
-				'country'    => $order->billing_country,
-				'email'      => $order->billing_email,
-				'phone'      => $order->billing_phone,
+				'first_name' => $order->get_billing_first_name(),
+				'last_name'  => $order->get_billing_last_name(),
+				'company'    => $order->get_billing_company(),
+				'address_1'  => $order->get_billing_address_1(),
+				'address_2'  => $order->get_billing_address_2(),
+				'city'       => $order->get_billing_city(),
+				'state'      => $order->get_billing_state(),
+				'postcode'   => $order->get_billing_postcode(),
+				'country'    => $order->get_billing_country(),
+				'email'      => $order->get_billing_email(),
+				'phone'      => $order->get_billing_phone(),
 			),
 			'shipping_address' => array(
-				'first_name' => $order->shipping_first_name,
-				'last_name'  => $order->shipping_last_name,
-				'company'    => $order->shipping_company,
-				'address_1'  => $order->shipping_address_1,
-				'address_2'  => $order->shipping_address_2,
-				'city'       => $order->shipping_city,
-				'state'      => $order->shipping_state,
-				'postcode'   => $order->shipping_postcode,
-				'country'    => $order->shipping_country,
+				'first_name' => $order->get_shipping_first_name(),
+				'last_name'  => $order->get_shipping_last_name(),
+				'company'    => $order->get_shipping_company(),
+				'address_1'  => $order->get_shipping_address_1(),
+				'address_2'  => $order->get_shipping_address_2(),
+				'city'       => $order->get_shipping_city(),
+				'state'      => $order->get_shipping_state(),
+				'postcode'   => $order->get_shipping_postcode(),
+				'country'    => $order->get_shipping_country(),
 			),
-			'note'                      => $order->customer_note,
-			'customer_ip'               => $order->customer_ip_address,
-			'customer_user_agent'       => $order->customer_user_agent,
+			'note'                      => $order->get_customer_note(),
+			'customer_ip'               => $order->get_customer_ip_address(),
+			'customer_user_agent'       => $order->get_customer_user_agent(),
 			'customer_id'               => $order->get_user_id(),
 			'view_order_url'            => $order->get_view_order_url(),
 			'line_items'                => array(),
@@ -219,43 +218,29 @@ class WC_API_Orders extends WC_API_Resource {
 
 		// Add line items.
 		foreach ( $order->get_items() as $item_id => $item ) {
-			$product     = $order->get_product_from_item( $item );
-			$product_id  = null;
-			$product_sku = null;
-
-			// Check if the product exists.
-			if ( is_object( $product ) ) {
-				$product_id  = ( isset( $product->variation_id ) ) ? $product->variation_id : $product->id;
-				$product_sku = $product->get_sku();
-			}
-
-			$meta = new WC_Order_Item_Meta( $item, $product );
-
-			$item_meta = array();
-
+			$product    = $item->get_product();
 			$hideprefix = ( isset( $filter['all_item_meta'] ) && 'true' === $filter['all_item_meta'] ) ? null : '_';
+			$item_meta  = $item->get_formatted_meta_data( $hideprefix );
 
-			foreach ( $meta->get_formatted( $hideprefix ) as $meta_key => $formatted_meta ) {
-				$item_meta[] = array(
-					'key'   => $formatted_meta['key'],
-					'label' => $formatted_meta['label'],
-					'value' => $formatted_meta['value'],
-				);
+			foreach ( $item_meta as $key => $values ) {
+				$item_meta[ $key ]->label = $values->display_key;
+				unset( $item_meta[ $key ]->display_key );
+				unset( $item_meta[ $key ]->display_value );
 			}
 
 			$line_item = array(
 				'id'           => $item_id,
 				'subtotal'     => wc_format_decimal( $order->get_line_subtotal( $item, false, false ), $dp ),
-				'subtotal_tax' => wc_format_decimal( $item['line_subtotal_tax'], $dp ),
+				'subtotal_tax' => wc_format_decimal( $item->get_subtotal_tax(), $dp ),
 				'total'        => wc_format_decimal( $order->get_line_total( $item, false, false ), $dp ),
-				'total_tax'    => wc_format_decimal( $item['line_tax'], $dp ),
+				'total_tax'    => wc_format_decimal( $item->get_total_tax(), $dp ),
 				'price'        => wc_format_decimal( $order->get_item_total( $item, false, false ), $dp ),
-				'quantity'     => wc_stock_amount( $item['qty'] ),
-				'tax_class'    => ( ! empty( $item['tax_class'] ) ) ? $item['tax_class'] : null,
-				'name'         => $item['name'],
-				'product_id'   => $product_id,
-				'sku'          => $product_sku,
-				'meta'         => $item_meta,
+				'quantity'     => $item->get_quantity(),
+				'tax_class'    => $item->get_tax_class(),
+				'name'         => $item->get_name(),
+				'product_id'   => $item->get_variation_id() ? $item->get_variation_id() : $item->get_product_id(),
+				'sku'          => is_object( $product ) ? $product->get_sku() : null,
+				'meta'         => array_values( $item_meta ),
 			);
 
 			if ( in_array( 'products', $expand ) ) {
@@ -273,9 +258,9 @@ class WC_API_Orders extends WC_API_Resource {
 		foreach ( $order->get_shipping_methods() as $shipping_item_id => $shipping_item ) {
 			$order_data['shipping_lines'][] = array(
 				'id'           => $shipping_item_id,
-				'method_id'    => $shipping_item['method_id'],
-				'method_title' => $shipping_item['name'],
-				'total'        => wc_format_decimal( $shipping_item['cost'], $dp ),
+				'method_id'    => $shipping_item->get_method_id(),
+				'method_title' => $shipping_item->get_name(),
+				'total'        => wc_format_decimal( $shipping_item->get_total(), $dp ),
 			);
 		}
 
@@ -305,8 +290,8 @@ class WC_API_Orders extends WC_API_Resource {
 		foreach ( $order->get_fees() as $fee_item_id => $fee_item ) {
 			$order_data['fee_lines'][] = array(
 				'id'        => $fee_item_id,
-				'title'     => $fee_item['name'],
-				'tax_class' => ( ! empty( $fee_item['tax_class'] ) ) ? $fee_item['tax_class'] : null,
+				'title'     => $fee_item->get_name(),
+				'tax_class' => $fee_item->get_tax_class(),
 				'total'     => wc_format_decimal( $order->get_line_total( $fee_item ), $dp ),
 				'total_tax' => wc_format_decimal( $order->get_line_tax( $fee_item ), $dp ),
 			);
@@ -316,14 +301,14 @@ class WC_API_Orders extends WC_API_Resource {
 		foreach ( $order->get_items( 'coupon' ) as $coupon_item_id => $coupon_item ) {
 			$coupon_line = array(
 				'id'     => $coupon_item_id,
-				'code'   => $coupon_item['name'],
-				'amount' => wc_format_decimal( $coupon_item['discount_amount'], $dp ),
+				'code'   => $coupon_item->get_code(),
+				'amount' => wc_format_decimal( $coupon_item->get_discount(), $dp ),
 			);
 
 			if ( in_array( 'coupons', $expand ) ) {
-				$_coupon_data = WC()->api->WC_API_Coupons->get_coupon_by_code( $coupon_item['name'] );
+				$_coupon_data = WC()->api->WC_API_Coupons->get_coupon_by_code( $coupon_item->get_code() );
 
-				if ( isset( $_coupon_data['coupon'] ) ) {
+				if ( ! is_wp_error( $_coupon_data ) && isset( $_coupon_data['coupon'] ) ) {
 					$coupon_line['coupon_data'] = $_coupon_data['coupon'];
 				}
 			}
@@ -351,7 +336,7 @@ class WC_API_Orders extends WC_API_Resource {
 
 			if ( ! empty( $status ) ) {
 
-				if ( $status == 'any' ) {
+				if ( 'any' === $status ) {
 
 					$order_statuses = array();
 
@@ -435,7 +420,7 @@ class WC_API_Orders extends WC_API_Resource {
 
 				// make sure customer exists
 				if ( false === get_user_by( 'id', $data['customer_id'] ) ) {
-					throw new WC_API_Exception( 'woocommerce_api_invalid_customer_id', __( 'Customer ID is invalid', 'woocommerce' ), 400 );
+					throw new WC_API_Exception( 'woocommerce_api_invalid_customer_id', __( 'Customer ID is invalid.', 'woocommerce' ), 400 );
 				}
 
 				$default_order_args['customer_id'] = $data['customer_id'];
@@ -471,6 +456,11 @@ class WC_API_Orders extends WC_API_Resource {
 				}
 			}
 
+			// set is vat exempt
+			if ( isset( $data['is_vat_exempt'] ) ) {
+				update_post_meta( $order->get_id(), '_is_vat_exempt', $data['is_vat_exempt'] ? 'yes' : 'no' );
+			}
+
 			// calculate totals and set them
 			$order->calculate_totals();
 
@@ -482,8 +472,8 @@ class WC_API_Orders extends WC_API_Resource {
 					throw new WC_API_Exception( 'woocommerce_invalid_payment_details', __( 'Payment method ID and title are required', 'woocommerce' ), 400 );
 				}
 
-				update_post_meta( $order->id, '_payment_method', $data['payment_details']['method_id'] );
-				update_post_meta( $order->id, '_payment_method_title', $data['payment_details']['method_title'] );
+				update_post_meta( $order->get_id(), '_payment_method', $data['payment_details']['method_id'] );
+				update_post_meta( $order->get_id(), '_payment_method_title', $data['payment_details']['method_title'] );
 
 				// mark as paid if set
 				if ( isset( $data['payment_details']['paid'] ) && true === $data['payment_details']['paid'] ) {
@@ -495,32 +485,33 @@ class WC_API_Orders extends WC_API_Resource {
 			if ( isset( $data['currency'] ) ) {
 
 				if ( ! array_key_exists( $data['currency'], get_woocommerce_currencies() ) ) {
-					throw new WC_API_Exception( 'woocommerce_invalid_order_currency', __( 'Provided order currency is invalid', 'woocommerce'), 400 );
+					throw new WC_API_Exception( 'woocommerce_invalid_order_currency', __( 'Provided order currency is invalid.', 'woocommerce' ), 400 );
 				}
 
-				update_post_meta( $order->id, '_order_currency', $data['currency'] );
+				update_post_meta( $order->get_id(), '_order_currency', $data['currency'] );
 			}
 
 			// set order meta
 			if ( isset( $data['order_meta'] ) && is_array( $data['order_meta'] ) ) {
-				$this->set_order_meta( $order->id, $data['order_meta'] );
+				$this->set_order_meta( $order->get_id(), $data['order_meta'] );
 			}
 
 			// HTTP 201 Created
 			$this->server->send_status( 201 );
 
-			wc_delete_shop_order_transients( $order->id );
+			wc_delete_shop_order_transients( $order );
 
-			do_action( 'woocommerce_api_create_order', $order->id, $data, $this );
+			do_action( 'woocommerce_api_create_order', $order->get_id(), $data, $this );
 
 			wc_transaction_query( 'commit' );
 
-			return $this->get_order( $order->id );
-
-		} catch ( WC_API_Exception $e ) {
+			return $this->get_order( $order->get_id() );
 
+		} catch ( WC_Data_Exception $e ) {
+			wc_transaction_query( 'rollback' );
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => 400 ) );
+		} catch ( WC_API_Exception $e ) {
 			wc_transaction_query( 'rollback' );
-
 			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
 		}
 	}
@@ -569,7 +560,7 @@ class WC_API_Orders extends WC_API_Resource {
 				throw new WC_API_Exception( 'woocommerce_api_invalid_order_id', __( 'Order ID is invalid', 'woocommerce' ), 400 );
 			}
 
-			$order_args = array( 'order_id' => $order->id );
+			$order_args = array( 'order_id' => $order->get_id() );
 
 			// Customer note.
 			if ( isset( $data['note'] ) ) {
@@ -580,10 +571,10 @@ class WC_API_Orders extends WC_API_Resource {
 			if ( isset( $data['customer_id'] ) && $data['customer_id'] != $order->get_user_id() ) {
 				// Make sure customer exists.
 				if ( false === get_user_by( 'id', $data['customer_id'] ) ) {
-					throw new WC_API_Exception( 'woocommerce_api_invalid_customer_id', __( 'Customer ID is invalid', 'woocommerce' ), 400 );
+					throw new WC_API_Exception( 'woocommerce_api_invalid_customer_id', __( 'Customer ID is invalid.', 'woocommerce' ), 400 );
 				}
 
-				update_post_meta( $order->id, '_customer_user', $data['customer_id'] );
+				update_post_meta( $order->get_id(), '_customer_user', $data['customer_id'] );
 			}
 
 			// Billing/shipping address.
@@ -603,10 +594,9 @@ class WC_API_Orders extends WC_API_Resource {
 					$update_totals = true;
 
 					foreach ( $data[ $line ] as $item ) {
-
 						// Item ID is always required.
 						if ( ! array_key_exists( 'id', $item ) ) {
-							throw new WC_API_Exception( 'woocommerce_invalid_item_id', __( 'Order item ID is required', 'woocommerce' ), 400 );
+							$item['id'] = null;
 						}
 
 						// Create item.
@@ -628,12 +618,12 @@ class WC_API_Orders extends WC_API_Resource {
 
 				// Method ID.
 				if ( isset( $data['payment_details']['method_id'] ) ) {
-					update_post_meta( $order->id, '_payment_method', $data['payment_details']['method_id'] );
+					update_post_meta( $order->get_id(), '_payment_method', $data['payment_details']['method_id'] );
 				}
 
 				// Method title.
 				if ( isset( $data['payment_details']['method_title'] ) ) {
-					update_post_meta( $order->id, '_payment_method_title', $data['payment_details']['method_title'] );
+					update_post_meta( $order->get_id(), '_payment_method_title', $data['payment_details']['method_title'] );
 				}
 
 				// Mark as paid if set.
@@ -645,10 +635,10 @@ class WC_API_Orders extends WC_API_Resource {
 			// Set order currency.
 			if ( isset( $data['currency'] ) ) {
 				if ( ! array_key_exists( $data['currency'], get_woocommerce_currencies() ) ) {
-					throw new WC_API_Exception( 'woocommerce_invalid_order_currency', __( 'Provided order currency is invalid', 'woocommerce' ), 400 );
+					throw new WC_API_Exception( 'woocommerce_invalid_order_currency', __( 'Provided order currency is invalid.', 'woocommerce' ), 400 );
 				}
 
-				update_post_meta( $order->id, '_order_currency', $data['currency'] );
+				update_post_meta( $order->get_id(), '_order_currency', $data['currency'] );
 			}
 
 			// If items have changed, recalculate order totals.
@@ -658,7 +648,7 @@ class WC_API_Orders extends WC_API_Resource {
 
 			// Update order meta.
 			if ( isset( $data['order_meta'] ) && is_array( $data['order_meta'] ) ) {
-				$this->set_order_meta( $order->id, $data['order_meta'] );
+				$this->set_order_meta( $order->get_id(), $data['order_meta'] );
 			}
 
 			// Update the order post to set customer note/modified date.
@@ -666,14 +656,18 @@ class WC_API_Orders extends WC_API_Resource {
 
 			// Order status.
 			if ( ! empty( $data['status'] ) ) {
-				$order->update_status( $data['status'], isset( $data['status_note'] ) ? $data['status_note'] : '' );
+				// Refresh the order instance.
+				$order = wc_get_order( $order->get_id() );
+				$order->update_status( $data['status'], isset( $data['status_note'] ) ? $data['status_note'] : '', true );
 			}
 
-			wc_delete_shop_order_transients( $order->id );
+			wc_delete_shop_order_transients( $order );
 
-			do_action( 'woocommerce_api_edit_order', $order->id, $data, $this );
+			do_action( 'woocommerce_api_edit_order', $order->get_id(), $data, $this );
 
 			return $this->get_order( $id );
+		} catch ( WC_Data_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => 400 ) );
 		} catch ( WC_API_Exception $e ) {
 			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
 		}
@@ -714,7 +708,7 @@ class WC_API_Orders extends WC_API_Resource {
 		$query_args = array(
 			'fields'      => 'ids',
 			'post_type'   => $this->post_type,
-			'post_status' => array_keys( wc_get_order_statuses() )
+			'post_status' => array_keys( wc_get_order_statuses() ),
 		);
 
 		// add status argument
@@ -731,8 +725,8 @@ class WC_API_Orders extends WC_API_Resource {
 				array(
 					'key'     => '_customer_user',
 					'value'   => absint( $args['customer_id'] ),
-					'compare' => '='
-				)
+					'compare' => '=',
+				),
 			);
 		}
 
@@ -792,8 +786,8 @@ class WC_API_Orders extends WC_API_Resource {
 			}
 		}
 
-		$order->set_address( $billing_address, 'billing' );
-		$order->set_address( $shipping_address, 'shipping' );
+		$this->update_address( $order, $billing_address, 'billing' );
+		$this->update_address( $order, $shipping_address, 'shipping' );
 
 		// update user meta
 		if ( $order->get_user_id() ) {
@@ -806,6 +800,21 @@ class WC_API_Orders extends WC_API_Resource {
 		}
 	}
 
+	/**
+	 * Update address.
+	 *
+	 * @param WC_Order $order
+	 * @param array $posted
+	 * @param string $type
+	 */
+	protected function update_address( $order, $posted, $type = 'billing' ) {
+		foreach ( $posted as $key => $value ) {
+			if ( is_callable( array( $order, "set_{$type}_{$key}" ) ) ) {
+				$order->{"set_{$type}_{$key}"}( $value );
+			}
+		}
+	}
+
 	/**
 	 * Helper method to add/update order meta, with two restrictions:
 	 *
@@ -820,7 +829,7 @@ class WC_API_Orders extends WC_API_Resource {
 
 		foreach ( $order_meta as $meta_key => $meta_value ) {
 
-			if ( is_string( $meta_key) && ! is_protected_meta( $meta_key ) && is_scalar( $meta_value ) ) {
+			if ( is_string( $meta_key ) && ! is_protected_meta( $meta_key ) && is_scalar( $meta_value ) ) {
 				update_post_meta( $order_id, $meta_key, $meta_value );
 			}
 		}
@@ -872,11 +881,11 @@ class WC_API_Orders extends WC_API_Resource {
 			$result = $wpdb->get_row(
 				$wpdb->prepare( "SELECT * FROM {$wpdb->prefix}woocommerce_order_items WHERE order_item_id = %d AND order_id = %d",
 				absint( $item['id'] ),
-				absint( $order->id )
+				absint( $order->get_id() )
 			) );
 
 			if ( is_null( $result ) ) {
-				throw new WC_API_Exception( 'woocommerce_invalid_item_id', __( 'Order item ID provided is not associated with order', 'woocommerce' ), 400 );
+				throw new WC_API_Exception( 'woocommerce_invalid_item_id', __( 'Order item ID provided is not associated with order.', 'woocommerce' ), 400 );
 			}
 		}
 
@@ -893,9 +902,7 @@ class WC_API_Orders extends WC_API_Resource {
 	 * @throws WC_API_Exception invalid data, server error
 	 */
 	protected function set_line_item( $order, $item, $action ) {
-
 		$creating  = ( 'create' === $action );
-		$item_args = array();
 
 		// product is always required
 		if ( ! isset( $item['product_id'] ) && ! isset( $item['sku'] ) ) {
@@ -927,67 +934,64 @@ class WC_API_Orders extends WC_API_Resource {
 					throw new WC_API_Exception( 'woocommerce_api_invalid_product_variation', __( 'The product variation is invalid', 'woocommerce' ), 400 );
 				}
 			}
-			$item_args['variation'] = $item['variations'];
-			$variation_id = $this->get_variation_id( wc_get_product( $product_id ), $item_args['variation'] );
+			$variation_id = $this->get_variation_id( wc_get_product( $product_id ), $item['variations'] );
 		}
 
 		$product = wc_get_product( $variation_id ? $variation_id : $product_id );
 
 		// must be a valid WC_Product
 		if ( ! is_object( $product ) ) {
-			throw new WC_API_Exception( 'woocommerce_api_invalid_product', __( 'Product is invalid', 'woocommerce' ), 400 );
+			throw new WC_API_Exception( 'woocommerce_api_invalid_product', __( 'Product is invalid.', 'woocommerce' ), 400 );
 		}
 
 		// quantity must be positive float
 		if ( isset( $item['quantity'] ) && floatval( $item['quantity'] ) <= 0 ) {
-			throw new WC_API_Exception( 'woocommerce_api_invalid_product_quantity', __( 'Product quantity must be a positive float', 'woocommerce' ), 400 );
+			throw new WC_API_Exception( 'woocommerce_api_invalid_product_quantity', __( 'Product quantity must be a positive float.', 'woocommerce' ), 400 );
 		}
 
 		// quantity is required when creating
 		if ( $creating && ! isset( $item['quantity'] ) ) {
-			throw new WC_API_Exception( 'woocommerce_api_invalid_product_quantity', __( 'Product quantity is required', 'woocommerce' ), 400 );
+			throw new WC_API_Exception( 'woocommerce_api_invalid_product_quantity', __( 'Product quantity is required.', 'woocommerce' ), 400 );
 		}
 
 		// quantity
-		if ( isset( $item['quantity'] ) ) {
-			$item_args['qty'] = $item['quantity'];
-		}
-
-		// total
-		if ( isset( $item['total'] ) ) {
-			$item_args['totals']['total'] = floatval( $item['total'] );
-		}
-
-		// total tax
-		if ( isset( $item['total_tax'] ) ) {
-			$item_args['totals']['tax'] = floatval( $item['total_tax'] );
-		}
-
-		// subtotal
-		if ( isset( $item['subtotal'] ) ) {
-			$item_args['totals']['subtotal'] = floatval( $item['subtotal'] );
-		}
-
-		// subtotal tax
-		if ( isset( $item['subtotal_tax'] ) ) {
-			$item_args['totals']['subtotal_tax'] = floatval( $item['subtotal_tax'] );
-		}
-
 		if ( $creating ) {
-
-			$item_id = $order->add_product( $product, $item_args['qty'], $item_args );
-
-			if ( ! $item_id ) {
-				throw new WC_API_Exception( 'woocommerce_cannot_create_line_item', __( 'Cannot create line item, try again', 'woocommerce' ), 500 );
-			}
-
+			$line_item = new WC_Order_Item_Product();
 		} else {
+			$line_item = new WC_Order_Item_Product( $item['id'] );
+		}
 
-			$item_id = $order->update_product( $item['id'], $product, $item_args );
+		$line_item->set_product( $product );
+		$line_item->set_order_id( $order->get_id() );
 
-			if ( ! $item_id ) {
-				throw new WC_API_Exception( 'woocommerce_cannot_update_line_item', __( 'Cannot update line item, try again', 'woocommerce' ), 500 );
-			}
+		if ( isset( $item['quantity'] ) ) {
+			$line_item->set_quantity( $item['quantity'] );
+		}
+		if ( isset( $item['total'] ) ) {
+			$line_item->set_total( floatval( $item['total'] ) );
+		} elseif ( $creating ) {
+			$total = wc_get_price_excluding_tax( $product, array( 'qty' => $line_item->get_quantity() ) );
+			$line_item->set_total( $total );
+			$line_item->set_subtotal( $total );
+		}
+		if ( isset( $item['total_tax'] ) ) {
+			$line_item->set_total_tax( floatval( $item['total_tax'] ) );
+		}
+		if ( isset( $item['subtotal'] ) ) {
+			$line_item->set_subtotal( floatval( $item['subtotal'] ) );
+		}
+		if ( isset( $item['subtotal_tax'] ) ) {
+			$line_item->set_subtotal_tax( floatval( $item['subtotal_tax'] ) );
+		}
+		if ( $variation_id ) {
+			$line_item->set_variation_id( $variation_id );
+			$line_item->set_variation( $item['variations'] );
+		}
+
+		$item_id = $line_item->save();
+
+		if ( ! $item_id ) {
+			throw new WC_API_Exception( 'woocommerce_cannot_create_line_item', __( 'Cannot create line item, try again.', 'woocommerce' ), 500 );
 		}
 	}
 
@@ -1055,44 +1059,45 @@ class WC_API_Orders extends WC_API_Resource {
 
 		// total must be a positive float
 		if ( isset( $shipping['total'] ) && floatval( $shipping['total'] ) < 0 ) {
-			throw new WC_API_Exception( 'woocommerce_invalid_shipping_total', __( 'Shipping total must be a positive amount', 'woocommerce' ), 400 );
+			throw new WC_API_Exception( 'woocommerce_invalid_shipping_total', __( 'Shipping total must be a positive amount.', 'woocommerce' ), 400 );
 		}
 
 		if ( 'create' === $action ) {
 
 			// method ID is required
 			if ( ! isset( $shipping['method_id'] ) ) {
-				throw new WC_API_Exception( 'woocommerce_invalid_shipping_item', __( 'Shipping method ID is required', 'woocommerce' ), 400 );
+				throw new WC_API_Exception( 'woocommerce_invalid_shipping_item', __( 'Shipping method ID is required.', 'woocommerce' ), 400 );
 			}
 
 			$rate = new WC_Shipping_Rate( $shipping['method_id'], isset( $shipping['method_title'] ) ? $shipping['method_title'] : '', isset( $shipping['total'] ) ? floatval( $shipping['total'] ) : 0, array(), $shipping['method_id'] );
-
-			$shipping_id = $order->add_shipping( $rate );
+			$item = new WC_Order_Item_Shipping();
+			$item->set_order_id( $order->get_id() );
+			$item->set_shipping_rate( $rate );
+			$shipping_id = $item->save();
 
 			if ( ! $shipping_id ) {
-				throw new WC_API_Exception( 'woocommerce_cannot_create_shipping', __( 'Cannot create shipping method, try again', 'woocommerce' ), 500 );
+				throw new WC_API_Exception( 'woocommerce_cannot_create_shipping', __( 'Cannot create shipping method, try again.', 'woocommerce' ), 500 );
 			}
-
 		} else {
 
-			$shipping_args = array();
+			$item = new WC_Order_Item_Shipping( $shipping['id'] );
 
 			if ( isset( $shipping['method_id'] ) ) {
-				$shipping_args['method_id'] = $shipping['method_id'];
+				$item->set_method_id( $shipping['method_id'] );
 			}
 
 			if ( isset( $shipping['method_title'] ) ) {
-				$shipping_args['method_title'] = $shipping['method_title'];
+				$item->set_method_title( $shipping['method_title'] );
 			}
 
 			if ( isset( $shipping['total'] ) ) {
-				$shipping_args['cost'] = floatval( $shipping['total'] );
+				$item->set_total( floatval( $shipping['total'] ) );
 			}
 
-			$shipping_id = $order->update_shipping( $shipping['id'], $shipping_args );
+			$shipping_id = $item->save();
 
 			if ( ! $shipping_id ) {
-				throw new WC_API_Exception( 'woocommerce_cannot_update_shipping', __( 'Cannot update shipping method, try again', 'woocommerce' ), 500 );
+				throw new WC_API_Exception( 'woocommerce_cannot_update_shipping', __( 'Cannot update shipping method, try again.', 'woocommerce' ), 500 );
 			}
 		}
 	}
@@ -1115,65 +1120,59 @@ class WC_API_Orders extends WC_API_Resource {
 				throw new WC_API_Exception( 'woocommerce_invalid_fee_item', __( 'Fee title is required', 'woocommerce' ), 400 );
 			}
 
-			$order_fee            = new stdClass();
-			$order_fee->id        = sanitize_title( $fee['title'] );
-			$order_fee->name      = $fee['title'];
-			$order_fee->amount    = isset( $fee['total'] ) ? floatval( $fee['total'] ) : 0;
-			$order_fee->taxable   = false;
-			$order_fee->tax       = 0;
-			$order_fee->tax_data  = array();
-			$order_fee->tax_class = '';
+			$item = new WC_Order_Item_Fee();
+			$item->set_order_id( $order->get_id() );
+			$item->set_name( wc_clean( $fee['title'] ) );
+			$item->set_total( isset( $fee['total'] ) ? floatval( $fee['total'] ) : 0 );
 
 			// if taxable, tax class and total are required
-			if ( isset( $fee['taxable'] ) && $fee['taxable'] ) {
-
+			if ( ! empty( $fee['taxable'] ) ) {
 				if ( ! isset( $fee['tax_class'] ) ) {
-					throw new WC_API_Exception( 'woocommerce_invalid_fee_item', __( 'Fee tax class is required when fee is taxable', 'woocommerce' ), 400 );
+					throw new WC_API_Exception( 'woocommerce_invalid_fee_item', __( 'Fee tax class is required when fee is taxable.', 'woocommerce' ), 400 );
 				}
 
-				$order_fee->taxable   = true;
-				$order_fee->tax_class = $fee['tax_class'];
+				$item->set_tax_status( 'taxable' );
+				$item->set_tax_class( $fee['tax_class'] );
 
 				if ( isset( $fee['total_tax'] ) ) {
-					$order_fee->tax = isset( $fee['total_tax'] ) ? wc_format_refund_total( $fee['total_tax'] ) : 0;
+					$item->set_total_tax( isset( $fee['total_tax'] ) ? wc_format_refund_total( $fee['total_tax'] ) : 0 );
 				}
 
 				if ( isset( $fee['tax_data'] ) ) {
-					$order_fee->tax      = wc_format_refund_total( array_sum( $fee['tax_data'] ) );
-					$order_fee->tax_data = array_map( 'wc_format_refund_total', $fee['tax_data'] );
+					$item->set_total_tax( wc_format_refund_total( array_sum( $fee['tax_data'] ) ) );
+					$item->set_taxes( array_map( 'wc_format_refund_total', $fee['tax_data'] ) );
 				}
 			}
 
-			$fee_id = $order->add_fee( $order_fee );
+			$fee_id = $item->save();
 
 			if ( ! $fee_id ) {
-				throw new WC_API_Exception( 'woocommerce_cannot_create_fee', __( 'Cannot create fee, try again', 'woocommerce' ), 500 );
+				throw new WC_API_Exception( 'woocommerce_cannot_create_fee', __( 'Cannot create fee, try again.', 'woocommerce' ), 500 );
 			}
-
 		} else {
 
-			$fee_args = array();
+			$item = new WC_Order_Item_Fee( $fee['id'] );
 
 			if ( isset( $fee['title'] ) ) {
-				$fee_args['name'] = $fee['title'];
+				$item->set_name( wc_clean( $fee['title'] ) );
 			}
 
 			if ( isset( $fee['tax_class'] ) ) {
-				$fee_args['tax_class'] = $fee['tax_class'];
+				$item->set_tax_class( $fee['tax_class'] );
 			}
 
 			if ( isset( $fee['total'] ) ) {
-				$fee_args['line_total'] = floatval( $fee['total'] );
+				$item->set_total( floatval( $fee['total'] ) );
 			}
 
 			if ( isset( $fee['total_tax'] ) ) {
-				$fee_args['line_tax'] = floatval( $fee['total_tax'] );
+				$item->set_total_tax( floatval( $fee['total_tax'] ) );
 			}
 
-			$fee_id = $order->update_fee( $fee['id'], $fee_args );
+			$fee_id = $item->save();
 
 			if ( ! $fee_id ) {
-				throw new WC_API_Exception( 'woocommerce_cannot_update_fee', __( 'Cannot update fee, try again', 'woocommerce' ), 500 );
+				throw new WC_API_Exception( 'woocommerce_cannot_update_fee', __( 'Cannot update fee, try again.', 'woocommerce' ), 500 );
 			}
 		}
 	}
@@ -1191,38 +1190,44 @@ class WC_API_Orders extends WC_API_Resource {
 
 		// coupon amount must be positive float
 		if ( isset( $coupon['amount'] ) && floatval( $coupon['amount'] ) < 0 ) {
-			throw new WC_API_Exception( 'woocommerce_invalid_coupon_total', __( 'Coupon discount total must be a positive amount', 'woocommerce' ), 400 );
+			throw new WC_API_Exception( 'woocommerce_invalid_coupon_total', __( 'Coupon discount total must be a positive amount.', 'woocommerce' ), 400 );
 		}
 
 		if ( 'create' === $action ) {
 
 			// coupon code is required
 			if ( empty( $coupon['code'] ) ) {
-				throw new WC_API_Exception( 'woocommerce_invalid_coupon_coupon', __( 'Coupon code is required', 'woocommerce' ), 400 );
+				throw new WC_API_Exception( 'woocommerce_invalid_coupon_coupon', __( 'Coupon code is required.', 'woocommerce' ), 400 );
 			}
 
-			$coupon_id = $order->add_coupon( $coupon['code'], isset( $coupon['amount'] ) ? floatval( $coupon['amount'] ) : 0 );
+			$item = new WC_Order_Item_Coupon();
+			$item->set_props( array(
+				'code'         => $coupon['code'],
+				'discount'     => isset( $coupon['amount'] ) ? floatval( $coupon['amount'] ) : 0,
+				'discount_tax' => 0,
+				'order_id'     => $order->get_id(),
+			) );
+			$coupon_id = $item->save();
 
 			if ( ! $coupon_id ) {
-				throw new WC_API_Exception( 'woocommerce_cannot_create_order_coupon', __( 'Cannot create coupon, try again', 'woocommerce' ), 500 );
+				throw new WC_API_Exception( 'woocommerce_cannot_create_order_coupon', __( 'Cannot create coupon, try again.', 'woocommerce' ), 500 );
 			}
-
 		} else {
 
-			$coupon_args = array();
+			$item = new WC_Order_Item_Coupon( $coupon['id'] );
 
 			if ( isset( $coupon['code'] ) ) {
-				$coupon_args['code'] = $coupon['code'];
+				$item->set_code( $coupon['code'] );
 			}
 
 			if ( isset( $coupon['amount'] ) ) {
-				$coupon_args['discount_amount'] = floatval( $coupon['amount'] );
+				$item->set_discount( floatval( $coupon['amount'] ) );
 			}
 
-			$coupon_id = $order->update_coupon( $coupon['id'], $coupon_args );
+			$coupon_id = $item->save();
 
 			if ( ! $coupon_id ) {
-				throw new WC_API_Exception( 'woocommerce_cannot_update_order_coupon', __( 'Cannot update coupon, try again', 'woocommerce' ), 500 );
+				throw new WC_API_Exception( 'woocommerce_cannot_update_order_coupon', __( 'Cannot update coupon, try again.', 'woocommerce' ), 500 );
 			}
 		}
 	}
@@ -1247,7 +1252,7 @@ class WC_API_Orders extends WC_API_Resource {
 		$args = array(
 			'post_id' => $order_id,
 			'approve' => 'approve',
-			'type'    => 'order_note'
+			'type'    => 'order_note',
 		);
 
 		remove_filter( 'comments_clauses', array( 'WC_Comments', 'exclude_order_comments' ), 10, 1 );
@@ -1351,7 +1356,7 @@ class WC_API_Orders extends WC_API_Resource {
 			$note_id = $order->add_order_note( $data['note'], $is_customer_note );
 
 			if ( ! $note_id ) {
-				throw new WC_API_Exception( 'woocommerce_api_cannot_create_order_note', __( 'Cannot create order note, please try again', 'woocommerce' ), 500 );
+				throw new WC_API_Exception( 'woocommerce_api_cannot_create_order_note', __( 'Cannot create order note, please try again.', 'woocommerce' ), 500 );
 			}
 
 			// HTTP 201 Created
@@ -1359,7 +1364,9 @@ class WC_API_Orders extends WC_API_Resource {
 
 			do_action( 'woocommerce_api_create_order_note', $note_id, $order_id, $this );
 
-			return $this->get_order_note( $order->id, $note_id );
+			return $this->get_order_note( $order->get_id(), $note_id );
+		} catch ( WC_Data_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => 400 ) );
 		} catch ( WC_API_Exception $e ) {
 			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
 		}
@@ -1406,11 +1413,11 @@ class WC_API_Orders extends WC_API_Resource {
 			}
 
 			// Ensure note ID is associated with given order
-			if ( $note->comment_post_ID != $order->id ) {
+			if ( $note->comment_post_ID != $order->get_id() ) {
 				throw new WC_API_Exception( 'woocommerce_api_invalid_order_note_id', __( 'The order note ID provided is not associated with the order', 'woocommerce' ), 400 );
 			}
 
-			$data = apply_filters( 'woocommerce_api_edit_order_note_data', $data, $note->comment_ID, $order->id, $this );
+			$data = apply_filters( 'woocommerce_api_edit_order_note_data', $data, $note->comment_ID, $order->get_id(), $this );
 
 			// Note content
 			if ( isset( $data['note'] ) ) {
@@ -1429,9 +1436,11 @@ class WC_API_Orders extends WC_API_Resource {
 				update_comment_meta( $note->comment_ID, 'is_customer_note', true === $data['customer_note'] ? 1 : 0 );
 			}
 
-			do_action( 'woocommerce_api_edit_order_note', $note->comment_ID, $order->id, $this );
+			do_action( 'woocommerce_api_edit_order_note', $note->comment_ID, $order->get_id(), $this );
 
-			return $this->get_order_note( $order->id, $note->comment_ID );
+			return $this->get_order_note( $order->get_id(), $note->comment_ID );
+		} catch ( WC_Data_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => 400 ) );
 		} catch ( WC_API_Exception $e ) {
 			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
 		}
@@ -1504,15 +1513,12 @@ class WC_API_Orders extends WC_API_Resource {
 			return $order_id;
 		}
 
-		$refund_items = get_posts(
-			array(
-				'post_type'      => 'shop_order_refund',
-				'post_parent'    => $order_id,
-				'posts_per_page' => -1,
-				'post_status'    => 'any',
-				'fields'         => 'ids'
-			)
-		);
+		$refund_items = wc_get_orders( array(
+			'type'   => 'shop_order_refund',
+			'parent' => $order_id,
+			'limit'  => -1,
+			'return' => 'ids',
+		) );
 		$order_refunds = array();
 
 		foreach ( $refund_items as $refund_id ) {
@@ -1542,56 +1548,53 @@ class WC_API_Orders extends WC_API_Resource {
 			$id = absint( $id );
 
 			if ( empty( $id ) ) {
-				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'Invalid order refund ID', 'woocommerce' ), 400 );
+				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'Invalid order refund ID.', 'woocommerce' ), 400 );
 			}
 
-			$order  = wc_get_order( $id );
+			$order  = wc_get_order( $order_id );
 			$refund = wc_get_order( $id );
 
 			if ( ! $refund ) {
-				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'An order refund with the provided ID could not be found', 'woocommerce' ), 404 );
+				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'An order refund with the provided ID could not be found.', 'woocommerce' ), 404 );
 			}
 
 			$line_items = array();
 
 			// Add line items
 			foreach ( $refund->get_items( 'line_item' ) as $item_id => $item ) {
+				$product    = $item->get_product();
+				$hideprefix = ( isset( $filter['all_item_meta'] ) && 'true' === $filter['all_item_meta'] ) ? null : '_';
+				$item_meta  = $item->get_formatted_meta_data( $hideprefix );
 
-				$product   = $order->get_product_from_item( $item );
-				$meta      = new WC_Order_Item_Meta( $item, $product );
-				$item_meta = array();
-
-				foreach ( $meta->get_formatted() as $meta_key => $formatted_meta ) {
-					$item_meta[] = array(
-						'key' => $meta_key,
-						'label' => $formatted_meta['label'],
-						'value' => $formatted_meta['value'],
-					);
+				foreach ( $item_meta as $key => $values ) {
+					$item_meta[ $key ]->label = $values->display_key;
+					unset( $item_meta[ $key ]->display_key );
+					unset( $item_meta[ $key ]->display_value );
 				}
 
 				$line_items[] = array(
 					'id'               => $item_id,
 					'subtotal'         => wc_format_decimal( $order->get_line_subtotal( $item ), 2 ),
-					'subtotal_tax'     => wc_format_decimal( $item['line_subtotal_tax'], 2 ),
+					'subtotal_tax'     => wc_format_decimal( $item->get_subtotal_tax(), 2 ),
 					'total'            => wc_format_decimal( $order->get_line_total( $item ), 2 ),
 					'total_tax'        => wc_format_decimal( $order->get_line_tax( $item ), 2 ),
 					'price'            => wc_format_decimal( $order->get_item_total( $item ), 2 ),
-					'quantity'         => (int) $item['qty'],
-					'tax_class'        => ( ! empty( $item['tax_class'] ) ) ? $item['tax_class'] : null,
-					'name'             => $item['name'],
-					'product_id'       => ( isset( $product->variation_id ) ) ? $product->variation_id : $product->id,
+					'quantity'         => $item->get_quantity(),
+					'tax_class'        => $item->get_tax_class(),
+					'name'             => $item->get_name(),
+					'product_id'       => $item->get_variation_id() ? $item->get_variation_id() : $item->get_product_id(),
 					'sku'              => is_object( $product ) ? $product->get_sku() : null,
-					'meta'             => $item_meta,
-					'refunded_item_id' => (int) $item['refunded_item_id'],
+					'meta'             => array_values( $item_meta ),
+					'refunded_item_id' => (int) $item->get_meta( 'refunded_item_id' ),
 				);
 			}
 
 			$order_refund = array(
 				'id'         => $refund->id,
-				'created_at' => $this->server->format_datetime( $refund->date ),
-				'amount'     => wc_format_decimal( $refund->get_refund_amount(), 2 ),
-				'reason'     => $refund->get_refund_reason(),
-				'line_items' => $line_items
+				'created_at' => $this->server->format_datetime( $refund->get_date_created() ? $refund->get_date_created()->getTimestamp() : 0, false, false ),
+				'amount'     => wc_format_decimal( $refund->get_amount(), 2 ),
+				'reason'     => $refund->get_reason(),
+				'line_items' => $line_items,
 			);
 
 			return array( 'order_refund' => apply_filters( 'woocommerce_api_order_refund_response', $order_refund, $id, $fields, $refund, $order_id, $this ) );
@@ -1632,9 +1635,9 @@ class WC_API_Orders extends WC_API_Resource {
 
 			// Refund amount is required
 			if ( ! isset( $data['amount'] ) ) {
-				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund', __( 'Refund amount is required', 'woocommerce' ), 400 );
+				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund', __( 'Refund amount is required.', 'woocommerce' ), 400 );
 			} elseif ( 0 > $data['amount'] ) {
-				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund', __( 'Refund amount must be positive', 'woocommerce' ), 400 );
+				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund', __( 'Refund amount must be positive.', 'woocommerce' ), 400 );
 			}
 
 			$data['order_id']  = $order_id;
@@ -1644,7 +1647,7 @@ class WC_API_Orders extends WC_API_Resource {
 			$refund = wc_create_refund( $data );
 
 			if ( ! $refund ) {
-				throw new WC_API_Exception( 'woocommerce_api_cannot_create_order_refund', __( 'Cannot create order refund, please try again', 'woocommerce' ), 500 );
+				throw new WC_API_Exception( 'woocommerce_api_cannot_create_order_refund', __( 'Cannot create order refund, please try again.', 'woocommerce' ), 500 );
 			}
 
 			// Refund via API
@@ -1655,13 +1658,13 @@ class WC_API_Orders extends WC_API_Resource {
 
 				$order = wc_get_order( $order_id );
 
-				if ( isset( $payment_gateways[ $order->payment_method ] ) && $payment_gateways[ $order->payment_method ]->supports( 'refunds' ) ) {
-					$result = $payment_gateways[ $order->payment_method ]->process_refund( $order_id, $refund->get_refund_amount(), $refund->get_refund_reason() );
+				if ( isset( $payment_gateways[ $order->get_payment_method() ] ) && $payment_gateways[ $order->get_payment_method() ]->supports( 'refunds' ) ) {
+					$result = $payment_gateways[ $order->get_payment_method() ]->process_refund( $order_id, $refund->get_amount(), $refund->get_reason() );
 
 					if ( is_wp_error( $result ) ) {
 						return $result;
 					} elseif ( ! $result ) {
-						throw new WC_API_Exception( 'woocommerce_api_create_order_refund_api_failed', __( 'An error occurred while attempting to create the refund using the payment gateway API', 'woocommerce' ), 500 );
+						throw new WC_API_Exception( 'woocommerce_api_create_order_refund_api_failed', __( 'An error occurred while attempting to create the refund using the payment gateway API.', 'woocommerce' ), 500 );
 					}
 				}
 			}
@@ -1672,6 +1675,8 @@ class WC_API_Orders extends WC_API_Resource {
 			do_action( 'woocommerce_api_create_order_refund', $refund->id, $order_id, $this );
 
 			return $this->get_order_refund( $order_id, $refund->id );
+		} catch ( WC_Data_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => 400 ) );
 		} catch ( WC_API_Exception $e ) {
 			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
 		}
@@ -1705,19 +1710,19 @@ class WC_API_Orders extends WC_API_Resource {
 			$id = absint( $id );
 
 			if ( empty( $id ) ) {
-				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'Invalid order refund ID', 'woocommerce' ), 400 );
+				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'Invalid order refund ID.', 'woocommerce' ), 400 );
 			}
 
 			// Ensure order ID is valid
 			$refund = get_post( $id );
 
 			if ( ! $refund ) {
-				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'An order refund with the provided ID could not be found', 'woocommerce' ), 404 );
+				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'An order refund with the provided ID could not be found.', 'woocommerce' ), 404 );
 			}
 
 			// Ensure refund ID is associated with given order
 			if ( $refund->post_parent != $order_id ) {
-				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'The order refund ID provided is not associated with the order', 'woocommerce' ), 400 );
+				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'The order refund ID provided is not associated with the order.', 'woocommerce' ), 400 );
 			}
 
 			$data = apply_filters( 'woocommerce_api_edit_order_refund_data', $data, $refund->ID, $order_id, $this );
@@ -1739,6 +1744,8 @@ class WC_API_Orders extends WC_API_Resource {
 			do_action( 'woocommerce_api_edit_order_refund', $refund->ID, $order_id, $this );
 
 			return $this->get_order_refund( $order_id, $refund->ID );
+		} catch ( WC_Data_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => 400 ) );
 		} catch ( WC_API_Exception $e ) {
 			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
 		}
@@ -1764,19 +1771,19 @@ class WC_API_Orders extends WC_API_Resource {
 			$id = absint( $id );
 
 			if ( empty( $id ) ) {
-				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'Invalid order refund ID', 'woocommerce' ), 400 );
+				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'Invalid order refund ID.', 'woocommerce' ), 400 );
 			}
 
 			// Ensure refund ID is valid
 			$refund = get_post( $id );
 
 			if ( ! $refund ) {
-				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'An order refund with the provided ID could not be found', 'woocommerce' ), 404 );
+				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'An order refund with the provided ID could not be found.', 'woocommerce' ), 404 );
 			}
 
 			// Ensure refund ID is associated with given order
 			if ( $refund->post_parent != $order_id ) {
-				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'The order refund ID provided is not associated with the order', 'woocommerce' ), 400 );
+				throw new WC_API_Exception( 'woocommerce_api_invalid_order_refund_id', __( 'The order refund ID provided is not associated with the order.', 'woocommerce' ), 400 );
 			}
 
 			wc_delete_shop_order_transients( $order_id );
@@ -1810,7 +1817,7 @@ class WC_API_Orders extends WC_API_Resource {
 
 			// Limit bulk operation
 			if ( count( $data ) > $limit ) {
-				throw new WC_API_Exception( 'woocommerce_api_orders_request_entity_too_large', sprintf( __( 'Unable to accept more than %s items for this request', 'woocommerce' ), $limit ), 413 );
+				throw new WC_API_Exception( 'woocommerce_api_orders_request_entity_too_large', sprintf( __( 'Unable to accept more than %s items for this request.', 'woocommerce' ), $limit ), 413 );
 			}
 
 			$orders = array();
@@ -1823,28 +1830,28 @@ class WC_API_Orders extends WC_API_Resource {
 					$order_id = intval( $_order['id'] );
 				}
 
-				// Order exists / edit order
 				if ( $order_id ) {
+
+					// Order exists / edit order
 					$edit = $this->edit_order( $order_id, array( 'order' => $_order ) );
 
 					if ( is_wp_error( $edit ) ) {
 						$orders[] = array(
 							'id'    => $order_id,
-							'error' => array( 'code' => $edit->get_error_code(), 'message' => $edit->get_error_message() )
+							'error' => array( 'code' => $edit->get_error_code(), 'message' => $edit->get_error_message() ),
 						);
 					} else {
 						$orders[] = $edit['order'];
 					}
-				}
+				} else {
 
-				// Order don't exists / create order
-				else {
+					// Order don't exists / create order
 					$new = $this->create_order( array( 'order' => $_order ) );
 
 					if ( is_wp_error( $new ) ) {
 						$orders[] = array(
 							'id'    => $order_id,
-							'error' => array( 'code' => $new->get_error_code(), 'message' => $new->get_error_message() )
+							'error' => array( 'code' => $new->get_error_code(), 'message' => $new->get_error_message() ),
 						);
 					} else {
 						$orders[] = $new['order'];
@@ -1853,6 +1860,8 @@ class WC_API_Orders extends WC_API_Resource {
 			}
 
 			return array( 'orders' => apply_filters( 'woocommerce_api_orders_bulk_response', $orders, $this ) );
+		} catch ( WC_Data_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => 400 ) );
 		} catch ( WC_API_Exception $e ) {
 			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
 		}
diff --git a/includes/api/class-wc-api-products.php b/includes/api/legacy/v3/class-wc-api-products.php
similarity index 72%
rename from includes/api/class-wc-api-products.php
rename to includes/api/legacy/v3/class-wc-api-products.php
index b56082bd665..f49be4e45db 100644
--- a/includes/api/class-wc-api-products.php
+++ b/includes/api/legacy/v3/class-wc-api-products.php
@@ -8,6 +8,7 @@
  * @category    API
  * @package     WooCommerce/API
  * @since       2.1
+ * @version     3.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -40,7 +41,7 @@ class WC_API_Products extends WC_API_Resource {
 		);
 
 		# GET /products/count
-		$routes[ $this->base . '/count'] = array(
+		$routes[ $this->base . '/count' ] = array(
 			array( array( $this, 'get_products_count' ), WC_API_Server::READABLE ),
 		);
 
@@ -197,8 +198,8 @@ class WC_API_Products extends WC_API_Resource {
 		}
 
 		// add the parent product data to an individual variation
-		if ( $product->is_type( 'variation' ) && $product->parent ) {
-			$product_data['parent'] = $this->get_product_data( $product->parent );
+		if ( $product->is_type( 'variation' ) && $product->get_parent_id() ) {
+			$product_data['parent'] = $this->get_product_data( $product->get_parent_id() );
 		}
 
 		// Add grouped products data
@@ -206,9 +207,12 @@ class WC_API_Products extends WC_API_Resource {
 			$product_data['grouped_products'] = $this->get_grouped_products_data( $product );
 		}
 
-		if ( $product->is_type( 'simple' ) && ! empty( $product->post->post_parent ) ) {
-			$_product = wc_get_product( $product->post->post_parent );
-			$product_data['parent'] = $this->get_product_data( $_product );
+		if ( $product->is_type( 'simple' ) ) {
+			$parent_id = $product->get_parent_id();
+			if ( ! empty( $parent_id ) ) {
+				$_product               = wc_get_product( $parent_id );
+				$product_data['parent'] = $this->get_product_data( $_product );
+			}
 		}
 
 		return array( 'product' => apply_filters( 'woocommerce_api_product_response', $product_data, $product, $fields, $this->server ) );
@@ -297,35 +301,43 @@ class WC_API_Products extends WC_API_Resource {
 				$post_excerpt = $data['short_description'];
 			}
 
-			$new_product = array(
-				'post_title'   => wc_clean( $data['title'] ),
-				'post_status'  => isset( $data['status'] ) ? wc_clean( $data['status'] ) : 'publish',
-				'post_type'    => 'product',
-				'post_excerpt' => isset( $data['short_description'] ) ? $post_excerpt : '',
-				'post_content' => isset( $data['description'] ) ? $post_content : '',
-				'post_author'  => get_current_user_id(),
-				'menu_order'   => isset( $data['menu_order'] ) ? intval( $data['menu_order'] ) : 0,
-			);
+			$classname = WC_Product_Factory::get_classname_from_product_type( $data['type'] );
+			if ( ! class_exists( $classname ) ) {
+				$classname = 'WC_Product_Simple';
+			}
+			$product = new $classname();
+
+			$product->set_name( wc_clean( $data['title'] ) );
+			$product->set_status( isset( $data['status'] ) ? wc_clean( $data['status'] ) : 'publish' );
+			$product->set_short_description( isset( $data['short_description'] ) ? $post_excerpt : '' );
+			$product->set_description( isset( $data['description'] ) ? $post_content : '' );
+			$product->set_menu_order( isset( $data['menu_order'] ) ? intval( $data['menu_order'] ) : 0 );
+
+			if ( ! empty( $data['name'] ) ) {
+				$product->set_slug( sanitize_title( $data['name'] ) );
+			}
 
 			// Attempts to create the new product.
-			$id = wp_insert_post( $new_product, true );
+			$product->save();
+			$id = $product->get_id();
 
 			// Checks for an error in the product creation.
-			if ( is_wp_error( $id ) ) {
+			if ( 0 >= $id ) {
 				throw new WC_API_Exception( 'woocommerce_api_cannot_create_product', $id->get_error_message(), 400 );
 			}
 
 			// Check for featured/gallery images, upload it and set it.
 			if ( isset( $data['images'] ) ) {
-				$this->save_product_images( $id, $data['images'] );
+				$product = $this->save_product_images( $product, $data['images'] );
 			}
 
 			// Save product meta fields.
-			$this->save_product_meta( $id, $data );
+			$product = $this->save_product_meta( $product, $data );
+			$product->save();
 
 			// Save variations.
 			if ( isset( $data['type'] ) && 'variable' == $data['type'] && isset( $data['variations'] ) && is_array( $data['variations'] ) ) {
-				$this->save_variations( $id, $data );
+				$this->save_variations( $product, $data );
 			}
 
 			do_action( 'woocommerce_api_create_product', $id, $data );
@@ -336,10 +348,11 @@ class WC_API_Products extends WC_API_Resource {
 			$this->server->send_status( 201 );
 
 			return $this->get_product( $id );
-		} catch ( WC_API_Exception $e ) {
-			// Remove the product when fails.
+		} catch ( WC_Data_Exception $e ) {
+			$this->clear_product( $id );
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
+		} catch ( WC_API_Exception $e ) {
 			$this->clear_product( $id );
-
 			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
 		}
 	}
@@ -366,42 +379,37 @@ class WC_API_Products extends WC_API_Resource {
 				return $id;
 			}
 
+			$product = wc_get_product( $id );
+
 			$data = apply_filters( 'woocommerce_api_edit_product_data', $data, $this );
 
 			// Product title.
 			if ( isset( $data['title'] ) ) {
-				wp_update_post( array( 'ID' => $id, 'post_title' => wc_clean( $data['title'] ) ) );
+				$product->set_name( wc_clean( $data['title'] ) );
 			}
 
 			// Product name (slug).
 			if ( isset( $data['name'] ) ) {
-				wp_update_post( array( 'ID' => $id, 'post_name' => sanitize_title( $data['name'] ) ) );
+				$product->set_slug( wc_clean( $data['name'] ) );
 			}
 
 			// Product status.
 			if ( isset( $data['status'] ) ) {
-				wp_update_post( array( 'ID' => $id, 'post_status' => wc_clean( $data['status'] ) ) );
+				$product->set_status( wc_clean( $data['status'] ) );
 			}
 
 			// Product short description.
 			if ( isset( $data['short_description'] ) ) {
 				// Enable short description html tags.
 				$post_excerpt = ( isset( $data['enable_html_short_description'] ) && true === $data['enable_html_short_description'] ) ? $data['short_description'] : wc_clean( $data['short_description'] );
-
-				wp_update_post( array( 'ID' => $id, 'post_excerpt' => $post_excerpt ) );
+				$product->set_short_description( $post_excerpt );
 			}
 
 			// Product description.
 			if ( isset( $data['description'] ) ) {
 				// Enable description html tags.
 				$post_content = ( isset( $data['enable_html_description'] ) && true === $data['enable_html_description'] ) ? $data['description'] : wc_clean( $data['description'] );
-
-				wp_update_post( array( 'ID' => $id, 'post_content' => $post_content ) );
-			}
-
-			// Menu order.
-			if ( isset( $data['menu_order'] ) ) {
-				wp_update_post( array( 'ID' => $id, 'menu_order' => intval( $data['menu_order'] ) ) );
+				$product->set_description( $post_content );
 			}
 
 			// Validate the product type.
@@ -409,31 +417,39 @@ class WC_API_Products extends WC_API_Resource {
 				throw new WC_API_Exception( 'woocommerce_api_invalid_product_type', sprintf( __( 'Invalid product type - the product type must be any of these: %s', 'woocommerce' ), implode( ', ', array_keys( wc_get_product_types() ) ) ), 400 );
 			}
 
+			// Menu order.
+			if ( isset( $data['menu_order'] ) ) {
+				$product->set_menu_order( intval( $data['menu_order'] ) );
+			}
+
 			// Check for featured/gallery images, upload it and set it.
 			if ( isset( $data['images'] ) ) {
-				$this->save_product_images( $id, $data['images'] );
+				$product = $this->save_product_images( $product, $data['images'] );
 			}
 
 			// Save product meta fields.
-			$this->save_product_meta( $id, $data );
+			$product = $this->save_product_meta( $product, $data );
 
 			// Save variations.
-			$product = get_product( $id );
 			if ( $product->is_type( 'variable' ) ) {
 				if ( isset( $data['variations'] ) && is_array( $data['variations'] ) ) {
-					$this->save_variations( $id, $data );
+					$this->save_variations( $product, $data );
 				} else {
-					// Just sync variations
-					WC_Product_Variable::sync( $id );
+					// Just sync variations.
+					$product = WC_Product_Variable::sync( $product, false );
 				}
 			}
 
+			$product->save();
+
 			do_action( 'woocommerce_api_edit_product', $id, $data );
 
 			// Clear cache/transients.
 			wc_delete_product_transients( $id );
 
 			return $this->get_product( $id );
+		} catch ( WC_Data_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
 		} catch ( WC_API_Exception $e ) {
 			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
 		}
@@ -455,17 +471,38 @@ class WC_API_Products extends WC_API_Resource {
 			return $id;
 		}
 
+		$product = wc_get_product( $id );
+
 		do_action( 'woocommerce_api_delete_product', $id, $this );
 
-		$parent_id = wp_get_post_parent_id( $id );
-		$result    = ( $force ) ? wp_delete_post( $id, true ) : wp_trash_post( $id );
+		// If we're forcing, then delete permanently.
+		if ( $force ) {
+			if ( $product->is_type( 'variable' ) ) {
+				foreach ( $product->get_children() as $child_id ) {
+					$child = wc_get_product( $child_id );
+					$child->delete( true );
+				}
+			} elseif ( $product->is_type( 'grouped' ) ) {
+				foreach ( $product->get_children() as $child_id ) {
+					$child = wc_get_product( $child_id );
+					$child->set_parent_id( 0 );
+					$child->save();
+				}
+			}
+
+			$product->delete( true );
+			$result = $product->get_id() > 0 ? false : true;
+		} else {
+			$product->delete();
+			$result = 'trash' === $product->get_status();
+		}
 
 		if ( ! $result ) {
 			return new WP_Error( 'woocommerce_api_cannot_delete_product', sprintf( __( 'This %s cannot be deleted', 'woocommerce' ), 'product' ), array( 'status' => 500 ) );
 		}
 
 		// Delete parent product transients.
-		if ( $parent_id ) {
+		if ( $parent_id = wp_get_post_parent_id( $id ) ) {
 			wc_delete_product_transients( $parent_id );
 		}
 
@@ -545,7 +582,7 @@ class WC_API_Products extends WC_API_Resource {
 		}
 
 		$filter = array_merge( $filter, array(
-			'in' => implode( ',', $order_ids )
+			'in' => implode( ',', $order_ids ),
 		) );
 
 		$orders = WC()->api->WC_API_Orders->get_orders( $fields, $filter, $status, $page );
@@ -628,7 +665,7 @@ class WC_API_Products extends WC_API_Resource {
 				'description' => $term->description,
 				'display'     => $display_type ? $display_type : 'default',
 				'image'       => $image ? esc_url( $image ) : '',
-				'count'       => intval( $term->count )
+				'count'       => intval( $term->count ),
 			);
 
 			return array( 'product_category' => apply_filters( 'woocommerce_api_product_category_response', $product_category, $id, $fields, $term, $this ) );
@@ -673,7 +710,7 @@ class WC_API_Products extends WC_API_Resource {
 			// Check parent.
 			$data['parent'] = absint( $data['parent'] );
 			if ( $data['parent'] ) {
-				$parent = get_term_by( 'term_taxonomy_id', $data['parent'], 'product_cat' );
+				$parent = get_term_by( 'id', $data['parent'], 'product_cat' );
 				if ( ! $parent ) {
 					throw new WC_API_Exception( 'woocommerce_api_invalid_product_category_parent', __( 'Product category parent is invalid', 'woocommerce' ), 400 );
 				}
@@ -684,8 +721,8 @@ class WC_API_Products extends WC_API_Resource {
 			$image_id = 0;
 			if ( is_numeric( $image ) ) {
 				$image_id = absint( $image );
-			} else if ( ! empty( $image ) ) {
-				$upload   = $this->upload_product_image( esc_url_raw( $image ) );
+			} elseif ( ! empty( $image ) ) {
+				$upload   = $this->upload_product_category_image( esc_url_raw( $image ) );
 				$image_id = $this->set_product_category_image_as_attachment( $upload );
 			}
 
@@ -694,18 +731,20 @@ class WC_API_Products extends WC_API_Resource {
 				throw new WC_API_Exception( 'woocommerce_api_cannot_create_product_category', $insert->get_error_message(), 400 );
 			}
 
-			update_woocommerce_term_meta( $insert['term_taxonomy_id'], 'display_type', esc_attr( $data['display'] ) );
+			$id = $insert['term_id'];
+
+			update_woocommerce_term_meta( $id, 'display_type', 'default' === $data['display'] ? '' : sanitize_text_field( $data['display'] ) );
 
 			// Check if image_id is a valid image attachment before updating the term meta.
 			if ( $image_id && wp_attachment_is_image( $image_id ) ) {
-				update_woocommerce_term_meta( $insert['term_taxonomy_id'], 'thumbnail_id', $image_id );
+				update_woocommerce_term_meta( $id, 'thumbnail_id', $image_id );
 			}
 
-			do_action( 'woocommerce_api_create_product_category', $insert['term_taxonomy_id'], $data );
+			do_action( 'woocommerce_api_create_product_category', $id, $data );
 
 			$this->server->send_status( 201 );
 
-			return $this->get_product_category( $insert['term_taxonomy_id'] );
+			return $this->get_product_category( $id );
 		} catch ( WC_API_Exception $e ) {
 			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
 		}
@@ -750,8 +789,8 @@ class WC_API_Products extends WC_API_Resource {
 				$image = $data['image'];
 				if ( is_numeric( $image ) ) {
 					$image_id = absint( $image );
-				} else if ( ! empty( $image ) ) {
-					$upload   = $this->upload_product_image( esc_url_raw( $image ) );
+				} elseif ( ! empty( $image ) ) {
+					$upload   = $this->upload_product_category_image( esc_url_raw( $image ) );
 					$image_id = $this->set_product_category_image_as_attachment( $upload );
 				}
 
@@ -767,11 +806,11 @@ class WC_API_Products extends WC_API_Resource {
 			}
 
 			if ( ! empty( $data['display'] ) ) {
-				update_woocommerce_term_meta( $update['term_taxonomy_id'], 'display_type', sanitize_text_field( $data['display'] ) );
+				update_woocommerce_term_meta( $id, 'display_type', 'default' === $data['display'] ? '' : sanitize_text_field( $data['display'] ) );
 			}
 
 			if ( isset( $image_id ) ) {
-				update_woocommerce_term_meta( $update['term_taxonomy_id'], 'thumbnail_id', $image_id );
+				update_woocommerce_term_meta( $id, 'thumbnail_id', $image_id );
 			}
 
 			do_action( 'woocommerce_api_edit_product_category', $id, $data );
@@ -806,7 +845,9 @@ class WC_API_Products extends WC_API_Resource {
 			}
 
 			// When a term is deleted, delete its meta.
-			$wpdb->delete( $wpdb->woocommerce_termmeta, array( 'woocommerce_term_id' => $id ), array( '%d' ) );
+			if ( get_option( 'db_version' ) < 34370 ) {
+				$wpdb->delete( $wpdb->woocommerce_termmeta, array( 'woocommerce_term_id' => $id ), array( '%d' ) );
+			}
 
 			do_action( 'woocommerce_api_delete_product_category', $id, $this );
 
@@ -879,7 +920,7 @@ class WC_API_Products extends WC_API_Resource {
 				'name'        => $term->name,
 				'slug'        => $term->slug,
 				'description' => $term->description,
-				'count'       => intval( $term->count )
+				'count'       => intval( $term->count ),
 			);
 
 			return array( 'product_tag' => apply_filters( 'woocommerce_api_product_tag_response', $tag, $id, $fields, $term, $this ) );
@@ -920,12 +961,13 @@ class WC_API_Products extends WC_API_Resource {
 			if ( is_wp_error( $insert ) ) {
 				throw new WC_API_Exception( 'woocommerce_api_cannot_create_product_tag', $insert->get_error_message(), 400 );
 			}
+			$id = $insert['term_id'];
 
-			do_action( 'woocommerce_api_create_product_tag', $insert['term_taxonomy_id'], $data );
+			do_action( 'woocommerce_api_create_product_tag', $id, $data );
 
 			$this->server->send_status( 201 );
 
-			return $this->get_product_tag( $insert['term_taxonomy_id'] );
+			return $this->get_product_tag( $id );
 		} catch ( WC_API_Exception $e ) {
 			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
 		}
@@ -1065,7 +1107,7 @@ class WC_API_Products extends WC_API_Resource {
 			$query_args['meta_query'][] = array(
 				'key'     => '_sku',
 				'value'   => $args['sku'],
-				'compare' => '='
+				'compare' => '=',
 			);
 
 			$query_args['post_type'] = array( 'product', 'product_variation' );
@@ -1080,17 +1122,21 @@ class WC_API_Products extends WC_API_Resource {
 	 * Get standard product data that applies to every product type
 	 *
 	 * @since 2.1
-	 * @param WC_Product $product
+	 * @param WC_Product|int $product
 	 * @return WC_Product
 	 */
 	private function get_product_data( $product ) {
+		if ( is_numeric( $product ) ) {
+			$product = wc_get_product( $product );
+		}
+
 		return array(
-			'title'              => $product->get_title(),
-			'id'                 => (int) $product->is_type( 'variation' ) ? $product->get_variation_id() : $product->id,
-			'created_at'         => $this->server->format_datetime( $product->get_post_data()->post_date_gmt ),
-			'updated_at'         => $this->server->format_datetime( $product->get_post_data()->post_modified_gmt ),
-			'type'               => $product->product_type,
-			'status'             => $product->get_post_data()->post_status,
+			'title'              => $product->get_name(),
+			'id'                 => $product->get_id(),
+			'created_at'         => $this->server->format_datetime( $product->get_date_created(), false, true ),
+			'updated_at'         => $this->server->format_datetime( $product->get_date_modified(), false, true ),
+			'type'               => $product->get_type(),
+			'status'             => $product->get_status(),
 			'downloadable'       => $product->is_downloadable(),
 			'virtual'            => $product->is_virtual(),
 			'permalink'          => $product->get_permalink(),
@@ -1111,50 +1157,63 @@ class WC_API_Products extends WC_API_Resource {
 			'purchaseable'       => $product->is_purchasable(),
 			'featured'           => $product->is_featured(),
 			'visible'            => $product->is_visible(),
-			'catalog_visibility' => $product->visibility,
+			'catalog_visibility' => $product->get_catalog_visibility(),
 			'on_sale'            => $product->is_on_sale(),
 			'product_url'        => $product->is_type( 'external' ) ? $product->get_product_url() : '',
 			'button_text'        => $product->is_type( 'external' ) ? $product->get_button_text() : '',
 			'weight'             => $product->get_weight() ? $product->get_weight() : null,
 			'dimensions'         => array(
-				'length' => $product->length,
-				'width'  => $product->width,
-				'height' => $product->height,
+				'length' => $product->get_length(),
+				'width'  => $product->get_width(),
+				'height' => $product->get_height(),
 				'unit'   => get_option( 'woocommerce_dimension_unit' ),
 			),
 			'shipping_required'  => $product->needs_shipping(),
 			'shipping_taxable'   => $product->is_shipping_taxable(),
 			'shipping_class'     => $product->get_shipping_class(),
 			'shipping_class_id'  => ( 0 !== $product->get_shipping_class_id() ) ? $product->get_shipping_class_id() : null,
-			'description'        => wpautop( do_shortcode( $product->get_post_data()->post_content ) ),
-			'short_description'  => apply_filters( 'woocommerce_short_description', $product->get_post_data()->post_excerpt ),
-			'reviews_allowed'    => ( 'open' === $product->get_post_data()->comment_status ),
+			'description'        => wpautop( do_shortcode( $product->get_description() ) ),
+			'short_description'  => apply_filters( 'woocommerce_short_description', $product->get_short_description() ),
+			'reviews_allowed'    => $product->get_reviews_allowed(),
 			'average_rating'     => wc_format_decimal( $product->get_average_rating(), 2 ),
-			'rating_count'       => (int) $product->get_rating_count(),
-			'related_ids'        => array_map( 'absint', array_values( $product->get_related() ) ),
-			'upsell_ids'         => array_map( 'absint', $product->get_upsells() ),
-			'cross_sell_ids'     => array_map( 'absint', $product->get_cross_sells() ),
-			'parent_id'          => $product->post->post_parent,
-			'categories'         => wp_get_post_terms( $product->id, 'product_cat', array( 'fields' => 'names' ) ),
-			'tags'               => wp_get_post_terms( $product->id, 'product_tag', array( 'fields' => 'names' ) ),
+			'rating_count'       => $product->get_rating_count(),
+			'related_ids'        => array_map( 'absint', array_values( wc_get_related_products( $product->get_id() ) ) ),
+			'upsell_ids'         => array_map( 'absint', $product->get_upsell_ids() ),
+			'cross_sell_ids'     => array_map( 'absint', $product->get_cross_sell_ids() ),
+			'parent_id'          => $product->get_parent_id(),
+			'categories'         => wc_get_object_terms( $product->get_id(), 'product_cat', 'name' ),
+			'tags'               => wc_get_object_terms( $product->get_id(), 'product_tag', 'name' ),
 			'images'             => $this->get_images( $product ),
-			'featured_src'       => (string) wp_get_attachment_url( get_post_thumbnail_id( $product->is_type( 'variation' ) ? $product->variation_id : $product->id ) ),
+			'featured_src'       => wp_get_attachment_url( get_post_thumbnail_id( $product->get_id() ) ),
 			'attributes'         => $this->get_attributes( $product ),
 			'downloads'          => $this->get_downloads( $product ),
-			'download_limit'     => (int) $product->download_limit,
-			'download_expiry'    => (int) $product->download_expiry,
-			'download_type'      => $product->download_type,
-			'purchase_note'      => wpautop( do_shortcode( wp_kses_post( $product->purchase_note ) ) ),
-			'total_sales'        => metadata_exists( 'post', $product->id, 'total_sales' ) ? (int) get_post_meta( $product->id, 'total_sales', true ) : 0,
+			'download_limit'     => $product->get_download_limit(),
+			'download_expiry'    => $product->get_download_expiry(),
+			'download_type'      => 'standard',
+			'purchase_note'      => wpautop( do_shortcode( wp_kses_post( $product->get_purchase_note() ) ) ),
+			'total_sales'        => $product->get_total_sales(),
 			'variations'         => array(),
 			'parent'             => array(),
 			'grouped_products'   => array(),
-			'menu_order'         => $product->post->menu_order,
+			'menu_order'         => $this->get_product_menu_order( $product ),
 		);
 	}
 
 	/**
-	 * Get an individual variation's data
+	 * Get product menu order.
+	 *
+	 * @since 2.5.3
+	 * @param WC_Product $product
+	 * @return int
+	 */
+	private function get_product_menu_order( $product ) {
+		$menu_order = $product->get_menu_order();
+
+		return apply_filters( 'woocommerce_api_product_menu_order', $menu_order, $product );
+	}
+
+	/**
+	 * Get an individual variation's data.
 	 *
 	 * @since 2.1
 	 * @param WC_Product $product
@@ -1164,48 +1223,48 @@ class WC_API_Products extends WC_API_Resource {
 		$variations = array();
 
 		foreach ( $product->get_children() as $child_id ) {
+			$variation = wc_get_product( $child_id );
 
-			$variation = $product->get_child( $child_id );
-
-			if ( ! $variation->exists() ) {
+			if ( ! $variation || ! $variation->exists() ) {
 				continue;
 			}
 
 			$variations[] = array(
-					'id'                => $variation->get_variation_id(),
-					'created_at'        => $this->server->format_datetime( $variation->get_post_data()->post_date_gmt ),
-					'updated_at'        => $this->server->format_datetime( $variation->get_post_data()->post_modified_gmt ),
-					'downloadable'      => $variation->is_downloadable(),
-					'virtual'           => $variation->is_virtual(),
-					'permalink'         => $variation->get_permalink(),
-					'sku'               => $variation->get_sku(),
-					'price'             => $variation->get_price(),
-					'regular_price'     => $variation->get_regular_price(),
-					'sale_price'        => $variation->get_sale_price() ? $variation->get_sale_price() : null,
-					'taxable'           => $variation->is_taxable(),
-					'tax_status'        => $variation->get_tax_status(),
-					'tax_class'         => $variation->get_tax_class(),
-					'managing_stock'    => $variation->managing_stock(),
-					'stock_quantity'    => $variation->get_stock_quantity(),
-					'in_stock'          => $variation->is_in_stock(),
-					'backordered'       => $variation->is_on_backorder(),
-					'purchaseable'      => $variation->is_purchasable(),
-					'visible'           => $variation->variation_is_visible(),
-					'on_sale'           => $variation->is_on_sale(),
-					'weight'            => $variation->get_weight() ? $variation->get_weight() : null,
-					'dimensions'        => array(
-						'length' => $variation->length,
-						'width'  => $variation->width,
-						'height' => $variation->height,
-						'unit'   => get_option( 'woocommerce_dimension_unit' ),
-					),
-					'shipping_class'    => $variation->get_shipping_class(),
-					'shipping_class_id' => ( 0 !== $variation->get_shipping_class_id() ) ? $variation->get_shipping_class_id() : null,
-					'image'             => $this->get_images( $variation ),
-					'attributes'        => $this->get_attributes( $variation ),
-					'downloads'         => $this->get_downloads( $variation ),
-					'download_limit'    => (int) $product->download_limit,
-					'download_expiry'   => (int) $product->download_expiry,
+				'id'                 => $variation->get_id(),
+				'created_at'         => $this->server->format_datetime( $variation->get_date_created(), false, true ),
+				'updated_at'         => $this->server->format_datetime( $variation->get_date_modified(), false, true ),
+				'downloadable'       => $variation->is_downloadable(),
+				'virtual'            => $variation->is_virtual(),
+				'permalink'          => $variation->get_permalink(),
+				'sku'                => $variation->get_sku(),
+				'price'              => $variation->get_price(),
+				'regular_price'      => $variation->get_regular_price(),
+				'sale_price'         => $variation->get_sale_price() ? $variation->get_sale_price() : null,
+				'taxable'            => $variation->is_taxable(),
+				'tax_status'         => $variation->get_tax_status(),
+				'tax_class'          => $variation->get_tax_class(),
+				'managing_stock'     => $variation->managing_stock(),
+				'stock_quantity'     => $variation->get_stock_quantity(),
+				'in_stock'           => $variation->is_in_stock(),
+				'backorders_allowed' => $variation->backorders_allowed(),
+				'backordered'        => $variation->is_on_backorder(),
+				'purchaseable'       => $variation->is_purchasable(),
+				'visible'            => $variation->variation_is_visible(),
+				'on_sale'            => $variation->is_on_sale(),
+				'weight'             => $variation->get_weight() ? $variation->get_weight() : null,
+				'dimensions'         => array(
+					'length' => $variation->get_length(),
+					'width'  => $variation->get_width(),
+					'height' => $variation->get_height(),
+					'unit'   => get_option( 'woocommerce_dimension_unit' ),
+				),
+				'shipping_class'    => $variation->get_shipping_class(),
+				'shipping_class_id' => ( 0 !== $variation->get_shipping_class_id() ) ? $variation->get_shipping_class_id() : null,
+				'image'             => $this->get_images( $variation ),
+				'attributes'        => $this->get_attributes( $variation ),
+				'downloads'         => $this->get_downloads( $variation ),
+				'download_limit'    => (int) $product->get_download_limit(),
+				'download_expiry'   => (int) $product->get_download_expiry(),
 			);
 		}
 
@@ -1224,9 +1283,9 @@ class WC_API_Products extends WC_API_Resource {
 		$products = array();
 
 		foreach ( $product->get_children() as $child_id ) {
-			$_product = $product->get_child( $child_id );
+			$_product = wc_get_product( $child_id );
 
-			if ( ! $_product->exists() ) {
+			if ( ! $_product || ! $_product->exists() ) {
 				continue;
 			}
 
@@ -1238,775 +1297,25 @@ class WC_API_Products extends WC_API_Resource {
 	}
 
 	/**
-	 * Save product meta.
+	 * Save default attributes.
 	 *
-	 * @since  2.2
-	 * @param  int $product_id
-	 * @param  array $data
-	 * @return bool
-	 * @throws WC_API_Exception
-	 */
-	protected function save_product_meta( $product_id, $data ) {
-		global $wpdb;
-
-		// Product Type.
-		$product_type = null;
-		if ( isset( $data['type'] ) ) {
-			$product_type = wc_clean( $data['type'] );
-			wp_set_object_terms( $product_id, $product_type, 'product_type' );
-		} else {
-			$_product_type = get_the_terms( $product_id, 'product_type' );
-			if ( is_array( $_product_type ) ) {
-				$_product_type = current( $_product_type );
-				$product_type  = $_product_type->slug;
-			}
-		}
-
-		// Virtual.
-		if ( isset( $data['virtual'] ) ) {
-			update_post_meta( $product_id, '_virtual', ( true === $data['virtual'] ) ? 'yes' : 'no' );
-		}
-
-		// Tax status.
-		if ( isset( $data['tax_status'] ) ) {
-			update_post_meta( $product_id, '_tax_status', wc_clean( $data['tax_status'] ) );
-		}
-
-		// Tax Class.
-		if ( isset( $data['tax_class'] ) ) {
-			update_post_meta( $product_id, '_tax_class', wc_clean( $data['tax_class'] ) );
-		}
-
-		// Catalog Visibility.
-		if ( isset( $data['catalog_visibility'] ) ) {
-			update_post_meta( $product_id, '_visibility', wc_clean( $data['catalog_visibility'] ) );
-		}
-
-		// Purchase Note.
-		if ( isset( $data['purchase_note'] ) ) {
-			update_post_meta( $product_id, '_purchase_note', wc_clean( $data['purchase_note'] ) );
-		}
-
-		// Featured Product.
-		if ( isset( $data['featured'] ) ) {
-			update_post_meta( $product_id, '_featured', ( true === $data['featured'] ) ? 'yes' : 'no' );
-		}
-
-		// Shipping data.
-		$this->save_product_shipping_data( $product_id, $data );
-
-		// SKU.
-		if ( isset( $data['sku'] ) ) {
-			$sku     = get_post_meta( $product_id, '_sku', true );
-			$new_sku = wc_clean( $data['sku'] );
-
-			if ( '' == $new_sku ) {
-				update_post_meta( $product_id, '_sku', '' );
-			} elseif ( $new_sku !== $sku ) {
-				if ( ! empty( $new_sku ) ) {
-					$unique_sku = wc_product_has_unique_sku( $product_id, $new_sku );
-					if ( ! $unique_sku ) {
-						throw new WC_API_Exception( 'woocommerce_api_product_sku_already_exists', __( 'The SKU already exists on another product', 'woocommerce' ), 400 );
-					} else {
-						update_post_meta( $product_id, '_sku', $new_sku );
-					}
-				} else {
-					update_post_meta( $product_id, '_sku', '' );
-				}
-			}
-		}
-
-		// Attributes.
-		if ( isset( $data['attributes'] ) ) {
-			$attributes = array();
-
-			foreach ( $data['attributes'] as $attribute ) {
-				$is_taxonomy = 0;
-				$taxonomy    = 0;
-
-				if ( ! isset( $attribute['name'] ) ) {
-					continue;
-				}
-
-				$attribute_slug = sanitize_title( $attribute['name'] );
-
-				if ( isset( $attribute['slug'] ) ) {
-					$taxonomy       = $this->get_attribute_taxonomy_by_slug( $attribute['slug'] );
-					$attribute_slug = sanitize_title( $attribute['slug'] );
-				}
-
-				if ( $taxonomy ) {
-					$is_taxonomy = 1;
-				}
-
-				if ( $is_taxonomy ) {
-
-					if ( isset( $attribute['options'] ) ) {
-						$options = $attribute['options'];
-
-						if ( ! is_array( $attribute['options'] ) ) {
-							// Text based attributes - Posted values are term names.
-							$options = explode( WC_DELIMITER, $options );
-						}
-
-						$values = array_map( 'wc_sanitize_term_text_based', $options );
-						$values = array_filter( $values, 'strlen' );
-					} else {
-						$values = array();
-					}
-
-					// Update post terms.
-					if ( taxonomy_exists( $taxonomy ) ) {
-						wp_set_object_terms( $product_id, $values, $taxonomy );
-					}
-
-					if ( $values ) {
-						// Add attribute to array, but don't set values.
-						$attributes[ $taxonomy ] = array(
-							'name'         => $taxonomy,
-							'value'        => '',
-							'position'     => isset( $attribute['position'] ) ? absint( $attribute['position'] ) : 0,
-							'is_visible'   => ( isset( $attribute['visible'] ) && $attribute['visible'] ) ? 1 : 0,
-							'is_variation' => ( isset( $attribute['variation'] ) && $attribute['variation'] ) ? 1 : 0,
-							'is_taxonomy'  => $is_taxonomy
-						);
-					}
-
-				} elseif ( isset( $attribute['options'] ) ) {
-					// Array based.
-					if ( is_array( $attribute['options'] ) ) {
-						$values = implode( ' ' . WC_DELIMITER . ' ', array_map( 'wc_clean', $attribute['options'] ) );
-
-					// Text based, separate by pipe.
-					} else {
-						$values = implode( ' ' . WC_DELIMITER . ' ', array_map( 'wc_clean', explode( WC_DELIMITER, $attribute['options'] ) ) );
-					}
-
-					// Custom attribute - Add attribute to array and set the values.
-					$attributes[ $attribute_slug ] = array(
-						'name'         => wc_clean( $attribute['name'] ),
-						'value'        => $values,
-						'position'     => isset( $attribute['position'] ) ? absint( $attribute['position'] ) : 0,
-						'is_visible'   => ( isset( $attribute['visible'] ) && $attribute['visible'] ) ? 1 : 0,
-						'is_variation' => ( isset( $attribute['variation'] ) && $attribute['variation'] ) ? 1 : 0,
-						'is_taxonomy'  => $is_taxonomy
-					);
-				}
-			}
-
-			if ( ! function_exists( 'attributes_cmp' ) ) {
-				function attributes_cmp( $a, $b ) {
-					if ( $a['position'] == $b['position'] ) {
-						return 0;
-					}
-
-					return ( $a['position'] < $b['position'] ) ? -1 : 1;
-				}
-			}
-			uasort( $attributes, 'attributes_cmp' );
-
-			update_post_meta( $product_id, '_product_attributes', $attributes );
-		}
-
-		// Sales and prices.
-		if ( in_array( $product_type, array( 'variable', 'grouped' ) ) ) {
-
-			// Variable and grouped products have no prices.
-			update_post_meta( $product_id, '_regular_price', '' );
-			update_post_meta( $product_id, '_sale_price', '' );
-			update_post_meta( $product_id, '_sale_price_dates_from', '' );
-			update_post_meta( $product_id, '_sale_price_dates_to', '' );
-			update_post_meta( $product_id, '_price', '' );
-
-		} else {
-
-			// Regular Price.
-			if ( isset( $data['regular_price'] ) ) {
-				$regular_price = ( '' === $data['regular_price'] ) ? '' : wc_format_decimal( $data['regular_price'] );
-				update_post_meta( $product_id, '_regular_price', $regular_price );
-			} else {
-				$regular_price = get_post_meta( $product_id, '_regular_price', true );
-			}
-
-			// Sale Price.
-			if ( isset( $data['sale_price'] ) ) {
-				$sale_price = ( '' === $data['sale_price'] ) ? '' : wc_format_decimal( $data['sale_price'] );
-				update_post_meta( $product_id, '_sale_price', $sale_price );
-			} else {
-				$sale_price = get_post_meta( $product_id, '_sale_price', true );
-			}
-
-			$date_from = isset( $data['sale_price_dates_from'] ) ? strtotime( $data['sale_price_dates_from'] ) : get_post_meta( $product_id, '_sale_price_dates_from', true );
-			$date_to   = isset( $data['sale_price_dates_to'] ) ? strtotime( $data['sale_price_dates_to'] ) : get_post_meta( $product_id, '_sale_price_dates_to', true );
-
-			// Dates
-			if ( $date_from ) {
-				update_post_meta( $product_id, '_sale_price_dates_from', $date_from );
-			} else {
-				update_post_meta( $product_id, '_sale_price_dates_from', '' );
-			}
-
-			if ( $date_to ) {
-				update_post_meta( $product_id, '_sale_price_dates_to', $date_to );
-			} else {
-				update_post_meta( $product_id, '_sale_price_dates_to', '' );
-			}
-
-			if ( $date_to && ! $date_from ) {
-				$date_from = strtotime( 'NOW', current_time( 'timestamp' ) );
-				update_post_meta( $product_id, '_sale_price_dates_from', $date_from );
-			}
-
-			// Update price if on sale.
-			if ( '' !== $sale_price && '' == $date_to && '' == $date_from ) {
-				update_post_meta( $product_id, '_price', wc_format_decimal( $sale_price ) );
-			} else {
-				update_post_meta( $product_id, '_price', $regular_price );
-			}
-
-			if ( '' !== $sale_price && $date_from && $date_from <= strtotime( 'NOW', current_time( 'timestamp' ) ) ) {
-				update_post_meta( $product_id, '_price', wc_format_decimal( $sale_price ) );
-			}
-
-			if ( $date_to && $date_to < strtotime( 'NOW', current_time( 'timestamp' ) ) ) {
-				update_post_meta( $product_id, '_price', $regular_price );
-				update_post_meta( $product_id, '_sale_price_dates_from', '' );
-				update_post_meta( $product_id, '_sale_price_dates_to', '' );
-			}
-		}
-
-		// Product parent ID for groups.
-		if ( isset( $data['parent_id'] ) ) {
-			wp_update_post( array( 'ID' => $product_id, 'post_parent' => absint( $data['parent_id'] ) ) );
-		}
-
-		// Update parent if grouped so price sorting works and stays in sync with the cheapest child.
-		$_product = wc_get_product( $product_id );
-		if ( $_product->post->post_parent > 0 || $product_type == 'grouped' ) {
-
-			$clear_parent_ids = array();
-
-			if ( $_product->post->post_parent > 0 ) {
-				$clear_parent_ids[] = $_product->post->post_parent;
-			}
-
-			if ( $product_type == 'grouped' ) {
-				$clear_parent_ids[] = $product_id;
-			}
-
-			if ( $clear_parent_ids ) {
-				foreach ( $clear_parent_ids as $clear_id ) {
-
-					$children_by_price = get_posts( array(
-						'post_parent'    => $clear_id,
-						'orderby'        => 'meta_value_num',
-						'order'          => 'asc',
-						'meta_key'       => '_price',
-						'posts_per_page' => 1,
-						'post_type'      => 'product',
-						'fields'         => 'ids'
-					) );
-
-					if ( $children_by_price ) {
-						foreach ( $children_by_price as $child ) {
-							$child_price = get_post_meta( $child, '_price', true );
-							update_post_meta( $clear_id, '_price', $child_price );
-						}
-					}
-				}
-			}
-		}
-
-		// Sold Individually.
-		if ( isset( $data['sold_individually'] ) ) {
-			update_post_meta( $product_id, '_sold_individually', ( true === $data['sold_individually'] ) ? 'yes' : '' );
-		}
-
-		// Stock status.
-		if ( isset( $data['in_stock'] ) ) {
-			$stock_status = ( true === $data['in_stock'] ) ? 'instock' : 'outofstock';
-		} else {
-			$stock_status = get_post_meta( $product_id, '_stock_status', true );
-
-			if ( '' === $stock_status ) {
-				$stock_status = 'instock';
-			}
-		}
-
-		// Stock Data.
-		if ( 'yes' == get_option( 'woocommerce_manage_stock' ) ) {
-			// Manage stock.
-			if ( isset( $data['managing_stock'] ) ) {
-				$managing_stock = ( true === $data['managing_stock'] ) ? 'yes' : 'no';
-				update_post_meta( $product_id, '_manage_stock', $managing_stock );
-			} else {
-				$managing_stock = get_post_meta( $product_id, '_manage_stock', true );
-			}
-
-			// Backorders.
-			if ( isset( $data['backorders'] ) ) {
-				if ( 'notify' == $data['backorders'] ) {
-					$backorders = 'notify';
-				} else {
-					$backorders = ( true === $data['backorders'] ) ? 'yes' : 'no';
-				}
-
-				update_post_meta( $product_id, '_backorders', $backorders );
-			} else {
-				$backorders = get_post_meta( $product_id, '_backorders', true );
-			}
-
-			if ( 'grouped' == $product_type ) {
-
-				update_post_meta( $product_id, '_manage_stock', 'no' );
-				update_post_meta( $product_id, '_backorders', 'no' );
-				update_post_meta( $product_id, '_stock', '' );
-
-				wc_update_product_stock_status( $product_id, $stock_status );
-
-			} elseif ( 'external' == $product_type ) {
-
-				update_post_meta( $product_id, '_manage_stock', 'no' );
-				update_post_meta( $product_id, '_backorders', 'no' );
-				update_post_meta( $product_id, '_stock', '' );
-
-				wc_update_product_stock_status( $product_id, 'instock' );
-
-			} elseif ( 'yes' == $managing_stock ) {
-				update_post_meta( $product_id, '_backorders', $backorders );
-
-				wc_update_product_stock_status( $product_id, $stock_status );
-
-				// Stock quantity.
-				if ( isset( $data['stock_quantity'] ) ) {
-					wc_update_product_stock( $product_id, wc_stock_amount( $data['stock_quantity'] ) );
-				} else if ( isset( $data['inventory_delta'] ) ) {
-					$stock_quantity  = wc_stock_amount( get_post_meta( $product_id, '_stock', true ) );
-					$stock_quantity += wc_stock_amount( $data['inventory_delta'] );
-
-					wc_update_product_stock( $product_id, wc_stock_amount( $stock_quantity ) );
-				}
-			} else {
-
-				// Don't manage stock.
-				update_post_meta( $product_id, '_manage_stock', 'no' );
-				update_post_meta( $product_id, '_backorders', $backorders );
-				update_post_meta( $product_id, '_stock', '' );
-
-				wc_update_product_stock_status( $product_id, $stock_status );
-			}
-
-		} else {
-			wc_update_product_stock_status( $product_id, $stock_status );
-		}
-
-		// Upsells.
-		if ( isset( $data['upsell_ids'] ) ) {
-			$upsells = array();
-			$ids     = $data['upsell_ids'];
-
-			if ( ! empty( $ids ) ) {
-				foreach ( $ids as $id ) {
-					if ( $id && $id > 0 ) {
-						$upsells[] = $id;
-					}
-				}
-
-				update_post_meta( $product_id, '_upsell_ids', $upsells );
-			} else {
-				delete_post_meta( $product_id, '_upsell_ids' );
-			}
-		}
-
-		// Cross sells.
-		if ( isset( $data['cross_sell_ids'] ) ) {
-			$crosssells = array();
-			$ids        = $data['cross_sell_ids'];
-
-			if ( ! empty( $ids ) ) {
-				foreach ( $ids as $id ) {
-					if ( $id && $id > 0 ) {
-						$crosssells[] = $id;
-					}
-				}
-
-				update_post_meta( $product_id, '_crosssell_ids', $crosssells );
-			} else {
-				delete_post_meta( $product_id, '_crosssell_ids' );
-			}
-		}
-
-		// Product categories.
-		if ( isset( $data['categories'] ) && is_array( $data['categories'] ) ) {
-			$term_ids = array_unique( array_map( 'intval', $data['categories'] ) );
-			wp_set_object_terms( $product_id, $term_ids, 'product_cat' );
-		}
-
-		// Product tags.
-		if ( isset( $data['tags'] ) && is_array( $data['tags'] ) ) {
-			$term_ids = array_unique( array_map( 'intval', $data['tags'] ) );
-			wp_set_object_terms( $product_id, $term_ids, 'product_tag' );
-		}
-
-		// Downloadable.
-		if ( isset( $data['downloadable'] ) ) {
-			$is_downloadable = ( true === $data['downloadable'] ) ? 'yes' : 'no';
-			update_post_meta( $product_id, '_downloadable', $is_downloadable );
-		} else {
-			$is_downloadable = get_post_meta( $product_id, '_downloadable', true );
-		}
-
-		// Downloadable options.
-		if ( 'yes' == $is_downloadable ) {
-
-			// Downloadable files.
-			if ( isset( $data['downloads'] ) && is_array( $data['downloads'] ) ) {
-				$this->save_downloadable_files( $product_id, $data['downloads'] );
-			}
-
-			// Download limit.
-			if ( isset( $data['download_limit'] ) ) {
-				update_post_meta( $product_id, '_download_limit', ( '' === $data['download_limit'] ) ? '' : absint( $data['download_limit'] ) );
-			}
-
-			// Download expiry.
-			if ( isset( $data['download_expiry'] ) ) {
-				update_post_meta( $product_id, '_download_expiry', ( '' === $data['download_expiry'] ) ? '' : absint( $data['download_expiry'] ) );
-			}
-
-			// Download type.
-			if ( isset( $data['download_type'] ) ) {
-				update_post_meta( $product_id, '_download_type', wc_clean( $data['download_type'] ) );
-			}
-		}
-
-		// Product url.
-		if ( $product_type == 'external' ) {
-			if ( isset( $data['product_url'] ) ) {
-				update_post_meta( $product_id, '_product_url', wc_clean( $data['product_url'] ) );
-			}
-
-			if ( isset( $data['button_text'] ) ) {
-				update_post_meta( $product_id, '_button_text', wc_clean( $data['button_text'] ) );
-			}
-		}
-
-		// Reviews allowed.
-		if ( isset( $data['reviews_allowed'] ) ) {
-			$reviews_allowed = ( true === $data['reviews_allowed'] ) ? 'open' : 'closed';
-
-			$wpdb->update( $wpdb->posts, array( 'comment_status' => $reviews_allowed ), array( 'ID' => $product_id ) );
-		}
-
-		// Do action for product type
-		do_action( 'woocommerce_api_process_product_meta_' . $product_type, $product_id, $data );
-
-		return true;
-	}
-
-	/**
-	 * Save variations
+	 * @since 3.0.0
 	 *
-	 * @since  2.2
-	 * @param  int $id
-	 * @param  array $data
-	 * @return bool
-	 * @throws WC_API_Exception
+	 * @param WC_Product $product
+	 * @param WP_REST_Request $request
+	 * @return WC_Product
 	 */
-	protected function save_variations( $id, $data ) {
-		global $wpdb;
-
-		$variations = $data['variations'];
-		$attributes = (array) maybe_unserialize( get_post_meta( $id, '_product_attributes', true ) );
-
-		foreach ( $variations as $menu_order => $variation ) {
-			$variation_id = isset( $variation['id'] ) ? absint( $variation['id'] ) : 0;
-
-			// Generate a useful post title
-			$variation_post_title = sprintf( __( 'Variation #%s of %s', 'woocommerce' ), $variation_id, esc_html( get_the_title( $id ) ) );
-
-			// Update or Add post
-			if ( ! $variation_id ) {
-				$post_status = ( isset( $variation['visible'] ) && false === $variation['visible'] ) ? 'private' : 'publish';
-
-				$new_variation = array(
-					'post_title'   => $variation_post_title,
-					'post_content' => '',
-					'post_status'  => $post_status,
-					'post_author'  => get_current_user_id(),
-					'post_parent'  => $id,
-					'post_type'    => 'product_variation',
-					'menu_order'   => $menu_order
-				);
-
-				$variation_id = wp_insert_post( $new_variation );
-
-				do_action( 'woocommerce_create_product_variation', $variation_id );
-			} else {
-				$update_variation = array( 'post_title' => $variation_post_title, 'menu_order' => $menu_order );
-				if ( isset( $variation['visible'] ) ) {
-					$post_status = ( false === $variation['visible'] ) ? 'private' : 'publish';
-					$update_variation['post_status'] = $post_status;
-				}
-
-				$wpdb->update( $wpdb->posts, $update_variation, array( 'ID' => $variation_id ) );
-
-				do_action( 'woocommerce_update_product_variation', $variation_id );
-			}
-
-			// Stop with we don't have a variation ID
-			if ( is_wp_error( $variation_id ) ) {
-				throw new WC_API_Exception( 'woocommerce_api_cannot_save_product_variation', $variation_id->get_error_message(), 400 );
-			}
-
-			// SKU
-			if ( isset( $variation['sku'] ) ) {
-				$sku     = get_post_meta( $variation_id, '_sku', true );
-				$new_sku = wc_clean( $variation['sku'] );
-
-				if ( '' == $new_sku ) {
-					update_post_meta( $variation_id, '_sku', '' );
-				} elseif ( $new_sku !== $sku ) {
-					if ( ! empty( $new_sku ) ) {
-						$unique_sku = wc_product_has_unique_sku( $variation_id, $new_sku );
-						if ( ! $unique_sku ) {
-							throw new WC_API_Exception( 'woocommerce_api_product_sku_already_exists', __( 'The SKU already exists on another product', 'woocommerce' ), 400 );
-						} else {
-							update_post_meta( $variation_id, '_sku', $new_sku );
-						}
-					} else {
-						update_post_meta( $variation_id, '_sku', '' );
-					}
-				}
-			}
-
-			// Thumbnail
-			if ( isset( $variation['image'] ) && is_array( $variation['image'] ) ) {
-				$image = current( $variation['image'] );
-				if ( $image && is_array( $image ) ) {
-					if ( isset( $image['position'] ) && isset( $image['src'] ) && $image['position'] == 0 ) {
-						$upload = $this->upload_product_image( wc_clean( $image['src'] ) );
-						if ( is_wp_error( $upload ) ) {
-							throw new WC_API_Exception( 'woocommerce_api_cannot_upload_product_image', $upload->get_error_message(), 400 );
-						}
-						$attachment_id = $this->set_product_image_as_attachment( $upload, $id );
-						update_post_meta( $variation_id, '_thumbnail_id', $attachment_id );
-					}
-				} else {
-					delete_post_meta( $variation_id, '_thumbnail_id' );
-				}
-			}
-
-			// Virtual variation
-			if ( isset( $variation['virtual'] ) ) {
-				$is_virtual = ( true === $variation['virtual'] ) ? 'yes' : 'no';
-				update_post_meta( $variation_id, '_virtual', $is_virtual );
-			}
-
-			// Downloadable variation
-			if ( isset( $variation['downloadable'] ) ) {
-				$is_downloadable = ( true === $variation['downloadable'] ) ? 'yes' : 'no';
-				update_post_meta( $variation_id, '_downloadable', $is_downloadable );
-			} else {
-				$is_downloadable = get_post_meta( $variation_id, '_downloadable', true );
-			}
-
-			// Shipping data
-			$this->save_product_shipping_data( $variation_id, $variation );
-
-			// Stock handling
-			if ( isset( $variation['managing_stock'] ) ) {
-				$managing_stock = ( true === $variation['managing_stock'] ) ? 'yes' : 'no';
-				update_post_meta( $variation_id, '_manage_stock', $managing_stock );
-			} else {
-				$managing_stock = get_post_meta( $variation_id, '_manage_stock', true );
-			}
-
-			// Only update stock status to user setting if changed by the user, but do so before looking at stock levels at variation level
-			if ( isset( $variation['in_stock'] ) ) {
-				$stock_status = ( true === $variation['in_stock'] ) ? 'instock' : 'outofstock';
-				wc_update_product_stock_status( $variation_id, $stock_status );
-			}
-
-			if ( 'yes' === $managing_stock ) {
-				$backorders = get_post_meta( $variation_id, '_backorders', true );
-
-				if ( isset( $variation['backorders'] ) ) {
-					if ( 'notify' == $variation['backorders'] ) {
-						$backorders = 'notify';
-					} else {
-						$backorders = ( true === $variation['backorders'] ) ? 'yes' : 'no';
-					}
-				}
-
-				update_post_meta( $variation_id, '_backorders', '' === $backorders ? 'no' : $backorders );
-
-				if ( isset( $variation['stock_quantity'] ) ) {
-					wc_update_product_stock( $variation_id, wc_stock_amount( $variation['stock_quantity'] ) );
-				}  else if ( isset( $data['inventory_delta'] ) ) {
-					$stock_quantity  = wc_stock_amount( get_post_meta( $variation_id, '_stock', true ) );
-					$stock_quantity += wc_stock_amount( $data['inventory_delta'] );
-
-					wc_update_product_stock( $variation_id, wc_stock_amount( $stock_quantity ) );
-				}
-			} else {
-				delete_post_meta( $variation_id, '_backorders' );
-				delete_post_meta( $variation_id, '_stock' );
-			}
-
-			// Regular Price
-			if ( isset( $variation['regular_price'] ) ) {
-				$regular_price = ( '' === $variation['regular_price'] ) ? '' : wc_format_decimal( $variation['regular_price'] );
-				update_post_meta( $variation_id, '_regular_price', $regular_price );
-			} else {
-				$regular_price = get_post_meta( $variation_id, '_regular_price', true );
-			}
-
-			// Sale Price
-			if ( isset( $variation['sale_price'] ) ) {
-				$sale_price = ( '' === $variation['sale_price'] ) ? '' : wc_format_decimal( $variation['sale_price'] );
-				update_post_meta( $variation_id, '_sale_price', $sale_price );
-			} else {
-				$sale_price = get_post_meta( $variation_id, '_sale_price', true );
-			}
-
-			$date_from = isset( $variation['sale_price_dates_from'] ) ? strtotime( $variation['sale_price_dates_from'] ) : get_post_meta( $variation_id, '_sale_price_dates_from', true );
-			$date_to   = isset( $variation['sale_price_dates_to'] ) ? strtotime( $variation['sale_price_dates_to'] ) : get_post_meta( $variation_id, '_sale_price_dates_to', true );
-
-			// Save Dates
-			if ( $date_from ) {
-				update_post_meta( $variation_id, '_sale_price_dates_from', $date_from );
-			} else {
-				update_post_meta( $variation_id, '_sale_price_dates_from', '' );
-			}
-
-			if ( $date_to ) {
-				update_post_meta( $variation_id, '_sale_price_dates_to', $date_to );
-			} else {
-				update_post_meta( $variation_id, '_sale_price_dates_to', '' );
-			}
-
-			if ( $date_to && ! $date_from ) {
-				update_post_meta( $variation_id, '_sale_price_dates_from', strtotime( 'NOW', current_time( 'timestamp' ) ) );
-			}
-
-			// Update price if on sale
-			if ( '' != $sale_price && '' == $date_to && '' == $date_from ) {
-				update_post_meta( $variation_id, '_price', $sale_price );
-			} else {
-				update_post_meta( $variation_id, '_price', $regular_price );
-			}
-
-			if ( '' != $sale_price && $date_from && $date_from < strtotime( 'NOW', current_time( 'timestamp' ) ) ) {
-				update_post_meta( $variation_id, '_price', $sale_price );
-			}
-
-			if ( $date_to && $date_to < strtotime( 'NOW', current_time( 'timestamp' ) ) ) {
-				update_post_meta( $variation_id, '_price', $regular_price );
-				update_post_meta( $variation_id, '_sale_price_dates_from', '' );
-				update_post_meta( $variation_id, '_sale_price_dates_to', '' );
-			}
-
-			// Tax class
-			if ( isset( $variation['tax_class'] ) ) {
-				if ( $variation['tax_class'] !== 'parent' ) {
-					update_post_meta( $variation_id, '_tax_class', wc_clean( $variation['tax_class'] ) );
-				} else {
-					delete_post_meta( $variation_id, '_tax_class' );
-				}
-			}
-
-			// Downloads
-			if ( 'yes' == $is_downloadable ) {
-				// Downloadable files
-				if ( isset( $variation['downloads'] ) && is_array( $variation['downloads'] ) ) {
-					$this->save_downloadable_files( $id, $variation['downloads'], $variation_id );
-				}
-
-				// Download limit
-				if ( isset( $variation['download_limit'] ) ) {
-					$download_limit = absint( $variation['download_limit'] );
-					update_post_meta( $variation_id, '_download_limit', ( ! $download_limit ) ? '' : $download_limit );
-				}
-
-				// Download expiry
-				if ( isset( $variation['download_expiry'] ) ) {
-					$download_expiry = absint( $variation['download_expiry'] );
-					update_post_meta( $variation_id, '_download_expiry', ( ! $download_expiry ) ? '' : $download_expiry );
-				}
-			} else {
-				update_post_meta( $variation_id, '_download_limit', '' );
-				update_post_meta( $variation_id, '_download_expiry', '' );
-				update_post_meta( $variation_id, '_downloadable_files', '' );
-			}
-
-			// Description.
-			if ( isset( $variation['description'] ) ) {
-				update_post_meta( $variation_id, '_variation_description', wp_kses_post( $variation['description'] ) );
-			}
-
-			// Update taxonomies
-			if ( isset( $variation['attributes'] ) ) {
-				$updated_attribute_keys = array();
-
-				foreach ( $variation['attributes'] as $attribute_key => $attribute ) {
-					if ( ! isset( $attribute['name'] ) ) {
-						continue;
-					}
-
-					$taxonomy   = 0;
-					$_attribute = array();
-
-					if ( isset( $attribute['slug'] ) ) {
-						$taxonomy = $this->get_attribute_taxonomy_by_slug( $attribute['slug'] );
-					}
-
-					if ( ! $taxonomy ) {
-						$taxonomy = sanitize_title( $attribute['name'] );
-					}
-
-					if ( isset( $attributes[ $taxonomy ] ) ) {
-						$_attribute = $attributes[ $taxonomy ];
-					}
-
-					if ( isset( $_attribute['is_variation'] ) && $_attribute['is_variation'] ) {
-						$_attribute_key           = 'attribute_' . sanitize_title( $_attribute['name'] );
-						$updated_attribute_keys[] = $_attribute_key;
-
-						if ( isset( $_attribute['is_taxonomy'] ) && $_attribute['is_taxonomy'] ) {
-							// Don't use wc_clean as it destroys sanitized characters
-							$_attribute_value = isset( $attribute['option'] ) ? sanitize_title( stripslashes( $attribute['option'] ) ) : '';
-						} else {
-							$_attribute_value = isset( $attribute['option'] ) ? wc_clean( stripslashes( $attribute['option'] ) ) : '';
-						}
-
-						update_post_meta( $variation_id, $_attribute_key, $_attribute_value );
-					}
-				}
-
-				// Remove old taxonomies attributes so data is kept up to date - first get attribute key names
-				$delete_attribute_keys = $wpdb->get_col( $wpdb->prepare( "SELECT meta_key FROM {$wpdb->postmeta} WHERE meta_key LIKE 'attribute_%%' AND meta_key NOT IN ( '" . implode( "','", $updated_attribute_keys ) . "' ) AND post_id = %d;", $variation_id ) );
-
-				foreach ( $delete_attribute_keys as $key ) {
-					delete_post_meta( $variation_id, $key );
-				}
-			}
-
-			do_action( 'woocommerce_api_save_product_variation', $variation_id, $menu_order, $variation );
+	protected function save_default_attributes( $product, $request ) {
+		// Update default attributes options setting.
+		if ( isset( $request['default_attribute'] ) ) {
+			$request['default_attributes'] = $request['default_attribute'];
 		}
 
-		// Update parent if variable so price sorting works and stays in sync with the cheapest child
-		WC_Product_Variable::sync( $id );
-
-		// Update default attributes options setting
-		if ( isset( $data['default_attribute'] ) ) {
-			$data['default_attributes'] = $data['default_attribute'];
-		}
-
-		if ( isset( $data['default_attributes'] ) && is_array( $data['default_attributes'] ) ) {
+		if ( isset( $request['default_attributes'] ) && is_array( $request['default_attributes'] ) ) {
+			$attributes         = $product->get_attributes();
 			$default_attributes = array();
 
-			foreach ( $data['default_attributes'] as $default_attr_key => $default_attr ) {
+			foreach ( $request['default_attributes'] as $default_attr_key => $default_attr ) {
 				if ( ! isset( $default_attr['name'] ) ) {
 					continue;
 				}
@@ -2039,7 +1348,587 @@ class WC_API_Products extends WC_API_Resource {
 				}
 			}
 
-			update_post_meta( $id, '_default_attributes', $default_attributes );
+			$product->set_default_attributes( $default_attributes );
+		}
+
+		return $product;
+	}
+
+	/**
+	 * Save product meta.
+	 *
+	 * @since  2.2
+	 * @param  WC_Product $product
+	 * @param  array $data
+	 * @return WC_Product
+	 * @throws WC_API_Exception
+	 */
+	protected function save_product_meta( $product, $data ) {
+		global $wpdb;
+
+		// Virtual.
+		if ( isset( $data['virtual'] ) ) {
+			$product->set_virtual( $data['virtual'] );
+		}
+
+		// Tax status.
+		if ( isset( $data['tax_status'] ) ) {
+			$product->set_tax_status( wc_clean( $data['tax_status'] ) );
+		}
+
+		// Tax Class.
+		if ( isset( $data['tax_class'] ) ) {
+			$product->set_tax_class( wc_clean( $data['tax_class'] ) );
+		}
+
+		// Catalog Visibility.
+		if ( isset( $data['catalog_visibility'] ) ) {
+			$product->set_catalog_visibility( wc_clean( $data['catalog_visibility'] ) );
+		}
+
+		// Purchase Note.
+		if ( isset( $data['purchase_note'] ) ) {
+			$product->set_purchase_note( wc_clean( $data['purchase_note'] ) );
+		}
+
+		// Featured Product.
+		if ( isset( $data['featured'] ) ) {
+			$product->set_featured( $data['featured'] );
+		}
+
+		// Shipping data.
+		$product = $this->save_product_shipping_data( $product, $data );
+
+		// SKU.
+		if ( isset( $data['sku'] ) ) {
+			$sku     = $product->get_sku();
+			$new_sku = wc_clean( $data['sku'] );
+
+			if ( '' == $new_sku ) {
+				$product->set_sku( '' );
+			} elseif ( $new_sku !== $sku ) {
+				if ( ! empty( $new_sku ) ) {
+					$unique_sku = wc_product_has_unique_sku( $product->get_id(), $new_sku );
+					if ( ! $unique_sku ) {
+						throw new WC_API_Exception( 'woocommerce_api_product_sku_already_exists', __( 'The SKU already exists on another product.', 'woocommerce' ), 400 );
+					} else {
+						$product->set_sku( $new_sku );
+					}
+				} else {
+					$product->set_sku( '' );
+				}
+			}
+		}
+
+		// Attributes.
+		if ( isset( $data['attributes'] ) ) {
+			$attributes = array();
+
+			foreach ( $data['attributes'] as $attribute ) {
+				$is_taxonomy = 0;
+				$taxonomy    = 0;
+
+				if ( ! isset( $attribute['name'] ) ) {
+					continue;
+				}
+
+				$attribute_slug = sanitize_title( $attribute['name'] );
+
+				if ( isset( $attribute['slug'] ) ) {
+					$taxonomy       = $this->get_attribute_taxonomy_by_slug( $attribute['slug'] );
+					$attribute_slug = sanitize_title( $attribute['slug'] );
+				}
+
+				if ( $taxonomy ) {
+					$is_taxonomy = 1;
+				}
+
+				if ( $is_taxonomy ) {
+
+					$attribute_id = wc_attribute_taxonomy_id_by_name( $attribute['name'] );
+
+					if ( isset( $attribute['options'] ) ) {
+						$options = $attribute['options'];
+
+						if ( ! is_array( $attribute['options'] ) ) {
+							// Text based attributes - Posted values are term names.
+							$options = explode( WC_DELIMITER, $options );
+						}
+
+						$values = array_map( 'wc_sanitize_term_text_based', $options );
+						$values = array_filter( $values, 'strlen' );
+					} else {
+						$values = array();
+					}
+
+					// Update post terms
+					if ( taxonomy_exists( $taxonomy ) ) {
+						wp_set_object_terms( $product->get_id(), $values, $taxonomy );
+					}
+
+					if ( ! empty( $values ) ) {
+						// Add attribute to array, but don't set values.
+						$attribute_object = new WC_Product_Attribute();
+						$attribute_object->set_id( $attribute_id );
+						$attribute_object->set_name( $taxonomy );
+						$attribute_object->set_options( $values );
+						$attribute_object->set_position( isset( $attribute['position'] ) ? absint( $attribute['position'] ) : 0 );
+						$attribute_object->set_visible( ( isset( $attribute['visible'] ) && $attribute['visible'] ) ? 1 : 0 );
+						$attribute_object->set_variation( ( isset( $attribute['variation'] ) && $attribute['variation'] ) ? 1 : 0 );
+						$attributes[] = $attribute_object;
+					}
+				} elseif ( isset( $attribute['options'] ) ) {
+					// Array based.
+					if ( is_array( $attribute['options'] ) ) {
+						$values = $attribute['options'];
+
+					// Text based, separate by pipe.
+					} else {
+						$values = array_map( 'wc_clean', explode( WC_DELIMITER, $attribute['options'] ) );
+					}
+
+					// Custom attribute - Add attribute to array and set the values.
+					$attribute_object = new WC_Product_Attribute();
+					$attribute_object->set_name( $attribute['name'] );
+					$attribute_object->set_options( $values );
+					$attribute_object->set_position( isset( $attribute['position'] ) ? absint( $attribute['position'] ) : 0 );
+					$attribute_object->set_visible( ( isset( $attribute['visible'] ) && $attribute['visible'] ) ? 1 : 0 );
+					$attribute_object->set_variation( ( isset( $attribute['variation'] ) && $attribute['variation'] ) ? 1 : 0 );
+					$attributes[] = $attribute_object;
+				}
+			}
+
+			uasort( $attributes, 'wc_product_attribute_uasort_comparison' );
+
+			$product->set_attributes( $attributes );
+		}
+
+		// Sales and prices.
+		if ( in_array( $product->get_type(), array( 'variable', 'grouped' ) ) ) {
+
+			// Variable and grouped products have no prices.
+			$product->set_regular_price( '' );
+			$product->set_sale_price( '' );
+			$product->set_date_on_sale_to( '' );
+			$product->set_date_on_sale_from( '' );
+			$product->set_price( '' );
+
+		} else {
+
+			// Regular Price
+			if ( isset( $data['regular_price'] ) ) {
+				$regular_price = ( '' === $data['regular_price'] ) ? '' : $data['regular_price'];
+			} else {
+				$regular_price = $product->get_regular_price();
+			}
+
+			// Sale Price
+			if ( isset( $data['sale_price'] ) ) {
+				$sale_price = ( '' === $data['sale_price'] ) ? '' : $data['sale_price'];
+			} else {
+				$sale_price = $product->get_sale_price();
+			}
+
+			$product->set_regular_price( $regular_price );
+			$product->set_sale_price( $sale_price );
+
+			if ( isset( $data['sale_price_dates_from'] ) ) {
+				$date_from = $data['sale_price_dates_from'];
+			} else {
+				$date_from = $product->get_date_on_sale_from() ? date( 'Y-m-d', $product->get_date_on_sale_from()->getTimestamp() ) : '';
+			}
+
+			if ( isset( $data['sale_price_dates_to'] ) ) {
+				$date_to = $data['sale_price_dates_to'];
+			} else {
+				$date_to = $product->get_date_on_sale_to() ? date( 'Y-m-d', $product->get_date_on_sale_to()->getTimestamp() ) : '';
+			}
+
+			if ( $date_to && ! $date_from ) {
+				$date_from = strtotime( 'NOW', current_time( 'timestamp', true ) );
+			}
+
+			$product->set_date_on_sale_to( $date_to );
+			$product->set_date_on_sale_from( $date_from );
+			if ( $product->is_on_sale() ) {
+				$product->set_price( $product->get_sale_price() );
+			} else {
+				$product->set_price( $product->get_regular_price() );
+			}
+		}
+
+		// Product parent ID for groups.
+		if ( isset( $data['parent_id'] ) ) {
+			$product->set_parent_id( absint( $data['parent_id'] ) );
+		}
+
+		// Sold Individually.
+		if ( isset( $data['sold_individually'] ) ) {
+			$product->set_sold_individually( true === $data['sold_individually'] ? 'yes' : '' );
+		}
+
+		// Stock status.
+		if ( isset( $data['in_stock'] ) ) {
+			$stock_status = ( true === $data['in_stock'] ) ? 'instock' : 'outofstock';
+		} else {
+			$stock_status = $product->get_stock_status();
+
+			if ( '' === $stock_status ) {
+				$stock_status = 'instock';
+			}
+		}
+
+		// Stock Data.
+		if ( 'yes' == get_option( 'woocommerce_manage_stock' ) ) {
+			// Manage stock.
+			if ( isset( $data['managing_stock'] ) ) {
+				$managing_stock = ( true === $data['managing_stock'] ) ? 'yes' : 'no';
+				$product->set_manage_stock( $managing_stock );
+			} else {
+				$managing_stock = $product->get_manage_stock() ? 'yes' : 'no';
+			}
+
+			// Backorders.
+			if ( isset( $data['backorders'] ) ) {
+				if ( 'notify' === $data['backorders'] ) {
+					$backorders = 'notify';
+				} else {
+					$backorders = ( true === $data['backorders'] ) ? 'yes' : 'no';
+				}
+
+				$product->set_backorders( $backorders );
+			} else {
+				$backorders = $product->get_backorders();
+			}
+
+			if ( $product->is_type( 'grouped' ) ) {
+				$product->set_manage_stock( 'no' );
+				$product->set_backorders( 'no' );
+				$product->set_stock_quantity( '' );
+				$product->set_stock_status( $stock_status );
+			} elseif ( $product->is_type( 'external' ) ) {
+				$product->set_manage_stock( 'no' );
+				$product->set_backorders( 'no' );
+				$product->set_stock_quantity( '' );
+				$product->set_stock_status( 'instock' );
+			} elseif ( 'yes' == $managing_stock ) {
+				$product->set_backorders( $backorders );
+
+				// Stock status is always determined by children so sync later.
+				if ( ! $product->is_type( 'variable' ) ) {
+					$product->set_stock_status( $stock_status );
+				}
+
+				// Stock quantity.
+				if ( isset( $data['stock_quantity'] ) ) {
+					$product->set_stock_quantity( wc_stock_amount( $data['stock_quantity'] ) );
+				} elseif ( isset( $data['inventory_delta'] ) ) {
+					$stock_quantity  = wc_stock_amount( $product->get_stock_quantity() );
+					$stock_quantity += wc_stock_amount( $data['inventory_delta'] );
+					$product->set_stock_quantity( wc_stock_amount( $stock_quantity ) );
+				}
+			} else {
+				// Don't manage stock.
+				$product->set_manage_stock( 'no' );
+				$product->set_backorders( $backorders );
+				$product->set_stock_quantity( '' );
+				$product->set_stock_status( $stock_status );
+			}
+		} elseif ( ! $product->is_type( 'variable' ) ) {
+			$product->set_stock_status( $stock_status );
+		}
+
+		// Upsells.
+		if ( isset( $data['upsell_ids'] ) ) {
+			$upsells = array();
+			$ids     = $data['upsell_ids'];
+
+			if ( ! empty( $ids ) ) {
+				foreach ( $ids as $id ) {
+					if ( $id && $id > 0 ) {
+						$upsells[] = $id;
+					}
+				}
+
+				$product->set_upsell_ids( $upsells );
+			} else {
+				$product->set_upsell_ids( array() );
+			}
+		}
+
+		// Cross sells.
+		if ( isset( $data['cross_sell_ids'] ) ) {
+			$crosssells = array();
+			$ids        = $data['cross_sell_ids'];
+
+			if ( ! empty( $ids ) ) {
+				foreach ( $ids as $id ) {
+					if ( $id && $id > 0 ) {
+						$crosssells[] = $id;
+					}
+				}
+
+				$product->set_cross_sell_ids( $crosssells );
+			} else {
+				$product->set_cross_sell_ids( array() );
+			}
+		}
+
+		// Product categories.
+		if ( isset( $data['categories'] ) && is_array( $data['categories'] ) ) {
+			$product->set_category_ids( $data['categories'] );
+		}
+
+		// Product tags.
+		if ( isset( $data['tags'] ) && is_array( $data['tags'] ) ) {
+			$product->set_tag_ids( $data['tags'] );
+		}
+
+		// Downloadable.
+		if ( isset( $data['downloadable'] ) ) {
+			$is_downloadable = ( true === $data['downloadable'] ) ? 'yes' : 'no';
+			$product->set_downloadable( $is_downloadable );
+		} else {
+			$is_downloadable = $product->get_downloadable() ? 'yes' : 'no';
+		}
+
+		// Downloadable options.
+		if ( 'yes' == $is_downloadable ) {
+
+			// Downloadable files.
+			if ( isset( $data['downloads'] ) && is_array( $data['downloads'] ) ) {
+				$product = $this->save_downloadable_files( $product, $data['downloads'] );
+			}
+
+			// Download limit.
+			if ( isset( $data['download_limit'] ) ) {
+				$product->set_download_limit( $data['download_limit'] );
+			}
+
+			// Download expiry.
+			if ( isset( $data['download_expiry'] ) ) {
+				$product->set_download_expiry( $data['download_expiry'] );
+			}
+		}
+
+		// Product url.
+		if ( $product->is_type( 'external' ) ) {
+			if ( isset( $data['product_url'] ) ) {
+				$product->set_product_url( $data['product_url'] );
+			}
+
+			if ( isset( $data['button_text'] ) ) {
+				$product->set_button_text( $data['button_text'] );
+			}
+		}
+
+		// Reviews allowed.
+		if ( isset( $data['reviews_allowed'] ) ) {
+			$product->set_reviews_allowed( $data['reviews_allowed'] );
+		}
+
+		// Save default attributes for variable products.
+		if ( $product->is_type( 'variable' ) ) {
+			$product = $this->save_default_attributes( $product, $data );
+		}
+
+		// Do action for product type
+		do_action( 'woocommerce_api_process_product_meta_' . $product->get_type(), $product->get_id(), $data );
+
+		return $product;
+	}
+
+	/**
+	 * Save variations.
+	 *
+	 * @since  2.2
+	 * @param  WC_Product $product
+	 * @param  array $request
+	 * @return WC_Product
+	 * @throws WC_API_Exception
+	 */
+	protected function save_variations( $product, $request ) {
+		global $wpdb;
+
+		$id         = $product->get_id();
+		$variations = $request['variations'];
+		$attributes = $product->get_attributes();
+
+		foreach ( $variations as $menu_order => $data ) {
+			$variation_id = isset( $data['id'] ) ? absint( $data['id'] ) : 0;
+			$variation    = new WC_Product_Variation( $variation_id );
+
+			// Create initial name and status.
+			if ( ! $variation->get_slug() ) {
+				/* translators: 1: variation id 2: product name */
+				$variation->set_name( sprintf( __( 'Variation #%1$s of %2$s', 'woocommerce' ), $variation->get_id(), $product->get_name() ) );
+				$variation->set_status( isset( $data['visible'] ) && false === $data['visible'] ? 'private' : 'publish' );
+			}
+
+			// Parent ID.
+			$variation->set_parent_id( $product->get_id() );
+
+			// Menu order.
+			$variation->set_menu_order( $menu_order );
+
+			// Status.
+			if ( isset( $data['visible'] ) ) {
+				$variation->set_status( false === $data['visible'] ? 'private' : 'publish' );
+			}
+
+			// SKU.
+			if ( isset( $data['sku'] ) ) {
+				$variation->set_sku( wc_clean( $data['sku'] ) );
+			}
+
+			// Thumbnail.
+			if ( isset( $data['image'] ) && is_array( $data['image'] ) ) {
+				$image = current( $data['image'] );
+				if ( is_array( $image ) ) {
+					$image['position'] = 0;
+				}
+
+				$variation = $this->save_product_images( $variation, array( $image ) );
+			}
+
+			// Virtual variation.
+			if ( isset( $data['virtual'] ) ) {
+				$variation->set_virtual( $data['virtual'] );
+			}
+
+			// Downloadable variation.
+			if ( isset( $data['downloadable'] ) ) {
+				$is_downloadable = $data['downloadable'];
+				$variation->set_downloadable( $is_downloadable );
+			} else {
+				$is_downloadable = $variation->get_downloadable();
+			}
+
+			// Downloads.
+			if ( $is_downloadable ) {
+				// Downloadable files.
+				if ( isset( $data['downloads'] ) && is_array( $data['downloads'] ) ) {
+					$variation = $this->save_downloadable_files( $variation, $data['downloads'] );
+				}
+
+				// Download limit.
+				if ( isset( $data['download_limit'] ) ) {
+					$variation->set_download_limit( $data['download_limit'] );
+				}
+
+				// Download expiry.
+				if ( isset( $data['download_expiry'] ) ) {
+					$variation->set_download_expiry( $data['download_expiry'] );
+				}
+			}
+
+			// Shipping data.
+			$variation = $this->save_product_shipping_data( $variation, $data );
+
+			// Stock handling.
+			$manage_stock = (bool) $variation->get_manage_stock();
+			if ( isset( $data['managing_stock'] ) ) {
+				$manage_stock = $data['managing_stock'];
+			}
+			$variation->set_manage_stock( $manage_stock );
+
+			$stock_status = $variation->get_stock_status();
+			if ( isset( $data['in_stock'] ) ) {
+				$stock_status = true === $data['in_stock'] ? 'instock' : 'outofstock';
+			}
+			$variation->set_stock_status( $stock_status );
+
+			$backorders = $variation->get_backorders();
+			if ( isset( $data['backorders'] ) ) {
+				$backorders = $data['backorders'];
+			}
+			$variation->set_backorders( $backorders );
+
+			if ( $manage_stock ) {
+				if ( isset( $data['stock_quantity'] ) ) {
+					$variation->set_stock_quantity( $data['stock_quantity'] );
+				} elseif ( isset( $data['inventory_delta'] ) ) {
+					$stock_quantity  = wc_stock_amount( $variation->get_stock_quantity() );
+					$stock_quantity += wc_stock_amount( $data['inventory_delta'] );
+					$variation->set_stock_quantity( $stock_quantity );
+				}
+			} else {
+				$variation->set_backorders( 'no' );
+				$variation->set_stock_quantity( '' );
+			}
+
+			// Regular Price.
+			if ( isset( $data['regular_price'] ) ) {
+				$variation->set_regular_price( $data['regular_price'] );
+			}
+
+			// Sale Price.
+			if ( isset( $data['sale_price'] ) ) {
+				$variation->set_sale_price( $data['sale_price'] );
+			}
+
+			if ( isset( $data['sale_price_dates_from'] ) ) {
+				$variation->set_date_on_sale_from( $data['sale_price_dates_from'] );
+			}
+
+			if ( isset( $data['sale_price_dates_to'] ) ) {
+				$variation->set_date_on_sale_to( $data['sale_price_dates_to'] );
+			}
+
+			// Tax class.
+			if ( isset( $data['tax_class'] ) ) {
+				$variation->set_tax_class( $data['tax_class'] );
+			}
+
+			// Description.
+			if ( isset( $data['description'] ) ) {
+				$variation->set_description( wp_kses_post( $data['description'] ) );
+			}
+
+			// Update taxonomies.
+			if ( isset( $data['attributes'] ) ) {
+				$_attributes = array();
+
+				foreach ( $data['attributes'] as $attribute_key => $attribute ) {
+					if ( ! isset( $attribute['name'] ) ) {
+						continue;
+					}
+
+					$taxonomy   = 0;
+					$_attribute = array();
+
+					if ( isset( $attribute['slug'] ) ) {
+						$taxonomy = $this->get_attribute_taxonomy_by_slug( $attribute['slug'] );
+					}
+
+					if ( ! $taxonomy ) {
+						$taxonomy = sanitize_title( $attribute['name'] );
+					}
+
+					if ( isset( $attributes[ $taxonomy ] ) ) {
+						$_attribute = $attributes[ $taxonomy ];
+					}
+
+					if ( isset( $_attribute['is_variation'] ) && $_attribute['is_variation'] ) {
+						$_attribute_key = sanitize_title( $_attribute['name'] );
+
+						if ( isset( $_attribute['is_taxonomy'] ) && $_attribute['is_taxonomy'] ) {
+							// Don't use wc_clean as it destroys sanitized characters.
+							$_attribute_value = isset( $attribute['option'] ) ? sanitize_title( stripslashes( $attribute['option'] ) ) : '';
+						} else {
+							$_attribute_value = isset( $attribute['option'] ) ? wc_clean( stripslashes( $attribute['option'] ) ) : '';
+						}
+
+						$_attributes[ $_attribute_key ] = $_attribute_value;
+					}
+				}
+
+				$variation->set_attributes( $_attributes );
+			}
+
+			$variation->save();
+
+			do_action( 'woocommerce_api_save_product_variation', $variation_id, $menu_order, $variation );
 		}
 
 		return true;
@@ -2049,29 +1938,30 @@ class WC_API_Products extends WC_API_Resource {
 	 * Save product shipping data
 	 *
 	 * @since 2.2
-	 * @param int $id
+	 * @param WC_Product $product
 	 * @param array $data
+	 * @return WC_Product
 	 */
-	private function save_product_shipping_data( $id, $data ) {
+	private function save_product_shipping_data( $product, $data ) {
 		if ( isset( $data['weight'] ) ) {
-			update_post_meta( $id, '_weight', ( '' === $data['weight'] ) ? '' : wc_format_decimal( $data['weight'] ) );
+			$product->set_weight( '' === $data['weight'] ? '' : wc_format_decimal( $data['weight'] ) );
 		}
 
 		// Product dimensions
 		if ( isset( $data['dimensions'] ) ) {
 			// Height
 			if ( isset( $data['dimensions']['height'] ) ) {
-				update_post_meta( $id, '_height', ( '' === $data['dimensions']['height'] ) ? '' : wc_format_decimal( $data['dimensions']['height'] ) );
+				$product->set_height( '' === $data['dimensions']['height'] ? '' : wc_format_decimal( $data['dimensions']['height'] ) );
 			}
 
 			// Width
 			if ( isset( $data['dimensions']['width'] ) ) {
-				update_post_meta( $id, '_width', ( '' === $data['dimensions']['width'] ) ? '' : wc_format_decimal($data['dimensions']['width'] ) );
+				$product->set_width( '' === $data['dimensions']['width'] ? '' : wc_format_decimal( $data['dimensions']['width'] ) );
 			}
 
 			// Length
 			if ( isset( $data['dimensions']['length'] ) ) {
-				update_post_meta( $id, '_length', ( '' === $data['dimensions']['length'] ) ? '' : wc_format_decimal( $data['dimensions']['length'] ) );
+				$product->set_length( '' === $data['dimensions']['length'] ? '' : wc_format_decimal( $data['dimensions']['length'] ) );
 			}
 		}
 
@@ -2080,59 +1970,58 @@ class WC_API_Products extends WC_API_Resource {
 			$virtual = ( true === $data['virtual'] ) ? 'yes' : 'no';
 
 			if ( 'yes' == $virtual ) {
-				update_post_meta( $id, '_weight', '' );
-				update_post_meta( $id, '_length', '' );
-				update_post_meta( $id, '_width', '' );
-				update_post_meta( $id, '_height', '' );
+				$product->set_weight( '' );
+				$product->set_height( '' );
+				$product->set_length( '' );
+				$product->set_width( '' );
 			}
 		}
 
 		// Shipping class
 		if ( isset( $data['shipping_class'] ) ) {
-			wp_set_object_terms( $id, wc_clean( $data['shipping_class'] ), 'product_shipping_class' );
+			$data_store         = $product->get_data_store();
+			$shipping_class_id  = $data_store->get_shipping_class_id_by_slug( wc_clean( $data['shipping_class'] ) );
+			if ( $shipping_class_id ) {
+				$product->set_shipping_class_id( $shipping_class_id );
+			}
 		}
+
+		return $product;
 	}
 
 	/**
 	 * Save downloadable files
 	 *
 	 * @since 2.2
-	 * @param int $product_id
+	 * @param WC_Product $product
 	 * @param array $downloads
-	 * @param int $variation_id
+	 * @param int $deprecated Deprecated since 3.0.
+	 * @return WC_Product
 	 */
-	private function save_downloadable_files( $product_id, $downloads, $variation_id = 0 ) {
-		$files = array();
+	private function save_downloadable_files( $product, $downloads, $deprecated = 0 ) {
+		if ( $deprecated ) {
+			wc_deprecated_argument( 'variation_id', '3.0', 'save_downloadable_files() does not require a variation_id anymore.' );
+		}
 
-		// File paths will be stored in an array keyed off md5(file path)
+		$files = array();
 		foreach ( $downloads as $key => $file ) {
 			if ( isset( $file['url'] ) ) {
 				$file['file'] = $file['url'];
 			}
 
-			if ( ! isset( $file['file'] ) ) {
+			if ( empty( $file['file'] ) ) {
 				continue;
 			}
 
-			$file_name = isset( $file['name'] ) ? wc_clean( $file['name'] ) : '';
-
-			if ( 0 === strpos( $file['file'], 'http' ) ) {
-				$file_url = esc_url_raw( $file['file'] );
-			} else {
-				$file_url = wc_clean( $file['file'] );
-			}
-
-			$files[ md5( $file_url ) ] = array(
-				'name' => $file_name,
-				'file' => $file_url
-			);
+			$download = new WC_Product_Download();
+			$download->set_id( $key );
+			$download->set_name( $file['name'] ? $file['name'] : wc_get_filename_from_url( $file['file'] ) );
+			$download->set_file( apply_filters( 'woocommerce_file_download_path', $file['file'], $product, $key ) );
+			$files[]  = $download;
 		}
+		$product->set_downloads( $files );
 
-		// Grant permission to any newly added files on any existing orders for this product prior to saving
-		do_action( 'woocommerce_process_product_file_download_paths', $product_id, $variation_id, $files );
-
-		$id = ( 0 === $variation_id ) ? $product_id : $variation_id;
-		update_post_meta( $id, '_downloadable_files', $files );
+		return $product;
 	}
 
 	/**
@@ -2165,34 +2054,18 @@ class WC_API_Products extends WC_API_Resource {
 	 * @return array
 	 */
 	private function get_images( $product ) {
+		$images        = $attachment_ids = array();
+		$product_image = $product->get_image_id();
 
-		$images = $attachment_ids = array();
-
-		if ( $product->is_type( 'variation' ) ) {
-
-			if ( has_post_thumbnail( $product->get_variation_id() ) ) {
-
-				// Add variation image if set
-				$attachment_ids[] = get_post_thumbnail_id( $product->get_variation_id() );
-
-			} elseif ( has_post_thumbnail( $product->id ) ) {
-
-				// Otherwise use the parent product featured image if set
-				$attachment_ids[] = get_post_thumbnail_id( $product->id );
-			}
-
-		} else {
-
-			// Add featured image
-			if ( has_post_thumbnail( $product->id ) ) {
-				$attachment_ids[] = get_post_thumbnail_id( $product->id );
-			}
-
-			// Add gallery images
-			$attachment_ids = array_merge( $attachment_ids, $product->get_gallery_attachment_ids() );
+		// Add featured image.
+		if ( ! empty( $product_image ) ) {
+			$attachment_ids[] = $product_image;
 		}
 
-		// Build image data
+		// Add gallery images.
+		$attachment_ids = array_merge( $attachment_ids, $product->get_gallery_image_ids() );
+
+		// Build image data.
 		foreach ( $attachment_ids as $position => $attachment_id ) {
 
 			$attachment_post = get_post( $attachment_id );
@@ -2218,12 +2091,12 @@ class WC_API_Products extends WC_API_Resource {
 			);
 		}
 
-		// Set a placeholder image if the product has no images set
+		// Set a placeholder image if the product has no images set.
 		if ( empty( $images ) ) {
 
 			$images[] = array(
 				'id'         => 0,
-				'created_at' => $this->server->format_datetime( time() ), // Default to now
+				'created_at' => $this->server->format_datetime( time() ), // Default to now.
 				'updated_at' => $this->server->format_datetime( time() ),
 				'src'        => wc_placeholder_img_src(),
 				'title'      => __( 'Placeholder', 'woocommerce' ),
@@ -2236,19 +2109,20 @@ class WC_API_Products extends WC_API_Resource {
 	}
 
 	/**
-	 * Save product images
+	 * Save product images.
 	 *
 	 * @since  2.2
+	 * @param  WC_Product $product
 	 * @param  array $images
-	 * @param  int $id
 	 * @throws WC_API_Exception
+	 * @return WC_Product
 	 */
-	protected function save_product_images( $id, $images ) {
+	protected function save_product_images( $product, $images ) {
 		if ( is_array( $images ) ) {
 			$gallery = array();
 
 			foreach ( $images as $image ) {
-				if ( isset( $image['position'] ) && $image['position'] == 0 ) {
+				if ( isset( $image['position'] ) && 0 == $image['position'] ) {
 					$attachment_id = isset( $image['id'] ) ? absint( $image['id'] ) : 0;
 
 					if ( 0 === $attachment_id && isset( $image['src'] ) ) {
@@ -2258,10 +2132,10 @@ class WC_API_Products extends WC_API_Resource {
 							throw new WC_API_Exception( 'woocommerce_api_cannot_upload_product_image', $upload->get_error_message(), 400 );
 						}
 
-						$attachment_id = $this->set_product_image_as_attachment( $upload, $id );
+						$attachment_id = $this->set_product_image_as_attachment( $upload, $product->get_id() );
 					}
 
-					set_post_thumbnail( $id, $attachment_id );
+					$product->set_image_id( $attachment_id );
 				} else {
 					$attachment_id = isset( $image['id'] ) ? absint( $image['id'] ) : 0;
 
@@ -2272,30 +2146,32 @@ class WC_API_Products extends WC_API_Resource {
 							throw new WC_API_Exception( 'woocommerce_api_cannot_upload_product_image', $upload->get_error_message(), 400 );
 						}
 
-						$gallery[] = $this->set_product_image_as_attachment( $upload, $id );
-					} else {
-						$gallery[] = $attachment_id;
+						$attachment_id = $this->set_product_image_as_attachment( $upload, $product->get_id() );
 					}
+
+					$gallery[] = $attachment_id;
 				}
 
 				// Set the image alt if present.
-				if ( ! empty( $image['alt'] ) ) {
+				if ( ! empty( $image['alt'] ) && $attachment_id ) {
 					update_post_meta( $attachment_id, '_wp_attachment_image_alt', wc_clean( $image['alt'] ) );
 				}
 
 				// Set the image title if present.
-				if ( ! empty( $image['title'] ) ) {
+				if ( ! empty( $image['title'] ) && $attachment_id ) {
 					wp_update_post( array( 'ID' => $attachment_id, 'post_title' => $image['title'] ) );
 				}
 			}
 
 			if ( ! empty( $gallery ) ) {
-				update_post_meta( $id, '_product_image_gallery', implode( ',', $gallery ) );
+				$product->set_gallery_image_ids( $gallery );
 			}
 		} else {
-			delete_post_thumbnail( $id );
-			update_post_meta( $id, '_product_image_gallery', '' );
+			$product->set_image_id( '' );
+			$product->set_gallery_image_ids( array() );
 		}
+
+		return $product;
 	}
 
 	/**
@@ -2306,14 +2182,14 @@ class WC_API_Products extends WC_API_Resource {
 	 * @return int|WP_Error attachment id
 	 */
 	public function upload_product_image( $image_url ) {
-		return $this->upload_image_from_url( $image_url );
+		return $this->upload_image_from_url( $image_url, 'product_image' );
 	}
 
 	/**
 	 * Upload product category image from URL.
 	 *
-	 * @since  2.5.0
-	 * @param  string $image_url
+	 * @since 2.5.0
+	 * @param string $image_url
 	 * @return int|WP_Error attachment id
 	 */
 	public function upload_product_category_image( $image_url ) {
@@ -2325,34 +2201,37 @@ class WC_API_Products extends WC_API_Resource {
 	 *
 	 * @throws WC_API_Exception
 	 *
-	 * @since  2.5.0
-	 * @param  string       $image_url
-	 * @param  string       $upload_for
+	 * @since 2.5.0
+	 * @param string $image_url
+	 * @param string $upload_for
 	 * @return int|WP_Error Attachment id
 	 */
 	protected function upload_image_from_url( $image_url, $upload_for = 'product_image' ) {
-		$file_name 		= basename( current( explode( '?', $image_url ) ) );
-		$wp_filetype 	= wp_check_filetype( $file_name, null );
-		$parsed_url 	= @parse_url( $image_url );
+		$file_name = basename( current( explode( '?', $image_url ) ) );
+		$parsed_url = @parse_url( $image_url );
 
 		// Check parsed URL.
 		if ( ! $parsed_url || ! is_array( $parsed_url ) ) {
-			throw new WC_API_Exception( 'woocommerce_api_invalid_' . $upload_for, sprintf( __( 'Invalid URL %s', 'woocommerce' ), $image_url ), 400 );
+			throw new WC_API_Exception( 'woocommerce_api_invalid_' . $upload_for, sprintf( __( 'Invalid URL %s.', 'woocommerce' ), $image_url ), 400 );
 		}
 
-		// Ensure url is valid
+		// Ensure url is valid.
 		$image_url = str_replace( ' ', '%20', $image_url );
 
-		// Get the file
+		// Get the file.
 		$response = wp_safe_remote_get( $image_url, array(
-			'timeout' => 10
+			'timeout' => 10,
 		) );
 
-		if ( is_wp_error( $response ) || 200 !== wp_remote_retrieve_response_code( $response ) ) {
-			throw new WC_API_Exception( 'woocommerce_api_invalid_remote_' . $upload_for, sprintf( __( 'Error getting remote image %s', 'woocommerce' ), $image_url ), 400 );
+		if ( is_wp_error( $response ) ) {
+			throw new WC_API_Exception( 'woocommerce_api_invalid_remote_' . $upload_for, sprintf( __( 'Error getting remote image %s.', 'woocommerce' ), $image_url ) . ' ' . sprintf( __( 'Error: %s.', 'woocommerce' ), $response->get_error_message() ), 400 );
+		} elseif ( 200 !== wp_remote_retrieve_response_code( $response ) ) {
+			throw new WC_API_Exception( 'woocommerce_api_invalid_remote_' . $upload_for, sprintf( __( 'Error getting remote image %s.', 'woocommerce' ), $image_url ), 400 );
 		}
 
-		// Ensure we have a file name and type
+		// Ensure we have a file name and type.
+		$wp_filetype = wp_check_filetype( $file_name, wc_rest_allowed_image_mime_types() );
+
 		if ( ! $wp_filetype['type'] ) {
 			$headers = wp_remote_retrieve_headers( $response );
 			if ( isset( $headers['content-disposition'] ) && strstr( $headers['content-disposition'], 'filename=' ) ) {
@@ -2363,27 +2242,34 @@ class WC_API_Products extends WC_API_Resource {
 				$file_name = 'image.' . str_replace( 'image/', '', $headers['content-type'] );
 			}
 			unset( $headers );
+
+			// Recheck filetype
+			$wp_filetype = wp_check_filetype( $file_name, wc_rest_allowed_image_mime_types() );
+
+			if ( ! $wp_filetype['type'] ) {
+				throw new WC_API_Exception( 'woocommerce_api_invalid_' . $upload_for, __( 'Invalid image type.', 'woocommerce' ), 400 );
+			}
 		}
 
-		// Upload the file
+		// Upload the file.
 		$upload = wp_upload_bits( $file_name, '', wp_remote_retrieve_body( $response ) );
 
 		if ( $upload['error'] ) {
 			throw new WC_API_Exception( 'woocommerce_api_' . $upload_for . '_upload_error', $upload['error'], 400 );
 		}
 
-		// Get filesize
+		// Get filesize.
 		$filesize = filesize( $upload['file'] );
 
 		if ( 0 == $filesize ) {
 			@unlink( $upload['file'] );
 			unset( $upload );
-			throw new WC_API_Exception( 'woocommerce_api_' . $upload_for . '_upload_file_error', __( 'Zero size file downloaded', 'woocommerce' ), 400 );
+			throw new WC_API_Exception( 'woocommerce_api_' . $upload_for . '_upload_file_error', __( 'Zero size file downloaded.', 'woocommerce' ), 400 );
 		}
 
 		unset( $response );
 
-		do_action( 'woocommerce_api_uploaded_image_from_url', $upload, $image_url, $upload_for  );
+		do_action( 'woocommerce_api_uploaded_image_from_url', $upload, $image_url, $upload_for );
 
 		return $upload;
 	}
@@ -2392,7 +2278,7 @@ class WC_API_Products extends WC_API_Resource {
 	 * Sets product image as attachment and returns the attachment ID.
 	 *
 	 * @since 2.2
-	 * @param integer $upload
+	 * @param array $upload
 	 * @param int $id
 	 * @return int
 	 */
@@ -2426,10 +2312,10 @@ class WC_API_Products extends WC_API_Resource {
 
 		if ( $image_meta = @wp_read_image_metadata( $upload['file'] ) ) {
 			if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
-				$title = $image_meta['title'];
+				$title = wc_clean( $image_meta['title'] );
 			}
 			if ( trim( $image_meta['caption'] ) ) {
-				$content = $image_meta['caption'];
+				$content = wc_clean( $image_meta['caption'] );
 			}
 		}
 
@@ -2438,7 +2324,7 @@ class WC_API_Products extends WC_API_Resource {
 			'guid'           => $upload['url'],
 			'post_parent'    => $id,
 			'post_title'     => $title,
-			'post_content'   => $content
+			'post_content'   => $content,
 		);
 
 		$attachment_id = wp_insert_attachment( $attachment, $upload['file'], $id );
@@ -2449,6 +2335,23 @@ class WC_API_Products extends WC_API_Resource {
 		return $attachment_id;
 	}
 
+	/**
+	 * Get attribute options.
+	 *
+	 * @param int $product_id
+	 * @param array $attribute
+	 * @return array
+	 */
+	protected function get_attribute_options( $product_id, $attribute ) {
+		if ( isset( $attribute['is_taxonomy'] ) && $attribute['is_taxonomy'] ) {
+			return wc_get_product_terms( $product_id, $attribute['name'], array( 'fields' => 'names' ) );
+		} elseif ( isset( $attribute['value'] ) ) {
+			return array_map( 'trim', explode( '|', $attribute['value'] ) );
+		}
+
+		return array();
+	}
+
 	/**
 	 * Get the attributes for a product or product variation
 	 *
@@ -2467,30 +2370,21 @@ class WC_API_Products extends WC_API_Resource {
 
 				// taxonomy-based attributes are prefixed with `pa_`, otherwise simply `attribute_`
 				$attributes[] = array(
-					'name'   => wc_attribute_label( str_replace( 'attribute_', '', $attribute_name ) ),
+					'name'   => wc_attribute_label( str_replace( 'attribute_', '', $attribute_name ), $product ),
 					'slug'   => str_replace( 'attribute_', '', str_replace( 'pa_', '', $attribute_name ) ),
 					'option' => $attribute,
 				);
 			}
-
 		} else {
 
 			foreach ( $product->get_attributes() as $attribute ) {
-
-				// taxonomy-based attributes are comma-separated, others are pipe (|) separated
-				if ( $attribute['is_taxonomy'] ) {
-					$options = explode( ',', $product->get_attribute( $attribute['name'] ) );
-				} else {
-					$options = explode( '|', $product->get_attribute( $attribute['name'] ) );
-				}
-
 				$attributes[] = array(
-					'name'      => wc_attribute_label( $attribute['name'] ),
+					'name'      => wc_attribute_label( $attribute['name'], $product ),
 					'slug'      => str_replace( 'pa_', '', $attribute['name'] ),
 					'position'  => (int) $attribute['position'],
 					'visible'   => (bool) $attribute['is_visible'],
 					'variation' => (bool) $attribute['is_variation'],
-					'options'   => array_map( 'trim', $options ),
+					'options'   => $this->get_attribute_options( $product->get_id(), $attribute ),
 				);
 			}
 		}
@@ -2511,7 +2405,7 @@ class WC_API_Products extends WC_API_Resource {
 
 		if ( $product->is_downloadable() ) {
 
-			foreach ( $product->get_files() as $file_id => $file ) {
+			foreach ( $product->get_downloads() as $file_id => $file ) {
 
 				$downloads[] = array(
 					'id'   => $file_id, // do not cast as int as this is a hash
@@ -2548,7 +2442,7 @@ class WC_API_Products extends WC_API_Resource {
 					'slug'         => wc_attribute_taxonomy_name( $attribute->attribute_name ),
 					'type'         => $attribute->attribute_type,
 					'order_by'     => $attribute->attribute_orderby,
-					'has_archives' => (bool) $attribute->attribute_public
+					'has_archives' => (bool) $attribute->attribute_public,
 				);
 			}
 
@@ -2598,7 +2492,7 @@ class WC_API_Products extends WC_API_Resource {
 				'slug'         => wc_attribute_taxonomy_name( $attribute->attribute_name ),
 				'type'         => $attribute->attribute_type,
 				'order_by'     => $attribute->attribute_orderby,
-				'has_archives' => (bool) $attribute->attribute_public
+				'has_archives' => (bool) $attribute->attribute_public,
 			);
 
 			return array( 'product_attribute' => apply_filters( 'woocommerce_api_product_attribute_response', $product_attribute, $id, $fields, $attribute, $this ) );
@@ -2626,9 +2520,9 @@ class WC_API_Products extends WC_API_Resource {
 
 		if ( strlen( $slug ) >= 28 ) {
 			throw new WC_API_Exception( 'woocommerce_api_invalid_product_attribute_slug_too_long', sprintf( __( 'Slug "%s" is too long (28 characters max). Shorten it, please.', 'woocommerce' ), $slug ), 400 );
-		} else if ( wc_check_if_attribute_name_is_reserved( $slug ) ) {
+		} elseif ( wc_check_if_attribute_name_is_reserved( $slug ) ) {
 			throw new WC_API_Exception( 'woocommerce_api_invalid_product_attribute_slug_reserved_name', sprintf( __( 'Slug "%s" is not allowed because it is a reserved term. Change it, please.', 'woocommerce' ), $slug ), 400 );
-		} else if ( $new_data && taxonomy_exists( wc_attribute_taxonomy_name( $slug ) ) ) {
+		} elseif ( $new_data && taxonomy_exists( wc_attribute_taxonomy_name( $slug ) ) ) {
 			throw new WC_API_Exception( 'woocommerce_api_invalid_product_attribute_slug_already_exists', sprintf( __( 'Slug "%s" is already in use. Change it, please.', 'woocommerce' ), $slug ), 400 );
 		}
 
@@ -2700,7 +2594,7 @@ class WC_API_Products extends WC_API_Resource {
 					'attribute_name'    => $data['slug'],
 					'attribute_type'    => $data['type'],
 					'attribute_orderby' => $data['order_by'],
-					'attribute_public'  => isset( $data['has_archives'] ) && true === $data['has_archives'] ? 1 : 0
+					'attribute_public'  => isset( $data['has_archives'] ) && true === $data['has_archives'] ? 1 : 0,
 				),
 				array( '%s', '%s', '%s', '%s', '%d' )
 			);
@@ -2715,7 +2609,7 @@ class WC_API_Products extends WC_API_Resource {
 			do_action( 'woocommerce_api_create_product_attribute', $id, $data );
 
 			// Clear transients.
-			flush_rewrite_rules();
+			wp_schedule_single_event( time(), 'woocommerce_flush_rewrite_rules' );
 			delete_transient( 'wc_attribute_taxonomies' );
 
 			$this->server->send_status( 201 );
@@ -2784,7 +2678,7 @@ class WC_API_Products extends WC_API_Resource {
 					'attribute_name'    => $attribute_slug,
 					'attribute_type'    => $attribute_type,
 					'attribute_orderby' => $attribute_order_by,
-					'attribute_public'  => $attribute_public
+					'attribute_public'  => $attribute_public,
 				),
 				array( 'attribute_id' => $id ),
 				array( '%s', '%s', '%s', '%s', '%d' ),
@@ -2799,7 +2693,7 @@ class WC_API_Products extends WC_API_Resource {
 			do_action( 'woocommerce_api_edit_product_attribute', $id, $data );
 
 			// Clear transients.
-			flush_rewrite_rules();
+			wp_schedule_single_event( time(), 'woocommerce_flush_rewrite_rules' );
 			delete_transient( 'wc_attribute_taxonomies' );
 
 			return $this->get_product_attribute( $id );
@@ -2859,7 +2753,7 @@ class WC_API_Products extends WC_API_Resource {
 			do_action( 'woocommerce_api_delete_product_attribute', $id, $this );
 
 			// Clear transients.
-			flush_rewrite_rules();
+			wp_schedule_single_event( time(), 'woocommerce_flush_rewrite_rules' );
 			delete_transient( 'wc_attribute_taxonomies' );
 
 			return array( 'message' => sprintf( __( 'Deleted %s', 'woocommerce' ), 'product_attribute' ) );
@@ -3124,7 +3018,7 @@ class WC_API_Products extends WC_API_Resource {
 
 			if ( ! $term ) {
 				throw new WC_API_Exception( 'woocommerce_api_cannot_delete_product_attribute_term', sprintf( __( 'This %s cannot be deleted', 'woocommerce' ), 'product_attribute_term' ), 500 );
-			} else if ( is_wp_error( $term ) ) {
+			} elseif ( is_wp_error( $term ) ) {
 				throw new WC_API_Exception( 'woocommerce_api_cannot_delete_product_attribute_term', $term->get_error_message(), 400 );
 			}
 
@@ -3156,7 +3050,8 @@ class WC_API_Products extends WC_API_Resource {
 		}
 
 		// Delete product
-		wp_delete_post( $product_id, true );
+		$product = wc_get_product( $product_id );
+		$product->delete( true );
 	}
 
 	/**
@@ -3180,7 +3075,7 @@ class WC_API_Products extends WC_API_Resource {
 
 			// Limit bulk operation
 			if ( count( $data ) > $limit ) {
-				throw new WC_API_Exception( 'woocommerce_api_products_request_entity_too_large', sprintf( __( 'Unable to accept more than %s items for this request', 'woocommerce' ), $limit ), 413 );
+				throw new WC_API_Exception( 'woocommerce_api_products_request_entity_too_large', sprintf( __( 'Unable to accept more than %s items for this request.', 'woocommerce' ), $limit ), 413 );
 			}
 
 			$products = array();
@@ -3199,30 +3094,30 @@ class WC_API_Products extends WC_API_Resource {
 					$product_id  = wc_get_product_id_by_sku( $product_sku );
 				}
 
-				// Product exists / edit product
 				if ( $product_id ) {
+
+					// Product exists / edit product
 					$edit = $this->edit_product( $product_id, array( 'product' => $_product ) );
 
 					if ( is_wp_error( $edit ) ) {
 						$products[] = array(
 							'id'    => $product_id,
 							'sku'   => $product_sku,
-							'error' => array( 'code' => $edit->get_error_code(), 'message' => $edit->get_error_message() )
+							'error' => array( 'code' => $edit->get_error_code(), 'message' => $edit->get_error_message() ),
 						);
 					} else {
 						$products[] = $edit['product'];
 					}
-				}
+				} else {
 
-				// Product don't exists / create product
-				else {
+					// Product don't exists / create product
 					$new = $this->create_product( array( 'product' => $_product ) );
 
 					if ( is_wp_error( $new ) ) {
 						$products[] = array(
 							'id'    => $product_id,
 							'sku'   => $product_sku,
-							'error' => array( 'code' => $new->get_error_code(), 'message' => $new->get_error_message() )
+							'error' => array( 'code' => $new->get_error_code(), 'message' => $new->get_error_message() ),
 						);
 					} else {
 						$products[] = $new['product'];
@@ -3300,7 +3195,7 @@ class WC_API_Products extends WC_API_Resource {
 				'slug'        => $term->slug,
 				'parent'      => $term->parent,
 				'description' => $term->description,
-				'count'       => intval( $term->count )
+				'count'       => intval( $term->count ),
 			);
 
 			return array( 'product_shipping_class' => apply_filters( 'woocommerce_api_product_shipping_class_response', $product_shipping_class, $id, $fields, $term, $this ) );
@@ -3343,7 +3238,7 @@ class WC_API_Products extends WC_API_Resource {
 			// Check parent.
 			$data['parent'] = absint( $data['parent'] );
 			if ( $data['parent'] ) {
-				$parent = get_term_by( 'term_taxonomy_id', $data['parent'], 'product_shipping_class' );
+				$parent = get_term_by( 'id', $data['parent'], 'product_shipping_class' );
 				if ( ! $parent ) {
 					throw new WC_API_Exception( 'woocommerce_api_invalid_product_shipping_class_parent', __( 'Product shipping class parent is invalid', 'woocommerce' ), 400 );
 				}
@@ -3354,11 +3249,13 @@ class WC_API_Products extends WC_API_Resource {
 				throw new WC_API_Exception( 'woocommerce_api_cannot_create_product_shipping_class', $insert->get_error_message(), 400 );
 			}
 
-			do_action( 'woocommerce_api_create_product_shipping_class', $insert['term_taxonomy_id'], $data );
+			$id = $insert['term_id'];
+
+			do_action( 'woocommerce_api_create_product_shipping_class', $id, $data );
 
 			$this->server->send_status( 201 );
 
-			return $this->get_product_shipping_class( $insert['term_taxonomy_id'] );
+			return $this->get_product_shipping_class( $id );
 		} catch ( WC_API_Exception $e ) {
 			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
 		}
diff --git a/includes/api/class-wc-api-reports.php b/includes/api/legacy/v3/class-wc-api-reports.php
similarity index 98%
rename from includes/api/class-wc-api-reports.php
rename to includes/api/legacy/v3/class-wc-api-reports.php
index e981f8b7307..834ecd105af 100644
--- a/includes/api/class-wc-api-reports.php
+++ b/includes/api/legacy/v3/class-wc-api-reports.php
@@ -40,7 +40,7 @@ class WC_API_Reports extends WC_API_Resource {
 		);
 
 		# GET /reports/sales
-		$routes[ $this->base . '/sales'] = array(
+		$routes[ $this->base . '/sales' ] = array(
 			array( array( $this, 'get_sales_report' ), WC_API_Server::READABLE ),
 		);
 
@@ -223,14 +223,14 @@ class WC_API_Reports extends WC_API_Resource {
 					'type'            => 'order_item_meta',
 					'order_item_type' => 'line_item',
 					'function'        => '',
-					'name'            => 'product_id'
+					'name'            => 'product_id',
 				),
 				'_qty' => array(
 					'type'            => 'order_item_meta',
 					'order_item_type' => 'line_item',
 					'function'        => 'SUM',
-					'name'            => 'order_item_qty'
-				)
+					'name'            => 'order_item_qty',
+				),
 			),
 			'order_by'     => 'order_item_qty DESC',
 			'group_by'     => 'product_id',
@@ -247,7 +247,7 @@ class WC_API_Reports extends WC_API_Resource {
 
 			if ( $product ) {
 				$top_sellers_data[] = array(
-					'title'      => $product->get_title(),
+					'title'      => $product->get_name(),
 					'product_id' => $top_seller->product_id,
 					'quantity'   => $top_seller->order_item_qty,
 				);
@@ -286,7 +286,6 @@ class WC_API_Reports extends WC_API_Resource {
 				// default custom range to today
 				$_GET['start_date'] = $_GET['end_date'] = date( 'Y-m-d', current_time( 'timestamp' ) );
 			}
-
 		} else {
 
 			// ensure period is valid
diff --git a/includes/api/class-wc-api-resource.php b/includes/api/legacy/v3/class-wc-api-resource.php
similarity index 91%
rename from includes/api/class-wc-api-resource.php
rename to includes/api/legacy/v3/class-wc-api-resource.php
index 725294c7841..c5e25fee5f9 100644
--- a/includes/api/class-wc-api-resource.php
+++ b/includes/api/legacy/v3/class-wc-api-resource.php
@@ -41,14 +41,26 @@ class WC_API_Resource {
 			add_filter( "woocommerce_api_{$resource}_response", array( $this, 'maybe_add_meta' ), 15, 2 );
 		}
 
-		$response_names = array( 'order', 'coupon', 'customer', 'product', 'report',
-			'customer_orders', 'customer_downloads', 'order_note', 'order_refund',
-			'product_reviews', 'product_category', 'tax', 'tax_class'
+		$response_names = array(
+			'order',
+			'coupon',
+			'customer',
+			'product',
+			'report',
+			'customer_orders',
+			'customer_downloads',
+			'order_note',
+			'order_refund',
+			'product_reviews',
+			'product_category',
+			'tax',
+			'tax_class',
 		);
 
 		foreach ( $response_names as $name ) {
 
-			/* remove fields from responses when requests specify certain fields
+			/**
+			 * Remove fields from responses when requests specify certain fields
 			 * note these are hooked at a later priority so data added via
 			 * filters (e.g. customer data to the order response) still has the
 			 * fields filtered properly
@@ -91,7 +103,7 @@ class WC_API_Resource {
 			$post = get_post( $id );
 
 			if ( null === $post ) {
-				return new WP_Error( "woocommerce_api_no_{$resource_name}_found", sprintf( __( 'No %s found with the ID equal to %s', 'woocommerce' ), $resource_name, $id ), array( 'status' => 404 ) );
+				return new WP_Error( "woocommerce_api_no_{$resource_name}_found", sprintf( __( 'No %1$s found with the ID equal to %2$s', 'woocommerce' ), $resource_name, $id ), array( 'status' => 404 ) );
 			}
 
 			// For checking permissions, product variations are the same as the product post type
@@ -106,18 +118,21 @@ class WC_API_Resource {
 			switch ( $context ) {
 
 				case 'read':
-					if ( ! $this->is_readable( $post ) )
+					if ( ! $this->is_readable( $post ) ) {
 						return new WP_Error( "woocommerce_api_user_cannot_read_{$resource_name}", sprintf( __( 'You do not have permission to read this %s', 'woocommerce' ), $resource_name ), array( 'status' => 401 ) );
+					}
 					break;
 
 				case 'edit':
-					if ( ! $this->is_editable( $post ) )
+					if ( ! $this->is_editable( $post ) ) {
 						return new WP_Error( "woocommerce_api_user_cannot_edit_{$resource_name}", sprintf( __( 'You do not have permission to edit this %s', 'woocommerce' ), $resource_name ), array( 'status' => 401 ) );
+					}
 					break;
 
 				case 'delete':
-					if ( ! $this->is_deletable( $post ) )
+					if ( ! $this->is_deletable( $post ) ) {
 						return new WP_Error( "woocommerce_api_user_cannot_delete_{$resource_name}", sprintf( __( 'You do not have permission to delete this %s', 'woocommerce' ), $resource_name ), array( 'status' => 401 ) );
+					}
 					break;
 			}
 		}
@@ -233,8 +248,9 @@ class WC_API_Resource {
 		if ( isset( $this->server->params['GET']['filter']['meta'] ) && 'true' === $this->server->params['GET']['filter']['meta'] && is_object( $resource ) ) {
 
 			// don't attempt to add meta more than once
-			if ( preg_grep( '/[a-z]+_meta/', array_keys( $data ) ) )
+			if ( preg_grep( '/[a-z]+_meta/', array_keys( $data ) ) ) {
 				return $data;
+			}
 
 			// define the top-level property name for the meta
 			switch ( get_class( $resource ) ) {
@@ -272,14 +288,13 @@ class WC_API_Resource {
 				$meta = (array) get_post_meta( $resource->id );
 			}
 
-			foreach( $meta as $meta_key => $meta_value ) {
+			foreach ( $meta as $meta_key => $meta_value ) {
 
 				// don't add hidden meta by default
 				if ( ! is_protected_meta( $meta_key ) ) {
 					$data[ $meta_name ][ $meta_key ] = maybe_unserialize( $meta_value[0] );
 				}
 			}
-
 		}
 
 		return $data;
@@ -328,7 +343,6 @@ class WC_API_Resource {
 						unset( $data[ $data_field ][ $sub_field ] );
 					}
 				}
-
 			} else {
 
 				// remove non-matching top-level fields
@@ -362,19 +376,19 @@ class WC_API_Resource {
 
 			$result = wp_delete_user( $id );
 
-			if ( $result )
+			if ( $result ) {
 				return array( 'message' => __( 'Permanently deleted customer', 'woocommerce' ) );
-			else
+			} else {
 				return new WP_Error( 'woocommerce_api_cannot_delete_customer', __( 'The customer cannot be deleted', 'woocommerce' ), array( 'status' => 500 ) );
-
+			}
 		} else {
 
 			// delete order/coupon/product/webhook
-
 			$result = ( $force ) ? wp_delete_post( $id, true ) : wp_trash_post( $id );
 
-			if ( ! $result )
+			if ( ! $result ) {
 				return new WP_Error( "woocommerce_api_cannot_delete_{$resource_name}", sprintf( __( 'This %s cannot be deleted', 'woocommerce' ), $resource_name ), array( 'status' => 500 ) );
+			}
 
 			if ( $force ) {
 				return array( 'message' => sprintf( __( 'Permanently deleted %s', 'woocommerce' ), $resource_name ) );
@@ -438,26 +452,26 @@ class WC_API_Resource {
 	 * @return bool true if the current user has the permissions to perform the context on the post
 	 */
 	private function check_permission( $post, $context ) {
+		$permission = false;
 
 		if ( ! is_a( $post, 'WP_Post' ) ) {
 			$post = get_post( $post );
 		}
 
 		if ( is_null( $post ) ) {
-			return false;
+			return $permission;
 		}
 
 		$post_type = get_post_type_object( $post->post_type );
 
 		if ( 'read' === $context ) {
-			return ( 'revision' !== $post->post_type && current_user_can( $post_type->cap->read_private_posts, $post->ID ) );
+			$permission = 'revision' !== $post->post_type && current_user_can( $post_type->cap->read_private_posts, $post->ID );
 		} elseif ( 'edit' === $context ) {
-			return current_user_can( $post_type->cap->edit_post, $post->ID );
+			$permission = current_user_can( $post_type->cap->edit_post, $post->ID );
 		} elseif ( 'delete' === $context ) {
-			return current_user_can( $post_type->cap->delete_post, $post->ID );
-		} else {
-			return false;
+			$permission = current_user_can( $post_type->cap->delete_post, $post->ID );
 		}
-	}
 
+		return apply_filters( 'woocommerce_api_check_permission', $permission, $context, $post, $post_type );
+	}
 }
diff --git a/includes/api/class-wc-api-server.php b/includes/api/legacy/v3/class-wc-api-server.php
similarity index 89%
rename from includes/api/class-wc-api-server.php
rename to includes/api/legacy/v3/class-wc-api-server.php
index 3b607f3f163..47136bf3257 100644
--- a/includes/api/class-wc-api-server.php
+++ b/includes/api/legacy/v3/class-wc-api-server.php
@@ -154,14 +154,16 @@ class WC_API_Server {
 		// allow plugins to remove default authentication or add their own authentication
 		$user = apply_filters( 'woocommerce_api_check_authentication', null, $this );
 
-		// API requests run under the context of the authenticated user
 		if ( is_a( $user, 'WP_User' ) ) {
-			wp_set_current_user( $user->ID );
-		}
 
-		// WP_Errors are handled in serve_request()
-		elseif ( ! is_wp_error( $user ) ) {
+			// API requests run under the context of the authenticated user
+			wp_set_current_user( $user->ID );
+
+		} elseif ( ! is_wp_error( $user ) ) {
+
+			// WP_Errors are handled in serve_request()
 			$user = new WP_Error( 'woocommerce_api_authentication_error', __( 'Invalid authentication method', 'woocommerce' ), array( 'code' => 500 ) );
+
 		}
 
 		return $user;
@@ -442,32 +444,34 @@ class WC_API_Server {
 	public function get_index() {
 
 		// General site data
-		$available = array( 'store' => array(
-			'name'        => get_option( 'blogname' ),
-			'description' => get_option( 'blogdescription' ),
-			'URL'         => get_option( 'siteurl' ),
-			'wc_version'  => WC()->version,
-			'version'     => WC_API::VERSION,
-			'routes'      => array(),
-			'meta'        => array(
-				'timezone'           => wc_timezone_string(),
-				'currency'           => get_woocommerce_currency(),
-				'currency_format'    => get_woocommerce_currency_symbol(),
-				'currency_position'  => get_option( 'woocommerce_currency_pos' ),
-				'thousand_separator' => get_option( 'woocommerce_price_decimal_sep' ),
-				'decimal_separator'  => get_option( 'woocommerce_price_thousand_sep' ),
-				'price_num_decimals' => wc_get_price_decimals(),
-				'tax_included'       => wc_prices_include_tax(),
-				'weight_unit'        => get_option( 'woocommerce_weight_unit' ),
-				'dimension_unit'     => get_option( 'woocommerce_dimension_unit' ),
-				'ssl_enabled'        => ( 'yes' === get_option( 'woocommerce_force_ssl_checkout' ) ),
-				'permalinks_enabled' => ( '' !== get_option( 'permalink_structure' ) ),
-				'generate_password'  => ( 'yes' === get_option( 'woocommerce_registration_generate_password' ) ),
-				'links'              => array(
-					'help' => 'http://woothemes.github.io/woocommerce-rest-api-docs/',
+		$available = array(
+			'store' => array(
+				'name'        => get_option( 'blogname' ),
+				'description' => get_option( 'blogdescription' ),
+				'URL'         => get_option( 'siteurl' ),
+				'wc_version'  => WC()->version,
+				'version'     => WC_API::VERSION,
+				'routes'      => array(),
+				'meta'        => array(
+					'timezone'           => wc_timezone_string(),
+					'currency'           => get_woocommerce_currency(),
+					'currency_format'    => get_woocommerce_currency_symbol(),
+					'currency_position'  => get_option( 'woocommerce_currency_pos' ),
+					'thousand_separator' => get_option( 'woocommerce_price_thousand_sep' ),
+					'decimal_separator'  => get_option( 'woocommerce_price_decimal_sep' ),
+					'price_num_decimals' => wc_get_price_decimals(),
+					'tax_included'       => wc_prices_include_tax(),
+					'weight_unit'        => get_option( 'woocommerce_weight_unit' ),
+					'dimension_unit'     => get_option( 'woocommerce_dimension_unit' ),
+					'ssl_enabled'        => ( 'yes' === get_option( 'woocommerce_force_ssl_checkout' ) || wc_site_is_https() ),
+					'permalinks_enabled' => ( '' !== get_option( 'permalink_structure' ) ),
+					'generate_password'  => ( 'yes' === get_option( 'woocommerce_registration_generate_password' ) ),
+					'links'              => array(
+						'help' => 'https://woocommerce.github.io/woocommerce-rest-api-docs/',
+					),
 				),
 			),
-		) );
+		);
 
 		// Find the available routes
 		foreach ( $this->get_routes() as $route => $callbacks ) {
@@ -571,14 +575,14 @@ class WC_API_Server {
 			$single      = count( $query->get_results() ) == 1;
 			$total       = $query->get_total();
 
-			if( $query->get( 'number' ) > 0 ) {
+			if ( $query->get( 'number' ) > 0 ) {
 				$page = ( $query->get( 'offset' ) / $query->get( 'number' ) ) + 1;
 				$total_pages = ceil( $total / $query->get( 'number' ) );
 			} else {
 				$page = 1;
 				$total_pages = 1;
 			}
-		} else if ( is_a( $query, 'stdClass' ) ) {
+		} elseif ( is_a( $query, 'stdClass' ) ) {
 			$page        = $query->page;
 			$single      = $query->is_single;
 			$total       = $query->total;
@@ -706,9 +710,17 @@ class WC_API_Server {
 	 * @since 2.1
 	 * @param int|string $timestamp unix timestamp or MySQL datetime
 	 * @param bool $convert_to_utc
+	 * @param bool $convert_to_gmt Use GMT timezone.
 	 * @return string RFC3339 datetime
 	 */
-	public function format_datetime( $timestamp, $convert_to_utc = false ) {
+	public function format_datetime( $timestamp, $convert_to_utc = false, $convert_to_gmt = false ) {
+		if ( $convert_to_gmt ) {
+			if ( is_numeric( $timestamp ) ) {
+				$timestamp = date( 'Y-m-d H:i:s', $timestamp );
+			}
+
+			$timestamp = get_gmt_from_date( $timestamp );
+		}
 
 		if ( $convert_to_utc ) {
 			$timezone = new DateTimeZone( wc_timezone_string() );
@@ -728,7 +740,6 @@ class WC_API_Server {
 			if ( $convert_to_utc ) {
 				$date->modify( -1 * $date->getOffset() . ' seconds' );
 			}
-
 		} catch ( Exception $e ) {
 
 			$date = new DateTime( '@0' );
@@ -744,13 +755,13 @@ class WC_API_Server {
 	 * @param array $server Associative array similar to $_SERVER
 	 * @return array Headers extracted from the input
 	 */
-	public function get_headers($server) {
+	public function get_headers( $server ) {
 		$headers = array();
 		// CONTENT_* headers are not prefixed with HTTP_
-		$additional = array('CONTENT_LENGTH' => true, 'CONTENT_MD5' => true, 'CONTENT_TYPE' => true);
+		$additional = array( 'CONTENT_LENGTH' => true, 'CONTENT_MD5' => true, 'CONTENT_TYPE' => true );
 
-		foreach ($server as $key => $value) {
-			if ( strpos( $key, 'HTTP_' ) === 0) {
+		foreach ( $server as $key => $value ) {
+			if ( strpos( $key, 'HTTP_' ) === 0 ) {
 				$headers[ substr( $key, 5 ) ] = $value;
 			} elseif ( isset( $additional[ $key ] ) ) {
 				$headers[ $key ] = $value;
@@ -759,5 +770,4 @@ class WC_API_Server {
 
 		return $headers;
 	}
-
 }
diff --git a/includes/api/class-wc-api-taxes.php b/includes/api/legacy/v3/class-wc-api-taxes.php
similarity index 97%
rename from includes/api/class-wc-api-taxes.php
rename to includes/api/legacy/v3/class-wc-api-taxes.php
index 11c50152486..4ee48cdeb0e 100644
--- a/includes/api/class-wc-api-taxes.php
+++ b/includes/api/legacy/v3/class-wc-api-taxes.php
@@ -39,7 +39,7 @@ class WC_API_Taxes extends WC_API_Resource {
 		);
 
 		# GET /taxes/count
-		$routes[ $this->base . '/count'] = array(
+		$routes[ $this->base . '/count' ] = array(
 			array( array( $this, 'get_taxes_count' ), WC_API_Server::READABLE ),
 		);
 
@@ -57,7 +57,7 @@ class WC_API_Taxes extends WC_API_Resource {
 		);
 
 		# GET /taxes/classes/count
-		$routes[ $this->base . '/classes/count'] = array(
+		$routes[ $this->base . '/classes/count' ] = array(
 			array( array( $this, 'get_tax_classes_count' ), WC_API_Server::READABLE ),
 		);
 
@@ -147,7 +147,7 @@ class WC_API_Taxes extends WC_API_Resource {
 				'compound' => (bool) $tax['tax_rate_compound'],
 				'shipping' => (bool) $tax['tax_rate_shipping'],
 				'order'    => (int) $tax['tax_rate_order'],
-				'class'    => $tax['tax_rate_class'] ? $tax['tax_rate_class'] : 'standard'
+				'class'    => $tax['tax_rate_class'] ? $tax['tax_rate_class'] : 'standard',
 			);
 
 			// Get locales from a tax rate
@@ -281,7 +281,7 @@ class WC_API_Taxes extends WC_API_Resource {
 				'tax_rate_compound',
 				'tax_rate_shipping',
 				'tax_rate_order',
-				'tax_rate_class'
+				'tax_rate_class',
 			);
 
 			foreach ( $data as $key => $value ) {
@@ -436,7 +436,7 @@ class WC_API_Taxes extends WC_API_Resource {
 
 		return array(
 			'results' => $results,
-			'headers' => $headers
+			'headers' => $headers,
 		);
 	}
 
@@ -462,7 +462,7 @@ class WC_API_Taxes extends WC_API_Resource {
 
 			// Limit bulk operation
 			if ( count( $data ) > $limit ) {
-				throw new WC_API_Exception( 'woocommerce_api_taxes_request_entity_too_large', sprintf( __( 'Unable to accept more than %s items for this request', 'woocommerce' ), $limit ), 413 );
+				throw new WC_API_Exception( 'woocommerce_api_taxes_request_entity_too_large', sprintf( __( 'Unable to accept more than %s items for this request.', 'woocommerce' ), $limit ), 413 );
 			}
 
 			$taxes = array();
@@ -475,28 +475,28 @@ class WC_API_Taxes extends WC_API_Resource {
 					$tax_id = intval( $_tax['id'] );
 				}
 
-				// Tax rate exists / edit tax rate
 				if ( $tax_id ) {
+
+					// Tax rate exists / edit tax rate
 					$edit = $this->edit_tax( $tax_id, array( 'tax' => $_tax ) );
 
 					if ( is_wp_error( $edit ) ) {
 						$taxes[] = array(
 							'id'    => $tax_id,
-							'error' => array( 'code' => $edit->get_error_code(), 'message' => $edit->get_error_message() )
+							'error' => array( 'code' => $edit->get_error_code(), 'message' => $edit->get_error_message() ),
 						);
 					} else {
 						$taxes[] = $edit['tax'];
 					}
-				}
+				} else {
 
-				// Tax rate don't exists / create tax rate
-				else {
+					// Tax rate don't exists / create tax rate
 					$new = $this->create_tax( array( 'tax' => $_tax ) );
 
 					if ( is_wp_error( $new ) ) {
 						$taxes[] = array(
 							'id'    => $tax_id,
-							'error' => array( 'code' => $new->get_error_code(), 'message' => $new->get_error_message() )
+							'error' => array( 'code' => $new->get_error_code(), 'message' => $new->get_error_message() ),
 						);
 					} else {
 						$taxes[] = $new['tax'];
@@ -531,7 +531,7 @@ class WC_API_Taxes extends WC_API_Resource {
 			// Add standard class
 			$tax_classes[] = array(
 				'slug' => 'standard',
-				'name' => __( 'Standard Rate', 'woocommerce' )
+				'name' => __( 'Standard rate', 'woocommerce' ),
 			);
 
 			$classes = WC_Tax::get_tax_classes();
@@ -539,7 +539,7 @@ class WC_API_Taxes extends WC_API_Resource {
 			foreach ( $classes as $class ) {
 				$tax_classes[] = apply_filters( 'woocommerce_api_tax_class_response', array(
 					'slug' => sanitize_title( $class ),
-					'name' => $class
+					'name' => $class,
 				), $class, $fields, $this );
 			}
 
@@ -605,8 +605,8 @@ class WC_API_Taxes extends WC_API_Resource {
 			return array(
 				'tax_class' => array(
 					'slug' => $slug,
-					'name' => $name
-				)
+					'name' => $name,
+				),
 			);
 		} catch ( WC_API_Exception $e ) {
 			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
diff --git a/includes/api/class-wc-api-webhooks.php b/includes/api/legacy/v3/class-wc-api-webhooks.php
similarity index 95%
rename from includes/api/class-wc-api-webhooks.php
rename to includes/api/legacy/v3/class-wc-api-webhooks.php
index 1851f789413..69167dde656 100644
--- a/includes/api/class-wc-api-webhooks.php
+++ b/includes/api/legacy/v3/class-wc-api-webhooks.php
@@ -35,7 +35,7 @@ class WC_API_Webhooks extends WC_API_Resource {
 		);
 
 		# GET /webhooks/count
-		$routes[ $this->base . '/count'] = array(
+		$routes[ $this->base . '/count' ] = array(
 			array( array( $this, 'get_webhooks_count' ), WC_API_Server::READABLE ),
 		);
 
@@ -173,14 +173,14 @@ class WC_API_Webhooks extends WC_API_Resource {
 
 			// permission check
 			if ( ! current_user_can( 'publish_shop_webhooks' ) ) {
-				throw new WC_API_Exception( 'woocommerce_api_user_cannot_create_webhooks', __( 'You do not have permission to create webhooks', 'woocommerce' ), 401 );
+				throw new WC_API_Exception( 'woocommerce_api_user_cannot_create_webhooks', __( 'You do not have permission to create webhooks.', 'woocommerce' ), 401 );
 			}
 
 			$data = apply_filters( 'woocommerce_api_create_webhook_data', $data, $this );
 
 			// validate topic
 			if ( empty( $data['topic'] ) || ! wc_is_webhook_valid_topic( strtolower( $data['topic'] ) ) ) {
-				throw new WC_API_Exception( 'woocommerce_api_invalid_webhook_topic', __( 'Webhook topic is required and must be valid', 'woocommerce' ), 400 );
+				throw new WC_API_Exception( 'woocommerce_api_invalid_webhook_topic', __( 'Webhook topic is required and must be valid.', 'woocommerce' ), 400 );
 			}
 
 			// validate delivery URL
@@ -194,7 +194,9 @@ class WC_API_Webhooks extends WC_API_Resource {
 				'ping_status'   => 'closed',
 				'post_author'   => get_current_user_id(),
 				'post_password' => strlen( ( $password = uniqid( 'webhook_' ) ) ) > 20 ? substr( $password, 0, 20 ) : $password,
+				// @codingStandardsIgnoreStart
 				'post_title'    => ! empty( $data['name'] ) ? $data['name'] : sprintf( __( 'Webhook created on %s', 'woocommerce' ), strftime( _x( '%b %d, %Y @ %I:%M %p', 'Webhook created on date parsed by strftime', 'woocommerce' ) ) ),
+				// @codingStandardsIgnoreEnd
 			), $data, $this );
 
 			$webhook_id = wp_insert_post( $webhook_data );
@@ -210,7 +212,10 @@ class WC_API_Webhooks extends WC_API_Resource {
 			$webhook->set_delivery_url( $data['delivery_url'] );
 
 			// set secret if provided, defaults to API users consumer secret
-			$webhook->set_secret( ! empty( $data['secret'] ) ? $data['secret'] : get_user_meta( get_current_user_id(), 'woocommerce_api_consumer_secret', true ) );
+			$webhook->set_secret( ! empty( $data['secret'] ) ? $data['secret'] : '' );
+
+			// Set API version to legacy v3.
+			$webhook->set_api_version( 'legacy_v3' );
 
 			// send ping
 			$webhook->deliver_ping();
@@ -265,7 +270,7 @@ class WC_API_Webhooks extends WC_API_Resource {
 					$webhook->set_topic( $data['topic'] );
 
 				} else {
-					throw new WC_API_Exception( 'woocommerce_api_invalid_webhook_topic', __( 'Webhook topic must be valid', 'woocommerce' ), 400 );
+					throw new WC_API_Exception( 'woocommerce_api_invalid_webhook_topic', __( 'Webhook topic must be valid.', 'woocommerce' ), 400 );
 				}
 			}
 
@@ -293,7 +298,7 @@ class WC_API_Webhooks extends WC_API_Resource {
 			// update user ID
 			$webhook_data = array(
 				'ID'          => $webhook->id,
-				'post_author' => get_current_user_id()
+				'post_author' => get_current_user_id(),
 			);
 
 			// update name
@@ -437,7 +442,7 @@ class WC_API_Webhooks extends WC_API_Resource {
 			$id = absint( $id );
 
 			if ( empty( $id ) ) {
-				throw new WC_API_Exception( 'woocommerce_api_invalid_webhook_delivery_id', __( 'Invalid webhook delivery ID', 'woocommerce' ), 404 );
+				throw new WC_API_Exception( 'woocommerce_api_invalid_webhook_delivery_id', __( 'Invalid webhook delivery ID.', 'woocommerce' ), 404 );
 			}
 
 			$webhook = new WC_Webhook( $webhook_id );
@@ -445,7 +450,7 @@ class WC_API_Webhooks extends WC_API_Resource {
 			$log = $webhook->get_delivery_log( $id );
 
 			if ( ! $log ) {
-				throw new WC_API_Exception( 'woocommerce_api_invalid_webhook_delivery_id', __( 'Invalid webhook delivery', 'woocommerce' ), 400 );
+				throw new WC_API_Exception( 'woocommerce_api_invalid_webhook_delivery_id', __( 'Invalid webhook delivery.', 'woocommerce' ), 400 );
 			}
 
 			$delivery_log = $log;
@@ -461,5 +466,4 @@ class WC_API_Webhooks extends WC_API_Resource {
 			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
 		}
 	}
-
 }
diff --git a/includes/api/v2/interface-wc-api-handler.php b/includes/api/legacy/v3/interface-wc-api-handler.php
similarity index 100%
rename from includes/api/v2/interface-wc-api-handler.php
rename to includes/api/legacy/v3/interface-wc-api-handler.php
diff --git a/includes/api/v1/class-wc-rest-coupons-controller.php b/includes/api/v1/class-wc-rest-coupons-controller.php
new file mode 100644
index 00000000000..2f19cb7958d
--- /dev/null
+++ b/includes/api/v1/class-wc-rest-coupons-controller.php
@@ -0,0 +1,580 @@
+<?php
+/**
+ * REST API Coupons controller
+ *
+ * Handles requests to the /coupons endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Coupons controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Posts_Controller
+ */
+class WC_REST_Coupons_V1_Controller extends WC_REST_Posts_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v1';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'coupons';
+
+	/**
+	 * Post type.
+	 *
+	 * @var string
+	 */
+	protected $post_type = 'shop_coupon';
+
+	/**
+	 * Coupons actions.
+	 */
+	public function __construct() {
+		add_filter( "woocommerce_rest_{$this->post_type}_query", array( $this, 'query_args' ), 10, 2 );
+	}
+
+	/**
+	 * Register the routes for coupons.
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+				'args'                => $this->get_collection_params(),
+			),
+			array(
+				'methods'             => WP_REST_Server::CREATABLE,
+				'callback'            => array( $this, 'create_item' ),
+				'permission_callback' => array( $this, 'create_item_permissions_check' ),
+				'args'                => array_merge( $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ), array(
+					'code' => array(
+						'description' => __( 'Coupon code.', 'woocommerce' ),
+						'required'    => true,
+						'type'        => 'string',
+					),
+				) ),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
+			'args' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_item' ),
+				'permission_callback' => array( $this, 'get_item_permissions_check' ),
+				'args'                => array(
+					'context'         => $this->get_context_param( array( 'default' => 'view' ) ),
+				),
+			),
+			array(
+				'methods'         => WP_REST_Server::EDITABLE,
+				'callback'        => array( $this, 'update_item' ),
+				'permission_callback' => array( $this, 'update_item_permissions_check' ),
+				'args'            => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			array(
+				'methods'             => WP_REST_Server::DELETABLE,
+				'callback'            => array( $this, 'delete_item' ),
+				'permission_callback' => array( $this, 'delete_item_permissions_check' ),
+				'args'                => array(
+					'force' => array(
+						'default'     => false,
+						'type'        => 'boolean',
+						'description' => __( 'Whether to bypass trash and force deletion.', 'woocommerce' ),
+					),
+				),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/batch', array(
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'batch_items' ),
+				'permission_callback' => array( $this, 'batch_items_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			'schema' => array( $this, 'get_public_batch_schema' ),
+		) );
+	}
+
+	/**
+	 * Query args.
+	 *
+	 * @param array $args Query args
+	 * @param WP_REST_Request $request Request data.
+	 * @return array
+	 */
+	public function query_args( $args, $request ) {
+		if ( ! empty( $request['code'] ) ) {
+			$id = wc_get_coupon_id_by_code( $request['code'] );
+			$args['post__in'] = array( $id );
+		}
+
+		return $args;
+	}
+
+	/**
+	 * Prepare a single coupon output for response.
+	 *
+	 * @param WP_Post $post Post object.
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response $data
+	 */
+	public function prepare_item_for_response( $post, $request ) {
+		$coupon = new WC_Coupon( (int) $post->ID );
+		$_data  = $coupon->get_data();
+
+		$format_decimal  = array( 'amount', 'minimum_amount', 'maximum_amount' );
+		$format_date     = array( 'date_created', 'date_modified' );
+		$format_date_utc = array( 'date_expires' );
+		$format_null     = array( 'usage_limit', 'usage_limit_per_user' );
+
+		// Format decimal values.
+		foreach ( $format_decimal as $key ) {
+			$_data[ $key ] = wc_format_decimal( $_data[ $key ], 2 );
+		}
+
+		// Format date values.
+		foreach ( $format_date as $key ) {
+			$_data[ $key ] = $_data[ $key ] ? wc_rest_prepare_date_response( $_data[ $key ], false ) : null;
+		}
+		foreach ( $format_date_utc as $key ) {
+			$_data[ $key ] = $_data[ $key ] ? wc_rest_prepare_date_response( $_data[ $key ] ) : null;
+		}
+
+		// Format null values.
+		foreach ( $format_null as $key ) {
+			$_data[ $key ] = $_data[ $key ] ? $_data[ $key ] : null;
+		}
+
+		$data = array(
+			'id'                          => $_data['id'],
+			'code'                        => $_data['code'],
+			'date_created'                => $_data['date_created'],
+			'date_modified'               => $_data['date_modified'],
+			'discount_type'               => $_data['discount_type'],
+			'description'                 => $_data['description'],
+			'amount'                      => $_data['amount'],
+			'expiry_date'                 => $_data['date_expires'],
+			'usage_count'                 => $_data['usage_count'],
+			'individual_use'              => $_data['individual_use'],
+			'product_ids'                 => $_data['product_ids'],
+			'exclude_product_ids'         => $_data['excluded_product_ids'],
+			'usage_limit'                 => $_data['usage_limit'],
+			'usage_limit_per_user'        => $_data['usage_limit_per_user'],
+			'limit_usage_to_x_items'      => $_data['limit_usage_to_x_items'],
+			'free_shipping'               => $_data['free_shipping'],
+			'product_categories'          => $_data['product_categories'],
+			'excluded_product_categories' => $_data['excluded_product_categories'],
+			'exclude_sale_items'          => $_data['exclude_sale_items'],
+			'minimum_amount'              => $_data['minimum_amount'],
+			'maximum_amount'              => $_data['maximum_amount'],
+			'email_restrictions'          => $_data['email_restrictions'],
+			'used_by'                     => $_data['used_by'],
+		);
+
+		$context  = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data     = $this->add_additional_fields_to_object( $data, $request );
+		$data     = $this->filter_response_by_context( $data, $context );
+		$response = rest_ensure_response( $data );
+		$response->add_links( $this->prepare_links( $post, $request ) );
+
+		/**
+		 * Filter the data for a response.
+		 *
+		 * The dynamic portion of the hook name, $this->post_type, refers to post_type of the post being
+		 * prepared for the response.
+		 *
+		 * @param WP_REST_Response   $response   The response object.
+		 * @param WP_Post            $post       Post object.
+		 * @param WP_REST_Request    $request    Request object.
+		 */
+		return apply_filters( "woocommerce_rest_prepare_{$this->post_type}", $response, $post, $request );
+	}
+
+	/**
+	 * Only reutrn writeable props from schema.
+	 * @param  array $schema
+	 * @return bool
+	 */
+	protected function filter_writable_props( $schema ) {
+		return empty( $schema['readonly'] );
+	}
+
+	/**
+	 * Prepare a single coupon for create or update.
+	 *
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_Error|stdClass $data Post object.
+	 */
+	protected function prepare_item_for_database( $request ) {
+		$id        = isset( $request['id'] ) ? absint( $request['id'] ) : 0;
+		$coupon    = new WC_Coupon( $id );
+		$schema    = $this->get_item_schema();
+		$data_keys = array_keys( array_filter( $schema['properties'], array( $this, 'filter_writable_props' ) ) );
+
+		// Update to schema to make compatible with CRUD schema.
+		if ( $request['exclude_product_ids'] ) {
+			$request['excluded_product_ids'] = $request['exclude_product_ids'];
+		}
+		if ( $request['expiry_date'] ) {
+			$request['date_expires'] = $request['expiry_date'];
+		}
+
+		// Validate required POST fields.
+		if ( 'POST' === $request->get_method() && 0 === $coupon->get_id() ) {
+			if ( empty( $request['code'] ) ) {
+				return new WP_Error( 'woocommerce_rest_empty_coupon_code', sprintf( __( 'The coupon code cannot be empty.', 'woocommerce' ), 'code' ), array( 'status' => 400 ) );
+			}
+		}
+
+		// Handle all writable props.
+		foreach ( $data_keys as $key ) {
+			$value = $request[ $key ];
+
+			if ( ! is_null( $value ) ) {
+				switch ( $key ) {
+					case 'code' :
+						$coupon_code = wc_format_coupon_code( $value );
+						$id          = $coupon->get_id() ? $coupon->get_id() : 0;
+						$id_from_code = wc_get_coupon_id_by_code( $coupon_code, $id );
+
+						if ( $id_from_code ) {
+							return new WP_Error( 'woocommerce_rest_coupon_code_already_exists', __( 'The coupon code already exists', 'woocommerce' ), array( 'status' => 400 ) );
+						}
+
+						$coupon->set_code( $coupon_code );
+						break;
+					case 'description' :
+						$coupon->set_description( wp_filter_post_kses( $value ) );
+						break;
+					case 'expiry_date' :
+						$coupon->set_date_expires( $value );
+						break;
+					default :
+						if ( is_callable( array( $coupon, "set_{$key}" ) ) ) {
+							$coupon->{"set_{$key}"}( $value );
+						}
+						break;
+				}
+			}
+		}
+
+		/**
+		 * Filter the query_vars used in `get_items` for the constructed query.
+		 *
+		 * The dynamic portion of the hook name, $this->post_type, refers to post_type of the post being
+		 * prepared for insertion.
+		 *
+		 * @param WC_Coupon       $coupon        The coupon object.
+		 * @param WP_REST_Request $request       Request object.
+		 */
+		return apply_filters( "woocommerce_rest_pre_insert_{$this->post_type}", $coupon, $request );
+	}
+
+	/**
+	 * Create a single item.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function create_item( $request ) {
+		if ( ! empty( $request['id'] ) ) {
+			/* translators: %s: post type */
+			return new WP_Error( "woocommerce_rest_{$this->post_type}_exists", sprintf( __( 'Cannot create existing %s.', 'woocommerce' ), $this->post_type ), array( 'status' => 400 ) );
+		}
+
+		$coupon_id = $this->save_coupon( $request );
+		if ( is_wp_error( $coupon_id ) ) {
+			return $coupon_id;
+		}
+
+		$post = get_post( $coupon_id );
+		$this->update_additional_fields_for_object( $post, $request );
+
+		$this->add_post_meta_fields( $post, $request );
+
+		/**
+		 * Fires after a single item is created or updated via the REST API.
+		 *
+		 * @param WP_Post         $post      Post object.
+		 * @param WP_REST_Request $request   Request object.
+		 * @param boolean         $creating  True when creating item, false when updating.
+		 */
+		do_action( "woocommerce_rest_insert_{$this->post_type}", $post, $request, true );
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_item_for_response( $post, $request );
+		$response = rest_ensure_response( $response );
+		$response->set_status( 201 );
+		$response->header( 'Location', rest_url( sprintf( '/%s/%s/%d', $this->namespace, $this->rest_base, $post->ID ) ) );
+
+		return $response;
+	}
+
+	/**
+	 * Update a single coupon.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function update_item( $request ) {
+		try {
+			$post_id = (int) $request['id'];
+
+			if ( empty( $post_id ) || get_post_type( $post_id ) !== $this->post_type ) {
+				return new WP_Error( "woocommerce_rest_{$this->post_type}_invalid_id", __( 'ID is invalid.', 'woocommerce' ), array( 'status' => 400 ) );
+			}
+
+			$coupon_id = $this->save_coupon( $request );
+			if ( is_wp_error( $coupon_id ) ) {
+				return $coupon_id;
+			}
+
+			$post = get_post( $coupon_id );
+			$this->update_additional_fields_for_object( $post, $request );
+
+			/**
+			 * Fires after a single item is created or updated via the REST API.
+			 *
+			 * @param WP_Post         $post      Post object.
+			 * @param WP_REST_Request $request   Request object.
+			 * @param boolean         $creating  True when creating item, false when updating.
+			 */
+			do_action( "woocommerce_rest_insert_{$this->post_type}", $post, $request, false );
+			$request->set_param( 'context', 'edit' );
+			$response = $this->prepare_item_for_response( $post, $request );
+			return rest_ensure_response( $response );
+
+		} catch ( Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
+		}
+	}
+
+	/**
+	 * Saves a coupon to the database.
+	 *
+	 * @since 3.0.0
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|int
+	 */
+	protected function save_coupon( $request ) {
+		try {
+			$coupon = $this->prepare_item_for_database( $request );
+
+			if ( is_wp_error( $coupon ) ) {
+				return $coupon;
+			}
+
+			$coupon->save();
+			return $coupon->get_id();
+		} catch ( WC_Data_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), $e->getErrorData() );
+		} catch ( WC_REST_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
+		}
+	}
+
+	/**
+	 * Get the Coupon's schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => $this->post_type,
+			'type'       => 'object',
+			'properties' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the object.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'code' => array(
+					'description' => __( 'Coupon code.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'date_created' => array(
+					'description' => __( "The date the coupon was created, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_modified' => array(
+					'description' => __( "The date the coupon was last modified, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'description' => array(
+					'description' => __( 'Coupon description.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'discount_type' => array(
+					'description' => __( 'Determines the type of discount that will be applied.', 'woocommerce' ),
+					'type'        => 'string',
+					'default'     => 'fixed_cart',
+					'enum'        => array_keys( wc_get_coupon_types() ),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'amount' => array(
+					'description' => __( 'The amount of discount. Should always be numeric, even if setting a percentage.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'expiry_date' => array(
+					'description' => __( 'UTC DateTime when the coupon expires.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'usage_count' => array(
+					'description' => __( 'Number of times the coupon has been used already.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'individual_use' => array(
+					'description' => __( 'If true, the coupon can only be used individually. Other applied coupons will be removed from the cart.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => false,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'product_ids' => array(
+					'description' => __( "List of product IDs the coupon can be used on.", 'woocommerce' ),
+					'type'        => 'array',
+					'items'       => array(
+						'type'    => 'integer',
+					),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'exclude_product_ids' => array(
+					'description' => __( "List of product IDs the coupon cannot be used on.", 'woocommerce' ),
+					'type'        => 'array',
+					'items'       => array(
+						'type'    => 'integer',
+					),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'usage_limit' => array(
+					'description' => __( 'How many times the coupon can be used in total.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'usage_limit_per_user' => array(
+					'description' => __( 'How many times the coupon can be used per customer.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'limit_usage_to_x_items' => array(
+					'description' => __( 'Max number of items in the cart the coupon can be applied to.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'free_shipping' => array(
+					'description' => __( 'If true and if the free shipping method requires a coupon, this coupon will enable free shipping.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => false,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'product_categories' => array(
+					'description' => __( "List of category IDs the coupon applies to.", 'woocommerce' ),
+					'type'        => 'array',
+					'items'       => array(
+						'type'    => 'integer',
+					),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'excluded_product_categories' => array(
+					'description' => __( "List of category IDs the coupon does not apply to.", 'woocommerce' ),
+					'type'        => 'array',
+					'items'       => array(
+						'type'    => 'integer',
+					),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'exclude_sale_items' => array(
+					'description' => __( 'If true, this coupon will not be applied to items that have sale prices.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => false,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'minimum_amount' => array(
+					'description' => __( 'Minimum order amount that needs to be in the cart before coupon applies.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'maximum_amount' => array(
+					'description' => __( 'Maximum order amount allowed when using the coupon.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'email_restrictions' => array(
+					'description' => __( 'List of email addresses that can use this coupon.', 'woocommerce' ),
+					'type'        => 'array',
+					'items'       => array(
+						'type'    => 'string',
+					),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'used_by' => array(
+					'description' => __( 'List of user IDs (or guest email addresses) that have used the coupon.', 'woocommerce' ),
+					'type'        => 'array',
+					'items'       => array(
+						'type'    => 'integer',
+					),
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+
+	/**
+	 * Get the query params for collections of attachments.
+	 *
+	 * @return array
+	 */
+	public function get_collection_params() {
+		$params = parent::get_collection_params();
+
+		$params['code'] = array(
+			'description'       => __( 'Limit result set to resources with a specific code.', 'woocommerce' ),
+			'type'              => 'string',
+			'sanitize_callback' => 'sanitize_text_field',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+
+		return $params;
+	}
+}
diff --git a/includes/api/v1/class-wc-rest-customer-downloads-controller.php b/includes/api/v1/class-wc-rest-customer-downloads-controller.php
new file mode 100644
index 00000000000..7557161adef
--- /dev/null
+++ b/includes/api/v1/class-wc-rest-customer-downloads-controller.php
@@ -0,0 +1,252 @@
+<?php
+/**
+ * REST API Customer Downloads controller
+ *
+ * Handles requests to the /customers/<customer_id>/downloads endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Customers controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Controller
+ */
+class WC_REST_Customer_Downloads_V1_Controller extends WC_REST_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v1';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'customers/(?P<customer_id>[\d]+)/downloads';
+
+	/**
+	 * Register the routes for customers.
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
+			'args' => array(
+				'customer_id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+				'args'                => $this->get_collection_params(),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+	}
+
+	/**
+	 * Check whether a given request has permission to read customers.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_items_permissions_check( $request ) {
+		$customer = get_user_by( 'id', (int) $request['customer_id'] );
+
+		if ( ! $customer ) {
+			return new WP_Error( 'woocommerce_rest_customer_invalid', __( 'Resource does not exist.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		if ( ! wc_rest_check_user_permissions( 'read', $customer->get_id() ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot list resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get all customer downloads.
+	 *
+	 * @param WP_REST_Request $request
+	 * @return array
+	 */
+	public function get_items( $request ) {
+		$downloads = wc_get_customer_available_downloads( (int) $request['customer_id'] );
+
+		$data = array();
+		foreach ( $downloads as $download_data ) {
+			$download = $this->prepare_item_for_response( (object) $download_data, $request );
+			$download = $this->prepare_response_for_collection( $download );
+			$data[]   = $download;
+		}
+
+		return rest_ensure_response( $data );
+	}
+
+	/**
+	 * Prepare a single download output for response.
+	 *
+	 * @param stdObject $download Download object.
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response $response Response data.
+	 */
+	public function prepare_item_for_response( $download, $request ) {
+		$data = (array) $download;
+		$data['access_expires']      = $data['access_expires'] ? wc_rest_prepare_date_response( $data['access_expires'] ) : 'never';
+		$data['downloads_remaining'] = '' === $data['downloads_remaining'] ? 'unlimited' : $data['downloads_remaining'];
+
+		// Remove "product_name" since it's new in 3.0.
+		unset( $data['product_name'] );
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		// Wrap the data in a response object.
+		$response = rest_ensure_response( $data );
+
+		$response->add_links( $this->prepare_links( $download, $request ) );
+
+		/**
+		 * Filter customer download data returned from the REST API.
+		 *
+		 * @param WP_REST_Response $response  The response object.
+		 * @param stdObject        $download  Download object used to create response.
+		 * @param WP_REST_Request  $request   Request object.
+		 */
+		return apply_filters( 'woocommerce_rest_prepare_customer_download', $response, $download, $request );
+	}
+
+	/**
+	 * Prepare links for the request.
+	 *
+	 * @param stdClass $download Download object.
+	 * @param WP_REST_Request $request Request object.
+	 * @return array Links for the given customer download.
+	 */
+	protected function prepare_links( $download, $request ) {
+		$base  = str_replace( '(?P<customer_id>[\d]+)', $request['customer_id'], $this->rest_base );
+		$links = array(
+			'collection' => array(
+				'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $base ) ),
+			),
+			'product' => array(
+				'href' => rest_url( sprintf( '/%s/products/%d', $this->namespace, $download->product_id ) ),
+			),
+			'order' => array(
+				'href' => rest_url( sprintf( '/%s/orders/%d', $this->namespace, $download->order_id ) ),
+			),
+		);
+
+		return $links;
+	}
+
+	/**
+	 * Get the Customer Download's schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'customer_download',
+			'type'       => 'object',
+			'properties' => array(
+				'download_url' => array(
+					'description' => __( 'Download file URL.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'download_id' => array(
+					'description' => __( 'Download ID (MD5).', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'product_id' => array(
+					'description' => __( 'Downloadable product ID.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'download_name' => array(
+					'description' => __( 'Downloadable file name.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'order_id' => array(
+					'description' => __( 'Order ID.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'order_key' => array(
+					'description' => __( 'Order key.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'downloads_remaining' => array(
+					'description' => __( 'Number of downloads remaining.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'access_expires' => array(
+					'description' => __( "The date when download access expires, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'file' => array(
+					'description' => __( 'File details.', 'woocommerce' ),
+					'type'        => 'object',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+					'properties' => array(
+						'name' => array(
+							'description' => __( 'File name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+						'file' => array(
+							'description' => __( 'File URL.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view' ),
+							'readonly'    => true,
+						),
+					),
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+
+	/**
+	 * Get the query params for collections.
+	 *
+	 * @return array
+	 */
+	public function get_collection_params() {
+		return array(
+			'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+		);
+	}
+}
diff --git a/includes/api/v1/class-wc-rest-customers-controller.php b/includes/api/v1/class-wc-rest-customers-controller.php
new file mode 100644
index 00000000000..24986dc15cb
--- /dev/null
+++ b/includes/api/v1/class-wc-rest-customers-controller.php
@@ -0,0 +1,922 @@
+<?php
+/**
+ * REST API Customers controller
+ *
+ * Handles requests to the /customers endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Customers controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Controller
+ */
+class WC_REST_Customers_V1_Controller extends WC_REST_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v1';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'customers';
+
+	/**
+	 * Register the routes for customers.
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+				'args'                => $this->get_collection_params(),
+			),
+			array(
+				'methods'             => WP_REST_Server::CREATABLE,
+				'callback'            => array( $this, 'create_item' ),
+				'permission_callback' => array( $this, 'create_item_permissions_check' ),
+				'args'                => array_merge( $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ), array(
+					'email' => array(
+						'required' => true,
+						'type'     => 'string',
+						'description' => __( 'New user email address.', 'woocommerce' ),
+					),
+					'username' => array(
+						'required' => 'no' === get_option( 'woocommerce_registration_generate_username', 'yes' ),
+						'description' => __( 'New user username.', 'woocommerce' ),
+						'type'     => 'string',
+					),
+					'password' => array(
+						'required' => 'no' === get_option( 'woocommerce_registration_generate_password', 'no' ),
+						'description' => __( 'New user password.', 'woocommerce' ),
+						'type'     => 'string',
+					),
+				) ),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
+			'args' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_item' ),
+				'permission_callback' => array( $this, 'get_item_permissions_check' ),
+				'args'                => array(
+					'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'update_item' ),
+				'permission_callback' => array( $this, 'update_item_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			array(
+				'methods'             => WP_REST_Server::DELETABLE,
+				'callback'            => array( $this, 'delete_item' ),
+				'permission_callback' => array( $this, 'delete_item_permissions_check' ),
+				'args'                => array(
+					'force' => array(
+						'default'     => false,
+						'type'        => 'boolean',
+						'description' => __( 'Required to be true, as resource does not support trashing.', 'woocommerce' ),
+					),
+					'reassign' => array(
+						'default'     => 0,
+						'type'        => 'integer',
+						'description' => __( 'ID to reassign posts to.', 'woocommerce' ),
+					),
+				),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/batch', array(
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'batch_items' ),
+				'permission_callback' => array( $this, 'batch_items_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			'schema' => array( $this, 'get_public_batch_schema' ),
+		) );
+	}
+
+	/**
+	 * Check whether a given request has permission to read customers.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_items_permissions_check( $request ) {
+		if ( ! wc_rest_check_user_permissions( 'read' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot list resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access create customers.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return boolean
+	 */
+	public function create_item_permissions_check( $request ) {
+		if ( ! wc_rest_check_user_permissions( 'create' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_create', __( 'Sorry, you are not allowed to create resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access to read a customer.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_item_permissions_check( $request ) {
+		$id = (int) $request['id'];
+
+		if ( ! wc_rest_check_user_permissions( 'read', $id ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot view this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access update a customer.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return boolean
+	 */
+	public function update_item_permissions_check( $request ) {
+		$id = (int) $request['id'];
+
+		if ( ! wc_rest_check_user_permissions( 'edit', $id ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_edit', __( 'Sorry, you are not allowed to edit this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access delete a customer.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return boolean
+	 */
+	public function delete_item_permissions_check( $request ) {
+		$id = (int) $request['id'];
+
+		if ( ! wc_rest_check_user_permissions( 'delete', $id ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_delete', __( 'Sorry, you are not allowed to delete this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access batch create, update and delete items.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return boolean
+	 */
+	public function batch_items_permissions_check( $request ) {
+		if ( ! wc_rest_check_user_permissions( 'batch' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_batch', __( 'Sorry, you are not allowed to batch manipulate this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get all customers.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function get_items( $request ) {
+		$prepared_args = array();
+		$prepared_args['exclude'] = $request['exclude'];
+		$prepared_args['include'] = $request['include'];
+		$prepared_args['order']   = $request['order'];
+		$prepared_args['number']  = $request['per_page'];
+		if ( ! empty( $request['offset'] ) ) {
+			$prepared_args['offset'] = $request['offset'];
+		} else {
+			$prepared_args['offset'] = ( $request['page'] - 1 ) * $prepared_args['number'];
+		}
+		$orderby_possibles = array(
+			'id'              => 'ID',
+			'include'         => 'include',
+			'name'            => 'display_name',
+			'registered_date' => 'registered',
+		);
+		$prepared_args['orderby'] = $orderby_possibles[ $request['orderby'] ];
+		$prepared_args['search']  = $request['search'];
+
+		if ( '' !== $prepared_args['search'] ) {
+			$prepared_args['search'] = '*' . $prepared_args['search'] . '*';
+		}
+
+		// Filter by email.
+		if ( ! empty( $request['email'] ) ) {
+			$prepared_args['search']         = $request['email'];
+			$prepared_args['search_columns'] = array( 'user_email' );
+		}
+
+		// Filter by role.
+		if ( 'all' !== $request['role'] ) {
+			$prepared_args['role'] = $request['role'];
+		}
+
+		/**
+		 * Filter arguments, before passing to WP_User_Query, when querying users via the REST API.
+		 *
+		 * @see https://developer.wordpress.org/reference/classes/wp_user_query/
+		 *
+		 * @param array           $prepared_args Array of arguments for WP_User_Query.
+		 * @param WP_REST_Request $request       The current request.
+		 */
+		$prepared_args = apply_filters( 'woocommerce_rest_customer_query', $prepared_args, $request );
+
+		$query = new WP_User_Query( $prepared_args );
+
+		$users = array();
+		foreach ( $query->results as $user ) {
+			$data = $this->prepare_item_for_response( $user, $request );
+			$users[] = $this->prepare_response_for_collection( $data );
+		}
+
+		$response = rest_ensure_response( $users );
+
+		// Store pagation values for headers then unset for count query.
+		$per_page = (int) $prepared_args['number'];
+		$page = ceil( ( ( (int) $prepared_args['offset'] ) / $per_page ) + 1 );
+
+		$prepared_args['fields'] = 'ID';
+
+		$total_users = $query->get_total();
+		if ( $total_users < 1 ) {
+			// Out-of-bounds, run the query again without LIMIT for total count.
+			unset( $prepared_args['number'] );
+			unset( $prepared_args['offset'] );
+			$count_query = new WP_User_Query( $prepared_args );
+			$total_users = $count_query->get_total();
+		}
+		$response->header( 'X-WP-Total', (int) $total_users );
+		$max_pages = ceil( $total_users / $per_page );
+		$response->header( 'X-WP-TotalPages', (int) $max_pages );
+
+		$base = add_query_arg( $request->get_query_params(), rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ) );
+		if ( $page > 1 ) {
+			$prev_page = $page - 1;
+			if ( $prev_page > $max_pages ) {
+				$prev_page = $max_pages;
+			}
+			$prev_link = add_query_arg( 'page', $prev_page, $base );
+			$response->link_header( 'prev', $prev_link );
+		}
+		if ( $max_pages > $page ) {
+			$next_page = $page + 1;
+			$next_link = add_query_arg( 'page', $next_page, $base );
+			$response->link_header( 'next', $next_link );
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Create a single customer.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function create_item( $request ) {
+		try {
+			if ( ! empty( $request['id'] ) ) {
+				throw new WC_REST_Exception( 'woocommerce_rest_customer_exists', __( 'Cannot create existing resource.', 'woocommerce' ), 400 );
+			}
+
+			// Sets the username.
+			$request['username'] = ! empty( $request['username'] ) ? $request['username'] : '';
+
+			// Sets the password.
+			$request['password'] = ! empty( $request['password'] ) ? $request['password'] : '';
+
+			// Create customer.
+			$customer = new WC_Customer;
+			$customer->set_username( $request['username'] );
+			$customer->set_password( $request['password'] );
+			$customer->set_email( $request['email'] );
+			$customer->save();
+
+			if ( ! $customer->get_id() ) {
+				throw new WC_REST_Exception( 'woocommerce_rest_cannot_create', __( 'This resource cannot be created.', 'woocommerce' ), 400 );
+			}
+
+			$this->update_customer_meta_fields( $customer, $request );
+			$customer->save();
+
+			$user_data = get_userdata( $customer->get_id() );
+			$this->update_additional_fields_for_object( $user_data, $request );
+
+			/**
+			 * Fires after a customer is created or updated via the REST API.
+			 *
+			 * @param WP_User         $user_data Data used to create the customer.
+			 * @param WP_REST_Request $request   Request object.
+			 * @param boolean         $creating  True when creating customer, false when updating customer.
+			 */
+			do_action( 'woocommerce_rest_insert_customer', $user_data, $request, true );
+
+			$request->set_param( 'context', 'edit' );
+			$response = $this->prepare_item_for_response( $user_data, $request );
+			$response = rest_ensure_response( $response );
+			$response->set_status( 201 );
+			$response->header( 'Location', rest_url( sprintf( '/%s/%s/%d', $this->namespace, $this->rest_base, $customer->get_id() ) ) );
+
+			return $response;
+		} catch ( Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
+		}
+	}
+
+	/**
+	 * Get a single customer.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function get_item( $request ) {
+		$id        = (int) $request['id'];
+		$user_data = get_userdata( $id );
+
+		if ( empty( $id ) || empty( $user_data->ID ) ) {
+			return new WP_Error( 'woocommerce_rest_invalid_id', __( 'Invalid resource ID.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$customer = $this->prepare_item_for_response( $user_data, $request );
+		$response = rest_ensure_response( $customer );
+
+		return $response;
+	}
+
+	/**
+	 * Update a single user.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function update_item( $request ) {
+		try {
+			$id       = (int) $request['id'];
+			$customer = new WC_Customer( $id );
+
+			if ( ! $customer->get_id() ) {
+				throw new WC_REST_Exception( 'woocommerce_rest_invalid_id', __( 'Invalid resource ID.', 'woocommerce' ), 400 );
+			}
+
+			if ( ! empty( $request['email'] ) && email_exists( $request['email'] ) && $request['email'] !== $customer->get_email() ) {
+				throw new WC_REST_Exception( 'woocommerce_rest_customer_invalid_email', __( 'Email address is invalid.', 'woocommerce' ), 400 );
+			}
+
+			if ( ! empty( $request['username'] ) && $request['username'] !== $customer->get_username() ) {
+				throw new WC_REST_Exception( 'woocommerce_rest_customer_invalid_argument', __( "Username isn't editable.", 'woocommerce' ), 400 );
+			}
+
+			// Customer email.
+			if ( isset( $request['email'] ) ) {
+				$customer->set_email( sanitize_email( $request['email'] ) );
+			}
+
+			// Customer password.
+			if ( isset( $request['password'] ) ) {
+				$customer->set_password( wc_clean( $request['password'] ) );
+			}
+
+			$this->update_customer_meta_fields( $customer, $request );
+			$customer->save();
+
+			$user_data = get_userdata( $customer->get_id() );
+			$this->update_additional_fields_for_object( $user_data, $request );
+
+			if ( ! is_user_member_of_blog( $user_data->ID ) ) {
+				$user_data->add_role( 'customer' );
+			}
+
+			/**
+			 * Fires after a customer is created or updated via the REST API.
+			 *
+			 * @param WP_User         $customer  Data used to create the customer.
+			 * @param WP_REST_Request $request   Request object.
+			 * @param boolean         $creating  True when creating customer, false when updating customer.
+			 */
+			do_action( 'woocommerce_rest_insert_customer', $user_data, $request, false );
+
+			$request->set_param( 'context', 'edit' );
+			$response = $this->prepare_item_for_response( $user_data, $request );
+			$response = rest_ensure_response( $response );
+			return $response;
+		} catch ( Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
+		}
+	}
+
+	/**
+	 * Delete a single customer.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function delete_item( $request ) {
+		$id       = (int) $request['id'];
+		$reassign = isset( $request['reassign'] ) ? absint( $request['reassign'] ) : null;
+		$force    = isset( $request['force'] ) ? (bool) $request['force'] : false;
+
+		// We don't support trashing for this type, error out.
+		if ( ! $force ) {
+			return new WP_Error( 'woocommerce_rest_trash_not_supported', __( 'Customers do not support trashing.', 'woocommerce' ), array( 'status' => 501 ) );
+		}
+
+		$user_data = get_userdata( $id );
+		if ( ! $user_data ) {
+			return new WP_Error( 'woocommerce_rest_invalid_id', __( 'Invalid resource id.', 'woocommerce' ), array( 'status' => 400 ) );
+		}
+
+		if ( ! empty( $reassign ) ) {
+			if ( $reassign === $id || ! get_userdata( $reassign ) ) {
+				return new WP_Error( 'woocommerce_rest_customer_invalid_reassign', __( 'Invalid resource id for reassignment.', 'woocommerce' ), array( 'status' => 400 ) );
+			}
+		}
+
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_item_for_response( $user_data, $request );
+
+		/** Include admin customer functions to get access to wp_delete_user() */
+		require_once ABSPATH . 'wp-admin/includes/user.php';
+
+		$customer = new WC_Customer( $id );
+
+		if ( ! is_null( $reassign ) ) {
+			$result = $customer->delete_and_reassign( $reassign );
+		} else {
+			$result = $customer->delete();
+		}
+
+		if ( ! $result ) {
+			return new WP_Error( 'woocommerce_rest_cannot_delete', __( 'The resource cannot be deleted.', 'woocommerce' ), array( 'status' => 500 ) );
+		}
+
+		/**
+		 * Fires after a customer is deleted via the REST API.
+		 *
+		 * @param WP_User          $user_data User data.
+		 * @param WP_REST_Response $response  The response returned from the API.
+		 * @param WP_REST_Request  $request   The request sent to the API.
+		 */
+		do_action( 'woocommerce_rest_delete_customer', $user_data, $response, $request );
+
+		return $response;
+	}
+
+	/**
+	 * Prepare a single customer output for response.
+	 *
+	 * @param  WP_User          $user_data User object.
+	 * @param  WP_REST_Request  $request Request object.
+	 * @return WP_REST_Response $response Response data.
+	 */
+	public function prepare_item_for_response( $user_data, $request ) {
+		$customer    = new WC_Customer( $user_data->ID );
+		$_data       = $customer->get_data();
+		$last_order  = wc_get_customer_last_order( $customer->get_id() );
+		$format_date = array( 'date_created', 'date_modified' );
+
+		// Format date values.
+		foreach ( $format_date as $key ) {
+			$_data[ $key ] = $_data[ $key ] ? wc_rest_prepare_date_response( $_data[ $key ] ) : null; // v1 API used UTC.
+		}
+
+		$data = array(
+			'id'            => $_data['id'],
+			'date_created'  => $_data['date_created'],
+			'date_modified' => $_data['date_modified'],
+			'email'         => $_data['email'],
+			'first_name'    => $_data['first_name'],
+			'last_name'     => $_data['last_name'],
+			'username'      => $_data['username'],
+			'last_order'    => array(
+				'id'   => is_object( $last_order ) ? $last_order->get_id() : null,
+				'date' => is_object( $last_order ) ? wc_rest_prepare_date_response( $last_order->get_date_created() ) : null, // v1 API used UTC.
+			),
+			'orders_count'  => $customer->get_order_count(),
+			'total_spent'   => $customer->get_total_spent(),
+			'avatar_url'    => $customer->get_avatar_url(),
+			'billing'       => $_data['billing'],
+			'shipping'      => $_data['shipping'],
+		);
+
+		$context  = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data     = $this->add_additional_fields_to_object( $data, $request );
+		$data     = $this->filter_response_by_context( $data, $context );
+		$response = rest_ensure_response( $data );
+		$response->add_links( $this->prepare_links( $user_data ) );
+
+		/**
+		 * Filter customer data returned from the REST API.
+		 *
+		 * @param WP_REST_Response $response   The response object.
+		 * @param WP_User          $user_data  User object used to create response.
+		 * @param WP_REST_Request  $request    Request object.
+		 */
+		return apply_filters( 'woocommerce_rest_prepare_customer', $response, $user_data, $request );
+	}
+
+	/**
+	 * Update customer meta fields.
+	 *
+	 * @param WC_Customer $customer
+	 * @param WP_REST_Request $request
+	 */
+	protected function update_customer_meta_fields( $customer, $request ) {
+		$schema = $this->get_item_schema();
+
+		// Customer first name.
+		if ( isset( $request['first_name'] ) ) {
+			$customer->set_first_name( wc_clean( $request['first_name'] ) );
+		}
+
+		// Customer last name.
+		if ( isset( $request['last_name'] ) ) {
+			$customer->set_last_name( wc_clean( $request['last_name'] ) );
+		}
+
+		// Customer billing address.
+		if ( isset( $request['billing'] ) ) {
+			foreach ( array_keys( $schema['properties']['billing']['properties'] ) as $field ) {
+				if ( isset( $request['billing'][ $field ] ) && is_callable( array( $customer, "set_billing_{$field}" ) ) ) {
+					$customer->{"set_billing_{$field}"}( $request['billing'][ $field ] );
+				}
+			}
+		}
+
+		// Customer shipping address.
+		if ( isset( $request['shipping'] ) ) {
+			foreach ( array_keys( $schema['properties']['shipping']['properties'] ) as $field ) {
+				if ( isset( $request['shipping'][ $field ] ) && is_callable( array( $customer, "set_shipping_{$field}" ) ) ) {
+					$customer->{"set_shipping_{$field}"}( $request['shipping'][ $field ] );
+				}
+			}
+		}
+	}
+
+	/**
+	 * Prepare links for the request.
+	 *
+	 * @param WP_User $customer Customer object.
+	 * @return array Links for the given customer.
+	 */
+	protected function prepare_links( $customer ) {
+		$links = array(
+			'self' => array(
+				'href' => rest_url( sprintf( '/%s/%s/%d', $this->namespace, $this->rest_base, $customer->ID ) ),
+			),
+			'collection' => array(
+				'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ),
+			),
+		);
+
+		return $links;
+	}
+
+	/**
+	 * Get the Customer's schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'customer',
+			'type'       => 'object',
+			'properties' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_created' => array(
+					'description' => __( 'The date the customer was created, as GMT.', 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_modified' => array(
+					'description' => __( 'The date the customer was last modified, as GMT.', 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'email' => array(
+					'description' => __( 'The email address for the customer.', 'woocommerce' ),
+					'type'        => 'string',
+					'format'      => 'email',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'first_name' => array(
+					'description' => __( 'Customer first name.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'arg_options' => array(
+						'sanitize_callback' => 'sanitize_text_field',
+					),
+				),
+				'last_name' => array(
+					'description' => __( 'Customer last name.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'arg_options' => array(
+						'sanitize_callback' => 'sanitize_text_field',
+					),
+				),
+				'username' => array(
+					'description' => __( 'Customer login name.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'arg_options' => array(
+						'sanitize_callback' => 'sanitize_user',
+					),
+				),
+				'password' => array(
+					'description' => __( 'Customer password.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'edit' ),
+				),
+				'last_order' => array(
+					'description' => __( 'Last order data.', 'woocommerce' ),
+					'type'        => 'object',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+					'properties'  => array(
+						'id' => array(
+							'description' => __( 'Last order ID.', 'woocommerce' ),
+							'type'        => 'integer',
+							'context'     => array( 'view', 'edit' ),
+							'readonly'    => true,
+						),
+						'date' => array(
+							'description' => __( 'The date of the customer last order, as GMT.', 'woocommerce' ),
+							'type'        => 'date-time',
+							'context'     => array( 'view', 'edit' ),
+							'readonly'    => true,
+						),
+					),
+				),
+				'orders_count' => array(
+					'description' => __( 'Quantity of orders made by the customer.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'total_spent' => array(
+					'description' => __( 'Total amount spent.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'avatar_url' => array(
+					'description' => __( 'Avatar URL.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'billing' => array(
+					'description' => __( 'List of billing address data.', 'woocommerce' ),
+					'type'        => 'object',
+					'context'     => array( 'view', 'edit' ),
+					'properties' => array(
+						'first_name' => array(
+							'description' => __( 'First name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'last_name' => array(
+							'description' => __( 'Last name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'company' => array(
+							'description' => __( 'Company name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'address_1' => array(
+							'description' => __( 'Address line 1.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'address_2' => array(
+							'description' => __( 'Address line 2.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'city' => array(
+							'description' => __( 'City name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'state' => array(
+							'description' => __( 'ISO code or name of the state, province or district.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'postcode' => array(
+							'description' => __( 'Postal code.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'country' => array(
+							'description' => __( 'ISO code of the country.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'email' => array(
+							'description' => __( 'Email address.', 'woocommerce' ),
+							'type'        => 'string',
+							'format'      => 'email',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'phone' => array(
+							'description' => __( 'Phone number.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+					),
+				),
+				'shipping' => array(
+					'description' => __( 'List of shipping address data.', 'woocommerce' ),
+					'type'        => 'object',
+					'context'     => array( 'view', 'edit' ),
+					'properties' => array(
+						'first_name' => array(
+							'description' => __( 'First name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'last_name' => array(
+							'description' => __( 'Last name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'company' => array(
+							'description' => __( 'Company name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'address_1' => array(
+							'description' => __( 'Address line 1.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'address_2' => array(
+							'description' => __( 'Address line 2.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'city' => array(
+							'description' => __( 'City name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'state' => array(
+							'description' => __( 'ISO code or name of the state, province or district.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'postcode' => array(
+							'description' => __( 'Postal code.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'country' => array(
+							'description' => __( 'ISO code of the country.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+					),
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+
+	/**
+	 * Get role names.
+	 *
+	 * @return array
+	 */
+	protected function get_role_names() {
+		global $wp_roles;
+
+		return array_keys( $wp_roles->role_names );
+	}
+
+	/**
+	 * Get the query params for collections.
+	 *
+	 * @return array
+	 */
+	public function get_collection_params() {
+		$params = parent::get_collection_params();
+
+		$params['context']['default'] = 'view';
+
+		$params['exclude'] = array(
+			'description'       => __( 'Ensure result set excludes specific IDs.', 'woocommerce' ),
+			'type'              => 'array',
+			'items'             => array(
+				'type'          => 'integer',
+			),
+			'default'           => array(),
+			'sanitize_callback' => 'wp_parse_id_list',
+		);
+		$params['include'] = array(
+			'description'       => __( 'Limit result set to specific IDs.', 'woocommerce' ),
+			'type'              => 'array',
+			'items'             => array(
+				'type'          => 'integer',
+			),
+			'default'           => array(),
+			'sanitize_callback' => 'wp_parse_id_list',
+		);
+		$params['offset'] = array(
+			'description'        => __( 'Offset the result set by a specific number of items.', 'woocommerce' ),
+			'type'               => 'integer',
+			'sanitize_callback'  => 'absint',
+			'validate_callback'  => 'rest_validate_request_arg',
+		);
+		$params['order'] = array(
+			'default'            => 'asc',
+			'description'        => __( 'Order sort attribute ascending or descending.', 'woocommerce' ),
+			'enum'               => array( 'asc', 'desc' ),
+			'sanitize_callback'  => 'sanitize_key',
+			'type'               => 'string',
+			'validate_callback'  => 'rest_validate_request_arg',
+		);
+		$params['orderby'] = array(
+			'default'            => 'name',
+			'description'        => __( 'Sort collection by object attribute.', 'woocommerce' ),
+			'enum'               => array(
+				'id',
+				'include',
+				'name',
+				'registered_date',
+			),
+			'sanitize_callback'  => 'sanitize_key',
+			'type'               => 'string',
+			'validate_callback'  => 'rest_validate_request_arg',
+		);
+		$params['email'] = array(
+			'description'        => __( 'Limit result set to resources with a specific email.', 'woocommerce' ),
+			'type'               => 'string',
+			'format'             => 'email',
+			'validate_callback'  => 'rest_validate_request_arg',
+		);
+		$params['role'] = array(
+			'description'        => __( 'Limit result set to resources with a specific role.', 'woocommerce' ),
+			'type'               => 'string',
+			'default'            => 'customer',
+			'enum'               => array_merge( array( 'all' ), $this->get_role_names() ),
+			'validate_callback'  => 'rest_validate_request_arg',
+		);
+		return $params;
+	}
+}
diff --git a/includes/api/v1/class-wc-rest-order-notes-controller.php b/includes/api/v1/class-wc-rest-order-notes-controller.php
new file mode 100644
index 00000000000..23f52394350
--- /dev/null
+++ b/includes/api/v1/class-wc-rest-order-notes-controller.php
@@ -0,0 +1,436 @@
+<?php
+/**
+ * REST API Order Notes controller
+ *
+ * Handles requests to the /orders/<order_id>/notes endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Order Notes controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Controller
+ */
+class WC_REST_Order_Notes_V1_Controller extends WC_REST_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v1';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'orders/(?P<order_id>[\d]+)/notes';
+
+	/**
+	 * Post type.
+	 *
+	 * @var string
+	 */
+	protected $post_type = 'shop_order';
+
+	/**
+	 * Register the routes for order notes.
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
+			'args' => array(
+				'order_id'  => array(
+					'description' => __( 'The order ID.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+				'args'                => $this->get_collection_params(),
+			),
+			array(
+				'methods'             => WP_REST_Server::CREATABLE,
+				'callback'            => array( $this, 'create_item' ),
+				'permission_callback' => array( $this, 'create_item_permissions_check' ),
+				'args'                => array_merge( $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ), array(
+					'note' => array(
+						'type'        => 'string',
+						'description' => __( 'Order note content.', 'woocommerce' ),
+						'required'    => true,
+					),
+				) ),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
+			'args' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+				'order_id'  => array(
+					'description' => __( 'The order ID.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_item' ),
+				'permission_callback' => array( $this, 'get_item_permissions_check' ),
+				'args'                => array(
+					'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::DELETABLE,
+				'callback'            => array( $this, 'delete_item' ),
+				'permission_callback' => array( $this, 'delete_item_permissions_check' ),
+				'args'                => array(
+					'force' => array(
+						'default'     => false,
+						'type'        => 'boolean',
+						'description' => __( 'Required to be true, as resource does not support trashing.', 'woocommerce' ),
+					),
+				),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+	}
+
+	/**
+	 * Check whether a given request has permission to read order notes.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_items_permissions_check( $request ) {
+		if ( ! wc_rest_check_post_permissions( $this->post_type, 'read' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot list resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access create order notes.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return boolean
+	 */
+	public function create_item_permissions_check( $request ) {
+		if ( ! wc_rest_check_post_permissions( $this->post_type, 'create' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_create', __( 'Sorry, you are not allowed to create resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access to read a order note.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_item_permissions_check( $request ) {
+		$order = wc_get_order( (int) $request['order_id'] );
+
+		if ( $order && ! wc_rest_check_post_permissions( $this->post_type, 'read', $order->get_id() ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot view this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access delete a order note.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return boolean
+	 */
+	public function delete_item_permissions_check( $request ) {
+		$order = wc_get_order( (int) $request['order_id'] );
+
+		if ( $order && ! wc_rest_check_post_permissions( $this->post_type, 'delete', $order->get_id() ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_delete', __( 'Sorry, you are not allowed to delete this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get order notes from an order.
+	 *
+	 * @param WP_REST_Request $request
+	 * @return array
+	 */
+	public function get_items( $request ) {
+		$order = wc_get_order( (int) $request['order_id'] );
+
+		if ( ! $order || $this->post_type !== $order->get_type() ) {
+			return new WP_Error( "woocommerce_rest_{$this->post_type}_invalid_id", __( 'Invalid order ID.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$args = array(
+			'post_id' => $order->get_id(),
+			'approve' => 'approve',
+			'type'    => 'order_note',
+		);
+
+		remove_filter( 'comments_clauses', array( 'WC_Comments', 'exclude_order_comments' ), 10, 1 );
+
+		$notes = get_comments( $args );
+
+		add_filter( 'comments_clauses', array( 'WC_Comments', 'exclude_order_comments' ), 10, 1 );
+
+		$data = array();
+		foreach ( $notes as $note ) {
+			$order_note = $this->prepare_item_for_response( $note, $request );
+			$order_note = $this->prepare_response_for_collection( $order_note );
+			$data[]     = $order_note;
+		}
+
+		return rest_ensure_response( $data );
+	}
+
+	/**
+	 * Create a single order note.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function create_item( $request ) {
+		if ( ! empty( $request['id'] ) ) {
+			/* translators: %s: post type */
+			return new WP_Error( "woocommerce_rest_{$this->post_type}_exists", sprintf( __( 'Cannot create existing %s.', 'woocommerce' ), $this->post_type ), array( 'status' => 400 ) );
+		}
+
+		$order = wc_get_order( (int) $request['order_id'] );
+
+		if ( ! $order || $this->post_type !== $order->get_type() ) {
+			return new WP_Error( 'woocommerce_rest_order_invalid_id', __( 'Invalid order ID.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		// Create the note.
+		$note_id = $order->add_order_note( $request['note'], $request['customer_note'] );
+
+		if ( ! $note_id ) {
+			return new WP_Error( 'woocommerce_api_cannot_create_order_note', __( 'Cannot create order note, please try again.', 'woocommerce' ), array( 'status' => 500 ) );
+		}
+
+		$note = get_comment( $note_id );
+		$this->update_additional_fields_for_object( $note, $request );
+
+		/**
+		 * Fires after a order note is created or updated via the REST API.
+		 *
+		 * @param WP_Comment      $note      New order note object.
+		 * @param WP_REST_Request $request   Request object.
+		 * @param boolean         $creating  True when creating item, false when updating.
+		 */
+		do_action( 'woocommerce_rest_insert_order_note', $note, $request, true );
+
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_item_for_response( $note, $request );
+		$response = rest_ensure_response( $response );
+		$response->set_status( 201 );
+		$response->header( 'Location', rest_url( sprintf( '/%s/%s/%d', $this->namespace, str_replace( '(?P<order_id>[\d]+)', $order->get_id(), $this->rest_base ), $note_id ) ) );
+
+		return $response;
+	}
+
+	/**
+	 * Get a single order note.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function get_item( $request ) {
+		$id    = (int) $request['id'];
+		$order = wc_get_order( (int) $request['order_id'] );
+
+		if ( ! $order || $this->post_type !== $order->get_type() ) {
+			return new WP_Error( 'woocommerce_rest_order_invalid_id', __( 'Invalid order ID.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$note = get_comment( $id );
+
+		if ( empty( $id ) || empty( $note ) || intval( $note->comment_post_ID ) !== intval( $order->get_id() ) ) {
+			return new WP_Error( 'woocommerce_rest_invalid_id', __( 'Invalid resource ID.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$order_note = $this->prepare_item_for_response( $note, $request );
+		$response   = rest_ensure_response( $order_note );
+
+		return $response;
+	}
+
+	/**
+	 * Delete a single order note.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Response|WP_Error
+	 */
+	public function delete_item( $request ) {
+		$id    = (int) $request['id'];
+		$force = isset( $request['force'] ) ? (bool) $request['force'] : false;
+
+		// We don't support trashing for this type, error out.
+		if ( ! $force ) {
+			return new WP_Error( 'woocommerce_rest_trash_not_supported', __( 'Webhooks do not support trashing.', 'woocommerce' ), array( 'status' => 501 ) );
+		}
+
+		$order = wc_get_order( (int) $request['order_id'] );
+
+		if ( ! $order || $this->post_type !== $order->get_type() ) {
+			return new WP_Error( 'woocommerce_rest_order_invalid_id', __( 'Invalid order ID.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$note = get_comment( $id );
+
+		if ( empty( $id ) || empty( $note ) || intval( $note->comment_post_ID ) !== intval( $order->get_id() ) ) {
+			return new WP_Error( 'woocommerce_rest_invalid_id', __( 'Invalid resource ID.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_item_for_response( $note, $request );
+
+		$result = wp_delete_comment( $note->comment_ID, true );
+
+		if ( ! $result ) {
+			return new WP_Error( 'woocommerce_rest_cannot_delete', sprintf( __( 'The %s cannot be deleted.', 'woocommerce' ), 'order_note' ), array( 'status' => 500 ) );
+		}
+
+		/**
+		 * Fires after a order note is deleted or trashed via the REST API.
+		 *
+		 * @param WP_Comment       $note     The deleted or trashed order note.
+		 * @param WP_REST_Response $response The response data.
+		 * @param WP_REST_Request  $request  The request sent to the API.
+		 */
+		do_action( 'woocommerce_rest_delete_order_note', $note, $response, $request );
+
+		return $response;
+	}
+
+	/**
+	 * Prepare a single order note output for response.
+	 *
+	 * @param WP_Comment $note Order note object.
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response $response Response data.
+	 */
+	public function prepare_item_for_response( $note, $request ) {
+		$data = array(
+			'id'            => (int) $note->comment_ID,
+			'date_created'  => wc_rest_prepare_date_response( $note->comment_date_gmt ),
+			'note'          => $note->comment_content,
+			'customer_note' => (bool) get_comment_meta( $note->comment_ID, 'is_customer_note', true ),
+		);
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		// Wrap the data in a response object.
+		$response = rest_ensure_response( $data );
+
+		$response->add_links( $this->prepare_links( $note ) );
+
+		/**
+		 * Filter order note object returned from the REST API.
+		 *
+		 * @param WP_REST_Response $response The response object.
+		 * @param WP_Comment       $note     Order note object used to create response.
+		 * @param WP_REST_Request  $request  Request object.
+		 */
+		return apply_filters( 'woocommerce_rest_prepare_order_note', $response, $note, $request );
+	}
+
+	/**
+	 * Prepare links for the request.
+	 *
+	 * @param WP_Comment $note Delivery order_note object.
+	 * @return array Links for the given order note.
+	 */
+	protected function prepare_links( $note ) {
+		$order_id = (int) $note->comment_post_ID;
+		$base     = str_replace( '(?P<order_id>[\d]+)', $order_id, $this->rest_base );
+		$links    = array(
+			'self' => array(
+				'href' => rest_url( sprintf( '/%s/%s/%d', $this->namespace, $base, $note->comment_ID ) ),
+			),
+			'collection' => array(
+				'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $base ) ),
+			),
+			'up' => array(
+				'href' => rest_url( sprintf( '/%s/orders/%d', $this->namespace, $order_id ) ),
+			),
+		);
+
+		return $links;
+	}
+
+	/**
+	 * Get the Order Notes schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'order_note',
+			'type'       => 'object',
+			'properties' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_created' => array(
+					'description' => __( "The date the order note was created, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'note' => array(
+					'description' => __( 'Order note.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'customer_note' => array(
+					'description' => __( 'Shows/define if the note is only for reference or for the customer (the user will be notified).', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => false,
+					'context'     => array( 'view', 'edit' ),
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+
+	/**
+	 * Get the query params for collections.
+	 *
+	 * @return array
+	 */
+	public function get_collection_params() {
+		return array(
+			'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+		);
+	}
+}
diff --git a/includes/api/v1/class-wc-rest-order-refunds-controller.php b/includes/api/v1/class-wc-rest-order-refunds-controller.php
new file mode 100644
index 00000000000..fbb3c13aa7f
--- /dev/null
+++ b/includes/api/v1/class-wc-rest-order-refunds-controller.php
@@ -0,0 +1,522 @@
+<?php
+/**
+ * REST API Order Refunds controller
+ *
+ * Handles requests to the /orders/<order_id>/refunds endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Order Refunds controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Orders_V1_Controller
+ */
+class WC_REST_Order_Refunds_V1_Controller extends WC_REST_Orders_V1_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v1';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'orders/(?P<order_id>[\d]+)/refunds';
+
+	/**
+	 * Post type.
+	 *
+	 * @var string
+	 */
+	protected $post_type = 'shop_order_refund';
+
+	/**
+	 * Order refunds actions.
+	 */
+	public function __construct() {
+		add_filter( "woocommerce_rest_{$this->post_type}_trashable", '__return_false' );
+		add_filter( "woocommerce_rest_{$this->post_type}_query", array( $this, 'query_args' ), 10, 2 );
+	}
+
+	/**
+	 * Register the routes for order refunds.
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
+			'args' => array(
+				'order_id'  => array(
+					'description' => __( 'The order ID.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+				'args'                => $this->get_collection_params(),
+			),
+			array(
+				'methods'             => WP_REST_Server::CREATABLE,
+				'callback'            => array( $this, 'create_item' ),
+				'permission_callback' => array( $this, 'create_item_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
+			'args' => array(
+				'order_id'  => array(
+					'description' => __( 'The order ID.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_item' ),
+				'permission_callback' => array( $this, 'get_item_permissions_check' ),
+				'args'                => array(
+					'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::DELETABLE,
+				'callback'            => array( $this, 'delete_item' ),
+				'permission_callback' => array( $this, 'delete_item_permissions_check' ),
+				'args'                => array(
+					'force' => array(
+						'default'     => true,
+						'type'        => 'boolean',
+						'description' => __( 'Required to be true, as resource does not support trashing.', 'woocommerce' ),
+					),
+				),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+	}
+
+	/**
+	 * Prepare a single order refund output for response.
+	 *
+	 * @param WP_Post $post Post object.
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response $data
+	 */
+	public function prepare_item_for_response( $post, $request ) {
+		$order = wc_get_order( (int) $request['order_id'] );
+
+		if ( ! $order ) {
+			return new WP_Error( 'woocommerce_rest_invalid_order_id', __( 'Invalid order ID.', 'woocommerce' ), 404 );
+		}
+
+		$refund = wc_get_order( $post );
+
+		if ( ! $refund || $refund->get_parent_id() !== $order->get_id() ) {
+			return new WP_Error( 'woocommerce_rest_invalid_order_refund_id', __( 'Invalid order refund ID.', 'woocommerce' ), 404 );
+		}
+
+		$dp = $request['dp'];
+
+		$data = array(
+			'id'           => $refund->get_id(),
+			'date_created' => wc_rest_prepare_date_response( $refund->get_date_created() ),
+			'amount'       => wc_format_decimal( $refund->get_amount(), $dp ),
+			'reason'       => $refund->get_reason(),
+			'line_items'   => array(),
+		);
+
+		// Add line items.
+		foreach ( $refund->get_items() as $item_id => $item ) {
+			$product      = $refund->get_product_from_item( $item );
+			$product_id   = 0;
+			$variation_id = 0;
+			$product_sku  = null;
+
+			// Check if the product exists.
+			if ( is_object( $product ) ) {
+				$product_id   = $item->get_product_id();
+				$variation_id = $item->get_variation_id();
+				$product_sku  = $product->get_sku();
+			}
+
+			$item_meta = array();
+
+			$hideprefix = 'true' === $request['all_item_meta'] ? null : '_';
+
+			foreach ( $item->get_formatted_meta_data( $hideprefix, true ) as $meta_key => $formatted_meta ) {
+				$item_meta[] = array(
+					'key'   => $formatted_meta->key,
+					'label' => $formatted_meta->display_key,
+					'value' => wc_clean( $formatted_meta->display_value ),
+				);
+			}
+
+			$line_item = array(
+				'id'           => $item_id,
+				'name'         => $item['name'],
+				'sku'          => $product_sku,
+				'product_id'   => (int) $product_id,
+				'variation_id' => (int) $variation_id,
+				'quantity'     => wc_stock_amount( $item['qty'] ),
+				'tax_class'    => ! empty( $item['tax_class'] ) ? $item['tax_class'] : '',
+				'price'        => wc_format_decimal( $refund->get_item_total( $item, false, false ), $dp ),
+				'subtotal'     => wc_format_decimal( $refund->get_line_subtotal( $item, false, false ), $dp ),
+				'subtotal_tax' => wc_format_decimal( $item['line_subtotal_tax'], $dp ),
+				'total'        => wc_format_decimal( $refund->get_line_total( $item, false, false ), $dp ),
+				'total_tax'    => wc_format_decimal( $item['line_tax'], $dp ),
+				'taxes'        => array(),
+				'meta'         => $item_meta,
+			);
+
+			$item_line_taxes = maybe_unserialize( $item['line_tax_data'] );
+			if ( isset( $item_line_taxes['total'] ) ) {
+				$line_tax = array();
+
+				foreach ( $item_line_taxes['total'] as $tax_rate_id => $tax ) {
+					$line_tax[ $tax_rate_id ] = array(
+						'id'       => $tax_rate_id,
+						'total'    => $tax,
+						'subtotal' => '',
+					);
+				}
+
+				foreach ( $item_line_taxes['subtotal'] as $tax_rate_id => $tax ) {
+					$line_tax[ $tax_rate_id ]['subtotal'] = $tax;
+				}
+
+				$line_item['taxes'] = array_values( $line_tax );
+			}
+
+			$data['line_items'][] = $line_item;
+		}
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		// Wrap the data in a response object.
+		$response = rest_ensure_response( $data );
+
+		$response->add_links( $this->prepare_links( $refund, $request ) );
+
+		/**
+		 * Filter the data for a response.
+		 *
+		 * The dynamic portion of the hook name, $this->post_type, refers to post_type of the post being
+		 * prepared for the response.
+		 *
+		 * @param WP_REST_Response   $response   The response object.
+		 * @param WP_Post            $post       Post object.
+		 * @param WP_REST_Request    $request    Request object.
+		 */
+		return apply_filters( "woocommerce_rest_prepare_{$this->post_type}", $response, $post, $request );
+	}
+
+	/**
+	 * Prepare links for the request.
+	 *
+	 * @param WC_Order_Refund $refund Comment object.
+	 * @param WP_REST_Request $request Request object.
+	 * @return array Links for the given order refund.
+	 */
+	protected function prepare_links( $refund, $request ) {
+		$order_id = $refund->get_parent_id();
+		$base     = str_replace( '(?P<order_id>[\d]+)', $order_id, $this->rest_base );
+		$links    = array(
+			'self' => array(
+				'href' => rest_url( sprintf( '/%s/%s/%d', $this->namespace, $base, $refund->get_id() ) ),
+			),
+			'collection' => array(
+				'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $base ) ),
+			),
+			'up' => array(
+				'href' => rest_url( sprintf( '/%s/orders/%d', $this->namespace, $order_id ) ),
+			),
+		);
+
+		return $links;
+	}
+
+	/**
+	 * Query args.
+	 *
+	 * @param array           $args    Request args.
+	 * @param WP_REST_Request $request Request object.
+	 * @return array
+	 */
+	public function query_args( $args, $request ) {
+		$args['post_status']     = array_keys( wc_get_order_statuses() );
+		$args['post_parent__in'] = array( absint( $request['order_id'] ) );
+
+		return $args;
+	}
+
+	/**
+	 * Create a single item.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function create_item( $request ) {
+		if ( ! empty( $request['id'] ) ) {
+			/* translators: %s: post type */
+			return new WP_Error( "woocommerce_rest_{$this->post_type}_exists", sprintf( __( 'Cannot create existing %s.', 'woocommerce' ), $this->post_type ), array( 'status' => 400 ) );
+		}
+
+		$order_data = get_post( (int) $request['order_id'] );
+
+		if ( empty( $order_data ) ) {
+			return new WP_Error( 'woocommerce_rest_invalid_order', __( 'Order is invalid', 'woocommerce' ), 400 );
+		}
+
+		if ( 0 > $request['amount'] ) {
+			return new WP_Error( 'woocommerce_rest_invalid_order_refund', __( 'Refund amount must be greater than zero.', 'woocommerce' ), 400 );
+		}
+
+		// Create the refund.
+		$refund = wc_create_refund( array(
+			'order_id'       => $order_data->ID,
+			'amount'         => $request['amount'],
+			'reason'         => empty( $request['reason'] ) ? null : $request['reason'],
+			'line_items'     => $request['line_items'],
+			'refund_payment' => is_bool( $request['api_refund'] ) ? $request['api_refund'] : true,
+			'restock_items'  => true,
+		) );
+
+		if ( is_wp_error( $refund ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_create_order_refund', $refund->get_error_message(), 500 );
+		}
+
+		if ( ! $refund ) {
+			return new WP_Error( 'woocommerce_rest_cannot_create_order_refund', __( 'Cannot create order refund, please try again.', 'woocommerce' ), 500 );
+		}
+
+		$post = get_post( $refund->get_id() );
+		$this->update_additional_fields_for_object( $post, $request );
+
+		/**
+		 * Fires after a single item is created or updated via the REST API.
+		 *
+		 * @param WP_Post         $post      Post object.
+		 * @param WP_REST_Request $request   Request object.
+		 * @param boolean         $creating  True when creating item, false when updating.
+		 */
+		do_action( "woocommerce_rest_insert_{$this->post_type}", $post, $request, true );
+
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_item_for_response( $post, $request );
+		$response = rest_ensure_response( $response );
+		$response->set_status( 201 );
+		$response->header( 'Location', rest_url( sprintf( '/%s/%s/%d', $this->namespace, $this->rest_base, $post->ID ) ) );
+
+		return $response;
+	}
+
+	/**
+	 * Get the Order's schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => $this->post_type,
+			'type'       => 'object',
+			'properties' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_created' => array(
+					'description' => __( "The date the order refund was created, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'amount' => array(
+					'description' => __( 'Refund amount.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'reason' => array(
+					'description' => __( 'Reason for refund.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'line_items' => array(
+					'description' => __( 'Line items data.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Item ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'name' => array(
+								'description' => __( 'Product name.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'sku' => array(
+								'description' => __( 'Product SKU.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'product_id' => array(
+								'description' => __( 'Product ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'variation_id' => array(
+								'description' => __( 'Variation ID, if applicable.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'quantity' => array(
+								'description' => __( 'Quantity ordered.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'tax_class' => array(
+								'description' => __( 'Tax class of product.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'price' => array(
+								'description' => __( 'Product price.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'subtotal' => array(
+								'description' => __( 'Line subtotal (before discounts).', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'subtotal_tax' => array(
+								'description' => __( 'Line subtotal tax (before discounts).', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'total' => array(
+								'description' => __( 'Line total (after discounts).', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'total_tax' => array(
+								'description' => __( 'Line total tax (after discounts).', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'taxes' => array(
+								'description' => __( 'Line taxes.', 'woocommerce' ),
+								'type'        => 'array',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+								'items'       => array(
+									'type'       => 'object',
+									'properties' => array(
+										'id' => array(
+											'description' => __( 'Tax rate ID.', 'woocommerce' ),
+											'type'        => 'integer',
+											'context'     => array( 'view', 'edit' ),
+											'readonly'    => true,
+										),
+										'total' => array(
+											'description' => __( 'Tax total.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+											'readonly'    => true,
+										),
+										'subtotal' => array(
+											'description' => __( 'Tax subtotal.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+											'readonly'    => true,
+										),
+									),
+								),
+							),
+							'meta' => array(
+								'description' => __( 'Line item meta data.', 'woocommerce' ),
+								'type'        => 'array',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+								'items'       => array(
+									'type'       => 'object',
+									'properties' => array(
+										'key' => array(
+											'description' => __( 'Meta key.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+											'readonly'    => true,
+										),
+										'label' => array(
+											'description' => __( 'Meta label.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+											'readonly'    => true,
+										),
+										'value' => array(
+											'description' => __( 'Meta value.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+											'readonly'    => true,
+										),
+									),
+								),
+							),
+						),
+					),
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+
+	/**
+	 * Get the query params for collections.
+	 *
+	 * @return array
+	 */
+	public function get_collection_params() {
+		$params = parent::get_collection_params();
+
+		$params['dp'] = array(
+			'default'           => 2,
+			'description'       => __( 'Number of decimal points to use in each resource.', 'woocommerce' ),
+			'type'              => 'integer',
+			'sanitize_callback' => 'absint',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+
+		return $params;
+	}
+}
diff --git a/includes/api/v1/class-wc-rest-orders-controller.php b/includes/api/v1/class-wc-rest-orders-controller.php
new file mode 100644
index 00000000000..3e7b85ef3b1
--- /dev/null
+++ b/includes/api/v1/class-wc-rest-orders-controller.php
@@ -0,0 +1,1612 @@
+<?php
+/**
+ * REST API Orders controller
+ *
+ * Handles requests to the /orders endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Orders controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Posts_Controller
+ */
+class WC_REST_Orders_V1_Controller extends WC_REST_Posts_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v1';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'orders';
+
+	/**
+	 * Post type.
+	 *
+	 * @var string
+	 */
+	protected $post_type = 'shop_order';
+
+	/**
+	 * Initialize orders actions.
+	 */
+	public function __construct() {
+		add_filter( "woocommerce_rest_{$this->post_type}_query", array( $this, 'query_args' ), 10, 2 );
+	}
+
+	/**
+	 * Register the routes for orders.
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+				'args'                => $this->get_collection_params(),
+			),
+			array(
+				'methods'             => WP_REST_Server::CREATABLE,
+				'callback'            => array( $this, 'create_item' ),
+				'permission_callback' => array( $this, 'create_item_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
+			'args' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_item' ),
+				'permission_callback' => array( $this, 'get_item_permissions_check' ),
+				'args'                => array(
+					'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'update_item' ),
+				'permission_callback' => array( $this, 'update_item_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			array(
+				'methods'             => WP_REST_Server::DELETABLE,
+				'callback'            => array( $this, 'delete_item' ),
+				'permission_callback' => array( $this, 'delete_item_permissions_check' ),
+				'args'                => array(
+					'force' => array(
+						'default'     => false,
+						'type'        => 'boolean',
+						'description' => __( 'Whether to bypass trash and force deletion.', 'woocommerce' ),
+					),
+				),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/batch', array(
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'batch_items' ),
+				'permission_callback' => array( $this, 'batch_items_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			'schema' => array( $this, 'get_public_batch_schema' ),
+		) );
+	}
+
+	/**
+	 * Prepare a single order output for response.
+	 *
+	 * @param WP_Post $post Post object.
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response $data
+	 */
+	public function prepare_item_for_response( $post, $request ) {
+		global $wpdb;
+
+		$order = wc_get_order( $post );
+		$dp    = $request['dp'];
+
+		$data = array(
+			'id'                   => $order->get_id(),
+			'parent_id'            => $order->get_parent_id(),
+			'status'               => $order->get_status(),
+			'order_key'            => $order->get_order_key(),
+			'number'               => $order->get_order_number(),
+			'currency'             => $order->get_currency(),
+			'version'              => $order->get_version(),
+			'prices_include_tax'   => $order->get_prices_include_tax(),
+			'date_created'         => wc_rest_prepare_date_response( $order->get_date_created() ),  // v1 API used UTC.
+			'date_modified'        => wc_rest_prepare_date_response( $order->get_date_modified() ), // v1 API used UTC.
+			'customer_id'          => $order->get_customer_id(),
+			'discount_total'       => wc_format_decimal( $order->get_total_discount(), $dp ),
+			'discount_tax'         => wc_format_decimal( $order->get_discount_tax(), $dp ),
+			'shipping_total'       => wc_format_decimal( $order->get_shipping_total(), $dp ),
+			'shipping_tax'         => wc_format_decimal( $order->get_shipping_tax(), $dp ),
+			'cart_tax'             => wc_format_decimal( $order->get_cart_tax(), $dp ),
+			'total'                => wc_format_decimal( $order->get_total(), $dp ),
+			'total_tax'            => wc_format_decimal( $order->get_total_tax(), $dp ),
+			'billing'              => array(),
+			'shipping'             => array(),
+			'payment_method'       => $order->get_payment_method(),
+			'payment_method_title' => $order->get_payment_method_title(),
+			'transaction_id'       => $order->get_transaction_id(),
+			'customer_ip_address'  => $order->get_customer_ip_address(),
+			'customer_user_agent'  => $order->get_customer_user_agent(),
+			'created_via'          => $order->get_created_via(),
+			'customer_note'        => $order->get_customer_note(),
+			'date_completed'       => wc_rest_prepare_date_response( $order->get_date_completed(), false ), // v1 API used local time.
+			'date_paid'            => wc_rest_prepare_date_response( $order->get_date_paid(), false ), // v1 API used local time.
+			'cart_hash'            => $order->get_cart_hash(),
+			'line_items'           => array(),
+			'tax_lines'            => array(),
+			'shipping_lines'       => array(),
+			'fee_lines'            => array(),
+			'coupon_lines'         => array(),
+			'refunds'              => array(),
+		);
+
+		// Add addresses.
+		$data['billing']  = $order->get_address( 'billing' );
+		$data['shipping'] = $order->get_address( 'shipping' );
+
+		// Add line items.
+		foreach ( $order->get_items() as $item_id => $item ) {
+			$product      = $order->get_product_from_item( $item );
+			$product_id   = 0;
+			$variation_id = 0;
+			$product_sku  = null;
+
+			// Check if the product exists.
+			if ( is_object( $product ) ) {
+				$product_id   = $item->get_product_id();
+				$variation_id = $item->get_variation_id();
+				$product_sku  = $product->get_sku();
+			}
+
+			$item_meta = array();
+
+			$hideprefix = 'true' === $request['all_item_meta'] ? null : '_';
+
+			foreach ( $item->get_formatted_meta_data( $hideprefix, true ) as $meta_key => $formatted_meta ) {
+				$item_meta[] = array(
+					'key'   => $formatted_meta->key,
+					'label' => $formatted_meta->display_key,
+					'value' => wc_clean( $formatted_meta->display_value ),
+				);
+			}
+
+			$line_item = array(
+				'id'           => $item_id,
+				'name'         => $item['name'],
+				'sku'          => $product_sku,
+				'product_id'   => (int) $product_id,
+				'variation_id' => (int) $variation_id,
+				'quantity'     => wc_stock_amount( $item['qty'] ),
+				'tax_class'    => ! empty( $item['tax_class'] ) ? $item['tax_class'] : '',
+				'price'        => wc_format_decimal( $order->get_item_total( $item, false, false ), $dp ),
+				'subtotal'     => wc_format_decimal( $order->get_line_subtotal( $item, false, false ), $dp ),
+				'subtotal_tax' => wc_format_decimal( $item['line_subtotal_tax'], $dp ),
+				'total'        => wc_format_decimal( $order->get_line_total( $item, false, false ), $dp ),
+				'total_tax'    => wc_format_decimal( $item['line_tax'], $dp ),
+				'taxes'        => array(),
+				'meta'         => $item_meta,
+			);
+
+			$item_line_taxes = maybe_unserialize( $item['line_tax_data'] );
+			if ( isset( $item_line_taxes['total'] ) ) {
+				$line_tax = array();
+
+				foreach ( $item_line_taxes['total'] as $tax_rate_id => $tax ) {
+					$line_tax[ $tax_rate_id ] = array(
+						'id'       => $tax_rate_id,
+						'total'    => $tax,
+						'subtotal' => '',
+					);
+				}
+
+				foreach ( $item_line_taxes['subtotal'] as $tax_rate_id => $tax ) {
+					$line_tax[ $tax_rate_id ]['subtotal'] = $tax;
+				}
+
+				$line_item['taxes'] = array_values( $line_tax );
+			}
+
+			$data['line_items'][] = $line_item;
+		}
+
+		// Add taxes.
+		foreach ( $order->get_items( 'tax' ) as $key => $tax ) {
+			$tax_line = array(
+				'id'                 => $key,
+				'rate_code'          => $tax['name'],
+				'rate_id'            => $tax['rate_id'],
+				'label'              => isset( $tax['label'] ) ? $tax['label'] : $tax['name'],
+				'compound'           => (bool) $tax['compound'],
+				'tax_total'          => wc_format_decimal( $tax['tax_amount'], $dp ),
+				'shipping_tax_total' => wc_format_decimal( $tax['shipping_tax_amount'], $dp ),
+			);
+
+			$data['tax_lines'][] = $tax_line;
+		}
+
+		// Add shipping.
+		foreach ( $order->get_shipping_methods() as $shipping_item_id => $shipping_item ) {
+			$shipping_line = array(
+				'id'           => $shipping_item_id,
+				'method_title' => $shipping_item['name'],
+				'method_id'    => $shipping_item['method_id'],
+				'total'        => wc_format_decimal( $shipping_item['cost'], $dp ),
+				'total_tax'    => wc_format_decimal( '', $dp ),
+				'taxes'        => array(),
+			);
+
+			$shipping_taxes = $shipping_item->get_taxes();
+
+			if ( ! empty( $shipping_taxes['total'] ) ) {
+				$shipping_line['total_tax'] = wc_format_decimal( array_sum( $shipping_taxes['total'] ), $dp );
+
+				foreach ( $shipping_taxes['total'] as $tax_rate_id => $tax ) {
+					$shipping_line['taxes'][] = array(
+						'id'       => $tax_rate_id,
+						'total'    => $tax,
+					);
+				}
+			}
+
+			$data['shipping_lines'][] = $shipping_line;
+		}
+
+		// Add fees.
+		foreach ( $order->get_fees() as $fee_item_id => $fee_item ) {
+			$fee_line = array(
+				'id'         => $fee_item_id,
+				'name'       => $fee_item['name'],
+				'tax_class'  => ! empty( $fee_item['tax_class'] ) ? $fee_item['tax_class'] : '',
+				'tax_status' => 'taxable',
+				'total'      => wc_format_decimal( $order->get_line_total( $fee_item ), $dp ),
+				'total_tax'  => wc_format_decimal( $order->get_line_tax( $fee_item ), $dp ),
+				'taxes'      => array(),
+			);
+
+			$fee_line_taxes = maybe_unserialize( $fee_item['line_tax_data'] );
+			if ( isset( $fee_line_taxes['total'] ) ) {
+				$fee_tax = array();
+
+				foreach ( $fee_line_taxes['total'] as $tax_rate_id => $tax ) {
+					$fee_tax[ $tax_rate_id ] = array(
+						'id'       => $tax_rate_id,
+						'total'    => $tax,
+						'subtotal' => '',
+					);
+				}
+
+				if ( isset( $fee_line_taxes['subtotal'] ) ) {
+					foreach ( $fee_line_taxes['subtotal'] as $tax_rate_id => $tax ) {
+						$fee_tax[ $tax_rate_id ]['subtotal'] = $tax;
+					}
+				}
+
+				$fee_line['taxes'] = array_values( $fee_tax );
+			}
+
+			$data['fee_lines'][] = $fee_line;
+		}
+
+		// Add coupons.
+		foreach ( $order->get_items( 'coupon' ) as $coupon_item_id => $coupon_item ) {
+			$coupon_line = array(
+				'id'           => $coupon_item_id,
+				'code'         => $coupon_item['name'],
+				'discount'     => wc_format_decimal( $coupon_item['discount_amount'], $dp ),
+				'discount_tax' => wc_format_decimal( $coupon_item['discount_amount_tax'], $dp ),
+			);
+
+			$data['coupon_lines'][] = $coupon_line;
+		}
+
+		// Add refunds.
+		foreach ( $order->get_refunds() as $refund ) {
+			$data['refunds'][] = array(
+				'id'     => $refund->get_id(),
+				'refund' => $refund->get_reason() ? $refund->get_reason() : '',
+				'total'  => '-' . wc_format_decimal( $refund->get_amount(), $dp ),
+			);
+		}
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		// Wrap the data in a response object.
+		$response = rest_ensure_response( $data );
+
+		$response->add_links( $this->prepare_links( $order, $request ) );
+
+		/**
+		 * Filter the data for a response.
+		 *
+		 * The dynamic portion of the hook name, $this->post_type, refers to post_type of the post being
+		 * prepared for the response.
+		 *
+		 * @param WP_REST_Response   $response   The response object.
+		 * @param WP_Post            $post       Post object.
+		 * @param WP_REST_Request    $request    Request object.
+		 */
+		return apply_filters( "woocommerce_rest_prepare_{$this->post_type}", $response, $post, $request );
+	}
+
+	/**
+	 * Prepare links for the request.
+	 *
+	 * @param WC_Order $order Order object.
+	 * @param WP_REST_Request $request Request object.
+	 * @return array Links for the given order.
+	 */
+	protected function prepare_links( $order, $request ) {
+		$links = array(
+			'self' => array(
+				'href' => rest_url( sprintf( '/%s/%s/%d', $this->namespace, $this->rest_base, $order->get_id() ) ),
+			),
+			'collection' => array(
+				'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ),
+			),
+		);
+		if ( 0 !== (int) $order->get_user_id() ) {
+			$links['customer'] = array(
+				'href' => rest_url( sprintf( '/%s/customers/%d', $this->namespace, $order->get_user_id() ) ),
+			);
+		}
+		if ( 0 !== (int) $order->get_parent_id() ) {
+			$links['up'] = array(
+				'href' => rest_url( sprintf( '/%s/orders/%d', $this->namespace, $order->get_parent_id() ) ),
+			);
+		}
+		return $links;
+	}
+
+	/**
+	 * Query args.
+	 *
+	 * @param array $args
+	 * @param WP_REST_Request $request
+	 * @return array
+	 */
+	public function query_args( $args, $request ) {
+		global $wpdb;
+
+		// Set post_status.
+		if ( 'any' !== $request['status'] ) {
+			$args['post_status'] = 'wc-' . $request['status'];
+		} else {
+			$args['post_status'] = 'any';
+		}
+
+		if ( isset( $request['customer'] ) ) {
+			if ( ! empty( $args['meta_query'] ) ) {
+				$args['meta_query'] = array();
+			}
+
+			$args['meta_query'][] = array(
+				'key'   => '_customer_user',
+				'value' => $request['customer'],
+				'type'  => 'NUMERIC',
+			);
+		}
+
+		// Search by product.
+		if ( ! empty( $request['product'] ) ) {
+			$order_ids = $wpdb->get_col( $wpdb->prepare( "
+				SELECT order_id
+				FROM {$wpdb->prefix}woocommerce_order_items
+				WHERE order_item_id IN ( SELECT order_item_id FROM {$wpdb->prefix}woocommerce_order_itemmeta WHERE meta_key = '_product_id' AND meta_value = %d )
+				AND order_item_type = 'line_item'
+			 ", $request['product'] ) );
+
+			// Force WP_Query return empty if don't found any order.
+			$order_ids = ! empty( $order_ids ) ? $order_ids : array( 0 );
+
+			$args['post__in'] = $order_ids;
+		}
+
+		// Search.
+		if ( ! empty( $args['s'] ) ) {
+			$order_ids = wc_order_search( $args['s'] );
+
+			if ( ! empty( $order_ids ) ) {
+				unset( $args['s'] );
+				$args['post__in'] = array_merge( $order_ids, array( 0 ) );
+			}
+		}
+
+		return $args;
+	}
+
+	/**
+	 * Prepare a single order for create.
+	 *
+	 * @param  WP_REST_Request $request Request object.
+	 * @return WP_Error|WC_Order $data Object.
+	 */
+	protected function prepare_item_for_database( $request ) {
+		$id        = isset( $request['id'] ) ? absint( $request['id'] ) : 0;
+		$order     = new WC_Order( $id );
+		$schema    = $this->get_item_schema();
+		$data_keys = array_keys( array_filter( $schema['properties'], array( $this, 'filter_writable_props' ) ) );
+
+		// Handle all writable props
+		foreach ( $data_keys as $key ) {
+			$value = $request[ $key ];
+
+			if ( ! is_null( $value ) ) {
+				switch ( $key ) {
+					case 'billing' :
+					case 'shipping' :
+						$this->update_address( $order, $value, $key );
+						break;
+					case 'line_items' :
+					case 'shipping_lines' :
+					case 'fee_lines' :
+					case 'coupon_lines' :
+						if ( is_array( $value ) ) {
+							foreach ( $value as $item ) {
+								if ( is_array( $item ) ) {
+									if ( $this->item_is_null( $item ) || ( isset( $item['quantity'] ) && 0 === $item['quantity'] ) ) {
+										$order->remove_item( $item['id'] );
+									} else {
+										$this->set_item( $order, $key, $item );
+									}
+								}
+							}
+						}
+						break;
+					default :
+						if ( is_callable( array( $order, "set_{$key}" ) ) ) {
+							$order->{"set_{$key}"}( $value );
+						}
+						break;
+				}
+			}
+		}
+
+		/**
+		 * Filter the data for the insert.
+		 *
+		 * The dynamic portion of the hook name, $this->post_type, refers to post_type of the post being
+		 * prepared for the response.
+		 *
+		 * @param WC_Order           $order      The prder object.
+		 * @param WP_REST_Request    $request    Request object.
+		 */
+		return apply_filters( "woocommerce_rest_pre_insert_{$this->post_type}", $order, $request );
+	}
+
+	/**
+	 * Create base WC Order object.
+	 * @deprecated 3.0.0
+	 * @param array $data
+	 * @return WC_Order
+	 */
+	protected function create_base_order( $data ) {
+		return wc_create_order( $data );
+	}
+
+	/**
+	 * Only reutrn writeable props from schema.
+	 * @param  array $schema
+	 * @return bool
+	 */
+	protected function filter_writable_props( $schema ) {
+		return empty( $schema['readonly'] );
+	}
+
+	/**
+	 * Create order.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return int|WP_Error
+	 */
+	protected function create_order( $request ) {
+		try {
+			// Make sure customer exists.
+			if ( ! is_null( $request['customer_id'] ) && 0 !== $request['customer_id'] && false === get_user_by( 'id', $request['customer_id'] ) ) {
+				throw new WC_REST_Exception( 'woocommerce_rest_invalid_customer_id',__( 'Customer ID is invalid.', 'woocommerce' ), 400 );
+			}
+
+			$order = $this->prepare_item_for_database( $request );
+			$order->set_created_via( 'rest-api' );
+			$order->set_prices_include_tax( 'yes' === get_option( 'woocommerce_prices_include_tax' ) );
+			$order->calculate_totals();
+			$order->save();
+
+			// Handle set paid.
+			if ( true === $request['set_paid'] ) {
+				$order->payment_complete( $request['transaction_id'] );
+			}
+
+			return $order->get_id();
+		} catch ( WC_Data_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), $e->getErrorData() );
+		} catch ( WC_REST_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
+		}
+	}
+
+	/**
+	 * Update order.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return int|WP_Error
+	 */
+	protected function update_order( $request ) {
+		try {
+			$order = $this->prepare_item_for_database( $request );
+			$order->save();
+
+			// Handle set paid.
+			if ( $order->needs_payment() && true === $request['set_paid'] ) {
+				$order->payment_complete( $request['transaction_id'] );
+			}
+
+			// If items have changed, recalculate order totals.
+			if ( isset( $request['billing'] ) || isset( $request['shipping'] ) || isset( $request['line_items'] ) || isset( $request['shipping_lines'] ) || isset( $request['fee_lines'] ) || isset( $request['coupon_lines'] ) ) {
+				$order->calculate_totals();
+			}
+
+			return $order->get_id();
+		} catch ( WC_Data_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), $e->getErrorData() );
+		} catch ( WC_REST_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
+		}
+	}
+
+	/**
+	 * Update address.
+	 *
+	 * @param WC_Order $order
+	 * @param array $posted
+	 * @param string $type
+	 */
+	protected function update_address( $order, $posted, $type = 'billing' ) {
+		foreach ( $posted as $key => $value ) {
+			if ( is_callable( array( $order, "set_{$type}_{$key}" ) ) ) {
+				$order->{"set_{$type}_{$key}"}( $value );
+			}
+		}
+	}
+
+	/**
+	 * Gets the product ID from the SKU or posted ID.
+	 * @param array $posted Request data
+	 * @return int
+	 */
+	protected function get_product_id( $posted ) {
+		if ( ! empty( $posted['sku'] ) ) {
+			$product_id = (int) wc_get_product_id_by_sku( $posted['sku'] );
+		} elseif ( ! empty( $posted['product_id'] ) && empty( $posted['variation_id'] ) ) {
+			$product_id = (int) $posted['product_id'];
+		} elseif ( ! empty( $posted['variation_id'] ) ) {
+			$product_id = (int) $posted['variation_id'];
+		} else {
+			throw new WC_REST_Exception( 'woocommerce_rest_required_product_reference', __( 'Product ID or SKU is required.', 'woocommerce' ), 400 );
+		}
+		return $product_id;
+	}
+
+	/**
+	 * Maybe set an item prop if the value was posted.
+	 * @param WC_Order_Item $item
+	 * @param string $prop
+	 * @param array $posted Request data.
+	 */
+	protected function maybe_set_item_prop( $item, $prop, $posted ) {
+		if ( isset( $posted[ $prop ] ) ) {
+			$item->{"set_$prop"}( $posted[ $prop ] );
+		}
+	}
+
+	/**
+	 * Maybe set item props if the values were posted.
+	 * @param WC_Order_Item $item
+	 * @param string[] $props
+	 * @param array $posted Request data.
+	 */
+	protected function maybe_set_item_props( $item, $props, $posted ) {
+		foreach ( $props as $prop ) {
+			$this->maybe_set_item_prop( $item, $prop, $posted );
+		}
+	}
+
+	/**
+	 * Create or update a line item.
+	 *
+	 * @param array $posted Line item data.
+	 * @param string $action 'create' to add line item or 'update' to update it.
+	 * @throws WC_REST_Exception Invalid data, server error.
+	 */
+	protected function prepare_line_items( $posted, $action = 'create' ) {
+		$item    = new WC_Order_Item_Product( ! empty( $posted['id'] ) ? $posted['id'] : '' );
+		$product = wc_get_product( $this->get_product_id( $posted ) );
+
+		if ( $product !== $item->get_product() ) {
+			$item->set_product( $product );
+
+			if ( 'create' === $action ) {
+				$quantity = isset( $posted['quantity'] ) ? $posted['quantity'] : 1;
+				$total    = wc_get_price_excluding_tax( $product, array( 'qty' => $quantity ) );
+				$item->set_total( $total );
+				$item->set_subtotal( $total );
+			}
+		}
+
+		$this->maybe_set_item_props( $item, array( 'name', 'quantity', 'total', 'subtotal', 'tax_class' ), $posted );
+
+		return $item;
+	}
+
+	/**
+	 * Create or update an order shipping method.
+	 *
+	 * @param $posted $shipping Item data.
+	 * @param string $action 'create' to add shipping or 'update' to update it.
+	 * @throws WC_REST_Exception Invalid data, server error.
+	 */
+	protected function prepare_shipping_lines( $posted, $action ) {
+		$item = new WC_Order_Item_Shipping( ! empty( $posted['id'] ) ? $posted['id'] : '' );
+
+		if ( 'create' === $action ) {
+			if ( empty( $posted['method_id'] ) ) {
+				throw new WC_REST_Exception( 'woocommerce_rest_invalid_shipping_item', __( 'Shipping method ID is required.', 'woocommerce' ), 400 );
+			}
+		}
+
+		$this->maybe_set_item_props( $item, array( 'method_id', 'method_title', 'total' ), $posted );
+
+		return $item;
+	}
+
+	/**
+	 * Create or update an order fee.
+	 *
+	 * @param array $posted Item data.
+	 * @param string $action 'create' to add fee or 'update' to update it.
+	 * @throws WC_REST_Exception Invalid data, server error.
+	 */
+	protected function prepare_fee_lines( $posted, $action ) {
+		$item = new WC_Order_Item_Fee( ! empty( $posted['id'] ) ? $posted['id'] : '' );
+
+		if ( 'create' === $action ) {
+			if ( empty( $posted['name'] ) ) {
+				throw new WC_REST_Exception( 'woocommerce_rest_invalid_fee_item', __( 'Fee name is required.', 'woocommerce' ), 400 );
+			}
+		}
+
+		$this->maybe_set_item_props( $item, array( 'name', 'tax_class', 'tax_status', 'total' ), $posted );
+
+		return $item;
+	}
+
+	/**
+	 * Create or update an order coupon.
+	 *
+	 * @param array $posted Item data.
+	 * @param string $action 'create' to add coupon or 'update' to update it.
+	 * @throws WC_REST_Exception Invalid data, server error.
+	 */
+	protected function prepare_coupon_lines( $posted, $action ) {
+		$item = new WC_Order_Item_Coupon( ! empty( $posted['id'] ) ? $posted['id'] : '' );
+
+		if ( 'create' === $action ) {
+			if ( empty( $posted['code'] ) ) {
+				throw new WC_REST_Exception( 'woocommerce_rest_invalid_coupon_coupon', __( 'Coupon code is required.', 'woocommerce' ), 400 );
+			}
+		}
+
+		$this->maybe_set_item_props( $item, array( 'code', 'discount' ), $posted );
+
+		return $item;
+	}
+
+	/**
+	 * Wrapper method to create/update order items.
+	 * When updating, the item ID provided is checked to ensure it is associated
+	 * with the order.
+	 *
+	 * @param WC_Order $order order
+	 * @param string $item_type
+	 * @param array $posted item provided in the request body
+	 * @throws WC_REST_Exception If item ID is not associated with order
+	 */
+	protected function set_item( $order, $item_type, $posted ) {
+		global $wpdb;
+
+		if ( ! empty( $posted['id'] ) ) {
+			$action = 'update';
+		} else {
+			$action = 'create';
+		}
+
+		$method = 'prepare_' . $item_type;
+
+		// Verify provided line item ID is associated with order.
+		if ( 'update' === $action ) {
+			$result = $wpdb->get_row(
+				$wpdb->prepare( "SELECT * FROM {$wpdb->prefix}woocommerce_order_items WHERE order_item_id = %d AND order_id = %d",
+				absint( $posted['id'] ),
+				absint( $order->get_id() )
+			) );
+			if ( is_null( $result ) ) {
+				throw new WC_REST_Exception( 'woocommerce_rest_invalid_item_id', __( 'Order item ID provided is not associated with order.', 'woocommerce' ), 400 );
+			}
+		}
+
+		// Prepare item data
+		$item = $this->$method( $posted, $action );
+
+		/**
+		 * Action hook to adjust item before save.
+		 * @since 3.0.0
+		 */
+		do_action( 'woocommerce_rest_set_order_item', $item, $posted );
+
+		// Save or add to order
+		if ( 'create' === $action ) {
+			$order->add_item( $item );
+		} else {
+			$item->save();
+		}
+	}
+
+	/**
+	 * Helper method to check if the resource ID associated with the provided item is null.
+	 * Items can be deleted by setting the resource ID to null.
+	 *
+	 * @param array $item Item provided in the request body.
+	 * @return bool True if the item resource ID is null, false otherwise.
+	 */
+	protected function item_is_null( $item ) {
+		$keys = array( 'product_id', 'method_id', 'method_title', 'name', 'code' );
+
+		foreach ( $keys as $key ) {
+			if ( array_key_exists( $key, $item ) && is_null( $item[ $key ] ) ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Create a single item.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function create_item( $request ) {
+		if ( ! empty( $request['id'] ) ) {
+			/* translators: %s: post type */
+			return new WP_Error( "woocommerce_rest_{$this->post_type}_exists", sprintf( __( 'Cannot create existing %s.', 'woocommerce' ), $this->post_type ), array( 'status' => 400 ) );
+		}
+
+		$order_id = $this->create_order( $request );
+		if ( is_wp_error( $order_id ) ) {
+			return $order_id;
+		}
+
+		$post = get_post( $order_id );
+		$this->update_additional_fields_for_object( $post, $request );
+
+		/**
+		 * Fires after a single item is created or updated via the REST API.
+		 *
+		 * @param WP_Post         $post      Post object.
+		 * @param WP_REST_Request $request   Request object.
+		 * @param boolean         $creating  True when creating item, false when updating.
+		 */
+		do_action( "woocommerce_rest_insert_{$this->post_type}", $post, $request, true );
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_item_for_response( $post, $request );
+		$response = rest_ensure_response( $response );
+		$response->set_status( 201 );
+		$response->header( 'Location', rest_url( sprintf( '/%s/%s/%d', $this->namespace, $this->rest_base, $post->ID ) ) );
+
+		return $response;
+	}
+
+	/**
+	 * Update a single order.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function update_item( $request ) {
+		try {
+			$post_id = (int) $request['id'];
+
+			if ( empty( $post_id ) || get_post_type( $post_id ) !== $this->post_type ) {
+				return new WP_Error( "woocommerce_rest_{$this->post_type}_invalid_id", __( 'ID is invalid.', 'woocommerce' ), array( 'status' => 400 ) );
+			}
+
+			$order_id = $this->update_order( $request );
+			if ( is_wp_error( $order_id ) ) {
+				return $order_id;
+			}
+
+			$post = get_post( $order_id );
+			$this->update_additional_fields_for_object( $post, $request );
+
+			/**
+			 * Fires after a single item is created or updated via the REST API.
+			 *
+			 * @param WP_Post         $post      Post object.
+			 * @param WP_REST_Request $request   Request object.
+			 * @param boolean         $creating  True when creating item, false when updating.
+			 */
+			do_action( "woocommerce_rest_insert_{$this->post_type}", $post, $request, false );
+			$request->set_param( 'context', 'edit' );
+			$response = $this->prepare_item_for_response( $post, $request );
+			return rest_ensure_response( $response );
+
+		} catch ( Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
+		}
+	}
+
+	/**
+	 * Get order statuses without prefixes.
+	 * @return array
+	 */
+	protected function get_order_statuses() {
+		$order_statuses = array();
+
+		foreach ( array_keys( wc_get_order_statuses() ) as $status ) {
+			$order_statuses[] = str_replace( 'wc-', '', $status );
+		}
+
+		return $order_statuses;
+	}
+
+	/**
+	 * Get the Order's schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => $this->post_type,
+			'type'       => 'object',
+			'properties' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'parent_id' => array(
+					'description' => __( 'Parent order ID.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'status' => array(
+					'description' => __( 'Order status.', 'woocommerce' ),
+					'type'        => 'string',
+					'default'     => 'pending',
+					'enum'        => $this->get_order_statuses(),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'order_key' => array(
+					'description' => __( 'Order key.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'number' => array(
+					'description' => __( 'Order number.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'currency' => array(
+					'description' => __( 'Currency the order was created with, in ISO format.', 'woocommerce' ),
+					'type'        => 'string',
+					'default'     => get_woocommerce_currency(),
+					'enum'        => array_keys( get_woocommerce_currencies() ),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'version' => array(
+					'description' => __( 'Version of WooCommerce which last updated the order.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'prices_include_tax' => array(
+					'description' => __( 'True the prices included tax during checkout.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_created' => array(
+					'description' => __( "The date the order was created, as GMT.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_modified' => array(
+					'description' => __( "The date the order was last modified, as GMT.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'customer_id' => array(
+					'description' => __( 'User ID who owns the order. 0 for guests.', 'woocommerce' ),
+					'type'        => 'integer',
+					'default'     => 0,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'discount_total' => array(
+					'description' => __( 'Total discount amount for the order.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'discount_tax' => array(
+					'description' => __( 'Total discount tax amount for the order.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'shipping_total' => array(
+					'description' => __( 'Total shipping amount for the order.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'shipping_tax' => array(
+					'description' => __( 'Total shipping tax amount for the order.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'cart_tax' => array(
+					'description' => __( 'Sum of line item taxes only.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'total' => array(
+					'description' => __( 'Grand total.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'total_tax' => array(
+					'description' => __( 'Sum of all taxes.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'billing' => array(
+					'description' => __( 'Billing address.', 'woocommerce' ),
+					'type'        => 'object',
+					'context'     => array( 'view', 'edit' ),
+					'properties'  => array(
+						'first_name' => array(
+							'description' => __( 'First name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'last_name' => array(
+							'description' => __( 'Last name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'company' => array(
+							'description' => __( 'Company name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'address_1' => array(
+							'description' => __( 'Address line 1.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'address_2' => array(
+							'description' => __( 'Address line 2.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'city' => array(
+							'description' => __( 'City name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'state' => array(
+							'description' => __( 'ISO code or name of the state, province or district.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'postcode' => array(
+							'description' => __( 'Postal code.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'country' => array(
+							'description' => __( 'Country code in ISO 3166-1 alpha-2 format.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'email' => array(
+							'description' => __( 'Email address.', 'woocommerce' ),
+							'type'        => 'string',
+							'format'      => 'email',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'phone' => array(
+							'description' => __( 'Phone number.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+					),
+				),
+				'shipping' => array(
+					'description' => __( 'Shipping address.', 'woocommerce' ),
+					'type'        => 'object',
+					'context'     => array( 'view', 'edit' ),
+					'properties'  => array(
+						'first_name' => array(
+							'description' => __( 'First name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'last_name' => array(
+							'description' => __( 'Last name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'company' => array(
+							'description' => __( 'Company name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'address_1' => array(
+							'description' => __( 'Address line 1.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'address_2' => array(
+							'description' => __( 'Address line 2.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'city' => array(
+							'description' => __( 'City name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'state' => array(
+							'description' => __( 'ISO code or name of the state, province or district.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'postcode' => array(
+							'description' => __( 'Postal code.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'country' => array(
+							'description' => __( 'Country code in ISO 3166-1 alpha-2 format.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+					),
+				),
+				'payment_method' => array(
+					'description' => __( 'Payment method ID.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'payment_method_title' => array(
+					'description' => __( 'Payment method title.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'set_paid' => array(
+					'description' => __( 'Define if the order is paid. It will set the status to processing and reduce stock items.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => false,
+					'context'     => array( 'edit' ),
+				),
+				'transaction_id' => array(
+					'description' => __( 'Unique transaction ID.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'customer_ip_address' => array(
+					'description' => __( "Customer's IP address.", 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'customer_user_agent' => array(
+					'description' => __( 'User agent of the customer.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'created_via' => array(
+					'description' => __( 'Shows where the order was created.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'customer_note' => array(
+					'description' => __( 'Note left by customer during checkout.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'date_completed' => array(
+					'description' => __( "The date the order was completed, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_paid' => array(
+					'description' => __( "The date the order was paid, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'cart_hash' => array(
+					'description' => __( 'MD5 hash of cart items to ensure orders are not modified.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'line_items' => array(
+					'description' => __( 'Line items data.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Item ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'name' => array(
+								'description' => __( 'Product name.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'sku' => array(
+								'description' => __( 'Product SKU.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'product_id' => array(
+								'description' => __( 'Product ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'variation_id' => array(
+								'description' => __( 'Variation ID, if applicable.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'quantity' => array(
+								'description' => __( 'Quantity ordered.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'tax_class' => array(
+								'description' => __( 'Tax class of product.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'price' => array(
+								'description' => __( 'Product price.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'subtotal' => array(
+								'description' => __( 'Line subtotal (before discounts).', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'subtotal_tax' => array(
+								'description' => __( 'Line subtotal tax (before discounts).', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'total' => array(
+								'description' => __( 'Line total (after discounts).', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'total_tax' => array(
+								'description' => __( 'Line total tax (after discounts).', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'taxes' => array(
+								'description' => __( 'Line taxes.', 'woocommerce' ),
+								'type'        => 'array',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+								'items'       => array(
+									'type'       => 'object',
+									'properties' => array(
+										'id' => array(
+											'description' => __( 'Tax rate ID.', 'woocommerce' ),
+											'type'        => 'integer',
+											'context'     => array( 'view', 'edit' ),
+											'readonly'    => true,
+										),
+										'total' => array(
+											'description' => __( 'Tax total.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+											'readonly'    => true,
+										),
+										'subtotal' => array(
+											'description' => __( 'Tax subtotal.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+											'readonly'    => true,
+										),
+									),
+								),
+							),
+							'meta' => array(
+								'description' => __( 'Line item meta data.', 'woocommerce' ),
+								'type'        => 'array',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+								'items'       => array(
+									'type'       => 'object',
+									'properties' => array(
+										'key' => array(
+											'description' => __( 'Meta key.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+											'readonly'    => true,
+										),
+										'label' => array(
+											'description' => __( 'Meta label.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+											'readonly'    => true,
+										),
+										'value' => array(
+											'description' => __( 'Meta value.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+											'readonly'    => true,
+										),
+									),
+								),
+							),
+						),
+					),
+				),
+				'tax_lines' => array(
+					'description' => __( 'Tax lines data.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Item ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'rate_code' => array(
+								'description' => __( 'Tax rate code.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'rate_id' => array(
+								'description' => __( 'Tax rate ID.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'label' => array(
+								'description' => __( 'Tax rate label.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'compound' => array(
+								'description' => __( 'Show if is a compound tax rate.', 'woocommerce' ),
+								'type'        => 'boolean',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'tax_total' => array(
+								'description' => __( 'Tax total (not including shipping taxes).', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'shipping_tax_total' => array(
+								'description' => __( 'Shipping tax total.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+						),
+					),
+				),
+				'shipping_lines' => array(
+					'description' => __( 'Shipping lines data.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Item ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'method_title' => array(
+								'description' => __( 'Shipping method name.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'method_id' => array(
+								'description' => __( 'Shipping method ID.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'total' => array(
+								'description' => __( 'Line total (after discounts).', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'total_tax' => array(
+								'description' => __( 'Line total tax (after discounts).', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'taxes' => array(
+								'description' => __( 'Line taxes.', 'woocommerce' ),
+								'type'        => 'array',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+								'items'       => array(
+									'type'       => 'object',
+									'properties' => array(
+										'id' => array(
+											'description' => __( 'Tax rate ID.', 'woocommerce' ),
+											'type'        => 'integer',
+											'context'     => array( 'view', 'edit' ),
+											'readonly'    => true,
+										),
+										'total' => array(
+											'description' => __( 'Tax total.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+											'readonly'    => true,
+										),
+									),
+								),
+							),
+						),
+					),
+				),
+				'fee_lines' => array(
+					'description' => __( 'Fee lines data.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Item ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'name' => array(
+								'description' => __( 'Fee name.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'tax_class' => array(
+								'description' => __( 'Tax class of fee.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'tax_status' => array(
+								'description' => __( 'Tax status of fee.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'enum'        => array( 'taxable', 'none' ),
+							),
+							'total' => array(
+								'description' => __( 'Line total (after discounts).', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'total_tax' => array(
+								'description' => __( 'Line total tax (after discounts).', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'taxes' => array(
+								'description' => __( 'Line taxes.', 'woocommerce' ),
+								'type'        => 'array',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+								'items'       => array(
+									'type'       => 'object',
+									'properties' => array(
+										'id' => array(
+											'description' => __( 'Tax rate ID.', 'woocommerce' ),
+											'type'        => 'integer',
+											'context'     => array( 'view', 'edit' ),
+											'readonly'    => true,
+										),
+										'total' => array(
+											'description' => __( 'Tax total.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+											'readonly'    => true,
+										),
+										'subtotal' => array(
+											'description' => __( 'Tax subtotal.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+											'readonly'    => true,
+										),
+									),
+								),
+							),
+						),
+					),
+				),
+				'coupon_lines' => array(
+					'description' => __( 'Coupons line data.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Item ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'code' => array(
+								'description' => __( 'Coupon code.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'discount' => array(
+								'description' => __( 'Discount total.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'discount_tax' => array(
+								'description' => __( 'Discount total tax.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+						),
+					),
+				),
+				'refunds' => array(
+					'description' => __( 'List of refunds.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Refund ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'reason' => array(
+								'description' => __( 'Refund reason.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'total' => array(
+								'description' => __( 'Refund total.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+						),
+					),
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+
+	/**
+	 * Get the query params for collections.
+	 *
+	 * @return array
+	 */
+	public function get_collection_params() {
+		$params = parent::get_collection_params();
+
+		$params['status'] = array(
+			'default'           => 'any',
+			'description'       => __( 'Limit result set to orders assigned a specific status.', 'woocommerce' ),
+			'type'              => 'string',
+			'enum'              => array_merge( array( 'any' ), $this->get_order_statuses() ),
+			'sanitize_callback' => 'sanitize_key',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+		$params['customer'] = array(
+			'description'       => __( 'Limit result set to orders assigned a specific customer.', 'woocommerce' ),
+			'type'              => 'integer',
+			'sanitize_callback' => 'absint',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+		$params['product'] = array(
+			'description'       => __( 'Limit result set to orders assigned a specific product.', 'woocommerce' ),
+			'type'              => 'integer',
+			'sanitize_callback' => 'absint',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+		$params['dp'] = array(
+			'default'           => 2,
+			'description'       => __( 'Number of decimal points to use in each resource.', 'woocommerce' ),
+			'type'              => 'integer',
+			'sanitize_callback' => 'absint',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+
+		return $params;
+	}
+}
diff --git a/includes/api/v1/class-wc-rest-product-attribute-terms-controller.php b/includes/api/v1/class-wc-rest-product-attribute-terms-controller.php
new file mode 100644
index 00000000000..e11ba3dace6
--- /dev/null
+++ b/includes/api/v1/class-wc-rest-product-attribute-terms-controller.php
@@ -0,0 +1,240 @@
+<?php
+/**
+ * REST API Product Attribute Terms controller
+ *
+ * Handles requests to the products/attributes/<attribute_id>/terms endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Product Attribute Terms controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Terms_Controller
+ */
+class WC_REST_Product_Attribute_Terms_V1_Controller extends WC_REST_Terms_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v1';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'products/attributes/(?P<attribute_id>[\d]+)/terms';
+
+	/**
+	 * Register the routes for terms.
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
+			'args' => array(
+				'attribute_id' => array(
+					'description' => __( 'Unique identifier for the attribute of the terms.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+				'args'                => $this->get_collection_params(),
+			),
+			array(
+				'methods'             => WP_REST_Server::CREATABLE,
+				'callback'            => array( $this, 'create_item' ),
+				'permission_callback' => array( $this, 'create_item_permissions_check' ),
+				'args'                => array_merge( $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ), array(
+					'name' => array(
+						'type'        => 'string',
+						'description' => __( 'Name for the resource.', 'woocommerce' ),
+						'required'    => true,
+					),
+				) ),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		));
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
+			'args' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+				'attribute_id' => array(
+					'description' => __( 'Unique identifier for the attribute of the terms.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_item' ),
+				'permission_callback' => array( $this, 'get_item_permissions_check' ),
+				'args'                => array(
+					'context'         => $this->get_context_param( array( 'default' => 'view' ) ),
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'update_item' ),
+				'permission_callback' => array( $this, 'update_item_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			array(
+				'methods'             => WP_REST_Server::DELETABLE,
+				'callback'            => array( $this, 'delete_item' ),
+				'permission_callback' => array( $this, 'delete_item_permissions_check' ),
+				'args'                => array(
+					'force' => array(
+						'default'     => false,
+						'type'        => 'boolean',
+						'description' => __( 'Required to be true, as resource does not support trashing.', 'woocommerce' ),
+					),
+				),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/batch', array(
+			'args' => array(
+				'attribute_id' => array(
+					'description' => __( 'Unique identifier for the attribute of the terms.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'batch_items' ),
+				'permission_callback' => array( $this, 'batch_items_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			'schema' => array( $this, 'get_public_batch_schema' ),
+		) );
+	}
+
+	/**
+	 * Prepare a single product attribute term output for response.
+	 *
+	 * @param WP_Term $item Term object.
+	 * @param WP_REST_Request $request
+	 * @return WP_REST_Response $response
+	 */
+	public function prepare_item_for_response( $item, $request ) {
+		// Get term order.
+		$menu_order = get_woocommerce_term_meta( $item->term_id, 'order_' . $this->taxonomy );
+
+		$data = array(
+			'id'          => (int) $item->term_id,
+			'name'        => $item->name,
+			'slug'        => $item->slug,
+			'description' => $item->description,
+			'menu_order'  => (int) $menu_order,
+			'count'       => (int) $item->count,
+		);
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		$response = rest_ensure_response( $data );
+
+		$response->add_links( $this->prepare_links( $item, $request ) );
+
+		/**
+		 * Filter a term item returned from the API.
+		 *
+		 * Allows modification of the term data right before it is returned.
+		 *
+		 * @param WP_REST_Response  $response  The response object.
+		 * @param object            $item      The original term object.
+		 * @param WP_REST_Request   $request   Request used to generate the response.
+		 */
+		return apply_filters( "woocommerce_rest_prepare_{$this->taxonomy}", $response, $item, $request );
+	}
+
+	/**
+	 * Update term meta fields.
+	 *
+	 * @param WP_Term $term
+	 * @param WP_REST_Request $request
+	 * @return bool|WP_Error
+	 */
+	protected function update_term_meta_fields( $term, $request ) {
+		$id = (int) $term->term_id;
+
+		update_woocommerce_term_meta( $id, 'order_' . $this->taxonomy, $request['menu_order'] );
+
+		return true;
+	}
+
+	/**
+	 * Get the Attribute Term's schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'              => 'http://json-schema.org/draft-04/schema#',
+			'title'                => 'product_attribute_term',
+			'type'                 => 'object',
+			'properties'           => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'name' => array(
+					'description' => __( 'Term name.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'arg_options' => array(
+						'sanitize_callback' => 'sanitize_text_field',
+					),
+				),
+				'slug' => array(
+					'description' => __( 'An alphanumeric identifier for the resource unique to its type.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'arg_options' => array(
+						'sanitize_callback' => 'sanitize_title',
+					),
+				),
+				'description' => array(
+					'description' => __( 'HTML description of the resource.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'arg_options' => array(
+						'sanitize_callback' => 'wp_filter_post_kses',
+					),
+				),
+				'menu_order' => array(
+					'description' => __( 'Menu order, used to custom sort the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'count' => array(
+					'description' => __( 'Number of published products for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+}
diff --git a/includes/api/v1/class-wc-rest-product-attributes-controller.php b/includes/api/v1/class-wc-rest-product-attributes-controller.php
new file mode 100644
index 00000000000..b3a8327c6ed
--- /dev/null
+++ b/includes/api/v1/class-wc-rest-product-attributes-controller.php
@@ -0,0 +1,664 @@
+<?php
+/**
+ * REST API Product Attributes controller
+ *
+ * Handles requests to the products/attributes endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Product Attributes controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Controller
+ */
+class WC_REST_Product_Attributes_V1_Controller extends WC_REST_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v1';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'products/attributes';
+
+	/**
+	 * Attribute name.
+	 *
+	 * @var string
+	 */
+	protected $attribute = '';
+
+	/**
+	 * Register the routes for product attributes.
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+				'args'                => $this->get_collection_params(),
+			),
+			array(
+				'methods'             => WP_REST_Server::CREATABLE,
+				'callback'            => array( $this, 'create_item' ),
+				'permission_callback' => array( $this, 'create_item_permissions_check' ),
+				'args'                => array_merge( $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ), array(
+					'name' => array(
+						'description' => __( 'Name for the resource.', 'woocommerce' ),
+						'type'        => 'string',
+						'required'    => true,
+					),
+				) ),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		));
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
+			'args' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_item' ),
+				'permission_callback' => array( $this, 'get_item_permissions_check' ),
+				'args'                => array(
+					'context'         => $this->get_context_param( array( 'default' => 'view' ) ),
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'update_item' ),
+				'permission_callback' => array( $this, 'update_item_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			array(
+				'methods'             => WP_REST_Server::DELETABLE,
+				'callback'            => array( $this, 'delete_item' ),
+				'permission_callback' => array( $this, 'delete_item_permissions_check' ),
+				'args'                => array(
+					'force' => array(
+						'default'     => true,
+						'type'        => 'boolean',
+						'description' => __( 'Required to be true, as resource does not support trashing.', 'woocommerce' ),
+					),
+				),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/batch', array(
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'batch_items' ),
+				'permission_callback' => array( $this, 'batch_items_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			'schema' => array( $this, 'get_public_batch_schema' ),
+		) );
+	}
+
+	/**
+	 * Check if a given request has access to read the attributes.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_items_permissions_check( $request ) {
+		if ( ! wc_rest_check_manager_permissions( 'attributes', 'read' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot list resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access to create a attribute.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function create_item_permissions_check( $request ) {
+		if ( ! wc_rest_check_manager_permissions( 'attributes', 'create' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_create', __( 'Sorry, you cannot create new resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access to read a attribute.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_item_permissions_check( $request ) {
+		if ( ! $this->get_taxonomy( $request ) ) {
+			return new WP_Error( 'woocommerce_rest_taxonomy_invalid', __( 'Resource does not exist.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		if ( ! wc_rest_check_manager_permissions( 'attributes', 'read' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot view this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access to update a attribute.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function update_item_permissions_check( $request ) {
+		if ( ! $this->get_taxonomy( $request ) ) {
+			return new WP_Error( 'woocommerce_rest_taxonomy_invalid', __( 'Resource does not exist.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		if ( ! wc_rest_check_manager_permissions( 'attributes', 'edit' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_update', __( 'Sorry, you cannot update resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access to delete a attribute.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function delete_item_permissions_check( $request ) {
+		if ( ! $this->get_taxonomy( $request ) ) {
+			return new WP_Error( 'woocommerce_rest_taxonomy_invalid', __( 'Resource does not exist.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		if ( ! wc_rest_check_manager_permissions( 'attributes', 'delete' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_delete', __( 'Sorry, you are not allowed to delete this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access batch create, update and delete items.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return boolean
+	 */
+	public function batch_items_permissions_check( $request ) {
+		if ( ! wc_rest_check_manager_permissions( 'attributes', 'batch' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_batch', __( 'Sorry, you are not allowed to batch manipulate this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get all attributes.
+	 *
+	 * @param WP_REST_Request $request
+	 * @return array
+	 */
+	public function get_items( $request ) {
+		$attributes = wc_get_attribute_taxonomies();
+		$data       = array();
+		foreach ( $attributes as $attribute_obj ) {
+			$attribute = $this->prepare_item_for_response( $attribute_obj, $request );
+			$attribute = $this->prepare_response_for_collection( $attribute );
+			$data[] = $attribute;
+		}
+
+		return rest_ensure_response( $data );
+	}
+
+	/**
+	 * Create a single attribute.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Request|WP_Error
+	 */
+	public function create_item( $request ) {
+		global $wpdb;
+
+		$args = array(
+			'attribute_label'   => $request['name'],
+			'attribute_name'    => wc_sanitize_taxonomy_name( stripslashes( $request['slug'] ) ),
+			'attribute_type'    => ! empty( $request['type'] ) ? $request['type'] : 'select',
+			'attribute_orderby' => ! empty( $request['order_by'] ) ? $request['order_by'] : 'menu_order',
+			'attribute_public'  => true === $request['has_archives'],
+		);
+
+		// Set the attribute slug.
+		if ( empty( $args['attribute_name'] ) ) {
+			$args['attribute_name'] = wc_sanitize_taxonomy_name( stripslashes( $args['attribute_label'] ) );
+		} else {
+			$args['attribute_name'] = preg_replace( '/^pa\_/', '', wc_sanitize_taxonomy_name( stripslashes( $args['attribute_name'] ) ) );
+		}
+
+		$valid_slug = $this->validate_attribute_slug( $args['attribute_name'], true );
+		if ( is_wp_error( $valid_slug ) ) {
+			return $valid_slug;
+		}
+
+		$insert = $wpdb->insert(
+			$wpdb->prefix . 'woocommerce_attribute_taxonomies',
+			$args,
+			array( '%s', '%s', '%s', '%s', '%d' )
+		);
+
+		// Checks for errors.
+		if ( is_wp_error( $insert ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_create', $insert->get_error_message(), array( 'status' => 400 ) );
+		}
+
+		$attribute = $this->get_attribute( $wpdb->insert_id );
+
+		if ( is_wp_error( $attribute ) ) {
+			return $attribute;
+		}
+
+		$this->update_additional_fields_for_object( $attribute, $request );
+
+		/**
+		 * Fires after a single product attribute is created or updated via the REST API.
+		 *
+		 * @param stdObject       $attribute Inserted attribute object.
+		 * @param WP_REST_Request $request   Request object.
+		 * @param boolean         $creating  True when creating attribute, false when updating.
+		 */
+		do_action( 'woocommerce_rest_insert_product_attribute', $attribute, $request, true );
+
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_item_for_response( $attribute, $request );
+		$response = rest_ensure_response( $response );
+		$response->set_status( 201 );
+		$response->header( 'Location', rest_url( '/' . $this->namespace . '/' . $this->rest_base . '/' . $attribute->attribute_id ) );
+
+		// Clear transients.
+		$this->flush_rewrite_rules();
+		delete_transient( 'wc_attribute_taxonomies' );
+
+		return $response;
+	}
+
+	/**
+	 * Get a single attribute.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Request|WP_Error
+	 */
+	public function get_item( $request ) {
+		global $wpdb;
+
+		$attribute = $this->get_attribute( (int) $request['id'] );
+
+		if ( is_wp_error( $attribute ) ) {
+			return $attribute;
+		}
+
+		$response = $this->prepare_item_for_response( $attribute, $request );
+
+		return rest_ensure_response( $response );
+	}
+
+	/**
+	 * Update a single term from a taxonomy.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Request|WP_Error
+	 */
+	public function update_item( $request ) {
+		global $wpdb;
+
+		$id     = (int) $request['id'];
+		$format = array( '%s', '%s', '%s', '%s', '%d' );
+		$args   = array(
+			'attribute_label'   => $request['name'],
+			'attribute_name'    => wc_sanitize_taxonomy_name( stripslashes( $request['slug'] ) ),
+			'attribute_type'    => $request['type'],
+			'attribute_orderby' => $request['order_by'],
+			'attribute_public'  => $request['has_archives'],
+		);
+
+		$i = 0;
+		foreach ( $args as $key => $value ) {
+			if ( empty( $value ) && ! is_bool( $value ) ) {
+				unset( $args[ $key ] );
+				unset( $format[ $i ] );
+			}
+
+			$i++;
+		}
+
+		// Set the attribute slug.
+		if ( ! empty( $args['attribute_name'] ) ) {
+			$args['attribute_name'] = preg_replace( '/^pa\_/', '', wc_sanitize_taxonomy_name( stripslashes( $args['attribute_name'] ) ) );
+
+			$valid_slug = $this->validate_attribute_slug( $args['attribute_name'], false );
+			if ( is_wp_error( $valid_slug ) ) {
+				return $valid_slug;
+			}
+		}
+
+		if ( $args ) {
+			$update = $wpdb->update(
+				$wpdb->prefix . 'woocommerce_attribute_taxonomies',
+				$args,
+				array( 'attribute_id' => $id ),
+				$format,
+				array( '%d' )
+			);
+
+			// Checks for errors.
+			if ( false === $update ) {
+				return new WP_Error( 'woocommerce_rest_cannot_edit', __( 'Could not edit the attribute.', 'woocommerce' ), array( 'status' => 400 ) );
+			}
+		}
+
+		$attribute = $this->get_attribute( $id );
+
+		if ( is_wp_error( $attribute ) ) {
+			return $attribute;
+		}
+
+		$this->update_additional_fields_for_object( $attribute, $request );
+
+		/**
+		 * Fires after a single product attribute is created or updated via the REST API.
+		 *
+		 * @param stdObject       $attribute Inserted attribute object.
+		 * @param WP_REST_Request $request   Request object.
+		 * @param boolean         $creating  True when creating attribute, false when updating.
+		 */
+		do_action( 'woocommerce_rest_insert_product_attribute', $attribute, $request, false );
+
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_item_for_response( $attribute, $request );
+
+		// Clear transients.
+		$this->flush_rewrite_rules();
+		delete_transient( 'wc_attribute_taxonomies' );
+
+		return rest_ensure_response( $response );
+	}
+
+	/**
+	 * Delete a single attribute.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Response|WP_Error
+	 */
+	public function delete_item( $request ) {
+		global $wpdb;
+
+		$force = isset( $request['force'] ) ? (bool) $request['force'] : false;
+
+		// We don't support trashing for this type, error out.
+		if ( ! $force ) {
+			return new WP_Error( 'woocommerce_rest_trash_not_supported', __( 'Resource does not support trashing.', 'woocommerce' ), array( 'status' => 501 ) );
+		}
+
+		$attribute = $this->get_attribute( (int) $request['id'] );
+
+		if ( is_wp_error( $attribute ) ) {
+			return $attribute;
+		}
+
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_item_for_response( $attribute, $request );
+
+		$deleted = $wpdb->delete(
+			$wpdb->prefix . 'woocommerce_attribute_taxonomies',
+			array( 'attribute_id' => $attribute->attribute_id ),
+			array( '%d' )
+		);
+
+		if ( false === $deleted ) {
+			return new WP_Error( 'woocommerce_rest_cannot_delete', __( 'The resource cannot be deleted.', 'woocommerce' ), array( 'status' => 500 ) );
+		}
+
+		$taxonomy = wc_attribute_taxonomy_name( $attribute->attribute_name );
+
+		if ( taxonomy_exists( $taxonomy ) ) {
+			$terms = get_terms( $taxonomy, 'orderby=name&hide_empty=0' );
+			foreach ( $terms as $term ) {
+				wp_delete_term( $term->term_id, $taxonomy );
+			}
+		}
+
+		/**
+		 * Fires after a single attribute is deleted via the REST API.
+		 *
+		 * @param stdObject        $attribute     The deleted attribute.
+		 * @param WP_REST_Response $response The response data.
+		 * @param WP_REST_Request  $request  The request sent to the API.
+		 */
+		do_action( 'woocommerce_rest_delete_product_attribute', $attribute, $response, $request );
+
+		// Fires woocommerce_attribute_deleted hook.
+		do_action( 'woocommerce_attribute_deleted', $attribute->attribute_id, $attribute->attribute_name, $taxonomy );
+
+		// Clear transients.
+		$this->flush_rewrite_rules();
+		delete_transient( 'wc_attribute_taxonomies' );
+
+		return $response;
+	}
+
+	/**
+	 * Prepare a single product attribute output for response.
+	 *
+	 * @param obj $item Term object.
+	 * @param WP_REST_Request $request
+	 * @return WP_REST_Response $response
+	 */
+	public function prepare_item_for_response( $item, $request ) {
+		$data = array(
+			'id'           => (int) $item->attribute_id,
+			'name'         => $item->attribute_label,
+			'slug'         => wc_attribute_taxonomy_name( $item->attribute_name ),
+			'type'         => $item->attribute_type,
+			'order_by'     => $item->attribute_orderby,
+			'has_archives' => (bool) $item->attribute_public,
+		);
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		$response = rest_ensure_response( $data );
+
+		$response->add_links( $this->prepare_links( $item ) );
+
+		/**
+		 * Filter a attribute item returned from the API.
+		 *
+		 * Allows modification of the product attribute data right before it is returned.
+		 *
+		 * @param WP_REST_Response  $response  The response object.
+		 * @param object            $item      The original attribute object.
+		 * @param WP_REST_Request   $request   Request used to generate the response.
+		 */
+		return apply_filters( 'woocommerce_rest_prepare_product_attribute', $response, $item, $request );
+	}
+
+	/**
+	 * Prepare links for the request.
+	 *
+	 * @param object $attribute Attribute object.
+	 * @return array Links for the given attribute.
+	 */
+	protected function prepare_links( $attribute ) {
+		$base  = '/' . $this->namespace . '/' . $this->rest_base;
+		$links = array(
+			'self' => array(
+				'href' => rest_url( trailingslashit( $base ) . $attribute->attribute_id ),
+			),
+			'collection' => array(
+				'href' => rest_url( $base ),
+			),
+		);
+
+		return $links;
+	}
+
+	/**
+	 * Get the Attribute's schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'              => 'http://json-schema.org/draft-04/schema#',
+			'title'                => 'product_attribute',
+			'type'                 => 'object',
+			'properties'           => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'name' => array(
+					'description' => __( 'Attribute name.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'arg_options' => array(
+						'sanitize_callback' => 'sanitize_text_field',
+					),
+				),
+				'slug' => array(
+					'description' => __( 'An alphanumeric identifier for the resource unique to its type.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'arg_options' => array(
+						'sanitize_callback' => 'sanitize_title',
+					),
+				),
+				'type' => array(
+					'description' => __( 'Type of attribute.', 'woocommerce' ),
+					'type'        => 'string',
+					'default'     => 'select',
+					'enum'        => array_keys( wc_get_attribute_types() ),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'order_by' => array(
+					'description' => __( 'Default sort order.', 'woocommerce' ),
+					'type'        => 'string',
+					'default'     => 'menu_order',
+					'enum'        => array( 'menu_order', 'name', 'name_num', 'id' ),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'has_archives' => array(
+					'description' => __( 'Enable/Disable attribute archives.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => false,
+					'context'     => array( 'view', 'edit' ),
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+
+	/**
+	 * Get the query params for collections
+	 *
+	 * @return array
+	 */
+	public function get_collection_params() {
+		$params = array();
+		$params['context'] = $this->get_context_param( array( 'default' => 'view' ) );
+
+		return $params;
+	}
+
+	/**
+	 * Get attribute name.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return string
+	 */
+	protected function get_taxonomy( $request ) {
+		if ( '' !== $this->attribute ) {
+			return $this->attribute;
+		}
+
+		if ( $request['id'] ) {
+			$name = wc_attribute_taxonomy_name_by_id( (int) $request['id'] );
+
+			$this->attribute = $name;
+		}
+
+		return $this->attribute;
+	}
+
+	/**
+	 * Get attribute data.
+	 *
+	 * @param int $id Attribute ID.
+	 * @return stdClass|WP_Error
+	 */
+	protected function get_attribute( $id ) {
+		global $wpdb;
+
+		$attribute = $wpdb->get_row( $wpdb->prepare( "
+			SELECT *
+			FROM {$wpdb->prefix}woocommerce_attribute_taxonomies
+			WHERE attribute_id = %d
+		 ", $id ) );
+
+		if ( is_wp_error( $attribute ) || is_null( $attribute ) ) {
+			return new WP_Error( 'woocommerce_rest_attribute_invalid', __( 'Resource does not exist.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		return $attribute;
+	}
+
+	/**
+	 * Validate attribute slug.
+	 *
+	 * @param string $slug
+	 * @param bool $new_data
+	 * @return bool|WP_Error
+	 */
+	protected function validate_attribute_slug( $slug, $new_data = true ) {
+		if ( strlen( $slug ) >= 28 ) {
+			return new WP_Error( 'woocommerce_rest_invalid_product_attribute_slug_too_long', sprintf( __( 'Slug "%s" is too long (28 characters max). Shorten it, please.', 'woocommerce' ), $slug ), array( 'status' => 400 ) );
+		} elseif ( wc_check_if_attribute_name_is_reserved( $slug ) ) {
+			return new WP_Error( 'woocommerce_rest_invalid_product_attribute_slug_reserved_name', sprintf( __( 'Slug "%s" is not allowed because it is a reserved term. Change it, please.', 'woocommerce' ), $slug ), array( 'status' => 400 ) );
+		} elseif ( $new_data && taxonomy_exists( wc_attribute_taxonomy_name( $slug ) ) ) {
+			return new WP_Error( 'woocommerce_rest_invalid_product_attribute_slug_already_exists', sprintf( __( 'Slug "%s" is already in use. Change it, please.', 'woocommerce' ), $slug ), array( 'status' => 400 ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Schedule to flush rewrite rules.
+	 *
+	 * @since 3.0.0
+	 */
+	protected function flush_rewrite_rules() {
+		wp_schedule_single_event( time(), 'woocommerce_flush_rewrite_rules' );
+	}
+}
diff --git a/includes/api/v1/class-wc-rest-product-categories-controller.php b/includes/api/v1/class-wc-rest-product-categories-controller.php
new file mode 100644
index 00000000000..182dc482bb2
--- /dev/null
+++ b/includes/api/v1/class-wc-rest-product-categories-controller.php
@@ -0,0 +1,267 @@
+<?php
+/**
+ * REST API Product Categories controller
+ *
+ * Handles requests to the products/categories endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Product Categories controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Terms_Controller
+ */
+class WC_REST_Product_Categories_V1_Controller extends WC_REST_Terms_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v1';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'products/categories';
+
+	/**
+	 * Taxonomy.
+	 *
+	 * @var string
+	 */
+	protected $taxonomy = 'product_cat';
+
+	/**
+	 * Prepare a single product category output for response.
+	 *
+	 * @param WP_Term $item Term object.
+	 * @param WP_REST_Request $request
+	 * @return WP_REST_Response $response
+	 */
+	public function prepare_item_for_response( $item, $request ) {
+		// Get category display type.
+		$display_type = get_woocommerce_term_meta( $item->term_id, 'display_type' );
+
+		// Get category order.
+		$menu_order = get_woocommerce_term_meta( $item->term_id, 'order' );
+
+		$data = array(
+			'id'          => (int) $item->term_id,
+			'name'        => $item->name,
+			'slug'        => $item->slug,
+			'parent'      => (int) $item->parent,
+			'description' => $item->description,
+			'display'     => $display_type ? $display_type : 'default',
+			'image'       => array(),
+			'menu_order'  => (int) $menu_order,
+			'count'       => (int) $item->count,
+		);
+
+		// Get category image.
+		if ( $image_id = get_woocommerce_term_meta( $item->term_id, 'thumbnail_id' ) ) {
+			$attachment = get_post( $image_id );
+
+			$data['image'] = array(
+				'id'            => (int) $image_id,
+				'date_created'  => wc_rest_prepare_date_response( $attachment->post_date_gmt ),
+				'date_modified' => wc_rest_prepare_date_response( $attachment->post_modified_gmt ),
+				'src'           => wp_get_attachment_url( $image_id ),
+				'title'         => get_the_title( $attachment ),
+				'alt'           => get_post_meta( $image_id, '_wp_attachment_image_alt', true ),
+			);
+		}
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		$response = rest_ensure_response( $data );
+
+		$response->add_links( $this->prepare_links( $item, $request ) );
+
+		/**
+		 * Filter a term item returned from the API.
+		 *
+		 * Allows modification of the term data right before it is returned.
+		 *
+		 * @param WP_REST_Response  $response  The response object.
+		 * @param object            $item      The original term object.
+		 * @param WP_REST_Request   $request   Request used to generate the response.
+		 */
+		return apply_filters( "woocommerce_rest_prepare_{$this->taxonomy}", $response, $item, $request );
+	}
+
+	/**
+	 * Update term meta fields.
+	 *
+	 * @param WP_Term $term
+	 * @param WP_REST_Request $request
+	 * @return bool|WP_Error
+	 */
+	protected function update_term_meta_fields( $term, $request ) {
+		$id = (int) $term->term_id;
+
+		if ( isset( $request['display'] ) ) {
+			update_woocommerce_term_meta( $id, 'display_type', 'default' === $request['display'] ? '' : $request['display'] );
+		}
+
+		if ( isset( $request['menu_order'] ) ) {
+			update_woocommerce_term_meta( $id, 'order', $request['menu_order'] );
+		}
+
+		if ( isset( $request['image'] ) ) {
+			if ( empty( $request['image']['id'] ) && ! empty( $request['image']['src'] ) ) {
+				$upload = wc_rest_upload_image_from_url( esc_url_raw( $request['image']['src'] ) );
+
+				if ( is_wp_error( $upload ) ) {
+					return $upload;
+				}
+
+				$image_id = wc_rest_set_uploaded_image_as_attachment( $upload );
+			} else {
+				$image_id = isset( $request['image']['id'] ) ? absint( $request['image']['id'] ) : 0;
+			}
+
+			// Check if image_id is a valid image attachment before updating the term meta.
+			if ( $image_id && wp_attachment_is_image( $image_id ) ) {
+				update_woocommerce_term_meta( $id, 'thumbnail_id', $image_id );
+
+				// Set the image alt.
+				if ( ! empty( $request['image']['alt'] ) ) {
+					update_post_meta( $image_id, '_wp_attachment_image_alt', wc_clean( $request['image']['alt'] ) );
+				}
+
+				// Set the image title.
+				if ( ! empty( $request['image']['title'] ) ) {
+					wp_update_post( array( 'ID' => $image_id, 'post_title' => wc_clean( $request['image']['title'] ) ) );
+				}
+			} else {
+				delete_woocommerce_term_meta( $id, 'thumbnail_id' );
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get the Category schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'              => 'http://json-schema.org/draft-04/schema#',
+			'title'                => $this->taxonomy,
+			'type'                 => 'object',
+			'properties'           => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'name' => array(
+					'description' => __( 'Category name.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'arg_options' => array(
+						'sanitize_callback' => 'sanitize_text_field',
+					),
+				),
+				'slug' => array(
+					'description' => __( 'An alphanumeric identifier for the resource unique to its type.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'arg_options' => array(
+						'sanitize_callback' => 'sanitize_title',
+					),
+				),
+				'parent' => array(
+					'description' => __( 'The ID for the parent of the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'description' => array(
+					'description' => __( 'HTML description of the resource.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'arg_options' => array(
+						'sanitize_callback' => 'wp_filter_post_kses',
+					),
+				),
+				'display' => array(
+					'description' => __( 'Category archive display type.', 'woocommerce' ),
+					'type'        => 'string',
+					'default'     => 'default',
+					'enum'        => array( 'default', 'products', 'subcategories', 'both' ),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'image' => array(
+					'description' => __( 'Image data.', 'woocommerce' ),
+					'type'        => 'object',
+					'context'     => array( 'view', 'edit' ),
+					'properties'  => array(
+						'id' => array(
+							'description' => __( 'Image ID.', 'woocommerce' ),
+							'type'        => 'integer',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'date_created' => array(
+							'description' => __( "The date the image was created, in the site's timezone.", 'woocommerce' ),
+							'type'        => 'date-time',
+							'context'     => array( 'view', 'edit' ),
+							'readonly'    => true,
+						),
+						'date_modified' => array(
+							'description' => __( "The date the image was last modified, in the site's timezone.", 'woocommerce' ),
+							'type'        => 'date-time',
+							'context'     => array( 'view', 'edit' ),
+							'readonly'    => true,
+						),
+						'src' => array(
+							'description' => __( 'Image URL.', 'woocommerce' ),
+							'type'        => 'string',
+							'format'      => 'uri',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'name' => array(
+							'description' => __( 'Image name.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'alt' => array(
+							'description' => __( 'Image alternative text.', 'woocommerce' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+					),
+				),
+				'menu_order' => array(
+					'description' => __( 'Menu order, used to custom sort the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'count' => array(
+					'description' => __( 'Number of published products for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+}
diff --git a/includes/api/v1/class-wc-rest-product-reviews-controller.php b/includes/api/v1/class-wc-rest-product-reviews-controller.php
new file mode 100644
index 00000000000..ab8e6aa499c
--- /dev/null
+++ b/includes/api/v1/class-wc-rest-product-reviews-controller.php
@@ -0,0 +1,568 @@
+<?php
+/**
+ * REST API Product Reviews Controller
+ *
+ * Handles requests to /products/<product_id>/reviews.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Product Reviews Controller Class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Controller
+ */
+class WC_REST_Product_Reviews_V1_Controller extends WC_REST_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v1';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'products/(?P<product_id>[\d]+)/reviews';
+
+	/**
+	 * Register the routes for product reviews.
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
+			'args' => array(
+				'product_id' => array(
+					'description' => __( 'Unique identifier for the variable product.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+				'id' => array(
+					'description' => __( 'Unique identifier for the variation.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+				'args'                => $this->get_collection_params(),
+			),
+			array(
+				'methods'             => WP_REST_Server::CREATABLE,
+				'callback'            => array( $this, 'create_item' ),
+				'permission_callback' => array( $this, 'create_item_permissions_check' ),
+				'args'                => array_merge( $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ), array(
+					'review' => array(
+						'required'    => true,
+						'type'        => 'string',
+						'description' => __( 'Review content.', 'woocommerce' ),
+					),
+					'name' => array(
+						'required'    => true,
+						'type'        => 'string',
+						'description' => __( 'Name of the reviewer.', 'woocommerce' ),
+					),
+					'email' => array(
+						'required'    => true,
+						'type'        => 'string',
+						'description' => __( 'Email of the reviewer.', 'woocommerce' ),
+					),
+				) ),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
+			'args' => array(
+				'product_id' => array(
+					'description' => __( 'Unique identifier for the variable product.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_item' ),
+				'permission_callback' => array( $this, 'get_item_permissions_check' ),
+				'args'                => array(
+					'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'update_item' ),
+				'permission_callback' => array( $this, 'update_item_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			array(
+				'methods'             => WP_REST_Server::DELETABLE,
+				'callback'            => array( $this, 'delete_item' ),
+				'permission_callback' => array( $this, 'delete_item_permissions_check' ),
+				'args'                => array(
+					'force' => array(
+						'default'     => false,
+						'type'        => 'boolean',
+						'description' => __( 'Whether to bypass trash and force deletion.', 'woocommerce' ),
+					),
+				),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+	}
+
+	/**
+	 * Check whether a given request has permission to read webhook deliveries.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_items_permissions_check( $request ) {
+		if ( ! wc_rest_check_post_permissions( 'product', 'read' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot list resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access to read a product review.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_item_permissions_check( $request ) {
+		$post = get_post( (int) $request['product_id'] );
+
+		if ( $post && ! wc_rest_check_post_permissions( 'product', 'read', $post->ID ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot view this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access to create a new product review.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function create_item_permissions_check( $request ) {
+		$post = get_post( (int) $request['product_id'] );
+		if ( $post && ! wc_rest_check_post_permissions( 'product', 'create', $post->ID ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_create', __( 'Sorry, you are not allowed to create resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access to update a product review.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function update_item_permissions_check( $request ) {
+		$post = get_post( (int) $request['product_id'] );
+		if ( $post && ! wc_rest_check_post_permissions( 'product', 'edit', $post->ID ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_edit', __( 'Sorry, you cannot edit this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access to delete a product review.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function delete_item_permissions_check( $request ) {
+		$post = get_post( (int) $request['product_id'] );
+		if ( $post && ! wc_rest_check_post_permissions( 'product', 'delete', $post->ID ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_edit', __( 'Sorry, you cannot delete this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+		return true;
+	}
+
+	/**
+	 * Get all reviews from a product.
+	 *
+	 * @param WP_REST_Request $request
+	 * @return array
+	 */
+	public function get_items( $request ) {
+		$product_id = (int) $request['product_id'];
+
+		if ( 'product' !== get_post_type( $product_id ) ) {
+			return new WP_Error( 'woocommerce_rest_product_invalid_id', __( 'Invalid product ID.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$reviews = get_approved_comments( $product_id );
+		$data    = array();
+		foreach ( $reviews as $review_data ) {
+			$review = $this->prepare_item_for_response( $review_data, $request );
+			$review = $this->prepare_response_for_collection( $review );
+			$data[] = $review;
+		}
+
+		return rest_ensure_response( $data );
+	}
+
+	/**
+	 * Get a single product review.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function get_item( $request ) {
+		$id         = (int) $request['id'];
+		$product_id = (int) $request['product_id'];
+
+		if ( 'product' !== get_post_type( $product_id ) ) {
+			return new WP_Error( 'woocommerce_rest_product_invalid_id', __( 'Invalid product ID.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$review = get_comment( $id );
+
+		if ( empty( $id ) || empty( $review ) || intval( $review->comment_post_ID ) !== $product_id ) {
+			return new WP_Error( 'woocommerce_rest_invalid_id', __( 'Invalid resource ID.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$delivery = $this->prepare_item_for_response( $review, $request );
+		$response = rest_ensure_response( $delivery );
+
+		return $response;
+	}
+
+
+	/**
+	 * Create a product review.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function create_item( $request ) {
+		$product_id = (int) $request['product_id'];
+
+		if ( 'product' !== get_post_type( $product_id ) ) {
+			return new WP_Error( 'woocommerce_rest_product_invalid_id', __( 'Invalid product ID.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$prepared_review = $this->prepare_item_for_database( $request );
+
+		/**
+		 * Filter a product review (comment) before it is inserted via the REST API.
+		 *
+		 * Allows modification of the comment right before it is inserted via `wp_insert_comment`.
+		 *
+		 * @param array           $prepared_review The prepared comment data for `wp_insert_comment`.
+		 * @param WP_REST_Request $request          Request used to insert the comment.
+		 */
+		$prepared_review = apply_filters( 'rest_pre_insert_product_review', $prepared_review, $request );
+
+		$product_review_id = wp_insert_comment( $prepared_review );
+		if ( ! $product_review_id ) {
+			return new WP_Error( 'rest_product_review_failed_create', __( 'Creating product review failed.', 'woocommerce' ), array( 'status' => 500 ) );
+		}
+
+		update_comment_meta( $product_review_id, 'rating', ( ! empty( $request['rating'] ) ? $request['rating'] : '0' ) );
+
+		$product_review = get_comment( $product_review_id );
+		$this->update_additional_fields_for_object( $product_review, $request );
+
+		/**
+		 * Fires after a single item is created or updated via the REST API.
+		 *
+		 * @param WP_Comment      $product_review Inserted object.
+		 * @param WP_REST_Request $request        Request object.
+		 * @param boolean         $creating       True when creating item, false when updating.
+		 */
+		do_action( "woocommerce_rest_insert_product_review", $product_review, $request, true );
+
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_item_for_response( $product_review, $request );
+		$response = rest_ensure_response( $response );
+		$response->set_status( 201 );
+		$base = str_replace( '(?P<product_id>[\d]+)', $product_id, $this->rest_base );
+		$response->header( 'Location', rest_url( sprintf( '/%s/%s/%d', $this->namespace, $base, $product_review_id ) ) );
+
+		return $response;
+	}
+
+	/**
+	 * Update a single product review.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function update_item( $request ) {
+		$product_review_id = (int) $request['id'];
+		$product_id        = (int) $request['product_id'];
+
+		if ( 'product' !== get_post_type( $product_id ) ) {
+			return new WP_Error( 'woocommerce_rest_product_invalid_id', __( 'Invalid product ID.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$review = get_comment( $product_review_id );
+
+		if ( empty( $product_review_id ) || empty( $review ) || intval( $review->comment_post_ID ) !== $product_id ) {
+			return new WP_Error( 'woocommerce_rest_product_review_invalid_id', __( 'Invalid resource ID.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$prepared_review = $this->prepare_item_for_database( $request );
+
+		$updated = wp_update_comment( $prepared_review );
+		if ( 0 === $updated ) {
+			return new WP_Error( 'rest_product_review_failed_edit', __( 'Updating product review failed.', 'woocommerce' ), array( 'status' => 500 ) );
+		}
+
+		if ( ! empty( $request['rating'] ) ) {
+			update_comment_meta( $product_review_id, 'rating', $request['rating'] );
+		}
+
+		$product_review = get_comment( $product_review_id );
+		$this->update_additional_fields_for_object( $product_review, $request );
+
+		/**
+		 * Fires after a single item is created or updated via the REST API.
+		 *
+		 * @param WP_Comment         $comment      Inserted object.
+		 * @param WP_REST_Request $request   Request object.
+		 * @param boolean         $creating  True when creating item, false when updating.
+		 */
+		do_action( "woocommerce_rest_insert_product_review", $product_review, $request, true );
+
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_item_for_response( $product_review, $request );
+
+		return rest_ensure_response( $response );
+	}
+
+	/**
+	 * Delete a product review.
+	 *
+	 * @param WP_REST_Request $request Full details about the request
+	 * @return WP_Error|boolean
+	 */
+	public function delete_item( $request ) {
+		$product_review_id = absint( is_array( $request['id'] ) ? $request['id']['id'] : $request['id'] );
+		$force             = isset( $request['force'] ) ? (bool) $request['force']     : false;
+
+		$product_review = get_comment( $product_review_id );
+		if ( empty( $product_review_id ) || empty( $product_review->comment_ID ) || empty( $product_review->comment_post_ID ) ) {
+			return new WP_Error( 'woocommerce_rest_product_review_invalid_id', __( 'Invalid product review ID.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		/**
+		 * Filter whether a product review is trashable.
+		 *
+		 * Return false to disable trash support for the product review.
+		 *
+		 * @param boolean $supports_trash        Whether the object supports trashing.
+		 * @param WP_Post $product_review        The object being considered for trashing support.
+		 */
+		$supports_trash = apply_filters( 'rest_product_review_trashable', ( EMPTY_TRASH_DAYS > 0 ), $product_review );
+
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_item_for_response( $product_review, $request );
+
+		if ( $force ) {
+			$result = wp_delete_comment( $product_review_id, true );
+		} else {
+			if ( ! $supports_trash ) {
+				return new WP_Error( 'rest_trash_not_supported', __( 'The product review does not support trashing.', 'woocommerce' ), array( 'status' => 501 ) );
+			}
+
+			if ( 'trash' === $product_review->comment_approved ) {
+				return new WP_Error( 'rest_already_trashed', __( 'The comment has already been trashed.', 'woocommerce' ), array( 'status' => 410 ) );
+			}
+
+			$result = wp_trash_comment( $product_review->comment_ID );
+		}
+
+		if ( ! $result ) {
+			return new WP_Error( 'rest_cannot_delete', __( 'The product review cannot be deleted.', 'woocommerce' ), array( 'status' => 500 ) );
+		}
+
+		/**
+		 * Fires after a product review is deleted via the REST API.
+		 *
+		 * @param object           $product_review  The deleted item.
+		 * @param WP_REST_Response $response        The response data.
+		 * @param WP_REST_Request  $request         The request sent to the API.
+		 */
+		do_action( 'rest_delete_product_review', $product_review, $response, $request );
+
+		return $response;
+	}
+
+	/**
+	 * Prepare a single product review output for response.
+	 *
+	 * @param WP_Comment $review Product review object.
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response $response Response data.
+	 */
+	public function prepare_item_for_response( $review, $request ) {
+		$data = array(
+			'id'           => (int) $review->comment_ID,
+			'date_created' => wc_rest_prepare_date_response( $review->comment_date_gmt ),
+			'review'       => $review->comment_content,
+			'rating'       => (int) get_comment_meta( $review->comment_ID, 'rating', true ),
+			'name'         => $review->comment_author,
+			'email'        => $review->comment_author_email,
+			'verified'     => wc_review_is_from_verified_owner( $review->comment_ID ),
+		);
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		// Wrap the data in a response object.
+		$response = rest_ensure_response( $data );
+
+		$response->add_links( $this->prepare_links( $review, $request ) );
+
+		/**
+		 * Filter product reviews object returned from the REST API.
+		 *
+		 * @param WP_REST_Response $response The response object.
+		 * @param WP_Comment       $review   Product review object used to create response.
+		 * @param WP_REST_Request  $request  Request object.
+		 */
+		return apply_filters( 'woocommerce_rest_prepare_product_review', $response, $review, $request );
+	}
+
+	/**
+	 * Prepare a single product review to be inserted into the database.
+	 *
+	 * @param  WP_REST_Request $request Request object.
+	 * @return array|WP_Error  $prepared_review
+	 */
+	protected function prepare_item_for_database( $request ) {
+		$prepared_review = array( 'comment_approved' => 1, 'comment_type' => 'review' );
+
+		if ( isset( $request['id'] ) ) {
+			$prepared_review['comment_ID'] = (int) $request['id'];
+		}
+
+		if ( isset( $request['review'] ) ) {
+			$prepared_review['comment_content'] = $request['review'];
+		}
+
+		if ( isset( $request['product_id'] ) ) {
+			$prepared_review['comment_post_ID'] = (int) $request['product_id'];
+		}
+
+		if ( isset( $request['name'] ) ) {
+			$prepared_review['comment_author'] = $request['name'];
+		}
+
+		if ( isset( $request['email'] ) ) {
+			$prepared_review['comment_author_email'] = $request['email'];
+		}
+
+		return apply_filters( 'rest_preprocess_product_review', $prepared_review, $request );
+	}
+
+	/**
+	 * Prepare links for the request.
+	 *
+	 * @param WP_Comment $review Product review object.
+	 * @param WP_REST_Request $request Request object.
+	 * @return array Links for the given product review.
+	 */
+	protected function prepare_links( $review, $request ) {
+		$product_id = (int) $request['product_id'];
+		$base       = str_replace( '(?P<product_id>[\d]+)', $product_id, $this->rest_base );
+		$links      = array(
+			'self' => array(
+				'href' => rest_url( sprintf( '/%s/%s/%d', $this->namespace, $base, $review->comment_ID ) ),
+			),
+			'collection' => array(
+				'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $base ) ),
+			),
+			'up' => array(
+				'href' => rest_url( sprintf( '/%s/products/%d', $this->namespace, $product_id ) ),
+			),
+		);
+
+		return $links;
+	}
+
+	/**
+	 * Get the Product Review's schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'product_review',
+			'type'       => 'object',
+			'properties' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'review' => array(
+					'description' => __( 'The content of the review.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'date_created' => array(
+					'description' => __( "The date the review was created, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'rating' => array(
+					'description' => __( 'Review rating (0 to 5).', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'name' => array(
+					'description' => __( 'Reviewer name.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'email' => array(
+					'description' => __( 'Reviewer email.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'verified' => array(
+					'description' => __( 'Shows if the reviewer bought the product or not.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+
+	/**
+	 * Get the query params for collections.
+	 *
+	 * @return array
+	 */
+	public function get_collection_params() {
+		return array(
+			'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+		);
+	}
+}
diff --git a/includes/api/v1/class-wc-rest-product-shipping-classes-controller.php b/includes/api/v1/class-wc-rest-product-shipping-classes-controller.php
new file mode 100644
index 00000000000..445c109df27
--- /dev/null
+++ b/includes/api/v1/class-wc-rest-product-shipping-classes-controller.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * REST API Product Shipping Classes controller
+ *
+ * Handles requests to the products/shipping_classes endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Product Shipping Classes controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Terms_Controller
+ */
+class WC_REST_Product_Shipping_Classes_V1_Controller extends WC_REST_Terms_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v1';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'products/shipping_classes';
+
+	/**
+	 * Taxonomy.
+	 *
+	 * @var string
+	 */
+	protected $taxonomy = 'product_shipping_class';
+
+	/**
+	 * Prepare a single product shipping class output for response.
+	 *
+	 * @param obj $item Term object.
+	 * @param WP_REST_Request $request
+	 * @return WP_REST_Response $response
+	 */
+	public function prepare_item_for_response( $item, $request ) {
+		$data = array(
+			'id'          => (int) $item->term_id,
+			'name'        => $item->name,
+			'slug'        => $item->slug,
+			'description' => $item->description,
+			'count'       => (int) $item->count,
+		);
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		$response = rest_ensure_response( $data );
+
+		$response->add_links( $this->prepare_links( $item, $request ) );
+
+		/**
+		 * Filter a term item returned from the API.
+		 *
+		 * Allows modification of the term data right before it is returned.
+		 *
+		 * @param WP_REST_Response  $response  The response object.
+		 * @param object            $item      The original term object.
+		 * @param WP_REST_Request   $request   Request used to generate the response.
+		 */
+		return apply_filters( "woocommerce_rest_prepare_{$this->taxonomy}", $response, $item, $request );
+	}
+
+	/**
+	 * Get the Shipping Class schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'              => 'http://json-schema.org/draft-04/schema#',
+			'title'                => $this->taxonomy,
+			'type'                 => 'object',
+			'properties'           => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'name' => array(
+					'description' => __( 'Shipping class name.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'arg_options' => array(
+						'sanitize_callback' => 'sanitize_text_field',
+					),
+				),
+				'slug' => array(
+					'description' => __( 'An alphanumeric identifier for the resource unique to its type.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'arg_options' => array(
+						'sanitize_callback' => 'sanitize_title',
+					),
+				),
+				'description' => array(
+					'description' => __( 'HTML description of the resource.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'arg_options' => array(
+						'sanitize_callback' => 'wp_filter_post_kses',
+					),
+				),
+				'count' => array(
+					'description' => __( 'Number of published products for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+}
diff --git a/includes/api/v1/class-wc-rest-product-tags-controller.php b/includes/api/v1/class-wc-rest-product-tags-controller.php
new file mode 100644
index 00000000000..accdfae4c63
--- /dev/null
+++ b/includes/api/v1/class-wc-rest-product-tags-controller.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * REST API Product Tags controller
+ *
+ * Handles requests to the products/tags endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Product Tags controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Terms_Controller
+ */
+class WC_REST_Product_Tags_V1_Controller extends WC_REST_Terms_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v1';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'products/tags';
+
+	/**
+	 * Taxonomy.
+	 *
+	 * @var string
+	 */
+	protected $taxonomy = 'product_tag';
+
+	/**
+	 * Prepare a single product tag output for response.
+	 *
+	 * @param obj $item Term object.
+	 * @param WP_REST_Request $request
+	 * @return WP_REST_Response $response
+	 */
+	public function prepare_item_for_response( $item, $request ) {
+		$data = array(
+			'id'          => (int) $item->term_id,
+			'name'        => $item->name,
+			'slug'        => $item->slug,
+			'description' => $item->description,
+			'count'       => (int) $item->count,
+		);
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		$response = rest_ensure_response( $data );
+
+		$response->add_links( $this->prepare_links( $item, $request ) );
+
+		/**
+		 * Filter a term item returned from the API.
+		 *
+		 * Allows modification of the term data right before it is returned.
+		 *
+		 * @param WP_REST_Response  $response  The response object.
+		 * @param object            $item      The original term object.
+		 * @param WP_REST_Request   $request   Request used to generate the response.
+		 */
+		return apply_filters( "woocommerce_rest_prepare_{$this->taxonomy}", $response, $item, $request );
+	}
+
+	/**
+	 * Get the Tag's schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'              => 'http://json-schema.org/draft-04/schema#',
+			'title'                => $this->taxonomy,
+			'type'                 => 'object',
+			'properties'           => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'name' => array(
+					'description' => __( 'Tag name.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'arg_options' => array(
+						'sanitize_callback' => 'sanitize_text_field',
+					),
+				),
+				'slug' => array(
+					'description' => __( 'An alphanumeric identifier for the resource unique to its type.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'arg_options' => array(
+						'sanitize_callback' => 'sanitize_title',
+					),
+				),
+				'description' => array(
+					'description' => __( 'HTML description of the resource.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'arg_options' => array(
+						'sanitize_callback' => 'wp_filter_post_kses',
+					),
+				),
+				'count' => array(
+					'description' => __( 'Number of published products for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+}
diff --git a/includes/api/v1/class-wc-rest-products-controller.php b/includes/api/v1/class-wc-rest-products-controller.php
new file mode 100644
index 00000000000..26d907fd6c3
--- /dev/null
+++ b/includes/api/v1/class-wc-rest-products-controller.php
@@ -0,0 +1,2640 @@
+<?php
+/**
+ * REST API Products controller
+ *
+ * Handles requests to the /products endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Products controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Posts_Controller
+ */
+class WC_REST_Products_V1_Controller extends WC_REST_Posts_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v1';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'products';
+
+	/**
+	 * Post type.
+	 *
+	 * @var string
+	 */
+	protected $post_type = 'product';
+
+	/**
+	 * Initialize product actions.
+	 */
+	public function __construct() {
+		add_filter( "woocommerce_rest_{$this->post_type}_query", array( $this, 'query_args' ), 10, 2 );
+		add_action( "woocommerce_rest_insert_{$this->post_type}", array( $this, 'clear_transients' ) );
+	}
+
+	/**
+	 * Register the routes for products.
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+				'args'                => $this->get_collection_params(),
+			),
+			array(
+				'methods'             => WP_REST_Server::CREATABLE,
+				'callback'            => array( $this, 'create_item' ),
+				'permission_callback' => array( $this, 'create_item_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
+			'args' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_item' ),
+				'permission_callback' => array( $this, 'get_item_permissions_check' ),
+				'args'                => array(
+					'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'update_item' ),
+				'permission_callback' => array( $this, 'update_item_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			array(
+				'methods'             => WP_REST_Server::DELETABLE,
+				'callback'            => array( $this, 'delete_item' ),
+				'permission_callback' => array( $this, 'delete_item_permissions_check' ),
+				'args'                => array(
+					'force' => array(
+						'default'     => false,
+						'description' => __( 'Whether to bypass trash and force deletion.', 'woocommerce' ),
+						'type'        => 'boolean',
+					),
+				),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/batch', array(
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'batch_items' ),
+				'permission_callback' => array( $this, 'batch_items_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			'schema' => array( $this, 'get_public_batch_schema' ),
+		) );
+	}
+
+	/**
+	 * Get post types.
+	 *
+	 * @return array
+	 */
+	protected function get_post_types() {
+		return array( 'product', 'product_variation' );
+	}
+
+	/**
+	 * Query args.
+	 *
+	 * @param array           $args    Request args.
+	 * @param WP_REST_Request $request Request data.
+	 * @return array
+	 */
+	public function query_args( $args, $request ) {
+		// Set post_status.
+		$args['post_status'] = $request['status'];
+
+		// Taxonomy query to filter products by type, category,
+		// tag, shipping class, and attribute.
+		$tax_query = array();
+
+		// Map between taxonomy name and arg's key.
+		$taxonomies = array(
+			'product_cat'            => 'category',
+			'product_tag'            => 'tag',
+			'product_shipping_class' => 'shipping_class',
+		);
+
+		// Set tax_query for each passed arg.
+		foreach ( $taxonomies as $taxonomy => $key ) {
+			if ( ! empty( $request[ $key ] ) && is_array( $request[ $key ] ) ) {
+				$request[ $key ] = array_filter( $request[ $key ] );
+			}
+
+			if ( ! empty( $request[ $key ] ) ) {
+				$tax_query[] = array(
+					'taxonomy' => $taxonomy,
+					'field'    => 'term_id',
+					'terms'    => $request[ $key ],
+				);
+			}
+		}
+
+		// Filter product type by slug.
+		if ( ! empty( $request['type'] ) ) {
+			$tax_query[] = array(
+				'taxonomy' => 'product_type',
+				'field'    => 'slug',
+				'terms'    => $request['type'],
+			);
+		}
+
+		// Filter by attribute and term.
+		if ( ! empty( $request['attribute'] ) && ! empty( $request['attribute_term'] ) ) {
+			if ( in_array( $request['attribute'], wc_get_attribute_taxonomy_names(), true ) ) {
+				$tax_query[] = array(
+					'taxonomy' => $request['attribute'],
+					'field'    => 'term_id',
+					'terms'    => $request['attribute_term'],
+				);
+			}
+		}
+
+		if ( ! empty( $tax_query ) ) {
+			$args['tax_query'] = $tax_query;
+		}
+
+		// Filter by sku.
+		if ( ! empty( $request['sku'] ) ) {
+			$skus = explode( ',', $request['sku'] );
+			// Include the current string as a SKU too.
+			if ( 1 < count( $skus ) ) {
+				$skus[] = $request['sku'];
+			}
+
+			$args['meta_query'] = $this->add_meta_query( $args, array(
+				'key'     => '_sku',
+				'value'   => $skus,
+				'compare' => 'IN',
+			) );
+		}
+
+		// Apply all WP_Query filters again.
+		if ( is_array( $request['filter'] ) ) {
+			$args = array_merge( $args, $request['filter'] );
+			unset( $args['filter'] );
+		}
+
+		// Force the post_type argument, since it's not a user input variable.
+		if ( ! empty( $request['sku'] ) ) {
+			$args['post_type'] = array( 'product', 'product_variation' );
+		} else {
+			$args['post_type'] = $this->post_type;
+		}
+
+		return $args;
+	}
+
+	/**
+	 * Get the downloads for a product or product variation.
+	 *
+	 * @param WC_Product|WC_Product_Variation $product Product instance.
+	 * @return array
+	 */
+	protected function get_downloads( $product ) {
+		$downloads = array();
+
+		if ( $product->is_downloadable() ) {
+			foreach ( $product->get_downloads() as $file_id => $file ) {
+				$downloads[] = array(
+					'id'   => $file_id, // MD5 hash.
+					'name' => $file['name'],
+					'file' => $file['file'],
+				);
+			}
+		}
+
+		return $downloads;
+	}
+
+	/**
+	 * Get taxonomy terms.
+	 *
+	 * @param WC_Product $product  Product instance.
+	 * @param string     $taxonomy Taxonomy slug.
+	 * @return array
+	 */
+	protected function get_taxonomy_terms( $product, $taxonomy = 'cat' ) {
+		$terms = array();
+
+		foreach ( wc_get_object_terms( $product->get_id(), 'product_' . $taxonomy ) as $term ) {
+			$terms[] = array(
+				'id'   => $term->term_id,
+				'name' => $term->name,
+				'slug' => $term->slug,
+			);
+		}
+
+		return $terms;
+	}
+
+	/**
+	 * Get the images for a product or product variation.
+	 *
+	 * @param WC_Product|WC_Product_Variation $product Product instance.
+	 * @return array
+	 */
+	protected function get_images( $product ) {
+		$images = array();
+		$attachment_ids = array();
+
+		// Add featured image.
+		if ( has_post_thumbnail( $product->get_id() ) ) {
+			$attachment_ids[] = $product->get_image_id();
+		}
+
+		// Add gallery images.
+		$attachment_ids = array_merge( $attachment_ids, $product->get_gallery_image_ids() );
+
+		// Build image data.
+		foreach ( $attachment_ids as $position => $attachment_id ) {
+			$attachment_post = get_post( $attachment_id );
+			if ( is_null( $attachment_post ) ) {
+				continue;
+			}
+
+			$attachment = wp_get_attachment_image_src( $attachment_id, 'full' );
+			if ( ! is_array( $attachment ) ) {
+				continue;
+			}
+
+			$images[] = array(
+				'id'            => (int) $attachment_id,
+				'date_created'  => wc_rest_prepare_date_response( $attachment_post->post_date_gmt ),
+				'date_modified' => wc_rest_prepare_date_response( $attachment_post->post_modified_gmt ),
+				'src'           => current( $attachment ),
+				'name'          => get_the_title( $attachment_id ),
+				'alt'           => get_post_meta( $attachment_id, '_wp_attachment_image_alt', true ),
+				'position'      => (int) $position,
+			);
+		}
+
+		// Set a placeholder image if the product has no images set.
+		if ( empty( $images ) ) {
+			$images[] = array(
+				'id'            => 0,
+				'date_created'  => wc_rest_prepare_date_response( current_time( 'mysql' ) ), // Default to now.
+				'date_modified' => wc_rest_prepare_date_response( current_time( 'mysql' ) ),
+				'src'           => wc_placeholder_img_src(),
+				'name'          => __( 'Placeholder', 'woocommerce' ),
+				'alt'           => __( 'Placeholder', 'woocommerce' ),
+				'position'      => 0,
+			);
+		}
+
+		return $images;
+	}
+
+	/**
+	 * Get attribute taxonomy label.
+	 *
+	 * @param  string $name Taxonomy name.
+	 * @return string
+	 */
+	protected function get_attribute_taxonomy_label( $name ) {
+		$tax    = get_taxonomy( $name );
+		$labels = get_taxonomy_labels( $tax );
+
+		return $labels->singular_name;
+	}
+
+	/**
+	 * Get default attributes.
+	 *
+	 * @param WC_Product $product Product instance.
+	 * @return array
+	 */
+	protected function get_default_attributes( $product ) {
+		$default = array();
+
+		if ( $product->is_type( 'variable' ) ) {
+			foreach ( array_filter( (array) $product->get_default_attributes(), 'strlen' ) as $key => $value ) {
+				if ( 0 === strpos( $key, 'pa_' ) ) {
+					$default[] = array(
+						'id'     => wc_attribute_taxonomy_id_by_name( $key ),
+						'name'   => $this->get_attribute_taxonomy_label( $key ),
+						'option' => $value,
+					);
+				} else {
+					$default[] = array(
+						'id'     => 0,
+						'name'   => str_replace( 'pa_', '', $key ),
+						'option' => $value,
+					);
+				}
+			}
+		}
+
+		return $default;
+	}
+
+	/**
+	 * Get attribute options.
+	 *
+	 * @param int   $product_id Product ID.
+	 * @param array $attribute  Attribute data.
+	 * @return array
+	 */
+	protected function get_attribute_options( $product_id, $attribute ) {
+		if ( isset( $attribute['is_taxonomy'] ) && $attribute['is_taxonomy'] ) {
+			return wc_get_product_terms( $product_id, $attribute['name'], array( 'fields' => 'names' ) );
+		} elseif ( isset( $attribute['value'] ) ) {
+			return array_map( 'trim', explode( '|', $attribute['value'] ) );
+		}
+
+		return array();
+	}
+
+	/**
+	 * Get the attributes for a product or product variation.
+	 *
+	 * @param WC_Product|WC_Product_Variation $product Product instance.
+	 * @return array
+	 */
+	protected function get_attributes( $product ) {
+		$attributes = array();
+
+		if ( $product->is_type( 'variation' ) ) {
+			// Variation attributes.
+			foreach ( $product->get_variation_attributes() as $attribute_name => $attribute ) {
+				$name = str_replace( 'attribute_', '', $attribute_name );
+
+				if ( ! $attribute ) {
+					continue;
+				}
+
+				// Taxonomy-based attributes are prefixed with `pa_`, otherwise simply `attribute_`.
+				if ( 0 === strpos( $attribute_name, 'attribute_pa_' ) ) {
+					$option_term = get_term_by( 'slug', $attribute, $name );
+					$attributes[] = array(
+						'id'     => wc_attribute_taxonomy_id_by_name( $name ),
+						'name'   => $this->get_attribute_taxonomy_label( $name ),
+						'option' => $option_term && ! is_wp_error( $option_term ) ? $option_term->name : $attribute,
+					);
+				} else {
+					$attributes[] = array(
+						'id'     => 0,
+						'name'   => $name,
+						'option' => $attribute,
+					);
+				}
+			}
+		} else {
+			foreach ( $product->get_attributes() as $attribute ) {
+				if ( $attribute['is_taxonomy'] ) {
+					$attributes[] = array(
+						'id'        => wc_attribute_taxonomy_id_by_name( $attribute['name'] ),
+						'name'      => $this->get_attribute_taxonomy_label( $attribute['name'] ),
+						'position'  => (int) $attribute['position'],
+						'visible'   => (bool) $attribute['is_visible'],
+						'variation' => (bool) $attribute['is_variation'],
+						'options'   => $this->get_attribute_options( $product->get_id(), $attribute ),
+					);
+				} else {
+					$attributes[] = array(
+						'id'        => 0,
+						'name'      => $attribute['name'],
+						'position'  => (int) $attribute['position'],
+						'visible'   => (bool) $attribute['is_visible'],
+						'variation' => (bool) $attribute['is_variation'],
+						'options'   => $this->get_attribute_options( $product->get_id(), $attribute ),
+					);
+				}
+			}
+		}
+
+		return $attributes;
+	}
+
+	/**
+	 * Get product menu order.
+	 *
+	 * @deprecated 3.0.0
+	 * @param WC_Product $product Product instance.
+	 * @return int
+	 */
+	protected function get_product_menu_order( $product ) {
+		return $product->get_menu_order();
+	}
+
+	/**
+	 * Get product data.
+	 *
+	 * @param WC_Product $product Product instance.
+	 * @return array
+	 */
+	protected function get_product_data( $product ) {
+		$data = array(
+			'id'                    => $product->get_id(),
+			'name'                  => $product->get_name(),
+			'slug'                  => $product->get_slug(),
+			'permalink'             => $product->get_permalink(),
+			'date_created'          => wc_rest_prepare_date_response( $product->get_date_created() ),
+			'date_modified'         => wc_rest_prepare_date_response( $product->get_date_modified() ),
+			'type'                  => $product->get_type(),
+			'status'                => $product->get_status(),
+			'featured'              => $product->is_featured(),
+			'catalog_visibility'    => $product->get_catalog_visibility(),
+			'description'           => wpautop( do_shortcode( $product->get_description() ) ),
+			'short_description'     => apply_filters( 'woocommerce_short_description', $product->get_short_description() ),
+			'sku'                   => $product->get_sku(),
+			'price'                 => $product->get_price(),
+			'regular_price'         => $product->get_regular_price(),
+			'sale_price'            => $product->get_sale_price() ? $product->get_sale_price() : '',
+			'date_on_sale_from'     => $product->get_date_on_sale_from() ? date( 'Y-m-d', $product->get_date_on_sale_from()->getTimestamp() ) : '',
+			'date_on_sale_to'       => $product->get_date_on_sale_to() ? date( 'Y-m-d', $product->get_date_on_sale_to()->getTimestamp() ) : '',
+			'price_html'            => $product->get_price_html(),
+			'on_sale'               => $product->is_on_sale(),
+			'purchasable'           => $product->is_purchasable(),
+			'total_sales'           => $product->get_total_sales(),
+			'virtual'               => $product->is_virtual(),
+			'downloadable'          => $product->is_downloadable(),
+			'downloads'             => $this->get_downloads( $product ),
+			'download_limit'        => $product->get_download_limit(),
+			'download_expiry'       => $product->get_download_expiry(),
+			'download_type'         => 'standard',
+			'external_url'          => $product->is_type( 'external' ) ? $product->get_product_url() : '',
+			'button_text'           => $product->is_type( 'external' ) ? $product->get_button_text() : '',
+			'tax_status'            => $product->get_tax_status(),
+			'tax_class'             => $product->get_tax_class(),
+			'manage_stock'          => $product->managing_stock(),
+			'stock_quantity'        => $product->get_stock_quantity(),
+			'in_stock'              => $product->is_in_stock(),
+			'backorders'            => $product->get_backorders(),
+			'backorders_allowed'    => $product->backorders_allowed(),
+			'backordered'           => $product->is_on_backorder(),
+			'sold_individually'     => $product->is_sold_individually(),
+			'weight'                => $product->get_weight(),
+			'dimensions'            => array(
+				'length' => $product->get_length(),
+				'width'  => $product->get_width(),
+				'height' => $product->get_height(),
+			),
+			'shipping_required'     => $product->needs_shipping(),
+			'shipping_taxable'      => $product->is_shipping_taxable(),
+			'shipping_class'        => $product->get_shipping_class(),
+			'shipping_class_id'     => $product->get_shipping_class_id(),
+			'reviews_allowed'       => $product->get_reviews_allowed(),
+			'average_rating'        => wc_format_decimal( $product->get_average_rating(), 2 ),
+			'rating_count'          => $product->get_rating_count(),
+			'related_ids'           => array_map( 'absint', array_values( wc_get_related_products( $product->get_id() ) ) ),
+			'upsell_ids'            => array_map( 'absint', $product->get_upsell_ids() ),
+			'cross_sell_ids'        => array_map( 'absint', $product->get_cross_sell_ids() ),
+			'parent_id'             => $product->get_parent_id(),
+			'purchase_note'         => wpautop( do_shortcode( wp_kses_post( $product->get_purchase_note() ) ) ),
+			'categories'            => $this->get_taxonomy_terms( $product ),
+			'tags'                  => $this->get_taxonomy_terms( $product, 'tag' ),
+			'images'                => $this->get_images( $product ),
+			'attributes'            => $this->get_attributes( $product ),
+			'default_attributes'    => $this->get_default_attributes( $product ),
+			'variations'            => array(),
+			'grouped_products'      => array(),
+			'menu_order'            => $product->get_menu_order(),
+		);
+
+		return $data;
+	}
+
+	/**
+	 * Get an individual variation's data.
+	 *
+	 * @param WC_Product $product Product instance.
+	 * @return array
+	 */
+	protected function get_variation_data( $product ) {
+		$variations = array();
+
+		foreach ( $product->get_children() as $child_id ) {
+			$variation = wc_get_product( $child_id );
+			if ( ! $variation || ! $variation->exists() ) {
+				continue;
+			}
+
+			$variations[] = array(
+				'id'                 => $variation->get_id(),
+				'date_created'       => wc_rest_prepare_date_response( $variation->get_date_created() ),
+				'date_modified'      => wc_rest_prepare_date_response( $variation->get_date_modified() ),
+				'permalink'          => $variation->get_permalink(),
+				'sku'                => $variation->get_sku(),
+				'price'              => $variation->get_price(),
+				'regular_price'      => $variation->get_regular_price(),
+				'sale_price'         => $variation->get_sale_price(),
+				'date_on_sale_from'  => $variation->get_date_on_sale_from() ? date( 'Y-m-d', $variation->get_date_on_sale_from()->getTimestamp() ) : '',
+				'date_on_sale_to'    => $variation->get_date_on_sale_to() ? date( 'Y-m-d', $variation->get_date_on_sale_to()->getTimestamp() ) : '',
+				'on_sale'            => $variation->is_on_sale(),
+				'purchasable'        => $variation->is_purchasable(),
+				'visible'            => $variation->is_visible(),
+				'virtual'            => $variation->is_virtual(),
+				'downloadable'       => $variation->is_downloadable(),
+				'downloads'          => $this->get_downloads( $variation ),
+				'download_limit'     => '' !== $variation->get_download_limit() ? (int) $variation->get_download_limit() : -1,
+				'download_expiry'    => '' !== $variation->get_download_expiry() ? (int) $variation->get_download_expiry() : -1,
+				'tax_status'         => $variation->get_tax_status(),
+				'tax_class'          => $variation->get_tax_class(),
+				'manage_stock'       => $variation->managing_stock(),
+				'stock_quantity'     => $variation->get_stock_quantity(),
+				'in_stock'           => $variation->is_in_stock(),
+				'backorders'         => $variation->get_backorders(),
+				'backorders_allowed' => $variation->backorders_allowed(),
+				'backordered'        => $variation->is_on_backorder(),
+				'weight'             => $variation->get_weight(),
+				'dimensions'         => array(
+					'length' => $variation->get_length(),
+					'width'  => $variation->get_width(),
+					'height' => $variation->get_height(),
+				),
+				'shipping_class'     => $variation->get_shipping_class(),
+				'shipping_class_id'  => $variation->get_shipping_class_id(),
+				'image'              => $this->get_images( $variation ),
+				'attributes'         => $this->get_attributes( $variation ),
+			);
+		}
+
+		return $variations;
+	}
+
+	/**
+	 * Prepare a single product output for response.
+	 *
+	 * @param WP_Post         $post    Post object.
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response
+	 */
+	public function prepare_item_for_response( $post, $request ) {
+		$product = wc_get_product( $post );
+		$data    = $this->get_product_data( $product );
+
+		// Add variations to variable products.
+		if ( $product->is_type( 'variable' ) && $product->has_child() ) {
+			$data['variations'] = $this->get_variation_data( $product );
+		}
+
+		// Add grouped products data.
+		if ( $product->is_type( 'grouped' ) && $product->has_child() ) {
+			$data['grouped_products'] = $product->get_children();
+		}
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		// Wrap the data in a response object.
+		$response = rest_ensure_response( $data );
+
+		$response->add_links( $this->prepare_links( $product, $request ) );
+
+		/**
+		 * Filter the data for a response.
+		 *
+		 * The dynamic portion of the hook name, $this->post_type, refers to post_type of the post being
+		 * prepared for the response.
+		 *
+		 * @param WP_REST_Response   $response   The response object.
+		 * @param WP_Post            $post       Post object.
+		 * @param WP_REST_Request    $request    Request object.
+		 */
+		return apply_filters( "woocommerce_rest_prepare_{$this->post_type}", $response, $post, $request );
+	}
+
+	/**
+	 * Prepare links for the request.
+	 *
+	 * @param WC_Product      $product Product object.
+	 * @param WP_REST_Request $request Request object.
+	 * @return array Links for the given product.
+	 */
+	protected function prepare_links( $product, $request ) {
+		$links = array(
+			'self' => array(
+				'href' => rest_url( sprintf( '/%s/%s/%d', $this->namespace, $this->rest_base, $product->get_id() ) ),
+			),
+			'collection' => array(
+				'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ),
+			),
+		);
+
+		if ( $product->get_parent_id() ) {
+			$links['up'] = array(
+				'href' => rest_url( sprintf( '/%s/products/%d', $this->namespace, $product->get_parent_id() ) ),
+			);
+		}
+
+		return $links;
+	}
+
+	/**
+	 * Prepare a single product for create or update.
+	 *
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_Error|stdClass $data Post object.
+	 */
+	protected function prepare_item_for_database( $request ) {
+		$id = isset( $request['id'] ) ? absint( $request['id'] ) : 0;
+
+		// Type is the most important part here because we need to be using the correct class and methods.
+		if ( isset( $request['type'] ) ) {
+			$classname = WC_Product_Factory::get_classname_from_product_type( $request['type'] );
+
+			if ( ! class_exists( $classname ) ) {
+				$classname = 'WC_Product_Simple';
+			}
+
+			$product = new $classname( $id );
+		} elseif ( isset( $request['id'] ) ) {
+			$product = wc_get_product( $id );
+		} else {
+			$product = new WC_Product_Simple();
+		}
+
+		// Post title.
+		if ( isset( $request['name'] ) ) {
+			$product->set_name( wp_filter_post_kses( $request['name'] ) );
+		}
+
+		// Post content.
+		if ( isset( $request['description'] ) ) {
+			$product->set_description( wp_filter_post_kses( $request['description'] ) );
+		}
+
+		// Post excerpt.
+		if ( isset( $request['short_description'] ) ) {
+			$product->set_short_description( wp_filter_post_kses( $request['short_description'] ) );
+		}
+
+		// Post status.
+		if ( isset( $request['status'] ) ) {
+			$product->set_status( get_post_status_object( $request['status'] ) ? $request['status'] : 'draft' );
+		}
+
+		// Post slug.
+		if ( isset( $request['slug'] ) ) {
+			$product->set_slug( $request['slug'] );
+		}
+
+		// Menu order.
+		if ( isset( $request['menu_order'] ) ) {
+			$product->set_menu_order( $request['menu_order'] );
+		}
+
+		// Comment status.
+		if ( isset( $request['reviews_allowed'] ) ) {
+			$product->set_reviews_allowed( $request['reviews_allowed'] );
+		}
+
+		/**
+		 * Filter the query_vars used in `get_items` for the constructed query.
+		 *
+		 * The dynamic portion of the hook name, $this->post_type, refers to post_type of the post being
+		 * prepared for insertion.
+		 *
+		 * @param WC_Product       $product An object representing a single item prepared
+		 *                                       for inserting or updating the database.
+		 * @param WP_REST_Request $request       Request object.
+		 */
+		return apply_filters( "woocommerce_rest_pre_insert_{$this->post_type}", $product, $request );
+	}
+
+	/**
+	 * Create a single product.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function create_item( $request ) {
+		if ( ! empty( $request['id'] ) ) {
+			return new WP_Error( "woocommerce_rest_{$this->post_type}_exists", sprintf( __( 'Cannot create existing %s.', 'woocommerce' ), $this->post_type ), array( 'status' => 400 ) );
+		}
+
+		$product_id = 0;
+
+		try {
+			$product_id = $this->save_product( $request );
+			$post       = get_post( $product_id );
+			$this->update_additional_fields_for_object( $post, $request );
+			$this->update_post_meta_fields( $post, $request );
+
+			/**
+			 * Fires after a single item is created or updated via the REST API.
+			 *
+			 * @param WP_Post         $post      Post data.
+			 * @param WP_REST_Request $request   Request object.
+			 * @param boolean         $creating  True when creating item, false when updating.
+			 */
+			do_action( 'woocommerce_rest_insert_product', $post, $request, true );
+			$request->set_param( 'context', 'edit' );
+			$response = $this->prepare_item_for_response( $post, $request );
+			$response = rest_ensure_response( $response );
+			$response->set_status( 201 );
+			$response->header( 'Location', rest_url( sprintf( '/%s/%s/%d', $this->namespace, $this->rest_base, $post->ID ) ) );
+
+			return $response;
+		} catch ( WC_Data_Exception $e ) {
+			$this->delete_post( $product_id );
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), $e->getErrorData() );
+		} catch ( WC_REST_Exception $e ) {
+			$this->delete_post( $product_id );
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
+		}
+	}
+
+	/**
+	 * Update a single product.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function update_item( $request ) {
+		$post_id = (int) $request['id'];
+
+		if ( empty( $post_id ) || get_post_type( $post_id ) !== $this->post_type ) {
+			return new WP_Error( "woocommerce_rest_{$this->post_type}_invalid_id", __( 'ID is invalid.', 'woocommerce' ), array( 'status' => 400 ) );
+		}
+
+		try {
+			$product_id = $this->save_product( $request );
+			$post       = get_post( $product_id );
+			$this->update_additional_fields_for_object( $post, $request );
+			$this->update_post_meta_fields( $post, $request );
+
+			/**
+			 * Fires after a single item is created or updated via the REST API.
+			 *
+			 * @param WP_Post         $post      Post data.
+			 * @param WP_REST_Request $request   Request object.
+			 * @param boolean         $creating  True when creating item, false when updating.
+			 */
+			do_action( 'woocommerce_rest_insert_product', $post, $request, false );
+			$request->set_param( 'context', 'edit' );
+			$response = $this->prepare_item_for_response( $post, $request );
+
+			return rest_ensure_response( $response );
+		} catch ( WC_Data_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), $e->getErrorData() );
+		} catch ( WC_REST_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
+		}
+	}
+
+	/**
+	 * Saves a product to the database.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return int
+	 */
+	public function save_product( $request ) {
+		$product = $this->prepare_item_for_database( $request );
+		return $product->save();
+	}
+
+	/**
+	 * Save product images.
+	 *
+	 * @deprecated 3.0.0
+	 * @param int $product_id
+	 * @param array $images
+	 * @throws WC_REST_Exception
+	 */
+	protected function save_product_images( $product_id, $images ) {
+		$product = wc_get_product( $product_id );
+
+		return set_product_images( $product, $images );
+	}
+
+	/**
+	 * Set product images.
+	 *
+	 * @throws WC_REST_Exception REST API exceptions.
+	 * @param WC_Product $product Product instance.
+	 * @param array      $images  Images data.
+	 * @return WC_Product
+	 */
+	protected function set_product_images( $product, $images ) {
+		if ( is_array( $images ) ) {
+			$gallery = array();
+
+			foreach ( $images as $image ) {
+				$attachment_id = isset( $image['id'] ) ? absint( $image['id'] ) : 0;
+
+				if ( 0 === $attachment_id && isset( $image['src'] ) ) {
+					$upload = wc_rest_upload_image_from_url( esc_url_raw( $image['src'] ) );
+
+					if ( is_wp_error( $upload ) ) {
+						if ( ! apply_filters( 'woocommerce_rest_suppress_image_upload_error', false, $upload, $product->get_id(), $images ) ) {
+							throw new WC_REST_Exception( 'woocommerce_product_image_upload_error', $upload->get_error_message(), 400 );
+						} else {
+							continue;
+						}
+					}
+
+					$attachment_id = wc_rest_set_uploaded_image_as_attachment( $upload, $product->get_id() );
+				}
+
+				if ( ! wp_attachment_is_image( $attachment_id ) ) {
+					throw new WC_REST_Exception( 'woocommerce_product_invalid_image_id', sprintf( __( '#%s is an invalid image ID.', 'woocommerce' ), $attachment_id ), 400 );
+				}
+
+				if ( isset( $image['position'] ) && 0 === absint( $image['position'] ) ) {
+					$product->set_image_id( $attachment_id );
+				} else {
+					$gallery[] = $attachment_id;
+				}
+
+				// Set the image alt if present.
+				if ( ! empty( $image['alt'] ) ) {
+					update_post_meta( $attachment_id, '_wp_attachment_image_alt', wc_clean( $image['alt'] ) );
+				}
+
+				// Set the image name if present.
+				if ( ! empty( $image['name'] ) ) {
+					wp_update_post( array( 'ID' => $attachment_id, 'post_title' => $image['name'] ) );
+				}
+			}
+
+			if ( ! empty( $gallery ) ) {
+				$product->set_gallery_image_ids( $gallery );
+			}
+		} else {
+			$product->set_image_id( '' );
+			$product->set_gallery_image_ids( array() );
+		}
+
+		return $product;
+	}
+
+	/**
+	 * Save product shipping data.
+	 *
+	 * @param WC_Product $product Product instance.
+	 * @param array      $data    Shipping data.
+	 * @return WC_Product
+	 */
+	protected function save_product_shipping_data( $product, $data ) {
+		// Virtual.
+		if ( isset( $data['virtual'] ) && true === $data['virtual'] ) {
+			$product->set_weight( '' );
+			$product->set_height( '' );
+			$product->set_length( '' );
+			$product->set_width( '' );
+		} else {
+			if ( isset( $data['weight'] ) ) {
+				$product->set_weight( $data['weight'] );
+			}
+
+			// Height.
+			if ( isset( $data['dimensions']['height'] ) ) {
+				$product->set_height( $data['dimensions']['height'] );
+			}
+
+			// Width.
+			if ( isset( $data['dimensions']['width'] ) ) {
+				$product->set_width( $data['dimensions']['width'] );
+			}
+
+			// Length.
+			if ( isset( $data['dimensions']['length'] ) ) {
+				$product->set_length( $data['dimensions']['length'] );
+			}
+		}
+
+		// Shipping class.
+		if ( isset( $data['shipping_class'] ) ) {
+			$shipping_class_term = get_term_by( 'slug', wc_clean( $data['shipping_class'] ), 'product_shipping_class' );
+
+			if ( $shipping_class_term ) {
+				$product->set_shipping_class_id( $shipping_class_term->term_id );
+			}
+		}
+
+		return $product;
+	}
+
+	/**
+	 * Save downloadable files.
+	 *
+	 * @param WC_Product $product    Product instance.
+	 * @param array      $downloads  Downloads data.
+	 * @param int        $deprecated Deprecated since 3.0.
+	 * @return WC_Product
+	 */
+	protected function save_downloadable_files( $product, $downloads, $deprecated = 0 ) {
+		if ( $deprecated ) {
+			wc_deprecated_argument( 'variation_id', '3.0', 'save_downloadable_files() not requires a variation_id anymore.' );
+		}
+
+		$files = array();
+		foreach ( $downloads as $key => $file ) {
+			if ( empty( $file['file'] ) ) {
+				continue;
+			}
+
+			$download = new WC_Product_Download();
+			$download->set_id( $key );
+			$download->set_name( $file['name'] ? $file['name'] : wc_get_filename_from_url( $file['file'] ) );
+			$download->set_file( apply_filters( 'woocommerce_file_download_path', $file['file'], $product, $key ) );
+			$files[]  = $download;
+		}
+		$product->set_downloads( $files );
+
+		return $product;
+	}
+
+	/**
+	 * Save taxonomy terms.
+	 *
+	 * @param WC_Product $product  Product instance.
+	 * @param array      $terms    Terms data.
+	 * @param string     $taxonomy Taxonomy name.
+	 * @return WC_Product
+	 */
+	protected function save_taxonomy_terms( $product, $terms, $taxonomy = 'cat' ) {
+		$term_ids = wp_list_pluck( $terms, 'id' );
+
+		if ( 'cat' === $taxonomy ) {
+			$product->set_category_ids( $term_ids );
+		} elseif ( 'tag' === $taxonomy ) {
+			$product->set_tag_ids( $term_ids );
+		}
+
+		return $product;
+	}
+
+	/**
+	 * Save default attributes.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param WC_Product      $product Product instance.
+	 * @param WP_REST_Request $request Request data.
+	 * @return WC_Product
+	 */
+	protected function save_default_attributes( $product, $request ) {
+		if ( isset( $request['default_attributes'] ) && is_array( $request['default_attributes'] ) ) {
+			$attributes         = $product->get_attributes();
+			$default_attributes = array();
+
+			foreach ( $request['default_attributes'] as $attribute ) {
+				$attribute_id   = 0;
+				$attribute_name = '';
+
+				// Check ID for global attributes or name for product attributes.
+				if ( ! empty( $attribute['id'] ) ) {
+					$attribute_id   = absint( $attribute['id'] );
+					$attribute_name = wc_attribute_taxonomy_name_by_id( $attribute_id );
+				} elseif ( ! empty( $attribute['name'] ) ) {
+					$attribute_name = sanitize_title( $attribute['name'] );
+				}
+
+				if ( ! $attribute_id && ! $attribute_name ) {
+					continue;
+				}
+
+				if ( isset( $attributes[ $attribute_name ] ) ) {
+					$_attribute = $attributes[ $attribute_name ];
+
+					if ( $_attribute['is_variation'] ) {
+						$value = isset( $attribute['option'] ) ? wc_clean( stripslashes( $attribute['option'] ) ) : '';
+
+						if ( ! empty( $_attribute['is_taxonomy'] ) ) {
+							// If dealing with a taxonomy, we need to get the slug from the name posted to the API.
+							$term = get_term_by( 'name', $value, $attribute_name );
+
+							if ( $term && ! is_wp_error( $term ) ) {
+								$value = $term->slug;
+							} else {
+								$value = sanitize_title( $value );
+							}
+						}
+
+						if ( $value ) {
+							$default_attributes[ $attribute_name ] = $value;
+						}
+					}
+				}
+			}
+
+			$product->set_default_attributes( $default_attributes );
+		}
+
+		return $product;
+	}
+
+	/**
+	 * Save product meta.
+	 *
+	 * @deprecated 3.0.0
+	 * @param WC_Product $product
+	 * @param WP_REST_Request $request
+	 * @return bool
+	 * @throws WC_REST_Exception
+	 */
+	protected function save_product_meta( $product, $request ) {
+		$product = $this->set_product_meta( $product, $request );
+		$product->save();
+
+		return true;
+	}
+
+	/**
+	 * Set product meta.
+	 *
+	 * @throws WC_REST_Exception REST API exceptions.
+	 * @param WC_Product      $product Product instance.
+	 * @param WP_REST_Request $request Request data.
+	 * @return WC_Product
+	 */
+	protected function set_product_meta( $product, $request ) {
+		// Virtual.
+		if ( isset( $request['virtual'] ) ) {
+			$product->set_virtual( $request['virtual'] );
+		}
+
+		// Tax status.
+		if ( isset( $request['tax_status'] ) ) {
+			$product->set_tax_status( $request['tax_status'] );
+		}
+
+		// Tax Class.
+		if ( isset( $request['tax_class'] ) ) {
+			$product->set_tax_class( $request['tax_class'] );
+		}
+
+		// Catalog Visibility.
+		if ( isset( $request['catalog_visibility'] ) ) {
+			$product->set_catalog_visibility( $request['catalog_visibility'] );
+		}
+
+		// Purchase Note.
+		if ( isset( $request['purchase_note'] ) ) {
+			$product->set_purchase_note( wc_clean( $request['purchase_note'] ) );
+		}
+
+		// Featured Product.
+		if ( isset( $request['featured'] ) ) {
+			$product->set_featured( $request['featured'] );
+		}
+
+		// Shipping data.
+		$product = $this->save_product_shipping_data( $product, $request );
+
+		// SKU.
+		if ( isset( $request['sku'] ) ) {
+			$product->set_sku( wc_clean( $request['sku'] ) );
+		}
+
+		// Attributes.
+		if ( isset( $request['attributes'] ) ) {
+			$attributes = array();
+
+			foreach ( $request['attributes'] as $attribute ) {
+				$attribute_id   = 0;
+				$attribute_name = '';
+
+				// Check ID for global attributes or name for product attributes.
+				if ( ! empty( $attribute['id'] ) ) {
+					$attribute_id   = absint( $attribute['id'] );
+					$attribute_name = wc_attribute_taxonomy_name_by_id( $attribute_id );
+				} elseif ( ! empty( $attribute['name'] ) ) {
+					$attribute_name = wc_clean( $attribute['name'] );
+				}
+
+				if ( ! $attribute_id && ! $attribute_name ) {
+					continue;
+				}
+
+				if ( $attribute_id ) {
+
+					if ( isset( $attribute['options'] ) ) {
+						$options = $attribute['options'];
+
+						if ( ! is_array( $attribute['options'] ) ) {
+							// Text based attributes - Posted values are term names.
+							$options = explode( WC_DELIMITER, $options );
+						}
+
+						$values = array_map( 'wc_sanitize_term_text_based', $options );
+						$values = array_filter( $values, 'strlen' );
+					} else {
+						$values = array();
+					}
+
+					if ( ! empty( $values ) ) {
+						// Add attribute to array, but don't set values.
+						$attribute_object = new WC_Product_Attribute();
+						$attribute_object->set_id( $attribute_id );
+						$attribute_object->set_name( $attribute_name );
+						$attribute_object->set_options( $values );
+						$attribute_object->set_position( isset( $attribute['position'] ) ? (string) absint( $attribute['position'] ) : '0' );
+						$attribute_object->set_visible( ( isset( $attribute['visible'] ) && $attribute['visible'] ) ? 1 : 0 );
+						$attribute_object->set_variation( ( isset( $attribute['variation'] ) && $attribute['variation'] ) ? 1 : 0 );
+						$attributes[] = $attribute_object;
+					}
+				} elseif ( isset( $attribute['options'] ) ) {
+					// Custom attribute - Add attribute to array and set the values.
+					if ( is_array( $attribute['options'] ) ) {
+						$values = $attribute['options'];
+					} else {
+						$values = explode( WC_DELIMITER, $attribute['options'] );
+					}
+					$attribute_object = new WC_Product_Attribute();
+					$attribute_object->set_name( $attribute_name );
+					$attribute_object->set_options( $values );
+					$attribute_object->set_position( isset( $attribute['position'] ) ? (string) absint( $attribute['position'] ) : '0' );
+					$attribute_object->set_visible( ( isset( $attribute['visible'] ) && $attribute['visible'] ) ? 1 : 0 );
+					$attribute_object->set_variation( ( isset( $attribute['variation'] ) && $attribute['variation'] ) ? 1 : 0 );
+					$attributes[] = $attribute_object;
+				}
+			}
+			$product->set_attributes( $attributes );
+		}
+
+		// Sales and prices.
+		if ( in_array( $product->get_type(), array( 'variable', 'grouped' ), true ) ) {
+			$product->set_regular_price( '' );
+			$product->set_sale_price( '' );
+			$product->set_date_on_sale_to( '' );
+			$product->set_date_on_sale_from( '' );
+			$product->set_price( '' );
+		} else {
+			// Regular Price.
+			if ( isset( $request['regular_price'] ) ) {
+				$product->set_regular_price( $request['regular_price'] );
+			}
+
+			// Sale Price.
+			if ( isset( $request['sale_price'] ) ) {
+				$product->set_sale_price( $request['sale_price'] );
+			}
+
+			if ( isset( $request['date_on_sale_from'] ) ) {
+				$product->set_date_on_sale_from( $request['date_on_sale_from'] );
+			}
+
+			if ( isset( $request['date_on_sale_to'] ) ) {
+				$product->set_date_on_sale_to( $request['date_on_sale_to'] );
+			}
+		}
+
+		// Product parent ID for groups.
+		if ( isset( $request['parent_id'] ) ) {
+			$product->set_parent_id( $request['parent_id'] );
+		}
+
+		// Sold individually.
+		if ( isset( $request['sold_individually'] ) ) {
+			$product->set_sold_individually( $request['sold_individually'] );
+		}
+
+		// Stock status.
+		if ( isset( $request['in_stock'] ) ) {
+			$stock_status = true === $request['in_stock'] ? 'instock' : 'outofstock';
+		} else {
+			$stock_status = $product->get_stock_status();
+		}
+
+		// Stock data.
+		if ( 'yes' === get_option( 'woocommerce_manage_stock' ) ) {
+			// Manage stock.
+			if ( isset( $request['manage_stock'] ) ) {
+				$product->set_manage_stock( $request['manage_stock'] );
+			}
+
+			// Backorders.
+			if ( isset( $request['backorders'] ) ) {
+				$product->set_backorders( $request['backorders'] );
+			}
+
+			if ( $product->is_type( 'grouped' ) ) {
+				$product->set_manage_stock( 'no' );
+				$product->set_backorders( 'no' );
+				$product->set_stock_quantity( '' );
+				$product->set_stock_status( $stock_status );
+			} elseif ( $product->is_type( 'external' ) ) {
+				$product->set_manage_stock( 'no' );
+				$product->set_backorders( 'no' );
+				$product->set_stock_quantity( '' );
+				$product->set_stock_status( 'instock' );
+			} elseif ( $product->get_manage_stock() ) {
+				// Stock status is always determined by children so sync later.
+				if ( ! $product->is_type( 'variable' ) ) {
+					$product->set_stock_status( $stock_status );
+				}
+
+				// Stock quantity.
+				if ( isset( $request['stock_quantity'] ) ) {
+					$product->set_stock_quantity( wc_stock_amount( $request['stock_quantity'] ) );
+				} elseif ( isset( $request['inventory_delta'] ) ) {
+					$stock_quantity  = wc_stock_amount( $product->get_stock_quantity() );
+					$stock_quantity += wc_stock_amount( $request['inventory_delta'] );
+					$product->set_stock_quantity( wc_stock_amount( $stock_quantity ) );
+				}
+			} else {
+				// Don't manage stock.
+				$product->set_manage_stock( 'no' );
+				$product->set_stock_quantity( '' );
+				$product->set_stock_status( $stock_status );
+			}
+		} elseif ( ! $product->is_type( 'variable' ) ) {
+			$product->set_stock_status( $stock_status );
+		}
+
+		// Upsells.
+		if ( isset( $request['upsell_ids'] ) ) {
+			$upsells = array();
+			$ids     = $request['upsell_ids'];
+
+			if ( ! empty( $ids ) ) {
+				foreach ( $ids as $id ) {
+					if ( $id && $id > 0 ) {
+						$upsells[] = $id;
+					}
+				}
+			}
+
+			$product->set_upsell_ids( $upsells );
+		}
+
+		// Cross sells.
+		if ( isset( $request['cross_sell_ids'] ) ) {
+			$crosssells = array();
+			$ids        = $request['cross_sell_ids'];
+
+			if ( ! empty( $ids ) ) {
+				foreach ( $ids as $id ) {
+					if ( $id && $id > 0 ) {
+						$crosssells[] = $id;
+					}
+				}
+			}
+
+			$product->set_cross_sell_ids( $crosssells );
+		}
+
+		// Product categories.
+		if ( isset( $request['categories'] ) && is_array( $request['categories'] ) ) {
+			$product = $this->save_taxonomy_terms( $product, $request['categories'] );
+		}
+
+		// Product tags.
+		if ( isset( $request['tags'] ) && is_array( $request['tags'] ) ) {
+			$product = $this->save_taxonomy_terms( $product, $request['tags'], 'tag' );
+		}
+
+		// Downloadable.
+		if ( isset( $request['downloadable'] ) ) {
+			$product->set_downloadable( $request['downloadable'] );
+		}
+
+		// Downloadable options.
+		if ( $product->get_downloadable() ) {
+
+			// Downloadable files.
+			if ( isset( $request['downloads'] ) && is_array( $request['downloads'] ) ) {
+				$product = $this->save_downloadable_files( $product, $request['downloads'] );
+			}
+
+			// Download limit.
+			if ( isset( $request['download_limit'] ) ) {
+				$product->set_download_limit( $request['download_limit'] );
+			}
+
+			// Download expiry.
+			if ( isset( $request['download_expiry'] ) ) {
+				$product->set_download_expiry( $request['download_expiry'] );
+			}
+		}
+
+		// Product url and button text for external products.
+		if ( $product->is_type( 'external' ) ) {
+			if ( isset( $request['external_url'] ) ) {
+				$product->set_product_url( $request['external_url'] );
+			}
+
+			if ( isset( $request['button_text'] ) ) {
+				$product->set_button_text( $request['button_text'] );
+			}
+		}
+
+		// Save default attributes for variable products.
+		if ( $product->is_type( 'variable' ) ) {
+			$product = $this->save_default_attributes( $product, $request );
+		}
+
+		return $product;
+	}
+
+	/**
+	 * Save variations.
+	 *
+	 * @throws WC_REST_Exception REST API exceptions.
+	 * @param WC_Product      $product          Product instance.
+	 * @param WP_REST_Request $request          Request data.
+	 * @return bool
+	 */
+	protected function save_variations_data( $product, $request ) {
+		foreach ( $request['variations'] as $menu_order => $data ) {
+			$variation = new WC_Product_Variation( isset( $data['id'] ) ? absint( $data['id'] ) : 0 );
+
+			// Create initial name and status.
+			if ( ! $variation->get_slug() ) {
+				/* translators: 1: variation id 2: product name */
+				$variation->set_name( sprintf( __( 'Variation #%1$s of %2$s', 'woocommerce' ), $variation->get_id(), $product->get_name() ) );
+				$variation->set_status( isset( $data['visible'] ) && false === $data['visible'] ? 'private' : 'publish' );
+			}
+
+			// Parent ID.
+			$variation->set_parent_id( $product->get_id() );
+
+			// Menu order.
+			$variation->set_menu_order( $menu_order );
+
+			// Status.
+			if ( isset( $data['visible'] ) ) {
+				$variation->set_status( false === $data['visible'] ? 'private' : 'publish' );
+			}
+
+			// SKU.
+			if ( isset( $data['sku'] ) ) {
+				$variation->set_sku( wc_clean( $data['sku'] ) );
+			}
+
+			// Thumbnail.
+			if ( isset( $data['image'] ) && is_array( $data['image'] ) ) {
+				$image = $data['image'];
+				$image = current( $image );
+				if ( is_array( $image ) ) {
+					$image['position'] = 0;
+				}
+
+				$variation = $this->set_product_images( $variation, array( $image ) );
+			}
+
+			// Virtual variation.
+			if ( isset( $data['virtual'] ) ) {
+				$variation->set_virtual( $data['virtual'] );
+			}
+
+			// Downloadable variation.
+			if ( isset( $data['downloadable'] ) ) {
+				$variation->set_downloadable( $data['downloadable'] );
+			}
+
+			// Downloads.
+			if ( $variation->get_downloadable() ) {
+				// Downloadable files.
+				if ( isset( $data['downloads'] ) && is_array( $data['downloads'] ) ) {
+					$variation = $this->save_downloadable_files( $variation, $data['downloads'] );
+				}
+
+				// Download limit.
+				if ( isset( $data['download_limit'] ) ) {
+					$variation->set_download_limit( $data['download_limit'] );
+				}
+
+				// Download expiry.
+				if ( isset( $data['download_expiry'] ) ) {
+					$variation->set_download_expiry( $data['download_expiry'] );
+				}
+			}
+
+			// Shipping data.
+			$variation = $this->save_product_shipping_data( $variation, $data );
+
+			// Stock handling.
+			if ( isset( $data['manage_stock'] ) ) {
+				$variation->set_manage_stock( $data['manage_stock'] );
+			}
+
+			if ( isset( $data['in_stock'] ) ) {
+				$variation->set_stock_status( true === $data['in_stock'] ? 'instock' : 'outofstock' );
+			}
+
+			if ( isset( $data['backorders'] ) ) {
+				$variation->set_backorders( $data['backorders'] );
+			}
+
+			if ( $variation->get_manage_stock() ) {
+				if ( isset( $data['stock_quantity'] ) ) {
+					$variation->set_stock_quantity( $data['stock_quantity'] );
+				} elseif ( isset( $data['inventory_delta'] ) ) {
+					$stock_quantity  = wc_stock_amount( $variation->get_stock_quantity() );
+					$stock_quantity += wc_stock_amount( $data['inventory_delta'] );
+					$variation->set_stock_quantity( $stock_quantity );
+				}
+			} else {
+				$variation->set_backorders( 'no' );
+				$variation->set_stock_quantity( '' );
+			}
+
+			// Regular Price.
+			if ( isset( $data['regular_price'] ) ) {
+				$variation->set_regular_price( $data['regular_price'] );
+			}
+
+			// Sale Price.
+			if ( isset( $data['sale_price'] ) ) {
+				$variation->set_sale_price( $data['sale_price'] );
+			}
+
+			if ( isset( $data['date_on_sale_from'] ) ) {
+				$variation->set_date_on_sale_from( $data['date_on_sale_from'] );
+			}
+
+			if ( isset( $data['date_on_sale_to'] ) ) {
+				$variation->set_date_on_sale_to( $data['date_on_sale_to'] );
+			}
+
+			// Tax class.
+			if ( isset( $data['tax_class'] ) ) {
+				$variation->set_tax_class( $data['tax_class'] );
+			}
+
+			// Description.
+			if ( isset( $data['description'] ) ) {
+				$variation->set_description( wp_kses_post( $data['description'] ) );
+			}
+
+			// Update taxonomies.
+			if ( isset( $data['attributes'] ) ) {
+				$attributes = array();
+				$parent_attributes = $product->get_attributes();
+
+				foreach ( $data['attributes'] as $attribute ) {
+					$attribute_id   = 0;
+					$attribute_name = '';
+
+					// Check ID for global attributes or name for product attributes.
+					if ( ! empty( $attribute['id'] ) ) {
+						$attribute_id   = absint( $attribute['id'] );
+						$attribute_name = wc_attribute_taxonomy_name_by_id( $attribute_id );
+					} elseif ( ! empty( $attribute['name'] ) ) {
+						$attribute_name = sanitize_title( $attribute['name'] );
+					}
+
+					if ( ! $attribute_id && ! $attribute_name ) {
+						continue;
+					}
+
+					if ( ! isset( $parent_attributes[ $attribute_name ] ) || ! $parent_attributes[ $attribute_name ]->get_variation() ) {
+						continue;
+					}
+
+					$attribute_key   = sanitize_title( $parent_attributes[ $attribute_name ]->get_name() );
+					$attribute_value = isset( $attribute['option'] ) ? wc_clean( stripslashes( $attribute['option'] ) ) : '';
+
+					if ( $parent_attributes[ $attribute_name ]->is_taxonomy() ) {
+						// If dealing with a taxonomy, we need to get the slug from the name posted to the API.
+						$term = get_term_by( 'name', $attribute_value, $attribute_name );
+
+						if ( $term && ! is_wp_error( $term ) ) {
+							$attribute_value = $term->slug;
+						} else {
+							$attribute_value = sanitize_title( $attribute_value );
+						}
+					}
+
+					$attributes[ $attribute_key ] = $attribute_value;
+				}
+
+				$variation->set_attributes( $attributes );
+			}
+
+			$variation->save();
+
+			do_action( 'woocommerce_rest_save_product_variation', $variation->get_id(), $menu_order, $data );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Add post meta fields.
+	 *
+	 * @param WP_Post         $post    Post data.
+	 * @param WP_REST_Request $request Request data.
+	 * @return bool|WP_Error
+	 */
+	protected function add_post_meta_fields( $post, $request ) {
+		return $this->update_post_meta_fields( $post, $request );
+	}
+
+	/**
+	 * Update post meta fields.
+	 *
+	 * @param WP_Post         $post    Post data.
+	 * @param WP_REST_Request $request Request data.
+	 * @return bool|WP_Error
+	 */
+	protected function update_post_meta_fields( $post, $request ) {
+		$product = wc_get_product( $post );
+
+		// Check for featured/gallery images, upload it and set it.
+		if ( isset( $request['images'] ) ) {
+			$product = $this->set_product_images( $product, $request['images'] );
+		}
+
+		// Save product meta fields.
+		$product = $this->set_product_meta( $product, $request );
+
+		// Save the product data.
+		$product->save();
+
+		// Save variations.
+		if ( $product->is_type( 'variable' ) ) {
+			if ( isset( $request['variations'] ) && is_array( $request['variations'] ) ) {
+				$this->save_variations_data( $product, $request );
+			}
+		}
+
+		// Clear caches here so in sync with any new variations/children.
+		wc_delete_product_transients( $product->get_id() );
+		wp_cache_delete( 'product-' . $product->get_id(), 'products' );
+
+		return true;
+	}
+
+	/**
+	 * Clear cache/transients.
+	 *
+	 * @param WP_Post $post Post data.
+	 */
+	public function clear_transients( $post ) {
+		wc_delete_product_transients( $post->ID );
+	}
+
+	/**
+	 * Delete post.
+	 *
+	 * @param int|WP_Post $id Post ID or WP_Post instance.
+	 */
+	protected function delete_post( $id ) {
+		if ( ! empty( $id->ID ) ) {
+			$id = $id->ID;
+		} elseif ( ! is_numeric( $id ) || 0 >= $id ) {
+			return;
+		}
+
+		// Delete product attachments.
+		$attachments = get_posts( array(
+			'post_parent' => $id,
+			'post_status' => 'any',
+			'post_type'   => 'attachment',
+		) );
+
+		foreach ( (array) $attachments as $attachment ) {
+			wp_delete_attachment( $attachment->ID, true );
+		}
+
+		// Delete product.
+		$product = wc_get_product( $id );
+		$product->delete( true );
+	}
+
+	/**
+	 * Delete a single item.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Response|WP_Error
+	 */
+	public function delete_item( $request ) {
+		$id      = (int) $request['id'];
+		$force   = (bool) $request['force'];
+		$post    = get_post( $id );
+		$product = wc_get_product( $id );
+
+		if ( ! empty( $post->post_type ) && 'product_variation' === $post->post_type && 'product' === $this->post_type ) {
+			return new WP_Error( "woocommerce_rest_invalid_{$this->post_type}_id", __( 'To manipulate product variations you should use the /products/&lt;product_id&gt;/variations/&lt;id&gt; endpoint.', 'woocommerce' ), array( 'status' => 404 ) );
+		} elseif ( empty( $id ) || empty( $post->ID ) || $post->post_type !== $this->post_type ) {
+			return new WP_Error( "woocommerce_rest_{$this->post_type}_invalid_id", __( 'Invalid post ID.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$supports_trash = EMPTY_TRASH_DAYS > 0;
+
+		/**
+		 * Filter whether an item is trashable.
+		 *
+		 * Return false to disable trash support for the item.
+		 *
+		 * @param boolean $supports_trash Whether the item type support trashing.
+		 * @param WP_Post $post           The Post object being considered for trashing support.
+		 */
+		$supports_trash = apply_filters( "woocommerce_rest_{$this->post_type}_trashable", $supports_trash, $post );
+
+		if ( ! wc_rest_check_post_permissions( $this->post_type, 'delete', $post->ID ) ) {
+			/* translators: %s: post type */
+			return new WP_Error( "woocommerce_rest_user_cannot_delete_{$this->post_type}", sprintf( __( 'Sorry, you are not allowed to delete %s.', 'woocommerce' ), $this->post_type ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_item_for_response( $post, $request );
+
+		// If we're forcing, then delete permanently.
+		if ( $force ) {
+			if ( $product->is_type( 'variable' ) ) {
+				foreach ( $product->get_children() as $child_id ) {
+					$child = wc_get_product( $child_id );
+					$child->delete( true );
+				}
+			} elseif ( $product->is_type( 'grouped' ) ) {
+				foreach ( $product->get_children() as $child_id ) {
+					$child = wc_get_product( $child_id );
+					$child->set_parent_id( 0 );
+					$child->save();
+				}
+			}
+
+			$product->delete( true );
+			$result = $product->get_id() > 0 ? false : true;
+		} else {
+			// If we don't support trashing for this type, error out.
+			if ( ! $supports_trash ) {
+				/* translators: %s: post type */
+				return new WP_Error( 'woocommerce_rest_trash_not_supported', sprintf( __( 'The %s does not support trashing.', 'woocommerce' ), $this->post_type ), array( 'status' => 501 ) );
+			}
+
+			// Otherwise, only trash if we haven't already.
+			if ( 'trash' === $post->post_status ) {
+				/* translators: %s: post type */
+				return new WP_Error( 'woocommerce_rest_already_trashed', sprintf( __( 'The %s has already been deleted.', 'woocommerce' ), $this->post_type ), array( 'status' => 410 ) );
+			}
+
+			// (Note that internally this falls through to `wp_delete_post` if
+			// the trash is disabled.)
+			$product->delete();
+			$result = 'trash' === $product->get_status();
+		}
+
+		if ( ! $result ) {
+			/* translators: %s: post type */
+			return new WP_Error( 'woocommerce_rest_cannot_delete', sprintf( __( 'The %s cannot be deleted.', 'woocommerce' ), $this->post_type ), array( 'status' => 500 ) );
+		}
+
+		// Delete parent product transients.
+		if ( $parent_id = wp_get_post_parent_id( $id ) ) {
+			wc_delete_product_transients( $parent_id );
+		}
+
+		/**
+		 * Fires after a single item is deleted or trashed via the REST API.
+		 *
+		 * @param object           $post     The deleted or trashed item.
+		 * @param WP_REST_Response $response The response data.
+		 * @param WP_REST_Request  $request  The request sent to the API.
+		 */
+		do_action( "woocommerce_rest_delete_{$this->post_type}", $post, $response, $request );
+
+		return $response;
+	}
+
+	/**
+	 * Get the Product's schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$weight_unit    = get_option( 'woocommerce_weight_unit' );
+		$dimension_unit = get_option( 'woocommerce_dimension_unit' );
+		$schema         = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => $this->post_type,
+			'type'       => 'object',
+			'properties' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'name' => array(
+					'description' => __( 'Product name.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'slug' => array(
+					'description' => __( 'Product slug.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'permalink' => array(
+					'description' => __( 'Product URL.', 'woocommerce' ),
+					'type'        => 'string',
+					'format'      => 'uri',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_created' => array(
+					'description' => __( "The date the product was created, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_modified' => array(
+					'description' => __( "The date the product was last modified, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'type' => array(
+					'description' => __( 'Product type.', 'woocommerce' ),
+					'type'        => 'string',
+					'default'     => 'simple',
+					'enum'        => array_keys( wc_get_product_types() ),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'status' => array(
+					'description' => __( 'Product status (post status).', 'woocommerce' ),
+					'type'        => 'string',
+					'default'     => 'publish',
+					'enum'        => array_keys( get_post_statuses() ),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'featured' => array(
+					'description' => __( 'Featured product.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => false,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'catalog_visibility' => array(
+					'description' => __( 'Catalog visibility.', 'woocommerce' ),
+					'type'        => 'string',
+					'default'     => 'visible',
+					'enum'        => array( 'visible', 'catalog', 'search', 'hidden' ),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'description' => array(
+					'description' => __( 'Product description.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'short_description' => array(
+					'description' => __( 'Product short description.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'sku' => array(
+					'description' => __( 'Unique identifier.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'price' => array(
+					'description' => __( 'Current product price.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'regular_price' => array(
+					'description' => __( 'Product regular price.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'sale_price' => array(
+					'description' => __( 'Product sale price.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'date_on_sale_from' => array(
+					'description' => __( 'Start date of sale price.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'date_on_sale_to' => array(
+					'description' => __( 'End data of sale price.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'price_html' => array(
+					'description' => __( 'Price formatted in HTML.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'on_sale' => array(
+					'description' => __( 'Shows if the product is on sale.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'purchasable' => array(
+					'description' => __( 'Shows if the product can be bought.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'total_sales' => array(
+					'description' => __( 'Amount of sales.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'virtual' => array(
+					'description' => __( 'If the product is virtual.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => false,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'downloadable' => array(
+					'description' => __( 'If the product is downloadable.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => false,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'downloads' => array(
+					'description' => __( 'List of downloadable files.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'File MD5 hash.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'name' => array(
+								'description' => __( 'File name.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'file' => array(
+								'description' => __( 'File URL.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+						),
+					),
+				),
+				'download_limit' => array(
+					'description' => __( 'Number of times downloadable files can be downloaded after purchase.', 'woocommerce' ),
+					'type'        => 'integer',
+					'default'     => -1,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'download_expiry' => array(
+					'description' => __( 'Number of days until access to downloadable files expires.', 'woocommerce' ),
+					'type'        => 'integer',
+					'default'     => -1,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'download_type' => array(
+					'description' => __( 'Download type, this controls the schema on the front-end.', 'woocommerce' ),
+					'type'        => 'string',
+					'default'     => 'standard',
+					'enum'        => array( 'standard' ),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'external_url' => array(
+					'description' => __( 'Product external URL. Only for external products.', 'woocommerce' ),
+					'type'        => 'string',
+					'format'      => 'uri',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'button_text' => array(
+					'description' => __( 'Product external button text. Only for external products.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'tax_status' => array(
+					'description' => __( 'Tax status.', 'woocommerce' ),
+					'type'        => 'string',
+					'default'     => 'taxable',
+					'enum'        => array( 'taxable', 'shipping', 'none' ),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'tax_class' => array(
+					'description' => __( 'Tax class.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'manage_stock' => array(
+					'description' => __( 'Stock management at product level.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => false,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'stock_quantity' => array(
+					'description' => __( 'Stock quantity.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'in_stock' => array(
+					'description' => __( 'Controls whether or not the product is listed as "in stock" or "out of stock" on the frontend.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => true,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'backorders' => array(
+					'description' => __( 'If managing stock, this controls if backorders are allowed.', 'woocommerce' ),
+					'type'        => 'string',
+					'default'     => 'no',
+					'enum'        => array( 'no', 'notify', 'yes' ),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'backorders_allowed' => array(
+					'description' => __( 'Shows if backorders are allowed.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'backordered' => array(
+					'description' => __( 'Shows if the product is on backordered.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'sold_individually' => array(
+					'description' => __( 'Allow one item to be bought in a single order.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => false,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'weight' => array(
+					/* translators: %s: weight unit */
+					'description' => sprintf( __( 'Product weight (%s).', 'woocommerce' ), $weight_unit ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'dimensions' => array(
+					'description' => __( 'Product dimensions.', 'woocommerce' ),
+					'type'        => 'object',
+					'context'     => array( 'view', 'edit' ),
+					'properties'  => array(
+						'length' => array(
+							/* translators: %s: dimension unit */
+							'description' => sprintf( __( 'Product length (%s).', 'woocommerce' ), $dimension_unit ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'width' => array(
+							/* translators: %s: dimension unit */
+							'description' => sprintf( __( 'Product width (%s).', 'woocommerce' ), $dimension_unit ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+						'height' => array(
+							/* translators: %s: dimension unit */
+							'description' => sprintf( __( 'Product height (%s).', 'woocommerce' ), $dimension_unit ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit' ),
+						),
+					),
+				),
+				'shipping_required' => array(
+					'description' => __( 'Shows if the product need to be shipped.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'shipping_taxable' => array(
+					'description' => __( 'Shows whether or not the product shipping is taxable.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'shipping_class' => array(
+					'description' => __( 'Shipping class slug.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'shipping_class_id' => array(
+					'description' => __( 'Shipping class ID.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'reviews_allowed' => array(
+					'description' => __( 'Allow reviews.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => true,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'average_rating' => array(
+					'description' => __( 'Reviews average rating.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'rating_count' => array(
+					'description' => __( 'Amount of reviews that the product have.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'related_ids' => array(
+					'description' => __( 'List of related products IDs.', 'woocommerce' ),
+					'type'        => 'array',
+					'items'       => array(
+						'type'    => 'integer',
+					),
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'upsell_ids' => array(
+					'description' => __( 'List of up-sell products IDs.', 'woocommerce' ),
+					'type'        => 'array',
+					'items'       => array(
+						'type'    => 'integer',
+					),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'cross_sell_ids' => array(
+					'description' => __( 'List of cross-sell products IDs.', 'woocommerce' ),
+					'type'        => 'array',
+					'items'       => array(
+						'type'    => 'integer',
+					),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'parent_id' => array(
+					'description' => __( 'Product parent ID.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'purchase_note' => array(
+					'description' => __( 'Optional note to send the customer after purchase.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'categories' => array(
+					'description' => __( 'List of categories.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Category ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'name' => array(
+								'description' => __( 'Category name.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'slug' => array(
+								'description' => __( 'Category slug.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+						),
+					),
+				),
+				'tags' => array(
+					'description' => __( 'List of tags.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Tag ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'name' => array(
+								'description' => __( 'Tag name.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'slug' => array(
+								'description' => __( 'Tag slug.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+						),
+					),
+				),
+				'images' => array(
+					'description' => __( 'List of images.', 'woocommerce' ),
+					'type'        => 'object',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Image ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'date_created' => array(
+								'description' => __( "The date the image was created, in the site's timezone.", 'woocommerce' ),
+								'type'        => 'date-time',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'date_modified' => array(
+								'description' => __( "The date the image was last modified, in the site's timezone.", 'woocommerce' ),
+								'type'        => 'date-time',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'src' => array(
+								'description' => __( 'Image URL.', 'woocommerce' ),
+								'type'        => 'string',
+								'format'      => 'uri',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'name' => array(
+								'description' => __( 'Image name.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'alt' => array(
+								'description' => __( 'Image alternative text.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'position' => array(
+								'description' => __( 'Image position. 0 means that the image is featured.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+							),
+						),
+					),
+				),
+				'attributes' => array(
+					'description' => __( 'List of attributes.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Attribute ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'name' => array(
+								'description' => __( 'Attribute name.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'position' => array(
+								'description' => __( 'Attribute position.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'visible' => array(
+								'description' => __( "Define if the attribute is visible on the \"Additional information\" tab in the product's page.", 'woocommerce' ),
+								'type'        => 'boolean',
+								'default'     => false,
+								'context'     => array( 'view', 'edit' ),
+							),
+							'variation' => array(
+								'description' => __( 'Define if the attribute can be used as variation.', 'woocommerce' ),
+								'type'        => 'boolean',
+								'default'     => false,
+								'context'     => array( 'view', 'edit' ),
+							),
+							'options' => array(
+								'description' => __( 'List of available term names of the attribute.', 'woocommerce' ),
+								'type'        => 'array',
+								'context'     => array( 'view', 'edit' ),
+							),
+						),
+					),
+				),
+				'default_attributes' => array(
+					'description' => __( 'Defaults variation attributes.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Attribute ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'name' => array(
+								'description' => __( 'Attribute name.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'option' => array(
+								'description' => __( 'Selected attribute term name.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+						),
+					),
+				),
+				'variations' => array(
+					'description' => __( 'List of variations.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'items'       => array(
+						'type'       => 'object',
+						'properties' => array(
+							'id' => array(
+								'description' => __( 'Variation ID.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'date_created' => array(
+								'description' => __( "The date the variation was created, in the site's timezone.", 'woocommerce' ),
+								'type'        => 'date-time',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'date_modified' => array(
+								'description' => __( "The date the variation was last modified, in the site's timezone.", 'woocommerce' ),
+								'type'        => 'date-time',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'permalink' => array(
+								'description' => __( 'Variation URL.', 'woocommerce' ),
+								'type'        => 'string',
+								'format'      => 'uri',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'sku' => array(
+								'description' => __( 'Unique identifier.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'price' => array(
+								'description' => __( 'Current variation price.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'regular_price' => array(
+								'description' => __( 'Variation regular price.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'sale_price' => array(
+								'description' => __( 'Variation sale price.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'date_on_sale_from' => array(
+								'description' => __( 'Start date of sale price.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'date_on_sale_to' => array(
+								'description' => __( 'End data of sale price.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'on_sale' => array(
+								'description' => __( 'Shows if the variation is on sale.', 'woocommerce' ),
+								'type'        => 'boolean',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'purchasable' => array(
+								'description' => __( 'Shows if the variation can be bought.', 'woocommerce' ),
+								'type'        => 'boolean',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'visible' => array(
+								'description' => __( 'If the variation is visible.', 'woocommerce' ),
+								'type'        => 'boolean',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'virtual' => array(
+								'description' => __( 'If the variation is virtual.', 'woocommerce' ),
+								'type'        => 'boolean',
+								'default'     => false,
+								'context'     => array( 'view', 'edit' ),
+							),
+							'downloadable' => array(
+								'description' => __( 'If the variation is downloadable.', 'woocommerce' ),
+								'type'        => 'boolean',
+								'default'     => false,
+								'context'     => array( 'view', 'edit' ),
+							),
+							'downloads' => array(
+								'description' => __( 'List of downloadable files.', 'woocommerce' ),
+								'type'        => 'array',
+								'context'     => array( 'view', 'edit' ),
+								'items'       => array(
+									'type'       => 'object',
+									'properties' => array(
+										'id' => array(
+											'description' => __( 'File MD5 hash.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+											'readonly'    => true,
+										),
+										'name' => array(
+											'description' => __( 'File name.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+										),
+										'file' => array(
+											'description' => __( 'File URL.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+										),
+									),
+								),
+							),
+							'download_limit' => array(
+								'description' => __( 'Number of times downloadable files can be downloaded after purchase.', 'woocommerce' ),
+								'type'        => 'integer',
+								'default'     => null,
+								'context'     => array( 'view', 'edit' ),
+							),
+							'download_expiry' => array(
+								'description' => __( 'Number of days until access to downloadable files expires.', 'woocommerce' ),
+								'type'        => 'integer',
+								'default'     => null,
+								'context'     => array( 'view', 'edit' ),
+							),
+							'tax_status' => array(
+								'description' => __( 'Tax status.', 'woocommerce' ),
+								'type'        => 'string',
+								'default'     => 'taxable',
+								'enum'        => array( 'taxable', 'shipping', 'none' ),
+								'context'     => array( 'view', 'edit' ),
+							),
+							'tax_class' => array(
+								'description' => __( 'Tax class.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'manage_stock' => array(
+								'description' => __( 'Stock management at variation level.', 'woocommerce' ),
+								'type'        => 'boolean',
+								'default'     => false,
+								'context'     => array( 'view', 'edit' ),
+							),
+							'stock_quantity' => array(
+								'description' => __( 'Stock quantity.', 'woocommerce' ),
+								'type'        => 'integer',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'in_stock' => array(
+								'description' => __( 'Controls whether or not the variation is listed as "in stock" or "out of stock" on the frontend.', 'woocommerce' ),
+								'type'        => 'boolean',
+								'default'     => true,
+								'context'     => array( 'view', 'edit' ),
+							),
+							'backorders' => array(
+								'description' => __( 'If managing stock, this controls if backorders are allowed.', 'woocommerce' ),
+								'type'        => 'string',
+								'default'     => 'no',
+								'enum'        => array( 'no', 'notify', 'yes' ),
+								'context'     => array( 'view', 'edit' ),
+							),
+							'backorders_allowed' => array(
+								'description' => __( 'Shows if backorders are allowed.', 'woocommerce' ),
+								'type'        => 'boolean',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'backordered' => array(
+								'description' => __( 'Shows if the variation is on backordered.', 'woocommerce' ),
+								'type'        => 'boolean',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'weight' => array(
+								/* translators: %s: weight unit */
+								'description' => sprintf( __( 'Variation weight (%s).', 'woocommerce' ), $weight_unit ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'dimensions' => array(
+								'description' => __( 'Variation dimensions.', 'woocommerce' ),
+								'type'        => 'object',
+								'context'     => array( 'view', 'edit' ),
+								'properties'  => array(
+									'length' => array(
+										/* translators: %s: dimension unit */
+										'description' => sprintf( __( 'Variation length (%s).', 'woocommerce' ), $dimension_unit ),
+										'type'        => 'string',
+										'context'     => array( 'view', 'edit' ),
+									),
+									'width' => array(
+										/* translators: %s: dimension unit */
+										'description' => sprintf( __( 'Variation width (%s).', 'woocommerce' ), $dimension_unit ),
+										'type'        => 'string',
+										'context'     => array( 'view', 'edit' ),
+									),
+									'height' => array(
+										/* translators: %s: dimension unit */
+										'description' => sprintf( __( 'Variation height (%s).', 'woocommerce' ), $dimension_unit ),
+										'type'        => 'string',
+										'context'     => array( 'view', 'edit' ),
+									),
+								),
+							),
+							'shipping_class' => array(
+								'description' => __( 'Shipping class slug.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+							),
+							'shipping_class_id' => array(
+								'description' => __( 'Shipping class ID.', 'woocommerce' ),
+								'type'        => 'string',
+								'context'     => array( 'view', 'edit' ),
+								'readonly'    => true,
+							),
+							'image' => array(
+								'description' => __( 'Variation image data.', 'woocommerce' ),
+								'type'        => 'object',
+								'context'     => array( 'view', 'edit' ),
+								'properties'  => array(
+									'id' => array(
+										'description' => __( 'Image ID.', 'woocommerce' ),
+										'type'        => 'integer',
+										'context'     => array( 'view', 'edit' ),
+									),
+									'date_created' => array(
+										'description' => __( "The date the image was created, in the site's timezone.", 'woocommerce' ),
+										'type'        => 'date-time',
+										'context'     => array( 'view', 'edit' ),
+										'readonly'    => true,
+									),
+									'date_modified' => array(
+										'description' => __( "The date the image was last modified, in the site's timezone.", 'woocommerce' ),
+										'type'        => 'date-time',
+										'context'     => array( 'view', 'edit' ),
+										'readonly'    => true,
+									),
+									'src' => array(
+										'description' => __( 'Image URL.', 'woocommerce' ),
+										'type'        => 'string',
+										'format'      => 'uri',
+										'context'     => array( 'view', 'edit' ),
+									),
+									'name' => array(
+										'description' => __( 'Image name.', 'woocommerce' ),
+										'type'        => 'string',
+										'context'     => array( 'view', 'edit' ),
+									),
+									'alt' => array(
+										'description' => __( 'Image alternative text.', 'woocommerce' ),
+										'type'        => 'string',
+										'context'     => array( 'view', 'edit' ),
+									),
+									'position' => array(
+										'description' => __( 'Image position. 0 means that the image is featured.', 'woocommerce' ),
+										'type'        => 'integer',
+										'context'     => array( 'view', 'edit' ),
+									),
+								),
+							),
+							'attributes' => array(
+								'description' => __( 'List of attributes.', 'woocommerce' ),
+								'type'        => 'array',
+								'context'     => array( 'view', 'edit' ),
+								'items'       => array(
+									'type'       => 'object',
+									'properties' => array(
+										'id' => array(
+											'description' => __( 'Attribute ID.', 'woocommerce' ),
+											'type'        => 'integer',
+											'context'     => array( 'view', 'edit' ),
+										),
+										'name' => array(
+											'description' => __( 'Attribute name.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+										),
+										'option' => array(
+											'description' => __( 'Selected attribute term name.', 'woocommerce' ),
+											'type'        => 'string',
+											'context'     => array( 'view', 'edit' ),
+										),
+									),
+								),
+							),
+						),
+					),
+				),
+				'grouped_products' => array(
+					'description' => __( 'List of grouped products ID.', 'woocommerce' ),
+					'type'        => 'array',
+					'items'       => array(
+						'type'    => 'integer',
+					),
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'menu_order' => array(
+					'description' => __( 'Menu order, used to custom sort products.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+
+	/**
+	 * Get the query params for collections of attachments.
+	 *
+	 * @return array
+	 */
+	public function get_collection_params() {
+		$params = parent::get_collection_params();
+
+		$params['slug'] = array(
+			'description'       => __( 'Limit result set to products with a specific slug.', 'woocommerce' ),
+			'type'              => 'string',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+		$params['status'] = array(
+			'default'           => 'any',
+			'description'       => __( 'Limit result set to products assigned a specific status.', 'woocommerce' ),
+			'type'              => 'string',
+			'enum'              => array_merge( array( 'any' ), array_keys( get_post_statuses() ) ),
+			'sanitize_callback' => 'sanitize_key',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+		$params['type'] = array(
+			'description'       => __( 'Limit result set to products assigned a specific type.', 'woocommerce' ),
+			'type'              => 'string',
+			'enum'              => array_keys( wc_get_product_types() ),
+			'sanitize_callback' => 'sanitize_key',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+		$params['category'] = array(
+			'description'       => __( 'Limit result set to products assigned a specific category ID.', 'woocommerce' ),
+			'type'              => 'string',
+			'sanitize_callback' => 'wp_parse_id_list',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+		$params['tag'] = array(
+			'description'       => __( 'Limit result set to products assigned a specific tag ID.', 'woocommerce' ),
+			'type'              => 'string',
+			'sanitize_callback' => 'wp_parse_id_list',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+		$params['shipping_class'] = array(
+			'description'       => __( 'Limit result set to products assigned a specific shipping class ID.', 'woocommerce' ),
+			'type'              => 'string',
+			'sanitize_callback' => 'wp_parse_id_list',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+		$params['attribute'] = array(
+			'description'       => __( 'Limit result set to products with a specific attribute.', 'woocommerce' ),
+			'type'              => 'string',
+			'sanitize_callback' => 'sanitize_text_field',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+		$params['attribute_term'] = array(
+			'description'       => __( 'Limit result set to products with a specific attribute term ID (required an assigned attribute).', 'woocommerce' ),
+			'type'              => 'string',
+			'sanitize_callback' => 'wp_parse_id_list',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+		$params['sku'] = array(
+			'description'       => __( 'Limit result set to products with a specific SKU.', 'woocommerce' ),
+			'type'              => 'string',
+			'sanitize_callback' => 'sanitize_text_field',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+
+		return $params;
+	}
+}
diff --git a/includes/api/v1/class-wc-rest-report-sales-controller.php b/includes/api/v1/class-wc-rest-report-sales-controller.php
new file mode 100644
index 00000000000..84902d85b41
--- /dev/null
+++ b/includes/api/v1/class-wc-rest-report-sales-controller.php
@@ -0,0 +1,397 @@
+<?php
+/**
+ * REST API Reports controller
+ *
+ * Handles requests to the reports/sales endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Report Sales controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Controller
+ */
+class WC_REST_Report_Sales_V1_Controller extends WC_REST_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v1';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'reports/sales';
+
+	/**
+	 * Report instance.
+	 *
+	 * @var WC_Admin_Report
+	 */
+	protected $report;
+
+	/**
+	 * Register the routes for sales reports.
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+				'args'                => $this->get_collection_params(),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+	}
+
+	/**
+	 * Check whether a given request has permission to read report.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_items_permissions_check( $request ) {
+		if ( ! wc_rest_check_manager_permissions( 'reports', 'read' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot list resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get sales reports.
+	 *
+	 * @param WP_REST_Request $request
+	 * @return array|WP_Error
+	 */
+	public function get_items( $request ) {
+		$data   = array();
+		$item   = $this->prepare_item_for_response( null, $request );
+		$data[] = $this->prepare_response_for_collection( $item );
+
+		return rest_ensure_response( $data );
+	}
+
+	/**
+	 * Prepare a report sales object for serialization.
+	 *
+	 * @param null $_
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response $response Response data.
+	 */
+	public function prepare_item_for_response( $_, $request ) {
+		// Set date filtering.
+		$filter = array(
+			'period'   => $request['period'],
+			'date_min' => $request['date_min'],
+			'date_max' => $request['date_max'],
+		);
+		$this->setup_report( $filter );
+
+		// New customers.
+		$users_query = new WP_User_Query(
+			array(
+				'fields' => array( 'user_registered' ),
+				'role'   => 'customer',
+			)
+		);
+
+		$customers = $users_query->get_results();
+
+		foreach ( $customers as $key => $customer ) {
+			if ( strtotime( $customer->user_registered ) < $this->report->start_date || strtotime( $customer->user_registered ) > $this->report->end_date ) {
+				unset( $customers[ $key ] );
+			}
+		}
+
+		$total_customers = count( $customers );
+		$report_data     = $this->report->get_report_data();
+		$period_totals   = array();
+
+		// Setup period totals by ensuring each period in the interval has data.
+		for ( $i = 0; $i <= $this->report->chart_interval; $i++ ) {
+
+			switch ( $this->report->chart_groupby ) {
+				case 'day' :
+					$time = date( 'Y-m-d', strtotime( "+{$i} DAY", $this->report->start_date ) );
+					break;
+				default :
+					$time = date( 'Y-m', strtotime( "+{$i} MONTH", $this->report->start_date ) );
+					break;
+			}
+
+			// Set the customer signups for each period.
+			$customer_count = 0;
+			foreach ( $customers as $customer ) {
+				if ( date( ( 'day' == $this->report->chart_groupby ) ? 'Y-m-d' : 'Y-m', strtotime( $customer->user_registered ) ) == $time ) {
+					$customer_count++;
+				}
+ 			}
+
+			$period_totals[ $time ] = array(
+				'sales'     => wc_format_decimal( 0.00, 2 ),
+				'orders'    => 0,
+				'items'     => 0,
+				'tax'       => wc_format_decimal( 0.00, 2 ),
+				'shipping'  => wc_format_decimal( 0.00, 2 ),
+				'discount'  => wc_format_decimal( 0.00, 2 ),
+				'customers' => $customer_count,
+			);
+		}
+
+		// add total sales, total order count, total tax and total shipping for each period
+		foreach ( $report_data->orders as $order ) {
+			$time = ( 'day' === $this->report->chart_groupby ) ? date( 'Y-m-d', strtotime( $order->post_date ) ) : date( 'Y-m', strtotime( $order->post_date ) );
+
+			if ( ! isset( $period_totals[ $time ] ) ) {
+				continue;
+			}
+
+			$period_totals[ $time ]['sales']    = wc_format_decimal( $order->total_sales, 2 );
+			$period_totals[ $time ]['tax']      = wc_format_decimal( $order->total_tax + $order->total_shipping_tax, 2 );
+			$period_totals[ $time ]['shipping'] = wc_format_decimal( $order->total_shipping, 2 );
+		}
+
+		foreach ( $report_data->order_counts as $order ) {
+			$time = ( 'day' === $this->report->chart_groupby ) ? date( 'Y-m-d', strtotime( $order->post_date ) ) : date( 'Y-m', strtotime( $order->post_date ) );
+
+			if ( ! isset( $period_totals[ $time ] ) ) {
+				continue;
+			}
+
+			$period_totals[ $time ]['orders']   = (int) $order->count;
+		}
+
+		// Add total order items for each period.
+		foreach ( $report_data->order_items as $order_item ) {
+			$time = ( 'day' === $this->report->chart_groupby ) ? date( 'Y-m-d', strtotime( $order_item->post_date ) ) : date( 'Y-m', strtotime( $order_item->post_date ) );
+
+			if ( ! isset( $period_totals[ $time ] ) ) {
+				continue;
+			}
+
+			$period_totals[ $time ]['items'] = (int) $order_item->order_item_count;
+		}
+
+		// Add total discount for each period.
+		foreach ( $report_data->coupons as $discount ) {
+			$time = ( 'day' === $this->report->chart_groupby ) ? date( 'Y-m-d', strtotime( $discount->post_date ) ) : date( 'Y-m', strtotime( $discount->post_date ) );
+
+			if ( ! isset( $period_totals[ $time ] ) ) {
+				continue;
+			}
+
+			$period_totals[ $time ]['discount'] = wc_format_decimal( $discount->discount_amount, 2 );
+		}
+
+		$sales_data = array(
+			'total_sales'       => $report_data->total_sales,
+			'net_sales'         => $report_data->net_sales,
+			'average_sales'     => $report_data->average_sales,
+			'total_orders'      => $report_data->total_orders,
+			'total_items'       => $report_data->total_items,
+			'total_tax'         => wc_format_decimal( $report_data->total_tax + $report_data->total_shipping_tax, 2 ),
+			'total_shipping'    => $report_data->total_shipping,
+			'total_refunds'     => $report_data->total_refunds,
+			'total_discount'    => $report_data->total_coupons,
+			'totals_grouped_by' => $this->report->chart_groupby,
+			'totals'            => $period_totals,
+			'total_customers'   => $total_customers,
+		);
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $sales_data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		// Wrap the data in a response object.
+		$response = rest_ensure_response( $data );
+		$response->add_links( array(
+			'about' => array(
+				'href' => rest_url( sprintf( '%s/reports', $this->namespace ) ),
+			),
+		) );
+
+		/**
+		 * Filter a report sales returned from the API.
+		 *
+		 * Allows modification of the report sales data right before it is returned.
+		 *
+		 * @param WP_REST_Response $response The response object.
+		 * @param stdClass         $data     The original report object.
+		 * @param WP_REST_Request  $request  Request used to generate the response.
+		 */
+		return apply_filters( 'woocommerce_rest_prepare_report_sales', $response, (object) $sales_data, $request );
+	}
+
+	/**
+	 * Setup the report object and parse any date filtering.
+	 *
+	 * @param array $filter date filtering
+	 */
+	protected function setup_report( $filter ) {
+		include_once( WC()->plugin_path() . '/includes/admin/reports/class-wc-admin-report.php' );
+		include_once( WC()->plugin_path() . '/includes/admin/reports/class-wc-report-sales-by-date.php' );
+
+		$this->report = new WC_Report_Sales_By_Date();
+
+		if ( empty( $filter['period'] ) ) {
+			// Custom date range.
+			$filter['period'] = 'custom';
+
+			if ( ! empty( $filter['date_min'] ) || ! empty( $filter['date_max'] ) ) {
+
+				// Overwrite _GET to make use of WC_Admin_Report::calculate_current_range() for custom date ranges.
+				$_GET['start_date'] = $filter['date_min'];
+				$_GET['end_date'] = isset( $filter['date_max'] ) ? $filter['date_max'] : null;
+
+			} else {
+
+				// Default custom range to today.
+				$_GET['start_date'] = $_GET['end_date'] = date( 'Y-m-d', current_time( 'timestamp' ) );
+			}
+		} else {
+			$filter['period'] = empty( $filter['period'] ) ? 'week' : $filter['period'];
+
+			// Change "week" period to "7day".
+			if ( 'week' === $filter['period'] ) {
+				$filter['period'] = '7day';
+			}
+		}
+
+		$this->report->calculate_current_range( $filter['period'] );
+	}
+
+	/**
+	 * Get the Report's schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'sales_report',
+			'type'       => 'object',
+			'properties' => array(
+				'total_sales' => array(
+					'description' => __( 'Gross sales in the period.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'net_sales' => array(
+					'description' => __( 'Net sales in the period.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'average_sales' => array(
+					'description' => __( 'Average net daily sales.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'total_orders' => array(
+					'description' => __( 'Total of orders placed.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'total_items' => array(
+					'description' => __( 'Total of items purchased.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'total_tax' => array(
+					'description' => __( 'Total charged for taxes.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'total_shipping' => array(
+					'description' => __( 'Total charged for shipping.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'total_refunds' => array(
+					'description' => __( 'Total of refunded orders.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'total_discount' => array(
+					'description' => __( 'Total of coupons used.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'totals_grouped_by' => array(
+					'description' => __( 'Group type.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'totals' => array(
+					'description' => __( 'Totals.', 'woocommerce' ),
+					'type'        => 'array',
+					'items'       => array(
+						'type'    => 'array',
+					),
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+
+	/**
+	 * Get the query params for collections.
+	 *
+	 * @return array
+	 */
+	public function get_collection_params() {
+		return array(
+			'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+			'period' => array(
+				'description'       => __( 'Report period.', 'woocommerce' ),
+				'type'              => 'string',
+				'enum'              => array( 'week', 'month', 'last_month', 'year' ),
+				'validate_callback' => 'rest_validate_request_arg',
+				'sanitize_callback' => 'sanitize_text_field',
+			),
+			'date_min' => array(
+				/* translators: %s: date format */
+				'description'       => sprintf( __( 'Return sales for a specific start date, the date need to be in the %s format.', 'woocommerce' ), 'YYYY-MM-AA' ),
+				'type'              => 'string',
+				'format'            => 'date',
+				'validate_callback' => 'wc_rest_validate_reports_request_arg',
+				'sanitize_callback' => 'sanitize_text_field',
+			),
+			'date_max' => array(
+				/* translators: %s: date format */
+				'description'       => sprintf( __( 'Return sales for a specific end date, the date need to be in the %s format.', 'woocommerce' ), 'YYYY-MM-AA' ),
+				'type'              => 'string',
+				'format'            => 'date',
+				'validate_callback' => 'wc_rest_validate_reports_request_arg',
+				'sanitize_callback' => 'sanitize_text_field',
+			),
+		);
+	}
+}
diff --git a/includes/api/v1/class-wc-rest-report-top-sellers-controller.php b/includes/api/v1/class-wc-rest-report-top-sellers-controller.php
new file mode 100644
index 00000000000..de8ec7e80c9
--- /dev/null
+++ b/includes/api/v1/class-wc-rest-report-top-sellers-controller.php
@@ -0,0 +1,174 @@
+<?php
+/**
+ * REST API Reports controller
+ *
+ * Handles requests to the reports/top_sellers endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Report Top Sellers controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Report_Sales_V1_Controller
+ */
+class WC_REST_Report_Top_Sellers_V1_Controller extends WC_REST_Report_Sales_V1_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v1';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'reports/top_sellers';
+
+	/**
+	 * Get sales reports.
+	 *
+	 * @param WP_REST_Request $request
+	 * @return array|WP_Error
+	 */
+	public function get_items( $request ) {
+		// Set date filtering.
+		$filter = array(
+			'period'   => $request['period'],
+			'date_min' => $request['date_min'],
+			'date_max' => $request['date_max'],
+		);
+		$this->setup_report( $filter );
+
+		$report_data = $this->report->get_order_report_data( array(
+			'data' => array(
+				'_product_id' => array(
+					'type'            => 'order_item_meta',
+					'order_item_type' => 'line_item',
+					'function'        => '',
+					'name'            => 'product_id',
+				),
+				'_qty' => array(
+					'type'            => 'order_item_meta',
+					'order_item_type' => 'line_item',
+					'function'        => 'SUM',
+					'name'            => 'order_item_qty',
+				),
+			),
+			'order_by'     => 'order_item_qty DESC',
+			'group_by'     => 'product_id',
+			'limit'        => isset( $filter['limit'] ) ? absint( $filter['limit'] ) : 12,
+			'query_type'   => 'get_results',
+			'filter_range' => true,
+		) );
+
+		$top_sellers = array();
+
+		foreach ( $report_data as $item ) {
+			$product = wc_get_product( $item->product_id );
+
+			if ( $product ) {
+				$top_sellers[] = array(
+					'name'      => $product->get_name(),
+					'product_id' => (int) $item->product_id,
+					'quantity'   => wc_stock_amount( $item->order_item_qty ),
+				);
+			}
+		}
+
+		$data = array();
+		foreach ( $top_sellers as $top_seller ) {
+			$item   = $this->prepare_item_for_response( (object) $top_seller, $request );
+			$data[] = $this->prepare_response_for_collection( $item );
+		}
+
+		return rest_ensure_response( $data );
+	}
+
+	/**
+	 * Prepare a report sales object for serialization.
+	 *
+	 * @param stdClass $top_seller
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response $response Response data.
+	 */
+	public function prepare_item_for_response( $top_seller, $request ) {
+		$data = array(
+			'name'       => $top_seller->name,
+			'product_id' => $top_seller->product_id,
+			'quantity'   => $top_seller->quantity,
+		);
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		// Wrap the data in a response object.
+		$response = rest_ensure_response( $data );
+		$response->add_links( array(
+			'about' => array(
+				'href' => rest_url( sprintf( '%s/reports', $this->namespace ) ),
+			),
+			'product' => array(
+				'href' => rest_url( sprintf( '/%s/products/%s', $this->namespace, $top_seller->product_id ) ),
+			),
+		) );
+
+		/**
+		 * Filter a report top sellers returned from the API.
+		 *
+		 * Allows modification of the report top sellers data right before it is returned.
+		 *
+		 * @param WP_REST_Response $response   The response object.
+		 * @param stdClass         $top_seller The original report object.
+		 * @param WP_REST_Request  $request    Request used to generate the response.
+		 */
+		return apply_filters( 'woocommerce_rest_prepare_report_top_sellers', $response, $top_seller, $request );
+	}
+
+	/**
+	 * Get the Report's schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'top_sellers_report',
+			'type'       => 'object',
+			'properties' => array(
+				'name' => array(
+					'description' => __( 'Product name.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'product_id' => array(
+					'description' => __( 'Product ID.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'quantity' => array(
+					'description' => __( 'Total number of purchases.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+}
diff --git a/includes/api/v1/class-wc-rest-reports-controller.php b/includes/api/v1/class-wc-rest-reports-controller.php
new file mode 100644
index 00000000000..ed5dc97fef0
--- /dev/null
+++ b/includes/api/v1/class-wc-rest-reports-controller.php
@@ -0,0 +1,174 @@
+<?php
+/**
+ * REST API Reports controller
+ *
+ * Handles requests to the reports endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Reports controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Controller
+ */
+class WC_REST_Reports_V1_Controller extends WC_REST_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v1';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'reports';
+
+	/**
+	 * Register the routes for reports.
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+				'args'                => $this->get_collection_params(),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+	}
+
+	/**
+	 * Check whether a given request has permission to read reports.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_items_permissions_check( $request ) {
+		if ( ! wc_rest_check_manager_permissions( 'reports', 'read' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot list resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get all reports.
+	 *
+	 * @param WP_REST_Request $request
+	 * @return array|WP_Error
+	 */
+	public function get_items( $request ) {
+		$data    = array();
+		$reports = array(
+			array(
+				'slug'        => 'sales',
+				'description' => __( 'List of sales reports.', 'woocommerce' ),
+			),
+			array(
+				'slug'        => 'top_sellers',
+				'description' => __( 'List of top sellers products.', 'woocommerce' ),
+			),
+		);
+
+		foreach ( $reports as $report ) {
+			$item   = $this->prepare_item_for_response( (object) $report, $request );
+			$data[] = $this->prepare_response_for_collection( $item );
+		}
+
+		return rest_ensure_response( $data );
+	}
+
+	/**
+	 * Prepare a report object for serialization.
+	 *
+	 * @param stdClass $report Report data.
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response $response Response data.
+	 */
+	public function prepare_item_for_response( $report, $request ) {
+		$data = array(
+			'slug'        => $report->slug,
+			'description' => $report->description,
+		);
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data = $this->add_additional_fields_to_object( $data, $request );
+		$data = $this->filter_response_by_context( $data, $context );
+
+		// Wrap the data in a response object.
+		$response = rest_ensure_response( $data );
+		$response->add_links( array(
+			'self' => array(
+				'href' => rest_url( sprintf( '/%s/%s/%s', $this->namespace, $this->rest_base, $report->slug ) ),
+			),
+			'collection' => array(
+				'href' => rest_url( sprintf( '%s/%s', $this->namespace, $this->rest_base ) ),
+			),
+		) );
+
+		/**
+		 * Filter a report returned from the API.
+		 *
+		 * Allows modification of the report data right before it is returned.
+		 *
+		 * @param WP_REST_Response $response The response object.
+		 * @param object           $report   The original report object.
+		 * @param WP_REST_Request  $request  Request used to generate the response.
+		 */
+		return apply_filters( 'woocommerce_rest_prepare_report', $response, $report, $request );
+	}
+
+	/**
+	 * Get the Report's schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'report',
+			'type'       => 'object',
+			'properties' => array(
+				'slug' => array(
+					'description' => __( 'An alphanumeric identifier for the resource.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'description' => array(
+					'description' => __( 'A human-readable description of the resource.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+
+	/**
+	 * Get the query params for collections.
+	 *
+	 * @return array
+	 */
+	public function get_collection_params() {
+		return array(
+			'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+		);
+	}
+}
diff --git a/includes/api/v1/class-wc-rest-tax-classes-controller.php b/includes/api/v1/class-wc-rest-tax-classes-controller.php
new file mode 100644
index 00000000000..17d44f9f05e
--- /dev/null
+++ b/includes/api/v1/class-wc-rest-tax-classes-controller.php
@@ -0,0 +1,362 @@
+<?php
+/**
+ * REST API Tax Classes controller
+ *
+ * Handles requests to the /taxes/classes endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Tax Classes controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Controller
+ */
+class WC_REST_Tax_Classes_V1_Controller extends WC_REST_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v1';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'taxes/classes';
+
+	/**
+	 * Register the routes for tax classes.
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+				'args'                => $this->get_collection_params(),
+			),
+			array(
+				'methods'             => WP_REST_Server::CREATABLE,
+				'callback'            => array( $this, 'create_item' ),
+				'permission_callback' => array( $this, 'create_item_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<slug>\w[\w\s\-]*)', array(
+			'args' => array(
+				'slug' => array(
+					'description' => __( 'Unique slug for the resource.', 'woocommerce' ),
+					'type'        => 'string',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::DELETABLE,
+				'callback'            => array( $this, 'delete_item' ),
+				'permission_callback' => array( $this, 'delete_item_permissions_check' ),
+				'args'                => array(
+					'force' => array(
+						'default'     => false,
+						'type'        => 'boolean',
+						'description' => __( 'Required to be true, as resource does not support trashing.', 'woocommerce' ),
+					),
+				),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+	}
+
+	/**
+	 * Check whether a given request has permission to read tax classes.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_items_permissions_check( $request ) {
+		if ( ! wc_rest_check_manager_permissions( 'settings', 'read' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot list resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access create tax classes.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return boolean
+	 */
+	public function create_item_permissions_check( $request ) {
+		if ( ! wc_rest_check_manager_permissions( 'settings', 'create' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_create', __( 'Sorry, you are not allowed to create resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access delete a tax.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return boolean
+	 */
+	public function delete_item_permissions_check( $request ) {
+		if ( ! wc_rest_check_manager_permissions( 'settings', 'delete' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_delete', __( 'Sorry, you are not allowed to delete this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get all tax classes.
+	 *
+	 * @param WP_REST_Request $request
+	 * @return array
+	 */
+	public function get_items( $request ) {
+		$tax_classes = array();
+
+		// Add standard class.
+		$tax_classes[] = array(
+			'slug' => 'standard',
+			'name' => __( 'Standard rate', 'woocommerce' ),
+		);
+
+		$classes = WC_Tax::get_tax_classes();
+
+		foreach ( $classes as $class ) {
+			$tax_classes[] = array(
+				'slug' => sanitize_title( $class ),
+				'name' => $class,
+			);
+		}
+
+		$data = array();
+		foreach ( $tax_classes as $tax_class ) {
+			$class  = $this->prepare_item_for_response( $tax_class, $request );
+			$class  = $this->prepare_response_for_collection( $class );
+			$data[] = $class;
+		}
+
+		return rest_ensure_response( $data );
+	}
+
+	/**
+	 * Create a single tax.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function create_item( $request ) {
+		$exists    = false;
+		$classes   = WC_Tax::get_tax_classes();
+		$tax_class = array(
+			'slug' => sanitize_title( $request['name'] ),
+			'name' => $request['name'],
+		);
+
+		// Check if class exists.
+		foreach ( $classes as $key => $class ) {
+			if ( sanitize_title( $class ) === $tax_class['slug'] ) {
+				$exists = true;
+				break;
+			}
+		}
+
+		// Return error if tax class already exists.
+		if ( $exists ) {
+			return new WP_Error( 'woocommerce_rest_tax_class_exists', __( 'Cannot create existing resource.', 'woocommerce' ), array( 'status' => 400 ) );
+		}
+
+		// Add the new class.
+		$classes[] = $tax_class['name'];
+
+		update_option( 'woocommerce_tax_classes', implode( "\n", $classes ) );
+
+		$this->update_additional_fields_for_object( $tax_class, $request );
+
+		/**
+		 * Fires after a tax class is created or updated via the REST API.
+		 *
+		 * @param stdClass        $tax_class Data used to create the tax class.
+		 * @param WP_REST_Request $request   Request object.
+		 * @param boolean         $creating  True when creating tax class, false when updating tax class.
+		 */
+		do_action( 'woocommerce_rest_insert_tax_class', (object) $tax_class, $request, true );
+
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_item_for_response( $tax_class, $request );
+		$response = rest_ensure_response( $response );
+		$response->set_status( 201 );
+		$response->header( 'Location', rest_url( sprintf( '/%s/%s/%s', $this->namespace, $this->rest_base, $tax_class['slug'] ) ) );
+
+		return $response;
+	}
+
+	/**
+	 * Delete a single tax class.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function delete_item( $request ) {
+		global $wpdb;
+
+		$force = isset( $request['force'] ) ? (bool) $request['force'] : false;
+
+		// We don't support trashing for this type, error out.
+		if ( ! $force ) {
+			return new WP_Error( 'woocommerce_rest_trash_not_supported', __( 'Taxes do not support trashing.', 'woocommerce' ), array( 'status' => 501 ) );
+		}
+
+		$tax_class = array(
+			'slug' => sanitize_title( $request['slug'] ),
+			'name' => '',
+		);
+		$classes = WC_Tax::get_tax_classes();
+		$deleted = false;
+
+		foreach ( $classes as $key => $class ) {
+			if ( sanitize_title( $class ) === $tax_class['slug'] ) {
+				$tax_class['name'] = $class;
+				unset( $classes[ $key ] );
+				$deleted = true;
+				break;
+			}
+		}
+
+		if ( ! $deleted ) {
+			return new WP_Error( 'woocommerce_rest_invalid_id', __( 'Invalid resource id.', 'woocommerce' ), array( 'status' => 400 ) );
+		}
+
+		update_option( 'woocommerce_tax_classes', implode( "\n", $classes ) );
+
+		// Delete tax rate locations locations from the selected class.
+		$wpdb->query( $wpdb->prepare( "
+			DELETE locations.*
+			FROM {$wpdb->prefix}woocommerce_tax_rate_locations AS locations
+			INNER JOIN
+				{$wpdb->prefix}woocommerce_tax_rates AS rates
+				ON rates.tax_rate_id = locations.tax_rate_id
+			WHERE rates.tax_rate_class = '%s'
+		", $tax_class['slug'] ) );
+
+		// Delete tax rates in the selected class.
+		$wpdb->delete( $wpdb->prefix . 'woocommerce_tax_rates', array( 'tax_rate_class' => $tax_class['slug'] ), array( '%s' ) );
+
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_item_for_response( $tax_class, $request );
+
+		/**
+		 * Fires after a tax class is deleted via the REST API.
+		 *
+		 * @param stdClass         $tax_class The tax data.
+		 * @param WP_REST_Response $response  The response returned from the API.
+		 * @param WP_REST_Request  $request   The request sent to the API.
+		 */
+		do_action( 'woocommerce_rest_delete_tax', (object) $tax_class, $response, $request );
+
+		return $response;
+	}
+
+	/**
+	 * Prepare a single tax class output for response.
+	 *
+	 * @param array $tax_class Tax class data.
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response $response Response data.
+	 */
+	public function prepare_item_for_response( $tax_class, $request ) {
+		$data = $tax_class;
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		// Wrap the data in a response object.
+		$response = rest_ensure_response( $data );
+
+		$response->add_links( $this->prepare_links() );
+
+		/**
+		 * Filter tax object returned from the REST API.
+		 *
+		 * @param WP_REST_Response $response  The response object.
+		 * @param stdClass         $tax_class Tax object used to create response.
+		 * @param WP_REST_Request  $request   Request object.
+		 */
+		return apply_filters( 'woocommerce_rest_prepare_tax', $response, (object) $tax_class, $request );
+	}
+
+	/**
+	 * Prepare links for the request.
+	 *
+	 * @return array Links for the given tax class.
+	 */
+	protected function prepare_links() {
+		$links = array(
+			'collection' => array(
+				'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ),
+			),
+		);
+
+		return $links;
+	}
+
+	/**
+	 * Get the Tax Classes schema, conforming to JSON Schema
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'tax_class',
+			'type'       => 'object',
+			'properties' => array(
+				'slug' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'name' => array(
+					'description' => __( 'Tax class name.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'required'    => true,
+					'arg_options' => array(
+						'sanitize_callback' => 'sanitize_text_field',
+					),
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+
+	/**
+	 * Get the query params for collections.
+	 *
+	 * @return array
+	 */
+	public function get_collection_params() {
+		return array(
+			'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+		);
+	}
+}
diff --git a/includes/api/v1/class-wc-rest-taxes-controller.php b/includes/api/v1/class-wc-rest-taxes-controller.php
new file mode 100644
index 00000000000..eaf95cf4dc4
--- /dev/null
+++ b/includes/api/v1/class-wc-rest-taxes-controller.php
@@ -0,0 +1,705 @@
+<?php
+/**
+ * REST API Taxes controller
+ *
+ * Handles requests to the /taxes endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Taxes controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Controller
+ */
+class WC_REST_Taxes_V1_Controller extends WC_REST_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v1';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'taxes';
+
+	/**
+	 * Register the routes for taxes.
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+				'args'                => $this->get_collection_params(),
+			),
+			array(
+				'methods'             => WP_REST_Server::CREATABLE,
+				'callback'            => array( $this, 'create_item' ),
+				'permission_callback' => array( $this, 'create_item_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
+			'args' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_item' ),
+				'permission_callback' => array( $this, 'get_item_permissions_check' ),
+				'args'                => array(
+					'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'update_item' ),
+				'permission_callback' => array( $this, 'update_item_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			array(
+				'methods'             => WP_REST_Server::DELETABLE,
+				'callback'            => array( $this, 'delete_item' ),
+				'permission_callback' => array( $this, 'delete_item_permissions_check' ),
+				'args'                => array(
+					'force' => array(
+						'default'     => false,
+						'type'        => 'boolean',
+						'description' => __( 'Required to be true, as resource does not support trashing.', 'woocommerce' ),
+					),
+				),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/batch', array(
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'batch_items' ),
+				'permission_callback' => array( $this, 'batch_items_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			'schema' => array( $this, 'get_public_batch_schema' ),
+		) );
+	}
+
+	/**
+	 * Check whether a given request has permission to read taxes.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_items_permissions_check( $request ) {
+		if ( ! wc_rest_check_manager_permissions( 'settings', 'read' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot list resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access create taxes.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return boolean
+	 */
+	public function create_item_permissions_check( $request ) {
+		if ( ! wc_rest_check_manager_permissions( 'settings', 'create' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_create', __( 'Sorry, you are not allowed to create resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access to read a tax.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_item_permissions_check( $request ) {
+		if ( ! wc_rest_check_manager_permissions( 'settings', 'read' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot view this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access update a tax.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return boolean
+	 */
+	public function update_item_permissions_check( $request ) {
+		if ( ! wc_rest_check_manager_permissions( 'settings', 'edit' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_edit', __( 'Sorry, you are not allowed to edit this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access delete a tax.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return boolean
+	 */
+	public function delete_item_permissions_check( $request ) {
+		if ( ! wc_rest_check_manager_permissions( 'settings', 'delete' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_delete', __( 'Sorry, you are not allowed to delete this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access batch create, update and delete items.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return boolean
+	 */
+	public function batch_items_permissions_check( $request ) {
+		if ( ! wc_rest_check_manager_permissions( 'settings', 'batch' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_batch', __( 'Sorry, you are not allowed to batch manipulate this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get all taxes.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function get_items( $request ) {
+		global $wpdb;
+
+		$prepared_args = array();
+		$prepared_args['order']  = $request['order'];
+		$prepared_args['number'] = $request['per_page'];
+		if ( ! empty( $request['offset'] ) ) {
+			$prepared_args['offset'] = $request['offset'];
+		} else {
+			$prepared_args['offset'] = ( $request['page'] - 1 ) * $prepared_args['number'];
+		}
+		$orderby_possibles = array(
+			'id'    => 'tax_rate_id',
+			'order' => 'tax_rate_order',
+		);
+		$prepared_args['orderby'] = $orderby_possibles[ $request['orderby'] ];
+		$prepared_args['class']   = $request['class'];
+
+		/**
+		 * Filter arguments, before passing to $wpdb->get_results(), when querying taxes via the REST API.
+		 *
+		 * @param array           $prepared_args Array of arguments for $wpdb->get_results().
+		 * @param WP_REST_Request $request       The current request.
+		 */
+		$prepared_args = apply_filters( 'woocommerce_rest_tax_query', $prepared_args, $request );
+
+		$query = "
+			SELECT *
+			FROM {$wpdb->prefix}woocommerce_tax_rates
+			WHERE 1 = 1
+		";
+
+		// Filter by tax class.
+		if ( ! empty( $prepared_args['class'] ) ) {
+			$class = 'standard' !== $prepared_args['class'] ? sanitize_title( $prepared_args['class'] ) : '';
+			$query .= " AND tax_rate_class = '$class'";
+		}
+
+		// Order tax rates.
+		$order_by = sprintf( ' ORDER BY %s', sanitize_key( $prepared_args['orderby'] ) );
+
+		// Pagination.
+		$pagination = sprintf( ' LIMIT %d, %d', $prepared_args['offset'], $prepared_args['number'] );
+
+		// Query taxes.
+		$results = $wpdb->get_results( $query . $order_by . $pagination );
+
+		$taxes = array();
+		foreach ( $results as $tax ) {
+			$data = $this->prepare_item_for_response( $tax, $request );
+			$taxes[] = $this->prepare_response_for_collection( $data );
+		}
+
+		$response = rest_ensure_response( $taxes );
+
+		// Store pagation values for headers then unset for count query.
+		$per_page = (int) $prepared_args['number'];
+		$page = ceil( ( ( (int) $prepared_args['offset'] ) / $per_page ) + 1 );
+
+		// Query only for ids.
+		$wpdb->get_results( str_replace( 'SELECT *', 'SELECT tax_rate_id', $query ) );
+
+		// Calcule totals.
+		$total_taxes = (int) $wpdb->num_rows;
+		$response->header( 'X-WP-Total', (int) $total_taxes );
+		$max_pages = ceil( $total_taxes / $per_page );
+		$response->header( 'X-WP-TotalPages', (int) $max_pages );
+
+		$base = add_query_arg( $request->get_query_params(), rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ) );
+		if ( $page > 1 ) {
+			$prev_page = $page - 1;
+			if ( $prev_page > $max_pages ) {
+				$prev_page = $max_pages;
+			}
+			$prev_link = add_query_arg( 'page', $prev_page, $base );
+			$response->link_header( 'prev', $prev_link );
+		}
+		if ( $max_pages > $page ) {
+			$next_page = $page + 1;
+			$next_link = add_query_arg( 'page', $next_page, $base );
+			$response->link_header( 'next', $next_link );
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Take tax data from the request and return the updated or newly created rate.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @param stdClass|null $current Existing tax object.
+	 * @return stdClass
+	 */
+	protected function create_or_update_tax( $request, $current = null ) {
+		$id          = absint( isset( $request['id'] ) ? $request['id'] : 0 );
+		$data        = array();
+		$fields      = array(
+			'tax_rate_country',
+			'tax_rate_state',
+			'tax_rate',
+			'tax_rate_name',
+			'tax_rate_priority',
+			'tax_rate_compound',
+			'tax_rate_shipping',
+			'tax_rate_order',
+			'tax_rate_class',
+		);
+
+		foreach ( $fields as $field ) {
+			// Keys via API differ from the stored names returned by _get_tax_rate.
+			$key = 'tax_rate' === $field ? 'rate' : str_replace( 'tax_rate_', '', $field );
+
+			// Remove data that was not posted.
+			if ( ! isset( $request[ $key ] ) ) {
+				continue;
+			}
+
+			// Test new data against current data.
+			if ( $current && $current->$field === $request[ $key ] ) {
+				continue;
+			}
+
+			// Add to data array.
+			switch ( $key ) {
+				case 'tax_rate_priority' :
+				case 'tax_rate_compound' :
+				case 'tax_rate_shipping' :
+				case 'tax_rate_order' :
+					$data[ $field ] = absint( $request[ $key ] );
+					break;
+				case 'tax_rate_class' :
+					$data[ $field ] = 'standard' !== $request['tax_rate_class'] ? $request['tax_rate_class'] : '';
+					break;
+				default :
+					$data[ $field ] = wc_clean( $request[ $key ] );
+					break;
+			}
+		}
+
+		if ( $id ) {
+			WC_Tax::_update_tax_rate( $id, $data );
+		} else {
+			$id = WC_Tax::_insert_tax_rate( $data );
+		}
+
+		// Add locales.
+		if ( ! empty( $request['postcode'] ) ) {
+			WC_Tax::_update_tax_rate_postcodes( $id, wc_clean( $request['postcode'] ) );
+		}
+		if ( ! empty( $request['city'] ) ) {
+			WC_Tax::_update_tax_rate_cities( $id, wc_clean( $request['city'] ) );
+		}
+
+		return WC_Tax::_get_tax_rate( $id, OBJECT );
+	}
+
+	/**
+	 * Create a single tax.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function create_item( $request ) {
+		if ( ! empty( $request['id'] ) ) {
+			return new WP_Error( 'woocommerce_rest_tax_exists', __( 'Cannot create existing resource.', 'woocommerce' ), array( 'status' => 400 ) );
+		}
+
+		$tax = $this->create_or_update_tax( $request );
+
+		$this->update_additional_fields_for_object( $tax, $request );
+
+		/**
+		 * Fires after a tax is created or updated via the REST API.
+		 *
+		 * @param stdClass        $tax       Data used to create the tax.
+		 * @param WP_REST_Request $request   Request object.
+		 * @param boolean         $creating  True when creating tax, false when updating tax.
+		 */
+		do_action( 'woocommerce_rest_insert_tax', $tax, $request, true );
+
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_item_for_response( $tax, $request );
+		$response = rest_ensure_response( $response );
+		$response->set_status( 201 );
+		$response->header( 'Location', rest_url( sprintf( '/%s/%s/%d', $this->namespace, $this->rest_base, $tax->tax_rate_id ) ) );
+
+		return $response;
+	}
+
+	/**
+	 * Get a single tax.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function get_item( $request ) {
+		$id      = (int) $request['id'];
+		$tax_obj = WC_Tax::_get_tax_rate( $id, OBJECT );
+
+		if ( empty( $id ) || empty( $tax_obj ) ) {
+			return new WP_Error( 'woocommerce_rest_invalid_id', __( 'Invalid resource ID.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$tax      = $this->prepare_item_for_response( $tax_obj, $request );
+		$response = rest_ensure_response( $tax );
+
+		return $response;
+	}
+
+	/**
+	 * Update a single tax.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function update_item( $request ) {
+		$id      = (int) $request['id'];
+		$tax_obj = WC_Tax::_get_tax_rate( $id, OBJECT );
+
+		if ( empty( $id ) || empty( $tax_obj ) ) {
+			return new WP_Error( 'woocommerce_rest_invalid_id', __( 'Invalid resource ID.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$tax = $this->create_or_update_tax( $request, $tax_obj );
+
+		$this->update_additional_fields_for_object( $tax, $request );
+
+		/**
+		 * Fires after a tax is created or updated via the REST API.
+		 *
+		 * @param stdClass        $tax       Data used to create the tax.
+		 * @param WP_REST_Request $request   Request object.
+		 * @param boolean         $creating  True when creating tax, false when updating tax.
+		 */
+		do_action( 'woocommerce_rest_insert_tax', $tax, $request, false );
+
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_item_for_response( $tax, $request );
+		$response = rest_ensure_response( $response );
+
+		return $response;
+	}
+
+	/**
+	 * Delete a single tax.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function delete_item( $request ) {
+		global $wpdb;
+
+		$id    = (int) $request['id'];
+		$force = isset( $request['force'] ) ? (bool) $request['force'] : false;
+
+		// We don't support trashing for this type, error out.
+		if ( ! $force ) {
+			return new WP_Error( 'woocommerce_rest_trash_not_supported', __( 'Taxes do not support trashing.', 'woocommerce' ), array( 'status' => 501 ) );
+		}
+
+		$tax = WC_Tax::_get_tax_rate( $id, OBJECT );
+
+		if ( empty( $id ) || empty( $tax ) ) {
+			return new WP_Error( 'woocommerce_rest_invalid_id', __( 'Invalid resource ID.', 'woocommerce' ), array( 'status' => 400 ) );
+		}
+
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_item_for_response( $tax, $request );
+
+		WC_Tax::_delete_tax_rate( $id );
+
+		if ( 0 === $wpdb->rows_affected ) {
+			return new WP_Error( 'woocommerce_rest_cannot_delete', __( 'The resource cannot be deleted.', 'woocommerce' ), array( 'status' => 500 ) );
+		}
+
+		/**
+		 * Fires after a tax is deleted via the REST API.
+		 *
+		 * @param stdClass         $tax      The tax data.
+		 * @param WP_REST_Response $response The response returned from the API.
+		 * @param WP_REST_Request  $request  The request sent to the API.
+		 */
+		do_action( 'woocommerce_rest_delete_tax', $tax, $response, $request );
+
+		return $response;
+	}
+
+	/**
+	 * Prepare a single tax output for response.
+	 *
+	 * @param stdClass $tax Tax object.
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response $response Response data.
+	 */
+	public function prepare_item_for_response( $tax, $request ) {
+		global $wpdb;
+
+		$id   = (int) $tax->tax_rate_id;
+		$data = array(
+			'id'       => $id,
+			'country'  => $tax->tax_rate_country,
+			'state'    => $tax->tax_rate_state,
+			'postcode' => '',
+			'city'     => '',
+			'rate'     => $tax->tax_rate,
+			'name'     => $tax->tax_rate_name,
+			'priority' => (int) $tax->tax_rate_priority,
+			'compound' => (bool) $tax->tax_rate_compound,
+			'shipping' => (bool) $tax->tax_rate_shipping,
+			'order'    => (int) $tax->tax_rate_order,
+			'class'    => $tax->tax_rate_class ? $tax->tax_rate_class : 'standard',
+		);
+
+		// Get locales from a tax rate.
+		$locales = $wpdb->get_results( $wpdb->prepare( "
+			SELECT location_code, location_type
+			FROM {$wpdb->prefix}woocommerce_tax_rate_locations
+			WHERE tax_rate_id = %d
+		", $id ) );
+
+		if ( ! is_wp_error( $tax ) && ! is_null( $tax ) ) {
+			foreach ( $locales as $locale ) {
+				$data[ $locale->location_type ] = $locale->location_code;
+			}
+		}
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		// Wrap the data in a response object.
+		$response = rest_ensure_response( $data );
+
+		$response->add_links( $this->prepare_links( $tax ) );
+
+		/**
+		 * Filter tax object returned from the REST API.
+		 *
+		 * @param WP_REST_Response $response The response object.
+		 * @param stdClass         $tax      Tax object used to create response.
+		 * @param WP_REST_Request  $request  Request object.
+		 */
+		return apply_filters( 'woocommerce_rest_prepare_tax', $response, $tax, $request );
+	}
+
+	/**
+	 * Prepare links for the request.
+	 *
+	 * @param stdClass $tax Tax object.
+	 * @return array Links for the given tax.
+	 */
+	protected function prepare_links( $tax ) {
+		$links = array(
+			'self' => array(
+				'href' => rest_url( sprintf( '/%s/%s/%d', $this->namespace, $this->rest_base, $tax->tax_rate_id ) ),
+			),
+			'collection' => array(
+				'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ),
+			),
+		);
+
+		return $links;
+	}
+
+	/**
+	 * Get the Taxes schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'tax',
+			'type'       => 'object',
+			'properties' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'country' => array(
+					'description' => __( 'Country ISO 3166 code.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'state' => array(
+					'description' => __( 'State code.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'postcode' => array(
+					'description' => __( 'Postcode / ZIP.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'city' => array(
+					'description' => __( 'City name.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'rate' => array(
+					'description' => __( 'Tax rate.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'name' => array(
+					'description' => __( 'Tax rate name.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'priority' => array(
+					'description' => __( 'Tax priority.', 'woocommerce' ),
+					'type'        => 'integer',
+					'default'     => 1,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'compound' => array(
+					'description' => __( 'Whether or not this is a compound rate.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => false,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'shipping' => array(
+					'description' => __( 'Whether or not this tax rate also gets applied to shipping.', 'woocommerce' ),
+					'type'        => 'boolean',
+					'default'     => true,
+					'context'     => array( 'view', 'edit' ),
+				),
+				'order' => array(
+					'description' => __( 'Indicates the order that will appear in queries.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'class' => array(
+					'description' => __( 'Tax class.', 'woocommerce' ),
+					'type'        => 'string',
+					'default'     => 'standard',
+					'enum'        => array_merge( array( 'standard' ), WC_Tax::get_tax_class_slugs() ),
+					'context'     => array( 'view', 'edit' ),
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+
+	/**
+	 * Get the query params for collections.
+	 *
+	 * @return array
+	 */
+	public function get_collection_params() {
+		$params                       = array();
+		$params['context']            = $this->get_context_param();
+		$params['context']['default'] = 'view';
+
+		$params['page'] = array(
+			'description'        => __( 'Current page of the collection.', 'woocommerce' ),
+			'type'               => 'integer',
+			'default'            => 1,
+			'sanitize_callback'  => 'absint',
+			'validate_callback'  => 'rest_validate_request_arg',
+			'minimum'            => 1,
+		);
+		$params['per_page'] = array(
+			'description'        => __( 'Maximum number of items to be returned in result set.', 'woocommerce' ),
+			'type'               => 'integer',
+			'default'            => 10,
+			'minimum'            => 1,
+			'maximum'            => 100,
+			'sanitize_callback'  => 'absint',
+			'validate_callback'  => 'rest_validate_request_arg',
+		);
+		$params['offset'] = array(
+			'description'        => __( 'Offset the result set by a specific number of items.', 'woocommerce' ),
+			'type'               => 'integer',
+			'sanitize_callback'  => 'absint',
+			'validate_callback'  => 'rest_validate_request_arg',
+		);
+		$params['order'] = array(
+			'default'            => 'asc',
+			'description'        => __( 'Order sort attribute ascending or descending.', 'woocommerce' ),
+			'enum'               => array( 'asc', 'desc' ),
+			'sanitize_callback'  => 'sanitize_key',
+			'type'               => 'string',
+			'validate_callback'  => 'rest_validate_request_arg',
+		);
+		$params['orderby'] = array(
+			'default'            => 'order',
+			'description'        => __( 'Sort collection by object attribute.', 'woocommerce' ),
+			'enum'               => array(
+				'id',
+				'order',
+			),
+			'sanitize_callback'  => 'sanitize_key',
+			'type'               => 'string',
+			'validate_callback'  => 'rest_validate_request_arg',
+		);
+		$params['class'] = array(
+			'description'        => __( 'Sort by tax class.', 'woocommerce' ),
+			'enum'               => array_merge( array( 'standard' ), WC_Tax::get_tax_class_slugs() ),
+			'sanitize_callback'  => 'sanitize_title',
+			'type'               => 'string',
+			'validate_callback'  => 'rest_validate_request_arg',
+		);
+
+		return $params;
+	}
+}
diff --git a/includes/api/v1/class-wc-rest-webhook-deliveries.php b/includes/api/v1/class-wc-rest-webhook-deliveries.php
new file mode 100644
index 00000000000..1da24d72f66
--- /dev/null
+++ b/includes/api/v1/class-wc-rest-webhook-deliveries.php
@@ -0,0 +1,329 @@
+<?php
+/**
+ * REST API Webhooks controller
+ *
+ * Handles requests to the /webhooks/<webhook_id>/deliveries endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Webhook Deliveries controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Controller
+ */
+class WC_REST_Webhook_Deliveries_V1_Controller extends WC_REST_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v1';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'webhooks/(?P<webhook_id>[\d]+)/deliveries';
+
+	/**
+	 * Register the routes for webhook deliveries.
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
+			'args' => array(
+				'webhook_id' => array(
+					'description' => __( 'Unique identifier for the webhook.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+				'args'                => $this->get_collection_params(),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
+			'args' => array(
+				'webhook_id' => array(
+					'description' => __( 'Unique identifier for the webhook.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_item' ),
+				'permission_callback' => array( $this, 'get_item_permissions_check' ),
+				'args'                => array(
+					'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+				),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+	}
+
+	/**
+	 * Check whether a given request has permission to read webhook deliveries.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_items_permissions_check( $request ) {
+		if ( ! wc_rest_check_post_permissions( 'shop_webhook', 'read' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot list resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a given request has access to read a webhook develivery.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_item_permissions_check( $request ) {
+		$post = get_post( (int) $request['webhook_id'] );
+
+		if ( $post && ! wc_rest_check_post_permissions( 'shop_webhook', 'read', $post->ID ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot view this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get all webhook deliveries.
+	 *
+	 * @param WP_REST_Request $request
+	 * @return array
+	 */
+	public function get_items( $request ) {
+		$webhook = new WC_Webhook( (int) $request['webhook_id'] );
+
+		if ( empty( $webhook->post_data->post_type ) || 'shop_webhook' !== $webhook->post_data->post_type ) {
+			return new WP_Error( 'woocommerce_rest_webhook_invalid_id', __( 'Invalid webhook ID.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$logs = $webhook->get_delivery_logs();
+
+		$data = array();
+		foreach ( $logs as $log ) {
+			$delivery = $this->prepare_item_for_response( (object) $log, $request );
+			$delivery = $this->prepare_response_for_collection( $delivery );
+			$data[]   = $delivery;
+		}
+
+		return rest_ensure_response( $data );
+	}
+
+	/**
+	 * Get a single webhook delivery.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function get_item( $request ) {
+		$id      = (int) $request['id'];
+		$webhook = new WC_Webhook( (int) $request['webhook_id'] );
+
+		if ( empty( $webhook->post_data->post_type ) || 'shop_webhook' !== $webhook->post_data->post_type ) {
+			return new WP_Error( 'woocommerce_rest_webhook_invalid_id', __( 'Invalid webhook ID.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$log = $webhook->get_delivery_log( $id );
+
+		if ( empty( $id ) || empty( $log ) ) {
+			return new WP_Error( 'woocommerce_rest_invalid_id', __( 'Invalid resource ID.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$delivery = $this->prepare_item_for_response( (object) $log, $request );
+		$response = rest_ensure_response( $delivery );
+
+		return $response;
+	}
+
+	/**
+	 * Prepare a single webhook delivery output for response.
+	 *
+	 * @param stdClass $log Delivery log object.
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response $response Response data.
+	 */
+	public function prepare_item_for_response( $log, $request ) {
+		$data = (array) $log;
+
+		// Add timestamp.
+		$data['date_created'] = wc_rest_prepare_date_response( $log->comment->comment_date_gmt );
+
+		// Remove comment object.
+		unset( $data['comment'] );
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		// Wrap the data in a response object.
+		$response = rest_ensure_response( $data );
+
+		$response->add_links( $this->prepare_links( $log ) );
+
+		/**
+		 * Filter webhook delivery object returned from the REST API.
+		 *
+		 * @param WP_REST_Response $response The response object.
+		 * @param stdClass         $log      Delivery log object used to create response.
+		 * @param WP_REST_Request  $request  Request object.
+		 */
+		return apply_filters( 'woocommerce_rest_prepare_webhook_delivery', $response, $log, $request );
+	}
+
+	/**
+	 * Prepare links for the request.
+	 *
+	 * @param stdClass $log Delivery log object.
+	 * @return array Links for the given webhook delivery.
+	 */
+	protected function prepare_links( $log ) {
+		$webhook_id = (int) $log->request_headers['X-WC-Webhook-ID'];
+		$base       = str_replace( '(?P<webhook_id>[\d]+)', $webhook_id, $this->rest_base );
+		$links      = array(
+			'self' => array(
+				'href' => rest_url( sprintf( '/%s/%s/%d', $this->namespace, $base, $log->id ) ),
+			),
+			'collection' => array(
+				'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $base ) ),
+			),
+			'up' => array(
+				'href' => rest_url( sprintf( '/%s/webhooks/%d', $this->namespace, $webhook_id ) ),
+			),
+		);
+
+		return $links;
+	}
+
+	/**
+	 * Get the Webhook's schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'webhook_delivery',
+			'type'       => 'object',
+			'properties' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'duration' => array(
+					'description' => __( 'The delivery duration, in seconds.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'summary' => array(
+					'description' => __( 'A friendly summary of the response including the HTTP response code, message, and body.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'request_url' => array(
+					'description' => __( 'The URL where the webhook was delivered.', 'woocommerce' ),
+					'type'        => 'string',
+					'format'      => 'uri',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'request_headers' => array(
+					'description' => __( 'The URL where the webhook was delivered.', 'woocommerce' ),
+					'type'        => 'string',
+					'format'      => 'uri',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'request_headers' => array(
+					'description' => __( 'Request headers.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+					'items'       => array(
+						'type'    => 'string',
+					),
+				),
+				'request_body' => array(
+					'description' => __( 'Request body.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'response_code' => array(
+					'description' => __( 'The HTTP response code from the receiving server.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'response_message' => array(
+					'description' => __( 'The HTTP response message from the receiving server.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'response_headers' => array(
+					'description' => __( 'Array of the response headers from the receiving server.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+					'items'       => array(
+						'type'    => 'string',
+					),
+				),
+				'response_body' => array(
+					'description' => __( 'The response body from the receiving server.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view' ),
+					'readonly'    => true,
+				),
+				'date_created' => array(
+					'description' => __( "The date the webhook delivery was logged, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+
+	/**
+	 * Get the query params for collections.
+	 *
+	 * @return array
+	 */
+	public function get_collection_params() {
+		return array(
+			'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+		);
+	}
+}
diff --git a/includes/api/v1/class-wc-rest-webhooks-controller.php b/includes/api/v1/class-wc-rest-webhooks-controller.php
new file mode 100644
index 00000000000..d2e79b224ba
--- /dev/null
+++ b/includes/api/v1/class-wc-rest-webhooks-controller.php
@@ -0,0 +1,593 @@
+<?php
+/**
+ * REST API Webhooks controller
+ *
+ * Handles requests to the /webhooks endpoint.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * REST API Webhooks controller class.
+ *
+ * @package WooCommerce/API
+ * @extends WC_REST_Posts_Controller
+ */
+class WC_REST_Webhooks_V1_Controller extends WC_REST_Posts_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v1';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'webhooks';
+
+	/**
+	 * Post type.
+	 *
+	 * @var string
+	 */
+	protected $post_type = 'shop_webhook';
+
+	/**
+	 * Initialize Webhooks actions.
+	 */
+	public function __construct() {
+		add_filter( "woocommerce_rest_{$this->post_type}_query", array( $this, 'query_args' ), 10, 2 );
+	}
+
+	/**
+	 * Register the routes for webhooks.
+	 */
+	public function register_routes() {
+		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_items' ),
+				'permission_callback' => array( $this, 'get_items_permissions_check' ),
+				'args'                => $this->get_collection_params(),
+			),
+			array(
+				'methods'             => WP_REST_Server::CREATABLE,
+				'callback'            => array( $this, 'create_item' ),
+				'permission_callback' => array( $this, 'create_item_permissions_check' ),
+				'args'                => array_merge( $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ), array(
+					'topic' => array(
+						'required'    => true,
+						'type'        => 'string',
+						'description' => __( 'Webhook topic.', 'woocommerce' ),
+					),
+					'delivery_url' => array(
+						'required'    => true,
+						'type'        => 'string',
+						'description' => __( 'Webhook delivery URL.', 'woocommerce' ),
+					),
+					'secret' => array(
+						'required'    => true,
+						'type'        => 'string',
+						'description' => __( 'Webhook secret.', 'woocommerce' ),
+					),
+				) ),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
+			'args' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::READABLE,
+				'callback'            => array( $this, 'get_item' ),
+				'permission_callback' => array( $this, 'get_item_permissions_check' ),
+				'args'                => array(
+					'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+				),
+			),
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'update_item' ),
+				'permission_callback' => array( $this, 'update_item_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			array(
+				'methods'             => WP_REST_Server::DELETABLE,
+				'callback'            => array( $this, 'delete_item' ),
+				'permission_callback' => array( $this, 'delete_item_permissions_check' ),
+				'args'                => array(
+					'force' => array(
+						'default'     => false,
+						'type'        => 'boolean',
+						'description' => __( 'Required to be true, as resource does not support trashing.', 'woocommerce' ),
+					),
+				),
+			),
+			'schema' => array( $this, 'get_public_item_schema' ),
+		) );
+
+		register_rest_route( $this->namespace, '/' . $this->rest_base . '/batch', array(
+			array(
+				'methods'             => WP_REST_Server::EDITABLE,
+				'callback'            => array( $this, 'batch_items' ),
+				'permission_callback' => array( $this, 'batch_items_permissions_check' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+			),
+			'schema' => array( $this, 'get_public_batch_schema' ),
+		) );
+	}
+
+	/**
+	 * Get the default REST API version.
+	 *
+	 * @since  3.0.0
+	 * @return string
+	 */
+	protected function get_default_api_version() {
+		return 'wp_api_v2';
+	}
+
+	/**
+	 * Create a single webhook.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function create_item( $request ) {
+		if ( ! empty( $request['id'] ) ) {
+			/* translators: %s: post type */
+			return new WP_Error( "woocommerce_rest_{$this->post_type}_exists", sprintf( __( 'Cannot create existing %s.', 'woocommerce' ), $this->post_type ), array( 'status' => 400 ) );
+		}
+
+		// Validate topic.
+		if ( empty( $request['topic'] ) || ! wc_is_webhook_valid_topic( strtolower( $request['topic'] ) ) ) {
+			return new WP_Error( "woocommerce_rest_{$this->post_type}_invalid_topic", __( 'Webhook topic is required and must be valid.', 'woocommerce' ), array( 'status' => 400 ) );
+		}
+
+		// Validate delivery URL.
+		if ( empty( $request['delivery_url'] ) || ! wc_is_valid_url( $request['delivery_url'] ) ) {
+			return new WP_Error( "woocommerce_rest_{$this->post_type}_invalid_delivery_url", __( 'Webhook delivery URL must be a valid URL starting with http:// or https://.', 'woocommerce' ), array( 'status' => 400 ) );
+		}
+
+		$post = $this->prepare_item_for_database( $request );
+		if ( is_wp_error( $post ) ) {
+			return $post;
+		}
+
+		$post->post_type = $this->post_type;
+		$post_id = wp_insert_post( $post, true );
+
+		if ( is_wp_error( $post_id ) ) {
+
+			if ( in_array( $post_id->get_error_code(), array( 'db_insert_error' ) ) ) {
+				$post_id->add_data( array( 'status' => 500 ) );
+			} else {
+				$post_id->add_data( array( 'status' => 400 ) );
+			}
+			return $post_id;
+		}
+		$post->ID = $post_id;
+
+		$webhook = new WC_Webhook( $post_id );
+
+		// Set topic.
+		$webhook->set_topic( $request['topic'] );
+
+		// Set delivery URL.
+		$webhook->set_delivery_url( $request['delivery_url'] );
+
+		// Set secret.
+		$webhook->set_secret( ! empty( $request['secret'] ) ? $request['secret'] : '' );
+
+		// Set API version to WP API integration.
+		$webhook->set_api_version( $this->get_default_api_version() );
+
+		// Set status.
+		if ( ! empty( $request['status'] ) ) {
+			$webhook->update_status( $request['status'] );
+		}
+
+		$post = get_post( $post_id );
+		$this->update_additional_fields_for_object( $post, $request );
+
+		/**
+		 * Fires after a single item is created or updated via the REST API.
+		 *
+		 * @param WP_Post         $post      Inserted object.
+		 * @param WP_REST_Request $request   Request object.
+		 * @param boolean         $creating  True when creating item, false when updating.
+		 */
+		do_action( "woocommerce_rest_insert_{$this->post_type}", $post, $request, true );
+
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_item_for_response( $post, $request );
+		$response = rest_ensure_response( $response );
+		$response->set_status( 201 );
+		$response->header( 'Location', rest_url( sprintf( '/%s/%s/%d', $this->namespace, $this->rest_base, $post_id ) ) );
+
+		// Send ping.
+		$webhook->deliver_ping();
+
+		// Clear cache.
+		delete_transient( 'woocommerce_webhook_ids' );
+
+		return $response;
+	}
+
+	/**
+	 * Update a single webhook.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function update_item( $request ) {
+		$id   = (int) $request['id'];
+		$post = get_post( $id );
+
+		if ( empty( $id ) || empty( $post->ID ) || $this->post_type !== $post->post_type ) {
+			return new WP_Error( "woocommerce_rest_{$this->post_type}_invalid_id", __( 'ID is invalid.', 'woocommerce' ), array( 'status' => 400 ) );
+		}
+
+		$webhook = new WC_Webhook( $id );
+
+		// Update topic.
+		if ( ! empty( $request['topic'] ) ) {
+			if ( wc_is_webhook_valid_topic( strtolower( $request['topic'] ) ) ) {
+				$webhook->set_topic( $request['topic'] );
+			} else {
+				return new WP_Error( "woocommerce_rest_{$this->post_type}_invalid_topic", __( 'Webhook topic must be valid.', 'woocommerce' ), array( 'status' => 400 ) );
+			}
+		}
+
+		// Update delivery URL.
+		if ( ! empty( $request['delivery_url'] ) ) {
+			if ( wc_is_valid_url( $request['delivery_url'] ) ) {
+				$webhook->set_delivery_url( $request['delivery_url'] );
+			} else {
+				return new WP_Error( "woocommerce_rest_{$this->post_type}_invalid_delivery_url", __( 'Webhook delivery URL must be a valid URL starting with http:// or https://.', 'woocommerce' ), array( 'status' => 400 ) );
+			}
+		}
+
+		// Update secret.
+		if ( ! empty( $request['secret'] ) ) {
+			$webhook->set_secret( $request['secret'] );
+		}
+
+		// Update status.
+		if ( ! empty( $request['status'] ) ) {
+			$webhook->update_status( $request['status'] );
+		}
+
+		$post = $this->prepare_item_for_database( $request );
+		if ( is_wp_error( $post ) ) {
+			return $post;
+		}
+
+		// Convert the post object to an array, otherwise wp_update_post will expect non-escaped input.
+		$post_id = wp_update_post( (array) $post, true );
+		if ( is_wp_error( $post_id ) ) {
+			if ( in_array( $post_id->get_error_code(), array( 'db_update_error' ) ) ) {
+				$post_id->add_data( array( 'status' => 500 ) );
+			} else {
+				$post_id->add_data( array( 'status' => 400 ) );
+			}
+			return $post_id;
+		}
+
+		$post = get_post( $post_id );
+		$this->update_additional_fields_for_object( $post, $request );
+
+		/**
+		 * Fires after a single item is created or updated via the REST API.
+		 *
+		 * @param WP_Post         $post      Inserted object.
+		 * @param WP_REST_Request $request   Request object.
+		 * @param boolean         $creating  True when creating item, false when updating.
+		 */
+		do_action( "woocommerce_rest_insert_{$this->post_type}", $post, $request, false );
+
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_item_for_response( $post, $request );
+
+		// Clear cache.
+		delete_transient( 'woocommerce_webhook_ids' );
+
+		return rest_ensure_response( $response );
+	}
+
+	/**
+	 * Delete a single webhook.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Response|WP_Error
+	 */
+	public function delete_item( $request ) {
+		$id    = (int) $request['id'];
+		$force = isset( $request['force'] ) ? (bool) $request['force'] : false;
+
+		// We don't support trashing for this type, error out.
+		if ( ! $force ) {
+			return new WP_Error( 'woocommerce_rest_trash_not_supported', __( 'Webhooks do not support trashing.', 'woocommerce' ), array( 'status' => 501 ) );
+		}
+
+		$post = get_post( $id );
+
+		if ( empty( $id ) || empty( $post->ID ) || $this->post_type !== $post->post_type ) {
+			return new WP_Error( "woocommerce_rest_{$this->post_type}_invalid_id", __( 'Invalid post ID.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_item_for_response( $post, $request );
+
+		$result = wp_delete_post( $id, true );
+
+		if ( ! $result ) {
+			/* translators: %s: post type */
+			return new WP_Error( 'woocommerce_rest_cannot_delete', sprintf( __( 'The %s cannot be deleted.', 'woocommerce' ), $this->post_type ), array( 'status' => 500 ) );
+		}
+
+		/**
+		 * Fires after a single item is deleted or trashed via the REST API.
+		 *
+		 * @param object           $post     The deleted or trashed item.
+		 * @param WP_REST_Response $response The response data.
+		 * @param WP_REST_Request  $request  The request sent to the API.
+		 */
+		do_action( "woocommerce_rest_delete_{$this->post_type}", $post, $response, $request );
+
+		// Clear cache.
+		delete_transient( 'woocommerce_webhook_ids' );
+
+		return $response;
+	}
+
+	/**
+	 * Prepare a single webhook for create or update.
+	 *
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_Error|stdClass $data Post object.
+	 */
+	protected function prepare_item_for_database( $request ) {
+		global $wpdb;
+
+		$data = new stdClass;
+
+		// Post ID.
+		if ( isset( $request['id'] ) ) {
+			$data->ID = absint( $request['id'] );
+		}
+
+		// Validate required POST fields.
+		if ( 'POST' === $request->get_method() && empty( $data->ID ) ) {
+			// @codingStandardsIgnoreStart
+			$data->post_title = ! empty( $request['name'] ) ? $request['name'] : sprintf( __( 'Webhook created on %s', 'woocommerce' ), strftime( _x( '%b %d, %Y @ %I:%M %p', 'Webhook created on date parsed by strftime', 'woocommerce' ) ) );
+			// @codingStandardsIgnoreEnd
+
+			// Post author.
+			$data->post_author = get_current_user_id();
+
+			// Post password.
+			$password = strlen( uniqid( 'webhook_' ) );
+			$data->post_password = $password > 20 ? substr( $password, 0, 20 ) : $password;
+
+			// Post status.
+			$data->post_status = 'publish';
+		} else {
+
+			// Allow edit post title.
+			if ( ! empty( $request['name'] ) ) {
+				$data->post_title = $request['name'];
+			}
+		}
+
+		// Comment status.
+		$data->comment_status = 'closed';
+
+		// Ping status.
+		$data->ping_status = 'closed';
+
+		/**
+		 * Filter the query_vars used in `get_items` for the constructed query.
+		 *
+		 * The dynamic portion of the hook name, $this->post_type, refers to post_type of the post being
+		 * prepared for insertion.
+		 *
+		 * @param stdClass        $data An object representing a single item prepared
+		 *                                       for inserting or updating the database.
+		 * @param WP_REST_Request $request       Request object.
+		 */
+		return apply_filters( "woocommerce_rest_pre_insert_{$this->post_type}", $data, $request );
+	}
+
+	/**
+	 * Prepare a single webhook output for response.
+	 *
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response $response Response data.
+	 */
+	public function prepare_item_for_response( $post, $request ) {
+		$id      = (int) $post->ID;
+		$webhook = new WC_Webhook( $id );
+		$data    = array(
+			'id'            => $webhook->id,
+			'name'          => $webhook->get_name(),
+			'status'        => $webhook->get_status(),
+			'topic'         => $webhook->get_topic(),
+			'resource'      => $webhook->get_resource(),
+			'event'         => $webhook->get_event(),
+			'hooks'         => $webhook->get_hooks(),
+			'delivery_url'  => $webhook->get_delivery_url(),
+			'date_created'  => wc_rest_prepare_date_response( $webhook->get_post_data()->post_date_gmt ),
+			'date_modified' => wc_rest_prepare_date_response( $webhook->get_post_data()->post_modified_gmt ),
+		);
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		// Wrap the data in a response object.
+		$response = rest_ensure_response( $data );
+
+		$response->add_links( $this->prepare_links( $post, $request ) );
+
+		/**
+		 * Filter webhook object returned from the REST API.
+		 *
+		 * @param WP_REST_Response $response The response object.
+		 * @param WC_Webhook       $webhook  Webhook object used to create response.
+		 * @param WP_REST_Request  $request  Request object.
+		 */
+		return apply_filters( "woocommerce_rest_prepare_{$this->post_type}", $response, $webhook, $request );
+	}
+
+	/**
+	 * Query args.
+	 *
+	 * @param array $args
+	 * @param WP_REST_Request $request
+	 * @return array
+	 */
+	public function query_args( $args, $request ) {
+		// Set post_status.
+		switch ( $request['status'] ) {
+			case 'active' :
+				$args['post_status'] = 'publish';
+				break;
+			case 'paused' :
+				$args['post_status'] = 'draft';
+				break;
+			case 'disabled' :
+				$args['post_status'] = 'pending';
+				break;
+			default :
+				$args['post_status'] = 'any';
+				break;
+		}
+
+		return $args;
+	}
+
+	/**
+	 * Get the Webhook's schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'webhook',
+			'type'       => 'object',
+			'properties' => array(
+				'id' => array(
+					'description' => __( 'Unique identifier for the resource.', 'woocommerce' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'name' => array(
+					'description' => __( 'A friendly name for the webhook.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'status' => array(
+					'description' => __( 'Webhook status.', 'woocommerce' ),
+					'type'        => 'string',
+					'default'     => 'active',
+					'enum'        => array( 'active', 'paused', 'disabled' ),
+					'context'     => array( 'view', 'edit' ),
+					'arg_options' => array(
+						'sanitize_callback' => 'wc_is_webhook_valid_topic',
+					),
+				),
+				'topic' => array(
+					'description' => __( 'Webhook topic.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'resource' => array(
+					'description' => __( 'Webhook resource.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'event' => array(
+					'description' => __( 'Webhook event.', 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'hooks' => array(
+					'description' => __( 'WooCommerce action names associated with the webhook.', 'woocommerce' ),
+					'type'        => 'array',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+					'items'       => array(
+						'type'    => 'string',
+					),
+				),
+				'delivery_url' => array(
+					'description' => __( 'The URL where the webhook payload is delivered.', 'woocommerce' ),
+					'type'        => 'string',
+					'format'      => 'uri',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'secret' => array(
+					'description' => __( "Secret key used to generate a hash of the delivered webhook and provided in the request headers. This will default is a MD5 hash from the current user's ID|username if not provided.", 'woocommerce' ),
+					'type'        => 'string',
+					'context'     => array( 'edit' ),
+				),
+				'date_created' => array(
+					'description' => __( "The date the webhook was created, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+				'date_modified' => array(
+					'description' => __( "The date the webhook was last modified, in the site's timezone.", 'woocommerce' ),
+					'type'        => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $schema );
+	}
+
+	/**
+	 * Get the query params for collections of attachments.
+	 *
+	 * @return array
+	 */
+	public function get_collection_params() {
+		$params = parent::get_collection_params();
+
+		$params['status'] = array(
+			'default'           => 'all',
+			'description'       => __( 'Limit result set to webhooks assigned a specific status.', 'woocommerce' ),
+			'type'              => 'string',
+			'enum'              => array( 'all', 'active', 'paused', 'disabled' ),
+			'sanitize_callback' => 'sanitize_key',
+			'validate_callback' => 'rest_validate_request_arg',
+		);
+
+		return $params;
+	}
+}
diff --git a/includes/class-wc-ajax.php b/includes/class-wc-ajax.php
index ee6d4fb318b..fefb85700ab 100644
--- a/includes/class-wc-ajax.php
+++ b/includes/class-wc-ajax.php
@@ -1,7 +1,7 @@
 <?php
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
 /**
@@ -10,7 +10,6 @@ if ( ! defined( 'ABSPATH' ) ) {
  * AJAX Event Handler.
  *
  * @class    WC_AJAX
- * @version  2.4.0
  * @package  WooCommerce/Classes
  * @category Class
  * @author   WooThemes
@@ -28,11 +27,12 @@ class WC_AJAX {
 
 	/**
 	 * Get WC Ajax Endpoint.
+	 *
 	 * @param  string $request Optional
 	 * @return string
 	 */
 	public static function get_endpoint( $request = '' ) {
-		return esc_url_raw( add_query_arg( 'wc-ajax', $request, remove_query_arg( array( 'remove_item', 'add-to-cart', 'added-to-cart' ) ) ) );
+		return esc_url_raw( apply_filters( 'woocommerce_ajax_get_endpoint', add_query_arg( 'wc-ajax', $request, remove_query_arg( array( 'remove_item', 'add-to-cart', 'added-to-cart' ) ) ), $request ) );
 	}
 
 	/**
@@ -40,22 +40,18 @@ class WC_AJAX {
 	 */
 	public static function define_ajax() {
 		if ( ! empty( $_GET['wc-ajax'] ) ) {
-			if ( ! defined( 'DOING_AJAX' ) ) {
-				define( 'DOING_AJAX', true );
-			}
-			if ( ! defined( 'WC_DOING_AJAX' ) ) {
-				define( 'WC_DOING_AJAX', true );
-			}
-			// Turn off display_errors during AJAX events to prevent malformed JSON
+			wc_maybe_define_constant( 'DOING_AJAX', true );
+			wc_maybe_define_constant( 'WC_DOING_AJAX', true );
 			if ( ! WP_DEBUG || ( WP_DEBUG && ! WP_DEBUG_DISPLAY ) ) {
-				@ini_set( 'display_errors', 0 );
+				@ini_set( 'display_errors', 0 ); // Turn off display_errors during AJAX events to prevent malformed JSON
 			}
 			$GLOBALS['wpdb']->hide_errors();
 		}
 	}
 
 	/**
-	 * Send headers for WC Ajax Requests
+	 * Send headers for WC Ajax Requests.
+	 *
 	 * @since 2.5.0
 	 */
 	private static function wc_ajax_headers() {
@@ -80,7 +76,7 @@ class WC_AJAX {
 		if ( $action = $wp_query->get( 'wc-ajax' ) ) {
 			self::wc_ajax_headers();
 			do_action( 'wc_ajax_' . sanitize_text_field( $action ) );
-			die();
+			wp_die();
 		}
 	}
 
@@ -94,10 +90,12 @@ class WC_AJAX {
 			'apply_coupon'                                     => true,
 			'remove_coupon'                                    => true,
 			'update_shipping_method'                           => true,
+			'get_cart_totals'                                  => true,
 			'update_order_review'                              => true,
 			'add_to_cart'                                      => true,
 			'checkout'                                         => true,
 			'get_variation'                                    => true,
+			'get_customer_location'                            => true,
 			'feature_product'                                  => false,
 			'mark_order_status'                                => false,
 			'add_attribute'                                    => false,
@@ -127,7 +125,6 @@ class WC_AJAX {
 			'delete_order_note'                                => false,
 			'json_search_products'                             => false,
 			'json_search_products_and_variations'              => false,
-			'json_search_grouped_products'                     => false,
 			'json_search_downloadable_products_and_variations' => false,
 			'json_search_customers'                            => false,
 			'term_ordering'                                    => false,
@@ -136,11 +133,15 @@ class WC_AJAX {
 			'delete_refund'                                    => false,
 			'rated'                                            => false,
 			'update_api_key'                                   => false,
-			'get_customer_location'                            => true,
 			'load_variations'                                  => false,
 			'save_variations'                                  => false,
 			'bulk_edit_variations'                             => false,
 			'tax_rates_save_changes'                           => false,
+			'shipping_zones_save_changes'                      => false,
+			'shipping_zone_add_method'                         => false,
+			'shipping_zone_methods_save_changes'               => false,
+			'shipping_zone_methods_save_settings'              => false,
+			'shipping_classes_save_changes'                    => false,
 		);
 
 		foreach ( $ajax_events as $ajax_event => $nopriv ) {
@@ -149,35 +150,31 @@ class WC_AJAX {
 			if ( $nopriv ) {
 				add_action( 'wp_ajax_nopriv_woocommerce_' . $ajax_event, array( __CLASS__, $ajax_event ) );
 
-				// WC AJAX can be used for frontend ajax requests
+				// WC AJAX can be used for frontend ajax requests.
 				add_action( 'wc_ajax_' . $ajax_event, array( __CLASS__, $ajax_event ) );
 			}
 		}
 	}
 
 	/**
-	 * Get a refreshed cart fragment.
+	 * Get a refreshed cart fragment, including the mini cart HTML.
 	 */
 	public static function get_refreshed_fragments() {
-
-		// Get mini cart
 		ob_start();
 
 		woocommerce_mini_cart();
 
 		$mini_cart = ob_get_clean();
 
-		// Fragments and mini cart are returned
 		$data = array(
 			'fragments' => apply_filters( 'woocommerce_add_to_cart_fragments', array(
-					'div.widget_shopping_cart_content' => '<div class="widget_shopping_cart_content">' . $mini_cart . '</div>'
+					'div.widget_shopping_cart_content' => '<div class="widget_shopping_cart_content">' . $mini_cart . '</div>',
 				)
 			),
-			'cart_hash' => apply_filters( 'woocommerce_add_to_cart_hash', WC()->cart->get_cart_for_session() ? md5( json_encode( WC()->cart->get_cart_for_session() ) ) : '', WC()->cart->get_cart_for_session() )
+			'cart_hash' => apply_filters( 'woocommerce_add_to_cart_hash', WC()->cart->get_cart_for_session() ? md5( json_encode( WC()->cart->get_cart_for_session() ) ) : '', WC()->cart->get_cart_for_session() ),
 		);
 
 		wp_send_json( $data );
-
 	}
 
 	/**
@@ -194,44 +191,35 @@ class WC_AJAX {
 		}
 
 		wc_print_notices();
-
-		die();
+		wp_die();
 	}
 
 	/**
 	 * AJAX remove coupon on cart and checkout page.
 	 */
 	public static function remove_coupon() {
-
 		check_ajax_referer( 'remove-coupon', 'security' );
 
-		$coupon = wc_clean( $_POST['coupon'] );
-
-		if ( ! isset( $coupon ) || empty( $coupon ) ) {
-			wc_add_notice( __( 'Sorry there was a problem removing this coupon.', 'woocommerce' ) );
+		$coupon = isset( $_POST['coupon'] ) ? wc_clean( $_POST['coupon'] ) : false;
 
+		if ( empty( $coupon ) ) {
+			wc_add_notice( __( 'Sorry there was a problem removing this coupon.', 'woocommerce' ), 'error' );
 		} else {
-
 			WC()->cart->remove_coupon( $coupon );
-
 			wc_add_notice( __( 'Coupon has been removed.', 'woocommerce' ) );
 		}
 
 		wc_print_notices();
-
-		die();
+		wp_die();
 	}
 
 	/**
 	 * AJAX update shipping method on cart page.
 	 */
 	public static function update_shipping_method() {
-
 		check_ajax_referer( 'update-shipping-method', 'security' );
 
-		if ( ! defined('WOOCOMMERCE_CART') ) {
-			define( 'WOOCOMMERCE_CART', true );
-		}
+		wc_maybe_define_constant( 'WOOCOMMERCE_CART', true );
 
 		$chosen_shipping_methods = WC()->session->get( 'chosen_shipping_methods' );
 
@@ -243,35 +231,40 @@ class WC_AJAX {
 
 		WC()->session->set( 'chosen_shipping_methods', $chosen_shipping_methods );
 
+		self::get_cart_totals();
+	}
+
+	/**
+	 * AJAX receive updated cart_totals div.
+	 */
+	public static function get_cart_totals() {
+		wc_maybe_define_constant( 'WOOCOMMERCE_CART', true );
 		WC()->cart->calculate_totals();
-
 		woocommerce_cart_totals();
+		wp_die();
+	}
 
-		die();
+	/**
+	 * Session has expired.
+	 */
+	private static function update_order_review_expired() {
+		wp_send_json( array(
+			'fragments' => apply_filters( 'woocommerce_update_order_review_fragments', array(
+				'form.woocommerce-checkout' => '<div class="woocommerce-error">' . __( 'Sorry, your session has expired.', 'woocommerce' ) . ' <a href="' . esc_url( wc_get_page_permalink( 'shop' ) ) . '" class="wc-backward">' . __( 'Return to shop', 'woocommerce' ) . '</a></div>',
+			) ),
+		) );
 	}
 
 	/**
 	 * AJAX update order review on checkout.
 	 */
 	public static function update_order_review() {
-		ob_start();
-
 		check_ajax_referer( 'update-order-review', 'security' );
 
-		if ( ! defined( 'WOOCOMMERCE_CHECKOUT' ) ) {
-			define( 'WOOCOMMERCE_CHECKOUT', true );
-		}
+		wc_maybe_define_constant( 'WOOCOMMERCE_CHECKOUT', true );
 
 		if ( WC()->cart->is_empty() ) {
-			$data = array(
-				'fragments' => apply_filters( 'woocommerce_update_order_review_fragments', array(
-					'form.woocommerce-checkout' => '<div class="woocommerce-error">' . __( 'Sorry, your session has expired.', 'woocommerce' ) . ' <a href="' . home_url() . '" class="wc-backward">' . __( 'Return to homepage', 'woocommerce' ) . '</a></div>'
-				) )
-			);
-
-			wp_send_json( $data );
-
-			die();
+			self::update_order_review_expired();
 		}
 
 		do_action( 'woocommerce_checkout_update_order_review', $_POST['post_data'] );
@@ -286,83 +279,42 @@ class WC_AJAX {
 
 		WC()->session->set( 'chosen_shipping_methods', $chosen_shipping_methods );
 		WC()->session->set( 'chosen_payment_method', empty( $_POST['payment_method'] ) ? '' : $_POST['payment_method'] );
-
-		if ( isset( $_POST['country'] ) ) {
-			WC()->customer->set_country( $_POST['country'] );
-		}
-
-		if ( isset( $_POST['state'] ) ) {
-			WC()->customer->set_state( $_POST['state'] );
-		}
-
-		if ( isset( $_POST['postcode'] ) ) {
-			WC()->customer->set_postcode( $_POST['postcode'] );
-		}
-
-		if ( isset( $_POST['city'] ) ) {
-			WC()->customer->set_city( $_POST['city'] );
-		}
-
-		if ( isset( $_POST['address'] ) ) {
-			WC()->customer->set_address( $_POST['address'] );
-		}
-
-		if ( isset( $_POST['address_2'] ) ) {
-			WC()->customer->set_address_2( $_POST['address_2'] );
-		}
+		WC()->customer->set_props( array(
+			'billing_country'   => isset( $_POST['country'] ) ? $_POST['country']     : null,
+			'billing_state'     => isset( $_POST['state'] ) ? $_POST['state']         : null,
+			'billing_postcode'  => isset( $_POST['postcode'] ) ? $_POST['postcode']   : null,
+			'billing_city'      => isset( $_POST['city'] ) ? $_POST['city']           : null,
+			'billing_address_1' => isset( $_POST['address'] ) ? $_POST['address']     : null,
+			'billing_address_2' => isset( $_POST['address_2'] ) ? $_POST['address_2'] : null,
+		) );
 
 		if ( wc_ship_to_billing_address_only() ) {
-
-			if ( isset( $_POST['country'] ) ) {
-				WC()->customer->set_shipping_country( $_POST['country'] );
-			}
-
-			if ( isset( $_POST['state'] ) ) {
-				WC()->customer->set_shipping_state( $_POST['state'] );
-			}
-
-			if ( isset( $_POST['postcode'] ) ) {
-				WC()->customer->set_shipping_postcode( $_POST['postcode'] );
-			}
-
-			if ( isset( $_POST['city'] ) ) {
-				WC()->customer->set_shipping_city( $_POST['city'] );
-			}
-
-			if ( isset( $_POST['address'] ) ) {
-				WC()->customer->set_shipping_address( $_POST['address'] );
-			}
-
-			if ( isset( $_POST['address_2'] ) ) {
-				WC()->customer->set_shipping_address_2( $_POST['address_2'] );
+			WC()->customer->set_props( array(
+				'shipping_country'   => isset( $_POST['country'] ) ? $_POST['country']     : null,
+				'shipping_state'     => isset( $_POST['state'] ) ? $_POST['state']         : null,
+				'shipping_postcode'  => isset( $_POST['postcode'] ) ? $_POST['postcode']   : null,
+				'shipping_city'      => isset( $_POST['city'] ) ? $_POST['city']           : null,
+				'shipping_address_1' => isset( $_POST['address'] ) ? $_POST['address']     : null,
+				'shipping_address_2' => isset( $_POST['address_2'] ) ? $_POST['address_2'] : null,
+			) );
+			if ( ! empty( $_POST['country'] ) ) {
+				WC()->customer->set_calculated_shipping( true );
 			}
 		} else {
-
-			if ( isset( $_POST['s_country'] ) ) {
-				WC()->customer->set_shipping_country( $_POST['s_country'] );
-			}
-
-			if ( isset( $_POST['s_state'] ) ) {
-				WC()->customer->set_shipping_state( $_POST['s_state'] );
-			}
-
-			if ( isset( $_POST['s_postcode'] ) ) {
-				WC()->customer->set_shipping_postcode( $_POST['s_postcode'] );
-			}
-
-			if ( isset( $_POST['s_city'] ) ) {
-				WC()->customer->set_shipping_city( $_POST['s_city'] );
-			}
-
-			if ( isset( $_POST['s_address'] ) ) {
-				WC()->customer->set_shipping_address( $_POST['s_address'] );
-			}
-
-			if ( isset( $_POST['s_address_2'] ) ) {
-				WC()->customer->set_shipping_address_2( $_POST['s_address_2'] );
+			WC()->customer->set_props( array(
+				'shipping_country'   => isset( $_POST['s_country'] ) ? $_POST['s_country']     : null,
+				'shipping_state'     => isset( $_POST['s_state'] ) ? $_POST['s_state']         : null,
+				'shipping_postcode'  => isset( $_POST['s_postcode'] ) ? $_POST['s_postcode']   : null,
+				'shipping_city'      => isset( $_POST['s_city'] ) ? $_POST['s_city']           : null,
+				'shipping_address_1' => isset( $_POST['s_address'] ) ? $_POST['s_address']     : null,
+				'shipping_address_2' => isset( $_POST['s_address_2'] ) ? $_POST['s_address_2'] : null,
+			) );
+			if ( ! empty( $_POST['s_country'] ) ) {
+				WC()->customer->set_calculated_shipping( true );
 			}
 		}
 
+		WC()->customer->save();
 		WC()->cart->calculate_totals();
 
 		// Get order review fragment
@@ -383,19 +335,17 @@ class WC_AJAX {
 			$messages = ob_get_clean();
 		}
 
-		$data = array(
+		unset( WC()->session->refresh_totals, WC()->session->reload_checkout );
+
+		wp_send_json( array(
 			'result'    => empty( $messages ) ? 'success' : 'failure',
 			'messages'  => $messages,
 			'reload'    => isset( WC()->session->reload_checkout ) ? 'true' : 'false',
 			'fragments' => apply_filters( 'woocommerce_update_order_review_fragments', array(
 				'.woocommerce-checkout-review-order-table' => $woocommerce_order_review,
-				'.woocommerce-checkout-payment'            => $woocommerce_checkout_payment
-			) )
-		);
-
-		wp_send_json( $data );
-
-		die();
+				'.woocommerce-checkout-payment'            => $woocommerce_checkout_payment,
+			) ),
+		) );
 	}
 
 	/**
@@ -409,12 +359,12 @@ class WC_AJAX {
 		$passed_validation = apply_filters( 'woocommerce_add_to_cart_validation', true, $product_id, $quantity );
 		$product_status    = get_post_status( $product_id );
 
-		if ( $passed_validation && WC()->cart->add_to_cart( $product_id, $quantity ) && 'publish' === $product_status ) {
+		if ( $passed_validation && false !== WC()->cart->add_to_cart( $product_id, $quantity ) && 'publish' === $product_status ) {
 
 			do_action( 'woocommerce_ajax_added_to_cart', $product_id );
 
 			if ( get_option( 'woocommerce_cart_redirect_after_add' ) == 'yes' ) {
-				wc_add_to_cart_message( $product_id );
+				wc_add_to_cart_message( array( $product_id => $quantity ), true );
 			}
 
 			// Return fragments
@@ -425,27 +375,20 @@ class WC_AJAX {
 			// If there was an error adding to the cart, redirect to the product page to show any errors
 			$data = array(
 				'error'       => true,
-				'product_url' => apply_filters( 'woocommerce_cart_redirect_after_error', get_permalink( $product_id ), $product_id )
+				'product_url' => apply_filters( 'woocommerce_cart_redirect_after_error', get_permalink( $product_id ), $product_id ),
 			);
 
 			wp_send_json( $data );
-
 		}
-
-		die();
 	}
 
 	/**
 	 * Process ajax checkout form.
 	 */
 	public static function checkout() {
-		if ( ! defined( 'WOOCOMMERCE_CHECKOUT' ) ) {
-			define( 'WOOCOMMERCE_CHECKOUT', true );
-		}
-
+		wc_maybe_define_constant( 'WOOCOMMERCE_CHECKOUT', true );
 		WC()->checkout()->process_checkout();
-
-		die(0);
+		wp_die( 0 );
 	}
 
 	/**
@@ -454,39 +397,39 @@ class WC_AJAX {
 	public static function get_variation() {
 		ob_start();
 
-		if ( empty( $_POST['product_id'] ) || ! ( $variable_product = wc_get_product( absint( $_POST['product_id'] ), array( 'product_type' => 'variable' ) ) ) ) {
-			die();
-		}
-
-		$variation_id = $variable_product->get_matching_variation( wp_unslash( $_POST ) );
-
-		if ( $variation_id ) {
-			$variation = $variable_product->get_available_variation( $variation_id );
-		} else {
-			$variation = false;
+		if ( empty( $_POST['product_id'] ) || ! ( $variable_product = wc_get_product( absint( $_POST['product_id'] ) ) ) ) {
+			wp_die();
 		}
 
+		$data_store   = WC_Data_Store::load( 'product' );
+		$variation_id = $data_store->find_matching_product_variation( $variable_product, wp_unslash( $_POST ) );
+		$variation    = $variation_id ? $variable_product->get_available_variation( $variation_id ) : false;
 		wp_send_json( $variation );
-
-		die();
 	}
 
 	/**
-	 * Feature a product from admin.
+	 * Locate user via AJAX.
+	 */
+	public static function get_customer_location() {
+		$location_hash = WC_Cache_Helper::geolocation_ajax_get_location_hash();
+		wp_send_json_success( array( 'hash' => $location_hash ) );
+	}
+
+	/**
+	 * Toggle Featured status of a product from admin.
 	 */
 	public static function feature_product() {
 		if ( current_user_can( 'edit_products' ) && check_admin_referer( 'woocommerce-feature-product' ) ) {
-			$product_id = absint( $_GET['product_id'] );
+			$product = wc_get_product( absint( $_GET['product_id'] ) );
 
-			if ( 'product' === get_post_type( $product_id ) ) {
-				update_post_meta( $product_id, '_featured', get_post_meta( $product_id, '_featured', true ) === 'yes' ? 'no' : 'yes' );
-
-				delete_transient( 'wc_featured_products' );
+			if ( $product ) {
+				$product->set_featured( ! $product->get_featured() );
+				$product->save();
 			}
 		}
 
-		wp_safe_redirect( wp_get_referer() ? remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'ids' ), wp_get_referer() ) : admin_url( 'edit.php?post_type=shop_order' ) );
-		die();
+		wp_safe_redirect( wp_get_referer() ? remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'ids' ), wp_get_referer() ) : admin_url( 'edit.php?post_type=product' ) );
+		exit;
 	}
 
 	/**
@@ -494,18 +437,17 @@ class WC_AJAX {
 	 */
 	public static function mark_order_status() {
 		if ( current_user_can( 'edit_shop_orders' ) && check_admin_referer( 'woocommerce-mark-order-status' ) ) {
-			$status   = sanitize_text_field( $_GET['status'] );
-			$order_id = absint( $_GET['order_id'] );
+			$status = sanitize_text_field( $_GET['status'] );
+			$order  = wc_get_order( absint( $_GET['order_id'] ) );
 
-			if ( wc_is_order_status( 'wc-' . $status ) && $order_id ) {
-				$order = wc_get_order( $order_id );
+			if ( wc_is_order_status( 'wc-' . $status ) && $order ) {
 				$order->update_status( $status, '', true );
-				do_action( 'woocommerce_order_edit_status', $order_id, $status );
+				do_action( 'woocommerce_order_edit_status', $order->get_id(), $status );
 			}
 		}
 
 		wp_safe_redirect( wp_get_referer() ? wp_get_referer() : admin_url( 'edit.php?post_type=shop_order' ) );
-		die();
+		exit;
 	}
 
 	/**
@@ -517,71 +459,56 @@ class WC_AJAX {
 		check_ajax_referer( 'add-attribute', 'security' );
 
 		if ( ! current_user_can( 'edit_products' ) ) {
-			die(-1);
+			wp_die( -1 );
 		}
 
-		global $wc_product_attributes;
-
-		$thepostid     = 0;
-		$taxonomy      = sanitize_text_field( $_POST['taxonomy'] );
 		$i             = absint( $_POST['i'] );
-		$position      = 0;
 		$metabox_class = array();
-		$attribute     = array(
-			'name'         => $taxonomy,
-			'value'        => '',
-			'is_visible'   => apply_filters( 'woocommerce_attribute_default_visibility', 1 ),
-			'is_variation' => 0,
-			'is_taxonomy'  => $taxonomy ? 1 : 0
-		);
+		$attribute     = new WC_Product_Attribute();
 
-		if ( $taxonomy ) {
-			$attribute_taxonomy = $wc_product_attributes[ $taxonomy ];
-			$metabox_class[]    = 'taxonomy';
-			$metabox_class[]    = $taxonomy;
-			$attribute_label    = wc_attribute_label( $taxonomy );
-		} else {
-			$attribute_label = '';
+		$attribute->set_id( wc_attribute_taxonomy_id_by_name( sanitize_text_field( $_POST['taxonomy'] ) ) );
+		$attribute->set_name( sanitize_text_field( $_POST['taxonomy'] ) );
+		$attribute->set_visible( apply_filters( 'woocommerce_attribute_default_visibility', 1 ) );
+		$attribute->set_variation( apply_filters( 'woocommerce_attribute_default_is_variation', 0 ) );
+
+		if ( $attribute->is_taxonomy() ) {
+			$metabox_class[] = 'taxonomy';
+			$metabox_class[] = $attribute->get_name();
 		}
 
 		include( 'admin/meta-boxes/views/html-product-attribute.php' );
-		die();
+		wp_die();
 	}
 
 	/**
 	 * Add a new attribute via ajax function.
 	 */
 	public static function add_new_attribute() {
-		ob_start();
-
 		check_ajax_referer( 'add-attribute', 'security' );
 
-		if ( ! current_user_can( 'manage_product_terms' ) ) {
-			die(-1);
-		}
+		if ( current_user_can( 'manage_product_terms' ) ) {
+			$taxonomy = esc_attr( $_POST['taxonomy'] );
+			$term     = wc_clean( $_POST['term'] );
 
-		$taxonomy = esc_attr( $_POST['taxonomy'] );
-		$term     = wc_clean( $_POST['term'] );
+			if ( taxonomy_exists( $taxonomy ) ) {
 
-		if ( taxonomy_exists( $taxonomy ) ) {
+				$result = wp_insert_term( $term, $taxonomy );
 
-			$result = wp_insert_term( $term, $taxonomy );
-
-			if ( is_wp_error( $result ) ) {
-				wp_send_json( array(
-					'error' => $result->get_error_message()
-				) );
-			} else {
-				$term = get_term_by( 'id', $result['term_id'], $taxonomy );
-				wp_send_json( array(
-					'term_id' => $term->term_id,
-					'name'    => $term->name,
-					'slug'    => $term->slug
-				) );
+				if ( is_wp_error( $result ) ) {
+					wp_send_json( array(
+						'error' => $result->get_error_message(),
+					) );
+				} else {
+					$term = get_term_by( 'id', $result['term_id'], $taxonomy );
+					wp_send_json( array(
+						'term_id' => $term->term_id,
+						'name'    => $term->name,
+						'slug'    => $term->slug,
+					) );
+				}
 			}
 		}
-
-		die();
+		wp_die( -1 );
 	}
 
 	/**
@@ -590,152 +517,41 @@ class WC_AJAX {
 	public static function remove_variations() {
 		check_ajax_referer( 'delete-variations', 'security' );
 
-		if ( ! current_user_can( 'edit_products' ) ) {
-			die(-1);
-		}
+		if ( current_user_can( 'edit_products' ) ) {
+			$variation_ids = (array) $_POST['variation_ids'];
 
-		$variation_ids = (array) $_POST['variation_ids'];
-
-		foreach ( $variation_ids as $variation_id ) {
-			$variation = get_post( $variation_id );
-
-			if ( $variation && 'product_variation' == $variation->post_type ) {
-				wp_delete_post( $variation_id );
+			foreach ( $variation_ids as $variation_id ) {
+				if ( 'product_variation' === get_post_type( $variation_id ) ) {
+					$variation = wc_get_product( $variation_id );
+					$variation->delete( true );
+				}
 			}
 		}
 
-		die();
+		wp_die( -1 );
 	}
 
 	/**
 	 * Save attributes via ajax.
 	 */
 	public static function save_attributes() {
-
 		check_ajax_referer( 'save-attributes', 'security' );
 
 		if ( ! current_user_can( 'edit_products' ) ) {
-			die(-1);
+			wp_die( -1 );
 		}
 
-		// Get post data
 		parse_str( $_POST['data'], $data );
-		$post_id = absint( $_POST['post_id'] );
 
-		// Save Attributes
-		$attributes = array();
+		$attributes   = WC_Meta_Box_Product_Data::prepare_attributes( $data );
+		$product_id   = absint( $_POST['post_id'] );
+		$product_type = ! empty( $_POST['product_type'] ) ? wc_clean( $_POST['product_type'] ) : 'simple';
+		$classname    = WC_Product_Factory::get_product_classname( $product_id, $product_type );
+		$product      = new $classname( $product_id );
 
-		if ( isset( $data['attribute_names'] ) ) {
-
-			$attribute_names  = array_map( 'stripslashes', $data['attribute_names'] );
-			$attribute_values = isset( $data['attribute_values'] ) ? $data['attribute_values'] : array();
-
-			if ( isset( $data['attribute_visibility'] ) ) {
-				$attribute_visibility = $data['attribute_visibility'];
-			}
-
-			if ( isset( $data['attribute_variation'] ) ) {
-				$attribute_variation = $data['attribute_variation'];
-			}
-
-			$attribute_is_taxonomy   = $data['attribute_is_taxonomy'];
-			$attribute_position      = $data['attribute_position'];
-			$attribute_names_max_key = max( array_keys( $attribute_names ) );
-
-			for ( $i = 0; $i <= $attribute_names_max_key; $i++ ) {
-				if ( empty( $attribute_names[ $i ] ) ) {
-					continue;
-				}
-
-				$is_visible   = isset( $attribute_visibility[ $i ] ) ? 1 : 0;
-				$is_variation = isset( $attribute_variation[ $i ] ) ? 1 : 0;
-				$is_taxonomy  = $attribute_is_taxonomy[ $i ] ? 1 : 0;
-
-				if ( $is_taxonomy ) {
-
-					if ( isset( $attribute_values[ $i ] ) ) {
-
-						// Select based attributes - Format values (posted values are slugs)
-						if ( is_array( $attribute_values[ $i ] ) ) {
-							$values = array_map( 'sanitize_title', $attribute_values[ $i ] );
-
-						// Text based attributes - Posted values are term names, wp_set_object_terms wants ids or slugs.
-						} else {
-							$values     = array();
-							$raw_values = array_map( 'wc_sanitize_term_text_based', explode( WC_DELIMITER, $attribute_values[ $i ] ) );
-
-							foreach ( $raw_values as $value ) {
-								$term = get_term_by( 'name', $value, $attribute_names[ $i ] );
-								if ( ! $term ) {
-									$term = wp_insert_term( $value, $attribute_names[ $i ] );
-
-									if ( $term && ! is_wp_error( $term ) ) {
-										$values[] = $term['term_id'];
-									}
-								} else {
-									$values[] = $term->term_id;
-								}
-							}
-						}
-
-						// Remove empty items in the array
-						$values = array_filter( $values, 'strlen' );
-
-					} else {
-						$values = array();
-					}
-
-					// Update post terms
-					if ( taxonomy_exists( $attribute_names[ $i ] ) ) {
-						wp_set_object_terms( $post_id, $values, $attribute_names[ $i ] );
-					}
-
-					if ( $values ) {
-						// Add attribute to array, but don't set values
-						$attributes[ sanitize_title( $attribute_names[ $i ] ) ] = array(
-							'name' 			=> wc_clean( $attribute_names[ $i ] ),
-							'value' 		=> '',
-							'position' 		=> $attribute_position[ $i ],
-							'is_visible' 	=> $is_visible,
-							'is_variation' 	=> $is_variation,
-							'is_taxonomy' 	=> $is_taxonomy
-						);
-					}
-
-				} elseif ( isset( $attribute_values[ $i ] ) ) {
-
-					// Text based, possibly separated by pipes (WC_DELIMITER). Preserve line breaks in non-variation attributes.
-					$values = $is_variation ? wc_clean( $attribute_values[ $i ] ) : implode( "\n", array_map( 'wc_clean', explode( "\n", $attribute_values[ $i ] ) ) );
-					$values = implode( ' ' . WC_DELIMITER . ' ', wc_get_text_attributes( $values ) );
-
-					// Custom attribute - Add attribute to array and set the values
-					$attributes[ sanitize_title( $attribute_names[ $i ] ) ] = array(
-						'name' 			=> wc_clean( $attribute_names[ $i ] ),
-						'value' 		=> $values,
-						'position' 		=> $attribute_position[ $i ],
-						'is_visible' 	=> $is_visible,
-						'is_variation' 	=> $is_variation,
-						'is_taxonomy' 	=> $is_taxonomy
-					);
-				}
-
-			 }
-		}
-
-		if ( ! function_exists( 'attributes_cmp' ) ) {
-			function attributes_cmp( $a, $b ) {
-				if ( $a['position'] == $b['position'] ) {
-					return 0;
-				}
-
-				return ( $a['position'] < $b['position'] ) ? -1 : 1;
-			}
-		}
-		uasort( $attributes, 'attributes_cmp' );
-
-		update_post_meta( $post_id, '_product_attributes', $attributes );
-
-		die();
+		$product->set_attributes( $attributes );
+		$product->save();
+		wp_die();
 	}
 
 	/**
@@ -746,275 +562,101 @@ class WC_AJAX {
 		check_ajax_referer( 'add-variation', 'security' );
 
 		if ( ! current_user_can( 'edit_products' ) ) {
-			die(-1);
+			wp_die( -1 );
 		}
 
-		global $post;
+		global $post; // Set $post global so its available, like within the admin screens
 
-		$post_id = intval( $_POST['post_id'] );
-		$post    = get_post( $post_id ); // Set $post global so its available like within the admin screens
-		$loop    = intval( $_POST['loop'] );
-
-		$variation = array(
-			'post_title'   => 'Product #' . $post_id . ' Variation',
-			'post_content' => '',
-			'post_status'  => 'publish',
-			'post_author'  => get_current_user_id(),
-			'post_parent'  => $post_id,
-			'post_type'    => 'product_variation',
-			'menu_order'   => -1
-		);
-
-		$variation_id = wp_insert_post( $variation );
-
-		do_action( 'woocommerce_create_product_variation', $variation_id );
-
-		if ( $variation_id ) {
-			$variation        = get_post( $variation_id );
-			$variation_meta   = get_post_meta( $variation_id );
-			$variation_data   = array();
-			$shipping_classes = get_the_terms( $variation_id, 'product_shipping_class' );
-			$variation_fields = array(
-				'_sku'                   => '',
-				'_stock'                 => '',
-				'_regular_price'         => '',
-				'_sale_price'            => '',
-				'_weight'                => '',
-				'_length'                => '',
-				'_width'                 => '',
-				'_height'                => '',
-				'_download_limit'        => '',
-				'_download_expiry'       => '',
-				'_downloadable_files'    => '',
-				'_downloadable'          => '',
-				'_virtual'               => '',
-				'_thumbnail_id'          => '',
-				'_sale_price_dates_from' => '',
-				'_sale_price_dates_to'   => '',
-				'_manage_stock'          => '',
-				'_stock_status'          => '',
-				'_backorders'            => null,
-				'_tax_class'             => null,
-				'_variation_description' => ''
-			);
-
-			foreach ( $variation_fields as $field => $value ) {
-				$variation_data[ $field ] = isset( $variation_meta[ $field ][0] ) ? maybe_unserialize( $variation_meta[ $field ][0] ) : $value;
-			}
-
-			// Add the variation attributes
-			$variation_data = array_merge( $variation_data, wc_get_product_variation_attributes( $variation_id ) );
-
-			// Formatting
-			$variation_data['_regular_price'] = wc_format_localized_price( $variation_data['_regular_price'] );
-			$variation_data['_sale_price']    = wc_format_localized_price( $variation_data['_sale_price'] );
-			$variation_data['_weight']        = wc_format_localized_decimal( $variation_data['_weight'] );
-			$variation_data['_length']        = wc_format_localized_decimal( $variation_data['_length'] );
-			$variation_data['_width']         = wc_format_localized_decimal( $variation_data['_width'] );
-			$variation_data['_height']        = wc_format_localized_decimal( $variation_data['_height'] );
-			$variation_data['_thumbnail_id']  = absint( $variation_data['_thumbnail_id'] );
-			$variation_data['image']          = $variation_data['_thumbnail_id'] ? wp_get_attachment_thumb_url( $variation_data['_thumbnail_id'] ) : '';
-			$variation_data['shipping_class'] = $shipping_classes && ! is_wp_error( $shipping_classes ) ? current( $shipping_classes )->term_id : '';
-			$variation_data['menu_order']     = $variation->menu_order;
-			$variation_data['_stock']         = wc_stock_amount( $variation_data['_stock'] );
-
-			// Get tax classes
-			$tax_classes           = WC_Tax::get_tax_classes();
-			$tax_class_options     = array();
-			$tax_class_options[''] = __( 'Standard', 'woocommerce' );
-
-			if ( ! empty( $tax_classes ) ) {
-				foreach ( $tax_classes as $class ) {
-					$tax_class_options[ sanitize_title( $class ) ] = esc_attr( $class );
-				}
-			}
-
-			// Set backorder options
-			$backorder_options = array(
-				'no'     => __( 'Do not allow', 'woocommerce' ),
-				'notify' => __( 'Allow, but notify customer', 'woocommerce' ),
-				'yes'    => __( 'Allow', 'woocommerce' )
-			);
-
-			// set stock status options
-			$stock_status_options = array(
-				'instock'    => __( 'In stock', 'woocommerce' ),
-				'outofstock' => __( 'Out of stock', 'woocommerce' )
-			);
-
-			// Get attributes
-			$attributes = (array) maybe_unserialize( get_post_meta( $post_id, '_product_attributes', true ) );
-
-			$parent_data = array(
-				'id'                   => $post_id,
-				'attributes'           => $attributes,
-				'tax_class_options'    => $tax_class_options,
-				'sku'                  => get_post_meta( $post_id, '_sku', true ),
-				'weight'               => wc_format_localized_decimal( get_post_meta( $post_id, '_weight', true ) ),
-				'length'               => wc_format_localized_decimal( get_post_meta( $post_id, '_length', true ) ),
-				'width'                => wc_format_localized_decimal( get_post_meta( $post_id, '_width', true ) ),
-				'height'               => wc_format_localized_decimal( get_post_meta( $post_id, '_height', true ) ),
-				'tax_class'            => get_post_meta( $post_id, '_tax_class', true ),
-				'backorder_options'    => $backorder_options,
-				'stock_status_options' => $stock_status_options
-			);
-
-			if ( ! $parent_data['weight'] ) {
-				$parent_data['weight'] = wc_format_localized_decimal( 0 );
-			}
-
-			if ( ! $parent_data['length'] ) {
-				$parent_data['length'] = wc_format_localized_decimal( 0 );
-			}
-
-			if ( ! $parent_data['width'] ) {
-				$parent_data['width'] = wc_format_localized_decimal( 0 );
-			}
-
-			if ( ! $parent_data['height'] ) {
-				$parent_data['height'] = wc_format_localized_decimal( 0 );
-			}
-
-			include( 'admin/meta-boxes/views/html-variation-admin.php' );
-		}
-
-		die();
+		$product_id       = intval( $_POST['post_id'] );
+		$post             = get_post( $product_id );
+		$loop             = intval( $_POST['loop'] );
+		$product_object   = wc_get_product( $product_id );
+		$variation_object = new WC_Product_Variation();
+		$variation_object->set_parent_id( $product_id );
+		$variation_id     = $variation_object->save();
+		$variation        = get_post( $variation_id );
+		$variation_data   = array_merge( array_map( 'maybe_unserialize', get_post_custom( $variation_id ) ), wc_get_product_variation_attributes( $variation_id ) ); // kept for BW compat.
+		include( 'admin/meta-boxes/views/html-variation-admin.php' );
+		wp_die();
 	}
 
 	/**
 	 * Link all variations via ajax function.
 	 */
 	public static function link_all_variations() {
-
-		if ( ! defined( 'WC_MAX_LINKED_VARIATIONS' ) ) {
-			define( 'WC_MAX_LINKED_VARIATIONS', 49 );
-		}
-
 		check_ajax_referer( 'link-variations', 'security' );
 
 		if ( ! current_user_can( 'edit_products' ) ) {
-			die(-1);
+			wp_die( -1 );
 		}
 
-		if ( function_exists( 'set_time_limit' ) && false === strpos( ini_get( 'disable_functions' ), 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-			@set_time_limit( 0 );
-		}
+		wc_maybe_define_constant( 'WC_MAX_LINKED_VARIATIONS', 49 );
+		wc_set_time_limit( 0 );
 
 		$post_id = intval( $_POST['post_id'] );
 
 		if ( ! $post_id ) {
-			die();
+			wp_die();
 		}
 
 		$variations = array();
-		$_product   = wc_get_product( $post_id, array( 'product_type' => 'variable' ) );
+		$product    = wc_get_product( $post_id );
+		$attributes = wc_list_pluck( array_filter( $product->get_attributes(), 'wc_attributes_array_filter_variation' ), 'get_slugs' );
 
-		// Put variation attributes into an array
-		foreach ( $_product->get_attributes() as $attribute ) {
+		if ( ! empty( $attributes ) ) {
+			// Get existing variations so we don't create duplicates.
+			$existing_variations = array_map( 'wc_get_product', $product->get_children() );
+			$existing_attributes = array();
 
-			if ( ! $attribute['is_variation'] ) {
-				continue;
+			foreach ( $existing_variations as $existing_variation ) {
+				$existing_attributes[] = $existing_variation->get_attributes();
 			}
 
-			$attribute_field_name = 'attribute_' . sanitize_title( $attribute['name'] );
+			$added               = 0;
+			$possible_attributes = wc_array_cartesian( $attributes );
 
-			if ( $attribute['is_taxonomy'] ) {
-				$options = wc_get_product_terms( $post_id, $attribute['name'], array( 'fields' => 'slugs' ) );
-			} else {
-				$options = explode( WC_DELIMITER, $attribute['value'] );
+			foreach ( $possible_attributes as $possible_attribute ) {
+				if ( in_array( $possible_attribute, $existing_attributes ) ) {
+					continue;
+				}
+				$variation = new WC_Product_Variation();
+				$variation->set_parent_id( $post_id );
+				$variation->set_attributes( $possible_attribute );
+
+				do_action( 'product_variation_linked', $variation->save() );
+
+				if ( ( $added ++ ) > WC_MAX_LINKED_VARIATIONS ) {
+					break;
+				}
 			}
 
-			$options = array_map( 'trim', $options );
-
-			$variations[ $attribute_field_name ] = $options;
+			echo $added;
 		}
 
-		// Quit out if none were found
-		if ( sizeof( $variations ) == 0 ) {
-			die();
-		}
-
-		// Get existing variations so we don't create duplicates
-		$available_variations = array();
-
-		foreach( $_product->get_children() as $child_id ) {
-			$child = $_product->get_child( $child_id );
-
-			if ( ! empty( $child->variation_id ) ) {
-				$available_variations[] = $child->get_variation_attributes();
-			}
-		}
-
-		// Created posts will all have the following data
-		$variation_post_data = array(
-			'post_title'   => 'Product #' . $post_id . ' Variation',
-			'post_content' => '',
-			'post_status'  => 'publish',
-			'post_author'  => get_current_user_id(),
-			'post_parent'  => $post_id,
-			'post_type'    => 'product_variation'
-		);
-
-		$variation_ids       = array();
-		$added               = 0;
-		$possible_variations = wc_array_cartesian( $variations );
-
-		foreach ( $possible_variations as $variation ) {
-
-			// Check if variation already exists
-			if ( in_array( $variation, $available_variations ) ) {
-				continue;
-			}
-
-			$variation_id = wp_insert_post( $variation_post_data );
-
-			$variation_ids[] = $variation_id;
-
-			foreach ( $variation as $key => $value ) {
-				update_post_meta( $variation_id, $key, $value );
-			}
-
-			// Save stock status
-			update_post_meta( $variation_id, '_stock_status', 'instock' );
-
-			$added++;
-
-			do_action( 'product_variation_linked', $variation_id );
-
-			if ( $added > WC_MAX_LINKED_VARIATIONS ) {
-				break;
-			}
-		}
-
-		delete_transient( 'wc_product_children_' . $post_id );
-
-		echo $added;
-
-		die();
+		$data_store = $product->get_data_store();
+		$data_store->sort_all_product_variations( $product->get_id() );
+		wp_die();
 	}
 
 	/**
 	 * Delete download permissions via ajax function.
 	 */
 	public static function revoke_access_to_download() {
-
 		check_ajax_referer( 'revoke-access', 'security' );
 
 		if ( ! current_user_can( 'edit_shop_orders' ) ) {
-			die(-1);
+			wp_die( -1 );
 		}
+		$download_id   = $_POST['download_id'];
+		$product_id    = intval( $_POST['product_id'] );
+		$order_id      = intval( $_POST['order_id'] );
+		$permission_id = absint( $_POST['permission_id'] );
+		$data_store    = WC_Data_Store::load( 'customer-download' );
+		$data_store->delete_by_id( $permission_id );
 
-		global $wpdb;
+		do_action( 'woocommerce_ajax_revoke_access_to_product_download', $download_id, $product_id, $order_id, $permission_id );
 
-		$download_id = $_POST['download_id'];
-		$product_id  = intval( $_POST['product_id'] );
-		$order_id    = intval( $_POST['order_id'] );
-
-		$wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->prefix}woocommerce_downloadable_product_permissions WHERE order_id = %d AND product_id = %d AND download_id = %s;", $order_id, $product_id, $download_id ) );
-
-		do_action( 'woocommerce_ajax_revoke_access_to_product_download', $download_id, $product_id, $order_id );
-
-		die();
+		wp_die();
 	}
 
 	/**
@@ -1025,7 +667,7 @@ class WC_AJAX {
 		check_ajax_referer( 'grant-access', 'security' );
 
 		if ( ! current_user_can( 'edit_shop_orders' ) ) {
-			die(-1);
+			wp_die( -1 );
 		}
 
 		global $wpdb;
@@ -1044,24 +686,21 @@ class WC_AJAX {
 
 		foreach ( $product_ids as $product_id ) {
 			$product = wc_get_product( $product_id );
-			$files   = $product->get_files();
+			$files   = $product->get_downloads();
 
-			if ( ! $order->billing_email ) {
-				die();
+			if ( ! $order->get_billing_email() ) {
+				wp_die();
 			}
 
-			if ( $files ) {
+			if ( ! empty( $files ) ) {
 				foreach ( $files as $download_id => $file ) {
 					if ( $inserted_id = wc_downloadable_file_permission( $download_id, $product_id, $order ) ) {
-
-						// insert complete - get inserted data
-						$download = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->prefix}woocommerce_downloadable_product_permissions WHERE permission_id = %d", $inserted_id ) );
-
+						$download = new WC_Customer_Download( $inserted_id );
 						$loop ++;
 						$file_counter ++;
 
-						if ( isset( $file['name'] ) ) {
-							$file_count = $file['name'];
+						if ( $file->get_name() ) {
+							$file_count = $file->get_name();
 						} else {
 							$file_count = sprintf( __( 'File %d', 'woocommerce' ), $file_counter );
 						}
@@ -1070,41 +709,31 @@ class WC_AJAX {
 				}
 			}
 		}
-
-		die();
+		wp_die();
 	}
 
 	/**
 	 * Get customer details via ajax.
 	 */
 	public static function get_customer_details() {
-		ob_start();
-
 		check_ajax_referer( 'get-customer-details', 'security' );
 
 		if ( ! current_user_can( 'edit_shop_orders' ) ) {
-			die(-1);
+			wp_die( -1 );
 		}
 
-		$user_id      = (int) trim(stripslashes($_POST['user_id']));
-		$type_to_load = esc_attr(trim(stripslashes($_POST['type_to_load'])));
+		$user_id  = absint( $_POST['user_id'] );
+		$customer = new WC_Customer( $user_id );
 
-		$customer_data = array(
-			$type_to_load . '_first_name' => get_user_meta( $user_id, $type_to_load . '_first_name', true ),
-			$type_to_load . '_last_name'  => get_user_meta( $user_id, $type_to_load . '_last_name', true ),
-			$type_to_load . '_company'    => get_user_meta( $user_id, $type_to_load . '_company', true ),
-			$type_to_load . '_address_1'  => get_user_meta( $user_id, $type_to_load . '_address_1', true ),
-			$type_to_load . '_address_2'  => get_user_meta( $user_id, $type_to_load . '_address_2', true ),
-			$type_to_load . '_city'       => get_user_meta( $user_id, $type_to_load . '_city', true ),
-			$type_to_load . '_postcode'   => get_user_meta( $user_id, $type_to_load . '_postcode', true ),
-			$type_to_load . '_country'    => get_user_meta( $user_id, $type_to_load . '_country', true ),
-			$type_to_load . '_state'      => get_user_meta( $user_id, $type_to_load . '_state', true ),
-			$type_to_load . '_email'      => get_user_meta( $user_id, $type_to_load . '_email', true ),
-			$type_to_load . '_phone'      => get_user_meta( $user_id, $type_to_load . '_phone', true ),
-		);
+		if ( has_filter( 'woocommerce_found_customer_details' ) ) {
+			wc_deprecated_function( 'The woocommerce_found_customer_details filter', '3.0', 'woocommerce_ajax_get_customer_details' );
+		}
 
-		$customer_data = apply_filters( 'woocommerce_found_customer_details', $customer_data, $user_id, $type_to_load );
+		$data = $customer->get_data();
+		$data['date_created']  = $data['date_created'] ? $data['date_created']->getTimestamp() : null;
+		$data['date_modified'] = $data['date_modified'] ? $data['date_modified']->getTimestamp() : null;
 
+		$customer_data = apply_filters( 'woocommerce_ajax_get_customer_details', $data, $customer, $user_id );
 		wp_send_json( $customer_data );
 	}
 
@@ -1115,171 +744,134 @@ class WC_AJAX {
 		check_ajax_referer( 'order-item', 'security' );
 
 		if ( ! current_user_can( 'edit_shop_orders' ) ) {
-			die(-1);
+			wp_die( -1 );
 		}
 
-		$item_to_add = sanitize_text_field( $_POST['item_to_add'] );
-		$order_id    = absint( $_POST['order_id'] );
+		try {
+			$order_id     = absint( $_POST['order_id'] );
+			$order        = wc_get_order( $order_id );
+			$items_to_add = wp_parse_id_list( is_array( $_POST['item_to_add'] ) ? $_POST['item_to_add'] : array( $_POST['item_to_add'] ) );
 
-		// Find the item
-		if ( ! is_numeric( $item_to_add ) ) {
-			die();
-		}
-
-		$post = get_post( $item_to_add );
-
-		if ( ! $post || ( 'product' !== $post->post_type && 'product_variation' !== $post->post_type ) ) {
-			die();
-		}
-
-		$_product    = wc_get_product( $post->ID );
-		$order       = wc_get_order( $order_id );
-		$order_taxes = $order->get_taxes();
-		$class       = 'new_row';
-
-		// Set values
-		$item = array();
-
-		$item['product_id']        = $_product->id;
-		$item['variation_id']      = isset( $_product->variation_id ) ? $_product->variation_id : '';
-		$item['variation_data']    = $item['variation_id'] ? $_product->get_variation_attributes() : '';
-		$item['name']              = $_product->get_title();
-		$item['tax_class']         = $_product->get_tax_class();
-		$item['qty']               = 1;
-		$item['line_subtotal']     = wc_format_decimal( $_product->get_price_excluding_tax() );
-		$item['line_subtotal_tax'] = '';
-		$item['line_total']        = wc_format_decimal( $_product->get_price_excluding_tax() );
-		$item['line_tax']          = '';
-		$item['type']              = 'line_item';
-
-		// Add line item
-		$item_id = wc_add_order_item( $order_id, array(
-			'order_item_name' 		=> $item['name'],
-			'order_item_type' 		=> 'line_item'
-		) );
-
-		// Add line item meta
-		if ( $item_id ) {
-			wc_add_order_item_meta( $item_id, '_qty', $item['qty'] );
-			wc_add_order_item_meta( $item_id, '_tax_class', $item['tax_class'] );
-			wc_add_order_item_meta( $item_id, '_product_id', $item['product_id'] );
-			wc_add_order_item_meta( $item_id, '_variation_id', $item['variation_id'] );
-			wc_add_order_item_meta( $item_id, '_line_subtotal', $item['line_subtotal'] );
-			wc_add_order_item_meta( $item_id, '_line_subtotal_tax', $item['line_subtotal_tax'] );
-			wc_add_order_item_meta( $item_id, '_line_total', $item['line_total'] );
-			wc_add_order_item_meta( $item_id, '_line_tax', $item['line_tax'] );
-
-			// Since 2.2
-			wc_add_order_item_meta( $item_id, '_line_tax_data', array( 'total' => array(), 'subtotal' => array() ) );
-
-			// Store variation data in meta
-			if ( $item['variation_data'] && is_array( $item['variation_data'] ) ) {
-				foreach ( $item['variation_data'] as $key => $value ) {
-					wc_add_order_item_meta( $item_id, str_replace( 'attribute_', '', $key ), $value );
-				}
+			if ( ! $order ) {
+				throw new Exception( __( 'Invalid order', 'woocommerce' ) );
 			}
 
-			do_action( 'woocommerce_ajax_add_order_item_meta', $item_id, $item );
+			ob_start();
+
+			foreach ( $items_to_add as $item_to_add ) {
+				if ( ! in_array( get_post_type( $item_to_add ), array( 'product', 'product_variation' ) ) ) {
+					continue;
+				}
+				$item_id     = $order->add_product( wc_get_product( $item_to_add ) );
+				$item        = apply_filters( 'woocommerce_ajax_order_item', $order->get_item( $item_id ), $item_id );
+				$order_taxes = $order->get_taxes();
+				$class       = 'new_row';
+
+				do_action( 'woocommerce_ajax_add_order_item_meta', $item_id, $item );
+				include( 'admin/meta-boxes/views/html-order-item.php' );
+			}
+
+			wp_send_json_success( array(
+				'html' => ob_get_clean(),
+			) );
+		} catch ( Exception $e ) {
+			wp_send_json_error( array( 'error' => $e->getMessage() ) );
 		}
-
-		$item['item_meta']       = $order->get_item_meta( $item_id );
-		$item['item_meta_array'] = $order->get_item_meta_array( $item_id );
-		$item                    = $order->expand_item_meta( $item );
-		$item                    = apply_filters( 'woocommerce_ajax_order_item', $item, $item_id );
-
-		include( 'admin/meta-boxes/views/html-order-item.php' );
-
-		// Quit out
-		die();
 	}
 
 	/**
 	 * Add order fee via ajax.
 	 */
 	public static function add_order_fee() {
-
 		check_ajax_referer( 'order-item', 'security' );
 
 		if ( ! current_user_can( 'edit_shop_orders' ) ) {
-			die(-1);
+			wp_die( -1 );
 		}
 
-		$order_id      = absint( $_POST['order_id'] );
-		$order         = wc_get_order( $order_id );
-		$order_taxes   = $order->get_taxes();
-		$item          = array();
+		try {
+			$order_id    = absint( $_POST['order_id'] );
+			$order       = wc_get_order( $order_id );
+			$order_taxes = $order->get_taxes();
+			$item        = new WC_Order_Item_Fee();
+			$item->set_order_id( $order_id );
+			$item_id     = $item->save();
 
-		// Add new fee
-		$fee            = new stdClass();
-		$fee->name      = '';
-		$fee->tax_class = '';
-		$fee->taxable   = $fee->tax_class !== '0';
-		$fee->amount    = '';
-		$fee->tax       = '';
-		$fee->tax_data  = array();
-		$item_id        = $order->add_fee( $fee );
+			ob_start();
+			include( 'admin/meta-boxes/views/html-order-fee.php' );
 
-		include( 'admin/meta-boxes/views/html-order-fee.php' );
-
-		// Quit out
-		die();
+			wp_send_json_success( array(
+				'html' => ob_get_clean(),
+			) );
+		} catch ( Exception $e ) {
+			wp_send_json_error( array( 'error' => $e->getMessage() ) );
+		}
 	}
 
 	/**
 	 * Add order shipping cost via ajax.
 	 */
 	public static function add_order_shipping() {
-
 		check_ajax_referer( 'order-item', 'security' );
 
 		if ( ! current_user_can( 'edit_shop_orders' ) ) {
-			die(-1);
+			wp_die( -1 );
 		}
 
-		$order_id         = absint( $_POST['order_id'] );
-		$order            = wc_get_order( $order_id );
-		$order_taxes      = $order->get_taxes();
-		$shipping_methods = WC()->shipping() ? WC()->shipping->load_shipping_methods() : array();
-		$item             = array();
+		try {
+			$order_id         = absint( $_POST['order_id'] );
+			$order            = wc_get_order( $order_id );
+			$order_taxes      = $order->get_taxes();
+			$shipping_methods = WC()->shipping() ? WC()->shipping->load_shipping_methods() : array();
 
-		// Add new shipping
-		$shipping        = new stdClass();
-		$shipping->label = '';
-		$shipping->id    = '';
-		$shipping->cost  = '';
-		$shipping->taxes = array();
-		$item_id         = $order->add_shipping( $shipping );
+			// Add new shipping
+			$item = new WC_Order_Item_Shipping();
+			$item->set_shipping_rate( new WC_Shipping_Rate() );
+			$item->set_order_id( $order_id );
+			$item_id = $item->save();
 
-		include( 'admin/meta-boxes/views/html-order-shipping.php' );
+			ob_start();
+			include( 'admin/meta-boxes/views/html-order-shipping.php' );
 
-		// Quit out
-		die();
+			wp_send_json_success( array(
+				'html' => ob_get_clean(),
+			) );
+		} catch ( Exception $e ) {
+			wp_send_json_error( array( 'error' => $e->getMessage() ) );
+		}
 	}
 
 	/**
 	 * Add order tax column via ajax.
 	 */
 	public static function add_order_tax() {
-		global $wpdb;
-
 		check_ajax_referer( 'order-item', 'security' );
 
 		if ( ! current_user_can( 'edit_shop_orders' ) ) {
-			die(-1);
+			wp_die( -1 );
 		}
 
-		$order_id = absint( $_POST['order_id'] );
-		$rate_id  = absint( $_POST['rate_id'] );
-		$order    = wc_get_order( $order_id );
-		$data     = get_post_meta( $order_id );
+		try {
+			$order_id = absint( $_POST['order_id'] );
+			$rate_id  = absint( $_POST['rate_id'] );
+			$order    = wc_get_order( $order_id );
+			$data     = get_post_meta( $order_id );
 
-		// Add new tax
-		$order->add_tax( $rate_id, 0, 0 );
+			// Add new tax
+			$item = new WC_Order_Item_Tax();
+			$item->set_rate( $rate_id );
+			$item->set_order_id( $order_id );
+			$item->save();
 
-		// Return HTML items
-		include( 'admin/meta-boxes/views/html-order-items.php' );
+			ob_start();
+			include( 'admin/meta-boxes/views/html-order-items.php' );
 
-		die();
+			wp_send_json_success( array(
+				'html' => ob_get_clean(),
+			) );
+		} catch ( Exception $e ) {
+			wp_send_json_error( array( 'error' => $e->getMessage() ) );
+		}
 	}
 
 	/**
@@ -1289,7 +881,7 @@ class WC_AJAX {
 		check_ajax_referer( 'order-item', 'security' );
 
 		if ( ! current_user_can( 'edit_shop_orders' ) ) {
-			die(-1);
+			wp_die( -1 );
 		}
 
 		$order_item_ids = $_POST['order_item_ids'];
@@ -1299,23 +891,21 @@ class WC_AJAX {
 		}
 
 		if ( sizeof( $order_item_ids ) > 0 ) {
-			foreach( $order_item_ids as $id ) {
+			foreach ( $order_item_ids as $id ) {
 				wc_delete_order_item( absint( $id ) );
 			}
 		}
-
-		die();
+		wp_die();
 	}
 
 	/**
 	 * Remove an order tax.
 	 */
 	public static function remove_order_tax() {
-
 		check_ajax_referer( 'order-item', 'security' );
 
 		if ( ! current_user_can( 'edit_shop_orders' ) ) {
-			die(-1);
+			wp_die( -1 );
 		}
 
 		$order_id = absint( $_POST['order_id'] );
@@ -1325,10 +915,8 @@ class WC_AJAX {
 
 		// Return HTML items
 		$order = wc_get_order( $order_id );
-		$data  = get_post_meta( $order_id );
 		include( 'admin/meta-boxes/views/html-order-items.php' );
-
-		die();
+		wp_die();
 	}
 
 	/**
@@ -1336,51 +924,38 @@ class WC_AJAX {
 	 */
 	public static function reduce_order_item_stock() {
 		check_ajax_referer( 'order-item', 'security' );
-
 		if ( ! current_user_can( 'edit_shop_orders' ) ) {
-			die(-1);
+			wp_die( -1 );
 		}
-
 		$order_id       = absint( $_POST['order_id'] );
 		$order_item_ids = isset( $_POST['order_item_ids'] ) ? $_POST['order_item_ids'] : array();
 		$order_item_qty = isset( $_POST['order_item_qty'] ) ? $_POST['order_item_qty'] : array();
 		$order          = wc_get_order( $order_id );
 		$order_items    = $order->get_items();
 		$return         = array();
-
 		if ( $order && ! empty( $order_items ) && sizeof( $order_item_ids ) > 0 ) {
-
 			foreach ( $order_items as $item_id => $order_item ) {
-
 				// Only reduce checked items
 				if ( ! in_array( $item_id, $order_item_ids ) ) {
 					continue;
 				}
-
-				$_product = $order->get_product_from_item( $order_item );
-
-				if ( $_product->exists() && $_product->managing_stock() && isset( $order_item_qty[ $item_id ] ) && $order_item_qty[ $item_id ] > 0 ) {
+				$_product = $order_item->get_product();
+				if ( $_product && $_product->exists() && $_product->managing_stock() && isset( $order_item_qty[ $item_id ] ) && $order_item_qty[ $item_id ] > 0 ) {
 					$stock_change = apply_filters( 'woocommerce_reduce_order_stock_quantity', $order_item_qty[ $item_id ], $item_id );
-					$new_stock    = $_product->reduce_stock( $stock_change );
-					$item_name    = $_product->get_sku() ? $_product->get_sku() : $order_item['product_id'];
-					$note         = sprintf( __( 'Item %s stock reduced from %s to %s.', 'woocommerce' ), $item_name, $new_stock + $stock_change, $new_stock );
+					$new_stock    = wc_update_product_stock( $_product, $stock_change, 'decrease' );
+					$item_name    = $_product->get_sku() ? $_product->get_sku() : $_product->get_id();
+					$note         = sprintf( __( 'Item %1$s stock reduced from %2$s to %3$s.', 'woocommerce' ), $item_name, $new_stock + $stock_change, $new_stock );
 					$return[]     = $note;
-
 					$order->add_order_note( $note );
-					$order->send_stock_notifications( $_product, $new_stock, $order_item_qty[ $item_id ] );
 				}
 			}
-
 			do_action( 'woocommerce_reduce_order_stock', $order );
-
 			if ( empty( $return ) ) {
 				$return[] = __( 'No products had their stock reduced - they may not have stock management enabled.', 'woocommerce' );
 			}
-
-			echo implode( ', ', $return );
+			echo wp_kses_post( implode( ', ', $return ) );
 		}
-
-		die();
+		wp_die();
 	}
 
 	/**
@@ -1388,248 +963,72 @@ class WC_AJAX {
 	 */
 	public static function increase_order_item_stock() {
 		check_ajax_referer( 'order-item', 'security' );
-
 		if ( ! current_user_can( 'edit_shop_orders' ) ) {
-			die(-1);
+			wp_die( -1 );
 		}
-
 		$order_id       = absint( $_POST['order_id'] );
 		$order_item_ids = isset( $_POST['order_item_ids'] ) ? $_POST['order_item_ids'] : array();
 		$order_item_qty = isset( $_POST['order_item_qty'] ) ? $_POST['order_item_qty'] : array();
 		$order          = wc_get_order( $order_id );
 		$order_items    = $order->get_items();
 		$return         = array();
-
 		if ( $order && ! empty( $order_items ) && sizeof( $order_item_ids ) > 0 ) {
-
 			foreach ( $order_items as $item_id => $order_item ) {
-
 				// Only reduce checked items
 				if ( ! in_array( $item_id, $order_item_ids ) ) {
 					continue;
 				}
-
-				$_product = $order->get_product_from_item( $order_item );
-
-				if ( $_product->exists() && $_product->managing_stock() && isset( $order_item_qty[ $item_id ] ) && $order_item_qty[ $item_id ] > 0 ) {
+				$_product = $order_item->get_product();
+				if ( $_product && $_product->exists() && $_product->managing_stock() && isset( $order_item_qty[ $item_id ] ) && $order_item_qty[ $item_id ] > 0 ) {
 					$old_stock    = $_product->get_stock_quantity();
 					$stock_change = apply_filters( 'woocommerce_restore_order_stock_quantity', $order_item_qty[ $item_id ], $item_id );
-					$new_quantity = $_product->increase_stock( $stock_change );
-					$item_name    = $_product->get_sku() ? $_product->get_sku(): $order_item['product_id'];
-					$note         = sprintf( __( 'Item %s stock increased from %s to %s.', 'woocommerce' ), $item_name, $old_stock, $new_quantity );
+					$new_quantity = wc_update_product_stock( $_product, $stock_change, 'increase' );
+					$item_name    = $_product->get_sku() ? $_product->get_sku() : $_product->get_id();
+					$note         = sprintf( __( 'Item %1$s stock increased from %2$s to %3$s.', 'woocommerce' ), $item_name, $old_stock, $new_quantity );
 					$return[]     = $note;
-
 					$order->add_order_note( $note );
 				}
 			}
-
 			do_action( 'woocommerce_restore_order_stock', $order );
-
 			if ( empty( $return ) ) {
 				$return[] = __( 'No products had their stock increased - they may not have stock management enabled.', 'woocommerce' );
 			}
-
-			echo implode( ', ', $return );
+			echo wp_kses_post( implode( ', ', $return ) );
 		}
-
-		die();
-	}
-
-	/**
-	 * Add some meta to a line item.
-	 */
-	public static function add_order_item_meta() {
-		check_ajax_referer( 'order-item', 'security' );
-
-		if ( ! current_user_can( 'edit_shop_orders' ) ) {
-			die(-1);
-		}
-
-		$meta_id = wc_add_order_item_meta( absint( $_POST['order_item_id'] ), __( 'Name', 'woocommerce' ), __( 'Value', 'woocommerce' ) );
-
-		if ( $meta_id ) {
-			echo '<tr data-meta_id="' . esc_attr( $meta_id ) . '"><td><input type="text" name="meta_key[' . $meta_id . ']" /><textarea name="meta_value[' . $meta_id . ']"></textarea></td><td width="1%"><button class="remove_order_item_meta button">&times;</button></td></tr>';
-		}
-
-		die();
-	}
-
-	/**
-	 * Remove meta from a line item.
-	 */
-	public static function remove_order_item_meta() {
-		global $wpdb;
-
-		check_ajax_referer( 'order-item', 'security' );
-
-		if ( ! current_user_can( 'edit_shop_orders' ) ) {
-			die(-1);
-		}
-
-		$meta_id = absint( $_POST['meta_id'] );
-
-		$wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->prefix}woocommerce_order_itemmeta WHERE meta_id = %d", $meta_id ) );
-
-		die();
+		wp_die();
 	}
 
 	/**
 	 * Calc line tax.
 	 */
 	public static function calc_line_taxes() {
-		global $wpdb;
-
 		check_ajax_referer( 'calc-totals', 'security' );
 
 		if ( ! current_user_can( 'edit_shop_orders' ) ) {
-			die(-1);
+			wp_die( -1 );
 		}
 
-		$tax            = new WC_Tax();
-		$tax_based_on   = get_option( 'woocommerce_tax_based_on' );
-		$order_id       = absint( $_POST['order_id'] );
-		$items          = array();
-		$country        = strtoupper( esc_attr( $_POST['country'] ) );
-		$state          = strtoupper( esc_attr( $_POST['state'] ) );
-		$postcode       = strtoupper( esc_attr( $_POST['postcode'] ) );
-		$city           = wc_clean( esc_attr( $_POST['city'] ) );
-		$order          = wc_get_order( $order_id );
-		$taxes          = array();
-		$shipping_taxes = array();
-
-		// Default to base
-		if ( 'base' === $tax_based_on || empty( $country ) ) {
-			$default  = wc_get_base_location();
-			$country  = $default['country'];
-			$state    = $default['state'];
-			$postcode = '';
-			$city     = '';
-		}
+		$order_id           = absint( $_POST['order_id'] );
+		$calculate_tax_args = array(
+			'country'  => strtoupper( wc_clean( $_POST['country'] ) ),
+			'state'    => strtoupper( wc_clean( $_POST['state'] ) ),
+			'postcode' => strtoupper( wc_clean( $_POST['postcode'] ) ),
+			'city'     => strtoupper( wc_clean( $_POST['city'] ) ),
+		);
 
 		// Parse the jQuery serialized items
+		$items = array();
 		parse_str( $_POST['items'], $items );
 
-		// Prevent undefined warnings
-		if ( ! isset( $items['line_tax'] ) ) {
-			$items['line_tax'] = array();
-		}
-		if ( ! isset( $items['line_subtotal_tax'] ) ) {
-			$items['line_subtotal_tax'] = array();
-		}
-		$items['order_taxes'] = array();
-
-		// Action
-		$items = apply_filters( 'woocommerce_ajax_calc_line_taxes', $items, $order_id, $country, $_POST );
-
-		// Get items and fees taxes
-		if ( isset( $items['order_item_id'] ) ) {
-			$line_total = $line_subtotal = $order_item_tax_class = array();
-
-			foreach ( $items['order_item_id'] as $item_id ) {
-				$item_id                          = absint( $item_id );
-				$line_total[ $item_id ]           = isset( $items['line_total'][ $item_id ] ) ? wc_format_decimal( $items['line_total'][ $item_id ] ) : 0;
-				$line_subtotal[ $item_id ]        = isset( $items['line_subtotal'][ $item_id ] ) ? wc_format_decimal( $items['line_subtotal'][ $item_id ] ) : $line_total[ $item_id ];
-				$order_item_tax_class[ $item_id ] = isset( $items['order_item_tax_class'][ $item_id ] ) ? sanitize_text_field( $items['order_item_tax_class'][ $item_id ] ) : '';
-				$product_id                       = $order->get_item_meta( $item_id, '_product_id', true );
-
-				// Get product details
-				if ( get_post_type( $product_id ) == 'product' ) {
-					$_product        = wc_get_product( $product_id );
-					$item_tax_status = $_product->get_tax_status();
-				} else {
-					$item_tax_status = 'taxable';
-				}
-
-				if ( '0' !== $order_item_tax_class[ $item_id ] && 'taxable' === $item_tax_status ) {
-					$tax_rates = WC_Tax::find_rates( array(
-						'country'   => $country,
-						'state'     => $state,
-						'postcode'  => $postcode,
-						'city'      => $city,
-						'tax_class' => $order_item_tax_class[ $item_id ]
-					) );
-
-					$line_taxes          = WC_Tax::calc_tax( $line_total[ $item_id ], $tax_rates, false );
-					$line_subtotal_taxes = WC_Tax::calc_tax( $line_subtotal[ $item_id ], $tax_rates, false );
-
-					// Set the new line_tax
-					foreach ( $line_taxes as $_tax_id => $_tax_value ) {
-						$items['line_tax'][ $item_id ][ $_tax_id ] = $_tax_value;
-					}
-
-					// Set the new line_subtotal_tax
-					foreach ( $line_subtotal_taxes as $_tax_id => $_tax_value ) {
-						$items['line_subtotal_tax'][ $item_id ][ $_tax_id ] = $_tax_value;
-					}
-
-					// Sum the item taxes
-					foreach ( array_keys( $taxes + $line_taxes ) as $key ) {
-						$taxes[ $key ] = ( isset( $line_taxes[ $key ] ) ? $line_taxes[ $key ] : 0 ) + ( isset( $taxes[ $key ] ) ? $taxes[ $key ] : 0 );
-					}
-				}
-			}
-		}
-
-		// Get shipping taxes
-		if ( isset( $items['shipping_method_id'] ) ) {
-			$matched_tax_rates = array();
-
-			$tax_rates = WC_Tax::find_rates( array(
-				'country'   => $country,
-				'state'     => $state,
-				'postcode'  => $postcode,
-				'city'      => $city,
-				'tax_class' => ''
-			) );
-
-			if ( $tax_rates ) {
-				foreach ( $tax_rates as $key => $rate ) {
-					if ( isset( $rate['shipping'] ) && 'yes' == $rate['shipping'] ) {
-						$matched_tax_rates[ $key ] = $rate;
-					}
-				}
-			}
-
-			$shipping_cost = $shipping_taxes = array();
-
-			foreach ( $items['shipping_method_id'] as $item_id ) {
-				$item_id                   = absint( $item_id );
-				$shipping_cost[ $item_id ] = isset( $items['shipping_cost'][ $item_id ] ) ? wc_format_decimal( $items['shipping_cost'][ $item_id ] ) : 0;
-				$_shipping_taxes           = WC_Tax::calc_shipping_tax( $shipping_cost[ $item_id ], $matched_tax_rates );
-
-				// Set the new shipping_taxes
-				foreach ( $_shipping_taxes as $_tax_id => $_tax_value ) {
-					$items['shipping_taxes'][ $item_id ][ $_tax_id ] = $_tax_value;
-
-					$shipping_taxes[ $_tax_id ] = isset( $shipping_taxes[ $_tax_id ] ) ? $shipping_taxes[ $_tax_id ] + $_tax_value : $_tax_value;
-				}
-			}
-		}
-
-		// Remove old tax rows
-		$order->remove_order_items( 'tax' );
-
-		// Add tax rows
-		foreach ( array_keys( $taxes + $shipping_taxes ) as $tax_rate_id ) {
-			$order->add_tax( $tax_rate_id, isset( $taxes[ $tax_rate_id ] ) ? $taxes[ $tax_rate_id ] : 0, isset( $shipping_taxes[ $tax_rate_id ] ) ? $shipping_taxes[ $tax_rate_id ] : 0 );
-		}
-
-		// Create the new order_taxes
-		foreach ( $order->get_taxes() as $tax_id => $tax_item ) {
-			$items['order_taxes'][ $tax_id ] = absint( $tax_item['rate_id'] );
-		}
-
-		$items = apply_filters( 'woocommerce_ajax_after_calc_line_taxes', $items, $order_id, $country, $_POST );
-
-		// Save order items
+		// Save order items first
 		wc_save_order_items( $order_id, $items );
 
-		// Return HTML items
+		// Grab the order and recalc taxes
 		$order = wc_get_order( $order_id );
-		$data  = get_post_meta( $order_id );
+		$order->calculate_taxes( $calculate_tax_args );
+		$order->calculate_totals( false );
 		include( 'admin/meta-boxes/views/html-order-items.php' );
-
-		die();
+		wp_die();
 	}
 
 	/**
@@ -1639,10 +1038,10 @@ class WC_AJAX {
 		check_ajax_referer( 'order-item', 'security' );
 
 		if ( ! current_user_can( 'edit_shop_orders' ) ) {
-			die(-1);
+			wp_die( -1 );
 		}
 
-		if ( isset( $_POST['order_id'] ) && isset( $_POST['items'] ) ) {
+		if ( isset( $_POST['order_id'], $_POST['items'] ) ) {
 			$order_id = absint( $_POST['order_id'] );
 
 			// Parse the jQuery serialized items
@@ -1654,11 +1053,9 @@ class WC_AJAX {
 
 			// Return HTML items
 			$order = wc_get_order( $order_id );
-			$data  = get_post_meta( $order_id );
 			include( 'admin/meta-boxes/views/html-order-items.php' );
 		}
-
-		die();
+		wp_die();
 	}
 
 	/**
@@ -1668,34 +1065,31 @@ class WC_AJAX {
 		check_ajax_referer( 'order-item', 'security' );
 
 		if ( ! current_user_can( 'edit_shop_orders' ) ) {
-			die(-1);
+			wp_die( -1 );
 		}
 
 		// Return HTML items
 		$order_id = absint( $_POST['order_id'] );
 		$order    = wc_get_order( $order_id );
-		$data     = get_post_meta( $order_id );
 		include( 'admin/meta-boxes/views/html-order-items.php' );
-
-		die();
+		wp_die();
 	}
 
 	/**
 	 * Add order note via ajax.
 	 */
 	public static function add_order_note() {
-
 		check_ajax_referer( 'add-order-note', 'security' );
 
 		if ( ! current_user_can( 'edit_shop_orders' ) ) {
-			die(-1);
+			wp_die( -1 );
 		}
 
 		$post_id   = absint( $_POST['post_id'] );
 		$note      = wp_kses_post( trim( stripslashes( $_POST['note'] ) ) );
 		$note_type = $_POST['note_type'];
 
-		$is_customer_note = $note_type == 'customer' ? 1 : 0;
+		$is_customer_note = ( 'customer' === $note_type ) ? 1 : 0;
 
 		if ( $post_id > 0 ) {
 			$order      = wc_get_order( $post_id );
@@ -1707,23 +1101,20 @@ class WC_AJAX {
 			}
 			echo '"><div class="note_content">';
 			echo wpautop( wptexturize( $note ) );
-			echo '</div><p class="meta"><a href="#" class="delete_note">'.__( 'Delete note', 'woocommerce' ).'</a></p>';
+			echo '</div><p class="meta"><a href="#" class="delete_note">' . __( 'Delete note', 'woocommerce' ) . '</a></p>';
 			echo '</li>';
 		}
-
-		// Quit out
-		die();
+		wp_die();
 	}
 
 	/**
 	 * Delete order note via ajax.
 	 */
 	public static function delete_order_note() {
-
 		check_ajax_referer( 'delete-order-note', 'security' );
 
 		if ( ! current_user_can( 'edit_shop_orders' ) ) {
-			die(-1);
+			wp_die( -1 );
 		}
 
 		$note_id = (int) $_POST['note_id'];
@@ -1731,95 +1122,47 @@ class WC_AJAX {
 		if ( $note_id > 0 ) {
 			wp_delete_comment( $note_id );
 		}
-
-		// Quit out
-		die();
+		wp_die();
 	}
 
 	/**
 	 * Search for products and echo json.
 	 *
-	 * @param string $x (default: '')
-	 * @param string $post_types (default: array('product'))
+	 * @param string $term (default: '')
+	 * @param bool $include_variations in search or not
 	 */
-	public static function json_search_products( $x = '', $post_types = array( 'product' ) ) {
-		global $wpdb;
-
-		ob_start();
-
+	public static function json_search_products( $term = '', $include_variations = false ) {
 		check_ajax_referer( 'search-products', 'security' );
 
-		$term = (string) wc_clean( stripslashes( $_GET['term'] ) );
+		$term = wc_clean( empty( $term ) ? stripslashes( $_GET['term'] ) : $term );
 
 		if ( empty( $term ) ) {
-			die();
+			wp_die();
 		}
 
-		$like_term = '%' . $wpdb->esc_like( $term ) . '%';
-
-		if ( is_numeric( $term ) ) {
-			$query = $wpdb->prepare( "
-				SELECT ID FROM {$wpdb->posts} posts LEFT JOIN {$wpdb->postmeta} postmeta ON posts.ID = postmeta.post_id
-				WHERE posts.post_status = 'publish'
-				AND (
-					posts.post_parent = %s
-					OR posts.ID = %s
-					OR posts.post_title LIKE %s
-					OR (
-						postmeta.meta_key = '_sku' AND postmeta.meta_value LIKE %s
-					)
-				)
-			", $term, $term, $term, $like_term );
-		} else {
-			$query = $wpdb->prepare( "
-				SELECT ID FROM {$wpdb->posts} posts LEFT JOIN {$wpdb->postmeta} postmeta ON posts.ID = postmeta.post_id
-				WHERE posts.post_status = 'publish'
-				AND (
-					posts.post_title LIKE %s
-					or posts.post_content LIKE %s
-					OR (
-						postmeta.meta_key = '_sku' AND postmeta.meta_value LIKE %s
-					)
-				)
-			", $like_term, $like_term, $like_term );
-		}
-
-		$query .= " AND posts.post_type IN ('" . implode( "','", array_map( 'esc_sql', $post_types ) ) . "')";
+		$data_store = WC_Data_Store::load( 'product' );
+		$ids        = $data_store->search_products( $term, '', (bool) $include_variations );
 
 		if ( ! empty( $_GET['exclude'] ) ) {
-			$query .= " AND posts.ID NOT IN (" . implode( ',', array_map( 'intval', explode( ',', $_GET['exclude'] ) ) ) . ")";
+			$ids = array_diff( $ids, (array) $_GET['exclude'] );
 		}
 
 		if ( ! empty( $_GET['include'] ) ) {
-			$query .= " AND posts.ID IN (" . implode( ',', array_map( 'intval', explode( ',', $_GET['include'] ) ) ) . ")";
+			$ids = array_intersect( $ids, (array) $_GET['include'] );
 		}
 
 		if ( ! empty( $_GET['limit'] ) ) {
-			$query .= " LIMIT " . intval( $_GET['limit'] );
+			$ids = array_slice( $ids, 0, absint( $_GET['limit'] ) );
 		}
 
-		$posts          = array_unique( $wpdb->get_col( $query ) );
-		$found_products = array();
+		$product_objects = array_filter( array_map( 'wc_get_product', $ids ), 'wc_products_array_filter_editable' );
+		$products        = array();
 
-		if ( ! empty( $posts ) ) {
-			foreach ( $posts as $post ) {
-				$product = wc_get_product( $post );
-
-				if ( ! current_user_can( 'read_product', $post ) ) {
-					continue;
-				}
-
-				if ( ! $product || ( $product->is_type( 'variation' ) && empty( $product->parent ) ) ) {
-					continue;
-				}
-
-				$found_products[ $post ] = rawurldecode( $product->get_formatted_name() );
-			}
+		foreach ( $product_objects as $product_object ) {
+			$products[ $product_object->get_id() ] = rawurldecode( $product_object->get_formatted_name() );
 		}
 
-		$found_products = apply_filters( 'woocommerce_json_search_found_products', $found_products );
-
-		wp_send_json( $found_products );
+		wp_send_json( apply_filters( 'woocommerce_json_search_found_products', $products ) );
 	}
 
 	/**
@@ -1828,69 +1171,7 @@ class WC_AJAX {
 	 * @see WC_AJAX::json_search_products()
 	 */
 	public static function json_search_products_and_variations() {
-		self::json_search_products( '', array( 'product', 'product_variation' ) );
-	}
-
-	/**
-	 * Search for gruoped products and return json.
-	 */
-	public static function json_search_grouped_products() {
-		ob_start();
-
-		check_ajax_referer( 'search-products', 'security' );
-
-		$term    = (string) wc_clean( stripslashes( $_GET['term'] ) );
-		$exclude = array();
-
-		if ( empty( $term ) ) {
-			die();
-		}
-
-		if ( ! empty( $_GET['exclude'] ) ) {
-			$exclude = array_map( 'intval', explode( ',', $_GET['exclude'] ) );
-		}
-
-		$found_products = array();
-
-		if ( $grouped_term = get_term_by( 'slug', 'grouped', 'product_type' ) ) {
-
-			$posts_in = array_unique( (array) get_objects_in_term( $grouped_term->term_id, 'product_type' ) );
-
-			if ( sizeof( $posts_in ) > 0 ) {
-
-				$args = array(
-					'post_type'        => 'product',
-					'post_status'      => 'any',
-					'numberposts'      => -1,
-					'orderby'          => 'title',
-					'order'            => 'asc',
-					'post_parent'      => 0,
-					'suppress_filters' => 0,
-					'include'          => $posts_in,
-					's'                => $term,
-					'fields'           => 'ids',
-					'exclude'          => $exclude
-				);
-
-				$posts = get_posts( $args );
-
-				if ( ! empty( $posts ) ) {
-					foreach ( $posts as $post ) {
-						$product = wc_get_product( $post );
-
-						if ( ! current_user_can( 'read_product', $post ) ) {
-							continue;
-						}
-
-						$found_products[ $post ] = rawurldecode( $product->get_formatted_name() );
-					}
-				}
-			}
-		}
-
-		$found_products = apply_filters( 'woocommerce_json_search_found_grouped_products', $found_products );
-
-		wp_send_json( $found_products );
+		self::json_search_products( '', true );
 	}
 
 	/**
@@ -1899,49 +1180,32 @@ class WC_AJAX {
 	 * @see WC_AJAX::json_search_products()
 	 */
 	public static function json_search_downloadable_products_and_variations() {
-		ob_start();
-
 		check_ajax_referer( 'search-products', 'security' );
 
-		$term    = (string) wc_clean( stripslashes( $_GET['term'] ) );
-		$exclude = array();
+		$term       = (string) wc_clean( stripslashes( $_GET['term'] ) );
+		$data_store = WC_Data_Store::load( 'product' );
+		$ids        = $data_store->search_products( $term, 'downloadable', true );
 
 		if ( ! empty( $_GET['exclude'] ) ) {
-			$exclude = array_map( 'intval', explode( ',', $_GET['exclude'] ) );
+			$ids = array_diff( $ids, (array) $_GET['exclude'] );
 		}
 
-		$args = array(
-			'post_type'      => array( 'product', 'product_variation' ),
-			'posts_per_page' => -1,
-			'post_status'    => 'publish',
-			'order'          => 'ASC',
-			'orderby'        => 'parent title',
-			'meta_query'     => array(
-				array(
-					'key'   => '_downloadable',
-					'value' => 'yes'
-				)
-			),
-			's'              => $term,
-			'exclude'        => $exclude
-		);
-
-		$posts = get_posts( $args );
-		$found_products = array();
-
-		if ( ! empty( $posts ) ) {
-			foreach ( $posts as $post ) {
-				$product = wc_get_product( $post->ID );
-
-				if ( ! current_user_can( 'read_product', $post->ID ) ) {
-					continue;
-				}
-
-				$found_products[ $post->ID ] = $product->get_formatted_name();
-			}
+		if ( ! empty( $_GET['include'] ) ) {
+			$ids = array_intersect( $ids, (array) $_GET['include'] );
 		}
 
-		wp_send_json( $found_products );
+		if ( ! empty( $_GET['limit'] ) ) {
+			$ids = array_slice( $ids, 0, absint( $_GET['limit'] ) );
+		}
+
+		$product_objects = array_filter( array_map( 'wc_get_product', $ids ), 'wc_products_array_filter_editable' );
+		$products        = array();
+
+		foreach ( $product_objects as $product_object ) {
+			$products[ $product_object->get_id() ] = rawurldecode( $product_object->get_formatted_name() );
+		}
+
+		wp_send_json( $products );
 	}
 
 	/**
@@ -1953,56 +1217,54 @@ class WC_AJAX {
 		check_ajax_referer( 'search-customers', 'security' );
 
 		if ( ! current_user_can( 'edit_shop_orders' ) ) {
-			die(-1);
+			wp_die( -1 );
 		}
 
-		$term = wc_clean( stripslashes( $_GET['term'] ) );
+		$term    = wc_clean( stripslashes( $_GET['term'] ) );
+		$exclude = array();
 
 		if ( empty( $term ) ) {
-			die();
+			wp_die();
+		}
+
+		// Stop if it is not numeric and smaller than 3 characters.
+		if ( ! is_numeric( $term ) && 2 >= strlen( $term ) ) {
+			wp_die();
+		}
+
+		// Search by ID.
+		if ( is_numeric( $term ) ) {
+			$customer = new WC_Customer( intval( $term ) );
+
+			// Customer does not exists.
+			if ( 0 === $customer->get_id() ) {
+				wp_die();
+			}
+
+			$ids = array( $customer->get_id() );
+		} else {
+			$data_store = WC_Data_Store::load( 'customer' );
+			$ids        = $data_store->search_customers( $term );
 		}
 
 		$found_customers = array();
 
-		add_action( 'pre_user_query', array( __CLASS__, 'json_search_customer_name' ) );
-
-		$customers_query = new WP_User_Query( apply_filters( 'woocommerce_json_search_customers_query', array(
-			'fields'         => 'all',
-			'orderby'        => 'display_name',
-			'search'         => '*' . $term . '*',
-			'search_columns' => array( 'ID', 'user_login', 'user_email', 'user_nicename' )
-		) ) );
-
-		remove_action( 'pre_user_query', array( __CLASS__, 'json_search_customer_name' ) );
-
-		$customers = $customers_query->get_results();
-
-		if ( ! empty( $customers ) ) {
-			foreach ( $customers as $customer ) {
-				$found_customers[ $customer->ID ] = $customer->display_name . ' (#' . $customer->ID . ' &ndash; ' . sanitize_email( $customer->user_email ) . ')';
-			}
+		if ( ! empty( $_GET['exclude'] ) ) {
+			$ids = array_diff( $ids, (array) $_GET['exclude'] );
 		}
 
-		wp_send_json( $found_customers );
-	}
-
-	/**
-	 * When searching using the WP_User_Query, search names (user meta) too.
-	 * @param  object $query
-	 * @return object
-	 */
-	public static function json_search_customer_name( $query ) {
-		global $wpdb;
-
-		$term = wc_clean( stripslashes( $_GET['term'] ) );
-		if ( method_exists( $wpdb, 'esc_like' ) ) {
-			$term = $wpdb->esc_like( $term );
-		} else {
-			$term = like_escape( $term );
+		foreach ( $ids as $id ) {
+			$customer = new WC_Customer( $id );
+			/* translators: 1: user display name 2: user ID 3: user email */
+			$found_customers[ $id ] = sprintf(
+				esc_html__( '%1$s (#%2$s &ndash; %3$s)', 'woocommerce' ),
+				$customer->get_first_name() . ' ' . $customer->get_last_name(),
+				$customer->get_id(),
+				$customer->get_email()
+			);
 		}
 
-		$query->query_from  .= " INNER JOIN {$wpdb->usermeta} AS user_name ON {$wpdb->users}.ID = user_name.user_id AND ( user_name.meta_key = 'first_name' OR user_name.meta_key = 'last_name' ) ";
-		$query->query_where .= $wpdb->prepare( " OR user_name.meta_value LIKE %s ", '%' . $term . '%' );
+		wp_send_json( apply_filters( 'woocommerce_json_search_found_customers', $found_customers ) );
 	}
 
 	/**
@@ -2012,7 +1274,7 @@ class WC_AJAX {
 
 		// check permissions again and make sure we have what we need
 		if ( ! current_user_can( 'edit_products' ) || empty( $_POST['id'] ) ) {
-			die(-1);
+			wp_die( -1 );
 		}
 
 		$id       = (int) $_POST['id'];
@@ -2021,7 +1283,7 @@ class WC_AJAX {
 		$term     = get_term_by( 'id', $id, $taxonomy );
 
 		if ( ! $id || ! $term || ! $taxonomy ) {
-			die(0);
+			wp_die( 0 );
 		}
 
 		wc_reorder_terms( $term, $next_id, $taxonomy );
@@ -2030,98 +1292,61 @@ class WC_AJAX {
 
 		if ( $term && sizeof( $children ) ) {
 			echo 'children';
-			die();
+			wp_die();
 		}
 	}
 
 	/**
 	 * Ajax request handling for product ordering.
 	 *
-	 * Based on Simple Page Ordering by 10up (http://wordpress.org/extend/plugins/simple-page-ordering/).
+	 * Based on Simple Page Ordering by 10up (https://wordpress.org/plugins/simple-page-ordering/).
 	 */
 	public static function product_ordering() {
 		global $wpdb;
 
-		ob_start();
-
-		// check permissions again and make sure we have what we need
-		if ( ! current_user_can('edit_products') || empty( $_POST['id'] ) || ( ! isset( $_POST['previd'] ) && ! isset( $_POST['nextid'] ) ) ) {
-			die(-1);
+		if ( ! current_user_can( 'edit_products' ) || empty( $_POST['id'] ) ) {
+			wp_die( -1 );
 		}
 
-		// real post?
-		if ( ! $post = get_post( $_POST['id'] ) ) {
-			die(-1);
+		$sorting_id  = absint( $_POST['id'] );
+		$previd      = absint( isset( $_POST['previd'] ) ? $_POST['previd'] : 0 );
+		$nextid      = absint( isset( $_POST['nextid'] ) ? $_POST['nextid'] : 0 );
+		$menu_orders = wp_list_pluck( $wpdb->get_results( "SELECT ID, menu_order FROM {$wpdb->posts} WHERE post_type = 'product' ORDER BY menu_order ASC, post_title ASC" ), 'menu_order', 'ID' );
+		$index       = 0;
+
+		foreach ( $menu_orders as $id => $menu_order ) {
+			$id = absint( $id );
+
+			if ( $sorting_id === $id ) {
+				continue;
+			}
+			if ( $nextid === $id ) {
+				$index ++;
+			}
+			$index ++;
+			$menu_orders[ $id ] = $index;
+			$wpdb->update( $wpdb->posts, array( 'menu_order' => $index ), array( 'ID' => $id ) );
+			
+			/**
+			 * When a single product has gotten it's ordering updated.
+			 * $id The product ID
+			 * $index The new menu order
+			*/
+			do_action( 'woocommerce_after_single_product_ordering', $id, $index );
 		}
 
-		$previd  = isset( $_POST['previd'] ) ? $_POST['previd'] : false;
-		$nextid  = isset( $_POST['nextid'] ) ? $_POST['nextid'] : false;
-		$new_pos = array(); // store new positions for ajax
-
-		$siblings = $wpdb->get_results( $wpdb->prepare( "
-			SELECT ID, menu_order FROM {$wpdb->posts} AS posts
-			WHERE 	posts.post_type 	= 'product'
-			AND 	posts.post_status 	IN ( 'publish', 'pending', 'draft', 'future', 'private' )
-			AND 	posts.ID			NOT IN (%d)
-			ORDER BY posts.menu_order ASC, posts.ID DESC
-		", $post->ID ) );
-
-		$menu_order = 0;
-
-		foreach ( $siblings as $sibling ) {
-
-			// if this is the post that comes after our repositioned post, set our repositioned post position and increment menu order
-			if ( $nextid == $sibling->ID ) {
-				$wpdb->update(
-					$wpdb->posts,
-					array(
-						'menu_order' => $menu_order
-					),
-					array( 'ID' => $post->ID ),
-					array( '%d' ),
-					array( '%d' )
-				);
-				$new_pos[ $post->ID ] = $menu_order;
-				$menu_order++;
-			}
-
-			// if repositioned post has been set, and new items are already in the right order, we can stop
-			if ( isset( $new_pos[ $post->ID ] ) && $sibling->menu_order >= $menu_order ) {
-				break;
-			}
-
-			// set the menu order of the current sibling and increment the menu order
-			$wpdb->update(
-				$wpdb->posts,
-				array(
-					'menu_order' => $menu_order
-				),
-				array( 'ID' => $sibling->ID ),
-				array( '%d' ),
-				array( '%d' )
-			);
-			$new_pos[ $sibling->ID ] = $menu_order;
-			$menu_order++;
-
-			if ( ! $nextid && $previd == $sibling->ID ) {
-				$wpdb->update(
-					$wpdb->posts,
-					array(
-						'menu_order' => $menu_order
-					),
-					array( 'ID' => $post->ID ),
-					array( '%d' ),
-					array( '%d' )
-				);
-				$new_pos[$post->ID] = $menu_order;
-				$menu_order++;
-			}
-
+		if ( isset( $menu_orders[ $previd ] ) ) {
+			$menu_orders[ $sorting_id ] = $menu_orders[ $previd ] + 1;
+		} elseif ( isset( $menu_orders[ $nextid ] ) ) {
+			$menu_orders[ $sorting_id ] = $menu_orders[ $nextid ] - 1;
+		} else {
+			$menu_orders[ $sorting_id ] = 0;
 		}
 
+		$wpdb->update( $wpdb->posts, array( 'menu_order' => $menu_orders[ $sorting_id ] ), array( 'ID' => $sorting_id ) );
+
 		do_action( 'woocommerce_after_product_ordering' );
-
-		wp_send_json( $new_pos );
+		wp_send_json( $menu_orders );
 	}
 
 	/**
@@ -2133,25 +1358,24 @@ class WC_AJAX {
 		check_ajax_referer( 'order-item', 'security' );
 
 		if ( ! current_user_can( 'edit_shop_orders' ) ) {
-			die(-1);
+			wp_die( -1 );
 		}
 
 		$order_id               = absint( $_POST['order_id'] );
-		$refund_amount          = wc_format_decimal( sanitize_text_field( $_POST['refund_amount'] ) );
+		$refund_amount          = wc_format_decimal( sanitize_text_field( $_POST['refund_amount'] ), wc_get_price_decimals() );
 		$refund_reason          = sanitize_text_field( $_POST['refund_reason'] );
 		$line_item_qtys         = json_decode( sanitize_text_field( stripslashes( $_POST['line_item_qtys'] ) ), true );
 		$line_item_totals       = json_decode( sanitize_text_field( stripslashes( $_POST['line_item_totals'] ) ), true );
 		$line_item_tax_totals   = json_decode( sanitize_text_field( stripslashes( $_POST['line_item_tax_totals'] ) ), true );
-		$api_refund             = $_POST['api_refund'] === 'true' ? true : false;
-		$restock_refunded_items = $_POST['restock_refunded_items'] === 'true' ? true : false;
+		$api_refund             = 'true' === $_POST['api_refund'];
+		$restock_refunded_items = 'true' === $_POST['restock_refunded_items'];
 		$refund                 = false;
 		$response_data          = array();
 
 		try {
-			// Validate that the refund can occur
 			$order       = wc_get_order( $order_id );
 			$order_items = $order->get_items();
-			$max_refund  = wc_format_decimal( $order->get_total() - $order->get_total_refunded() );
+			$max_refund  = wc_format_decimal( $order->get_total() - $order->get_total_refunded(), wc_get_price_decimals() );
 
 			if ( ! $refund_amount || $max_refund < $refund_amount || 0 > $refund_amount ) {
 				throw new exception( __( 'Invalid refund amount', 'woocommerce' ) );
@@ -2171,83 +1395,33 @@ class WC_AJAX {
 				$line_items[ $item_id ]['refund_total'] = wc_format_decimal( $total );
 			}
 			foreach ( $line_item_tax_totals as $item_id => $tax_totals ) {
-				$line_items[ $item_id ]['refund_tax'] = array_map( 'wc_format_decimal', $tax_totals );
+				$line_items[ $item_id ]['refund_tax'] = array_filter( array_map( 'wc_format_decimal', $tax_totals ) );
 			}
 
-			// Create the refund object
+			// Create the refund object.
 			$refund = wc_create_refund( array(
-				'amount'     => $refund_amount,
-				'reason'     => $refund_reason,
-				'order_id'   => $order_id,
-				'line_items' => $line_items,
+				'amount'         => $refund_amount,
+				'reason'         => $refund_reason,
+				'order_id'       => $order_id,
+				'line_items'     => $line_items,
+				'refund_payment' => $api_refund,
+				'restock_items'  => $restock_refunded_items,
 			) );
 
 			if ( is_wp_error( $refund ) ) {
 				throw new Exception( $refund->get_error_message() );
 			}
 
-			// Refund via API
-			if ( $api_refund ) {
-				if ( WC()->payment_gateways() ) {
-					$payment_gateways = WC()->payment_gateways->payment_gateways();
-				}
-				if ( isset( $payment_gateways[ $order->payment_method ] ) && $payment_gateways[ $order->payment_method ]->supports( 'refunds' ) ) {
-					$result = $payment_gateways[ $order->payment_method ]->process_refund( $order_id, $refund_amount, $refund_reason );
-
-					do_action( 'woocommerce_refund_processed', $refund, $result );
-
-					if ( is_wp_error( $result ) ) {
-						throw new Exception( $result->get_error_message() );
-					} elseif ( ! $result ) {
-						throw new Exception( __( 'Refund failed', 'woocommerce' ) );
-					}
-				}
-			}
-
-			// restock items
-			foreach ( $line_item_qtys as $item_id => $qty ) {
-				if ( $restock_refunded_items && $qty && isset( $order_items[ $item_id ] ) ) {
-					$order_item = $order_items[ $item_id ];
-					$_product   = $order->get_product_from_item( $order_item );
-
-					if ( $_product && $_product->exists() && $_product->managing_stock() ) {
-						$old_stock    = wc_stock_amount( $_product->stock );
-						$new_quantity = $_product->increase_stock( $qty );
-
-						$order->add_order_note( sprintf( __( 'Item #%s stock increased from %s to %s.', 'woocommerce' ), $order_item['product_id'], $old_stock, $new_quantity ) );
-
-						do_action( 'woocommerce_restock_refunded_item', $_product->id, $old_stock, $new_quantity, $order );
-					}
-				}
-			}
-
-			// Trigger notifications and status changes
-			if ( $order->get_remaining_refund_amount() > 0 || ( $order->has_free_item() && $order->get_remaining_refund_items() > 0 ) ) {
-				/**
-				 * woocommerce_order_partially_refunded.
-				 *
-				 * @since 2.4.0
-				 * Note: 3rd arg was added in err. Kept for bw compat. 2.4.3.
-				 */
-				do_action( 'woocommerce_order_partially_refunded', $order_id, $refund->id, $refund->id );
-			} else {
-				do_action( 'woocommerce_order_fully_refunded', $order_id, $refund->id );
-
-				$order->update_status( apply_filters( 'woocommerce_order_fully_refunded_status', 'refunded', $order_id, $refund->id ) );
+			if ( did_action( 'woocommerce_order_fully_refunded' ) ) {
 				$response_data['status'] = 'fully_refunded';
 			}
 
-			do_action( 'woocommerce_order_refunded', $order_id, $refund->id );
-
-			// Clear transients
-			wc_delete_shop_order_transients( $order_id );
 			wp_send_json_success( $response_data );
 
 		} catch ( Exception $e ) {
 			if ( $refund && is_a( $refund, 'WC_Order_Refund' ) ) {
-				wp_delete_post( $refund->id, true );
+				wp_delete_post( $refund->get_id(), true );
 			}
-
 			wp_send_json_error( array( 'error' => $e->getMessage() ) );
 		}
 	}
@@ -2259,20 +1433,19 @@ class WC_AJAX {
 		check_ajax_referer( 'order-item', 'security' );
 
 		if ( ! current_user_can( 'edit_shop_orders' ) ) {
-			die(-1);
+			wp_die( -1 );
 		}
 
-		$refund_id = absint( $_POST['refund_id'] );
-
-		if ( $refund_id && 'shop_order_refund' === get_post_type( $refund_id ) ) {
-			$order_id = wp_get_post_parent_id( $refund_id );
-			wc_delete_shop_order_transients( $order_id );
-			wp_delete_post( $refund_id );
-
-			do_action( 'woocommerce_refund_deleted', $refund_id, $order_id );
+		$refund_ids = array_map( 'absint', is_array( $_POST['refund_id'] ) ? $_POST['refund_id'] : array( $_POST['refund_id'] ) );
+		foreach ( $refund_ids as $refund_id ) {
+			if ( $refund_id && 'shop_order_refund' === get_post_type( $refund_id ) ) {
+				$refund   = wc_get_order( $refund_id );
+				$order_id = $refund->get_parent_id();
+				$refund->delete( true );
+				do_action( 'woocommerce_refund_deleted', $refund_id, $order_id );
+			}
 		}
-
-		die();
+		wp_die();
 	}
 
 	/**
@@ -2280,11 +1453,10 @@ class WC_AJAX {
 	 */
 	public static function rated() {
 		if ( ! current_user_can( 'manage_woocommerce' ) ) {
-			die(-1);
+			wp_die( -1 );
 		}
-
 		update_option( 'woocommerce_admin_footer_text_rated', 1 );
-		die();
+		wp_die();
 	}
 
 	/**
@@ -2298,7 +1470,7 @@ class WC_AJAX {
 		check_ajax_referer( 'update-api-key', 'security' );
 
 		if ( ! current_user_can( 'manage_woocommerce' ) ) {
-			die(-1);
+			wp_die( -1 );
 		}
 
 		try {
@@ -2321,7 +1493,7 @@ class WC_AJAX {
 				$data = array(
 					'user_id'     => $user_id,
 					'description' => $description,
-					'permissions' => $permissions
+					'permissions' => $permissions,
 				);
 
 				$wpdb->update(
@@ -2331,7 +1503,7 @@ class WC_AJAX {
 					array(
 						'%d',
 						'%s',
-						'%s'
+						'%s',
 					),
 					array( '%d' )
 				);
@@ -2340,7 +1512,6 @@ class WC_AJAX {
 				$data['consumer_secret'] = '';
 				$data['message']         = __( 'API Key updated successfully.', 'woocommerce' );
 			} else {
-				$status          = 2;
 				$consumer_key    = 'ck_' . wc_rand_hash();
 				$consumer_secret = 'cs_' . wc_rand_hash();
 
@@ -2350,7 +1521,7 @@ class WC_AJAX {
 					'permissions'     => $permissions,
 					'consumer_key'    => wc_api_hash( $consumer_key ),
 					'consumer_secret' => $consumer_secret,
-					'truncated_key'   => substr( $consumer_key, -7 )
+					'truncated_key'   => substr( $consumer_key, -7 ),
 				);
 
 				$wpdb->insert(
@@ -2362,15 +1533,15 @@ class WC_AJAX {
 						'%s',
 						'%s',
 						'%s',
-						'%s'
+						'%s',
 					)
 				);
 
 				$key_id                  = $wpdb->insert_id;
 				$data['consumer_key']    = $consumer_key;
 				$data['consumer_secret'] = $consumer_secret;
-				$data['message']         = __( 'API Key generated successfully. Make sure to copy your new API keys now. You won\'t be able to see it again!', 'woocommerce' );
-				$data['revoke_url']      = '<a style="color: #a00; text-decoration: none;" href="' . esc_url( wp_nonce_url( add_query_arg( array( 'revoke-key' => $key_id ), admin_url( 'admin.php?page=wc-settings&tab=api&section=keys' ) ), 'revoke' ) ). '">' . __( 'Revoke Key', 'woocommerce' ) . '</a>';
+				$data['message']         = __( 'API Key generated successfully. Make sure to copy your new keys now as the secret key will be hidden once you leave this page.', 'woocommerce' );
+				$data['revoke_url']      = '<a style="color: #a00; text-decoration: none;" href="' . esc_url( wp_nonce_url( add_query_arg( array( 'revoke-key' => $key_id ), admin_url( 'admin.php?page=wc-settings&tab=api&section=keys' ) ), 'revoke' ) ) . '">' . __( 'Revoke key', 'woocommerce' ) . '</a>';
 			}
 
 			wp_send_json_success( $data );
@@ -2379,14 +1550,6 @@ class WC_AJAX {
 		}
 	}
 
-	/**
-	 * Locate user via AJAX.
-	 */
-	public static function get_customer_location() {
-		$location_hash = WC_Cache_Helper::geolocation_ajax_get_location_hash();
-		wp_send_json_success( array( 'hash' => $location_hash ) );
-	}
-
 	/**
 	 * Load variations via AJAX.
 	 */
@@ -2395,155 +1558,42 @@ class WC_AJAX {
 
 		check_ajax_referer( 'load-variations', 'security' );
 
-		// Check permissions again and make sure we have what we need
-		if ( ! current_user_can( 'edit_products' ) || empty( $_POST['product_id'] ) || empty( $_POST['attributes'] ) ) {
-			die( -1 );
+		if ( ! current_user_can( 'edit_products' ) || empty( $_POST['product_id'] ) ) {
+			wp_die( -1 );
 		}
 
+		// Set $post global so its available, like within the admin screens
 		global $post;
 
-		$product_id = absint( $_POST['product_id'] );
-		$post       = get_post( $product_id ); // Set $post global so its available like within the admin screens
-		$per_page   = ! empty( $_POST['per_page'] ) ? absint( $_POST['per_page'] ) : 10;
-		$page       = ! empty( $_POST['page'] ) ? absint( $_POST['page'] ) : 1;
-
-		// Get attributes
-		$attributes        = array();
-		$posted_attributes = wp_unslash( $_POST['attributes'] );
-
-		foreach ( $posted_attributes as $key => $value ) {
-			$attributes[ $key ] = array_map( 'wc_clean', $value );
-		}
-
-		// Get tax classes
-		$tax_classes           = WC_Tax::get_tax_classes();
-		$tax_class_options     = array();
-		$tax_class_options[''] = __( 'Standard', 'woocommerce' );
-
-		if ( ! empty( $tax_classes ) ) {
-			foreach ( $tax_classes as $class ) {
-				$tax_class_options[ sanitize_title( $class ) ] = esc_attr( $class );
-			}
-		}
-
-		// Set backorder options
-		$backorder_options = array(
-			'no'     => __( 'Do not allow', 'woocommerce' ),
-			'notify' => __( 'Allow, but notify customer', 'woocommerce' ),
-			'yes'    => __( 'Allow', 'woocommerce' )
-		);
-
-		// set stock status options
-		$stock_status_options = array(
-			'instock'    => __( 'In stock', 'woocommerce' ),
-			'outofstock' => __( 'Out of stock', 'woocommerce' )
-		);
-
-		$parent_data = array(
-			'id'                   => $product_id,
-			'attributes'           => $attributes,
-			'tax_class_options'    => $tax_class_options,
-			'sku'                  => get_post_meta( $product_id, '_sku', true ),
-			'weight'               => wc_format_localized_decimal( get_post_meta( $product_id, '_weight', true ) ),
-			'length'               => wc_format_localized_decimal( get_post_meta( $product_id, '_length', true ) ),
-			'width'                => wc_format_localized_decimal( get_post_meta( $product_id, '_width', true ) ),
-			'height'               => wc_format_localized_decimal( get_post_meta( $product_id, '_height', true ) ),
-			'tax_class'            => get_post_meta( $product_id, '_tax_class', true ),
-			'backorder_options'    => $backorder_options,
-			'stock_status_options' => $stock_status_options
-		);
-
-		if ( ! $parent_data['weight'] ) {
-			$parent_data['weight'] = wc_format_localized_decimal( 0 );
-		}
-
-		if ( ! $parent_data['length'] ) {
-			$parent_data['length'] = wc_format_localized_decimal( 0 );
-		}
-
-		if ( ! $parent_data['width'] ) {
-			$parent_data['width'] = wc_format_localized_decimal( 0 );
-		}
-
-		if ( ! $parent_data['height'] ) {
-			$parent_data['height'] = wc_format_localized_decimal( 0 );
-		}
-
-		// Get variations
-		$args = apply_filters( 'woocommerce_ajax_admin_get_variations_args', array(
-			'post_type'      => 'product_variation',
-			'post_status'    => array( 'private', 'publish' ),
-			'posts_per_page' => $per_page,
-			'paged'          => $page,
-			'orderby'        => array( 'menu_order' => 'ASC', 'ID' => 'DESC' ),
-			'post_parent'    => $product_id
-		), $product_id );
-
-		$variations = get_posts( $args );
-		$loop = 0;
+		$loop           = 0;
+		$product_id     = absint( $_POST['product_id'] );
+		$post           = get_post( $product_id );
+		$product_object = wc_get_product( $product_id );
+		$per_page       = ! empty( $_POST['per_page'] ) ? absint( $_POST['per_page'] ) : 10;
+		$page           = ! empty( $_POST['page'] ) ? absint( $_POST['page'] ) : 1;
+		$variations     = wc_get_products( array(
+			'status'         => array( 'private', 'publish' ),
+			'type'           => 'variation',
+			'parent'         => $product_id,
+			'limit'          => $per_page,
+			'page'           => $page,
+			'orderby'        => array(
+				'menu_order' => 'ASC',
+				'ID'         => 'DESC',
+			),
+			'return'         => 'objects',
+		) );
 
 		if ( $variations ) {
-
-			foreach ( $variations as $variation ) {
-				$variation_id     = absint( $variation->ID );
-				$variation_meta   = get_post_meta( $variation_id );
-				$variation_data   = array();
-				$shipping_classes = get_the_terms( $variation_id, 'product_shipping_class' );
-				$variation_fields = array(
-					'_sku'                   => '',
-					'_stock'                 => '',
-					'_regular_price'         => '',
-					'_sale_price'            => '',
-					'_weight'                => '',
-					'_length'                => '',
-					'_width'                 => '',
-					'_height'                => '',
-					'_download_limit'        => '',
-					'_download_expiry'       => '',
-					'_downloadable_files'    => '',
-					'_downloadable'          => '',
-					'_virtual'               => '',
-					'_thumbnail_id'          => '',
-					'_sale_price_dates_from' => '',
-					'_sale_price_dates_to'   => '',
-					'_manage_stock'          => '',
-					'_stock_status'          => '',
-					'_backorders'            => null,
-					'_tax_class'             => null,
-					'_variation_description' => ''
-				);
-
-				foreach ( $variation_fields as $field => $value ) {
-					$variation_data[ $field ] = isset( $variation_meta[ $field ][0] ) ? maybe_unserialize( $variation_meta[ $field ][0] ) : $value;
-				}
-
-				// Add the variation attributes
-				$variation_data = array_merge( $variation_data, wc_get_product_variation_attributes( $variation_id ) );
-
-				// Formatting
-				$variation_data['_regular_price'] = wc_format_localized_price( $variation_data['_regular_price'] );
-				$variation_data['_sale_price']    = wc_format_localized_price( $variation_data['_sale_price'] );
-				$variation_data['_weight']        = wc_format_localized_decimal( $variation_data['_weight'] );
-				$variation_data['_length']        = wc_format_localized_decimal( $variation_data['_length'] );
-				$variation_data['_width']         = wc_format_localized_decimal( $variation_data['_width'] );
-				$variation_data['_height']        = wc_format_localized_decimal( $variation_data['_height'] );
-				$variation_data['_thumbnail_id']  = absint( $variation_data['_thumbnail_id'] );
-				$variation_data['image']          = $variation_data['_thumbnail_id'] ? wp_get_attachment_thumb_url( $variation_data['_thumbnail_id'] ) : '';
-				$variation_data['shipping_class'] = $shipping_classes && ! is_wp_error( $shipping_classes ) ? current( $shipping_classes )->term_id : '';
-				$variation_data['menu_order']     = $variation->menu_order;
-
-				// Stock BW compat
-				if ( '' !== $variation_data['_stock'] ) {
-					$variation_data['_manage_stock'] = 'yes';
-				}
-
+			foreach ( $variations as $variation_object ) {
+				$variation_id   = $variation_object->get_id();
+				$variation      = get_post( $variation_id );
+				$variation_data = array_merge( array_map( 'maybe_unserialize', get_post_custom( $variation_id ) ), wc_get_product_variation_attributes( $variation_id ) ); // kept for BW compat.
 				include( 'admin/meta-boxes/views/html-variation-admin.php' );
-
 				$loop++;
 			}
 		}
-
-		die();
+		wp_die();
 	}
 
 	/**
@@ -2556,29 +1606,15 @@ class WC_AJAX {
 
 		// Check permissions again and make sure we have what we need
 		if ( ! current_user_can( 'edit_products' ) || empty( $_POST ) || empty( $_POST['product_id'] ) ) {
-			die( -1 );
+			wp_die( -1 );
 		}
 
-		// Remove previous meta box errors
+		$product_id = absint( $_POST['product_id'] );
 		WC_Admin_Meta_Boxes::$meta_box_errors = array();
-
-		$product_id   = absint( $_POST['product_id'] );
-		$product_type = empty( $_POST['product-type'] ) ? 'simple' : sanitize_title( stripslashes( $_POST['product-type'] ) );
-
-		$product_type_terms = wp_get_object_terms( $product_id, 'product_type' );
-
-		// If the product type hasn't been set or it has changed, update it before saving variations
-		if ( empty( $product_type_terms ) || $product_type !== sanitize_title( current( $product_type_terms )->name ) ) {
-			wp_set_object_terms( $product_id, $product_type, 'product_type' );
-		}
-
 		WC_Meta_Box_Product_Data::save_variations( $product_id, get_post( $product_id ) );
 
 		do_action( 'woocommerce_ajax_save_product_variations', $product_id );
 
-		// Clear cache/transients
-		wc_delete_product_transients( $product_id );
-
 		if ( $errors = WC_Admin_Meta_Boxes::$meta_box_errors ) {
 			echo '<div class="error notice is-dismissible">';
 
@@ -2592,122 +1628,105 @@ class WC_AJAX {
 			delete_option( 'woocommerce_meta_box_errors' );
 		}
 
-		die();
+		wp_die();
 	}
 
 	/**
 	 * Bulk action - Toggle Enabled.
 	 * @access private
+	 * @used-by bulk_edit_variations
 	 * @param  array $variations
 	 * @param  array $data
 	 */
 	private static function variation_bulk_action_toggle_enabled( $variations, $data ) {
-		global $wpdb;
-
 		foreach ( $variations as $variation_id ) {
-			$post_status = get_post_status( $variation_id );
-			$new_status  = 'private' === $post_status ? 'publish' : 'private';
-			$wpdb->update( $wpdb->posts, array( 'post_status' => $new_status ), array( 'ID' => $variation_id ) );
+			$variation = wc_get_product( $variation_id );
+			$variation->set_status( 'private' === $variation->get_status( 'edit' ) ? 'publish' : 'private' );
+			$variation->save();
 		}
 	}
 
 	/**
 	 * Bulk action - Toggle Downloadable Checkbox.
 	 * @access private
+	 * @used-by bulk_edit_variations
 	 * @param  array $variations
 	 * @param  array $data
 	 */
 	private static function variation_bulk_action_toggle_downloadable( $variations, $data ) {
-		foreach ( $variations as $variation_id ) {
-			$_downloadable   = get_post_meta( $variation_id, '_downloadable', true );
-			$is_downloadable = 'no' === $_downloadable ? 'yes' : 'no';
-			update_post_meta( $variation_id, '_downloadable', wc_clean( $is_downloadable ) );
-		}
+		self::variation_bulk_toggle( $variations, 'downloadable' );
 	}
 
 	/**
 	 * Bulk action - Toggle Virtual Checkbox.
 	 * @access private
+	 * @used-by bulk_edit_variations
 	 * @param  array $variations
 	 * @param  array $data
 	 */
 	private static function variation_bulk_action_toggle_virtual( $variations, $data ) {
-		foreach ( $variations as $variation_id ) {
-			$_virtual   = get_post_meta( $variation_id, '_virtual', true );
-			$is_virtual = 'no' === $_virtual ? 'yes' : 'no';
-			update_post_meta( $variation_id, '_virtual', wc_clean( $is_virtual ) );
-		}
+		self::variation_bulk_toggle( $variations, 'virtual' );
 	}
 
 	/**
 	 * Bulk action - Toggle Manage Stock Checkbox.
 	 * @access private
+	 * @used-by bulk_edit_variations
 	 * @param  array $variations
 	 * @param  array $data
 	 */
 	private static function variation_bulk_action_toggle_manage_stock( $variations, $data ) {
-		foreach ( $variations as $variation_id ) {
-			$_manage_stock   = get_post_meta( $variation_id, '_manage_stock', true );
-			$is_manage_stock = 'no' === $_manage_stock || '' === $_manage_stock ? 'yes' : 'no';
-			update_post_meta( $variation_id, '_manage_stock', $is_manage_stock );
-		}
+		self::variation_bulk_toggle( $variations, 'manage_stock' );
 	}
 
 	/**
 	 * Bulk action - Set Regular Prices.
 	 * @access private
+	 * @used-by bulk_edit_variations
 	 * @param  array $variations
 	 * @param  array $data
 	 */
 	private static function variation_bulk_action_variable_regular_price( $variations, $data ) {
-		if ( ! isset( $data['value'] ) ) {
-			return;
-		}
-
-		foreach ( $variations as $variation_id ) {
-			// Price fields
-			$regular_price = wc_clean( $data['value'] );
-			$sale_price    = get_post_meta( $variation_id, '_sale_price', true );
-
-			// Date fields
-			$date_from = get_post_meta( $variation_id, '_sale_price_dates_from', true );
-			$date_to   = get_post_meta( $variation_id, '_sale_price_dates_to', true );
-			$date_from = ! empty( $date_from ) ? date( 'Y-m-d', $date_from ) : '';
-			$date_to   = ! empty( $date_to ) ? date( 'Y-m-d', $date_to ) : '';
-
-			_wc_save_product_price( $variation_id, $regular_price, $sale_price, $date_from, $date_to );
-		}
+		self::variation_bulk_set( $variations, 'regular_price', $data['value'] );
 	}
 
 	/**
 	 * Bulk action - Set Sale Prices.
 	 * @access private
+	 * @used-by bulk_edit_variations
 	 * @param  array $variations
 	 * @param  array $data
 	 */
 	private static function variation_bulk_action_variable_sale_price( $variations, $data ) {
-		if ( ! isset( $data['value'] ) ) {
-			return;
-		}
+		self::variation_bulk_set( $variations, 'sale_price', $data['value'] );
+	}
 
-		foreach ( $variations as $variation_id ) {
-			// Price fields
-			$regular_price = get_post_meta( $variation_id, '_regular_price', true );
-			$sale_price    = wc_clean( $data['value'] );
+	/**
+	 * Bulk action - Set Stock Status as In Stock.
+	 * @access private
+	 * @used-by bulk_edit_variations
+	 * @param  array $variations
+	 * @param  array $data
+	 */
+	private static function variation_bulk_action_variable_stock_status_instock( $variations, $data ) {
+		self::variation_bulk_set( $variations, 'stock_status', 'instock' );
+	}
 
-			// Date fields
-			$date_from = get_post_meta( $variation_id, '_sale_price_dates_from', true );
-			$date_to   = get_post_meta( $variation_id, '_sale_price_dates_to', true );
-			$date_from = ! empty( $date_from ) ? date( 'Y-m-d', $date_from ) : '';
-			$date_to   = ! empty( $date_to ) ? date( 'Y-m-d', $date_to ) : '';
-
-			_wc_save_product_price( $variation_id, $regular_price, $sale_price, $date_from, $date_to );
-		}
+	/**
+	 * Bulk action - Set Stock Status as Out of Stock.
+	 * @access private
+	 * @used-by bulk_edit_variations
+	 * @param  array $variations
+	 * @param  array $data
+	 */
+	private static function variation_bulk_action_variable_stock_status_outofstock( $variations, $data ) {
+		self::variation_bulk_set( $variations, 'stock_status', 'outofstock' );
 	}
 
 	/**
 	 * Bulk action - Set Stock.
 	 * @access private
+	 * @used-by bulk_edit_variations
 	 * @param  array $variations
 	 * @param  array $data
 	 */
@@ -2716,87 +1735,97 @@ class WC_AJAX {
 			return;
 		}
 
-		$value = wc_clean( $data['value'] );
+		$quantity = wc_stock_amount( wc_clean( $data['value'] ) );
 
 		foreach ( $variations as $variation_id ) {
-			if ( 'yes' === get_post_meta( $variation_id, '_manage_stock', true ) ) {
-				wc_update_product_stock( $variation_id, wc_stock_amount( $value ) );
+			$variation = wc_get_product( $variation_id );
+			if ( $variation->managing_stock() ) {
+				$variation->set_stock_quantity( $quantity );
 			} else {
-				delete_post_meta( $variation_id, '_stock' );
+				$variation->set_stock_quantity( null );
 			}
+			$variation->save();
 		}
 	}
 
 	/**
 	 * Bulk action - Set Weight.
 	 * @access private
+	 * @used-by bulk_edit_variations
 	 * @param  array $variations
 	 * @param  array $data
 	 */
 	private static function variation_bulk_action_variable_weight( $variations, $data ) {
-		self::variation_bulk_set_meta( $variations, '_weight', wc_clean( $data['value'] ) );
+		self::variation_bulk_set( $variations, 'weight', $data['value'] );
 	}
 
 	/**
 	 * Bulk action - Set Length.
 	 * @access private
+	 * @used-by bulk_edit_variations
 	 * @param  array $variations
 	 * @param  array $data
 	 */
 	private static function variation_bulk_action_variable_length( $variations, $data ) {
-		self::variation_bulk_set_meta( $variations, '_length', wc_clean( $data['value'] ) );
+		self::variation_bulk_set( $variations, 'length', $data['value'] );
 	}
 
 	/**
 	 * Bulk action - Set Width.
 	 * @access private
+	 * @used-by bulk_edit_variations
 	 * @param  array $variations
 	 * @param  array $data
 	 */
 	private static function variation_bulk_action_variable_width( $variations, $data ) {
-		self::variation_bulk_set_meta( $variations, '_width', wc_clean( $data['value'] ) );
+		self::variation_bulk_set( $variations, 'width', $data['value'] );
 	}
 
 	/**
 	 * Bulk action - Set Height.
 	 * @access private
+	 * @used-by bulk_edit_variations
 	 * @param  array $variations
 	 * @param  array $data
 	 */
 	private static function variation_bulk_action_variable_height( $variations, $data ) {
-		self::variation_bulk_set_meta( $variations, '_height', wc_clean( $data['value'] ) );
+		self::variation_bulk_set( $variations, 'height', $data['value'] );
 	}
 
 	/**
 	 * Bulk action - Set Download Limit.
 	 * @access private
+	 * @used-by bulk_edit_variations
 	 * @param  array $variations
 	 * @param  array $data
 	 */
 	private static function variation_bulk_action_variable_download_limit( $variations, $data ) {
-		self::variation_bulk_set_meta( $variations, '_download_limit', wc_clean( $data['value'] ) );
+		self::variation_bulk_set( $variations, 'download_limit', $data['value'] );
 	}
 
 	/**
 	 * Bulk action - Set Download Expiry.
 	 * @access private
+	 * @used-by bulk_edit_variations
 	 * @param  array $variations
 	 * @param  array $data
 	 */
 	private static function variation_bulk_action_variable_download_expiry( $variations, $data ) {
-		self::variation_bulk_set_meta( $variations, '_download_expiry', wc_clean( $data['value'] ) );
+		self::variation_bulk_set( $variations, 'download_expiry', $data['value'] );
 	}
 
 	/**
 	 * Bulk action - Delete all.
 	 * @access private
+	 * @used-by bulk_edit_variations
 	 * @param  array $variations
 	 * @param  array $data
 	 */
 	private static function variation_bulk_action_delete_all( $variations, $data ) {
 		if ( isset( $data['allowed'] ) && 'true' === $data['allowed'] ) {
 			foreach ( $variations as $variation_id ) {
-				wp_delete_post( $variation_id );
+				$variation = wc_get_product( $variation_id );
+				$variation->delete( true );
 			}
 		}
 	}
@@ -2804,6 +1833,7 @@ class WC_AJAX {
 	/**
 	 * Bulk action - Sale Schedule.
 	 * @access private
+	 * @used-by bulk_edit_variations
 	 * @param  array $variations
 	 * @param  array $data
 	 */
@@ -2813,114 +1843,143 @@ class WC_AJAX {
 		}
 
 		foreach ( $variations as $variation_id ) {
-			// Price fields
-			$regular_price = get_post_meta( $variation_id, '_regular_price', true );
-			$sale_price    = get_post_meta( $variation_id, '_sale_price', true );
+			$variation = wc_get_product( $variation_id );
 
-			// Date fields
-			$date_from = get_post_meta( $variation_id, '_sale_price_dates_from', true );
-			$date_to   = get_post_meta( $variation_id, '_sale_price_dates_to', true );
-
-			if ( 'false' === $data['date_from'] ) {
-				$date_from = ! empty( $date_from ) ? date( 'Y-m-d', $date_from ) : '';
-			} else {
-				$date_from = $data['date_from'];
+			if ( 'false' !== $data['date_from'] ) {
+				$variation->set_date_on_sale_from( wc_clean( $data['date_from'] ) );
 			}
 
-			if ( 'false' === $data['date_to'] ) {
-				$date_to = ! empty( $date_to ) ? date( 'Y-m-d', $date_to ) : '';
-			} else {
-				$date_to = $data['date_to'];
+			if ( 'false' !== $data['date_to'] ) {
+				$variation->set_date_on_sale_to( wc_clean( $data['date_to'] ) );
 			}
 
-			_wc_save_product_price( $variation_id, $regular_price, $sale_price, $date_from, $date_to );
+			$variation->save();
 		}
 	}
 
 	/**
 	 * Bulk action - Increase Regular Prices.
 	 * @access private
+	 * @used-by bulk_edit_variations
 	 * @param  array $variations
 	 * @param  array $data
 	 */
 	private static function variation_bulk_action_variable_regular_price_increase( $variations, $data ) {
-		self::variation_bulk_adjust_price( $variations, '_regular_price', '+', wc_clean( $data['value'] ) );
+		self::variation_bulk_adjust_price( $variations, 'regular_price', '+', wc_clean( $data['value'] ) );
 	}
 
 	/**
 	 * Bulk action - Decrease Regular Prices.
 	 * @access private
+	 * @used-by bulk_edit_variations
 	 * @param  array $variations
 	 * @param  array $data
 	 */
 	private static function variation_bulk_action_variable_regular_price_decrease( $variations, $data ) {
-		self::variation_bulk_adjust_price( $variations, '_regular_price', '-', wc_clean( $data['value'] ) );
+		self::variation_bulk_adjust_price( $variations, 'regular_price', '-', wc_clean( $data['value'] ) );
 	}
 
 	/**
 	 * Bulk action - Increase Sale Prices.
 	 * @access private
+	 * @used-by bulk_edit_variations
 	 * @param  array $variations
 	 * @param  array $data
 	 */
 	private static function variation_bulk_action_variable_sale_price_increase( $variations, $data ) {
-		self::variation_bulk_adjust_price( $variations, '_sale_price', '+', wc_clean( $data['value'] ) );
+		self::variation_bulk_adjust_price( $variations, 'sale_price', '+', wc_clean( $data['value'] ) );
 	}
 
 	/**
 	 * Bulk action - Decrease Sale Prices.
 	 * @access private
+	 * @used-by bulk_edit_variations
 	 * @param  array $variations
 	 * @param  array $data
 	 */
 	private static function variation_bulk_action_variable_sale_price_decrease( $variations, $data ) {
-		self::variation_bulk_adjust_price( $variations, '_sale_price', '-', wc_clean( $data['value'] ) );
+		self::variation_bulk_adjust_price( $variations, 'sale_price', '-', wc_clean( $data['value'] ) );
 	}
 
 	/**
 	 * Bulk action - Set Price.
 	 * @access private
-	 * @param  array $variations
+	 * @used-by bulk_edit_variations
+	 * @param array $variations
 	 * @param string $operator + or -
-	 * @param string $field price being adjusted
+	 * @param string $field price being adjusted _regular_price or _sale_price
 	 * @param string $value Price or Percent
 	 */
 	private static function variation_bulk_adjust_price( $variations, $field, $operator, $value ) {
 		foreach ( $variations as $variation_id ) {
-			// Get existing data
-			$_regular_price = get_post_meta( $variation_id, '_regular_price', true );
-			$_sale_price    = get_post_meta( $variation_id, '_sale_price', true );
-			$date_from      = get_post_meta( $variation_id, '_sale_price_dates_from', true );
-			$date_to        = get_post_meta( $variation_id, '_sale_price_dates_to', true );
-			$date_from      = ! empty( $date_from ) ? date( 'Y-m-d', $date_from ) : '';
-			$date_to        = ! empty( $date_to ) ? date( 'Y-m-d', $date_to ) : '';
+			$variation   = wc_get_product( $variation_id );
+			$field_value = $variation->{"get_$field"}( 'edit' );
 
 			if ( '%' === substr( $value, -1 ) ) {
 				$percent = wc_format_decimal( substr( $value, 0, -1 ) );
-				$$field  += ( ( $$field / 100 ) * $percent ) * "{$operator}1";
+				$field_value += ( ( $field_value / 100 ) * $percent ) * "{$operator}1";
 			} else {
-				$$field  += $value * "{$operator}1";
+				$field_value += $value * "{$operator}1";
 			}
-			_wc_save_product_price( $variation_id, $_regular_price, $_sale_price, $date_from, $date_to );
+
+			$variation->{"set_$field"}( $field_value );
+			$variation->save();
 		}
 	}
 
 	/**
-	 * Bulk action - Set Meta.
+	 * Bulk set convenience function.
 	 * @access private
 	 * @param array $variations
 	 * @param string $field
 	 * @param string $value
 	 */
-	private static function variation_bulk_set_meta( $variations, $field, $value ) {
+	private static function variation_bulk_set( $variations, $field, $value ) {
 		foreach ( $variations as $variation_id ) {
-			update_post_meta( $variation_id, $field, $value );
+			$variation = wc_get_product( $variation_id );
+			$variation->{ "set_$field" }( wc_clean( $value ) );
+			$variation->save();
 		}
 	}
 
+	/**
+	 * Bulk toggle convenience function.
+	 * @access private
+	 * @param array $variations
+	 * @param string $field
+	 */
+	private static function variation_bulk_toggle( $variations, $field ) {
+		foreach ( $variations as $variation_id ) {
+			$variation = wc_get_product( $variation_id );
+			$prev_value = $variation->{ "get_$field" }( 'edit' );
+			$variation->{ "set_$field" }( ! $prev_value );
+			$variation->save();
+		}
+	}
 
 	/**
 	 * Bulk edit variations via AJAX.
+	 * @uses WC_AJAX::variation_bulk_set()
+	 * @uses WC_AJAX::variation_bulk_adjust_price()
+	 * @uses WC_AJAX::variation_bulk_action_variable_sale_price_decrease()
+	 * @uses WC_AJAX::variation_bulk_action_variable_sale_price_increase()
+	 * @uses WC_AJAX::variation_bulk_action_variable_regular_price_decrease()
+	 * @uses WC_AJAX::variation_bulk_action_variable_regular_price_increase()
+	 * @uses WC_AJAX::variation_bulk_action_variable_sale_schedule()
+	 * @uses WC_AJAX::variation_bulk_action_delete_all()
+	 * @uses WC_AJAX::variation_bulk_action_variable_download_expiry()
+	 * @uses WC_AJAX::variation_bulk_action_variable_download_limit()
+	 * @uses WC_AJAX::variation_bulk_action_variable_height()
+	 * @uses WC_AJAX::variation_bulk_action_variable_width()
+	 * @uses WC_AJAX::variation_bulk_action_variable_length()
+	 * @uses WC_AJAX::variation_bulk_action_variable_weight()
+	 * @uses WC_AJAX::variation_bulk_action_variable_stock()
+	 * @uses WC_AJAX::variation_bulk_action_variable_sale_price()
+	 * @uses WC_AJAX::variation_bulk_action_variable_regular_price()
+	 * @uses WC_AJAX::variation_bulk_action_toggle_manage_stock()
+	 * @uses WC_AJAX::variation_bulk_action_toggle_virtual()
+	 * @uses WC_AJAX::variation_bulk_action_toggle_downloadable()
+	 * @uses WC_AJAX::variation_bulk_action_toggle_enabled
 	 */
 	public static function bulk_edit_variations() {
 		ob_start();
@@ -2929,7 +1988,7 @@ class WC_AJAX {
 
 		// Check permissions again and make sure we have what we need
 		if ( ! current_user_can( 'edit_products' ) || empty( $_POST['product_id'] ) || empty( $_POST['bulk_action'] ) ) {
-			die( -1 );
+			wp_die( -1 );
 		}
 
 		$product_id  = absint( $_POST['product_id'] );
@@ -2943,7 +2002,7 @@ class WC_AJAX {
 				'posts_per_page' => -1,
 				'post_type'      => 'product_variation',
 				'fields'         => 'ids',
-				'post_status'    => array( 'publish', 'private' )
+				'post_status'    => array( 'publish', 'private' ),
 			) );
 		}
 
@@ -2954,23 +2013,21 @@ class WC_AJAX {
 		}
 
 		do_action( 'woocommerce_bulk_edit_variations', $bulk_action, $data, $product_id, $variations );
-
-		// Sync and update transients
 		WC_Product_Variable::sync( $product_id );
 		wc_delete_product_transients( $product_id );
-		die();
+		wp_die();
 	}
 
 	/**
 	 * Handle submissions from assets/js/settings-views-html-settings-tax.js Backbone model.
 	 */
 	public static function tax_rates_save_changes() {
-		if ( ! isset( $_POST['current_class'], $_POST['wc_tax_nonce'], $_POST['changes'] ) ) {
+		if ( ! isset( $_POST['wc_tax_nonce'], $_POST['changes'] ) ) {
 			wp_send_json_error( 'missing_fields' );
 			exit;
 		}
 
-		$current_class = $_POST['current_class']; // This is sanitized seven lines later.
+		$current_class = ! empty( $_POST['current_class'] ) ? $_POST['current_class'] : ''; // This is sanitized seven lines later.
 
 		if ( ! wp_verify_nonce( $_POST['wc_tax_nonce'], 'wc_tax_nonce-class:' . $current_class ) ) {
 			wp_send_json_error( 'bad_nonce' );
@@ -3019,7 +2076,9 @@ class WC_AJAX {
 			}
 
 			if ( isset( $data['postcode'] ) ) {
-				WC_Tax::_update_tax_rate_postcodes( $tax_rate_id, array_map( 'wc_clean', $data['postcode'] ) );
+				$postcode = array_map( 'wc_clean', $data['postcode'] );
+				$postcode = array_map( 'wc_normalize_postcode', $postcode );
+				WC_Tax::_update_tax_rate_postcodes( $tax_rate_id, $postcode );
 			}
 			if ( isset( $data['city'] ) ) {
 				WC_Tax::_update_tax_rate_cities( $tax_rate_id, array_map( 'wc_clean', $data['city'] ) );
@@ -3030,6 +2089,290 @@ class WC_AJAX {
 			'rates' => WC_Tax::get_rates_for_tax_class( $current_class ),
 		) );
 	}
+
+	/**
+	 * Handle submissions from assets/js/wc-shipping-zones.js Backbone model.
+	 */
+	public static function shipping_zones_save_changes() {
+		if ( ! isset( $_POST['wc_shipping_zones_nonce'], $_POST['changes'] ) ) {
+			wp_send_json_error( 'missing_fields' );
+			exit;
+		}
+
+		if ( ! wp_verify_nonce( $_POST['wc_shipping_zones_nonce'], 'wc_shipping_zones_nonce' ) ) {
+			wp_send_json_error( 'bad_nonce' );
+			exit;
+		}
+
+		// Check User Caps
+		if ( ! current_user_can( 'manage_woocommerce' ) ) {
+			wp_send_json_error( 'missing_capabilities' );
+			exit;
+		}
+
+		$changes = $_POST['changes'];
+		foreach ( $changes as $zone_id => $data ) {
+			if ( isset( $data['deleted'] ) ) {
+				if ( isset( $data['newRow'] ) ) {
+					// So the user added and deleted a new row.
+					// That's fine, it's not in the database anyways. NEXT!
+					continue;
+				}
+				WC_Shipping_Zones::delete_zone( $zone_id );
+				continue;
+			}
+
+			$zone_data = array_intersect_key( $data, array(
+				'zone_id'        => 1,
+				'zone_order'     => 1,
+			) );
+
+			if ( isset( $zone_data['zone_id'] ) ) {
+				$zone = new WC_Shipping_Zone( $zone_data['zone_id'] );
+
+				if ( isset( $zone_data['zone_order'] ) ) {
+					$zone->set_zone_order( $zone_data['zone_order'] );
+				}
+
+				$zone->save();
+			}
+		}
+
+		wp_send_json_success( array(
+			'zones' => WC_Shipping_Zones::get_zones(),
+		) );
+	}
+
+	/**
+	 * Handle submissions from assets/js/wc-shipping-zone-methods.js Backbone model.
+	 */
+	public static function shipping_zone_add_method() {
+		if ( ! isset( $_POST['wc_shipping_zones_nonce'], $_POST['zone_id'], $_POST['method_id'] ) ) {
+			wp_send_json_error( 'missing_fields' );
+			exit;
+		}
+
+		if ( ! wp_verify_nonce( $_POST['wc_shipping_zones_nonce'], 'wc_shipping_zones_nonce' ) ) {
+			wp_send_json_error( 'bad_nonce' );
+			exit;
+		}
+
+		// Check User Caps
+		if ( ! current_user_can( 'manage_woocommerce' ) ) {
+			wp_send_json_error( 'missing_capabilities' );
+			exit;
+		}
+
+		$zone_id     = wc_clean( $_POST['zone_id'] );
+		$zone        = new WC_Shipping_Zone( $zone_id );
+		$instance_id = $zone->add_shipping_method( wc_clean( $_POST['method_id'] ) );
+
+		wp_send_json_success( array(
+			'instance_id' => $instance_id,
+			'zone_id'     => $zone->get_id(),
+			'zone_name'   => $zone->get_zone_name(),
+			'methods'     => $zone->get_shipping_methods(),
+		) );
+	}
+
+	/**
+	 * Handle submissions from assets/js/wc-shipping-zone-methods.js Backbone model.
+	 */
+	public static function shipping_zone_methods_save_changes() {
+		if ( ! isset( $_POST['wc_shipping_zones_nonce'], $_POST['zone_id'], $_POST['changes'] ) ) {
+			wp_send_json_error( 'missing_fields' );
+			exit;
+		}
+
+		if ( ! wp_verify_nonce( $_POST['wc_shipping_zones_nonce'], 'wc_shipping_zones_nonce' ) ) {
+			wp_send_json_error( 'bad_nonce' );
+			exit;
+		}
+
+		if ( ! current_user_can( 'manage_woocommerce' ) ) {
+			wp_send_json_error( 'missing_capabilities' );
+			exit;
+		}
+
+		global $wpdb;
+
+		$zone_id = wc_clean( $_POST['zone_id'] );
+		$zone    = new WC_Shipping_Zone( $zone_id );
+		$changes = $_POST['changes'];
+
+		if ( isset( $changes['zone_name'] ) ) {
+			$zone->set_zone_name( wc_clean( $changes['zone_name'] ) );
+		}
+
+		if ( isset( $changes['zone_locations'] ) ) {
+			$zone->clear_locations( array( 'state', 'country', 'continent' ) );
+			$locations = array_filter( array_map( 'wc_clean', (array) $changes['zone_locations'] ) );
+			foreach ( $locations as $location ) {
+				// Each posted location will be in the format type:code
+				$location_parts = explode( ':', $location );
+				switch ( $location_parts[0] ) {
+					case 'state' :
+						$zone->add_location( $location_parts[1] . ':' . $location_parts[2], 'state' );
+					break;
+					case 'country' :
+						$zone->add_location( $location_parts[1], 'country' );
+					break;
+					case 'continent' :
+						$zone->add_location( $location_parts[1], 'continent' );
+					break;
+				}
+			}
+		}
+
+		if ( isset( $changes['zone_postcodes'] ) ) {
+			$zone->clear_locations( 'postcode' );
+			$postcodes = array_filter( array_map( 'strtoupper', array_map( 'wc_clean', explode( "\n", $changes['zone_postcodes'] ) ) ) );
+			foreach ( $postcodes as $postcode ) {
+				$zone->add_location( $postcode, 'postcode' );
+			}
+		}
+
+		if ( isset( $changes['methods'] ) ) {
+			foreach ( $changes['methods'] as $instance_id => $data ) {
+				$method_id = $wpdb->get_var( $wpdb->prepare( "SELECT method_id FROM {$wpdb->prefix}woocommerce_shipping_zone_methods WHERE instance_id = %d", $instance_id ) );
+
+				if ( isset( $data['deleted'] ) ) {
+					$shipping_method = WC_Shipping_Zones::get_shipping_method( $instance_id );
+					$option_key      = $shipping_method->get_instance_option_key();
+					if ( $wpdb->delete( "{$wpdb->prefix}woocommerce_shipping_zone_methods", array( 'instance_id' => $instance_id ) ) ) {
+						delete_option( $option_key );
+						do_action( 'woocommerce_shipping_zone_method_deleted', $instance_id, $method_id, $zone_id );
+					}
+					continue;
+				}
+
+				$method_data = array_intersect_key( $data, array(
+					'method_order' => 1,
+					'enabled'      => 1,
+				) );
+
+				if ( isset( $method_data['method_order'] ) ) {
+					$wpdb->update( "{$wpdb->prefix}woocommerce_shipping_zone_methods", array( 'method_order' => absint( $method_data['method_order'] ) ), array( 'instance_id' => absint( $instance_id ) ) );
+				}
+
+				if ( isset( $method_data['enabled'] ) ) {
+					$is_enabled = absint( 'yes' === $method_data['enabled'] );
+					if ( $wpdb->update( "{$wpdb->prefix}woocommerce_shipping_zone_methods", array( 'is_enabled' => $is_enabled ), array( 'instance_id' => absint( $instance_id ) ) ) ) {
+						do_action( 'woocommerce_shipping_zone_method_status_toggled', $instance_id, $method_id, $zone_id, $is_enabled );
+					}
+				}
+			}
+		}
+
+		$zone->save();
+
+		wp_send_json_success( array(
+			'zone_id'   => $zone->get_id(),
+			'zone_name' => $zone->get_zone_name(),
+			'methods'   => $zone->get_shipping_methods(),
+		) );
+	}
+
+	/**
+	 * Save method settings
+	 */
+	public static function shipping_zone_methods_save_settings() {
+		if ( ! isset( $_POST['wc_shipping_zones_nonce'], $_POST['instance_id'], $_POST['data'] ) ) {
+			wp_send_json_error( 'missing_fields' );
+			exit;
+		}
+
+		if ( ! wp_verify_nonce( $_POST['wc_shipping_zones_nonce'], 'wc_shipping_zones_nonce' ) ) {
+			wp_send_json_error( 'bad_nonce' );
+			exit;
+		}
+
+		if ( ! current_user_can( 'manage_woocommerce' ) ) {
+			wp_send_json_error( 'missing_capabilities' );
+			exit;
+		}
+
+		$instance_id     = absint( $_POST['instance_id'] );
+		$zone            = WC_Shipping_Zones::get_zone_by( 'instance_id', $instance_id );
+		$shipping_method = WC_Shipping_Zones::get_shipping_method( $instance_id );
+		$shipping_method->set_post_data( $_POST['data'] );
+		$shipping_method->process_admin_options();
+
+		wp_send_json_success( array(
+			'zone_id'   => $zone->get_id(),
+			'zone_name' => $zone->get_zone_name(),
+			'methods'   => $zone->get_shipping_methods(),
+			'errors'    => $shipping_method->get_errors(),
+		) );
+	}
+
+	/**
+	 * Handle submissions from assets/js/wc-shipping-classes.js Backbone model.
+	 */
+	public static function shipping_classes_save_changes() {
+		if ( ! isset( $_POST['wc_shipping_classes_nonce'], $_POST['changes'] ) ) {
+			wp_send_json_error( 'missing_fields' );
+			exit;
+		}
+
+		if ( ! wp_verify_nonce( $_POST['wc_shipping_classes_nonce'], 'wc_shipping_classes_nonce' ) ) {
+			wp_send_json_error( 'bad_nonce' );
+			exit;
+		}
+
+		if ( ! current_user_can( 'manage_woocommerce' ) ) {
+			wp_send_json_error( 'missing_capabilities' );
+			exit;
+		}
+
+		$changes = $_POST['changes'];
+
+		foreach ( $changes as $term_id => $data ) {
+			$term_id = absint( $term_id );
+
+			if ( isset( $data['deleted'] ) ) {
+				if ( isset( $data['newRow'] ) ) {
+					// So the user added and deleted a new row.
+					// That's fine, it's not in the database anyways. NEXT!
+					continue;
+				}
+				wp_delete_term( $term_id, 'product_shipping_class' );
+				continue;
+			}
+
+			$update_args = array();
+
+			if ( isset( $data['name'] ) ) {
+				$update_args['name'] = wc_clean( $data['name'] );
+			}
+
+			if ( isset( $data['slug'] ) ) {
+				$update_args['slug'] = wc_clean( $data['slug'] );
+			}
+
+			if ( isset( $data['description'] ) ) {
+				$update_args['description'] = wc_clean( $data['description'] );
+			}
+
+			if ( isset( $data['newRow'] ) ) {
+				$update_args = array_filter( $update_args );
+				if ( empty( $update_args['name'] ) ) {
+					continue;
+				}
+				$term_id = wp_insert_term( $update_args['name'], 'product_shipping_class', $update_args );
+			} else {
+				wp_update_term( $term_id, 'product_shipping_class', $update_args );
+			}
+
+			do_action( 'woocommerce_shipping_classes_save_class', $term_id, $data );
+		}
+
+		$wc_shipping = WC_Shipping::instance();
+
+		wp_send_json_success( array(
+			'shipping_classes' => $wc_shipping->get_shipping_classes(),
+		) );
+	}
 }
 
 WC_AJAX::init();
diff --git a/includes/class-wc-api.php b/includes/class-wc-api.php
index 5a39bd3ba8c..6b3a5b133f7 100644
--- a/includes/class-wc-api.php
+++ b/includes/class-wc-api.php
@@ -14,272 +14,58 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
-if ( ! class_exists( 'WC_API' ) ) :
-
-class WC_API {
-
-	/** This is the major version for the REST API and takes
-	 * first-order position in endpoint URLs.
-	 */
-	const VERSION = '3.1.0';
-
-	/** @var WC_API_Server the REST API server */
-	public $server;
-
-	/** @var WC_API_Authentication REST API authentication class instance */
-	public $authentication;
+class WC_API extends WC_Legacy_API {
 
 	/**
 	 * Setup class.
-	 *
 	 * @since 2.0
-	 * @return WC_API
 	 */
 	public function __construct() {
-		// add query vars
+		parent::__construct();
+
+		// Add query vars.
 		add_filter( 'query_vars', array( $this, 'add_query_vars' ), 0 );
 
-		// register API endpoints
+		// Register API endpoints.
 		add_action( 'init', array( $this, 'add_endpoint' ), 0 );
 
-		// handle REST API requests
-		add_action( 'parse_request', array( $this, 'handle_rest_api_requests' ), 0 );
-
-		// handle wc-api endpoint requests
+		// Handle wc-api endpoint requests.
 		add_action( 'parse_request', array( $this, 'handle_api_requests' ), 0 );
 
-		// Ensure payment gateways are initialized in time for API requests
+		// Ensure payment gateways are initialized in time for API requests.
 		add_action( 'woocommerce_api_request', array( 'WC_Payment_Gateways', 'instance' ), 0 );
+
+		// WP REST API.
+		$this->rest_api_init();
 	}
 
 	/**
 	 * Add new query vars.
 	 *
 	 * @since 2.0
-	 * @param $vars
+	 * @param array $vars
 	 * @return string[]
 	 */
 	public function add_query_vars( $vars ) {
+		$vars   = parent::add_query_vars( $vars );
 		$vars[] = 'wc-api';
-		$vars[] = 'wc-api-version';
-		$vars[] = 'wc-api-route';
 		return $vars;
 	}
 
 	/**
-	 * Add new endpoints.
-	 *
+	 * WC API for payment gateway IPNs, etc.
 	 * @since 2.0
 	 */
 	public static function add_endpoint() {
-
-		// REST API
-		add_rewrite_rule( '^wc-api/v([1-3]{1})/?$', 'index.php?wc-api-version=$matches[1]&wc-api-route=/', 'top' );
-		add_rewrite_rule( '^wc-api/v([1-3]{1})(.*)?', 'index.php?wc-api-version=$matches[1]&wc-api-route=$matches[2]', 'top' );
-
-		// WC API for payment gateway IPNs, etc
+		parent::add_endpoint();
 		add_rewrite_endpoint( 'wc-api', EP_ALL );
 	}
 
-
-	/**
-	 * Handle REST API requests.
-	 *
-	 * @since 2.2
-	 */
-	public function handle_rest_api_requests() {
-		global $wp;
-
-		if ( ! empty( $_GET['wc-api-version'] ) ) {
-			$wp->query_vars['wc-api-version'] = $_GET['wc-api-version'];
-		}
-
-		if ( ! empty( $_GET['wc-api-route'] ) ) {
-			$wp->query_vars['wc-api-route'] = $_GET['wc-api-route'];
-		}
-
-		// REST API request
-		if ( ! empty( $wp->query_vars['wc-api-version'] ) && ! empty( $wp->query_vars['wc-api-route'] ) ) {
-
-			define( 'WC_API_REQUEST', true );
-			define( 'WC_API_REQUEST_VERSION', absint( $wp->query_vars['wc-api-version'] ) );
-
-			// legacy v1 API request
-			if ( 1 === WC_API_REQUEST_VERSION ) {
-				$this->handle_v1_rest_api_request();
-			} else if ( 2 === WC_API_REQUEST_VERSION ) {
-				$this->handle_v2_rest_api_request();
-			} else {
-				$this->includes();
-
-				$this->server = new WC_API_Server( $wp->query_vars['wc-api-route'] );
-
-				// load API resource classes
-				$this->register_resources( $this->server );
-
-				// Fire off the request
-				$this->server->serve_request();
-			}
-
-			exit;
-		}
-	}
-
-	/**
-	 * Include required files for REST API request.
-	 *
-	 * @since 2.1
-	 */
-	public function includes() {
-
-		// API server / response handlers
-		include_once( 'api/class-wc-api-exception.php' );
-		include_once( 'api/class-wc-api-server.php' );
-		include_once( 'api/interface-wc-api-handler.php' );
-		include_once( 'api/class-wc-api-json-handler.php' );
-
-		// authentication
-		include_once( 'api/class-wc-api-authentication.php' );
-		$this->authentication = new WC_API_Authentication();
-
-		include_once( 'api/class-wc-api-resource.php' );
-		include_once( 'api/class-wc-api-coupons.php' );
-		include_once( 'api/class-wc-api-customers.php' );
-		include_once( 'api/class-wc-api-orders.php' );
-		include_once( 'api/class-wc-api-products.php' );
-		include_once( 'api/class-wc-api-reports.php' );
-		include_once( 'api/class-wc-api-taxes.php' );
-		include_once( 'api/class-wc-api-webhooks.php' );
-
-		// allow plugins to load other response handlers or resource classes
-		do_action( 'woocommerce_api_loaded' );
-	}
-
-	/**
-	 * Register available API resources.
-	 *
-	 * @since 2.1
-	 * @param WC_API_Server $server the REST server
-	 */
-	public function register_resources( $server ) {
-
-		$api_classes = apply_filters( 'woocommerce_api_classes',
-			array(
-				'WC_API_Coupons',
-				'WC_API_Customers',
-				'WC_API_Orders',
-				'WC_API_Products',
-				'WC_API_Reports',
-				'WC_API_Taxes',
-				'WC_API_Webhooks',
-			)
-		);
-
-		foreach ( $api_classes as $api_class ) {
-			$this->$api_class = new $api_class( $server );
-		}
-	}
-
-
-	/**
-	 * Handle legacy v1 REST API requests.
-	 *
-	 * @since 2.2
-	 */
-	private function handle_v1_rest_api_request() {
-
-		// include legacy required files for v1 REST API request
-		include_once( 'api/v1/class-wc-api-server.php' );
-		include_once( 'api/v1/interface-wc-api-handler.php' );
-		include_once( 'api/v1/class-wc-api-json-handler.php' );
-		include_once( 'api/v1/class-wc-api-xml-handler.php' );
-
-		include_once( 'api/v1/class-wc-api-authentication.php' );
-		$this->authentication = new WC_API_Authentication();
-
-		include_once( 'api/v1/class-wc-api-resource.php' );
-		include_once( 'api/v1/class-wc-api-coupons.php' );
-		include_once( 'api/v1/class-wc-api-customers.php' );
-		include_once( 'api/v1/class-wc-api-orders.php' );
-		include_once( 'api/v1/class-wc-api-products.php' );
-		include_once( 'api/v1/class-wc-api-reports.php' );
-
-		// allow plugins to load other response handlers or resource classes
-		do_action( 'woocommerce_api_loaded' );
-
-		$this->server = new WC_API_Server( $GLOBALS['wp']->query_vars['wc-api-route'] );
-
-		// Register available resources for legacy v1 REST API request
-		$api_classes = apply_filters( 'woocommerce_api_classes',
-			array(
-				'WC_API_Customers',
-				'WC_API_Orders',
-				'WC_API_Products',
-				'WC_API_Coupons',
-				'WC_API_Reports',
-			)
-		);
-
-		foreach ( $api_classes as $api_class ) {
-			$this->$api_class = new $api_class( $this->server );
-		}
-
-		// Fire off the request
-		$this->server->serve_request();
-	}
-
-	/**
-	 * Handle legacy v2 REST API requests.
-	 *
-	 * @since 2.4
-	 */
-	private function handle_v2_rest_api_request() {
-		include_once( 'api/v2/class-wc-api-exception.php' );
-		include_once( 'api/v2/class-wc-api-server.php' );
-		include_once( 'api/v2/interface-wc-api-handler.php' );
-		include_once( 'api/v2/class-wc-api-json-handler.php' );
-
-		include_once( 'api/v2/class-wc-api-authentication.php' );
-		$this->authentication = new WC_API_Authentication();
-
-		include_once( 'api/v2/class-wc-api-resource.php' );
-		include_once( 'api/v2/class-wc-api-coupons.php' );
-		include_once( 'api/v2/class-wc-api-customers.php' );
-		include_once( 'api/v2/class-wc-api-orders.php' );
-		include_once( 'api/v2/class-wc-api-products.php' );
-		include_once( 'api/v2/class-wc-api-reports.php' );
-		include_once( 'api/v2/class-wc-api-webhooks.php' );
-
-		// allow plugins to load other response handlers or resource classes
-		do_action( 'woocommerce_api_loaded' );
-
-		$this->server = new WC_API_Server( $GLOBALS['wp']->query_vars['wc-api-route'] );
-
-		// Register available resources for legacy v2 REST API request
-		$api_classes = apply_filters( 'woocommerce_api_classes',
-			array(
-				'WC_API_Customers',
-				'WC_API_Orders',
-				'WC_API_Products',
-				'WC_API_Coupons',
-				'WC_API_Reports',
-				'WC_API_Webhooks',
-			)
-		);
-
-		foreach ( $api_classes as $api_class ) {
-			$this->$api_class = new $api_class( $this->server );
-		}
-
-		// Fire off the request
-		$this->server->serve_request();
-	}
-
 	/**
 	 * API request - Trigger any API requests.
 	 *
-	 * @since    2.0
-	 * @version  2.4
+	 * @since   2.0
+	 * @version 2.4
 	 */
 	public function handle_api_requests() {
 		global $wp;
@@ -288,34 +74,219 @@ class WC_API {
 			$wp->query_vars['wc-api'] = $_GET['wc-api'];
 		}
 
-		// wc-api endpoint requests
+		// wc-api endpoint requests.
 		if ( ! empty( $wp->query_vars['wc-api'] ) ) {
 
-			// Buffer, we won't want any output here
+			// Buffer, we won't want any output here.
 			ob_start();
 
-			// No cache headers
+			// No cache headers.
 			nocache_headers();
 
-			// Clean the API request
+			// Clean the API request.
 			$api_request = strtolower( wc_clean( $wp->query_vars['wc-api'] ) );
 
-			// Trigger generic action before request hook
+			// Trigger generic action before request hook.
 			do_action( 'woocommerce_api_request', $api_request );
 
-			// Is there actually something hooked into this API request? If not trigger 400 - Bad request
+			// Is there actually something hooked into this API request? If not trigger 400 - Bad request.
 			status_header( has_action( 'woocommerce_api_' . $api_request ) ? 200 : 400 );
 
-			// Trigger an action which plugins can hook into to fulfill the request
+			// Trigger an action which plugins can hook into to fulfill the request.
 			do_action( 'woocommerce_api_' . $api_request );
 
-			// Done, clear buffer and exit
+			// Done, clear buffer and exit.
 			ob_end_clean();
-			die('-1');
+			die( '-1' );
 		}
 	}
+
+	/**
+	 * Init WP REST API.
+	 * @since 2.6.0
+	 */
+	private function rest_api_init() {
+		// REST API was included starting WordPress 4.4.
+		if ( ! class_exists( 'WP_REST_Server' ) ) {
+			return;
+		}
+
+		$this->rest_api_includes();
+
+		// Init REST API routes.
+		add_action( 'rest_api_init', array( $this, 'register_rest_routes' ), 10 );
+	}
+
+	/**
+	 * Include REST API classes.
+	 *
+	 * @since 2.6.0
+	 */
+	private function rest_api_includes() {
+		// Exception handler.
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-exception.php' );
+
+		// Authentication.
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-authentication.php' );
+
+		// WP-API classes and functions.
+		include_once( dirname( __FILE__ ) . '/vendor/wp-rest-functions.php' );
+		if ( ! class_exists( 'WP_REST_Controller' ) ) {
+			include_once( dirname( __FILE__ ) . '/vendor/abstract-wp-rest-controller.php' );
+		}
+
+		// Abstract controllers.
+		include_once( dirname( __FILE__ ) . '/abstracts/abstract-wc-rest-controller.php' );
+		include_once( dirname( __FILE__ ) . '/abstracts/abstract-wc-rest-posts-controller.php' );
+		include_once( dirname( __FILE__ ) . '/abstracts/abstract-wc-rest-crud-controller.php' );
+		include_once( dirname( __FILE__ ) . '/abstracts/abstract-wc-rest-terms-controller.php' );
+		include_once( dirname( __FILE__ ) . '/abstracts/abstract-wc-rest-shipping-zones-controller.php' );
+		include_once( dirname( __FILE__ ) . '/abstracts/abstract-wc-settings-api.php' );
+
+		// REST API v1 controllers.
+		include_once( dirname( __FILE__ ) . '/api/v1/class-wc-rest-coupons-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/v1/class-wc-rest-customer-downloads-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/v1/class-wc-rest-customers-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/v1/class-wc-rest-orders-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/v1/class-wc-rest-order-notes-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/v1/class-wc-rest-order-refunds-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/v1/class-wc-rest-product-attribute-terms-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/v1/class-wc-rest-product-attributes-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/v1/class-wc-rest-product-categories-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/v1/class-wc-rest-product-reviews-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/v1/class-wc-rest-product-shipping-classes-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/v1/class-wc-rest-product-tags-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/v1/class-wc-rest-products-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/v1/class-wc-rest-report-sales-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/v1/class-wc-rest-report-top-sellers-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/v1/class-wc-rest-reports-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/v1/class-wc-rest-tax-classes-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/v1/class-wc-rest-taxes-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/v1/class-wc-rest-webhook-deliveries.php' );
+		include_once( dirname( __FILE__ ) . '/api/v1/class-wc-rest-webhooks-controller.php' );
+
+		// Legacy v2 code.
+		include_once( dirname( __FILE__ ) . '/api/legacy/class-wc-rest-legacy-coupons-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/legacy/class-wc-rest-legacy-orders-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/legacy/class-wc-rest-legacy-products-controller.php' );
+
+		// REST API v2 controllers.
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-coupons-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-customer-downloads-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-customers-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-orders-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-order-notes-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-order-refunds-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-product-attribute-terms-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-product-attributes-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-product-categories-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-product-reviews-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-product-shipping-classes-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-product-tags-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-products-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-product-variations-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-report-sales-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-report-top-sellers-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-reports-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-settings-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-setting-options-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-shipping-zones-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-shipping-zone-locations-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-shipping-zone-methods-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-tax-classes-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-taxes-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-webhook-deliveries.php' );
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-webhooks-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-system-status-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-system-status-tools-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-shipping-methods-controller.php' );
+		include_once( dirname( __FILE__ ) . '/api/class-wc-rest-payment-gateways-controller.php' );
+	}
+
+	/**
+	 * Register REST API routes.
+	 * @since 2.6.0
+	 */
+	public function register_rest_routes() {
+		// Register settings to the REST API.
+		$this->register_wp_admin_settings();
+
+		$controllers = array(
+			// v1 controllers.
+			'WC_REST_Coupons_V1_Controller',
+			'WC_REST_Customer_Downloads_V1_Controller',
+			'WC_REST_Customers_V1_Controller',
+			'WC_REST_Order_Notes_V1_Controller',
+			'WC_REST_Order_Refunds_V1_Controller',
+			'WC_REST_Orders_V1_Controller',
+			'WC_REST_Product_Attribute_Terms_V1_Controller',
+			'WC_REST_Product_Attributes_V1_Controller',
+			'WC_REST_Product_Categories_V1_Controller',
+			'WC_REST_Product_Reviews_V1_Controller',
+			'WC_REST_Product_Shipping_Classes_V1_Controller',
+			'WC_REST_Product_Tags_V1_Controller',
+			'WC_REST_Products_V1_Controller',
+			'WC_REST_Report_Sales_V1_Controller',
+			'WC_REST_Report_Top_Sellers_V1_Controller',
+			'WC_REST_Reports_V1_Controller',
+			'WC_REST_Tax_Classes_V1_Controller',
+			'WC_REST_Taxes_V1_Controller',
+			'WC_REST_Webhook_Deliveries_V1_Controller',
+			'WC_REST_Webhooks_V1_Controller',
+
+			// v2 controllers.
+			'WC_REST_Coupons_Controller',
+			'WC_REST_Customer_Downloads_Controller',
+			'WC_REST_Customers_Controller',
+			'WC_REST_Order_Notes_Controller',
+			'WC_REST_Order_Refunds_Controller',
+			'WC_REST_Orders_Controller',
+			'WC_REST_Product_Attribute_Terms_Controller',
+			'WC_REST_Product_Attributes_Controller',
+			'WC_REST_Product_Categories_Controller',
+			'WC_REST_Product_Reviews_Controller',
+			'WC_REST_Product_Shipping_Classes_Controller',
+			'WC_REST_Product_Tags_Controller',
+			'WC_REST_Products_Controller',
+			'WC_REST_Product_Variations_Controller',
+			'WC_REST_Report_Sales_Controller',
+			'WC_REST_Report_Top_Sellers_Controller',
+			'WC_REST_Reports_Controller',
+			'WC_REST_Settings_Controller',
+			'WC_REST_Setting_Options_Controller',
+			'WC_REST_Shipping_Zones_Controller',
+			'WC_REST_Shipping_Zone_Locations_Controller',
+			'WC_REST_Shipping_Zone_Methods_Controller',
+			'WC_REST_Tax_Classes_Controller',
+			'WC_REST_Taxes_Controller',
+			'WC_REST_Webhook_Deliveries_Controller',
+			'WC_REST_Webhooks_Controller',
+			'WC_REST_System_Status_Controller',
+			'WC_REST_System_Status_Tools_Controller',
+			'WC_REST_Shipping_Methods_Controller',
+			'WC_REST_Payment_Gateways_Controller',
+		);
+
+		foreach ( $controllers as $controller ) {
+			$this->$controller = new $controller();
+			$this->$controller->register_routes();
+		}
+	}
+
+	/**
+	 * Register WC settings from WP-API to the REST API.
+	 * @since  3.0.0
+	 */
+	public function register_wp_admin_settings() {
+		$pages = WC_Admin_Settings::get_settings_pages();
+		foreach ( $pages as $page ) {
+			new WC_Register_WP_Admin_Settings( $page, 'page' );
+		}
+
+		$emails = WC_Emails::instance();
+		foreach ( $emails->get_emails() as $email ) {
+			new WC_Register_WP_Admin_Settings( $email, 'email' );
+		}
+	}
+
 }
-
-endif;
-
-return new WC_API();
diff --git a/includes/class-wc-auth.php b/includes/class-wc-auth.php
index 59103126ee2..d1999600e35 100644
--- a/includes/class-wc-auth.php
+++ b/includes/class-wc-auth.php
@@ -9,17 +9,16 @@
  * @package  WooCommerce/API
  * @since    2.4.0
  */
-
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
-if ( ! class_exists( 'WC_Auth' ) ) :
-
 class WC_Auth {
 
 	/**
 	 * Version.
+	 *
+	 * @var int
 	 */
 	const VERSION = 1;
 
@@ -44,7 +43,7 @@ class WC_Auth {
 	 *
 	 * @since  2.4.0
 	 *
-	 * @param  $vars
+	 * @param  array $vars
 	 *
 	 * @return string[]
 	 */
@@ -93,7 +92,7 @@ class WC_Auth {
 	 */
 	protected function get_permissions_in_scope( $scope ) {
 		$permissions = array();
-		switch ( $scope )  {
+		switch ( $scope ) {
 			case 'read' :
 				$permissions[] = __( 'View coupons', 'woocommerce' );
 				$permissions[] = __( 'View customers', 'woocommerce' );
@@ -132,14 +131,29 @@ class WC_Auth {
 		$url = wc_get_endpoint_url( 'wc-auth/v' . self::VERSION, $endpoint, home_url( '/' ) );
 
 		return add_query_arg( array(
-			'app_name'     => wc_clean( $data['app_name'] ),
-			'user_id'      => wc_clean( $data['user_id'] ),
-			'return_url'   => urlencode( $data['return_url'] ),
-			'callback_url' => urlencode( $data['callback_url'] ),
-			'scope'        => wc_clean( $data['scope'] ),
+			'app_name'            => wc_clean( $data['app_name'] ),
+			'user_id'             => wc_clean( $data['user_id'] ),
+			'return_url'          => urlencode( $this->get_formatted_url( $data['return_url'] ) ),
+			'callback_url'        => urlencode( $this->get_formatted_url( $data['callback_url'] ) ),
+			'scope'               => wc_clean( $data['scope'] ),
 		), $url );
 	}
 
+	/**
+	 * Decode and format a URL.
+	 * @param  string $url
+	 * @return array
+	 */
+	protected function get_formatted_url( $url ) {
+		$url = urldecode( $url );
+
+		if ( ! strstr( $url, '://' ) ) {
+			$url = 'https://' . $url;
+		}
+
+		return $url;
+	}
+
 	/**
 	 * Make validation.
 	 *
@@ -151,26 +165,33 @@ class WC_Auth {
 			'user_id',
 			'return_url',
 			'callback_url',
-			'scope'
+			'scope',
 		);
 
 		foreach ( $params as $param ) {
 			if ( empty( $_REQUEST[ $param ] ) ) {
+				/* translators: %s: parameter */
 				throw new Exception( sprintf( __( 'Missing parameter %s', 'woocommerce' ), $param ) );
 			}
 		}
 
 		if ( ! in_array( $_REQUEST['scope'], array( 'read', 'write', 'read_write' ) ) ) {
+			/* translators: %s: scope */
 			throw new Exception( sprintf( __( 'Invalid scope %s', 'woocommerce' ), wc_clean( $_REQUEST['scope'] ) ) );
 		}
 
 		foreach ( array( 'return_url', 'callback_url' ) as $param ) {
-			if ( false === filter_var( urldecode( $_REQUEST[ $param ] ), FILTER_VALIDATE_URL ) ) {
+			$param = $this->get_formatted_url( $_REQUEST[ $param ] );
+
+			if ( false === filter_var( $param, FILTER_VALIDATE_URL ) ) {
+				/* translators: %s: url */
 				throw new Exception( sprintf( __( 'The %s is not a valid URL', 'woocommerce' ), $param ) );
 			}
 		}
 
-		if ( 0 !== stripos( urldecode( $_REQUEST['callback_url'] ), 'https://' ) ) {
+		$callback_url = $this->get_formatted_url( $_REQUEST['callback_url'] );
+
+		if ( 0 !== stripos( $callback_url, 'https://' ) ) {
 			throw new Exception( __( 'The callback_url need to be over SSL', 'woocommerce' ) );
 		}
 	}
@@ -189,8 +210,15 @@ class WC_Auth {
 	protected function create_keys( $app_name, $app_user_id, $scope ) {
 		global $wpdb;
 
-		$description = sprintf( __( '%s - API %s (created on %s at %s).', 'woocommerce' ), wc_clean( $app_name ), $this->get_i18n_scope( $scope ), date_i18n( wc_date_format() ), date_i18n( wc_time_format() ) );
-		$user        = wp_get_current_user();
+		/* translators: 1: app name 2: scope 3: date 4: time */
+		$description = sprintf(
+			__( '%1$s - API %2$s (created on %3$s at %4$s).', 'woocommerce' ),
+			wc_clean( $app_name ),
+			$this->get_i18n_scope( $scope ),
+			date_i18n( wc_date_format() ),
+			date_i18n( wc_time_format() )
+		);
+		$user = wp_get_current_user();
 
 		// Created API keys.
 		$permissions     = ( in_array( $scope, array( 'read', 'write', 'read_write' ) ) ) ? sanitize_text_field( $scope ) : 'read';
@@ -205,7 +233,7 @@ class WC_Auth {
 				'permissions'     => $permissions,
 				'consumer_key'    => wc_api_hash( $consumer_key ),
 				'consumer_secret' => $consumer_secret,
-				'truncated_key'   => substr( $consumer_key, -7 )
+				'truncated_key'   => substr( $consumer_key, -7 ),
 			),
 			array(
 				'%d',
@@ -213,7 +241,7 @@ class WC_Auth {
 				'%s',
 				'%s',
 				'%s',
-				'%s'
+				'%s',
 			)
 		);
 
@@ -222,7 +250,7 @@ class WC_Auth {
 			'user_id'         => $app_user_id,
 			'consumer_key'    => $consumer_key,
 			'consumer_secret' => $consumer_secret,
-			'key_permissions' => $permissions
+			'key_permissions' => $permissions,
 		);
 	}
 
@@ -243,14 +271,14 @@ class WC_Auth {
 			'timeout'   => 60,
 			'headers'   => array(
 				'Content-Type' => 'application/json;charset=' . get_bloginfo( 'charset' ),
-			)
+			),
 		);
 
-		$response = wp_safe_remote_post( esc_url_raw( urldecode( $url ) ), $params );
+		$response = wp_safe_remote_post( esc_url_raw( $url ), $params );
 
 		if ( is_wp_error( $response ) ) {
 			throw new Exception( $response->get_error_message() );
-		} else if ( 200 != $response['response']['code'] ) {
+		} elseif ( 200 != $response['response']['code'] ) {
 			throw new Exception( __( 'An error occurred in the request and at the time were unable to send the consumer data', 'woocommerce' ) );
 		}
 
@@ -303,46 +331,46 @@ class WC_Auth {
 			if ( 'login' == $route && ! is_user_logged_in() ) {
 				wc_get_template( 'auth/form-login.php', array(
 					'app_name'     => $_REQUEST['app_name'],
-					'return_url'   => add_query_arg( array( 'success' => 0, 'user_id' => wc_clean( $_REQUEST['user_id'] ) ), urldecode( $_REQUEST['return_url'] ) ),
+					'return_url'   => add_query_arg( array( 'success' => 0, 'user_id' => wc_clean( $_REQUEST['user_id'] ) ), $this->get_formatted_url( $_REQUEST['return_url'] ) ),
 					'redirect_url' => $this->build_url( $_REQUEST, 'authorize' ),
 				) );
 
 				exit;
 
 			// Redirect with user is logged in
-			} else if ( 'login' == $route && is_user_logged_in() ) {
+			} elseif ( 'login' == $route && is_user_logged_in() ) {
 				wp_redirect( esc_url_raw( $this->build_url( $_REQUEST, 'authorize' ) ) );
 				exit;
 
 			// Redirect with user is not logged in and trying to access the authorize endpoint
-			} else if ( 'authorize' == $route && ! is_user_logged_in() ) {
+			} elseif ( 'authorize' == $route && ! is_user_logged_in() ) {
 				wp_redirect( esc_url_raw( $this->build_url( $_REQUEST, 'login' ) ) );
 				exit;
 
 			// Authorize endpoint
-			} else if ( 'authorize' == $route && current_user_can( 'manage_woocommerce' ) ) {
+			} elseif ( 'authorize' == $route && current_user_can( 'manage_woocommerce' ) ) {
 				wc_get_template( 'auth/form-grant-access.php', array(
 					'app_name'    => $_REQUEST['app_name'],
-					'return_url'  => add_query_arg( array( 'success' => 0, 'user_id' => wc_clean( $_REQUEST['user_id'] ) ), urldecode( $_REQUEST['return_url'] ) ),
+					'return_url'  => add_query_arg( array( 'success' => 0, 'user_id' => wc_clean( $_REQUEST['user_id'] ) ), $this->get_formatted_url( $_REQUEST['return_url'] ) ),
 					'scope'       => $this->get_i18n_scope( wc_clean( $_REQUEST['scope'] ) ),
 					'permissions' => $this->get_permissions_in_scope( wc_clean( $_REQUEST['scope'] ) ),
 					'granted_url' => wp_nonce_url( $this->build_url( $_REQUEST, 'access_granted' ), 'wc_auth_grant_access', 'wc_auth_nonce' ),
 					'logout_url'  => wp_logout_url( $this->build_url( $_REQUEST, 'login' ) ),
-					'user'        => wp_get_current_user()
+					'user'        => wp_get_current_user(),
 				) );
 				exit;
 
 			// Granted access endpoint
-			} else if ( 'access_granted' == $route && current_user_can( 'manage_woocommerce' ) ) {
+			} elseif ( 'access_granted' == $route && current_user_can( 'manage_woocommerce' ) ) {
 				if ( ! isset( $_GET['wc_auth_nonce'] ) || ! wp_verify_nonce( $_GET['wc_auth_nonce'], 'wc_auth_grant_access' ) ) {
 					throw new Exception( __( 'Invalid nonce verification', 'woocommerce' ) );
 				}
 
 				$consumer_data = $this->create_keys( $_REQUEST['app_name'], $_REQUEST['user_id'], $_REQUEST['scope'] );
-				$response      = $this->post_consumer_data( $consumer_data, $_REQUEST['callback_url'] );
+				$response      = $this->post_consumer_data( $consumer_data, $this->get_formatted_url( $_REQUEST['callback_url'] ) );
 
 				if ( $response ) {
-					wp_redirect( esc_url_raw( add_query_arg( array( 'success' => 1, 'user_id' => wc_clean( $_REQUEST['user_id'] ) ), urldecode( $_REQUEST['return_url'] ) ) ) );
+					wp_redirect( esc_url_raw( add_query_arg( array( 'success' => 1, 'user_id' => wc_clean( $_REQUEST['user_id'] ) ), $this->get_formatted_url( $_REQUEST['return_url'] ) ) ) );
 					exit;
 				}
 			} else {
@@ -351,7 +379,8 @@ class WC_Auth {
 		} catch ( Exception $e ) {
 			$this->maybe_delete_key( $consumer_data );
 
-			wp_die( sprintf( __( 'Error: %s', 'woocommerce' ), $e->getMessage() ), __( 'Access Denied', 'woocommerce' ), array( 'response' => 401 ) );
+			/* translators: %s: error messase */
+			wp_die( sprintf( __( 'Error: %s.', 'woocommerce' ), $e->getMessage() ), __( 'Access denied', 'woocommerce' ), array( 'response' => 401 ) );
 		}
 	}
 
@@ -370,7 +399,4 @@ class WC_Auth {
 		}
 	}
 }
-
-endif;
-
-return new WC_Auth();
+new WC_Auth();
diff --git a/includes/class-wc-autoloader.php b/includes/class-wc-autoloader.php
index f6af30d3d6a..b6c7416a5ea 100644
--- a/includes/class-wc-autoloader.php
+++ b/includes/class-wc-autoloader.php
@@ -1,5 +1,4 @@
 <?php
-
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
@@ -9,7 +8,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  *
  * @class 		WC_Autoloader
  * @version		2.3.0
- * @package		WooCommerce/Classes/
+ * @package		WooCommerce/Classes
  * @category	Class
  * @author 		WooThemes
  */
@@ -66,6 +65,11 @@ class WC_Autoloader {
 	 */
 	public function autoload( $class ) {
 		$class = strtolower( $class );
+
+		if ( 0 !== strpos( $class, 'wc_' ) ) {
+			return;
+		}
+
 		$file  = $this->get_file_name_from_class( $class );
 		$path  = '';
 
@@ -81,11 +85,13 @@ class WC_Autoloader {
 			$path = $this->include_path . 'admin/meta-boxes/';
 		} elseif ( strpos( $class, 'wc_admin' ) === 0 ) {
 			$path = $this->include_path . 'admin/';
-		} elseif ( strpos( $class, 'wc_cli_' ) === 0 ) {
-			$path = $this->include_path . 'cli/';
+		} elseif ( strpos( $class, 'wc_payment_token_' ) === 0 ) {
+			$path = $this->include_path . 'payment-tokens/';
+		} elseif ( strpos( $class, 'wc_log_handler_' ) === 0 ) {
+			$path = $this->include_path . 'log-handlers/';
 		}
 
-		if ( empty( $path ) || ( ! $this->load_file( $path . $file ) && strpos( $class, 'wc_' ) === 0 ) ) {
+		if ( empty( $path ) || ! $this->load_file( $path . $file ) ) {
 			$this->load_file( $this->include_path . $file );
 		}
 	}
diff --git a/includes/class-wc-background-emailer.php b/includes/class-wc-background-emailer.php
new file mode 100644
index 00000000000..c0e5601d274
--- /dev/null
+++ b/includes/class-wc-background-emailer.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * Background Emailer
+ *
+ * Uses https://github.com/A5hleyRich/wp-background-processing to handle emails
+ * in the background.
+ *
+ * @class    WC_Background_Emailer
+ * @version  3.0.1
+ * @package  WooCommerce/Classes
+ * @category Class
+ * @author   WooCommerce
+ */
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+if ( ! class_exists( 'WP_Async_Request', false ) ) {
+	include_once( dirname( __FILE__ ) . '/libraries/wp-async-request.php' );
+}
+
+if ( ! class_exists( 'WP_Background_Process', false ) ) {
+	include_once( dirname( __FILE__ ) . '/libraries/wp-background-process.php' );
+}
+
+/**
+ * WC_Background_Emailer Class.
+ */
+class WC_Background_Emailer extends WP_Background_Process {
+
+	/**
+	 * @var string
+	 */
+	protected $action = 'wc_emailer';
+
+	/**
+	 * Initiate new background process
+	 */
+	public function __construct() {
+		parent::__construct();
+		add_action( 'shutdown', array( $this, 'dispatch_queue' ) );
+	}
+
+	/**
+	 * Schedule fallback event.
+	 */
+	protected function schedule_event() {
+		if ( ! wp_next_scheduled( $this->cron_hook_identifier ) ) {
+			wp_schedule_event( time() + 10, $this->cron_interval_identifier, $this->cron_hook_identifier );
+		}
+	}
+
+	/**
+	 * Task
+	 *
+	 * Override this method to perform any actions required on each
+	 * queue item. Return the modified item for further processing
+	 * in the next pass through. Or, return false to remove the
+	 * item from the queue.
+	 *
+	 * @param string $callback Update callback function
+	 * @return mixed
+	 */
+	protected function task( $callback ) {
+		if ( isset( $callback['filter'], $callback['args'] ) ) {
+			try {
+				WC_Emails::send_queued_transactional_email( $callback['filter'], $callback['args'] );
+			} catch ( Exception $e ) {
+				if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+					trigger_error( 'Transactional email triggered fatal error for callback ' . $callback['filter'], E_USER_WARNING );
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Save and run queue.
+	 */
+	public function dispatch_queue() {
+		if ( ! empty( $this->data ) ) {
+			$this->save()->dispatch();
+		}
+	}
+
+	/**
+	 * Get post args
+	 *
+	 * @return array
+	 */
+	protected function get_post_args() {
+		if ( property_exists( $this, 'post_args' ) ) {
+			return $this->post_args;
+		}
+
+		// Pass cookies through with the request so nonces function.
+		$cookies = array();
+
+		foreach ( $_COOKIE as $name => $value ) {
+			if ( 'PHPSESSID' === $name ) {
+				continue;
+			}
+			$cookies[] = new WP_Http_Cookie( array( 'name' => $name, 'value' => $value ) );
+		}
+
+		return array(
+			'timeout'   => 0.01,
+			'blocking'  => false,
+			'body'      => $this->data,
+			'cookies'   => $cookies,
+			'sslverify' => apply_filters( 'https_local_ssl_verify', false ),
+		);
+	}
+
+	/**
+	 * Handle
+	 *
+	 * Pass each queue item to the task handler, while remaining
+	 * within server memory and time limit constraints.
+	 */
+	protected function handle() {
+		$this->lock_process();
+
+		do {
+			$batch = $this->get_batch();
+
+			if ( empty( $batch->data ) ) {
+				break;
+			}
+
+			foreach ( $batch->data as $key => $value ) {
+				$task = $this->task( $value );
+
+				if ( false !== $task ) {
+					$batch->data[ $key ] = $task;
+				} else {
+					unset( $batch->data[ $key ] );
+				}
+
+				// Update batch before sending more to prevent duplicate email possibility.
+				$this->update( $batch->key, $batch->data );
+
+				if ( $this->time_exceeded() || $this->memory_exceeded() ) {
+					// Batch limits reached.
+					break;
+				}
+			}
+			if ( empty( $batch->data ) ) {
+				$this->delete( $batch->key );
+			}
+		} while ( ! $this->time_exceeded() && ! $this->memory_exceeded() && ! $this->is_queue_empty() );
+
+		$this->unlock_process();
+
+		// Start next batch or complete process.
+		if ( ! $this->is_queue_empty() ) {
+			$this->dispatch();
+		} else {
+			$this->complete();
+		}
+	}
+}
diff --git a/includes/class-wc-background-updater.php b/includes/class-wc-background-updater.php
new file mode 100644
index 00000000000..0eec0045ff2
--- /dev/null
+++ b/includes/class-wc-background-updater.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Background Updater
+ *
+ * Uses https://github.com/A5hleyRich/wp-background-processing to handle DB
+ * updates in the background.
+ *
+ * @class    WC_Background_Updater
+ * @version  2.6.0
+ * @package  WooCommerce/Classes
+ * @category Class
+ * @author   WooThemes
+ */
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+if ( ! class_exists( 'WP_Async_Request', false ) ) {
+	include_once( dirname( __FILE__ ) . '/libraries/wp-async-request.php' );
+}
+
+if ( ! class_exists( 'WP_Background_Process', false ) ) {
+	include_once( dirname( __FILE__ ) . '/libraries/wp-background-process.php' );
+}
+
+/**
+ * WC_Background_Updater Class.
+ */
+class WC_Background_Updater extends WP_Background_Process {
+
+	/**
+	 * @var string
+	 */
+	protected $action = 'wc_updater';
+
+	/**
+	 * Dispatch updater.
+	 *
+	 * Updater will still run via cron job if this fails for any reason.
+	 */
+	public function dispatch() {
+		$dispatched = parent::dispatch();
+		$logger     = wc_get_logger();
+
+		if ( is_wp_error( $dispatched ) ) {
+			$logger->error(
+				sprintf( 'Unable to dispatch WooCommerce updater: %s', $dispatched->get_error_message() ),
+				array( 'source' => 'wc_db_updates' )
+			);
+		}
+	}
+
+	/**
+	 * Handle cron healthcheck
+	 *
+	 * Restart the background process if not already running
+	 * and data exists in the queue.
+	 */
+	public function handle_cron_healthcheck() {
+		if ( $this->is_process_running() ) {
+			// Background process already running.
+			return;
+		}
+
+		if ( $this->is_queue_empty() ) {
+			// No data to process.
+			$this->clear_scheduled_event();
+			return;
+		}
+
+		$this->handle();
+	}
+
+	/**
+	 * Schedule fallback event.
+	 */
+	protected function schedule_event() {
+		if ( ! wp_next_scheduled( $this->cron_hook_identifier ) ) {
+			wp_schedule_event( time() + 10, $this->cron_interval_identifier, $this->cron_hook_identifier );
+		}
+	}
+
+	/**
+	 * Is the updater running?
+	 * @return boolean
+	 */
+	public function is_updating() {
+		return false === $this->is_queue_empty();
+	}
+
+	/**
+	 * Task
+	 *
+	 * Override this method to perform any actions required on each
+	 * queue item. Return the modified item for further processing
+	 * in the next pass through. Or, return false to remove the
+	 * item from the queue.
+	 *
+	 * @param string $callback Update callback function
+	 * @return mixed
+	 */
+	protected function task( $callback ) {
+		if ( ! defined( 'WC_UPDATING' ) ) {
+			define( 'WC_UPDATING', true );
+		}
+
+		$logger = wc_get_logger();
+
+		include_once( dirname( __FILE__ ) . '/wc-update-functions.php' );
+
+		if ( is_callable( $callback ) ) {
+			$logger->info( sprintf( 'Running %s callback', $callback ), array( 'source' => 'wc_db_updates' ) );
+			call_user_func( $callback );
+			$logger->info( sprintf( 'Finished %s callback', $callback ), array( 'source' => 'wc_db_updates' ) );
+		} else {
+			$logger->notice( sprintf( 'Could not find %s callback', $callback ), array( 'source' => 'wc_db_updates' ) );
+		}
+
+		return false;
+	}
+
+	/**
+	 * Complete
+	 *
+	 * Override if applicable, but ensure that the below actions are
+	 * performed, or, call parent::complete().
+	 */
+	protected function complete() {
+		$logger = wc_get_logger();
+		$logger->info( 'Data update complete', array( 'source' => 'wc_db_updates' ) );
+		WC_Install::update_db_version();
+		parent::complete();
+	}
+}
diff --git a/includes/class-wc-breadcrumb.php b/includes/class-wc-breadcrumb.php
index a08194f2c33..3894502a555 100644
--- a/includes/class-wc-breadcrumb.php
+++ b/includes/class-wc-breadcrumb.php
@@ -30,8 +30,8 @@ class WC_Breadcrumb {
 	 */
 	public function add_crumb( $name, $link = '' ) {
 		$this->crumbs[] = array(
-			$name,
-			$link
+			strip_tags( $name ),
+			$link,
 		);
 	}
 
@@ -71,10 +71,10 @@ class WC_Breadcrumb {
 			'is_tag',
 			'is_author',
 			'is_date',
-			'is_tax'
+			'is_tax',
 		);
 
-		if ( ( ! is_front_page() && ! ( is_post_type_archive() && get_option( 'page_on_front' ) == wc_get_page_id( 'shop' ) ) ) || is_paged() ) {
+		if ( ( ! is_front_page() && ! ( is_post_type_archive() && intval( get_option( 'page_on_front' ) ) === wc_get_page_id( 'shop' ) ) ) || is_paged() ) {
 			foreach ( $conditionals as $conditional ) {
 				if ( call_user_func( $conditional ) ) {
 					call_user_func( array( $this, 'add_crumbs_' . substr( $conditional, 3 ) ) );
@@ -95,7 +95,7 @@ class WC_Breadcrumb {
 	 * Prepend the shop page to shop breadcrumbs.
 	 */
 	private function prepend_shop_page() {
-		$permalinks   = get_option( 'woocommerce_permalinks' );
+		$permalinks   = wc_get_permalink_structure();
 		$shop_page_id = wc_get_page_id( 'shop' );
 		$shop_page    = get_post( $shop_page_id );
 
diff --git a/includes/class-wc-cache-helper.php b/includes/class-wc-cache-helper.php
index dacaa0a3211..ef9a513d17a 100644
--- a/includes/class-wc-cache-helper.php
+++ b/includes/class-wc-cache-helper.php
@@ -55,12 +55,12 @@ class WC_Cache_Helper {
 	 * @return string
 	 */
 	public static function geolocation_ajax_get_location_hash() {
-		$customer             = new WC_Customer();
+		$customer             = new WC_Customer( 0, true );
 		$location             = array();
-		$location['country']  = $customer->get_country();
-		$location['state']    = $customer->get_state();
-		$location['postcode'] = $customer->get_postcode();
-		$location['city']     = $customer->get_city();
+		$location['country']  = $customer->get_billing_country();
+		$location['state']    = $customer->get_billing_state();
+		$location['postcode'] = $customer->get_billing_postcode();
+		$location['city']     = $customer->get_billing_city();
 		return substr( md5( implode( '', $location ) ), 0, 12 );
 	}
 
@@ -107,7 +107,7 @@ class WC_Cache_Helper {
 	 * to append a unique string (based on time()) to each transient. When transients.
 	 * are invalidated, the transient version will increment and data will be regenerated.
 	 *
-	 * Raised in issue https://github.com/woothemes/woocommerce/issues/5777.
+	 * Raised in issue https://github.com/woocommerce/woocommerce/issues/5777.
 	 * Adapted from ideas in http://tollmanz.com/invalidation-schemes/.
 	 *
 	 * @param  string  $group   Name for the group of transients we need to invalidate
@@ -164,9 +164,13 @@ class WC_Cache_Helper {
 
 	/**
 	 * Prevent caching on dynamic pages.
-	 * @access public
 	 */
 	public static function prevent_caching() {
+
+		if ( ! is_blog_installed() ) {
+			return;
+		}
+
 		if ( false === ( $wc_page_uris = get_transient( 'woocommerce_cache_excluded_uris' ) ) ) {
 			$wc_page_uris   = array_filter( array_merge( self::get_page_uris( 'cart' ), self::get_page_uris( 'checkout' ), self::get_page_uris( 'myaccount' ) ) );
 	    	set_transient( 'woocommerce_cache_excluded_uris', $wc_page_uris );
@@ -175,8 +179,8 @@ class WC_Cache_Helper {
 		if ( isset( $_GET['download_file'] ) ) {
 			self::nocache();
 		} elseif ( is_array( $wc_page_uris ) ) {
-			foreach( $wc_page_uris as $uri ) {
-				if ( stristr( $_SERVER['REQUEST_URI'], $uri ) ) {
+			foreach ( $wc_page_uris as $uri ) {
+				if ( stristr( trailingslashit( $_SERVER['REQUEST_URI'] ), $uri ) ) {
 					self::nocache();
 					break;
 				}
@@ -189,15 +193,15 @@ class WC_Cache_Helper {
 	 * @access private
 	 */
 	private static function nocache() {
-		if ( ! defined( 'DONOTCACHEPAGE' ) )
-			define( "DONOTCACHEPAGE", "true" );
-
-		if ( ! defined( 'DONOTCACHEOBJECT' ) )
-			define( "DONOTCACHEOBJECT", "true" );
-
-		if ( ! defined( 'DONOTCACHEDB' ) )
-			define( "DONOTCACHEDB", "true" );
-
+		if ( ! defined( 'DONOTCACHEPAGE' ) ) {
+			define( "DONOTCACHEPAGE", true );
+		}
+		if ( ! defined( 'DONOTCACHEOBJECT' ) ) {
+			define( "DONOTCACHEOBJECT", true );
+		}
+		if ( ! defined( 'DONOTCACHEDB' ) ) {
+			define( "DONOTCACHEDB", true );
+		}
 		nocache_headers();
 	}
 
@@ -209,14 +213,14 @@ class WC_Cache_Helper {
 			return;
 		}
 
-		$config   = w3_instance('W3_Config');
+		$config   = w3_instance( 'W3_Config' );
 		$enabled  = $config->get_integer( 'dbcache.enabled' );
 		$settings = array_map( 'trim', $config->get_array( 'dbcache.reject.sql' ) );
 
 		if ( $enabled && ! in_array( '_wc_session_', $settings ) ) {
 			?>
 			<div class="error">
-				<p><?php printf( __( 'In order for <strong>database caching</strong> to work with WooCommerce you must add <code>_wc_session_</code> to the "Ignored Query Strings" option in W3 Total Cache settings <a href="%s">here</a>.', 'woocommerce' ), admin_url( 'admin.php?page=w3tc_dbcache' ) ); ?></p>
+				<p><?php printf( __( 'In order for <strong>database caching</strong> to work with WooCommerce you must add %1$s to the "Ignored Query Strings" option in <a href="%2$s">W3 Total Cache settings</a>.', 'woocommerce' ), '<code>_wc_session_</code>', admin_url( 'admin.php?page=w3tc_dbcache' ) ); ?></p>
 			</div>
 			<?php
 		}
diff --git a/includes/class-wc-cart.php b/includes/class-wc-cart.php
index a548126c09d..e33694b255c 100644
--- a/includes/class-wc-cart.php
+++ b/includes/class-wc-cart.php
@@ -91,41 +91,20 @@ class WC_Cart {
 		'coupon_discount_amounts'     => array(),
 		'coupon_discount_tax_amounts' => array(),
 		'fee_total'                   => 0,
-		'fees'                        => array()
+		'fees'                        => array(),
 	);
 
-	/** @var array An array of fees. */
-	public $fees                  = array();
-
-	/** @var boolean Prices inc tax */
-	public $prices_include_tax;
-
-	/** @var boolean */
-	public $round_at_subtotal;
-
-	/** @var string */
-	public $tax_display_cart;
-
-	/** @var int Prices inc tax */
-	public $dp;
-
-	/** @var boolean */
-	public $display_totals_ex_tax;
-
-	/** @var boolean */
-	public $display_cart_ex_tax;
+	/**
+	 * An array of fees.
+	 *
+	 * @var array
+	 */
+	public $fees = array();
 
 	/**
 	 * Constructor for the cart class. Loads options and hooks in the init method.
 	 */
 	public function __construct() {
-		$this->prices_include_tax    = wc_prices_include_tax();
-		$this->round_at_subtotal     = get_option( 'woocommerce_tax_round_at_subtotal' ) == 'yes';
-		$this->tax_display_cart      = get_option( 'woocommerce_tax_display_cart' );
-		$this->dp                    = wc_get_price_decimals();
-		$this->display_totals_ex_tax = $this->tax_display_cart == 'excl';
-		$this->display_cart_ex_tax   = $this->tax_display_cart == 'excl';
-
 		add_action( 'wp_loaded', array( $this, 'init' ) ); // Get cart after WP and plugins are loaded.
 		add_action( 'wp', array( $this, 'maybe_set_cart_cookies' ), 99 ); // Set cookies
 		add_action( 'shutdown', array( $this, 'maybe_set_cart_cookies' ), 0 ); // Set cookies before shutdown and ob flushing
@@ -141,6 +120,22 @@ class WC_Cart {
 	 */
 	public function __get( $key ) {
 		switch ( $key ) {
+			case 'prices_include_tax' :
+				return wc_prices_include_tax();
+			break;
+			case 'round_at_subtotal' :
+				return 'yes' === get_option( 'woocommerce_tax_round_at_subtotal' );
+			break;
+			case 'tax_display_cart' :
+				return get_option( 'woocommerce_tax_display_cart' );
+			break;
+			case 'dp' :
+				return wc_get_price_decimals();
+			break;
+			case 'display_totals_ex_tax' :
+			case 'display_cart_ex_tax' :
+				return 'excl' === $this->tax_display_cart;
+			break;
 			case 'cart_contents_weight' :
 				return $this->get_cart_contents_weight();
 			break;
@@ -148,11 +143,11 @@ class WC_Cart {
 				return $this->get_cart_contents_count();
 			break;
 			case 'tax' :
-				_deprecated_argument( 'WC_Cart->tax', '2.3', 'Use WC_Tax:: directly' );
+				wc_deprecated_argument( 'WC_Cart->tax', '2.3', 'Use WC_Tax:: directly' );
 				$this->tax = new WC_Tax();
 			return $this->tax;
 			case 'discount_total':
-				_deprecated_argument( 'WC_Cart->discount_total', '2.3', 'After tax coupons are no longer supported. For more information see: https://woocommerce.wordpress.com/2014/12/upcoming-coupon-changes-in-woocommerce-2-3/' );
+				wc_deprecated_argument( 'WC_Cart->discount_total', '2.3', 'After tax coupons are no longer supported. For more information see: https://woocommerce.wordpress.com/2014/12/upcoming-coupon-changes-in-woocommerce-2-3/' );
 			return 0;
 		}
 	}
@@ -198,2079 +193,2136 @@ class WC_Cart {
 		do_action( 'woocommerce_set_cart_cookies', $set );
 	}
 
-	/*-----------------------------------------------------------------------------------*/
-	/* Cart Session Handling */
-	/*-----------------------------------------------------------------------------------*/
+	/*
+	/* Cart Session Handling
+	*/
+
+	/**
+	 * Get the cart data from the PHP session and store it in class variables.
+	 */
+	public function get_cart_from_session() {
+		// Load cart session data from session
+		foreach ( $this->cart_session_data as $key => $default ) {
+			$this->$key = WC()->session->get( $key, $default );
+		}
+
+		$update_cart_session         = false;
+		$this->removed_cart_contents = array_filter( WC()->session->get( 'removed_cart_contents', array() ) );
+		$this->applied_coupons       = array_filter( WC()->session->get( 'applied_coupons', array() ) );
 
 		/**
-		 * Get the cart data from the PHP session and store it in class variables.
+		 * Load the cart object. This defaults to the persistent cart if null.
 		 */
-		public function get_cart_from_session() {
-			// Load cart session data from session
-			foreach ( $this->cart_session_data as $key => $default ) {
-				$this->$key = WC()->session->get( $key, $default );
-			}
+		$cart = WC()->session->get( 'cart', null );
 
-			$update_cart_session         = false;
-			$this->removed_cart_contents = array_filter( WC()->session->get( 'removed_cart_contents', array() ) );
-			$this->applied_coupons       = array_filter( WC()->session->get( 'applied_coupons', array() ) );
+		if ( is_null( $cart ) && ( $saved_cart = get_user_meta( get_current_user_id(), '_woocommerce_persistent_cart', true ) ) ) {
+			$cart                = $saved_cart['cart'];
+			$update_cart_session = true;
+		} elseif ( is_null( $cart ) ) {
+			$cart = array();
+		}
 
-			/**
-			 * Load the cart object. This defaults to the persistant cart if null.
-			 */
-			$cart = WC()->session->get( 'cart', null );
+		if ( is_array( $cart ) ) {
+			// Prime meta cache to reduce future queries
+			update_meta_cache( 'post', wp_list_pluck( $cart, 'product_id' ) );
+			update_object_term_cache( wp_list_pluck( $cart, 'product_id' ), 'product' );
 
-			if ( is_null( $cart ) && ( $saved_cart = get_user_meta( get_current_user_id(), '_woocommerce_persistent_cart', true ) ) ) {
-				$cart                = $saved_cart['cart'];
-				$update_cart_session = true;
-			} elseif ( is_null( $cart ) ) {
-				$cart = array();
-			}
+			foreach ( $cart as $key => $values ) {
+				$product = wc_get_product( $values['variation_id'] ? $values['variation_id'] : $values['product_id'] );
 
-			if ( is_array( $cart ) ) {
-				foreach ( $cart as $key => $values ) {
-					$_product = wc_get_product( $values['variation_id'] ? $values['variation_id'] : $values['product_id'] );
+				if ( ! empty( $product ) && $product->exists() && $values['quantity'] > 0 ) {
 
-					if ( ! empty( $_product ) && $_product->exists() && $values['quantity'] > 0 ) {
+					if ( ! $product->is_purchasable() ) {
 
-						if ( ! $_product->is_purchasable() ) {
+						// Flag to indicate the stored cart should be update
+						$update_cart_session = true;
+						/* translators: %s: product name */
+						wc_add_notice( sprintf( __( '%s has been removed from your cart because it can no longer be purchased. Please contact us if you need assistance.', 'woocommerce' ), $product->get_name() ), 'error' );
+						do_action( 'woocommerce_remove_cart_item_from_session', $key, $values );
 
-							// Flag to indicate the stored cart should be update
-							$update_cart_session = true;
-							wc_add_notice( sprintf( __( '%s has been removed from your cart because it can no longer be purchased. Please contact us if you need assistance.', 'woocommerce' ), $_product->get_title() ), 'error' );
-							do_action( 'woocommerce_remove_cart_item_from_session', $key, $values );
+					} else {
 
-						} else {
+						// Put session data into array. Run through filter so other plugins can load their own session data
+						$session_data = array_merge( $values, array( 'data' => $product ) );
+						$this->cart_contents[ $key ] = apply_filters( 'woocommerce_get_cart_item_from_session', $session_data, $values, $key );
 
-							// Put session data into array. Run through filter so other plugins can load their own session data
-							$session_data = array_merge( $values, array( 'data' => $_product ) );
-							$this->cart_contents[ $key ] = apply_filters( 'woocommerce_get_cart_item_from_session', $session_data, $values, $key );
-
-						}
 					}
 				}
 			}
+		}
 
-			// Trigger action
-			do_action( 'woocommerce_cart_loaded_from_session', $this );
+		// Trigger action
+		do_action( 'woocommerce_cart_loaded_from_session', $this );
 
-			if ( $update_cart_session ) {
-				WC()->session->cart = $this->get_cart_for_session();
+		if ( $update_cart_session ) {
+			WC()->session->cart = $this->get_cart_for_session();
+		}
+
+		// Queue re-calc if subtotal is not set
+		if ( ( ! $this->subtotal && ! $this->is_empty() ) || $update_cart_session ) {
+			$this->calculate_totals();
+		}
+	}
+
+	/**
+	 * Sets the php session data for the cart and coupons.
+	 */
+	public function set_session() {
+		// Set cart and coupon session data
+		$cart_session = $this->get_cart_for_session();
+
+		WC()->session->set( 'cart', $cart_session );
+		WC()->session->set( 'applied_coupons', $this->applied_coupons );
+		WC()->session->set( 'coupon_discount_amounts', $this->coupon_discount_amounts );
+		WC()->session->set( 'coupon_discount_tax_amounts', $this->coupon_discount_tax_amounts );
+		WC()->session->set( 'removed_cart_contents', $this->removed_cart_contents );
+
+		foreach ( $this->cart_session_data as $key => $default ) {
+			WC()->session->set( $key, $this->$key );
+		}
+
+		if ( get_current_user_id() ) {
+			$this->persistent_cart_update();
+		}
+
+		do_action( 'woocommerce_cart_updated' );
+	}
+
+	/**
+	 * Empties the cart and optionally the persistent cart too.
+	 *
+	 * @param bool $clear_persistent_cart (default: true)
+	 */
+	public function empty_cart( $clear_persistent_cart = true ) {
+		$this->cart_contents = array();
+		$this->reset( true );
+
+		unset( WC()->session->order_awaiting_payment, WC()->session->applied_coupons, WC()->session->coupon_discount_amounts, WC()->session->coupon_discount_tax_amounts, WC()->session->cart );
+
+		if ( $clear_persistent_cart && get_current_user_id() ) {
+			$this->persistent_cart_destroy();
+		}
+
+		do_action( 'woocommerce_cart_emptied' );
+	}
+
+	/*
+	 * Persistent cart handling
+	 */
+
+	/**
+	 * Save the persistent cart when the cart is updated.
+	 */
+	public function persistent_cart_update() {
+		update_user_meta( get_current_user_id(), '_woocommerce_persistent_cart', array(
+			'cart' => WC()->session->get( 'cart' ),
+		) );
+	}
+
+	/**
+	 * Delete the persistent cart permanently.
+	 */
+	public function persistent_cart_destroy() {
+		delete_user_meta( get_current_user_id(), '_woocommerce_persistent_cart' );
+	}
+
+	/*
+	 * Cart Data Functions.
+	 */
+
+	/**
+	 * Coupons enabled function. Filterable.
+	 *
+	 * @deprecated 2.5.0 in favor to wc_coupons_enabled()
+	 *
+	 * @return bool
+	 */
+	public function coupons_enabled() {
+		return wc_coupons_enabled();
+	}
+
+	/**
+	 * Get number of items in the cart.
+	 * @return int
+	 */
+	public function get_cart_contents_count() {
+		return apply_filters( 'woocommerce_cart_contents_count', array_sum( wp_list_pluck( $this->get_cart(), 'quantity' ) ) );
+	}
+
+	/**
+	 * Get weight of items in the cart.
+	 * @since 2.5.0
+	 * @return int
+	 */
+	public function get_cart_contents_weight() {
+		$weight = 0;
+
+		foreach ( $this->get_cart() as $cart_item_key => $values ) {
+			$weight += (float) $values['data']->get_weight() * $values['quantity'];
+		}
+
+		return apply_filters( 'woocommerce_cart_contents_weight', $weight );
+	}
+
+	/**
+	 * Checks if the cart is empty.
+	 *
+	 * @return bool
+	 */
+	public function is_empty() {
+		return 0 === sizeof( $this->get_cart() );
+	}
+
+	/**
+	 * Check all cart items for errors.
+	 */
+	public function check_cart_items() {
+
+		// Result
+		$return = true;
+
+		// Check cart item validity
+		$result = $this->check_cart_item_validity();
+
+		if ( is_wp_error( $result ) ) {
+			wc_add_notice( $result->get_error_message(), 'error' );
+			$return = false;
+		}
+
+		// Check item stock
+		$result = $this->check_cart_item_stock();
+
+		if ( is_wp_error( $result ) ) {
+			wc_add_notice( $result->get_error_message(), 'error' );
+			$return = false;
+		}
+
+		return $return;
+
+	}
+
+	/**
+	 * Check cart coupons for errors.
+	 */
+	public function check_cart_coupons() {
+		foreach ( $this->applied_coupons as $code ) {
+			$coupon = new WC_Coupon( $code );
+
+			if ( ! $coupon->is_valid() ) {
+				// Error message
+				$coupon->add_coupon_message( WC_Coupon::E_WC_COUPON_INVALID_REMOVED );
+
+				// Remove the coupon
+				$this->remove_coupon( $code );
+
+				// Flag totals for refresh
+				WC()->session->set( 'refresh_totals', true );
 			}
+		}
+	}
 
-			// Queue re-calc if subtotal is not set
-			if ( ( ! $this->subtotal && ! $this->is_empty() ) || $update_cart_session ) {
-				$this->calculate_totals();
+	/**
+	 * Get cart items quantities - merged so we can do accurate stock checks on items across multiple lines.
+	 *
+	 * @return array
+	 */
+	public function get_cart_item_quantities() {
+		$quantities = array();
+
+		foreach ( $this->get_cart() as $cart_item_key => $values ) {
+			$product = $values['data'];
+			$quantities[ $product->get_stock_managed_by_id() ] = isset( $quantities[ $product->get_stock_managed_by_id() ] ) ? $quantities[ $product->get_stock_managed_by_id() ] + $values['quantity'] : $values['quantity'];
+		}
+
+		return $quantities;
+	}
+
+	/**
+	 * Looks through cart items and checks the posts are not trashed or deleted.
+	 *
+	 * @return bool|WP_Error
+	 */
+	public function check_cart_item_validity() {
+		$return = true;
+
+		foreach ( $this->get_cart() as $cart_item_key => $values ) {
+			$product = $values['data'];
+
+			if ( ! $product || ! $product->exists() || 'trash' === $product->get_status() ) {
+				$this->set_quantity( $cart_item_key, 0 );
+				$return = new WP_Error( 'invalid', __( 'An item which is no longer available was removed from your cart.', 'woocommerce' ) );
 			}
 		}
 
-		/**
-		 * Sets the php session data for the cart and coupons.
-		 */
-		public function set_session() {
-			// Set cart and coupon session data
-			$cart_session = $this->get_cart_for_session();
+		return $return;
+	}
 
-			WC()->session->set( 'cart', $cart_session );
-			WC()->session->set( 'applied_coupons', $this->applied_coupons );
-			WC()->session->set( 'coupon_discount_amounts', $this->coupon_discount_amounts );
-			WC()->session->set( 'coupon_discount_tax_amounts', $this->coupon_discount_tax_amounts );
-			WC()->session->set( 'removed_cart_contents', $this->removed_cart_contents );
+	/**
+	 * Looks through the cart to check each item is in stock. If not, add an error.
+	 *
+	 * @return bool|WP_Error
+	 */
+	public function check_cart_item_stock() {
+		global $wpdb;
 
-			foreach ( $this->cart_session_data as $key => $default ) {
-				WC()->session->set( $key, $this->$key );
+		$error               = new WP_Error();
+		$product_qty_in_cart = $this->get_cart_item_quantities();
+
+		// First stock check loop
+		foreach ( $this->get_cart() as $cart_item_key => $values ) {
+			$product = $values['data'];
+
+			/**
+			 * Check stock based on stock-status.
+			 */
+			if ( ! $product->is_in_stock() ) {
+				/* translators: %s: product name */
+				$error->add( 'out-of-stock', sprintf( __( 'Sorry, "%s" is not in stock. Please edit your cart and try again. We apologize for any inconvenience caused.', 'woocommerce' ), $product->get_name() ) );
+				return $error;
 			}
 
-			if ( get_current_user_id() ) {
-				$this->persistent_cart_update();
+			if ( ! $product->managing_stock() ) {
+				continue;
 			}
 
-			do_action( 'woocommerce_cart_updated' );
-		}
-
-		/**
-		 * Empties the cart and optionally the persistent cart too.
-		 *
-		 * @param bool $clear_persistent_cart (default: true)
-		 */
-		public function empty_cart( $clear_persistent_cart = true ) {
-			$this->cart_contents = array();
-			$this->reset( true );
-
-			unset( WC()->session->order_awaiting_payment, WC()->session->applied_coupons, WC()->session->coupon_discount_amounts, WC()->session->coupon_discount_tax_amounts, WC()->session->cart );
-
-			if ( $clear_persistent_cart && get_current_user_id() ) {
-				$this->persistent_cart_destroy();
+			/**
+			 * Check stock based on all items in the cart.
+			 */
+			if ( ! $product->has_enough_stock( $product_qty_in_cart[ $product->get_stock_managed_by_id() ] ) ) {
+				/* translators: 1: product name 2: quantity in stock */
+				$error->add( 'out-of-stock', sprintf( __( 'Sorry, we do not have enough "%1$s" in stock to fulfill your order (%2$s in stock). Please edit your cart and try again. We apologize for any inconvenience caused.', 'woocommerce' ), $product->get_name(), wc_format_stock_quantity_for_display( $product->get_stock_quantity(), $product ) ) );
+				return $error;
 			}
 
-			do_action( 'woocommerce_cart_emptied' );
+			/**
+			 * Finally consider any held stock, from pending orders.
+			 */
+			if ( get_option( 'woocommerce_hold_stock_minutes' ) > 0 && ! $product->backorders_allowed() ) {
+				$order_id   = isset( WC()->session->order_awaiting_payment ) ? absint( WC()->session->order_awaiting_payment ) : 0;
+				$held_stock = $wpdb->get_var(
+					$wpdb->prepare( "
+						SELECT SUM( order_item_meta.meta_value ) AS held_qty
+						FROM {$wpdb->posts} AS posts
+						LEFT JOIN {$wpdb->prefix}woocommerce_order_items as order_items ON posts.ID = order_items.order_id
+						LEFT JOIN {$wpdb->prefix}woocommerce_order_itemmeta as order_item_meta ON order_items.order_item_id = order_item_meta.order_item_id
+						LEFT JOIN {$wpdb->prefix}woocommerce_order_itemmeta as order_item_meta2 ON order_items.order_item_id = order_item_meta2.order_item_id
+						WHERE 	order_item_meta.meta_key   = '_qty'
+						AND 	order_item_meta2.meta_key  = %s AND order_item_meta2.meta_value  = %d
+						AND 	posts.post_type            IN ( '" . implode( "','", wc_get_order_types() ) . "' )
+						AND 	posts.post_status          = 'wc-pending'
+						AND		posts.ID                   != %d;",
+						'variation' === get_post_type( $product->get_stock_managed_by_id() ) ? '_variation_id' : '_product_id',
+						$product->get_stock_managed_by_id(),
+						$order_id
+					)
+				);
+
+				if ( $product->get_stock_quantity() < ( $held_stock + $product_qty_in_cart[ $product->get_stock_managed_by_id() ] ) ) {
+					/* translators: 1: product name 2: minutes */
+					$error->add( 'out-of-stock', sprintf( __( 'Sorry, we do not have enough "%1$s" in stock to fulfill your order right now. Please try again in %2$d minutes or edit your cart and try again. We apologize for any inconvenience caused.', 'woocommerce' ), $product->get_name(), get_option( 'woocommerce_hold_stock_minutes' ) ) );
+					return $error;
+				}
+			}
 		}
 
-	/*-----------------------------------------------------------------------------------*/
-	/* Persistent cart handling */
-	/*-----------------------------------------------------------------------------------*/
+		return true;
+	}
 
-		/**
-		 * Save the persistent cart when the cart is updated.
-		 */
-		public function persistent_cart_update() {
-			update_user_meta( get_current_user_id(), '_woocommerce_persistent_cart', array(
-				'cart' => WC()->session->get( 'cart' )
-			) );
+	/**
+	 * Gets and formats a list of cart item data + variations for display on the frontend.
+	 *
+	 * @param array $cart_item
+	 * @param bool $flat (default: false)
+	 * @return string
+	 */
+	public function get_item_data( $cart_item, $flat = false ) {
+		$item_data = array();
+
+		// Variation values are shown only if they are not found in the title as of 3.0.
+		// This is because variation titles display the attributes.
+		if ( $cart_item['data']->is_type( 'variation' ) && is_array( $cart_item['variation'] ) ) {
+			foreach ( $cart_item['variation'] as $name => $value ) {
+				$taxonomy = wc_attribute_taxonomy_name( str_replace( 'attribute_pa_', '', urldecode( $name ) ) );
+
+				// If this is a term slug, get the term's nice name
+				if ( taxonomy_exists( $taxonomy ) ) {
+					$term = get_term_by( 'slug', $value, $taxonomy );
+					if ( ! is_wp_error( $term ) && $term && $term->name ) {
+						$value = $term->name;
+					}
+					$label = wc_attribute_label( $taxonomy );
+
+				// If this is a custom option slug, get the options name.
+				} else {
+					$value = apply_filters( 'woocommerce_variation_option_name', $value );
+					$label = wc_attribute_label( str_replace( 'attribute_', '', $name ), $cart_item['data'] );
+				}
+
+				// Check the nicename against the title.
+				if ( '' === $value || wc_is_attribute_in_product_name( $value, $cart_item['data']->get_name() ) ) {
+					continue;
+				}
+
+				$item_data[] = array(
+					'key'   => $label,
+					'value' => $value,
+				);
+			}
 		}
 
-		/**
-		 * Delete the persistent cart permanently.
-		 */
-		public function persistent_cart_destroy() {
-			delete_user_meta( get_current_user_id(), '_woocommerce_persistent_cart' );
+		// Filter item data to allow 3rd parties to add more to the array
+		$item_data = apply_filters( 'woocommerce_get_item_data', $item_data, $cart_item );
+
+		// Format item data ready to display
+		foreach ( $item_data as $key => $data ) {
+			// Set hidden to true to not display meta on cart.
+			if ( ! empty( $data['hidden'] ) ) {
+				unset( $item_data[ $key ] );
+				continue;
+			}
+			$item_data[ $key ]['key']     = ! empty( $data['key'] ) ? $data['key'] : $data['name'];
+			$item_data[ $key ]['display'] = ! empty( $data['display'] ) ? $data['display'] : $data['value'];
 		}
 
-	/*-----------------------------------------------------------------------------------*/
-	/* Cart Data Functions */
-	/*-----------------------------------------------------------------------------------*/
+		// Output flat or in list format
+		if ( sizeof( $item_data ) > 0 ) {
+			ob_start();
 
-		/**
-		 * Coupons enabled function. Filterable.
-		 *
-		 * @deprecated 2.5.0 in favor to wc_coupons_enabled()
-		 *
-		 * @return bool
-		 */
-		public function coupons_enabled() {
-			return wc_coupons_enabled();
+			if ( $flat ) {
+				foreach ( $item_data as $data ) {
+					echo esc_html( $data['key'] ) . ': ' . wp_kses_post( $data['display'] ) . "\n";
+				}
+			} else {
+				wc_get_template( 'cart/cart-item-data.php', array( 'item_data' => $item_data ) );
+			}
+
+			return ob_get_clean();
 		}
 
-		/**
-		 * Get number of items in the cart.
-		 * @return int
-		 */
-		public function get_cart_contents_count() {
-			return apply_filters( 'woocommerce_cart_contents_count', array_sum( wp_list_pluck( $this->get_cart(), 'quantity' ) ) );
-		}
-
-		/**
-		 * Get weight of items in the cart.
-		 * @since 2.5.0
-		 * @return int
-		 */
-		public function get_cart_contents_weight() {
-			$weight = 0;
+		return '';
+	}
 
+	/**
+	 * Gets cross sells based on the items in the cart.
+	 *
+	 * @return array cross_sells (item ids)
+	 */
+	public function get_cross_sells() {
+		$cross_sells = array();
+		$in_cart     = array();
+		if ( ! $this->is_empty() ) {
 			foreach ( $this->get_cart() as $cart_item_key => $values ) {
-				$weight += $values['data']->get_weight() * $values['quantity'];
+				if ( $values['quantity'] > 0 ) {
+					$cross_sells = array_merge( $values['data']->get_cross_sell_ids(), $cross_sells );
+					$in_cart[]   = $values['product_id'];
+				}
+			}
+		}
+		$cross_sells = array_diff( $cross_sells, $in_cart );
+		return wp_parse_id_list( $cross_sells );
+	}
+
+	/**
+	 * Gets the url to the cart page.
+	 *
+	 * @deprecated 2.5.0 in favor to wc_get_cart_url()
+	 *
+	 * @return string url to page
+	 */
+	public function get_cart_url() {
+		return wc_get_cart_url();
+	}
+
+	/**
+	 * Gets the url to the checkout page.
+	 *
+	 * @deprecated 2.5.0 in favor to wc_get_checkout_url()
+	 *
+	 * @return string url to page
+	 */
+	public function get_checkout_url() {
+		return wc_get_checkout_url();
+	}
+
+	/**
+	 * Gets the url to remove an item from the cart.
+	 *
+	 * @param string $cart_item_key contains the id of the cart item
+	 * @return string url to page
+	 */
+	public function get_remove_url( $cart_item_key ) {
+		$cart_page_url = wc_get_page_permalink( 'cart' );
+		return apply_filters( 'woocommerce_get_remove_url', $cart_page_url ? wp_nonce_url( add_query_arg( 'remove_item', $cart_item_key, $cart_page_url ), 'woocommerce-cart' ) : '' );
+	}
+
+	/**
+	 * Gets the url to re-add an item into the cart.
+	 *
+	 * @param  string $cart_item_key
+	 * @return string url to page
+	 */
+	public function get_undo_url( $cart_item_key ) {
+		$cart_page_url = wc_get_page_permalink( 'cart' );
+
+		$query_args = array(
+			'undo_item' => $cart_item_key,
+		);
+
+		return apply_filters( 'woocommerce_get_undo_url', $cart_page_url ? wp_nonce_url( add_query_arg( $query_args, $cart_page_url ), 'woocommerce-cart' ) : '', $cart_item_key );
+	}
+
+	/**
+	 * Returns the contents of the cart in an array.
+	 *
+	 * @return array contents of the cart
+	 */
+	public function get_cart() {
+		if ( ! did_action( 'wp_loaded' ) ) {
+			wc_doing_it_wrong( __FUNCTION__, __( 'Get cart should not be called before the wp_loaded action.', 'woocommerce' ), '2.3' );
+		}
+		if ( ! did_action( 'woocommerce_cart_loaded_from_session' ) ) {
+			$this->get_cart_from_session();
+		}
+		return array_filter( (array) $this->cart_contents );
+	}
+
+	/**
+	 * Returns the contents of the cart in an array without the 'data' element.
+	 *
+	 * @return array contents of the cart
+	 */
+	public function get_cart_for_session() {
+		$cart_session = array();
+
+		if ( $this->get_cart() ) {
+			foreach ( $this->get_cart() as $key => $values ) {
+				$cart_session[ $key ] = $values;
+				unset( $cart_session[ $key ]['data'] ); // Unset product object
+			}
+		}
+
+		return $cart_session;
+	}
+
+	/**
+	 * Returns a specific item in the cart.
+	 *
+	 * @param string $item_key Cart item key.
+	 * @return array Item data
+	 */
+	public function get_cart_item( $item_key ) {
+		if ( isset( $this->cart_contents[ $item_key ] ) ) {
+			return $this->cart_contents[ $item_key ];
+		}
+
+		return array();
+	}
+
+	/**
+	 * Returns the cart and shipping taxes, merged.
+	 *
+	 * @return array merged taxes
+	 */
+	public function get_taxes() {
+		$taxes = array();
+
+		// Merge
+		foreach ( array_keys( $this->taxes + $this->shipping_taxes ) as $key ) {
+			$taxes[ $key ] = ( isset( $this->shipping_taxes[ $key ] ) ? $this->shipping_taxes[ $key ] : 0 ) + ( isset( $this->taxes[ $key ] ) ? $this->taxes[ $key ] : 0 );
+		}
+
+		return apply_filters( 'woocommerce_cart_get_taxes', $taxes, $this );
+	}
+
+	/**
+	 * Get taxes, merged by code, formatted ready for output.
+	 *
+	 * @return array
+	 */
+	public function get_tax_totals() {
+		$taxes      = $this->get_taxes();
+		$tax_totals = array();
+
+		foreach ( $taxes as $key => $tax ) {
+			$code = WC_Tax::get_rate_code( $key );
+
+			if ( $code || apply_filters( 'woocommerce_cart_remove_taxes_zero_rate_id', 'zero-rated' ) === $key ) {
+				if ( ! isset( $tax_totals[ $code ] ) ) {
+					$tax_totals[ $code ] = new stdClass();
+					$tax_totals[ $code ]->amount = 0;
+				}
+				$tax_totals[ $code ]->tax_rate_id       = $key;
+				$tax_totals[ $code ]->is_compound       = WC_Tax::is_compound( $key );
+				$tax_totals[ $code ]->label             = WC_Tax::get_rate_label( $key );
+				$tax_totals[ $code ]->amount           += wc_round_tax_total( $tax );
+				$tax_totals[ $code ]->formatted_amount  = wc_price( wc_round_tax_total( $tax_totals[ $code ]->amount ) );
+			}
+		}
+
+		if ( apply_filters( 'woocommerce_cart_hide_zero_taxes', true ) ) {
+			$amounts    = array_filter( wp_list_pluck( $tax_totals, 'amount' ) );
+			$tax_totals = array_intersect_key( $tax_totals, $amounts );
+		}
+
+		return apply_filters( 'woocommerce_cart_tax_totals', $tax_totals, $this );
+	}
+
+	/**
+	 * Get all tax classes for items in the cart.
+	 * @return array
+	 */
+	public function get_cart_item_tax_classes() {
+		$found_tax_classes = array();
+
+		foreach ( WC()->cart->get_cart() as $item ) {
+			$found_tax_classes[] = $item['data']->get_tax_class();
+		}
+
+		return array_unique( $found_tax_classes );
+	}
+
+	/**
+	 * Determines the value that the customer spent and the subtotal
+	 * displayed, used for things like coupon validation.
+	 *
+	 * Since the coupon lines are displayed based on the TAX DISPLAY value
+	 * of cart, this is used to determine the spend.
+	 *
+	 * If cart totals are shown including tax, use the subtotal.
+	 * If cart totals are shown excluding tax, use the subtotal ex tax
+	 * (tax is shown after coupons).
+	 *
+	 * @since 2.6.0
+	 * @return string
+	 */
+	public function get_displayed_subtotal() {
+		if ( 'incl' === $this->tax_display_cart ) {
+			return wc_format_decimal( $this->subtotal );
+		} elseif ( 'excl' === $this->tax_display_cart ) {
+			return wc_format_decimal( $this->subtotal_ex_tax );
+		}
+	}
+
+	/*
+	 * Add to cart handling.
+	 */
+
+	/**
+	 * Check if product is in the cart and return cart item key.
+	 *
+	 * Cart item key will be unique based on the item and its properties, such as variations.
+	 *
+	 * @param mixed id of product to find in the cart
+	 * @return string cart item key
+	 */
+	public function find_product_in_cart( $cart_id = false ) {
+		if ( false !== $cart_id ) {
+			if ( is_array( $this->cart_contents ) && isset( $this->cart_contents[ $cart_id ] ) ) {
+				return $cart_id;
+			}
+		}
+		return '';
+	}
+
+	/**
+	 * Generate a unique ID for the cart item being added.
+	 *
+	 * @param int $product_id - id of the product the key is being generated for
+	 * @param int $variation_id of the product the key is being generated for
+	 * @param array $variation data for the cart item
+	 * @param array $cart_item_data other cart item data passed which affects this items uniqueness in the cart
+	 * @return string cart item key
+	 */
+	public function generate_cart_id( $product_id, $variation_id = 0, $variation = array(), $cart_item_data = array() ) {
+		$id_parts = array( $product_id );
+
+		if ( $variation_id && 0 != $variation_id ) {
+			$id_parts[] = $variation_id;
+		}
+
+		if ( is_array( $variation ) && ! empty( $variation ) ) {
+			$variation_key = '';
+			foreach ( $variation as $key => $value ) {
+				$variation_key .= trim( $key ) . trim( $value );
+			}
+			$id_parts[] = $variation_key;
+		}
+
+		if ( is_array( $cart_item_data ) && ! empty( $cart_item_data ) ) {
+			$cart_item_data_key = '';
+			foreach ( $cart_item_data as $key => $value ) {
+				if ( is_array( $value ) || is_object( $value ) ) {
+					$value = http_build_query( $value );
+				}
+				$cart_item_data_key .= trim( $key ) . trim( $value );
+
+			}
+			$id_parts[] = $cart_item_data_key;
+		}
+
+		return apply_filters( 'woocommerce_cart_id', md5( implode( '_', $id_parts ) ), $product_id, $variation_id, $variation, $cart_item_data );
+	}
+
+	/**
+	 * Add a product to the cart.
+	 *
+	 * @param int $product_id contains the id of the product to add to the cart
+	 * @param int $quantity contains the quantity of the item to add
+	 * @param int $variation_id
+	 * @param array $variation attribute values
+	 * @param array $cart_item_data extra cart item data we want to pass into the item
+	 * @return string|bool $cart_item_key
+	 */
+	public function add_to_cart( $product_id = 0, $quantity = 1, $variation_id = 0, $variation = array(), $cart_item_data = array() ) {
+		// Wrap in try catch so plugins can throw an exception to prevent adding to cart
+		try {
+			$product_id   = absint( $product_id );
+			$variation_id = absint( $variation_id );
+
+			// Ensure we don't add a variation to the cart directly by variation ID
+			if ( 'product_variation' === get_post_type( $product_id ) ) {
+				$variation_id = $product_id;
+				$product_id   = wp_get_post_parent_id( $variation_id );
 			}
 
-			return apply_filters( 'woocommerce_cart_contents_weight', $weight );
+			// Get the product
+			$product_data = wc_get_product( $variation_id ? $variation_id : $product_id );
+
+			// Sanity check
+			if ( $quantity <= 0 || ! $product_data || 'trash' === $product_data->get_status() ) {
+				return false;
+			}
+
+			// Load cart item data - may be added by other plugins
+			$cart_item_data = (array) apply_filters( 'woocommerce_add_cart_item_data', $cart_item_data, $product_id, $variation_id );
+
+			// Generate a ID based on product ID, variation ID, variation data, and other cart item data
+			$cart_id        = $this->generate_cart_id( $product_id, $variation_id, $variation, $cart_item_data );
+
+			// Find the cart item key in the existing cart
+			$cart_item_key  = $this->find_product_in_cart( $cart_id );
+
+			// Force quantity to 1 if sold individually and check for existing item in cart
+			if ( $product_data->is_sold_individually() ) {
+				$quantity      = apply_filters( 'woocommerce_add_to_cart_sold_individually_quantity', 1, $quantity, $product_id, $variation_id, $cart_item_data );
+				$found_in_cart = apply_filters( 'woocommerce_add_to_cart_sold_individually_found_in_cart', $cart_item_key && $this->cart_contents[ $cart_item_key ]['quantity'] > 0, $product_id, $variation_id, $cart_item_data, $cart_id );
+
+				if ( $found_in_cart ) {
+					/* translators: %s: product name */
+					throw new Exception( sprintf( '<a href="%s" class="button wc-forward">%s</a> %s', wc_get_cart_url(), __( 'View cart', 'woocommerce' ), sprintf( __( 'You cannot add another "%s" to your cart.', 'woocommerce' ), $product_data->get_name() ) ) );
+				}
+			}
+
+			// Check product is_purchasable
+			if ( ! $product_data->is_purchasable() ) {
+				throw new Exception( __( 'Sorry, this product cannot be purchased.', 'woocommerce' ) );
+			}
+
+			// Stock check - only check if we're managing stock and backorders are not allowed
+			if ( ! $product_data->is_in_stock() ) {
+				throw new Exception( sprintf( __( 'You cannot add &quot;%s&quot; to the cart because the product is out of stock.', 'woocommerce' ), $product_data->get_name() ) );
+			}
+
+			if ( ! $product_data->has_enough_stock( $quantity ) ) {
+				/* translators: 1: product name 2: quantity in stock */
+				throw new Exception( sprintf( __( 'You cannot add that amount of &quot;%1$s&quot; to the cart because there is not enough stock (%2$s remaining).', 'woocommerce' ), $product_data->get_name(), wc_format_stock_quantity_for_display( $product_data->get_stock_quantity(), $product_data ) ) );
+			}
+
+			// Stock check - this time accounting for whats already in-cart
+			if ( $product_data->managing_stock() ) {
+				$products_qty_in_cart = $this->get_cart_item_quantities();
+
+				if ( isset( $products_qty_in_cart[ $product_data->get_stock_managed_by_id() ] ) && ! $product_data->has_enough_stock( $products_qty_in_cart[ $product_data->get_stock_managed_by_id() ] + $quantity ) ) {
+					throw new Exception( sprintf(
+						'<a href="%s" class="button wc-forward">%s</a> %s',
+						wc_get_cart_url(),
+						__( 'View Cart', 'woocommerce' ),
+						sprintf( __( 'You cannot add that amount to the cart &mdash; we have %1$s in stock and you already have %2$s in your cart.', 'woocommerce' ), wc_format_stock_quantity_for_display( $product_data->get_stock_quantity(), $product_data ), wc_format_stock_quantity_for_display( $products_qty_in_cart[ $product_data->get_stock_managed_by_id() ], $product_data ) )
+					) );
+				}
+			}
+
+			// If cart_item_key is set, the item is already in the cart
+			if ( $cart_item_key ) {
+				$new_quantity = $quantity + $this->cart_contents[ $cart_item_key ]['quantity'];
+				$this->set_quantity( $cart_item_key, $new_quantity, false );
+			} else {
+				$cart_item_key = $cart_id;
+
+				// Add item after merging with $cart_item_data - hook to allow plugins to modify cart item
+				$this->cart_contents[ $cart_item_key ] = apply_filters( 'woocommerce_add_cart_item', array_merge( $cart_item_data, array(
+					'product_id'	=> $product_id,
+					'variation_id'	=> $variation_id,
+					'variation' 	=> $variation,
+					'quantity' 		=> $quantity,
+					'data'			=> $product_data,
+				) ), $cart_item_key );
+			}
+
+			if ( did_action( 'wp' ) ) {
+				$this->set_cart_cookies( ! $this->is_empty() );
+			}
+
+			do_action( 'woocommerce_add_to_cart', $cart_item_key, $product_id, $quantity, $variation_id, $variation, $cart_item_data );
+
+			return $cart_item_key;
+
+		} catch ( Exception $e ) {
+			if ( $e->getMessage() ) {
+				wc_add_notice( $e->getMessage(), 'error' );
+			}
+			return false;
+		}
+	}
+
+	/**
+	 * Remove a cart item.
+	 *
+	 * @since  2.3.0
+	 * @param  string $cart_item_key
+	 * @return bool
+	 */
+	public function remove_cart_item( $cart_item_key ) {
+		if ( isset( $this->cart_contents[ $cart_item_key ] ) ) {
+			$this->removed_cart_contents[ $cart_item_key ] = $this->cart_contents[ $cart_item_key ];
+			unset( $this->removed_cart_contents[ $cart_item_key ]['data'] );
+
+			do_action( 'woocommerce_remove_cart_item', $cart_item_key, $this );
+
+			unset( $this->cart_contents[ $cart_item_key ] );
+
+			do_action( 'woocommerce_cart_item_removed', $cart_item_key, $this );
+
+			$this->calculate_totals();
+
+			return true;
 		}
 
-		/**
-		* Checks if the cart is empty.
-		*
-		* @return bool
-		*/
-		public function is_empty() {
-			return 0 === sizeof( $this->get_cart() );
+		return false;
+	}
+
+	/**
+	 * Restore a cart item.
+	 *
+	 * @param  string $cart_item_key
+	 * @return bool
+	 */
+	public function restore_cart_item( $cart_item_key ) {
+		if ( isset( $this->removed_cart_contents[ $cart_item_key ] ) ) {
+			$this->cart_contents[ $cart_item_key ] = $this->removed_cart_contents[ $cart_item_key ];
+			$this->cart_contents[ $cart_item_key ]['data'] = wc_get_product( $this->cart_contents[ $cart_item_key ]['variation_id'] ? $this->cart_contents[ $cart_item_key ]['variation_id'] : $this->cart_contents[ $cart_item_key ]['product_id'] );
+
+			do_action( 'woocommerce_restore_cart_item', $cart_item_key, $this );
+
+			unset( $this->removed_cart_contents[ $cart_item_key ] );
+
+			do_action( 'woocommerce_cart_item_restored', $cart_item_key, $this );
+
+			$this->calculate_totals();
+
+			return true;
 		}
 
+		return false;
+	}
+
+	/**
+	 * Set the quantity for an item in the cart.
+	 *
+	 * @param string	$cart_item_key	contains the id of the cart item
+	 * @param int		$quantity		contains the quantity of the item
+	 * @param bool      $refresh_totals	whether or not to calculate totals after setting the new qty
+	 *
+	 * @return bool
+	 */
+	public function set_quantity( $cart_item_key, $quantity = 1, $refresh_totals = true ) {
+		if ( 0 == $quantity || $quantity < 0 ) {
+			do_action( 'woocommerce_before_cart_item_quantity_zero', $cart_item_key );
+			unset( $this->cart_contents[ $cart_item_key ] );
+		} else {
+			$old_quantity = $this->cart_contents[ $cart_item_key ]['quantity'];
+			$this->cart_contents[ $cart_item_key ]['quantity'] = $quantity;
+			do_action( 'woocommerce_after_cart_item_quantity_update', $cart_item_key, $quantity, $old_quantity );
+		}
+
+		if ( $refresh_totals ) {
+			$this->calculate_totals();
+		}
+
+		return true;
+	}
+
+	/*
+	 * Cart Calculation Functions.
+	 */
+
+	/**
+	 * Reset cart totals to the defaults. Useful before running calculations.
+	 *
+	 * @param  bool  	$unset_session If true, the session data will be forced unset.
+	 * @access private
+	 */
+	private function reset( $unset_session = false ) {
+		foreach ( $this->cart_session_data as $key => $default ) {
+			$this->$key = $default;
+			if ( $unset_session ) {
+				unset( WC()->session->$key );
+			}
+		}
+		do_action( 'woocommerce_cart_reset', $this, $unset_session );
+	}
+
+	/**
+	 * Sort by subtotal.
+	 * @param  array $a
+	 * @param  array $b
+	 * @return int
+	 */
+	private function sort_by_subtotal( $a, $b ) {
+		$first_item_subtotal  = isset( $a['line_subtotal'] ) ? $a['line_subtotal'] : 0;
+		$second_item_subtotal = isset( $b['line_subtotal'] ) ? $b['line_subtotal'] : 0;
+		if ( $first_item_subtotal === $second_item_subtotal ) {
+			return 0;
+		}
+		return ( $first_item_subtotal < $second_item_subtotal ) ? 1 : -1;
+	}
+
+	/**
+	 * Calculate totals for the items in the cart.
+	 */
+	public function calculate_totals() {
+		$this->reset();
+		$this->coupons = $this->get_coupons();
+
+		do_action( 'woocommerce_before_calculate_totals', $this );
+
+		if ( $this->is_empty() ) {
+			$this->set_session();
+			return;
+		}
+
+		$tax_rates      = array();
+		$shop_tax_rates = array();
+		$cart           = $this->get_cart();
+
 		/**
-		 * Check all cart items for errors.
+		 * Calculate subtotals for items. This is done first so that discount logic can use the values.
 		 */
-		public function check_cart_items() {
+		foreach ( $cart as $cart_item_key => $values ) {
+			$product           = $values['data'];
+			$line_price        = $product->get_price() * $values['quantity'];
+			$line_subtotal     = 0;
+			$line_subtotal_tax = 0;
 
-			// Result
-			$return = true;
+			/**
+			 * No tax to calculate.
+			 */
+			if ( ! $product->is_taxable() ) {
 
-			// Check cart item validity
-			$result = $this->check_cart_item_validity();
+				// Subtotal is the undiscounted price
+				$this->subtotal += $line_price;
+				$this->subtotal_ex_tax += $line_price;
 
-			if ( is_wp_error( $result ) ) {
-				wc_add_notice( $result->get_error_message(), 'error' );
-				$return = false;
+			/**
+			 * Prices include tax.
+			 *
+			 * To prevent rounding issues we need to work with the inclusive price where possible.
+			 * otherwise we'll see errors such as when working with a 9.99 inc price, 20% VAT which would.
+			 * be 8.325 leading to totals being 1p off.
+			 *
+			 * Pre tax coupons come off the price the customer thinks they are paying - tax is calculated.
+			 * afterwards.
+			 *
+			 * e.g. $100 bike with $10 coupon = customer pays $90 and tax worked backwards from that.
+			 */
+			} elseif ( $this->prices_include_tax ) {
+
+				// Get base tax rates
+				if ( empty( $shop_tax_rates[ $product->get_tax_class( 'unfiltered' ) ] ) ) {
+					$shop_tax_rates[ $product->get_tax_class( 'unfiltered' ) ] = WC_Tax::get_base_tax_rates( $product->get_tax_class( 'unfiltered' ) );
+				}
+
+				// Get item tax rates
+				if ( empty( $tax_rates[ $product->get_tax_class() ] ) ) {
+					$tax_rates[ $product->get_tax_class() ] = WC_Tax::get_rates( $product->get_tax_class() );
+				}
+
+				$base_tax_rates = $shop_tax_rates[ $product->get_tax_class( 'unfiltered' ) ];
+				$item_tax_rates = $tax_rates[ $product->get_tax_class() ];
+
+				/**
+				 * ADJUST TAX - Calculations when base tax is not equal to the item tax.
+				 *
+					 * The woocommerce_adjust_non_base_location_prices filter can stop base taxes being taken off when dealing with out of base locations.
+					 * e.g. If a product costs 10 including tax, all users will pay 10 regardless of location and taxes.
+					 * This feature is experimental @since 2.4.7 and may change in the future. Use at your risk.
+					 */
+				if ( $item_tax_rates !== $base_tax_rates && apply_filters( 'woocommerce_adjust_non_base_location_prices', true ) ) {
+
+					// Work out a new base price without the shop's base tax
+					$taxes                 = WC_Tax::calc_tax( $line_price, $base_tax_rates, true, true );
+
+					// Now we have a new item price (excluding TAX)
+					$line_subtotal         = $line_price - array_sum( $taxes );
+
+					// Now add modified taxes
+					$tax_result            = WC_Tax::calc_tax( $line_subtotal, $item_tax_rates );
+					$line_subtotal_tax     = array_sum( $tax_result );
+
+				/**
+				 * Regular tax calculation (customer inside base and the tax class is unmodified.
+				 */
+				} else {
+
+					// Calc tax normally
+					$taxes                 = WC_Tax::calc_tax( $line_price, $item_tax_rates, true );
+					$line_subtotal_tax     = array_sum( $taxes );
+					$line_subtotal         = $line_price - array_sum( $taxes );
+				}
+
+			/**
+			 * Prices exclude tax.
+			 *
+			 * This calculation is simpler - work with the base, untaxed price.
+			 */
+			} else {
+
+				// Get item tax rates
+				if ( empty( $tax_rates[ $product->get_tax_class() ] ) ) {
+					$tax_rates[ $product->get_tax_class() ] = WC_Tax::get_rates( $product->get_tax_class() );
+				}
+
+				$item_tax_rates        = $tax_rates[ $product->get_tax_class() ];
+
+				// Base tax for line before discount - we will store this in the order data
+				$taxes                 = WC_Tax::calc_tax( $line_price, $item_tax_rates );
+				$line_subtotal_tax     = array_sum( $taxes );
+
+				$line_subtotal         = $line_price;
 			}
 
-			// Check item stock
-			$result = $this->check_cart_item_stock();
-
-			if ( is_wp_error( $result ) ) {
-				wc_add_notice( $result->get_error_message(), 'error' );
-				$return = false;
-			}
-
-			return $return;
-
+			// Add to main subtotal
+			$this->subtotal        += $line_subtotal + $line_subtotal_tax;
+			$this->subtotal_ex_tax += $line_subtotal;
 		}
 
+		// Order cart items by price so coupon logic is 'fair' for customers and not based on order added to cart.
+		uasort( $cart, apply_filters( 'woocommerce_sort_by_subtotal_callback', array( $this, 'sort_by_subtotal' ) ) );
+
 		/**
-		 * Check cart coupons for errors.
+		 * Calculate totals for items.
 		 */
-		public function check_cart_coupons() {
+		foreach ( $cart as $cart_item_key => $values ) {
+
+			$product = $values['data'];
+
+			// Prices
+			$base_price = $product->get_price();
+			$line_price = $product->get_price() * $values['quantity'];
+
+			// Tax data
+			$taxes = array();
+			$discounted_taxes = array();
+
+			/**
+			 * No tax to calculate.
+			 */
+			if ( ! $product->is_taxable() ) {
+
+				// Discounted Price (price with any pre-tax discounts applied)
+				$discounted_price      = $this->get_discounted_price( $values, $base_price, true );
+				$line_subtotal_tax     = 0;
+				$line_subtotal         = $line_price;
+				$line_tax              = 0;
+				$line_total            = round( $discounted_price * $values['quantity'], wc_get_rounding_precision() );
+
+			/**
+			 * Prices include tax.
+			 */
+			} elseif ( $this->prices_include_tax ) {
+
+				$base_tax_rates = $shop_tax_rates[ $product->get_tax_class( 'unfiltered' ) ];
+				$item_tax_rates = $tax_rates[ $product->get_tax_class() ];
+
+				/**
+				 * ADJUST TAX - Calculations when base tax is not equal to the item tax.
+				 *
+					 * The woocommerce_adjust_non_base_location_prices filter can stop base taxes being taken off when dealing with out of base locations.
+					 * e.g. If a product costs 10 including tax, all users will pay 10 regardless of location and taxes.
+					 * This feature is experimental @since 2.4.7 and may change in the future. Use at your risk.
+					 */
+				if ( $item_tax_rates !== $base_tax_rates && apply_filters( 'woocommerce_adjust_non_base_location_prices', true ) ) {
+
+					// Work out a new base price without the shop's base tax
+					$taxes             = WC_Tax::calc_tax( $line_price, $base_tax_rates, true, true );
+
+					// Now we have a new item price (excluding TAX)
+					$line_subtotal     = round( $line_price - array_sum( $taxes ), wc_get_rounding_precision() );
+					$taxes             = WC_Tax::calc_tax( $line_subtotal, $item_tax_rates );
+					$line_subtotal_tax = array_sum( $taxes );
+
+					// Adjusted price (this is the price including the new tax rate)
+					$adjusted_price    = ( $line_subtotal + $line_subtotal_tax ) / $values['quantity'];
+
+					// Apply discounts and get the discounted price FOR A SINGLE ITEM
+					$discounted_price  = $this->get_discounted_price( $values, $adjusted_price, true );
+
+					// Convert back to line price
+					$discounted_line_price = $discounted_price * $values['quantity'];
+
+					// Now use rounded line price to get taxes.
+					$discounted_taxes  = WC_Tax::calc_tax( $discounted_line_price, $item_tax_rates, true );
+					$line_tax          = array_sum( $discounted_taxes );
+					$line_total        = $discounted_line_price - $line_tax;
+
+				/**
+				 * Regular tax calculation (customer inside base and the tax class is unmodified.
+				 */
+				} else {
+
+					// Work out a new base price without the item tax
+					$taxes             = WC_Tax::calc_tax( $line_price, $item_tax_rates, true );
+
+					// Now we have a new item price (excluding TAX)
+					$line_subtotal     = $line_price - array_sum( $taxes );
+					$line_subtotal_tax = array_sum( $taxes );
+
+					// Calc prices and tax (discounted)
+					$discounted_price = $this->get_discounted_price( $values, $base_price, true );
+
+					// Convert back to line price
+					$discounted_line_price = $discounted_price * $values['quantity'];
+
+					// Now use rounded line price to get taxes.
+					$discounted_taxes  = WC_Tax::calc_tax( $discounted_line_price, $item_tax_rates, true );
+					$line_tax          = array_sum( $discounted_taxes );
+					$line_total        = $discounted_line_price - $line_tax;
+				}
+
+				// Tax rows - merge the totals we just got
+				foreach ( array_keys( $this->taxes + $discounted_taxes ) as $key ) {
+					$this->taxes[ $key ] = ( isset( $discounted_taxes[ $key ] ) ? $discounted_taxes[ $key ] : 0 ) + ( isset( $this->taxes[ $key ] ) ? $this->taxes[ $key ] : 0 );
+				}
+
+			/**
+			 * Prices exclude tax.
+			 */
+			} else {
+
+				$item_tax_rates        = $tax_rates[ $product->get_tax_class() ];
+
+				// Work out a new base price without the shop's base tax
+				$taxes                 = WC_Tax::calc_tax( $line_price, $item_tax_rates );
+
+				// Now we have the item price (excluding TAX)
+				$line_subtotal         = $line_price;
+				$line_subtotal_tax     = array_sum( $taxes );
+
+				// Now calc product rates
+				$discounted_price      = $this->get_discounted_price( $values, $base_price, true );
+				$discounted_taxes      = WC_Tax::calc_tax( $discounted_price * $values['quantity'], $item_tax_rates );
+				$discounted_tax_amount = array_sum( $discounted_taxes );
+				$line_tax              = $discounted_tax_amount;
+				$line_total            = $discounted_price * $values['quantity'];
+
+				// Tax rows - merge the totals we just got
+				foreach ( array_keys( $this->taxes + $discounted_taxes ) as $key ) {
+					$this->taxes[ $key ] = ( isset( $discounted_taxes[ $key ] ) ? $discounted_taxes[ $key ] : 0 ) + ( isset( $this->taxes[ $key ] ) ? $this->taxes[ $key ] : 0 );
+				}
+			}
+
+			// Cart contents total is based on discounted prices and is used for the final total calculation
+			$this->cart_contents_total += $line_total;
+
+			/**
+			 * Store costs + taxes for lines. For tax inclusive prices, we do some extra rounding logic so the stored
+			 * values "add up" when viewing the order in admin. This does have the disadvatage of not being able to
+			 * recalculate the tax total/subtotal accurately in the future, but it does ensure the data looks correct.
+			 *
+			 * Tax exclusive prices are not affected.
+			 */
+			if ( ! $product->is_taxable() || $this->prices_include_tax ) {
+				$this->cart_contents[ $cart_item_key ]['line_total']        = round( $line_total + $line_tax - wc_round_tax_total( $line_tax ), $this->dp );
+				$this->cart_contents[ $cart_item_key ]['line_subtotal']     = round( $line_subtotal + $line_subtotal_tax - wc_round_tax_total( $line_subtotal_tax ), $this->dp );
+				$this->cart_contents[ $cart_item_key ]['line_tax']          = wc_round_tax_total( $line_tax );
+				$this->cart_contents[ $cart_item_key ]['line_subtotal_tax'] = wc_round_tax_total( $line_subtotal_tax );
+				$this->cart_contents[ $cart_item_key ]['line_tax_data']     = array( 'total' => array_map( 'wc_round_tax_total', $discounted_taxes ), 'subtotal' => array_map( 'wc_round_tax_total', $taxes ) );
+			} else {
+				$this->cart_contents[ $cart_item_key ]['line_total']        = $line_total;
+				$this->cart_contents[ $cart_item_key ]['line_subtotal']     = $line_subtotal;
+				$this->cart_contents[ $cart_item_key ]['line_tax']          = $line_tax;
+				$this->cart_contents[ $cart_item_key ]['line_subtotal_tax'] = $line_subtotal_tax;
+				$this->cart_contents[ $cart_item_key ]['line_tax_data']     = array( 'total' => $discounted_taxes, 'subtotal' => $taxes );
+			}
+		}
+
+		// Only calculate the grand total + shipping if on the cart/checkout
+		if ( is_checkout() || is_cart() || defined( 'WOOCOMMERCE_CHECKOUT' ) || defined( 'WOOCOMMERCE_CART' ) ) {
+
+			// Calculate the Shipping
+			$this->calculate_shipping();
+
+			// Trigger the fees API where developers can add fees to the cart
+			$this->calculate_fees();
+
+			// Total up/round taxes and shipping taxes
+			if ( $this->round_at_subtotal ) {
+				$this->tax_total          = WC_Tax::get_tax_total( $this->taxes );
+				$this->shipping_tax_total = WC_Tax::get_tax_total( $this->shipping_taxes );
+				$this->taxes              = array_map( array( 'WC_Tax', 'round' ), $this->taxes );
+				$this->shipping_taxes     = array_map( array( 'WC_Tax', 'round' ), $this->shipping_taxes );
+			} else {
+				$this->tax_total          = array_sum( $this->taxes );
+				$this->shipping_tax_total = array_sum( $this->shipping_taxes );
+			}
+
+			// VAT exemption done at this point - so all totals are correct before exemption
+			if ( WC()->customer->get_is_vat_exempt() ) {
+				$this->remove_taxes();
+			}
+
+			// Allow plugins to hook and alter totals before final total is calculated
+			do_action( 'woocommerce_calculate_totals', $this );
+
+			// Grand Total - Discounted product prices, discounted tax, shipping cost + tax
+			$this->total = max( 0, apply_filters( 'woocommerce_calculated_total', round( $this->cart_contents_total + $this->tax_total + $this->shipping_tax_total + $this->shipping_total + $this->fee_total, $this->dp ), $this ) );
+
+		} else {
+
+			// Set tax total to sum of all tax rows
+			$this->tax_total = WC_Tax::get_tax_total( $this->taxes );
+
+			// VAT exemption done at this point - so all totals are correct before exemption
+			if ( WC()->customer->get_is_vat_exempt() ) {
+				$this->remove_taxes();
+			}
+		}
+
+		do_action( 'woocommerce_after_calculate_totals', $this );
+
+		$this->set_session();
+	}
+
+	/**
+	 * Remove taxes.
+	 */
+	public function remove_taxes() {
+		$this->shipping_tax_total = $this->tax_total = 0;
+		$this->subtotal           = $this->subtotal_ex_tax;
+
+		foreach ( $this->cart_contents as $cart_item_key => $item ) {
+			$this->cart_contents[ $cart_item_key ]['line_subtotal_tax'] = $this->cart_contents[ $cart_item_key ]['line_tax'] = 0;
+			$this->cart_contents[ $cart_item_key ]['line_tax_data']     = array( 'total' => array(), 'subtotal' => array() );
+		}
+
+		// If true, zero rate is applied so '0' tax is displayed on the frontend rather than nothing.
+		if ( apply_filters( 'woocommerce_cart_remove_taxes_apply_zero_rate', true ) ) {
+			$this->taxes = $this->shipping_taxes = array( apply_filters( 'woocommerce_cart_remove_taxes_zero_rate_id', 'zero-rated' ) => 0 );
+		} else {
+			$this->taxes = $this->shipping_taxes = array();
+		}
+	}
+
+	/**
+	 * Looks at the totals to see if payment is actually required.
+	 *
+	 * @return bool
+	 */
+	public function needs_payment() {
+		return apply_filters( 'woocommerce_cart_needs_payment', $this->total > 0, $this );
+	}
+
+	/*
+	 * Shipping related functions.
+	 */
+
+	/**
+	 * Uses the shipping class to calculate shipping then gets the totals when its finished.
+	 */
+	public function calculate_shipping() {
+		if ( $this->needs_shipping() && $this->show_shipping() ) {
+			WC()->shipping->calculate_shipping( $this->get_shipping_packages() );
+		} else {
+			WC()->shipping->reset_shipping();
+		}
+
+		// Get totals for the chosen shipping method
+		$this->shipping_total 		= WC()->shipping->shipping_total;	// Shipping Total
+		$this->shipping_taxes		= WC()->shipping->shipping_taxes;	// Shipping Taxes
+	}
+
+	/**
+	 * Filter items needing shipping callback.
+	 *
+	 * @since  3.0.0
+	 * @param  array $item
+	 * @return bool
+	 */
+	protected function filter_items_needing_shipping( $item ) {
+		$product = $item['data'];
+		return $product && $product->needs_shipping();
+	}
+
+	/**
+	 * Get only items that need shipping.
+	 *
+	 * @since  3.0.0
+	 * @return array
+	 */
+	protected function get_items_needing_shipping() {
+		return array_filter( $this->get_cart(), array( $this, 'filter_items_needing_shipping' ) );
+	}
+
+	/**
+	 * Get packages to calculate shipping for.
+	 *
+	 * This lets us calculate costs for carts that are shipped to multiple locations.
+	 *
+	 * Shipping methods are responsible for looping through these packages.
+	 *
+	 * By default we pass the cart itself as a package - plugins can change this.
+	 * through the filter and break it up.
+	 *
+	 * @since 1.5.4
+	 * @return array of cart items
+	 */
+	public function get_shipping_packages() {
+		return apply_filters( 'woocommerce_cart_shipping_packages',
+			array(
+				array(
+					'contents'        => $this->get_items_needing_shipping(),
+					'contents_cost'   => array_sum( wp_list_pluck( $this->get_items_needing_shipping(), 'line_total' ) ),
+					'applied_coupons' => $this->applied_coupons,
+					'user'            => array(
+						'ID' => get_current_user_id(),
+					),
+					'destination'     => array(
+						'country'   => WC()->customer->get_shipping_country(),
+						'state'     => WC()->customer->get_shipping_state(),
+						'postcode'  => WC()->customer->get_shipping_postcode(),
+						'city'      => WC()->customer->get_shipping_city(),
+						'address'   => WC()->customer->get_shipping_address(),
+						'address_2' => WC()->customer->get_shipping_address_2(),
+					),
+				),
+			)
+		);
+	}
+
+	/**
+	 * Looks through the cart to see if shipping is actually required.
+	 *
+	 * @return bool whether or not the cart needs shipping
+	 */
+	public function needs_shipping() {
+		if ( ! wc_shipping_enabled() || 0 === wc_get_shipping_method_count( true ) ) {
+			return false;
+		}
+		$needs_shipping = false;
+
+		if ( ! empty( $this->cart_contents ) ) {
+			foreach ( $this->cart_contents as $cart_item_key => $values ) {
+				if ( $values['data']->needs_shipping() ) {
+					$needs_shipping = true;
+					break;
+				}
+			}
+		}
+
+		return apply_filters( 'woocommerce_cart_needs_shipping', $needs_shipping );
+	}
+
+	/**
+	 * Should the shipping address form be shown.
+	 *
+	 * @return bool
+	 */
+	public function needs_shipping_address() {
+
+		$needs_shipping_address = false;
+
+		if ( $this->needs_shipping() === true && ! wc_ship_to_billing_address_only() ) {
+			$needs_shipping_address = true;
+		}
+
+		return apply_filters( 'woocommerce_cart_needs_shipping_address', $needs_shipping_address );
+	}
+
+	/**
+	 * Sees if the customer has entered enough data to calc the shipping yet.
+	 *
+	 * @return bool
+	 */
+	public function show_shipping() {
+		if ( ! wc_shipping_enabled() || ! is_array( $this->cart_contents ) ) {
+			return false;
+		}
+
+		if ( 'yes' === get_option( 'woocommerce_shipping_cost_requires_address' ) ) {
+			if ( ! WC()->customer->has_calculated_shipping() ) {
+				if ( ! WC()->customer->get_shipping_country() || ( ! WC()->customer->get_shipping_state() && ! WC()->customer->get_shipping_postcode() ) ) {
+					return false;
+				}
+			}
+		}
+
+		return apply_filters( 'woocommerce_cart_ready_to_calc_shipping', true );
+	}
+
+	/**
+	 * Sees if we need a shipping address.
+	 *
+	 * @deprecated 2.5.0 in favor to wc_ship_to_billing_address_only()
+	 *
+	 * @return bool
+	 */
+	public function ship_to_billing_address_only() {
+		return wc_ship_to_billing_address_only();
+	}
+
+	/**
+	 * Gets the shipping total (after calculation).
+	 *
+	 * @return string price or string for the shipping total
+	 */
+	public function get_cart_shipping_total() {
+		if ( isset( $this->shipping_total ) ) {
+			if ( $this->shipping_total > 0 ) {
+
+				// Display varies depending on settings
+				if ( 'excl' === $this->tax_display_cart ) {
+
+					$return = wc_price( $this->shipping_total );
+
+					if ( $this->shipping_tax_total > 0 && $this->prices_include_tax ) {
+						$return .= ' <small class="tax_label">' . WC()->countries->ex_tax_or_vat() . '</small>';
+					}
+
+					return $return;
+
+				} else {
+
+					$return = wc_price( $this->shipping_total + $this->shipping_tax_total );
+
+					if ( $this->shipping_tax_total > 0 && ! $this->prices_include_tax ) {
+						$return .= ' <small class="tax_label">' . WC()->countries->inc_tax_or_vat() . '</small>';
+					}
+
+					return $return;
+
+				}
+			} else {
+				return __( 'Free!', 'woocommerce' );
+			}
+		}
+
+		return '';
+	}
+
+	/*
+	 * Coupons/Discount related functions.
+	 */
+
+	/**
+	 * Check for user coupons (now that we have billing email). If a coupon is invalid, add an error.
+	 *
+	 * Checks two types of coupons:
+	 *  1. Where a list of customer emails are set (limits coupon usage to those defined).
+	 *  2. Where a usage_limit_per_user is set (limits coupon usage to a number based on user ID and email).
+	 *
+	 * @param array $posted
+	 */
+	public function check_customer_coupons( $posted ) {
+		if ( ! empty( $this->applied_coupons ) ) {
 			foreach ( $this->applied_coupons as $code ) {
 				$coupon = new WC_Coupon( $code );
 
-				if ( ! $coupon->is_valid() ) {
-					// Error message
-					$coupon->add_coupon_message( WC_Coupon::E_WC_COUPON_INVALID_REMOVED );
+				if ( $coupon->is_valid() ) {
 
-					// Remove the coupon
-					$this->remove_coupon( $code );
-
-					// Flag totals for refresh
-					WC()->session->set( 'refresh_totals', true );
-				}
-			}
-		}
-
-		/**
-		 * Get cart items quantities - merged so we can do accurate stock checks on items across multiple lines.
-		 *
-		 * @return array
-		 */
-		public function get_cart_item_quantities() {
-			$quantities = array();
-
-			foreach ( $this->get_cart() as $cart_item_key => $values ) {
-				$_product = $values['data'];
-
-				if ( $_product->is_type( 'variation' ) && true === $_product->managing_stock() ) {
-					// Variation has stock levels defined so its handled individually
-					$quantities[ $values['variation_id'] ] = isset( $quantities[ $values['variation_id'] ] ) ? $quantities[ $values['variation_id'] ] + $values['quantity'] : $values['quantity'];
-				} else {
-					$quantities[ $values['product_id'] ] = isset( $quantities[ $values['product_id'] ] ) ? $quantities[ $values['product_id'] ] + $values['quantity'] : $values['quantity'];
-				}
-			}
-
-			return $quantities;
-		}
-
-		/**
-		 * Looks through cart items and checks the posts are not trashed or deleted.
-		 *
-		 * @return bool|WP_Error
-		 */
-		public function check_cart_item_validity() {
-			foreach ( $this->get_cart() as $cart_item_key => $values ) {
-
-				$_product = $values['data'];
-
-				if ( ! $_product || ! $_product->exists() || $_product->post->post_status == 'trash' ) {
-					$this->set_quantity( $cart_item_key, 0 );
-
-					return new WP_Error( 'invalid', __( 'An item which is no longer available was removed from your cart.', 'woocommerce' ) );
-				}
-			}
-
-			return true;
-		}
-
-		/**
-		 * Looks through the cart to check each item is in stock. If not, add an error.
-		 *
-		 * @return bool|WP_Error
-		 */
-		public function check_cart_item_stock() {
-			global $wpdb;
-
-			$error               = new WP_Error();
-			$product_qty_in_cart = $this->get_cart_item_quantities();
-
-			// First stock check loop
-			foreach ( $this->get_cart() as $cart_item_key => $values ) {
-				$_product = $values['data'];
-
-				/**
-				 * Check stock based on stock-status.
-				 */
-				if ( ! $_product->is_in_stock() ) {
-					$error->add( 'out-of-stock', sprintf(__( 'Sorry, "%s" is not in stock. Please edit your cart and try again. We apologise for any inconvenience caused.', 'woocommerce' ), $_product->get_title() ) );
-					return $error;
-				}
-
-				if ( ! $_product->managing_stock() ) {
-					continue;
-				}
-
-				$check_qty = $_product->is_type( 'variation' ) && true === $_product->managing_stock() ? $product_qty_in_cart[ $values['variation_id'] ] : $product_qty_in_cart[ $values['product_id'] ];
-
-				/**
-				 * Check stock based on all items in the cart.
-				 */
-				if ( ! $_product->has_enough_stock( $check_qty ) ) {
-					$error->add( 'out-of-stock', sprintf(__( 'Sorry, we do not have enough "%s" in stock to fulfill your order (%s in stock). Please edit your cart and try again. We apologise for any inconvenience caused.', 'woocommerce' ), $_product->get_title(), $_product->get_stock_quantity() ) );
-					return $error;
-				}
-
-				/**
-				 * Finally consider any held stock, from pending orders.
-				 */
-				if ( get_option( 'woocommerce_hold_stock_minutes' ) > 0 && ! $_product->backorders_allowed() ) {
-					$order_id   = isset( WC()->session->order_awaiting_payment ) ? absint( WC()->session->order_awaiting_payment ) : 0;
-					$held_stock = $wpdb->get_var(
-						$wpdb->prepare( "
-							SELECT SUM( order_item_meta.meta_value ) AS held_qty
-							FROM {$wpdb->posts} AS posts
-							LEFT JOIN {$wpdb->prefix}woocommerce_order_items as order_items ON posts.ID = order_items.order_id
-							LEFT JOIN {$wpdb->prefix}woocommerce_order_itemmeta as order_item_meta ON order_items.order_item_id = order_item_meta.order_item_id
-							LEFT JOIN {$wpdb->prefix}woocommerce_order_itemmeta as order_item_meta2 ON order_items.order_item_id = order_item_meta2.order_item_id
-							WHERE 	order_item_meta.meta_key   = '_qty'
-							AND 	order_item_meta2.meta_key  = %s AND order_item_meta2.meta_value  = %d
-							AND 	posts.post_type            IN ( '" . implode( "','", wc_get_order_types() ) . "' )
-							AND 	posts.post_status          = 'wc-pending'
-							AND		posts.ID                   != %d;",
-							$_product->is_type( 'variation' ) && true === $_product->managing_stock() ? '_variation_id' : '_product_id',
-							$_product->is_type( 'variation' ) && true === $_product->managing_stock() ? $values['variation_id'] : $values['product_id'],
-							$order_id
-						)
-					);
-
-					$not_enough_stock = false;
-
-					if ( $_product->is_type( 'variation' ) && 'parent' === $_product->managing_stock() && $_product->parent->get_stock_quantity() < ( $held_stock + $check_qty ) ) {
-						$not_enough_stock = true;
-					} elseif ( $_product->get_stock_quantity() < ( $held_stock + $check_qty ) ) {
-						$not_enough_stock = true;
-					}
-					if ( $not_enough_stock ) {
-						$error->add( 'out-of-stock', sprintf(__( 'Sorry, we do not have enough "%s" in stock to fulfill your order right now. Please try again in %d minutes or edit your cart and try again. We apologise for any inconvenience caused.', 'woocommerce' ), $_product->get_title(), get_option( 'woocommerce_hold_stock_minutes' ) ) );
-						return $error;
-					}
-				}
-			}
-
-			return true;
-		}
-
-		/**
-		 * Gets and formats a list of cart item data + variations for display on the frontend.
-		 *
-		 * @param array $cart_item
-		 * @param bool $flat (default: false)
-		 * @return string
-		 */
-		public function get_item_data( $cart_item, $flat = false ) {
-			$item_data = array();
-
-			// Variation data
-			if ( ! empty( $cart_item['data']->variation_id ) && is_array( $cart_item['variation'] ) ) {
-
-				foreach ( $cart_item['variation'] as $name => $value ) {
-
-					if ( '' === $value )
-						continue;
-
-					$taxonomy = wc_attribute_taxonomy_name( str_replace( 'attribute_pa_', '', urldecode( $name ) ) );
-
-					// If this is a term slug, get the term's nice name
-					if ( taxonomy_exists( $taxonomy ) ) {
-						$term = get_term_by( 'slug', $value, $taxonomy );
-						if ( ! is_wp_error( $term ) && $term && $term->name ) {
-							$value = $term->name;
+					// Limit to defined email addresses
+					if ( is_array( $coupon->get_email_restrictions() ) && sizeof( $coupon->get_email_restrictions() ) > 0 ) {
+						$check_emails           = array();
+						if ( is_user_logged_in() ) {
+							$current_user   = wp_get_current_user();
+							$check_emails[] = $current_user->user_email;
 						}
-						$label = wc_attribute_label( $taxonomy );
+						$check_emails[] = $posted['billing_email'];
+						$check_emails   = array_map( 'sanitize_email', array_map( 'strtolower', $check_emails ) );
 
-					// If this is a custom option slug, get the options name
-					} else {
-						$value              = apply_filters( 'woocommerce_variation_option_name', $value );
-						$product_attributes = $cart_item['data']->get_attributes();
-						if ( isset( $product_attributes[ str_replace( 'attribute_', '', $name ) ] ) ) {
-							$label = wc_attribute_label( $product_attributes[ str_replace( 'attribute_', '', $name ) ]['name'] );
+						if ( 0 == sizeof( array_intersect( $check_emails, $coupon->get_email_restrictions() ) ) ) {
+							$coupon->add_coupon_message( WC_Coupon::E_WC_COUPON_NOT_YOURS_REMOVED );
+
+							// Remove the coupon
+							$this->remove_coupon( $code );
+
+							// Flag totals for refresh
+							WC()->session->set( 'refresh_totals', true );
+						}
+					}
+
+					// Usage limits per user - check against billing and user email and user ID
+					if ( $coupon->get_usage_limit_per_user() > 0 ) {
+						$check_emails = array();
+						$used_by      = $coupon->get_used_by();
+
+						if ( is_user_logged_in() ) {
+							$current_user   = wp_get_current_user();
+							$check_emails[] = sanitize_email( $current_user->user_email );
+							$usage_count    = sizeof( array_keys( $used_by, get_current_user_id() ) );
 						} else {
-							$label = $name;
-						}
-					}
-
-					$item_data[] = array(
-						'key'   => $label,
-						'value' => $value
-					);
-				}
-			}
-
-			// Filter item data to allow 3rd parties to add more to the array
-			$item_data = apply_filters( 'woocommerce_get_item_data', $item_data, $cart_item );
-
-			// Format item data ready to display
-			foreach ( $item_data as $key => $data ) {
-				// Set hidden to true to not display meta on cart.
-				if ( ! empty( $data['hidden'] ) ) {
-					unset( $item_data[ $key ] );
-					continue;
-				}
-				$item_data[ $key ]['key']     = ! empty( $data['key'] ) ? $data['key'] : $data['name'];
-				$item_data[ $key ]['display'] = ! empty( $data['display'] ) ? $data['display'] : $data['value'];
-			}
-
-			// Output flat or in list format
-			if ( sizeof( $item_data ) > 0 ) {
-				ob_start();
-
-				if ( $flat ) {
-					foreach ( $item_data as $data ) {
-						echo esc_html( $data['key'] ) . ': ' . wp_kses_post( $data['display'] ) . "\n";
-					}
-				} else {
-					wc_get_template( 'cart/cart-item-data.php', array( 'item_data' => $item_data ) );
-				}
-
-				return ob_get_clean();
-			}
-
-			return '';
-		}
-
-		/**
-		 * Gets cross sells based on the items in the cart.
-		 *
-		 * @return array cross_sells (item ids)
-		 */
-		public function get_cross_sells() {
-			$cross_sells = array();
-			$in_cart = array();
-			if ( ! $this->is_empty() ) {
-				foreach ( $this->get_cart() as $cart_item_key => $values ) {
-					if ( $values['quantity'] > 0 ) {
-						$cross_sells = array_merge( $values['data']->get_cross_sells(), $cross_sells );
-						$in_cart[] = $values['product_id'];
-					}
-				}
-			}
-			$cross_sells = array_diff( $cross_sells, $in_cart );
-			return $cross_sells;
-		}
-
-		/**
-		 * Gets the url to the cart page.
-		 *
-		 * @deprecated 2.5.0 in favor to wc_get_cart_url()
-		 *
-		 * @return string url to page
-		 */
-		public function get_cart_url() {
-			return wc_get_cart_url();
-		}
-
-		/**
-		 * Gets the url to the checkout page.
-		 *
-		 * @deprecated 2.5.0 in favor to wc_get_checkout_url()
-		 *
-		 * @return string url to page
-		 */
-		public function get_checkout_url() {
-			return wc_get_checkout_url();
-		}
-
-		/**
-		 * Gets the url to remove an item from the cart.
-		 *
-		 * @param string cart_item_key contains the id of the cart item
-		 * @return string url to page
-		 */
-		public function get_remove_url( $cart_item_key ) {
-			$cart_page_url = wc_get_page_permalink( 'cart' );
-			return apply_filters( 'woocommerce_get_remove_url', $cart_page_url ? wp_nonce_url( add_query_arg( 'remove_item', $cart_item_key, $cart_page_url ), 'woocommerce-cart' ) : '' );
-		}
-
-		/**
-		 * Gets the url to re-add an item into the cart.
-		 *
-		 * @param  string $cart_item_key
-		 * @return string url to page
-		 */
-		public function get_undo_url( $cart_item_key ) {
-			$cart_page_url = wc_get_page_permalink( 'cart' );
-
-			$query_args = array(
-				'undo_item' => $cart_item_key,
-			);
-
-			return apply_filters( 'woocommerce_get_undo_url', $cart_page_url ? wp_nonce_url( add_query_arg( $query_args, $cart_page_url ), 'woocommerce-cart' ) : '' );
-		}
-
-		/**
-		 * Returns the contents of the cart in an array.
-		 *
-		 * @return array contents of the cart
-		 */
-		public function get_cart() {
-			if ( ! did_action( 'wp_loaded' ) ) {
-				_doing_it_wrong( __FUNCTION__, __( 'Get cart should not be called before the wp_loaded action.', 'woocommerce' ), '2.3' );
-			}
-			if ( ! did_action( 'woocommerce_cart_loaded_from_session' ) ) {
-				$this->get_cart_from_session();
-			}
-			return array_filter( (array) $this->cart_contents );
-		}
-
-		/**
-		 * Returns the contents of the cart in an array without the 'data' element.
-		 *
-		 * @return array contents of the cart
-		 */
-		public function get_cart_for_session() {
-			$cart_session = array();
-
-			if ( $this->get_cart() ) {
-				foreach ( $this->get_cart() as $key => $values ) {
-					$cart_session[ $key ] = $values;
-					unset( $cart_session[ $key ]['data'] ); // Unset product object
-				}
-			}
-
-			return $cart_session;
-		}
-
-		/**
-		 * Returns a specific item in the cart.
-		 *
-		 * @return array item data
-		 */
-		public function get_cart_item( $item_key ) {
-			if ( isset( $this->cart_contents[ $item_key ] ) ) {
-				return $this->cart_contents[ $item_key ];
-			}
-
-			return array();
-		}
-
-		/**
-		 * Returns the cart and shipping taxes, merged.
-		 *
-		 * @return array merged taxes
-		 */
-		public function get_taxes() {
-			$taxes = array();
-
-			// Merge
-			foreach ( array_keys( $this->taxes + $this->shipping_taxes ) as $key ) {
-				$taxes[ $key ] = ( isset( $this->shipping_taxes[ $key ] ) ? $this->shipping_taxes[ $key ] : 0 ) + ( isset( $this->taxes[ $key ] ) ? $this->taxes[ $key ] : 0 );
-			}
-
-			return apply_filters( 'woocommerce_cart_get_taxes', $taxes, $this );
-		}
-
-		/**
-		 * Get taxes, merged by code, formatted ready for output.
-		 *
-		 * @return array
-		 */
-		public function get_tax_totals() {
-			$taxes      = $this->get_taxes();
-			$tax_totals = array();
-
-			foreach ( $taxes as $key => $tax ) {
-				$code = WC_Tax::get_rate_code( $key );
-
-				if ( $code || $key === apply_filters( 'woocommerce_cart_remove_taxes_zero_rate_id', 'zero-rated' ) ) {
-					if ( ! isset( $tax_totals[ $code ] ) ) {
-						$tax_totals[ $code ] = new stdClass();
-						$tax_totals[ $code ]->amount = 0;
-					}
-					$tax_totals[ $code ]->tax_rate_id       = $key;
-					$tax_totals[ $code ]->is_compound       = WC_Tax::is_compound( $key );
-					$tax_totals[ $code ]->label             = WC_Tax::get_rate_label( $key );
-					$tax_totals[ $code ]->amount           += wc_round_tax_total( $tax );
-					$tax_totals[ $code ]->formatted_amount  = wc_price( wc_round_tax_total( $tax_totals[ $code ]->amount ) );
-				}
-			}
-
-			return apply_filters( 'woocommerce_cart_tax_totals', $tax_totals, $this );
-		}
-
-		/**
-		 * Get all tax classes for items in the cart.
-		 * @return array
-		 */
-		public function get_cart_item_tax_classes() {
-			$found_tax_classes = array();
-
-			foreach ( WC()->cart->get_cart() as $item ) {
-				$found_tax_classes[] = $item['data']->get_tax_class();
-			}
-
-			return array_unique( $found_tax_classes );
-		}
-
-	/*-----------------------------------------------------------------------------------*/
-	/* Add to cart handling */
-	/*-----------------------------------------------------------------------------------*/
-
-		/**
-		 * Check if product is in the cart and return cart item key.
-		 *
-		 * Cart item key will be unique based on the item and its properties, such as variations.
-		 *
-		 * @param mixed id of product to find in the cart
-		 * @return string cart item key
-		 */
-		public function find_product_in_cart( $cart_id = false ) {
-			if ( $cart_id !== false ) {
-				if ( is_array( $this->cart_contents ) ) {
-					foreach ( $this->cart_contents as $cart_item_key => $cart_item ) {
-						if ( $cart_item_key == $cart_id ) {
-							return $cart_item_key;
-						}
-					}
-				}
-			}
-			return '';
-		}
-
-		/**
-		 * Generate a unique ID for the cart item being added.
-		 *
-		 * @param int $product_id - id of the product the key is being generated for
-		 * @param int $variation_id of the product the key is being generated for
-		 * @param array $variation data for the cart item
-		 * @param array $cart_item_data other cart item data passed which affects this items uniqueness in the cart
-		 * @return string cart item key
-		 */
-		public function generate_cart_id( $product_id, $variation_id = 0, $variation = array(), $cart_item_data = array() ) {
-			$id_parts = array( $product_id );
-
-			if ( $variation_id && 0 != $variation_id ) {
-				$id_parts[] = $variation_id;
-			}
-
-			if ( is_array( $variation ) && ! empty( $variation ) ) {
-				$variation_key = '';
-				foreach ( $variation as $key => $value ) {
-					$variation_key .= trim( $key ) . trim( $value );
-				}
-				$id_parts[] = $variation_key;
-			}
-
-			if ( is_array( $cart_item_data ) && ! empty( $cart_item_data ) ) {
-				$cart_item_data_key = '';
-				foreach ( $cart_item_data as $key => $value ) {
-
-					if ( is_array( $value ) ) {
-						$value = http_build_query( $value );
-					}
-					$cart_item_data_key .= trim( $key ) . trim( $value );
-
-				}
-				$id_parts[] = $cart_item_data_key;
-			}
-
-			return md5( implode( '_', $id_parts ) );
-		}
-
-		/**
-		 * Add a product to the cart.
-		 *
-		 * @param integer $product_id contains the id of the product to add to the cart
-		 * @param integer $quantity contains the quantity of the item to add
-		 * @param integer $variation_id
-		 * @param array $variation attribute values
-		 * @param array $cart_item_data extra cart item data we want to pass into the item
-		 * @return string $cart_item_key
-		 */
-		public function add_to_cart( $product_id = 0, $quantity = 1, $variation_id = 0, $variation = array(), $cart_item_data = array() ) {
-			// Wrap in try catch so plugins can throw an exception to prevent adding to cart
-			try {
-				$product_id   = absint( $product_id );
-				$variation_id = absint( $variation_id );
-
-				// Ensure we don't add a variation to the cart directly by variation ID
-				if ( 'product_variation' == get_post_type( $product_id ) ) {
-					$variation_id = $product_id;
-					$product_id   = wp_get_post_parent_id( $variation_id );
-				}
-
-				// Get the product
-				$product_data = wc_get_product( $variation_id ? $variation_id : $product_id );
-
-				// Sanitity check
-				if ( $quantity <= 0 || ! $product_data || 'trash' === $product_data->post->post_status  ) {
-					throw new Exception();
-				}
-
-				// Load cart item data - may be added by other plugins
-				$cart_item_data = (array) apply_filters( 'woocommerce_add_cart_item_data', $cart_item_data, $product_id, $variation_id );
-
-				// Generate a ID based on product ID, variation ID, variation data, and other cart item data
-				$cart_id        = $this->generate_cart_id( $product_id, $variation_id, $variation, $cart_item_data );
-
-				// Find the cart item key in the existing cart
-				$cart_item_key  = $this->find_product_in_cart( $cart_id );
-
-				// Force quantity to 1 if sold individually and check for exisitng item in cart
-				if ( $product_data->is_sold_individually() ) {
-					$quantity         = apply_filters( 'woocommerce_add_to_cart_sold_individually_quantity', 1, $quantity, $product_id, $variation_id, $cart_item_data );
-					$in_cart_quantity = $cart_item_key ? $this->cart_contents[ $cart_item_key ]['quantity'] : 0;
-
-					if ( $in_cart_quantity > 0 ) {
-						throw new Exception( sprintf( '<a href="%s" class="button wc-forward">%s</a> %s', wc_get_cart_url(), __( 'View Cart', 'woocommerce' ), sprintf( __( 'You cannot add another &quot;%s&quot; to your cart.', 'woocommerce' ), $product_data->get_title() ) ) );
-					}
-				}
-
-				// Check product is_purchasable
-				if ( ! $product_data->is_purchasable() ) {
-					throw new Exception( __( 'Sorry, this product cannot be purchased.', 'woocommerce' ) );
-				}
-
-				// Stock check - only check if we're managing stock and backorders are not allowed
-				if ( ! $product_data->is_in_stock() ) {
-					throw new Exception( sprintf( __( 'You cannot add &quot;%s&quot; to the cart because the product is out of stock.', 'woocommerce' ), $product_data->get_title() ) );
-				}
-
-				if ( ! $product_data->has_enough_stock( $quantity ) ) {
-					throw new Exception( sprintf(__( 'You cannot add that amount of &quot;%s&quot; to the cart because there is not enough stock (%s remaining).', 'woocommerce' ), $product_data->get_title(), $product_data->get_stock_quantity() ) );
-				}
-
-				// Stock check - this time accounting for whats already in-cart
-				if ( $managing_stock = $product_data->managing_stock() ) {
-					$products_qty_in_cart = $this->get_cart_item_quantities();
-
-					if ( $product_data->is_type( 'variation' ) && true === $managing_stock ) {
-						$check_qty = isset( $products_qty_in_cart[ $variation_id ] ) ? $products_qty_in_cart[ $variation_id ] : 0;
-					} else {
-						$check_qty = isset( $products_qty_in_cart[ $product_id ] ) ? $products_qty_in_cart[ $product_id ] : 0;
-					}
-
-					/**
-					 * Check stock based on all items in the cart.
-					 */
-					if ( ! $product_data->has_enough_stock( $check_qty + $quantity ) ) {
-						throw new Exception( sprintf(
-							'<a href="%s" class="button wc-forward">%s</a> %s',
-							wc_get_cart_url(),
-							__( 'View Cart', 'woocommerce' ),
-							sprintf( __( 'You cannot add that amount to the cart &mdash; we have %s in stock and you already have %s in your cart.', 'woocommerce' ), $product_data->get_stock_quantity(), $check_qty )
-						) );
-					}
-				}
-
-				// If cart_item_key is set, the item is already in the cart
-				if ( $cart_item_key ) {
-					$new_quantity = $quantity + $this->cart_contents[ $cart_item_key ]['quantity'];
-					$this->set_quantity( $cart_item_key, $new_quantity, false );
-				} else {
-					$cart_item_key = $cart_id;
-
-					// Add item after merging with $cart_item_data - hook to allow plugins to modify cart item
-					$this->cart_contents[ $cart_item_key ] = apply_filters( 'woocommerce_add_cart_item', array_merge( $cart_item_data, array(
-						'product_id'	=> $product_id,
-						'variation_id'	=> $variation_id,
-						'variation' 	=> $variation,
-						'quantity' 		=> $quantity,
-						'data'			=> $product_data
-					) ), $cart_item_key );
-				}
-
-				if ( did_action( 'wp' ) ) {
-					$this->set_cart_cookies( ! $this->is_empty() );
-				}
-
-				do_action( 'woocommerce_add_to_cart', $cart_item_key, $product_id, $quantity, $variation_id, $variation, $cart_item_data );
-
-				return $cart_item_key;
-
-			} catch ( Exception $e ) {
-				if ( $e->getMessage() ) {
-					wc_add_notice( $e->getMessage(), 'error' );
-				}
-				return false;
-			}
-		}
-
-		/**
-		 * Remove a cart item.
-		 *
-		 * @since  2.3.0
-		 * @param  string $cart_item_key
-		 * @return bool
-		 */
-		public function remove_cart_item( $cart_item_key ) {
-			if ( isset( $this->cart_contents[ $cart_item_key ] ) ) {
-				$this->removed_cart_contents[ $cart_item_key ] = $this->cart_contents[ $cart_item_key ];
-				unset( $this->removed_cart_contents[ $cart_item_key ]['data'] );
-
-				do_action( 'woocommerce_remove_cart_item', $cart_item_key, $this );
-
-				unset( $this->cart_contents[ $cart_item_key ] );
-
-				do_action( 'woocommerce_cart_item_removed', $cart_item_key, $this );
-
-				$this->calculate_totals();
-
-				return true;
-			}
-
-			return false;
-		}
-
-		/**
-		 * Restore a cart item.
-		 *
-		 * @param  string $cart_item_key
-		 * @return bool
-		 */
-		public function restore_cart_item( $cart_item_key ) {
-			if ( isset( $this->removed_cart_contents[ $cart_item_key ] ) ) {
-				$this->cart_contents[ $cart_item_key ] = $this->removed_cart_contents[ $cart_item_key ];
-				$this->cart_contents[ $cart_item_key ]['data'] = wc_get_product( $this->cart_contents[ $cart_item_key ]['variation_id'] ? $this->cart_contents[ $cart_item_key ]['variation_id'] : $this->cart_contents[ $cart_item_key ]['product_id'] );
-
-				do_action( 'woocommerce_restore_cart_item', $cart_item_key, $this );
-
-				unset( $this->removed_cart_contents[ $cart_item_key ] );
-
-				do_action( 'woocommerce_cart_item_restored', $cart_item_key, $this );
-
-				$this->calculate_totals();
-
-				return true;
-			}
-
-			return false;
-		}
-
-		/**
-		 * Set the quantity for an item in the cart.
-		 *
-		 * @param string	cart_item_key	contains the id of the cart item
-		 * @param string	quantity		contains the quantity of the item
-		 * @param boolean 	$refresh_totals	whether or not to calculate totals after setting the new qty
-		 *
-		 * @return bool
-		 */
-		public function set_quantity( $cart_item_key, $quantity = 1, $refresh_totals = true ) {
-			if ( $quantity == 0 || $quantity < 0 ) {
-				do_action( 'woocommerce_before_cart_item_quantity_zero', $cart_item_key );
-				unset( $this->cart_contents[ $cart_item_key ] );
-			} else {
-				$old_quantity = $this->cart_contents[ $cart_item_key ]['quantity'];
-				$this->cart_contents[ $cart_item_key ]['quantity'] = $quantity;
-				do_action( 'woocommerce_after_cart_item_quantity_update', $cart_item_key, $quantity, $old_quantity );
-			}
-
-			if ( $refresh_totals ) {
-				$this->calculate_totals();
-			}
-
-			return true;
-		}
-
-	/*-----------------------------------------------------------------------------------*/
-	/* Cart Calculation Functions */
-	/*-----------------------------------------------------------------------------------*/
-
-		/**
-		 * Reset cart totals to the defaults. Useful before running calculations.
-		 *
-		 * @param  bool  	$unset_session If true, the session data will be forced unset.
-		 * @access private
-		 */
-		private function reset( $unset_session = false ) {
-			foreach ( $this->cart_session_data as $key => $default ) {
-				$this->$key = $default;
-				if ( $unset_session ) {
-					unset( WC()->session->$key );
-				}
-			}
-			do_action( 'woocommerce_cart_reset', $this, $unset_session );
-		}
-
-		/**
-		 * Sort by subtotal.
-		 * @param  array $a
-		 * @param  array $b
-		 * @return int
-		 */
-		private function sort_by_subtotal( $a, $b ) {
-			$first_item_subtotal  = isset( $a['line_subtotal'] ) ? $a['line_subtotal'] : 0;
-			$second_item_subtotal = isset( $b['line_subtotal'] ) ? $b['line_subtotal'] : 0;
-			if ( $first_item_subtotal === $second_item_subtotal ) {
-				return 0;
-			}
-			return ( $first_item_subtotal < $second_item_subtotal ) ? 1 : -1;
-		}
-
-		/**
-		 * Calculate totals for the items in the cart.
-		 */
-		public function calculate_totals() {
-			$this->reset();
-			$this->coupons = $this->get_coupons();
-
-			do_action( 'woocommerce_before_calculate_totals', $this );
-
-			if ( $this->is_empty() ) {
-				$this->set_session();
-				return;
-			}
-
-			$tax_rates      = array();
-			$shop_tax_rates = array();
-			$cart           = $this->get_cart();
-
-			/**
-			 * Calculate subtotals for items. This is done first so that discount logic can use the values.
-			 */
-			foreach ( $cart as $cart_item_key => $values ) {
-				$_product          = $values['data'];
-				$line_price        = $_product->get_price() * $values['quantity'];
-				$line_subtotal     = 0;
-				$line_subtotal_tax = 0;
-
-				/**
-				 * No tax to calculate.
-				 */
-				if ( ! $_product->is_taxable() ) {
-
-					// Subtotal is the undiscounted price
-					$this->subtotal += $line_price;
-					$this->subtotal_ex_tax += $line_price;
-
-				/**
-				 * Prices include tax.
-				 *
-				 * To prevent rounding issues we need to work with the inclusive price where possible.
-				 * otherwise we'll see errors such as when working with a 9.99 inc price, 20% VAT which would.
-				 * be 8.325 leading to totals being 1p off.
-				 *
-				 * Pre tax coupons come off the price the customer thinks they are paying - tax is calculated.
-				 * afterwards.
-				 *
-				 * e.g. $100 bike with $10 coupon = customer pays $90 and tax worked backwards from that.
-				 */
-				} elseif ( $this->prices_include_tax ) {
-
-					// Get base tax rates
-					if ( empty( $shop_tax_rates[ $_product->tax_class ] ) ) {
-						$shop_tax_rates[ $_product->tax_class ] = WC_Tax::get_base_tax_rates( $_product->tax_class );
-					}
-
-					// Get item tax rates
-					if ( empty( $tax_rates[ $_product->get_tax_class() ] ) ) {
-						$tax_rates[ $_product->get_tax_class() ] = WC_Tax::get_rates( $_product->get_tax_class() );
-					}
-
-					$base_tax_rates = $shop_tax_rates[ $_product->tax_class ];
-					$item_tax_rates = $tax_rates[ $_product->get_tax_class() ];
-
-					/**
-					 * ADJUST TAX - Calculations when base tax is not equal to the item tax.
-					 *
- 					 * The woocommerce_adjust_non_base_location_prices filter can stop base taxes being taken off when dealing with out of base locations.
- 					 * e.g. If a product costs 10 including tax, all users will pay 10 regardless of location and taxes.
- 					 * This feature is experimental @since 2.4.7 and may change in the future. Use at your risk.
- 					 */
-					if ( $item_tax_rates !== $base_tax_rates && apply_filters( 'woocommerce_adjust_non_base_location_prices', true ) ) {
-
-						// Work out a new base price without the shop's base tax
-						$taxes                 = WC_Tax::calc_tax( $line_price, $base_tax_rates, true, true );
-
-						// Now we have a new item price (excluding TAX)
-						$line_subtotal         = $line_price - array_sum( $taxes );
-
-						// Now add modified taxes
-						$tax_result            = WC_Tax::calc_tax( $line_subtotal, $item_tax_rates );
-						$line_subtotal_tax     = array_sum( $tax_result );
-
-					/**
-					 * Regular tax calculation (customer inside base and the tax class is unmodified.
-					 */
-					} else {
-
-						// Calc tax normally
-						$taxes                 = WC_Tax::calc_tax( $line_price, $item_tax_rates, true );
-						$line_subtotal_tax     = array_sum( $taxes );
-						$line_subtotal         = $line_price - array_sum( $taxes );
-					}
-
-				/**
-				 * Prices exclude tax.
-				 *
-				 * This calculation is simpler - work with the base, untaxed price.
-				 */
-				} else {
-
-					// Get item tax rates
-					if ( empty( $tax_rates[ $_product->get_tax_class() ] ) ) {
-						$tax_rates[ $_product->get_tax_class() ] = WC_Tax::get_rates( $_product->get_tax_class() );
-					}
-
-					$item_tax_rates        = $tax_rates[ $_product->get_tax_class() ];
-
-					// Base tax for line before discount - we will store this in the order data
-					$taxes                 = WC_Tax::calc_tax( $line_price, $item_tax_rates );
-					$line_subtotal_tax     = array_sum( $taxes );
-
-					$line_subtotal         = $line_price;
-				}
-
-				// Add to main subtotal
-				$this->subtotal        += $line_subtotal + $line_subtotal_tax;
-				$this->subtotal_ex_tax += $line_subtotal;
-			}
-
-			// Order cart items by price so coupon logic is 'fair' for customers and not based on order added to cart.
-			uasort( $cart, array( $this, 'sort_by_subtotal' ) );
-
-			/**
-			 * Calculate totals for items.
-			 */
-			foreach ( $cart as $cart_item_key => $values ) {
-
-				$_product = $values['data'];
-
-				// Prices
-				$base_price = $_product->get_price();
-				$line_price = $_product->get_price() * $values['quantity'];
-
-				// Tax data
-				$taxes = array();
-				$discounted_taxes = array();
-
-				/**
-				 * No tax to calculate.
-				 */
-				if ( ! $_product->is_taxable() ) {
-
-					// Discounted Price (price with any pre-tax discounts applied)
-					$discounted_price      = $this->get_discounted_price( $values, $base_price, true );
-					$line_subtotal_tax     = 0;
-					$line_subtotal         = $line_price;
-					$line_tax              = 0;
-					$line_total            = WC_Tax::round( $discounted_price * $values['quantity'] );
-
-				/**
-				 * Prices include tax.
-				 */
-				} elseif ( $this->prices_include_tax ) {
-
-					$base_tax_rates = $shop_tax_rates[ $_product->tax_class ];
-					$item_tax_rates = $tax_rates[ $_product->get_tax_class() ];
-
-					/**
-					 * ADJUST TAX - Calculations when base tax is not equal to the item tax.
-					 *
- 					 * The woocommerce_adjust_non_base_location_prices filter can stop base taxes being taken off when dealing with out of base locations.
- 					 * e.g. If a product costs 10 including tax, all users will pay 10 regardless of location and taxes.
- 					 * This feature is experimental @since 2.4.7 and may change in the future. Use at your risk.
- 					 */
-					if ( $item_tax_rates !== $base_tax_rates && apply_filters( 'woocommerce_adjust_non_base_location_prices', true ) ) {
-
-						// Work out a new base price without the shop's base tax
-						$taxes             = WC_Tax::calc_tax( $line_price, $base_tax_rates, true, true );
-
-						// Now we have a new item price (excluding TAX)
-						$line_subtotal     = round( $line_price - array_sum( $taxes ), WC_ROUNDING_PRECISION );
-						$taxes             = WC_Tax::calc_tax( $line_subtotal, $item_tax_rates );
-						$line_subtotal_tax = array_sum( $taxes );
-
-						// Adjusted price (this is the price including the new tax rate)
-						$adjusted_price    = ( $line_subtotal + $line_subtotal_tax ) / $values['quantity'];
-
-						// Apply discounts
-						$discounted_price  = $this->get_discounted_price( $values, $adjusted_price, true );
-						$discounted_taxes  = WC_Tax::calc_tax( $discounted_price * $values['quantity'], $item_tax_rates, true );
-						$line_tax          = array_sum( $discounted_taxes );
-						$line_total        = ( $discounted_price * $values['quantity'] ) - $line_tax;
-
-					/**
-					 * Regular tax calculation (customer inside base and the tax class is unmodified.
-					 */
-					} else {
-
-						// Work out a new base price without the item tax
-						$taxes             = WC_Tax::calc_tax( $line_price, $item_tax_rates, true );
-
-						// Now we have a new item price (excluding TAX)
-						$line_subtotal     = $line_price - array_sum( $taxes );
-						$line_subtotal_tax = array_sum( $taxes );
-
-						// Calc prices and tax (discounted)
-						$discounted_price = $this->get_discounted_price( $values, $base_price, true );
-						$discounted_taxes = WC_Tax::calc_tax( $discounted_price * $values['quantity'], $item_tax_rates, true );
-						$line_tax         = array_sum( $discounted_taxes );
-						$line_total       = ( $discounted_price * $values['quantity'] ) - $line_tax;
-					}
-
-					// Tax rows - merge the totals we just got
-					foreach ( array_keys( $this->taxes + $discounted_taxes ) as $key ) {
-						$this->taxes[ $key ] = ( isset( $discounted_taxes[ $key ] ) ? $discounted_taxes[ $key ] : 0 ) + ( isset( $this->taxes[ $key ] ) ? $this->taxes[ $key ] : 0 );
-					}
-
-				/**
-				 * Prices exclude tax.
-				 */
-				} else {
-
-					$item_tax_rates        = $tax_rates[ $_product->get_tax_class() ];
-
-					// Work out a new base price without the shop's base tax
-					$taxes                 = WC_Tax::calc_tax( $line_price, $item_tax_rates );
-
-					// Now we have the item price (excluding TAX)
-					$line_subtotal         = $line_price;
-					$line_subtotal_tax     = array_sum( $taxes );
-
-					// Now calc product rates
-					$discounted_price      = $this->get_discounted_price( $values, $base_price, true );
-					$discounted_taxes      = WC_Tax::calc_tax( $discounted_price * $values['quantity'], $item_tax_rates );
-					$discounted_tax_amount = array_sum( $discounted_taxes );
-					$line_tax              = $discounted_tax_amount;
-					$line_total            = $discounted_price * $values['quantity'];
-
-					// Tax rows - merge the totals we just got
-					foreach ( array_keys( $this->taxes + $discounted_taxes ) as $key ) {
-						$this->taxes[ $key ] = ( isset( $discounted_taxes[ $key ] ) ? $discounted_taxes[ $key ] : 0 ) + ( isset( $this->taxes[ $key ] ) ? $this->taxes[ $key ] : 0 );
-					}
-				}
-
-				// Cart contents total is based on discounted prices and is used for the final total calculation
-				$this->cart_contents_total += $line_total;
-
-				// Store costs + taxes for lines
-				$this->cart_contents[ $cart_item_key ]['line_total']        = $line_total;
-				$this->cart_contents[ $cart_item_key ]['line_tax']          = $line_tax;
-				$this->cart_contents[ $cart_item_key ]['line_subtotal']     = $line_subtotal;
-				$this->cart_contents[ $cart_item_key ]['line_subtotal_tax'] = $line_subtotal_tax;
-
-				// Store rates ID and costs - Since 2.2
-				$this->cart_contents[ $cart_item_key ]['line_tax_data']     = array( 'total' => $discounted_taxes, 'subtotal' => $taxes );
-			}
-
-			// Only calculate the grand total + shipping if on the cart/checkout
-			if ( is_checkout() || is_cart() || defined('WOOCOMMERCE_CHECKOUT') || defined('WOOCOMMERCE_CART') ) {
-
-				// Calculate the Shipping
-				$this->calculate_shipping();
-
-				// Trigger the fees API where developers can add fees to the cart
-				$this->calculate_fees();
-
-				// Total up/round taxes and shipping taxes
-				if ( $this->round_at_subtotal ) {
-					$this->tax_total          = WC_Tax::get_tax_total( $this->taxes );
-					$this->shipping_tax_total = WC_Tax::get_tax_total( $this->shipping_taxes );
-					$this->taxes              = array_map( array( 'WC_Tax', 'round' ), $this->taxes );
-					$this->shipping_taxes     = array_map( array( 'WC_Tax', 'round' ), $this->shipping_taxes );
-				} else {
-					$this->tax_total          = array_sum( $this->taxes );
-					$this->shipping_tax_total = array_sum( $this->shipping_taxes );
-				}
-
-				// VAT exemption done at this point - so all totals are correct before exemption
-				if ( WC()->customer->is_vat_exempt() ) {
-					$this->remove_taxes();
-				}
-
-				// Allow plugins to hook and alter totals before final total is calculated
-				do_action( 'woocommerce_calculate_totals', $this );
-
-				// Grand Total - Discounted product prices, discounted tax, shipping cost + tax
-				$this->total = max( 0, apply_filters( 'woocommerce_calculated_total', round( $this->cart_contents_total + $this->tax_total + $this->shipping_tax_total + $this->shipping_total + $this->fee_total, $this->dp ), $this ) );
-
-			} else {
-
-				// Set tax total to sum of all tax rows
-				$this->tax_total = WC_Tax::get_tax_total( $this->taxes );
-
-				// VAT exemption done at this point - so all totals are correct before exemption
-				if ( WC()->customer->is_vat_exempt() ) {
-					$this->remove_taxes();
-				}
-			}
-
-			do_action( 'woocommerce_after_calculate_totals', $this );
-
-			$this->set_session();
-		}
-
-		/**
-		 * remove_taxes function.
-		 */
-		public function remove_taxes() {
-			$this->shipping_tax_total = $this->tax_total = 0;
-			$this->subtotal           = $this->subtotal_ex_tax;
-
-			foreach ( $this->cart_contents as $cart_item_key => $item ) {
-				$this->cart_contents[ $cart_item_key ]['line_subtotal_tax'] = $this->cart_contents[ $cart_item_key ]['line_tax'] = 0;
-				$this->cart_contents[ $cart_item_key ]['line_tax_data']     = array( 'total' => array(), 'subtotal' => array() );
-			}
-
-			// If true, zero rate is applied so '0' tax is displayed on the frontend rather than nothing.
-			if ( apply_filters( 'woocommerce_cart_remove_taxes_apply_zero_rate', true ) ) {
-				$this->taxes = $this->shipping_taxes = array( apply_filters( 'woocommerce_cart_remove_taxes_zero_rate_id', 'zero-rated' ) => 0 );
-			} else {
-				$this->taxes = $this->shipping_taxes = array();
-			}
-		}
-
-		/**
-		 * looks at the totals to see if payment is actually required.
-		 *
-		 * @return bool
-		 */
-		public function needs_payment() {
-			return apply_filters( 'woocommerce_cart_needs_payment', $this->total > 0, $this );
-		}
-
-	/*-----------------------------------------------------------------------------------*/
-	/* Shipping related functions */
-	/*-----------------------------------------------------------------------------------*/
-
-		/**
-		 * Uses the shipping class to calculate shipping then gets the totals when its finished.
-		 */
-		public function calculate_shipping() {
-			if ( $this->needs_shipping() && $this->show_shipping() ) {
-				WC()->shipping->calculate_shipping( $this->get_shipping_packages() );
-			} else {
-				WC()->shipping->reset_shipping();
-			}
-
-			// Get totals for the chosen shipping method
-			$this->shipping_total 		= WC()->shipping->shipping_total;	// Shipping Total
-			$this->shipping_taxes		= WC()->shipping->shipping_taxes;	// Shipping Taxes
-		}
-
-		/**
-		 * Get packages to calculate shipping for.
-		 *
-		 * This lets us calculate costs for carts that are shipped to multiple locations.
-		 *
-		 * Shipping methods are responsible for looping through these packages.
-		 *
-		 * By default we pass the cart itself as a package - plugins can change this.
-		 * through the filter and break it up.
-		 *
-		 * @since 1.5.4
-		 * @return array of cart items
-		 */
-		public function get_shipping_packages() {
-			// Packages array for storing 'carts'
-			$packages = array();
-
-			$packages[0]['contents']                 = $this->get_cart();		// Items in the package
-			$packages[0]['contents_cost']            = 0;						// Cost of items in the package, set below
-			$packages[0]['applied_coupons']          = $this->applied_coupons;
-			$packages[0]['user']['ID']               = get_current_user_id();
-			$packages[0]['destination']['country']   = WC()->customer->get_shipping_country();
-			$packages[0]['destination']['state']     = WC()->customer->get_shipping_state();
-			$packages[0]['destination']['postcode']  = WC()->customer->get_shipping_postcode();
-			$packages[0]['destination']['city']      = WC()->customer->get_shipping_city();
-			$packages[0]['destination']['address']   = WC()->customer->get_shipping_address();
-			$packages[0]['destination']['address_2'] = WC()->customer->get_shipping_address_2();
-
-			foreach ( $this->get_cart() as $item ) {
-				if ( $item['data']->needs_shipping() ) {
-					if ( isset( $item['line_total'] ) ) {
-						$packages[0]['contents_cost'] += $item['line_total'];
-					}
-				}
-			}
-
-			return apply_filters( 'woocommerce_cart_shipping_packages', $packages );
-		}
-
-		/**
-		 * Looks through the cart to see if shipping is actually required.
-		 *
-		 * @return bool whether or not the cart needs shipping
-		 */
-		public function needs_shipping() {
-			if ( get_option( 'woocommerce_calc_shipping' ) === 'no' ) {
-				return false;
-			}
-
-			$needs_shipping = false;
-
-			if ( $this->cart_contents ) {
-				foreach ( $this->cart_contents as $cart_item_key => $values ) {
-					$_product = $values['data'];
-					if ( $_product->needs_shipping() ) {
-						$needs_shipping = true;
-					}
-				}
-			}
-
-			return apply_filters( 'woocommerce_cart_needs_shipping', $needs_shipping );
-		}
-
-		/**
-		 * Should the shipping address form be shown.
-		 *
-		 * @return bool
-		 */
-		function needs_shipping_address() {
-
-			$needs_shipping_address = false;
-
-			if ( $this->needs_shipping() === true && ! wc_ship_to_billing_address_only() ) {
-				$needs_shipping_address = true;
-			}
-
-			return apply_filters( 'woocommerce_cart_needs_shipping_address', $needs_shipping_address );
-		}
-
-		/**
-		 * Sees if the customer has entered enough data to calc the shipping yet.
-		 *
-		 * @return bool
-		 */
-		public function show_shipping() {
-			if ( get_option('woocommerce_calc_shipping') == 'no' || ! is_array( $this->cart_contents ) )
-				return false;
-
-			if ( get_option( 'woocommerce_shipping_cost_requires_address' ) == 'yes' ) {
-				if ( ! WC()->customer->has_calculated_shipping() ) {
-					if ( ! WC()->customer->get_shipping_country() || ( ! WC()->customer->get_shipping_state() && ! WC()->customer->get_shipping_postcode() ) )
-						return false;
-				}
-			}
-
-			$show_shipping = true;
-
-			return apply_filters( 'woocommerce_cart_ready_to_calc_shipping', $show_shipping );
-
-		}
-
-		/**
-		 * Sees if we need a shipping address.
-		 *
-		 * @deprecated 2.5.0 in favor to wc_ship_to_billing_address_only()
-		 *
-		 * @return bool
-		 */
-		public function ship_to_billing_address_only() {
-			return wc_ship_to_billing_address_only();
-		}
-
-		/**
-		 * Gets the shipping total (after calculation).
-		 *
-		 * @return string price or string for the shipping total
-		 */
-		public function get_cart_shipping_total() {
-			if ( isset( $this->shipping_total ) ) {
-				if ( $this->shipping_total > 0 ) {
-
-					// Display varies depending on settings
-					if ( $this->tax_display_cart == 'excl' ) {
-
-						$return = wc_price( $this->shipping_total );
-
-						if ( $this->shipping_tax_total > 0 && $this->prices_include_tax ) {
-							$return .= ' <small class="tax_label">' . WC()->countries->ex_tax_or_vat() . '</small>';
-						}
-
-						return $return;
-
-					} else {
-
-						$return = wc_price( $this->shipping_total + $this->shipping_tax_total );
-
-						if ( $this->shipping_tax_total > 0 && ! $this->prices_include_tax ) {
-							$return .= ' <small class="tax_label">' . WC()->countries->inc_tax_or_vat() . '</small>';
-						}
-
-						return $return;
-
-					}
-
-				} else {
-					return __( 'Free!', 'woocommerce' );
-				}
-			}
-
-			return '';
-		}
-
-	/*-----------------------------------------------------------------------------------*/
-	/* Coupons/Discount related functions */
-	/*-----------------------------------------------------------------------------------*/
-
-		/**
-		 * Check for user coupons (now that we have billing email). If a coupon is invalid, add an error.
-		 *
-		 * Checks two types of coupons:
-		 *  1. Where a list of customer emails are set (limits coupon usage to those defined).
-		 *  2. Where a usage_limit_per_user is set (limits coupon usage to a number based on user ID and email).
-		 *
-		 * @param array $posted
-		 */
-		public function check_customer_coupons( $posted ) {
-			if ( ! empty( $this->applied_coupons ) ) {
-				foreach ( $this->applied_coupons as $code ) {
-					$coupon = new WC_Coupon( $code );
-
-					if ( $coupon->is_valid() ) {
-
-						// Limit to defined email addresses
-						if ( is_array( $coupon->customer_email ) && sizeof( $coupon->customer_email ) > 0 ) {
-							$check_emails           = array();
-							$coupon->customer_email = array_map( 'sanitize_email', $coupon->customer_email );
-
-							if ( is_user_logged_in() ) {
-								$current_user   = wp_get_current_user();
-								$check_emails[] = $current_user->user_email;
-							}
-							$check_emails[] = $posted['billing_email'];
-							$check_emails   = array_map( 'sanitize_email', array_map( 'strtolower', $check_emails ) );
-
-							if ( 0 == sizeof( array_intersect( $check_emails, $coupon->customer_email ) ) ) {
-								$coupon->add_coupon_message( WC_Coupon::E_WC_COUPON_NOT_YOURS_REMOVED );
-
-								// Remove the coupon
-								$this->remove_coupon( $code );
-
-								// Flag totals for refresh
-								WC()->session->set( 'refresh_totals', true );
-							}
-						}
-
-						// Usage limits per user - check against billing and user email and user ID
-						if ( $coupon->usage_limit_per_user > 0 ) {
-							$check_emails = array();
-							$used_by      = $coupon->get_used_by();
-
-							if ( is_user_logged_in() ) {
-								$current_user   = wp_get_current_user();
-								$check_emails[] = sanitize_email( $current_user->user_email );
-								$usage_count    = sizeof( array_keys( $used_by, get_current_user_id() ) );
+							$check_emails[] = sanitize_email( $posted['billing_email'] );
+							$user           = get_user_by( 'email', $posted['billing_email'] );
+							if ( $user ) {
+								$usage_count = sizeof( array_keys( $used_by, $user->ID ) );
 							} else {
-								$check_emails[] = sanitize_email( $posted['billing_email'] );
-								$user           = get_user_by( 'email', $posted['billing_email'] );
-								if ( $user ) {
-									$usage_count = sizeof( array_keys( $used_by, $user->ID ) );
-								} else {
-									$usage_count = 0;
-								}
+								$usage_count = 0;
 							}
+						}
 
-							foreach ( $check_emails as $check_email ) {
-								$usage_count = $usage_count + sizeof( array_keys( $used_by, $check_email ) );
-							}
+						foreach ( $check_emails as $check_email ) {
+							$usage_count = $usage_count + sizeof( array_keys( $used_by, $check_email ) );
+						}
 
-							if ( $usage_count >= $coupon->usage_limit_per_user ) {
-								$coupon->add_coupon_message( WC_Coupon::E_WC_COUPON_USAGE_LIMIT_REACHED );
+						if ( $usage_count >= $coupon->get_usage_limit_per_user() ) {
+							$coupon->add_coupon_message( WC_Coupon::E_WC_COUPON_USAGE_LIMIT_REACHED );
 
-								// Remove the coupon
-								$this->remove_coupon( $code );
+							// Remove the coupon
+							$this->remove_coupon( $code );
 
-								// Flag totals for refresh
-								WC()->session->set( 'refresh_totals', true );
-							}
+							// Flag totals for refresh
+							WC()->session->set( 'refresh_totals', true );
 						}
 					}
 				}
 			}
 		}
+	}
 
-		/**
-		 * Returns whether or not a discount has been applied.
-		 *
-		 * @return bool
-		 */
-		public function has_discount( $coupon_code ) {
-			return in_array( apply_filters( 'woocommerce_coupon_code', $coupon_code ), $this->applied_coupons );
+	/**
+	 * Returns whether or not a discount has been applied.
+	 * @param string $coupon_code
+	 * @return bool
+	 */
+	public function has_discount( $coupon_code = '' ) {
+		return $coupon_code ? in_array( wc_format_coupon_code( $coupon_code ), $this->applied_coupons ) : sizeof( $this->applied_coupons ) > 0;
+	}
+
+	/**
+	 * Applies a coupon code passed to the method.
+	 *
+	 * @param string $coupon_code - The code to apply
+	 * @return bool	True if the coupon is applied, false if it does not exist or cannot be applied
+	 */
+	public function add_discount( $coupon_code ) {
+		// Coupons are globally disabled.
+		if ( ! wc_coupons_enabled() ) {
+			return false;
 		}
 
-		/**
-		 * Applies a coupon code passed to the method.
-		 *
-		 * @param string $coupon_code - The code to apply
-		 * @return bool	True if the coupon is applied, false if it does not exist or cannot be applied
-		 */
-		public function add_discount( $coupon_code ) {
-			// Coupons are globally disabled
-			if ( ! wc_coupons_enabled() ) {
-				return false;
-			}
+		// Sanitize coupon code.
+		$coupon_code = wc_format_coupon_code( $coupon_code );
 
-			// Sanitize coupon code
-			$coupon_code = apply_filters( 'woocommerce_coupon_code', $coupon_code );
+		// Get the coupon.
+		$the_coupon = new WC_Coupon( $coupon_code );
 
-			// Get the coupon
-			$the_coupon = new WC_Coupon( $coupon_code );
+		// Check it can be used with cart.
+		if ( ! $the_coupon->is_valid() ) {
+			wc_add_notice( $the_coupon->get_error_message(), 'error' );
+			return false;
+		}
 
-			// Check it can be used with cart
-			if ( ! $the_coupon->is_valid() ) {
-				wc_add_notice( $the_coupon->get_error_message(), 'error' );
-				return false;
-			}
+		// Check if applied.
+		if ( $this->has_discount( $coupon_code ) ) {
+			$the_coupon->add_coupon_message( WC_Coupon::E_WC_COUPON_ALREADY_APPLIED );
+			return false;
+		}
 
-			// Check if applied
-			if ( $this->has_discount( $coupon_code ) ) {
-				$the_coupon->add_coupon_message( WC_Coupon::E_WC_COUPON_ALREADY_APPLIED );
-				return false;
-			}
+		// If its individual use then remove other coupons.
+		if ( $the_coupon->get_individual_use() ) {
+			$coupons_to_keep = apply_filters( 'woocommerce_apply_individual_use_coupon', array(), $the_coupon, $this->applied_coupons );
 
-			// If its individual use then remove other coupons
-			if ( $the_coupon->individual_use == 'yes' ) {
-				$this->applied_coupons = apply_filters( 'woocommerce_apply_individual_use_coupon', array(), $the_coupon, $this->applied_coupons );
-			}
-
-			if ( $this->applied_coupons ) {
-				foreach ( $this->applied_coupons as $code ) {
-					$coupon = new WC_Coupon( $code );
-
-					if ( $coupon->individual_use == 'yes' && false === apply_filters( 'woocommerce_apply_with_individual_use_coupon', false, $the_coupon, $coupon, $this->applied_coupons ) ) {
-
-						// Reject new coupon
-						$coupon->add_coupon_message( WC_Coupon::E_WC_COUPON_ALREADY_APPLIED_INDIV_USE_ONLY );
-
-						return false;
-					}
+			foreach ( $this->applied_coupons as $applied_coupon ) {
+				$keep_key = array_search( $applied_coupon, $coupons_to_keep );
+				if ( false === $keep_key ) {
+					$this->remove_coupon( $applied_coupon );
+				} else {
+					unset( $coupons_to_keep[ $keep_key ] );
 				}
 			}
 
-			$this->applied_coupons[] = $coupon_code;
-
-			// Choose free shipping
-			if ( $the_coupon->enable_free_shipping() ) {
-				$packages = WC()->shipping->get_packages();
-				$chosen_shipping_methods = WC()->session->get( 'chosen_shipping_methods' );
-
-				foreach ( $packages as $i => $package ) {
-					$chosen_shipping_methods[ $i ] = 'free_shipping';
-				}
-
-				WC()->session->set( 'chosen_shipping_methods', $chosen_shipping_methods );
+			if ( ! empty( $coupons_to_keep ) ) {
+				$this->applied_coupons += $coupons_to_keep;
 			}
-
-			$the_coupon->add_coupon_message( WC_Coupon::WC_COUPON_SUCCESS );
-
-			do_action( 'woocommerce_applied_coupon', $coupon_code );
-
-			return true;
 		}
 
-		/**
-		 * Get array of applied coupon objects and codes.
-		 * @return array of applied coupons
-		 */
-		public function get_coupons( $deprecated = null ) {
-			$coupons = array();
-
-			if ( 'order' === $deprecated ) {
-				return $coupons;
-			}
-
-			foreach ( $this->get_applied_coupons() as $code ) {
+		// Check to see if an individual use coupon is set.
+		if ( $this->applied_coupons ) {
+			foreach ( $this->applied_coupons as $code ) {
 				$coupon = new WC_Coupon( $code );
-				$coupons[ $code ] = $coupon;
+
+				if ( $coupon->get_individual_use() && false === apply_filters( 'woocommerce_apply_with_individual_use_coupon', false, $the_coupon, $coupon, $this->applied_coupons ) ) {
+
+					// Reject new coupon.
+					$coupon->add_coupon_message( WC_Coupon::E_WC_COUPON_ALREADY_APPLIED_INDIV_USE_ONLY );
+
+					return false;
+				}
+			}
+		}
+
+		$this->applied_coupons[] = $coupon_code;
+
+		// Choose free shipping.
+		if ( $the_coupon->get_free_shipping() ) {
+			$packages = WC()->shipping->get_packages();
+			$chosen_shipping_methods = WC()->session->get( 'chosen_shipping_methods' );
+
+			foreach ( $packages as $i => $package ) {
+				$chosen_shipping_methods[ $i ] = 'free_shipping';
 			}
 
+			WC()->session->set( 'chosen_shipping_methods', $chosen_shipping_methods );
+		}
+
+		$the_coupon->add_coupon_message( WC_Coupon::WC_COUPON_SUCCESS );
+
+		do_action( 'woocommerce_applied_coupon', $coupon_code );
+
+		return true;
+	}
+
+	/**
+	 * Get array of applied coupon objects and codes.
+	 * @return array of applied coupons
+	 */
+	public function get_coupons( $deprecated = null ) {
+		$coupons = array();
+
+		if ( 'order' === $deprecated ) {
 			return $coupons;
 		}
 
-		/**
-		 * Gets the array of applied coupon codes.
-		 *
-		 * @return array of applied coupons
-		 */
-		public function get_applied_coupons() {
-			return $this->applied_coupons;
+		foreach ( $this->get_applied_coupons() as $code ) {
+			$coupon = new WC_Coupon( $code );
+			$coupons[ $code ] = $coupon;
 		}
 
-		/**
-		 * Get the discount amount for a used coupon.
-		 * @param  string $code coupon code
-		 * @param  bool inc or ex tax
-		 * @return float discount amount
-		 */
-		public function get_coupon_discount_amount( $code, $ex_tax = true ) {
-			$discount_amount = isset( $this->coupon_discount_amounts[ $code ] ) ? $this->coupon_discount_amounts[ $code ] : 0;
+		return $coupons;
+	}
 
-			if ( ! $ex_tax ) {
-				$discount_amount += $this->get_coupon_discount_tax_amount( $code );
-			}
+	/**
+	 * Gets the array of applied coupon codes.
+	 *
+	 * @return array of applied coupons
+	 */
+	public function get_applied_coupons() {
+		return $this->applied_coupons;
+	}
 
-			return wc_cart_round_discount( $discount_amount, $this->dp );
+	/**
+	 * Get the discount amount for a used coupon.
+	 * @param  string $code coupon code
+	 * @param  bool $ex_tax inc or ex tax
+	 * @return float discount amount
+	 */
+	public function get_coupon_discount_amount( $code, $ex_tax = true ) {
+		$discount_amount = isset( $this->coupon_discount_amounts[ $code ] ) ? $this->coupon_discount_amounts[ $code ] : 0;
+
+		if ( ! $ex_tax ) {
+			$discount_amount += $this->get_coupon_discount_tax_amount( $code );
 		}
 
-		/**
-		 * Get the discount tax amount for a used coupon (for tax inclusive prices).
-		 * @param  string $code coupon code
-		 * @param  bool inc or ex tax
-		 * @return float discount amount
-		 */
-		public function get_coupon_discount_tax_amount( $code ) {
-			return wc_cart_round_discount( isset( $this->coupon_discount_tax_amounts[ $code ] ) ? $this->coupon_discount_tax_amounts[ $code ] : 0, $this->dp );
+		return wc_cart_round_discount( $discount_amount, $this->dp );
+	}
+
+	/**
+	 * Get the discount tax amount for a used coupon (for tax inclusive prices).
+	 * @param  string $code coupon code
+	 * @param  bool inc or ex tax
+	 * @return float discount amount
+	 */
+	public function get_coupon_discount_tax_amount( $code ) {
+		return wc_cart_round_discount( isset( $this->coupon_discount_tax_amounts[ $code ] ) ? $this->coupon_discount_tax_amounts[ $code ] : 0, $this->dp );
+	}
+
+	/**
+	 * Remove coupons from the cart of a defined type. Type 1 is before tax, type 2 is after tax.
+	 */
+	public function remove_coupons( $deprecated = null ) {
+		$this->applied_coupons = $this->coupon_discount_amounts = $this->coupon_discount_tax_amounts = $this->coupon_applied_count = array();
+		WC()->session->set( 'applied_coupons', array() );
+		WC()->session->set( 'coupon_discount_amounts', array() );
+		WC()->session->set( 'coupon_discount_tax_amounts', array() );
+	}
+
+	/**
+	 * Remove a single coupon by code.
+	 * @param  string $coupon_code Code of the coupon to remove
+	 * @return bool
+	 */
+	public function remove_coupon( $coupon_code ) {
+		// Coupons are globally disabled
+		if ( ! wc_coupons_enabled() ) {
+			return false;
 		}
 
-		/**
-		 * Remove coupons from the cart of a defined type. Type 1 is before tax, type 2 is after tax.
-		 */
-		public function remove_coupons( $deprecated = null ) {
-			$this->applied_coupons = $this->coupon_discount_amounts = $this->coupon_discount_tax_amounts = $this->coupon_applied_count = array();
-			WC()->session->set( 'applied_coupons', array() );
-			WC()->session->set( 'coupon_discount_amounts', array() );
-			WC()->session->set( 'coupon_discount_tax_amounts', array() );
+		// Get the coupon
+		$coupon_code  = wc_format_coupon_code( $coupon_code );
+		$position     = array_search( $coupon_code, $this->applied_coupons );
+
+		if ( false !== $position ) {
+			unset( $this->applied_coupons[ $position ] );
 		}
 
-		/**
-		 * Remove a single coupon by code.
-		 * @param  string $coupon_code Code of the coupon to remove
-		 * @return bool
-		 */
-		public function remove_coupon( $coupon_code ) {
-			// Coupons are globally disabled
-			if ( ! wc_coupons_enabled() ) {
-				return false;
-			}
+		WC()->session->set( 'applied_coupons', $this->applied_coupons );
 
-			// Get the coupon
-			$coupon_code  = apply_filters( 'woocommerce_coupon_code', $coupon_code );
-			$position     = array_search( $coupon_code, $this->applied_coupons );
+		do_action( 'woocommerce_removed_coupon', $coupon_code );
 
-			if ( $position !== false ) {
-				unset( $this->applied_coupons[ $position ] );
-			}
+		return true;
+	}
 
-			WC()->session->set( 'applied_coupons', $this->applied_coupons );
-
-			do_action( 'woocommerce_removed_coupon', $coupon_code );
-
-			return true;
+	/**
+	 * Function to apply discounts to a product and get the discounted price (before tax is applied).
+	 *
+	 * @param mixed $values
+	 * @param mixed $price
+	 * @param bool $add_totals (default: false)
+	 * @return float price
+	 */
+	public function get_discounted_price( $values, $price, $add_totals = false ) {
+		if ( ! $price ) {
+			return $price;
 		}
 
-		/**
-		 * Function to apply discounts to a product and get the discounted price (before tax is applied).
-		 *
-		 * @param mixed $values
-		 * @param mixed $price
-		 * @param bool $add_totals (default: false)
-		 * @return float price
-		 */
-		public function get_discounted_price( $values, $price, $add_totals = false ) {
-			if ( ! $price ) {
-				return $price;
-			}
+		$undiscounted_price = $price;
 
-			$undiscounted_price = $price;
+		if ( ! empty( $this->coupons ) ) {
+			$product = $values['data'];
 
-			if ( ! empty( $this->coupons ) ) {
-				$product = $values['data'];
+			foreach ( $this->coupons as $code => $coupon ) {
+				if ( $coupon->is_valid() && ( $coupon->is_valid_for_product( $product, $values ) || $coupon->is_valid_for_cart() ) ) {
+					$discount_amount = $coupon->get_discount_amount( 'yes' === get_option( 'woocommerce_calc_discounts_sequentially', 'no' ) ? $price : $undiscounted_price, $values, true );
+					$discount_amount = min( $price, $discount_amount );
+					$price           = max( $price - $discount_amount, 0 );
 
-				foreach ( $this->coupons as $code => $coupon ) {
-					if ( $coupon->is_valid() && ( $coupon->is_valid_for_product( $product, $values ) || $coupon->is_valid_for_cart() ) ) {
-						$discount_amount = $coupon->get_discount_amount( 'yes' === get_option( 'woocommerce_calc_discounts_sequentially', 'no' ) ? $price : $undiscounted_price, $values, true );
-						$discount_amount = min( $price, $discount_amount );
-						$price           = max( $price - $discount_amount, 0 );
+					// Store the totals for DISPLAY in the cart.
+					if ( $add_totals ) {
+						$total_discount     = $discount_amount * $values['quantity'];
+						$total_discount_tax = 0;
 
-						// Store the totals for DISPLAY in the cart
-						if ( $add_totals ) {
-							$total_discount     = $discount_amount * $values['quantity'];
-							$total_discount_tax = 0;
-
-							if ( wc_tax_enabled() ) {
-								$tax_rates          = WC_Tax::get_rates( $product->get_tax_class() );
-								$taxes              = WC_Tax::calc_tax( $discount_amount, $tax_rates, $this->prices_include_tax );
-								$total_discount_tax = WC_Tax::get_tax_total( $taxes ) * $values['quantity'];
-								$total_discount     = $this->prices_include_tax ? $total_discount - $total_discount_tax : $total_discount;
-								$this->discount_cart_tax += $total_discount_tax;
-							}
-
-							$this->discount_cart     += $total_discount;
-							$this->increase_coupon_discount_amount( $code, $total_discount, $total_discount_tax );
-							$this->increase_coupon_applied_count( $code, $values['quantity'] );
+						if ( wc_tax_enabled() && $product->is_taxable() ) {
+							$tax_rates          = WC_Tax::get_rates( $product->get_tax_class() );
+							$taxes              = WC_Tax::calc_tax( $discount_amount, $tax_rates, $this->prices_include_tax );
+							$total_discount_tax = WC_Tax::get_tax_total( $taxes ) * $values['quantity'];
+							$total_discount     = $this->prices_include_tax ? $total_discount - $total_discount_tax : $total_discount;
+							$this->discount_cart_tax += $total_discount_tax;
 						}
-					}
 
-					// If the price is 0, we can stop going through coupons because there is nothing more to discount for this product.
-					if ( 0 >= $price ) {
-						break;
+						$this->discount_cart     += $total_discount;
+						$this->increase_coupon_discount_amount( $code, $total_discount, $total_discount_tax );
+						$this->increase_coupon_applied_count( $code, $values['quantity'] );
 					}
 				}
-			}
 
-			return apply_filters( 'woocommerce_get_discounted_price', $price, $values, $this );
-		}
-
-		/**
-		 * Store how much discount each coupon grants.
-		 *
-		 * @access private
-		 * @param string $code
-		 * @param double $amount
-		 * @param double $tax
-		 */
-		private function increase_coupon_discount_amount( $code, $amount, $tax ) {
-			$this->coupon_discount_amounts[ $code ]     = isset( $this->coupon_discount_amounts[ $code ] ) ? $this->coupon_discount_amounts[ $code ] + $amount : $amount;
-			$this->coupon_discount_tax_amounts[ $code ] = isset( $this->coupon_discount_tax_amounts[ $code ] ) ? $this->coupon_discount_tax_amounts[ $code ] + $tax : $tax;
-		}
-
-		/**
-		 * Store how many times each coupon is applied to cart/items.
-		 *
-		 * @access private
-		 * @param string $code
-		 * @param integer $count
-		 */
-		private function increase_coupon_applied_count( $code, $count = 1 ) {
-			if ( empty( $this->coupon_applied_count[ $code ] ) ) {
-				$this->coupon_applied_count[ $code ] = 0;
-			}
-			$this->coupon_applied_count[ $code ] += $count;
-		}
-
-	/*-----------------------------------------------------------------------------------*/
-	/* Fees API to add additional costs to orders */
-	/*-----------------------------------------------------------------------------------*/
-
-		/**
-		 * Add additional fee to the cart.
-		 *
-		 * @param string $name Unique name for the fee. Multiple fees of the same name cannot be added.
-		 * @param float $amount Fee amount.
-		 * @param bool $taxable (default: false) Is the fee taxable?
-		 * @param string $tax_class (default: '') The tax class for the fee if taxable. A blank string is standard tax class.
-		 */
-		public function add_fee( $name, $amount, $taxable = false, $tax_class = '' ) {
-
-			$new_fee_id = sanitize_title( $name );
-
-			// Only add each fee once
-			foreach ( $this->fees as $fee ) {
-				if ( $fee->id == $new_fee_id ) {
-					return;
+				// If the price is 0, we can stop going through coupons because there is nothing more to discount for this product.
+				if ( 0 >= $price ) {
+					break;
 				}
 			}
-
-			$new_fee            = new stdClass();
-			$new_fee->id        = $new_fee_id;
-			$new_fee->name      = esc_attr( $name );
-			$new_fee->amount    = (float) esc_attr( $amount );
-			$new_fee->tax_class = $tax_class;
-			$new_fee->taxable   = $taxable ? true : false;
-			$new_fee->tax       = 0;
-			$new_fee->tax_data  = array();
-			$this->fees[]       = $new_fee;
 		}
 
-		/**
-		 * get_fees function.
-		 *
-		 * @return array
-		 */
-		public function get_fees() {
-			return array_filter( (array) $this->fees );
+		return apply_filters( 'woocommerce_get_discounted_price', $price, $values, $this );
+	}
+
+	/**
+	 * Store how much discount each coupon grants.
+	 *
+	 * @access private
+	 * @param string $code
+	 * @param double $amount
+	 * @param double $tax
+	 */
+	private function increase_coupon_discount_amount( $code, $amount, $tax ) {
+		$this->coupon_discount_amounts[ $code ]     = isset( $this->coupon_discount_amounts[ $code ] ) ? $this->coupon_discount_amounts[ $code ] + $amount : $amount;
+		$this->coupon_discount_tax_amounts[ $code ] = isset( $this->coupon_discount_tax_amounts[ $code ] ) ? $this->coupon_discount_tax_amounts[ $code ] + $tax : $tax;
+	}
+
+	/**
+	 * Store how many times each coupon is applied to cart/items.
+	 *
+	 * @access private
+	 * @param string $code
+	 * @param int    $count
+	 */
+	private function increase_coupon_applied_count( $code, $count = 1 ) {
+		if ( empty( $this->coupon_applied_count[ $code ] ) ) {
+			$this->coupon_applied_count[ $code ] = 0;
+		}
+		$this->coupon_applied_count[ $code ] += $count;
+	}
+
+	/*
+	 * Fees API to add additional costs to orders.
+	 */
+
+	/**
+	 * Add additional fee to the cart.
+	 *
+	 * Fee is an amount of money charged for a particular piece of work
+	 * or for a particular right or service, and not supposed to be negative.
+	 *
+	 * @param string $name      Unique name for the fee. Multiple fees of the same name cannot be added.
+	 * @param float  $amount    Fee amount (do not enter negative amounts).
+	 * @param bool   $taxable   Is the fee taxable? (default: false).
+	 * @param string $tax_class The tax class for the fee if taxable. A blank string is standard tax class. (default: '').
+	 */
+	public function add_fee( $name, $amount, $taxable = false, $tax_class = '' ) {
+
+		$new_fee_id = sanitize_title( $name );
+
+		// Only add each fee once.
+		foreach ( $this->fees as $fee ) {
+			if ( $fee->id == $new_fee_id ) {
+				return;
+			}
 		}
 
-		/**
-		 * Calculate fees.
-		 */
-		public function calculate_fees() {
-			// Reset fees before calculation
-			$this->fee_total = 0;
-			$this->fees      = array();
+		$new_fee            = new stdClass();
+		$new_fee->id        = $new_fee_id;
+		$new_fee->name      = esc_attr( $name );
+		$new_fee->amount    = (float) esc_attr( $amount );
+		$new_fee->tax_class = $tax_class;
+		$new_fee->taxable   = $taxable ? true : false;
+		$new_fee->tax       = 0;
+		$new_fee->tax_data  = array();
+		$this->fees[]       = $new_fee;
+	}
 
-			// Fire an action where developers can add their fees
-			do_action( 'woocommerce_cart_calculate_fees', $this );
+	/**
+	 * Get fees.
+	 *
+	 * @return array
+	 */
+	public function get_fees() {
+		return array_filter( (array) $this->fees );
+	}
 
-			// If fees were added, total them and calculate tax
-			if ( ! empty( $this->fees ) ) {
-				foreach ( $this->fees as $fee_key => $fee ) {
-					$this->fee_total += $fee->amount;
+	/**
+	 * Calculate fees.
+	 */
+	public function calculate_fees() {
+		// Reset fees before calculation
+		$this->fee_total = 0;
+		$this->fees      = array();
 
-					if ( $fee->taxable ) {
-						// Get tax rates
-						$tax_rates = WC_Tax::get_rates( $fee->tax_class );
-						$fee_taxes = WC_Tax::calc_tax( $fee->amount, $tax_rates, false );
+		// Fire an action where developers can add their fees
+		do_action( 'woocommerce_cart_calculate_fees', $this );
 
-						if ( ! empty( $fee_taxes ) ) {
-							// Set the tax total for this fee
-							$this->fees[ $fee_key ]->tax = array_sum( $fee_taxes );
+		// If fees were added, total them and calculate tax
+		if ( ! empty( $this->fees ) ) {
+			foreach ( $this->fees as $fee_key => $fee ) {
+				$this->fee_total += $fee->amount;
 
-							// Set tax data - Since 2.2
-							$this->fees[ $fee_key ]->tax_data = $fee_taxes;
+				if ( $fee->taxable ) {
+					// Get tax rates
+					$tax_rates = WC_Tax::get_rates( $fee->tax_class );
+					$fee_taxes = WC_Tax::calc_tax( $fee->amount, $tax_rates, false );
 
-							// Tax rows - merge the totals we just got
-							foreach ( array_keys( $this->taxes + $fee_taxes ) as $key ) {
-								$this->taxes[ $key ] = ( isset( $fee_taxes[ $key ] ) ? $fee_taxes[ $key ] : 0 ) + ( isset( $this->taxes[ $key ] ) ? $this->taxes[ $key ] : 0 );
-							}
+					if ( ! empty( $fee_taxes ) ) {
+						// Set the tax total for this fee
+						$this->fees[ $fee_key ]->tax = array_sum( $fee_taxes );
+
+						// Set tax data - Since 2.2
+						$this->fees[ $fee_key ]->tax_data = $fee_taxes;
+
+						// Tax rows - merge the totals we just got
+						foreach ( array_keys( $this->taxes + $fee_taxes ) as $key ) {
+							$this->taxes[ $key ] = ( isset( $fee_taxes[ $key ] ) ? $fee_taxes[ $key ] : 0 ) + ( isset( $this->taxes[ $key ] ) ? $this->taxes[ $key ] : 0 );
 						}
 					}
 				}
 			}
 		}
+	}
 
-	/*-----------------------------------------------------------------------------------*/
-	/* Get Formatted Totals */
-	/*-----------------------------------------------------------------------------------*/
+	/*
+	 * Get Formatted Totals.
+	 */
 
-		/**
-		 * Gets the order total (after calculation).
-		 *
-		 * @return string formatted price
-		 */
-		public function get_total() {
-			return apply_filters( 'woocommerce_cart_total', wc_price( $this->total ) );
+	/**
+	 * Gets the order total (after calculation).
+	 *
+	 * @return string formatted price
+	 */
+	public function get_total() {
+		return apply_filters( 'woocommerce_cart_total', wc_price( $this->total ) );
+	}
+
+	/**
+	 * Gets the total excluding taxes.
+	 *
+	 * @return string formatted price
+	 */
+	public function get_total_ex_tax() {
+		$total = $this->total - $this->tax_total - $this->shipping_tax_total;
+		if ( $total < 0 ) {
+			$total = 0;
+		}
+		return apply_filters( 'woocommerce_cart_total_ex_tax', wc_price( $total ) );
+	}
+
+	/**
+	 * Gets the cart contents total (after calculation).
+	 *
+	 * @todo deprecate? It's unused.
+	 * @return string formatted price
+	 */
+	public function get_cart_total() {
+		if ( ! $this->prices_include_tax ) {
+			$cart_contents_total = wc_price( $this->cart_contents_total );
+		} else {
+			$cart_contents_total = wc_price( $this->cart_contents_total + $this->tax_total );
 		}
 
-		/**
-		 * Gets the total excluding taxes.
-		 *
-		 * @return string formatted price
-		 */
-		public function get_total_ex_tax() {
-			$total = $this->total - $this->tax_total - $this->shipping_tax_total;
-			if ( $total < 0 ) {
-				$total = 0;
-			}
-			return apply_filters( 'woocommerce_cart_total_ex_tax', wc_price( $total ) );
-		}
+		return apply_filters( 'woocommerce_cart_contents_total', $cart_contents_total );
+	}
 
-		/**
-		 * Gets the cart contents total (after calculation).
-		 *
-		 * @return string formatted price
-		 */
-		public function get_cart_total() {
-			if ( ! $this->prices_include_tax ) {
-				$cart_contents_total = wc_price( $this->cart_contents_total );
-			} else {
-				$cart_contents_total = wc_price( $this->cart_contents_total + $this->tax_total );
-			}
+	/**
+	 * Gets the sub total (after calculation).
+	 *
+	 * @param bool $compound whether to include compound taxes
+	 * @return string formatted price
+	 */
+	public function get_cart_subtotal( $compound = false ) {
 
-			return apply_filters( 'woocommerce_cart_contents_total', $cart_contents_total );
-		}
+		// If the cart has compound tax, we want to show the subtotal as
+		// cart + shipping + non-compound taxes (after discount)
+		if ( $compound ) {
 
-		/**
-		 * Gets the sub total (after calculation).
-		 *
-		 * @params bool whether to include compound taxes
-		 * @return string formatted price
-		 */
-		public function get_cart_subtotal( $compound = false ) {
+			$cart_subtotal = wc_price( $this->cart_contents_total + $this->shipping_total + $this->get_taxes_total( false, false ) );
 
-			// If the cart has compound tax, we want to show the subtotal as
-			// cart + shipping + non-compound taxes (after discount)
-			if ( $compound ) {
+		// Otherwise we show cart items totals only (before discount)
+		} else {
 
-				$cart_subtotal = wc_price( $this->cart_contents_total + $this->shipping_total + $this->get_taxes_total( false, false ) );
+			// Display varies depending on settings
+			if ( 'excl' === $this->tax_display_cart ) {
 
-			// Otherwise we show cart items totals only (before discount)
+				$cart_subtotal = wc_price( $this->subtotal_ex_tax );
+
+				if ( $this->tax_total > 0 && $this->prices_include_tax ) {
+					$cart_subtotal .= ' <small class="tax_label">' . WC()->countries->ex_tax_or_vat() . '</small>';
+				}
 			} else {
 
-				// Display varies depending on settings
-				if ( $this->tax_display_cart == 'excl' ) {
-
-					$cart_subtotal = wc_price( $this->subtotal_ex_tax );
-
-					if ( $this->tax_total > 0 && $this->prices_include_tax ) {
-						$cart_subtotal .= ' <small class="tax_label">' . WC()->countries->ex_tax_or_vat() . '</small>';
-					}
-
-				} else {
-
-					$cart_subtotal = wc_price( $this->subtotal );
-
-					if ( $this->tax_total > 0 && !$this->prices_include_tax ) {
-						$cart_subtotal .= ' <small class="tax_label">' . WC()->countries->inc_tax_or_vat() . '</small>';
-					}
+				$cart_subtotal = wc_price( $this->subtotal );
 
+				if ( $this->tax_total > 0 && ! $this->prices_include_tax ) {
+					$cart_subtotal .= ' <small class="tax_label">' . WC()->countries->inc_tax_or_vat() . '</small>';
 				}
 			}
-
-			return apply_filters( 'woocommerce_cart_subtotal', $cart_subtotal, $compound, $this );
 		}
 
-		/**
-		 * Get the product row price per item.
-		 *
-		 * @param WC_Product $_product
-		 * @return string formatted price
-		 */
-		public function get_product_price( $_product ) {
-			if ( $this->tax_display_cart == 'excl' ) {
-				$product_price = $_product->get_price_excluding_tax();
-			} else {
-				$product_price = $_product->get_price_including_tax();
-			}
+		return apply_filters( 'woocommerce_cart_subtotal', $cart_subtotal, $compound, $this );
+	}
 
-			return apply_filters( 'woocommerce_cart_product_price', wc_price( $product_price ), $_product );
+	/**
+	 * Get the product row price per item.
+	 *
+	 * @param WC_Product $product
+	 * @return string formatted price
+	 */
+	public function get_product_price( $product ) {
+		if ( 'excl' === $this->tax_display_cart ) {
+			$product_price = wc_get_price_excluding_tax( $product );
+		} else {
+			$product_price = wc_get_price_including_tax( $product );
 		}
+		return apply_filters( 'woocommerce_cart_product_price', wc_price( $product_price ), $product );
+	}
 
-		/**
-		 * Get the product row subtotal.
-		 *
-		 * Gets the tax etc to avoid rounding issues.
-		 *
-		 * When on the checkout (review order), this will get the subtotal based on the customer's tax rate rather than the base rate.
-		 *
-		 * @param WC_Product $_product
-		 * @param int quantity
-		 * @return string formatted price
-		 */
-		public function get_product_subtotal( $_product, $quantity ) {
+	/**
+	 * Get the product row subtotal.
+	 *
+	 * Gets the tax etc to avoid rounding issues.
+	 *
+	 * When on the checkout (review order), this will get the subtotal based on the customer's tax rate rather than the base rate.
+	 *
+	 * @param WC_Product $product
+	 * @param int $quantity
+	 * @return string formatted price
+	 */
+	public function get_product_subtotal( $product, $quantity ) {
+		$price   = $product->get_price();
+		$taxable = $product->is_taxable();
 
-			$price 			= $_product->get_price();
-			$taxable 		= $_product->is_taxable();
+		// Taxable
+		if ( $taxable ) {
 
-			// Taxable
-			if ( $taxable ) {
+			if ( 'excl' === $this->tax_display_cart ) {
 
-				if ( $this->tax_display_cart == 'excl' ) {
-
-					$row_price        = $_product->get_price_excluding_tax( $quantity );
-					$product_subtotal = wc_price( $row_price );
-
-					if ( $this->prices_include_tax && $this->tax_total > 0 ) {
-						$product_subtotal .= ' <small class="tax_label">' . WC()->countries->ex_tax_or_vat() . '</small>';
-					}
-
-				} else {
-
-					$row_price        = $_product->get_price_including_tax( $quantity );
-					$product_subtotal = wc_price( $row_price );
-
-					if ( ! $this->prices_include_tax && $this->tax_total > 0 ) {
-						$product_subtotal .= ' <small class="tax_label">' . WC()->countries->inc_tax_or_vat() . '</small>';
-					}
-
-				}
-
-			// Non-taxable
-			} else {
-
-				$row_price        = $price * $quantity;
+				$row_price        = wc_get_price_excluding_tax( $product, array( 'qty' => $quantity ) );
 				$product_subtotal = wc_price( $row_price );
 
-			}
-
-			return apply_filters( 'woocommerce_cart_product_subtotal', $product_subtotal, $_product, $quantity, $this );
-		}
-
-		/**
-		 * Gets the cart tax (after calculation).
-		 *
-		 * @return string formatted price
-		 */
-		public function get_cart_tax() {
-			$cart_total_tax = wc_round_tax_total( $this->tax_total + $this->shipping_tax_total );
-
-			return apply_filters( 'woocommerce_get_cart_tax', $cart_total_tax ? wc_price( $cart_total_tax ) : '' );
-		}
-
-		/**
-		 * Get a tax amount.
-		 * @param  string $tax_rate_id
-		 * @return float amount
-		 */
-		public function get_tax_amount( $tax_rate_id ) {
-			return isset( $this->taxes[ $tax_rate_id ] ) ? $this->taxes[ $tax_rate_id ] : 0;
-		}
-
-		/**
-		 * Get a tax amount.
-		 * @param  string $tax_rate_id
-		 * @return float amount
-		 */
-		public function get_shipping_tax_amount( $tax_rate_id ) {
-			return isset( $this->shipping_taxes[ $tax_rate_id ] ) ? $this->shipping_taxes[ $tax_rate_id ] : 0;
-		}
-
-		/**
-		 * Get tax row amounts with or without compound taxes includes.
-		 *
-		 * @param  boolean $compound True if getting compound taxes
-		 * @param  boolean $display  True if getting total to display
-		 * @return float price
-		 */
-		public function get_taxes_total( $compound = true, $display = true ) {
-			$total = 0;
-			foreach ( $this->taxes as $key => $tax ) {
-				if ( ! $compound && WC_Tax::is_compound( $key ) ) continue;
-				$total += $tax;
-			}
-			foreach ( $this->shipping_taxes as $key => $tax ) {
-				if ( ! $compound && WC_Tax::is_compound( $key ) ) continue;
-				$total += $tax;
-			}
-			if ( $display ) {
-				$total = wc_round_tax_total( $total );
-			}
-			return apply_filters( 'woocommerce_cart_taxes_total', $total, $compound, $display, $this );
-		}
-
-		/**
-		 * Get the total of all cart discounts.
-		 *
-		 * @return float
-		 */
-		public function get_cart_discount_total() {
-			return wc_cart_round_discount( $this->discount_cart, $this->dp );
-		}
-
-		/**
-		 * Get the total of all cart tax discounts (used for discounts on tax inclusive prices).
-		 *
-		 * @return float
-		 */
-		public function get_cart_discount_tax_total() {
-			return wc_cart_round_discount( $this->discount_cart_tax, $this->dp );
-		}
-
-		/**
-		 * Gets the total discount amount - both kinds.
-		 *
-		 * @return mixed formatted price or false if there are none
-		 */
-		public function get_total_discount() {
-			if ( $this->get_cart_discount_total() ) {
-				$total_discount = wc_price( $this->get_cart_discount_total() );
+				if ( $this->prices_include_tax && $this->tax_total > 0 ) {
+					$product_subtotal .= ' <small class="tax_label">' . WC()->countries->ex_tax_or_vat() . '</small>';
+				}
 			} else {
-				$total_discount = false;
+
+				$row_price        = wc_get_price_including_tax( $product, array( 'qty' => $quantity ) );
+				$product_subtotal = wc_price( $row_price );
+
+				if ( ! $this->prices_include_tax && $this->tax_total > 0 ) {
+					$product_subtotal .= ' <small class="tax_label">' . WC()->countries->inc_tax_or_vat() . '</small>';
+				}
 			}
-			return apply_filters( 'woocommerce_cart_total_discount', $total_discount, $this );
+
+		// Non-taxable
+		} else {
+
+			$row_price        = $price * $quantity;
+			$product_subtotal = wc_price( $row_price );
+
 		}
 
-		/**
-		 * Gets the total (product) discount amount - these are applied before tax.
-		 *
-		 * @deprecated Order discounts (after tax) removed in 2.3 so multiple methods for discounts are no longer required.
-		 * @return mixed formatted price or false if there are none
-		 */
-		public function get_discounts_before_tax() {
-			_deprecated_function( 'get_discounts_before_tax', '2.3', 'get_total_discount' );
-			if ( $this->get_cart_discount_total() ) {
-				$discounts_before_tax = wc_price( $this->get_cart_discount_total() );
-			} else {
-				$discounts_before_tax = false;
+		return apply_filters( 'woocommerce_cart_product_subtotal', $product_subtotal, $product, $quantity, $this );
+	}
+
+	/**
+	 * Gets the cart tax (after calculation).
+	 *
+	 * @return string formatted price
+	 */
+	public function get_cart_tax() {
+		$cart_total_tax = wc_round_tax_total( $this->tax_total + $this->shipping_tax_total );
+
+		return apply_filters( 'woocommerce_get_cart_tax', $cart_total_tax ? wc_price( $cart_total_tax ) : '' );
+	}
+
+	/**
+	 * Get a tax amount.
+	 * @param  string $tax_rate_id
+	 * @return float amount
+	 */
+	public function get_tax_amount( $tax_rate_id ) {
+		return isset( $this->taxes[ $tax_rate_id ] ) ? $this->taxes[ $tax_rate_id ] : 0;
+	}
+
+	/**
+	 * Get a tax amount.
+	 * @param  string $tax_rate_id
+	 * @return float amount
+	 */
+	public function get_shipping_tax_amount( $tax_rate_id ) {
+		return isset( $this->shipping_taxes[ $tax_rate_id ] ) ? $this->shipping_taxes[ $tax_rate_id ] : 0;
+	}
+
+	/**
+	 * Get tax row amounts with or without compound taxes includes.
+	 *
+	 * @param  bool $compound True if getting compound taxes
+	 * @param  bool $display  True if getting total to display
+	 * @return float price
+	 */
+	public function get_taxes_total( $compound = true, $display = true ) {
+		$total = 0;
+		foreach ( $this->taxes as $key => $tax ) {
+			if ( ! $compound && WC_Tax::is_compound( $key ) ) {
+				continue;
 			}
-			return apply_filters( 'woocommerce_cart_discounts_before_tax', $discounts_before_tax, $this );
+			$total += $tax;
 		}
+		foreach ( $this->shipping_taxes as $key => $tax ) {
+			if ( ! $compound && WC_Tax::is_compound( $key ) ) {
+				continue;
+			}
+			$total += $tax;
+		}
+		if ( $display ) {
+			$total = wc_round_tax_total( $total );
+		}
+		return apply_filters( 'woocommerce_cart_taxes_total', $total, $compound, $display, $this );
+	}
 
-		/**
-		 * Get the total of all order discounts (after tax discounts).
-		 *
-		 * @deprecated Order discounts (after tax) removed in 2.3
-		 * @return integer
-		 */
-		public function get_order_discount_total() {
-			_deprecated_function( 'get_order_discount_total', '2.3' );
-			return 0;
-		}
+	/**
+	 * Get the total of all cart discounts.
+	 *
+	 * @return float
+	 */
+	public function get_cart_discount_total() {
+		return wc_cart_round_discount( $this->discount_cart, $this->dp );
+	}
 
-		/**
-		 * Function to apply cart discounts after tax.
- 		 * @deprecated Coupons can not be applied after tax
-		 */
-		public function apply_cart_discounts_after_tax( $values, $price ) {
-			_deprecated_function( 'apply_cart_discounts_after_tax', '2.3' );
-		}
+	/**
+	 * Get the total of all cart tax discounts (used for discounts on tax inclusive prices).
+	 *
+	 * @return float
+	 */
+	public function get_cart_discount_tax_total() {
+		return wc_cart_round_discount( $this->discount_cart_tax, $this->dp );
+	}
 
-		/**
-		 * Function to apply product discounts after tax.
-		 * @deprecated Coupons can not be applied after tax
-		 */
-		public function apply_product_discounts_after_tax( $values, $price ) {
-			_deprecated_function( 'apply_product_discounts_after_tax', '2.3' );
+	/**
+	 * Gets the total discount amount - both kinds.
+	 *
+	 * @return mixed formatted price or false if there are none
+	 */
+	public function get_total_discount() {
+		if ( $this->get_cart_discount_total() ) {
+			$total_discount = wc_price( $this->get_cart_discount_total() );
+		} else {
+			$total_discount = false;
 		}
+		return apply_filters( 'woocommerce_cart_total_discount', $total_discount, $this );
+	}
 
-		/**
-		 * Gets the order discount amount - these are applied after tax.
-		 * @deprecated Coupons can not be applied after tax
-		 */
-		public function get_discounts_after_tax() {
-			_deprecated_function( 'get_discounts_after_tax', '2.3' );
+	/**
+	 * Gets the total (product) discount amount - these are applied before tax.
+	 *
+	 * @deprecated Order discounts (after tax) removed in 2.3 so multiple methods for discounts are no longer required.
+	 * @return mixed formatted price or false if there are none
+	 */
+	public function get_discounts_before_tax() {
+		wc_deprecated_function( 'get_discounts_before_tax', '2.3', 'get_total_discount' );
+		if ( $this->get_cart_discount_total() ) {
+			$discounts_before_tax = wc_price( $this->get_cart_discount_total() );
+		} else {
+			$discounts_before_tax = false;
 		}
+		return apply_filters( 'woocommerce_cart_discounts_before_tax', $discounts_before_tax, $this );
+	}
+
+	/**
+	 * Get the total of all order discounts (after tax discounts).
+	 *
+	 * @deprecated Order discounts (after tax) removed in 2.3
+	 * @return int
+	 */
+	public function get_order_discount_total() {
+		wc_deprecated_function( 'get_order_discount_total', '2.3' );
+		return 0;
+	}
+
+	/**
+	 * Function to apply cart discounts after tax.
+	 * @deprecated Coupons can not be applied after tax
+	 */
+	public function apply_cart_discounts_after_tax( $values, $price ) {
+		wc_deprecated_function( 'apply_cart_discounts_after_tax', '2.3' );
+	}
+
+	/**
+	 * Function to apply product discounts after tax.
+	 * @deprecated Coupons can not be applied after tax
+	 */
+	public function apply_product_discounts_after_tax( $values, $price ) {
+		wc_deprecated_function( 'apply_product_discounts_after_tax', '2.3' );
+	}
+
+	/**
+	 * Gets the order discount amount - these are applied after tax.
+	 * @deprecated Coupons can not be applied after tax
+	 */
+	public function get_discounts_after_tax() {
+		wc_deprecated_function( 'get_discounts_after_tax', '2.3' );
+	}
 }
diff --git a/includes/class-wc-checkout.php b/includes/class-wc-checkout.php
index eaca7f582d8..e134564ed1b 100644
--- a/includes/class-wc-checkout.php
+++ b/includes/class-wc-checkout.php
@@ -1,343 +1,908 @@
 <?php
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
 /**
- * Checkout
+ * Main checkout class.
  *
  * The WooCommerce checkout class handles the checkout process, collecting user data and processing the payment.
  *
- * @class 		WC_Checkout
- * @version		2.1.0
- * @package		WooCommerce/Classes
- * @category		Class
- * @author 		WooThemes
+ * @class    WC_Checkout
+ * @package  WooCommerce/Classes
+ * @category Class
+ * @author   WooThemes
  */
 class WC_Checkout {
 
-	/** @var array Array of posted form data. */
-	public $posted;
-
-	/** @var array Array of fields to display on the checkout. */
-	public $checkout_fields;
-
-	/** @var bool Whether or not the user must create an account to checkout. */
-	public $must_create_account;
-
-	/** @var bool Whether or not signups are allowed. */
-	public $enable_signup;
-
-	/** @var object The shipping method being used. */
-	private $shipping_method;
-
-	/** @var WC_Payment_Gateway|string The payment gateway being used. */
-	private $payment_method;
-
-	/** @var int ID of customer. */
-	private $customer_id;
-
-	/** @var array Where shipping_methods are stored. */
-	public $shipping_methods;
-
 	/**
-	 * @var WC_Checkout The single instance of the class
-	 * @since 2.1
-	 */
-	protected static $_instance = null;
-
-	/** @var Bool */
-	public $enable_guest_checkout;
-
-	/**
-	 * Main WC_Checkout Instance.
+	 * The single instance of the class.
 	 *
-	 * Ensures only one instance of WC_Checkout is loaded or can be loaded.
+	 * @var WC_Checkout|null
+	 */
+	protected static $instance = null;
+
+	/**
+	 * Checkout fields are stored here.
+	 *
+	 * @var array|null
+	 */
+	protected $fields = null;
+
+	/**
+	 * Holds posted data for backwards compatibility.
+	 * @var array
+	 */
+	protected $legacy_posted_data = array();
+
+	/**
+	 * Gets the main WC_Checkout Instance.
 	 *
 	 * @since 2.1
 	 * @static
 	 * @return WC_Checkout Main instance
 	 */
 	public static function instance() {
-		if ( is_null( self::$_instance ) )
-			self::$_instance = new self();
-		return self::$_instance;
+		if ( is_null( self::$instance ) ) {
+			self::$instance = new self();
+
+			// Hook in actions once.
+			add_action( 'woocommerce_checkout_billing', array( self::$instance, 'checkout_form_billing' ) );
+			add_action( 'woocommerce_checkout_shipping', array( self::$instance, 'checkout_form_shipping' ) );
+
+			// woocommerce_checkout_init action is ran once when the class is first constructed.
+			do_action( 'woocommerce_checkout_init', self::$instance );
+		}
+		return self::$instance;
+	}
+
+	/**
+	 * See if variable is set. Used to support legacy public variables which are no longer defined.
+	 *
+	 * @param string $key
+	 * @return bool
+	 */
+	public function __isset( $key ) {
+		return in_array( $key, array(
+			'enable_signup',
+			'enable_guest_checkout',
+			'must_create_account',
+			'checkout_fields',
+			'posted',
+			'shipping_method',
+			'payment_method',
+			'customer_id',
+			'shipping_methods',
+		) );
+	}
+
+	/**
+	 * Sets the legacy public variables for backwards compatibility.
+	 *
+	 * @param string $key
+	 * @param mixed $value
+	 */
+	public function __set( $key, $value ) {
+		switch ( $key ) {
+			case 'enable_signup' :
+				$bool_value = wc_string_to_bool( $value );
+
+				if ( $bool_value !== $this->is_registration_enabled() ) {
+					remove_filter( 'woocommerce_checkout_registration_enabled', '__return_true', 0 );
+					remove_filter( 'woocommerce_checkout_registration_enabled', '__return_false', 0 );
+					add_filter( 'woocommerce_checkout_registration_enabled', $bool_value ? '__return_true' : '__return_false', 0 );
+				}
+				break;
+			case 'enable_guest_checkout' :
+				$bool_value = wc_string_to_bool( $value );
+
+				if ( $bool_value === $this->is_registration_required() ) {
+					remove_filter( 'woocommerce_checkout_registration_required', '__return_true', 0 );
+					remove_filter( 'woocommerce_checkout_registration_required', '__return_false', 0 );
+					add_filter( 'woocommerce_checkout_registration_required', $bool_value ? '__return_false' : '__return_true', 0 );
+				}
+				break;
+			case 'checkout_fields' :
+				$this->fields = $value;
+				break;
+			case 'shipping_methods' :
+				WC()->session->set( 'chosen_shipping_methods', $value );
+				break;
+			case 'posted' :
+				$this->legacy_posted_data = $value;
+				break;
+		}
+	}
+
+	/**
+	 * Gets the legacy public variables for backwards compatibility.
+	 *
+	 * @param string $key
+	 * @return string
+	 */
+	public function __get( $key ) {
+		if ( in_array( $key, array( 'posted', 'shipping_method', 'payment_method' ) ) && empty( $this->legacy_posted_data ) ) {
+			$this->legacy_posted_data = $this->get_posted_data();
+		}
+		switch ( $key ) {
+			case 'enable_signup' :
+				return $this->is_registration_enabled();
+			case 'enable_guest_checkout' :
+				return ! $this->is_registration_required();
+			case 'must_create_account' :
+				return $this->is_registration_required() && ! is_user_logged_in();
+			case 'checkout_fields' :
+				return $this->get_checkout_fields();
+			case 'posted' :
+				wc_doing_it_wrong( 'WC_Checkout->posted', 'Use $_POST directly.', '3.0.0' );
+				return $this->legacy_posted_data;
+			case 'shipping_method' :
+				return $this->legacy_posted_data['shipping_method'];
+			case 'payment_method' :
+				return $this->legacy_posted_data['payment_method'];
+			case 'customer_id' :
+				return apply_filters( 'woocommerce_checkout_customer_id', get_current_user_id() );
+			case 'shipping_methods' :
+				return (array) WC()->session->get( 'chosen_shipping_methods' );
+		}
 	}
 
 	/**
 	 * Cloning is forbidden.
-	 *
-	 * @since 2.1
 	 */
 	public function __clone() {
-		_doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'woocommerce' ), '2.1' );
+		wc_doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'woocommerce' ), '2.1' );
 	}
 
 	/**
 	 * Unserializing instances of this class is forbidden.
-	 *
-	 * @since 2.1
 	 */
 	public function __wakeup() {
-		_doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'woocommerce' ), '2.1' );
+		wc_doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'woocommerce' ), '2.1' );
 	}
 
 	/**
-	 * Constructor for the checkout class. Hooks in methods and defines checkout fields.
+	 * Is registration required to checkout?
 	 *
-	 * @access public
+	 * @since  3.0.0
+	 * @return boolean
 	 */
-	public function __construct () {
-		add_action( 'woocommerce_checkout_billing', array( $this,'checkout_form_billing' ) );
-		add_action( 'woocommerce_checkout_shipping', array( $this,'checkout_form_shipping' ) );
-
-		$this->enable_signup         = get_option( 'woocommerce_enable_signup_and_login_from_checkout' ) == 'yes' ? true : false;
-		$this->enable_guest_checkout = get_option( 'woocommerce_enable_guest_checkout' ) == 'yes' ? true : false;
-		$this->must_create_account   = $this->enable_guest_checkout || is_user_logged_in() ? false : true;
-
-		// Define all Checkout fields
-		$this->checkout_fields['billing'] 	= WC()->countries->get_address_fields( $this->get_value( 'billing_country' ), 'billing_' );
-		$this->checkout_fields['shipping'] 	= WC()->countries->get_address_fields( $this->get_value( 'shipping_country' ), 'shipping_' );
-
-		if ( get_option( 'woocommerce_registration_generate_username' ) == 'no' ) {
-			$this->checkout_fields['account']['account_username'] = array(
-				'type' 			=> 'text',
-				'label' 		=> __( 'Account username', 'woocommerce' ),
-				'required'      => true,
-				'placeholder' 	=> _x( 'Username', 'placeholder', 'woocommerce' )
-			);
-		}
-
-		if ( get_option( 'woocommerce_registration_generate_password' ) == 'no' ) {
-			$this->checkout_fields['account']['account_password'] = array(
-				'type' 				=> 'password',
-				'label' 			=> __( 'Account password', 'woocommerce' ),
-				'required'          => true,
-				'placeholder' 		=> _x( 'Password', 'placeholder', 'woocommerce' )
-			);
-		}
-
-		$this->checkout_fields['order']	= array(
-			'order_comments' => array(
-				'type' => 'textarea',
-				'class' => array('notes'),
-				'label' => __( 'Order Notes', 'woocommerce' ),
-				'placeholder' => _x('Notes about your order, e.g. special notes for delivery.', 'placeholder', 'woocommerce')
-			)
-		);
-
-		$this->checkout_fields = apply_filters( 'woocommerce_checkout_fields', $this->checkout_fields );
-
-		do_action( 'woocommerce_checkout_init', $this );
+	public function is_registration_required() {
+		return apply_filters( 'woocommerce_checkout_registration_required', 'yes' !== get_option( 'woocommerce_enable_guest_checkout' ) );
 	}
 
 	/**
-	 * Checkout process.
+	 * Is registration enabled on the checkout page?
+	 *
+	 * @since  3.0.0
+	 * @return boolean
+	 */
+	public function is_registration_enabled() {
+		return apply_filters( 'woocommerce_checkout_registration_enabled', 'yes' === get_option( 'woocommerce_enable_signup_and_login_from_checkout' ) );
+	}
+
+	/**
+	 * Get an array of checkout fields.
+	 *
+	 * @param  string $fieldset to get.
+	 * @return array
+	 */
+	public function get_checkout_fields( $fieldset = '' ) {
+		if ( is_null( $this->fields ) ) {
+			$this->fields = array(
+				'billing'  => WC()->countries->get_address_fields( $this->get_value( 'billing_country' ), 'billing_' ),
+				'shipping' => WC()->countries->get_address_fields( $this->get_value( 'shipping_country' ), 'shipping_' ),
+				'account'  => array(),
+				'order'    => array(
+					'order_comments' => array(
+						'type'        => 'textarea',
+						'class'       => array( 'notes' ),
+						'label'       => __( 'Order notes', 'woocommerce' ),
+						'placeholder' => esc_attr__( 'Notes about your order, e.g. special notes for delivery.', 'woocommerce' ),
+					),
+				),
+			);
+			if ( 'no' === get_option( 'woocommerce_registration_generate_username' ) ) {
+				$this->fields['account']['account_username'] = array(
+					'type'         => 'text',
+					'label'        => __( 'Account username', 'woocommerce' ),
+					'required'     => true,
+					'placeholder'  => esc_attr__( 'Username', 'woocommerce' ),
+				);
+			}
+
+			if ( 'no' === get_option( 'woocommerce_registration_generate_password' ) ) {
+				$this->fields['account']['account_password'] = array(
+					'type'         => 'password',
+					'label'        => __( 'Account password', 'woocommerce' ),
+					'required'     => true,
+					'placeholder'  => esc_attr__( 'Password', 'woocommerce' ),
+				);
+			}
+
+			$this->fields = apply_filters( 'woocommerce_checkout_fields', $this->fields );
+		}
+		if ( $fieldset ) {
+			return $this->fields[ $fieldset ];
+		} else {
+			return $this->fields;
+		}
+	}
+
+	/**
+	 * When we process the checkout, lets ensure cart items are rechecked to prevent checkout.
 	 */
 	public function check_cart_items() {
-		// When we process the checkout, lets ensure cart items are rechecked to prevent checkout
-		do_action('woocommerce_check_cart_items');
+		do_action( 'woocommerce_check_cart_items' );
 	}
 
 	/**
-	 * Output the billing information form.
+	 * Output the billing form.
 	 */
 	public function checkout_form_billing() {
 		wc_get_template( 'checkout/form-billing.php', array( 'checkout' => $this ) );
 	}
 
 	/**
-	 * Output the shipping information form.
+	 * Output the shipping form.
 	 */
 	public function checkout_form_shipping() {
 		wc_get_template( 'checkout/form-shipping.php', array( 'checkout' => $this ) );
 	}
 
 	/**
-	 * Create an order.
+	 * Create an order. Error codes:
+	 * 		520 - Cannot insert order into the database.
+	 * 		521 - Cannot get order after creation.
+	 * 		522 - Cannot update order.
+	 * 		525 - Cannot create line item.
+	 * 		526 - Cannot create fee item.
+	 * 		527 - Cannot create shipping item.
+	 * 		528 - Cannot create tax item.
+	 * 		529 - Cannot create coupon item.
 	 *
-	 * Error codes:
-	 * 		400 - Cannot insert order into the database.
-	 * 		401 - Cannote update existing order.
-	 * 		402 - Cannot create line item.
-	 * 		403 - Cannot create fee item.
-	 * 		404 - Cannot create shipping item.
-	 * 		405 - Cannot create tax item.
-	 * 		406 - Cannot create coupon item.
-	 *
-	 * @access public
 	 * @throws Exception
+	 * @param  $data Posted data.
 	 * @return int|WP_ERROR
 	 */
-	public function create_order() {
-		global $wpdb;
-
-		// Give plugins the opportunity to create an order themselves
+	public function create_order( $data ) {
+		// Give plugins the opportunity to create an order themselves.
 		if ( $order_id = apply_filters( 'woocommerce_create_order', null, $this ) ) {
 			return $order_id;
 		}
 
 		try {
-			// Start transaction if available
-			wc_transaction_query( 'start' );
+			$order_id           = absint( WC()->session->get( 'order_awaiting_payment' ) );
+			$cart_hash          = md5( json_encode( wc_clean( WC()->cart->get_cart_for_session() ) ) . WC()->cart->total );
+			$available_gateways = WC()->payment_gateways->get_available_payment_gateways();
 
-			$order_data = array(
-				'status'        => apply_filters( 'woocommerce_default_order_status', 'pending' ),
-				'customer_id'   => $this->customer_id,
-				'customer_note' => isset( $this->posted['order_comments'] ) ? $this->posted['order_comments'] : '',
-				'created_via'   => 'checkout'
-			);
-
-			// Insert or update the post data
-			$order_id = absint( WC()->session->order_awaiting_payment );
-
-			// Resume the unpaid order if its pending
-			if ( $order_id > 0 && ( $order = wc_get_order( $order_id ) ) && $order->has_status( array( 'pending', 'failed' ) ) ) {
-
-				$order_data['order_id'] = $order_id;
-				$order                  = wc_update_order( $order_data );
-
-				if ( is_wp_error( $order ) ) {
-					throw new Exception( sprintf( __( 'Error %d: Unable to create order. Please try again.', 'woocommerce' ), 401 ) );
-				} else {
-					$order->remove_order_items();
-					do_action( 'woocommerce_resume_order', $order_id );
-				}
+			/**
+			 * If there is an order pending payment, we can resume it here so
+			 * long as it has not changed. If the order has changed, i.e.
+			 * different items or cost, create a new order. We use a hash to
+			 * detect changes which is based on cart items + order total.
+			 */
+			if ( $order_id && ( $order = wc_get_order( $order_id ) ) && $order->has_cart_hash( $cart_hash ) && $order->has_status( array( 'pending', 'failed' ) ) ) {
+				// Action for 3rd parties.
+				do_action( 'woocommerce_resume_order', $order_id );
 
+				// Remove all items - we will re-add them later.
+				$order->remove_order_items();
 			} else {
+				$order = new WC_Order();
+			}
 
-				$order = wc_create_order( $order_data );
+			foreach ( $data as $key => $value ) {
+				if ( is_callable( array( $order, "set_{$key}" ) ) ) {
+					$order->{"set_{$key}"}( $value );
 
-				if ( is_wp_error( $order ) ) {
-					throw new Exception( sprintf( __( 'Error %d: Unable to create order. Please try again.', 'woocommerce' ), 400 ) );
-				} else {
-					$order_id = $order->id;
-					do_action( 'woocommerce_new_order', $order_id );
+				// Store custom fields prefixed with wither shipping_ or billing_. This is for backwards compatibility with 2.6.x.
+				} elseif ( 0 === stripos( $key, 'billing_' ) || 0 === stripos( $key, 'shipping_' ) ) {
+					$order->update_meta_data( '_' . $key, $value );
 				}
 			}
 
-			// Store the line items to the new/resumed order
-			foreach ( WC()->cart->get_cart() as $cart_item_key => $values ) {
-				$item_id = $order->add_product(
-					$values['data'],
-					$values['quantity'],
-					array(
-						'variation' => $values['variation'],
-						'totals'    => array(
-							'subtotal'     => $values['line_subtotal'],
-							'subtotal_tax' => $values['line_subtotal_tax'],
-							'total'        => $values['line_total'],
-							'tax'          => $values['line_tax'],
-							'tax_data'     => $values['line_tax_data'] // Since 2.2
-						)
-					)
-				);
-
-				if ( ! $item_id ) {
-					throw new Exception( sprintf( __( 'Error %d: Unable to create order. Please try again.', 'woocommerce' ), 402 ) );
-				}
-
-				// Allow plugins to add order item meta
-				do_action( 'woocommerce_add_order_item_meta', $item_id, $values, $cart_item_key );
-			}
-
-			// Store fees
-			foreach ( WC()->cart->get_fees() as $fee_key => $fee ) {
-				$item_id = $order->add_fee( $fee );
-
-				if ( ! $item_id ) {
-					throw new Exception( sprintf( __( 'Error %d: Unable to create order. Please try again.', 'woocommerce' ), 403 ) );
-				}
-
-				// Allow plugins to add order item meta to fees
-				do_action( 'woocommerce_add_order_fee_meta', $order_id, $item_id, $fee, $fee_key );
-			}
-
-			// Store shipping for all packages
-			foreach ( WC()->shipping->get_packages() as $package_key => $package ) {
-				if ( isset( $package['rates'][ $this->shipping_methods[ $package_key ] ] ) ) {
-					$item_id = $order->add_shipping( $package['rates'][ $this->shipping_methods[ $package_key ] ] );
-
-					if ( ! $item_id ) {
-						throw new Exception( sprintf( __( 'Error %d: Unable to create order. Please try again.', 'woocommerce' ), 404 ) );
-					}
-
-					// Allows plugins to add order item meta to shipping
-					do_action( 'woocommerce_add_shipping_order_item', $order_id, $item_id, $package_key );
-				}
-			}
-
-			// Store tax rows
-			foreach ( array_keys( WC()->cart->taxes + WC()->cart->shipping_taxes ) as $tax_rate_id ) {
-				if ( $tax_rate_id && ! $order->add_tax( $tax_rate_id, WC()->cart->get_tax_amount( $tax_rate_id ), WC()->cart->get_shipping_tax_amount( $tax_rate_id ) ) && apply_filters( 'woocommerce_cart_remove_taxes_zero_rate_id', 'zero-rated' ) !== $tax_rate_id ) {
-					throw new Exception( sprintf( __( 'Error %d: Unable to create order. Please try again.', 'woocommerce' ), 405 ) );
-				}
-			}
-
-			// Store coupons
-			foreach ( WC()->cart->get_coupons() as $code => $coupon ) {
-				if ( ! $order->add_coupon( $code, WC()->cart->get_coupon_discount_amount( $code ), WC()->cart->get_coupon_discount_tax_amount( $code ) ) ) {
-					throw new Exception( sprintf( __( 'Error %d: Unable to create order. Please try again.', 'woocommerce' ), 406 ) );
-				}
-			}
-
-			// Billing address
-			$billing_address = array();
-			if ( $this->checkout_fields['billing'] ) {
-				foreach ( array_keys( $this->checkout_fields['billing'] ) as $field ) {
-					$field_name = str_replace( 'billing_', '', $field );
-					$billing_address[ $field_name ] = $this->get_posted_address_data( $field_name );
-				}
-			}
-
-			// Shipping address.
-			$shipping_address = array();
-			if ( $this->checkout_fields['shipping'] ) {
-				foreach ( array_keys( $this->checkout_fields['shipping'] ) as $field ) {
-					$field_name = str_replace( 'shipping_', '', $field );
-					$shipping_address[ $field_name ] = $this->get_posted_address_data( $field_name, 'shipping' );
-				}
-			}
-
-			$order->set_address( $billing_address, 'billing' );
-			$order->set_address( $shipping_address, 'shipping' );
-			$order->set_payment_method( $this->payment_method );
-			$order->set_total( WC()->cart->shipping_total, 'shipping' );
-			$order->set_total( WC()->cart->get_cart_discount_total(), 'cart_discount' );
-			$order->set_total( WC()->cart->get_cart_discount_tax_total(), 'cart_discount_tax' );
-			$order->set_total( WC()->cart->tax_total, 'tax' );
-			$order->set_total( WC()->cart->shipping_tax_total, 'shipping_tax' );
+			$order->set_created_via( 'checkout' );
+			$order->set_cart_hash( $cart_hash );
+			$order->set_customer_id( apply_filters( 'woocommerce_checkout_customer_id', get_current_user_id() ) );
+			$order->set_currency( get_woocommerce_currency() );
+			$order->set_prices_include_tax( 'yes' === get_option( 'woocommerce_prices_include_tax' ) );
+			$order->set_customer_ip_address( WC_Geolocation::get_ip_address() );
+			$order->set_customer_user_agent( wc_get_user_agent() );
+			$order->set_customer_note( isset( $data['order_comments'] ) ? $data['order_comments'] : '' );
+			$order->set_payment_method( isset( $available_gateways[ $data['payment_method'] ] ) ? $available_gateways[ $data['payment_method'] ]  : $data['payment_method'] );
+			$order->set_shipping_total( WC()->cart->shipping_total );
+			$order->set_discount_total( WC()->cart->get_cart_discount_total() );
+			$order->set_discount_tax( WC()->cart->get_cart_discount_tax_total() );
+			$order->set_cart_tax( WC()->cart->tax_total );
+			$order->set_shipping_tax( WC()->cart->shipping_tax_total );
 			$order->set_total( WC()->cart->total );
+			$this->create_order_line_items( $order, WC()->cart );
+			$this->create_order_fee_lines( $order, WC()->cart );
+			$this->create_order_shipping_lines( $order, WC()->session->get( 'chosen_shipping_methods' ), WC()->shipping->get_packages() );
+			$this->create_order_tax_lines( $order, WC()->cart );
+			$this->create_order_coupon_lines( $order, WC()->cart );
 
-			// Update user meta
-			if ( $this->customer_id ) {
-				if ( apply_filters( 'woocommerce_checkout_update_customer_data', true, $this ) ) {
-					foreach ( $billing_address as $key => $value ) {
-						update_user_meta( $this->customer_id, 'billing_' . $key, $value );
+			/**
+			 * Action hook to adjust order before save.
+			 * @since 3.0.0
+			 */
+			do_action( 'woocommerce_checkout_create_order', $order, $data );
+
+			// Save the order.
+			$order_id = $order->save();
+
+			do_action( 'woocommerce_checkout_update_order_meta', $order_id, $data );
+
+			return $order_id;
+		} catch ( Exception $e ) {
+			return new WP_Error( 'checkout-error', $e->getMessage() );
+		}
+	}
+
+	/**
+	 * Add line items to the order.
+	 *
+	 * @param  WC_Order $order
+	 */
+	public function create_order_line_items( &$order, $cart ) {
+		foreach ( $cart->get_cart() as $cart_item_key => $values ) {
+			$product                    = $values['data'];
+			$item                       = new WC_Order_Item_Product();
+			$item->legacy_values        = $values; // @deprecated For legacy actions.
+			$item->legacy_cart_item_key = $cart_item_key; // @deprecated For legacy actions.
+			$item->set_props( array(
+				'quantity'     => $values['quantity'],
+				'variation'    => $values['variation'],
+				'subtotal'     => $values['line_subtotal'],
+				'total'        => $values['line_total'],
+				'subtotal_tax' => $values['line_subtotal_tax'],
+				'total_tax'    => $values['line_tax'],
+				'taxes'        => $values['line_tax_data'],
+			) );
+			if ( $product ) {
+				$item->set_props( array(
+					'name'         => $product->get_name(),
+					'tax_class'    => $product->get_tax_class(),
+					'product_id'   => $product->is_type( 'variation' ) ? $product->get_parent_id() : $product->get_id(),
+					'variation_id' => $product->is_type( 'variation' ) ? $product->get_id() : 0,
+				) );
+			}
+			$item->set_backorder_meta();
+
+			/**
+			 * Action hook to adjust item before save.
+			 * @since 3.0.0
+			 */
+			do_action( 'woocommerce_checkout_create_order_line_item', $item, $cart_item_key, $values, $order );
+
+			// Add item to order and save.
+			$order->add_item( $item );
+		}
+	}
+
+	/**
+	 * Add fees to the order.
+	 *
+	 * @param  WC_Order $order
+	 */
+	public function create_order_fee_lines( &$order, $cart ) {
+		foreach ( $cart->get_fees() as $fee_key => $fee ) {
+			$item                 = new WC_Order_Item_Fee();
+			$item->legacy_fee     = $fee; // @deprecated For legacy actions.
+			$item->legacy_fee_key = $fee_key; // @deprecated For legacy actions.
+			$item->set_props( array(
+				'name'      => $fee->name,
+				'tax_class' => $fee->taxable ? $fee->tax_class : 0,
+				'total'     => $fee->amount,
+				'total_tax' => $fee->tax,
+				'taxes'     => array(
+					'total' => $fee->tax_data,
+				),
+			) );
+
+			/**
+			 * Action hook to adjust item before save.
+			 * @since 3.0.0
+			 */
+			do_action( 'woocommerce_checkout_create_order_fee_item', $item, $fee_key, $fee, $order );
+
+			// Add item to order and save.
+			$order->add_item( $item );
+		}
+	}
+
+	/**
+	 * Add shipping lines to the order.
+	 *
+	 * @param  WC_Order $order
+	 */
+	public function create_order_shipping_lines( &$order, $chosen_shipping_methods, $packages ) {
+		foreach ( $packages as $package_key => $package ) {
+			if ( isset( $chosen_shipping_methods[ $package_key ], $package['rates'][ $chosen_shipping_methods[ $package_key ] ] ) ) {
+				/** @var WC_Shipping_Rate $shipping_rate */
+				$shipping_rate            = $package['rates'][ $chosen_shipping_methods[ $package_key ] ];
+				$item                     = new WC_Order_Item_Shipping();
+				$item->legacy_package_key = $package_key; // @deprecated For legacy actions.
+				$item->set_props( array(
+					'method_title' => $shipping_rate->label,
+					'method_id'    => $shipping_rate->id,
+					'total'        => wc_format_decimal( $shipping_rate->cost ),
+					'taxes'        => array(
+						'total' => $shipping_rate->taxes,
+					),
+				) );
+
+				foreach ( $shipping_rate->get_meta_data() as $key => $value ) {
+					$item->add_meta_data( $key, $value, true );
+				}
+
+				/**
+				 * Action hook to adjust item before save.
+				 * @since 3.0.0
+				 */
+				do_action( 'woocommerce_checkout_create_order_shipping_item', $item, $package_key, $package, $order );
+
+				// Add item to order and save.
+				$order->add_item( $item );
+			}
+		}
+	}
+
+	/**
+	 * Add tax lines to the order.
+	 *
+	 * @param  WC_Order $order
+	 */
+	public function create_order_tax_lines( &$order, $cart ) {
+		foreach ( array_keys( $cart->taxes + $cart->shipping_taxes ) as $tax_rate_id ) {
+			if ( $tax_rate_id && apply_filters( 'woocommerce_cart_remove_taxes_zero_rate_id', 'zero-rated' ) !== $tax_rate_id ) {
+				$item = new WC_Order_Item_Tax();
+				$item->set_props( array(
+					'rate_id'            => $tax_rate_id,
+					'tax_total'          => $cart->get_tax_amount( $tax_rate_id ),
+					'shipping_tax_total' => $cart->get_shipping_tax_amount( $tax_rate_id ),
+					'rate_code'          => WC_Tax::get_rate_code( $tax_rate_id ),
+					'label'              => WC_Tax::get_rate_label( $tax_rate_id ),
+					'compound'           => WC_Tax::is_compound( $tax_rate_id ),
+				) );
+
+				/**
+				 * Action hook to adjust item before save.
+				 * @since 3.0.0
+				 */
+				do_action( 'woocommerce_checkout_create_order_tax_item', $item, $tax_rate_id, $order );
+
+				// Add item to order and save.
+				$order->add_item( $item );
+			}
+		}
+	}
+
+	/**
+	 * Add coupon lines to the order.
+	 *
+	 * @param  WC_Order $order
+	 */
+	public function create_order_coupon_lines( &$order, $cart ) {
+		foreach ( $cart->get_coupons() as $code => $coupon ) {
+			$item = new WC_Order_Item_Coupon();
+			$item->set_props( array(
+				'code'         => $code,
+				'discount'     => $cart->get_coupon_discount_amount( $code ),
+				'discount_tax' => $cart->get_coupon_discount_tax_amount( $code ),
+			) );
+
+			/**
+			 * Action hook to adjust item before save.
+			 * @since 3.0.0
+			 */
+			do_action( 'woocommerce_checkout_create_order_coupon_item', $item, $code, $coupon, $order );
+
+			// Add item to order and save.
+			$order->add_item( $item );
+		}
+	}
+
+	/**
+	 * See if a fieldset should be skipped.
+	 *
+	 * @since 3.0.0
+	 * @param string $fieldset_key
+	 * @param array $data
+	 */
+	protected function maybe_skip_fieldset( $fieldset_key, $data ) {
+		if ( 'shipping' === $fieldset_key && ( ! $data['ship_to_different_address'] || ! WC()->cart->needs_shipping_address() ) ) {
+			return true;
+		}
+		if ( 'account' === $fieldset_key && ( is_user_logged_in() || ( ! $this->is_registration_required() && empty( $data['createaccount'] ) ) ) ) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Get posted data from the checkout form.
+	 *
+	 * @since  3.0.0
+	 * @return array of data.
+	 */
+	protected function get_posted_data() {
+		$skipped = array();
+		$data    = array(
+			'terms'                              => (int) isset( $_POST['terms'] ),
+			'createaccount'                      => (int) ! empty( $_POST['createaccount'] ),
+			'payment_method'                     => isset( $_POST['payment_method'] ) ? wc_clean( $_POST['payment_method'] ) : '',
+			'shipping_method'                    => isset( $_POST['shipping_method'] ) ? wc_clean( $_POST['shipping_method'] ) : '',
+			'ship_to_different_address'          => ! empty( $_POST['ship_to_different_address'] ) && ! wc_ship_to_billing_address_only(),
+			'woocommerce_checkout_update_totals' => isset( $_POST['woocommerce_checkout_update_totals'] ),
+		);
+		foreach ( $this->get_checkout_fields() as $fieldset_key => $fieldset ) {
+			if ( $this->maybe_skip_fieldset( $fieldset_key, $data ) ) {
+				$skipped[] = $fieldset_key;
+				continue;
+			}
+			foreach ( $fieldset as $key => $field ) {
+				$type = sanitize_title( isset( $field['type'] ) ? $field['type'] : 'text' );
+
+				switch ( $type ) {
+					case 'checkbox' :
+						$value = (int) isset( $_POST[ $key ] );
+						break;
+					case 'multiselect' :
+						$value = isset( $_POST[ $key ] ) ? implode( ', ', wc_clean( $_POST[ $key ] ) ) : '';
+						break;
+					case 'textarea' :
+						$value = isset( $_POST[ $key ] ) ? wc_sanitize_textarea( $_POST[ $key ] ) : '';
+						break;
+					default :
+						$value = isset( $_POST[ $key ] ) ? wc_clean( $_POST[ $key ] ) : '';
+						break;
+				}
+
+				$data[ $key ] = apply_filters( 'woocommerce_process_checkout_' . $type . '_field', apply_filters( 'woocommerce_process_checkout_field_' . $key, $value ) );
+
+				// BW compatibility.
+				$this->legacy_posted_data[ $key ] = $data[ $key ];
+			}
+		}
+
+		if ( in_array( 'shipping', $skipped ) && ( WC()->cart->needs_shipping_address() || wc_ship_to_billing_address_only() ) ) {
+			foreach ( $this->get_checkout_fields( 'shipping' ) as $key => $field ) {
+				$data[ $key ] = isset( $data[ 'billing_' . substr( $key, 9 ) ] ) ? $data[ 'billing_' . substr( $key, 9 ) ] : '';
+			}
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Validates the posted checkout data based on field properties.
+	 *
+	 * @since  3.0.0
+	 * @param  array $data An array of posted data.
+	 * @param  WP_Error $errors
+	 */
+	protected function validate_posted_data( &$data, &$errors ) {
+		foreach ( $this->get_checkout_fields() as $fieldset_key => $fieldset ) {
+			if ( $this->maybe_skip_fieldset( $fieldset_key, $data ) ) {
+				continue;
+			}
+			foreach ( $fieldset as $key => $field ) {
+				if ( ! isset( $data[ $key ] ) ) {
+					continue;
+				}
+				$required    = ! empty( $field['required'] );
+				$format      = array_filter( isset( $field['validate'] ) ? (array) $field['validate'] : array() );
+				$field_label = isset( $field['label'] ) ? $field['label'] : '';
+
+				switch ( $fieldset_key ) {
+					case 'shipping' :
+						/* translators: %s: field name */
+						$field_label = sprintf( __( 'Shipping %s', 'woocommerce' ), $field_label );
+					break;
+					case 'billing' :
+						/* translators: %s: field name */
+						$field_label = sprintf( __( 'Billing %s', 'woocommerce' ), $field_label );
+					break;
+				}
+
+				if ( in_array( 'postcode', $format ) ) {
+					$country      = isset( $data[ $fieldset_key . '_country' ] ) ? $data[ $fieldset_key . '_country' ] : WC()->customer->{"get_{$fieldset_key}_country"}();
+					$data[ $key ] = wc_format_postcode( $data[ $key ], $country );
+
+					if ( '' !== $data[ $key ] && ! WC_Validation::is_postcode( $data[ $key ], $country ) ) {
+						$errors->add( 'validation', __( 'Please enter a valid postcode / ZIP.', 'woocommerce' ) );
 					}
-					if ( WC()->cart->needs_shipping() ) {
-						foreach ( $shipping_address as $key => $value ) {
-							update_user_meta( $this->customer_id, 'shipping_' . $key, $value );
+				}
+
+				if ( in_array( 'phone', $format ) ) {
+					$data[ $key ] = wc_format_phone_number( $data[ $key ] );
+
+					if ( '' !== $data[ $key ] && ! WC_Validation::is_phone( $data[ $key ] ) ) {
+						/* translators: %s: phone number */
+						$errors->add( 'validation', sprintf( __( '%s is not a valid phone number.', 'woocommerce' ), '<strong>' . esc_html( $field_label ) . '</strong>' ) );
+					}
+				}
+
+				if ( in_array( 'email', $format ) && '' !== $data[ $key ] ) {
+					$data[ $key ] = sanitize_email( $data[ $key ] );
+
+					if ( ! is_email( $data[ $key ] ) ) {
+						/* translators: %s: email address */
+						$errors->add( 'validation', sprintf( __( '%s is not a valid email address.', 'woocommerce' ), '<strong>' . $field_label . '</strong>' ) );
+						continue;
+					}
+				}
+
+				if ( '' !== $data[ $key ] && in_array( 'state', $format ) ) {
+					$country      = isset( $data[ $fieldset_key . '_country' ] ) ? $data[ $fieldset_key . '_country' ] : WC()->customer->{"get_{$fieldset_key}_country"}();
+					$valid_states = WC()->countries->get_states( $country );
+
+					if ( ! empty( $valid_states ) && is_array( $valid_states ) && sizeof( $valid_states ) > 0 ) {
+						$valid_state_values = array_flip( array_map( 'strtolower', $valid_states ) );
+
+						// Convert value to key if set
+						if ( isset( $valid_state_values[ strtolower( $data[ $key ] ) ] ) ) {
+							$data[ $key ] = $valid_state_values[ strtolower( $data[ $key ] ) ];
+						}
+
+						if ( ! in_array( $data[ $key ], array_keys( $valid_states ) ) ) {
+							/* translators: 1: state field 2: valid states */
+							$errors->add( 'validation', sprintf( __( '%1$s is not valid. Please enter one of the following: %2$s', 'woocommerce' ), '<strong>' . $field_label . '</strong>', implode( ', ', $valid_states ) ) );
 						}
 					}
 				}
-				do_action( 'woocommerce_checkout_update_user_meta', $this->customer_id, $this->posted );
+
+				if ( $required && '' === $data[ $key ] ) {
+					/* translators: %s: field name */
+					$errors->add( 'required-field', apply_filters( 'woocommerce_checkout_required_field_notice', sprintf( __( '%s is a required field.', 'woocommerce' ), '<strong>' . $field_label . '</strong>' ), $field_label ) );
+				}
 			}
+		}
+	}
 
-			// Let plugins add meta
-			do_action( 'woocommerce_checkout_update_order_meta', $order_id, $this->posted );
+	/**
+	 * Validates that the checkout has enough info to proceed.
+	 *
+	 * @since  3.0.0
+	 * @param  array $data An array of posted data.
+	 * @param  WP_Error $errors
+	 */
+	protected function validate_checkout( &$data, &$errors ) {
+		$this->validate_posted_data( $data, $errors );
+		$this->check_cart_items();
 
-			// If we got here, the order was created without problems!
-			wc_transaction_query( 'commit' );
-
-		} catch ( Exception $e ) {
-			// There was an error adding order data!
-			wc_transaction_query( 'rollback' );
-			return new WP_Error( 'checkout-error', $e->getMessage() );
+		if ( empty( $data['woocommerce_checkout_update_totals'] ) && empty( $data['terms'] ) && apply_filters( 'woocommerce_checkout_show_terms', wc_get_page_id( 'terms' ) > 0 ) ) {
+			$errors->add( 'terms', __( 'You must accept our Terms &amp; Conditions.', 'woocommerce' ) );
 		}
 
-		return $order_id;
+		if ( WC()->cart->needs_shipping() ) {
+			$shipping_country = WC()->customer->get_shipping_country();
+
+			if ( empty( $shipping_country ) ) {
+				$errors->add( 'shipping', __( 'Please enter an address to continue.', 'woocommerce' ) );
+			} elseif ( ! in_array( WC()->customer->get_shipping_country(), array_keys( WC()->countries->get_shipping_countries() ) ) ) {
+				$errors->add( 'shipping', sprintf( __( 'Unfortunately <strong>we do not ship %s</strong>. Please enter an alternative shipping address.', 'woocommerce' ), WC()->countries->shipping_to_prefix() . ' ' . WC()->customer->get_shipping_country() ) );
+			} else {
+				$chosen_shipping_methods = WC()->session->get( 'chosen_shipping_methods' );
+
+				foreach ( WC()->shipping->get_packages() as $i => $package ) {
+					if ( ! isset( $chosen_shipping_methods[ $i ], $package['rates'][ $chosen_shipping_methods[ $i ] ] ) ) {
+						$errors->add( 'shipping', __( 'No shipping method has been selected. Please double check your address, or contact us if you need any help.', 'woocommerce' ) );
+					}
+				}
+			}
+		}
+
+		if ( WC()->cart->needs_payment() ) {
+			$available_gateways = WC()->payment_gateways->get_available_payment_gateways();
+
+			if ( ! isset( $available_gateways[ $data['payment_method'] ] ) ) {
+				$errors->add( 'payment', __( 'Invalid payment method.', 'woocommerce' ) );
+			} else {
+				$available_gateways[ $data['payment_method'] ]->validate_fields();
+			}
+		}
+
+		do_action( 'woocommerce_after_checkout_validation', $data, $errors );
+	}
+
+	/**
+	 * Update customer and session data from the posted checkout data.
+	 *
+	 * @since  3.0.0
+	 * @param  array $data
+	 */
+	protected function update_session( $data ) {
+		if ( isset( $data['billing_country'] ) ) {
+			WC()->customer->set_billing_country( $data['billing_country'] );
+			WC()->customer->set_shipping_country( $data['billing_country'] );
+		}
+		if ( isset( $data['billing_state'] ) ) {
+			WC()->customer->set_billing_state( $data['billing_state'] );
+			WC()->customer->set_shipping_state( $data['billing_state'] );
+		}
+		if ( isset( $data['billing_postcode'] ) ) {
+			WC()->customer->set_billing_postcode( $data['billing_postcode'] );
+			WC()->customer->set_shipping_postcode( $data['billing_postcode'] );
+		}
+		if ( isset( $data['shipping_country'] ) ) {
+			WC()->customer->set_shipping_country( $data['shipping_country'] );
+		}
+		if ( isset( $data['shipping_state'] ) ) {
+			WC()->customer->set_shipping_state( $data['shipping_state'] );
+		}
+		if ( isset( $data['shipping_postcode'] ) ) {
+			WC()->customer->set_shipping_postcode( $data['shipping_postcode'] );
+		}
+		WC()->customer->save();
+
+		// Update customer shipping and payment method to posted method
+		$chosen_shipping_methods = WC()->session->get( 'chosen_shipping_methods' );
+
+		if ( is_array( $data['shipping_method'] ) ) {
+			foreach ( $data['shipping_method'] as $i => $value ) {
+				$chosen_shipping_methods[ $i ] = $value;
+			}
+		}
+
+		WC()->session->set( 'chosen_shipping_methods', $chosen_shipping_methods );
+		WC()->session->set( 'chosen_payment_method', $data['payment_method'] );
+
+		// Update cart totals now we have customer address.
+		WC()->cart->calculate_totals();
+	}
+
+
+	/**
+	 * Process an order that does require payment.
+	 *
+	 * @since  3.0.0
+	 * @param  int $order_id
+	 * @param  string $payment_method
+	 */
+	protected function process_order_payment( $order_id, $payment_method ) {
+		$available_gateways = WC()->payment_gateways->get_available_payment_gateways();
+
+		if ( ! isset( $available_gateways[ $payment_method ] ) ) {
+			return;
+		}
+
+		// Store Order ID in session so it can be re-used after payment failure
+		WC()->session->set( 'order_awaiting_payment', $order_id );
+
+		// Process Payment
+		$result = $available_gateways[ $payment_method ]->process_payment( $order_id );
+
+		// Redirect to success/confirmation/payment page
+		if ( isset( $result['result'] ) && 'success' === $result['result'] ) {
+			$result = apply_filters( 'woocommerce_payment_successful_result', $result, $order_id );
+
+			if ( is_ajax() ) {
+				wp_send_json( $result );
+			} else {
+				wp_redirect( $result['redirect'] );
+				exit;
+			}
+		}
+	}
+
+	/**
+	 * Process an order that doesn't require payment.
+	 *
+	 * @since  3.0.0
+	 * @param  int $order_id
+	 */
+	protected function process_order_without_payment( $order_id ) {
+		$order = wc_get_order( $order_id );
+		$order->payment_complete();
+		wc_empty_cart();
+
+		if ( is_ajax() ) {
+			wp_send_json( array(
+				'result'   => 'success',
+				'redirect' => apply_filters( 'woocommerce_checkout_no_payment_needed_redirect', $order->get_checkout_order_received_url(), $order ),
+			) );
+		} else {
+			wp_safe_redirect(
+				apply_filters( 'woocommerce_checkout_no_payment_needed_redirect', $order->get_checkout_order_received_url(), $order )
+			);
+			exit;
+		}
+	}
+
+	/**
+	 * Create a new customer account if needed.
+	 * @param  array $data
+	 * @throws Exception
+	 */
+	protected function process_customer( $data ) {
+		$customer_id = apply_filters( 'woocommerce_checkout_customer_id', get_current_user_id() );
+
+		if ( ! is_user_logged_in() && ( $this->is_registration_required() || ! empty( $data['createaccount'] ) ) ) {
+			$username    = ! empty( $data['account_username'] ) ? $data['account_username'] : '';
+			$password    = ! empty( $data['account_password'] ) ? $data['account_password'] : '';
+			$customer_id = wc_create_new_customer( $data['billing_email'], $username, $password );
+
+			if ( is_wp_error( $customer_id ) ) {
+				throw new Exception( $customer_id->get_error_message() );
+			}
+
+			wp_set_current_user( $customer_id );
+			wc_set_customer_auth_cookie( $customer_id );
+
+			// As we are now logged in, checkout will need to refresh to show logged in data
+			WC()->session->set( 'reload_checkout', true );
+
+			// Also, recalculate cart totals to reveal any role-based discounts that were unavailable before registering
+			WC()->cart->calculate_totals();
+		}
+
+		// On multisite, ensure user exists on current site, if not add them before allowing login.
+		if ( $customer_id && is_multisite() && is_user_logged_in() && ! is_user_member_of_blog() ) {
+			add_user_to_blog( get_current_blog_id(), $customer_id, 'customer' );
+		}
+
+		// Add customer info from other fields.
+		if ( $customer_id && apply_filters( 'woocommerce_checkout_update_customer_data', true, $this ) ) {
+			$customer = new WC_Customer( $customer_id );
+
+			if ( ! empty( $data['billing_first_name'] ) ) {
+				$customer->set_first_name( $data['billing_first_name'] );
+			}
+
+			if ( ! empty( $data['billing_last_name'] ) ) {
+				$customer->set_last_name( $data['billing_last_name'] );
+			}
+
+			foreach ( $data as $key => $value ) {
+				// Use setters where available.
+				if ( is_callable( array( $customer, "set_{$key}" ) ) ) {
+					$customer->{"set_{$key}"}( $value );
+
+				// Store custom fields prefixed with wither shipping_ or billing_.
+				} elseif ( 0 === stripos( $key, 'billing_' ) || 0 === stripos( $key, 'shipping_' ) ) {
+					$customer->update_meta_data( $key, $value );
+				}
+			}
+
+			/**
+			 * Action hook to adjust customer before save.
+			 * @since 3.0.0
+			 */
+			do_action( 'woocommerce_checkout_update_customer', $customer, $data );
+
+			$customer->save();
+		}
+
+		do_action( 'woocommerce_checkout_update_user_meta', $customer_id, $data );
+	}
+
+	/**
+	 * If checkout failed during an AJAX call, send failure response.
+	 */
+	protected function send_ajax_failure_response() {
+		if ( is_ajax() ) {
+			// only print notices if not reloading the checkout, otherwise they're lost in the page reload
+			if ( ! isset( WC()->session->reload_checkout ) ) {
+				ob_start();
+				wc_print_notices();
+				$messages = ob_get_clean();
+			}
+
+			$response = array(
+				'result'   => 'failure',
+				'messages' => isset( $messages ) ? $messages : '',
+				'refresh'  => isset( WC()->session->refresh_totals ),
+				'reload'   => isset( WC()->session->reload_checkout ),
+			);
+
+			unset( WC()->session->refresh_totals, WC()->session->reload_checkout );
+
+			wp_send_json( $response );
+		}
 	}
 
 	/**
@@ -350,390 +915,65 @@ class WC_Checkout {
 				throw new Exception( __( 'We were unable to process your order, please try again.', 'woocommerce' ) );
 			}
 
-			if ( ! defined( 'WOOCOMMERCE_CHECKOUT' ) ) {
-				define( 'WOOCOMMERCE_CHECKOUT', true );
-			}
-
-			// Prevent timeout
-			@set_time_limit(0);
+			wc_maybe_define_constant( 'WOOCOMMERCE_CHECKOUT', true );
+			wc_set_time_limit( 0 );
 
 			do_action( 'woocommerce_before_checkout_process' );
 
 			if ( WC()->cart->is_empty() ) {
-				throw new Exception( sprintf( __( 'Sorry, your session has expired. <a href="%s" class="wc-backward">Return to homepage</a>', 'woocommerce' ), home_url() ) );
+				throw new Exception( sprintf( __( 'Sorry, your session has expired. <a href="%s" class="wc-backward">Return to shop</a>', 'woocommerce' ), esc_url( wc_get_page_permalink( 'shop' ) ) ) );
 			}
 
 			do_action( 'woocommerce_checkout_process' );
 
-			// Checkout fields (not defined in checkout_fields)
-			$this->posted['terms']                     = isset( $_POST['terms'] ) ? 1 : 0;
-			$this->posted['createaccount']             = isset( $_POST['createaccount'] ) && ! empty( $_POST['createaccount'] ) ? 1 : 0;
-			$this->posted['payment_method']            = isset( $_POST['payment_method'] ) ? stripslashes( $_POST['payment_method'] ) : '';
-			$this->posted['shipping_method']           = isset( $_POST['shipping_method'] ) ? $_POST['shipping_method'] : '';
-			$this->posted['ship_to_different_address'] = isset( $_POST['ship_to_different_address'] ) ? true : false;
+			$errors      = new WP_Error();
+			$posted_data = $this->get_posted_data();
 
-			if ( isset( $_POST['shiptobilling'] ) ) {
-				_deprecated_argument( 'WC_Checkout::process_checkout()', '2.1', 'The "shiptobilling" field is deprecated. The template files are out of date' );
+			// Update session for customer and totals.
+			$this->update_session( $posted_data );
 
-				$this->posted['ship_to_different_address'] = $_POST['shiptobilling'] ? false : true;
+			// Validate posted data and cart items before proceeding.
+			$this->validate_checkout( $posted_data, $errors );
+
+			foreach ( $errors->get_error_messages() as $message ) {
+				wc_add_notice( $message, 'error' );
 			}
 
-			// Ship to billing only option
-			if ( wc_ship_to_billing_address_only() ) {
-				$this->posted['ship_to_different_address']  = false;
-			}
-
-			// Update customer shipping and payment method to posted method
-			$chosen_shipping_methods = WC()->session->get( 'chosen_shipping_methods' );
-
-			if ( isset( $this->posted['shipping_method'] ) && is_array( $this->posted['shipping_method'] ) ) {
-				foreach ( $this->posted['shipping_method'] as $i => $value ) {
-					$chosen_shipping_methods[ $i ] = wc_clean( $value );
-				}
-			}
-
-			WC()->session->set( 'chosen_shipping_methods', $chosen_shipping_methods );
-			WC()->session->set( 'chosen_payment_method', $this->posted['payment_method'] );
-
-			// Note if we skip shipping
-			$skipped_shipping = false;
-
-			// Get posted checkout_fields and do validation
-			foreach ( $this->checkout_fields as $fieldset_key => $fieldset ) {
-
-				// Skip shipping if not needed
-				if ( $fieldset_key == 'shipping' && ( $this->posted['ship_to_different_address'] == false || ! WC()->cart->needs_shipping_address() ) ) {
-					$skipped_shipping = true;
-					continue;
-				}
-
-				// Skip account if not needed
-				if ( $fieldset_key == 'account' && ( is_user_logged_in() || ( $this->must_create_account == false && empty( $this->posted['createaccount'] ) ) ) ) {
-					continue;
-				}
-
-				foreach ( $fieldset as $key => $field ) {
-
-					if ( ! isset( $field['type'] ) ) {
-						$field['type'] = 'text';
-					}
-
-					// Get Value
-					switch ( $field['type'] ) {
-						case "checkbox" :
-							$this->posted[ $key ] = isset( $_POST[ $key ] ) ? 1 : 0;
-						break;
-						case "multiselect" :
-							$this->posted[ $key ] = isset( $_POST[ $key ] ) ? implode( ', ', array_map( 'wc_clean', $_POST[ $key ] ) ) : '';
-						break;
-						case "textarea" :
-							$this->posted[ $key ] = isset( $_POST[ $key ] ) ? wp_strip_all_tags( wp_check_invalid_utf8( stripslashes( $_POST[ $key ] ) ) ) : '';
-						break;
-						default :
-							$this->posted[ $key ] = isset( $_POST[ $key ] ) ? ( is_array( $_POST[ $key ] ) ? array_map( 'wc_clean', $_POST[ $key ] ) : wc_clean( $_POST[ $key ] ) ) : '';
-						break;
-					}
-
-					// Hooks to allow modification of value
-					$this->posted[ $key ] = apply_filters( 'woocommerce_process_checkout_' . sanitize_title( $field['type'] ) . '_field', $this->posted[ $key ] );
-					$this->posted[ $key ] = apply_filters( 'woocommerce_process_checkout_field_' . $key, $this->posted[ $key ] );
-
-					// Validation: Required fields
-					if ( isset( $field['required'] ) && $field['required'] && empty( $this->posted[ $key ] ) ) {
-						wc_add_notice( '<strong>' . $field['label'] . '</strong> ' . __( 'is a required field.', 'woocommerce' ), 'error' );
-					}
-
-					if ( ! empty( $this->posted[ $key ] ) ) {
-
-						// Validation rules
-						if ( ! empty( $field['validate'] ) && is_array( $field['validate'] ) ) {
-							foreach ( $field['validate'] as $rule ) {
-								switch ( $rule ) {
-									case 'postcode' :
-										$this->posted[ $key ] = strtoupper( str_replace( ' ', '', $this->posted[ $key ] ) );
-
-										if ( ! WC_Validation::is_postcode( $this->posted[ $key ], $_POST[ $fieldset_key . '_country' ] ) ) :
-											wc_add_notice( __( 'Please enter a valid postcode/ZIP.', 'woocommerce' ), 'error' );
-										else :
-											$this->posted[ $key ] = wc_format_postcode( $this->posted[ $key ], $_POST[ $fieldset_key . '_country' ] );
-										endif;
-									break;
-									case 'phone' :
-										$this->posted[ $key ] = wc_format_phone_number( $this->posted[ $key ] );
-
-										if ( ! WC_Validation::is_phone( $this->posted[ $key ] ) )
-											wc_add_notice( '<strong>' . $field['label'] . '</strong> ' . __( 'is not a valid phone number.', 'woocommerce' ), 'error' );
-									break;
-									case 'email' :
-										$this->posted[ $key ] = strtolower( $this->posted[ $key ] );
-
-										if ( ! is_email( $this->posted[ $key ] ) )
-											wc_add_notice( '<strong>' . $field['label'] . '</strong> ' . __( 'is not a valid email address.', 'woocommerce' ), 'error' );
-									break;
-									case 'state' :
-										// Get valid states
-										$valid_states = WC()->countries->get_states( isset( $_POST[ $fieldset_key . '_country' ] ) ? $_POST[ $fieldset_key . '_country' ] : ( 'billing' === $fieldset_key ? WC()->customer->get_country() : WC()->customer->get_shipping_country() ) );
-
-										if ( ! empty( $valid_states ) && is_array( $valid_states ) ) {
-											$valid_state_values = array_flip( array_map( 'strtolower', $valid_states ) );
-
-											// Convert value to key if set
-											if ( isset( $valid_state_values[ strtolower( $this->posted[ $key ] ) ] ) ) {
-												 $this->posted[ $key ] = $valid_state_values[ strtolower( $this->posted[ $key ] ) ];
-											}
-										}
-
-										// Only validate if the country has specific state options
-										if ( ! empty( $valid_states ) && is_array( $valid_states ) && sizeof( $valid_states ) > 0 ) {
-											if ( ! in_array( $this->posted[ $key ], array_keys( $valid_states ) ) ) {
-												wc_add_notice( '<strong>' . $field['label'] . '</strong> ' . __( 'is not valid. Please enter one of the following:', 'woocommerce' ) . ' ' . implode( ', ', $valid_states ), 'error' );
-											}
-										}
-									break;
-								}
-							}
-						}
-					}
-				}
-			}
-
-			// Update customer location to posted location so we can correctly check available shipping methods
-			if ( isset( $this->posted['billing_country'] ) ) {
-				WC()->customer->set_country( $this->posted['billing_country'] );
-			}
-			if ( isset( $this->posted['billing_state'] ) ) {
-				WC()->customer->set_state( $this->posted['billing_state'] );
-			}
-			if ( isset( $this->posted['billing_postcode'] ) ) {
-				WC()->customer->set_postcode( $this->posted['billing_postcode'] );
-			}
-
-			// Shipping Information
-			if ( ! $skipped_shipping ) {
-
-				// Update customer location to posted location so we can correctly check available shipping methods
-				if ( isset( $this->posted['shipping_country'] ) ) {
-					WC()->customer->set_shipping_country( $this->posted['shipping_country'] );
-				}
-				if ( isset( $this->posted['shipping_state'] ) ) {
-					WC()->customer->set_shipping_state( $this->posted['shipping_state'] );
-				}
-				if ( isset( $this->posted['shipping_postcode'] ) ) {
-					WC()->customer->set_shipping_postcode( $this->posted['shipping_postcode'] );
-				}
-
-			} else {
-
-				// Update customer location to posted location so we can correctly check available shipping methods
-				if ( isset( $this->posted['billing_country'] ) ) {
-					WC()->customer->set_shipping_country( $this->posted['billing_country'] );
-				}
-				if ( isset( $this->posted['billing_state'] ) ) {
-					WC()->customer->set_shipping_state( $this->posted['billing_state'] );
-				}
-				if ( isset( $this->posted['billing_postcode'] ) ) {
-					WC()->customer->set_shipping_postcode( $this->posted['billing_postcode'] );
-				}
-
-			}
-
-			// Update cart totals now we have customer address
-			WC()->cart->calculate_totals();
-
-			// Terms
-			if ( ! isset( $_POST['woocommerce_checkout_update_totals'] ) && empty( $this->posted['terms'] ) && wc_get_page_id( 'terms' ) > 0 && apply_filters( 'woocommerce_checkout_show_terms', true ) ) {
-				wc_add_notice( __( 'You must accept our Terms &amp; Conditions.', 'woocommerce' ), 'error' );
-			}
-
-			if ( WC()->cart->needs_shipping() ) {
-
-				if ( ! in_array( WC()->customer->get_shipping_country(), array_keys( WC()->countries->get_shipping_countries() ) ) ) {
-					wc_add_notice( sprintf( __( 'Unfortunately <strong>we do not ship %s</strong>. Please enter an alternative shipping address.', 'woocommerce' ), WC()->countries->shipping_to_prefix() . ' ' . WC()->customer->get_shipping_country() ), 'error' );
-				}
-
-				// Validate Shipping Methods
-				$packages               = WC()->shipping->get_packages();
-				$this->shipping_methods = WC()->session->get( 'chosen_shipping_methods' );
-
-				foreach ( $packages as $i => $package ) {
-					if ( ! isset( $package['rates'][ $this->shipping_methods[ $i ] ] ) ) {
-						wc_add_notice( __( 'Invalid shipping method.', 'woocommerce' ), 'error' );
-						$this->shipping_methods[ $i ] = '';
-					}
-				}
-			}
-
-			if ( WC()->cart->needs_payment() ) {
-				// Payment Method
-				$available_gateways = WC()->payment_gateways->get_available_payment_gateways();
-
-				if ( ! isset( $available_gateways[ $this->posted['payment_method'] ] ) ) {
-					$this->payment_method = '';
-					wc_add_notice( __( 'Invalid payment method.', 'woocommerce' ), 'error' );
-				} else {
-					$this->payment_method = $available_gateways[ $this->posted['payment_method'] ];
-					$this->payment_method->validate_fields();
-				}
-			} else {
-				$available_gateways = array();
-			}
-
-			// Action after validation
-			do_action( 'woocommerce_after_checkout_validation', $this->posted );
-
-			if ( ! isset( $_POST['woocommerce_checkout_update_totals'] ) && wc_notice_count( 'error' ) == 0 ) {
-
-				// Customer accounts
-				$this->customer_id = apply_filters( 'woocommerce_checkout_customer_id', get_current_user_id() );
-
-				if ( ! is_user_logged_in() && ( $this->must_create_account || ! empty( $this->posted['createaccount'] ) ) ) {
-
-					$username     = ! empty( $this->posted['account_username'] ) ? $this->posted['account_username'] : '';
-					$password     = ! empty( $this->posted['account_password'] ) ? $this->posted['account_password'] : '';
-					$new_customer = wc_create_new_customer( $this->posted['billing_email'], $username, $password );
-
-					if ( is_wp_error( $new_customer ) ) {
-						throw new Exception( $new_customer->get_error_message() );
-					}
-
-					$this->customer_id = $new_customer;
-
-					wc_set_customer_auth_cookie( $this->customer_id );
-
-					// As we are now logged in, checkout will need to refresh to show logged in data
-					WC()->session->set( 'reload_checkout', true );
-
-					// Also, recalculate cart totals to reveal any role-based discounts that were unavailable before registering
-					WC()->cart->calculate_totals();
-
-					// Add customer info from other billing fields
-					if ( $this->posted['billing_first_name'] && apply_filters( 'woocommerce_checkout_update_customer_data', true, $this ) ) {
-						$userdata = array(
-							'ID'           => $this->customer_id,
-							'first_name'   => $this->posted['billing_first_name'] ? $this->posted['billing_first_name'] : '',
-							'last_name'    => $this->posted['billing_last_name'] ? $this->posted['billing_last_name'] : '',
-							'display_name' => $this->posted['billing_first_name'] ? $this->posted['billing_first_name'] : ''
-						);
-						wp_update_user( apply_filters( 'woocommerce_checkout_customer_userdata', $userdata, $this ) );
-					}
-				}
-
-				// Do a final stock check at this point
-				$this->check_cart_items();
-
-				// Abort if errors are present
-				if ( wc_notice_count( 'error' ) > 0 )
-					throw new Exception();
-
-				$order_id = $this->create_order();
+			if ( empty( $posted_data['woocommerce_checkout_update_totals'] ) && 0 === wc_notice_count( 'error' ) ) {
+				$this->process_customer( $posted_data );
+				$order_id = $this->create_order( $posted_data );
+				$order    = wc_get_order( $order_id );
 
 				if ( is_wp_error( $order_id ) ) {
 					throw new Exception( $order_id->get_error_message() );
 				}
 
-				do_action( 'woocommerce_checkout_order_processed', $order_id, $this->posted );
+				do_action( 'woocommerce_checkout_order_processed', $order_id, $posted_data, $order );
 
-				// Process payment
 				if ( WC()->cart->needs_payment() ) {
-
-					// Store Order ID in session so it can be re-used after payment failure
-					WC()->session->order_awaiting_payment = $order_id;
-
-					// Process Payment
-					$result = $available_gateways[ $this->posted['payment_method'] ]->process_payment( $order_id );
-
-					// Redirect to success/confirmation/payment page
-					if ( isset( $result['result'] ) && 'success' === $result['result'] ) {
-
-						$result = apply_filters( 'woocommerce_payment_successful_result', $result, $order_id );
-
-						if ( is_ajax() ) {
-							wp_send_json( $result );
-						} else {
-							wp_redirect( $result['redirect'] );
-							exit;
-						}
-
-					}
-
+					$this->process_order_payment( $order_id, $posted_data['payment_method'] );
 				} else {
-
-					if ( empty( $order ) ) {
-						$order = wc_get_order( $order_id );
-					}
-
-					// No payment was required for order
-					$order->payment_complete();
-
-					// Empty the Cart
-					WC()->cart->empty_cart();
-
-					// Get redirect
-					$return_url = $order->get_checkout_order_received_url();
-
-					// Redirect to success/confirmation/payment page
-					if ( is_ajax() ) {
-						wp_send_json( array(
-							'result' 	=> 'success',
-							'redirect'  => apply_filters( 'woocommerce_checkout_no_payment_needed_redirect', $return_url, $order )
-						) );
-					} else {
-						wp_safe_redirect(
-							apply_filters( 'woocommerce_checkout_no_payment_needed_redirect', $return_url, $order )
-						);
-						exit;
-					}
-
+					$this->process_order_without_payment( $order_id );
 				}
-
 			}
-
 		} catch ( Exception $e ) {
-			if ( ! empty( $e ) ) {
-				wc_add_notice( $e->getMessage(), 'error' );
-			}
-		}
-
-		// If we reached this point then there were errors
-		if ( is_ajax() ) {
-
-			// only print notices if not reloading the checkout, otherwise they're lost in the page reload
-			if ( ! isset( WC()->session->reload_checkout ) ) {
-				ob_start();
-				wc_print_notices();
-				$messages = ob_get_clean();
-			}
-
-			$response = array(
-				'result'	=> 'failure',
-				'messages' 	=> isset( $messages ) ? $messages : '',
-				'refresh' 	=> isset( WC()->session->refresh_totals ) ? 'true' : 'false',
-				'reload'    => isset( WC()->session->reload_checkout ) ? 'true' : 'false'
-			);
-
-			unset( WC()->session->refresh_totals, WC()->session->reload_checkout );
-
-			wp_send_json( $response );
+			wc_add_notice( $e->getMessage(), 'error' );
 		}
+		$this->send_ajax_failure_response();
 	}
 
 	/**
 	 * Get a posted address field after sanitization and validation.
+	 *
 	 * @param string $key
 	 * @param string $type billing for shipping
 	 * @return string
 	 */
 	public function get_posted_address_data( $key, $type = 'billing' ) {
-		if ( 'billing' === $type || false === $this->posted['ship_to_different_address'] ) {
-			$return = isset( $this->posted[ 'billing_' . $key ] ) ? $this->posted[ 'billing_' . $key ] : '';
+		if ( 'billing' === $type || false === $this->legacy_posted_data['ship_to_different_address'] ) {
+			$return = isset( $this->legacy_posted_data[ 'billing_' . $key ] ) ? $this->legacy_posted_data[ 'billing_' . $key ] : '';
 		} else {
-			$return = isset( $this->posted[ 'shipping_' . $key ] ) ? $this->posted[ 'shipping_' . $key ] : '';
-		}
-
-		// Use logged in user's billing email if neccessary
-		if ( 'email' === $key && empty( $return ) && is_user_logged_in() ) {
-			$current_user = wp_get_current_user();
-			$return       = $current_user->user_email;
+			$return = isset( $this->legacy_posted_data[ 'shipping_' . $key ] ) ? $this->legacy_posted_data[ 'shipping_' . $key ] : '';
 		}
 		return $return;
 	}
@@ -741,54 +981,28 @@ class WC_Checkout {
 	/**
 	 * Gets the value either from the posted data, or from the users meta data.
 	 *
-	 * @access public
 	 * @param string $input
-	 * @return string|null
+	 * @return string
 	 */
 	public function get_value( $input ) {
 		if ( ! empty( $_POST[ $input ] ) ) {
-
 			return wc_clean( $_POST[ $input ] );
 
 		} else {
 
 			$value = apply_filters( 'woocommerce_checkout_get_value', null, $input );
 
-			if ( $value !== null ) {
+			if ( null !== $value ) {
 				return $value;
 			}
 
-			// Get the billing_ and shipping_ address fields
-			$address_fields = array_merge( WC()->countries->get_address_fields(), WC()->countries->get_address_fields( '', 'shipping_' ) );
-
-			if ( is_user_logged_in() && array_key_exists( $input, $address_fields ) ) {
-				$current_user = wp_get_current_user();
-
-				if ( $meta = get_user_meta( $current_user->ID, $input, true ) ) {
-					return $meta;
-				}
-
-				if ( $input == 'billing_email' ) {
-					return $current_user->user_email;
-				}
+			if ( is_callable( array( WC()->customer, "get_$input" ) ) ) {
+				$value = WC()->customer->{"get_$input"}() ? WC()->customer->{"get_$input"}() : null;
+			} elseif ( WC()->customer->meta_exists( $input ) ) {
+				$value = WC()->customer->get_meta( $input, true );
 			}
 
-			switch ( $input ) {
-				case 'billing_country' :
-					return apply_filters( 'default_checkout_country', WC()->customer->get_country() ? WC()->customer->get_country() : WC()->countries->get_base_country(), 'billing' );
-				case 'billing_state' :
-					return apply_filters( 'default_checkout_state', WC()->customer->has_calculated_shipping() ? WC()->customer->get_state() : '', 'billing' );
-				case 'billing_postcode' :
-					return apply_filters( 'default_checkout_postcode', WC()->customer->get_postcode() ? WC()->customer->get_postcode() : '', 'billing' );
-				case 'shipping_country' :
-					return apply_filters( 'default_checkout_country', WC()->customer->get_shipping_country() ? WC()->customer->get_shipping_country() : WC()->countries->get_base_country(), 'shipping' );
-				case 'shipping_state' :
-					return apply_filters( 'default_checkout_state', WC()->customer->has_calculated_shipping() ? WC()->customer->get_shipping_state() : '', 'shipping' );
-				case 'shipping_postcode' :
-					return apply_filters( 'default_checkout_postcode', WC()->customer->get_shipping_postcode() ? WC()->customer->get_shipping_postcode() : '', 'shipping' );
-				default :
-					return apply_filters( 'default_checkout_' . $input, null, $input );
-			}
+			return apply_filters( 'default_checkout_' . $input, $value, $input );
 		}
 	}
 }
diff --git a/includes/class-wc-cli.php b/includes/class-wc-cli.php
index 8cdd3831e07..09e55707032 100644
--- a/includes/class-wc-cli.php
+++ b/includes/class-wc-cli.php
@@ -1,23 +1,42 @@
 <?php
-
-/**
- * Manage WooCommerce from CLI.
- *
- * @class    WC_CLI
- * @version  2.5.0
- * @package  WooCommerce/CLI
- * @category CLI
- * @author   WooThemes
- */
-class WC_CLI extends WP_CLI_Command {
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
 }
 
-WP_CLI::add_command( 'wc',                  'WC_CLI' );
-WP_CLI::add_command( 'wc coupon',           'WC_CLI_Coupon' );
-WP_CLI::add_command( 'wc customer',         'WC_CLI_Customer' );
-WP_CLI::add_command( 'wc order',            'WC_CLI_Order' );
-WP_CLI::add_command( 'wc product',          'WC_CLI_Product' );
-WP_CLI::add_command( 'wc product category', 'WC_CLI_Product_Category' );
-WP_CLI::add_command( 'wc report',           'WC_CLI_Report' );
-WP_CLI::add_command( 'wc tax',              'WC_CLI_Tax' );
-WP_CLI::add_command( 'wc tool',             'WC_CLI_Tool' );
+/**
+ * Enables WooCommerce, via the the command line.
+ *
+ * @version 3.0.0
+ * @package WooCommerce
+ * @author  WooCommerce
+ */
+class WC_CLI {
+	/**
+	 * Load required files and hooks to make the CLI work.
+	 */
+	public function __construct() {
+		$this->includes();
+		$this->hooks();
+	}
+
+	/**
+	 * Load command files.
+	 */
+	private function includes() {
+		require_once __DIR__ . '/cli/class-wc-cli-runner.php';
+		require_once __DIR__ . '/cli/class-wc-cli-rest-command.php';
+		require_once __DIR__ . '/cli/class-wc-cli-tool-command.php';
+		require_once __DIR__ . '/cli/class-wc-cli-update-command.php';
+	}
+
+	/**
+	 * Sets up and hooks WP CLI to our CLI code.
+	 */
+	private function hooks() {
+		WP_CLI::add_hook( 'after_wp_load', 'WC_CLI_Runner::after_wp_load' );
+		WP_CLI::add_hook( 'after_wp_load', 'WC_CLI_Tool_Command::register_commands' );
+		WP_CLI::add_hook( 'after_wp_load', 'WC_CLI_Update_Command::register_commands' );
+	}
+}
+
+new WC_CLI;
diff --git a/includes/class-wc-comments.php b/includes/class-wc-comments.php
index 711cded7ddd..daaebe840f9 100644
--- a/includes/class-wc-comments.php
+++ b/includes/class-wc-comments.php
@@ -42,6 +42,10 @@ class WC_Comments {
 		// Count comments
 		add_filter( 'wp_count_comments', array( __CLASS__, 'wp_count_comments' ), 10, 2 );
 
+		// Delete comments count cache whenever there is a new comment or a comment status changes
+		add_action( 'wp_insert_comment', array( __CLASS__, 'delete_comments_count_cache' ) );
+		add_action( 'wp_set_comment_status', array( __CLASS__, 'delete_comments_count_cache' ) );
+
 		// Support avatars for `review` comment type
 		add_filter( 'get_avatar_comment_types', array( __CLASS__, 'add_avatar_for_review_comment_type' ) );
 
@@ -71,7 +75,7 @@ class WC_Comments {
 			$clauses['join'] = '';
 		}
 
-		if ( ! strstr( $clauses['join'], "JOIN $wpdb->posts" ) ) {
+		if ( ! stristr( $clauses['join'], "JOIN $wpdb->posts ON" ) ) {
 			$clauses['join'] .= " LEFT JOIN $wpdb->posts ON comment_post_ID = $wpdb->posts.ID ";
 		}
 
@@ -92,7 +96,7 @@ class WC_Comments {
 	public static function exclude_order_comments_from_feed_join( $join ) {
 		global $wpdb;
 
-		if ( ! strstr( $join, $wpdb->posts ) ) {
+		if ( ! stristr( $join, "JOIN $wpdb->posts ON" ) ) {
 			$join = " LEFT JOIN $wpdb->posts ON $wpdb->comments.comment_post_ID = $wpdb->posts.ID ";
 		}
 
@@ -178,23 +182,16 @@ class WC_Comments {
 
 	/**
 	 * Validate the comment ratings.
+	 *
 	 * @param  array $comment_data
 	 * @return array
 	 */
 	public static function check_comment_rating( $comment_data ) {
 		// If posting a comment (not trackback etc) and not logged in
-		if (
-			! is_admin()
-			&& 'product' === get_post_type( $_POST['comment_post_ID'] )
-			&& empty( $_POST['rating'] )
-			&& '' === $comment_data['comment_type']
-			&& 'yes' === get_option( 'woocommerce_enable_review_rating' )
-			&& 'yes' === get_option( 'woocommerce_review_rating_required' )
-		) {
+		if ( ! is_admin() && isset( $_POST['comment_post_ID'], $_POST['rating'], $comment_data['comment_type'] ) && 'product' === get_post_type( $_POST['comment_post_ID'] ) && empty( $_POST['rating'] ) && '' === $comment_data['comment_type'] && 'yes' === get_option( 'woocommerce_enable_review_rating' ) && 'yes' === get_option( 'woocommerce_review_rating_required' ) ) {
 			wp_die( __( 'Please rate the product.', 'woocommerce' ) );
 			exit;
 		}
-
 		return $comment_data;
 	}
 
@@ -208,11 +205,18 @@ class WC_Comments {
 				return;
 			}
 			add_comment_meta( $comment_id, 'rating', (int) esc_attr( $_POST['rating'] ), true );
+
+			$post_id = isset( $_POST['comment_post_ID'] ) ? (int) $_POST['comment_post_ID'] : 0;
+			if ( $post_id ) {
+				self::clear_transients( $post_id );
+			}
 		}
 	}
 
 	/**
 	 * Modify recipient of review email.
+	 * @param array $emails
+	 * @param int $comment_id
 	 * @return array
 	 */
 	public static function comment_moderation_recipients( $emails, $comment_id ) {
@@ -230,52 +234,81 @@ class WC_Comments {
 	 * @param int $post_id
 	 */
 	public static function clear_transients( $post_id ) {
-		delete_post_meta( $post_id, '_wc_average_rating' );
-		delete_post_meta( $post_id, '_wc_rating_count' );
-		delete_post_meta( $post_id, '_wc_review_count' );
+
+		if ( 'product' === get_post_type( $post_id ) ) {
+			$product = wc_get_product( $post_id );
+			self::get_rating_counts_for_product( $product );
+			self::get_average_rating_for_product( $product );
+			self::get_review_count_for_product( $product );
+		}
 	}
 
 	/**
-	 * Remove order notes from wp_count_comments().
+	 * Delete comments count cache whenever there is
+	 * new comment or the status of a comment changes. Cache
+	 * will be regenerated next time WC_Comments::wp_count_comments()
+	 * is called.
+	 *
+	 * @return void
+	 */
+	public static function delete_comments_count_cache() {
+		delete_transient( 'wc_count_comments' );
+	}
+
+	/**
+	 * Remove order notes and webhook delivery logs from wp_count_comments().
+	 *
 	 * @since  2.2
-	 * @param  object $stats
-	 * @param  int $post_id
+	 * @param  object $stats   Comment stats.
+	 * @param  int    $post_id Post ID.
 	 * @return object
 	 */
 	public static function wp_count_comments( $stats, $post_id ) {
 		global $wpdb;
 
 		if ( 0 === $post_id ) {
+			$stats = get_transient( 'wc_count_comments' );
 
-			$count = wp_cache_get( 'comments-0', 'counts' );
-			if ( false !== $count ) {
-				return $count;
-			}
+			if ( ! $stats ) {
+				$stats = array();
 
-			$count = $wpdb->get_results( "SELECT comment_approved, COUNT( * ) AS num_comments FROM {$wpdb->comments} WHERE comment_type != 'order_note' GROUP BY comment_approved", ARRAY_A );
+				$count = $wpdb->get_results( "
+					SELECT comment_approved, COUNT(*) AS num_comments
+					FROM {$wpdb->comments}
+					WHERE comment_type NOT IN ('order_note', 'webhook_delivery')
+					GROUP BY comment_approved
+				", ARRAY_A );
 
-			$total = 0;
-			$approved = array( '0' => 'moderated', '1' => 'approved', 'spam' => 'spam', 'trash' => 'trash', 'post-trashed' => 'post-trashed' );
+				$total = 0;
+				$approved = array(
+					'0'            => 'moderated',
+					'1'            => 'approved',
+					'spam'         => 'spam',
+					'trash'        => 'trash',
+					'post-trashed' => 'post-trashed',
+				);
 
-			foreach ( (array) $count as $row ) {
-				// Don't count post-trashed toward totals
-				if ( 'post-trashed' != $row['comment_approved'] && 'trash' != $row['comment_approved'] ) {
-					$total += $row['num_comments'];
+				foreach ( (array) $count as $row ) {
+					// Don't count post-trashed toward totals.
+					if ( 'post-trashed' !== $row['comment_approved'] && 'trash' !== $row['comment_approved'] ) {
+						$total += $row['num_comments'];
+					}
+					if ( isset( $approved[ $row['comment_approved'] ] ) ) {
+						$stats[ $approved[ $row['comment_approved'] ] ] = $row['num_comments'];
+					}
 				}
-				if ( isset( $approved[ $row['comment_approved'] ] ) ) {
-					$stats[ $approved[ $row['comment_approved'] ] ] = $row['num_comments'];
-				}
-			}
 
-			$stats['total_comments'] = $total;
-			foreach ( $approved as $key ) {
-				if ( empty( $stats[ $key ] ) ) {
-					$stats[ $key ] = 0;
+				$stats['total_comments'] = $total;
+				$stats['all'] = $total;
+				foreach ( $approved as $key ) {
+					if ( empty( $stats[ $key ] ) ) {
+						$stats[ $key ] = 0;
+					}
 				}
-			}
 
-			$stats = (object) $stats;
-			wp_cache_set( 'comments-0', $stats, 'counts' );
+				$stats = (object) $stats;
+				set_transient( 'wc_count_comments', $stats );
+			}
 		}
 
 		return $stats;
@@ -305,6 +338,98 @@ class WC_Comments {
 		}
 		return $verified;
 	}
+
+	/**
+	 * Get product rating for a product. Please note this is not cached.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Product $product
+	 * @return float
+	 */
+	public static function get_average_rating_for_product( &$product ) {
+		global $wpdb;
+
+		$count = $product->get_rating_count();
+
+		if ( $count ) {
+			$ratings = $wpdb->get_var( $wpdb->prepare("
+				SELECT SUM(meta_value) FROM $wpdb->commentmeta
+				LEFT JOIN $wpdb->comments ON $wpdb->commentmeta.comment_id = $wpdb->comments.comment_ID
+				WHERE meta_key = 'rating'
+				AND comment_post_ID = %d
+				AND comment_approved = '1'
+				AND meta_value > 0
+			", $product->get_id() ) );
+			$average = number_format( $ratings / $count, 2, '.', '' );
+		} else {
+			$average = 0;
+		}
+
+		$product->set_average_rating( $average );
+
+		$data_store = $product->get_data_store();
+		$data_store->update_average_rating( $product );
+
+		return $average;
+	}
+
+	/**
+	 * Get product review count for a product (not replies). Please note this is not cached.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Product $product
+	 * @return int
+	 */
+	public static function get_review_count_for_product( &$product ) {
+		global $wpdb;
+
+		$count = $wpdb->get_var( $wpdb->prepare("
+			SELECT COUNT(*) FROM $wpdb->comments
+			WHERE comment_parent = 0
+			AND comment_post_ID = %d
+			AND comment_approved = '1'
+		", $product->get_id() ) );
+
+		$product->set_review_count( $count );
+
+		$data_store = $product->get_data_store();
+		$data_store->update_review_count( $product );
+
+		return $count;
+	}
+
+	/**
+	 * Get product rating count for a product. Please note this is not cached.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Product $product
+	 * @return array of integers
+	 */
+	public static function get_rating_counts_for_product( &$product ) {
+		global $wpdb;
+
+		$counts     = array();
+		$raw_counts = $wpdb->get_results( $wpdb->prepare( "
+			SELECT meta_value, COUNT( * ) as meta_value_count FROM $wpdb->commentmeta
+			LEFT JOIN $wpdb->comments ON $wpdb->commentmeta.comment_id = $wpdb->comments.comment_ID
+			WHERE meta_key = 'rating'
+			AND comment_post_ID = %d
+			AND comment_approved = '1'
+			AND meta_value > 0
+			GROUP BY meta_value
+		", $product->get_id() ) );
+
+		foreach ( $raw_counts as $count ) {
+			$counts[ $count->meta_value ] = absint( $count->meta_value_count );
+		}
+
+		$product->set_rating_counts( $counts );
+
+		$data_store = $product->get_data_store();
+		$data_store->update_rating_counts( $product );
+
+		return $counts;
+	}
 }
 
 WC_Comments::init();
diff --git a/includes/class-wc-countries.php b/includes/class-wc-countries.php
index bebd06ae97f..7e2dc4b6ab3 100644
--- a/includes/class-wc-countries.php
+++ b/includes/class-wc-countries.php
@@ -50,6 +50,35 @@ class WC_Countries {
 		return $this->countries;
 	}
 
+	/**
+	 * Get all continents.
+	 * @return array
+	 */
+	public function get_continents() {
+		if ( empty( $this->continents ) ) {
+			$this->continents = apply_filters( 'woocommerce_continents', include( WC()->plugin_path() . '/i18n/continents.php' ) );
+		}
+		return $this->continents;
+	}
+
+	/**
+	 * Get continent code for a country code.
+	 * @since 2.6.0
+	 * @param string $cc string
+	 * @return string
+	 */
+	public function get_continent_code_for_country( $cc ) {
+		$cc                 = trim( strtoupper( $cc ) );
+		$continents         = $this->get_continents();
+		$continents_and_ccs = wp_list_pluck( $continents, 'countries' );
+		foreach ( $continents_and_ccs as $continent_code => $countries ) {
+			if ( false !== array_search( $cc, $countries ) ) {
+				return $continent_code;
+			}
+		}
+		return '';
+	}
+
 	/**
 	 * Load the states.
 	 */
@@ -69,25 +98,32 @@ class WC_Countries {
 			'EE' => array(),
 			'FI' => array(),
 			'FR' => array(),
+			'GP' => array(),
+			'GF' => array(),
 			'IS' => array(),
 			'IL' => array(),
 			'KR' => array(),
+			'KW' => array(),
+			'LB' => array(),
+			'MQ' => array(),
 			'NL' => array(),
 			'NO' => array(),
 			'PL' => array(),
 			'PT' => array(),
+			'RE' => array(),
 			'SG' => array(),
 			'SK' => array(),
 			'SI' => array(),
 			'LK' => array(),
 			'SE' => array(),
 			'VN' => array(),
+			'YT' => array(),
 		);
 
 		// Load only the state files the shop owner wants/needs.
 		$allowed = array_merge( $this->get_allowed_countries(), $this->get_shipping_countries() );
 
-		if ( $allowed ) {
+		if ( ! empty( $allowed ) ) {
 			foreach ( $allowed as $code => $country ) {
 				if ( ! isset( $states[ $code ] ) && file_exists( WC()->plugin_path() . '/i18n/states/' . $code . '.php' ) ) {
 					include( WC()->plugin_path() . '/i18n/states/' . $code . '.php' );
@@ -154,16 +190,32 @@ class WC_Countries {
 	 * @return array
 	 */
 	public function get_allowed_countries() {
-		if ( get_option( 'woocommerce_allowed_countries' ) !== 'specific' ) {
+		if ( 'all' === get_option( 'woocommerce_allowed_countries' ) ) {
 			return $this->countries;
 		}
 
+		if ( 'all_except' === get_option( 'woocommerce_allowed_countries' ) ) {
+			$except_countries = get_option( 'woocommerce_all_except_countries', array() );
+
+			if ( ! $except_countries ) {
+				return $this->countries;
+			} else {
+				$all_except_countries = $this->countries;
+				foreach ( $except_countries as $country ) {
+					unset( $all_except_countries[ $country ] );
+				}
+				return apply_filters( 'woocommerce_countries_allowed_countries', $all_except_countries );
+			}
+		}
+
 		$countries = array();
 
-		$raw_countries = get_option( 'woocommerce_specific_allowed_countries' );
+		$raw_countries = get_option( 'woocommerce_specific_allowed_countries', array() );
 
-		foreach ( $raw_countries as $country ) {
-			$countries[ $country ] = $this->countries[ $country ];
+		if ( $raw_countries ) {
+			foreach ( $raw_countries as $country ) {
+				$countries[ $country ] = $this->countries[ $country ];
+			}
 		}
 
 		return apply_filters( 'woocommerce_countries_allowed_countries', $countries );
@@ -174,11 +226,11 @@ class WC_Countries {
 	 * @return array
 	 */
 	public function get_shipping_countries() {
-		if ( get_option( 'woocommerce_ship_to_countries' ) == '' ) {
+		if ( '' === get_option( 'woocommerce_ship_to_countries' ) ) {
 			return $this->get_allowed_countries();
 		}
 
-		if ( get_option( 'woocommerce_ship_to_countries' ) !== 'specific' ) {
+		if ( 'all' === get_option( 'woocommerce_ship_to_countries' ) ) {
 			return $this->countries;
 		}
 
@@ -186,15 +238,17 @@ class WC_Countries {
 
 		$raw_countries = get_option( 'woocommerce_specific_ship_to_countries' );
 
-		foreach ( $raw_countries as $country ) {
-			$countries[ $country ] = $this->countries[ $country ];
+		if ( $raw_countries ) {
+			foreach ( $raw_countries as $country ) {
+				$countries[ $country ] = $this->countries[ $country ];
+			}
 		}
 
 		return apply_filters( 'woocommerce_countries_shipping_countries', $countries );
 	}
 
 	/**
-	 * get_allowed_country_states function.
+	 * Get allowed country states.
 	 * @return array
 	 */
 	public function get_allowed_country_states() {
@@ -206,9 +260,11 @@ class WC_Countries {
 
 		$raw_countries = get_option( 'woocommerce_specific_allowed_countries' );
 
-		foreach ( $raw_countries as $country ) {
-			if ( isset( $this->states[ $country ] ) ) {
-				$states[ $country ] = $this->states[ $country ];
+		if ( $raw_countries ) {
+			foreach ( $raw_countries as $country ) {
+				if ( isset( $this->states[ $country ] ) ) {
+					$states[ $country ] = $this->states[ $country ];
+				}
 			}
 		}
 
@@ -216,7 +272,7 @@ class WC_Countries {
 	}
 
 	/**
-	 * get_shipping_country_states function.
+	 * Get shipping country states.
 	 * @return array
 	 */
 	public function get_shipping_country_states() {
@@ -232,9 +288,11 @@ class WC_Countries {
 
 		$raw_countries = get_option( 'woocommerce_specific_ship_to_countries' );
 
-		foreach ( $raw_countries as $country ) {
-			if ( ! empty( $this->states[ $country ] ) ) {
-				$states[ $country ] = $this->states[ $country ];
+		if ( $raw_countries ) {
+			foreach ( $raw_countries as $country ) {
+				if ( ! empty( $this->states[ $country ] ) ) {
+					$states[ $country ] = $this->states[ $country ];
+				}
 			}
 		}
 
@@ -264,22 +322,24 @@ class WC_Countries {
 	 * Gets the correct string for shipping - either 'to the' or 'to'
 	 * @return string
 	 */
-	public function shipping_to_prefix() {
-		$countries  = array( 'GB', 'US', 'AE', 'CZ', 'DO', 'NL', 'PH', 'USAF' );
-		$return     = in_array( WC()->customer->get_shipping_country(), $countries ) ? __( 'to the', 'woocommerce' ) : __( 'to', 'woocommerce' );
+	public function shipping_to_prefix( $country_code = '' ) {
+		$country_code = $country_code ? $country_code : WC()->customer->get_shipping_country();
+		$countries    = array( 'GB', 'US', 'AE', 'CZ', 'DO', 'NL', 'PH', 'USAF' );
+		$return       = in_array( $country_code, $countries ) ? __( 'to the', 'woocommerce' ) : __( 'to', 'woocommerce' );
 
-		return apply_filters( 'woocommerce_countries_shipping_to_prefix', $return, WC()->customer->get_shipping_country() );
+		return apply_filters( 'woocommerce_countries_shipping_to_prefix', $return, $country_code );
 	}
 
 	/**
 	 * Prefix certain countries with 'the'
 	 * @return string
 	 */
-	public function estimated_for_prefix() {
-		$countries  = array( 'GB', 'US', 'AE', 'CZ', 'DO', 'NL', 'PH', 'USAF' );
-		$return     = in_array( $this->get_base_country(), $countries ) ? __( 'the', 'woocommerce' ) . ' ' : '';
+	public function estimated_for_prefix( $country_code = '' ) {
+		$country_code = $country_code ? $country_code : $this->get_base_country();
+		$countries    = array( 'GB', 'US', 'AE', 'CZ', 'DO', 'NL', 'PH', 'USAF' );
+		$return       = in_array( $country_code, $countries ) ? __( 'the', 'woocommerce' ) . ' ' : '';
 
-		return apply_filters( 'woocommerce_countries_estimated_for_prefix', $return, $this->get_base_country() );
+		return apply_filters( 'woocommerce_countries_estimated_for_prefix', $return, $country_code );
 	}
 
 	/**
@@ -316,80 +376,81 @@ class WC_Countries {
 	 * Outputs the list of countries and states for use in dropdown boxes.
 	 * @param string $selected_country (default: '')
 	 * @param string $selected_state (default: '')
+	 * @param bool $escape (default: false)
 	 * @param bool   $escape (default: false)
 	 */
 	public function country_dropdown_options( $selected_country = '', $selected_state = '', $escape = false ) {
-		if ( $this->countries ) foreach ( $this->countries as $key => $value ) :
-			if ( $states = $this->get_states( $key ) ) :
-				echo '<optgroup label="' . esc_attr( $value ) . '">';
-					foreach ( $states as $state_key => $state_value ) :
+		if ( $this->countries ) :
+			foreach ( $this->countries as $key => $value ) :
+				if ( $states = $this->get_states( $key ) ) :
+					echo '<optgroup label="' . esc_attr( $value ) . '">';
+						foreach ( $states as $state_key => $state_value ) :
 						echo '<option value="' . esc_attr( $key ) . ':' . $state_key . '"';
 
 						if ( $selected_country == $key && $selected_state == $state_key ) {
 							echo ' selected="selected"';
-						}
+							}
 
 						echo '>' . $value . ' &mdash; ' . ( $escape ? esc_js( $state_value ) : $state_value ) . '</option>';
-					endforeach;
-				echo '</optgroup>';
-			else :
-				echo '<option';
-				if ( $selected_country == $key && $selected_state == '*' ) {
-					echo ' selected="selected"';
-				}
-				echo ' value="' . esc_attr( $key ) . '">' . ( $escape ? esc_js( $value ) : $value ) . '</option>';
-			endif;
-		endforeach;
+						endforeach;
+					echo '</optgroup>';
+				else :
+					echo '<option';
+					if ( $selected_country == $key && '*' == $selected_state ) {
+						echo ' selected="selected"';
+					}
+					echo ' value="' . esc_attr( $key ) . '">' . ( $escape ? esc_js( $value ) : $value ) . '</option>';
+				endif;
+			endforeach;
+		endif;
 	}
 
 	/**
 	 * Get country address formats.
+	 *
+	 * These define how addresses are formatted for display in various countries.
+	 *
 	 * @return array
 	 */
 	public function get_address_formats() {
-		if ( ! $this->address_formats ) :
-
-			// Common formats
-			$postcode_before_city = "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}";
-
-			// Define address formats
+		if ( empty( $this->address_formats ) ) {
 			$this->address_formats = apply_filters( 'woocommerce_localisation_address_formats', array(
 				'default' => "{name}\n{company}\n{address_1}\n{address_2}\n{city}\n{state}\n{postcode}\n{country}",
 				'AU' => "{name}\n{company}\n{address_1}\n{address_2}\n{city} {state} {postcode}\n{country}",
-				'AT' => $postcode_before_city,
-				'BE' => $postcode_before_city,
+				'AT' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
+				'BE' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
 				'CA' => "{company}\n{name}\n{address_1}\n{address_2}\n{city} {state} {postcode}\n{country}",
-				'CH' => $postcode_before_city,
+				'CH' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
 				'CL' => "{company}\n{name}\n{address_1}\n{address_2}\n{state}\n{postcode} {city}\n{country}",
 				'CN' => "{country} {postcode}\n{state}, {city}, {address_2}, {address_1}\n{company}\n{name}",
-				'CZ' => $postcode_before_city,
-				'DE' => $postcode_before_city,
-				'EE' => $postcode_before_city,
-				'FI' => $postcode_before_city,
-				'DK' => $postcode_before_city,
+				'CZ' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
+				'DE' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
+				'EE' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
+				'FI' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
+				'DK' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
 				'FR' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city_upper}\n{country}",
 				'HK' => "{company}\n{first_name} {last_name_upper}\n{address_1}\n{address_2}\n{city_upper}\n{state_upper}\n{country}",
 				'HU' => "{name}\n{company}\n{city}\n{address_1}\n{address_2}\n{postcode}\n{country}",
 				'IN' => "{company}\n{name}\n{address_1}\n{address_2}\n{city} - {postcode}\n{state}, {country}",
-				'IS' => $postcode_before_city,
+				'IS' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
 				'IT' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode}\n{city}\n{state_upper}\n{country}",
 				'JP' => "{postcode}\n{state}{city}{address_1}\n{address_2}\n{company}\n{last_name} {first_name}\n{country}",
 				'TW' => "{company}\n{last_name} {first_name}\n{address_1}\n{address_2}\n{state}, {city} {postcode}\n{country}",
-				'LI' => $postcode_before_city,
-				'NL' => $postcode_before_city,
+				'LI' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
+				'NL' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
 				'NZ' => "{name}\n{company}\n{address_1}\n{address_2}\n{city} {postcode}\n{country}",
-				'NO' => $postcode_before_city,
-				'PL' => $postcode_before_city,
-				'SK' => $postcode_before_city,
-				'SI' => $postcode_before_city,
+				'NO' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
+				'PL' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
+				'PT' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
+				'SK' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
+				'SI' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
 				'ES' => "{name}\n{company}\n{address_1}\n{address_2}\n{postcode} {city}\n{state}\n{country}",
-				'SE' => $postcode_before_city,
+				'SE' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
 				'TR' => "{name}\n{company}\n{address_1}\n{address_2}\n{postcode} {city} {state}\n{country}",
 				'US' => "{name}\n{company}\n{address_1}\n{address_2}\n{city}, {state_code} {postcode}\n{country}",
 				'VN' => "{name}\n{company}\n{address_1}\n{city}\n{country}",
-			));
-		endif;
-
+			) );
+		}
 		return $this->address_formats;
 	}
 
@@ -408,7 +469,7 @@ class WC_Countries {
 			'city'       => '',
 			'state'      => '',
 			'postcode'   => '',
-			'country'    => ''
+			'country'    => '',
 		);
 
 		$args = array_map( 'trim', wp_parse_args( $args, $default_args ) );
@@ -475,7 +536,7 @@ class WC_Countries {
 
 	/**
 	 * Trim white space and commas off a line.
-	 * @param  string
+	 * @param  string $line
 	 * @return string
 	 */
 	private function trim_formatted_address_line( $line ) {
@@ -489,57 +550,73 @@ class WC_Countries {
 	public function get_default_address_fields() {
 		$fields = array(
 			'first_name' => array(
-				'label'    => __( 'First Name', 'woocommerce' ),
-				'required' => true,
-				'class'    => array( 'form-row-first' ),
+				'label'        => __( 'First name', 'woocommerce' ),
+				'required'     => true,
+				'class'        => array( 'form-row-first' ),
+				'autocomplete' => 'given-name',
+				'autofocus'    => true,
+				'priority'     => 10,
 			),
 			'last_name' => array(
-				'label'    => __( 'Last Name', 'woocommerce' ),
-				'required' => true,
-				'class'    => array( 'form-row-last' ),
-				'clear'    => true
+				'label'        => __( 'Last name', 'woocommerce' ),
+				'required'     => true,
+				'class'        => array( 'form-row-last' ),
+				'autocomplete' => 'family-name',
+				'priority'     => 20,
 			),
 			'company' => array(
-				'label' => __( 'Company Name', 'woocommerce' ),
-				'class' => array( 'form-row-wide' ),
+				'label'        => __( 'Company name', 'woocommerce' ),
+				'class'        => array( 'form-row-wide' ),
+				'autocomplete' => 'organization',
+				'priority'     => 30,
 			),
 			'country' => array(
-				'type'     => 'country',
-				'label'    => __( 'Country', 'woocommerce' ),
-				'required' => true,
-				'class'    => array( 'form-row-wide', 'address-field', 'update_totals_on_change' ),
+				'type'         => 'country',
+				'label'        => __( 'Country', 'woocommerce' ),
+				'required'     => true,
+				'class'        => array( 'form-row-wide', 'address-field', 'update_totals_on_change' ),
+				'autocomplete' => 'country',
+				'priority'     => 40,
 			),
 			'address_1' => array(
-				'label'       => __( 'Address', 'woocommerce' ),
-				'placeholder' => _x( 'Street address', 'placeholder', 'woocommerce' ),
-				'required'    => true,
-				'class'       => array( 'form-row-wide', 'address-field' )
+				'label'        => __( 'Street address', 'woocommerce' ),
+				/* translators: use local order of street name and house number. */
+				'placeholder'  => esc_attr__( 'House number and street name', 'woocommerce' ),
+				'required'     => true,
+				'class'        => array( 'form-row-wide', 'address-field' ),
+				'autocomplete' => 'address-line1',
+				'priority'     => 50,
 			),
 			'address_2' => array(
-				'placeholder' => _x( 'Apartment, suite, unit etc. (optional)', 'placeholder', 'woocommerce' ),
-				'class'       => array( 'form-row-wide', 'address-field' ),
-				'required'    => false
+				'placeholder'  => esc_attr__( 'Apartment, suite, unit etc. (optional)', 'woocommerce' ),
+				'class'        => array( 'form-row-wide', 'address-field' ),
+				'required'     => false,
+				'autocomplete' => 'address-line2',
+				'priority'     => 60,
 			),
 			'city' => array(
-				'label'       => __( 'Town / City', 'woocommerce' ),
-				'placeholder' => __( 'Town / City', 'woocommerce' ),
-				'required'    => true,
-				'class'       => array( 'form-row-wide', 'address-field' )
+				'label'        => __( 'Town / City', 'woocommerce' ),
+				'required'     => true,
+				'class'        => array( 'form-row-wide', 'address-field' ),
+				'autocomplete' => 'address-level2',
+				'priority'     => 70,
 			),
 			'state' => array(
-				'type'        => 'state',
-				'label'       => __( 'State / County', 'woocommerce' ),
-				'required'    => true,
-				'class'       => array( 'form-row-first', 'address-field' ),
-				'validate'    => array( 'state' )
+				'type'         => 'state',
+				'label'        => __( 'State / County', 'woocommerce' ),
+				'required'     => true,
+				'class'        => array( 'form-row-wide', 'address-field' ),
+				'validate'     => array( 'state' ),
+				'autocomplete' => 'address-level1',
+				'priority'     => 80,
 			),
 			'postcode' => array(
-				'label'       => __( 'Postcode / ZIP', 'woocommerce' ),
-				'placeholder' => __( 'Postcode / ZIP', 'woocommerce' ),
-				'required'    => true,
-				'class'       => array( 'form-row-last', 'address-field' ),
-				'clear'       => true,
-				'validate'    => array( 'postcode' )
+				'label'        => __( 'Postcode / ZIP', 'woocommerce' ),
+				'required'     => true,
+				'class'        => array( 'form-row-wide', 'address-field' ),
+				'validate'     => array( 'postcode' ),
+				'autocomplete' => 'postal-code',
+				'priority'     => 90,
 			),
 		);
 
@@ -551,7 +628,7 @@ class WC_Countries {
 	 * @return array
 	 */
 	public function get_country_locale_field_selectors() {
-		$locale_fields = array (
+		$locale_fields = array(
 			'address_1' => '#billing_address_1_field, #shipping_address_1_field',
 			'address_2' => '#billing_address_2_field, #shipping_address_2_field',
 			'state'     => '#billing_state_field, #shipping_state_field, #calc_shipping_state_field',
@@ -563,66 +640,70 @@ class WC_Countries {
 
 	/**
 	 * Get country locale settings.
+	 *
+	 * These locales override the default country selections after a country is chosen.
+	 *
 	 * @return array
-	 * @todo  [2.4] Check select2 4.0.0 compatibility with `placeholder` attribute and uncomment relevant lines. https://github.com/woothemes/woocommerce/issues/7729
 	 */
 	public function get_country_locale() {
-		if ( ! $this->locale ) {
-
-			// Locale information used by the checkout
+		if ( empty( $this->locale ) ) {
 			$this->locale = apply_filters( 'woocommerce_get_country_locale', array(
 				'AE' => array(
 					'postcode' => array(
 						'required' => false,
-						'hidden'   => true
+						'hidden'   => true,
 					),
-				),
+                    'state' => array(
+                        'required' => false,
+					),
+                ),
 				'AF' => array(
 					'state' => array(
 						'required' => false,
 					),
 				),
 				'AT' => array(
-					'postcode_before_city' => true,
+					'postcode' => array(
+						'priority' => 65,
+					),
 					'state' => array(
-						'required' => false
-					)
+						'required' => false,
+					),
 				),
 				'AU' => array(
 					'city'      => array(
 						'label'       => __( 'Suburb', 'woocommerce' ),
-						'placeholder' => __( 'Suburb', 'woocommerce' ),
 					),
 					'postcode'  => array(
 						'label'       => __( 'Postcode', 'woocommerce' ),
-						'placeholder' => __( 'Postcode', 'woocommerce' ),
 					),
 					'state'     => array(
 						'label'       => __( 'State', 'woocommerce' ),
-						//'placeholder' => __( 'State', 'woocommerce' ),
-					)
+					),
 				),
 				'AX' => array(
-					'postcode_before_city' => true,
+					'postcode' => array(
+						'priority' => 65,
+					),
 					'state' => array(
 						'required' => false,
 					),
 				),
 				'BD' => array(
 					'postcode' => array(
-						'required' => false
+						'required' => false,
 					),
 					'state' => array(
 						'label'       => __( 'District', 'woocommerce' ),
-						//'placeholder' => __( 'District', 'woocommerce' ),
-					)
+					),
 				),
 				'BE' => array(
-					'postcode_before_city' => true,
+					'postcode' => array(
+						'priority' => 65,
+					),
 					'state' => array(
 						'required'    => false,
 						'label'       => __( 'Province', 'woocommerce' ),
-						//'placeholder' => __( 'Province', 'woocommerce' ),
 					),
 				),
 				'BI' => array(
@@ -633,296 +714,364 @@ class WC_Countries {
 				'BO' => array(
 					'postcode' => array(
 						'required' => false,
-						'hidden'   => true
+						'hidden'   => true,
 					),
 				),
 				'BS' => array(
 					'postcode' => array(
 						'required' => false,
-						'hidden'   => true
+						'hidden'   => true,
 					),
 				),
 				'CA' => array(
 					'state' => array(
 						'label'       => __( 'Province', 'woocommerce' ),
-						//'placeholder' => __( 'Province', 'woocommerce' ),
-					)
+					),
 				),
 				'CH' => array(
-					'postcode_before_city' => true,
+					'postcode' => array(
+						'priority' => 65,
+					),
 					'state' => array(
 						'label'       => __( 'Canton', 'woocommerce' ),
-						//'placeholder' => __( 'Canton', 'woocommerce' ),
-						'required'    => false
-					)
+						'required'    => false,
+					),
 				),
 				'CL' => array(
 					'city'      => array(
 						'required' 	=> true,
 					),
 					'postcode'  => array(
-						'required' => false
+						'required' => false,
 					),
 					'state'     => array(
 						'label'       => __( 'Region', 'woocommerce' ),
-						//'placeholder' => __( 'Region', 'woocommerce' )
-					)
+					),
 				),
 				'CN' => array(
 					'state' => array(
 						'label'       => __( 'Province', 'woocommerce' ),
-						//'placeholder' => __( 'Province', 'woocommerce' ),
-					)
+					),
 				),
 				'CO' => array(
 					'postcode' => array(
-						'required' => false
-					)
+						'required' => false,
+					),
 				),
 				'CZ' => array(
 					'state' => array(
-						'required' => false
-					)
+						'required' => false,
+					),
 				),
 				'DE' => array(
-					'postcode_before_city' => true,
+					'postcode' => array(
+						'priority' => 65,
+					),
 					'state' => array(
-						'required' => false
-					)
+						'required' => false,
+					),
 				),
 				'DK' => array(
-					'postcode_before_city' => true,
+					'postcode' => array(
+						'priority' => 65,
+					),
 					'state' => array(
-						'required' => false
-					)
+						'required' => false,
+					),
 				),
 				'EE' => array(
-					'postcode_before_city' => true,
+					'postcode' => array(
+						'priority' => 65,
+					),
 					'state' => array(
-						'required' => false
-					)
+						'required' => false,
+					),
 				),
 				'FI' => array(
-					'postcode_before_city' => true,
+					'postcode' => array(
+						'priority' => 65,
+					),
 					'state' => array(
-						'required' => false
-					)
+						'required' => false,
+					),
 				),
 				'FR' => array(
-					'postcode_before_city' => true,
+					'postcode' => array(
+						'priority' => 65,
+					),
 					'state' => array(
-						'required' => false
-					)
+						'required' => false,
+					),
+				),
+				'GP' => array(
+					'state' => array(
+						'required' => false,
+					),
+				),
+				'GF' => array(
+					'state' => array(
+						'required' => false,
+					),
 				),
 				'HK' => array(
 					'postcode' => array(
-						'required' => false
+						'required' => false,
 					),
 					'city'  => array(
 						'label'       => __( 'Town / District', 'woocommerce' ),
-						'placeholder' => __( 'Town / District', 'woocommerce' )
 					),
 					'state' => array(
 						'label'       => __( 'Region', 'woocommerce' ),
-						//'placeholder' => __( 'Region', 'woocommerce' ),
-					)
+					),
 				),
 				'HU' => array(
 					'state' => array(
 						'label'       => __( 'County', 'woocommerce' ),
-						//'placeholder' => __( 'County', 'woocommerce' ),
-					)
+					),
 				),
 				'ID' => array(
 					'state' => array(
 						'label'       => __( 'Province', 'woocommerce' ),
-						//'placeholder' => __( 'Province', 'woocommerce' ),
-					)
+					),
+				),
+				'IE' => array(
+					'postcode' => array(
+						'required' => false,
+						'label'    => __( 'Eircode', 'woocommerce' ),
+					),
+					'state' => array(
+						'label'       => __( 'County', 'woocommerce' ),
+					),
 				),
 				'IS' => array(
-					'postcode_before_city' => true,
+					'postcode' => array(
+						'priority' => 65,
+					),
 					'state' => array(
-						'required' => false
-					)
+						'required' => false,
+					),
 				),
 				'IL' => array(
-					'postcode_before_city' => true,
+					'postcode' => array(
+						'priority' => 65,
+					),
 					'state' => array(
-						'required' => false
-					)
+						'required' => false,
+					),
 				),
 				'IT' => array(
-					'postcode_before_city' => true,
+					'postcode' => array(
+						'priority' => 65,
+					),
 					'state' => array(
 						'required'    => true,
 						'label'       => __( 'Province', 'woocommerce' ),
-						//'placeholder' => __( 'Province', 'woocommerce' ),
-					)
+					),
 				),
 				'JP' => array(
 					'state' => array(
-						'label' => __( 'Prefecture', 'woocommerce' )
-					)
+						'label' => __( 'Prefecture', 'woocommerce' ),
+						'priority' => 66,
+					),
+					'postcode' => array(
+						'priority' => 65,
+					),
 				),
 				'KR' => array(
 					'state' => array(
-						'required' => false
-					)
+						'required' => false,
+					),
+				),
+				'KW' => array(
+					'state' => array(
+						'required' => false,
+					),
+				),
+				'LB' => array(
+					'state' => array(
+						'required' => false,
+					),
+				),
+				'MQ' => array(
+					'state' => array(
+						'required' => false,
+					),
 				),
 				'NL' => array(
-					'postcode_before_city' => true,
+					'postcode' => array(
+						'priority' => 65,
+					),
 					'state' => array(
 						'required'    => false,
 						'label'       => __( 'Province', 'woocommerce' ),
-						//'placeholder' => __( 'Province', 'woocommerce' ),
-					)
+					),
 				),
 				'NZ' => array(
+					'postcode' => array(
+						'label' => __( 'Postcode', 'woocommerce' ),
+					),
 					'state' => array(
-						'required' => false
-					)
+						'required' => false,
+						'label'    => __( 'Region', 'woocommerce' ),
+					),
 				),
 				'NO' => array(
-					'postcode_before_city' => true,
+					'postcode' => array(
+						'priority' => 65,
+					),
 					'state' => array(
-						'required' => false
-					)
+						'required' => false,
+					),
 				),
 				'NP' => array(
 					'state' => array(
 						'label'       => __( 'State / Zone', 'woocommerce' ),
-						//'placeholder' => __( 'State / Zone', 'woocommerce' ),
 					),
 					'postcode' => array(
-						'required' => false
-					)
+						'required' => false,
+					),
 				),
 				'PL' => array(
-					'postcode_before_city' => true,
+					'postcode' => array(
+						'priority' => 65,
+					),
 					'state' => array(
-						'required' => false
-					)
+						'required' => false,
+					),
 				),
 				'PT' => array(
 					'state' => array(
-						'required' => false
-					)
+						'required' => false,
+					),
+				),
+				'RE' => array(
+					'state' => array(
+						'required' => false,
+					),
 				),
 				'RO' => array(
 					'state' => array(
-						'required' => false
-					)
+						'required' => false,
+					),
 				),
 				'SG' => array(
 					'state' => array(
-						'required' => false
-					)
+						'required' => false,
+					),
 				),
 				'SK' => array(
-					'postcode_before_city' => true,
+					'postcode' => array(
+						'priority' => 65,
+					),
 					'state' => array(
-						'required' => false
-					)
+						'required' => false,
+					),
 				),
 				'SI' => array(
-					'postcode_before_city' => true,
+					'postcode' => array(
+						'priority' => 65,
+					),
 					'state' => array(
-						'required' => false
-					)
+						'required' => false,
+					),
 				),
 				'ES' => array(
-					'postcode_before_city' => true,
+					'postcode' => array(
+						'priority' => 65,
+					),
 					'state' => array(
 						'label'       => __( 'Province', 'woocommerce' ),
-						//'placeholder' => __( 'Province', 'woocommerce' ),
-					)
+					),
 				),
 				'LI' => array(
-					'postcode_before_city' => true,
+					'postcode' => array(
+						'priority' => 65,
+					),
 					'state' => array(
 						'label'       => __( 'Municipality', 'woocommerce' ),
-						//'placeholder' => __( 'Municipality', 'woocommerce' ),
-						'required'    => false
-					)
+						'required'    => false,
+					),
 				),
 				'LK' => array(
 					'state' => array(
-						'required' => false
-					)
+						'required' => false,
+					),
 				),
 				'SE' => array(
-					'postcode_before_city' => true,
+					'postcode' => array(
+						'priority' => 65,
+					),
 					'state' => array(
-						'required' => false
-					)
+						'required' => false,
+					),
 				),
 				'TR' => array(
-					'postcode_before_city' => true,
+					'postcode' => array(
+						'priority' => 65,
+					),
 					'state' => array(
 						'label'       => __( 'Province', 'woocommerce' ),
-						//'placeholder' => __( 'Province', 'woocommerce' ),
-					)
+					),
 				),
 				'US' => array(
 					'postcode'  => array(
 						'label'       => __( 'ZIP', 'woocommerce' ),
-						'placeholder' => __( 'ZIP', 'woocommerce' ),
 					),
 					'state'     => array(
 						'label'       => __( 'State', 'woocommerce' ),
-						//'placeholder' => __( 'State', 'woocommerce' ),
-					)
+					),
 				),
 				'GB' => array(
 					'postcode'  => array(
 						'label'       => __( 'Postcode', 'woocommerce' ),
-						'placeholder' => __( 'Postcode', 'woocommerce' ),
 					),
 					'state'     => array(
 						'label'       => __( 'County', 'woocommerce' ),
-						//'placeholder' => __( 'County', 'woocommerce' ),
-						'required'    => false
-					)
+						'required'    => false,
+					),
 				),
 				'VN' => array(
-					'postcode_before_city' => true,
 					'state' => array(
-						'required' => false
+						'required' => false,
 					),
 					'postcode' => array(
+						'priority'     => 65,
 						'required' => false,
-						'hidden'   => false
+						'hidden'   => false,
 					),
 					'address_2' => array(
 						'required' => false,
-						'hidden'   => true
-					)
+						'hidden'   => true,
+					),
 				),
 				'WS' => array(
 					'postcode' => array(
 						'required' => false,
-						'hidden'   => true
+						'hidden'   => true,
+					),
+				),
+				'YT' => array(
+					'state' => array(
+						'required' => false,
 					),
 				),
 				'ZA' => array(
 					'state' => array(
 						'label'       => __( 'Province', 'woocommerce' ),
-						//'placeholder' => __( 'Province', 'woocommerce' ),
-					)
+					),
 				),
 				'ZW' => array(
 					'postcode' => array(
 						'required' => false,
-						'hidden'   => true
+						'hidden'   => true,
 					),
 				),
 			));
 
 			$this->locale = array_intersect_key( $this->locale, array_merge( $this->get_allowed_countries(), $this->get_shipping_countries() ) );
 
-			// Default Locale Can be filtered to override fields in get_address_fields().
-			// Countries with no specific locale will use default.
-			$this->locale['default'] = apply_filters('woocommerce_get_country_locale_default', $this->get_default_address_fields() );
+			// Default Locale Can be filtered to override fields in get_address_fields(). Countries with no specific locale will use default.
+			$this->locale['default'] = apply_filters( 'woocommerce_get_country_locale_default', $this->get_default_address_fields() );
 
 			// Filter default AND shop base locales to allow overides via a single function. These will be used when changing countries on the checkout
 			if ( ! isset( $this->locale[ $this->get_base_country() ] ) ) {
@@ -938,7 +1087,7 @@ class WC_Countries {
 
 	/**
 	 * Apply locale and get address fields.
-	 * @param  mixed  $country
+	 * @param  mixed  $country (default: '')
 	 * @param  string $type (default: 'billing_')
 	 * @return array
 	 */
@@ -960,29 +1109,36 @@ class WC_Countries {
 		foreach ( $fields as $key => $value ) {
 			$keys = array_keys( $fields );
 			$address_fields[ $type . $key ] = $value;
-
-			// Add email and phone after company or last
-			if ( $type == 'billing_' && ( 'company' === $key || ( ! array_key_exists( 'company', $fields ) && $key === end( $keys ) ) ) ) {
-				$address_fields['billing_email'] = array(
-					'label'		=> __( 'Email Address', 'woocommerce' ),
-					'required'	=> true,
-					'type'		=> 'email',
-					'class'		=> array( 'form-row-first' ),
-					'validate'	=> array( 'email' ),
-				);
-				$address_fields['billing_phone'] = array(
-					'label'    	=> __( 'Phone', 'woocommerce' ),
-					'required' 	=> true,
-					'type'		=> 'tel',
-					'class'    	=> array( 'form-row-last' ),
-					'clear'    	=> true,
-					'validate' 	=> array( 'phone' ),
-				);
-			}
 		}
 
-		$address_fields = apply_filters( 'woocommerce_' . $type . 'fields', $address_fields, $country );
+		// Add email and phone fields.
+		if ( 'billing_' === $type ) {
+			$address_fields['billing_phone'] = array(
+				'label'        => __( 'Phone', 'woocommerce' ),
+				'required'     => true,
+				'type'         => 'tel',
+				'class'        => array( 'form-row-first' ),
+				'validate'     => array( 'phone' ),
+				'autocomplete' => 'tel',
+				'priority'     => 100,
+			);
+			$address_fields['billing_email'] = array(
+				'label'        => __( 'Email address', 'woocommerce' ),
+				'required'     => true,
+				'type'         => 'email',
+				'class'        => array( 'form-row-last' ),
+				'validate'     => array( 'email' ),
+				'autocomplete' => 'no' === get_option( 'woocommerce_registration_generate_username' ) ? 'email' : 'email username',
+				'priority'     => 110,
+			);
+		}
 
-		return $address_fields;
+		/**
+		 * Important note on this filter: Changes to address fields can and will be overridden by
+		 * the woocommerce_default_address_fields. The locales/default locales apply on top based
+		 * on country selection. If you want to change things like the required status of an
+		 * address field, filter woocommerce_default_address_fields instead.
+		 */
+		return apply_filters( 'woocommerce_' . $type . 'fields', $address_fields, $country );
 	}
 }
diff --git a/includes/class-wc-coupon.php b/includes/class-wc-coupon.php
index 7c5232f07b9..d31a546cac1 100644
--- a/includes/class-wc-coupon.php
+++ b/includes/class-wc-coupon.php
@@ -1,39 +1,52 @@
 <?php
+include_once( 'legacy/class-wc-legacy-coupon.php' );
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
 /**
- * WooCommerce coupons
+ * WooCommerce coupons.
  *
  * The WooCommerce coupons class gets coupon data from storage and checks coupon validity.
  *
  * @class 		WC_Coupon
- * @version		2.3.0
+ * @version		3.0.0
  * @package		WooCommerce/Classes
  * @category	Class
  * @author		WooThemes
- *
- * @property    string $discount_type
- * @property    string $coupon_amount
- * @property    string $individual_use
- * @property    array $product_ids
- * @property    array $exclude_product_ids
- * @property    string $usage_limit
- * @property    string $usage_limit_per_user
- * @property    string $limit_usage_to_x_items
- * @property    string $usage_count
- * @property    string $expiry_date
- * @property    string $free_shipping
- * @property    array $product_categories
- * @property    array $exclude_product_categories
- * @property    string $exclude_sale_items
- * @property    string $minimum_amount
- * @property    string $maximum_amount
- * @property    array $customer_email
  */
-class WC_Coupon {
+class WC_Coupon extends WC_Legacy_Coupon {
+
+	/**
+	 * Data array, with defaults.
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $data = array(
+		'code'                        => '',
+		'amount'                      => 0,
+		'date_created'                => null,
+		'date_modified'               => null,
+		'date_expires'                => null,
+		'discount_type'               => 'fixed_cart',
+		'description'                 => '',
+		'usage_count'                 => 0,
+		'individual_use'              => false,
+		'product_ids'                 => array(),
+		'excluded_product_ids'        => array(),
+		'usage_limit'                 => 0,
+		'usage_limit_per_user'        => 0,
+		'limit_usage_to_x_items'      => null,
+		'free_shipping'               => false,
+		'product_categories'          => array(),
+		'excluded_product_categories' => array(),
+		'exclude_sale_items'          => false,
+		'minimum_amount'              => '',
+		'maximum_amount'              => '',
+		'email_restrictions'          => array(),
+		'used_by'                     => array(),
+	);
 
 	// Coupon message codes
 	const E_WC_COUPON_INVALID_FILTERED               = 100;
@@ -54,217 +67,640 @@ class WC_Coupon {
 	const WC_COUPON_SUCCESS                          = 200;
 	const WC_COUPON_REMOVED                          = 201;
 
-	/** @public string Coupon code. */
-	public $code   = '';
-
-	/** @public int Coupon ID. */
-	public $id     = 0;
-
-	/** @public bool Coupon exists */
-	public $exists = false;
+	/**
+	 * Cache group.
+	 * @var string
+	 */
+	protected $cache_group = 'coupons';
 
 	/**
 	 * Coupon constructor. Loads coupon data.
-	 *
-	 * @access public
-	 * @param mixed $code code of the coupon to load
+	 * @param mixed $data Coupon data, object, ID or code.
 	 */
-	public function __construct( $code ) {
-		$this->exists = $this->get_coupon( $code );
-	}
+	public function __construct( $data = '' ) {
+		parent::__construct( $data );
 
-	/**
-	 * __isset function.
-	 *
-	 * @param mixed $key
-	 * @return bool
-	 */
-	public function __isset( $key ) {
-		if ( in_array( $key, array( 'coupon_custom_fields', 'type', 'amount' ) ) ) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * __get function.
-	 *
-	 * @param mixed $key
-	 * @return mixed
-	 */
-	public function __get( $key ) {
-		// Get values or default if not set
-		if ( 'coupon_custom_fields' === $key ) {
-			$value = $this->id ? get_post_meta( $this->id ) : array();
-		} elseif ( 'type' === $key ) {
-			$value = $this->discount_type;
-		} elseif ( 'amount' === $key ) {
-			$value = $this->coupon_amount;
+		if ( $data instanceof WC_Coupon ) {
+			$this->set_id( absint( $data->get_id() ) );
+		} elseif ( $coupon = apply_filters( 'woocommerce_get_shop_coupon_data', false, $data ) ) {
+			$this->read_manual_coupon( $data, $coupon );
+			return;
+		} elseif ( is_numeric( $data ) && 'shop_coupon' === get_post_type( $data ) ) {
+			$this->set_id( $data );
+		} elseif ( ! empty( $data ) ) {
+			$this->set_id( wc_get_coupon_id_by_code( $data ) );
+			$this->set_code( $data );
 		} else {
-			$value = '';
+			$this->set_object_read( true );
+		}
+
+		$this->data_store = WC_Data_Store::load( 'coupon' );
+		if ( $this->get_id() > 0 ) {
+			$this->data_store->read( $this );
 		}
-		return $value;
 	}
 
 	/**
 	 * Checks the coupon type.
-	 *
-	 * @param string $type Array or string of types
+	 * @param  string $type Array or string of types
 	 * @return bool
 	 */
 	public function is_type( $type ) {
-		return ( $this->discount_type == $type || ( is_array( $type ) && in_array( $this->discount_type, $type ) ) ) ? true : false;
+		return ( $this->get_discount_type() === $type || ( is_array( $type ) && in_array( $this->get_discount_type(), $type ) ) );
 	}
 
 	/**
-	 * Gets an coupon from the database.
+	 * Prefix for action and filter hooks on data.
 	 *
-	 * @param string $code
+	 * @since  3.0.0
+	 * @return string
+	 */
+	protected function get_hook_prefix() {
+		return 'woocommerce_coupon_get_';
+	}
+
+	/*
+	 |--------------------------------------------------------------------------
+	 | Getters
+	 |--------------------------------------------------------------------------
+	 |
+	 | Methods for getting data from the coupon object.
+	 |
+	 */
+
+	/**
+	 * Get coupon code.
+	 * @since  3.0.0
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_code( $context = 'view' ) {
+		return $this->get_prop( 'code', $context );
+	}
+
+	/**
+	 * Get coupon description.
+	 * @since  3.0.0
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_description( $context = 'view' ) {
+		return $this->get_prop( 'description', $context );
+	}
+
+	/**
+	 * Get discount type.
+	 * @since  3.0.0
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_discount_type( $context = 'view' ) {
+		return $this->get_prop( 'discount_type', $context );
+	}
+
+	/**
+	 * Get coupon amount.
+	 * @since  3.0.0
+	 * @param  string $context
+	 * @return float
+	 */
+	public function get_amount( $context = 'view' ) {
+		return $this->get_prop( 'amount', $context );
+	}
+
+	/**
+	 * Get coupon expiration date.
+	 * @since  3.0.0
+	 * @param  string $context
+	 * @return WC_DateTime|NULL object if the date is set or null if there is no date.
+	 */
+	public function get_date_expires( $context = 'view' ) {
+		return $this->get_prop( 'date_expires', $context );
+	}
+
+	/**
+	 * Get date_created
+	 * @since  3.0.0
+	 * @param  string $context
+	 * @return WC_DateTime|NULL object if the date is set or null if there is no date.
+	 */
+	public function get_date_created( $context = 'view' ) {
+		return $this->get_prop( 'date_created', $context );
+	}
+
+	/**
+	 * Get date_modified
+	 * @since  3.0.0
+	 * @param  string $context
+	 * @return WC_DateTime|NULL object if the date is set or null if there is no date.
+	 */
+	public function get_date_modified( $context = 'view' ) {
+		return $this->get_prop( 'date_modified', $context );
+	}
+
+	/**
+	 * Get coupon usage count.
+	 * @since  3.0.0
+	 * @param  string $context
+	 * @return integer
+	 */
+	public function get_usage_count( $context = 'view' ) {
+		return $this->get_prop( 'usage_count', $context );
+	}
+
+	/**
+	 * Get the "indvidual use" checkbox status.
+	 * @since  3.0.0
+	 * @param  string $context
 	 * @return bool
 	 */
-	private function get_coupon( $code ) {
-		$this->code  = apply_filters( 'woocommerce_coupon_code', $code );
-
-		// Coupon data lets developers create coupons through code
-		if ( $coupon = apply_filters( 'woocommerce_get_shop_coupon_data', false, $this->code ) ) {
-			$this->populate( $coupon );
-			return true;
-		}
-
-		// Otherwise get ID from the code
-		$this->id = $this->get_coupon_id_from_code( $this->code );
-
-		if ( $this->code === apply_filters( 'woocommerce_coupon_code', get_the_title( $this->id ) ) ) {
-			$this->populate();
-			return true;
-		}
-
-		return false;
+	public function get_individual_use( $context = 'view' ) {
+		return $this->get_prop( 'individual_use', $context );
 	}
 
 	/**
-	 * Get a coupon ID from it's code.
-	 * @since 2.5.0 woocommerce_coupon_code_query was removed in favour of woocommerce_get_coupon_id_from_code filter on the return. wp_cache was also implemented.
-	 * @param  string $code
-	 * @return int
-	 */
-	private function get_coupon_id_from_code( $code ) {
-		global $wpdb;
-
-		$coupon_id = wp_cache_get( WC_Cache_Helper::get_cache_prefix( 'coupons' ) . 'coupon_id_from_code_' . $code, 'coupons' );
-
-		if ( false === $coupon_id ) {
-			$sql       = $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_title = %s AND post_type = 'shop_coupon' AND post_status = 'publish'", $this->code );
-			$coupon_id = apply_filters( 'woocommerce_get_coupon_id_from_code', $wpdb->get_var( $sql ), $this->code );
-			wp_cache_set( WC_Cache_Helper::get_cache_prefix( 'coupons' ) . 'coupon_id_from_code_' . $code, $coupon_id, 'coupons' );
-		}
-
-		return absint( $coupon_id );
-	}
-
-	/**
-	 * Populates an order from the loaded post data.
-	 */
-	private function populate( $data = array() ) {
-		$defaults = array(
-			'discount_type'              => 'fixed_cart',
-			'coupon_amount'              => 0,
-			'individual_use'             => 'no',
-			'product_ids'                => array(),
-			'exclude_product_ids'        => array(),
-			'usage_limit'                => '',
-			'usage_limit_per_user'       => '',
-			'limit_usage_to_x_items'     => '',
-			'usage_count'                => '',
-			'expiry_date'                => '',
-			'free_shipping'              => 'no',
-			'product_categories'         => array(),
-			'exclude_product_categories' => array(),
-			'exclude_sale_items'         => 'no',
-			'minimum_amount'             => '',
-			'maximum_amount'             => '',
-			'customer_email'             => array()
-		);
-
-		if ( ! empty( $this->id ) ) {
-			$postmeta = get_post_meta( $this->id );
-		}
-
-		foreach ( $defaults as $key => $value ) {
-			// Try to load from meta if an ID is present
-			if ( ! empty( $this->id ) ) {
-				/**
-				 * By not calling `get_post_meta()` individually, we may be breaking compatibility with.
-				 * some plugins that filter on `get_post_metadata` and erroneously override based solely.
-				 * on $meta_key -- but don't override when querying for all as $meta_key is empty().
-				 */
-				$this->$key = isset( $postmeta[ $key ] ) ? maybe_unserialize( array_shift( $postmeta[ $key ] ) ) : '';
-			} else {
-				$this->$key = ! empty( $data[ $key ] ) ? wc_clean( $data[ $key ] ) : '';
-
-				// Backwards compat field names @deprecated
-				if ( 'coupon_amount' === $key ) {
-					$this->coupon_amount = ! empty( $data[ 'amount' ] ) ? wc_clean( $data[ 'amount' ] ) : $this->coupon_amount;
-				} elseif ( 'discount_type' === $key ) {
-					$this->discount_type = ! empty( $data[ 'type' ] ) ? wc_clean( $data[ 'type' ] ) : $this->discount_type;
-				}
-			}
-
-			if ( empty( $this->$key ) ) {
-				$this->$key = $value;
-			} elseif ( in_array( $key, array( 'product_ids', 'exclude_product_ids', 'product_categories', 'exclude_product_categories', 'customer_email' ) ) ) {
-				$this->$key = $this->format_array( $this->$key );
-			} elseif ( in_array( $key, array( 'usage_limit', 'usage_limit_per_user', 'limit_usage_to_x_items', 'usage_count' ) ) ) {
-				$this->$key = absint( $this->$key );
-			} elseif( 'expiry_date' === $key ) {
-				$this->expiry_date = $this->expiry_date && ! is_numeric( $this->expiry_date ) ? strtotime( $this->expiry_date ) : $this->expiry_date;
-			}
-		}
-
-		do_action( 'woocommerce_coupon_loaded', $this );
-	}
-
-	/**
-	 * Format loaded data as array.
-	 * @param  string|array $array
+	 * Get product IDs this coupon can apply to.
+	 * @since  3.0.0
+	 * @param  string $context
 	 * @return array
 	 */
-	public function format_array( $array ) {
-		if ( ! is_array( $array ) ) {
-			if ( is_serialized( $array ) ) {
-				$array = maybe_unserialize( $array );
+	public function get_product_ids( $context = 'view' ) {
+		return $this->get_prop( 'product_ids', $context );
+	}
+
+	/**
+	 * Get product IDs that this coupon should not apply to.
+	 * @since  3.0.0
+	 * @param  string $context
+	 * @return array
+	 */
+	public function get_excluded_product_ids( $context = 'view' ) {
+		return $this->get_prop( 'excluded_product_ids', $context );
+	}
+
+	/**
+	 * Get coupon usage limit.
+	 * @since  3.0.0
+	 * @param  string $context
+	 * @return integer
+	 */
+	public function get_usage_limit( $context = 'view' ) {
+		return $this->get_prop( 'usage_limit', $context );
+	}
+
+	/**
+	 * Get coupon usage limit per customer (for a single customer)
+	 * @since  3.0.0
+	 * @param  string $context
+	 * @return integer
+	 */
+	public function get_usage_limit_per_user( $context = 'view' ) {
+		return $this->get_prop( 'usage_limit_per_user', $context );
+	}
+
+	/**
+	 * Usage limited to certain amount of items
+	 * @since  3.0.0
+	 * @param  string $context
+	 * @return integer|null
+	 */
+	public function get_limit_usage_to_x_items( $context = 'view' ) {
+		return $this->get_prop( 'limit_usage_to_x_items', $context );
+	}
+
+	/**
+	 * If this coupon grants free shipping or not.
+	 * @since  3.0.0
+	 * @param  string $context
+	 * @return bool
+	 */
+	public function get_free_shipping( $context = 'view' ) {
+		return $this->get_prop( 'free_shipping', $context );
+	}
+
+	/**
+	 * Get product categories this coupon can apply to.
+	 * @since  3.0.0
+	 * @param  string $context
+	 * @return array
+	 */
+	public function get_product_categories( $context = 'view' ) {
+		return $this->get_prop( 'product_categories', $context );
+	}
+
+	/**
+	 * Get product categories this coupon cannot not apply to.
+	 * @since  3.0.0
+	 * @param  string $context
+	 * @return array
+	 */
+	public function get_excluded_product_categories( $context = 'view' ) {
+		return $this->get_prop( 'excluded_product_categories', $context );
+	}
+
+	/**
+	 * If this coupon should exclude items on sale.
+	 * @since  3.0.0
+	 * @param  string $context
+	 * @return bool
+	 */
+	public function get_exclude_sale_items( $context = 'view' ) {
+		return $this->get_prop( 'exclude_sale_items', $context );
+	}
+
+	/**
+	 * Get minium spend amount.
+	 * @since  3.0.0
+	 * @param  string $context
+	 * @return float
+	 */
+	public function get_minimum_amount( $context = 'view' ) {
+		return $this->get_prop( 'minimum_amount', $context );
+	}
+	/**
+	 * Get maximum spend amount.
+	 * @since  3.0.0
+	 * @param  string $context
+	 * @return float
+	 */
+	public function get_maximum_amount( $context = 'view' ) {
+		return $this->get_prop( 'maximum_amount', $context );
+	}
+
+	/**
+	 * Get emails to check customer usage restrictions.
+	 * @since  3.0.0
+	 * @param  string $context
+	 * @return array
+	 */
+	public function get_email_restrictions( $context = 'view' ) {
+		return $this->get_prop( 'email_restrictions', $context );
+	}
+
+	/**
+	 * Get records of all users who have used the current coupon.
+	 * @since  3.0.0
+	 * @param  string $context
+	 * @return array
+	 */
+	public function get_used_by( $context = 'view' ) {
+		return $this->get_prop( 'used_by', $context );
+	}
+
+	/**
+	 * Get discount amount for a cart item.
+	 *
+	 * @param  float $discounting_amount Amount the coupon is being applied to
+	 * @param  array|null $cart_item Cart item being discounted if applicable
+	 * @param  boolean $single True if discounting a single qty item, false if its the line
+	 * @return float Amount this coupon has discounted
+	 */
+	public function get_discount_amount( $discounting_amount, $cart_item = null, $single = false ) {
+		$discount      = 0;
+		$cart_item_qty = is_null( $cart_item ) ? 1 : $cart_item['quantity'];
+
+		if ( $this->is_type( array( 'percent' ) ) ) {
+			$discount = (float) $this->get_amount() * ( $discounting_amount / 100 );
+		} elseif ( $this->is_type( 'fixed_cart' ) && ! is_null( $cart_item ) && WC()->cart->subtotal_ex_tax ) {
+			/**
+			 * This is the most complex discount - we need to divide the discount between rows based on their price in.
+			 * proportion to the subtotal. This is so rows with different tax rates get a fair discount, and so rows.
+			 * with no price (free) don't get discounted.
+			 *
+			 * Get item discount by dividing item cost by subtotal to get a %.
+			 *
+			 * Uses price inc tax if prices include tax to work around https://github.com/woocommerce/woocommerce/issues/7669 and https://github.com/woocommerce/woocommerce/issues/8074.
+			 */
+			if ( wc_prices_include_tax() ) {
+				$discount_percent = ( wc_get_price_including_tax( $cart_item['data'] ) * $cart_item_qty ) / WC()->cart->subtotal;
 			} else {
-				$array = explode( ',', $array );
+				$discount_percent = ( wc_get_price_excluding_tax( $cart_item['data'] ) * $cart_item_qty ) / WC()->cart->subtotal_ex_tax;
+			}
+			$discount = ( (float) $this->get_amount() * $discount_percent ) / $cart_item_qty;
+
+		} elseif ( $this->is_type( 'fixed_product' ) ) {
+			$discount = min( $this->get_amount(), $discounting_amount );
+			$discount = $single ? $discount : $discount * $cart_item_qty;
+		}
+
+		$discount = (float) min( $discount, $discounting_amount );
+
+		// Handle the limit_usage_to_x_items option
+		if ( ! $this->is_type( array( 'fixed_cart' ) ) ) {
+			if ( $discounting_amount ) {
+				if ( null === $this->get_limit_usage_to_x_items() ) {
+					$limit_usage_qty = $cart_item_qty;
+				} else {
+					$limit_usage_qty = min( $this->get_limit_usage_to_x_items(), $cart_item_qty );
+
+					$this->set_limit_usage_to_x_items( max( 0, ( $this->get_limit_usage_to_x_items() - $limit_usage_qty ) ) );
+				}
+				if ( $single ) {
+					$discount = ( $discount * $limit_usage_qty ) / $cart_item_qty;
+				} else {
+					$discount = ( $discount / $cart_item_qty ) * $limit_usage_qty;
+				}
 			}
 		}
-		return array_filter( array_map( 'trim', array_map( 'strtolower', $array ) ) );
+
+		$discount = round( $discount, wc_get_rounding_precision() );
+
+		return apply_filters( 'woocommerce_coupon_get_discount_amount', $discount, $discounting_amount, $cart_item, $single, $this );
+	}
+
+	/*
+	 |--------------------------------------------------------------------------
+	 | Setters
+	 |--------------------------------------------------------------------------
+	 |
+	 | Functions for setting coupon data. These should not update anything in the
+	 | database itself and should only change what is stored in the class
+	 | object.
+	 |
+	 */
+
+	/**
+	 * Set coupon code.
+	 * @since  3.0.0
+	 * @param  string $code
+	 * @throws WC_Data_Exception
+	 */
+	public function set_code( $code ) {
+		$this->set_prop( 'code', wc_format_coupon_code( $code ) );
 	}
 
 	/**
-	 * Check if coupon needs applying before tax.
-	 *
-	 * @return bool
+	 * Set coupon description.
+	 * @since  3.0.0
+	 * @param  string $description
+	 * @throws WC_Data_Exception
 	 */
-	public function apply_before_tax() {
-		return true;
+	public function set_description( $description ) {
+		$this->set_prop( 'description', $description );
 	}
 
 	/**
-	 * Check if a coupon enables free shipping.
-	 *
-	 * @return bool
+	 * Set discount type.
+	 * @since  3.0.0
+	 * @param  string $discount_type
+	 * @throws WC_Data_Exception
 	 */
-	public function enable_free_shipping() {
-		return 'yes' === $this->free_shipping;
+	public function set_discount_type( $discount_type ) {
+		if ( 'percent_product' === $discount_type ) {
+			$discount_type = 'percent'; // Backwards compatibility.
+		}
+		if ( ! in_array( $discount_type, array_keys( wc_get_coupon_types() ) ) ) {
+			$this->error( 'coupon_invalid_discount_type', __( 'Invalid discount type', 'woocommerce' ) );
+		}
+		$this->set_prop( 'discount_type', $discount_type );
 	}
 
 	/**
-	 * Check if a coupon excludes sale items.
-	 *
-	 * @return bool
+	 * Set amount.
+	 * @since  3.0.0
+	 * @param  float $amount
+	 * @throws WC_Data_Exception
 	 */
-	public function exclude_sale_items() {
-		return 'yes' === $this->exclude_sale_items;
+	public function set_amount( $amount ) {
+		$this->set_prop( 'amount', wc_format_decimal( $amount ) );
+	}
+
+	/**
+	 * Set expiration date.
+	 * @since  3.0.0
+	 * @param string|integer|null $date UTC timestamp, or ISO 8601 DateTime. If the DateTime string has no timezone or offset, WordPress site timezone will be assumed. Null if there is no date.
+	 * @throws WC_Data_Exception
+	 */
+	public function set_date_expires( $date ) {
+		$this->set_date_prop( 'date_expires', $date );
+	}
+
+	/**
+	 * Set date_created
+	 * @since  3.0.0
+	 * @param string|integer|null $date UTC timestamp, or ISO 8601 DateTime. If the DateTime string has no timezone or offset, WordPress site timezone will be assumed. Null if there is no date.
+	 * @throws WC_Data_Exception
+	 */
+	public function set_date_created( $date ) {
+		$this->set_date_prop( 'date_created', $date );
+	}
+
+	/**
+	 * Set date_modified
+	 * @since  3.0.0
+	 * @param string|integer|null $date UTC timestamp, or ISO 8601 DateTime. If the DateTime string has no timezone or offset, WordPress site timezone will be assumed. Null if there is no date.
+	 * @throws WC_Data_Exception
+	 */
+	public function set_date_modified( $date ) {
+		$this->set_date_prop( 'date_modified', $date );
+	}
+
+	/**
+	 * Set how many times this coupon has been used.
+	 * @since  3.0.0
+	 * @param  int $usage_count
+	 * @throws WC_Data_Exception
+	 */
+	public function set_usage_count( $usage_count ) {
+		$this->set_prop( 'usage_count', absint( $usage_count ) );
+	}
+
+	/**
+	 * Set if this coupon can only be used once.
+	 * @since  3.0.0
+	 * @param  bool $is_individual_use
+	 * @throws WC_Data_Exception
+	 */
+	public function set_individual_use( $is_individual_use ) {
+		$this->set_prop( 'individual_use', (bool) $is_individual_use );
+	}
+
+	/**
+	 * Set the product IDs this coupon can be used with.
+	 * @since  3.0.0
+	 * @param  array $product_ids
+	 * @throws WC_Data_Exception
+	 */
+	public function set_product_ids( $product_ids ) {
+		$this->set_prop( 'product_ids', array_filter( wp_parse_id_list( (array) $product_ids ) ) );
+	}
+
+	/**
+	 * Set the product IDs this coupon cannot be used with.
+	 * @since  3.0.0
+	 * @param  array $excluded_product_ids
+	 * @throws WC_Data_Exception
+	 */
+	public function set_excluded_product_ids( $excluded_product_ids ) {
+		$this->set_prop( 'excluded_product_ids', array_filter( wp_parse_id_list( (array) $excluded_product_ids ) ) );
+	}
+
+	/**
+	 * Set the amount of times this coupon can be used.
+	 * @since  3.0.0
+	 * @param  int $usage_limit
+	 * @throws WC_Data_Exception
+	 */
+	public function set_usage_limit( $usage_limit ) {
+		$this->set_prop( 'usage_limit', absint( $usage_limit ) );
+	}
+
+	/**
+	 * Set the amount of times this coupon can be used per user.
+	 * @since  3.0.0
+	 * @param  int $usage_limit
+	 * @throws WC_Data_Exception
+	 */
+	public function set_usage_limit_per_user( $usage_limit ) {
+		$this->set_prop( 'usage_limit_per_user', absint( $usage_limit ) );
+	}
+
+	/**
+	 * Set usage limit to x number of items.
+	 * @since  3.0.0
+	 * @param  int|null $limit_usage_to_x_items
+	 * @throws WC_Data_Exception
+	 */
+	public function set_limit_usage_to_x_items( $limit_usage_to_x_items ) {
+		$this->set_prop( 'limit_usage_to_x_items', is_null( $limit_usage_to_x_items ) ? null : absint( $limit_usage_to_x_items ) );
+	}
+
+	/**
+	 * Set if this coupon enables free shipping or not.
+	 * @since  3.0.0
+	 * @param  bool $free_shipping
+	 * @throws WC_Data_Exception
+	 */
+	public function set_free_shipping( $free_shipping ) {
+		$this->set_prop( 'free_shipping', (bool) $free_shipping );
+	}
+
+	/**
+	 * Set the product category IDs this coupon can be used with.
+	 * @since  3.0.0
+	 * @param  array $product_categories
+	 * @throws WC_Data_Exception
+	 */
+	public function set_product_categories( $product_categories ) {
+		$this->set_prop( 'product_categories', array_filter( wp_parse_id_list( (array) $product_categories ) ) );
+	}
+
+	/**
+	 * Set the product category IDs this coupon cannot be used with.
+	 * @since  3.0.0
+	 * @param  array $excluded_product_categories
+	 * @throws WC_Data_Exception
+	 */
+	public function set_excluded_product_categories( $excluded_product_categories ) {
+		$this->set_prop( 'excluded_product_categories', array_filter( wp_parse_id_list( (array) $excluded_product_categories ) ) );
+	}
+
+	/**
+	 * Set if this coupon should excluded sale items or not.
+	 * @since  3.0.0
+	 * @param  bool $exclude_sale_items
+	 * @throws WC_Data_Exception
+	 */
+	public function set_exclude_sale_items( $exclude_sale_items ) {
+		$this->set_prop( 'exclude_sale_items', (bool) $exclude_sale_items );
+	}
+
+	/**
+	 * Set the minimum spend amount.
+	 * @since  3.0.0
+	 * @param  float $amount
+	 * @throws WC_Data_Exception
+	 */
+	public function set_minimum_amount( $amount ) {
+		$this->set_prop( 'minimum_amount', wc_format_decimal( $amount ) );
+	}
+
+	/**
+	 * Set the maximum spend amount.
+	 * @since  3.0.0
+	 * @param  float $amount
+	 * @throws WC_Data_Exception
+	 */
+	public function set_maximum_amount( $amount ) {
+		$this->set_prop( 'maximum_amount', wc_format_decimal( $amount ) );
+	}
+
+	/**
+	 * Set email restrictions.
+	 * @since  3.0.0
+	 * @param  array $emails
+	 * @throws WC_Data_Exception
+	 */
+	public function set_email_restrictions( $emails = array() ) {
+		$emails = array_filter( array_map( 'sanitize_email', (array) $emails ) );
+		foreach ( $emails as $email ) {
+			if ( ! is_email( $email ) ) {
+				$this->error( 'coupon_invalid_email_address', __( 'Invalid email address restriction', 'woocommerce' ) );
+			}
+		}
+		$this->set_prop( 'email_restrictions', $emails );
+	}
+
+	/**
+	 * Set which users have used this coupon.
+	 * @since 3.0.0
+	 * @param array $used_by
+	 * @throws WC_Data_Exception
+	 */
+	public function set_used_by( $used_by ) {
+		$this->set_prop( 'used_by', array_filter( $used_by ) );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Other Actions
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Developers can programically return coupons. This function will read those values into our WC_Coupon class.
+	 * @since  3.0.0
+	 * @param  string $code  Coupon code
+	 * @param  array $coupon Array of coupon properties
+	 */
+	public function read_manual_coupon( $code, $coupon ) {
+		foreach ( $coupon as $key => $value ) {
+			switch ( $key ) {
+				case 'excluded_product_ids' :
+				case 'exclude_product_ids' :
+					if ( ! is_array( $coupon[ $key ] ) ) {
+						wc_doing_it_wrong( $key, $key . ' should be an array instead of a string.', '3.0' );
+						$coupon['excluded_product_ids'] = wc_string_to_array( $value );
+					}
+					break;
+				case 'exclude_product_categories' :
+				case 'excluded_product_categories' :
+					if ( ! is_array( $coupon[ $key ] ) ) {
+						wc_doing_it_wrong( $key, $key . ' should be an array instead of a string.', '3.0' );
+						$coupon['excluded_product_categories'] = wc_string_to_array( $value );
+					}
+					break;
+				case 'product_ids' :
+					if ( ! is_array( $coupon[ $key ] ) ) {
+						wc_doing_it_wrong( $key, $key . ' should be an array instead of a string.', '3.0' );
+						$coupon[ $key ] = wc_string_to_array( $value );
+					}
+					break;
+				case 'individual_use' :
+				case 'free_shipping' :
+				case 'exclude_sale_items' :
+					if ( ! is_bool( $coupon[ $key ] ) ) {
+						wc_doing_it_wrong( $key, $key . ' should be true or false instead of yes or no.', '3.0' );
+						$coupon[ $key ] = wc_string_to_bool( $value );
+					}
+					break;
+				case 'expiry_date' :
+					$coupon['date_expires'] = $value;
+					break;
+			}
+		}
+		$this->set_code( $code );
+		$this->set_props( $coupon );
 	}
 
 	/**
@@ -272,13 +708,14 @@ class WC_Coupon {
 	 *
 	 * @param string $used_by Either user ID or billing email
 	 */
-	public function inc_usage_count( $used_by = '' ) {
-		if ( $this->id ) {
-			$this->usage_count++;
-			update_post_meta( $this->id, 'usage_count', $this->usage_count );
+	public function increase_usage_count( $used_by = '' ) {
+		if ( $this->get_id() && $this->data_store ) {
+			$new_count = $this->data_store->increase_usage_count( $this, $used_by );
 
-			if ( $used_by ) {
-				add_post_meta( $this->id, '_used_by', strtolower( $used_by ) );
+			// Bypass set_prop and remove pending changes since the data store saves the count already.
+			$this->data['usage_count'] = $new_count;
+			if ( isset( $this->changes['usage_count'] ) ) {
+				unset( $this->changes['usage_count'] );
 			}
 		}
 	}
@@ -288,36 +725,23 @@ class WC_Coupon {
 	 *
 	 * @param string $used_by Either user ID or billing email
 	 */
-	public function dcr_usage_count( $used_by = '' ) {
-		if ( $this->id && $this->usage_count > 0 ) {
-			global $wpdb;
-			$this->usage_count--;
-			update_post_meta( $this->id, 'usage_count', $this->usage_count );
+	public function decrease_usage_count( $used_by = '' ) {
+		if ( $this->get_id() && $this->get_usage_count() > 0 && $this->data_store ) {
+			$new_count = $this->data_store->decrease_usage_count( $this, $used_by );
 
-			if ( $used_by ) {
-				/**
-				 * We're doing this the long way because `delete_post_meta( $id, $key, $value )` deletes.
-				 * all instances where the key and value match, and we only want to delete one.
-				 */
-				$meta_id = $wpdb->get_var( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE meta_key = '_used_by' AND meta_value = %s AND post_id = %d LIMIT 1;", $used_by, $this->id ) );
-				if ( $meta_id ) {
-					delete_metadata_by_mid( 'post', $meta_id );
-				}
+			// Bypass set_prop and remove pending changes since the data store saves the count already.
+			$this->data['usage_count'] = $new_count;
+			if ( isset( $this->changes['usage_count'] ) ) {
+				unset( $this->changes['usage_count'] );
 			}
 		}
 	}
 
-	/**
-	 * Get records of all users who have used the current coupon.
-	 *
-	 * @access public
-	 * @return array
+	/*
+	 |--------------------------------------------------------------------------
+	 | Validation & Error Handling
+	 |--------------------------------------------------------------------------
 	 */
-	public function get_used_by() {
-		$_used_by = (array) get_post_meta( $this->id, '_used_by' );
-		// Strip out any null values.
-		return array_filter( $_used_by );
-	}
 
 	/**
 	 * Returns the error_message string.
@@ -331,18 +755,22 @@ class WC_Coupon {
 
 	/**
 	 * Ensure coupon exists or throw exception.
+	 *
+	 * @throws Exception
 	 */
 	private function validate_exists() {
-		if ( ! $this->exists ) {
+		if ( ! $this->get_id() ) {
 			throw new Exception( self::E_WC_COUPON_NOT_EXIST );
 		}
 	}
 
 	/**
 	 * Ensure coupon usage limit is valid or throw exception.
+	 *
+	 * @throws Exception
 	 */
 	private function validate_usage_limit() {
-		if ( $this->usage_limit > 0 && $this->usage_count >= $this->usage_limit ) {
+		if ( $this->get_usage_limit() > 0 && $this->get_usage_count() >= $this->get_usage_limit() ) {
 			throw new Exception( self::E_WC_COUPON_USAGE_LIMIT_REACHED );
 		}
 	}
@@ -356,19 +784,14 @@ class WC_Coupon {
 	 * @param  int  $user_id
 	 * @throws Exception
 	 */
-	private function validate_user_usage_limit( $user_id = null ) {
-		if ( ! $user_id ) {
+	private function validate_user_usage_limit( $user_id = 0 ) {
+		if ( empty( $user_id ) ) {
 			$user_id = get_current_user_id();
 		}
-		if ( $this->usage_limit_per_user > 0 && is_user_logged_in() && $this->id ) {
+		if ( $this->get_usage_limit_per_user() > 0 && is_user_logged_in() && $this->get_id() && $this->data_store ) {
 			global $wpdb;
-			$wpdb->get_var( $wpdb->prepare( "SELECT COUNT( `meta_id` )
-											 FROM   {$wpdb->postmeta}
-											 WHERE  `post_id`    = %d
-											   AND  `meta_key`   = '_used_by'
-											   AND  `meta_value` = %d", $this->id, $user_id ) );
-
-			if ( $usage_count >= $this->usage_limit_per_user ) {
+			$usage_count = $this->data_store->get_usage_by_user_id( $this, $user_id );
+			if ( $usage_count >= $this->get_usage_limit_per_user() ) {
 				throw new Exception( self::E_WC_COUPON_USAGE_LIMIT_REACHED );
 			}
 		}
@@ -376,40 +799,48 @@ class WC_Coupon {
 
 	/**
 	 * Ensure coupon date is valid or throw exception.
+	 *
+	 * @throws Exception
 	 */
 	private function validate_expiry_date() {
-		if ( $this->expiry_date && current_time( 'timestamp' ) > $this->expiry_date ) {
+		if ( $this->get_date_expires() && current_time( 'timestamp', true ) > $this->get_date_expires()->getTimestamp() ) {
 			throw new Exception( $error_code = self::E_WC_COUPON_EXPIRED );
 		}
 	}
 
 	/**
 	 * Ensure coupon amount is valid or throw exception.
+	 *
+	 * @throws Exception
 	 */
 	private function validate_minimum_amount() {
-		if ( $this->minimum_amount > 0 && wc_format_decimal( $this->minimum_amount ) > wc_format_decimal( WC()->cart->subtotal ) ) {
+		if ( $this->get_minimum_amount() > 0 && apply_filters( 'woocommerce_coupon_validate_minimum_amount', $this->get_minimum_amount() > WC()->cart->get_displayed_subtotal(), $this ) ) {
 			throw new Exception( self::E_WC_COUPON_MIN_SPEND_LIMIT_NOT_MET );
 		}
 	}
 
 	/**
 	 * Ensure coupon amount is valid or throw exception.
+	 *
+	 * @throws Exception
 	 */
 	private function validate_maximum_amount() {
-		if ( $this->maximum_amount > 0 && wc_format_decimal( $this->maximum_amount ) < wc_format_decimal( WC()->cart->subtotal ) ) {
+		if ( $this->get_maximum_amount() > 0 && apply_filters( 'woocommerce_coupon_validate_maximum_amount', $this->get_maximum_amount() < WC()->cart->get_displayed_subtotal(), $this ) ) {
 			throw new Exception( self::E_WC_COUPON_MAX_SPEND_LIMIT_MET );
 		}
 	}
 
 	/**
 	 * Ensure coupon is valid for products in the cart is valid or throw exception.
+	 *
+	 * @throws Exception
 	 */
 	private function validate_product_ids() {
-		if ( sizeof( $this->product_ids ) > 0 ) {
+		if ( sizeof( $this->get_product_ids() ) > 0 ) {
 			$valid_for_cart = false;
 			if ( ! WC()->cart->is_empty() ) {
-				foreach( WC()->cart->get_cart() as $cart_item_key => $cart_item ) {
-					if ( in_array( $cart_item['product_id'], $this->product_ids ) || in_array( $cart_item['variation_id'], $this->product_ids ) || in_array( $cart_item['data']->get_parent(), $this->product_ids ) ) {
+				foreach ( WC()->cart->get_cart() as $cart_item_key => $cart_item ) {
+					if ( in_array( $cart_item['product_id'], $this->get_product_ids() ) || in_array( $cart_item['variation_id'], $this->get_product_ids() ) || in_array( $cart_item['data']->get_parent_id(), $this->get_product_ids() ) ) {
 						$valid_for_cart = true;
 					}
 				}
@@ -422,15 +853,18 @@ class WC_Coupon {
 
 	/**
 	 * Ensure coupon is valid for product categories in the cart is valid or throw exception.
+	 *
+	 * @throws Exception
 	 */
 	private function validate_product_categories() {
-		if ( sizeof( $this->product_categories ) > 0 ) {
+		if ( sizeof( $this->get_product_categories() ) > 0 ) {
 			$valid_for_cart = false;
 			if ( ! WC()->cart->is_empty() ) {
-				foreach( WC()->cart->get_cart() as $cart_item_key => $cart_item ) {
+				foreach ( WC()->cart->get_cart() as $cart_item_key => $cart_item ) {
 					$product_cats = wc_get_product_cat_ids( $cart_item['product_id'] );
 
-					if ( sizeof( array_intersect( $product_cats, $this->product_categories ) ) > 0 ) {
+					// If we find an item with a cat in our allowed cat list, the coupon is valid
+					if ( sizeof( array_intersect( $product_cats, $this->get_product_categories() ) ) > 0 ) {
 						$valid_for_cart = true;
 					}
 				}
@@ -443,14 +877,16 @@ class WC_Coupon {
 
 	/**
 	 * Ensure coupon is valid for sale items in the cart is valid or throw exception.
+	 *
+	 * @throws Exception
 	 */
 	private function validate_sale_items() {
-		if ( 'yes' === $this->exclude_sale_items && $this->is_type( wc_get_product_coupon_types() ) ) {
+		if ( $this->get_exclude_sale_items() ) {
 			$valid_for_cart      = false;
 			$product_ids_on_sale = wc_get_product_ids_on_sale();
 
 			if ( ! WC()->cart->is_empty() ) {
-				foreach( WC()->cart->get_cart() as $cart_item_key => $cart_item ) {
+				foreach ( WC()->cart->get_cart() as $cart_item_key => $cart_item ) {
 					if ( ! empty( $cart_item['variation_id'] ) ) {
 						if ( ! in_array( $cart_item['variation_id'], $product_ids_on_sale, true ) ) {
 							$valid_for_cart = true;
@@ -466,6 +902,26 @@ class WC_Coupon {
 		}
 	}
 
+	/**
+	 * All exclusion rules must pass at the same time for a product coupon to be valid.
+	 */
+	private function validate_excluded_items() {
+		if ( ! WC()->cart->is_empty() && $this->is_type( wc_get_product_coupon_types() ) ) {
+			$valid = false;
+
+			foreach ( WC()->cart->get_cart() as $cart_item_key => $cart_item ) {
+				if ( $this->is_valid_for_product( $cart_item['data'], $cart_item ) ) {
+					$valid = true;
+					break;
+				}
+			}
+
+			if ( ! $valid ) {
+				throw new Exception( self::E_WC_COUPON_NOT_APPLICABLE );
+			}
+		}
+	}
+
 	/**
 	 * Cart discounts cannot be added if non-eligble product is found in cart.
 	 */
@@ -473,20 +929,21 @@ class WC_Coupon {
 		if ( ! $this->is_type( wc_get_product_coupon_types() ) ) {
 			$this->validate_cart_excluded_product_ids();
 			$this->validate_cart_excluded_product_categories();
-			$this->validate_cart_excluded_sale_items();
 		}
 	}
 
 	/**
 	 * Exclude products from cart.
+	 *
+	 * @throws Exception
 	 */
 	private function validate_cart_excluded_product_ids() {
 		// Exclude Products
-		if ( sizeof( $this->exclude_product_ids ) > 0 ) {
+		if ( sizeof( $this->get_excluded_product_ids() ) > 0 ) {
 			$valid_for_cart = true;
 			if ( ! WC()->cart->is_empty() ) {
-				foreach( WC()->cart->get_cart() as $cart_item_key => $cart_item ) {
-					if ( in_array( $cart_item['product_id'], $this->exclude_product_ids ) || in_array( $cart_item['variation_id'], $this->exclude_product_ids ) || in_array( $cart_item['data']->get_parent(), $this->exclude_product_ids ) ) {
+				foreach ( WC()->cart->get_cart() as $cart_item_key => $cart_item ) {
+					if ( in_array( $cart_item['product_id'], $this->get_excluded_product_ids() ) || in_array( $cart_item['variation_id'], $this->get_excluded_product_ids() ) || in_array( $cart_item['data']->get_parent_id(), $this->get_excluded_product_ids() ) ) {
 						$valid_for_cart = false;
 					}
 				}
@@ -499,16 +956,16 @@ class WC_Coupon {
 
 	/**
 	 * Exclude categories from cart.
+	 *
+	 * @throws Exception
 	 */
 	private function validate_cart_excluded_product_categories() {
-		if ( sizeof( $this->exclude_product_categories ) > 0 ) {
+		if ( sizeof( $this->get_excluded_product_categories() ) > 0 ) {
 			$valid_for_cart = true;
 			if ( ! WC()->cart->is_empty() ) {
-				foreach( WC()->cart->get_cart() as $cart_item_key => $cart_item ) {
-
+				foreach ( WC()->cart->get_cart() as $cart_item_key => $cart_item ) {
 					$product_cats = wc_get_product_cat_ids( $cart_item['product_id'] );
-
-					if ( sizeof( array_intersect( $product_cats, $this->exclude_product_categories ) ) > 0 ) {
+					if ( sizeof( array_intersect( $product_cats, $this->get_excluded_product_categories() ) ) > 0 ) {
 						$valid_for_cart = false;
 					}
 				}
@@ -519,34 +976,11 @@ class WC_Coupon {
 		}
 	}
 
-	/**
-	 * Exclude sale items from cart.
-	 */
-	private function validate_cart_excluded_sale_items() {
-		if ( $this->exclude_sale_items == 'yes' ) {
-			$valid_for_cart = true;
-			$product_ids_on_sale = wc_get_product_ids_on_sale();
-			if ( ! WC()->cart->is_empty() ) {
-				foreach( WC()->cart->get_cart() as $cart_item_key => $cart_item ) {
-					if ( ! empty( $cart_item['variation_id'] ) ) {
-						if ( in_array( $cart_item['variation_id'], $product_ids_on_sale, true ) ) {
-							$valid_for_cart = false;
-						}
-					} elseif ( in_array( $cart_item['product_id'], $product_ids_on_sale, true ) ) {
-						$valid_for_cart = false;
-					}
-				}
-			}
-			if ( ! $valid_for_cart ) {
-				throw new Exception( self::E_WC_COUPON_NOT_VALID_SALE_ITEMS );
-			}
-		}
-	}
-
 	/**
 	 * Check if a coupon is valid.
 	 *
 	 * @return boolean validity
+	 * @throws Exception
 	 */
 	public function is_valid() {
 		try {
@@ -559,6 +993,7 @@ class WC_Coupon {
 			$this->validate_product_ids();
 			$this->validate_product_categories();
 			$this->validate_sale_items();
+			$this->validate_excluded_items();
 			$this->validate_cart_excluded_items();
 
 			if ( ! apply_filters( 'woocommerce_coupon_is_valid', true, $this ) ) {
@@ -593,50 +1028,39 @@ class WC_Coupon {
 		}
 
 		$valid        = false;
-		$product_cats = wc_get_product_cat_ids( $product->id );
+		$product_cats = wc_get_product_cat_ids( $product->is_type( 'variation' ) ? $product->get_parent_id() : $product->get_id() );
+		$product_ids  = array( $product->get_id(), $product->get_parent_id() );
 
 		// Specific products get the discount
-		if ( sizeof( $this->product_ids ) > 0 ) {
-			if ( in_array( $product->id, $this->product_ids ) || ( isset( $product->variation_id ) && in_array( $product->variation_id, $this->product_ids ) ) || in_array( $product->get_parent(), $this->product_ids ) ) {
-				$valid = true;
-			}
-		}
-
-		// Category discounts
-		if ( sizeof( $this->product_categories ) > 0 ) {
-			if ( sizeof( array_intersect( $product_cats, $this->product_categories ) ) > 0 ) {
-				$valid = true;
-			}
-		}
-
-		if ( ! sizeof( $this->product_ids ) && ! sizeof( $this->product_categories ) ) {
-			// No product ids - all items discounted
+		if ( sizeof( $this->get_product_ids() ) && sizeof( array_intersect( $product_ids, $this->get_product_ids() ) ) ) {
 			$valid = true;
 		}
 
-		// Specific product ID's excluded from the discount
-		if ( sizeof( $this->exclude_product_ids ) > 0 ) {
-			if ( in_array( $product->id, $this->exclude_product_ids ) || ( isset( $product->variation_id ) && in_array( $product->variation_id, $this->exclude_product_ids ) ) || in_array( $product->get_parent(), $this->exclude_product_ids ) ) {
-				$valid = false;
-			}
+		// Category discounts
+		if ( sizeof( $this->get_product_categories() ) && sizeof( array_intersect( $product_cats, $this->get_product_categories() ) ) ) {
+			$valid = true;
+		}
+
+		// No product ids - all items discounted
+		if ( ! sizeof( $this->get_product_ids() ) && ! sizeof( $this->get_product_categories() ) ) {
+			$valid = true;
+		}
+
+		// Specific product IDs excluded from the discount
+		if ( sizeof( $this->get_excluded_product_ids() ) && sizeof( array_intersect( $product_ids, $this->get_excluded_product_ids() ) ) ) {
+			$valid = false;
 		}
 
 		// Specific categories excluded from the discount
-		if ( sizeof( $this->exclude_product_categories ) > 0 ) {
-			if ( sizeof( array_intersect( $product_cats, $this->exclude_product_categories ) ) > 0 ) {
-				$valid = false;
-			}
+		if ( sizeof( $this->get_excluded_product_categories() ) && sizeof( array_intersect( $product_cats, $this->get_excluded_product_categories() ) ) ) {
+			$valid = false;
 		}
 
 		// Sale Items excluded from discount
-		if ( $this->exclude_sale_items == 'yes' ) {
+		if ( $this->get_exclude_sale_items() ) {
 			$product_ids_on_sale = wc_get_product_ids_on_sale();
 
-			if ( isset( $product->variation_id ) ) {
-				if ( in_array( $product->variation_id, $product_ids_on_sale, true ) ) {
-					$valid = false;
-				}
-			} elseif ( in_array( $product->id, $product_ids_on_sale, true ) ) {
+			if ( in_array( $product->get_id(), $product_ids_on_sale, true ) ) {
 				$valid = false;
 			}
 		}
@@ -644,67 +1068,6 @@ class WC_Coupon {
 		return apply_filters( 'woocommerce_coupon_is_valid_for_product', $valid, $product, $this, $values );
 	}
 
-	/**
-	 * Get discount amount for a cart item.
-	 *
-	 * @param  float $discounting_amount Amount the coupon is being applied to
-	 * @param  array|null $cart_item Cart item being discounted if applicable
-	 * @param  boolean $single True if discounting a single qty item, false if its the line
-	 * @return float Amount this coupon has discounted
-	 */
-	public function get_discount_amount( $discounting_amount, $cart_item = null, $single = false ) {
-		$discount      = 0;
-		$cart_item_qty = is_null( $cart_item ) ? 1 : $cart_item['quantity'];
-
-		if ( $this->is_type( array( 'percent_product', 'percent' ) ) ) {
-			$discount = $this->coupon_amount * ( $discounting_amount / 100 );
-
-		} elseif ( $this->is_type( 'fixed_cart' ) && ! is_null( $cart_item ) && WC()->cart->subtotal_ex_tax ) {
-			/**
-			 * This is the most complex discount - we need to divide the discount between rows based on their price in.
-			 * proportion to the subtotal. This is so rows with different tax rates get a fair discount, and so rows.
-			 * with no price (free) don't get discounted.
-			 *
-			 * Get item discount by dividing item cost by subtotal to get a %.
-			 *
-			 * Uses price inc tax if prices include tax to work around https://github.com/woothemes/woocommerce/issues/7669 and https://github.com/woothemes/woocommerce/issues/8074.
-			 */
-			if ( wc_prices_include_tax() ) {
-				$discount_percent = ( $cart_item['data']->get_price_including_tax() * $cart_item_qty ) / WC()->cart->subtotal;
-			} else {
-				$discount_percent = ( $cart_item['data']->get_price_excluding_tax() * $cart_item_qty ) / WC()->cart->subtotal_ex_tax;
-			}
-			$discount         = ( $this->coupon_amount * $discount_percent ) / $cart_item_qty;
-
-		} elseif ( $this->is_type( 'fixed_product' ) ) {
-			$discount = min( $this->coupon_amount, $discounting_amount );
-			$discount = $single ? $discount : $discount * $cart_item_qty;
-		}
-
-		$discount = min( $discount, $discounting_amount );
-
-		// Handle the limit_usage_to_x_items option
-		if ( $this->is_type( array( 'percent_product', 'fixed_product' ) ) ) {
-			if ( $discounting_amount ) {
-				if ( '' === $this->limit_usage_to_x_items ) {
-					$limit_usage_qty = $cart_item_qty;
-				} else {
-					$limit_usage_qty              = min( $this->limit_usage_to_x_items, $cart_item_qty );
-					$this->limit_usage_to_x_items = max( 0, $this->limit_usage_to_x_items - $limit_usage_qty );
-				}
-				if ( $single ) {
-					$discount = ( $discount * $limit_usage_qty ) / $cart_item_qty;
-				} else {
-					$discount = ( $discount / $cart_item_qty ) * $limit_usage_qty;
-				}
-			}
-		}
-
-		$discount = round( $discount, WC_ROUNDING_PRECISION );
-
-		return apply_filters( 'woocommerce_coupon_get_discount_amount', $discount, $discounting_amount, $cart_item, $single, $this );
-	}
-
 	/**
 	 * Converts one of the WC_Coupon message/error codes to a message string and.
 	 * displays the message/error.
@@ -712,7 +1075,6 @@ class WC_Coupon {
 	 * @param int $msg_code Message/error code.
 	 */
 	public function add_coupon_message( $msg_code ) {
-
 		$msg = $msg_code < 200 ? $this->get_coupon_error( $msg_code ) : $this->get_coupon_message( $msg_code );
 
 		if ( ! $msg ) {
@@ -759,19 +1121,23 @@ class WC_Coupon {
 				$err = __( 'Coupon is not valid.', 'woocommerce' );
 			break;
 			case self::E_WC_COUPON_NOT_EXIST:
-				$err = sprintf( __( 'Coupon "%s" does not exist!', 'woocommerce' ), $this->code );
+				/* translators: %s: coupon code */
+				$err = sprintf( __( 'Coupon "%s" does not exist!', 'woocommerce' ), $this->get_code() );
 			break;
 			case self::E_WC_COUPON_INVALID_REMOVED:
-				$err = sprintf( __( 'Sorry, it seems the coupon "%s" is invalid - it has now been removed from your order.', 'woocommerce' ), $this->code );
+				/* translators: %s: coupon code */
+				$err = sprintf( __( 'Sorry, it seems the coupon "%s" is invalid - it has now been removed from your order.', 'woocommerce' ), $this->get_code() );
 			break;
 			case self::E_WC_COUPON_NOT_YOURS_REMOVED:
-				$err = sprintf( __( 'Sorry, it seems the coupon "%s" is not yours - it has now been removed from your order.', 'woocommerce' ), $this->code );
+				/* translators: %s: coupon code */
+				$err = sprintf( __( 'Sorry, it seems the coupon "%s" is not yours - it has now been removed from your order.', 'woocommerce' ), $this->get_code() );
 			break;
 			case self::E_WC_COUPON_ALREADY_APPLIED:
 				$err = __( 'Coupon code already applied!', 'woocommerce' );
 			break;
 			case self::E_WC_COUPON_ALREADY_APPLIED_INDIV_USE_ONLY:
-				$err = sprintf( __( 'Sorry, coupon "%s" has already been applied and cannot be used in conjunction with other coupons.', 'woocommerce' ), $this->code );
+				/* translators: %s: coupon code */
+				$err = sprintf( __( 'Sorry, coupon "%s" has already been applied and cannot be used in conjunction with other coupons.', 'woocommerce' ), $this->get_code() );
 			break;
 			case self::E_WC_COUPON_USAGE_LIMIT_REACHED:
 				$err = __( 'Coupon usage limit has been reached.', 'woocommerce' );
@@ -780,10 +1146,12 @@ class WC_Coupon {
 				$err = __( 'This coupon has expired.', 'woocommerce' );
 			break;
 			case self::E_WC_COUPON_MIN_SPEND_LIMIT_NOT_MET:
-				$err = sprintf( __( 'The minimum spend for this coupon is %s.', 'woocommerce' ), wc_price( $this->minimum_amount ) );
+				/* translators: %s: coupon minimum amount */
+				$err = sprintf( __( 'The minimum spend for this coupon is %s.', 'woocommerce' ), wc_price( $this->get_minimum_amount() ) );
 			break;
 			case self::E_WC_COUPON_MAX_SPEND_LIMIT_MET:
-				$err = sprintf( __( 'The maximum spend for this coupon is %s.', 'woocommerce' ), wc_price( $this->maximum_amount ) );
+				/* translators: %s: coupon maximum amount */
+				$err = sprintf( __( 'The maximum spend for this coupon is %s.', 'woocommerce' ), wc_price( $this->get_maximum_amount() ) );
 			break;
 			case self::E_WC_COUPON_NOT_APPLICABLE:
 				$err = __( 'Sorry, this coupon is not applicable to your cart contents.', 'woocommerce' );
@@ -793,24 +1161,25 @@ class WC_Coupon {
 				$products = array();
 				if ( ! WC()->cart->is_empty() ) {
 					foreach ( WC()->cart->get_cart() as $cart_item_key => $cart_item ) {
-						if ( in_array( $cart_item['product_id'], $this->exclude_product_ids ) || in_array( $cart_item['variation_id'], $this->exclude_product_ids ) || in_array( $cart_item['data']->get_parent(), $this->exclude_product_ids ) ) {
-							$products[] = $cart_item['data']->get_title();
+						if ( in_array( $cart_item['product_id'], $this->get_excluded_product_ids() ) || in_array( $cart_item['variation_id'], $this->get_excluded_product_ids() ) || in_array( $cart_item['data']->get_parent_id(), $this->get_excluded_product_ids() ) ) {
+							$products[] = $cart_item['data']->get_name();
 						}
 					}
 				}
 
+				/* translators: %s: products list */
 				$err = sprintf( __( 'Sorry, this coupon is not applicable to the products: %s.', 'woocommerce' ), implode( ', ', $products ) );
 				break;
 			case self::E_WC_COUPON_EXCLUDED_CATEGORIES:
 				// Store excluded categories that are in cart in $categories
 				$categories = array();
 				if ( ! WC()->cart->is_empty() ) {
-					foreach( WC()->cart->get_cart() as $cart_item_key => $cart_item ) {
+					foreach ( WC()->cart->get_cart() as $cart_item_key => $cart_item ) {
 						$product_cats = wc_get_product_cat_ids( $cart_item['product_id'] );
 
-						if ( sizeof( $intersect = array_intersect( $product_cats, $this->exclude_product_categories ) ) > 0 ) {
+						if ( sizeof( $intersect = array_intersect( $product_cats, $this->get_excluded_product_categories() ) ) > 0 ) {
 
-							foreach( $intersect as $cat_id) {
+							foreach ( $intersect as $cat_id ) {
 								$cat = get_term( $cat_id, 'product_cat' );
 								$categories[] = $cat->name;
 							}
@@ -818,6 +1187,7 @@ class WC_Coupon {
 					}
 				}
 
+				/* translators: %s: categories list */
 				$err = sprintf( __( 'Sorry, this coupon is not applicable to the categories: %s.', 'woocommerce' ), implode( ', ', array_unique( $categories ) ) );
 				break;
 			case self::E_WC_COUPON_NOT_VALID_SALE_ITEMS:
diff --git a/includes/class-wc-customer-download.php b/includes/class-wc-customer-download.php
new file mode 100644
index 00000000000..a2a40255acb
--- /dev/null
+++ b/includes/class-wc-customer-download.php
@@ -0,0 +1,362 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Class for customer download permissions.
+ *
+ * @version     3.0.0
+ * @since       3.0.0
+ * @package     WooCommerce/Classes
+ * @author      WooThemes
+ */
+class WC_Customer_Download extends WC_Data implements ArrayAccess {
+
+	/**
+	 * This is the name of this object type.
+	 * @var string
+	 */
+	protected $object_type = 'customer_download';
+
+	/**
+	 * Download Data array.
+	 *
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $data = array(
+		'download_id'         => '',
+		'product_id'          => 0,
+		'user_id'             => 0,
+		'user_email'          => '',
+		'order_id'            => 0,
+		'order_key'           => '',
+		'downloads_remaining' => '',
+		'access_granted'      => null,
+		'access_expires'      => null,
+		'download_count'      => 0,
+	);
+
+	/**
+	 * Constructor.
+	 *
+	 * @param int|object|array $download
+	 */
+	 public function __construct( $download = 0 ) {
+		parent::__construct( $download );
+
+		if ( is_numeric( $download ) && $download > 0 ) {
+			$this->set_id( $download );
+		} elseif ( $download instanceof self ) {
+			$this->set_id( $download->get_id() );
+		} elseif ( is_object( $download ) && ! empty( $download->permission_id ) ) {
+			$this->set_id( $download->permission_id );
+			$this->set_props( (array) $download );
+			$this->set_object_read( true );
+		} else {
+			$this->set_object_read( true );
+		}
+
+		$this->data_store = WC_Data_Store::load( 'customer-download' );
+
+		if ( $this->get_id() > 0 ) {
+			$this->data_store->read( $this );
+		}
+ 	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Getters
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Get download id.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_download_id( $context = 'view' ) {
+		return $this->get_prop( 'download_id', $context );
+	}
+
+	/**
+	 * Get product id.
+	 *
+	 * @param  string $context
+	 * @return integer
+	 */
+	public function get_product_id( $context = 'view' ) {
+		return $this->get_prop( 'product_id', $context );
+	}
+
+	/**
+	 * Get user id.
+	 *
+	 * @param  string $context
+	 * @return integer
+	 */
+	public function get_user_id( $context = 'view' ) {
+		return $this->get_prop( 'user_id', $context );
+	}
+
+	/**
+	 * Get user_email.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_user_email( $context = 'view' ) {
+		return $this->get_prop( 'user_email', $context );
+	}
+
+	/**
+	 * Get order_id.
+	 *
+	 * @param  string $context
+	 * @return integer
+	 */
+	public function get_order_id( $context = 'view' ) {
+		return $this->get_prop( 'order_id', $context );
+	}
+
+	/**
+	 * Get order_key.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_order_key( $context = 'view' ) {
+		return $this->get_prop( 'order_key', $context );
+	}
+
+	/**
+	 * Get downloads_remaining.
+	 *
+	 * @param  string $context
+	 * @return integer|string
+	 */
+	public function get_downloads_remaining( $context = 'view' ) {
+		return $this->get_prop( 'downloads_remaining', $context );
+	}
+
+	/**
+	 * Get access_granted.
+	 *
+	 * @param  string $context
+	 * @return WC_DateTime|null Object if the date is set or null if there is no date.
+	 */
+	public function get_access_granted( $context = 'view' ) {
+		return $this->get_prop( 'access_granted', $context );
+	}
+
+	/**
+	 * Get access_expires.
+	 *
+	 * @param  string $context
+	 * @return WC_DateTime|null Object if the date is set or null if there is no date.
+	 */
+	public function get_access_expires( $context = 'view' ) {
+		return $this->get_prop( 'access_expires', $context );
+	}
+
+	/**
+	 * Get download_count.
+	 *
+	 * @param  string $context
+	 * @return integer
+	 */
+	public function get_download_count( $context = 'view' ) {
+		return $this->get_prop( 'download_count', $context );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Setters
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Set download id.
+	 *
+	 * @param string $value
+	 */
+	public function set_download_id( $value ) {
+		$this->set_prop( 'download_id', $value );
+	}
+	/**
+	 * Set product id.
+	 *
+	 * @param int $value
+	 */
+	public function set_product_id( $value ) {
+		$this->set_prop( 'product_id', absint( $value ) );
+	}
+
+	/**
+	 * Get user id.
+	 *
+	 * @param int $value
+	 */
+	public function set_user_id( $value ) {
+		$this->set_prop( 'user_id', absint( $value ) );
+	}
+
+	/**
+	 * Get user_email.
+	 *
+	 * @param int $value
+	 */
+	public function set_user_email( $value ) {
+		$this->set_prop( 'user_email', sanitize_email( $value ) );
+	}
+
+	/**
+	 * Get order_id.
+	 *
+	 * @param int $value
+	 */
+	public function set_order_id( $value ) {
+		$this->set_prop( 'order_id', absint( $value ) );
+	}
+
+	/**
+	 * Get order_key.
+	 *
+	 * @param string $value
+	 */
+	public function set_order_key( $value ) {
+		$this->set_prop( 'order_key', $value );
+	}
+
+	/**
+	 * Get downloads_remaining.
+	 *
+	 * @param integer|string $value
+	 */
+	public function set_downloads_remaining( $value ) {
+		$this->set_prop( 'downloads_remaining', '' === $value ? '' : absint( $value ) );
+	}
+
+	/**
+	 * Get access_granted.
+	 *
+	 * @param string|integer|null $date UTC timestamp, or ISO 8601 DateTime. If the DateTime string has no timezone or offset, WordPress site timezone will be assumed. Null if their is no date.
+	 */
+	public function set_access_granted( $date = null ) {
+		$this->set_date_prop( 'access_granted', $date );
+	}
+
+	/**
+	 * Get access_expires.
+	 *
+	 * @param string|integer|null $date UTC timestamp, or ISO 8601 DateTime. If the DateTime string has no timezone or offset, WordPress site timezone will be assumed. Null if their is no date.
+	 */
+	public function set_access_expires( $date = null ) {
+		$this->set_date_prop( 'access_expires', $date );
+	}
+
+	/**
+	 * Get download_count.
+	 *
+	 * @param int $value
+	 */
+	public function set_download_count( $value ) {
+		$this->set_prop( 'download_count', absint( $value ) );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| CRUD methods
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Save data to the database.
+	 * @since 3.0.0
+	 * @return int Item ID
+	 */
+	public function save() {
+		if ( $this->data_store ) {
+			// Trigger action before saving to the DB. Use a pointer to adjust object props before save.
+			do_action( 'woocommerce_before_' . $this->object_type . '_object_save', $this, $this->data_store );
+
+			if ( $this->get_id() ) {
+				$this->data_store->update( $this );
+			} else {
+				$this->data_store->create( $this );
+			}
+		}
+		return $this->get_id();
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| ArrayAccess/Backwards compatibility.
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * offsetGet
+	 * @param string $offset
+	 * @return mixed
+	 */
+	public function offsetGet( $offset ) {
+		if ( is_callable( array( $this, "get_$offset" ) ) ) {
+			return $this->{"get_$offset"}();
+		}
+	}
+
+	/**
+	 * offsetSet
+	 * @param string $offset
+	 * @param mixed $value
+	 */
+	public function offsetSet( $offset, $value ) {
+		if ( is_callable( array( $this, "set_$offset" ) ) ) {
+			$this->{"set_$offset"}( $value );
+		}
+	}
+
+	/**
+	 * offsetUnset
+	 * @param string $offset
+	 */
+	public function offsetUnset( $offset ) {
+		if ( is_callable( array( $this, "set_$offset" ) ) ) {
+			$this->{"set_$offset"}( '' );
+		}
+	}
+
+	/**
+	 * offsetExists
+	 * @param string $offset
+	 * @return bool
+	 */
+	public function offsetExists( $offset ) {
+		return in_array( $offset, array_keys( $this->data ) );
+	}
+
+	/**
+	 * Magic __isset method for backwards compatibility. Legacy properties which could be accessed directly in the past.
+	 *
+	 * @param  string $key Key name.
+	 * @return bool
+	 */
+	public function __isset( $key ) {
+		return in_array( $offset, array_keys( $this->data ) );
+	}
+
+	/**
+	 * Magic __get method for backwards compatibility. Maps legacy vars to new getters.
+	 *
+	 * @param  string $key Key name.
+	 * @return mixed
+	 */
+	public function __get( $key ) {
+		if ( is_callable( array( $this, "get_$key" ) ) ) {
+			return $this->{"get_$key"}( '' );
+		}
+	}
+}
diff --git a/includes/class-wc-customer.php b/includes/class-wc-customer.php
index 6ec7ad47221..3a78eeb0167 100644
--- a/includes/class-wc-customer.php
+++ b/includes/class-wc-customer.php
@@ -1,173 +1,146 @@
 <?php
+include_once( 'legacy/class-wc-legacy-customer.php' );
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
-
 /**
- * Customer
- *
  * The WooCommerce customer class handles storage of the current customer's data, such as location.
  *
  * @class    WC_Customer
- * @version  2.3.0
+ * @version  3.0.0
  * @package  WooCommerce/Classes
  * @category Class
  * @author   WooThemes
- *
- * @property string $country
- * @property string $state
- * @property string $postcode
- * @property string $city
- * @property string $address_1
- * @property string $address_2
- * @property string $shipping_country
- * @property string $shipping_state
- * @property string $shipping_postcode
- * @property string $shipping_city
- * @property string $shipping_address_1
- * @property string $shipping_address_2
- * @property string $is_vat_exempt
- * @property string $calculated_shipping
  */
-class WC_Customer {
+class WC_Customer extends WC_Legacy_Customer {
 
 	/**
 	 * Stores customer data.
 	 *
 	 * @var array
 	 */
-	protected $_data = array();
+	protected $data = array(
+		'date_created'       => null,
+		'date_modified'      => null,
+		'email'              => '',
+		'first_name'         => '',
+		'last_name'          => '',
+		'role'               => 'customer',
+		'username'           => '',
+		'billing'            => array(
+			'first_name'     => '',
+			'last_name'      => '',
+			'company'        => '',
+			'address_1'      => '',
+			'address_2'      => '',
+			'city'           => '',
+			'state'          => '',
+			'postcode'       => '',
+			'country'        => '',
+			'email'          => '',
+			'phone'          => '',
+		),
+		'shipping'           => array(
+			'first_name'     => '',
+			'last_name'      => '',
+			'company'        => '',
+			'address_1'      => '',
+			'address_2'      => '',
+			'city'           => '',
+			'state'          => '',
+			'postcode'       => '',
+			'country'        => '',
+		),
+		'is_paying_customer' => false,
+	);
 
 	/**
-	 * Stores bool when data is changed.
+	 * Stores a password if this needs to be changed. Write-only and hidden from _data.
 	 *
-	 * @var bool
+	 * @var string
 	 */
-	private $_changed = false;
+	protected $password = '';
 
 	/**
-	 * Constructor for the customer class loads the customer data.
+	 * Stores if user is VAT exempt for this session.
 	 *
+	 * @var string
 	 */
-	public function __construct() {
-		$this->_data = (array) WC()->session->get( 'customer' );
+	protected $is_vat_exempt = false;
 
-		// No data - set defaults
-		if ( empty( $this->_data ) ) {
-			$this->set_default_data();
+	/**
+	 * Stores if user has calculated shipping in this session.
+	 *
+	 * @var string
+	 */
+	protected $calculated_shipping = false;
+
+	/**
+	 * Load customer data based on how WC_Customer is called.
+	 *
+	 * If $customer is 'new', you can build a new WC_Customer object. If it's empty, some
+	 * data will be pulled from the session for the current user/customer.
+	 *
+	 * @param WC_Customer|int $data Customer ID or data.
+	 * @param bool $is_session True if this is the customer session
+	 * @throws Exception if customer cannot be read/found and $data is set.
+	 */
+	public function __construct( $data = 0, $is_session = false ) {
+		parent::__construct( $data );
+
+		if ( $data instanceof WC_Customer ) {
+			$this->set_id( absint( $data->get_id() ) );
+		} elseif ( is_numeric( $data ) ) {
+			$this->set_id( $data );
 		}
 
-		// When leaving or ending page load, store data
-		add_action( 'shutdown', array( $this, 'save_data' ), 10 );
-	}
+		$this->data_store = WC_Data_Store::load( 'customer' );
 
-	/**
-	 * Save data function.
-	 */
-	public function save_data() {
-		if ( $this->_changed ) {
-			WC()->session->set( 'customer', $this->_data );
+		// If we have an ID, load the user from the DB.
+		if ( $this->get_id() ) {
+			try {
+				$this->data_store->read( $this );
+			} catch ( Exception $e ) {
+				$this->set_id( 0 );
+				$this->set_object_read( true );
+			}
+		} else {
+			$this->set_object_read( true );
+		}
+
+		// If this is a session, set or change the data store to sessions. Changes do not persist in the database.
+		if ( $is_session ) {
+			$this->data_store = WC_Data_Store::load( 'customer-session' );
+			$this->data_store->read( $this );
 		}
 	}
 
 	/**
-	 * __set function.
+	 * Prefix for action and filter hooks on data.
 	 *
-	 * @param mixed $property
+	 * @since  3.0.0
+	 * @return string
+	 */
+	protected function get_hook_prefix() {
+		return 'woocommerce_customer_get_';
+	}
+
+	/**
+	 * Delete a customer and reassign posts..
+	 *
+	 * @param int $reassign Reassign posts and links to new User ID.
+	 * @since 3.0.0
 	 * @return bool
 	 */
-	public function __isset( $property ) {
-		if ( 'address' === $property ) {
-			$property = 'address_1';
+	public function delete_and_reassign( $reassign = null ) {
+		if ( $this->data_store ) {
+			$this->data_store->delete( $this, array( 'force_delete' => true, 'reassign' => $reassign ) );
+			$this->set_id( 0 );
+			return true;
 		}
-		if ( 'shipping_address' === $property ) {
-			$property = 'shipping_address_1';
-		}
-		return isset( $this->_data[ $property ] );
-	}
-
-	/**
-	 * __get function.
-	 *
-	 * @param string $property
-	 * @return string
-	 */
-	public function __get( $property ) {
-		if ( 'address' === $property ) {
-			$property = 'address_1';
-		}
-		if ( 'shipping_address' === $property ) {
-			$property = 'shipping_address_1';
-		}
-		return isset( $this->_data[ $property ] ) ? $this->_data[ $property ] : '';
-	}
-
-	/**
-	 * __set function.
-	 *
-	 * @param mixed $property
-	 * @param mixed $value
-	 */
-	public function __set( $property, $value ) {
-		if ( 'address' === $property ) {
-			$property = 'address_1';
-		}
-		if ( 'shipping_address' === $property ) {
-			$property = 'shipping_address_1';
-		}
-		$this->_data[ $property ] = $value;
-		$this->_changed = true;
-	}
-
-	/**
-	 * Get default country for a customer.
-	 *
-	 * @return string
-	 */
-	public function get_default_country() {
-		$default = wc_get_customer_default_location();
-		return $default['country'];
-	}
-
-	/**
-	 * Get default state for a customer.
-	 *
-	 * @return string
-	 */
-	public function get_default_state() {
-		$default = wc_get_customer_default_location();
-		return $default['state'];
-	}
-
-	/**
-	 * has_calculated_shipping function.
-	 *
-	 * @return bool
-	 */
-	public function has_calculated_shipping() {
-		return ! empty( $this->calculated_shipping );
-	}
-
-	/**
-	 * Set customer address to match shop base address.
-	 */
-	public function set_to_base() {
-		$this->country  = $this->get_default_country();
-		$this->state    = $this->get_default_state();
-		$this->postcode = '';
-		$this->city     = '';
-	}
-
-	/**
-	 * Set customer shipping address to base address.
-	 */
-	public function set_shipping_to_base() {
-		$this->shipping_country  = $this->get_default_country();
-		$this->shipping_state    = $this->get_default_state();
-		$this->shipping_postcode = '';
-		$this->shipping_city     = '';
+		return false;
 	}
 
 	/**
@@ -177,176 +150,59 @@ class WC_Customer {
 	 */
 	public function is_customer_outside_base() {
 		list( $country, $state ) = $this->get_taxable_address();
-
 		if ( $country ) {
-
 			$default = wc_get_base_location();
-
 			if ( $default['country'] !== $country ) {
 				return true;
 			}
-
 			if ( $default['state'] && $default['state'] !== $state ) {
 				return true;
 			}
-
 		}
-
 		return false;
 	}
 
 	/**
-	 * Is the user a paying customer?
-	 *
-	 * @return bool
-	 */
-	function is_paying_customer( $user_id ) {
-		return '1' === get_user_meta( $user_id, 'paying_customer', true );
-	}
-
-	/**
-	 * Is customer VAT exempt?
-	 *
-	 * @return bool
-	 */
-	public function is_vat_exempt() {
-		return ( ! empty( $this->is_vat_exempt ) ) ? true : false;
-	}
-
-	/**
-	 * Gets the state from the current session.
+	 * Return this customer's avatar.
 	 *
+	 * @since 3.0.0
 	 * @return string
 	 */
-	public function get_state() {
-		return $this->state;
+	public function get_avatar_url() {
+		$avatar_html = get_avatar( $this->get_email() );
+
+		// Get the URL of the avatar from the provided HTML
+		preg_match( '/src=["|\'](.+)[\&|"|\']/U', $avatar_html, $matches );
+
+		if ( isset( $matches[1] ) && ! empty( $matches[1] ) ) {
+			return esc_url( $matches[1] );
+		}
+
+		return '';
 	}
 
 	/**
-	 * Gets the country from the current session.
-	 *
-	 * @return string
-	 */
-	public function get_country() {
-		return $this->country;
-	}
-
-	/**
-	 * Gets the postcode from the current session.
-	 *
-	 * @return string
-	 */
-	public function get_postcode() {
-		return empty( $this->postcode ) ? '' : wc_format_postcode( $this->postcode, $this->get_country() );
-	}
-
-	/**
-	 * Get the city from the current session.
-	 *
-	 * @return string
-	 */
-	public function get_city() {
-		return $this->city;
-	}
-
-	/**
-	 * Gets the address from the current session.
-	 *
-	 * @return string
-	 */
-	public function get_address() {
-		return $this->address_1;
-	}
-
-	/**
-	 * Gets the address_2 from the current session.
-	 *
-	 * @return string
-	 */
-	public function get_address_2() {
-		return $this->address_2;
-	}
-
-	/**
-	 * Gets the state from the current session.
-	 *
-	 * @return string
-	 */
-	public function get_shipping_state() {
-		return $this->shipping_state;
-	}
-
-	/**
-	 * Gets the country from the current session.
-	 *
-	 * @return string
-	 */
-	public function get_shipping_country() {
-		return $this->shipping_country;
-	}
-
-	/**
-	 * Gets the postcode from the current session.
-	 *
-	 * @return string
-	 */
-	public function get_shipping_postcode() {
-		return empty( $this->shipping_postcode ) ? '' : wc_format_postcode( $this->shipping_postcode, $this->get_shipping_country() );
-	}
-
-	/**
-	 * Gets the city from the current session.
-	 *
-	 * @return string
-	 */
-	public function get_shipping_city() {
-		return $this->shipping_city;
-	}
-
-	/**
-	 * Gets the address from the current session.
-	 *
-	 * @return string
-	 */
-	public function get_shipping_address() {
-		return $this->shipping_address_1;
-	}
-
-	/**
-	 * Gets the address_2 from the current session.
-	 *
-	 * @return string
-	 */
-	public function get_shipping_address_2() {
-		return $this->shipping_address_2;
-	}
-
-	/**
-	 * get_taxable_address function.
-	 *
+	 * Get taxable address.
 	 * @return array
 	 */
 	public function get_taxable_address() {
 		$tax_based_on = get_option( 'woocommerce_tax_based_on' );
 
 		// Check shipping method at this point to see if we need special handling
-		if ( true == apply_filters( 'woocommerce_apply_base_tax_for_local_pickup', true ) && WC()->cart->needs_shipping() && sizeof( array_intersect( WC()->session->get( 'chosen_shipping_methods', array() ), apply_filters( 'woocommerce_local_pickup_methods', array( 'local_pickup' ) ) ) ) > 0 ) {
+		if ( true === apply_filters( 'woocommerce_apply_base_tax_for_local_pickup', true ) && sizeof( array_intersect( wc_get_chosen_shipping_method_ids(), apply_filters( 'woocommerce_local_pickup_methods', array( 'legacy_local_pickup', 'local_pickup' ) ) ) ) > 0 ) {
 			$tax_based_on = 'base';
 		}
 
 		if ( 'base' === $tax_based_on ) {
-
 			$country  = WC()->countries->get_base_country();
 			$state    = WC()->countries->get_base_state();
 			$postcode = WC()->countries->get_base_postcode();
 			$city     = WC()->countries->get_base_city();
-
 		} elseif ( 'billing' === $tax_based_on ) {
-			$country  = $this->get_country();
-			$state    = $this->get_state();
-			$postcode = $this->get_postcode();
-			$city     = $this->get_city();
-
+			$country  = $this->get_billing_country();
+			$state    = $this->get_billing_state();
+			$postcode = $this->get_billing_postcode();
+			$city     = $this->get_billing_city();
 		} else {
 			$country  = $this->get_shipping_country();
 			$state    = $this->get_shipping_state();
@@ -358,218 +214,860 @@ class WC_Customer {
 	}
 
 	/**
-	 * Set default data for a customer.
-	 */
-	public function set_default_data( $get_user_profile_data = true ) {
-		$this->_data = array(
-			'postcode'            => '',
-			'city'                => '',
-			'address_1'           => '',
-			'address_2'           => '',
-			'state'               => '',
-			'country'             => '',
-			'shipping_postcode'   => '',
-			'shipping_city'       => '',
-			'shipping_address_1'  => '',
-			'shipping_address_2'  => '',
-			'shipping_state'      => '',
-			'shipping_country'    => '',
-			'is_vat_exempt'       => false,
-			'calculated_shipping' => false
-		);
-
-		if ( is_user_logged_in() && $get_user_profile_data ) {
-			foreach ( $this->_data as $key => $value ) {
-				$meta_value          = get_user_meta( get_current_user_id(), ( false === strstr( $key, 'shipping_' ) ? 'billing_' : '' ) . $key, true );
-				$this->_data[ $key ] = $meta_value ? $meta_value : $this->_data[ $key ];
-			}
-		}
-
-		if ( empty( $this->_data['country'] ) ) {
-			$this->_data['country'] = $this->get_default_country();
-		}
-
-		if ( empty( $this->_data['shipping_country'] ) ) {
-			$this->_data['shipping_country'] = $this->_data['country'];
-		}
-
-		if ( empty( $this->_data['state'] ) ) {
-			$this->_data['state'] = $this->get_default_state();
-		}
-
-		if ( empty( $this->_data['shipping_state'] ) ) {
-			$this->_data['shipping_state'] = $this->_data['state'];
-		}
-	}
-
-	/**
-	 * Sets session data for the location.
-	 *
-	 * @param string $country
-	 * @param string $state
-	 * @param string $postcode (default: '')
-	 * @param string $city (default: '')
-	 */
-	public function set_location( $country, $state, $postcode = '', $city = '' ) {
-		$this->country  = $country;
-		$this->state    = $state;
-		$this->postcode = $postcode;
-		$this->city     = $city;
-	}
-
-	/**
-	 * Sets session data for the country.
-	 *
-	 * @param mixed $country
-	 */
-	public function set_country( $country ) {
-		$this->country = $country;
-	}
-
-	/**
-	 * Sets session data for the state.
-	 *
-	 * @param mixed $state
-	 */
-	public function set_state( $state ) {
-		$this->state = $state;
-	}
-
-	/**
-	 * Sets session data for the postcode.
-	 *
-	 * @param mixed $postcode
-	 */
-	public function set_postcode( $postcode ) {
-		$this->postcode = $postcode;
-	}
-
-	/**
-	 * Sets session data for the city.
-	 *
-	 * @param mixed $city
-	 */
-	public function set_city( $city ) {
-		$this->city = $city;
-	}
-
-	/**
-	 * Sets session data for the address.
-	 *
-	 * @param mixed $address
-	 */
-	public function set_address( $address ) {
-		$this->address_1 = $address;
-	}
-
-	/**
-	 * Sets session data for the $address.
-	 *
-	 * @param mixed $address
-	 */
-	public function set_address_2( $address ) {
-		$this->address_2 = $address;
-	}
-
-	/**
-	 * Sets session data for the location.
-	 *
-	 * @param string $country
-	 * @param string $state (default: '')
-	 * @param string $postcode (default: '')
-	 * @param string $city (default: '')
-	 */
-	public function set_shipping_location( $country, $state = '', $postcode = '', $city = '' ) {
-		$this->shipping_country  = $country;
-		$this->shipping_state    = $state;
-		$this->shipping_postcode = $postcode;
-		$this->shipping_city     = $city;
-	}
-
-	/**
-	 * Sets session data for the country.
-	 *
-	 * @param string $country
-	 */
-	public function set_shipping_country( $country ) {
-		$this->shipping_country = $country;
-	}
-
-	/**
-	 * Sets session data for the state.
-	 *
-	 * @param string $state
-	 */
-	public function set_shipping_state( $state ) {
-		$this->shipping_state = $state;
-	}
-
-	/**
-	 * Sets session data for the postcode.
-	 *
-	 * @param string $postcode
-	 */
-	public function set_shipping_postcode( $postcode ) {
-		$this->shipping_postcode = $postcode;
-	}
-
-	/**
-	 * Sets session data for the city.
-	 *
-	 * @param string $city
-	 */
-	public function set_shipping_city( $city ) {
-		$this->shipping_city = $city;
-	}
-
-	/**
-	 * Sets session data for the address.
-	 *
-	 * @param string $address
-	 */
-	public function set_shipping_address( $address ) {
-		$this->shipping_address_1 = $address;
-	}
-
-	/**
-	 * Sets session data for the address_2.
-	 *
-	 * @param string $address
-	 */
-	public function set_shipping_address_2( $address ) {
-		$this->shipping_address_2 = $address;
-	}
-
-	/**
-	 * Sets session data for the tax exemption.
-	 *
-	 * @param bool $is_vat_exempt
-	 */
-	public function set_is_vat_exempt( $is_vat_exempt ) {
-		$this->is_vat_exempt = $is_vat_exempt;
-	}
-
-	/**
-	 * calculated_shipping function.
-	 *
-	 * @param boolean $calculated
-	 */
-	public function calculated_shipping( $calculated = true ) {
-		$this->calculated_shipping = $calculated;
-	}
-
-	/**
-	 * Gets a user's downloadable products if they are logged in.
+	 * Gets a customer's downloadable products.
 	 *
 	 * @return array Array of downloadable products
 	 */
 	public function get_downloadable_products() {
 		$downloads = array();
-
-		if ( is_user_logged_in() ) {
-			$downloads = wc_get_customer_available_downloads( get_current_user_id() );
+		if ( $this->get_id() ) {
+			$downloads = wc_get_customer_available_downloads( $this->get_id() );
 		}
-
 		return apply_filters( 'woocommerce_customer_get_downloadable_products', $downloads );
 	}
+
+	/**
+	 * Is customer VAT exempt?
+	 *
+	 * @return bool
+	 */
+	public function is_vat_exempt() {
+		return $this->get_is_vat_exempt();
+	}
+
+	/**
+	 * Has calculated shipping?
+	 *
+	 * @return bool
+	 */
+	public function has_calculated_shipping() {
+		return $this->get_calculated_shipping();
+	}
+
+	/**
+	 * Get if customer is VAT exempt?
+	 *
+	 * @since 3.0.0
+	 * @return bool
+	 */
+	public function get_is_vat_exempt() {
+		return $this->is_vat_exempt;
+	}
+
+	/**
+	 * Get password (only used when updating the user object).
+	 *
+	 * @return string
+	 */
+	public function get_password() {
+		return $this->password;
+	}
+
+	/**
+	 * Has customer calculated shipping?
+	 *
+	 * @param  string $context
+	 * @return bool
+	 */
+	public function get_calculated_shipping() {
+		return $this->calculated_shipping;
+	}
+
+	/**
+	 * Set if customer has tax exemption.
+	 *
+	 * @param bool $is_vat_exempt
+	 */
+	public function set_is_vat_exempt( $is_vat_exempt ) {
+		$this->is_vat_exempt = (bool) $is_vat_exempt;
+	}
+
+	/**
+	 * Calculated shipping?
+	 *
+	 * @param boolean $calculated
+	 */
+	public function set_calculated_shipping( $calculated = true ) {
+		$this->calculated_shipping = (bool) $calculated;
+	}
+
+	/**
+	 * Set customer's password.
+	 *
+	 * @since 3.0.0
+	 * @param string $password
+	 * @throws WC_Data_Exception
+	 */
+	public function set_password( $password ) {
+		$this->password = wc_clean( $password );
+	}
+
+	/**
+	 * Gets the customers last order.
+	 *
+	 * @param WC_Customer
+	 * @return WC_Order|false
+	 */
+	public function get_last_order() {
+		return $this->data_store->get_last_order( $this );
+	}
+
+	/**
+	 * Return the number of orders this customer has.
+	 *
+	 * @param WC_Customer
+	 * @return integer
+	 */
+	public function get_order_count() {
+		return $this->data_store->get_order_count( $this );
+	}
+
+	/**
+	 * Return how much money this customer has spent.
+	 *
+	 * @param WC_Customer
+	 * @return float
+	 */
+	public function get_total_spent() {
+		return $this->data_store->get_total_spent( $this );
+	}
+
+	/*
+	 |--------------------------------------------------------------------------
+	 | Getters
+	 |--------------------------------------------------------------------------
+	 */
+
+	/**
+	 * Return the customer's username.
+	 *
+	 * @since  3.0.0
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_username( $context = 'view' ) {
+		return $this->get_prop( 'username', $context );
+	}
+
+	/**
+	 * Return the customer's email.
+	 *
+	 * @since  3.0.0
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_email( $context = 'view' ) {
+		return $this->get_prop( 'email', $context );
+	}
+
+	/**
+	 * Return customer's first name.
+	 *
+	 * @since  3.0.0
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_first_name( $context = 'view' ) {
+		return $this->get_prop( 'first_name', $context );
+	}
+
+	/**
+	 * Return customer's last name.
+	 *
+	 * @since  3.0.0
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_last_name( $context = 'view' ) {
+		return $this->get_prop( 'last_name', $context );
+	}
+
+	/**
+	 * Return customer's user role.
+	 *
+	 * @since  3.0.0
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_role( $context = 'view' ) {
+		return $this->get_prop( 'role', $context );
+	}
+
+	/**
+	 * Return the date this customer was created.
+	 *
+	 * @since  3.0.0
+	 * @param  string $context
+	 * @return WC_DateTime|null object if the date is set or null if there is no date.
+	 */
+	public function get_date_created( $context = 'view' ) {
+		return $this->get_prop( 'date_created', $context );
+	}
+
+	/**
+	 * Return the date this customer was last updated.
+	 *
+	 * @since  3.0.0
+	 * @param  string $context
+	 * @return WC_DateTime|null object if the date is set or null if there is no date.
+	 */
+	public function get_date_modified( $context = 'view' ) {
+		return $this->get_prop( 'date_modified', $context );
+	}
+
+	/**
+	 * Gets a prop for a getter method.
+	 *
+	 * @since  3.0.0
+	 * @param  string $prop Name of prop to get.
+	 * @param  string $address billing or shipping.
+	 * @param  string $context What the value is for. Valid values are view and edit.
+	 * @return mixed
+	 */
+	protected function get_address_prop( $prop, $address = 'billing', $context = 'view' ) {
+		$value = null;
+
+		if ( array_key_exists( $prop, $this->data[ $address ] ) ) {
+			$value = isset( $this->changes[ $address ][ $prop ] ) ? $this->changes[ $address ][ $prop ] : $this->data[ $address ][ $prop ];
+
+			if ( 'view' === $context ) {
+				$value = apply_filters( $this->get_hook_prefix() . $address . '_' . $prop, $value, $this );
+			}
+		}
+		return $value;
+	}
+
+	/**
+	 * Get billing_first_name.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_billing_first_name( $context = 'view' ) {
+		return $this->get_address_prop( 'first_name', 'billing', $context );
+	}
+
+	/**
+	 * Get billing_last_name.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_billing_last_name( $context = 'view' ) {
+		return $this->get_address_prop( 'last_name', 'billing', $context );
+	}
+
+	/**
+	 * Get billing_company.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_billing_company( $context = 'view' ) {
+		return $this->get_address_prop( 'company', 'billing', $context );
+	}
+
+	/**
+	 * Get billing_address_1.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_billing_address( $context = 'view' ) {
+		return $this->get_billing_address_1( $context );
+	}
+
+	/**
+	 * Get billing_address_1.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_billing_address_1( $context = 'view' ) {
+		return $this->get_address_prop( 'address_1', 'billing', $context );
+	}
+
+	/**
+	 * Get billing_address_2.
+	 *
+	 * @param  string $context
+	 * @return string $value
+	 */
+	public function get_billing_address_2( $context = 'view' ) {
+		return $this->get_address_prop( 'address_2', 'billing', $context );
+	}
+
+	/**
+	 * Get billing_city.
+	 *
+	 * @param  string $context
+	 * @return string $value
+	 */
+	public function get_billing_city( $context = 'view' ) {
+		return $this->get_address_prop( 'city', 'billing', $context );
+	}
+
+	/**
+	 * Get billing_state.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_billing_state( $context = 'view' ) {
+		return $this->get_address_prop( 'state', 'billing', $context );
+	}
+
+	/**
+	 * Get billing_postcode.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_billing_postcode( $context = 'view' ) {
+		return $this->get_address_prop( 'postcode', 'billing', $context );
+	}
+
+	/**
+	 * Get billing_country.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_billing_country( $context = 'view' ) {
+		return $this->get_address_prop( 'country', 'billing', $context );
+	}
+
+	/**
+	 * Get billing_email.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_billing_email( $context = 'view' ) {
+		return $this->get_address_prop( 'email', 'billing', $context );
+	}
+
+	/**
+	 * Get billing_phone.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_billing_phone( $context = 'view' ) {
+		return $this->get_address_prop( 'phone', 'billing', $context );
+	}
+
+	/**
+	 * Get shipping_first_name.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_shipping_first_name( $context = 'view' ) {
+		return $this->get_address_prop( 'first_name', 'shipping', $context );
+	}
+
+	/**
+	 * Get shipping_last_name.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_shipping_last_name( $context = 'view' ) {
+		 return $this->get_address_prop( 'last_name', 'shipping', $context );
+	}
+
+	/**
+	 * Get shipping_company.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_shipping_company( $context = 'view' ) {
+		return $this->get_address_prop( 'company', 'shipping', $context );
+	}
+
+	/**
+	 * Get shipping_address_1.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_shipping_address( $context = 'view' ) {
+		return $this->get_shipping_address_1( $context );
+	}
+
+	/**
+	 * Get shipping_address_1.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_shipping_address_1( $context = 'view' ) {
+		return $this->get_address_prop( 'address_1', 'shipping', $context );
+	}
+
+	/**
+	 * Get shipping_address_2.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_shipping_address_2( $context = 'view' ) {
+		return $this->get_address_prop( 'address_2', 'shipping', $context );
+	}
+
+	/**
+	 * Get shipping_city.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_shipping_city( $context = 'view' ) {
+		return $this->get_address_prop( 'city', 'shipping', $context );
+	}
+
+	/**
+	 * Get shipping_state.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_shipping_state( $context = 'view' ) {
+		return $this->get_address_prop( 'state', 'shipping', $context );
+	}
+
+	/**
+	 * Get shipping_postcode.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_shipping_postcode( $context = 'view' ) {
+		return $this->get_address_prop( 'postcode', 'shipping', $context );
+	}
+
+	/**
+	 * Get shipping_country.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_shipping_country( $context = 'view' ) {
+		return $this->get_address_prop( 'country', 'shipping', $context );
+	}
+
+	/**
+	 * Is the user a paying customer?
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return bool
+	 */
+	function get_is_paying_customer( $context = 'view' ) {
+		return $this->get_prop( 'is_paying_customer', $context );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Setters
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Set customer's username.
+	 *
+	 * @since 3.0.0
+	 * @param string $username
+	 * @throws WC_Data_Exception
+	 */
+	public function set_username( $username ) {
+		$this->set_prop( 'username', $username );
+	}
+
+	/**
+	 * Set customer's email.
+	 *
+	 * @since 3.0.0
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_email( $value ) {
+		if ( $value && ! is_email( $value ) ) {
+			$this->error( 'customer_invalid_email', __( 'Invalid email address', 'woocommerce' ) );
+		}
+		$this->set_prop( 'email', sanitize_email( $value ) );
+	}
+
+	/**
+	 * Set customer's first name.
+	 *
+	 * @since 3.0.0
+	 * @param string $first_name
+	 * @throws WC_Data_Exception
+	 */
+	public function set_first_name( $first_name ) {
+		$this->set_prop( 'first_name', $first_name );
+	}
+
+	/**
+	 * Set customer's last name.
+	 *
+	 * @since 3.0.0
+	 * @param string $last_name
+	 * @throws WC_Data_Exception
+	 */
+	public function set_last_name( $last_name ) {
+		$this->set_prop( 'last_name', $last_name );
+	}
+
+	/**
+	 * Set customer's user role(s).
+	 *
+	 * @since 3.0.0
+	 * @param mixed $role
+	 * @throws WC_Data_Exception
+	 */
+	public function set_role( $role ) {
+		global $wp_roles;
+
+		if ( $role && ! empty( $wp_roles->roles ) && ! in_array( $role, array_keys( $wp_roles->roles ) ) ) {
+			$this->error( 'customer_invalid_role', __( 'Invalid role', 'woocommerce' ) );
+		}
+		$this->set_prop( 'role', $role );
+	}
+
+	/**
+	 * Set the date this customer was last updated.
+	 *
+	 * @since  3.0.0
+	 * @param  string|integer|null $date UTC timestamp, or ISO 8601 DateTime. If the DateTime string has no timezone or offset, WordPress site timezone will be assumed. Null if their is no date.
+	 * @throws WC_Data_Exception
+	 */
+	public function set_date_created( $date = null ) {
+		$this->set_date_prop( 'date_created', $date );
+	}
+
+	/**
+	 * Set the date this customer was last updated.
+	 *
+	 * @since  3.0.0
+	 * @param  string|integer|null $date UTC timestamp, or ISO 8601 DateTime. If the DateTime string has no timezone or offset, WordPress site timezone will be assumed. Null if their is no date.
+	 * @throws WC_Data_Exception
+	 */
+	public function set_date_modified( $date = null ) {
+		$this->set_date_prop( 'date_modified', $date );
+	}
+
+	/**
+	 * Set customer address to match shop base address.
+	 *
+	 * @since 3.0.0
+	 * @throws WC_Data_Exception
+	 */
+	public function set_billing_address_to_base() {
+		$base = wc_get_customer_default_location();
+		$this->set_billing_location( $base['country'], $base['state'], '', '' );
+	}
+
+	/**
+	 * Set customer shipping address to base address.
+	 *
+	 * @since 3.0.0
+	 * @throws WC_Data_Exception
+	 */
+	public function set_shipping_address_to_base() {
+		$base = wc_get_customer_default_location();
+		$this->set_shipping_location( $base['country'], $base['state'], '', '' );
+	}
+
+	/**
+	 * Sets all address info at once.
+	 *
+	 * @param string $country
+	 * @param string $state
+	 * @param string $postcode
+	 * @param string $city
+	 * @throws WC_Data_Exception
+	 */
+	public function set_billing_location( $country, $state = '', $postcode = '', $city = '' ) {
+		$billing             = $this->get_prop( 'billing', 'edit' );
+		$billing['country']  = $country;
+		$billing['state']    = $state;
+		$billing['postcode'] = $postcode;
+		$billing['city']     = $city;
+		$this->set_prop( 'billing', $billing );
+	}
+
+	/**
+	 * Sets all shipping info at once.
+	 *
+	 * @param string $country
+	 * @param string $state
+	 * @param string $postcode
+	 * @param string $city
+	 * @throws WC_Data_Exception
+	 */
+	public function set_shipping_location( $country, $state = '', $postcode = '', $city = '' ) {
+		$shipping             = $this->get_prop( 'shipping', 'edit' );
+		$shipping['country']  = $country;
+		$shipping['state']    = $state;
+		$shipping['postcode'] = $postcode;
+		$shipping['city']     = $city;
+		$this->set_prop( 'shipping', $shipping );
+	}
+
+	/**
+	 * Sets a prop for a setter method.
+	 *
+	 * @since 3.0.0
+	 * @param string $prop Name of prop to set.
+	 * @param string $address Name of address to set. billing or shipping.
+	 * @param mixed  $value Value of the prop.
+	 */
+	protected function set_address_prop( $prop, $address = 'billing', $value ) {
+		if ( array_key_exists( $prop, $this->data[ $address ] ) ) {
+			if ( true === $this->object_read ) {
+				if ( $value !== $this->data[ $address ][ $prop ] || ( isset( $this->changes[ $address ] ) && array_key_exists( $prop, $this->changes[ $address ] ) ) ) {
+					$this->changes[ $address ][ $prop ] = $value;
+				}
+			} else {
+				$this->data[ $address ][ $prop ] = $value;
+			}
+		}
+	}
+
+	/**
+	 * Set billing_first_name.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_billing_first_name( $value ) {
+		$this->set_address_prop( 'first_name', 'billing', $value );
+	}
+
+	/**
+	 * Set billing_last_name.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_billing_last_name( $value ) {
+		$this->set_address_prop( 'last_name', 'billing', $value );
+	}
+
+	/**
+	 * Set billing_company.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_billing_company( $value ) {
+		$this->set_address_prop( 'company', 'billing', $value );
+	}
+
+	/**
+	 * Set billing_address_1.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_billing_address( $value ) {
+		$this->set_billing_address_1( $value );
+	}
+
+	/**
+	 * Set billing_address_1.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_billing_address_1( $value ) {
+		$this->set_address_prop( 'address_1', 'billing', $value );
+	}
+
+	/**
+	 * Set billing_address_2.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_billing_address_2( $value ) {
+		$this->set_address_prop( 'address_2', 'billing', $value );
+	}
+
+	/**
+	 * Set billing_city.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_billing_city( $value ) {
+		$this->set_address_prop( 'city', 'billing', $value );
+	}
+
+	/**
+	 * Set billing_state.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_billing_state( $value ) {
+		$this->set_address_prop( 'state', 'billing', $value );
+	}
+
+	/**
+	 * Set billing_postcode.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_billing_postcode( $value ) {
+		$this->set_address_prop( 'postcode', 'billing', $value );
+	}
+
+	/**
+	 * Set billing_country.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_billing_country( $value ) {
+		$this->set_address_prop( 'country', 'billing', $value );
+	}
+
+	/**
+	 * Set billing_email.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_billing_email( $value ) {
+		if ( $value && ! is_email( $value ) ) {
+			$this->error( 'customer_invalid_billing_email', __( 'Invalid billing email address', 'woocommerce' ) );
+		}
+		$this->set_address_prop( 'email', 'billing', sanitize_email( $value ) );
+	}
+
+	/**
+	 * Set billing_phone.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_billing_phone( $value ) {
+		$this->set_address_prop( 'phone', 'billing', $value );
+	}
+
+	/**
+	 * Set shipping_first_name.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_shipping_first_name( $value ) {
+		$this->set_address_prop( 'first_name', 'shipping', $value );
+	}
+
+	/**
+	 * Set shipping_last_name.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_shipping_last_name( $value ) {
+		$this->set_address_prop( 'last_name', 'shipping', $value );
+	}
+
+	/**
+	 * Set shipping_company.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_shipping_company( $value ) {
+		$this->set_address_prop( 'company', 'shipping', $value );
+	}
+
+	/**
+	 * Set shipping_address_1.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_shipping_address( $value ) {
+		$this->set_shipping_address_1( $value );
+	}
+
+	/**
+	 * Set shipping_address_1.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_shipping_address_1( $value ) {
+		$this->set_address_prop( 'address_1', 'shipping', $value );
+	}
+
+	/**
+	 * Set shipping_address_2.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_shipping_address_2( $value ) {
+		$this->set_address_prop( 'address_2', 'shipping', $value );
+	}
+
+	/**
+	 * Set shipping_city.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_shipping_city( $value ) {
+		$this->set_address_prop( 'city', 'shipping', $value );
+	}
+
+	/**
+	 * Set shipping_state.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_shipping_state( $value ) {
+		$this->set_address_prop( 'state', 'shipping', $value );
+	}
+
+	/**
+	 * Set shipping_postcode.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_shipping_postcode( $value ) {
+		$this->set_address_prop( 'postcode', 'shipping', $value );
+	}
+
+	/**
+	 * Set shipping_country.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_shipping_country( $value ) {
+		$this->set_address_prop( 'country', 'shipping', $value );
+	}
+
+	/**
+	 * Set if the user a paying customer.
+	 *
+	 * @since 3.0.0
+	 * @param bool $is_paying_customer
+	 * @throws WC_Data_Exception
+	 */
+	function set_is_paying_customer( $is_paying_customer ) {
+		$this->set_prop( 'is_paying_customer', (bool) $is_paying_customer );
+	}
 }
diff --git a/includes/class-wc-data-exception.php b/includes/class-wc-data-exception.php
new file mode 100644
index 00000000000..504552ae36c
--- /dev/null
+++ b/includes/class-wc-data-exception.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * WooCommerce Data Exception Class
+ *
+ * Extends Exception to provide additional data.
+ *
+ * @author   WooThemes
+ * @category Core
+ * @package  WooCommerce
+ * @since    3.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC_Data_Exception class.
+ */
+class WC_Data_Exception extends Exception {
+
+	/**
+	 * Sanitized error code.
+	 *
+	 * @var string
+	 */
+	protected $error_code;
+
+	/**
+	 * Error extra data.
+	 *
+	 * @var array
+	 */
+	protected $error_data;
+
+	/**
+	 * Setup exception.
+	 *
+	 * @param string $code             Machine-readable error code, e.g `woocommerce_invalid_product_id`.
+	 * @param string $message          User-friendly translated error message, e.g. 'Product ID is invalid'.
+	 * @param int    $http_status_code Proper HTTP status code to respond with, e.g. 400.
+	 * @param array  $data             Extra error data.
+	 */
+	public function __construct( $code, $message, $http_status_code = 400, $data = array() ) {
+		$this->error_code = $code;
+		$this->error_data = array_merge( array( 'status' => $http_status_code ), $data );
+
+		parent::__construct( $message, $http_status_code );
+	}
+
+	/**
+	 * Returns the error code.
+	 *
+	 * @return string
+	 */
+	public function getErrorCode() {
+		return $this->error_code;
+	}
+
+	/**
+	 * Returns error data.
+	 *
+	 * @return array
+	 */
+	public function getErrorData() {
+		return $this->error_data;
+	}
+}
diff --git a/includes/class-wc-data-store.php b/includes/class-wc-data-store.php
new file mode 100644
index 00000000000..ac6b51afde4
--- /dev/null
+++ b/includes/class-wc-data-store.php
@@ -0,0 +1,193 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Data Store.
+ *
+ * @since    3.0.0
+ * @version  3.0.0
+ * @category Class
+ * @author   WooThemes
+ */
+class WC_Data_Store {
+
+	/**
+	 * Contains an instance of the data store class that we are working with.
+	 */
+	private $instance = null;
+
+	/**
+	 * Contains an array of default WC supported data stores.
+	 * Format of object name => class name.
+	 * Example: 'product' => 'WC_Product_Data_Store_CPT'
+	 * You can aso pass something like product_<type> for product stores and
+	 * that type will be used first when avaiable, if a store is requested like
+	 * this and doesn't exist, then the store would fall back to 'product'.
+	 * Ran through `woocommerce_data_stores`.
+	 */
+	private $stores = array(
+		'coupon'              => 'WC_Coupon_Data_Store_CPT',
+		'customer'            => 'WC_Customer_Data_Store',
+		'customer-download'   => 'WC_Customer_Download_Data_Store',
+		'customer-session'    => 'WC_Customer_Data_Store_Session',
+		'order'               => 'WC_Order_Data_Store_CPT',
+		'order-refund'        => 'WC_Order_Refund_Data_Store_CPT',
+		'order-item'          => 'WC_Order_Item_Data_Store',
+		'order-item-coupon'   => 'WC_Order_Item_Coupon_Data_Store',
+		'order-item-fee'      => 'WC_Order_Item_Fee_Data_Store',
+		'order-item-product'  => 'WC_Order_Item_Product_Data_Store',
+		'order-item-shipping' => 'WC_Order_Item_Shipping_Data_Store',
+		'order-item-tax'      => 'WC_Order_Item_Tax_Data_Store',
+		'payment-token'       => 'WC_Payment_Token_Data_Store',
+		'product'             => 'WC_Product_Data_Store_CPT',
+		'product-grouped'     => 'WC_Product_Grouped_Data_Store_CPT',
+		'product-variable'    => 'WC_Product_Variable_Data_Store_CPT',
+		'product-variation'   => 'WC_Product_Variation_Data_Store_CPT',
+		'shipping-zone'       => 'WC_Shipping_Zone_Data_Store',
+	);
+
+	/**
+	 * Contains the name of the current data store's class name.
+	 */
+	private $current_class_name = '';
+
+	/**
+	 * The object type this store works with.
+	 * @var string
+	 */
+	private $object_type = '';
+
+
+	/**
+	 * Tells WC_Data_Store which object (coupon, product, order, etc)
+	 * store we want to work with.
+	 *
+	 * @param string $object_type Name of object.
+	 */
+	public function __construct( $object_type ) {
+		$this->object_type = $object_type;
+		$this->stores = apply_filters( 'woocommerce_data_stores', $this->stores );
+
+		// If this object type can't be found, check to see if we can load one
+		// level up (so if product-type isn't found, we try product).
+		if ( ! array_key_exists( $object_type, $this->stores ) ) {
+			$pieces = explode( '-', $object_type );
+			$object_type = $pieces[0];
+		}
+
+		if ( array_key_exists( $object_type, $this->stores ) ) {
+			$store = apply_filters( 'woocommerce_' . $object_type . '_data_store', $this->stores[ $object_type ] );
+			if ( is_object( $store ) ) {
+				if ( ! $store instanceof WC_Object_Data_Store_Interface ) {
+					throw new Exception( __( 'Invalid data store.', 'woocommerce' ) );
+				}
+				$this->current_class_name = get_class( $store );
+				$this->instance = $store;
+			} else {
+				if ( ! class_exists( $store ) ) {
+					throw new Exception( __( 'Invalid data store.', 'woocommerce' ) );
+				}
+				$this->current_class_name = $store;
+				$this->instance = new $store;
+			}
+		} else {
+			throw new Exception( __( 'Invalid data store.', 'woocommerce' ) );
+		}
+	}
+
+	/**
+	 * Only store the object type to avoid serializing the data store instance.
+	 *
+	 * @return array
+	 */
+	public function __sleep() {
+		return array( 'object_type' );
+	}
+
+	/**
+	 * Re-run the constructor with the object type.
+	 */
+	public function __wakeup() {
+		$this->__construct( $this->object_type );
+	}
+
+	/**
+	 * Loads a data store.
+	 *
+	 * @param string $object_type Name of object.
+	 * @since 3.0.0
+	 */
+	public static function load( $object_type ) {
+		return new WC_Data_Store( $object_type );
+	}
+
+	/**
+	 * Returns the class name of the current data store.
+	 *
+	 * @since 3.0.0
+	 * @return string
+	 */
+	public function get_current_class_name() {
+		return $this->current_class_name;
+	}
+
+	/**
+	 * Reads an object from the data store.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Data
+	 */
+	public function read( &$data ) {
+		$this->instance->read( $data );
+	}
+
+	/**
+	 * Create an object in the data store.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Data
+	 */
+	public function create( &$data ) {
+		$this->instance->create( $data );
+	}
+
+	/**
+	 * Update an object in the data store.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Data
+	 */
+	public function update( &$data ) {
+		$this->instance->update( $data );
+	}
+
+	/**
+	 * Delete an object from the data store.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Data
+	 * @param array $args Array of args to pass to the delete method.
+	 */
+	public function delete( &$data, $args = array() ) {
+		$this->instance->delete( $data, $args );
+	}
+
+	/**
+	 * Data stores can define additional functions (for example, coupons have
+	 * some helper methods for increasing or decreasing usage). This passes
+	 * through to the instance if that function exists.
+	 *
+	 * @since 3.0.0
+	 * @param $method
+	 * @param $parameters
+	 */
+	public function __call( $method, $parameters ) {
+		if ( is_callable( array( $this->instance, $method ) ) ) {
+			$object = array_shift( $parameters );
+			return call_user_func_array( array( $this->instance, $method ), array_merge( array( &$object ), $parameters ) );
+		}
+	}
+
+}
diff --git a/includes/class-wc-datetime.php b/includes/class-wc-datetime.php
new file mode 100644
index 00000000000..b7b310c3b1f
--- /dev/null
+++ b/includes/class-wc-datetime.php
@@ -0,0 +1,102 @@
+<?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Wrapper for PHP DateTime.
+ *
+ * @class    WC_DateTime
+ * @since    3.0.0
+ * @package  WooCommerce/Classes
+ * @category Class
+ * @author   WooThemes
+ */
+class WC_DateTime extends DateTime {
+
+	/**
+	 * UTC Offset if needed.
+	 * @var integer
+	 */
+	protected $utc_offset = 0;
+
+	/**
+	 * Output an ISO 8601 date string in local timezone.
+	 *
+	 * @since  3.0.0
+	 * @return string
+	 */
+	public function __toString() {
+		return $this->format( DATE_ATOM );
+	}
+
+	/**
+	 * Set UTC offset.
+	 */
+	public function set_utc_offset( $offset ) {
+		$this->utc_offset = intval( $offset );
+	}
+
+	/**
+	 * getOffset.
+	 */
+	public function getOffset() {
+		if ( $this->utc_offset ) {
+			return $this->utc_offset;
+		} else {
+			return parent::getOffset();
+		}
+	}
+
+	/**
+	 * Set timezone.
+	 * @param DateTimeZone $timezone
+	 */
+	public function setTimezone( $timezone ) {
+		$this->utc_offset = 0;
+		return parent::setTimezone( $timezone );
+	}
+
+	/**
+	 * Missing in PHP 5.2.
+	 *
+	 * @since  3.0.0
+	 * @return int
+	 */
+	public function getTimestamp() {
+		return method_exists( 'DateTime', 'getTimestamp' ) ? parent::getTimestamp() : $this->format( 'U' );
+	}
+
+	/**
+	 * Get the timestamp with the WordPress timezone offset added or subtracted.
+	 *
+	 * @since  3.0.0
+	 * @return int
+	 */
+	public function getOffsetTimestamp() {
+		return $this->getTimestamp() + $this->getOffset();
+	}
+
+	/**
+	 * Format a date based on the offset timestamp.
+	 *
+	 * @since  3.0.0
+	 * @param  string $format
+	 * @return string
+	 */
+	public function date( $format ) {
+		return gmdate( $format, $this->getOffsetTimestamp() );
+	}
+
+	/**
+	 * Return a localised date based on offset timestamp. Wrapper for date_i18n function.
+	 *
+	 * @since  3.0.0
+	 * @param  string $format
+	 * @return string
+	 */
+	public function date_i18n( $format = 'Y-m-d' ) {
+		return date_i18n( $format, $this->getOffsetTimestamp() );
+	}
+}
diff --git a/includes/class-wc-deprecated-action-hooks.php b/includes/class-wc-deprecated-action-hooks.php
new file mode 100644
index 00000000000..6e1e10eaba9
--- /dev/null
+++ b/includes/class-wc-deprecated-action-hooks.php
@@ -0,0 +1,143 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Handles deprecation notices and triggering of legacy action hooks.
+ *
+ * @since 3.0.0
+ */
+class WC_Deprecated_Action_Hooks extends WC_Deprecated_Hooks {
+
+	/**
+	 * Array of deprecated hooks we need to handle.
+	 *
+	 * @var array
+	 */
+	protected $deprecated_hooks = array(
+		'woocommerce_new_order_item' => array(
+			'woocommerce_order_add_shipping',
+			'woocommerce_order_add_coupon',
+			'woocommerce_order_add_tax',
+			'woocommerce_order_add_fee',
+			'woocommerce_add_shipping_order_item',
+			'woocommerce_add_order_item_meta',
+			'woocommerce_add_order_fee_meta',
+		),
+		'woocommerce_update_order_item' => array(
+			'woocommerce_order_edit_product',
+			'woocommerce_order_update_coupon',
+			'woocommerce_order_update_shipping',
+			'woocommerce_order_update_fee',
+			'woocommerce_order_update_tax',
+		),
+		'woocommerce_new_payment_token' => 'woocommerce_payment_token_created',
+		'woocommerce_new_product_variation' => 'woocommerce_create_product_variation',
+	);
+
+	/**
+	 * Hook into the new hook so we can handle deprecated hooks once fired.
+	 * @param  string $hook_name
+	 */
+	public function hook_in( $hook_name ) {
+		add_action( $hook_name, array( $this, 'maybe_handle_deprecated_hook' ), -1000, 8 );
+	}
+
+	/**
+	 * If the old hook is in-use, trigger it.
+	 *
+	 * @param string $new_hook
+	 * @param string $old_hook
+	 * @param array $new_callback_args
+	 * @param mixed $return_value
+	 * @return mixed
+	 */
+	public function handle_deprecated_hook( $new_hook, $old_hook, $new_callback_args, $return_value ) {
+		if ( has_action( $old_hook ) ) {
+			$this->display_notice( $old_hook, $new_hook );
+			$return_value = $this->trigger_hook( $old_hook, $new_callback_args );
+		}
+		return $return_value;
+	}
+
+	/**
+	 * Fire off a legacy hook with it's args.
+	 *
+	 * @param  string $old_hook
+	 * @param  array $new_callback_args
+	 * @return mixed
+	 */
+	protected function trigger_hook( $old_hook, $new_callback_args ) {
+		switch ( $old_hook ) {
+			case 'woocommerce_order_add_shipping' :
+			case 'woocommerce_order_add_fee' :
+				$item_id  = $new_callback_args[0];
+				$item     = $new_callback_args[1];
+				$order_id = $new_callback_args[2];
+				if ( is_a( $item, 'WC_Order_Item_Shipping' ) || is_a( $item, 'WC_Order_Item_Fee' ) ) {
+					do_action( $old_hook, $order_id, $item_id, $item );
+				}
+				break;
+			case 'woocommerce_order_add_coupon' :
+				$item_id  = $new_callback_args[0];
+				$item     = $new_callback_args[1];
+				$order_id = $new_callback_args[2];
+				if ( is_a( $item, 'WC_Order_Item_Coupon' ) ) {
+					do_action( $old_hook, $order_id, $item_id, $item->get_code(), $item->get_discount(), $item->get_discount_tax() );
+				}
+				break;
+			case 'woocommerce_order_add_tax' :
+				$item_id  = $new_callback_args[0];
+				$item     = $new_callback_args[1];
+				$order_id = $new_callback_args[2];
+				if ( is_a( $item, 'WC_Order_Item_Tax' ) ) {
+					do_action( $old_hook, $order_id, $item_id, $item->get_rate_id(), $item->get_tax_total(), $item->get_shipping_tax_total() );
+				}
+				break;
+			case 'woocommerce_add_shipping_order_item' :
+				$item_id  = $new_callback_args[0];
+				$item     = $new_callback_args[1];
+				$order_id = $new_callback_args[2];
+				if ( is_a( $item, 'WC_Order_Item_Shipping' ) ) {
+					do_action( $old_hook, $order_id, $item_id, $item->legacy_package_key );
+				}
+				break;
+			case 'woocommerce_add_order_item_meta' :
+				$item_id  = $new_callback_args[0];
+				$item     = $new_callback_args[1];
+				$order_id = $new_callback_args[2];
+				if ( is_a( $item, 'WC_Order_Item_Product' ) ) {
+					do_action( $old_hook, $item_id, $item->legacy_values, $item->legacy_cart_item_key );
+				}
+				break;
+			case 'woocommerce_add_order_fee_meta' :
+				$item_id  = $new_callback_args[0];
+				$item     = $new_callback_args[1];
+				$order_id = $new_callback_args[2];
+				if ( is_a( $item, 'WC_Order_Item_Fee' ) ) {
+					do_action( $old_hook, $order_id, $item_id, $item->legacy_fee, $item->legacy_fee_key );
+				}
+				break;
+			case 'woocommerce_order_edit_product' :
+				$item_id  = $new_callback_args[0];
+				$item     = $new_callback_args[1];
+				$order_id = $new_callback_args[2];
+				if ( is_a( $item, 'WC_Order_Item_Product' ) ) {
+					do_action( $old_hook, $order_id, $item_id, $item, $item->get_product() );
+				}
+				break;
+			case 'woocommerce_order_update_coupon' :
+			case 'woocommerce_order_update_shipping' :
+			case 'woocommerce_order_update_fee' :
+			case 'woocommerce_order_update_tax' :
+				if ( ! is_a( $item, 'WC_Order_Item_Product' ) ) {
+					do_action( $old_hook, $order_id, $item_id, $item );
+				}
+				break;
+			default :
+				do_action_ref_array( $old_hook, $new_callback_args );
+				break;
+		}
+	}
+}
diff --git a/includes/class-wc-deprecated-filter-hooks.php b/includes/class-wc-deprecated-filter-hooks.php
new file mode 100644
index 00000000000..5ef50fa4957
--- /dev/null
+++ b/includes/class-wc-deprecated-filter-hooks.php
@@ -0,0 +1,91 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Handles deprecation notices and triggering of legacy filter hooks.
+ *
+ * @since 3.0.0
+ */
+class WC_Deprecated_Filter_Hooks extends WC_Deprecated_Hooks {
+
+	/**
+	 * Array of deprecated hooks we need to handle.
+	 * Format of 'new' => 'old'.
+	 *
+	 * @var array
+	 */
+	protected $deprecated_hooks = array(
+		'woocommerce_structured_data_order'          => 'woocommerce_email_order_schema_markup',
+		'woocommerce_add_to_cart_fragments'          => 'add_to_cart_fragments',
+		'woocommerce_add_to_cart_redirect'           => 'add_to_cart_redirect',
+		'woocommerce_product_get_width'              => 'woocommerce_product_width',
+		'woocommerce_product_get_height'             => 'woocommerce_product_height',
+		'woocommerce_product_get_length'             => 'woocommerce_product_length',
+		'woocommerce_product_get_weight'             => 'woocommerce_product_weight',
+		'woocommerce_product_get_sku'                => 'woocommerce_get_sku',
+		'woocommerce_product_get_price'              => 'woocommerce_get_price',
+		'woocommerce_product_get_regular_price'      => 'woocommerce_get_regular_price',
+		'woocommerce_product_get_sale_price'         => 'woocommerce_get_sale_price',
+		'woocommerce_product_get_tax_class'          => 'woocommerce_product_tax_class',
+		'woocommerce_product_get_stock_quantity'     => 'woocommerce_get_stock_quantity',
+		'woocommerce_product_get_attributes'         => 'woocommerce_get_product_attributes',
+		'woocommerce_product_get_gallery_image_ids'  => 'woocommerce_product_gallery_attachment_ids',
+		'woocommerce_product_get_review_count'       => 'woocommerce_product_review_count',
+		'woocommerce_product_get_downloads'          => 'woocommerce_product_files',
+		'woocommerce_order_get_currency'             => 'woocommerce_get_currency',
+		'woocommerce_order_get_discount_total'       => 'woocommerce_order_amount_discount_total',
+		'woocommerce_order_get_discount_tax'         => 'woocommerce_order_amount_discount_tax',
+		'woocommerce_order_get_shipping_total'       => 'woocommerce_order_amount_shipping_total',
+		'woocommerce_order_get_shipping_tax'         => 'woocommerce_order_amount_shipping_tax',
+		'woocommerce_order_get_cart_tax'             => 'woocommerce_order_amount_cart_tax',
+		'woocommerce_order_get_total'                => 'woocommerce_order_amount_total',
+		'woocommerce_order_get_total_tax'            => 'woocommerce_order_amount_total_tax',
+		'woocommerce_order_get_total_discount'       => 'woocommerce_order_amount_total_discount',
+		'woocommerce_order_get_subtotal'             => 'woocommerce_order_amount_subtotal',
+		'woocommerce_order_get_tax_totals'           => 'woocommerce_order_tax_totals',
+		'woocommerce_get_order_refund_get_amount'    => 'woocommerce_refund_amount',
+		'woocommerce_get_order_refund_get_reason'    => 'woocommerce_refund_reason',
+		'default_checkout_billing_country'           => 'default_checkout_country',
+		'default_checkout_billing_state'             => 'default_checkout_state',
+		'default_checkout_billing_postcode'          => 'default_checkout_postcode',
+		'woocommerce_system_status_environment_rows' => 'woocommerce_debug_posting',
+	);
+
+	/**
+	 * Hook into the new hook so we can handle deprecated hooks once fired.
+	 * @param  string $hook_name
+	 */
+	public function hook_in( $hook_name ) {
+		add_filter( $hook_name, array( $this, 'maybe_handle_deprecated_hook' ), -1000, 8 );
+	}
+
+	/**
+	 * If the old hook is in-use, trigger it.
+	 *
+	 * @param string $new_hook
+	 * @param string $old_hook
+	 * @param array $new_callback_args
+	 * @param mixed $return_value
+	 * @return mixed
+	 */
+	public function handle_deprecated_hook( $new_hook, $old_hook, $new_callback_args, $return_value ) {
+		if ( has_filter( $old_hook ) ) {
+			$this->display_notice( $old_hook, $new_hook );
+			$return_value = $this->trigger_hook( $old_hook, $new_callback_args );
+		}
+		return $return_value;
+	}
+
+	/**
+	 * Fire off a legacy hook with it's args.
+	 *
+	 * @param  string $old_hook
+	 * @param  array $new_callback_args
+	 * @return mixed
+	 */
+	protected function trigger_hook( $old_hook, $new_callback_args ) {
+		return apply_filters_ref_array( $old_hook, $new_callback_args );
+	}
+}
diff --git a/includes/class-wc-download-handler.php b/includes/class-wc-download-handler.php
index e4a2586a447..a5395674f43 100644
--- a/includes/class-wc-download-handler.php
+++ b/includes/class-wc-download-handler.php
@@ -21,7 +21,7 @@ class WC_Download_Handler {
 	 * Hook in methods.
 	 */
 	public static function init() {
-		if ( isset( $_GET['download_file'] ) && isset( $_GET['order'] ) && isset( $_GET['email'] ) ) {
+		if ( isset( $_GET['download_file'], $_GET['order'], $_GET['email'] ) ) {
 			add_action( 'init', array( __CLASS__, 'download_product' ) );
 		}
 		add_action( 'woocommerce_download_file_redirect', array( __CLASS__, 'download_file_redirect' ), 10, 2 );
@@ -33,101 +33,96 @@ class WC_Download_Handler {
 	 * Check if we need to download a file and check validity.
 	 */
 	public static function download_product() {
-		$product_id    = absint( $_GET['download_file'] );
-		$_product      = wc_get_product( $product_id );
-		$download_data = self::get_download_data( array(
-			'product_id'  => $product_id,
-			'order_key'   => wc_clean( $_GET['order'] ),
-			'email'       => sanitize_email( str_replace( ' ', '+', $_GET['email'] ) ),
-			'download_id' => wc_clean( isset( $_GET['key'] ) ? preg_replace( '/\s+/', ' ', $_GET['key'] ) : '' )
-		) );
+		$product_id   = absint( $_GET['download_file'] );
+		$product      = wc_get_product( $product_id );
+		$data_store   = WC_Data_Store::load( 'customer-download' );
 
-		if ( $_product && $download_data ) {
-			self::check_current_user_can_download( $download_data );
-
-			do_action( 'woocommerce_download_product', $download_data->user_email, $download_data->order_key, $download_data->product_id, $download_data->user_id, $download_data->download_id, $download_data->order_id );
-
-			self::count_download( $download_data );
-			self::download( $_product->get_file_download_path( $download_data->download_id ), $download_data->product_id );
-		} else {
+		if ( ! $product || ! isset( $_GET['key'], $_GET['order'] ) ) {
 			self::download_error( __( 'Invalid download link.', 'woocommerce' ) );
 		}
-	}
 
-	/**
-	 * Get a download from the database.
-	 *
-	 * @param  array  $args Contains email, order key, product id and download id
-	 * @return object
-	 * @access private
-	 */
-	private static function get_download_data( $args = array() ) {
-		global $wpdb;
+		$download_ids = $data_store->get_downloads( array(
+			'user_email'  => sanitize_email( str_replace( ' ', '+', $_GET['email'] ) ),
+			'order_key'   => wc_clean( $_GET['order'] ),
+			'product_id'  => $product_id,
+			'download_id' => wc_clean( preg_replace( '/\s+/', ' ', $_GET['key'] ) ),
+			'orderby'     => 'downloads_remaining',
+			'order'       => 'DESC',
+			'limit'       => 1,
+			'return'      => 'ids',
+		) );
 
-		$query = "SELECT * FROM " . $wpdb->prefix . "woocommerce_downloadable_product_permissions ";
-		$query .= "WHERE user_email = %s ";
-		$query .= "AND order_key = %s ";
-		$query .= "AND product_id = %s ";
-
-		if ( $args['download_id'] ) {
-			$query .= "AND download_id = %s ";
+		if ( empty( $download_ids ) ) {
+			self::download_error( __( 'Invalid download link.', 'woocommerce' ) );
 		}
 
-		return $wpdb->get_row( $wpdb->prepare( $query, array( $args['email'], $args['order_key'], $args['product_id'], $args['download_id'] ) ) );
-	}
+		$download = new WC_Customer_Download( current( $download_ids ) );
 
-	/**
-	 * Perform checks to see if the current user can download the file.
-	 * @param  object $download_data
-	 * @access private
-	 */
-	private static function check_current_user_can_download( $download_data ) {
-		self::check_order_is_valid( $download_data );
-		self::check_downloads_remaining( $download_data );
-		self::check_download_expiry( $download_data );
-		self::check_download_login_required( $download_data );
+		self::check_order_is_valid( $download );
+		self::check_downloads_remaining( $download );
+		self::check_download_expiry( $download );
+		self::check_download_login_required( $download );
+
+		do_action(
+			'woocommerce_download_product',
+			$download->get_user_email(),
+			$download->get_order_key(),
+			$download->get_product_id(),
+			$download->get_user_id(),
+			$download->get_download_id(),
+			$download->get_order_id()
+		);
+		$count     = $download->get_download_count();
+		$remaining = $download->get_downloads_remaining();
+		$download->set_download_count( $count + 1 );
+		if ( '' !== $remaining ) {
+			$download->set_downloads_remaining( $remaining - 1 );
+		}
+		$download->save();
+
+		self::download( $product->get_file_download_path( $download->get_download_id() ), $download->get_product_id() );
 	}
 
 	/**
 	 * Check if an order is valid for downloading from.
-	 * @param  array $download_data
+	 * @param  WC_Customer_Download $download
 	 * @access private
 	 */
-	private static function check_order_is_valid( $download_data ) {
-		if ( $download_data->order_id && ( $order = wc_get_order( $download_data->order_id ) ) && ! $order->is_download_permitted() ) {
+	private static function check_order_is_valid( $download ) {
+		if ( $download->get_order_id() && ( $order = wc_get_order( $download->get_order_id() ) ) && ! $order->is_download_permitted() ) {
 			self::download_error( __( 'Invalid order.', 'woocommerce' ), '', 403 );
 		}
 	}
 
 	/**
 	 * Check if there are downloads remaining.
-	 * @param  array $download_data
+	 * @param  WC_Customer_Download $download
 	 * @access private
 	 */
-	private static function check_downloads_remaining( $download_data ) {
-		if ( '0' == $download_data->downloads_remaining  ) {
+	private static function check_downloads_remaining( $download ) {
+		if ( '' !== $download->get_downloads_remaining() && 0 >= $download->get_downloads_remaining() ) {
 			self::download_error( __( 'Sorry, you have reached your download limit for this file', 'woocommerce' ), '', 403 );
 		}
 	}
 
 	/**
 	 * Check if the download has expired.
-	 * @param  array $download_data
+	 * @param  WC_Customer_Download $download
 	 * @access private
 	 */
-	private static function check_download_expiry( $download_data ) {
-		if ( $download_data->access_expires > 0 && strtotime( $download_data->access_expires ) < strtotime( 'midnight', current_time( 'timestamp' ) ) ) {
+	private static function check_download_expiry( $download ) {
+		if ( ! is_null( $download->get_access_expires() ) && $download->get_access_expires()->getTimestamp() < strtotime( 'midnight', current_time( 'timestamp', true ) ) ) {
 			self::download_error( __( 'Sorry, this download has expired', 'woocommerce' ), '', 403 );
 		}
 	}
 
 	/**
 	 * Check if a download requires the user to login first.
-	 * @param  array $download_data
+	 * @param  WC_Customer_Download $download
 	 * @access private
 	 */
-	private static function check_download_login_required( $download_data ) {
-		if ( $download_data->user_id && 'yes' === get_option( 'woocommerce_downloads_require_login' ) ) {
+	private static function check_download_login_required( $download ) {
+		if ( $download->get_user_id() && 'yes' === get_option( 'woocommerce_downloads_require_login' ) ) {
 			if ( ! is_user_logged_in() ) {
 				if ( wc_get_page_id( 'myaccount' ) ) {
 					wp_safe_redirect( add_query_arg( 'wc_error', urlencode( __( 'You must be logged in to download files.', 'woocommerce' ) ), wc_get_page_permalink( 'myaccount' ) ) );
@@ -135,32 +130,16 @@ class WC_Download_Handler {
 				} else {
 					self::download_error( __( 'You must be logged in to download files.', 'woocommerce' ) . ' <a href="' . esc_url( wp_login_url( wc_get_page_permalink( 'myaccount' ) ) ) . '" class="wc-forward">' . __( 'Login', 'woocommerce' ) . '</a>', __( 'Log in to Download Files', 'woocommerce' ), 403 );
 				}
-			} elseif ( ! current_user_can( 'download_file', $download_data ) ) {
+			} elseif ( ! current_user_can( 'download_file', $download ) ) {
 				self::download_error( __( 'This is not your download link.', 'woocommerce' ), '', 403 );
 			}
 		}
 	}
 
 	/**
-	 * Log the download + increase counts.
-	 * @param object $download_data
+	 * @deprecated
 	 */
-	public static function count_download( $download_data ) {
-		global $wpdb;
-
-		$wpdb->update(
-			$wpdb->prefix . 'woocommerce_downloadable_product_permissions',
-			array(
-				'download_count'      => $download_data->download_count + 1,
-				'downloads_remaining' => $download_data->downloads_remaining > 0 ? $download_data->downloads_remaining - 1 : $download_data->downloads_remaining,
-			),
-			array(
-				'permission_id' => absint( $download_data->permission_id ),
-			),
-			array( '%d', '%s' ),
-			array( '%d' )
-		);
-	}
+	public static function count_download( $download_data ) {}
 
 	/**
 	 * Download a file - hook into init function.
@@ -214,7 +193,7 @@ class WC_Download_Handler {
 			network_site_url( '/', 'https' ) => ABSPATH,
 			network_site_url( '/', 'http' )  => ABSPATH,
 			site_url( '/', 'https' )         => ABSPATH,
-			site_url( '/', 'http' )          => ABSPATH
+			site_url( '/', 'http' )          => ABSPATH,
 		);
 
 		$file_path        = str_replace( array_keys( $replacements ), array_values( $replacements ), $file_path );
@@ -226,6 +205,10 @@ class WC_Download_Handler {
 			$remote_file = false;
 			$file_path   = ABSPATH . $file_path;
 
+		} elseif ( '/wp-content' === substr( $file_path, 0, 11 ) ) {
+			$remote_file = false;
+			$file_path   = realpath( WP_CONTENT_DIR . substr( $file_path, 11 ) );
+
 		// Check if we have an absolute path
 		} elseif ( ( ! isset( $parsed_file_path['scheme'] ) || ! in_array( $parsed_file_path['scheme'], array( 'http', 'https', 'ftp' ) ) ) && isset( $parsed_file_path['path'] ) && file_exists( $parsed_file_path['path'] ) ) {
 			$remote_file = false;
@@ -234,7 +217,7 @@ class WC_Download_Handler {
 
 		return array(
 			'remote_file' => $remote_file,
-			'file_path'   => $file_path
+			'file_path'   => $file_path,
 		);
 	}
 
@@ -324,18 +307,16 @@ class WC_Download_Handler {
 		header( "Content-Disposition: attachment; filename=\"" . $filename . "\";" );
 		header( "Content-Transfer-Encoding: binary" );
 
-        if ( $size = @filesize( $file_path ) ) {
-        	header( "Content-Length: " . $size );
-        }
+		if ( $size = @filesize( $file_path ) ) {
+			header( "Content-Length: " . $size );
+		}
 	}
 
 	/**
 	 * Check and set certain server config variables to ensure downloads work as intended.
 	 */
 	private static function check_server_config() {
-		if ( function_exists( 'set_time_limit' ) && false === strpos( ini_get( 'disable_functions' ), 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-			@set_time_limit( 0 );
-		}
+		wc_set_time_limit( 0 );
 		if ( function_exists( 'get_magic_quotes_runtime' ) && get_magic_quotes_runtime() && version_compare( phpversion(), '5.4', '<' ) ) {
 			set_magic_quotes_runtime( 0 );
 		}
@@ -417,7 +398,7 @@ class WC_Download_Handler {
 	 */
 	private static function download_error( $message, $title = '', $status = 404 ) {
 		if ( ! strstr( $message, '<a ' ) ) {
-			$message .= ' <a href="' . esc_url( home_url() ) . '" class="wc-forward">' . __( 'Go to homepage', 'woocommerce' ) . '</a>';
+			$message .= ' <a href="' . esc_url( wc_get_page_permalink( 'shop' ) ) . '" class="wc-forward">' . esc_html__( 'Go to shop', 'woocommerce' ) . '</a>';
 		}
 		wp_die( $message, $title, array( 'response' => $status ) );
 	}
diff --git a/includes/class-wc-emails.php b/includes/class-wc-emails.php
index c7b93117dda..dbb642dbbc9 100644
--- a/includes/class-wc-emails.php
+++ b/includes/class-wc-emails.php
@@ -23,6 +23,11 @@ class WC_Emails {
 	/** @var WC_Emails The single instance of the class */
 	protected static $_instance = null;
 
+	/**
+	 * Background emailer class.
+	 */
+	protected static $background_emailer;
+
 	/**
 	 * Main WC_Emails Instance.
 	 *
@@ -45,7 +50,7 @@ class WC_Emails {
 	 * @since 2.1
 	 */
 	public function __clone() {
-		_doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'woocommerce' ), '2.1' );
+		wc_doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'woocommerce' ), '2.1' );
 	}
 
 	/**
@@ -54,7 +59,7 @@ class WC_Emails {
 	 * @since 2.1
 	 */
 	public function __wakeup() {
-		_doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'woocommerce' ), '2.1' );
+		wc_doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'woocommerce' ), '2.1' );
 	}
 
 	/**
@@ -72,6 +77,7 @@ class WC_Emails {
 			'woocommerce_order_status_pending_to_on-hold',
 			'woocommerce_order_status_failed_to_processing',
 			'woocommerce_order_status_failed_to_completed',
+			'woocommerce_order_status_failed_to_on-hold',
 			'woocommerce_order_status_on-hold_to_processing',
 			'woocommerce_order_status_on-hold_to_cancelled',
 			'woocommerce_order_status_on-hold_to_failed',
@@ -79,22 +85,74 @@ class WC_Emails {
 			'woocommerce_order_fully_refunded',
 			'woocommerce_order_partially_refunded',
 			'woocommerce_new_customer_note',
-			'woocommerce_created_customer'
+			'woocommerce_created_customer',
 		) );
 
-		foreach ( $email_actions as $action ) {
-			add_action( $action, array( __CLASS__, 'send_transactional_email' ), 10, 10 );
+		if ( apply_filters( 'woocommerce_defer_transactional_emails', false ) ) {
+			self::$background_emailer = new WC_Background_Emailer();
+
+			foreach ( $email_actions as $action ) {
+				add_action( $action, array( __CLASS__, 'queue_transactional_email' ), 10, 10 );
+			}
+		} else {
+			foreach ( $email_actions as $action ) {
+				add_action( $action, array( __CLASS__, 'send_transactional_email' ), 10, 10 );
+			}
+		}
+	}
+
+	/**
+	 * Queues transactional email so it's not sent in current request if enabled,
+	 * otherwise falls back to send now.
+	 */
+	public static function queue_transactional_email() {
+		if ( is_a( self::$background_emailer, 'WC_Background_Emailer' ) ) {
+			self::$background_emailer->push_to_queue( array(
+				'filter' => current_filter(),
+				'args'   => func_get_args(),
+			) );
+		} else {
+			call_user_func_array( array( __CLASS__, 'send_transactional_email' ), func_get_args() );
 		}
 	}
 
 	/**
 	 * Init the mailer instance and call the notifications for the current filter.
-	 * @internal param array $args (default: array())
+	 *
+	 * @internal
+	 *
+	 * @param string $filter Filter name.
+	 * @param array  $args Email args (default: []).
 	 */
-	public static function send_transactional_email() {
-		self::instance();
-		$args = func_get_args();
-		do_action_ref_array( current_filter() . '_notification', $args );
+	public static function send_queued_transactional_email( $filter = '', $args = array() ) {
+		if ( apply_filters( 'woocommerce_allow_send_queued_transactional_email', true, $filter, $args ) ) {
+			self::instance(); // Init self so emails exist.
+
+			// Ensure gateways are loaded in case they need to insert data into the emails.
+			WC()->payment_gateways();
+			WC()->shipping();
+
+			do_action_ref_array( $filter . '_notification', $args );
+		}
+	}
+
+	/**
+	 * Init the mailer instance and call the notifications for the current filter.
+	 *
+	 * @internal
+	 *
+	 * @param array $args Email args (default: []).
+	 */
+	public static function send_transactional_email( $args = array() ) {
+		try {
+			$args = func_get_args();
+			self::instance(); // Init self so emails exist.
+			do_action_ref_array( current_filter() . '_notification', $args );
+		} catch ( Exception $e ) {
+			if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+				trigger_error( 'Transactional email triggered fatal error for callback ' . current_filter(), E_USER_WARNING );
+			}
+		}
 	}
 
 	/**
@@ -127,11 +185,12 @@ class WC_Emails {
 	 */
 	public function init() {
 		// Include email classes
-		include_once( 'emails/class-wc-email.php' );
+		include_once( dirname( __FILE__ ) . '/emails/class-wc-email.php' );
 
 		$this->emails['WC_Email_New_Order'] 		                 = include( 'emails/class-wc-email-new-order.php' );
 		$this->emails['WC_Email_Cancelled_Order'] 		             = include( 'emails/class-wc-email-cancelled-order.php' );
 		$this->emails['WC_Email_Failed_Order'] 		                 = include( 'emails/class-wc-email-failed-order.php' );
+		$this->emails['WC_Email_Customer_On_Hold_Order'] 		     = include( 'emails/class-wc-email-customer-on-hold-order.php' );
 		$this->emails['WC_Email_Customer_Processing_Order'] 		 = include( 'emails/class-wc-email-customer-processing-order.php' );
 		$this->emails['WC_Email_Customer_Completed_Order'] 		     = include( 'emails/class-wc-email-customer-completed-order.php' );
 		$this->emails['WC_Email_Customer_Refunded_Order'] 		     = include( 'emails/class-wc-email-customer-refunded-order.php' );
@@ -144,7 +203,7 @@ class WC_Emails {
 
 		// include css inliner
 		if ( ! class_exists( 'Emogrifier' ) && class_exists( 'DOMDocument' ) ) {
-			include_once( 'libraries/class-emogrifier.php' );
+			include_once( dirname( __FILE__ ) . '/libraries/class-emogrifier.php' );
 		}
 	}
 
@@ -235,7 +294,12 @@ class WC_Emails {
 	 */
 	public function customer_invoice( $order ) {
 		$email = $this->emails['WC_Email_Customer_Invoice'];
-		$email->trigger( $order );
+
+		if ( ! is_object( $order ) ) {
+			$order = wc_get_order( absint( $order ) );
+		}
+
+		$email->trigger( $order->get_id(), $order );
 	}
 
 	/**
@@ -275,16 +339,7 @@ class WC_Emails {
 	 * @return string
 	 */
 	public function order_meta( $order, $sent_to_admin = false, $plain_text = false ) {
-		$fields = array();
-
-		if ( $order->customer_note ) {
-			$fields['customer_note'] = array(
-				'label' => __( 'Note', 'woocommerce' ),
-				'value' => wptexturize( $order->customer_note )
-			);
-		}
-
-		$fields = apply_filters( 'woocommerce_email_order_meta_fields', $fields, $sent_to_admin, $order );
+		$fields = apply_filters( 'woocommerce_email_order_meta_fields', array(), $sent_to_admin, $order );
 
 		/**
 		 * Deprecated woocommerce_email_order_meta_keys filter.
@@ -301,7 +356,7 @@ class WC_Emails {
 
 				$fields[ $key ] = array(
 					'label' => wptexturize( $key ),
-					'value' => wptexturize( get_post_meta( $order->id, $field, true ) )
+					'value' => wptexturize( get_post_meta( $order->get_id(), $field, true ) ),
 				);
 			}
 		}
@@ -315,7 +370,6 @@ class WC_Emails {
 						echo $field['label'] . ': ' . $field['value'] . "\n";
 					}
 				}
-
 			} else {
 
 				foreach ( $fields as $field ) {
@@ -339,27 +393,37 @@ class WC_Emails {
 	/**
 	 * Add customer details to email templates.
 	 *
-	 * @param mixed $order
+	 * @param WC_Order $order
 	 * @param bool $sent_to_admin (default: false)
 	 * @param bool $plain_text (default: false)
 	 * @return string
 	 */
 	public function customer_details( $order, $sent_to_admin = false, $plain_text = false ) {
+		if ( ! is_a( $order, 'WC_Order' ) ) {
+			return;
+		}
 		$fields = array();
 
-		if ( $order->billing_email ) {
-			$fields['billing_email'] = array(
-				'label' => __( 'Email', 'woocommerce' ),
-				'value' => wptexturize( $order->billing_email )
+		if ( $order->get_customer_note() ) {
+			$fields['customer_note'] = array(
+				'label' => __( 'Note', 'woocommerce' ),
+				'value' => wptexturize( $order->get_customer_note() ),
 			);
-	    }
+		}
 
-	    if ( $order->billing_phone ) {
-			$fields['billing_phone'] = array(
-				'label' => __( 'Tel', 'woocommerce' ),
-				'value' => wptexturize( $order->billing_phone )
+		if ( $order->get_billing_email() ) {
+			$fields['billing_email'] = array(
+				'label' => __( 'Email address', 'woocommerce' ),
+				'value' => wptexturize( $order->get_billing_email() ),
 			);
-	    }
+		}
+
+		if ( $order->get_billing_phone() ) {
+			$fields['billing_phone'] = array(
+				'label' => __( 'Phone', 'woocommerce' ),
+				'value' => wptexturize( $order->get_billing_phone() ),
+			);
+		}
 
 		$fields = array_filter( apply_filters( 'woocommerce_email_customer_details_fields', $fields, $sent_to_admin, $order ), array( $this, 'customer_detail_field_is_valid' ) );
 
@@ -374,6 +438,9 @@ class WC_Emails {
 	 * Get the email addresses.
 	 */
 	public function email_addresses( $order, $sent_to_admin = false, $plain_text = false ) {
+		if ( ! is_a( $order, 'WC_Order' ) ) {
+			return;
+		}
 		if ( $plain_text ) {
 			wc_get_template( 'emails/plain/email-addresses.php', array( 'order' => $order ) );
 		} else {
@@ -395,8 +462,17 @@ class WC_Emails {
 	 * @param WC_Product $product
 	 */
 	public function low_stock( $product ) {
+		if ( 'no' === get_option( 'woocommerce_notify_low_stock', 'yes' ) ) {
+			return;
+		}
+
 		$subject = sprintf( '[%s] %s', $this->get_blogname(), __( 'Product low in stock', 'woocommerce' ) );
-		$message = sprintf( __( '%s is low in stock.', 'woocommerce' ), html_entity_decode( strip_tags( $product->get_formatted_name() ), ENT_QUOTES, get_bloginfo( 'charset' ) ) ) . ' ' . sprintf( __( 'There are %d left', 'woocommerce' ), html_entity_decode( strip_tags( $product->get_total_stock() ) ) );
+		/* translators: 1: product name 2: items in stock */
+		$message = sprintf(
+			__( '%1$s is low in stock. There are %2$d left.', 'woocommerce' ),
+			html_entity_decode( strip_tags( $product->get_formatted_name() ), ENT_QUOTES, get_bloginfo( 'charset' ) ),
+			html_entity_decode( strip_tags( $product->get_stock_quantity() ) )
+		);
 
 		wp_mail(
 			apply_filters( 'woocommerce_email_recipient_low_stock', get_option( 'woocommerce_stock_email_recipient' ), $product ),
@@ -413,7 +489,12 @@ class WC_Emails {
 	 * @param WC_Product $product
 	 */
 	public function no_stock( $product ) {
+		if ( 'no' === get_option( 'woocommerce_notify_no_stock', 'yes' ) ) {
+			return;
+		}
+
 		$subject = sprintf( '[%s] %s', $this->get_blogname(), __( 'Product out of stock', 'woocommerce' ) );
+		/* translators: %s: product name */
 		$message = sprintf( __( '%s is out of stock.', 'woocommerce' ), html_entity_decode( strip_tags( $product->get_formatted_name() ), ENT_QUOTES, get_bloginfo( 'charset' ) ) );
 
 		wp_mail(
@@ -434,7 +515,7 @@ class WC_Emails {
 		$args = wp_parse_args( $args, array(
 			'product'  => '',
 			'quantity' => '',
-			'order_id' => ''
+			'order_id' => '',
 		) );
 
 		extract( $args );
@@ -443,8 +524,8 @@ class WC_Emails {
 			return;
 		}
 
-		$subject = sprintf( '[%s] %s', $this->get_blogname(), __( 'Product Backorder', 'woocommerce' ) );
-		$message = sprintf( __( '%s units of %s have been backordered in order #%s.', 'woocommerce' ), $quantity, html_entity_decode( strip_tags( $product->get_formatted_name() ), ENT_QUOTES, get_bloginfo( 'charset' ) ), $order->get_order_number() );
+		$subject = sprintf( '[%s] %s', $this->get_blogname(), __( 'Product backorder', 'woocommerce' ) );
+		$message = sprintf( __( '%1$s units of %2$s have been backordered in order #%3$s.', 'woocommerce' ), $quantity, html_entity_decode( strip_tags( $product->get_formatted_name() ), ENT_QUOTES, get_bloginfo( 'charset' ) ), $order->get_order_number() );
 
 		wp_mail(
 			apply_filters( 'woocommerce_email_recipient_backorder', get_option( 'woocommerce_stock_email_recipient' ), $args ),
@@ -454,4 +535,22 @@ class WC_Emails {
 			apply_filters( 'woocommerce_email_attachments', array(), 'backorder', $args )
 		);
 	}
+
+	/**
+	 * Adds Schema.org markup for order in JSON-LD format.
+	 *
+	 * @deprecated 3.0.0
+	 * @see WC_Structured_Data::generate_order_data()
+	 *
+	 * @since 2.6.0
+	 * @param mixed $order
+	 * @param bool $sent_to_admin (default: false)
+	 * @param bool $plain_text (default: false)
+	 */
+	public function order_schema_markup( $order, $sent_to_admin = false, $plain_text = false ) {
+		wc_deprecated_function( 'WC_Emails::order_schema_markup', '3.0', 'WC_Structured_Data::generate_order_data' );
+
+		WC()->structured_data->generate_order_data( $order, $sent_to_admin, $plain_text );
+		WC()->structured_data->output_structured_data();
+	}
 }
diff --git a/includes/class-wc-embed.php b/includes/class-wc-embed.php
index 36ab9f19db6..dc7e61f9015 100644
--- a/includes/class-wc-embed.php
+++ b/includes/class-wc-embed.php
@@ -29,11 +29,10 @@ class WC_Embed {
 	public static function init() {
 
 		// Filter all of the content that's going to be embedded.
-		add_filter( 'the_title', array( __CLASS__, 'the_title' ), 10 );
 		add_filter( 'the_excerpt_embed', array( __CLASS__, 'the_excerpt' ), 10 );
 
 		// Make sure no comments display. Doesn't make sense for products.
-		remove_action( 'embed_content_meta', 'print_embed_comments_button' );
+		add_action( 'embed_content_meta', array( __CLASS__, 'remove_comments_button' ), 5 );
 
 		// In the comments place let's display the product rating.
 		add_action( 'embed_content_meta', array( __CLASS__, 'get_ratings' ), 5 );
@@ -43,23 +42,14 @@ class WC_Embed {
 	}
 
 	/**
-	 * Create the title for embedded products - we want to add the price to it.
+	 * Remove comments button on product embeds.
 	 *
-	 * @since 2.4.11
-	 * @param string $title Embed title.
-	 * @return string
+	 * @since 2.6.0
 	 */
-	public static function the_title( $title ) {
-		// Make sure we're only affecting embedded products.
+	public static function remove_comments_button() {
 		if ( self::is_embedded_product() ) {
-
-			// Get product.
-			$_product = wc_get_product( get_the_ID() );
-
-			// Add the price.
-			$title = $title . '<span class="wc-embed-price">' . $_product->get_price_html() . '</span>';
+			remove_action( 'embed_content_meta', 'print_embed_comments_button' );
 		}
-		return $title;
 	}
 
 	/**
@@ -85,8 +75,13 @@ class WC_Embed {
 	public static function the_excerpt( $excerpt ) {
 		global $post;
 
+		// Get product.
+		$_product = wc_get_product( get_the_ID() );
+
 		// Make sure we're only affecting embedded products.
 		if ( self::is_embedded_product() ) {
+			echo '<p><span class="wc-embed-price">' . $_product->get_price_html() . '</span></p>';
+
 			if ( ! empty( $post->post_excerpt ) ) {
 				ob_start();
 				woocommerce_template_single_excerpt();
@@ -111,10 +106,10 @@ class WC_Embed {
 		$button   = '<a href="%s" class="wp-embed-more wc-embed-button">%s</a>';
 
 		if ( $_product->is_type( 'simple' ) && $_product->is_purchasable() && $_product->is_in_stock() ) {
-			$buttons[] = sprintf( $button, esc_url( add_query_arg( 'add-to-cart', get_the_ID(), wc_get_cart_url() ) ), esc_html__( 'Buy Now', 'woocommerce' ) );
+			$buttons[] = sprintf( $button, esc_url( add_query_arg( 'add-to-cart', get_the_ID(), wc_get_cart_url() ) ), esc_html__( 'Buy now', 'woocommerce' ) );
 		}
 
-		$buttons[] = sprintf( $button, get_the_permalink(), esc_html__( 'Read More', 'woocommerce' ) );
+		$buttons[] = sprintf( $button, get_the_permalink(), esc_html__( 'Read more', 'woocommerce' ) );
 
 		return '<p>' . implode( ' ', $buttons ) . '</p>';
 	}
@@ -129,7 +124,13 @@ class WC_Embed {
 		if ( self::is_embedded_product() && ( $_product = wc_get_product( get_the_ID() ) ) && $_product->get_average_rating() > 0 ) {
 			?>
 			<div class="wc-embed-rating">
-				<?php echo esc_html( sprintf( __( 'Rated %s out of 5', 'woocommerce' ), $_product->get_average_rating() ) ); ?>
+				<?php
+					/* translators: %s: average rating */
+					printf(
+						esc_html_( 'Rated %s out of 5', 'woocommerce' ),
+						esc_html( $_product->get_average_rating() )
+					);
+				?>
 			</div>
 			<?php
 		}
@@ -161,7 +162,10 @@ class WC_Embed {
 				margin: 0 0 1em;
 			}
 			.wc-embed-price {
-				float:right;
+				display: block;
+				opacity: .75;
+				font-weight: 700;
+				margin-top: -.75em;
 			}
 			.wc-embed-rating {
 				display: inline-block;
diff --git a/includes/class-wc-form-handler.php b/includes/class-wc-form-handler.php
index 3bb5569b2e3..75a5c60bfc4 100644
--- a/includes/class-wc-form-handler.php
+++ b/includes/class-wc-form-handler.php
@@ -19,6 +19,7 @@ class WC_Form_Handler {
 	 * Hook in methods.
 	 */
 	public static function init() {
+		add_action( 'template_redirect', array( __CLASS__, 'redirect_reset_password_link' ) );
 		add_action( 'template_redirect', array( __CLASS__, 'save_address' ) );
 		add_action( 'template_redirect', array( __CLASS__, 'save_account_details' ) );
 		add_action( 'wp_loaded', array( __CLASS__, 'checkout_action' ), 20 );
@@ -31,23 +32,38 @@ class WC_Form_Handler {
 		add_action( 'wp_loaded', array( __CLASS__, 'update_cart_action' ), 20 );
 		add_action( 'wp_loaded', array( __CLASS__, 'add_to_cart_action' ), 20 );
 
-		// May need $wp global to access query vars
+		// May need $wp global to access query vars.
 		add_action( 'wp', array( __CLASS__, 'pay_action' ), 20 );
 		add_action( 'wp', array( __CLASS__, 'add_payment_method_action' ), 20 );
+		add_action( 'wp', array( __CLASS__, 'delete_payment_method_action' ), 20 );
+		add_action( 'wp', array( __CLASS__, 'set_default_payment_method_action' ), 20 );
 	}
 
 	/**
-	 * Save and and update a billing or shipping address if the.
+	 * Remove key and login from querystring, set cookie, and redirect to account page to show the form.
+	 */
+	public static function redirect_reset_password_link() {
+		if ( is_account_page() && ! empty( $_GET['key'] ) && ! empty( $_GET['login'] ) ) {
+			$value = sprintf( '%s:%s', wp_unslash( $_GET['login'] ), wp_unslash( $_GET['key'] ) );
+			WC_Shortcode_My_Account::set_reset_password_cookie( $value );
+
+			wp_safe_redirect( add_query_arg( 'show-reset-form', 'true', wc_lostpassword_url() ) );
+			exit;
+		}
+	}
+
+	/**
+	 * Save and and update a billing or shipping address if the
 	 * form was submitted through the user account page.
 	 */
 	public static function save_address() {
 		global $wp;
 
-		if ( 'POST' !== strtoupper( $_SERVER[ 'REQUEST_METHOD' ] ) ) {
+		if ( 'POST' !== strtoupper( $_SERVER['REQUEST_METHOD'] ) ) {
 			return;
 		}
 
-		if ( empty( $_POST[ 'action' ] ) || 'edit_address' !== $_POST[ 'action' ] || empty( $_POST['_wpnonce'] ) || ! wp_verify_nonce( $_POST['_wpnonce'], 'woocommerce-edit_address' ) ) {
+		if ( empty( $_POST['action'] ) || 'edit_address' !== $_POST['action'] || empty( $_POST['_wpnonce'] ) || ! wp_verify_nonce( $_POST['_wpnonce'], 'woocommerce-edit_address' ) ) {
 			return;
 		}
 
@@ -67,27 +83,27 @@ class WC_Form_Handler {
 				$field['type'] = 'text';
 			}
 
-			// Get Value
+			// Get Value.
 			switch ( $field['type'] ) {
-				case "checkbox" :
-					$_POST[ $key ] = isset( $_POST[ $key ] ) ? 1 : 0;
-				break;
+				case 'checkbox' :
+					$_POST[ $key ] = (int) isset( $_POST[ $key ] );
+					break;
 				default :
 					$_POST[ $key ] = isset( $_POST[ $key ] ) ? wc_clean( $_POST[ $key ] ) : '';
-				break;
+					break;
 			}
 
-			// Hook to allow modification of value
+			// Hook to allow modification of value.
 			$_POST[ $key ] = apply_filters( 'woocommerce_process_myaccount_field_' . $key, $_POST[ $key ] );
 
-			// Validation: Required fields
+			// Validation: Required fields.
 			if ( ! empty( $field['required'] ) && empty( $_POST[ $key ] ) ) {
-				wc_add_notice( $field['label'] . ' ' . __( 'is a required field.', 'woocommerce' ), 'error' );
+				wc_add_notice( sprintf( __( '%s is a required field.', 'woocommerce' ), $field['label'] ), 'error' );
 			}
 
 			if ( ! empty( $_POST[ $key ] ) ) {
 
-				// Validation rules
+				// Validation rules.
 				if ( ! empty( $field['validate'] ) && is_array( $field['validate'] ) ) {
 					foreach ( $field['validate'] as $rule ) {
 						switch ( $rule ) {
@@ -95,32 +111,34 @@ class WC_Form_Handler {
 								$_POST[ $key ] = strtoupper( str_replace( ' ', '', $_POST[ $key ] ) );
 
 								if ( ! WC_Validation::is_postcode( $_POST[ $key ], $_POST[ $load_address . '_country' ] ) ) {
-									wc_add_notice( __( 'Please enter a valid postcode/ZIP.', 'woocommerce' ), 'error' );
+									wc_add_notice( __( 'Please enter a valid postcode / ZIP.', 'woocommerce' ), 'error' );
 								} else {
 									$_POST[ $key ] = wc_format_postcode( $_POST[ $key ], $_POST[ $load_address . '_country' ] );
 								}
-							break;
+								break;
 							case 'phone' :
 								$_POST[ $key ] = wc_format_phone_number( $_POST[ $key ] );
 
 								if ( ! WC_Validation::is_phone( $_POST[ $key ] ) ) {
-									wc_add_notice( '<strong>' . $field['label'] . '</strong> ' . __( 'is not a valid phone number.', 'woocommerce' ), 'error' );
+									wc_add_notice( sprintf( __( '%s is not a valid phone number.', 'woocommerce' ), '<strong>' . $field['label'] . '</strong>' ), 'error' );
 								}
-							break;
+								break;
 							case 'email' :
 								$_POST[ $key ] = strtolower( $_POST[ $key ] );
 
 								if ( ! is_email( $_POST[ $key ] ) ) {
-									wc_add_notice( '<strong>' . $field['label'] . '</strong> ' . __( 'is not a valid email address.', 'woocommerce' ), 'error' );
+									wc_add_notice( sprintf( __( '%s is not a valid email address.', 'woocommerce' ), '<strong>' . $field['label'] . '</strong>' ), 'error' );
 								}
-							break;
+								break;
 						}
 					}
 				}
 			}
 		}
 
-		if ( wc_notice_count( 'error' ) == 0 ) {
+		do_action( 'woocommerce_after_save_address_validation', $user_id, $load_address, $address );
+
+		if ( 0 === wc_notice_count( 'error' ) ) {
 
 			foreach ( $address as $key => $field ) {
 				update_user_meta( $user_id, $key, $_POST[ $key ] );
@@ -130,7 +148,7 @@ class WC_Form_Handler {
 
 			do_action( 'woocommerce_customer_save_address', $user_id, $load_address );
 
-			wp_safe_redirect( wc_get_page_permalink( 'myaccount') );
+			wp_safe_redirect( wc_get_endpoint_url( 'edit-address', '', wc_get_page_permalink( 'myaccount' ) ) );
 			exit;
 		}
 	}
@@ -140,11 +158,11 @@ class WC_Form_Handler {
 	 */
 	public static function save_account_details() {
 
-		if ( 'POST' !== strtoupper( $_SERVER[ 'REQUEST_METHOD' ] ) ) {
+		if ( 'POST' !== strtoupper( $_SERVER['REQUEST_METHOD'] ) ) {
 			return;
 		}
 
-		if ( empty( $_POST[ 'action' ] ) || 'save_account_details' !== $_POST[ 'action' ] || empty( $_POST['_wpnonce'] ) || ! wp_verify_nonce( $_POST['_wpnonce'], 'save_account_details' ) ) {
+		if ( empty( $_POST['action'] ) || 'save_account_details' !== $_POST['action'] || empty( $_POST['_wpnonce'] ) || ! wp_verify_nonce( $_POST['_wpnonce'], 'save_account_details' ) ) {
 			return;
 		}
 
@@ -158,12 +176,12 @@ class WC_Form_Handler {
 			return;
 		}
 
-		$account_first_name = ! empty( $_POST[ 'account_first_name' ] ) ? wc_clean( $_POST[ 'account_first_name' ] ) : '';
-		$account_last_name  = ! empty( $_POST[ 'account_last_name' ] ) ? wc_clean( $_POST[ 'account_last_name' ] ) : '';
-		$account_email      = ! empty( $_POST[ 'account_email' ] ) ? sanitize_email( $_POST[ 'account_email' ] ) : '';
-		$pass_cur           = ! empty( $_POST[ 'password_current' ] ) ? $_POST[ 'password_current' ] : '';
-		$pass1              = ! empty( $_POST[ 'password_1' ] ) ? $_POST[ 'password_1' ] : '';
-		$pass2              = ! empty( $_POST[ 'password_2' ] ) ? $_POST[ 'password_2' ] : '';
+		$account_first_name = ! empty( $_POST['account_first_name'] ) ? wc_clean( $_POST['account_first_name'] ) : '';
+		$account_last_name  = ! empty( $_POST['account_last_name'] ) ? wc_clean( $_POST['account_last_name'] ) : '';
+		$account_email      = ! empty( $_POST['account_email'] ) ? wc_clean( $_POST['account_email'] ) : '';
+		$pass_cur           = ! empty( $_POST['password_current'] ) ? $_POST['password_current'] : '';
+		$pass1              = ! empty( $_POST['password_1'] ) ? $_POST['password_1'] : '';
+		$pass2              = ! empty( $_POST['password_2'] ) ? $_POST['password_2'] : '';
 		$save_pass          = true;
 
 		$user->first_name   = $account_first_name;
@@ -174,18 +192,19 @@ class WC_Form_Handler {
 
 		// Handle required fields
 		$required_fields = apply_filters( 'woocommerce_save_account_details_required_fields', array(
-			'account_first_name' => __( 'First Name', 'woocommerce' ),
-			'account_last_name'  => __( 'Last Name', 'woocommerce' ),
+			'account_first_name' => __( 'First name', 'woocommerce' ),
+			'account_last_name'  => __( 'Last name', 'woocommerce' ),
 			'account_email'      => __( 'Email address', 'woocommerce' ),
 		) );
 
 		foreach ( $required_fields as $field_key => $field_name ) {
 			if ( empty( $_POST[ $field_key ] ) ) {
-				wc_add_notice( '<strong>' . esc_html( $field_name ) . '</strong> ' . __( 'is a required field.', 'woocommerce' ), 'error' );
+				wc_add_notice( sprintf( __( '%s is a required field.', 'woocommerce' ), '<strong>' . esc_html( $field_name ) . '</strong>' ), 'error' );
 			}
 		}
 
 		if ( $account_email ) {
+			$account_email = sanitize_email( $account_email );
 			if ( ! is_email( $account_email ) ) {
 				wc_add_notice( __( 'Please provide a valid email address.', 'woocommerce' ), 'error' );
 			} elseif ( email_exists( $account_email ) && $account_email !== $current_user->user_email ) {
@@ -194,11 +213,6 @@ class WC_Form_Handler {
 			$user->user_email = $account_email;
 		}
 
-		if ( ! empty( $pass1 ) && ! wp_check_password( $pass_cur, $current_user->user_pass, $current_user->ID ) ) {
-			wc_add_notice( __( 'Your current password is incorrect.', 'woocommerce' ), 'error' );
-			$save_pass = false;
-		}
-
 		if ( ! empty( $pass_cur ) && empty( $pass1 ) && empty( $pass2 ) ) {
 			wc_add_notice( __( 'Please fill out all password fields.', 'woocommerce' ), 'error' );
 			$save_pass = false;
@@ -211,6 +225,9 @@ class WC_Form_Handler {
 		} elseif ( ( ! empty( $pass1 ) || ! empty( $pass2 ) ) && $pass1 !== $pass2 ) {
 			wc_add_notice( __( 'New passwords do not match.', 'woocommerce' ), 'error' );
 			$save_pass = false;
+		} elseif ( ! empty( $pass1 ) && ! wp_check_password( $pass_cur, $current_user->user_pass, $current_user->ID ) ) {
+			wc_add_notice( __( 'Your current password is incorrect.', 'woocommerce' ), 'error' );
+			$save_pass = false;
 		}
 
 		if ( $pass1 && $save_pass ) {
@@ -228,7 +245,7 @@ class WC_Form_Handler {
 
 		if ( wc_notice_count( 'error' ) === 0 ) {
 
-			wp_update_user( $user ) ;
+			wp_update_user( $user );
 
 			wc_add_notice( __( 'Account details changed successfully.', 'woocommerce' ) );
 
@@ -273,21 +290,17 @@ class WC_Form_Handler {
 			$order_id   = absint( $wp->query_vars['order-pay'] );
 			$order      = wc_get_order( $order_id );
 
-			if ( $order->id == $order_id && $order->order_key == $order_key && $order->needs_payment() ) {
+			if ( $order->get_id() == $order_id && $order->get_order_key() == $order_key && $order->needs_payment() ) {
 
-				// Set customer location to order location
-				if ( $order->billing_country ) {
-					WC()->customer->set_country( $order->billing_country );
-				}
-				if ( $order->billing_state ) {
-					WC()->customer->set_state( $order->billing_state );
-				}
-				if ( $order->billing_postcode ) {
-					WC()->customer->set_postcode( $order->billing_postcode );
-				}
-				if ( $order->billing_city ) {
-					WC()->customer->set_city( $order->billing_city );
-				}
+				do_action( 'woocommerce_before_pay_action', $order );
+
+				WC()->customer->set_props( array(
+					'billing_country'  => $order->get_billing_country() ? $order->get_billing_country()   : null,
+					'billing_state'    => $order->get_billing_state() ? $order->get_billing_state()       : null,
+					'billing_postcode' => $order->get_billing_postcode() ? $order->get_billing_postcode() : null,
+					'billing_city'     => $order->get_billing_city() ? $order->get_billing_city()         : null,
+				) );
+				WC()->customer->save();
 
 				// Terms
 				if ( ! empty( $_POST['terms-field'] ) && empty( $_POST['terms'] ) ) {
@@ -330,15 +343,16 @@ class WC_Form_Handler {
 							exit;
 						}
 					}
-
 				} else {
 					// No payment was required for order
 					$order->payment_complete();
 					wp_safe_redirect( $order->get_checkout_order_received_url() );
 					exit;
 				}
-			}
 
+				do_action( 'woocommerce_after_pay_action', $order );
+
+			}
 		}
 	}
 
@@ -346,30 +360,74 @@ class WC_Form_Handler {
 	 * Process the add payment method form.
 	 */
 	public static function add_payment_method_action() {
-		if ( isset( $_POST['woocommerce_add_payment_method'] ) && isset( $_POST['_wpnonce'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'woocommerce-add-payment-method' ) ) {
+		if ( isset( $_POST['woocommerce_add_payment_method'], $_POST['payment_method'], $_POST['_wpnonce'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'woocommerce-add-payment-method' ) ) {
 
 			ob_start();
 
 			$payment_method = wc_clean( $_POST['payment_method'] );
 
 			$available_gateways = WC()->payment_gateways->get_available_payment_gateways();
-
 			// Validate
 			$available_gateways[ $payment_method ]->validate_fields();
 
 			// Process
 			if ( wc_notice_count( 'wc_errors' ) == 0 ) {
 				$result = $available_gateways[ $payment_method ]->add_payment_method();
-
 				// Redirect to success/confirmation/payment page
-				if ( $result['result'] == 'success' ) {
-					wc_add_message( __( 'Payment method added.', 'woocommerce' ) );
+				if ( 'success' === $result['result'] ) {
+					wc_add_notice( __( 'Payment method added.', 'woocommerce' ) );
 					wp_redirect( $result['redirect'] );
 					exit();
 				}
+			}
+		}
 
+	}
+
+	/**
+	 * Process the delete payment method form.
+	 */
+	public static function delete_payment_method_action() {
+		global $wp;
+
+		if ( isset( $wp->query_vars['delete-payment-method'] ) ) {
+
+			$token_id = absint( $wp->query_vars['delete-payment-method'] );
+			$token    = WC_Payment_Tokens::get( $token_id );
+
+			if ( is_null( $token ) || get_current_user_id() !== $token->get_user_id() || false === wp_verify_nonce( $_REQUEST['_wpnonce'], 'delete-payment-method-' . $token_id ) ) {
+				wc_add_notice( __( 'Invalid payment method.', 'woocommerce' ), 'error' );
+			} else {
+				WC_Payment_Tokens::delete( $token_id );
+				wc_add_notice( __( 'Payment method deleted.', 'woocommerce' ) );
 			}
 
+			wp_redirect( wc_get_account_endpoint_url( 'payment-methods' ) );
+			exit();
+		}
+
+	}
+
+	/**
+	 * Process the delete payment method form.
+	 */
+	public static function set_default_payment_method_action() {
+		global $wp;
+
+		if ( isset( $wp->query_vars['set-default-payment-method'] ) ) {
+
+			$token_id = absint( $wp->query_vars['set-default-payment-method'] );
+			$token    = WC_Payment_Tokens::get( $token_id );
+
+			if ( is_null( $token ) || get_current_user_id() !== $token->get_user_id() || false === wp_verify_nonce( $_REQUEST['_wpnonce'], 'set-default-payment-method-' . $token_id ) ) {
+				wc_add_notice( __( 'Invalid payment method.', 'woocommerce' ), 'error' );
+			} else {
+				WC_Payment_Tokens::set_users_default( $token->get_user_id(), intval( $token_id ) );
+				wc_add_notice( __( 'This payment method was successfully set as your default.', 'woocommerce' ) );
+			}
+
+			wp_redirect( wc_get_account_endpoint_url( 'payment-methods' ) );
+			exit();
 		}
 
 	}
@@ -379,18 +437,19 @@ class WC_Form_Handler {
 	 */
 	public static function update_cart_action() {
 
-		// Add Discount
 		if ( ! empty( $_POST['apply_coupon'] ) && ! empty( $_POST['coupon_code'] ) ) {
+
+			// Add Discount
 			WC()->cart->add_discount( sanitize_text_field( $_POST['coupon_code'] ) );
-		}
 
-		// Remove Coupon Codes
-		elseif ( isset( $_GET['remove_coupon'] ) ) {
+		} elseif ( isset( $_GET['remove_coupon'] ) ) {
+
+			// Remove Coupon Codes
 			WC()->cart->remove_coupon( wc_clean( $_GET['remove_coupon'] ) );
-		}
 
-		// Remove from cart
-		elseif ( ! empty( $_GET['remove_item'] ) && isset( $_GET['_wpnonce'] ) && wp_verify_nonce( $_GET['_wpnonce'], 'woocommerce-cart' ) ) {
+		} elseif ( ! empty( $_GET['remove_item'] ) && isset( $_GET['_wpnonce'] ) && wp_verify_nonce( $_GET['_wpnonce'], 'woocommerce-cart' ) ) {
+
+			// Remove from cart
 			$cart_item_key = sanitize_text_field( $_GET['remove_item'] );
 
 			if ( $cart_item = WC()->cart->get_cart_item( $cart_item_key ) ) {
@@ -398,24 +457,26 @@ class WC_Form_Handler {
 
 				$product = wc_get_product( $cart_item['product_id'] );
 
-				$item_removed_title = apply_filters( 'woocommerce_cart_item_removed_title', $product ? $product->get_title() : __( 'Item', 'woocommerce' ), $cart_item );
+				$item_removed_title = apply_filters( 'woocommerce_cart_item_removed_title', $product ? sprintf( _x( '&ldquo;%s&rdquo;', 'Item name in quotes', 'woocommerce' ), $product->get_name() ) : __( 'Item', 'woocommerce' ), $cart_item );
 
 				// Don't show undo link if removed item is out of stock.
 				if ( $product->is_in_stock() && $product->has_enough_stock( $cart_item['quantity'] ) ) {
-					$undo = WC()->cart->get_undo_url( $cart_item_key );
-					wc_add_notice( sprintf( __( '%s removed. %sUndo?%s', 'woocommerce' ), $item_removed_title, '<a href="' . esc_url( $undo ) . '">', '</a>' ) );
+					$removed_notice  = sprintf( __( '%s removed.', 'woocommerce' ), $item_removed_title );
+					$removed_notice .= ' <a href="' . esc_url( WC()->cart->get_undo_url( $cart_item_key ) ) . '">' . __( 'Undo?', 'woocommerce' ) . '</a>';
 				} else {
-					wc_add_notice( sprintf( __( '%s removed.', 'woocommerce' ), $item_removed_title ) );
+					$removed_notice = sprintf( __( '%s removed.', 'woocommerce' ), $item_removed_title );
 				}
+
+				wc_add_notice( $removed_notice );
 			}
 
 			$referer  = wp_get_referer() ? remove_query_arg( array( 'remove_item', 'add-to-cart', 'added-to-cart' ), add_query_arg( 'removed_item', '1', wp_get_referer() ) ) : wc_get_cart_url();
 			wp_safe_redirect( $referer );
 			exit;
-		}
 
-		// Undo Cart Item
-		elseif ( ! empty( $_GET['undo_item'] ) && isset( $_GET['_wpnonce'] ) && wp_verify_nonce( $_GET['_wpnonce'], 'woocommerce-cart' ) ) {
+		} elseif ( ! empty( $_GET['undo_item'] ) && isset( $_GET['_wpnonce'] ) && wp_verify_nonce( $_GET['_wpnonce'], 'woocommerce-cart' ) ) {
+
+			// Undo Cart Item
 			$cart_item_key = sanitize_text_field( $_GET['undo_item'] );
 
 			WC()->cart->restore_cart_item( $cart_item_key );
@@ -423,6 +484,7 @@ class WC_Form_Handler {
 			$referer  = wp_get_referer() ? remove_query_arg( array( 'undo_item', '_wpnonce' ), wp_get_referer() ) : wc_get_cart_url();
 			wp_safe_redirect( $referer );
 			exit;
+
 		}
 
 		// Update Cart - checks apply_coupon too because they are in the same form
@@ -444,15 +506,16 @@ class WC_Form_Handler {
 					// Sanitize
 					$quantity = apply_filters( 'woocommerce_stock_amount_cart_item', wc_stock_amount( preg_replace( "/[^0-9\.]/", '', $cart_totals[ $cart_item_key ]['qty'] ) ), $cart_item_key );
 
-					if ( '' === $quantity || $quantity == $values['quantity'] )
+					if ( '' === $quantity || $quantity == $values['quantity'] ) {
 						continue;
+					}
 
 					// Update cart validation
 					$passed_validation 	= apply_filters( 'woocommerce_update_cart_validation', true, $cart_item_key, $values, $quantity );
 
 					// is_sold_individually
 					if ( $_product->is_sold_individually() && $quantity > 1 ) {
-						wc_add_notice( sprintf( __( 'You can only have 1 %s in your cart.', 'woocommerce' ), $_product->get_title() ), 'error' );
+						wc_add_notice( sprintf( __( 'You can only have 1 %s in your cart.', 'woocommerce' ), $_product->get_name() ), 'error' );
 						$passed_validation = false;
 					}
 
@@ -460,7 +523,6 @@ class WC_Form_Handler {
 						WC()->cart->set_quantity( $cart_item_key, $quantity, false );
 						$cart_updated = true;
 					}
-
 				}
 			}
 
@@ -477,7 +539,7 @@ class WC_Form_Handler {
 				exit;
 			} elseif ( $cart_updated ) {
 				wc_add_notice( __( 'Cart updated.', 'woocommerce' ) );
-				$referer = remove_query_arg( 'remove_coupon', ( wp_get_referer() ? wp_get_referer() : wc_get_cart_url() ) );
+				$referer = remove_query_arg( array( 'remove_coupon', 'add-to-cart' ), ( wp_get_referer() ? wp_get_referer() : wc_get_cart_url() ) );
 				wp_safe_redirect( $referer );
 				exit;
 			}
@@ -500,34 +562,35 @@ class WC_Form_Handler {
 		// Load the previous order - Stop if the order does not exist
 		$order = wc_get_order( absint( $_GET['order_again'] ) );
 
-		if ( empty( $order->id ) ) {
+		if ( ! $order->get_id() ) {
 			return;
 		}
 
-		if ( ! $order->has_status( 'completed' ) ) {
+		if ( ! $order->has_status( apply_filters( 'woocommerce_valid_order_statuses_for_order_again', array( 'completed' ) ) ) ) {
 			return;
 		}
 
 		// Make sure the user is allowed to order again. By default it check if the
 		// previous order belonged to the current user.
-		if ( ! current_user_can( 'order_again', $order->id ) ) {
+		if ( ! current_user_can( 'order_again', $order->get_id() ) ) {
 			return;
 		}
 
 		// Copy products from the order to the cart
-		foreach ( $order->get_items() as $item ) {
+		$order_items = $order->get_items();
+		foreach ( $order_items as $item ) {
 			// Load all product info including variation data
-			$product_id   = (int) apply_filters( 'woocommerce_add_to_cart_product_id', $item['product_id'] );
-			$quantity     = (int) $item['qty'];
-			$variation_id = (int) $item['variation_id'];
+			$product_id   = (int) apply_filters( 'woocommerce_add_to_cart_product_id', $item->get_product_id() );
+			$quantity     = $item->get_quantity();
+			$variation_id = $item->get_variation_id();
 			$variations   = array();
 			$cart_item_data = apply_filters( 'woocommerce_order_again_cart_item_data', array(), $item, $order );
 
-			foreach ( $item['item_meta'] as $meta_name => $meta_value ) {
-				if ( taxonomy_is_product_attribute( $meta_name ) ) {
-					$variations[ $meta_name ] = $meta_value[0];
-				} elseif ( meta_is_product_attribute( $meta_name, $meta_value[0], $product_id ) ) {
-					$variations[ $meta_name ] = $meta_value[0];
+			foreach ( $item->get_meta_data() as $meta ) {
+				if ( taxonomy_is_product_attribute( $meta->key ) ) {
+					$variations[ $meta->key ] = $meta->value;
+				} elseif ( meta_is_product_attribute( $meta->key, $meta->value, $product_id ) ) {
+					$variations[ $meta->key ] = $meta->value;
 				}
 			}
 
@@ -539,10 +602,28 @@ class WC_Form_Handler {
 			WC()->cart->add_to_cart( $product_id, $quantity, $variation_id, $variations, $cart_item_data );
 		}
 
-		do_action( 'woocommerce_ordered_again', $order->id );
+		do_action( 'woocommerce_ordered_again', $order->get_id() );
+
+		$num_items_in_cart = count( WC()->cart->get_cart() );
+		$num_items_in_original_order = count( $order_items );
+
+		if ( $num_items_in_original_order > $num_items_in_cart ) {
+			wc_add_notice(
+				sprintf( _n(
+					'%d item from your previous order is currently unavailable and could not be added to your cart.',
+					'%d items from your previous order are currently unavailable and could not be added to your cart.',
+					$num_items_in_original_order - $num_items_in_cart,
+					'woocommerce'
+				), $num_items_in_original_order - $num_items_in_cart ),
+				'error'
+			);
+		}
+
+		if ( $num_items_in_cart > 0 ) {
+			wc_add_notice( __( 'The cart has been filled with the items from your previous order.', 'woocommerce' ) );
+		}
 
 		// Redirect to cart
-		wc_add_notice( __( 'The cart has been filled with the items from your previous order.', 'woocommerce' ) );
 		wp_safe_redirect( wc_get_cart_url() );
 		exit;
 	}
@@ -562,15 +643,16 @@ class WC_Form_Handler {
 
 			if ( $order->has_status( 'cancelled' ) ) {
 				// Already cancelled - take no action
-			} elseif ( $user_can_cancel && $order_can_cancel && $order->id == $order_id && $order->order_key == $order_key && isset( $_GET['_wpnonce'] ) && wp_verify_nonce( $_GET['_wpnonce'], 'woocommerce-cancel_order' ) ) {
+			} elseif ( $user_can_cancel && $order_can_cancel && $order->get_id() === $order_id && $order->get_order_key() === $order_key ) {
 
 				// Cancel the order + restore stock
-				$order->cancel_order( __('Order cancelled by customer.', 'woocommerce' ) );
+				WC()->session->set( 'order_awaiting_payment', false );
+				$order->update_status( 'cancelled', __( 'Order cancelled by customer.', 'woocommerce' ) );
 
 				// Message
 				wc_add_notice( apply_filters( 'woocommerce_order_cancelled_notice', __( 'Your order was cancelled.', 'woocommerce' ) ), apply_filters( 'woocommerce_order_cancelled_notice_type', 'notice' ) );
 
-				do_action( 'woocommerce_cancelled_order', $order->id );
+				do_action( 'woocommerce_cancelled_order', $order->get_id() );
 
 			} elseif ( $user_can_cancel && ! $order_can_cancel ) {
 				wc_add_notice( __( 'Your order can no longer be cancelled. Please contact us if you need assistance.', 'woocommerce' ), 'error' );
@@ -605,7 +687,7 @@ class WC_Form_Handler {
 			return;
 		}
 
-		$add_to_cart_handler = apply_filters( 'woocommerce_add_to_cart_handler', $adding_to_cart->product_type, $adding_to_cart );
+		$add_to_cart_handler = apply_filters( 'woocommerce_add_to_cart_handler', $adding_to_cart->get_type(), $adding_to_cart );
 
 		// Variable product handling
 		if ( 'variable' === $add_to_cart_handler ) {
@@ -616,7 +698,7 @@ class WC_Form_Handler {
 			$was_added_to_cart = self::add_to_cart_handler_grouped( $product_id );
 
 		// Custom Handler
-		} elseif ( has_action( 'woocommerce_add_to_cart_handler_' . $add_to_cart_handler ) ){
+		} elseif ( has_action( 'woocommerce_add_to_cart_handler_' . $add_to_cart_handler ) ) {
 			do_action( 'woocommerce_add_to_cart_handler_' . $add_to_cart_handler, $url );
 
 		// Simple Products
@@ -648,7 +730,7 @@ class WC_Form_Handler {
 		$passed_validation 	= apply_filters( 'woocommerce_add_to_cart_validation', true, $product_id, $quantity );
 
 		if ( $passed_validation && WC()->cart->add_to_cart( $product_id, $quantity ) !== false ) {
-			wc_add_to_cart_message( $product_id );
+			wc_add_to_cart_message( array( $product_id => $quantity ), true );
 			return true;
 		}
 		return false;
@@ -678,7 +760,7 @@ class WC_Form_Handler {
 
 				if ( $passed_validation && WC()->cart->add_to_cart( $item, $quantity ) !== false ) {
 					$was_added_to_cart = true;
-					$added_to_cart[]   = $item;
+					$added_to_cart[ $item ] = $quantity;
 				}
 			}
 
@@ -688,7 +770,6 @@ class WC_Form_Handler {
 				wc_add_to_cart_message( $added_to_cart );
 				return true;
 			}
-
 		} elseif ( $product_id ) {
 			/* Link on product archives */
 			wc_add_notice( __( 'Please choose a product to add to your cart&hellip;', 'woocommerce' ), 'error' );
@@ -709,53 +790,66 @@ class WC_Form_Handler {
 		$missing_attributes = array();
 		$variations         = array();
 		$attributes         = $adding_to_cart->get_attributes();
-		$variation          = wc_get_product( $variation_id );
 
-		// Verify all attributes
-		foreach ( $attributes as $attribute ) {
-			if ( ! $attribute['is_variation'] ) {
-				continue;
+		// If no variation ID is set, attempt to get a variation ID from posted attributes.
+		if ( empty( $variation_id ) ) {
+			$data_store   = WC_Data_Store::load( 'product' );
+			$variation_id = $data_store->find_matching_product_variation( $adding_to_cart, wp_unslash( $_POST ) );
+		}
+
+		// Validate the attributes.
+		try {
+			if ( empty( $variation_id ) ) {
+				throw new Exception( __( 'Please choose product options&hellip;', 'woocommerce' ) );
 			}
 
-			$taxonomy = 'attribute_' . sanitize_title( $attribute['name'] );
+			$variation_data = wc_get_product_variation_attributes( $variation_id );
 
-			if ( isset( $_REQUEST[ $taxonomy ] ) ) {
-
-				// Get value from post data
-				if ( $attribute['is_taxonomy'] ) {
-					// Don't use wc_clean as it destroys sanitized characters
-					$value = sanitize_title( stripslashes( $_REQUEST[ $taxonomy ] ) );
-				} else {
-					$value = wc_clean( stripslashes( $_REQUEST[ $taxonomy ] ) );
-				}
-
-				// Get valid value from variation
-				$valid_value = isset( $variation->variation_data[ $taxonomy ] ) ? $variation->variation_data[ $taxonomy ] : '';
-
-				// Allow if valid
-				if ( '' === $valid_value || $valid_value === $value ) {
-					$variations[ $taxonomy ] = $value;
+			foreach ( $attributes as $attribute ) {
+				if ( ! $attribute['is_variation'] ) {
 					continue;
 				}
 
-			} else {
-				$missing_attributes[] = wc_attribute_label( $attribute['name'] );
+				$taxonomy = 'attribute_' . sanitize_title( $attribute['name'] );
+
+				if ( isset( $_REQUEST[ $taxonomy ] ) ) {
+					// Get value from post data
+					if ( $attribute['is_taxonomy'] ) {
+						// Don't use wc_clean as it destroys sanitized characters
+						$value = sanitize_title( stripslashes( $_REQUEST[ $taxonomy ] ) );
+					} else {
+						$value = wc_clean( stripslashes( $_REQUEST[ $taxonomy ] ) );
+					}
+
+					// Get valid value from variation
+					$valid_value = isset( $variation_data[ $taxonomy ] ) ? $variation_data[ $taxonomy ] : '';
+
+					// Allow if valid or show error.
+					if ( '' === $valid_value || $valid_value === $value ) {
+						$variations[ $taxonomy ] = $value;
+					} else {
+						throw new Exception( sprintf( __( 'Invalid value posted for %s', 'woocommerce' ), wc_attribute_label( $attribute['name'] ) ) );
+					}
+				} else {
+					$missing_attributes[] = wc_attribute_label( $attribute['name'] );
+				}
 			}
+			if ( ! empty( $missing_attributes ) ) {
+				throw new Exception( sprintf( _n( '%s is a required field', '%s are required fields', sizeof( $missing_attributes ), 'woocommerce' ), wc_format_list_of_items( $missing_attributes ) ) );
+			}
+		} catch ( Exception $e ) {
+			wc_add_notice( $e->getMessage(), 'error' );
+			return false;
 		}
 
-		if ( $missing_attributes ) {
-			wc_add_notice( sprintf( _n( '%s is a required field', '%s are required fields', sizeof( $missing_attributes ), 'woocommerce' ), wc_format_list_of_items( $missing_attributes ) ), 'error' );
-		} elseif ( empty( $variation_id ) ) {
-			wc_add_notice( __( 'Please choose product options&hellip;', 'woocommerce' ), 'error' );
-		} else {
-			// Add to cart validation
-			$passed_validation 	= apply_filters( 'woocommerce_add_to_cart_validation', true, $product_id, $quantity, $variation_id, $variations );
+		// Add to cart validation
+		$passed_validation 	= apply_filters( 'woocommerce_add_to_cart_validation', true, $product_id, $quantity, $variation_id, $variations );
 
-			if ( $passed_validation && WC()->cart->add_to_cart( $product_id, $quantity, $variation_id, $variations ) !== false ) {
-				wc_add_to_cart_message( $product_id );
-				return true;
-			}
+		if ( $passed_validation && WC()->cart->add_to_cart( $product_id, $quantity, $variation_id, $variations ) !== false ) {
+			wc_add_to_cart_message( array( $product_id => $quantity ), true );
+			return true;
 		}
+
 		return false;
 	}
 
@@ -763,25 +857,27 @@ class WC_Form_Handler {
 	 * Process the login form.
 	 */
 	public static function process_login() {
-		if ( ! empty( $_POST['login'] ) && ! empty( $_POST['_wpnonce'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'woocommerce-login' ) ) {
+		$nonce_value = isset( $_POST['_wpnonce'] ) ? $_POST['_wpnonce'] : '';
+		$nonce_value = isset( $_POST['woocommerce-login-nonce'] ) ? $_POST['woocommerce-login-nonce'] : $nonce_value;
+
+		if ( ! empty( $_POST['login'] ) && wp_verify_nonce( $nonce_value, 'woocommerce-login' ) ) {
 
 			try {
-				$creds    = array();
-				$username = trim( $_POST['username'] );
+				$creds = array(
+					'user_password' => $_POST['password'],
+					'remember'      => isset( $_POST['rememberme'] ),
+				);
 
+				$username         = trim( $_POST['username'] );
 				$validation_error = new WP_Error();
 				$validation_error = apply_filters( 'woocommerce_process_login_errors', $validation_error, $_POST['username'], $_POST['password'] );
 
 				if ( $validation_error->get_error_code() ) {
-					throw new Exception( '<strong>' . __( 'Error', 'woocommerce' ) . ':</strong> ' . $validation_error->get_error_message() );
+					throw new Exception( '<strong>' . __( 'Error:', 'woocommerce' ) . '</strong> ' . $validation_error->get_error_message() );
 				}
 
 				if ( empty( $username ) ) {
-					throw new Exception( '<strong>' . __( 'Error', 'woocommerce' ) . ':</strong> ' . __( 'Username is required.', 'woocommerce' ) );
-				}
-
-				if ( empty( $_POST['password'] ) ) {
-					throw new Exception( '<strong>' . __( 'Error', 'woocommerce' ) . ':</strong> ' . __( 'Password is required.', 'woocommerce' ) );
+					throw new Exception( '<strong>' . __( 'Error:', 'woocommerce' ) . '</strong> ' . __( 'Username is required.', 'woocommerce' ) );
 				}
 
 				if ( is_email( $username ) && apply_filters( 'woocommerce_get_username_from_email', true ) ) {
@@ -790,17 +886,23 @@ class WC_Form_Handler {
 					if ( isset( $user->user_login ) ) {
 						$creds['user_login'] = $user->user_login;
 					} else {
-						throw new Exception( '<strong>' . __( 'Error', 'woocommerce' ) . ':</strong> ' . __( 'A user could not be found with this email address.', 'woocommerce' ) );
+						throw new Exception( '<strong>' . __( 'Error:', 'woocommerce' ) . '</strong> ' . __( 'A user could not be found with this email address.', 'woocommerce' ) );
 					}
-
 				} else {
 					$creds['user_login'] = $username;
 				}
 
-				$creds['user_password'] = $_POST['password'];
-				$creds['remember']      = isset( $_POST['rememberme'] );
-				$secure_cookie          = is_ssl() ? true : false;
-				$user                   = wp_signon( apply_filters( 'woocommerce_login_credentials', $creds ), $secure_cookie );
+				// On multisite, ensure user exists on current site, if not add them before allowing login.
+				if ( is_multisite() ) {
+					$user_data = get_user_by( 'login', $username );
+
+					if ( $user_data && ! is_user_member_of_blog( $user_data->ID, get_current_blog_id() ) ) {
+						add_user_to_blog( get_current_blog_id(), $user_data->ID, 'customer' );
+					}
+				}
+
+				// Perform the login
+				$user = wp_signon( apply_filters( 'woocommerce_login_credentials', $creds ), is_ssl() );
 
 				if ( is_wp_error( $user ) ) {
 					$message = $user->get_error_message();
@@ -816,17 +918,12 @@ class WC_Form_Handler {
 						$redirect = wc_get_page_permalink( 'myaccount' );
 					}
 
-					// Feedback
-					wc_add_notice( sprintf( __( 'You are now logged in as <strong>%s</strong>', 'woocommerce' ), $user->display_name ) );
-
 					wp_redirect( apply_filters( 'woocommerce_login_redirect', $redirect, $user ) );
 					exit;
 				}
-
-			} catch (Exception $e) {
-
-				wc_add_notice( apply_filters('login_errors', $e->getMessage() ), 'error' );
-
+			} catch ( Exception $e ) {
+				wc_add_notice( apply_filters( 'login_errors', $e->getMessage() ), 'error' );
+				do_action( 'woocommerce_login_failed' );
 			}
 		}
 	}
@@ -836,7 +933,13 @@ class WC_Form_Handler {
 	 */
 	public static function process_lost_password() {
 		if ( isset( $_POST['wc_reset_password'] ) && isset( $_POST['user_login'] ) && isset( $_POST['_wpnonce'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'lost_password' ) ) {
-			WC_Shortcode_My_Account::retrieve_password();
+			$success = WC_Shortcode_My_Account::retrieve_password();
+
+			// If successful, redirect to my account with query arg set.
+			if ( $success ) {
+				wp_redirect( add_query_arg( 'reset-link-sent', 'true', wc_get_account_endpoint_url( 'lost-password' ) ) );
+				exit;
+			}
 		}
 	}
 
@@ -864,7 +967,7 @@ class WC_Form_Handler {
 				wc_add_notice( __( 'Please enter your password.', 'woocommerce' ), 'error' );
 			}
 
-			if ( $posted_fields[ 'password_1' ] !== $posted_fields[ 'password_2' ] ) {
+			if ( $posted_fields['password_1'] !== $posted_fields['password_2'] ) {
 				wc_add_notice( __( 'Passwords do not match.', 'woocommerce' ), 'error' );
 			}
 
@@ -879,7 +982,7 @@ class WC_Form_Handler {
 
 				do_action( 'woocommerce_customer_reset_password', $user );
 
-				wp_redirect( add_query_arg( 'reset', 'true', remove_query_arg( array( 'key', 'login' ) ) ) );
+				wp_redirect( add_query_arg( 'password-reset', 'true', wc_get_page_permalink( 'myaccount' ) ) );
 				exit;
 			}
 		}
@@ -889,7 +992,10 @@ class WC_Form_Handler {
 	 * Process the registration form.
 	 */
 	public static function process_registration() {
-		if ( ! empty( $_POST['register'] ) && isset( $_POST['_wpnonce'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'woocommerce-register' ) ) {
+		$nonce_value = isset( $_POST['_wpnonce'] ) ? $_POST['_wpnonce'] : '';
+		$nonce_value = isset( $_POST['woocommerce-register-nonce'] ) ? $_POST['woocommerce-register-nonce'] : $nonce_value;
+
+		if ( ! empty( $_POST['register'] ) && wp_verify_nonce( $nonce_value, 'woocommerce-register' ) ) {
 			$username = 'no' === get_option( 'woocommerce_registration_generate_username' ) ? $_POST['username'] : '';
 			$password = 'no' === get_option( 'woocommerce_registration_generate_password' ) ? $_POST['password'] : '';
 			$email    = $_POST['email'];
@@ -921,7 +1027,7 @@ class WC_Form_Handler {
 				exit;
 
 			} catch ( Exception $e ) {
-				wc_add_notice( '<strong>' . __( 'Error', 'woocommerce' ) . ':</strong> ' . $e->getMessage(), 'error' );
+				wc_add_notice( '<strong>' . __( 'Error:', 'woocommerce' ) . '</strong> ' . $e->getMessage(), 'error' );
 			}
 		}
 	}
diff --git a/includes/class-wc-frontend-scripts.php b/includes/class-wc-frontend-scripts.php
index fb4d739b305..7cbb7b50bd6 100644
--- a/includes/class-wc-frontend-scripts.php
+++ b/includes/class-wc-frontend-scripts.php
@@ -43,36 +43,61 @@ class WC_Frontend_Scripts {
 		add_action( 'wp_enqueue_scripts', array( __CLASS__, 'load_scripts' ) );
 		add_action( 'wp_print_scripts', array( __CLASS__, 'localize_printed_scripts' ), 5 );
 		add_action( 'wp_print_footer_scripts', array( __CLASS__, 'localize_printed_scripts' ), 5 );
+		add_action( 'setup_theme', array( __CLASS__, 'add_default_theme_support' ) );
+	}
+
+	/**
+	 * Add theme support for default WP themes.
+	 *
+	 * @since 3.0.0
+	 */
+	public static function add_default_theme_support() {
+		if ( in_array( get_option( 'template' ), wc_get_core_supported_themes() ) ) {
+			add_theme_support( 'wc-product-gallery-zoom' );
+			add_theme_support( 'wc-product-gallery-lightbox' );
+			add_theme_support( 'wc-product-gallery-slider' );
+		}
 	}
 
 	/**
 	 * Get styles for the frontend.
-	 * @access private
+	 *
 	 * @return array
 	 */
 	public static function get_styles() {
 		return apply_filters( 'woocommerce_enqueue_styles', array(
 			'woocommerce-layout' => array(
-				'src'     => str_replace( array( 'http:', 'https:' ), '', WC()->plugin_url() ) . '/assets/css/woocommerce-layout.css',
+				'src'     => self::get_asset_url( 'assets/css/woocommerce-layout.css' ),
 				'deps'    => '',
 				'version' => WC_VERSION,
-				'media'   => 'all'
+				'media'   => 'all',
+				'has_rtl' => true,
 			),
 			'woocommerce-smallscreen' => array(
-				'src'     => str_replace( array( 'http:', 'https:' ), '', WC()->plugin_url() ) . '/assets/css/woocommerce-smallscreen.css',
+				'src'     => self::get_asset_url( 'assets/css/woocommerce-smallscreen.css' ),
 				'deps'    => 'woocommerce-layout',
 				'version' => WC_VERSION,
-				'media'   => 'only screen and (max-width: ' . apply_filters( 'woocommerce_style_smallscreen_breakpoint', $breakpoint = '768px' ) . ')'
+				'media'   => 'only screen and (max-width: ' . apply_filters( 'woocommerce_style_smallscreen_breakpoint', $breakpoint = '768px' ) . ')',
+				'has_rtl' => true,
 			),
 			'woocommerce-general' => array(
-				'src'     => str_replace( array( 'http:', 'https:' ), '', WC()->plugin_url() ) . '/assets/css/woocommerce.css',
+				'src'     => self::get_asset_url( 'assets/css/woocommerce.css' ),
 				'deps'    => '',
 				'version' => WC_VERSION,
-				'media'   => 'all'
+				'media'   => 'all',
+				'has_rtl' => true,
 			),
 		) );
 	}
 
+	/**
+	 * Return protocol relative asset URL.
+	 * @param string $path
+	 */
+	private static function get_asset_url( $path ) {
+		return str_replace( array( 'http:', 'https:' ), '', plugins_url( $path, WC_PLUGIN_FILE ) );
+	}
+
 	/**
 	 * Register a script for use.
 	 *
@@ -117,10 +142,15 @@ class WC_Frontend_Scripts {
 	 * @param  string[] $deps
 	 * @param  string   $version
 	 * @param  string   $media
+	 * @param  boolean  $has_rtl
 	 */
-	private static function register_style( $handle, $path, $deps = array(), $version = WC_VERSION, $media = 'all' ) {
+	private static function register_style( $handle, $path, $deps = array(), $version = WC_VERSION, $media = 'all', $has_rtl = false ) {
 		self::$styles[] = $handle;
 		wp_register_style( $handle, $path, $deps, $version, $media );
+
+		if ( $has_rtl ) {
+			wp_style_add_data( $handle, 'rtl', 'replace' );
+		}
 	}
 
 	/**
@@ -133,14 +163,187 @@ class WC_Frontend_Scripts {
 	 * @param  string[] $deps
 	 * @param  string   $version
 	 * @param  string   $media
+	 * @param  boolean  $has_rtl
 	 */
-	private static function enqueue_style( $handle, $path = '', $deps = array(), $version = WC_VERSION, $media = 'all' ) {
+	private static function enqueue_style( $handle, $path = '', $deps = array(), $version = WC_VERSION, $media = 'all', $has_rtl = false ) {
 		if ( ! in_array( $handle, self::$styles ) && $path ) {
-			self::register_style( $handle, $path, $deps, $version, $media );
+			self::register_style( $handle, $path, $deps, $version, $media, $has_rtl );
 		}
 		wp_enqueue_style( $handle );
 	}
 
+	/**
+	 * Register all WC scripts.
+	 */
+	private static function register_scripts() {
+		$suffix           = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$register_scripts = array(
+			'flexslider' => array(
+				'src'     => self::get_asset_url( 'assets/js/flexslider/jquery.flexslider' . $suffix . '.js' ),
+				'deps'    => array( 'jquery' ),
+				'version' => '2.6.1',
+			),
+			'js-cookie' => array(
+				'src'     => self::get_asset_url( 'assets/js/js-cookie/js.cookie' . $suffix . '.js' ),
+				'deps'    => array(),
+				'version' => '2.1.4',
+			),
+			'jquery-blockui' => array(
+				'src'     => self::get_asset_url( 'assets/js/jquery-blockui/jquery.blockUI' . $suffix . '.js' ),
+				'deps'    => array( 'jquery' ),
+				'version' => '2.70',
+			),
+			'jquery-cookie' => array( // deprecated.
+				'src'     => self::get_asset_url( 'assets/js/jquery-cookie/jquery.cookie' . $suffix . '.js' ),
+				'deps'    => array( 'jquery' ),
+				'version' => '1.4.1',
+			),
+			'jquery-payment' => array(
+				'src'     => self::get_asset_url( 'assets/js/jquery-payment/jquery.payment' . $suffix . '.js' ),
+				'deps'    => array( 'jquery' ),
+				'version' => '1.4.1',
+			),
+			'photoswipe' => array(
+				'src'     => self::get_asset_url( 'assets/js/photoswipe/photoswipe' . $suffix . '.js' ),
+				'deps'    => array(),
+				'version' => '4.1.1',
+			),
+			'photoswipe-ui-default'  => array(
+				'src'     => self::get_asset_url( 'assets/js/photoswipe/photoswipe-ui-default' . $suffix . '.js' ),
+				'deps'    => array( 'photoswipe' ),
+				'version' => '4.1.1',
+			),
+			'prettyPhoto' => array( // deprecated.
+				'src'     => self::get_asset_url( 'assets/js/prettyPhoto/jquery.prettyPhoto' . $suffix . '.js' ),
+				'deps'    => array( 'jquery' ),
+				'version' => '3.1.6',
+			),
+			'prettyPhoto-init' => array( // deprecated.
+				'src'     => self::get_asset_url( 'assets/js/prettyPhoto/jquery.prettyPhoto.init' . $suffix . '.js' ),
+				'deps'    => array( 'jquery', 'prettyPhoto' ),
+				'version' => WC_VERSION,
+			),
+			'select2' => array(
+				'src'     => self::get_asset_url( 'assets/js/select2/select2.full' . $suffix . '.js' ),
+				'deps'    => array( 'jquery' ),
+				'version' => '4.0.3',
+			),
+			'wc-address-i18n' => array(
+				'src'     => self::get_asset_url( 'assets/js/frontend/address-i18n' . $suffix . '.js' ),
+				'deps'    => array( 'jquery' ),
+				'version' => WC_VERSION,
+			),
+			'wc-add-payment-method' => array(
+				'src'     => self::get_asset_url( 'assets/js/frontend/add-payment-method' . $suffix . '.js' ),
+				'deps'    => array( 'jquery', 'woocommerce' ),
+				'version' => WC_VERSION,
+			),
+			'wc-cart' => array(
+				'src'     => self::get_asset_url( 'assets/js/frontend/cart' . $suffix . '.js' ),
+				'deps'    => array( 'jquery', 'wc-country-select', 'wc-address-i18n' ),
+				'version' => WC_VERSION,
+			),
+			'wc-cart-fragments' => array(
+				'src'     => self::get_asset_url( 'assets/js/frontend/cart-fragments' . $suffix . '.js' ),
+				'deps'    => array( 'jquery', 'js-cookie' ),
+				'version' => WC_VERSION,
+			),
+			'wc-checkout' => array(
+				'src'     => self::get_asset_url( 'assets/js/frontend/checkout' . $suffix . '.js' ),
+				'deps'    => array( 'jquery', 'woocommerce', 'wc-country-select', 'wc-address-i18n' ),
+				'version' => WC_VERSION,
+			),
+			'wc-country-select' => array(
+				'src'     => self::get_asset_url( 'assets/js/frontend/country-select' . $suffix . '.js' ),
+				'deps'    => array( 'jquery' ),
+				'version' => WC_VERSION,
+			),
+			'wc-credit-card-form' => array(
+				'src'     => self::get_asset_url( 'assets/js/frontend/credit-card-form' . $suffix . '.js' ),
+				'deps'    => array( 'jquery', 'jquery-payment' ),
+				'version' => WC_VERSION,
+			),
+			'wc-add-to-cart' => array(
+				'src'     => self::get_asset_url( 'assets/js/frontend/add-to-cart' . $suffix . '.js' ),
+				'deps'    => array( 'jquery' ),
+				'version' => WC_VERSION,
+			),
+			'wc-add-to-cart-variation' => array(
+				'src'     => self::get_asset_url( 'assets/js/frontend/add-to-cart-variation' . $suffix . '.js' ),
+				'deps'    => array( 'jquery', 'wp-util' ),
+				'version' => WC_VERSION,
+			),
+			'wc-geolocation' => array(
+				'src'     => self::get_asset_url( 'assets/js/frontend/geolocation' . $suffix . '.js' ),
+				'deps'    => array( 'jquery' ),
+				'version' => WC_VERSION,
+			),
+			'wc-lost-password' => array(
+				'src'     => self::get_asset_url( 'assets/js/frontend/lost-password' . $suffix . '.js' ),
+				'deps'    => array( 'jquery', 'woocommerce' ),
+				'version' => WC_VERSION,
+			),
+			'wc-password-strength-meter' => array(
+				'src'     => self::get_asset_url( 'assets/js/frontend/password-strength-meter' . $suffix . '.js' ),
+				'deps'    => array( 'jquery', 'password-strength-meter' ),
+				'version' => WC_VERSION,
+			),
+			'wc-single-product' => array(
+				'src'     => self::get_asset_url( 'assets/js/frontend/single-product' . $suffix . '.js' ),
+				'deps'    => array( 'jquery' ),
+				'version' => WC_VERSION,
+			),
+			'woocommerce' => array(
+				'src'     => self::get_asset_url( 'assets/js/frontend/woocommerce' . $suffix . '.js' ),
+				'deps'    => array( 'jquery', 'jquery-blockui', 'js-cookie' ),
+				'version' => WC_VERSION,
+			),
+			'zoom' => array(
+				'src'     => self::get_asset_url( 'assets/js/zoom/jquery.zoom' . $suffix . '.js' ),
+				'deps'    => array( 'jquery' ),
+				'version' => '1.7.15',
+			),
+		);
+		foreach ( $register_scripts as $name => $props ) {
+			self::register_script( $name, $props['src'], $props['deps'], $props['version'] );
+		}
+	}
+
+	/**
+	 * Register all WC sty;es.
+	 */
+	private static function register_styles() {
+		$register_styles = array(
+			'photoswipe' => array(
+				'src'     => self::get_asset_url( 'assets/css/photoswipe/photoswipe.css' ),
+				'deps'    => array(),
+				'version' => WC_VERSION,
+				'has_rtl' => false,
+			),
+			'photoswipe-default-skin' => array(
+				'src'     => self::get_asset_url( 'assets/css/photoswipe/default-skin/default-skin.css' ),
+				'deps'    => array( 'photoswipe' ),
+				'version' => WC_VERSION,
+				'has_rtl' => false,
+			),
+			'select2' => array(
+				'src'     => self::get_asset_url( 'assets/css/select2.css' ),
+				'deps'    => array(),
+				'version' => WC_VERSION,
+				'has_rtl' => false,
+			),
+			'woocommerce_prettyPhoto_css' => array( // deprecated.
+				'src'     => self::get_asset_url( 'assets/css/prettyPhoto.css' ),
+				'deps'    => array(),
+				'version' => WC_VERSION,
+				'has_rtl' => true,
+			),
+		);
+		foreach ( $register_styles as $name => $props ) {
+			self::register_style( $name, $props['src'], $props['deps'], $props['version'], 'all', $props['has_rtl'] );
+		}
+	}
+
 	/**
 	 * Register/queue frontend scripts.
 	 */
@@ -151,72 +354,70 @@ class WC_Frontend_Scripts {
 			return;
 		}
 
-		$suffix               = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-		$lightbox_en          = 'yes' === get_option( 'woocommerce_enable_lightbox' );
-		$ajax_cart_en         = 'yes' === get_option( 'woocommerce_enable_ajax_add_to_cart' );
-		$assets_path          = str_replace( array( 'http:', 'https:' ), '', WC()->plugin_url() ) . '/assets/';
-		$frontend_script_path = $assets_path . 'js/frontend/';
+		self::register_scripts();
+		self::register_styles();
 
-		// Chosen is @deprecated as of 2.3 in favour of 2.3. Here for backwards compatibility.
-		self::register_script( 'chosen', $assets_path . 'js/chosen/chosen.jquery' . $suffix . '.js', array( 'jquery' ), '1.0.0' );
-		self::register_script( 'select2', $assets_path . 'js/select2/select2' . $suffix . '.js', array( 'jquery' ), '3.5.4' );
-
-		// Register any scripts for later use, or used as dependencies
-		self::register_script( 'jquery-blockui', $assets_path . 'js/jquery-blockui/jquery.blockUI' . $suffix . '.js', array( 'jquery' ), '2.70' );
-		self::register_script( 'jquery-payment', $assets_path . 'js/jquery-payment/jquery.payment' . $suffix . '.js', array( 'jquery' ), '1.2.4' );
-		self::register_script( 'jquery-cookie', $assets_path . 'js/jquery-cookie/jquery.cookie' . $suffix . '.js', array( 'jquery' ), '1.4.1' );
-		self::register_script( 'wc-credit-card-form', $frontend_script_path . 'credit-card-form' . $suffix . '.js', array( 'jquery', 'jquery-payment' ) );
-		self::register_script( 'wc-add-to-cart-variation', $frontend_script_path . 'add-to-cart-variation' . $suffix . '.js', array( 'jquery', 'wp-util' ) );
-		self::register_script( 'wc-single-product', $frontend_script_path . 'single-product' . $suffix . '.js' );
-		self::register_script( 'wc-country-select', $frontend_script_path . 'country-select' . $suffix . '.js' );
-		self::register_script( 'wc-address-i18n', $frontend_script_path . 'address-i18n' . $suffix . '.js' );
-		self::register_script( 'wc-password-strength-meter', $frontend_script_path . 'password-strength-meter' . $suffix . '.js', array( 'jquery', 'password-strength-meter' ) );
-
-		// Register frontend scripts conditionally
-		if ( $ajax_cart_en ) {
-			self::enqueue_script( 'wc-add-to-cart', $frontend_script_path . 'add-to-cart' . $suffix . '.js' );
+		if ( 'yes' === get_option( 'woocommerce_enable_ajax_add_to_cart' ) ) {
+			self::enqueue_script( 'wc-add-to-cart' );
 		}
 		if ( is_cart() ) {
-			self::enqueue_script( 'wc-cart', $frontend_script_path . 'cart' . $suffix . '.js', array( 'jquery', 'wc-country-select', 'wc-address-i18n' ) );
+			self::enqueue_script( 'wc-cart' );
 		}
 		if ( is_checkout() || is_account_page() ) {
 			self::enqueue_script( 'select2' );
-			self::enqueue_style( 'select2', $assets_path . 'css/select2.css' );
+			self::enqueue_style( 'select2' );
 
-			// Password strength meter js called for checkout page.
-			if ( 'no' === get_option( 'woocommerce_registration_generate_password' ) && ! is_user_logged_in() ) {
+			// Password strength meter. Load in checkout, account login and edit account page.
+			if ( ( 'no' === get_option( 'woocommerce_registration_generate_password' ) && ! is_user_logged_in() ) || is_edit_account_page() || is_lost_password_page() ) {
 				self::enqueue_script( 'wc-password-strength-meter' );
 			}
 		}
 		if ( is_checkout() ) {
-			self::enqueue_script( 'wc-checkout', $frontend_script_path . 'checkout' . $suffix . '.js', array( 'jquery', 'woocommerce', 'wc-country-select', 'wc-address-i18n' ) );
+			self::enqueue_script( 'wc-checkout' );
 		}
 		if ( is_add_payment_method_page() ) {
-			self::enqueue_script( 'wc-add-payment-method', $frontend_script_path . 'add-payment-method' . $suffix . '.js', array( 'jquery', 'woocommerce' ) );
+			self::enqueue_script( 'wc-add-payment-method' );
 		}
 		if ( is_lost_password_page() ) {
-			self::enqueue_script( 'wc-lost-password', $frontend_script_path . 'lost-password' . $suffix . '.js', array( 'jquery', 'woocommerce' ) );
+			self::enqueue_script( 'wc-lost-password' );
 		}
-		if ( $lightbox_en && ( is_product() || ( ! empty( $post->post_content ) && strstr( $post->post_content, '[product_page' ) ) ) ) {
-			self::enqueue_script( 'prettyPhoto', $assets_path . 'js/prettyPhoto/jquery.prettyPhoto' . $suffix . '.js', array( 'jquery' ), '3.1.6', true );
-			self::enqueue_script( 'prettyPhoto-init', $assets_path . 'js/prettyPhoto/jquery.prettyPhoto.init' . $suffix . '.js', array( 'jquery','prettyPhoto' ) );
-			self::enqueue_style( 'woocommerce_prettyPhoto_css', $assets_path . 'css/prettyPhoto.css' );
-		}
-		if ( is_product() ) {
+
+		// Load gallery scripts on product pages only if supported.
+		if ( is_product() || ( ! empty( $post->post_content ) && strstr( $post->post_content, '[product_page' ) ) ) {
+			if ( current_theme_supports( 'wc-product-gallery-zoom' ) ) {
+				self::enqueue_script( 'zoom' );
+			}
+			if ( current_theme_supports( 'wc-product-gallery-slider' ) ) {
+				self::enqueue_script( 'flexslider' );
+			}
+			if ( current_theme_supports( 'wc-product-gallery-lightbox' ) ) {
+				self::enqueue_script( 'photoswipe-ui-default' );
+				self::enqueue_style( 'photoswipe-default-skin' );
+				add_action( 'wp_footer', 'woocommerce_photoswipe' );
+			}
 			self::enqueue_script( 'wc-single-product' );
 		}
+
 		if ( 'geolocation_ajax' === get_option( 'woocommerce_default_customer_address' ) ) {
-			self::enqueue_script( 'wc-geolocation', $frontend_script_path . 'geolocation' . $suffix . '.js', array( 'jquery' ) );
+			$ua = wc_get_user_agent(); // Exclude common bots from geolocation by user agent.
+
+			if ( ! strstr( $ua, 'bot' ) && ! strstr( $ua, 'spider' ) && ! strstr( $ua, 'crawl' ) ) {
+				self::enqueue_script( 'wc-geolocation' );
+			}
 		}
 
 		// Global frontend scripts
-		self::enqueue_script( 'woocommerce', $frontend_script_path . 'woocommerce' . $suffix . '.js', array( 'jquery', 'jquery-blockui' ) );
-		self::enqueue_script( 'wc-cart-fragments', $frontend_script_path . 'cart-fragments' . $suffix . '.js', array( 'jquery', 'jquery-cookie' ) );
+		self::enqueue_script( 'woocommerce' );
+		self::enqueue_script( 'wc-cart-fragments' );
 
 		// CSS Styles
 		if ( $enqueue_styles = self::get_styles() ) {
 			foreach ( $enqueue_styles as $handle => $args ) {
-				self::enqueue_style( $handle, $args['src'], $args['deps'], $args['version'], $args['media'] );
+				if ( ! isset( $args['has_rtl'] ) ) {
+					$args['has_rtl'] = false;
+				}
+
+				self::enqueue_style( $handle, $args['src'], $args['deps'], $args['version'], $args['media'], $args['has_rtl'] );
 			}
 		}
 	}
@@ -248,7 +449,7 @@ class WC_Frontend_Scripts {
 			case 'woocommerce' :
 				return array(
 					'ajax_url'    => WC()->ajax_url(),
-					'wc_ajax_url' => WC_AJAX::get_endpoint( "%%endpoint%%" )
+					'wc_ajax_url' => WC_AJAX::get_endpoint( "%%endpoint%%" ),
 				);
 			break;
 			case 'wc-geolocation' :
@@ -256,13 +457,33 @@ class WC_Frontend_Scripts {
 					'wc_ajax_url'  => WC_AJAX::get_endpoint( "%%endpoint%%" ),
 					'home_url'     => home_url(),
 					'is_available' => ! ( is_cart() || is_account_page() || is_checkout() || is_customize_preview() ) ? '1' : '0',
-					'hash'         => isset( $_GET['v'] ) ? wc_clean( $_GET['v'] ) : ''
+					'hash'         => isset( $_GET['v'] ) ? wc_clean( $_GET['v'] ) : '',
 				);
 			break;
 			case 'wc-single-product' :
 				return array(
 					'i18n_required_rating_text' => esc_attr__( 'Please select a rating', 'woocommerce' ),
 					'review_rating_required'    => get_option( 'woocommerce_review_rating_required' ),
+					'flexslider'                => apply_filters( 'woocommerce_single_product_carousel_options', array(
+						'rtl'            => is_rtl(),
+						'animation'      => 'slide',
+						'smoothHeight'   => true,
+						'directionNav'   => false,
+						'controlNav'     => 'thumbnails',
+						'slideshow'      => false,
+						'animationSpeed' => 500,
+						'animationLoop'  => false, // Breaks photoswipe pagination if true.
+					) ),
+					'zoom_enabled'       => get_theme_support( 'wc-product-gallery-zoom' ),
+					'photoswipe_enabled' => get_theme_support( 'wc-product-gallery-lightbox' ),
+					'photoswipe_options' => apply_filters( 'woocommerce_single_product_photoswipe_options', array(
+						'shareEl'               => false,
+						'closeOnScroll'         => false,
+						'history'               => false,
+						'hideAnimationDuration' => 0,
+						'showAnimationDuration' => 0
+					) ),
+					'flexslider_enabled' => get_theme_support( 'wc-product-gallery-slider' ),
 				);
 			break;
 			case 'wc-checkout' :
@@ -275,7 +496,7 @@ class WC_Frontend_Scripts {
 					'option_guest_checkout'     => get_option( 'woocommerce_enable_guest_checkout' ),
 					'checkout_url'              => WC_AJAX::get_endpoint( "checkout" ),
 					'is_checkout'               => is_page( wc_get_page_id( 'checkout' ) ) && empty( $wp->query_vars['order-pay'] ) && ! isset( $wp->query_vars['order-received'] ) ? 1 : 0,
-					'debug_mode'                => defined('WP_DEBUG') && WP_DEBUG,
+					'debug_mode'                => defined( 'WP_DEBUG' ) && WP_DEBUG,
 					'i18n_checkout_error'       => esc_attr__( 'Error processing checkout. Please try again.', 'woocommerce' ),
 				);
 			break;
@@ -291,23 +512,25 @@ class WC_Frontend_Scripts {
 					'ajax_url'                     => WC()->ajax_url(),
 					'wc_ajax_url'                  => WC_AJAX::get_endpoint( "%%endpoint%%" ),
 					'update_shipping_method_nonce' => wp_create_nonce( "update-shipping-method" ),
+					'apply_coupon_nonce'           => wp_create_nonce( "apply-coupon" ),
+					'remove_coupon_nonce'          => wp_create_nonce( "remove-coupon" ),
 				);
 			break;
 			case 'wc-cart-fragments' :
 				return array(
 					'ajax_url'      => WC()->ajax_url(),
 					'wc_ajax_url'   => WC_AJAX::get_endpoint( "%%endpoint%%" ),
-					'fragment_name' => apply_filters( 'woocommerce_cart_fragment_name', 'wc_fragments' )
+					'fragment_name' => apply_filters( 'woocommerce_cart_fragment_name', 'wc_fragments' ),
 				);
 			break;
 			case 'wc-add-to-cart' :
 				return array(
 					'ajax_url'                => WC()->ajax_url(),
 					'wc_ajax_url'             => WC_AJAX::get_endpoint( "%%endpoint%%" ),
-					'i18n_view_cart'          => esc_attr__( 'View Cart', 'woocommerce' ),
+					'i18n_view_cart'          => esc_attr__( 'View cart', 'woocommerce' ),
 					'cart_url'                => apply_filters( 'woocommerce_add_to_cart_redirect', wc_get_cart_url() ),
 					'is_cart'                 => is_cart(),
-					'cart_redirect_after_add' => get_option( 'woocommerce_cart_redirect_after_add' )
+					'cart_redirect_after_add' => get_option( 'woocommerce_cart_redirect_after_add' ),
 				);
 			break;
 			case 'wc-add-to-cart-variation' :
@@ -315,17 +538,16 @@ class WC_Frontend_Scripts {
 				wc_get_template( 'single-product/add-to-cart/variation.php' );
 
 				return array(
+					'wc_ajax_url'                      => WC_AJAX::get_endpoint( "%%endpoint%%" ),
 					'i18n_no_matching_variations_text' => esc_attr__( 'Sorry, no products matched your selection. Please choose a different combination.', 'woocommerce' ),
-					'i18n_make_a_selection_text'       => esc_attr__( 'Select product options before adding this product to your cart.', 'woocommerce' ),
-					'i18n_unavailable_text'            => esc_attr__( 'Sorry, this product is unavailable. Please choose a different combination.', 'woocommerce' )
+					'i18n_make_a_selection_text'       => esc_attr__( 'Please select some product options before adding this product to your cart.', 'woocommerce' ),
+					'i18n_unavailable_text'            => esc_attr__( 'Sorry, this product is unavailable. Please choose a different combination.', 'woocommerce' ),
 				);
 			break;
 			case 'wc-country-select' :
 				return array(
-					'countries'              => json_encode( array_merge( WC()->countries->get_allowed_country_states(), WC()->countries->get_shipping_country_states() ) ),
-					'i18n_select_state_text' => esc_attr__( 'Select an option&hellip;', 'woocommerce' ),
-					'i18n_matches_1'            => _x( 'One result is available, press enter to select it.', 'enhanced select', 'woocommerce' ),
-					'i18n_matches_n'            => _x( '%qty% results are available, use up and down arrow keys to navigate.', 'enhanced select', 'woocommerce' ),
+					'countries'                 => json_encode( array_merge( WC()->countries->get_allowed_country_states(), WC()->countries->get_shipping_country_states() ) ),
+					'i18n_select_state_text'    => esc_attr__( 'Select an option&hellip;', 'woocommerce' ),
 					'i18n_no_matches'           => _x( 'No matches found', 'enhanced select', 'woocommerce' ),
 					'i18n_ajax_error'           => _x( 'Loading failed', 'enhanced select', 'woocommerce' ),
 					'i18n_input_too_short_1'    => _x( 'Please enter 1 or more characters', 'enhanced select', 'woocommerce' ),
@@ -338,6 +560,13 @@ class WC_Frontend_Scripts {
 					'i18n_searching'            => _x( 'Searching&hellip;', 'enhanced select', 'woocommerce' ),
 				);
 			break;
+			case 'wc-password-strength-meter' :
+				return array(
+					'min_password_strength' => apply_filters( 'woocommerce_min_password_strength', 3 ),
+					'i18n_password_error'   => esc_attr__( 'Please enter a stronger password.', 'woocommerce' ),
+					'i18n_password_hint'    => esc_attr( wp_get_password_hint() ),
+				);
+			break;
 		}
 		return false;
 	}
diff --git a/includes/class-wc-geo-ip.php b/includes/class-wc-geo-ip.php
index 6ea8eea34a2..40baa908e2f 100644
--- a/includes/class-wc-geo-ip.php
+++ b/includes/class-wc-geo-ip.php
@@ -15,7 +15,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 }
 
 /**
- * WC_Geolocation Class.
+ * WC_Geo_IP Class.
  */
 class WC_Geo_IP {
 
@@ -54,20 +54,60 @@ class WC_Geo_IP {
 	const GEOIP_ORG_EDITION_V6           = 23;
 	const GEOIP_DOMAIN_EDITION_V6        = 24;
 
+	/**
+	 * Flags.
+	 *
+	 * @var int
+	 */
 	public $flags;
 
+	/**
+	 * File handler.
+	 *
+	 * @var resource
+	 */
 	public $filehandle;
 
+	/**
+	 * Memory buffer.
+	 *
+	 * @var string
+	 */
 	public $memory_buffer;
 
+	/**
+	 * Database type.
+	 *
+	 * @var int
+	 */
 	public $databaseType;
 
+	/**
+	 * Database segments.
+	 *
+	 * @var int
+	 */
 	public $databaseSegments;
 
+	/**
+	 * Record length.
+	 *
+	 * @var int
+	 */
 	public $record_length;
 
+	/**
+	 * Shmid.
+	 *
+	 * @var string
+	 */
 	public $shmid;
 
+	/**
+	 * Two letters country codes.
+	 *
+	 * @var array
+	 */
 	public $GEOIP_COUNTRY_CODES = array(
 		'',
 		'AP',
@@ -324,9 +364,14 @@ class WC_Geo_IP {
 		'MF',
 		'BQ',
 		'SS',
-		'O1'
+		'O1',
 	);
 
+	/**
+	 * 3 letters country codes.
+	 *
+	 * @var array
+	 */
 	public $GEOIP_COUNTRY_CODES3 = array(
 		'',
 		'AP',
@@ -583,9 +628,14 @@ class WC_Geo_IP {
 		'MAF',
 		'BES',
 		'SSD',
-		'O1'
+		'O1',
 	);
 
+	/**
+	 * Contry names.
+	 *
+	 * @var array
+	 */
 	public $GEOIP_COUNTRY_NAMES = array(
 		'',
 		'Asia/Pacific Region',
@@ -842,9 +892,14 @@ class WC_Geo_IP {
 		'Saint Martin',
 		'Bonaire, Saint Eustatius and Saba',
 		'South Sudan',
-		'Other'
+		'Other',
 	);
 
+	/**
+	 * 2 letters continent codes.
+	 *
+	 * @var array
+	 */
 	public $GEOIP_CONTINENT_CODES = array(
 		'--',
 		'AS',
@@ -1101,7 +1156,7 @@ class WC_Geo_IP {
 		'NA',
 		'NA',
 		'AF',
-		'--'
+		'--',
 	);
 
 	/** @var WC_Logger Logger instance */
@@ -1110,17 +1165,15 @@ class WC_Geo_IP {
 	/**
 	 * Logging method.
 	 *
-	 * @param string $message
+	 * @param string $message Log message.
+	 * @param string $level   Optional. Default 'info'.
+	 *     emergency|alert|critical|error|warning|notice|info|debug
 	 */
-	public static function log( $message ) {
-		if ( ! class_exists( 'WC_Logger' ) ) {
-			include_once( 'class-wc-logger.php' );
-		}
-
+	public static function log( $message, $level = 'info' ) {
 		if ( empty( self::$log ) ) {
-			self::$log = new WC_Logger();
+			self::$log = wc_get_logger();
 		}
-		self::$log->add( 'geoip', $message );
+		self::$log->log( $level, $message, array( 'source' => 'geoip' ) );
 	}
 
 	/**
@@ -1140,7 +1193,7 @@ class WC_Geo_IP {
 					$this->memory_buffer = fread( $this->filehandle, $s_array['size'] );
 				}
 			} else {
-				$this->log( 'GeoIP API: Can not open ' . $filename );
+				$this->log( 'GeoIP API: Can not open ' . $filename, 'error' );
 			}
 		}
 
@@ -1163,7 +1216,7 @@ class WC_Geo_IP {
 				$delim   = @shmop_read( $this->shmid, $offset, 3 );
 				$offset += 3;
 
-				if ( $delim == ( chr( 255 ) . chr( 255 ) . chr( 255 ) ) ) {
+				if ( ( chr( 255 ) . chr( 255 ) . chr( 255 ) ) == $delim ) {
 					$this->databaseType = ord( @shmop_read( $this->shmid, $offset, 1 ) );
 
 					if ( $this->databaseType >= 106 ) {
@@ -1172,28 +1225,28 @@ class WC_Geo_IP {
 
 					$offset++;
 
-					if ( $this->databaseType == self::GEOIP_REGION_EDITION_REV0 ) {
+					if ( self::GEOIP_REGION_EDITION_REV0 == $this->databaseType ) {
 						$this->databaseSegments = self::GEOIP_STATE_BEGIN_REV0;
-					} elseif ( $this->databaseType == self::GEOIP_REGION_EDITION_REV1 ) {
+					} elseif ( self::GEOIP_REGION_EDITION_REV1 == $this->databaseType ) {
 						$this->databaseSegments = self::GEOIP_STATE_BEGIN_REV1;
-					} elseif ( ( $this->databaseType == self::GEOIP_CITY_EDITION_REV0 )
-						|| ( $this->databaseType == self::GEOIP_CITY_EDITION_REV1 )
-						|| ( $this->databaseType == self::GEOIP_ORG_EDITION )
-						|| ( $this->databaseType == self::GEOIP_ORG_EDITION_V6 )
-						|| ( $this->databaseType == self::GEOIP_DOMAIN_EDITION )
-						|| ( $this->databaseType == self::GEOIP_DOMAIN_EDITION_V6 )
-						|| ( $this->databaseType == self::GEOIP_ISP_EDITION )
-						|| ( $this->databaseType == self::GEOIP_ISP_EDITION_V6 )
-						|| ( $this->databaseType == self::GEOIP_USERTYPE_EDITION )
-						|| ( $this->databaseType == self::GEOIP_USERTYPE_EDITION_V6 )
-						|| ( $this->databaseType == self::GEOIP_LOCATIONA_EDITION )
-						|| ( $this->databaseType == self::GEOIP_ACCURACYRADIUS_EDITION )
-						|| ( $this->databaseType == self::GEOIP_CITY_EDITION_REV0_V6 )
-						|| ( $this->databaseType == self::GEOIP_CITY_EDITION_REV1_V6 )
-						|| ( $this->databaseType == self::GEOIP_NETSPEED_EDITION_REV1 )
-						|| ( $this->databaseType == self::GEOIP_NETSPEED_EDITION_REV1_V6 )
-						|| ( $this->databaseType == self::GEOIP_ASNUM_EDITION )
-						|| ( $this->databaseType == self::GEOIP_ASNUM_EDITION_V6 )
+					} elseif ( ( self::GEOIP_CITY_EDITION_REV0 == $this->databaseType )
+						|| ( self::GEOIP_CITY_EDITION_REV1 == $this->databaseType )
+						|| ( self::GEOIP_ORG_EDITION == $this->databaseType )
+						|| ( self::GEOIP_ORG_EDITION_V6 == $this->databaseType )
+						|| ( self::GEOIP_DOMAIN_EDITION == $this->databaseType )
+						|| ( self::GEOIP_DOMAIN_EDITION_V6 == $this->databaseType )
+						|| ( self::GEOIP_ISP_EDITION == $this->databaseType )
+						|| ( self::GEOIP_ISP_EDITION_V6 == $this->databaseType )
+						|| ( self::GEOIP_USERTYPE_EDITION == $this->databaseType )
+						|| ( self::GEOIP_USERTYPE_EDITION_V6 == $this->databaseType )
+						|| ( self::GEOIP_LOCATIONA_EDITION == $this->databaseType )
+						|| ( self::GEOIP_ACCURACYRADIUS_EDITION == $this->databaseType )
+						|| ( self::GEOIP_CITY_EDITION_REV0_V6 == $this->databaseType )
+						|| ( self::GEOIP_CITY_EDITION_REV1_V6 == $this->databaseType )
+						|| ( self::GEOIP_NETSPEED_EDITION_REV1 == $this->databaseType )
+						|| ( self::GEOIP_NETSPEED_EDITION_REV1_V6 == $this->databaseType )
+						|| ( self::GEOIP_ASNUM_EDITION == $this->databaseType )
+						|| ( self::GEOIP_ASNUM_EDITION_V6 == $this->databaseType )
 					) {
 						$this->databaseSegments = 0;
 						$buf                    = @shmop_read( $this->shmid, $offset, self::SEGMENT_RECORD_LENGTH );
@@ -1202,12 +1255,12 @@ class WC_Geo_IP {
 							$this->databaseSegments += ( ord( $buf[ $j ] ) << ( $j * 8 ) );
 						}
 
-						if ( ( $this->databaseType == self::GEOIP_ORG_EDITION )
-							|| ( $this->databaseType == self::GEOIP_ORG_EDITION_V6 )
-							|| ( $this->databaseType == self::GEOIP_DOMAIN_EDITION )
-							|| ( $this->databaseType == self::GEOIP_DOMAIN_EDITION_V6 )
-							|| ( $this->databaseType == self::GEOIP_ISP_EDITION )
-							|| ( $this->databaseType == self::GEOIP_ISP_EDITION_V6 )
+						if ( ( self::GEOIP_ORG_EDITION == $this->databaseType )
+							|| ( self::GEOIP_ORG_EDITION_V6 == $this->databaseType )
+							|| ( self::GEOIP_DOMAIN_EDITION == $this->databaseType )
+							|| ( self::GEOIP_DOMAIN_EDITION_V6 == $this->databaseType )
+							|| ( self::GEOIP_ISP_EDITION == $this->databaseType )
+							|| ( self::GEOIP_ISP_EDITION_V6 == $this->databaseType )
 						) {
 							$this->record_length = self::ORG_RECORD_LENGTH;
 						}
@@ -1218,10 +1271,10 @@ class WC_Geo_IP {
 					$offset -= 4;
 				}
 			}
-			if ( ( $this->databaseType == self::GEOIP_COUNTRY_EDITION )
-				|| ( $this->databaseType == self::GEOIP_COUNTRY_EDITION_V6 )
-				|| ( $this->databaseType == self::GEOIP_PROXY_EDITION )
-				|| ( $this->databaseType == self::GEOIP_NETSPEED_EDITION )
+			if ( ( self::GEOIP_COUNTRY_EDITION == $this->databaseType )
+				|| ( self::GEOIP_COUNTRY_EDITION_V6 == $this->databaseType )
+				|| ( self::GEOIP_PROXY_EDITION == $this->databaseType )
+				|| ( self::GEOIP_NETSPEED_EDITION == $this->databaseType )
 			) {
 				$this->databaseSegments = self::GEOIP_COUNTRY_BEGIN;
 			}
@@ -1232,37 +1285,35 @@ class WC_Geo_IP {
 			for ( $i = 0; $i < self::STRUCTURE_INFO_MAX_SIZE; $i++ ) {
 
 				$delim = fread( $this->filehandle, 3 );
-				if ( $delim == ( chr( 255 ) . chr( 255 ) . chr( 255 ) ) ) {
+				if ( ( chr( 255 ) . chr( 255 ) . chr( 255 ) ) == $delim ) {
 
 					$this->databaseType = ord( fread( $this->filehandle, 1 ) );
 					if ( $this->databaseType >= 106 ) {
 						$this->databaseType -= 105;
 					}
 
-					if ( $this->databaseType == self::GEOIP_REGION_EDITION_REV0 ) {
+					if ( self::GEOIP_REGION_EDITION_REV0 == $this->databaseType ) {
 						$this->databaseSegments = self::GEOIP_STATE_BEGIN_REV0;
-					} elseif ( $this->databaseType == self::GEOIP_REGION_EDITION_REV1 ) {
+					} elseif ( self::GEOIP_REGION_EDITION_REV1 == $this->databaseType ) {
 						$this->databaseSegments = self::GEOIP_STATE_BEGIN_REV1;
-					} elseif ( ( $this->databaseType == self::GEOIP_CITY_EDITION_REV0 )
-						|| ( $this->databaseType == self::GEOIP_CITY_EDITION_REV1 )
-						|| ( $this->databaseType == self::GEOIP_CITY_EDITION_REV0_V6 )
-						|| ( $this->databaseType == self::GEOIP_CITY_EDITION_REV1_V6 )
-						|| ( $this->databaseType == self::GEOIP_ORG_EDITION )
-						|| ( $this->databaseType == self::GEOIP_DOMAIN_EDITION )
-						|| ( $this->databaseType == self::GEOIP_ISP_EDITION )
-						|| ( $this->databaseType == self::GEOIP_ORG_EDITION_V6 )
-						|| ( $this->databaseType == self::GEOIP_DOMAIN_EDITION_V6 )
-						|| ( $this->databaseType == self::GEOIP_ISP_EDITION_V6 )
-						|| ( $this->databaseType == self::GEOIP_LOCATIONA_EDITION )
-						|| ( $this->databaseType == self::GEOIP_ACCURACYRADIUS_EDITION )
-						|| ( $this->databaseType == self::GEOIP_CITY_EDITION_REV0_V6 )
-						|| ( $this->databaseType == self::GEOIP_CITY_EDITION_REV1_V6 )
-						|| ( $this->databaseType == self::GEOIP_NETSPEED_EDITION_REV1 )
-						|| ( $this->databaseType == self::GEOIP_NETSPEED_EDITION_REV1_V6 )
-						|| ( $this->databaseType == self::GEOIP_USERTYPE_EDITION )
-						|| ( $this->databaseType == self::GEOIP_USERTYPE_EDITION_V6 )
-						|| ( $this->databaseType == self::GEOIP_ASNUM_EDITION )
-						|| ( $this->databaseType == self::GEOIP_ASNUM_EDITION_V6 )
+					} elseif ( ( self::GEOIP_CITY_EDITION_REV0 == $this->databaseType )
+						|| ( self::GEOIP_CITY_EDITION_REV1 == $this->databaseType )
+						|| ( self::GEOIP_CITY_EDITION_REV0_V6 == $this->databaseType )
+						|| ( self::GEOIP_CITY_EDITION_REV1_V6 == $this->databaseType )
+						|| ( self::GEOIP_ORG_EDITION == $this->databaseType )
+						|| ( self::GEOIP_DOMAIN_EDITION == $this->databaseType )
+						|| ( self::GEOIP_ISP_EDITION == $this->databaseType )
+						|| ( self::GEOIP_ORG_EDITION_V6 == $this->databaseType )
+						|| ( self::GEOIP_DOMAIN_EDITION_V6 == $this->databaseType )
+						|| ( self::GEOIP_ISP_EDITION_V6 == $this->databaseType )
+						|| ( self::GEOIP_LOCATIONA_EDITION == $this->databaseType )
+						|| ( self::GEOIP_ACCURACYRADIUS_EDITION == $this->databaseType )
+						|| ( self::GEOIP_NETSPEED_EDITION_REV1 == $this->databaseType )
+						|| ( self::GEOIP_NETSPEED_EDITION_REV1_V6 == $this->databaseType )
+						|| ( self::GEOIP_USERTYPE_EDITION == $this->databaseType )
+						|| ( self::GEOIP_USERTYPE_EDITION_V6 == $this->databaseType )
+						|| ( self::GEOIP_ASNUM_EDITION == $this->databaseType )
+						|| ( self::GEOIP_ASNUM_EDITION_V6 == $this->databaseType )
 					) {
 						$this->databaseSegments = 0;
 						$buf = fread( $this->filehandle, self::SEGMENT_RECORD_LENGTH );
@@ -1271,12 +1322,12 @@ class WC_Geo_IP {
 							$this->databaseSegments += ( ord( $buf[ $j ] ) << ( $j * 8 ) );
 						}
 
-						if ( ( $this->databaseType == self::GEOIP_ORG_EDITION )
-							|| ( $this->databaseType == self::GEOIP_DOMAIN_EDITION )
-							|| ( $this->databaseType == self::GEOIP_ISP_EDITION )
-							|| ( $this->databaseType == self::GEOIP_ORG_EDITION_V6 )
-							|| ( $this->databaseType == self::GEOIP_DOMAIN_EDITION_V6 )
-							|| ( $this->databaseType == self::GEOIP_ISP_EDITION_V6 )
+						if ( ( self::GEOIP_ORG_EDITION == $this->databaseType )
+							|| ( self::GEOIP_DOMAIN_EDITION == $this->databaseType )
+							|| ( self::GEOIP_ISP_EDITION == $this->databaseType )
+							|| ( self::GEOIP_ORG_EDITION_V6 == $this->databaseType )
+							|| ( self::GEOIP_DOMAIN_EDITION_V6 == $this->databaseType )
+							|| ( self::GEOIP_ISP_EDITION_V6 == $this->databaseType )
 						) {
 							$this->record_length = self::ORG_RECORD_LENGTH;
 						}
@@ -1288,10 +1339,10 @@ class WC_Geo_IP {
 				}
 			}
 
-			if ( ( $this->databaseType == self::GEOIP_COUNTRY_EDITION )
-				|| ( $this->databaseType == self::GEOIP_COUNTRY_EDITION_V6 )
-				|| ( $this->databaseType == self::GEOIP_PROXY_EDITION )
-				|| ( $this->databaseType == self::GEOIP_NETSPEED_EDITION )
+			if ( ( self::GEOIP_COUNTRY_EDITION == $this->databaseType )
+				|| ( self::GEOIP_COUNTRY_EDITION_V6 == $this->databaseType )
+				|| ( self::GEOIP_PROXY_EDITION == $this->databaseType )
+				|| ( self::GEOIP_NETSPEED_EDITION == $this->databaseType )
 			) {
 				$this->databaseSegments = self::GEOIP_COUNTRY_BEGIN;
 			}
@@ -1354,7 +1405,7 @@ class WC_Geo_IP {
 
 		// Get region
 		$char = ord( substr( $record_buf, $record_buf_pos + $str_length, 1 ) );
-		while ( $char != 0 ) {
+		while ( 0 != $char ) {
 			$str_length++;
 			$char = ord( substr( $record_buf, $record_buf_pos + $str_length, 1 ) );
 		}
@@ -1368,7 +1419,7 @@ class WC_Geo_IP {
 
 		// Get city
 		$char = ord( substr( $record_buf, $record_buf_pos + $str_length, 1 ) );
-		while ( $char != 0 ) {
+		while ( 0 != $char ) {
 			$str_length++;
 			$char = ord( substr( $record_buf, $record_buf_pos + $str_length, 1 ) );
 		}
@@ -1382,7 +1433,7 @@ class WC_Geo_IP {
 
 		// Get postal code
 		$char = ord( substr( $record_buf, $record_buf_pos + $str_length, 1 ) );
-		while ( $char != 0 ) {
+		while ( 0 != $char ) {
 			$str_length++;
 			$char = ord( substr( $record_buf, $record_buf_pos + $str_length, 1 ) );
 		}
@@ -1412,7 +1463,7 @@ class WC_Geo_IP {
 
 		if ( self::GEOIP_CITY_EDITION_REV1 == $this->databaseType ) {
 			$metroarea_combo = 0;
-			if ( $record->country_code == "US" ) {
+			if ( 'US' === $record->country_code ) {
 				for ( $j = 0; $j < 3; ++$j ) {
 					$char             = ord( substr( $record_buf, $record_buf_pos++, 1 ) );
 					$metroarea_combo += ( $char << ( $j * 8 ) );
@@ -1451,7 +1502,7 @@ class WC_Geo_IP {
 	 * @param  int $ipnum
 	 * @return string
 	 */
-	function _geoip_seek_country_v6( $ipnum ) {
+	public function _geoip_seek_country_v6( $ipnum ) {
 		// arrays from unpack start with offset 1
 		// yet another php mystery. array_merge work around
 		// this broken behaviour
@@ -1501,7 +1552,7 @@ class WC_Geo_IP {
 			}
 		}
 
-		$this->log( 'GeoIP API: Error traversing database - perhaps it is corrupt?' );
+		$this->log( 'GeoIP API: Error traversing database - perhaps it is corrupt?', 'error' );
 
 		return false;
 	}
@@ -1556,7 +1607,7 @@ class WC_Geo_IP {
 			}
 		}
 
-		$this->log( 'GeoIP API: Error traversing database - perhaps it is corrupt?' );
+		$this->log( 'GeoIP API: Error traversing database - perhaps it is corrupt?', 'error' );
 
 		return false;
 	}
@@ -1568,7 +1619,7 @@ class WC_Geo_IP {
 	 * @return int
 	 */
 	public function geoip_record_by_addr( $addr ) {
-		if ( $addr == null ) {
+		if ( null == $addr ) {
 			return 0;
 		}
 
@@ -1580,9 +1631,13 @@ class WC_Geo_IP {
 	 * Country ID by addr IPv6.
 	 *
 	 * @param  string $addr
-	 * @return int
+	 * @return int|bool
 	 */
 	public function geoip_country_id_by_addr_v6( $addr ) {
+		if ( ! defined( 'AF_INET6' ) ) {
+			$this->log( 'GEOIP (geoip_country_id_by_addr_v6): PHP was compiled with --disable-ipv6 option' );
+			return false;
+		}
 		$ipnum = inet_pton( $addr );
 		return $this->_geoip_seek_country_v6( $ipnum ) - self::GEOIP_COUNTRY_BEGIN;
 	}
@@ -1606,7 +1661,7 @@ class WC_Geo_IP {
 	 */
 	public function geoip_country_code_by_addr_v6( $addr ) {
 		$country_id = $this->geoip_country_id_by_addr_v6( $addr );
-		if ( $country_id !== false && isset( $this->GEOIP_COUNTRY_CODES[ $country_id ] ) ) {
+		if ( false !== $country_id && isset( $this->GEOIP_COUNTRY_CODES[ $country_id ] ) ) {
 			return $this->GEOIP_COUNTRY_CODES[ $country_id ];
 		}
 
@@ -1620,14 +1675,14 @@ class WC_Geo_IP {
 	 * @return string
 	 */
 	public function geoip_country_code_by_addr( $addr ) {
-		if ( $this->databaseType == self::GEOIP_CITY_EDITION_REV1 ) {
+		if ( self::GEOIP_CITY_EDITION_REV1 == $this->databaseType ) {
 			$record = $this->geoip_record_by_addr( $addr );
-			if ( $record !== false ) {
+			if ( false !== $record ) {
 				return $record->country_code;
 			}
 		} else {
 			$country_id = $this->geoip_country_id_by_addr( $addr );
-			if ( $country_id !== false && isset( $this->GEOIP_COUNTRY_CODES[ $country_id ] ) ) {
+			if ( false !== $country_id && isset( $this->GEOIP_COUNTRY_CODES[ $country_id ] ) ) {
 				return $this->GEOIP_COUNTRY_CODES[ $country_id ];
 			}
 		}
@@ -1667,16 +1722,91 @@ class WC_Geo_IP {
  * Geo IP Record class.
  */
 class WC_Geo_IP_Record {
+
+	/**
+	 * Country code.
+	 *
+	 * @var string
+	 */
 	public $country_code;
+
+	/**
+	 * 3 letters country code.
+	 *
+	 * @var string
+	 */
 	public $country_code3;
+
+	/**
+	 * Country name.
+	 *
+	 * @var string
+	 */
 	public $country_name;
+
+	/**
+	 * Region.
+	 *
+	 * @var string
+	 */
 	public $region;
+
+	/**
+	 * City.
+	 *
+	 * @var string
+	 */
 	public $city;
+
+	/**
+	 * Postal code.
+	 *
+	 * @var string
+	 */
 	public $postal_code;
+
+	/**
+	 * Latitude
+	 *
+	 * @var int
+	 */
 	public $latitude;
+
+	/**
+	 * Longitude.
+	 *
+	 * @var int
+	 */
 	public $longitude;
+
+	/**
+	 * Area code.
+	 *
+	 * @var int
+	 */
 	public $area_code;
-	public $dma_code; // metro and dma code are the same. use metro_code
+
+	/**
+	 * DMA Code.
+	 *
+	 * Metro and DMA code are the same.
+	 * Use metro code instead.
+	 *
+	 * @var float
+	 */
+	public $dma_code;
+
+	/**
+	 * Metro code.
+	 *
+	 * @var float
+	 */
 	public $metro_code;
+
+	/**
+	 * Continent code.
+	 *
+	 * @var string
+	 */
 	public $continent_code;
 }
diff --git a/includes/class-wc-geolocation.php b/includes/class-wc-geolocation.php
index 8c708426491..062799815ff 100644
--- a/includes/class-wc-geolocation.php
+++ b/includes/class-wc-geolocation.php
@@ -32,14 +32,14 @@ class WC_Geolocation {
 		'ipecho'            => 'http://ipecho.net/plain',
 		'ident'             => 'http://ident.me',
 		'whatismyipaddress' => 'http://bot.whatismyipaddress.com',
-		'ip.appspot'        => 'http://ip.appspot.com'
+		'ip.appspot'        => 'http://ip.appspot.com',
 	);
 
 	/** @var array API endpoints for geolocating an IP address */
 	private static $geoip_apis = array(
-		'freegeoip'        => 'https://freegeoip.net/json/%s',
-		'telize'           => 'http://www.telize.com/geoip/%s',
-		'geoip-api.meteor' => 'http://geoip-api.meteor.com/lookup/%s'
+		'freegeoip'  => 'https://freegeoip.net/json/%s',
+		'ipinfo.io'  => 'https://ipinfo.io/%s/json',
+		'ip-api.com' => 'http://ip-api.com/json/%s',
 	);
 
 	/**
@@ -84,7 +84,9 @@ class WC_Geolocation {
 	}
 
 	/**
-	 * Get user IP Address using a service.
+	 * Get user IP Address using an external service.
+	 * This is used mainly as a fallback for users on localhost where
+	 * get_ip_address() will be a local IP and non-geolocatable.
 	 * @return string
 	 */
 	public static function get_external_ip_address() {
@@ -116,37 +118,51 @@ class WC_Geolocation {
 	/**
 	 * Geolocate an IP address.
 	 * @param  string $ip_address
-	 * @param  bool   $fallback
+	 * @param  bool   $fallback If true, fallbacks to alternative IP detection (can be slower).
+	 * @param  bool   $api_fallback If true, uses geolocation APIs if the database file doesn't exist (can be slower).
 	 * @return array
 	 */
-	public static function geolocate_ip( $ip_address = '', $fallback = true ) {
-		// If GEOIP is enabled in CloudFlare, we can use that (Settings -> CloudFlare Settings -> Settings Overview)
-		if ( ! empty( $_SERVER['HTTP_CF_IPCOUNTRY'] ) ) {
-			$country_code = sanitize_text_field( strtoupper( $_SERVER['HTTP_CF_IPCOUNTRY'] ) );
-		} else {
-			$ip_address = $ip_address ? $ip_address : self::get_ip_address();
+	public static function geolocate_ip( $ip_address = '', $fallback = true, $api_fallback = true ) {
+		// Filter to allow custom geolocation of the IP address.
+		$country_code = apply_filters( 'woocommerce_geolocate_ip', false, $ip_address, $fallback, $api_fallback );
 
-			if ( self::is_IPv6( $ip_address ) ) {
-				$database = self::get_local_database_path( 'v6' );
+		if ( false === $country_code ) {
+			// If GEOIP is enabled in CloudFlare, we can use that (Settings -> CloudFlare Settings -> Settings Overview)
+			if ( ! empty( $_SERVER['HTTP_CF_IPCOUNTRY'] ) ) {
+				$country_code = sanitize_text_field( strtoupper( $_SERVER['HTTP_CF_IPCOUNTRY'] ) );
+			// WP.com VIP has a variable available.
+			} elseif ( ! empty( $_SERVER['GEOIP_COUNTRY_CODE'] ) ) {
+				$country_code = sanitize_text_field( strtoupper( $_SERVER['GEOIP_COUNTRY_CODE'] ) );
+			// VIP Go has a variable available also.
+			} elseif ( ! empty( $_SERVER['HTTP_X_COUNTRY_CODE'] ) ) {
+				$country_code = sanitize_text_field( strtoupper( $_SERVER['HTTP_X_COUNTRY_CODE'] ) );
 			} else {
-				$database = self::get_local_database_path();
-			}
+				$ip_address = $ip_address ? $ip_address : self::get_ip_address();
 
-			if ( file_exists( $database ) ) {
-				$country_code = self::geolocate_via_db( $ip_address );
-			} else {
-				$country_code = self::geolocate_via_api( $ip_address );
-			}
+				if ( self::is_IPv6( $ip_address ) ) {
+					$database = self::get_local_database_path( 'v6' );
+				} else {
+					$database = self::get_local_database_path();
+				}
 
-			if ( ! $country_code && $fallback ) {
-				// May be a local environment - find external IP
-				return self::geolocate_ip( self::get_external_ip_address(), false );
+				if ( file_exists( $database ) ) {
+					$country_code = self::geolocate_via_db( $ip_address );
+				} elseif ( $api_fallback ) {
+					$country_code = self::geolocate_via_api( $ip_address );
+				} else {
+					$country_code = '';
+				}
+
+				if ( ! $country_code && $fallback ) {
+					// May be a local environment - find external IP
+					return self::geolocate_ip( self::get_external_ip_address(), false, $api_fallback );
+				}
 			}
 		}
 
 		return array(
 			'country' => $country_code,
-			'state'   => ''
+			'state'   => '',
 		);
 	}
 
@@ -155,21 +171,21 @@ class WC_Geolocation {
 	 * @param  string $version
 	 * @return string
 	 */
-	private static function get_local_database_path( $version = 'v4' ) {
+	public static function get_local_database_path( $version = 'v4' ) {
 		$version    = ( 'v4' == $version ) ? '' : 'v6';
 		$upload_dir = wp_upload_dir();
 
-		return $upload_dir['basedir'] . '/GeoIP' . $version . '.dat';
+		return apply_filters( 'woocommerce_geolocation_local_database_path', $upload_dir['basedir'] . '/GeoIP' . $version . '.dat', $version );
 	}
 
 	/**
 	 * Update geoip database. Adapted from https://wordpress.org/plugins/geoip-detect/.
 	 */
 	public static function update_database() {
-		$logger = new WC_Logger();
+		$logger = wc_get_logger();
 
 		if ( ! is_callable( 'gzopen' ) ) {
-			$logger->add( 'geolocation', 'Server does not support gzopen' );
+			$logger->notice( 'Server does not support gzopen', array( 'source' => 'geolocation' ) );
 			return;
 		}
 
@@ -177,7 +193,7 @@ class WC_Geolocation {
 
 		$tmp_databases = array(
 			'v4' => download_url( self::GEOLITE_DB ),
-			'v6' => download_url( self::GEOLITE_IPV6_DB )
+			'v6' => download_url( self::GEOLITE_IPV6_DB ),
 		);
 
 		foreach ( $tmp_databases as $tmp_database_version => $tmp_database_path ) {
@@ -192,11 +208,14 @@ class WC_Geolocation {
 					gzclose( $gzhandle );
 					fclose( $handle );
 				} else {
-					$logger->add( 'geolocation', 'Unable to open database file' );
+					$logger->notice( 'Unable to open database file', array( 'source' => 'geolocation' ) );
 				}
 				@unlink( $tmp_database_path );
 			} else {
-				$logger->add( 'geolocation', 'Unable to download GeoIP Database: ' . $tmp_database_path->get_error_message() );
+				$logger->notice(
+					'Unable to download GeoIP Database: ' . $tmp_database_path->get_error_message(),
+					array( 'source' => 'geolocation' )
+				);
 			}
 		}
 	}
@@ -207,8 +226,8 @@ class WC_Geolocation {
 	 * @return string
 	 */
 	private static function geolocate_via_db( $ip_address ) {
-		if ( ! class_exists( 'WC_Geo_IP' ) ) {
-			include_once( 'class-wc-geo-ip.php' );
+		if ( ! class_exists( 'WC_Geo_IP', false ) ) {
+			include_once( WC_ABSPATH . 'includes/class-wc-geo-ip.php' );
 		}
 
 		$gi = new WC_Geo_IP();
@@ -247,12 +266,15 @@ class WC_Geolocation {
 
 				if ( ! is_wp_error( $response ) && $response['body'] ) {
 					switch ( $service_name ) {
-						case 'geoip-api.meteor' :
+						case 'ipinfo.io' :
 							$data         = json_decode( $response['body'] );
 							$country_code = isset( $data->country ) ? $data->country : '';
 						break;
+						case 'ip-api.com' :
+							$data         = json_decode( $response['body'] );
+							$country_code = isset( $data->countryCode ) ? $data->countryCode : '';
+						break;
 						case 'freegeoip' :
-						case 'telize' :
 							$data         = json_decode( $response['body'] );
 							$country_code = isset( $data->country_code ) ? $data->country_code : '';
 						break;
diff --git a/includes/class-wc-https.php b/includes/class-wc-https.php
index 9c721febdfd..a1aacc1dbe0 100644
--- a/includes/class-wc-https.php
+++ b/includes/class-wc-https.php
@@ -19,7 +19,7 @@ class WC_HTTPS {
 	 * Hook in our HTTPS functions if we're on the frontend. This will ensure any links output to a page (when viewing via HTTPS) are also served over HTTPS.
 	 */
 	public static function init() {
-		if ( 'yes' == get_option( 'woocommerce_force_ssl_checkout' ) && ! is_admin() ) {
+		if ( 'yes' === get_option( 'woocommerce_force_ssl_checkout' ) && ! is_admin() ) {
 			// HTTPS urls with SSL on
 			$filters = array(
 				'post_thumbnail_html',
@@ -31,7 +31,7 @@ class WC_HTTPS {
 				'style_loader_src',
 				'template_directory_uri',
 				'stylesheet_directory_uri',
-				'site_url'
+				'site_url',
 			);
 
 			foreach ( $filters as $filter ) {
@@ -45,10 +45,11 @@ class WC_HTTPS {
 				add_action( 'template_redirect', array( __CLASS__, 'unforce_https_template_redirect' ) );
 			}
 		}
+		add_action( 'http_api_curl', array( __CLASS__, 'http_api_curl' ), 10, 3 );
 	}
 
 	/**
-	 * force_https_url function.
+	 * Force https for urls.
 	 *
 	 * @param mixed $content
 	 * @return string
@@ -72,7 +73,7 @@ class WC_HTTPS {
 	public static function force_https_page_link( $link, $page_id ) {
 		if ( in_array( $page_id, array( get_option( 'woocommerce_checkout_page_id' ), get_option( 'woocommerce_myaccount_page_id' ) ) ) ) {
 			$link = str_replace( 'http:', 'https:', $link );
-		} elseif ( 'yes' == get_option( 'woocommerce_unforce_ssl_checkout' ) ) {
+		} elseif ( 'yes' === get_option( 'woocommerce_unforce_ssl_checkout' ) && ! wc_site_is_https() ) {
 			$link = str_replace( 'https:', 'http:', $link );
 		}
 		return $link;
@@ -102,7 +103,7 @@ class WC_HTTPS {
 			return;
 		}
 
-		if ( is_ssl() && $_SERVER['REQUEST_URI'] && ! is_checkout() && ! is_ajax() && ! is_account_page() && apply_filters( 'woocommerce_unforce_ssl_checkout', true ) ) {
+		if ( ! wc_site_is_https() && is_ssl() && $_SERVER['REQUEST_URI'] && ! is_checkout() && ! is_ajax() && ! is_account_page() && apply_filters( 'woocommerce_unforce_ssl_checkout', true ) ) {
 
 			if ( 0 === strpos( $_SERVER['REQUEST_URI'], 'http' ) ) {
 				wp_safe_redirect( preg_replace( '|^https://|', 'http://', $_SERVER['REQUEST_URI'] ) );
@@ -113,6 +114,18 @@ class WC_HTTPS {
 			}
 		}
 	}
+
+	/**
+	 * Force posts to PayPal to use TLS v1.2. See:
+	 * 		https://core.trac.wordpress.org/ticket/36320
+	 * 		https://core.trac.wordpress.org/ticket/34924#comment:13
+	 * 		https://www.paypal-knowledge.com/infocenter/index?page=content&widgetview=true&id=FAQ1914&viewlocale=en_US
+	 */
+	public static function http_api_curl( $handle, $r, $url ) {
+		if ( strstr( $url, 'https://' ) && ( strstr( $url, '.paypal.com/nvp' ) || strstr( $url, '.paypal.com/cgi-bin/webscr' ) ) ) {
+			curl_setopt( $handle, CURLOPT_SSLVERSION, 6 );
+		}
+	}
 }
 
 WC_HTTPS::init();
diff --git a/includes/class-wc-install.php b/includes/class-wc-install.php
index ce2966a758c..2a0bed60b79 100644
--- a/includes/class-wc-install.php
+++ b/includes/class-wc-install.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * Installation related functions and actions
+ * Installation related functions and actions.
  *
  * @author   WooThemes
  * @category Admin
  * @package  WooCommerce/Classes
- * @version  2.4.1
+ * @version  3.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -17,61 +17,123 @@ if ( ! defined( 'ABSPATH' ) ) {
  */
 class WC_Install {
 
-	/** @var array DB updates that need to be run */
+	/** @var array DB updates and callbacks that need to be run per version */
 	private static $db_updates = array(
-		'2.0.0' => 'updates/woocommerce-update-2.0.php',
-		'2.0.9' => 'updates/woocommerce-update-2.0.9.php',
-		'2.1.0' => 'updates/woocommerce-update-2.1.php',
-		'2.2.0' => 'updates/woocommerce-update-2.2.php',
-		'2.3.0' => 'updates/woocommerce-update-2.3.php',
-		'2.4.0' => 'updates/woocommerce-update-2.4.php',
-		'2.4.1' => 'updates/woocommerce-update-2.4.1.php',
-		'2.5.0' => 'updates/woocommerce-update-2.5.php',
+		'2.0.0' => array(
+			'wc_update_200_file_paths',
+			'wc_update_200_permalinks',
+			'wc_update_200_subcat_display',
+			'wc_update_200_taxrates',
+			'wc_update_200_line_items',
+			'wc_update_200_images',
+			'wc_update_200_db_version',
+		),
+		'2.0.9' => array(
+			'wc_update_209_brazillian_state',
+			'wc_update_209_db_version',
+		),
+		'2.1.0' => array(
+			'wc_update_210_remove_pages',
+			'wc_update_210_file_paths',
+			'wc_update_210_db_version',
+		),
+		'2.2.0' => array(
+			'wc_update_220_shipping',
+			'wc_update_220_order_status',
+			'wc_update_220_variations',
+			'wc_update_220_attributes',
+			'wc_update_220_db_version',
+		),
+		'2.3.0' => array(
+			'wc_update_230_options',
+			'wc_update_230_db_version',
+		),
+		'2.4.0' => array(
+			'wc_update_240_options',
+			'wc_update_240_shipping_methods',
+			'wc_update_240_api_keys',
+			'wc_update_240_webhooks',
+			'wc_update_240_refunds',
+			'wc_update_240_db_version',
+		),
+		'2.4.1' => array(
+			'wc_update_241_variations',
+			'wc_update_241_db_version',
+		),
+		'2.5.0' => array(
+			'wc_update_250_currency',
+			'wc_update_250_db_version',
+		),
+		'2.6.0' => array(
+			'wc_update_260_options',
+			'wc_update_260_termmeta',
+			'wc_update_260_zones',
+			'wc_update_260_zone_methods',
+			'wc_update_260_refunds',
+			'wc_update_260_db_version',
+		),
+		'3.0.0' => array(
+			'wc_update_300_webhooks',
+			'wc_update_300_grouped_products',
+			'wc_update_300_settings',
+			'wc_update_300_product_visibility',
+			'wc_update_300_db_version',
+		),
 	);
 
+	/** @var object Background update class */
+	private static $background_updater;
+
 	/**
 	 * Hook in tabs.
 	 */
 	public static function init() {
-		add_action( 'admin_init', array( __CLASS__, 'check_version' ), 5 );
+		add_action( 'init', array( __CLASS__, 'check_version' ), 5 );
+		add_action( 'init', array( __CLASS__, 'init_background_updater' ), 5 );
 		add_action( 'admin_init', array( __CLASS__, 'install_actions' ) );
 		add_action( 'in_plugin_update_message-woocommerce/woocommerce.php', array( __CLASS__, 'in_plugin_update_message' ) );
 		add_filter( 'plugin_action_links_' . WC_PLUGIN_BASENAME, array( __CLASS__, 'plugin_action_links' ) );
 		add_filter( 'plugin_row_meta', array( __CLASS__, 'plugin_row_meta' ), 10, 2 );
 		add_filter( 'wpmu_drop_tables', array( __CLASS__, 'wpmu_drop_tables' ) );
 		add_filter( 'cron_schedules', array( __CLASS__, 'cron_schedules' ) );
+		add_action( 'woocommerce_plugin_background_installer', array( __CLASS__, 'background_installer' ), 10, 2 );
 	}
 
 	/**
-	 * check_version function.
+	 * Init background updates
+	 */
+	public static function init_background_updater() {
+		include_once( dirname( __FILE__ ) . '/class-wc-background-updater.php' );
+		self::$background_updater = new WC_Background_Updater();
+	}
+
+	/**
+	 * Check WooCommerce version and run the updater is required.
+	 *
+	 * This check is done on all requests and runs if the versions do not match.
 	 */
 	public static function check_version() {
-		if ( ! defined( 'IFRAME_REQUEST' ) && ( get_option( 'woocommerce_version' ) != WC()->version ) ) {
+		if ( ! defined( 'IFRAME_REQUEST' ) && get_option( 'woocommerce_version' ) !== WC()->version ) {
 			self::install();
 			do_action( 'woocommerce_updated' );
 		}
 	}
 
 	/**
-	 * Install actions when a update button is clicked.
+	 * Install actions when a update button is clicked within the admin area.
+	 *
+	 * This function is hooked into admin_init to affect admin only.
 	 */
 	public static function install_actions() {
 		if ( ! empty( $_GET['do_update_woocommerce'] ) ) {
 			self::update();
-			WC_Admin_Notices::remove_notice( 'update' );
-			add_action( 'admin_notices', array( __CLASS__, 'updated_notice' ) );
+			WC_Admin_Notices::add_notice( 'update' );
+		}
+		if ( ! empty( $_GET['force_update_woocommerce'] ) ) {
+			do_action( 'wp_wc_updater_cron' );
+			wp_safe_redirect( admin_url( 'admin.php?page=wc-settings' ) );
+			exit;
 		}
-	}
-
-	/**
-	 * Show notice stating update was successful.
-	 */
-	public static function updated_notice() {
-		?>
-		<div id="message" class="updated woocommerce-message wc-connect">
-			<p><?php _e( 'WooCommerce data update complete. Thank you for updating to the latest version!', 'woocommerce' ); ?></p>
-		</div>
-		<?php
 	}
 
 	/**
@@ -80,12 +142,16 @@ class WC_Install {
 	public static function install() {
 		global $wpdb;
 
+		if ( ! is_blog_installed() ) {
+			return;
+		}
+
 		if ( ! defined( 'WC_INSTALLING' ) ) {
 			define( 'WC_INSTALLING', true );
 		}
 
 		// Ensure needed classes are loaded
-		include_once( 'admin/class-wc-admin-notices.php' );
+		include_once( dirname( __FILE__ ) . '/admin/class-wc-admin-notices.php' );
 
 		self::create_options();
 		self::create_tables();
@@ -108,7 +174,6 @@ class WC_Install {
 		// Queue upgrades/setup wizard
 		$current_wc_version    = get_option( 'woocommerce_version', null );
 		$current_db_version    = get_option( 'woocommerce_db_version', null );
-		$major_wc_version      = substr( WC()->version, 0, strrpos( WC()->version, '.' ) );
 
 		WC_Admin_Notices::remove_all_notices();
 
@@ -131,12 +196,12 @@ class WC_Install {
 		self::update_wc_version();
 
 		// Flush rules after install
-		flush_rewrite_rules();
+		do_action( 'woocommerce_flush_rewrite_rules' );
 		delete_transient( 'wc_attribute_taxonomies' );
 
 		/*
-		 * Deletes all expired transients. The multi-table delete syntax is used.
-		 * to delete the transient record from table a, and the corresponding.
+		 * Deletes all expired transients. The multi-table delete syntax is used
+		 * to delete the transient record from table a, and the corresponding
 		 * transient_timeout record from table b.
 		 *
 		 * Based on code inside core's upgrade_network() function.
@@ -161,27 +226,48 @@ class WC_Install {
 	}
 
 	/**
-	 * Update DB version to current.
+	 * Get list of DB update callbacks.
+	 *
+	 * @since  3.0.0
+	 * @return array
 	 */
-	private static function update_db_version( $version = null ) {
-		delete_option( 'woocommerce_db_version' );
-		add_option( 'woocommerce_db_version', is_null( $version ) ? WC()->version : $version );
+	public static function get_db_update_callbacks() {
+		return self::$db_updates;
 	}
 
 	/**
-	 * Handle updates.
+	 * Push all needed DB updates to the queue for processing.
 	 */
 	private static function update() {
 		$current_db_version = get_option( 'woocommerce_db_version' );
+		$logger             = wc_get_logger();
+		$update_queued      = false;
 
-		foreach ( self::$db_updates as $version => $updater ) {
+		foreach ( self::get_db_update_callbacks() as $version => $update_callbacks ) {
 			if ( version_compare( $current_db_version, $version, '<' ) ) {
-				include( $updater );
-				self::update_db_version( $version );
+				foreach ( $update_callbacks as $update_callback ) {
+					$logger->info(
+						sprintf( 'Queuing %s - %s', $version, $update_callback ),
+						array( 'source' => 'wc_db_updates' )
+					);
+					self::$background_updater->push_to_queue( $update_callback );
+					$update_queued = true;
+				}
 			}
 		}
 
-		self::update_db_version();
+		if ( $update_queued ) {
+			self::$background_updater->save()->dispatch();
+		}
+	}
+
+	/**
+	 * Update DB version to current.
+	 * @param string $version
+	 */
+	public static function update_db_version( $version = null ) {
+		delete_option( 'woocommerce_db_version' );
+		add_option( 'woocommerce_db_version', is_null( $version ) ? WC()->version : $version );
 	}
 
 	/**
@@ -192,7 +278,7 @@ class WC_Install {
 	public static function cron_schedules( $schedules ) {
 		$schedules['monthly'] = array(
 			'interval' => 2635200,
-			'display'  => __( 'Monthly', 'woocommerce' )
+			'display'  => __( 'Monthly', 'woocommerce' ),
 		);
 		return $schedules;
 	}
@@ -207,13 +293,13 @@ class WC_Install {
 		wp_clear_scheduled_hook( 'woocommerce_geoip_updater' );
 		wp_clear_scheduled_hook( 'woocommerce_tracker_send_event' );
 
-		$ve = get_option( 'gmt_offset' ) > 0 ? '+' : '-';
+		$ve = get_option( 'gmt_offset' ) > 0 ? '-' : '+';
 
 		wp_schedule_event( strtotime( '00:00 tomorrow ' . $ve . get_option( 'gmt_offset' ) . ' HOURS' ), 'daily', 'woocommerce_scheduled_sales' );
 
 		$held_duration = get_option( 'woocommerce_hold_stock_minutes', '60' );
 
-		if ( $held_duration != '' ) {
+		if ( '' != $held_duration ) {
 			wp_schedule_single_event( time() + ( absint( $held_duration ) * 60 ), 'woocommerce_cancel_unpaid_orders' );
 		}
 
@@ -223,37 +309,39 @@ class WC_Install {
 	}
 
 	/**
-	 * Create pages that the plugin relies on, storing page id's in variables.
+	 * Create pages that the plugin relies on, storing page IDs in variables.
 	 */
 	public static function create_pages() {
-		include_once( 'admin/wc-admin-functions.php' );
+		include_once( dirname( __FILE__ ) . '/admin/wc-admin-functions.php' );
 
 		$pages = apply_filters( 'woocommerce_create_pages', array(
 			'shop' => array(
 				'name'    => _x( 'shop', 'Page slug', 'woocommerce' ),
 				'title'   => _x( 'Shop', 'Page title', 'woocommerce' ),
-				'content' => ''
+				'content' => '',
 			),
 			'cart' => array(
 				'name'    => _x( 'cart', 'Page slug', 'woocommerce' ),
 				'title'   => _x( 'Cart', 'Page title', 'woocommerce' ),
-				'content' => '[' . apply_filters( 'woocommerce_cart_shortcode_tag', 'woocommerce_cart' ) . ']'
+				'content' => '[' . apply_filters( 'woocommerce_cart_shortcode_tag', 'woocommerce_cart' ) . ']',
 			),
 			'checkout' => array(
 				'name'    => _x( 'checkout', 'Page slug', 'woocommerce' ),
 				'title'   => _x( 'Checkout', 'Page title', 'woocommerce' ),
-				'content' => '[' . apply_filters( 'woocommerce_checkout_shortcode_tag', 'woocommerce_checkout' ) . ']'
+				'content' => '[' . apply_filters( 'woocommerce_checkout_shortcode_tag', 'woocommerce_checkout' ) . ']',
 			),
 			'myaccount' => array(
 				'name'    => _x( 'my-account', 'Page slug', 'woocommerce' ),
-				'title'   => _x( 'My Account', 'Page title', 'woocommerce' ),
-				'content' => '[' . apply_filters( 'woocommerce_my_account_shortcode_tag', 'woocommerce_my_account' ) . ']'
-			)
+				'title'   => _x( 'My account', 'Page title', 'woocommerce' ),
+				'content' => '[' . apply_filters( 'woocommerce_my_account_shortcode_tag', 'woocommerce_my_account' ) . ']',
+			),
 		) );
 
 		foreach ( $pages as $key => $page ) {
 			wc_create_page( esc_sql( $page['name'] ), 'woocommerce_' . $key . '_page_id', $page['title'], $page['content'], ! empty( $page['parent'] ) ? wc_get_page_id( $page['parent'] ) : '' );
 		}
+
+		delete_transient( 'woocommerce_cache_excluded_uris' );
 	}
 
 	/**
@@ -263,7 +351,7 @@ class WC_Install {
 	 */
 	private static function create_options() {
 		// Include settings so that we can run through defaults
-		include_once( 'admin/class-wc-admin-settings.php' );
+		include_once( dirname( __FILE__ ) . '/admin/class-wc-admin-settings.php' );
 
 		$settings = WC_Admin_Settings::get_settings_pages();
 
@@ -287,19 +375,30 @@ class WC_Install {
 	/**
 	 * Add the default terms for WC taxonomies - product types and order statuses. Modify this at your own risk.
 	 */
-	private static function create_terms() {
+	public static function create_terms() {
 		$taxonomies = array(
 			'product_type' => array(
 				'simple',
 				'grouped',
 				'variable',
-				'external'
-			)
+				'external',
+			),
+			'product_visibility' => array(
+				'exclude-from-search',
+				'exclude-from-catalog',
+				'featured',
+				'outofstock',
+				'rated-1',
+				'rated-2',
+				'rated-3',
+				'rated-4',
+				'rated-5',
+			),
 		);
 
 		foreach ( $taxonomies as $taxonomy => $terms ) {
 			foreach ( $terms as $term ) {
-				if ( ! get_term_by( 'slug', sanitize_title( $term ), $taxonomy ) ) {
+				if ( ! get_term_by( 'name', $term, $taxonomy ) ) {
 					wp_insert_term( $term, $taxonomy );
 				}
 			}
@@ -327,25 +426,38 @@ class WC_Install {
 		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
 		/**
-		 * Before updating with DBDELTA, remove any primary keys which could be modified due to schema updates.
+		 * Before updating with DBDELTA, remove any primary keys which could be
+		 * modified due to schema updates.
 		 */
 		if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}woocommerce_downloadable_product_permissions';" ) ) {
 			if ( ! $wpdb->get_var( "SHOW COLUMNS FROM `{$wpdb->prefix}woocommerce_downloadable_product_permissions` LIKE 'permission_id';" ) ) {
-				$wpdb->query( "ALTER TABLE {$wpdb->prefix}woocommerce_downloadable_product_permissions DROP PRIMARY KEY, ADD `permission_id` bigint(20) NOT NULL PRIMARY KEY AUTO_INCREMENT;" );
-			}
-		}
-
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}woocommerce_tax_rate_locations';" ) ) {
-			if ( $wpdb->get_var( "SHOW INDEX FROM `{$wpdb->prefix}woocommerce_tax_rate_locations` WHERE Key_name LIKE 'location_type_code';" ) ) {
-				$wpdb->query( "DROP INDEX `location_type_code` ON {$wpdb->prefix}woocommerce_tax_rate_locations;" );
+				$wpdb->query( "ALTER TABLE {$wpdb->prefix}woocommerce_downloadable_product_permissions DROP PRIMARY KEY, ADD `permission_id` BIGINT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT;" );
 			}
 		}
 
 		dbDelta( self::get_schema() );
+
+		$index_exists = $wpdb->get_row( "SHOW INDEX FROM {$wpdb->comments} WHERE column_name = 'comment_type' and key_name = 'woo_idx_comment_type'" );
+
+		if ( is_null( $index_exists ) ) {
+			// Add an index to the field comment_type to improve the response time of the query
+			// used by WC_Comments::wp_count_comments() to get the number of comments by type.
+			$wpdb->query( "ALTER TABLE {$wpdb->comments} ADD INDEX woo_idx_comment_type (comment_type)" );
+		}
 	}
 
 	/**
 	 * Get Table schema.
+	 *
+	 * https://github.com/woocommerce/woocommerce/wiki/Database-Description/
+	 *
+	 * A note on indexes; Indexes have a maximum size of 767 bytes. Historically, we haven't need to be concerned about that.
+	 * As of WordPress 4.2, however, we moved to utf8mb4, which uses 4 bytes per character. This means that an index which
+	 * used to have room for floor(767/3) = 255 characters, now only has room for floor(767/4) = 191 characters.
+	 *
+	 * Changing indexes may cause duplicate index notices in logs due to https://core.trac.wordpress.org/ticket/34870 but dropping
+	 * indexes first causes too much load on some servers/larger DB.
+	 *
 	 * @return string
 	 */
 	private static function get_schema() {
@@ -354,27 +466,22 @@ class WC_Install {
 		$collate = '';
 
 		if ( $wpdb->has_cap( 'collation' ) ) {
-			if ( ! empty( $wpdb->charset ) ) {
-				$collate .= "DEFAULT CHARACTER SET $wpdb->charset";
-			}
-			if ( ! empty( $wpdb->collate ) ) {
-				$collate .= " COLLATE $wpdb->collate";
-			}
+			$collate = $wpdb->get_charset_collate();
 		}
 
-		return "
+		$tables = "
 CREATE TABLE {$wpdb->prefix}woocommerce_sessions (
-  session_id bigint(20) NOT NULL AUTO_INCREMENT,
+  session_id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
   session_key char(32) NOT NULL,
   session_value longtext NOT NULL,
-  session_expiry bigint(20) NOT NULL,
-  UNIQUE KEY session_id (session_id),
-  PRIMARY KEY  (session_key)
+  session_expiry BIGINT UNSIGNED NOT NULL,
+  PRIMARY KEY  (session_key),
+  UNIQUE KEY session_id (session_id)
 ) $collate;
 CREATE TABLE {$wpdb->prefix}woocommerce_api_keys (
-  key_id bigint(20) NOT NULL auto_increment,
-  user_id bigint(20) NOT NULL,
-  description longtext NULL,
+  key_id BIGINT UNSIGNED NOT NULL auto_increment,
+  user_id BIGINT UNSIGNED NOT NULL,
+  description varchar(200) NULL,
   permissions varchar(10) NOT NULL,
   consumer_key char(64) NOT NULL,
   consumer_secret char(43) NOT NULL,
@@ -386,85 +493,146 @@ CREATE TABLE {$wpdb->prefix}woocommerce_api_keys (
   KEY consumer_secret (consumer_secret)
 ) $collate;
 CREATE TABLE {$wpdb->prefix}woocommerce_attribute_taxonomies (
-  attribute_id bigint(20) NOT NULL auto_increment,
+  attribute_id BIGINT UNSIGNED NOT NULL auto_increment,
   attribute_name varchar(200) NOT NULL,
-  attribute_label longtext NULL,
-  attribute_type varchar(200) NOT NULL,
-  attribute_orderby varchar(200) NOT NULL,
+  attribute_label varchar(200) NULL,
+  attribute_type varchar(20) NOT NULL,
+  attribute_orderby varchar(20) NOT NULL,
   attribute_public int(1) NOT NULL DEFAULT 1,
   PRIMARY KEY  (attribute_id),
-  KEY attribute_name (attribute_name)
-) $collate;
-CREATE TABLE {$wpdb->prefix}woocommerce_termmeta (
-  meta_id bigint(20) NOT NULL auto_increment,
-  woocommerce_term_id bigint(20) NOT NULL,
-  meta_key varchar(255) NULL,
-  meta_value longtext NULL,
-  PRIMARY KEY  (meta_id),
-  KEY woocommerce_term_id (woocommerce_term_id),
-  KEY meta_key (meta_key)
+  KEY attribute_name (attribute_name(20))
 ) $collate;
 CREATE TABLE {$wpdb->prefix}woocommerce_downloadable_product_permissions (
-  permission_id bigint(20) NOT NULL auto_increment,
+  permission_id BIGINT UNSIGNED NOT NULL auto_increment,
   download_id varchar(32) NOT NULL,
-  product_id bigint(20) NOT NULL,
-  order_id bigint(20) NOT NULL DEFAULT 0,
+  product_id BIGINT UNSIGNED NOT NULL,
+  order_id BIGINT UNSIGNED NOT NULL DEFAULT 0,
   order_key varchar(200) NOT NULL,
   user_email varchar(200) NOT NULL,
-  user_id bigint(20) NULL,
+  user_id BIGINT UNSIGNED NULL,
   downloads_remaining varchar(9) NULL,
   access_granted datetime NOT NULL default '0000-00-00 00:00:00',
   access_expires datetime NULL default null,
-  download_count bigint(20) NOT NULL DEFAULT 0,
+  download_count BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY  (permission_id),
-  KEY download_order_key_product (product_id,order_id,order_key,download_id),
+  KEY download_order_key_product (product_id,order_id,order_key(16),download_id),
   KEY download_order_product (download_id,order_id,product_id)
 ) $collate;
 CREATE TABLE {$wpdb->prefix}woocommerce_order_items (
-  order_item_id bigint(20) NOT NULL auto_increment,
-  order_item_name longtext NOT NULL,
+  order_item_id BIGINT UNSIGNED NOT NULL auto_increment,
+  order_item_name TEXT NOT NULL,
   order_item_type varchar(200) NOT NULL DEFAULT '',
-  order_id bigint(20) NOT NULL,
+  order_id BIGINT UNSIGNED NOT NULL,
   PRIMARY KEY  (order_item_id),
   KEY order_id (order_id)
 ) $collate;
 CREATE TABLE {$wpdb->prefix}woocommerce_order_itemmeta (
-  meta_id bigint(20) NOT NULL auto_increment,
-  order_item_id bigint(20) NOT NULL,
-  meta_key varchar(255) NULL,
+  meta_id BIGINT UNSIGNED NOT NULL auto_increment,
+  order_item_id BIGINT UNSIGNED NOT NULL,
+  meta_key varchar(255) default NULL,
   meta_value longtext NULL,
   PRIMARY KEY  (meta_id),
   KEY order_item_id (order_item_id),
-  KEY meta_key (meta_key)
+  KEY meta_key (meta_key(32))
 ) $collate;
 CREATE TABLE {$wpdb->prefix}woocommerce_tax_rates (
-  tax_rate_id bigint(20) NOT NULL auto_increment,
-  tax_rate_country varchar(200) NOT NULL DEFAULT '',
+  tax_rate_id BIGINT UNSIGNED NOT NULL auto_increment,
+  tax_rate_country varchar(2) NOT NULL DEFAULT '',
   tax_rate_state varchar(200) NOT NULL DEFAULT '',
-  tax_rate varchar(200) NOT NULL DEFAULT '',
+  tax_rate varchar(8) NOT NULL DEFAULT '',
   tax_rate_name varchar(200) NOT NULL DEFAULT '',
-  tax_rate_priority bigint(20) NOT NULL,
+  tax_rate_priority BIGINT UNSIGNED NOT NULL,
   tax_rate_compound int(1) NOT NULL DEFAULT 0,
   tax_rate_shipping int(1) NOT NULL DEFAULT 1,
-  tax_rate_order bigint(20) NOT NULL,
+  tax_rate_order BIGINT UNSIGNED NOT NULL,
   tax_rate_class varchar(200) NOT NULL DEFAULT '',
   PRIMARY KEY  (tax_rate_id),
   KEY tax_rate_country (tax_rate_country),
-  KEY tax_rate_state (tax_rate_state),
-  KEY tax_rate_class (tax_rate_class),
+  KEY tax_rate_state (tax_rate_state(2)),
+  KEY tax_rate_class (tax_rate_class(10)),
   KEY tax_rate_priority (tax_rate_priority)
 ) $collate;
 CREATE TABLE {$wpdb->prefix}woocommerce_tax_rate_locations (
-  location_id bigint(20) NOT NULL auto_increment,
-  location_code varchar(255) NOT NULL,
-  tax_rate_id bigint(20) NOT NULL,
+  location_id BIGINT UNSIGNED NOT NULL auto_increment,
+  location_code varchar(200) NOT NULL,
+  tax_rate_id BIGINT UNSIGNED NOT NULL,
   location_type varchar(40) NOT NULL,
   PRIMARY KEY  (location_id),
   KEY tax_rate_id (tax_rate_id),
-  KEY location_type (location_type),
-  KEY location_type_code (location_type(40),location_code(90))
+  KEY location_type_code (location_type(10),location_code(20))
+) $collate;
+CREATE TABLE {$wpdb->prefix}woocommerce_shipping_zones (
+  zone_id BIGINT UNSIGNED NOT NULL auto_increment,
+  zone_name varchar(200) NOT NULL,
+  zone_order BIGINT UNSIGNED NOT NULL,
+  PRIMARY KEY  (zone_id)
+) $collate;
+CREATE TABLE {$wpdb->prefix}woocommerce_shipping_zone_locations (
+  location_id BIGINT UNSIGNED NOT NULL auto_increment,
+  zone_id BIGINT UNSIGNED NOT NULL,
+  location_code varchar(200) NOT NULL,
+  location_type varchar(40) NOT NULL,
+  PRIMARY KEY  (location_id),
+  KEY location_id (location_id),
+  KEY location_type_code (location_type(10),location_code(20))
+) $collate;
+CREATE TABLE {$wpdb->prefix}woocommerce_shipping_zone_methods (
+  zone_id BIGINT UNSIGNED NOT NULL,
+  instance_id BIGINT UNSIGNED NOT NULL auto_increment,
+  method_id varchar(200) NOT NULL,
+  method_order BIGINT UNSIGNED NOT NULL,
+  is_enabled tinyint(1) NOT NULL DEFAULT '1',
+  PRIMARY KEY  (instance_id)
+) $collate;
+CREATE TABLE {$wpdb->prefix}woocommerce_payment_tokens (
+  token_id BIGINT UNSIGNED NOT NULL auto_increment,
+  gateway_id varchar(200) NOT NULL,
+  token text NOT NULL,
+  user_id BIGINT UNSIGNED NOT NULL DEFAULT '0',
+  type varchar(200) NOT NULL,
+  is_default tinyint(1) NOT NULL DEFAULT '0',
+  PRIMARY KEY  (token_id),
+  KEY user_id (user_id)
+) $collate;
+CREATE TABLE {$wpdb->prefix}woocommerce_payment_tokenmeta (
+  meta_id BIGINT UNSIGNED NOT NULL auto_increment,
+  payment_token_id BIGINT UNSIGNED NOT NULL,
+  meta_key varchar(255) NULL,
+  meta_value longtext NULL,
+  PRIMARY KEY  (meta_id),
+  KEY payment_token_id (payment_token_id),
+  KEY meta_key (meta_key(32))
+) $collate;
+CREATE TABLE {$wpdb->prefix}woocommerce_log (
+  log_id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
+  timestamp datetime NOT NULL,
+  level smallint(4) NOT NULL,
+  source varchar(200) NOT NULL,
+  message longtext NOT NULL,
+  context longtext NULL,
+  PRIMARY KEY (log_id),
+  KEY level (level)
 ) $collate;
 		";
+
+		/**
+		 * Term meta is only needed for old installs and is now @deprecated by WordPress term meta.
+		 */
+		if ( ! function_exists( 'get_term_meta' ) ) {
+			$tables .= "
+CREATE TABLE {$wpdb->prefix}woocommerce_termmeta (
+  meta_id BIGINT UNSIGNED NOT NULL auto_increment,
+  woocommerce_term_id BIGINT UNSIGNED NOT NULL,
+  meta_key varchar(255) default NULL,
+  meta_value longtext NULL,
+  PRIMARY KEY  (meta_id),
+  KEY woocommerce_term_id (woocommerce_term_id),
+  KEY meta_key (meta_key(32))
+) $collate;
+			";
+		}
+
+		return $tables;
 	}
 
 	/**
@@ -483,11 +651,11 @@ CREATE TABLE {$wpdb->prefix}woocommerce_tax_rate_locations (
 
 		// Customer role
 		add_role( 'customer', __( 'Customer', 'woocommerce' ), array(
-			'read' 					=> true
+			'read' 					=> true,
 		) );
 
 		// Shop manager role
-		add_role( 'shop_manager', __( 'Shop Manager', 'woocommerce' ), array(
+		add_role( 'shop_manager', __( 'Shop manager', 'woocommerce' ), array(
 			'level_9'                => true,
 			'level_8'                => true,
 			'level_7'                => true,
@@ -527,7 +695,7 @@ CREATE TABLE {$wpdb->prefix}woocommerce_tax_rate_locations (
 			'upload_files'           => true,
 			'export'                 => true,
 			'import'                 => true,
-			'list_users'             => true
+			'list_users'             => true,
 		) );
 
 		$capabilities = self::get_core_capabilities();
@@ -550,7 +718,7 @@ CREATE TABLE {$wpdb->prefix}woocommerce_tax_rate_locations (
 
 		$capabilities['core'] = array(
 			'manage_woocommerce',
-			'view_woocommerce_reports'
+			'view_woocommerce_reports',
 		);
 
 		$capability_types = array( 'product', 'shop_order', 'shop_coupon', 'shop_webhook' );
@@ -577,7 +745,7 @@ CREATE TABLE {$wpdb->prefix}woocommerce_tax_rate_locations (
 				"manage_{$capability_type}_terms",
 				"edit_{$capability_type}_terms",
 				"delete_{$capability_type}_terms",
-				"assign_{$capability_type}_terms"
+				"assign_{$capability_type}_terms",
 			);
 		}
 
@@ -623,25 +791,25 @@ CREATE TABLE {$wpdb->prefix}woocommerce_tax_rate_locations (
 			array(
 				'base' 		=> $upload_dir['basedir'] . '/woocommerce_uploads',
 				'file' 		=> 'index.html',
-				'content' 	=> ''
+				'content' 	=> '',
 			),
 			array(
 				'base' 		=> WC_LOG_DIR,
 				'file' 		=> '.htaccess',
-				'content' 	=> 'deny from all'
+				'content' 	=> 'deny from all',
 			),
 			array(
 				'base' 		=> WC_LOG_DIR,
 				'file' 		=> 'index.html',
-				'content' 	=> ''
-			)
+				'content' 	=> '',
+			),
 		);
 
 		if ( 'redirect' !== $download_method ) {
 			$files[] = array(
 				'base' 		=> $upload_dir['basedir'] . '/woocommerce_uploads',
 				'file' 		=> '.htaccess',
-				'content' 	=> 'deny from all'
+				'content' 	=> 'deny from all',
 			);
 		}
 
@@ -665,7 +833,7 @@ CREATE TABLE {$wpdb->prefix}woocommerce_tax_rate_locations (
 			$response = wp_safe_remote_get( 'https://plugins.svn.wordpress.org/woocommerce/trunk/readme.txt' );
 
 			if ( ! is_wp_error( $response ) && ! empty( $response['body'] ) ) {
-				$upgrade_notice = self::parse_update_notice( $response['body'] );
+				$upgrade_notice = self::parse_update_notice( $response['body'], $args['new_version'] );
 				set_transient( $transient_name, $upgrade_notice, DAY_IN_SECONDS );
 			}
 		}
@@ -675,28 +843,39 @@ CREATE TABLE {$wpdb->prefix}woocommerce_tax_rate_locations (
 
 	/**
 	 * Parse update notice from readme file.
+	 *
 	 * @param  string $content
+	 * @param  string $new_version
 	 * @return string
 	 */
-	private static function parse_update_notice( $content ) {
-		// Output Upgrade Notice
+	private static function parse_update_notice( $content, $new_version ) {
+		// Output Upgrade Notice.
 		$matches        = null;
 		$regexp         = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( WC_VERSION ) . '\s*=|$)~Uis';
 		$upgrade_notice = '';
 
 		if ( preg_match( $regexp, $content, $matches ) ) {
-			$version = trim( $matches[1] );
-			$notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );
+			$notices = (array) preg_split( '~[\r\n]+~', trim( $matches[2] ) );
 
-			if ( version_compare( WC_VERSION, $version, '<' ) ) {
+			// Convert the full version strings to minor versions.
+			$notice_version_parts  = explode( '.', trim( $matches[1] ) );
+			$current_version_parts = explode( '.', WC_VERSION );
 
-				$upgrade_notice .= '<div class="wc_plugin_upgrade_notice">';
+			if ( 3 !== sizeof( $notice_version_parts ) ) {
+				return;
+			}
+
+			$notice_version  = $notice_version_parts[0] . '.' . $notice_version_parts[1];
+			$current_version = $current_version_parts[0] . '.' . $current_version_parts[1];
+
+			// Check the latest stable version and ignore trunk.
+			if ( version_compare( $current_version, $notice_version, '<' ) ) {
+
+				$upgrade_notice .= '</p><p class="wc_plugin_upgrade_notice">';
 
 				foreach ( $notices as $index => $line ) {
-					$upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );
+					$upgrade_notice .= preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line );
 				}
-
-				$upgrade_notice .= '</div> ';
 			}
 		}
 
@@ -711,7 +890,7 @@ CREATE TABLE {$wpdb->prefix}woocommerce_tax_rate_locations (
 	 */
 	public static function plugin_action_links( $links ) {
 		$action_links = array(
-			'settings' => '<a href="' . admin_url( 'admin.php?page=wc-settings' ) . '" title="' . esc_attr( __( 'View WooCommerce Settings', 'woocommerce' ) ) . '">' . __( 'Settings', 'woocommerce' ) . '</a>',
+			'settings' => '<a href="' . admin_url( 'admin.php?page=wc-settings' ) . '" aria-label="' . esc_attr__( 'View WooCommerce settings', 'woocommerce' ) . '">' . esc_html__( 'Settings', 'woocommerce' ) . '</a>',
 		);
 
 		return array_merge( $action_links, $links );
@@ -725,11 +904,11 @@ CREATE TABLE {$wpdb->prefix}woocommerce_tax_rate_locations (
 	 * @return	array
 	 */
 	public static function plugin_row_meta( $links, $file ) {
-		if ( $file == WC_PLUGIN_BASENAME ) {
+		if ( WC_PLUGIN_BASENAME == $file ) {
 			$row_meta = array(
-				'docs'    => '<a href="' . esc_url( apply_filters( 'woocommerce_docs_url', 'http://docs.woothemes.com/documentation/plugins/woocommerce/' ) ) . '" title="' . esc_attr( __( 'View WooCommerce Documentation', 'woocommerce' ) ) . '">' . __( 'Docs', 'woocommerce' ) . '</a>',
-				'apidocs' => '<a href="' . esc_url( apply_filters( 'woocommerce_apidocs_url', 'http://docs.woothemes.com/wc-apidocs/' ) ) . '" title="' . esc_attr( __( 'View WooCommerce API Docs', 'woocommerce' ) ) . '">' . __( 'API Docs', 'woocommerce' ) . '</a>',
-				'support' => '<a href="' . esc_url( apply_filters( 'woocommerce_support_url', 'http://support.woothemes.com/' ) ) . '" title="' . esc_attr( __( 'Visit Premium Customer Support Forum', 'woocommerce' ) ) . '">' . __( 'Premium Support', 'woocommerce' ) . '</a>',
+				'docs'    => '<a href="' . esc_url( apply_filters( 'woocommerce_docs_url', 'https://docs.woocommerce.com/documentation/plugins/woocommerce/' ) ) . '" aria-label="' . esc_attr__( 'View WooCommerce documentation', 'woocommerce' ) . '">' . esc_html__( 'Docs', 'woocommerce' ) . '</a>',
+				'apidocs' => '<a href="' . esc_url( apply_filters( 'woocommerce_apidocs_url', 'https://docs.woocommerce.com/wc-apidocs/' ) ) . '" aria-label="' . esc_attr__( 'View WooCommerce API docs', 'woocommerce' ) . '">' . esc_html__( 'API docs', 'woocommerce' ) . '</a>',
+				'support' => '<a href="' . esc_url( apply_filters( 'woocommerce_support_url', 'https://woocommerce.com/my-account/tickets/' ) ) . '" aria-label="' . esc_attr__( 'Visit premium customer support', 'woocommerce' ) . '">' . esc_html__( 'Premium support', 'woocommerce' ) . '</a>',
 			);
 
 			return array_merge( $links, $row_meta );
@@ -755,9 +934,157 @@ CREATE TABLE {$wpdb->prefix}woocommerce_tax_rate_locations (
 		$tables[] = $wpdb->prefix . 'woocommerce_tax_rate_locations';
 		$tables[] = $wpdb->prefix . 'woocommerce_order_items';
 		$tables[] = $wpdb->prefix . 'woocommerce_order_itemmeta';
+		$tables[] = $wpdb->prefix . 'woocommerce_payment_tokens';
+		$tables[] = $wpdb->prefix . 'woocommerce_shipping_zones';
+		$tables[] = $wpdb->prefix . 'woocommerce_shipping_zone_locations';
+		$tables[] = $wpdb->prefix . 'woocommerce_shipping_zone_methods';
 
 		return $tables;
 	}
+
+	/**
+	 * Get slug from path
+	 * @param  string $key
+	 * @return string
+	 */
+	private static function format_plugin_slug( $key ) {
+		$slug = explode( '/', $key );
+		$slug = explode( '.', end( $slug ) );
+		return $slug[0];
+	}
+
+	/**
+	 * Install a plugin from .org in the background via a cron job (used by
+	 * installer - opt in).
+	 * @param string $plugin_to_install_id
+	 * @param array $plugin_to_install
+	 * @since 2.6.0
+	 */
+	public static function background_installer( $plugin_to_install_id, $plugin_to_install ) {
+		// Explicitly clear the event.
+		wp_clear_scheduled_hook( 'woocommerce_plugin_background_installer', func_get_args() );
+
+		if ( ! empty( $plugin_to_install['repo-slug'] ) ) {
+			require_once( ABSPATH . 'wp-admin/includes/file.php' );
+			require_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
+			require_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+			require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+
+			WP_Filesystem();
+
+			$skin              = new Automatic_Upgrader_Skin;
+			$upgrader          = new WP_Upgrader( $skin );
+			$installed_plugins = array_map( array( __CLASS__, 'format_plugin_slug' ), array_keys( get_plugins() ) );
+			$plugin_slug       = $plugin_to_install['repo-slug'];
+			$plugin            = $plugin_slug . '/' . $plugin_slug . '.php';
+			$installed         = false;
+			$activate          = false;
+
+			// See if the plugin is installed already
+			if ( in_array( $plugin_to_install['repo-slug'], $installed_plugins ) ) {
+				$installed = true;
+				$activate  = ! is_plugin_active( $plugin );
+			}
+
+			// Install this thing!
+			if ( ! $installed ) {
+				// Suppress feedback
+				ob_start();
+
+				try {
+					$plugin_information = plugins_api( 'plugin_information', array(
+						'slug'   => $plugin_to_install['repo-slug'],
+						'fields' => array(
+							'short_description' => false,
+							'sections'          => false,
+							'requires'          => false,
+							'rating'            => false,
+							'ratings'           => false,
+							'downloaded'        => false,
+							'last_updated'      => false,
+							'added'             => false,
+							'tags'              => false,
+							'homepage'          => false,
+							'donate_link'       => false,
+							'author_profile'    => false,
+							'author'            => false,
+						),
+					) );
+
+					if ( is_wp_error( $plugin_information ) ) {
+						throw new Exception( $plugin_information->get_error_message() );
+					}
+
+					$package  = $plugin_information->download_link;
+					$download = $upgrader->download_package( $package );
+
+					if ( is_wp_error( $download ) ) {
+						throw new Exception( $download->get_error_message() );
+					}
+
+					$working_dir = $upgrader->unpack_package( $download, true );
+
+					if ( is_wp_error( $working_dir ) ) {
+						throw new Exception( $working_dir->get_error_message() );
+					}
+
+					$result = $upgrader->install_package( array(
+						'source'                      => $working_dir,
+						'destination'                 => WP_PLUGIN_DIR,
+						'clear_destination'           => false,
+						'abort_if_destination_exists' => false,
+						'clear_working'               => true,
+						'hook_extra'                  => array(
+							'type'   => 'plugin',
+							'action' => 'install',
+						),
+					) );
+
+					if ( is_wp_error( $result ) ) {
+						throw new Exception( $result->get_error_message() );
+					}
+
+					$activate = true;
+
+				} catch ( Exception $e ) {
+					WC_Admin_Notices::add_custom_notice(
+						$plugin_to_install_id . '_install_error',
+						sprintf(
+							__( '%1$s could not be installed (%2$s). <a href="%3$s">Please install it manually by clicking here.</a>', 'woocommerce' ),
+							$plugin_to_install['name'],
+							$e->getMessage(),
+							esc_url( admin_url( 'index.php?wc-install-plugin-redirect=' . $plugin_to_install['repo-slug'] ) )
+						)
+					);
+				}
+
+				// Discard feedback
+				ob_end_clean();
+			}
+
+			wp_clean_plugins_cache();
+
+			// Activate this thing
+			if ( $activate ) {
+				try {
+					$result = activate_plugin( $plugin );
+
+					if ( is_wp_error( $result ) ) {
+						throw new Exception( $result->get_error_message() );
+					}
+				} catch ( Exception $e ) {
+					WC_Admin_Notices::add_custom_notice(
+						$plugin_to_install_id . '_install_error',
+						sprintf(
+							__( '%1$s was installed but could not be activated. <a href="%2$s">Please activate it manually by clicking here.</a>', 'woocommerce' ),
+							$plugin_to_install['name'],
+							admin_url( 'plugins.php' )
+						)
+					);
+				}
+			}
+		}
+	}
 }
 
 WC_Install::init();
diff --git a/includes/class-wc-integrations.php b/includes/class-wc-integrations.php
index e292e7382fc..32bdc72a58b 100644
--- a/includes/class-wc-integrations.php
+++ b/includes/class-wc-integrations.php
@@ -17,13 +17,17 @@ if ( ! defined( 'ABSPATH' ) ) {
  */
 class WC_Integrations {
 
-	/** Array of integration classes */
+	/**
+	 * Array of integrations.
+	 *
+	 * @var array
+	 */
 	public $integrations = array();
 
-    /**
-     * Initialize integrations.
-     */
-    public function __construct() {
+	/**
+	 * Initialize integrations.
+	 */
+	public function __construct() {
 
 		do_action( 'woocommerce_integrations_init' );
 
diff --git a/includes/class-wc-legacy-api.php b/includes/class-wc-legacy-api.php
new file mode 100644
index 00000000000..fd915c3796a
--- /dev/null
+++ b/includes/class-wc-legacy-api.php
@@ -0,0 +1,271 @@
+<?php
+/**
+ * WooCommerce Legacy API. Was deprecated with 2.6.0.
+ *
+ * @author   WooThemes
+ * @category API
+ * @package  WooCommerce/API
+ * @since    2.6
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+class WC_Legacy_API {
+
+	/**
+	 * This is the major version for the REST API and takes
+	 * first-order position in endpoint URLs.
+	 *
+	 * @deprecated 2.6.0
+	 * @var string
+	 */
+	const VERSION = '3.1.0';
+
+	/**
+	 * The REST API server.
+	 *
+	 * @deprecated 2.6.0
+	 * @var WC_API_Server
+	 */
+	public $server;
+
+	/**
+	 * REST API authentication class instance.
+	 *
+	 * @deprecated 2.6.0
+	 * @var WC_API_Authentication
+	 */
+	public $authentication;
+
+	/**
+	 * Setup class.
+	 * @since 2.0
+	 */
+	public function __construct() {
+		add_action( 'parse_request', array( $this, 'handle_rest_api_requests' ), 0 );
+	}
+
+	/**
+	 * Add new query vars.
+	 *
+	 * @since 2.0
+	 * @param array $vars
+	 * @return string[]
+	 */
+	public function add_query_vars( $vars ) {
+		$vars[] = 'wc-api-version'; // Deprecated since 2.6.0.
+		$vars[] = 'wc-api-route'; // Deprecated since 2.6.0.
+		return $vars;
+	}
+
+	/**
+	 * Add new endpoints.
+	 *
+	 * @since 2.0
+	 */
+	public static function add_endpoint() {
+		// REST API, deprecated since 2.6.0.
+		add_rewrite_rule( '^wc-api/v([1-3]{1})/?$', 'index.php?wc-api-version=$matches[1]&wc-api-route=/', 'top' );
+		add_rewrite_rule( '^wc-api/v([1-3]{1})(.*)?', 'index.php?wc-api-version=$matches[1]&wc-api-route=$matches[2]', 'top' );
+	}
+
+	/**
+	 * Handle REST API requests.
+	 *
+	 * @since 2.2
+	 * @deprecated 2.6.0
+	 */
+	public function handle_rest_api_requests() {
+		global $wp;
+
+		if ( ! empty( $_GET['wc-api-version'] ) ) {
+			$wp->query_vars['wc-api-version'] = $_GET['wc-api-version'];
+		}
+
+		if ( ! empty( $_GET['wc-api-route'] ) ) {
+			$wp->query_vars['wc-api-route'] = $_GET['wc-api-route'];
+		}
+
+		// REST API request.
+		if ( ! empty( $wp->query_vars['wc-api-version'] ) && ! empty( $wp->query_vars['wc-api-route'] ) ) {
+
+			define( 'WC_API_REQUEST', true );
+			define( 'WC_API_REQUEST_VERSION', absint( $wp->query_vars['wc-api-version'] ) );
+
+			// Legacy v1 API request.
+			if ( 1 === WC_API_REQUEST_VERSION ) {
+				$this->handle_v1_rest_api_request();
+			} elseif ( 2 === WC_API_REQUEST_VERSION ) {
+				$this->handle_v2_rest_api_request();
+			} else {
+				$this->includes();
+
+				$this->server = new WC_API_Server( $wp->query_vars['wc-api-route'] );
+
+				// load API resource classes.
+				$this->register_resources( $this->server );
+
+				// Fire off the request.
+				$this->server->serve_request();
+			}
+
+			exit;
+		}
+	}
+
+	/**
+	 * Include required files for REST API request.
+	 *
+	 * @since 2.1
+	 * @deprecated 2.6.0
+	 */
+	public function includes() {
+
+		// API server / response handlers.
+		include_once( dirname( __FILE__ ) . '/api/legacy/v3/class-wc-api-exception.php' );
+		include_once( dirname( __FILE__ ) . '/api/legacy/v3/class-wc-api-server.php' );
+		include_once( dirname( __FILE__ ) . '/api/legacy/v3/interface-wc-api-handler.php' );
+		include_once( dirname( __FILE__ ) . '/api/legacy/v3/class-wc-api-json-handler.php' );
+
+		// Authentication.
+		include_once( dirname( __FILE__ ) . '/api/legacy/v3/class-wc-api-authentication.php' );
+		$this->authentication = new WC_API_Authentication();
+
+		include_once( dirname( __FILE__ ) . '/api/legacy/v3/class-wc-api-resource.php' );
+		include_once( dirname( __FILE__ ) . '/api/legacy/v3/class-wc-api-coupons.php' );
+		include_once( dirname( __FILE__ ) . '/api/legacy/v3/class-wc-api-customers.php' );
+		include_once( dirname( __FILE__ ) . '/api/legacy/v3/class-wc-api-orders.php' );
+		include_once( dirname( __FILE__ ) . '/api/legacy/v3/class-wc-api-products.php' );
+		include_once( dirname( __FILE__ ) . '/api/legacy/v3/class-wc-api-reports.php' );
+		include_once( dirname( __FILE__ ) . '/api/legacy/v3/class-wc-api-taxes.php' );
+		include_once( dirname( __FILE__ ) . '/api/legacy/v3/class-wc-api-webhooks.php' );
+
+		// Allow plugins to load other response handlers or resource classes.
+		do_action( 'woocommerce_api_loaded' );
+	}
+
+	/**
+	 * Register available API resources.
+	 *
+	 * @since 2.1
+	 * @deprecated 2.6.0
+	 * @param WC_API_Server $server the REST server
+	 */
+	public function register_resources( $server ) {
+
+		$api_classes = apply_filters( 'woocommerce_api_classes',
+			array(
+				'WC_API_Coupons',
+				'WC_API_Customers',
+				'WC_API_Orders',
+				'WC_API_Products',
+				'WC_API_Reports',
+				'WC_API_Taxes',
+				'WC_API_Webhooks',
+			)
+		);
+
+		foreach ( $api_classes as $api_class ) {
+			$this->$api_class = new $api_class( $server );
+		}
+	}
+
+
+	/**
+	 * Handle legacy v1 REST API requests.
+	 *
+	 * @since 2.2
+	 * @deprecated 2.6.0
+	 */
+	private function handle_v1_rest_api_request() {
+
+		// Include legacy required files for v1 REST API request.
+		include_once( dirname( __FILE__ ) . '/api/legacy/v1/class-wc-api-server.php' );
+		include_once( dirname( __FILE__ ) . '/api/legacy/v1/interface-wc-api-handler.php' );
+		include_once( dirname( __FILE__ ) . '/api/legacy/v1/class-wc-api-json-handler.php' );
+		include_once( dirname( __FILE__ ) . '/api/legacy/v1/class-wc-api-xml-handler.php' );
+
+		include_once( dirname( __FILE__ ) . '/api/legacy/v1/class-wc-api-authentication.php' );
+		$this->authentication = new WC_API_Authentication();
+
+		include_once( dirname( __FILE__ ) . '/api/legacy/v1/class-wc-api-resource.php' );
+		include_once( dirname( __FILE__ ) . '/api/legacy/v1/class-wc-api-coupons.php' );
+		include_once( dirname( __FILE__ ) . '/api/legacy/v1/class-wc-api-customers.php' );
+		include_once( dirname( __FILE__ ) . '/api/legacy/v1/class-wc-api-orders.php' );
+		include_once( dirname( __FILE__ ) . '/api/legacy/v1/class-wc-api-products.php' );
+		include_once( dirname( __FILE__ ) . '/api/legacy/v1/class-wc-api-reports.php' );
+
+		// Allow plugins to load other response handlers or resource classes.
+		do_action( 'woocommerce_api_loaded' );
+
+		$this->server = new WC_API_Server( $GLOBALS['wp']->query_vars['wc-api-route'] );
+
+		// Register available resources for legacy v1 REST API request.
+		$api_classes = apply_filters( 'woocommerce_api_classes',
+			array(
+				'WC_API_Customers',
+				'WC_API_Orders',
+				'WC_API_Products',
+				'WC_API_Coupons',
+				'WC_API_Reports',
+			)
+		);
+
+		foreach ( $api_classes as $api_class ) {
+			$this->$api_class = new $api_class( $this->server );
+		}
+
+		// Fire off the request.
+		$this->server->serve_request();
+	}
+
+	/**
+	 * Handle legacy v2 REST API requests.
+	 *
+	 * @since 2.4
+	 * @deprecated 2.6.0
+	 */
+	private function handle_v2_rest_api_request() {
+		include_once( dirname( __FILE__ ) . '/api/legacy/v2/class-wc-api-exception.php' );
+		include_once( dirname( __FILE__ ) . '/api/legacy/v2/class-wc-api-server.php' );
+		include_once( dirname( __FILE__ ) . '/api/legacy/v2/interface-wc-api-handler.php' );
+		include_once( dirname( __FILE__ ) . '/api/legacy/v2/class-wc-api-json-handler.php' );
+
+		include_once( dirname( __FILE__ ) . '/api/legacy/v2/class-wc-api-authentication.php' );
+		$this->authentication = new WC_API_Authentication();
+
+		include_once( dirname( __FILE__ ) . '/api/legacy/v2/class-wc-api-resource.php' );
+		include_once( dirname( __FILE__ ) . '/api/legacy/v2/class-wc-api-coupons.php' );
+		include_once( dirname( __FILE__ ) . '/api/legacy/v2/class-wc-api-customers.php' );
+		include_once( dirname( __FILE__ ) . '/api/legacy/v2/class-wc-api-orders.php' );
+		include_once( dirname( __FILE__ ) . '/api/legacy/v2/class-wc-api-products.php' );
+		include_once( dirname( __FILE__ ) . '/api/legacy/v2/class-wc-api-reports.php' );
+		include_once( dirname( __FILE__ ) . '/api/legacy/v2/class-wc-api-webhooks.php' );
+
+		// allow plugins to load other response handlers or resource classes.
+		do_action( 'woocommerce_api_loaded' );
+
+		$this->server = new WC_API_Server( $GLOBALS['wp']->query_vars['wc-api-route'] );
+
+		// Register available resources for legacy v2 REST API request.
+		$api_classes = apply_filters( 'woocommerce_api_classes',
+			array(
+				'WC_API_Customers',
+				'WC_API_Orders',
+				'WC_API_Products',
+				'WC_API_Coupons',
+				'WC_API_Reports',
+				'WC_API_Webhooks',
+			)
+		);
+
+		foreach ( $api_classes as $api_class ) {
+			$this->$api_class = new $api_class( $this->server );
+		}
+
+		// Fire off the request.
+		$this->server->serve_request();
+	}
+}
diff --git a/includes/class-wc-log-levels.php b/includes/class-wc-log-levels.php
new file mode 100644
index 00000000000..e97b72c36cf
--- /dev/null
+++ b/includes/class-wc-log-levels.php
@@ -0,0 +1,116 @@
+<?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+
+/**
+ * Standard log levels
+ *
+ * @class          WC_Log_Levels
+ * @version        1.0.0
+ * @package        WooCommerce/Classes
+ * @category       Class
+ * @author         WooThemes
+ */
+abstract class WC_Log_Levels {
+
+	/**
+	 * Log Levels
+	 *
+	 * Description of levels:
+	 *     'emergency': System is unusable.
+	 *     'alert': Action must be taken immediately.
+	 *     'critical': Critical conditions.
+	 *     'error': Error conditions.
+	 *     'warning': Warning conditions.
+	 *     'notice': Normal but significant condition.
+	 *     'informational': Informational messages.
+	 *     'debug': Debug-level messages.
+	 *
+	 * @see @link {https://tools.ietf.org/html/rfc5424}
+	 */
+	const EMERGENCY = 'emergency';
+	const ALERT     = 'alert';
+	const CRITICAL  = 'critical';
+	const ERROR     = 'error';
+	const WARNING   = 'warning';
+	const NOTICE    = 'notice';
+	const INFO      = 'info';
+	const DEBUG     = 'debug';
+
+	/**
+	 * Level strings mapped to integer severity.
+	 *
+	 * @var array
+	 */
+	protected static $level_to_severity = array(
+		self::EMERGENCY => 800,
+		self::ALERT     => 700,
+		self::CRITICAL  => 600,
+		self::ERROR     => 500,
+		self::WARNING   => 400,
+		self::NOTICE    => 300,
+		self::INFO      => 200,
+		self::DEBUG     => 100,
+	);
+
+	/**
+	 * Severity integers mapped to level strings.
+	 *
+	 * This is the inverse of $level_severity.
+	 *
+	 * @var array
+	 */
+	protected static $severity_to_level = array(
+		800 => self::EMERGENCY,
+		700 => self::ALERT,
+		600 => self::CRITICAL,
+		500 => self::ERROR,
+		400 => self::WARNING,
+		300 => self::NOTICE,
+		200 => self::INFO,
+		100 => self::DEBUG,
+	);
+
+
+	/**
+	 * Validate a level string.
+	 *
+	 * @param string $level
+	 * @return bool True if $level is a valid level.
+	 */
+	public static function is_valid_level( $level ) {
+		return array_key_exists( strtolower( $level ), self::$level_to_severity );
+	}
+
+	/**
+	 * Translate level string to integer.
+	 *
+	 * @param string $level emergency|alert|critical|error|warning|notice|info|debug
+	 * @return int 100 (debug) - 800 (emergency) or 0 if not recognized
+	 */
+	public static function get_level_severity( $level ) {
+		if ( self::is_valid_level( $level ) ) {
+			$severity = self::$level_to_severity[ strtolower( $level ) ];
+		} else {
+			$severity = 0;
+		}
+		return $severity;
+	}
+
+	/**
+	 * Translate severity integer to level string.
+	 *
+	 * @param int $severity
+	 * @return bool|string False if not recognized. Otherwise string representation of level.
+	 */
+	public static function get_severity_level( $severity ) {
+		if ( array_key_exists( $severity, self::$severity_to_level ) ) {
+			return self::$severity_to_level[ $severity ];
+		} else {
+			return false;
+		}
+	}
+
+}
diff --git a/includes/class-wc-logger.php b/includes/class-wc-logger.php
index af43997a41f..49b2018f757 100644
--- a/includes/class-wc-logger.php
+++ b/includes/class-wc-logger.php
@@ -1,91 +1,246 @@
 <?php
-
 if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
 
 /**
- * Allows log files to be written to for debugging purposes
+ * Provides logging capabilities for debugging purposes.
  *
- * @class 		WC_Logger
- * @version		1.6.4
- * @package		WooCommerce/Classes
- * @category	Class
- * @author 		WooThemes
+ * @class          WC_Logger
+ * @version        2.0.0
+ * @package        WooCommerce/Classes
+ * @category       Class
+ * @author         WooThemes
  */
-class WC_Logger {
+class WC_Logger implements WC_Logger_Interface {
 
 	/**
-	 * @var array Stores open file _handles.
-	 * @access private
+	 * Stores registered log handlers.
+	 *
+	 * @var array
 	 */
-	private $_handles;
+	protected $handlers;
+
+	/**
+	 * Minimum log level this handler will process.
+	 *
+	 * @var int Integer representation of minimum log level to handle.
+	 */
+	protected $threshold;
 
 	/**
 	 * Constructor for the logger.
-	 */
-	public function __construct() {
-		$this->_handles = array();
-	}
-
-
-	/**
-	 * Destructor.
-	 */
-	public function __destruct() {
-		foreach ( $this->_handles as $handle ) {
-			@fclose( $handle );
-		}
-	}
-
-
-	/**
-	 * Open log file for writing.
 	 *
-	 * @access private
-	 * @param mixed $handle
-	 * @return bool success
+	 * @param array $handlers Optional. Array of log handlers. If $handlers is not provided,
+	 *     the filter 'woocommerce_register_log_handlers' will be used to define the handlers.
+	 *     If $handlers is provided, the filter will not be applied and the handlers will be
+	 *     used directly.
+	 * @param string $threshold Optional. Define an explicit threshold. May be configured
+	 *     via  WC_LOG_THRESHOLD. By default, all logs will be processed.
 	 */
-	private function open( $handle ) {
-		if ( isset( $this->_handles[ $handle ] ) ) {
-			return true;
+	public function __construct( $handlers = null, $threshold = null ) {
+		if ( null === $handlers ) {
+			$handlers = apply_filters( 'woocommerce_register_log_handlers', array() );
 		}
 
-		if ( $this->_handles[ $handle ] = @fopen( wc_get_log_file_path( $handle ), 'a' ) ) {
-			return true;
+		$register_handlers = array();
+
+		if ( ! empty( $handlers ) && is_array( $handlers ) ) {
+			foreach ( $handlers as $handler ) {
+				$implements = class_implements( $handler );
+				if ( is_object( $handler ) && is_array( $implements ) && in_array( 'WC_Log_Handler_Interface', $implements ) ) {
+					$register_handlers[] = $handler;
+				} else {
+					wc_doing_it_wrong(
+						__METHOD__,
+						sprintf(
+							__( 'The provided handler <code>%s</code> does not implement WC_Log_Handler_Interface.', 'woocommerce' ),
+							esc_html( is_object( $handler ) ? get_class( $handler ) : $handler )
+						),
+						'3.0'
+					);
+				}
+			}
 		}
 
-		return false;
+		if ( null !== $threshold ) {
+			$threshold = WC_Log_Levels::get_level_severity( $threshold );
+		} elseif ( defined( 'WC_LOG_THRESHOLD' ) && WC_Log_Levels::is_valid_level( WC_LOG_THRESHOLD ) ) {
+			$threshold = WC_Log_Levels::get_level_severity( WC_LOG_THRESHOLD );
+		} else {
+			$threshold = null;
+		}
+
+		$this->handlers  = $register_handlers;
+		$this->threshold = $threshold;
 	}
 
+	/**
+	 * Determine whether to handle or ignore log.
+	 *
+	 * @param string $level emergency|alert|critical|error|warning|notice|info|debug
+	 * @return bool True if the log should be handled.
+	 */
+	protected function should_handle( $level ) {
+		if ( null === $this->threshold ) {
+			return true;
+		}
+		return $this->threshold <= WC_Log_Levels::get_level_severity( $level );
+	}
 
 	/**
-	 * Add a log entry to chosen file.
+	 * Add a log entry.
+	 *
+	 * This is not the preferred method for adding log messages. Please use log() or any one of
+	 * the level methods (debug(), info(), etc.). This method may be deprecated in the future.
 	 *
 	 * @param string $handle
 	 * @param string $message
+	 * @return bool
 	 */
-	public function add( $handle, $message ) {
-		if ( $this->open( $handle ) && is_resource( $this->_handles[ $handle ] ) ) {
-			$time = date_i18n( 'm-d-Y @ H:i:s -' ); // Grab Time
-			@fwrite( $this->_handles[ $handle ], $time . " " . $message . "\n" );
-		}
-
-		do_action( 'woocommerce_log_add', $handle, $message );
+	public function add( $handle, $message, $level = WC_Log_Levels::NOTICE ) {
+		$message = apply_filters( 'woocommerce_logger_add_message', $message, $handle );
+		$this->log( $level, $message, array( 'source' => $handle, '_legacy' => true ) );
+		wc_do_deprecated_action( 'woocommerce_log_add', array( $handle, $message ), '3.0', 'This action has been deprecated with no alternative.' );
+		return true;
 	}
 
+	/**
+	 * Add a log entry.
+	 *
+	 * @param string $level One of the following:
+	 *     'emergency': System is unusable.
+	 *     'alert': Action must be taken immediately.
+	 *     'critical': Critical conditions.
+	 *     'error': Error conditions.
+	 *     'warning': Warning conditions.
+	 *     'notice': Normal but significant condition.
+	 *     'informational': Informational messages.
+	 *     'debug': Debug-level messages.
+	 * @param string $message Log message.
+	 * @param array $context Optional. Additional information for log handlers.
+	 */
+	public function log( $level, $message, $context = array() ) {
+		if ( ! WC_Log_Levels::is_valid_level( $level ) ) {
+			wc_doing_it_wrong( __METHOD__, sprintf( __( 'WC_Logger::log was called with an invalid level "%s".', 'woocommerce' ), $level ), '3.0' );
+		}
+
+		if ( $this->should_handle( $level ) ) {
+			$timestamp = current_time( 'timestamp' );
+
+			foreach ( $this->handlers as $handler ) {
+				$handler->handle( $timestamp, $level, $message, $context );
+			}
+		}
+	}
+
+	/**
+	 * Adds an emergency level message.
+	 *
+	 * System is unusable.
+	 *
+	 * @see WC_Logger::log
+	 */
+	public function emergency( $message, $context = array() ) {
+		$this->log( WC_Log_Levels::EMERGENCY, $message, $context );
+	}
+
+	/**
+	 * Adds an alert level message.
+	 *
+	 * Action must be taken immediately.
+	 * Example: Entire website down, database unavailable, etc.
+	 *
+	 * @see WC_Logger::log
+	 */
+	public function alert( $message, $context = array() ) {
+		$this->log( WC_Log_Levels::ALERT, $message, $context );
+	}
+
+	/**
+	 * Adds a critical level message.
+	 *
+	 * Critical conditions.
+	 * Example: Application component unavailable, unexpected exception.
+	 *
+	 * @see WC_Logger::log
+	 */
+	public function critical( $message, $context = array() ) {
+		$this->log( WC_Log_Levels::CRITICAL, $message, $context );
+	}
+
+	/**
+	 * Adds an error level message.
+	 *
+	 * Runtime errors that do not require immediate action but should typically be logged
+	 * and monitored.
+	 *
+	 * @see WC_Logger::log
+	 */
+	public function error( $message, $context = array() ) {
+		$this->log( WC_Log_Levels::ERROR, $message, $context );
+	}
+
+	/**
+	 * Adds a warning level message.
+	 *
+	 * Exceptional occurrences that are not errors.
+	 *
+	 * Example: Use of deprecated APIs, poor use of an API, undesirable things that are not
+	 * necessarily wrong.
+	 *
+	 * @see WC_Logger::log
+	 */
+	public function warning( $message, $context = array() ) {
+		$this->log( WC_Log_Levels::WARNING, $message, $context );
+	}
+
+	/**
+	 * Adds a notice level message.
+	 *
+	 * Normal but significant events.
+	 *
+	 * @see WC_Logger::log
+	 */
+	public function notice( $message, $context = array() ) {
+		$this->log( WC_Log_Levels::NOTICE, $message, $context );
+	}
+
+	/**
+	 * Adds a info level message.
+	 *
+	 * Interesting events.
+	 * Example: User logs in, SQL logs.
+	 *
+	 * @see WC_Logger::log
+	 */
+	public function info( $message, $context = array() ) {
+		$this->log( WC_Log_Levels::INFO, $message, $context );
+	}
+
+	/**
+	 * Adds a debug level message.
+	 *
+	 * Detailed debug information.
+	 *
+	 * @see WC_Logger::log
+	 */
+	public function debug( $message, $context = array() ) {
+		$this->log( WC_Log_Levels::DEBUG, $message, $context );
+	}
 
 	/**
 	 * Clear entries from chosen file.
 	 *
-	 * @param mixed $handle
+	 * @deprecated 3.0.0
+	 *
+	 * @param string $handle
+	 *
+	 * @return bool
 	 */
 	public function clear( $handle ) {
-		if ( $this->open( $handle ) && is_resource( $this->_handles[ $handle ] ) ) {
-			@ftruncate( $this->_handles[ $handle ], 0 );
-		}
-
-		do_action( 'woocommerce_log_clear', $handle );
+		wc_deprecated_function( 'WC_Logger::clear', '3.0', 'WC_Log_Handler_File::clear' );
+		$handler = new WC_Log_Handler_File();
+		return $handler->clear( $handle );
 	}
-
 }
diff --git a/includes/class-wc-order-factory.php b/includes/class-wc-order-factory.php
index 8fb5aa79d7e..f465ee8e800 100644
--- a/includes/class-wc-order-factory.php
+++ b/includes/class-wc-order-factory.php
@@ -1,7 +1,6 @@
 <?php
-
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
 /**
@@ -10,50 +9,125 @@ if ( ! defined( 'ABSPATH' ) ) {
  * The WooCommerce order factory creating the right order objects.
  *
  * @class 		WC_Order_Factory
- * @version		2.2.0
+ * @version		3.0.0
  * @package		WooCommerce/Classes
  * @category	Class
- * @author 		WooThemes
+ * @author 		WooCommerce
  */
 class WC_Order_Factory {
 
 	/**
-	 * get_order function.
+	 * Get order.
 	 *
-	 * @param bool $the_order (default: false)
+	 * @param  mixed $order_id (default: false)
 	 * @return WC_Order|bool
 	 */
-	public function get_order( $the_order = false ) {
-		global $post;
+	public static function get_order( $order_id = false ) {
+		$order_id = self::get_order_id( $order_id );
 
-		if ( false === $the_order ) {
-			$the_order = $post;
-		} elseif ( is_numeric( $the_order ) ) {
-			$the_order = get_post( $the_order );
-		} elseif ( $the_order instanceof WC_Order ) {
-			$the_order = get_post( $the_order->id );
-		}
-
-		if ( ! $the_order || ! is_object( $the_order ) ) {
+		if ( ! $order_id ) {
 			return false;
 		}
 
-		$order_id  = absint( $the_order->ID );
-		$post_type = $the_order->post_type;
-
-		if ( $order_type = wc_get_order_type( $post_type ) ) {
-			$classname = $order_type['class_name'];
+		$order_type = WC_Data_Store::load( 'order' )->get_order_type( $order_id );
+		if ( $order_type_data = wc_get_order_type( $order_type ) ) {
+			$classname = $order_type_data['class_name'];
 		} else {
 			$classname = false;
 		}
 
 		// Filter classname so that the class can be overridden if extended.
-		$classname = apply_filters( 'woocommerce_order_class', $classname, $post_type, $order_id, $the_order );
+		$classname = apply_filters( 'woocommerce_order_class', $classname, $order_type, $order_id );
 
 		if ( ! class_exists( $classname ) ) {
 			return false;
 		}
 
-		return new $classname( $the_order );
+		try {
+			return new $classname( $order_id );
+		} catch ( Exception $e ) {
+			return false;
+		}
+	}
+
+	/**
+	 * Get order item.
+	 * @param int
+	 * @return WC_Order_Item|false if not found
+	 */
+	public static function get_order_item( $item_id = 0 ) {
+		global $wpdb;
+
+		if ( is_numeric( $item_id ) ) {
+			$item_type = WC_Data_Store::load( 'order-item' )->get_order_item_type( $item_id );
+			$id        = $item_id;
+		} elseif ( $item_id instanceof WC_Order_Item ) {
+			$item_type = $item_id->get_type();
+			$id        = $item_id->get_id();
+		} elseif ( is_object( $item_id ) && ! empty( $item_id->order_item_type ) ) {
+			$id        = $item_id->order_item_id;
+			$item_type = $item_id->order_item_type;
+		} else {
+			$item_data = false;
+			$item_type = false;
+			$id        = false;
+		}
+
+		if ( $id && $item_type ) {
+			$classname = false;
+			switch ( $item_type ) {
+				case 'line_item' :
+				case 'product' :
+					$classname = 'WC_Order_Item_Product';
+				break;
+				case 'coupon' :
+					$classname = 'WC_Order_Item_Coupon';
+				break;
+				case 'fee' :
+					$classname = 'WC_Order_Item_Fee';
+				break;
+				case 'shipping' :
+					$classname = 'WC_Order_Item_Shipping';
+				break;
+				case 'tax' :
+					$classname = 'WC_Order_Item_Tax';
+				break;
+				default :
+					$classname = apply_filters( 'woocommerce_get_order_item_classname', $classname, $item_type, $id );
+				break;
+			}
+
+			if ( $classname && class_exists( $classname ) ) {
+				try {
+					return new $classname( $id );
+				} catch ( Exception $e ) {
+					return false;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Get the order ID depending on what was passed.
+	 *
+	 * @since 3.0.0
+	 * @param  mixed $order
+	 * @return int|bool false on failure
+	 */
+	public static function get_order_id( $order ) {
+		global $post;
+
+		if ( false === $order && is_a( $post, 'WP_Post' ) && 'shop_order' === get_post_type( $post ) ) {
+			return $post->ID;
+		} elseif ( is_numeric( $order ) ) {
+			return $order;
+		} elseif ( $order instanceof WC_Abstract_Order ) {
+			return $order->get_id();
+		} elseif ( ! empty( $order->ID ) ) {
+			return $order->ID;
+		} else {
+			return false;
+		}
 	}
 }
diff --git a/includes/class-wc-order-item-coupon.php b/includes/class-wc-order-item-coupon.php
new file mode 100644
index 00000000000..820c1cc06b5
--- /dev/null
+++ b/includes/class-wc-order-item-coupon.php
@@ -0,0 +1,176 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Order Line Item (coupon).
+ *
+ * @version     3.0.0
+ * @since       3.0.0
+ * @package     WooCommerce/Classes
+ * @author      WooCommerce
+ */
+class WC_Order_Item_Coupon extends WC_Order_Item {
+
+	/**
+	 * Order Data array. This is the core order data exposed in APIs since 3.0.0.
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $extra_data = array(
+		'code'         => '',
+		'discount'     => 0,
+		'discount_tax' => 0,
+	);
+
+	/*
+	|--------------------------------------------------------------------------
+	| Setters
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Set order item name.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_name( $value ) {
+		return $this->set_code( $value );
+	}
+
+	/**
+	 * Set code.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_code( $value ) {
+		$this->set_prop( 'code', wc_clean( $value ) );
+	}
+
+	/**
+	 * Set discount amount.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_discount( $value ) {
+		$this->set_prop( 'discount', wc_format_decimal( $value ) );
+	}
+
+	/**
+	 * Set discounted tax amount.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_discount_tax( $value ) {
+		$this->set_prop( 'discount_tax', wc_format_decimal( $value ) );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Getters
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Get order item type.
+	 *
+	 * @return string
+	 */
+	public function get_type() {
+		return 'coupon';
+	}
+
+	/**
+	 * Get order item name.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_name( $context = 'view' ) {
+		return $this->get_code( $context );
+	}
+
+	/**
+	 * Get coupon code.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_code( $context = 'view' ) {
+		return $this->get_prop( 'code', $context );
+	}
+
+	/**
+	 * Get discount amount.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_discount( $context = 'view' ) {
+		return $this->get_prop( 'discount', $context );
+	}
+
+	/**
+	 * Get discounted tax amount.
+	 * @return string
+	 */
+	public function get_discount_tax( $context = 'view' ) {
+		return $this->get_prop( 'discount_tax', $context );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Array Access Methods
+	|--------------------------------------------------------------------------
+	|
+	| For backwards compat with legacy arrays.
+	|
+	*/
+
+	/**
+	 * offsetGet for ArrayAccess/Backwards compatibility.
+	 * @deprecated Add deprecation notices in future release.
+	 * @param string $offset
+	 * @return mixed
+	 */
+	public function offsetGet( $offset ) {
+		if ( 'discount_amount' === $offset ) {
+			$offset = 'discount';
+		} elseif ( 'discount_amount_tax' === $offset ) {
+			$offset = 'discount_tax';
+		}
+		return parent::offsetGet( $offset );
+	}
+
+	/**
+	 * offsetSet for ArrayAccess/Backwards compatibility.
+	 * @deprecated Add deprecation notices in future release.
+	 * @param string $offset
+	 * @param mixed $value
+	 */
+	public function offsetSet( $offset, $value ) {
+		if ( 'discount_amount' === $offset ) {
+			$offset = 'discount';
+		} elseif ( 'discount_amount_tax' === $offset ) {
+			$offset = 'discount_tax';
+		}
+		parent::offsetSet( $offset, $value );
+	}
+
+	/**
+	 * offsetExists for ArrayAccess
+	 * @param string $offset
+	 * @return bool
+	 */
+	public function offsetExists( $offset ) {
+		if ( in_array( $offset, array( 'discount_amount', 'discount_amount_tax' ) ) ) {
+			return true;
+		}
+		return parent::offsetExists( $offset );
+	}
+}
diff --git a/includes/class-wc-order-item-fee.php b/includes/class-wc-order-item-fee.php
new file mode 100644
index 00000000000..f811684a8f1
--- /dev/null
+++ b/includes/class-wc-order-item-fee.php
@@ -0,0 +1,240 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Order Line Item (fee).
+ *
+ * Fee is an amount of money charged for a particular piece of work
+ * or for a particular right or service, and not supposed to be negative.
+ *
+ * @version     3.0.0
+ * @since       3.0.0
+ * @package     WooCommerce/Classes
+ * @author      WooThemes
+ */
+class WC_Order_Item_Fee extends WC_Order_Item {
+
+	/**
+	 * Order Data array. This is the core order data exposed in APIs since 3.0.0.
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $extra_data = array(
+		'tax_class'  => '',
+		'tax_status' => 'taxable',
+		'total'      => '',
+		'total_tax'  => '',
+		'taxes'      => array(
+			'total' => array(),
+		),
+	);
+
+	/*
+	|--------------------------------------------------------------------------
+	| Setters
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Set tax class.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_tax_class( $value ) {
+		if ( $value && ! in_array( $value, WC_Tax::get_tax_class_slugs() ) ) {
+			$this->error( 'order_item_fee_invalid_tax_class', __( 'Invalid tax class', 'woocommerce' ) );
+		}
+		$this->set_prop( 'tax_class', $value );
+	}
+
+	/**
+	 * Set tax_status.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_tax_status( $value ) {
+		if ( in_array( $value, array( 'taxable', 'none' ) ) ) {
+			$this->set_prop( 'tax_status', $value );
+		} else {
+			$this->set_prop( 'tax_status', 'taxable' );
+		}
+	}
+
+	/**
+	 * Set total.
+	 *
+	 * @param string $amount Fee amount (do not enter negative amounts).
+	 * @throws WC_Data_Exception
+	 */
+	public function set_total( $amount ) {
+		$this->set_prop( 'total', wc_format_decimal( $amount ) );
+	}
+
+	/**
+	 * Set total tax.
+	 *
+	 * @param string $amount
+	 * @throws WC_Data_Exception
+	 */
+	public function set_total_tax( $amount ) {
+		$this->set_prop( 'total_tax', wc_format_decimal( $amount ) );
+	}
+
+	/**
+	 * Set taxes.
+	 *
+	 * This is an array of tax ID keys with total amount values.
+	 * @param array $raw_tax_data
+	 * @throws WC_Data_Exception
+	 */
+	public function set_taxes( $raw_tax_data ) {
+		$raw_tax_data = maybe_unserialize( $raw_tax_data );
+		$tax_data     = array(
+			'total' => array(),
+		);
+		if ( ! empty( $raw_tax_data['total'] ) ) {
+			$tax_data['total'] = array_map( 'wc_format_decimal', $raw_tax_data['total'] );
+		}
+		$this->set_prop( 'taxes', $tax_data );
+		$this->set_total_tax( array_sum( $tax_data['total'] ) );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Getters
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Get order item name.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_name( $context = 'view' ) {
+		$name = $this->get_prop( 'name', $context );
+		if ( 'view' === $context ) {
+			return $name ? $name : __( 'Fee', 'woocommerce' );
+		} else {
+			return $name;
+		}
+	}
+
+	/**
+	 * Get order item type.
+	 *
+	 * @return string
+	 */
+	public function get_type() {
+		return 'fee';
+	}
+
+	/**
+	 * Get tax class.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_tax_class( $context = 'view' ) {
+		return $this->get_prop( 'tax_class', $context );
+	}
+
+	/**
+	 * Get tax status.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_tax_status( $context = 'view' ) {
+		return $this->get_prop( 'tax_status', $context );
+	}
+
+	/**
+	 * Get total fee.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_total( $context = 'view' ) {
+		return $this->get_prop( 'total', $context );
+	}
+
+	/**
+	 * Get total tax.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_total_tax( $context = 'view' ) {
+		return $this->get_prop( 'total_tax', $context );
+	}
+
+	/**
+	 * Get fee taxes.
+	 *
+	 * @param  string $context
+	 * @return array
+	 */
+	public function get_taxes( $context = 'view' ) {
+		return $this->get_prop( 'taxes', $context );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Array Access Methods
+	|--------------------------------------------------------------------------
+	|
+	| For backwards compat with legacy arrays.
+	|
+	*/
+
+	/**
+	 * offsetGet for ArrayAccess/Backwards compatibility.
+	 * @deprecated Add deprecation notices in future release.
+	 * @param string $offset
+	 * @return mixed
+	 */
+	public function offsetGet( $offset ) {
+		if ( 'line_total' === $offset ) {
+			$offset = 'total';
+		} elseif ( 'line_tax' === $offset ) {
+			$offset = 'total_tax';
+		} elseif ( 'line_tax_data' === $offset ) {
+			$offset = 'taxes';
+		}
+		return parent::offsetGet( $offset );
+	}
+
+	/**
+	 * offsetSet for ArrayAccess/Backwards compatibility.
+	 * @deprecated Add deprecation notices in future release.
+	 * @param string $offset
+	 * @param mixed $value
+	 */
+	public function offsetSet( $offset, $value ) {
+		if ( 'line_total' === $offset ) {
+			$offset = 'total';
+		} elseif ( 'line_tax' === $offset ) {
+			$offset = 'total_tax';
+		} elseif ( 'line_tax_data' === $offset ) {
+			$offset = 'taxes';
+		}
+		parent::offsetSet( $offset, $value );
+	}
+
+	/**
+	 * offsetExists for ArrayAccess
+	 * @param string $offset
+	 * @return bool
+	 */
+	public function offsetExists( $offset ) {
+		if ( in_array( $offset, array( 'line_total', 'line_tax', 'line_tax_data' ) ) ) {
+			return true;
+		}
+		return parent::offsetExists( $offset );
+	}
+}
diff --git a/includes/class-wc-order-item-meta.php b/includes/class-wc-order-item-meta.php
index 522ec449aeb..bbf48fdc657 100644
--- a/includes/class-wc-order-item-meta.php
+++ b/includes/class-wc-order-item-meta.php
@@ -1,7 +1,6 @@
 <?php
-
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
 /**
@@ -9,6 +8,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  *
  * A Simple class for managing order item meta so plugins add it in the correct format.
  *
+ * @deprecated  3.0.0 wc_display_item_meta function is used instead.
  * @class 		order_item_meta
  * @version		2.4
  * @package		WooCommerce/Classes
@@ -33,16 +33,16 @@ class WC_Order_Item_Meta {
 	 *
 	 * @param array $item defaults to array()
 	 * @param \WC_Product $product defaults to null
-	 * @return \WC_Order_Item_Meta instance
 	 */
 	public function __construct( $item = array(), $product = null ) {
+		wc_deprecated_function( 'WC_Order_Item_Meta::__construct', '3.1', 'WC_Order_Item_Product' );
+
 		// Backwards (pre 2.4) compat
 		if ( ! isset( $item['item_meta'] ) ) {
 			$this->legacy = true;
 			$this->meta   = array_filter( (array) $item );
 			return;
 		}
-
 		$this->item    = $item;
 		$this->meta    = array_filter( (array) $item['item_meta'] );
 		$this->product = $product;
@@ -116,24 +116,26 @@ class WC_Order_Item_Meta {
 
 		if ( ! empty( $this->item['item_meta_array'] ) ) {
 			foreach ( $this->item['item_meta_array'] as $meta_id => $meta ) {
-				if ( "" === $meta->value || is_serialized( $meta->value ) || ( ! empty( $hideprefix ) && substr( $meta->key, 0, 1 ) == $hideprefix ) ) {
+				if ( "" === $meta->value || is_serialized( $meta->value ) || ( ! empty( $hideprefix ) && substr( $meta->key, 0, 1 ) === $hideprefix ) ) {
 					continue;
 				}
 
 				$attribute_key = urldecode( str_replace( 'attribute_', '', $meta->key ) );
+				$meta_value    = $meta->value;
 
 				// If this is a term slug, get the term's nice name
 				if ( taxonomy_exists( $attribute_key ) ) {
-					$term = get_term_by( 'slug', $meta->value, $attribute_key );
+					$term = get_term_by( 'slug', $meta_value, $attribute_key );
+
 					if ( ! is_wp_error( $term ) && is_object( $term ) && $term->name ) {
-						$meta->value = $term->name;
+						$meta_value = $term->name;
 					}
 				}
 
 				$formatted_meta[ $meta_id ] = array(
 					'key'   => $meta->key,
 					'label' => wc_attribute_label( $attribute_key, $this->product ),
-					'value' => apply_filters( 'woocommerce_order_item_display_meta_value', $meta->value ),
+					'value' => apply_filters( 'woocommerce_order_item_display_meta_value', $meta_value ),
 				);
 			}
 		}
@@ -148,7 +150,7 @@ class WC_Order_Item_Meta {
 	 */
 	public function get_formatted_legacy( $hideprefix = '_' ) {
 		if ( ! is_ajax() ) {
-			_deprecated_function( 'get_formatted_legacy', '2.4', 'Item Meta Data is being called with legacy arguments' );
+			wc_deprecated_function( 'get_formatted_legacy', '2.4', 'Item Meta Data is being called with legacy arguments' );
 		}
 
 		$formatted_meta = array();
diff --git a/includes/class-wc-order-item-product.php b/includes/class-wc-order-item-product.php
new file mode 100644
index 00000000000..dc587755a0f
--- /dev/null
+++ b/includes/class-wc-order-item-product.php
@@ -0,0 +1,462 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Order Line Item (product).
+ *
+ * @version     3.0.0
+ * @since       3.0.0
+ * @package     WooCommerce/Classes
+ * @author      WooThemes
+ */
+class WC_Order_Item_Product extends WC_Order_Item {
+
+	/**
+	 * Order Data array. This is the core order data exposed in APIs since 3.0.0.
+	 *
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $extra_data = array(
+		'product_id'   => 0,
+		'variation_id' => 0,
+		'quantity'     => 1,
+		'tax_class'    => '',
+		'subtotal'     => 0,
+		'subtotal_tax' => 0,
+		'total'        => 0,
+		'total_tax'    => 0,
+		'taxes'        => array(
+			'subtotal' => array(),
+			'total'    => array(),
+		),
+	);
+
+	/*
+	|--------------------------------------------------------------------------
+	| Setters
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Set quantity.
+	 *
+	 * @param int $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_quantity( $value ) {
+		$this->set_prop( 'quantity', wc_stock_amount( $value ) );
+	}
+
+	/**
+	 * Set tax class.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_tax_class( $value ) {
+		if ( $value && ! in_array( $value, WC_Tax::get_tax_class_slugs() ) ) {
+			$this->error( 'order_item_product_invalid_tax_class', __( 'Invalid tax class', 'woocommerce' ) );
+		}
+		$this->set_prop( 'tax_class', $value );
+	}
+
+	/**
+	 * Set Product ID
+	 *
+	 * @param int $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_product_id( $value ) {
+		if ( $value > 0 && 'product' !== get_post_type( absint( $value ) ) ) {
+			$this->error( 'order_item_product_invalid_product_id', __( 'Invalid product ID', 'woocommerce' ) );
+		}
+		$this->set_prop( 'product_id', absint( $value ) );
+	}
+
+	/**
+	 * Set variation ID.
+	 *
+	 * @param int $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_variation_id( $value ) {
+		if ( $value > 0 && 'product_variation' !== get_post_type( $value ) ) {
+			$this->error( 'order_item_product_invalid_variation_id', __( 'Invalid variation ID', 'woocommerce' ) );
+		}
+		$this->set_prop( 'variation_id', absint( $value ) );
+	}
+
+	/**
+	 * Line subtotal (before discounts).
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_subtotal( $value ) {
+		$this->set_prop( 'subtotal', floatval( wc_format_decimal( $value ) ) );
+	}
+
+	/**
+	 * Line total (after discounts).
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_total( $value ) {
+		$this->set_prop( 'total', floatval( wc_format_decimal( $value ) ) );
+
+		// Subtotal cannot be less than total
+		if ( ! $this->get_subtotal() || $this->get_subtotal() < $this->get_total() ) {
+			$this->set_subtotal( $value );
+		}
+	}
+
+	/**
+	 * Line subtotal tax (before discounts).
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_subtotal_tax( $value ) {
+		$this->set_prop( 'subtotal_tax', wc_format_decimal( $value ) );
+	}
+
+	/**
+	 * Line total tax (after discounts).
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_total_tax( $value ) {
+		$this->set_prop( 'total_tax', wc_format_decimal( $value ) );
+	}
+
+	/**
+	 * Set line taxes and totals for passed in taxes.
+	 *
+	 * @param array $raw_tax_data
+	 * @throws WC_Data_Exception
+	 */
+	public function set_taxes( $raw_tax_data ) {
+		$raw_tax_data = maybe_unserialize( $raw_tax_data );
+		$tax_data     = array(
+			'total'    => array(),
+			'subtotal' => array(),
+		);
+		if ( ! empty( $raw_tax_data['total'] ) && ! empty( $raw_tax_data['subtotal'] ) ) {
+			$tax_data['subtotal'] = array_map( 'wc_format_decimal', $raw_tax_data['subtotal'] );
+			$tax_data['total']    = array_map( 'wc_format_decimal', $raw_tax_data['total'] );
+
+			// Subtotal cannot be less than total!
+			if ( array_sum( $tax_data['subtotal'] ) < array_sum( $tax_data['total'] ) ) {
+				$tax_data['subtotal'] = $tax_data['total'];
+			}
+		}
+		$this->set_prop( 'taxes', $tax_data );
+		$this->set_total_tax( array_sum( $tax_data['total'] ) );
+		$this->set_subtotal_tax( array_sum( $tax_data['subtotal'] ) );
+	}
+
+	/**
+	 * Set variation data (stored as meta data - write only).
+	 *
+	 * @param array $data Key/Value pairs
+	 */
+	public function set_variation( $data ) {
+		foreach ( $data as $key => $value ) {
+			$this->add_meta_data( str_replace( 'attribute_', '', $key ), $value, true );
+		}
+	}
+
+	/**
+	 * Set properties based on passed in product object.
+	 *
+	 * @param WC_Product $product
+	 * @throws WC_Data_Exception
+	 */
+	public function set_product( $product ) {
+		if ( ! is_a( $product, 'WC_Product' ) ) {
+			$this->error( 'order_item_product_invalid_product', __( 'Invalid product', 'woocommerce' ) );
+		}
+		if ( $product->is_type( 'variation' ) ) {
+			$this->set_product_id( $product->get_parent_id() );
+			$this->set_variation_id( $product->get_id() );
+			$this->set_variation( is_callable( array( $product, 'get_variation_attributes' ) ) ? $product->get_variation_attributes() : array() );
+		} else {
+			$this->set_product_id( $product->get_id() );
+		}
+		$this->set_name( $product->get_name() );
+		$this->set_tax_class( $product->get_tax_class() );
+	}
+
+	/**
+	 * Set meta data for backordered products.
+	 */
+	public function set_backorder_meta() {
+		$product = $this->get_product();
+		if ( $product && $product->backorders_require_notification() && $product->is_on_backorder( $this->get_quantity() ) ) {
+			$this->add_meta_data( apply_filters( 'woocommerce_backordered_item_meta_name', __( 'Backordered', 'woocommerce' ) ), $this->get_quantity() - max( 0, $product->get_stock_quantity() ), true );
+		}
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Getters
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Get order item type.
+	 *
+	 * @return string
+	 */
+	public function get_type() {
+		return 'line_item';
+	}
+
+	/**
+	 * Get product ID.
+	 *
+	 * @param  string $context
+	 * @return int
+	 */
+	public function get_product_id( $context = 'view' ) {
+		return $this->get_prop( 'product_id', $context );
+	}
+
+	/**
+	 * Get variation ID.
+	 *
+	 * @param  string $context
+	 * @return int
+	 */
+	public function get_variation_id( $context = 'view' ) {
+		return $this->get_prop( 'variation_id', $context );
+	}
+
+	/**
+	 * Get quantity.
+	 *
+	 * @param  string $context
+	 * @return int
+	 */
+	public function get_quantity( $context = 'view' ) {
+		return $this->get_prop( 'quantity', $context );
+	}
+
+	/**
+	 * Get tax class.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_tax_class( $context = 'view' ) {
+		return $this->get_prop( 'tax_class', $context );
+	}
+
+	/**
+	 * Get subtotal.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_subtotal( $context = 'view' ) {
+		return $this->get_prop( 'subtotal', $context );
+	}
+
+	/**
+	 * Get subtotal tax.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_subtotal_tax( $context = 'view' ) {
+		return $this->get_prop( 'subtotal_tax', $context );
+	}
+
+	/**
+	 * Get total.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_total( $context = 'view' ) {
+		return $this->get_prop( 'total', $context );
+	}
+
+	/**
+	 * Get total tax.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_total_tax( $context = 'view' ) {
+		return $this->get_prop( 'total_tax', $context );
+	}
+
+	/**
+	 * Get taxes.
+	 *
+	 * @param  string $context
+	 * @return array
+	 */
+	public function get_taxes( $context = 'view' ) {
+		return $this->get_prop( 'taxes', $context );
+	}
+
+	/**
+	 * Get the associated product.
+	 *
+	 * @return WC_Product|bool
+	 */
+	public function get_product() {
+		if ( $this->get_variation_id() ) {
+			$product = wc_get_product( $this->get_variation_id() );
+		} else {
+			$product = wc_get_product( $this->get_product_id() );
+		}
+
+		// Backwards compatible filter from WC_Order::get_product_from_item()
+		if ( has_filter( 'woocommerce_get_product_from_item' ) ) {
+			$product = apply_filters( 'woocommerce_get_product_from_item', $product, $this, $this->get_order() );
+		}
+
+		return apply_filters( 'woocommerce_order_item_product', $product, $this );
+	}
+
+	/**
+	 * Get the Download URL.
+	 *
+	 * @param  int $download_id
+	 * @return string
+	 */
+	public function get_item_download_url( $download_id ) {
+		$order = $this->get_order();
+
+		return $order ? add_query_arg( array(
+			'download_file' => $this->get_variation_id() ? $this->get_variation_id() : $this->get_product_id(),
+			'order'         => $order->get_order_key(),
+			'email'         => urlencode( $order->get_billing_email() ),
+			'key'           => $download_id,
+		), trailingslashit( home_url() ) ) : '';
+	}
+
+	/**
+	 * Get any associated downloadable files.
+	 *
+	 * @return array
+	 */
+	public function get_item_downloads() {
+		$files      = array();
+		$product    = $this->get_product();
+		$order      = $this->get_order();
+		$product_id = $this->get_variation_id() ? $this->get_variation_id() : $this->get_product_id();
+
+		if ( $product && $order && $product->is_downloadable() && $order->is_download_permitted() ) {
+			$data_store         = WC_Data_Store::load( 'customer-download' );
+			$customer_downloads = $data_store->get_downloads( array(
+				'user_email' => $order->get_billing_email(),
+				'order_id'   => $order->get_id(),
+				'product_id' => $product_id,
+			) );
+			foreach ( $customer_downloads as $customer_download ) {
+				$download_id = $customer_download->get_download_id();
+
+				if ( $product->has_file( $download_id ) ) {
+					$file                                  = $product->get_file( $download_id );
+					$files[ $download_id ]                 = $file->get_data();
+					$files[ $download_id ]['download_url'] = add_query_arg( array(
+						'download_file' => $product_id,
+						'order'         => $order->get_order_key(),
+						'email'         => urlencode( $order->get_billing_email() ),
+						'key'           => $download_id,
+					), trailingslashit( home_url() ) );
+				}
+			}
+		}
+
+		return apply_filters( 'woocommerce_get_item_downloads', $files, $this, $order );
+	}
+
+	/**
+	 * Get tax status.
+	 * @return string
+	 */
+	public function get_tax_status() {
+		$product = $this->get_product();
+		return $product ? $product->get_tax_status() : 'taxable';
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Array Access Methods
+	|--------------------------------------------------------------------------
+	|
+	| For backwards compat with legacy arrays.
+	|
+	*/
+
+	/**
+	 * offsetGet for ArrayAccess/Backwards compatibility.
+	 *
+	 * @deprecated Add deprecation notices in future release.
+	 * @param string $offset
+	 * @return mixed
+	 */
+	public function offsetGet( $offset ) {
+		if ( 'line_subtotal' === $offset ) {
+			$offset = 'subtotal';
+		} elseif ( 'line_subtotal_tax' === $offset ) {
+			$offset = 'subtotal_tax';
+		} elseif ( 'line_total' === $offset ) {
+			$offset = 'total';
+		} elseif ( 'line_tax' === $offset ) {
+			$offset = 'total_tax';
+		} elseif ( 'line_tax_data' === $offset ) {
+			$offset = 'taxes';
+		} elseif ( 'qty' === $offset ) {
+			$offset = 'quantity';
+		}
+		return parent::offsetGet( $offset );
+	}
+
+	/**
+	 * offsetSet for ArrayAccess/Backwards compatibility.
+	 *
+	 * @deprecated Add deprecation notices in future release.
+	 * @param string $offset
+	 * @param mixed $value
+	 */
+	public function offsetSet( $offset, $value ) {
+		if ( 'line_subtotal' === $offset ) {
+			$offset = 'subtotal';
+		} elseif ( 'line_subtotal_tax' === $offset ) {
+			$offset = 'subtotal_tax';
+		} elseif ( 'line_total' === $offset ) {
+			$offset = 'total';
+		} elseif ( 'line_tax' === $offset ) {
+			$offset = 'total_tax';
+		} elseif ( 'line_tax_data' === $offset ) {
+			$offset = 'taxes';
+		} elseif ( 'qty' === $offset ) {
+			$offset = 'quantity';
+		}
+		parent::offsetSet( $offset, $value );
+	}
+
+	/**
+	 * offsetExists for ArrayAccess
+	 *
+	 * @param string $offset
+	 * @return bool
+	 */
+	public function offsetExists( $offset ) {
+		if ( in_array( $offset, array( 'line_subtotal', 'line_subtotal_tax', 'line_total', 'line_tax', 'line_tax_data', 'item_meta_array', 'item_meta', 'qty' ) ) ) {
+			return true;
+		}
+		return parent::offsetExists( $offset );
+	}
+}
diff --git a/includes/class-wc-order-item-shipping.php b/includes/class-wc-order-item-shipping.php
new file mode 100644
index 00000000000..9fc6108f149
--- /dev/null
+++ b/includes/class-wc-order-item-shipping.php
@@ -0,0 +1,250 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Order Line Item (shipping).
+ *
+ * @version     3.0.0
+ * @since       3.0.0
+ * @package     WooCommerce/Classes
+ * @author      WooThemes
+ */
+class WC_Order_Item_Shipping extends WC_Order_Item {
+
+	/**
+	 * Order Data array. This is the core order data exposed in APIs since 3.0.0.
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $extra_data = array(
+		'method_title' => '',
+		'method_id'    => '',
+		'total'        => 0,
+		'total_tax'    => 0,
+		'taxes'        => array(
+			'total' => array(),
+		),
+	);
+
+	/*
+	|--------------------------------------------------------------------------
+	| Setters
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Set order item name.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_name( $value ) {
+		$this->set_method_title( $value );
+	}
+
+	/**
+	 * Set method title.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_method_title( $value ) {
+		$this->set_prop( 'name', wc_clean( $value ) );
+		$this->set_prop( 'method_title', wc_clean( $value ) );
+	}
+
+	/**
+	 * Set shipping method id.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_method_id( $value ) {
+		$this->set_prop( 'method_id', wc_clean( $value ) );
+	}
+
+	/**
+	 * Set total.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_total( $value ) {
+		$this->set_prop( 'total', wc_format_decimal( $value ) );
+	}
+
+	/**
+	 * Set total tax.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	protected function set_total_tax( $value ) {
+		$this->set_prop( 'total_tax', wc_format_decimal( $value ) );
+	}
+
+	/**
+	 * Set taxes.
+	 *
+	 * This is an array of tax ID keys with total amount values.
+	 * @param array $raw_tax_data
+	 * @throws WC_Data_Exception
+	 */
+	public function set_taxes( $raw_tax_data ) {
+		$raw_tax_data = maybe_unserialize( $raw_tax_data );
+		$tax_data     = array(
+			'total'    => array(),
+		);
+		if ( ! empty( $raw_tax_data['total'] ) ) {
+			$tax_data['total']    = array_map( 'wc_format_decimal', $raw_tax_data['total'] );
+		} elseif ( ! empty( $raw_tax_data ) && is_array( $raw_tax_data ) ) {
+			// Older versions just used an array.
+			$tax_data['total']    = array_map( 'wc_format_decimal', $raw_tax_data );
+		}
+		$this->set_prop( 'taxes', $tax_data );
+		$this->set_total_tax( array_sum( $tax_data['total'] ) );
+	}
+
+	/**
+	 * Set properties based on passed in shipping rate object.
+	 *
+	 * @param WC_Shipping_Rate $tax_rate_id
+	 * @throws WC_Data_Exception
+	 */
+	public function set_shipping_rate( $shipping_rate ) {
+		$this->set_method_title( $shipping_rate->label );
+		$this->set_method_id( $shipping_rate->id );
+		$this->set_total( $shipping_rate->cost );
+		$this->set_taxes( $shipping_rate->taxes );
+		$this->set_meta_data( $shipping_rate->get_meta_data() );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Getters
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Get order item type.
+	 *
+	 * @return string
+	 */
+	public function get_type() {
+		return 'shipping';
+	}
+
+	/**
+	 * Get order item name.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_name( $context = 'view' ) {
+		return $this->get_method_title( $context );
+	}
+
+	/**
+	 * Get title.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_method_title( $context = 'view' ) {
+		$method_title = $this->get_prop( 'method_title', $context );
+		if ( 'view' === $context ) {
+			return $method_title ? $method_title : __( 'Shipping', 'woocommerce' );
+		} else {
+			return $method_title;
+		}
+	}
+
+	/**
+	 * Get method ID.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_method_id( $context = 'view' ) {
+		return $this->get_prop( 'method_id', $context );
+	}
+
+	/**
+	 * Get total cost.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_total( $context = 'view' ) {
+		return $this->get_prop( 'total', $context );
+	}
+
+	/**
+	 * Get total tax.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_total_tax( $context = 'view' ) {
+		return $this->get_prop( 'total_tax', $context );
+	}
+
+	/**
+	 * Get taxes.
+	 *
+	 * @param  string $context
+	 * @return array
+	 */
+	public function get_taxes( $context = 'view' ) {
+		return $this->get_prop( 'taxes', $context );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Array Access Methods
+	|--------------------------------------------------------------------------
+	|
+	| For backwards compat with legacy arrays.
+	|
+	*/
+
+	/**
+	 * offsetGet for ArrayAccess/Backwards compatibility.
+	 * @deprecated Add deprecation notices in future release.
+	 * @param string $offset
+	 * @return mixed
+	 */
+	public function offsetGet( $offset ) {
+		if ( 'cost' === $offset ) {
+			$offset = 'total';
+		}
+		return parent::offsetGet( $offset );
+	}
+
+	/**
+	 * offsetSet for ArrayAccess/Backwards compatibility.
+	 * @deprecated Add deprecation notices in future release.
+	 * @param string $offset
+	 * @param mixed $value
+	 */
+	public function offsetSet( $offset, $value ) {
+		if ( 'cost' === $offset ) {
+			$offset = 'total';
+		}
+		parent::offsetSet( $offset, $value );
+	}
+
+	/**
+	 * offsetExists for ArrayAccess
+	 * @param string $offset
+	 * @return bool
+	 */
+	public function offsetExists( $offset ) {
+		if ( in_array( $offset, array( 'cost' ) ) ) {
+			return true;
+		}
+		return parent::offsetExists( $offset );
+	}
+}
diff --git a/includes/class-wc-order-item-tax.php b/includes/class-wc-order-item-tax.php
new file mode 100644
index 00000000000..890a3cfea13
--- /dev/null
+++ b/includes/class-wc-order-item-tax.php
@@ -0,0 +1,263 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Order Line Item (tax).
+ *
+ * @version     3.0.0
+ * @since       3.0.0
+ * @package     WooCommerce/Classes
+ * @author      WooThemes
+ */
+class WC_Order_Item_Tax extends WC_Order_Item {
+
+	/**
+	 * Order Data array. This is the core order data exposed in APIs since 3.0.0.
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $extra_data = array(
+		'rate_code'          => '',
+		'rate_id'            => 0,
+		'label'              => '',
+		'compound'           => false,
+		'tax_total'          => 0,
+		'shipping_tax_total' => 0,
+	);
+
+	/*
+	|--------------------------------------------------------------------------
+	| Setters
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Set order item name.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_name( $value ) {
+		$this->set_rate_code( $value );
+	}
+
+	/**
+	 * Set item name.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_rate_code( $value ) {
+		$this->set_prop( 'rate_code', wc_clean( $value ) );
+	}
+
+	/**
+	 * Set item name.
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_label( $value ) {
+		$this->set_prop( 'label', wc_clean( $value ) );
+	}
+
+	/**
+	 * Set tax rate id.
+	 * @param int $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_rate_id( $value ) {
+		$this->set_prop( 'rate_id', absint( $value ) );
+	}
+
+	/**
+	 * Set tax total.
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_tax_total( $value ) {
+		$this->set_prop( 'tax_total', $value ? wc_format_decimal( $value ) : 0 );
+	}
+
+	/**
+	 * Set shipping_tax_total
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_shipping_tax_total( $value ) {
+		$this->set_prop( 'shipping_tax_total', $value ? wc_format_decimal( $value ) : 0 );
+	}
+
+	/**
+	 * Set compound
+	 * @param bool $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_compound( $value ) {
+		$this->set_prop( 'compound', (bool) $value );
+	}
+
+	/**
+	 * Set properties based on passed in tax rate by ID.
+	 * @param int $tax_rate_id
+	 * @throws WC_Data_Exception
+	 */
+	public function set_rate( $tax_rate_id ) {
+		$tax_rate = WC_Tax::_get_tax_rate( $tax_rate_id, OBJECT );
+
+		$this->set_rate_id( $tax_rate_id );
+		$this->set_rate_code( WC_Tax::get_rate_code( $tax_rate ) );
+		$this->set_label( WC_Tax::get_rate_label( $tax_rate ) );
+		$this->set_compound( WC_Tax::is_compound( $tax_rate ) );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Getters
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Get order item type.
+	 *
+	 * @return string
+	 */
+	public function get_type() {
+		return 'tax';
+	}
+
+	/**
+	 * Get rate code/name.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_name( $context = 'view' ) {
+		return $this->get_rate_code( $context );
+	}
+
+	/**
+	 * Get rate code/name.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_rate_code( $context = 'view' ) {
+		return $this->get_prop( 'rate_code', $context );
+	}
+
+	/**
+	 * Get label.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_label( $context = 'view' ) {
+		$label = $this->get_prop( 'label', $context );
+		if ( 'view' === $context ) {
+			return $label ? $label : __( 'Tax', 'woocommerce' );
+		} else {
+			return $label;
+		}
+	}
+
+	/**
+	 * Get tax rate ID.
+	 *
+	 * @param  string $context
+	 * @return int
+	 */
+	public function get_rate_id( $context = 'view' ) {
+		return $this->get_prop( 'rate_id', $context );
+	}
+
+	/**
+	 * Get tax_total
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_tax_total( $context = 'view' ) {
+		return $this->get_prop( 'tax_total', $context );
+	}
+
+	/**
+	 * Get shipping_tax_total
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_shipping_tax_total( $context = 'view' ) {
+		return $this->get_prop( 'shipping_tax_total', $context );
+	}
+
+	/**
+	 * Get compound.
+	 *
+	 * @param  string $context
+	 * @return bool
+	 */
+	public function get_compound( $context = 'view' ) {
+		return $this->get_prop( 'compound', $context );
+	}
+
+	/**
+	 * Is this a compound tax rate?
+	 * @return boolean
+	 */
+	public function is_compound() {
+		return $this->get_compound();
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Array Access Methods
+	|--------------------------------------------------------------------------
+	|
+	| For backwards compat with legacy arrays.
+	|
+	*/
+
+	/**
+	 * offsetGet for ArrayAccess/Backwards compatibility.
+	 * @deprecated Add deprecation notices in future release.
+	 * @param string $offset
+	 * @return mixed
+	 */
+	public function offsetGet( $offset ) {
+		if ( 'tax_amount' === $offset ) {
+			$offset = 'tax_total';
+		} elseif ( 'shipping_tax_amount' === $offset ) {
+			$offset = 'shipping_tax_total';
+		}
+		return parent::offsetGet( $offset );
+	}
+
+	/**
+	 * offsetSet for ArrayAccess/Backwards compatibility.
+	 * @deprecated Add deprecation notices in future release.
+	 * @param string $offset
+	 * @param mixed $value
+	 */
+	public function offsetSet( $offset, $value ) {
+		if ( 'tax_amount' === $offset ) {
+			$offset = 'tax_total';
+		} elseif ( 'shipping_tax_amount' === $offset ) {
+			$offset = 'shipping_tax_total';
+		}
+		parent::offsetSet( $offset, $value );
+	}
+
+	/**
+	 * offsetExists for ArrayAccess
+	 * @param string $offset
+	 * @return bool
+	 */
+	public function offsetExists( $offset ) {
+		if ( in_array( $offset, array( 'tax_amount', 'shipping_tax_amount' ) ) ) {
+			return true;
+		}
+		return parent::offsetExists( $offset );
+	}
+}
diff --git a/includes/class-wc-order-item.php b/includes/class-wc-order-item.php
new file mode 100644
index 00000000000..69c3b25bc47
--- /dev/null
+++ b/includes/class-wc-order-item.php
@@ -0,0 +1,324 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Order Item
+ *
+ * A class which represents an item within an order and handles CRUD.
+ * Uses ArrayAccess to be BW compatible with WC_Orders::get_items().
+ *
+ * @version     3.0.0
+ * @since       3.0.0
+ * @package     WooCommerce/Classes
+ * @author      WooThemes
+ */
+class WC_Order_Item extends WC_Data implements ArrayAccess {
+
+	/**
+	 * Order Data array. This is the core order data exposed in APIs since 3.0.0.
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $data = array(
+		'order_id' => 0,
+		'name'     => '',
+	);
+
+	/**
+	 * Stores meta in cache for future reads.
+	 * A group must be set to to enable caching.
+	 * @var string
+	 */
+	protected $cache_group = 'order-items';
+
+	/**
+	 * Meta type. This should match up with
+	 * the types avaiable at https://codex.wordpress.org/Function_Reference/add_metadata.
+	 * WP defines 'post', 'user', 'comment', and 'term'.
+	 */
+	protected $meta_type = 'order_item';
+
+	/**
+	 * This is the name of this object type.
+	 * @var string
+	 */
+	protected $object_type = 'order_item';
+
+	/**
+	 * Constructor.
+	 * @param int|object|array $item ID to load from the DB, or WC_Order_Item Object
+	 */
+	public function __construct( $item = 0 ) {
+		parent::__construct( $item );
+
+		if ( $item instanceof WC_Order_Item ) {
+			$this->set_id( $item->get_id() );
+		} elseif ( is_numeric( $item ) && $item > 0 ) {
+			$this->set_id( $item );
+		} else {
+			$this->set_object_read( true );
+		}
+
+		$type = 'line_item' === $this->get_type() ? 'product' : $this->get_type();
+		$this->data_store = WC_Data_Store::load( 'order-item-' . $type );
+		if ( $this->get_id() > 0 ) {
+			$this->data_store->read( $this );
+		}
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Getters
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Get order ID this meta belongs to.
+	 *
+	 * @param  string $context
+	 * @return int
+	 */
+	public function get_order_id( $context = 'view' ) {
+		return $this->get_prop( 'order_id', $context );
+	}
+
+	/**
+	 * Get order item name.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_name( $context = 'view' ) {
+		return $this->get_prop( 'name', $context );
+	}
+
+	/**
+	 * Get order item type. Overridden by child classes.
+	 *
+	 * @return string
+	 */
+	public function get_type() {
+		return;
+	}
+
+	/**
+	 * Get quantity.
+	 * @return int
+	 */
+	public function get_quantity() {
+		return 1;
+	}
+
+	/**
+	 * Get parent order object.
+	 * @return int
+	 */
+	public function get_order() {
+		return wc_get_order( $this->get_order_id() );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Setters
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Set order ID.
+	 *
+	 * @param  int $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_order_id( $value ) {
+		$this->set_prop( 'order_id', absint( $value ) );
+	}
+
+	/**
+	 * Set order item name.
+	 *
+	 * @param  string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_name( $value ) {
+		$this->set_prop( 'name', wc_clean( $value ) );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Other Methods
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Type checking
+	 * @param  string|array  $Type
+	 * @return boolean
+	 */
+	public function is_type( $type ) {
+		return is_array( $type ) ? in_array( $this->get_type(), $type ) : $type === $this->get_type();
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Meta Data Handling
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Expands things like term slugs before return.
+	 *
+	 * @param string $hideprefix  Meta data prefix, (default: _).
+	 * @param bool   $include_all Include all meta data, this stop skip items with values already in the product name.
+	 * @return array
+	 */
+	public function get_formatted_meta_data( $hideprefix = '_', $include_all = false ) {
+		$formatted_meta    = array();
+		$meta_data         = $this->get_meta_data();
+		$hideprefix_length = ! empty( $hideprefix ) ? strlen( $hideprefix ) : 0;
+		$product           = is_callable( array( $this, 'get_product' ) ) ? $this->get_product() : false;
+		$order_item_name   = $this->get_name();
+
+		foreach ( $meta_data as $meta ) {
+			if ( empty( $meta->id ) || '' === $meta->value || is_array( $meta->value ) || ( $hideprefix_length && substr( $meta->key, 0, $hideprefix_length ) === $hideprefix ) ) {
+				continue;
+			}
+
+			$meta->key     = rawurldecode( (string) $meta->key );
+			$meta->value   = rawurldecode( (string) $meta->value );
+			$attribute_key = str_replace( 'attribute_', '', $meta->key );
+			$display_key   = wc_attribute_label( $attribute_key, $product );
+			$display_value = $meta->value;
+
+			if ( taxonomy_exists( $attribute_key ) ) {
+				$term = get_term_by( 'slug', $meta->value, $attribute_key );
+				if ( ! is_wp_error( $term ) && is_object( $term ) && $term->name ) {
+					$display_value = $term->name;
+				}
+			}
+
+			// Skip items with values already in the product details area of the product name.
+			if ( ! $include_all && $product && wc_is_attribute_in_product_name( $display_value, $order_item_name ) ) {
+				continue;
+			}
+
+			$formatted_meta[ $meta->id ] = (object) array(
+				'key'           => $meta->key,
+				'value'         => $meta->value,
+				'display_key'   => apply_filters( 'woocommerce_order_item_display_meta_key', $display_key ),
+				'display_value' => wpautop( make_clickable( apply_filters( 'woocommerce_order_item_display_meta_value', $display_value ) ) ),
+			);
+		}
+
+		return apply_filters( 'woocommerce_order_item_get_formatted_meta_data', $formatted_meta, $this );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Array Access Methods
+	|--------------------------------------------------------------------------
+	|
+	| For backwards compat with legacy arrays.
+	|
+	*/
+
+	/**
+	 * offsetSet for ArrayAccess
+	 * @param string $offset
+	 * @param mixed $value
+	 */
+	public function offsetSet( $offset, $value ) {
+		if ( 'item_meta_array' === $offset ) {
+			foreach ( $value as $meta_id => $meta ) {
+				$this->update_meta_data( $meta->key, $meta->value, $meta_id );
+			}
+			return;
+		}
+
+		if ( array_key_exists( $offset, $this->data ) ) {
+			$setter = "set_$offset";
+			if ( is_callable( array( $this, $setter ) ) ) {
+				$this->$setter( $value );
+			}
+			return;
+		}
+
+		$this->update_meta_data( $offset, $value );
+	}
+
+	/**
+	 * offsetUnset for ArrayAccess
+	 * @param string $offset
+	 */
+	public function offsetUnset( $offset ) {
+		$this->maybe_read_meta_data();
+
+		if ( 'item_meta_array' === $offset || 'item_meta' === $offset ) {
+			$this->meta_data = array();
+			return;
+		}
+
+		if ( array_key_exists( $offset, $this->data ) ) {
+			unset( $this->data[ $offset ] );
+		}
+
+		if ( array_key_exists( $offset, $this->changes ) ) {
+			unset( $this->changes[ $offset ] );
+		}
+
+		$this->delete_meta_data( $offset );
+	}
+
+	/**
+	 * offsetExists for ArrayAccess
+	 * @param string $offset
+	 * @return bool
+	 */
+	public function offsetExists( $offset ) {
+		$this->maybe_read_meta_data();
+		if ( 'item_meta_array' === $offset || 'item_meta' === $offset || array_key_exists( $offset, $this->data ) ) {
+			return true;
+		}
+		return array_key_exists( $offset, wp_list_pluck( $this->meta_data, 'value', 'key' ) ) || array_key_exists( '_' . $offset, wp_list_pluck( $this->meta_data, 'value', 'key' ) );
+	}
+
+	/**
+	 * offsetGet for ArrayAccess
+	 * @param string $offset
+	 * @return mixed
+	 */
+	public function offsetGet( $offset ) {
+		$this->maybe_read_meta_data();
+
+		if ( 'item_meta_array' === $offset ) {
+			$return = array();
+
+			foreach ( $this->meta_data as $meta ) {
+				$return[ $meta->key ] = $meta;
+			}
+
+			return $return;
+		}
+
+		$meta_values = wp_list_pluck( $this->meta_data, 'value', 'key' );
+
+		if ( 'item_meta' === $offset ) {
+			return $meta_values;
+		} elseif ( 'type' === $offset ) {
+			return $this->get_type();
+		} elseif ( array_key_exists( $offset, $this->data ) ) {
+			$getter = "get_$offset";
+			if ( is_callable( array( $this, $getter ) ) ) {
+				return $this->$getter();
+			}
+		} elseif ( array_key_exists( '_' . $offset, $meta_values ) ) {
+			// Item meta was expanded in previous versions, with prefixes removed. This maintains support.
+			return $meta_values[ '_' . $offset ];
+		} elseif ( array_key_exists( $offset, $meta_values ) ) {
+			return $meta_values[ $offset ];
+		}
+
+		return null;
+	}
+}
diff --git a/includes/class-wc-order-refund.php b/includes/class-wc-order-refund.php
index b3ab4ce106e..88b500d3c9a 100644
--- a/includes/class-wc-order-refund.php
+++ b/includes/class-wc-order-refund.php
@@ -1,93 +1,101 @@
 <?php
-
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
 /**
- * Order refund
+ * Order refund. Refunds are based on orders (essentially negative orders) and
+ * contain much of the same data.
  *
- * @class    WC_Order_Refund
- * @version  2.2.0
+ * @version  3.0.0
  * @package  WooCommerce/Classes
  * @category Class
  * @author   WooThemes
  */
 class WC_Order_Refund extends WC_Abstract_Order {
 
-	/** @public string Order type */
-	public $order_type = 'refund';
-
-	/** @var string Date */
-	public $date;
-
-	/** @var string Refund reason */
-	public $reason;
+	/**
+	 * Which data store to load.
+	 *
+	 * @var string
+	 */
+	protected $data_store_name = 'order-refund';
 
 	/**
-	 * Init/load the refund object. Called from the constructor.
-	 *
-	 * @param  string|int|object|WC_Order_Refund $refund Refund to init
-	 * @uses   WP_POST
+	 * This is the name of this object type.
+	 * @var string
 	 */
-	protected function init( $refund ) {
-		if ( is_numeric( $refund ) ) {
-			$this->id   = absint( $refund );
-			$this->post = get_post( $refund );
-			$this->get_refund( $this->id );
-		} elseif ( $refund instanceof WC_Order_Refund ) {
-			$this->id   = absint( $refund->id );
-			$this->post = $refund->post;
-			$this->get_refund( $this->id );
-		} elseif ( isset( $refund->ID ) ) {
-			$this->id   = absint( $refund->ID );
-			$this->post = $refund;
-			$this->get_refund( $this->id );
-		}
+	protected $object_type = 'order_refund';
+
+	/**
+	 * Stores product data.
+	 *
+	 * @var array
+	 */
+	protected $extra_data = array(
+		'amount'      => '',
+		'reason'      => '',
+		'refunded_by' => 0,
+	);
+
+	/**
+	 * Get internal type (post type.)
+	 * @return string
+	 */
+	public function get_type() {
+		return 'shop_order_refund';
 	}
 
 	/**
-	 * Gets an refund from the database.
+	 * Get status - always completed for refunds.
 	 *
-	 * @since 2.2
-	 * @param int $id
-	 * @return bool
+	 * @param  string $context
+	 * @return string
 	 */
-	public function get_refund( $id = 0 ) {
-		if ( ! $id ) {
-			return false;
-		}
-
-		if ( $result = get_post( $id ) ) {
-			$this->populate( $result );
-
-			return true;
-		}
-
-		return false;
+	public function get_status( $context = 'view' ) {
+		return 'completed';
 	}
 
 	/**
-	 * Populates an refund from the loaded post data.
-	 *
-	 * @param mixed $result
+	 * Get a title for the new post type.
 	 */
-	public function populate( $result ) {
-		// Standard post data
-		$this->id            = $result->ID;
-		$this->date          = $result->post_date;
-		$this->modified_date = $result->post_modified;
-		$this->reason        = $result->post_excerpt;
+	public function get_post_title() {
+		// @codingStandardsIgnoreStart
+		return sprintf( __( 'Refund &ndash; %s', 'woocommerce' ), strftime( _x( '%b %d, %Y @ %I:%M %p', 'Order date parsed by strftime', 'woocommerce' ) ) );
+		// @codingStandardsIgnoreEnd
 	}
 
 	/**
 	 * Get refunded amount.
 	 *
-	 * @since 2.2
+	 * @param  string $context
 	 * @return int|float
 	 */
-	public function get_refund_amount() {
-		return apply_filters( 'woocommerce_refund_amount', (double) $this->refund_amount, $this );
+	public function get_amount( $context = 'view' ) {
+		return $this->get_prop( 'amount', $context );
+	}
+
+	/**
+	 * Get refund reason.
+	 *
+	 * @since 2.2
+	 * @param  string $context
+	 * @return int|float
+	 */
+	public function get_reason( $context = 'view' ) {
+		return $this->get_prop( 'reason', $context );
+	}
+
+	/**
+	 * Get ID of user who did the refund.
+	 *
+	 * @since 3.0
+	 * @param  string $context
+	 * @return int
+	 */
+	public function get_refunded_by( $context = 'view' ) {
+		return $this->get_prop( 'refunded_by', $context );
+
 	}
 
 	/**
@@ -97,17 +105,93 @@ class WC_Order_Refund extends WC_Abstract_Order {
 	 * @return string
 	 */
 	public function get_formatted_refund_amount() {
-		return apply_filters( 'woocommerce_formatted_refund_amount', wc_price( $this->refund_amount, array('currency' => $this->get_order_currency()) ), $this );
+		return apply_filters( 'woocommerce_formatted_refund_amount', wc_price( $this->get_amount(), array( 'currency' => $this->get_currency() ) ), $this );
 	}
 
+	/**
+	 * Set refunded amount.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_amount( $value ) {
+		$this->set_prop( 'amount', wc_format_decimal( $value ) );
+	}
 
 	/**
-	 * Get refunded amount.
+	 * Set refund reason.
 	 *
-	 * @since 2.2
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_reason( $value ) {
+		$this->set_prop( 'reason', $value );
+	}
+
+	/**
+	 * Set refunded by.
+	 *
+	 * @param int $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_refunded_by( $value ) {
+		$this->set_prop( 'refunded_by', absint( $value ) );
+	}
+
+	/**
+	 * Magic __get method for backwards compatibility.
+	 *
+	 * @param string $key
+	 * @return mixed
+	 */
+	public function __get( $key ) {
+		wc_doing_it_wrong( $key, 'Refund properties should not be accessed directly.', '3.0' );
+		/**
+		 * Maps legacy vars to new getters.
+		 */
+		if ( 'reason' === $key ) {
+			return $this->get_reason();
+		} elseif ( 'refund_amount' === $key ) {
+			return $this->get_amount();
+		}
+		return parent::__get( $key );
+	}
+
+	/**
+	 * Gets an refund from the database.
+	 * @deprecated 3.0
+	 * @param int $id (default: 0).
+	 * @return bool
+	 */
+	public function get_refund( $id = 0 ) {
+		wc_deprecated_function( 'get_refund', '3.0', 'read' );
+		if ( ! $id ) {
+			return false;
+		}
+		if ( $result = get_post( $id ) ) {
+			$this->populate( $result );
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Get refund amount.
+	 * @deprecated 3.0
+	 * @return int|float
+	 */
+	public function get_refund_amount() {
+		wc_deprecated_function( 'get_refund_amount', '3.0', 'get_amount' );
+		return $this->get_amount();
+	}
+
+	/**
+	 * Get refund reason.
+	 * @deprecated 3.0
 	 * @return int|float
 	 */
 	public function get_refund_reason() {
-		return apply_filters( 'woocommerce_refund_reason', $this->reason, $this );
+		wc_deprecated_function( 'get_refund_reason', '3.0', 'get_reason' );
+		return $this->get_reason();
 	}
 }
diff --git a/includes/class-wc-order.php b/includes/class-wc-order.php
index 12e5b8780f1..8039a7b6849 100644
--- a/includes/class-wc-order.php
+++ b/includes/class-wc-order.php
@@ -1,11 +1,13 @@
 <?php
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
 /**
- * Order
+ * Order Class.
+ *
+ * These are regular WooCommerce orders, which extend the abstract order class.
  *
  * @class    WC_Order
  * @version  2.2.0
@@ -15,71 +17,1536 @@ if ( ! defined( 'ABSPATH' ) ) {
  */
 class WC_Order extends WC_Abstract_Order {
 
-	/** @public string Order type */
-	public $order_type = 'simple';
+	/**
+	 * Stores data about status changes so relevant hooks can be fired.
+	 * @var bool|array
+	 */
+	protected $status_transition = false;
+
+	/**
+	 * Order Data array. This is the core order data exposed in APIs since 3.0.0.
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $data = array(
+		// Abstract order props
+		'parent_id'            => 0,
+		'status'               => '',
+		'currency'             => '',
+		'version'              => '',
+		'prices_include_tax'   => false,
+		'date_created'         => null,
+		'date_modified'        => null,
+		'discount_total'       => 0,
+		'discount_tax'         => 0,
+		'shipping_total'       => 0,
+		'shipping_tax'         => 0,
+		'cart_tax'             => 0,
+		'total'                => 0,
+		'total_tax'            => 0,
+
+		// Order props
+		'customer_id'          => 0,
+		'order_key'            => '',
+		'billing'              => array(
+			'first_name'       => '',
+			'last_name'        => '',
+			'company'          => '',
+			'address_1'        => '',
+			'address_2'        => '',
+			'city'             => '',
+			'state'            => '',
+			'postcode'         => '',
+			'country'          => '',
+			'email'            => '',
+			'phone'            => '',
+		),
+		'shipping'             => array(
+			'first_name'       => '',
+			'last_name'        => '',
+			'company'          => '',
+			'address_1'        => '',
+			'address_2'        => '',
+			'city'             => '',
+			'state'            => '',
+			'postcode'         => '',
+			'country'          => '',
+		),
+		'payment_method'       => '',
+		'payment_method_title' => '',
+		'transaction_id'       => '',
+		'customer_ip_address'  => '',
+		'customer_user_agent'  => '',
+		'created_via'          => '',
+		'customer_note'        => '',
+		'date_completed'       => null,
+		'date_paid'            => null,
+		'cart_hash'            => '',
+	);
+
+	/**
+	 * When a payment is complete this function is called.
+	 *
+	 * Most of the time this should mark an order as 'processing' so that admin can process/post the items.
+	 * If the cart contains only downloadable items then the order is 'completed' since the admin needs to take no action.
+	 * Stock levels are reduced at this point.
+	 * Sales are also recorded for products.
+	 * Finally, record the date of payment.
+	 *
+	 * Order must exist.
+	 *
+	 * @param string $transaction_id Optional transaction id to store in post meta.
+	 * @return bool success
+	 */
+	public function payment_complete( $transaction_id = '' ) {
+		try {
+			if ( ! $this->get_id() ) {
+				return false;
+			}
+			do_action( 'woocommerce_pre_payment_complete', $this->get_id() );
+
+			if ( ! empty( WC()->session ) ) {
+				WC()->session->set( 'order_awaiting_payment', false );
+			}
+
+			if ( $this->has_status( apply_filters( 'woocommerce_valid_order_statuses_for_payment_complete', array( 'on-hold', 'pending', 'failed', 'cancelled' ), $this ) ) ) {
+				if ( ! empty( $transaction_id ) ) {
+					$this->set_transaction_id( $transaction_id );
+				}
+				if ( ! $this->get_date_paid( 'edit' ) ) {
+					$this->set_date_paid( current_time( 'timestamp', true ) );
+				}
+				$this->set_status( apply_filters( 'woocommerce_payment_complete_order_status', $this->needs_processing() ? 'processing' : 'completed', $this->get_id(), $this ) );
+				$this->save();
+
+				do_action( 'woocommerce_payment_complete', $this->get_id() );
+			} else {
+				do_action( 'woocommerce_payment_complete_order_status_' . $this->get_status(), $this->get_id() );
+			}
+		} catch ( Exception $e ) {
+			return false;
+		}
+		return true;
+	}
 
 	/**
 	 * Gets order total - formatted for display.
 	 *
+	 * @param  string $tax_display     Type of tax display.
+	 * @param  bool  $display_refunded If should include refunded value.
+	 *
 	 * @return string
 	 */
 	public function get_formatted_order_total( $tax_display = '', $display_refunded = true ) {
-		$formatted_total = wc_price( $this->get_total(), array( 'currency' => $this->get_order_currency() ) );
+		$formatted_total = wc_price( $this->get_total(), array( 'currency' => $this->get_currency() ) );
 		$order_total    = $this->get_total();
 		$total_refunded = $this->get_total_refunded();
 		$tax_string     = '';
 
-		// Tax for inclusive prices
+		// Tax for inclusive prices.
 		if ( wc_tax_enabled() && 'incl' == $tax_display ) {
 			$tax_string_array = array();
 
 			if ( 'itemized' == get_option( 'woocommerce_tax_total_display' ) ) {
 				foreach ( $this->get_tax_totals() as $code => $tax ) {
-					$tax_amount         = ( $total_refunded && $display_refunded ) ? wc_price( WC_Tax::round( $tax->amount - $this->get_total_tax_refunded_by_rate_id( $tax->rate_id ) ), array( 'currency' => $this->get_order_currency() ) ) : $tax->formatted_amount;
+					$tax_amount         = ( $total_refunded && $display_refunded ) ? wc_price( WC_Tax::round( $tax->amount - $this->get_total_tax_refunded_by_rate_id( $tax->rate_id ) ), array( 'currency' => $this->get_currency() ) ) : $tax->formatted_amount;
 					$tax_string_array[] = sprintf( '%s %s', $tax_amount, $tax->label );
 				}
 			} else {
 				$tax_amount         = ( $total_refunded && $display_refunded ) ? $this->get_total_tax() - $this->get_total_tax_refunded() : $this->get_total_tax();
-				$tax_string_array[] = sprintf( '%s %s', wc_price( $tax_amount, array( 'currency' => $this->get_order_currency() ) ), WC()->countries->tax_or_vat() );
+				$tax_string_array[] = sprintf( '%s %s', wc_price( $tax_amount, array( 'currency' => $this->get_currency() ) ), WC()->countries->tax_or_vat() );
 			}
 			if ( ! empty( $tax_string_array ) ) {
-				$tax_string = ' ' . sprintf( __( '(Includes %s)', 'woocommerce' ), implode( ', ', $tax_string_array ) );
+				$tax_string = ' <small class="includes_tax">' . sprintf( __( '(includes %s)', 'woocommerce' ), implode( ', ', $tax_string_array ) ) . '</small>';
 			}
 		}
 
 		if ( $total_refunded && $display_refunded ) {
-			$formatted_total = '<del>' . strip_tags( $formatted_total ) . '</del> <ins>' . wc_price( $order_total - $total_refunded, array( 'currency' => $this->get_order_currency() ) ) . $tax_string . '</ins>';
+			$formatted_total = '<del>' . strip_tags( $formatted_total ) . '</del> <ins>' . wc_price( $order_total - $total_refunded, array( 'currency' => $this->get_currency() ) ) . $tax_string . '</ins>';
 		} else {
 			$formatted_total .= $tax_string;
 		}
 
-		return apply_filters( 'woocommerce_get_formatted_order_total', $formatted_total, $this );
+		/**
+		 * Filter WooCommerce formatted order total.
+		 *
+		 * @param string   $formatted_total  Total to display.
+		 * @param WC_Order $order            Order data.
+		 * @param string   $tax_display      Type of tax display.
+		 * @param bool     $display_refunded If should include refunded value.
+		 */
+		return apply_filters( 'woocommerce_get_formatted_order_total', $formatted_total, $this, $tax_display, $display_refunded );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| CRUD methods
+	|--------------------------------------------------------------------------
+	|
+	| Methods which create, read, update and delete orders from the database.
+	| Written in abstract fashion so that the way orders are stored can be
+	| changed more easily in the future.
+	|
+	| A save method is included for convenience (chooses update or create based
+	| on if the order exists yet).
+	|
+	*/
+
+	/**
+	 * Save data to the database.
+	 *
+	 * @since 3.0.0
+	 * @return int order ID
+	 */
+	public function save() {
+		$this->maybe_set_user_billing_email();
+		if ( $this->data_store ) {
+			// Trigger action before saving to the DB. Allows you to adjust object props before save.
+			do_action( 'woocommerce_before_' . $this->object_type . '_object_save', $this, $this->data_store );
+
+			if ( $this->get_id() ) {
+				$this->data_store->update( $this );
+			} else {
+				$this->data_store->create( $this );
+			}
+		}
+		$this->save_items();
+		$this->status_transition();
+		return $this->get_id();
 	}
 
+	/**
+	 * Set order status.
+	 * @since 3.0.0
+	 * @param string $new_status Status to change the order to. No internal wc- prefix is required.
+	 * @param string $note (default: '') Optional note to add.
+	 * @param bool $manual_update is this a manual order status change?
+	 * @param array details of change
+	 */
+	public function set_status( $new_status, $note = '', $manual_update = false ) {
+		$result = parent::set_status( $new_status );
+
+		if ( true === $this->object_read && ! empty( $result['from'] ) && $result['from'] !== $result['to'] ) {
+			$this->status_transition = array(
+				'from'   => ! empty( $this->status_transition['from'] ) ? $this->status_transition['from'] : $result['from'],
+				'to'     => $result['to'],
+				'note'   => $note,
+				'manual' => (bool) $manual_update,
+			);
+
+			$this->maybe_set_date_paid();
+			$this->maybe_set_date_completed();
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Maybe set date paid.
+	 *
+	 * Sets the date paid variable when transitioning to the payment complete
+	 * order status. This is either processing or completed. This is not filtered
+	 * to avoid infinite loops e.g. if loading an order via the filter.
+	 *
+	 * Date paid is set once in this manner - only when it is not already set.
+	 * This ensures the data exists even if a gateway does not use the
+	 * `payment_complete` method.
+	 *
+	 * @since 3.0.0
+	 */
+	public function maybe_set_date_paid() {
+		if ( ! $this->get_date_paid( 'edit' ) && $this->has_status( apply_filters( 'woocommerce_payment_complete_order_status', $this->needs_processing() ? 'processing' : 'completed', $this->get_id(), $this ) ) ) {
+			$this->set_date_paid( current_time( 'timestamp' ) );
+		}
+	}
+
+	/**
+	 * Maybe set date completed.
+	 *
+	 * Sets the date completed variable when transitioning to completed status.
+	 *
+	 * @since 3.0.0
+	 */
+	protected function maybe_set_date_completed() {
+		if ( $this->has_status( 'completed' ) ) {
+			$this->set_date_completed( current_time( 'timestamp', true ) );
+		}
+	}
+
+	/**
+	 * Updates status of order immediately. Order must exist.
+	 * @uses WC_Order::set_status()
+	 * @return bool success
+	 */
+	public function update_status( $new_status, $note = '', $manual = false ) {
+		try {
+			if ( ! $this->get_id() ) {
+				return false;
+			}
+			$this->set_status( $new_status, $note, $manual );
+			$this->save();
+		} catch ( Exception $e ) {
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Handle the status transition.
+	 */
+	protected function status_transition() {
+		if ( $this->status_transition ) {
+			do_action( 'woocommerce_order_status_' . $this->status_transition['to'], $this->get_id(), $this );
+
+			if ( ! empty( $this->status_transition['from'] ) ) {
+				/* translators: 1: old order status 2: new order status */
+				$transition_note = sprintf( __( 'Order status changed from %1$s to %2$s.', 'woocommerce' ), wc_get_order_status_name( $this->status_transition['from'] ), wc_get_order_status_name( $this->status_transition['to'] ) );
+
+				do_action( 'woocommerce_order_status_' . $this->status_transition['from'] . '_to_' . $this->status_transition['to'], $this->get_id(), $this );
+				do_action( 'woocommerce_order_status_changed', $this->get_id(), $this->status_transition['from'], $this->status_transition['to'], $this );
+			} else {
+				/* translators: %s: new order status */
+				$transition_note = sprintf( __( 'Order status set to %s.', 'woocommerce' ), wc_get_order_status_name( $this->status_transition['to'] ) );
+			}
+
+			// Note the transition occurred
+			$this->add_order_note( trim( $this->status_transition['note'] . ' ' . $transition_note ), 0, $this->status_transition['manual'] );
+
+			// This has ran, so reset status transition variable
+			$this->status_transition = false;
+		}
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Getters
+	|--------------------------------------------------------------------------
+	|
+	| Methods for getting data from the order object.
+	|
+	*/
+
+	/**
+	 * Get all class data in array format.
+	 * @since 3.0.0
+	 * @return array
+	 */
+	public function get_data() {
+		return array_merge(
+			array(
+				'id' => $this->get_id(),
+			),
+			$this->data,
+			array(
+				'number'         => $this->get_order_number(),
+				'meta_data'      => $this->get_meta_data(),
+				'line_items'     => $this->get_items( 'line_item' ),
+				'tax_lines'      => $this->get_items( 'tax' ),
+				'shipping_lines' => $this->get_items( 'shipping' ),
+				'fee_lines'      => $this->get_items( 'fee' ),
+				'coupon_lines'   => $this->get_items( 'coupon' ),
+			)
+		);
+	}
+
+	/**
+	 * Expands the shipping and billing information in the changes array.
+	 */
+	public function get_changes() {
+		$changed_props = parent::get_changes();
+		$subs          = array( 'shipping', 'billing' );
+		foreach ( $subs as $sub ) {
+			if ( ! empty( $changed_props[ $sub ] ) ) {
+				foreach ( $changed_props[ $sub ] as $sub_prop => $value ) {
+					$changed_props[ $sub . '_' . $sub_prop ] = $value;
+				}
+			}
+		}
+		if ( isset( $changed_props['customer_note'] ) ) {
+			$changed_props['post_excerpt'] = $changed_props['customer_note'];
+		}
+		return $changed_props;
+	}
+
+	/**
+	 * get_order_number function.
+	 *
+	 * Gets the order number for display (by default, order ID).
+	 *
+	 * @return string
+	 */
+	public function get_order_number() {
+		return (string) apply_filters( 'woocommerce_order_number', $this->get_id(), $this );
+	}
+
+	/**
+	 * Get order key.
+	 *
+	 * @since  3.0.0
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_order_key( $context = 'view' ) {
+		return $this->get_prop( 'order_key', $context );
+	}
+
+	/**
+	 * Get customer_id.
+	 *
+	 * @param  string $context
+	 * @return int
+	 */
+	public function get_customer_id( $context = 'view' ) {
+		return $this->get_prop( 'customer_id', $context );
+	}
+
+	/**
+	 * Alias for get_customer_id().
+	 *
+	 * @param  string $context
+	 * @return int
+	 */
+	public function get_user_id( $context = 'view' ) {
+		return $this->get_customer_id( $context );
+	}
+
+	/**
+	 * Get the user associated with the order. False for guests.
+	 *
+	 * @return WP_User|false
+	 */
+	public function get_user() {
+		return $this->get_user_id() ? get_user_by( 'id', $this->get_user_id() ) : false;
+	}
+
+	/**
+	 * Gets a prop for a getter method.
+	 *
+	 * @since  3.0.0
+	 * @param  string $prop Name of prop to get.
+	 * @param  string $address billing or shipping.
+	 * @param  string $context What the value is for. Valid values are view and edit.
+	 * @return mixed
+	 */
+	protected function get_address_prop( $prop, $address = 'billing', $context = 'view' ) {
+		$value = null;
+
+		if ( array_key_exists( $prop, $this->data[ $address ] ) ) {
+			$value = isset( $this->changes[ $address ][ $prop ] ) ? $this->changes[ $address ][ $prop ] : $this->data[ $address ][ $prop ];
+
+			if ( 'view' === $context ) {
+				$value = apply_filters( $this->get_hook_prefix() . $address . '_' . $prop, $value, $this );
+			}
+		}
+		return $value;
+	}
+
+	/**
+	 * Get billing_first_name.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_billing_first_name( $context = 'view' ) {
+		return $this->get_address_prop( 'first_name', 'billing', $context );
+	}
+
+	/**
+	 * Get billing_last_name.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_billing_last_name( $context = 'view' ) {
+		return $this->get_address_prop( 'last_name', 'billing', $context );
+	}
+
+	/**
+	 * Get billing_company.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_billing_company( $context = 'view' ) {
+		return $this->get_address_prop( 'company', 'billing', $context );
+	}
+
+	/**
+	 * Get billing_address_1.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_billing_address_1( $context = 'view' ) {
+		return $this->get_address_prop( 'address_1', 'billing', $context );
+	}
+
+	/**
+	 * Get billing_address_2.
+	 *
+	 * @param  string $context
+	 * @return string $value
+	 */
+	public function get_billing_address_2( $context = 'view' ) {
+		return $this->get_address_prop( 'address_2', 'billing', $context );
+	}
+
+	/**
+	 * Get billing_city.
+	 *
+	 * @param  string $context
+	 * @return string $value
+	 */
+	public function get_billing_city( $context = 'view' ) {
+		return $this->get_address_prop( 'city', 'billing', $context );
+	}
+
+	/**
+	 * Get billing_state.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_billing_state( $context = 'view' ) {
+		return $this->get_address_prop( 'state', 'billing', $context );
+	}
+
+	/**
+	 * Get billing_postcode.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_billing_postcode( $context = 'view' ) {
+		return $this->get_address_prop( 'postcode', 'billing', $context );
+	}
+
+	/**
+	 * Get billing_country.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_billing_country( $context = 'view' ) {
+		return $this->get_address_prop( 'country', 'billing', $context );
+	}
+
+	/**
+	 * Get billing_email.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_billing_email( $context = 'view' ) {
+		return $this->get_address_prop( 'email', 'billing', $context );
+	}
+
+	/**
+	 * Get billing_phone.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_billing_phone( $context = 'view' ) {
+		return $this->get_address_prop( 'phone', 'billing', $context );
+	}
+
+	/**
+	 * Get shipping_first_name.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_shipping_first_name( $context = 'view' ) {
+		return $this->get_address_prop( 'first_name', 'shipping', $context );
+	}
+
+	/**
+	 * Get shipping_last_name.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_shipping_last_name( $context = 'view' ) {
+		 return $this->get_address_prop( 'last_name', 'shipping', $context );
+	}
+
+	/**
+	 * Get shipping_company.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_shipping_company( $context = 'view' ) {
+		return $this->get_address_prop( 'company', 'shipping', $context );
+	}
+
+	/**
+	 * Get shipping_address_1.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_shipping_address_1( $context = 'view' ) {
+		return $this->get_address_prop( 'address_1', 'shipping', $context );
+	}
+
+	/**
+	 * Get shipping_address_2.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_shipping_address_2( $context = 'view' ) {
+		return $this->get_address_prop( 'address_2', 'shipping', $context );
+	}
+
+	/**
+	 * Get shipping_city.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_shipping_city( $context = 'view' ) {
+		return $this->get_address_prop( 'city', 'shipping', $context );
+	}
+
+	/**
+	 * Get shipping_state.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_shipping_state( $context = 'view' ) {
+		return $this->get_address_prop( 'state', 'shipping', $context );
+	}
+
+	/**
+	 * Get shipping_postcode.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_shipping_postcode( $context = 'view' ) {
+		return $this->get_address_prop( 'postcode', 'shipping', $context );
+	}
+
+	/**
+	 * Get shipping_country.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_shipping_country( $context = 'view' ) {
+		return $this->get_address_prop( 'country', 'shipping', $context );
+	}
+
+	/**
+	 * Get the payment method.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_payment_method( $context = 'view' ) {
+		return $this->get_prop( 'payment_method', $context );
+	}
+
+	/**
+	 * Get payment_method_title.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_payment_method_title( $context = 'view' ) {
+		return $this->get_prop( 'payment_method_title', $context );
+	}
+
+	/**
+	 * Get transaction_id.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_transaction_id( $context = 'view' ) {
+		return $this->get_prop( 'transaction_id', $context );
+	}
+
+	/**
+	 * Get customer_ip_address.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_customer_ip_address( $context = 'view' ) {
+		return $this->get_prop( 'customer_ip_address', $context );
+	}
+
+	/**
+	 * Get customer_user_agent.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_customer_user_agent( $context = 'view' ) {
+		return $this->get_prop( 'customer_user_agent', $context );
+	}
+
+	/**
+	 * Get created_via.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_created_via( $context = 'view' ) {
+		return $this->get_prop( 'created_via', $context );
+	}
+
+	/**
+	 * Get customer_note.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_customer_note( $context = 'view' ) {
+		return $this->get_prop( 'customer_note', $context );
+	}
+
+	/**
+	 * Get date_completed.
+	 *
+	 * @param  string $context
+	 * @return WC_DateTime|NULL object if the date is set or null if there is no date.
+	 */
+	public function get_date_completed( $context = 'view' ) {
+		return $this->get_prop( 'date_completed', $context );
+	}
+
+	/**
+	 * Get date_paid.
+	 *
+	 * @param  string $context
+	 * @return WC_DateTime|NULL object if the date is set or null if there is no date.
+	 */
+	public function get_date_paid( $context = 'view' ) {
+		$date_paid = $this->get_prop( 'date_paid', $context );
+
+		if ( 'view' === $context && ! $date_paid && version_compare( $this->get_version( 'edit' ), '3.0', '<' ) && $this->has_status( apply_filters( 'woocommerce_payment_complete_order_status', $this->needs_processing() ? 'processing' : 'completed', $this->get_id(), $this ) ) ) {
+			// In view context, return a date if missing.
+			$date_paid = $this->get_date_created( 'edit' );
+		}
+		return $date_paid;
+	}
+
+	/**
+	 * Get cart hash.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_cart_hash( $context = 'view' ) {
+		return $this->get_prop( 'cart_hash', $context );
+	}
+
+	/**
+	 * Returns the requested address in raw, non-formatted way.
+	 * Note: Merges raw data with get_prop data so changes are returned too.
+	 *
+	 * @since  2.4.0
+	 * @param  string $type Billing or shipping. Anything else besides 'billing' will return shipping address.
+	 * @return array The stored address after filter.
+	 */
+	public function get_address( $type = 'billing' ) {
+		return apply_filters( 'woocommerce_get_order_address', array_merge( $this->data[ $type ], $this->get_prop( $type, 'view' ) ), $type, $this );
+	}
+
+	/**
+	 * Get a formatted shipping address for the order.
+	 *
+	 * @return string
+	 */
+	public function get_shipping_address_map_url() {
+		$address = $this->get_address( 'shipping' );
+
+		// Remove name and company before generate the Google Maps URL.
+		unset( $address['first_name'], $address['last_name'], $address['company'] );
+
+		$address = apply_filters( 'woocommerce_shipping_address_map_url_parts', $address, $this );
+
+		return apply_filters( 'woocommerce_shipping_address_map_url', 'https://maps.google.com/maps?&q=' . urlencode( implode( ', ', $address ) ) . '&z=16', $this );
+	}
+
+	/**
+	 * Get a formatted billing full name.
+	 *
+	 * @return string
+	 */
+	public function get_formatted_billing_full_name() {
+		/* translators: 1: first name 2: last name */
+		return sprintf( _x( '%1$s %2$s', 'full name', 'woocommerce' ), $this->get_billing_first_name(), $this->get_billing_last_name() );
+	}
+
+	/**
+	 * Get a formatted shipping full name.
+	 *
+	 * @return string
+	 */
+	public function get_formatted_shipping_full_name() {
+		/* translators: 1: first name 2: last name */
+		return sprintf( _x( '%1$s %2$s', 'full name', 'woocommerce' ), $this->get_shipping_first_name(), $this->get_shipping_last_name() );
+	}
+
+	/**
+	 * Get a formatted billing address for the order.
+	 *
+	 * @return string
+	 */
+	public function get_formatted_billing_address() {
+		return WC()->countries->get_formatted_address( apply_filters( 'woocommerce_order_formatted_billing_address', $this->get_address( 'billing' ), $this ) );
+	}
+
+	/**
+	 * Get a formatted shipping address for the order.
+	 *
+	 * @return string
+	 */
+	public function get_formatted_shipping_address() {
+		if ( $this->has_shipping_address() ) {
+			return WC()->countries->get_formatted_address( apply_filters( 'woocommerce_order_formatted_shipping_address', $this->get_address( 'shipping' ), $this ) );
+		} else {
+			return '';
+		}
+	}
+
+	/**
+	 * Returns true if the order has a shipping address.
+	 *
+	 * @since  3.0.4
+	 * @return boolean
+	 */
+	public function has_shipping_address() {
+		return $this->get_shipping_address_1() || $this->get_shipping_address_2();
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Setters
+	|--------------------------------------------------------------------------
+	|
+	| Functions for setting order data. These should not update anything in the
+	| database itself and should only change what is stored in the class
+	| object. However, for backwards compatibility pre 3.0.0 some of these
+	| setters may handle both.
+	|
+	*/
+
+	/**
+	 * Sets a prop for a setter method.
+	 *
+	 * @since 3.0.0
+	 * @param string $prop Name of prop to set.
+	 * @param string $address Name of address to set. billing or shipping.
+	 * @param mixed  $value Value of the prop.
+	 */
+	protected function set_address_prop( $prop, $address = 'billing', $value ) {
+		if ( array_key_exists( $prop, $this->data[ $address ] ) ) {
+			if ( true === $this->object_read ) {
+				if ( $value !== $this->data[ $address ][ $prop ] || ( isset( $this->changes[ $address ] ) && array_key_exists( $prop, $this->changes[ $address ] ) ) ) {
+					$this->changes[ $address ][ $prop ] = $value;
+				}
+			} else {
+				$this->data[ $address ][ $prop ] = $value;
+			}
+		}
+	}
+
+	/**
+	 * Set order_key.
+	 *
+	 * @param string $value Max length 22 chars.
+	 * @throws WC_Data_Exception
+	 */
+	public function set_order_key( $value ) {
+		$this->set_prop( 'order_key', substr( $value, 0, 22 ) );
+	}
+
+	/**
+	 * Set customer_id.
+	 *
+	 * @param int $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_customer_id( $value ) {
+		$this->set_prop( 'customer_id', absint( $value ) );
+	}
+
+	/**
+	 * Set billing_first_name.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_billing_first_name( $value ) {
+		$this->set_address_prop( 'first_name', 'billing', $value );
+	}
+
+	/**
+	 * Set billing_last_name.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_billing_last_name( $value ) {
+		$this->set_address_prop( 'last_name', 'billing', $value );
+	}
+
+	/**
+	 * Set billing_company.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_billing_company( $value ) {
+		$this->set_address_prop( 'company', 'billing', $value );
+	}
+
+	/**
+	 * Set billing_address_1.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_billing_address_1( $value ) {
+		$this->set_address_prop( 'address_1', 'billing', $value );
+	}
+
+	/**
+	 * Set billing_address_2.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_billing_address_2( $value ) {
+		$this->set_address_prop( 'address_2', 'billing', $value );
+	}
+
+	/**
+	 * Set billing_city.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_billing_city( $value ) {
+		$this->set_address_prop( 'city', 'billing', $value );
+	}
+
+	/**
+	 * Set billing_state.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_billing_state( $value ) {
+		$this->set_address_prop( 'state', 'billing', $value );
+	}
+
+	/**
+	 * Set billing_postcode.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_billing_postcode( $value ) {
+		$this->set_address_prop( 'postcode', 'billing', $value );
+	}
+
+	/**
+	 * Set billing_country.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_billing_country( $value ) {
+		$this->set_address_prop( 'country', 'billing', $value );
+	}
+
+	/**
+	 * Maybe set empty billing email to that of the user who owns the order.
+	 */
+	protected function maybe_set_user_billing_email() {
+		if ( ! $this->get_billing_email() && ( $user = $this->get_user() ) ) {
+			try {
+				$this->set_billing_email( $user->user_email );
+			} catch( WC_Data_Exception $e ) {
+				unset( $e );
+			}
+		}
+	}
+
+	/**
+	 * Set billing_email.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_billing_email( $value ) {
+		if ( $value && ! is_email( $value ) ) {
+			$this->error( 'order_invalid_billing_email', __( 'Invalid billing email address', 'woocommerce' ) );
+		}
+		$this->set_address_prop( 'email', 'billing', sanitize_email( $value ) );
+	}
+
+	/**
+	 * Set billing_phone.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_billing_phone( $value ) {
+		$this->set_address_prop( 'phone', 'billing', $value );
+	}
+
+	/**
+	 * Set shipping_first_name.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_shipping_first_name( $value ) {
+		$this->set_address_prop( 'first_name', 'shipping', $value );
+	}
+
+	/**
+	 * Set shipping_last_name.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_shipping_last_name( $value ) {
+		$this->set_address_prop( 'last_name', 'shipping', $value );
+	}
+
+	/**
+	 * Set shipping_company.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_shipping_company( $value ) {
+		$this->set_address_prop( 'company', 'shipping', $value );
+	}
+
+	/**
+	 * Set shipping_address_1.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_shipping_address_1( $value ) {
+		$this->set_address_prop( 'address_1', 'shipping', $value );
+	}
+
+	/**
+	 * Set shipping_address_2.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_shipping_address_2( $value ) {
+		$this->set_address_prop( 'address_2', 'shipping', $value );
+	}
+
+	/**
+	 * Set shipping_city.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_shipping_city( $value ) {
+		$this->set_address_prop( 'city', 'shipping', $value );
+	}
+
+	/**
+	 * Set shipping_state.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_shipping_state( $value ) {
+		$this->set_address_prop( 'state', 'shipping', $value );
+	}
+
+	/**
+	 * Set shipping_postcode.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_shipping_postcode( $value ) {
+		$this->set_address_prop( 'postcode', 'shipping', $value );
+	}
+
+	/**
+	 * Set shipping_country.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_shipping_country( $value ) {
+		$this->set_address_prop( 'country', 'shipping', $value );
+	}
+
+	/**
+	 * Set the payment method.
+	 *
+	 * @param string $payment_method Supports WC_Payment_Gateway for bw compatibility with < 3.0
+	 * @throws WC_Data_Exception
+	 */
+	public function set_payment_method( $payment_method = '' ) {
+		if ( is_object( $payment_method ) ) {
+			$this->set_payment_method( $payment_method->id );
+			$this->set_payment_method_title( $payment_method->get_title() );
+		} elseif ( '' === $payment_method ) {
+			$this->set_prop( 'payment_method', '' );
+			$this->set_prop( 'payment_method_title', '' );
+		} else {
+			$this->set_prop( 'payment_method', $payment_method );
+		}
+	}
+
+	/**
+	 * Set payment_method_title.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_payment_method_title( $value ) {
+		$this->set_prop( 'payment_method_title', $value );
+	}
+
+	/**
+	 * Set transaction_id.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_transaction_id( $value ) {
+		$this->set_prop( 'transaction_id', $value );
+	}
+
+	/**
+	 * Set customer_ip_address.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_customer_ip_address( $value ) {
+		$this->set_prop( 'customer_ip_address', $value );
+	}
+
+	/**
+	 * Set customer_user_agent.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_customer_user_agent( $value ) {
+		$this->set_prop( 'customer_user_agent', $value );
+	}
+
+	/**
+	 * Set created_via.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_created_via( $value ) {
+		$this->set_prop( 'created_via', $value );
+	}
+
+	/**
+	 * Set customer_note.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_customer_note( $value ) {
+		$this->set_prop( 'customer_note', $value );
+	}
+
+	/**
+	 * Set date_completed.
+	 *
+	 * @param  string|integer|null $date UTC timestamp, or ISO 8601 DateTime. If the DateTime string has no timezone or offset, WordPress site timezone will be assumed. Null if their is no date.
+	 * @throws WC_Data_Exception
+	 */
+	public function set_date_completed( $date = null ) {
+		$this->set_date_prop( 'date_completed', $date );
+	}
+
+	/**
+	 * Set date_paid.
+	 *
+	 * @param  string|integer|null $date UTC timestamp, or ISO 8601 DateTime. If the DateTime string has no timezone or offset, WordPress site timezone will be assumed. Null if their is no date.
+	 * @throws WC_Data_Exception
+	 */
+	public function set_date_paid( $date = null ) {
+		$this->set_date_prop( 'date_paid', $date );
+	}
+
+	/**
+	 * Set cart hash.
+	 *
+	 * @param string $value
+	 * @throws WC_Data_Exception
+	 */
+	public function set_cart_hash( $value ) {
+		$this->set_prop( 'cart_hash', $value );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Conditionals
+	|--------------------------------------------------------------------------
+	|
+	| Checks if a condition is true or false.
+	|
+	*/
+
+	/**
+	 * Check if an order key is valid.
+	 *
+	 * @param mixed $key
+	 * @return bool
+	 */
+	public function key_is_valid( $key ) {
+		return $key === $this->get_order_key();
+	}
+
+	/**
+	 * See if order matches cart_hash.
+	 * @return bool
+	 */
+	public function has_cart_hash( $cart_hash = '' ) {
+		return hash_equals( $this->get_cart_hash(), $cart_hash );
+	}
+
+	/**
+	 * Checks if an order can be edited, specifically for use on the Edit Order screen.
+	 * @return bool
+	 */
+	public function is_editable() {
+		return apply_filters( 'wc_order_is_editable', in_array( $this->get_status(), array( 'pending', 'on-hold', 'auto-draft' ) ), $this );
+	}
+
+	/**
+	 * Returns if an order has been paid for based on the order status.
+	 * @since 2.5.0
+	 * @return bool
+	 */
+	public function is_paid() {
+		return apply_filters( 'woocommerce_order_is_paid', $this->has_status( wc_get_is_paid_statuses() ), $this );
+	}
+
+	/**
+	 * Checks if product download is permitted.
+	 *
+	 * @return bool
+	 */
+	public function is_download_permitted() {
+		return apply_filters( 'woocommerce_order_is_download_permitted', $this->has_status( 'completed' ) || ( 'yes' === get_option( 'woocommerce_downloads_grant_access_after_payment' ) && $this->has_status( 'processing' ) ), $this );
+	}
+
+	/**
+	 * Checks if an order needs display the shipping address, based on shipping method.
+	 * @return bool
+	 */
+	public function needs_shipping_address() {
+		if ( 'no' === get_option( 'woocommerce_calc_shipping' ) ) {
+			return false;
+		}
+
+		$hide  = apply_filters( 'woocommerce_order_hide_shipping_address', array( 'local_pickup' ), $this );
+		$needs_address = false;
+
+		foreach ( $this->get_shipping_methods() as $shipping_method ) {
+			// Remove any instance IDs after :
+			$shipping_method_id = current( explode( ':', $shipping_method['method_id'] ) );
+
+			if ( ! in_array( $shipping_method_id, $hide ) ) {
+				$needs_address = true;
+				break;
+			}
+		}
+
+		return apply_filters( 'woocommerce_order_needs_shipping_address', $needs_address, $hide, $this );
+	}
+
+	/**
+	 * Returns true if the order contains a downloadable product.
+	 * @return bool
+	 */
+	public function has_downloadable_item() {
+		foreach ( $this->get_items() as $item ) {
+			if ( $item->is_type( 'line_item' ) && ( $product = $item->get_product() ) && $product->is_downloadable() && $product->has_file() ) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if an order needs payment, based on status and order total.
+	 *
+	 * @return bool
+	 */
+	public function needs_payment() {
+		$valid_order_statuses = apply_filters( 'woocommerce_valid_order_statuses_for_payment', array( 'pending', 'failed' ), $this );
+		return apply_filters( 'woocommerce_order_needs_payment', ( $this->has_status( $valid_order_statuses ) && $this->get_total() > 0 ), $this, $valid_order_statuses );
+	}
+
+	/**
+	 * See if the order needs processing before it can be completed.
+	 *
+	 * Orders which only contain virtual, downloadable items do not need admin
+	 * intervention.
+	 *
+	 * @since 3.0.0
+	 * @return bool
+	 */
+	public function needs_processing() {
+		$needs_processing = false;
+
+		if ( sizeof( $this->get_items() ) > 0 ) {
+			foreach ( $this->get_items() as $item ) {
+				if ( $item->is_type( 'line_item' ) && ( $product = $item->get_product() ) ) {
+					$virtual_downloadable_item = $product->is_downloadable() && $product->is_virtual();
+
+					if ( apply_filters( 'woocommerce_order_item_needs_processing', ! $virtual_downloadable_item, $product, $this->get_id() ) ) {
+						$needs_processing = true;
+						break;
+					}
+				}
+			}
+		}
+
+		return $needs_processing;
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| URLs and Endpoints
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Generates a URL so that a customer can pay for their (unpaid - pending) order. Pass 'true' for the checkout version which doesn't offer gateway choices.
+	 *
+	 * @param  bool $on_checkout
+	 * @return string
+	 */
+	public function get_checkout_payment_url( $on_checkout = false ) {
+		$pay_url = wc_get_endpoint_url( 'order-pay', $this->get_id(), wc_get_page_permalink( 'checkout' ) );
+
+		if ( 'yes' == get_option( 'woocommerce_force_ssl_checkout' ) || is_ssl() ) {
+			$pay_url = str_replace( 'http:', 'https:', $pay_url );
+		}
+
+		if ( $on_checkout ) {
+			$pay_url = add_query_arg( 'key', $this->get_order_key(), $pay_url );
+		} else {
+			$pay_url = add_query_arg( array( 'pay_for_order' => 'true', 'key' => $this->get_order_key() ), $pay_url );
+		}
+
+		return apply_filters( 'woocommerce_get_checkout_payment_url', $pay_url, $this );
+	}
+
+	/**
+	 * Generates a URL for the thanks page (order received).
+	 *
+	 * @return string
+	 */
+	public function get_checkout_order_received_url() {
+		$order_received_url = wc_get_endpoint_url( 'order-received', $this->get_id(), wc_get_page_permalink( 'checkout' ) );
+
+		if ( 'yes' === get_option( 'woocommerce_force_ssl_checkout' ) || is_ssl() ) {
+			$order_received_url = str_replace( 'http:', 'https:', $order_received_url );
+		}
+
+		$order_received_url = add_query_arg( 'key', $this->get_order_key(), $order_received_url );
+
+		return apply_filters( 'woocommerce_get_checkout_order_received_url', $order_received_url, $this );
+	}
+
+	/**
+	 * Generates a URL so that a customer can cancel their (unpaid - pending) order.
+	 *
+	 * @param string $redirect
+	 *
+	 * @return string
+	 */
+	public function get_cancel_order_url( $redirect = '' ) {
+		return apply_filters( 'woocommerce_get_cancel_order_url', wp_nonce_url( add_query_arg( array(
+			'cancel_order' => 'true',
+			'order'        => $this->get_order_key(),
+			'order_id'     => $this->get_id(),
+			'redirect'     => $redirect,
+		), $this->get_cancel_endpoint() ), 'woocommerce-cancel_order' ) );
+	}
+
+	/**
+	 * Generates a raw (unescaped) cancel-order URL for use by payment gateways.
+	 *
+	 * @param string $redirect
+	 *
+	 * @return string The unescaped cancel-order URL.
+	 */
+	public function get_cancel_order_url_raw( $redirect = '' ) {
+		return apply_filters( 'woocommerce_get_cancel_order_url_raw', add_query_arg( array(
+			'cancel_order' => 'true',
+			'order'        => $this->get_order_key(),
+			'order_id'     => $this->get_id(),
+			'redirect'     => $redirect,
+			'_wpnonce'     => wp_create_nonce( 'woocommerce-cancel_order' ),
+		), $this->get_cancel_endpoint() ) );
+	}
+
+	/**
+	 * Helper method to return the cancel endpoint.
+	 *
+	 * @return string the cancel endpoint; either the cart page or the home page.
+	 */
+	public function get_cancel_endpoint() {
+		$cancel_endpoint = wc_get_page_permalink( 'cart' );
+		if ( ! $cancel_endpoint ) {
+			$cancel_endpoint = home_url();
+		}
+
+		if ( false === strpos( $cancel_endpoint, '?' ) ) {
+			$cancel_endpoint = trailingslashit( $cancel_endpoint );
+		}
+
+		return $cancel_endpoint;
+	}
+
+	/**
+	 * Generates a URL to view an order from the my account page.
+	 *
+	 * @return string
+	 */
+	public function get_view_order_url() {
+		return apply_filters( 'woocommerce_get_view_order_url', wc_get_endpoint_url( 'view-order', $this->get_id(), wc_get_page_permalink( 'myaccount' ) ), $this );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Order notes.
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Adds a note (comment) to the order. Order must exist.
+	 *
+	 * @param string $note Note to add.
+	 * @param int $is_customer_note (default: 0) Is this a note for the customer?
+	 * @param  bool added_by_user Was the note added by a user?
+	 * @return int Comment ID.
+	 */
+	public function add_order_note( $note, $is_customer_note = 0, $added_by_user = false ) {
+		if ( ! $this->get_id() ) {
+			return 0;
+		}
+
+		if ( is_user_logged_in() && current_user_can( 'edit_shop_order', $this->get_id() ) && $added_by_user ) {
+			$user                 = get_user_by( 'id', get_current_user_id() );
+			$comment_author       = $user->display_name;
+			$comment_author_email = $user->user_email;
+		} else {
+			$comment_author       = __( 'WooCommerce', 'woocommerce' );
+			$comment_author_email = strtolower( __( 'WooCommerce', 'woocommerce' ) ) . '@';
+			$comment_author_email .= isset( $_SERVER['HTTP_HOST'] ) ? str_replace( 'www.', '', $_SERVER['HTTP_HOST'] ) : 'noreply.com';
+			$comment_author_email = sanitize_email( $comment_author_email );
+		}
+		$commentdata = apply_filters( 'woocommerce_new_order_note_data', array(
+			'comment_post_ID'      => $this->get_id(),
+			'comment_author'       => $comment_author,
+			'comment_author_email' => $comment_author_email,
+			'comment_author_url'   => '',
+			'comment_content'      => $note,
+			'comment_agent'        => 'WooCommerce',
+			'comment_type'         => 'order_note',
+			'comment_parent'       => 0,
+			'comment_approved'     => 1,
+		), array( 'order_id' => $this->get_id(), 'is_customer_note' => $is_customer_note ) );
+
+		$comment_id = wp_insert_comment( $commentdata );
+
+		if ( $is_customer_note ) {
+			add_comment_meta( $comment_id, 'is_customer_note', 1 );
+
+			do_action( 'woocommerce_new_customer_note', array( 'order_id' => $this->get_id(), 'customer_note' => $commentdata['comment_content'] ) );
+		}
+
+		return $comment_id;
+	}
+
+	/**
+	 * List order notes (public) for the customer.
+	 *
+	 * @return array
+	 */
+	public function get_customer_order_notes() {
+		$notes = array();
+		$args  = array(
+			'post_id' => $this->get_id(),
+			'approve' => 'approve',
+			'type'    => '',
+		);
+
+		remove_filter( 'comments_clauses', array( 'WC_Comments', 'exclude_order_comments' ) );
+
+		$comments = get_comments( $args );
+
+		foreach ( $comments as $comment ) {
+			if ( ! get_comment_meta( $comment->comment_ID, 'is_customer_note', true ) ) {
+				continue;
+			}
+			$comment->comment_content = make_clickable( $comment->comment_content );
+			$notes[] = $comment;
+		}
+
+		add_filter( 'comments_clauses', array( 'WC_Comments', 'exclude_order_comments' ) );
+
+		return $notes;
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Refunds
+	|--------------------------------------------------------------------------
+	*/
+
 	/**
 	 * Get order refunds.
+	 *
 	 * @since 2.2
 	 * @return array of WC_Order_Refund objects
 	 */
 	public function get_refunds() {
-		if ( empty( $this->refunds ) && ! is_array( $this->refunds ) ) {
-			$refunds      = array();
-			$refund_items = get_posts(
-				array(
-					'post_type'      => 'shop_order_refund',
-					'post_parent'    => $this->id,
-					'posts_per_page' => -1,
-					'post_status'    => 'any',
-					'fields'         => 'ids'
-				)
-			);
+		$cache_key   = WC_Cache_Helper::get_cache_prefix( 'orders' ) . 'refunds' . $this->get_id();
+		$cached_data = wp_cache_get( $cache_key, $this->cache_group );
 
-			foreach ( $refund_items as $refund_id ) {
-				$refunds[] = new WC_Order_Refund( $refund_id );
-			}
-
-			$this->refunds = $refunds;
+		if ( false !== $cached_data ) {
+			return $cached_data;
 		}
+
+		$this->refunds = wc_get_orders( array(
+			'type'   => 'shop_order_refund',
+			'parent' => $this->get_id(),
+			'limit'  => -1,
+		) );
+
+		wp_cache_set( $cache_key, $this->refunds, $this->cache_group );
+
 		return $this->refunds;
 	}
 
@@ -90,17 +1557,18 @@ class WC_Order extends WC_Abstract_Order {
 	 * @return string
 	 */
 	public function get_total_refunded() {
-		global $wpdb;
+		$cache_key   = WC_Cache_Helper::get_cache_prefix( 'orders' ) . 'total_refunded' . $this->get_id();
+		$cached_data = wp_cache_get( $cache_key, $this->cache_group );
 
-		$total = $wpdb->get_var( $wpdb->prepare( "
-			SELECT SUM( postmeta.meta_value )
-			FROM $wpdb->postmeta AS postmeta
-			INNER JOIN $wpdb->posts AS posts ON ( posts.post_type = 'shop_order_refund' AND posts.post_parent = %d )
-			WHERE postmeta.meta_key = '_refund_amount'
-			AND postmeta.post_id = posts.ID
-		", $this->id ) );
+		if ( false !== $cached_data ) {
+			return $cached_data;
+		}
 
-		return $total;
+		$total_refunded = $this->data_store->get_total_refunded( $this );
+
+		wp_cache_set( $cache_key, $total_refunded, $this->cache_group );
+
+		return $total_refunded;
 	}
 
 	/**
@@ -110,18 +1578,18 @@ class WC_Order extends WC_Abstract_Order {
 	 * @return float
 	 */
 	public function get_total_tax_refunded() {
-		global $wpdb;
+		$cache_key   = WC_Cache_Helper::get_cache_prefix( 'orders' ) . 'total_tax_refunded' . $this->get_id();
+		$cached_data = wp_cache_get( $cache_key, $this->cache_group );
 
-		$total = $wpdb->get_var( $wpdb->prepare( "
-			SELECT SUM( order_itemmeta.meta_value )
-			FROM {$wpdb->prefix}woocommerce_order_itemmeta AS order_itemmeta
-			INNER JOIN $wpdb->posts AS posts ON ( posts.post_type = 'shop_order_refund' AND posts.post_parent = %d )
-			INNER JOIN {$wpdb->prefix}woocommerce_order_items AS order_items ON ( order_items.order_id = posts.ID AND order_items.order_item_type = 'tax' )
-			WHERE order_itemmeta.order_item_id = order_items.order_item_id
-			AND order_itemmeta.meta_key IN ('tax_amount', 'shipping_tax_amount')
-		", $this->id ) );
+		if ( false !== $cached_data ) {
+			return $cached_data;
+		}
 
-		return abs( $total );
+		$total_refunded = $this->data_store->get_total_tax_refunded( $this );
+
+		wp_cache_set( $cache_key, $total_refunded, $this->cache_group );
+
+		return $total_refunded;
 	}
 
 	/**
@@ -131,18 +1599,18 @@ class WC_Order extends WC_Abstract_Order {
 	 * @return float
 	 */
 	public function get_total_shipping_refunded() {
-		global $wpdb;
+		$cache_key   = WC_Cache_Helper::get_cache_prefix( 'orders' ) . 'total_shipping_refunded' . $this->get_id();
+		$cached_data = wp_cache_get( $cache_key, $this->cache_group );
 
-		$total = $wpdb->get_var( $wpdb->prepare( "
-			SELECT SUM( order_itemmeta.meta_value )
-			FROM {$wpdb->prefix}woocommerce_order_itemmeta AS order_itemmeta
-			INNER JOIN $wpdb->posts AS posts ON ( posts.post_type = 'shop_order_refund' AND posts.post_parent = %d )
-			INNER JOIN {$wpdb->prefix}woocommerce_order_items AS order_items ON ( order_items.order_id = posts.ID AND order_items.order_item_type = 'shipping' )
-			WHERE order_itemmeta.order_item_id = order_items.order_item_id
-			AND order_itemmeta.meta_key IN ('cost')
-		", $this->id ) );
+		if ( false !== $cached_data ) {
+			return $cached_data;
+		}
 
-		return abs( $total );
+		$total_refunded = $this->data_store->get_total_shipping_refunded( $this );
+
+		wp_cache_set( $cache_key, $total_refunded, $this->cache_group );
+
+		return $total_refunded;
 	}
 
 	/**
@@ -162,7 +1630,7 @@ class WC_Order extends WC_Abstract_Order {
 
 		foreach ( $this->get_refunds() as $refund ) {
 			foreach ( $refund->get_items( $item_type ) as $refunded_item ) {
-				$count += empty( $refunded_item['qty'] ) ? 0 : $refunded_item['qty'];
+				$count += abs( $refunded_item->get_quantity() );
 			}
 		}
 
@@ -180,7 +1648,7 @@ class WC_Order extends WC_Abstract_Order {
 		$qty = 0;
 		foreach ( $this->get_refunds() as $refund ) {
 			foreach ( $refund->get_items( $item_type ) as $refunded_item ) {
-				$qty += $refunded_item['qty'];
+				$qty += $refunded_item->get_quantity();
 			}
 		}
 		return $qty;
@@ -197,8 +1665,8 @@ class WC_Order extends WC_Abstract_Order {
 		$qty = 0;
 		foreach ( $this->get_refunds() as $refund ) {
 			foreach ( $refund->get_items( $item_type ) as $refunded_item ) {
-				if ( isset( $refunded_item['refunded_item_id'] ) && $refunded_item['refunded_item_id'] == $item_id ) {
-					$qty += $refunded_item['qty'];
+				if ( absint( $refunded_item->get_meta( '_refunded_item_id' ) ) === $item_id ) {
+					$qty += $refunded_item->get_quantity();
 				}
 			}
 		}
@@ -216,15 +1684,8 @@ class WC_Order extends WC_Abstract_Order {
 		$total = 0;
 		foreach ( $this->get_refunds() as $refund ) {
 			foreach ( $refund->get_items( $item_type ) as $refunded_item ) {
-				if ( isset( $refunded_item['refunded_item_id'] ) && $refunded_item['refunded_item_id'] == $item_id ) {
-					switch ( $item_type ) {
-						case 'shipping' :
-							$total += $refunded_item['cost'];
-						break;
-						default :
-							$total += $refunded_item['line_total'];
-						break;
-					}
+				if ( absint( $refunded_item->get_meta( '_refunded_item_id' ) ) === $item_id ) {
+					$total += $refunded_item->get_total();
 				}
 			}
 		}
@@ -232,7 +1693,7 @@ class WC_Order extends WC_Abstract_Order {
 	}
 
 	/**
-	 * Get the refunded amount for a line item.
+	 * Get the refunded tax amount for a line item.
 	 *
 	 * @param  int $item_id ID of the item we're checking
 	 * @param  int $tax_id ID of the tax we're checking
@@ -243,21 +1704,11 @@ class WC_Order extends WC_Abstract_Order {
 		$total = 0;
 		foreach ( $this->get_refunds() as $refund ) {
 			foreach ( $refund->get_items( $item_type ) as $refunded_item ) {
-				if ( isset( $refunded_item['refunded_item_id'] ) && $refunded_item['refunded_item_id'] == $item_id ) {
-					switch ( $item_type ) {
-						case 'shipping' :
-							$tax_data = maybe_unserialize( $refunded_item['taxes'] );
-							if ( isset( $tax_data[ $tax_id ] ) ) {
-								$total += $tax_data[ $tax_id ];
-							}
-						break;
-						default :
-							$tax_data = maybe_unserialize( $refunded_item['line_tax_data'] );
-							if ( isset( $tax_data['total'][ $tax_id ] ) ) {
-								$total += $tax_data['total'][ $tax_id ];
-							}
-						break;
-					}
+				$refunded_item_id = (int) $refunded_item->get_meta( '_refunded_item_id' );
+				if ( $refunded_item_id === $item_id ) {
+					$taxes = $refunded_item->get_taxes();
+					$total += isset( $taxes['total'][ $tax_id ] ) ? $taxes['total'][ $tax_id ] : 0;
+					break;
 				}
 			}
 		}
@@ -275,8 +1726,8 @@ class WC_Order extends WC_Abstract_Order {
 		$total = 0;
 		foreach ( $this->get_refunds() as $refund ) {
 			foreach ( $refund->get_items( 'tax' ) as $refunded_item ) {
-				if ( isset( $refunded_item['rate_id'] ) && $refunded_item['rate_id'] == $rate_id ) {
-					$total += abs( $refunded_item['tax_amount'] ) + abs( $refunded_item['shipping_tax_amount'] );
+				if ( absint( $refunded_item->get_rate_id() ) === $rate_id ) {
+					$total += abs( $refunded_item->get_tax_total() ) + abs( $refunded_item->get_shipping_tax_total() );
 				}
 			}
 		}
@@ -289,7 +1740,7 @@ class WC_Order extends WC_Abstract_Order {
 	 * @return string
 	 */
 	public function get_remaining_refund_amount() {
-		return wc_format_decimal( $this->get_total() - $this->get_total_refunded() );
+		return wc_format_decimal( $this->get_total() - $this->get_total_refunded(), wc_get_price_decimals() );
 	}
 
 	/**
@@ -299,4 +1750,58 @@ class WC_Order extends WC_Abstract_Order {
 	public function get_remaining_refund_items() {
 		return absint( $this->get_item_count() - $this->get_item_count_refunded() );
 	}
+
+	/**
+	 * Add total row for the payment method.
+	 *
+	 * @param array $total_rows
+	 * @param string $tax_display
+	 */
+	protected function add_order_item_totals_payment_method_row( &$total_rows, $tax_display ) {
+		if ( $this->get_total() > 0 && $this->get_payment_method_title() ) {
+			$total_rows['payment_method'] = array(
+				'label' => __( 'Payment method:', 'woocommerce' ),
+				'value' => $this->get_payment_method_title(),
+			);
+		}
+	}
+
+	/**
+	 * Add total row for refunds.
+	 *
+	 * @param array $total_rows
+	 * @param string $tax_display
+	 */
+	protected function add_order_item_totals_refund_rows( &$total_rows, $tax_display ) {
+		if ( $refunds = $this->get_refunds() ) {
+			foreach ( $refunds as $id => $refund ) {
+				$total_rows[ 'refund_' . $id ] = array(
+					'label' => $refund->get_reason() ? $refund->get_reason() : __( 'Refund', 'woocommerce' ) . ':',
+					'value'    => wc_price( '-' . $refund->get_amount(), array( 'currency' => $this->get_currency() ) ),
+				);
+			}
+		}
+	}
+
+	/**
+	 * Get totals for display on pages and in emails.
+	 *
+	 * @param mixed $tax_display
+	 * @return array
+	 */
+	public function get_order_item_totals( $tax_display = '' ) {
+		$tax_display = $tax_display ? $tax_display : get_option( 'woocommerce_tax_display_cart' );
+		$total_rows  = array();
+
+		$this->add_order_item_totals_subtotal_row( $total_rows, $tax_display );
+		$this->add_order_item_totals_discount_row( $total_rows, $tax_display );
+		$this->add_order_item_totals_shipping_row( $total_rows, $tax_display );
+		$this->add_order_item_totals_fee_rows( $total_rows, $tax_display );
+		$this->add_order_item_totals_tax_rows( $total_rows, $tax_display );
+		$this->add_order_item_totals_payment_method_row( $total_rows, $tax_display );
+		$this->add_order_item_totals_refund_rows( $total_rows, $tax_display );
+		$this->add_order_item_totals_total_row( $total_rows, $tax_display );
+
+		return apply_filters( 'woocommerce_get_order_item_totals', $total_rows, $this, $tax_display );
+	}
 }
diff --git a/includes/class-wc-payment-gateways.php b/includes/class-wc-payment-gateways.php
index a7c613d9708..9cb89d994d5 100644
--- a/includes/class-wc-payment-gateways.php
+++ b/includes/class-wc-payment-gateways.php
@@ -48,7 +48,7 @@ class WC_Payment_Gateways {
 	 * @since 2.1
 	 */
 	public function __clone() {
-		_doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'woocommerce' ), '2.1' );
+		wc_doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'woocommerce' ), '2.1' );
 	}
 
 	/**
@@ -57,7 +57,7 @@ class WC_Payment_Gateways {
 	 * @since 2.1
 	 */
 	public function __wakeup() {
-		_doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'woocommerce' ), '2.1' );
+		wc_doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'woocommerce' ), '2.1' );
 	}
 
 	/**
@@ -78,17 +78,18 @@ class WC_Payment_Gateways {
 			'WC_Gateway_Paypal',
 		);
 
-		$simplify_countries = (array) apply_filters( 'woocommerce_gateway_simplify_commerce_supported_countries', array( 'US', 'IE' ) );
+		/**
+		 * Simplify Commerce is @deprecated in 2.6.0. Only load when enabled.
+		 */
+		if ( ! class_exists( 'WC_Gateway_Simplify_Commerce_Loader' ) && in_array( WC()->countries->get_base_country(), apply_filters( 'woocommerce_gateway_simplify_commerce_supported_countries', array( 'US', 'IE' ) ) ) ) {
+			$simplify_options = get_option( 'woocommerce_simplify_commerce_settings', array() );
 
-		if ( in_array( WC()->countries->get_base_country(), $simplify_countries ) ) {
-			if ( class_exists( 'WC_Subscriptions_Order' ) || class_exists( 'WC_Pre_Orders_Order' ) ) {
-				if ( ! function_exists( 'wcs_create_renewal_order' ) ) { // Subscriptions < 2.0
-					$load_gateways[] = 'WC_Addons_Gateway_Simplify_Commerce_Deprecated';
-				} else {
+			if ( ! empty( $simplify_options['enabled'] ) && 'yes' === $simplify_options['enabled'] ) {
+				if ( function_exists( 'wcs_create_renewal_order' ) ) {
 					$load_gateways[] = 'WC_Addons_Gateway_Simplify_Commerce';
+				} else {
+					$load_gateways[] = 'WC_Gateway_Simplify_Commerce';
 				}
-			} else {
-				$load_gateways[] = 'WC_Gateway_Simplify_Commerce';
 			}
 		}
 
@@ -118,8 +119,6 @@ class WC_Payment_Gateways {
 
 	/**
 	 * Get gateways.
-	 *
-	 * @access public
 	 * @return array
 	 */
 	public function payment_gateways() {
@@ -134,6 +133,15 @@ class WC_Payment_Gateways {
 		return $_available_gateways;
 	}
 
+	/**
+	 * Get array of registered gateway ids
+	 * @since 2.6.0
+	 * @return array of strings
+	 */
+	public function get_payment_gateway_ids() {
+		return wp_list_pluck( $this->payment_gateways, 'id' );
+	}
+
 	/**
 	 * Get available gateways.
 	 *
@@ -146,7 +154,9 @@ class WC_Payment_Gateways {
 			if ( $gateway->is_available() ) {
 				if ( ! is_add_payment_method_page() ) {
 					$_available_gateways[ $gateway->id ] = $gateway;
-				} elseif( $gateway->supports( 'add_payment_method' ) ) {
+				} elseif ( $gateway->supports( 'add_payment_method' ) ) {
+					$_available_gateways[ $gateway->id ] = $gateway;
+				} elseif ( $gateway->supports( 'tokenization' ) ) {
 					$_available_gateways[ $gateway->id ] = $gateway;
 				}
 			}
@@ -166,7 +176,14 @@ class WC_Payment_Gateways {
 			return;
 		}
 
-		$current = WC()->session->get( 'chosen_payment_method' );
+		if ( is_user_logged_in() ) {
+			$default_token = WC_Payment_Tokens::get_customer_default_token( get_current_user_id() );
+			if ( ! is_null( $default_token ) ) {
+				$default_token_gateway = $default_token->get_gateway_id();
+			}
+		}
+
+		$current = ( isset( $default_token_gateway ) ? $default_token_gateway : WC()->session->get( 'chosen_payment_method' ) );
 
 		if ( $current && isset( $gateways[ $current ] ) ) {
 			$current_gateway = $gateways[ $current ];
diff --git a/includes/class-wc-payment-tokens.php b/includes/class-wc-payment-tokens.php
new file mode 100644
index 00000000000..fffcae484a5
--- /dev/null
+++ b/includes/class-wc-payment-tokens.php
@@ -0,0 +1,200 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WooCommerce Payment Tokens.
+ *
+ * An API for storing and managing tokens for gateways and customers.
+ *
+ * @class 		WC_Payment_Tokens
+ * @version     3.0.0
+ * @since		2.6.0
+ * @package		WooCommerce/Classes
+ * @category	Class
+ * @author		WooThemes
+ */
+class WC_Payment_Tokens {
+
+	/**
+	 * Gets valid tokens from the database based on user defined criteria.
+	 *
+	 * @since  2.6.0
+	 * @param  array $args
+	 * @return array
+	 */
+	public static function get_tokens( $args ) {
+		$args = wp_parse_args( $args, array(
+			'token_id'   => '',
+			'user_id'    => '',
+			'gateway_id' => '',
+			'type'       => '',
+		) );
+
+		$data_store    = WC_Data_Store::load( 'payment-token' );
+		$token_results = $data_store->get_tokens( $args );
+		$tokens        = array();
+
+		if ( ! empty( $token_results ) ) {
+			foreach ( $token_results as $token_result ) {
+				$_token = self::get( $token_result->token_id, $token_result );
+				if ( ! empty( $_token ) ) {
+					$tokens[ $token_result->token_id ] = $_token;
+				}
+			}
+		}
+
+		return $tokens;
+	}
+
+	/**
+	 * Returns an array of payment token objects associated with the passed customer ID.
+	 *
+	 * @since 2.6.0
+	 * @param  int    $customer_id  Customer ID
+	 * @param  string $gateway_id      Optional Gateway ID for getting tokens for a specific gateway
+	 * @return array                Array of token objects
+	 */
+	public static function get_customer_tokens( $customer_id, $gateway_id = '' ) {
+		if ( $customer_id < 1 ) {
+			return array();
+		}
+
+		$tokens = self::get_tokens( array(
+			'user_id'    => $customer_id,
+			'gateway_id' => $gateway_id,
+		) );
+
+		return apply_filters( 'woocommerce_get_customer_payment_tokens', $tokens, $customer_id, $gateway_id );
+	}
+
+	/**
+	 * Returns a customers default token or NULL if there is no default token.
+	 *
+	 * @since 2.6.0
+	 * @param  int $customer_id
+	 * @return WC_Payment_Token|null
+	 */
+	public static function get_customer_default_token( $customer_id ) {
+		if ( $customer_id < 1 ) {
+			return null;
+		}
+
+		$data_store = WC_Data_Store::load( 'payment-token' );
+		$token      = $data_store->get_users_default_token( $customer_id );
+
+		if ( $token ) {
+			return self::get( $token->token_id, $token );
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * Returns an array of payment token objects associated with the passed order ID.
+	 *
+	 * @since 2.6.0
+	 * @param int $order_id Order ID
+	 * @return array Array of token objects
+	 */
+	public static function get_order_tokens( $order_id ) {
+		$order = wc_get_order( $order_id );
+
+		if ( ! $order ) {
+			return array();
+		}
+
+		$token_ids = $order->get_payment_tokens();
+
+		if ( empty( $token_ids ) ) {
+			return array();
+		}
+
+		$tokens = self::get_tokens( array(
+			'token_id' => $token_ids,
+		) );
+
+		return apply_filters( 'woocommerce_get_order_payment_tokens', $tokens, $order_id );
+	}
+
+	/**
+	 * Get a token object by ID.
+	 *
+	 * @since 2.6.0
+	 * @param  int $token_id Token ID
+	 * @return WC_Payment_Token|null Returns a valid payment token or null if no token can be found
+	 */
+	public static function get( $token_id, $token_result = null ) {
+		$data_store = WC_Data_Store::load( 'payment-token' );
+
+		if ( is_null( $token_result ) ) {
+			$token_result = $data_store->get_token_by_id( $token_id );
+			// Still empty? Token doesn't exist? Don't continue
+			if ( empty( $token_result ) ) {
+				return null;
+			}
+		}
+
+		$token_class = 'WC_Payment_Token_' . $token_result->type;
+
+		if ( class_exists( $token_class ) ) {
+			$meta = $data_store->get_metadata( $token_id );
+			$passed_meta = array();
+			if ( ! empty( $meta ) ) {
+				foreach ( $meta as $meta_key => $meta_value ) {
+					$passed_meta[ $meta_key ] = $meta_value[0];
+				}
+			}
+			return new $token_class( $token_id, (array) $token_result, $passed_meta );
+		}
+
+		return null;
+	}
+
+	/**
+	 * Remove a payment token from the database by ID.
+	 * @since 2.6.0
+	 * @param WC_Payment_Token $token_id Token ID
+	 */
+	public static function delete( $token_id ) {
+		$type = self::get_token_type_by_id( $token_id );
+		if ( ! empty( $type ) ) {
+			$class = 'WC_Payment_Token_' . $type;
+			$token = new $class( $token_id );
+			$token->delete();
+		}
+	}
+
+	/**
+	 * Loops through all of a users payment tokens and sets is_default to false for all but a specific token.
+	 *
+	 * @since 2.6.0
+	 * @param int $user_id  User to set a default for
+	 * @param int $token_id The ID of the token that should be default
+	 */
+	public static function set_users_default( $user_id, $token_id ) {
+		$data_store   = WC_Data_Store::load( 'payment-token' );
+		$users_tokens = self::get_customer_tokens( $user_id );
+		foreach ( $users_tokens as $token ) {
+			if ( $token_id === $token->get_id() ) {
+				$data_store->set_default_status( $token->get_id(), true );
+				do_action( 'woocommerce_payment_token_set_default', $token_id, $token );
+			} else {
+				$data_store->set_default_status( $token->get_id(), false );
+			}
+		}
+	}
+
+	/**
+	 * Returns what type (credit card, echeck, etc) of token a token is by ID.
+	 *
+	 * @since 2.6.0
+	 * @param  int $token_id Token ID
+	 * @return string        Type
+	 */
+	public static function get_token_type_by_id( $token_id ) {
+		$data_store = WC_Data_Store::load( 'payment-token' );
+		return $data_store->get_token_type_by_id( $token_id );
+	}
+}
diff --git a/includes/class-wc-post-data.php b/includes/class-wc-post-data.php
index 2271dcd76e1..2c3b2f9c2a8 100644
--- a/includes/class-wc-post-data.php
+++ b/includes/class-wc-post-data.php
@@ -17,25 +17,77 @@ if ( ! defined( 'ABSPATH' ) ) {
  */
 class WC_Post_Data {
 
+	/**
+	 * Editing term.
+	 *
+	 * @var object
+	 */
 	private static $editing_term = null;
 
 	/**
 	 * Hook in methods.
 	 */
 	public static function init() {
+		add_filter( 'post_type_link', array( __CLASS__, 'variation_post_link' ), 10, 2 );
+		add_action( 'shutdown', array( __CLASS__, 'do_deferred_product_sync' ), 10 );
 		add_action( 'set_object_terms', array( __CLASS__, 'set_object_terms' ), 10, 6 );
 
 		add_action( 'transition_post_status', array( __CLASS__, 'transition_post_status' ), 10, 3 );
 		add_action( 'woocommerce_product_set_stock_status', array( __CLASS__, 'delete_product_query_transients' ) );
 		add_action( 'woocommerce_product_set_visibility', array( __CLASS__, 'delete_product_query_transients' ) );
+		add_action( 'woocommerce_product_type_changed', array( __CLASS__, 'product_type_changed' ), 10, 3 );
 
 		add_action( 'edit_term', array( __CLASS__, 'edit_term' ), 10, 3 );
 		add_action( 'edited_term', array( __CLASS__, 'edited_term' ), 10, 3 );
 		add_filter( 'update_order_item_metadata', array( __CLASS__, 'update_order_item_metadata' ), 10, 5 );
 		add_filter( 'update_post_metadata', array( __CLASS__, 'update_post_metadata' ), 10, 5 );
 		add_filter( 'wp_insert_post_data', array( __CLASS__, 'wp_insert_post_data' ) );
-		add_action( 'pre_post_update', array( __CLASS__, 'pre_post_update' ) );
-		add_action( 'update_post_meta', array( __CLASS__, 'sync_product_stock_status' ), 10, 4 );
+
+		// Status transitions
+		add_action( 'delete_post', array( __CLASS__, 'delete_post' ) );
+		add_action( 'wp_trash_post', array( __CLASS__, 'trash_post' ) );
+		add_action( 'untrashed_post', array( __CLASS__, 'untrash_post' ) );
+		add_action( 'before_delete_post', array( __CLASS__, 'delete_order_items' ) );
+		add_action( 'before_delete_post', array( __CLASS__, 'delete_order_downloadable_permissions' ) );
+
+		// Download permissions
+		add_action( 'woocommerce_process_product_file_download_paths', array( __CLASS__, 'process_product_file_download_paths' ), 10, 3 );
+	}
+
+	/**
+	 * Link to parent products when getting permalink for variation.
+	 *
+	 * @return string
+	 */
+	public static function variation_post_link( $permalink, $post ) {
+		if ( isset( $post->ID, $post->post_type ) && 'product_variation' === $post->post_type && ( $variation = wc_get_product( $post->ID ) ) ) {
+			return $variation->get_permalink();
+		}
+		return $permalink;
+	}
+
+	/**
+	 * Sync products queued to sync.
+	 */
+	public static function do_deferred_product_sync() {
+		global $wc_deferred_product_sync;
+
+		if ( ! empty( $wc_deferred_product_sync ) ) {
+			$wc_deferred_product_sync = wp_parse_id_list( $wc_deferred_product_sync );
+			array_walk( $wc_deferred_product_sync, array( __CLASS__, 'deferred_product_sync' ) );
+		}
+	}
+
+	/**
+	 * Sync a product.
+	 * @param  int $product_id
+	 */
+	public static function deferred_product_sync( $product_id ) {
+		$product = wc_get_product( $product_id );
+
+		if ( is_callable( array( $product, 'sync' ) ) ) {
+			$product->sync( $product );
+		}
 	}
 
 	/**
@@ -77,6 +129,22 @@ class WC_Post_Data {
 		}
 	}
 
+	/**
+	 * Handle type changes.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Product $product
+	 * @param string $from
+	 * @param string $to
+	 */
+	public static function product_type_changed( $product, $from, $to ) {
+		if ( 'variable' === $from && 'variable' !== $to ) {
+			// If the product is no longer variable, we should ensure all variations are removed.
+			$data_store = WC_Data_Store::load( 'product-variable' );
+			$data_store->delete_variations( $product->get_id() );
+		}
+	}
+
 	/**
 	 * When editing a term, check for product attributes.
 	 * @param  id $term_id
@@ -147,6 +215,11 @@ class WC_Post_Data {
 	 * @return null|bool
 	 */
 	public static function update_post_metadata( $check, $object_id, $meta_key, $meta_value, $prev_value ) {
+		// Delete product cache if someone uses meta directly.
+		if ( in_array( get_post_type( $object_id ), array( 'product', 'product_variation' ) ) ) {
+			wp_cache_delete( 'product-' . $object_id, 'products' );
+		}
+
 		if ( ! empty( $meta_value ) && is_float( $meta_value ) && in_array( get_post_type( $object_id ), array_merge( wc_get_order_types(), array( 'shop_coupon', 'product', 'product_variation' ) ) ) ) {
 
 			// Convert float to string
@@ -166,14 +239,10 @@ class WC_Post_Data {
 	 * @param  int $meta_id
 	 * @param  int $object_id
 	 * @param  string $meta_key
-	 * @param  mixed $_meta_value
+	 * @param  mixed $meta_value
+	 * @deprecated
 	 */
-	public static function sync_product_stock_status( $meta_id, $object_id, $meta_key, $_meta_value ) {
-		if ( '_stock' === $meta_key && 'product' !== get_post_type( $object_id ) ) {
-			$product = wc_get_product( $object_id );
-			$product->check_stock_status();
-		}
-	}
+	public static function sync_product_stock_status( $meta_id, $object_id, $meta_key, $meta_value ) {}
 
 	/**
 	 * Forces the order posts to have a title in a certain format (containing the date).
@@ -186,12 +255,10 @@ class WC_Post_Data {
 		if ( 'shop_order' === $data['post_type'] && isset( $data['post_date'] ) ) {
 			$order_title = 'Order';
 			if ( $data['post_date'] ) {
-				$order_title.= ' &ndash; ' . date_i18n( 'F j, Y @ h:i A', strtotime( $data['post_date'] ) );
+				$order_title .= ' &ndash; ' . date_i18n( 'F j, Y @ h:i A', strtotime( $data['post_date'] ) );
 			}
 			$data['post_title'] = $order_title;
-		}
-
-		elseif ( 'product' === $data['post_type'] && isset( $_POST['product-type'] ) ) {
+		} elseif ( 'product' === $data['post_type'] && isset( $_POST['product-type'] ) ) {
 			$product_type = stripslashes( $_POST['product-type'] );
 			switch ( $product_type ) {
 				case 'grouped' :
@@ -199,26 +266,171 @@ class WC_Post_Data {
 					$data['post_parent'] = 0;
 				break;
 			}
+		} elseif ( 'product' === $data['post_type'] && 'auto-draft' === $data['post_status'] ) {
+			$data['post_title'] = 'AUTO-DRAFT';
 		}
 
 		return $data;
 	}
 
 	/**
-	 * Some functions, like the term recount, require the visibility to be set prior. Lets save that here.
+	 * Removes variations etc belonging to a deleted post, and clears transients.
 	 *
-	 * @param int $post_id
+	 * @param mixed $id ID of post being deleted
 	 */
-	public static function pre_post_update( $post_id ) {
-		$product_type = empty( $_POST['product-type'] ) ? 'simple' : sanitize_title( stripslashes( $_POST['product-type'] ) );
-
-		if ( isset( $_POST['_visibility'] ) ) {
-			if ( update_post_meta( $post_id, '_visibility', wc_clean( $_POST['_visibility'] ) ) ) {
-				do_action( 'woocommerce_product_set_visibility', $post_id, wc_clean( $_POST['_visibility'] ) );
-			}
+	public static function delete_post( $id ) {
+		if ( ! current_user_can( 'delete_posts' ) || ! $id ) {
+			return;
 		}
-		if ( isset( $_POST['_stock_status'] ) && 'variable' !== $product_type ) {
-			wc_update_product_stock_status( $post_id, wc_clean( $_POST['_stock_status'] ) );
+
+		$post_type = get_post_type( $id );
+
+		switch ( $post_type ) {
+			case 'product' :
+				$data_store = WC_Data_Store::load( 'product-variable' );
+				$data_store->delete_variations( $id, true );
+
+				if ( $parent_id = wp_get_post_parent_id( $id ) ) {
+					wc_delete_product_transients( $parent_id );
+				}
+				break;
+			case 'product_variation' :
+				wc_delete_product_transients( wp_get_post_parent_id( $id ) );
+				break;
+			case 'shop_order' :
+				global $wpdb;
+
+				$refunds = $wpdb->get_results( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = 'shop_order_refund' AND post_parent = %d", $id ) );
+
+				if ( ! is_null( $refunds ) ) {
+					foreach ( $refunds as $refund ) {
+						wp_delete_post( $refund->ID, true );
+					}
+				}
+				break;
+		}
+	}
+
+	/**
+	 * woocommerce_trash_post function.
+	 *
+	 * @param mixed $id
+	 */
+	public static function trash_post( $id ) {
+		if ( ! $id ) {
+			return;
+		}
+
+		$post_type = get_post_type( $id );
+
+		// If this is an order, trash any refunds too.
+		if ( in_array( $post_type, wc_get_order_types( 'order-count' ) ) ) {
+			global $wpdb;
+
+			$refunds = $wpdb->get_results( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = 'shop_order_refund' AND post_parent = %d", $id ) );
+
+			foreach ( $refunds as $refund ) {
+				$wpdb->update( $wpdb->posts, array( 'post_status' => 'trash' ), array( 'ID' => $refund->ID ) );
+			}
+
+			wc_delete_shop_order_transients( $id );
+
+		// If this is a product, trash children variations.
+		} elseif ( 'product' === $post_type ) {
+			$data_store = WC_Data_Store::load( 'product-variable' );
+			$data_store->delete_variations( $id, false );
+		}
+	}
+
+	/**
+	 * woocommerce_untrash_post function.
+	 *
+	 * @param mixed $id
+	 */
+	public static function untrash_post( $id ) {
+		if ( ! $id ) {
+			return;
+		}
+
+		$post_type = get_post_type( $id );
+
+		if ( in_array( $post_type, wc_get_order_types( 'order-count' ) ) ) {
+			global $wpdb;
+
+			$refunds = $wpdb->get_results( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = 'shop_order_refund' AND post_parent = %d", $id ) );
+
+			foreach ( $refunds as $refund ) {
+				$wpdb->update( $wpdb->posts, array( 'post_status' => 'wc-completed' ), array( 'ID' => $refund->ID ) );
+			}
+
+			wc_delete_shop_order_transients( $id );
+
+		} elseif ( 'product' === $post_type ) {
+			$data_store = WC_Data_Store::load( 'product-variable' );
+			$data_store->untrash_variations( $id );
+
+			wc_product_force_unique_sku( $id );
+		}
+	}
+
+	/**
+	 * Remove item meta on permanent deletion.
+	 */
+	public static function delete_order_items( $postid ) {
+		global $wpdb;
+
+		if ( in_array( get_post_type( $postid ), wc_get_order_types() ) ) {
+			do_action( 'woocommerce_delete_order_items', $postid );
+
+			$wpdb->query( "
+				DELETE {$wpdb->prefix}woocommerce_order_items, {$wpdb->prefix}woocommerce_order_itemmeta
+				FROM {$wpdb->prefix}woocommerce_order_items
+				JOIN {$wpdb->prefix}woocommerce_order_itemmeta ON {$wpdb->prefix}woocommerce_order_items.order_item_id = {$wpdb->prefix}woocommerce_order_itemmeta.order_item_id
+				WHERE {$wpdb->prefix}woocommerce_order_items.order_id = '{$postid}';
+				" );
+
+			do_action( 'woocommerce_deleted_order_items', $postid );
+		}
+	}
+
+	/**
+	 * Remove downloadable permissions on permanent order deletion.
+	 */
+	public static function delete_order_downloadable_permissions( $postid ) {
+		global $wpdb;
+
+		if ( in_array( get_post_type( $postid ), wc_get_order_types() ) ) {
+			do_action( 'woocommerce_delete_order_downloadable_permissions', $postid );
+
+			$data_store = WC_Data_Store::load( 'customer-download' );
+			$data_store->delete_by_order_id( $postid );
+
+			do_action( 'woocommerce_deleted_order_downloadable_permissions', $postid );
+		}
+	}
+
+	/**
+	 * Update changed downloads.
+	 *
+	 * @param int $product_id product identifier
+	 * @param int $variation_id optional product variation identifier
+	 * @param array $downloads newly set files
+	 */
+	public static function process_product_file_download_paths( $product_id, $variation_id, $downloads ) {
+		if ( $variation_id ) {
+			$product_id = $variation_id;
+		}
+		$data_store = WC_Data_Store::load( 'customer-download' );
+
+		if ( $downloads ) {
+			foreach ( $downloads as $download ) {
+				$new_hash = md5( $download->get_file() );
+
+				if ( $download->get_previous_hash() && $download->get_previous_hash() !== $new_hash ) {
+					// Update permissions.
+					$data_store->update_download_id( $product_id, $download->get_previous_hash(), $new_hash );
+				}
+			}
 		}
 	}
 }
diff --git a/includes/class-wc-post-types.php b/includes/class-wc-post-types.php
index ae990f74c22..27fba74d9fc 100644
--- a/includes/class-wc-post-types.php
+++ b/includes/class-wc-post-types.php
@@ -29,19 +29,25 @@ class WC_Post_types {
 		add_action( 'init', array( __CLASS__, 'register_post_status' ), 9 );
 		add_action( 'init', array( __CLASS__, 'support_jetpack_omnisearch' ) );
 		add_filter( 'rest_api_allowed_post_types', array( __CLASS__, 'rest_api_allowed_post_types' ) );
+		add_action( 'woocommerce_flush_rewrite_rules', array( __CLASS__, 'flush_rewrite_rules' ) );
 	}
 
 	/**
 	 * Register core taxonomies.
 	 */
 	public static function register_taxonomies() {
+
+		if ( ! is_blog_installed() ) {
+			return;
+		}
+
 		if ( taxonomy_exists( 'product_type' ) ) {
 			return;
 		}
 
 		do_action( 'woocommerce_register_taxonomy' );
 
-		$permalinks = get_option( 'woocommerce_permalinks' );
+		$permalinks = wc_get_permalink_structure();
 
 		register_taxonomy( 'product_type',
 			apply_filters( 'woocommerce_taxonomy_objects_product_type', array( 'product' ) ),
@@ -51,7 +57,19 @@ class WC_Post_types {
 				'show_in_nav_menus' => false,
 				'query_var'         => is_admin(),
 				'rewrite'           => false,
-				'public'            => false
+				'public'            => false,
+			) )
+		);
+
+		register_taxonomy( 'product_visibility',
+			apply_filters( 'woocommerce_taxonomy_objects_product_visibility', array( 'product', 'product_variation' ) ),
+			apply_filters( 'woocommerce_taxonomy_args_product_visibility', array(
+				'hierarchical'      => false,
+				'show_ui'           => false,
+				'show_in_nav_menus' => false,
+				'query_var'         => is_admin(),
+				'rewrite'           => false,
+				'public'            => false,
 			) )
 		);
 
@@ -60,19 +78,20 @@ class WC_Post_types {
 			apply_filters( 'woocommerce_taxonomy_args_product_cat', array(
 				'hierarchical'          => true,
 				'update_count_callback' => '_wc_term_recount',
-				'label'                 => __( 'Product Categories', 'woocommerce' ),
+				'label'                 => __( 'Categories', 'woocommerce' ),
 				'labels' => array(
-						'name'              => __( 'Product Categories', 'woocommerce' ),
-						'singular_name'     => __( 'Product Category', 'woocommerce' ),
+						'name'              => __( 'Product categories', 'woocommerce' ),
+						'singular_name'     => __( 'Category', 'woocommerce' ),
 						'menu_name'         => _x( 'Categories', 'Admin menu name', 'woocommerce' ),
-						'search_items'      => __( 'Search Product Categories', 'woocommerce' ),
-						'all_items'         => __( 'All Product Categories', 'woocommerce' ),
-						'parent_item'       => __( 'Parent Product Category', 'woocommerce' ),
-						'parent_item_colon' => __( 'Parent Product Category:', 'woocommerce' ),
-						'edit_item'         => __( 'Edit Product Category', 'woocommerce' ),
-						'update_item'       => __( 'Update Product Category', 'woocommerce' ),
-						'add_new_item'      => __( 'Add New Product Category', 'woocommerce' ),
-						'new_item_name'     => __( 'New Product Category Name', 'woocommerce' )
+						'search_items'      => __( 'Search categories', 'woocommerce' ),
+						'all_items'         => __( 'All categories', 'woocommerce' ),
+						'parent_item'       => __( 'Parent category', 'woocommerce' ),
+						'parent_item_colon' => __( 'Parent category:', 'woocommerce' ),
+						'edit_item'         => __( 'Edit category', 'woocommerce' ),
+						'update_item'       => __( 'Update category', 'woocommerce' ),
+						'add_new_item'      => __( 'Add new category', 'woocommerce' ),
+						'new_item_name'     => __( 'New category name', 'woocommerce' ),
+						'not_found'         => __( 'No categories found', 'woocommerce' ),
 					),
 				'show_ui'               => true,
 				'query_var'             => true,
@@ -82,8 +101,8 @@ class WC_Post_types {
 					'delete_terms' => 'delete_product_terms',
 					'assign_terms' => 'assign_product_terms',
 				),
-				'rewrite'               => array(
-					'slug'         => empty( $permalinks['category_base'] ) ? _x( 'product-category', 'slug', 'woocommerce' ) : $permalinks['category_base'],
+				'rewrite'          => array(
+					'slug'         => $permalinks['category_rewrite_slug'],
 					'with_front'   => false,
 					'hierarchical' => true,
 				),
@@ -95,22 +114,22 @@ class WC_Post_types {
 			apply_filters( 'woocommerce_taxonomy_args_product_tag', array(
 				'hierarchical'          => false,
 				'update_count_callback' => '_wc_term_recount',
-				'label'                 => __( 'Product Tags', 'woocommerce' ),
+				'label'                 => __( 'Product tags', 'woocommerce' ),
 				'labels'                => array(
-						'name'                       => __( 'Product Tags', 'woocommerce' ),
-						'singular_name'              => __( 'Product Tag', 'woocommerce' ),
+						'name'                       => __( 'Product tags', 'woocommerce' ),
+						'singular_name'              => __( 'Tag', 'woocommerce' ),
 						'menu_name'                  => _x( 'Tags', 'Admin menu name', 'woocommerce' ),
-						'search_items'               => __( 'Search Product Tags', 'woocommerce' ),
-						'all_items'                  => __( 'All Product Tags', 'woocommerce' ),
-						'edit_item'                  => __( 'Edit Product Tag', 'woocommerce' ),
-						'update_item'                => __( 'Update Product Tag', 'woocommerce' ),
-						'add_new_item'               => __( 'Add New Product Tag', 'woocommerce' ),
-						'new_item_name'              => __( 'New Product Tag Name', 'woocommerce' ),
-						'popular_items'              => __( 'Popular Product Tags', 'woocommerce' ),
-						'separate_items_with_commas' => __( 'Separate Product Tags with commas', 'woocommerce'  ),
-						'add_or_remove_items'        => __( 'Add or remove Product Tags', 'woocommerce' ),
-						'choose_from_most_used'      => __( 'Choose from the most used Product tags', 'woocommerce' ),
-						'not_found'                  => __( 'No Product Tags found', 'woocommerce' ),
+						'search_items'               => __( 'Search tags', 'woocommerce' ),
+						'all_items'                  => __( 'All tags', 'woocommerce' ),
+						'edit_item'                  => __( 'Edit tag', 'woocommerce' ),
+						'update_item'                => __( 'Update tag', 'woocommerce' ),
+						'add_new_item'               => __( 'Add new tag', 'woocommerce' ),
+						'new_item_name'              => __( 'New tag name', 'woocommerce' ),
+						'popular_items'              => __( 'Popular tags', 'woocommerce' ),
+						'separate_items_with_commas' => __( 'Separate tags with commas', 'woocommerce' ),
+						'add_or_remove_items'        => __( 'Add or remove tags', 'woocommerce' ),
+						'choose_from_most_used'      => __( 'Choose from the most used tags', 'woocommerce' ),
+						'not_found'                  => __( 'No tags found', 'woocommerce' ),
 					),
 				'show_ui'               => true,
 				'query_var'             => true,
@@ -121,8 +140,8 @@ class WC_Post_types {
 					'assign_terms' => 'assign_product_terms',
 				),
 				'rewrite'               => array(
-					'slug'       => empty( $permalinks['tag_base'] ) ? _x( 'product-tag', 'slug', 'woocommerce' ) : $permalinks['tag_base'],
-					'with_front' => false
+					'slug'       => $permalinks['tag_rewrite_slug'],
+					'with_front' => false,
 				),
 			) )
 		);
@@ -130,23 +149,23 @@ class WC_Post_types {
 		register_taxonomy( 'product_shipping_class',
 			apply_filters( 'woocommerce_taxonomy_objects_product_shipping_class', array( 'product', 'product_variation' ) ),
 			apply_filters( 'woocommerce_taxonomy_args_product_shipping_class', array(
-				'hierarchical'          => true,
+				'hierarchical'          => false,
 				'update_count_callback' => '_update_post_term_count',
-				'label'                 => __( 'Shipping Classes', 'woocommerce' ),
+				'label'                 => __( 'Shipping classes', 'woocommerce' ),
 				'labels' => array(
-						'name'              => __( 'Shipping Classes', 'woocommerce' ),
-						'singular_name'     => __( 'Shipping Class', 'woocommerce' ),
-						'menu_name'         => _x( 'Shipping Classes', 'Admin menu name', 'woocommerce' ),
-						'search_items'      => __( 'Search Shipping Classes', 'woocommerce' ),
-						'all_items'         => __( 'All Shipping Classes', 'woocommerce' ),
-						'parent_item'       => __( 'Parent Shipping Class', 'woocommerce' ),
-						'parent_item_colon' => __( 'Parent Shipping Class:', 'woocommerce' ),
-						'edit_item'         => __( 'Edit Shipping Class', 'woocommerce' ),
-						'update_item'       => __( 'Update Shipping Class', 'woocommerce' ),
-						'add_new_item'      => __( 'Add New Shipping Class', 'woocommerce' ),
-						'new_item_name'     => __( 'New Shipping Class Name', 'woocommerce' )
+						'name'              => __( 'Product shipping classes', 'woocommerce' ),
+						'singular_name'     => __( 'Shipping class', 'woocommerce' ),
+						'menu_name'         => _x( 'Shipping classes', 'Admin menu name', 'woocommerce' ),
+						'search_items'      => __( 'Search shipping classes', 'woocommerce' ),
+						'all_items'         => __( 'All shipping classes', 'woocommerce' ),
+						'parent_item'       => __( 'Parent shipping class', 'woocommerce' ),
+						'parent_item_colon' => __( 'Parent shipping class:', 'woocommerce' ),
+						'edit_item'         => __( 'Edit shipping class', 'woocommerce' ),
+						'update_item'       => __( 'Update shipping class', 'woocommerce' ),
+						'add_new_item'      => __( 'Add new shipping class', 'woocommerce' ),
+						'new_item_name'     => __( 'New shipping class Name', 'woocommerce' ),
 					),
-				'show_ui'               => true,
+				'show_ui'               => false,
 				'show_in_quick_edit'    => false,
 				'show_in_nav_menus'     => false,
 				'query_var'             => is_admin(),
@@ -171,10 +190,10 @@ class WC_Post_types {
 					$label                          = ! empty( $tax->attribute_label ) ? $tax->attribute_label : $tax->attribute_name;
 					$wc_product_attributes[ $name ] = $tax;
 					$taxonomy_data                  = array(
-						'hierarchical'          => true,
+						'hierarchical'          => false,
 						'update_count_callback' => '_update_post_term_count',
 						'labels'                => array(
-								'name'              => $label,
+								'name'              => sprintf( _x( 'Product %s', 'Product Attribute', 'woocommerce' ), $label ),
 								'singular_name'     => $label,
 								'search_items'      => sprintf( __( 'Search %s', 'woocommerce' ), $label ),
 								'all_items'         => sprintf( __( 'All %s', 'woocommerce' ), $label ),
@@ -182,8 +201,9 @@ class WC_Post_types {
 								'parent_item_colon' => sprintf( __( 'Parent %s:', 'woocommerce' ), $label ),
 								'edit_item'         => sprintf( __( 'Edit %s', 'woocommerce' ), $label ),
 								'update_item'       => sprintf( __( 'Update %s', 'woocommerce' ), $label ),
-								'add_new_item'      => sprintf( __( 'Add New %s', 'woocommerce' ), $label ),
-								'new_item_name'     => sprintf( __( 'New %s', 'woocommerce' ), $label )
+								'add_new_item'      => sprintf( __( 'Add new %s', 'woocommerce' ), $label ),
+								'new_item_name'     => sprintf( __( 'New %s', 'woocommerce' ), $label ),
+								'not_found'         => sprintf( __( 'No &quot;%s&quot; found', 'woocommerce' ), $label ),
 							),
 						'show_ui'            => true,
 						'show_in_quick_edit' => false,
@@ -200,14 +220,14 @@ class WC_Post_types {
 							'edit_terms'   => 'edit_product_terms',
 							'delete_terms' => 'delete_product_terms',
 							'assign_terms' => 'assign_product_terms',
-						)
+						),
 					);
 
-					if ( 1 === $tax->attribute_public ) {
+					if ( 1 === $tax->attribute_public && sanitize_title( $tax->attribute_name ) ) {
 						$taxonomy_data['rewrite'] = array(
-							'slug'         => empty( $permalinks['attribute_base'] ) ? '' : trailingslashit( $permalinks['attribute_base'] ) . sanitize_title( $tax->attribute_name ),
+							'slug'         => trailingslashit( $permalinks['attribute_rewrite_slug'] ) . sanitize_title( $tax->attribute_name ),
 							'with_front'   => false,
-							'hierarchical' => true
+							'hierarchical' => true,
 						);
 					}
 
@@ -223,14 +243,13 @@ class WC_Post_types {
 	 * Register core post types.
 	 */
 	public static function register_post_types() {
-		if ( post_type_exists('product') ) {
+		if ( ! is_blog_installed() || post_type_exists( 'product' ) ) {
 			return;
 		}
 
 		do_action( 'woocommerce_register_post_type' );
 
-		$permalinks        = get_option( 'woocommerce_permalinks' );
-		$product_permalink = empty( $permalinks['product_base'] ) ? _x( 'product', 'slug', 'woocommerce' ) : $permalinks['product_base'];
+		$permalinks = wc_get_permalink_structure();
 
 		register_post_type( 'product',
 			apply_filters( 'woocommerce_register_post_type_product',
@@ -238,22 +257,28 @@ class WC_Post_types {
 					'labels'              => array(
 							'name'                  => __( 'Products', 'woocommerce' ),
 							'singular_name'         => __( 'Product', 'woocommerce' ),
+							'all_items'             => __( 'All Products', 'woocommerce' ),
 							'menu_name'             => _x( 'Products', 'Admin menu name', 'woocommerce' ),
-							'add_new'               => __( 'Add Product', 'woocommerce' ),
-							'add_new_item'          => __( 'Add New Product', 'woocommerce' ),
+							'add_new'               => __( 'Add New', 'woocommerce' ),
+							'add_new_item'          => __( 'Add new product', 'woocommerce' ),
 							'edit'                  => __( 'Edit', 'woocommerce' ),
-							'edit_item'             => __( 'Edit Product', 'woocommerce' ),
-							'new_item'              => __( 'New Product', 'woocommerce' ),
-							'view'                  => __( 'View Product', 'woocommerce' ),
-							'view_item'             => __( 'View Product', 'woocommerce' ),
-							'search_items'          => __( 'Search Products', 'woocommerce' ),
-							'not_found'             => __( 'No Products found', 'woocommerce' ),
-							'not_found_in_trash'    => __( 'No Products found in trash', 'woocommerce' ),
-							'parent'                => __( 'Parent Product', 'woocommerce' ),
-							'featured_image'        => __( 'Product Image', 'woocommerce' ),
+							'edit_item'             => __( 'Edit product', 'woocommerce' ),
+							'new_item'              => __( 'New product', 'woocommerce' ),
+							'view'                  => __( 'View product', 'woocommerce' ),
+							'view_item'             => __( 'View product', 'woocommerce' ),
+							'search_items'          => __( 'Search products', 'woocommerce' ),
+							'not_found'             => __( 'No products found', 'woocommerce' ),
+							'not_found_in_trash'    => __( 'No products found in trash', 'woocommerce' ),
+							'parent'                => __( 'Parent product', 'woocommerce' ),
+							'featured_image'        => __( 'Product image', 'woocommerce' ),
 							'set_featured_image'    => __( 'Set product image', 'woocommerce' ),
 							'remove_featured_image' => __( 'Remove product image', 'woocommerce' ),
 							'use_featured_image'    => __( 'Use as product image', 'woocommerce' ),
+							'insert_into_item'      => __( 'Insert into product', 'woocommerce' ),
+							'uploaded_to_this_item' => __( 'Uploaded to this product', 'woocommerce' ),
+							'filter_items_list'     => __( 'Filter products', 'woocommerce' ),
+							'items_list_navigation' => __( 'Products navigation', 'woocommerce' ),
+							'items_list'            => __( 'Products list', 'woocommerce' ),
 						),
 					'description'         => __( 'This is where you can add new products to your store.', 'woocommerce' ),
 					'public'              => true,
@@ -263,11 +288,12 @@ class WC_Post_types {
 					'publicly_queryable'  => true,
 					'exclude_from_search' => false,
 					'hierarchical'        => false, // Hierarchical causes memory issues - WP loads all records!
-					'rewrite'             => $product_permalink ? array( 'slug' => untrailingslashit( $product_permalink ), 'with_front' => false, 'feeds' => true ) : false,
+					'rewrite'             => $permalinks['product_rewrite_slug'] ? array( 'slug' => $permalinks['product_rewrite_slug'], 'with_front' => false, 'feeds' => true ) : false,
 					'query_var'           => true,
-					'supports'            => array( 'title', 'editor', 'excerpt', 'thumbnail', 'comments', 'custom-fields', 'page-attributes', 'publicize', 'wpcom-markdown' ),
+					'supports'            => array( 'title', 'editor', 'excerpt', 'thumbnail', 'comments', 'custom-fields', 'publicize', 'wpcom-markdown' ),
 					'has_archive'         => ( $shop_page_id = wc_get_page_id( 'shop' ) ) && get_post( $shop_page_id ) ? get_page_uri( $shop_page_id ) : 'shop',
-					'show_in_nav_menus'   => true
+					'show_in_nav_menus'   => true,
+					'show_in_rest'        => true,
 				)
 			)
 		);
@@ -275,11 +301,12 @@ class WC_Post_types {
 		register_post_type( 'product_variation',
 			apply_filters( 'woocommerce_register_post_type_product_variation',
 				array(
-					'label'        => __( 'Variations', 'woocommerce' ),
-					'public'       => false,
-					'hierarchical' => false,
-					'supports'     => false,
-					'capability_type' => 'product'
+					'label'           => __( 'Variations', 'woocommerce' ),
+					'public'          => false,
+					'hierarchical'    => false,
+					'supports'        => false,
+					'capability_type' => 'product',
+					'rewrite'         => false,
 				)
 			)
 		);
@@ -289,20 +316,23 @@ class WC_Post_types {
 			apply_filters( 'woocommerce_register_post_type_shop_order',
 				array(
 					'labels'              => array(
-							'name'               => __( 'Orders', 'woocommerce' ),
-							'singular_name'      => _x( 'Order', 'shop_order post type singular name', 'woocommerce' ),
-							'add_new'            => __( 'Add Order', 'woocommerce' ),
-							'add_new_item'       => __( 'Add New Order', 'woocommerce' ),
-							'edit'               => __( 'Edit', 'woocommerce' ),
-							'edit_item'          => __( 'Edit Order', 'woocommerce' ),
-							'new_item'           => __( 'New Order', 'woocommerce' ),
-							'view'               => __( 'View Order', 'woocommerce' ),
-							'view_item'          => __( 'View Order', 'woocommerce' ),
-							'search_items'       => __( 'Search Orders', 'woocommerce' ),
-							'not_found'          => __( 'No Orders found', 'woocommerce' ),
-							'not_found_in_trash' => __( 'No Orders found in trash', 'woocommerce' ),
-							'parent'             => __( 'Parent Orders', 'woocommerce' ),
-							'menu_name'          => _x( 'Orders', 'Admin menu name', 'woocommerce' )
+							'name'                  => __( 'Orders', 'woocommerce' ),
+							'singular_name'         => _x( 'Order', 'shop_order post type singular name', 'woocommerce' ),
+							'add_new'               => __( 'Add order', 'woocommerce' ),
+							'add_new_item'          => __( 'Add new order', 'woocommerce' ),
+							'edit'                  => __( 'Edit', 'woocommerce' ),
+							'edit_item'             => __( 'Edit order', 'woocommerce' ),
+							'new_item'              => __( 'New order', 'woocommerce' ),
+							'view'                  => __( 'View order', 'woocommerce' ),
+							'view_item'             => __( 'View order', 'woocommerce' ),
+							'search_items'          => __( 'Search orders', 'woocommerce' ),
+							'not_found'             => __( 'No orders found', 'woocommerce' ),
+							'not_found_in_trash'    => __( 'No orders found in trash', 'woocommerce' ),
+							'parent'                => __( 'Parent orders', 'woocommerce' ),
+							'menu_name'             => _x( 'Orders', 'Admin menu name', 'woocommerce' ),
+							'filter_items_list'     => __( 'Filter orders', 'woocommerce' ),
+							'items_list_navigation' => __( 'Orders navigation', 'woocommerce' ),
+							'items_list'            => __( 'Orders list', 'woocommerce' ),
 						),
 					'description'         => __( 'This is where store orders are stored.', 'woocommerce' ),
 					'public'              => false,
@@ -337,7 +367,8 @@ class WC_Post_types {
 					'exclude_from_order_views'         => false,
 					'exclude_from_order_reports'       => false,
 					'exclude_from_order_sales_reports' => true,
-					'class_name'                       => 'WC_Order_Refund'
+					'class_name'                       => 'WC_Order_Refund',
+					'rewrite'                          => false,
 				)
 			)
 		);
@@ -347,20 +378,23 @@ class WC_Post_types {
 				apply_filters( 'woocommerce_register_post_type_shop_coupon',
 					array(
 						'labels'              => array(
-								'name'               => __( 'Coupons', 'woocommerce' ),
-								'singular_name'      => __( 'Coupon', 'woocommerce' ),
-								'menu_name'          => _x( 'Coupons', 'Admin menu name', 'woocommerce' ),
-								'add_new'            => __( 'Add Coupon', 'woocommerce' ),
-								'add_new_item'       => __( 'Add New Coupon', 'woocommerce' ),
-								'edit'               => __( 'Edit', 'woocommerce' ),
-								'edit_item'          => __( 'Edit Coupon', 'woocommerce' ),
-								'new_item'           => __( 'New Coupon', 'woocommerce' ),
-								'view'               => __( 'View Coupons', 'woocommerce' ),
-								'view_item'          => __( 'View Coupon', 'woocommerce' ),
-								'search_items'       => __( 'Search Coupons', 'woocommerce' ),
-								'not_found'          => __( 'No Coupons found', 'woocommerce' ),
-								'not_found_in_trash' => __( 'No Coupons found in trash', 'woocommerce' ),
-								'parent'             => __( 'Parent Coupon', 'woocommerce' )
+								'name'                  => __( 'Coupons', 'woocommerce' ),
+								'singular_name'         => __( 'Coupon', 'woocommerce' ),
+								'menu_name'             => _x( 'Coupons', 'Admin menu name', 'woocommerce' ),
+								'add_new'               => __( 'Add coupon', 'woocommerce' ),
+								'add_new_item'          => __( 'Add new coupon', 'woocommerce' ),
+								'edit'                  => __( 'Edit', 'woocommerce' ),
+								'edit_item'             => __( 'Edit coupon', 'woocommerce' ),
+								'new_item'              => __( 'New coupon', 'woocommerce' ),
+								'view'                  => __( 'View coupons', 'woocommerce' ),
+								'view_item'             => __( 'View coupon', 'woocommerce' ),
+								'search_items'          => __( 'Search coupons', 'woocommerce' ),
+								'not_found'             => __( 'No coupons found', 'woocommerce' ),
+								'not_found_in_trash'    => __( 'No coupons found in trash', 'woocommerce' ),
+								'parent'                => __( 'Parent coupon', 'woocommerce' ),
+								'filter_items_list'     => __( 'Filter coupons', 'woocommerce' ),
+								'items_list_navigation' => __( 'Coupons navigation', 'woocommerce' ),
+								'items_list'            => __( 'Coupons list', 'woocommerce' ),
 							),
 						'description'         => __( 'This is where you can add new coupons that customers can use in your store.', 'woocommerce' ),
 						'public'              => false,
@@ -375,7 +409,7 @@ class WC_Post_types {
 						'query_var'           => false,
 						'supports'            => array( 'title' ),
 						'show_in_nav_menus'   => false,
-						'show_in_admin_bar'   => true
+						'show_in_admin_bar'   => true,
 					)
 				)
 			);
@@ -388,17 +422,17 @@ class WC_Post_types {
 						'name'               => __( 'Webhooks', 'woocommerce' ),
 						'singular_name'      => __( 'Webhook', 'woocommerce' ),
 						'menu_name'          => _x( 'Webhooks', 'Admin menu name', 'woocommerce' ),
-						'add_new'            => __( 'Add Webhook', 'woocommerce' ),
-						'add_new_item'       => __( 'Add New Webhook', 'woocommerce' ),
+						'add_new'            => __( 'Add webhook', 'woocommerce' ),
+						'add_new_item'       => __( 'Add new webhook', 'woocommerce' ),
 						'edit'               => __( 'Edit', 'woocommerce' ),
-						'edit_item'          => __( 'Edit Webhook', 'woocommerce' ),
-						'new_item'           => __( 'New Webhook', 'woocommerce' ),
-						'view'               => __( 'View Webhooks', 'woocommerce' ),
-						'view_item'          => __( 'View Webhook', 'woocommerce' ),
-						'search_items'       => __( 'Search Webhooks', 'woocommerce' ),
-						'not_found'          => __( 'No Webhooks found', 'woocommerce' ),
-						'not_found_in_trash' => __( 'No Webhooks found in trash', 'woocommerce' ),
-						'parent'             => __( 'Parent Webhook', 'woocommerce' )
+						'edit_item'          => __( 'Edit webhook', 'woocommerce' ),
+						'new_item'           => __( 'New webhook', 'woocommerce' ),
+						'view'               => __( 'View webhooks', 'woocommerce' ),
+						'view_item'          => __( 'View webhook', 'woocommerce' ),
+						'search_items'       => __( 'Search webhooks', 'woocommerce' ),
+						'not_found'          => __( 'No webhooks found', 'woocommerce' ),
+						'not_found_in_trash' => __( 'No webhooks found in trash', 'woocommerce' ),
+						'parent'             => __( 'Parent webhook', 'woocommerce' ),
 					),
 					'public'              => false,
 					'show_ui'             => true,
@@ -412,72 +446,90 @@ class WC_Post_types {
 					'query_var'           => false,
 					'supports'            => false,
 					'show_in_nav_menus'   => false,
-					'show_in_admin_bar'   => false
+					'show_in_admin_bar'   => false,
 				)
 			)
 		);
+
+		do_action( 'woocommerce_after_register_post_type' );
 	}
 
 	/**
 	 * Register our custom post statuses, used for order status.
 	 */
 	public static function register_post_status() {
-		register_post_status( 'wc-pending', array(
-			'label'                     => _x( 'Pending Payment', 'Order status', 'woocommerce' ),
-			'public'                    => false,
-			'exclude_from_search'       => false,
-			'show_in_admin_all_list'    => true,
-			'show_in_admin_status_list' => true,
-			'label_count'               => _n_noop( 'Pending Payment <span class="count">(%s)</span>', 'Pending Payment <span class="count">(%s)</span>', 'woocommerce' )
-		) );
-		register_post_status( 'wc-processing', array(
-			'label'                     => _x( 'Processing', 'Order status', 'woocommerce' ),
-			'public'                    => false,
-			'exclude_from_search'       => false,
-			'show_in_admin_all_list'    => true,
-			'show_in_admin_status_list' => true,
-			'label_count'               => _n_noop( 'Processing <span class="count">(%s)</span>', 'Processing <span class="count">(%s)</span>', 'woocommerce' )
-		) );
-		register_post_status( 'wc-on-hold', array(
-			'label'                     => _x( 'On Hold', 'Order status', 'woocommerce' ),
-			'public'                    => false,
-			'exclude_from_search'       => false,
-			'show_in_admin_all_list'    => true,
-			'show_in_admin_status_list' => true,
-			'label_count'               => _n_noop( 'On Hold <span class="count">(%s)</span>', 'On Hold <span class="count">(%s)</span>', 'woocommerce' )
-		) );
-		register_post_status( 'wc-completed', array(
-			'label'                     => _x( 'Completed', 'Order status', 'woocommerce' ),
-			'public'                    => false,
-			'exclude_from_search'       => false,
-			'show_in_admin_all_list'    => true,
-			'show_in_admin_status_list' => true,
-			'label_count'               => _n_noop( 'Completed <span class="count">(%s)</span>', 'Completed <span class="count">(%s)</span>', 'woocommerce' )
-		) );
-		register_post_status( 'wc-cancelled', array(
-			'label'                     => _x( 'Cancelled', 'Order status', 'woocommerce' ),
-			'public'                    => false,
-			'exclude_from_search'       => false,
-			'show_in_admin_all_list'    => true,
-			'show_in_admin_status_list' => true,
-			'label_count'               => _n_noop( 'Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'woocommerce' )
-		) );
-		register_post_status( 'wc-refunded', array(
-			'label'                     => _x( 'Refunded', 'Order status', 'woocommerce' ),
-			'public'                    => false,
-			'exclude_from_search'       => false,
-			'show_in_admin_all_list'    => true,
-			'show_in_admin_status_list' => true,
-			'label_count'               => _n_noop( 'Refunded <span class="count">(%s)</span>', 'Refunded <span class="count">(%s)</span>', 'woocommerce' )
-		) );
-		register_post_status( 'wc-failed', array(
-			'label'                     => _x( 'Failed', 'Order status', 'woocommerce' ),
-			'public'                    => false,
-			'exclude_from_search'       => false,
-			'show_in_admin_all_list'    => true,
-			'show_in_admin_status_list' => true,
-			'label_count'               => _n_noop( 'Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>', 'woocommerce' )
-		) );
+
+		$order_statuses = apply_filters( 'woocommerce_register_shop_order_post_statuses',
+			array(
+				'wc-pending'    => array(
+					'label'                     => _x( 'Pending payment', 'Order status', 'woocommerce' ),
+					'public'                    => false,
+					'exclude_from_search'       => false,
+					'show_in_admin_all_list'    => true,
+					'show_in_admin_status_list' => true,
+					'label_count'               => _n_noop( 'Pending payment <span class="count">(%s)</span>', 'Pending payment <span class="count">(%s)</span>', 'woocommerce' ),
+				),
+				'wc-processing' => array(
+					'label'                     => _x( 'Processing', 'Order status', 'woocommerce' ),
+					'public'                    => false,
+					'exclude_from_search'       => false,
+					'show_in_admin_all_list'    => true,
+					'show_in_admin_status_list' => true,
+					'label_count'               => _n_noop( 'Processing <span class="count">(%s)</span>', 'Processing <span class="count">(%s)</span>', 'woocommerce' ),
+				),
+				'wc-on-hold'    => array(
+					'label'                     => _x( 'On hold', 'Order status', 'woocommerce' ),
+					'public'                    => false,
+					'exclude_from_search'       => false,
+					'show_in_admin_all_list'    => true,
+					'show_in_admin_status_list' => true,
+					'label_count'               => _n_noop( 'On hold <span class="count">(%s)</span>', 'On hold <span class="count">(%s)</span>', 'woocommerce' ),
+				),
+				'wc-completed'  => array(
+					'label'                     => _x( 'Completed', 'Order status', 'woocommerce' ),
+					'public'                    => false,
+					'exclude_from_search'       => false,
+					'show_in_admin_all_list'    => true,
+					'show_in_admin_status_list' => true,
+					'label_count'               => _n_noop( 'Completed <span class="count">(%s)</span>', 'Completed <span class="count">(%s)</span>', 'woocommerce' ),
+				),
+				'wc-cancelled'  => array(
+					'label'                     => _x( 'Cancelled', 'Order status', 'woocommerce' ),
+					'public'                    => false,
+					'exclude_from_search'       => false,
+					'show_in_admin_all_list'    => true,
+					'show_in_admin_status_list' => true,
+					'label_count'               => _n_noop( 'Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'woocommerce' ),
+				),
+				'wc-refunded'   => array(
+					'label'                     => _x( 'Refunded', 'Order status', 'woocommerce' ),
+					'public'                    => false,
+					'exclude_from_search'       => false,
+					'show_in_admin_all_list'    => true,
+					'show_in_admin_status_list' => true,
+					'label_count'               => _n_noop( 'Refunded <span class="count">(%s)</span>', 'Refunded <span class="count">(%s)</span>', 'woocommerce' ),
+				),
+				'wc-failed'     => array(
+					'label'                     => _x( 'Failed', 'Order status', 'woocommerce' ),
+					'public'                    => false,
+					'exclude_from_search'       => false,
+					'show_in_admin_all_list'    => true,
+					'show_in_admin_status_list' => true,
+					'label_count'               => _n_noop( 'Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>', 'woocommerce' ),
+				),
+			)
+		);
+
+		foreach ( $order_statuses as $order_status => $values ) {
+			register_post_status( $order_status, $values );
+		}
+	}
+
+	/**
+	 * Flush rewrite rules.
+	 */
+	public static function flush_rewrite_rules() {
+		flush_rewrite_rules();
 	}
 
 	/**
diff --git a/includes/class-wc-product-attribute.php b/includes/class-wc-product-attribute.php
new file mode 100644
index 00000000000..ab730ad22a8
--- /dev/null
+++ b/includes/class-wc-product-attribute.php
@@ -0,0 +1,328 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Represents a product attribute.
+ *
+ * Attributes can be global (taxonomy based) or local to the product itself.
+ * Uses ArrayAccess to be BW compatible with previous ways of reading attributes.
+ *
+ * @version     3.0.0
+ * @since       3.0.0
+ * @package     WooCommerce/Classes
+ * @author      WooThemes
+ */
+class WC_Product_Attribute implements ArrayAccess {
+
+	/**
+	 * Data array.
+	 *
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $data = array(
+		'id'        => 0,
+		'name'      => '',
+		'options'   => array(),
+		'position'  => 0,
+		'visible'   => false,
+		'variation' => false,
+	);
+
+	/**
+	 * Return if this attribute is a taxonomy.
+	 *
+	 * @return boolean
+	 */
+	public function is_taxonomy() {
+		return 0 < $this->get_id();
+	}
+
+	/**
+	 * Get taxonomy name if applicable.
+	 *
+	 * @return string
+	 */
+	public function get_taxonomy() {
+		return $this->is_taxonomy() ? $this->get_name() : '';
+	}
+
+	/**
+	 * Get taxonomy object.
+	 *
+	 * @return array|null
+	 */
+	public function get_taxonomy_object() {
+		global $wc_product_attributes;
+		return $this->is_taxonomy() ? $wc_product_attributes[ $this->get_name() ] : null;
+	}
+
+	/**
+	 * Gets terms from the stored options.
+	 *
+	 * @return array|null
+	 */
+	public function get_terms() {
+		if ( ! $this->is_taxonomy() || ! taxonomy_exists( $this->get_name() ) ) {
+			return null;
+		}
+		$terms = array();
+		foreach ( $this->get_options() as $option ) {
+			if ( is_int( $option ) ) {
+				$term = get_term_by( 'id', $option, $this->get_name() );
+			} else {
+				$term = get_term_by( 'name', $option, $this->get_name() );
+
+				if ( ! $term || is_wp_error( $term ) ) {
+					$new_term = wp_insert_term( $option, $this->get_name() );
+					$term     = is_wp_error( $new_term ) ? false : get_term_by( 'id', $new_term['term_id'], $this->get_name() );
+				}
+			}
+			if ( $term && ! is_wp_error( $term ) ) {
+				$terms[] = $term;
+			}
+		}
+		return $terms;
+	}
+
+	/**
+	 * Gets slugs from the stored options, or just the string if text based.
+	 *
+	 * @return array
+	 */
+	public function get_slugs() {
+		if ( ! $this->is_taxonomy() || ! taxonomy_exists( $this->get_name() ) ) {
+			return $this->get_options();
+		}
+		$terms = array();
+		foreach ( $this->get_options() as $option ) {
+			if ( is_int( $option ) ) {
+				$term = get_term_by( 'id', $option, $this->get_name() );
+			} else {
+				$term = get_term_by( 'name', $option, $this->get_name() );
+
+				if ( ! $term || is_wp_error( $term ) ) {
+					$new_term = wp_insert_term( $option, $this->get_name() );
+					$term     = is_wp_error( $new_term ) ? false : get_term_by( 'id', $new_term['term_id'], $this->get_name() );
+				}
+			}
+			if ( $term && ! is_wp_error( $term ) ) {
+				$terms[] = $term->slug;
+			}
+		}
+		return $terms;
+	}
+
+	/**
+	 * Returns all data for this object.
+	 *
+	 * @return array
+	 */
+	public function get_data() {
+		return array_merge( $this->data, array(
+			'is_visible'   => $this->get_visible() ? 1   : 0,
+			'is_variation' => $this->get_variation() ? 1 : 0,
+			'is_taxonomy'  => $this->is_taxonomy() ? 1   : 0,
+			'value'        => $this->is_taxonomy() ? ''  : wc_implode_text_attributes( $this->get_options() ),
+		) );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Setters
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Set ID (this is the attribute ID).
+	 *
+	 * @param int $value
+	 */
+	public function set_id( $value ) {
+		$this->data['id'] = absint( $value );
+	}
+
+	/**
+	 * Set name (this is the attribute name or taxonomy).
+	 *
+	 * @param int $value
+	 */
+	public function set_name( $value ) {
+		$this->data['name'] = $value;
+	}
+
+	/**
+	 * Set options.
+	 *
+	 * @param array $value
+	 */
+	public function set_options( $value ) {
+		$this->data['options'] = $value;
+	}
+
+	/**
+	 * Set position.
+	 *
+	 * @param int $value
+	 */
+	public function set_position( $value ) {
+		$this->data['position'] = absint( $value );
+	}
+
+	/**
+	 * Set if visible.
+	 *
+	 * @param bool $value
+	 */
+	public function set_visible( $value ) {
+		$this->data['visible'] = wc_string_to_bool( $value );
+	}
+
+	/**
+	 * Set if variation.
+	 *
+	 * @param bool $value
+	 */
+	public function set_variation( $value ) {
+		$this->data['variation'] = wc_string_to_bool( $value );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Getters
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Get the ID.
+	 *
+	 * @return int
+	 */
+	public function get_id() {
+		return $this->data['id'];
+	}
+
+	/**
+	 * Get name.
+	 *
+	 * @return int
+	 */
+	public function get_name() {
+		return $this->data['name'];
+	}
+
+	/**
+	 * Get options.
+	 *
+	 * @return array
+	 */
+	public function get_options() {
+		return $this->data['options'];
+	}
+
+	/**
+	 * Get position.
+	 *
+	 * @return int
+	 */
+	public function get_position() {
+		return $this->data['position'];
+	}
+
+	/**
+	 * Get if visible.
+	 *
+	 * @return bool
+	 */
+	public function get_visible() {
+		return $this->data['visible'];
+	}
+
+	/**
+	 * Get if variation.
+	 *
+	 * @return bool
+	 */
+	public function get_variation() {
+		return $this->data['variation'];
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| ArrayAccess/Backwards compatibility.
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * offsetGet.
+	 *
+	 * @param string $offset
+	 * @return mixed
+	 */
+	public function offsetGet( $offset ) {
+		switch ( $offset ) {
+			case 'is_variation' :
+				return $this->get_variation() ? 1 : 0;
+				break;
+			case 'is_visible' :
+				return $this->get_visible() ? 1 : 0;
+				break;
+			case 'is_taxonomy' :
+				return $this->is_taxonomy() ? 1 : 0;
+				break;
+			case 'value' :
+				return $this->is_taxonomy() ? '' : wc_implode_text_attributes( $this->get_options() );
+				break;
+			default :
+				if ( is_callable( array( $this, "get_$offset" ) ) ) {
+					return $this->{"get_$offset"}();
+				}
+				break;
+		}
+		return '';
+	}
+
+	/**
+	 * offsetSet.
+	 *
+	 * @param string $offset
+	 * @param mixed $value
+	 */
+	public function offsetSet( $offset, $value ) {
+		switch ( $offset ) {
+			case 'is_variation' :
+				$this->set_variation( $value );
+				break;
+			case 'is_visible' :
+				$this->set_visible( $value );
+				break;
+			case 'value' :
+				$this->set_options( $value );
+				break;
+			default :
+				if ( is_callable( array( $this, "set_$offset" ) ) ) {
+					return $this->{"set_$offset"}( $value );
+				}
+				break;
+		}
+	}
+
+	/**
+	 * offsetUnset.
+	 *
+	 * @param string $offset
+	 */
+	public function offsetUnset( $offset ) {}
+
+	/**
+	 * offsetExists.
+	 *
+	 * @param string $offset
+	 * @return bool
+	 */
+	public function offsetExists( $offset ) {
+		return in_array( $offset, array_merge( array( 'is_variation', 'is_visible', 'is_taxonomy', 'value' ), array_keys( $this->data ) ) );
+	}
+}
diff --git a/includes/class-wc-product-download.php b/includes/class-wc-product-download.php
new file mode 100644
index 00000000000..63e2744bd6e
--- /dev/null
+++ b/includes/class-wc-product-download.php
@@ -0,0 +1,240 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Represents a file which can be downloaded.
+ *
+ * @version     3.0.0
+ * @since       3.0.0
+ * @package     WooCommerce/Classes
+ * @author      WooThemes
+ */
+class WC_Product_Download implements ArrayAccess {
+
+	/**
+	 * Data array.
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $data = array(
+		'id'            => '',
+		'name'          => '',
+		'file'          => '',
+		'previous_hash' => '',
+	);
+
+	/**
+	 * Returns all data for this object.
+	 * @return array
+	 */
+	public function get_data() {
+		return $this->data;
+	}
+
+	/**
+	 * Get allowed mime types.
+	 * @return array
+	 */
+	public function get_allowed_mime_types() {
+		return apply_filters( 'woocommerce_downloadable_file_allowed_mime_types', get_allowed_mime_types() );
+	}
+
+	/**
+	 * Get type of file path set.
+	 * @param  string $file_path optional.
+	 * @return string absolute, relative, or shortcode.
+	 */
+	public function get_type_of_file_path( $file_path = '' ) {
+		$file_path = $file_path ? $file_path : $this->get_file();
+		if ( 0 === strpos( $file_path, 'http' ) ) {
+			return 'absolute';
+		} elseif ( '[' === substr( $file_path, 0, 1 ) && ']' === substr( $file_path, -1 ) ) {
+			return 'shortcode';
+		} else {
+			return 'relative';
+		}
+	}
+
+	/**
+	 * Get file type.
+	 * @return string
+	 */
+	public function get_file_type() {
+		$type = wp_check_filetype( strtok( $this->get_file(), '?' ), $this->get_allowed_mime_types() );
+		return $type['type'];
+	}
+
+	/**
+	 * Get file extension.
+	 * @return string
+	 */
+	public function get_file_extension() {
+		$parsed_url = parse_url( $this->get_file(), PHP_URL_PATH );
+		return pathinfo( $parsed_url, PATHINFO_EXTENSION );
+	}
+
+	/**
+	 * Check if file is allowed.
+	 * @return boolean
+	 */
+	public function is_allowed_filetype() {
+		if ( 'relative' !== $this->get_type_of_file_path() ) {
+			return true;
+		}
+		return ! $this->get_file_extension() || in_array( $this->get_file_type(), $this->get_allowed_mime_types() );
+	}
+
+	/**
+	 * Validate file exists.
+	 * @return boolean
+	 */
+	public function file_exists() {
+		if ( 'relative' !== $this->get_type_of_file_path() ) {
+			return true;
+		}
+		$file_url = $this->get_file();
+		if ( '..' === substr( $file_url, 0, 2 ) || '/' !== substr( $file_url, 0, 1 ) ) {
+			$file_url = realpath( ABSPATH . $file_url );
+		} elseif ( '/wp-content' === substr( $file_url, 0, 11 ) ) {
+			$file_url = realpath( WP_CONTENT_DIR . substr( $file_url, 11 ) );
+		}
+		return apply_filters( 'woocommerce_downloadable_file_exists', file_exists( $file_url ), $this->get_file() );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Setters
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Set ID.
+	 * @param string $value
+	 */
+	public function set_id( $value ) {
+		$this->data['id'] = wc_clean( $value );
+	}
+
+	/**
+	 * Set name.
+	 * @param string $value
+	 */
+	public function set_name( $value ) {
+		$this->data['name'] = wc_clean( $value );
+	}
+
+	/**
+	 * Set previous_hash.
+	 * @param string $value
+	 */
+	public function set_previous_hash( $value ) {
+		$this->data['previous_hash'] = wc_clean( $value );
+	}
+
+	/**
+	 * Set file.
+	 * @param string $value
+	 */
+	public function set_file( $value ) {
+		switch ( $this->get_type_of_file_path( $value ) ) {
+			case 'absolute' :
+				$this->data['file'] = esc_url_raw( $value );
+				break;
+			default:
+				$this->data['file'] = wc_clean( $value );
+				break;
+		}
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Getters
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Get id.
+	 * @return string
+	 */
+	public function get_id() {
+		return $this->data['id'];
+	}
+
+	/**
+	 * Get name.
+	 * @return string
+	 */
+	public function get_name() {
+		return $this->data['name'];
+	}
+
+	/**
+	 * Get previous_hash.
+	 * @return string
+	 */
+	public function get_previous_hash() {
+		return $this->data['previous_hash'];
+	}
+
+	/**
+	 * Get file.
+	 * @return string
+	 */
+	public function get_file() {
+		return $this->data['file'];
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| ArrayAccess/Backwards compatibility.
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * offsetGet
+	 * @param string $offset
+	 * @return mixed
+	 */
+	public function offsetGet( $offset ) {
+		switch ( $offset ) {
+			default :
+				if ( is_callable( array( $this, "get_$offset" ) ) ) {
+					return $this->{"get_$offset"}();
+				}
+				break;
+		}
+		return '';
+	}
+
+	/**
+	 * offsetSet
+	 * @param string $offset
+	 * @param mixed $value
+	 */
+	public function offsetSet( $offset, $value ) {
+		switch ( $offset ) {
+			default :
+				if ( is_callable( array( $this, "set_$offset" ) ) ) {
+					return $this->{"set_$offset"}( $value );
+				}
+				break;
+		}
+	}
+
+	/**
+	 * offsetUnset
+	 * @param string $offset
+	 */
+	public function offsetUnset( $offset ) {}
+
+	/**
+	 * offsetExists
+	 * @param string $offset
+	 * @return bool
+	 */
+	public function offsetExists( $offset ) {
+		return in_array( $offset, array_keys( $this->data ) );
+	}
+}
diff --git a/includes/class-wc-product-external.php b/includes/class-wc-product-external.php
index a0b4385d0eb..8c41bec5451 100644
--- a/includes/class-wc-product-external.php
+++ b/includes/class-wc-product-external.php
@@ -1,7 +1,6 @@
 <?php
-
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
 /**
@@ -10,7 +9,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  * External products cannot be bought; they link offsite. Extends simple products.
  *
  * @class 		WC_Product_External
- * @version		2.0.0
+ * @version		3.0.0
  * @package		WooCommerce/Classes/Products
  * @category	Class
  * @author 		WooThemes
@@ -18,16 +17,129 @@ if ( ! defined( 'ABSPATH' ) ) {
 class WC_Product_External extends WC_Product {
 
 	/**
-	 * __construct function.
+	 * Stores product data.
 	 *
-	 * @access public
-	 * @param mixed $product
+	 * @var array
 	 */
-	public function __construct( $product ) {
-		$this->product_type = 'external';
-		parent::__construct( $product );
+	protected $extra_data = array(
+		'product_url' => '',
+		'button_text' => '',
+	);
+
+	/**
+	 * Get internal type.
+	 * @return string
+	 */
+	public function get_type() {
+		return 'external';
 	}
 
+	/*
+	|--------------------------------------------------------------------------
+	| Getters
+	|--------------------------------------------------------------------------
+	|
+	| Methods for getting data from the product object.
+	*/
+
+	/**
+	 * Get product url.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_product_url( $context = 'view' ) {
+		return esc_url( $this->get_prop( 'product_url', $context ) );
+	}
+
+	/**
+	 * Get button text.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_button_text( $context = 'view' ) {
+		return $this->get_prop( 'button_text', $context );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Setters
+	|--------------------------------------------------------------------------
+	|
+	| Functions for setting product data. These should not update anything in the
+	| database itself and should only change what is stored in the class
+	| object.
+	*/
+
+	/**
+	 * Set product URL.
+	 *
+	 * @since 3.0.0
+	 * @param string $product_url Product URL.
+	 */
+	public function set_product_url( $product_url ) {
+		$this->set_prop( 'product_url', $product_url );
+	}
+
+	/**
+	 * Set button text.
+	 *
+	 * @since 3.0.0
+	 * @param string $button_text Button text.
+	 */
+	public function set_button_text( $button_text ) {
+		$this->set_prop( 'button_text', $button_text );
+	}
+
+	/**
+	 * External products cannot be stock managed.
+	 *
+	 * @since 3.0.0
+	 * @param bool
+	 */
+	public function set_manage_stock( $manage_stock ) {
+		$this->set_prop( 'manage_stock', false );
+
+		if ( true === $manage_stock ) {
+			$this->error( 'product_external_invalid_manage_stock', __( 'External products cannot be stock managed.', 'woocommerce' ) );
+		}
+	}
+
+	/**
+	 * External products cannot be stock managed.
+	 *
+	 * @since 3.0.0
+	 * @param bool
+	 */
+	public function set_stock_status( $stock_status = '' ) {
+		$this->set_prop( 'stock_status', 'instock' );
+
+		if ( 'instock' !== $stock_status ) {
+			$this->error( 'product_external_invalid_stock_status', __( 'External products cannot be stock managed.', 'woocommerce' ) );
+		}
+	}
+
+	/**
+	 * xternal products cannot be backordered.
+	 *
+	 * @since 3.0.0
+	 * @param string $backorders Options: 'yes', 'no' or 'notify'.
+	 */
+	public function set_backorders( $backorders ) {
+		$this->set_prop( 'backorders', 'no' );
+
+		if ( 'no' !== $backorders ) {
+			$this->error( 'product_external_invalid_backorders', __( 'External products cannot be backordered.', 'woocommerce' ) );
+		}
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Other Actions
+	|--------------------------------------------------------------------------
+	*/
+
 	/**
 	 * Returns false if the product cannot be bought.
 	 *
@@ -55,7 +167,7 @@ class WC_Product_External extends WC_Product {
 	 * @return string
 	 */
 	public function single_add_to_cart_text() {
-		return apply_filters( 'woocommerce_product_single_add_to_cart_text', $this->get_button_text(), $this );
+		return apply_filters( 'woocommerce_product_single_add_to_cart_text', $this->get_button_text() ? $this->get_button_text() : _x( 'Buy product', 'placeholder', 'woocommerce' ), $this );
 	}
 
 	/**
@@ -65,26 +177,6 @@ class WC_Product_External extends WC_Product {
 	 * @return string
 	 */
 	public function add_to_cart_text() {
-		return apply_filters( 'woocommerce_product_single_add_to_cart_text', $this->get_button_text(), $this );
-	}
-
-	/**
-	 * get_product_url function.
-	 *
-	 * @access public
-	 * @return string
-	 */
-	public function get_product_url() {
-		return esc_url( $this->product_url );
-	}
-
-	/**
-	 * get_button_text function.
-	 *
-	 * @access public
-	 * @return string
-	 */
-	public function get_button_text() {
-		return $this->button_text ? $this->button_text : __( 'Buy product', 'woocommerce' );
+		return apply_filters( 'woocommerce_product_add_to_cart_text', $this->get_button_text() ? $this->get_button_text() : _x( 'Buy product', 'placeholder', 'woocommerce' ), $this );
 	}
 }
diff --git a/includes/class-wc-product-factory.php b/includes/class-wc-product-factory.php
index 8d99e7e5172..8626900b0f0 100644
--- a/includes/class-wc-product-factory.php
+++ b/includes/class-wc-product-factory.php
@@ -10,7 +10,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  * The WooCommerce product factory creating the right product object.
  *
  * @class 		WC_Product_Factory
- * @version		2.3.0
+ * @version		3.0.0
  * @package		WooCommerce/Classes
  * @category	Class
  * @author 		WooThemes
@@ -18,83 +18,100 @@ if ( ! defined( 'ABSPATH' ) ) {
 class WC_Product_Factory {
 
 	/**
-	 * get_product function.
+	 * Get a product.
 	 *
-	 * @param bool $the_product (default: false)
-	 * @param array $args (default: array())
-	 * @return WC_Product|bool false if the product cannot be loaded
+	 * @param mixed $product_id (default: false)
+	 * @param array $deprecated Previously used to pass arguments to the factory, e.g. to force a type.
+	 * @return WC_Product|bool Product object or null if the product cannot be loaded.
 	 */
-	public function get_product( $the_product = false, $args = array() ) {
-		$the_product = $this->get_product_object( $the_product );
-
-		if ( ! $the_product ) {
+	public function get_product( $product_id = false, $deprecated = array() ) {
+		if ( ! $product_id = $this->get_product_id( $product_id ) ) {
 			return false;
 		}
 
-		$classname = $this->get_product_class( $the_product, $args );
+		$product_type = $this->get_product_type( $product_id );
 
-		if ( ! class_exists( $classname ) ) {
+		// Backwards compatibility.
+		if ( ! empty( $deprecated ) ) {
+			wc_deprecated_argument( 'args', '3.0', 'Passing args to the product factory is deprecated. If you need to force a type, construct the product class directly.' );
+
+			if ( isset( $deprecated['product_type'] ) ) {
+				$product_type = $this->get_classname_from_product_type( $deprecated['product_type'] );
+			}
+		}
+
+		$classname = $this->get_product_classname( $product_id, $product_type );
+
+		try {
+			return new $classname( $product_id, $deprecated );
+		} catch ( Exception $e ) {
+			return false;
+		}
+	}
+
+	/**
+	 * Gets a product classname and allows filtering. Returns WC_Product_Simple if the class does not exist.
+	 *
+	 * @since  3.0.0
+	 * @param  int    $product_id
+	 * @param  string $product_type
+	 * @return string
+	 */
+	public static function get_product_classname( $product_id, $product_type ) {
+		$classname = apply_filters( 'woocommerce_product_class', self::get_classname_from_product_type( $product_type ), $product_type, 'variation' === $product_type ? 'product_variation' : 'product', $product_id );
+
+		if ( ! $classname || ! class_exists( $classname ) ) {
 			$classname = 'WC_Product_Simple';
 		}
 
-		return new $classname( $the_product, $args );
+		return $classname;
+	}
+
+	/**
+	 * Get the product type for a product.
+	 *
+	 * @since 3.0.0
+	 * @param  int $product_id
+	 * @return string|false
+	 */
+	public static function get_product_type( $product_id ) {
+		// Allow the overriding of the lookup in this function. Return the product type here.
+		$override = apply_filters( 'woocommerce_product_type_query', false, $product_id );
+		if ( ! $override ) {
+			return WC_Data_Store::load( 'product' )->get_product_type( $product_id );
+		} else {
+			return $override;
+		}
 	}
 
 	/**
 	 * Create a WC coding standards compliant class name e.g. WC_Product_Type_Class instead of WC_Product_type-class.
+	 *
 	 * @param  string $product_type
 	 * @return string|false
 	 */
-	private function get_classname_from_product_type( $product_type ) {
+	public static function get_classname_from_product_type( $product_type ) {
 		return $product_type ? 'WC_Product_' . implode( '_', array_map( 'ucfirst', explode( '-', $product_type ) ) ) : false;
 	}
 
 	/**
-	 * Get the product class name.
-	 * @param  WP_Post $the_product
-	 * @param  array $args (default: array())
-	 * @return string
+	 * Get the product ID depending on what was passed.
+	 *
+	 * @since 3.0.0
+	 * @param  mixed $product
+	 * @return int|bool false on failure
 	 */
-	private function get_product_class( $the_product, $args = array() ) {
-		$product_id = absint( $the_product->ID );
-		$post_type  = $the_product->post_type;
-
-		if ( 'product' === $post_type ) {
-			if ( isset( $args['product_type'] ) ) {
-				$product_type = $args['product_type'];
-			} else {
-				$terms        = get_the_terms( $product_id, 'product_type' );
-				$product_type = ! empty( $terms ) ? sanitize_title( current( $terms )->name ) : 'simple';
-			}
-		} elseif( 'product_variation' === $post_type ) {
-			$product_type = 'variation';
+	private function get_product_id( $product ) {
+		if ( false === $product && isset( $GLOBALS['post'], $GLOBALS['post']->ID ) && 'product' === get_post_type( $GLOBALS['post']->ID ) ) {
+			return $GLOBALS['post']->ID;
+		} elseif ( is_numeric( $product ) ) {
+			return $product;
+		} elseif ( $product instanceof WC_Product ) {
+			return $product->get_id();
+		} elseif ( ! empty( $product->ID ) ) {
+			return $product->ID;
 		} else {
-			$product_type = false;
+			return false;
 		}
-
-		$classname = $this->get_classname_from_product_type( $product_type );
-
-		// Filter classname so that the class can be overridden if extended.
-		return apply_filters( 'woocommerce_product_class', $classname, $product_type, $post_type, $product_id );
-	}
-
-	/**
-	 * Get the product object.
-	 * @param  mixed $the_product
-	 * @uses   WP_Post
-	 * @return WP_Post|bool false on failure
-	 */
-	private function get_product_object( $the_product ) {
-		if ( false === $the_product ) {
-			$the_product = $GLOBALS['post'];
-		} elseif ( is_numeric( $the_product ) ) {
-			$the_product = get_post( $the_product );
-		} elseif ( $the_product instanceof WC_Product ) {
-			$the_product = get_post( $the_product->id );
-		} elseif ( ! ( $the_product instanceof WP_Post ) ) {
-			$the_product = false;
-		}
-
-		return apply_filters( 'woocommerce_product_object', $the_product );
 	}
 }
diff --git a/includes/class-wc-product-grouped.php b/includes/class-wc-product-grouped.php
index 6a0dbc9ba10..bb44818ec76 100644
--- a/includes/class-wc-product-grouped.php
+++ b/includes/class-wc-product-grouped.php
@@ -1,7 +1,6 @@
 <?php
-
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
 /**
@@ -10,25 +9,28 @@ if ( ! defined( 'ABSPATH' ) ) {
  * Grouped products cannot be purchased - they are wrappers for other products.
  *
  * @class 		WC_Product_Grouped
- * @version		2.3.0
+ * @version		3.0.0
  * @package		WooCommerce/Classes/Products
  * @category	Class
  * @author 		WooThemes
  */
 class WC_Product_Grouped extends WC_Product {
 
-	/** @public array Array of child products/posts/variations. */
-	public $children;
+	/**
+	 * Stores product data.
+	 *
+	 * @var array
+	 */
+	protected $extra_data = array(
+		'children' => array(),
+	);
 
 	/**
-	 * __construct function.
-	 *
-	 * @access public
-	 * @param mixed $product
+	 * Get internal type.
+	 * @return string
 	 */
-	public function __construct( $product ) {
-		$this->product_type = 'grouped';
-		parent::__construct( $product );
+	public function get_type() {
+		return 'grouped';
 	}
 
 	/**
@@ -41,81 +43,23 @@ class WC_Product_Grouped extends WC_Product {
 		return apply_filters( 'woocommerce_product_add_to_cart_text', __( 'View products', 'woocommerce' ), $this );
 	}
 
-	/**
-	 * Return the products children posts.
-	 *
-	 * @access public
-	 * @return array
-	 */
-	public function get_children() {
-		if ( ! is_array( $this->children ) || empty( $this->children ) ) {
-        	$transient_name = 'wc_product_children_' . $this->id;
-			$this->children = array_filter( array_map( 'absint', (array) get_transient( $transient_name ) ) );
-
-        	if ( empty( $this->children ) ) {
-
-        		$args = apply_filters( 'woocommerce_grouped_children_args', array(
-        			'post_parent' 	=> $this->id,
-        			'post_type'		=> 'product',
-        			'orderby'		=> 'menu_order',
-        			'order'			=> 'ASC',
-        			'fields'		=> 'ids',
-        			'post_status'	=> 'publish',
-        			'numberposts'	=> -1,
-        		) );
-
-		        $this->children = get_posts( $args );
-
-				set_transient( $transient_name, $this->children, DAY_IN_SECONDS * 30 );
-			}
-		}
-		return (array) $this->children;
-	}
-
-	/**
-	 * Returns whether or not the product has any child product.
-	 *
-	 * @access public
-	 * @return bool
-	 */
-	public function has_child() {
-		return sizeof( $this->get_children() ) ? true : false;
-	}
-
 	/**
 	 * Returns whether or not the product is on sale.
 	 *
-	 * @access public
+	 * @param  string $context What the value is for. Valid values are view and edit.
 	 * @return bool
 	 */
-	public function is_on_sale() {
-		$is_on_sale = false;
+	public function is_on_sale( $context = 'view' ) {
+		global $wpdb;
 
-		if ( $this->has_child() ) {
+		$on_sale = $this->get_children() && null !== $wpdb->get_var( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_sale_price' AND meta_value > 0 AND post_id IN (" . implode( ',', array_map( 'esc_sql', $this->get_children() ) ) . ");" );
 
-			foreach ( $this->get_children() as $child_id ) {
-				$sale_price = get_post_meta( $child_id, '_sale_price', true );
-				if ( $sale_price !== "" && $sale_price >= 0 ) {
-					$is_on_sale = true;
-				}
-			}
-
-		} else {
-
-			if ( $this->sale_price && $this->sale_price == $this->price ) {
-				$is_on_sale = true;
-			}
-
-		}
-
-		return apply_filters( 'woocommerce_product_is_on_sale', $is_on_sale, $this );
+		return 'view' === $context ? apply_filters( 'woocommerce_product_is_on_sale', $on_sale, $this ) : $on_sale;
 	}
 
-
 	/**
 	 * Returns false if the product cannot be bought.
 	 *
-	 * @access public
 	 * @return bool
 	 */
 	public function is_purchasable() {
@@ -133,11 +77,12 @@ class WC_Product_Grouped extends WC_Product {
 		$tax_display_mode = get_option( 'woocommerce_tax_display_shop' );
 		$child_prices     = array();
 
-		foreach ( $this->get_children() as $child_id )
-			$child_prices[] = get_post_meta( $child_id, '_price', true );
-
-		$child_prices     = array_unique( $child_prices );
-		$get_price_method = 'get_price_' . $tax_display_mode . 'uding_tax';
+		foreach ( $this->get_children() as $child_id ) {
+			$child = wc_get_product( $child_id );
+			if ( '' !== $child->get_price() ) {
+				$child_prices[] = 'incl' === $tax_display_mode ? wc_get_price_including_tax( $child ) : wc_get_price_excluding_tax( $child );
+			}
+		}
 
 		if ( ! empty( $child_prices ) ) {
 			$min_price = min( $child_prices );
@@ -147,22 +92,82 @@ class WC_Product_Grouped extends WC_Product {
 			$max_price = '';
 		}
 
-		if ( $min_price ) {
-			if ( $min_price == $max_price ) {
-				$display_price = wc_price( $this->$get_price_method( 1, $min_price ) );
+		if ( '' !== $min_price ) {
+			$price   = $min_price !== $max_price ? sprintf( _x( '%1$s&ndash;%2$s', 'Price range: from-to', 'woocommerce' ), wc_price( $min_price ), wc_price( $max_price ) ) : wc_price( $min_price );
+			$is_free = ( 0 == $min_price && 0 == $max_price );
+
+			if ( $is_free ) {
+				$price = apply_filters( 'woocommerce_grouped_free_price_html', __( 'Free!', 'woocommerce' ), $this );
 			} else {
-				$from          = wc_price( $this->$get_price_method( 1, $min_price ) );
-				$to            = wc_price( $this->$get_price_method( 1, $max_price ) );
-				$display_price = sprintf( _x( '%1$s&ndash;%2$s', 'Price range: from-to', 'woocommerce' ), $from, $to );
+				$price = apply_filters( 'woocommerce_grouped_price_html', $price . $this->get_price_suffix(), $this, $child_prices );
 			}
-
-			$price .= $display_price . $this->get_price_suffix();
-
-			$price = apply_filters( 'woocommerce_grouped_price_html', $price, $this );
 		} else {
 			$price = apply_filters( 'woocommerce_grouped_empty_price_html', '', $this );
 		}
 
 		return apply_filters( 'woocommerce_get_price_html', $price, $this );
 	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Getters
+	|--------------------------------------------------------------------------
+	|
+	| Methods for getting data from the product object.
+	*/
+
+	/**
+	 * Return the children of this product.
+	 *
+	 * @param  string $context
+	 * @return array
+	 */
+	public function get_children( $context = 'view' ) {
+		return $this->get_prop( 'children', $context );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Setters
+	|--------------------------------------------------------------------------
+	|
+	| Methods for getting data from the product object.
+	*/
+
+	/**
+	 * Return the children of this product.
+	 *
+	 * @param array $children
+	 */
+	public function set_children( $children ) {
+		$this->set_prop( 'children', array_filter( wp_parse_id_list( (array) $children ) ) );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Sync with children.
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Sync a grouped product with it's children. These sync functions sync
+	 * upwards (from child to parent) when the variation is saved.
+	 *
+	 * @param WC_Product|int $product Product object or ID for which you wish to sync.
+	 * @param bool $save If true, the prouduct object will be saved to the DB before returning it.
+	 * @return WC_Product Synced product object.
+	 */
+	public static function sync( $product, $save = true ) {
+		if ( ! is_a( $product, 'WC_Product' ) ) {
+			$product = wc_get_product( $product );
+		}
+		if ( is_a( $product, 'WC_Product_Grouped' ) ) {
+			$data_store = WC_Data_Store::load( 'product-' . $product->get_type() );
+			$data_store->sync_price( $product );
+			if ( $save ) {
+				$product->save();
+			}
+		}
+		return $product;
+	}
 }
diff --git a/includes/class-wc-product-simple.php b/includes/class-wc-product-simple.php
index 3c18d8f2ad4..33ee968fde4 100644
--- a/includes/class-wc-product-simple.php
+++ b/includes/class-wc-product-simple.php
@@ -10,7 +10,6 @@ if ( ! defined( 'ABSPATH' ) ) {
  * The default product type kinda product.
  *
  * @class 		WC_Product_Simple
- * @version		2.0.0
  * @package		WooCommerce/Classes/Products
  * @category	Class
  * @author 		WooThemes
@@ -22,12 +21,19 @@ class WC_Product_Simple extends WC_Product {
 	 *
 	 * @param mixed $product
 	 */
-	public function __construct( $product ) {
-		$this->product_type = 'simple';
+	public function __construct( $product = 0 ) {
 		$this->supports[]   = 'ajax_add_to_cart';
 		parent::__construct( $product );
 	}
 
+	/**
+	 * Get internal type.
+	 * @return string
+	 */
+	public function get_type() {
+		return 'simple';
+	}
+
 	/**
 	 * Get the add to url used mainly in loops.
 	 *
@@ -45,51 +51,8 @@ class WC_Product_Simple extends WC_Product {
 	 * @return string
 	 */
 	public function add_to_cart_text() {
-		$text = $this->is_purchasable() && $this->is_in_stock() ? __( 'Add to cart', 'woocommerce' ) : __( 'Read More', 'woocommerce' );
+		$text = $this->is_purchasable() && $this->is_in_stock() ? __( 'Add to cart', 'woocommerce' ) : __( 'Read more', 'woocommerce' );
 
 		return apply_filters( 'woocommerce_product_add_to_cart_text', $text, $this );
 	}
-
-	/**
-	 * Get the title of the post.
-	 *
-	 * @return string
-	 */
-	public function get_title() {
-
-		$title = $this->post->post_title;
-
-		if ( $this->get_parent() > 0 ) {
-			$title = get_the_title( $this->get_parent() ) . ' &rarr; ' . $title;
-		}
-
-		return apply_filters( 'woocommerce_product_title', $title, $this );
-	}
-
-	/**
-	 * Sync grouped products with the children lowest price (so they can be sorted by price accurately).
-	 */
-	public function grouped_product_sync() {
-		if ( ! $this->get_parent() ) return;
-
-		$children_by_price = get_posts( array(
-			'post_parent'    => $this->get_parent(),
-			'orderby'        => 'meta_value_num',
-			'order'          => 'asc',
-			'meta_key'       => '_price',
-			'posts_per_page' => 1,
-			'post_type'      => 'product',
-			'fields'         => 'ids'
-		));
-		if ( $children_by_price ) {
-			foreach ( $children_by_price as $child ) {
-				$child_price = get_post_meta( $child, '_price', true );
-				update_post_meta( $this->get_parent(), '_price', $child_price );
-			}
-		}
-
-		delete_transient( 'wc_products_onsale' );
-
-		do_action( 'woocommerce_grouped_product_sync', $this->id, $children_by_price );
-	}
 }
diff --git a/includes/class-wc-product-variable.php b/includes/class-wc-product-variable.php
index ae9d9f93c9c..429325d1d5c 100644
--- a/includes/class-wc-product-variable.php
+++ b/includes/class-wc-product-variable.php
@@ -1,7 +1,6 @@
 <?php
-
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
 /**
@@ -9,448 +8,203 @@ if ( ! defined( 'ABSPATH' ) ) {
  *
  * The WooCommerce product class handles individual product data.
  *
- * @class 		WC_Product_Variable
- * @version		2.0.0
+ * @version		3.0.0
  * @package		WooCommerce/Classes/Products
  * @category	Class
  * @author 		WooThemes
  */
 class WC_Product_Variable extends WC_Product {
 
-	/** @public array Array of child products/posts/variations. */
-	public $children = null;
-
-	/** @private array Array of variation prices. */
-	private $prices_array = array();
+	/**
+	 * Array of children variation IDs. Determined by children.
+	 *
+	 * @var array
+	 */
+	protected $children = array();
 
 	/**
-	 * Constructor.
+	 * Array of visible children variation IDs. Determined by children.
 	 *
-	 * @param mixed $product
+	 * @var array
 	 */
-	public function __construct( $product ) {
-		$this->product_type = 'variable';
-		parent::__construct( $product );
+	protected $visible_children = array();
+
+	/**
+	 * Array of variation attributes IDs. Determined by children.
+	 *
+	 * @var array
+	 */
+	protected $variation_attributes = array();
+
+	/**
+	 * Get internal type.
+	 *
+	 * @return string
+	 */
+	public function get_type() {
+		return 'variable';
 	}
 
+	/*
+	|--------------------------------------------------------------------------
+	| Getters
+	|--------------------------------------------------------------------------
+	*/
+
 	/**
 	 * Get the add to cart button text.
 	 *
-	 * @access public
 	 * @return string
 	 */
 	public function add_to_cart_text() {
-		return apply_filters( 'woocommerce_product_add_to_cart_text', __( 'Select options', 'woocommerce' ), $this );
-	}
-
-	/**
-	 * Set stock level of the product.
-	 *
-	 * @param mixed $amount (default: null)
-	 * @param string $mode can be set, add, or subtract
-	 * @return int Stock
-	 */
-	public function set_stock( $amount = null, $mode = 'set' ) {
-		$this->total_stock = '';
-		delete_transient( 'wc_product_total_stock_' . $this->id . WC_Cache_Helper::get_transient_version( 'product' ) );
-		return parent::set_stock( $amount, $mode );
-	}
-
-	/**
-	 * Performed after a stock level change at product level.
-	 */
-	public function check_stock_status() {
-		$set_child_stock_status = '';
-
-		if ( ! $this->backorders_allowed() && $this->get_stock_quantity() <= get_option( 'woocommerce_notify_no_stock_amount' ) ) {
-			$set_child_stock_status = 'outofstock';
-		} elseif ( $this->backorders_allowed() || $this->get_stock_quantity() > get_option( 'woocommerce_notify_no_stock_amount' ) ) {
-			$set_child_stock_status = 'instock';
-		}
-
-		if ( $set_child_stock_status ) {
-			foreach ( $this->get_children() as $child_id ) {
-				if ( 'yes' !== get_post_meta( $child_id, '_manage_stock', true ) ) {
-					wc_update_product_stock_status( $child_id, $set_child_stock_status );
-				}
-			}
-
-			// Children statuses changed, so sync self
-			self::sync_stock_status( $this->id );
-		}
-	}
-
-	/**
-	 * Set stock status.
-	 */
-	public function set_stock_status( $status ) {
-		$status = 'outofstock' === $status ? 'outofstock' : 'instock';
-
-		if ( update_post_meta( $this->id, '_stock_status', $status ) ) {
-			do_action( 'woocommerce_product_set_stock_status', $this->id, $status );
-		}
-	}
-
-	/**
-	 * Return a products child ids.
-	 *
-	 * @param  boolean $visible_only Only return variations which are not hidden
-	 * @return array of children ids
-	 */
-	public function get_children( $visible_only = false ) {
-		$key            = $visible_only ? 'visible' : 'all';
-		$transient_name = 'wc_product_children_' . $this->id;
-
-		// Get value of transient
-		if ( ! is_array( $this->children ) ) {
-			$this->children = get_transient( $transient_name );
-		}
-
-		// Get value from DB
-		if ( empty( $this->children ) || ! is_array( $this->children ) || ! isset( $this->children[ $key ] ) ) {
-			$args = array(
-				'post_parent' => $this->id,
-				'post_type'   => 'product_variation',
-				'orderby'     => 'menu_order',
-				'order'       => 'ASC',
-				'fields'      => 'ids',
-				'post_status' => 'publish',
-				'numberposts' => -1
-			);
-
-			if ( $visible_only ) {
-				$args['meta_query'] = array(
-					'relation' => 'AND',
-					// Price is required
-					array(
-						'key'     => '_price',
-						'value'   => '',
-						'compare' => '!=',
-					)
-				);
-				// Must be in stock?
-				if ( 'yes' === get_option( 'woocommerce_hide_out_of_stock_items' ) ) {
-					$args['meta_query'][] = array(
-						'key'     => '_stock_status',
-						'value'   => 'instock',
-						'compare' => '=',
-					);
-				}
-			}
-
-			$args                   = apply_filters( 'woocommerce_variable_children_args', $args, $this, $visible_only );
-			$this->children[ $key ] = get_posts( $args );
-
-			set_transient( $transient_name, $this->children, DAY_IN_SECONDS * 30 );
-		}
-
-		return apply_filters( 'woocommerce_get_children', $this->children[ $key ], $this, $visible_only );
-	}
-
-	/**
-	 * get_child function.
-	 *
-	 * @access public
-	 * @param mixed $child_id
-	 * @return WC_Product WC_Product or WC_Product_variation
-	 */
-	public function get_child( $child_id ) {
-		return wc_get_product( $child_id, array(
-			'parent_id' => $this->id,
-			'parent' 	=> $this
-		) );
-	}
-
-	/**
-	 * Returns whether or not the product has any child product.
-	 *
-	 * @access public
-	 * @return bool
-	 */
-	public function has_child() {
-		return sizeof( $this->get_children() ) ? true : false;
-	}
-
-	/**
-	 * Returns whether or not the product is on sale.
-	 * @return bool
-	 */
-	public function is_on_sale() {
-		$is_on_sale = false;
-		$prices     = $this->get_variation_prices();
-		if ( $prices['regular_price'] !== $prices['sale_price'] && $prices['sale_price'] === $prices['price'] ) {
-			$is_on_sale = true;
-		}
-		return apply_filters( 'woocommerce_product_is_on_sale', $is_on_sale, $this );
-	}
-
-	/**
-	 * Get the min or max variation regular price.
-	 * @param  string $min_or_max - min or max
-	 * @param  boolean  $display Whether the value is going to be displayed
-	 * @return string
-	 */
-	public function get_variation_regular_price( $min_or_max = 'min', $display = false ) {
-		$prices = $this->get_variation_prices( $display );
-		$price  = 'min' === $min_or_max ? current( $prices['regular_price'] ) : end( $prices['regular_price'] );
-		return apply_filters( 'woocommerce_get_variation_regular_price', $price, $this, $min_or_max, $display );
-	}
-
-	/**
-	 * Get the min or max variation sale price.
-	 * @param  string $min_or_max - min or max
-	 * @param  boolean  $display Whether the value is going to be displayed
-	 * @return string
-	 */
-	public function get_variation_sale_price( $min_or_max = 'min', $display = false ) {
-		$prices = $this->get_variation_prices( $display );
-		$price  = 'min' === $min_or_max ? current( $prices['sale_price'] ) : end( $prices['sale_price'] );
-		return apply_filters( 'woocommerce_get_variation_sale_price', $price, $this, $min_or_max, $display );
-	}
-
-	/**
-	 * Get the min or max variation (active) price.
-	 * @param  string $min_or_max - min or max
-	 * @param  boolean  $display Whether the value is going to be displayed
-	 * @return string
-	 */
-	public function get_variation_price( $min_or_max = 'min', $display = false ) {
-		$prices = $this->get_variation_prices( $display );
-		$price  = 'min' === $min_or_max ? current( $prices['price'] ) : end( $prices['price'] );
-		return apply_filters( 'woocommerce_get_variation_price', $price, $this, $min_or_max, $display );
+		return apply_filters( 'woocommerce_product_add_to_cart_text', $this->is_purchasable() ? __( 'Select options', 'woocommerce' ) : __( 'Read more', 'woocommerce' ), $this );
 	}
 
 	/**
 	 * Get an array of all sale and regular prices from all variations. This is used for example when displaying the price range at variable product level or seeing if the variable product is on sale.
 	 *
-	 * Can be filtered by plugins which modify costs, but otherwise will include the raw meta costs unlike get_price() which runs costs through the woocommerce_get_price filter.
-	 * This is to ensure modified prices are not cached, unless intended.
-	 *
-	 * @param  bool $display Are prices for display? If so, taxes will be calculated.
+	 * @param  bool $include_taxes Should taxes be included in the prices.
 	 * @return array() Array of RAW prices, regular prices, and sale prices with keys set to variation ID.
 	 */
-	public function get_variation_prices( $display = false ) {
-		global $wp_filter;
+	public function get_variation_prices( $include_taxes = false ) {
+		$prices = $this->data_store->read_price_data( $this, $include_taxes );
 
-		/**
-		 * Transient name for storing prices for this product (note: Max transient length is 45)
-		 * @since 2.5.0 a single transient is used per product for all prices, rather than many transients per product.
-		 */
-		$transient_name = 'wc_var_prices_' . $this->id;
-
-		/**
-		 * Create unique cache key based on the tax location (affects displayed/cached prices), product version and active price filters.
-		 * DEVELOPERS should filter this hash if offering conditonal pricing to keep it unique.
-		 * @var string
-		 */
-		if ( $display ) {
-			$price_hash = array( true, WC_Tax::get_rates(), get_option( 'woocommerce_tax_display_shop' ) );
-		} else {
-			$price_hash = array( false );
+		foreach ( $prices as $price_key => $variation_prices ) {
+			$prices[ $price_key ] = $this->sort_variation_prices( $variation_prices );
 		}
 
-		$filter_names = array( 'woocommerce_variation_prices_price', 'woocommerce_variation_prices_regular_price', 'woocommerce_variation_prices_sale_price' );
+		return $prices;
+	}
 
-		foreach ( $filter_names as $filter_name ) {
-			if ( ! empty( $wp_filter[ $filter_name ] ) ) {
-				$price_hash[ $filter_name ] = $wp_filter[ $filter_name ];
-			}
-		}
+	/**
+	 * Get the min or max variation regular price.
+	 *
+	 * @param  string  $min_or_max    Min or max price.
+	 * @param  boolean $include_taxes Should the price include taxes?
+	 * @return string
+	 */
+	public function get_variation_regular_price( $min_or_max = 'min', $include_taxes = false ) {
+		$prices = $this->get_variation_prices( $include_taxes );
+		$price  = 'min' === $min_or_max ? current( $prices['regular_price'] ) : end( $prices['regular_price'] );
+		return apply_filters( 'woocommerce_get_variation_regular_price', $price, $this, $min_or_max, $include_taxes );
+	}
 
-		$price_hash = md5( json_encode( apply_filters( 'woocommerce_get_variation_prices_hash', $price_hash, $this, $display ) ) );
+	/**
+	 * Get the min or max variation sale price.
+	 *
+	 * @param  string  $min_or_max    Min or max price.
+	 * @param  boolean $include_taxes Should the price include taxes?
+	 * @return string
+	 */
+	public function get_variation_sale_price( $min_or_max = 'min', $include_taxes = false ) {
+		$prices = $this->get_variation_prices( $include_taxes );
+		$price  = 'min' === $min_or_max ? current( $prices['sale_price'] ) : end( $prices['sale_price'] );
+		return apply_filters( 'woocommerce_get_variation_sale_price', $price, $this, $min_or_max, $include_taxes );
+	}
 
-		// If the value has already been generated, return it now
-		if ( ! empty( $this->prices_array[ $price_hash ] ) ) {
-			return $this->prices_array[ $price_hash ];
-		}
-
-		// Get value of transient
-		$this->prices_array = array_filter( (array) get_transient( $transient_name ) );
-
-		// If the prices are not stored for this hash, generate them
-		if ( empty( $this->prices_array[ $price_hash ] ) ) {
-			$prices         = array();
-			$regular_prices = array();
-			$sale_prices    = array();
-			$variation_ids  = $this->get_children( true );
-
-			foreach ( $variation_ids as $variation_id ) {
-				if ( $variation = $this->get_child( $variation_id ) ) {
-					$price         = apply_filters( 'woocommerce_variation_prices_price', $variation->price, $variation, $this );
-					$regular_price = apply_filters( 'woocommerce_variation_prices_regular_price', $variation->regular_price, $variation, $this );
-					$sale_price    = apply_filters( 'woocommerce_variation_prices_sale_price', $variation->sale_price, $variation, $this );
-
-					// If sale price does not equal price, the product is not yet on sale
-					if ( $sale_price === $regular_price || $sale_price !== $price ) {
-						$sale_price = $regular_price;
-					}
-
-					// If we are getting prices for display, we need to account for taxes
-					if ( $display ) {
-						if ( 'incl' === get_option( 'woocommerce_tax_display_shop' ) ) {
-							$price         = '' === $price ? ''         : $variation->get_price_including_tax( 1, $price );
-							$regular_price = '' === $regular_price ? '' : $variation->get_price_including_tax( 1, $regular_price );
-							$sale_price    = '' === $sale_price ? ''    : $variation->get_price_including_tax( 1, $sale_price );
-						} else {
-							$price         = '' === $price ? ''         : $variation->get_price_excluding_tax( 1, $price );
-							$regular_price = '' === $regular_price ? '' : $variation->get_price_excluding_tax( 1, $regular_price );
-							$sale_price    = '' === $sale_price ? ''    : $variation->get_price_excluding_tax( 1, $sale_price );
-						}
-					}
-
-					$prices[ $variation_id ]         = $price;
-					$regular_prices[ $variation_id ] = $regular_price;
-					$sale_prices[ $variation_id ]    = $sale_price;
-				}
-			}
-
-			asort( $prices );
-			asort( $regular_prices );
-			asort( $sale_prices );
-
-			$this->prices_array[ $price_hash ] = array(
-				'price'         => $prices,
-				'regular_price' => $regular_prices,
-				'sale_price'    => $sale_prices
-			);
-
-			set_transient( $transient_name, $this->prices_array, DAY_IN_SECONDS * 30 );
-		}
-
-		/**
-		 * Give plugins one last chance to filter the variation prices array which is being returned.
-		 */
-		return $this->prices_array[ $price_hash ] = apply_filters( 'woocommerce_variation_prices', $this->prices_array[ $price_hash ], $this, $display );
+	/**
+	 * Get the min or max variation (active) price.
+	 *
+	 * @param  string  $min_or_max    Min or max price.
+	 * @param  boolean $include_taxes Should the price include taxes?
+	 * @return string
+	 */
+	public function get_variation_price( $min_or_max = 'min', $include_taxes = false ) {
+		$prices = $this->get_variation_prices( $include_taxes );
+		$price  = 'min' === $min_or_max ? current( $prices['price'] ) : end( $prices['price'] );
+		return apply_filters( 'woocommerce_get_variation_price', $price, $this, $min_or_max, $include_taxes );
 	}
 
 	/**
 	 * Returns the price in html format.
 	 *
-	 * @access public
+	 * Note: Variable prices do not show suffixes like other product types. This
+	 * is due to some things like tax classes being set at variation level which
+	 * could differ from the parent price. The only way to show accurate prices
+	 * would be to load the variation and get IT's price, which adds extra
+	 * overhead and still has edge cases where the values would be inaccurate.
+	 *
+	 * Additionally, ranges of prices no longer show 'striked out' sale prices
+	 * due to the strings being very long and unclear/confusing. A single range
+	 * is shown instead.
+	 *
 	 * @param string $price (default: '')
 	 * @return string
 	 */
 	public function get_price_html( $price = '' ) {
 		$prices = $this->get_variation_prices( true );
 
-		// No variations, or no active variation prices
-		if ( $this->get_price() === '' || empty( $prices['price'] ) ) {
+		if ( empty( $prices['price'] ) ) {
 			$price = apply_filters( 'woocommerce_variable_empty_price_html', '', $this );
 		} else {
-			$min_price = current( $prices['price'] );
-			$max_price = end( $prices['price'] );
-			$price     = $min_price !== $max_price ? sprintf( _x( '%1$s&ndash;%2$s', 'Price range: from-to', 'woocommerce' ), wc_price( $min_price ), wc_price( $max_price ) ) : wc_price( $min_price );
-			$is_free   = $min_price == 0 && $max_price == 0;
+			$min_price     = current( $prices['price'] );
+			$max_price     = end( $prices['price'] );
+			$min_reg_price = current( $prices['regular_price'] );
+			$max_reg_price = end( $prices['regular_price'] );
 
-			if ( $this->is_on_sale() ) {
-				$min_regular_price = current( $prices['regular_price'] );
-				$max_regular_price = end( $prices['regular_price'] );
-				$regular_price     = $min_regular_price !== $max_regular_price ? sprintf( _x( '%1$s&ndash;%2$s', 'Price range: from-to', 'woocommerce' ), wc_price( $min_regular_price ), wc_price( $max_regular_price ) ) : wc_price( $min_regular_price );
-				$price             = apply_filters( 'woocommerce_variable_sale_price_html', $this->get_price_html_from_to( $regular_price, $price ) . $this->get_price_suffix(), $this );
-			} elseif ( $is_free ) {
-				$price = apply_filters( 'woocommerce_variable_free_price_html', __( 'Free!', 'woocommerce' ), $this );
+			if ( $min_price !== $max_price ) {
+				$price = apply_filters( 'woocommerce_variable_price_html', wc_format_price_range( $min_price, $max_price ) . $this->get_price_suffix(), $this );
+			} elseif ( $this->is_on_sale() && $min_reg_price === $max_reg_price ) {
+				$price = apply_filters( 'woocommerce_variable_price_html', wc_format_sale_price( wc_price( $max_reg_price ), wc_price( $min_price ) ) . $this->get_price_suffix(), $this );
 			} else {
-				$price = apply_filters( 'woocommerce_variable_price_html', $price . $this->get_price_suffix(), $this );
+				$price = apply_filters( 'woocommerce_variable_price_html', wc_price( $min_price ) . $this->get_price_suffix(), $this );
 			}
 		}
+
 		return apply_filters( 'woocommerce_get_price_html', $price, $this );
 	}
 
+	/**
+	 * Get the suffix to display after prices > 0.
+	 *
+	 * This is skipped if the suffix
+	 * has dynamic values such as {price_excluding_tax} for variable products.
+	 * @see get_price_html for an explanation as to why.
+	 *
+	 * @param  string  $price to calculate, left blank to just use get_price()
+	 * @param  integer $qty   passed on to get_price_including_tax() or get_price_excluding_tax()
+	 * @return string
+	 */
+	public function get_price_suffix( $price = '', $qty = 1 ) {
+		$suffix = get_option( 'woocommerce_price_display_suffix' );
+
+		if ( strstr( $suffix, '{' ) ) {
+			return apply_filters( 'woocommerce_get_price_suffix', '', $this, $price, $qty );
+		} else {
+			return parent::get_price_suffix( $price, $qty );
+		}
+	}
+
+	/**
+	 * Return a products child ids.
+	 *
+	 * @return array Children ids
+	 */
+	public function get_children( $visible_only = '' ) {
+		if ( is_bool( $visible_only ) ) {
+			wc_deprecated_argument( 'visible_only', '3.0', 'WC_Product_Variable::get_visible_children' );
+			return $visible_only ? $this->get_visible_children() : $this->get_children();
+		}
+		return apply_filters( 'woocommerce_get_children', $this->children, $this, false );
+	}
+
+	/**
+	 * Return a products child ids - visible only.
+	 *
+	 * @since 3.0.0
+	 * @return array Children ids
+	 */
+	public function get_visible_children() {
+		return apply_filters( 'woocommerce_get_children', $this->visible_children, $this, true );
+	}
+
 	/**
 	 * Return an array of attributes used for variations, as well as their possible values.
 	 *
-	 * @return array of attributes and their available values
+	 * @return array Attributes and their available values
 	 */
 	public function get_variation_attributes() {
-		$variation_attributes = array();
-
-		if ( ! $this->has_child() ) {
-			return $variation_attributes;
-		}
-
-		$attributes = $this->get_attributes();
-
-		foreach ( $attributes as $attribute ) {
-			if ( ! $attribute['is_variation'] ) {
-				continue;
-			}
-
-			$values               = array();
-			$attribute_field_name = 'attribute_' . sanitize_title( $attribute['name'] );
-
-			// Get used values from children variations
-			foreach ( $this->get_children() as $child_id ) {
-				$variation = $this->get_child( $child_id );
-
-				if ( ! empty( $variation->variation_id ) ) {
-					if ( ! $variation->variation_is_visible() ) {
-						continue; // Disabled or hidden
-					}
-
-					$child_variation_attributes = $variation->get_variation_attributes();
-
-					if ( isset( $child_variation_attributes[ $attribute_field_name ] ) ) {
-						$values[] = $child_variation_attributes[ $attribute_field_name ];
-					}
-				}
-			}
-
-			// empty value indicates that all options for given attribute are available
-			if ( in_array( '', $values ) ) {
-				$values = $attribute['is_taxonomy'] ? wp_get_post_terms( $this->id, $attribute['name'], array( 'fields' => 'slugs' ) ) : wc_get_text_attributes( $attribute['value'] );
-
-			// Get custom attributes (non taxonomy) as defined
-			} elseif ( ! $attribute['is_taxonomy'] ) {
-				$text_attributes          = wc_get_text_attributes( $attribute['value'] );
-				$assigned_text_attributes = $values;
-				$values                   = array();
-
-				// Pre 2.4 handling where 'slugs' were saved instead of the full text attribute
-				if ( version_compare( get_post_meta( $this->id, '_product_version', true ), '2.4.0', '<' ) ) {
-					$assigned_text_attributes = array_map( 'sanitize_title', $assigned_text_attributes );
-
-					foreach ( $text_attributes as $text_attribute ) {
-						if ( in_array( sanitize_title( $text_attribute ), $assigned_text_attributes ) ) {
-							$values[] = $text_attribute;
-						}
-					}
-				} else {
-					foreach ( $text_attributes as $text_attribute ) {
-						if ( in_array( $text_attribute, $assigned_text_attributes ) ) {
-							$values[] = $text_attribute;
-						}
-					}
-				}
-			}
-
-			$variation_attributes[ $attribute['name'] ] = array_unique( $values );
-		}
-
-		return $variation_attributes;
-	}
-
-	/**
-	 * If set, get the default attributes for a variable product.
-	 *
-	 * @access public
-	 * @return array
-	 */
-	public function get_variation_default_attributes() {
-		$default = isset( $this->default_attributes ) ? $this->default_attributes : '';
-		return apply_filters( 'woocommerce_product_default_attributes', array_filter( (array) maybe_unserialize( $default ) ), $this );
-	}
-
-	/**
-	 * Check if variable product has default attributes set.
-	 *
-	 * @access public
-	 * @return bool
-	 */
-	public function has_default_attributes() {
-		if ( ! $this->get_variation_default_attributes() ) {
-			return true;
-		}
-		return false;
+		return $this->variation_attributes;
 	}
 
 	/**
@@ -460,83 +214,43 @@ class WC_Product_Variable extends WC_Product {
 	 * @return string
 	 */
 	public function get_variation_default_attribute( $attribute_name ) {
-		$defaults       = $this->get_variation_default_attributes();
+		$defaults       = $this->get_default_attributes();
 		$attribute_name = sanitize_title( $attribute_name );
 		return isset( $defaults[ $attribute_name ] ) ? $defaults[ $attribute_name ] : '';
 	}
 
 	/**
-	 * Match a variation to a given set of attributes using a WP_Query.
-	 * @since  2.4.0
-	 * @param  $match_attributes
-	 * @return int Variation ID which matched, 0 is no match was found
+	 * Variable products themselves cannot be downloadable.
 	 */
-	public function get_matching_variation( $match_attributes = array() ) {
-		$query_args = array(
-			'post_parent' => $this->id,
-			'post_type'   => 'product_variation',
-			'orderby'     => 'menu_order',
-			'order'       => 'ASC',
-			'fields'      => 'ids',
-			'post_status' => 'publish',
-			'numberposts' => 1,
-			'meta_query'  => array()
-		);
+	public function get_downloadable( $context = 'view' ) {
+		return false;
+	}
 
-		foreach ( $this->get_attributes() as $attribute ) {
-			if ( ! $attribute['is_variation'] ) {
-				continue;
-			}
-
-			$attribute_field_name = 'attribute_' . sanitize_title( $attribute['name'] );
-
-			if ( ! isset( $match_attributes[ $attribute_field_name ] ) ) {
-				return 0;
-			}
-
-			$value = wc_clean( $match_attributes[ $attribute_field_name ] );
-
-			$query_args['meta_query'][] = array(
-				'key'     => $attribute_field_name,
-				'value'   => array( '', $value ),
-				'compare' => 'IN'
-			);
-		}
-
-		$matches = get_posts( $query_args );
-
-		if ( $matches && ! is_wp_error( $matches ) ) {
-			return current( $matches );
-
-		/**
-		 * Pre 2.4 handling where 'slugs' were saved instead of the full text attribute.
-		 * Fallback is here because there are cases where data will be 'synced' but the product version will remain the same. @see WC_Product_Variable::sync_attributes.
-		 */
-	 	} elseif ( version_compare( get_post_meta( $this->id, '_product_version', true ), '2.4.0', '<' ) ) {
-			return $match_attributes === array_map( 'sanitize_title', $match_attributes ) ? 0 : $this->get_matching_variation( array_map( 'sanitize_title', $match_attributes ) );
-
-		} else {
-			return 0;
-		}
+	/**
+	 * Variable products themselves cannot be virtual.
+	 */
+	public function get_virtual( $context = 'view' ) {
+		return false;
 	}
 
 	/**
 	 * Get an array of available variations for the current product.
+	 *
 	 * @return array
 	 */
 	public function get_available_variations() {
 		$available_variations = array();
 
 		foreach ( $this->get_children() as $child_id ) {
-			$variation = $this->get_child( $child_id );
+			$variation = wc_get_product( $child_id );
 
 			// Hide out of stock variations if 'Hide out of stock items from the catalog' is checked
-			if ( empty( $variation->variation_id ) || ( 'yes' === get_option( 'woocommerce_hide_out_of_stock_items' ) && ! $variation->is_in_stock() ) ) {
+			if ( ! $variation || ! $variation->exists() || ( 'yes' === get_option( 'woocommerce_hide_out_of_stock_items' ) && ! $variation->is_in_stock() ) ) {
 				continue;
 			}
 
 			// Filter 'woocommerce_hide_invisible_variations' to optionally hide invisible variations (disabled variations and variations with empty price)
-			if ( apply_filters( 'woocommerce_hide_invisible_variations', false, $this->id, $variation ) && ! $variation->variation_is_visible() ) {
+			if ( apply_filters( 'woocommerce_hide_invisible_variations', false, $this->get_id(), $variation ) && ! $variation->variation_is_visible() ) {
 				continue;
 			}
 
@@ -547,269 +261,290 @@ class WC_Product_Variable extends WC_Product {
 	}
 
 	/**
-	 * Returns an array of date for a variation. Used in the add to cart form.
+	 * Returns an array of data for a variation. Used in the add to cart form.
 	 * @since  2.4.0
 	 * @param  WC_Product $variation Variation product object or ID
 	 * @return array
 	 */
 	public function get_available_variation( $variation ) {
 		if ( is_numeric( $variation ) ) {
-			$variation = $this->get_child( $variation );
+			$variation = wc_get_product( $variation );
 		}
 
-		if ( has_post_thumbnail( $variation->get_variation_id() ) ) {
-			$attachment_id   = get_post_thumbnail_id( $variation->get_variation_id() );
-			$attachment      = wp_get_attachment_image_src( $attachment_id, 'shop_single' );
-			$full_attachment = wp_get_attachment_image_src( $attachment_id, 'full' );
-			$image           = $attachment ? current( $attachment ) : '';
-			$image_link      = $full_attachment ? current( $full_attachment ) : '';
-			$image_title     = get_the_title( $attachment_id );
-			$image_alt       = get_post_meta( $attachment_id, '_wp_attachment_image_alt', true );
-			$image_srcset    = function_exists( 'wp_get_attachment_image_srcset' ) ? wp_get_attachment_image_srcset( $attachment_id, 'shop_single' ) : false;
-			$image_sizes     = function_exists( 'wp_get_attachment_image_sizes' ) ? wp_get_attachment_image_sizes( $attachment_id, 'shop_single' ) : false;
-		} else {
-			$image = $image_link = $image_title = $image_alt = $image_srcset = $image_sizes = '';
-		}
+		// See if prices should be shown for each variation after selection.
+		$show_variation_price = apply_filters( 'woocommerce_show_variation_price', $variation->get_price() === "" || $this->get_variation_sale_price( 'min' ) !== $this->get_variation_sale_price( 'max' ) || $this->get_variation_regular_price( 'min' ) !== $this->get_variation_regular_price( 'max' ), $this, $variation );
 
-		$availability      = $variation->get_availability();
-		$availability_html = empty( $availability['availability'] ) ? '' : '<p class="stock ' . esc_attr( $availability['class'] ) . '">' . wp_kses_post( $availability['availability'] ) . '</p>';
-		$availability_html = apply_filters( 'woocommerce_stock_html', $availability_html, $availability['availability'], $variation );
-
-		return apply_filters( 'woocommerce_available_variation', array(
-			'variation_id'          => $variation->variation_id,
+		return apply_filters( 'woocommerce_available_variation', array_merge( $variation->get_data(), array(
+			'attributes'            => $variation->get_variation_attributes(),
+			'image'                 => wc_get_product_attachment_props( $variation->get_image_id() ),
+			'weight_html'           => wc_format_weight( $variation->get_weight() ),
+			'dimensions_html'       => wc_format_dimensions( $variation->get_dimensions( false ) ),
+			'price_html'            => $show_variation_price ? '<span class="price">' . $variation->get_price_html() . '</span>' : '',
+			'availability_html'     => wc_get_stock_html( $variation ),
+			'variation_id'          => $variation->get_id(),
 			'variation_is_visible'  => $variation->variation_is_visible(),
 			'variation_is_active'   => $variation->variation_is_active(),
 			'is_purchasable'        => $variation->is_purchasable(),
-			'display_price'         => $variation->get_display_price(),
-			'display_regular_price' => $variation->get_display_price( $variation->get_regular_price() ),
-			'attributes'            => $variation->get_variation_attributes(),
-			'image_src'             => $image,
-			'image_link'            => $image_link,
-			'image_title'           => $image_title,
-			'image_alt'             => $image_alt,
-			'image_srcset'			=> $image_srcset ? $image_srcset : '',
-			'image_sizes'			=> $image_sizes ? $image_sizes : '',
-			'price_html'            => apply_filters( 'woocommerce_show_variation_price', $variation->get_price() === "" || $this->get_variation_price( 'min' ) !== $this->get_variation_price( 'max' ), $this, $variation ) ? '<span class="price">' . $variation->get_price_html() . '</span>' : '',
-			'availability_html'     => $availability_html,
-			'sku'                   => $variation->get_sku(),
-			'weight'                => $variation->get_weight() . ' ' . esc_attr( get_option('woocommerce_weight_unit' ) ),
-			'dimensions'            => $variation->get_dimensions(),
-			'min_qty'               => 1,
-			'max_qty'               => $variation->backorders_allowed() ? '' : $variation->get_stock_quantity(),
+			'display_price'         => wc_get_price_to_display( $variation ),
+			'display_regular_price' => wc_get_price_to_display( $variation, array( 'price' => $variation->get_regular_price() ) ),
+			'dimensions'            => wc_format_dimensions( $variation->get_dimensions( false ) ),
+			'min_qty'               => $variation->get_min_purchase_quantity(),
+			'max_qty'               => 0 < $variation->get_max_purchase_quantity() ? $variation->get_max_purchase_quantity() : '',
 			'backorders_allowed'    => $variation->backorders_allowed(),
 			'is_in_stock'           => $variation->is_in_stock(),
-			'is_downloadable'       => $variation->is_downloadable() ,
+			'is_downloadable'       => $variation->is_downloadable(),
 			'is_virtual'            => $variation->is_virtual(),
 			'is_sold_individually'  => $variation->is_sold_individually() ? 'yes' : 'no',
-			'variation_description' => $variation->get_variation_description(),
-		), $this, $variation );
+			'variation_description' => wc_format_content( $variation->get_description() ),
+		) ), $this, $variation );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Setters
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Sets an array of variation attributes.
+	 *
+	 * @since 3.0.0
+	 * @param array
+	 */
+	public function set_variation_attributes( $variation_attributes ) {
+		$this->variation_attributes = $variation_attributes;
 	}
 
 	/**
-	 * Sync variable product prices with the children lowest/highest prices.
+	 * Sets an array of children for the product.
+	 *
+	 * @since 3.0.0
+	 * @param array
 	 */
-	public function variable_product_sync( $product_id = '' ) {
-		if ( empty( $product_id ) ) {
-			$product_id = $this->id;
-		}
-
-		// Sync prices with children
-		self::sync( $product_id );
-
-		// Re-load prices
-		$this->price = get_post_meta( $product_id, '_price', true );
-
-		foreach ( array( 'price', 'regular_price', 'sale_price' ) as $price_type ) {
-			$min_variation_id_key        = "min_{$price_type}_variation_id";
-			$max_variation_id_key        = "max_{$price_type}_variation_id";
-			$min_price_key               = "_min_variation_{$price_type}";
-			$max_price_key               = "_max_variation_{$price_type}";
-			$this->$min_variation_id_key = get_post_meta( $product_id, '_' . $min_variation_id_key, true );
-			$this->$max_variation_id_key = get_post_meta( $product_id, '_' . $max_variation_id_key, true );
-			$this->$min_price_key        = get_post_meta( $product_id, '_' . $min_price_key, true );
-			$this->$max_price_key        = get_post_meta( $product_id, '_' . $max_price_key, true );
-		}
+	public function set_children( $children ) {
+		$this->children = array_filter( wp_parse_id_list( (array) $children ) );
 	}
 
 	/**
-	 * Sync variable product stock status with children.
-	 * @param  int $product_id
+	 * Sets an array of visible children only.
+	 *
+	 * @since 3.0.0
+	 * @param array
 	 */
-	public static function sync_stock_status( $product_id ) {
-		$children = get_posts( array(
-			'post_parent' 	=> $product_id,
-			'posts_per_page'=> -1,
-			'post_type' 	=> 'product_variation',
-			'fields' 		=> 'ids',
-			'post_status'	=> 'publish'
-		) );
-
-		$stock_status = 'outofstock';
-
-		foreach ( $children as $child_id ) {
-			$child_stock_status = get_post_meta( $child_id, '_stock_status', true );
-			$child_stock_status = $child_stock_status ? $child_stock_status : 'instock';
-			if ( 'instock' === $child_stock_status ) {
-				$stock_status = 'instock';
-				break;
-			}
-		}
-
-		wc_update_product_stock_status( $product_id, $stock_status );
+	public function set_visible_children( $visible_children ) {
+		$this->visible_children = array_filter( wp_parse_id_list( (array) $visible_children ) );
 	}
 
-	/**
-	 * Sync the variable product's attributes with the variations.
-	 */
-	public static function sync_attributes( $product_id, $children = false ) {
-		if ( ! $children ) {
-			$children = get_posts( array(
-				'post_parent' 	=> $product_id,
-				'posts_per_page'=> -1,
-				'post_type' 	=> 'product_variation',
-				'fields' 		=> 'ids',
-				'post_status'	=> 'any'
-			) );
-		}
-
-		/**
-		 * Pre 2.4 handling where 'slugs' were saved instead of the full text attribute.
-		 * Attempt to get full version of the text attribute from the parent and UPDATE meta.
-		 */
-		if ( version_compare( get_post_meta( $product_id, '_product_version', true ), '2.4.0', '<' ) ) {
-			$parent_attributes = array_filter( (array) get_post_meta( $product_id, '_product_attributes', true ) );
-
-			foreach ( $children as $child_id ) {
-				$all_meta = get_post_meta( $child_id );
-
-				foreach ( $all_meta as $name => $value ) {
-					if ( 0 !== strpos( $name, 'attribute_' ) ) {
-						continue;
-					}
-					if ( sanitize_title( $value[0] ) === $value[0] ) {
-						foreach ( $parent_attributes as $attribute ) {
-							if ( $name !== 'attribute_' . sanitize_title( $attribute['name'] ) ) {
-								continue;
-							}
-							$text_attributes = wc_get_text_attributes( $attribute['value'] );
-							foreach ( $text_attributes as $text_attribute ) {
-								if ( sanitize_title( $text_attribute ) === $value[0] ) {
-									update_post_meta( $child_id, $name, $text_attribute );
-									break;
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
+	/*
+	|--------------------------------------------------------------------------
+	| CRUD methods
+	|--------------------------------------------------------------------------
+	*/
 
 	/**
-	 * Sync the variable product with it's children.
+	 * Ensure properties are set correctly before save.
+	 * @since 3.0.0
 	 */
-	public static function sync( $product_id ) {
-		global $wpdb;
+	public function validate_props() {
+		// Before updating, ensure stock props are all aligned. Qty and backorders are not needed if not stock managed.
+		if ( ! $this->get_manage_stock() ) {
+			$this->set_stock_quantity( '' );
+			$this->set_backorders( 'no' );
+			$this->set_stock_status( $this->child_is_in_stock() ? 'instock' : 'outofstock' );
 
-		$children = get_posts( array(
-			'post_parent' 	=> $product_id,
-			'posts_per_page'=> -1,
-			'post_type' 	=> 'product_variation',
-			'fields' 		=> 'ids',
-			'post_status'	=> 'publish'
-		) );
+		// If we are stock managing and we don't have stock, force out of stock status.
+		} elseif ( $this->get_stock_quantity() <= get_option( 'woocommerce_notify_no_stock_amount' ) ) {
+			$this->set_stock_status( 'outofstock' );
 
-		// No published variations - product won't be purchasable.
-		if ( ! $children ) {
-			update_post_meta( $product_id, '_price', '' );
-			delete_transient( 'wc_products_onsale' );
+		// If the stock level is changing and we do now have enough, force in stock status.
+		} elseif ( $this->get_stock_quantity() > get_option( 'woocommerce_notify_no_stock_amount' ) && array_key_exists( 'stock_quantity', $this->get_changes() ) ) {
+			$this->set_stock_status( 'instock' );
 
-			if ( is_admin() && 'publish' === get_post_status( $product_id ) ) {
-				WC_Admin_Meta_Boxes::add_error( __( 'This variable product has no active variations. Add or enable variations to allow this product to be purchased.', 'woocommerce' ) );
-			}
-
-		// Loop the variations
+		// Otherwise revert to status the children have.
 		} else {
-
-			// Set the variable product to be virtual/downloadable if all children are virtual/downloadable
-			foreach ( array( '_downloadable', '_virtual' ) as $meta_key ) {
-				$all_variations_yes = true;
-
-				foreach ( $children as $child_id ) {
-					if ( 'yes' != get_post_meta( $child_id, $meta_key, true ) ) {
-						$all_variations_yes = false;
-						break;
-					}
-				}
-
-				update_post_meta( $product_id, $meta_key, ( true === $all_variations_yes ) ? 'yes' : 'no' );
-			}
-
-			// Main active prices
-			$min_price            = null;
-			$max_price            = null;
-			$min_price_id         = null;
-			$max_price_id         = null;
-
-			// Regular prices
-			$min_regular_price    = null;
-			$max_regular_price    = null;
-			$min_regular_price_id = null;
-			$max_regular_price_id = null;
-
-			// Sale prices
-			$min_sale_price       = null;
-			$max_sale_price       = null;
-			$min_sale_price_id    = null;
-			$max_sale_price_id    = null;
-
-			foreach ( array( 'price', 'regular_price', 'sale_price' ) as $price_type ) {
-				foreach ( $children as $child_id ) {
-					$child_price = get_post_meta( $child_id, '_' . $price_type, true );
-
-					// Skip non-priced variations
-					if ( $child_price === '' ) {
-						continue;
-					}
-
-					// Skip hidden variations
-					if ( 'yes' === get_option( 'woocommerce_hide_out_of_stock_items' ) ) {
-						$stock = get_post_meta( $child_id, '_stock', true );
-						if ( $stock !== "" && $stock <= get_option( 'woocommerce_notify_no_stock_amount' ) ) {
-							continue;
-						}
-					}
-
-					// Find min price
-					if ( is_null( ${"min_{$price_type}"} ) || $child_price < ${"min_{$price_type}"} ) {
-						${"min_{$price_type}"}    = $child_price;
-						${"min_{$price_type}_id"} = $child_id;
-					}
-
-					// Find max price
-					if ( $child_price > ${"max_{$price_type}"} ) {
-						${"max_{$price_type}"}    = $child_price;
-						${"max_{$price_type}_id"} = $child_id;
-					}
-				}
-
-				// Store prices
-				update_post_meta( $product_id, '_min_variation_' . $price_type, ${"min_{$price_type}"} );
-				update_post_meta( $product_id, '_max_variation_' . $price_type, ${"max_{$price_type}"} );
-
-				// Store ids
-				update_post_meta( $product_id, '_min_' . $price_type . '_variation_id', ${"min_{$price_type}_id"} );
-				update_post_meta( $product_id, '_max_' . $price_type . '_variation_id', ${"max_{$price_type}_id"} );
-			}
-
-			// The VARIABLE PRODUCT price should equal the min price of any type
-			update_post_meta( $product_id, '_price', $min_price );
-			delete_transient( 'wc_products_onsale' );
-
-			// Sync attributes
-			self::sync_attributes( $product_id, $children );
-
-			do_action( 'woocommerce_variable_product_sync', $product_id, $children );
+			$this->set_stock_status( $this->child_is_in_stock() ? 'instock' : 'outofstock' );
 		}
 	}
+
+	/**
+	 * Save data (either create or update depending on if we are working on an existing product).
+	 *
+	 * @since 3.0.0
+	 */
+	public function save() {
+		$this->validate_props();
+		if ( $this->data_store ) {
+			// Trigger action before saving to the DB. Allows you to adjust object props before save.
+			do_action( 'woocommerce_before_' . $this->object_type . '_object_save', $this, $this->data_store );
+
+			// Get names before save.
+			$previous_name = $this->data['name'];
+			$new_name      = $this->get_name( 'edit' );
+
+			if ( $this->get_id() ) {
+				$this->data_store->update( $this );
+			} else {
+				$this->data_store->create( $this );
+			}
+
+			$this->data_store->sync_variation_names( $this, $previous_name, $new_name );
+			$this->data_store->sync_managed_variation_stock_status( $this );
+
+			return $this->get_id();
+		}
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Conditionals
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Returns whether or not the product is on sale.
+	 *
+	 * @param  string $context What the value is for. Valid values are view and edit.
+	 * @return bool
+	 */
+	public function is_on_sale( $context = 'view' ) {
+		$prices  = $this->get_variation_prices();
+		$on_sale = $prices['regular_price'] !== $prices['sale_price'] && $prices['sale_price'] === $prices['price'];
+
+		return 'view' === $context ? apply_filters( 'woocommerce_product_is_on_sale', $on_sale, $this ) : $on_sale;
+	}
+
+	/**
+	 * Is a child in stock?
+	 * @return boolean
+	 */
+	public function child_is_in_stock() {
+		return $this->data_store->child_is_in_stock( $this );
+	}
+
+	/**
+	 * Does a child have a weight set?
+	 * @return boolean
+	 */
+	public function child_has_weight() {
+		$transient_name = 'wc_child_has_weight_' . $this->get_id();
+		$has_weight     = get_transient( $transient_name );
+
+		if ( false === $has_weight ) {
+			$has_weight = $this->data_store->child_has_weight( $this );
+			set_transient( $transient_name, $has_weight, DAY_IN_SECONDS * 30 );
+		}
+		return (bool) $has_weight;
+	}
+
+	/**
+	 * Does a child have dimensions set?
+	 * @return boolean
+	 */
+	public function child_has_dimensions() {
+		$transient_name = 'wc_child_has_dimensions_' . $this->get_id();
+		$has_dimension  = get_transient( $transient_name );
+
+		if ( false === $has_dimension ) {
+			$has_dimension = $this->data_store->child_has_dimensions( $this );
+			set_transient( $transient_name, $has_dimension, DAY_IN_SECONDS * 30 );
+		}
+		return (bool) $has_dimension;
+	}
+
+	/**
+	 * Returns whether or not the product has dimensions set.
+	 *
+	 * @return bool
+	 */
+	public function has_dimensions() {
+		return parent::has_dimensions() || $this->child_has_dimensions();
+	}
+
+	/**
+	 * Returns whether or not the product has weight set.
+	 *
+	 * @return bool
+	 */
+	public function has_weight() {
+		return parent::has_weight() || $this->child_has_weight();
+	}
+
+	/**
+	 * Returns whether or not the product has additonal options that need
+	 * selecting before adding to cart.
+	 *
+	 * @since  3.0.0
+	 * @return boolean
+	 */
+	public function has_options() {
+		return true;
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Sync with child variations.
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Sync a variable product with it's children. These sync functions sync
+	 * upwards (from child to parent) when the variation is saved.
+	 *
+	 * @param WC_Product|int $product Product object or ID for which you wish to sync.
+	 * @param bool $save If true, the prouduct object will be saved to the DB before returning it.
+	 * @return WC_Product Synced product object.
+	 */
+	public static function sync( $product, $save = true ) {
+		if ( ! is_a( $product, 'WC_Product' ) ) {
+			$product = wc_get_product( $product );
+		}
+		if ( is_a( $product, 'WC_Product_Variable' ) ) {
+			$data_store = WC_Data_Store::load( 'product-' . $product->get_type() );
+			$data_store->sync_price( $product );
+			$data_store->sync_stock_status( $product );
+			self::sync_attributes( $product ); // Legacy update of attributes.
+
+			do_action( 'woocommerce_variable_product_sync_data', $product );
+
+			if ( $save ) {
+				$product->save();
+			}
+
+			wc_do_deprecated_action( 'woocommerce_variable_product_sync', array( $product->get_id(), $product->get_visible_children() ), '3.0', 'woocommerce_variable_product_sync_data, woocommerce_new_product or woocommerce_update_product' );
+		}
+		return $product;
+	}
+
+	/**
+	 * Sync parent stock status with the status of all children and save.
+	 *
+	 * @param WC_Product|int $product Product object or ID for which you wish to sync.
+	 * @param bool $save If true, the prouduct object will be saved to the DB before returning it.
+	 * @return WC_Product Synced product object.
+	 */
+	public static function sync_stock_status( $product, $save = true ) {
+		if ( ! is_a( $product, 'WC_Product' ) ) {
+			$product = wc_get_product( $product );
+		}
+		if ( is_a( $product, 'WC_Product_Variable' ) ) {
+			$data_store = WC_Data_Store::load( 'product-' . $product->get_type() );
+			$data_store->sync_stock_status( $product );
+
+			if ( $save ) {
+				$product->save();
+			}
+		}
+		return $product;
+	}
+
+	/**
+	 * Sort an associativate array of $variation_id => $price pairs in order of min and max prices.
+	 *
+	 * @param array $prices Associativate array of $variation_id => $price pairs
+	 * @return array
+	 */
+	protected function sort_variation_prices( $prices ) {
+		asort( $prices );
+		return $prices;
+	}
 }
diff --git a/includes/class-wc-product-variation.php b/includes/class-wc-product-variation.php
index c939e2049d7..2db4e432c6c 100644
--- a/includes/class-wc-product-variation.php
+++ b/includes/class-wc-product-variation.php
@@ -1,7 +1,6 @@
 <?php
-
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
 /**
@@ -10,171 +9,132 @@ if ( ! defined( 'ABSPATH' ) ) {
  * The WooCommerce product variation class handles product variation data.
  *
  * @class       WC_Product_Variation
- * @version     2.2.0
+ * @version     3.0.0
  * @package     WooCommerce/Classes
  * @category    Class
  * @author      WooThemes
  */
-class WC_Product_Variation extends WC_Product {
+class WC_Product_Variation extends WC_Product_Simple {
 
-	/** @public int ID of the variation itself. */
-	public $variation_id;
+	/**
+	 * Post type.
+	 * @var string
+	 */
+	public $post_type = 'product_variation';
 
-	/** @public object Parent Variable product object. */
-	public $parent;
-
-	/** @public string Stores the shipping class of the variation. */
-	public $variation_shipping_class         = false;
-
-	/** @public int Stores the shipping class ID of the variation. */
-	public $variation_shipping_class_id      = false;
-
-	/** @public unused vars @deprecated in 2.2 */
-	public $variation_has_sku                = true;
-	public $variation_has_length             = true;
-	public $variation_has_width              = true;
-	public $variation_has_height             = true;
-	public $variation_has_weight             = true;
-	public $variation_has_tax_class          = true;
-	public $variation_has_downloadable_files = true;
-
-	/** @private array Data which is only at variation level - no inheritance plus their default values if left blank. */
-	protected $variation_level_meta_data = array(
-		'downloadable'          => 'no',
-		'virtual'               => 'no',
-		'manage_stock'          => 'no',
-		'sale_price_dates_from' => '',
-		'sale_price_dates_to'   => '',
-		'price'                 => '',
-		'regular_price'         => '',
-		'sale_price'            => '',
-		'stock'                 => 0,
-		'stock_status'          => 'instock',
-		'downloadable_files'    => array()
-	);
-
-	/** @private array Data which can be at variation level, otherwise fallback to parent if not set. */
-	protected $variation_inherited_meta_data = array(
-		'tax_class'  => '',
-		'backorders' => 'no',
-		'sku'        => '',
-		'weight'     => '',
-		'length'     => '',
-		'width'      => '',
-		'height'     => ''
+	/**
+	 * Parent data.
+	 * @var array
+	 */
+	protected $parent_data = array(
+		'title'             => '',
+		'sku'               => '',
+		'manage_stock'      => '',
+		'backorders'        => '',
+		'stock_quantity'    => '',
+		'weight'            => '',
+		'length'            => '',
+		'width'             => '',
+		'height'            => '',
+		'tax_class'         => '',
+		'shipping_class_id' => '',
+		'image_id'          => '',
 	);
 
 	/**
-	 * Loads required variation data.
+	 * Prefix for action and filter hooks on data.
 	 *
-	 * @param int $variation ID of the variation to load
-	 * @param array $args Array of the arguments containing parent product data
+	 * @since  3.0.0
+	 * @return string
 	 */
-	public function __construct( $variation, $args = array() ) {
-		if ( is_object( $variation ) ) {
-			$this->variation_id = absint( $variation->ID );
-		} else {
-			$this->variation_id = absint( $variation );
-		}
-
-		/* Get main product data from parent (args) */
-		$this->id = ! empty( $args['parent_id'] ) ? intval( $args['parent_id'] ) : wp_get_post_parent_id( $this->variation_id );
-
-		// The post doesn't have a parent id, therefore its invalid.
-		if ( empty( $this->id ) ) {
-			return;
-		}
-
-		$this->product_type = 'variation';
-		$this->parent       = ! empty( $args['parent'] ) ? $args['parent'] : wc_get_product( $this->id );
-		$this->post         = ! empty( $this->parent->post ) ? $this->parent->post : array();
+	protected function get_hook_prefix() {
+		return 'woocommerce_product_variation_get_';
 	}
 
 	/**
-	 * __isset function.
-	 *
-	 * @param mixed $key
-	 * @return bool
+	 * Get internal type.
+	 * @return string
 	 */
-	public function __isset( $key ) {
-		if ( in_array( $key, array_keys( $this->variation_level_meta_data ) ) ) {
-			return metadata_exists( 'post', $this->variation_id, '_' . $key );
-		} elseif ( in_array( $key, array_keys( $this->variation_inherited_meta_data ) ) ) {
-			return metadata_exists( 'post', $this->variation_id, '_' . $key ) || metadata_exists( 'post', $this->id, '_' . $key );
-		} else {
-			return metadata_exists( 'post', $this->id, '_' . $key );
-		}
+	public function get_type() {
+		return 'variation';
 	}
 
 	/**
-	 * Get method returns variation meta data if set, otherwise in most cases the data from the parent.
-	 *
-	 * @param string $key
-	 * @return mixed
+	 * If the stock level comes from another product ID.
+	 * @since  3.0.0
+	 * @return int
 	 */
-	public function __get( $key ) {
-		if ( in_array( $key, array_keys( $this->variation_level_meta_data ) ) ) {
+	public function get_stock_managed_by_id() {
+		return 'parent' === $this->get_manage_stock() ? $this->get_parent_id() : $this->get_id();
+	}
 
-			$value = get_post_meta( $this->variation_id, '_' . $key, true );
+	/**
+	 * Get the product's title. For variations this is the parent product name.
+	 *
+	 * @return string
+	 */
+	public function get_title() {
+		return apply_filters( 'woocommerce_product_title', $this->parent_data['title'], $this );
+	}
 
-			if ( '' === $value ) {
-				$value = $this->variation_level_meta_data[ $key ];
-			}
+	/**
+	 * Get variation attribute values. Keys are prefixed with attribute_, as stored.
+	 *
+	 * @return array of attributes and their values for this variation
+	 */
+	public function get_variation_attributes() {
+		$attributes           = $this->get_attributes();
+		$variation_attributes = array();
+		foreach ( $attributes as $key => $value ) {
+			$variation_attributes[ 'attribute_' . $key ] = $value;
+		}
+		return $variation_attributes;
+	}
 
-		} elseif ( in_array( $key, array_keys( $this->variation_inherited_meta_data ) ) ) {
-
-			$value = metadata_exists( 'post', $this->variation_id, '_' . $key ) ? get_post_meta( $this->variation_id, '_' . $key, true ) : get_post_meta( $this->id, '_' . $key, true );
-
-			// Handle meta data keys which can be empty at variation level to cause inheritance
-			if ( '' === $value && in_array( $key, array( 'sku', 'weight', 'length', 'width', 'height' ) ) ) {
-				$value = get_post_meta( $this->id, '_' . $key, true );
-			}
-
-			if ( '' === $value ) {
-				$value = $this->variation_inherited_meta_data[ $key ];
-			}
-
-		} elseif ( 'variation_data' === $key ) {
-			return $this->variation_data = wc_get_product_variation_attributes( $this->variation_id );
-
-		} elseif ( 'variation_has_stock' === $key ) {
-			return $this->managing_stock();
+	/**
+	 * Returns a single product attribute as a string.
+	 * @param  string $attribute to get.
+	 * @return string
+	 */
+	public function get_attribute( $attribute ) {
+		$attributes = $this->get_attributes();
+		$attribute  = sanitize_title( $attribute );
 
+		if ( isset( $attributes[ $attribute ] ) ) {
+			$value = $attributes[ $attribute ];
+			$term  = taxonomy_exists( $attribute ) ? get_term_by( 'slug', $value, $attribute ) : false;
+			$value = ! is_wp_error( $term ) && $term ? $term->name : $value;
+		} elseif ( isset( $attributes[ 'pa_' . $attribute ] ) ) {
+			$value = $attributes[ 'pa_' . $attribute ];
+			$term  = taxonomy_exists( 'pa_' . $attribute ) ? get_term_by( 'slug', $value, 'pa_' . $attribute ) : false;
+			$value = ! is_wp_error( $term ) && $term ? $term->name : $value;
 		} else {
-			$value = metadata_exists( 'post', $this->variation_id, '_' . $key ) ? get_post_meta( $this->variation_id, '_' . $key, true ) : parent::__get( $key );
+			return '';
 		}
 
 		return $value;
 	}
 
-	/**
-	 * Return the variation ID
-	 *
-	 * @since 2.5.0
-	 * @return int variation (post) ID
-	 */
-	public function get_id() {
-
-		return $this->variation_id;
-	}
-
-	/**
-	 * Returns whether or not the product post exists.
-	 *
-	 * @return bool
-	 */
-	public function exists() {
-		return ! empty( $this->id );
-	}
-
 	/**
 	 * Wrapper for get_permalink. Adds this variations attributes to the URL.
 	 *
-	 * @param  $cart item array If the cart item is passed, we can get a link containing the exact attributes selected for the variation, rather than the default attributes.
+	 * @param  $item_object item array If a cart or order item is passed, we can get a link containing the exact attributes selected for the variation, rather than the default attributes.
 	 * @return string
 	 */
-	public function get_permalink( $cart_item = null ) {
-		return add_query_arg( array_map( 'urlencode', array_filter( isset( $cart_item['variation'] ) ? $cart_item['variation'] : $this->variation_data ) ), get_permalink( $this->id ) );
+	public function get_permalink( $item_object = null ) {
+		$url = get_permalink( $this->get_parent_id() );
+
+		if ( ! empty( $item_object['variation'] ) ) {
+			$data = $item_object['variation'];
+		} elseif ( ! empty( $item_object['item_meta_array'] ) ) {
+			$data_keys    = array_map( 'wc_variation_attribute_name', wp_list_pluck( $item_object['item_meta_array'], 'key' ) );
+			$data_values  = wp_list_pluck( $item_object['item_meta_array'], 'value' );
+			$data         = array_intersect_key( array_combine( $data_keys, $data_values ), $this->get_variation_attributes() );
+		} else {
+			$data         = $this->get_variation_attributes();
+		}
+
+		return add_query_arg( array_map( 'urlencode', array_filter( $data ) ), $url );
 	}
 
 	/**
@@ -183,44 +143,268 @@ class WC_Product_Variation extends WC_Product {
 	 * @return string
 	 */
 	public function add_to_cart_url() {
-		$variation_data = array_map( 'urlencode', $this->variation_data );
-		$url            = $this->is_purchasable() && $this->is_in_stock() ? remove_query_arg( 'added-to-cart', add_query_arg( array_merge( array( 'variation_id' => $this->variation_id, 'add-to-cart' => $this->id ), $variation_data ) ) ) : get_permalink( $this->id );
-
+		$url            = $this->is_purchasable() ? remove_query_arg( 'added-to-cart', add_query_arg( array( 'variation_id' => $this->get_id(), 'add-to-cart' => $this->get_parent_id() ), $this->get_permalink() ) ) : $this->get_permalink();
 		return apply_filters( 'woocommerce_product_add_to_cart_url', $url, $this );
 	}
 
 	/**
-	 * Get the add to cart button text.
+	 * Get SKU (Stock-keeping unit) - product unique ID.
 	 *
+	 * @param  string $context
 	 * @return string
 	 */
-	public function add_to_cart_text() {
-		$text = $this->is_purchasable() && $this->is_in_stock() ? __( 'Add to cart', 'woocommerce' ) : __( 'Read More', 'woocommerce' );
+	public function get_sku( $context = 'view' ) {
+		$value = $this->get_prop( 'sku', $context );
 
-		return apply_filters( 'woocommerce_product_add_to_cart_text', $text, $this );
+		// Inherit value from parent.
+		if ( 'view' === $context && empty( $value ) ) {
+			$value = apply_filters( $this->get_hook_prefix() . 'sku', $this->parent_data['sku'], $this );
+		}
+		return $value;
 	}
 
 	/**
-	 * Checks if this particular variation is visible. Invisible variations are enabled and can be selected, but no price / stock info is displayed.
-	 * Instead, a suitable 'unavailable' message is displayed.
-	 * Invisible by default: Disabled variations and variations with an empty price.
+	 * Returns the product's weight.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_weight( $context = 'view' ) {
+		$value = $this->get_prop( 'weight', $context );
+
+		// Inherit value from parent.
+		if ( 'view' === $context && empty( $value ) ) {
+			$value = apply_filters( $this->get_hook_prefix() . 'weight', $this->parent_data['weight'], $this );
+		}
+		return $value;
+	}
+
+	/**
+	 * Returns the product length.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_length( $context = 'view' ) {
+		$value = $this->get_prop( 'length', $context );
+
+		// Inherit value from parent.
+		if ( 'view' === $context && empty( $value ) ) {
+			$value = apply_filters( $this->get_hook_prefix() . 'length', $this->parent_data['length'], $this );
+		}
+		return $value;
+	}
+
+	/**
+	 * Returns the product width.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_width( $context = 'view' ) {
+		$value = $this->get_prop( 'width', $context );
+
+		// Inherit value from parent.
+		if ( 'view' === $context && empty( $value ) ) {
+			$value = apply_filters( $this->get_hook_prefix() . 'width', $this->parent_data['width'], $this );
+		}
+		return $value;
+	}
+
+	/**
+	 * Returns the product height.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_height( $context = 'view' ) {
+		$value = $this->get_prop( 'height', $context );
+
+		// Inherit value from parent.
+		if ( 'view' === $context && empty( $value ) ) {
+			$value = apply_filters( $this->get_hook_prefix() . 'height', $this->parent_data['height'], $this );
+		}
+		return $value;
+	}
+
+	/**
+	 * Returns the tax class.
+	 *
+	 * Does not use get_prop so it can handle 'parent' Inheritance correctly.
+	 *
+	 * @param  string $context view, edit, or unfiltered
+	 * @return string
+	 */
+	public function get_tax_class( $context = 'view' ) {
+		$value = null;
+
+		if ( array_key_exists( 'tax_class', $this->data ) ) {
+			$value = array_key_exists( 'tax_class', $this->changes ) ? $this->changes['tax_class'] : $this->data['tax_class'];
+
+			if ( 'edit' !== $context && 'parent' === $value ) {
+				$value = $this->parent_data['tax_class'];
+			}
+
+			if ( 'view' === $context ) {
+				$value = apply_filters( $this->get_hook_prefix() . 'tax_class', $value, $this );
+			}
+		}
+		return $value;
+	}
+
+	/**
+	 * Return if product manage stock.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return boolean|string true, false, or parent.
+	 */
+	public function get_manage_stock( $context = 'view' ) {
+		$value = $this->get_prop( 'manage_stock', $context );
+
+		// Inherit value from parent.
+		if ( 'view' === $context && false === $value && true === wc_string_to_bool( $this->parent_data['manage_stock'] ) ) {
+			$value = 'parent';
+		}
+		return $value;
+	}
+
+	/**
+	 * Returns number of items available for sale.
+	 *
+	 * @param  string $context
+	 * @return int|null
+	 */
+	public function get_stock_quantity( $context = 'view' ) {
+		$value = $this->get_prop( 'stock_quantity', $context );
+
+		// Inherit value from parent.
+		if ( 'view' === $context && 'parent' === $this->get_manage_stock() ) {
+			$value = apply_filters( $this->get_hook_prefix() . 'stock_quantity', $this->parent_data['stock_quantity'], $this );
+		}
+		return $value;
+	}
+
+	/**
+	 * Get backorders.
+	 *
+	 * @param  string $context
+	 * @since 3.0.0
+	 * @return string yes no or notify
+	 */
+	public function get_backorders( $context = 'view' ) {
+		$value = $this->get_prop( 'backorders', $context );
+
+		// Inherit value from parent.
+		if ( 'view' === $context && 'parent' === $this->get_manage_stock() ) {
+			$value = apply_filters( $this->get_hook_prefix() . 'backorders', $this->parent_data['backorders'], $this );
+		}
+		return $value;
+	}
+
+	/**
+	 * Get main image ID.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_image_id( $context = 'view' ) {
+		$image_id = $this->get_prop( 'image_id', $context );
+
+		if ( 'view' === $context && ! $image_id ) {
+			$image_id = apply_filters( $this->get_hook_prefix() . 'image_id', $this->parent_data['image_id'], $this );
+		}
+
+		return $image_id;
+	}
+
+	/**
+	 * Get shipping class ID.
+	 *
+	 * @since 3.0.0
+	 * @param  string $context
+	 * @return int
+	 */
+	public function get_shipping_class_id( $context = 'view' ) {
+		$shipping_class_id = $this->get_prop( 'shipping_class_id', $context );
+
+		if ( 'view' === $context && ! $shipping_class_id ) {
+			$shipping_class_id = apply_filters( $this->get_hook_prefix() . 'shipping_class_id', $this->parent_data['shipping_class_id'], $this );
+		}
+
+		return $shipping_class_id;
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| CRUD methods
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Set the parent data array for this variation.
+	 *
+	 * @since 3.0.0
+	 * @param array
+	 */
+	public function set_parent_data( $parent_data ) {
+		$this->parent_data = $parent_data;
+	}
+
+	/**
+	 * Get the parent data array for this variation.
+	 *
+	 * @since  3.0.0
+	 * @return array
+	 */
+	public function get_parent_data() {
+		return $this->parent_data;
+	}
+
+	/**
+	 * Set attributes. Unlike the parent product which uses terms, variations are assigned
+	 * specific attributes using name value pairs.
+	 * @param array $raw_attributes
+	 */
+	public function set_attributes( $raw_attributes ) {
+		$raw_attributes = (array) $raw_attributes;
+		$attributes     = array();
+
+		foreach ( $raw_attributes as $key => $value ) {
+			// Remove attribute prefix which meta gets stored with.
+			if ( 0 === strpos( $key, 'attribute_' ) ) {
+				$key = substr( $key, 10 );
+			}
+			$attributes[ $key ] = $value;
+		}
+		$this->set_prop( 'attributes', $attributes );
+	}
+
+	/**
+	 * Returns array of attribute name value pairs. Keys are prefixed with attribute_, as stored.
+	 *
+	 * @param  string $context
+	 * @return array
+	 */
+	public function get_attributes( $context = 'view' ) {
+		return $this->get_prop( 'attributes', $context );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Conditionals
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Returns false if the product cannot be bought.
+	 * Override abstract method so that: i) Disabled variations are not be purchasable by admins. ii) Enabled variations are not purchasable if the parent product is not purchasable.
 	 *
 	 * @return bool
 	 */
-	public function variation_is_visible() {
-		$visible = true;
-
-		// Published == enabled checkbox
-		if ( get_post_status( $this->variation_id ) != 'publish' ) {
-			$visible = false;
-		}
-
-		// Price not set
-		elseif ( $this->get_price() === "" ) {
-			$visible = false;
-		}
-
-		return apply_filters( 'woocommerce_variation_is_visible', $visible, $this->variation_id, $this->id, $this );
+	public function is_purchasable() {
+		return apply_filters( 'woocommerce_variation_is_purchasable', $this->variation_is_visible() && parent::is_purchasable(), $this );
 	}
 
 	/**
@@ -235,526 +419,13 @@ class WC_Product_Variation extends WC_Product {
 	}
 
 	/**
-	 * Returns false if the product cannot be bought.
-	 * Override abstract method so that: i) Disabled variations are not be purchasable by admins. ii) Enabled variations are not purchasable if the parent product is not purchasable.
+	 * Checks if this particular variation is visible. Invisible variations are enabled and can be selected, but no price / stock info is displayed.
+	 * Instead, a suitable 'unavailable' message is displayed.
+	 * Invisible by default: Disabled variations and variations with an empty price.
 	 *
 	 * @return bool
 	 */
-	public function is_purchasable() {
-		// Published == enabled checkbox
-		if ( get_post_status( $this->variation_id ) != 'publish' ) {
-			$purchasable = false;
-		} else {
-			$purchasable = parent::is_purchasable();
-		}
-		return apply_filters( 'woocommerce_variation_is_purchasable', $purchasable, $this );
-	}
-
-	/**
-	 * Returns whether or not the variations parent is visible.
-	 *
-	 * @return bool
-	 */
-	public function parent_is_visible() {
-		return $this->is_visible();
-	}
-
-	/**
-	 * Get variation ID.
-	 *
-	 * @return int
-	 */
-	public function get_variation_id() {
-		return absint( $this->variation_id );
-	}
-
-	/**
-	 * Get variation attribute values.
-	 *
-	 * @return array of attributes and their values for this variation
-	 */
-	public function get_variation_attributes() {
-		return $this->variation_data;
-	}
-
-	/**
-	 * Check if all variation's attributes are set.
-	 *
-	 * @return boolean
-	 */
-	public function has_all_attributes_set() {
-
-		$set = true;
-
-		// undefined attributes have null strings as array values
-		foreach( $this->get_variation_attributes() as $att ){
-			if( ! $att ){
-				$set = false;
-				break;
-			}
-		}
-
-		return $set;
-
-	}
-
-	/**
-	 * Get variation price HTML. Prices are not inherited from parents.
-	 *
-	 * @return string containing the formatted price
-	 */
-	public function get_price_html( $price = '' ) {
-
-		$display_price         = $this->get_display_price();
-		$display_regular_price = $this->get_display_price( $this->get_regular_price() );
-		$display_sale_price    = $this->get_display_price( $this->get_sale_price() );
-
-		if ( $this->get_price() !== '' ) {
-			if ( $this->is_on_sale() ) {
-				$price = apply_filters( 'woocommerce_variation_sale_price_html', '<del>' . wc_price( $display_regular_price ) . '</del> <ins>' . wc_price( $display_sale_price ) . '</ins>' . $this->get_price_suffix(), $this );
-			} elseif ( $this->get_price() > 0 ) {
-				$price = apply_filters( 'woocommerce_variation_price_html', wc_price( $display_price ) . $this->get_price_suffix(), $this );
-			} else {
-				$price = apply_filters( 'woocommerce_variation_free_price_html', __( 'Free!', 'woocommerce' ), $this );
-			}
-		} else {
-			$price = apply_filters( 'woocommerce_variation_empty_price_html', '', $this );
-		}
-
-		return apply_filters( 'woocommerce_get_variation_price_html', $price, $this );
-	}
-
-	/**
-	 * Gets the main product image ID.
-	 *
-	 * @return int
-	 */
-	public function get_image_id() {
-		if ( $this->variation_id && has_post_thumbnail( $this->variation_id ) ) {
-			$image_id = get_post_thumbnail_id( $this->variation_id );
-		} elseif ( has_post_thumbnail( $this->id ) ) {
-			$image_id = get_post_thumbnail_id( $this->id );
-		} elseif ( ( $parent_id = wp_get_post_parent_id( $this->id ) ) && has_post_thumbnail( $parent_id ) ) {
-			$image_id = get_post_thumbnail_id( $parent_id );
-		} else {
-			$image_id = 0;
-		}
-		return $image_id;
-	}
-
-	/**
-	 * Gets the main product image.
-	 *
-	 * @param string $size (default: 'shop_thumbnail')
-	 * @return string
-	 */
-	public function get_image( $size = 'shop_thumbnail', $attr = array() ) {
-		if ( $this->variation_id && has_post_thumbnail( $this->variation_id ) ) {
-			$image = get_the_post_thumbnail( $this->variation_id, $size, $attr );
-		} elseif ( has_post_thumbnail( $this->id ) ) {
-			$image = get_the_post_thumbnail( $this->id, $size, $attr );
-		} elseif ( ( $parent_id = wp_get_post_parent_id( $this->id ) ) && has_post_thumbnail( $parent_id ) ) {
-			$image = get_the_post_thumbnail( $parent_id, $size , $attr);
-		} else {
-			$image = wc_placeholder_img( $size );
-		}
-		return $image;
-	}
-
-	/**
-	 * Returns whether or not the product (or variation) is stock managed.
-	 *
-	 * @return bool|string Bool if managed at variation level, 'parent' if managed by the parent.
-	 */
-	public function managing_stock() {
-		if ( 'yes' === get_option( 'woocommerce_manage_stock', 'yes' ) ) {
-			if ( 'no' === $this->manage_stock ) {
-				if ( $this->parent && $this->parent->managing_stock() ) {
-					return 'parent';
-				}
-			} else {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Returns number of items available for sale from the variation, or parent.
-	 *
-	 * @return int
-	 */
-	public function get_stock_quantity() {
-		return true === $this->managing_stock() ? wc_stock_amount( $this->stock ) : $this->parent->get_stock_quantity();
-	}
-
-	/**
-	 * Returns the tax status. Always use parent data.
-	 *
-	 * @return string
-	 */
-	public function get_tax_status() {
-		return $this->parent->get_tax_status();
-	}
-
-	/**
-	 * Returns whether or not the product is in stock.
-	 *
-	 * @return bool
-	 */
-	public function is_in_stock() {
-		// If we're managing stock at variation level, check stock levels
-		if ( true === $this->managing_stock() ) {
-			if ( $this->backorders_allowed() ) {
-				return true;
-			} elseif ( $this->get_stock_quantity() <= get_option( 'woocommerce_notify_no_stock_amount' ) ) {
-				return false;
-			} else {
-				return $this->stock_status === 'instock';
-			}
-		} else {
-			return $this->stock_status === 'instock';
-		}
-	}
-
-	/**
-	 * Set stock level of the product variation.
-	 *
-	 * Uses queries rather than update_post_meta so we can do this in one query (to avoid stock issues).
-	 * We cannot rely on the original loaded value in case another order was made since then.
-	 *
-	 * @param int $amount
-	 * @param string $mode can be set, add, or subtract
-	 * @return int new stock level
-	 */
-	public function set_stock( $amount = null, $mode = 'set' ) {
-		global $wpdb;
-
-		if ( ! is_null( $amount ) && true === $this->managing_stock() ) {
-
-			// Ensure key exists
-			add_post_meta( $this->variation_id, '_stock', 0, true );
-
-			// Update stock in DB directly
-			switch ( $mode ) {
-				case 'add' :
-					$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->postmeta} SET meta_value = meta_value + %f WHERE post_id = %d AND meta_key='_stock'", $amount, $this->variation_id ) );
-				break;
-				case 'subtract' :
-					$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->postmeta} SET meta_value = meta_value - %f WHERE post_id = %d AND meta_key='_stock'", $amount, $this->variation_id ) );
-				break;
-				default :
-					$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->postmeta} SET meta_value = %f WHERE post_id = %d AND meta_key='_stock'", $amount, $this->variation_id ) );
-				break;
-			}
-
-			// Clear caches
-			wp_cache_delete( $this->variation_id, 'post_meta' );
-
-			// Clear total stock transient
-			delete_transient( 'wc_product_total_stock_' . $this->id . WC_Cache_Helper::get_transient_version( 'product' ) );
-
-			// Stock status
-			$this->check_stock_status();
-
-			// Sync the parent
-			WC_Product_Variable::sync( $this->id );
-
-			// Trigger action
-			do_action( 'woocommerce_variation_set_stock', $this );
-
-		} elseif ( ! is_null( $amount ) ) {
-			return $this->parent->set_stock( $amount, $mode );
-		}
-
-		return $this->get_stock_quantity();
-	}
-
-	/**
-	 * set_stock_status function.
-	 */
-	public function set_stock_status( $status ) {
-		$status = 'outofstock' === $status ? 'outofstock' : 'instock';
-
-		// Sanity check
-		if ( true === $this->managing_stock() ) {
-			if ( ! $this->backorders_allowed() && $this->get_stock_quantity() <= get_option( 'woocommerce_notify_no_stock_amount' ) ) {
-				$status = 'outofstock';
-			}
-		} elseif ( 'parent' === $this->managing_stock() ) {
-			if ( ! $this->parent->backorders_allowed() && $this->parent->get_stock_quantity() <= get_option( 'woocommerce_notify_no_stock_amount' ) ) {
-				$status = 'outofstock';
-			}
-		}
-
-		if ( update_post_meta( $this->variation_id, '_stock_status', $status ) ) {
-			do_action( 'woocommerce_variation_set_stock_status', $this->variation_id, $status );
-
-			WC_Product_Variable::sync_stock_status( $this->id );
-		}
-	}
-
-	/**
-	 * Reduce stock level of the product.
-	 *
-	 * @param int $amount (default: 1) Amount to reduce by
-	 * @return int stock level
-	 */
-	public function reduce_stock( $amount = 1 ) {
-		if ( true === $this->managing_stock() ) {
-			return $this->set_stock( $amount, 'subtract' );
-		} else {
-			return $this->parent->reduce_stock( $amount );
-		}
-	}
-
-	/**
-	 * Increase stock level of the product.
-	 *
-	 * @param int $amount (default: 1) Amount to increase by
-	 * @return int stock level
-	 */
-	public function increase_stock( $amount = 1 ) {
-		if ( true === $this->managing_stock() ) {
-			return $this->set_stock( $amount, 'add' );
-		} else {
-			return $this->parent->increase_stock( $amount );
-		}
-	}
-
-	/**
-	 * Returns the availability of the product.
-	 *
-	 * @return string
-	 */
-	public function get_availability() {
-		$availability = $class = '';
-
-		if ( $this->managing_stock() ) {
-			if ( $this->is_in_stock() && $this->get_stock_quantity() > get_option( 'woocommerce_notify_no_stock_amount' ) ) {
-				switch ( get_option( 'woocommerce_stock_format' ) ) {
-					case 'no_amount' :
-						$availability = __( 'In stock', 'woocommerce' );
-					break;
-					case 'low_amount' :
-						if ( $this->get_stock_quantity() <= get_option( 'woocommerce_notify_low_stock_amount' ) ) {
-							$availability = sprintf( __( 'Only %s left in stock', 'woocommerce' ), $this->get_stock_quantity() );
-
-							if ( $this->backorders_allowed() && $this->backorders_require_notification() ) {
-								$availability .= ' ' . __( '(can be backordered)', 'woocommerce' );
-							}
-						} else {
-							$availability = __( 'In stock', 'woocommerce' );
-						}
-					break;
-					default :
-						$availability = sprintf( __( '%s in stock', 'woocommerce' ), $this->get_stock_quantity() );
-
-						if ( $this->backorders_allowed() && $this->backorders_require_notification() ) {
-							$availability .= ' ' . __( '(can be backordered)', 'woocommerce' );
-						}
-					break;
-				}
-				$class        = 'in-stock';
-			} elseif ( $this->backorders_allowed() && $this->backorders_require_notification() ) {
-				$availability = __( 'Available on backorder', 'woocommerce' );
-				$class        = 'available-on-backorder';
-			} elseif ( $this->backorders_allowed() ) {
-				$availability = __( 'In stock', 'woocommerce' );
-				$class        = 'in-stock';
-			} else {
-				$availability = __( 'Out of stock', 'woocommerce' );
-				$class        = 'out-of-stock';
-			}
-		} elseif ( ! $this->is_in_stock() ) {
-			$availability = __( 'Out of stock', 'woocommerce' );
-			$class        = 'out-of-stock';
-		}
-
-		return apply_filters( 'woocommerce_get_availability', array( 'availability' => $availability, 'class' => $class ), $this );
-	}
-
-	/**
-	 * Returns whether or not the product needs to notify the customer on backorder.
-	 *
-	 * @return bool
-	 */
-	public function backorders_require_notification() {
-		if ( true === $this->managing_stock() ) {
-			return parent::backorders_require_notification();
-		} else {
-			return $this->parent->backorders_require_notification();
-		}
-	}
-
-	/**
-	 * is_on_backorder function.
-	 *
-	 * @param int $qty_in_cart (default: 0)
-	 * @return bool
-	 */
-	public function is_on_backorder( $qty_in_cart = 0 ) {
-		if ( true === $this->managing_stock() ) {
-			return parent::is_on_backorder( $qty_in_cart );
-		} else {
-			return $this->parent->is_on_backorder( $qty_in_cart );
-		}
-	}
-
-	/**
-	 * Returns whether or not the product has enough stock for the order.
-	 *
-	 * @param mixed $quantity
-	 * @return bool
-	 */
-	public function has_enough_stock( $quantity ) {
-		if ( true === $this->managing_stock() ) {
-			return parent::has_enough_stock( $quantity );
-		} else {
-			return $this->parent->has_enough_stock( $quantity );
-		}
-	}
-
-	/**
-	 * Get the shipping class, and if not set, get the shipping class of the parent.
-	 *
-	 * @return string
-	 */
-	public function get_shipping_class() {
-		if ( ! $this->variation_shipping_class ) {
-			$classes = get_the_terms( $this->variation_id, 'product_shipping_class' );
-
-			if ( $classes && ! is_wp_error( $classes ) ) {
-				$this->variation_shipping_class = current( $classes )->slug;
-			} else {
-				$this->variation_shipping_class = parent::get_shipping_class();
-			}
-		}
-		return $this->variation_shipping_class;
-	}
-
-	/**
-	 * Returns the product shipping class ID.
-	 *
-	 * @return int
-	 */
-	public function get_shipping_class_id() {
-		if ( ! $this->variation_shipping_class_id ) {
-			$classes = get_the_terms( $this->variation_id, 'product_shipping_class' );
-
-			if ( $classes && ! is_wp_error( $classes ) ) {
-				$this->variation_shipping_class_id = current( $classes )->term_id;
-			} else {
-				$this->variation_shipping_class_id = parent::get_shipping_class_id();
-			}
-		}
-		return absint( $this->variation_shipping_class_id );
-	}
-
-	/**
-	 * Get formatted variation data with WC < 2.4 back compat and proper formatting of text-based attribute names.
-	 *
-	 * @return string
-	 */
-	public function get_formatted_variation_attributes( $flat = false ) {
-		$variation_data = $this->get_variation_attributes();
-		$attributes     = $this->parent->get_attributes();
-		$description    = array();
-		$return         = '';
-
-		if ( is_array( $variation_data ) ) {
-
-			if ( ! $flat ) {
-				$return = '<dl class="variation">';
-			}
-
-			foreach ( $attributes as $attribute ) {
-
-				// Only deal with attributes that are variations
-				if ( ! $attribute[ 'is_variation' ] ) {
-					continue;
-				}
-
-				$variation_selected_value = isset( $variation_data[ 'attribute_' . sanitize_title( $attribute[ 'name' ] ) ] ) ? $variation_data[ 'attribute_' . sanitize_title( $attribute[ 'name' ] ) ] : '';
-				$description_name         = esc_html( wc_attribute_label( $attribute[ 'name' ] ) );
-				$description_value        = __( 'Any', 'woocommerce' );
-
-				// Get terms for attribute taxonomy or value if its a custom attribute
-				if ( $attribute[ 'is_taxonomy' ] ) {
-
-					$post_terms = wp_get_post_terms( $this->id, $attribute[ 'name' ] );
-
-					foreach ( $post_terms as $term ) {
-						if ( $variation_selected_value === $term->slug ) {
-							$description_value = esc_html( apply_filters( 'woocommerce_variation_option_name', $term->name ) );
-						}
-					}
-
-				} else {
-
-					$options = wc_get_text_attributes( $attribute[ 'value' ] );
-
-					foreach ( $options as $option ) {
-
-						if ( sanitize_title( $variation_selected_value ) === $variation_selected_value ) {
-							if ( $variation_selected_value !== sanitize_title( $option ) ) {
-								continue;
-							}
-						} else {
-							if ( $variation_selected_value !== $option ) {
-								continue;
-							}
-						}
-
-						$description_value = esc_html( apply_filters( 'woocommerce_variation_option_name', $option ) );
-					}
-				}
-
-				if ( $flat ) {
-					$description[] = $description_name . ': ' . rawurldecode( $description_value );
-				} else {
-					$description[] = '<dt>' . $description_name . ':</dt><dd>' . rawurldecode( $description_value ) . '</dd>';
-				}
-			}
-
-			if ( $flat ) {
-				$return .= implode( ', ', $description );
-			} else {
-				$return .= implode( '', $description );
-			}
-
-			if ( ! $flat ) {
-				$return .= '</dl>';
-			}
-		}
-
-		return $return;
-	}
-
-	/**
-	 * Get product name with extra details such as SKU, price and attributes. Used within admin.
-	 *
-	 * @return string Formatted product name, including attributes and price
-	 */
-	public function get_formatted_name() {
-		if ( $this->get_sku() ) {
-			$identifier = $this->get_sku();
-		} else {
-			$identifier = '#' . $this->variation_id;
-		}
-
-		$formatted_attributes = $this->get_formatted_variation_attributes( true );
-		$extra_data           = ' &ndash; ' . $formatted_attributes . ' &ndash; ' . wc_price( $this->get_price() );
-
-		return sprintf( __( '%s &ndash; %s%s', 'woocommerce' ), $identifier, $this->get_title(), $extra_data );
-	}
-
-	/**
-	 * Get product variation description.
-	 *
-	 * @return string
-	 */
-	public function get_variation_description() {
-		return wpautop( do_shortcode( wp_kses_post( get_post_meta( $this->variation_id, '_variation_description', true ) ) ) );
+	public function variation_is_visible() {
+		return apply_filters( 'woocommerce_variation_is_visible', 'publish' === get_post_status( $this->get_id() ) && '' !== $this->get_price(), $this->get_id(), $this->get_parent_id(), $this );
 	}
 }
diff --git a/includes/class-wc-query.php b/includes/class-wc-query.php
index e27c0e80ff7..445f03274f0 100644
--- a/includes/class-wc-query.php
+++ b/includes/class-wc-query.php
@@ -3,7 +3,7 @@
  * Contains the query functions for WooCommerce which alter the front-end post queries and loops
  *
  * @class 		WC_Query
- * @version		2.3.0
+ * @version		2.6.0
  * @package		WooCommerce/Classes
  * @category	Class
  * @author 		WooThemes
@@ -13,8 +13,6 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
-if ( ! class_exists( 'WC_Query' ) ) :
-
 /**
  * WC_Query Class.
  */
@@ -23,26 +21,11 @@ class WC_Query {
 	/** @public array Query vars to add to wp */
 	public $query_vars = array();
 
-	/** @public array Unfiltered product ids (before layered nav etc) */
-	public $unfiltered_product_ids 	= array();
-
-	/** @public array Filtered product ids (after layered nav) */
-	public $filtered_product_ids 	= array();
-
-	/** @public array Filtered product ids (after layered nav, per taxonomy) */
-	public $filtered_product_ids_for_taxonomy 	= array();
-
-	/** @public array Product IDs that match the layered nav + price filter */
-	public $post__in 		= array();
-
-	/** @public array|string The meta query for the page */
-	public $meta_query 		= '';
-
-	/** @public array Post IDs matching layered nav only */
-	public $layered_nav_post__in 	= array();
-
-	/** @public array Stores post IDs matching layered nav, so price filter can find max price in view */
-	public $layered_nav_product_ids = array();
+	/**
+	 * Stores chosen attributes
+	 * @var array
+	 */
+	private static $_chosen_attributes;
 
 	/**
 	 * Constructor for the query class. Hooks in methods.
@@ -51,19 +34,14 @@ class WC_Query {
 	 */
 	public function __construct() {
 		add_action( 'init', array( $this, 'add_endpoints' ) );
-		add_action( 'init', array( $this, 'layered_nav_init' ) );
-		add_action( 'init', array( $this, 'price_filter_init' ) );
-
 		if ( ! is_admin() ) {
 			add_action( 'wp_loaded', array( $this, 'get_errors' ), 20 );
-			add_filter( 'query_vars', array( $this, 'add_query_vars'), 0 );
-			add_action( 'parse_request', array( $this, 'parse_request'), 0 );
+			add_filter( 'query_vars', array( $this, 'add_query_vars' ), 0 );
+			add_action( 'parse_request', array( $this, 'parse_request' ), 0 );
 			add_action( 'pre_get_posts', array( $this, 'pre_get_posts' ) );
-			add_filter( 'the_posts', array( $this, 'the_posts' ), 11, 2 );
 			add_action( 'wp', array( $this, 'remove_product_query' ) );
 			add_action( 'wp', array( $this, 'remove_ordering_args' ) );
 		}
-
 		$this->init_query_vars();
 	}
 
@@ -80,19 +58,23 @@ class WC_Query {
 	 * Init query vars by loading options.
 	 */
 	public function init_query_vars() {
-		// Query vars to add to WP
+		// Query vars to add to WP.
 		$this->query_vars = array(
-			// Checkout actions
+			// Checkout actions.
 			'order-pay'          => get_option( 'woocommerce_checkout_pay_endpoint', 'order-pay' ),
 			'order-received'     => get_option( 'woocommerce_checkout_order_received_endpoint', 'order-received' ),
-
-			// My account actions
-			'view-order'         => get_option( 'woocommerce_myaccount_view_order_endpoint', 'view-order' ),
-			'edit-account'       => get_option( 'woocommerce_myaccount_edit_account_endpoint', 'edit-account' ),
-			'edit-address'       => get_option( 'woocommerce_myaccount_edit_address_endpoint', 'edit-address' ),
-			'lost-password'      => get_option( 'woocommerce_myaccount_lost_password_endpoint', 'lost-password' ),
-			'customer-logout'    => get_option( 'woocommerce_logout_endpoint', 'customer-logout' ),
-			'add-payment-method' => get_option( 'woocommerce_myaccount_add_payment_method_endpoint', 'add-payment-method' ),
+			// My account actions.
+			'orders'                     => get_option( 'woocommerce_myaccount_orders_endpoint', 'orders' ),
+			'view-order'                 => get_option( 'woocommerce_myaccount_view_order_endpoint', 'view-order' ),
+			'downloads'                  => get_option( 'woocommerce_myaccount_downloads_endpoint', 'downloads' ),
+			'edit-account'               => get_option( 'woocommerce_myaccount_edit_account_endpoint', 'edit-account' ),
+			'edit-address'               => get_option( 'woocommerce_myaccount_edit_address_endpoint', 'edit-address' ),
+			'payment-methods'            => get_option( 'woocommerce_myaccount_payment_methods_endpoint', 'payment-methods' ),
+			'lost-password'              => get_option( 'woocommerce_myaccount_lost_password_endpoint', 'lost-password' ),
+			'customer-logout'            => get_option( 'woocommerce_logout_endpoint', 'customer-logout' ),
+			'add-payment-method'         => get_option( 'woocommerce_myaccount_add_payment_method_endpoint', 'add-payment-method' ),
+			'delete-payment-method'      => get_option( 'woocommerce_myaccount_delete_payment_method_endpoint', 'delete-payment-method' ),
+			'set-default-payment-method' => get_option( 'woocommerce_myaccount_set_default_payment_method_endpoint', 'set-default-payment-method' ),
 		);
 	}
 
@@ -106,55 +88,94 @@ class WC_Query {
 
 		switch ( $endpoint ) {
 			case 'order-pay' :
-				$title = __( 'Pay for Order', 'woocommerce' );
+				$title = __( 'Pay for order', 'woocommerce' );
 			break;
 			case 'order-received' :
-				$title = __( 'Order Received', 'woocommerce' );
+				$title = __( 'Order received', 'woocommerce' );
+			break;
+			case 'orders' :
+				if ( ! empty( $wp->query_vars['orders'] ) ) {
+					/* translators: %s: page */
+					$title = sprintf( __( 'Orders (page %d)', 'woocommerce' ), intval( $wp->query_vars['orders'] ) );
+				} else {
+					$title = __( 'Orders', 'woocommerce' );
+				}
 			break;
 			case 'view-order' :
 				$order = wc_get_order( $wp->query_vars['view-order'] );
+				/* translators: %s: order number */
 				$title = ( $order ) ? sprintf( __( 'Order #%s', 'woocommerce' ), $order->get_order_number() ) : '';
 			break;
+			case 'downloads' :
+				$title = __( 'Downloads', 'woocommerce' );
+			break;
 			case 'edit-account' :
-				$title = __( 'Edit Account Details', 'woocommerce' );
+				$title = __( 'Account details', 'woocommerce' );
 			break;
 			case 'edit-address' :
-				$title = __( 'Edit Address', 'woocommerce' );
+				$title = __( 'Addresses', 'woocommerce' );
+			break;
+			case 'payment-methods' :
+				$title = __( 'Payment methods', 'woocommerce' );
 			break;
 			case 'add-payment-method' :
-				$title = __( 'Add Payment Method', 'woocommerce' );
+				$title = __( 'Add payment method', 'woocommerce' );
 			break;
 			case 'lost-password' :
-				$title = __( 'Lost Password', 'woocommerce' );
+				$title = __( 'Lost password', 'woocommerce' );
 			break;
 			default :
 				$title = '';
 			break;
 		}
-		return $title;
+
+		return apply_filters( 'woocommerce_endpoint_' . $endpoint . '_title', $title, $endpoint );
+	}
+
+	/**
+	 * Endpoint mask describing the places the endpoint should be added.
+	 *
+	 * @since 2.6.2
+	 * @return int
+	 */
+	public function get_endpoints_mask() {
+		if ( 'page' === get_option( 'show_on_front' ) ) {
+			$page_on_front     = get_option( 'page_on_front' );
+			$myaccount_page_id = get_option( 'woocommerce_myaccount_page_id' );
+			$checkout_page_id  = get_option( 'woocommerce_checkout_page_id' );
+
+			if ( in_array( $page_on_front, array( $myaccount_page_id, $checkout_page_id ) ) ) {
+				return EP_ROOT | EP_PAGES;
+			}
+		}
+
+		return EP_PAGES;
 	}
 
 	/**
 	 * Add endpoints for query vars.
 	 */
 	public function add_endpoints() {
+		$mask = $this->get_endpoints_mask();
+
 		foreach ( $this->query_vars as $key => $var ) {
-			add_rewrite_endpoint( $var, EP_ROOT | EP_PAGES );
+			if ( ! empty( $var ) ) {
+				add_rewrite_endpoint( $var, $mask );
+			}
 		}
 	}
 
 	/**
-	 * add_query_vars function.
+	 * Add query vars.
 	 *
 	 * @access public
 	 * @param array $vars
 	 * @return array
 	 */
 	public function add_query_vars( $vars ) {
-		foreach ( $this->query_vars as $key => $var ) {
+		foreach ( $this->get_query_vars() as $key => $var ) {
 			$vars[] = $key;
 		}
-
 		return $vars;
 	}
 
@@ -164,7 +185,7 @@ class WC_Query {
 	 * @return array
 	 */
 	public function get_query_vars() {
-		return $this->query_vars;
+		return apply_filters( 'woocommerce_get_query_vars', $this->query_vars );
 	}
 
 	/**
@@ -189,17 +210,31 @@ class WC_Query {
 		global $wp;
 
 		// Map query vars to their keys, or get them if endpoints are not supported
-		foreach ( $this->query_vars as $key => $var ) {
+		foreach ( $this->get_query_vars() as $key => $var ) {
 			if ( isset( $_GET[ $var ] ) ) {
 				$wp->query_vars[ $key ] = $_GET[ $var ];
-			}
-
-			elseif ( isset( $wp->query_vars[ $var ] ) ) {
+			} elseif ( isset( $wp->query_vars[ $var ] ) ) {
 				$wp->query_vars[ $key ] = $wp->query_vars[ $var ];
 			}
 		}
 	}
 
+	/**
+	 * Are we currently on the front page?
+	 * @return boolean
+	 */
+	private function is_showing_page_on_front( $q ) {
+		return $q->is_home() && 'page' === get_option( 'show_on_front' );
+	}
+
+	/**
+	 * Is the front page a page we define?
+	 * @return boolean
+	 */
+	private function page_on_front_is( $page_id ) {
+		return absint( get_option( 'page_on_front' ) ) === absint( $page_id );
+	}
+
 	/**
 	 * Hook into pre_get_posts to do the main product query.
 	 *
@@ -211,45 +246,36 @@ class WC_Query {
 			return;
 		}
 
-		// Fix for verbose page rules
-		if ( $GLOBALS['wp_rewrite']->use_verbose_page_rules && isset( $q->queried_object->ID ) && $q->queried_object->ID === wc_get_page_id('shop') ) {
-			$q->set( 'post_type', 'product' );
-			$q->set( 'page', '' );
-			$q->set( 'pagename', '' );
-
-			// Fix conditional Functions
-			$q->is_archive           = true;
-			$q->is_post_type_archive = true;
-			$q->is_singular          = false;
-			$q->is_page              = false;
-		}
-
 		// Fix for endpoints on the homepage
-		if ( $q->is_home() && 'page' == get_option('show_on_front') && get_option('page_on_front') != $q->get('page_id') ) {
+		if ( $this->is_showing_page_on_front( $q ) && ! $this->page_on_front_is( $q->get( 'page_id' ) ) ) {
 			$_query = wp_parse_args( $q->query );
 			if ( ! empty( $_query ) && array_intersect( array_keys( $_query ), array_keys( $this->query_vars ) ) ) {
 				$q->is_page     = true;
 				$q->is_home     = false;
 				$q->is_singular = true;
-
-				$q->set( 'page_id', get_option('page_on_front') );
+				$q->set( 'page_id', (int) get_option( 'page_on_front' ) );
+				add_filter( 'redirect_canonical', '__return_false' );
 			}
 		}
 
 		// When orderby is set, WordPress shows posts. Get around that here.
-		if ( $q->is_home() && 'page' == get_option('show_on_front') && get_option('page_on_front') == wc_get_page_id('shop') ) {
+		if ( $this->is_showing_page_on_front( $q ) && $this->page_on_front_is( wc_get_page_id( 'shop' ) ) ) {
 			$_query = wp_parse_args( $q->query );
 			if ( empty( $_query ) || ! array_diff( array_keys( $_query ), array( 'preview', 'page', 'paged', 'cpage', 'orderby' ) ) ) {
 				$q->is_page = true;
 				$q->is_home = false;
-				$q->set( 'page_id', get_option('page_on_front') );
+				$q->set( 'page_id', (int) get_option( 'page_on_front' ) );
 				$q->set( 'post_type', 'product' );
 			}
 		}
 
-		// Special check for shops with the product archive on front
-		if ( $q->is_page() && 'page' == get_option( 'show_on_front' ) && $q->get( 'page_id' ) == wc_get_page_id( 'shop' ) ) {
+		// Fix product feeds
+		if ( $q->is_feed() && $q->is_post_type_archive( 'product' ) ) {
+			$q->is_comment_feed = false;
+		}
 
+		// Special check for shops with the product archive on front
+		if ( $q->is_page() && 'page' === get_option( 'show_on_front' ) && absint( $q->get( 'page_id' ) ) === wc_get_page_id( 'shop' ) ) {
 			// This is a front-page shop
 			$q->set( 'post_type', 'product' );
 			$q->set( 'page_id', '' );
@@ -259,10 +285,12 @@ class WC_Query {
 			}
 
 			// Define a variable so we know this is the front page shop later on
-			define( 'SHOP_IS_ON_FRONT', true );
+			if ( ! defined( 'SHOP_IS_ON_FRONT' ) ) {
+				define( 'SHOP_IS_ON_FRONT', true );
+			}
 
 			// Get the actual WP page to avoid errors and let us use is_front_page()
-			// This is hacky but works. Awaiting http://core.trac.wordpress.org/ticket/21096
+			// This is hacky but works. Awaiting https://core.trac.wordpress.org/ticket/21096
 			global $wp_post_types;
 
 			$shop_page 	= get_post( wc_get_page_id( 'shop' ) );
@@ -300,15 +328,12 @@ class WC_Query {
 			add_filter( 'wp', array( $this, 'remove_posts_where' ) );
 		}
 
-		// We're on a shop page so queue the woocommerce_get_products_in_view function
-		add_action( 'wp', array( $this, 'get_products_in_view' ), 2);
-
 		// And remove the pre_get_posts hook
 		$this->remove_product_query();
 	}
 
 	/**
-	 * search_post_excerpt function.
+	 * Search post excerpt.
 	 *
 	 * @access public
 	 * @param string $where (default: '')
@@ -318,8 +343,9 @@ class WC_Query {
 		global $wp_the_query;
 
 		// If this is not a WC Query, do not modify the query
-		if ( empty( $wp_the_query->query_vars['wc_query'] ) || empty( $wp_the_query->query_vars['s'] ) )
+		if ( empty( $wp_the_query->query_vars['wc_query'] ) || empty( $wp_the_query->query_vars['s'] ) ) {
 			return $where;
+		}
 
 		$where = preg_replace(
 			"/post_title\s+LIKE\s*(\'\%[^\%]+\%\')/",
@@ -329,100 +355,37 @@ class WC_Query {
 	}
 
 	/**
-	 * wpseo_metadesc function.
+	 * WP SEO meta description.
+	 *
 	 * Hooked into wpseo_ hook already, so no need for function_exist.
 	 *
 	 * @access public
 	 * @return string
 	 */
 	public function wpseo_metadesc() {
-		return WPSEO_Meta::get_value( 'metadesc', wc_get_page_id('shop') );
+		return WPSEO_Meta::get_value( 'metadesc', wc_get_page_id( 'shop' ) );
 	}
 
 	/**
-	 * wpseo_metakey function.
+	 * WP SEO meta key.
+	 *
 	 * Hooked into wpseo_ hook already, so no need for function_exist.
 	 *
 	 * @access public
 	 * @return string
 	 */
 	public function wpseo_metakey() {
-		return WPSEO_Meta::get_value( 'metakey', wc_get_page_id('shop') );
+		return WPSEO_Meta::get_value( 'metakey', wc_get_page_id( 'shop' ) );
 	}
 
-	/**
-	 * Hook into the_posts to do the main product query if needed - relevanssi compatibility.
-	 *
-	 * @access public
-	 * @param array $posts
-	 * @param WP_Query|bool $query (default: false)
-	 * @return array
-	 */
-	public function the_posts( $posts, $query = false ) {
-		// Abort if there's no query
-		if ( ! $query )
-			return $posts;
-
-		// Abort if we're not filtering posts
-		if ( empty( $this->post__in ) )
-			return $posts;
-
-		// Abort if this query has already been done
-		if ( ! empty( $query->wc_query ) )
-			return $posts;
-
-		// Abort if this isn't a search query
-		if ( empty( $query->query_vars["s"] ) )
-			return $posts;
-
-		// Abort if we're not on a post type archive/product taxonomy
-		if 	( ! $query->is_post_type_archive( 'product' ) && ! $query->is_tax( get_object_taxonomies( 'product' ) ) )
-			return $posts;
-
-		$filtered_posts   = array();
-		$queried_post_ids = array();
-
-		foreach ( $posts as $post ) {
-			if ( in_array( $post->ID, $this->post__in ) ) {
-				$filtered_posts[] = $post;
-				$queried_post_ids[] = $post->ID;
-			}
-		}
-
-		$query->posts = $filtered_posts;
-		$query->post_count = count( $filtered_posts );
-
-		// Ensure filters are set
-		$this->unfiltered_product_ids = $queried_post_ids;
-		$this->filtered_product_ids   = $queried_post_ids;
-
-		if ( sizeof( $this->layered_nav_post__in ) > 0 ) {
-			$this->layered_nav_product_ids = array_intersect( $this->unfiltered_product_ids, $this->layered_nav_post__in );
-		} else {
-			$this->layered_nav_product_ids = $this->unfiltered_product_ids;
-		}
-
-		return $filtered_posts;
-	}
-
-
 	/**
 	 * Query the products, applying sorting/ordering etc. This applies to the main wordpress loop.
 	 *
 	 * @param mixed $q
 	 */
 	public function product_query( $q ) {
-
-		// Meta query
-		$meta_query = $this->get_meta_query( $q->get( 'meta_query' ) );
-
-		// Ordering
-		$ordering   = $this->get_catalog_ordering_args();
-
-		// Get a list of post id's which match the current filters set (in the layered nav and price filter)
-		$post__in   = array_unique( apply_filters( 'loop_shop_post_in', array() ) );
-
 		// Ordering query vars
+		$ordering  = $this->get_catalog_ordering_args();
 		$q->set( 'orderby', $ordering['orderby'] );
 		$q->set( 'order', $ordering['order'] );
 		if ( isset( $ordering['meta_key'] ) ) {
@@ -430,16 +393,11 @@ class WC_Query {
 		}
 
 		// Query vars that affect posts shown
-		$q->set( 'meta_query', $meta_query );
-		$q->set( 'post__in', $post__in );
+		$q->set( 'meta_query', $this->get_meta_query( $q->get( 'meta_query' ), true ) );
+		$q->set( 'tax_query', $this->get_tax_query( $q->get( 'tax_query' ), true ) );
 		$q->set( 'posts_per_page', $q->get( 'posts_per_page' ) ? $q->get( 'posts_per_page' ) : apply_filters( 'loop_shop_per_page', get_option( 'posts_per_page' ) ) );
-
-		// Set a special variable
 		$q->set( 'wc_query', 'product_query' );
-
-		// Store variables
-		$this->post__in   = $post__in;
-		$this->meta_query = $meta_query;
+		$q->set( 'post__in', array_unique( (array) apply_filters( 'loop_shop_post_in', array() ) ) );
 
 		do_action( 'woocommerce_product_query', $q, $this );
 	}
@@ -467,66 +425,6 @@ class WC_Query {
 		remove_filter( 'posts_where', array( $this, 'search_post_excerpt' ) );
 	}
 
-
-	/**
-	 * Get an unpaginated list all product ID's (both filtered and unfiltered). Makes use of transients.
-	 */
-	public function get_products_in_view() {
-		global $wp_the_query;
-
-		// Get main query
-		$current_wp_query = $wp_the_query->query;
-
-		// Get WP Query for current page (without 'paged')
-		unset( $current_wp_query['paged'] );
-
-		// Generate a transient name based on current query
-		$transient_name = 'wc_uf_pid_' . md5( http_build_query( $current_wp_query ) . WC_Cache_Helper::get_transient_version( 'product_query' ) );
-		$transient_name = ( is_search() ) ? $transient_name . '_s' : $transient_name;
-
-		if ( false === ( $unfiltered_product_ids = get_transient( $transient_name ) ) ) {
-
-			// Get all visible posts, regardless of filters
-			$unfiltered_product_ids = get_posts(
-				array_merge(
-					$current_wp_query,
-					array(
-						'post_type'              => 'product',
-						'numberposts'            => -1,
-						'post_status'            => 'publish',
-						'meta_query'             => $this->meta_query,
-						'fields'                 => 'ids',
-						'no_found_rows'          => true,
-						'update_post_meta_cache' => false,
-						'update_post_term_cache' => false,
-						'pagename'               => '',
-						'wc_query'               => 'get_products_in_view'
-					)
-				)
-			);
-
-			set_transient( $transient_name, $unfiltered_product_ids, DAY_IN_SECONDS * 30 );
-		}
-
-		// Store the variable
-		$this->unfiltered_product_ids = $unfiltered_product_ids;
-
-		// Also store filtered posts ids...
-		if ( sizeof( $this->post__in ) > 0 ) {
-			$this->filtered_product_ids = array_intersect( $this->unfiltered_product_ids, $this->post__in );
-		} else {
-			$this->filtered_product_ids = $this->unfiltered_product_ids;
-		}
-
-		// And filtered post ids which just take layered nav into consideration (to find max price in the price widget)
-		if ( sizeof( $this->layered_nav_post__in ) > 0 ) {
-			$this->layered_nav_product_ids = array_intersect( $this->unfiltered_product_ids, $this->layered_nav_post__in );
-		} else {
-			$this->layered_nav_product_ids = $this->unfiltered_product_ids;
-		}
-	}
-
-
 	/**
 	 * Returns an array of arguments for ordering products based on the selected values.
 	 *
@@ -534,8 +432,6 @@ class WC_Query {
 	 * @return array
 	 */
 	public function get_catalog_ordering_args( $orderby = '', $order = '' ) {
-		global $wpdb;
-
 		// Get ordering from query string unless defined
 		if ( ! $orderby ) {
 			$orderby_value = isset( $_GET['orderby'] ) ? wc_clean( $_GET['orderby'] ) : apply_filters( 'woocommerce_default_catalog_orderby', get_option( 'woocommerce_default_catalog_orderby' ) );
@@ -552,43 +448,46 @@ class WC_Query {
 
 		// default - menu_order
 		$args['orderby']  = 'menu_order title';
-		$args['order']    = $order == 'DESC' ? 'DESC' : 'ASC';
+		$args['order']    = ( 'DESC' === $order ) ? 'DESC' : 'ASC';
 		$args['meta_key'] = '';
 
 		switch ( $orderby ) {
 			case 'rand' :
 				$args['orderby']  = 'rand';
-			break;
+				break;
 			case 'date' :
-				$args['orderby']  = 'date';
-				$args['order']    = $order == 'ASC' ? 'ASC' : 'DESC';
-			break;
+				$args['orderby']  = 'date ID';
+				$args['order']    = ( 'ASC' === $order ) ? 'ASC' : 'DESC';
+				break;
 			case 'price' :
 				$args['orderby']  = "meta_value_num ID";
-				$args['order']    = $order == 'DESC' ? 'DESC' : 'ASC';
+				$args['order']    = ( 'DESC' === $order ) ? 'DESC' : 'ASC';
 				$args['meta_key'] = '_price';
-			break;
+				break;
 			case 'popularity' :
 				$args['meta_key'] = 'total_sales';
 
 				// Sorting handled later though a hook
 				add_filter( 'posts_clauses', array( $this, 'order_by_popularity_post_clauses' ) );
-			break;
+				break;
 			case 'rating' :
-				// Sorting handled later though a hook
-				add_filter( 'posts_clauses', array( $this, 'order_by_rating_post_clauses' ) );
-			break;
+				$args['meta_key'] = '_wc_average_rating';
+				$args['orderby']  = array(
+					'meta_value_num' => 'DESC',
+					'ID'             => 'ASC',
+				);
+				break;
 			case 'title' :
-				$args['orderby']  = 'title';
-				$args['order']    = $order == 'DESC' ? 'DESC' : 'ASC';
-			break;
+				$args['orderby'] = 'title';
+				$args['order']   = ( 'DESC' === $order ) ? 'DESC' : 'ASC';
+				break;
 		}
 
 		return apply_filters( 'woocommerce_get_catalog_ordering_args', $args );
 	}
 
 	/**
-	 * WP Core doens't let us change the sort direction for invidual orderby params - http://core.trac.wordpress.org/ticket/17065.
+	 * WP Core doens't let us change the sort direction for invidual orderby params - https://core.trac.wordpress.org/ticket/17065.
 	 *
 	 * This lets us sort by meta value desc, and have a second orderby param.
 	 *
@@ -598,33 +497,29 @@ class WC_Query {
 	 */
 	public function order_by_popularity_post_clauses( $args ) {
 		global $wpdb;
-
 		$args['orderby'] = "$wpdb->postmeta.meta_value+0 DESC, $wpdb->posts.post_date DESC";
-
 		return $args;
 	}
 
 	/**
-	 * order_by_rating_post_clauses function.
+	 * Order by rating post clauses.
 	 *
-	 * @access public
+	 * @deprecated 3.0.0
 	 * @param array $args
 	 * @return array
 	 */
 	public function order_by_rating_post_clauses( $args ) {
 		global $wpdb;
 
+		wc_deprecated_function( 'order_by_rating_post_clauses', '3.0' );
+
 		$args['fields'] .= ", AVG( $wpdb->commentmeta.meta_value ) as average_rating ";
-
-		$args['where'] .= " AND ( $wpdb->commentmeta.meta_key = 'rating' OR $wpdb->commentmeta.meta_key IS null ) ";
-
-		$args['join'] .= "
+		$args['where']  .= " AND ( $wpdb->commentmeta.meta_key = 'rating' OR $wpdb->commentmeta.meta_key IS null ) ";
+		$args['join']   .= "
 			LEFT OUTER JOIN $wpdb->comments ON($wpdb->posts.ID = $wpdb->comments.comment_post_ID)
 			LEFT JOIN $wpdb->commentmeta ON($wpdb->comments.comment_ID = $wpdb->commentmeta.comment_id)
 		";
-
 		$args['orderby'] = "average_rating DESC, $wpdb->posts.post_date DESC";
-
 		$args['groupby'] = "$wpdb->posts.ID";
 
 		return $args;
@@ -632,297 +527,235 @@ class WC_Query {
 
 	/**
 	 * Appends meta queries to an array.
-	 * @access public
-	 * @param array $meta_query
+	 *
+	 * @param  array $meta_query
+	 * @param  bool $main_query
 	 * @return array
 	 */
-	public function get_meta_query( $meta_query = array() ) {
-		if ( ! is_array( $meta_query ) )
+	public function get_meta_query( $meta_query = array(), $main_query = false ) {
+		if ( ! is_array( $meta_query ) ) {
 			$meta_query = array();
+		}
+		$meta_query['price_filter']  = $this->price_filter_meta_query();
+		return array_filter( apply_filters( 'woocommerce_product_query_meta_query', $meta_query, $this ) );
+	}
 
-		$meta_query[] = $this->visibility_meta_query();
-		$meta_query[] = $this->stock_status_meta_query();
+	/**
+	 * Appends tax queries to an array.
+	 * @param array $tax_query
+	 * @param bool  $main_query
+	 * @return array
+	 */
+	public function get_tax_query( $tax_query = array(), $main_query = false ) {
+		if ( ! is_array( $tax_query ) ) {
+			$tax_query = array( 'relation' => 'AND' );
+		}
 
-		return array_filter( $meta_query );
+		// Layered nav filters on terms.
+		if ( $main_query && ( $_chosen_attributes = $this->get_layered_nav_chosen_attributes() ) ) {
+			foreach ( $_chosen_attributes as $taxonomy => $data ) {
+				$tax_query[] = array(
+					'taxonomy'         => $taxonomy,
+					'field'            => 'slug',
+					'terms'            => $data['terms'],
+					'operator'         => 'and' === $data['query_type'] ? 'AND' : 'IN',
+					'include_children' => false,
+				);
+			}
+		}
+
+		$product_visibility_terms  = wc_get_product_visibility_term_ids();
+		$product_visibility_not_in = array( is_search() && $main_query ? $product_visibility_terms['exclude-from-search'] : $product_visibility_terms['exclude-from-catalog'] );
+
+		// Hide out of stock products.
+		if ( 'yes' === get_option( 'woocommerce_hide_out_of_stock_items' ) ) {
+			$product_visibility_not_in[] = $product_visibility_terms['outofstock'];
+		}
+
+		// Filter by rating.
+		if ( isset( $_GET['rating_filter'] ) ) {
+			$rating_filter = array_filter( array_map( 'absint', explode( ',', $_GET['rating_filter'] ) ) );
+			$rating_terms  = array();
+			for ( $i = 1; $i <= 5; $i ++ ) {
+				if ( in_array( $i, $rating_filter ) && isset( $product_visibility_terms[ 'rated-' . $i ] ) ) {
+					$rating_terms[] = $product_visibility_terms[ 'rated-' . $i ];
+				}
+			}
+			if ( ! empty( $rating_terms ) ) {
+				$tax_query[] = array(
+					'taxonomy'      => 'product_visibility',
+					'field'         => 'term_taxonomy_id',
+					'terms'         => $rating_terms,
+					'operator'      => 'IN',
+					'rating_filter' => true,
+				);
+			}
+		}
+
+		if ( ! empty( $product_visibility_not_in ) ) {
+			$tax_query[] = array(
+				'taxonomy' => 'product_visibility',
+				'field'    => 'term_taxonomy_id',
+				'terms'    => $product_visibility_not_in,
+				'operator' => 'NOT IN',
+			);
+		}
+
+		return array_filter( apply_filters( 'woocommerce_product_query_tax_query', $tax_query, $this ) );
+	}
+
+	/**
+	 * Return a meta query for filtering by price.
+	 * @return array
+	 */
+	private function price_filter_meta_query() {
+		if ( isset( $_GET['max_price'] ) || isset( $_GET['min_price'] ) ) {
+			$meta_query = wc_get_min_max_price_meta_query( $_GET );
+			$meta_query['price_filter'] = true;
+
+			return $meta_query;
+		}
+
+		return array();
+	}
+
+	/**
+	 * Return a meta query for filtering by rating.
+	 *
+	 * @deprecated 3.0.0 Replaced with taxonomy.
+	 * @return array
+	 */
+	public function rating_filter_meta_query() {
+		return array();
 	}
 
 	/**
 	 * Returns a meta query to handle product visibility.
 	 *
-	 * @access public
+	 * @deprecated 3.0.0 Replaced with taxonomy.
 	 * @param string $compare (default: 'IN')
 	 * @return array
 	 */
 	public function visibility_meta_query( $compare = 'IN' ) {
-		if ( is_search() )
-			$in = array( 'visible', 'search' );
-		else
-			$in = array( 'visible', 'catalog' );
-
-		$meta_query = array(
-			'key'     => '_visibility',
-			'value'   => $in,
-			'compare' => $compare
-		);
-
-		return $meta_query;
+		return array();
 	}
 
 	/**
 	 * Returns a meta query to handle product stock status.
 	 *
-	 * @access public
+	 * @deprecated 3.0.0 Replaced with taxonomy.
 	 * @param string $status (default: 'instock')
 	 * @return array
 	 */
 	public function stock_status_meta_query( $status = 'instock' ) {
-		$meta_query = array();
-		if ( get_option( 'woocommerce_hide_out_of_stock_items' ) == 'yes' ) {
-			$meta_query = array(
-				'key' 		=> '_stock_status',
-				'value' 	=> $status,
-				'compare' 	=> '='
-			);
-		}
+		return array();
+	}
+
+	/**
+	 * Get the tax query which was used by the main query.
+	 * @return array
+	 */
+	public static function get_main_tax_query() {
+		global $wp_the_query;
+
+		$tax_query = isset( $wp_the_query->tax_query, $wp_the_query->tax_query->queries ) ? $wp_the_query->tax_query->queries : array();
+
+		return $tax_query;
+	}
+
+	/**
+	 * Get the meta query which was used by the main query.
+	 * @return array
+	 */
+	public static function get_main_meta_query() {
+		global $wp_the_query;
+
+		$args       = $wp_the_query->query_vars;
+		$meta_query = isset( $args['meta_query'] ) ? $args['meta_query'] : array();
+
 		return $meta_query;
 	}
 
+	/**
+	 * Based on WP_Query::parse_search
+	 */
+	public static function get_main_search_query_sql() {
+		global $wp_the_query, $wpdb;
+
+		$args         = $wp_the_query->query_vars;
+		$search_terms = isset( $args['search_terms'] ) ? $args['search_terms'] : array();
+		$sql          = array();
+
+		foreach ( $search_terms as $term ) {
+			// Terms prefixed with '-' should be excluded.
+			$include = '-' !== substr( $term, 0, 1 );
+
+			if ( $include ) {
+				$like_op  = 'LIKE';
+				$andor_op = 'OR';
+			} else {
+				$like_op  = 'NOT LIKE';
+				$andor_op = 'AND';
+				$term     = substr( $term, 1 );
+			}
+
+			$like  = '%' . $wpdb->esc_like( $term ) . '%';
+			$sql[] = $wpdb->prepare( "(($wpdb->posts.post_title $like_op %s) $andor_op ($wpdb->posts.post_excerpt $like_op %s) $andor_op ($wpdb->posts.post_content $like_op %s))", $like, $like, $like );
+		}
+
+		if ( ! empty( $sql ) && ! is_user_logged_in() ) {
+			$sql[] = "($wpdb->posts.post_password = '')";
+		}
+
+		return implode( ' AND ', $sql );
+	}
+
 	/**
 	 * Layered Nav Init.
 	 */
-	public function layered_nav_init( ) {
+	public static function get_layered_nav_chosen_attributes() {
+		if ( ! is_array( self::$_chosen_attributes ) ) {
+			self::$_chosen_attributes = array();
 
-		if ( apply_filters( 'woocommerce_is_layered_nav_active', is_active_widget( false, false, 'woocommerce_layered_nav', true ) ) && ! is_admin() ) {
-
-			global $_chosen_attributes;
-
-			$_chosen_attributes = array();
-
-			$attribute_taxonomies = wc_get_attribute_taxonomies();
-			if ( $attribute_taxonomies ) {
+			if ( $attribute_taxonomies = wc_get_attribute_taxonomies() ) {
 				foreach ( $attribute_taxonomies as $tax ) {
+					$attribute    = wc_sanitize_taxonomy_name( $tax->attribute_name );
+					$taxonomy     = wc_attribute_taxonomy_name( $attribute );
+					$filter_terms = ! empty( $_GET[ 'filter_' . $attribute ] ) ? explode( ',', wc_clean( $_GET[ 'filter_' . $attribute ] ) ) : array();
 
-					$attribute       = wc_sanitize_taxonomy_name( $tax->attribute_name );
-					$taxonomy        = wc_attribute_taxonomy_name( $attribute );
-					$name            = 'filter_' . $attribute;
-					$query_type_name = 'query_type_' . $attribute;
-
-					if ( ! empty( $_GET[ $name ] ) && taxonomy_exists( $taxonomy ) ) {
-
-						$_chosen_attributes[ $taxonomy ]['terms'] = explode( ',', $_GET[ $name ] );
-
-						if ( empty( $_GET[ $query_type_name ] ) || ! in_array( strtolower( $_GET[ $query_type_name ] ), array( 'and', 'or' ) ) )
-							$_chosen_attributes[ $taxonomy ]['query_type'] = apply_filters( 'woocommerce_layered_nav_default_query_type', 'and' );
-						else
-							$_chosen_attributes[ $taxonomy ]['query_type'] = strtolower( $_GET[ $query_type_name ] );
-
+					if ( empty( $filter_terms ) || ! taxonomy_exists( $taxonomy ) ) {
+						continue;
 					}
+
+					$query_type = ! empty( $_GET[ 'query_type_' . $attribute ] ) && in_array( $_GET[ 'query_type_' . $attribute ], array( 'and', 'or' ) ) ? wc_clean( $_GET[ 'query_type_' . $attribute ] ) : '';
+					self::$_chosen_attributes[ $taxonomy ]['terms']      = array_map( 'sanitize_title', $filter_terms ); // Ensures correct encoding
+					self::$_chosen_attributes[ $taxonomy ]['query_type'] = $query_type ? $query_type : apply_filters( 'woocommerce_layered_nav_default_query_type', 'and' );
 				}
 			}
-
-			add_filter('loop_shop_post_in', array( $this, 'layered_nav_query' ) );
 		}
+		return self::$_chosen_attributes;
+	}
+
+	/**
+	 * @deprecated 2.6.0
+	 */
+	public function layered_nav_init() {
+		wc_deprecated_function( 'layered_nav_init', '2.6' );
+	}
+
+	/**
+	 * Get an unpaginated list all product IDs (both filtered and unfiltered). Makes use of transients.
+	 * @deprecated 2.6.0 due to performance concerns
+	 */
+	public function get_products_in_view() {
+		wc_deprecated_function( 'get_products_in_view', '2.6' );
 	}
 
 	/**
 	 * Layered Nav post filter.
-	 *
-	 * @param array $filtered_posts
-	 * @return array
+	 * @deprecated 2.6.0 due to performance concerns
 	 */
 	public function layered_nav_query( $filtered_posts ) {
-		global $_chosen_attributes;
-
-		if ( sizeof( $_chosen_attributes ) > 0 ) {
-
-			$matched_products   = array(
-				'and' => array(),
-				'or'  => array()
-			);
-			$filtered_attribute = array(
-				'and' => false,
-				'or'  => false
-			);
-
-			foreach ( $_chosen_attributes as $attribute => $data ) {
-				$matched_products_from_attribute = array();
-				$filtered = false;
-
-				if ( sizeof( $data['terms'] ) > 0 ) {
-					foreach ( $data['terms'] as $value ) {
-
-						$posts = get_posts(
-							array(
-								'post_type' 	=> 'product',
-								'numberposts' 	=> -1,
-								'post_status' 	=> 'publish',
-								'fields' 		=> 'ids',
-								'no_found_rows' => true,
-								'tax_query' => array(
-									array(
-										'taxonomy' 	=> $attribute,
-										'terms' 	=> $value,
-										'field' 	=> 'term_id'
-									)
-								)
-							)
-						);
-
-						if ( ! is_wp_error( $posts ) ) {
-
-							if ( sizeof( $matched_products_from_attribute ) > 0 || $filtered ) {
-								$matched_products_from_attribute = $data['query_type'] == 'or' ? array_merge( $posts, $matched_products_from_attribute ) : array_intersect( $posts, $matched_products_from_attribute );
-							} else {
-								$matched_products_from_attribute = $posts;
-							}
-
-							$filtered = true;
-						}
-					}
-				}
-
-				if ( sizeof( $matched_products[ $data['query_type'] ] ) > 0 || $filtered_attribute[ $data['query_type'] ] === true ) {
-					$matched_products[ $data['query_type'] ] = ( $data['query_type'] == 'or' ) ? array_merge( $matched_products_from_attribute, $matched_products[ $data['query_type'] ] ) : array_intersect( $matched_products_from_attribute, $matched_products[ $data['query_type'] ] );
-				} else {
-					$matched_products[ $data['query_type'] ] = $matched_products_from_attribute;
-				}
-
-				$filtered_attribute[ $data['query_type'] ] = true;
-
-				$this->filtered_product_ids_for_taxonomy[ $attribute ] = $matched_products_from_attribute;
-			}
-
-			// Combine our AND and OR result sets
-			if ( $filtered_attribute['and'] && $filtered_attribute['or'] )
-				$results = array_intersect( $matched_products[ 'and' ], $matched_products[ 'or' ] );
-			else
-				$results = array_merge( $matched_products[ 'and' ], $matched_products[ 'or' ] );
-
-			if ( $filtered ) {
-
-				WC()->query->layered_nav_post__in   = $results;
-				WC()->query->layered_nav_post__in[] = 0;
-
-				if ( sizeof( $filtered_posts ) == 0 ) {
-					$filtered_posts   = $results;
-					$filtered_posts[] = 0;
-				} else {
-					$filtered_posts   = array_intersect( $filtered_posts, $results );
-					$filtered_posts[] = 0;
-				}
-
-			}
-		}
-		return (array) $filtered_posts;
+		wc_deprecated_function( 'layered_nav_query', '2.6' );
 	}
-
-	/**
-	 * Price filter Init.
-	 */
-	public function price_filter_init() {
-		if ( apply_filters( 'woocommerce_is_price_filter_active', is_active_widget( false, false, 'woocommerce_price_filter', true ) ) && ! is_admin() ) {
-
-			$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-
-			wp_register_script( 'wc-jquery-ui-touchpunch', WC()->plugin_url() . '/assets/js/jquery-ui-touch-punch/jquery-ui-touch-punch' . $suffix . '.js', array( 'jquery-ui-slider' ), WC_VERSION, true );
-			wp_register_script( 'wc-price-slider', WC()->plugin_url() . '/assets/js/frontend/price-slider' . $suffix . '.js', array( 'jquery-ui-slider', 'wc-jquery-ui-touchpunch' ), WC_VERSION, true );
-
-			wp_localize_script( 'wc-price-slider', 'woocommerce_price_slider_params', array(
-				'currency_symbol' 	=> get_woocommerce_currency_symbol(),
-				'currency_pos'      => get_option( 'woocommerce_currency_pos' ),
-				'min_price'			=> isset( $_GET['min_price'] ) ? esc_attr( $_GET['min_price'] ) : '',
-				'max_price'			=> isset( $_GET['max_price'] ) ? esc_attr( $_GET['max_price'] ) : ''
-			) );
-
-			add_filter( 'loop_shop_post_in', array( $this, 'price_filter' ) );
-		}
-	}
-
-	/**
-	 * Price Filter post filter.
-	 *
-	 * @param array $filtered_posts
-	 * @return array
-	 */
-	public function price_filter( $filtered_posts = array() ) {
-		global $wpdb;
-
-		if ( isset( $_GET['max_price'] ) || isset( $_GET['min_price'] ) ) {
-
-			$matched_products = array();
-			$min              = isset( $_GET['min_price'] ) ? floatval( $_GET['min_price'] ) : 0;
-			$max              = isset( $_GET['max_price'] ) ? floatval( $_GET['max_price'] ) : 9999999999;
-
-			// If displaying prices in the shop including taxes, but prices don't include taxes..
-			if ( wc_tax_enabled() && 'incl' === get_option( 'woocommerce_tax_display_shop' ) && ! wc_prices_include_tax() ) {
-				$tax_classes = array_merge( array( '' ), WC_Tax::get_tax_classes() );
-
-				foreach ( $tax_classes as $tax_class ) {
-					$tax_rates = WC_Tax::get_rates( $tax_class );
-					$min_class = $min - WC_Tax::get_tax_total( WC_Tax::calc_inclusive_tax( $min, $tax_rates ) );
-					$max_class = $max - WC_Tax::get_tax_total( WC_Tax::calc_inclusive_tax( $max, $tax_rates ) );
-
-					$matched_products_query = apply_filters( 'woocommerce_price_filter_results', $wpdb->get_results( $wpdb->prepare( "
-						SELECT DISTINCT ID, post_parent, post_type FROM {$wpdb->posts}
-						INNER JOIN {$wpdb->postmeta} pm1 ON ID = pm1.post_id
-						INNER JOIN {$wpdb->postmeta} pm2 ON ID = pm2.post_id
-						WHERE post_type IN ( 'product', 'product_variation' )
-						AND post_status = 'publish'
-						AND pm1.meta_key IN ('" . implode( "','", array_map( 'esc_sql', apply_filters( 'woocommerce_price_filter_meta_keys', array( '_price' ) ) ) ) . "')
-						AND pm1.meta_value BETWEEN %f AND %f
-						AND pm2.meta_key = '_tax_class'
-						AND pm2.meta_value = %s
-					", $min_class, $max_class, sanitize_title( $tax_class ) ), OBJECT_K ), $min_class, $max_class );
-
-					if ( $matched_products_query ) {
-						foreach ( $matched_products_query as $product ) {
-							if ( $product->post_type == 'product' ) {
-								$matched_products[] = $product->ID;
-							}
-							if ( $product->post_parent > 0 ) {
-								$matched_products[] = $product->post_parent;
-							}
-						}
-					}
-				}
-			} else {
-				$matched_products_query = apply_filters( 'woocommerce_price_filter_results', $wpdb->get_results( $wpdb->prepare( "
-					SELECT DISTINCT ID, post_parent, post_type FROM {$wpdb->posts}
-					INNER JOIN {$wpdb->postmeta} pm1 ON ID = pm1.post_id
-					WHERE post_type IN ( 'product', 'product_variation' )
-					AND post_status = 'publish'
-					AND pm1.meta_key IN ('" . implode( "','", array_map( 'esc_sql', apply_filters( 'woocommerce_price_filter_meta_keys', array( '_price' ) ) ) ) . "')
-					AND pm1.meta_value BETWEEN %d AND %d
-				", $min, $max ), OBJECT_K ), $min, $max );
-
-				if ( $matched_products_query ) {
-					foreach ( $matched_products_query as $product ) {
-						if ( $product->post_type == 'product' ) {
-							$matched_products[] = $product->ID;
-						}
-						if ( $product->post_parent > 0 ) {
-							$matched_products[] = $product->post_parent;
-						}
-					}
-				}
-			}
-
-			$matched_products = array_unique( $matched_products );
-
-			// Filter the id's
-			if ( 0 === sizeof( $filtered_posts ) ) {
-				$filtered_posts = $matched_products;
-			} else {
-				$filtered_posts = array_intersect( $filtered_posts, $matched_products );
-			}
-			$filtered_posts[] = 0;
-		}
-
-		return (array) $filtered_posts;
-	}
-
 }
-
-endif;
-
-return new WC_Query();
diff --git a/includes/class-wc-register-wp-admin-settings.php b/includes/class-wc-register-wp-admin-settings.php
new file mode 100644
index 00000000000..4f197f9db98
--- /dev/null
+++ b/includes/class-wc-register-wp-admin-settings.php
@@ -0,0 +1,174 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Take settings registered for WP-Admin and hooks them up to the REST API.
+ *
+ * @version  3.0.0
+ * @since    3.0.0
+ * @package  WooCommerce/Classes
+ * @category Class
+ */
+class WC_Register_WP_Admin_Settings {
+
+	/** @var class Contains the current class to pull settings from. Either a admin page object or WC_Email object. */
+	protected $object;
+
+	/**
+	 * Hooks into the settings API and starts registering our settings.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Email|WC_Settings_Page $object The object that contains the settings to register.
+	 * @param string                    $type   Type of settings to register (email or page).
+	 */
+	public function __construct( $object, $type ) {
+		if ( ! is_object( $object ) ) {
+			return;
+		}
+
+		$this->object = $object;
+
+		if ( 'page' === $type ) {
+			add_filter( 'woocommerce_settings_groups', array( $this, 'register_page_group' ) );
+			add_filter( 'woocommerce_settings-' . $this->object->get_id(),  array( $this, 'register_page_settings' ) );
+		} elseif ( 'email' === $type ) {
+			add_filter( 'woocommerce_settings_groups', array( $this, 'register_email_group' ) );
+			add_filter( 'woocommerce_settings-email_' . $this->object->id,  array( $this, 'register_email_settings' ) );
+		}
+	}
+
+	/**
+	 * Register's all of our different notification emails as sub groups
+	 * of email settings.
+	 *
+	 * @since  3.0.0
+	 * @param  array $groups Existing registered groups.
+	 * @return array
+	 */
+	public function register_email_group( $groups ) {
+		$groups[] = array(
+			'id'          => 'email_' . $this->object->id,
+			'label'       => $this->object->title,
+			'description' => $this->object->description,
+			'parent_id'   => 'email',
+		);
+		return $groups;
+	}
+
+	/**
+	 * Registers all of the setting form fields for emails to each email type's group.
+	 *
+	 * @since  3.0.0
+	 * @param  array $settings Existing registered settings.
+	 * @return array
+	 */
+	public function register_email_settings( $settings ) {
+		foreach ( $this->object->form_fields as $id => $setting ) {
+			$setting['id']         = $id;
+			$setting['option_key'] = array( $this->object->get_option_key(), $id );
+			$new_setting      = $this->register_setting( $setting );
+			if ( $new_setting ) {
+				$settings[] = $new_setting;
+			}
+		}
+		return $settings;
+	}
+
+	/**
+	 * Registers a setting group, based on admin page ID & label as parent group.
+	 *
+	 * @since  3.0.0
+	 * @param  array $groups Array of previously registered groups.
+	 * @return array
+	 */
+	public function register_page_group( $groups ) {
+		$groups[] = array(
+			'id'    => $this->object->get_id(),
+			'label' => $this->object->get_label(),
+		);
+		return $groups;
+	}
+
+	/**
+	 * Registers settings to a specific group.
+	 *
+	 * @since  3.0.0
+	 * @param  array $settings Existing registered settings
+	 * @return array
+	 */
+	public function register_page_settings( $settings ) {
+		/**
+		 * wp-admin settings can be broken down into separate sections from
+		 * a UI standpoint. This will grab all the sections associated with
+		 * a particular setting group (like 'products') and register them
+		 * to the REST API.
+		 */
+		$sections = $this->object->get_sections();
+		if ( empty( $sections ) ) {
+			// Default section is just an empty string, per admin page classes
+			$sections = array( '' );
+		}
+
+		foreach ( $sections as $section => $section_label ) {
+			$settings_from_section = $this->object->get_settings( $section );
+			foreach ( $settings_from_section as $setting ) {
+				if ( ! isset( $setting['id'] ) ) {
+					continue;
+				}
+				$setting['option_key'] = $setting['id'];
+				$new_setting           = $this->register_setting( $setting );
+				if ( $new_setting ) {
+					$settings[] = $new_setting;
+				}
+			}
+		}
+		return $settings;
+	}
+
+	/**
+	 * Register a setting into the format expected for the Settings REST API.
+	 *
+	 * @since 3.0.0
+	 * @param  array $setting
+	 * @return array|bool
+	 */
+	public function register_setting( $setting ) {
+		if ( ! isset( $setting['id'] ) ) {
+			return false;
+		}
+
+		$description = '';
+		if ( ! empty( $setting['desc'] ) ) {
+			$description = $setting['desc'];
+		} elseif ( ! empty( $setting['description'] ) ) {
+			$description = $setting['description'];
+		}
+
+		$new_setting = array(
+			'id'          => $setting['id'],
+			'label'       => ( ! empty( $setting['title'] ) ? $setting['title'] : '' ),
+			'description' => $description,
+			'type'        => $setting['type'],
+			'option_key'  => $setting['option_key'],
+		);
+
+		if ( isset( $setting['default'] ) ) {
+			$new_setting['default'] = $setting['default'];
+		}
+		if ( isset( $setting['options'] ) ) {
+			$new_setting['options'] = $setting['options'];
+		}
+		if ( isset( $setting['desc_tip'] ) ) {
+			if ( true === $setting['desc_tip'] ) {
+				$new_setting['tip'] = $description;
+			} elseif ( ! empty( $setting['desc_tip'] ) ) {
+				$new_setting['tip'] = $setting['desc_tip'];
+			}
+		}
+
+		return $new_setting;
+	}
+
+}
diff --git a/includes/class-wc-session-handler.php b/includes/class-wc-session-handler.php
index fc286efa5b6..255d92159b3 100644
--- a/includes/class-wc-session-handler.php
+++ b/includes/class-wc-session-handler.php
@@ -52,7 +52,6 @@ class WC_Session_Handler extends WC_Session {
 				$this->set_session_expiration();
 				$this->update_session_timestamp( $this->_customer_id, $this->_session_expiration );
 			}
-
 		} else {
 			$this->set_session_expiration();
 			$this->_customer_id = $this->generate_customer_id();
@@ -66,7 +65,6 @@ class WC_Session_Handler extends WC_Session {
 		add_action( 'shutdown', array( $this, 'save_data' ), 20 );
 		add_action( 'wp_logout', array( $this, 'destroy_session' ) );
 		if ( ! is_user_logged_in() ) {
-			add_action( 'woocommerce_thankyou', array( $this, 'destroy_session' ) );
 			add_filter( 'nonce_user_logged_out', array( $this, 'nonce_user_logged_out' ) );
 		}
 	}
@@ -119,7 +117,7 @@ class WC_Session_Handler extends WC_Session {
 		if ( is_user_logged_in() ) {
 			return get_current_user_id();
 		} else {
-			require_once( ABSPATH . 'wp-includes/class-phpass.php');
+			require_once( ABSPATH . 'wp-includes/class-phpass.php' );
 			$hasher = new PasswordHash( 8, false );
 			return md5( $hasher->get_random_bytes( 32 ) );
 		}
@@ -131,7 +129,7 @@ class WC_Session_Handler extends WC_Session {
 	 * @return bool|array
 	 */
 	public function get_session_cookie() {
-		if ( empty( $_COOKIE[ $this->_cookie ] ) ) {
+		if ( empty( $_COOKIE[ $this->_cookie ] ) || ! is_string( $_COOKIE[ $this->_cookie ] ) ) {
 			return false;
 		}
 
@@ -141,7 +139,7 @@ class WC_Session_Handler extends WC_Session {
 		$to_hash = $customer_id . '|' . $session_expiration;
 		$hash    = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
 
-		if ( ! hash_equals( $hash, $cookie_hash ) ) {
+		if ( empty( $cookie_hash ) || ! hash_equals( $hash, $cookie_hash ) ) {
 			return false;
 		}
 
@@ -174,39 +172,19 @@ class WC_Session_Handler extends WC_Session {
 		if ( $this->_dirty && $this->has_session() ) {
 			global $wpdb;
 
-			$session_id = $wpdb->get_var( $wpdb->prepare( "SELECT session_id FROM $this->_table WHERE session_key = %s;", $this->_customer_id ) );
-
-			if ( $session_id ) {
-				$wpdb->update(
-					$this->_table,
-					array(
-						'session_key'    => $this->_customer_id,
-						'session_value'  => maybe_serialize( $this->_data ),
-						'session_expiry' => $this->_session_expiration
-					),
-					array( 'session_id' => $session_id ),
-					array(
-						'%s',
-						'%s',
-						'%d'
-					),
-					array( '%d' )
-				);
-			} else {
-				$wpdb->insert(
-					$this->_table,
-					array(
-						'session_key'    => $this->_customer_id,
-						'session_value'  => maybe_serialize( $this->_data ),
-						'session_expiry' => $this->_session_expiration
-					),
-					array(
-						'%s',
-						'%s',
-						'%d'
-					)
-				);
-			}
+			$wpdb->replace(
+				$this->_table,
+				array(
+					'session_key' => $this->_customer_id,
+					'session_value' => maybe_serialize( $this->_data ),
+					'session_expiry' => $this->_session_expiration,
+				),
+				array(
+					'%s',
+					'%s',
+					'%d',
+				)
+			);
 
 			// Set cache
 			wp_cache_set( $this->get_cache_prefix() . $this->_customer_id, $this->_data, WC_SESSION_CACHE_GROUP, $this->_session_expiration - time() );
@@ -302,7 +280,7 @@ class WC_Session_Handler extends WC_Session {
 		$wpdb->delete(
 			$this->_table,
 			array(
-				'session_key' => $customer_id
+				'session_key' => $customer_id,
 			)
 		);
 	}
@@ -319,10 +297,10 @@ class WC_Session_Handler extends WC_Session {
 		$wpdb->update(
 			$this->_table,
 			array(
-				'session_expiry' => $timestamp
+				'session_expiry' => $timestamp,
 			),
 			array(
-				'session_key' => $customer_id
+				'session_key' => $customer_id,
 			),
 			array(
 				'%d'
diff --git a/includes/class-wc-shipping-rate.php b/includes/class-wc-shipping-rate.php
index ae0a87e8f7b..c7037928594 100644
--- a/includes/class-wc-shipping-rate.php
+++ b/includes/class-wc-shipping-rate.php
@@ -10,7 +10,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  * Simple Class for storing rates.
  *
  * @class 		WC_Shipping_Rate
- * @version		2.3.0
+ * @version		2.6.0
  * @package		WooCommerce/Classes/Shipping
  * @category	Class
  * @author 		WooThemes
@@ -32,34 +32,37 @@ class WC_Shipping_Rate {
 	/** @var string Label for the rate. */
 	public $method_id = '';
 
+	/**
+	 * Stores meta data for this rate
+	 * @since 2.6.0
+	 * @var array
+	 */
+	private $meta_data = array();
+
 	/**
 	 * Constructor.
 	 *
 	 * @param string $id
 	 * @param string $label
-	 * @param float $cost
+	 * @param integer $cost
 	 * @param array $taxes
 	 * @param string $method_id
 	 */
-	public function __construct( $id, $label, $cost, $taxes, $method_id ) {
-		$this->id 			= $id;
-		$this->label 		= $label;
-		$this->cost 		= $cost;
-		$this->taxes 		= $taxes ? $taxes : array();
-		$this->method_id 	= $method_id;
+	public function __construct( $id = '', $label = '', $cost = 0, $taxes = array(), $method_id = '' ) {
+		$this->id        = $id;
+		$this->label     = $label;
+		$this->cost      = $cost;
+		$this->taxes     = ! empty( $taxes ) && is_array( $taxes ) ? $taxes : array();
+		$this->method_id = $method_id;
 	}
 
 	/**
-	 * get_shipping_tax function.
+	 * Get shipping tax.
 	 *
 	 * @return array
 	 */
 	public function get_shipping_tax() {
-		$taxes = 0;
-		if ( $this->taxes && sizeof( $this->taxes ) > 0 && ! WC()->customer->is_vat_exempt() ) {
-			$taxes = array_sum( $this->taxes );
-		}
-		return apply_filters( 'woocommerce_get_shipping_tax', $taxes, $this );
+		return apply_filters( 'woocommerce_get_shipping_tax', sizeof( $this->taxes ) > 0 && ! WC()->customer->get_is_vat_exempt() ? array_sum( $this->taxes ) : 0, $this );
 	}
 
 	/**
@@ -68,6 +71,24 @@ class WC_Shipping_Rate {
 	 * @return string
 	 */
 	public function get_label() {
-		return apply_filters( 'woocommerce_shipping_rate_label', $this->label );
+		return apply_filters( 'woocommerce_shipping_rate_label', $this->label, $this );
+	}
+
+	/**
+	 * Add some meta data for this rate.
+	 * @since 2.6.0
+	 * @param string $key
+	 * @param string $value
+	 */
+	public function add_meta_data( $key, $value ) {
+		$this->meta_data[ wc_clean( $key ) ] = wc_clean( $value );
+	}
+
+	/**
+	 * Get all meta data for this rate.
+	 * @since 2.6.0
+	 */
+	public function get_meta_data() {
+		return $this->meta_data;
 	}
 }
diff --git a/includes/class-wc-shipping-zone.php b/includes/class-wc-shipping-zone.php
new file mode 100644
index 00000000000..bcc406770e1
--- /dev/null
+++ b/includes/class-wc-shipping-zone.php
@@ -0,0 +1,428 @@
+<?php
+include_once( 'legacy/class-wc-legacy-shipping-zone.php' );
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Represents a single shipping zone
+ *
+ * @class 		WC_Shipping_Zone
+ * @since		2.6.0
+ * @version		3.0.0
+ * @package		WooCommerce/Classes
+ * @category	Class
+ * @author 		WooCommerce
+ */
+class WC_Shipping_Zone extends WC_Legacy_Shipping_Zone {
+
+	/**
+	 * Zone ID
+	 * @var int|null
+	 */
+	protected $id = null;
+
+	/**
+	 * This is the name of this object type.
+	 * @var string
+	 */
+	protected $object_type = 'shipping_zone';
+
+	/**
+	 * Zone Data
+	 * @var array
+	 */
+	protected $data = array(
+		'zone_name'      => '',
+		'zone_order'     => 0,
+		'zone_locations' => array(),
+	);
+
+	/**
+	 * Constructor for zones.
+	 *
+	 * @param int|object $zone Zone ID to load from the DB or zone object.
+	 */
+	public function __construct( $zone = null ) {
+		if ( is_numeric( $zone ) && ! empty( $zone ) ) {
+			$this->set_id( $zone );
+		} elseif ( is_object( $zone ) ) {
+			$this->set_id( $zone->zone_id );
+		} elseif ( 0 === $zone || "0" === $zone ) {
+			$this->set_id( 0 );
+		} else {
+			$this->set_object_read( true );
+		}
+
+		$this->data_store = WC_Data_Store::load( 'shipping-zone' );
+		if ( false === $this->get_object_read() ) {
+			$this->data_store->read( $this );
+		}
+	}
+
+	/*
+	 |--------------------------------------------------------------------------
+	 | Getters
+	 |--------------------------------------------------------------------------
+	 */
+
+	/**
+	 * Get zone name.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_zone_name( $context = 'view' ) {
+		return $this->get_prop( 'zone_name', $context );
+	}
+
+	/**
+	 * Get zone order.
+	 *
+	 * @param  string $context
+	 * @return int
+	 */
+	public function get_zone_order( $context = 'view' ) {
+		return $this->get_prop( 'zone_order', $context );
+	}
+
+	/**
+	 * Get zone locations.
+	 *
+	 * @param  string $context
+	 * @return array of zone objects
+	 */
+	public function get_zone_locations( $context = 'view' ) {
+		return $this->get_prop( 'zone_locations', $context );
+	}
+
+	/**
+	 * Return a text string representing what this zone is for.
+	 *
+	 * @param  int $max
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_formatted_location( $max = 10, $context = 'view' ) {
+		$location_parts = array();
+		$all_continents = WC()->countries->get_continents();
+		$all_countries  = WC()->countries->get_countries();
+		$all_states     = WC()->countries->get_states();
+		$locations      = $this->get_zone_locations( $context );
+		$continents     = array_filter( $locations, array( $this, 'location_is_continent' ) );
+		$countries      = array_filter( $locations, array( $this, 'location_is_country' ) );
+		$states         = array_filter( $locations, array( $this, 'location_is_state' ) );
+		$postcodes      = array_filter( $locations, array( $this, 'location_is_postcode' ) );
+
+		foreach ( $continents as $location ) {
+			$location_parts[] = $all_continents[ $location->code ]['name'];
+		}
+
+		foreach ( $countries as $location ) {
+			$location_parts[] = $all_countries[ $location->code ];
+		}
+
+		foreach ( $states as $location ) {
+			$location_codes = explode( ':', $location->code );
+			$location_parts[] = $all_states[ $location_codes[0] ][ $location_codes[1] ];
+		}
+
+		foreach ( $postcodes as $location ) {
+			$location_parts[] = $location->code;
+		}
+
+		// Fix display of encoded characters.
+		$location_parts = array_map( 'html_entity_decode', $location_parts );
+
+		if ( sizeof( $location_parts ) > $max ) {
+			$remaining = sizeof( $location_parts ) - $max;
+			// @codingStandardsIgnoreStart
+			return sprintf( _n( '%s and %d other region', '%s and %d other regions', $remaining, 'woocommerce' ), implode( ', ', array_splice( $location_parts, 0, $max ) ), $remaining );
+			// @codingStandardsIgnoreEnd
+		} elseif ( ! empty( $location_parts ) ) {
+			return implode( ', ', $location_parts );
+		} else {
+			return __( 'Everywhere', 'woocommerce' );
+		}
+	}
+
+	/**
+	 * Get shipping methods linked to this zone.
+	 *
+	 * @param bool Only return enabled methods.
+	 * @return array of objects
+	 */
+	public function get_shipping_methods( $enabled_only = false ) {
+		if ( null === $this->get_id() ) {
+			return array();
+		}
+
+		$raw_methods     = $this->data_store->get_methods( $this->get_id(), $enabled_only );
+		$wc_shipping     = WC_Shipping::instance();
+		$allowed_classes = $wc_shipping->get_shipping_method_class_names();
+		$methods         = array();
+
+		foreach ( $raw_methods as $raw_method ) {
+			if ( in_array( $raw_method->method_id, array_keys( $allowed_classes ), true ) ) {
+				$class_name = $allowed_classes[ $raw_method->method_id ];
+
+				// The returned array may contain instances of shipping methods, as well
+				// as classes. If the "class" is an instance, just use it. If not,
+				// create an instance.
+				if ( is_object( $class_name ) ) {
+					$class_name_of_instance = get_class( $class_name );
+					$methods[ $raw_method->instance_id ] = new $class_name_of_instance( $raw_method->instance_id );
+				} else {
+					// If the class is not an object, it should be a string. It's better
+					// to double check, to be sure (a class must be a string, anything)
+					// else would be useless
+					if ( is_string( $class_name ) && class_exists( $class_name ) ) {
+						$methods[ $raw_method->instance_id ] = new $class_name( $raw_method->instance_id );
+					}
+				}
+
+				// Let's make sure that we have an instance before setting its attributes
+				if ( is_object( $methods[ $raw_method->instance_id ] ) ) {
+					$methods[ $raw_method->instance_id ]->method_order       = absint( $raw_method->method_order );
+					$methods[ $raw_method->instance_id ]->enabled            = $raw_method->is_enabled ? 'yes' : 'no';
+					$methods[ $raw_method->instance_id ]->has_settings       = $methods[ $raw_method->instance_id ]->has_settings();
+					$methods[ $raw_method->instance_id ]->settings_html      = $methods[ $raw_method->instance_id ]->supports( 'instance-settings-modal' ) ? $methods[ $raw_method->instance_id ]->get_admin_options_html() : false;
+					$methods[ $raw_method->instance_id ]->method_description = wp_kses_post( wpautop( $methods[ $raw_method->instance_id ]->method_description ) );
+				}
+			}
+		}
+
+		uasort( $methods, 'wc_shipping_zone_method_order_uasort_comparison' );
+
+		return apply_filters( 'woocommerce_shipping_zone_shipping_methods', $methods, $raw_methods, $allowed_classes, $this );
+	}
+
+	/*
+	 |--------------------------------------------------------------------------
+	 | Setters
+	 |--------------------------------------------------------------------------
+	 */
+
+	/**
+	 * Set zone name.
+	 *
+	 * @param string $set
+	 */
+	public function set_zone_name( $set ) {
+		$this->set_prop( 'zone_name', wc_clean( $set ) );
+	}
+
+	/**
+	 * Set zone order.
+	 *
+	 * @param int $set
+	 */
+	public function set_zone_order( $set ) {
+		$this->set_prop( 'zone_order', absint( $set ) );
+	}
+
+	/**
+	 * Set zone locations.
+	 *
+	 * @since 3.0.0
+	 * @param array
+	 */
+	public function set_zone_locations( $locations ) {
+		$this->set_prop( 'zone_locations', $locations );
+	}
+
+	/*
+	 |--------------------------------------------------------------------------
+	 | Other Methods
+	 |--------------------------------------------------------------------------
+	 */
+
+	/**
+	 * Save zone data to the database.
+	 *
+	 * @return int
+	 */
+	public function save() {
+		if ( ! $this->get_zone_name() ) {
+			$this->set_zone_name( $this->generate_zone_name() );
+		}
+		if ( $this->data_store ) {
+			// Trigger action before saving to the DB. Allows you to adjust object props before save.
+			do_action( 'woocommerce_before_' . $this->object_type . '_object_save', $this, $this->data_store );
+
+			if ( null === $this->get_id() ) {
+				$this->data_store->create( $this );
+			} else {
+				$this->data_store->update( $this );
+			}
+			return $this->get_id();
+		}
+	}
+
+	/**
+	 * Generate a zone name based on location.
+	 *
+	 * @return string
+	 */
+	protected function generate_zone_name() {
+		$zone_name = $this->get_formatted_location();
+
+		if ( empty( $zone_name ) ) {
+			$zone_name = __( 'Zone', 'woocommerce' );
+		}
+
+		return $zone_name;
+	}
+
+	/**
+	 * Location type detection.
+	 *
+	 * @param  object  $location
+	 * @return boolean
+	 */
+	private function location_is_continent( $location ) {
+		return 'continent' === $location->type;
+	}
+
+	/**
+	 * Location type detection.
+	 *
+	 * @param  object  $location
+	 * @return boolean
+	 */
+	private function location_is_country( $location ) {
+		return 'country' === $location->type;
+	}
+
+	/**
+	 * Location type detection.
+	 *
+	 * @param  object  $location
+	 * @return boolean
+	 */
+	private function location_is_state( $location ) {
+		return 'state' === $location->type;
+	}
+
+	/**
+	 * Location type detection.
+	 *
+	 * @param  object  $location
+	 * @return boolean
+	 */
+	private function location_is_postcode( $location ) {
+		return 'postcode' === $location->type;
+	}
+
+	/**
+	 * Is passed location type valid?
+	 *
+	 * @param  string  $type
+	 * @return boolean
+	 */
+	public function is_valid_location_type( $type ) {
+		return in_array( $type, array( 'postcode', 'state', 'country', 'continent' ) );
+	}
+
+	/**
+	 * Add location (state or postcode) to a zone.
+	 *
+	 * @param string $code
+	 * @param string $type state or postcode
+	 */
+	public function add_location( $code, $type ) {
+		if ( $this->is_valid_location_type( $type ) ) {
+			if ( 'postcode' === $type ) {
+				$code = trim( strtoupper( str_replace( chr( 226 ) . chr( 128 ) . chr( 166 ), '...', $code ) ) ); // No normalization - postcodes are matched against both normal and formatted versions to support wildcards.
+			}
+			$location = array(
+				'code' => wc_clean( $code ),
+				'type' => wc_clean( $type ),
+			);
+			$zone_locations = $this->get_prop( 'zone_locations', 'edit' );
+			$zone_locations[] = (object) $location;
+			$this->set_prop( 'zone_locations', $zone_locations );
+		}
+	}
+
+
+	/**
+	 * Clear all locations for this zone.
+	 *
+	 * @param array|string $types of location to clear
+	 */
+	public function clear_locations( $types = array( 'postcode', 'state', 'country', 'continent' ) ) {
+		if ( ! is_array( $types ) ) {
+			$types = array( $types );
+		}
+		$zone_locations = $this->get_prop( 'zone_locations', 'edit' );
+		foreach ( $zone_locations as $key => $values ) {
+			if ( in_array( $values->type, $types ) ) {
+				unset( $zone_locations[ $key ] );
+			}
+		}
+		$zone_locations = array_values( $zone_locations ); // reindex.
+		$this->set_prop( 'zone_locations', $zone_locations );
+	}
+
+	/**
+	 * Set locations.
+	 *
+	 * @param array $locations Array of locations
+	 */
+	public function set_locations( $locations = array() ) {
+		$this->clear_locations();
+		foreach ( $locations as $location ) {
+			$this->add_location( $location['code'], $location['type'] );
+		}
+	}
+
+	/**
+	 * Add a shipping method to this zone.
+	 *
+	 * @param string $type shipping method type
+	 * @return int new instance_id, 0 on failure
+	 */
+	public function add_shipping_method( $type ) {
+		if ( null === $this->get_id() ) {
+			$this->save();
+		}
+
+		$instance_id     = 0;
+		$wc_shipping     = WC_Shipping::instance();
+		$allowed_classes = $wc_shipping->get_shipping_method_class_names();
+		$count           = $this->data_store->get_method_count( $this->get_id() );
+
+		if ( in_array( $type, array_keys( $allowed_classes ) ) ) {
+			$instance_id = $this->data_store->add_method( $this->get_id(), $type, $count + 1 );
+		}
+
+		if ( $instance_id ) {
+			do_action( 'woocommerce_shipping_zone_method_added', $instance_id, $type, $this->get_id() );
+		}
+
+		WC_Cache_Helper::get_transient_version( 'shipping', true );
+
+		return $instance_id;
+	}
+
+	/**
+	 * Delete a shipping method from a zone.
+	 *
+	 * @param int $instance_id
+	 * @return True on success, false on failure
+	 */
+	public function delete_shipping_method( $instance_id ) {
+		if ( null === $this->get_id() ) {
+			return false;
+		}
+
+		$this->data_store->delete_method( $instance_id );
+		do_action( 'woocommerce_shipping_zone_method_deleted', $instance_id, $this->get_id() );
+
+		WC_Cache_Helper::get_transient_version( 'shipping', true );
+
+		return true;
+	}
+}
diff --git a/includes/class-wc-shipping-zones.php b/includes/class-wc-shipping-zones.php
new file mode 100644
index 00000000000..54a30e407ed
--- /dev/null
+++ b/includes/class-wc-shipping-zones.php
@@ -0,0 +1,133 @@
+<?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Handles storage and retrieval of shipping zones
+ *
+ * @class 		WC_Shipping_Zones
+ * @since 		2.6.0
+ * @version		3.0.0
+ * @package		WooCommerce/Classes
+ * @category	Class
+ * @author 		WooCommerce
+ */
+class WC_Shipping_Zones {
+
+	/**
+	 * Get shipping zones from the database
+	 * @since 2.6.0
+	 * @return array of arrays
+	 */
+	public static function get_zones() {
+		$data_store = WC_Data_Store::load( 'shipping-zone' );
+		$raw_zones  = $data_store->get_zones();
+		$zones      = array();
+
+		foreach ( $raw_zones as $raw_zone ) {
+			$zone                                                     = new WC_Shipping_Zone( $raw_zone );
+			$zones[ $zone->get_id() ]                            = $zone->get_data();
+			$zones[ $zone->get_id() ]['zone_id']                 = $zone->get_id();
+			$zones[ $zone->get_id() ]['formatted_zone_location'] = $zone->get_formatted_location();
+			$zones[ $zone->get_id() ]['shipping_methods']        = $zone->get_shipping_methods();
+		}
+
+		return $zones;
+	}
+
+	/**
+	 * Get shipping zone using it's ID
+	 * @since 2.6.0
+	 * @param int $zone_id
+	 * @return WC_Shipping_Zone|bool
+	 */
+	public static function get_zone( $zone_id ) {
+		return self::get_zone_by( 'zone_id', $zone_id );
+	}
+
+	/**
+	 * Get shipping zone by an ID.
+	 * @since 2.6.0
+	 * @param string $by zone_id or instance_id
+	 * @param int $id
+	 * @return WC_Shipping_Zone|bool
+	 */
+	public static function get_zone_by( $by = 'zone_id', $id = 0 ) {
+		switch ( $by ) {
+			case 'zone_id' :
+				$zone_id = $id;
+			break;
+			case 'instance_id' :
+				$data_store = WC_Data_Store::load( 'shipping-zone' );
+				$zone_id    = $data_store->get_zone_id_by_instance_id( $id );
+			break;
+		}
+
+		if ( false !== $zone_id ) {
+			try {
+				return new WC_Shipping_Zone( $zone_id );
+			} catch ( Exception $e ) {
+				return false;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Get shipping zone using it's ID
+	 * @since 2.6.0
+	 * @return WC_Shipping_Meethod|bool
+	 */
+	public static function get_shipping_method( $instance_id ) {
+		$data_store          = WC_Data_Store::load( 'shipping-zone' );
+		$raw_shipping_method = $data_store->get_method( $instance_id );
+		$wc_shipping         = WC_Shipping::instance();
+		$allowed_classes     = $wc_shipping->get_shipping_method_class_names();
+
+		if ( ! empty( $raw_shipping_method ) && in_array( $raw_shipping_method->method_id, array_keys( $allowed_classes ) ) ) {
+			$class_name = $allowed_classes[ $raw_shipping_method->method_id ];
+			if ( is_object( $class_name ) ) {
+				$class_name = get_class( $class_name );
+			}
+			return new $class_name( $raw_shipping_method->instance_id );
+		}
+		return false;
+	}
+
+	/**
+	 * Delete a zone using it's ID
+	 * @param int $zone_id
+	 * @since 2.6.0
+	 */
+	public static function delete_zone( $zone_id ) {
+		$zone = new WC_Shipping_Zone( $zone_id );
+		$zone->delete();
+	}
+
+	/**
+	 * Find a matching zone for a given package.
+	 * @since  2.6.0
+	 * @uses   wc_make_numeric_postcode()
+	 * @param  object $package
+	 * @return WC_Shipping_Zone
+	 */
+	public static function get_zone_matching_package( $package ) {
+		$country          = strtoupper( wc_clean( $package['destination']['country'] ) );
+		$state            = strtoupper( wc_clean( $package['destination']['state'] ) );
+		$continent        = strtoupper( wc_clean( WC()->countries->get_continent_code_for_country( $country ) ) );
+		$postcode         = wc_normalize_postcode( wc_clean( $package['destination']['postcode'] ) );
+		$cache_key        = WC_Cache_Helper::get_cache_prefix( 'shipping_zones' ) . 'wc_shipping_zone_' . md5( sprintf( '%s+%s+%s', $country, $state, $postcode ) );
+		$matching_zone_id = wp_cache_get( $cache_key, 'shipping_zones' );
+
+		if ( false === $matching_zone_id ) {
+			$data_store       = WC_Data_Store::load( 'shipping-zone' );
+			$matching_zone_id = $data_store->get_zone_id_from_package( $package );
+			wp_cache_set( $cache_key, $matching_zone_id, 'shipping_zones' );
+		}
+
+		return new WC_Shipping_Zone( $matching_zone_id ? $matching_zone_id : 0 );
+	}
+}
diff --git a/includes/class-wc-shipping.php b/includes/class-wc-shipping.php
index e079068cbe4..c242de60d21 100644
--- a/includes/class-wc-shipping.php
+++ b/includes/class-wc-shipping.php
@@ -5,35 +5,38 @@
  * Handles shipping and loads shipping methods via hooks.
  *
  * @class 		WC_Shipping
- * @version		2.3.0
+ * @version		2.6.0
  * @package		WooCommerce/Classes/Shipping
  * @category	Class
  * @author 		WooThemes
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
+/**
+ * WC_Shipping
+ */
 class WC_Shipping {
 
 	/** @var bool True if shipping is enabled. */
-	public $enabled					= false;
+	public $enabled					 = false;
 
-	/** @var array Stores methods loaded into woocommerce. */
-	public $shipping_methods 		= array();
+	/** @var array|null Stores methods loaded into woocommerce. */
+	public $shipping_methods         = null;
 
 	/** @var float Stores the cost of shipping */
-	public $shipping_total 			= 0;
+	public $shipping_total 			 = 0;
 
-	/**  @var array Stores an array of shipping taxes. */
-	public $shipping_taxes			= array();
+	/** @var array Stores an array of shipping taxes. */
+	public $shipping_taxes			 = array();
 
 	/** @var array Stores the shipping classes. */
-	public $shipping_classes		= array();
+	public $shipping_classes		 = array();
 
 	/** @var array Stores packages to ship and to get quotes for. */
-	public $packages				= array();
+	public $packages				 = array();
 
 	/**
 	 * @var WC_Shipping The single instance of the class
@@ -51,8 +54,9 @@ class WC_Shipping {
 	 * @return WC_Shipping Main instance
 	 */
 	public static function instance() {
-		if ( is_null( self::$_instance ) )
+		if ( is_null( self::$_instance ) ) {
 			self::$_instance = new self();
+		}
 		return self::$_instance;
 	}
 
@@ -62,7 +66,7 @@ class WC_Shipping {
 	 * @since 2.1
 	 */
 	public function __clone() {
-		_doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'woocommerce' ), '2.1' );
+		wc_doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'woocommerce' ), '2.1' );
 	}
 
 	/**
@@ -71,149 +75,137 @@ class WC_Shipping {
 	 * @since 2.1
 	 */
 	public function __wakeup() {
-		_doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'woocommerce' ), '2.1' );
+		wc_doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'woocommerce' ), '2.1' );
 	}
 
 	/**
 	 * Initialize shipping.
 	 */
 	public function __construct() {
-		$this->init();
-	}
+		$this->enabled = wc_shipping_enabled();
 
-    /**
-     * init function.
-     */
-    public function init() {
-		do_action( 'woocommerce_shipping_init' );
-
-		$this->enabled = ( get_option('woocommerce_calc_shipping') == 'no' ) ? false : true;
+		if ( $this->enabled ) {
+			$this->init();
+		}
+	}
+
+	/**
+	 * Initialize shipping.
+	 */
+	public function init() {
+		do_action( 'woocommerce_shipping_init' );
+	}
+
+	/**
+	 * Shipping methods register themselves by returning their main class name through the woocommerce_shipping_methods filter.
+	 * @return array
+	 */
+	public function get_shipping_method_class_names() {
+		// Unique Method ID => Method Class name
+		$shipping_methods = array(
+			'flat_rate'     => 'WC_Shipping_Flat_Rate',
+			'free_shipping' => 'WC_Shipping_Free_Shipping',
+			'local_pickup'  => 'WC_Shipping_Local_Pickup',
+		);
+
+		// For backwards compatibility with 2.5.x we load any ENABLED legacy shipping methods here
+		$maybe_load_legacy_methods = array( 'flat_rate', 'free_shipping', 'international_delivery', 'local_delivery', 'local_pickup' );
+
+		foreach ( $maybe_load_legacy_methods as $method ) {
+			$options = get_option( 'woocommerce_' . $method . '_settings' );
+			if ( $options && isset( $options['enabled'] ) && 'yes' === $options['enabled'] ) {
+				$shipping_methods[ 'legacy_' . $method ] = 'WC_Shipping_Legacy_' . $method;
+			}
+		}
+
+		return apply_filters( 'woocommerce_shipping_methods', $shipping_methods );
 	}
 
 	/**
-	 * load_shipping_methods function.
-	 *
 	 * Loads all shipping methods which are hooked in. If a $package is passed some methods may add themselves conditionally.
 	 *
-	 * Methods are sorted into their user-defined order after being loaded.
+	 * Loads all shipping methods which are hooked in.
+	 * If a $package is passed some methods may add themselves conditionally and zones will be used.
 	 *
-	 * @access public
 	 * @param array $package
 	 * @return array
 	 */
 	public function load_shipping_methods( $package = array() ) {
+		if ( ! empty( $package ) ) {
+			$debug_mode             = 'yes' === get_option( 'woocommerce_shipping_debug_mode', 'no' );
+			$shipping_zone          = WC_Shipping_Zones::get_zone_matching_package( $package );
+			$this->shipping_methods = $shipping_zone->get_shipping_methods( true );
 
-		$this->unregister_shipping_methods();
-
-		// Methods can register themselves through this hook
-		do_action( 'woocommerce_load_shipping_methods', $package );
-
-		// Register methods through a filter
-		$shipping_methods_to_load = apply_filters( 'woocommerce_shipping_methods', array(
-			'WC_Shipping_Flat_Rate',
-			'WC_Shipping_Free_Shipping',
-			'WC_Shipping_International_Delivery',
-			'WC_Shipping_Local_Delivery',
-			'WC_Shipping_Local_Pickup'
-		) );
-
-		foreach ( $shipping_methods_to_load as $method ) {
-			$this->register_shipping_method( $method );
+			// Debug output
+			if ( $debug_mode && ! defined( 'WOOCOMMERCE_CHECKOUT' ) && ! wc_has_notice( 'Customer matched zone "' . $shipping_zone->get_zone_name() . '"' ) ) {
+				wc_add_notice( 'Customer matched zone "' . $shipping_zone->get_zone_name() . '"' );
+			}
+		} else {
+			$this->shipping_methods = array();
 		}
 
-		$this->sort_shipping_methods();
+		// For the settings in the backend, and for non-shipping zone methods, we still need to load any registered classes here.
+		foreach ( $this->get_shipping_method_class_names() as $method_id => $method_class ) {
+			$this->register_shipping_method( $method_class );
+		}
 
-		return $this->shipping_methods;
+		// Methods can register themselves manually through this hook if necessary.
+		do_action( 'woocommerce_load_shipping_methods', $package );
+
+		// Return loaded methods
+		return $this->get_shipping_methods();
 	}
 
 	/**
-	 * Register a shipping method for use in calculations.
+	 * Register a shipping method.
 	 *
-	 * @param object|string $method Either the name of the method's class, or an instance of the method's class
+	 * @param object|string $method Either the name of the method's class, or an instance of the method's class.
 	 */
 	public function register_shipping_method( $method ) {
 		if ( ! is_object( $method ) ) {
+			if ( ! class_exists( $method ) ) {
+				return false;
+			}
 			$method = new $method();
 		}
-
-		$id = empty( $method->instance_id ) ? $method->id : $method->instance_id;
-
-		$this->shipping_methods[ $id ] = $method;
+		if ( is_null( $this->shipping_methods ) ) {
+			$this->shipping_methods = array();
+		}
+		$this->shipping_methods[ $method->id ] = $method;
 	}
 
 	/**
 	 * Unregister shipping methods.
 	 */
 	public function unregister_shipping_methods() {
-		$this->shipping_methods = array();
+		$this->shipping_methods = null;
 	}
 
 	/**
-	 * Sort shipping methods.
-	 *
-	 * Sorts shipping methods into the user defined order.
-	 *
-	 * @return array
-	 */
-	public function sort_shipping_methods() {
-
-		$sorted_shipping_methods = array();
-
-		// Get order option
-		$ordering 	= (array) get_option('woocommerce_shipping_method_order');
-		$order_end 	= 999;
-
-		// Load shipping methods in order
-		foreach ( $this->shipping_methods as $method ) {
-
-			if ( isset( $ordering[ $method->id ] ) && is_numeric( $ordering[ $method->id ] ) ) {
-				// Add in position
-				$sorted_shipping_methods[ $ordering[ $method->id ] ][] = $method;
-			} else {
-				// Add to end of the array
-				$sorted_shipping_methods[ $order_end ][] = $method;
-			}
-		}
-
-		ksort( $sorted_shipping_methods );
-
-		$this->shipping_methods = array();
-
-		foreach ( $sorted_shipping_methods as $methods )
-			foreach ( $methods as $method ) {
-				$id = empty( $method->instance_id ) ? $method->id : $method->instance_id;
-				$this->shipping_methods[ $id ] = $method;
-			}
-
-		return $this->shipping_methods;
-	}
-
-	/**
-	 * get_shipping_methods function.
-	 *
 	 * Returns all registered shipping methods for usage.
 	 *
 	 * @access public
 	 * @return array
 	 */
 	public function get_shipping_methods() {
+		if ( is_null( $this->shipping_methods ) ) {
+			$this->load_shipping_methods();
+		}
 		return $this->shipping_methods;
 	}
 
 	/**
-	 * get_shipping_classes function.
-	 *
-	 * Load shipping classes taxonomy terms.
+	 * Get an array of shipping classes.
 	 *
 	 * @access public
 	 * @return array
 	 */
 	public function get_shipping_classes() {
 		if ( empty( $this->shipping_classes ) ) {
-			$classes                = get_terms( 'product_shipping_class', array( 'hide_empty' => '0' ) );
-			$this->shipping_classes = $classes && ! is_wp_error( $classes ) ? $classes : array();
+			$classes                = get_terms( 'product_shipping_class', array( 'hide_empty' => '0', 'orderby' => 'name' ) );
+			$this->shipping_classes = ! is_wp_error( $classes ) ? $classes : array();
 		}
-		return $this->shipping_classes;
+		return apply_filters( 'woocommerce_get_shipping_classes', $this->shipping_classes );
 	}
 
 	/**
@@ -223,52 +215,30 @@ class WC_Shipping {
 	 * @return string
 	 */
 	private function get_default_method( $available_methods, $current_chosen_method = false ) {
-		$selection_priority = get_option( 'woocommerce_shipping_method_selection_priority', array() );
-
 		if ( ! empty( $available_methods ) ) {
-
-			// Is a method already chosen?
-			if ( ! empty( $current_chosen_method ) && ! isset( $available_methods[ $current_chosen_method ] ) ) {
-				foreach ( $available_methods as $method_key => $method ) {
-					if ( strpos( $method->id, $current_chosen_method ) === 0 ) {
-						return $method->id;
+			if ( ! empty( $current_chosen_method ) ) {
+				if ( isset( $available_methods[ $current_chosen_method ] ) ) {
+					return $available_methods[ $current_chosen_method ]->id;
+				} else {
+					foreach ( $available_methods as $method_key => $method ) {
+						if ( strpos( $method->id, $current_chosen_method ) === 0 ) {
+							return $method->id;
+						}
 					}
 				}
 			}
-
-			// Order by priorities and costs
-			$prioritized_methods = array();
-
-			foreach ( $available_methods as $method_key => $method ) {
-				// Some IDs contain : if they have multiple rates so use $method->method_id
-				$priority  = isset( $selection_priority[ $method->method_id ] ) ? absint( $selection_priority[ $method->method_id ] ): 1;
-
-				if ( empty( $prioritized_methods[ $priority ] ) ) {
-					$prioritized_methods[ $priority ] = array();
-				}
-
-				$prioritized_methods[ $priority ][ $method_key ] = $method->cost;
-			}
-
-			ksort( $prioritized_methods );
-			$prioritized_methods = current( $prioritized_methods );
-			asort( $prioritized_methods );
-
-			return current( array_keys( $prioritized_methods ) );
+			return current( $available_methods )->id;
 		}
-
-		return false;
+		return '';
 	}
 
 	/**
-	 * calculate_shipping function.
-	 *
 	 * Calculate shipping for (multiple) packages of cart items.
 	 *
 	 * @param array $packages multi-dimensional array of cart items to calc shipping for
 	 */
 	public function calculate_shipping( $packages = array() ) {
-		$this->shipping_total = null;
+		$this->shipping_total = 0;
 		$this->shipping_taxes = array();
 		$this->packages       = array();
 
@@ -277,11 +247,25 @@ class WC_Shipping {
 		}
 
 		// Calculate costs for passed packages
-		$package_keys 		= array_keys( $packages );
-		$package_keys_size 	= sizeof( $package_keys );
+		foreach ( $packages as $package_key => $package ) {
+			$this->packages[ $package_key ] = $this->calculate_shipping_for_package( $package, $package_key );
+		}
 
-		for ( $i = 0; $i < $package_keys_size; $i ++ ) {
-			$this->packages[ $package_keys[ $i ] ] = $this->calculate_shipping_for_package( $packages[ $package_keys[ $i ] ] );
+		/**
+		 * Allow packages to be reorganized after calculate the shipping.
+		 *
+		 * This filter can be used to apply some extra manipulation after the shipping costs are calculated for the packages
+		 * but before Woocommerce does anything with them. A good example of usage is to merge the shipping methods for multiple
+		 * packages for marketplaces.
+		 *
+		 * @since 2.6.0
+		 *
+		 * @param array $packages The array of packages after shipping costs are calculated.
+		 */
+		$this->packages = apply_filters( 'woocommerce_shipping_packages', $this->packages );
+
+		if ( ! is_array( $this->packages ) || empty( $this->packages ) ) {
+			return;
 		}
 
 		// Get all chosen methods
@@ -298,32 +282,29 @@ class WC_Shipping {
 			}
 
 			if ( ! empty( $method_counts[ $i ] ) ) {
-				$method_count = $method_counts[ $i ];
+				$method_count = absint( $method_counts[ $i ] );
 			}
 
-			// Get available methods for package
-			$available_methods = $package['rates'];
-
-			if ( sizeof( $available_methods ) > 0 ) {
+			if ( sizeof( $package['rates'] ) > 0 ) {
 
 				// If not set, not available, or available methods have changed, set to the DEFAULT option
-				if ( empty( $chosen_method ) || ! isset( $available_methods[ $chosen_method ] ) || $method_count != sizeof( $available_methods ) ) {
-					$chosen_method        = apply_filters( 'woocommerce_shipping_chosen_method', $this->get_default_method( $available_methods, $chosen_method ), $available_methods );
+				if ( empty( $chosen_method ) || ! isset( $package['rates'][ $chosen_method ] ) || sizeof( $package['rates'] ) !== $method_count ) {
+					$chosen_method        = apply_filters( 'woocommerce_shipping_chosen_method', $this->get_default_method( $package['rates'], false ), $package['rates'], $chosen_method );
 					$chosen_methods[ $i ] = $chosen_method;
-					$method_counts[ $i ]  = sizeof( $available_methods );
+					$method_counts[ $i ]  = sizeof( $package['rates'] );
 					do_action( 'woocommerce_shipping_method_chosen', $chosen_method );
 				}
 
 				// Store total costs
-				if ( $chosen_method ) {
-					$rate = $available_methods[ $chosen_method ];
+				if ( $chosen_method && isset( $package['rates'][ $chosen_method ] ) ) {
+					$rate = $package['rates'][ $chosen_method ];
 
 					// Merge cost and taxes - label and ID will be the same
 					$this->shipping_total += $rate->cost;
 
 					if ( ! empty( $rate->taxes ) && is_array( $rate->taxes ) ) {
 						foreach ( array_keys( $this->shipping_taxes + $rate->taxes ) as $key ) {
-							$this->shipping_taxes[ $key ] = ( isset( $rate->taxes[$key] ) ? $rate->taxes[$key] : 0 ) + ( isset( $this->shipping_taxes[$key] ) ? $this->shipping_taxes[$key] : 0 );
+							$this->shipping_taxes[ $key ] = ( isset( $rate->taxes[ $key ] ) ? $rate->taxes[ $key ] : 0 ) + ( isset( $this->shipping_taxes[ $key ] ) ? $this->shipping_taxes[ $key ] : 0 );
 						}
 					}
 				}
@@ -335,43 +316,50 @@ class WC_Shipping {
 		WC()->session->set( 'shipping_method_counts', $method_counts );
 	}
 
+	/**
+	 * See if package is shippable.
+	 * @param  array  $package
+	 * @return boolean
+	 */
+	protected function is_package_shippable( $package ) {
+		$allowed = array_keys( WC()->countries->get_shipping_countries() );
+		return in_array( $package['destination']['country'], $allowed );
+	}
+
 	/**
 	 * Calculate shipping rates for a package,
 	 *
 	 * Calculates each shipping methods cost. Rates are stored in the session based on the package hash to avoid re-calculation every page load.
 	 *
 	 * @param array $package cart items
+	 * @param int   $package_key Index of the package being calculated. Used to cache multiple package rates.
 	 * @return array
 	 */
-	public function calculate_shipping_for_package( $package = array() ) {
-		if ( ! $this->enabled || ! $package ) {
+	public function calculate_shipping_for_package( $package = array(), $package_key = 0 ) {
+		if ( ! $this->enabled || empty( $package ) || ! $this->is_package_shippable( $package ) ) {
 			return false;
 		}
 
 		// Check if we need to recalculate shipping for this package
-		$package_hash   = 'wc_ship_' . md5( json_encode( $package ) . WC_Cache_Helper::get_transient_version( 'shipping' ) );
-		$status_options = get_option( 'woocommerce_status_options', array() );
-		$stored_rates   = WC()->session->get( 'shipping_for_package' );
+		$package_to_hash = $package;
 
-		if ( ! is_array( $stored_rates ) || $package_hash !== $stored_rates['package_hash'] || ! empty( $status_options['shipping_debug_mode'] ) ) {
+		// Remove data objects so hashes are consistent
+		foreach ( $package_to_hash['contents'] as $item_id => $item ) {
+			unset( $package_to_hash['contents'][ $item_id ]['data'] );
+		}
+
+		$package_hash = 'wc_ship_' . md5( json_encode( $package_to_hash ) . WC_Cache_Helper::get_transient_version( 'shipping' ) );
+		$session_key  = 'shipping_for_package_' . $package_key;
+		$stored_rates = WC()->session->get( $session_key );
+
+		if ( ! is_array( $stored_rates ) || $package_hash !== $stored_rates['package_hash'] || 'yes' === get_option( 'woocommerce_shipping_debug_mode', 'no' ) ) {
 			// Calculate shipping method rates
 			$package['rates'] = array();
 
 			foreach ( $this->load_shipping_methods( $package ) as $shipping_method ) {
-				if ( $shipping_method->is_available( $package ) && ( empty( $package['ship_via'] ) || in_array( $shipping_method->id, $package['ship_via'] ) ) ) {
-
-					// Reset Rates
-					$shipping_method->rates = array();
-
-					// Calculate Shipping for package
-					$shipping_method->calculate_shipping( $package );
-
-					// Place rates in package array
-					if ( ! empty( $shipping_method->rates ) && is_array( $shipping_method->rates ) ) {
-						foreach ( $shipping_method->rates as $rate ) {
-							$package['rates'][ $rate->id ] = $rate;
-						}
-					}
+				// Shipping instances need an ID
+				if ( ! $shipping_method->supports( 'shipping-zones' ) || $shipping_method->get_instance_id() ) {
+					$package['rates'] = $package['rates'] + $shipping_method->get_rates_for_package( $package ); // + instead of array_merge maintains numeric keys
 				}
 			}
 
@@ -379,9 +367,9 @@ class WC_Shipping {
 			$package['rates'] = apply_filters( 'woocommerce_package_rates', $package['rates'], $package );
 
 			// Store in session to avoid recalculation
-			WC()->session->set( 'shipping_for_package', array(
+			WC()->session->set( $session_key, array(
 				'package_hash' => $package_hash,
-				'rates'        => $package['rates']
+				'rates'        => $package['rates'],
 			) );
 		} else {
 			$package['rates'] = $stored_rates['rates'];
@@ -392,7 +380,6 @@ class WC_Shipping {
 
 	/**
 	 * Get packages.
-	 *
 	 * @return array
 	 */
 	public function get_packages() {
@@ -406,45 +393,16 @@ class WC_Shipping {
 	 */
 	public function reset_shipping() {
 		unset( WC()->session->chosen_shipping_methods );
-		$this->shipping_total = null;
+		$this->shipping_total = 0;
 		$this->shipping_taxes = array();
 		$this->packages = array();
 	}
 
 	/**
-	 * Process admin options.
-	 *
-	 * Saves options on the shipping setting page.
+	 * @deprecated 2.6.0 Was previously used to determine sort order of methods, but this is now controlled by zones and thus unused.
 	 */
-	public function process_admin_options() {
-		$method_order       = isset( $_POST['method_order'] ) ? $_POST['method_order'] : '';
-		$method_priority    = isset( $_POST['method_priority'] ) ? $_POST['method_priority'] : '';
-		$order              = array();
-		$selection_priority = array();
-
-		if ( is_array( $method_order ) && sizeof( $method_order ) > 0 ) {
-			$loop = 0;
-			foreach ( $method_order as $method_id ) {
-				$order[ $method_id ]              = $loop;
-				$selection_priority[ $method_id ] = absint( $method_priority[ $method_id ] );
-				$loop ++;
-			}
-		}
-
-		update_option( 'woocommerce_shipping_method_selection_priority', $selection_priority );
-		update_option( 'woocommerce_shipping_method_order', $order );
+	public function sort_shipping_methods() {
+		wc_deprecated_function( 'sort_shipping_methods', '2.6' );
+		return $this->shipping_methods;
 	}
-
-}
-
-/**
- * Register a shipping method.
- *
- * Registers a shipping method ready to be loaded. Accepts a class name (string) or a class object.
- *
- * @package		WooCommerce/Classes/Shipping
- * @since 1.5.7
- */
-function woocommerce_register_shipping_method( $shipping_method ) {
-	WC()->shipping->register_shipping_method( $shipping_method );
 }
diff --git a/includes/class-wc-shortcodes.php b/includes/class-wc-shortcodes.php
index 378168fc9b5..a7c0c6d8992 100644
--- a/includes/class-wc-shortcodes.php
+++ b/includes/class-wc-shortcodes.php
@@ -62,7 +62,7 @@ class WC_Shortcodes {
 		$wrapper = array(
 			'class'  => 'woocommerce',
 			'before' => null,
-			'after'  => null
+			'after'  => null,
 		)
 	) {
 		ob_start();
@@ -84,15 +84,24 @@ class WC_Shortcodes {
 	private static function product_loop( $query_args, $atts, $loop_name ) {
 		global $woocommerce_loop;
 
-		$products                    = new WP_Query( apply_filters( 'woocommerce_shortcode_products_query', $query_args, $atts, $loop_name ) );
 		$columns                     = absint( $atts['columns'] );
 		$woocommerce_loop['columns'] = $columns;
+		$woocommerce_loop['name']    = $loop_name;
+		$query_args                  = apply_filters( 'woocommerce_shortcode_products_query', $query_args, $atts, $loop_name );
+		$transient_name              = 'wc_loop' . substr( md5( json_encode( $query_args ) . $loop_name ), 28 ) . WC_Cache_Helper::get_transient_version( 'product_query' );
+		$products                    = get_transient( $transient_name );
+
+		if ( false === $products || ! is_a( $products, 'WP_Query' ) ) {
+			$products = new WP_Query( $query_args );
+			set_transient( $transient_name, $products, DAY_IN_SECONDS * 30 );
+		}
 
 		ob_start();
 
-		if ( $products->have_posts() ) : ?>
+		if ( $products->have_posts() ) {
+			?>
 
-			<?php do_action( "woocommerce_shortcode_before_{$loop_name}_loop" ); ?>
+			<?php do_action( "woocommerce_shortcode_before_{$loop_name}_loop", $atts ); ?>
 
 			<?php woocommerce_product_loop_start(); ?>
 
@@ -104,9 +113,12 @@ class WC_Shortcodes {
 
 			<?php woocommerce_product_loop_end(); ?>
 
-			<?php do_action( "woocommerce_shortcode_after_{$loop_name}_loop" ); ?>
+			<?php do_action( "woocommerce_shortcode_after_{$loop_name}_loop", $atts ); ?>
 
-		<?php endif;
+			<?php
+		} else {
+			do_action( "woocommerce_shortcode_{$loop_name}_loop_no_results", $atts );
+		}
 
 		woocommerce_reset_loop();
 		wp_reset_postdata();
@@ -144,7 +156,7 @@ class WC_Shortcodes {
 	}
 
 	/**
-	 * Cart shortcode.
+	 * My account page shortcode.
 	 *
 	 * @param mixed $atts
 	 * @return string
@@ -163,11 +175,11 @@ class WC_Shortcodes {
 		$atts = shortcode_atts( array(
 			'per_page' => '12',
 			'columns'  => '4',
-			'orderby'  => 'title',
-			'order'    => 'desc',
+			'orderby'  => 'menu_order title',
+			'order'    => 'asc',
 			'category' => '',  // Slugs
-			'operator' => 'IN' // Possible values are 'IN', 'NOT IN', 'AND'.
-		), $atts );
+			'operator' => 'IN', // Possible values are 'IN', 'NOT IN', 'AND'.
+		), $atts, 'product_category' );
 
 		if ( ! $atts['category'] ) {
 			return '';
@@ -183,7 +195,8 @@ class WC_Shortcodes {
 			'orderby'             => $ordering_args['orderby'],
 			'order'               => $ordering_args['order'],
 			'posts_per_page'      => $atts['per_page'],
-			'meta_query'          => $meta_query
+			'meta_query'          => $meta_query,
+			'tax_query'           => WC()->query->get_tax_query(),
 		);
 
 		$query_args = self::_maybe_add_category_args( $query_args, $atts['category'], $atts['operator'] );
@@ -217,17 +230,11 @@ class WC_Shortcodes {
 			'columns'    => '4',
 			'hide_empty' => 1,
 			'parent'     => '',
-			'ids'        => ''
-		), $atts );
+			'ids'        => '',
+		), $atts, 'product_categories' );
 
-		if ( isset( $atts['ids'] ) ) {
-			$ids = explode( ',', $atts['ids'] );
-			$ids = array_map( 'trim', $ids );
-		} else {
-			$ids = array();
-		}
-
-		$hide_empty = ( $atts['hide_empty'] == true || $atts['hide_empty'] == 1 ) ? 1 : 0;
+		$ids        = array_filter( array_map( 'trim', explode( ',', $atts['ids'] ) ) );
+		$hide_empty = ( true === $atts['hide_empty'] || 'true' === $atts['hide_empty'] || 1 === $atts['hide_empty'] || '1' === $atts['hide_empty'] ) ? 1 : 0;
 
 		// get terms and workaround WP bug with parents/pad counts
 		$args = array(
@@ -236,7 +243,7 @@ class WC_Shortcodes {
 			'hide_empty' => $hide_empty,
 			'include'    => $ids,
 			'pad_counts' => true,
-			'child_of'   => $atts['parent']
+			'child_of'   => $atts['parent'],
 		);
 
 		$product_categories = get_terms( 'product_cat', $args );
@@ -247,7 +254,7 @@ class WC_Shortcodes {
 
 		if ( $hide_empty ) {
 			foreach ( $product_categories as $key => $category ) {
-				if ( $category->count == 0 ) {
+				if ( 0 == $category->count ) {
 					unset( $product_categories[ $key ] );
 				}
 			}
@@ -262,15 +269,12 @@ class WC_Shortcodes {
 
 		ob_start();
 
-		// Reset loop/columns globals when starting a new loop
-		$woocommerce_loop['loop'] = $woocommerce_loop['column'] = '';
-
 		if ( $product_categories ) {
 			woocommerce_product_loop_start();
 
 			foreach ( $product_categories as $category ) {
 				wc_get_template( 'content-product_cat.php', array(
-					'category' => $category
+					'category' => $category,
 				) );
 			}
 
@@ -295,8 +299,8 @@ class WC_Shortcodes {
 			'orderby'  => 'date',
 			'order'    => 'desc',
 			'category' => '',  // Slugs
-			'operator' => 'IN' // Possible values are 'IN', 'NOT IN', 'AND'.
-		), $atts );
+			'operator' => 'IN', // Possible values are 'IN', 'NOT IN', 'AND'.
+		), $atts, 'recent_products' );
 
 		$query_args = array(
 			'post_type'           => 'product',
@@ -305,7 +309,8 @@ class WC_Shortcodes {
 			'posts_per_page'      => $atts['per_page'],
 			'orderby'             => $atts['orderby'],
 			'order'               => $atts['order'],
-			'meta_query'          => WC()->query->get_meta_query()
+			'meta_query'          => WC()->query->get_meta_query(),
+			'tax_query'           => WC()->query->get_tax_query(),
 		);
 
 		$query_args = self::_maybe_add_category_args( $query_args, $atts['category'], $atts['operator'] );
@@ -325,8 +330,8 @@ class WC_Shortcodes {
 			'orderby' => 'title',
 			'order'   => 'asc',
 			'ids'     => '',
-			'skus'    => ''
-		), $atts );
+			'skus'    => '',
+		), $atts, 'products' );
 
 		$query_args = array(
 			'post_type'           => 'product',
@@ -335,14 +340,15 @@ class WC_Shortcodes {
 			'orderby'             => $atts['orderby'],
 			'order'               => $atts['order'],
 			'posts_per_page'      => -1,
-			'meta_query'          => WC()->query->get_meta_query()
+			'meta_query'          => WC()->query->get_meta_query(),
+			'tax_query'           => WC()->query->get_tax_query(),
 		);
 
 		if ( ! empty( $atts['skus'] ) ) {
 			$query_args['meta_query'][] = array(
 				'key'     => '_sku',
 				'value'   => array_map( 'trim', explode( ',', $atts['skus'] ) ),
-				'compare' => 'IN'
+				'compare' => 'IN',
 			);
 		}
 
@@ -371,14 +377,15 @@ class WC_Shortcodes {
 			'posts_per_page' => 1,
 			'no_found_rows'  => 1,
 			'post_status'    => 'publish',
-			'meta_query'     => $meta_query
+			'meta_query'     => $meta_query,
+			'tax_query'      => WC()->query->get_tax_query(),
 		);
 
 		if ( isset( $atts['sku'] ) ) {
 			$args['meta_query'][] = array(
 				'key'     => '_sku',
 				'value'   => $atts['sku'],
-				'compare' => '='
+				'compare' => '=',
 			);
 		}
 
@@ -434,8 +441,8 @@ class WC_Shortcodes {
 			'quantity'   => '1',
 			'sku'        => '',
 			'style'      => 'border:4px solid #ccc; padding: 12px;',
-			'show_price' => 'true'
-		), $atts );
+			'show_price' => 'true',
+		), $atts, 'product_add_to_cart' );
 
 		if ( ! empty( $atts['id'] ) ) {
 			$product_data = get_post( $atts['id'] );
@@ -446,7 +453,7 @@ class WC_Shortcodes {
 			return '';
 		}
 
-		$product = wc_setup_product_data( $product_data );
+		$product = is_object( $product_data ) && in_array( $product_data->post_type, array( 'product', 'product_variation' ) ) ? wc_setup_product_data( $product_data ) : false;
 
 		if ( ! $product ) {
 			return '';
@@ -494,7 +501,9 @@ class WC_Shortcodes {
 			return '';
 		}
 
-		if ( 'product' !== $product_data->post_type ) {
+		$product = is_object( $product_data ) && in_array( $product_data->post_type, array( 'product', 'product_variation' ) ) ? wc_setup_product_data( $product_data ) : false;
+
+		if ( ! $product ) {
 			return '';
 		}
 
@@ -514,8 +523,10 @@ class WC_Shortcodes {
 			'per_page' => '12',
 			'columns'  => '4',
 			'orderby'  => 'title',
-			'order'    => 'asc'
-		), $atts );
+			'order'    => 'asc',
+			'category' => '', // Slugs
+			'operator' => 'IN', // Possible values are 'IN', 'NOT IN', 'AND'.
+		), $atts, 'sale_products' );
 
 		$query_args = array(
 			'posts_per_page' => $atts['per_page'],
@@ -525,9 +536,12 @@ class WC_Shortcodes {
 			'post_status'    => 'publish',
 			'post_type'      => 'product',
 			'meta_query'     => WC()->query->get_meta_query(),
-			'post__in'       => array_merge( array( 0 ), wc_get_product_ids_on_sale() )
+			'tax_query'      => WC()->query->get_tax_query(),
+			'post__in'       => array_merge( array( 0 ), wc_get_product_ids_on_sale() ),
 		);
 
+		$query_args = self::_maybe_add_category_args( $query_args, $atts['category'], $atts['operator'] );
+
 		return self::product_loop( $query_args, $atts, 'sale_products' );
 	}
 
@@ -542,8 +556,8 @@ class WC_Shortcodes {
 			'per_page' => '12',
 			'columns'  => '4',
 			'category' => '',  // Slugs
-			'operator' => 'IN' // Possible values are 'IN', 'NOT IN', 'AND'.
-		), $atts );
+			'operator' => 'IN', // Possible values are 'IN', 'NOT IN', 'AND'.
+		), $atts, 'best_selling_products' );
 
 		$query_args = array(
 			'post_type'           => 'product',
@@ -552,7 +566,8 @@ class WC_Shortcodes {
 			'posts_per_page'      => $atts['per_page'],
 			'meta_key'            => 'total_sales',
 			'orderby'             => 'meta_value_num',
-			'meta_query'          => WC()->query->get_meta_query()
+			'meta_query'          => WC()->query->get_meta_query(),
+			'tax_query'           => WC()->query->get_tax_query(),
 		);
 
 		$query_args = self::_maybe_add_category_args( $query_args, $atts['category'], $atts['operator'] );
@@ -573,8 +588,8 @@ class WC_Shortcodes {
 			'orderby'  => 'title',
 			'order'    => 'asc',
 			'category' => '',  // Slugs
-			'operator' => 'IN' // Possible values are 'IN', 'NOT IN', 'AND'.
-		), $atts );
+			'operator' => 'IN', // Possible values are 'IN', 'NOT IN', 'AND'.
+		), $atts, 'top_rated_products' );
 
 		$query_args = array(
 			'post_type'           => 'product',
@@ -583,13 +598,12 @@ class WC_Shortcodes {
 			'orderby'             => $atts['orderby'],
 			'order'               => $atts['order'],
 			'posts_per_page'      => $atts['per_page'],
-			'meta_query'          => WC()->query->get_meta_query()
+			'meta_query'          => WC()->query->get_meta_query(),
+			'tax_query'           => WC()->query->get_tax_query(),
 		);
 
 		$query_args = self::_maybe_add_category_args( $query_args, $atts['category'], $atts['operator'] );
 
-		ob_start();
-
 		add_filter( 'posts_clauses', array( __CLASS__, 'order_by_rating_post_clauses' ) );
 
 		$return = self::product_loop( $query_args, $atts, 'top_rated_products' );
@@ -612,13 +626,16 @@ class WC_Shortcodes {
 			'orderby'  => 'date',
 			'order'    => 'desc',
 			'category' => '',  // Slugs
-			'operator' => 'IN' // Possible values are 'IN', 'NOT IN', 'AND'.
-		), $atts );
+			'operator' => 'IN', // Possible values are 'IN', 'NOT IN', 'AND'.
+		), $atts, 'featured_products' );
 
-		$meta_query   = WC()->query->get_meta_query();
-		$meta_query[] = array(
-			'key'   => '_featured',
-			'value' => 'yes'
+		$meta_query  = WC()->query->get_meta_query();
+		$tax_query   = WC()->query->get_tax_query();
+		$tax_query[] = array(
+			'taxonomy' => 'product_visibility',
+			'field'    => 'name',
+			'terms'    => 'featured',
+			'operator' => 'IN',
 		);
 
 		$query_args = array(
@@ -628,7 +645,8 @@ class WC_Shortcodes {
 			'posts_per_page'      => $atts['per_page'],
 			'orderby'             => $atts['orderby'],
 			'order'               => $atts['order'],
-			'meta_query'          => $meta_query
+			'meta_query'          => $meta_query,
+			'tax_query'           => $tax_query,
 		);
 
 		$query_args = self::_maybe_add_category_args( $query_args, $atts['category'], $atts['operator'] );
@@ -656,14 +674,14 @@ class WC_Shortcodes {
 			'post_type'           => 'product',
 			'post_status'         => 'publish',
 			'ignore_sticky_posts' => 1,
-			'no_found_rows'       => 1
+			'no_found_rows'       => 1,
 		);
 
 		if ( isset( $atts['sku'] ) ) {
 			$args['meta_query'][] = array(
 				'key'     => '_sku',
 				'value'   => sanitize_text_field( $atts['sku'] ),
-				'compare' => '='
+				'compare' => '=',
 			);
 
 			$args['post_type'] = array( 'product', 'product_variation' );
@@ -678,10 +696,10 @@ class WC_Shortcodes {
 		$preselected_id = '0';
 
 		// check if sku is a variation
-		if ( isset( $atts['sku'] ) && $single_product->have_posts() && $single_product->post->post_type === 'product_variation' ) {
+		if ( isset( $atts['sku'] ) && $single_product->have_posts() && 'product_variation' === $single_product->post->post_type ) {
 
 			$variation = new WC_Product_Variation( $single_product->post->ID );
-			$attributes = $variation->get_variation_attributes();
+			$attributes = $variation->get_attributes();
 
 			// set preselected id to be used by JS to provide context
 			$preselected_id = $single_product->post->ID;
@@ -693,7 +711,7 @@ class WC_Shortcodes {
 				'post_status'         => 'publish',
 				'ignore_sticky_posts' => 1,
 				'no_found_rows'       => 1,
-				'p'                   => $single_product->post->post_parent
+				'p'                   => $single_product->post->post_parent,
 			);
 
 			$single_product = new WP_Query( $args );
@@ -702,8 +720,8 @@ class WC_Shortcodes {
 				jQuery( document ).ready( function( $ ) {
 					var $variations_form = $( '[data-product-page-preselected-id="<?php echo esc_attr( $preselected_id ); ?>"]' ).find( 'form.variations_form' );
 
-					<?php foreach( $attributes as $attr => $value ) { ?>
-						$variations_form.find( 'select[name="<?php echo esc_attr( $attr ); ?>"]' ).val( '<?php echo $value; ?>' );
+					<?php foreach ( $attributes as $attr => $value ) { ?>
+						$variations_form.find( 'select[name="<?php echo esc_attr( $attr ); ?>"]' ).val( '<?php echo esc_js( $value ); ?>' );
 					<?php } ?>
 				});
 			</script>
@@ -712,7 +730,10 @@ class WC_Shortcodes {
 
 		ob_start();
 
-		while ( $single_product->have_posts() ) : $single_product->the_post(); wp_enqueue_script( 'wc-single-product' ); ?>
+		while ( $single_product->have_posts() ) :
+			$single_product->the_post();
+			wp_enqueue_script( 'wc-single-product' );
+			?>
 
 			<div class="single-product" data-product-page-preselected-id="<?php echo esc_attr( $preselected_id ); ?>">
 
@@ -769,8 +790,8 @@ class WC_Shortcodes {
 			'orderby'   => 'title',
 			'order'     => 'asc',
 			'attribute' => '',
-			'filter'    => ''
-		), $atts );
+			'filter'    => '',
+		), $atts, 'product_attribute' );
 
 		$query_args = array(
 			'post_type'           => 'product',
@@ -780,13 +801,13 @@ class WC_Shortcodes {
 			'orderby'             => $atts['orderby'],
 			'order'               => $atts['order'],
 			'meta_query'          => WC()->query->get_meta_query(),
-			'tax_query'           => array(
-				array(
-					'taxonomy' => strstr( $atts['attribute'], 'pa_' ) ? sanitize_title( $atts['attribute'] ) : 'pa_' . sanitize_title( $atts['attribute'] ),
-					'terms'    => array_map( 'sanitize_title', explode( ',', $atts['filter'] ) ),
-					'field'    => 'slug'
-				)
-			)
+			'tax_query'           => WC()->query->get_tax_query(),
+		);
+
+		$query_args['tax_query'][] = array(
+			'taxonomy' => strstr( $atts['attribute'], 'pa_' ) ? sanitize_title( $atts['attribute'] ) : 'pa_' . sanitize_title( $atts['attribute'] ),
+			'terms'    => array_map( 'sanitize_title', explode( ',', $atts['filter'] ) ),
+			'field'    => 'slug',
 		);
 
 		return self::product_loop( $query_args, $atts, 'product_attribute' );
@@ -801,11 +822,14 @@ class WC_Shortcodes {
 		$atts = shortcode_atts( array(
 			'per_page' => '4',
 			'columns'  => '4',
-			'orderby'  => 'rand'
-		), $atts );
+			'orderby'  => 'rand',
+		), $atts, 'related_products' );
 
 		ob_start();
 
+		// Rename arg
+		$atts['posts_per_page'] = absint( $atts['per_page'] );
+
 		woocommerce_related_products( $atts );
 
 		return ob_get_clean();
@@ -822,13 +846,16 @@ class WC_Shortcodes {
 	 */
 	private static function _maybe_add_category_args( $args, $category, $operator ) {
 		if ( ! empty( $category ) ) {
-			$args['tax_query'] = array(
+			if ( empty( $args['tax_query'] ) ) {
+				$args['tax_query'] = array();
+			}
+			$args['tax_query'][] = array(
 				array(
 					'taxonomy' => 'product_cat',
 					'terms'    => array_map( 'sanitize_title', explode( ',', $category ) ),
 					'field'    => 'slug',
-					'operator' => $operator
-				)
+					'operator' => $operator,
+				),
 			);
 		}
 
diff --git a/includes/class-wc-structured-data.php b/includes/class-wc-structured-data.php
new file mode 100644
index 00000000000..5d751a0b684
--- /dev/null
+++ b/includes/class-wc-structured-data.php
@@ -0,0 +1,443 @@
+<?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly.
+}
+
+/**
+ * Structured data's handler and generator using JSON-LD format.
+ *
+ * @class   WC_Structured_Data
+ * @since   3.0.0
+ * @version 3.0.0
+ * @package WooCommerce/Classes
+ * @author  Clément Cazaud <opportus@gmail.com>
+ */
+class WC_Structured_Data {
+
+	/**
+	 * @var array $_data
+	 */
+	private $_data = array();
+
+	/**
+	 * Constructor.
+	 */
+	public function __construct() {
+		// Generate structured data.
+		add_action( 'woocommerce_before_main_content', array( $this, 'generate_website_data' ), 30 );
+		add_action( 'woocommerce_breadcrumb', array( $this, 'generate_breadcrumblist_data' ), 10 );
+		add_action( 'woocommerce_shop_loop', array( $this, 'generate_product_data' ), 10 );
+		add_action( 'woocommerce_single_product_summary', array( $this, 'generate_product_data' ), 60 );
+		add_action( 'woocommerce_review_meta', array( $this, 'generate_review_data' ), 20 );
+		add_action( 'woocommerce_email_order_details', array( $this, 'generate_order_data' ), 20, 3 );
+
+		// Output structured data.
+		add_action( 'woocommerce_email_order_details', array( $this, 'output_email_structured_data' ), 30, 3 );
+		add_action( 'wp_footer', array( $this, 'output_structured_data' ), 10 );
+	}
+
+	/**
+	 * Sets data.
+	 *
+	 * @param  array $data  Structured data.
+	 * @param  bool  $reset Unset data (default: false).
+	 * @return bool
+	 */
+	public function set_data( $data, $reset = false ) {
+		if ( ! isset( $data['@type'] ) || ! preg_match( '|^[a-zA-Z]{1,20}$|', $data['@type'] ) ) {
+			return false;
+		}
+
+		if ( $reset && isset( $this->_data ) ) {
+			unset( $this->_data );
+		}
+
+		$this->_data[] = $data;
+
+		return true;
+	}
+
+	/**
+	 * Gets data.
+	 *
+	 * @return array
+	 */
+	public function get_data() {
+		return $this->_data;
+	}
+
+	/**
+	 * Structures and returns data.
+	 *
+	 * List of types available by default for specific request:
+	 *
+	 * 'product',
+	 * 'review',
+	 * 'breadcrumblist',
+	 * 'website',
+	 * 'order',
+	 *
+	 * @param  array $types Structured data types.
+	 * @return array
+	 */
+	public function get_structured_data( $types ) {
+		$data = array();
+
+		// Put together the values of same type of structured data.
+		foreach ( $this->get_data() as $value ) {
+			$data[ strtolower( $value['@type'] ) ][] = $value;
+		}
+
+		// Wrap the multiple values of each type inside a graph... Then add context to each type.
+		foreach ( $data as $type => $value ) {
+			$data[ $type ] = count( $value ) > 1 ? array( '@graph' => $value ) : $value[0];
+			$data[ $type ] = apply_filters( 'woocommerce_structured_data_context', array( '@context' => 'https://schema.org/' ), $data, $type, $value ) + $data[ $type ];
+		}
+
+		// If requested types, pick them up... Finally change the associative array to an indexed one.
+		$data = $types ? array_values( array_intersect_key( $data, array_flip( $types ) ) ) : array_values( $data );
+
+		if ( ! empty( $data ) ) {
+			$data = count( $data ) > 1 ? array( '@graph' => $data ) : $data[0];
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Get data types for pages.
+	 *
+	 * @return array
+	 */
+	protected function get_data_type_for_page() {
+		$types   = array();
+		$types[] = is_shop() || is_product_category() || is_product() ? 'product' : '';
+		$types[] = is_shop() && is_front_page() ? 'website' : '';
+		$types[] = is_product() ? 'review' : '';
+		$types[] = ! is_shop() ? 'breadcrumblist' : '';
+		$types[] = 'order';
+
+		return array_filter( apply_filters( 'woocommerce_structured_data_type_for_page', $types ) );
+	}
+
+	/**
+	 * Makes sure email structured data only outputs on non-plain text versions.
+	 *
+	 * @param WP_Order  $order         Order data.
+	 * @param bool	    $sent_to_admin Send to admin (default: false).
+	 * @param bool	    $plain_text    Plain text email (default: false).
+	 */
+	public function output_email_structured_data( $order, $sent_to_admin = false, $plain_text = false ) {
+		if ( $plain_text ) {
+			return;
+		}
+		echo '<div style="display: none; font-size: 0; max-height: 0; line-height: 0; padding: 0; mso-hide: all;">';
+		$this->output_structured_data();
+		echo '</div>';
+	}
+
+	/**
+	 * Sanitizes, encodes and outputs structured data.
+	 *
+	 * Hooked into `wp_footer` action hook.
+	 * Hooked into `woocommerce_email_order_details` action hook.
+	 */
+	public function output_structured_data() {
+		$types = $this->get_data_type_for_page();
+
+		if ( $data = wc_clean( $this->get_structured_data( $types ) ) ) {
+			echo '<script type="application/ld+json">' . wp_json_encode( $data ) . '</script>';
+		}
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Generators
+	|--------------------------------------------------------------------------
+	|
+	| Methods for generating specific structured data types:
+	|
+	| - Product
+	| - Review
+	| - BreadcrumbList
+	| - WebSite
+	| - Order
+	|
+	| The generated data is stored into `$this->_data`.
+	| See the methods above for handling `$this->_data`.
+	|
+	*/
+
+	/**
+	 * Generates Product structured data.
+	 *
+	 * Hooked into `woocommerce_single_product_summary` action hook.
+	 * Hooked into `woocommerce_shop_loop` action hook.
+	 *
+	 * @param WC_Product $product Product data (default: null).
+	 */
+	public function generate_product_data( $product = null ) {
+		if ( ! is_object( $product ) ) {
+			global $product;
+		}
+
+		if ( ! is_a( $product, 'WC_Product' ) ) {
+			return;
+		}
+
+		$shop_name       = get_bloginfo( 'name' );
+		$shop_url        = home_url();
+		$currency        = get_woocommerce_currency();
+		$markup          = array();
+		$markup['@type'] = 'Product';
+		$markup['@id']   = get_permalink( $product->get_id() );
+		$markup['url']   = $markup['@id'];
+		$markup['name']  = $product->get_name();
+
+		if ( apply_filters( 'woocommerce_structured_data_product_limit', is_product_taxonomy() || is_shop() ) ) {
+			$this->set_data( apply_filters( 'woocommerce_structured_data_product_limited', $markup, $product ) );
+			return;
+		}
+
+		$markup_offer = array(
+			'@type'         => 'Offer',
+			'priceCurrency' => $currency,
+			'availability'  => 'https://schema.org/' . $stock = ( $product->is_in_stock() ? 'InStock' : 'OutOfStock' ),
+			'sku'           => $product->get_sku(),
+			'image'         => wp_get_attachment_url( $product->get_image_id() ),
+			'description'   => $product->get_description(),
+			'seller'        => array(
+				'@type' => 'Organization',
+				'name'  => $shop_name,
+				'url'   => $shop_url,
+			),
+		);
+
+		if ( $product->is_type( 'variable' ) ) {
+			$prices = $product->get_variation_prices();
+
+			$markup_offer['priceSpecification'] = array(
+				'price'         => wc_format_decimal( $product->get_price(), wc_get_price_decimals() ),
+				'minPrice'      => wc_format_decimal( current( $prices['price'] ), wc_get_price_decimals() ),
+				'maxPrice'      => wc_format_decimal( end( $prices['price'] ), wc_get_price_decimals() ),
+				'priceCurrency' => $currency,
+			);
+		} else {
+			$markup_offer['price']    = wc_format_decimal( $product->get_price(), wc_get_price_decimals() );
+		}
+
+		$markup['offers'] = array( apply_filters( 'woocommerce_structured_data_product_offer', $markup_offer, $product ) );
+
+		if ( $product->get_rating_count() ) {
+			$markup['aggregateRating'] = array(
+				'@type'       => 'AggregateRating',
+				'ratingValue' => $product->get_average_rating(),
+				'ratingCount' => $product->get_rating_count(),
+				'reviewCount' => $product->get_review_count(),
+			);
+		}
+
+		$this->set_data( apply_filters( 'woocommerce_structured_data_product', $markup, $product ) );
+	}
+
+	/**
+	 * Generates Review structured data.
+	 *
+	 * Hooked into `woocommerce_review_meta` action hook.
+	 *
+	 * @param WP_Comment $comment Comment data.
+	 */
+	public function generate_review_data( $comment ) {
+		$markup                  = array();
+		$markup['@type']         = 'Review';
+		$markup['@id']           = get_comment_link( $comment->comment_ID );
+		$markup['datePublished'] = get_comment_date( 'c', $comment->comment_ID );
+		$markup['description']   = get_comment_text( $comment->comment_ID );
+		$markup['itemReviewed']  = array(
+			'@type' => 'Product',
+			'name'  => get_the_title( $comment->post_ID ),
+		);
+		if ( $rating = get_comment_meta( $comment->comment_ID, 'rating', true ) ) {
+			$markup['reviewRating']  = array(
+				'@type'       => 'rating',
+				'ratingValue' => $rating,
+			);
+
+		// Skip replies unless they have a rating.
+		} elseif ( $comment->comment_parent ) {
+			return;
+		}
+
+		$markup['author']        = array(
+			'@type' => 'Person',
+			'name'  => get_comment_author( $comment->comment_ID ),
+		);
+
+		$this->set_data( apply_filters( 'woocommerce_structured_data_review', $markup, $comment ) );
+	}
+
+	/**
+	 * Generates BreadcrumbList structured data.
+	 *
+	 * Hooked into `woocommerce_breadcrumb` action hook.
+	 *
+	 * @param WC_Breadcrumb $breadcrumbs Breadcrumb data.
+	 */
+	public function generate_breadcrumblist_data( $breadcrumbs ) {
+		$crumbs = $breadcrumbs->get_breadcrumb();
+
+		if ( empty( $crumbs ) || ! is_array( $crumbs ) ) {
+			return;
+		}
+
+		$markup                    = array();
+		$markup['@type']           = 'BreadcrumbList';
+		$markup['itemListElement'] = array();
+
+		foreach ( $crumbs as $key => $crumb ) {
+			$markup['itemListElement'][ $key ] = array(
+				'@type'    => 'ListItem',
+				'position' => $key + 1,
+				'item'     => array(
+					'name' => $crumb[0],
+				),
+			);
+
+			if ( ! empty( $crumb[1] ) && sizeof( $crumbs ) !== $key + 1 ) {
+				$markup['itemListElement'][ $key ]['item'] += array( '@id' => $crumb[1] );
+			}
+		}
+
+		$this->set_data( apply_filters( 'woocommerce_structured_data_breadcrumblist', $markup, $breadcrumbs ) );
+	}
+
+	/**
+	 * Generates WebSite structured data.
+	 *
+	 * Hooked into `woocommerce_before_main_content` action hook.
+	 */
+	public function generate_website_data() {
+		$markup                    = array();
+		$markup['@type']           = 'WebSite';
+		$markup['name']            = get_bloginfo( 'name' );
+		$markup['url']             = home_url();
+		$markup['potentialAction'] = array(
+			'@type'       => 'SearchAction',
+			'target'      => home_url( '?s={search_term_string}&post_type=product' ),
+			'query-input' => 'required name=search_term_string',
+		);
+
+		$this->set_data( apply_filters( 'woocommerce_structured_data_website', $markup ) );
+	}
+
+	/**
+	 * Generates Order structured data.
+	 *
+	 * Hooked into `woocommerce_email_order_details` action hook.
+	 *
+	 * @param WP_Order  $order         Order data.
+	 * @param bool	    $sent_to_admin Send to admin (default: false).
+	 * @param bool	    $plain_text    Plain text email (default: false).
+	 */
+	public function generate_order_data( $order, $sent_to_admin = false, $plain_text = false ) {
+		if ( $plain_text || ! is_a( $order, 'WC_Order' ) ) {
+			return;
+		}
+
+		$shop_name      = get_bloginfo( 'name' );
+		$shop_url       = home_url();
+		$order_url      = $sent_to_admin ? admin_url( 'post.php?post=' . absint( $order->get_id() ) . '&action=edit' ) : $order->get_view_order_url();
+		$order_statuses = array(
+			'pending'    => 'https://schema.org/OrderPaymentDue',
+			'processing' => 'https://schema.org/OrderProcessing',
+			'on-hold'    => 'https://schema.org/OrderProblem',
+			'completed'  => 'https://schema.org/OrderDelivered',
+			'cancelled'  => 'https://schema.org/OrderCancelled',
+			'refunded'   => 'https://schema.org/OrderReturned',
+			'failed'     => 'https://schema.org/OrderProblem',
+		);
+
+		$markup_offers = array();
+		foreach ( $order->get_items() as $item ) {
+			if ( ! apply_filters( 'woocommerce_order_item_visible', true, $item ) ) {
+				continue;
+			}
+
+			$product        = apply_filters( 'woocommerce_order_item_product', $order->get_product_from_item( $item ), $item );
+			$product_exists = is_object( $product );
+			$is_visible     = $product_exists && $product->is_visible();
+
+			$markup_offers[]  = array(
+				'@type'              => 'Offer',
+				'price'              => $order->get_line_subtotal( $item ),
+				'priceCurrency'      => $order->get_currency(),
+				'priceSpecification' => array(
+					'price'            => $order->get_line_subtotal( $item ),
+					'priceCurrency'    => $order->get_currency(),
+					'eligibleQuantity' => array(
+						'@type' => 'QuantitativeValue',
+						'value' => apply_filters( 'woocommerce_email_order_item_quantity', $item['qty'], $item ),
+					),
+				),
+				'itemOffered'        => array(
+					'@type' => 'Product',
+					'name'  => apply_filters( 'woocommerce_order_item_name', $item['name'], $item, $is_visible ),
+					'sku'   => $product_exists ? $product->get_sku() : '',
+					'image' => $product_exists ? wp_get_attachment_image_url( $product->get_image_id() ) : '',
+					'url'   => $is_visible ? get_permalink( $product->get_id() ) : get_home_url(),
+				),
+				'seller'             => array(
+					'@type' => 'Organization',
+					'name'  => $shop_name,
+					'url'   => $shop_url,
+				),
+			);
+		}
+
+		$markup                       = array();
+		$markup['@type']              = 'Order';
+		$markup['url']                = $order_url;
+		$markup['orderStatus']        = isset( $order_status[ $order->get_status() ] ) ? $order_status[ $order->get_status() ] : '';
+		$markup['orderNumber']        = $order->get_order_number();
+		$markup['orderDate']          = $order->get_date_created()->format( 'c' );
+		$markup['acceptedOffer']      = $markup_offers;
+		$markup['discount']           = $order->get_total_discount();
+		$markup['discountCurrency']   = $order->get_currency();
+		$markup['price']              = $order->get_total();
+		$markup['priceCurrency']      = $order->get_currency();
+		$markup['priceSpecification'] = array(
+			'price'                 => $order->get_total(),
+			'priceCurrency'         => $order->get_currency(),
+			'valueAddedTaxIncluded' => true,
+		);
+		$markup['billingAddress']     = array(
+			'@type'           => 'PostalAddress',
+			'name'            => $order->get_formatted_billing_full_name(),
+			'streetAddress'   => $order->get_billing_address_1(),
+			'postalCode'      => $order->get_billing_postcode(),
+			'addressLocality' => $order->get_billing_city(),
+			'addressRegion'   => $order->get_billing_state(),
+			'addressCountry'  => $order->get_billing_country(),
+			'email'           => $order->get_billing_email(),
+			'telephone'       => $order->get_billing_phone(),
+		);
+		$markup['customer']           = array(
+			'@type' => 'Person',
+			'name'  => $order->get_formatted_billing_full_name(),
+		);
+		$markup['merchant']           = array(
+			'@type' => 'Organization',
+			'name'  => $shop_name,
+			'url'   => $shop_url,
+		);
+		$markup['potentialAction']    = array(
+			'@type'  => 'ViewAction',
+			'name'   => 'View Order',
+			'url'    => $order_url,
+			'target' => $order_url,
+		);
+
+		$this->set_data( apply_filters( 'woocommerce_structured_data_order', $markup, $sent_to_admin, $order ), true );
+	}
+}
diff --git a/includes/class-wc-tax.php b/includes/class-wc-tax.php
index e89fd5ce18f..498ce5b7d0e 100644
--- a/includes/class-wc-tax.php
+++ b/includes/class-wc-tax.php
@@ -15,7 +15,18 @@ if ( ! defined( 'ABSPATH' ) ) {
  */
 class WC_Tax {
 
+	/**
+	 * Precision.
+	 *
+	 * @var int
+	 */
 	public static $precision;
+
+	/**
+	 * Round at subtotal.
+	 *
+	 * @var bool
+	 */
 	public static $round_at_subtotal;
 
 	/**
@@ -24,8 +35,31 @@ class WC_Tax {
 	 * @access public
 	 */
 	public static function init() {
-		self::$precision         = WC_ROUNDING_PRECISION;
+		self::$precision         = wc_get_rounding_precision();
 		self::$round_at_subtotal = 'yes' === get_option( 'woocommerce_tax_round_at_subtotal' );
+		add_action( 'update_option_woocommerce_tax_classes', array( __CLASS__, 'maybe_remove_tax_class_rates' ), 10, 2 );
+	}
+
+	/**
+	 * When the woocommerce_tax_classes option is changed, remove any orphan rates.
+	 * @param  string $old_value
+	 * @param  string $value
+	 */
+	public static function maybe_remove_tax_class_rates( $old_value, $value ) {
+		$old     = array_filter( array_map( 'trim', explode( "\n", $old_value ) ) );
+		$new     = array_filter( array_map( 'trim', explode( "\n", $value ) ) );
+		$removed = array_filter( array_map( 'sanitize_title', array_diff( $old, $new ) ) );
+
+		if ( $removed ) {
+			global $wpdb;
+
+			foreach ( $removed as $removed_tax_class ) {
+				$wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rates WHERE tax_rate_class = %s;", $removed_tax_class ) );
+				$wpdb->query( "DELETE locations FROM {$wpdb->prefix}woocommerce_tax_rate_locations locations LEFT JOIN {$wpdb->prefix}woocommerce_tax_rates rates ON rates.tax_rate_id = locations.tax_rate_id WHERE rates.tax_rate_id IS NULL;" );
+			}
+
+			WC_Cache_Helper::incr_cache_prefix( 'taxes' );
+		}
 	}
 
 	/**
@@ -66,7 +100,8 @@ class WC_Tax {
 	 * @return  array
 	 */
 	public static function calc_shipping_tax( $price, $rates ) {
-		return self::calc_exclusive_tax( $price, $rates );
+		$taxes = self::calc_exclusive_tax( $price, $rates );
+		return apply_filters( 'woocommerce_calc_shipping_tax', $taxes, $price, $rates );
 	}
 
 	/**
@@ -92,7 +127,7 @@ class WC_Tax {
 	 *
 	 * Filter example: to return rounding to .5 cents you'd use:
 	 *
-	 * public function euro_5cent_rounding( $in ) {
+	 * function euro_5cent_rounding( $in ) {
 	 *      return round( $in / 5, 2 ) * 5;
 	 * }
 	 * add_filter( 'woocommerce_tax_round', 'euro_5cent_rounding' );
@@ -114,23 +149,26 @@ class WC_Tax {
 
 		$regular_tax_rates = $compound_tax_rates = 0;
 
-		foreach ( $rates as $key => $rate )
-			if ( $rate['compound'] == 'yes' )
+		foreach ( $rates as $key => $rate ) {
+			if ( 'yes' === $rate['compound'] ) {
 				$compound_tax_rates = $compound_tax_rates + $rate['rate'];
-			else
+			} else {
 				$regular_tax_rates  = $regular_tax_rates + $rate['rate'];
+			}
+		}
 
 		$regular_tax_rate 	= 1 + ( $regular_tax_rates / 100 );
 		$compound_tax_rate 	= 1 + ( $compound_tax_rates / 100 );
 		$non_compound_price = $price / $compound_tax_rate;
 
 		foreach ( $rates as $key => $rate ) {
-			if ( ! isset( $taxes[ $key ] ) )
+			if ( ! isset( $taxes[ $key ] ) ) {
 				$taxes[ $key ] = 0;
+			}
 
 			$the_rate      = $rate['rate'] / 100;
 
-			if ( $rate['compound'] == 'yes' ) {
+			if ( 'yes' === $rate['compound'] ) {
 				$the_price = $price;
 				$the_rate  = $the_rate / $compound_tax_rate;
 			} else {
@@ -156,12 +194,13 @@ class WC_Tax {
 	public static function calc_exclusive_tax( $price, $rates ) {
 		$taxes = array();
 
-		if ( $rates ) {
+		if ( ! empty( $rates ) ) {
 			// Multiple taxes
 			foreach ( $rates as $key => $rate ) {
 
-				if ( $rate['compound'] == 'yes' )
+				if ( 'yes' === $rate['compound'] ) {
 					continue;
+				}
 
 				$tax_amount = $price * ( $rate['rate'] / 100 );
 
@@ -169,10 +208,11 @@ class WC_Tax {
 				$tax_amount = apply_filters( 'woocommerce_price_ex_tax_amount', $tax_amount, $key, $rate, $price );
 
 				// Add rate
-				if ( ! isset( $taxes[ $key ] ) )
+				if ( ! isset( $taxes[ $key ] ) ) {
 					$taxes[ $key ] = $tax_amount;
-				else
+				} else {
 					$taxes[ $key ] += $tax_amount;
+				}
 			}
 
 			$pre_compound_total = array_sum( $taxes );
@@ -180,8 +220,9 @@ class WC_Tax {
 			// Compound taxes
 			foreach ( $rates as $key => $rate ) {
 
-				if ( $rate['compound'] == 'no' )
+				if ( 'no' === $rate['compound'] ) {
 					continue;
+				}
 
 				$the_price_inc_tax = $price + ( $pre_compound_total );
 
@@ -191,10 +232,11 @@ class WC_Tax {
 				$tax_amount = apply_filters( 'woocommerce_price_ex_tax_amount', $tax_amount, $key, $rate, $price, $the_price_inc_tax, $pre_compound_total );
 
 				// Add rate
-				if ( ! isset( $taxes[ $key ] ) )
+				if ( ! isset( $taxes[ $key ] ) ) {
 					$taxes[ $key ] = $tax_amount;
-				else
+				} else {
 					$taxes[ $key ] += $tax_amount;
+				}
 			}
 		}
 
@@ -213,7 +255,7 @@ class WC_Tax {
 			'state'     => '',
 			'city'      => '',
 			'postcode'  => '',
-			'tax_class' => ''
+			'tax_class' => '',
 		) );
 
 		extract( $args, EXTR_SKIP );
@@ -222,13 +264,12 @@ class WC_Tax {
 			return array();
 		}
 
-		$postcode          = wc_clean( $postcode );
-		$valid_postcodes   = self::_get_wildcard_postcodes( $postcode );
+		$postcode          = wc_normalize_postcode( wc_clean( $postcode ) );
 		$cache_key         = WC_Cache_Helper::get_cache_prefix( 'taxes' ) . 'wc_tax_rates_' . md5( sprintf( '%s+%s+%s+%s+%s', $country, $state, $city, $postcode, $tax_class ) );
 		$matched_tax_rates = wp_cache_get( $cache_key, 'taxes' );
 
 		if ( false === $matched_tax_rates ) {
-			$matched_tax_rates = self::get_matched_tax_rates( $country, $state, $postcode, $city, $tax_class, $valid_postcodes );
+			$matched_tax_rates = self::get_matched_tax_rates( $country, $state, $postcode, $city, $tax_class );
 			wp_cache_set( $cache_key, $matched_tax_rates, 'taxes' );
 		}
 
@@ -256,6 +297,50 @@ class WC_Tax {
 		return $shipping_rates;
 	}
 
+	/**
+	 * Does the sort comparison.
+	 */
+	private static function sort_rates_callback( $rate1, $rate2 ) {
+		if ( $rate1->tax_rate_priority !== $rate2->tax_rate_priority ) {
+			return $rate1->tax_rate_priority < $rate2->tax_rate_priority ? -1 : 1; // ASC
+		} elseif ( $rate1->tax_rate_country !== $rate2->tax_rate_country ) {
+			if ( '' === $rate1->tax_rate_country ) {
+				return 1;
+			}
+			if ( '' === $rate2->tax_rate_country ) {
+				return -1;
+			}
+			return strcmp( $rate1->tax_rate_country, $rate2->tax_rate_country ) > 0 ? 1 : -1;
+		} elseif ( $rate1->tax_rate_state !== $rate2->tax_rate_state ) {
+			if ( '' === $rate1->tax_rate_state ) {
+				return 1;
+			}
+			if ( '' === $rate2->tax_rate_state ) {
+				return -1;
+			}
+			return strcmp( $rate1->tax_rate_state, $rate2->tax_rate_state ) > 0 ? 1 : -1;
+		} else {
+			return $rate1->tax_rate_id < $rate2->tax_rate_id ? -1 : 1; // Identical - use ID
+		}
+	}
+
+	/**
+	 * Logical sort order for tax rates based on the following in order of priority:
+	 * 		- Priority
+	 * 		- County code
+	 * 		- State code
+	 * @param  array $rates
+	 * @return array
+	 */
+	private static function sort_rates( $rates ) {
+		uasort( $rates, __CLASS__ . '::sort_rates_callback' );
+		$i = 0;
+		foreach ( $rates as $key => $rate ) {
+			$rates[ $key ]->tax_rate_order = $i++;
+		}
+		return $rates;
+	}
+
 	/**
 	 * Loop through a set of tax rates and get the matching rates (1 per priority).
 	 *
@@ -264,53 +349,74 @@ class WC_Tax {
 	 * @param  string $postcode
 	 * @param  string $city
 	 * @param  string $tax_class
-	 * @param  string[] $valid_postcodes
 	 * @return array
 	 */
-	private static function get_matched_tax_rates( $country, $state, $postcode, $city, $tax_class, $valid_postcodes ) {
+	private static function get_matched_tax_rates( $country, $state, $postcode, $city, $tax_class ) {
 		global $wpdb;
 
-		$valid_postcodes = array_map( 'esc_sql', array_map( 'wc_clean', $valid_postcodes ) );
-		$match_country   = esc_sql( strtoupper( wc_clean( $country ) ) );
-		$match_state     = esc_sql( strtoupper( wc_clean( $state ) ) );
-		$match_tax_class = esc_sql( sanitize_title( $tax_class ) );
-		$match_city      = esc_sql( strtoupper( wc_clean( $city ) ) );
-		$found_rates     = $wpdb->get_results( "
+		// Query criteria - these will be ANDed
+		$criteria   = array();
+		$criteria[] = $wpdb->prepare( "tax_rate_country IN ( %s, '' )", strtoupper( $country ) );
+		$criteria[] = $wpdb->prepare( "tax_rate_state IN ( %s, '' )", strtoupper( $state ) );
+		$criteria[] = $wpdb->prepare( "tax_rate_class = %s", sanitize_title( $tax_class ) );
+
+		// Pre-query postcode ranges for PHP based matching.
+		$postcode_search = wc_get_wildcard_postcodes( $postcode, $country );
+		$postcode_ranges = $wpdb->get_results( "SELECT tax_rate_id, location_code FROM {$wpdb->prefix}woocommerce_tax_rate_locations WHERE location_type = 'postcode' AND location_code LIKE '%...%';" );
+
+		if ( $postcode_ranges ) {
+			$matches = wc_postcode_location_matcher( $postcode, $postcode_ranges, 'tax_rate_id', 'location_code', $country );
+			if ( ! empty( $matches ) ) {
+				foreach ( $matches as $matched_postcodes ) {
+					$postcode_search = array_merge( $postcode_search, $matched_postcodes );
+				}
+			}
+		}
+
+		$postcode_search = array_unique( $postcode_search );
+
+		/**
+		 * Location matching criteria - ORed
+		 * Needs to match:
+		 * 	- rates with no postcodes and cities
+		 * 	- rates with a matching postcode and city
+		 * 	- rates with matching postcode, no city
+		 * 	- rates with matching city, no postcode
+		 */
+		$locations_criteria   = array();
+		$locations_criteria[] = "locations.location_type IS NULL";
+		$locations_criteria[] = "
+			locations.location_type = 'postcode' AND locations.location_code IN ('" . implode( "','", array_map( 'esc_sql', $postcode_search ) ) . "')
+			AND (
+				( locations2.location_type = 'city' AND locations2.location_code = '" . esc_sql( strtoupper( $city ) ) . "' )
+				OR NOT EXISTS (
+					SELECT sub.tax_rate_id FROM {$wpdb->prefix}woocommerce_tax_rate_locations as sub
+					WHERE sub.location_type = 'city'
+					AND sub.tax_rate_id = tax_rates.tax_rate_id
+				)
+			)
+		";
+		$locations_criteria[] = "
+			locations.location_type = 'city' AND locations.location_code = '" . esc_sql( strtoupper( $city ) ) . "'
+			AND NOT EXISTS (
+				SELECT sub.tax_rate_id FROM {$wpdb->prefix}woocommerce_tax_rate_locations as sub
+				WHERE sub.location_type = 'postcode'
+				AND sub.tax_rate_id = tax_rates.tax_rate_id
+			)
+		";
+		$criteria[] = '( ( ' . implode( ' ) OR ( ', $locations_criteria ) . ' ) )';
+
+		$found_rates = $wpdb->get_results( "
 			SELECT tax_rates.*
 			FROM {$wpdb->prefix}woocommerce_tax_rates as tax_rates
 			LEFT OUTER JOIN {$wpdb->prefix}woocommerce_tax_rate_locations as locations ON tax_rates.tax_rate_id = locations.tax_rate_id
 			LEFT OUTER JOIN {$wpdb->prefix}woocommerce_tax_rate_locations as locations2 ON tax_rates.tax_rate_id = locations2.tax_rate_id
-			WHERE tax_rate_country IN ( '{$match_country}', '' )
-			AND tax_rate_state IN ( '{$match_state}', '' )
-			AND tax_rate_class = '{$match_tax_class}'
-			AND (
-				locations.location_type IS NULL
-				OR (
-					locations.location_type = 'postcode'
-					AND locations.location_code IN ('" . implode( "','", $valid_postcodes ) . "')
-					AND (
-						locations2.location_type = 'city' AND locations2.location_code = '{$match_city}'
-						OR 0 = (
-							SELECT COUNT(*) FROM {$wpdb->prefix}woocommerce_tax_rate_locations as sublocations
-							WHERE sublocations.location_type = 'city'
-							AND sublocations.tax_rate_id = tax_rates.tax_rate_id
-						)
-					)
-				)
-				OR (
-					locations.location_type = 'city'
-					AND locations.location_code = '{$match_city}'
-					AND 0 = (
-							SELECT COUNT(*) FROM {$wpdb->prefix}woocommerce_tax_rate_locations as sublocations
-							WHERE sublocations.location_type = 'postcode'
-							AND sublocations.tax_rate_id = tax_rates.tax_rate_id
-						)
-				)
-			)
-			GROUP BY tax_rate_id
-			ORDER BY tax_rate_priority, tax_rate_order
+			WHERE 1=1 AND " . implode( ' AND ', $criteria ) . "
+			GROUP BY tax_rates.tax_rate_id
+			ORDER BY tax_rates.tax_rate_priority
 		" );
 
+		$found_rates       = self::sort_rates( $found_rates );
 		$matched_tax_rates = array();
 		$found_priority    = array();
 
@@ -323,7 +429,7 @@ class WC_Tax {
 				'rate'     => $found_rate->tax_rate,
 				'label'    => $found_rate->tax_rate_name,
 				'shipping' => $found_rate->tax_rate_shipping ? 'yes' : 'no',
-				'compound' => $found_rate->tax_rate_compound ? 'yes' : 'no'
+				'compound' => $found_rate->tax_rate_compound ? 'yes' : 'no',
 			);
 
 			$found_priority[] = $found_rate->tax_rate_priority;
@@ -350,7 +456,7 @@ class WC_Tax {
 				WC()->countries->get_base_country(),
 				WC()->countries->get_base_state(),
 				WC()->countries->get_base_postcode(),
-				WC()->countries->get_base_city()
+				WC()->countries->get_base_city(),
 			);
 		}
 
@@ -375,7 +481,7 @@ class WC_Tax {
 				'state' 	=> $state,
 				'postcode' 	=> $postcode,
 				'city' 		=> $city,
-				'tax_class' => $tax_class
+				'tax_class' => $tax_class,
 			) );
 		}
 
@@ -394,7 +500,7 @@ class WC_Tax {
 			'state' 	=> WC()->countries->get_base_state(),
 			'postcode' 	=> WC()->countries->get_base_postcode(),
 			'city' 		=> WC()->countries->get_base_city(),
-			'tax_class' => $tax_class
+			'tax_class' => $tax_class,
 		) ), $tax_class );
 	}
 
@@ -417,8 +523,10 @@ class WC_Tax {
 	 */
 	public static function get_shipping_tax_rates( $tax_class = null ) {
 		// See if we have an explicitly set shipping tax class
-		if ( $shipping_tax_class = get_option( 'woocommerce_shipping_tax_class' ) ) {
-			$tax_class = 'standard' === $shipping_tax_class ? '' : $shipping_tax_class;
+		$shipping_tax_class = get_option( 'woocommerce_shipping_tax_class' );
+
+		if ( 'inherit' !== $shipping_tax_class ) {
+			$tax_class = $shipping_tax_class;
 		}
 
 		$location          = self::get_tax_location( $tax_class );
@@ -434,7 +542,7 @@ class WC_Tax {
 					'state' 	=> $state,
 					'postcode' 	=> $postcode,
 					'city' 		=> $city,
-					'tax_class' => $tax_class
+					'tax_class' => $tax_class,
 				) );
 
 			} else {
@@ -442,19 +550,18 @@ class WC_Tax {
 				// This will be per order shipping - loop through the order and find the highest tax class rate
 				$cart_tax_classes = WC()->cart->get_cart_item_tax_classes();
 
-				// If multiple classes are found, use the first one. Don't bother with standard rate, we can get that later.
+				// If multiple classes are found, use the first one found unless a standard rate item is found. This will be the first listed in the 'additonal tax class' section.
 				if ( sizeof( $cart_tax_classes ) > 1 && ! in_array( '', $cart_tax_classes ) ) {
-					$tax_classes = self::get_tax_classes();
+					$tax_classes = self::get_tax_class_slugs();
 
 					foreach ( $tax_classes as $tax_class ) {
-						$tax_class = sanitize_title( $tax_class );
 						if ( in_array( $tax_class, $cart_tax_classes ) ) {
 							$matched_tax_rates = self::find_shipping_rates( array(
 								'country' 	=> $country,
 								'state' 	=> $state,
 								'postcode' 	=> $postcode,
 								'city' 		=> $city,
-								'tax_class' => $tax_class
+								'tax_class' => $tax_class,
 							) );
 							break;
 						}
@@ -467,7 +574,7 @@ class WC_Tax {
 						'state' 	=> $state,
 						'postcode' 	=> $postcode,
 						'city' 		=> $city,
-						'tax_class' => $cart_tax_classes[0]
+						'tax_class' => $cart_tax_classes[0],
 					) );
 				}
 			}
@@ -478,7 +585,7 @@ class WC_Tax {
 					'country' 	=> $country,
 					'state' 	=> $state,
 					'postcode' 	=> $postcode,
-					'city' 		=> $city
+					'city' 		=> $city,
 				) );
 			}
 		}
@@ -489,12 +596,21 @@ class WC_Tax {
 	/**
 	 * Return true/false depending on if a rate is a compound rate.
 	 *
-	 * @param   int		key
+	 * @param mixed $key_or_rate Tax rate ID, or the db row itself in object format
 	 * @return  bool
 	 */
-	public static function is_compound( $key ) {
+	public static function is_compound( $key_or_rate ) {
 		global $wpdb;
-		return $wpdb->get_var( $wpdb->prepare( "SELECT tax_rate_compound FROM {$wpdb->prefix}woocommerce_tax_rates WHERE tax_rate_id = %s", $key ) ) ? true : false;
+
+		if ( is_object( $key_or_rate ) ) {
+			$key       = $key_or_rate->tax_rate_id;
+			$compound  = $key_or_rate->tax_rate_compound;
+		} else {
+			$key 	   = $key_or_rate;
+			$compound  = $wpdb->get_var( $wpdb->prepare( "SELECT tax_rate_compound FROM {$wpdb->prefix}woocommerce_tax_rates WHERE tax_rate_id = %s", $key ) ) ? true : false;
+		}
+
+		return (bool) apply_filters( 'woocommerce_rate_compound', $compound, $key );
 	}
 
 	/**
@@ -556,7 +672,7 @@ class WC_Tax {
 			$rate = $key_or_rate;
 		} else {
 			$key  = $key_or_rate;
-			$rate = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->prefix}woocommerce_tax_rates WHERE tax_rate_id = %s", $key ) );
+			$rate = $wpdb->get_row( $wpdb->prepare( "SELECT tax_rate_country, tax_rate_state, tax_rate_name, tax_rate_priority FROM {$wpdb->prefix}woocommerce_tax_rates WHERE tax_rate_id = %s", $key ) );
 		}
 
 		$code_string = '';
@@ -585,19 +701,20 @@ class WC_Tax {
 
 	/**
 	 * Get store tax classes.
-	 * @return array
+	 * @return array Array of class names ("Reduced rate", "Zero rate", etc).
 	 */
 	public static function get_tax_classes() {
 		return array_filter( array_map( 'trim', explode( "\n", get_option( 'woocommerce_tax_classes' ) ) ) );
 	}
 
 	/**
-	 * format the postcodes.
-	 * @param  string $postcode
-	 * @return string
+	 * Get store tax classes as slugs.
+	 *
+	 * @since  3.0.0
+	 * @return array Array of class slugs ("reduced-rate", "zero-rate", etc).
 	 */
-	private static function format_tax_rate_postcode( $postcode ) {
-		return strtoupper( trim( $postcode ) );
+	public static function get_tax_class_slugs() {
+		return array_map( 'sanitize_title', self::get_tax_classes() );
 	}
 
 	/**
@@ -616,7 +733,7 @@ class WC_Tax {
 	 */
 	private static function format_tax_rate_state( $state ) {
 		$state = strtoupper( $state );
-		return $state === '*' ? '' : $state;
+		return ( '*' === $state ) ? '' : $state;
 	}
 
 	/**
@@ -626,7 +743,7 @@ class WC_Tax {
 	 */
 	private static function format_tax_rate_country( $country ) {
 		$country = strtoupper( $country );
-		return $country === '*' ? '' : $country;
+		return ( '*' === $country ) ? '' : $country;
 	}
 
 	/**
@@ -662,12 +779,12 @@ class WC_Tax {
 	 * @return string
 	 */
 	public static function format_tax_rate_class( $class ) {
-		$class = sanitize_title( $class );
-		$sanitized_classes = array_map( 'sanitize_title', self::get_tax_classes() );
-		if ( ! in_array( $class, $sanitized_classes ) ) {
+		$class   = sanitize_title( $class );
+		$classes = self::get_tax_class_slugs();
+		if ( ! in_array( $class, $classes ) ) {
 			$class = '';
 		}
-		return $class === 'standard' ? '' : $class;
+		return ( 'standard' === $class ) ? '' : $class;
 	}
 
 	/**
@@ -716,18 +833,19 @@ class WC_Tax {
 	 * @since 2.5.0
 	 * @access private
 	 *
-	 * @param  int $tax_rate_id
+	 * @param int $tax_rate_id
+	 * @param string $output_type
 	 *
 	 * @return array
 	 */
-	public static function _get_tax_rate( $tax_rate_id ) {
+	public static function _get_tax_rate( $tax_rate_id, $output_type = ARRAY_A ) {
 		global $wpdb;
 
 		return $wpdb->get_row( $wpdb->prepare( "
 			SELECT *
 			FROM {$wpdb->prefix}woocommerce_tax_rates
 			WHERE tax_rate_id = %d
-		", $tax_rate_id ), ARRAY_A );
+		", $tax_rate_id ), $output_type );
 	}
 
 	/**
@@ -750,7 +868,7 @@ class WC_Tax {
 			$wpdb->prefix . "woocommerce_tax_rates",
 			self::prepare_tax_rate( $tax_rate ),
 			array(
-				'tax_rate_id' => $tax_rate_id
+				'tax_rate_id' => $tax_rate_id,
 			)
 		);
 
@@ -796,10 +914,11 @@ class WC_Tax {
 		if ( ! is_array( $postcodes ) ) {
 			$postcodes = explode( ';', $postcodes );
 		}
-		$postcodes = array_filter( array_diff( array_map( array( __CLASS__, 'format_tax_rate_postcode' ), $postcodes ), array( '*' ) ) );
-		$postcodes = self::_get_expanded_numeric_ranges_from_array( $postcodes );
-
-		self::_update_tax_rate_locations( $tax_rate_id, $postcodes, 'postcode' );
+		// No normalization - postcodes are matched against both normal and formatted versions to support wildcards.
+		foreach ( $postcodes as $key => $postcode ) {
+			$postcodes[ $key ] = strtoupper( trim( str_replace( chr( 226 ) . chr( 128 ) . chr( 166 ), '...', $postcode ) ) );
+		}
+		self::_update_tax_rate_locations( $tax_rate_id, array_diff( array_filter( $postcodes ), array( '*' ) ), 'postcode' );
 	}
 
 	/**
@@ -858,59 +977,6 @@ class WC_Tax {
 		WC_Cache_Helper::incr_cache_prefix( 'taxes' );
 	}
 
-	/**
-	 * Expands ranges in an array (used for zipcodes). e.g. 101-105 would expand to 101, 102, 103, 104, 105.
-	 *
-	 * Internal use only.
-	 *
-	 * @since 2.3.0
-	 * @access private
-	 *
-	 * @param  array  $values array of values
-	 * @return array expanded values
-	 */
-	private static function _get_expanded_numeric_ranges_from_array( $values = array() ) {
-		$expanded = array();
-		foreach ( $values as $value ) {
-			if ( strstr( $value, '-' ) ) {
-				$parts = array_map( 'absint', array_map( 'trim', explode( '-', $value ) ) );
-
-				for ( $expanded_value = $parts[0]; $expanded_value <= $parts[1]; $expanded_value ++ ) {
-					if ( strlen( $expanded_value ) < strlen( $parts[0] ) ) {
-						$expanded_value = str_pad( $expanded_value, strlen( $parts[0] ), "0", STR_PAD_LEFT );
-					}
-					$expanded[] = $expanded_value;
-				}
-			} else {
-				$expanded[] = trim( $value );
-			}
-		}
-		return array_filter( $expanded );
-	}
-
-	/**
-	 * Get postcode wildcards in array format.
-	 *
-	 * Internal use only.
-	 *
-	 * @since 2.3.0
-	 * @access private
-	 *
-	 * @param  string  $postcode array of values
-	 * @return string[] Array of postcodes with wildcards
-	 */
-	private static function _get_wildcard_postcodes( $postcode ) {
-		$postcodes         = array( '*', strtoupper( $postcode ), strtoupper( $postcode ) . '*' );
-		$postcode_length   = strlen( $postcode );
-		$wildcard_postcode = strtoupper( $postcode );
-
-		for ( $i = 0; $i < $postcode_length; $i ++ ) {
-			$wildcard_postcode = substr( $wildcard_postcode, 0, -1 );
-			$postcodes[] = $wildcard_postcode . '*';
-		}
-		return $postcodes;
-	}
-
 	/**
 	 * Used by admin settings page.
 	 *
@@ -922,11 +988,13 @@ class WC_Tax {
 		global $wpdb;
 
 		// Get all the rates and locations. Snagging all at once should significantly cut down on the number of queries.
-		$rates     = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM `{$wpdb->prefix}woocommerce_tax_rates` WHERE `tax_rate_class` = %s ORDER BY `tax_rate_order`;", sanitize_title( $tax_class ) ) );
+		$rates     = self::sort_rates( $wpdb->get_results( $wpdb->prepare( "SELECT * FROM `{$wpdb->prefix}woocommerce_tax_rates` WHERE `tax_rate_class` = %s;", sanitize_title( $tax_class ) ) ) );
 		$locations = $wpdb->get_results( "SELECT * FROM `{$wpdb->prefix}woocommerce_tax_rate_locations`" );
 
-		// Set the rates keys equal to their ids.
-		$rates = array_combine( wp_list_pluck( $rates, 'tax_rate_id' ), $rates );
+		if ( ! empty( $rates ) ) {
+			// Set the rates keys equal to their ids.
+			$rates = array_combine( wp_list_pluck( $rates, 'tax_rate_id' ), $rates );
+		}
 
 		// Drop the locations into the rates array.
 		foreach ( $locations as $location ) {
diff --git a/includes/class-wc-template-loader.php b/includes/class-wc-template-loader.php
index 576ddbb2ffe..7bb9ddfe63e 100644
--- a/includes/class-wc-template-loader.php
+++ b/includes/class-wc-template-loader.php
@@ -39,44 +39,22 @@ class WC_Template_Loader {
 	 * @return string
 	 */
 	public static function template_loader( $template ) {
-		$find = array( 'woocommerce.php' );
-		$file = '';
-
-		if ( is_single() && get_post_type() == 'product' ) {
-
-			$file 	= 'single-product.php';
-			$find[] = $file;
-			$find[] = WC()->template_path() . $file;
-
-		} elseif ( is_product_taxonomy() ) {
-
-			$term   = get_queried_object();
-
-			if ( is_tax( 'product_cat' ) || is_tax( 'product_tag' ) ) {
-				$file = 'taxonomy-' . $term->taxonomy . '.php';
-			} else {
-				$file = 'archive-product.php';
-			}
-
-			$find[] = 'taxonomy-' . $term->taxonomy . '-' . $term->slug . '.php';
-			$find[] = WC()->template_path() . 'taxonomy-' . $term->taxonomy . '-' . $term->slug . '.php';
-			$find[] = 'taxonomy-' . $term->taxonomy . '.php';
-			$find[] = WC()->template_path() . 'taxonomy-' . $term->taxonomy . '.php';
-			$find[] = $file;
-			$find[] = WC()->template_path() . $file;
-
-		} elseif ( is_post_type_archive( 'product' ) || is_page( wc_get_page_id( 'shop' ) ) ) {
-
-			$file 	= 'archive-product.php';
-			$find[] = $file;
-			$find[] = WC()->template_path() . $file;
-
+		if ( is_embed() ) {
+			return $template;
 		}
 
-		if ( $file ) {
-			$template       = locate_template( array_unique( $find ) );
+		if ( $default_file = self::get_template_loader_default_file() ) {
+			/**
+			 * Filter hook to choose which files to find before WooCommerce does it's own logic.
+			 *
+			 * @since 3.0.0
+			 * @var array
+			 */
+			$search_files = self::get_template_loader_files( $default_file );
+			$template     = locate_template( $search_files );
+
 			if ( ! $template || WC_TEMPLATE_DEBUG_MODE ) {
-				$template = WC()->plugin_path() . '/templates/' . $file;
+				$template = WC()->plugin_path() . '/templates/' . $default_file;
 			}
 		}
 
@@ -84,7 +62,57 @@ class WC_Template_Loader {
 	}
 
 	/**
-	 * comments_template_loader function.
+	 * Get the default filename for a template.
+	 *
+	 * @since  3.0.0
+	 * @return string
+	 */
+	private static function get_template_loader_default_file() {
+		if ( is_singular( 'product' ) ) {
+			$default_file = 'single-product.php';
+		} elseif ( is_product_taxonomy() ) {
+			$term = get_queried_object();
+
+			if ( is_tax( 'product_cat' ) || is_tax( 'product_tag' ) ) {
+				$default_file = 'taxonomy-' . $term->taxonomy . '.php';
+			} else {
+				$default_file = 'archive-product.php';
+			}
+		} elseif ( is_post_type_archive( 'product' ) || is_page( wc_get_page_id( 'shop' ) ) ) {
+			$default_file = 'archive-product.php';
+		} else {
+			$default_file = '';
+		}
+		return $default_file;
+	}
+
+	/**
+	 * Get an array of filenames to search for a given template.
+	 *
+	 * @since  3.0.0
+	 * @param  string $file The default file name.
+	 * @return string[]
+	 */
+	private static function get_template_loader_files( $default_file ) {
+		$search_files   = apply_filters( 'woocommerce_template_loader_files', array(), $default_file );
+		$search_files[] = 'woocommerce.php';
+
+		if ( is_product_taxonomy() ) {
+			$term   = get_queried_object();
+			$search_files[] = 'taxonomy-' . $term->taxonomy . '-' . $term->slug . '.php';
+			$search_files[] = WC()->template_path() . 'taxonomy-' . $term->taxonomy . '-' . $term->slug . '.php';
+			$search_files[] = 'taxonomy-' . $term->taxonomy . '.php';
+			$search_files[] = WC()->template_path() . 'taxonomy-' . $term->taxonomy . '.php';
+		}
+
+		$search_files[] = $default_file;
+		$search_files[] = WC()->template_path() . $default_file;
+
+		return array_unique( $search_files );
+	}
+
+	/**
+	 * Load comments template.
 	 *
 	 * @param mixed $template
 	 * @return string
@@ -99,7 +127,7 @@ class WC_Template_Loader {
 			trailingslashit( get_template_directory() ) . WC()->template_path(),
 			trailingslashit( get_stylesheet_directory() ),
 			trailingslashit( get_template_directory() ),
-			trailingslashit( WC()->plugin_path() ) . 'templates/'
+			trailingslashit( WC()->plugin_path() ) . 'templates/',
 		);
 
 		if ( WC_TEMPLATE_DEBUG_MODE ) {
diff --git a/includes/class-wc-tracker.php b/includes/class-wc-tracker.php
index 3648fb6fb08..9c784c42fa3 100644
--- a/includes/class-wc-tracker.php
+++ b/includes/class-wc-tracker.php
@@ -3,7 +3,7 @@
  * WooCommerce Tracker
  *
  * The WooCommerce tracker class adds functionality to track WooCommerce usage based on if the customer opted in.
- * No personal infomation is tracked, only general WooCommerce settings, general product, order and user counts and admin email for discount code.
+ * No personal information is tracked, only general WooCommerce settings, general product, order and user counts and admin email for discount code.
  *
  * @class 		WC_Tracker
  * @version		2.3.0
@@ -37,7 +37,7 @@ class WC_Tracker {
 	 * @param boolean $override
 	 */
 	public static function send_tracking_data( $override = false ) {
-		// Dont trigger this on AJAX Requests
+		// Don't trigger this on AJAX Requests
 		if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
 			return;
 		}
@@ -49,7 +49,7 @@ class WC_Tracker {
 				return;
 			}
 		} else {
-			// Make sure there is at least a 1 hour delay between override sends, we dont want duplicate calls due to double clicking links.
+			// Make sure there is at least a 1 hour delay between override sends, we don't want duplicate calls due to double clicking links.
 			$last_send = self::get_last_send_time();
 			if ( $last_send && $last_send > strtotime( '-1 hours' ) ) {
 				return;
@@ -60,7 +60,7 @@ class WC_Tracker {
 		update_option( 'woocommerce_tracker_last_send', time() );
 
 		$params   = self::get_tracking_data();
-		$response = wp_safe_remote_post( self::$api_url, array(
+		wp_safe_remote_post( self::$api_url, array(
 				'method'      => 'POST',
 				'timeout'     => 45,
 				'redirection' => 5,
@@ -68,7 +68,7 @@ class WC_Tracker {
 				'blocking'    => false,
 				'headers'     => array( 'user-agent' => 'WooCommerceTracker/' . md5( esc_url( home_url( '/' ) ) ) . ';' ),
 				'body'        => json_encode( $params ),
-				'cookies'     => array()
+				'cookies'     => array(),
 			)
 		);
 	}
@@ -104,6 +104,13 @@ class WC_Tracker {
 		$data['active_plugins']     = $all_plugins['active_plugins'];
 		$data['inactive_plugins']   = $all_plugins['inactive_plugins'];
 
+		// Jetpack & WooCommerce Connect
+		$data['jetpack_version']    = defined( 'JETPACK__VERSION' ) ? JETPACK__VERSION : 'none';
+		$data['jetpack_connected']  = ( class_exists( 'Jetpack' ) && is_callable( 'Jetpack::is_active' ) && Jetpack::is_active() ) ? 'yes' : 'no';
+		$data['jetpack_is_staging'] = ( class_exists( 'Jetpack' ) && is_callable( 'Jetpack::is_staging_site' ) && Jetpack::is_staging_site() ) ? 'yes' : 'no';
+		$data['connect_installed']  = class_exists( 'WC_Connect_Loader' ) ? 'yes' : 'no';
+		$data['connect_active']     = ( class_exists( 'WC_Connect_Loader' ) && wp_next_scheduled( 'wc_connect_fetch_service_schemas' ) ) ? 'yes' : 'no';
+
 		// Store count info
 		$data['users']              = self::get_user_counts();
 		$data['products']           = self::get_product_counts();
@@ -121,6 +128,9 @@ class WC_Tracker {
 		// Template overrides
 		$data['template_overrides'] = self::get_all_template_overrides();
 
+		// Template overrides
+		$data['admin_user_agents']  = self::get_admin_user_agents();
+
 		return apply_filters( 'woocommerce_tracker_data', $data );
 	}
 
@@ -129,21 +139,11 @@ class WC_Tracker {
 	 * @return array
 	 */
 	public static function get_theme_info() {
-		$wp_version = get_bloginfo( 'version' );
-
-		if ( version_compare( $wp_version, '3.4', '<' ) ) {
-			$theme_data = get_theme_data( get_stylesheet_directory() . '/style.css' );
-			$theme_name = $theme_data['Name'];
-			$theme_version = $theme_data['Version'];
-		} else {
-			$theme_data = wp_get_theme();
-			$theme_name = $theme_data->Name;
-			$theme_version = $theme_data->Version;
-		}
+		$theme_data        = wp_get_theme();
 		$theme_child_theme = is_child_theme() ? 'Yes' : 'No';
-		$theme_wc_support = ( ! current_theme_supports( 'woocommerce' ) && ! in_array( $theme_data->template, wc_get_core_supported_themes() ) ) ? 'No' : 'Yes';
+		$theme_wc_support  = ( ! current_theme_supports( 'woocommerce' ) && ! in_array( $theme_data->template, wc_get_core_supported_themes() ) ) ? 'No' : 'Yes';
 
-		return array( 'name' => $theme_name, 'version' => $theme_version, 'child_theme' => $theme_child_theme, 'wc_support' => $theme_wc_support );
+		return array( 'name' => $theme_data->Name, 'version' => $theme_data->Version, 'child_theme' => $theme_child_theme, 'wc_support' => $theme_wc_support );
 	}
 
 	/**
@@ -161,7 +161,7 @@ class WC_Tracker {
 		}
 
 		$wp_data['memory_limit'] = size_format( $memory );
-		$wp_data['debug_mode']   = ( defined('WP_DEBUG') && WP_DEBUG ) ? 'Yes' : 'No';
+		$wp_data['debug_mode']   = ( defined( 'WP_DEBUG' ) && WP_DEBUG ) ? 'Yes' : 'No';
 		$wp_data['locale']       = get_locale();
 		$wp_data['version']      = get_bloginfo( 'version' );
 		$wp_data['multisite']    = is_multisite() ? 'Yes' : 'No';
@@ -209,7 +209,7 @@ class WC_Tracker {
 	 */
 	private static function get_all_plugins() {
 		// Ensure get_plugins function is loaded
-		if( ! function_exists( 'get_plugins' ) ) {
+		if ( ! function_exists( 'get_plugins' ) ) {
 			include ABSPATH . '/wp-admin/includes/plugin.php';
 		}
 
@@ -235,10 +235,10 @@ class WC_Tracker {
 			}
 			if ( in_array( $k, $active_plugins_keys ) ) {
 				// Remove active plugins from list so we can show active and inactive separately
-				unset( $plugins[$k] );
-				$active_plugins[$k] = $formatted;
+				unset( $plugins[ $k ] );
+				$active_plugins[ $k ] = $formatted;
 			} else {
-				$plugins[$k] = $formatted;
+				$plugins[ $k ] = $formatted;
 			}
 		}
 
@@ -302,7 +302,7 @@ class WC_Tracker {
 		$active_gateways = array();
 		$gateways        = WC()->payment_gateways->payment_gateways();
 		foreach ( $gateways as $id => $gateway ) {
-			if ( isset( $gateway->enabled ) && $gateway->enabled == 'yes' ) {
+			if ( isset( $gateway->enabled ) && 'yes' === $gateway->enabled ) {
 				$active_gateways[ $id ] = array( 'title' => $gateway->title, 'supports' => $gateway->supports );
 			}
 		}
@@ -318,7 +318,7 @@ class WC_Tracker {
 		$active_methods   = array();
 		$shipping_methods = WC()->shipping->get_shipping_methods();
 		foreach ( $shipping_methods as $id => $shipping_method ) {
-			if ( isset( $shipping_method->enabled ) && $shipping_method->enabled == 'yes' ) {
+			if ( isset( $shipping_method->enabled ) && 'yes' === $shipping_method->enabled ) {
 				$active_methods[ $id ] = array( 'title' => $shipping_method->title, 'tax_status' => $shipping_method->tax_status );
 			}
 		}
@@ -343,7 +343,7 @@ class WC_Tracker {
 			'download_require_login'                => get_option( 'woocommerce_downloads_require_login' ),
 			'calc_taxes'                            => get_option( 'woocommerce_calc_taxes' ),
 			'coupons_enabled'                       => get_option( 'woocommerce_enable_coupons' ),
-			'guest_checkout'                        => get_option( 'woocommerce_enable_guest_checkout'),
+			'guest_checkout'                        => get_option( 'woocommerce_enable_guest_checkout' ),
 			'secure_checkout'                       => get_option( 'woocommerce_force_ssl_checkout' ),
 			'enable_signup_and_login_from_checkout' => get_option( 'woocommerce_enable_signup_and_login_from_checkout' ),
 			'enable_myaccount_registration'         => get_option( 'woocommerce_enable_myaccount_registration' ),
@@ -375,19 +375,27 @@ class WC_Tracker {
 					$theme_file = get_stylesheet_directory() . '/woocommerce/' . $file;
 				} elseif ( file_exists( get_template_directory() . '/' . $file ) ) {
 					$theme_file = get_template_directory() . '/' . $file;
-				} elseif( file_exists( get_template_directory() . '/woocommerce/' . $file ) ) {
+				} elseif ( file_exists( get_template_directory() . '/woocommerce/' . $file ) ) {
 					$theme_file = get_template_directory() . '/woocommerce/' . $file;
 				} else {
 					$theme_file = false;
 				}
 
-				if ( $theme_file !== false ) {
+				if ( false !== $theme_file ) {
 					$override_data[] = basename( $theme_file );
 				}
 			}
 		}
 		return $override_data;
 	}
+
+	/**
+	 * When an admin user logs in, there user agent is tracked in user meta and collected here.
+	 * @return array
+	 */
+	private static function get_admin_user_agents() {
+		return array_filter( (array) get_option( 'woocommerce_tracker_ua', array() ) );
+	}
 }
 
 WC_Tracker::init();
diff --git a/includes/class-wc-validation.php b/includes/class-wc-validation.php
index 0fbca96ef2b..b5d0c818167 100644
--- a/includes/class-wc-validation.php
+++ b/includes/class-wc-validation.php
@@ -16,9 +16,9 @@ if ( ! defined( 'ABSPATH' ) ) {
 class WC_Validation {
 
 	/**
-	 * Validates an email using wordpress native is_email function.
+	 * Validates an email using WordPress native is_email function.
 	 *
-	 * @param   string	email address
+	 * @param   string	$email Email address to validate.
 	 * @return  bool
 	 */
 	public static function is_email( $email ) {
@@ -28,11 +28,11 @@ class WC_Validation {
 	/**
 	 * Validates a phone number using a regular expression.
 	 *
-	 * @param   string	phone number
+	 * @param   string	$phone Phone number to validate.
 	 * @return  bool
 	 */
 	public static function is_phone( $phone ) {
-		if ( 0 < strlen( trim( preg_replace( '/[\s\#0-9_\-\+\(\)]/', '', $phone ) ) ) ) {
+		if ( 0 < strlen( trim( preg_replace( '/[\s\#0-9_\-\+\/\(\)]/', '', $phone ) ) ) ) {
 			return false;
 		}
 
@@ -42,8 +42,8 @@ class WC_Validation {
 	/**
 	 * Checks for a valid postcode.
 	 *
-	 * @param   string	postcode
-	 * @param	string	country
+	 * @param   string	$postcode Postcode to validate.
+	 * @param	string	$country Country to validate the postcode for.
 	 * @return  bool
 	 */
 	public static function is_postcode( $postcode, $country ) {
@@ -52,6 +52,9 @@ class WC_Validation {
 		}
 
 		switch ( $country ) {
+			case 'AT' :
+				$valid = (bool) preg_match( '/^([0-9]{4})$/', $postcode );
+				break;
 			case 'BR' :
 				$valid = (bool) preg_match( '/^([0-9]{5})([-])?([0-9]{3})$/', $postcode );
 				break;
@@ -61,15 +64,28 @@ class WC_Validation {
 			case 'DE' :
 				$valid = (bool) preg_match( '/^([0]{1}[1-9]{1}|[1-9]{1}[0-9]{1})[0-9]{3}$/', $postcode );
 				break;
+			case 'ES' :
+				$valid = (bool) preg_match( '/^([0-9]{5})$/i', $postcode );
+				break;
 			case 'GB' :
 				$valid = self::is_GB_postcode( $postcode );
 				break;
+			case 'JP' :
+				$valid = (bool) preg_match( '/^([0-9]{3})([-])([0-9]{4})$/', $postcode );
+				break;
 			case 'PT' :
 				$valid = (bool) preg_match( '/^([0-9]{4})([-])([0-9]{3})$/', $postcode );
 				break;
 			case 'US' :
 				$valid = (bool) preg_match( '/^([0-9]{5})(-[0-9]{4})?$/i', $postcode );
 				break;
+			case 'CA' :
+				// CA Postal codes cannot contain D,F,I,O,Q,U and cannot start with W or Z. https://en.wikipedia.org/wiki/Postal_codes_in_Canada#Number_of_possible_postal_codes
+				$valid = (bool) preg_match( '/^([ABCEGHJKLMNPRSTVXY]\d[ABCEGHJKLMNPRSTVWXYZ])([\ ])?(\d[ABCEGHJKLMNPRSTVWXYZ]\d)$/i', $postcode );
+				break;
+			case 'PL':
+				$valid = (bool) preg_match( '/^([0-9]{2})([-])([0-9]{3})$/', $postcode );
+				break;
 
 			default :
 				$valid = true;
@@ -89,7 +105,7 @@ class WC_Validation {
 	public static function is_GB_postcode( $to_check ) {
 
 		// Permitted letters depend upon their position in the postcode.
-		// http://en.wikipedia.org/wiki/Postcodes_in_the_United_Kingdom#Validation
+		// https://en.wikipedia.org/wiki/Postcodes_in_the_United_Kingdom#Validation
 		$alpha1 = "[abcdefghijklmnoprstuwyz]"; // Character 1
 		$alpha2 = "[abcdefghklmnopqrstuvwxy]"; // Character 2
 		$alpha3 = "[abcdefghjkpstuw]";         // Character 3 == ABCDEFGHJKPSTUW
@@ -99,16 +115,16 @@ class WC_Validation {
 		$pcexp = array();
 
 		// Expression for postcodes: AN NAA, ANN NAA, AAN NAA, and AANN NAA
-		$pcexp[0] = '/^('.$alpha1.'{1}'.$alpha2.'{0,1}[0-9]{1,2})([0-9]{1}'.$alpha5.'{2})$/';
+		$pcexp[0] = '/^(' . $alpha1 . '{1}' . $alpha2 . '{0,1}[0-9]{1,2})([0-9]{1}' . $alpha5 . '{2})$/';
 
 		// Expression for postcodes: ANA NAA
-		$pcexp[1] =  '/^('.$alpha1.'{1}[0-9]{1}'.$alpha3.'{1})([0-9]{1}'.$alpha5.'{2})$/';
+		$pcexp[1] = '/^(' . $alpha1 . '{1}[0-9]{1}' . $alpha3 . '{1})([0-9]{1}' . $alpha5 . '{2})$/';
 
 		// Expression for postcodes: AANA NAA
-		$pcexp[2] =  '/^('.$alpha1.'{1}'.$alpha2.'[0-9]{1}'.$alpha4.')([0-9]{1}'.$alpha5.'{2})$/';
+		$pcexp[2] = '/^(' . $alpha1 . '{1}' . $alpha2 . '[0-9]{1}' . $alpha4 . ')([0-9]{1}' . $alpha5 . '{2})$/';
 
 		// Exception for the special postcode GIR 0AA
-		$pcexp[3] =  '/^(gir)(0aa)$/';
+		$pcexp[3] = '/^(gir)(0aa)$/';
 
 		// Standard BFPO numbers
 		$pcexp[4] = '/^(bfpo)([0-9]{1,4})$/';
@@ -138,9 +154,9 @@ class WC_Validation {
 	/**
 	 * Format the postcode according to the country and length of the postcode.
 	 *
-	 * @param   string	postcode
-	 * @param	string	country
-	 * @return  string	formatted postcode
+	 * @param   string	$postcode Postcode to format.
+	 * @param	string	$country Country to format the postcode for.
+	 * @return  string	Formatted postcode.
 	 */
 	public static function format_postcode( $postcode, $country ) {
 		return wc_format_postcode( $postcode, $country );
@@ -149,8 +165,7 @@ class WC_Validation {
 	/**
 	 * format_phone function.
 	 *
-	 * @access public
-	 * @param mixed $tel
+	 * @param mixed $tel Phone number to format.
 	 * @return string
 	 */
 	public static function format_phone( $tel ) {
diff --git a/includes/class-wc-webhook.php b/includes/class-wc-webhook.php
index 8cafece0def..0e8245f120f 100644
--- a/includes/class-wc-webhook.php
+++ b/includes/class-wc-webhook.php
@@ -28,7 +28,6 @@ class WC_Webhook {
 	 *
 	 * @since 2.2
 	 * @param string|int $id
-	 * @return \WC_Webhook
 	 */
 	public function __construct( $id ) {
 
@@ -111,10 +110,10 @@ class WC_Webhook {
 		// webhooks are processed in the background by default
 		// so as to avoid delays or failures in delivery from affecting the
 		// user who triggered it
-		if ( apply_filters( 'woocommerce_webhook_deliver_async', true, $this ) ) {
+		if ( apply_filters( 'woocommerce_webhook_deliver_async', true, $this, $arg ) ) {
 
 			// deliver in background
-			wp_schedule_single_event( time(), 'woocommerce_deliver_webhook_async', array( $this->id, is_scalar( $arg ) ? $arg : 0 ) );
+			wp_schedule_single_event( time(), 'woocommerce_deliver_webhook_async', array( $this->id, $arg ) );
 
 		} else {
 
@@ -132,46 +131,57 @@ class WC_Webhook {
 	 * @return bool true if webhook should be delivered, false otherwise
 	 */
 	private function should_deliver( $arg ) {
+		$should_deliver = true;
+		$current_action = current_action();
 
 		// only active webhooks can be delivered
 		if ( 'active' != $this->get_status() ) {
-			return false;
-		}
-
-		$current_action = current_action();
-
-		// only deliver deleted event for coupons, orders, and products
-		if ( 'delete_post' == $current_action && ! in_array( $GLOBALS['post_type'], array( 'shop_coupon', 'shop_order', 'product' ) ) ) {
-			return false;
+			$should_deliver = false;
+		} elseif ( in_array( $current_action, array( 'delete_post', 'wp_trash_post', 'untrashed_post' ), true ) ) {
+			// Only deliver deleted/restored event for coupons, orders, and products.
+			if ( isset( $GLOBALS['post_type'] ) && ! in_array( $GLOBALS['post_type'], array( 'shop_coupon', 'shop_order', 'product' ) ) ) {
+				$should_deliver = false;
+			}
 
+			// Check if is delivering for the correct resource.
+			if ( isset( $GLOBALS['post_type'] ) && str_replace( 'shop_', '', $GLOBALS['post_type'] ) !== $this->get_resource() ) {
+				$should_deliver = false;
+			}
 		} elseif ( 'delete_user' == $current_action ) {
 			$user = get_userdata( absint( $arg ) );
 
 			// only deliver deleted customer event for users with customer role
 			if ( ! $user || ! in_array( 'customer', (array) $user->roles ) ) {
-				return false;
+				$should_deliver = false;
 			}
 
 		// check if the custom order type has chosen to exclude order webhooks from triggering along with its own webhooks.
 		} elseif ( 'order' == $this->get_resource() && ! in_array( get_post_type( absint( $arg ) ), wc_get_order_types( 'order-webhooks' ) ) ) {
-			return false;
+			$should_deliver = false;
 
-		} elseif ( 0 === strpos( $current_action, 'woocommerce_process_shop' ) ) {
-			// the `woocommerce_process_shop_*` hook fires for both updates
-			// and creation so check the post creation date to determine the actual event
+		} elseif ( 0 === strpos( $current_action, 'woocommerce_process_shop' ) || 0 === strpos( $current_action, 'woocommerce_process_product' ) ) {
+			// the `woocommerce_process_shop_*` and `woocommerce_process_product_*` hooks
+			// fire for create and update of products and orders, so check the post
+			// creation date to determine the actual event
 			$resource = get_post( absint( $arg ) );
 
+			// Drafts don't have post_date_gmt so calculate it here
+			$gmt_date = get_gmt_from_date( $resource->post_date );
+
 			// a resource is considered created when the hook is executed within 10 seconds of the post creation date
-			$resource_created = ( ( time() - 10 ) <= strtotime( $resource->post_date_gmt ) );
+			$resource_created = ( ( time() - 10 ) <= strtotime( $gmt_date ) );
 
 			if ( 'created' == $this->get_event() && ! $resource_created ) {
-				return false;
+				$should_deliver = false;
 			} elseif ( 'updated' == $this->get_event() && $resource_created ) {
-				return false;
+				$should_deliver = false;
 			}
 		}
 
-		return true;
+		/*
+		 * Let other plugins intercept deliver for some messages queue like rabbit/zeromq
+		 */
+		return apply_filters( 'woocommerce_webhook_should_deliver', $should_deliver, $this, $arg );
 	}
 
 
@@ -179,13 +189,12 @@ class WC_Webhook {
 	 * Deliver the webhook payload using wp_safe_remote_request().
 	 *
 	 * @since 2.2
-	 * @param mixed $arg first hook argument
+	 * @param mixed $arg First hook argument.
 	 */
 	public function deliver( $arg ) {
-
 		$payload = $this->build_payload( $arg );
 
-		// setup request args
+		// Setup request args.
 		$http_args = array(
 			'method'      => 'POST',
 			'timeout'     => MINUTE_IN_SECONDS,
@@ -200,7 +209,8 @@ class WC_Webhook {
 
 		$http_args = apply_filters( 'woocommerce_webhook_http_args', $http_args, $arg, $this->id );
 
-		// add custom headers
+		// Add custom headers.
+		$http_args['headers']['X-WC-Webhook-Source']      = home_url( '/' ); // Since 2.6.0.
 		$http_args['headers']['X-WC-Webhook-Topic']       = $this->get_topic();
 		$http_args['headers']['X-WC-Webhook-Resource']    = $this->get_resource();
 		$http_args['headers']['X-WC-Webhook-Event']       = $this->get_event();
@@ -210,7 +220,7 @@ class WC_Webhook {
 
 		$start_time = microtime( true );
 
-		// webhook away!
+		// Webhook away!
 		$response = wp_safe_remote_request( $this->get_delivery_url(), $http_args );
 
 		$duration = round( microtime( true ) - $start_time, 5 );
@@ -220,6 +230,103 @@ class WC_Webhook {
 		do_action( 'woocommerce_webhook_delivery', $http_args, $response, $duration, $arg, $this->id );
 	}
 
+	/**
+	 * Get Legacy API payload.
+	 *
+	 * @since  3.0.0
+	 * @param  string $resource    Resource type.
+	 * @param  int    $resource_id Resource ID.
+	 * @param  string $event       Event type.
+	 * @return array
+	 */
+	private function get_legacy_api_payload( $resource, $resource_id, $event ) {
+		// Include & load API classes.
+		WC()->api->includes();
+		WC()->api->register_resources( new WC_API_Server( '/' ) );
+
+		switch ( $resource ) {
+			case 'coupon' :
+				$payload = WC()->api->WC_API_Coupons->get_coupon( $resource_id );
+				break;
+
+			case 'customer' :
+				$payload = WC()->api->WC_API_Customers->get_customer( $resource_id );
+				break;
+
+			case 'order' :
+				$payload = WC()->api->WC_API_Orders->get_order( $resource_id, null, apply_filters( 'woocommerce_webhook_order_payload_filters', array() ) );
+				break;
+
+			case 'product' :
+				// Bulk and quick edit action hooks return a product object instead of an ID.
+				if ( 'updated' === $event && is_a( $resource_id, 'WC_Product' ) ) {
+					$resource_id = $resource_id->get_id();
+				}
+				$payload = WC()->api->WC_API_Products->get_product( $resource_id );
+				break;
+
+			// Custom topics include the first hook argument.
+			case 'action' :
+				$payload = array(
+					'action' => current( $this->get_hooks() ),
+					'arg'    => $resource_id,
+				);
+				break;
+
+			default :
+				$payload = array();
+				break;
+		}
+
+		return $payload;
+	}
+
+	/**
+	 * Get WP API integration payload.
+	 *
+	 * @since  3.0.0
+	 * @param  string $resource    Resource type.
+	 * @param  int    $resource_id Resource ID.
+	 * @param  string $event       Event type.
+	 * @return array
+	 */
+	private function get_wp_api_payload( $resource, $resource_id, $event ) {
+		$version_suffix = 'wp_api_v1' === $this->get_api_version() ? '_V1' : '';
+
+		switch ( $resource ) {
+			case 'coupon' :
+			case 'customer' :
+			case 'order' :
+			case 'product' :
+				$class      = 'WC_REST_' . ucfirst( $resource ) . 's' . $version_suffix . '_Controller';
+				$request    = new WP_REST_Request( 'GET' );
+				$controller = new $class;
+
+				// Bulk and quick edit action hooks return a product object instead of an ID.
+				if ( 'product' === $resource && 'updated' === $event && is_a( $resource_id, 'WC_Product' ) ) {
+					$resource_id = $resource_id->get_id();
+				}
+
+				$request->set_param( 'id', $resource_id );
+				$result  = $controller->get_item( $request );
+				$payload = isset( $result->data ) ? $result->data : array();
+				break;
+
+			// Custom topics include the first hook argument.
+			case 'action' :
+				$payload = array(
+					'action' => current( $this->get_hooks() ),
+					'arg'    => $resource_id,
+				);
+				break;
+
+			default :
+				$payload = array();
+				break;
+		}
+
+		return $payload;
+	}
 
 	/**
 	 * Build the payload data for the webhook.
@@ -229,7 +336,6 @@ class WC_Webhook {
 	 * @return mixed payload data
 	 */
 	private function build_payload( $resource_id ) {
-
 		// build the payload with the same user context as the user who created
 		// the webhook -- this avoids permission errors as background processing
 		// runs with no user context
@@ -239,51 +345,20 @@ class WC_Webhook {
 		$resource = $this->get_resource();
 		$event    = $this->get_event();
 
-		// if a resource has been deleted, just include the ID
+		// If a resource has been deleted, just include the ID.
 		if ( 'deleted' == $event ) {
-
 			$payload = array(
 				'id' => $resource_id,
 			);
-
 		} else {
-
-			// include & load API classes
-			WC()->api->includes();
-			WC()->api->register_resources( new WC_API_Server( '/' ) );
-
-			switch( $resource ) {
-
-				case 'coupon':
-					$payload = WC()->api->WC_API_Coupons->get_coupon( $resource_id );
-					break;
-
-				case 'customer':
-					$payload = WC()->api->WC_API_Customers->get_customer( $resource_id );
-					break;
-
-				case 'order':
-					$payload = WC()->api->WC_API_Orders->get_order( $resource_id );
-					break;
-
-				case 'product':
-					$payload = WC()->api->WC_API_Products->get_product( $resource_id );
-					break;
-
-				// custom topics include the first hook argument
-				case 'action':
-					$payload = array(
-						'action' => current( $this->get_hooks() ),
-						'arg'    => $resource_id,
-					);
-					break;
-
-				default:
-					$payload = array();
+			if ( in_array( $this->get_api_version(), array( 'wp_api_v1', 'wp_api_v2' ), true ) ) {
+				$payload = $this->get_wp_api_payload( $resource, $resource_id, $event );
+			} else {
+				$payload = $this->get_legacy_api_payload( $resource, $resource_id, $event );
 			}
 		}
 
-		// restore the current user
+		// Restore the current user.
 		wp_set_current_user( $current_user );
 
 		return apply_filters( 'woocommerce_webhook_payload', $payload, $resource, $resource_id, $this->id );
@@ -338,7 +413,7 @@ class WC_Webhook {
 	 * @since 2.2
 	 * @param int $delivery_id previously created comment ID
 	 * @param array $request request data
-	 * @param array $response response data
+	 * @param array|WP_Error $response response data
 	 * @param float $duration request duration
 	 */
 	public function log_delivery( $delivery_id, $request, $response, $duration ) {
@@ -352,7 +427,8 @@ class WC_Webhook {
 		if ( is_wp_error( $response ) ) {
 			$response_code    = $response->get_error_code();
 			$response_message = $response->get_error_message();
-			$response_headers = $response_body = array();
+			$response_headers = array();
+			$response_body    = '';
 
 		} else {
 			$response_code    = wp_remote_retrieve_response_code( $response );
@@ -543,12 +619,18 @@ class WC_Webhook {
 			'coupon.deleted' => array(
 				'wp_trash_post',
 			),
+			'coupon.restored' => array(
+				'untrashed_post',
+			),
 			'customer.created' => array(
+				'user_register',
 				'woocommerce_created_customer',
+				'woocommerce_api_create_customer',
 			),
 			'customer.updated' => array(
 				'profile_update',
 				'woocommerce_api_edit_customer',
+				'woocommerce_customer_save_address',
 			),
 			'customer.deleted' => array(
 				'delete_user',
@@ -562,11 +644,14 @@ class WC_Webhook {
 				'woocommerce_process_shop_order_meta',
 				'woocommerce_api_edit_order',
 				'woocommerce_order_edit_status',
-				'woocommerce_order_status_changed'
+				'woocommerce_order_status_changed',
 			),
 			'order.deleted' => array(
 				'wp_trash_post',
 			),
+			'order.restored' => array(
+				'untrashed_post',
+			),
 			'product.created' => array(
 				'woocommerce_process_product_meta',
 				'woocommerce_api_create_product',
@@ -574,10 +659,15 @@ class WC_Webhook {
 			'product.updated' => array(
 				'woocommerce_process_product_meta',
 				'woocommerce_api_edit_product',
+				'woocommerce_product_quick_edit_save',
+				'woocommerce_product_bulk_edit_save',
 			),
 			'product.deleted' => array(
 				'wp_trash_post',
 			),
+			'product.restored' => array(
+				'untrashed_post',
+			),
 		);
 
 		$topic_hooks = apply_filters( 'woocommerce_webhook_topic_hooks', $topic_hooks, $this );
@@ -813,4 +903,33 @@ class WC_Webhook {
 		return $this->post_data;
 	}
 
+	/**
+	 * Set API version.
+	 *
+	 * @since 3.0.0
+	 * @param string $version REST API version.
+	 */
+	public function set_api_version( $version ) {
+		$versions = array(
+			'wp_api_v2',
+			'wp_api_v1',
+			'legacy_v3',
+		);
+
+		if ( ! in_array( $version, $versions, true ) ) {
+			$version = 'wp_api_v2';
+		}
+
+		update_post_meta( $this->id, '_api_version', $version );
+	}
+
+	/**
+	 * API version.
+	 *
+	 * @since  3.0.0
+	 * @return string
+	 */
+	public function get_api_version() {
+		return $this->api_version ? $this->api_version : 'legacy_v3';
+	}
 }
diff --git a/includes/cli/class-wc-cli-command.php b/includes/cli/class-wc-cli-command.php
deleted file mode 100644
index a11d683286c..00000000000
--- a/includes/cli/class-wc-cli-command.php
+++ /dev/null
@@ -1,397 +0,0 @@
-<?php
-
-/**
- * WooCommerce CLI Command.
- *
- * Base class that must be extended by any WooCommerce sub commands.
- *
- * @class    WC_CLI_Command
- * @version  2.5.0
- * @package  WooCommerce/CLI
- * @category CLI
- * @author   WooThemes
- */
-class WC_CLI_Command extends WP_CLI_Command {
-
-	/**
-	 * Add common cli arguments to argument list before WP_Query is run.
-	 *
-	 * @since  2.5.0
-	 * @param  array $base_args  Required arguments for the query (e.g. `post_type`, etc)
-	 * @param  array $assoc_args Arguments provided in when invoking the command
-	 * @return array
-	 */
-	protected function merge_wp_query_args( $base_args, $assoc_args ) {
-		$args = array();
-
-		// date
-		if ( ! empty( $assoc_args['created_at_min'] ) || ! empty( $assoc_args['created_at_max'] ) || ! empty( $assoc_args['updated_at_min'] ) || ! empty( $assoc_args['updated_at_max'] ) ) {
-
-			$args['date_query'] = array();
-
-			// resources created after specified date
-			if ( ! empty( $assoc_args['created_at_min'] ) ) {
-				$args['date_query'][] = array( 'column' => 'post_date_gmt', 'after' => $this->parse_datetime( $assoc_args['created_at_min'] ), 'inclusive' => true );
-			}
-
-			// resources created before specified date
-			if ( ! empty( $assoc_args['created_at_max'] ) ) {
-				$args['date_query'][] = array( 'column' => 'post_date_gmt', 'before' => $this->parse_datetime( $assoc_args['created_at_max'] ), 'inclusive' => true );
-			}
-
-			// resources updated after specified date
-			if ( ! empty( $assoc_args['updated_at_min'] ) ) {
-				$args['date_query'][] = array( 'column' => 'post_modified_gmt', 'after' => $this->parse_datetime( $assoc_args['updated_at_min'] ), 'inclusive' => true );
-			}
-
-			// resources updated before specified date
-			if ( ! empty( $assoc_args['updated_at_max'] ) ) {
-				$args['date_query'][] = array( 'column' => 'post_modified_gmt', 'before' => $this->parse_datetime( $assoc_args['updated_at_max'] ), 'inclusive' => true );
-			}
-		}
-
-		// Search.
-		if ( ! empty( $assoc_args['q'] ) ) {
-			$args['s'] = $assoc_args['q'];
-		}
-
-		// Number of post to show per page.
-		if ( ! empty( $assoc_args['limit'] ) ) {
-			$args['posts_per_page'] = $assoc_args['limit'];
-		}
-
-		// Number of post to displace or pass over.
-		if ( ! empty( $assoc_args['offset'] ) ) {
-			$args['offset'] = $assoc_args['offset'];
-		}
-
-		// order (ASC or DESC, DESC by default).
-		if ( ! empty( $assoc_args['order'] ) ) {
-			$args['order'] = $assoc_args['order'];
-		}
-
-		// orderby.
-		if ( ! empty( $assoc_args['orderby'] ) ) {
-			$args['orderby'] = $assoc_args['orderby'];
-
-			// allow sorting by meta value
-			if ( ! empty( $assoc_args['orderby_meta_key'] ) ) {
-				$args['meta_key'] = $assoc_args['orderby_meta_key'];
-			}
-		}
-
-		// allow post status change
-		if ( ! empty( $assoc_args['post_status'] ) ) {
-			$args['post_status'] = $assoc_args['post_status'];
-			unset( $assoc_args['post_status'] );
-		}
-
-		// filter by a list of post ids
-		if ( ! empty( $assoc_args['in'] ) ) {
-			$args['post__in'] = explode( ',', $assoc_args['in'] );
-			unset( $assoc_args['in'] );
-		}
-
-		// exclude by a list of post ids
-		if ( ! empty( $assoc_args['not_in'] ) ) {
-			$args['post__not_in'] = explode( ',', $assoc_args['not_in'] );
-			unset( $assoc_args['not_in'] );
-		}
-
-		// posts page.
-		$args['paged'] = ( isset( $assoc_args['page'] ) ) ? absint( $assoc_args['page'] ) : 1;
-
-		$args = apply_filters( 'woocommerce_cli_query_args', $args, $assoc_args );
-
-		return array_merge( $base_args, $args );
-	}
-
-	/**
-	 * Add common cli arguments to argument list before WP_User_Query is run.
-	 *
-	 * @since  2.5.0
-	 * @param  array $base_args required arguments for the query (e.g. `post_type`, etc)
-	 * @param  array $assoc_args arguments provided in when invoking the command
-	 * @return array
-	 */
-	protected function merge_wp_user_query_args( $base_args, $assoc_args ) {
-		$args = array();
-
-		// Custom Role
-		if ( ! empty( $assoc_args['role'] ) ) {
-			$args['role'] = $assoc_args['role'];
-		}
-
-		// Search
-		if ( ! empty( $assoc_args['q'] ) ) {
-			$args['search'] = $assoc_args['q'];
-		}
-
-		// Limit number of users returned.
-		if ( ! empty( $assoc_args['limit'] ) ) {
-			$args['number'] = absint( $assoc_args['limit'] );
-		}
-
-		// Offset
-		if ( ! empty( $assoc_args['offset'] ) ) {
-			$args['offset'] = absint( $assoc_args['offset'] );
-		}
-
-		// date
-		if ( ! empty( $assoc_args['created_at_min'] ) || ! empty( $assoc_args['created_at_max'] ) ) {
-
-			$args['date_query'] = array();
-
-			// resources created after specified date
-			if ( ! empty( $assoc_args['created_at_min'] ) ) {
-				$args['date_query'][] = array( 'after' => $this->parse_datetime( $assoc_args['created_at_min'] ), 'inclusive' => true );
-			}
-
-			// resources created before specified date
-			if ( ! empty( $assoc_args['created_at_max'] ) ) {
-				$args['date_query'][] = array( 'before' => $this->parse_datetime( $assoc_args['created_at_max'] ), 'inclusive' => true );
-			}
-		}
-
-		// Order (ASC or DESC, ASC by default).
-		if ( ! empty( $assoc_args['order'] ) ) {
-			$args['order'] = $assoc_args['order'];
-		}
-
-		// Orderby.
-		if ( ! empty( $assoc_args['orderby'] ) ) {
-			$args['orderby'] = $assoc_args['orderby'];
-		}
-
-		$args = apply_filters( 'woocommerce_cli_user_query_args', $args, $assoc_args );
-
-		return array_merge( $base_args, $args );
-	}
-
-	/**
-	 * Parse an RFC3339 datetime into a MySQl datetime.
-	 *
-	 * Invalid dates default to unix epoch.
-	 *
-	 * @since  2.5.0
-	 * @param  string $datetime RFC3339 datetime
-	 * @return string MySQl datetime (YYYY-MM-DD HH:MM:SS)
-	 */
-	protected function parse_datetime( $datetime ) {
-		// Strip millisecond precision (a full stop followed by one or more digits)
-		if ( strpos( $datetime, '.' ) !== false ) {
-			$datetime = preg_replace( '/\.\d+/', '', $datetime );
-		}
-
-		// default timezone to UTC
-		$datetime = preg_replace( '/[+-]\d+:+\d+$/', '+00:00', $datetime );
-
-		try {
-
-			$datetime = new DateTime( $datetime, new DateTimeZone( 'UTC' ) );
-
-		} catch ( Exception $e ) {
-
-			$datetime = new DateTime( '@0' );
-
-		}
-
-		return $datetime->format( 'Y-m-d H:i:s' );
-	}
-
-	/**
-	 * Format a unix timestamp or MySQL datetime into an RFC3339 datetime.
-	 *
-	 * @since  2.5.0
-	 * @param  int|string $timestamp unix timestamp or MySQL datetime
-	 * @param  bool $convert_to_utc
-	 * @return string RFC3339 datetime
-	 */
-	protected function format_datetime( $timestamp, $convert_to_utc = false ) {
-		if ( $convert_to_utc ) {
-			$timezone = new DateTimeZone( wc_timezone_string() );
-		} else {
-			$timezone = new DateTimeZone( 'UTC' );
-		}
-
-		try {
-			if ( is_numeric( $timestamp ) ) {
-				$date = new DateTime( "@{$timestamp}" );
-			} else {
-				$date = new DateTime( $timestamp, $timezone );
-			}
-
-			// convert to UTC by adjusting the time based on the offset of the site's timezone
-			if ( $convert_to_utc ) {
-				$date->modify( -1 * $date->getOffset() . ' seconds' );
-			}
-
-		} catch ( Exception $e ) {
-			$date = new DateTime( '@0' );
-		}
-
-		return $date->format( 'Y-m-d\TH:i:s\Z' );
-	}
-
-	/**
-	 * Get formatter object based on supplied arguments.
-	 *
-	 * @since  2.5.0
-	 * @param  array $assoc_args Associative args from CLI to determine formatting
-	 * @return \WP_CLI\Formatter
-	 */
-	protected function get_formatter( $assoc_args ) {
-		$args = $this->get_format_args( $assoc_args );
-		return new \WP_CLI\Formatter( $args );
-	}
-
-	/**
-	 * Get default fields for formatter.
-	 *
-	 * Class that extends WC_CLI_Command should override this method.
-	 *
-	 * @since  2.5.0
-	 * @return null|string|array
-	 */
-	protected function get_default_format_fields() {
-		return null;
-	}
-
-	/**
-	 * Get format args that will be passed into CLI Formatter.
-	 *
-	 * @since  2.5.0
-	 * @param  array $assoc_args Associative args from CLI
-	 * @return array Formatter args
-	 */
-	protected function get_format_args( $assoc_args ) {
-		$format_args = array(
-			'fields' => $this->get_default_format_fields(),
-			'field'  => null,
-			'format' => 'table',
-		);
-
-		if ( isset( $assoc_args['fields'] ) ) {
-			$format_args['fields'] = $assoc_args['fields'];
-		}
-
-		if ( isset( $assoc_args['field'] ) ) {
-			$format_args['field'] = $assoc_args['field'];
-		}
-
-		if ( ! empty( $assoc_args['format'] ) && in_array( $assoc_args['format'], array( 'count', 'ids', 'table', 'csv', 'json' ) ) ) {
-			$format_args['format'] = $assoc_args['format'];
-		}
-
-		return $format_args;
-	}
-
-	/**
-	 * Flatten multidimensional array in which nested array will be prefixed with
-	 * parent keys separated with dot char, e.g. given an array:
-	 *
-	 *     array(
-	 *         'a' => array(
-	 *             'b' => array(
-	 *                 'c' => ...
-	 *             )
-	 *         )
-	 *     )
-	 *
-	 * a flatten array would contain key 'a.b.c' => ...
-	 *
-	 * @since 2.5.0
-	 * @param array  $arr    Array that may contains nested array
-	 * @param string $prefix Prefix
-	 *
-	 * @return array Flattened array
-	 */
-	protected function flatten_array( $arr, $prefix = '' ) {
-		$flattened = array();
-		foreach ( $arr as $key => $value ) {
-			if ( is_array( $value ) ) {
-				if ( sizeof( $value ) > 0 ) {
-
-					// Full access to whole elements if indices are numerical.
-					$flattened[ $prefix . $key ] = $value;
-
-					// This is naive assumption that if element with index zero
-					// exists then array indices are numberical.
-					if ( ! empty( $value[0] ) ) {
-
-						// Allow size of array to be accessed, i.e., a.b.arr.size
-						$flattened[ $prefix . $key . '.size' ] = sizeof( $value );
-					}
-
-					$flattened = array_merge( $flattened, $this->flatten_array( $value, $prefix . $key . '.' ) );
-				} else {
-					$flattened[ $prefix . $key ] = '';
-
-					// Tells user that size of this array is zero.
-					$flattened[ $prefix . $key . '.size' ] = 0;
-				}
-			} else {
-				$flattened[ $prefix . $key ] = $value;
-			}
-		}
-
-		return $flattened;
-	}
-
-	/**
-	 * Unflatten array will make key 'a.b.c' becomes nested array:
-	 *
-	 *     array(
-	 *         'a' => array(
-	 *             'b' => array(
-	 *                 'c' => ...
-	 *             )
-	 *         )
-	 *     )
-	 *
-	 * @since  2.5.0
-	 * @param  array $arr Flattened array
-	 * @return array
-	 */
-	protected function unflatten_array( $arr ) {
-		$unflatten = array();
-
-		foreach ( $arr as $key => $value ) {
-			$key_list  = explode( '.', $key );
-			$first_key = array_shift( $key_list );
-			$first_key = $this->get_normalized_array_key( $first_key );
-			if ( sizeof( $key_list ) > 0 ) {
-				$remaining_keys = implode( '.', $key_list );
-				$subarray       = $this->unflatten_array( array( $remaining_keys => $value ) );
-
-				foreach ( $subarray as $sub_key => $sub_value ) {
-					$sub_key = $this->get_normalized_array_key( $sub_key );
-					if ( ! empty( $unflatten[ $first_key ][ $sub_key ] ) ) {
-						$unflatten[ $first_key ][ $sub_key ] = array_merge( $unflatten[ $first_key ][ $sub_key ], $sub_value );
-					} else {
-						$unflatten[ $first_key ][ $sub_key ] = $sub_value;
-					}
-				}
-			} else {
-				$unflatten[ $first_key ] = $value;
-			}
-		}
-
-		return $unflatten;
-	}
-
-	/**
-	 * Get normalized array key. If key is a numeric one it will be converted
-	 * as absolute integer.
-	 *
-	 * @since  2.5.0
-	 * @param  string $key Array key
-	 * @return string|int
-	 */
-	protected function get_normalized_array_key( $key ) {
-		if ( is_numeric( $key ) ) {
-			$key = absint( $key );
-		}
-		return $key;
-	}
-}
diff --git a/includes/cli/class-wc-cli-coupon.php b/includes/cli/class-wc-cli-coupon.php
deleted file mode 100644
index 75440a30f69..00000000000
--- a/includes/cli/class-wc-cli-coupon.php
+++ /dev/null
@@ -1,664 +0,0 @@
-<?php
-
-/**
- * Manage Coupons.
- *
- * @since    2.5.0
- * @package  WooCommerce/CLI
- * @category CLI
- * @author   WooThemes
- */
-class WC_CLI_Coupon extends WC_CLI_Command {
-
-	/**
-	 * Create a coupon.
-	 *
-	 * ## OPTIONS
-	 *
-	 * [--<field>=<value>]
-	 * : Associative args for the new coupon.
-	 *
-	 * [--porcelain]
-	 * : Outputs just the new coupon id.
-	 *
-	 * ## AVAILABLE FIELDS
-	 *
-	 * These fields are available for create command:
-	 *
-	 * * code
-	 * * type
-	 * * amount
-	 * * description
-	 * * expiry_date
-	 * * individual_use
-	 * * product_ids
-	 * * exclude_product_ids
-	 * * usage_limit
-	 * * usage_limit_per_user
-	 * * limit_usage_to_x_items
-	 * * usage_count
-	 * * enable_free_shipping
-	 * * product_category_ids
-	 * * exclude_product_category_ids
-	 * * minimum_amount
-	 * * maximum_amount
-	 * * customer_emails
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc coupon create --code=new-coupon --type=percent
-	 *
-	 */
-	public function create( $__, $assoc_args ) {
-		global $wpdb;
-
-		try {
-			$porcelain = isset( $assoc_args['porcelain'] );
-			unset( $assoc_args['porcelain'] );
-
-			$assoc_args = apply_filters( 'woocommerce_cli_create_coupon_data', $assoc_args );
-
-			// Check if coupon code is specified.
-			if ( ! isset( $assoc_args['code'] ) ) {
-				throw new WC_CLI_Exception( 'woocommerce_cli_missing_coupon_code', sprintf( __( 'Missing parameter %s', 'woocommerce' ), 'code' ) );
-			}
-
-			$coupon_code = apply_filters( 'woocommerce_coupon_code', $assoc_args['code'] );
-
-			// Check for duplicate coupon codes.
-			$coupon_found = $wpdb->get_var( $wpdb->prepare( "
-				SELECT $wpdb->posts.ID
-				FROM $wpdb->posts
-				WHERE $wpdb->posts.post_type = 'shop_coupon'
-				AND $wpdb->posts.post_status = 'publish'
-				AND $wpdb->posts.post_title = '%s'
-			 ", $coupon_code ) );
-
-			if ( $coupon_found ) {
-				throw new WC_CLI_Exception( 'woocommerce_cli_coupon_code_already_exists', __( 'The coupon code already exists', 'woocommerce' ) );
-			}
-
-			$defaults = array(
-				'type'                         => 'fixed_cart',
-				'amount'                       => 0,
-				'individual_use'               => false,
-				'product_ids'                  => array(),
-				'exclude_product_ids'          => array(),
-				'usage_limit'                  => '',
-				'usage_limit_per_user'         => '',
-				'limit_usage_to_x_items'       => '',
-				'usage_count'                  => '',
-				'expiry_date'                  => '',
-				'enable_free_shipping'         => false,
-				'product_category_ids'         => array(),
-				'exclude_product_category_ids' => array(),
-				'exclude_sale_items'           => false,
-				'minimum_amount'               => '',
-				'maximum_amount'               => '',
-				'customer_emails'              => array(),
-				'description'                  => ''
-			);
-
-			$coupon_data = wp_parse_args( $assoc_args, $defaults );
-
-			// Validate coupon types
-			if ( ! in_array( wc_clean( $coupon_data['type'] ), array_keys( wc_get_coupon_types() ) ) ) {
-				throw new WC_CLI_Exception( 'woocommerce_cli_invalid_coupon_type', sprintf( __( 'Invalid coupon type - the coupon type must be any of these: %s', 'woocommerce' ), implode( ', ', array_keys( wc_get_coupon_types() ) ) ) );
-			}
-
-			$new_coupon = array(
-				'post_title'   => $coupon_code,
-				'post_content' => '',
-				'post_status'  => 'publish',
-				'post_author'  => get_current_user_id(),
-				'post_type'    => 'shop_coupon',
-				'post_excerpt' => $coupon_data['description']
-	 		);
-
-			$id = wp_insert_post( $new_coupon, $wp_error = false );
-
-			if ( is_wp_error( $id ) ) {
-				throw new WC_CLI_Exception( 'woocommerce_cli_cannot_create_coupon', $id->get_error_message() );
-			}
-
-			// Set coupon meta
-			update_post_meta( $id, 'discount_type', $coupon_data['type'] );
-			update_post_meta( $id, 'coupon_amount', wc_format_decimal( $coupon_data['amount'] ) );
-			update_post_meta( $id, 'individual_use', ( true === $coupon_data['individual_use'] ) ? 'yes' : 'no' );
-			update_post_meta( $id, 'product_ids', implode( ',', array_filter( array_map( 'intval', $coupon_data['product_ids'] ) ) ) );
-			update_post_meta( $id, 'exclude_product_ids', implode( ',', array_filter( array_map( 'intval', $coupon_data['exclude_product_ids'] ) ) ) );
-			update_post_meta( $id, 'usage_limit', absint( $coupon_data['usage_limit'] ) );
-			update_post_meta( $id, 'usage_limit_per_user', absint( $coupon_data['usage_limit_per_user'] ) );
-			update_post_meta( $id, 'limit_usage_to_x_items', absint( $coupon_data['limit_usage_to_x_items'] ) );
-			update_post_meta( $id, 'usage_count', absint( $coupon_data['usage_count'] ) );
-			update_post_meta( $id, 'expiry_date', $this->get_coupon_expiry_date( wc_clean( $coupon_data['expiry_date'] ) ) );
-			update_post_meta( $id, 'free_shipping', ( true === $coupon_data['enable_free_shipping'] ) ? 'yes' : 'no' );
-			update_post_meta( $id, 'product_categories', array_filter( array_map( 'intval', $coupon_data['product_category_ids'] ) ) );
-			update_post_meta( $id, 'exclude_product_categories', array_filter( array_map( 'intval', $coupon_data['exclude_product_category_ids'] ) ) );
-			update_post_meta( $id, 'exclude_sale_items', ( true === $coupon_data['exclude_sale_items'] ) ? 'yes' : 'no' );
-			update_post_meta( $id, 'minimum_amount', wc_format_decimal( $coupon_data['minimum_amount'] ) );
-			update_post_meta( $id, 'maximum_amount', wc_format_decimal( $coupon_data['maximum_amount'] ) );
-			update_post_meta( $id, 'customer_email', array_filter( array_map( 'sanitize_email', $coupon_data['customer_emails'] ) ) );
-
-			do_action( 'woocommerce_cli_create_coupon', $id, $coupon_data );
-
-			if ( $porcelain ) {
-				WP_CLI::line( $id );
-			} else {
-				WP_CLI::success( "Created coupon $id." );
-			}
-		} catch ( WC_CLI_Exception $e ) {
-			WP_CLI::error( $e->getMessage() );
-		}
-	}
-
-	/**
-	 * Delete one or more coupons.
-	 *
-	 * ## OPTIONS
-	 *
-	 * <id>...
-	 * : The coupon ID to delete.
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc coupon delete 123
-	 *
-	 *     wp wc coupon delete $(wp wc coupon list --format=ids)
-	 *
-	 */
-	public function delete( $args, $assoc_args ) {
-		$exit_code = 0;
-		foreach ( $this->get_many_coupons_from_ids_or_codes( $args, true ) as $coupon ) {
-			do_action( 'woocommerce_cli_delete_coupon', $coupon->id );
-			$r = wp_delete_post( $coupon->id, true );
-
-			if ( $r ) {
-				WP_CLI::success( "Deleted coupon {$coupon->id}." );
-			} else {
-				$exit_code += 1;
-				WP_CLI::warning( "Failed deleting coupon {$coupon->id}." );
-			}
-		}
-		exit( $exit_code ? 1 : 0 );
-	}
-
-	/**
-	 * Get a coupon.
-	 *
-	 * ## OPTIONS
-	 *
-	 * <coupon>
-	 * : Coupon ID or code
-	 *
-	 * [--field=<field>]
-	 * : Instead of returning the whole coupon fields, returns the value of a single fields.
-	 *
-	 * [--fields=<fields>]
-	 * : Get a specific subset of the coupon's fields.
-	 *
-	 * [--format=<format>]
-	 * : Accepted values: table, json, csv. Default: table.
-	 *
-	 * ## AVAILABLE FIELDS
-	 *
-	 * These fields are available for get command:
-	 *
-	 * * id
-	 * * code
-	 * * type
-	 * * amount
-	 * * description
-	 * * expiry_date
-	 * * individual_use
-	 * * product_ids
-	 * * exclude_product_ids
-	 * * usage_limit
-	 * * usage_limit_per_user
-	 * * limit_usage_to_x_items
-	 * * usage_count
-	 * * enable_free_shipping
-	 * * product_category_ids
-	 * * exclude_product_category_ids
-	 * * minimum_amount
-	 * * maximum_amount
-	 * * customer_emails
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc coupon get 123 --field=discount_type
-	 *
-	 *     wp wc coupon get disc50 --format=json > disc50.json
-	 *
-	 * @since 2.5.0
-	 */
-	public function get( $args, $assoc_args ) {
-		global $wpdb;
-
-		try {
-			$coupon = $this->get_coupon_from_id_or_code( $args[0] );
-			if ( ! $coupon ) {
-				throw new WC_CLI_Exception( 'woocommerce_cli_invalid_coupon', sprintf( __( 'Invalid coupon ID or code: %s', 'woocommerce' ), $args[0] ) );
-			}
-
-			$coupon_post = get_post( $coupon->id );
-			$coupon_data = array(
-				'id'                           => $coupon->id,
-				'code'                         => $coupon->code,
-				'type'                         => $coupon->type,
-				'created_at'                   => $this->format_datetime( $coupon_post->post_date_gmt ),
-				'updated_at'                   => $this->format_datetime( $coupon_post->post_modified_gmt ),
-				'amount'                       => wc_format_decimal( $coupon->coupon_amount, 2 ),
-				'individual_use'               => $coupon->individual_use,
-				'product_ids'                  => $coupon_post->product_ids,
-				'exclude_product_ids'          => $coupon_post->exclude_product_ids,
-				'usage_limit'                  => ( ! empty( $coupon->usage_limit ) ) ? $coupon->usage_limit : null,
-				'usage_limit_per_user'         => ( ! empty( $coupon->usage_limit_per_user ) ) ? $coupon->usage_limit_per_user : null,
-				'limit_usage_to_x_items'       => (int) $coupon->limit_usage_to_x_items,
-				'usage_count'                  => (int) $coupon->usage_count,
-				'expiry_date'                  => ( ! empty( $coupon->expiry_date ) ) ? $this->format_datetime( $coupon->expiry_date ) : null,
-				'enable_free_shipping'         => $coupon->free_shipping,
-				'product_category_ids'         => implode( ', ', $coupon->product_categories ),
-				'exclude_product_category_ids' => implode( ', ', $coupon->exclude_product_categories ),
-				'exclude_sale_items'           => $coupon->exclude_sale_items,
-				'minimum_amount'               => wc_format_decimal( $coupon->minimum_amount, 2 ),
-				'maximum_amount'               => wc_format_decimal( $coupon->maximum_amount, 2 ),
-				'customer_emails'              => implode( ', ', $coupon->customer_email ),
-				'description'                  => $coupon_post->post_excerpt,
-			);
-
-			$coupon_data = apply_filters( 'woocommerce_cli_get_coupon', $coupon_data );
-
-			if ( empty( $assoc_args['fields'] ) ) {
-				$assoc_args['fields'] = array_keys( $coupon_data );
-			}
-
-			$formatter = $this->get_formatter( $assoc_args );
-			$formatter->display_item( $coupon_data );
-		} catch ( WC_CLI_Exception $e ) {
-			WP_CLI::error( $e->getMessage() );
-		}
-	}
-
-	/**
-	 * List coupons.
-	 *
-	 * ## OPTIONS
-	 *
-	 * [--<field>=<value>]
-	 * : Filter coupon based on coupon property.
-	 *
-	 * [--field=<field>]
-	 * : Prints the value of a single field for each coupon.
-	 *
-	 * [--fields=<fields>]
-	 * : Limit the output to specific coupon fields.
-	 *
-	 * [--format=<format>]
-	 * : Acceptec values: table, csv, json, count, ids. Default: table.
-	 *
-	 * ## AVAILABLE FIELDS
-	 *
-	 * These fields will be displayed by default for each coupon:
-	 *
-	 * * id
-	 * * code
-	 * * type
-	 * * amount
-	 * * description
-	 * * expiry_date
-	 *
-	 * These fields are optionally available:
-	 *
-	 * * individual_use
-	 * * product_ids
-	 * * exclude_product_ids
-	 * * usage_limit
-	 * * usage_limit_per_user
-	 * * limit_usage_to_x_items
-	 * * usage_count
-	 * * free_shipping
-	 * * product_category_ids
-	 * * exclude_product_category_ids
-	 * * exclude_sale_items
-	 * * minimum_amount
-	 * * maximum_amount
-	 * * customer_emails
-	 *
-	 * Fields for filtering query result also available:
-	 *
-	 * * q              Filter coupons with search query.
-	 * * in             Specify coupon IDs to retrieve.
-	 * * not_in         Specify coupon IDs NOT to retrieve.
-	 * * created_at_min Filter coupons created after this date.
-	 * * created_at_max Filter coupons created before this date.
-	 * * updated_at_min Filter coupons updated after this date.
-	 * * updated_at_max Filter coupons updated before this date.
-	 * * page           Page number.
-	 * * offset         Number of coupon to displace or pass over.
-	 * * order          Accepted values: ASC and DESC. Default: DESC.
-	 * * orderby        Sort retrieved coupons by parameter. One or more options can be passed.
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc coupon list
-	 *
-	 *     wp wc coupon list --field=id
-	 *
-	 *     wp wc coupon list --fields=id,code,type --format=json
-	 *
-	 * @since      2.5.0
-	 * @subcommand list
-	 */
-	public function list_( $__, $assoc_args ) {
-		$query_args = $this->merge_wp_query_args( $this->get_list_query_args(), $assoc_args );
-		$formatter  = $this->get_formatter( $assoc_args );
-
-		if ( 'ids' === $formatter->format ) {
-			$query_args['fields'] = 'ids';
-			$query = new WP_Query( $query_args );
-			echo implode( ' ', $query->posts );
-		} else {
-			$query = new WP_Query( $query_args );
-			$items = $this->format_posts_to_items( $query->posts );
-			$formatter->display_items( $items );
-		}
-	}
-
-	/**
-	 * Get coupon types.
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc coupon types
-	 *
-	 * @since 2.5.0
-	 */
-	public function types( $__, $___ ) {
-		$coupon_types = wc_get_coupon_types();
-		foreach ( $coupon_types as $type => $label ) {
-			WP_CLI::line( sprintf( '%s: %s', $label, $type ) );
-		}
-	}
-
-	/**
-	 * Update one or more coupons.
-	 *
-	 * ## OPTIONS
-	 *
-	 * <coupon>
-	 * : The ID or code of the coupon to update.
-	 *
-	 * [--<field>=<value>]
-	 * : One or more fields to update.
-	 *
-	 * ## AVAILABLE FIELDS
-	 *
-	 * These fields are available for update command:
-	 *
-	 * * code
-	 * * type
-	 * * amount
-	 * * description
-	 * * expiry_date
-	 * * individual_use
-	 * * product_ids
-	 * * exclude_product_ids
-	 * * usage_limit
-	 * * usage_limit_per_user
-	 * * limit_usage_to_x_items
-	 * * usage_count
-	 * * enable_free_shipping
-	 * * product_category_ids
-	 * * exclude_product_categories
-	 * * exclude_product_category_ids
-	 * * minimum_amount
-	 * * maximum_amount
-	 * * customer_emails
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc coupon update 123 --amount=5
-	 *
-	 *     wp wc coupon update coupon-code --code=new-coupon-code
-	 *
-	 * @since 2.5.0
-	 */
-	public function update( $args, $assoc_args ) {
-		try {
-			$coupon = $this->get_coupon_from_id_or_code( $args[0] );
-			if ( ! $coupon ) {
-				throw new WC_CLI_Exception( 'woocommerce_cli_invalid_coupon', sprintf( __( 'Invalid coupon ID or code: %s', 'woocommerce' ), $args[0] ) );
-			}
-
-			$id          = $coupon->id;
-			$coupon_code = $coupon->code;
-			$data        = apply_filters( 'woocommerce_cli_update_coupon_data', $assoc_args, $id );
-			if ( isset( $data['code'] ) ) {
-				global $wpdb;
-
-				$coupon_code = apply_filters( 'woocommerce_coupon_code', $data['code'] );
-
-				// Check for duplicate coupon codes
-				$coupon_found = $wpdb->get_var( $wpdb->prepare( "
-					SELECT $wpdb->posts.ID
-					FROM $wpdb->posts
-					WHERE $wpdb->posts.post_type = 'shop_coupon'
-					AND $wpdb->posts.post_status = 'publish'
-					AND $wpdb->posts.post_title = '%s'
-					AND $wpdb->posts.ID != %s
-				 ", $coupon_code, $id ) );
-
-				if ( $coupon_found ) {
-					throw new WC_CLI_Exception( 'woocommerce_cli_coupon_code_already_exists', __( 'The coupon code already exists', 'woocommerce' ) );
-				}
-			}
-
-			$id = wp_update_post( array( 'ID' => intval( $id ), 'post_title' => $coupon_code, 'post_excerpt' => isset( $data['description'] ) ? $data['description'] : '' ) );
-			if ( 0 === $id ) {
-				throw new WC_CLI_Exception( 'woocommerce_cli_cannot_update_coupon', __( 'Failed to update coupon', 'woocommerce' ) );
-			}
-
-			if ( isset( $data['type'] ) ) {
-				// Validate coupon types.
-				if ( ! in_array( wc_clean( $data['type'] ), array_keys( wc_get_coupon_types() ) ) ) {
-					throw new WC_CLI_Exception( 'woocommerce_cli_invalid_coupon_type', sprintf( __( 'Invalid coupon type - the coupon type must be any of these: %s', 'woocommerce' ), implode( ', ', array_keys( wc_get_coupon_types() ) ) ) );
-				}
-				update_post_meta( $id, 'discount_type', $data['type'] );
-			}
-
-			if ( isset( $data['amount'] ) ) {
-				update_post_meta( $id, 'coupon_amount', wc_format_decimal( $data['amount'] ) );
-			}
-
-			if ( isset( $data['individual_use'] ) ) {
-				update_post_meta( $id, 'individual_use', ( true === $data['individual_use'] ) ? 'yes' : 'no' );
-			}
-
-			if ( isset( $data['product_ids'] ) ) {
-				update_post_meta( $id, 'product_ids', implode( ',', array_filter( array_map( 'intval', $data['product_ids'] ) ) ) );
-			}
-
-			if ( isset( $data['exclude_product_ids'] ) ) {
-				update_post_meta( $id, 'exclude_product_ids', implode( ',', array_filter( array_map( 'intval', $data['exclude_product_ids'] ) ) ) );
-			}
-
-			if ( isset( $data['usage_limit'] ) ) {
-				update_post_meta( $id, 'usage_limit', absint( $data['usage_limit'] ) );
-			}
-
-			if ( isset( $data['usage_limit_per_user'] ) ) {
-				update_post_meta( $id, 'usage_limit_per_user', absint( $data['usage_limit_per_user'] ) );
-			}
-
-			if ( isset( $data['limit_usage_to_x_items'] ) ) {
-				update_post_meta( $id, 'limit_usage_to_x_items', absint( $data['limit_usage_to_x_items'] ) );
-			}
-
-			if ( isset( $data['usage_count'] ) ) {
-				update_post_meta( $id, 'usage_count', absint( $data['usage_count'] ) );
-			}
-
-			if ( isset( $data['expiry_date'] ) ) {
-				update_post_meta( $id, 'expiry_date', $this->get_coupon_expiry_date( wc_clean( $data['expiry_date'] ) ) );
-			}
-
-			if ( isset( $data['enable_free_shipping'] ) ) {
-				update_post_meta( $id, 'free_shipping', ( true === $data['enable_free_shipping'] ) ? 'yes' : 'no' );
-			}
-
-			if ( isset( $data['product_category_ids'] ) ) {
-				update_post_meta( $id, 'product_categories', array_filter( array_map( 'intval', $data['product_category_ids'] ) ) );
-			}
-
-			if ( isset( $data['exclude_product_category_ids'] ) ) {
-				update_post_meta( $id, 'exclude_product_categories', array_filter( array_map( 'intval', $data['exclude_product_category_ids'] ) ) );
-			}
-
-			if ( isset( $data['exclude_sale_items'] ) ) {
-				update_post_meta( $id, 'exclude_sale_items', ( true === $data['exclude_sale_items'] ) ? 'yes' : 'no' );
-			}
-
-			if ( isset( $data['minimum_amount'] ) ) {
-				update_post_meta( $id, 'minimum_amount', wc_format_decimal( $data['minimum_amount'] ) );
-			}
-
-			if ( isset( $data['maximum_amount'] ) ) {
-				update_post_meta( $id, 'maximum_amount', wc_format_decimal( $data['maximum_amount'] ) );
-			}
-
-			if ( isset( $data['customer_emails'] ) ) {
-				update_post_meta( $id, 'customer_email', array_filter( array_map( 'sanitize_email', $data['customer_emails'] ) ) );
-			}
-
-			do_action( 'woocommerce_cli_update_coupon', $id, $data );
-
-			WP_CLI::success( "Updated coupon $id." );
-		} catch ( WC_CLI_Exception $e ) {
-			WP_CLI::error( $e->getMessage() );
-		}
-	}
-
-	/**
-	 * Get query args for list subcommand.
-	 *
-	 * @since  2.5.0
-	 * @return array
-	 */
-	protected function get_list_query_args() {
-		return array(
-			'post_type'      => 'shop_coupon',
-			'post_status'    => 'publish',
-			'posts_per_page' => -1,
-			'order'          => 'DESC',
-		);
-	}
-
-	/**
-	 * Get default format fields that will be used in `list` and `get` subcommands.
-	 *
-	 * @since  2.5.0
-	 * @return string
-	 */
-	protected function get_default_format_fields() {
-		return 'id,code,type,amount,description,expiry_date';
-	}
-
-	/**
-	 * Format posts from WP_Query result to items in which each item contain
-	 * common properties of item, for instance `post_title` will be `code`.
-	 *
-	 * @since  2.5.0
-	 * @param  array $posts Array of post
-	 * @return array Items
-	 */
-	protected function format_posts_to_items( $posts ) {
-		$items = array();
-		foreach ( $posts as $post ) {
-			$items[] = array(
-				'id'                           => $post->ID,
-				'code'                         => $post->post_title,
-				'type'                         => $post->discount_type,
-				'created_at'                   => $this->format_datetime( $post->post_date_gmt ),
-				'updated_at'                   => $this->format_datetime( $post->post_modified_gmt ),
-				'amount'                       => wc_format_decimal( $post->coupon_amount, 2 ),
-				'individual_use'               => $post->individual_use,
-				'product_ids'                  => $post->product_ids,
-				'exclude_product_ids'          => $post->exclude_product_ids,
-				'usage_limit'                  => ( ! empty( $post->usage_limit ) ) ? $post->usage_limit : null,
-				'usage_limit_per_user'         => ( ! empty( $post->usage_limit_per_user ) ) ? $post->usage_limit_per_user : null,
-				'limit_usage_to_x_items'       => (int) $post->limit_usage_to_x_items,
-				'usage_count'                  => (int) $post->usage_count,
-				'expiry_date'                  => ( ! empty( $post->expiry_date ) ) ? $this->format_datetime( $post->expiry_date ) : null,
-				'free_shipping'                => $post->free_shipping,
-				'product_category_ids'         => implode( ', ', is_array( $post->product_categories ) ? $post->product_categories : array() ),
-				'exclude_product_category_ids' => implode( ', ', is_array( $post->exclude_product_categories ) ? $post->exclude_product_categories : array() ),
-				'exclude_sale_items'           => $post->exclude_sale_items,
-				'minimum_amount'               => wc_format_decimal( $post->minimum_amount, 2 ),
-				'maximum_amount'               => wc_format_decimal( $post->maximum_amount, 2 ),
-				'customer_emails'              => implode( ', ', is_array( $post->customer_email ) ? $post->customer_email : array() ),
-				'description'                  => $post->post_excerpt,
-			);
-		}
-
-		return $items;
-	}
-
-	/**
-	 * Get expiry_date format before saved into DB.
-	 *
-	 * @since  2.5.0
-	 * @param  string $expiry_date
-	 * @return string
-	 */
-	protected function get_coupon_expiry_date( $expiry_date ) {
-		if ( '' !== $expiry_date ) {
-			return date( 'Y-m-d', strtotime( $expiry_date ) );
-		}
-
-		return '';
-	}
-
-	/**
-	 * Get coupon from coupon's ID or code.
-	 *
-	 * @since  2.5.0
-	 * @param  int|string $coupon_id_or_code Coupon's ID or code
-	 * @param  bool       $display_warning   Display warning if ID or code is invalid. Default false.
-	 * @return WC_Coupon
-	 */
-	protected function get_coupon_from_id_or_code( $coupon_id_or_code, $display_warning = false ) {
-		global $wpdb;
-
-		$code = $wpdb->get_var( $wpdb->prepare( "SELECT post_title FROM $wpdb->posts WHERE (id = %s OR post_title = %s) AND post_type = 'shop_coupon' AND post_status = 'publish' LIMIT 1", $coupon_id_or_code, $coupon_id_or_code ) );
-		if ( ! $code ) {
-			if ( $display_warning ) {
-				WP_CLI::warning( "Invalid coupon ID or code $coupon_id_or_code" );
-			}
-			return null;
-		}
-
-		return new WC_Coupon( $code );
-	}
-
-	/**
-	 * Get coupon from coupon's ID or code.
-	 *
-	 * @since  2.5.0
-	 * @param  array     $args            Coupon's IDs or codes
-	 * @param  bool      $display_warning Display warning if ID or code is invalid. Default false.
-	 * @return WC_Coupon
-	 */
-	protected function get_many_coupons_from_ids_or_codes( $args, $display_warning = false ) {
-		$coupons = array();
-
-		foreach ( $args as $arg ) {
-			$code = $this->get_coupon_from_id_or_code( $arg, $display_warning );
-			if ( $code ) {
-				$coupons[] = $code;
-			}
-		}
-
-		return $coupons;
-	}
-}
diff --git a/includes/cli/class-wc-cli-customer.php b/includes/cli/class-wc-cli-customer.php
deleted file mode 100644
index 86928a49e34..00000000000
--- a/includes/cli/class-wc-cli-customer.php
+++ /dev/null
@@ -1,742 +0,0 @@
-<?php
-
-/**
- * Manage Customers.
- *
- * @since    2.5.0
- * @package  WooCommerce/CLI
- * @category CLI
- * @author   WooThemes
- */
-class WC_CLI_Customer extends WC_CLI_Command {
-
-	/**
-	 * Create a customer.
-	 *
-	 * ## OPTIONS
-	 *
-	 * <email>
-	 * : The email address of the customer to create.
-	 *
-	 * [--<field>=<value>]
-	 * : Associative args for the new customer.
-	 *
-	 * [--porcelain]
-	 * : Outputs just the new customer id.
-	 *
-	 * ## AVAILABLE FIELDS
-	 *
-	 * These fields are optionally available for create command:
-	 *
-	 * * username
-	 * * password
-	 * * first_name
-	 * * last_name
-	 *
-	 * Billing address fields:
-	 *
-	 * * billing_address.first_name
-	 * * billing_address.last_name
-	 * * billing_address.company
-	 * * billing_address.address_1
-	 * * billing_address.address_2
-	 * * billing_address.city
-	 * * billing_address.state
-	 * * billing_address.postcode
-	 * * billing_address.country
-	 * * billing_address.email
-	 * * billing_address.phone
-	 *
-	 * Shipping address fields:
-	 *
-	 * * shipping_address.first_name
-	 * * shipping_address.last_name
-	 * * shipping_address.company
-	 * * shipping_address.address_1
-	 * * shipping_address.address_2
-	 * * shipping_address.city
-	 * * shipping_address.state
-	 * * shipping_address.postcode
-	 * * shipping_address.country
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc customer create new-customer@example.com --first_name=Akeda
-	 *
-	 * @since 2.5.0
-	 */
-	public function create( $args, $assoc_args ) {
-		global $wpdb;
-
-		try {
-			$porcelain = isset( $assoc_args['porcelain'] );
-			unset( $assoc_args['porcelain'] );
-
-			$assoc_args['email'] = $args[0];
-			$data                = apply_filters( 'woocommerce_cli_create_customer_data', $this->unflatten_array( $assoc_args ) );
-
-			// Sets the username.
-			$data['username'] = ! empty( $data['username'] ) ? $data['username'] : '';
-
-			// Sets the password.
-			$data['password'] = ! empty( $data['password'] ) ? $data['password'] : '';
-
-			// Attempts to create the new customer.
-			$id = wc_create_new_customer( $data['email'], $data['username'], $data['password'] );
-
-			// Checks for an error in the customer creation.
-			if ( is_wp_error( $id ) ) {
-				throw new WC_CLI_Exception( $id->get_error_code(), $id->get_error_message() );
-			}
-
-			// Added customer data.
-			$this->update_customer_data( $id, $data );
-
-			do_action( 'woocommerce_cli_create_customer', $id, $data );
-
-			if ( $porcelain ) {
-				WP_CLI::line( $id );
-			} else {
-				WP_CLI::success( "Created customer $id." );
-			}
-		} catch ( WC_CLI_Exception $e ) {
-			WP_CLI::error( $e->getMessage() );
-		}
-	}
-
-	/**
-	 * Delete one or more customers.
-	 *
-	 * ## OPTIONS
-	 *
-	 * <customer>...
-	 * : The customer ID, email, or username to delete.
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc customer delete 123
-	 *
-	 *     wp wc customer delete $(wp wc customer list --format=ids)
-	 *
-	 * @since 2.5.0
-	 */
-	public function delete( $args, $assoc_args ) {
-		$exit_code = 0;
-		foreach ( $args as $arg ) {
-			try {
-				$customer = $this->get_user( $arg );
-				do_action( 'woocommerce_cli_delete_customer', $customer['id'] );
-				$r = wp_delete_user( $customer['id'] );
-
-				if ( $r ) {
-					WP_CLI::success( "Deleted customer {$customer['id']}." );
-				} else {
-					$exit_code += 1;
-					WP_CLI::warning( "Failed deleting customer {$customer['id']}." );
-				}
-			} catch ( WC_CLI_Exception $e ) {
-				WP_CLI::warning( $e->getMessage() );
-			}
-		}
-		exit( $exit_code ? 1 : 0 );
-	}
-
-	/**
-	 * View customer downloads.
-	 *
-	 * ## OPTIONS
-	 *
-	 * <customer>
-	 * : The customer ID, email or username.
-	 *
-	 * [--field=<field>]
-	 * : Instead of returning the whole customer fields, returns the value of a single fields.
-	 *
-	 * [--fields=<fields>]
-	 * : Get a specific subset of the customer's fields.
-	 *
-	 * [--format=<format>]
-	 * : Accepted values: table, json, csv. Default: table.
-	 *
-	 * ## AVAILABLE FIELDS
-	 *
-	 * * download_id
-	 * * download_name
-	 * * access_expires
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc customer downloads 123
-	 *
-	 * @since 2.5.0
-	 */
-	public function downloads( $args, $assoc_args ) {
-		try {
-			$user      = $this->get_user( $args[0] );
-			$downloads = array();
-			foreach ( wc_get_customer_available_downloads( $user['id'] ) as $key => $download ) {
-				$downloads[ $key ] = $download;
-				$downloads[ $key ]['access_expires'] = $this->format_datetime( $download['access_expires'] );
-			}
-			$downloads = apply_filters( 'woocommerce_cli_customer_downloads', $downloads, $user, $assoc_args );
-
-			if ( empty( $assoc_args['fields'] ) ) {
-				$assoc_args['fields'] = $this->get_customer_download_fields();
-			}
-
-			$formatter = $this->get_formatter( $assoc_args );
-			$formatter->display_items( $downloads );
-
-		} catch ( WC_CLI_Exception $e ) {
-			WP_CLI::error( $e->getMessage() );
-		}
-	}
-
-	/**
-	 * Get a customer.
-	 *
-	 * ## OPTIONS
-	 *
-	 * <customer>
-	 * : Customer ID, email, or username.
-	 *
-	 * [--field=<field>]
-	 * : Instead of returning the whole customer fields, returns the value of a single fields.
-	 *
-	 * [--fields=<fields>]
-	 * : Get a specific subset of the customer's fields.
-	 *
-	 * [--format=<format>]
-	 * : Accepted values: table, json, csv. Default: table.
-	 *
-	 * ## AVAILABLE FIELDS
-	 *
-	 * * id
-	 * * email
-	 * * first_name
-	 * * last_name
-	 * * created_at
-	 * * username
-	 * * last_order_id
-	 * * last_order_date
-	 * * orders_count
-	 * * total_spent
-	 * * avatar_url
-	 *
-	 * Billing address fields:
-	 *
-	 * * billing_address.first_name
-	 * * billing_address.last_name
-	 * * billing_address.company
-	 * * billing_address.address_1
-	 * * billing_address.address_2
-	 * * billing_address.city
-	 * * billing_address.state
-	 * * billing_address.postcode
-	 * * billing_address.country
-	 * * billing_address.email
-	 * * billing_address.phone
-	 *
-	 * Shipping address fields:
-	 *
-	 * * shipping_address.first_name
-	 * * shipping_address.last_name
-	 * * shipping_address.company
-	 * * shipping_address.address_1
-	 * * shipping_address.address_2
-	 * * shipping_address.city
-	 * * shipping_address.state
-	 * * shipping_address.postcode
-	 * * shipping_address.country
-	 *
-	 * Fields for filtering query result also available:
-	 *
-	 * * role           Filter customers associated with certain role.
-	 * * q              Filter customers with search query.
-	 * * created_at_min Filter customers whose registered after this date.
-	 * * created_at_max Filter customers whose registered before this date.
-	 * * limit          The maximum returned number of results.
-	 * * offset         Offset the returned results.
-	 * * order          Accepted values: ASC and DESC. Default: DESC.
-	 * * orderby        Sort retrieved customers by parameter. One or more options can be passed.
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc customer get 123 --field=email
-	 *
-	 *     wp wc customer get customer-login --format=json
-	 *
-	 * @since 2.5.0
-	 */
-	public function get( $args, $assoc_args ) {
-		try {
-			$user = $this->get_user( $args[0] );
-
-			if ( empty( $assoc_args['fields'] ) ) {
-				$assoc_args['fields'] = array_keys( $user );
-			}
-
-			$formatter = $this->get_formatter( $assoc_args );
-			$formatter->display_item( $user );
-		} catch ( WC_CLI_Exception $e ) {
-			WP_CLI::error( $e->getMessage() );
-		}
-	}
-
-	/**
-	 * List customers.
-	 *
-	 * ## OPTIONS
-	 *
-	 * [--<field>=<value>]
-	 * : Filter customer based on customer property.
-	 *
-	 * [--field=<field>]
-	 * : Prints the value of a single field for each customer.
-	 *
-	 * [--fields=<fields>]
-	 * : Limit the output to specific customer fields.
-	 *
-	 * [--format=<format>]
-	 * : Acceptec values: table, csv, json, count, ids. Default: table.
-	 *
-	 * ## AVAILABLE FIELDS
-	 *
-	 * These fields will be displayed by default for each customer:
-	 *
-	 * * id
-	 * * email
-	 * * first_name
-	 * * last_name
-	 * * created_at
-	 *
-	 * These fields are optionally available:
-	 *
-	 * * username
-	 * * last_order_id
-	 * * last_order_date
-	 * * orders_count
-	 * * total_spent
-	 * * avatar_url
-	 *
-	 * Billing address fields:
-	 *
-	 * * billing_address.first_name
-	 * * billing_address.last_name
-	 * * billing_address.company
-	 * * billing_address.address_1
-	 * * billing_address.address_2
-	 * * billing_address.city
-	 * * billing_address.state
-	 * * billing_address.postcode
-	 * * billing_address.country
-	 * * billing_address.email
-	 * * billing_address.phone
-	 *
-	 * Shipping address fields:
-	 *
-	 * * shipping_address.first_name
-	 * * shipping_address.last_name
-	 * * shipping_address.company
-	 * * shipping_address.address_1
-	 * * shipping_address.address_2
-	 * * shipping_address.city
-	 * * shipping_address.state
-	 * * shipping_address.postcode
-	 * * shipping_address.country
-	 *
-	 * Fields for filtering query result also available:
-	 *
-	 * * role           Filter customers associated with certain role.
-	 * * q              Filter customers with search query.
-	 * * created_at_min Filter customers whose registered after this date.
-	 * * created_at_max Filter customers whose registered before this date.
-	 * * limit          The maximum returned number of results.
-	 * * offset         Offset the returned results.
-	 * * order          Accepted values: ASC and DESC. Default: DESC.
-	 * * orderby        Sort retrieved customers by parameter. One or more options can be passed.
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc customer list
-	 *
-	 *     wp wc customer list --field=id
-	 *
-	 *     wp wc customer list --fields=id,email,first_name --format=json
-	 *
-	 * @subcommand list
-	 * @since      2.5.0
-	 */
-	public function list_( $__, $assoc_args ) {
-		$query_args = $this->merge_wp_user_query_args( $this->get_list_query_args(), $assoc_args );
-		$formatter  = $this->get_formatter( $assoc_args );
-
-		if ( 'ids' === $formatter->format ) {
-			$query_args['fields'] = 'ids';
-			$query = new WP_User_Query( $query_args );
-			echo implode( ' ', $query->results );
-		} else {
-			$query = new WP_User_Query( $query_args );
-			$items = $this->format_users_to_items( $query->results );
-			$formatter->display_items( $items );
-		}
-	}
-
-	/**
-	 * View customer orders.
-	 *
-	 * ## OPTIONS
-	 *
-	 * <customer>
-	 * : The customer ID, email or username.
-	 *
-	 * [--field=<field>]
-	 * : Instead of returning the whole customer fields, returns the value of a single fields.
-	 *
-	 * [--fields=<fields>]
-	 * : Get a specific subset of the customer's fields.
-	 *
-	 * [--format=<format>]
-	 * : Accepted values: table, json, csv. Default: table.
-	 *
-	 * ## AVAILABLE FIELDS
-	 *
-	 * For more fields, see: wp wc order list --help
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc customer orders 123
-	 *
-	 * @since 2.5.0
-	 */
-	public function orders( $args, $assoc_args ) {
-		try {
-			WP_CLI::run_command( array( 'wc', 'order', 'list' ), array( 'customer_id' => $args[0] ) );
-		} catch ( WC_CLI_Exception $e ) {
-			WP_CLI::error( $e->getMessage() );
-		}
-	}
-
-	/**
-	 * Update one or more customers.
-	 *
-	 * ## OPTIONS
-	 *
-	 * <customer>
-	 * : Customer ID, email, or username.
-	 *
-	 * [--<field>=<value>]
-	 * : One or more fields to update.
-	 *
-	 * ## AVAILABLE FIELDS
-	 *
-	 * These fields are available for update command:
-	 *
-	 * * email
-	 * * password
-	 * * first_name
-	 * * last_name
-	 *
-	 * Billing address fields:
-	 *
-	 * * billing_address.first_name
-	 * * billing_address.last_name
-	 * * billing_address.company
-	 * * billing_address.address_1
-	 * * billing_address.address_2
-	 * * billing_address.city
-	 * * billing_address.state
-	 * * billing_address.postcode
-	 * * billing_address.country
-	 * * billing_address.email
-	 * * billing_address.phone
-	 *
-	 * Shipping address fields:
-	 *
-	 * * shipping_address.first_name
-	 * * shipping_address.last_name
-	 * * shipping_address.company
-	 * * shipping_address.address_1
-	 * * shipping_address.address_2
-	 * * shipping_address.city
-	 * * shipping_address.state
-	 * * shipping_address.postcode
-	 * * shipping_address.country
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc customer update customer-login --first_name=akeda --last_name=bagus
-	 *
-	 *     wp wc customer update customer@example.com --password=new-password
-	 *
-	 * @since 2.5.0
-	 */
-	public function update( $args, $assoc_args ) {
-		try {
-			$user = $this->get_user( $args[0] );
-			$data = $this->unflatten_array( $assoc_args );
-			$data = apply_filters( 'woocommerce_cli_update_customer_data', $data );
-
-			// Customer email.
-			if ( isset( $data['email'] ) ) {
-				wp_update_user( array( 'ID' => $user['id'], 'user_email' => sanitize_email( $data['email'] ) ) );
-			}
-
-			// Customer password.
-			if ( isset( $data['password'] ) ) {
-				wp_update_user( array( 'ID' => $user['id'], 'user_pass' => wc_clean( $data['password'] ) ) );
-			}
-
-			// Update customer data.
-			$this->update_customer_data( $user['id'], $data );
-
-			do_action( 'woocommerce_cli_update_customer', $user['id'], $data );
-
-			WP_CLI::success( "Updated customer {$user['id']}." );
-		} catch ( WC_CLI_Exception $e ) {
-			WP_CLI::error( $e->getMessage() );
-		}
-	}
-
-	/**
-	 * Get query args for list subcommand.
-	 *
-	 * @since  2.5.0
-	 * @return array
-	 */
-	protected function get_list_query_args() {
-		return array(
-			'role'    => 'customer',
-			'orderby' => 'registered',
-		);
-	}
-
-	/**
-	 * Get default format fields that will be used in `list` and `get` subcommands.
-	 *
-	 * @since  2.5.0
-	 * @return string
-	 */
-	protected function get_default_format_fields() {
-		return 'id,email,first_name,last_name,created_at';
-	}
-
-	/**
-	 * Format users from WP_User_Query result to items in which each item contain
-	 * common properties of item.
-	 *
-	 * @since  2.5.0
-	 * @param  array $users Array of user
-	 * @return array Items
-	 */
-	protected function format_users_to_items( $users ) {
-		$items = array();
-		foreach ( $users as $user ) {
-			try {
-				$items[] = $this->get_user( $user->ID );
-			} catch ( WC_CLI_Exception $e ) {
-				WP_CLI::warning( $e->getMessage() );
-			}
-		}
-
-		return $items;
-	}
-
-	/**
-	 * Get user from given user ID, email, or login
-	 *
-	 * @throws WC_CLI_Exception
-	 *
-	 * @since  2.5.0
-	 * @param  mixed          $id_email_or_login
-	 * @return array|WP_Error
-	 */
-	protected function get_user( $id_email_or_login ) {
-		global $wpdb;
-
-		if ( is_numeric( $id_email_or_login ) ) {
-			$user = get_user_by( 'id', $id_email_or_login );
-		} else if ( is_email( $id_email_or_login ) ) {
-			$user = get_user_by( 'email', $id_email_or_login );
-		} else {
-			$user = get_user_by( 'login', $id_email_or_login );
-		}
-
-		if ( ! $user ) {
-			throw new WC_CLI_Exception( 'woocommerce_cli_invalid_customer', sprintf( __( 'Invalid customer "%s"', 'woocommerce' ), $id_email_or_login ) );
-		}
-
-		// Get info about user's last order
-		$last_order = $wpdb->get_row( "SELECT id, post_date_gmt
-						FROM $wpdb->posts AS posts
-						LEFT JOIN {$wpdb->postmeta} AS meta on posts.ID = meta.post_id
-						WHERE meta.meta_key = '_customer_user'
-						AND   meta.meta_value = {$user->ID}
-						AND   posts.post_type = 'shop_order'
-						AND   posts.post_status IN ( '" . implode( "','", array_keys( wc_get_order_statuses() ) ) . "' )
-						ORDER BY posts.ID DESC
-					" );
-
-		$customer = array(
-			'id'               => $user->ID,
-			'created_at'       => $this->format_datetime( $user->user_registered ),
-			'email'            => $user->user_email,
-			'first_name'       => $user->first_name,
-			'last_name'        => $user->last_name,
-			'username'         => $user->user_login,
-			'role'             => $user->roles[0],
-			'last_order_id'    => is_object( $last_order ) ? $last_order->id : null,
-			'last_order_date'  => is_object( $last_order ) ? $this->format_datetime( $last_order->post_date_gmt ) : null,
-			'orders_count'     => wc_get_customer_order_count( $user->ID ),
-			'total_spent'      => wc_format_decimal( wc_get_customer_total_spent( $user->ID ), 2 ),
-			'avatar_url'       => $this->get_avatar_url( $user->customer_email ),
-			'billing_address'  => array(
-				'first_name' => $user->billing_first_name,
-				'last_name'  => $user->billing_last_name,
-				'company'    => $user->billing_company,
-				'address_1'  => $user->billing_address_1,
-				'address_2'  => $user->billing_address_2,
-				'city'       => $user->billing_city,
-				'state'      => $user->billing_state,
-				'postcode'   => $user->billing_postcode,
-				'country'    => $user->billing_country,
-				'email'      => $user->billing_email,
-				'phone'      => $user->billing_phone,
-			),
-			'shipping_address' => array(
-				'first_name' => $user->shipping_first_name,
-				'last_name'  => $user->shipping_last_name,
-				'company'    => $user->shipping_company,
-				'address_1'  => $user->shipping_address_1,
-				'address_2'  => $user->shipping_address_2,
-				'city'       => $user->shipping_city,
-				'state'      => $user->shipping_state,
-				'postcode'   => $user->shipping_postcode,
-				'country'    => $user->shipping_country,
-			),
-		);
-
-
-		// Allow dot notation for nested array so that user can specifies field
-		// like 'billing_address.first_name'.
-		return $this->flatten_array( $customer );
-	}
-
-	/**
-	 * Wrapper for @see get_avatar() which doesn't simply return
-	 * the URL so we need to pluck it from the HTML img tag
-	 *
-	 * Kudos to https://github.com/WP-API/WP-API for offering a better solution
-	 *
-	 * @since  2.5.0
-	 * @param  string $email the customer's email
-	 * @return string the URL to the customer's avatar
-	 */
-	protected function get_avatar_url( $email ) {
-		$avatar_html = get_avatar( $email );
-
-		// Get the URL of the avatar from the provided HTML
-		preg_match( '/src=["|\'](.+)[\&|"|\']/U', $avatar_html, $matches );
-
-		if ( isset( $matches[1] ) && ! empty( $matches[1] ) ) {
-			return esc_url_raw( $matches[1] );
-		}
-
-		return null;
-	}
-
-	/**
-	 * Add/Update customer data.
-	 *
-	 * @since 2.5.0
-	 * @param int   $id   The customer ID
-	 * @param array $data
-	 */
-	protected function update_customer_data( $id, $data ) {
-		// Customer first name.
-		if ( isset( $data['first_name'] ) ) {
-			update_user_meta( $id, 'first_name', wc_clean( $data['first_name'] ) );
-		}
-
-		// Customer last name.
-		if ( isset( $data['last_name'] ) ) {
-			update_user_meta( $id, 'last_name', wc_clean( $data['last_name'] ) );
-		}
-
-		// Customer billing address.
-		if ( isset( $data['billing_address'] ) ) {
-			foreach ( $this->get_customer_billing_address_fields() as $address ) {
-				if ( isset( $data['billing_address'][ $address ] ) ) {
-					update_user_meta( $id, 'billing_' . $address, wc_clean( $data['billing_address'][ $address ] ) );
-				}
-			}
-		}
-
-		// Customer shipping address.
-		if ( isset( $data['shipping_address'] ) ) {
-			foreach ( $this->get_customer_shipping_address_fields() as $address ) {
-				if ( isset( $data['shipping_address'][ $address ] ) ) {
-					update_user_meta( $id, 'shipping_' . $address, wc_clean( $data['shipping_address'][ $address ] ) );
-				}
-			}
-		}
-
-		do_action( 'woocommerce_cli_update_customer_data', $id, $data );
-	}
-
-	/**
-	 * Get customer billing address fields.
-	 *
-	 * @since  2.5.0
-	 * @return array
-	 */
-	protected function get_customer_billing_address_fields() {
-		return apply_filters( 'woocommerce_cli_customer_billing_address_fields', array(
-			'first_name',
-			'last_name',
-			'company',
-			'address_1',
-			'address_2',
-			'city',
-			'state',
-			'postcode',
-			'country',
-			'email',
-			'phone',
-		) );
-	}
-
-	/**
-	 * Get customer shipping address fields.
-	 *
-	 * @since  2.5.0
-	 * @return array
-	 */
-	protected function get_customer_shipping_address_fields() {
-		return apply_filters( 'woocommerce_cli_customer_shipping_address_fields', array(
-			'first_name',
-			'last_name',
-			'company',
-			'address_1',
-			'address_2',
-			'city',
-			'state',
-			'postcode',
-			'country',
-		) );
-	}
-
-	/**
-	 * Get customer download fields.
-	 *
-	 * @since  2.5.0
-	 * @return array
-	 */
-	protected function get_customer_download_fields() {
-		return apply_filters( 'woocommerce_cli_customer_download_fields', array(
-			'download_id',
-			'download_name',
-			'access_expires',
-		) );
-	}
-}
diff --git a/includes/cli/class-wc-cli-exception.php b/includes/cli/class-wc-cli-exception.php
deleted file mode 100644
index 199303cb48b..00000000000
--- a/includes/cli/class-wc-cli-exception.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * WooCommerce CLI Exception Class.
- *
- * Extends Exception to provide additional data.
- *
- * @since    2.5.0
- * @package  WooCommerce/CLI
- * @category CLI
- * @author   WooThemes
- */
-
-if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
-}
-
-class WC_CLI_Exception extends Exception {
-
-	/** @var string sanitized error code */
-	protected $error_code;
-
-	/**
-	 * Setup exception, requires 3 params:
-	 *
-	 * error code - machine-readable, e.g. `woocommerce_invalid_product_id`
-	 * error message - friendly message, e.g. 'Product ID is invalid'
-	 *
-	 * @since 2.5.0
-	 * @param string $error_code
-	 * @param string $error_message user-friendly translated error message
-	 */
-	public function __construct( $error_code, $error_message ) {
-		$this->error_code = $error_code;
-		parent::__construct( $error_message );
-	}
-
-	/**
-	 * Returns the error code
-	 *
-	 * @since  2.5.0
-	 * @return string
-	 */
-	public function getErrorCode() {
-		return $this->error_code;
-	}
-}
diff --git a/includes/cli/class-wc-cli-order.php b/includes/cli/class-wc-cli-order.php
deleted file mode 100644
index 8cd88b4ba5e..00000000000
--- a/includes/cli/class-wc-cli-order.php
+++ /dev/null
@@ -1,1247 +0,0 @@
-<?php
-
-/**
- * Manage Orders.
- *
- * @since    2.5.0
- * @package  WooCommerce/CLI
- * @category CLI
- * @author   WooThemes
- */
-class WC_CLI_Order extends WC_CLI_Command {
-
-	/**
-	 * Create an order.
-	 *
-	 * ## OPTIONS
-	 *
-	 * [--<field>=<value>]
-	 * : Associative args for the new order.
-	 *
-	 * [--porcelain]
-	 * : Outputs just the new order id.
-	 *
-	 * ## AVAILABLE FIELDS
-	 *
-	 * Required fields:
-	 *
-	 * * customer_id
-	 *
-	 * Optional fields:
-	 *
-	 * * status
-	 * * note
-	 * * currency
-	 * * order_meta
-	 *
-	 * Payment detail fields:
-	 *
-	 * * payment_details.method_id
-	 * * payment_details.method_title
-	 * * payment_details.paid
-	 *
-	 * Billing address fields:
-	 *
-	 * * billing_address.first_name
-	 * * billing_address.last_name
-	 * * billing_address.company
-	 * * billing_address.address_1
-	 * * billing_address.address_2
-	 * * billing_address.city
-	 * * billing_address.state
-	 * * billing_address.postcode
-	 * * billing_address.country
-	 * * billing_address.email
-	 * * billing_address.phone
-	 *
-	 * Shipping address fields:
-	 *
-	 * * shipping_address.first_name
-	 * * shipping_address.last_name
-	 * * shipping_address.company
-	 * * shipping_address.address_1
-	 * * shipping_address.address_2
-	 * * shipping_address.city
-	 * * shipping_address.state
-	 * * shipping_address.postcode
-	 * * shipping_address.country
-	 *
-	 * Line item fields (numeric array, started with index zero):
-	 *
-	 * * line_items.0.product_id
-	 * * line_items.0.quantity
-	 * * line_items.0.variations.pa_color
-	 *
-	 * For second line item: line_items.1.product_id and so on.
-	 *
-	 * Shipping line fields (numeric array, started with index zero):
-	 *
-	 * * shipping_lines.0.method_id
-	 * * shipping_lines.0.method_title
-	 * * shipping_lines.0.total
-	 *
-	 * For second shipping item: shipping_lines.1.method_id and so on.
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc order create --customer_id=1 --status=pending ...
-	 *
-	 * @since  2.5.0
-	 */
-	public function create( $__, $assoc_args ) {
-		global $wpdb;
-
-		wc_transaction_query( 'start' );
-
-		try {
-			$porcelain = isset( $assoc_args['porcelain'] );
-			unset( $assoc_args['porcelain'] );
-
-			$data = apply_filters( 'woocommerce_cli_create_order_data', $this->unflatten_array( $assoc_args ) );
-
-			// default order args, note that status is checked for validity in wc_create_order()
-			$default_order_args = array(
-				'status'        => isset( $data['status'] ) ? $data['status'] : '',
-				'customer_note' => isset( $data['note'] ) ? $data['note'] : null,
-			);
-
-			if ( empty( $data['customer_id'] ) ) {
-				throw new WC_CLI_Exception( 'woocommerce_cli_missing_customer_id', __( 'Missing customer_id field', 'woocommerce' ) );
-			}
-
-			// make sure customer exists
-			if ( false === get_user_by( 'id', $data['customer_id'] ) ) {
-				throw new WC_CLI_Exception( 'woocommerce_cli_invalid_customer_id', __( 'Customer ID is invalid', 'woocommerce' ) );
-			}
-			$default_order_args['customer_id'] = $data['customer_id'];
-
-			// create the pending order
-			$order = $this->create_base_order( $default_order_args, $data );
-
-			if ( is_wp_error( $order ) ) {
-				throw new WC_CLI_Exception( 'woocommerce_cli_cannot_create_order', sprintf( __( 'Cannot create order: %s', 'woocommerce' ), implode( ', ', $order->get_error_messages() ) ) );
-			}
-
-			// billing/shipping addresses
-			$this->set_order_addresses( $order, $data );
-
-			$lines = array(
-				'line_item' => 'line_items',
-				'shipping'  => 'shipping_lines',
-				'fee'       => 'fee_lines',
-				'coupon'    => 'coupon_lines',
-			);
-
-			foreach ( $lines as $line_type => $line ) {
-				if ( isset( $data[ $line ] ) && is_array( $data[ $line ] ) ) {
-					$set_item = "set_{$line_type}";
-					foreach ( $data[ $line ] as $item ) {
-						$this->$set_item( $order, $item, 'create' );
-					}
-				}
-			}
-
-			// calculate totals and set them
-			$order->calculate_totals();
-
-			// payment method (and payment_complete() if `paid` == true)
-			if ( isset( $data['payment_details'] ) && is_array( $data['payment_details'] ) ) {
-				// method ID & title are required
-				if ( empty( $data['payment_details']['method_id'] ) || empty( $data['payment_details']['method_title'] ) ) {
-					throw new WC_CLI_Exception( 'woocommerce_invalid_payment_details', __( 'Payment method ID and title are required', 'woocommerce' ) );
-				}
-
-				update_post_meta( $order->id, '_payment_method', $data['payment_details']['method_id'] );
-				update_post_meta( $order->id, '_payment_method_title', $data['payment_details']['method_title'] );
-
-				// Mark as paid if set.
-				if ( isset( $data['payment_details']['paid'] ) && true === $data['payment_details']['paid'] ) {
-					$order->payment_complete( isset( $data['payment_details']['transaction_id'] ) ? $data['payment_details']['transaction_id'] : '' );
-				}
-			}
-
-			// Set order currency.
-			if ( isset( $data['currency'] ) ) {
-				if ( ! array_key_exists( $data['currency'], get_woocommerce_currencies() ) ) {
-					throw new WC_CLI_Exception( 'woocommerce_invalid_order_currency', __( 'Provided order currency is invalid', 'woocommerce') );
-				}
-
-				update_post_meta( $order->id, '_order_currency', $data['currency'] );
-			}
-
-			// Set order meta.
-			if ( isset( $data['order_meta'] ) && is_array( $data['order_meta'] ) ) {
-				$this->set_order_meta( $order->id, $data['order_meta'] );
-			}
-
-			wc_delete_shop_order_transients( $order->id );
-
-			do_action( 'woocommerce_cli_create_order', $order->id, $data );
-
-			wc_transaction_query( 'commit' );
-
-			if ( $porcelain ) {
-				WP_CLI::line( $order->id );
-			} else {
-				WP_CLI::success( "Created order {$order->id}." );
-			}
-		} catch ( WC_CLI_Exception $e ) {
-			wc_transaction_query( 'rollback' );
-
-			WP_CLI::error( $e->getMessage() );
-		}
-	}
-
-	/**
-	 * Delete one or more orders.
-	 *
-	 * ## OPTIONS
-	 *
-	 * <id>...
-	 * : The order ID to delete.
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc order delete 123
-	 *
-	 * @since 2.5.0
-	 */
-	public function delete( $args, $assoc_args ) {
-		$exit_code = 0;
-		foreach ( $args as $id ) {
-			$order = wc_get_order( $args[0] );
-			if ( ! $order ) {
-				WP_CLI::warning( "Invalid order ID $id" );
-				continue;
-			}
-
-			wc_delete_shop_order_transients( $id );
-			do_action( 'woocommerce_cli_delete_order', $id );
-			$r = wp_delete_post( $id, true );
-
-			if ( $r ) {
-				WP_CLI::success( "Deleted order $id." );
-			} else {
-				$exit_code += 1;
-				WP_CLI::warning( "Failed deleting order $id." );
-			}
-		}
-		exit( $exit_code ? 1 : 0 );
-	}
-
-	/**
-	 * Get an order.
-	 *
-	 * ## OPTIONS
-	 *
-	 * <id>
-	 * : Order ID.
-	 *
-	 * [--field=<field>]
-	 * : Instead of returning the whole order fields, returns the value of a single fields.
-	 *
-	 * [--fields=<fields>]
-	 * : Get a specific subset of the order's fields.
-	 *
-	 * [--format=<format>]
-	 * : Accepted values: table, json, csv. Default: table.
-	 *
-	 * ## AVAILABLE FIELDS
-	 *
-	 * These fields will be displayed by default:
-	 *
-	 * * id
-	 * * order_number
-	 * * customer_id
-	 * * total
-	 * * status
-	 * * created_at
-	 *
-	 * For more fields, see: wp wc order list --help
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc order get 123 --fields=id,title,sku
-	 *
-	 * @since 2.5.0
-	 */
-	public function get( $args, $assoc_args ) {
-		try {
-			$order = wc_get_order( $args[0] );
-			if ( ! $order ) {
-				throw new WC_CLI_Exception( 'woocommerce_cli_invalid_order', sprintf( __( 'Invalid order "%s"', 'woocommerce' ), $args[0] ) );
-			}
-			$order_data = $this->get_order_data( $order );
-
-			$formatter = $this->get_formatter( $assoc_args );
-			$formatter->display_item( $order_data );
-		} catch ( WC_CLI_Exception $e ) {
-			WP_CLI::error( $e->getMessage() );
-		}
-	}
-
-	/**
-	 * List orders.
-	 *
-	 * ## OPTIONS
-	 *
-	 * [--<field>=<value>]
-	 * : Filter orders based on order property.
-	 *
-	 * [--field=<field>]
-	 * : Prints the value of a single field for each order.
-	 *
-	 * [--fields=<fields>]
-	 * : Limit the output to specific order fields.
-	 *
-	 * [--format=<format>]
-	 * : Acceptec values: table, csv, json, count, ids. Default: table.
-	 *
-	 * ## AVAILABLE FIELDS
-	 *
-	 * These fields will be displayed by default for each order:
-	 *
-	 * * id
-	 * * order_number
-	 * * customer_id
-	 * * total
-	 * * status
-	 * * created_at
-	 *
-	 * These fields are optionally available:
-	 *
-	 * * updated_at
-	 * * completed_at
-	 * * currency
-	 * * subtotal
-	 * * total_line_items_quantity
-	 * * total_tax
-	 * * total_shipping
-	 * * cart_tax
-	 * * shipping_tax
-	 * * total_discount
-	 * * shipping_methods
-	 * * note
-	 * * customer_ip
-	 * * customer_user_agent
-	 * * view_order_url
-	 *
-	 * Payment detail fields:
-	 *
-	 * * payment_details.method_id
-	 * * payment_details.method_title
-	 * * payment_details.paid
-	 *
-	 * Billing address fields:
-	 *
-	 * * billing_address.first_name
-	 * * billing_address.last_name
-	 * * billing_address.company
-	 * * billing_address.address_1
-	 * * billing_address.address_2
-	 * * billing_address.city
-	 * * billing_address.state
-	 * * billing_address.postcode
-	 * * billing_address.country
-	 * * billing_address.email
-	 * * billing_address.phone
-	 *
-	 * Shipping address fields:
-	 *
-	 * * shipping_address.first_name
-	 * * shipping_address.last_name
-	 * * shipping_address.company
-	 * * shipping_address.address_1
-	 * * shipping_address.address_2
-	 * * shipping_address.city
-	 * * shipping_address.state
-	 * * shipping_address.postcode
-	 * * shipping_address.country
-	 *
-	 * Line item fields (numeric array, started with index zero):
-	 *
-	 * * line_items.0.product_id
-	 * * line_items.0.quantity
-	 * * line_items.0.variations.pa_color
-	 *
-	 * For second line item: line_items.1.product_id and so on.
-	 *
-	 * Shipping line fields (numeric array, started with index zero):
-	 *
-	 * * shipping_lines.0.method_id
-	 * * shipping_lines.0.method_title
-	 * * shipping_lines.0.total
-	 *
-	 * For second shipping item: shipping_lines.1.method_id and so on.
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc order list
-	 *
-	 * @subcommand list
-	 * @since      2.5.0
-	 */
-	public function list_( $args, $assoc_args ) {
-		$query_args = $this->merge_wp_query_args( $this->get_list_query_args( $assoc_args ), $assoc_args );
-		$formatter  = $this->get_formatter( $assoc_args );
-
-		if ( 'ids' === $formatter->format ) {
-			$query_args['fields'] = 'ids';
-			$query = new WP_Query( $query_args );
-			echo implode( ' ', $query->posts );
-		} else {
-			$query = new WP_Query( $query_args );
-			$items = $this->format_posts_to_items( $query->posts );
-			$formatter->display_items( $items );
-		}
-	}
-
-	/**
-	 * Update an order.
-	 *
-	 * ## OPTIONS
-	 *
-	 * <id>
-	 * : Product ID
-	 *
-	 * [--<field>=<value>]
-	 * : One or more fields to update.
-	 *
-	 * ## AVAILABLE FIELDS
-	 *
-	 * For available fields, see: wp wc order create --help
-	 *
-	 * ## EXAMPLES
-	 *
-	 *    wp wc order update 123 --status=completed
-	 *
-	 * @todo  gedex
-	 * @since 2.5.0
-	 */
-	public function update( $args, $assoc_args ) {
-		try {
-			$id            = $args[0];
-			$data          = apply_filters( 'woocommerce_cli_update_order_data', $this->unflatten_array( $assoc_args ) );
-			$update_totals = false;
-			$order         = wc_get_order( $id );
-
-			if ( empty( $order ) ) {
-				throw new WC_CLI_Exception( 'woocommerce_cli_invalid_order_id', __( 'Order ID is invalid', 'woocommerce' ) );
-			}
-
-			$order_args = array( 'order_id' => $order->id );
-
-			// customer note
-			if ( isset( $data['note'] ) ) {
-				$order_args['customer_note'] = $data['note'];
-			}
-
-			// order status
-			if ( ! empty( $data['status'] ) ) {
-
-				$order->update_status( $data['status'], isset( $data['status_note'] ) ? $data['status_note'] : '' );
-			}
-
-			// customer ID
-			if ( isset( $data['customer_id'] ) && $data['customer_id'] != $order->get_user_id() ) {
-
-				// make sure customer exists
-				if ( false === get_user_by( 'id', $data['customer_id'] ) ) {
-					throw new WC_CLI_Exception( 'woocommerce_cli_invalid_customer_id', __( 'Customer ID is invalid', 'woocommerce' ) );
-				}
-
-				update_post_meta( $order->id, '_customer_user', $data['customer_id'] );
-			}
-
-			// billing/shipping address
-			$this->set_order_addresses( $order, $data );
-
-			$lines = array(
-				'line_item' => 'line_items',
-				'shipping'  => 'shipping_lines',
-				'fee'       => 'fee_lines',
-				'coupon'    => 'coupon_lines',
-			);
-
-			foreach ( $lines as $line_type => $line ) {
-
-				if ( isset( $data[ $line ] ) && is_array( $data[ $line ] ) ) {
-
-					$update_totals = true;
-
-					foreach ( $data[ $line ] as $item ) {
-
-						// item ID is always required
-						if ( ! array_key_exists( 'id', $item ) ) {
-							throw new WC_CLI_Exception( 'woocommerce_invalid_item_id', __( 'Order item ID is required', 'woocommerce' ) );
-						}
-
-						// create item
-						if ( is_null( $item['id'] ) ) {
-
-							$this->set_item( $order, $line_type, $item, 'create' );
-
-						} elseif ( $this->item_is_null( $item ) ) {
-
-							// delete item
-							wc_delete_order_item( $item['id'] );
-
-						} else {
-
-							// update item
-							$this->set_item( $order, $line_type, $item, 'update' );
-						}
-					}
-				}
-			}
-
-			// payment method (and payment_complete() if `paid` == true and order needs payment)
-			if ( isset( $data['payment_details'] ) && is_array( $data['payment_details'] ) ) {
-
-				// method ID
-				if ( isset( $data['payment_details']['method_id'] ) ) {
-					update_post_meta( $order->id, '_payment_method', $data['payment_details']['method_id'] );
-				}
-
-				// method title
-				if ( isset( $data['payment_details']['method_title'] ) ) {
-					update_post_meta( $order->id, '_payment_method_title', $data['payment_details']['method_title'] );
-				}
-
-				// mark as paid if set
-				if ( $order->needs_payment() && isset( $data['payment_details']['paid'] ) && true === $data['payment_details']['paid'] ) {
-					$order->payment_complete( isset( $data['payment_details']['transaction_id'] ) ? $data['payment_details']['transaction_id'] : '' );
-				}
-			}
-
-			// set order currency
-			if ( isset( $data['currency'] ) ) {
-
-				if ( ! array_key_exists( $data['currency'], get_woocommerce_currencies() ) ) {
-					throw new WC_CLI_Exception( 'woocommerce_invalid_order_currency', __( 'Provided order currency is invalid', 'woocommerce' ) );
-				}
-
-				update_post_meta( $order->id, '_order_currency', $data['currency'] );
-			}
-
-			// set order number
-			if ( isset( $data['order_number'] ) ) {
-
-				update_post_meta( $order->id, '_order_number', $data['order_number'] );
-			}
-
-			// if items have changed, recalculate order totals
-			if ( $update_totals ) {
-				$order->calculate_totals();
-			}
-
-			// update order meta
-			if ( isset( $data['order_meta'] ) && is_array( $data['order_meta'] ) ) {
-				$this->set_order_meta( $order->id, $data['order_meta'] );
-			}
-
-			// update the order post to set customer note/modified date
-			wc_update_order( $order_args );
-
-			wc_delete_shop_order_transients( $order->id );
-
-			do_action( 'woocommerce_cli_update_order', $order->id, $data );
-
-			WP_CLI::success( "Updated order {$order->id}." );
-
-		} catch ( WC_CLI_Exception $e ) {
-			WP_CLI::error( $e->getMessage() );
-		}
-	}
-
-	/**
-	 * Get query args for list subcommand.
-	 *
-	 * @since  2.5.0
-	 * @param  array $args Args from command line
-	 * @return array
-	 */
-	protected function get_list_query_args( $args ) {
-		$query_args = array(
-			'post_type'      => 'shop_order',
-			'post_status'    => array_keys( wc_get_order_statuses() ),
-			'posts_per_page' => -1,
-		);
-
-		if ( ! empty( $args['status'] ) ) {
-			$statuses                  = 'wc-' . str_replace( ',', ',wc-', $args['status'] );
-			$statuses                  = explode( ',', $statuses );
-			$query_args['post_status'] = $statuses;
-		}
-
-		if ( ! empty( $args['customer_id'] ) ) {
-			$query_args['meta_query'] = array(
-				array(
-					'key'   => '_customer_user',
-					'value' => (int) $args['customer_id'],
-					'compare' => '='
-				)
-			);
-		}
-
-		return $query_args;
-	}
-
-	/**
-	 * Get default format fields that will be used in `list` and `get` subcommands.
-	 *
-	 * @since  2.5.0
-	 * @return string
-	 */
-	protected function get_default_format_fields() {
-		return 'id,order_number,customer_id,total,status,created_at';
-	}
-
-	/**
-	 * Format posts from WP_Query result to items in which each item contain
-	 * common properties of item.
-	 *
-	 * @since  2.5.0
-	 * @param  array $posts Array of post
-	 * @return array Items
-	 */
-	protected function format_posts_to_items( $posts ) {
-		$items = array();
-		foreach ( $posts as $post ) {
-			$order = wc_get_order( $post->ID );
-			if ( ! $order ) {
-				continue;
-			}
-			$items[] = $this->get_order_data( $order );
-		}
-
-		return $items;
-	}
-
-	/**
-	 * Get the order data for the given ID.
-	 *
-	 * @since  2.5.0
-	 * @param  WC_Order $order The order instance
-	 * @return array
-	 */
-	protected function get_order_data( $order ) {
-		$order_post = get_post( $order->id );
-		$dp         = wc_get_price_decimals();
-		$order_data = array(
-			'id'                        => $order->id,
-			'order_number'              => $order->get_order_number(),
-			'created_at'                => $this->format_datetime( $order_post->post_date_gmt ),
-			'updated_at'                => $this->format_datetime( $order_post->post_modified_gmt ),
-			'completed_at'              => $this->format_datetime( $order->completed_date, true ),
-			'status'                    => $order->get_status(),
-			'currency'                  => $order->get_order_currency(),
-			'total'                     => wc_format_decimal( $order->get_total(), $dp ),
-			'subtotal'                  => wc_format_decimal( $order->get_subtotal(), $dp ),
-			'total_line_items_quantity' => $order->get_item_count(),
-			'total_tax'                 => wc_format_decimal( $order->get_total_tax(), $dp ),
-			'total_shipping'            => wc_format_decimal( $order->get_total_shipping(), $dp ),
-			'cart_tax'                  => wc_format_decimal( $order->get_cart_tax(), $dp ),
-			'shipping_tax'              => wc_format_decimal( $order->get_shipping_tax(), $dp ),
-			'total_discount'            => wc_format_decimal( $order->get_total_discount(), $dp ),
-			'shipping_methods'          => $order->get_shipping_method(),
-			'payment_details' => array(
-				'method_id'    => $order->payment_method,
-				'method_title' => $order->payment_method_title,
-				'paid'         => isset( $order->paid_date ),
-			),
-			'billing_address' => array(
-				'first_name' => $order->billing_first_name,
-				'last_name'  => $order->billing_last_name,
-				'company'    => $order->billing_company,
-				'address_1'  => $order->billing_address_1,
-				'address_2'  => $order->billing_address_2,
-				'city'       => $order->billing_city,
-				'state'      => $order->billing_state,
-				'postcode'   => $order->billing_postcode,
-				'country'    => $order->billing_country,
-				'email'      => $order->billing_email,
-				'phone'      => $order->billing_phone,
-			),
-			'shipping_address' => array(
-				'first_name' => $order->shipping_first_name,
-				'last_name'  => $order->shipping_last_name,
-				'company'    => $order->shipping_company,
-				'address_1'  => $order->shipping_address_1,
-				'address_2'  => $order->shipping_address_2,
-				'city'       => $order->shipping_city,
-				'state'      => $order->shipping_state,
-				'postcode'   => $order->shipping_postcode,
-				'country'    => $order->shipping_country,
-			),
-			'note'                      => $order->customer_note,
-			'customer_ip'               => $order->customer_ip_address,
-			'customer_user_agent'       => $order->customer_user_agent,
-			'customer_id'               => $order->get_user_id(),
-			'view_order_url'            => $order->get_view_order_url(),
-			'line_items'                => array(),
-			'shipping_lines'            => array(),
-			'tax_lines'                 => array(),
-			'fee_lines'                 => array(),
-			'coupon_lines'              => array(),
-		);
-
-		// add line items
-		foreach ( $order->get_items() as $item_id => $item ) {
-
-			$product     = $order->get_product_from_item( $item );
-			$product_id  = null;
-			$product_sku = null;
-
-			// Check if the product exists.
-			if ( is_object( $product ) ) {
-				$product_id  = ( isset( $product->variation_id ) ) ? $product->variation_id : $product->id;
-				$product_sku = $product->get_sku();
-			}
-
-			$meta = new WC_Order_Item_Meta( $item, $product );
-			$item_meta = array();
-			foreach ( $meta->get_formatted( null ) as $meta_key => $formatted_meta ) {
-				$item_meta[] = array(
-					'key' => $meta_key,
-					'label' => $formatted_meta['label'],
-					'value' => $formatted_meta['value'],
-				);
-			}
-
-			$order_data['line_items'][] = array(
-				'id'           => $item_id,
-				'subtotal'     => wc_format_decimal( $order->get_line_subtotal( $item, false, false ), $dp ),
-				'subtotal_tax' => wc_format_decimal( $item['line_subtotal_tax'], $dp ),
-				'total'        => wc_format_decimal( $order->get_line_total( $item, false, false ), $dp ),
-				'total_tax'    => wc_format_decimal( $item['line_tax'], $dp ),
-				'price'        => wc_format_decimal( $order->get_item_total( $item, false, false ), $dp ),
-				'quantity'     => wc_stock_amount( $item['qty'] ),
-				'tax_class'    => ( ! empty( $item['tax_class'] ) ) ? $item['tax_class'] : null,
-				'name'         => $item['name'],
-				'product_id'   => $product_id,
-				'sku'          => $product_sku,
-				'meta'         => $item_meta,
-			);
-		}
-
-		// Add shipping.
-		foreach ( $order->get_shipping_methods() as $shipping_item_id => $shipping_item ) {
-			$order_data['shipping_lines'][] = array(
-				'id'           => $shipping_item_id,
-				'method_id'    => $shipping_item['method_id'],
-				'method_title' => $shipping_item['name'],
-				'total'        => wc_format_decimal( $shipping_item['cost'], $dp ),
-			);
-		}
-
-		// Add taxes.
-		foreach ( $order->get_tax_totals() as $tax_code => $tax ) {
-			$order_data['tax_lines'][] = array(
-				'id'       => $tax->id,
-				'rate_id'  => $tax->rate_id,
-				'code'     => $tax_code,
-				'title'    => $tax->label,
-				'total'    => wc_format_decimal( $tax->amount, $dp ),
-				'compound' => (bool) $tax->is_compound,
-			);
-		}
-
-		// Add fees.
-		foreach ( $order->get_fees() as $fee_item_id => $fee_item ) {
-			$order_data['fee_lines'][] = array(
-				'id'        => $fee_item_id,
-				'title'     => $fee_item['name'],
-				'tax_class' => ( ! empty( $fee_item['tax_class'] ) ) ? $fee_item['tax_class'] : null,
-				'total'     => wc_format_decimal( $order->get_line_total( $fee_item ), $dp ),
-				'total_tax' => wc_format_decimal( $order->get_line_tax( $fee_item ), $dp ),
-			);
-		}
-
-		// Add coupons.
-		foreach ( $order->get_items( 'coupon' ) as $coupon_item_id => $coupon_item ) {
-			$order_data['coupon_lines'][] = array(
-				'id'     => $coupon_item_id,
-				'code'   => $coupon_item['name'],
-				'amount' => wc_format_decimal( $coupon_item['discount_amount'], $dp ),
-			);
-		}
-
-		$order_data = apply_filters( 'woocommerce_cli_order_data', $order_data );
-
-		return $this->flatten_array( $order_data );
-	}
-
-	/**
-	 * Creates new WC_Order.
-	 *
-	 * @since  2.5.0
-	 * @param  $args array
-	 * @return WC_Order
-	 */
-	protected function create_base_order( $args ) {
-		return wc_create_order( $args );
-	}
-
-	/**
-	 * Helper method to set/update the billing & shipping addresses for an order.
-	 *
-	 * @since 2.5.0
-	 * @param WC_Order $order
-	 * @param array $data
-	 */
-	protected function set_order_addresses( $order, $data ) {
-		$address_fields = array(
-			'first_name',
-			'last_name',
-			'company',
-			'email',
-			'phone',
-			'address_1',
-			'address_2',
-			'city',
-			'state',
-			'postcode',
-			'country',
-		);
-		$billing_address = $shipping_address = array();
-
-		// billing address.
-		if ( isset( $data['billing_address'] ) && is_array( $data['billing_address'] ) ) {
-			foreach ( $address_fields as $field ) {
-				if ( isset( $data['billing_address'][ $field ] ) ) {
-					$billing_address[ $field ] = wc_clean( $data['billing_address'][ $field ] );
-				}
-			}
-
-			unset( $address_fields['email'] );
-			unset( $address_fields['phone'] );
-		}
-
-		// shipping address.
-		if ( isset( $data['shipping_address'] ) && is_array( $data['shipping_address'] ) ) {
-			foreach ( $address_fields as $field ) {
-				if ( isset( $data['shipping_address'][ $field ] ) ) {
-					$shipping_address[ $field ] = wc_clean( $data['shipping_address'][ $field ] );
-				}
-			}
-		}
-
-		$order->set_address( $billing_address, 'billing' );
-		$order->set_address( $shipping_address, 'shipping' );
-
-		// update user meta
-		if ( $order->get_user_id() ) {
-			foreach ( $billing_address as $key => $value ) {
-				update_user_meta( $order->get_user_id(), 'billing_' . $key, $value );
-			}
-			foreach ( $shipping_address as $key => $value ) {
-				update_user_meta( $order->get_user_id(), 'shipping_' . $key, $value );
-			}
-		}
-	}
-
-	/**
-	 * Helper method to add/update order meta, with two restrictions:
-	 *
-	 * 1) Only non-protected meta (no leading underscore) can be set
-	 * 2) Meta values must be scalar (int, string, bool)
-	 *
-	 * @since 2.5.0
-	 * @param int $order_id valid order ID
-	 * @param array $order_meta order meta in array( 'meta_key' => 'meta_value' ) format
-	 */
-	protected function set_order_meta( $order_id, $order_meta ) {
-
-		foreach ( $order_meta as $meta_key => $meta_value ) {
-
-			if ( is_string( $meta_key) && ! is_protected_meta( $meta_key ) && is_scalar( $meta_value ) ) {
-				update_post_meta( $order_id, $meta_key, $meta_value );
-			}
-		}
-	}
-
-	/**
-	 * Wrapper method to create/update order items
-	 *
-	 * When updating, the item ID provided is checked to ensure it is associated
-	 * with the order.
-	 *
-	 * @since  2.5.0
-	 * @param  WC_Order $order order
-	 * @param  string $item_type
-	 * @param  array $item item provided in the request body
-	 * @param  string $action either 'create' or 'update'
-	 * @throws WC_CLI_Exception if item ID is not associated with order
-	 */
-	protected function set_item( $order, $item_type, $item, $action ) {
-		global $wpdb;
-
-		$set_method = "set_{$item_type}";
-
-		// verify provided line item ID is associated with order
-		if ( 'update' === $action ) {
-			$result = $wpdb->get_row(
-				$wpdb->prepare( "SELECT * FROM {$wpdb->prefix}woocommerce_order_items WHERE order_item_id = %d AND order_id = %d",
-				absint( $item['id'] ),
-				absint( $order->id )
-			) );
-
-			if ( is_null( $result ) ) {
-				throw new WC_CLI_Exception( 'woocommerce_invalid_item_id', __( 'Order item ID provided is not associated with order', 'woocommerce' ) );
-			}
-		}
-
-		$this->$set_method( $order, $item, $action );
-	}
-
-	/**
-	 * Create or update a line item
-	 *
-	 * @since  2.5.0
-	 * @param  WC_Order $order
-	 * @param  array $item line item data
-	 * @param  string $action 'create' to add line item or 'update' to update it
-	 * @throws WC_CLI_Exception invalid data, server error
-	 */
-	protected function set_line_item( $order, $item, $action ) {
-
-		$creating = ( 'create' === $action );
-
-		// product is always required
-		if ( ! isset( $item['product_id'] ) && ! isset( $item['sku'] ) ) {
-			throw new WC_CLI_Exception( 'woocommerce_cli_invalid_product_id', __( 'Product ID or SKU is required', 'woocommerce' ) );
-		}
-
-		// when updating, ensure product ID provided matches
-		if ( 'update' === $action ) {
-
-			$item_product_id   = wc_get_order_item_meta( $item['id'], '_product_id' );
-			$item_variation_id = wc_get_order_item_meta( $item['id'], '_variation_id' );
-
-			if ( $item['product_id'] != $item_product_id && $item['product_id'] != $item_variation_id ) {
-				throw new WC_CLI_Exception( 'woocommerce_cli_invalid_product_id', __( 'Product ID provided does not match this line item', 'woocommerce' ) );
-			}
-		}
-
-		if ( isset( $item['product_id'] ) ) {
-			$product_id = $item['product_id'];
-		} elseif ( isset( $item['sku'] ) ) {
-			$product_id = wc_get_product_id_by_sku( $item['sku'] );
-		}
-
-		// variations must each have a key & value
-		$variation_id = 0;
-		if ( isset( $item['variations'] ) && is_array( $item['variations'] ) ) {
-			foreach ( $item['variations'] as $key => $value ) {
-				if ( ! $key || ! $value ) {
-					throw new WC_CLI_Exception( 'woocommerce_cli_invalid_product_variation', __( 'The product variation is invalid', 'woocommerce' ) );
-				}
-			}
-			$item_args['variation'] = $item['variations'];
-			$variation_id = $this->get_variation_id( wc_get_product( $product_id ), $item_args['variation'] );
-		}
-
-		$product = wc_get_product( $variation_id ? $variation_id : $product_id );
-
-		// must be a valid WC_Product
-		if ( ! is_object( $product ) ) {
-			throw new WC_CLI_Exception( 'woocommerce_cli_invalid_product', __( 'Product is invalid', 'woocommerce' ) );
-		}
-
-		// quantity must be positive float
-		if ( isset( $item['quantity'] ) && floatval( $item['quantity'] ) <= 0 ) {
-			throw new WC_CLI_Exception( 'woocommerce_cli_invalid_product_quantity', __( 'Product quantity must be a positive float', 'woocommerce' ) );
-		}
-
-		// quantity is required when creating
-		if ( $creating && ! isset( $item['quantity'] ) ) {
-			throw new WC_CLI_Exception( 'woocommerce_cli_invalid_product_quantity', __( 'Product quantity is required', 'woocommerce' ) );
-		}
-
-		$item_args = array();
-
-		// quantity
-		if ( isset( $item['quantity'] ) ) {
-			$item_args['qty'] = $item['quantity'];
-		}
-
-		// total
-		if ( isset( $item['total'] ) ) {
-			$item_args['totals']['total'] = floatval( $item['total'] );
-		}
-
-		// total tax
-		if ( isset( $item['total_tax'] ) ) {
-			$item_args['totals']['tax'] = floatval( $item['total_tax'] );
-		}
-
-		// subtotal
-		if ( isset( $item['subtotal'] ) ) {
-			$item_args['totals']['subtotal'] = floatval( $item['subtotal'] );
-		}
-
-		// subtotal tax
-		if ( isset( $item['subtotal_tax'] ) ) {
-			$item_args['totals']['subtotal_tax'] = floatval( $item['subtotal_tax'] );
-		}
-
-		if ( $creating ) {
-
-			$item_id = $order->add_product( $product, $item_args['qty'], $item_args );
-
-			if ( ! $item_id ) {
-				throw new WC_CLI_Exception( 'woocommerce_cannot_create_line_item', __( 'Cannot create line item, try again', 'woocommerce' ) );
-			}
-
-		} else {
-
-			$item_id = $order->update_product( $item['id'], $product, $item_args );
-
-			if ( ! $item_id ) {
-				throw new WC_CLI_Exception( 'woocommerce_cannot_update_line_item', __( 'Cannot update line item, try again', 'woocommerce' ) );
-			}
-		}
-	}
-
-	/**
-	 * Given a product ID & variations, find the correct variation ID to use for
-	 * calculation. We can't just trust input from the CLI to pass a variation_id
-	 * manually, otherwise you could pass the cheapest variation ID but provide
-	 * other information so we have to look up the variation ID.
-	 *
-	 * @since  2.5.0
-	 * @param  WC_Product $product Product instance
-	 * @return int                 Returns an ID if a valid variation was found for this product
-	 */
-	protected function get_variation_id( $product, $variations = array() ) {
-		$variation_id = null;
-		$variations_normalized = array();
-
-		if ( $product->is_type( 'variable' ) && $product->has_child() ) {
-			if ( isset( $variations ) && is_array( $variations ) ) {
-				// start by normalizing the passed variations
-				foreach ( $variations as $key => $value ) {
-					$key = str_replace( 'attribute_', '', str_replace( 'pa_', '', $key ) ); // from get_attributes in class-wc-api-products.php
-					$variations_normalized[ $key ] = strtolower( $value );
-				}
-				// now search through each product child and see if our passed variations match anything
-				foreach ( $product->get_children() as $variation ) {
-					$meta = array();
-					foreach ( get_post_meta( $variation ) as $key => $value ) {
-						$value = $value[0];
-						$key = str_replace( 'attribute_', '', str_replace( 'pa_', '', $key ) );
-						$meta[ $key ] = strtolower( $value );
-					}
-					// if the variation array is a part of the $meta array, we found our match
-					if ( $this->array_contains( $variations_normalized, $meta ) ) {
-						$variation_id = $variation;
-						break;
-					}
-				}
-			}
-		}
-
-		return $variation_id;
-	}
-
-	/**
-	 * Utility function to see if the meta array contains data from variations.
-	 *
-	 * @since  2.5.0
-	 * @return bool  Returns true if meta array contains data from variations
-	 */
-	protected function array_contains( $needles, $haystack ) {
-		foreach ( $needles as $key => $value ) {
-			if ( $haystack[ $key ] !== $value ) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Create or update an order shipping method
-	 *
-	 * @since  2.5.0
-	 * @param  \WC_Order $order
-	 * @param  array $shipping item data
-	 * @param  string $action 'create' to add shipping or 'update' to update it
-	 * @throws WC_CLI_Exception invalid data, server error
-	 */
-	protected function set_shipping( $order, $shipping, $action ) {
-
-		// total must be a positive float
-		if ( isset( $shipping['total'] ) && floatval( $shipping['total'] ) < 0 ) {
-			throw new WC_CLI_Exception( 'woocommerce_invalid_shipping_total', __( 'Shipping total must be a positive amount', 'woocommerce' ) );
-		}
-
-		if ( 'create' === $action ) {
-
-			// method ID is required
-			if ( ! isset( $shipping['method_id'] ) ) {
-				throw new WC_CLI_Exception( 'woocommerce_invalid_shipping_item', __( 'Shipping method ID is required', 'woocommerce' ) );
-			}
-
-			$rate = new WC_Shipping_Rate( $shipping['method_id'], isset( $shipping['method_title'] ) ? $shipping['method_title'] : '', isset( $shipping['total'] ) ? floatval( $shipping['total'] ) : 0, array(), $shipping['method_id'] );
-
-			$shipping_id = $order->add_shipping( $rate );
-
-			if ( ! $shipping_id ) {
-				throw new WC_CLI_Exception( 'woocommerce_cannot_create_shipping', __( 'Cannot create shipping method, try again', 'woocommerce' ) );
-			}
-
-		} else {
-
-			$shipping_args = array();
-
-			if ( isset( $shipping['method_id'] ) ) {
-				$shipping_args['method_id'] = $shipping['method_id'];
-			}
-
-			if ( isset( $shipping['method_title'] ) ) {
-				$shipping_args['method_title'] = $shipping['method_title'];
-			}
-
-			if ( isset( $shipping['total'] ) ) {
-				$shipping_args['cost'] = floatval( $shipping['total'] );
-			}
-
-			$shipping_id = $order->update_shipping( $shipping['id'], $shipping_args );
-
-			if ( ! $shipping_id ) {
-				throw new WC_CLI_Exception( 'woocommerce_cannot_update_shipping', __( 'Cannot update shipping method, try again', 'woocommerce' ) );
-			}
-		}
-	}
-
-	/**
-	 * Create or update an order fee.
-	 *
-	 * @since  2.5.0
-	 * @param  \WC_Order $order
-	 * @param  array $fee item data
-	 * @param  string $action 'create' to add fee or 'update' to update it
-	 * @throws WC_CLI_Exception invalid data, server error
-	 */
-	protected function set_fee( $order, $fee, $action ) {
-
-		if ( 'create' === $action ) {
-
-			// fee title is required
-			if ( ! isset( $fee['title'] ) ) {
-				throw new WC_CLI_Exception( 'woocommerce_invalid_fee_item', __( 'Fee title is required', 'woocommerce' ) );
-			}
-
-			$order_fee            = new stdClass();
-			$order_fee->id        = sanitize_title( $fee['title'] );
-			$order_fee->name      = $fee['title'];
-			$order_fee->amount    = isset( $fee['total'] ) ? floatval( $fee['total'] ) : 0;
-			$order_fee->taxable   = false;
-			$order_fee->tax       = 0;
-			$order_fee->tax_data  = array();
-			$order_fee->tax_class = '';
-
-			// if taxable, tax class and total are required
-			if ( isset( $fee['taxable'] ) && $fee['taxable'] ) {
-
-				if ( ! isset( $fee['tax_class'] ) ) {
-					throw new WC_CLI_Exception( 'woocommerce_invalid_fee_item', __( 'Fee tax class is required when fee is taxable', 'woocommerce' ) );
-				}
-
-				$order_fee->taxable   = true;
-				$order_fee->tax_class = $fee['tax_class'];
-
-				if ( isset( $fee['total_tax'] ) ) {
-					$order_fee->tax = isset( $fee['total_tax'] ) ? wc_format_refund_total( $fee['total_tax'] ) : 0;
-				}
-
-				if ( isset( $fee['tax_data'] ) ) {
-					$order_fee->tax      = wc_format_refund_total( array_sum( $fee['tax_data'] ) );
-					$order_fee->tax_data = array_map( 'wc_format_refund_total', $fee['tax_data'] );
-				}
-			}
-
-			$fee_id = $order->add_fee( $order_fee );
-
-			if ( ! $fee_id ) {
-				throw new WC_CLI_Exception( 'woocommerce_cannot_create_fee', __( 'Cannot create fee, try again', 'woocommerce' ) );
-			}
-
-		} else {
-
-			$fee_args = array();
-
-			if ( isset( $fee['title'] ) ) {
-				$fee_args['name'] = $fee['title'];
-			}
-
-			if ( isset( $fee['tax_class'] ) ) {
-				$fee_args['tax_class'] = $fee['tax_class'];
-			}
-
-			if ( isset( $fee['total'] ) ) {
-				$fee_args['line_total'] = floatval( $fee['total'] );
-			}
-
-			if ( isset( $fee['total_tax'] ) ) {
-				$fee_args['line_tax'] = floatval( $fee['total_tax'] );
-			}
-
-			$fee_id = $order->update_fee( $fee['id'], $fee_args );
-
-			if ( ! $fee_id ) {
-				throw new WC_CLI_Exception( 'woocommerce_cannot_update_fee', __( 'Cannot update fee, try again', 'woocommerce' ) );
-			}
-		}
-	}
-
-	/**
-	 * Create or update an order coupon
-	 *
-	 * @since  2.5.0
-	 * @param  \WC_Order $order
-	 * @param  array $coupon item data
-	 * @param  string $action 'create' to add coupon or 'update' to update it
-	 * @throws WC_CLI_Exception invalid data, server error
-	 */
-	protected function set_coupon( $order, $coupon, $action ) {
-
-		// coupon amount must be positive float.
-		if ( isset( $coupon['amount'] ) && floatval( $coupon['amount'] ) < 0 ) {
-			throw new WC_CLI_Exception( 'woocommerce_invalid_coupon_total', __( 'Coupon discount total must be a positive amount', 'woocommerce' ) );
-		}
-
-		if ( 'create' === $action ) {
-
-			// coupon code is required
-			if ( empty( $coupon['code'] ) ) {
-				throw new WC_CLI_Exception( 'woocommerce_invalid_coupon_coupon', __( 'Coupon code is required', 'woocommerce' ) );
-			}
-
-			$coupon_id = $order->add_coupon( $coupon['code'], isset( $coupon['amount'] ) ? floatval( $coupon['amount'] ) : 0 );
-
-			if ( ! $coupon_id ) {
-				throw new WC_CLI_Exception( 'woocommerce_cannot_create_order_coupon', __( 'Cannot create coupon, try again', 'woocommerce' ) );
-			}
-
-		} else {
-
-			$coupon_args = array();
-
-			if ( isset( $coupon['code'] ) ) {
-				$coupon_args['code'] = $coupon['code'];
-			}
-
-			if ( isset( $coupon['amount'] ) ) {
-				$coupon_args['discount_amount'] = floatval( $coupon['amount'] );
-			}
-
-			$coupon_id = $order->update_coupon( $coupon['id'], $coupon_args );
-
-			if ( ! $coupon_id ) {
-				throw new WC_CLI_Exception( 'woocommerce_cannot_update_order_coupon', __( 'Cannot update coupon, try again', 'woocommerce' ) );
-			}
-		}
-	}
-}
diff --git a/includes/cli/class-wc-cli-product-category.php b/includes/cli/class-wc-cli-product-category.php
deleted file mode 100644
index 4d9dacdd8c3..00000000000
--- a/includes/cli/class-wc-cli-product-category.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-
-/**
- * Manage Product Categories.
- *
- * @since    2.5.0
- * @package  WooCommerce/CLI
- * @category CLI
- * @author   WooThemes
- */
-class WC_CLI_Product_Category extends WC_CLI_Command {
-
-	/**
-	 * Get product category.
-	 *
-	 * ## OPTIONS
-	 *
-	 * <id>
-	 * : Product category ID.
-	 *
-	 * [--field=<field>]
-	 * : Instead of returning the whole product category fields, returns the value of a single fields.
-	 *
-	 * [--fields=<fields>]
-	 * : Get a specific subset of the product category's fields.
-	 *
-	 * [--format=<format>]
-	 * : Accepted values: table, json, csv. Default: table.
-	 *
-	 * ## AVAILABLE FIELDS
-	 *
-	 * * id
-	 * * name
-	 * * slug
-	 * * parent
-	 * * description
-	 * * display
-	 * * image
-	 * * count
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc product category get 123
-	 *
-	 * @since 2.5.0
-	 */
-	public function get( $args, $assoc_args ) {
-		try {
-			$product_category = $this->get_product_category( $args[0] );
-
-			$formatter = $this->get_formatter( $assoc_args );
-			$formatter->display_item( $product_category );
-		} catch ( WC_CLI_Exception $e ) {
-			WP_CLI::error( $e->getMessage() );
-		}
-	}
-
-	/**
-	 * List of product categories.
-	 *
-	 * ## OPTIONS
-	 *
-	 * [--<field>=<value>]
-	 * : Filter products based on product property.
-	 *
-	 * [--field=<field>]
-	 * : Prints the value of a single field for each product.
-	 *
-	 * [--fields=<fields>]
-	 * : Limit the output to specific product fields.
-	 *
-	 * [--format=<format>]
-	 * : Acceptec values: table, csv, json, count, ids. Default: table.
-	 *
-	 * ## AVAILABLE FIELDS
-	 *
-	 * * id
-	 * * name
-	 * * slug
-	 * * parent
-	 * * description
-	 * * display
-	 * * image
-	 * * count
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc product category list
-	 *
-	 *     wp wc product category list --fields=id,name --format=json
-	 *
-	 * @subcommand list
-	 * @since      2.5.0
-	 */
-	public function list_( $__, $assoc_args ) {
-		try {
-			$product_categories = array();
-			$terms              = get_terms( 'product_cat', array( 'hide_empty' => false, 'fields' => 'ids' ) );
-
-			foreach ( $terms as $term_id ) {
-				$product_categories[] = $this->get_product_category( $term_id );
-			}
-
-			$formatter = $this->get_formatter( $assoc_args );
-			$formatter->display_items( $product_categories );
-		} catch ( WC_CLI_Exception $e ) {
-			WP_CLI::error( $e->getMessage() );
-		}
-	}
-
-	/**
-	 * Get product category properties from given term ID.
-	 *
-	 * @since  2.5.0
-	 * @param  int $term_id Category term ID
-	 * @return array
-	 * @throws WC_CLI_Exception
-	 */
-	protected function get_product_category( $term_id ) {
-		$term_id = absint( $term_id );
-		$term    = get_term( $term_id, 'product_cat' );
-
-		if ( is_wp_error( $term ) || is_null( $term ) ) {
-			throw new WC_CLI_Exception( 'woocommerce_cli_invalid_product_category_id', sprintf( __( 'Invalid product category ID "%s"', 'woocommerce' ), $term_id ) );
-		}
-
-		$term_id = intval( $term->term_id );
-
-		// Get category display type.
-		$display_type = get_woocommerce_term_meta( $term_id, 'display_type' );
-
-		// Get category image.
-		$image = '';
-		if ( $image_id = get_woocommerce_term_meta( $term_id, 'thumbnail_id' ) ) {
-			$image = wp_get_attachment_url( $image_id );
-		}
-
-		return array(
-			'id'          => $term_id,
-			'name'        => $term->name,
-			'slug'        => $term->slug,
-			'parent'      => $term->parent,
-			'description' => $term->description,
-			'display'     => $display_type ? $display_type : 'default',
-			'image'       => $image ? esc_url( $image ) : '',
-			'count'       => intval( $term->count )
-		);
-	}
-
-	/**
-	 * Get default format fields that will be used in `list` and `get` subcommands.
-	 *
-	 * @since  2.5.0
-	 * @return string
-	 */
-	protected function get_default_format_fields() {
-		return 'id,name,slug,parent,description,display,image,count';
-	}
-}
diff --git a/includes/cli/class-wc-cli-product.php b/includes/cli/class-wc-cli-product.php
deleted file mode 100644
index c7d844f9bd7..00000000000
--- a/includes/cli/class-wc-cli-product.php
+++ /dev/null
@@ -1,2128 +0,0 @@
-<?php
-
-/**
- * Manage Products.
- *
- * @since    2.5.0
- * @package  WooCommerce/CLI
- * @category CLI
- * @author   WooThemes
- */
-class WC_CLI_Product extends WC_CLI_Command {
-
-	/**
-	 * Create a product.
-	 *
-	 * ## OPTIONS
-	 *
-	 * [--<field>=<value>]
-	 * : Associative args for the new product.
-	 *
-	 * [--porcelain]
-	 * : Outputs just the new product id.
-	 *
-	 * ## AVAILABLE FIELDS
-	 *
-	 * Required fields:
-	 *
-	 * * title
-	 *
-	 * These fields are optionally available for create command:
-	 *
-	 * * type
-	 * * status
-	 * * downloadable
-	 * * virtual
-	 * * sku
-	 * * regular_price
-	 * * sale_price
-	 * * sale_price_dates_from
-	 * * sale_price_dates_to
-	 * * tax_status
-	 * * tax_class
-	 * * managing_stock
-	 * * stock_quantity
-	 * * in_stock
-	 * * backorders
-	 * * sold_individually
-	 * * featured
-	 * * shipping_class
-	 * * description
-	 * * enable_html_description
-	 * * short_description
-	 * * enable_html_short_description
-	 * * reviews_allowed
-	 * * upsell_ids
-	 * * cross_sell_ids
-	 * * parent_id
-	 * * categories
-	 * * tags
-	 *
-	 * Dimensions fields:
-	 *
-	 * * dimensions.length
-	 * * dimensions.width
-	 * * dimensions.height
-	 * * dimensions.unit
-	 *
-	 * Images is an array in which element can be set by specifying its index:
-	 *
-	 * * images
-	 * * images.size
-	 * * images.0.id
-	 * * images.0.created_at
-	 * * images.0.updated_at
-	 * * images.0.src
-	 * * images.0.title
-	 * * images.0.alt
-	 * * images.0.position
-	 *
-	 * Attributes is an array in which element can be set by specifying its index:
-	 *
-	 * * attributes
-	 * * attributes.size
-	 * * attributes.0.name
-	 * * attributes.0.slug
-	 * * attributes.0.position
-	 * * attributes.0.visible
-	 * * attributes.0.variation
-	 * * attributes.0.options
-	 *
-	 * Downloads is an array in which element can be accessed by specifying its index:
-	 *
-	 * * downloads
-	 * * downloads.size
-	 * * downloads.0.id
-	 * * downloads.0.name
-	 * * downloads.0.file
-	 *
-	 * Variations is an array in which element can be accessed by specifying its index:
-	 *
-	 * * variations
-	 * * variations.size
-	 * * variations.0.id
-	 * * variations.0.created_at
-	 * * variations.0.updated_at
-	 * * variations.0.downloadable
-	 * * variations.0.virtual
-	 * * variations.0.permalink
-	 * * variations.0.sku
-	 * * variations.0.price
-	 * * variations.0.regular_price
-	 * * variations.0.sale_price
-	 * * variations.0.sale_price_dates_from
-	 * * variations.0.sale_price_dates_to
-	 * * variations.0.taxable
-	 * * variations.0.tax_status
-	 * * variations.0.tax_class
-	 * * variations.0.managing_stock
-	 * * variations.0.stock_quantity
-	 * * variations.0.in_stock
-	 * * variations.0.backordered
-	 * * variations.0.purchaseable
-	 * * variations.0.visible
-	 * * variations.0.on_sale
-	 * * variations.0.weight
-	 * * variations.0.dimensions -- See dimensions fields
-	 * * variations.0.shipping_class
-	 * * variations.0.shipping_class_id
-	 * * variations.0.images -- See images fields
-	 * * variations.0.attributes -- See attributes fields
-	 * * variations.0.downloads -- See downloads fields
-	 * * variations.0.download_limit
-	 * * variations.0.download_expiry
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc product create --title="Product Name"
-	 *
-	 *     wp wc product create --title="Product Name" --
-	 *
-	 * @since 2.5.0
-	 */
-	public function create( $args, $assoc_args ) {
-		$id = 0;
-
-		try {
-			$data = apply_filters( 'woocommerce_cli_create_product_data', $this->unflatten_array( $assoc_args ) );
-
-			// Check if product title is specified
-			if ( ! isset( $data['title'] ) ) {
-				throw new WC_CLI_Exception( 'woocommerce_missing_product_title', sprintf( __( 'Missing parameter %s', 'woocommerce' ), 'title' ) );
-			}
-
-			// Check product type
-			if ( ! isset( $data['type'] ) ) {
-				$data['type'] = 'simple';
-			}
-
-			// Set visible visibility when not sent
-			if ( ! isset( $data['catalog_visibility'] ) ) {
-				$data['catalog_visibility'] = 'visible';
-			}
-
-			// Validate the product type
-			if ( ! in_array( wc_clean( $data['type'] ), array_keys( wc_get_product_types() ) ) ) {
-				throw new WC_CLI_Exception( 'woocommerce_cli_invalid_product_type', sprintf( __( 'Invalid product type - the product type must be any of these: %s', 'woocommerce' ), implode( ', ', array_keys( wc_get_product_types() ) ) ) );
-			}
-
-			// Enable description html tags.
-			$post_content = isset( $data['description'] ) ? wc_clean( $data['description'] ) : '';
-			if ( $post_content && isset( $data['enable_html_description'] ) && true === $data['enable_html_description'] ) {
-				$post_content = $data['description'];
-			}
-
-			// Enable short description html tags.
-			$post_excerpt = isset( $data['short_description'] ) ? wc_clean( $data['short_description'] ) : '';
-			if ( $post_excerpt && isset( $data['enable_html_short_description'] ) && true === $data['enable_html_short_description'] ) {
-				$post_excerpt = $data['short_description'];
-			}
-
-			$new_product = array(
-				'post_title'   => wc_clean( $data['title'] ),
-				'post_status'  => ( isset( $data['status'] ) ? wc_clean( $data['status'] ) : 'publish' ),
-				'post_type'    => 'product',
-				'post_excerpt' => ( isset( $data['short_description'] ) ? $post_excerpt : '' ),
-				'post_content' => ( isset( $data['description'] ) ? $post_content : '' ),
-				'post_author'  => get_current_user_id(),
-			);
-
-			// Attempts to create the new product
-			$id = wp_insert_post( $new_product, true );
-
-			// Checks for an error in the product creation
-			if ( is_wp_error( $id ) ) {
-				throw new WC_CLI_Exception( 'woocommerce_cli_cannot_create_product', $id->get_error_message() );
-			}
-
-			// Check for featured/gallery images, upload it and set it
-			if ( isset( $data['images'] ) ) {
-				$this->save_product_images( $id, $data['images'] );
-			}
-
-			// Save product meta fields
-			$this->save_product_meta( $id, $data );
-
-			// Save variations
-			if ( isset( $data['type'] ) && 'variable' == $data['type'] && isset( $data['variations'] ) && is_array( $data['variations'] ) ) {
-				$this->save_variations( $id, $data );
-			}
-
-			do_action( 'woocommerce_cli_create_product', $id, $data );
-
-			// Clear cache/transients
-			wc_delete_product_transients( $id );
-
-			WP_CLI::success( "Created product $id." );
-		} catch ( WC_CLI_Exception $e ) {
-			// Remove the product when fails
-			$this->clear_product( $id );
-
-			WP_CLI::error( $e->getMessage() );
-		}
-	}
-
-	/**
-	 * Delete products.
-	 *
-	 * ## OPTIONS
-	 *
-	 * <id>...
-	 * : The product ID to delete.
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc product delete 123
-	 *
-	 *     wp wc product delete $(wp wc product list --format=ids)
-	 *
-	 * @since 2.5.0
-	 */
-	public function delete( $args, $assoc_args ) {
-		$exit_code = 0;
-		foreach ( $args as $id ) {
-			do_action( 'woocommerce_cli_delete_product', $id );
-			$r = wp_delete_post( $id, true );
-
-			if ( $r ) {
-				WP_CLI::success( "Deleted product $id." );
-			} else {
-				$exit_code += 1;
-				WP_CLI::warning( "Failed deleting product $id." );
-			}
-		}
-		exit( $exit_code ? 1 : 0 );
-	}
-
-	/**
-	 * Get a product.
-	 *
-	 * ## OPTIONS
-	 *
-	 * <id>
-	 * : Product ID.
-	 *
-	 * [--field=<field>]
-	 * : Instead of returning the whole product fields, returns the value of a single fields.
-	 *
-	 * [--fields=<fields>]
-	 * : Get a specific subset of the product's fields.
-	 *
-	 * [--format=<format>]
-	 * : Accepted values: table, json, csv. Default: table.
-	 *
-	 * ## AVAILABLE FIELDS
-	 *
-	 * For more fields, see: wp wc product list --help
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc product get 123 --fields=id,title,sku
-	 *
-	 * @since 2.5.0
-	 */
-	public function get( $args, $assoc_args ) {
-		try {
-			$product = wc_get_product( $args[0] );
-			if ( ! $product ) {
-				throw new WC_CLI_Exception( 'woocommerce_cli_invalid_product', sprintf( __( 'Invalid product "%s"', 'woocommerce' ), $args[0] ) );
-			}
-			$product_data = $this->get_product_data( $product );
-
-			$formatter = $this->get_formatter( $assoc_args );
-			$formatter->display_item( $product_data );
-		} catch ( WC_CLI_Exception $e ) {
-			WP_CLI::error( $e->getMessage() );
-		}
-	}
-
-	/**
-	 * List products.
-	 *
-	 * ## OPTIONS
-	 *
-	 * [--<field>=<value>]
-	 * : Filter products based on product property.
-	 *
-	 * [--field=<field>]
-	 * : Prints the value of a single field for each product.
-	 *
-	 * [--fields=<fields>]
-	 * : Limit the output to specific product fields.
-	 *
-	 * [--format=<format>]
-	 * : Acceptec values: table, csv, json, count, ids. Default: table.
-	 *
-	 * ## AVAILABLE FIELDS
-	 *
-	 * These fields will be displayed by default for each product:
-	 *
-	 * * id
-	 * * title
-	 * * sku
-	 * * in_stock
-	 * * price
-	 * * sale_price
-	 * * categories
-	 * * tags
-	 * * type
-	 * * created_at
-	 *
-	 * These fields are optionally available:
-	 *
-	 * * updated_at
-	 * * status
-	 * * downloadable
-	 * * virtual
-	 * * permalink
-	 * * regular_price
-	 * * sale_price_dates_from
-	 * * sale_price_dates_to
-	 * * price_html
-	 * * taxable
-	 * * tax_status
-	 * * tax_class
-	 * * managing_stock
-	 * * stock_quantity
-	 * * backorders_allowed
-	 * * backordered
-	 * * backorders
-	 * * sold_individually
-	 * * purchaseable
-	 * * featured
-	 * * visible
-	 * * catalog_visibility
-	 * * on_sale
-	 * * weight
-	 * * shipping_required
-	 * * shipping_taxable
-	 * * shipping_class
-	 * * shipping_class_id
-	 * * description
-	 * * enable_html_description
-	 * * short_description
-	 * * enable_html_short_description
-	 * * reviews_allowed
-	 * * average_rating
-	 * * rating_count
-	 * * related_ids
-	 * * upsell_ids
-	 * * cross_sell_ids
-	 * * parent_id
-	 * * featured_src
-	 * * download_limit
-	 * * download_expiry
-	 * * download_type
-	 * * purchase_note
-	 * * total_sales
-	 * * parent
-	 * * product_url
-	 * * button_text
-	 *
-	 * There are some properties that are nested array. In such case, if array.size
-	 * is zero then listing the fields with `array.0.some_field` will results
-	 * in error that field `array.0.some_field` does not exists.
-	 *
-	 * Dimensions fields:
-	 *
-	 * * dimensions.length
-	 * * dimensions.width
-	 * * dimensions.height
-	 * * dimensions.unit
-	 *
-	 * Images is an array in which element can be accessed by specifying its index:
-	 *
-	 * * images
-	 * * images.size
-	 * * images.0.id
-	 * * images.0.created_at
-	 * * images.0.updated_at
-	 * * images.0.src
-	 * * images.0.title
-	 * * images.0.alt
-	 * * images.0.position
-	 *
-	 * Attributes is an array in which element can be accessed by specifying its index:
-	 *
-	 * * attributes
-	 * * attributes.size
-	 * * attributes.0.name
-	 * * attributes.0.slug
-	 * * attributes.0.position
-	 * * attributes.0.visible
-	 * * attributes.0.variation
-	 * * attributes.0.options
-	 *
-	 * Downloads is an array in which element can be accessed by specifying its index:
-	 *
-	 * * downloads
-	 * * downloads.size
-	 * * downloads.0.id
-	 * * downloads.0.name
-	 * * downloads.0.file
-	 *
-	 * Variations is an array in which element can be accessed by specifying its index:
-	 *
-	 * * variations
-	 * * variations.size
-	 * * variations.0.id
-	 * * variations.0.created_at
-	 * * variations.0.updated_at
-	 * * variations.0.downloadable
-	 * * variations.0.virtual
-	 * * variations.0.permalink
-	 * * variations.0.sku
-	 * * variations.0.price
-	 * * variations.0.regular_price
-	 * * variations.0.sale_price
-	 * * variations.0.sale_price_dates_from
-	 * * variations.0.sale_price_dates_to
-	 * * variations.0.taxable
-	 * * variations.0.tax_status
-	 * * variations.0.tax_class
-	 * * variations.0.managing_stock
-	 * * variations.0.stock_quantity
-	 * * variations.0.in_stock
-	 * * variations.0.backordered
-	 * * variations.0.purchaseable
-	 * * variations.0.visible
-	 * * variations.0.on_sale
-	 * * variations.0.weight
-	 * * variations.0.dimensions -- See dimensions fields
-	 * * variations.0.shipping_class
-	 * * variations.0.shipping_class_id
-	 * * variations.0.images -- See images fields
-	 * * variations.0.attributes -- See attributes fields
-	 * * variations.0.downloads -- See downloads fields
-	 * * variations.0.download_limit
-	 * * variations.0.download_expiry
-	 *
-	 * Fields for filtering query result also available:
-	 *
-	 * * q              Filter products with search query.
-	 * * created_at_min Filter products whose created after this date.
-	 * * created_at_max Filter products whose created before this date.
-	 * * updated_at_min Filter products whose updated after this date.
-	 * * updated_at_max Filter products whose updated before this date.
-	 * * limit          The maximum returned number of results.
-	 * * offset         Offset the returned results.
-	 * * order          Accepted values: ASC and DESC. Default: DESC.
-	 * * orderby        Sort retrieved products by parameter. One or more options can be passed.
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc product list
-	 *
-	 *     wp wc product list --field=id
-	 *
-	 *     wp wc product list --fields=id,title,type --format=json
-	 *
-	 * @subcommand list
-	 * @since      2.5.0
-	 */
-	public function list_( $args, $assoc_args ) {
-		$query_args = $this->merge_wp_query_args( $this->get_list_query_args( $assoc_args ), $assoc_args );
-		$formatter  = $this->get_formatter( $assoc_args );
-
-		if ( 'ids' === $formatter->format ) {
-			$query_args['fields'] = 'ids';
-			$query = new WP_Query( $query_args );
-			echo implode( ' ', $query->posts );
-		} else {
-			$query = new WP_Query( $query_args );
-			$items = $this->format_posts_to_items( $query->posts );
-			$formatter->display_items( $items );
-		}
-	}
-
-	/**
-	 * List of product reviews.
-	 *
-	 * ## OPTIONS
-	 *
-	 * <id>
-	 * : Product ID.
-	 *
-	 * [--field=<field>]
-	 * : Instead of returning the whole review fields, returns the value of a single fields.
-	 *
-	 * [--fields=<fields>]
-	 * : Get a specific subset of the review's fields.
-	 *
-	 * [--format=<format>]
-	 * : Accepted values: table, json, csv. Default: table.
-	 *
-	 * ## AVAILABLE FIELDS
-	 *
-	 * * id
-	 * * rating
-	 * * reviewer_name
-	 * * reviewer_email
-	 * * verified
-	 * * created_at
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc product reviews 123
-	 *
-	 *     wp wc product reviews 123 --fields=id,rating,reviewer_email
-	 *
-	 * @since 2.5.0
-	 */
-	public function reviews( $args, $assoc_args ) {
-		try {
-			$id      = $args[0];
-			$product = wc_get_product( $id );
-			if ( ! $product ) {
-				throw new WC_CLI_Exception( 'woocommerce_cli_invalid_product', sprintf( __( 'Invalid product "%s"', 'woocommerce' ), $id ) );
-			}
-
-			$comments = get_approved_comments( $id );
-			$reviews  = array();
-
-			foreach ( $comments as $comment ) {
-				$reviews[] = array(
-					'id'             => intval( $comment->comment_ID ),
-					'created_at'     => $this->format_datetime( $comment->comment_date_gmt ),
-					'review'         => $comment->comment_content,
-					'rating'         => get_comment_meta( $comment->comment_ID, 'rating', true ),
-					'reviewer_name'  => $comment->comment_author,
-					'reviewer_email' => $comment->comment_author_email,
-					'verified'       => (bool) get_comment_meta( $comment->comment_ID, 'verified', true ),
-				);
-			}
-
-			if ( empty( $assoc_args['fields'] ) ) {
-				$assoc_args['fields'] = $this->get_review_fields();
-			}
-
-			$formatter = $this->get_formatter( $assoc_args );
-			$formatter->display_items( $reviews );
-		} catch ( WC_CLI_Exception $e ) {
-			WP_CLI::error( $e->getMessage() );
-		}
-	}
-
-	/**
-	 * Get product types.
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc product types
-	 *
-	 * @since 2.5.0
-	 */
-	public function types( $__, $___ ) {
-		$product_types = wc_get_product_types();
-		foreach ( $product_types as $type => $label ) {
-			WP_CLI::line( sprintf( '%s: %s', $label, $type ) );
-		}
-	}
-
-	/**
-	 * Update one or more products.
-	 *
-	 * ## OPTIONS
-	 *
-	 * <id>
-	 * : Product ID
-	 *
-	 * [--<field>=<value>]
-	 * : One or more fields to update.
-	 *
-	 * ## AVAILABLE_FIELDS
-	 *
-	 * For more fields, see: wp wc product create --help
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc product update 123 --title="New Product Title" --description="New description"
-	 *
-	 * @since 2.5.0
-	 */
-	public function update( $args, $assoc_args ) {
-		try {
-			$id   = $args[0];
-			$data = apply_filters( 'woocommerce_cli_update_product_data', $this->unflatten_array( $assoc_args ) );
-
-			// Product title.
-			if ( isset( $data['title'] ) ) {
-				wp_update_post( array( 'ID' => $id, 'post_title' => wc_clean( $data['title'] ) ) );
-			}
-
-			// Product name (slug).
-			if ( isset( $data['name'] ) ) {
-				wp_update_post( array( 'ID' => $id, 'post_name' => sanitize_title( $data['name'] ) ) );
-			}
-
-			// Product status.
-			if ( isset( $data['status'] ) ) {
-				wp_update_post( array( 'ID' => $id, 'post_status' => wc_clean( $data['status'] ) ) );
-			}
-
-			// Product short description.
-			if ( isset( $data['short_description'] ) ) {
-				// Enable short description html tags.
-				$post_excerpt = ( isset( $data['enable_html_short_description'] ) && true === $data['enable_html_short_description'] ) ? $data['short_description'] : wc_clean( $data['short_description'] );
-
-				wp_update_post( array( 'ID' => $id, 'post_excerpt' => $post_excerpt ) );
-			}
-
-			// Product description.
-			if ( isset( $data['description'] ) ) {
-				// Enable description html tags.
-				$post_content = ( isset( $data['enable_html_description'] ) && true === $data['enable_html_description'] ) ? $data['description'] : wc_clean( $data['description'] );
-
-				wp_update_post( array( 'ID' => $id, 'post_content' => $post_content ) );
-			}
-
-			// Validate the product type
-			if ( isset( $data['type'] ) && ! in_array( wc_clean( $data['type'] ), array_keys( wc_get_product_types() ) ) ) {
-				throw new WC_CLI_Exception( 'woocommerce_cli_invalid_product_type', sprintf( __( 'Invalid product type - the product type must be any of these: %s', 'woocommerce' ), implode( ', ', array_keys( wc_get_product_types() ) ) ) );
-			}
-
-			// Check for featured/gallery images, upload it and set it
-			if ( isset( $data['images'] ) ) {
-				$this->save_product_images( $id, $data['images'] );
-			}
-
-			// Save product meta fields
-			$this->save_product_meta( $id, $data );
-
-			// Save variations
-			if ( isset( $data['type'] ) && 'variable' == $data['type'] && isset( $data['variations'] ) && is_array( $data['variations'] ) ) {
-				$this->save_variations( $id, $data );
-			}
-
-			do_action( 'woocommerce_cli_update_product', $id, $data );
-
-			// Clear cache/transients
-			wc_delete_product_transients( $id );
-
-			WP_CLI::success( "Updated product $id." );
-		} catch ( WC_CLI_Exception $e ) {
-			WP_CLI::error( $e->getMessage() );
-		}
-	}
-
-	/**
-	 * Get query args for list subcommand.
-	 *
-	 * @since  2.5.0
-	 * @param  array $args Args from command line
-	 * @return array
-	 */
-	protected function get_list_query_args( $args ) {
-		$query_args = array(
-			'post_type'      => 'product',
-			'post_status'    => 'publish',
-			'posts_per_page' => -1,
-			'meta_query'     => array(),
-		);
-
-		if ( ! empty( $args['type'] ) ) {
-			$types                   = explode( ',', $args['type'] );
-			$query_args['tax_query'] = array(
-				array(
-					'taxonomy' => 'product_type',
-					'field'    => 'slug',
-					'terms'    => $types,
-				),
-			);
-		}
-
-		// Filter products by category
-		if ( ! empty( $args['category'] ) ) {
-			$query_args['product_cat'] = $args['category'];
-		}
-
-		// Filter by specific sku
-		if ( ! empty( $args['sku'] ) ) {
-			if ( ! is_array( $query_args['meta_query'] ) ) {
-				$query_args['meta_query'] = array();
-			}
-
-			$query_args['meta_query'][] = array(
-				'key'     => '_sku',
-				'value'   => $args['sku'],
-				'compare' => '='
-			);
-		}
-
-		return $query_args;
-	}
-
-	/**
-	 * Get default format fields that will be used in `list` and `get` subcommands.
-	 *
-	 * @since  2.5.0
-	 * @return string
-	 */
-	protected function get_default_format_fields() {
-		return 'id,title,sku,in_stock,price,sale_price,categories,tags,type,created_at';
-	}
-
-	/**
-	 * Get review fields for formatting.
-	 *
-	 * @since  2.5.0
-	 * @return string
-	 */
-	protected function get_review_fields() {
-		return 'id,rating,reviewer_name,reviewer_email,verified,created_at';
-	}
-
-	/**
-	 * Format posts from WP_Query result to items in which each item contain
-	 * common properties of item, for instance `post_title` will be `title`.
-	 *
-	 * @since  2.5.0
-	 * @param  array $posts Array of post
-	 * @return array Items
-	 */
-	protected function format_posts_to_items( $posts ) {
-		$items = array();
-		foreach ( $posts as $post ) {
-			$product = wc_get_product( $post->ID );
-			if ( ! $product ) {
-				continue;
-			}
-			$items[] = $this->get_product_data( $product );
-		}
-
-		return $items;
-	}
-
-	/**
-	 * Get standard product data that applies to every product type.
-	 *
-	 * @since  2.5.0
-	 * @param  WC_Product $product
-	 * @return array
-	 */
-	private function get_product_data( $product ) {
-
-		// Add data that applies to every product type.
-		$product_data = array(
-			'title'              => $product->get_title(),
-			'id'                 => (int) $product->is_type( 'variation' ) ? $product->get_variation_id() : $product->id,
-			'created_at'         => $this->format_datetime( $product->get_post_data()->post_date_gmt ),
-			'updated_at'         => $this->format_datetime( $product->get_post_data()->post_modified_gmt ),
-			'type'               => $product->product_type,
-			'status'             => $product->get_post_data()->post_status,
-			'downloadable'       => $product->is_downloadable(),
-			'virtual'            => $product->is_virtual(),
-			'permalink'          => $product->get_permalink(),
-			'sku'                => $product->get_sku(),
-			'price'              => $product->get_price(),
-			'regular_price'      => $product->get_regular_price(),
-			'sale_price'         => $product->get_sale_price() ? $product->get_sale_price() : null,
-			'price_html'         => $product->get_price_html(),
-			'taxable'            => $product->is_taxable(),
-			'tax_status'         => $product->get_tax_status(),
-			'tax_class'          => $product->get_tax_class(),
-			'managing_stock'     => $product->managing_stock(),
-			'stock_quantity'     => $product->get_stock_quantity(),
-			'in_stock'           => $product->is_in_stock() ? 'yes' : 'no',
-			'backorders_allowed' => $product->backorders_allowed(),
-			'backordered'        => $product->is_on_backorder(),
-			'sold_individually'  => $product->is_sold_individually(),
-			'purchaseable'       => $product->is_purchasable(),
-			'featured'           => $product->is_featured(),
-			'visible'            => $product->is_visible(),
-			'catalog_visibility' => $product->visibility,
-			'on_sale'            => $product->is_on_sale(),
-			'product_url'        => $product->is_type( 'external' ) ? $product->get_product_url() : '',
-			'button_text'        => $product->is_type( 'external' ) ? $product->get_button_text() : '',
-			'weight'             => $product->get_weight() ? $product->get_weight() : null,
-			'dimensions'         => array(
-				'length' => $product->length,
-				'width'  => $product->width,
-				'height' => $product->height,
-				'unit'   => get_option( 'woocommerce_dimension_unit' ),
-			),
-			'shipping_required'  => $product->needs_shipping(),
-			'shipping_taxable'   => $product->is_shipping_taxable(),
-			'shipping_class'     => $product->get_shipping_class(),
-			'shipping_class_id'  => ( 0 !== $product->get_shipping_class_id() ) ? $product->get_shipping_class_id() : null,
-			'description'        => wpautop( do_shortcode( $product->get_post_data()->post_content ) ),
-			'short_description'  => apply_filters( 'woocommerce_short_description', $product->get_post_data()->post_excerpt ),
-			'reviews_allowed'    => ( 'open' === $product->get_post_data()->comment_status ),
-			'average_rating'     => wc_format_decimal( $product->get_average_rating(), 2 ),
-			'rating_count'       => (int) $product->get_rating_count(),
-			'related_ids'        => implode( ', ', $product->get_related() ),
-			'upsell_ids'         => implode( ', ', $product->get_upsells() ),
-			'cross_sell_ids'     => implode( ', ', $product->get_cross_sells() ),
-			'parent_id'          => $product->post->post_parent,
-			'categories'         => implode( ', ', wp_get_post_terms( $product->id, 'product_cat', array( 'fields' => 'names' ) ) ),
-			'tags'               => implode( ', ', wp_get_post_terms( $product->id, 'product_tag', array( 'fields' => 'names' ) ) ),
-			'images'             => $this->get_images( $product ),
-			'featured_src'       => wp_get_attachment_url( get_post_thumbnail_id( $product->is_type( 'variation' ) ? $product->variation_id : $product->id ) ),
-			'attributes'         => $this->get_attributes( $product ),
-			'downloads'          => $this->get_downloads( $product ),
-			'download_limit'     => (int) $product->download_limit,
-			'download_expiry'    => (int) $product->download_expiry,
-			'download_type'      => $product->download_type,
-			'purchase_note'      => wpautop( do_shortcode( wp_kses_post( $product->purchase_note ) ) ),
-			'total_sales'        => metadata_exists( 'post', $product->id, 'total_sales' ) ? (int) get_post_meta( $product->id, 'total_sales', true ) : 0,
-			'variations'         => array(),
-			'parent'             => array(),
-		);
-
-		// add variations to variable products
-		if ( $product->is_type( 'variable' ) && $product->has_child() ) {
-			$product_data['variations'] = $this->get_variation_data( $product );
-		}
-
-		// add the parent product data to an individual variation
-		if ( $product->is_type( 'variation' ) ) {
-			$product_data['parent'] = $this->get_product_data( $product->parent );
-		}
-
-		return $this->flatten_array( $product_data );
-	}
-
-	/**
-	 * Get the images for a product or product variation
-	 *
-	 * @since  2.5.0
-	 * @param  WC_Product|WC_Product_Variation $product
-	 * @return array
-	 */
-	private function get_images( $product ) {
-
-		$images = $attachment_ids = array();
-
-		if ( $product->is_type( 'variation' ) ) {
-
-			if ( has_post_thumbnail( $product->get_variation_id() ) ) {
-
-				// Add variation image if set
-				$attachment_ids[] = get_post_thumbnail_id( $product->get_variation_id() );
-
-			} elseif ( has_post_thumbnail( $product->id ) ) {
-
-				// Otherwise use the parent product featured image if set
-				$attachment_ids[] = get_post_thumbnail_id( $product->id );
-			}
-
-		} else {
-
-			// Add featured image
-			if ( has_post_thumbnail( $product->id ) ) {
-				$attachment_ids[] = get_post_thumbnail_id( $product->id );
-			}
-
-			// Add gallery images
-			$attachment_ids = array_merge( $attachment_ids, $product->get_gallery_attachment_ids() );
-		}
-
-		// Build image data
-		foreach ( $attachment_ids as $position => $attachment_id ) {
-
-			$attachment_post = get_post( $attachment_id );
-
-			if ( is_null( $attachment_post ) ) {
-				continue;
-			}
-
-			$attachment = wp_get_attachment_image_src( $attachment_id, 'full' );
-
-			if ( ! is_array( $attachment ) ) {
-				continue;
-			}
-
-			$images[] = array(
-				'id'         => (int) $attachment_id,
-				'created_at' => $this->format_datetime( $attachment_post->post_date_gmt ),
-				'updated_at' => $this->format_datetime( $attachment_post->post_modified_gmt ),
-				'src'        => current( $attachment ),
-				'title'      => get_the_title( $attachment_id ),
-				'alt'        => get_post_meta( $attachment_id, '_wp_attachment_image_alt', true ),
-				'position'   => (int) $position,
-			);
-		}
-
-		// Set a placeholder image if the product has no images set
-		if ( empty( $images ) ) {
-
-			$images[] = array(
-				'id'         => 0,
-				'created_at' => $this->format_datetime( time() ), // Default to now
-				'updated_at' => $this->format_datetime( time() ),
-				'src'        => wc_placeholder_img_src(),
-				'title'      => __( 'Placeholder', 'woocommerce' ),
-				'alt'        => __( 'Placeholder', 'woocommerce' ),
-				'position'   => 0,
-			);
-		}
-
-		return $images;
-	}
-
-	/**
-	 * Get the attributes for a product or product variation
-	 *
-	 * @since  2.5.0
-	 * @param  WC_Product|WC_Product_Variation $product
-	 * @return array
-	 */
-	private function get_attributes( $product ) {
-
-		$attributes = array();
-
-		if ( $product->is_type( 'variation' ) ) {
-
-			// variation attributes
-			foreach ( $product->get_variation_attributes() as $attribute_name => $attribute ) {
-
-				// taxonomy-based attributes are prefixed with `pa_`, otherwise simply `attribute_`
-				$attributes[] = array(
-					'name'   => wc_attribute_label( str_replace( 'attribute_', '', $attribute_name ) ),
-					'slug'   => str_replace( 'attribute_', '', str_replace( 'pa_', '', $attribute_name ) ),
-					'option' => $attribute,
-				);
-			}
-
-		} else {
-
-			foreach ( $product->get_attributes() as $attribute ) {
-
-				// taxonomy-based attributes are comma-separated, others are pipe (|) separated
-				if ( $attribute['is_taxonomy'] ) {
-					$options = explode( ',', $product->get_attribute( $attribute['name'] ) );
-				} else {
-					$options = explode( '|', $product->get_attribute( $attribute['name'] ) );
-				}
-
-				$attributes[] = array(
-					'name'      => wc_attribute_label( $attribute['name'] ),
-					'slug'      => str_replace( 'pa_', '', $attribute['name'] ),
-					'position'  => (int) $attribute['position'],
-					'visible'   => (bool) $attribute['is_visible'],
-					'variation' => (bool) $attribute['is_variation'],
-					'options'   => array_map( 'trim', $options ),
-				);
-			}
-		}
-
-		return $attributes;
-	}
-
-	/**
-	 * Get the downloads for a product or product variation
-	 *
-	 * @since  2.5.0
-	 * @param  WC_Product|WC_Product_Variation $product
-	 * @return array
-	 */
-	private function get_downloads( $product ) {
-
-		$downloads = array();
-
-		if ( $product->is_downloadable() ) {
-
-			foreach ( $product->get_files() as $file_id => $file ) {
-
-				$downloads[] = array(
-					'id'   => $file_id, // do not cast as int as this is a hash
-					'name' => $file['name'],
-					'file' => $file['file'],
-				);
-			}
-		}
-
-		return $downloads;
-	}
-
-	/**
-	 * Get an individual variation's data
-	 *
-	 * @since  2.5.0
-	 * @param  WC_Product $product
-	 * @return array
-	 */
-	private function get_variation_data( $product ) {
-		$variations = array();
-
-		foreach ( $product->get_children() as $child_id ) {
-
-			$variation = $product->get_child( $child_id );
-
-			if ( ! $variation->exists() ) {
-				continue;
-			}
-
-			$variations[] = array(
-					'id'                => $variation->get_variation_id(),
-					'created_at'        => $this->format_datetime( $variation->get_post_data()->post_date_gmt ),
-					'updated_at'        => $this->format_datetime( $variation->get_post_data()->post_modified_gmt ),
-					'downloadable'      => $variation->is_downloadable(),
-					'virtual'           => $variation->is_virtual(),
-					'permalink'         => $variation->get_permalink(),
-					'sku'               => $variation->get_sku(),
-					'price'             => $variation->get_price(),
-					'regular_price'     => $variation->get_regular_price(),
-					'sale_price'        => $variation->get_sale_price() ? $variation->get_sale_price() : null,
-					'taxable'           => $variation->is_taxable(),
-					'tax_status'        => $variation->get_tax_status(),
-					'tax_class'         => $variation->get_tax_class(),
-					'managing_stock'    => $variation->managing_stock(),
-					'stock_quantity'    => $variation->get_stock_quantity(),
-					'in_stock'          => $variation->is_in_stock(),
-					'backordered'       => $variation->is_on_backorder(),
-					'purchaseable'      => $variation->is_purchasable(),
-					'visible'           => $variation->variation_is_visible(),
-					'on_sale'           => $variation->is_on_sale(),
-					'weight'            => $variation->get_weight() ? $variation->get_weight() : null,
-					'dimensions'        => array(
-						'length' => $variation->length,
-						'width'  => $variation->width,
-						'height' => $variation->height,
-						'unit'   => get_option( 'woocommerce_dimension_unit' ),
-					),
-					'shipping_class'    => $variation->get_shipping_class(),
-					'shipping_class_id' => ( 0 !== $variation->get_shipping_class_id() ) ? $variation->get_shipping_class_id() : null,
-					'image'             => $this->get_images( $variation ),
-					'attributes'        => $this->get_attributes( $variation ),
-					'downloads'         => $this->get_downloads( $variation ),
-					'download_limit'    => (int) $product->download_limit,
-					'download_expiry'   => (int) $product->download_expiry,
-			);
-		}
-
-		return $variations;
-	}
-
-	/**
-	 * Save product meta
-	 *
-	 * @since  2.5.0
-	 * @param  int $product_id
-	 * @param  array $data
-	 * @return bool
-	 * @throws WC_CLI_Exception
-	 */
-	private function save_product_meta( $product_id, $data ) {
-		global $wpdb;
-
-		// Product Type
-		$product_type = null;
-		if ( isset( $data['type'] ) ) {
-			$product_type = wc_clean( $data['type'] );
-			wp_set_object_terms( $product_id, $product_type, 'product_type' );
-		} else {
-			$_product_type = get_the_terms( $product_id, 'product_type' );
-			if ( is_array( $_product_type ) ) {
-				$_product_type = current( $_product_type );
-				$product_type  = $_product_type->slug;
-			}
-		}
-
-		// Virtual
-		if ( isset( $data['virtual'] ) ) {
-			update_post_meta( $product_id, '_virtual', ( true === $data['virtual'] ) ? 'yes' : 'no' );
-		}
-
-		// Tax status
-		if ( isset( $data['tax_status'] ) ) {
-			update_post_meta( $product_id, '_tax_status', wc_clean( $data['tax_status'] ) );
-		}
-
-		// Tax Class
-		if ( isset( $data['tax_class'] ) ) {
-			update_post_meta( $product_id, '_tax_class', wc_clean( $data['tax_class'] ) );
-		}
-
-		// Catalog Visibility
-		if ( isset( $data['catalog_visibility'] ) ) {
-			update_post_meta( $product_id, '_visibility', wc_clean( $data['catalog_visibility'] ) );
-		}
-
-		// Purchase Note
-		if ( isset( $data['purchase_note'] ) ) {
-			update_post_meta( $product_id, '_purchase_note', wc_clean( $data['purchase_note'] ) );
-		}
-
-		// Featured Product
-		if ( isset( $data['featured'] ) ) {
-			update_post_meta( $product_id, '_featured', ( true === $data['featured'] ) ? 'yes' : 'no' );
-		}
-
-		// Shipping data
-		$this->save_product_shipping_data( $product_id, $data );
-
-		// SKU
-		if ( isset( $data['sku'] ) ) {
-			$sku     = get_post_meta( $product_id, '_sku', true );
-			$new_sku = wc_clean( $data['sku'] );
-
-			if ( '' == $new_sku ) {
-				update_post_meta( $product_id, '_sku', '' );
-			} elseif ( $new_sku !== $sku ) {
-				if ( ! empty( $new_sku ) ) {
-					$unique_sku = wc_product_has_unique_sku( $product_id, $new_sku );
-					if ( ! $unique_sku ) {
-						throw new WC_CLI_Exception( 'woocommerce_cli_product_sku_already_exists', __( 'The SKU already exists on another product', 'woocommerce' ) );
-					} else {
-						update_post_meta( $product_id, '_sku', $new_sku );
-					}
-				} else {
-					update_post_meta( $product_id, '_sku', '' );
-				}
-			}
-		}
-
-		// Attributes
-		if ( isset( $data['attributes'] ) ) {
-			$attributes = array();
-
-			foreach ( $data['attributes'] as $attribute ) {
-				$is_taxonomy    = 0;
-				$taxonomy       = 0;
-
-				if ( ! isset( $attribute['name'] ) ) {
-					continue;
-				}
-
-				$attribute_slug = sanitize_title( $attribute['name'] );
-
-				if ( isset( $attribute['slug'] ) ) {
-					$taxonomy       = $this->get_attribute_taxonomy_by_slug( $attribute['slug'] );
-					$attribute_slug = sanitize_title( $attribute['slug'] );
-				}
-
-				if ( $taxonomy ) {
-					$is_taxonomy = 1;
-				}
-
-				if ( $is_taxonomy ) {
-
-					if ( isset( $attribute['options'] ) ) {
-						$options = $attribute['options'];
-
-						if ( ! is_array( $attribute['options'] ) ) {
-							// Text based attributes - Posted values are term names
-							$options = explode( WC_DELIMITER, $options );
-						}
-
-						$values = array_map( 'wc_sanitize_term_text_based', $options );
-						$values = array_filter( $values, 'strlen' );
-					} else {
-						$values = array();
-					}
-
-					// Update post terms
-					if ( taxonomy_exists( $taxonomy ) ) {
-						wp_set_object_terms( $product_id, $values, $taxonomy );
-					}
-
-					if ( $values ) {
-						// Add attribute to array, but don't set values
-						$attributes[ $taxonomy ] = array(
-							'name'         => $taxonomy,
-							'value'        => '',
-							'position'     => isset( $attribute['position'] ) ? absint( $attribute['position'] ) : 0,
-							'is_visible'   => ( isset( $attribute['visible'] ) && $attribute['visible'] ) ? 1 : 0,
-							'is_variation' => ( isset( $attribute['variation'] ) && $attribute['variation'] ) ? 1 : 0,
-							'is_taxonomy'  => $is_taxonomy
-						);
-					}
-
-				} elseif ( isset( $attribute['options'] ) ) {
-					// Array based
-					if ( is_array( $attribute['options'] ) ) {
-						$values = implode( ' ' . WC_DELIMITER . ' ', array_map( 'wc_clean', $attribute['options'] ) );
-
-					// Text based, separate by pipe
-					} else {
-						$values = implode( ' ' . WC_DELIMITER . ' ', array_map( 'wc_clean', explode( WC_DELIMITER, $attribute['options'] ) ) );
-					}
-
-					// Custom attribute - Add attribute to array and set the values
-					$attributes[ $attribute_slug ] = array(
-						'name'         => wc_clean( $attribute['name'] ),
-						'value'        => $values,
-						'position'     => isset( $attribute['position'] ) ? absint( $attribute['position'] ) : 0,
-						'is_visible'   => ( isset( $attribute['visible'] ) && $attribute['visible'] ) ? 1 : 0,
-						'is_variation' => ( isset( $attribute['variation'] ) && $attribute['variation'] ) ? 1 : 0,
-						'is_taxonomy'  => $is_taxonomy
-					);
-				}
-			}
-
-			if ( ! function_exists( 'attributes_cmp' ) ) {
-				function attributes_cmp( $a, $b ) {
-					if ( $a['position'] == $b['position'] ) {
-						return 0;
-					}
-
-					return ( $a['position'] < $b['position'] ) ? -1 : 1;
-				}
-			}
-			uasort( $attributes, 'attributes_cmp' );
-
-			update_post_meta( $product_id, '_product_attributes', $attributes );
-		}
-
-		// Sales and prices
-		if ( in_array( $product_type, array( 'variable', 'grouped' ) ) ) {
-
-			// Variable and grouped products have no prices
-			update_post_meta( $product_id, '_regular_price', '' );
-			update_post_meta( $product_id, '_sale_price', '' );
-			update_post_meta( $product_id, '_sale_price_dates_from', '' );
-			update_post_meta( $product_id, '_sale_price_dates_to', '' );
-			update_post_meta( $product_id, '_price', '' );
-
-		} else {
-
-			// Regular Price
-			if ( isset( $data['regular_price'] ) ) {
-				$regular_price = ( '' === $data['regular_price'] ) ? '' : wc_format_decimal( $data['regular_price'] );
-				update_post_meta( $product_id, '_regular_price', $regular_price );
-			} else {
-				$regular_price = get_post_meta( $product_id, '_regular_price', true );
-			}
-
-			// Sale Price
-			if ( isset( $data['sale_price'] ) ) {
-				$sale_price = ( '' === $data['sale_price'] ) ? '' : wc_format_decimal( $data['sale_price'] );
-				update_post_meta( $product_id, '_sale_price', $sale_price );
-			} else {
-				$sale_price = get_post_meta( $product_id, '_sale_price', true );
-			}
-
-			$date_from = isset( $data['sale_price_dates_from'] ) ? strtotime( $data['sale_price_dates_from'] ) : get_post_meta( $product_id, '_sale_price_dates_from', true );
-			$date_to   = isset( $data['sale_price_dates_to'] ) ? strtotime( $data['sale_price_dates_to'] ) : get_post_meta( $product_id, '_sale_price_dates_to', true );
-
-			// Dates
-			if ( $date_from ) {
-				update_post_meta( $product_id, '_sale_price_dates_from', $date_from );
-			} else {
-				update_post_meta( $product_id, '_sale_price_dates_from', '' );
-			}
-
-			if ( $date_to ) {
-				update_post_meta( $product_id, '_sale_price_dates_to', $date_to );
-			} else {
-				update_post_meta( $product_id, '_sale_price_dates_to', '' );
-			}
-
-			if ( $date_to && ! $date_from ) {
-				$date_from = strtotime( 'NOW', current_time( 'timestamp' ) );
-				update_post_meta( $product_id, '_sale_price_dates_from', $date_from );
-			}
-
-			// Update price if on sale
-			if ( '' !== $sale_price && '' == $date_to && '' == $date_from ) {
-				update_post_meta( $product_id, '_price', wc_format_decimal( $sale_price ) );
-			} else {
-				update_post_meta( $product_id, '_price', $regular_price );
-			}
-
-			if ( '' !== $sale_price && $date_from && $date_from <= strtotime( 'NOW', current_time( 'timestamp' ) ) ) {
-				update_post_meta( $product_id, '_price', wc_format_decimal( $sale_price ) );
-			}
-
-			if ( $date_to && $date_to < strtotime( 'NOW', current_time( 'timestamp' ) ) ) {
-				update_post_meta( $product_id, '_price', $regular_price );
-				update_post_meta( $product_id, '_sale_price_dates_from', '' );
-				update_post_meta( $product_id, '_sale_price_dates_to', '' );
-			}
-		}
-
-		// Product parent ID for groups
-		if ( isset( $data['parent_id'] ) ) {
-			wp_update_post( array( 'ID' => $product_id, 'post_parent' => absint( $data['parent_id'] ) ) );
-		}
-
-		// Update parent if grouped so price sorting works and stays in sync with the cheapest child
-		$_product = wc_get_product( $product_id );
-		if ( $_product->post->post_parent > 0 || $product_type == 'grouped' ) {
-
-			$clear_parent_ids = array();
-
-			if ( $_product->post->post_parent > 0 ) {
-				$clear_parent_ids[] = $_product->post->post_parent;
-			}
-
-			if ( $product_type == 'grouped' ) {
-				$clear_parent_ids[] = $product_id;
-			}
-
-			if ( $clear_parent_ids ) {
-				foreach ( $clear_parent_ids as $clear_id ) {
-
-					$children_by_price = get_posts( array(
-						'post_parent'    => $clear_id,
-						'orderby'        => 'meta_value_num',
-						'order'          => 'asc',
-						'meta_key'       => '_price',
-						'posts_per_page' => 1,
-						'post_type'      => 'product',
-						'fields'         => 'ids'
-					) );
-
-					if ( $children_by_price ) {
-						foreach ( $children_by_price as $child ) {
-							$child_price = get_post_meta( $child, '_price', true );
-							update_post_meta( $clear_id, '_price', $child_price );
-						}
-					}
-				}
-			}
-		}
-
-		// Sold Individually
-		if ( isset( $data['sold_individually'] ) ) {
-			update_post_meta( $product_id, '_sold_individually', ( true === $data['sold_individually'] ) ? 'yes' : '' );
-		}
-
-		// Stock status
-		if ( isset( $data['in_stock'] ) ) {
-			$stock_status = ( true === $data['in_stock'] ) ? 'instock' : 'outofstock';
-		} else {
-			$stock_status = get_post_meta( $product_id, '_stock_status', true );
-
-			if ( '' === $stock_status ) {
-				$stock_status = 'instock';
-			}
-		}
-
-		// Stock Data
-		if ( 'yes' == get_option( 'woocommerce_manage_stock' ) ) {
-			// Manage stock
-			if ( isset( $data['managing_stock'] ) ) {
-				$managing_stock = ( true === $data['managing_stock'] ) ? 'yes' : 'no';
-				update_post_meta( $product_id, '_manage_stock', $managing_stock );
-			} else {
-				$managing_stock = get_post_meta( $product_id, '_manage_stock', true );
-			}
-
-			// Backorders
-			if ( isset( $data['backorders'] ) ) {
-				if ( 'notify' == $data['backorders'] ) {
-					$backorders = 'notify';
-				} else {
-					$backorders = ( true === $data['backorders'] ) ? 'yes' : 'no';
-				}
-
-				update_post_meta( $product_id, '_backorders', $backorders );
-			} else {
-				$backorders = get_post_meta( $product_id, '_backorders', true );
-			}
-
-			if ( 'grouped' == $product_type ) {
-
-				update_post_meta( $product_id, '_manage_stock', 'no' );
-				update_post_meta( $product_id, '_backorders', 'no' );
-				update_post_meta( $product_id, '_stock', '' );
-
-				wc_update_product_stock_status( $product_id, $stock_status );
-
-			} elseif ( 'external' == $product_type ) {
-
-				update_post_meta( $product_id, '_manage_stock', 'no' );
-				update_post_meta( $product_id, '_backorders', 'no' );
-				update_post_meta( $product_id, '_stock', '' );
-
-				wc_update_product_stock_status( $product_id, 'instock' );
-
-			} elseif ( 'yes' == $managing_stock ) {
-				update_post_meta( $product_id, '_backorders', $backorders );
-
-				wc_update_product_stock_status( $product_id, $stock_status );
-
-				// Stock quantity
-				if ( isset( $data['stock_quantity'] ) ) {
-					wc_update_product_stock( $product_id, intval( $data['stock_quantity'] ) );
-				}
-			} else {
-
-				// Don't manage stock
-				update_post_meta( $product_id, '_manage_stock', 'no' );
-				update_post_meta( $product_id, '_backorders', $backorders );
-				update_post_meta( $product_id, '_stock', '' );
-
-				wc_update_product_stock_status( $product_id, $stock_status );
-			}
-
-		} else {
-			wc_update_product_stock_status( $product_id, $stock_status );
-		}
-
-		// Upsells
-		if ( isset( $data['upsell_ids'] ) ) {
-			$upsells = array();
-			$ids     = $data['upsell_ids'];
-
-			if ( ! empty( $ids ) ) {
-				foreach ( $ids as $id ) {
-					if ( $id && $id > 0 ) {
-						$upsells[] = $id;
-					}
-				}
-
-				update_post_meta( $product_id, '_upsell_ids', $upsells );
-			} else {
-				delete_post_meta( $product_id, '_upsell_ids' );
-			}
-		}
-
-		// Cross sells
-		if ( isset( $data['cross_sell_ids'] ) ) {
-			$crosssells = array();
-			$ids        = $data['cross_sell_ids'];
-
-			if ( ! empty( $ids ) ) {
-				foreach ( $ids as $id ) {
-					if ( $id && $id > 0 ) {
-						$crosssells[] = $id;
-					}
-				}
-
-				update_post_meta( $product_id, '_crosssell_ids', $crosssells );
-			} else {
-				delete_post_meta( $product_id, '_crosssell_ids' );
-			}
-		}
-
-		// Product categories
-		if ( isset( $data['categories'] ) && is_array( $data['categories'] ) ) {
-			$term_ids = array_unique( array_map( 'intval', $data['categories'] ) );
-			wp_set_object_terms( $product_id, $term_ids, 'product_cat' );
-		}
-
-		// Product tags
-		if ( isset( $data['tags'] ) && is_array( $data['tags'] ) ) {
-			$term_ids = array_unique( array_map( 'intval', $data['tags'] ) );
-			wp_set_object_terms( $product_id, $term_ids, 'product_tag' );
-		}
-
-		// Downloadable
-		if ( isset( $data['downloadable'] ) ) {
-			$is_downloadable = ( true === $data['downloadable'] ) ? 'yes' : 'no';
-			update_post_meta( $product_id, '_downloadable', $is_downloadable );
-		} else {
-			$is_downloadable = get_post_meta( $product_id, '_downloadable', true );
-		}
-
-		// Downloadable options
-		if ( 'yes' == $is_downloadable ) {
-
-			// Downloadable files
-			if ( isset( $data['downloads'] ) && is_array( $data['downloads'] ) ) {
-				$this->save_downloadable_files( $product_id, $data['downloads'] );
-			}
-
-			// Download limit
-			if ( isset( $data['download_limit'] ) ) {
-				update_post_meta( $product_id, '_download_limit', ( '' === $data['download_limit'] ) ? '' : absint( $data['download_limit'] ) );
-			}
-
-			// Download expiry
-			if ( isset( $data['download_expiry'] ) ) {
-				update_post_meta( $product_id, '_download_expiry', ( '' === $data['download_expiry'] ) ? '' : absint( $data['download_expiry'] ) );
-			}
-
-			// Download type
-			if ( isset( $data['download_type'] ) ) {
-				update_post_meta( $product_id, '_download_type', wc_clean( $data['download_type'] ) );
-			}
-		}
-
-		// Product url
-		if ( $product_type == 'external' ) {
-			if ( isset( $data['product_url'] ) ) {
-				update_post_meta( $product_id, '_product_url', wc_clean( $data['product_url'] ) );
-			}
-
-			if ( isset( $data['button_text'] ) ) {
-				update_post_meta( $product_id, '_button_text', wc_clean( $data['button_text'] ) );
-			}
-		}
-
-		// Reviews allowed
-		if ( isset( $data['reviews_allowed'] ) ) {
-			$reviews_allowed = ( true === $data['reviews_allowed'] ) ? 'open' : 'closed';
-
-			$wpdb->update( $wpdb->posts, array( 'comment_status' => $reviews_allowed ), array( 'ID' => $product_id ) );
-		}
-
-		// Do action for product type
-		do_action( 'woocommerce_cli_process_product_meta_' . $product_type, $product_id, $data );
-
-		return true;
-	}
-
-	/**
-	 * Save variations.
-	 *
-	 * @since  2.5.0
-	 * @param  int $id
-	 * @param  array $data
-	 * @return bool
-	 * @throws WC_CLI_Exception
-	 */
-	private function save_variations( $id, $data ) {
-		global $wpdb;
-
-		$variations = $data['variations'];
-		$attributes = (array) maybe_unserialize( get_post_meta( $id, '_product_attributes', true ) );
-
-		foreach ( $variations as $menu_order => $variation ) {
-			$variation_id = isset( $variation['id'] ) ? absint( $variation['id'] ) : 0;
-
-			// Generate a useful post title
-			$variation_post_title = sprintf( __( 'Variation #%s of %s', 'woocommerce' ), $variation_id, esc_html( get_the_title( $id ) ) );
-
-			// Update or Add post
-			if ( ! $variation_id ) {
-				$post_status = ( isset( $variation['visible'] ) && false === $variation['visible'] ) ? 'private' : 'publish';
-
-				$new_variation = array(
-					'post_title'   => $variation_post_title,
-					'post_content' => '',
-					'post_status'  => $post_status,
-					'post_author'  => get_current_user_id(),
-					'post_parent'  => $id,
-					'post_type'    => 'product_variation',
-					'menu_order'   => $menu_order
-				);
-
-				$variation_id = wp_insert_post( $new_variation );
-
-				do_action( 'woocommerce_create_product_variation', $variation_id );
-			} else {
-				$update_variation = array( 'post_title' => $variation_post_title, 'menu_order' => $menu_order );
-				if ( isset( $variation['visible'] ) ) {
-					$post_status = ( false === $variation['visible'] ) ? 'private' : 'publish';
-					$update_variation['post_status'] = $post_status;
-				}
-
-				$wpdb->update( $wpdb->posts, $update_variation, array( 'ID' => $variation_id ) );
-
-				do_action( 'woocommerce_update_product_variation', $variation_id );
-			}
-
-			// Stop with we don't have a variation ID
-			if ( is_wp_error( $variation_id ) ) {
-				throw new WC_CLI_Exception( 'woocommerce_cli_cannot_save_product_variation', $variation_id->get_error_message() );
-			}
-
-			// SKU
-			if ( isset( $variation['sku'] ) ) {
-				$sku     = get_post_meta( $variation_id, '_sku', true );
-				$new_sku = wc_clean( $variation['sku'] );
-
-				if ( '' == $new_sku ) {
-					update_post_meta( $variation_id, '_sku', '' );
-				} elseif ( $new_sku !== $sku ) {
-					if ( ! empty( $new_sku ) ) {
-						$unique_sku = wc_product_has_unique_sku( $variation_id, $new_sku );
-						if ( ! $unique_sku ) {
-							throw new WC_CLI_Exception( 'woocommerce_cli_product_sku_already_exists', __( 'The SKU already exists on another product', 'woocommerce' ) );
-						} else {
-							update_post_meta( $variation_id, '_sku', $new_sku );
-						}
-					} else {
-						update_post_meta( $variation_id, '_sku', '' );
-					}
-				}
-			}
-
-			// Thumbnail
-			if ( isset( $variation['image'] ) && is_array( $variation['image'] ) ) {
-				$image = current( $variation['image'] );
-				if ( $image && is_array( $image ) ) {
-					if ( isset( $image['position'] ) && isset( $image['src'] ) && $image['position'] == 0 ) {
-						$upload = $this->upload_product_image( wc_clean( $image['src'] ) );
-						if ( is_wp_error( $upload ) ) {
-							throw new WC_CLI_Exception( 'woocommerce_cli_cannot_upload_product_image', $upload->get_error_message() );
-						}
-						$attachment_id = $this->set_product_image_as_attachment( $upload, $id );
-						update_post_meta( $variation_id, '_thumbnail_id', $attachment_id );
-					}
-				} else {
-					delete_post_meta( $variation_id, '_thumbnail_id' );
-				}
-			}
-
-			// Virtual variation
-			if ( isset( $variation['virtual'] ) ) {
-				$is_virtual = ( true === $variation['virtual'] ) ? 'yes' : 'no';
-				update_post_meta( $variation_id, '_virtual', $is_virtual );
-			}
-
-			// Downloadable variation
-			if ( isset( $variation['downloadable'] ) ) {
-				$is_downloadable = ( true === $variation['downloadable'] ) ? 'yes' : 'no';
-				update_post_meta( $variation_id, '_downloadable', $is_downloadable );
-			} else {
-				$is_downloadable = get_post_meta( $variation_id, '_downloadable', true );
-			}
-
-			// Shipping data
-			$this->save_product_shipping_data( $variation_id, $variation );
-
-			// Stock handling
-			if ( isset( $variation['managing_stock'] ) ) {
-				$managing_stock = ( true === $variation['managing_stock'] ) ? 'yes' : 'no';
-				update_post_meta( $variation_id, '_manage_stock', $managing_stock );
-			} else {
-				$managing_stock = get_post_meta( $variation_id, '_manage_stock', true );
-			}
-
-			// Only update stock status to user setting if changed by the user, but do so before looking at stock levels at variation level
-			if ( isset( $variation['in_stock'] ) ) {
-				$stock_status = ( true === $variation['in_stock'] ) ? 'instock' : 'outofstock';
-				wc_update_product_stock_status( $variation_id, $stock_status );
-			}
-
-			if ( 'yes' === $managing_stock ) {
-				if ( isset( $variation['backorders'] ) ) {
-					if ( 'notify' == $variation['backorders'] ) {
-						$backorders = 'notify';
-					} else {
-						$backorders = ( true === $variation['backorders'] ) ? 'yes' : 'no';
-					}
-				} else {
-					$backorders = 'no';
-				}
-
-				update_post_meta( $variation_id, '_backorders', $backorders );
-
-				if ( isset( $variation['stock_quantity'] ) ) {
-					wc_update_product_stock( $variation_id, wc_stock_amount( $variation['stock_quantity'] ) );
-				}
-			} else {
-				delete_post_meta( $variation_id, '_backorders' );
-				delete_post_meta( $variation_id, '_stock' );
-			}
-
-			// Regular Price
-			if ( isset( $variation['regular_price'] ) ) {
-				$regular_price = ( '' === $variation['regular_price'] ) ? '' : wc_format_decimal( $variation['regular_price'] );
-				update_post_meta( $variation_id, '_regular_price', $regular_price );
-			} else {
-				$regular_price = get_post_meta( $variation_id, '_regular_price', true );
-			}
-
-			// Sale Price
-			if ( isset( $variation['sale_price'] ) ) {
-				$sale_price = ( '' === $variation['sale_price'] ) ? '' : wc_format_decimal( $variation['sale_price'] );
-				update_post_meta( $variation_id, '_sale_price', $sale_price );
-			} else {
-				$sale_price = get_post_meta( $variation_id, '_sale_price', true );
-			}
-
-			$date_from = isset( $variation['sale_price_dates_from'] ) ? strtotime( $variation['sale_price_dates_from'] ) : get_post_meta( $variation_id, '_sale_price_dates_from', true );
-			$date_to   = isset( $variation['sale_price_dates_to'] ) ? strtotime( $variation['sale_price_dates_to'] ) : get_post_meta( $variation_id, '_sale_price_dates_to', true );
-
-			// Save Dates
-			if ( $date_from ) {
-				update_post_meta( $variation_id, '_sale_price_dates_from', $date_from );
-			} else {
-				update_post_meta( $variation_id, '_sale_price_dates_from', '' );
-			}
-
-			if ( $date_to ) {
-				update_post_meta( $variation_id, '_sale_price_dates_to', $date_to );
-			} else {
-				update_post_meta( $variation_id, '_sale_price_dates_to', '' );
-			}
-
-			if ( $date_to && ! $date_from ) {
-				update_post_meta( $variation_id, '_sale_price_dates_from', strtotime( 'NOW', current_time( 'timestamp' ) ) );
-			}
-
-			// Update price if on sale
-			if ( '' != $sale_price && '' == $date_to && '' == $date_from ) {
-				update_post_meta( $variation_id, '_price', $sale_price );
-			} else {
-				update_post_meta( $variation_id, '_price', $regular_price );
-			}
-
-			if ( '' != $sale_price && $date_from && $date_from < strtotime( 'NOW', current_time( 'timestamp' ) ) ) {
-				update_post_meta( $variation_id, '_price', $sale_price );
-			}
-
-			if ( $date_to && $date_to < strtotime( 'NOW', current_time( 'timestamp' ) ) ) {
-				update_post_meta( $variation_id, '_price', $regular_price );
-				update_post_meta( $variation_id, '_sale_price_dates_from', '' );
-				update_post_meta( $variation_id, '_sale_price_dates_to', '' );
-			}
-
-			// Tax class
-			if ( isset( $variation['tax_class'] ) ) {
-				if ( $variation['tax_class'] !== 'parent' ) {
-					update_post_meta( $variation_id, '_tax_class', wc_clean( $variation['tax_class'] ) );
-				} else {
-					delete_post_meta( $variation_id, '_tax_class' );
-				}
-			}
-
-			// Downloads
-			if ( 'yes' == $is_downloadable ) {
-				// Downloadable files
-				if ( isset( $variation['downloads'] ) && is_array( $variation['downloads'] ) ) {
-					$this->save_downloadable_files( $id, $variation['downloads'], $variation_id );
-				}
-
-				// Download limit
-				if ( isset( $variation['download_limit'] ) ) {
-					$download_limit = absint( $variation['download_limit'] );
-					update_post_meta( $variation_id, '_download_limit', ( ! $download_limit ) ? '' : $download_limit );
-				}
-
-				// Download expiry
-				if ( isset( $variation['download_expiry'] ) ) {
-					$download_expiry = absint( $variation['download_expiry'] );
-					update_post_meta( $variation_id, '_download_expiry', ( ! $download_expiry ) ? '' : $download_expiry );
-				}
-			} else {
-				update_post_meta( $variation_id, '_download_limit', '' );
-				update_post_meta( $variation_id, '_download_expiry', '' );
-				update_post_meta( $variation_id, '_downloadable_files', '' );
-			}
-
-			// Update taxonomies
-			if ( isset( $variation['attributes'] ) ) {
-				$updated_attribute_keys = array();
-
-				foreach ( $variation['attributes'] as $attribute_key => $attribute ) {
-					if ( ! isset( $attribute['name'] ) ) {
-						continue;
-					}
-
-					$taxonomy   = sanitize_title( $attribute['name'] );
-					$_attribute = array();
-
-					if ( isset( $attribute['slug'] ) ) {
-						$taxonomy = $this->get_attribute_taxonomy_by_slug( $attribute['slug'] );
-					}
-
-					if ( isset( $attributes[ $taxonomy ] ) ) {
-						$_attribute = $attributes[ $taxonomy ];
-					}
-
-					if ( isset( $_attribute['is_variation'] ) && $_attribute['is_variation'] ) {
-						$attribute_key   = 'attribute_' . sanitize_title( $_attribute['name'] );
-						$attribute_value = isset( $attribute['option'] ) ? sanitize_title( stripslashes( $attribute['option'] ) ) : '';
-						$updated_attribute_keys[] = $attribute_key;
-
-						update_post_meta( $variation_id, $attribute_key, $attribute_value );
-					}
-				}
-
-				// Remove old taxonomies attributes so data is kept up to date - first get attribute key names
-				$delete_attribute_keys = $wpdb->get_col( $wpdb->prepare( "SELECT meta_key FROM {$wpdb->postmeta} WHERE meta_key LIKE 'attribute_%%' AND meta_key NOT IN ( '" . implode( "','", $updated_attribute_keys ) . "' ) AND post_id = %d;", $variation_id ) );
-
-				foreach ( $delete_attribute_keys as $key ) {
-					delete_post_meta( $variation_id, $key );
-				}
-			}
-
-			do_action( 'woocommerce_cli_save_product_variation', $variation_id, $menu_order, $variation );
-		}
-
-		// Update parent if variable so price sorting works and stays in sync with the cheapest child
-		WC_Product_Variable::sync( $id );
-
-		// Update default attributes options setting
-		if ( isset( $data['default_attribute'] ) ) {
-			$data['default_attributes'] = $data['default_attribute'];
-		}
-
-		if ( isset( $data['default_attributes'] ) && is_array( $data['default_attributes'] ) ) {
-			$default_attributes = array();
-
-			foreach ( $data['default_attributes'] as $default_attr_key => $default_attr ) {
-				if ( ! isset( $default_attr['name'] ) ) {
-					continue;
-				}
-
-				$taxonomy = sanitize_title( $default_attr['name'] );
-
-				if ( isset( $default_attr['slug'] ) ) {
-					$taxonomy = $this->get_attribute_taxonomy_by_slug( $default_attr['slug'] );
-				}
-
-				if ( isset( $attributes[ $taxonomy ] ) ) {
-					$_attribute = $attributes[ $taxonomy ];
-
-					if ( $_attribute['is_variation'] ) {
-						// Don't use wc_clean as it destroys sanitized characters
-						if ( isset( $default_attr['option'] ) ) {
-							$value = sanitize_title( trim( stripslashes( $default_attr['option'] ) ) );
-						} else {
-							$value = '';
-						}
-
-						if ( $value ) {
-							$default_attributes[ $taxonomy ] = $value;
-						}
-					}
-				}
-			}
-
-			update_post_meta( $id, '_default_attributes', $default_attributes );
-		}
-
-		return true;
-	}
-
-	/**
-	 * Save product images.
-	 *
-	 * @since  2.5.0
-	 * @param  array $images
-	 * @param  int $id
-	 * @throws WC_CLI_Exception
-	 */
-	private function save_product_images( $id, $images ) {
-		if ( is_array( $images ) ) {
-			$gallery = array();
-
-			foreach ( $images as $image ) {
-				if ( isset( $image['position'] ) && $image['position'] == 0 ) {
-					$attachment_id = isset( $image['id'] ) ? absint( $image['id'] ) : 0;
-
-					if ( 0 === $attachment_id && isset( $image['src'] ) ) {
-						$upload = $this->upload_product_image( esc_url_raw( $image['src'] ) );
-
-						if ( is_wp_error( $upload ) ) {
-							throw new WC_CLI_Exception( 'woocommerce_cli_cannot_upload_product_image', $upload->get_error_message() );
-						}
-
-						$attachment_id = $this->set_product_image_as_attachment( $upload, $id );
-					}
-
-					set_post_thumbnail( $id, $attachment_id );
-				} else {
-					$attachment_id = isset( $image['id'] ) ? absint( $image['id'] ) : 0;
-
-					if ( 0 === $attachment_id && isset( $image['src'] ) ) {
-						$upload = $this->upload_product_image( esc_url_raw( $image['src'] ) );
-
-						if ( is_wp_error( $upload ) ) {
-							throw new WC_CLI_Exception( 'woocommerce_cli_cannot_upload_product_image', $upload->get_error_message() );
-						}
-
-						$gallery[] = $this->set_product_image_as_attachment( $upload, $id );
-					} else {
-						$gallery[] = $attachment_id;
-					}
-				}
-			}
-
-			if ( ! empty( $gallery ) ) {
-				update_post_meta( $id, '_product_image_gallery', implode( ',', $gallery ) );
-			}
-		} else {
-			delete_post_thumbnail( $id );
-			update_post_meta( $id, '_product_image_gallery', '' );
-		}
-	}
-
-	/**
-	 * Save product shipping data.
-	 *
-	 * @since 2.5.0
-	 * @param int $id
-	 * @param array $data
-	 */
-	private function save_product_shipping_data( $id, $data ) {
-		if ( isset( $data['weight'] ) ) {
-			update_post_meta( $id, '_weight', ( '' === $data['weight'] ) ? '' : wc_format_decimal( $data['weight'] ) );
-		}
-
-		// Product dimensions
-		if ( isset( $data['dimensions'] ) ) {
-			// Height
-			if ( isset( $data['dimensions']['height'] ) ) {
-				update_post_meta( $id, '_height', ( '' === $data['dimensions']['height'] ) ? '' : wc_format_decimal( $data['dimensions']['height'] ) );
-			}
-
-			// Width
-			if ( isset( $data['dimensions']['width'] ) ) {
-				update_post_meta( $id, '_width', ( '' === $data['dimensions']['width'] ) ? '' : wc_format_decimal($data['dimensions']['width'] ) );
-			}
-
-			// Length
-			if ( isset( $data['dimensions']['length'] ) ) {
-				update_post_meta( $id, '_length', ( '' === $data['dimensions']['length'] ) ? '' : wc_format_decimal( $data['dimensions']['length'] ) );
-			}
-		}
-
-		// Virtual
-		if ( isset( $data['virtual'] ) ) {
-			$virtual = ( true === $data['virtual'] ) ? 'yes' : 'no';
-
-			if ( 'yes' == $virtual ) {
-				update_post_meta( $id, '_weight', '' );
-				update_post_meta( $id, '_length', '' );
-				update_post_meta( $id, '_width', '' );
-				update_post_meta( $id, '_height', '' );
-			}
-		}
-
-		// Shipping class
-		if ( isset( $data['shipping_class'] ) ) {
-			wp_set_object_terms( $id, wc_clean( $data['shipping_class'] ), 'product_shipping_class' );
-		}
-	}
-
-	/**
-	 * Save downloadable files.
-	 *
-	 * @since 2.5.0
-	 * @param int $product_id
-	 * @param array $downloads
-	 * @param int $variation_id
-	 */
-	private function save_downloadable_files( $product_id, $downloads, $variation_id = 0 ) {
-		$files = array();
-
-		// File paths will be stored in an array keyed off md5(file path)
-		foreach ( $downloads as $key => $file ) {
-			if ( isset( $file['url'] ) ) {
-				$file['file'] = $file['url'];
-			}
-
-			if ( ! isset( $file['file'] ) ) {
-				continue;
-			}
-
-			$file_name = isset( $file['name'] ) ? wc_clean( $file['name'] ) : '';
-
-			if ( 0 === strpos( $file['file'], 'http' ) ) {
-				$file_url = esc_url_raw( $file['file'] );
-			} else {
-				$file_url = wc_clean( $file['file'] );
-			}
-
-			$files[ md5( $file_url ) ] = array(
-				'name' => $file_name,
-				'file' => $file_url
-			);
-		}
-
-		// Grant permission to any newly added files on any existing orders for this product prior to saving
-		do_action( 'woocommerce_process_product_file_download_paths', $product_id, $variation_id, $files );
-
-		$id = ( 0 === $variation_id ) ? $product_id : $variation_id;
-		update_post_meta( $id, '_downloadable_files', $files );
-	}
-
-	/**
-	 * Get attribute taxonomy by slug.
-	 *
-	 * @since  2.5.0
-	 * @param  string $slug
-	 * @return string|null
-	 */
-	private function get_attribute_taxonomy_by_slug( $slug ) {
-		$taxonomy = null;
-		$attribute_taxonomies = wc_get_attribute_taxonomies();
-
-		foreach ( $attribute_taxonomies as $key => $tax ) {
-			if ( $slug == $tax->attribute_name ) {
-				$taxonomy = 'pa_' . $tax->attribute_name;
-
-				break;
-			}
-		}
-
-		return $taxonomy;
-	}
-
-	/**
-	 * Upload image from URL
-	 *
-	 * @since  2.5.0
-	 * @param  string $image_url
-	 * @return int|WP_Error attachment id
-	 * @throws WC_CLI_Exception
-	 */
-	private function upload_product_image( $image_url ) {
-		$file_name 		= basename( current( explode( '?', $image_url ) ) );
-		$wp_filetype 	= wp_check_filetype( $file_name, null );
-		$parsed_url 	= @parse_url( $image_url );
-
-		// Check parsed URL
-		if ( ! $parsed_url || ! is_array( $parsed_url ) ) {
-			throw new WC_CLI_Exception( 'woocommerce_cli_invalid_product_image', sprintf( __( 'Invalid URL %s', 'woocommerce' ), $image_url ) );
-		}
-
-		// Ensure url is valid
-		$image_url = str_replace( ' ', '%20', $image_url );
-
-		// Get the file
-		$response = wp_safe_remote_get( $image_url, array(
-			'timeout' => 10
-		) );
-
-		if ( is_wp_error( $response ) || 200 !== wp_remote_retrieve_response_code( $response ) ) {
-			throw new WC_CLI_Exception( 'woocommerce_cli_invalid_remote_product_image', sprintf( __( 'Error getting remote image %s', 'woocommerce' ), $image_url ) );
-		}
-
-		// Ensure we have a file name and type
-		if ( ! $wp_filetype['type'] ) {
-			$headers = wp_remote_retrieve_headers( $response );
-			if ( isset( $headers['content-disposition'] ) && strstr( $headers['content-disposition'], 'filename=' ) ) {
-				$disposition = end( explode( 'filename=', $headers['content-disposition'] ) );
-				$disposition = sanitize_file_name( $disposition );
-				$file_name   = $disposition;
-			} elseif ( isset( $headers['content-type'] ) && strstr( $headers['content-type'], 'image/' ) ) {
-				$file_name = 'image.' . str_replace( 'image/', '', $headers['content-type'] );
-			}
-			unset( $headers );
-		}
-
-		// Upload the file.
-		$upload = wp_upload_bits( $file_name, '', wp_remote_retrieve_body( $response ) );
-
-		if ( $upload['error'] ) {
-			throw new WC_CLI_Exception( 'woocommerce_cli_product_image_upload_error', $upload['error'] );
-		}
-
-		// Get filesize
-		$filesize = filesize( $upload['file'] );
-
-		if ( 0 == $filesize ) {
-			@unlink( $upload['file'] );
-			unset( $upload );
-			throw new WC_CLI_Exception( 'woocommerce_cli_product_image_upload_file_error', __( 'Zero size file downloaded', 'woocommerce' ) );
-		}
-
-		unset( $response );
-
-		return $upload;
-	}
-
-	/**
-	 * Get product image as attachment
-	 *
-	 * @since  2.5.0
-	 * @param  int $upload
-	 * @param  int $id
-	 * @return int
-	 */
-	private function set_product_image_as_attachment( $upload, $id ) {
-		$info    = wp_check_filetype( $upload['file'] );
-		$title   = '';
-		$content = '';
-
-		if ( $image_meta = @wp_read_image_metadata( $upload['file'] ) ) {
-			if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
-				$title = $image_meta['title'];
-			}
-			if ( trim( $image_meta['caption'] ) ) {
-				$content = $image_meta['caption'];
-			}
-		}
-
-		$attachment = array(
-			'post_mime_type' => $info['type'],
-			'guid'           => $upload['url'],
-			'post_parent'    => $id,
-			'post_title'     => $title,
-			'post_content'   => $content
-		);
-
-		$attachment_id = wp_insert_attachment( $attachment, $upload['file'], $id );
-		if ( ! is_wp_error( $attachment_id ) ) {
-			wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $upload['file'] ) );
-		}
-
-		return $attachment_id;
-	}
-
-	/**
-	 * Clear product
-	 *
-	 * @since 2.5.0
-	 * @param int $product_id Product ID
-	 */
-	private function clear_product( $product_id ) {
-		if ( ! is_numeric( $product_id ) || 0 >= $product_id ) {
-			return;
-		}
-
-		// Delete product attachments
-		$attachments = get_children( array(
-			'post_parent' => $product_id,
-			'post_status' => 'any',
-			'post_type'   => 'attachment',
-		) );
-
-		foreach ( (array) $attachments as $attachment ) {
-			wp_delete_attachment( $attachment->ID, true );
-		}
-
-		// Delete product
-		wp_delete_post( $product_id, true );
-	}
-}
diff --git a/includes/cli/class-wc-cli-report.php b/includes/cli/class-wc-cli-report.php
deleted file mode 100644
index 08550a63dff..00000000000
--- a/includes/cli/class-wc-cli-report.php
+++ /dev/null
@@ -1,372 +0,0 @@
-<?php
-
-/**
- * Show Reports.
- *
- * @since    2.5.0
- * @package  WooCommerce/CLI
- * @category CLI
- * @author   WooThemes
- */
-class WC_CLI_Report extends WC_CLI_Command {
-
-	/**
-	 * List reports.
-	 *
-	 * ## OPTIONS
-	 *
-	 * [--format=<format>]
-	 * : Acceptec values: table, csv, json, count, ids. Default: table.
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc report list
-	 *
-	 * @subcommand list
-	 * @since      2.5.0
-	 */
-	public function list_( $__, $assoc_args ) {
-		$reports   = array( 'sales', 'sales/top_sellers' );
-		$formatter = $this->get_formatter(
-			array_merge(
-				array( 'fields' => array_keys( $reports ) ),
-				$assoc_args
-			)
-		);
-
-		if ( 'ids' === $formatter->format ) {
-			echo implode( ' ', $reports );
-		} else {
-			$formatter->display_item( $reports );
-		}
-	}
-
-	/**
-	 * View sales report.
-	 *
-	 * ## OPTIONS
-	 *
-	 * [--field=<field>]
-	 * : Instead of returning the whole report fields, returns the value of a single fields.
-	 *
-	 * [--fields=<fields>]
-	 * : Get a specific subset of the report's fields.
-	 *
-	 * [--format=<format>]
-	 * : Accepted values: table, json, csv. Default: table.
-	 *
-	 * [--period=<period>]
-	 * : The supported periods are: week, month, last_month, and year. If invalid
-	 * period is supplied, week is used. If period is not specified, the current
-	 * day is used.
-	 *
-	 * [--date_min]
-	 * : Return sales for a specific start date. The date need to be in the YYYY-MM-AA format.
-	 *
-	 * [--date_max]
-	 * : Return sales for a specific end date. The dates need to be in the YYYY-MM-AA format.
-	 *
-	 * [--limit]
-	 * : Limit report result. Default: 12.
-	 *
-	 * ## AVAILABLE FIELDS
-	 *
-	 * These fields are available for get command:
-	 *
-	 * * total_sales
-	 * * average_sales
-	 * * total_orders
-	 * * total_items
-	 * * total_tax
-	 * * total_shipping
-	 * * total_discount
-	 * * totals_grouped_by
-	 * * totals
-	 * * total_customers
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc report sales
-	 *
-	 *     wp wc report sales --period=last_month
-	 *
-	 * @since 2.5.0
-	 */
-	public function sales( $__, $assoc_args ) {
-		$reporter = $this->get_reporter( $assoc_args );
-
-		// new customers
-		$users_query = new WP_User_Query(
-			array(
-				'fields' => array( 'user_registered' ),
-				'role'   => 'customer',
-			)
-		);
-
-		$customers = $users_query->get_results();
-
-		foreach ( $customers as $key => $customer ) {
-			if ( strtotime( $customer->user_registered ) < $reporter->start_date || strtotime( $customer->user_registered ) > $reporter->end_date ) {
-				unset( $customers[ $key ] );
-			}
-		}
-
-		$total_customers = count( $customers );
-		$report_data     = $reporter->get_report_data();
-		$period_totals   = array();
-
-		// setup period totals by ensuring each period in the interval has data
-		for ( $i = 0; $i <= $reporter->chart_interval; $i ++ ) {
-
-			switch ( $reporter->chart_groupby ) {
-				case 'day' :
-					$time = date( 'Y-m-d', strtotime( "+{$i} DAY", $reporter->start_date ) );
-					break;
-				default :
-					$time = date( 'Y-m', strtotime( "+{$i} MONTH", $reporter->start_date ) );
-					break;
-			}
-
-			// set the customer signups for each period
-			$customer_count = 0;
-			foreach ( $customers as $customer ) {
-				if ( date( ( 'day' == $reporter->chart_groupby ) ? 'Y-m-d' : 'Y-m', strtotime( $customer->user_registered ) ) == $time ) {
-					$customer_count++;
-				}
- 			}
-
-			$period_totals[ $time ] = array(
-				'sales'     => wc_format_decimal( 0.00, 2 ),
-				'orders'    => 0,
-				'items'     => 0,
-				'tax'       => wc_format_decimal( 0.00, 2 ),
-				'shipping'  => wc_format_decimal( 0.00, 2 ),
-				'discount'  => wc_format_decimal( 0.00, 2 ),
-				'customers' => $customer_count,
-			);
-		}
-
-		// add total sales, total order count, total tax and total shipping for each period
-		foreach ( $report_data->orders as $order ) {
-			$time = ( 'day' === $reporter->chart_groupby ) ? date( 'Y-m-d', strtotime( $order->post_date ) ) : date( 'Y-m', strtotime( $order->post_date ) );
-
-			if ( ! isset( $period_totals[ $time ] ) ) {
-				continue;
-			}
-
-			$period_totals[ $time ]['sales']    = wc_format_decimal( $order->total_sales, 2 );
-			$period_totals[ $time ]['tax']      = wc_format_decimal( $order->total_tax + $order->total_shipping_tax, 2 );
-			$period_totals[ $time ]['shipping'] = wc_format_decimal( $order->total_shipping, 2 );
-		}
-
-		foreach ( $report_data->order_counts as $order ) {
-			$time = ( 'day' === $reporter->chart_groupby ) ? date( 'Y-m-d', strtotime( $order->post_date ) ) : date( 'Y-m', strtotime( $order->post_date ) );
-
-			if ( ! isset( $period_totals[ $time ] ) ) {
-				continue;
-			}
-
-			$period_totals[ $time ]['orders']   = (int) $order->count;
-		}
-
-		// add total order items for each period
-		foreach ( $report_data->order_items as $order_item ) {
-			$time = ( 'day' === $reporter->chart_groupby ) ? date( 'Y-m-d', strtotime( $order_item->post_date ) ) : date( 'Y-m', strtotime( $order_item->post_date ) );
-
-			if ( ! isset( $period_totals[ $time ] ) ) {
-				continue;
-			}
-
-			$period_totals[ $time ]['items'] = (int) $order_item->order_item_count;
-		}
-
-		// add total discount for each period
-		foreach ( $report_data->coupons as $discount ) {
-			$time = ( 'day' === $reporter->chart_groupby ) ? date( 'Y-m-d', strtotime( $discount->post_date ) ) : date( 'Y-m', strtotime( $discount->post_date ) );
-
-			if ( ! isset( $period_totals[ $time ] ) ) {
-				continue;
-			}
-
-			$period_totals[ $time ]['discount'] = wc_format_decimal( $discount->discount_amount, 2 );
-		}
-
-		$sales_data  = array(
-			'total_sales'       => $report_data->total_sales,
-			'net_sales'         => $report_data->net_sales,
-			'average_sales'     => $report_data->average_sales,
-			'total_orders'      => $report_data->total_orders,
-			'total_items'       => $report_data->total_items,
-			'total_tax'         => wc_format_decimal( $report_data->total_tax + $report_data->total_shipping_tax, 2 ),
-			'total_shipping'    => $report_data->total_shipping,
-			'total_refunds'     => $report_data->total_refunds,
-			'total_discount'    => $report_data->total_coupons,
-			'totals_grouped_by' => $reporter->chart_groupby,
-			'totals'            => $period_totals,
-			'total_customers'   => $total_customers,
-		);
-
-		$sales_data = apply_filters( 'woocommerce_cli_sales_report', $sales_data );
-
-		if ( empty( $assoc_args['fields'] ) ) {
-			$assoc_args['fields'] = array_keys( $sales_data );
-		}
-
-		$formatter = $this->get_formatter( $assoc_args );
-		$formatter->display_item( $sales_data );
-	}
-
-	/**
-	 * View report of top sellers.
-	 *
-	 * ## OPTIONS
-	 *
-	 * [--<field>=<value>]
-	 * : Filter report based on report property.
-	 *
-	 * [--field=<field>]
-	 * : Prints the value of a single field for each seller.
-	 *
-	 * [--fields=<fields>]
-	 * : Limit the output to specific report fields.
-	 *
-	 * [--format=<format>]
-	 * : Acceptec values: table, csv, json, count, ids. Default: table.
-	 *
-	 * [--period=<period>]
-	 * : The supported periods are: week, month, last_month, and year. If invalid
-	 * period is supplied, week is used. If period is not specified, the current
-	 * day is used.
-	 *
-	 * [--date_min]
-	 * : Return sales for a specific start date. The date need to be in the YYYY-MM-AA format.
-	 *
-	 * [--date_max]
-	 * : Return sales for a specific end date. The dates need to be in the YYYY-MM-AA format.
-	 *
-	 * [--limit]
-	 * : Limit report result. Default: 12.
-	 *
-	 * ## AVAILABLE FIELDS
-	 *
-	 * These fields will be displayed by default for each row:
-	 *
-	 * * title
-	 * * product_id
-	 * * quantity
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc report top_sellers
-	 *
-	 *     wp wc report top_sellers --period=last_month
-	 *
-	 * @since 2.5.0
-	 */
-	public function top_sellers( $__, $assoc_args ) {
-		$reporter    = $this->get_reporter( $assoc_args );
-		$top_sellers = $reporter->get_order_report_data( array(
-			'data' => array(
-				'_product_id' => array(
-					'type'            => 'order_item_meta',
-					'order_item_type' => 'line_item',
-					'function'        => '',
-					'name'            => 'product_id'
-				),
-				'_qty' => array(
-					'type'            => 'order_item_meta',
-					'order_item_type' => 'line_item',
-					'function'        => 'SUM',
-					'name'            => 'order_item_qty'
-				)
-			),
-			'order_by'     => 'order_item_qty DESC',
-			'group_by'     => 'product_id',
-			'limit'        => isset( $assoc_args['limit'] ) ? absint( $assoc_args['limit'] ) : 12,
-			'query_type'   => 'get_results',
-			'filter_range' => true,
-		) );
-
-		$top_sellers_data = array();
-		foreach ( $top_sellers as $top_seller ) {
-			$product = wc_get_product( $top_seller->product_id );
-
-			if ( $product ) {
-				$top_sellers_data[] = array(
-					'title'      => $product->get_title(),
-					'product_id' => $top_seller->product_id,
-					'quantity'   => $top_seller->order_item_qty,
-				);
-			}
-		}
-		$top_sellers_data = apply_filters( 'woocommerce_cli_top_sellers_report', $top_sellers_data );
-
-		$formatter = $this->get_formatter( $assoc_args );
-		if ( 'ids' === $formatter->format ) {
-			$query_args['fields'] = 'ids';
-			echo implode( ' ', wp_list_pluck( $top_sellers_data, 'product_id' ) );
-		} else {
-			$formatter->display_items( $top_sellers_data );
-		}
-	}
-
-	/**
-	 * Setup the report object and parse any date filtering
-	 *
-	 * @since  2.5.0
-	 * @param  array $assoc_args Arguments provided in when invoking the command
-	 * @return WC_Report_Sales_By_Date
-	 */
-	private function get_reporter( $assoc_args ) {
-
-		include_once( WC()->plugin_path() . '/includes/admin/reports/class-wc-admin-report.php' );
-		include_once( WC()->plugin_path() . '/includes/admin/reports/class-wc-report-sales-by-date.php' );
-
-		$report = new WC_Report_Sales_By_Date();
-
-		if ( empty( $assoc_args['period'] ) ) {
-
-			// custom date range
-			$assoc_args['period'] = 'custom';
-
-			if ( ! empty( $assoc_args['date_min'] ) || ! empty( $assoc_args['date_max'] ) ) {
-
-				// overwrite _GET to make use of WC_Admin_Report::calculate_current_range() for custom date ranges
-				$_GET['start_date'] = $this->parse_datetime( $assoc_args['date_min'] );
-				$_GET['end_date'] = isset( $assoc_args['date_max'] ) ? $this->parse_datetime( $assoc_args['date_max'] ) : null;
-
-			} else {
-
-				// default custom range to today
-				$_GET['start_date'] = $_GET['end_date'] = date( 'Y-m-d', current_time( 'timestamp' ) );
-			}
-
-		} else {
-
-			// ensure period is valid
-			if ( ! in_array( $assoc_args['period'], array( 'week', 'month', 'last_month', 'year' ) ) ) {
-				$assoc_args['period'] = 'week';
-			}
-
-			// TODO: change WC_Admin_Report class to use "week" instead, as it's more consistent with other periods
-			// allow "week" for period instead of "7day"
-			if ( 'week' === $assoc_args['period'] ) {
-				$assoc_args['period'] = '7day';
-			}
-		}
-
-		$report->calculate_current_range( $assoc_args['period'] );
-
-		return $report;
-	}
-
-	/**
-	 * Get default format fields that will be used in `list` and `get` subcommands.
-	 *
-	 * @since  2.5.0
-	 * @return string
-	 */
-	protected function get_default_format_fields() {
-		return 'title,product_id,quantity';
-	}
-}
diff --git a/includes/cli/class-wc-cli-rest-command.php b/includes/cli/class-wc-cli-rest-command.php
new file mode 100644
index 00000000000..b500dbafe35
--- /dev/null
+++ b/includes/cli/class-wc-cli-rest-command.php
@@ -0,0 +1,452 @@
+<?php
+/**
+ * Main Command for WooCommere CLI.
+ *
+ * Since a lot of WC operations can be handled via the REST API, we base our CLI
+ * off of Restful to generate commands for each WooCommerce REST API endpoint
+ * so most of the logic is shared.
+ *
+ * Forked from wp-cli/restful (by Daniel Bachhuber, released under the MIT license https://opensource.org/licenses/MIT).
+ * https://github.com/wp-cli/restful
+ *
+ * @version 3.0.0
+ * @package WooCommerce
+ */
+class WC_CLI_REST_Command {
+	/**
+	 * Endpoints that have a parent ID.
+	 * Ex: Product reviews, which has a product ID and a review ID.
+	 */
+	protected $routes_with_parent_id = array(
+		'customer_download',
+		'product_review',
+		'order_note',
+		'shop_order_refund',
+	);
+
+	/**
+	 * Name of command/endpoint object.
+	 */
+	private $name;
+
+	/**
+	 * Endpoint route.
+	 */
+	private $route;
+
+	/**
+	 * Main resource ID.
+	 */
+	private $resource_identifier;
+
+	/**
+	 * Schema for command.
+	 */
+	private $schema;
+
+	/**
+	 * Nesting level.
+	 */
+	private $output_nesting_level = 0;
+
+	/**
+	 * List of supported IDs and their description (name => desc).
+	 */
+	private $supported_ids = array();
+
+	/**
+	 * Sets up REST Command.
+	 *
+	 * @param string $name   Name of endpoint object (comes from schema)
+	 * @param string $route  Path to route of this endpoint
+	 * @param array  $schema Schema object
+	 */
+	public function __construct( $name, $route, $schema ) {
+		$this->name   = $name;
+		$parsed_args  = preg_match_all( '#\([^\)]+\)#', $route, $matches );
+		$first_match  = $matches[0];
+		$resource_id  = ! empty( $matches[0] ) ? array_pop( $matches[0] ) : null;
+		$this->route  = rtrim( $route );
+		$this->schema = $schema;
+
+		$this->resource_identifier = $resource_id;
+		if ( in_array( $name, $this->routes_with_parent_id ) ) {
+			$is_singular = substr( $this->route, - strlen( $resource_id ) ) === $resource_id;
+			if ( ! $is_singular ) {
+				$this->resource_identifier = $first_match[0];
+			}
+		}
+	}
+
+	/**
+	 * Passes supported ID arguments (things like product_id, order_id, etc) that we should look for in addition to id.
+	 *
+	 * @param array $supported_ids
+	 */
+	public function set_supported_ids( $supported_ids = array() ) {
+		$this->supported_ids = $supported_ids;
+	}
+
+	/**
+	 * Peturns an ID of supported ID arguments (things like product_id, order_id, etc) that we should look for in addition to id.
+	 *
+	 * @return array
+	 */
+	public function get_supported_ids() {
+		return $this->supported_ids;
+	}
+
+	/**
+	 * Create a new item.
+	 *
+	 * @subcommand create
+	 */
+	public function create_item( $args, $assoc_args ) {
+		$assoc_args = self::decode_json( $assoc_args );
+		list( $status, $body ) = $this->do_request( 'POST', $this->get_filled_route( $args ), $assoc_args );
+		if ( \WP_CLI\Utils\get_flag_value( $assoc_args, 'porcelain' ) ) {
+			WP_CLI::line( $body['id'] );
+		} else {
+			WP_CLI::success( "Created {$this->name} {$body['id']}." );
+		}
+	}
+
+	/**
+	 * Delete an existing item.
+	 *
+	 * @subcommand delete
+	 */
+	public function delete_item( $args, $assoc_args ) {
+		list( $status, $body ) = $this->do_request( 'DELETE', $this->get_filled_route( $args ), $assoc_args );
+		if ( \WP_CLI\Utils\get_flag_value( $assoc_args, 'porcelain' ) ) {
+			WP_CLI::line( $body['id'] );
+		} else {
+			if ( empty( $assoc_args['force'] ) ) {
+				WP_CLI::success( __( 'Trashed', 'woocommerce' ) . " {$this->name} {$body['id']}" );
+			} else {
+				WP_CLI::success( __( 'Deleted', 'woocommerce' ) . " {$this->name} {$body['id']}." );
+			}
+		}
+	}
+
+	/**
+	 * Get a single item.
+	 *
+	 * @subcommand get
+	 */
+	public function get_item( $args, $assoc_args ) {
+		$route = $this->get_filled_route( $args );
+		list( $status, $body, $headers ) = $this->do_request( 'GET', $route, $assoc_args );
+
+		if ( ! empty( $assoc_args['fields'] ) ) {
+			$body = self::limit_item_to_fields( $body, $assoc_args['fields'] );
+		}
+
+		if ( 'headers' === $assoc_args['format'] ) {
+			echo json_encode( $headers );
+		} elseif ( 'body' === $assoc_args['format'] ) {
+			echo json_encode( $body );
+		} elseif ( 'envelope' === $assoc_args['format'] ) {
+			echo json_encode( array(
+				'body'    => $body,
+				'headers' => $headers,
+				'status'  => $status,
+			) );
+		} else {
+			$formatter = $this->get_formatter( $assoc_args );
+			$formatter->display_item( $body );
+		}
+	}
+
+	/**
+	 * List all items.
+	 *
+	 * @subcommand list
+	 */
+	public function list_items( $args, $assoc_args ) {
+		if ( ! empty( $assoc_args['format'] ) && 'count' === $assoc_args['format'] ) {
+			$method = 'HEAD';
+		} else {
+			$method = 'GET';
+		}
+
+		list( $status, $body, $headers ) = $this->do_request( $method, $this->get_filled_route( $args ), $assoc_args );
+		if ( ! empty( $assoc_args['format'] ) && 'ids' === $assoc_args['format'] ) {
+			$items = array_column( $body, 'id' );
+		} else {
+			$items = $body;
+		}
+
+		if ( ! empty( $assoc_args['fields'] ) ) {
+			foreach ( $items as $key => $item ) {
+				$items[ $key ] = self::limit_item_to_fields( $item, $assoc_args['fields'] );
+			}
+		}
+
+		if ( ! empty( $assoc_args['format'] ) && 'count' === $assoc_args['format'] ) {
+			echo (int) $headers['X-WP-Total'];
+		} elseif ( 'headers' === $assoc_args['format'] ) {
+			echo json_encode( $headers );
+		} elseif ( 'body' === $assoc_args['format'] ) {
+			echo json_encode( $body );
+		} elseif ( 'envelope' === $assoc_args['format'] ) {
+			echo json_encode( array(
+				'body'    => $body,
+				'headers' => $headers,
+				'status'  => $status,
+				'api_url' => $this->api_url,
+			) );
+		} else {
+			$formatter = $this->get_formatter( $assoc_args );
+			$formatter->display_items( $items );
+		}
+	}
+
+	/**
+	 * Update an existing item.
+	 *
+	 * @subcommand update
+	 */
+	public function update_item( $args, $assoc_args ) {
+		$assoc_args = self::decode_json( $assoc_args );
+		list( $status, $body ) = $this->do_request( 'POST', $this->get_filled_route( $args ), $assoc_args );
+		if ( \WP_CLI\Utils\get_flag_value( $assoc_args, 'porcelain' ) ) {
+			WP_CLI::line( $body['id'] );
+		} else {
+			WP_CLI::success( __( 'Updated', 'woocommerce' ) . " {$this->name} {$body['id']}." );
+		}
+	}
+
+	/**
+	 * Do a REST Request
+	 *
+	 * @param string $method
+	 *
+	 */
+	private function do_request( $method, $route, $assoc_args ) {
+		if ( ! defined( 'REST_REQUEST' ) ) {
+			define( 'REST_REQUEST', true );
+		}
+		$request = new WP_REST_Request( $method, $route );
+		if ( in_array( $method, array( 'POST', 'PUT' ) ) ) {
+			$request->set_body_params( $assoc_args );
+		} else {
+			foreach ( $assoc_args as $key => $value ) {
+				$request->set_param( $key, $value );
+			}
+		}
+		if ( defined( 'SAVEQUERIES' ) && SAVEQUERIES ) {
+			$original_queries = is_array( $GLOBALS['wpdb']->queries ) ? array_keys( $GLOBALS['wpdb']->queries ) : array();
+		}
+		$response = rest_do_request( $request );
+		if ( defined( 'SAVEQUERIES' ) && SAVEQUERIES ) {
+			$performed_queries = array();
+			foreach ( (array) $GLOBALS['wpdb']->queries as $key => $query ) {
+				if ( in_array( $key, $original_queries ) ) {
+					continue;
+				}
+				$performed_queries[] = $query;
+			}
+			usort( $performed_queries, function( $a, $b ) {
+				if ( $a[1] === $b[1] ) {
+					return 0;
+				}
+				return ( $a[1] > $b[1] ) ? -1 : 1;
+			});
+
+			$query_count = count( $performed_queries );
+			$query_total_time = 0;
+			foreach ( $performed_queries as $query ) {
+				$query_total_time += $query[1];
+			}
+			$slow_query_message = '';
+			if ( $performed_queries && 'wc' === WP_CLI::get_config( 'debug' ) ) {
+				$slow_query_message .= '. Ordered by slowness, the queries are:' . PHP_EOL;
+				foreach ( $performed_queries as $i => $query ) {
+					$i++;
+					$bits = explode( ', ', $query[2] );
+					$backtrace = implode( ', ', array_slice( $bits, 13 ) );
+					$seconds = round( $query[1], 6 );
+					$slow_query_message .= <<<EOT
+{$i}:
+- {$seconds} seconds
+- {$backtrace}
+- {$query[0]}
+EOT;
+					$slow_query_message .= PHP_EOL;
+				}
+			} elseif ( 'wc' !== WP_CLI::get_config( 'debug' ) ) {
+				$slow_query_message = '. Use --debug=wc to see all queries.';
+			}
+			$query_total_time = round( $query_total_time, 6 );
+			WP_CLI::debug( "wc command executed {$query_count} queries in {$query_total_time} seconds{$slow_query_message}", 'wc' );
+		}
+
+		if ( $error = $response->as_error() ) {
+			// For authentication errors (status 401), include a reminder to set the --user flag.
+			// WP_CLI::error will only return the first message from WP_Error, so we will pass a string containing both instead.
+			if ( 401 === $response->get_status() ) {
+				$errors   = $error->get_error_messages();
+				$errors[] = __( 'Make sure to include the --user flag with an account that has permissions for this action.', 'woocommerce' ) . ' {"status":401}';
+				$error    = implode( "\n", $errors );
+			}
+			WP_CLI::error( $error );
+		}
+		return array( $response->get_status(), $response->get_data(), $response->get_headers() );
+	}
+
+	/**
+	 * Get Formatter object based on supplied parameters.
+	 *
+	 * @param array $assoc_args Parameters passed to command. Determines formatting.
+	 * @return \WP_CLI\Formatter
+	 */
+	protected function get_formatter( &$assoc_args ) {
+		if ( ! empty( $assoc_args['fields'] ) ) {
+			if ( is_string( $assoc_args['fields'] ) ) {
+				$fields = explode( ',', $assoc_args['fields'] );
+			} else {
+				$fields = $assoc_args['fields'];
+			}
+		} else {
+			if ( ! empty( $assoc_args['context'] ) ) {
+				$fields = $this->get_context_fields( $assoc_args['context'] );
+			} else {
+				$fields = $this->get_context_fields( 'view' );
+			}
+		}
+		return new \WP_CLI\Formatter( $assoc_args, $fields );
+	}
+
+	/**
+	 * Get a list of fields present in a given context
+	 *
+	 * @param string $context
+	 * @return array
+	 */
+	private function get_context_fields( $context ) {
+		$fields = array();
+		foreach ( $this->schema['properties'] as $key => $args ) {
+			if ( empty( $args['context'] ) || in_array( $context, $args['context'] ) ) {
+				$fields[] = $key;
+			}
+		}
+		return $fields;
+	}
+
+	/**
+	 * Get the route for this resource
+	 *
+	 * @param  array $args
+	 * @return string
+	 */
+	private function get_filled_route( $args = array() ) {
+		$supported_id_matched = false;
+		$route                = $this->route;
+
+		foreach ( $this->get_supported_ids() as $id_name => $id_desc ) {
+			if ( strpos( $route, '<' . $id_name . '>' ) !== false && ! empty( $args ) ) {
+				$route                = str_replace( '(?P<' . $id_name . '>[\d]+)', $args[0], $route );
+				$supported_id_matched = true;
+			}
+		}
+
+		if ( ! empty( $args ) ) {
+			$id_replacement = $supported_id_matched && ! empty( $args[1] ) ? $args[1] : $args[0];
+			$route          = str_replace( array( '(?P<id>[\d]+)', '(?P<id>[\w-]+)' ), $id_replacement, $route );
+		}
+
+		return rtrim( $route );
+	}
+
+	/**
+	 * Output a line to be added
+	 *
+	 * @param string
+	 */
+	private function add_line( $line ) {
+		$this->nested_line( $line, 'add' );
+	}
+
+	/**
+	 * Output a line to be removed
+	 *
+	 * @param string
+	 */
+	private function remove_line( $line ) {
+		$this->nested_line( $line, 'remove' );
+	}
+
+	/**
+	 * Output a line that's appropriately nested
+	 */
+	private function nested_line( $line, $change = false ) {
+		if ( 'add' == $change ) {
+			$label = '+ ';
+		} elseif ( 'remove' == $change ) {
+			$label = '- ';
+		} else {
+			$label = false;
+		}
+
+		$spaces = ( $this->output_nesting_level * 2 ) + 2;
+		if ( $label ) {
+			$line = $label . $line;
+			$spaces = $spaces - 2;
+		}
+		WP_CLI::line( str_pad( ' ', $spaces ) . $line );
+	}
+
+	/**
+	 * Whether or not this is an associative array
+	 *
+	 * @param array
+	 * @return bool
+	 */
+	private function is_assoc_array( $array ) {
+		if ( ! is_array( $array ) ) {
+			return false;
+		}
+		return array_keys( $array ) !== range( 0, count( $array ) - 1 );
+	}
+
+	/**
+	 * Reduce an item to specific fields.
+	 *
+	 * @param  array $item
+	 * @param  array $fields
+	 * @return array
+	 */
+	private static function limit_item_to_fields( $item, $fields ) {
+		if ( empty( $fields ) ) {
+			return $item;
+		}
+		if ( is_string( $fields ) ) {
+			$fields = explode( ',', $fields );
+		}
+		foreach ( $item as $i => $field ) {
+			if ( ! in_array( $i, $fields ) ) {
+				unset( $item[ $i ] );
+			}
+		}
+		return $item;
+	}
+
+	/**
+	 * JSON can be passed in some more complicated objects, like the payment gateway settings array.
+	 * This function decodes the json (if present) and tries to get it's value.
+	 *
+	 * @param array $arr
+	 */
+	protected function decode_json( $arr ) {
+		foreach ( $arr as $key => $value ) {
+			if ( '[' === substr( $value, 0, 1 ) || '{' === substr( $value, 0, 1 ) ) {
+				$arr[ $key ] = json_decode( $value, true );
+			} else {
+				continue;
+			}
+		}
+		return $arr;
+	}
+
+}
diff --git a/includes/cli/class-wc-cli-runner.php b/includes/cli/class-wc-cli-runner.php
new file mode 100644
index 00000000000..de689708d03
--- /dev/null
+++ b/includes/cli/class-wc-cli-runner.php
@@ -0,0 +1,248 @@
+<?php
+/**
+ * WC API to WC CLI Bridge.
+ *
+ * Hooks into the REST API, figures out which endpoints come from WC,
+ * and registers them as CLI commands.
+ *
+ * Forked from wp-cli/restful (by Daniel Bachhuber, released under the MIT license https://opensource.org/licenses/MIT).
+ * https://github.com/wp-cli/restful
+ *
+ * @version 3.0.0
+ * @package WooCommerce
+ */
+class WC_CLI_Runner {
+	/**
+	 * Endpoints to disable (meaning they will not be avaiable as CLI commands).
+	 * Some of these can either be done via WP already, or are offered with
+	 * some other changes (like tools).
+	 */
+	private static $disabled_endpoints = array(
+		'settings',
+		'settings/(?P<group_id>[\w-]+)',
+		'settings/(?P<group_id>[\w-]+)/batch',
+		'settings/(?P<group_id>[\w-]+)/(?P<id>[\w-]+)',
+		'system_status',
+		'system_status/tools',
+		'system_status/tools/(?P<id>[\w-]+)',
+		'reports',
+		'reports/sales',
+		'reports/top_sellers',
+	);
+
+	/**
+	 * The version of the REST API we should target to
+	 * generate commands.
+	 */
+	private static $target_rest_version = 'v2';
+
+	/**
+	 * Register's all endpoints as commands once WP and WC have all loaded.
+	 */
+	public static function after_wp_load() {
+		global $wp_rest_server;
+		$wp_rest_server = new WP_REST_Server;
+		do_action( 'rest_api_init', $wp_rest_server );
+
+		$request = new WP_REST_Request( 'GET', '/' );
+		$request->set_param( 'context', 'help' );
+		$response      = $wp_rest_server->dispatch( $request );
+		$response_data = $response->get_data();
+		if ( empty( $response_data ) ) {
+			return;
+		}
+
+		// Loop through all of our endpoints and register any valid WC endpoints.
+		foreach ( $response_data['routes'] as $route => $route_data ) {
+			// Only register endpoints for WC and our target version.
+			if ( substr( $route, 0, 4 + strlen( self::$target_rest_version ) ) !== '/wc/' . self::$target_rest_version ) {
+				continue;
+			}
+
+			// Only register endpoints with schemas
+			if ( empty( $route_data['schema']['title'] ) ) {
+				WP_CLI::debug( sprintf( __( 'No schema title found for %s, skipping REST command registration.', 'woocommerce' ), $route ), 'wc' );
+				continue;
+			}
+			// Ignore batch endpoints
+			if ( 'batch' === $route_data['schema']['title'] ) {
+				continue;
+			}
+			// Disable specific endpoints
+			$route_pieces   = explode( '/', $route );
+			$endpoint_piece = str_replace( '/wc/' . $route_pieces[2] . '/', '', $route );
+			if ( in_array( $endpoint_piece, self::$disabled_endpoints ) ) {
+				continue;
+			}
+
+			self::register_route_commands( new WC_CLI_REST_Command( $route_data['schema']['title'], $route, $route_data['schema'] ), $route, $route_data );
+		}
+	}
+
+	/**
+	 * Generates command information and tells WP CLI about all
+	 * commands avaiable from a route.
+	 *
+	 * @param string $rest_command
+	 * @param string $route
+	 * @param array  $route_data
+	 * @param array  $command_args
+	 */
+	private static function register_route_commands( $rest_command, $route, $route_data, $command_args = array() ) {
+		// Define IDs that we are looking for in the routes (in addition to id)
+		// so that we can pass it to the rest command, and use it here to generate documentation.
+		$supported_ids = array(
+				'id'           => __( 'ID.', 'woocommerce' ),
+				'product_id'   => __( 'Product ID.', 'woocommerce' ),
+				'customer_id'  => __( 'Customer ID.', 'woocommerce' ),
+				'order_id'     => __( 'Order ID.', 'woocommerce' ),
+				'refund_id'    => __( 'Refund ID.', 'woocommerce' ),
+				'attribute_id' => __( 'Attribute ID.', 'woocommerce' ),
+				'zone_id'      => __( 'Zone ID.', 'woocommerce' ),
+		);
+		$rest_command->set_supported_ids( $supported_ids );
+		$positional_args = array_keys( $supported_ids );
+
+		$parent			 = "wc {$route_data['schema']['title']}";
+		$supported_commands = array();
+
+		// Get a list of supported commands for each route.
+		foreach ( $route_data['endpoints'] as $endpoint ) {
+			$parsed_args   = preg_match_all( '#\([^\)]+\)#', $route, $matches );
+			$first_match   = $matches[0];
+			$resource_id   = ! empty( $matches[0] ) ? array_pop( $matches[0] ) : null;
+			$trimmed_route = rtrim( $route );
+			$is_singular   = substr( $trimmed_route, - strlen( $resource_id ) ) === $resource_id;
+			if ( ! $is_singular ) {
+				$resource_id = $first_match;
+			}
+			$command = '';
+
+			// List a collection
+			if ( array( 'GET' ) == $endpoint['methods'] && ! $is_singular ) {
+				$supported_commands['list'] = ! empty( $endpoint['args'] ) ? $endpoint['args'] : array();
+			}
+			// Create a specific resource
+			if ( array( 'POST' ) == $endpoint['methods'] && ! $is_singular ) {
+				$supported_commands['create'] = ! empty( $endpoint['args'] ) ? $endpoint['args'] : array();
+			}
+			// Get a specific resource
+			if ( array( 'GET' ) == $endpoint['methods'] && $is_singular ) {
+				$supported_commands['get'] = ! empty( $endpoint['args'] ) ? $endpoint['args'] : array();
+			}
+			// Update a specific resource
+			if ( in_array( 'POST', $endpoint['methods'] ) && $is_singular ) {
+				$supported_commands['update'] = ! empty( $endpoint['args'] ) ? $endpoint['args'] : array();
+			}
+			// Delete a specific resource
+			if ( array( 'DELETE' ) == $endpoint['methods'] && $is_singular ) {
+				$supported_commands['delete'] = ! empty( $endpoint['args'] ) ? $endpoint['args'] : array();
+			}
+		}
+
+		foreach ( $supported_commands as $command => $endpoint_args ) {
+			$synopsis = array();
+			$arg_regs = array();
+
+			foreach ( $supported_ids as $id_name => $id_desc ) {
+				if ( strpos( $route, '<' . $id_name . '>' ) !== false ) {
+					$synopsis[] = array(
+						'name'        => $id_name,
+						'type'        => 'positional',
+						'description' => $id_desc,
+						'optional'    => false,
+					);
+				}
+			}
+
+			if ( in_array( $command, array( 'delete', 'get', 'update' ) ) ) {
+				$synopsis[] = array(
+					'name'		  => 'id',
+					'type'		  => 'positional',
+					'description' => __( 'The id for the resource.', 'woocommerce' ),
+					'optional'	  => false,
+				);
+			}
+
+			foreach ( $endpoint_args as $name => $args ) {
+				if ( ! in_array( $name, $positional_args ) ) {
+					$arg_regs[] = array(
+						'name'		  => $name,
+						'type'		  => 'assoc',
+						'description' => ! empty( $args['description'] ) ? $args['description'] : '',
+						'optional'	  => empty( $args['required'] ) ? true : false,
+					);
+				}
+			}
+
+			foreach ( $arg_regs as $arg_reg ) {
+				$synopsis[] = $arg_reg;
+			}
+
+			if ( in_array( $command, array( 'list', 'get' ) ) ) {
+				$synopsis[] = array(
+					'name'		  => 'fields',
+					'type'		  => 'assoc',
+					'description' => __( 'Limit response to specific fields. Defaults to all fields.', 'woocommerce' ),
+					'optional'	  => true,
+				);
+				$synopsis[] = array(
+					'name'		  => 'field',
+					'type'		  => 'assoc',
+					'description' => __( 'Get the value of an individual field.', 'woocommerce' ),
+					'optional'	  => true,
+				);
+				$synopsis[] = array(
+					'name'		  => 'format',
+					'type'		  => 'assoc',
+					'description' => __( 'Render response in a particular format.', 'woocommerce' ),
+					'optional'	  => true,
+					'default'	  => 'table',
+					'options'	  => array(
+						'table',
+						'json',
+						'csv',
+						'ids',
+						'yaml',
+						'count',
+						'headers',
+						'body',
+						'envelope',
+					),
+				);
+			}
+
+			if ( in_array( $command, array( 'create', 'update', 'delete' ) ) ) {
+				$synopsis[] = array(
+					'name'		  => 'porcelain',
+					'type'		  => 'flag',
+					'description' => __( 'Output just the id when the operation is successful.', 'woocommerce' ),
+					'optional'	  => true,
+				);
+			}
+
+			$methods = array(
+				'list'   => 'list_items',
+				'create' => 'create_item',
+				'delete' => 'delete_item',
+				'get'	 => 'get_item',
+				'update' => 'update_item',
+			);
+
+			$before_invoke = null;
+			if ( empty( $command_args['when'] ) && \WP_CLI::get_config( 'debug' ) ) {
+				$before_invoke = function() {
+					if ( ! defined( 'SAVEQUERIES' ) ) {
+						define( 'SAVEQUERIES', true );
+					}
+				};
+			}
+
+			WP_CLI::add_command( "{$parent} {$command}", array( $rest_command, $methods[ $command ] ), array(
+				'synopsis'	    => $synopsis,
+				'when'		    => ! empty( $command_args['when'] ) ? $command_args['when'] : '',
+				'before_invoke' => $before_invoke,
+			) );
+		}
+	}
+}
diff --git a/includes/cli/class-wc-cli-tax.php b/includes/cli/class-wc-cli-tax.php
deleted file mode 100644
index 28a0b64287e..00000000000
--- a/includes/cli/class-wc-cli-tax.php
+++ /dev/null
@@ -1,685 +0,0 @@
-<?php
-
-/**
- * Manage Taxes.
- *
- * @since    2.5.0
- * @package  WooCommerce/CLI
- * @category CLI
- * @author   WooThemes
- */
-class WC_CLI_Tax extends WC_CLI_Command {
-
-	/**
-	 * Create a tax rate.
-	 *
-	 * ## OPTIONS
-	 *
-	 * [--<field>=<value>]
-	 * : Associative args for the new tax rate.
-	 *
-	 * [--porcelain]
-	 * : Outputs just the new tax rate id.
-	 *
-	 * ## AVAILABLE FIELDS
-	 *
-	 * These fields are available for create command:
-	 *
-	 * * country
-	 * * state
-	 * * postcode
-	 * * city
-	 * * rate
-	 * * name
-	 * * priority
-	 * * compound
-	 * * shipping
-	 * * class
-	 * * order
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc tax create --country=US --rate=5 --class=standard --type=percent
-	 *
-	 * @since 2.5.0
-	 */
-	public function create( $__, $assoc_args ) {
-		$porcelain = isset( $assoc_args['porcelain'] );
-		unset( $assoc_args['porcelain'] );
-
-		$assoc_args = apply_filters( 'woocommerce_cli_create_tax_rate_data', $assoc_args );
-
-		$tax_data = array(
-			'tax_rate_country'  => '',
-			'tax_rate_state'    => '',
-			'tax_rate'          => '',
-			'tax_rate_name'     => '',
-			'tax_rate_priority' => 1,
-			'tax_rate_compound' => 0,
-			'tax_rate_shipping' => 1,
-			'tax_rate_order'    => 0,
-			'tax_rate_class'    => '',
-		);
-
-		foreach ( $tax_data as $key => $value ) {
-			$new_key = str_replace( 'tax_rate_', '', $key );
-			$new_key = 'tax_rate' === $new_key ? 'rate' : $new_key;
-
-			if ( isset( $assoc_args[ $new_key ] ) ) {
-				if ( in_array( $new_key, array( 'compound', 'shipping' ) ) ) {
-					$tax_data[ $key ] = $assoc_args[ $new_key ] ? 1 : 0;
-				} else {
-					$tax_data[ $key ] = $assoc_args[ $new_key ];
-				}
-			}
-		}
-
-		// Create tax rate.
-		$id = WC_Tax::_insert_tax_rate( $tax_data );
-
-		// Add locales.
-		if ( ! empty( $assoc_args['postcode'] ) ) {
-			WC_Tax::_update_tax_rate_postcodes( $id, wc_clean( $assoc_args['postcode'] ) );
-		}
-
-		if ( ! empty( $assoc_args['city'] ) ) {
-			WC_Tax::_update_tax_rate_cities( $id, wc_clean( $assoc_args['city'] ) );
-		}
-
-		do_action( 'woocommerce_cli_create_tax_rate', $id, $tax_data );
-
-		if ( $porcelain ) {
-			WP_CLI::line( $id );
-		} else {
-			WP_CLI::success( "Created tax rate $id." );
-		}
-	}
-
-	/**
-	 * Create a tax class.
-	 *
-	 * ## OPTIONS
-	 *
-	 * [--<field>=<value>]
-	 * : Associative args for the new tax class.
-	 *
-	 * [--porcelain]
-	 * : Outputs just the new tax class slug.
-	 *
-	 * ## AVAILABLE FIELDS
-	 *
-	 * These fields are available for create command:
-	 *
-	 * * name
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc tax create_class --name="Reduced Rate"
-	 *
-	 * @since 2.5.0
-	 */
-	public function create_class( $__, $assoc_args ) {
-		try {
-			$porcelain = isset( $assoc_args['porcelain'] );
-			unset( $assoc_args['porcelain'] );
-
-			$assoc_args = apply_filters( 'woocommerce_cli_create_tax_class_data', $assoc_args );
-
-			// Check if name is specified.
-			if ( ! isset( $assoc_args['name'] ) ) {
-				throw new WC_CLI_Exception( 'woocommerce_cli_missing_name', sprintf( __( 'Missing parameter %s', 'woocommerce' ), 'name' ) );
-			}
-
-			$name    = sanitize_text_field( $assoc_args['name'] );
-			$slug    = sanitize_title( $name );
-			$classes = WC_Tax::get_tax_classes();
-			$exists  = false;
-
-			// Check if class exists.
-			foreach ( $classes as $key => $class ) {
-				if ( sanitize_title( $class ) === $slug ) {
-					$exists = true;
-					break;
-				}
-			}
-
-			// Return error if tax class already exists.
-			if ( $exists ) {
-				throw new WC_CLI_Exception( 'woocommerce_cli_cannot_create_tax_class', __( 'Tax class already exists', 'woocommerce' ) );
-			}
-
-			// Add the new class
-			$classes[] = $name;
-
-			update_option( 'woocommerce_tax_classes', implode( "\n", $classes ) );
-
-			do_action( 'woocommerce_cli_create_tax_class', $slug, array( 'name' => $name ) );
-
-			if ( $porcelain ) {
-				WP_CLI::line( $slug );
-			} else {
-				WP_CLI::success( "Created tax class $slug." );
-			}
-		} catch ( WC_CLI_Exception $e ) {
-			WP_CLI::error( $e->getMessage() );
-		}
-	}
-
-	/**
-	 * Delete one or more tax rates.
-	 *
-	 * ## OPTIONS
-	 *
-	 * <id>...
-	 * : The tax rate ID to delete.
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc tax delete 123
-	 *
-	 *     wp wc tax delete $(wp wc tax list --format=ids)
-	 *
-	 * @since 2.5.0
-	 */
-	public function delete( $args, $assoc_args ) {
-		$exit_code = 0;
-
-		foreach ( $args as $tax_id ) {
-			$tax_id = absint( $tax_id );
-			$tax    = WC_Tax::_get_tax_rate( $tax_id );
-
-			if ( is_null( $tax ) ) {
-				$exit_code += 1;
-				WP_CLI::warning( "Failed deleting tax rate {$tax_id}." );
-				continue;
-			}
-
-			do_action( 'woocommerce_cli_delete_tax_rate', $tax_id );
-
-			WC_Tax::_delete_tax_rate( $tax_id );
-			WP_CLI::success( "Deleted tax rate {$tax_id}." );
-		}
-		exit( $exit_code ? 1 : 0 );
-	}
-
-	/**
-	 * Delete one or more tax classes.
-	 *
-	 * ## OPTIONS
-	 *
-	 * <slug>...
-	 * : The tax class slug to delete.
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc tax delete_class reduced-rate
-	 *
-	 *     wp wc tax delete_class $(wp wc tax list_class --format=ids)
-	 *
-	 * @since 2.5.0
-	 */
-	public function delete_class( $args, $assoc_args ) {
-		$classes   = WC_Tax::get_tax_classes();
-		$exit_code = 0;
-
-		foreach ( $args as $slug ) {
-			$slug    = sanitize_title( $slug );
-			$deleted = false;
-
-			foreach ( $classes as $key => $class ) {
-				if ( sanitize_title( $class ) === $slug ) {
-					unset( $classes[ $key ] );
-					$deleted = true;
-					break;
-				}
-			}
-
-			if ( $deleted ) {
-				WP_CLI::success( "Deleted tax class {$slug}." );
-			} else {
-				$exit_code += 1;
-				WP_CLI::warning( "Failed deleting tax class {$slug}." );
-			}
-		}
-
-		update_option( 'woocommerce_tax_classes', implode( "\n", $classes ) );
-
-		exit( $exit_code ? 1 : 0 );
-	}
-
-	/**
-	 * Get a tax rate.
-	 *
-	 * ## OPTIONS
-	 *
-	 * <id>
-	 * : Tax rate ID
-	 *
-	 * [--field=<field>]
-	 * : Instead of returning the whole tax rate fields, returns the value of a single fields.
-	 *
-	 * [--fields=<fields>]
-	 * : Get a specific subset of the tax rates fields.
-	 *
-	 * [--format=<format>]
-	 * : Accepted values: table, json, csv. Default: table.
-	 *
-	 * ## AVAILABLE FIELDS
-	 *
-	 * These fields are available for get command:
-	 *
-	 * * id
-	 * * country
-	 * * state
-	 * * postcode
-	 * * city
-	 * * rate
-	 * * name
-	 * * priority
-	 * * compound
-	 * * shipping
-	 * * order
-	 * * class
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc tax get 123 --field=rate
-	 *
-	 *     wp wc tax get 321 --format=json > rate321.json
-	 *
-	 * @since 2.5.0
-	 */
-	public function get( $args, $assoc_args ) {
-		global $wpdb;
-
-		try {
-
-			$tax_data = $this->format_taxes_to_items( array( $args[0] ) );
-
-			if ( empty( $tax_data ) ) {
-				throw new WC_CLI_Exception( 'woocommerce_cli_invalid_tax_rate', sprintf( __( 'Invalid tax rate ID: %s', 'woocommerce' ), $args[0] ) );
-			}
-
-			$tax_data = apply_filters( 'woocommerce_cli_get_tax_rate', $tax_data[0] );
-
-			if ( empty( $assoc_args['fields'] ) ) {
-				$assoc_args['fields'] = array_keys( $tax_data );
-			}
-
-			$formatter = $this->get_formatter( $assoc_args );
-			$formatter->display_item( $tax_data );
-		} catch ( WC_CLI_Exception $e ) {
-			WP_CLI::error( $e->getMessage() );
-		}
-	}
-
-	/**
-	 * List taxes.
-	 *
-	 * ## OPTIONS
-	 *
-	 * [--<field>=<value>]
-	 * : Filter tax based on tax property.
-	 *
-	 * [--field=<field>]
-	 * : Prints the value of a single field for each tax.
-	 *
-	 * [--fields=<fields>]
-	 * : Limit the output to specific tax fields.
-	 *
-	 * [--format=<format>]
-	 * : Acceptec values: table, csv, json, count, ids. Default: table.
-	 *
-	 * ## AVAILABLE FIELDS
-	 *
-	 * These fields will be displayed by default for each tax:
-	 *
-	 * * id
-	 * * country
-	 * * state
-	 * * postcode
-	 * * city
-	 * * rate
-	 * * name
-	 * * priority
-	 * * compound
-	 * * shipping
-	 * * class
-	 *
-	 * These fields are optionally available:
-	 *
-	 * * order
-	 *
-	 * Fields for filtering query result also available:
-	 *
-	 * * class Sort by tax class.
-	 * * page  Page number.
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc tax list
-	 *
-	 *     wp wc tax list --field=id
-	 *
-	 *     wp wc tax list --fields=id,rate,class --format=json
-	 *
-	 * @since      2.5.0
-	 * @subcommand list
-	 */
-	public function list_( $__, $assoc_args ) {
-		$query_args = $this->merge_tax_query_args( array(), $assoc_args );
-		$formatter  = $this->get_formatter( $assoc_args );
-
-		$taxes = $this->query_tax_rates( $query_args );
-
-		if ( 'ids' === $formatter->format ) {
-			$_taxes = array();
-			foreach ( $taxes as $tax ) {
-				$_taxes[] = $tax->tax_rate_id;
-			}
-			echo implode( ' ', $_taxes );
-		} else {
-			$items = $this->format_taxes_to_items( $taxes );
-			$formatter->display_items( $items );
-		}
-	}
-
-	/**
-	 * List tax classes.
-	 *
-	 * ## OPTIONS
-	 *
-	 * [--<field>=<value>]
-	 * : Filter tax class based on tax class property.
-	 *
-	 * [--field=<field>]
-	 * : Prints the value of a single field for each tax class.
-	 *
-	 * [--fields=<fields>]
-	 * : Limit the output to specific tax class fields.
-	 *
-	 * [--format=<format>]
-	 * : Acceptec values: table, csv, json, count, ids. Default: table.
-	 *
-	 * ## AVAILABLE FIELDS
-	 *
-	 * These fields will be displayed by default for each tax class:
-	 *
-	 * * slug
-	 * * name
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc tax list_class
-	 *
-	 *     wp wc tax list_class --field=slug
-	 *
-	 *     wp wc tax list_class --format=json
-	 *
-	 * @since      2.5.0
-	 * @subcommand list_class
-	 */
-	public function list_class( $__, $assoc_args ) {
-		// Set default fields for tax classes
-		if ( empty( $assoc_args['fields'] ) ) {
-			$assoc_args['fields'] = 'slug,name';
-		}
-
-		$formatter = $this->get_formatter( $assoc_args );
-		$items     = array();
-
-		// Add standard class
-		$items[] = array(
-			'slug' => 'standard',
-			'name' => __( 'Standard Rate', 'woocommerce' )
-		);
-
-		$classes = WC_Tax::get_tax_classes();
-
-		foreach ( $classes as $class ) {
-			$items[] = apply_filters( 'woocommerce_cli_tax_class_response', array(
-				'slug' => sanitize_title( $class ),
-				'name' => $class
-			), $class, $assoc_args, $this );
-		}
-
-		if ( 'ids' === $formatter->format ) {
-			$_slugs = array();
-			foreach ( $items as $item ) {
-				$_slugs[] = $item['slug'];
-			}
-			echo implode( ' ', $_slugs );
-		} else {
-			$formatter->display_items( $items );
-		}
-	}
-
-	/**
-	 * Update a tax rate.
-	 *
-	 * ## OPTIONS
-	 *
-	 * <id>
-	 * : The ID of the tax rate to update.
-	 *
-	 * [--<field>=<value>]
-	 * : One or more fields to update.
-	 *
-	 * ## AVAILABLE FIELDS
-	 *
-	 * These fields are available for update command:
-	 *
-	 * * country
-	 * * state
-	 * * postcode
-	 * * city
-	 * * rate
-	 * * name
-	 * * priority
-	 * * compound
-	 * * shipping
-	 * * class
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc tax update 123 --rate=5
-	 *
-	 * @since 2.5.0
-	 */
-	public function update( $args, $assoc_args ) {
-		try {
-			// Get current tax rate data
-			$tax_data = $this->format_taxes_to_items( array( $args[0] ) );
-
-			if ( empty( $tax_data ) ) {
-				throw new WC_CLI_Exception( 'woocommerce_cli_invalid_tax_rate', sprintf( __( 'Invalid tax rate ID: %s', 'woocommerce' ), $args[0] ) );
-			}
-
-			$current_data   = $tax_data[0];
-			$id             = $current_data['id'];
-			$data           = apply_filters( 'woocommerce_cli_update_tax_rate_data', $assoc_args, $id );
-			$new_data       = array();
-			$default_fields = array(
-				'tax_rate_country',
-				'tax_rate_state',
-				'tax_rate',
-				'tax_rate_name',
-				'tax_rate_priority',
-				'tax_rate_compound',
-				'tax_rate_shipping',
-				'tax_rate_order',
-				'tax_rate_class'
-			);
-
-			foreach ( $data as $key => $value ) {
-				$new_key = 'rate' === $key ? 'tax_rate' : 'tax_rate_' . $key;
-
-				// Check if the key is valid
-				if ( ! in_array( $new_key, $default_fields ) ) {
-					continue;
-				}
-
-				// Test new data against current data
-				if ( $value === $current_data[ $key ] ) {
-					continue;
-				}
-
-				// Fix compund and shipping values
-				if ( in_array( $key, array( 'compound', 'shipping' ) ) ) {
-					$value = $value ? 1 : 0;
-				}
-
-				$new_data[ $new_key ] = $value;
-			}
-
-			// Update tax rate
-			WC_Tax::_update_tax_rate( $id, $new_data );
-
-			// Update locales
-			if ( ! empty( $data['postcode'] ) && $current_data['postcode'] != $data['postcode'] ) {
-				WC_Tax::_update_tax_rate_postcodes( $id, wc_clean( $data['postcode'] ) );
-			}
-
-			if ( ! empty( $data['city'] ) && $current_data['city'] != $data['city'] ) {
-				WC_Tax::_update_tax_rate_cities( $id, wc_clean( $data['city'] ) );
-			}
-
-			do_action( 'woocommerce_cli_update_tax_rate', $id, $data );
-
-			WP_CLI::success( "Updated tax rate $id." );
-		} catch ( WC_CLI_Exception $e ) {
-			WP_CLI::error( $e->getMessage() );
-		}
-	}
-
-	/**
-	 * Add common cli arguments to argument list before $wpdb->get_results() is run.
-	 *
-	 * @since  2.5.0
-	 * @param  array $base_args  Required arguments for the query (e.g. `limit`, etc)
-	 * @param  array $assoc_args Arguments provided in when invoking the command
-	 * @return array
-	 */
-	protected function merge_tax_query_args( $base_args, $assoc_args ) {
-		$args = array();
-
-		if ( ! empty( $assoc_args['class'] ) ) {
-			$args['class'] = $assoc_args['class'];
-		}
-
-		// Number of post to show per page.
-		if ( ! empty( $assoc_args['limit'] ) ) {
-			$args['posts_per_page'] = $assoc_args['limit'];
-		}
-
-		// posts page.
-		$args['paged'] = ( isset( $assoc_args['page'] ) ) ? absint( $assoc_args['page'] ) : 1;
-
-		$args = apply_filters( 'woocommerce_cli_tax_query_args', $args, $assoc_args );
-
-		return array_merge( $base_args, $args );
-	}
-
-	/**
-	 * Helper method to get tax rates objects
-	 *
-	 * @since 2.5.0
-	 *
-	 * @param  array $args
-	 *
-	 * @return array
-	 */
-	protected function query_tax_rates( $args ) {
-		global $wpdb;
-
-		$query = "
-			SELECT tax_rate_id
-			FROM {$wpdb->prefix}woocommerce_tax_rates
-			WHERE 1 = 1
-		";
-
-		// Filter by tax class
-		if ( ! empty( $args['class'] ) ) {
-			$class = 'standard' !== $args['class'] ? sanitize_title( $args['class'] ) : '';
-			$query .= " AND tax_rate_class = '$class'";
-		}
-
-		// Order tax rates
-		$order_by = ' ORDER BY tax_rate_order';
-
-		// Pagination
-		$per_page   = isset( $args['posts_per_page'] ) ? $args['posts_per_page'] : get_option( 'posts_per_page' );
-		$offset     = 1 < $args['paged'] ? ( $args['paged'] - 1 ) * $per_page : 0;
-		$pagination = sprintf( ' LIMIT %d, %d', $offset, $per_page );
-
-		return $wpdb->get_results( $query . $order_by . $pagination );
-	}
-
-	/**
-	 * Get default format fields that will be used in `list` and `get` subcommands.
-	 *
-	 * @since  2.5.0
-	 * @return string
-	 */
-	protected function get_default_format_fields() {
-		return 'id,country,state,postcode,city,rate,name,priority,compound,shipping,class';
-	}
-
-	/**
-	 * Format taxes from query result to items in which each item contain
-	 * common properties of item, for instance `tax_rate_id` will be `id`.
-	 *
-	 * @since  2.5.0
-	 * @param  array $taxes Array of tax rate.
-	 * @return array Items
-	 */
-	protected function format_taxes_to_items( $taxes ) {
-		global $wpdb;
-
-		$items = array();
-
-		foreach ( $taxes as $tax_id ) {
-			$id = is_object( $tax_id ) ? $tax_id->tax_rate_id : $tax_id;
-			$id = absint( $id );
-
-			// Get tax rate details
-			$tax = WC_Tax::_get_tax_rate( $id );
-
-			if ( is_wp_error( $tax ) || empty( $tax ) ) {
-				continue;
-			}
-
-			$tax_data = array(
-				'id'       => $tax['tax_rate_id'],
-				'country'  => $tax['tax_rate_country'],
-				'state'    => $tax['tax_rate_state'],
-				'postcode' => '',
-				'city'     => '',
-				'rate'     => $tax['tax_rate'],
-				'name'     => $tax['tax_rate_name'],
-				'priority' => (int) $tax['tax_rate_priority'],
-				'compound' => (bool) $tax['tax_rate_compound'],
-				'shipping' => (bool) $tax['tax_rate_shipping'],
-				'order'    => (int) $tax['tax_rate_order'],
-				'class'    => $tax['tax_rate_class'] ? $tax['tax_rate_class'] : 'standard'
-			);
-
-			// Get locales from a tax rate
-			$locales = $wpdb->get_results( $wpdb->prepare( "
-				SELECT location_code, location_type
-				FROM {$wpdb->prefix}woocommerce_tax_rate_locations
-				WHERE tax_rate_id = %d
-			", $id ) );
-
-			if ( ! is_wp_error( $tax ) && ! is_null( $tax ) ) {
-				foreach ( $locales as $locale ) {
-					$tax_data[ $locale->location_type ] = $locale->location_code;
-				}
-			}
-
-			$items[] = $tax_data;
-		}
-
-		return $items;
-	}
-}
diff --git a/includes/cli/class-wc-cli-tool-command.php b/includes/cli/class-wc-cli-tool-command.php
new file mode 100644
index 00000000000..2a928cc226d
--- /dev/null
+++ b/includes/cli/class-wc-cli-tool-command.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Hooks up our system status tools to the CLI.
+ *
+ * Forked from wp-cli/restful (by Daniel Bachhuber, released under the MIT license https://opensource.org/licenses/MIT).
+ * https://github.com/wp-cli/restful
+ *
+ * @version 3.0.0
+ * @package WooCommerce
+ */
+class WC_CLI_Tool_Command {
+
+	/**
+	 * Registers just a 'list' and 'run' command to the WC CLI
+	 * since we only want to enable certain actions on the system status
+	 * tools endpoints.
+	 */
+	public static function register_commands() {
+		global $wp_rest_server;
+
+		$request       = new WP_REST_Request( 'OPTIONS', '/wc/v1/system_status/tools' );
+		$response      = $wp_rest_server->dispatch( $request );
+		$response_data = $response->get_data();
+		if ( empty( $response_data ) ) {
+			return;
+		}
+
+		$parent	            = "wc tool";
+		$supported_commands = array( 'list', 'run' );
+		foreach ( $supported_commands as $command ) {
+			$synopsis = array();
+			if ( 'run' === $command ) {
+				$synopsis[] = array(
+					'name'		  => 'id',
+					'type'		  => 'positional',
+					'description' => __( 'The id for the resource.', 'woocommerce' ),
+					'optional'	  => false,
+				);
+				$method = 'update_item';
+				$route  = '/wc/v1/system_status/tools/(?P<id>[\w-]+)';
+			} elseif ( 'list' === $command ) {
+				$synopsis[] = array(
+					'name'		  => 'fields',
+					'type'		  => 'assoc',
+					'description' => __( 'Limit response to specific fields. Defaults to all fields.', 'woocommerce' ),
+					'optional'    => true,
+				);
+				$synopsis[] = array(
+					'name'		  => 'field',
+					'type'		  => 'assoc',
+					'description' => __( 'Get the value of an individual field.', 'woocommerce' ),
+					'optional'	  => true,
+				);
+				$synopsis[] = array(
+					'name'		  => 'format',
+					'type'		  => 'assoc',
+					'description' => __( 'Render response in a particular format.', 'woocommerce' ),
+					'optional'	  => true,
+					'default'	  => 'table',
+					'options'	  => array(
+						'table',
+						'json',
+						'csv',
+						'ids',
+						'yaml',
+						'count',
+						'headers',
+						'body',
+						'envelope',
+					),
+				);
+				$method = 'list_items';
+				$route  = '/wc/v1/system_status/tools';
+			}
+
+			$before_invoke = null;
+			if ( empty( $command_args['when'] ) && WP_CLI::get_config( 'debug' ) ) {
+				$before_invoke = function() {
+					if ( ! defined( 'SAVEQUERIES' ) ) {
+						define( 'SAVEQUERIES', true );
+					}
+				};
+			}
+
+			$rest_command = new WC_CLI_REST_Command( 'system_status_tool', $route, $response_data['schema'] );
+
+			WP_CLI::add_command( "{$parent} {$command}", array( $rest_command, $method ), array(
+				'synopsis'	    => $synopsis,
+				'when'		    => ! empty( $command_args['when'] ) ? $command_args['when'] : '',
+				'before_invoke' => $before_invoke,
+			) );
+		}
+	}
+
+}
diff --git a/includes/cli/class-wc-cli-tool.php b/includes/cli/class-wc-cli-tool.php
deleted file mode 100644
index 0beb0ee8c30..00000000000
--- a/includes/cli/class-wc-cli-tool.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * Tools for WooCommerce.
- *
- * @since    2.5.0
- * @package  WooCommerce/CLI
- * @category CLI
- * @author   WooThemes
- */
-class WC_CLI_Tool extends WC_CLI_Command {
-
-	/**
-	 * Clear the product/shop transients cache.
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     wp wc tool clear_transients
-	 *
-	 * @since 2.5.0
-	 */
-	public function clear_transients( $args, $assoc_args ) {
-		wc_delete_product_transients();
-		wc_delete_shop_order_transients();
-		WC_Cache_Helper::get_transient_version( 'shipping', true );
-
-		WP_CLI::success( 'Product transients and shop order transients were cleared.' );
-	}
-}
diff --git a/includes/cli/class-wc-cli-update-command.php b/includes/cli/class-wc-cli-update-command.php
new file mode 100644
index 00000000000..e15d526e83f
--- /dev/null
+++ b/includes/cli/class-wc-cli-update-command.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Allows updates via CLI.
+ *
+ * @version 3.0.0
+ * @package WooCommerce
+ */
+class WC_CLI_Update_Command {
+
+	/**
+	 * Registers the update command.
+	 */
+	public static function register_commands() {
+		WP_CLI::add_command( 'wc update', array( 'WC_CLI_Update_Command', 'update' ) );
+	}
+
+	/**
+	 * Runs all pending WooCommerce database updates.
+	 */
+	public static function update() {
+		global $wpdb;
+
+		$wpdb->hide_errors();
+
+		include_once( WC_ABSPATH . 'includes/class-wc-install.php' );
+		include_once( WC_ABSPATH . 'includes/wc-update-functions.php' );
+
+		$current_db_version = get_option( 'woocommerce_db_version' );
+		$update_count       = 0;
+
+		foreach ( WC_Install::get_db_update_callbacks() as $version => $update_callbacks ) {
+			if ( version_compare( $current_db_version, $version, '<' ) ) {
+				foreach ( $update_callbacks as $update_callback ) {
+					WP_CLI::log( sprintf( __( 'Calling update function: %s', 'woocommerce' ), $update_callback ) );
+					call_user_func( $update_callback );
+					$update_count ++;
+				}
+			}
+		}
+
+		WC_Admin_Notices::remove_notice( 'update' );
+		WP_CLI::success( sprintf( __( '%1$d updates complete. Database version is %2$s', 'woocommerce' ), absint( $update_count ), get_option( 'woocommerce_db_version' ) ) );
+	}
+}
diff --git a/includes/data-stores/abstract-wc-order-data-store-cpt.php b/includes/data-stores/abstract-wc-order-data-store-cpt.php
new file mode 100644
index 00000000000..4aedd9f9cad
--- /dev/null
+++ b/includes/data-stores/abstract-wc-order-data-store-cpt.php
@@ -0,0 +1,355 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Abstract Order Data Store: Stored in CPT.
+ *
+ * @version  3.0.0
+ * @category Class
+ * @author   WooThemes
+ */
+abstract class Abstract_WC_Order_Data_Store_CPT extends WC_Data_Store_WP implements WC_Object_Data_Store_Interface, WC_Abstract_Order_Data_Store_Interface {
+
+	/**
+	 * Internal meta type used to store order data.
+	 *
+	 * @var string
+	 */
+	protected $meta_type = 'post';
+
+	/**
+	 * Data stored in meta keys, but not considered "meta" for an order.
+	 *
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $internal_meta_keys = array(
+		'_order_currency',
+		'_cart_discount',
+		'_cart_discount_tax',
+		'_order_shipping',
+		'_order_shipping_tax',
+		'_order_tax',
+		'_order_total',
+		'_order_version',
+		'_prices_include_tax',
+		'_payment_tokens',
+	);
+
+	/*
+	|--------------------------------------------------------------------------
+	| CRUD Methods
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Method to create a new order in the database.
+	 * @param WC_Order $order
+	 */
+	public function create( &$order ) {
+		$order->set_version( WC_VERSION );
+		$order->set_date_created( current_time( 'timestamp', true ) );
+		$order->set_currency( $order->get_currency() ? $order->get_currency() : get_woocommerce_currency() );
+
+		$id = wp_insert_post( apply_filters( 'woocommerce_new_order_data', array(
+			'post_date'     => gmdate( 'Y-m-d H:i:s', $order->get_date_created( 'edit' )->getOffsetTimestamp() ),
+			'post_date_gmt' => gmdate( 'Y-m-d H:i:s', $order->get_date_created( 'edit' )->getTimestamp() ),
+			'post_type'     => $order->get_type( 'edit' ),
+			'post_status'   => 'wc-' . ( $order->get_status( 'edit' ) ? $order->get_status( 'edit' ) : apply_filters( 'woocommerce_default_order_status', 'pending' ) ),
+			'ping_status'   => 'closed',
+			'post_author'   => 1,
+			'post_title'    => $this->get_post_title(),
+			'post_password' => uniqid( 'order_' ),
+			'post_parent'   => $order->get_parent_id( 'edit' ),
+			'post_excerpt'  => $this->get_post_excerpt( $order ),
+		) ), true );
+
+		if ( $id && ! is_wp_error( $id ) ) {
+			$order->set_id( $id );
+			$this->update_post_meta( $order );
+			$order->save_meta_data();
+			$order->apply_changes();
+			$this->clear_caches( $order );
+		}
+	}
+
+	/**
+	 * Method to read an order from the database.
+	 * @param WC_Order
+	 */
+	public function read( &$order ) {
+		$order->set_defaults();
+
+		if ( ! $order->get_id() || ! ( $post_object = get_post( $order->get_id() ) ) || ! in_array( $post_object->post_type, wc_get_order_types() ) ) {
+			throw new Exception( __( 'Invalid order.', 'woocommerce' ) );
+		}
+
+		$id = $order->get_id();
+		$order->set_props( array(
+			'parent_id'     => $post_object->post_parent,
+			'date_created'  => 0 < $post_object->post_date_gmt ? wc_string_to_timestamp( $post_object->post_date_gmt ) : null,
+			'date_modified' => 0 < $post_object->post_modified_gmt ? wc_string_to_timestamp( $post_object->post_modified_gmt ) : null,
+			'status'        => $post_object->post_status,
+		) );
+
+		$this->read_order_data( $order, $post_object );
+		$order->read_meta_data();
+		$order->set_object_read( true );
+
+		/**
+		 * In older versions, discounts may have been stored differently.
+		 * Update them now so if the object is saved, the correct values are
+		 * stored. @todo When meta is flattened, handle this during migration.
+		 */
+		if ( version_compare( $order->get_version( 'edit' ), '2.3.7', '<' ) && $order->get_prices_include_tax( 'edit' ) ) {
+			$order->set_discount_total( (double) get_post_meta( $order->get_id(), '_cart_discount', true ) - (double) get_post_meta( $order->get_id(), '_cart_discount_tax', true ) );
+		}
+	}
+
+	/**
+	 * Method to update an order in the database.
+	 * @param WC_Order $order
+	 */
+	public function update( &$order ) {
+		$order->save_meta_data();
+		$order->set_version( WC_VERSION );
+
+		$changes = $order->get_changes();
+
+		// Only update the post when the post data changes.
+		if ( array_intersect( array( 'date_created', 'date_modified', 'status', 'parent_id', 'post_excerpt' ), array_keys( $changes ) ) ) {
+			$post_data = array(
+				'post_date'         => gmdate( 'Y-m-d H:i:s', $order->get_date_created( 'edit' )->getOffsetTimestamp() ),
+				'post_date_gmt'     => gmdate( 'Y-m-d H:i:s', $order->get_date_created( 'edit' )->getTimestamp() ),
+				'post_status'       => 'wc-' . ( $order->get_status( 'edit' ) ? $order->get_status( 'edit' ) : apply_filters( 'woocommerce_default_order_status', 'pending' ) ),
+				'post_parent'       => $order->get_parent_id(),
+				'post_excerpt'      => $this->get_post_excerpt( $order ),
+				'post_modified'     => isset( $changes['date_modified'] ) ? gmdate( 'Y-m-d H:i:s', $order->get_date_modified( 'edit' )->getOffsetTimestamp() ) : current_time( 'mysql' ),
+				'post_modified_gmt' => isset( $changes['date_modified'] ) ? gmdate( 'Y-m-d H:i:s', $order->get_date_modified( 'edit' )->getTimestamp() ) : current_time( 'mysql', 1 ),
+			);
+
+			/**
+			 * When updating this object, to prevent infinite loops, use $wpdb
+			 * to update data, since wp_update_post spawns more calls to the
+			 * save_post action.
+			 *
+			 * This ensures hooks are fired by either WP itself (admin screen save),
+			 * or an update purely from CRUD.
+			 */
+			if ( doing_action( 'save_post' ) ) {
+				$GLOBALS['wpdb']->update( $GLOBALS['wpdb']->posts, $post_data, array( 'ID' => $order->get_id() ) );
+				clean_post_cache( $order->get_id() );
+			} else {
+				wp_update_post( array_merge( array( 'ID' => $order->get_id() ), $post_data ) );
+			}
+			$order->read_meta_data( true ); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
+		}
+		$this->update_post_meta( $order );
+		$order->apply_changes();
+		$this->clear_caches( $order );
+	}
+
+	/**
+	 * Method to delete an order from the database.
+	 * @param WC_Order
+	 * @param array $args Array of args to pass to the delete method.
+	 */
+	public function delete( &$order, $args = array() ) {
+		$id   = $order->get_id();
+		$args = wp_parse_args( $args, array(
+			'force_delete' => false,
+		) );
+
+		if ( $args['force_delete'] ) {
+			wp_delete_post( $id );
+			$order->set_id( 0 );
+			do_action( 'woocommerce_delete_order', $id );
+		} else {
+			wp_trash_post( $id );
+			$order->set_status( 'trash' );
+			do_action( 'woocommerce_trash_order', $id );
+		}
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Additional Methods
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Excerpt for post.
+	 *
+	 * @param  WC_order $order
+	 * @return string
+	 */
+	protected function get_post_excerpt( $order ) {
+		return '';
+	}
+
+	/**
+	 * Get a title for the new post type.
+	 *
+	 * @return string
+	 */
+	protected function get_post_title() {
+		// @codingStandardsIgnoreStart
+		/* translators: %s: Order date */
+		return sprintf( __( 'Order &ndash; %s', 'woocommerce' ), strftime( _x( '%b %d, %Y @ %I:%M %p', 'Order date parsed by strftime', 'woocommerce' ) ) );
+		// @codingStandardsIgnoreEnd
+	}
+
+	/**
+	 * Read order data. Can be overridden by child classes to load other props.
+	 *
+	 * @param WC_Order
+	 * @param object $post_object
+	 * @since 3.0.0
+	 */
+	protected function read_order_data( &$order, $post_object ) {
+		$id = $order->get_id();
+
+		$order->set_props( array(
+			'currency'           => get_post_meta( $id, '_order_currency', true ),
+			'discount_total'     => get_post_meta( $id, '_cart_discount', true ),
+			'discount_tax'       => get_post_meta( $id, '_cart_discount_tax', true ),
+			'shipping_total'     => get_post_meta( $id, '_order_shipping', true ),
+			'shipping_tax'       => get_post_meta( $id, '_order_shipping_tax', true ),
+			'cart_tax'           => get_post_meta( $id, '_order_tax', true ),
+			'total'              => get_post_meta( $id, '_order_total', true ),
+			'version'            => get_post_meta( $id, '_order_version', true ),
+			'prices_include_tax' => metadata_exists( 'post', $id, '_prices_include_tax' ) ? 'yes' === get_post_meta( $id, '_prices_include_tax', true ) : 'yes' === get_option( 'woocommerce_prices_include_tax' ),
+		) );
+
+		// Gets extra data associated with the order if needed.
+		foreach ( $order->get_extra_data_keys() as $key ) {
+			$function = 'set_' . $key;
+			if ( is_callable( array( $order, $function ) ) ) {
+				$order->{$function}( get_post_meta( $order->get_id(), '_' . $key, true ) );
+			}
+		}
+	}
+
+	/**
+	 * Helper method that updates all the post meta for an order based on it's settings in the WC_Order class.
+	 *
+	 * @param $order WC_Order
+	 * @since 3.0.0
+	 */
+	protected function update_post_meta( &$order ) {
+		$updated_props     = array();
+		$meta_key_to_props = array(
+			'_order_currency'     => 'currency',
+			'_cart_discount'      => 'discount_total',
+			'_cart_discount_tax'  => 'discount_tax',
+			'_order_shipping'     => 'shipping_total',
+			'_order_shipping_tax' => 'shipping_tax',
+			'_order_tax'          => 'cart_tax',
+			'_order_total'        => 'total',
+			'_order_version'      => 'version',
+			'_prices_include_tax' => 'prices_include_tax',
+		);
+
+		$props_to_update = $this->get_props_to_update( $order, $meta_key_to_props );
+
+		foreach ( $props_to_update as $meta_key => $prop ) {
+			$value = $order->{"get_$prop"}( 'edit' );
+
+			if ( 'prices_include_tax' === $prop ) {
+				$value = $value ? 'yes' : 'no';
+			}
+
+			if ( update_post_meta( $order->get_id(), $meta_key, $value ) ) {
+				$updated_props[] = $prop;
+			}
+		}
+
+		do_action( 'woocommerce_order_object_updated_props', $order, $updated_props );
+	}
+
+	/**
+	 * Clear any caches.
+	 *
+	 * @param WC_Order
+	 * @since 3.0.0
+	 */
+	protected function clear_caches( &$order ) {
+		clean_post_cache( $order->get_id() );
+		wc_delete_shop_order_transients( $order );
+		wp_cache_delete( 'order-items-' . $order->get_id(), 'orders' );
+	}
+
+	/**
+	 * Read order items of a specific type from the database for this order.
+	 *
+	 * @param  WC_Order $order
+	 * @param  string $type
+	 * @return array
+	 */
+	public function read_items( $order, $type ) {
+		global $wpdb;
+
+		// Get from cache if available.
+		$items = wp_cache_get( 'order-items-' . $order->get_id(), 'orders' );
+
+		if ( false === $items ) {
+			$get_items_sql = $wpdb->prepare( "SELECT order_item_type, order_item_id, order_id, order_item_name FROM {$wpdb->prefix}woocommerce_order_items WHERE order_id = %d ORDER BY order_item_id;", $order->get_id() );
+			$items         = $wpdb->get_results( $get_items_sql );
+			foreach ( $items as $item ) {
+				wp_cache_set( 'item-' . $item->order_item_id, $item, 'order-items' );
+			}
+			wp_cache_set( 'order-items-' . $order->get_id(), $items, 'orders' );
+		}
+
+		$items = wp_list_filter( $items, array( 'order_item_type' => $type ) );
+
+		if ( ! empty( $items ) ) {
+			$items = array_map( array( 'WC_Order_Factory', 'get_order_item' ), array_combine( wp_list_pluck( $items, 'order_item_id' ), $items ) );
+		} else {
+			$items = array();
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Remove all line items (products, coupons, shipping, taxes) from the order.
+	 *
+	 * @param WC_Order
+	 * @param string $type Order item type. Default null.
+	 */
+	public function delete_items( $order, $type = null ) {
+		global $wpdb;
+		if ( ! empty( $type ) ) {
+			$wpdb->query( $wpdb->prepare( "DELETE FROM itemmeta USING {$wpdb->prefix}woocommerce_order_itemmeta itemmeta INNER JOIN {$wpdb->prefix}woocommerce_order_items items WHERE itemmeta.order_item_id = items.order_item_id AND items.order_id = %d AND items.order_item_type = %s", $order->get_id(), $type ) );
+			$wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->prefix}woocommerce_order_items WHERE order_id = %d AND order_item_type = %s", $order->get_id(), $type ) );
+		} else {
+			$wpdb->query( $wpdb->prepare( "DELETE FROM itemmeta USING {$wpdb->prefix}woocommerce_order_itemmeta itemmeta INNER JOIN {$wpdb->prefix}woocommerce_order_items items WHERE itemmeta.order_item_id = items.order_item_id and items.order_id = %d", $order->get_id() ) );
+			$wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->prefix}woocommerce_order_items WHERE order_id = %d", $order->get_id() ) );
+		}
+		$this->clear_caches( $order );
+	}
+
+	/**
+	 * Get token ids for an order.
+	 *
+	 * @param WC_Order
+	 * @return array
+	 */
+	public function get_payment_token_ids( $order ) {
+		$token_ids = array_filter( (array) get_post_meta( $order->get_id(), '_payment_tokens', true ) );
+		return $token_ids;
+	}
+
+	/**
+	 * Update token ids for an order.
+	 *
+	 * @param WC_Order
+	 * @param array $token_ids
+	 */
+	public function update_payment_token_ids( $order, $token_ids ) {
+		update_post_meta( $order->get_id(), '_payment_tokens', $token_ids );
+	}
+}
diff --git a/includes/data-stores/abstract-wc-order-item-type-data-store.php b/includes/data-stores/abstract-wc-order-item-type-data-store.php
new file mode 100644
index 00000000000..13c05c45ab5
--- /dev/null
+++ b/includes/data-stores/abstract-wc-order-item-type-data-store.php
@@ -0,0 +1,142 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Order Item Data Store
+ *
+ * @version  3.0.0
+ * @category Class
+ * @author   WooCommerce
+ */
+abstract class Abstract_WC_Order_Item_Type_Data_Store extends WC_Data_Store_WP implements WC_Object_Data_Store_Interface {
+
+	/**
+	 * Meta type. This should match up with
+	 * the types avaiable at https://codex.wordpress.org/Function_Reference/add_metadata.
+	 * WP defines 'post', 'user', 'comment', and 'term'.
+	 */
+	protected $meta_type = 'order_item';
+
+	/**
+	 * This only needs set if you are using a custom metadata type (for example payment tokens.
+	 * This should be the name of the field your table uses for associating meta with objects.
+	 * For example, in payment_tokenmeta, this would be payment_token_id.
+	 * @var string
+	 */
+	protected $object_id_field_for_meta = 'order_item_id';
+
+	/**
+	 * Create a new order item in the database.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Order_Item $item
+	 */
+	public function create( &$item ) {
+		global $wpdb;
+
+		$wpdb->insert( $wpdb->prefix . 'woocommerce_order_items', array(
+			'order_item_name' => $item->get_name(),
+			'order_item_type' => $item->get_type(),
+			'order_id'        => $item->get_order_id(),
+		) );
+		$item->set_id( $wpdb->insert_id );
+		$this->save_item_data( $item );
+		$item->save_meta_data();
+		$item->apply_changes();
+		$this->clear_cache( $item );
+
+		do_action( 'woocommerce_new_order_item', $item->get_id(), $item, $item->get_order_id() );
+	}
+
+	/**
+	 * Update a order item in the database.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Order_Item $item
+	 */
+	public function update( &$item ) {
+		global $wpdb;
+
+		$changes = $item->get_changes();
+
+		if ( array_intersect( array( 'name', 'order_id' ), array_keys( $changes ) ) ) {
+			$wpdb->update( $wpdb->prefix . 'woocommerce_order_items', array(
+				'order_item_name' => $item->get_name(),
+				'order_item_type' => $item->get_type(),
+				'order_id'        => $item->get_order_id(),
+			), array( 'order_item_id' => $item->get_id() ) );
+		}
+
+		$this->save_item_data( $item );
+		$item->save_meta_data();
+		$item->apply_changes();
+		$this->clear_cache( $item );
+
+		do_action( 'woocommerce_update_order_item', $item->get_id(), $item, $item->get_order_id() );
+	}
+
+	/**
+	 * Remove an order item from the database.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Order_Item $item
+	 * @param array $args Array of args to pass to the delete method.
+	 */
+	public function delete( &$item, $args = array() ) {
+		if ( $item->get_id() ) {
+			global $wpdb;
+			do_action( 'woocommerce_before_delete_order_item', $item->get_id() );
+			$wpdb->delete( $wpdb->prefix . 'woocommerce_order_items', array( 'order_item_id' => $item->get_id() ) );
+			$wpdb->delete( $wpdb->prefix . 'woocommerce_order_itemmeta', array( 'order_item_id' => $item->get_id() ) );
+			do_action( 'woocommerce_delete_order_item', $item->get_id() );
+		}
+	}
+
+	/**
+	 * Read a order item from the database.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Order_Item $item
+	 */
+	public function read( &$item ) {
+		global $wpdb;
+
+		$item->set_defaults();
+
+		// Get from cache if available.
+		$data = wp_cache_get( 'item-' . $item->get_id(), 'order-items' );
+
+		if ( false === $data ) {
+			$data = $wpdb->get_row( $wpdb->prepare( "SELECT order_id, order_item_name FROM {$wpdb->prefix}woocommerce_order_items WHERE order_item_id = %d LIMIT 1;", $item->get_id() ) );
+			wp_cache_set( 'item-' . $item->get_id(), $data, 'order-items' );
+		}
+
+		if ( ! $data ) {
+			throw new Exception( __( 'Invalid order item.', 'woocommerce' ) );
+		}
+
+		$item->set_props( array(
+			'order_id' => $data->order_id,
+			'name'     => $data->order_item_name,
+		) );
+		$item->read_meta_data();
+	}
+
+	/**
+	 * Saves an item's data to the database / item meta.
+	 * Ran after both create and update, so $item->get_id() will be set.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Order_Item $item
+	 */
+	public function save_item_data( &$item ) {}
+
+	/**
+	 * Clear meta cachce.
+	 */
+	public function clear_cache( &$item ) {
+		wp_cache_delete( 'item-' . $item->get_id(), 'order-items' );
+	}
+}
diff --git a/includes/data-stores/class-wc-coupon-data-store-cpt.php b/includes/data-stores/class-wc-coupon-data-store-cpt.php
new file mode 100644
index 00000000000..5d9aa76e48d
--- /dev/null
+++ b/includes/data-stores/class-wc-coupon-data-store-cpt.php
@@ -0,0 +1,357 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Coupon Data Store: Custom Post Type.
+ *
+ * @version  3.0.0
+ * @category Class
+ * @author   WooThemes
+ */
+class WC_Coupon_Data_Store_CPT extends WC_Data_Store_WP implements WC_Coupon_Data_Store_Interface, WC_Object_Data_Store_Interface {
+
+	/**
+	 * Internal meta type used to store coupon data.
+	 * @since 3.0.0
+	 * @var string
+	 */
+	protected $meta_type = 'post';
+
+	/**
+	 * Data stored in meta keys, but not considered "meta" for a coupon.
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $internal_meta_keys = array(
+		'discount_type',
+		'coupon_amount',
+		'expiry_date',
+		'date_expires',
+		'usage_count',
+		'individual_use',
+		'product_ids',
+		'exclude_product_ids',
+		'usage_limit',
+		'usage_limit_per_user',
+		'limit_usage_to_x_items',
+		'free_shipping',
+		'product_categories',
+		'exclude_product_categories',
+		'exclude_sale_items',
+		'minimum_amount',
+		'maximum_amount',
+		'customer_email',
+		'_used_by',
+		'_edit_lock',
+		'_edit_last',
+	);
+
+	/**
+	 * Method to create a new coupon in the database.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Coupon
+	 */
+	public function create( &$coupon ) {
+		$coupon->set_date_created( current_time( 'timestamp', true ) );
+
+		$coupon_id = wp_insert_post( apply_filters( 'woocommerce_new_coupon_data', array(
+			'post_type'     => 'shop_coupon',
+			'post_status'   => 'publish',
+			'post_author'   => get_current_user_id(),
+			'post_title'    => $coupon->get_code( 'edit' ),
+			'post_content'  => '',
+			'post_excerpt'  => $coupon->get_description( 'edit' ),
+			'post_date'     => gmdate( 'Y-m-d H:i:s', $coupon->get_date_created()->getOffsetTimestamp() ),
+			'post_date_gmt' => gmdate( 'Y-m-d H:i:s', $coupon->get_date_created()->getTimestamp() ),
+		) ), true );
+
+		if ( $coupon_id ) {
+			$coupon->set_id( $coupon_id );
+			$this->update_post_meta( $coupon );
+			$coupon->save_meta_data();
+			$coupon->apply_changes();
+			do_action( 'woocommerce_new_coupon', $coupon_id );
+		}
+	}
+
+	/**
+	 * Method to read a coupon.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Coupon
+	 */
+	public function read( &$coupon ) {
+		$coupon->set_defaults();
+
+		if ( ! $coupon->get_id() || ! ( $post_object = get_post( $coupon->get_id() ) ) || 'shop_coupon' !== $post_object->post_type ) {
+			throw new Exception( __( 'Invalid coupon.', 'woocommerce' ) );
+		}
+
+		$coupon_id = $coupon->get_id();
+		$coupon->set_props( array(
+			'code'                        => $post_object->post_title,
+			'description'                 => $post_object->post_excerpt,
+			'date_created'                => 0 < $post_object->post_date_gmt ? wc_string_to_timestamp( $post_object->post_date_gmt ) : null,
+			'date_modified'               => 0 < $post_object->post_modified_gmt ? wc_string_to_timestamp( $post_object->post_modified_gmt ) : null,
+			'date_expires'                => metadata_exists( 'post', $coupon_id, 'date_expires' ) ? get_post_meta( $coupon_id, 'date_expires', true ) : get_post_meta( $coupon_id, 'expiry_date', true ),
+			'discount_type'               => get_post_meta( $coupon_id, 'discount_type', true ),
+			'amount'                      => get_post_meta( $coupon_id, 'coupon_amount', true ),
+			'usage_count'                 => get_post_meta( $coupon_id, 'usage_count', true ),
+			'individual_use'              => 'yes' === get_post_meta( $coupon_id, 'individual_use', true ),
+			'product_ids'                 => array_filter( (array) explode( ',', get_post_meta( $coupon_id, 'product_ids', true ) ) ),
+			'excluded_product_ids'        => array_filter( (array) explode( ',', get_post_meta( $coupon_id, 'exclude_product_ids', true ) ) ),
+			'usage_limit'                 => get_post_meta( $coupon_id, 'usage_limit', true ),
+			'usage_limit_per_user'        => get_post_meta( $coupon_id, 'usage_limit_per_user', true ),
+			'limit_usage_to_x_items'      => 0 < get_post_meta( $coupon_id, 'limit_usage_to_x_items', true ) ? get_post_meta( $coupon_id, 'limit_usage_to_x_items', true ) : null,
+			'free_shipping'               => 'yes' === get_post_meta( $coupon_id, 'free_shipping', true ),
+			'product_categories'          => array_filter( (array) get_post_meta( $coupon_id, 'product_categories', true ) ),
+			'excluded_product_categories' => array_filter( (array) get_post_meta( $coupon_id, 'exclude_product_categories', true ) ),
+			'exclude_sale_items'          => 'yes' === get_post_meta( $coupon_id, 'exclude_sale_items', true ),
+			'minimum_amount'              => get_post_meta( $coupon_id, 'minimum_amount', true ),
+			'maximum_amount'              => get_post_meta( $coupon_id, 'maximum_amount', true ),
+			'email_restrictions'          => array_filter( (array) get_post_meta( $coupon_id, 'customer_email', true ) ),
+			'used_by'                     => array_filter( (array) get_post_meta( $coupon_id, '_used_by' ) ),
+		) );
+		$coupon->read_meta_data();
+		$coupon->set_object_read( true );
+		do_action( 'woocommerce_coupon_loaded', $coupon );
+	}
+
+	/**
+	 * Updates a coupon in the database.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Coupon
+	 */
+	public function update( &$coupon ) {
+		$coupon->save_meta_data();
+		$changes = $coupon->get_changes();
+
+		if ( array_intersect( array( 'code', 'description', 'date_created', 'date_modified' ), array_keys( $changes ) ) ) {
+			$post_data = array(
+				'post_title'        => $coupon->get_code( 'edit' ),
+				'post_excerpt'      => $coupon->get_description( 'edit' ),
+				'post_date'         => gmdate( 'Y-m-d H:i:s', $coupon->get_date_created( 'edit' )->getOffsetTimestamp() ),
+				'post_date_gmt'     => gmdate( 'Y-m-d H:i:s', $coupon->get_date_created( 'edit' )->getTimestamp() ),
+				'post_modified'     => isset( $changes['date_modified'] ) ? gmdate( 'Y-m-d H:i:s', $coupon->get_date_modified( 'edit' )->getOffsetTimestamp() ) : current_time( 'mysql' ),
+				'post_modified_gmt' => isset( $changes['date_modified'] ) ? gmdate( 'Y-m-d H:i:s', $coupon->get_date_modified( 'edit' )->getTimestamp() )       : current_time( 'mysql', 1 ),
+			);
+
+			/**
+			 * When updating this object, to prevent infinite loops, use $wpdb
+			 * to update data, since wp_update_post spawns more calls to the
+			 * save_post action.
+			 *
+			 * This ensures hooks are fired by either WP itself (admin screen save),
+			 * or an update purely from CRUD.
+			 */
+			if ( doing_action( 'save_post' ) ) {
+				$GLOBALS['wpdb']->update( $GLOBALS['wpdb']->posts, $post_data, array( 'ID' => $coupon->get_id() ) );
+				clean_post_cache( $coupon->get_id() );
+			} else {
+				wp_update_post( array_merge( array( 'ID' => $coupon->get_id() ), $post_data ) );
+			}
+			$coupon->read_meta_data( true ); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
+		}
+		$this->update_post_meta( $coupon );
+		$coupon->apply_changes();
+		do_action( 'woocommerce_update_coupon', $coupon->get_id() );
+	}
+
+	/**
+	 * Deletes a coupon from the database.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Coupon
+	 * @param array $args Array of args to pass to the delete method.
+	 */
+	public function delete( &$coupon, $args = array() ) {
+		$args = wp_parse_args( $args, array(
+			'force_delete' => false,
+		) );
+
+		$id = $coupon->get_id();
+
+		if ( $args['force_delete'] ) {
+			wp_delete_post( $coupon->get_id() );
+			$coupon->set_id( 0 );
+			do_action( 'woocommerce_delete_coupon', $id );
+		} else {
+			wp_trash_post( $coupon->get_id() );
+			do_action( 'woocommerce_trash_coupon', $id );
+		}
+	}
+
+	/**
+	 * Helper method that updates all the post meta for a coupon based on it's settings in the WC_Coupon class.
+	 *
+	 * @param WC_Coupon
+	 * @since 3.0.0
+	 */
+	private function update_post_meta( &$coupon ) {
+		$updated_props     = array();
+		$meta_key_to_props = array(
+			'discount_type'              => 'discount_type',
+			'coupon_amount'              => 'amount',
+			'individual_use'             => 'individual_use',
+			'product_ids'                => 'product_ids',
+			'exclude_product_ids'        => 'excluded_product_ids',
+			'usage_limit'                => 'usage_limit',
+			'usage_limit_per_user'       => 'usage_limit_per_user',
+			'limit_usage_to_x_items'     => 'limit_usage_to_x_items',
+			'usage_count'                => 'usage_count',
+			'date_expires'            	 => 'date_expires',
+			'free_shipping'              => 'free_shipping',
+			'product_categories'         => 'product_categories',
+			'exclude_product_categories' => 'excluded_product_categories',
+			'exclude_sale_items'         => 'exclude_sale_items',
+			'minimum_amount'             => 'minimum_amount',
+			'maximum_amount'             => 'maximum_amount',
+			'customer_email'             => 'email_restrictions',
+		);
+
+		$props_to_update = $this->get_props_to_update( $coupon, $meta_key_to_props );
+		foreach ( $props_to_update as $meta_key => $prop ) {
+			$value = $coupon->{"get_$prop"}( 'edit' );
+			switch ( $prop ) {
+				case 'individual_use' :
+				case 'free_shipping' :
+				case 'exclude_sale_items' :
+					$updated = update_post_meta( $coupon->get_id(), $meta_key, wc_bool_to_string( $value ) );
+					break;
+				case 'product_ids' :
+				case 'excluded_product_ids' :
+					$updated = update_post_meta( $coupon->get_id(), $meta_key, implode( ',', array_filter( array_map( 'intval', $value ) ) ) );
+					break;
+				case 'product_categories' :
+				case 'excluded_product_categories' :
+					$updated = update_post_meta( $coupon->get_id(), $meta_key, array_filter( array_map( 'intval', $value ) ) );
+					break;
+				case 'email_restrictions' :
+					$updated = update_post_meta( $coupon->get_id(), $meta_key, array_filter( array_map( 'sanitize_email', $value ) ) );
+					break;
+				case 'date_expires' :
+					$updated = update_post_meta( $coupon->get_id(), $meta_key, ( $value ? $value->getTimestamp() : null ) );
+					update_post_meta( $coupon->get_id(), 'expiry_date', ( $value ? $value->date( 'Y-m-d' ) : '' ) ); // Update the old meta key for backwards compatibility.
+					break;
+				default :
+					$updated = update_post_meta( $coupon->get_id(), $meta_key, $value );
+					break;
+			}
+			if ( $updated ) {
+				$updated_props[] = $prop;
+			}
+		}
+
+		do_action( 'woocommerce_coupon_object_updated_props', $coupon, $updated_props );
+	}
+
+	/**
+	 * Increase usage count for current coupon.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Coupon
+	 * @param string $used_by Either user ID or billing email
+	 * @return int New usage count
+	 */
+	public function increase_usage_count( &$coupon, $used_by = '' ) {
+		$new_count = $this->update_usage_count_meta( $coupon, 'increase' );
+		if ( $used_by ) {
+			add_post_meta( $coupon->get_id(), '_used_by', strtolower( $used_by ) );
+			$coupon->set_used_by( (array) get_post_meta( $coupon->get_id(), '_used_by' ) );
+		}
+		return $new_count;
+	}
+
+	/**
+	 * Decrease usage count for current coupon.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Coupon
+	 * @param string $used_by Either user ID or billing email
+	 * @return int New usage count
+	 */
+	public function decrease_usage_count( &$coupon, $used_by = '' ) {
+		global $wpdb;
+		$new_count = $this->update_usage_count_meta( $coupon, 'decrease' );
+		if ( $used_by ) {
+			/**
+			 * We're doing this the long way because `delete_post_meta( $id, $key, $value )` deletes.
+			 * all instances where the key and value match, and we only want to delete one.
+			 */
+			$meta_id = $wpdb->get_var( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE meta_key = '_used_by' AND meta_value = %s AND post_id = %d LIMIT 1;", $used_by, $coupon->get_id() ) );
+			if ( $meta_id ) {
+				delete_metadata_by_mid( 'post', $meta_id );
+				$coupon->set_used_by( (array) get_post_meta( $coupon->get_id(), '_used_by' ) );
+			}
+		}
+		return $new_count;
+	}
+
+	/**
+	 * Increase or decrease the usage count for a coupon by 1.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Coupon
+	 * @param string $operation 'increase' or 'decrease'
+	 * @return int New usage count
+	 */
+	private function update_usage_count_meta( &$coupon, $operation = 'increase' ) {
+		global $wpdb;
+		$id = $coupon->get_id();
+		$operator = ( 'increase' === $operation ) ? '+' : '-';
+
+		add_post_meta( $id, 'usage_count', $coupon->get_usage_count( 'edit' ), true );
+		$wpdb->query( $wpdb->prepare( "UPDATE $wpdb->postmeta SET meta_value = meta_value {$operator} 1 WHERE meta_key = 'usage_count' AND post_id = %d;", $id ) );
+
+		// Get the latest value direct from the DB, instead of possibly the WP meta cache.
+		return (int) $wpdb->get_var( $wpdb->prepare( "SELECT meta_value FROM $wpdb->postmeta WHERE meta_key = 'usage_count' AND post_id = %d;", $id ) );
+	}
+
+	/**
+	 * Get the number of uses for a coupon by user ID.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Coupon
+	 * @param id $user_id
+	 * @return int
+	 */
+	public function get_usage_by_user_id( &$coupon, $user_id ) {
+		global $wpdb;
+		return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( meta_id ) FROM {$wpdb->postmeta} WHERE post_id = %d AND meta_key = '_used_by' AND meta_value = %d;", $coupon->get_id(), $user_id ) );
+	}
+
+	/**
+	 * Return a coupon code for a specific ID.
+	 *
+	 * @since 3.0.0
+	 * @param int $id
+	 * @return string Coupon Code
+	 */
+	public function get_code_by_id( $id ) {
+		global $wpdb;
+		return $wpdb->get_var( $wpdb->prepare( "
+			SELECT post_title
+			FROM $wpdb->posts
+			WHERE ID = %d
+			AND post_type = 'shop_coupon'
+			AND post_status = 'publish';
+		", $id ) );
+	}
+
+	/**
+	 * Return an array of IDs for for a specific coupon code.
+	 * Can return multiple to check for existence.
+	 *
+	 * @since 3.0.0
+	 * @param string $code
+	 * @return array Array of IDs.
+	 */
+	public function get_ids_by_code( $code ) {
+		global $wpdb;
+		return $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_title = %s AND post_type = 'shop_coupon' AND post_status = 'publish' ORDER BY post_date DESC;", $code ) );
+	}
+}
diff --git a/includes/data-stores/class-wc-customer-data-store-session.php b/includes/data-stores/class-wc-customer-data-store-session.php
new file mode 100644
index 00000000000..395e5021b9b
--- /dev/null
+++ b/includes/data-stores/class-wc-customer-data-store-session.php
@@ -0,0 +1,184 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Customer Data Store which stores the data in session.
+ *
+ * @version  3.0.0
+ * @category Class
+ * @author   WooThemes
+ */
+class WC_Customer_Data_Store_Session extends WC_Data_Store_WP implements WC_Customer_Data_Store_Interface, WC_Object_Data_Store_Interface {
+
+	/**
+	 * Keys which are also stored in a session (so we can make sure they get updated...)
+	 * @var array
+	 */
+	protected $session_keys = array(
+		'billing_postcode',
+		'billing_city',
+		'billing_address_1',
+		'billing_address',
+		'billing_address_2',
+		'billing_state',
+		'billing_country',
+		'shipping_postcode',
+		'shipping_city',
+		'shipping_address_1',
+		'shipping_address',
+		'shipping_address_2',
+		'shipping_state',
+		'shipping_country',
+		'is_vat_exempt',
+		'calculated_shipping',
+		'billing_first_name',
+		'billing_last_name',
+		'billing_company',
+		'billing_phone',
+		'billing_email',
+		'shipping_first_name',
+		'shipping_last_name',
+		'shipping_company',
+	);
+
+	/**
+	 * Simply update the session.
+	 *
+	 * @param WC_Customer
+	 */
+	public function create( &$customer ) {
+		$this->save_to_session( $customer );
+	}
+
+	/**
+	 * Simply update the session.
+	 *
+	 * @param WC_Customer
+	 */
+	public function update( &$customer ) {
+		$this->save_to_session( $customer );
+	}
+
+	/**
+	 * Saves all customer data to the session.
+	 *
+	 * @param WC_Customer
+	 */
+	public function save_to_session( $customer ) {
+		$data = array();
+		foreach ( $this->session_keys as $session_key ) {
+			$function_key = $session_key;
+			if ( 'billing_' === substr( $session_key, 0, 8 ) ) {
+				$session_key = str_replace( 'billing_', '', $session_key );
+			}
+			$data[ $session_key ] = $customer->{"get_$function_key"}( 'edit' );
+		}
+		if ( WC()->session->get( 'customer' ) !== $data ) {
+			WC()->session->set( 'customer', $data );
+		}
+	}
+
+	/**
+	 * Read customer data from the session.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Customer
+	 */
+	public function read( &$customer ) {
+		$data = (array) WC()->session->get( 'customer' );
+		if ( ! empty( $data ) ) {
+			foreach ( $this->session_keys as $session_key ) {
+				$function_key = $session_key;
+				if ( 'billing_' === substr( $session_key, 0, 8 ) ) {
+					$session_key = str_replace( 'billing_', '', $session_key );
+				}
+				if ( ! empty( $data[ $session_key ] ) && is_callable( array( $customer, "set_{$function_key}" ) ) ) {
+					// Only set from session if data is already missing.
+					if ( ! $customer->{"get_{$function_key}"}() ) {
+						$customer->{"set_{$function_key}"}( $data[ $session_key ] );
+					}
+				}
+			}
+		}
+		$this->set_defaults( $customer );
+		$customer->set_object_read( true );
+	}
+
+	/**
+	 * Load default values if props are unset.
+	 *
+	 * @param WC_Customer
+	 */
+	protected function set_defaults( &$customer ) {
+		try {
+			$default = wc_get_customer_default_location();
+
+			if ( ! $customer->get_billing_country() ) {
+				$customer->set_billing_country( $default['country'] );
+			}
+
+			if ( ! $customer->get_shipping_country() ) {
+				$customer->set_shipping_country( $customer->get_billing_country() );
+			}
+
+			if ( ! $customer->get_billing_state() ) {
+				$customer->set_billing_state( $default['state'] );
+			}
+
+			if ( ! $customer->get_shipping_state() ) {
+				$customer->set_shipping_state( $customer->get_billing_state() );
+			}
+
+			if ( ! $customer->get_billing_email() && is_user_logged_in() ) {
+				$current_user = wp_get_current_user();
+				$customer->set_billing_email( $current_user->user_email );
+			}
+		} catch ( WC_Data_Exception $e ) {}
+	}
+
+	/**
+	 * Deletes a customer from the database.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Customer
+	 * @param array $args Array of args to pass to the delete method.
+	 */
+	public function delete( &$customer, $args = array() ) {
+		WC()->session->set( 'customer', null );
+	}
+
+	/**
+	 * Gets the customers last order.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Customer
+	 * @return WC_Order|false
+	 */
+	public function get_last_order( &$customer ) {
+		return false;
+	}
+
+	/**
+	 * Return the number of orders this customer has.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Customer
+	 * @return integer
+	 */
+	public function get_order_count( &$customer ) {
+		return 0;
+	}
+
+	/**
+	 * Return how much money this customer has spent.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Customer
+	 * @return float
+	 */
+	public function get_total_spent( &$customer ) {
+		return 0;
+	}
+}
diff --git a/includes/data-stores/class-wc-customer-data-store.php b/includes/data-stores/class-wc-customer-data-store.php
new file mode 100644
index 00000000000..b3b8f407ada
--- /dev/null
+++ b/includes/data-stores/class-wc-customer-data-store.php
@@ -0,0 +1,397 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Customer Data Store.
+ *
+ * @version  3.0.0
+ * @category Class
+ * @author   WooThemes
+ */
+class WC_Customer_Data_Store extends WC_Data_Store_WP implements WC_Customer_Data_Store_Interface, WC_Object_Data_Store_Interface {
+
+	/**
+	 * Data stored in meta keys, but not considered "meta".
+	 *
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $internal_meta_keys = array(
+		'locale',
+		'billing_postcode',
+		'billing_city',
+		'billing_address_1',
+		'billing_address_2',
+		'billing_state',
+		'billing_country',
+		'shipping_postcode',
+		'shipping_city',
+		'shipping_address_1',
+		'shipping_address_2',
+		'shipping_state',
+		'shipping_country',
+		'paying_customer',
+		'last_update',
+		'first_name',
+		'last_name',
+		'show_admin_bar_front',
+		'use_ssl',
+		'admin_color',
+		'rich_editing',
+		'comment_shortcuts',
+		'dismissed_wp_pointers',
+		'show_welcome_panel',
+		'_woocommerce_persistent_cart',
+		'session_tokens',
+		'nickname',
+		'description',
+		'billing_first_name',
+		'billing_last_name',
+		'billing_company',
+		'billing_phone',
+		'billing_email',
+		'shipping_first_name',
+		'shipping_last_name',
+		'shipping_company',
+		'wptests_capabilities',
+		'wptests_user_level',
+		'_order_count',
+		'_money_spent',
+	);
+
+	/**
+	 * Internal meta type used to store user data.
+	 *
+	 * @var string
+	 */
+	protected $meta_type = 'user';
+
+	/**
+	 * Callback to remove unwanted meta data.
+	 *
+	 * @param object $meta
+	 * @return bool
+	 */
+	protected function exclude_internal_meta_keys( $meta ) {
+		global $wpdb;
+
+		$table_prefix = $wpdb->prefix ? $wpdb->prefix : 'wp_';
+
+		return ! in_array( $meta->meta_key, $this->internal_meta_keys )
+			&& 0 !== strpos( $meta->meta_key, 'closedpostboxes_' )
+			&& 0 !== strpos( $meta->meta_key, 'metaboxhidden_' )
+			&& 0 !== strpos( $meta->meta_key, 'manageedit-' )
+			&& ! strstr( $meta->meta_key, $table_prefix )
+			&& 0 !== stripos( $meta->meta_key, 'wp_' );
+	 }
+
+	/**
+	 * Method to create a new customer in the database.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Customer
+	 */
+	public function create( &$customer ) {
+		$id = wc_create_new_customer( $customer->get_email(), $customer->get_username(), $customer->get_password() );
+
+		if ( is_wp_error( $id ) ) {
+			throw new WC_Data_Exception( $id->get_error_code(), $id->get_error_message() );
+		}
+
+		$customer->set_id( $id );
+		$this->update_user_meta( $customer );
+
+		// Prevent wp_update_user calls in the same request and customer trigger the 'Notice of Password Changed' email
+		$customer->set_password( '' );
+
+		wp_update_user( apply_filters( 'woocommerce_update_customer_args', array(
+			'ID'           => $customer->get_id(),
+			'role'         => $customer->get_role(),
+			'display_name' => $customer->get_first_name() . ' ' . $customer->get_last_name(),
+		), $customer ) );
+		$wp_user = new WP_User( $customer->get_id() );
+		$customer->set_date_created( $wp_user->user_registered );
+		$customer->set_date_modified( get_user_meta( $customer->get_id(), 'last_update', true ) );
+		$customer->save_meta_data();
+		$customer->apply_changes();
+		do_action( 'woocommerce_new_customer', $customer->get_id() );
+	}
+
+	/**
+	 * Method to read a customer object.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Customer
+	 * @throws Exception
+	 */
+	public function read( &$customer ) {
+		global $wpdb;
+
+		// User object is required.
+		if ( ! $customer->get_id() || ! ( $user_object = get_user_by( 'id', $customer->get_id() ) ) || empty( $user_object->ID ) ) {
+			throw new Exception( __( 'Invalid customer.', 'woocommerce' ) );
+		}
+
+		// Only users on this site should be read.
+		if ( is_multisite() && ! is_user_member_of_blog( $customer->get_id() ) ) {
+			throw new Exception( __( 'Invalid customer.', 'woocommerce' ) );
+		}
+
+		$customer_id = $customer->get_id();
+		// Load meta but exclude deprecated props.
+		$user_meta = array_diff_key( array_map( 'wc_flatten_meta_callback', get_user_meta( $customer_id ) ), array_flip( array( 'country', 'state', 'postcode', 'city', 'address', 'address_2', 'default', 'location' ) ) );
+		$customer->set_props( $user_meta );
+		$customer->set_props( array(
+			'is_paying_customer' => get_user_meta( $customer_id, 'paying_customer', true ),
+			'email'              => $user_object->user_email,
+			'username'           => $user_object->user_login,
+			'date_created'       => $user_object->user_registered, // Mysql string in local format.
+			'date_modified'      => get_user_meta( $customer_id, 'last_update', true ),
+			'role'               => ! empty( $user_object->roles[0] ) ? $user_object->roles[0] : 'customer',
+		) );
+		$customer->read_meta_data();
+		$customer->set_object_read( true );
+		do_action( 'woocommerce_customer_loaded', $customer );
+	}
+
+	/**
+	 * Updates a customer in the database.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Customer
+	 */
+	public function update( &$customer ) {
+		wp_update_user( apply_filters( 'woocommerce_update_customer_args', array(
+			'ID'           => $customer->get_id(),
+			'user_email'   => $customer->get_email(),
+			'display_name' => $customer->get_first_name() . ' ' . $customer->get_last_name(),
+		), $customer ) );
+		// Only update password if a new one was set with set_password.
+		if ( $customer->get_password() ) {
+			wp_update_user( array( 'ID' => $customer->get_id(), 'user_pass' => $customer->get_password() ) );
+			$customer->set_password( '' );
+		}
+		$this->update_user_meta( $customer );
+		$customer->set_date_modified( get_user_meta( $customer->get_id(), 'last_update', true ) );
+		$customer->save_meta_data();
+		$customer->apply_changes();
+		do_action( 'woocommerce_update_customer', $customer->get_id() );
+	}
+
+	/**
+	 * Deletes a customer from the database.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Customer
+	 * @param array $args Array of args to pass to the delete method.
+	 */
+	public function delete( &$customer, $args = array() ) {
+		if ( ! $customer->get_id() ) {
+			return;
+		}
+		$args = wp_parse_args( $args, array(
+			'reassign' => 0,
+		) );
+
+		$id = $customer->get_id();
+		wp_delete_user( $id, $args['reassign'] );
+
+		do_action( 'woocommerce_delete_customer', $id );
+	}
+
+	/**
+	 * Helper method that updates all the meta for a customer. Used for update & create.
+	 * @since 3.0.0
+	 * @param WC_Customer
+	 */
+	private function update_user_meta( $customer ) {
+		$updated_props = array();
+		$changed_props = $customer->get_changes();
+
+		$meta_key_to_props = array(
+			'paying_customer' => 'is_paying_customer',
+			'first_name'      => 'first_name',
+			'last_name'       => 'last_name',
+		);
+
+		foreach ( $meta_key_to_props as $meta_key => $prop ) {
+			if ( ! array_key_exists( $prop, $changed_props ) ) {
+				continue;
+			}
+
+			if ( update_user_meta( $customer->get_id(), $meta_key, $customer->{"get_$prop"}( 'edit' ) ) ) {
+				$updated_props[] = $prop;
+			}
+		}
+
+		$billing_address_props = array(
+			'billing_first_name' => 'billing_first_name',
+			'billing_last_name'  => 'billing_last_name',
+			'billing_company'    => 'billing_company',
+			'billing_address_1'  => 'billing_address_1',
+			'billing_address_2'  => 'billing_address_2',
+			'billing_city'       => 'billing_city',
+			'billing_state'      => 'billing_state',
+			'billing_postcode'   => 'billing_postcode',
+			'billing_country'    => 'billing_country',
+			'billing_email'      => 'billing_email',
+			'billing_phone'      => 'billing_phone',
+		);
+
+		foreach ( $billing_address_props as $meta_key => $prop ) {
+			$prop_key = substr( $prop, 8 );
+			if ( ! isset( $changed_props['billing'] ) || ! array_key_exists( $prop_key, $changed_props['billing'] ) ) {
+				continue;
+			}
+			if ( update_user_meta( $customer->get_id(), $meta_key, $customer->{"get_$prop"}( 'edit' ) ) ) {
+				$updated_props[] = $prop;
+			}
+		}
+
+		$shipping_address_props = array(
+			'shipping_first_name' => 'shipping_first_name',
+			'shipping_last_name'  => 'shipping_last_name',
+			'shipping_company'    => 'shipping_company',
+			'shipping_address_1'  => 'shipping_address_1',
+			'shipping_address_2'  => 'shipping_address_2',
+			'shipping_city'       => 'shipping_city',
+			'shipping_state'      => 'shipping_state',
+			'shipping_postcode'   => 'shipping_postcode',
+			'shipping_country'    => 'shipping_country',
+		);
+
+		foreach ( $shipping_address_props as $meta_key => $prop ) {
+			$prop_key = substr( $prop, 9 );
+			if ( ! isset( $changed_props['shipping'] ) || ! array_key_exists( $prop_key, $changed_props['shipping'] ) ) {
+				continue;
+			}
+			if ( update_user_meta( $customer->get_id(), $meta_key, $customer->{"get_$prop"}( 'edit' ) ) ) {
+				$updated_props[] = $prop;
+			}
+		}
+
+		do_action( 'woocommerce_customer_object_updated_props', $customer, $updated_props );
+	}
+
+	/**
+	 * Gets the customers last order.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Customer
+	 * @return WC_Order|false
+	 */
+	public function get_last_order( &$customer ) {
+		global $wpdb;
+
+		$last_order = $wpdb->get_var( "SELECT posts.ID
+			FROM $wpdb->posts AS posts
+			LEFT JOIN {$wpdb->postmeta} AS meta on posts.ID = meta.post_id
+			WHERE meta.meta_key = '_customer_user'
+			AND   meta.meta_value = '" . esc_sql( $customer->get_id() ) . "'
+			AND   posts.post_type = 'shop_order'
+			AND   posts.post_status IN ( '" . implode( "','", array_map( 'esc_sql', array_keys( wc_get_order_statuses() ) ) ) . "' )
+			ORDER BY posts.ID DESC
+		" );
+
+		if ( $last_order ) {
+			return wc_get_order( absint( $last_order ) );
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Return the number of orders this customer has.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Customer
+	 * @return integer
+	 */
+	public function get_order_count( &$customer ) {
+		$count = get_user_meta( $customer->get_id(), '_order_count', true );
+
+		if ( '' === $count ) {
+			global $wpdb;
+
+			$count = $wpdb->get_var( "SELECT COUNT(*)
+				FROM $wpdb->posts as posts
+				LEFT JOIN {$wpdb->postmeta} AS meta ON posts.ID = meta.post_id
+				WHERE   meta.meta_key = '_customer_user'
+				AND     posts.post_type = 'shop_order'
+				AND     posts.post_status IN ( '" . implode( "','", array_map( 'esc_sql', array_keys( wc_get_order_statuses() ) ) ) . "' )
+				AND     meta_value = '" . esc_sql( $customer->get_id() ) . "'
+			" );
+			update_user_meta( $customer->get_id(), '_order_count', $count );
+		}
+
+		return absint( $count );
+	}
+
+	/**
+	 * Return how much money this customer has spent.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Customer
+	 * @return float
+	 */
+	public function get_total_spent( &$customer ) {
+		$spent = get_user_meta( $customer->get_id(), '_money_spent', true );
+
+		if ( '' === $spent ) {
+			global $wpdb;
+
+			$statuses = array_map( 'esc_sql', wc_get_is_paid_statuses() );
+			$spent    = $wpdb->get_var( "SELECT SUM(meta2.meta_value)
+				FROM $wpdb->posts as posts
+				LEFT JOIN {$wpdb->postmeta} AS meta ON posts.ID = meta.post_id
+				LEFT JOIN {$wpdb->postmeta} AS meta2 ON posts.ID = meta2.post_id
+				WHERE   meta.meta_key       = '_customer_user'
+				AND     meta.meta_value     = '" . esc_sql( $customer->get_id() ) . "'
+				AND     posts.post_type     = 'shop_order'
+				AND     posts.post_status   IN ( 'wc-" . implode( "','wc-", $statuses ) . "' )
+				AND     meta2.meta_key      = '_order_total'
+			" );
+
+			if ( ! $spent ) {
+				$spent = 0;
+			}
+			update_user_meta( $customer->get_id(), '_money_spent', $spent );
+		}
+
+		return wc_format_decimal( $spent, 2 );
+	}
+
+	/**
+	 * Search customers and return customer IDs.
+	 *
+	 * @param  string $term
+	 * @return array
+	 */
+	public function search_customers( $term ) {
+		$query = new WP_User_Query( array(
+			'search'         => '*' . esc_attr( $term ) . '*',
+			'search_columns' => array( 'user_login', 'user_url', 'user_email', 'user_nicename', 'display_name' ),
+			'fields'         => 'ID',
+		) );
+
+		$query2 = new WP_User_Query( array(
+			'fields'         => 'ID',
+			'meta_query'     => array(
+				'relation' => 'OR',
+				array(
+					'key'     => 'first_name',
+					'value'   => $term,
+					'compare' => 'LIKE',
+				),
+				array(
+					'key'     => 'last_name',
+					'value'   => $term,
+					'compare' => 'LIKE',
+				),
+			),
+		) );
+		return wp_parse_id_list( array_merge( $query->get_results(), $query2->get_results() ) );
+	}
+}
diff --git a/includes/data-stores/class-wc-customer-download-data-store.php b/includes/data-stores/class-wc-customer-download-data-store.php
new file mode 100644
index 00000000000..abeb077294f
--- /dev/null
+++ b/includes/data-stores/class-wc-customer-download-data-store.php
@@ -0,0 +1,353 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Customer Download Data Store.
+ *
+ * @version  3.0.0
+ * @category Class
+ * @author   WooThemes
+ */
+class WC_Customer_Download_Data_Store implements WC_Customer_Download_Data_Store_Interface {
+
+	/**
+	 * Create download permission for a user.
+	 *
+	 * @param WC_Customer_Download $download
+	 */
+	public function create( &$download ) {
+		global $wpdb;
+
+		// Always set a access granted date.
+		if ( is_null( $download->get_access_granted( 'edit' ) ) ) {
+			$download->set_access_granted( current_time( 'timestamp', true ) );
+		}
+
+		$data = array(
+			'download_id'         => $download->get_download_id( 'edit' ),
+			'product_id'          => $download->get_product_id( 'edit' ),
+			'user_id'             => $download->get_user_id( 'edit' ),
+			'user_email'          => $download->get_user_email( 'edit' ),
+			'order_id'            => $download->get_order_id( 'edit' ),
+			'order_key'           => $download->get_order_key( 'edit' ),
+			'downloads_remaining' => $download->get_downloads_remaining( 'edit' ),
+			'access_granted'      => date( 'Y-m-d', $download->get_access_granted( 'edit' )->getTimestamp() ),
+			'download_count'      => $download->get_download_count( 'edit' ),
+			'access_expires'      => ! is_null( $download->get_access_expires( 'edit' ) ) ? date( 'Y-m-d', $download->get_access_expires( 'edit' )->getTimestamp() ) : null,
+		);
+
+		$format = array(
+			'%s',
+			'%s',
+			'%s',
+			'%s',
+			'%s',
+			'%s',
+			'%s',
+			'%s',
+			'%d',
+			'%s',
+		);
+
+		$result = $wpdb->insert(
+			$wpdb->prefix . 'woocommerce_downloadable_product_permissions',
+			apply_filters( 'woocommerce_downloadable_file_permission_data', $data ),
+			apply_filters( 'woocommerce_downloadable_file_permission_format', $format, $data )
+		);
+
+		do_action( 'woocommerce_grant_product_download_access', $data );
+
+		if ( $result ) {
+			$download->set_id( $wpdb->insert_id );
+			$download->apply_changes();
+		}
+	}
+
+	/**
+	 * Method to read a download permission from the database.
+	 *
+	 * @param WC_Customer_Download
+	 */
+	public function read( &$download ) {
+		global $wpdb;
+
+		$download->set_defaults();
+
+		if ( ! $download->get_id() || ! ( $raw_download = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->prefix}woocommerce_downloadable_product_permissions WHERE permission_id = %d", $download->get_id() ) ) ) ) {
+			throw new Exception( __( 'Invalid download.', 'woocommerce' ) );
+		}
+
+		$download->set_props( array(
+			'download_id'         => $raw_download->download_id,
+			'product_id'          => $raw_download->product_id,
+			'user_id'             => $raw_download->user_id,
+			'user_email'          => $raw_download->user_email,
+			'order_id'            => $raw_download->order_id,
+			'order_key'           => $raw_download->order_key,
+			'downloads_remaining' => $raw_download->downloads_remaining,
+			'access_granted'      => strtotime( $raw_download->access_granted ),
+			'download_count'      => $raw_download->download_count,
+			'access_expires'      => is_null( $raw_download->access_expires ) ? null : strtotime( $raw_download->access_expires ),
+		) );
+		$download->set_object_read( true );
+	}
+
+	/**
+	 * Method to update a download in the database.
+	 *
+	 * @param WC_Customer_Download $download
+	 */
+	public function update( &$download ) {
+		global $wpdb;
+
+		$data = array(
+			'download_id'         => $download->get_download_id( 'edit' ),
+			'product_id'          => $download->get_product_id( 'edit' ),
+			'user_id'             => $download->get_user_id( 'edit' ),
+			'user_email'          => $download->get_user_email( 'edit' ),
+			'order_id'            => $download->get_order_id( 'edit' ),
+			'order_key'           => $download->get_order_key( 'edit' ),
+			'downloads_remaining' => $download->get_downloads_remaining( 'edit' ),
+			'access_granted'      => date( 'Y-m-d', $download->get_access_granted( 'edit' )->getTimestamp() ),
+			'download_count'      => $download->get_download_count( 'edit' ),
+			'access_expires'      => ! is_null( $download->get_access_expires( 'edit' ) ) ? date( 'Y-m-d', $download->get_access_expires( 'edit' )->getTimestamp() ) : null,
+		);
+
+		$format = array(
+			'%s',
+			'%s',
+			'%s',
+			'%s',
+			'%s',
+			'%s',
+			'%s',
+			'%s',
+			'%d',
+			'%s',
+		);
+
+		$wpdb->update(
+			$wpdb->prefix . 'woocommerce_downloadable_product_permissions',
+			$data,
+			array(
+				'permission_id' => $download->get_id(),
+			),
+			$format
+		);
+		$download->apply_changes();
+	}
+
+	/**
+	 * Method to delete a download permission from the database.
+	 *
+	 * @param WC_Customer_Download $download
+	 * @param array $args Array of args to pass to the delete method.
+	 */
+	public function delete( &$download, $args = array() ) {
+		global $wpdb;
+
+		$wpdb->query( $wpdb->prepare( "
+			DELETE FROM {$wpdb->prefix}woocommerce_downloadable_product_permissions
+			WHERE permission_id = %d
+		", $download->get_id() ) );
+
+		$download->set_id( 0 );
+	}
+
+	/**
+	 * Method to delete a download permission from the database by ID.
+	 *
+	 * @param int $id
+	 */
+	public function delete_by_id( $id ) {
+		global $wpdb;
+		$wpdb->query( $wpdb->prepare( "
+			DELETE FROM {$wpdb->prefix}woocommerce_downloadable_product_permissions
+			WHERE permission_id = %d
+		", $id ) );
+	}
+
+	/**
+	 * Method to delete a download permission from the database by order ID.
+	 *
+	 * @param int $id
+	 */
+	public function delete_by_order_id( $id ) {
+		global $wpdb;
+		$wpdb->query( $wpdb->prepare( "
+			DELETE FROM {$wpdb->prefix}woocommerce_downloadable_product_permissions
+			WHERE order_id = %d
+		", $id ) );
+	}
+
+	/**
+	 * Method to delete a download permission from the database by download ID.
+	 *
+	 * @param int $id
+	 */
+	public function delete_by_download_id( $id ) {
+		global $wpdb;
+		$wpdb->query( $wpdb->prepare( "
+			DELETE FROM {$wpdb->prefix}woocommerce_downloadable_product_permissions
+			WHERE download_id = %s
+		", $id ) );
+	}
+
+	/**
+	 * Get a download object.
+	 *
+	 * @param  array $data From the DB.
+	 * @return WC_Customer_Download
+	 */
+	private function get_download( $data ) {
+		return new WC_Customer_Download( $data );
+	}
+
+	/**
+	 * Get array of download ids by specified args.
+	 *
+	 * @param  array $args
+	 * @return array
+	 */
+	public function get_downloads( $args = array() ) {
+		global $wpdb;
+
+		$args = wp_parse_args( $args, array(
+			'user_email'  => '',
+			'order_id'    => '',
+			'order_key'   => '',
+			'product_id'  => '',
+			'download_id' => '',
+			'orderby'     => 'permission_id',
+			'order'       => 'DESC',
+			'limit'       => -1,
+			'return'      => 'objects',
+		) );
+
+		$query   = array();
+		$query[] = "SELECT * FROM {$wpdb->prefix}woocommerce_downloadable_product_permissions WHERE 1=1";
+
+		if ( $args['user_email'] ) {
+			$query[] = $wpdb->prepare( "AND user_email = %s", sanitize_email( $args['user_email'] ) );
+		}
+
+		if ( $args['order_id'] ) {
+			$query[] = $wpdb->prepare( "AND order_id = %d", $args['order_id'] );
+		}
+
+		if ( $args['order_key'] ) {
+			$query[] = $wpdb->prepare( "AND order_key = %s", $args['order_key'] );
+		}
+
+		if ( $args['product_id'] ) {
+			$query[] = $wpdb->prepare( "AND product_id = %d", $args['product_id'] );
+		}
+
+		if ( $args['download_id'] ) {
+			$query[] = $wpdb->prepare( "AND download_id = %s", $args['download_id'] );
+		}
+
+		$allowed_orders = array( 'permission_id', 'download_id', 'product_id', 'order_id', 'order_key', 'user_email', 'user_id', 'downloads_remaining', 'access_granted', 'access_expires', 'download_count' );
+		$order          = in_array( $args['order'], $allowed_orders ) ? $args['order'] : 'permission_id';
+		$orderby        = 'DESC' === strtoupper( $args['orderby'] ) ? 'DESC' : 'ASC';
+		$orderby_sql    = sanitize_sql_orderby( "{$order} {$orderby}" );
+		$query[]        = "ORDER BY {$orderby_sql}";
+
+		if ( 0 < $args['limit'] ) {
+			$query[] = $wpdb->prepare( "LIMIT %d", $args['limit'] );
+		}
+
+		$raw_downloads = $wpdb->get_results( implode( ' ', $query ) );
+
+		switch ( $args['return'] ) {
+			case 'ids' :
+				return wp_list_pluck( $raw_downloads, 'permission_id' );
+			default :
+				return array_map( array( $this, 'get_download' ), $raw_downloads );
+		}
+	}
+
+	/**
+	 * Update download ids if the hash changes.
+	 *
+	 * @param  int $product_id
+	 * @param  string $old_id
+	 * @param  string $new_id
+	 */
+	public function update_download_id( $product_id, $old_id, $new_id ) {
+		global $wpdb;
+
+		$wpdb->update(
+			$wpdb->prefix . 'woocommerce_downloadable_product_permissions',
+			array(
+				'download_id' => $new_id,
+			),
+			array(
+				'download_id' => $old_id,
+				'product_id'  => $product_id,
+			)
+		);
+	}
+
+	/**
+	 * Get a customers downloads.
+	 *
+	 * @param  int $customer_id
+	 * @return array
+	 */
+	public function get_downloads_for_customer( $customer_id ) {
+		global $wpdb;
+
+		return $wpdb->get_results(
+			$wpdb->prepare( "
+				SELECT * FROM {$wpdb->prefix}woocommerce_downloadable_product_permissions as permissions
+				WHERE user_id = %d
+				AND permissions.order_id > 0
+				AND
+					(
+						permissions.downloads_remaining > 0
+						OR permissions.downloads_remaining = ''
+					)
+				AND
+					(
+						permissions.access_expires IS NULL
+						OR permissions.access_expires >= %s
+						OR permissions.access_expires = '0000-00-00 00:00:00'
+					)
+				ORDER BY permissions.order_id, permissions.product_id, permissions.permission_id;
+				",
+				$customer_id,
+				date( 'Y-m-d', current_time( 'timestamp' ) )
+			)
+		);
+	}
+
+	/**
+	 * Update user prop for downloads based on order id.
+	 *
+	 * @param  int $order_id
+	 * @param  int $customer_id
+	 * @param  string $email
+	 */
+	public function update_user_by_order_id( $order_id, $customer_id, $email ) {
+		global $wpdb;
+		$wpdb->update( $wpdb->prefix . 'woocommerce_downloadable_product_permissions',
+			array(
+				'user_id'    => $customer_id,
+				'user_email' => $email,
+			),
+			array(
+				'order_id'   => $order_id,
+			),
+			array(
+				'%d',
+				'%s',
+			),
+			array(
+				'%d',
+			)
+		);
+	}
+}
diff --git a/includes/data-stores/class-wc-data-store-wp.php b/includes/data-stores/class-wc-data-store-wp.php
new file mode 100644
index 00000000000..1ccc6e92f4a
--- /dev/null
+++ b/includes/data-stores/class-wc-data-store-wp.php
@@ -0,0 +1,197 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Shared logic for WP based data.
+ * Contains functions like meta handling for all default data stores.
+ * Your own data store doesn't need to use WC_Data_Store_WP -- you can write
+ * your own meta handling functions.
+ *
+ * @version  3.0.0
+ * @category Class
+ * @author   WooThemes
+ */
+class WC_Data_Store_WP {
+
+	/**
+	 * Meta type. This should match up with
+	 * the types available at https://codex.wordpress.org/Function_Reference/add_metadata.
+	 * WP defines 'post', 'user', 'comment', and 'term'.
+	 */
+	protected $meta_type = 'post';
+
+	/**
+	 * This only needs set if you are using a custom metadata type (for example payment tokens.
+	 * This should be the name of the field your table uses for associating meta with objects.
+	 * For example, in payment_tokenmeta, this would be payment_token_id.
+	 * @var string
+	 */
+	protected $object_id_field_for_meta = '';
+
+	/**
+	 * Data stored in meta keys, but not considered "meta" for an object.
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $internal_meta_keys = array();
+
+	/**
+	 * Get and store terms from a taxonomy.
+	 *
+	 * @since  3.0.0
+	 * @param  WC_Data|integer $object
+	 * @param  string $taxonomy Taxonomy name e.g. product_cat
+	 * @return array of terms
+	 */
+	protected function get_term_ids( $object, $taxonomy ) {
+		if ( is_numeric( $object ) ) {
+			$object_id = $object;
+		} else {
+			$object_id = $object->get_id();
+		}
+		$terms = get_the_terms( $object_id, $taxonomy );
+		if ( false === $terms || is_wp_error( $terms ) ) {
+			return array();
+		}
+		return wp_list_pluck( $terms, 'term_id' );
+	}
+
+	/**
+	 * Returns an array of meta for an object.
+	 *
+	 * @since  3.0.0
+	 * @param  WC_Data
+	 * @return array
+	 */
+	public function read_meta( &$object ) {
+		global $wpdb;
+		$db_info       = $this->get_db_info();
+		$raw_meta_data = $wpdb->get_results( $wpdb->prepare( "
+			SELECT {$db_info['meta_id_field']} as meta_id, meta_key, meta_value
+			FROM {$db_info['table']}
+			WHERE {$db_info['object_id_field']} = %d
+			ORDER BY {$db_info['meta_id_field']}
+		", $object->get_id() ) );
+
+		$this->internal_meta_keys = array_merge( array_map( array( $this, 'prefix_key' ), $object->get_data_keys() ), $this->internal_meta_keys );
+		return array_filter( $raw_meta_data, array( $this, 'exclude_internal_meta_keys' ) );
+	}
+
+	/**
+	 * Deletes meta based on meta ID.
+	 *
+	 * @since  3.0.0
+	 * @param  WC_Data
+	 * @param  stdClass (containing at least ->id)
+	 * @return array
+	 */
+	public function delete_meta( &$object, $meta ) {
+		delete_metadata_by_mid( $this->meta_type, $meta->id );
+	}
+
+	/**
+	 * Add new piece of meta.
+	 *
+	 * @since  3.0.0
+	 * @param  WC_Data
+	 * @param  stdClass (containing ->key and ->value)
+	 * @return int meta ID
+	 */
+	public function add_meta( &$object, $meta ) {
+		return add_metadata( $this->meta_type, $object->get_id(), $meta->key, $meta->value, false );
+	}
+
+	/**
+	 * Update meta.
+	 *
+	 * @since  3.0.0
+	 * @param  WC_Data
+	 * @param  stdClass (containing ->id, ->key and ->value)
+	 */
+	public function update_meta( &$object, $meta ) {
+		update_metadata_by_mid( $this->meta_type, $meta->id, $meta->value, $meta->key );
+	}
+
+	/**
+	 * Table structure is slightly different between meta types, this function will return what we need to know.
+	 *
+	 * @since  3.0.0
+	 * @return array Array elements: table, object_id_field, meta_id_field
+	 */
+	protected function get_db_info() {
+		global $wpdb;
+
+		$meta_id_field   = 'meta_id'; // for some reason users calls this umeta_id so we need to track this as well.
+		$table           = $wpdb->prefix;
+
+		// If we are dealing with a type of metadata that is not a core type, the table should be prefixed.
+		if ( ! in_array( $this->meta_type, array( 'post', 'user', 'comment', 'term' ) ) ) {
+			$table .= 'woocommerce_';
+		}
+
+		$table          .= $this->meta_type . 'meta';
+		$object_id_field = $this->meta_type . '_id';
+
+		// Figure out our field names.
+		if ( 'user' === $this->meta_type ) {
+			$meta_id_field = 'umeta_id';
+			$table         = $wpdb->usermeta;
+		}
+
+		if ( ! empty( $this->object_id_field_for_meta ) ) {
+			$object_id_field = $this->object_id_field_for_meta;
+		}
+
+		return array(
+			'table'           => $table,
+			'object_id_field' => $object_id_field,
+			'meta_id_field'   => $meta_id_field,
+		);
+	}
+
+	/**
+	 * Internal meta keys we don't want exposed as part of meta_data. This is in
+	 * addition to all data props with _ prefix.
+	 * @since 2.6.0
+	 * @return array
+	 */
+	protected function prefix_key( $key ) {
+		return '_' === substr( $key, 0, 1 ) ? $key : '_' . $key;
+	}
+
+	/**
+	 * Callback to remove unwanted meta data.
+	 *
+	 * @param object $meta
+	 * @return bool
+	 */
+	protected function exclude_internal_meta_keys( $meta ) {
+		return ! in_array( $meta->meta_key, $this->internal_meta_keys ) && 0 !== stripos( $meta->meta_key, 'wp_' );
+	}
+
+	/**
+	 * Gets a list of props and meta keys that need updated based on change state
+	 * or if they are present in the database or not.
+	 *
+	 * @param  WC_Data $object              The WP_Data object (WC_Coupon for coupons, etc).
+	 * @param  array   $meta_key_to_props   A mapping of meta keys => prop names.
+	 * @param  string  $meta_type           The internal WP meta type (post, user, etc).
+	 * @return array                        A mapping of meta keys => prop names, filtered by ones that should be updated.
+	 */
+	protected function get_props_to_update( $object, $meta_key_to_props, $meta_type = 'post' ) {
+		$props_to_update = array();
+		$changed_props   = $object->get_changes();
+
+		// Props should be updated if they are a part of the $changed array or don't exist yet.
+		foreach ( $meta_key_to_props as $meta_key => $prop ) {
+			if ( array_key_exists( $prop, $changed_props ) || ! metadata_exists( $meta_type, $object->get_id(), $meta_key ) ) {
+				$props_to_update[ $meta_key ] = $prop;
+			}
+		}
+
+		return $props_to_update;
+	}
+
+}
diff --git a/includes/data-stores/class-wc-order-data-store-cpt.php b/includes/data-stores/class-wc-order-data-store-cpt.php
new file mode 100644
index 00000000000..eec47bc0d1f
--- /dev/null
+++ b/includes/data-stores/class-wc-order-data-store-cpt.php
@@ -0,0 +1,637 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Order Data Store: Stored in CPT.
+ *
+ * @version  3.0.0
+ * @category Class
+ * @author   WooThemes
+ */
+class WC_Order_Data_Store_CPT extends Abstract_WC_Order_Data_Store_CPT implements WC_Object_Data_Store_Interface, WC_Order_Data_Store_Interface {
+
+	/**
+	 * Data stored in meta keys, but not considered "meta" for an order.
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $internal_meta_keys = array(
+		'_customer_user',
+		'_order_key',
+		'_order_currency',
+		'_billing_first_name',
+		'_billing_last_name',
+		'_billing_company',
+		'_billing_address_1',
+		'_billing_address_2',
+		'_billing_city',
+		'_billing_state',
+		'_billing_postcode',
+		'_billing_country',
+		'_billing_email',
+		'_billing_phone',
+		'_shipping_first_name',
+		'_shipping_last_name',
+		'_shipping_company',
+		'_shipping_address_1',
+		'_shipping_address_2',
+		'_shipping_city',
+		'_shipping_state',
+		'_shipping_postcode',
+		'_shipping_country',
+		'_completed_date',
+		'_paid_date',
+		'_edit_lock',
+		'_edit_last',
+		'_cart_discount',
+		'_cart_discount_tax',
+		'_order_shipping',
+		'_order_shipping_tax',
+		'_order_tax',
+		'_order_total',
+		'_payment_method',
+		'_payment_method_title',
+		'_transaction_id',
+		'_customer_ip_address',
+		'_customer_user_agent',
+		'_created_via',
+		'_order_version',
+		'_prices_include_tax',
+		'_date_completed',
+		'_date_paid',
+		'_payment_tokens',
+		'_billing_address_index',
+		'_shipping_address_index',
+		'_recorded_sales',
+		'_recorded_coupon_usage_counts',
+		'_shipping_method',
+	);
+
+	/**
+	 * Method to create a new order in the database.
+	 * @param WC_Order $order
+	 */
+	public function create( &$order ) {
+		$order->set_order_key( 'wc_' . apply_filters( 'woocommerce_generate_order_key', uniqid( 'order_' ) ) );
+		parent::create( $order );
+		do_action( 'woocommerce_new_order', $order->get_id() );
+	}
+
+	/**
+	 * Read order data. Can be overridden by child classes to load other props.
+	 *
+	 * @param WC_Order
+	 * @param object $post_object
+	 * @since 3.0.0
+	 */
+	protected function read_order_data( &$order, $post_object ) {
+		parent::read_order_data( $order, $post_object );
+		$id             = $order->get_id();
+		$date_completed = get_post_meta( $id, '_date_completed', true );
+		$date_paid      = get_post_meta( $id, '_date_paid', true );
+
+		if ( ! $date_completed ) {
+			$date_completed = get_post_meta( $id, '_completed_date', true );
+		}
+
+		if ( ! $date_paid ) {
+			$date_paid = get_post_meta( $id, '_paid_date', true );
+		}
+
+		$order->set_props( array(
+			'order_key'            => get_post_meta( $id, '_order_key', true ),
+			'customer_id'          => get_post_meta( $id, '_customer_user', true ),
+			'billing_first_name'   => get_post_meta( $id, '_billing_first_name', true ),
+			'billing_last_name'    => get_post_meta( $id, '_billing_last_name', true ),
+			'billing_company'      => get_post_meta( $id, '_billing_company', true ),
+			'billing_address_1'    => get_post_meta( $id, '_billing_address_1', true ),
+			'billing_address_2'    => get_post_meta( $id, '_billing_address_2', true ),
+			'billing_city'         => get_post_meta( $id, '_billing_city', true ),
+			'billing_state'        => get_post_meta( $id, '_billing_state', true ),
+			'billing_postcode'     => get_post_meta( $id, '_billing_postcode', true ),
+			'billing_country'      => get_post_meta( $id, '_billing_country', true ),
+			'billing_email'        => get_post_meta( $id, '_billing_email', true ),
+			'billing_phone'        => get_post_meta( $id, '_billing_phone', true ),
+			'shipping_first_name'  => get_post_meta( $id, '_shipping_first_name', true ),
+			'shipping_last_name'   => get_post_meta( $id, '_shipping_last_name', true ),
+			'shipping_company'     => get_post_meta( $id, '_shipping_company', true ),
+			'shipping_address_1'   => get_post_meta( $id, '_shipping_address_1', true ),
+			'shipping_address_2'   => get_post_meta( $id, '_shipping_address_2', true ),
+			'shipping_city'        => get_post_meta( $id, '_shipping_city', true ),
+			'shipping_state'       => get_post_meta( $id, '_shipping_state', true ),
+			'shipping_postcode'    => get_post_meta( $id, '_shipping_postcode', true ),
+			'shipping_country'     => get_post_meta( $id, '_shipping_country', true ),
+			'payment_method'       => get_post_meta( $id, '_payment_method', true ),
+			'payment_method_title' => get_post_meta( $id, '_payment_method_title', true ),
+			'transaction_id'       => get_post_meta( $id, '_transaction_id', true ),
+			'customer_ip_address'  => get_post_meta( $id, '_customer_ip_address', true ),
+			'customer_user_agent'  => get_post_meta( $id, '_customer_user_agent', true ),
+			'created_via'          => get_post_meta( $id, '_created_via', true ),
+			'date_completed'       => $date_completed,
+			'date_paid'            => $date_paid,
+			'cart_hash'            => get_post_meta( $id, '_cart_hash', true ),
+			'customer_note'        => $post_object->post_excerpt,
+		) );
+	}
+
+	/**
+	 * Method to update an order in the database.
+	 * @param WC_Order $order
+	 */
+	public function update( &$order ) {
+		// Before updating, ensure date paid is set if missing.
+		if ( ! $order->get_date_paid( 'edit' ) && version_compare( $order->get_version( 'edit' ), '3.0', '<' ) && $order->has_status( apply_filters( 'woocommerce_payment_complete_order_status', $order->needs_processing() ? 'processing' : 'completed', $order->get_id(), $order ) ) ) {
+			$order->set_date_paid( $order->get_date_created( 'edit' ) );
+		}
+
+		// Update the order.
+		parent::update( $order );
+
+		do_action( 'woocommerce_update_order', $order->get_id() );
+	}
+
+	/**
+	 * Helper method that updates all the post meta for an order based on it's settings in the WC_Order class.
+	 *
+	 * @param WC_Order
+	 * @since 3.0.0
+	 */
+	protected function update_post_meta( &$order ) {
+		$updated_props     = array();
+		$id                = $order->get_id();
+		$meta_key_to_props = array(
+			'_order_key'            => 'order_key',
+			'_customer_user'        => 'customer_id',
+			'_payment_method'       => 'payment_method',
+			'_payment_method_title' => 'payment_method_title',
+			'_transaction_id'       => 'transaction_id',
+			'_customer_ip_address'  => 'customer_ip_address',
+			'_customer_user_agent'  => 'customer_user_agent',
+			'_created_via'          => 'created_via',
+			'_date_completed'       => 'date_completed',
+			'_date_paid'            => 'date_paid',
+			'_cart_hash'            => 'cart_hash',
+		);
+
+		$props_to_update = $this->get_props_to_update( $order, $meta_key_to_props );
+
+		foreach ( $props_to_update as $meta_key => $prop ) {
+			$value = $order->{"get_$prop"}( 'edit' );
+
+			if ( 'date_paid' === $prop ) {
+				// In 3.0.x we store this as a UTC timestamp.
+				update_post_meta( $id, $meta_key, ! is_null( $value ) ? $value->getTimestamp() : '' );
+
+				// In 2.6.x date_paid was stored as _paid_date in local mysql format.
+				update_post_meta( $id, '_paid_date', ! is_null( $value ) ? $value->date( 'Y-m-d H:i:s' ) : '' );
+
+			} elseif ( 'date_completed' === $prop ) {
+				// In 3.0.x we store this as a UTC timestamp.
+				update_post_meta( $id, $meta_key, ! is_null( $value ) ? $value->getTimestamp() : '' );
+
+				// In 2.6.x date_paid was stored as _paid_date in local mysql format.
+				update_post_meta( $id, '_completed_date', ! is_null( $value ) ? $value->date( 'Y-m-d H:i:s' ) : '' );
+
+			} else {
+				update_post_meta( $id, $meta_key, $value );
+			}
+
+			$updated_props[] = $prop;
+		}
+
+		$address_props = array(
+			'billing' => array(
+				'_billing_first_name' => 'billing_first_name',
+				'_billing_last_name'  => 'billing_last_name',
+				'_billing_company'    => 'billing_company',
+				'_billing_address_1'  => 'billing_address_1',
+				'_billing_address_2'  => 'billing_address_2',
+				'_billing_city'       => 'billing_city',
+				'_billing_state'      => 'billing_state',
+				'_billing_postcode'   => 'billing_postcode',
+				'_billing_country'    => 'billing_country',
+				'_billing_email'      => 'billing_email',
+				'_billing_phone'      => 'billing_phone',
+			),
+			'shipping' => array(
+				'_shipping_first_name' => 'shipping_first_name',
+				'_shipping_last_name'  => 'shipping_last_name',
+				'_shipping_company'    => 'shipping_company',
+				'_shipping_address_1'  => 'shipping_address_1',
+				'_shipping_address_2'  => 'shipping_address_2',
+				'_shipping_city'       => 'shipping_city',
+				'_shipping_state'      => 'shipping_state',
+				'_shipping_postcode'   => 'shipping_postcode',
+				'_shipping_country'    => 'shipping_country',
+			),
+		);
+
+		foreach ( $address_props as $props_key => $props ) {
+			$props_to_update = $this->get_props_to_update( $order, $props );
+			foreach ( $props_to_update as $meta_key => $prop ) {
+				$value = $order->{"get_$prop"}( 'edit' );
+				update_post_meta( $id, $meta_key, $value );
+				$updated_props[] = $prop;
+				$updated_props[] = $props_key;
+			}
+		}
+
+		parent::update_post_meta( $order );
+
+		// If address changed, store concatenated version to make searches faster.
+		if ( in_array( 'billing', $updated_props ) || ! metadata_exists( 'post', $id, '_billing_address_index' ) ) {
+			update_post_meta( $id, '_billing_address_index', implode( ' ', $order->get_address( 'billing' ) ) );
+		}
+		if ( in_array( 'shipping', $updated_props ) || ! metadata_exists( 'post', $id, '_shipping_address_index' ) ) {
+			update_post_meta( $id, '_shipping_address_index', implode( ' ', $order->get_address( 'shipping' ) ) );
+		}
+
+		// If customer changed, update any downloadable permissions.
+		if ( in_array( 'customer_user', $updated_props ) || in_array( 'billing_email', $updated_props ) ) {
+			$data_store = WC_Data_Store::load( 'customer-download' );
+			$data_store->update_user_by_order_id( $id, $order->get_customer_id(), $order->get_billing_email() );
+		}
+
+		do_action( 'woocommerce_order_object_updated_props', $order, $updated_props );
+	}
+
+	/**
+	 * Excerpt for post.
+	 *
+	 * @param  WC_Order $order
+	 * @return string
+	 */
+	protected function get_post_excerpt( $order ) {
+		return $order->get_customer_note();
+	}
+
+	/**
+	 * Get amount already refunded.
+	 *
+	 * @param  WC_Order
+	 * @return string
+	 */
+	public function get_total_refunded( $order ) {
+		global $wpdb;
+
+		$total = $wpdb->get_var( $wpdb->prepare( "
+			SELECT SUM( postmeta.meta_value )
+			FROM $wpdb->postmeta AS postmeta
+			INNER JOIN $wpdb->posts AS posts ON ( posts.post_type = 'shop_order_refund' AND posts.post_parent = %d )
+			WHERE postmeta.meta_key = '_refund_amount'
+			AND postmeta.post_id = posts.ID
+		", $order->get_id() ) );
+
+		return $total;
+	}
+
+	/**
+	 * Get the total tax refunded.
+	 *
+	 * @param  WC_Order
+	 * @return float
+	 */
+	public function get_total_tax_refunded( $order ) {
+		global $wpdb;
+
+		$total = $wpdb->get_var( $wpdb->prepare( "
+			SELECT SUM( order_itemmeta.meta_value )
+			FROM {$wpdb->prefix}woocommerce_order_itemmeta AS order_itemmeta
+			INNER JOIN $wpdb->posts AS posts ON ( posts.post_type = 'shop_order_refund' AND posts.post_parent = %d )
+			INNER JOIN {$wpdb->prefix}woocommerce_order_items AS order_items ON ( order_items.order_id = posts.ID AND order_items.order_item_type = 'tax' )
+			WHERE order_itemmeta.order_item_id = order_items.order_item_id
+			AND order_itemmeta.meta_key IN ('tax_amount', 'shipping_tax_amount')
+		", $order->get_id() ) );
+
+		return abs( $total );
+	}
+
+	/**
+	 * Get the total shipping refunded.
+	 *
+	 * @param  WC_Order
+	 * @return float
+	 */
+	public function get_total_shipping_refunded( $order ) {
+		global $wpdb;
+
+		$total = $wpdb->get_var( $wpdb->prepare( "
+			SELECT SUM( order_itemmeta.meta_value )
+			FROM {$wpdb->prefix}woocommerce_order_itemmeta AS order_itemmeta
+			INNER JOIN $wpdb->posts AS posts ON ( posts.post_type = 'shop_order_refund' AND posts.post_parent = %d )
+			INNER JOIN {$wpdb->prefix}woocommerce_order_items AS order_items ON ( order_items.order_id = posts.ID AND order_items.order_item_type = 'shipping' )
+			WHERE order_itemmeta.order_item_id = order_items.order_item_id
+			AND order_itemmeta.meta_key IN ('cost')
+		", $order->get_id() ) );
+
+		return abs( $total );
+	}
+
+	/**
+	 * Finds an Order ID based on an order key.
+	 *
+	 * @param string $order_key An order key has generated by
+	 * @return int The ID of an order, or 0 if the order could not be found
+	 */
+	public function get_order_id_by_order_key( $order_key ) {
+		global $wpdb;
+		return $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM {$wpdb->prefix}postmeta WHERE meta_key = '_order_key' AND meta_value = %s", $order_key ) );
+	}
+
+	/**
+	 * Return count of orders with a specific status.
+	 *
+	 * @param  string $status
+	 * @return int
+	 */
+	public function get_order_count( $status ) {
+		global $wpdb;
+		return absint( $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( * ) FROM {$wpdb->posts} WHERE post_type = 'shop_order' AND post_status = %s", $status ) ) );
+	}
+
+	/**
+	 * Get all orders matching the passed in args.
+	 *
+	 * @see    wc_get_orders()
+	 * @param  array $args
+	 * @return array of orders
+	 */
+	public function get_orders( $args = array() ) {
+		/**
+		 * Generate WP_Query args. This logic will change if orders are moved to
+		 * custom tables in the future.
+		 */
+		$wp_query_args = array(
+			'post_type'      => $args['type'] ? $args['type'] : 'shop_order',
+			'post_status'    => $args['status'],
+			'posts_per_page' => $args['limit'],
+			'meta_query'     => array(),
+			'fields'         => 'ids',
+			'orderby'        => $args['orderby'],
+			'order'          => $args['order'],
+		);
+
+		if ( ! is_null( $args['parent'] ) ) {
+			$wp_query_args['post_parent'] = absint( $args['parent'] );
+		}
+
+		if ( ! is_null( $args['offset'] ) ) {
+			$wp_query_args['offset'] = absint( $args['offset'] );
+		} else {
+			$wp_query_args['paged'] = absint( $args['page'] );
+		}
+
+		if ( isset( $args['customer'] ) && '' !== $args['customer'] ) {
+			$values = is_array( $args['customer'] ) ? $args['customer'] : array( $args['customer'] );
+			$wp_query_args['meta_query'][] = $this->get_orders_generate_customer_meta_query( $values );
+		}
+
+		if ( ! empty( $args['exclude'] ) ) {
+			$wp_query_args['post__not_in'] = array_map( 'absint', $args['exclude'] );
+		}
+
+		if ( ! $args['paginate'] ) {
+			$wp_query_args['no_found_rows'] = true;
+		}
+
+		if ( ! empty( $args['date_before'] ) ) {
+			$wp_query_args['date_query']['before'] = $args['date_before'];
+		}
+
+		if ( ! empty( $args['date_after'] ) ) {
+			$wp_query_args['date_query']['after'] = $args['date_after'];
+		}
+
+		// Get results.
+		$orders = new WP_Query( apply_filters( 'woocommerce_order_data_store_cpt_get_orders_query', $wp_query_args, $args, $this ) );
+
+		if ( 'objects' === $args['return'] ) {
+			$return = array_map( 'wc_get_order', $orders->posts );
+		} else {
+			$return = $orders->posts;
+		}
+
+		if ( $args['paginate'] ) {
+			return (object) array(
+				'orders'        => $return,
+				'total'         => $orders->found_posts,
+				'max_num_pages' => $orders->max_num_pages,
+			);
+		} else {
+			return $return;
+		}
+	}
+
+	/**
+	 * Generate meta query for wc_get_orders.
+	 *
+	 * @param  array $values
+	 * @param  string $relation
+	 * @return array
+	 */
+	private function get_orders_generate_customer_meta_query( $values, $relation = 'or' ) {
+		$meta_query = array(
+			'relation' => strtoupper( $relation ),
+			'customer_emails' => array(
+				'key'     => '_billing_email',
+				'value'   => array(),
+				'compare' => 'IN',
+			),
+			'customer_ids' => array(
+				'key'     => '_customer_user',
+				'value'   => array(),
+				'compare' => 'IN',
+			),
+		);
+		foreach ( $values as $value ) {
+			if ( is_array( $value ) ) {
+				$meta_query[] = $this->get_orders_generate_customer_meta_query( $value, 'and' );
+			} elseif ( is_email( $value ) ) {
+				$meta_query['customer_emails']['value'][] = sanitize_email( $value );
+			} else {
+				$meta_query['customer_ids']['value'][] = strval( absint( $value ) );
+			}
+		}
+
+		if ( empty( $meta_query['customer_emails']['value'] ) ) {
+			unset( $meta_query['customer_emails'] );
+			unset( $meta_query['relation'] );
+		}
+
+		if ( empty( $meta_query['customer_ids']['value'] ) ) {
+			unset( $meta_query['customer_ids'] );
+			unset( $meta_query['relation'] );
+		}
+
+		return $meta_query;
+	}
+
+	/**
+	 * Get unpaid orders after a certain date,
+	 *
+	 * @param  int timestamp $date
+	 * @return array
+	 */
+	public function get_unpaid_orders( $date ) {
+		global $wpdb;
+
+		$unpaid_orders = $wpdb->get_col( $wpdb->prepare( "
+			SELECT posts.ID
+			FROM {$wpdb->posts} AS posts
+			WHERE   posts.post_type   IN ('" . implode( "','", wc_get_order_types() ) . "')
+			AND     posts.post_status = 'wc-pending'
+			AND     posts.post_modified < %s
+		", date( 'Y-m-d H:i:s', absint( $date ) ) ) );
+
+		return $unpaid_orders;
+	}
+
+	/**
+	 * Search order data for a term and return ids.
+	 *
+	 * @param  string $term
+	 * @return array of ids
+	 */
+	public function search_orders( $term ) {
+		global $wpdb;
+
+		/**
+		 * Searches on meta data can be slow - this lets you choose what fields to search.
+		 * 3.0.0 added _billing_address and _shipping_address meta which contains all address data to make this faster.
+		 * This however won't work on older orders unless updated, so search a few others (expand this using the filter if needed).
+		 * @var array
+		 */
+		$search_fields = array_map( 'wc_clean', apply_filters( 'woocommerce_shop_order_search_fields', array(
+			'_billing_address_index',
+			'_shipping_address_index',
+			'_billing_last_name',
+			'_billing_email',
+		) ) );
+		$order_ids = array();
+
+		if ( is_numeric( $term ) ) {
+			$order_ids[] = absint( $term );
+		}
+
+		if ( ! empty( $search_fields ) ) {
+			$order_ids = array_unique( array_merge(
+				$order_ids,
+				$wpdb->get_col(
+					$wpdb->prepare( "SELECT DISTINCT p1.post_id FROM {$wpdb->postmeta} p1 WHERE p1.meta_value LIKE '%%%s%%'", $wpdb->esc_like( wc_clean( $term ) ) ) . " AND p1.meta_key IN ('" . implode( "','", array_map( 'esc_sql', $search_fields ) ) . "')"
+				),
+				$wpdb->get_col(
+					$wpdb->prepare( "
+						SELECT order_id
+						FROM {$wpdb->prefix}woocommerce_order_items as order_items
+						WHERE order_item_name LIKE '%%%s%%'
+						",
+						$wpdb->esc_like( wc_clean( $term ) )
+					)
+				)
+			) );
+		}
+
+		return apply_filters( 'woocommerce_shop_order_search_results', $order_ids, $term, $search_fields );
+	}
+
+	/**
+	 * Gets information about whether permissions were generated yet.
+	 *
+	 * @param WC_Order|int $order
+	 * @return bool
+	 */
+	public function get_download_permissions_granted( $order ) {
+		$order_id = WC_Order_Factory::get_order_id( $order );
+		return wc_string_to_bool( get_post_meta( $order_id, '_download_permissions_granted', true ) );
+	}
+
+	/**
+	 * Stores information about whether permissions were generated yet.
+	 *
+	 * @param WC_Order|int $order
+	 * @param bool $set
+	 */
+	public function set_download_permissions_granted( $order, $set ) {
+		$order_id = WC_Order_Factory::get_order_id( $order );
+		update_post_meta( $order_id, '_download_permissions_granted', wc_bool_to_string( $set ) );
+	}
+
+	/**
+	 * Gets information about whether sales were recorded.
+	 *
+	 * @param WC_Order|int $order
+	 * @return bool
+	 */
+	public function get_recorded_sales( $order ) {
+		$order_id = WC_Order_Factory::get_order_id( $order );
+		return wc_string_to_bool( get_post_meta( $order_id, '_recorded_sales', true ) );
+	}
+
+	/**
+	 * Stores information about whether sales were recorded.
+	 *
+	 * @param WC_Order|int $order
+	 * @param bool $set
+	 */
+	public function set_recorded_sales( $order, $set ) {
+		$order_id = WC_Order_Factory::get_order_id( $order );
+		update_post_meta( $order_id, '_recorded_sales', wc_bool_to_string( $set ) );
+	}
+
+	/**
+	 * Gets information about whether coupon counts were updated.
+	 *
+	 * @param WC_Order|int $order
+	 * @return bool
+	 */
+	public function get_recorded_coupon_usage_counts( $order ) {
+		$order_id = WC_Order_Factory::get_order_id( $order );
+		return wc_string_to_bool( get_post_meta( $order_id, '_recorded_coupon_usage_counts', true ) );
+	}
+
+	/**
+	 * Stores information about whether coupon counts were updated.
+	 *
+	 * @param WC_Order|int $order
+	 * @param bool $set
+	 */
+	public function set_recorded_coupon_usage_counts( $order, $set ) {
+		$order_id = WC_Order_Factory::get_order_id( $order );
+		update_post_meta( $order_id, '_recorded_coupon_usage_counts', wc_bool_to_string( $set ) );
+	}
+
+	/**
+	 * Gets information about whether stock was reduced.
+	 *
+	 * @param WC_Order|int $order
+	 * @return bool
+	 */
+	public function get_stock_reduced( $order ) {
+		$order_id = WC_Order_Factory::get_order_id( $order );
+		return wc_string_to_bool( get_post_meta( $order_id, '_order_stock_reduced', true ) );
+	}
+
+	/**
+	 * Stores information about whether stock was reduced.
+	 *
+	 * @param WC_Order|int $order
+	 * @param bool $set
+	 */
+	public function set_stock_reduced( $order, $set ) {
+		$order_id = WC_Order_Factory::get_order_id( $order );
+		update_post_meta( $order_id, '_order_stock_reduced', wc_bool_to_string( $set ) );
+	}
+
+	/**
+	 * Get the order type based on Order ID.
+	 *
+	 * @since 3.0.0
+	 * @param int $order_id
+	 * @return string
+	 */
+	public function get_order_type( $order_id ) {
+		return get_post_type( $order_id );
+	}
+}
diff --git a/includes/data-stores/class-wc-order-item-coupon-data-store.php b/includes/data-stores/class-wc-order-item-coupon-data-store.php
new file mode 100644
index 00000000000..ac2780d20ce
--- /dev/null
+++ b/includes/data-stores/class-wc-order-item-coupon-data-store.php
@@ -0,0 +1,55 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Order Item Coupon Data Store
+ *
+ * @version  3.0.0
+ * @category Class
+ * @author   WooCommerce
+ */
+class WC_Order_Item_Coupon_Data_Store extends Abstract_WC_Order_Item_Type_Data_Store implements WC_Object_Data_Store_Interface, WC_Order_Item_Type_Data_Store_Interface {
+
+	/**
+	 * Data stored in meta keys.
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $internal_meta_keys = array( 'discount_amount', 'discount_amount_tax' );
+
+	/**
+	 * Read/populate data properties specific to this order item.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Order_Item_Coupon $item
+	 */
+	public function read( &$item ) {
+		parent::read( $item );
+		$id = $item->get_id();
+		$item->set_props( array(
+			'discount'     => get_metadata( 'order_item', $id, 'discount_amount', true ),
+			'discount_tax' => get_metadata( 'order_item', $id, 'discount_amount_tax', true ),
+		) );
+		$item->set_object_read( true );
+	}
+
+	/**
+	 * Saves an item's data to the database / item meta.
+	 * Ran after both create and update, so $item->get_id() will be set.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Order_Item_Coupon $item
+	 */
+	public function save_item_data( &$item ) {
+		$id          = $item->get_id();
+		$save_values = array(
+			'discount_amount'     => $item->get_discount( 'edit' ),
+			'discount_amount_tax' => $item->get_discount_tax( 'edit' ),
+		);
+		foreach ( $save_values as $key => $value ) {
+			update_metadata( 'order_item', $id, $key, $value );
+		}
+	}
+}
diff --git a/includes/data-stores/class-wc-order-item-data-store.php b/includes/data-stores/class-wc-order-item-data-store.php
new file mode 100644
index 00000000000..36bbbaf647a
--- /dev/null
+++ b/includes/data-stores/class-wc-order-item-data-store.php
@@ -0,0 +1,149 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Order Item Data Store: Misc Order Item Data functions.
+ *
+ * @version  3.0.0
+ * @category Class
+ * @author   WooCommerce
+ */
+class WC_Order_Item_Data_Store implements WC_Order_Item_Data_Store_Interface {
+
+	/**
+	 * Add an order item to an order.
+	 *
+	 * @since  3.0.0
+	 * @param  int   $order_id
+	 * @param  array $item order_item_name and order_item_type.
+	 * @return int Order Item ID
+	 */
+	public function add_order_item( $order_id, $item ) {
+		global $wpdb;
+		$wpdb->insert(
+			$wpdb->prefix . "woocommerce_order_items",
+			array(
+				'order_item_name'       => $item['order_item_name'],
+				'order_item_type'       => $item['order_item_type'],
+				'order_id'              => $order_id,
+			),
+			array(
+				'%s',
+				'%s',
+				'%d',
+			)
+		);
+
+		return absint( $wpdb->insert_id );
+	}
+
+	/**
+	 * Update an order item.
+	 *
+	 * @since  3.0.0
+	 * @param  int   $item_id
+	 * @param  array $item order_item_name or order_item_type.
+	 * @return boolean
+	 */
+	public function update_order_item( $item_id, $item ) {
+		global $wpdb;
+		return $wpdb->update( $wpdb->prefix . 'woocommerce_order_items', $item, array( 'order_item_id' => $item_id ) );
+	}
+
+	/**
+	 * Delete an order item.
+	 *
+	 * @since  3.0.0
+	 * @param  int   $item_id
+	 */
+	public function delete_order_item( $item_id ) {
+		global $wpdb;
+		$wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->prefix}woocommerce_order_items WHERE order_item_id = %d", $item_id ) );
+		$wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->prefix}woocommerce_order_itemmeta WHERE order_item_id = %d", $item_id ) );
+	}
+
+	/**
+	 * Update term meta.
+	 *
+	 * @since  3.0.0
+	 * @param  int    $item_id
+	 * @param  string $meta_key
+	 * @param  mixed  $meta_value
+	 * @param  string $prev_value (default: '')
+	 * @return bool
+	 */
+	public function update_metadata( $item_id, $meta_key, $meta_value, $prev_value = '' ) {
+		return update_metadata( 'order_item', $item_id, $meta_key, $meta_value, $prev_value );
+	}
+
+	/**
+	 * Add term meta.
+	 *
+	 * @since  3.0.0
+	 * @param  int    $item_id
+	 * @param  string $meta_key
+	 * @param  mixed  $meta_value
+	 * @param  bool   $unique (default: false)
+	 * @return int    New row ID or 0
+	 */
+	public function add_metadata( $item_id, $meta_key, $meta_value, $unique = false ) {
+		return add_metadata( 'order_item', $item_id, $meta_key, $meta_value, $unique );
+	}
+
+	/**
+	 * Delete term meta.
+	 *
+	 * @since  3.0.0
+	 * @param  int    $item_id
+	 * @param  string $meta_key
+	 * @param  string $meta_value (default: '')
+	 * @param  bool   $delete_all (default: false)
+	 * @return bool
+	 */
+	public function delete_metadata( $item_id, $meta_key, $meta_value = '', $delete_all = false ) {
+		return delete_metadata( 'order_item', $item_id, $meta_key, $meta_value, $delete_all );
+	}
+
+	/**
+	 * Get term meta.
+	 *
+	 * @since  3.0.0
+	 * @param  int    $item_id
+	 * @param  string $key
+	 * @param  bool   $single (default: true)
+	 * @return mixed
+	 */
+	public function get_metadata( $item_id, $key, $single = true ) {
+		return get_metadata( 'order_item', $item_id, $key, $single );
+	}
+
+	/**
+	 * Get order ID by order item ID.
+	 *
+	 * @since 3.0.0
+	 * @param  int $item_id
+	 * @return int
+	 */
+	function get_order_id_by_order_item_id( $item_id ) {
+		global $wpdb;
+		return (int) $wpdb->get_var( $wpdb->prepare(
+			"SELECT order_id FROM {$wpdb->prefix}woocommerce_order_items WHERE order_item_id = %d",
+			$item_id
+		) );
+	}
+
+	/**
+	 * Get the order item type based on Item ID.
+	 *
+	 * @since 3.0.0
+	 * @param int $item_id
+	 * @return string
+	 */
+	public function get_order_item_type( $item_id ) {
+		global $wpdb;
+		$item_data = $wpdb->get_row( $wpdb->prepare( "SELECT order_item_type FROM {$wpdb->prefix}woocommerce_order_items WHERE order_item_id = %d LIMIT 1;", $item_id ) );
+		return $item_data->order_item_type;
+	}
+}
diff --git a/includes/data-stores/class-wc-order-item-fee-data-store.php b/includes/data-stores/class-wc-order-item-fee-data-store.php
new file mode 100644
index 00000000000..6f748dde876
--- /dev/null
+++ b/includes/data-stores/class-wc-order-item-fee-data-store.php
@@ -0,0 +1,60 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Order Item Fee Data Store
+ *
+ * @version  3.0.0
+ * @category Class
+ * @author   WooCommerce
+ */
+class WC_Order_Item_Fee_Data_Store extends Abstract_WC_Order_Item_Type_Data_Store implements WC_Object_Data_Store_Interface, WC_Order_Item_Type_Data_Store_Interface {
+
+	/**
+	 * Data stored in meta keys.
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $internal_meta_keys = array( '_tax_class', '_tax_status', '_line_subtotal', '_line_subtotal_tax', '_line_total', '_line_tax', '_line_tax_data' );
+
+	/**
+	 * Read/populate data properties specific to this order item.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Order_Item_Fee $item
+	 */
+	public function read( &$item ) {
+		parent::read( $item );
+		$id = $item->get_id();
+		$item->set_props( array(
+			'tax_class'  => get_metadata( 'order_item', $id, '_tax_class', true ),
+			'tax_status' => get_metadata( 'order_item', $id, '_tax_status', true ),
+			'total'      => get_metadata( 'order_item', $id, '_line_total', true ),
+			'taxes'      => get_metadata( 'order_item', $id, '_line_tax_data', true ),
+		) );
+		$item->set_object_read( true );
+	}
+
+	/**
+	 * Saves an item's data to the database / item meta.
+	 * Ran after both create and update, so $id will be set.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Order_Item_Fee $item
+	 */
+	public function save_item_data( &$item ) {
+		$id          = $item->get_id();
+		$save_values = array(
+			'_tax_class'     => $item->get_tax_class( 'edit' ),
+			'_tax_status'    => $item->get_tax_status( 'edit' ),
+			'_line_total'    => $item->get_total( 'edit' ),
+			'_line_tax'      => $item->get_total_tax( 'edit' ),
+			'_line_tax_data' => $item->get_taxes( 'edit' ),
+		);
+		foreach ( $save_values as $key => $value ) {
+			update_metadata( 'order_item', $id, $key, $value );
+		}
+	}
+}
diff --git a/includes/data-stores/class-wc-order-item-product-store.php b/includes/data-stores/class-wc-order-item-product-store.php
new file mode 100644
index 00000000000..f7f8025b640
--- /dev/null
+++ b/includes/data-stores/class-wc-order-item-product-store.php
@@ -0,0 +1,87 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Order Item Product Data Store
+ *
+ * @version  3.0.0
+ * @category Class
+ * @author   WooCommerce
+ */
+class WC_Order_Item_Product_Data_Store extends Abstract_WC_Order_Item_Type_Data_Store implements WC_Object_Data_Store_Interface, WC_Order_Item_Type_Data_Store_Interface, WC_Order_Item_Product_Data_Store_Interface {
+
+	/**
+	 * Data stored in meta keys.
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $internal_meta_keys = array( '_product_id', '_variation_id', '_qty', '_tax_class', '_line_subtotal', '_line_subtotal_tax', '_line_total', '_line_tax', '_line_tax_data' );
+
+	/**
+	 * Read/populate data properties specific to this order item.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Order_Item_Product $item
+	 */
+	public function read( &$item ) {
+		parent::read( $item );
+		$id = $item->get_id();
+		$item->set_props( array(
+			'product_id'   => get_metadata( 'order_item', $id, '_product_id', true ),
+			'variation_id' => get_metadata( 'order_item', $id, '_variation_id', true ),
+			'quantity'     => get_metadata( 'order_item', $id, '_qty', true ),
+			'tax_class'    => get_metadata( 'order_item', $id, '_tax_class', true ),
+			'subtotal'     => get_metadata( 'order_item', $id, '_line_subtotal', true ),
+			'total'        => get_metadata( 'order_item', $id, '_line_total', true ),
+			'taxes'        => get_metadata( 'order_item', $id, '_line_tax_data', true ),
+		) );
+		$item->set_object_read( true );
+	}
+
+	/**
+	 * Saves an item's data to the database / item meta.
+	 * Ran after both create and update, so $id will be set.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Order_Item_Product $item
+	 */
+	public function save_item_data( &$item ) {
+		$id          = $item->get_id();
+		$save_values = array(
+			'_product_id'        => $item->get_product_id( 'edit' ),
+			'_variation_id'      => $item->get_variation_id( 'edit' ),
+			'_qty'               => $item->get_quantity( 'edit' ),
+			'_tax_class'         => $item->get_tax_class( 'edit' ),
+			'_line_subtotal'     => $item->get_subtotal( 'edit' ),
+			'_line_subtotal_tax' => $item->get_subtotal_tax( 'edit' ),
+			'_line_total'        => $item->get_total( 'edit' ),
+			'_line_tax'          => $item->get_total_tax( 'edit' ),
+			'_line_tax_data'     => $item->get_taxes( 'edit' ),
+		);
+		foreach ( $save_values as $key => $value ) {
+			update_metadata( 'order_item', $id, $key, $value );
+		}
+	}
+
+	/**
+	 * Get a list of download IDs for a specific item from an order.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Order_Item_Product $item
+	 * @param WC_Order $order
+	 * @return array
+	 */
+	public function get_download_ids( $item, $order ) {
+		global $wpdb;
+		return $wpdb->get_col(
+			$wpdb->prepare(
+				"SELECT download_id FROM {$wpdb->prefix}woocommerce_downloadable_product_permissions WHERE user_email = %s AND order_key = %s AND product_id = %d ORDER BY permission_id",
+				$order->get_billing_email(),
+				$order->get_order_key(),
+				$item->get_variation_id() ? $item->get_variation_id() : $item->get_product_id()
+			)
+		);
+	}
+}
diff --git a/includes/data-stores/class-wc-order-item-shipping-data-store.php b/includes/data-stores/class-wc-order-item-shipping-data-store.php
new file mode 100644
index 00000000000..48cd5b8c53d
--- /dev/null
+++ b/includes/data-stores/class-wc-order-item-shipping-data-store.php
@@ -0,0 +1,58 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Order Item Shipping Data Store
+ *
+ * @version  3.0.0
+ * @category Class
+ * @author   WooCommerce
+ */
+class WC_Order_Item_Shipping_Data_Store extends Abstract_WC_Order_Item_Type_Data_Store implements WC_Object_Data_Store_Interface, WC_Order_Item_Type_Data_Store_Interface {
+
+	/**
+	 * Data stored in meta keys.
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $internal_meta_keys = array( 'method_id', 'cost', 'total_tax', 'taxes' );
+
+	/**
+	 * Read/populate data properties specific to this order item.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Order_Item_Shipping $item
+	 */
+	public function read( &$item ) {
+		parent::read( $item );
+		$id = $item->get_id();
+		$item->set_props( array(
+			'method_id' => get_metadata( 'order_item', $id, 'method_id', true ),
+			'total'     => get_metadata( 'order_item', $id, 'cost', true ),
+			'taxes'     => get_metadata( 'order_item', $id, 'taxes', true ),
+		) );
+		$item->set_object_read( true );
+	}
+
+	/**
+	 * Saves an item's data to the database / item meta.
+	 * Ran after both create and update, so $id will be set.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Order_Item_Shipping $item
+	 */
+	public function save_item_data( &$item ) {
+		$id          = $item->get_id();
+		$save_values = array(
+			'method_id' => $item->get_method_id( 'edit' ),
+			'cost'      => $item->get_total( 'edit' ),
+			'total_tax' => $item->get_total_tax( 'edit' ),
+			'taxes'     => $item->get_taxes( 'edit' ),
+		);
+		foreach ( $save_values as $key => $value ) {
+			update_metadata( 'order_item', $id, $key, $value );
+		}
+	}
+}
diff --git a/includes/data-stores/class-wc-order-item-tax-data-store.php b/includes/data-stores/class-wc-order-item-tax-data-store.php
new file mode 100644
index 00000000000..5619143ddc5
--- /dev/null
+++ b/includes/data-stores/class-wc-order-item-tax-data-store.php
@@ -0,0 +1,61 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Order Item Tax Data Store
+ *
+ * @version  3.0.0
+ * @category Class
+ * @author   WooCommerce
+ */
+class WC_Order_Item_Tax_Data_Store extends Abstract_WC_Order_Item_Type_Data_Store implements WC_Object_Data_Store_Interface, WC_Order_Item_Type_Data_Store_Interface {
+
+	/**
+	 * Data stored in meta keys.
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $internal_meta_keys = array( 'rate_id', 'label', 'compound', 'tax_amount', 'shipping_tax_amount' );
+
+	/**
+	 * Read/populate data properties specific to this order item.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Order_Item_Tax $item
+	 */
+	public function read( &$item ) {
+		parent::read( $item );
+		$id = $item->get_id();
+		$item->set_props( array(
+			'rate_id'            => get_metadata( 'order_item', $id, 'rate_id', true ),
+			'label'              => get_metadata( 'order_item', $id, 'label', true ),
+			'compound'           => get_metadata( 'order_item', $id, 'compound', true ),
+			'tax_total'          => get_metadata( 'order_item', $id, 'tax_amount', true ),
+			'shipping_tax_total' => get_metadata( 'order_item', $id, 'shipping_tax_amount', true ),
+		) );
+		$item->set_object_read( true );
+	}
+
+	/**
+	 * Saves an item's data to the database / item meta.
+	 * Ran after both create and update, so $id will be set.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Order_Item_Tax $item
+	 */
+	public function save_item_data( &$item ) {
+		$id          = $item->get_id();
+		$save_values = array(
+			'rate_id'             => $item->get_rate_id( 'edit' ),
+			'label'               => $item->get_label( 'edit' ),
+			'compound'            => $item->get_compound( 'edit' ),
+			'tax_amount'          => $item->get_tax_total( 'edit' ),
+			'shipping_tax_amount' => $item->get_shipping_tax_total( 'edit' ),
+		);
+		foreach ( $save_values as $key => $value ) {
+			update_metadata( 'order_item', $id, $key, $value );
+		}
+	}
+}
diff --git a/includes/data-stores/class-wc-order-refund-data-store-cpt.php b/includes/data-stores/class-wc-order-refund-data-store-cpt.php
new file mode 100644
index 00000000000..2a299064124
--- /dev/null
+++ b/includes/data-stores/class-wc-order-refund-data-store-cpt.php
@@ -0,0 +1,104 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Order Refund Data Store: Stored in CPT.
+ *
+ * @version  3.0.0
+ * @category Class
+ * @author   WooThemes
+ */
+class WC_Order_Refund_Data_Store_CPT extends Abstract_WC_Order_Data_Store_CPT implements WC_Object_Data_Store_Interface, WC_Order_Refund_Data_Store_Interface {
+
+	/**
+	 * Data stored in meta keys, but not considered "meta" for an order.
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $internal_meta_keys = array(
+		'_order_currency',
+		'_cart_discount',
+		'_refund_amount',
+		'_refunded_by',
+		'_refund_reason',
+		'_cart_discount_tax',
+		'_order_shipping',
+		'_order_shipping_tax',
+		'_order_tax',
+		'_order_total',
+		'_order_version',
+		'_prices_include_tax',
+		'_payment_tokens',
+	);
+
+	/**
+	 * Delete a refund - no trash is supported.
+	 * @param WC_Order $order
+	 * @param array $args Array of args to pass to the delete method.
+	 */
+	public function delete( &$order, $args = array() ) {
+		$id = $order->get_id();
+
+		wp_delete_post( $id );
+		$order->set_id( 0 );
+		do_action( 'woocommerce_delete_order_refund', $id );
+	}
+
+	/**
+	 * Read refund data. Can be overridden by child classes to load other props.
+	 *
+	 * @param WC_Order $refund
+	 * @param object $post_object
+	 * @since 3.0.0
+	 */
+	protected function read_order_data( &$refund, $post_object ) {
+		parent::read_order_data( $refund, $post_object );
+		$id = $refund->get_id();
+		$refund->set_props( array(
+			'amount'      => get_post_meta( $id, '_refund_amount', true ),
+			'refunded_by' => metadata_exists( 'post', $id, '_refunded_by' ) ? get_post_meta( $id, '_refunded_by', true ) : absint( $post_object->post_author ),
+			'reason'      => metadata_exists( 'post', $id, '_refund_reason' ) ? get_post_meta( $id, '_refund_reason', true ) : $post_object->post_excerpt,
+		) );
+	}
+
+	/**
+	 * Helper method that updates all the post meta for an order based on it's settings in the WC_Order class.
+	 *
+	 * @param WC_Order
+	 * @param WC_Order $refund
+	 * @since 3.0.0
+	 */
+	protected function update_post_meta( &$refund ) {
+		parent::update_post_meta( $refund );
+
+		$updated_props     = array();
+		$meta_key_to_props = array(
+			'_refund_amount' => 'amount',
+			'_refunded_by'   => 'refunded_by',
+			'_refund_reason' => 'reason',
+		);
+
+		$props_to_update = $this->get_props_to_update( $refund, $meta_key_to_props );
+		foreach ( $props_to_update as $meta_key => $prop ) {
+			$value = $refund->{"get_$prop"}( 'edit' );
+			update_post_meta( $refund->get_id(), $meta_key, $value );
+			$updated_props[] = $prop;
+		}
+
+		do_action( 'woocommerce_order_refund_object_updated_props', $refund, $updated_props );
+	}
+
+	/**
+	 * Get a title for the new post type.
+	 *
+	 * @return string
+	 */
+	protected function get_post_title() {
+		// @codingStandardsIgnoreStart
+		/* translators: %s: Order date */
+		return sprintf( __( 'Refund &ndash; %s', 'woocommerce' ), strftime( _x( '%b %d, %Y @ %I:%M %p', 'Order date parsed by strftime', 'woocommerce' ) ) );
+		// @codingStandardsIgnoreEnd
+	}
+}
diff --git a/includes/data-stores/class-wc-payment-token-data-store.php b/includes/data-stores/class-wc-payment-token-data-store.php
new file mode 100644
index 00000000000..c6e72017019
--- /dev/null
+++ b/includes/data-stores/class-wc-payment-token-data-store.php
@@ -0,0 +1,327 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Payment Token Data Store: Custom Table.
+ *
+ * @version  3.0.0
+ * @category Class
+ * @author   WooThemes
+ */
+class WC_Payment_Token_Data_Store extends WC_Data_Store_WP implements WC_Payment_Token_Data_Store_Interface, WC_Object_Data_Store_Interface {
+
+	/**
+	 * Meta type. Payment tokens are a new object type.
+	 * @var string
+	 */
+	protected $meta_type = 'payment_token';
+
+	/**
+	 * If we have already saved our extra data, don't do automatic / default handling.
+	 */
+	protected $extra_data_saved = false;
+
+	/**
+	 * Create a new payment token in the database.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Payment_Token $token
+	 */
+	public function create( &$token ) {
+		if ( false === $token->validate() ) {
+			throw new Exception( __( 'Invalid or missing payment token fields.', 'woocommerce' ) );
+		}
+
+		global $wpdb;
+		if ( ! $token->is_default() && $token->get_user_id() > 0 ) {
+			$default_token = WC_Payment_Tokens::get_customer_default_token( $token->get_user_id() );
+			if ( is_null( $default_token ) ) {
+				$token->set_default( true );
+			}
+		}
+
+		$payment_token_data = array(
+			'gateway_id' => $token->get_gateway_id( 'edit' ),
+			'token'      => $token->get_token( 'edit' ),
+			'user_id'    => $token->get_user_id( 'edit' ),
+			'type'       => $token->get_type( 'edit' ),
+		);
+
+		$wpdb->insert( $wpdb->prefix . 'woocommerce_payment_tokens', $payment_token_data );
+		$token_id = $wpdb->insert_id;
+		$token->set_id( $token_id );
+		$this->save_extra_data( $token, true );
+		$token->save_meta_data();
+		$token->apply_changes();
+
+		// Make sure all other tokens are not set to default
+		if ( $token->is_default() && $token->get_user_id() > 0 ) {
+			WC_Payment_Tokens::set_users_default( $token->get_user_id(), $token_id );
+		}
+
+		do_action( 'woocommerce_new_payment_token', $token_id );
+	}
+
+	/**
+	 * Update a payment token.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Payment_Token $token
+	 */
+	public function update( &$token ) {
+		if ( false === $token->validate() ) {
+			throw new Exception( __( 'Invalid or missing payment token fields.', 'woocommerce' ) );
+		}
+
+		global $wpdb;
+
+		$updated_props      = array();
+		$core_props         = array( 'gateway_id', 'token', 'user_id', 'type' );
+		$changed_props      = array_keys( $token->get_changes() );
+
+		foreach ( $changed_props as $prop ) {
+			if ( ! in_array( $prop, $core_props ) ) {
+				continue;
+			}
+			$updated_props[]             = $prop;
+			$payment_token_data[ $prop ] = $token->{"get_" . $prop}( 'edit' );
+		}
+
+		if ( ! empty( $payment_token_data ) ) {
+			$wpdb->update(
+				$wpdb->prefix . 'woocommerce_payment_tokens',
+				$payment_token_data,
+				array( 'token_id' => $token->get_id( 'edit' ) )
+			);
+		}
+
+		$updated_extra_props = $this->save_extra_data( $token );
+		$updated_props       = array_merge( $updated_props, $updated_extra_props );
+		$token->save_meta_data();
+		$token->apply_changes();
+
+		// Make sure all other tokens are not set to default
+		if ( $token->is_default() && $token->get_user_id() > 0 ) {
+			WC_Payment_Tokens::set_users_default( $token->get_user_id(), $token->get_id() );
+		}
+
+		do_action( 'woocommerce_payment_token_object_updated_props', $token, $updated_props );
+		do_action( 'woocommerce_payment_token_updated', $token->get_id() );
+	}
+
+	/**
+	 * Remove a payment token from the database.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Payment_Token $token
+	 * @param bool $force_delete
+	 */
+	public function delete( &$token, $force_delete = false ) {
+		global $wpdb;
+		$wpdb->delete( $wpdb->prefix . 'woocommerce_payment_tokens', array( 'token_id' => $token->get_id() ), array( '%d' ) );
+		$wpdb->delete( $wpdb->prefix . 'woocommerce_payment_tokenmeta', array( 'payment_token_id' => $token->get_id() ), array( '%d' ) );
+		do_action( 'woocommerce_payment_token_deleted', $token->get_id(), $token );
+	}
+
+	/**
+	 * Read a token from the database.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Payment_Token $token
+	 */
+	public function read( &$token ) {
+		global $wpdb;
+		if ( $data = $wpdb->get_row( $wpdb->prepare( "SELECT token, user_id, gateway_id, is_default FROM {$wpdb->prefix}woocommerce_payment_tokens WHERE token_id = %d LIMIT 1;", $token->get_id() ) ) ) {
+			$token->set_props( array(
+				'token'      => $data->token,
+				'user_id'    => $data->user_id,
+				'gateway_id' => $data->gateway_id,
+				'default'    => $data->is_default,
+			) );
+			$this->read_extra_data( $token );
+			$token->read_meta_data();
+			$token->set_object_read( true );
+			do_action( 'woocommerce_payment_token_loaded', $token );
+		} else {
+			throw new Exception( __( 'Invalid payment token.', 'woocommerce' ) );
+		}
+	}
+
+	/**
+	 * Read extra data associated with the token (like last4 digits of a card for expiry dates).
+	 *
+	 * @param WC_Payment_Token
+	 * @since 3.0.0
+	 */
+	protected function read_extra_data( &$token ) {
+		foreach ( $token->get_extra_data_keys() as $key ) {
+			$function = 'set_' . $key;
+			if ( is_callable( array( $token, $function ) ) ) {
+				$token->{$function}( get_metadata( 'payment_token', $token->get_id(), $key, true ) );
+			}
+		}
+	}
+
+	/**
+	 * Saves extra token data as meta.
+	 *
+	 * @since 3.0.0
+	 * @param $token WC_Token
+	 * @param $force bool
+	 * @return array List of updated props.
+	 */
+	protected function save_extra_data( &$token, $force = false ) {
+		if ( $this->extra_data_saved ) {
+			return array();
+		}
+
+		$updated_props     = array();
+		$extra_data_keys   = $token->get_extra_data_keys();
+		$meta_key_to_props = ! empty( $extra_data_keys ) ? array_combine( $extra_data_keys, $extra_data_keys ) : array();
+		$props_to_update   = $force ? $meta_key_to_props : $this->get_props_to_update( $token, $meta_key_to_props );
+
+		foreach ( $extra_data_keys as $key ) {
+			if ( ! array_key_exists( $key, $props_to_update ) ) {
+				continue;
+			}
+			$function = 'get_' . $key;
+			if ( is_callable( array( $token, $function ) ) ) {
+				if ( update_metadata( 'payment_token', $token->get_id(), $key, $token->{$function}( 'edit' ) ) ) {
+					$updated_props[] = $key;
+				}
+			}
+		}
+
+		return $updated_props;
+	}
+
+	/**
+	 * Returns an array of objects (stdObject) matching specific token critera.
+	 * Accepts token_id, user_id, gateway_id, and type.
+	 * Each object should contain the fields token_id, gateway_id, token, user_id, type, is_default.
+	 *
+	 * @since 3.0.0
+	 * @param array $args
+	 * @return array
+	 */
+	public function get_tokens( $args ) {
+		global $wpdb;
+		$args = wp_parse_args( $args, array(
+			'token_id'   => '',
+			'user_id'    => '',
+			'gateway_id' => '',
+			'type'       => '',
+		) );
+
+		$sql   = "SELECT * FROM {$wpdb->prefix}woocommerce_payment_tokens";
+		$where = array( '1=1' );
+
+		if ( $args['token_id'] ) {
+			$token_ids = array_map( 'absint', is_array( $args['token_id'] ) ? $args['token_id'] : array( $args['token_id'] ) );
+			$where[]   = "token_id IN ('" . implode( "','", array_map( 'esc_sql', $token_ids ) ) . "')";
+		}
+
+		if ( $args['user_id'] ) {
+			$where[] = $wpdb->prepare( 'user_id = %d', absint( $args['user_id'] ) );
+		}
+
+		if ( $args['gateway_id'] ) {
+			$gateway_ids = array( $args['gateway_id'] );
+		} else {
+			$gateways    = WC_Payment_Gateways::instance();
+			$gateway_ids = $gateways->get_payment_gateway_ids();
+		}
+
+		$gateway_ids[] = '';
+		$where[]       = "gateway_id IN ('" . implode( "','", array_map( 'esc_sql', $gateway_ids ) ) . "')";
+
+		if ( $args['type'] ) {
+			$where[] = $wpdb->prepare( 'type = %s', $args['type'] );
+		}
+
+		$token_results = $wpdb->get_results( $sql . ' WHERE ' . implode( ' AND ', $where ) );
+
+		return $token_results;
+	}
+
+	/**
+	 * Returns an stdObject of a token for a user's default token.
+	 * Should contain the fields token_id, gateway_id, token, user_id, type, is_default.
+	 *
+	 * @since 3.0.0
+	 * @param id $user_id
+	 * @return object
+	 */
+	public function get_users_default_token( $user_id ) {
+		global $wpdb;
+		return $wpdb->get_row( $wpdb->prepare(
+			"SELECT * FROM {$wpdb->prefix}woocommerce_payment_tokens WHERE user_id = %d AND is_default = 1",
+			$user_id
+		) );
+	}
+
+	/**
+	 * Returns an stdObject of a token.
+	 * Should contain the fields token_id, gateway_id, token, user_id, type, is_default.
+	 *
+	 * @since 3.0.0
+	 * @param id $token_id
+	 * @return object
+	 */
+	public function get_token_by_id( $token_id ) {
+		global $wpdb;
+		return $wpdb->get_row( $wpdb->prepare(
+			"SELECT * FROM {$wpdb->prefix}woocommerce_payment_tokens WHERE token_id = %d",
+			$token_id
+		) );
+	}
+
+	/**
+	 * Returns metadata for a specific payment token.
+	 *
+	 * @since 3.0.0
+	 * @param id $token_id
+	 * @return array
+	 */
+	public function get_metadata( $token_id ) {
+		return get_metadata( 'payment_token', $token_id );
+	}
+
+	/**
+	 * Get a token's type by ID.
+	 *
+	 * @since 3.0.0
+	 * @param id $token_id
+	 * @return string
+	 */
+	public function get_token_type_by_id( $token_id ) {
+		global $wpdb;
+		return $wpdb->get_var( $wpdb->prepare(
+			"SELECT type FROM {$wpdb->prefix}woocommerce_payment_tokens WHERE token_id = %d",
+			$token_id
+		) );
+	}
+
+	/**
+	 * Update's a tokens default status in the database. Used for quickly
+	 * looping through tokens and setting their statuses instead of creating a bunch
+	 * of objects.
+	 *
+	 * @since 3.0.0
+	 * @param id $token_id
+	 * @return string
+	 */
+	public function set_default_status( $token_id, $status = true ) {
+		global $wpdb;
+		$wpdb->update(
+			$wpdb->prefix . 'woocommerce_payment_tokens',
+			array( 'is_default' => $status ),
+			array(
+				'token_id' => $token_id,
+			)
+		);
+	}
+
+}
diff --git a/includes/data-stores/class-wc-product-data-store-cpt.php b/includes/data-stores/class-wc-product-data-store-cpt.php
new file mode 100644
index 00000000000..1582303fb90
--- /dev/null
+++ b/includes/data-stores/class-wc-product-data-store-cpt.php
@@ -0,0 +1,1344 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Product Data Store: Stored in CPT.
+ *
+ * @version  3.0.0
+ * @category Class
+ * @author   WooThemes
+ */
+class WC_Product_Data_Store_CPT extends WC_Data_Store_WP implements WC_Object_Data_Store_Interface, WC_Product_Data_Store_Interface {
+
+	/**
+	 * Data stored in meta keys, but not considered "meta".
+	 *
+	 * @since 3.0.0
+	 * @var array
+	 */
+	protected $internal_meta_keys = array(
+		'_visibility',
+		'_sku',
+		'_price',
+		'_regular_price',
+		'_sale_price',
+		'_sale_price_dates_from',
+		'_sale_price_dates_to',
+		'total_sales',
+		'_tax_status',
+		'_tax_class',
+		'_manage_stock',
+		'_stock',
+		'_stock_status',
+		'_backorders',
+		'_sold_individually',
+		'_weight',
+		'_length',
+		'_width',
+		'_height',
+		'_upsell_ids',
+		'_crosssell_ids',
+		'_purchase_note',
+		'_default_attributes',
+		'_product_attributes',
+		'_virtual',
+		'_downloadable',
+		'_featured',
+		'_downloadable_files',
+		'_wc_rating_count',
+		'_wc_average_rating',
+		'_wc_review_count',
+		'_variation_description',
+		'_thumbnail_id',
+		'_file_paths',
+		'_product_image_gallery',
+		'_product_version',
+		'_wp_old_slug',
+		'_edit_last',
+		'_edit_lock',
+	);
+
+	/**
+	 * If we have already saved our extra data, don't do automatic / default handling.
+	 */
+	protected $extra_data_saved = false;
+
+	/**
+	 * Stores updated props.
+	 * @var array
+	 */
+	protected $updated_props = array();
+
+	/*
+	|--------------------------------------------------------------------------
+	| CRUD Methods
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Method to create a new product in the database.
+	 *
+	 * @param WC_Product
+	 */
+	public function create( &$product ) {
+		if ( ! $product->get_date_created() ) {
+			$product->set_date_created( current_time( 'timestamp', true ) );
+		}
+
+		$id = wp_insert_post( apply_filters( 'woocommerce_new_product_data', array(
+			'post_type'      => 'product',
+			'post_status'    => $product->get_status() ? $product->get_status() : 'publish',
+			'post_author'    => get_current_user_id(),
+			'post_title'     => $product->get_name() ? $product->get_name() : __( 'Product', 'woocommerce' ),
+			'post_content'   => $product->get_description(),
+			'post_excerpt'   => $product->get_short_description(),
+			'post_parent'    => $product->get_parent_id(),
+			'comment_status' => $product->get_reviews_allowed() ? 'open' : 'closed',
+			'ping_status'    => 'closed',
+			'menu_order'     => $product->get_menu_order(),
+			'post_date'      => gmdate( 'Y-m-d H:i:s', $product->get_date_created( 'edit' )->getOffsetTimestamp() ),
+			'post_date_gmt'  => gmdate( 'Y-m-d H:i:s', $product->get_date_created( 'edit' )->getTimestamp() ),
+			'post_name'      => $product->get_slug( 'edit' ),
+		) ), true );
+
+		if ( $id && ! is_wp_error( $id ) ) {
+			$product->set_id( $id );
+
+			$this->update_post_meta( $product, true );
+			$this->update_terms( $product, true );
+			$this->update_visibility( $product, true );
+			$this->update_attributes( $product, true );
+			$this->update_version_and_type( $product );
+			$this->handle_updated_props( $product );
+
+			$product->save_meta_data();
+			$product->apply_changes();
+
+			$this->clear_caches( $product );
+
+			do_action( 'woocommerce_new_product', $id );
+		}
+	}
+
+	/**
+	 * Method to read a product from the database.
+	 * @param WC_Product
+	 */
+	public function read( &$product ) {
+		$product->set_defaults();
+
+		if ( ! $product->get_id() || ! ( $post_object = get_post( $product->get_id() ) ) || 'product' !== $post_object->post_type ) {
+			throw new Exception( __( 'Invalid product.', 'woocommerce' ) );
+		}
+
+		$id = $product->get_id();
+
+		$product->set_props( array(
+			'name'              => $post_object->post_title,
+			'slug'              => $post_object->post_name,
+			'date_created'      => 0 < $post_object->post_date_gmt ? wc_string_to_timestamp( $post_object->post_date_gmt ) : null,
+			'date_modified'     => 0 < $post_object->post_modified_gmt ? wc_string_to_timestamp( $post_object->post_modified_gmt ) : null,
+			'status'            => $post_object->post_status,
+			'description'       => $post_object->post_content,
+			'short_description' => $post_object->post_excerpt,
+			'parent_id'         => $post_object->post_parent,
+			'menu_order'        => $post_object->menu_order,
+			'reviews_allowed'   => 'open' === $post_object->comment_status,
+		) );
+
+		$this->read_attributes( $product );
+		$this->read_downloads( $product );
+		$this->read_visibility( $product );
+		$this->read_product_data( $product );
+		$this->read_extra_data( $product );
+		$product->set_object_read( true );
+	}
+
+	/**
+	 * Method to update a product in the database.
+	 *
+	 * @param WC_Product
+	 */
+	public function update( &$product ) {
+		$product->save_meta_data();
+		$changes = $product->get_changes();
+
+		// Only update the post when the post data changes.
+		if ( array_intersect( array( 'description', 'short_description', 'name', 'parent_id', 'reviews_allowed', 'status', 'menu_order', 'date_created', 'date_modified', 'slug' ), array_keys( $changes ) ) ) {
+			$post_data = array(
+				'post_content'   => $product->get_description( 'edit' ),
+				'post_excerpt'   => $product->get_short_description( 'edit' ),
+				'post_title'     => $product->get_name( 'edit' ),
+				'post_parent'    => $product->get_parent_id( 'edit' ),
+				'comment_status' => $product->get_reviews_allowed( 'edit' ) ? 'open' : 'closed',
+				'post_status'    => $product->get_status( 'edit' ) ? $product->get_status( 'edit' ) : 'publish',
+				'menu_order'     => $product->get_menu_order( 'edit' ),
+				'post_name'      => $product->get_slug( 'edit' ),
+			);
+			if ( $product->get_date_created( 'edit' ) ) {
+				$post_data['post_date']     = gmdate( 'Y-m-d H:i:s', $product->get_date_created( 'edit' )->getOffsetTimestamp() );
+				$post_data['post_date_gmt'] = gmdate( 'Y-m-d H:i:s', $product->get_date_created( 'edit' )->getTimestamp() );
+			}
+			if ( isset( $changes['date_modified'] ) && $product->get_date_modified( 'edit' ) ) {
+				$post_data['post_modified']     = gmdate( 'Y-m-d H:i:s', $product->get_date_modified( 'edit' )->getOffsetTimestamp() );
+				$post_data['post_modified_gmt'] = gmdate( 'Y-m-d H:i:s', $product->get_date_modified( 'edit' )->getTimestamp() );
+			} else {
+				$post_data['post_modified']     = current_time( 'mysql' );
+				$post_data['post_modified_gmt'] = current_time( 'mysql', 1 );
+			}
+
+			/**
+			 * When updating this object, to prevent infinite loops, use $wpdb
+			 * to update data, since wp_update_post spawns more calls to the
+			 * save_post action.
+			 *
+			 * This ensures hooks are fired by either WP itself (admin screen save),
+			 * or an update purely from CRUD.
+			 */
+			if ( doing_action( 'save_post' ) ) {
+				$GLOBALS['wpdb']->update( $GLOBALS['wpdb']->posts, $post_data, array( 'ID' => $product->get_id() ) );
+				clean_post_cache( $product->get_id() );
+			} else {
+				wp_update_post( array_merge( array( 'ID' => $product->get_id() ), $post_data ) );
+			}
+			$product->read_meta_data( true ); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
+		}
+
+		$this->update_post_meta( $product );
+		$this->update_terms( $product );
+		$this->update_visibility( $product );
+		$this->update_attributes( $product );
+		$this->update_version_and_type( $product );
+		$this->handle_updated_props( $product );
+
+		$product->apply_changes();
+
+		$this->clear_caches( $product );
+
+		do_action( 'woocommerce_update_product', $product->get_id() );
+	}
+
+	/**
+	 * Method to delete a product from the database.
+	 * @param WC_Product
+	 * @param array $args Array of args to pass to the delete method.
+	 */
+	public function delete( &$product, $args = array() ) {
+		$id        = $product->get_id();
+		$post_type = $product->is_type( 'variation' ) ? 'product_variation' : 'product';
+
+		$args = wp_parse_args( $args, array(
+			'force_delete' => false,
+		) );
+
+		if ( $args['force_delete'] ) {
+			wp_delete_post( $product->get_id() );
+			$product->set_id( 0 );
+			do_action( 'woocommerce_delete_' . $post_type, $id );
+		} else {
+			wp_trash_post( $product->get_id() );
+			$product->set_status( 'trash' );
+			do_action( 'woocommerce_trash_' . $post_type, $id );
+		}
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Additional Methods
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Read product data. Can be overridden by child classes to load other props.
+	 *
+	 * @param WC_Product
+	 * @since 3.0.0
+	 */
+	protected function read_product_data( &$product ) {
+		$id = $product->get_id();
+
+		if ( '' === ( $review_count = get_post_meta( $id, '_wc_review_count', true ) ) ) {
+			WC_Comments::get_review_count_for_product( $product );
+		} else {
+			$product->set_review_count( $review_count );
+		}
+
+		if ( '' === ( $rating_counts = get_post_meta( $id, '_wc_rating_count', true ) ) ) {
+			WC_Comments::get_rating_counts_for_product( $product );
+		} else {
+			$product->set_rating_counts( $rating_counts );
+		}
+
+		if ( '' === ( $average_rating = get_post_meta( $id, '_wc_average_rating', true ) ) ) {
+			WC_Comments::get_average_rating_for_product( $product );
+		} else {
+			$product->set_average_rating( $average_rating );
+		}
+
+		$product->set_props( array(
+			'sku'                => get_post_meta( $id, '_sku', true ),
+			'regular_price'      => get_post_meta( $id, '_regular_price', true ),
+			'sale_price'         => get_post_meta( $id, '_sale_price', true ),
+			'price'              => get_post_meta( $id, '_price', true ),
+			'date_on_sale_from'  => get_post_meta( $id, '_sale_price_dates_from', true ),
+			'date_on_sale_to'    => get_post_meta( $id, '_sale_price_dates_to', true ),
+			'total_sales'        => get_post_meta( $id, 'total_sales', true ),
+			'tax_status'         => get_post_meta( $id, '_tax_status', true ),
+			'tax_class'          => get_post_meta( $id, '_tax_class', true ),
+			'manage_stock'       => get_post_meta( $id, '_manage_stock', true ),
+			'stock_quantity'     => get_post_meta( $id, '_stock', true ),
+			'stock_status'       => get_post_meta( $id, '_stock_status', true ),
+			'backorders'         => get_post_meta( $id, '_backorders', true ),
+			'sold_individually'  => get_post_meta( $id, '_sold_individually', true ),
+			'weight'             => get_post_meta( $id, '_weight', true ),
+			'length'             => get_post_meta( $id, '_length', true ),
+			'width'              => get_post_meta( $id, '_width', true ),
+			'height'             => get_post_meta( $id, '_height', true ),
+			'upsell_ids'         => get_post_meta( $id, '_upsell_ids', true ),
+			'cross_sell_ids'     => get_post_meta( $id, '_crosssell_ids', true ),
+			'purchase_note'      => get_post_meta( $id, '_purchase_note', true ),
+			'default_attributes' => get_post_meta( $id, '_default_attributes', true ),
+			'category_ids'       => $this->get_term_ids( $product, 'product_cat' ),
+			'tag_ids'            => $this->get_term_ids( $product, 'product_tag' ),
+			'shipping_class_id'  => current( $this->get_term_ids( $product, 'product_shipping_class' ) ),
+			'virtual'            => get_post_meta( $id, '_virtual', true ),
+			'downloadable'       => get_post_meta( $id, '_downloadable', true ),
+			'gallery_image_ids'  => array_filter( explode( ',', get_post_meta( $id, '_product_image_gallery', true ) ) ),
+			'download_limit'     => get_post_meta( $id, '_download_limit', true ),
+			'download_expiry'    => get_post_meta( $id, '_download_expiry', true ),
+			'image_id'           => get_post_thumbnail_id( $id ),
+		) );
+	}
+
+	/**
+	 * Read extra data associated with the product, like button text or product URL for external products.
+	 *
+	 * @param WC_Product
+	 * @since 3.0.0
+	 */
+	protected function read_extra_data( &$product ) {
+		foreach ( $product->get_extra_data_keys() as $key ) {
+			$function = 'set_' . $key;
+			if ( is_callable( array( $product, $function ) ) ) {
+				$product->{$function}( get_post_meta( $product->get_id(), '_' . $key, true ) );
+			}
+		}
+	}
+
+	/**
+	 * Convert visibility terms to props.
+	 * Catalog visibility valid values are 'visible', 'catalog', 'search', and 'hidden'.
+	 *
+	 * @param WC_Product
+	 * @since 3.0.0
+	 */
+	protected function read_visibility( &$product ) {
+		$terms           = get_the_terms( $product->get_id(), 'product_visibility' );
+		$term_names      = is_array( $terms ) ? wp_list_pluck( $terms, 'name' ) : array();
+		$featured        = in_array( 'featured', $term_names );
+		$exclude_search  = in_array( 'exclude-from-search', $term_names );
+		$exclude_catalog = in_array( 'exclude-from-catalog', $term_names );
+
+		if ( $exclude_search && $exclude_catalog ) {
+			$catalog_visibility = 'hidden';
+		} elseif ( $exclude_search ) {
+			$catalog_visibility = 'catalog';
+		} elseif ( $exclude_catalog ) {
+			$catalog_visibility = 'search';
+		} else {
+			$catalog_visibility = 'visible';
+		}
+
+		$product->set_props( array(
+			'featured'           => $featured,
+			'catalog_visibility' => $catalog_visibility,
+		) );
+	}
+
+	/**
+	 * Read attributes from post meta.
+	 *
+	 * @param WC_Product
+	 * @since 3.0.0
+	 */
+	protected function read_attributes( &$product ) {
+		$meta_values = get_post_meta( $product->get_id(), '_product_attributes', true );
+
+		if ( ! empty( $meta_values ) && is_array( $meta_values ) ) {
+			$attributes = array();
+			foreach ( $meta_values as $meta_value ) {
+				$id         = 0;
+				$meta_value = array_merge( array(
+					'name'         => '',
+					'value'        => '',
+					'position'     => 0,
+					'is_visible'   => 0,
+					'is_variation' => 0,
+					'is_taxonomy'  => 0,
+				), (array) $meta_value );
+
+				// Check if is a taxonomy attribute.
+				if ( ! empty( $meta_value['is_taxonomy'] ) ) {
+					if ( ! taxonomy_exists( $meta_value['name'] ) ) {
+						continue;
+					}
+					$id      = wc_attribute_taxonomy_id_by_name( $meta_value['name'] );
+					$options = wc_get_object_terms( $product->get_id(), $meta_value['name'], 'term_id' );
+				} else {
+					$options = wc_get_text_attributes( $meta_value['value'] );
+				}
+
+				$attribute = new WC_Product_Attribute();
+
+				$attribute->set_id( $id );
+				$attribute->set_name( $meta_value['name'] );
+				$attribute->set_options( $options );
+				$attribute->set_position( $meta_value['position'] );
+				$attribute->set_visible( $meta_value['is_visible'] );
+				$attribute->set_variation( $meta_value['is_variation'] );
+				$attributes[] = $attribute;
+			}
+			$product->set_attributes( $attributes );
+		}
+	}
+
+	/**
+	 * Read downloads from post meta.
+	 *
+	 * @param WC_Product
+	 * @since 3.0.0
+	 */
+	protected function read_downloads( &$product ) {
+		$meta_values = array_filter( (array) get_post_meta( $product->get_id(), '_downloadable_files', true ) );
+
+		if ( $meta_values ) {
+			$downloads = array();
+			foreach ( $meta_values as $key => $value ) {
+				if ( ! isset( $value['name'], $value['file'] ) ) {
+					continue;
+				}
+				$download    = new WC_Product_Download();
+				$download->set_id( $key );
+				$download->set_name( $value['name'] ? $value['name'] : wc_get_filename_from_url( $value['file'] ) );
+				$download->set_file( apply_filters( 'woocommerce_file_download_path', $value['file'], $product, $key ) );
+				$downloads[] = $download;
+			}
+			$product->set_downloads( $downloads );
+		}
+	}
+
+	/**
+	 * Helper method that updates all the post meta for a product based on it's settings in the WC_Product class.
+	 *
+	 * @param WC_Product
+	 * @param bool Force update. Used during create.
+	 * @since 3.0.0
+	 */
+	protected function update_post_meta( &$product, $force = false ) {
+		$meta_key_to_props = array(
+			'_sku'                   => 'sku',
+			'_regular_price'         => 'regular_price',
+			'_sale_price'            => 'sale_price',
+			'_sale_price_dates_from' => 'date_on_sale_from',
+			'_sale_price_dates_to'   => 'date_on_sale_to',
+			'total_sales'            => 'total_sales',
+			'_tax_status'            => 'tax_status',
+			'_tax_class'             => 'tax_class',
+			'_manage_stock'          => 'manage_stock',
+			'_backorders'            => 'backorders',
+			'_sold_individually'     => 'sold_individually',
+			'_weight'                => 'weight',
+			'_length'                => 'length',
+			'_width'                 => 'width',
+			'_height'                => 'height',
+			'_upsell_ids'            => 'upsell_ids',
+			'_crosssell_ids'         => 'cross_sell_ids',
+			'_purchase_note'         => 'purchase_note',
+			'_default_attributes'    => 'default_attributes',
+			'_virtual'               => 'virtual',
+			'_downloadable'          => 'downloadable',
+			'_product_image_gallery' => 'gallery_image_ids',
+			'_download_limit'        => 'download_limit',
+			'_download_expiry'       => 'download_expiry',
+			'_thumbnail_id'          => 'image_id',
+			'_stock'                 => 'stock_quantity',
+			'_stock_status'          => 'stock_status',
+			'_wc_average_rating'     => 'average_rating',
+			'_wc_rating_count'       => 'rating_counts',
+			'_wc_review_count'       => 'review_count',
+		);
+
+		// Make sure to take extra data (like product url or text for external products) into account.
+		$extra_data_keys = $product->get_extra_data_keys();
+
+		foreach ( $extra_data_keys as $key ) {
+			$meta_key_to_props[ '_' . $key ] = $key;
+		}
+
+		$props_to_update = $force ? $meta_key_to_props : $this->get_props_to_update( $product, $meta_key_to_props );
+
+		foreach ( $props_to_update as $meta_key => $prop ) {
+			$value = $product->{"get_$prop"}( 'edit' );
+			switch ( $prop ) {
+				case 'virtual' :
+				case 'downloadable' :
+				case 'manage_stock' :
+				case 'sold_individually' :
+					$updated = update_post_meta( $product->get_id(), $meta_key, wc_bool_to_string( $value ) );
+					break;
+				case 'gallery_image_ids' :
+					$updated = update_post_meta( $product->get_id(), $meta_key, implode( ',', $value ) );
+					break;
+				case 'image_id' :
+					if ( ! empty( $value ) ) {
+						set_post_thumbnail( $product->get_id(), $value );
+					} else {
+						delete_post_meta( $product->get_id(), '_thumbnail_id' );
+					}
+					$updated = true;
+					break;
+				case 'date_on_sale_from' :
+				case 'date_on_sale_to' :
+					$updated = update_post_meta( $product->get_id(), $meta_key, $value ? $value->getTimestamp() : '' );
+					break;
+				default :
+					$updated = update_post_meta( $product->get_id(), $meta_key, $value );
+					break;
+			}
+			if ( $updated ) {
+				$this->updated_props[] = $prop;
+			}
+		}
+
+		// Update extra data associated with the product like button text or product URL for external products.
+		if ( ! $this->extra_data_saved ) {
+			foreach ( $extra_data_keys as $key ) {
+				if ( ! array_key_exists( $key, $props_to_update ) ) {
+					continue;
+				}
+				$function = 'get_' . $key;
+				if ( is_callable( array( $product, $function ) ) ) {
+					if ( update_post_meta( $product->get_id(), '_' . $key, $product->{$function}( 'edit' ) ) ) {
+						$this->updated_props[] = $key;
+					}
+				}
+			}
+		}
+
+		if ( $this->update_downloads( $product, $force ) ) {
+			$this->updated_props[] = 'downloads';
+		}
+	}
+
+	/**
+	 * Handle updated meta props after updating meta data.
+	 *
+	 * @since  3.0.0
+	 * @param  WC_Product $product
+	 */
+	protected function handle_updated_props( &$product ) {
+		if ( in_array( 'date_on_sale_from', $this->updated_props ) || in_array( 'date_on_sale_to', $this->updated_props ) || in_array( 'regular_price', $this->updated_props ) || in_array( 'sale_price', $this->updated_props ) ) {
+			if ( $product->is_on_sale( 'edit' ) ) {
+				update_post_meta( $product->get_id(), '_price', $product->get_sale_price( 'edit' ) );
+				$product->set_price( $product->get_sale_price( 'edit' ) );
+			} else {
+				update_post_meta( $product->get_id(), '_price', $product->get_regular_price( 'edit' ) );
+				$product->set_price( $product->get_regular_price( 'edit' ) );
+			}
+		}
+
+		if ( in_array( 'stock_quantity', $this->updated_props ) ) {
+			do_action( $product->is_type( 'variation' ) ? 'woocommerce_variation_set_stock' : 'woocommerce_product_set_stock' , $product );
+		}
+
+		if ( in_array( 'stock_status', $this->updated_props ) ) {
+			do_action( $product->is_type( 'variation' ) ? 'woocommerce_variation_set_stock_status' : 'woocommerce_product_set_stock_status' , $product->get_id(), $product->get_stock_status(), $product );
+		}
+
+		// Trigger action so 3rd parties can deal with updated props.
+		do_action( 'woocommerce_product_object_updated_props', $product, $this->updated_props );
+
+		// After handling, we can reset the props array.
+		$this->updated_props = array();
+	}
+
+	/**
+	 * For all stored terms in all taxonomies, save them to the DB.
+	 *
+	 * @param WC_Product
+	 * @param bool Force update. Used during create.
+	 * @since 3.0.0
+	 */
+	protected function update_terms( &$product, $force = false ) {
+		$changes = $product->get_changes();
+
+		if ( $force || array_key_exists( 'category_ids', $changes ) ) {
+			wp_set_post_terms( $product->get_id(), $product->get_category_ids( 'edit' ), 'product_cat', false );
+		}
+		if ( $force || array_key_exists( 'tag_ids', $changes ) ) {
+			wp_set_post_terms( $product->get_id(), $product->get_tag_ids( 'edit' ), 'product_tag', false );
+		}
+		if ( $force || array_key_exists( 'shipping_class_id', $changes ) ) {
+			wp_set_post_terms( $product->get_id(), array( $product->get_shipping_class_id( 'edit' ) ), 'product_shipping_class', false );
+		}
+	}
+
+	/**
+	 * Update visibility terms based on props.
+	 *
+	 * @since 3.0.0
+	 * @param bool Force update. Used during create.
+	 * @param WC_Product
+	 */
+	protected function update_visibility( &$product, $force = false ) {
+		$changes = $product->get_changes();
+
+		if ( $force || array_intersect( array( 'featured', 'stock_status', 'average_rating', 'catalog_visibility' ), array_keys( $changes ) ) ) {
+			$terms = array();
+
+			if ( $product->get_featured() ) {
+				$terms[] = 'featured';
+			}
+
+			if ( 'outofstock' === $product->get_stock_status() ) {
+				$terms[] = 'outofstock';
+			}
+
+			$rating  = max( array( 5, min( array( 1, round( $product->get_average_rating(), 0 ) ) ) ) );
+			$terms[] = 'rated-' . $rating;
+
+			switch ( $product->get_catalog_visibility() ) {
+				case 'hidden' :
+					$terms[] = 'exclude-from-search';
+					$terms[] = 'exclude-from-catalog';
+					break;
+				case 'catalog' :
+					$terms[] = 'exclude-from-search';
+					break;
+				case 'search' :
+					$terms[] = 'exclude-from-catalog';
+					break;
+			}
+
+			if ( ! is_wp_error( wp_set_post_terms( $product->get_id(), $terms, 'product_visibility', false ) ) ) {
+				delete_transient( 'wc_featured_products' );
+				do_action( 'woocommerce_product_set_visibility', $product->get_id(), $product->get_catalog_visibility() );
+			}
+		}
+	}
+
+	/**
+	 * Update attributes which are a mix of terms and meta data.
+	 *
+	 * @param WC_Product
+	 * @param bool Force update. Used during create.
+	 * @since 3.0.0
+	 */
+	protected function update_attributes( &$product, $force = false ) {
+		$changes = $product->get_changes();
+
+		if ( $force || array_key_exists( 'attributes', $changes ) ) {
+			$attributes  = $product->get_attributes();
+			$meta_values = array();
+
+			if ( $attributes ) {
+				foreach ( $attributes as $attribute_key => $attribute ) {
+					$value = '';
+
+					if ( is_null( $attribute ) ) {
+						if ( taxonomy_exists( $attribute_key ) ) {
+							// Handle attributes that have been unset.
+							wp_set_object_terms( $product->get_id(), array(), $attribute_key );
+						}
+						continue;
+
+					} elseif ( $attribute->is_taxonomy() ) {
+						wp_set_object_terms( $product->get_id(), wp_list_pluck( $attribute->get_terms(), 'term_id' ), $attribute->get_name() );
+					} else {
+						$value = wc_implode_text_attributes( $attribute->get_options() );
+					}
+
+					// Store in format WC uses in meta.
+					$meta_values[ $attribute_key ] = array(
+						'name'         => $attribute->get_name(),
+						'value'        => $value,
+						'position'     => $attribute->get_position(),
+						'is_visible'   => $attribute->get_visible() ? 1 : 0,
+						'is_variation' => $attribute->get_variation() ? 1 : 0,
+						'is_taxonomy'  => $attribute->is_taxonomy() ? 1 : 0,
+					);
+				}
+			}
+			update_post_meta( $product->get_id(), '_product_attributes', $meta_values );
+		}
+	}
+
+	/**
+	 * Update downloads.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Product $product
+	 * @param bool Force update. Used during create.
+	 * @return bool If updated or not.
+	 */
+	protected function update_downloads( &$product, $force = false ) {
+		$changes = $product->get_changes();
+
+		if ( $force || array_key_exists( 'downloads', $changes ) ) {
+			$downloads   = $product->get_downloads();
+			$meta_values = array();
+
+			if ( $downloads ) {
+				foreach ( $downloads as $key => $download ) {
+					// Store in format WC uses in meta.
+					$meta_values[ $key ] = $download->get_data();
+				}
+			}
+
+			if ( $product->is_type( 'variation' ) ) {
+				do_action( 'woocommerce_process_product_file_download_paths', $product->get_parent_id(), $product->get_id(), $downloads );
+			} else {
+				do_action( 'woocommerce_process_product_file_download_paths', $product->get_id(), 0, $downloads );
+			}
+
+			return update_post_meta( $product->get_id(), '_downloadable_files', $meta_values );
+		}
+		return false;
+	}
+
+	/**
+	 * Make sure we store the product type and version (to track data changes).
+	 *
+	 * @param WC_Product
+	 * @since 3.0.0
+	 */
+	protected function update_version_and_type( &$product ) {
+		$old_type = WC_Product_Factory::get_product_type( $product->get_id() );
+		$new_type = $product->get_type();
+
+		wp_set_object_terms( $product->get_id(), $new_type, 'product_type' );
+		update_post_meta( $product->get_id(), '_product_version', WC_VERSION );
+
+		// Action for the transition.
+		if ( $old_type !== $new_type ) {
+			do_action( 'woocommerce_product_type_changed', $product, $old_type, $new_type );
+		}
+	}
+
+	/**
+	 * Clear any caches.
+	 *
+	 * @param WC_Product
+	 * @since 3.0.0
+	 */
+	protected function clear_caches( &$product ) {
+		wc_delete_product_transients( $product->get_id() );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| wc-product-functions.php methods
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Returns an array of on sale products, as an array of objects with an
+	 * ID and parent_id present. Example: $return[0]->id, $return[0]->parent_id.
+	 *
+	 * @return array
+	 * @since 3.0.0
+	 */
+	public function get_on_sale_products() {
+		global $wpdb;
+
+		$decimals = absint( wc_get_price_decimals() );
+
+		return $wpdb->get_results( "
+			SELECT post.ID as id, post.post_parent as parent_id FROM `$wpdb->posts` AS post
+			LEFT JOIN `$wpdb->postmeta` AS meta ON post.ID = meta.post_id
+			LEFT JOIN `$wpdb->postmeta` AS meta2 ON post.ID = meta2.post_id
+			WHERE post.post_type IN ( 'product', 'product_variation' )
+				AND post.post_status = 'publish'
+				AND meta.meta_key = '_sale_price'
+				AND meta2.meta_key = '_price'
+				AND CAST( meta.meta_value AS DECIMAL ) >= 0
+				AND CAST( meta.meta_value AS CHAR ) != ''
+				AND CAST( meta.meta_value AS DECIMAL( 10, {$decimals} ) ) = CAST( meta2.meta_value AS DECIMAL( 10, {$decimals} ) )
+			GROUP BY post.ID;
+		" );
+	}
+
+	/**
+	 * Returns a list of product IDs ( id as key => parent as value) that are
+	 * featured. Uses get_posts instead of wc_get_products since we want
+	 * some extra meta queries and ALL products (posts_per_page = -1).
+	 *
+	 * @return array
+	 * @since 3.0.0
+	 */
+	public function get_featured_product_ids() {
+		$product_visibility_term_ids = wc_get_product_visibility_term_ids();
+
+		return get_posts( array(
+			'post_type'      => array( 'product', 'product_variation' ),
+			'posts_per_page' => -1,
+			'post_status'    => 'publish',
+			'tax_query'      => array(
+				'relation' => 'AND',
+				array(
+					'taxonomy' => 'product_visibility',
+					'field'    => 'term_taxonomy_id',
+					'terms'    => array( $product_visibility_term_ids['featured'] ),
+				),
+				array(
+					'taxonomy' => 'product_visibility',
+					'field'    => 'term_taxonomy_id',
+					'terms'    => array( $product_visibility_term_ids['exclude-from-catalog'] ),
+					'operator' => 'NOT IN',
+				),
+			),
+			'fields' => 'id=>parent',
+		) );
+	}
+
+	/**
+	 * Check if product sku is found for any other product IDs.
+	 *
+	 * @since 3.0.0
+	 * @param int $product_id
+	 * @param string $sku Will be slashed to work around https://core.trac.wordpress.org/ticket/27421
+	 * @return bool
+	 */
+	public function is_existing_sku( $product_id, $sku ) {
+		global $wpdb;
+		return $wpdb->get_var( $wpdb->prepare( "
+			SELECT $wpdb->posts.ID
+			FROM $wpdb->posts
+			LEFT JOIN $wpdb->postmeta ON ( $wpdb->posts.ID = $wpdb->postmeta.post_id )
+			WHERE $wpdb->posts.post_type IN ( 'product', 'product_variation' )
+			AND $wpdb->posts.post_status != 'trash'
+			AND $wpdb->postmeta.meta_key = '_sku' AND $wpdb->postmeta.meta_value = '%s'
+			AND $wpdb->postmeta.post_id <> %d LIMIT 1
+		 ", wp_slash( $sku ), $product_id ) );
+	}
+
+	/**
+	 * Return product ID based on SKU.
+	 *
+	 * @since 3.0.0
+	 * @param string $sku
+	 * @return int
+	 */
+	public function get_product_id_by_sku( $sku ) {
+		global $wpdb;
+		return $wpdb->get_var( $wpdb->prepare( "
+			SELECT posts.ID
+			FROM $wpdb->posts AS posts
+			LEFT JOIN $wpdb->postmeta AS postmeta ON ( posts.ID = postmeta.post_id )
+			WHERE posts.post_type IN ( 'product', 'product_variation' )
+			AND posts.post_status != 'trash'
+			AND postmeta.meta_key = '_sku'
+			AND postmeta.meta_value = '%s'
+			LIMIT 1
+		 ", $sku ) );
+	}
+
+	/**
+	 * Returns an array of IDs of products that have sales starting soon.
+	 *
+	 * @since 3.0.0
+	 * @return array
+	 */
+	public function get_starting_sales() {
+		global $wpdb;
+		return $wpdb->get_col( $wpdb->prepare( "
+			SELECT postmeta.post_id FROM {$wpdb->postmeta} as postmeta
+			LEFT JOIN {$wpdb->postmeta} as postmeta_2 ON postmeta.post_id = postmeta_2.post_id
+			LEFT JOIN {$wpdb->postmeta} as postmeta_3 ON postmeta.post_id = postmeta_3.post_id
+			WHERE postmeta.meta_key = '_sale_price_dates_from'
+			AND postmeta_2.meta_key = '_price'
+			AND postmeta_3.meta_key = '_sale_price'
+			AND postmeta.meta_value > 0
+			AND postmeta.meta_value < %s
+			AND postmeta_2.meta_value != postmeta_3.meta_value
+		", current_time( 'timestamp', true ) ) );
+	}
+
+	/**
+	 * Returns an array of IDs of products that have sales which are due to end.
+	 *
+	 * @since 3.0.0
+	 * @return array
+	 */
+	public function get_ending_sales() {
+		global $wpdb;
+		return $wpdb->get_col( $wpdb->prepare( "
+			SELECT postmeta.post_id FROM {$wpdb->postmeta} as postmeta
+			LEFT JOIN {$wpdb->postmeta} as postmeta_2 ON postmeta.post_id = postmeta_2.post_id
+			LEFT JOIN {$wpdb->postmeta} as postmeta_3 ON postmeta.post_id = postmeta_3.post_id
+			WHERE postmeta.meta_key = '_sale_price_dates_to'
+			AND postmeta_2.meta_key = '_price'
+			AND postmeta_3.meta_key = '_regular_price'
+			AND postmeta.meta_value > 0
+			AND postmeta.meta_value < %s
+			AND postmeta_2.meta_value != postmeta_3.meta_value
+		", current_time( 'timestamp', true ) ) );
+	}
+
+	/**
+	 * Find a matching (enabled) variation within a variable product.
+	 *
+	 * @since  3.0.0
+	 * @param  WC_Product $product Variable product.
+	 * @param  array $match_attributes Array of attributes we want to try to match.
+	 * @return int Matching variation ID or 0.
+	 */
+	public function find_matching_product_variation( $product, $match_attributes = array() ) {
+		$query_args = array(
+			'post_parent' => $product->get_id(),
+			'post_type'   => 'product_variation',
+			'orderby'     => 'menu_order',
+			'order'       => 'ASC',
+			'fields'      => 'ids',
+			'post_status' => 'publish',
+			'numberposts' => 1,
+			'meta_query'  => array(),
+		);
+
+		// Allow large queries in case user has many variations or attributes.
+		$GLOBALS['wpdb']->query( 'SET SESSION SQL_BIG_SELECTS=1' );
+
+		foreach ( $product->get_attributes() as $attribute ) {
+			if ( ! $attribute->get_variation() ) {
+				continue;
+			}
+
+			$attribute_field_name = 'attribute_' . sanitize_title( $attribute->get_name() );
+
+			if ( ! isset( $match_attributes[ $attribute_field_name ] ) ) {
+				return 0;
+			}
+
+			// Note not wc_clean here to prevent removal of entities.
+			$value = $match_attributes[ $attribute_field_name ];
+
+			$query_args['meta_query'][] = array(
+				'relation' => 'OR',
+				array(
+					'key'     => $attribute_field_name,
+					'value'   => array( '', $value ),
+					'compare' => 'IN',
+				),
+				array(
+					'key'     => $attribute_field_name,
+					'compare' => 'NOT EXISTS',
+				)
+			);
+		}
+
+		$variations = get_posts( $query_args );
+
+		if ( $variations && ! is_wp_error( $variations ) ) {
+			return current( $variations );
+	 	} elseif ( version_compare( get_post_meta( $product->get_id(), '_product_version', true ), '2.4.0', '<' ) ) {
+			/**
+			 * Pre 2.4 handling where 'slugs' were saved instead of the full text attribute.
+			 * Fallback is here because there are cases where data will be 'synced' but the product version will remain the same.
+			 */
+			return ( array_map( 'sanitize_title', $match_attributes ) === $match_attributes ) ? 0 : $this->find_matching_product_variation( $product, array_map( 'sanitize_title', $match_attributes ) );
+		}
+
+		return 0;
+	}
+
+	/**
+	 * Make sure all variations have a sort order set so they can be reordered correctly.
+	 *
+	 * 	@param int $parent_id
+	 */
+	public function sort_all_product_variations( $parent_id ) {
+		global $wpdb;
+		$ids   = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_type='product_variation' AND post_parent=%d AND post_status='publish' ORDER BY menu_order ASC, ID ASC", $parent_id ) );
+		$index = 0;
+
+		foreach ( $ids as $id ) {
+			$wpdb->update( $wpdb->posts, array( 'menu_order' => ( $index ++ ) ), array( 'ID' => absint( $id ) ) );
+		}
+	}
+
+	/**
+	 * Return a list of related products (using data like categories and IDs).
+	 *
+	 * @since 3.0.0
+	 * @param array $cats_array  List of categories IDs.
+	 * @param array $tags_array  List of tags IDs.
+	 * @param array $exclude_ids Excluded IDs.
+	 * @param int   $limit       Limit of results.
+	 * @param int   $product_id
+	 * @return array
+	 */
+	public function get_related_products( $cats_array, $tags_array, $exclude_ids, $limit, $product_id ) {
+		global $wpdb;
+		return $wpdb->get_col( implode( ' ', apply_filters( 'woocommerce_product_related_posts_query', $this->get_related_products_query( $cats_array, $tags_array, $exclude_ids, $limit + 10 ), $product_id ) ) );
+	}
+
+	/**
+	 * Builds the related posts query.
+	 *
+	 * @since 3.0.0
+	 * @param array $cats_array  List of categories IDs.
+	 * @param array $tags_array  List of tags IDs.
+	 * @param array $exclude_ids Excluded IDs.
+	 * @param int   $limit       Limit of results.
+	 * @return string
+	 */
+	public function get_related_products_query( $cats_array, $tags_array, $exclude_ids, $limit ) {
+		global $wpdb;
+
+		// Arrays to string.
+		$exclude_ids = implode( ',', array_map( 'absint', $exclude_ids ) );
+		$cats_array  = implode( ',', array_map( 'absint', $cats_array ) );
+		$tags_array  = implode( ',', array_map( 'absint', $tags_array ) );
+
+		$limit           = absint( $limit );
+		$query           = array();
+		$query['fields'] = "SELECT DISTINCT ID FROM {$wpdb->posts} p";
+		$query['join']   = " INNER JOIN {$wpdb->term_relationships} tr ON (p.ID = tr.object_id)";
+		$query['join']  .= " INNER JOIN {$wpdb->term_taxonomy} tt ON (tr.term_taxonomy_id = tt.term_taxonomy_id)";
+		$query['join']  .= " INNER JOIN {$wpdb->terms} t ON (t.term_id = tt.term_id)";
+		$query['where']  = ' WHERE 1=1';
+		$query['where'] .= " AND p.post_status = 'publish'";
+		$query['where'] .= " AND p.post_type = 'product'";
+		$query['where'] .= " AND p.ID NOT IN ( {$exclude_ids} )";
+
+		$product_visibility_term_ids = wc_get_product_visibility_term_ids();
+
+		if ( $product_visibility_term_ids['exclude-from-catalog'] ) {
+			$query['where'] .= " AND t.term_id !=" . $product_visibility_term_ids['exclude-from-catalog'];
+		}
+
+		if ( 'yes' === get_option( 'woocommerce_hide_out_of_stock_items' ) && $product_visibility_term_ids['outofstock'] ) {
+			$query['where'] .= " AND t.term_id !=" . $product_visibility_term_ids['outofstock'];
+		}
+
+		if ( $cats_array || $tags_array ) {
+			$query['where'] .= ' AND (';
+
+			if ( $cats_array ) {
+				$query['where'] .= " ( tt.taxonomy = 'product_cat' AND t.term_id IN ( {$cats_array} ) ) ";
+				if ( $tags_array ) {
+					$query['where'] .= ' OR ';
+				}
+			}
+
+			if ( $tags_array ) {
+				$query['where'] .= " ( tt.taxonomy = 'product_tag' AND t.term_id IN ( {$tags_array} ) ) ";
+			}
+
+			$query['where'] .= ')';
+		}
+
+		$query['limits'] = " LIMIT {$limit} ";
+
+		return $query;
+	}
+
+	/**
+	 * Update a product's stock amount directly.
+	 *
+	 * Uses queries rather than update_post_meta so we can do this in one query (to avoid stock issues).
+	 *
+	 * @since  3.0.0 this supports set, increase and decrease.
+	 * @param  int
+	 * @param  int|null $stock_quantity
+	 * @param  string $operation set, increase and decrease.
+	 */
+	public function update_product_stock( $product_id_with_stock, $stock_quantity = null, $operation = 'set' ) {
+		global $wpdb;
+		add_post_meta( $product_id_with_stock, '_stock', 0, true );
+
+		// Update stock in DB directly
+		switch ( $operation ) {
+			case 'increase' :
+				$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->postmeta} SET meta_value = meta_value + %f WHERE post_id = %d AND meta_key='_stock'", $stock_quantity, $product_id_with_stock ) );
+				break;
+			case 'decrease' :
+				$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->postmeta} SET meta_value = meta_value - %f WHERE post_id = %d AND meta_key='_stock'", $stock_quantity, $product_id_with_stock ) );
+				break;
+			default :
+				$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->postmeta} SET meta_value = %f WHERE post_id = %d AND meta_key='_stock'", $stock_quantity, $product_id_with_stock ) );
+				break;
+		}
+
+		wp_cache_delete( $product_id_with_stock, 'post_meta' );
+	}
+
+	/**
+	 * Update a product's sale count directly.
+	 *
+	 * Uses queries rather than update_post_meta so we can do this in one query for performance.
+	 *
+	 * @since  3.0.0 this supports set, increase and decrease.
+	 * @param  int
+	 * @param  int|null $quantity
+	 * @param  string $operation set, increase and decrease.
+	 */
+	public function update_product_sales( $product_id, $quantity = null, $operation = 'set' ) {
+		global $wpdb;
+		add_post_meta( $product_id, 'total_sales', 0, true );
+
+		// Update stock in DB directly
+		switch ( $operation ) {
+			case 'increase' :
+				$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->postmeta} SET meta_value = meta_value + %f WHERE post_id = %d AND meta_key='total_sales'", $quantity, $product_id ) );
+				break;
+			case 'decrease' :
+				$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->postmeta} SET meta_value = meta_value - %f WHERE post_id = %d AND meta_key='total_sales'", $quantity, $product_id ) );
+				break;
+			default :
+				$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->postmeta} SET meta_value = %f WHERE post_id = %d AND meta_key='total_sales'", $quantity, $product_id ) );
+				break;
+		}
+
+		wp_cache_delete( $product_id, 'post_meta' );
+	}
+
+	/**
+	 * Update a products average rating meta.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Product $product
+	 */
+	public function update_average_rating( $product ) {
+		update_post_meta( $product->get_id(), '_wc_average_rating', $product->get_average_rating( 'edit' ) );
+	}
+
+	/**
+	 * Update a products review count meta.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Product $product
+	 */
+	public function update_review_count( $product ) {
+		update_post_meta( $product->get_id(), '_wc_review_count', $product->get_review_count( 'edit' ) );
+	}
+
+	/**
+	 * Update a products rating counts.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Product $product
+	 */
+	public function update_rating_counts( $product ) {
+		update_post_meta( $product->get_id(), '_wc_rating_count', $product->get_rating_counts( 'edit' ) );
+	}
+
+	/**
+	 * Get shipping class ID by slug.
+	 *
+	 * @since 3.0.0
+	 * @param $slug string
+	 * @return int|false
+	 */
+	public function get_shipping_class_id_by_slug( $slug ) {
+		$shipping_class_term = get_term_by( 'slug', $slug, 'product_shipping_class' );
+		if ( $shipping_class_term ) {
+			return $shipping_class_term->term_id;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Returns an array of products.
+	 *
+	 * @param  array $args @see wc_get_products
+	 * @return array
+	 */
+	public function get_products( $args = array() ) {
+		/**
+		 * Generate WP_Query args.
+		 */
+		$wp_query_args = array(
+			'post_type'      => 'variation' === $args['type'] ? 'product_variation' : 'product',
+			'post_status'    => $args['status'],
+			'posts_per_page' => $args['limit'],
+			'meta_query'     => array(),
+			'orderby'        => $args['orderby'],
+			'order'          => $args['order'],
+			'tax_query'      => array(),
+		);
+		// Do not load unnecessary post data if the user only wants IDs.
+		if ( 'ids' === $args['return'] ) {
+			$wp_query_args['fields'] = 'ids';
+		}
+
+		if ( 'variation' !== $args['type'] ) {
+			$wp_query_args['tax_query'][] = array(
+				'taxonomy' => 'product_type',
+				'field'    => 'slug',
+				'terms'    => $args['type'],
+			);
+		}
+
+		if ( ! empty( $args['sku'] ) ) {
+			$wp_query_args['meta_query'][] = array(
+				'key'     => '_sku',
+				'value'   => $args['sku'],
+				'compare' => 'LIKE',
+			);
+		}
+
+		if ( ! empty( $args['category'] ) ) {
+			$wp_query_args['tax_query'][] = array(
+				'taxonomy' => 'product_cat',
+				'field'    => 'slug',
+				'terms'   => $args['category'],
+			);
+		}
+
+		if ( ! empty( $args['tag'] ) ) {
+			$wp_query_args['tax_query'][] = array(
+				'taxonomy' => 'product_tag',
+				'field'    => 'slug',
+				'terms'   => $args['tag'],
+			);
+		}
+
+		if ( ! empty( $args['shipping_class'] ) ) {
+			$wp_query_args['tax_query'][] = array(
+				'taxonomy' => 'product_shipping_class',
+				'field'    => 'slug',
+				'terms'   => $args['shipping_class'],
+			);
+		}
+
+		if ( ! is_null( $args['parent'] ) ) {
+			$wp_query_args['post_parent'] = absint( $args['parent'] );
+		}
+
+		if ( ! is_null( $args['offset'] ) ) {
+			$wp_query_args['offset'] = absint( $args['offset'] );
+		} else {
+			$wp_query_args['paged'] = absint( $args['page'] );
+		}
+
+		if ( ! empty( $args['include'] ) ) {
+			$wp_query_args['post__in'] = array_map( 'absint', $args['include'] );
+		}
+
+		if ( ! empty( $args['exclude'] ) ) {
+			$wp_query_args['post__not_in'] = array_map( 'absint', $args['exclude'] );
+		}
+
+		if ( ! $args['paginate'] ) {
+			$wp_query_args['no_found_rows'] = true;
+		}
+
+		// Get results.
+		$products = new WP_Query( $wp_query_args );
+
+		if ( 'objects' === $args['return'] ) {
+			$return = array_filter( array_map( 'wc_get_product', $products->posts ) );
+		} else {
+			$return = $products->posts;
+		}
+
+		if ( $args['paginate'] ) {
+			return (object) array(
+				'products'      => $return,
+				'total'         => $products->found_posts,
+				'max_num_pages' => $products->max_num_pages,
+			);
+		} else {
+			return $return;
+		}
+	}
+
+	/**
+	 * Search product data for a term and return ids.
+	 *
+	 * @param  string $term
+	 * @param  string $type of product
+	 * @param  bool $include_variations in search or not
+	 * @return array of ids
+	 */
+	public function search_products( $term, $type = '', $include_variations = false ) {
+		global $wpdb;
+
+		$search_fields = array_map( 'wc_clean', apply_filters( 'woocommerce_product_search_fields', array(
+			'_sku',
+		) ) );
+		$like_term     = '%' . $wpdb->esc_like( $term ) . '%';
+		$post_types    = $include_variations ? array( 'product', 'product_variation' ) : array( 'product' );
+		$post_statuses = current_user_can( 'edit_private_products' ) ? array( 'private', 'publish' ) : array( 'publish' );
+		$type_join     = '';
+		$type_where    = '';
+
+		if ( $type ) {
+			if ( in_array( $type, array( 'virtual', 'downloadable' ) ) ) {
+				$type_join  = " LEFT JOIN {$wpdb->postmeta} postmeta_type ON posts.ID = postmeta_type.post_id ";
+				$type_where = " AND ( postmeta_type.meta_key = '_{$type}' AND postmeta_type.meta_value = 'yes' ) ";
+			}
+		}
+
+		$product_ids = $wpdb->get_col(
+			$wpdb->prepare( "
+				SELECT DISTINCT posts.ID FROM {$wpdb->posts} posts
+				LEFT JOIN {$wpdb->postmeta} postmeta ON posts.ID = postmeta.post_id
+				$type_join
+				WHERE (
+					posts.post_title LIKE %s
+					OR posts.post_content LIKE %s
+					OR (
+						postmeta.meta_key = '_sku' AND postmeta.meta_value LIKE %s
+					)
+				)
+				AND posts.post_type IN ('" . implode( "','", $post_types ) . "')
+				AND posts.post_status IN ('" . implode( "','", $post_statuses ) . "')
+				$type_where
+				ORDER BY posts.post_parent ASC, posts.post_title ASC
+				",
+				$like_term,
+				$like_term,
+				$like_term
+			)
+		);
+
+		if ( is_numeric( $term ) ) {
+			$post_id   = absint( $term );
+			$post_type = get_post_type( $post_id );
+
+			if ( 'product_variation' === $post_type && $include_variations ) {
+				$product_ids[] = $post_id;
+			} elseif ( 'product' === $post_type ) {
+				$product_ids[] = $post_id;
+			}
+
+			$product_ids[] = wp_get_post_parent_id( $post_id );
+		}
+
+		return wp_parse_id_list( $product_ids );
+	}
+
+	/**
+	 * Get the product type based on product ID.
+	 *
+	 * @since 3.0.0
+	 * @param int $product_id
+	 * @return bool|string
+	 */
+	public function get_product_type( $product_id ) {
+		$post_type = get_post_type( $product_id );
+		if ( 'product_variation' === $post_type ) {
+			return 'variation';
+		} elseif ( 'product' === $post_type ) {
+			$terms = get_the_terms( $product_id, 'product_type' );
+			return ! empty( $terms ) ? sanitize_title( current( $terms )->name ) : 'simple';
+		} else {
+			return false;
+		}
+	}
+}
diff --git a/includes/data-stores/class-wc-product-grouped-data-store-cpt.php b/includes/data-stores/class-wc-product-grouped-data-store-cpt.php
new file mode 100644
index 00000000000..d9677c4898e
--- /dev/null
+++ b/includes/data-stores/class-wc-product-grouped-data-store-cpt.php
@@ -0,0 +1,93 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Grouped Product Data Store: Stored in CPT.
+ *
+ * @version  3.0.0
+ * @category Class
+ * @author   WooThemes
+ */
+class WC_Product_Grouped_Data_Store_CPT extends WC_Product_Data_Store_CPT implements WC_Object_Data_Store_Interface {
+
+	/**
+	 * Helper method that updates all the post meta for a grouped product.
+	 *
+	 * @param WC_Product
+	 * @param bool Force update. Used during create.
+	 * @since 3.0.0
+	 */
+	protected function update_post_meta( &$product, $force = false ) {
+		$meta_key_to_props = array(
+			'_children' => 'children',
+		);
+
+		$props_to_update = $force ? $meta_key_to_props : $this->get_props_to_update( $product, $meta_key_to_props );
+
+		foreach ( $props_to_update as $meta_key => $prop ) {
+			$value   = $product->{"get_$prop"}( 'edit' );
+			$updated = update_post_meta( $product->get_id(), $meta_key, $value );
+			if ( $updated ) {
+				$this->updated_props[] = $prop;
+			}
+		}
+
+		parent::update_post_meta( $product, $force );
+	}
+
+	/**
+	 * Handle updated meta props after updating meta data.
+	 *
+	 * @since  3.0.0
+	 * @param  WC_Product $product
+	 */
+	protected function handle_updated_props( &$product ) {
+		if ( in_array( 'children', $this->updated_props ) ) {
+			$child_prices = array();
+			foreach ( $product->get_children( 'edit' ) as $child_id ) {
+				$child = wc_get_product( $child_id );
+				if ( $child ) {
+					$child_prices[] = $child->get_price();
+				}
+			}
+			$child_prices = array_filter( $child_prices );
+			delete_post_meta( $product->get_id(), '_price' );
+
+			if ( ! empty( $child_prices ) ) {
+				add_post_meta( $product->get_id(), '_price', min( $child_prices ) );
+				add_post_meta( $product->get_id(), '_price', max( $child_prices ) );
+			}
+		}
+		parent::handle_updated_props( $product );
+	}
+
+	/**
+	 * Sync grouped product prices with children.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Product|int $product
+	 */
+	public function sync_price( &$product ) {
+		global $wpdb;
+
+		$children_ids = get_posts( array(
+			'post_parent' => $product->get_id(),
+			'post_type'   => 'product',
+			'fields'      => 'ids',
+		) );
+		$prices = $children_ids ? array_unique( $wpdb->get_col( "SELECT meta_value FROM $wpdb->postmeta WHERE meta_key = '_price' AND post_id IN ( " . implode( ',', array_map( 'absint', $children_ids ) ) . " )" ) ) : array();
+
+		delete_post_meta( $product->get_id(), '_price' );
+		delete_transient( 'wc_var_prices_' . $product->get_id() );
+
+		if ( $prices ) {
+			sort( $prices );
+			// To allow sorting and filtering by multiple values, we have no choice but to store child prices in this manner.
+			foreach ( $prices as $price ) {
+				add_post_meta( $product->get_id(), '_price', $price, false );
+			}
+		}
+	}
+}
diff --git a/includes/data-stores/class-wc-product-variable-data-store-cpt.php b/includes/data-stores/class-wc-product-variable-data-store-cpt.php
new file mode 100644
index 00000000000..0c1408c408e
--- /dev/null
+++ b/includes/data-stores/class-wc-product-variable-data-store-cpt.php
@@ -0,0 +1,443 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Variable Product Data Store: Stored in CPT.
+ *
+ * @version  3.0.0
+ * @category Class
+ * @author   WooThemes
+ */
+class WC_Product_Variable_Data_Store_CPT extends WC_Product_Data_Store_CPT implements WC_Object_Data_Store_Interface, WC_Product_Variable_Data_Store_Interface {
+
+	/**
+	 * Cached & hashed prices array for child variations.
+	 *
+	 * @var array
+	 */
+	protected $prices_array = array();
+
+	/**
+	 * Read product data.
+	 *
+	 * @since 3.0.0
+	 */
+	protected function read_product_data( &$product ) {
+		parent::read_product_data( $product );
+
+		// Set directly since individual data needs changed at the WC_Product_Variation level -- these datasets just pull.
+		$children = $this->read_children( $product );
+		$product->set_children( $children['all'] );
+		$product->set_visible_children( $children['visible'] );
+		$product->set_variation_attributes( $this->read_variation_attributes( $product ) );
+	}
+
+	/**
+	 * Loads variation child IDs.
+	 *
+	 * @param  WC_Product
+	 * @param  bool $force_read True to bypass the transient.
+	 * @return array
+	 */
+	protected function read_children( &$product, $force_read = false ) {
+		$children_transient_name = 'wc_product_children_' . $product->get_id();
+		$children                = get_transient( $children_transient_name );
+
+		if ( empty( $children ) || ! is_array( $children ) || ! isset( $children['all'] ) || ! isset( $children['visible'] ) || $force_read ) {
+			$all_args = $visible_only_args = array(
+				'post_parent' => $product->get_id(),
+				'post_type'   => 'product_variation',
+				'orderby'     => array( 'menu_order' => 'ASC', 'ID' => 'ASC' ),
+				'fields'      => 'ids',
+				'post_status' => 'publish',
+				'numberposts' => -1,
+			);
+			if ( 'yes' === get_option( 'woocommerce_hide_out_of_stock_items' ) ) {
+				$visible_only_args['tax_query'][] = array(
+					'taxonomy' => 'product_visibility',
+					'field'    => 'name',
+					'terms'    => 'outofstock',
+					'operator' => 'NOT IN',
+				);
+			}
+			$children['all']     = get_posts( apply_filters( 'woocommerce_variable_children_args', $all_args, $product, false ) );
+			$children['visible'] = get_posts( apply_filters( 'woocommerce_variable_children_args', $visible_only_args, $product, true ) );
+
+			set_transient( $children_transient_name, $children, DAY_IN_SECONDS * 30 );
+		}
+
+		$children['all']     = wp_parse_id_list( (array) $children['all'] );
+		$children['visible'] = wp_parse_id_list( (array) $children['visible'] );
+
+		return $children;
+	}
+
+	/**
+	 * Loads an array of attributes used for variations, as well as their possible values.
+	 *
+	 * @param WC_Product
+	 * @return array
+	 */
+	protected function read_variation_attributes( &$product ) {
+		global $wpdb;
+
+		$variation_attributes = array();
+		$attributes           = $product->get_attributes();
+		$child_ids            = $product->get_children();
+
+		if ( ! empty( $child_ids ) && ! empty( $attributes ) ) {
+			foreach ( $attributes as $attribute ) {
+				if ( empty( $attribute['is_variation'] ) ) {
+					continue;
+				}
+
+				// Get possible values for this attribute, for only visible variations.
+				$values = array_unique( $wpdb->get_col( $wpdb->prepare(
+					"SELECT meta_value FROM {$wpdb->postmeta} WHERE meta_key = %s AND post_id IN (" . implode( ',', array_map( 'absint', $child_ids ) ) . ")",
+					wc_variation_attribute_name( $attribute['name'] )
+				) ) );
+
+				// Empty value indicates that all options for given attribute are available.
+				if ( in_array( '', $values ) || empty( $values ) ) {
+					$values = $attribute['is_taxonomy'] ? wc_get_object_terms( $product->get_id(), $attribute['name'], 'slug' ) : wc_get_text_attributes( $attribute['value'] );
+				// Get custom attributes (non taxonomy) as defined.
+				} elseif ( ! $attribute['is_taxonomy'] ) {
+					$text_attributes          = wc_get_text_attributes( $attribute['value'] );
+					$assigned_text_attributes = $values;
+					$values                   = array();
+
+					// Pre 2.4 handling where 'slugs' were saved instead of the full text attribute
+					if ( version_compare( get_post_meta( $product->get_id(), '_product_version', true ), '2.4.0', '<' ) ) {
+						$assigned_text_attributes = array_map( 'sanitize_title', $assigned_text_attributes );
+						foreach ( $text_attributes as $text_attribute ) {
+							if ( in_array( sanitize_title( $text_attribute ), $assigned_text_attributes ) ) {
+								$values[] = $text_attribute;
+							}
+						}
+					} else {
+						foreach ( $text_attributes as $text_attribute ) {
+							if ( in_array( $text_attribute, $assigned_text_attributes ) ) {
+								$values[] = $text_attribute;
+							}
+						}
+					}
+				}
+				$variation_attributes[ $attribute['name'] ] = array_unique( $values );
+			}
+		}
+
+		return $variation_attributes;
+	}
+
+	/**
+	 * Get an array of all sale and regular prices from all variations. This is used for example when displaying the price range at variable product level or seeing if the variable product is on sale.
+	 *
+	 * Can be filtered by plugins which modify costs, but otherwise will include the raw meta costs unlike get_price() which runs costs through the woocommerce_get_price filter.
+	 * This is to ensure modified prices are not cached, unless intended.
+	 *
+	 * @since  3.0.0
+	 * @param  WC_Product
+	 * @param  bool $include_taxes If taxes should be calculated or not.
+	 * @return array of prices
+	 */
+	public function read_price_data( &$product, $include_taxes = false ) {
+
+		/**
+		 * Transient name for storing prices for this product (note: Max transient length is 45)
+		 * @since 2.5.0 a single transient is used per product for all prices, rather than many transients per product.
+		 */
+		$transient_name = 'wc_var_prices_' . $product->get_id();
+
+		$price_hash = $this->get_price_hash( $product, $include_taxes );
+
+		/**
+		 * $this->prices_array is an array of values which may have been modified from what is stored in transients - this may not match $transient_cached_prices_array.
+		 * If the value has already been generated, we don't need to grab the values again so just return them. They are already filtered.
+		 */
+		if ( empty( $this->prices_array[ $price_hash ] ) ) {
+			$transient_cached_prices_array = array_filter( (array) json_decode( strval( get_transient( $transient_name ) ), true ) );
+
+			// If the product version has changed since the transient was last saved, reset the transient cache.
+			if ( empty( $transient_cached_prices_array['version'] ) || WC_Cache_Helper::get_transient_version( 'product' ) !== $transient_cached_prices_array['version'] ) {
+				$transient_cached_prices_array = array( 'version' => WC_Cache_Helper::get_transient_version( 'product' ) );
+			}
+
+			// If the prices are not stored for this hash, generate them and add to the transient.
+			if ( empty( $transient_cached_prices_array[ $price_hash ] ) ) {
+				$prices         = array();
+				$regular_prices = array();
+				$sale_prices    = array();
+				$variation_ids  = $product->get_visible_children();
+				foreach ( $variation_ids as $variation_id ) {
+					if ( $variation = wc_get_product( $variation_id ) ) {
+						$price         = apply_filters( 'woocommerce_variation_prices_price', $variation->get_price( 'edit' ), $variation, $product );
+						$regular_price = apply_filters( 'woocommerce_variation_prices_regular_price', $variation->get_regular_price( 'edit' ), $variation, $product );
+						$sale_price    = apply_filters( 'woocommerce_variation_prices_sale_price', $variation->get_sale_price( 'edit' ), $variation, $product );
+
+						// Skip empty prices
+						if ( '' === $price ) {
+							continue;
+						}
+
+						// If sale price does not equal price, the product is not yet on sale
+						if ( $sale_price === $regular_price || $sale_price !== $price ) {
+							$sale_price = $regular_price;
+						}
+
+						// If we are getting prices for display, we need to account for taxes
+						if ( $include_taxes ) {
+							if ( 'incl' === get_option( 'woocommerce_tax_display_shop' ) ) {
+								$price         = '' === $price ? ''         : wc_get_price_including_tax( $variation, array( 'qty' => 1, 'price' => $price ) );
+								$regular_price = '' === $regular_price ? '' : wc_get_price_including_tax( $variation, array( 'qty' => 1, 'price' => $regular_price ) );
+								$sale_price    = '' === $sale_price ? ''    : wc_get_price_including_tax( $variation, array( 'qty' => 1, 'price' => $sale_price ) );
+							} else {
+								$price         = '' === $price ? ''         : wc_get_price_excluding_tax( $variation, array( 'qty' => 1, 'price' => $price ) );
+								$regular_price = '' === $regular_price ? '' : wc_get_price_excluding_tax( $variation, array( 'qty' => 1, 'price' => $regular_price ) );
+								$sale_price    = '' === $sale_price ? ''    : wc_get_price_excluding_tax( $variation, array( 'qty' => 1, 'price' => $sale_price ) );
+							}
+						}
+
+						$prices[ $variation_id ]         = wc_format_decimal( $price, wc_get_price_decimals() );
+						$regular_prices[ $variation_id ] = wc_format_decimal( $regular_price, wc_get_price_decimals() );
+						$sale_prices[ $variation_id ]    = wc_format_decimal( $sale_price . '.00', wc_get_price_decimals() );
+					}
+				}
+
+				$transient_cached_prices_array[ $price_hash ] = array(
+					'price'         => $prices,
+					'regular_price' => $regular_prices,
+					'sale_price'    => $sale_prices,
+				);
+
+				set_transient( $transient_name, json_encode( $transient_cached_prices_array ), DAY_IN_SECONDS * 30 );
+			}
+
+			/**
+			 * Give plugins one last chance to filter the variation prices array which has been generated and store locally to the class.
+			 * This value may differ from the transient cache. It is filtered once before storing locally.
+			 */
+			$this->prices_array[ $price_hash ] = apply_filters( 'woocommerce_variation_prices', $transient_cached_prices_array[ $price_hash ], $product, $include_taxes );
+		}
+		return $this->prices_array[ $price_hash ];
+	}
+
+	/**
+	 * Create unique cache key based on the tax location (affects displayed/cached prices), product version and active price filters.
+	 * DEVELOPERS should filter this hash if offering conditonal pricing to keep it unique.
+	 *
+	 * @since  3.0.0
+	 * @param  WC_Product
+	 * @param  bool $include_taxes If taxes should be calculated or not.
+	 * @return string
+	 */
+	protected function get_price_hash( &$product, $include_taxes = false ) {
+		global $wp_filter;
+
+		$price_hash   = $include_taxes ? array( get_option( 'woocommerce_tax_display_shop', 'excl' ), WC_Tax::get_rates() ) : array( false );
+		$filter_names = array( 'woocommerce_variation_prices_price', 'woocommerce_variation_prices_regular_price', 'woocommerce_variation_prices_sale_price' );
+
+		foreach ( $filter_names as $filter_name ) {
+			if ( ! empty( $wp_filter[ $filter_name ] ) ) {
+				$price_hash[ $filter_name ] = array();
+
+				foreach ( $wp_filter[ $filter_name ] as $priority => $callbacks ) {
+					$price_hash[ $filter_name ][] = array_values( wp_list_pluck( $callbacks, 'function' ) );
+				}
+			}
+		}
+
+		$price_hash[] = WC_Cache_Helper::get_transient_version( 'product' );
+		$price_hash   = md5( json_encode( apply_filters( 'woocommerce_get_variation_prices_hash', $price_hash, $product, $include_taxes ) ) );
+
+		return $price_hash;
+	}
+
+	/**
+	 * Does a child have a weight set?
+	 *
+	 * @since 3.0.0
+	 * @param WC_Product
+	 * @return boolean
+	 */
+	public function child_has_weight( $product ) {
+		global $wpdb;
+		$children = $product->get_visible_children();
+		return $children ? null !== $wpdb->get_var( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_weight' AND meta_value > 0 AND post_id IN ( " . implode( ',', array_map( 'absint', $children ) ) . " )" ) : false;
+	}
+
+	/**
+	 * Does a child have dimensions set?
+	 *
+	 * @since 3.0.0
+	 * @param WC_Product
+	 * @return boolean
+	 */
+	public function child_has_dimensions( $product ) {
+		global $wpdb;
+		$children = $product->get_visible_children();
+		return $children ? null !== $wpdb->get_var( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key IN ( '_length', '_width', '_height' ) AND meta_value > 0 AND post_id IN ( " . implode( ',', array_map( 'absint', $children ) ) . " )" ) : false;
+	}
+
+	/**
+	 * Is a child in stock?
+	 *
+	 * @since 3.0.0
+	 * @param WC_Product
+	 * @return boolean
+	 */
+	public function child_is_in_stock( $product ) {
+		global $wpdb;
+		$children            = $product->get_children();
+		$oufofstock_children = $children ? $wpdb->get_var( "SELECT COUNT( post_id ) FROM $wpdb->postmeta WHERE meta_key = '_stock_status' AND meta_value = 'outofstock' AND post_id IN ( " . implode( ',', array_map( 'absint', $children ) ) . " )" ) : 0;
+		return count( $children ) > $oufofstock_children;
+	}
+
+	/**
+	 * Syncs all variation names if the parent name is changed.
+	 *
+	 * @param WC_Product $product
+	 * @param string $previous_name
+	 * @param string $new_name
+	 * @since 3.0.0
+	 */
+	public function sync_variation_names( &$product, $previous_name = '', $new_name = '' ) {
+		if ( $new_name !== $previous_name ) {
+			global $wpdb;
+
+			$wpdb->query( $wpdb->prepare(
+				"
+					UPDATE {$wpdb->posts}
+					SET post_title = REPLACE( post_title, %s, %s )
+					WHERE post_type = 'product_variation'
+					AND post_parent = %d
+				",
+				$previous_name ? $previous_name : 'AUTO-DRAFT',
+				$new_name,
+				$product->get_id()
+			 ) );
+		}
+	}
+
+	/**
+	 * Stock managed at the parent level - update children being managed by this product.
+	 * This sync function syncs downwards (from parent to child) when the variable product is saved.
+	 *
+	 * @param WC_Product
+	 * @since 3.0.0
+	 */
+	public function sync_managed_variation_stock_status( &$product ) {
+		global $wpdb;
+
+		if ( $product->get_manage_stock() ) {
+			$status           = $product->get_stock_status();
+			$children         = $product->get_children();
+			$managed_children = $children ? array_unique( $wpdb->get_col( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_manage_stock' AND meta_value != 'yes' AND post_id IN ( " . implode( ',', array_map( 'absint', $children ) ) . " )" ) ) : array();
+			$changed          = false;
+			foreach ( $managed_children as $managed_child ) {
+				if ( update_post_meta( $managed_child, '_stock_status', $status ) ) {
+					$changed = true;
+				}
+			}
+			if ( $changed ) {
+				$children = $this->read_children( $product, true );
+				$product->set_children( $children['all'] );
+				$product->set_visible_children( $children['visible'] );
+			}
+		}
+	}
+
+	/**
+	 * Sync variable product prices with children.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Product|int $product
+	 */
+	public function sync_price( &$product ) {
+		global $wpdb;
+
+		$children = $product->get_visible_children();
+		$prices   = $children ? array_unique( $wpdb->get_col( "SELECT meta_value FROM $wpdb->postmeta WHERE meta_key = '_price' AND post_id IN ( " . implode( ',', array_map( 'absint', $children ) ) . " )" ) ) : array();
+
+		delete_post_meta( $product->get_id(), '_price' );
+
+		if ( $prices ) {
+			sort( $prices );
+			// To allow sorting and filtering by multiple values, we have no choice but to store child prices in this manner.
+			foreach ( $prices as $price ) {
+				if ( is_null( $price ) || '' === $price ) {
+					continue;
+				}
+				add_post_meta( $product->get_id(), '_price', $price, false );
+			}
+		}
+	}
+
+	/**
+	 * Sync variable product stock status with children.
+	 * Change does not persist unless saved by caller.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Product|int $product
+	 */
+	public function sync_stock_status( &$product ) {
+		$product->set_stock_status( $product->child_is_in_stock() ? 'instock' : 'outofstock' );
+	}
+
+	/**
+	 * Delete variations of a product.
+	 *
+	 * @since 3.0.0
+	 * @param int $product_id
+	 * @param $force_delete False to trash.
+	 */
+	public function delete_variations( $product_id, $force_delete = false ) {
+		if ( ! is_numeric( $product_id ) || 0 >= $product_id ) {
+			return;
+		}
+
+		$variation_ids = wp_parse_id_list( get_posts( array(
+			'post_parent' => $product_id,
+			'post_type'   => 'product_variation',
+			'fields'      => 'ids',
+			'post_status' => array( 'any', 'trash', 'auto-draft' ),
+			'numberposts' => -1,
+		) ) );
+
+		if ( ! empty( $variation_ids ) ) {
+			foreach ( $variation_ids as $variation_id ) {
+				if ( $force_delete ) {
+					wp_delete_post( $variation_id, true );
+				} else {
+					wp_trash_post( $variation_id );
+				}
+			}
+		}
+
+		delete_transient( 'wc_product_children_' . $product_id );
+	}
+
+	/**
+	 * Untrash variations.
+	 *
+	 * @param int $product_id
+	 */
+	public function untrash_variations( $product_id ) {
+		$variation_ids = wp_parse_id_list( get_posts( array(
+			'post_parent' => $product_id,
+			'post_type'   => 'product_variation',
+			'fields'      => 'ids',
+			'post_status' => 'trash',
+			'numberposts' => -1,
+		) ) );
+
+		if ( ! empty( $variation_ids ) ) {
+			foreach ( $variation_ids as $variation_id ) {
+				wp_untrash_post( $variation_id );
+			}
+		}
+
+		delete_transient( 'wc_product_children_' . $product_id );
+	}
+}
diff --git a/includes/data-stores/class-wc-product-variation-data-store-cpt.php b/includes/data-stores/class-wc-product-variation-data-store-cpt.php
new file mode 100644
index 00000000000..6f686d5306f
--- /dev/null
+++ b/includes/data-stores/class-wc-product-variation-data-store-cpt.php
@@ -0,0 +1,365 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Variation Product Data Store: Stored in CPT.
+ *
+ * @version  3.0.0
+ * @category Class
+ * @author   WooThemes
+ */
+class WC_Product_Variation_Data_Store_CPT extends WC_Product_Data_Store_CPT implements WC_Object_Data_Store_Interface {
+
+	/**
+	 * Callback to remove unwanted meta data.
+	 *
+	 * @param object $meta
+	 * @return bool false if excluded.
+	 */
+	protected function exclude_internal_meta_keys( $meta ) {
+		return ! in_array( $meta->meta_key, $this->internal_meta_keys ) && 0 !== stripos( $meta->meta_key, 'attribute_' ) && 0 !== stripos( $meta->meta_key, 'wp_' );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| CRUD Methods
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Reads a product from the database and sets its data to the class.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Product
+	 */
+	public function read( &$product ) {
+		$product->set_defaults();
+
+		if ( ! $product->get_id() || ! ( $post_object = get_post( $product->get_id() ) ) || 'product_variation' !== $post_object->post_type ) {
+			return;
+		}
+
+		$id = $product->get_id();
+		$product->set_parent_id( $post_object->post_parent );
+		$parent_id = $product->get_parent_id();
+
+		// The post doesn't have a parent id, therefore its invalid and we should prevent this being created.
+		if ( empty( $parent_id ) ) {
+			throw new Exception( sprintf( 'No parent product set for variation #%d', $product->get_id() ), 422 );
+		}
+
+		// The post parent is not a valid variable product so we should prevent this being created.
+		if ( 'product' !== get_post_type( $product->get_parent_id() ) ) {
+			throw new Exception( sprintf( 'Invalid parent for variation #%d', $product->get_id() ), 422 );
+		}
+
+		$product->set_props( array(
+			'name'            => $post_object->post_title,
+			'slug'            => $post_object->post_name,
+			'date_created'    => 0 < $post_object->post_date_gmt ? wc_string_to_timestamp( $post_object->post_date_gmt ) : null,
+			'date_modified'   => 0 < $post_object->post_modified_gmt ? wc_string_to_timestamp( $post_object->post_modified_gmt ) : null,
+			'status'          => $post_object->post_status,
+			'menu_order'      => $post_object->menu_order,
+			'reviews_allowed' => 'open' === $post_object->comment_status,
+		) );
+
+		$this->read_downloads( $product );
+		$this->read_product_data( $product );
+		$this->read_extra_data( $product );
+		$product->set_attributes( wc_get_product_variation_attributes( $product->get_id() ) );
+
+		/**
+		 * If a variation title is not in sync with the parent e.g. saved prior to 3.0, or if the parent title has changed, detect here and update.
+		 */
+		if ( version_compare( get_post_meta( $product->get_id(), '_product_version', true ), '3.0', '<' ) && 0 !== strpos( $post_object->post_title, get_post_field( 'post_title', $product->get_parent_id() ) ) ) {
+			global $wpdb;
+
+			$new_title = $this->generate_product_title( $product );
+			$product->set_name( $new_title );
+			$wpdb->update( $wpdb->posts, array( 'post_title' => $new_title ), array( 'ID' => $product->get_id() ) );
+			clean_post_cache( $product->get_id() );
+		}
+
+		// Set object_read true once all data is read.
+		$product->set_object_read( true );
+	}
+
+	/**
+	 * Create a new product.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Product
+	 */
+	public function create( &$product ) {
+		if ( ! $product->get_date_created() ) {
+			$product->set_date_created( current_time( 'timestamp', true ) );
+		}
+
+		$id = wp_insert_post( apply_filters( 'woocommerce_new_product_variation_data', array(
+			'post_type'      => 'product_variation',
+			'post_status'    => $product->get_status() ? $product->get_status() : 'publish',
+			'post_author'    => get_current_user_id(),
+			'post_title'     => $this->generate_product_title( $product ),
+			'post_content'   => '',
+			'post_parent'    => $product->get_parent_id(),
+			'comment_status' => 'closed',
+			'ping_status'    => 'closed',
+			'menu_order'     => $product->get_menu_order(),
+			'post_date'      => gmdate( 'Y-m-d H:i:s', $product->get_date_created( 'edit' )->getOffsetTimestamp() ),
+			'post_date_gmt'  => gmdate( 'Y-m-d H:i:s', $product->get_date_created( 'edit' )->getTimestamp() ),
+		) ), true );
+
+		if ( $id && ! is_wp_error( $id ) ) {
+			$product->set_id( $id );
+
+			$this->update_post_meta( $product, true );
+			$this->update_terms( $product, true );
+			$this->update_attributes( $product, true );
+			$this->handle_updated_props( $product );
+
+			$product->save_meta_data();
+			$product->apply_changes();
+
+			$this->update_version_and_type( $product );
+
+			$this->clear_caches( $product );
+
+			do_action( 'woocommerce_new_product_variation', $id );
+		}
+	}
+
+	/**
+	 * Updates an existing product.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Product
+	 */
+	public function update( &$product ) {
+		$product->save_meta_data();
+		$changes = $product->get_changes();
+		$title   = $this->generate_product_title( $product );
+
+		// Only update the post when the post data changes.
+		if ( $title !== $product->get_name( 'edit' ) || array_intersect( array( 'parent_id', 'status', 'menu_order', 'date_created', 'date_modified' ), array_keys( $changes ) ) ) {
+			$post_data = array(
+				'post_title'        => $title,
+				'post_parent'       => $product->get_parent_id( 'edit' ),
+				'comment_status'    => 'closed',
+				'post_status'       => $product->get_status( 'edit' ) ? $product->get_status( 'edit' ) : 'publish',
+				'menu_order'        => $product->get_menu_order( 'edit' ),
+				'post_date'         => gmdate( 'Y-m-d H:i:s', $product->get_date_created( 'edit' )->getOffsetTimestamp() ),
+				'post_date_gmt'     => gmdate( 'Y-m-d H:i:s', $product->get_date_created( 'edit' )->getTimestamp() ),
+				'post_modified'     => isset( $changes['date_modified'] ) ? gmdate( 'Y-m-d H:i:s', $product->get_date_modified( 'edit' )->getOffsetTimestamp() ) : current_time( 'mysql' ),
+				'post_modified_gmt' => isset( $changes['date_modified'] ) ? gmdate( 'Y-m-d H:i:s', $product->get_date_modified( 'edit' )->getTimestamp() ) : current_time( 'mysql', 1 ),
+			);
+
+			/**
+			 * When updating this object, to prevent infinite loops, use $wpdb
+			 * to update data, since wp_update_post spawns more calls to the
+			 * save_post action.
+			 *
+			 * This ensures hooks are fired by either WP itself (admin screen save),
+			 * or an update purely from CRUD.
+			 */
+			if ( doing_action( 'save_post' ) ) {
+				$GLOBALS['wpdb']->update( $GLOBALS['wpdb']->posts, $post_data, array( 'ID' => $product->get_id() ) );
+				clean_post_cache( $product->get_id() );
+			} else {
+				wp_update_post( array_merge( array( 'ID' => $product->get_id() ), $post_data ) );
+			}
+			$product->read_meta_data( true ); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
+		}
+
+		$this->update_post_meta( $product );
+		$this->update_terms( $product );
+		$this->update_attributes( $product );
+		$this->handle_updated_props( $product );
+
+		$product->apply_changes();
+
+		$this->update_version_and_type( $product );
+
+		$this->clear_caches( $product );
+
+		do_action( 'woocommerce_update_product_variation', $product->get_id() );
+	}
+
+	/*
+	|--------------------------------------------------------------------------
+	| Additional Methods
+	|--------------------------------------------------------------------------
+	*/
+
+	/**
+	 * Generates a title with attribute information for a variation.
+	 * Products will get a title of the form "Name - Value, Value" or just "Name".
+	 *
+	 * @since 3.0.0
+	 * @param WC_Product
+	 * @return string
+	 */
+	protected function generate_product_title( $product ) {
+		$attributes = (array) $product->get_attributes();
+
+		// Don't include attributes if the product has 3+ attributes.
+		$should_include_attributes = count( $attributes ) < 3;
+
+		// Don't include attributes if an attribute name has 2+ words.
+		if ( $should_include_attributes ) {
+			foreach ( $attributes as $name => $value ) {
+				if ( false !== strpos( $name, '-' ) ) {
+					$should_include_attributes = false;
+					break;
+				}
+			}
+		}
+
+		$should_include_attributes = apply_filters( 'woocommerce_product_variation_title_include_attributes', $should_include_attributes, $product );
+		$separator                 = apply_filters( 'woocommerce_product_variation_title_attributes_separator', ' - ', $product );
+		$title_base                = get_post_field( 'post_title', $product->get_parent_id() );
+		$title_suffix              = $should_include_attributes ? wc_get_formatted_variation( $product, true, false ) : '';
+
+		return apply_filters( 'woocommerce_product_variation_title', rtrim( $title_base . $separator . $title_suffix, $separator ), $product, $title_base, $title_suffix );
+	}
+
+	/**
+	 * Make sure we store the product version (to track data changes).
+	 *
+	 * @param WC_Product
+	 * @since 3.0.0
+	 */
+	protected function update_version_and_type( &$product ) {
+		update_post_meta( $product->get_id(), '_product_version', WC_VERSION );
+	}
+
+	/**
+	 * Read post data.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Product
+	 */
+	protected function read_product_data( &$product ) {
+		$id = $product->get_id();
+		$product->set_props( array(
+			'description'       => get_post_meta( $id, '_variation_description', true ),
+			'regular_price'     => get_post_meta( $id, '_regular_price', true ),
+			'sale_price'        => get_post_meta( $id, '_sale_price', true ),
+			'date_on_sale_from' => get_post_meta( $id, '_sale_price_dates_from', true ),
+			'date_on_sale_to'   => get_post_meta( $id, '_sale_price_dates_to', true ),
+			'manage_stock'      => get_post_meta( $id, '_manage_stock', true ),
+			'stock_status'      => get_post_meta( $id, '_stock_status', true ),
+			'shipping_class_id' => current( $this->get_term_ids( $id, 'product_shipping_class' ) ),
+			'virtual'           => get_post_meta( $id, '_virtual', true ),
+			'downloadable'      => get_post_meta( $id, '_downloadable', true ),
+			'gallery_image_ids' => array_filter( explode( ',', get_post_meta( $id, '_product_image_gallery', true ) ) ),
+			'download_limit'    => get_post_meta( $id, '_download_limit', true ),
+			'download_expiry'   => get_post_meta( $id, '_download_expiry', true ),
+			'image_id'          => get_post_thumbnail_id( $id ),
+			'backorders'        => get_post_meta( $id, '_backorders', true ),
+			'sku'               => get_post_meta( $id, '_sku', true ),
+			'stock_quantity'    => get_post_meta( $id, '_stock', true ),
+			'weight'            => get_post_meta( $id, '_weight', true ),
+			'length'            => get_post_meta( $id, '_length', true ),
+			'width'             => get_post_meta( $id, '_width', true ),
+			'height'            => get_post_meta( $id, '_height', true ),
+			'tax_class'         => ! metadata_exists( 'post', $id, '_tax_class' ) ? 'parent' : get_post_meta( $id, '_tax_class', true ),
+		) );
+
+		if ( $product->is_on_sale( 'edit' ) ) {
+			$product->set_price( $product->get_sale_price( 'edit' ) );
+		} else {
+			$product->set_price( $product->get_regular_price( 'edit' ) );
+		}
+
+		$parent_object = get_post( $product->get_parent_id() );
+		$product->set_parent_data( array(
+			'title'             => $parent_object->post_title,
+			'sku'               => get_post_meta( $product->get_parent_id(), '_sku', true ),
+			'manage_stock'      => get_post_meta( $product->get_parent_id(), '_manage_stock', true ),
+			'backorders'        => get_post_meta( $product->get_parent_id(), '_backorders', true ),
+			'stock_quantity'    => get_post_meta( $product->get_parent_id(), '_stock', true ),
+			'weight'            => get_post_meta( $product->get_parent_id(), '_weight', true ),
+			'length'            => get_post_meta( $product->get_parent_id(), '_length', true ),
+			'width'             => get_post_meta( $product->get_parent_id(), '_width', true ),
+			'height'            => get_post_meta( $product->get_parent_id(), '_height', true ),
+			'tax_class'         => get_post_meta( $product->get_parent_id(), '_tax_class', true ),
+			'shipping_class_id' => absint( current( $this->get_term_ids( $product->get_parent_id(), 'product_shipping_class' ) ) ),
+			'image_id'          => get_post_thumbnail_id( $product->get_parent_id() ),
+		) );
+
+		// Pull data from the parent when there is no user-facing way to set props.
+		$product->set_sold_individually( get_post_meta( $product->get_parent_id(), '_sold_individually', true ) );
+		$product->set_tax_status( get_post_meta( $product->get_parent_id(), '_tax_status', true ) );
+		$product->set_cross_sell_ids( get_post_meta( $product->get_parent_id(), '_crosssell_ids', true ) );
+	}
+
+	/**
+	 * For all stored terms in all taxonomies, save them to the DB.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Product
+	 * @param bool Force update. Used during create.
+	 */
+	protected function update_terms( &$product, $force = false ) {
+		$changes = $product->get_changes();
+
+		if ( $force || array_key_exists( 'shipping_class_id', $changes ) ) {
+			wp_set_post_terms( $product->get_id(), array( $product->get_shipping_class_id( 'edit' ) ), 'product_shipping_class', false );
+		}
+	}
+
+	/**
+	 * Update attribute meta values.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Product
+	 * @param bool Force update. Used during create.
+	 */
+	protected function update_attributes( &$product, $force = false ) {
+		$changes = $product->get_changes();
+
+		if ( $force || array_key_exists( 'attributes', $changes ) ) {
+			global $wpdb;
+			$attributes             = $product->get_attributes();
+			$updated_attribute_keys = array();
+			foreach ( $attributes as $key => $value ) {
+				update_post_meta( $product->get_id(), 'attribute_' . $key, $value );
+				$updated_attribute_keys[] = 'attribute_' . $key;
+			}
+
+			// Remove old taxonomies attributes so data is kept up to date - first get attribute key names.
+			$delete_attribute_keys = $wpdb->get_col( $wpdb->prepare( "SELECT meta_key FROM {$wpdb->postmeta} WHERE meta_key LIKE 'attribute_%%' AND meta_key NOT IN ( '" . implode( "','", array_map( 'esc_sql', $updated_attribute_keys ) ) . "' ) AND post_id = %d;", $product->get_id() ) );
+
+			foreach ( $delete_attribute_keys as $key ) {
+				delete_post_meta( $product->get_id(), $key );
+			}
+		}
+	}
+
+	/**
+	 * Helper method that updates all the post meta for a product based on it's settings in the WC_Product class.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Product
+	 * @param bool Force update. Used during create.
+	 */
+	public function update_post_meta( &$product, $force = false ) {
+		$meta_key_to_props = array(
+			'_variation_description' => 'description',
+		);
+
+		$props_to_update = $force ? $meta_key_to_props : $this->get_props_to_update( $product, $meta_key_to_props );
+
+		foreach ( $props_to_update as $meta_key => $prop ) {
+			$value   = $product->{"get_$prop"}( 'edit' );
+			$updated = update_post_meta( $product->get_id(), $meta_key, $value );
+			if ( $updated ) {
+				$this->updated_props[] = $prop;
+			}
+		}
+
+		parent::update_post_meta( $product, $force );
+	}
+}
diff --git a/includes/data-stores/class-wc-shipping-zone-data-store.php b/includes/data-stores/class-wc-shipping-zone-data-store.php
new file mode 100644
index 00000000000..31aaa0d7d5f
--- /dev/null
+++ b/includes/data-stores/class-wc-shipping-zone-data-store.php
@@ -0,0 +1,289 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Shipping Zone Data Store.
+ *
+ * @version  3.0.0
+ * @category Class
+ * @author   WooCommerce
+ */
+class WC_Shipping_Zone_Data_Store extends WC_Data_Store_WP implements WC_Shipping_Zone_Data_Store_Interface, WC_Object_Data_Store_Interface {
+
+	/**
+	 * Method to create a new shipping zone.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Shipping_Zone
+	 */
+	public function create( &$zone ) {
+		global $wpdb;
+		$wpdb->insert( $wpdb->prefix . 'woocommerce_shipping_zones', array(
+			'zone_name'  => $zone->get_zone_name(),
+			'zone_order' => $zone->get_zone_order(),
+		) );
+		$zone->set_id( $wpdb->insert_id );
+		$zone->save_meta_data();
+		$this->save_locations( $zone );
+		$zone->apply_changes();
+		WC_Cache_Helper::incr_cache_prefix( 'shipping_zones' );
+		WC_Cache_Helper::get_transient_version( 'shipping', true );
+	}
+
+	/**
+	 * Update zone in the database.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Shipping_Zone
+	 */
+	public function update( &$zone ) {
+		global $wpdb;
+		if ( $zone->get_id() ) {
+			$wpdb->update( $wpdb->prefix . 'woocommerce_shipping_zones', array(
+				'zone_name'  => $zone->get_zone_name(),
+				'zone_order' => $zone->get_zone_order(),
+			), array( 'zone_id' => $zone->get_id() ) );
+		}
+		$zone->save_meta_data();
+		$this->save_locations( $zone );
+		$zone->apply_changes();
+		WC_Cache_Helper::incr_cache_prefix( 'shipping_zones' );
+		WC_Cache_Helper::get_transient_version( 'shipping', true );
+	}
+
+	/**
+	 * Method to read a shipping zone from the database.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Shipping_Zone
+	 */
+	public function read( &$zone ) {
+		global $wpdb;
+		if ( 0 === $zone->get_id() || "0" === $zone->get_id() ) {
+			$this->read_zone_locations( $zone );
+			$zone->set_zone_name( __( 'Rest of the World', 'woocommerce' ) );
+			$zone->read_meta_data();
+			$zone->set_object_read( true );
+			do_action( 'woocommerce_shipping_zone_loaded', $zone );
+		} elseif ( $zone_data = $wpdb->get_row( $wpdb->prepare( "SELECT zone_name, zone_order FROM {$wpdb->prefix}woocommerce_shipping_zones WHERE zone_id = %d LIMIT 1;", $zone->get_id() ) ) ) {
+			$zone->set_zone_name( $zone_data->zone_name );
+			$zone->set_zone_order( $zone_data->zone_order );
+			$this->read_zone_locations( $zone );
+			$zone->read_meta_data();
+			$zone->set_object_read( true );
+			do_action( 'woocommerce_shipping_zone_loaded', $zone );
+		} else {
+			throw new Exception( __( 'Invalid data store.', 'woocommerce' ) );
+		}
+	}
+
+	/**
+	 * Deletes a shipping zone from the database.
+	 *
+	 * @since  3.0.0
+	 * @param  WC_Shipping_Zone
+	 * @param  array $args Array of args to pass to the delete method.
+	 * @return bool result
+	 */
+	public function delete( &$zone, $args = array() ) {
+		if ( $zone->get_id() ) {
+			global $wpdb;
+			$wpdb->delete( $wpdb->prefix . 'woocommerce_shipping_zone_methods', array( 'zone_id' => $zone->get_id() ) );
+			$wpdb->delete( $wpdb->prefix . 'woocommerce_shipping_zone_locations', array( 'zone_id' => $zone->get_id() ) );
+			$wpdb->delete( $wpdb->prefix . 'woocommerce_shipping_zones', array( 'zone_id' => $zone->get_id() ) );
+			WC_Cache_Helper::incr_cache_prefix( 'shipping_zones' );
+			$id = $zone->get_id();
+			$zone->set_id( null );
+			WC_Cache_Helper::incr_cache_prefix( 'shipping_zones' );
+			WC_Cache_Helper::get_transient_version( 'shipping', true );
+			do_action( 'woocommerce_delete_shipping_zone', $id );
+		}
+	}
+
+	/**
+	 * Get a list of shipping methods for a specific zone.
+	 *
+	 * @since  3.0.0
+	 * @param  int   $zone_id      Zone ID
+	 * @param  bool  $enabled_only True to request enabled methods only.
+	 * @return array               Array of objects containing method_id, method_order, instance_id, is_enabled
+	 */
+	public function get_methods( $zone_id, $enabled_only ) {
+		global $wpdb;
+		$raw_methods_sql = $enabled_only ? "SELECT method_id, method_order, instance_id, is_enabled FROM {$wpdb->prefix}woocommerce_shipping_zone_methods WHERE zone_id = %d AND is_enabled = 1;" : "SELECT method_id, method_order, instance_id, is_enabled FROM {$wpdb->prefix}woocommerce_shipping_zone_methods WHERE zone_id = %d;";
+		return $wpdb->get_results( $wpdb->prepare( $raw_methods_sql, $zone_id ) );
+	}
+
+	/**
+	 * Get count of methods for a zone.
+	 *
+	 * @since  3.0.0
+	 * @param  int Zone ID
+	 * @return int Method Count
+	 */
+	public function get_method_count( $zone_id ) {
+		global $wpdb;
+		return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM {$wpdb->prefix}woocommerce_shipping_zone_methods WHERE zone_id = %d", $zone_id ) );
+	}
+
+	/**
+	 * Add a shipping method to a zone.
+	 *
+	 * @since  3.0.0
+	 * @param  int    $zone_id Zone ID
+	 * @param  string $type    Method Type/ID
+	 * @param  int    $order   Method Order
+	 * @return int             Instance ID
+	 */
+	public function add_method( $zone_id, $type, $order ) {
+		global $wpdb;
+		$wpdb->insert(
+			$wpdb->prefix . 'woocommerce_shipping_zone_methods',
+			array(
+				'method_id'    => $type,
+				'zone_id'      => $zone_id,
+				'method_order' => $order,
+			),
+			array(
+				'%s',
+				'%d',
+				'%d',
+			)
+		);
+		return $wpdb->insert_id;
+	}
+
+	/**
+	 * Delete a method instance.
+	 *
+	 * @since 3.0.0
+	 * @param int $instance_id
+	 */
+	public function delete_method( $instance_id ) {
+		global $wpdb;
+		$wpdb->delete( $wpdb->prefix . 'woocommerce_shipping_zone_methods', array( 'instance_id' => $instance_id ) );
+		do_action( 'woocommerce_delete_shipping_zone_method', $instance_id );
+	}
+
+	/**
+	 * Get a shipping zone method instance.
+	 *
+	 * @since  3.0.0
+	 * @param  int
+	 * @return object
+	 */
+	public function get_method( $instance_id ) {
+		global $wpdb;
+		return $wpdb->get_row( $wpdb->prepare( "SELECT zone_id, method_id, instance_id, method_order, is_enabled FROM {$wpdb->prefix}woocommerce_shipping_zone_methods WHERE instance_id = %d LIMIT 1;", $instance_id ) );
+	}
+
+	/**
+	 * Find a matching zone ID for a given package.
+	 *
+	 * @since  3.0.0
+	 * @param  object $package
+	 * @return int
+	 */
+	public function get_zone_id_from_package( $package ) {
+		global $wpdb;
+
+		$country          = strtoupper( wc_clean( $package['destination']['country'] ) );
+		$state            = strtoupper( wc_clean( $package['destination']['state'] ) );
+		$continent        = strtoupper( wc_clean( WC()->countries->get_continent_code_for_country( $country ) ) );
+		$postcode         = wc_normalize_postcode( wc_clean( $package['destination']['postcode'] ) );
+
+		// Work out criteria for our zone search
+		$criteria   = array();
+		$criteria[] = $wpdb->prepare( "( ( location_type = 'country' AND location_code = %s )", $country );
+		$criteria[] = $wpdb->prepare( "OR ( location_type = 'state' AND location_code = %s )", $country . ':' . $state );
+		$criteria[] = $wpdb->prepare( "OR ( location_type = 'continent' AND location_code = %s )", $continent );
+		$criteria[] = "OR ( location_type IS NULL ) )";
+
+		// Postcode range and wildcard matching
+		$postcode_locations = $wpdb->get_results( "SELECT zone_id, location_code FROM {$wpdb->prefix}woocommerce_shipping_zone_locations WHERE location_type = 'postcode';" );
+
+		if ( $postcode_locations ) {
+			$zone_ids_with_postcode_rules = array_map( 'absint', wp_list_pluck( $postcode_locations, 'zone_id' ) );
+			$matches                      = wc_postcode_location_matcher( $postcode, $postcode_locations, 'zone_id', 'location_code', $country );
+			$do_not_match                 = array_unique( array_diff( $zone_ids_with_postcode_rules, array_keys( $matches ) ) );
+
+			if ( ! empty( $do_not_match ) ) {
+				$criteria[] = "AND zones.zone_id NOT IN (" . implode( ',', $do_not_match ) . ")";
+			}
+		}
+
+		// Get matching zones
+		return $wpdb->get_var( "
+			SELECT zones.zone_id FROM {$wpdb->prefix}woocommerce_shipping_zones as zones
+			LEFT OUTER JOIN {$wpdb->prefix}woocommerce_shipping_zone_locations as locations ON zones.zone_id = locations.zone_id AND location_type != 'postcode'
+			WHERE " . implode( ' ', $criteria ) . "
+			ORDER BY zone_order ASC LIMIT 1
+		" );
+	}
+
+	/**
+	 * Return an ordered list of zones.
+	 *
+	 * @since 3.0.0
+	 * @return array An array of objects containing a zone_id, zone_name, and zone_order.
+	 */
+	public function get_zones() {
+		global $wpdb;
+		return $wpdb->get_results( "SELECT zone_id, zone_name, zone_order FROM {$wpdb->prefix}woocommerce_shipping_zones order by zone_order ASC;" );
+	}
+
+
+	/**
+	 * Return a zone ID from an instance ID.
+	 *
+	 * @since  3.0.0
+	 * @param  int
+	 * @return int
+	 */
+	public function get_zone_id_by_instance_id( $id ) {
+		global $wpdb;
+		return $wpdb->get_var( $wpdb->prepare( "SELECT zone_id FROM {$wpdb->prefix}woocommerce_shipping_zone_methods as methods WHERE methods.instance_id = %d LIMIT 1;", $id ) );
+	}
+
+	/**
+	 * Read location data from the database.
+	 *
+	 * @param WC_Shipping_Zone
+	 */
+	private function read_zone_locations( &$zone ) {
+		global $wpdb;
+		if ( $locations = $wpdb->get_results( $wpdb->prepare( "SELECT location_code, location_type FROM {$wpdb->prefix}woocommerce_shipping_zone_locations WHERE zone_id = %d;", $zone->get_id() ) ) ) {
+			foreach ( $locations as $location ) {
+				$zone->add_location( $location->location_code, $location->location_type );
+			}
+		}
+	}
+
+	/**
+	 * Save locations to the DB.
+	 * This function clears old locations, then re-inserts new if any changes are found.
+	 *
+	 * @since 3.0.0
+	 * @param WC_Shipping_Zone
+	 */
+	private function save_locations( &$zone ) {
+		$updated_props = array();
+		$changed_props = array_keys( $zone->get_changes() );
+		if ( ! in_array( 'zone_locations', $changed_props ) ) {
+			return false;
+		}
+
+		global $wpdb;
+		$wpdb->delete( $wpdb->prefix . 'woocommerce_shipping_zone_locations', array( 'zone_id' => $zone->get_id() ) );
+
+		foreach ( $zone->get_zone_locations( 'edit' ) as $location ) {
+			$wpdb->insert( $wpdb->prefix . 'woocommerce_shipping_zone_locations', array(
+				'zone_id'       => $zone->get_id(),
+				'location_code' => $location->code,
+				'location_type' => $location->type,
+			) );
+		}
+	}
+}
diff --git a/includes/emails/class-wc-email-cancelled-order.php b/includes/emails/class-wc-email-cancelled-order.php
index 2109735a2d3..e2d77034b71 100644
--- a/includes/emails/class-wc-email-cancelled-order.php
+++ b/includes/emails/class-wc-email-cancelled-order.php
@@ -4,7 +4,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
-if ( ! class_exists( 'WC_Email_Cancelled_Order' ) ) :
+if ( ! class_exists( 'WC_Email_Cancelled_Order', false ) ) :
 
 /**
  * Cancelled Order Email.
@@ -32,8 +32,8 @@ class WC_Email_Cancelled_Order extends WC_Email {
 		$this->template_plain   = 'emails/plain/admin-cancelled-order.php';
 
 		// Triggers for this email
-		add_action( 'woocommerce_order_status_pending_to_cancelled_notification', array( $this, 'trigger' ) );
-		add_action( 'woocommerce_order_status_on-hold_to_cancelled_notification', array( $this, 'trigger' ) );
+		add_action( 'woocommerce_order_status_pending_to_cancelled_notification', array( $this, 'trigger' ), 10, 2 );
+		add_action( 'woocommerce_order_status_on-hold_to_cancelled_notification', array( $this, 'trigger' ), 10, 2 );
 
 		// Call parent constructor
 		parent::__construct();
@@ -43,14 +43,21 @@ class WC_Email_Cancelled_Order extends WC_Email {
 	}
 
 	/**
-	 * Trigger.
+	 * Trigger the sending of this email.
+	 *
+	 * @param int $order_id The order ID.
+	 * @param WC_Order $order Order object.
 	 */
-	public function trigger( $order_id ) {
-		if ( $order_id ) {
-			$this->object                  = wc_get_order( $order_id );
+	public function trigger( $order_id, $order = false ) {
+		if ( $order_id && ! is_a( $order, 'WC_Order' ) ) {
+			$order = wc_get_order( $order_id );
+		}
+
+		if ( is_a( $order, 'WC_Order' ) ) {
+			$this->object                  = $order;
 			$this->find['order-date']      = '{order_date}';
 			$this->find['order-number']    = '{order_number}';
-			$this->replace['order-date']   = date_i18n( wc_date_format(), strtotime( $this->object->order_date ) );
+			$this->replace['order-date']   = wc_format_datetime( $this->object->get_date_created() );
 			$this->replace['order-number'] = $this->object->get_order_number();
 		}
 
@@ -62,7 +69,7 @@ class WC_Email_Cancelled_Order extends WC_Email {
 	}
 
 	/**
-	 * get_content_html function.
+	 * Get content html.
 	 *
 	 * @access public
 	 * @return string
@@ -73,7 +80,7 @@ class WC_Email_Cancelled_Order extends WC_Email {
 			'email_heading' => $this->get_heading(),
 			'sent_to_admin' => true,
 			'plain_text'    => false,
-			'email'			=> $this
+			'email'			=> $this,
 		) );
 	}
 
@@ -88,7 +95,7 @@ class WC_Email_Cancelled_Order extends WC_Email {
 			'email_heading' => $this->get_heading(),
 			'sent_to_admin' => true,
 			'plain_text'    => true,
-			'email'			=> $this
+			'email'			=> $this,
 		) );
 	}
 
@@ -101,31 +108,34 @@ class WC_Email_Cancelled_Order extends WC_Email {
 				'title'         => __( 'Enable/Disable', 'woocommerce' ),
 				'type'          => 'checkbox',
 				'label'         => __( 'Enable this email notification', 'woocommerce' ),
-				'default'       => 'yes'
+				'default'       => 'yes',
 			),
 			'recipient' => array(
 				'title'         => __( 'Recipient(s)', 'woocommerce' ),
 				'type'          => 'text',
-				'description'   => sprintf( __( 'Enter recipients (comma separated) for this email. Defaults to <code>%s</code>.', 'woocommerce' ), esc_attr( get_option('admin_email') ) ),
+				/* translators: %s: admin email */
+				'description'   => sprintf( __( 'Enter recipients (comma separated) for this email. Defaults to %s.', 'woocommerce' ), '<code>' . esc_attr( get_option( 'admin_email' ) ) . '</code>' ),
 				'placeholder'   => '',
 				'default'       => '',
-				'desc_tip'      => true
+				'desc_tip'      => true,
 			),
 			'subject' => array(
 				'title'         => __( 'Subject', 'woocommerce' ),
 				'type'          => 'text',
-				'description'   => sprintf( __( 'This controls the email subject line. Leave blank to use the default subject: <code>%s</code>.', 'woocommerce' ), $this->subject ),
+				/* translators: %s: default subject */
+				'description'   => sprintf( __( 'This controls the email subject line. Leave blank to use the default subject: %s.', 'woocommerce' ), '<code>' . $this->subject . '</code>' ),
 				'placeholder'   => '',
 				'default'       => '',
-				'desc_tip'      => true
+				'desc_tip'      => true,
 			),
 			'heading' => array(
-				'title'         => __( 'Email Heading', 'woocommerce' ),
+				'title'         => __( 'Email heading', 'woocommerce' ),
 				'type'          => 'text',
-				'description'   => sprintf( __( 'This controls the main heading contained within the email notification. Leave blank to use the default heading: <code>%s</code>.', 'woocommerce' ), $this->heading ),
+				/* translators: %s: default heading */
+				'description'   => sprintf( __( 'This controls the main heading contained within the email notification. Leave blank to use the default heading: %s.', 'woocommerce' ), '<code>' . $this->heading . '</code>' ),
 				'placeholder'   => '',
 				'default'       => '',
-				'desc_tip'      => true
+				'desc_tip'      => true,
 			),
 			'email_type' => array(
 				'title'         => __( 'Email type', 'woocommerce' ),
@@ -134,8 +144,8 @@ class WC_Email_Cancelled_Order extends WC_Email {
 				'default'       => 'html',
 				'class'         => 'email_type wc-enhanced-select',
 				'options'       => $this->get_email_type_options(),
-				'desc_tip'      => true
-			)
+				'desc_tip'      => true,
+			),
 		);
 	}
 }
diff --git a/includes/emails/class-wc-email-customer-completed-order.php b/includes/emails/class-wc-email-customer-completed-order.php
index 0119a357afe..0bc97d73bf1 100644
--- a/includes/emails/class-wc-email-customer-completed-order.php
+++ b/includes/emails/class-wc-email-customer-completed-order.php
@@ -4,7 +4,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
 
-if ( ! class_exists( 'WC_Email_Customer_Completed_Order' ) ) :
+if ( ! class_exists( 'WC_Email_Customer_Completed_Order', false ) ) :
 
 /**
  * Customer Completed Order Email.
@@ -22,7 +22,7 @@ class WC_Email_Customer_Completed_Order extends WC_Email {
 	/**
 	 * Constructor.
 	 */
-	function __construct() {
+	public function __construct() {
 
 		$this->id             = 'customer_completed_order';
 		$this->customer_email = true;
@@ -36,7 +36,7 @@ class WC_Email_Customer_Completed_Order extends WC_Email {
 		$this->template_plain = 'emails/plain/customer-completed-order.php';
 
 		// Triggers for this email
-		add_action( 'woocommerce_order_status_completed_notification', array( $this, 'trigger' ) );
+		add_action( 'woocommerce_order_status_completed_notification', array( $this, 'trigger' ), 10, 2 );
 
 		// Other settings
 		$this->heading_downloadable = $this->get_option( 'heading_downloadable', __( 'Your order is complete - download your files', 'woocommerce' ) );
@@ -47,18 +47,24 @@ class WC_Email_Customer_Completed_Order extends WC_Email {
 	}
 
 	/**
-	 * Trigger.
+	 * Trigger the sending of this email.
+	 *
+	 * @param int $order_id The order ID.
+	 * @param WC_Order $order Order object.
 	 */
-	function trigger( $order_id ) {
+	public function trigger( $order_id, $order = false ) {
+		if ( $order_id && ! is_a( $order, 'WC_Order' ) ) {
+			$order = wc_get_order( $order_id );
+		}
 
-		if ( $order_id ) {
-			$this->object                  = wc_get_order( $order_id );
-			$this->recipient               = $this->object->billing_email;
+		if ( is_a( $order, 'WC_Order' ) ) {
+			$this->object                  = $order;
+			$this->recipient               = $this->object->get_billing_email();
 
 			$this->find['order-date']      = '{order_date}';
 			$this->find['order-number']    = '{order_number}';
 
-			$this->replace['order-date']   = date_i18n( wc_date_format(), strtotime( $this->object->order_date ) );
+			$this->replace['order-date']   = wc_format_datetime( $this->object->get_date_created() );
 			$this->replace['order-number'] = $this->object->get_order_number();
 		}
 
@@ -70,12 +76,12 @@ class WC_Email_Customer_Completed_Order extends WC_Email {
 	}
 
 	/**
-	 * get_subject function.
+	 * Get email subject.
 	 *
 	 * @access public
 	 * @return string
 	 */
-	function get_subject() {
+	public function get_subject() {
 		if ( ! empty( $this->object ) && $this->object->has_downloadable_item() ) {
 			return apply_filters( 'woocommerce_email_subject_customer_completed_order', $this->format_string( $this->subject_downloadable ), $this->object );
 		} else {
@@ -84,12 +90,12 @@ class WC_Email_Customer_Completed_Order extends WC_Email {
 	}
 
 	/**
-	 * get_heading function.
+	 * Get email heading.
 	 *
 	 * @access public
 	 * @return string
 	 */
-	function get_heading() {
+	public function get_heading() {
 		if ( ! empty( $this->object ) && $this->object->has_downloadable_item() ) {
 			return apply_filters( 'woocommerce_email_heading_customer_completed_order', $this->format_string( $this->heading_downloadable ), $this->object );
 		} else {
@@ -98,18 +104,18 @@ class WC_Email_Customer_Completed_Order extends WC_Email {
 	}
 
 	/**
-	 * get_content_html function.
+	 * Get content html.
 	 *
 	 * @access public
 	 * @return string
 	 */
-	function get_content_html() {
+	public function get_content_html() {
 		return wc_get_template_html( $this->template_html, array(
 			'order'         => $this->object,
 			'email_heading' => $this->get_heading(),
 			'sent_to_admin' => false,
 			'plain_text'    => false,
-			'email'			=> $this
+			'email'			=> $this,
 		) );
 	}
 
@@ -118,58 +124,62 @@ class WC_Email_Customer_Completed_Order extends WC_Email {
 	 *
 	 * @return string
 	 */
-	function get_content_plain() {
+	public function get_content_plain() {
 		return wc_get_template_html( $this->template_plain, array(
 			'order'         => $this->object,
 			'email_heading' => $this->get_heading(),
 			'sent_to_admin' => false,
 			'plain_text'    => true,
-			'email'			=> $this
+			'email'			=> $this,
 		) );
 	}
 
 	/**
 	 * Initialise settings form fields.
 	 */
-	function init_form_fields() {
+	public function init_form_fields() {
 		$this->form_fields = array(
 			'enabled' => array(
 				'title'         => __( 'Enable/Disable', 'woocommerce' ),
 				'type'          => 'checkbox',
 				'label'         => __( 'Enable this email notification', 'woocommerce' ),
-				'default'       => 'yes'
+				'default'       => 'yes',
 			),
 			'subject' => array(
 				'title'         => __( 'Subject', 'woocommerce' ),
 				'type'          => 'text',
-				'description'   => sprintf( __( 'Defaults to <code>%s</code>', 'woocommerce' ), $this->subject ),
+				/* translators: %s: default subject */
+				'description'   => sprintf( __( 'Defaults to %s', 'woocommerce' ), '<code>' . $this->subject . '</code>' ),
 				'placeholder'   => '',
 				'default'       => '',
-				'desc_tip'      => true
+				'desc_tip'      => true,
 			),
 			'heading' => array(
-				'title'         => __( 'Email Heading', 'woocommerce' ),
+				'title'         => __( 'Email heading', 'woocommerce' ),
 				'type'          => 'text',
-				'description'   => sprintf( __( 'Defaults to <code>%s</code>', 'woocommerce' ), $this->heading ),
+				/* translators: %s: default heading */
+				'description'   => sprintf( __( 'Defaults to %s', 'woocommerce' ), '<code>' . $this->heading . '</code>' ),
 				'placeholder'   => '',
 				'default'       => '',
-				'desc_tip'      => true
+				'desc_tip'      => true,
 			),
 			'subject_downloadable' => array(
 				'title'         => __( 'Subject (downloadable)', 'woocommerce' ),
 				'type'          => 'text',
-				'description'   => sprintf( __( 'Defaults to <code>%s</code>', 'woocommerce' ), $this->subject_downloadable ),
+				/* translators: %s: default subject */
+				'description'   => sprintf( __( 'Defaults to %s', 'woocommerce' ), '<code>' . $this->subject_downloadable . '</code>' ),
 				'placeholder'   => '',
 				'default'       => '',
-				'desc_tip'      => true
+				'desc_tip'      => true,
 			),
 			'heading_downloadable' => array(
-				'title'         => __( 'Email Heading (downloadable)', 'woocommerce' ),
+				'title'         => __( 'Email heading (downloadable)', 'woocommerce' ),
 				'type'          => 'text',
-				'description'   => sprintf( __( 'Defaults to <code>%s</code>', 'woocommerce' ), $this->heading_downloadable ),
+				/* translators: %s: default heading */
+				'description'   => sprintf( __( 'Defaults to %s', 'woocommerce' ), '<code>' . $this->heading_downloadable . '</code>' ),
 				'placeholder'   => '',
 				'default'       => '',
-				'desc_tip'      => true
+				'desc_tip'      => true,
 			),
 			'email_type' => array(
 				'title'         => __( 'Email type', 'woocommerce' ),
@@ -178,8 +188,8 @@ class WC_Email_Customer_Completed_Order extends WC_Email {
 				'default'       => 'html',
 				'class'         => 'email_type wc-enhanced-select',
 				'options'       => $this->get_email_type_options(),
-				'desc_tip'      => true
-			)
+				'desc_tip'      => true,
+			),
 		);
 	}
 }
diff --git a/includes/emails/class-wc-email-customer-invoice.php b/includes/emails/class-wc-email-customer-invoice.php
index 84f18ddbe28..9e4eb8ca423 100644
--- a/includes/emails/class-wc-email-customer-invoice.php
+++ b/includes/emails/class-wc-email-customer-invoice.php
@@ -4,7 +4,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
 
-if ( ! class_exists( 'WC_Email_Customer_Invoice' ) ) :
+if ( ! class_exists( 'WC_Email_Customer_Invoice', false ) ) :
 
 /**
  * Customer Invoice.
@@ -19,13 +19,24 @@ if ( ! class_exists( 'WC_Email_Customer_Invoice' ) ) :
  */
 class WC_Email_Customer_Invoice extends WC_Email {
 
+	/**
+	 * Strings to find in subjects/headings.
+	 *
+	 * @var array
+	 */
 	public $find;
+
+	/**
+	 * Strings to replace in subjects/headings.
+	 *
+	 * @var array
+	 */
 	public $replace;
 
 	/**
 	 * Constructor.
 	 */
-	function __construct() {
+	public function __construct() {
 
 		$this->id             = 'customer_invoice';
 		$this->title          = __( 'Customer invoice', 'woocommerce' );
@@ -34,11 +45,11 @@ class WC_Email_Customer_Invoice extends WC_Email {
 		$this->template_html  = 'emails/customer-invoice.php';
 		$this->template_plain = 'emails/plain/customer-invoice.php';
 
-		$this->subject        = __( 'Invoice for order {order_number} from {order_date}', 'woocommerce');
-		$this->heading        = __( 'Invoice for order {order_number}', 'woocommerce');
+		$this->subject        = __( 'Invoice for order {order_number} from {order_date}', 'woocommerce' );
+		$this->heading        = __( 'Invoice for order {order_number}', 'woocommerce' );
 
-		$this->subject_paid   = __( 'Your {site_title} order from {order_date}', 'woocommerce');
-		$this->heading_paid   = __( 'Order {order_number} details', 'woocommerce');
+		$this->subject_paid   = __( 'Your {site_title} order from {order_date}', 'woocommerce' );
+		$this->heading_paid   = __( 'Order {order_number} details', 'woocommerce' );
 
 		// Call parent constructor
 		parent::__construct();
@@ -50,22 +61,24 @@ class WC_Email_Customer_Invoice extends WC_Email {
 	}
 
 	/**
-	 * Trigger.
+	 * Trigger the sending of this email.
+	 *
+	 * @param int $order_id The order ID.
+	 * @param WC_Order $order Order object.
 	 */
-	function trigger( $order ) {
-
-		if ( ! is_object( $order ) ) {
-			$order = wc_get_order( absint( $order ) );
+	public function trigger( $order_id, $order = false ) {
+		if ( $order_id && ! is_a( $order, 'WC_Order' ) ) {
+			$order = wc_get_order( $order_id );
 		}
 
-		if ( $order ) {
+		if ( is_a( $order, 'WC_Order' ) ) {
 			$this->object                  = $order;
-			$this->recipient               = $this->object->billing_email;
+			$this->recipient               = $this->object->get_billing_email();
 
 			$this->find['order-date']      = '{order_date}';
 			$this->find['order-number']    = '{order_number}';
 
-			$this->replace['order-date']   = date_i18n( wc_date_format(), strtotime( $this->object->order_date ) );
+			$this->replace['order-date']   = wc_format_datetime( $this->object->get_date_created() );
 			$this->replace['order-number'] = $this->object->get_order_number();
 		}
 
@@ -77,13 +90,13 @@ class WC_Email_Customer_Invoice extends WC_Email {
 	}
 
 	/**
-	 * get_subject function.
+	 * Get email subject.
 	 *
 	 * @access public
 	 * @return string
 	 */
-	function get_subject() {
-		if ( $this->object->has_status( array( 'processing', 'completed' ) ) ) {
+	public function get_subject() {
+		if ( $this->object->has_status( wc_get_is_paid_statuses() ) ) {
 			return apply_filters( 'woocommerce_email_subject_customer_invoice_paid', $this->format_string( $this->subject_paid ), $this->object );
 		} else {
 			return apply_filters( 'woocommerce_email_subject_customer_invoice', $this->format_string( $this->subject ), $this->object );
@@ -91,12 +104,12 @@ class WC_Email_Customer_Invoice extends WC_Email {
 	}
 
 	/**
-	 * get_heading function.
+	 * Get email heading.
 	 *
 	 * @access public
 	 * @return string
 	 */
-	function get_heading() {
+	public function get_heading() {
 		if ( $this->object->has_status( array( 'completed', 'processing' ) ) ) {
 			return apply_filters( 'woocommerce_email_heading_customer_invoice_paid', $this->format_string( $this->heading_paid ), $this->object );
 		} else {
@@ -105,83 +118,87 @@ class WC_Email_Customer_Invoice extends WC_Email {
 	}
 
 	/**
-	 * get_content_html function.
+	 * Get content html.
 	 *
 	 * @access public
 	 * @return string
 	 */
-	function get_content_html() {
+	public function get_content_html() {
 		return wc_get_template_html( $this->template_html, array(
 			'order'         => $this->object,
 			'email_heading' => $this->get_heading(),
 			'sent_to_admin' => false,
 			'plain_text'    => false,
-			'email'			=> $this
+			'email'			=> $this,
 		) );
 	}
 
 	/**
-	 * get_content_plain function.
+	 * Get content plain.
 	 *
 	 * @access public
 	 * @return string
 	 */
-	function get_content_plain() {
+	public function get_content_plain() {
 		return wc_get_template_html( $this->template_plain, array(
 			'order'         => $this->object,
 			'email_heading' => $this->get_heading(),
 			'sent_to_admin' => false,
 			'plain_text'    => true,
-			'email'			=> $this
+			'email'			=> $this,
 		) );
 	}
 
 	/**
 	 * Initialise settings form fields.
 	 */
-	function init_form_fields() {
+	public function init_form_fields() {
 		$this->form_fields = array(
 			'subject' => array(
-				'title'         => __( 'Email Subject', 'woocommerce' ),
+				'title'         => __( 'Email subject', 'woocommerce' ),
 				'type'          => 'text',
-				'description'   => sprintf( __( 'Defaults to <code>%s</code>', 'woocommerce' ), $this->subject ),
+				/* translators: %s: default subject */
+				'description'   => sprintf( __( 'Defaults to %s', 'woocommerce' ), '<code>' . $this->subject . '</code>' ),
 				'placeholder'   => '',
 				'default'       => '',
-				'desc_tip'      => true
+				'desc_tip'      => true,
 			),
 			'heading' => array(
-				'title'         => __( 'Email Heading', 'woocommerce' ),
+				'title'         => __( 'Email heading', 'woocommerce' ),
 				'type'          => 'text',
-				'description'   => sprintf( __( 'Defaults to <code>%s</code>', 'woocommerce' ), $this->heading ),
+				/* translators: %s: default heading */
+				'description'   => sprintf( __( 'Defaults to %s', 'woocommerce' ), '<code>' . $this->heading . '</code>' ),
 				'placeholder'   => '',
 				'default'       => '',
-				'desc_tip'      => true
+				'desc_tip'      => true,
 			),
 			'subject_paid' => array(
-				'title'         => __( 'Email Subject (paid)', 'woocommerce' ),
+				'title'         => __( 'Email subject (paid)', 'woocommerce' ),
 				'type'          => 'text',
-				'description'   => sprintf( __( 'Defaults to <code>%s</code>', 'woocommerce' ), $this->subject_paid ),
+				/* translators: %s: default subject */
+				'description'   => sprintf( __( 'Defaults to %s', 'woocommerce' ), '<code>' . $this->subject_paid . '</code>' ),
 				'placeholder'   => '',
 				'default'       => '',
-				'desc_tip'      => true
+				'desc_tip'      => true,
 			),
 			'heading_paid' => array(
-				'title'         => __( 'Email Heading (paid)', 'woocommerce' ),
+				'title'         => __( 'Email heading (paid)', 'woocommerce' ),
 				'type'          => 'text',
-				'description'   => sprintf( __( 'Defaults to <code>%s</code>', 'woocommerce' ), $this->heading_paid ),
+				/* translators: %s: default heading */
+				'description'   => sprintf( __( 'Defaults to %s', 'woocommerce' ), '<code>' . $this->heading_paid . '</code>' ),
 				'placeholder'   => '',
 				'default'       => '',
-				'desc_tip'      => true
+				'desc_tip'      => true,
 			),
 			'email_type' => array(
-				'title'         => __( 'Email Type', 'woocommerce' ),
+				'title'         => __( 'Email type', 'woocommerce' ),
 				'type'          => 'select',
 				'description'   => __( 'Choose which format of email to send.', 'woocommerce' ),
 				'default'       => 'html',
 				'class'         => 'email_type wc-enhanced-select',
 				'options'       => $this->get_email_type_options(),
-				'desc_tip'      => true
-			)
+				'desc_tip'      => true,
+			),
 		);
 	}
 }
diff --git a/includes/emails/class-wc-email-customer-new-account.php b/includes/emails/class-wc-email-customer-new-account.php
index 355a73fe511..4803d1679fd 100644
--- a/includes/emails/class-wc-email-customer-new-account.php
+++ b/includes/emails/class-wc-email-customer-new-account.php
@@ -4,7 +4,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
 
-if ( ! class_exists( 'WC_Email_Customer_New_Account' ) ) :
+if ( ! class_exists( 'WC_Email_Customer_New_Account', false ) ) :
 
 /**
  * Customer New Account.
@@ -19,15 +19,38 @@ if ( ! class_exists( 'WC_Email_Customer_New_Account' ) ) :
  */
 class WC_Email_Customer_New_Account extends WC_Email {
 
+	/**
+	 * User login name.
+	 *
+	 * @var string
+	 */
 	public $user_login;
+
+	/**
+	 * User email.
+	 *
+	 * @var string
+	 */
 	public $user_email;
+
+	/**
+	 * User password.
+	 *
+	 * @var string
+	 */
 	public $user_pass;
+
+	/**
+	 * Is the password generated?
+	 *
+	 * @var bool
+	 */
 	public $password_generated;
 
 	/**
 	 * Constructor.
 	 */
-	function __construct() {
+	public function __construct() {
 
 		$this->id             = 'customer_new_account';
 		$this->customer_email = true;
@@ -37,17 +60,21 @@ class WC_Email_Customer_New_Account extends WC_Email {
 		$this->template_html  = 'emails/customer-new-account.php';
 		$this->template_plain = 'emails/plain/customer-new-account.php';
 
-		$this->subject        = __( 'Your account on {site_title}', 'woocommerce');
-		$this->heading        = __( 'Welcome to {site_title}', 'woocommerce');
+		$this->subject        = __( 'Your account on {site_title}', 'woocommerce' );
+		$this->heading        = __( 'Welcome to {site_title}', 'woocommerce' );
 
-		// Call parent constuctor
+		// Call parent constructor
 		parent::__construct();
 	}
 
 	/**
 	 * Trigger.
+	 *
+	 * @param int $user_id
+	 * @param string $user_pass
+	 * @param bool $password_generated
 	 */
-	function trigger( $user_id, $user_pass = '', $password_generated = false ) {
+	public function trigger( $user_id, $user_pass = '', $password_generated = false ) {
 
 		if ( $user_id ) {
 			$this->object             = new WP_User( $user_id );
@@ -67,12 +94,12 @@ class WC_Email_Customer_New_Account extends WC_Email {
 	}
 
 	/**
-	 * get_content_html function.
+	 * Get content html.
 	 *
 	 * @access public
 	 * @return string
 	 */
-	function get_content_html() {
+	public function get_content_html() {
 		return wc_get_template_html( $this->template_html, array(
 			'email_heading'      => $this->get_heading(),
 			'user_login'         => $this->user_login,
@@ -81,17 +108,17 @@ class WC_Email_Customer_New_Account extends WC_Email {
 			'password_generated' => $this->password_generated,
 			'sent_to_admin'      => false,
 			'plain_text'         => false,
-			'email'				 => $this
+			'email'				 => $this,
 		) );
 	}
 
 	/**
-	 * get_content_plain function.
+	 * Get content plain.
 	 *
 	 * @access public
 	 * @return string
 	 */
-	function get_content_plain() {
+	public function get_content_plain() {
 		return wc_get_template_html( $this->template_plain, array(
 			'email_heading'      => $this->get_heading(),
 			'user_login'         => $this->user_login,
@@ -100,7 +127,7 @@ class WC_Email_Customer_New_Account extends WC_Email {
 			'password_generated' => $this->password_generated,
 			'sent_to_admin'      => false,
 			'plain_text'         => true,
-			'email'			     => $this
+			'email'			     => $this,
 		) );
 	}
 }
diff --git a/includes/emails/class-wc-email-customer-note.php b/includes/emails/class-wc-email-customer-note.php
index a2a67d961f6..52afd393990 100644
--- a/includes/emails/class-wc-email-customer-note.php
+++ b/includes/emails/class-wc-email-customer-note.php
@@ -4,7 +4,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
 
-if ( ! class_exists( 'WC_Email_Customer_Note' ) ) :
+if ( ! class_exists( 'WC_Email_Customer_Note', false ) ) :
 
 /**
  * Customer Note Order Email.
@@ -19,12 +19,17 @@ if ( ! class_exists( 'WC_Email_Customer_Note' ) ) :
  */
 class WC_Email_Customer_Note extends WC_Email {
 
+	/**
+	 * Customer note.
+	 *
+	 * @var string
+	 */
 	public $customer_note;
 
 	/**
 	 * Constructor.
 	 */
-	function __construct() {
+	public function __construct() {
 
 		$this->id             = 'customer_note';
 		$this->customer_email = true;
@@ -34,8 +39,8 @@ class WC_Email_Customer_Note extends WC_Email {
 		$this->template_html  = 'emails/customer-note.php';
 		$this->template_plain = 'emails/plain/customer-note.php';
 
-		$this->subject        = __( 'Note added to your {site_title} order from {order_date}', 'woocommerce');
-		$this->heading        = __( 'A note has been added to your order', 'woocommerce');
+		$this->subject        = __( 'Note added to your {site_title} order from {order_date}', 'woocommerce' );
+		$this->heading        = __( 'A note has been added to your order', 'woocommerce' );
 
 		// Triggers
 		add_action( 'woocommerce_new_customer_note_notification', array( $this, 'trigger' ) );
@@ -46,14 +51,16 @@ class WC_Email_Customer_Note extends WC_Email {
 
 	/**
 	 * Trigger.
+	 *
+	 * @param array $args
 	 */
-	function trigger( $args ) {
+	public function trigger( $args ) {
 
-		if ( $args ) {
+		if ( ! empty( $args ) ) {
 
 			$defaults = array(
 				'order_id'      => '',
-				'customer_note' => ''
+				'customer_note' => '',
 			);
 
 			$args = wp_parse_args( $args, $defaults );
@@ -61,13 +68,13 @@ class WC_Email_Customer_Note extends WC_Email {
 			extract( $args );
 
 			if ( $order_id && ( $this->object = wc_get_order( $order_id ) ) ) {
-				$this->recipient               = $this->object->billing_email;
+				$this->recipient               = $this->object->get_billing_email();
 				$this->customer_note           = $customer_note;
 
 				$this->find['order-date']      = '{order_date}';
 				$this->find['order-number']    = '{order_number}';
 
-				$this->replace['order-date']   = date_i18n( wc_date_format(), strtotime( $this->object->order_date ) );
+				$this->replace['order-date']   = wc_format_datetime( $this->object->get_date_created() );
 				$this->replace['order-number'] = $this->object->get_order_number();
 			} else {
 				return;
@@ -82,36 +89,36 @@ class WC_Email_Customer_Note extends WC_Email {
 	}
 
 	/**
-	 * get_content_html function.
+	 * Get content html.
 	 *
 	 * @access public
 	 * @return string
 	 */
-	function get_content_html() {
+	public function get_content_html() {
 		return wc_get_template_html( $this->template_html, array(
 			'order'         => $this->object,
 			'email_heading' => $this->get_heading(),
 			'customer_note' => $this->customer_note,
 			'sent_to_admin' => false,
 			'plain_text'    => false,
-			'email'			=> $this
+			'email'			=> $this,
 		) );
 	}
 
 	/**
-	 * get_content_plain function.
+	 * Get content plain.
 	 *
 	 * @access public
 	 * @return string
 	 */
-	function get_content_plain() {
+	public function get_content_plain() {
 		return wc_get_template_html( $this->template_plain, array(
 			'order'         => $this->object,
 			'email_heading' => $this->get_heading(),
 			'customer_note' => $this->customer_note,
 			'sent_to_admin' => false,
 			'plain_text'    => true,
-			'email'			=> $this
+			'email'			=> $this,
 		) );
 	}
 }
diff --git a/includes/emails/class-wc-email-customer-on-hold-order.php b/includes/emails/class-wc-email-customer-on-hold-order.php
new file mode 100644
index 00000000000..73cc4f2b0c2
--- /dev/null
+++ b/includes/emails/class-wc-email-customer-on-hold-order.php
@@ -0,0 +1,107 @@
+<?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+
+if ( ! class_exists( 'WC_Email_Customer_On_Hold_Order', false ) ) :
+
+/**
+ * Customer On-hold Order Email.
+ *
+ * An email sent to the customer when a new order is on-hold for.
+ *
+ * @class       WC_Email_Customer_On_Hold_Order
+ * @version     2.6.0
+ * @package     WooCommerce/Classes/Emails
+ * @author      WooThemes
+ * @extends     WC_Email
+ */
+class WC_Email_Customer_On_Hold_Order extends WC_Email {
+
+	/**
+	 * Constructor.
+	 */
+	public function __construct() {
+		$this->id               = 'customer_on_hold_order';
+		$this->customer_email   = true;
+		$this->title            = __( 'Order on-hold', 'woocommerce' );
+		$this->description      = __( 'This is an order notification sent to customers containing order details after an order is placed on-hold.', 'woocommerce' );
+		$this->heading          = __( 'Thank you for your order', 'woocommerce' );
+		$this->subject          = __( 'Your {site_title} order receipt from {order_date}', 'woocommerce' );
+		$this->template_html    = 'emails/customer-on-hold-order.php';
+		$this->template_plain   = 'emails/plain/customer-on-hold-order.php';
+
+		// Triggers for this email
+		add_action( 'woocommerce_order_status_pending_to_on-hold_notification', array( $this, 'trigger' ), 10, 2 );
+		add_action( 'woocommerce_order_status_failed_to_on-hold_notification', array( $this, 'trigger' ), 10, 2 );
+
+		// Call parent constructor
+		parent::__construct();
+	}
+
+	/**
+	 * Trigger the sending of this email.
+	 *
+	 * @param int $order_id The order ID.
+	 * @param WC_Order $order Order object.
+	 */
+	public function trigger( $order_id, $order = false ) {
+		if ( $order_id && ! is_a( $order, 'WC_Order' ) ) {
+			$order = wc_get_order( $order_id );
+		}
+
+		if ( is_a( $order, 'WC_Order' ) ) {
+			$this->object       = $order;
+			$this->recipient    = $this->object->get_billing_email();
+
+			$this->find['order-date']      = '{order_date}';
+			$this->find['order-number']    = '{order_number}';
+
+			$this->replace['order-date']   = wc_format_datetime( $this->object->get_date_created() );
+			$this->replace['order-number'] = $this->object->get_order_number();
+		}
+
+		if ( ! $this->is_enabled() || ! $this->get_recipient() ) {
+			return;
+		}
+
+		$this->send( $this->get_recipient(), $this->get_subject(), $this->get_content(), $this->get_headers(), $this->get_attachments() );
+	}
+
+	/**
+	 * Get content html.
+	 *
+	 * @access public
+	 * @return string
+	 */
+	public function get_content_html() {
+		return wc_get_template_html( $this->template_html, array(
+			'order'         => $this->object,
+			'email_heading' => $this->get_heading(),
+			'sent_to_admin' => false,
+			'plain_text'    => false,
+			'email'         => $this,
+		) );
+	}
+
+	/**
+	 * Get content plain.
+	 *
+	 * @access public
+	 * @return string
+	 */
+	public function get_content_plain() {
+		return wc_get_template_html( $this->template_plain, array(
+			'order'         => $this->object,
+			'email_heading' => $this->get_heading(),
+			'sent_to_admin' => false,
+			'plain_text'    => true,
+			'email'			=> $this,
+		) );
+	}
+}
+
+endif;
+
+return new WC_Email_Customer_On_Hold_Order();
diff --git a/includes/emails/class-wc-email-customer-processing-order.php b/includes/emails/class-wc-email-customer-processing-order.php
index ab9226395e3..02346438897 100644
--- a/includes/emails/class-wc-email-customer-processing-order.php
+++ b/includes/emails/class-wc-email-customer-processing-order.php
@@ -4,12 +4,12 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
 
-if ( ! class_exists( 'WC_Email_Customer_Processing_Order' ) ) :
+if ( ! class_exists( 'WC_Email_Customer_Processing_Order', false ) ) :
 
 /**
  * Customer Processing Order Email.
  *
- * An email sent to the customer when a new order is received/paid for.
+ * An email sent to the customer when a new order is paid for.
  *
  * @class       WC_Email_Customer_Processing_Order
  * @version     2.0.0
@@ -22,37 +22,43 @@ class WC_Email_Customer_Processing_Order extends WC_Email {
 	/**
 	 * Constructor.
 	 */
-	function __construct() {
+	public function __construct() {
 		$this->id               = 'customer_processing_order';
 		$this->customer_email   = true;
 		$this->title            = __( 'Processing order', 'woocommerce' );
-		$this->description      = __( 'This is an order notification sent to customers containing their order details after payment.', 'woocommerce' );
+		$this->description      = __( 'This is an order notification sent to customers containing order details after payment.', 'woocommerce' );
 		$this->heading          = __( 'Thank you for your order', 'woocommerce' );
 		$this->subject          = __( 'Your {site_title} order receipt from {order_date}', 'woocommerce' );
 		$this->template_html    = 'emails/customer-processing-order.php';
 		$this->template_plain   = 'emails/plain/customer-processing-order.php';
 
 		// Triggers for this email
-		add_action( 'woocommerce_order_status_pending_to_processing_notification', array( $this, 'trigger' ) );
-		add_action( 'woocommerce_order_status_pending_to_on-hold_notification', array( $this, 'trigger' ) );
+		add_action( 'woocommerce_order_status_on-hold_to_processing_notification', array( $this, 'trigger' ), 10, 2 );
+		add_action( 'woocommerce_order_status_pending_to_processing_notification', array( $this, 'trigger' ), 10, 2 );
 
 		// Call parent constructor
 		parent::__construct();
 	}
 
 	/**
-	 * Trigger.
+	 * Trigger the sending of this email.
+	 *
+	 * @param int $order_id The order ID.
+	 * @param WC_Order $order Order object.
 	 */
-	function trigger( $order_id ) {
+	public function trigger( $order_id, $order = false ) {
+		if ( $order_id && ! is_a( $order, 'WC_Order' ) ) {
+			$order = wc_get_order( $order_id );
+		}
 
-		if ( $order_id ) {
-			$this->object       = wc_get_order( $order_id );
-			$this->recipient    = $this->object->billing_email;
+		if ( is_a( $order, 'WC_Order' ) ) {
+			$this->object       = $order;
+			$this->recipient    = $this->object->get_billing_email();
 
 			$this->find['order-date']      = '{order_date}';
 			$this->find['order-number']    = '{order_number}';
 
-			$this->replace['order-date']   = date_i18n( wc_date_format(), strtotime( $this->object->order_date ) );
+			$this->replace['order-date']   = wc_format_datetime( $this->object->get_date_created() );
 			$this->replace['order-number'] = $this->object->get_order_number();
 		}
 
@@ -64,34 +70,34 @@ class WC_Email_Customer_Processing_Order extends WC_Email {
 	}
 
 	/**
-	 * get_content_html function.
+	 * Get content html.
 	 *
 	 * @access public
 	 * @return string
 	 */
-	function get_content_html() {
+	public function get_content_html() {
 		return wc_get_template_html( $this->template_html, array(
 			'order'         => $this->object,
 			'email_heading' => $this->get_heading(),
 			'sent_to_admin' => false,
 			'plain_text'    => false,
-			'email'			=> $this
+			'email'			=> $this,
 		) );
 	}
 
 	/**
-	 * get_content_plain function.
+	 * Get content plain.
 	 *
 	 * @access public
 	 * @return string
 	 */
-	function get_content_plain() {
+	public function get_content_plain() {
 		return wc_get_template_html( $this->template_plain, array(
 			'order'         => $this->object,
 			'email_heading' => $this->get_heading(),
 			'sent_to_admin' => false,
 			'plain_text'    => true,
-			'email'			=> $this
+			'email'			=> $this,
 		) );
 	}
 }
diff --git a/includes/emails/class-wc-email-customer-refunded-order.php b/includes/emails/class-wc-email-customer-refunded-order.php
index 1b243ffa76e..23cbcfd3f8e 100644
--- a/includes/emails/class-wc-email-customer-refunded-order.php
+++ b/includes/emails/class-wc-email-customer-refunded-order.php
@@ -4,7 +4,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
 
-if ( ! class_exists( 'WC_Email_Customer_Refunded_Order' ) ) :
+if ( ! class_exists( 'WC_Email_Customer_Refunded_Order', false ) ) :
 
 /**
  * Customer Refunded Order Email.
@@ -19,7 +19,18 @@ if ( ! class_exists( 'WC_Email_Customer_Refunded_Order' ) ) :
  */
 class WC_Email_Customer_Refunded_Order extends WC_Email {
 
+	/**
+	 * Refund order.
+	 *
+	 * @var WC_Order|bool
+	 */
 	public $refund;
+
+	/**
+	 * Is the order partial refunded?
+	 *
+	 * @var bool
+	 */
 	public $partial_refund;
 
 	/**
@@ -37,6 +48,11 @@ class WC_Email_Customer_Refunded_Order extends WC_Email {
 		parent::__construct();
 	}
 
+	/**
+	 * Set email strings.
+	 *
+	 * @param bool $partial_refund
+	 */
 	public function set_email_strings( $partial_refund = false ) {
 		$this->subject_partial     = $this->get_option( 'subject_partial', __( 'Your {site_title} order from {order_date} has been partially refunded', 'woocommerce' ) );
 		$this->subject_full        = $this->get_option( 'subject_full', __( 'Your {site_title} order from {order_date} has been refunded', 'woocommerce' ) );
@@ -44,21 +60,19 @@ class WC_Email_Customer_Refunded_Order extends WC_Email {
 		$this->heading_full        = $this->get_option( 'heading_full', __( 'Your order has been fully refunded', 'woocommerce' ) );
 		$this->heading_partial     = $this->get_option( 'heading_partial', __( 'Your order has been partially refunded', 'woocommerce' ) );
 
+		$this->template_html  = 'emails/customer-refunded-order.php';
+		$this->template_plain = 'emails/plain/customer-refunded-order.php';
+
 		if ( $partial_refund ) {
 			$this->id             = 'customer_partially_refunded_order';
-			$this->title          = __( 'Partially Refunded order', 'woocommerce' );
+			$this->title          = __( 'Partially refunded order', 'woocommerce' );
 			$this->description    = __( 'Order partially refunded emails are sent to customers when their orders are partially refunded.', 'woocommerce' );
-			$this->template_html  = 'emails/customer-refunded-order.php';
-			$this->template_plain = 'emails/plain/customer-refunded-order.php';
 			$this->heading        = $this->heading_partial;
 			$this->subject        = $this->subject_partial;
-		}
-		else {
+		} else {
 			$this->id             = 'customer_refunded_order';
 			$this->title          = __( 'Refunded order', 'woocommerce' );
 			$this->description    = __( 'Order refunded emails are sent to customers when their orders are marked refunded.', 'woocommerce' );
-			$this->template_html  = 'emails/customer-refunded-order.php';
-			$this->template_plain = 'emails/plain/customer-refunded-order.php';
 			$this->heading        = $this->heading_full;
 			$this->subject        = $this->subject_full;
 		}
@@ -66,6 +80,9 @@ class WC_Email_Customer_Refunded_Order extends WC_Email {
 
 	/**
 	 * Full refund notification.
+	 *
+	 * @param int $order_id
+	 * @param int $refund_id
 	 */
 	public function trigger_full( $order_id, $refund_id = null ) {
 		$this->trigger( $order_id, false, $refund_id );
@@ -73,6 +90,9 @@ class WC_Email_Customer_Refunded_Order extends WC_Email {
 
 	/**
 	 * Partial refund notification.
+	 *
+	 * @param int $order_id
+	 * @param int $refund_id
 	 */
 	public function trigger_partial( $order_id, $refund_id = null ) {
 		$this->trigger( $order_id, true, $refund_id );
@@ -80,6 +100,10 @@ class WC_Email_Customer_Refunded_Order extends WC_Email {
 
 	/**
 	 * Trigger.
+	 *
+	 * @param int $order_id
+	 * @param bool $partial_refund
+	 * @param int $refund_id
 	 */
 	public function trigger( $order_id, $partial_refund = false, $refund_id = null ) {
 		$this->partial_refund = $partial_refund;
@@ -87,16 +111,16 @@ class WC_Email_Customer_Refunded_Order extends WC_Email {
 
 		if ( $order_id ) {
 			$this->object    = wc_get_order( $order_id );
-			$this->recipient = $this->object->billing_email;
+			$this->recipient = $this->object->get_billing_email();
 
 			$this->find['order-date']      = '{order_date}';
 			$this->find['order-number']    = '{order_number}';
 
-			$this->replace['order-date']   = date_i18n( wc_date_format(), strtotime( $this->object->order_date ) );
+			$this->replace['order-date']   = wc_format_datetime( $this->object->get_date_created() );
 			$this->replace['order-number'] = $this->object->get_order_number();
 		}
 
-		if ( $refund_id ) {
+		if ( ! empty( $refund_id ) ) {
 			$this->refund = wc_get_order( $refund_id );
 		} else {
 			$this->refund = false;
@@ -110,7 +134,7 @@ class WC_Email_Customer_Refunded_Order extends WC_Email {
 	}
 
 	/**
-	 * get_subject function.
+	 * Get email subject.
 	 *
 	 * @access public
 	 * @return string
@@ -120,7 +144,7 @@ class WC_Email_Customer_Refunded_Order extends WC_Email {
 	}
 
 	/**
-	 * get_heading function.
+	 * Get email heading.
 	 *
 	 * @access public
 	 * @return string
@@ -130,7 +154,7 @@ class WC_Email_Customer_Refunded_Order extends WC_Email {
 	}
 
 	/**
-	 * get_content_html function.
+	 * Get content html.
 	 *
 	 * @access public
 	 * @return string
@@ -143,7 +167,7 @@ class WC_Email_Customer_Refunded_Order extends WC_Email {
 			'email_heading'  => $this->get_heading(),
 			'sent_to_admin'  => false,
 			'plain_text'     => false,
-			'email'			 => $this
+			'email'			 => $this,
 		) );
 	}
 
@@ -160,7 +184,7 @@ class WC_Email_Customer_Refunded_Order extends WC_Email {
 			'email_heading'  => $this->get_heading(),
 			'sent_to_admin'  => false,
 			'plain_text'     => true,
-			'email'			 => $this
+			'email'			 => $this,
 		) );
 	}
 
@@ -173,39 +197,43 @@ class WC_Email_Customer_Refunded_Order extends WC_Email {
 				'title'   => __( 'Enable/Disable', 'woocommerce' ),
 				'type'    => 'checkbox',
 				'label'   => __( 'Enable this email notification', 'woocommerce' ),
-				'default' => 'yes'
+				'default' => 'yes',
 			),
 			'subject_full' => array(
-				'title'       => __( 'Full Refund Subject', 'woocommerce' ),
+				'title'       => __( 'Full refund subject', 'woocommerce' ),
 				'type'        => 'text',
-				'description' => sprintf( __( 'Defaults to <code>%s</code>', 'woocommerce' ), $this->subject_full ),
+				/* translators: %s: default subject */
+				'description' => sprintf( __( 'Defaults to %s', 'woocommerce' ), '<code>' . $this->subject_full . '</code>' ),
 				'placeholder' => '',
 				'default'     => $this->subject_full,
-				'desc_tip'      => true
+				'desc_tip'    => true,
 			),
 			'subject_partial' => array(
-				'title'       => __( 'Partial Refund Subject', 'woocommerce' ),
+				'title'       => __( 'Partial refund subject', 'woocommerce' ),
 				'type'        => 'text',
-				'description' => sprintf( __( 'Defaults to <code>%s</code>', 'woocommerce' ), $this->subject_partial ),
+				/* translators: %s: default subject */
+				'description' => sprintf( __( 'Defaults to %s', 'woocommerce' ), '<code>' . $this->subject_partial . '</code>' ),
 				'placeholder' => '',
 				'default'     => $this->subject_partial,
-				'desc_tip'      => true
+				'desc_tip'    => true,
 			),
 			'heading_full' => array(
-				'title'       => __( 'Full Refund Email Heading', 'woocommerce' ),
+				'title'       => __( 'Full refund email heading', 'woocommerce' ),
 				'type'        => 'text',
-				'description' => sprintf( __( 'Defaults to <code>%s</code>', 'woocommerce' ), $this->heading_full ),
+				/* translators: %s: default heading */
+				'description' => sprintf( __( 'Defaults to %s', 'woocommerce' ), '<code>' . $this->heading_full . '</code>' ),
 				'placeholder' => '',
 				'default'     => $this->heading_full,
-				'desc_tip'      => true
+				'desc_tip'    => true,
 			),
 			'heading_partial' => array(
-				'title'       => __( 'Partial Refund Email Heading', 'woocommerce' ),
+				'title'       => __( 'Partial refund email heading', 'woocommerce' ),
 				'type'        => 'text',
-				'description' => sprintf( __( 'Defaults to <code>%s</code>', 'woocommerce' ), $this->heading_partial ),
+				/* translators: %s: default heading */
+				'description' => sprintf( __( 'Defaults to %s', 'woocommerce' ), '<code>' . $this->heading_partial . '</code>' ),
 				'placeholder' => '',
 				'default'     => $this->heading_partial,
-				'desc_tip'      => true
+				'desc_tip'    => true,
 			),
 			'email_type' => array(
 				'title'       => __( 'Email type', 'woocommerce' ),
@@ -214,8 +242,8 @@ class WC_Email_Customer_Refunded_Order extends WC_Email {
 				'default'     => 'html',
 				'class'       => 'email_type wc-enhanced-select',
 				'options'     => $this->get_email_type_options(),
-				'desc_tip'      => true
-			)
+				'desc_tip'    => true,
+			),
 		);
 	}
 }
diff --git a/includes/emails/class-wc-email-customer-reset-password.php b/includes/emails/class-wc-email-customer-reset-password.php
index 5e0b08da331..86c4a591f5f 100644
--- a/includes/emails/class-wc-email-customer-reset-password.php
+++ b/includes/emails/class-wc-email-customer-reset-password.php
@@ -4,7 +4,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
 
-if ( ! class_exists( 'WC_Email_Customer_Reset_Password' ) ) :
+if ( ! class_exists( 'WC_Email_Customer_Reset_Password', false ) ) :
 
 /**
  * Customer Reset Password.
@@ -19,19 +19,31 @@ if ( ! class_exists( 'WC_Email_Customer_Reset_Password' ) ) :
  */
 class WC_Email_Customer_Reset_Password extends WC_Email {
 
-	/** @var string */
+	/**
+	 * User login name.
+	 *
+	 * @var string
+	 */
 	public $user_login;
 
-	/** @var string */
+	/**
+	 * User email.
+	 *
+	 * @var string
+	 */
 	public $user_email;
 
-	/** @var string */
+	/**
+	 * Reset key.
+	 *
+	 * @var string
+	 */
 	public $reset_key;
 
 	/**
 	 * Constructor.
 	 */
-	function __construct() {
+	public function __construct() {
 
 		$this->id               = 'customer_reset_password';
 		$this->title            = __( 'Reset password', 'woocommerce' );
@@ -41,8 +53,8 @@ class WC_Email_Customer_Reset_Password extends WC_Email {
 		$this->template_html    = 'emails/customer-reset-password.php';
 		$this->template_plain   = 'emails/plain/customer-reset-password.php';
 
-		$this->subject          = __( 'Password Reset for {site_title}', 'woocommerce');
-		$this->heading          = __( 'Password Reset Instructions', 'woocommerce');
+		$this->subject          = __( 'Password reset for {site_title}', 'woocommerce' );
+		$this->heading          = __( 'Password reset instructions', 'woocommerce' );
 
 		// Trigger
 		add_action( 'woocommerce_reset_password_notification', array( $this, 'trigger' ), 10, 2 );
@@ -53,8 +65,11 @@ class WC_Email_Customer_Reset_Password extends WC_Email {
 
 	/**
 	 * Trigger.
+	 *
+	 * @param string $user_login
+	 * @param string $reset_key
 	 */
-	function trigger( $user_login = '', $reset_key = '' ) {
+	public function trigger( $user_login = '', $reset_key = '' ) {
 		if ( $user_login && $reset_key ) {
 			$this->object     = get_user_by( 'login', $user_login );
 
@@ -73,12 +88,12 @@ class WC_Email_Customer_Reset_Password extends WC_Email {
 	}
 
 	/**
-	 * get_content_html function.
+	 * Get content html.
 	 *
 	 * @access public
 	 * @return string
 	 */
-	function get_content_html() {
+	public function get_content_html() {
 		return wc_get_template_html( $this->template_html, array(
 			'email_heading' => $this->get_heading(),
 			'user_login'    => $this->user_login,
@@ -86,17 +101,17 @@ class WC_Email_Customer_Reset_Password extends WC_Email {
 			'blogname'      => $this->get_blogname(),
 			'sent_to_admin' => false,
 			'plain_text'    => false,
-			'email'			=> $this
+			'email'			=> $this,
 		) );
 	}
 
 	/**
-	 * get_content_plain function.
+	 * Get content plain.
 	 *
 	 * @access public
 	 * @return string
 	 */
-	function get_content_plain() {
+	public function get_content_plain() {
 		return wc_get_template_html( $this->template_plain, array(
 			'email_heading' => $this->get_heading(),
 			'user_login'    => $this->user_login,
@@ -104,7 +119,7 @@ class WC_Email_Customer_Reset_Password extends WC_Email {
 			'blogname'      => $this->get_blogname(),
 			'sent_to_admin' => false,
 			'plain_text'    => true,
-			'email'			=> $this
+			'email'			=> $this,
 		) );
 	}
 }
diff --git a/includes/emails/class-wc-email-failed-order.php b/includes/emails/class-wc-email-failed-order.php
index 598e1458f0e..b45f4480e41 100644
--- a/includes/emails/class-wc-email-failed-order.php
+++ b/includes/emails/class-wc-email-failed-order.php
@@ -4,10 +4,10 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
-if ( ! class_exists( 'WC_Email_Failed_Order' ) ) :
+if ( ! class_exists( 'WC_Email_Failed_Order', false ) ) :
 
 /**
- * Failed Order Email
+ * Failed Order Email.
  *
  * An email sent to the admin when payment fails to go through.
  *
@@ -20,7 +20,7 @@ if ( ! class_exists( 'WC_Email_Failed_Order' ) ) :
 class WC_Email_Failed_Order extends WC_Email {
 
 	/**
-	 * Constructor
+	 * Constructor.
 	 */
 	public function __construct() {
 		$this->id               = 'failed_order';
@@ -32,8 +32,8 @@ class WC_Email_Failed_Order extends WC_Email {
 		$this->template_plain   = 'emails/plain/admin-failed-order.php';
 
 		// Triggers for this email
-		add_action( 'woocommerce_order_status_pending_to_failed_notification', array( $this, 'trigger' ) );
-		add_action( 'woocommerce_order_status_on-hold_to_failed_notification', array( $this, 'trigger' ) );
+		add_action( 'woocommerce_order_status_pending_to_failed_notification', array( $this, 'trigger' ), 10, 2 );
+		add_action( 'woocommerce_order_status_on-hold_to_failed_notification', array( $this, 'trigger' ), 10, 2 );
 
 		// Call parent constructor
 		parent::__construct();
@@ -43,14 +43,21 @@ class WC_Email_Failed_Order extends WC_Email {
 	}
 
 	/**
-	 * Trigger.
+	 * Trigger the sending of this email.
+	 *
+	 * @param int $order_id The order ID.
+	 * @param WC_Order $order Order object.
 	 */
-	public function trigger( $order_id ) {
-		if ( $order_id ) {
-            $this->object                  = wc_get_order( $order_id );
+	public function trigger( $order_id, $order = false ) {
+		if ( $order_id && ! is_a( $order, 'WC_Order' ) ) {
+			$order = wc_get_order( $order_id );
+		}
+
+		if ( is_a( $order, 'WC_Order' ) ) {
+			$this->object                  = $order;
 			$this->find['order-date']      = '{order_date}';
 			$this->find['order-number']    = '{order_number}';
-			$this->replace['order-date']   = date_i18n( wc_date_format(), strtotime( $this->object->order_date ) );
+			$this->replace['order-date']   = wc_format_datetime( $this->object->get_date_created() );
 			$this->replace['order-number'] = $this->object->get_order_number();
 		}
 
@@ -62,7 +69,7 @@ class WC_Email_Failed_Order extends WC_Email {
 	}
 
 	/**
-	 * get_content_html function.
+	 * Get content html.
 	 *
 	 * @access public
 	 * @return string
@@ -73,7 +80,7 @@ class WC_Email_Failed_Order extends WC_Email {
 			'email_heading' => $this->get_heading(),
 			'sent_to_admin' => true,
 			'plain_text'    => false,
-			'email'			=> $this
+			'email'			=> $this,
 		) );
 	}
 
@@ -88,7 +95,7 @@ class WC_Email_Failed_Order extends WC_Email {
 			'email_heading' => $this->get_heading(),
 			'sent_to_admin' => true,
 			'plain_text'    => true,
-			'email'			=> $this
+			'email'			=> $this,
 		) );
 	}
 
@@ -101,31 +108,31 @@ class WC_Email_Failed_Order extends WC_Email {
 				'title'         => __( 'Enable/Disable', 'woocommerce' ),
 				'type'          => 'checkbox',
 				'label'         => __( 'Enable this email notification', 'woocommerce' ),
-				'default'       => 'yes'
+				'default'       => 'yes',
 			),
 			'recipient' => array(
 				'title'         => __( 'Recipient(s)', 'woocommerce' ),
 				'type'          => 'text',
-				'description'   => sprintf( __( 'Enter recipients (comma separated) for this email. Defaults to <code>%s</code>.', 'woocommerce' ), esc_attr( get_option('admin_email') ) ),
+				'description'   => sprintf( __( 'Enter recipients (comma separated) for this email. Defaults to %s.', 'woocommerce' ), '<code>' . esc_attr( get_option( 'admin_email' ) ) . '</code>' ),
 				'placeholder'   => '',
 				'default'       => '',
-				'desc_tip'      => true
+				'desc_tip'      => true,
 			),
 			'subject' => array(
 				'title'         => __( 'Subject', 'woocommerce' ),
 				'type'          => 'text',
-				'description'   => sprintf( __( 'This controls the email subject line. Leave blank to use the default subject: <code>%s</code>.', 'woocommerce' ), $this->subject ),
+				'description'   => sprintf( __( 'This controls the email subject line. Leave blank to use the default subject: %s.', 'woocommerce' ), '<code>' . $this->subject . '</code>' ),
 				'placeholder'   => '',
 				'default'       => '',
-				'desc_tip'      => true
+				'desc_tip'      => true,
 			),
 			'heading' => array(
-				'title'         => __( 'Email Heading', 'woocommerce' ),
+				'title'         => __( 'Email heading', 'woocommerce' ),
 				'type'          => 'text',
-				'description'   => sprintf( __( 'This controls the main heading contained within the email notification. Leave blank to use the default heading: <code>%s</code>.', 'woocommerce' ), $this->heading ),
+				'description'   => sprintf( __( 'This controls the main heading contained within the email notification. Leave blank to use the default heading: %s.', 'woocommerce' ), '<code>' . $this->heading . '</code>' ),
 				'placeholder'   => '',
 				'default'       => '',
-				'desc_tip'      => true
+				'desc_tip'      => true,
 			),
 			'email_type' => array(
 				'title'         => __( 'Email type', 'woocommerce' ),
@@ -134,8 +141,8 @@ class WC_Email_Failed_Order extends WC_Email {
 				'default'       => 'html',
 				'class'         => 'email_type wc-enhanced-select',
 				'options'       => $this->get_email_type_options(),
-				'desc_tip'      => true
-			)
+				'desc_tip'      => true,
+			),
 		);
 	}
 }
diff --git a/includes/emails/class-wc-email-new-order.php b/includes/emails/class-wc-email-new-order.php
index 88c663c4613..bf98bfa8f64 100644
--- a/includes/emails/class-wc-email-new-order.php
+++ b/includes/emails/class-wc-email-new-order.php
@@ -32,12 +32,12 @@ class WC_Email_New_Order extends WC_Email {
 		$this->template_plain   = 'emails/plain/admin-new-order.php';
 
 		// Triggers for this email
-		add_action( 'woocommerce_order_status_pending_to_processing_notification', array( $this, 'trigger' ) );
-		add_action( 'woocommerce_order_status_pending_to_completed_notification', array( $this, 'trigger' ) );
-		add_action( 'woocommerce_order_status_pending_to_on-hold_notification', array( $this, 'trigger' ) );
-		add_action( 'woocommerce_order_status_failed_to_processing_notification', array( $this, 'trigger' ) );
-		add_action( 'woocommerce_order_status_failed_to_completed_notification', array( $this, 'trigger' ) );
-		add_action( 'woocommerce_order_status_failed_to_on-hold_notification', array( $this, 'trigger' ) );
+		add_action( 'woocommerce_order_status_pending_to_processing_notification', array( $this, 'trigger' ), 10, 2 );
+		add_action( 'woocommerce_order_status_pending_to_completed_notification', array( $this, 'trigger' ), 10, 2 );
+		add_action( 'woocommerce_order_status_pending_to_on-hold_notification', array( $this, 'trigger' ), 10, 2 );
+		add_action( 'woocommerce_order_status_failed_to_processing_notification', array( $this, 'trigger' ), 10, 2 );
+		add_action( 'woocommerce_order_status_failed_to_completed_notification', array( $this, 'trigger' ), 10, 2 );
+		add_action( 'woocommerce_order_status_failed_to_on-hold_notification', array( $this, 'trigger' ), 10, 2 );
 
 		// Call parent constructor
 		parent::__construct();
@@ -47,14 +47,21 @@ class WC_Email_New_Order extends WC_Email {
 	}
 
 	/**
-	 * Trigger.
+	 * Trigger the sending of this email.
+	 *
+	 * @param int $order_id The order ID.
+	 * @param WC_Order $order Order object.
 	 */
-	public function trigger( $order_id ) {
-		if ( $order_id ) {
-			$this->object                  = wc_get_order( $order_id );
+	public function trigger( $order_id, $order = false ) {
+		if ( $order_id && ! is_a( $order, 'WC_Order' ) ) {
+			$order = wc_get_order( $order_id );
+		}
+
+		if ( is_a( $order, 'WC_Order' ) ) {
+			$this->object                  = $order;
 			$this->find['order-date']      = '{order_date}';
 			$this->find['order-number']    = '{order_number}';
-			$this->replace['order-date']   = date_i18n( wc_date_format(), strtotime( $this->object->order_date ) );
+			$this->replace['order-date']   = wc_format_datetime( $this->object->get_date_created() );
 			$this->replace['order-number'] = $this->object->get_order_number();
 		}
 
@@ -66,7 +73,7 @@ class WC_Email_New_Order extends WC_Email {
 	}
 
 	/**
-	 * get_content_html function.
+	 * Get content html.
 	 *
 	 * @access public
 	 * @return string
@@ -77,12 +84,12 @@ class WC_Email_New_Order extends WC_Email {
 			'email_heading' => $this->get_heading(),
 			'sent_to_admin' => true,
 			'plain_text'    => false,
-			'email'			=> $this
+			'email'			=> $this,
 		) );
 	}
 
 	/**
-	 * get_content_plain function.
+	 * Get content plain.
 	 *
 	 * @access public
 	 * @return string
@@ -93,7 +100,7 @@ class WC_Email_New_Order extends WC_Email {
 			'email_heading' => $this->get_heading(),
 			'sent_to_admin' => true,
 			'plain_text'    => true,
-			'email'			=> $this
+			'email'			=> $this,
 		) );
 	}
 
@@ -106,31 +113,31 @@ class WC_Email_New_Order extends WC_Email {
 				'title'         => __( 'Enable/Disable', 'woocommerce' ),
 				'type'          => 'checkbox',
 				'label'         => __( 'Enable this email notification', 'woocommerce' ),
-				'default'       => 'yes'
+				'default'       => 'yes',
 			),
 			'recipient' => array(
 				'title'         => __( 'Recipient(s)', 'woocommerce' ),
 				'type'          => 'text',
-				'description'   => sprintf( __( 'Enter recipients (comma separated) for this email. Defaults to <code>%s</code>.', 'woocommerce' ), esc_attr( get_option('admin_email') ) ),
+				'description'   => sprintf( __( 'Enter recipients (comma separated) for this email. Defaults to %s.', 'woocommerce' ), '<code>' . esc_attr( get_option( 'admin_email' ) ) . '</code>' ),
 				'placeholder'   => '',
 				'default'       => '',
-				'desc_tip'      => true
+				'desc_tip'      => true,
 			),
 			'subject' => array(
 				'title'         => __( 'Subject', 'woocommerce' ),
 				'type'          => 'text',
-				'description'   => sprintf( __( 'This controls the email subject line. Leave blank to use the default subject: <code>%s</code>.', 'woocommerce' ), $this->subject ),
+				'description'   => sprintf( __( 'This controls the email subject line. Leave blank to use the default subject: %s.', 'woocommerce' ), '<code>' . $this->subject . '</code>' ),
 				'placeholder'   => '',
 				'default'       => '',
-				'desc_tip'      => true
+				'desc_tip'      => true,
 			),
 			'heading' => array(
-				'title'         => __( 'Email Heading', 'woocommerce' ),
+				'title'         => __( 'Email heading', 'woocommerce' ),
 				'type'          => 'text',
-				'description'   => sprintf( __( 'This controls the main heading contained within the email notification. Leave blank to use the default heading: <code>%s</code>.', 'woocommerce' ), $this->heading ),
+				'description'   => sprintf( __( 'This controls the main heading contained within the email notification. Leave blank to use the default heading: %s.', 'woocommerce' ), '<code>' . $this->heading . '</code>' ),
 				'placeholder'   => '',
 				'default'       => '',
-				'desc_tip'      => true
+				'desc_tip'      => true,
 			),
 			'email_type' => array(
 				'title'         => __( 'Email type', 'woocommerce' ),
@@ -139,8 +146,8 @@ class WC_Email_New_Order extends WC_Email {
 				'default'       => 'html',
 				'class'         => 'email_type wc-enhanced-select',
 				'options'       => $this->get_email_type_options(),
-				'desc_tip'      => true
-			)
+				'desc_tip'      => true,
+			),
 		);
 	}
 }
diff --git a/includes/emails/class-wc-email.php b/includes/emails/class-wc-email.php
index 5709fc21131..a97fe579f55 100644
--- a/includes/emails/class-wc-email.php
+++ b/includes/emails/class-wc-email.php
@@ -4,7 +4,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
-if ( class_exists( 'WC_Email' ) ) {
+if ( class_exists( 'WC_Email', false ) ) {
 	return;
 }
 
@@ -83,7 +83,7 @@ class WC_Email extends WC_Settings_API {
 
 	/**
 	 * Object this email is for, for example a customer, product, or email.
-	 * @var object
+	 * @var object|bool
 	 */
 	public $object;
 
@@ -156,7 +156,7 @@ class WC_Email extends WC_Settings_API {
 		'/&(euro|#8364);/i',                             // Euro sign
 		'/&#36;/',                                       // Dollar sign
 		'/&[^&\s;]+;/i',                                 // Unknown/unhandled entities
-		'/[ ]{2,}/'                                      // Runs of spaces, post-handling
+		'/[ ]{2,}/',                                      // Runs of spaces, post-handling
 	);
 
 	/**
@@ -184,7 +184,7 @@ class WC_Email extends WC_Settings_API {
 		'EUR',                                          // Euro sign. € ?
 		'$',                                            // Dollar sign
 		'',                                             // Unknown/unhandled entities
-		' '                                             // Runs of spaces, post-handling
+		' ',                                             // Runs of spaces, post-handling
 	);
 
 	/**
@@ -216,16 +216,16 @@ class WC_Email extends WC_Settings_API {
 		$this->replace['site-title'] = $this->get_blogname();
 
 		// For multipart messages
-		add_filter( 'phpmailer_init', array( $this, 'handle_multipart' ) );
+		add_action( 'phpmailer_init', array( $this, 'handle_multipart' ) );
 	}
 
 	/**
-	 * handle_multipart function.
+	 * Handle multipart mail.
 	 *
 	 * @param PHPMailer $mailer
 	 * @return PHPMailer
 	 */
-	public function handle_multipart( $mailer )  {
+	public function handle_multipart( $mailer ) {
 		if ( $this->sending && 'multipart' === $this->get_email_type() ) {
 			$mailer->AltBody = wordwrap( preg_replace( $this->plain_search, $this->plain_replace, strip_tags( $this->get_content_plain() ) ) );
 			$this->sending   = false;
@@ -234,7 +234,7 @@ class WC_Email extends WC_Settings_API {
 	}
 
 	/**
-	 * format_string function.
+	 * Format email string.
 	 *
 	 * @param mixed $string
 	 * @return string
@@ -244,7 +244,7 @@ class WC_Email extends WC_Settings_API {
 	}
 
 	/**
-	 * get_subject function.
+	 * Get email subject.
 	 *
 	 * @return string
 	 */
@@ -253,7 +253,7 @@ class WC_Email extends WC_Settings_API {
 	}
 
 	/**
-	 * get_heading function.
+	 * Get email heading.
 	 *
 	 * @return string
 	 */
@@ -273,18 +273,24 @@ class WC_Email extends WC_Settings_API {
 	}
 
 	/**
-	 * get_headers function.
+	 * Get email headers.
 	 *
 	 * @return string
 	 */
 	public function get_headers() {
-		return apply_filters( 'woocommerce_email_headers', "Content-Type: " . $this->get_content_type() . "\r\n", $this->id, $this->object );
+		$header = "Content-Type: " . $this->get_content_type() . "\r\n";
+
+		if ( 'new_order' === $this->id ) {
+			$header .= 'Reply-to: ' . $this->object->get_billing_first_name() . ' ' . $this->object->get_billing_last_name() . ' <' . $this->object->get_billing_email() . ">\r\n";
+		}
+
+		return apply_filters( 'woocommerce_email_headers', $header, $this->id, $this->object );
 	}
 
 	/**
-	 * get_attachments function.
+	 * Get email attachments.
 	 *
-	 * @return string|array
+	 * @return string
 	 */
 	public function get_attachments() {
 		return apply_filters( 'woocommerce_email_attachments', array(), $this->id, $this->object );
@@ -300,7 +306,7 @@ class WC_Email extends WC_Settings_API {
 	}
 
 	/**
-	 * get_content_type function.
+	 * Get email content type.
 	 *
 	 * @return string
 	 */
@@ -340,7 +346,7 @@ class WC_Email extends WC_Settings_API {
 	 */
 	public function get_option( $key, $empty_value = null ) {
 		$value = parent::get_option( $key, $empty_value );
-		return apply_filters( 'woocommerce_email_get_option', __( $value ), $this, $value, $key, $empty_value );
+		return apply_filters( 'woocommerce_email_get_option', $value, $this, $value, $key, $empty_value );
 	}
 
 	/**
@@ -368,7 +374,7 @@ class WC_Email extends WC_Settings_API {
 	}
 
 	/**
-	 * get_blogname function.
+	 * Get WordPress blog name.
 	 *
 	 * @return string
 	 */
@@ -377,7 +383,7 @@ class WC_Email extends WC_Settings_API {
 	}
 
 	/**
-	 * get_content function.
+	 * Get email content.
 	 *
 	 * @return string
 	 */
@@ -411,8 +417,8 @@ class WC_Email extends WC_Settings_API {
 				$emogrifier = new Emogrifier( $content, $css );
 				$content    = $emogrifier->emogrify();
 			} catch ( Exception $e ) {
-				$logger = new WC_Logger();
-				$logger->add( 'emogrifier', $e->getMessage() );
+				$logger = wc_get_logger();
+				$logger->error( $e->getMessage(), array( 'source' => 'emogrifier' ) );
 			}
 		}
 		return $content;
@@ -481,23 +487,25 @@ class WC_Email extends WC_Settings_API {
 				'title'       => __( 'Enable/Disable', 'woocommerce' ),
 				'type'        => 'checkbox',
 				'label'       => __( 'Enable this email notification', 'woocommerce' ),
-				'default'     => 'yes'
+				'default'     => 'yes',
 			),
 			'subject'         => array(
-				'title'       => __( 'Email Subject', 'woocommerce' ),
+				'title'       => __( 'Email subject', 'woocommerce' ),
 				'type'        => 'text',
-				'description' => sprintf( __( 'Defaults to <code>%s</code>', 'woocommerce' ), $this->subject ),
+				/* translators: %s: default subject */
+				'description' => sprintf( __( 'Defaults to %s', 'woocommerce' ), '<code>' . $this->subject . '</code>' ),
 				'placeholder' => '',
 				'default'     => '',
-				'desc_tip'    => true
+				'desc_tip'    => true,
 			),
 			'heading'         => array(
-				'title'       => __( 'Email Heading', 'woocommerce' ),
+				'title'       => __( 'Email heading', 'woocommerce' ),
 				'type'        => 'text',
-				'description' => sprintf( __( 'Defaults to <code>%s</code>', 'woocommerce' ), $this->heading ),
+				/* translators: %s: default heading */
+				'description' => sprintf( __( 'Defaults to %s', 'woocommerce' ), '<code>' . $this->heading . '</code>' ),
 				'placeholder' => '',
 				'default'     => '',
-				'desc_tip'    => true
+				'desc_tip'    => true,
 			),
 			'email_type'      => array(
 				'title'       => __( 'Email type', 'woocommerce' ),
@@ -506,8 +514,8 @@ class WC_Email extends WC_Settings_API {
 				'default'     => 'html',
 				'class'       => 'email_type wc-enhanced-select',
 				'options'     => $this->get_email_type_options(),
-				'desc_tip'    => true
-			)
+				'desc_tip'    => true,
+			),
 		);
 	}
 
@@ -533,12 +541,14 @@ class WC_Email extends WC_Settings_API {
 		// Save regular options
 		parent::process_admin_options();
 
+		$post_data = $this->get_post_data();
+
 		// Save templates
-		if ( isset( $_POST['template_html_code'] ) ) {
-			$this->save_template( $_POST['template_html_code'], $this->template_html );
+		if ( isset( $post_data['template_html_code'] ) ) {
+			$this->save_template( $post_data['template_html_code'], $this->template_html );
 		}
-		if ( isset( $_POST['template_plain_code'] ) ) {
-			$this->save_template( $_POST['template_plain_code'], $this->template_plain );
+		if ( isset( $post_data['template_plain_code'] ) ) {
+			$this->save_template( $post_data['template_plain_code'], $this->template_plain );
 		}
 	}
 
@@ -570,12 +580,12 @@ class WC_Email extends WC_Settings_API {
 		if ( current_user_can( 'edit_themes' ) && ! empty( $template_code ) && ! empty( $template_path ) ) {
 			$saved  = false;
 			$file   = get_stylesheet_directory() . '/woocommerce/' . $template_path;
-			$code   = stripslashes( $template_code );
+			$code   = wp_unslash( $template_code );
 
 			if ( is_writeable( $file ) ) {
 				$f = fopen( $file, 'w+' );
 
-				if ( $f !== false ) {
+				if ( false !== $f ) {
 					fwrite( $f, $code );
 					fclose( $f );
 					$saved = true;
@@ -616,7 +626,7 @@ class WC_Email extends WC_Settings_API {
 
 					// Locate template file
 					$core_file     = $this->template_base . $template;
-					$template_file = apply_filters( 'woocommerce_locate_core_template', $core_file, $template, $this->template_base );
+					$template_file = apply_filters( 'woocommerce_locate_core_template', $core_file, $template, $this->template_base, $this->id );
 
 					// Copy template file
 					copy( $template_file, $theme_file );
@@ -704,7 +714,8 @@ class WC_Email extends WC_Settings_API {
 		// Do admin actions.
 		$this->admin_actions();
 		?>
-		<h3><?php echo esc_html( $this->get_title() ); ?></h3>
+		<h2><?php echo esc_html( $this->get_title() ); ?> <?php wc_back_link( __( 'Return to emails', 'woocommerce' ), admin_url( 'admin.php?page=wc-settings&tab=email' ) ); ?></h2>
+
 		<?php echo wpautop( wp_kses_post( $this->get_description() ) ); ?>
 
 		<?php
@@ -732,7 +743,7 @@ class WC_Email extends WC_Settings_API {
 			<?php
 				$templates = array(
 					'template_html'  => __( 'HTML template', 'woocommerce' ),
-					'template_plain' => __( 'Plain text template', 'woocommerce' )
+					'template_plain' => __( 'Plain text template', 'woocommerce' ),
 				);
 
 				foreach ( $templates as $template_type => $title ) :
@@ -744,7 +755,7 @@ class WC_Email extends WC_Settings_API {
 
 					$local_file    = $this->get_theme_template_file( $template );
 					$core_file     = $this->template_base . $template;
-					$template_file = apply_filters( 'woocommerce_locate_core_template', $core_file, $template, $this->template_base );
+					$template_file = apply_filters( 'woocommerce_locate_core_template', $core_file, $template, $this->template_base, $this->id );
 					$template_dir  = apply_filters( 'woocommerce_template_directory', 'woocommerce', $template );
 					?>
 					<div class="template <?php echo $template_type; ?>">
@@ -760,7 +771,7 @@ class WC_Email extends WC_Settings_API {
 									<a href="<?php echo esc_url( wp_nonce_url( remove_query_arg( array( 'move_template', 'saved' ), add_query_arg( 'delete_template', $template_type ) ), 'woocommerce_email_template_nonce', '_wc_email_nonce' ) ); ?>" class="delete_template button"><?php _e( 'Delete template file', 'woocommerce' ); ?></a>
 								<?php endif; ?>
 
-								<?php printf( __( 'This template has been overridden by your theme and can be found in: <code>%s</code>.', 'woocommerce' ), trailingslashit( basename( get_stylesheet_directory() ) ) . $template_dir . '/' . $template ); ?>
+								<?php printf( __( 'This template has been overridden by your theme and can be found in: %s.', 'woocommerce' ), '<code>' . trailingslashit( basename( get_stylesheet_directory() ) ) . $template_dir . '/' . $template . '</code>' ); ?>
 							</p>
 
 							<div class="editor" style="display:none">
@@ -776,7 +787,7 @@ class WC_Email extends WC_Settings_API {
 									<a href="<?php echo esc_url( wp_nonce_url( remove_query_arg( array( 'delete_template', 'saved' ), add_query_arg( 'move_template', $template_type ) ), 'woocommerce_email_template_nonce', '_wc_email_nonce' ) ); ?>" class="button"><?php _e( 'Copy file to theme', 'woocommerce' ); ?></a>
 								<?php } ?>
 
-								<?php printf( __( 'To override and edit this email template copy <code>%s</code> to your theme folder: <code>%s</code>.', 'woocommerce' ), plugin_basename( $template_file ) , trailingslashit( basename( get_stylesheet_directory() ) ) . $template_dir . '/' . $template ); ?>
+								<?php printf( __( 'To override and edit this email template copy %1$s to your theme folder: %2$s.', 'woocommerce' ), '<code>' . plugin_basename( $template_file ) . '</code>', '<code>' . trailingslashit( basename( get_stylesheet_directory() ) ) . $template_dir . '/' . $template . '</code>' ); ?>
 							</p>
 
 							<div class="editor" style="display:none">
diff --git a/includes/gateways/bacs/class-wc-gateway-bacs.php b/includes/gateways/bacs/class-wc-gateway-bacs.php
index bb22b0615b4..57df990dce5 100644
--- a/includes/gateways/bacs/class-wc-gateway-bacs.php
+++ b/includes/gateways/bacs/class-wc-gateway-bacs.php
@@ -26,7 +26,7 @@ class WC_Gateway_BACS extends WC_Payment_Gateway {
 	public function __construct() {
 
 		$this->id                 = 'bacs';
-		$this->icon               = apply_filters('woocommerce_bacs_icon', '');
+		$this->icon               = apply_filters( 'woocommerce_bacs_icon', '' );
 		$this->has_fields         = false;
 		$this->method_title       = __( 'BACS', 'woocommerce' );
 		$this->method_description = __( 'Allows payments by BACS, more commonly known as direct bank/wire transfer.', 'woocommerce' );
@@ -38,7 +38,7 @@ class WC_Gateway_BACS extends WC_Payment_Gateway {
 		// Define user set variables
 		$this->title        = $this->get_option( 'title' );
 		$this->description  = $this->get_option( 'description' );
-		$this->instructions = $this->get_option( 'instructions', $this->description );
+		$this->instructions = $this->get_option( 'instructions' );
 
 		// BACS account fields shown on the thanks page and in emails
 		$this->account_details = get_option( 'woocommerce_bacs_accounts',
@@ -49,8 +49,8 @@ class WC_Gateway_BACS extends WC_Payment_Gateway {
 					'sort_code'      => $this->get_option( 'sort_code' ),
 					'bank_name'      => $this->get_option( 'bank_name' ),
 					'iban'           => $this->get_option( 'iban' ),
-					'bic'            => $this->get_option( 'bic' )
-				)
+					'bic'            => $this->get_option( 'bic' ),
+				),
 			)
 		);
 
@@ -61,7 +61,6 @@ class WC_Gateway_BACS extends WC_Payment_Gateway {
 
 		// Customer Emails
 		add_action( 'woocommerce_email_before_order_table', array( $this, 'email_instructions' ), 10, 3 );
-
 	}
 
 	/**
@@ -73,21 +72,21 @@ class WC_Gateway_BACS extends WC_Payment_Gateway {
 			'enabled' => array(
 				'title'   => __( 'Enable/Disable', 'woocommerce' ),
 				'type'    => 'checkbox',
-				'label'   => __( 'Enable Bank Transfer', 'woocommerce' ),
-				'default' => 'no'
+				'label'   => __( 'Enable bank transfer', 'woocommerce' ),
+				'default' => 'no',
 			),
 			'title' => array(
 				'title'       => __( 'Title', 'woocommerce' ),
 				'type'        => 'text',
 				'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce' ),
-				'default'     => __( 'Direct Bank Transfer', 'woocommerce' ),
+				'default'     => __( 'Direct bank transfer', 'woocommerce' ),
 				'desc_tip'    => true,
 			),
 			'description' => array(
 				'title'       => __( 'Description', 'woocommerce' ),
 				'type'        => 'textarea',
 				'description' => __( 'Payment method description that the customer will see on your checkout.', 'woocommerce' ),
-				'default'     => __( 'Make your payment directly into our bank account. Please use your Order ID as the payment reference. Your order won\'t be shipped until the funds have cleared in our account.', 'woocommerce' ),
+				'default'     => __( 'Make your payment directly into our bank account. Please use your Order ID as the payment reference. Your order will not be shipped until the funds have cleared in our account.', 'woocommerce' ),
 				'desc_tip'    => true,
 			),
 			'instructions' => array(
@@ -98,14 +97,16 @@ class WC_Gateway_BACS extends WC_Payment_Gateway {
 				'desc_tip'    => true,
 			),
 			'account_details' => array(
-				'type'        => 'account_details'
+				'type'        => 'account_details',
 			),
 		);
 
 	}
 
 	/**
-	 * generate_account_details_html function.
+	 * Generate account details html.
+	 *
+	 * @return string
 	 */
 	public function generate_account_details_html() {
 
@@ -115,19 +116,19 @@ class WC_Gateway_BACS extends WC_Payment_Gateway {
 		$locale		= $this->get_country_locale();
 
 		// Get sortcode label in the $locale array and use appropriate one
-		$sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort Code', 'woocommerce' );
+		$sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'woocommerce' );
 
 		?>
 		<tr valign="top">
-			<th scope="row" class="titledesc"><?php _e( 'Account Details', 'woocommerce' ); ?>:</th>
+			<th scope="row" class="titledesc"><?php _e( 'Account details', 'woocommerce' ); ?>:</th>
 			<td class="forminp" id="bacs_accounts">
 				<table class="widefat wc_input_table sortable" cellspacing="0">
 					<thead>
 						<tr>
 							<th class="sort">&nbsp;</th>
-							<th><?php _e( 'Account Name', 'woocommerce' ); ?></th>
-							<th><?php _e( 'Account Number', 'woocommerce' ); ?></th>
-							<th><?php _e( 'Bank Name', 'woocommerce' ); ?></th>
+							<th><?php _e( 'Account name', 'woocommerce' ); ?></th>
+							<th><?php _e( 'Account number', 'woocommerce' ); ?></th>
+							<th><?php _e( 'Bank name', 'woocommerce' ); ?></th>
 							<th><?php echo $sortcode; ?></th>
 							<th><?php _e( 'IBAN', 'woocommerce' ); ?></th>
 							<th><?php _e( 'BIC / Swift', 'woocommerce' ); ?></th>
@@ -155,7 +156,7 @@ class WC_Gateway_BACS extends WC_Payment_Gateway {
 					</tbody>
 					<tfoot>
 						<tr>
-							<th colspan="7"><a href="#" class="add button"><?php _e( '+ Add Account', 'woocommerce' ); ?></a> <a href="#" class="remove_rows button"><?php _e( 'Remove selected account(s)', 'woocommerce' ); ?></a></th>
+							<th colspan="7"><a href="#" class="add button"><?php _e( '+ Add account', 'woocommerce' ); ?></a> <a href="#" class="remove_rows button"><?php _e( 'Remove selected account(s)', 'woocommerce' ); ?></a></th>
 						</tr>
 					</tfoot>
 				</table>
@@ -163,7 +164,7 @@ class WC_Gateway_BACS extends WC_Payment_Gateway {
 					jQuery(function() {
 						jQuery('#bacs_accounts').on( 'click', 'a.add', function(){
 
-							var size = jQuery('#bacs_accounts').find('tbody .account').size();
+							var size = jQuery('#bacs_accounts').find('tbody .account').length;
 
 							jQuery('<tr class="account">\
 									<td class="sort"></td>\
@@ -213,7 +214,7 @@ class WC_Gateway_BACS extends WC_Payment_Gateway {
 					'bank_name'      => $bank_names[ $i ],
 					'sort_code'      => $sort_codes[ $i ],
 					'iban'           => $ibans[ $i ],
-					'bic'            => $bics[ $i ]
+					'bic'            => $bics[ $i ],
 				);
 			}
 		}
@@ -224,6 +225,8 @@ class WC_Gateway_BACS extends WC_Payment_Gateway {
 
 	/**
 	 * Output for the order received page.
+	 *
+	 * @param int $order_id
 	 */
 	public function thankyou_page( $order_id ) {
 
@@ -243,17 +246,19 @@ class WC_Gateway_BACS extends WC_Payment_Gateway {
 	 */
 	public function email_instructions( $order, $sent_to_admin, $plain_text = false ) {
 
-		if ( ! $sent_to_admin && 'bacs' === $order->payment_method && $order->has_status( 'on-hold' ) ) {
+		if ( ! $sent_to_admin && 'bacs' === $order->get_payment_method() && $order->has_status( 'on-hold' ) ) {
 			if ( $this->instructions ) {
 				echo wpautop( wptexturize( $this->instructions ) ) . PHP_EOL;
 			}
-			$this->bank_details( $order->id );
+			$this->bank_details( $order->get_id() );
 		}
 
 	}
 
 	/**
 	 * Get bank details and place into a list format.
+	 *
+	 * @param int $order_id
 	 */
 	private function bank_details( $order_id = '' ) {
 
@@ -265,54 +270,63 @@ class WC_Gateway_BACS extends WC_Payment_Gateway {
 		$order 		= wc_get_order( $order_id );
 
 		// Get the order country and country $locale
-		$country 	= $order->billing_country;
+		$country 	= $order->get_billing_country();
 		$locale		= $this->get_country_locale();
 
 		// Get sortcode label in the $locale array and use appropriate one
-		$sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort Code', 'woocommerce' );
+		$sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'woocommerce' );
 
 		$bacs_accounts = apply_filters( 'woocommerce_bacs_accounts', $this->account_details );
 
 		if ( ! empty( $bacs_accounts ) ) {
-			echo '<h2>' . __( 'Our Bank Details', 'woocommerce' ) . '</h2>' . PHP_EOL;
+			$account_html = '';
+			$has_details  = false;
 
 			foreach ( $bacs_accounts as $bacs_account ) {
-
 				$bacs_account = (object) $bacs_account;
 
-				if ( $bacs_account->account_name || $bacs_account->bank_name ) {
-					echo '<h3>' . wp_unslash( implode( ' - ', array_filter( array( $bacs_account->account_name, $bacs_account->bank_name ) ) ) ) . '</h3>' . PHP_EOL;
+				if ( $bacs_account->account_name ) {
+					$account_html .= '<h3 class="wc-bacs-bank-details-account-name">' . wp_kses_post( wp_unslash( $bacs_account->account_name ) ) . ':</h3>' . PHP_EOL;
 				}
 
-				echo '<ul class="order_details bacs_details">' . PHP_EOL;
+				$account_html .= '<ul class="wc-bacs-bank-details order_details bacs_details">' . PHP_EOL;
 
 				// BACS account fields shown on the thanks page and in emails
 				$account_fields = apply_filters( 'woocommerce_bacs_account_fields', array(
-					'account_number'=> array(
-						'label' => __( 'Account Number', 'woocommerce' ),
-						'value' => $bacs_account->account_number
+					'bank_name' => array(
+						'label' => __( 'Bank', 'woocommerce' ),
+						'value' => $bacs_account->bank_name,
+					),
+					'account_number' => array(
+						'label' => __( 'Account number', 'woocommerce' ),
+						'value' => $bacs_account->account_number,
 					),
 					'sort_code'     => array(
 						'label' => $sortcode,
-						'value' => $bacs_account->sort_code
+						'value' => $bacs_account->sort_code,
 					),
 					'iban'          => array(
 						'label' => __( 'IBAN', 'woocommerce' ),
-						'value' => $bacs_account->iban
+						'value' => $bacs_account->iban,
 					),
 					'bic'           => array(
 						'label' => __( 'BIC', 'woocommerce' ),
-						'value' => $bacs_account->bic
-					)
+						'value' => $bacs_account->bic,
+					),
 				), $order_id );
 
 				foreach ( $account_fields as $field_key => $field ) {
 					if ( ! empty( $field['value'] ) ) {
-						echo '<li class="' . esc_attr( $field_key ) . '">' . esc_attr( $field['label'] ) . ': <strong>' . wptexturize( $field['value'] ) . '</strong></li>' . PHP_EOL;
+						$account_html .= '<li class="' . esc_attr( $field_key ) . '">' . wp_kses_post( $field['label'] ) . ': <strong>' . wp_kses_post( wptexturize( $field['value'] ) ) . '</strong></li>' . PHP_EOL;
+						$has_details   = true;
 					}
 				}
 
-				echo '</ul>';
+				$account_html .= '</ul>';
+			}
+
+			if ( $has_details ) {
+				echo '<section class="woocommerce-bacs-bank-details"><h2 class="wc-bacs-bank-details-heading">' . __( 'Our bank details', 'woocommerce' ) . '</h2>' . PHP_EOL . $account_html . '</section>';
 			}
 		}
 
@@ -332,7 +346,7 @@ class WC_Gateway_BACS extends WC_Payment_Gateway {
 		$order->update_status( 'on-hold', __( 'Awaiting BACS payment', 'woocommerce' ) );
 
 		// Reduce stock levels
-		$order->reduce_order_stock();
+		wc_reduce_stock_levels( $order_id );
 
 		// Remove cart
 		WC()->cart->empty_cart();
@@ -340,7 +354,7 @@ class WC_Gateway_BACS extends WC_Payment_Gateway {
 		// Return thankyou redirect
 		return array(
 			'result'    => 'success',
-			'redirect'  => $this->get_return_url( $order )
+			'redirect'  => $this->get_return_url( $order ),
 		);
 
 	}
@@ -350,10 +364,9 @@ class WC_Gateway_BACS extends WC_Payment_Gateway {
 	 *
 	 * @return array
 	 */
-
 	public function get_country_locale() {
 
-		if ( ! $this->locale ) {
+		if ( empty( $this->locale ) ) {
 
 			// Locale information to be used - only those that are not 'Sort Code'
 			$this->locale = apply_filters( 'woocommerce_get_bacs_locale', array(
@@ -364,7 +377,7 @@ class WC_Gateway_BACS extends WC_Payment_Gateway {
 				),
 				'CA' => array(
 					'sortcode'	=> array(
-						'label'		=> __( 'Bank Transit Number', 'woocommerce' ),
+						'label'		=> __( 'Bank transit number', 'woocommerce' ),
 					),
 				),
 				'IN' => array(
@@ -374,27 +387,27 @@ class WC_Gateway_BACS extends WC_Payment_Gateway {
 				),
 				'IT' => array(
 					'sortcode'	=> array(
-						'label'		=> __( 'Branch Sort', 'woocommerce' ),
+						'label'		=> __( 'Branch sort', 'woocommerce' ),
 					),
 				),
 				'NZ' => array(
 					'sortcode'	=> array(
-						'label'		=> __( 'Bank Code', 'woocommerce' ),
+						'label'		=> __( 'Bank code', 'woocommerce' ),
 					),
 				),
 				'SE' => array(
 					'sortcode'	=> array(
-						'label'		=> __( 'Bank Code', 'woocommerce' ),
+						'label'		=> __( 'Bank code', 'woocommerce' ),
 					),
 				),
 				'US' => array(
 					'sortcode'	=> array(
-						'label'		=> __( 'Routing Number', 'woocommerce' ),
+						'label'		=> __( 'Routing number', 'woocommerce' ),
 					),
 				),
 				'ZA' => array(
 					'sortcode'	=> array(
-						'label'		=> __( 'Branch Code', 'woocommerce' ),
+						'label'		=> __( 'Branch code', 'woocommerce' ),
 					),
 				),
 			) );
diff --git a/includes/gateways/cheque/class-wc-gateway-cheque.php b/includes/gateways/cheque/class-wc-gateway-cheque.php
index dfbb8b2709f..53fde62bc16 100644
--- a/includes/gateways/cheque/class-wc-gateway-cheque.php
+++ b/includes/gateways/cheque/class-wc-gateway-cheque.php
@@ -17,15 +17,15 @@ if ( ! defined( 'ABSPATH' ) ) {
  */
 class WC_Gateway_Cheque extends WC_Payment_Gateway {
 
-    /**
-     * Constructor for the gateway.
-     */
+	/**
+	 * Constructor for the gateway.
+	 */
 	public function __construct() {
 		$this->id                 = 'cheque';
-		$this->icon               = apply_filters('woocommerce_cheque_icon', '');
+		$this->icon               = apply_filters( 'woocommerce_cheque_icon', '' );
 		$this->has_fields         = false;
-		$this->method_title       = __( 'Cheque', 'woocommerce' );
-		$this->method_description = __( 'Allows cheque payments. Why would you take cheques in this day and age? Well you probably wouldn\'t but it does allow you to make test purchases for testing order emails and the \'success\' pages etc.', 'woocommerce' );
+		$this->method_title       = _x( 'Check payments', 'Check payment method', 'woocommerce' );
+		$this->method_description = __( 'Allows check payments. Why would you take checks in this day and age? Well you probably would not, but it does allow you to make test purchases for testing order emails and the success pages.', 'woocommerce' );
 
 		// Load the settings.
 		$this->init_form_fields();
@@ -34,40 +34,40 @@ class WC_Gateway_Cheque extends WC_Payment_Gateway {
 		// Define user set variables
 		$this->title        = $this->get_option( 'title' );
 		$this->description  = $this->get_option( 'description' );
-		$this->instructions = $this->get_option( 'instructions', $this->description );
+		$this->instructions = $this->get_option( 'instructions' );
 
 		// Actions
 		add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
-    	add_action( 'woocommerce_thankyou_cheque', array( $this, 'thankyou_page' ) );
+		add_action( 'woocommerce_thankyou_cheque', array( $this, 'thankyou_page' ) );
 
-    	// Customer Emails
-    	add_action( 'woocommerce_email_before_order_table', array( $this, 'email_instructions' ), 10, 3 );
-    }
+		// Customer Emails
+		add_action( 'woocommerce_email_before_order_table', array( $this, 'email_instructions' ), 10, 3 );
+	}
 
-    /**
-     * Initialise Gateway Settings Form Fields.
-     */
-    public function init_form_fields() {
+	/**
+	 * Initialise Gateway Settings Form Fields.
+	 */
+	public function init_form_fields() {
 
-    	$this->form_fields = array(
+		$this->form_fields = array(
 			'enabled' => array(
 				'title'   => __( 'Enable/Disable', 'woocommerce' ),
 				'type'    => 'checkbox',
-				'label'   => __( 'Enable Cheque Payment', 'woocommerce' ),
-				'default' => 'yes'
+				'label'   => __( 'Enable check payments', 'woocommerce' ),
+				'default' => 'yes',
 			),
 			'title' => array(
 				'title'       => __( 'Title', 'woocommerce' ),
 				'type'        => 'text',
 				'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce' ),
-				'default'     => __( 'Cheque Payment', 'woocommerce' ),
+				'default'     => _x( 'Check payments', 'Check payment method', 'woocommerce' ),
 				'desc_tip'    => true,
 			),
 			'description' => array(
 				'title'       => __( 'Description', 'woocommerce' ),
 				'type'        => 'textarea',
 				'description' => __( 'Payment method description that the customer will see on your checkout.', 'woocommerce' ),
-				'default'     => __( 'Please send your cheque to Store Name, Store Street, Store Town, Store State / County, Store Postcode.', 'woocommerce' ),
+				'default'     => __( 'Please send a check to Store Name, Store Street, Store Town, Store State / County, Store Postcode.', 'woocommerce' ),
 				'desc_tip'    => true,
 			),
 			'instructions' => array(
@@ -78,45 +78,46 @@ class WC_Gateway_Cheque extends WC_Payment_Gateway {
 				'desc_tip'    => true,
 			),
 		);
-    }
-
-    /**
-     * Output for the order received page.
-     */
-	public function thankyou_page() {
-		if ( $this->instructions )
-        	echo wpautop( wptexturize( $this->instructions ) );
 	}
 
-    /**
-     * Add content to the WC emails.
-     *
-     * @access public
-     * @param WC_Order $order
-     * @param bool $sent_to_admin
-     * @param bool $plain_text
-     */
+	/**
+	 * Output for the order received page.
+	 */
+	public function thankyou_page() {
+		if ( $this->instructions ) {
+			echo wpautop( wptexturize( $this->instructions ) );
+		}
+	}
+
+	/**
+	 * Add content to the WC emails.
+	 *
+	 * @access public
+	 * @param WC_Order $order
+	 * @param bool $sent_to_admin
+	 * @param bool $plain_text
+	 */
 	public function email_instructions( $order, $sent_to_admin, $plain_text = false ) {
-        if ( $this->instructions && ! $sent_to_admin && 'cheque' === $order->payment_method && $order->has_status( 'on-hold' ) ) {
+		if ( $this->instructions && ! $sent_to_admin && 'cheque' === $order->get_payment_method() && $order->has_status( 'on-hold' ) ) {
 			echo wpautop( wptexturize( $this->instructions ) ) . PHP_EOL;
 		}
 	}
 
-    /**
-     * Process the payment and return the result.
-     *
-     * @param int $order_id
-     * @return array
-     */
+	/**
+	 * Process the payment and return the result.
+	 *
+	 * @param int $order_id
+	 * @return array
+	 */
 	public function process_payment( $order_id ) {
 
 		$order = wc_get_order( $order_id );
 
 		// Mark as on-hold (we're awaiting the cheque)
-		$order->update_status( 'on-hold', __( 'Awaiting cheque payment', 'woocommerce' ) );
+		$order->update_status( 'on-hold', _x( 'Awaiting check payment', 'Check payment method', 'woocommerce' ) );
 
 		// Reduce stock levels
-		$order->reduce_order_stock();
+		wc_reduce_stock_levels( $order_id );
 
 		// Remove cart
 		WC()->cart->empty_cart();
@@ -124,7 +125,7 @@ class WC_Gateway_Cheque extends WC_Payment_Gateway {
 		// Return thankyou redirect
 		return array(
 			'result' 	=> 'success',
-			'redirect'	=> $this->get_return_url( $order )
+			'redirect'	=> $this->get_return_url( $order ),
 		);
 	}
 }
diff --git a/includes/gateways/class-wc-payment-gateway-cc.php b/includes/gateways/class-wc-payment-gateway-cc.php
new file mode 100644
index 00000000000..608bb34e955
--- /dev/null
+++ b/includes/gateways/class-wc-payment-gateway-cc.php
@@ -0,0 +1,92 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Credit Card Payment Gateway
+ *
+ * @since       2.6.0
+ * @package		WooCommerce/Classes
+ * @author 		WooThemes
+ */
+class WC_Payment_Gateway_CC extends WC_Payment_Gateway {
+
+	/**
+	 * Builds our payment fields area - including tokenization fields for logged
+	 * in users, and the actual payment fields.
+	 * @since 2.6.0
+	 */
+	public function payment_fields() {
+		if ( $this->supports( 'tokenization' ) && is_checkout() ) {
+			$this->tokenization_script();
+			$this->saved_payment_methods();
+			$this->form();
+			$this->save_payment_method_checkbox();
+		} else {
+			$this->form();
+		}
+	}
+
+	/**
+	 * Output field name HTML
+	 *
+	 * Gateways which support tokenization do not require names - we don't want the data to post to the server.
+	 *
+	 * @since  2.6.0
+	 * @param  string $name
+	 * @return string
+	 */
+	public function field_name( $name ) {
+		return $this->supports( 'tokenization' ) ? '' : ' name="' . esc_attr( $this->id . '-' . $name ) . '" ';
+	}
+
+	/**
+	 * Outputs fields for entering credit card information.
+	 * @since 2.6.0
+	 */
+	public function form() {
+		wp_enqueue_script( 'wc-credit-card-form' );
+
+		$fields = array();
+
+		$cvc_field = '<p class="form-row form-row-last">
+			<label for="' . esc_attr( $this->id ) . '-card-cvc">' . esc_html__( 'Card code', 'woocommerce' ) . ' <span class="required">*</span></label>
+			<input id="' . esc_attr( $this->id ) . '-card-cvc" class="input-text wc-credit-card-form-card-cvc" inputmode="numeric" autocomplete="off" autocorrect="no" autocapitalize="no" spellcheck="no" type="tel" maxlength="4" placeholder="' . esc_attr__( 'CVC', 'woocommerce' ) . '" ' . $this->field_name( 'card-cvc' ) . ' style="width:100px" />
+		</p>';
+
+		$default_fields = array(
+			'card-number-field' => '<p class="form-row form-row-wide">
+				<label for="' . esc_attr( $this->id ) . '-card-number">' . esc_html__( 'Card number', 'woocommerce' ) . ' <span class="required">*</span></label>
+				<input id="' . esc_attr( $this->id ) . '-card-number" class="input-text wc-credit-card-form-card-number" inputmode="numeric" autocomplete="cc-number" autocorrect="no" autocapitalize="no" spellcheck="no" type="tel" placeholder="&bull;&bull;&bull;&bull; &bull;&bull;&bull;&bull; &bull;&bull;&bull;&bull; &bull;&bull;&bull;&bull;" ' . $this->field_name( 'card-number' ) . ' />
+			</p>',
+			'card-expiry-field' => '<p class="form-row form-row-first">
+				<label for="' . esc_attr( $this->id ) . '-card-expiry">' . esc_html__( 'Expiry (MM/YY)', 'woocommerce' ) . ' <span class="required">*</span></label>
+				<input id="' . esc_attr( $this->id ) . '-card-expiry" class="input-text wc-credit-card-form-card-expiry" inputmode="numeric" autocomplete="cc-exp" autocorrect="no" autocapitalize="no" spellcheck="no" type="tel" placeholder="' . esc_attr__( 'MM / YY', 'woocommerce' ) . '" ' . $this->field_name( 'card-expiry' ) . ' />
+			</p>',
+		);
+
+		if ( ! $this->supports( 'credit_card_form_cvc_on_saved_method' ) ) {
+			$default_fields['card-cvc-field'] = $cvc_field;
+		}
+
+		$fields = wp_parse_args( $fields, apply_filters( 'woocommerce_credit_card_form_fields', $default_fields, $this->id ) );
+		?>
+
+		<fieldset id="wc-<?php echo esc_attr( $this->id ); ?>-cc-form" class='wc-credit-card-form wc-payment-form'>
+			<?php do_action( 'woocommerce_credit_card_form_start', $this->id ); ?>
+			<?php
+				foreach ( $fields as $field ) {
+				echo $field;
+				}
+			?>
+			<?php do_action( 'woocommerce_credit_card_form_end', $this->id ); ?>
+			<div class="clear"></div>
+		</fieldset>
+		<?php
+
+		if ( $this->supports( 'credit_card_form_cvc_on_saved_method' ) ) {
+			echo '<fieldset>' . $cvc_field . '</fieldset>';
+		}
+	}
+}
diff --git a/includes/gateways/class-wc-payment-gateway-echeck.php b/includes/gateways/class-wc-payment-gateway-echeck.php
new file mode 100644
index 00000000000..652fa497fb6
--- /dev/null
+++ b/includes/gateways/class-wc-payment-gateway-echeck.php
@@ -0,0 +1,63 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * eCheck Payment Gateway
+ *
+ * @since       2.6.0
+ * @package		WooCommerce/Classes
+ * @author 		WooThemes
+ */
+class WC_Payment_Gateway_eCheck extends WC_Payment_Gateway {
+
+	/**
+	 * Builds our payment fields area - including tokenization fields for logged
+	 * in users, and the actual payment fields.
+	 * @since 2.6.0
+	 */
+	public function payment_fields() {
+		if ( $this->supports( 'tokenization' ) && is_checkout() ) {
+			$this->tokenization_script();
+			$this->saved_payment_methods();
+			$this->form();
+			$this->save_payment_method_checkbox();
+		} else {
+			$this->form();
+		}
+	}
+
+	/**
+	 * Outputs fields for entering eCheck information.
+	 * @since 2.6.0
+	 */
+	public function form() {
+		$fields = array();
+
+		$default_fields = array(
+			'routing-number' => '<p class="form-row form-row-first">
+				<label for="' . esc_attr( $this->id ) . '-routing-number">' . esc_html__( 'Routing number', 'woocommerce' ) . ' <span class="required">*</span></label>
+				<input id="' . esc_attr( $this->id ) . '-routing-number" class="input-text wc-echeck-form-routing-number" type="text" maxlength="9" autocomplete="off" placeholder="&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;" name="' . esc_attr( $this->id ) . '-routing-number" />
+			</p>',
+			'account-number' => '<p class="form-row form-row-wide">
+				<label for="' . esc_attr( $this->id ) . '-account-number">' . esc_html__( 'Account number', 'woocommerce' ) . ' <span class="required">*</span></label>
+				<input id="' . esc_attr( $this->id ) . '-account-number" class="input-text wc-echeck-form-account-number" type="text" autocomplete="off" name="' . esc_attr( $this->id ) . '-account-number" maxlength="17" />
+			</p>',
+		);
+
+		$fields = wp_parse_args( $fields, apply_filters( 'woocommerce_echeck_form_fields', $default_fields, $this->id ) );
+		?>
+
+		<fieldset id="<?php echo esc_attr( $this->id ); ?>-cc-form" class='wc-echeck-form wc-payment-form'>
+			<?php do_action( 'woocommerce_echeck_form_start', $this->id ); ?>
+			<?php
+				foreach ( $fields as $field ) {
+					echo $field;
+				}
+			?>
+			<?php do_action( 'woocommerce_echeck_form_end', $this->id ); ?>
+			<div class="clear"></div>
+		</fieldset><?php
+	}
+}
diff --git a/includes/gateways/cod/class-wc-gateway-cod.php b/includes/gateways/cod/class-wc-gateway-cod.php
index 49303017659..ee5acb4418b 100644
--- a/includes/gateways/cod/class-wc-gateway-cod.php
+++ b/includes/gateways/cod/class-wc-gateway-cod.php
@@ -17,15 +17,12 @@ if ( ! defined( 'ABSPATH' ) ) {
  */
 class WC_Gateway_COD extends WC_Payment_Gateway {
 
-    /**
-     * Constructor for the gateway.
-     */
+	/**
+	 * Constructor for the gateway.
+	 */
 	public function __construct() {
-		$this->id                 = 'cod';
-		$this->icon               = apply_filters( 'woocommerce_cod_icon', '' );
-		$this->method_title       = __( 'Cash on Delivery', 'woocommerce' );
-		$this->method_description = __( 'Have your customers pay with cash (or by other means) upon delivery.', 'woocommerce' );
-		$this->has_fields         = false;
+		// Setup general properties
+		$this->setup_properties();
 
 		// Load the settings
 		$this->init_form_fields();
@@ -34,41 +31,51 @@ class WC_Gateway_COD extends WC_Payment_Gateway {
 		// Get settings
 		$this->title              = $this->get_option( 'title' );
 		$this->description        = $this->get_option( 'description' );
-		$this->instructions       = $this->get_option( 'instructions', $this->description );
+		$this->instructions       = $this->get_option( 'instructions' );
 		$this->enable_for_methods = $this->get_option( 'enable_for_methods', array() );
 		$this->enable_for_virtual = $this->get_option( 'enable_for_virtual', 'yes' ) === 'yes' ? true : false;
 
 		add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
-		add_action( 'woocommerce_thankyou_cod', array( $this, 'thankyou_page' ) );
+		add_action( 'woocommerce_thankyou_' . $this->id, array( $this, 'thankyou_page' ) );
 
-    	// Customer Emails
-    	add_action( 'woocommerce_email_before_order_table', array( $this, 'email_instructions' ), 10, 3 );
+		// Customer Emails
+		add_action( 'woocommerce_email_before_order_table', array( $this, 'email_instructions' ), 10, 3 );
 	}
 
-    /**
-     * Initialise Gateway Settings Form Fields.
-     */
-    public function init_form_fields() {
-    	$shipping_methods = array();
+	/**
+	 * Setup general properties for the gateway.
+	 */
+	protected function setup_properties() {
+		$this->id                 = 'cod';
+		$this->icon               = apply_filters( 'woocommerce_cod_icon', '' );
+		$this->method_title       = __( 'Cash on delivery', 'woocommerce' );
+		$this->method_description = __( 'Have your customers pay with cash (or by other means) upon delivery.', 'woocommerce' );
+		$this->has_fields         = false;
+	}
 
-    	if ( is_admin() )
-	    	foreach ( WC()->shipping()->load_shipping_methods() as $method ) {
-		    	$shipping_methods[ $method->id ] = $method->get_title();
-	    	}
+	/**
+	 * Initialise Gateway Settings Form Fields.
+	 */
+	public function init_form_fields() {
+		$shipping_methods = array();
 
-    	$this->form_fields = array(
+		foreach ( WC()->shipping()->load_shipping_methods() as $method ) {
+			$shipping_methods[ $method->id ] = $method->get_method_title();
+		}
+
+		$this->form_fields = array(
 			'enabled' => array(
-				'title'       => __( 'Enable COD', 'woocommerce' ),
-				'label'       => __( 'Enable Cash on Delivery', 'woocommerce' ),
+				'title'       => __( 'Enable/Disable', 'woocommerce' ),
+				'label'       => __( 'Enable cash on delivery', 'woocommerce' ),
 				'type'        => 'checkbox',
 				'description' => '',
-				'default'     => 'no'
+				'default'     => 'no',
 			),
 			'title' => array(
 				'title'       => __( 'Title', 'woocommerce' ),
 				'type'        => 'text',
 				'description' => __( 'Payment method description that the customer will see on your checkout.', 'woocommerce' ),
-				'default'     => __( 'Cash on Delivery', 'woocommerce' ),
+				'default'     => __( 'Cash on delivery', 'woocommerce' ),
 				'desc_tip'    => true,
 			),
 			'description' => array(
@@ -89,23 +96,23 @@ class WC_Gateway_COD extends WC_Payment_Gateway {
 				'title'             => __( 'Enable for shipping methods', 'woocommerce' ),
 				'type'              => 'multiselect',
 				'class'             => 'wc-enhanced-select',
-				'css'               => 'width: 450px;',
+				'css'               => 'width: 400px;',
 				'default'           => '',
 				'description'       => __( 'If COD is only available for certain methods, set it up here. Leave blank to enable for all methods.', 'woocommerce' ),
 				'options'           => $shipping_methods,
 				'desc_tip'          => true,
 				'custom_attributes' => array(
-					'data-placeholder' => __( 'Select shipping methods', 'woocommerce' )
-				)
+					'data-placeholder' => __( 'Select shipping methods', 'woocommerce' ),
+				),
 			),
 			'enable_for_virtual' => array(
 				'title'             => __( 'Accept for virtual orders', 'woocommerce' ),
 				'label'             => __( 'Accept COD if the order is virtual', 'woocommerce' ),
 				'type'              => 'checkbox',
-				'default'           => 'yes'
-			)
- 	   );
-    }
+				'default'           => 'yes',
+			),
+	   );
+	}
 
 	/**
 	 * Check If The Gateway Is Available For Use.
@@ -126,7 +133,7 @@ class WC_Gateway_COD extends WC_Payment_Gateway {
 			// Test if order needs shipping.
 			if ( 0 < sizeof( $order->get_items() ) ) {
 				foreach ( $order->get_items() as $item ) {
-					$_product = $order->get_product_from_item( $item );
+					$_product = $item->get_product();
 					if ( $_product && $_product->needs_shipping() ) {
 						$needs_shipping = true;
 						break;
@@ -160,7 +167,6 @@ class WC_Gateway_COD extends WC_Payment_Gateway {
 				if ( $order->shipping_method ) {
 					$check_method = $order->shipping_method;
 				}
-
 			} elseif ( empty( $chosen_shipping_methods ) || sizeof( $chosen_shipping_methods ) > 1 ) {
 				$check_method = false;
 			} elseif ( sizeof( $chosen_shipping_methods ) == 1 ) {
@@ -189,21 +195,20 @@ class WC_Gateway_COD extends WC_Payment_Gateway {
 	}
 
 
-    /**
-     * Process the payment and return the result.
-     *
-     * @param int $order_id
-     * @return array
-     */
+	/**
+	 * Process the payment and return the result.
+	 *
+	 * @param int $order_id
+	 * @return array
+	 */
 	public function process_payment( $order_id ) {
-
 		$order = wc_get_order( $order_id );
 
-		// Mark as processing (payment won't be taken until delivery)
-		$order->update_status( 'processing', __( 'Payment to be made upon delivery.', 'woocommerce' ) );
+		// Mark as processing or on-hold (payment won't be taken until delivery)
+		$order->update_status( apply_filters( 'woocommerce_cod_process_payment_order_status', $order->has_downloadable_item() ? 'on-hold' : 'processing', $order ), __( 'Payment to be made upon delivery.', 'woocommerce' ) );
 
 		// Reduce stock levels
-		$order->reduce_order_stock();
+		wc_reduce_stock_levels( $order_id );
 
 		// Remove cart
 		WC()->cart->empty_cart();
@@ -211,29 +216,29 @@ class WC_Gateway_COD extends WC_Payment_Gateway {
 		// Return thankyou redirect
 		return array(
 			'result' 	=> 'success',
-			'redirect'	=> $this->get_return_url( $order )
+			'redirect'	=> $this->get_return_url( $order ),
 		);
 	}
 
-    /**
-     * Output for the order received page.
-     */
+	/**
+	 * Output for the order received page.
+	 */
 	public function thankyou_page() {
 		if ( $this->instructions ) {
-        	echo wpautop( wptexturize( $this->instructions ) );
+			echo wpautop( wptexturize( $this->instructions ) );
 		}
 	}
 
-    /**
-     * Add content to the WC emails.
-     *
-     * @access public
-     * @param WC_Order $order
-     * @param bool $sent_to_admin
-     * @param bool $plain_text
-     */
+	/**
+	 * Add content to the WC emails.
+	 *
+	 * @access public
+	 * @param WC_Order $order
+	 * @param bool $sent_to_admin
+	 * @param bool $plain_text
+	 */
 	public function email_instructions( $order, $sent_to_admin, $plain_text = false ) {
-		if ( $this->instructions && ! $sent_to_admin && 'cod' === $order->payment_method ) {
+		if ( $this->instructions && ! $sent_to_admin && $this->id === $order->get_payment_method() ) {
 			echo wpautop( wptexturize( $this->instructions ) ) . PHP_EOL;
 		}
 	}
diff --git a/includes/gateways/paypal/class-wc-gateway-paypal.php b/includes/gateways/paypal/class-wc-gateway-paypal.php
index d3d1bd6b461..ade35aeb6c9 100644
--- a/includes/gateways/paypal/class-wc-gateway-paypal.php
+++ b/includes/gateways/paypal/class-wc-gateway-paypal.php
@@ -1,9 +1,4 @@
 <?php
-
-if ( ! defined( 'ABSPATH' ) ) {
-	exit;
-}
-
 /**
  * PayPal Standard Payment Gateway.
  *
@@ -15,9 +10,17 @@ if ( ! defined( 'ABSPATH' ) ) {
  * @package		WooCommerce/Classes/Payment
  * @author 		WooThemes
  */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC_Gateway_Paypal Class.
+ */
 class WC_Gateway_Paypal extends WC_Payment_Gateway {
 
-	/** @var boolean Whether or not logging is enabled */
+	/** @var bool Whether or not logging is enabled */
 	public static $log_enabled = false;
 
 	/** @var WC_Logger Logger instance */
@@ -31,17 +34,17 @@ class WC_Gateway_Paypal extends WC_Payment_Gateway {
 		$this->has_fields         = false;
 		$this->order_button_text  = __( 'Proceed to PayPal', 'woocommerce' );
 		$this->method_title       = __( 'PayPal', 'woocommerce' );
-		$this->method_description = sprintf( __( 'PayPal standard sends customers to PayPal to enter their payment information. PayPal IPN requires fsockopen/cURL support to update order statuses after payment. Check the %ssystem status%s page for more details.', 'woocommerce' ), '<a href="' . admin_url( 'admin.php?page=wc-status' ) . '">', '</a>' );
+		$this->method_description = sprintf( __( 'PayPal Standard sends customers to PayPal to enter their payment information. PayPal IPN requires fsockopen/cURL support to update order statuses after payment. Check the <a href="%s">system status</a> page for more details.', 'woocommerce' ), admin_url( 'admin.php?page=wc-status' ) );
 		$this->supports           = array(
 			'products',
-			'refunds'
+			'refunds',
 		);
 
 		// Load the settings.
 		$this->init_form_fields();
 		$this->init_settings();
 
-		// Define user set variables
+		// Define user set variables.
 		$this->title          = $this->get_option( 'title' );
 		$this->description    = $this->get_option( 'description' );
 		$this->testmode       = 'yes' === $this->get_option( 'testmode', 'no' );
@@ -53,15 +56,17 @@ class WC_Gateway_Paypal extends WC_Payment_Gateway {
 		self::$log_enabled    = $this->debug;
 
 		add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
+		add_action( 'woocommerce_order_status_on-hold_to_processing', array( $this, 'capture_payment' ) );
+		add_action( 'woocommerce_order_status_on-hold_to_completed', array( $this, 'capture_payment' ) );
 
 		if ( ! $this->is_valid_for_use() ) {
 			$this->enabled = 'no';
 		} else {
-			include_once( 'includes/class-wc-gateway-paypal-ipn-handler.php' );
+			include_once( dirname( __FILE__ ) . '/includes/class-wc-gateway-paypal-ipn-handler.php' );
 			new WC_Gateway_Paypal_IPN_Handler( $this->testmode, $this->receiver_email );
 
 			if ( $this->identity_token ) {
-				include_once( 'includes/class-wc-gateway-paypal-pdt-handler.php' );
+				include_once( dirname( __FILE__ ) . '/includes/class-wc-gateway-paypal-pdt-handler.php' );
 				new WC_Gateway_Paypal_PDT_Handler( $this->testmode, $this->identity_token );
 			}
 		}
@@ -69,20 +74,22 @@ class WC_Gateway_Paypal extends WC_Payment_Gateway {
 
 	/**
 	 * Logging method.
-	 * @param  string $message
+	 *
+	 * @param string $message Log message.
+	 * @param string $level   Optional. Default 'info'.
+	 *     emergency|alert|critical|error|warning|notice|info|debug
 	 */
-	public static function log( $message ) {
+	public static function log( $message, $level = 'info' ) {
 		if ( self::$log_enabled ) {
 			if ( empty( self::$log ) ) {
-				self::$log = new WC_Logger();
+				self::$log = wc_get_logger();
 			}
-			self::$log->add( 'paypal', $message );
+			self::$log->log( $level, $message, array( 'source' => 'paypal' ) );
 		}
 	}
 
 	/**
-	 * get_icon function.
-	 *
+	 * Get gateway icon.
 	 * @return string
 	 */
 	public function get_icon() {
@@ -90,10 +97,10 @@ class WC_Gateway_Paypal extends WC_Payment_Gateway {
 		$icon      = (array) $this->get_icon_image( WC()->countries->get_base_country() );
 
 		foreach ( $icon as $i ) {
-			$icon_html .= '<img src="' . esc_attr( $i ) . '" alt="' . esc_attr__( 'PayPal Acceptance Mark', 'woocommerce' ) . '" />';
+			$icon_html .= '<img src="' . esc_attr( $i ) . '" alt="' . esc_attr__( 'PayPal acceptance mark', 'woocommerce' ) . '" />';
 		}
 
-		$icon_html .= sprintf( '<a href="%1$s" class="about_paypal" onclick="javascript:window.open(\'%1$s\',\'WIPaypal\',\'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, width=1060, height=700\'); return false;" title="' . esc_attr__( 'What is PayPal?', 'woocommerce' ) . '">' . esc_attr__( 'What is PayPal?', 'woocommerce' ) . '</a>', esc_url( $this->get_icon_url( WC()->countries->get_base_country() ) ) );
+		$icon_html .= sprintf( '<a href="%1$s" class="about_paypal" onclick="javascript:window.open(\'%1$s\',\'WIPaypal\',\'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, width=1060, height=700\'); return false;">' . esc_attr__( 'What is PayPal?', 'woocommerce' ) . '</a>', esc_url( $this->get_icon_url( WC()->countries->get_base_country() ) ) );
 
 		return apply_filters( 'woocommerce_gateway_icon', $icon_html, $this->id );
 	}
@@ -104,13 +111,17 @@ class WC_Gateway_Paypal extends WC_Payment_Gateway {
 	 * @return string
 	 */
 	protected function get_icon_url( $country ) {
-		$countries = array( 'DZ', 'AU', 'BH', 'BE', 'BQ', 'BW', 'CA', 'CN', 'CW', 'CZ', 'DK', 'FI', 'FR', 'DE', 'GR', 'HK', 'HU', 'IN', 'ID', 'IT', 'JO', 'KE', 'KW', 'LU', 'MY', 'MA', 'NL', 'NO', 'OM', 'PH', 'PL', 'PT', 'QA', 'IE', 'RU', 'BL', 'SX', 'MF', 'SA', 'SG', 'SK', 'KR', 'SS', 'ES', 'SE', 'TW', 'TH', 'TR', 'AE', 'GB', 'US', 'VN' );
+		$url           = 'https://www.paypal.com/' . strtolower( $country );
+		$home_counties = array( 'BE', 'CZ', 'DK', 'HU', 'IT', 'JP', 'NL', 'NO', 'ES', 'SE', 'TR' );
+		$countries     = array( 'DZ', 'AU', 'BH', 'BQ', 'BW', 'CA', 'CN', 'CW', 'FI', 'FR', 'DE', 'GR', 'HK', 'IN', 'ID', 'JO', 'KE', 'KW', 'LU', 'MY', 'MA', 'OM', 'PH', 'PL', 'PT', 'QA', 'IE', 'RU', 'BL', 'SX', 'MF', 'SA', 'SG', 'SK', 'KR', 'SS', 'TW', 'TH', 'AE', 'GB', 'US', 'VN' );
 
-		if ( in_array( $country, $countries ) ) {
-			return 'https://www.paypal.com/' . strtolower( $country ) . '/webapps/mpp/paypal-popup';
+		if ( in_array( $country, $home_counties ) ) {
+			return  $url . '/webapps/mpp/home';
+		} elseif ( in_array( $country, $countries ) ) {
+			return $url . '/webapps/mpp/paypal-popup';
+		} else {
+			return $url . '/cgi-bin/webscr?cmd=xpt/Marketing/general/WIPaypal-outside';
 		}
-
-		return 'https://www.paypal.com/' . strtolower( $country ) . '/cgi-bin/webscr?cmd=xpt/Marketing/general/WIPaypal-outside';
 	}
 
 	/**
@@ -136,7 +147,7 @@ class WC_Gateway_Paypal extends WC_Payment_Gateway {
 			case 'MX' :
 				$icon = array(
 					'https://www.paypal.com/es_XC/Marketing/i/banner/paypal_visa_mastercard_amex.png',
-					'https://www.paypal.com/es_XC/Marketing/i/banner/paypal_debit_card_275x60.gif'
+					'https://www.paypal.com/es_XC/Marketing/i/banner/paypal_debit_card_275x60.gif',
 				);
 			break;
 			case 'FR' :
@@ -181,7 +192,6 @@ class WC_Gateway_Paypal extends WC_Payment_Gateway {
 
 	/**
 	 * Check if this gateway is enabled and available in the user's country.
-	 *
 	 * @return bool
 	 */
 	public function is_valid_for_use() {
@@ -199,7 +209,7 @@ class WC_Gateway_Paypal extends WC_Payment_Gateway {
 			parent::admin_options();
 		} else {
 			?>
-			<div class="inline error"><p><strong><?php _e( 'Gateway Disabled', 'woocommerce' ); ?></strong>: <?php _e( 'PayPal does not support your store currency.', 'woocommerce' ); ?></p></div>
+			<div class="inline error"><p><strong><?php _e( 'Gateway disabled', 'woocommerce' ); ?></strong>: <?php _e( 'PayPal does not support your store currency.', 'woocommerce' ); ?></p></div>
 			<?php
 		}
 	}
@@ -213,9 +223,7 @@ class WC_Gateway_Paypal extends WC_Payment_Gateway {
 
 	/**
 	 * Get the transaction URL.
-	 *
 	 * @param  WC_Order $order
-	 *
 	 * @return string
 	 */
 	public function get_transaction_url( $order ) {
@@ -229,19 +237,18 @@ class WC_Gateway_Paypal extends WC_Payment_Gateway {
 
 	/**
 	 * Process the payment and return the result.
-	 *
-	 * @param int $order_id
+	 * @param  int $order_id
 	 * @return array
 	 */
 	public function process_payment( $order_id ) {
-		include_once( 'includes/class-wc-gateway-paypal-request.php' );
+		include_once( dirname( __FILE__ ) . '/includes/class-wc-gateway-paypal-request.php' );
 
 		$order          = wc_get_order( $order_id );
 		$paypal_request = new WC_Gateway_Paypal_Request( $this );
 
 		return array(
 			'result'   => 'success',
-			'redirect' => $paypal_request->get_request_url( $order, $this->testmode )
+			'redirect' => $paypal_request->get_request_url( $order, $this->testmode ),
 		);
 	}
 
@@ -254,44 +261,87 @@ class WC_Gateway_Paypal extends WC_Payment_Gateway {
 		return $order && $order->get_transaction_id();
 	}
 
+	/**
+	 * Init the API class and set the username/password etc.
+	 */
+	protected function init_api() {
+		include_once( dirname( __FILE__ ) . '/includes/class-wc-gateway-paypal-api-handler.php' );
+
+		WC_Gateway_Paypal_API_Handler::$api_username  = $this->get_option( 'api_username' );
+		WC_Gateway_Paypal_API_Handler::$api_password  = $this->get_option( 'api_password' );
+		WC_Gateway_Paypal_API_Handler::$api_signature = $this->get_option( 'api_signature' );
+		WC_Gateway_Paypal_API_Handler::$sandbox       = $this->testmode;
+	}
+
 	/**
 	 * Process a refund if supported.
-	 * @param  int $order_id
-	 * @param  float $amount
+	 * @param  int    $order_id
+	 * @param  float  $amount
 	 * @param  string $reason
-	 * @return  boolean True or false based on success, or a WP_Error object
+	 * @return bool True or false based on success, or a WP_Error object
 	 */
 	public function process_refund( $order_id, $amount = null, $reason = '' ) {
 		$order = wc_get_order( $order_id );
 
 		if ( ! $this->can_refund_order( $order ) ) {
-			$this->log( 'Refund Failed: No transaction ID' );
-			return new WP_Error( 'error', __( 'Refund Failed: No transaction ID', 'woocommerce' ) );
+			$this->log( 'Refund Failed: No transaction ID', 'error' );
+			return new WP_Error( 'error', __( 'Refund failed: No transaction ID', 'woocommerce' ) );
 		}
 
-		include_once( 'includes/class-wc-gateway-paypal-refund.php' );
+		$this->init_api();
 
-		WC_Gateway_Paypal_Refund::$api_username  = $this->get_option( 'api_username' );
-		WC_Gateway_Paypal_Refund::$api_password  = $this->get_option( 'api_password' );
-		WC_Gateway_Paypal_Refund::$api_signature = $this->get_option( 'api_signature' );
-
-		$result = WC_Gateway_Paypal_Refund::refund_order( $order, $amount, $reason, $this->testmode );
+		$result = WC_Gateway_Paypal_API_Handler::refund_transaction( $order, $amount, $reason );
 
 		if ( is_wp_error( $result ) ) {
-			$this->log( 'Refund Failed: ' . $result->get_error_message() );
+			$this->log( 'Refund Failed: ' . $result->get_error_message(), 'error' );
 			return new WP_Error( 'error', $result->get_error_message() );
 		}
 
-		$this->log( 'Refund Result: ' . print_r( $result, true ) );
+		$this->log( 'Refund Result: ' . wc_print_r( $result, true ) );
 
-		switch ( strtolower( $result['ACK'] ) ) {
+		switch ( strtolower( $result->ACK ) ) {
 			case 'success':
 			case 'successwithwarning':
-				$order->add_order_note( sprintf( __( 'Refunded %s - Refund ID: %s', 'woocommerce' ), $result['GROSSREFUNDAMT'], $result['REFUNDTRANSACTIONID'] ) );
+				$order->add_order_note( sprintf( __( 'Refunded %1$s - Refund ID: %2$s', 'woocommerce' ), $result->GROSSREFUNDAMT, $result->REFUNDTRANSACTIONID ) );
 				return true;
 			break;
 		}
 
-		return isset( $result['L_LONGMESSAGE0'] ) ? new WP_Error( 'error', $result['L_LONGMESSAGE0'] ) : false;
+		return isset( $result->L_LONGMESSAGE0 ) ? new WP_Error( 'error', $result->L_LONGMESSAGE0 ) : false;
+	}
+
+	/**
+	 * Capture payment when the order is changed from on-hold to complete or processing
+	 *
+	 * @param  int $order_id
+	 */
+	public function capture_payment( $order_id ) {
+		$order = wc_get_order( $order_id );
+
+		if ( 'paypal' === $order->get_payment_method() && 'pending' === get_post_meta( $order->get_id(), '_paypal_status', true ) && $order->get_transaction_id() ) {
+			$this->init_api();
+			$result = WC_Gateway_Paypal_API_Handler::do_capture( $order );
+
+			if ( is_wp_error( $result ) ) {
+				$this->log( 'Capture Failed: ' . $result->get_error_message(), 'error' );
+				$order->add_order_note( sprintf( __( 'Payment could not captured: %s', 'woocommerce' ), $result->get_error_message() ) );
+				return;
+			}
+
+			$this->log( 'Capture Result: ' . wc_print_r( $result, true ) );
+
+			if ( ! empty( $result->PAYMENTSTATUS ) ) {
+				switch ( $result->PAYMENTSTATUS ) {
+					case 'Completed' :
+						$order->add_order_note( sprintf( __( 'Payment of %1$s was captured - Auth ID: %2$s, Transaction ID: %3$s', 'woocommerce' ), $result->AMT, $result->AUTHORIZATIONID, $result->TRANSACTIONID ) );
+						update_post_meta( $order->get_id(), '_paypal_status', $result->PAYMENTSTATUS );
+						update_post_meta( $order->get_id(), '_transaction_id', $result->TRANSACTIONID );
+					break;
+					default :
+						$order->add_order_note( sprintf( __( 'Payment could not captured - Auth ID: %1$s, Status: %2$s', 'woocommerce' ), $result->AUTHORIZATIONID, $result->PAYMENTSTATUS ) );
+					break;
+				}
+			}
+		}
 	}
 }
diff --git a/includes/gateways/paypal/includes/class-wc-gateway-paypal-api-handler.php b/includes/gateways/paypal/includes/class-wc-gateway-paypal-api-handler.php
new file mode 100644
index 00000000000..9ed597cb91c
--- /dev/null
+++ b/includes/gateways/paypal/includes/class-wc-gateway-paypal-api-handler.php
@@ -0,0 +1,156 @@
+<?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Handles Refunds and other API requests such as capture.
+ * @since 3.0.0
+ */
+class WC_Gateway_Paypal_API_Handler {
+
+	/** @var string API Username */
+	public static $api_username;
+
+	/** @var string API Password */
+	public static $api_password;
+
+	/** @var string API Signature */
+	public static $api_signature;
+
+	/** @var bool Sandbox */
+	public static $sandbox = false;
+
+	/**
+	 * Get capture request args.
+	 * See https://developer.paypal.com/docs/classic/api/merchant/DoCapture_API_Operation_NVP/.
+	 * @param  WC_Order $order
+	 * @param  float    $amount
+	 * @return array
+	 */
+	public static function get_capture_request( $order, $amount = null ) {
+		$request = array(
+			'VERSION'         => '84.0',
+			'SIGNATURE'       => self::$api_signature,
+			'USER'            => self::$api_username,
+			'PWD'             => self::$api_password,
+			'METHOD'          => 'DoCapture',
+			'AUTHORIZATIONID' => $order->get_transaction_id(),
+			'AMT'             => number_format( is_null( $amount ) ? $order->get_total() : $amount, 2, '.', '' ),
+			'CURRENCYCODE'    => $order->get_currency(),
+			'COMPLETETYPE'    => 'Complete',
+		);
+		return apply_filters( 'woocommerce_paypal_capture_request', $request, $order, $amount );
+	}
+
+	/**
+	 * Get refund request args.
+	 * @param  WC_Order $order
+	 * @param  float    $amount
+	 * @param  string   $reason
+	 * @return array
+	 */
+	public static function get_refund_request( $order, $amount = null, $reason = '' ) {
+		$request = array(
+			'VERSION'       => '84.0',
+			'SIGNATURE'     => self::$api_signature,
+			'USER'          => self::$api_username,
+			'PWD'           => self::$api_password,
+			'METHOD'        => 'RefundTransaction',
+			'TRANSACTIONID' => $order->get_transaction_id(),
+			'NOTE'          => html_entity_decode( wc_trim_string( $reason, 255 ), ENT_NOQUOTES, 'UTF-8' ),
+			'REFUNDTYPE'    => 'Full',
+		);
+		if ( ! is_null( $amount ) ) {
+			$request['AMT']          = number_format( $amount, 2, '.', '' );
+			$request['CURRENCYCODE'] = $order->get_currency();
+			$request['REFUNDTYPE']   = 'Partial';
+		}
+		return apply_filters( 'woocommerce_paypal_refund_request', $request, $order, $amount, $reason );
+	}
+
+	/**
+	 * Capture an authorization.
+	 * @param  WC_Order $order
+	 * @param  float $amount
+	 * @return object Either an object of name value pairs for a success, or a WP_ERROR object.
+	 */
+	public static function do_capture( $order, $amount = null ) {
+		$raw_response = wp_safe_remote_post(
+			self::$sandbox ? 'https://api-3t.sandbox.paypal.com/nvp' : 'https://api-3t.paypal.com/nvp',
+			array(
+				'method'      => 'POST',
+				'body'        => self::get_capture_request( $order, $amount ),
+				'timeout'     => 70,
+				'user-agent'  => 'WooCommerce/' . WC()->version,
+				'httpversion' => '1.1',
+			)
+		);
+
+		WC_Gateway_Paypal::log( 'DoCapture Response: ' . wc_print_r( $raw_response, true ) );
+
+		if ( empty( $raw_response['body'] ) ) {
+			return new WP_Error( 'paypal-api', 'Empty Response' );
+		} elseif ( is_wp_error( $raw_response ) ) {
+			return $raw_response;
+		}
+
+		parse_str( $raw_response['body'], $response );
+
+		return (object) $response;
+	}
+
+	/**
+	 * Refund an order via PayPal.
+	 * @param  WC_Order $order
+	 * @param  float    $amount
+	 * @param  string   $reason
+	 * @return object Either an object of name value pairs for a success, or a WP_ERROR object.
+	 */
+	public static function refund_transaction( $order, $amount = null, $reason = '' ) {
+		$raw_response = wp_safe_remote_post(
+			self::$sandbox ? 'https://api-3t.sandbox.paypal.com/nvp' : 'https://api-3t.paypal.com/nvp',
+			array(
+				'method'      => 'POST',
+				'body'        => self::get_refund_request( $order, $amount, $reason ),
+				'timeout'     => 70,
+				'user-agent'  => 'WooCommerce/' . WC()->version,
+				'httpversion' => '1.1',
+			)
+		);
+
+		WC_Gateway_Paypal::log( 'Refund Response: ' . wc_print_r( $raw_response, true ) );
+
+		if ( empty( $raw_response['body'] ) ) {
+			return new WP_Error( 'paypal-api', 'Empty Response' );
+		} elseif ( is_wp_error( $raw_response ) ) {
+			return $raw_response;
+		}
+
+		parse_str( $raw_response['body'], $response );
+
+		return (object) $response;
+	}
+}
+
+/**
+ * Here for backwards compatibility.
+ * @since 3.0.0
+ */
+class WC_Gateway_Paypal_Refund extends WC_Gateway_Paypal_API_Handler {
+	public static function get_request( $order, $amount = null, $reason = '' ) {
+		return self::get_refund_request( $order, $amount, $reason );
+	}
+	public static function refund_order( $order, $amount = null, $reason = '', $sandbox = false ) {
+		if ( $sandbox ) {
+			self::$sandbox = $sandbox;
+		}
+		$result = self::refund_transaction( $order, $amount, $reason );
+		if ( is_wp_error( $result ) ) {
+			return $result;
+		} else {
+			return (array) $result;
+		}
+	}
+}
diff --git a/includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php b/includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php
index cb56d118500..da4435f2c23 100644
--- a/includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php
+++ b/includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php
@@ -1,10 +1,10 @@
 <?php
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
-include_once( 'class-wc-gateway-paypal-response.php' );
+include_once( dirname( __FILE__ ) . '/class-wc-gateway-paypal-response.php' );
 
 /**
  * Handles responses from PayPal IPN.
@@ -16,6 +16,9 @@ class WC_Gateway_Paypal_IPN_Handler extends WC_Gateway_Paypal_Response {
 
 	/**
 	 * Constructor.
+	 *
+	 * @param bool $sandbox
+	 * @param string $receiver_email
 	 */
 	public function __construct( $sandbox = false, $receiver_email = '' ) {
 		add_action( 'woocommerce_api_wc_gateway_paypal', array( $this, 'check_response' ) );
@@ -32,10 +35,13 @@ class WC_Gateway_Paypal_IPN_Handler extends WC_Gateway_Paypal_Response {
 		if ( ! empty( $_POST ) && $this->validate_ipn() ) {
 			$posted = wp_unslash( $_POST );
 
-			do_action( "valid-paypal-standard-ipn-request", $posted );
+			// @codingStandardsIgnoreStart
+			do_action( 'valid-paypal-standard-ipn-request', $posted );
+			// @codingStandardsIgnoreEnd
 			exit;
 		}
-		wp_die( "PayPal IPN Request Failure", "PayPal IPN", array( 'response' => 500 ) );
+
+		wp_die( 'PayPal IPN Request Failure', 'PayPal IPN', array( 'response' => 500 ) );
 	}
 
 	/**
@@ -45,15 +51,15 @@ class WC_Gateway_Paypal_IPN_Handler extends WC_Gateway_Paypal_Response {
 	public function valid_response( $posted ) {
 		if ( ! empty( $posted['custom'] ) && ( $order = $this->get_paypal_order( $posted['custom'] ) ) ) {
 
-			// Lowercase returned variables
+			// Lowercase returned variables.
 			$posted['payment_status'] = strtolower( $posted['payment_status'] );
 
-			// Sandbox fix
+			// Sandbox fix.
 			if ( isset( $posted['test_ipn'] ) && 1 == $posted['test_ipn'] && 'pending' == $posted['payment_status'] ) {
 				$posted['payment_status'] = 'completed';
 			}
 
-			WC_Gateway_Paypal::log( 'Found order #' . $order->id );
+			WC_Gateway_Paypal::log( 'Found order #' . $order->get_id() );
 			WC_Gateway_Paypal::log( 'Payment status: ' . $posted['payment_status'] );
 
 			if ( method_exists( $this, 'payment_status_' . $posted['payment_status'] ) ) {
@@ -69,8 +75,8 @@ class WC_Gateway_Paypal_IPN_Handler extends WC_Gateway_Paypal_Response {
 		WC_Gateway_Paypal::log( 'Checking IPN response is valid' );
 
 		// Get received values from post data
-		$validate_ipn = array( 'cmd' => '_notify-validate' );
-		$validate_ipn += wp_unslash( $_POST );
+		$validate_ipn        = wp_unslash( $_POST );
+		$validate_ipn['cmd'] = '_notify-validate';
 
 		// Send back post vars to paypal
 		$params = array(
@@ -79,16 +85,16 @@ class WC_Gateway_Paypal_IPN_Handler extends WC_Gateway_Paypal_Response {
 			'httpversion' => '1.1',
 			'compress'    => false,
 			'decompress'  => false,
-			'user-agent'  => 'WooCommerce/' . WC()->version
+			'user-agent'  => 'WooCommerce/' . WC()->version,
 		);
 
-		// Post back to get a response
+		// Post back to get a response.
 		$response = wp_safe_remote_post( $this->sandbox ? 'https://www.sandbox.paypal.com/cgi-bin/webscr' : 'https://www.paypal.com/cgi-bin/webscr', $params );
 
-		WC_Gateway_Paypal::log( 'IPN Request: ' . print_r( $params, true ) );
-		WC_Gateway_Paypal::log( 'IPN Response: ' . print_r( $response, true ) );
+		WC_Gateway_Paypal::log( 'IPN Request: ' . wc_print_r( $params, true ) );
+		WC_Gateway_Paypal::log( 'IPN Response: ' . wc_print_r( $response, true ) );
 
-		// check to see if the request was valid
+		// Check to see if the request was valid.
 		if ( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 && strstr( $response['body'], 'VERIFIED' ) ) {
 			WC_Gateway_Paypal::log( 'Received valid response from PayPal' );
 			return true;
@@ -105,10 +111,10 @@ class WC_Gateway_Paypal_IPN_Handler extends WC_Gateway_Paypal_Response {
 
 	/**
 	 * Check for a valid transaction type.
-	 * @param  string $txn_type
+	 * @param string $txn_type
 	 */
 	protected function validate_transaction_type( $txn_type ) {
-		$accepted_types = array( 'cart', 'instant', 'express_checkout', 'web_accept', 'masspay', 'send_money' );
+		$accepted_types = array( 'cart', 'instant', 'express_checkout', 'web_accept', 'masspay', 'send_money', 'paypal_here' );
 
 		if ( ! in_array( strtolower( $txn_type ), $accepted_types ) ) {
 			WC_Gateway_Paypal::log( 'Aborting, Invalid type:' . $txn_type );
@@ -118,15 +124,14 @@ class WC_Gateway_Paypal_IPN_Handler extends WC_Gateway_Paypal_Response {
 
 	/**
 	 * Check currency from IPN matches the order.
-	 * @param  WC_Order $order
-	 * @param  string $currency
+	 * @param WC_Order $order
+	 * @param string $currency
 	 */
 	protected function validate_currency( $order, $currency ) {
-		// Validate currency
-		if ( $order->get_order_currency() != $currency ) {
-			WC_Gateway_Paypal::log( 'Payment error: Currencies do not match (sent "' . $order->get_order_currency() . '" | returned "' . $currency . '")' );
+		if ( $order->get_currency() != $currency ) {
+			WC_Gateway_Paypal::log( 'Payment error: Currencies do not match (sent "' . $order->get_currency() . '" | returned "' . $currency . '")' );
 
-			// Put this order on-hold for manual checking
+			// Put this order on-hold for manual checking.
 			$order->update_status( 'on-hold', sprintf( __( 'Validation error: PayPal currencies do not match (code %s).', 'woocommerce' ), $currency ) );
 			exit;
 		}
@@ -134,13 +139,14 @@ class WC_Gateway_Paypal_IPN_Handler extends WC_Gateway_Paypal_Response {
 
 	/**
 	 * Check payment amount from IPN matches the order.
-	 * @param  WC_Order $order
+	 * @param WC_Order $order
+	 * @param int $amount
 	 */
 	protected function validate_amount( $order, $amount ) {
 		if ( number_format( $order->get_total(), 2, '.', '' ) != number_format( $amount, 2, '.', '' ) ) {
 			WC_Gateway_Paypal::log( 'Payment error: Amounts do not match (gross ' . $amount . ')' );
 
-			// Put this order on-hold for manual checking
+			// Put this order on-hold for manual checking.
 			$order->update_status( 'on-hold', sprintf( __( 'Validation error: PayPal amounts do not match (gross %s).', 'woocommerce' ), $amount ) );
 			exit;
 		}
@@ -149,26 +155,27 @@ class WC_Gateway_Paypal_IPN_Handler extends WC_Gateway_Paypal_Response {
 	/**
 	 * Check receiver email from PayPal. If the receiver email in the IPN is different than what is stored in.
 	 * WooCommerce -> Settings -> Checkout -> PayPal, it will log an error about it.
-	 * @param  WC_Order $order
+	 * @param WC_Order $order
+	 * @param string $receiver_email
 	 */
 	protected function validate_receiver_email( $order, $receiver_email ) {
 		if ( strcasecmp( trim( $receiver_email ), trim( $this->receiver_email ) ) != 0 ) {
 			WC_Gateway_Paypal::log( "IPN Response is for another account: {$receiver_email}. Your email is {$this->receiver_email}" );
 
-			// Put this order on-hold for manual checking
+			// Put this order on-hold for manual checking.
 			$order->update_status( 'on-hold', sprintf( __( 'Validation error: PayPal IPN response from a different email address (%s).', 'woocommerce' ), $receiver_email ) );
-
 			exit;
 		}
 	}
 
 	/**
 	 * Handle a completed payment.
-	 * @param  WC_Order $order
+	 * @param WC_Order $order
+	 * @param array $posted
 	 */
 	protected function payment_status_completed( $order, $posted ) {
-		if ( $order->has_status( 'completed' ) ) {
-			WC_Gateway_Paypal::log( 'Aborting, Order #' . $order->id . ' is already complete.' );
+		if ( $order->has_status( wc_get_is_paid_statuses() ) ) {
+			WC_Gateway_Paypal::log( 'Aborting, Order #' . $order->get_id() . ' is already complete.' );
 			exit;
 		}
 
@@ -179,21 +186,29 @@ class WC_Gateway_Paypal_IPN_Handler extends WC_Gateway_Paypal_Response {
 		$this->save_paypal_meta_data( $order, $posted );
 
 		if ( 'completed' === $posted['payment_status'] ) {
+			if ( $order->has_status( 'cancelled' ) ) {
+				$this->payment_status_paid_cancelled_order( $order, $posted );
+			}
+
 			$this->payment_complete( $order, ( ! empty( $posted['txn_id'] ) ? wc_clean( $posted['txn_id'] ) : '' ), __( 'IPN payment completed', 'woocommerce' ) );
 
 			if ( ! empty( $posted['mc_fee'] ) ) {
-				// log paypal transaction fee
-				update_post_meta( $order->id, 'PayPal Transaction Fee', wc_clean( $posted['mc_fee'] ) );
+				// Log paypal transaction fee.
+				update_post_meta( $order->get_id(), 'PayPal Transaction Fee', wc_clean( $posted['mc_fee'] ) );
 			}
-
 		} else {
-			$this->payment_on_hold( $order, sprintf( __( 'Payment pending: %s', 'woocommerce' ), $posted['pending_reason'] ) );
+			if ( 'authorization' === $posted['pending_reason'] ) {
+				$this->payment_on_hold( $order, __( 'Payment authorized. Change payment status to processing or complete to capture funds.', 'woocommerce' ) );
+			} else {
+				$this->payment_on_hold( $order, sprintf( __( 'Payment pending (%s).', 'woocommerce' ), $posted['pending_reason'] ) );
+			}
 		}
 	}
 
 	/**
 	 * Handle a pending payment.
-	 * @param  WC_Order $order
+	 * @param WC_Order $order
+	 * @param array $posted
 	 */
 	protected function payment_status_pending( $order, $posted ) {
 		$this->payment_status_completed( $order, $posted );
@@ -201,7 +216,8 @@ class WC_Gateway_Paypal_IPN_Handler extends WC_Gateway_Paypal_Response {
 
 	/**
 	 * Handle a failed payment.
-	 * @param  WC_Order $order
+	 * @param WC_Order $order
+	 * @param array $posted
 	 */
 	protected function payment_status_failed( $order, $posted ) {
 		$order->update_status( 'failed', sprintf( __( 'Payment %s via IPN.', 'woocommerce' ), wc_clean( $posted['payment_status'] ) ) );
@@ -209,7 +225,8 @@ class WC_Gateway_Paypal_IPN_Handler extends WC_Gateway_Paypal_Response {
 
 	/**
 	 * Handle a denied payment.
-	 * @param  WC_Order $order
+	 * @param WC_Order $order
+	 * @param array $posted
 	 */
 	protected function payment_status_denied( $order, $posted ) {
 		$this->payment_status_failed( $order, $posted );
@@ -217,7 +234,8 @@ class WC_Gateway_Paypal_IPN_Handler extends WC_Gateway_Paypal_Response {
 
 	/**
 	 * Handle an expired payment.
-	 * @param  WC_Order $order
+	 * @param WC_Order $order
+	 * @param array $posted
 	 */
 	protected function payment_status_expired( $order, $posted ) {
 		$this->payment_status_failed( $order, $posted );
@@ -225,83 +243,107 @@ class WC_Gateway_Paypal_IPN_Handler extends WC_Gateway_Paypal_Response {
 
 	/**
 	 * Handle a voided payment.
-	 * @param  WC_Order $order
+	 * @param WC_Order $order
+	 * @param array $posted
 	 */
 	protected function payment_status_voided( $order, $posted ) {
 		$this->payment_status_failed( $order, $posted );
 	}
 
+	/**
+	 * When a user cancelled order is marked paid.
+	 *
+	 * @param WC_Order $order
+	 * @param array $posted
+	 */
+	protected function payment_status_paid_cancelled_order( $order, $posted ) {
+		$this->send_ipn_email_notification(
+			sprintf( __( 'Payment for cancelled order %s received', 'woocommerce' ), '<a class="link" href="' . esc_url( admin_url( 'post.php?post=' . $order->get_id() . '&action=edit' ) ) . '">' . $order->get_order_number() . '</a>' ),
+			sprintf( __( 'Order #%1$s has been marked paid by PayPal IPN, but was previously cancelled. Admin handling required.', 'woocommerce' ), $order->get_order_number() )
+		);
+	}
+
 	/**
 	 * Handle a refunded order.
-	 * @param  WC_Order $order
+	 * @param WC_Order $order
+	 * @param array $posted
 	 */
 	protected function payment_status_refunded( $order, $posted ) {
-		// Only handle full refunds, not partial
+		// Only handle full refunds, not partial.
 		if ( $order->get_total() == ( $posted['mc_gross'] * -1 ) ) {
 
-			// Mark order as refunded
+			// Mark order as refunded.
 			$order->update_status( 'refunded', sprintf( __( 'Payment %s via IPN.', 'woocommerce' ), strtolower( $posted['payment_status'] ) ) );
 
 			$this->send_ipn_email_notification(
-				sprintf( __( 'Payment for order %s refunded', 'woocommerce' ), '<a class="link" href="' . esc_url( admin_url( 'post.php?post=' . $order->id . '&action=edit' ) ) . '">' . $order->get_order_number() . '</a>' ),
-				sprintf( __( 'Order #%s has been marked as refunded - PayPal reason code: %s', 'woocommerce' ), $order->get_order_number(), $posted['reason_code'] )
+				sprintf( __( 'Payment for order %s refunded', 'woocommerce' ), '<a class="link" href="' . esc_url( admin_url( 'post.php?post=' . $order->get_id() . '&action=edit' ) ) . '">' . $order->get_order_number() . '</a>' ),
+				sprintf( __( 'Order #%1$s has been marked as refunded - PayPal reason code: %2$s', 'woocommerce' ), $order->get_order_number(), $posted['reason_code'] )
 			);
 		}
 	}
 
 	/**
-	 * Handle a reveral.
-	 * @param  WC_Order $order
+	 * Handle a reversal.
+	 * @param WC_Order $order
+	 * @param array $posted
 	 */
 	protected function payment_status_reversed( $order, $posted ) {
 		$order->update_status( 'on-hold', sprintf( __( 'Payment %s via IPN.', 'woocommerce' ), wc_clean( $posted['payment_status'] ) ) );
 
 		$this->send_ipn_email_notification(
-			sprintf( __( 'Payment for order %s reversed', 'woocommerce' ), '<a class="link" href="' . esc_url( admin_url( 'post.php?post=' . $order->id . '&action=edit' ) ) . '">' . $order->get_order_number() . '</a>' ),
-			sprintf( __( 'Order #%s has been marked on-hold due to a reversal - PayPal reason code: %s', 'woocommerce' ), $order->get_order_number(), wc_clean( $posted['reason_code'] ) )
+			sprintf( __( 'Payment for order %s reversed', 'woocommerce' ), '<a class="link" href="' . esc_url( admin_url( 'post.php?post=' . $order->get_id() . '&action=edit' ) ) . '">' . $order->get_order_number() . '</a>' ),
+			sprintf( __( 'Order #%1$s has been marked on-hold due to a reversal - PayPal reason code: %2$s', 'woocommerce' ), $order->get_order_number(), wc_clean( $posted['reason_code'] ) )
 		);
 	}
 
 	/**
-	 * Handle a cancelled reveral.
-	 * @param  WC_Order $order
+	 * Handle a cancelled reversal.
+	 * @param WC_Order $order
+	 * @param array $posted
 	 */
 	protected function payment_status_canceled_reversal( $order, $posted ) {
 		$this->send_ipn_email_notification(
 			sprintf( __( 'Reversal cancelled for order #%s', 'woocommerce' ), $order->get_order_number() ),
-			sprintf( __( 'Order #%s has had a reversal cancelled. Please check the status of payment and update the order status accordingly here: %s', 'woocommerce' ), $order->get_order_number(), esc_url( admin_url( 'post.php?post=' . $order->id . '&action=edit' ) ) )
+			sprintf( __( 'Order #%1$s has had a reversal cancelled. Please check the status of payment and update the order status accordingly here: %2$s', 'woocommerce' ), $order->get_order_number(), esc_url( admin_url( 'post.php?post=' . $order->get_id() . '&action=edit' ) ) )
 		);
 	}
 
 	/**
 	 * Save important data from the IPN to the order.
 	 * @param WC_Order $order
+	 * @param array $posted
 	 */
 	protected function save_paypal_meta_data( $order, $posted ) {
 		if ( ! empty( $posted['payer_email'] ) ) {
-			update_post_meta( $order->id, 'Payer PayPal address', wc_clean( $posted['payer_email'] ) );
+			update_post_meta( $order->get_id(), 'Payer PayPal address', wc_clean( $posted['payer_email'] ) );
 		}
 		if ( ! empty( $posted['first_name'] ) ) {
-			update_post_meta( $order->id, 'Payer first name', wc_clean( $posted['first_name'] ) );
+			update_post_meta( $order->get_id(), 'Payer first name', wc_clean( $posted['first_name'] ) );
 		}
 		if ( ! empty( $posted['last_name'] ) ) {
-			update_post_meta( $order->id, 'Payer last name', wc_clean( $posted['last_name'] ) );
+			update_post_meta( $order->get_id(), 'Payer last name', wc_clean( $posted['last_name'] ) );
 		}
 		if ( ! empty( $posted['payment_type'] ) ) {
-			update_post_meta( $order->id, 'Payment type', wc_clean( $posted['payment_type'] ) );
+			update_post_meta( $order->get_id(), 'Payment type', wc_clean( $posted['payment_type'] ) );
+		}
+		if ( ! empty( $posted['txn_id'] ) ) {
+			update_post_meta( $order->get_id(), '_transaction_id', wc_clean( $posted['txn_id'] ) );
+		}
+		if ( ! empty( $posted['payment_status'] ) ) {
+			update_post_meta( $order->get_id(), '_paypal_status', wc_clean( $posted['payment_status'] ) );
 		}
 	}
 
 	/**
 	 * Send a notification to the user handling orders.
-	 * @param  string $subject
-	 * @param  string $message
+	 * @param string $subject
+	 * @param string $message
 	 */
 	protected function send_ipn_email_notification( $subject, $message ) {
 		$new_order_settings = get_option( 'woocommerce_new_order_settings', array() );
 		$mailer             = WC()->mailer();
 		$message            = $mailer->wrap_message( $subject, $message );
 
-		$mailer->send( ! empty( $new_order_settings['recipient'] ) ? $new_order_settings['recipient'] : get_option( 'admin_email' ), $subject, $message );
+		$mailer->send( ! empty( $new_order_settings['recipient'] ) ? $new_order_settings['recipient'] : get_option( 'admin_email' ), strip_tags( $subject ), $message );
 	}
 }
diff --git a/includes/gateways/paypal/includes/class-wc-gateway-paypal-pdt-handler.php b/includes/gateways/paypal/includes/class-wc-gateway-paypal-pdt-handler.php
index 124a6a4d96d..de81d7ce827 100644
--- a/includes/gateways/paypal/includes/class-wc-gateway-paypal-pdt-handler.php
+++ b/includes/gateways/paypal/includes/class-wc-gateway-paypal-pdt-handler.php
@@ -1,10 +1,10 @@
 <?php
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
-include_once( 'class-wc-gateway-paypal-response.php' );
+include_once( dirname( __FILE__ ) . '/class-wc-gateway-paypal-response.php' );
 
 /**
  * Handle PDT Responses from PayPal.
@@ -16,6 +16,9 @@ class WC_Gateway_Paypal_PDT_Handler extends WC_Gateway_Paypal_Response {
 
 	/**
 	 * Constructor.
+	 *
+	 * @param bool $sandbox
+	 * @param string $identity_token
 	 */
 	public function __construct( $sandbox = false, $identity_token = '' ) {
 		add_action( 'woocommerce_thankyou_paypal', array( $this, 'check_response' ) );
@@ -27,28 +30,43 @@ class WC_Gateway_Paypal_PDT_Handler extends WC_Gateway_Paypal_Response {
 	/**
 	 * Validate a PDT transaction to ensure its authentic.
 	 * @param  string $transaction
-	 * @return bool
+	 * @return bool|array False or result array
 	 */
 	protected function validate_transaction( $transaction ) {
 		$pdt = array(
 			'body' 			=> array(
 				'cmd' => '_notify-synch',
 				'tx'  => $transaction,
-				'at'  => $this->identity_token
+				'at'  => $this->identity_token,
 			),
 			'timeout' 		=> 60,
 			'httpversion'   => '1.1',
-			'user-agent'	=> 'WooCommerce/' . WC_VERSION
+			'user-agent'	=> 'WooCommerce/' . WC_VERSION,
 		);
 
-		// Post back to get a response
+		// Post back to get a response.
 		$response = wp_safe_remote_post( $this->sandbox ? 'https://www.sandbox.paypal.com/cgi-bin/webscr' : 'https://www.paypal.com/cgi-bin/webscr', $pdt );
 
 		if ( is_wp_error( $response ) || ! strpos( $response['body'], "SUCCESS" ) === 0 ) {
 			return false;
 		}
 
-		return true;
+		// Parse transaction result data
+		$transaction_result  = array_map( 'wc_clean', array_map( 'urldecode', explode( "\n", $response['body'] ) ) );
+		$transaction_results = array();
+
+		foreach ( $transaction_result as $line ) {
+			$line                            = explode( "=", $line );
+			$transaction_results[ $line[0] ] = isset( $line[1] ) ? $line[1] : '';
+		}
+
+		if ( ! empty( $transaction_results['charset'] ) && function_exists( 'iconv' ) ) {
+			foreach ( $transaction_results as $key => $value ) {
+				$transaction_results[ $key ] = iconv( $transaction_results['charset'], 'utf-8', $value );
+			}
+		}
+
+		return $transaction_results;
 	}
 
 	/**
@@ -68,16 +86,43 @@ class WC_Gateway_Paypal_PDT_Handler extends WC_Gateway_Paypal_Response {
 			return false;
 		}
 
-		if ( $this->validate_transaction( $transaction ) && 'completed' === $status ) {
-			if ( $order->get_total() != $amount ) {
-				WC_Gateway_Paypal::log( 'Payment error: Amounts do not match (amt ' . $amount . ')' );
-				$this->payment_on_hold( $order, sprintf( __( 'Validation error: PayPal amounts do not match (amt %s).', 'woocommerce' ), $amount ) );
-			} else {
-				$this->payment_complete( $order, $transaction,  __( 'PDT payment completed', 'woocommerce' ) );
+		$transaction_result = $this->validate_transaction( $transaction );
 
-				if ( ! empty( $_REQUEST['mc_fee'] ) ) {
-					// log paypal transaction fee
-					update_post_meta( $order->id, 'PayPal Transaction Fee', wc_clean( $_REQUEST['mc_fee'] ) );
+		WC_Gateway_Paypal::log( 'PDT Transaction Result: ' . wc_print_r( $transaction_result, true ) );
+
+		update_post_meta( $order->get_id(), '_paypal_status', $status );
+		update_post_meta( $order->get_id(), '_transaction_id', $transaction );
+
+		if ( $transaction_result ) {
+	 		if ( 'completed' === $status ) {
+				if ( $order->get_total() != $amount ) {
+					WC_Gateway_Paypal::log( 'Payment error: Amounts do not match (amt ' . $amount . ')', 'error' );
+					$this->payment_on_hold( $order, sprintf( __( 'Validation error: PayPal amounts do not match (amt %s).', 'woocommerce' ), $amount ) );
+				} else {
+					$this->payment_complete( $order, $transaction,  __( 'PDT payment completed', 'woocommerce' ) );
+
+					// Log paypal transaction fee and other meta data.
+					if ( ! empty( $transaction_result['mc_fee'] ) ) {
+						update_post_meta( $order->get_id(), 'PayPal Transaction Fee', $transaction_result['mc_fee'] );
+					}
+					if ( ! empty( $transaction_result['payer_email'] ) ) {
+						update_post_meta( $order->get_id(), 'Payer PayPal address', $transaction_result['payer_email'] );
+					}
+					if ( ! empty( $transaction_result['first_name'] ) ) {
+						update_post_meta( $order->get_id(), 'Payer first name', $transaction_result['first_name'] );
+					}
+					if ( ! empty( $transaction_result['last_name'] ) ) {
+						update_post_meta( $order->get_id(), 'Payer last name', $transaction_result['last_name'] );
+					}
+					if ( ! empty( $transaction_result['payment_type'] ) ) {
+						update_post_meta( $order->get_id(), 'Payment type', $transaction_result['payment_type'] );
+					}
+				}
+			} else {
+				if ( 'authorization' === $transaction_result['pending_reason'] ) {
+					$this->payment_on_hold( $order, __( 'Payment authorized. Change payment status to processing or complete to capture funds.', 'woocommerce' ) );
+				} else {
+					$this->payment_on_hold( $order, sprintf( __( 'Payment pending (%s).', 'woocommerce' ), $transaction_result['pending_reason'] ) );
 				}
 			}
 		}
diff --git a/includes/gateways/paypal/includes/class-wc-gateway-paypal-refund.php b/includes/gateways/paypal/includes/class-wc-gateway-paypal-refund.php
deleted file mode 100644
index 359a2ed34c2..00000000000
--- a/includes/gateways/paypal/includes/class-wc-gateway-paypal-refund.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
-}
-
-/**
- * Handles refunds.
- */
-class WC_Gateway_Paypal_Refund {
-
-	/** @var string API Username for refunds */
-	public static $api_username;
-
-	/** @var string API Password for refunds */
-	public static $api_password;
-
-	/** @var string API Signature for refunds */
-	public static $api_signature;
-
-	/**
-	 * Get refund request args.
-	 * @param  WC_Order $order
-	 * @param  float $amount
-	 * @param  string $reason
-	 * @return array
-	 */
-	public static function get_request( $order, $amount = null, $reason = '' ) {
-		$request = array(
-			'VERSION'       => '84.0',
-			'SIGNATURE'     => self::$api_signature,
-			'USER'          => self::$api_username,
-			'PWD'           => self::$api_password,
-			'METHOD'        => 'RefundTransaction',
-			'TRANSACTIONID' => $order->get_transaction_id(),
-			'NOTE'          => html_entity_decode( wc_trim_string( $reason, 255 ), ENT_NOQUOTES, 'UTF-8' ),
-			'REFUNDTYPE'    => 'Full'
-		);
-		if ( ! is_null( $amount ) ) {
-			$request['AMT']          = number_format( $amount, 2, '.', '' );
-			$request['CURRENCYCODE'] = $order->get_order_currency();
-			$request['REFUNDTYPE']   = 'Partial';
-		}
-		return apply_filters( 'woocommerce_paypal_refund_request', $request, $order, $amount, $reason );
-	}
-
-	/**
-	 * Refund an order via PayPal.
-	 * @param  WC_Order $order
-	 * @param  float $amount
-	 * @param  string $reason
-	 * @param  boolean $sandbox
-	 * @return array|wp_error The parsed response from paypal, or a WP_Error object
-	 */
-	public static function refund_order( $order, $amount = null, $reason = '', $sandbox = false ) {
-		$response = wp_safe_remote_post(
-			$sandbox ? 'https://api-3t.sandbox.paypal.com/nvp' : 'https://api-3t.paypal.com/nvp',
-			array(
-				'method'      => 'POST',
-				'body'        => self::get_request( $order, $amount, $reason ),
-				'timeout'     => 70,
-				'user-agent'  => 'WooCommerce',
-				'httpversion' => '1.1'
-			)
-		);
-
-		WC_Gateway_Paypal::log( 'Refund Response: ' . print_r( $response, true ) );
-
-		if ( is_wp_error( $response ) ) {
-			return $response;
-		}
-
-		if ( empty( $response['body'] ) ) {
-			return new WP_Error( 'paypal-refunds', 'Empty Response' );
-		}
-
-		parse_str( $response['body'], $response_array );
-
-		return $response_array;
-	}
-}
diff --git a/includes/gateways/paypal/includes/class-wc-gateway-paypal-request.php b/includes/gateways/paypal/includes/class-wc-gateway-paypal-request.php
index df9dae75286..f4e9b9a5e74 100644
--- a/includes/gateways/paypal/includes/class-wc-gateway-paypal-request.php
+++ b/includes/gateways/paypal/includes/class-wc-gateway-paypal-request.php
@@ -1,7 +1,7 @@
 <?php
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
 /**
@@ -38,13 +38,15 @@ class WC_Gateway_Paypal_Request {
 
 	/**
 	 * Get the PayPal request URL for an order.
-	 * @param  WC_Order  $order
-	 * @param  boolean $sandbox
+	 * @param  WC_Order $order
+	 * @param  bool     $sandbox
 	 * @return string
 	 */
 	public function get_request_url( $order, $sandbox = false ) {
 		$paypal_args = http_build_query( $this->get_paypal_args( $order ), '', '&' );
 
+		WC_Gateway_Paypal::log( 'PayPal Request Args for order ' . $order->get_order_number() . ': ' . wc_print_r( $paypal_args, true ) );
+
 		if ( $sandbox ) {
 			return 'https://www.sandbox.paypal.com/cgi-bin/webscr?test_ipn=1&' . $paypal_args;
 		} else {
@@ -53,9 +55,22 @@ class WC_Gateway_Paypal_Request {
 	}
 
 	/**
-	 * Get PayPal Args for passing to PP.
+	 * Limit length of an arg.
 	 *
-	 * @param WC_Order $order
+	 * @param  string  $string
+	 * @param  integer $limit
+	 * @return string
+	 */
+	protected function limit_length( $string, $limit = 127 ) {
+		if ( strlen( $string ) > $limit ) {
+			$string = substr( $string, 0, $limit - 3 ) . '...';
+		}
+		return $string;
+	}
+
+	/**
+	 * Get PayPal Args for passing to PP.
+	 * @param  WC_Order $order
 	 * @return array
 	 */
 	protected function get_paypal_args( $order ) {
@@ -73,21 +88,21 @@ class WC_Gateway_Paypal_Request {
 				'return'        => esc_url_raw( add_query_arg( 'utm_nooverride', '1', $this->gateway->get_return_url( $order ) ) ),
 				'cancel_return' => esc_url_raw( $order->get_cancel_order_url_raw() ),
 				'page_style'    => $this->gateway->get_option( 'page_style' ),
+				'image_url'     => esc_url_raw( $this->gateway->get_option( 'image_url' ) ),
 				'paymentaction' => $this->gateway->get_option( 'paymentaction' ),
 				'bn'            => 'WooThemes_Cart',
-				'invoice'       => $this->gateway->get_option( 'invoice_prefix' ) . $order->get_order_number(),
-				'custom'        => json_encode( array( 'order_id' => $order->id, 'order_key' => $order->order_key ) ),
-				'notify_url'    => $this->notify_url,
-				'first_name'    => $order->billing_first_name,
-				'last_name'     => $order->billing_last_name,
-				'company'       => $order->billing_company,
-				'address1'      => $order->billing_address_1,
-				'address2'      => $order->billing_address_2,
-				'city'          => $order->billing_city,
-				'state'         => $this->get_paypal_state( $order->billing_country, $order->billing_state ),
-				'zip'           => $order->billing_postcode,
-				'country'       => $order->billing_country,
-				'email'         => $order->billing_email
+				'invoice'       => $this->limit_length( $this->gateway->get_option( 'invoice_prefix' ) . $order->get_order_number(), 127 ),
+				'custom'        => json_encode( array( 'order_id' => $order->get_id(), 'order_key' => $order->get_order_key() ) ),
+				'notify_url'    => $this->limit_length( $this->notify_url, 255 ),
+				'first_name'    => $this->limit_length( $order->get_billing_first_name(), 32 ),
+				'last_name'     => $this->limit_length( $order->get_billing_last_name(), 64 ),
+				'address1'      => $this->limit_length( $order->get_billing_address_1(), 100 ),
+				'address2'      => $this->limit_length( $order->get_billing_address_2(), 100 ),
+				'city'          => $this->limit_length( $order->get_billing_city(), 40 ),
+				'state'         => $this->get_paypal_state( $order->get_billing_country(), $order->get_billing_state() ),
+				'zip'           => $this->limit_length( wc_format_postcode( $order->get_billing_postcode(), $order->get_billing_country() ), 32 ),
+				'country'       => $this->limit_length( $order->get_billing_country(), 2 ),
+				'email'         => $this->limit_length( $order->get_billing_email() ),
 			),
 			$this->get_phone_number_args( $order ),
 			$this->get_shipping_args( $order ),
@@ -101,21 +116,17 @@ class WC_Gateway_Paypal_Request {
 	 * @return array
 	 */
 	protected function get_phone_number_args( $order ) {
-		if ( in_array( $order->billing_country, array( 'US','CA' ) ) ) {
-			$phone_number = str_replace( array( '(', '-', ' ', ')', '.' ), '', $order->billing_phone );
+		if ( in_array( $order->get_billing_country(), array( 'US', 'CA' ) ) ) {
+			$phone_number = str_replace( array( '(', '-', ' ', ')', '.' ), '', $order->get_billing_phone() );
 			$phone_number = ltrim( $phone_number, '+1' );
 			$phone_args   = array(
 				'night_phone_a' => substr( $phone_number, 0, 3 ),
 				'night_phone_b' => substr( $phone_number, 3, 3 ),
 				'night_phone_c' => substr( $phone_number, 6, 4 ),
-				'day_phone_a' 	=> substr( $phone_number, 0, 3 ),
-				'day_phone_b' 	=> substr( $phone_number, 3, 3 ),
-				'day_phone_c' 	=> substr( $phone_number, 6, 4 )
 			);
 		} else {
 			$phone_args = array(
-				'night_phone_b' => $order->billing_phone,
-				'day_phone_b' 	=> $order->billing_phone
+				'night_phone_b' => $order->get_billing_phone(),
 			);
 		}
 		return $phone_args;
@@ -134,15 +145,14 @@ class WC_Gateway_Paypal_Request {
 			$shipping_args['no_shipping']      = 0;
 
 			// If we are sending shipping, send shipping address instead of billing
-			$shipping_args['first_name']       = $order->shipping_first_name;
-			$shipping_args['last_name']        = $order->shipping_last_name;
-			$shipping_args['company']          = $order->shipping_company;
-			$shipping_args['address1']         = $order->shipping_address_1;
-			$shipping_args['address2']         = $order->shipping_address_2;
-			$shipping_args['city']             = $order->shipping_city;
-			$shipping_args['state']            = $this->get_paypal_state( $order->shipping_country, $order->shipping_state );
-			$shipping_args['country']          = $order->shipping_country;
-			$shipping_args['zip']              = $order->shipping_postcode;
+			$shipping_args['first_name'] = $this->limit_length( $order->get_shipping_first_name(), 32 );
+			$shipping_args['last_name']  = $this->limit_length( $order->get_shipping_last_name(), 64 );
+			$shipping_args['address1']   = $this->limit_length( $order->get_shipping_address_1(), 100 );
+			$shipping_args['address2']   = $this->limit_length( $order->get_shipping_address_2(), 100 );
+			$shipping_args['city']       = $this->limit_length( $order->get_shipping_city(), 40 );
+			$shipping_args['state']      = $this->get_paypal_state( $order->get_shipping_country(), $order->get_shipping_state() );
+			$shipping_args['country']    = $this->limit_length( $order->get_shipping_country(), 2 );
+			$shipping_args['zip']        = $this->limit_length( wc_format_postcode( $order->get_shipping_postcode(), $order->get_shipping_country() ), 32 );
 		} else {
 			$shipping_args['no_shipping']      = 1;
 		}
@@ -162,13 +172,24 @@ class WC_Gateway_Paypal_Request {
 		 */
 		if ( ( ! wc_tax_enabled() || ! wc_prices_include_tax() ) && $this->prepare_line_items( $order ) ) {
 
-			$line_item_args             = $this->get_line_items();
+			$line_item_args             = array();
 			$line_item_args['tax_cart'] = $this->number_format( $order->get_total_tax(), $order );
 
 			if ( $order->get_total_discount() > 0 ) {
 				$line_item_args['discount_amount_cart'] = $this->number_format( $this->round( $order->get_total_discount(), $order ), $order );
 			}
 
+			// Add shipping costs. Paypal ignores anything over 5 digits (999.99 is the max).
+			// We also check that shipping is not the **only** cost as PayPal won't allow payment
+			// if the items have no cost.
+			if ( $order->get_shipping_total() > 0 && $order->get_shipping_total() < 999.99 && $this->number_format( $order->get_shipping_total() + $order->get_shipping_tax(), $order ) !== $this->number_format( $order->get_total(), $order ) ) {
+				$line_item_args['shipping_1'] = $this->number_format( $order->get_shipping_total(), $order );
+			} elseif ( $order->get_shipping_total() > 0 ) {
+				$this->add_line_item( sprintf( __( 'Shipping via %s', 'woocommerce' ), $order->get_shipping_method() ), 1, $this->number_format( $order->get_shipping_total(), $order ) );
+			}
+
+			$line_item_args = array_merge( $line_item_args, $this->get_line_items() );
+
 		/**
 		 * Send order as a single item.
 		 *
@@ -178,11 +199,20 @@ class WC_Gateway_Paypal_Request {
 
 			$this->delete_line_items();
 
+			$line_item_args = array();
 			$all_items_name = $this->get_order_item_names( $order );
-			$this->add_line_item( $all_items_name ? $all_items_name : __( 'Order', 'woocommerce' ), 1, $this->number_format( $order->get_total() - $this->round( $order->get_total_shipping() + $order->get_shipping_tax(), $order ), $order ), $order->get_order_number() );
-			$this->add_line_item( sprintf( __( 'Shipping via %s', 'woocommerce' ), ucwords( $order->get_shipping_method() ) ), 1, $this->number_format( $order->get_total_shipping() + $order->get_shipping_tax(), $order ) );
+			$this->add_line_item( $all_items_name ? $all_items_name : __( 'Order', 'woocommerce' ), 1, $this->number_format( $order->get_total() - $this->round( $order->get_shipping_total() + $order->get_shipping_tax(), $order ), $order ), $order->get_order_number() );
 
-			$line_item_args = $this->get_line_items();
+			// Add shipping costs. Paypal ignores anything over 5 digits (999.99 is the max).
+			// We also check that shipping is not the **only** cost as PayPal won't allow payment
+			// if the items have no cost.
+			if ( $order->get_shipping_total() > 0 && $order->get_shipping_total() < 999.99 && $this->number_format( $order->get_shipping_total() + $order->get_shipping_tax(), $order ) !== $this->number_format( $order->get_total(), $order ) ) {
+				$line_item_args['shipping_1'] = $this->number_format( $order->get_shipping_total() + $order->get_shipping_tax(), $order );
+			} elseif ( $order->get_shipping_total() > 0 ) {
+				$this->add_line_item( sprintf( __( 'Shipping via %s', 'woocommerce' ), $order->get_shipping_method() ), 1, $this->number_format( $order->get_shipping_total() + $order->get_shipping_tax(), $order ) );
+			}
+
+			$line_item_args = array_merge( $line_item_args, $this->get_line_items() );
 		}
 
 		return $line_item_args;
@@ -197,10 +227,23 @@ class WC_Gateway_Paypal_Request {
 		$item_names = array();
 
 		foreach ( $order->get_items() as $item ) {
-			$item_names[] = $item['name'] . ' x ' . $item['qty'];
+			$item_name = $item->get_name();
+			$item_meta = strip_tags( wc_display_item_meta( $item, array(
+				'before'    => "",
+				'separator' => ", ",
+				'after'     => "",
+				'echo'      => false,
+				'autop'     => false,
+			) ) );
+
+			if ( $item_meta ) {
+				$item_name .= ' (' . $item_meta . ')';
+			}
+
+			$item_names[] = $item_name . ' x ' . $item->get_quantity();
 		}
 
-		return implode( ', ', $item_names );
+		return apply_filters( 'woocommerce_paypal_get_order_item_names', implode( ', ', $item_names ), $order );
 	}
 
 	/**
@@ -210,14 +253,20 @@ class WC_Gateway_Paypal_Request {
 	 * @return string
 	 */
 	protected function get_order_item_name( $order, $item ) {
-		$item_name = $item['name'];
-		$item_meta = new WC_Order_Item_Meta( $item );
+		$item_name = $item->get_name();
+		$item_meta = strip_tags( wc_display_item_meta( $item, array(
+			'before'    => "",
+			'separator' => ", ",
+			'after'     => "",
+			'echo'      => false,
+			'autop'     => false,
+		) ) );
 
-		if ( $meta = $item_meta->display( true, true ) ) {
-			$item_name .= ' ( ' . $meta . ' )';
+		if ( $item_meta ) {
+			$item_name .= ' (' . $item_meta . ')';
 		}
 
-		return $item_name;
+		return apply_filters( 'woocommerce_paypal_get_order_item_name', $item_name, $order, $item );
 	}
 
 	/**
@@ -236,7 +285,6 @@ class WC_Gateway_Paypal_Request {
 
 	/**
 	 * Get line items to send to paypal.
-	 *
 	 * @param  WC_Order $order
 	 * @return bool
 	 */
@@ -248,13 +296,14 @@ class WC_Gateway_Paypal_Request {
 		foreach ( $order->get_items( array( 'line_item', 'fee' ) ) as $item ) {
 			if ( 'fee' === $item['type'] ) {
 				$item_line_total  = $this->number_format( $item['line_total'], $order );
-				$line_item        = $this->add_line_item( $item['name'], 1, $item_line_total );
+				$line_item        = $this->add_line_item( $item->get_name(), 1, $item_line_total );
 				$calculated_total += $item_line_total;
 			} else {
-				$product          = $order->get_product_from_item( $item );
+				$product          = $item->get_product();
+				$sku              = $product ? $product->get_sku() : '';
 				$item_line_total  = $this->number_format( $order->get_item_subtotal( $item, false ), $order );
-				$line_item        = $this->add_line_item( $this->get_order_item_name( $order, $item ), $item['qty'], $item_line_total, $product->get_sku() );
-				$calculated_total += $item_line_total * $item['qty'];
+				$line_item        = $this->add_line_item( $this->get_order_item_name( $order, $item ), $item->get_quantity(), $item_line_total, $sku );
+				$calculated_total += $item_line_total * $item->get_quantity();
 			}
 
 			if ( ! $line_item ) {
@@ -262,13 +311,8 @@ class WC_Gateway_Paypal_Request {
 			}
 		}
 
-		// Shipping Cost item - paypal only allows shipping per item, we want to send shipping for the order
-		if ( $order->get_total_shipping() > 0 && ! $this->add_line_item( sprintf( __( 'Shipping via %s', 'woocommerce' ), $order->get_shipping_method() ), 1, $this->round( $order->get_total_shipping(), $order ) ) ) {
-			return false;
-		}
-
-		// Check for mismatched totals
-		if ( $this->number_format( $calculated_total + $order->get_total_tax() + $this->round( $order->get_total_shipping(), $order ) - $this->round( $order->get_total_discount(), $order ), $order ) != $this->number_format( $order->get_total(), $order ) ) {
+		// Check for mismatched totals.
+		if ( $this->number_format( $calculated_total + $order->get_total_tax() + $this->round( $order->get_shipping_total(), $order ) - $this->round( $order->get_total_discount(), $order ), $order ) != $this->number_format( $order->get_total(), $order ) ) {
 			return false;
 		}
 
@@ -277,10 +321,10 @@ class WC_Gateway_Paypal_Request {
 
 	/**
 	 * Add PayPal Line Item.
-	 * @param string  $item_name
-	 * @param integer $quantity
-	 * @param integer $amount
-	 * @param string  $item_number
+	 * @param  string  $item_name
+	 * @param  int     $quantity
+	 * @param  float   $amount
+	 * @param  string  $item_number
 	 * @return bool successfully added or not
 	 */
 	protected function add_line_item( $item_name, $quantity = 1, $amount = 0, $item_number = '' ) {
@@ -290,10 +334,17 @@ class WC_Gateway_Paypal_Request {
 			return false;
 		}
 
-		$this->line_items[ 'item_name_' . $index ]   = html_entity_decode( wc_trim_string( $item_name ? $item_name : __( 'Item', 'woocommerce' ), 127 ), ENT_NOQUOTES, 'UTF-8' );
-		$this->line_items[ 'quantity_' . $index ]    = $quantity;
-		$this->line_items[ 'amount_' . $index ]      = $amount;
-		$this->line_items[ 'item_number_' . $index ] = $item_number;
+		$item = apply_filters( 'woocommerce_paypal_line_item', array(
+			'item_name'   => html_entity_decode( wc_trim_string( $item_name ? $item_name : __( 'Item', 'woocommerce' ), 127 ), ENT_NOQUOTES, 'UTF-8' ),
+			'quantity'    => (int) $quantity,
+			'amount'      => (float) $amount,
+			'item_number' => $item_number,
+		), $item_name, $quantity, $amount, $item_number );
+
+		$this->line_items[ 'item_name_' . $index ]   = $this->limit_length( $item['item_name'], 127 );
+		$this->line_items[ 'quantity_' . $index ]    = $item['quantity'];
+		$this->line_items[ 'amount_' . $index ]      = $item['amount'];
+		$this->line_items[ 'item_number_' . $index ] = $this->limit_length( $item['item_number'], 127 );
 
 		return true;
 	}
@@ -320,9 +371,7 @@ class WC_Gateway_Paypal_Request {
 
 	/**
 	 * Check if currency has decimals.
-	 *
 	 * @param  string $currency
-	 *
 	 * @return bool
 	 */
 	protected function currency_has_decimals( $currency ) {
@@ -335,16 +384,14 @@ class WC_Gateway_Paypal_Request {
 
 	/**
 	 * Round prices.
-	 *
 	 * @param  double $price
 	 * @param  WC_Order $order
-	 *
 	 * @return double
 	 */
 	protected function round( $price, $order ) {
 		$precision = 2;
 
-		if ( ! $this->currency_has_decimals( $order->get_order_currency() ) ) {
+		if ( ! $this->currency_has_decimals( $order->get_currency() ) ) {
 			$precision = 0;
 		}
 
@@ -353,16 +400,14 @@ class WC_Gateway_Paypal_Request {
 
 	/**
 	 * Format prices.
-	 *
 	 * @param  float|int $price
 	 * @param  WC_Order $order
-	 *
 	 * @return string
 	 */
 	protected function number_format( $price, $order ) {
 		$decimals = 2;
 
-		if ( ! $this->currency_has_decimals( $order->get_order_currency() ) ) {
+		if ( ! $this->currency_has_decimals( $order->get_currency() ) ) {
 			$decimals = 0;
 		}
 
diff --git a/includes/gateways/paypal/includes/class-wc-gateway-paypal-response.php b/includes/gateways/paypal/includes/class-wc-gateway-paypal-response.php
index 8bbbdc71e3d..b543f362736 100644
--- a/includes/gateways/paypal/includes/class-wc-gateway-paypal-response.php
+++ b/includes/gateways/paypal/includes/class-wc-gateway-paypal-response.php
@@ -1,11 +1,11 @@
 <?php
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
 /**
- * Handles refunds.
+ * Handles Responses.
  */
 abstract class WC_Gateway_Paypal_Response {
 
@@ -14,12 +14,11 @@ abstract class WC_Gateway_Paypal_Response {
 
 	/**
 	 * Get the order from the PayPal 'Custom' variable.
-	 *
 	 * @param  string $raw_custom JSON Data passed back by PayPal
 	 * @return bool|WC_Order object
 	 */
 	protected function get_paypal_order( $raw_custom ) {
-		// We have the data in the correct format, so get the order
+		// We have the data in the correct format, so get the order.
 		if ( ( $custom = json_decode( $raw_custom ) ) && is_object( $custom ) ) {
 			$order_id  = $custom->order_id;
 			$order_key = $custom->order_key;
@@ -29,20 +28,20 @@ abstract class WC_Gateway_Paypal_Response {
 			$order_id  = $custom[0];
 			$order_key = $custom[1];
 
-		// Nothing was found
+		// Nothing was found.
 		} else {
-			WC_Gateway_Paypal::log( 'Error: Order ID and key were not found in "custom".' );
+			WC_Gateway_Paypal::log( 'Order ID and key were not found in "custom".', 'error' );
 			return false;
 		}
 
 		if ( ! $order = wc_get_order( $order_id ) ) {
-			// We have an invalid $order_id, probably because invoice_prefix has changed
+			// We have an invalid $order_id, probably because invoice_prefix has changed.
 			$order_id = wc_get_order_id_by_order_key( $order_key );
 			$order    = wc_get_order( $order_id );
 		}
 
-		if ( ! $order || $order->order_key !== $order_key ) {
-			WC_Gateway_Paypal::log( 'Error: Order Keys do not match.' );
+		if ( ! $order || $order->get_order_key() !== $order_key ) {
+			WC_Gateway_Paypal::log( 'Order Keys do not match.', 'error' );
 			return false;
 		}
 
@@ -52,8 +51,8 @@ abstract class WC_Gateway_Paypal_Response {
 	/**
 	 * Complete order, add transaction ID and note.
 	 * @param  WC_Order $order
-	 * @param  string $txn_id
-	 * @param  string $note
+	 * @param  string   $txn_id
+	 * @param  string   $note
 	 */
 	protected function payment_complete( $order, $txn_id = '', $note = '' ) {
 		$order->add_order_note( $note );
@@ -63,11 +62,11 @@ abstract class WC_Gateway_Paypal_Response {
 	/**
 	 * Hold order and add note.
 	 * @param  WC_Order $order
-	 * @param  string $reason
+	 * @param  string   $reason
 	 */
 	protected function payment_on_hold( $order, $reason = '' ) {
 		$order->update_status( 'on-hold', $reason );
-		$order->reduce_order_stock();
+		wc_reduce_stock_levels( $order->get_id() );
 		WC()->cart->empty_cart();
 	}
 }
diff --git a/includes/gateways/paypal/includes/settings-paypal.php b/includes/gateways/paypal/includes/settings-paypal.php
index 0f3902399f8..693af77bf41 100644
--- a/includes/gateways/paypal/includes/settings-paypal.php
+++ b/includes/gateways/paypal/includes/settings-paypal.php
@@ -11,8 +11,8 @@ return array(
 	'enabled' => array(
 		'title'   => __( 'Enable/Disable', 'woocommerce' ),
 		'type'    => 'checkbox',
-		'label'   => __( 'Enable PayPal standard', 'woocommerce' ),
-		'default' => 'yes'
+		'label'   => __( 'Enable PayPal Standard', 'woocommerce' ),
+		'default' => 'yes',
 	),
 	'title' => array(
 		'title'       => __( 'Title', 'woocommerce' ),
@@ -26,29 +26,29 @@ return array(
 		'type'        => 'text',
 		'desc_tip'    => true,
 		'description' => __( 'This controls the description which the user sees during checkout.', 'woocommerce' ),
-		'default'     => __( 'Pay via PayPal; you can pay with your credit card if you don\'t have a PayPal account.', 'woocommerce' )
+		'default'     => __( "Pay via PayPal; you can pay with your credit card if you don't have a PayPal account.", 'woocommerce' ),
 	),
 	'email' => array(
-		'title'       => __( 'PayPal Email', 'woocommerce' ),
+		'title'       => __( 'PayPal email', 'woocommerce' ),
 		'type'        => 'email',
 		'description' => __( 'Please enter your PayPal email address; this is needed in order to take payment.', 'woocommerce' ),
 		'default'     => get_option( 'admin_email' ),
 		'desc_tip'    => true,
-		'placeholder' => 'you@youremail.com'
+		'placeholder' => 'you@youremail.com',
 	),
 	'testmode' => array(
-		'title'       => __( 'PayPal Sandbox', 'woocommerce' ),
+		'title'       => __( 'PayPal sandbox', 'woocommerce' ),
 		'type'        => 'checkbox',
 		'label'       => __( 'Enable PayPal sandbox', 'woocommerce' ),
 		'default'     => 'no',
-		'description' => sprintf( __( 'PayPal sandbox can be used to test payments. Sign up for a developer account <a href="%s">here</a>.', 'woocommerce' ), 'https://developer.paypal.com/' ),
+		'description' => sprintf( __( 'PayPal sandbox can be used to test payments. Sign up for a <a href="%s">developer account</a>.', 'woocommerce' ), 'https://developer.paypal.com/' ),
 	),
 	'debug' => array(
-		'title'       => __( 'Debug Log', 'woocommerce' ),
+		'title'       => __( 'Debug log', 'woocommerce' ),
 		'type'        => 'checkbox',
 		'label'       => __( 'Enable logging', 'woocommerce' ),
 		'default'     => 'no',
-		'description' => sprintf( __( 'Log PayPal events, such as IPN requests, inside <code>%s</code>', 'woocommerce' ), wc_get_log_file_path( 'paypal' ) )
+		'description' => sprintf( __( 'Log PayPal events, such as IPN requests, inside %s', 'woocommerce' ), '<code>' . WC_Log_Handler_File::get_log_file_path( 'paypal' ) . '</code>' ),
 	),
 	'advanced' => array(
 		'title'       => __( 'Advanced options', 'woocommerce' ),
@@ -56,44 +56,44 @@ return array(
 		'description' => '',
 	),
 	'receiver_email' => array(
-		'title'       => __( 'Receiver Email', 'woocommerce' ),
+		'title'       => __( 'Receiver email', 'woocommerce' ),
 		'type'        => 'email',
 		'description' => __( 'If your main PayPal email differs from the PayPal email entered above, input your main receiver email for your PayPal account here. This is used to validate IPN requests.', 'woocommerce' ),
 		'default'     => '',
 		'desc_tip'    => true,
-		'placeholder' => 'you@youremail.com'
+		'placeholder' => 'you@youremail.com',
 	),
 	'identity_token' => array(
-		'title'       => __( 'PayPal Identity Token', 'woocommerce' ),
+		'title'       => __( 'PayPal identity token', 'woocommerce' ),
 		'type'        => 'text',
 		'description' => __( 'Optionally enable "Payment Data Transfer" (Profile > Profile and Settings > My Selling Tools > Website Preferences) and then copy your identity token here. This will allow payments to be verified without the need for PayPal IPN.', 'woocommerce' ),
 		'default'     => '',
 		'desc_tip'    => true,
-		'placeholder' => ''
+		'placeholder' => '',
 	),
 	'invoice_prefix' => array(
-		'title'       => __( 'Invoice Prefix', 'woocommerce' ),
+		'title'       => __( 'Invoice prefix', 'woocommerce' ),
 		'type'        => 'text',
 		'description' => __( 'Please enter a prefix for your invoice numbers. If you use your PayPal account for multiple stores ensure this prefix is unique as PayPal will not allow orders with the same invoice number.', 'woocommerce' ),
 		'default'     => 'WC-',
 		'desc_tip'    => true,
 	),
 	'send_shipping' => array(
-		'title'       => __( 'Shipping Details', 'woocommerce' ),
+		'title'       => __( 'Shipping details', 'woocommerce' ),
 		'type'        => 'checkbox',
 		'label'       => __( 'Send shipping details to PayPal instead of billing.', 'woocommerce' ),
 		'description' => __( 'PayPal allows us to send one address. If you are using PayPal for shipping labels you may prefer to send the shipping address rather than billing.', 'woocommerce' ),
-		'default'     => 'no'
+		'default'     => 'no',
 	),
 	'address_override' => array(
-		'title'       => __( 'Address Override', 'woocommerce' ),
+		'title'       => __( 'Address override', 'woocommerce' ),
 		'type'        => 'checkbox',
 		'label'       => __( 'Enable "address_override" to prevent address information from being changed.', 'woocommerce' ),
 		'description' => __( 'PayPal verifies addresses therefore this setting can cause errors (we recommend keeping it disabled).', 'woocommerce' ),
-		'default'     => 'no'
+		'default'     => 'no',
 	),
 	'paymentaction' => array(
-		'title'       => __( 'Payment Action', 'woocommerce' ),
+		'title'       => __( 'Payment action', 'woocommerce' ),
 		'type'        => 'select',
 		'class'       => 'wc-enhanced-select',
 		'description' => __( 'Choose whether you wish to capture funds immediately or authorize payment only.', 'woocommerce' ),
@@ -101,44 +101,52 @@ return array(
 		'desc_tip'    => true,
 		'options'     => array(
 			'sale'          => __( 'Capture', 'woocommerce' ),
-			'authorization' => __( 'Authorize', 'woocommerce' )
-		)
+			'authorization' => __( 'Authorize', 'woocommerce' ),
+		),
 	),
 	'page_style' => array(
-		'title'       => __( 'Page Style', 'woocommerce' ),
+		'title'       => __( 'Page style', 'woocommerce' ),
 		'type'        => 'text',
-		'description' => __( 'Optionally enter the name of the page style you wish to use. These are defined within your PayPal account.', 'woocommerce' ),
+		'description' => __( 'Optionally enter the name of the page style you wish to use. These are defined within your PayPal account. This affects classic PayPal checkout screens.', 'woocommerce' ),
 		'default'     => '',
 		'desc_tip'    => true,
-		'placeholder' => __( 'Optional', 'woocommerce' )
+		'placeholder' => __( 'Optional', 'woocommerce' ),
+	),
+	'image_url' => array(
+		'title'       => __( 'Image url', 'woocommerce' ),
+		'type'        => 'text',
+		'description' => __( 'Optionally enter the URL to a 150x50px image displayed as your logo in the upper left corner of the PayPal checkout pages.', 'woocommerce' ),
+		'default'     => '',
+		'desc_tip'    => true,
+		'placeholder' => __( 'Optional', 'woocommerce' ),
 	),
 	'api_details' => array(
-		'title'       => __( 'API Credentials', 'woocommerce' ),
+		'title'       => __( 'API credentials', 'woocommerce' ),
 		'type'        => 'title',
-		'description' => sprintf( __( 'Enter your PayPal API credentials to process refunds via PayPal. Learn how to access your PayPal API Credentials %shere%s.', 'woocommerce' ), '<a href="https://developer.paypal.com/webapps/developer/docs/classic/api/apiCredentials/#creating-classic-api-credentials">', '</a>' ),
+		'description' => sprintf( __( 'Enter your PayPal API credentials to process refunds via PayPal. Learn how to access your <a href="%s">PayPal API Credentials</a>.', 'woocommerce' ), 'https://developer.paypal.com/webapps/developer/docs/classic/api/apiCredentials/#creating-an-api-signature' ),
 	),
 	'api_username' => array(
-		'title'       => __( 'API Username', 'woocommerce' ),
+		'title'       => __( 'API username', 'woocommerce' ),
 		'type'        => 'text',
 		'description' => __( 'Get your API credentials from PayPal.', 'woocommerce' ),
 		'default'     => '',
 		'desc_tip'    => true,
-		'placeholder' => __( 'Optional', 'woocommerce' )
+		'placeholder' => __( 'Optional', 'woocommerce' ),
 	),
 	'api_password' => array(
-		'title'       => __( 'API Password', 'woocommerce' ),
-		'type'        => 'text',
+		'title'       => __( 'API password', 'woocommerce' ),
+		'type'        => 'password',
 		'description' => __( 'Get your API credentials from PayPal.', 'woocommerce' ),
 		'default'     => '',
 		'desc_tip'    => true,
-		'placeholder' => __( 'Optional', 'woocommerce' )
+		'placeholder' => __( 'Optional', 'woocommerce' ),
 	),
 	'api_signature' => array(
-		'title'       => __( 'API Signature', 'woocommerce' ),
+		'title'       => __( 'API signature', 'woocommerce' ),
 		'type'        => 'text',
 		'description' => __( 'Get your API credentials from PayPal.', 'woocommerce' ),
 		'default'     => '',
 		'desc_tip'    => true,
-		'placeholder' => __( 'Optional', 'woocommerce' )
+		'placeholder' => __( 'Optional', 'woocommerce' ),
 	),
 );
diff --git a/includes/gateways/simplify-commerce-deprecated/class-wc-addons-gateway-simplify-commerce-deprecated.php b/includes/gateways/simplify-commerce-deprecated/class-wc-addons-gateway-simplify-commerce-deprecated.php
deleted file mode 100644
index ef7b4e89397..00000000000
--- a/includes/gateways/simplify-commerce-deprecated/class-wc-addons-gateway-simplify-commerce-deprecated.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-
-if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
-}
-
-/**
- * Simplify Commerce Gateway for Subscriptions < 2.0.
- *
- * @class 		WC_Addons_Gateway_Simplify_Commerce_Deprecated
- * @extends		WC_Addons_Gateway_Simplify_Commerce
- * @since       2.4.0
- * @version		1.0.0
- * @package		WooCommerce/Classes/Payment
- * @author 		WooThemes
- */
-class WC_Addons_Gateway_Simplify_Commerce_Deprecated extends WC_Addons_Gateway_Simplify_Commerce {
-
-	/**
-	 * Constructor.
-	 */
-	public function __construct() {
-		parent::__construct();
-
-		if ( class_exists( 'WC_Subscriptions_Order' ) ) {
-			add_action( 'scheduled_subscription_payment_' . $this->id, array( $this, 'process_scheduled_subscription_payment' ), 10, 3 );
-			add_filter( 'woocommerce_subscriptions_renewal_order_meta_query', array( $this, 'remove_renewal_order_meta' ), 10, 4 );
-			add_action( 'woocommerce_subscriptions_changed_failing_payment_method_' . $this->id, array( $this, 'change_failing_payment_method' ), 10, 3 );
-		}
-	}
-
-	/**
-	 * Store the customer and card IDs on the order and subscriptions in the order.
-	 *
-	 * @param int $order_id
-	 * @param string $customer_id
-	 * @return array
-	 */
-	protected function save_subscription_meta( $order_id, $customer_id ) {
-		update_post_meta( $order_id, '_simplify_customer_id', wc_clean( $customer_id ) );
-	}
-
-	/**
-	 * process_subscription_payment function.
-	 *
-	 * @param WC_order $order
-	 * @param integer $amount (default: 0)
-	 * @uses  Simplify_BadRequestException
-	 * @return bool|WP_Error
-	 */
-	public function process_subscription_payment( $order, $amount = 0 ) {
-		if ( 0 == $amount ) {
-			// Payment complete
-			$order->payment_complete();
-
-			return true;
-		}
-
-		if ( $amount * 100 < 50 ) {
-			return new WP_Error( 'simplify_error', __( 'Sorry, the minimum allowed order total is 0.50 to use this payment method.', 'woocommerce' ) );
-		}
-
-		$order_items       = $order->get_items();
-		$order_item        = array_shift( $order_items );
-		$subscription_name = sprintf( __( '%s - Subscription for "%s"', 'woocommerce' ), esc_html( get_bloginfo( 'name', 'display' ) ), $order_item['name'] ) . ' ' . sprintf( __( '(Order #%s)', 'woocommerce' ), $order->get_order_number() );
-
-		$customer_id = get_post_meta( $order->id, '_simplify_customer_id', true );
-
-		if ( ! $customer_id ) {
-			return new WP_Error( 'simplify_error', __( 'Customer not found', 'woocommerce' ) );
-		}
-
-		try {
-			// Charge the customer
-			$payment = Simplify_Payment::createPayment( array(
-				'amount'              => $amount * 100, // In cents.
-				'customer'            => $customer_id,
-				'description'         => trim( substr( $subscription_name, 0, 1024 ) ),
-				'currency'            => strtoupper( get_woocommerce_currency() ),
-				'reference'           => $order->id,
-				'card.addressCity'    => $order->billing_city,
-				'card.addressCountry' => $order->billing_country,
-				'card.addressLine1'   => $order->billing_address_1,
-				'card.addressLine2'   => $order->billing_address_2,
-				'card.addressState'   => $order->billing_state,
-				'card.addressZip'     => $order->billing_postcode
-			) );
-
-		} catch ( Exception $e ) {
-
-			$error_message = $e->getMessage();
-
-			if ( $e instanceof Simplify_BadRequestException && $e->hasFieldErrors() && $e->getFieldErrors() ) {
-				$error_message = '';
-				foreach ( $e->getFieldErrors() as $error ) {
-					$error_message .= ' ' . $error->getFieldName() . ': "' . $error->getMessage() . '" (' . $error->getErrorCode() . ')';
-				}
-			}
-
-			$order->add_order_note( sprintf( __( 'Simplify payment error: %s', 'woocommerce' ), $error_message ) );
-
-			return new WP_Error( 'simplify_payment_declined', $e->getMessage(), array( 'status' => $e->getCode() ) );
-		}
-
-		if ( 'APPROVED' == $payment->paymentStatus ) {
-			// Payment complete
-			$order->payment_complete( $payment->id );
-
-			// Add order note
-			$order->add_order_note( sprintf( __( 'Simplify payment approved (ID: %s, Auth Code: %s)', 'woocommerce' ), $payment->id, $payment->authCode ) );
-
-			return true;
-		} else {
-			$order->add_order_note( __( 'Simplify payment declined', 'woocommerce' ) );
-
-			return new WP_Error( 'simplify_payment_declined', __( 'Payment was declined - please try another card.', 'woocommerce' ) );
-		}
-	}
-
-	/**
-	 * process_scheduled_subscription_payment function.
-	 *
-	 * @param float $amount_to_charge The amount to charge.
-	 * @param WC_Order $order The WC_Order object of the order which the subscription was purchased in.
-	 * @param int $product_id The ID of the subscription product for which this payment relates.
-	 */
-	public function process_scheduled_subscription_payment( $amount_to_charge, $order, $product_id ) {
-		$result = $this->process_subscription_payment( $order, $amount_to_charge );
-
-		if ( is_wp_error( $result ) ) {
-			WC_Subscriptions_Manager::process_subscription_payment_failure_on_order( $order, $product_id );
-		} else {
-			WC_Subscriptions_Manager::process_subscription_payments_on_order( $order );
-		}
-	}
-
-	/**
-	 * Don't transfer customer meta when creating a parent renewal order.
-	 *
-	 * @param string $order_meta_query MySQL query for pulling the metadata
-	 * @param int $original_order_id Post ID of the order being used to purchased the subscription being renewed
-	 * @param int $renewal_order_id Post ID of the order created for renewing the subscription
-	 * @param string $new_order_role The role the renewal order is taking, one of 'parent' or 'child'
-	 * @return string
-	 */
-	public function remove_renewal_order_meta( $order_meta_query, $original_order_id, $renewal_order_id, $new_order_role ) {
-		if ( 'parent' == $new_order_role ) {
-			$order_meta_query .= " AND `meta_key` NOT LIKE '_simplify_customer_id' ";
-		}
-
-		return $order_meta_query;
-	}
-
-	/**
-	 * Check if order contains subscriptions.
-	 *
-	 * @param  int $order_id
-	 * @return bool
-	 */
-	protected function order_contains_subscription( $order_id ) {
-		return class_exists( 'WC_Subscriptions_Order' ) && ( WC_Subscriptions_Order::order_contains_subscription( $order_id ) || WC_Subscriptions_Renewal_Order::is_renewal( $order_id ) );
-	}
-
-	/**
-	 * Update the customer_id for a subscription after using Simplify to complete a payment to make up for.
-	 * an automatic renewal payment which previously failed.
-	 *
-	 * @param WC_Order $original_order The original order in which the subscription was purchased.
-	 * @param WC_Order $renewal_order The order which recorded the successful payment (to make up for the failed automatic payment).
-	 * @param string $subscription_key A subscription key of the form created by @see WC_Subscriptions_Manager::get_subscription_key()
-	 */
-	public function change_failing_payment_method( $original_order, $renewal_order, $subscription_key ) {
-		$new_customer_id = get_post_meta( $renewal_order->id, '_simplify_customer_id', true );
-
-		update_post_meta( $original_order->id, '_simplify_customer_id', $new_customer_id );
-	}
-}
diff --git a/includes/gateways/simplify-commerce/assets/js/simplify-commerce.js b/includes/gateways/simplify-commerce/assets/js/simplify-commerce.js
index 4c1b3b53e90..88aafb49fb6 100644
--- a/includes/gateways/simplify-commerce/assets/js/simplify-commerce.js
+++ b/includes/gateways/simplify-commerce/assets/js/simplify-commerce.js
@@ -3,11 +3,11 @@
 
 	// Form handler
 	function simplifyFormHandler() {
-		var $form = $( 'form.checkout, form#order_review' );
+		var $form = $( 'form.checkout, form#order_review, form#add_payment_method' );
 
-		if ( $( '#payment_method_simplify_commerce' ).is( ':checked' ) ) {
+		if ( ( $( '#payment_method_simplify_commerce' ).is( ':checked' ) && 'new' === $( 'input[name="wc-simplify_commerce-payment-token"]:checked' ).val() ) || ( '1' === $( '#woocommerce_add_payment_method' ).val() ) ) {
 
-			if ( 0 === $( 'input.simplify-token' ).size() ) {
+			if ( 0 === $( 'input.simplify-token' ).length ) {
 
 				$form.block({
 					message: null,
@@ -20,13 +20,14 @@
 				var card           = $( '#simplify_commerce-card-number' ).val(),
 					cvc            = $( '#simplify_commerce-card-cvc' ).val(),
 					expiry         = $.payment.cardExpiryVal( $( '#simplify_commerce-card-expiry' ).val() ),
-					address1       = $form.find( '#billing_address_1' ).val(),
-					address2       = $form.find( '#billing_address_2' ).val(),
-					addressCountry = $form.find( '#billing_country' ).val(),
-					addressState   = $form.find( '#billing_state' ).val(),
-					addressCity    = $form.find( '#billing_city' ).val(),
-					addressZip     = $form.find( '#billing_postcode' ).val();
+					address1       = $form.find( '#billing_address_1' ).val() || '',
+					address2       = $form.find( '#billing_address_2' ).val() || '',
+					addressCountry = $form.find( '#billing_country' ).val() || '',
+					addressState   = $form.find( '#billing_state' ).val() || '',
+					addressCity    = $form.find( '#billing_city' ).val() || '',
+					addressZip     = $form.find( '#billing_postcode' ).val() || '';
 
+				addressZip = addressZip.replace( /-/g, '' );
 				card = card.replace( /\s/g, '' );
 
 				SimplifyCommerce.generateToken({
@@ -55,8 +56,9 @@
 
 	// Handle Simplify response
 	function simplifyResponseHandler( data ) {
-		var $form  = $( 'form.checkout, form#order_review' ),
-			ccForm = $( '#simplify_commerce-cc-form' );
+
+		var $form  = $( 'form.checkout, form#order_review, form#add_payment_method' ),
+			ccForm = $( '#wc-simplify_commerce-cc-form' );
 
 		if ( data.error ) {
 
@@ -101,8 +103,13 @@
 			return simplifyFormHandler();
 		});
 
+		/* Pay Page Form */
+		$( 'form#add_payment_method' ).on( 'submit', function () {
+			return simplifyFormHandler();
+		});
+
 		/* Both Forms */
-		$( 'form.checkout, form#order_review' ).on( 'change', '#simplify_commerce-cc-form input', function() {
+		$( 'form.checkout, form#order_review, form#add_payment_method' ).on( 'change', '#wc-simplify_commerce-cc-form input', function() {
 			$( '.simplify-token' ).remove();
 		});
 
diff --git a/includes/gateways/simplify-commerce/assets/js/simplify-commerce.min.js b/includes/gateways/simplify-commerce/assets/js/simplify-commerce.min.js
index 3192029f5ae..823ea5391b6 100644
--- a/includes/gateways/simplify-commerce/assets/js/simplify-commerce.min.js
+++ b/includes/gateways/simplify-commerce/assets/js/simplify-commerce.min.js
@@ -1 +1 @@
-!function(a){function b(){var b=a("form.checkout, form#order_review");if(a("#payment_method_simplify_commerce").is(":checked")&&0===a("input.simplify-token").size()){b.block({message:null,overlayCSS:{background:"#fff",opacity:.6}});var d=a("#simplify_commerce-card-number").val(),e=a("#simplify_commerce-card-cvc").val(),f=a.payment.cardExpiryVal(a("#simplify_commerce-card-expiry").val()),g=b.find("#billing_address_1").val(),h=b.find("#billing_address_2").val(),i=b.find("#billing_country").val(),j=b.find("#billing_state").val(),k=b.find("#billing_city").val(),l=b.find("#billing_postcode").val();return d=d.replace(/\s/g,""),SimplifyCommerce.generateToken({key:Simplify_commerce_params.key,card:{number:d,cvc:e,expMonth:f.month,expYear:f.year-2e3,addressLine1:g,addressLine2:h,addressCountry:i,addressState:j,addressZip:l,addressCity:k}},c),!1}return!0}function c(b){var c=a("form.checkout, form#order_review"),d=a("#simplify_commerce-cc-form");if(b.error){if(a(".woocommerce-error, .simplify-token",d).remove(),c.unblock(),"validation"===b.error.code){for(var e=b.error.fieldErrors,f=e.length,g="",h=0;f>h;h++)g+="<li>"+Simplify_commerce_params[e[h].field]+" "+Simplify_commerce_params.is_invalid+" - "+e[h].message+".</li>";d.prepend('<ul class="woocommerce-error">'+g+"</ul>")}}else d.append('<input type="hidden" class="simplify-token" name="simplify_token" value="'+b.id+'"/>'),c.submit()}a(function(){a(document.body).on("checkout_error",function(){a(".simplify-token").remove()}),a("form.checkout").on("checkout_place_order_simplify_commerce",function(){return b()}),a("form#order_review").on("submit",function(){return b()}),a("form.checkout, form#order_review").on("change","#simplify_commerce-cc-form input",function(){a(".simplify-token").remove()})})}(jQuery);
\ No newline at end of file
+!function(a){function b(){var b=a("form.checkout, form#order_review, form#add_payment_method");if((a("#payment_method_simplify_commerce").is(":checked")&&"new"===a('input[name="wc-simplify_commerce-payment-token"]:checked').val()||"1"===a("#woocommerce_add_payment_method").val())&&0===a("input.simplify-token").length){b.block({message:null,overlayCSS:{background:"#fff",opacity:.6}});var d=a("#simplify_commerce-card-number").val(),e=a("#simplify_commerce-card-cvc").val(),f=a.payment.cardExpiryVal(a("#simplify_commerce-card-expiry").val()),g=b.find("#billing_address_1").val()||"",h=b.find("#billing_address_2").val()||"",i=b.find("#billing_country").val()||"",j=b.find("#billing_state").val()||"",k=b.find("#billing_city").val()||"",l=b.find("#billing_postcode").val()||"";return l=l.replace(/-/g,""),d=d.replace(/\s/g,""),SimplifyCommerce.generateToken({key:Simplify_commerce_params.key,card:{number:d,cvc:e,expMonth:f.month,expYear:f.year-2e3,addressLine1:g,addressLine2:h,addressCountry:i,addressState:j,addressZip:l,addressCity:k}},c),!1}return!0}function c(b){var c=a("form.checkout, form#order_review, form#add_payment_method"),d=a("#wc-simplify_commerce-cc-form");if(b.error){if(a(".woocommerce-error, .simplify-token",d).remove(),c.unblock(),"validation"===b.error.code){for(var e=b.error.fieldErrors,f=e.length,g="",h=0;h<f;h++)g+="<li>"+Simplify_commerce_params[e[h].field]+" "+Simplify_commerce_params.is_invalid+" - "+e[h].message+".</li>";d.prepend('<ul class="woocommerce-error">'+g+"</ul>")}}else d.append('<input type="hidden" class="simplify-token" name="simplify_token" value="'+b.id+'"/>'),c.submit()}a(function(){a(document.body).on("checkout_error",function(){a(".simplify-token").remove()}),a("form.checkout").on("checkout_place_order_simplify_commerce",function(){return b()}),a("form#order_review").on("submit",function(){return b()}),a("form#add_payment_method").on("submit",function(){return b()}),a("form.checkout, form#order_review, form#add_payment_method").on("change","#wc-simplify_commerce-cc-form input",function(){a(".simplify-token").remove()})})}(jQuery);
\ No newline at end of file
diff --git a/includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php b/includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php
index 5c7e8f64ddb..396bfd9d530 100644
--- a/includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php
+++ b/includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php
@@ -94,7 +94,7 @@ class WC_Addons_Gateway_Simplify_Commerce extends WC_Gateway_Simplify_Commerce {
 				$error_msg = __( 'Please make sure your card details have been entered correctly and that your browser supports JavaScript.', 'woocommerce' );
 
 				if ( 'yes' == $this->sandbox ) {
-					$error_msg .= ' ' . __( 'Developers: Please make sure that you\'re including jQuery and there are no JavaScript errors on the page.', 'woocommerce' );
+					$error_msg .= ' ' . __( 'Developers: Please make sure that you are including jQuery and there are no JavaScript errors on the page.', 'woocommerce' );
 				}
 
 				throw new Simplify_ApiException( $error_msg );
@@ -103,13 +103,13 @@ class WC_Addons_Gateway_Simplify_Commerce extends WC_Gateway_Simplify_Commerce {
 			// Create customer
 			$customer = Simplify_Customer::createCustomer( array(
 				'token'     => $cart_token,
-				'email'     => $order->billing_email,
+				'email'     => $order->get_billing_email(),
 				'name'      => trim( $order->get_formatted_billing_full_name() ),
-				'reference' => $order->id
+				'reference' => $order->get_id(),
 			) );
 
 			if ( is_object( $customer ) && '' != $customer->id ) {
-				$this->save_subscription_meta( $order->id, $customer->id );
+				$this->save_subscription_meta( $order->get_id(), $customer->id );
 			} else {
 				$error_msg = __( 'Error creating user in Simplify Commerce.', 'woocommerce' );
 
@@ -127,10 +127,9 @@ class WC_Addons_Gateway_Simplify_Commerce extends WC_Gateway_Simplify_Commerce {
 				// Return thank you page redirect
 				return array(
 					'result'   => 'success',
-					'redirect' => $this->get_return_url( $order )
+					'redirect' => $this->get_return_url( $order ),
 				);
 			}
-
 		} catch ( Simplify_ApiException $e ) {
 			if ( $e instanceof Simplify_BadRequestException && $e->hasFieldErrors() && $e->getFieldErrors() ) {
 				foreach ( $e->getFieldErrors() as $error ) {
@@ -142,7 +141,7 @@ class WC_Addons_Gateway_Simplify_Commerce extends WC_Gateway_Simplify_Commerce {
 
 			return array(
 				'result'   => 'fail',
-				'redirect' => ''
+				'redirect' => '',
 			);
 		}
 	}
@@ -160,7 +159,7 @@ class WC_Addons_Gateway_Simplify_Commerce extends WC_Gateway_Simplify_Commerce {
 		update_post_meta( $order_id, '_simplify_customer_id', $customer_id );
 
 		// Also store it on the subscriptions being purchased in the order
-		foreach( wcs_get_subscriptions_for_order( $order_id ) as $subscription ) {
+		foreach ( wcs_get_subscriptions_for_order( $order_id ) as $subscription ) {
 			update_post_meta( $subscription->id, '_simplify_customer_id', $customer_id );
 		}
 	}
@@ -175,10 +174,10 @@ class WC_Addons_Gateway_Simplify_Commerce extends WC_Gateway_Simplify_Commerce {
 	 * @return array
 	 */
 	protected function process_pre_order( $order, $cart_token = '' ) {
-		if ( WC_Pre_Orders_Order::order_requires_payment_tokenization( $order->id ) ) {
+		if ( WC_Pre_Orders_Order::order_requires_payment_tokenization( $order->get_id() ) ) {
 
 			try {
-				if ( $order->order_total * 100 < 50 ) {
+				if ( $order->get_total() * 100 < 50 ) {
 					$error_msg = __( 'Sorry, the minimum allowed order total is 0.50 to use this payment method.', 'woocommerce' );
 
 					throw new Simplify_ApiException( $error_msg );
@@ -188,7 +187,7 @@ class WC_Addons_Gateway_Simplify_Commerce extends WC_Gateway_Simplify_Commerce {
 					$error_msg = __( 'Please make sure your card details have been entered correctly and that your browser supports JavaScript.', 'woocommerce' );
 
 					if ( 'yes' == $this->sandbox ) {
-						$error_msg .= ' ' . __( 'Developers: Please make sure that you\'re including jQuery and there are no JavaScript errors on the page.', 'woocommerce' );
+						$error_msg .= ' ' . __( 'Developers: Please make sure that you are including jQuery and there are no JavaScript errors on the page.', 'woocommerce' );
 					}
 
 					throw new Simplify_ApiException( $error_msg );
@@ -197,16 +196,16 @@ class WC_Addons_Gateway_Simplify_Commerce extends WC_Gateway_Simplify_Commerce {
 				// Create customer
 				$customer = Simplify_Customer::createCustomer( array(
 					'token'     => $cart_token,
-					'email'     => $order->billing_email,
+					'email'     => $order->get_billing_email(),
 					'name'      => trim( $order->get_formatted_billing_full_name() ),
-					'reference' => $order->id
+					'reference' => $order->get_id(),
 				) );
 
 				if ( is_object( $customer ) && '' != $customer->id ) {
 					$customer_id = wc_clean( $customer->id );
 
 					// Store the customer ID in the order
-					update_post_meta( $order->id, '_simplify_customer_id', $customer_id );
+					update_post_meta( $order->get_id(), '_simplify_customer_id', $customer_id );
 				} else {
 					$error_msg = __( 'Error creating user in Simplify Commerce.', 'woocommerce' );
 
@@ -214,7 +213,7 @@ class WC_Addons_Gateway_Simplify_Commerce extends WC_Gateway_Simplify_Commerce {
 				}
 
 				// Reduce stock levels
-				$order->reduce_order_stock();
+				wc_reduce_stock_levels( $order->get_id() );
 
 				// Remove cart
 				WC()->cart->empty_cart();
@@ -225,7 +224,7 @@ class WC_Addons_Gateway_Simplify_Commerce extends WC_Gateway_Simplify_Commerce {
 				// Return thank you page redirect
 				return array(
 					'result'   => 'success',
-					'redirect' => $this->get_return_url( $order )
+					'redirect' => $this->get_return_url( $order ),
 				);
 
 			} catch ( Simplify_ApiException $e ) {
@@ -239,7 +238,7 @@ class WC_Addons_Gateway_Simplify_Commerce extends WC_Gateway_Simplify_Commerce {
 
 				return array(
 					'result'   => 'fail',
-					'redirect' => ''
+					'redirect' => '',
 				);
 			}
 
@@ -259,11 +258,11 @@ class WC_Addons_Gateway_Simplify_Commerce extends WC_Gateway_Simplify_Commerce {
 		$order      = wc_get_order( $order_id );
 
 		// Processing subscription
-		if ( 'standard' == $this->mode && ( $this->order_contains_subscription( $order->id ) || ( function_exists( 'wcs_is_subscription' ) && wcs_is_subscription( $order_id ) ) ) ) {
+		if ( 'standard' == $this->mode && ( $this->order_contains_subscription( $order->get_id() ) || ( function_exists( 'wcs_is_subscription' ) && wcs_is_subscription( $order_id ) ) ) ) {
 			return $this->process_subscription( $order, $cart_token );
 
 		// Processing pre-order
-		} elseif ( 'standard' == $this->mode && $this->order_contains_pre_order( $order->id ) ) {
+		} elseif ( 'standard' == $this->mode && $this->order_contains_pre_order( $order->get_id() ) ) {
 			return $this->process_pre_order( $order, $cart_token );
 
 		// Processing regular product
@@ -276,7 +275,7 @@ class WC_Addons_Gateway_Simplify_Commerce extends WC_Gateway_Simplify_Commerce {
 	 * process_subscription_payment function.
 	 *
 	 * @param WC_order $order
-	 * @param integer $amount (default: 0)
+	 * @param int $amount (default: 0)
 	 * @uses  Simplify_BadRequestException
 	 * @return bool|WP_Error
 	 */
@@ -292,10 +291,10 @@ class WC_Addons_Gateway_Simplify_Commerce extends WC_Gateway_Simplify_Commerce {
 			return new WP_Error( 'simplify_error', __( 'Sorry, the minimum allowed order total is 0.50 to use this payment method.', 'woocommerce' ) );
 		}
 
-		$customer_id = get_post_meta( $order->id, '_simplify_customer_id', true );
+		$customer_id = get_post_meta( $order->get_id(), '_simplify_customer_id', true );
 
 		if ( ! $customer_id ) {
-			return new WP_Error( 'simplify_error', __( 'Customer not found', 'woocommerce' ) );
+			return new WP_Error( 'simplify_error', __( 'Customer not found.', 'woocommerce' ) );
 		}
 
 		try {
@@ -303,9 +302,9 @@ class WC_Addons_Gateway_Simplify_Commerce extends WC_Gateway_Simplify_Commerce {
 			$payment = Simplify_Payment::createPayment( array(
 				'amount'              => $amount * 100, // In cents.
 				'customer'            => $customer_id,
-				'description'         => sprintf( __( '%s - Order #%s', 'woocommerce' ), esc_html( get_bloginfo( 'name', 'display' ) ), $order->get_order_number() ),
+				'description'         => sprintf( __( '%1$s - Order #%2$s', 'woocommerce' ), esc_html( get_bloginfo( 'name', 'display' ) ), $order->get_order_number() ),
 				'currency'            => strtoupper( get_woocommerce_currency() ),
-				'reference'           => $order->id
+				'reference'           => $order->get_id(),
 			) );
 
 		} catch ( Exception $e ) {
@@ -319,7 +318,7 @@ class WC_Addons_Gateway_Simplify_Commerce extends WC_Gateway_Simplify_Commerce {
 				}
 			}
 
-			$order->add_order_note( sprintf( __( 'Simplify payment error: %s', 'woocommerce' ), $error_message ) );
+			$order->add_order_note( sprintf( __( 'Simplify payment error: %s.', 'woocommerce' ), $error_message ) );
 
 			return new WP_Error( 'simplify_payment_declined', $e->getMessage(), array( 'status' => $e->getCode() ) );
 		}
@@ -329,7 +328,7 @@ class WC_Addons_Gateway_Simplify_Commerce extends WC_Gateway_Simplify_Commerce {
 			$order->payment_complete( $payment->id );
 
 			// Add order note
-			$order->add_order_note( sprintf( __( 'Simplify payment approved (ID: %s, Auth Code: %s)', 'woocommerce' ), $payment->id, $payment->authCode ) );
+			$order->add_order_note( sprintf( __( 'Simplify payment approved (ID: %1$s, Auth Code: %2$s)', 'woocommerce' ), $payment->id, $payment->authCode ) );
 
 			return true;
 		} else {
@@ -361,7 +360,7 @@ class WC_Addons_Gateway_Simplify_Commerce extends WC_Gateway_Simplify_Commerce {
 	 * @param WC_Order $renewal_order The order which recorded the successful payment (to make up for the failed automatic payment).
 	 */
 	public function update_failing_payment_method( $subscription, $renewal_order ) {
-		update_post_meta( $subscription->id, '_simplify_customer_id', get_post_meta( $renewal_order->id, '_simplify_customer_id', true ) );
+		update_post_meta( $subscription->id, '_simplify_customer_id', get_post_meta( $renewal_order->get_id(), '_simplify_customer_id', true ) );
 	}
 
 	/**
@@ -413,35 +412,41 @@ class WC_Addons_Gateway_Simplify_Commerce extends WC_Gateway_Simplify_Commerce {
 	 * @return void
 	 */
 	public function delete_resubscribe_meta( $resubscribe_order ) {
-		delete_post_meta( $resubscribe_order->id, '_simplify_customer_id' );
+		delete_post_meta( $resubscribe_order->get_id(), '_simplify_customer_id' );
 	}
 
 	/**
 	 * Process a pre-order payment when the pre-order is released.
 	 *
 	 * @param WC_Order $order
-	 * @return wp_error|null
+	 * @return WP_Error|null
 	 */
 	public function process_pre_order_release_payment( $order ) {
 
 		try {
 			$order_items    = $order->get_items();
 			$order_item     = array_shift( $order_items );
-			$pre_order_name = sprintf( __( '%s - Pre-order for "%s"', 'woocommerce' ), esc_html( get_bloginfo( 'name', 'display' ) ), $order_item['name'] ) . ' ' . sprintf( __( '(Order #%s)', 'woocommerce' ), $order->get_order_number() );
+			/* translators: 1: site name 2: product name 3: order number */
+			$pre_order_name = sprintf(
+				__( '%1$s - Pre-order for "%2$s" (Order #%3$s)', 'woocommerce' ),
+				esc_html( get_bloginfo( 'name', 'display' ) ),
+				$order_item['name'],
+				$order->get_order_number()
+			);
 
-			$customer_id = get_post_meta( $order->id, '_simplify_customer_id', true );
+			$customer_id = get_post_meta( $order->get_id(), '_simplify_customer_id', true );
 
 			if ( ! $customer_id ) {
-				return new WP_Error( 'simplify_error', __( 'Customer not found', 'woocommerce' ) );
+				return new WP_Error( 'simplify_error', __( 'Customer not found.', 'woocommerce' ) );
 			}
 
 			// Charge the customer
 			$payment = Simplify_Payment::createPayment( array(
-				'amount'              => $order->order_total * 100, // In cents.
+				'amount'              => $order->get_total() * 100, // In cents.
 				'customer'            => $customer_id,
 				'description'         => trim( substr( $pre_order_name, 0, 1024 ) ),
 				'currency'            => strtoupper( get_woocommerce_currency() ),
-				'reference'           => $order->id
+				'reference'           => $order->get_id(),
 			) );
 
 			if ( 'APPROVED' == $payment->paymentStatus ) {
@@ -449,7 +454,7 @@ class WC_Addons_Gateway_Simplify_Commerce extends WC_Gateway_Simplify_Commerce {
 				$order->payment_complete( $payment->id );
 
 				// Add order note
-				$order->add_order_note( sprintf( __( 'Simplify payment approved (ID: %s, Auth Code: %s)', 'woocommerce' ), $payment->id, $payment->authCode ) );
+				$order->add_order_note( sprintf( __( 'Simplify payment approved (ID: %1$s, Auth Code: %2$s)', 'woocommerce' ), $payment->id, $payment->authCode ) );
 			} else {
 				return new WP_Error( 'simplify_payment_declined', __( 'Payment was declined - the customer need to try another card.', 'woocommerce' ) );
 			}
@@ -484,12 +489,12 @@ class WC_Addons_Gateway_Simplify_Commerce extends WC_Gateway_Simplify_Commerce {
 			$amount      = absint( $_REQUEST['amount'] );
 			$order_id    = absint( $_REQUEST['reference'] );
 			$order       = wc_get_order( $order_id );
-			$order_total = absint( $order->order_total * 100 );
+			$order_total = absint( $order->get_total() * 100 );
 
 			if ( $amount === $order_total ) {
-				if ( $this->order_contains_subscription( $order->id ) ) {
+				if ( $this->order_contains_subscription( $order->get_id() ) ) {
 					$response = $this->process_subscription( $order, $cart_token );
-				} elseif ( $this->order_contains_pre_order( $order->id ) ) {
+				} elseif ( $this->order_contains_pre_order( $order->get_id() ) ) {
 					$response = $this->process_pre_order( $order, $cart_token );
 				} else {
 					$response = parent::process_standard_payments( $order, $cart_token );
diff --git a/includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php b/includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php
index 8f1c18db81e..d727f37d19c 100644
--- a/includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php
+++ b/includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php
@@ -8,13 +8,13 @@ if ( ! defined( 'ABSPATH' ) ) {
  * Simplify Commerce Gateway.
  *
  * @class 		WC_Gateway_Simplify_Commerce
- * @extends		WC_Payment_Gateway
+ * @extends		WC_Payment_Gateway_CC
  * @since       2.2.0
  * @version		1.0.0
  * @package		WooCommerce/Classes/Payment
  * @author 		WooThemes
  */
-class WC_Gateway_Simplify_Commerce extends WC_Payment_Gateway {
+class WC_Gateway_Simplify_Commerce extends WC_Payment_Gateway_CC {
 
 	/**
 	 * Constructor.
@@ -23,6 +23,7 @@ class WC_Gateway_Simplify_Commerce extends WC_Payment_Gateway {
 		$this->id                 = 'simplify_commerce';
 		$this->method_title       = __( 'Simplify Commerce', 'woocommerce' );
 		$this->method_description = __( 'Take payments via Simplify Commerce - uses simplify.js to create card tokens and the Simplify Commerce SDK. Requires SSL when sandbox is disabled.', 'woocommerce' );
+		$this->new_method_label   = __( 'Use a new card', 'woocommerce' );
 		$this->has_fields         = true;
 		$this->supports           = array(
 			'subscriptions',
@@ -37,8 +38,9 @@ class WC_Gateway_Simplify_Commerce extends WC_Payment_Gateway {
 			'subscription_date_changes',
 			'multiple_subscriptions',
 			'default_credit_card_form',
+			'tokenization',
 			'refunds',
-			'pre-orders'
+			'pre-orders',
 		);
 		$this->view_transaction_url = 'https://www.simplify.com/commerce/app#/payment/%s';
 
@@ -55,8 +57,8 @@ class WC_Gateway_Simplify_Commerce extends WC_Payment_Gateway {
 		$this->mode            = $this->get_option( 'mode', 'standard' );
 		$this->modal_color     = $this->get_option( 'modal_color', '#a46497' );
 		$this->sandbox         = $this->get_option( 'sandbox' );
-		$this->public_key      = $this->sandbox == 'no' ? $this->get_option( 'public_key' ) : $this->get_option( 'sandbox_public_key' );
-		$this->private_key     = $this->sandbox == 'no' ? $this->get_option( 'private_key' ) : $this->get_option( 'sandbox_private_key' );
+		$this->public_key      = ( 'no' === $this->sandbox ) ? $this->get_option( 'public_key' ) : $this->get_option( 'sandbox_public_key' );
+		$this->private_key     = ( 'no' === $this->sandbox ) ? $this->get_option( 'private_key' ) : $this->get_option( 'sandbox_private_key' );
 
 		$this->init_simplify_sdk();
 
@@ -72,7 +74,7 @@ class WC_Gateway_Simplify_Commerce extends WC_Payment_Gateway {
 	 */
 	protected function init_simplify_sdk() {
 		// Include lib
-		require_once( 'includes/Simplify.php' );
+		require_once( dirname( __FILE__ ) . '/includes/Simplify.php' );
 
 		Simplify::$publicKey  = $this->public_key;
 		Simplify::$privateKey = $this->private_key;
@@ -140,24 +142,28 @@ class WC_Gateway_Simplify_Commerce extends WC_Payment_Gateway {
 			return;
 		}
 
-		// PHP Version
 		if ( version_compare( phpversion(), '5.3', '<' ) ) {
+
+			// PHP Version
 			echo '<div class="error"><p>' . sprintf( __( 'Simplify Commerce Error: Simplify commerce requires PHP 5.3 and above. You are using version %s.', 'woocommerce' ), phpversion() ) . '</p></div>';
-		}
 
-		// Check required fields
-		elseif ( ! $this->public_key || ! $this->private_key ) {
+		} elseif ( ! $this->public_key || ! $this->private_key ) {
+
+			// Check required fields
 			echo '<div class="error"><p>' . __( 'Simplify Commerce Error: Please enter your public and private keys', 'woocommerce' ) . '</p></div>';
-		}
 
-		// Show message when using standard mode and no SSL on the checkout page
-		elseif ( 'standard' == $this->mode && ! wc_checkout_is_https() ) {
-			echo '<div class="error"><p>' . sprintf( __( 'Simplify Commerce is enabled, but the <a href="%s">force SSL option</a> is disabled; your checkout may not be secure! Please enable SSL and ensure your server has a valid SSL certificate - Simplify Commerce will only work in sandbox mode.', 'woocommerce'), admin_url( 'admin.php?page=wc-settings&tab=checkout' ) ) . '</p></div>';
+		} elseif ( 'standard' == $this->mode && ! wc_checkout_is_https() ) {
+
+			// Show message when using standard mode and no SSL on the checkout page
+			echo '<div class="error"><p>' . sprintf( __( 'Simplify Commerce is enabled, but the <a href="%s">force SSL option</a> is disabled; your checkout may not be secure! Please enable SSL and ensure your server has a valid SSL certificate - Simplify Commerce will only work in sandbox mode.', 'woocommerce' ), admin_url( 'admin.php?page=wc-settings&tab=checkout' ) ) . '</p></div>';
+
 		}
 	}
 
 	/**
 	 * Check if this gateway is enabled.
+	 *
+	 * @return bool
 	 */
 	public function is_available() {
 		if ( 'yes' !== $this->enabled ) {
@@ -185,74 +191,74 @@ class WC_Gateway_Simplify_Commerce extends WC_Payment_Gateway {
 				'label'       => __( 'Enable Simplify Commerce', 'woocommerce' ),
 				'type'        => 'checkbox',
 				'description' => '',
-				'default'     => 'no'
+				'default'     => 'no',
 			),
 			'title' => array(
 				'title'       => __( 'Title', 'woocommerce' ),
 				'type'        => 'text',
 				'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce' ),
 				'default'     => __( 'Credit card', 'woocommerce' ),
-				'desc_tip'    => true
+				'desc_tip'    => true,
 			),
 			'description' => array(
 				'title'       => __( 'Description', 'woocommerce' ),
 				'type'        => 'text',
 				'description' => __( 'This controls the description which the user sees during checkout.', 'woocommerce' ),
 				'default'     => 'Pay with your credit card via Simplify Commerce by MasterCard.',
-				'desc_tip'    => true
+				'desc_tip'    => true,
 			),
 			'mode' => array(
-				'title'       => __( 'Payment Mode', 'woocommerce' ),
+				'title'       => __( 'Payment mode', 'woocommerce' ),
 				'label'       => __( 'Enable Hosted Payments', 'woocommerce' ),
 				'type'        => 'select',
 				'description' => sprintf( __( 'Standard will display the credit card fields on your store (SSL required). %1$s Hosted Payments will display a Simplify Commerce modal dialog on your store (if SSL) or will redirect the customer to Simplify Commerce hosted page (if not SSL). %1$s Note: Hosted Payments need a new API Key pair with the hosted payments flag selected. %2$sFor more details check the Simplify Commerce docs%3$s.', 'woocommerce' ), '<br />', '<a href="https://simplify.desk.com/customer/portal/articles/1792405-how-do-i-enable-hosted-payments" target="_blank">', '</a>' ),
 				'default'     => 'standard',
 				'options'     => array(
 					'standard' => __( 'Standard', 'woocommerce' ),
-					'hosted'   => __( 'Hosted Payments', 'woocommerce' )
-				)
+					'hosted'   => __( 'Hosted Payments', 'woocommerce' ),
+				),
 			),
 			'modal_color' => array(
-				'title'       => __( 'Modal Color', 'woocommerce' ),
+				'title'       => __( 'Modal color', 'woocommerce' ),
 				'type'        => 'color',
 				'description' => __( 'Set the color of the buttons and titles on the modal dialog.', 'woocommerce' ),
 				'default'     => '#a46497',
-				'desc_tip'    => true
+				'desc_tip'    => true,
 			),
 			'sandbox' => array(
 				'title'       => __( 'Sandbox', 'woocommerce' ),
-				'label'       => __( 'Enable Sandbox Mode', 'woocommerce' ),
+				'label'       => __( 'Enable sandbox mode', 'woocommerce' ),
 				'type'        => 'checkbox',
 				'description' => __( 'Place the payment gateway in sandbox mode using sandbox API keys (real payments will not be taken).', 'woocommerce' ),
-				'default'     => 'yes'
+				'default'     => 'yes',
 			),
 			'sandbox_public_key' => array(
-				'title'       => __( 'Sandbox Public Key', 'woocommerce' ),
+				'title'       => __( 'Sandbox public key', 'woocommerce' ),
 				'type'        => 'text',
 				'description' => __( 'Get your API keys from your Simplify account: Settings > API Keys.', 'woocommerce' ),
 				'default'     => '',
-				'desc_tip'    => true
+				'desc_tip'    => true,
 			),
 			'sandbox_private_key' => array(
-				'title'       => __( 'Sandbox Private Key', 'woocommerce' ),
+				'title'       => __( 'Sandbox private key', 'woocommerce' ),
 				'type'        => 'text',
 				'description' => __( 'Get your API keys from your Simplify account: Settings > API Keys.', 'woocommerce' ),
 				'default'     => '',
-				'desc_tip'    => true
+				'desc_tip'    => true,
 			),
 			'public_key' => array(
-				'title'       => __( 'Public Key', 'woocommerce' ),
+				'title'       => __( 'Public key', 'woocommerce' ),
 				'type'        => 'text',
 				'description' => __( 'Get your API keys from your Simplify account: Settings > API Keys.', 'woocommerce' ),
 				'default'     => '',
-				'desc_tip'    => true
+				'desc_tip'    => true,
 			),
 			'private_key' => array(
-				'title'       => __( 'Private Key', 'woocommerce' ),
+				'title'       => __( 'Private key', 'woocommerce' ),
 				'type'        => 'text',
 				'description' => __( 'Get your API keys from your Simplify account: Settings > API Keys.', 'woocommerce' ),
 				'default'     => '',
-				'desc_tip'    => true
+				'desc_tip'    => true,
 			),
 		);
 	}
@@ -272,35 +278,132 @@ class WC_Gateway_Simplify_Commerce extends WC_Payment_Gateway {
 		}
 
 		if ( 'standard' == $this->mode ) {
-			$this->credit_card_form( array( 'fields_have_names' => false ) );
+			parent::payment_fields();
 		}
 	}
 
 	/**
-	 * payment_scripts function.
-	 *
 	 * Outputs scripts used for simplify payment.
 	 */
 	public function payment_scripts() {
-		if ( ! is_checkout() || ! $this->is_available() ) {
+		$load_scripts = false;
+
+		if ( is_checkout() ) {
+			$load_scripts = true;
+		}
+		if ( $this->is_available() ) {
+			$load_scripts = true;
+		}
+
+		if ( false === $load_scripts ) {
 			return;
 		}
 
-		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-
 		wp_enqueue_script( 'simplify-commerce', 'https://www.simplify.com/commerce/v1/simplify.js', array( 'jquery' ), WC_VERSION, true );
-		wp_enqueue_script( 'wc-simplify-commerce', WC()->plugin_url() . '/includes/gateways/simplify-commerce/assets/js/simplify-commerce' . $suffix . '.js', array( 'simplify-commerce', 'wc-credit-card-form' ), WC_VERSION, true );
+		wp_enqueue_script( 'wc-simplify-commerce', WC()->plugin_url() . '/includes/gateways/simplify-commerce/assets/js/simplify-commerce.js', array( 'simplify-commerce', 'wc-credit-card-form' ), WC_VERSION, true );
 		wp_localize_script( 'wc-simplify-commerce', 'Simplify_commerce_params', array(
 			'key'           => $this->public_key,
-			'card.number'   => __( 'Card Number', 'woocommerce' ),
-			'card.expMonth' => __( 'Expiry Month', 'woocommerce' ),
-			'card.expYear'  => __( 'Expiry Year', 'woocommerce' ),
+			'card.number'   => __( 'Card number', 'woocommerce' ),
+			'card.expMonth' => __( 'Expiry month', 'woocommerce' ),
+			'card.expYear'  => __( 'Expiry year', 'woocommerce' ),
 			'is_invalid'    => __( 'is invalid', 'woocommerce' ),
 			'mode'          => $this->mode,
-			'is_ssl'        => is_ssl()
+			'is_ssl'        => is_ssl(),
 		) );
 	}
 
+	public function add_payment_method() {
+		if ( empty( $_POST['simplify_token'] ) ) {
+			wc_add_notice( __( 'There was a problem adding this card.', 'woocommerce' ), 'error' );
+			return;
+		}
+
+		$cart_token     = wc_clean( $_POST['simplify_token'] );
+		$customer_token = $this->get_users_token();
+		$current_user   = wp_get_current_user();
+		$customer_info  = array(
+			'email' => $current_user->user_email,
+			'name'  => $current_user->display_name,
+		);
+
+		$token = $this->save_token( $customer_token, $cart_token, $customer_info );
+		if ( is_null( $token ) ) {
+			wc_add_notice( __( 'There was a problem adding this card.', 'woocommerce' ), 'error' );
+			return;
+		}
+
+		return array(
+			'result'   => 'success',
+			'redirect' => wc_get_endpoint_url( 'payment-methods' ),
+		);
+	}
+
+	/**
+	 * Actually saves a customer token to the database.
+	 *
+	 * @param  WC_Payment_Token   $customer_token Payment Token
+	 * @param  string             $cart_token     CC Token
+	 * @param  array              $customer_info  'email', 'name'
+	 */
+	public function save_token( $customer_token, $cart_token, $customer_info ) {
+		if ( ! is_null( $customer_token ) ) {
+			$customer = Simplify_Customer::findCustomer( $customer_token->get_token() );
+			$updates = array( 'token' => $cart_token );
+			$customer->setAll( $updates );
+			$customer->updateCustomer();
+			$customer = Simplify_Customer::findCustomer( $customer_token->get_token() ); // get updated customer with new set card
+			$token = $customer_token;
+		} else {
+			$customer = Simplify_Customer::createCustomer( array(
+				'token'     => $cart_token,
+				'email'     => $customer_info['email'],
+				'name'      => $customer_info['name'],
+			) );
+			$token = new WC_Payment_Token_CC();
+			$token->set_token( $customer->id );
+		}
+
+		// If we were able to create an save our card, save the data on our side too
+		if ( is_object( $customer ) && '' != $customer->id ) {
+			$customer_properties = $customer->getProperties();
+			$card = $customer_properties['card'];
+			$token->set_gateway_id( $this->id );
+			$token->set_card_type( strtolower( $card->type ) );
+			$token->set_last4( $card->last4 );
+			$expiry_month = ( 1 === strlen( $card->expMonth ) ? '0' . $card->expMonth : $card->expMonth );
+			$token->set_expiry_month( $expiry_month );
+			$token->set_expiry_year( '20' . $card->expYear );
+			if ( is_user_logged_in() ) {
+				$token->set_user_id( get_current_user_id() );
+			}
+			$token->save();
+			return $token;
+		}
+
+		return null;
+	}
+
+	/**
+	 * Process customer: updating or creating a new customer/saved CC
+	 *
+	 * @param  WC_Order           $order          Order object
+	 * @param  WC_Payment_Token   $customer_token Payment Token
+	 * @param  string             $cart_token     CC Token
+	 */
+	protected function process_customer( $order, $customer_token = null, $cart_token = '' ) {
+		// Are we saving a new payment method?
+		if ( is_user_logged_in() && isset( $_POST['wc-simplify_commerce-new-payment-method'] ) && true === (bool) $_POST['wc-simplify_commerce-new-payment-method'] ) {
+			$customer_info = array(
+				'email' => $order->get_billing_email(),
+				'name'  => trim( $order->get_formatted_billing_full_name() ),
+			);
+			$token = $this->save_token( $customer_token, $cart_token, $customer_info );
+			if ( ! is_null( $token ) ) {
+				$order->add_payment_token( $token );
+			}
+		}
+	}
+
 	/**
 	 * Process standard payments.
 	 *
@@ -310,41 +413,58 @@ class WC_Gateway_Simplify_Commerce extends WC_Payment_Gateway {
 	 * @uses   Simplify_BadRequestException
 	 * @return array
 	 */
-	protected function process_standard_payments( $order, $cart_token = '' ) {
+	protected function process_standard_payments( $order, $cart_token = '', $customer_token = '' ) {
 		try {
 
-			if ( empty( $cart_token ) ) {
+			if ( empty( $cart_token ) && empty( $customer_token ) ) {
 				$error_msg = __( 'Please make sure your card details have been entered correctly and that your browser supports JavaScript.', 'woocommerce' );
 
 				if ( 'yes' == $this->sandbox ) {
-					$error_msg .= ' ' . __( 'Developers: Please make sure that you\'re including jQuery and there are no JavaScript errors on the page.', 'woocommerce' );
+					$error_msg .= ' ' . __( 'Developers: Please make sure that you are including jQuery and there are no JavaScript errors on the page.', 'woocommerce' );
 				}
 
 				throw new Simplify_ApiException( $error_msg );
 			}
 
-			$payment = Simplify_Payment::createPayment( array(
-				'amount'              => $order->order_total * 100, // In cents.
-				'token'               => $cart_token,
-				'description'         => sprintf( __( '%s - Order #%s', 'woocommerce' ), esc_html( get_bloginfo( 'name', 'display' ) ), $order->get_order_number() ),
-				'currency'            => strtoupper( get_woocommerce_currency() ),
-				'reference'           => $order->id
-			) );
+			// We need to figure out if we want to charge the card token (new unsaved token, no customer, etc)
+			// or the customer token (just saved method, previously saved method)
+			$pass_tokens = array();
 
-			$order_complete = $this->process_order_status( $order, $payment->id, $payment->paymentStatus, $payment->authCode );
+			if ( ! empty( $cart_token ) ) {
+				$pass_tokens['token'] = $cart_token;
+			}
+
+			if ( ! empty( $customer_token ) ) {
+				$pass_tokens['customer'] = $customer_token;
+				// Use the customer token only, since we already saved the (one time use) card token to the customer
+				if ( isset( $_POST['wc-simplify_commerce-new-payment-method'] ) && true === (bool) $_POST['wc-simplify_commerce-new-payment-method'] ) {
+					unset( $pass_tokens['token'] );
+				}
+			}
+
+			// Did we create an account and save a payment method? We might need to use the customer token instead of the card token
+			if ( isset( $_POST['createaccount'] ) && true === (bool) $_POST['createaccount'] && empty( $customer_token ) ) {
+				$user_token = $this->get_users_token();
+				if ( ! is_null( $user_token ) ) {
+					$pass_tokens['customer'] = $user_token->get_token();
+					unset( $pass_tokens['token'] );
+				}
+			}
+
+			$payment_response = $this->do_payment( $order, $order->get_total(), $pass_tokens );
+
+			if ( is_wp_error( $payment_response ) ) {
+				throw new Simplify_ApiException( $payment_response->get_error_message() );
+			} else {
+				// Remove cart
+				WC()->cart->empty_cart();
 
-			if ( $order_complete ) {
 				// Return thank you page redirect
 				return array(
 					'result'   => 'success',
-					'redirect' => $this->get_return_url( $order )
+					'redirect' => $this->get_return_url( $order ),
 				);
-			} else {
-				$order->add_order_note( __( 'Simplify payment declined', 'woocommerce' ) );
-
-				throw new Simplify_ApiException( __( 'Payment was declined - please try another card.', 'woocommerce' ) );
 			}
-
 		} catch ( Simplify_ApiException $e ) {
 			if ( $e instanceof Simplify_BadRequestException && $e->hasFieldErrors() && $e->getFieldErrors() ) {
 				foreach ( $e->getFieldErrors() as $error ) {
@@ -356,11 +476,67 @@ class WC_Gateway_Simplify_Commerce extends WC_Payment_Gateway {
 
 			return array(
 				'result'   => 'fail',
-				'redirect' => ''
+				'redirect' => '',
 			);
 		}
 	}
 
+ 	/**
+	 * do payment function.
+	 *
+	 * @param WC_order $order
+	 * @param int $amount (default: 0)
+	 * @uses  Simplify_BadRequestException
+	 * @return bool|WP_Error
+	 */
+	public function do_payment( $order, $amount = 0, $token = array() ) {
+		if ( $amount * 100 < 50 ) {
+			return new WP_Error( 'simplify_error', __( 'Sorry, the minimum allowed order total is 0.50 to use this payment method.', 'woocommerce' ) );
+		}
+
+		try {
+			// Charge the customer
+			$data = array(
+				'amount'              => $amount * 100, // In cents.
+				'description'         => sprintf( __( '%1$s - Order #%2$s', 'woocommerce' ), esc_html( get_bloginfo( 'name', 'display' ) ), $order->get_order_number() ),
+				'currency'            => strtoupper( get_woocommerce_currency() ),
+				'reference'           => $order->get_id(),
+			);
+
+			$data = array_merge( $data, $token );
+			$payment = Simplify_Payment::createPayment( $data );
+
+		} catch ( Exception $e ) {
+
+			$error_message = $e->getMessage();
+
+			if ( $e instanceof Simplify_BadRequestException && $e->hasFieldErrors() && $e->getFieldErrors() ) {
+				$error_message = '';
+				foreach ( $e->getFieldErrors() as $error ) {
+					$error_message .= ' ' . $error->getFieldName() . ': "' . $error->getMessage() . '" (' . $error->getErrorCode() . ')';
+				}
+			}
+
+			$order->add_order_note( sprintf( __( 'Simplify payment error: %s.', 'woocommerce' ), $error_message ) );
+
+			return new WP_Error( 'simplify_payment_declined', $e->getMessage(), array( 'status' => $e->getCode() ) );
+		}
+
+		if ( 'APPROVED' == $payment->paymentStatus ) {
+			// Payment complete
+			$order->payment_complete( $payment->id );
+
+			// Add order note
+			$order->add_order_note( sprintf( __( 'Simplify payment approved (ID: %1$s, Auth Code: %2$s)', 'woocommerce' ), $payment->id, $payment->authCode ) );
+
+			return true;
+		} else {
+			$order->add_order_note( __( 'Simplify payment declined', 'woocommerce' ) );
+
+			return new WP_Error( 'simplify_payment_declined', __( 'Payment was declined - please try another card.', 'woocommerce' ) );
+		}
+	}
+
 	/**
 	 * Process standard payments.
 	 *
@@ -370,23 +546,56 @@ class WC_Gateway_Simplify_Commerce extends WC_Payment_Gateway {
 	protected function process_hosted_payments( $order ) {
 		return array(
 			'result'   => 'success',
-			'redirect' => $order->get_checkout_payment_url( true )
+			'redirect' => $order->get_checkout_payment_url( true ),
 		);
 	}
 
+	protected function get_users_token() {
+		$customer_token  = null;
+		if ( is_user_logged_in() ) {
+			$tokens = WC_Payment_Tokens::get_customer_tokens( get_current_user_id() );
+			foreach ( $tokens as $token ) {
+				if ( $token->get_gateway_id() === $this->id ) {
+					$customer_token = $token;
+					break;
+				}
+			}
+		}
+		return $customer_token;
+	}
+
 	/**
 	 * Process the payment.
 	 *
-	 * @param integer $order_id
+	 * @param int $order_id
 	 */
 	public function process_payment( $order_id ) {
-		$cart_token = isset( $_POST['simplify_token'] ) ? wc_clean( $_POST['simplify_token'] ) : '';
-		$order      = wc_get_order( $order_id );
+		$order = wc_get_order( $order_id );
 
-		if ( 'hosted' == $this->mode ) {
+		// Payment/CC form is hosted on Simplify
+		if ( 'hosted' === $this->mode ) {
 			return $this->process_hosted_payments( $order );
-		} else {
-			return $this->process_standard_payments( $order, $cart_token );
+		}
+
+		// New CC info was entered
+		if ( isset( $_POST['simplify_token'] ) ) {
+			$cart_token           = wc_clean( $_POST['simplify_token'] );
+			$customer_token       = $this->get_users_token();
+			$customer_token_value = ( ! is_null( $customer_token ) ? $customer_token->get_token() : '' );
+			$this->process_customer( $order, $customer_token, $cart_token );
+			return $this->process_standard_payments( $order, $cart_token, $customer_token_value );
+		}
+
+		// Possibly Create (or update) customer/save payment token, use an existing token, and then process the payment
+		if ( isset( $_POST['wc-simplify_commerce-payment-token'] ) && 'new' !== $_POST['wc-simplify_commerce-payment-token'] ) {
+			$token_id = wc_clean( $_POST['wc-simplify_commerce-payment-token'] );
+			$token    = WC_Payment_Tokens::get( $token_id );
+			if ( $token->get_user_id() !== get_current_user_id() ) {
+				wc_add_notice( __( 'Please make sure your card details have been entered correctly and that your browser supports JavaScript.', 'woocommerce' ), 'error' );
+				return;
+			}
+			$this->process_customer( $order, $token );
+			return $this->process_standard_payments( $order, '', $token->get_token() );
 		}
 	}
 
@@ -400,19 +609,20 @@ class WC_Gateway_Simplify_Commerce extends WC_Payment_Gateway {
 	protected function get_hosted_payments_args( $order ) {
 		$args = apply_filters( 'woocommerce_simplify_commerce_hosted_args', array(
 			'sc-key'          => $this->public_key,
-			'amount'          => $order->order_total * 100,
-			'reference'       => $order->id,
+			'amount'          => $order->get_total() * 100,
+			'reference'       => $order->get_id(),
 			'name'            => esc_html( get_bloginfo( 'name', 'display' ) ),
 			'description'     => sprintf( __( 'Order #%s', 'woocommerce' ), $order->get_order_number() ),
 			'receipt'         => 'false',
 			'color'           => $this->modal_color,
 			'redirect-url'    => WC()->api_request_url( 'WC_Gateway_Simplify_Commerce' ),
-			'address'         => $order->billing_address_1 . ' ' . $order->billing_address_2,
-			'address-city'    => $order->billing_city,
-			'address-state'   => $order->billing_state,
-			'address-zip'     => $order->billing_postcode,
-			'address-country' => $order->billing_country
-		), $order->id );
+			'address'         => $order->get_billing_address_1() . ' ' . $order->get_billing_address_2(),
+			'address-city'    => $order->get_billing_city(),
+			'address-state'   => $order->get_billing_state(),
+			'address-zip'     => $order->get_billing_postcode(),
+			'address-country' => $order->get_billing_country(),
+			'operation'       => 'create.token',
+		), $order->get_id() );
 
 		return $args;
 	}
@@ -434,7 +644,7 @@ class WC_Gateway_Simplify_Commerce extends WC_Payment_Gateway {
 		}
 
 		echo '<script type="text/javascript" src="https://www.simplify.com/commerce/simplify.pay.js"></script>
-			<button class="button alt" id="simplify-payment-button" ' . implode( ' ', $button_args ) . '>' . __( 'Pay Now', 'woocommerce' ) . '</button> <a class="button cancel" href="' . esc_url( $order->get_cancel_order_url() ) . '">' . __( 'Cancel order &amp; restore cart', 'woocommerce' ) . '</a>
+			<button class="button alt" id="simplify-payment-button" ' . implode( ' ', $button_args ) . '>' . __( 'Pay now', 'woocommerce' ) . '</button> <a class="button cancel" href="' . esc_url( $order->get_cancel_order_url() ) . '">' . __( 'Cancel order &amp; restore cart', 'woocommerce' ) . '</a>
 			';
 	}
 
@@ -482,7 +692,7 @@ class WC_Gateway_Simplify_Commerce extends WC_Payment_Gateway {
 			$order->payment_complete( $payment_id );
 
 			// Add order note
-			$order->add_order_note( sprintf( __( 'Simplify payment approved (ID: %s, Auth Code: %s)', 'woocommerce' ), $payment_id, $auth_code ) );
+			$order->add_order_note( sprintf( __( 'Simplify payment approved (ID: %1$s, Auth Code: %2$s)', 'woocommerce' ), $payment_id, $auth_code ) );
 
 			// Remove cart
 			WC()->cart->empty_cart();
@@ -512,7 +722,7 @@ class WC_Gateway_Simplify_Commerce extends WC_Payment_Gateway {
 				'amount'    => $amount * 100, // In cents.
 				'payment'   => $payment_id,
 				'reason'    => $reason,
-				'reference' => $order_id
+				'reference' => $order_id,
 			) );
 
 			if ( 'APPROVED' == $refund->paymentStatus ) {
@@ -520,7 +730,6 @@ class WC_Gateway_Simplify_Commerce extends WC_Payment_Gateway {
 			} else {
 				throw new Simplify_ApiException( __( 'Refund was declined.', 'woocommerce' ) );
 			}
-
 		} catch ( Simplify_ApiException $e ) {
 			if ( $e instanceof Simplify_BadRequestException && $e->hasFieldErrors() && $e->getFieldErrors() ) {
 				foreach ( $e->getFieldErrors() as $error ) {
@@ -535,17 +744,17 @@ class WC_Gateway_Simplify_Commerce extends WC_Payment_Gateway {
 	}
 
 	/**
-	 * get_icon function.
+	 * Get gateway icon.
 	 *
 	 * @access public
 	 * @return string
 	 */
 	public function get_icon() {
-		$icon  = '<img src="' . WC_HTTPS::force_https_url( WC()->plugin_url() . '/assets/images/icons/credit-cards/visa.png' ) . '" alt="Visa" />';
-		$icon .= '<img src="' . WC_HTTPS::force_https_url( WC()->plugin_url() . '/assets/images/icons/credit-cards/mastercard.png' ) . '" alt="MasterCard" />';
-		$icon .= '<img src="' . WC_HTTPS::force_https_url( WC()->plugin_url() . '/assets/images/icons/credit-cards/discover.png' ) . '" alt="Discover" />';
-		$icon .= '<img src="' . WC_HTTPS::force_https_url( WC()->plugin_url() . '/assets/images/icons/credit-cards/amex.png' ) . '" alt="Amex" />';
-		$icon .= '<img src="' . WC_HTTPS::force_https_url( WC()->plugin_url() . '/assets/images/icons/credit-cards/jcb.png' ) . '" alt="JCB" />';
+		$icon  = '<img src="' . WC_HTTPS::force_https_url( WC()->plugin_url() . '/assets/images/icons/credit-cards/visa.svg' ) . '" alt="Visa" width="32" />';
+		$icon .= '<img src="' . WC_HTTPS::force_https_url( WC()->plugin_url() . '/assets/images/icons/credit-cards/mastercard.svg' ) . '" alt="MasterCard" width="32" />';
+		$icon .= '<img src="' . WC_HTTPS::force_https_url( WC()->plugin_url() . '/assets/images/icons/credit-cards/discover.svg' ) . '" alt="Discover" width="32" />';
+		$icon .= '<img src="' . WC_HTTPS::force_https_url( WC()->plugin_url() . '/assets/images/icons/credit-cards/amex.svg' ) . '" alt="Amex" width="32" />';
+		$icon .= '<img src="' . WC_HTTPS::force_https_url( WC()->plugin_url() . '/assets/images/icons/credit-cards/jcb.svg' ) . '" alt="JCB" width="32" />';
 
 		return apply_filters( 'woocommerce_gateway_icon', $icon, $this->id );
 	}
diff --git a/includes/gateways/simplify-commerce/includes/Simplify.php b/includes/gateways/simplify-commerce/includes/Simplify.php
index 586ad560146..d4f90df41a3 100644
--- a/includes/gateways/simplify-commerce/includes/Simplify.php
+++ b/includes/gateways/simplify-commerce/includes/Simplify.php
@@ -2,59 +2,59 @@
 /*
  * Copyright (c) 2013 - 2015 MasterCard International Incorporated
  * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are 
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of
  * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of 
- * conditions and the following disclaimer in the documentation and/or other materials 
+ * Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials
  * provided with the distribution.
- * Neither the name of the MasterCard International Incorporated nor the names of its 
- * contributors may be used to endorse or promote products derived from this software 
+ * Neither the name of the MasterCard International Incorporated nor the names of its
+ * contributors may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
- * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-
+// @codingStandardsIgnoreFile
 require_once(dirname(__FILE__) . '/Simplify/Constants.php');
 
 class Simplify
 {
-    /**
-     * @var string $publicKey public API key used to authenticate requests.
-     */
-    public static $publicKey;
+	/**
+	 * @var string $publicKey public API key used to authenticate requests.
+	 */
+	public static $publicKey;
 
-    /**
-     * @var string $privateKey private API key used to authenticate requests.
-     */
-    public static $privateKey;
+	/**
+	 * @var string $privateKey private API key used to authenticate requests.
+	 */
+	public static $privateKey;
 
 
-    /**
-     * @var string $apiBaseLiveUrl URL of the live API endpoint
-     */
-    public static $apiBaseLiveUrl = Simplify_Constants::API_BASE_LIVE_URL;
+	/**
+	 * @var string $apiBaseLiveUrl URL of the live API endpoint
+	 */
+	public static $apiBaseLiveUrl = Simplify_Constants::API_BASE_LIVE_URL;
 
-    /**
-     * @var string $apiBaseSandboxUrl URL of the sandbox API endpoint
-     */
-    public static $apiBaseSandboxUrl = Simplify_Constants::API_BASE_SANDBOX_URL;
+	/**
+	 * @var string $apiBaseSandboxUrl URL of the sandbox API endpoint
+	 */
+	public static $apiBaseSandboxUrl = Simplify_Constants::API_BASE_SANDBOX_URL;
 
-    /**
-     * @var string $userAgent User-agent string send with requests.
-     */
-    public static $userAgent = null;
+	/**
+	 * @var string $userAgent User-agent string send with requests.
+	 */
+	public static $userAgent = null;
 
 }
 
diff --git a/includes/gateways/simplify-commerce/includes/Simplify/AccessToken.php b/includes/gateways/simplify-commerce/includes/Simplify/AccessToken.php
index c47559439d3..d3c5e4100b7 100644
--- a/includes/gateways/simplify-commerce/includes/Simplify/AccessToken.php
+++ b/includes/gateways/simplify-commerce/includes/Simplify/AccessToken.php
@@ -2,27 +2,27 @@
 /*
  * Copyright (c) 2013 - 2015 MasterCard International Incorporated
  * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are 
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of
  * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of 
- * conditions and the following disclaimer in the documentation and/or other materials 
+ * Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials
  * provided with the distribution.
- * Neither the name of the MasterCard International Incorporated nor the names of its 
- * contributors may be used to endorse or promote products derived from this software 
+ * Neither the name of the MasterCard International Incorporated nor the names of its
+ * contributors may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
- * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
@@ -31,93 +31,93 @@
  */
 class Simplify_AccessToken extends Simplify_Object {
 
-    public function __construct($hash) {
-        $this->setAll($hash);
-    }
+	public function __construct($hash) {
+		$this->setAll($hash);
+	}
 
-    /**
-     * Creates an OAuth access token
-     * @param $code - the authorisation code returned from the GET on /oauth/authorize
-     * @param $redirect_uri = this must be the redirect_uri set in the apps configuration
-     * @param $authentication - Authentication information to access the API.  If not value is passed the global key Simplify::$publicKey and Simplify::$privateKey are used
-     * @return Simplify_AccessToken
-     */
-    public static function create($code, $redirect_uri, $authentication = null) {
+	/**
+	 * Creates an OAuth access token
+	 * @param $code - the authorisation code returned from the GET on /oauth/authorize
+	 * @param $redirect_uri = this must be the redirect_uri set in the apps configuration
+	 * @param $authentication - Authentication information to access the API.  If not value is passed the global key Simplify::$publicKey and Simplify::$privateKey are used
+	 * @return Simplify_AccessToken
+	 */
+	public static function create($code, $redirect_uri, $authentication = null) {
 
-        $args = func_get_args();
-        $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 3);
+		$args = func_get_args();
+		$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 3);
 
-        $props = 'code='.$code.'&redirect_uri='.$redirect_uri.'&grant_type=authorization_code';
-        $resp = Simplify_AccessToken::sendRequest($props, "token", $authentication);
+		$props = 'code='.$code.'&redirect_uri='.$redirect_uri.'&grant_type=authorization_code';
+		$resp = Simplify_AccessToken::sendRequest($props, "token", $authentication);
 
-        return new Simplify_AccessToken($resp);
-    }
+		return new Simplify_AccessToken($resp);
+	}
 
-    /**
-     * Refreshes the current token.  The access_token and refresh_token values will be updated.
-     * @param $authentication - Authentication information to access the API.  If not value is passed the global key Simplify::$publicKey and Simplify::$privateKey are used
-     * @return Simplify_AccessToken
-     * @throws InvalidArgumentException
-     */
-    public function refresh($authentication = null) {
+	/**
+	 * Refreshes the current token.  The access_token and refresh_token values will be updated.
+	 * @param $authentication - Authentication information to access the API.  If not value is passed the global key Simplify::$publicKey and Simplify::$privateKey are used
+	 * @return Simplify_AccessToken
+	 * @throws InvalidArgumentException
+	 */
+	public function refresh($authentication = null) {
+		$args = func_get_args();
 
-        $refresh_token = $this->refresh_token;
-        if (empty($refresh_token)){
-            throw new InvalidArgumentException('Cannot refresh access token; refresh token is invalid');
-        }
+		$refresh_token = $this->refresh_token;
+		if (empty($refresh_token)){
+			throw new InvalidArgumentException('Cannot refresh access token; refresh token is invalid');
+		}
 
-        $args = func_get_args();
-        $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
+		$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
 
-        $props = 'refresh_token='.$refresh_token.'&grant_type=refresh_token';
-        $resp = Simplify_AccessToken::sendRequest($props, "token", $authentication);
+		$props = 'refresh_token='.$refresh_token.'&grant_type=refresh_token';
+		$resp = Simplify_AccessToken::sendRequest($props, "token", $authentication);
 
-        $this->setAll($resp);
+		$this->setAll($resp);
 
-        return $this;
-    }
+		return $this;
+	}
 
-    /**
-     * <p>Revokes a token from further use.
-     * @param $authentication - Authentication information to access the API.  If not value is passed the global key Simplify::$publicKey and Simplify::$privateKey are used
-     * @return Simplify_AccessToken
-     * @throws InvalidArgumentException
-     */
-    public function revoke($authentication = null) {
+	/**
+	 * <p>Revokes a token from further use.
+	 * @param $authentication - Authentication information to access the API.  If not value is passed the global key Simplify::$publicKey and Simplify::$privateKey are used
+	 * @return Simplify_AccessToken
+	 * @throws InvalidArgumentException
+	 */
+	public function revoke($authentication = null) {
+		$args = func_get_args();
 
-        $access_token = $this->access_token;
-        if (empty($access_token)){
-            throw new InvalidArgumentException('Cannot revoke access token; access token is invalid');
-        }
+		$access_token = $this->access_token;
+		if (empty($access_token)){
+			throw new InvalidArgumentException('Cannot revoke access token; access token is invalid');
+		}
 
-        $args = func_get_args();
-        $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+		$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-        $props = 'token='.$access_token.'';
+		$props = 'token='.$access_token.'';
 
-        Simplify_AccessToken::sendRequest($props, "revoke", $authentication);
+		Simplify_AccessToken::sendRequest($props, "revoke", $authentication);
 
-        $this->access_token = null;
-        $this->refresh_token = null;
-        $this->redirect_uri = null;
+		$this->access_token = null;
+		$this->refresh_token = null;
+		$this->redirect_uri = null;
 
-        return $this;
-    }
+		return $this;
+	}
 
-    private static function sendRequest($props, $context, $authentication){
+	private static function sendRequest($props, $context, $authentication){
 
-        $url = Simplify_Constants::OAUTH_BASE_URL.'/'.$context;
-        $http = new Simplify_HTTP();
-        $resp = $http->oauthRequest($url, $props, $authentication);
+		$url = Simplify_Constants::OAUTH_BASE_URL.'/'.$context;
+		$http = new Simplify_HTTP();
+		$resp = $http->oauthRequest($url, $props, $authentication);
 
-        return $resp;
-    }
+		return $resp;
+	}
 
-    /**
-     * @ignore
-     */
-    static public function getClazz() {
-        return "AccessToken";
-    }
+	/**
+	 * @ignore
+	 */
+	static public function getClazz() {
+		return "AccessToken";
+	}
 
 }
diff --git a/includes/gateways/simplify-commerce/includes/Simplify/Authentication.php b/includes/gateways/simplify-commerce/includes/Simplify/Authentication.php
index 64859579723..d5fa97e51f7 100644
--- a/includes/gateways/simplify-commerce/includes/Simplify/Authentication.php
+++ b/includes/gateways/simplify-commerce/includes/Simplify/Authentication.php
@@ -2,27 +2,27 @@
 /*
  * Copyright (c) 2013 - 2015 MasterCard International Incorporated
  * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are 
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of
  * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of 
- * conditions and the following disclaimer in the documentation and/or other materials 
+ * Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials
  * provided with the distribution.
- * Neither the name of the MasterCard International Incorporated nor the names of its 
- * contributors may be used to endorse or promote products derived from this software 
+ * Neither the name of the MasterCard International Incorporated nor the names of its
+ * contributors may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
- * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
@@ -35,36 +35,36 @@
  */
 class Simplify_Authentication {
 
-    public $privateKey;
-    public $publicKey;
-    public $accessToken;
+	public $privateKey;
+	public $publicKey;
+	public $accessToken;
 
-    function __construct() {
-        $args = func_get_args();
-        switch( func_num_args() ) {
-            case 1:
-                self::__construct1( $args[0] );
-                break;
-            case 2:
-                self::__construct2( $args[0], $args[1] );
-                break;
-            case 3:
-                self::__construct3( $args[0], $args[1], $args[2] );
-        }
-    }
+	function __construct() {
+		$args = func_get_args();
+		switch( func_num_args() ) {
+			case 1:
+				self::__construct1( $args[0] );
+				break;
+			case 2:
+				self::__construct2( $args[0], $args[1] );
+				break;
+			case 3:
+				self::__construct3( $args[0], $args[1], $args[2] );
+		}
+	}
 
-    function __construct1($accessToken) {
-        $this->accessToken = $accessToken;
-    }
+	function __construct1($accessToken) {
+		$this->accessToken = $accessToken;
+	}
 
-    function __construct2($publicKey, $privateKey) {
-        $this->publicKey = $publicKey;
-        $this->privateKey = $privateKey;
-    }
+	function __construct2($publicKey, $privateKey) {
+		$this->publicKey = $publicKey;
+		$this->privateKey = $privateKey;
+	}
 
-    function __construct3($publicKey, $privateKey, $accessToken) {
-        $this->publicKey = $publicKey;
-        $this->privateKey = $privateKey;
-        $this->accessToken = $accessToken;
-    }
-}
\ No newline at end of file
+	function __construct3($publicKey, $privateKey, $accessToken) {
+		$this->publicKey = $publicKey;
+		$this->privateKey = $privateKey;
+		$this->accessToken = $accessToken;
+	}
+}
diff --git a/includes/gateways/simplify-commerce/includes/Simplify/Authorization.php b/includes/gateways/simplify-commerce/includes/Simplify/Authorization.php
index 78b8b654bfb..f309a657c4f 100644
--- a/includes/gateways/simplify-commerce/includes/Simplify/Authorization.php
+++ b/includes/gateways/simplify-commerce/includes/Simplify/Authorization.php
@@ -2,137 +2,137 @@
 /*
  * Copyright (c) 2013 - 2015 MasterCard International Incorporated
  * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are 
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of
  * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of 
- * conditions and the following disclaimer in the documentation and/or other materials 
+ * Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials
  * provided with the distribution.
- * Neither the name of the MasterCard International Incorporated nor the names of its 
- * contributors may be used to endorse or promote products derived from this software 
+ * Neither the name of the MasterCard International Incorporated nor the names of its
+ * contributors may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
- * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 
 class Simplify_Authorization extends Simplify_Object {
-    /**
-     * Creates an Simplify_Authorization object
-     * @param     array $hash a map of parameters; valid keys are:<dl style="padding-left:10px;">
-     *     <dt><tt>amount</tt></dt>    <dd>Amount of the payment (in the smallest unit of your currency). Example: 100 = $1.00USD <strong>required </strong></dd>
-     *     <dt><tt>card.addressCity</tt></dt>    <dd>City of the cardholder. [max length: 50, min length: 2] </dd>
-     *     <dt><tt>card.addressCountry</tt></dt>    <dd>Country code (ISO-3166-1-alpha-2 code) of residence of the cardholder. [max length: 2, min length: 2] </dd>
-     *     <dt><tt>card.addressLine1</tt></dt>    <dd>Address of the cardholder. [max length: 255] </dd>
-     *     <dt><tt>card.addressLine2</tt></dt>    <dd>Address of the cardholder if needed. [max length: 255] </dd>
-     *     <dt><tt>card.addressState</tt></dt>    <dd>State of residence of the cardholder. For the US, this is a 2-digit USPS code. [max length: 255, min length: 2] </dd>
-     *     <dt><tt>card.addressZip</tt></dt>    <dd>Postal code of the cardholder. The postal code size is between 5 and 9 characters in length and only contains numbers or letters. [max length: 9, min length: 3] </dd>
-     *     <dt><tt>card.cvc</tt></dt>    <dd>CVC security code of the card. This is the code on the back of the card. Example: 123 </dd>
-     *     <dt><tt>card.expMonth</tt></dt>    <dd>Expiration month of the card. Format is MM. Example: January = 01 [min value: 1, max value: 12] <strong>required </strong></dd>
-     *     <dt><tt>card.expYear</tt></dt>    <dd>Expiration year of the card. Format is YY. Example: 2013 = 13 [min value: 0, max value: 99] <strong>required </strong></dd>
-     *     <dt><tt>card.name</tt></dt>    <dd>Name as it appears on the card. [max length: 50, min length: 2] </dd>
-     *     <dt><tt>card.number</tt></dt>    <dd>Card number as it appears on the card. [max length: 19, min length: 13] <strong>required </strong></dd>
-     *     <dt><tt>currency</tt></dt>    <dd>Currency code (ISO-4217) for the transaction. Must match the currency associated with your account. [default: USD] <strong>required </strong></dd>
-     *     <dt><tt>customer</tt></dt>    <dd>ID of customer. If specified, card on file of customer will be used. </dd>
-     *     <dt><tt>description</tt></dt>    <dd>Free form text field to be used as a description of the payment. This field is echoed back with the payment on any find or list operations. [max length: 1024] </dd>
-     *     <dt><tt>reference</tt></dt>    <dd>Custom reference field to be used with outside systems. </dd>
-     *     <dt><tt>replayId</tt></dt>    <dd>An identifier that can be sent to uniquely identify a payment request to facilitate retries due to I/O related issues. This identifier must be unique for your account (sandbox or live) across all of your payments. If supplied, we will check for a payment on your account that matches this identifier, and if one is found we will attempt to return an identical response of the original request. [max length: 50, min length: 1] </dd>
-     *     <dt><tt>statementDescription.name</tt></dt>    <dd>Merchant name <strong>required </strong></dd>
-     *     <dt><tt>statementDescription.phoneNumber</tt></dt>    <dd>Merchant contact phone number. </dd>
-     *     <dt><tt>token</tt></dt>    <dd>If specified, card associated with card token will be used. [max length: 255] </dd></dl>
-     * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.<i/>
-     * @return    Authorization a Authorization object.
-     */
-    static public function createAuthorization($hash, $authentication = null) {
+	/**
+	 * Creates an Simplify_Authorization object
+	 * @param     array $hash a map of parameters; valid keys are:<dl style="padding-left:10px;">
+	 *     <dt><tt>amount</tt></dt>    <dd>Amount of the payment (in the smallest unit of your currency). Example: 100 = $1.00USD <strong>required </strong></dd>
+	 *     <dt><tt>card.addressCity</tt></dt>    <dd>City of the cardholder. [max length: 50, min length: 2] </dd>
+	 *     <dt><tt>card.addressCountry</tt></dt>    <dd>Country code (ISO-3166-1-alpha-2 code) of residence of the cardholder. [max length: 2, min length: 2] </dd>
+	 *     <dt><tt>card.addressLine1</tt></dt>    <dd>Address of the cardholder. [max length: 255] </dd>
+	 *     <dt><tt>card.addressLine2</tt></dt>    <dd>Address of the cardholder if needed. [max length: 255] </dd>
+	 *     <dt><tt>card.addressState</tt></dt>    <dd>State of residence of the cardholder. For the US, this is a 2-digit USPS code. [max length: 255, min length: 2] </dd>
+	 *     <dt><tt>card.addressZip</tt></dt>    <dd>Postal code of the cardholder. The postal code size is between 5 and 9 characters in length and only contains numbers or letters. [max length: 9, min length: 3] </dd>
+	 *     <dt><tt>card.cvc</tt></dt>    <dd>CVC security code of the card. This is the code on the back of the card. Example: 123 </dd>
+	 *     <dt><tt>card.expMonth</tt></dt>    <dd>Expiration month of the card. Format is MM. Example: January = 01 [min value: 1, max value: 12] <strong>required </strong></dd>
+	 *     <dt><tt>card.expYear</tt></dt>    <dd>Expiration year of the card. Format is YY. Example: 2013 = 13 [min value: 0, max value: 99] <strong>required </strong></dd>
+	 *     <dt><tt>card.name</tt></dt>    <dd>Name as it appears on the card. [max length: 50, min length: 2] </dd>
+	 *     <dt><tt>card.number</tt></dt>    <dd>Card number as it appears on the card. [max length: 19, min length: 13] <strong>required </strong></dd>
+	 *     <dt><tt>currency</tt></dt>    <dd>Currency code (ISO-4217) for the transaction. Must match the currency associated with your account. [default: USD] <strong>required </strong></dd>
+	 *     <dt><tt>customer</tt></dt>    <dd>ID of customer. If specified, card on file of customer will be used. </dd>
+	 *     <dt><tt>description</tt></dt>    <dd>Free form text field to be used as a description of the payment. This field is echoed back with the payment on any find or list operations. [max length: 1024] </dd>
+	 *     <dt><tt>reference</tt></dt>    <dd>Custom reference field to be used with outside systems. </dd>
+	 *     <dt><tt>replayId</tt></dt>    <dd>An identifier that can be sent to uniquely identify a payment request to facilitate retries due to I/O related issues. This identifier must be unique for your account (sandbox or live) across all of your payments. If supplied, we will check for a payment on your account that matches this identifier, and if one is found we will attempt to return an identical response of the original request. [max length: 50, min length: 1] </dd>
+	 *     <dt><tt>statementDescription.name</tt></dt>    <dd>Merchant name <strong>required </strong></dd>
+	 *     <dt><tt>statementDescription.phoneNumber</tt></dt>    <dd>Merchant contact phone number. </dd>
+	 *     <dt><tt>token</tt></dt>    <dd>If specified, card associated with card token will be used. [max length: 255] </dd></dl>
+	 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.<i/>
+	 * @return    Authorization a Authorization object.
+	 */
+	static public function createAuthorization($hash, $authentication = null) {
 
-        $args = func_get_args();
-        $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+		$args = func_get_args();
+		$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-        $instance = new Simplify_Authorization();
-        $instance->setAll($hash);
+		$instance = new Simplify_Authorization();
+		$instance->setAll($hash);
 
-        $object = Simplify_PaymentsApi::createObject($instance, $authentication);
-        return $object;
-    }
+		$object = Simplify_PaymentsApi::createObject($instance, $authentication);
+		return $object;
+	}
 
 
 
 
-       /**
-        * Deletes an Simplify_Authorization object.
-        *
-        * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-        */
-        public function deleteAuthorization($authentication = null) {
+	   /**
+		* Deletes an Simplify_Authorization object.
+		*
+		* @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		*/
+		public function deleteAuthorization($authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
 
-            $obj = Simplify_PaymentsApi::deleteObject($this, $authentication);
-            $this->properties = null;
-            return true;
-        }
+			$obj = Simplify_PaymentsApi::deleteObject($this, $authentication);
+			$this->properties = null;
+			return true;
+		}
 
 
-       /**
-        * Retrieve Simplify_Authorization objects.
-        * @param     array criteria a map of parameters; valid keys are:<dl style="padding-left:10px;">
-        *     <dt><tt>filter</tt></dt>    <dd>Filters to apply to the list.  </dd>
-        *     <dt><tt>max</tt></dt>    <dd>Allows up to a max of 50 list items to return. [min value: 0, max value: 50, default: 20]  </dd>
-        *     <dt><tt>offset</tt></dt>    <dd>Used in pagination of the list. This is the start offset of the page. [min value: 0, default: 0]  </dd>
-        *     <dt><tt>sorting</tt></dt>    <dd>Allows for ascending or descending sorting of the list.  The value maps properties to the sort direction (either <tt>asc</tt> for ascending or <tt>desc</tt> for descending).  Sortable properties are: <tt> dateCreated</tt><tt> amount</tt><tt> id</tt><tt> description</tt><tt> paymentDate</tt>.</dd></dl>
-        * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-        * @return    ResourceList a ResourceList object that holds the list of Authorization objects and the total
-        *            number of Authorization objects available for the given criteria.
-        * @see       ResourceList
-        */
-        static public function listAuthorization($criteria = null, $authentication = null) {
+	   /**
+		* Retrieve Simplify_Authorization objects.
+		* @param     array criteria a map of parameters; valid keys are:<dl style="padding-left:10px;">
+		*     <dt><tt>filter</tt></dt>    <dd>Filters to apply to the list.  </dd>
+		*     <dt><tt>max</tt></dt>    <dd>Allows up to a max of 50 list items to return. [min value: 0, max value: 50, default: 20]  </dd>
+		*     <dt><tt>offset</tt></dt>    <dd>Used in pagination of the list. This is the start offset of the page. [min value: 0, default: 0]  </dd>
+		*     <dt><tt>sorting</tt></dt>    <dd>Allows for ascending or descending sorting of the list.  The value maps properties to the sort direction (either <tt>asc</tt> for ascending or <tt>desc</tt> for descending).  Sortable properties are: <tt> dateCreated</tt><tt> amount</tt><tt> id</tt><tt> description</tt><tt> paymentDate</tt>.</dd></dl>
+		* @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		* @return    ResourceList a ResourceList object that holds the list of Authorization objects and the total
+		*            number of Authorization objects available for the given criteria.
+		* @see       ResourceList
+		*/
+		static public function listAuthorization($criteria = null, $authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-            $val = new Simplify_Authorization();
-            $list = Simplify_PaymentsApi::listObject($val, $criteria, $authentication);
+			$val = new Simplify_Authorization();
+			$list = Simplify_PaymentsApi::listObject($val, $criteria, $authentication);
 
-            return $list;
-        }
+			return $list;
+		}
 
 
-        /**
-         * Retrieve a Simplify_Authorization object from the API
-         *
-         * @param     string id  the id of the Authorization object to retrieve
-         * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-         * @return    Authorization a Authorization object
-         */
-        static public function findAuthorization($id, $authentication = null) {
+		/**
+		 * Retrieve a Simplify_Authorization object from the API
+		 *
+		 * @param     string id  the id of the Authorization object to retrieve
+		 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		 * @return    Authorization a Authorization object
+		 */
+		static public function findAuthorization($id, $authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-            $val = new Simplify_Authorization();
-            $val->id = $id;
+			$val = new Simplify_Authorization();
+			$val->id = $id;
 
-            $obj = Simplify_PaymentsApi::findObject($val, $authentication);
+			$obj = Simplify_PaymentsApi::findObject($val, $authentication);
 
-            return $obj;
-        }
+			return $obj;
+		}
 
-    /**
-     * @ignore
-     */
-    public function getClazz() {
-        return "Authorization";
-    }
-}
\ No newline at end of file
+	/**
+	 * @ignore
+	 */
+	public function getClazz() {
+		return "Authorization";
+	}
+}
diff --git a/includes/gateways/simplify-commerce/includes/Simplify/CardToken.php b/includes/gateways/simplify-commerce/includes/Simplify/CardToken.php
index 4661405e2b3..dfdf681995c 100644
--- a/includes/gateways/simplify-commerce/includes/Simplify/CardToken.php
+++ b/includes/gateways/simplify-commerce/includes/Simplify/CardToken.php
@@ -2,89 +2,89 @@
 /*
  * Copyright (c) 2013 - 2015 MasterCard International Incorporated
  * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are 
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of
  * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of 
- * conditions and the following disclaimer in the documentation and/or other materials 
+ * Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials
  * provided with the distribution.
- * Neither the name of the MasterCard International Incorporated nor the names of its 
- * contributors may be used to endorse or promote products derived from this software 
+ * Neither the name of the MasterCard International Incorporated nor the names of its
+ * contributors may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
- * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 
 class Simplify_CardToken extends Simplify_Object {
-    /**
-     * Creates an Simplify_CardToken object
-     * @param     array $hash a map of parameters; valid keys are:<dl style="padding-left:10px;">
-     *     <dt><tt>callback</tt></dt>    <dd>The URL callback for the cardtoken </dd>
-     *     <dt><tt>card.addressCity</tt></dt>    <dd>City of the cardholder. [max length: 50, min length: 2] </dd>
-     *     <dt><tt>card.addressCountry</tt></dt>    <dd>Country code (ISO-3166-1-alpha-2 code) of residence of the cardholder. [max length: 2, min length: 2] </dd>
-     *     <dt><tt>card.addressLine1</tt></dt>    <dd>Address of the cardholder. [max length: 255] </dd>
-     *     <dt><tt>card.addressLine2</tt></dt>    <dd>Address of the cardholder if needed. [max length: 255] </dd>
-     *     <dt><tt>card.addressState</tt></dt>    <dd>State of residence of the cardholder. For the US, this is a 2-digit USPS code. [max length: 255, min length: 2] </dd>
-     *     <dt><tt>card.addressZip</tt></dt>    <dd>Postal code of the cardholder. The postal code size is between 5 and 9 in length and only contain numbers or letters. [max length: 9, min length: 3] </dd>
-     *     <dt><tt>card.cvc</tt></dt>    <dd>CVC security code of the card. This is the code on the back of the card. Example: 123 </dd>
-     *     <dt><tt>card.expMonth</tt></dt>    <dd>Expiration month of the card. Format is MM. Example: January = 01 [min value: 1, max value: 12] <strong>required </strong></dd>
-     *     <dt><tt>card.expYear</tt></dt>    <dd>Expiration year of the card. Format is YY. Example: 2013 = 13 [min value: 0, max value: 99] <strong>required </strong></dd>
-     *     <dt><tt>card.name</tt></dt>    <dd>Name as appears on the card. [max length: 50, min length: 2] </dd>
-     *     <dt><tt>card.number</tt></dt>    <dd>Card number as it appears on the card. [max length: 19, min length: 13] <strong>required </strong></dd>
-     *     <dt><tt>key</tt></dt>    <dd>Key used to create the card token. </dd></dl>
-     * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.<i/>
-     * @return    CardToken a CardToken object.
-     */
-    static public function createCardToken($hash, $authentication = null) {
+	/**
+	 * Creates an Simplify_CardToken object
+	 * @param     array $hash a map of parameters; valid keys are:<dl style="padding-left:10px;">
+	 *     <dt><tt>callback</tt></dt>    <dd>The URL callback for the cardtoken </dd>
+	 *     <dt><tt>card.addressCity</tt></dt>    <dd>City of the cardholder. [max length: 50, min length: 2] </dd>
+	 *     <dt><tt>card.addressCountry</tt></dt>    <dd>Country code (ISO-3166-1-alpha-2 code) of residence of the cardholder. [max length: 2, min length: 2] </dd>
+	 *     <dt><tt>card.addressLine1</tt></dt>    <dd>Address of the cardholder. [max length: 255] </dd>
+	 *     <dt><tt>card.addressLine2</tt></dt>    <dd>Address of the cardholder if needed. [max length: 255] </dd>
+	 *     <dt><tt>card.addressState</tt></dt>    <dd>State of residence of the cardholder. For the US, this is a 2-digit USPS code. [max length: 255, min length: 2] </dd>
+	 *     <dt><tt>card.addressZip</tt></dt>    <dd>Postal code of the cardholder. The postal code size is between 5 and 9 in length and only contain numbers or letters. [max length: 9, min length: 3] </dd>
+	 *     <dt><tt>card.cvc</tt></dt>    <dd>CVC security code of the card. This is the code on the back of the card. Example: 123 </dd>
+	 *     <dt><tt>card.expMonth</tt></dt>    <dd>Expiration month of the card. Format is MM. Example: January = 01 [min value: 1, max value: 12] <strong>required </strong></dd>
+	 *     <dt><tt>card.expYear</tt></dt>    <dd>Expiration year of the card. Format is YY. Example: 2013 = 13 [min value: 0, max value: 99] <strong>required </strong></dd>
+	 *     <dt><tt>card.name</tt></dt>    <dd>Name as appears on the card. [max length: 50, min length: 2] </dd>
+	 *     <dt><tt>card.number</tt></dt>    <dd>Card number as it appears on the card. [max length: 19, min length: 13] <strong>required </strong></dd>
+	 *     <dt><tt>key</tt></dt>    <dd>Key used to create the card token. </dd></dl>
+	 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.<i/>
+	 * @return    CardToken a CardToken object.
+	 */
+	static public function createCardToken($hash, $authentication = null) {
 
-        $args = func_get_args();
-        $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+		$args = func_get_args();
+		$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-        $instance = new Simplify_CardToken();
-        $instance->setAll($hash);
+		$instance = new Simplify_CardToken();
+		$instance->setAll($hash);
 
-        $object = Simplify_PaymentsApi::createObject($instance, $authentication);
-        return $object;
-    }
+		$object = Simplify_PaymentsApi::createObject($instance, $authentication);
+		return $object;
+	}
 
 
 
-        /**
-         * Retrieve a Simplify_CardToken object from the API
-         *
-         * @param     string id  the id of the CardToken object to retrieve
-         * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-         * @return    CardToken a CardToken object
-         */
-        static public function findCardToken($id, $authentication = null) {
+		/**
+		 * Retrieve a Simplify_CardToken object from the API
+		 *
+		 * @param     string id  the id of the CardToken object to retrieve
+		 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		 * @return    CardToken a CardToken object
+		 */
+		static public function findCardToken($id, $authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-            $val = new Simplify_CardToken();
-            $val->id = $id;
+			$val = new Simplify_CardToken();
+			$val->id = $id;
 
-            $obj = Simplify_PaymentsApi::findObject($val, $authentication);
+			$obj = Simplify_PaymentsApi::findObject($val, $authentication);
 
-            return $obj;
-        }
+			return $obj;
+		}
 
-    /**
-     * @ignore
-     */
-    public function getClazz() {
-        return "CardToken";
-    }
-}
\ No newline at end of file
+	/**
+	 * @ignore
+	 */
+	public function getClazz() {
+		return "CardToken";
+	}
+}
diff --git a/includes/gateways/simplify-commerce/includes/Simplify/Chargeback.php b/includes/gateways/simplify-commerce/includes/Simplify/Chargeback.php
index 361fb10c5b5..b9ead82de39 100644
--- a/includes/gateways/simplify-commerce/includes/Simplify/Chargeback.php
+++ b/includes/gateways/simplify-commerce/includes/Simplify/Chargeback.php
@@ -2,81 +2,81 @@
 /*
  * Copyright (c) 2013 - 2015 MasterCard International Incorporated
  * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are 
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of
  * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of 
- * conditions and the following disclaimer in the documentation and/or other materials 
+ * Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials
  * provided with the distribution.
- * Neither the name of the MasterCard International Incorporated nor the names of its 
- * contributors may be used to endorse or promote products derived from this software 
+ * Neither the name of the MasterCard International Incorporated nor the names of its
+ * contributors may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
- * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 
 class Simplify_Chargeback extends Simplify_Object {
 
-       /**
-        * Retrieve Simplify_Chargeback objects.
-        * @param     array criteria a map of parameters; valid keys are:<dl style="padding-left:10px;">
-        *     <dt><tt>filter</tt></dt>    <dd>Filters to apply to the list.  </dd>
-        *     <dt><tt>max</tt></dt>    <dd>Allows up to a max of 50 list items to return. [min value: 0, max value: 50, default: 20]  </dd>
-        *     <dt><tt>offset</tt></dt>    <dd>Used in paging of the list.  This is the start offset of the page. [min value: 0, default: 0]  </dd>
-        *     <dt><tt>sorting</tt></dt>    <dd>Allows for ascending or descending sorting of the list.  The value maps properties to the sort direction (either <tt>asc</tt> for ascending or <tt>desc</tt> for descending).  Sortable properties are: <tt> id</tt><tt> amount</tt><tt> description</tt><tt> dateCreated</tt>.</dd></dl>
-        * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-        * @return    ResourceList a ResourceList object that holds the list of Chargeback objects and the total
-        *            number of Chargeback objects available for the given criteria.
-        * @see       ResourceList
-        */
-        static public function listChargeback($criteria = null, $authentication = null) {
+	   /**
+		* Retrieve Simplify_Chargeback objects.
+		* @param     array criteria a map of parameters; valid keys are:<dl style="padding-left:10px;">
+		*     <dt><tt>filter</tt></dt>    <dd>Filters to apply to the list.  </dd>
+		*     <dt><tt>max</tt></dt>    <dd>Allows up to a max of 50 list items to return. [min value: 0, max value: 50, default: 20]  </dd>
+		*     <dt><tt>offset</tt></dt>    <dd>Used in paging of the list.  This is the start offset of the page. [min value: 0, default: 0]  </dd>
+		*     <dt><tt>sorting</tt></dt>    <dd>Allows for ascending or descending sorting of the list.  The value maps properties to the sort direction (either <tt>asc</tt> for ascending or <tt>desc</tt> for descending).  Sortable properties are: <tt> id</tt><tt> amount</tt><tt> description</tt><tt> dateCreated</tt>.</dd></dl>
+		* @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		* @return    ResourceList a ResourceList object that holds the list of Chargeback objects and the total
+		*            number of Chargeback objects available for the given criteria.
+		* @see       ResourceList
+		*/
+		static public function listChargeback($criteria = null, $authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-            $val = new Simplify_Chargeback();
-            $list = Simplify_PaymentsApi::listObject($val, $criteria, $authentication);
+			$val = new Simplify_Chargeback();
+			$list = Simplify_PaymentsApi::listObject($val, $criteria, $authentication);
 
-            return $list;
-        }
+			return $list;
+		}
 
 
-        /**
-         * Retrieve a Simplify_Chargeback object from the API
-         *
-         * @param     string id  the id of the Chargeback object to retrieve
-         * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-         * @return    Chargeback a Chargeback object
-         */
-        static public function findChargeback($id, $authentication = null) {
+		/**
+		 * Retrieve a Simplify_Chargeback object from the API
+		 *
+		 * @param     string id  the id of the Chargeback object to retrieve
+		 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		 * @return    Chargeback a Chargeback object
+		 */
+		static public function findChargeback($id, $authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-            $val = new Simplify_Chargeback();
-            $val->id = $id;
+			$val = new Simplify_Chargeback();
+			$val->id = $id;
 
-            $obj = Simplify_PaymentsApi::findObject($val, $authentication);
+			$obj = Simplify_PaymentsApi::findObject($val, $authentication);
 
-            return $obj;
-        }
+			return $obj;
+		}
 
-    /**
-     * @ignore
-     */
-    public function getClazz() {
-        return "Chargeback";
-    }
-}
\ No newline at end of file
+	/**
+	 * @ignore
+	 */
+	public function getClazz() {
+		return "Chargeback";
+	}
+}
diff --git a/includes/gateways/simplify-commerce/includes/Simplify/Constants.php b/includes/gateways/simplify-commerce/includes/Simplify/Constants.php
index 900bf4a5c35..e24a838160a 100644
--- a/includes/gateways/simplify-commerce/includes/Simplify/Constants.php
+++ b/includes/gateways/simplify-commerce/includes/Simplify/Constants.php
@@ -32,23 +32,23 @@
  */
 class Simplify_Constants
 {
-    /**
-     * @var string VERSION SDK version information.
-     */
-    const VERSION = '1.2.0';
+	/**
+	 * @var string VERSION SDK version information.
+	 */
+	const VERSION = '1.2.0';
 
-    /**
-     * @var string API_BASE_LIVE_URL URL for the live API endpoint
-     */
-    const API_BASE_LIVE_URL = 'https://api.simplify.com/v1/api';
+	/**
+	 * @var string API_BASE_LIVE_URL URL for the live API endpoint
+	 */
+	const API_BASE_LIVE_URL = 'https://api.simplify.com/v1/api';
 
-    /**
-     * @var string API_BASE_SANDBOX_URL URL for the sandbox API endpoint
-     */
-    const API_BASE_SANDBOX_URL = 'https://sandbox.simplify.com/v1/api';
+	/**
+	 * @var string API_BASE_SANDBOX_URL URL for the sandbox API endpoint
+	 */
+	const API_BASE_SANDBOX_URL = 'https://sandbox.simplify.com/v1/api';
 
-    /**
-     * @var string OAUTH_BASE_URL URL for the oauth enpoint
-     */
-    const OAUTH_BASE_URL = 'https://www.simplify.com/commerce/oauth';
+	/**
+	 * @var string OAUTH_BASE_URL URL for the oauth enpoint
+	 */
+	const OAUTH_BASE_URL = 'https://www.simplify.com/commerce/oauth';
 }
diff --git a/includes/gateways/simplify-commerce/includes/Simplify/Coupon.php b/includes/gateways/simplify-commerce/includes/Simplify/Coupon.php
index 295ba13fc31..f99198599fc 100644
--- a/includes/gateways/simplify-commerce/includes/Simplify/Coupon.php
+++ b/includes/gateways/simplify-commerce/includes/Simplify/Coupon.php
@@ -2,146 +2,146 @@
 /*
  * Copyright (c) 2013 - 2015 MasterCard International Incorporated
  * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are 
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of
  * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of 
- * conditions and the following disclaimer in the documentation and/or other materials 
+ * Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials
  * provided with the distribution.
- * Neither the name of the MasterCard International Incorporated nor the names of its 
- * contributors may be used to endorse or promote products derived from this software 
+ * Neither the name of the MasterCard International Incorporated nor the names of its
+ * contributors may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
- * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 
 class Simplify_Coupon extends Simplify_Object {
-    /**
-     * Creates an Simplify_Coupon object
-     * @param     array $hash a map of parameters; valid keys are:<dl style="padding-left:10px;">
-     *     <dt><tt>amountOff</tt></dt>    <dd>Amount off of the price of the product in the smallest units of the currency of the merchant. While this field is optional, you must provide either amountOff or percentOff for a coupon. Example: 100 = $1.00USD [min value: 1] </dd>
-     *     <dt><tt>couponCode</tt></dt>    <dd>Code that identifies the coupon to be used. [min length: 2] <strong>required </strong></dd>
-     *     <dt><tt>description</tt></dt>    <dd>A brief section that describes the coupon. </dd>
-     *     <dt><tt>durationInMonths</tt></dt>    <dd>DEPRECATED - Duration in months that the coupon will be applied after it has first been selected. [min value: 1, max value: 9999] </dd>
-     *     <dt><tt>endDate</tt></dt>    <dd>Last date of the coupon in UTC millis that the coupon can be applied to a subscription. This ends at 23:59:59 of the merchant timezone. </dd>
-     *     <dt><tt>maxRedemptions</tt></dt>    <dd>Maximum number of redemptions allowed for the coupon. A redemption is defined as when the coupon is applied to the subscription for the first time. [min value: 1] </dd>
-     *     <dt><tt>numTimesApplied</tt></dt>    <dd>The number of times a coupon will be applied on a customer's subscription. [min value: 1, max value: 9999] </dd>
-     *     <dt><tt>percentOff</tt></dt>    <dd>Percentage off of the price of the product. While this field is optional, you must provide either amountOff or percentOff for a coupon. The percent off is a whole number. [min value: 1, max value: 100] </dd>
-     *     <dt><tt>startDate</tt></dt>    <dd>First date of the coupon in UTC millis that the coupon can be applied to a subscription. This starts at midnight of the merchant timezone. <strong>required </strong></dd></dl>
-     * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.<i/>
-     * @return    Coupon a Coupon object.
-     */
-    static public function createCoupon($hash, $authentication = null) {
+	/**
+	 * Creates an Simplify_Coupon object
+	 * @param     array $hash a map of parameters; valid keys are:<dl style="padding-left:10px;">
+	 *     <dt><tt>amountOff</tt></dt>    <dd>Amount off of the price of the product in the smallest units of the currency of the merchant. While this field is optional, you must provide either amountOff or percentOff for a coupon. Example: 100 = $1.00USD [min value: 1] </dd>
+	 *     <dt><tt>couponCode</tt></dt>    <dd>Code that identifies the coupon to be used. [min length: 2] <strong>required </strong></dd>
+	 *     <dt><tt>description</tt></dt>    <dd>A brief section that describes the coupon. </dd>
+	 *     <dt><tt>durationInMonths</tt></dt>    <dd>DEPRECATED - Duration in months that the coupon will be applied after it has first been selected. [min value: 1, max value: 9999] </dd>
+	 *     <dt><tt>endDate</tt></dt>    <dd>Last date of the coupon in UTC millis that the coupon can be applied to a subscription. This ends at 23:59:59 of the merchant timezone. </dd>
+	 *     <dt><tt>maxRedemptions</tt></dt>    <dd>Maximum number of redemptions allowed for the coupon. A redemption is defined as when the coupon is applied to the subscription for the first time. [min value: 1] </dd>
+	 *     <dt><tt>numTimesApplied</tt></dt>    <dd>The number of times a coupon will be applied on a customer's subscription. [min value: 1, max value: 9999] </dd>
+	 *     <dt><tt>percentOff</tt></dt>    <dd>Percentage off of the price of the product. While this field is optional, you must provide either amountOff or percentOff for a coupon. The percent off is a whole number. [min value: 1, max value: 100] </dd>
+	 *     <dt><tt>startDate</tt></dt>    <dd>First date of the coupon in UTC millis that the coupon can be applied to a subscription. This starts at midnight of the merchant timezone. <strong>required </strong></dd></dl>
+	 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.<i/>
+	 * @return    Coupon a Coupon object.
+	 */
+	static public function createCoupon($hash, $authentication = null) {
 
-        $args = func_get_args();
-        $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+		$args = func_get_args();
+		$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-        $instance = new Simplify_Coupon();
-        $instance->setAll($hash);
+		$instance = new Simplify_Coupon();
+		$instance->setAll($hash);
 
-        $object = Simplify_PaymentsApi::createObject($instance, $authentication);
-        return $object;
-    }
+		$object = Simplify_PaymentsApi::createObject($instance, $authentication);
+		return $object;
+	}
 
 
 
 
-       /**
-        * Deletes an Simplify_Coupon object.
-        *
-        * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-        */
-        public function deleteCoupon($authentication = null) {
+	   /**
+		* Deletes an Simplify_Coupon object.
+		*
+		* @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		*/
+		public function deleteCoupon($authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
 
-            $obj = Simplify_PaymentsApi::deleteObject($this, $authentication);
-            $this->properties = null;
-            return true;
-        }
+			$obj = Simplify_PaymentsApi::deleteObject($this, $authentication);
+			$this->properties = null;
+			return true;
+		}
 
 
-       /**
-        * Retrieve Simplify_Coupon objects.
-        * @param     array criteria a map of parameters; valid keys are:<dl style="padding-left:10px;">
-        *     <dt><tt>filter</tt></dt>    <dd>Filters to apply to the list.  </dd>
-        *     <dt><tt>max</tt></dt>    <dd>Allows up to a max of 50 list items to return. [min value: 0, max value: 50, default: 20]  </dd>
-        *     <dt><tt>offset</tt></dt>    <dd>Used in paging of the list.  This is the start offset of the page. [min value: 0, default: 0]  </dd>
-        *     <dt><tt>sorting</tt></dt>    <dd>Allows for ascending or descending sorting of the list.  The value maps properties to the sort direction (either <tt>asc</tt> for ascending or <tt>desc</tt> for descending).  Sortable properties are: <tt> dateCreated</tt><tt> maxRedemptions</tt><tt> timesRedeemed</tt><tt> id</tt><tt> startDate</tt><tt> endDate</tt><tt> percentOff</tt><tt> couponCode</tt><tt> durationInMonths</tt><tt> numTimesApplied</tt><tt> amountOff</tt>.</dd></dl>
-        * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-        * @return    ResourceList a ResourceList object that holds the list of Coupon objects and the total
-        *            number of Coupon objects available for the given criteria.
-        * @see       ResourceList
-        */
-        static public function listCoupon($criteria = null, $authentication = null) {
+	   /**
+		* Retrieve Simplify_Coupon objects.
+		* @param     array criteria a map of parameters; valid keys are:<dl style="padding-left:10px;">
+		*     <dt><tt>filter</tt></dt>    <dd>Filters to apply to the list.  </dd>
+		*     <dt><tt>max</tt></dt>    <dd>Allows up to a max of 50 list items to return. [min value: 0, max value: 50, default: 20]  </dd>
+		*     <dt><tt>offset</tt></dt>    <dd>Used in paging of the list.  This is the start offset of the page. [min value: 0, default: 0]  </dd>
+		*     <dt><tt>sorting</tt></dt>    <dd>Allows for ascending or descending sorting of the list.  The value maps properties to the sort direction (either <tt>asc</tt> for ascending or <tt>desc</tt> for descending).  Sortable properties are: <tt> dateCreated</tt><tt> maxRedemptions</tt><tt> timesRedeemed</tt><tt> id</tt><tt> startDate</tt><tt> endDate</tt><tt> percentOff</tt><tt> couponCode</tt><tt> durationInMonths</tt><tt> numTimesApplied</tt><tt> amountOff</tt>.</dd></dl>
+		* @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		* @return    ResourceList a ResourceList object that holds the list of Coupon objects and the total
+		*            number of Coupon objects available for the given criteria.
+		* @see       ResourceList
+		*/
+		static public function listCoupon($criteria = null, $authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-            $val = new Simplify_Coupon();
-            $list = Simplify_PaymentsApi::listObject($val, $criteria, $authentication);
+			$val = new Simplify_Coupon();
+			$list = Simplify_PaymentsApi::listObject($val, $criteria, $authentication);
 
-            return $list;
-        }
+			return $list;
+		}
 
 
-        /**
-         * Retrieve a Simplify_Coupon object from the API
-         *
-         * @param     string id  the id of the Coupon object to retrieve
-         * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-         * @return    Coupon a Coupon object
-         */
-        static public function findCoupon($id, $authentication = null) {
+		/**
+		 * Retrieve a Simplify_Coupon object from the API
+		 *
+		 * @param     string id  the id of the Coupon object to retrieve
+		 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		 * @return    Coupon a Coupon object
+		 */
+		static public function findCoupon($id, $authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-            $val = new Simplify_Coupon();
-            $val->id = $id;
+			$val = new Simplify_Coupon();
+			$val->id = $id;
 
-            $obj = Simplify_PaymentsApi::findObject($val, $authentication);
+			$obj = Simplify_PaymentsApi::findObject($val, $authentication);
 
-            return $obj;
-        }
+			return $obj;
+		}
 
 
-        /**
-         * Updates an Simplify_Coupon object.
-         *
-         * The properties that can be updated:
-         * <dl style="padding-left:10px;">
-         *     <dt><tt>endDate</tt></dt>    <dd>The ending date in UTC millis for the coupon. This must be after the starting date of the coupon. </dd>
-         *     <dt><tt>maxRedemptions</tt></dt>    <dd>Maximum number of redemptions allowed for the coupon. A redemption is defined as when the coupon is applied to the subscription for the first time. [min value: 1] </dd></dl>
-         * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-         * @return    Coupon a Coupon object.
-         */
-        public function updateCoupon($authentication = null)  {
+		/**
+		 * Updates an Simplify_Coupon object.
+		 *
+		 * The properties that can be updated:
+		 * <dl style="padding-left:10px;">
+		 *     <dt><tt>endDate</tt></dt>    <dd>The ending date in UTC millis for the coupon. This must be after the starting date of the coupon. </dd>
+		 *     <dt><tt>maxRedemptions</tt></dt>    <dd>Maximum number of redemptions allowed for the coupon. A redemption is defined as when the coupon is applied to the subscription for the first time. [min value: 1] </dd></dl>
+		 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		 * @return    Coupon a Coupon object.
+		 */
+		public function updateCoupon($authentication = null)  {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
 
-            $object = Simplify_PaymentsApi::updateObject($this, $authentication);
-            return $object;
-        }
+			$object = Simplify_PaymentsApi::updateObject($this, $authentication);
+			return $object;
+		}
 
-    /**
-     * @ignore
-     */
-    public function getClazz() {
-        return "Coupon";
-    }
-}
\ No newline at end of file
+	/**
+	 * @ignore
+	 */
+	public function getClazz() {
+		return "Coupon";
+	}
+}
diff --git a/includes/gateways/simplify-commerce/includes/Simplify/Customer.php b/includes/gateways/simplify-commerce/includes/Simplify/Customer.php
index 822929280a8..694ee744e43 100644
--- a/includes/gateways/simplify-commerce/includes/Simplify/Customer.php
+++ b/includes/gateways/simplify-commerce/includes/Simplify/Customer.php
@@ -2,179 +2,179 @@
 /*
  * Copyright (c) 2013 - 2015 MasterCard International Incorporated
  * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are 
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of
  * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of 
- * conditions and the following disclaimer in the documentation and/or other materials 
+ * Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials
  * provided with the distribution.
- * Neither the name of the MasterCard International Incorporated nor the names of its 
- * contributors may be used to endorse or promote products derived from this software 
+ * Neither the name of the MasterCard International Incorporated nor the names of its
+ * contributors may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
- * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 
 class Simplify_Customer extends Simplify_Object {
-    /**
-     * Creates an Simplify_Customer object
-     * @param     array $hash a map of parameters; valid keys are:<dl style="padding-left:10px;">
-     *     <dt><tt>card.addressCity</tt></dt>    <dd>City of the cardholder. <strong>required </strong></dd>
-     *     <dt><tt>card.addressCountry</tt></dt>    <dd>Country code (ISO-3166-1-alpha-2 code) of residence of the cardholder. <strong>required </strong></dd>
-     *     <dt><tt>card.addressLine1</tt></dt>    <dd>Address of the cardholder <strong>required </strong></dd>
-     *     <dt><tt>card.addressLine2</tt></dt>    <dd>Address of the cardholder if needed. <strong>required </strong></dd>
-     *     <dt><tt>card.addressState</tt></dt>    <dd>State of residence of the cardholder. For the US, this is a 2-digit USPS code. <strong>required </strong></dd>
-     *     <dt><tt>card.addressZip</tt></dt>    <dd>Postal code of the cardholder. The postal code size is between 5 and 9 in length and only contain numbers or letters. <strong>required </strong></dd>
-     *     <dt><tt>card.cvc</tt></dt>    <dd>CVC security code of the card. This is the code on the back of the card. Example: 123 <strong>required </strong></dd>
-     *     <dt><tt>card.expMonth</tt></dt>    <dd>Expiration month of the card. Format is MM. Example: January = 01 <strong>required </strong></dd>
-     *     <dt><tt>card.expYear</tt></dt>    <dd>Expiration year of the card. Format is YY. Example: 2013 = 13 <strong>required </strong></dd>
-     *     <dt><tt>card.id</tt></dt>    <dd>ID of card. Unused during customer create. </dd>
-     *     <dt><tt>card.name</tt></dt>    <dd>Name as appears on the card. <strong>required </strong></dd>
-     *     <dt><tt>card.number</tt></dt>    <dd>Card number as it appears on the card. [max length: 19, min length: 13] </dd>
-     *     <dt><tt>email</tt></dt>    <dd>Email address of the customer <strong>required </strong></dd>
-     *     <dt><tt>name</tt></dt>    <dd>Customer name [min length: 2] <strong>required </strong></dd>
-     *     <dt><tt>reference</tt></dt>    <dd>Reference field for external applications use. </dd>
-     *     <dt><tt>subscriptions.amount</tt></dt>    <dd>Amount of payment in the smallest unit of your currency. Example: 100 = $1.00USD </dd>
-     *     <dt><tt>subscriptions.billingCycle</tt></dt>    <dd>How the plan is billed to the customer. Values must be AUTO (indefinitely until the customer cancels) or FIXED (a fixed number of billing cycles). [default: AUTO] </dd>
-     *     <dt><tt>subscriptions.billingCycleLimit</tt></dt>    <dd>The number of fixed billing cycles for a plan. Only used if the billingCycle parameter is set to FIXED. Example: 4 </dd>
-     *     <dt><tt>subscriptions.coupon</tt></dt>    <dd>Coupon associated with the subscription for the customer. </dd>
-     *     <dt><tt>subscriptions.currency</tt></dt>    <dd>Currency code (ISO-4217). Must match the currency associated with your account. [default: USD] </dd>
-     *     <dt><tt>subscriptions.customer</tt></dt>    <dd>The customer ID to create the subscription for. Do not supply this when creating a customer. </dd>
-     *     <dt><tt>subscriptions.frequency</tt></dt>    <dd>Frequency of payment for the plan. Used in conjunction with frequencyPeriod. Valid values are "DAILY", "WEEKLY", "MONTHLY" and "YEARLY". </dd>
-     *     <dt><tt>subscriptions.frequencyPeriod</tt></dt>    <dd>Period of frequency of payment for the plan. Example: if the frequency is weekly, and periodFrequency is 2, then the subscription is billed bi-weekly. </dd>
-     *     <dt><tt>subscriptions.name</tt></dt>    <dd>Name describing subscription </dd>
-     *     <dt><tt>subscriptions.plan</tt></dt>    <dd>The plan ID that the subscription should be created from. </dd>
-     *     <dt><tt>subscriptions.quantity</tt></dt>    <dd>Quantity of the plan for the subscription. [min value: 1] </dd>
-     *     <dt><tt>subscriptions.renewalReminderLeadDays</tt></dt>    <dd>If set, how many days before the next billing cycle that a renewal reminder is sent to the customer. If null, then no emails are sent. Minimum value is 7 if set. </dd>
-     *     <dt><tt>token</tt></dt>    <dd>If specified, card associated with card token will be used </dd></dl>
-     * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.<i/>
-     * @return    Customer a Customer object.
-     */
-    static public function createCustomer($hash, $authentication = null) {
+	/**
+	 * Creates an Simplify_Customer object
+	 * @param     array $hash a map of parameters; valid keys are:<dl style="padding-left:10px;">
+	 *     <dt><tt>card.addressCity</tt></dt>    <dd>City of the cardholder. <strong>required </strong></dd>
+	 *     <dt><tt>card.addressCountry</tt></dt>    <dd>Country code (ISO-3166-1-alpha-2 code) of residence of the cardholder. <strong>required </strong></dd>
+	 *     <dt><tt>card.addressLine1</tt></dt>    <dd>Address of the cardholder <strong>required </strong></dd>
+	 *     <dt><tt>card.addressLine2</tt></dt>    <dd>Address of the cardholder if needed. <strong>required </strong></dd>
+	 *     <dt><tt>card.addressState</tt></dt>    <dd>State of residence of the cardholder. For the US, this is a 2-digit USPS code. <strong>required </strong></dd>
+	 *     <dt><tt>card.addressZip</tt></dt>    <dd>Postal code of the cardholder. The postal code size is between 5 and 9 in length and only contain numbers or letters. <strong>required </strong></dd>
+	 *     <dt><tt>card.cvc</tt></dt>    <dd>CVC security code of the card. This is the code on the back of the card. Example: 123 <strong>required </strong></dd>
+	 *     <dt><tt>card.expMonth</tt></dt>    <dd>Expiration month of the card. Format is MM. Example: January = 01 <strong>required </strong></dd>
+	 *     <dt><tt>card.expYear</tt></dt>    <dd>Expiration year of the card. Format is YY. Example: 2013 = 13 <strong>required </strong></dd>
+	 *     <dt><tt>card.id</tt></dt>    <dd>ID of card. Unused during customer create. </dd>
+	 *     <dt><tt>card.name</tt></dt>    <dd>Name as appears on the card. <strong>required </strong></dd>
+	 *     <dt><tt>card.number</tt></dt>    <dd>Card number as it appears on the card. [max length: 19, min length: 13] </dd>
+	 *     <dt><tt>email</tt></dt>    <dd>Email address of the customer <strong>required </strong></dd>
+	 *     <dt><tt>name</tt></dt>    <dd>Customer name [min length: 2] <strong>required </strong></dd>
+	 *     <dt><tt>reference</tt></dt>    <dd>Reference field for external applications use. </dd>
+	 *     <dt><tt>subscriptions.amount</tt></dt>    <dd>Amount of payment in the smallest unit of your currency. Example: 100 = $1.00USD </dd>
+	 *     <dt><tt>subscriptions.billingCycle</tt></dt>    <dd>How the plan is billed to the customer. Values must be AUTO (indefinitely until the customer cancels) or FIXED (a fixed number of billing cycles). [default: AUTO] </dd>
+	 *     <dt><tt>subscriptions.billingCycleLimit</tt></dt>    <dd>The number of fixed billing cycles for a plan. Only used if the billingCycle parameter is set to FIXED. Example: 4 </dd>
+	 *     <dt><tt>subscriptions.coupon</tt></dt>    <dd>Coupon associated with the subscription for the customer. </dd>
+	 *     <dt><tt>subscriptions.currency</tt></dt>    <dd>Currency code (ISO-4217). Must match the currency associated with your account. [default: USD] </dd>
+	 *     <dt><tt>subscriptions.customer</tt></dt>    <dd>The customer ID to create the subscription for. Do not supply this when creating a customer. </dd>
+	 *     <dt><tt>subscriptions.frequency</tt></dt>    <dd>Frequency of payment for the plan. Used in conjunction with frequencyPeriod. Valid values are "DAILY", "WEEKLY", "MONTHLY" and "YEARLY". </dd>
+	 *     <dt><tt>subscriptions.frequencyPeriod</tt></dt>    <dd>Period of frequency of payment for the plan. Example: if the frequency is weekly, and periodFrequency is 2, then the subscription is billed bi-weekly. </dd>
+	 *     <dt><tt>subscriptions.name</tt></dt>    <dd>Name describing subscription </dd>
+	 *     <dt><tt>subscriptions.plan</tt></dt>    <dd>The plan ID that the subscription should be created from. </dd>
+	 *     <dt><tt>subscriptions.quantity</tt></dt>    <dd>Quantity of the plan for the subscription. [min value: 1] </dd>
+	 *     <dt><tt>subscriptions.renewalReminderLeadDays</tt></dt>    <dd>If set, how many days before the next billing cycle that a renewal reminder is sent to the customer. If null, then no emails are sent. Minimum value is 7 if set. </dd>
+	 *     <dt><tt>token</tt></dt>    <dd>If specified, card associated with card token will be used </dd></dl>
+	 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.<i/>
+	 * @return    Customer a Customer object.
+	 */
+	static public function createCustomer($hash, $authentication = null) {
 
-        $args = func_get_args();
-        $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+		$args = func_get_args();
+		$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-        $instance = new Simplify_Customer();
-        $instance->setAll($hash);
+		$instance = new Simplify_Customer();
+		$instance->setAll($hash);
 
-        $object = Simplify_PaymentsApi::createObject($instance, $authentication);
-        return $object;
-    }
+		$object = Simplify_PaymentsApi::createObject($instance, $authentication);
+		return $object;
+	}
 
 
 
 
-       /**
-        * Deletes an Simplify_Customer object.
-        *
-        * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-        */
-        public function deleteCustomer($authentication = null) {
+	   /**
+		* Deletes an Simplify_Customer object.
+		*
+		* @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		*/
+		public function deleteCustomer($authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
 
-            $obj = Simplify_PaymentsApi::deleteObject($this, $authentication);
-            $this->properties = null;
-            return true;
-        }
+			$obj = Simplify_PaymentsApi::deleteObject($this, $authentication);
+			$this->properties = null;
+			return true;
+		}
 
 
-       /**
-        * Retrieve Simplify_Customer objects.
-        * @param     array criteria a map of parameters; valid keys are:<dl style="padding-left:10px;">
-        *     <dt><tt>filter</tt></dt>    <dd>Filters to apply to the list.  </dd>
-        *     <dt><tt>max</tt></dt>    <dd>Allows up to a max of 50 list items to return. [min value: 0, max value: 50, default: 20]  </dd>
-        *     <dt><tt>offset</tt></dt>    <dd>Used in paging of the list.  This is the start offset of the page. [min value: 0, default: 0]  </dd>
-        *     <dt><tt>sorting</tt></dt>    <dd>Allows for ascending or descending sorting of the list.  The value maps properties to the sort direction (either <tt>asc</tt> for ascending or <tt>desc</tt> for descending).  Sortable properties are: <tt> dateCreated</tt><tt> id</tt><tt> name</tt><tt> email</tt><tt> reference</tt>.</dd></dl>
-        * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-        * @return    ResourceList a ResourceList object that holds the list of Customer objects and the total
-        *            number of Customer objects available for the given criteria.
-        * @see       ResourceList
-        */
-        static public function listCustomer($criteria = null, $authentication = null) {
+	   /**
+		* Retrieve Simplify_Customer objects.
+		* @param     array criteria a map of parameters; valid keys are:<dl style="padding-left:10px;">
+		*     <dt><tt>filter</tt></dt>    <dd>Filters to apply to the list.  </dd>
+		*     <dt><tt>max</tt></dt>    <dd>Allows up to a max of 50 list items to return. [min value: 0, max value: 50, default: 20]  </dd>
+		*     <dt><tt>offset</tt></dt>    <dd>Used in paging of the list.  This is the start offset of the page. [min value: 0, default: 0]  </dd>
+		*     <dt><tt>sorting</tt></dt>    <dd>Allows for ascending or descending sorting of the list.  The value maps properties to the sort direction (either <tt>asc</tt> for ascending or <tt>desc</tt> for descending).  Sortable properties are: <tt> dateCreated</tt><tt> id</tt><tt> name</tt><tt> email</tt><tt> reference</tt>.</dd></dl>
+		* @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		* @return    ResourceList a ResourceList object that holds the list of Customer objects and the total
+		*            number of Customer objects available for the given criteria.
+		* @see       ResourceList
+		*/
+		static public function listCustomer($criteria = null, $authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-            $val = new Simplify_Customer();
-            $list = Simplify_PaymentsApi::listObject($val, $criteria, $authentication);
+			$val = new Simplify_Customer();
+			$list = Simplify_PaymentsApi::listObject($val, $criteria, $authentication);
 
-            return $list;
-        }
+			return $list;
+		}
 
 
-        /**
-         * Retrieve a Simplify_Customer object from the API
-         *
-         * @param     string id  the id of the Customer object to retrieve
-         * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-         * @return    Customer a Customer object
-         */
-        static public function findCustomer($id, $authentication = null) {
+		/**
+		 * Retrieve a Simplify_Customer object from the API
+		 *
+		 * @param     string id  the id of the Customer object to retrieve
+		 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		 * @return    Customer a Customer object
+		 */
+		static public function findCustomer($id, $authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-            $val = new Simplify_Customer();
-            $val->id = $id;
+			$val = new Simplify_Customer();
+			$val->id = $id;
 
-            $obj = Simplify_PaymentsApi::findObject($val, $authentication);
+			$obj = Simplify_PaymentsApi::findObject($val, $authentication);
 
-            return $obj;
-        }
+			return $obj;
+		}
 
 
-        /**
-         * Updates an Simplify_Customer object.
-         *
-         * The properties that can be updated:
-         * <dl style="padding-left:10px;">
-         *     <dt><tt>card.addressCity</tt></dt>    <dd>City of the cardholder. <strong>required </strong></dd>
-         *     <dt><tt>card.addressCountry</tt></dt>    <dd>Country code (ISO-3166-1-alpha-2 code) of residence of the cardholder. <strong>required </strong></dd>
-         *     <dt><tt>card.addressLine1</tt></dt>    <dd>Address of the cardholder. <strong>required </strong></dd>
-         *     <dt><tt>card.addressLine2</tt></dt>    <dd>Address of the cardholder if needed. <strong>required </strong></dd>
-         *     <dt><tt>card.addressState</tt></dt>    <dd>State of residence of the cardholder. For the US, this is a 2-digit USPS code. <strong>required </strong></dd>
-         *     <dt><tt>card.addressZip</tt></dt>    <dd>Postal code of the cardholder. The postal code size is between 5 and 9 in length and only contain numbers or letters. <strong>required </strong></dd>
-         *     <dt><tt>card.cvc</tt></dt>    <dd>CVC security code of the card. This is the code on the back of the card. Example: 123 <strong>required </strong></dd>
-         *     <dt><tt>card.expMonth</tt></dt>    <dd>Expiration month of the card. Format is MM.  Example: January = 01 <strong>required </strong></dd>
-         *     <dt><tt>card.expYear</tt></dt>    <dd>Expiration year of the card. Format is YY. Example: 2013 = 13 <strong>required </strong></dd>
-         *     <dt><tt>card.id</tt></dt>    <dd>ID of card. If present, card details for the customer will not be updated. If not present, the customer will be updated with the supplied card details. </dd>
-         *     <dt><tt>card.name</tt></dt>    <dd>Name as appears on the card. <strong>required </strong></dd>
-         *     <dt><tt>card.number</tt></dt>    <dd>Card number as it appears on the card. [max length: 19, min length: 13] </dd>
-         *     <dt><tt>email</tt></dt>    <dd>Email address of the customer <strong>required </strong></dd>
-         *     <dt><tt>name</tt></dt>    <dd>Customer name [min length: 2] <strong>required </strong></dd>
-         *     <dt><tt>reference</tt></dt>    <dd>Reference field for external applications use. </dd>
-         *     <dt><tt>token</tt></dt>    <dd>If specified, card associated with card token will be added to the customer </dd></dl>
-         * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-         * @return    Customer a Customer object.
-         */
-        public function updateCustomer($authentication = null)  {
+		/**
+		 * Updates an Simplify_Customer object.
+		 *
+		 * The properties that can be updated:
+		 * <dl style="padding-left:10px;">
+		 *     <dt><tt>card.addressCity</tt></dt>    <dd>City of the cardholder. <strong>required </strong></dd>
+		 *     <dt><tt>card.addressCountry</tt></dt>    <dd>Country code (ISO-3166-1-alpha-2 code) of residence of the cardholder. <strong>required </strong></dd>
+		 *     <dt><tt>card.addressLine1</tt></dt>    <dd>Address of the cardholder. <strong>required </strong></dd>
+		 *     <dt><tt>card.addressLine2</tt></dt>    <dd>Address of the cardholder if needed. <strong>required </strong></dd>
+		 *     <dt><tt>card.addressState</tt></dt>    <dd>State of residence of the cardholder. For the US, this is a 2-digit USPS code. <strong>required </strong></dd>
+		 *     <dt><tt>card.addressZip</tt></dt>    <dd>Postal code of the cardholder. The postal code size is between 5 and 9 in length and only contain numbers or letters. <strong>required </strong></dd>
+		 *     <dt><tt>card.cvc</tt></dt>    <dd>CVC security code of the card. This is the code on the back of the card. Example: 123 <strong>required </strong></dd>
+		 *     <dt><tt>card.expMonth</tt></dt>    <dd>Expiration month of the card. Format is MM.  Example: January = 01 <strong>required </strong></dd>
+		 *     <dt><tt>card.expYear</tt></dt>    <dd>Expiration year of the card. Format is YY. Example: 2013 = 13 <strong>required </strong></dd>
+		 *     <dt><tt>card.id</tt></dt>    <dd>ID of card. If present, card details for the customer will not be updated. If not present, the customer will be updated with the supplied card details. </dd>
+		 *     <dt><tt>card.name</tt></dt>    <dd>Name as appears on the card. <strong>required </strong></dd>
+		 *     <dt><tt>card.number</tt></dt>    <dd>Card number as it appears on the card. [max length: 19, min length: 13] </dd>
+		 *     <dt><tt>email</tt></dt>    <dd>Email address of the customer <strong>required </strong></dd>
+		 *     <dt><tt>name</tt></dt>    <dd>Customer name [min length: 2] <strong>required </strong></dd>
+		 *     <dt><tt>reference</tt></dt>    <dd>Reference field for external applications use. </dd>
+		 *     <dt><tt>token</tt></dt>    <dd>If specified, card associated with card token will be added to the customer </dd></dl>
+		 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		 * @return    Customer a Customer object.
+		 */
+		public function updateCustomer($authentication = null)  {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
 
-            $object = Simplify_PaymentsApi::updateObject($this, $authentication);
-            return $object;
-        }
+			$object = Simplify_PaymentsApi::updateObject($this, $authentication);
+			return $object;
+		}
 
-    /**
-     * @ignore
-     */
-    public function getClazz() {
-        return "Customer";
-    }
-}
\ No newline at end of file
+	/**
+	 * @ignore
+	 */
+	public function getClazz() {
+		return "Customer";
+	}
+}
diff --git a/includes/gateways/simplify-commerce/includes/Simplify/Deposit.php b/includes/gateways/simplify-commerce/includes/Simplify/Deposit.php
index ab2c7b8e9a7..e0ca1aaf548 100644
--- a/includes/gateways/simplify-commerce/includes/Simplify/Deposit.php
+++ b/includes/gateways/simplify-commerce/includes/Simplify/Deposit.php
@@ -2,81 +2,81 @@
 /*
  * Copyright (c) 2013 - 2015 MasterCard International Incorporated
  * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are 
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of
  * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of 
- * conditions and the following disclaimer in the documentation and/or other materials 
+ * Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials
  * provided with the distribution.
- * Neither the name of the MasterCard International Incorporated nor the names of its 
- * contributors may be used to endorse or promote products derived from this software 
+ * Neither the name of the MasterCard International Incorporated nor the names of its
+ * contributors may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
- * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 
 class Simplify_Deposit extends Simplify_Object {
 
-       /**
-        * Retrieve Simplify_Deposit objects.
-        * @param     array criteria a map of parameters; valid keys are:<dl style="padding-left:10px;">
-        *     <dt><tt>filter</tt></dt>    <dd>Filters to apply to the list.  </dd>
-        *     <dt><tt>max</tt></dt>    <dd>Allows up to a max of 50 list items to return. [min value: 0, max value: 50, default: 20]  </dd>
-        *     <dt><tt>offset</tt></dt>    <dd>Used in paging of the list.  This is the start offset of the page. [min value: 0, default: 0]  </dd>
-        *     <dt><tt>sorting</tt></dt>    <dd>Allows for ascending or descending sorting of the list.  The value maps properties to the sort direction (either <tt>asc</tt> for ascending or <tt>desc</tt> for descending).  Sortable properties are: <tt> amount</tt><tt> dateCreated</tt><tt> depositDate</tt>.</dd></dl>
-        * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-        * @return    ResourceList a ResourceList object that holds the list of Deposit objects and the total
-        *            number of Deposit objects available for the given criteria.
-        * @see       ResourceList
-        */
-        static public function listDeposit($criteria = null, $authentication = null) {
+	   /**
+		* Retrieve Simplify_Deposit objects.
+		* @param     array criteria a map of parameters; valid keys are:<dl style="padding-left:10px;">
+		*     <dt><tt>filter</tt></dt>    <dd>Filters to apply to the list.  </dd>
+		*     <dt><tt>max</tt></dt>    <dd>Allows up to a max of 50 list items to return. [min value: 0, max value: 50, default: 20]  </dd>
+		*     <dt><tt>offset</tt></dt>    <dd>Used in paging of the list.  This is the start offset of the page. [min value: 0, default: 0]  </dd>
+		*     <dt><tt>sorting</tt></dt>    <dd>Allows for ascending or descending sorting of the list.  The value maps properties to the sort direction (either <tt>asc</tt> for ascending or <tt>desc</tt> for descending).  Sortable properties are: <tt> amount</tt><tt> dateCreated</tt><tt> depositDate</tt>.</dd></dl>
+		* @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		* @return    ResourceList a ResourceList object that holds the list of Deposit objects and the total
+		*            number of Deposit objects available for the given criteria.
+		* @see       ResourceList
+		*/
+		static public function listDeposit($criteria = null, $authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-            $val = new Simplify_Deposit();
-            $list = Simplify_PaymentsApi::listObject($val, $criteria, $authentication);
+			$val = new Simplify_Deposit();
+			$list = Simplify_PaymentsApi::listObject($val, $criteria, $authentication);
 
-            return $list;
-        }
+			return $list;
+		}
 
 
-        /**
-         * Retrieve a Simplify_Deposit object from the API
-         *
-         * @param     string id  the id of the Deposit object to retrieve
-         * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-         * @return    Deposit a Deposit object
-         */
-        static public function findDeposit($id, $authentication = null) {
+		/**
+		 * Retrieve a Simplify_Deposit object from the API
+		 *
+		 * @param     string id  the id of the Deposit object to retrieve
+		 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		 * @return    Deposit a Deposit object
+		 */
+		static public function findDeposit($id, $authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-            $val = new Simplify_Deposit();
-            $val->id = $id;
+			$val = new Simplify_Deposit();
+			$val->id = $id;
 
-            $obj = Simplify_PaymentsApi::findObject($val, $authentication);
+			$obj = Simplify_PaymentsApi::findObject($val, $authentication);
 
-            return $obj;
-        }
+			return $obj;
+		}
 
-    /**
-     * @ignore
-     */
-    public function getClazz() {
-        return "Deposit";
-    }
-}
\ No newline at end of file
+	/**
+	 * @ignore
+	 */
+	public function getClazz() {
+		return "Deposit";
+	}
+}
diff --git a/includes/gateways/simplify-commerce/includes/Simplify/Event.php b/includes/gateways/simplify-commerce/includes/Simplify/Event.php
index 9f5e5bfe1f0..98546751f9d 100644
--- a/includes/gateways/simplify-commerce/includes/Simplify/Event.php
+++ b/includes/gateways/simplify-commerce/includes/Simplify/Event.php
@@ -2,63 +2,63 @@
 /*
  * Copyright (c) 2013 - 2015 MasterCard International Incorporated
  * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are 
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of
  * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of 
- * conditions and the following disclaimer in the documentation and/or other materials 
+ * Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials
  * provided with the distribution.
- * Neither the name of the MasterCard International Incorporated nor the names of its 
- * contributors may be used to endorse or promote products derived from this software 
+ * Neither the name of the MasterCard International Incorporated nor the names of its
+ * contributors may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
- * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 
 class Simplify_Event extends Simplify_Object {
 
-    /**
-     * Creates an Event object
-     * @param     array $hash A map of parameters; valid keys are:
-     *     <dt><code>paylod</code></dt>    <dd>The raw JWS payload. </dd> <strong>required</strong>
-     *     <dt><code>url</code></dt>    <dd>The URL for the webhook.  If present it must match the URL registered for the webhook.</dd>
-     * @param  $authentication Object that contains the API public and private keys.  If null the values of the static
-     *         Simplify::$publicKey and Simplify::$privateKey will be used.
-     * @return Payments_Event an Event object.
-     * @throws InvalidArgumentException
-     */
-    static public function createEvent($hash, $authentication = null) {
+	/**
+	 * Creates an Event object
+	 * @param     array $hash A map of parameters; valid keys are:
+	 *     <dt><code>paylod</code></dt>    <dd>The raw JWS payload. </dd> <strong>required</strong>
+	 *     <dt><code>url</code></dt>    <dd>The URL for the webhook.  If present it must match the URL registered for the webhook.</dd>
+	 * @param  $authentication Object that contains the API public and private keys.  If null the values of the static
+	 *         Simplify::$publicKey and Simplify::$privateKey will be used.
+	 * @return Payments_Event an Event object.
+	 * @throws InvalidArgumentException
+	 */
+	static public function createEvent($hash, $authentication = null) {
 
-        $args = func_get_args();
-        $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+		$args = func_get_args();
+		$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-        $paymentsApi = new Simplify_PaymentsApi();
+		$paymentsApi = new Simplify_PaymentsApi();
 
-        $jsonObject = $paymentsApi->jwsDecode($hash, $authentication);
+		$jsonObject = $paymentsApi->jwsDecode($hash, $authentication);
 
-        if ($jsonObject['event'] == null) {
-            throw new InvalidArgumentException("Incorect data in webhook event");
-        }   
+		if ($jsonObject['event'] == null) {
+			throw new InvalidArgumentException("Incorect data in webhook event");
+		}
 
-        return  $paymentsApi->convertFromHashToObject($jsonObject['event'], self::getClazz());
-    }
+		return  $paymentsApi->convertFromHashToObject($jsonObject['event'], self::getClazz());
+	}
 
-    /**
-     * @ignore
-     */
-    static public function getClazz() {
-        return "Event";
-    }
-}
\ No newline at end of file
+	/**
+	 * @ignore
+	 */
+	static public function getClazz() {
+		return "Event";
+	}
+}
diff --git a/includes/gateways/simplify-commerce/includes/Simplify/Exceptions.php b/includes/gateways/simplify-commerce/includes/Simplify/Exceptions.php
index 590b58dc6ab..a8031626e11 100644
--- a/includes/gateways/simplify-commerce/includes/Simplify/Exceptions.php
+++ b/includes/gateways/simplify-commerce/includes/Simplify/Exceptions.php
@@ -2,27 +2,27 @@
 /*
  * Copyright (c) 2013 - 2015 MasterCard International Incorporated
  * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are 
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of
  * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of 
- * conditions and the following disclaimer in the documentation and/or other materials 
+ * Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials
  * provided with the distribution.
- * Neither the name of the MasterCard International Incorporated nor the names of its 
- * contributors may be used to endorse or promote products derived from this software 
+ * Neither the name of the MasterCard International Incorporated nor the names of its
+ * contributors may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
- * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
@@ -35,82 +35,82 @@
 class Simplify_ApiException extends Exception
 {
 
-    protected $errorData;
-    protected $status;
-    protected $errorCode;
-    protected $reference;
+	protected $errorData;
+	protected $status;
+	protected $errorCode;
+	protected $reference;
 
-    /**
-     * @ignore
-     */
-    function __construct($message, $status = null, $errorData = null) {
-        parent::__construct($message);
+	/**
+	 * @ignore
+	 */
+	function __construct($message, $status = null, $errorData = null) {
+		parent::__construct($message);
 
-        $this->status = $status;
-        $this->errorCode = null;
-        $this->reference = null;
+		$this->status = $status;
+		$this->errorCode = null;
+		$this->reference = null;
 
-        if ($errorData != null) {
-            
-            $this->reference = $errorData['reference'];
-            $this->errorData = $errorData;
+		if ($errorData != null) {
 
-            $error = $errorData['error'];            
-            if ($error != null) {
-    
-                $m = $error['message'];
-                if ($m != null) {
-                    $this->message = $m;
-                }
+			$this->reference = $errorData['reference'];
+			$this->errorData = $errorData;
 
-                $this->errorCode = $error['code'];
-            }
-        }
-    }
-    
-    /**
-     * Returns a map of all error data returned by the API.
-     * @return array a map containing API error data.
-     */
-    function getErrorData() {
-        return $this->errorData;
-    }
+			$error = $errorData['error'];
+			if ($error != null) {
 
-    /**
-     * Returns the HTTP status for the request.
-     * @return string HTTP status code (or null if there is no status).
-     */
-    function getStatus() {
-        return $this->status;
-    }
-    
-    /**
-     * Returns unique reference for the API error.
-     * @return string a reference (or null if there is no reference).
-     */
-    function getReference() {
-        return $this->reference;
-    }
+				$m = $error['message'];
+				if ($m != null) {
+					$this->message = $m;
+				}
 
-    /**
-     * Returns an code for the API error.
-     * @return string the error code.
-     */
-    function getErrorCode() {
-        return $this->errorCode;
-    }
+				$this->errorCode = $error['code'];
+			}
+		}
+	}
 
-    /**
-     * Returns a description of the error.
-     * @return string Description of the error.
-     */
-    function describe() {
-        return get_class($this) . ": \"" 
-            . $this->getMessage() . "\" (status: "
-            . $this->getStatus() . ", error code: "
-            . $this->getErrorCode() . ", reference: "
-            . $this->getReference() . ")";
-    }
+	/**
+	 * Returns a map of all error data returned by the API.
+	 * @return array a map containing API error data.
+	 */
+	function getErrorData() {
+		return $this->errorData;
+	}
+
+	/**
+	 * Returns the HTTP status for the request.
+	 * @return string HTTP status code (or null if there is no status).
+	 */
+	function getStatus() {
+		return $this->status;
+	}
+
+	/**
+	 * Returns unique reference for the API error.
+	 * @return string a reference (or null if there is no reference).
+	 */
+	function getReference() {
+		return $this->reference;
+	}
+
+	/**
+	 * Returns an code for the API error.
+	 * @return string the error code.
+	 */
+	function getErrorCode() {
+		return $this->errorCode;
+	}
+
+	/**
+	 * Returns a description of the error.
+	 * @return string Description of the error.
+	 */
+	function describe() {
+		return get_class($this) . ": \""
+			. $this->getMessage() . "\" (status: "
+			. $this->getStatus() . ", error code: "
+			. $this->getErrorCode() . ", reference: "
+			. $this->getReference() . ")";
+	}
 
 }
 
@@ -120,12 +120,12 @@ class Simplify_ApiException extends Exception
  */
 class Simplify_ApiConnectionException extends Simplify_ApiException {
 
-    /**
-     * @ignore
-     */
-    function __construct($message, $status = null, $errorData = null) {
-        parent::__construct($message, $status, $errorData);
-    }
+	/**
+	 * @ignore
+	 */
+	function __construct($message, $status = null, $errorData = null) {
+		parent::__construct($message, $status, $errorData);
+	}
 }
 
 /**
@@ -133,12 +133,12 @@ class Simplify_ApiConnectionException extends Simplify_ApiException {
  */
 class Simplify_AuthenticationException extends Simplify_ApiException {
 
-    /**
-     * @ignore
-     */
-    function __construct($message, $status = null, $errorData = null) {
-        parent::__construct($message, $status, $errorData);
-    }
+	/**
+	 * @ignore
+	 */
+	function __construct($message, $status = null, $errorData = null) {
+		parent::__construct($message, $status, $errorData);
+	}
 }
 
 /**
@@ -146,57 +146,57 @@ class Simplify_AuthenticationException extends Simplify_ApiException {
  */
 class Simplify_BadRequestException extends Simplify_ApiException {
 
-    protected $fieldErrors;
+	protected $fieldErrors;
 
-    /**
-     * @ignore
-     */
-    function __construct($message, $status = null, $errorData = null) {
-        parent::__construct($message, $status, $errorData);
+	/**
+	 * @ignore
+	 */
+	function __construct($message, $status = null, $errorData = null) {
+		parent::__construct($message, $status, $errorData);
 
-        $fieldErrors = array();
+		$fieldErrors = array();
 
-        if ($errorData != null) {
-            $error = $errorData['error'];
-            if ($error != null) {
-                $fieldErrors = $error['fieldErrors'];
-                if ($fieldErrors != null) {
-                    $this->fieldErrors = array();                
-                    foreach ($fieldErrors as $fieldError) {
-                        array_push($this->fieldErrors, new Simplify_FieldError($fieldError));
-                    }
-                }
-            }
-        }
-    }
+		if ($errorData != null) {
+			$error = $errorData['error'];
+			if ($error != null) {
+				$fieldErrors = $error['fieldErrors'];
+				if ($fieldErrors != null) {
+					$this->fieldErrors = array();
+					foreach ($fieldErrors as $fieldError) {
+						array_push($this->fieldErrors, new Simplify_FieldError($fieldError));
+					}
+				}
+			}
+		}
+	}
 
-    /**
-     * Returns a boolean indicating whether there are any field errors.
-     * @return boolean true if there are field errors; false otherwise.
-     */
-    function hasFieldErrors() {
-        return count($this->fieldErrors) > 0;
-    }
+	/**
+	 * Returns a boolean indicating whether there are any field errors.
+	 * @return boolean true if there are field errors; false otherwise.
+	 */
+	function hasFieldErrors() {
+		return count($this->fieldErrors) > 0;
+	}
 
-    /**
-     * Returns a list containing all field errors.
-     * @return array list of field errors.
-     */
-    function getFieldErrors() {
-        return $this->fieldErrors;
-    }
+	/**
+	 * Returns a list containing all field errors.
+	 * @return array list of field errors.
+	 */
+	function getFieldErrors() {
+		return $this->fieldErrors;
+	}
 
-    /**
-     * Returns a description of the error.
-     * @return string description of the error.
-     */
-    function describe() {
-        $s = parent::describe();
-        foreach ($this->getFieldErrors() as $fieldError) {
-            $s = $s . "\n" . (string) $fieldError;
-        }
-        return $s . "\n";
-    }
+	/**
+	 * Returns a description of the error.
+	 * @return string description of the error.
+	 */
+	function describe() {
+		$s = parent::describe();
+		foreach ($this->getFieldErrors() as $fieldError) {
+			$s = $s . "\n" . (string) $fieldError;
+		}
+		return $s . "\n";
+	}
 
 }
 
@@ -205,48 +205,48 @@ class Simplify_BadRequestException extends Simplify_ApiException {
  */
 class Simplify_FieldError {
 
-    protected $field;
-    protected $code;
-    protected $message;
+	protected $field;
+	protected $code;
+	protected $message;
 
-    /**
-     * @ignore
-     */
-    function __construct($errorData) {
-    
-        $this->field = $errorData['field'];
-        $this->code = $errorData['code'];
-        $this->message = $errorData['message'];
-    }
+	/**
+	 * @ignore
+	 */
+	function __construct($errorData) {
 
-    /**
-     * Returns the name of the field with the error.
-     * @return string the field name.
-     */
-    function getFieldName() {
-        return $this->field;
-    }
+		$this->field = $errorData['field'];
+		$this->code = $errorData['code'];
+		$this->message = $errorData['message'];
+	}
 
-    /**
-     * Returns the code for the error.
-     * @return string the error code.
-     */
-    function getErrorCode() {
-        return $this->code;
-    }
+	/**
+	 * Returns the name of the field with the error.
+	 * @return string the field name.
+	 */
+	function getFieldName() {
+		return $this->field;
+	}
 
-    /**
-     * Returns a description of the error.
-     * @return string description of the error.
-     */
-    function getMessage() {
-        return $this->message;
-    }
+	/**
+	 * Returns the code for the error.
+	 * @return string the error code.
+	 */
+	function getErrorCode() {
+		return $this->code;
+	}
+
+	/**
+	 * Returns a description of the error.
+	 * @return string description of the error.
+	 */
+	function getMessage() {
+		return $this->message;
+	}
 
 
-    function __toString() {
-        return "Field error: " . $this->getFieldName() . "\"" . $this->getMessage() . "\" (" . $this->getErrorCode() . ")";
-    }
+	function __toString() {
+		return "Field error: " . $this->getFieldName() . "\"" . $this->getMessage() . "\" (" . $this->getErrorCode() . ")";
+	}
 
 }
 
@@ -255,12 +255,12 @@ class Simplify_FieldError {
  */
 class Simplify_ObjectNotFoundException extends Simplify_ApiException {
 
-    /**
-     * @ignore
-     */
-    function __construct($message, $status = null, $errorData = null) {
-        parent::__construct($message, $status, $errorData);
-    }
+	/**
+	 * @ignore
+	 */
+	function __construct($message, $status = null, $errorData = null) {
+		parent::__construct($message, $status, $errorData);
+	}
 }
 
 /**
@@ -268,12 +268,12 @@ class Simplify_ObjectNotFoundException extends Simplify_ApiException {
  */
 class Simplify_NotAllowedException extends Simplify_ApiException {
 
-    /**
-     * @ignore
-     */
-    function __construct($message, $status = null, $errorData = null) {
-        parent::__construct($message, $status, $errorData);
-    }
+	/**
+	 * @ignore
+	 */
+	function __construct($message, $status = null, $errorData = null) {
+		parent::__construct($message, $status, $errorData);
+	}
 }
 
 /**
@@ -281,10 +281,10 @@ class Simplify_NotAllowedException extends Simplify_ApiException {
  */
 class Simplify_SystemException extends Simplify_ApiException {
 
-    /**
-     * @ignore
-     */
-    function __construct($message, $status = null, $errorData = null) {
-        parent::__construct($message, $status, $errorData);
-    }
+	/**
+	 * @ignore
+	 */
+	function __construct($message, $status = null, $errorData = null) {
+		parent::__construct($message, $status, $errorData);
+	}
 }
diff --git a/includes/gateways/simplify-commerce/includes/Simplify/FraudCheck.php b/includes/gateways/simplify-commerce/includes/Simplify/FraudCheck.php
index 01236b9fe52..8ade3f49663 100644
--- a/includes/gateways/simplify-commerce/includes/Simplify/FraudCheck.php
+++ b/includes/gateways/simplify-commerce/includes/Simplify/FraudCheck.php
@@ -2,117 +2,117 @@
 /*
  * Copyright (c) 2013 - 2015 MasterCard International Incorporated
  * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are 
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of
  * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of 
- * conditions and the following disclaimer in the documentation and/or other materials 
+ * Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials
  * provided with the distribution.
- * Neither the name of the MasterCard International Incorporated nor the names of its 
- * contributors may be used to endorse or promote products derived from this software 
+ * Neither the name of the MasterCard International Incorporated nor the names of its
+ * contributors may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
- * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 
 class Simplify_FraudCheck extends Simplify_Object {
-    /**
-     * Creates an Simplify_FraudCheck object
-     * @param     array $hash a map of parameters; valid keys are:<dl style="padding-left:10px;">
-     *     <dt><tt>amount</tt></dt>    <dd>Amount of the transaction to be checked for fraud (in the smallest unit of your currency). Example: 100 = $1.00USD </dd>
-     *     <dt><tt>card.addressCity</tt></dt>    <dd>City of the cardholder. [max length: 50, min length: 2] </dd>
-     *     <dt><tt>card.addressCountry</tt></dt>    <dd>Country code (ISO-3166-1-alpha-2 code) of residence of the cardholder. [max length: 2, min length: 2] </dd>
-     *     <dt><tt>card.addressLine1</tt></dt>    <dd>Address of the cardholder. [max length: 255] </dd>
-     *     <dt><tt>card.addressLine2</tt></dt>    <dd>Address of the cardholder if needed. [max length: 255] </dd>
-     *     <dt><tt>card.addressState</tt></dt>    <dd>State of residence of the cardholder. For the US, this is a 2-digit USPS code. [max length: 255, min length: 2] </dd>
-     *     <dt><tt>card.addressZip</tt></dt>    <dd>Postal code of the cardholder. The postal code size is between 5 and 9 characters in length and only contains numbers or letters. [max length: 9, min length: 3] </dd>
-     *     <dt><tt>card.cvc</tt></dt>    <dd>CVC security code of the card. This is the code on the back of the card. Example: 123 </dd>
-     *     <dt><tt>card.expMonth</tt></dt>    <dd>Expiration month of the card. Format is MM. Example: January = 01 [min value: 1, max value: 12] <strong>required </strong></dd>
-     *     <dt><tt>card.expYear</tt></dt>    <dd>Expiration year of the card. Format is YY. Example: 2013 = 13 [min value: 0, max value: 99] <strong>required </strong></dd>
-     *     <dt><tt>card.name</tt></dt>    <dd>Name as it appears on the card. [max length: 50, min length: 2] </dd>
-     *     <dt><tt>card.number</tt></dt>    <dd>Card number as it appears on the card. [max length: 19, min length: 13] <strong>required </strong></dd>
-     *     <dt><tt>currency</tt></dt>    <dd>Currency code (ISO-4217) for the transaction to be checked for fraud. </dd>
-     *     <dt><tt>description</tt></dt>    <dd>- Description of the fraud check. </dd>
-     *     <dt><tt>mode</tt></dt>    <dd>Fraud check mode.  “simple” only does an AVS and CVC check; “advanced” does a complete fraud check, running the input against the set up rules. [valid values: simple, advanced, full] <strong>required </strong></dd>
-     *     <dt><tt>sessionId</tt></dt>    <dd>Session ID usd during data collection. [max length: 255] </dd>
-     *     <dt><tt>token</tt></dt>    <dd>Description </dd></dl>
-     * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.<i/>
-     * @return    FraudCheck a FraudCheck object.
-     */
-    static public function createFraudCheck($hash, $authentication = null) {
+	/**
+	 * Creates an Simplify_FraudCheck object
+	 * @param     array $hash a map of parameters; valid keys are:<dl style="padding-left:10px;">
+	 *     <dt><tt>amount</tt></dt>    <dd>Amount of the transaction to be checked for fraud (in the smallest unit of your currency). Example: 100 = $1.00USD </dd>
+	 *     <dt><tt>card.addressCity</tt></dt>    <dd>City of the cardholder. [max length: 50, min length: 2] </dd>
+	 *     <dt><tt>card.addressCountry</tt></dt>    <dd>Country code (ISO-3166-1-alpha-2 code) of residence of the cardholder. [max length: 2, min length: 2] </dd>
+	 *     <dt><tt>card.addressLine1</tt></dt>    <dd>Address of the cardholder. [max length: 255] </dd>
+	 *     <dt><tt>card.addressLine2</tt></dt>    <dd>Address of the cardholder if needed. [max length: 255] </dd>
+	 *     <dt><tt>card.addressState</tt></dt>    <dd>State of residence of the cardholder. For the US, this is a 2-digit USPS code. [max length: 255, min length: 2] </dd>
+	 *     <dt><tt>card.addressZip</tt></dt>    <dd>Postal code of the cardholder. The postal code size is between 5 and 9 characters in length and only contains numbers or letters. [max length: 9, min length: 3] </dd>
+	 *     <dt><tt>card.cvc</tt></dt>    <dd>CVC security code of the card. This is the code on the back of the card. Example: 123 </dd>
+	 *     <dt><tt>card.expMonth</tt></dt>    <dd>Expiration month of the card. Format is MM. Example: January = 01 [min value: 1, max value: 12] <strong>required </strong></dd>
+	 *     <dt><tt>card.expYear</tt></dt>    <dd>Expiration year of the card. Format is YY. Example: 2013 = 13 [min value: 0, max value: 99] <strong>required </strong></dd>
+	 *     <dt><tt>card.name</tt></dt>    <dd>Name as it appears on the card. [max length: 50, min length: 2] </dd>
+	 *     <dt><tt>card.number</tt></dt>    <dd>Card number as it appears on the card. [max length: 19, min length: 13] <strong>required </strong></dd>
+	 *     <dt><tt>currency</tt></dt>    <dd>Currency code (ISO-4217) for the transaction to be checked for fraud. </dd>
+	 *     <dt><tt>description</tt></dt>    <dd>- Description of the fraud check. </dd>
+	 *     <dt><tt>mode</tt></dt>    <dd>Fraud check mode.  “simple” only does an AVS and CVC check; “advanced” does a complete fraud check, running the input against the set up rules. [valid values: simple, advanced, full] <strong>required </strong></dd>
+	 *     <dt><tt>sessionId</tt></dt>    <dd>Session ID usd during data collection. [max length: 255] </dd>
+	 *     <dt><tt>token</tt></dt>    <dd>Description </dd></dl>
+	 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.<i/>
+	 * @return    FraudCheck a FraudCheck object.
+	 */
+	static public function createFraudCheck($hash, $authentication = null) {
 
-        $args = func_get_args();
-        $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+		$args = func_get_args();
+		$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-        $instance = new Simplify_FraudCheck();
-        $instance->setAll($hash);
+		$instance = new Simplify_FraudCheck();
+		$instance->setAll($hash);
 
-        $object = Simplify_PaymentsApi::createObject($instance, $authentication);
-        return $object;
-    }
+		$object = Simplify_PaymentsApi::createObject($instance, $authentication);
+		return $object;
+	}
 
 
 
-       /**
-        * Retrieve Simplify_FraudCheck objects.
-        * @param     array criteria a map of parameters; valid keys are:<dl style="padding-left:10px;">
-        *     <dt><tt>filter</tt></dt>    <dd>Allows for ascending or descending sorting of the list.  </dd>
-        *     <dt><tt>max</tt></dt>    <dd>Allows up to a max of 50 list items to return. [min value: 0, max value: 50, default: 20]  </dd>
-        *     <dt><tt>offset</tt></dt>    <dd>Used in paging of the list.  This is the start offset of the page. [min value: 0, default: 0]  </dd>
-        *     <dt><tt>sorting</tt></dt>    <dd>Used in paging of the list.  This is the start offset of the page.  The value maps properties to the sort direction (either <tt>asc</tt> for ascending or <tt>desc</tt> for descending).  Sortable properties are: .</dd></dl>
-        * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-        * @return    ResourceList a ResourceList object that holds the list of FraudCheck objects and the total
-        *            number of FraudCheck objects available for the given criteria.
-        * @see       ResourceList
-        */
-        static public function listFraudCheck($criteria = null, $authentication = null) {
+	   /**
+		* Retrieve Simplify_FraudCheck objects.
+		* @param     array criteria a map of parameters; valid keys are:<dl style="padding-left:10px;">
+		*     <dt><tt>filter</tt></dt>    <dd>Allows for ascending or descending sorting of the list.  </dd>
+		*     <dt><tt>max</tt></dt>    <dd>Allows up to a max of 50 list items to return. [min value: 0, max value: 50, default: 20]  </dd>
+		*     <dt><tt>offset</tt></dt>    <dd>Used in paging of the list.  This is the start offset of the page. [min value: 0, default: 0]  </dd>
+		*     <dt><tt>sorting</tt></dt>    <dd>Used in paging of the list.  This is the start offset of the page.  The value maps properties to the sort direction (either <tt>asc</tt> for ascending or <tt>desc</tt> for descending).  Sortable properties are: .</dd></dl>
+		* @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		* @return    ResourceList a ResourceList object that holds the list of FraudCheck objects and the total
+		*            number of FraudCheck objects available for the given criteria.
+		* @see       ResourceList
+		*/
+		static public function listFraudCheck($criteria = null, $authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-            $val = new Simplify_FraudCheck();
-            $list = Simplify_PaymentsApi::listObject($val, $criteria, $authentication);
+			$val = new Simplify_FraudCheck();
+			$list = Simplify_PaymentsApi::listObject($val, $criteria, $authentication);
 
-            return $list;
-        }
+			return $list;
+		}
 
 
-        /**
-         * Retrieve a Simplify_FraudCheck object from the API
-         *
-         * @param     string id  the id of the FraudCheck object to retrieve
-         * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-         * @return    FraudCheck a FraudCheck object
-         */
-        static public function findFraudCheck($id, $authentication = null) {
+		/**
+		 * Retrieve a Simplify_FraudCheck object from the API
+		 *
+		 * @param     string id  the id of the FraudCheck object to retrieve
+		 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		 * @return    FraudCheck a FraudCheck object
+		 */
+		static public function findFraudCheck($id, $authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-            $val = new Simplify_FraudCheck();
-            $val->id = $id;
+			$val = new Simplify_FraudCheck();
+			$val->id = $id;
 
-            $obj = Simplify_PaymentsApi::findObject($val, $authentication);
+			$obj = Simplify_PaymentsApi::findObject($val, $authentication);
 
-            return $obj;
-        }
+			return $obj;
+		}
 
-    /**
-     * @ignore
-     */
-    public function getClazz() {
-        return "FraudCheck";
-    }
-}
\ No newline at end of file
+	/**
+	 * @ignore
+	 */
+	public function getClazz() {
+		return "FraudCheck";
+	}
+}
diff --git a/includes/gateways/simplify-commerce/includes/Simplify/Http.php b/includes/gateways/simplify-commerce/includes/Simplify/Http.php
index b7d73d506e4..da85d12c645 100644
--- a/includes/gateways/simplify-commerce/includes/Simplify/Http.php
+++ b/includes/gateways/simplify-commerce/includes/Simplify/Http.php
@@ -29,379 +29,379 @@
 
 class Simplify_HTTP
 {
-    const DELETE = "DELETE";
-    const GET = "GET";
-    const POST = "POST";
-    const PUT = "PUT";
-
-    const HTTP_SUCCESS = 200;
-    const HTTP_REDIRECTED = 302;
-    const HTTP_UNAUTHORIZED = 401;
-    const HTTP_NOT_FOUND = 404;
-    const HTTP_NOT_ALLOWED = 405;
-    const HTTP_BAD_REQUEST = 400;
-
-
-    const JWS_NUM_HEADERS         = 7;
-    const JWS_ALGORITHM           = 'HS256';
-    const JWS_TYPE                = 'JWS';
-    const JWS_HDR_UNAME           = 'uname';
-    const JWS_HDR_URI             = 'api.simplifycommerce.com/uri';
-    const JWS_HDR_TIMESTAMP       = 'api.simplifycommerce.com/timestamp';
-    const JWS_HDR_NONCE           = 'api.simplifycommerce.com/nonce';
-    const JWS_HDR_TOKEN           = 'api.simplifycommerce.com/token';
-    const JWS_MAX_TIMESTAMP_DIFF  = 300; // 5 minutes in seconds
-
-    static private $_validMethods = array(
-        "post" => self::POST,
-        "put" => self::PUT,
-        "get" => self::GET,
-        "delete" => self::DELETE);
-
-    private function request($url, $method, $authentication, $payload = '')
-    {
-        if ($authentication->publicKey == null) {
-            throw new InvalidArgumentException('Must have a valid public key to connect to the API');
-        }
-
-        if ($authentication->privateKey == null) {
-            throw new InvalidArgumentException('Must have a valid API key to connect to the API');
-        }
-
-        if (!array_key_exists(strtolower($method), self::$_validMethods)) {
-            throw new InvalidArgumentException('Invalid method: '.strtolower($method));
-        }
-
-        $method = self::$_validMethods[strtolower($method)];
-
-        $curl = curl_init();
-
-        $options = array();
-
-        $options[CURLOPT_URL] = $url;
-        $options[CURLOPT_CUSTOMREQUEST] = $method;
-        $options[CURLOPT_RETURNTRANSFER] = true;
-        $options[CURLOPT_FAILONERROR] = false;
-
-        $signature = $this->jwsEncode($authentication, $url, $payload, $method == self::POST || $method == self::PUT);
-
-        if ($method == self::POST || $method == self::PUT) {
-            $headers = array(
-                 'Content-type: application/json'
-            );
-            $options[CURLOPT_POSTFIELDS] = $signature;
-        } else {
-            $headers = array(
-                 'Authorization: JWS ' . $signature
-            );
-        }
-
-        array_push($headers, 'Accept: application/json');
-        $user_agent = 'PHP-SDK/' . Simplify_Constants::VERSION;
-        if (Simplify::$userAgent != null) {
-            $user_agent = $user_agent . ' ' . Simplify::$userAgent;
-        }
-        array_push($headers, 'User-Agent: ' . $user_agent);
-
-        $options[CURLOPT_HTTPHEADER] = $headers;
-
-        curl_setopt_array($curl, $options);
-
-        $data = curl_exec($curl);
-        $errno = curl_errno($curl);
-        $status = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-
-        if ($data == false || $errno != CURLE_OK) {
-            throw new Simplify_ApiConnectionException(curl_error($curl));
-        }
-
-        $object = json_decode($data, true);
-                                     //'typ' => self::JWS_TYPE,
-        $response = array('status' => $status, 'object' => $object);
-
-        return $response;
-        curl_close($curl);
-    }
-
-    /**
-     * Handles Simplify API requests
-     *
-     * @param $url
-     * @param $method
-     * @param $authentication
-     * @param string $payload
-     * @return mixed
-     * @throws Simplify_AuthenticationException
-     * @throws Simplify_ObjectNotFoundException
-     * @throws Simplify_BadRequestException
-     * @throws Simplify_NotAllowedException
-     * @throws Simplify_SystemException
-     */
-    public function apiRequest($url, $method, $authentication, $payload = ''){
-
-        $response = $this->request($url, $method, $authentication, $payload);
-
-        $status = $response['status'];
-        $object = $response['object'];
-
-        if ($status == self::HTTP_SUCCESS) {
-            return $object;
-        }
-
-        if ($status == self::HTTP_REDIRECTED) {
-            throw new Simplify_BadRequestException("Unexpected response code returned from the API, have you got the correct URL?", $status, $object);
-        } else if ($status == self::HTTP_BAD_REQUEST) {
-            throw new Simplify_BadRequestException("Bad request", $status, $object);
-        } else if ($status == self::HTTP_UNAUTHORIZED) {
-            throw new Simplify_AuthenticationException("You are not authorized to make this request.  Are you using the correct API keys?", $status, $object);
-        } else if ($status == self::HTTP_NOT_FOUND) {
-            throw new Simplify_ObjectNotFoundException("Object not found", $status, $object);
-        } else if ($status == self::HTTP_NOT_ALLOWED) {
-            throw new Simplify_NotAllowedException("Operation not allowed", $status, $object);
-        } else if ($status < 500) {
-            throw new Simplify_BadRequestException("Bad request", $status, $object);
-        }
-        throw new Simplify_SystemException("An unexpected error has been raised.  Looks like there's something wrong at our end." , $status, $object);
-    }
-
-    /**
-     * Handles Simplify OAuth requests
-     *
-     * @param $url
-     * @param $payload
-     * @param $authentication
-     * @return mixed
-     * @throws Simplify_AuthenticationException
-     * @throws Simplify_ObjectNotFoundException
-     * @throws Simplify_BadRequestException
-     * @throws Simplify_NotAllowedException
-     * @throws Simplify_SystemException
-     */
-    public function oauthRequest($url, $payload, $authentication){
-
-        $response = $this->request($url, Simplify_HTTP::POST, $authentication, $payload);
-
-        $status = $response['status'];
-        $object = $response['object'];
-
-        if ($status == self::HTTP_SUCCESS) {
-            return $object;
-        }
-
-        $error = $object['error'];
-        $error_description = $object['error_description'];
-
-        if ($status == self::HTTP_REDIRECTED) {
-            throw new Simplify_BadRequestException("Unexpected response code returned from the API, have you got the correct URL?", $status, $object);
-        } else if ($status == self::HTTP_BAD_REQUEST) {
-
-            if ( $error == 'invalid_request'){
-                throw new Simplify_BadRequestException("", $status, $this->buildOauthError('Error during OAuth request', $error, $error_description));
-            }else if ($error == 'unsupported_grant_type'){
-                throw new Simplify_BadRequestException("", $status, $this->buildOauthError('Unsupported grant type in OAuth request', $error, $error_description));
-            }else if ($error == 'invalid_scope'){
-                throw new Simplify_BadRequestException("", $status, $this->buildOauthError('Invalid scope in OAuth request', $error, $error_description));
-            }else{
-                throw new Simplify_BadRequestException("", $status, $this->buildOauthError('Unknown OAuth error', $error, $error_description));
-            }
-
-            //TODO:  build BadRequestException error JSON
-
-        } else if ($status == self::HTTP_UNAUTHORIZED){
-
-            if ($error == 'access_denied'){
-                throw new Simplify_AuthenticationException("", $status, $this->buildOauthError('Access denied for OAuth request', $error, $error_description));
-            }else if ($error == 'invalid_client'){
-                throw new Simplify_AuthenticationException("", $status, $this->buildOauthError('Invalid client ID in OAuth request', $error, $error_description));
-            }else if ($error == 'unauthorized_client'){
-                throw new Simplify_AuthenticationException("", $status, $this->buildOauthError('Unauthorized client in OAuth request', $error, $error_description));
-            }else{
-                throw new Simplify_AuthenticationException("", $status, $this->buildOauthError('Unknown authentication error', $error, $error_description));
-            }
-
-        } else if ($status < 500) {
-            throw new Simplify_BadRequestException("Bad request", $status, $object);
-        }
-        throw new Simplify_SystemException("An unexpected error has been raised.  Looks like there's something wrong at our end." , $status, $object);
-    }
-
-    public function jwsDecode($authentication, $hash)
-    {
-        if ($authentication->publicKey == null) {
-            throw new InvalidArgumentException('Must have a valid public key to connect to the API');
-        }
-
-        if ($authentication->privateKey == null) {
-            throw new InvalidArgumentException('Must have a valid API key to connect to the API');
-        }
-
-        if (!isset($hash['payload'])) {
-            throw new InvalidArgumentException('Event data is Missing payload');
-        }
-        $payload = trim($hash['payload']);
-
-
-        try {
-            $parts = explode('.', $payload);
-            if (count($parts) != 3) {
-                $this->jwsAuthError("Incorrectly formatted JWS message");
-            }
-
-            $headerStr = $this->jwsUrlSafeDecode64($parts[0]);
-            $bodyStr = $this->jwsUrlSafeDecode64($parts[1]);
-            $sigStr = $parts[2];
-
-            $url = null;
-            if (isset($hash['url'])) {
-                $url = $hash['url'];
-            }
-            $this->jwsVerifyHeader($headerStr, $url, $authentication->publicKey);
-
-            $msg = $parts[0] . "." . $parts[1];
-            if (!$this->jwsVerifySignature($authentication->privateKey, $msg, $sigStr)) {
-                $this->jwsAuthError("JWS signature does not match");
-            }
-
-            return $bodyStr;
-
-        } catch (ApiException $e) {
-            throw $e;
-        } catch (Exception $e) {
-            $this->jwsAuthError("Exception during JWS decoding: " . $e);
-        }
-    }
-
-    private function jwsEncode($authentication, $url, $payload, $hasPayload)
-    {
-        // TODO - better seeding of RNG
-        $jws_hdr = array('typ' => self::JWS_TYPE,
-                          'alg' => self::JWS_ALGORITHM,
-                          'kid' => $authentication->publicKey,
-                          self::JWS_HDR_URI => $url,
-                          self::JWS_HDR_TIMESTAMP => sprintf("%u000", round(microtime(true))),
-                          self::JWS_HDR_NONCE => sprintf("%u", mt_rand()),
-    	);
-
-        // add oauth token if provided
-        if ( !empty($authentication->accessToken) ){
-            $jws_hdr[self::JWS_HDR_TOKEN] = $authentication->accessToken;
-        }
-
-        $header = $this->jwsUrlSafeEncode64(json_encode($jws_hdr));
-
-        if ($hasPayload) {
-            $payload = $this->jwsUrlSafeEncode64($payload);
-        } else {
-            $payload = '';
-        }
-
-        $msg = $header . "." . $payload;
-        return $msg . "." . $this->jwsSign($authentication->privateKey, $msg);
-    }
-
-    private function jwsSign($privateKey, $msg) {
-        $decodedPrivateKey = $this->jwsUrlSafeDecode64($privateKey);
-        $sig = hash_hmac('sha256', $msg, $decodedPrivateKey, true);
-
-        return $this->jwsUrlSafeEncode64($sig);
-    }
-
-    private function jwsVerifyHeader($header, $url, $publicKey) {
-
-	    $hdr = json_decode($header, true);
-
-	    if (count($hdr) != self::JWS_NUM_HEADERS) {
-		    $this->jwsAuthError("Incorrect number of JWS header parameters - found " . count($hdr) . " required " . self::JWS_NUM_HEADERS);
-        }
-
-	    if ($hdr['alg'] != self::JWS_ALGORITHM) {
-		    $this->jwsAuthError("Incorrect algorithm - found " . $hdr['alg'] . " required " . self::WS_ALGORITHM);
-        }
-
-	    if ($hdr['typ'] != self::JWS_TYPE) {
-		    $this->jwsAuthError("Incorrect type - found " . $hdr['typ'] . " required " . self::JWS_TYPE);
-        }
-
-	    if ($hdr['kid'] == null) {
-		    $this->jwsAuthError("Missing Key ID");
-	    }
-
-	    if ($hdr['kid'] != $publicKey) {
-	        if ($this->isLiveKey($publicKey)) {
-	            $this->jwsAuthError("Invalid Key ID");
-            }
-        }
-
-	    if ($hdr[self::JWS_HDR_URI] == null) {
-		    $this->jwsAuthError("Missing URI");
-        }
-
-	    if ($url != null && $hdr[self::JWS_HDR_URI] != $url) {
-	        $this->jwsAuthError("Incorrect URL - found " . $hdr[self::JWS_HDR_URI] . " required " . $url);
-        }
-
-
-	    if ($hdr[self::JWS_HDR_TIMESTAMP] == null) {
-		    $this->jwsAuthError("Missing timestamp");
-        }
-
-	    if (!$this->jwsVerifyTimestamp($hdr[self::JWS_HDR_TIMESTAMP])) {
-		    $this->jwsAuthError("Invalid timestamp");
-	    }
-
-	    if ($hdr[self::JWS_HDR_NONCE] == null) {
-		    $this->jwsAuthError("Missing nonce");
-        }
-
-	    if ($hdr[self::JWS_HDR_UNAME] == null) {
-		    $this->jwsAuthError("Missing username");
-        }
-    }
-
-
-    private function jwsVerifySignature($privateKey, $msg, $expectedSig) {
-        return $this->jwsSign($privateKey, $msg) == $expectedSig;
-    }
-
-    private function jwsAuthError($reason) {
-        throw new Simplify_AuthenticationException("JWS authentication failure: " . $reason);
-    }
-
-    private function jwsVerifyTimestamp($ts) {
-        $now = round(microtime(true)); // Seconds
-        return abs($now - $ts / 1000) < self::JWS_MAX_TIMESTAMP_DIFF;
-    }
-
-    private function isLiveKey($k) {
-        return strpos($k, "lvpb") === 0;
-    }
-
-    private function jwsUrlSafeEncode64($s) {
-        return str_replace(array('+', '/', '='),
-                           array('-', '_', ''),
-                           base64_encode($s));
-    }
+	const DELETE = "DELETE";
+	const GET = "GET";
+	const POST = "POST";
+	const PUT = "PUT";
+
+	const HTTP_SUCCESS = 200;
+	const HTTP_REDIRECTED = 302;
+	const HTTP_UNAUTHORIZED = 401;
+	const HTTP_NOT_FOUND = 404;
+	const HTTP_NOT_ALLOWED = 405;
+	const HTTP_BAD_REQUEST = 400;
+
+
+	const JWS_NUM_HEADERS         = 7;
+	const JWS_ALGORITHM           = 'HS256';
+	const JWS_TYPE                = 'JWS';
+	const JWS_HDR_UNAME           = 'uname';
+	const JWS_HDR_URI             = 'api.simplifycommerce.com/uri';
+	const JWS_HDR_TIMESTAMP       = 'api.simplifycommerce.com/timestamp';
+	const JWS_HDR_NONCE           = 'api.simplifycommerce.com/nonce';
+	const JWS_HDR_TOKEN           = 'api.simplifycommerce.com/token';
+	const JWS_MAX_TIMESTAMP_DIFF  = 300; // 5 minutes in seconds
+
+	static private $_validMethods = array(
+		"post" => self::POST,
+		"put" => self::PUT,
+		"get" => self::GET,
+		"delete" => self::DELETE);
+
+	private function request($url, $method, $authentication, $payload = '')
+	{
+		if ($authentication->publicKey == null) {
+			throw new InvalidArgumentException('Must have a valid public key to connect to the API');
+		}
+
+		if ($authentication->privateKey == null) {
+			throw new InvalidArgumentException('Must have a valid API key to connect to the API');
+		}
+
+		if (!array_key_exists(strtolower($method), self::$_validMethods)) {
+			throw new InvalidArgumentException('Invalid method: '.strtolower($method));
+		}
+
+		$method = self::$_validMethods[strtolower($method)];
+
+		$curl = curl_init();
+
+		$options = array();
+
+		$options[CURLOPT_URL] = $url;
+		$options[CURLOPT_CUSTOMREQUEST] = $method;
+		$options[CURLOPT_RETURNTRANSFER] = true;
+		$options[CURLOPT_FAILONERROR] = false;
+
+		$signature = $this->jwsEncode($authentication, $url, $payload, $method == self::POST || $method == self::PUT);
+
+		if ($method == self::POST || $method == self::PUT) {
+			$headers = array(
+				 'Content-type: application/json'
+			);
+			$options[CURLOPT_POSTFIELDS] = $signature;
+		} else {
+			$headers = array(
+				 'Authorization: JWS ' . $signature
+			);
+		}
+
+		array_push($headers, 'Accept: application/json');
+		$user_agent = 'PHP-SDK/' . Simplify_Constants::VERSION;
+		if (Simplify::$userAgent != null) {
+			$user_agent = $user_agent . ' ' . Simplify::$userAgent;
+		}
+		array_push($headers, 'User-Agent: ' . $user_agent);
+
+		$options[CURLOPT_HTTPHEADER] = $headers;
+
+		curl_setopt_array($curl, $options);
+
+		$data = curl_exec($curl);
+		$errno = curl_errno($curl);
+		$status = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+
+		if ($data == false || $errno != CURLE_OK) {
+			throw new Simplify_ApiConnectionException(curl_error($curl));
+		}
+
+		$object = json_decode($data, true);
+									 //'typ' => self::JWS_TYPE,
+		$response = array('status' => $status, 'object' => $object);
+
+		return $response;
+		curl_close($curl);
+	}
+
+	/**
+	 * Handles Simplify API requests
+	 *
+	 * @param $url
+	 * @param $method
+	 * @param $authentication
+	 * @param string $payload
+	 * @return mixed
+	 * @throws Simplify_AuthenticationException
+	 * @throws Simplify_ObjectNotFoundException
+	 * @throws Simplify_BadRequestException
+	 * @throws Simplify_NotAllowedException
+	 * @throws Simplify_SystemException
+	 */
+	public function apiRequest($url, $method, $authentication, $payload = ''){
+
+		$response = $this->request($url, $method, $authentication, $payload);
+
+		$status = $response['status'];
+		$object = $response['object'];
+
+		if ($status == self::HTTP_SUCCESS) {
+			return $object;
+		}
+
+		if ($status == self::HTTP_REDIRECTED) {
+			throw new Simplify_BadRequestException("Unexpected response code returned from the API, have you got the correct URL?", $status, $object);
+		} else if ($status == self::HTTP_BAD_REQUEST) {
+			throw new Simplify_BadRequestException("Bad request", $status, $object);
+		} else if ($status == self::HTTP_UNAUTHORIZED) {
+			throw new Simplify_AuthenticationException("You are not authorized to make this request.  Are you using the correct API keys?", $status, $object);
+		} else if ($status == self::HTTP_NOT_FOUND) {
+			throw new Simplify_ObjectNotFoundException("Object not found", $status, $object);
+		} else if ($status == self::HTTP_NOT_ALLOWED) {
+			throw new Simplify_NotAllowedException("Operation not allowed", $status, $object);
+		} else if ($status < 500) {
+			throw new Simplify_BadRequestException("Bad request", $status, $object);
+		}
+		throw new Simplify_SystemException("An unexpected error has been raised.  Looks like there's something wrong at our end." , $status, $object);
+	}
+
+	/**
+	 * Handles Simplify OAuth requests
+	 *
+	 * @param $url
+	 * @param $payload
+	 * @param $authentication
+	 * @return mixed
+	 * @throws Simplify_AuthenticationException
+	 * @throws Simplify_ObjectNotFoundException
+	 * @throws Simplify_BadRequestException
+	 * @throws Simplify_NotAllowedException
+	 * @throws Simplify_SystemException
+	 */
+	public function oauthRequest($url, $payload, $authentication){
+
+		$response = $this->request($url, Simplify_HTTP::POST, $authentication, $payload);
+
+		$status = $response['status'];
+		$object = $response['object'];
+
+		if ($status == self::HTTP_SUCCESS) {
+			return $object;
+		}
+
+		$error = $object['error'];
+		$error_description = $object['error_description'];
+
+		if ($status == self::HTTP_REDIRECTED) {
+			throw new Simplify_BadRequestException("Unexpected response code returned from the API, have you got the correct URL?", $status, $object);
+		} else if ($status == self::HTTP_BAD_REQUEST) {
+
+			if ( $error == 'invalid_request'){
+				throw new Simplify_BadRequestException("", $status, $this->buildOauthError('Error during OAuth request', $error, $error_description));
+			}else if ($error == 'unsupported_grant_type'){
+				throw new Simplify_BadRequestException("", $status, $this->buildOauthError('Unsupported grant type in OAuth request', $error, $error_description));
+			}else if ($error == 'invalid_scope'){
+				throw new Simplify_BadRequestException("", $status, $this->buildOauthError('Invalid scope in OAuth request', $error, $error_description));
+			}else{
+				throw new Simplify_BadRequestException("", $status, $this->buildOauthError('Unknown OAuth error', $error, $error_description));
+			}
+
+			//TODO:  build BadRequestException error JSON
+
+		} else if ($status == self::HTTP_UNAUTHORIZED){
+
+			if ($error == 'access_denied'){
+				throw new Simplify_AuthenticationException("", $status, $this->buildOauthError('Access denied for OAuth request', $error, $error_description));
+			}else if ($error == 'invalid_client'){
+				throw new Simplify_AuthenticationException("", $status, $this->buildOauthError('Invalid client ID in OAuth request', $error, $error_description));
+			}else if ($error == 'unauthorized_client'){
+				throw new Simplify_AuthenticationException("", $status, $this->buildOauthError('Unauthorized client in OAuth request', $error, $error_description));
+			}else{
+				throw new Simplify_AuthenticationException("", $status, $this->buildOauthError('Unknown authentication error', $error, $error_description));
+			}
+
+		} else if ($status < 500) {
+			throw new Simplify_BadRequestException("Bad request", $status, $object);
+		}
+		throw new Simplify_SystemException("An unexpected error has been raised.  Looks like there's something wrong at our end." , $status, $object);
+	}
+
+	public function jwsDecode($authentication, $hash)
+	{
+		if ($authentication->publicKey == null) {
+			throw new InvalidArgumentException('Must have a valid public key to connect to the API');
+		}
+
+		if ($authentication->privateKey == null) {
+			throw new InvalidArgumentException('Must have a valid API key to connect to the API');
+		}
+
+		if (!isset($hash['payload'])) {
+			throw new InvalidArgumentException('Event data is Missing payload');
+		}
+		$payload = trim($hash['payload']);
+
+
+		try {
+			$parts = explode('.', $payload);
+			if (count($parts) != 3) {
+				$this->jwsAuthError("Incorrectly formatted JWS message");
+			}
+
+			$headerStr = $this->jwsUrlSafeDecode64($parts[0]);
+			$bodyStr = $this->jwsUrlSafeDecode64($parts[1]);
+			$sigStr = $parts[2];
+
+			$url = null;
+			if (isset($hash['url'])) {
+				$url = $hash['url'];
+			}
+			$this->jwsVerifyHeader($headerStr, $url, $authentication->publicKey);
+
+			$msg = $parts[0] . "." . $parts[1];
+			if (!$this->jwsVerifySignature($authentication->privateKey, $msg, $sigStr)) {
+				$this->jwsAuthError("JWS signature does not match");
+			}
+
+			return $bodyStr;
+
+		} catch (ApiException $e) {
+			throw $e;
+		} catch (Exception $e) {
+			$this->jwsAuthError("Exception during JWS decoding: " . $e);
+		}
+	}
+
+	private function jwsEncode($authentication, $url, $payload, $hasPayload)
+	{
+		// TODO - better seeding of RNG
+		$jws_hdr = array('typ' => self::JWS_TYPE,
+						  'alg' => self::JWS_ALGORITHM,
+						  'kid' => $authentication->publicKey,
+						  self::JWS_HDR_URI => $url,
+						  self::JWS_HDR_TIMESTAMP => sprintf("%u000", round(microtime(true))),
+						  self::JWS_HDR_NONCE => sprintf("%u", mt_rand()),
+		);
+
+		// add oauth token if provided
+		if ( !empty($authentication->accessToken) ){
+			$jws_hdr[self::JWS_HDR_TOKEN] = $authentication->accessToken;
+		}
+
+		$header = $this->jwsUrlSafeEncode64(json_encode($jws_hdr));
+
+		if ($hasPayload) {
+			$payload = $this->jwsUrlSafeEncode64($payload);
+		} else {
+			$payload = '';
+		}
+
+		$msg = $header . "." . $payload;
+		return $msg . "." . $this->jwsSign($authentication->privateKey, $msg);
+	}
+
+	private function jwsSign($privateKey, $msg) {
+		$decodedPrivateKey = $this->jwsUrlSafeDecode64($privateKey);
+		$sig = hash_hmac('sha256', $msg, $decodedPrivateKey, true);
+
+		return $this->jwsUrlSafeEncode64($sig);
+	}
+
+	private function jwsVerifyHeader($header, $url, $publicKey) {
+
+		$hdr = json_decode($header, true);
+
+		if (count($hdr) != self::JWS_NUM_HEADERS) {
+			$this->jwsAuthError("Incorrect number of JWS header parameters - found " . count($hdr) . " required " . self::JWS_NUM_HEADERS);
+		}
+
+		if ($hdr['alg'] != self::JWS_ALGORITHM) {
+			$this->jwsAuthError("Incorrect algorithm - found " . $hdr['alg'] . " required " . self::WS_ALGORITHM);
+		}
+
+		if ($hdr['typ'] != self::JWS_TYPE) {
+			$this->jwsAuthError("Incorrect type - found " . $hdr['typ'] . " required " . self::JWS_TYPE);
+		}
+
+		if ($hdr['kid'] == null) {
+			$this->jwsAuthError("Missing Key ID");
+		}
+
+		if ($hdr['kid'] != $publicKey) {
+			if ($this->isLiveKey($publicKey)) {
+				$this->jwsAuthError("Invalid Key ID");
+			}
+		}
+
+		if ($hdr[self::JWS_HDR_URI] == null) {
+			$this->jwsAuthError("Missing URI");
+		}
+
+		if ($url != null && $hdr[self::JWS_HDR_URI] != $url) {
+			$this->jwsAuthError("Incorrect URL - found " . $hdr[self::JWS_HDR_URI] . " required " . $url);
+		}
+
+
+		if ($hdr[self::JWS_HDR_TIMESTAMP] == null) {
+			$this->jwsAuthError("Missing timestamp");
+		}
+
+		if (!$this->jwsVerifyTimestamp($hdr[self::JWS_HDR_TIMESTAMP])) {
+			$this->jwsAuthError("Invalid timestamp");
+		}
+
+		if ($hdr[self::JWS_HDR_NONCE] == null) {
+			$this->jwsAuthError("Missing nonce");
+		}
+
+		if ($hdr[self::JWS_HDR_UNAME] == null) {
+			$this->jwsAuthError("Missing username");
+		}
+	}
+
+
+	private function jwsVerifySignature($privateKey, $msg, $expectedSig) {
+		return $this->jwsSign($privateKey, $msg) == $expectedSig;
+	}
+
+	private function jwsAuthError($reason) {
+		throw new Simplify_AuthenticationException("JWS authentication failure: " . $reason);
+	}
+
+	private function jwsVerifyTimestamp($ts) {
+		$now = round(microtime(true)); // Seconds
+		return abs($now - $ts / 1000) < self::JWS_MAX_TIMESTAMP_DIFF;
+	}
+
+	private function isLiveKey($k) {
+		return strpos($k, "lvpb") === 0;
+	}
+
+	private function jwsUrlSafeEncode64($s) {
+		return str_replace(array('+', '/', '='),
+						   array('-', '_', ''),
+						   base64_encode($s));
+	}
 
-    private function jwsUrlSafeDecode64($s) {
-
-        switch (strlen($s) % 4) {
-            case 0: break;
-            case 2: $s = $s . "==";
-                    break;
-            case 3: $s = $s . "=";
-                    break;
-            default: throw new InvalidArgumentException('incorrecly formatted JWS payload');
-        }
-        return base64_decode(str_replace(array('-', '_'), array('+', '/'), $s));
-    }
+	private function jwsUrlSafeDecode64($s) {
+
+		switch (strlen($s) % 4) {
+			case 0: break;
+			case 2: $s = $s . "==";
+					break;
+			case 3: $s = $s . "=";
+					break;
+			default: throw new InvalidArgumentException('incorrecly formatted JWS payload');
+		}
+		return base64_decode(str_replace(array('-', '_'), array('+', '/'), $s));
+	}
 
-    private function buildOauthError($msg, $error, $error_description){
-
-        return array(
-            'error' => array(
-                'code' => 'oauth_error',
-                'message' => $msg.', error code: '.$error.', description: '.$error_description.''
-            )
-        );
-    }
+	private function buildOauthError($msg, $error, $error_description){
+
+		return array(
+			'error' => array(
+				'code' => 'oauth_error',
+				'message' => $msg.', error code: '.$error.', description: '.$error_description.''
+			)
+		);
+	}
 }
diff --git a/includes/gateways/simplify-commerce/includes/Simplify/Invoice.php b/includes/gateways/simplify-commerce/includes/Simplify/Invoice.php
index 854811506e6..5075748107d 100644
--- a/includes/gateways/simplify-commerce/includes/Simplify/Invoice.php
+++ b/includes/gateways/simplify-commerce/includes/Simplify/Invoice.php
@@ -2,223 +2,223 @@
 /*
  * Copyright (c) 2013 - 2015 MasterCard International Incorporated
  * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are 
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of
  * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of 
- * conditions and the following disclaimer in the documentation and/or other materials 
+ * Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials
  * provided with the distribution.
- * Neither the name of the MasterCard International Incorporated nor the names of its 
- * contributors may be used to endorse or promote products derived from this software 
+ * Neither the name of the MasterCard International Incorporated nor the names of its
+ * contributors may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
- * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 
 class Simplify_Invoice extends Simplify_Object {
-    /**
-     * Creates an Simplify_Invoice object
-     * @param     array $hash a map of parameters; valid keys are:<dl style="padding-left:10px;">
-     *     <dt><tt>billingAddress.city</tt></dt>    <dd>Billing address city of the location where the goods or services were supplied. [max length: 255, min length: 2] </dd>
-     *     <dt><tt>billingAddress.country</tt></dt>    <dd>Billing address country of the location where the goods or services were supplied. [max length: 2, min length: 2] </dd>
-     *     <dt><tt>billingAddress.line1</tt></dt>    <dd>Billing address line 1 of the location where the goods or services were supplied. [max length: 255] </dd>
-     *     <dt><tt>billingAddress.line2</tt></dt>    <dd>Billing address line 2 of the location where the goods or services were supplied. [max length: 255] </dd>
-     *     <dt><tt>billingAddress.name</tt></dt>    <dd>Billing address name of the location where the goods or services were supplied. Will use the customer name if not provided. [max length: 255] </dd>
-     *     <dt><tt>billingAddress.state</tt></dt>    <dd>Billing address state of the location where the goods or services were supplied. [max length: 255] </dd>
-     *     <dt><tt>billingAddress.zip</tt></dt>    <dd>Billing address zip of the location where the goods or services were supplied. [max length: 32] </dd>
-     *     <dt><tt>businessAddress.city</tt></dt>    <dd>Address city of the business that is sending the invoice. [max length: 255, min length: 2] </dd>
-     *     <dt><tt>businessAddress.country</tt></dt>    <dd>Address country of the business that is sending the invoice. [max length: 2, min length: 2] </dd>
-     *     <dt><tt>businessAddress.line1</tt></dt>    <dd>Address line 1 of the business that is sending the invoice. [max length: 255] </dd>
-     *     <dt><tt>businessAddress.line2</tt></dt>    <dd>Address line 2 of the business that is sending the invoice. [max length: 255] </dd>
-     *     <dt><tt>businessAddress.name</tt></dt>    <dd>The name of the business that is sending the invoice. [max length: 255] </dd>
-     *     <dt><tt>businessAddress.state</tt></dt>    <dd>Address state of the business that is sending the invoice. [max length: 255] </dd>
-     *     <dt><tt>businessAddress.zip</tt></dt>    <dd>Address zip of the business that is sending the invoice. [max length: 32] </dd>
-     *     <dt><tt>currency</tt></dt>    <dd>Currency code (ISO-4217). Must match the currency associated with your account. [max length: 3, min length: 3, default: USD] </dd>
-     *     <dt><tt>customer</tt></dt>    <dd>The customer ID of the customer we are invoicing.  This is optional if invoiceToCopy or a name and email are provided </dd>
-     *     <dt><tt>customerTaxNo</tt></dt>    <dd>The tax number or VAT id of the person to whom the goods or services were supplied. [max length: 255] </dd>
-     *     <dt><tt>discountRate</tt></dt>    <dd>The discount percent as a decimal e.g. 12.5.  This is used to calculate the discount amount which is subtracted from the total amount due before any tax is applied. [max length: 6] </dd>
-     *     <dt><tt>dueDate</tt></dt>    <dd>The date invoice payment is due.  If a late fee is provided this will be added to the invoice total is the due date has past. </dd>
-     *     <dt><tt>email</tt></dt>    <dd>The email of the customer we are invoicing.  This is optional if customer or invoiceToCopy is provided.  A new customer will be created using the the name and email. </dd>
-     *     <dt><tt>invoiceId</tt></dt>    <dd>User defined invoice id. If not provided the system will generate a numeric id. [max length: 255] </dd>
-     *     <dt><tt>invoiceToCopy</tt></dt>    <dd>The id of an existing invoice to be copied.  This is optional if customer or a name and email are provided </dd>
-     *     <dt><tt>items.amount</tt></dt>    <dd>Amount of the invoice item (the smallest unit of your currency). Example: 100 = $1.00USD [min value: -9999900, max value: 9999900] <strong>required </strong></dd>
-     *     <dt><tt>items.description</tt></dt>    <dd>The description of the invoice item. [max length: 1024] </dd>
-     *     <dt><tt>items.invoice</tt></dt>    <dd>The ID of the invoice this item belongs to. </dd>
-     *     <dt><tt>items.product</tt></dt>    <dd>The product this invoice item refers to. </dd>
-     *     <dt><tt>items.quantity</tt></dt>    <dd>Quantity of the item.  This total amount of the invoice item is the amount * quantity. [min value: 1, max value: 999999, default: 1] </dd>
-     *     <dt><tt>items.reference</tt></dt>    <dd>User defined reference field. [max length: 255] </dd>
-     *     <dt><tt>items.tax</tt></dt>    <dd>The tax ID of the tax charge in the invoice item. </dd>
-     *     <dt><tt>lateFee</tt></dt>    <dd>The late fee amount that will be added to the invoice total is the due date is past due.  Value provided must be in the smallest unit of your currency. Example: 100 = $1.00USD [max value: 9999900] </dd>
-     *     <dt><tt>memo</tt></dt>    <dd>A memo that is displayed to the customer on the invoice payment screen. [max length: 4000] </dd>
-     *     <dt><tt>name</tt></dt>    <dd>The name of the customer we are invoicing.  This is optional if customer or invoiceToCopy is provided.  A new customer will be created using the the name and email. [max length: 50, min length: 2] </dd>
-     *     <dt><tt>note</tt></dt>    <dd>This field can be used to store a note that is not displayed to the customer. [max length: 4000] </dd>
-     *     <dt><tt>reference</tt></dt>    <dd>User defined reference field. [max length: 255] </dd>
-     *     <dt><tt>shippingAddress.city</tt></dt>    <dd>Address city of the location where the goods or services were supplied. [max length: 255, min length: 2] </dd>
-     *     <dt><tt>shippingAddress.country</tt></dt>    <dd>Address country of the location where the goods or services were supplied. [max length: 2, min length: 2] </dd>
-     *     <dt><tt>shippingAddress.line1</tt></dt>    <dd>Address line 1 of the location where the goods or services were supplied. [max length: 255] </dd>
-     *     <dt><tt>shippingAddress.line2</tt></dt>    <dd>Address line 2 of the location where the goods or services were supplied. [max length: 255] </dd>
-     *     <dt><tt>shippingAddress.name</tt></dt>    <dd>Address name of the location where the goods or services were supplied. [max length: 255] </dd>
-     *     <dt><tt>shippingAddress.state</tt></dt>    <dd>Address state of the location where the goods or services were supplied. [max length: 255] </dd>
-     *     <dt><tt>shippingAddress.zip</tt></dt>    <dd>Address zip of the location where the goods or services were supplied. [max length: 32] </dd>
-     *     <dt><tt>suppliedDate</tt></dt>    <dd>The date on which the goods or services were supplied. </dd>
-     *     <dt><tt>taxNo</tt></dt>    <dd>The tax number or VAT id of the person who supplied the goods or services. [max length: 255] </dd>
-     *     <dt><tt>type</tt></dt>    <dd>The type of invoice.  One of WEB or MOBILE. [valid values: WEB, MOBILE, default: WEB] </dd></dl>
-     * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.<i/>
-     * @return    Invoice a Invoice object.
-     */
-    static public function createInvoice($hash, $authentication = null) {
+	/**
+	 * Creates an Simplify_Invoice object
+	 * @param     array $hash a map of parameters; valid keys are:<dl style="padding-left:10px;">
+	 *     <dt><tt>billingAddress.city</tt></dt>    <dd>Billing address city of the location where the goods or services were supplied. [max length: 255, min length: 2] </dd>
+	 *     <dt><tt>billingAddress.country</tt></dt>    <dd>Billing address country of the location where the goods or services were supplied. [max length: 2, min length: 2] </dd>
+	 *     <dt><tt>billingAddress.line1</tt></dt>    <dd>Billing address line 1 of the location where the goods or services were supplied. [max length: 255] </dd>
+	 *     <dt><tt>billingAddress.line2</tt></dt>    <dd>Billing address line 2 of the location where the goods or services were supplied. [max length: 255] </dd>
+	 *     <dt><tt>billingAddress.name</tt></dt>    <dd>Billing address name of the location where the goods or services were supplied. Will use the customer name if not provided. [max length: 255] </dd>
+	 *     <dt><tt>billingAddress.state</tt></dt>    <dd>Billing address state of the location where the goods or services were supplied. [max length: 255] </dd>
+	 *     <dt><tt>billingAddress.zip</tt></dt>    <dd>Billing address zip of the location where the goods or services were supplied. [max length: 32] </dd>
+	 *     <dt><tt>businessAddress.city</tt></dt>    <dd>Address city of the business that is sending the invoice. [max length: 255, min length: 2] </dd>
+	 *     <dt><tt>businessAddress.country</tt></dt>    <dd>Address country of the business that is sending the invoice. [max length: 2, min length: 2] </dd>
+	 *     <dt><tt>businessAddress.line1</tt></dt>    <dd>Address line 1 of the business that is sending the invoice. [max length: 255] </dd>
+	 *     <dt><tt>businessAddress.line2</tt></dt>    <dd>Address line 2 of the business that is sending the invoice. [max length: 255] </dd>
+	 *     <dt><tt>businessAddress.name</tt></dt>    <dd>The name of the business that is sending the invoice. [max length: 255] </dd>
+	 *     <dt><tt>businessAddress.state</tt></dt>    <dd>Address state of the business that is sending the invoice. [max length: 255] </dd>
+	 *     <dt><tt>businessAddress.zip</tt></dt>    <dd>Address zip of the business that is sending the invoice. [max length: 32] </dd>
+	 *     <dt><tt>currency</tt></dt>    <dd>Currency code (ISO-4217). Must match the currency associated with your account. [max length: 3, min length: 3, default: USD] </dd>
+	 *     <dt><tt>customer</tt></dt>    <dd>The customer ID of the customer we are invoicing.  This is optional if invoiceToCopy or a name and email are provided </dd>
+	 *     <dt><tt>customerTaxNo</tt></dt>    <dd>The tax number or VAT id of the person to whom the goods or services were supplied. [max length: 255] </dd>
+	 *     <dt><tt>discountRate</tt></dt>    <dd>The discount percent as a decimal e.g. 12.5.  This is used to calculate the discount amount which is subtracted from the total amount due before any tax is applied. [max length: 6] </dd>
+	 *     <dt><tt>dueDate</tt></dt>    <dd>The date invoice payment is due.  If a late fee is provided this will be added to the invoice total is the due date has past. </dd>
+	 *     <dt><tt>email</tt></dt>    <dd>The email of the customer we are invoicing.  This is optional if customer or invoiceToCopy is provided.  A new customer will be created using the the name and email. </dd>
+	 *     <dt><tt>invoiceId</tt></dt>    <dd>User defined invoice id. If not provided the system will generate a numeric id. [max length: 255] </dd>
+	 *     <dt><tt>invoiceToCopy</tt></dt>    <dd>The id of an existing invoice to be copied.  This is optional if customer or a name and email are provided </dd>
+	 *     <dt><tt>items.amount</tt></dt>    <dd>Amount of the invoice item (the smallest unit of your currency). Example: 100 = $1.00USD [min value: -9999900, max value: 9999900] <strong>required </strong></dd>
+	 *     <dt><tt>items.description</tt></dt>    <dd>The description of the invoice item. [max length: 1024] </dd>
+	 *     <dt><tt>items.invoice</tt></dt>    <dd>The ID of the invoice this item belongs to. </dd>
+	 *     <dt><tt>items.product</tt></dt>    <dd>The product this invoice item refers to. </dd>
+	 *     <dt><tt>items.quantity</tt></dt>    <dd>Quantity of the item.  This total amount of the invoice item is the amount * quantity. [min value: 1, max value: 999999, default: 1] </dd>
+	 *     <dt><tt>items.reference</tt></dt>    <dd>User defined reference field. [max length: 255] </dd>
+	 *     <dt><tt>items.tax</tt></dt>    <dd>The tax ID of the tax charge in the invoice item. </dd>
+	 *     <dt><tt>lateFee</tt></dt>    <dd>The late fee amount that will be added to the invoice total is the due date is past due.  Value provided must be in the smallest unit of your currency. Example: 100 = $1.00USD [max value: 9999900] </dd>
+	 *     <dt><tt>memo</tt></dt>    <dd>A memo that is displayed to the customer on the invoice payment screen. [max length: 4000] </dd>
+	 *     <dt><tt>name</tt></dt>    <dd>The name of the customer we are invoicing.  This is optional if customer or invoiceToCopy is provided.  A new customer will be created using the the name and email. [max length: 50, min length: 2] </dd>
+	 *     <dt><tt>note</tt></dt>    <dd>This field can be used to store a note that is not displayed to the customer. [max length: 4000] </dd>
+	 *     <dt><tt>reference</tt></dt>    <dd>User defined reference field. [max length: 255] </dd>
+	 *     <dt><tt>shippingAddress.city</tt></dt>    <dd>Address city of the location where the goods or services were supplied. [max length: 255, min length: 2] </dd>
+	 *     <dt><tt>shippingAddress.country</tt></dt>    <dd>Address country of the location where the goods or services were supplied. [max length: 2, min length: 2] </dd>
+	 *     <dt><tt>shippingAddress.line1</tt></dt>    <dd>Address line 1 of the location where the goods or services were supplied. [max length: 255] </dd>
+	 *     <dt><tt>shippingAddress.line2</tt></dt>    <dd>Address line 2 of the location where the goods or services were supplied. [max length: 255] </dd>
+	 *     <dt><tt>shippingAddress.name</tt></dt>    <dd>Address name of the location where the goods or services were supplied. [max length: 255] </dd>
+	 *     <dt><tt>shippingAddress.state</tt></dt>    <dd>Address state of the location where the goods or services were supplied. [max length: 255] </dd>
+	 *     <dt><tt>shippingAddress.zip</tt></dt>    <dd>Address zip of the location where the goods or services were supplied. [max length: 32] </dd>
+	 *     <dt><tt>suppliedDate</tt></dt>    <dd>The date on which the goods or services were supplied. </dd>
+	 *     <dt><tt>taxNo</tt></dt>    <dd>The tax number or VAT id of the person who supplied the goods or services. [max length: 255] </dd>
+	 *     <dt><tt>type</tt></dt>    <dd>The type of invoice.  One of WEB or MOBILE. [valid values: WEB, MOBILE, default: WEB] </dd></dl>
+	 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.<i/>
+	 * @return    Invoice a Invoice object.
+	 */
+	static public function createInvoice($hash, $authentication = null) {
 
-        $args = func_get_args();
-        $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+		$args = func_get_args();
+		$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-        $instance = new Simplify_Invoice();
-        $instance->setAll($hash);
+		$instance = new Simplify_Invoice();
+		$instance->setAll($hash);
 
-        $object = Simplify_PaymentsApi::createObject($instance, $authentication);
-        return $object;
-    }
+		$object = Simplify_PaymentsApi::createObject($instance, $authentication);
+		return $object;
+	}
 
 
 
 
-       /**
-        * Deletes an Simplify_Invoice object.
-        *
-        * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-        */
-        public function deleteInvoice($authentication = null) {
+	   /**
+		* Deletes an Simplify_Invoice object.
+		*
+		* @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		*/
+		public function deleteInvoice($authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
 
-            $obj = Simplify_PaymentsApi::deleteObject($this, $authentication);
-            $this->properties = null;
-            return true;
-        }
+			$obj = Simplify_PaymentsApi::deleteObject($this, $authentication);
+			$this->properties = null;
+			return true;
+		}
 
 
-       /**
-        * Retrieve Simplify_Invoice objects.
-        * @param     array criteria a map of parameters; valid keys are:<dl style="padding-left:10px;">
-        *     <dt><tt>filter</tt></dt>    <dd>Filters to apply to the list.  </dd>
-        *     <dt><tt>max</tt></dt>    <dd>Allows up to a max of 50 list items to return. [min value: 0, max value: 50, default: 20]  </dd>
-        *     <dt><tt>offset</tt></dt>    <dd>Used in paging of the list.  This is the start offset of the page. [min value: 0, default: 0]  </dd>
-        *     <dt><tt>sorting</tt></dt>    <dd>Allows for ascending or descending sorting of the list.  The value maps properties to the sort direction (either <tt>asc</tt> for ascending or <tt>desc</tt> for descending).  Sortable properties are: <tt> id</tt><tt> invoiceDate</tt><tt> dueDate</tt><tt> datePaid</tt><tt> customer</tt><tt> status</tt><tt> dateCreated</tt>.</dd></dl>
-        * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-        * @return    ResourceList a ResourceList object that holds the list of Invoice objects and the total
-        *            number of Invoice objects available for the given criteria.
-        * @see       ResourceList
-        */
-        static public function listInvoice($criteria = null, $authentication = null) {
+	   /**
+		* Retrieve Simplify_Invoice objects.
+		* @param     array criteria a map of parameters; valid keys are:<dl style="padding-left:10px;">
+		*     <dt><tt>filter</tt></dt>    <dd>Filters to apply to the list.  </dd>
+		*     <dt><tt>max</tt></dt>    <dd>Allows up to a max of 50 list items to return. [min value: 0, max value: 50, default: 20]  </dd>
+		*     <dt><tt>offset</tt></dt>    <dd>Used in paging of the list.  This is the start offset of the page. [min value: 0, default: 0]  </dd>
+		*     <dt><tt>sorting</tt></dt>    <dd>Allows for ascending or descending sorting of the list.  The value maps properties to the sort direction (either <tt>asc</tt> for ascending or <tt>desc</tt> for descending).  Sortable properties are: <tt> id</tt><tt> invoiceDate</tt><tt> dueDate</tt><tt> datePaid</tt><tt> customer</tt><tt> status</tt><tt> dateCreated</tt>.</dd></dl>
+		* @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		* @return    ResourceList a ResourceList object that holds the list of Invoice objects and the total
+		*            number of Invoice objects available for the given criteria.
+		* @see       ResourceList
+		*/
+		static public function listInvoice($criteria = null, $authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-            $val = new Simplify_Invoice();
-            $list = Simplify_PaymentsApi::listObject($val, $criteria, $authentication);
+			$val = new Simplify_Invoice();
+			$list = Simplify_PaymentsApi::listObject($val, $criteria, $authentication);
 
-            return $list;
-        }
+			return $list;
+		}
 
 
-        /**
-         * Retrieve a Simplify_Invoice object from the API
-         *
-         * @param     string id  the id of the Invoice object to retrieve
-         * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-         * @return    Invoice a Invoice object
-         */
-        static public function findInvoice($id, $authentication = null) {
+		/**
+		 * Retrieve a Simplify_Invoice object from the API
+		 *
+		 * @param     string id  the id of the Invoice object to retrieve
+		 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		 * @return    Invoice a Invoice object
+		 */
+		static public function findInvoice($id, $authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-            $val = new Simplify_Invoice();
-            $val->id = $id;
+			$val = new Simplify_Invoice();
+			$val->id = $id;
 
-            $obj = Simplify_PaymentsApi::findObject($val, $authentication);
+			$obj = Simplify_PaymentsApi::findObject($val, $authentication);
 
-            return $obj;
-        }
+			return $obj;
+		}
 
 
-        /**
-         * Updates an Simplify_Invoice object.
-         *
-         * The properties that can be updated:
-         * <dl style="padding-left:10px;">
-         *     <dt><tt>billingAddress.city</tt></dt>    <dd>Billing address city of the location where the goods or services were supplied. [max length: 255, min length: 2] </dd>
-         *     <dt><tt>billingAddress.country</tt></dt>    <dd>Billing address country of the location where the goods or services were supplied. [max length: 2, min length: 2] </dd>
-         *     <dt><tt>billingAddress.line1</tt></dt>    <dd>Billing address line 1 of the location where the goods or services were supplied. [max length: 255] </dd>
-         *     <dt><tt>billingAddress.line2</tt></dt>    <dd>Billing address line 2 of the location where the goods or services were supplied. [max length: 255] </dd>
-         *     <dt><tt>billingAddress.name</tt></dt>    <dd>Billing address name of the location where the goods or services were supplied. [max length: 255] </dd>
-         *     <dt><tt>billingAddress.state</tt></dt>    <dd>Billing address state of the location where the goods or services were supplied. [max length: 255] </dd>
-         *     <dt><tt>billingAddress.zip</tt></dt>    <dd>Billing address zip of the location where the goods or services were supplied. [max length: 32] </dd>
-         *     <dt><tt>businessAddress.city</tt></dt>    <dd>Business address city of the business that is sending the invoice. [max length: 255, min length: 2] </dd>
-         *     <dt><tt>businessAddress.country</tt></dt>    <dd>Business address country of the business that is sending the invoice. [max length: 2, min length: 2] </dd>
-         *     <dt><tt>businessAddress.line1</tt></dt>    <dd>Business address line 1 of the business that is sending the invoice. [max length: 255] </dd>
-         *     <dt><tt>businessAddress.line2</tt></dt>    <dd>Business address line 2 of the business that is sending the invoice. [max length: 255] </dd>
-         *     <dt><tt>businessAddress.name</tt></dt>    <dd>Business address name of the business that is sending the invoice. [max length: 255] </dd>
-         *     <dt><tt>businessAddress.state</tt></dt>    <dd>Business address state of the business that is sending the invoice. [max length: 255] </dd>
-         *     <dt><tt>businessAddress.zip</tt></dt>    <dd>Business address zip of the business that is sending the invoice. [max length: 32] </dd>
-         *     <dt><tt>currency</tt></dt>    <dd>Currency code (ISO-4217). Must match the currency associated with your account. [max length: 3, min length: 3] </dd>
-         *     <dt><tt>customerTaxNo</tt></dt>    <dd>The tax number or VAT id of the person to whom the goods or services were supplied. [max length: 255] </dd>
-         *     <dt><tt>datePaid</tt></dt>    <dd>This is the date the invoice was PAID in UTC millis. </dd>
-         *     <dt><tt>discountRate</tt></dt>    <dd>The discount percent as a decimal e.g. 12.5.  This is used to calculate the discount amount which is subtracted from the total amount due before any tax is applied. [max length: 6] </dd>
-         *     <dt><tt>dueDate</tt></dt>    <dd>The date invoice payment is due.  If a late fee is provided this will be added to the invoice total is the due date has past. </dd>
-         *     <dt><tt>email</tt></dt>    <dd>The email of the customer we are invoicing.  This is optional if customer or invoiceToCopy is provided.  A new customer will be created using the the name and email. </dd>
-         *     <dt><tt>invoiceId</tt></dt>    <dd>User defined invoice id. If not provided the system will generate a numeric id. [max length: 255] </dd>
-         *     <dt><tt>items.amount</tt></dt>    <dd>Amount of the invoice item in the smallest unit of your currency. Example: 100 = $1.00USD [min value: -9999900, max value: 9999900] <strong>required </strong></dd>
-         *     <dt><tt>items.description</tt></dt>    <dd>The description of the invoice item. [max length: 1024] </dd>
-         *     <dt><tt>items.invoice</tt></dt>    <dd>The ID of the invoice this item belongs to. </dd>
-         *     <dt><tt>items.product</tt></dt>    <dd>The Id of the product this item refers to. </dd>
-         *     <dt><tt>items.quantity</tt></dt>    <dd>Quantity of the item.  This total amount of the invoice item is the amount * quantity. [min value: 1, max value: 999999, default: 1] </dd>
-         *     <dt><tt>items.reference</tt></dt>    <dd>User defined reference field. [max length: 255] </dd>
-         *     <dt><tt>items.tax</tt></dt>    <dd>The tax ID of the tax charge in the invoice item. </dd>
-         *     <dt><tt>lateFee</tt></dt>    <dd>The late fee amount that will be added to the invoice total is the due date is past due.  Value provided must be in the smallest unit of your currency. Example: 100 = $1.00USD [max value: 9999900] </dd>
-         *     <dt><tt>memo</tt></dt>    <dd>A memo that is displayed to the customer on the invoice payment screen. [max length: 4000] </dd>
-         *     <dt><tt>name</tt></dt>    <dd>The name of the customer we are invoicing.  This is optional if customer or invoiceToCopy is provided.  A new customer will be created using the the name and email. [max length: 50, min length: 2] </dd>
-         *     <dt><tt>note</tt></dt>    <dd>This field can be used to store a note that is not displayed to the customer. [max length: 4000] </dd>
-         *     <dt><tt>payment</tt></dt>    <dd>The ID of the payment.  Use this ID to query the /payment API. [max length: 255] </dd>
-         *     <dt><tt>reference</tt></dt>    <dd>User defined reference field. [max length: 255] </dd>
-         *     <dt><tt>shippingAddress.city</tt></dt>    <dd>Address city of the location where the goods or services were supplied. [max length: 255, min length: 2] </dd>
-         *     <dt><tt>shippingAddress.country</tt></dt>    <dd>Address country of the location where the goods or services were supplied. [max length: 2, min length: 2] </dd>
-         *     <dt><tt>shippingAddress.line1</tt></dt>    <dd>Address line 1 of the location where the goods or services were supplied. [max length: 255] </dd>
-         *     <dt><tt>shippingAddress.line2</tt></dt>    <dd>Address line 2 of the location where the goods or services were supplied. [max length: 255] </dd>
-         *     <dt><tt>shippingAddress.name</tt></dt>    <dd>Address name of the location where the goods or services were supplied. [max length: 255] </dd>
-         *     <dt><tt>shippingAddress.state</tt></dt>    <dd>Address state of the location where the goods or services were supplied. [max length: 255] </dd>
-         *     <dt><tt>shippingAddress.zip</tt></dt>    <dd>Address zip of the location where the goods or services were supplied. [max length: 32] </dd>
-         *     <dt><tt>status</tt></dt>    <dd>New status of the invoice. </dd>
-         *     <dt><tt>suppliedDate</tt></dt>    <dd>The date on which the goods or services were supplied. </dd>
-         *     <dt><tt>taxNo</tt></dt>    <dd>The tax number or VAT id of the person who supplied the goods or services. [max length: 255] </dd></dl>
-         * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-         * @return    Invoice a Invoice object.
-         */
-        public function updateInvoice($authentication = null)  {
+		/**
+		 * Updates an Simplify_Invoice object.
+		 *
+		 * The properties that can be updated:
+		 * <dl style="padding-left:10px;">
+		 *     <dt><tt>billingAddress.city</tt></dt>    <dd>Billing address city of the location where the goods or services were supplied. [max length: 255, min length: 2] </dd>
+		 *     <dt><tt>billingAddress.country</tt></dt>    <dd>Billing address country of the location where the goods or services were supplied. [max length: 2, min length: 2] </dd>
+		 *     <dt><tt>billingAddress.line1</tt></dt>    <dd>Billing address line 1 of the location where the goods or services were supplied. [max length: 255] </dd>
+		 *     <dt><tt>billingAddress.line2</tt></dt>    <dd>Billing address line 2 of the location where the goods or services were supplied. [max length: 255] </dd>
+		 *     <dt><tt>billingAddress.name</tt></dt>    <dd>Billing address name of the location where the goods or services were supplied. [max length: 255] </dd>
+		 *     <dt><tt>billingAddress.state</tt></dt>    <dd>Billing address state of the location where the goods or services were supplied. [max length: 255] </dd>
+		 *     <dt><tt>billingAddress.zip</tt></dt>    <dd>Billing address zip of the location where the goods or services were supplied. [max length: 32] </dd>
+		 *     <dt><tt>businessAddress.city</tt></dt>    <dd>Business address city of the business that is sending the invoice. [max length: 255, min length: 2] </dd>
+		 *     <dt><tt>businessAddress.country</tt></dt>    <dd>Business address country of the business that is sending the invoice. [max length: 2, min length: 2] </dd>
+		 *     <dt><tt>businessAddress.line1</tt></dt>    <dd>Business address line 1 of the business that is sending the invoice. [max length: 255] </dd>
+		 *     <dt><tt>businessAddress.line2</tt></dt>    <dd>Business address line 2 of the business that is sending the invoice. [max length: 255] </dd>
+		 *     <dt><tt>businessAddress.name</tt></dt>    <dd>Business address name of the business that is sending the invoice. [max length: 255] </dd>
+		 *     <dt><tt>businessAddress.state</tt></dt>    <dd>Business address state of the business that is sending the invoice. [max length: 255] </dd>
+		 *     <dt><tt>businessAddress.zip</tt></dt>    <dd>Business address zip of the business that is sending the invoice. [max length: 32] </dd>
+		 *     <dt><tt>currency</tt></dt>    <dd>Currency code (ISO-4217). Must match the currency associated with your account. [max length: 3, min length: 3] </dd>
+		 *     <dt><tt>customerTaxNo</tt></dt>    <dd>The tax number or VAT id of the person to whom the goods or services were supplied. [max length: 255] </dd>
+		 *     <dt><tt>datePaid</tt></dt>    <dd>This is the date the invoice was PAID in UTC millis. </dd>
+		 *     <dt><tt>discountRate</tt></dt>    <dd>The discount percent as a decimal e.g. 12.5.  This is used to calculate the discount amount which is subtracted from the total amount due before any tax is applied. [max length: 6] </dd>
+		 *     <dt><tt>dueDate</tt></dt>    <dd>The date invoice payment is due.  If a late fee is provided this will be added to the invoice total is the due date has past. </dd>
+		 *     <dt><tt>email</tt></dt>    <dd>The email of the customer we are invoicing.  This is optional if customer or invoiceToCopy is provided.  A new customer will be created using the the name and email. </dd>
+		 *     <dt><tt>invoiceId</tt></dt>    <dd>User defined invoice id. If not provided the system will generate a numeric id. [max length: 255] </dd>
+		 *     <dt><tt>items.amount</tt></dt>    <dd>Amount of the invoice item in the smallest unit of your currency. Example: 100 = $1.00USD [min value: -9999900, max value: 9999900] <strong>required </strong></dd>
+		 *     <dt><tt>items.description</tt></dt>    <dd>The description of the invoice item. [max length: 1024] </dd>
+		 *     <dt><tt>items.invoice</tt></dt>    <dd>The ID of the invoice this item belongs to. </dd>
+		 *     <dt><tt>items.product</tt></dt>    <dd>The Id of the product this item refers to. </dd>
+		 *     <dt><tt>items.quantity</tt></dt>    <dd>Quantity of the item.  This total amount of the invoice item is the amount * quantity. [min value: 1, max value: 999999, default: 1] </dd>
+		 *     <dt><tt>items.reference</tt></dt>    <dd>User defined reference field. [max length: 255] </dd>
+		 *     <dt><tt>items.tax</tt></dt>    <dd>The tax ID of the tax charge in the invoice item. </dd>
+		 *     <dt><tt>lateFee</tt></dt>    <dd>The late fee amount that will be added to the invoice total is the due date is past due.  Value provided must be in the smallest unit of your currency. Example: 100 = $1.00USD [max value: 9999900] </dd>
+		 *     <dt><tt>memo</tt></dt>    <dd>A memo that is displayed to the customer on the invoice payment screen. [max length: 4000] </dd>
+		 *     <dt><tt>name</tt></dt>    <dd>The name of the customer we are invoicing.  This is optional if customer or invoiceToCopy is provided.  A new customer will be created using the the name and email. [max length: 50, min length: 2] </dd>
+		 *     <dt><tt>note</tt></dt>    <dd>This field can be used to store a note that is not displayed to the customer. [max length: 4000] </dd>
+		 *     <dt><tt>payment</tt></dt>    <dd>The ID of the payment.  Use this ID to query the /payment API. [max length: 255] </dd>
+		 *     <dt><tt>reference</tt></dt>    <dd>User defined reference field. [max length: 255] </dd>
+		 *     <dt><tt>shippingAddress.city</tt></dt>    <dd>Address city of the location where the goods or services were supplied. [max length: 255, min length: 2] </dd>
+		 *     <dt><tt>shippingAddress.country</tt></dt>    <dd>Address country of the location where the goods or services were supplied. [max length: 2, min length: 2] </dd>
+		 *     <dt><tt>shippingAddress.line1</tt></dt>    <dd>Address line 1 of the location where the goods or services were supplied. [max length: 255] </dd>
+		 *     <dt><tt>shippingAddress.line2</tt></dt>    <dd>Address line 2 of the location where the goods or services were supplied. [max length: 255] </dd>
+		 *     <dt><tt>shippingAddress.name</tt></dt>    <dd>Address name of the location where the goods or services were supplied. [max length: 255] </dd>
+		 *     <dt><tt>shippingAddress.state</tt></dt>    <dd>Address state of the location where the goods or services were supplied. [max length: 255] </dd>
+		 *     <dt><tt>shippingAddress.zip</tt></dt>    <dd>Address zip of the location where the goods or services were supplied. [max length: 32] </dd>
+		 *     <dt><tt>status</tt></dt>    <dd>New status of the invoice. </dd>
+		 *     <dt><tt>suppliedDate</tt></dt>    <dd>The date on which the goods or services were supplied. </dd>
+		 *     <dt><tt>taxNo</tt></dt>    <dd>The tax number or VAT id of the person who supplied the goods or services. [max length: 255] </dd></dl>
+		 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		 * @return    Invoice a Invoice object.
+		 */
+		public function updateInvoice($authentication = null)  {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
 
-            $object = Simplify_PaymentsApi::updateObject($this, $authentication);
-            return $object;
-        }
+			$object = Simplify_PaymentsApi::updateObject($this, $authentication);
+			return $object;
+		}
 
-    /**
-     * @ignore
-     */
-    public function getClazz() {
-        return "Invoice";
-    }
-}
\ No newline at end of file
+	/**
+	 * @ignore
+	 */
+	public function getClazz() {
+		return "Invoice";
+	}
+}
diff --git a/includes/gateways/simplify-commerce/includes/Simplify/InvoiceItem.php b/includes/gateways/simplify-commerce/includes/Simplify/InvoiceItem.php
index 183add41434..2d40f66b942 100644
--- a/includes/gateways/simplify-commerce/includes/Simplify/InvoiceItem.php
+++ b/includes/gateways/simplify-commerce/includes/Simplify/InvoiceItem.php
@@ -2,123 +2,123 @@
 /*
  * Copyright (c) 2013 - 2015 MasterCard International Incorporated
  * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are 
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of
  * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of 
- * conditions and the following disclaimer in the documentation and/or other materials 
+ * Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials
  * provided with the distribution.
- * Neither the name of the MasterCard International Incorporated nor the names of its 
- * contributors may be used to endorse or promote products derived from this software 
+ * Neither the name of the MasterCard International Incorporated nor the names of its
+ * contributors may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
- * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 
 class Simplify_InvoiceItem extends Simplify_Object {
-    /**
-     * Creates an Simplify_InvoiceItem object
-     * @param     array $hash a map of parameters; valid keys are:<dl style="padding-left:10px;">
-     *     <dt><tt>amount</tt></dt>    <dd>Amount of the invoice item in the smallest unit of your currency. Example: 100 = $1.00USD [min value: -9999900, max value: 9999900] <strong>required </strong></dd>
-     *     <dt><tt>description</tt></dt>    <dd>Individual items of an invoice [max length: 1024] </dd>
-     *     <dt><tt>invoice</tt></dt>    <dd>The ID of the invoice this item belongs to. </dd>
-     *     <dt><tt>product</tt></dt>    <dd>Product ID this item relates to. </dd>
-     *     <dt><tt>quantity</tt></dt>    <dd>Quantity of the item.  This total amount of the invoice item is the amount * quantity. [min value: 1, max value: 999999, default: 1] </dd>
-     *     <dt><tt>reference</tt></dt>    <dd>User defined reference field. [max length: 255] </dd>
-     *     <dt><tt>tax</tt></dt>    <dd>The tax ID of the tax charge in the invoice item. </dd></dl>
-     * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.<i/>
-     * @return    InvoiceItem a InvoiceItem object.
-     */
-    static public function createInvoiceItem($hash, $authentication = null) {
+	/**
+	 * Creates an Simplify_InvoiceItem object
+	 * @param     array $hash a map of parameters; valid keys are:<dl style="padding-left:10px;">
+	 *     <dt><tt>amount</tt></dt>    <dd>Amount of the invoice item in the smallest unit of your currency. Example: 100 = $1.00USD [min value: -9999900, max value: 9999900] <strong>required </strong></dd>
+	 *     <dt><tt>description</tt></dt>    <dd>Individual items of an invoice [max length: 1024] </dd>
+	 *     <dt><tt>invoice</tt></dt>    <dd>The ID of the invoice this item belongs to. </dd>
+	 *     <dt><tt>product</tt></dt>    <dd>Product ID this item relates to. </dd>
+	 *     <dt><tt>quantity</tt></dt>    <dd>Quantity of the item.  This total amount of the invoice item is the amount * quantity. [min value: 1, max value: 999999, default: 1] </dd>
+	 *     <dt><tt>reference</tt></dt>    <dd>User defined reference field. [max length: 255] </dd>
+	 *     <dt><tt>tax</tt></dt>    <dd>The tax ID of the tax charge in the invoice item. </dd></dl>
+	 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.<i/>
+	 * @return    InvoiceItem a InvoiceItem object.
+	 */
+	static public function createInvoiceItem($hash, $authentication = null) {
 
-        $args = func_get_args();
-        $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+		$args = func_get_args();
+		$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-        $instance = new Simplify_InvoiceItem();
-        $instance->setAll($hash);
+		$instance = new Simplify_InvoiceItem();
+		$instance->setAll($hash);
 
-        $object = Simplify_PaymentsApi::createObject($instance, $authentication);
-        return $object;
-    }
+		$object = Simplify_PaymentsApi::createObject($instance, $authentication);
+		return $object;
+	}
 
 
 
 
-       /**
-        * Deletes an Simplify_InvoiceItem object.
-        *
-        * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-        */
-        public function deleteInvoiceItem($authentication = null) {
+	   /**
+		* Deletes an Simplify_InvoiceItem object.
+		*
+		* @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		*/
+		public function deleteInvoiceItem($authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
 
-            $obj = Simplify_PaymentsApi::deleteObject($this, $authentication);
-            $this->properties = null;
-            return true;
-        }
+			$obj = Simplify_PaymentsApi::deleteObject($this, $authentication);
+			$this->properties = null;
+			return true;
+		}
 
 
-        /**
-         * Retrieve a Simplify_InvoiceItem object from the API
-         *
-         * @param     string id  the id of the InvoiceItem object to retrieve
-         * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-         * @return    InvoiceItem a InvoiceItem object
-         */
-        static public function findInvoiceItem($id, $authentication = null) {
+		/**
+		 * Retrieve a Simplify_InvoiceItem object from the API
+		 *
+		 * @param     string id  the id of the InvoiceItem object to retrieve
+		 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		 * @return    InvoiceItem a InvoiceItem object
+		 */
+		static public function findInvoiceItem($id, $authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-            $val = new Simplify_InvoiceItem();
-            $val->id = $id;
+			$val = new Simplify_InvoiceItem();
+			$val->id = $id;
 
-            $obj = Simplify_PaymentsApi::findObject($val, $authentication);
+			$obj = Simplify_PaymentsApi::findObject($val, $authentication);
 
-            return $obj;
-        }
+			return $obj;
+		}
 
 
-        /**
-         * Updates an Simplify_InvoiceItem object.
-         *
-         * The properties that can be updated:
-         * <dl style="padding-left:10px;">
-         *     <dt><tt>amount</tt></dt>    <dd>Amount of the invoice item in the smallest unit of your currency. Example: 100 = $1.00USD [min value: 1] </dd>
-         *     <dt><tt>description</tt></dt>    <dd>Individual items of an invoice </dd>
-         *     <dt><tt>quantity</tt></dt>    <dd>Quantity of the item.  This total amount of the invoice item is the amount * quantity. [min value: 1, max value: 999999] </dd>
-         *     <dt><tt>reference</tt></dt>    <dd>User defined reference field. </dd>
-         *     <dt><tt>tax</tt></dt>    <dd>The tax ID of the tax charge in the invoice item. </dd></dl>
-         * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-         * @return    InvoiceItem a InvoiceItem object.
-         */
-        public function updateInvoiceItem($authentication = null)  {
+		/**
+		 * Updates an Simplify_InvoiceItem object.
+		 *
+		 * The properties that can be updated:
+		 * <dl style="padding-left:10px;">
+		 *     <dt><tt>amount</tt></dt>    <dd>Amount of the invoice item in the smallest unit of your currency. Example: 100 = $1.00USD [min value: 1] </dd>
+		 *     <dt><tt>description</tt></dt>    <dd>Individual items of an invoice </dd>
+		 *     <dt><tt>quantity</tt></dt>    <dd>Quantity of the item.  This total amount of the invoice item is the amount * quantity. [min value: 1, max value: 999999] </dd>
+		 *     <dt><tt>reference</tt></dt>    <dd>User defined reference field. </dd>
+		 *     <dt><tt>tax</tt></dt>    <dd>The tax ID of the tax charge in the invoice item. </dd></dl>
+		 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		 * @return    InvoiceItem a InvoiceItem object.
+		 */
+		public function updateInvoiceItem($authentication = null)  {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
 
-            $object = Simplify_PaymentsApi::updateObject($this, $authentication);
-            return $object;
-        }
+			$object = Simplify_PaymentsApi::updateObject($this, $authentication);
+			return $object;
+		}
 
-    /**
-     * @ignore
-     */
-    public function getClazz() {
-        return "InvoiceItem";
-    }
-}
\ No newline at end of file
+	/**
+	 * @ignore
+	 */
+	public function getClazz() {
+		return "InvoiceItem";
+	}
+}
diff --git a/includes/gateways/simplify-commerce/includes/Simplify/Object.php b/includes/gateways/simplify-commerce/includes/Simplify/Object.php
index 0885fa38666..8d8293f7f3e 100644
--- a/includes/gateways/simplify-commerce/includes/Simplify/Object.php
+++ b/includes/gateways/simplify-commerce/includes/Simplify/Object.php
@@ -2,27 +2,27 @@
 /*
  * Copyright (c) 2013 - 2015 MasterCard International Incorporated
  * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are 
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of
  * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of 
- * conditions and the following disclaimer in the documentation and/or other materials 
+ * Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials
  * provided with the distribution.
- * Neither the name of the MasterCard International Incorporated nor the names of its 
- * contributors may be used to endorse or promote products derived from this software 
+ * Neither the name of the MasterCard International Incorporated nor the names of its
+ * contributors may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
- * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
@@ -32,48 +32,48 @@
  */
 class Simplify_Object {
 
-    private $properties = array();
+	private $properties = array();
 
-    /**
-     * @ignore
-     */
-    public function __get($key) {
-        if (array_key_exists($key, $this->properties)) {
-            return $this->properties[$key];
-        } else {
-            return null;
-        }
-    }
+	/**
+	 * @ignore
+	 */
+	public function __get($key) {
+		if (array_key_exists($key, $this->properties)) {
+			return $this->properties[$key];
+		} else {
+			return null;
+		}
+	}
 
-    /**
-     * @ignore
-     */
-    public function __set($key, $value) {
-        $this->properties[$key] = $value;
-    }
+	/**
+	 * @ignore
+	 */
+	public function __set($key, $value) {
+		$this->properties[$key] = $value;
+	}
 
-    /**
-     * Updates the object's properties with the values in the specified map.
-     * @param $hash array Map of values to set.
-     */
-    public function setAll($hash) {
-        foreach ($hash as $key => $value) {
-            $this->$key = $value;
-        }
-    }
+	/**
+	 * Updates the object's properties with the values in the specified map.
+	 * @param $hash array Map of values to set.
+	 */
+	public function setAll($hash) {
+		foreach ($hash as $key => $value) {
+			$this->$key = $value;
+		}
+	}
 
-    /**
-     * @ignore
-     */
-    public function __toString() {
-        return json_encode($this->properties);
-    }
+	/**
+	 * @ignore
+	 */
+	public function __toString() {
+		return json_encode($this->properties);
+	}
 
-    /**
-     * Returns the object's properties as a map.
-     * @return array map of properties.
-     */
-    public function getProperties() {
-        return $this->properties;
-    }
-}
\ No newline at end of file
+	/**
+	 * Returns the object's properties as a map.
+	 * @return array map of properties.
+	 */
+	public function getProperties() {
+		return $this->properties;
+	}
+}
diff --git a/includes/gateways/simplify-commerce/includes/Simplify/Payment.php b/includes/gateways/simplify-commerce/includes/Simplify/Payment.php
index 04f93fb72ab..3b7c9e0950f 100644
--- a/includes/gateways/simplify-commerce/includes/Simplify/Payment.php
+++ b/includes/gateways/simplify-commerce/includes/Simplify/Payment.php
@@ -2,140 +2,140 @@
 /*
  * Copyright (c) 2013 - 2015 MasterCard International Incorporated
  * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are 
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of
  * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of 
- * conditions and the following disclaimer in the documentation and/or other materials 
+ * Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials
  * provided with the distribution.
- * Neither the name of the MasterCard International Incorporated nor the names of its 
- * contributors may be used to endorse or promote products derived from this software 
+ * Neither the name of the MasterCard International Incorporated nor the names of its
+ * contributors may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
- * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 
 class Simplify_Payment extends Simplify_Object {
-    /**
-     * Creates an Simplify_Payment object
-     * @param     array $hash a map of parameters; valid keys are:<dl style="padding-left:10px;">
-     *     <dt><tt>amount</tt></dt>    <dd>Amount of the payment (in the smallest unit of your currency). Example: 100 = $1.00USD </dd>
-     *     <dt><tt>authorization</tt></dt>    <dd>The ID of the authorization being used to capture the payment. </dd>
-     *     <dt><tt>card.addressCity</tt></dt>    <dd>City of the cardholder. [max length: 50, min length: 2] </dd>
-     *     <dt><tt>card.addressCountry</tt></dt>    <dd>Country code (ISO-3166-1-alpha-2 code) of residence of the cardholder. [max length: 2, min length: 2] </dd>
-     *     <dt><tt>card.addressLine1</tt></dt>    <dd>Address of the cardholder. [max length: 255] </dd>
-     *     <dt><tt>card.addressLine2</tt></dt>    <dd>Address of the cardholder if needed. [max length: 255] </dd>
-     *     <dt><tt>card.addressState</tt></dt>    <dd>State of residence of the cardholder. For the US, this is a 2-digit USPS code. [max length: 255, min length: 2] </dd>
-     *     <dt><tt>card.addressZip</tt></dt>    <dd>Postal code of the cardholder. The postal code size is between 5 and 9 in length and only contain numbers or letters. [max length: 9, min length: 3] </dd>
-     *     <dt><tt>card.cvc</tt></dt>    <dd>CVC security code of the card. This is the code on the back of the card. Example: 123 </dd>
-     *     <dt><tt>card.expMonth</tt></dt>    <dd>Expiration month of the card. Format is MM. Example: January = 01 [min value: 1, max value: 12] <strong>required </strong></dd>
-     *     <dt><tt>card.expYear</tt></dt>    <dd>Expiration year of the card. Format is YY. Example: 2013 = 13 [min value: 0, max value: 99] <strong>required </strong></dd>
-     *     <dt><tt>card.name</tt></dt>    <dd>Name as it appears on the card. [max length: 50, min length: 2] </dd>
-     *     <dt><tt>card.number</tt></dt>    <dd>Card number as it appears on the card. [max length: 19, min length: 13] <strong>required </strong></dd>
-     *     <dt><tt>currency</tt></dt>    <dd>Currency code (ISO-4217) for the transaction. Must match the currency associated with your account. [default: USD] <strong>required </strong></dd>
-     *     <dt><tt>customer</tt></dt>    <dd>ID of customer. If specified, card on file of customer will be used. </dd>
-     *     <dt><tt>description</tt></dt>    <dd>Free form text field to be used as a description of the payment. This field is echoed back with the payment on any find or list operations. [max length: 1024] </dd>
-     *     <dt><tt>invoice</tt></dt>    <dd>ID of invoice for which this payment is being made. </dd>
-     *     <dt><tt>reference</tt></dt>    <dd>Custom reference field to be used with outside systems. </dd>
-     *     <dt><tt>replayId</tt></dt>    <dd>An identifier that can be sent to uniquely identify a payment request to facilitate retries due to I/O related issues. This identifier must be unique for your account (sandbox or live) across all of your payments. If supplied, we will check for a payment on your account that matches this identifier. If found will attempt to return an identical response of the original request. [max length: 50, min length: 1] </dd>
-     *     <dt><tt>statementDescription.name</tt></dt>    <dd>Merchant name. <strong>required </strong></dd>
-     *     <dt><tt>statementDescription.phoneNumber</tt></dt>    <dd>Merchant contact phone number. </dd>
-     *     <dt><tt>token</tt></dt>    <dd>If specified, card associated with card token will be used. [max length: 255] </dd></dl>
-     * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.<i/>
-     * @return    Payment a Payment object.
-     */
-    static public function createPayment($hash, $authentication = null) {
+	/**
+	 * Creates an Simplify_Payment object
+	 * @param     array $hash a map of parameters; valid keys are:<dl style="padding-left:10px;">
+	 *     <dt><tt>amount</tt></dt>    <dd>Amount of the payment (in the smallest unit of your currency). Example: 100 = $1.00USD </dd>
+	 *     <dt><tt>authorization</tt></dt>    <dd>The ID of the authorization being used to capture the payment. </dd>
+	 *     <dt><tt>card.addressCity</tt></dt>    <dd>City of the cardholder. [max length: 50, min length: 2] </dd>
+	 *     <dt><tt>card.addressCountry</tt></dt>    <dd>Country code (ISO-3166-1-alpha-2 code) of residence of the cardholder. [max length: 2, min length: 2] </dd>
+	 *     <dt><tt>card.addressLine1</tt></dt>    <dd>Address of the cardholder. [max length: 255] </dd>
+	 *     <dt><tt>card.addressLine2</tt></dt>    <dd>Address of the cardholder if needed. [max length: 255] </dd>
+	 *     <dt><tt>card.addressState</tt></dt>    <dd>State of residence of the cardholder. For the US, this is a 2-digit USPS code. [max length: 255, min length: 2] </dd>
+	 *     <dt><tt>card.addressZip</tt></dt>    <dd>Postal code of the cardholder. The postal code size is between 5 and 9 in length and only contain numbers or letters. [max length: 9, min length: 3] </dd>
+	 *     <dt><tt>card.cvc</tt></dt>    <dd>CVC security code of the card. This is the code on the back of the card. Example: 123 </dd>
+	 *     <dt><tt>card.expMonth</tt></dt>    <dd>Expiration month of the card. Format is MM. Example: January = 01 [min value: 1, max value: 12] <strong>required </strong></dd>
+	 *     <dt><tt>card.expYear</tt></dt>    <dd>Expiration year of the card. Format is YY. Example: 2013 = 13 [min value: 0, max value: 99] <strong>required </strong></dd>
+	 *     <dt><tt>card.name</tt></dt>    <dd>Name as it appears on the card. [max length: 50, min length: 2] </dd>
+	 *     <dt><tt>card.number</tt></dt>    <dd>Card number as it appears on the card. [max length: 19, min length: 13] <strong>required </strong></dd>
+	 *     <dt><tt>currency</tt></dt>    <dd>Currency code (ISO-4217) for the transaction. Must match the currency associated with your account. [default: USD] <strong>required </strong></dd>
+	 *     <dt><tt>customer</tt></dt>    <dd>ID of customer. If specified, card on file of customer will be used. </dd>
+	 *     <dt><tt>description</tt></dt>    <dd>Free form text field to be used as a description of the payment. This field is echoed back with the payment on any find or list operations. [max length: 1024] </dd>
+	 *     <dt><tt>invoice</tt></dt>    <dd>ID of invoice for which this payment is being made. </dd>
+	 *     <dt><tt>reference</tt></dt>    <dd>Custom reference field to be used with outside systems. </dd>
+	 *     <dt><tt>replayId</tt></dt>    <dd>An identifier that can be sent to uniquely identify a payment request to facilitate retries due to I/O related issues. This identifier must be unique for your account (sandbox or live) across all of your payments. If supplied, we will check for a payment on your account that matches this identifier. If found will attempt to return an identical response of the original request. [max length: 50, min length: 1] </dd>
+	 *     <dt><tt>statementDescription.name</tt></dt>    <dd>Merchant name. <strong>required </strong></dd>
+	 *     <dt><tt>statementDescription.phoneNumber</tt></dt>    <dd>Merchant contact phone number. </dd>
+	 *     <dt><tt>token</tt></dt>    <dd>If specified, card associated with card token will be used. [max length: 255] </dd></dl>
+	 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.<i/>
+	 * @return    Payment a Payment object.
+	 */
+	static public function createPayment($hash, $authentication = null) {
 
-        $args = func_get_args();
-        $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+		$args = func_get_args();
+		$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-        $instance = new Simplify_Payment();
-        $instance->setAll($hash);
+		$instance = new Simplify_Payment();
+		$instance->setAll($hash);
 
-        $object = Simplify_PaymentsApi::createObject($instance, $authentication);
-        return $object;
-    }
+		$object = Simplify_PaymentsApi::createObject($instance, $authentication);
+		return $object;
+	}
 
 
 
-       /**
-        * Retrieve Simplify_Payment objects.
-        * @param     array criteria a map of parameters; valid keys are:<dl style="padding-left:10px;">
-        *     <dt><tt>filter</tt></dt>    <dd>Filters to apply to the list.  </dd>
-        *     <dt><tt>max</tt></dt>    <dd>Allows up to a max of 50 list items to return. [min value: 0, max value: 50, default: 20]  </dd>
-        *     <dt><tt>offset</tt></dt>    <dd>Used in paging of the list.  This is the start offset of the page. [min value: 0, default: 0]  </dd>
-        *     <dt><tt>sorting</tt></dt>    <dd>Allows for ascending or descending sorting of the list.  The value maps properties to the sort direction (either <tt>asc</tt> for ascending or <tt>desc</tt> for descending).  Sortable properties are: <tt> dateCreated</tt><tt> createdBy</tt><tt> amount</tt><tt> id</tt><tt> description</tt><tt> paymentDate</tt>.</dd></dl>
-        * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-        * @return    ResourceList a ResourceList object that holds the list of Payment objects and the total
-        *            number of Payment objects available for the given criteria.
-        * @see       ResourceList
-        */
-        static public function listPayment($criteria = null, $authentication = null) {
+	   /**
+		* Retrieve Simplify_Payment objects.
+		* @param     array criteria a map of parameters; valid keys are:<dl style="padding-left:10px;">
+		*     <dt><tt>filter</tt></dt>    <dd>Filters to apply to the list.  </dd>
+		*     <dt><tt>max</tt></dt>    <dd>Allows up to a max of 50 list items to return. [min value: 0, max value: 50, default: 20]  </dd>
+		*     <dt><tt>offset</tt></dt>    <dd>Used in paging of the list.  This is the start offset of the page. [min value: 0, default: 0]  </dd>
+		*     <dt><tt>sorting</tt></dt>    <dd>Allows for ascending or descending sorting of the list.  The value maps properties to the sort direction (either <tt>asc</tt> for ascending or <tt>desc</tt> for descending).  Sortable properties are: <tt> dateCreated</tt><tt> createdBy</tt><tt> amount</tt><tt> id</tt><tt> description</tt><tt> paymentDate</tt>.</dd></dl>
+		* @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		* @return    ResourceList a ResourceList object that holds the list of Payment objects and the total
+		*            number of Payment objects available for the given criteria.
+		* @see       ResourceList
+		*/
+		static public function listPayment($criteria = null, $authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-            $val = new Simplify_Payment();
-            $list = Simplify_PaymentsApi::listObject($val, $criteria, $authentication);
+			$val = new Simplify_Payment();
+			$list = Simplify_PaymentsApi::listObject($val, $criteria, $authentication);
 
-            return $list;
-        }
+			return $list;
+		}
 
 
-        /**
-         * Retrieve a Simplify_Payment object from the API
-         *
-         * @param     string id  the id of the Payment object to retrieve
-         * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-         * @return    Payment a Payment object
-         */
-        static public function findPayment($id, $authentication = null) {
+		/**
+		 * Retrieve a Simplify_Payment object from the API
+		 *
+		 * @param     string id  the id of the Payment object to retrieve
+		 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		 * @return    Payment a Payment object
+		 */
+		static public function findPayment($id, $authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-            $val = new Simplify_Payment();
-            $val->id = $id;
+			$val = new Simplify_Payment();
+			$val->id = $id;
 
-            $obj = Simplify_PaymentsApi::findObject($val, $authentication);
+			$obj = Simplify_PaymentsApi::findObject($val, $authentication);
 
-            return $obj;
-        }
+			return $obj;
+		}
 
 
-        /**
-         * Updates an Simplify_Payment object.
-         *
-         * The properties that can be updated:
-         * <dl style="padding-left:10px;"></dl>
-         * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-         * @return    Payment a Payment object.
-         */
-        public function updatePayment($authentication = null)  {
+		/**
+		 * Updates an Simplify_Payment object.
+		 *
+		 * The properties that can be updated:
+		 * <dl style="padding-left:10px;"></dl>
+		 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		 * @return    Payment a Payment object.
+		 */
+		public function updatePayment($authentication = null)  {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
 
-            $object = Simplify_PaymentsApi::updateObject($this, $authentication);
-            return $object;
-        }
+			$object = Simplify_PaymentsApi::updateObject($this, $authentication);
+			return $object;
+		}
 
-    /**
-     * @ignore
-     */
-    public function getClazz() {
-        return "Payment";
-    }
-}
\ No newline at end of file
+	/**
+	 * @ignore
+	 */
+	public function getClazz() {
+		return "Payment";
+	}
+}
diff --git a/includes/gateways/simplify-commerce/includes/Simplify/PaymentsApi.php b/includes/gateways/simplify-commerce/includes/Simplify/PaymentsApi.php
index f318f70030d..4f51193b610 100644
--- a/includes/gateways/simplify-commerce/includes/Simplify/PaymentsApi.php
+++ b/includes/gateways/simplify-commerce/includes/Simplify/PaymentsApi.php
@@ -2,27 +2,27 @@
 /*
  * Copyright (c) 2013 - 2015 MasterCard International Incorporated
  * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are 
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of
  * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of 
- * conditions and the following disclaimer in the documentation and/or other materials 
+ * Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials
  * provided with the distribution.
- * Neither the name of the MasterCard International Incorporated nor the names of its 
- * contributors may be used to endorse or promote products derived from this software 
+ * Neither the name of the MasterCard International Incorporated nor the names of its
+ * contributors may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
- * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
@@ -30,261 +30,261 @@
 class Simplify_PaymentsApi
 {
 
-    /**
-     * @ignore
-     */
-    public static $methodMap = array(
-        'create' => 'POST',
-        'delete' => 'DELETE',
-        'list' => 'GET',
-        'show' => 'GET',
-        'update' => 'PUT'
-    );
+	/**
+	 * @ignore
+	 */
+	public static $methodMap = array(
+		'create' => 'POST',
+		'delete' => 'DELETE',
+		'list' => 'GET',
+		'show' => 'GET',
+		'update' => 'PUT'
+	);
 
-    /**
-     * @ignore
-     */
-    static public function createObject($object, $authentication = null)
-    {
-        $paymentsApi = new Simplify_PaymentsApi();
+	/**
+	 * @ignore
+	 */
+	static public function createObject($object, $authentication = null)
+	{
+		$paymentsApi = new Simplify_PaymentsApi();
 
-        $jsonObject = $paymentsApi->execute("create", $object, $authentication);
+		$jsonObject = $paymentsApi->execute("create", $object, $authentication);
 
-        $o = $paymentsApi->convertFromHashToObject($jsonObject, $object->getClazz());
+		$o = $paymentsApi->convertFromHashToObject($jsonObject, $object->getClazz());
 
-        return $o;
-    }
+		return $o;
+	}
 
-    /**
-     * @ignore
-     */
-    static public function findObject($object, $authentication = null)
-    {
-        $paymentsApi = new Simplify_PaymentsApi();
+	/**
+	 * @ignore
+	 */
+	static public function findObject($object, $authentication = null)
+	{
+		$paymentsApi = new Simplify_PaymentsApi();
 
-        $jsonObject = $paymentsApi->execute("show", $object, $authentication);
-        $o = $paymentsApi->convertFromHashToObject($jsonObject, $object->getClazz());
+		$jsonObject = $paymentsApi->execute("show", $object, $authentication);
+		$o = $paymentsApi->convertFromHashToObject($jsonObject, $object->getClazz());
 
-        return $o;
-    }
+		return $o;
+	}
 
-    /**
-     * @ignore
-     */
-    static public function updateObject($object, $authentication = null) {
-        $paymentsApi = new Simplify_PaymentsApi();
+	/**
+	 * @ignore
+	 */
+	static public function updateObject($object, $authentication = null) {
+		$paymentsApi = new Simplify_PaymentsApi();
 
-        $jsonObject = $paymentsApi->execute("update", $object, $authentication);
-        $o = $paymentsApi->convertFromHashToObject($jsonObject, $object->getClazz());
+		$jsonObject = $paymentsApi->execute("update", $object, $authentication);
+		$o = $paymentsApi->convertFromHashToObject($jsonObject, $object->getClazz());
 
-        return $o;
-    }
+		return $o;
+	}
 
-    /**
-     * @ignore
-     */
-    static public function deleteObject($object, $authentication = null) {
-        $paymentsApi = new Simplify_PaymentsApi();
+	/**
+	 * @ignore
+	 */
+	static public function deleteObject($object, $authentication = null) {
+		$paymentsApi = new Simplify_PaymentsApi();
 
-        $jsonObject = $paymentsApi->execute("delete", $object, $authentication);
+		$jsonObject = $paymentsApi->execute("delete", $object, $authentication);
 
-        return $jsonObject;
-    }
+		return $jsonObject;
+	}
 
-    /**
-     * @ignore
-     */
-    static public function listObject($object, $criteria = null, $authentication =null) {
-        if ($criteria != null) {
-            if (isset($criteria['max'])) {
-                $object->max = $criteria['max'];
-            }
-            if (isset($criteria['offset'])) {
-                $object->offset = $criteria['offset'];
-            }
-            if (isset($criteria['sorting'])) {
-                $object->sorting = $criteria['sorting'];
-            }
-            if (isset($criteria['filter'])) {
-                $object->filter = $criteria['filter'];
-            }
-        }
+	/**
+	 * @ignore
+	 */
+	static public function listObject($object, $criteria = null, $authentication =null) {
+		if ($criteria != null) {
+			if (isset($criteria['max'])) {
+				$object->max = $criteria['max'];
+			}
+			if (isset($criteria['offset'])) {
+				$object->offset = $criteria['offset'];
+			}
+			if (isset($criteria['sorting'])) {
+				$object->sorting = $criteria['sorting'];
+			}
+			if (isset($criteria['filter'])) {
+				$object->filter = $criteria['filter'];
+			}
+		}
 
-        $paymentsApi = new Simplify_PaymentsApi();
-        $jsonObject = $paymentsApi->execute("list", $object, $authentication);
+		$paymentsApi = new Simplify_PaymentsApi();
+		$jsonObject = $paymentsApi->execute("list", $object, $authentication);
 
-        $ret = new Simplify_ResourceList();
-        if (array_key_exists('list', $jsonObject) & is_array($jsonObject['list'])) {
-            foreach ($jsonObject['list'] as $obj) {
-                array_push($ret->list, $paymentsApi->convertFromHashToObject($obj, $object->getClazz()));
-            }
-            $ret->total = $jsonObject['total'];
-        }
+		$ret = new Simplify_ResourceList();
+		if (array_key_exists('list', $jsonObject) & is_array($jsonObject['list'])) {
+			foreach ($jsonObject['list'] as $obj) {
+				array_push($ret->list, $paymentsApi->convertFromHashToObject($obj, $object->getClazz()));
+			}
+			$ret->total = $jsonObject['total'];
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    /**
-     * @ignore
-     */
-    public function convertFromHashToObject($from, $toClazz)
-    {
-        $clazz = 'stdClass';
-        $toClazz = "Simplify_" . $toClazz;
-        if ("stdClass" != $toClazz && class_exists("{$toClazz}", false)) {
-            $clazz = "{$toClazz}";
-        }
-        $object = new $clazz();
+	/**
+	 * @ignore
+	 */
+	public function convertFromHashToObject($from, $toClazz)
+	{
+		$clazz = 'stdClass';
+		$toClazz = "Simplify_" . $toClazz;
+		if ("stdClass" != $toClazz && class_exists("{$toClazz}", false)) {
+			$clazz = "{$toClazz}";
+		}
+		$object = new $clazz();
 
-        foreach ($from as $key => $value) {
-            if (is_array($value) && count(array_keys($value))) {
-                $newClazz = "Simplify_" . ucfirst($key);
-                if (!class_exists($newClazz, false)) {
-                    $newClazz = 'stdClass';
-                }
+		foreach ($from as $key => $value) {
+			if (is_array($value) && count(array_keys($value))) {
+				$newClazz = "Simplify_" . ucfirst($key);
+				if (!class_exists($newClazz, false)) {
+					$newClazz = 'stdClass';
+				}
 
-                $object->$key = $this->convertFromHashToObject($value, $newClazz);
-            } else {
-                $object->$key = $value;
-            }
-        }
+				$object->$key = $this->convertFromHashToObject($value, $newClazz);
+			} else {
+				$object->$key = $value;
+			}
+		}
 
-        return $object;
-    }
+		return $object;
+	}
 
-    /**
-     * @ignore
-     */
-    public function getUrl($publicKey, $action, $object)
-    {
-        $url = $this->fixUrl(Simplify::$apiBaseSandboxUrl);
-        if ($this->isLiveKey($publicKey)) {
-            $url = $this->fixUrl(Simplify::$apiBaseLiveUrl);
-        }
-        $url = $this->fixUrl($url) . urlencode(lcfirst($object->getClazz())) . '/';
+	/**
+	 * @ignore
+	 */
+	public function getUrl($publicKey, $action, $object)
+	{
+		$url = $this->fixUrl(Simplify::$apiBaseSandboxUrl);
+		if ($this->isLiveKey($publicKey)) {
+			$url = $this->fixUrl(Simplify::$apiBaseLiveUrl);
+		}
+		$url = $this->fixUrl($url) . urlencode(lcfirst($object->getClazz())) . '/';
 
-        $queryParams = array();
-        if ($action == "show") {
-            $url .= urlencode($object->id);
-        } elseif ($action == "list") {
-            $queryParams = array_merge($queryParams, array('max' => $object->max, 'offset' => $object->offset));
-            if (is_array($object->filter) && count(array_keys($object->filter))) {
-                foreach ($object->filter as $key => $value) {
-		    $queryParams["filter[$key]"] = $value;
-                }
-            }
-            if (is_array($object->sorting) && count(array_keys($object->sorting))) {
-                foreach ($object->sorting as $key => $value) {
-                    $queryParams["sorting[$key]"] = $value;
-                }
-            }
-            $query = http_build_query($queryParams);
-            if ($query != '') {
-                if (strpos($url, '?', strlen($url)) === false) $url .= '?';
-                $url .= $query;
-            }
+		$queryParams = array();
+		if ($action == "show") {
+			$url .= urlencode($object->id);
+		} elseif ($action == "list") {
+			$queryParams = array_merge($queryParams, array('max' => $object->max, 'offset' => $object->offset));
+			if (is_array($object->filter) && count(array_keys($object->filter))) {
+				foreach ($object->filter as $key => $value) {
+			$queryParams["filter[$key]"] = $value;
+				}
+			}
+			if (is_array($object->sorting) && count(array_keys($object->sorting))) {
+				foreach ($object->sorting as $key => $value) {
+					$queryParams["sorting[$key]"] = $value;
+				}
+			}
+			$query = http_build_query($queryParams);
+			if ($query != '') {
+				if (strpos($url, '?', strlen($url)) === false) $url .= '?';
+				$url .= $query;
+			}
 
-        } elseif ($action == "delete") {
-            $url .= urlencode($object->id);
-        } elseif ($action == "update") {
-            $url .= urlencode($object->id);
-        } elseif ($action == "create") {
-        }
-        return $url;
-    }
+		} elseif ($action == "delete") {
+			$url .= urlencode($object->id);
+		} elseif ($action == "update") {
+			$url .= urlencode($object->id);
+		} elseif ($action == "create") {
+		}
+		return $url;
+	}
 
-    /**
-     * @ignore
-     */
-    public function getMethod($action)
-    {
-        if (array_key_exists(strtolower($action), self::$methodMap)) {
-            return self::$methodMap[strtolower($action)];
-        }
-        return 'GET';
-    }
+	/**
+	 * @ignore
+	 */
+	public function getMethod($action)
+	{
+		if (array_key_exists(strtolower($action), self::$methodMap)) {
+			return self::$methodMap[strtolower($action)];
+		}
+		return 'GET';
+	}
 
-    /**
-     * @ignore
-     */
-    private function execute($action, $object, $authentication)
-    {
-        $http = new Simplify_HTTP();
+	/**
+	 * @ignore
+	 */
+	private function execute($action, $object, $authentication)
+	{
+		$http = new Simplify_HTTP();
 
-        return $http->apiRequest($this->getUrl($authentication->publicKey, $action, $object), $this->getMethod($action),
-            $authentication, json_encode($object->getProperties()));
-    }
+		return $http->apiRequest($this->getUrl($authentication->publicKey, $action, $object), $this->getMethod($action),
+			$authentication, json_encode($object->getProperties()));
+	}
 
-    /**
-     * @ignore
-     */
-    public function jwsDecode($hash, $authentication)
-    {
-        $http = new Simplify_HTTP();
+	/**
+	 * @ignore
+	 */
+	public function jwsDecode($hash, $authentication)
+	{
+		$http = new Simplify_HTTP();
 
-        $data = $http->jwsDecode($authentication, $hash);
+		$data = $http->jwsDecode($authentication, $hash);
 
-        return json_decode($data, true);
-    }
+		return json_decode($data, true);
+	}
 
-    /**
-     * @ignore
-     */
-    private function fixUrl($url)
-    {
-        if ($this->endsWith($url, '/')) {
-            return $url;
-        }
-        return $url . '/';
-    }
+	/**
+	 * @ignore
+	 */
+	private function fixUrl($url)
+	{
+		if ($this->endsWith($url, '/')) {
+			return $url;
+		}
+		return $url . '/';
+	}
 
-    /**
-     * @ignore
-     */
-    private function isLiveKey($k) {
-        return strpos($k, "lvpb") === 0;
-    }
+	/**
+	 * @ignore
+	 */
+	private function isLiveKey($k) {
+		return strpos($k, "lvpb") === 0;
+	}
 
-    /**
-     * @ignore
-     */
-    private function endsWith($s, $c)
-    {
-        return substr($s, -strlen($c)) == $c;
-    }
+	/**
+	 * @ignore
+	 */
+	private function endsWith($s, $c)
+	{
+		return substr($s, -strlen($c)) == $c;
+	}
 
-    /**
-     * Helper function to build the Authentication object for backwards compatibility.
-     * An array of all the arguments passed to one of the API functions is checked against what
-     * we expect to received.  If it's greater, then we're assuming that the user is using the older way of
-     * passing the keys. i.e as two separate strings.  We take those two string and create the Authentication object
-     *
-     * @ignore
-     * @param $authentication
-     * @param $args
-     * @param $expectedArgCount
-     * @return Simplify_Authentication
-     */
-    static function buildAuthenticationObject($authentication = null, $args, $expectedArgCount){
+	/**
+	 * Helper function to build the Authentication object for backwards compatibility.
+	 * An array of all the arguments passed to one of the API functions is checked against what
+	 * we expect to received.  If it's greater, then we're assuming that the user is using the older way of
+	 * passing the keys. i.e as two separate strings.  We take those two string and create the Authentication object
+	 *
+	 * @ignore
+	 * @param $authentication
+	 * @param $args
+	 * @param $expectedArgCount
+	 * @return Simplify_Authentication
+	 */
+	static function buildAuthenticationObject($authentication = null, $args, $expectedArgCount){
 
-        if(sizeof($args) > $expectedArgCount) {
-            $authentication = new Simplify_Authentication($args[$expectedArgCount-1], $args[$expectedArgCount]);
-        }
+		if(sizeof($args) > $expectedArgCount) {
+			$authentication = new Simplify_Authentication($args[$expectedArgCount-1], $args[$expectedArgCount]);
+		}
 
-        if ($authentication == null){
-            $authentication = new Simplify_Authentication();
-        }
+		if ($authentication == null){
+			$authentication = new Simplify_Authentication();
+		}
 
-        // check that the keys have been set, if not use the global keys
-        if ( empty($authentication->publicKey)){
-            $authentication->publicKey = Simplify::$publicKey;
-        }
-        if ( empty($authentication->privateKey)){
-            $authentication->privateKey = Simplify::$privateKey;
-        }
+		// check that the keys have been set, if not use the global keys
+		if ( empty($authentication->publicKey)){
+			$authentication->publicKey = Simplify::$publicKey;
+		}
+		if ( empty($authentication->privateKey)){
+			$authentication->privateKey = Simplify::$privateKey;
+		}
 
-        return $authentication;
-    }
+		return $authentication;
+	}
 
 }
 
diff --git a/includes/gateways/simplify-commerce/includes/Simplify/Plan.php b/includes/gateways/simplify-commerce/includes/Simplify/Plan.php
index 90d492d6a1d..d5a09564589 100644
--- a/includes/gateways/simplify-commerce/includes/Simplify/Plan.php
+++ b/includes/gateways/simplify-commerce/includes/Simplify/Plan.php
@@ -2,146 +2,146 @@
 /*
  * Copyright (c) 2013 - 2015 MasterCard International Incorporated
  * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are 
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of
  * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of 
- * conditions and the following disclaimer in the documentation and/or other materials 
+ * Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials
  * provided with the distribution.
- * Neither the name of the MasterCard International Incorporated nor the names of its 
- * contributors may be used to endorse or promote products derived from this software 
+ * Neither the name of the MasterCard International Incorporated nor the names of its
+ * contributors may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
- * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 
 class Simplify_Plan extends Simplify_Object {
-    /**
-     * Creates an Simplify_Plan object
-     * @param     array $hash a map of parameters; valid keys are:<dl style="padding-left:10px;">
-     *     <dt><tt>amount</tt></dt>    <dd>Amount of payment for the plan in the smallest unit of your currency. Example: 100 = $1.00USD <strong>required </strong></dd>
-     *     <dt><tt>billingCycle</tt></dt>    <dd>How the plan is billed to the customer. Values must be AUTO (indefinitely until the customer cancels) or FIXED (a fixed number of billing cycles). [default: AUTO] </dd>
-     *     <dt><tt>billingCycleLimit</tt></dt>    <dd>The number of fixed billing cycles for a plan. Only used if the billingCycle parameter is set to FIXED. Example: 4 </dd>
-     *     <dt><tt>currency</tt></dt>    <dd>Currency code (ISO-4217) for the plan. Must match the currency associated with your account. [default: USD] <strong>required </strong></dd>
-     *     <dt><tt>frequency</tt></dt>    <dd>Frequency of payment for the plan. Used in conjunction with frequencyPeriod. Valid values are "DAILY", "WEEKLY", "MONTHLY" and "YEARLY". [default: MONTHLY] <strong>required </strong></dd>
-     *     <dt><tt>frequencyPeriod</tt></dt>    <dd>Period of frequency of payment for the plan. Example: if the frequency is weekly, and periodFrequency is 2, then the subscription is billed bi-weekly. [min value: 1, default: 1] <strong>required </strong></dd>
-     *     <dt><tt>name</tt></dt>    <dd>Name of the plan [max length: 50, min length: 2] <strong>required </strong></dd>
-     *     <dt><tt>renewalReminderLeadDays</tt></dt>    <dd>If set, how many days before the next billing cycle that a renewal reminder is sent to the customer. If null, then no emails are sent. Minimum value is 7 if set. </dd>
-     *     <dt><tt>trialPeriod</tt></dt>    <dd>Plan free trial period selection.  Must be Days, Weeks, or Month [default: NONE] <strong>required </strong></dd>
-     *     <dt><tt>trialPeriodQuantity</tt></dt>    <dd>Quantity of the trial period.  Must be greater than 0 and a whole number. [min value: 1] </dd></dl>
-     * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.<i/>
-     * @return    Plan a Plan object.
-     */
-    static public function createPlan($hash, $authentication = null) {
+	/**
+	 * Creates an Simplify_Plan object
+	 * @param     array $hash a map of parameters; valid keys are:<dl style="padding-left:10px;">
+	 *     <dt><tt>amount</tt></dt>    <dd>Amount of payment for the plan in the smallest unit of your currency. Example: 100 = $1.00USD <strong>required </strong></dd>
+	 *     <dt><tt>billingCycle</tt></dt>    <dd>How the plan is billed to the customer. Values must be AUTO (indefinitely until the customer cancels) or FIXED (a fixed number of billing cycles). [default: AUTO] </dd>
+	 *     <dt><tt>billingCycleLimit</tt></dt>    <dd>The number of fixed billing cycles for a plan. Only used if the billingCycle parameter is set to FIXED. Example: 4 </dd>
+	 *     <dt><tt>currency</tt></dt>    <dd>Currency code (ISO-4217) for the plan. Must match the currency associated with your account. [default: USD] <strong>required </strong></dd>
+	 *     <dt><tt>frequency</tt></dt>    <dd>Frequency of payment for the plan. Used in conjunction with frequencyPeriod. Valid values are "DAILY", "WEEKLY", "MONTHLY" and "YEARLY". [default: MONTHLY] <strong>required </strong></dd>
+	 *     <dt><tt>frequencyPeriod</tt></dt>    <dd>Period of frequency of payment for the plan. Example: if the frequency is weekly, and periodFrequency is 2, then the subscription is billed bi-weekly. [min value: 1, default: 1] <strong>required </strong></dd>
+	 *     <dt><tt>name</tt></dt>    <dd>Name of the plan [max length: 50, min length: 2] <strong>required </strong></dd>
+	 *     <dt><tt>renewalReminderLeadDays</tt></dt>    <dd>If set, how many days before the next billing cycle that a renewal reminder is sent to the customer. If null, then no emails are sent. Minimum value is 7 if set. </dd>
+	 *     <dt><tt>trialPeriod</tt></dt>    <dd>Plan free trial period selection.  Must be Days, Weeks, or Month [default: NONE] <strong>required </strong></dd>
+	 *     <dt><tt>trialPeriodQuantity</tt></dt>    <dd>Quantity of the trial period.  Must be greater than 0 and a whole number. [min value: 1] </dd></dl>
+	 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.<i/>
+	 * @return    Plan a Plan object.
+	 */
+	static public function createPlan($hash, $authentication = null) {
 
-        $args = func_get_args();
-        $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+		$args = func_get_args();
+		$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-        $instance = new Simplify_Plan();
-        $instance->setAll($hash);
+		$instance = new Simplify_Plan();
+		$instance->setAll($hash);
 
-        $object = Simplify_PaymentsApi::createObject($instance, $authentication);
-        return $object;
-    }
+		$object = Simplify_PaymentsApi::createObject($instance, $authentication);
+		return $object;
+	}
 
 
 
 
-       /**
-        * Deletes an Simplify_Plan object.
-        *
-        * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-        */
-        public function deletePlan($authentication = null) {
+	   /**
+		* Deletes an Simplify_Plan object.
+		*
+		* @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		*/
+		public function deletePlan($authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
 
-            $obj = Simplify_PaymentsApi::deleteObject($this, $authentication);
-            $this->properties = null;
-            return true;
-        }
+			$obj = Simplify_PaymentsApi::deleteObject($this, $authentication);
+			$this->properties = null;
+			return true;
+		}
 
 
-       /**
-        * Retrieve Simplify_Plan objects.
-        * @param     array criteria a map of parameters; valid keys are:<dl style="padding-left:10px;">
-        *     <dt><tt>filter</tt></dt>    <dd>Filters to apply to the list.  </dd>
-        *     <dt><tt>max</tt></dt>    <dd>Allows up to a max of 50 list items to return. [min value: 0, max value: 50, default: 20]  </dd>
-        *     <dt><tt>offset</tt></dt>    <dd>Used in paging of the list.  This is the start offset of the page. [min value: 0, default: 0]  </dd>
-        *     <dt><tt>sorting</tt></dt>    <dd>Allows for ascending or descending sorting of the list.  The value maps properties to the sort direction (either <tt>asc</tt> for ascending or <tt>desc</tt> for descending).  Sortable properties are: <tt> dateCreated</tt><tt> amount</tt><tt> frequency</tt><tt> name</tt><tt> id</tt>.</dd></dl>
-        * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-        * @return    ResourceList a ResourceList object that holds the list of Plan objects and the total
-        *            number of Plan objects available for the given criteria.
-        * @see       ResourceList
-        */
-        static public function listPlan($criteria = null, $authentication = null) {
+	   /**
+		* Retrieve Simplify_Plan objects.
+		* @param     array criteria a map of parameters; valid keys are:<dl style="padding-left:10px;">
+		*     <dt><tt>filter</tt></dt>    <dd>Filters to apply to the list.  </dd>
+		*     <dt><tt>max</tt></dt>    <dd>Allows up to a max of 50 list items to return. [min value: 0, max value: 50, default: 20]  </dd>
+		*     <dt><tt>offset</tt></dt>    <dd>Used in paging of the list.  This is the start offset of the page. [min value: 0, default: 0]  </dd>
+		*     <dt><tt>sorting</tt></dt>    <dd>Allows for ascending or descending sorting of the list.  The value maps properties to the sort direction (either <tt>asc</tt> for ascending or <tt>desc</tt> for descending).  Sortable properties are: <tt> dateCreated</tt><tt> amount</tt><tt> frequency</tt><tt> name</tt><tt> id</tt>.</dd></dl>
+		* @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		* @return    ResourceList a ResourceList object that holds the list of Plan objects and the total
+		*            number of Plan objects available for the given criteria.
+		* @see       ResourceList
+		*/
+		static public function listPlan($criteria = null, $authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-            $val = new Simplify_Plan();
-            $list = Simplify_PaymentsApi::listObject($val, $criteria, $authentication);
+			$val = new Simplify_Plan();
+			$list = Simplify_PaymentsApi::listObject($val, $criteria, $authentication);
 
-            return $list;
-        }
+			return $list;
+		}
 
 
-        /**
-         * Retrieve a Simplify_Plan object from the API
-         *
-         * @param     string id  the id of the Plan object to retrieve
-         * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-         * @return    Plan a Plan object
-         */
-        static public function findPlan($id, $authentication = null) {
+		/**
+		 * Retrieve a Simplify_Plan object from the API
+		 *
+		 * @param     string id  the id of the Plan object to retrieve
+		 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		 * @return    Plan a Plan object
+		 */
+		static public function findPlan($id, $authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-            $val = new Simplify_Plan();
-            $val->id = $id;
+			$val = new Simplify_Plan();
+			$val->id = $id;
 
-            $obj = Simplify_PaymentsApi::findObject($val, $authentication);
+			$obj = Simplify_PaymentsApi::findObject($val, $authentication);
 
-            return $obj;
-        }
+			return $obj;
+		}
 
 
-        /**
-         * Updates an Simplify_Plan object.
-         *
-         * The properties that can be updated:
-         * <dl style="padding-left:10px;">
-         *     <dt><tt>name</tt></dt>    <dd>Name of the plan. [min length: 2] <strong>required </strong></dd></dl>
-         * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-         * @return    Plan a Plan object.
-         */
-        public function updatePlan($authentication = null)  {
+		/**
+		 * Updates an Simplify_Plan object.
+		 *
+		 * The properties that can be updated:
+		 * <dl style="padding-left:10px;">
+		 *     <dt><tt>name</tt></dt>    <dd>Name of the plan. [min length: 2] <strong>required </strong></dd></dl>
+		 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		 * @return    Plan a Plan object.
+		 */
+		public function updatePlan($authentication = null)  {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
 
-            $object = Simplify_PaymentsApi::updateObject($this, $authentication);
-            return $object;
-        }
+			$object = Simplify_PaymentsApi::updateObject($this, $authentication);
+			return $object;
+		}
 
-    /**
-     * @ignore
-     */
-    public function getClazz() {
-        return "Plan";
-    }
-}
\ No newline at end of file
+	/**
+	 * @ignore
+	 */
+	public function getClazz() {
+		return "Plan";
+	}
+}
diff --git a/includes/gateways/simplify-commerce/includes/Simplify/Refund.php b/includes/gateways/simplify-commerce/includes/Simplify/Refund.php
index 2c2ccd8eead..ae2e55a8b04 100644
--- a/includes/gateways/simplify-commerce/includes/Simplify/Refund.php
+++ b/includes/gateways/simplify-commerce/includes/Simplify/Refund.php
@@ -2,107 +2,107 @@
 /*
  * Copyright (c) 2013 - 2015 MasterCard International Incorporated
  * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are 
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of
  * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of 
- * conditions and the following disclaimer in the documentation and/or other materials 
+ * Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials
  * provided with the distribution.
- * Neither the name of the MasterCard International Incorporated nor the names of its 
- * contributors may be used to endorse or promote products derived from this software 
+ * Neither the name of the MasterCard International Incorporated nor the names of its
+ * contributors may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
- * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 
 class Simplify_Refund extends Simplify_Object {
-    /**
-     * Creates an Simplify_Refund object
-     * @param     array $hash a map of parameters; valid keys are:<dl style="padding-left:10px;">
-     *     <dt><tt>amount</tt></dt>    <dd>Amount of the refund in the smallest unit of your currency. Example: 100 = $1.00USD [min value: 1] <strong>required </strong></dd>
-     *     <dt><tt>payment</tt></dt>    <dd>ID of the payment for the refund <strong>required </strong></dd>
-     *     <dt><tt>reason</tt></dt>    <dd>Reason for the refund </dd>
-     *     <dt><tt>reference</tt></dt>    <dd>Custom reference field to be used with outside systems. </dd>
-     *     <dt><tt>replayId</tt></dt>    <dd>An identifier that can be sent to uniquely identify a refund request to facilitate retries due to I/O related issues. This identifier must be unique for your account (sandbox or live) across all of your refunds. If supplied, we will check for a refund on your account that matches this identifier. If found we will return an identical response to that of the original request. [max length: 50, min length: 1] </dd>
-     *     <dt><tt>statementDescription.name</tt></dt>    <dd>Merchant name. <strong>required </strong></dd>
-     *     <dt><tt>statementDescription.phoneNumber</tt></dt>    <dd>Merchant contact phone number. </dd></dl>
-     * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.<i/>
-     * @return    Refund a Refund object.
-     */
-    static public function createRefund($hash, $authentication = null) {
+	/**
+	 * Creates an Simplify_Refund object
+	 * @param     array $hash a map of parameters; valid keys are:<dl style="padding-left:10px;">
+	 *     <dt><tt>amount</tt></dt>    <dd>Amount of the refund in the smallest unit of your currency. Example: 100 = $1.00USD [min value: 1] <strong>required </strong></dd>
+	 *     <dt><tt>payment</tt></dt>    <dd>ID of the payment for the refund <strong>required </strong></dd>
+	 *     <dt><tt>reason</tt></dt>    <dd>Reason for the refund </dd>
+	 *     <dt><tt>reference</tt></dt>    <dd>Custom reference field to be used with outside systems. </dd>
+	 *     <dt><tt>replayId</tt></dt>    <dd>An identifier that can be sent to uniquely identify a refund request to facilitate retries due to I/O related issues. This identifier must be unique for your account (sandbox or live) across all of your refunds. If supplied, we will check for a refund on your account that matches this identifier. If found we will return an identical response to that of the original request. [max length: 50, min length: 1] </dd>
+	 *     <dt><tt>statementDescription.name</tt></dt>    <dd>Merchant name. <strong>required </strong></dd>
+	 *     <dt><tt>statementDescription.phoneNumber</tt></dt>    <dd>Merchant contact phone number. </dd></dl>
+	 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.<i/>
+	 * @return    Refund a Refund object.
+	 */
+	static public function createRefund($hash, $authentication = null) {
 
-        $args = func_get_args();
-        $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+		$args = func_get_args();
+		$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-        $instance = new Simplify_Refund();
-        $instance->setAll($hash);
+		$instance = new Simplify_Refund();
+		$instance->setAll($hash);
 
-        $object = Simplify_PaymentsApi::createObject($instance, $authentication);
-        return $object;
-    }
+		$object = Simplify_PaymentsApi::createObject($instance, $authentication);
+		return $object;
+	}
 
 
 
-       /**
-        * Retrieve Simplify_Refund objects.
-        * @param     array criteria a map of parameters; valid keys are:<dl style="padding-left:10px;">
-        *     <dt><tt>filter</tt></dt>    <dd>Filters to apply to the list.  </dd>
-        *     <dt><tt>max</tt></dt>    <dd>Allows up to a max of 50 list items to return. [min value: 0, max value: 50, default: 20]  </dd>
-        *     <dt><tt>offset</tt></dt>    <dd>Used in paging of the list.  This is the start offset of the page. [min value: 0, default: 0]  </dd>
-        *     <dt><tt>sorting</tt></dt>    <dd>Allows for ascending or descending sorting of the list.  The value maps properties to the sort direction (either <tt>asc</tt> for ascending or <tt>desc</tt> for descending).  Sortable properties are: <tt> id</tt><tt> amount</tt><tt> description</tt><tt> dateCreated</tt><tt> paymentDate</tt>.</dd></dl>
-        * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-        * @return    ResourceList a ResourceList object that holds the list of Refund objects and the total
-        *            number of Refund objects available for the given criteria.
-        * @see       ResourceList
-        */
-        static public function listRefund($criteria = null, $authentication = null) {
+	   /**
+		* Retrieve Simplify_Refund objects.
+		* @param     array criteria a map of parameters; valid keys are:<dl style="padding-left:10px;">
+		*     <dt><tt>filter</tt></dt>    <dd>Filters to apply to the list.  </dd>
+		*     <dt><tt>max</tt></dt>    <dd>Allows up to a max of 50 list items to return. [min value: 0, max value: 50, default: 20]  </dd>
+		*     <dt><tt>offset</tt></dt>    <dd>Used in paging of the list.  This is the start offset of the page. [min value: 0, default: 0]  </dd>
+		*     <dt><tt>sorting</tt></dt>    <dd>Allows for ascending or descending sorting of the list.  The value maps properties to the sort direction (either <tt>asc</tt> for ascending or <tt>desc</tt> for descending).  Sortable properties are: <tt> id</tt><tt> amount</tt><tt> description</tt><tt> dateCreated</tt><tt> paymentDate</tt>.</dd></dl>
+		* @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		* @return    ResourceList a ResourceList object that holds the list of Refund objects and the total
+		*            number of Refund objects available for the given criteria.
+		* @see       ResourceList
+		*/
+		static public function listRefund($criteria = null, $authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-            $val = new Simplify_Refund();
-            $list = Simplify_PaymentsApi::listObject($val, $criteria, $authentication);
+			$val = new Simplify_Refund();
+			$list = Simplify_PaymentsApi::listObject($val, $criteria, $authentication);
 
-            return $list;
-        }
+			return $list;
+		}
 
 
-        /**
-         * Retrieve a Simplify_Refund object from the API
-         *
-         * @param     string id  the id of the Refund object to retrieve
-         * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-         * @return    Refund a Refund object
-         */
-        static public function findRefund($id, $authentication = null) {
+		/**
+		 * Retrieve a Simplify_Refund object from the API
+		 *
+		 * @param     string id  the id of the Refund object to retrieve
+		 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		 * @return    Refund a Refund object
+		 */
+		static public function findRefund($id, $authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-            $val = new Simplify_Refund();
-            $val->id = $id;
+			$val = new Simplify_Refund();
+			$val->id = $id;
 
-            $obj = Simplify_PaymentsApi::findObject($val, $authentication);
+			$obj = Simplify_PaymentsApi::findObject($val, $authentication);
 
-            return $obj;
-        }
+			return $obj;
+		}
 
-    /**
-     * @ignore
-     */
-    public function getClazz() {
-        return "Refund";
-    }
-}
\ No newline at end of file
+	/**
+	 * @ignore
+	 */
+	public function getClazz() {
+		return "Refund";
+	}
+}
diff --git a/includes/gateways/simplify-commerce/includes/Simplify/ResourceList.php b/includes/gateways/simplify-commerce/includes/Simplify/ResourceList.php
index c34b8db78c1..5297c79e392 100644
--- a/includes/gateways/simplify-commerce/includes/Simplify/ResourceList.php
+++ b/includes/gateways/simplify-commerce/includes/Simplify/ResourceList.php
@@ -2,27 +2,27 @@
 /*
  * Copyright (c) 2013 - 2015 MasterCard International Incorporated
  * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are 
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of
  * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of 
- * conditions and the following disclaimer in the documentation and/or other materials 
+ * Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials
  * provided with the distribution.
- * Neither the name of the MasterCard International Incorporated nor the names of its 
- * contributors may be used to endorse or promote products derived from this software 
+ * Neither the name of the MasterCard International Incorporated nor the names of its
+ * contributors may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
- * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
@@ -32,13 +32,13 @@
  */
 class Simplify_ResourceList {
 
-    /**
-     * @var array $list the list of domain objects.
-     */
-    public $list = array();
+	/**
+	 * @var array $list the list of domain objects.
+	 */
+	public $list = array();
 
-    /**
-     * @var int $total the total number of object available.
-     */
-    public $total = 0;
-}
\ No newline at end of file
+	/**
+	 * @var int $total the total number of object available.
+	 */
+	public $total = 0;
+}
diff --git a/includes/gateways/simplify-commerce/includes/Simplify/Subscription.php b/includes/gateways/simplify-commerce/includes/Simplify/Subscription.php
index 514a931b416..e72573824b2 100644
--- a/includes/gateways/simplify-commerce/includes/Simplify/Subscription.php
+++ b/includes/gateways/simplify-commerce/includes/Simplify/Subscription.php
@@ -2,159 +2,159 @@
 /*
  * Copyright (c) 2013 - 2015 MasterCard International Incorporated
  * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are 
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of
  * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of 
- * conditions and the following disclaimer in the documentation and/or other materials 
+ * Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials
  * provided with the distribution.
- * Neither the name of the MasterCard International Incorporated nor the names of its 
- * contributors may be used to endorse or promote products derived from this software 
+ * Neither the name of the MasterCard International Incorporated nor the names of its
+ * contributors may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
- * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 
 class Simplify_Subscription extends Simplify_Object {
-    /**
-     * Creates an Simplify_Subscription object
-     * @param     array $hash a map of parameters; valid keys are:<dl style="padding-left:10px;">
-     *     <dt><tt>amount</tt></dt>    <dd>Amount of the payment in the smallest unit of your currency. Example: 100 = $1.00USD </dd>
-     *     <dt><tt>billingCycle</tt></dt>    <dd>How the plan is billed to the customer. Values must be AUTO (indefinitely until the customer cancels) or FIXED (a fixed number of billing cycles). [default: AUTO] </dd>
-     *     <dt><tt>billingCycleLimit</tt></dt>    <dd>The number of fixed billing cycles for a plan. Only used if the billingCycle parameter is set to FIXED. Example: 4 </dd>
-     *     <dt><tt>coupon</tt></dt>    <dd>Coupon ID associated with the subscription </dd>
-     *     <dt><tt>currency</tt></dt>    <dd>Currency code (ISO-4217). Must match the currency associated with your account. [default: USD] </dd>
-     *     <dt><tt>customer</tt></dt>    <dd>Customer that is enrolling in the subscription. </dd>
-     *     <dt><tt>frequency</tt></dt>    <dd>Frequency of payment for the plan. Used in conjunction with frequencyPeriod. Valid values are "DAILY", "WEEKLY", "MONTHLY" and "YEARLY". </dd>
-     *     <dt><tt>frequencyPeriod</tt></dt>    <dd>Period of frequency of payment for the plan. Example: if the frequency is weekly, and periodFrequency is 2, then the subscription is billed bi-weekly. </dd>
-     *     <dt><tt>name</tt></dt>    <dd>Name describing subscription </dd>
-     *     <dt><tt>plan</tt></dt>    <dd>The ID of the plan that should be used for the subscription. </dd>
-     *     <dt><tt>quantity</tt></dt>    <dd>Quantity of the plan for the subscription. [min value: 1] </dd>
-     *     <dt><tt>renewalReminderLeadDays</tt></dt>    <dd>If set, how many days before the next billing cycle that a renewal reminder is sent to the customer. If null, then no emails are sent. Minimum value is 7 if set. </dd></dl>
-     * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.<i/>
-     * @return    Subscription a Subscription object.
-     */
-    static public function createSubscription($hash, $authentication = null) {
+	/**
+	 * Creates an Simplify_Subscription object
+	 * @param     array $hash a map of parameters; valid keys are:<dl style="padding-left:10px;">
+	 *     <dt><tt>amount</tt></dt>    <dd>Amount of the payment in the smallest unit of your currency. Example: 100 = $1.00USD </dd>
+	 *     <dt><tt>billingCycle</tt></dt>    <dd>How the plan is billed to the customer. Values must be AUTO (indefinitely until the customer cancels) or FIXED (a fixed number of billing cycles). [default: AUTO] </dd>
+	 *     <dt><tt>billingCycleLimit</tt></dt>    <dd>The number of fixed billing cycles for a plan. Only used if the billingCycle parameter is set to FIXED. Example: 4 </dd>
+	 *     <dt><tt>coupon</tt></dt>    <dd>Coupon ID associated with the subscription </dd>
+	 *     <dt><tt>currency</tt></dt>    <dd>Currency code (ISO-4217). Must match the currency associated with your account. [default: USD] </dd>
+	 *     <dt><tt>customer</tt></dt>    <dd>Customer that is enrolling in the subscription. </dd>
+	 *     <dt><tt>frequency</tt></dt>    <dd>Frequency of payment for the plan. Used in conjunction with frequencyPeriod. Valid values are "DAILY", "WEEKLY", "MONTHLY" and "YEARLY". </dd>
+	 *     <dt><tt>frequencyPeriod</tt></dt>    <dd>Period of frequency of payment for the plan. Example: if the frequency is weekly, and periodFrequency is 2, then the subscription is billed bi-weekly. </dd>
+	 *     <dt><tt>name</tt></dt>    <dd>Name describing subscription </dd>
+	 *     <dt><tt>plan</tt></dt>    <dd>The ID of the plan that should be used for the subscription. </dd>
+	 *     <dt><tt>quantity</tt></dt>    <dd>Quantity of the plan for the subscription. [min value: 1] </dd>
+	 *     <dt><tt>renewalReminderLeadDays</tt></dt>    <dd>If set, how many days before the next billing cycle that a renewal reminder is sent to the customer. If null, then no emails are sent. Minimum value is 7 if set. </dd></dl>
+	 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.<i/>
+	 * @return    Subscription a Subscription object.
+	 */
+	static public function createSubscription($hash, $authentication = null) {
 
-        $args = func_get_args();
-        $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+		$args = func_get_args();
+		$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-        $instance = new Simplify_Subscription();
-        $instance->setAll($hash);
+		$instance = new Simplify_Subscription();
+		$instance->setAll($hash);
 
-        $object = Simplify_PaymentsApi::createObject($instance, $authentication);
-        return $object;
-    }
+		$object = Simplify_PaymentsApi::createObject($instance, $authentication);
+		return $object;
+	}
 
 
 
 
-       /**
-        * Deletes an Simplify_Subscription object.
-        *
-        * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-        */
-        public function deleteSubscription($authentication = null) {
+	   /**
+		* Deletes an Simplify_Subscription object.
+		*
+		* @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		*/
+		public function deleteSubscription($authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
 
-            $obj = Simplify_PaymentsApi::deleteObject($this, $authentication);
-            $this->properties = null;
-            return true;
-        }
+			$obj = Simplify_PaymentsApi::deleteObject($this, $authentication);
+			$this->properties = null;
+			return true;
+		}
 
 
-       /**
-        * Retrieve Simplify_Subscription objects.
-        * @param     array criteria a map of parameters; valid keys are:<dl style="padding-left:10px;">
-        *     <dt><tt>filter</tt></dt>    <dd>Filters to apply to the list.  </dd>
-        *     <dt><tt>max</tt></dt>    <dd>Allows up to a max of 50 list items to return. [min value: 0, max value: 50, default: 20]  </dd>
-        *     <dt><tt>offset</tt></dt>    <dd>Used in paging of the list.  This is the start offset of the page. [min value: 0, default: 0]  </dd>
-        *     <dt><tt>sorting</tt></dt>    <dd>Allows for ascending or descending sorting of the list.  The value maps properties to the sort direction (either <tt>asc</tt> for ascending or <tt>desc</tt> for descending).  Sortable properties are: <tt> id</tt><tt> plan</tt>.</dd></dl>
-        * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-        * @return    ResourceList a ResourceList object that holds the list of Subscription objects and the total
-        *            number of Subscription objects available for the given criteria.
-        * @see       ResourceList
-        */
-        static public function listSubscription($criteria = null, $authentication = null) {
+	   /**
+		* Retrieve Simplify_Subscription objects.
+		* @param     array criteria a map of parameters; valid keys are:<dl style="padding-left:10px;">
+		*     <dt><tt>filter</tt></dt>    <dd>Filters to apply to the list.  </dd>
+		*     <dt><tt>max</tt></dt>    <dd>Allows up to a max of 50 list items to return. [min value: 0, max value: 50, default: 20]  </dd>
+		*     <dt><tt>offset</tt></dt>    <dd>Used in paging of the list.  This is the start offset of the page. [min value: 0, default: 0]  </dd>
+		*     <dt><tt>sorting</tt></dt>    <dd>Allows for ascending or descending sorting of the list.  The value maps properties to the sort direction (either <tt>asc</tt> for ascending or <tt>desc</tt> for descending).  Sortable properties are: <tt> id</tt><tt> plan</tt>.</dd></dl>
+		* @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		* @return    ResourceList a ResourceList object that holds the list of Subscription objects and the total
+		*            number of Subscription objects available for the given criteria.
+		* @see       ResourceList
+		*/
+		static public function listSubscription($criteria = null, $authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-            $val = new Simplify_Subscription();
-            $list = Simplify_PaymentsApi::listObject($val, $criteria, $authentication);
+			$val = new Simplify_Subscription();
+			$list = Simplify_PaymentsApi::listObject($val, $criteria, $authentication);
 
-            return $list;
-        }
+			return $list;
+		}
 
 
-        /**
-         * Retrieve a Simplify_Subscription object from the API
-         *
-         * @param     string id  the id of the Subscription object to retrieve
-         * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-         * @return    Subscription a Subscription object
-         */
-        static public function findSubscription($id, $authentication = null) {
+		/**
+		 * Retrieve a Simplify_Subscription object from the API
+		 *
+		 * @param     string id  the id of the Subscription object to retrieve
+		 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		 * @return    Subscription a Subscription object
+		 */
+		static public function findSubscription($id, $authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-            $val = new Simplify_Subscription();
-            $val->id = $id;
+			$val = new Simplify_Subscription();
+			$val->id = $id;
 
-            $obj = Simplify_PaymentsApi::findObject($val, $authentication);
+			$obj = Simplify_PaymentsApi::findObject($val, $authentication);
 
-            return $obj;
-        }
+			return $obj;
+		}
 
 
-        /**
-         * Updates an Simplify_Subscription object.
-         *
-         * The properties that can be updated:
-         * <dl style="padding-left:10px;">
-         *     <dt><tt>amount</tt></dt>    <dd>Amount of the payment in the smallest unit of your currency. Example: 100 = $1.00USD </dd>
-         *     <dt><tt>billingCycle</tt></dt>    <dd>How the plan is billed to the customer. Values must be AUTO (indefinitely until the customer cancels) or FIXED (a fixed number of billing cycles). [default: AUTO] </dd>
-         *     <dt><tt>billingCycleLimit</tt></dt>    <dd>The number of fixed billing cycles for a plan. Only used if the billingCycle parameter is set to FIXED. Example: 4 </dd>
-         *     <dt><tt>coupon</tt></dt>    <dd>Coupon being assigned to this subscription </dd>
-         *     <dt><tt>currency</tt></dt>    <dd>Currency code (ISO-4217). Must match the currency associated with your account. [default: USD] </dd>
-         *     <dt><tt>frequency</tt></dt>    <dd>Frequency of payment for the plan. Used in conjunction with frequencyPeriod. Valid values are "DAILY", "WEEKLY", "MONTHLY" and "YEARLY". </dd>
-         *     <dt><tt>frequencyPeriod</tt></dt>    <dd>Period of frequency of payment for the plan. Example: if the frequency is weekly, and periodFrequency is 2, then the subscription is billed bi-weekly. [min value: 1] </dd>
-         *     <dt><tt>name</tt></dt>    <dd>Name describing subscription </dd>
-         *     <dt><tt>plan</tt></dt>    <dd>Plan that should be used for the subscription. </dd>
-         *     <dt><tt>prorate</tt></dt>    <dd>Whether to prorate existing subscription. [default: true] <strong>required </strong></dd>
-         *     <dt><tt>quantity</tt></dt>    <dd>Quantity of the plan for the subscription. [min value: 1] </dd>
-         *     <dt><tt>renewalReminderLeadDays</tt></dt>    <dd>If set, how many days before the next billing cycle that a renewal reminder is sent to the customer. If null or 0, no emails are sent. Minimum value is 7 if set. </dd></dl>
-         * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-         * @return    Subscription a Subscription object.
-         */
-        public function updateSubscription($authentication = null)  {
+		/**
+		 * Updates an Simplify_Subscription object.
+		 *
+		 * The properties that can be updated:
+		 * <dl style="padding-left:10px;">
+		 *     <dt><tt>amount</tt></dt>    <dd>Amount of the payment in the smallest unit of your currency. Example: 100 = $1.00USD </dd>
+		 *     <dt><tt>billingCycle</tt></dt>    <dd>How the plan is billed to the customer. Values must be AUTO (indefinitely until the customer cancels) or FIXED (a fixed number of billing cycles). [default: AUTO] </dd>
+		 *     <dt><tt>billingCycleLimit</tt></dt>    <dd>The number of fixed billing cycles for a plan. Only used if the billingCycle parameter is set to FIXED. Example: 4 </dd>
+		 *     <dt><tt>coupon</tt></dt>    <dd>Coupon being assigned to this subscription </dd>
+		 *     <dt><tt>currency</tt></dt>    <dd>Currency code (ISO-4217). Must match the currency associated with your account. [default: USD] </dd>
+		 *     <dt><tt>frequency</tt></dt>    <dd>Frequency of payment for the plan. Used in conjunction with frequencyPeriod. Valid values are "DAILY", "WEEKLY", "MONTHLY" and "YEARLY". </dd>
+		 *     <dt><tt>frequencyPeriod</tt></dt>    <dd>Period of frequency of payment for the plan. Example: if the frequency is weekly, and periodFrequency is 2, then the subscription is billed bi-weekly. [min value: 1] </dd>
+		 *     <dt><tt>name</tt></dt>    <dd>Name describing subscription </dd>
+		 *     <dt><tt>plan</tt></dt>    <dd>Plan that should be used for the subscription. </dd>
+		 *     <dt><tt>prorate</tt></dt>    <dd>Whether to prorate existing subscription. [default: true] <strong>required </strong></dd>
+		 *     <dt><tt>quantity</tt></dt>    <dd>Quantity of the plan for the subscription. [min value: 1] </dd>
+		 *     <dt><tt>renewalReminderLeadDays</tt></dt>    <dd>If set, how many days before the next billing cycle that a renewal reminder is sent to the customer. If null or 0, no emails are sent. Minimum value is 7 if set. </dd></dl>
+		 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		 * @return    Subscription a Subscription object.
+		 */
+		public function updateSubscription($authentication = null)  {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
 
-            $object = Simplify_PaymentsApi::updateObject($this, $authentication);
-            return $object;
-        }
+			$object = Simplify_PaymentsApi::updateObject($this, $authentication);
+			return $object;
+		}
 
-    /**
-     * @ignore
-     */
-    public function getClazz() {
-        return "Subscription";
-    }
-}
\ No newline at end of file
+	/**
+	 * @ignore
+	 */
+	public function getClazz() {
+		return "Subscription";
+	}
+}
diff --git a/includes/gateways/simplify-commerce/includes/Simplify/Tax.php b/includes/gateways/simplify-commerce/includes/Simplify/Tax.php
index 9edbfadb5c1..b3a05fa1344 100644
--- a/includes/gateways/simplify-commerce/includes/Simplify/Tax.php
+++ b/includes/gateways/simplify-commerce/includes/Simplify/Tax.php
@@ -2,119 +2,119 @@
 /*
  * Copyright (c) 2013 - 2015 MasterCard International Incorporated
  * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are 
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of
  * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of 
- * conditions and the following disclaimer in the documentation and/or other materials 
+ * Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials
  * provided with the distribution.
- * Neither the name of the MasterCard International Incorporated nor the names of its 
- * contributors may be used to endorse or promote products derived from this software 
+ * Neither the name of the MasterCard International Incorporated nor the names of its
+ * contributors may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
- * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 
 class Simplify_Tax extends Simplify_Object {
-    /**
-     * Creates an Simplify_Tax object
-     * @param     array $hash a map of parameters; valid keys are:<dl style="padding-left:10px;">
-     *     <dt><tt>label</tt></dt>    <dd>The label of the tax object. [max length: 255] <strong>required </strong></dd>
-     *     <dt><tt>rate</tt></dt>    <dd>The tax rate.  Decimal value up three decimal places.  e.g 12.501. [max length: 6] <strong>required </strong></dd></dl>
-     * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.<i/>
-     * @return    Tax a Tax object.
-     */
-    static public function createTax($hash, $authentication = null) {
+	/**
+	 * Creates an Simplify_Tax object
+	 * @param     array $hash a map of parameters; valid keys are:<dl style="padding-left:10px;">
+	 *     <dt><tt>label</tt></dt>    <dd>The label of the tax object. [max length: 255] <strong>required </strong></dd>
+	 *     <dt><tt>rate</tt></dt>    <dd>The tax rate.  Decimal value up three decimal places.  e.g 12.501. [max length: 6] <strong>required </strong></dd></dl>
+	 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.<i/>
+	 * @return    Tax a Tax object.
+	 */
+	static public function createTax($hash, $authentication = null) {
 
-        $args = func_get_args();
-        $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+		$args = func_get_args();
+		$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-        $instance = new Simplify_Tax();
-        $instance->setAll($hash);
+		$instance = new Simplify_Tax();
+		$instance->setAll($hash);
 
-        $object = Simplify_PaymentsApi::createObject($instance, $authentication);
-        return $object;
-    }
+		$object = Simplify_PaymentsApi::createObject($instance, $authentication);
+		return $object;
+	}
 
 
 
 
-       /**
-        * Deletes an Simplify_Tax object.
-        *
-        * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-        */
-        public function deleteTax($authentication = null) {
+	   /**
+		* Deletes an Simplify_Tax object.
+		*
+		* @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		*/
+		public function deleteTax($authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
 
-            $obj = Simplify_PaymentsApi::deleteObject($this, $authentication);
-            $this->properties = null;
-            return true;
-        }
+			$obj = Simplify_PaymentsApi::deleteObject($this, $authentication);
+			$this->properties = null;
+			return true;
+		}
 
 
-       /**
-        * Retrieve Simplify_Tax objects.
-        * @param     array criteria a map of parameters; valid keys are:<dl style="padding-left:10px;">
-        *     <dt><tt>filter</tt></dt>    <dd>Filters to apply to the list.  </dd>
-        *     <dt><tt>max</tt></dt>    <dd>Allows up to a max of 50 list items to return. [min value: 0, max value: 50, default: 20]  </dd>
-        *     <dt><tt>offset</tt></dt>    <dd>Used in paging of the list.  This is the start offset of the page. [min value: 0, default: 0]  </dd>
-        *     <dt><tt>sorting</tt></dt>    <dd>Allows for ascending or descending sorting of the list.  The value maps properties to the sort direction (either <tt>asc</tt> for ascending or <tt>desc</tt> for descending).  Sortable properties are: <tt> id</tt><tt> label</tt>.</dd></dl>
-        * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-        * @return    ResourceList a ResourceList object that holds the list of Tax objects and the total
-        *            number of Tax objects available for the given criteria.
-        * @see       ResourceList
-        */
-        static public function listTax($criteria = null, $authentication = null) {
+	   /**
+		* Retrieve Simplify_Tax objects.
+		* @param     array criteria a map of parameters; valid keys are:<dl style="padding-left:10px;">
+		*     <dt><tt>filter</tt></dt>    <dd>Filters to apply to the list.  </dd>
+		*     <dt><tt>max</tt></dt>    <dd>Allows up to a max of 50 list items to return. [min value: 0, max value: 50, default: 20]  </dd>
+		*     <dt><tt>offset</tt></dt>    <dd>Used in paging of the list.  This is the start offset of the page. [min value: 0, default: 0]  </dd>
+		*     <dt><tt>sorting</tt></dt>    <dd>Allows for ascending or descending sorting of the list.  The value maps properties to the sort direction (either <tt>asc</tt> for ascending or <tt>desc</tt> for descending).  Sortable properties are: <tt> id</tt><tt> label</tt>.</dd></dl>
+		* @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		* @return    ResourceList a ResourceList object that holds the list of Tax objects and the total
+		*            number of Tax objects available for the given criteria.
+		* @see       ResourceList
+		*/
+		static public function listTax($criteria = null, $authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-            $val = new Simplify_Tax();
-            $list = Simplify_PaymentsApi::listObject($val, $criteria, $authentication);
+			$val = new Simplify_Tax();
+			$list = Simplify_PaymentsApi::listObject($val, $criteria, $authentication);
 
-            return $list;
-        }
+			return $list;
+		}
 
 
-        /**
-         * Retrieve a Simplify_Tax object from the API
-         *
-         * @param     string id  the id of the Tax object to retrieve
-         * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-         * @return    Tax a Tax object
-         */
-        static public function findTax($id, $authentication = null) {
+		/**
+		 * Retrieve a Simplify_Tax object from the API
+		 *
+		 * @param     string id  the id of the Tax object to retrieve
+		 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		 * @return    Tax a Tax object
+		 */
+		static public function findTax($id, $authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-            $val = new Simplify_Tax();
-            $val->id = $id;
+			$val = new Simplify_Tax();
+			$val->id = $id;
 
-            $obj = Simplify_PaymentsApi::findObject($val, $authentication);
+			$obj = Simplify_PaymentsApi::findObject($val, $authentication);
 
-            return $obj;
-        }
+			return $obj;
+		}
 
-    /**
-     * @ignore
-     */
-    public function getClazz() {
-        return "Tax";
-    }
-}
\ No newline at end of file
+	/**
+	 * @ignore
+	 */
+	public function getClazz() {
+		return "Tax";
+	}
+}
diff --git a/includes/gateways/simplify-commerce/includes/Simplify/TransactionReview.php b/includes/gateways/simplify-commerce/includes/Simplify/TransactionReview.php
index a438230d9e3..cfea74e4069 100644
--- a/includes/gateways/simplify-commerce/includes/Simplify/TransactionReview.php
+++ b/includes/gateways/simplify-commerce/includes/Simplify/TransactionReview.php
@@ -2,136 +2,136 @@
 /*
  * Copyright (c) 2013 - 2015 MasterCard International Incorporated
  * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are 
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of
  * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of 
- * conditions and the following disclaimer in the documentation and/or other materials 
+ * Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials
  * provided with the distribution.
- * Neither the name of the MasterCard International Incorporated nor the names of its 
- * contributors may be used to endorse or promote products derived from this software 
+ * Neither the name of the MasterCard International Incorporated nor the names of its
+ * contributors may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
- * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 
 class Simplify_TransactionReview extends Simplify_Object {
-    /**
-     * Creates an Simplify_TransactionReview object
-     * @param     array $hash a map of parameters; valid keys are:<dl style="padding-left:10px;"></dl>
-     * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.<i/>
-     * @return    TransactionReview a TransactionReview object.
-     */
-    static public function createTransactionReview($hash, $authentication = null) {
+	/**
+	 * Creates an Simplify_TransactionReview object
+	 * @param     array $hash a map of parameters; valid keys are:<dl style="padding-left:10px;"></dl>
+	 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.<i/>
+	 * @return    TransactionReview a TransactionReview object.
+	 */
+	static public function createTransactionReview($hash, $authentication = null) {
 
-        $args = func_get_args();
-        $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+		$args = func_get_args();
+		$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-        $instance = new Simplify_TransactionReview();
-        $instance->setAll($hash);
+		$instance = new Simplify_TransactionReview();
+		$instance->setAll($hash);
 
-        $object = Simplify_PaymentsApi::createObject($instance, $authentication);
-        return $object;
-    }
+		$object = Simplify_PaymentsApi::createObject($instance, $authentication);
+		return $object;
+	}
 
 
 
 
-       /**
-        * Deletes an Simplify_TransactionReview object.
-        *
-        * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-        */
-        public function deleteTransactionReview($authentication = null) {
+	   /**
+		* Deletes an Simplify_TransactionReview object.
+		*
+		* @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		*/
+		public function deleteTransactionReview($authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
 
-            $obj = Simplify_PaymentsApi::deleteObject($this, $authentication);
-            $this->properties = null;
-            return true;
-        }
+			$obj = Simplify_PaymentsApi::deleteObject($this, $authentication);
+			$this->properties = null;
+			return true;
+		}
 
 
-       /**
-        * Retrieve Simplify_TransactionReview objects.
-        * @param     array criteria a map of parameters; valid keys are:<dl style="padding-left:10px;">
-        *     <dt><tt>filter</tt></dt>    <dd>Allows for ascending or descending sorting of the list.  </dd>
-        *     <dt><tt>max</tt></dt>    <dd>Allows up to a max of 50 list items to return. [min value: 0, max value: 50, default: 20]  </dd>
-        *     <dt><tt>offset</tt></dt>    <dd>Filters to apply to the list. [min value: 0, default: 0]  </dd>
-        *     <dt><tt>sorting</tt></dt>    <dd>Used in paging of the list.  This is the start offset of the page.  The value maps properties to the sort direction (either <tt>asc</tt> for ascending or <tt>desc</tt> for descending).  Sortable properties are: <tt> dateCreated</tt><tt> status</tt>.</dd></dl>
-        * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-        * @return    ResourceList a ResourceList object that holds the list of TransactionReview objects and the total
-        *            number of TransactionReview objects available for the given criteria.
-        * @see       ResourceList
-        */
-        static public function listTransactionReview($criteria = null, $authentication = null) {
+	   /**
+		* Retrieve Simplify_TransactionReview objects.
+		* @param     array criteria a map of parameters; valid keys are:<dl style="padding-left:10px;">
+		*     <dt><tt>filter</tt></dt>    <dd>Allows for ascending or descending sorting of the list.  </dd>
+		*     <dt><tt>max</tt></dt>    <dd>Allows up to a max of 50 list items to return. [min value: 0, max value: 50, default: 20]  </dd>
+		*     <dt><tt>offset</tt></dt>    <dd>Filters to apply to the list. [min value: 0, default: 0]  </dd>
+		*     <dt><tt>sorting</tt></dt>    <dd>Used in paging of the list.  This is the start offset of the page.  The value maps properties to the sort direction (either <tt>asc</tt> for ascending or <tt>desc</tt> for descending).  Sortable properties are: <tt> dateCreated</tt><tt> status</tt>.</dd></dl>
+		* @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		* @return    ResourceList a ResourceList object that holds the list of TransactionReview objects and the total
+		*            number of TransactionReview objects available for the given criteria.
+		* @see       ResourceList
+		*/
+		static public function listTransactionReview($criteria = null, $authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-            $val = new Simplify_TransactionReview();
-            $list = Simplify_PaymentsApi::listObject($val, $criteria, $authentication);
+			$val = new Simplify_TransactionReview();
+			$list = Simplify_PaymentsApi::listObject($val, $criteria, $authentication);
 
-            return $list;
-        }
+			return $list;
+		}
 
 
-        /**
-         * Retrieve a Simplify_TransactionReview object from the API
-         *
-         * @param     string id  the id of the TransactionReview object to retrieve
-         * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-         * @return    TransactionReview a TransactionReview object
-         */
-        static public function findTransactionReview($id, $authentication = null) {
+		/**
+		 * Retrieve a Simplify_TransactionReview object from the API
+		 *
+		 * @param     string id  the id of the TransactionReview object to retrieve
+		 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		 * @return    TransactionReview a TransactionReview object
+		 */
+		static public function findTransactionReview($id, $authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-            $val = new Simplify_TransactionReview();
-            $val->id = $id;
+			$val = new Simplify_TransactionReview();
+			$val->id = $id;
 
-            $obj = Simplify_PaymentsApi::findObject($val, $authentication);
+			$obj = Simplify_PaymentsApi::findObject($val, $authentication);
 
-            return $obj;
-        }
+			return $obj;
+		}
 
 
-        /**
-         * Updates an Simplify_TransactionReview object.
-         *
-         * The properties that can be updated:
-         * <dl style="padding-left:10px;">
-         *     <dt><tt>status</tt></dt>    <dd>Status of the transaction review. </dd></dl>
-         * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-         * @return    TransactionReview a TransactionReview object.
-         */
-        public function updateTransactionReview($authentication = null)  {
+		/**
+		 * Updates an Simplify_TransactionReview object.
+		 *
+		 * The properties that can be updated:
+		 * <dl style="padding-left:10px;">
+		 *     <dt><tt>status</tt></dt>    <dd>Status of the transaction review. </dd></dl>
+		 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		 * @return    TransactionReview a TransactionReview object.
+		 */
+		public function updateTransactionReview($authentication = null)  {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
 
-            $object = Simplify_PaymentsApi::updateObject($this, $authentication);
-            return $object;
-        }
+			$object = Simplify_PaymentsApi::updateObject($this, $authentication);
+			return $object;
+		}
 
-    /**
-     * @ignore
-     */
-    public function getClazz() {
-        return "TransactionReview";
-    }
-}
\ No newline at end of file
+	/**
+	 * @ignore
+	 */
+	public function getClazz() {
+		return "TransactionReview";
+	}
+}
diff --git a/includes/gateways/simplify-commerce/includes/Simplify/Webhook.php b/includes/gateways/simplify-commerce/includes/Simplify/Webhook.php
index 537c52c1f5a..ab32aa4cfdc 100644
--- a/includes/gateways/simplify-commerce/includes/Simplify/Webhook.php
+++ b/includes/gateways/simplify-commerce/includes/Simplify/Webhook.php
@@ -2,137 +2,137 @@
 /*
  * Copyright (c) 2013 - 2015 MasterCard International Incorporated
  * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are 
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of
  * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of 
- * conditions and the following disclaimer in the documentation and/or other materials 
+ * Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials
  * provided with the distribution.
- * Neither the name of the MasterCard International Incorporated nor the names of its 
- * contributors may be used to endorse or promote products derived from this software 
+ * Neither the name of the MasterCard International Incorporated nor the names of its
+ * contributors may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
- * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 
 class Simplify_Webhook extends Simplify_Object {
-    /**
-     * Creates an Simplify_Webhook object
-     * @param     array $hash a map of parameters; valid keys are:<dl style="padding-left:10px;">
-     *     <dt><tt>url</tt></dt>    <dd>Endpoint URL <strong>required </strong></dd></dl>
-     * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.<i/>
-     * @return    Webhook a Webhook object.
-     */
-    static public function createWebhook($hash, $authentication = null) {
+	/**
+	 * Creates an Simplify_Webhook object
+	 * @param     array $hash a map of parameters; valid keys are:<dl style="padding-left:10px;">
+	 *     <dt><tt>url</tt></dt>    <dd>Endpoint URL <strong>required </strong></dd></dl>
+	 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.<i/>
+	 * @return    Webhook a Webhook object.
+	 */
+	static public function createWebhook($hash, $authentication = null) {
 
-        $args = func_get_args();
-        $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+		$args = func_get_args();
+		$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-        $instance = new Simplify_Webhook();
-        $instance->setAll($hash);
+		$instance = new Simplify_Webhook();
+		$instance->setAll($hash);
 
-        $object = Simplify_PaymentsApi::createObject($instance, $authentication);
-        return $object;
-    }
+		$object = Simplify_PaymentsApi::createObject($instance, $authentication);
+		return $object;
+	}
 
 
 
 
-       /**
-        * Deletes an Simplify_Webhook object.
-        *
-        * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-        */
-        public function deleteWebhook($authentication = null) {
+	   /**
+		* Deletes an Simplify_Webhook object.
+		*
+		* @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		*/
+		public function deleteWebhook($authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
 
-            $obj = Simplify_PaymentsApi::deleteObject($this, $authentication);
-            $this->properties = null;
-            return true;
-        }
+			$obj = Simplify_PaymentsApi::deleteObject($this, $authentication);
+			$this->properties = null;
+			return true;
+		}
 
 
-       /**
-        * Retrieve Simplify_Webhook objects.
-        * @param     array criteria a map of parameters; valid keys are:<dl style="padding-left:10px;">
-        *     <dt><tt>filter</tt></dt>    <dd>Filters to apply to the list.  </dd>
-        *     <dt><tt>max</tt></dt>    <dd>Allows up to a max of 50 list items to return. [min value: 0, max value: 50, default: 20]  </dd>
-        *     <dt><tt>offset</tt></dt>    <dd>Used in paging of the list.  This is the start offset of the page. [min value: 0, default: 0]  </dd>
-        *     <dt><tt>sorting</tt></dt>    <dd>Allows for ascending or descending sorting of the list.  The value maps properties to the sort direction (either <tt>asc</tt> for ascending or <tt>desc</tt> for descending).  Sortable properties are: <tt> dateCreated</tt>.</dd></dl>
-        * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-        * @return    ResourceList a ResourceList object that holds the list of Webhook objects and the total
-        *            number of Webhook objects available for the given criteria.
-        * @see       ResourceList
-        */
-        static public function listWebhook($criteria = null, $authentication = null) {
+	   /**
+		* Retrieve Simplify_Webhook objects.
+		* @param     array criteria a map of parameters; valid keys are:<dl style="padding-left:10px;">
+		*     <dt><tt>filter</tt></dt>    <dd>Filters to apply to the list.  </dd>
+		*     <dt><tt>max</tt></dt>    <dd>Allows up to a max of 50 list items to return. [min value: 0, max value: 50, default: 20]  </dd>
+		*     <dt><tt>offset</tt></dt>    <dd>Used in paging of the list.  This is the start offset of the page. [min value: 0, default: 0]  </dd>
+		*     <dt><tt>sorting</tt></dt>    <dd>Allows for ascending or descending sorting of the list.  The value maps properties to the sort direction (either <tt>asc</tt> for ascending or <tt>desc</tt> for descending).  Sortable properties are: <tt> dateCreated</tt>.</dd></dl>
+		* @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		* @return    ResourceList a ResourceList object that holds the list of Webhook objects and the total
+		*            number of Webhook objects available for the given criteria.
+		* @see       ResourceList
+		*/
+		static public function listWebhook($criteria = null, $authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-            $val = new Simplify_Webhook();
-            $list = Simplify_PaymentsApi::listObject($val, $criteria, $authentication);
+			$val = new Simplify_Webhook();
+			$list = Simplify_PaymentsApi::listObject($val, $criteria, $authentication);
 
-            return $list;
-        }
+			return $list;
+		}
 
 
-        /**
-         * Retrieve a Simplify_Webhook object from the API
-         *
-         * @param     string id  the id of the Webhook object to retrieve
-         * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-         * @return    Webhook a Webhook object
-         */
-        static public function findWebhook($id, $authentication = null) {
+		/**
+		 * Retrieve a Simplify_Webhook object from the API
+		 *
+		 * @param     string id  the id of the Webhook object to retrieve
+		 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		 * @return    Webhook a Webhook object
+		 */
+		static public function findWebhook($id, $authentication = null) {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 2);
 
-            $val = new Simplify_Webhook();
-            $val->id = $id;
+			$val = new Simplify_Webhook();
+			$val->id = $id;
 
-            $obj = Simplify_PaymentsApi::findObject($val, $authentication);
+			$obj = Simplify_PaymentsApi::findObject($val, $authentication);
 
-            return $obj;
-        }
+			return $obj;
+		}
 
 
-        /**
-         * Updates an Simplify_Webhook object.
-         *
-         * The properties that can be updated:
-         * <dl style="padding-left:10px;">
-         *     <dt><tt>url</tt></dt>    <dd>Endpoint URL <strong>required </strong></dd></dl>
-         * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
-         * @return    Webhook a Webhook object.
-         */
-        public function updateWebhook($authentication = null)  {
+		/**
+		 * Updates an Simplify_Webhook object.
+		 *
+		 * The properties that can be updated:
+		 * <dl style="padding-left:10px;">
+		 *     <dt><tt>url</tt></dt>    <dd>Endpoint URL <strong>required </strong></dd></dl>
+		 * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.</i>
+		 * @return    Webhook a Webhook object.
+		 */
+		public function updateWebhook($authentication = null)  {
 
-            $args = func_get_args();
-            $authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
+			$args = func_get_args();
+			$authentication = Simplify_PaymentsApi::buildAuthenticationObject($authentication, $args, 1);
 
-            $object = Simplify_PaymentsApi::updateObject($this, $authentication);
-            return $object;
-        }
+			$object = Simplify_PaymentsApi::updateObject($this, $authentication);
+			return $object;
+		}
 
-    /**
-     * @ignore
-     */
-    public function getClazz() {
-        return "Webhook";
-    }
-}
\ No newline at end of file
+	/**
+	 * @ignore
+	 */
+	public function getClazz() {
+		return "Webhook";
+	}
+}
diff --git a/includes/interfaces/class-wc-abstract-order-data-store-interface.php b/includes/interfaces/class-wc-abstract-order-data-store-interface.php
new file mode 100644
index 00000000000..a511b705661
--- /dev/null
+++ b/includes/interfaces/class-wc-abstract-order-data-store-interface.php
@@ -0,0 +1,49 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Order Data Store Interface
+ *
+ * Functions that must be defined by order store classes.
+ *
+ * @version  3.0.0
+ * @category Interface
+ * @author   WooThemes
+ */
+interface WC_Abstract_Order_Data_Store_Interface {
+
+	/**
+	 * Read order items of a specific type from the database for this order.
+	 *
+	 * @param  WC_Order $order
+	 * @param  string $type
+	 * @return array
+	 */
+	public function read_items( $order, $type );
+
+	/**
+	 * Remove all line items (products, coupons, shipping, taxes) from the order.
+	 *
+	 * @param WC_Order $order
+	 * @param string $type Order item type. Default null.
+	 */
+	public function delete_items( $order, $type = null );
+
+	/**
+	 * Get token ids for an order.
+	 *
+	 * @param WC_Order $order
+	 * @return array
+	 */
+	public function get_payment_token_ids( $order );
+
+	/**
+	 * Update token ids for an order.
+	 *
+	 * @param WC_Order $order
+	 * @param array $token_ids
+	 */
+	public function update_payment_token_ids( $order, $token_ids );
+}
diff --git a/includes/interfaces/class-wc-coupon-data-store-interface.php b/includes/interfaces/class-wc-coupon-data-store-interface.php
new file mode 100644
index 00000000000..d4174ba203b
--- /dev/null
+++ b/includes/interfaces/class-wc-coupon-data-store-interface.php
@@ -0,0 +1,52 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Coupon Data Store Interface
+ *
+ * Functions that must be defined by coupon store classes.
+ *
+ * @version  3.0.0
+ * @category Interface
+ * @author   WooThemes
+ */
+interface WC_Coupon_Data_Store_Interface {
+	/**
+	 * Increase usage count for current coupon.
+	 * @param WC_Coupon &$coupon
+	 * @param string $used_by Either user ID or billing email
+	 */
+	public function increase_usage_count( &$coupon, $used_by = '' );
+
+	/**
+	 *  Decrease usage count for current coupon.
+	 * @param WC_Coupon &$coupon
+	 * @param string $used_by Either user ID or billing email
+	 */
+	public function decrease_usage_count( &$coupon, $used_by = '' );
+
+	/**
+	 * Get the number of uses for a coupon by user ID.
+	 * @param WC_Coupon &$coupon
+	 * @param int $user_id
+	 * @return int
+	 */
+	public function get_usage_by_user_id( &$coupon, $user_id );
+
+	/**
+	 * Return a coupon code for a specific ID.
+	 * @param int $id
+	 * @return string Coupon Code
+	 */
+	 public function get_code_by_id( $id );
+
+	 /**
+	  * Return an array of IDs for for a specific coupon code.
+	  * Can return multiple to check for existence.
+	  * @param string $code
+	  * @return array Array of IDs.
+	  */
+	 public function get_ids_by_code( $code );
+}
diff --git a/includes/interfaces/class-wc-customer-data-store-interface.php b/includes/interfaces/class-wc-customer-data-store-interface.php
new file mode 100644
index 00000000000..7ed1cca6722
--- /dev/null
+++ b/includes/interfaces/class-wc-customer-data-store-interface.php
@@ -0,0 +1,40 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Customer Data Store Interface
+ *
+ * Functions that must be defined by customer store classes.
+ *
+ * @version  3.0.0
+ * @category Interface
+ * @author   WooThemes
+ */
+interface WC_Customer_Data_Store_Interface {
+
+	/**
+	 * Gets the customers last order.
+	 *
+	 * @param WC_Customer &$customer
+	 * @return WC_Order|false
+	 */
+	public function get_last_order( &$customer );
+
+	/**
+	 * Return the number of orders this customer has.
+	 *
+	 * @param WC_Customer &$customer
+	 * @return integer
+	 */
+	public function get_order_count( &$customer );
+
+	/**
+	 * Return how much money this customer has spent.
+	 *
+	 * @param WC_Customer &$customer
+	 * @return float
+	 */
+	public function get_total_spent( &$customer );
+}
diff --git a/includes/interfaces/class-wc-customer-download-data-store-interface.php b/includes/interfaces/class-wc-customer-download-data-store-interface.php
new file mode 100644
index 00000000000..adddb738e3e
--- /dev/null
+++ b/includes/interfaces/class-wc-customer-download-data-store-interface.php
@@ -0,0 +1,69 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Customer Download Data Store Interface.
+ *
+ * @version  3.0.0
+ * @category Interface
+ * @author   WooThemes
+ */
+interface WC_Customer_Download_Data_Store_Interface {
+
+	/**
+	 * Method to delete a download permission from the database by ID.
+	 *
+	 * @param int $id
+	 */
+	public function delete_by_id( $id );
+
+	/**
+	 * Method to delete a download permission from the database by order ID.
+	 *
+	 * @param int $id
+	 */
+	public function delete_by_order_id( $id );
+
+	/**
+	 * Method to delete a download permission from the database by download ID.
+	 *
+	 * @param int $id
+	 */
+	public function delete_by_download_id( $id );
+
+	/**
+	 * Get array of download ids by specified args.
+	 *
+	 * @param  array $args
+	 * @return array of WC_Customer_Download
+	 */
+	public function get_downloads( $args = array() );
+
+	/**
+	 * Update download ids if the hash changes.
+	 *
+	 * @param  int $product_id
+	 * @param  string $old_id
+	 * @param  string $new_id
+	 */
+	public function update_download_id( $product_id, $old_id, $new_id );
+
+	/**
+	 * Get a customers downloads.
+	 *
+	 * @param  int $customer_id
+	 * @return array
+	 */
+	public function get_downloads_for_customer( $customer_id );
+
+	/**
+	 * Update user prop for downloads based on order id.
+	 *
+	 * @param  int $order_id
+	 * @param  int $customer_id
+	 * @param  string $email
+	 */
+	public function update_user_by_order_id( $order_id, $customer_id, $email );
+}
diff --git a/includes/interfaces/class-wc-log-handler-interface.php b/includes/interfaces/class-wc-log-handler-interface.php
new file mode 100644
index 00000000000..5bcd92934ad
--- /dev/null
+++ b/includes/interfaces/class-wc-log-handler-interface.php
@@ -0,0 +1,28 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+
+/**
+ * WC Log Handler Interface
+ *
+ * Functions that must be defined to correctly fulfill log handler API.
+ *
+ * @version        1.0.0
+ * @category       Interface
+ * @author         WooThemes
+ */
+interface WC_Log_Handler_Interface {
+
+	/**
+	 * Handle a log entry.
+	 *
+	 * @param int $timestamp Log timestamp.
+	 * @param string $level emergency|alert|critical|error|warning|notice|info|debug
+	 * @param string $message Log message.
+	 * @param array $context Additional information for log handlers.
+	 *
+	 * @return bool False if value was not handled and true if value was handled.
+	 */
+	public function handle( $timestamp, $level, $message, $context );
+}
diff --git a/includes/interfaces/class-wc-logger-interface.php b/includes/interfaces/class-wc-logger-interface.php
new file mode 100644
index 00000000000..9c1255e7a71
--- /dev/null
+++ b/includes/interfaces/class-wc-logger-interface.php
@@ -0,0 +1,132 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+
+/**
+ * WC Logger Interface
+ *
+ * Functions that must be defined to correctly fulfill logger API.
+ *
+ * @version        1.0.0
+ * @category       Interface
+ * @author         WooThemes
+ */
+interface WC_Logger_Interface {
+
+	/**
+	 * Add a log entry.
+	 *
+	 * This is not the preferred method for adding log messages. Please use log() or any one of
+	 * the level methods (debug(), info(), etc.). This method may be deprecated in the future.
+	 *
+	 * @param string $handle
+	 * @param string $message
+	 * @return bool True if log was added, otherwise false.
+	 */
+	public function add( $handle, $message, $level = WC_Log_Levels::NOTICE );
+
+	/**
+	 * Add a log entry.
+	 *
+	 * @param string $level One of the following:
+	 *     'emergency': System is unusable.
+	 *     'alert': Action must be taken immediately.
+	 *     'critical': Critical conditions.
+	 *     'error': Error conditions.
+	 *     'warning': Warning conditions.
+	 *     'notice': Normal but significant condition.
+	 *     'informational': Informational messages.
+	 *     'debug': Debug-level messages.
+	 * @param string $message Log message.
+	 * @param array $context Optional. Additional information for log handlers.
+	 */
+	public function log( $level, $message, $context = array() );
+
+	/**
+	 * Adds an emergency level message.
+	 *
+	 * System is unusable.
+	 *
+	 * @param string $message Log message.
+	 * @param array $context Optional. Additional information for log handlers.
+	 */
+	public function emergency( $message, $context = array() );
+
+	/**
+	 * Adds an alert level message.
+	 *
+	 * Action must be taken immediately.
+	 * Example: Entire website down, database unavailable, etc.
+	 *
+	 * @param string $message Log message.
+	 * @param array $context Optional. Additional information for log handlers.
+	 */
+	public function alert( $message, $context = array() );
+
+	/**
+	 * Adds a critical level message.
+	 *
+	 * Critical conditions.
+	 * Example: Application component unavailable, unexpected exception.
+	 *
+	 * @param string $message Log message.
+	 * @param array $context Optional. Additional information for log handlers.
+	 */
+	public function critical( $message, $context = array() );
+
+	/**
+	 * Adds an error level message.
+	 *
+	 * Runtime errors that do not require immediate action but should typically be logged
+	 * and monitored.
+	 *
+	 * @param string $message Log message.
+	 * @param array $context Optional. Additional information for log handlers.
+	 */
+	public function error( $message, $context = array() );
+
+	/**
+	 * Adds a warning level message.
+	 *
+	 * Exceptional occurrences that are not errors.
+	 *
+	 * Example: Use of deprecated APIs, poor use of an API, undesirable things that are not
+	 * necessarily wrong.
+	 *
+	 * @param string $message Log message.
+	 * @param array $context Optional. Additional information for log handlers.
+	 */
+	public function warning( $message, $context = array() );
+
+	/**
+	 * Adds a notice level message.
+	 *
+	 * Normal but significant events.
+	 *
+	 * @param string $message Log message.
+	 * @param array $context Optional. Additional information for log handlers.
+	 */
+	public function notice( $message, $context = array() );
+
+	/**
+	 * Adds a info level message.
+	 *
+	 * Interesting events.
+	 * Example: User logs in, SQL logs.
+	 *
+	 * @param string $message Log message.
+	 * @param array $context Optional. Additional information for log handlers.
+	 */
+	public function info( $message, $context = array() );
+
+	/**
+	 * Adds a debug level message.
+	 *
+	 * Detailed debug information.
+	 *
+	 * @param string $message Log message.
+	 * @param array $context Optional. Additional information for log handlers.
+	 */
+	public function debug( $message, $context = array() );
+}
diff --git a/includes/interfaces/class-wc-object-data-store-interface.php b/includes/interfaces/class-wc-object-data-store-interface.php
new file mode 100644
index 00000000000..50a0e842fcd
--- /dev/null
+++ b/includes/interfaces/class-wc-object-data-store-interface.php
@@ -0,0 +1,69 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Data Store Interface
+ *
+ * @version  3.0.0
+ * @category Interface
+ * @author   WooThemes
+ */
+interface WC_Object_Data_Store_Interface {
+	/**
+	 * Method to create a new record of a WC_Data based object.
+	 * @param WC_Data &$data
+	 */
+	public function create( &$data );
+
+	/**
+	 * Method to read a record. Creates a new WC_Data based object.
+	 * @param WC_Data &$data
+	 */
+	public function read( &$data );
+
+	/**
+	 * Updates a record in the database.
+	 * @param WC_Data &$data
+	 */
+	public function update( &$data );
+
+	/**
+	 * Deletes a record from the database.
+	 * @param  WC_Data &$data
+	 * @param  array $args Array of args to pass to the delete method.
+	 * @return bool result
+	 */
+	public function delete( &$data, $args = array() );
+
+	/**
+	 * Returns an array of meta for an object.
+	 * @param  WC_Data &$data
+	 * @return array
+	 */
+	public function read_meta( &$data );
+
+	/**
+	 * Deletes meta based on meta ID.
+	 * @param  WC_Data &$data
+	 * @param  object $meta (containing at least ->id)
+	 * @return array
+	 */
+	public function delete_meta( &$data, $meta );
+
+	/**
+	 * Add new piece of meta.
+	 * @param  WC_Data &$data
+	 * @param  object $meta (containing ->key and ->value)
+	 * @return int meta ID
+	 */
+	public function add_meta( &$data, $meta );
+
+	/**
+	 * Update meta.
+	 * @param  WC_Data &$data
+	 * @param  object $meta (containing ->id, ->key and ->value)
+	 */
+	public function update_meta( &$data, $meta );
+}
diff --git a/includes/interfaces/class-wc-order-data-store-interface.php b/includes/interfaces/class-wc-order-data-store-interface.php
new file mode 100644
index 00000000000..2928aee9651
--- /dev/null
+++ b/includes/interfaces/class-wc-order-data-store-interface.php
@@ -0,0 +1,126 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Order Data Store Interface
+ *
+ * Functions that must be defined by order store classes.
+ *
+ * @version  3.0.0
+ * @category Interface
+ * @author   WooThemes
+ */
+interface WC_Order_Data_Store_Interface {
+	/**
+	 * Get amount already refunded.
+	 *
+	 * @param  WC_Order $order
+	 * @return string
+	 */
+	public function get_total_refunded( $order );
+
+	/**
+	 * Get the total tax refunded.
+	 *
+	 * @param  WC_Order $order
+	 * @return float
+	 */
+	public function get_total_tax_refunded( $order );
+
+	/**
+	 * Get the total shipping refunded.
+	 *
+	 * @param  WC_Order $order
+	 * @return float
+	 */
+	public function get_total_shipping_refunded( $order );
+
+	/**
+	 * Finds an Order ID based on an order key.
+	 *
+	 * @param string $order_key An order key has generated by
+	 * @return int The ID of an order, or 0 if the order could not be found
+	 */
+	public function get_order_id_by_order_key( $order_key );
+
+	/**
+	 * Return count of orders with a specific status.
+	 * @param  string $status
+	 * @return int
+	 */
+	public function get_order_count( $status );
+
+	/**
+	 * Get all orders matching the passed in args.
+	 *
+	 * @see    wc_get_orders()
+	 * @param  array $args
+	 * @return array of orders
+	 */
+	public function get_orders( $args = array() );
+
+	/**
+	 * Get unpaid orders after a certain date,
+	 * @param  int $date timestamp
+	 * @return array
+	 */
+	public function get_unpaid_orders( $date );
+
+	/**
+	 * Search order data for a term and return ids.
+	 * @param  string $term
+	 * @return array of ids
+	 */
+	public function search_orders( $term );
+
+	/**
+	 * Gets information about whether permissions were generated yet.
+	 * @param WC_Order $order
+	 * @return bool
+	 */
+	public function get_download_permissions_granted( $order );
+
+	/**
+	 * Stores information about whether permissions were generated yet.
+	 * @param WC_Order $order
+	 * @param bool $set
+	 */
+	public function set_download_permissions_granted( $order, $set );
+
+	/**
+	 * Gets information about whether sales were recorded.
+	 * @param WC_Order $order
+	 * @return bool
+	 */
+	public function get_recorded_sales( $order );
+
+	/**
+	 * Stores information about whether sales were recorded.
+	 * @param WC_Order $order
+	 * @param bool $set
+	 */
+	public function set_recorded_sales( $order, $set );
+
+	/**
+	 * Gets information about whether coupon counts were updated.
+	 * @param WC_Order $order
+	 * @return bool
+	 */
+	public function get_recorded_coupon_usage_counts( $order );
+
+	/**
+	 * Stores information about whether coupon counts were updated.
+	 * @param WC_Order $order
+	 * @param bool $set
+	 */
+	public function set_recorded_coupon_usage_counts( $order, $set );
+
+	/**
+	 * Get the order type based on Order ID.
+	 * @param  int $order_id
+	 * @return string
+	 */
+	public function get_order_type( $order_id );
+}
diff --git a/includes/interfaces/class-wc-order-item-data-store-interface.php b/includes/interfaces/class-wc-order-item-data-store-interface.php
new file mode 100644
index 00000000000..751bb5d1125
--- /dev/null
+++ b/includes/interfaces/class-wc-order-item-data-store-interface.php
@@ -0,0 +1,92 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Order Item Data Store Interface
+ *
+ * Functions that must be defined by the order item data store (for functions).
+ *
+ * @version  3.0.0
+ * @category Interface
+ * @author   WooCommerce
+ */
+interface WC_Order_Item_Data_Store_Interface {
+
+	/**
+	 * Add an order item to an order.
+	 * @param  int   $order_id
+	 * @param  array $item order_item_name and order_item_type.
+	 * @return int   Order Item ID
+	 */
+	public function add_order_item( $order_id, $item );
+
+	/**
+	 * Update an order item.
+	 * @param  int   $item_id
+	 * @param  array $item order_item_name or order_item_type.
+	 * @return boolean
+	 */
+	public function update_order_item( $item_id, $item );
+
+	/**
+	 * Delete an order item.
+	 * @param int $item_id
+	 */
+	public function delete_order_item( $item_id );
+
+	/**
+	 * Update term meta.
+	 * @param  int    $item_id
+	 * @param  string $meta_key
+	 * @param  mixed  $meta_value
+	 * @param  string $prev_value (default: '')
+	 * @return bool
+	 */
+	function update_metadata( $item_id, $meta_key, $meta_value, $prev_value = '' );
+
+	/**
+	 * Add term meta.
+	 * @param  int    $item_id
+	 * @param  string $meta_key
+	 * @param  mixed  $meta_value
+	 * @param  bool   $unique (default: false)
+	 * @return int    New row ID or 0
+	 */
+	function add_metadata( $item_id, $meta_key, $meta_value, $unique = false );
+
+
+	/**
+	 * Delete term meta.
+	 * @param  int    $item_id
+	 * @param  string $meta_key
+	 * @param  string $meta_value (default: '')
+	 * @param  bool   $delete_all (default: false)
+	 * @return bool
+	 */
+	function delete_metadata( $item_id, $meta_key, $meta_value = '', $delete_all = false );
+
+	/**
+	 * Get term meta.
+	 * @param  int    $item_id
+	 * @param  string $key
+	 * @param  bool   $single (default: true)
+	 * @return mixed
+	 */
+	function get_metadata( $item_id, $key, $single = true );
+
+	/**
+	 * Get order ID by order item ID.
+	 * @param  int $item_id
+	 * @return int
+	 */
+	function get_order_id_by_order_item_id( $item_id );
+
+	/**
+	 * Get the order item type based on Item ID.
+	 * @param  int $item_id
+	 * @return string
+	 */
+	public function get_order_item_type( $item_id );
+}
diff --git a/includes/interfaces/class-wc-order-item-product-data-store-interface.php b/includes/interfaces/class-wc-order-item-product-data-store-interface.php
new file mode 100644
index 00000000000..f0e086c2b95
--- /dev/null
+++ b/includes/interfaces/class-wc-order-item-product-data-store-interface.php
@@ -0,0 +1,24 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Order Item Data Store Interface
+ *
+ * Functions that must be defined by order item store classes.
+ *
+ * @version  3.0.0
+ * @category Interface
+ * @author   WooCommerce
+ */
+interface WC_Order_Item_Product_Data_Store_Interface {
+	/**
+	 * Get a list of download IDs for a specific item from an order.
+	 *
+	 * @param WC_Order_Item $item
+	 * @param WC_Order $order
+	 * @return array
+	 */
+	 public function get_download_ids( $item, $order );
+}
diff --git a/includes/interfaces/class-wc-order-item-type-data-store-interface.php b/includes/interfaces/class-wc-order-item-type-data-store-interface.php
new file mode 100644
index 00000000000..7514d189c59
--- /dev/null
+++ b/includes/interfaces/class-wc-order-item-type-data-store-interface.php
@@ -0,0 +1,23 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Order Item Data Store Interface
+ *
+ * Functions that must be defined by order item store classes.
+ *
+ * @version  3.0.0
+ * @category Interface
+ * @author   WooCommerce
+ */
+interface WC_Order_Item_Type_Data_Store_Interface {
+	/**
+	 * Saves an item's data to the database / item meta.
+	 * Ran after both create and update, so $item->get_id() will be set.
+	 *
+	 * @param WC_Order_Item $item
+	 */
+	public function save_item_data( &$item );
+}
diff --git a/includes/interfaces/class-wc-order-refund-data-store-interface.php b/includes/interfaces/class-wc-order-refund-data-store-interface.php
new file mode 100644
index 00000000000..b21622d961e
--- /dev/null
+++ b/includes/interfaces/class-wc-order-refund-data-store-interface.php
@@ -0,0 +1,16 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Order Refund Data Store Interface
+ *
+ * Functions that must be defined by order store classes.
+ *
+ * @version  3.0.0
+ * @category Interface
+ * @author   WooThemes
+ */
+interface WC_Order_Refund_Data_Store_Interface {
+}
diff --git a/includes/interfaces/class-wc-payment-token-data-store-interface.php b/includes/interfaces/class-wc-payment-token-data-store-interface.php
new file mode 100644
index 00000000000..9a878617e8f
--- /dev/null
+++ b/includes/interfaces/class-wc-payment-token-data-store-interface.php
@@ -0,0 +1,66 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Payment Token Data Store Interface
+ *
+ * Functions that must be defined by payment token store classes.
+ *
+ * @version  3.0.0
+ * @category Interface
+ * @author   WooThemes
+ */
+interface WC_Payment_Token_Data_Store_Interface {
+	/**
+	 * Returns an array of objects (stdObject) matching specific token critera.
+	 * Accepts token_id, user_id, gateway_id, and type.
+	 * Each object should contain the fields token_id, gateway_id, token, user_id, type, is_default.
+	 * @param array $args
+	 * @return array
+	 */
+	public function get_tokens( $args );
+
+	/**
+	 * Returns an stdObject of a token for a user's default token.
+	 * Should contain the fields token_id, gateway_id, token, user_id, type, is_default.
+	 * @param int $user_id
+	 * @return object
+	 */
+	public function get_users_default_token( $user_id );
+
+	/**
+	 * Returns an stdObject of a token.
+	 * Should contain the fields token_id, gateway_id, token, user_id, type, is_default.
+	 * @param int $token_id
+	 * @return object
+	 */
+	public function get_token_by_id( $token_id );
+
+	/**
+	 * Returns metadata for a specific payment token.
+	 * @param int $token_id
+	 * @return array
+	 */
+	public function get_metadata( $token_id );
+
+	/**
+	 * Get a token's type by ID.
+	 *
+	 * @since 3.0.0
+	 * @param int $token_id
+	 * @return string
+	 */
+	public function get_token_type_by_id( $token_id );
+
+	/**
+	 * Update's a tokens default status in the database. Used for quickly
+	 * looping through tokens and setting their statuses instead of creating a bunch
+	 * of objects.
+	 * @param int $token_id
+	 * @param bool $status
+	 * @return string
+	 */
+	public function set_default_status( $token_id, $status = true );
+}
diff --git a/includes/interfaces/class-wc-product-data-store-interface.php b/includes/interfaces/class-wc-product-data-store-interface.php
new file mode 100644
index 00000000000..2bfd73096db
--- /dev/null
+++ b/includes/interfaces/class-wc-product-data-store-interface.php
@@ -0,0 +1,137 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Product Data Store Interface
+ *
+ * Functions that must be defined by product store classes.
+ *
+ * @version  3.0.0
+ * @category Interface
+ * @author   WooThemes
+ */
+interface WC_Product_Data_Store_Interface {
+
+	/**
+	 * Returns an array of on sale products, as an array of objects with an
+	 * ID and parent_id present. Example: $return[0]->id, $return[0]->parent_id.
+	 *
+	 * @return array
+	 */
+	public function get_on_sale_products();
+
+	/**
+	 * Returns a list of product IDs ( id as key => parent as value) that are
+	 * featured. Uses get_posts instead of wc_get_products since we want
+	 * some extra meta queries and ALL products (posts_per_page = -1).
+	 *
+	 * @return array
+	 */
+	public function get_featured_product_ids();
+
+	/**
+	 * Check if product sku is found for any other product IDs.
+	 *
+	 * @param int $product_id
+	 * @param string $sku
+	 * @return bool
+	 */
+	public function is_existing_sku( $product_id, $sku );
+
+	/**
+	 * Return product ID based on SKU.
+	 *
+	 * @param string $sku
+	 * @return int
+	 */
+	public function get_product_id_by_sku( $sku );
+
+	/**
+	 * Returns an array of IDs of products that have sales starting soon.
+	 *
+	 * @return array
+	 */
+	public function get_starting_sales();
+
+	/**
+	 * Returns an array of IDs of products that have sales which are due to end.
+	 *
+	 * @return array
+	 */
+	public function get_ending_sales();
+
+	/**
+	 * Find a matching (enabled) variation within a variable product.
+	 *
+	 * @param  WC_Product $product Variable product.
+	 * @param  array $match_attributes Array of attributes we want to try to match.
+	 * @return int Matching variation ID or 0.
+	 */
+	public function find_matching_product_variation( $product, $match_attributes = array() );
+
+	/**
+	 * Make sure all variations have a sort order set so they can be reordered correctly.
+	 *
+	 * @param int $parent_id
+	 */
+	public function sort_all_product_variations( $parent_id );
+
+	/**
+	 * Return a list of related products (using data like categories and IDs).
+	 *
+	 * @param array $cats_array  List of categories IDs.
+	 * @param array $tags_array  List of tags IDs.
+	 * @param array $exclude_ids Excluded IDs.
+	 * @param int   $limit       Limit of results.
+	 * @param int   $product_id
+	 * @return array
+	 */
+	public function get_related_products( $cats_array, $tags_array, $exclude_ids, $limit, $product_id );
+
+	/**
+	 * Update a product's stock amount directly.
+	 *
+	 * Uses queries rather than update_post_meta so we can do this in one query (to avoid stock issues).
+	 *
+	 * @param  int $product_id_with_stock
+	 * @param  int|null $stock_quantity
+	 * @param  string $operation set, increase and decrease.
+	 */
+	public function update_product_stock( $product_id_with_stock, $stock_quantity = null, $operation = 'set' );
+
+	/**
+	 * Update a product's sale count directly.
+	 *
+	 * Uses queries rather than update_post_meta so we can do this in one query for performance.
+	 *
+	 * @since  3.0.0 this supports set, increase and decrease.
+	 * @param  int $product_id
+	 * @param  int|null $quantity
+	 * @param  string $operation set, increase and decrease.
+	 */
+	public function update_product_sales( $product_id, $quantity = null, $operation = 'set' );
+
+	/**
+	 * Get shipping class ID by slug.
+	 * @param string $slug
+	 * @return int|false
+	 */
+	public function get_shipping_class_id_by_slug( $slug );
+
+	/**
+	 * Returns an array of products.
+	 *
+	 * @param  array $args @see wc_get_products
+	 * @return array
+	 */
+	public function get_products( $args = array() );
+
+	/**
+	 * Get the product type based on product ID.
+	 * @param  int $product_id
+	 * @return bool|string
+	 */
+	public function get_product_type( $product_id );
+}
diff --git a/includes/interfaces/class-wc-product-variable-data-store-interface.php b/includes/interfaces/class-wc-product-variable-data-store-interface.php
new file mode 100644
index 00000000000..b327abfb4de
--- /dev/null
+++ b/includes/interfaces/class-wc-product-variable-data-store-interface.php
@@ -0,0 +1,79 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Product Variable Data Store Interface
+ *
+ * Functions that must be defined by product variable store classes.
+ *
+ * @version  3.0.0
+ * @category Interface
+ * @author   WooThemes
+ */
+interface WC_Product_Variable_Data_Store_Interface {
+	/**
+	 * Does a child have a weight set?
+	 *
+	 * @param WC_Product
+	 * @return boolean
+	 */
+	public function child_has_weight( $product );
+
+	/**
+	 * Does a child have dimensions set?
+	 *
+	 * @param WC_Product
+	 * @return boolean
+	 */
+	public function child_has_dimensions( $product );
+
+	/**
+	 * Is a child in stock?
+	 *
+	 * @param WC_Product
+	 * @return boolean
+	 */
+	public function child_is_in_stock( $product );
+
+	/**
+	 * Syncs all variation names if the parent name is changed.
+	 *
+	 * @param WC_Product $product
+	 * @param string $previous_name
+	 * @param string $new_name
+	 * @since 3.0.0
+	 */
+	public function sync_variation_names( &$product, $previous_name = '', $new_name = '' );
+
+	/**
+	 * Stock managed at the parent level - update children being managed by this product.
+	 * This sync function syncs downwards (from parent to child) when the variable product is saved.
+	 *
+	 * @param WC_Product
+	 */
+	public function sync_managed_variation_stock_status( &$product );
+
+	/**
+	 * Sync variable product prices with children.
+	 *
+	 * @param WC_Product|int $product
+	 */
+	public function sync_price( &$product );
+
+	/**
+	 * Delete variations of a product.
+	 *
+	 * @param int $product_id
+	 * @param bool $force_delete False to trash.
+	 */
+	public function delete_variations( $product_id, $force_delete = false );
+
+	/**
+	 * Untrash variations.
+	 *
+	 * @param int $product_id
+	 */
+	public function untrash_variations( $product_id );
+}
diff --git a/includes/interfaces/class-wc-shipping-zone-data-store-interface.php b/includes/interfaces/class-wc-shipping-zone-data-store-interface.php
new file mode 100644
index 00000000000..b488f778b61
--- /dev/null
+++ b/includes/interfaces/class-wc-shipping-zone-data-store-interface.php
@@ -0,0 +1,72 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Shipping Zone Data Store Interface.
+ *
+ * Functions that must be defined by shipping zone store classes.
+ *
+ * @version  3.0.0
+ * @category Interface
+ * @author   WooCommerce
+ */
+interface WC_Shipping_Zone_Data_Store_Interface {
+	/**
+	 * Get a list of shipping methods for a specific zone.
+	 * @param  int   $zone_id      Zone ID
+	 * @param  bool  $enabled_only True to request enabled methods only.
+	 * @return array               Array of objects containing method_id, method_order, instance_id, is_enabled
+	 */
+	public function get_methods( $zone_id, $enabled_only );
+
+	/**
+	 * Get count of methods for a zone.
+	 * @param  int $zone_id Zone ID
+	 * @return int Method Count
+	 */
+	public function get_method_count( $zone_id );
+
+	/**
+	 * Add a shipping method to a zone.
+	 * @param  int    $zone_id Zone ID
+	 * @param  string $type    Method Type/ID
+	 * @param  int    $order   Method Order
+	 * @return int             Instance ID
+	 */
+	public function add_method( $zone_id, $type, $order );
+
+	/**
+	 * Delete a method instance.
+	 * @param int $instance_id
+	 */
+	public function delete_method( $instance_id );
+
+	/**
+	 * Get a shipping zone method instance.
+	 * @param  int
+	 * @return object
+	 */
+	public function get_method( $instance_id );
+
+	/**
+	 * Find a matching zone ID for a given package.
+	 * @param  object $package
+	 * @return int
+	 */
+	public function get_zone_id_from_package( $package );
+
+	/**
+	 * Return an ordered list of zones.
+	 * @return array An array of objects containing a zone_id, zone_name, and zone_order.
+	 */
+	public function get_zones();
+
+	/**
+	 * Return a zone ID from an instance ID.
+	 * @param  int
+	 * @return int
+	 */
+	public function get_zone_id_by_instance_id( $id );
+}
diff --git a/includes/legacy/abstract-wc-legacy-order.php b/includes/legacy/abstract-wc-legacy-order.php
new file mode 100644
index 00000000000..d735269a9e4
--- /dev/null
+++ b/includes/legacy/abstract-wc-legacy-order.php
@@ -0,0 +1,737 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Legacy Abstract Order
+ *
+ * Legacy and deprecated functions are here to keep the WC_Abstract_Order clean.
+ * This class will be removed in future versions.
+ *
+ * @version	 3.0.0
+ * @package	 WooCommerce/Abstracts
+ * @category	Abstract Class
+ * @author	  WooThemes
+ */
+abstract class WC_Abstract_Legacy_Order extends WC_Data {
+
+	/**
+	 * Add coupon code to the order.
+	 * @param string $code
+	 * @param int $discount tax amount.
+	 * @param int $discount_tax amount.
+	 * @return int order item ID
+	 * @throws WC_Data_Exception
+	 */
+	public function add_coupon( $code = array(), $discount = 0, $discount_tax = 0 ) {
+		wc_deprecated_function( 'WC_Order::add_coupon', '3.0', 'a new WC_Order_Item_Coupon object and add to order with WC_Order::add_item()' );
+
+		$item = new WC_Order_Item_Coupon();
+		$item->set_props( array(
+			'code'         => $code,
+			'discount'     => $discount,
+			'discount_tax' => $discount_tax,
+			'order_id'     => $this->get_id(),
+		) );
+		$item->save();
+		$this->add_item( $item );
+		wc_do_deprecated_action( 'woocommerce_order_add_coupon', array( $this->get_id(), $item->get_id(), $code, $discount, $discount_tax ), '3.0', 'woocommerce_new_order_item action instead.' );
+		return $item->get_id();
+	}
+
+	/**
+	 * Add a tax row to the order.
+	 * @param array $args
+	 * @param int $tax_amount amount of tax.
+	 * @param int $shipping_tax_amount shipping amount.
+	 * @return int order item ID
+	 * @throws WC_Data_Exception
+	 */
+	public function add_tax( $tax_rate_id, $tax_amount = 0, $shipping_tax_amount = 0 ) {
+		wc_deprecated_function( 'WC_Order::add_tax', '3.0', 'a new WC_Order_Item_Tax object and add to order with WC_Order::add_item()' );
+
+		$item = new WC_Order_Item_Tax();
+		$item->set_props( array(
+			'rate_id'            => $tax_rate_id,
+			'tax_total'          => $tax_amount,
+			'shipping_tax_total' => $shipping_tax_amount,
+		) );
+		$item->set_rate( $tax_rate_id );
+		$item->set_order_id( $this->get_id() );
+		$item->save();
+		$this->add_item( $item );
+		wc_do_deprecated_action( 'woocommerce_order_add_tax', array( $this->get_id(), $item->get_id(), $tax_rate_id, $tax_amount, $shipping_tax_amount ), '3.0', 'woocommerce_new_order_item action instead.' );
+		return $item->get_id();
+	}
+
+	/**
+	 * Add a shipping row to the order.
+	 * @param WC_Shipping_Rate shipping_rate
+	 * @return int order item ID
+	 * @throws WC_Data_Exception
+	 */
+	public function add_shipping( $shipping_rate ) {
+		wc_deprecated_function( 'WC_Order::add_shipping', '3.0', 'a new WC_Order_Item_Shipping object and add to order with WC_Order::add_item()' );
+
+		$item = new WC_Order_Item_Shipping();
+		$item->set_props( array(
+			'method_title' => $shipping_rate->label,
+			'method_id'    => $shipping_rate->id,
+			'total'        => wc_format_decimal( $shipping_rate->cost ),
+			'taxes'        => $shipping_rate->taxes,
+			'order_id'     => $this->get_id(),
+		) );
+		foreach ( $shipping_rate->get_meta_data() as $key => $value ) {
+			$item->add_meta_data( $key, $value, true );
+		}
+		$item->save();
+		$this->add_item( $item );
+		wc_do_deprecated_action( 'woocommerce_order_add_shipping', array( $this->get_id(), $item->get_id(), $shipping_rate ), '3.0', 'woocommerce_new_order_item action instead.' );
+		return $item->get_id();
+	}
+
+	/**
+	 * Add a fee to the order.
+	 * Order must be saved prior to adding items.
+	 *
+	 * Fee is an amount of money charged for a particular piece of work
+	 * or for a particular right or service, and not supposed to be negative.
+	 *
+	 * @throws WC_Data_Exception
+	 * @param  object $fee Fee data.
+	 * @return int         Updated order item ID.
+	 */
+	public function add_fee( $fee ) {
+		wc_deprecated_function( 'WC_Order::add_fee', '3.0', 'a new WC_Order_Item_Fee object and add to order with WC_Order::add_item()' );
+
+		$item = new WC_Order_Item_Fee();
+		$item->set_props( array(
+			'name'      => $fee->name,
+			'tax_class' => $fee->taxable ? $fee->tax_class : 0,
+			'total'     => $fee->amount,
+			'total_tax' => $fee->tax,
+			'taxes'     => array(
+				'total' => $fee->tax_data,
+			),
+			'order_id'  => $this->get_id(),
+		) );
+		$item->save();
+		$this->add_item( $item );
+		wc_do_deprecated_action( 'woocommerce_order_add_fee', array( $this->get_id(), $item->get_id(), $fee ), '3.0', 'woocommerce_new_order_item action instead.' );
+		return $item->get_id();
+	}
+
+	/**
+	 * Update a line item for the order.
+	 *
+	 * Note this does not update order totals.
+	 *
+	 * @param object|int $item order item ID or item object.
+	 * @param WC_Product $product
+	 * @param array $args data to update.
+	 * @return int updated order item ID
+	 * @throws WC_Data_Exception
+	 */
+	public function update_product( $item, $product, $args ) {
+		wc_deprecated_function( 'WC_Order::update_product', '3.0', 'an interaction with the WC_Order_Item_Product class' );
+		if ( is_numeric( $item ) ) {
+			$item = $this->get_item( $item );
+		}
+		if ( ! is_object( $item ) || ! $item->is_type( 'line_item' ) ) {
+			return false;
+		}
+		if ( ! $this->get_id() ) {
+			$this->save(); // Order must exist
+		}
+
+		// BW compatibility with old args
+		if ( isset( $args['totals'] ) ) {
+			foreach ( $args['totals'] as $key => $value ) {
+				if ( 'tax' === $key ) {
+					$args['total_tax'] = $value;
+				} elseif ( 'tax_data' === $key ) {
+					$args['taxes'] = $value;
+				} else {
+					$args[ $key ] = $value;
+				}
+			}
+		}
+
+		// Handly qty if set
+		if ( isset( $args['qty'] ) ) {
+			if ( $product->backorders_require_notification() && $product->is_on_backorder( $args['qty'] ) ) {
+				$item->add_meta_data( apply_filters( 'woocommerce_backordered_item_meta_name', __( 'Backordered', 'woocommerce' ) ), $args['qty'] - max( 0, $product->get_stock_quantity() ), true );
+			}
+			$args['subtotal'] = $args['subtotal'] ? $args['subtotal'] : wc_get_price_excluding_tax( $product, array( 'qty' => $args['qty'] ) );
+			$args['total']	= $args['total'] ? $args['total'] : wc_get_price_excluding_tax( $product, array( 'qty' => $args['qty'] ) );
+		}
+
+		$item->set_order_id( $this->get_id() );
+		$item->set_props( $args );
+		$item->save();
+		do_action( 'woocommerce_order_edit_product', $this->get_id(), $item->get_id(), $args, $product );
+
+		return $item->get_id();
+	}
+
+	/**
+	 * Update coupon for order. Note this does not update order totals.
+	 * @param object|int $item
+	 * @param array $args
+	 * @return int updated order item ID
+	 * @throws WC_Data_Exception
+	 */
+	public function update_coupon( $item, $args ) {
+		wc_deprecated_function( 'WC_Order::update_coupon', '3.0', 'an interaction with the WC_Order_Item_Coupon class' );
+		if ( is_numeric( $item ) ) {
+			$item = $this->get_item( $item );
+		}
+		if ( ! is_object( $item ) || ! $item->is_type( 'coupon' ) ) {
+			return false;
+		}
+		if ( ! $this->get_id() ) {
+			$this->save(); // Order must exist
+		}
+
+		// BW compatibility for old args
+		if ( isset( $args['discount_amount'] ) ) {
+			$args['discount'] = $args['discount_amount'];
+		}
+		if ( isset( $args['discount_amount_tax'] ) ) {
+			$args['discount_tax'] = $args['discount_amount_tax'];
+		}
+
+		$item->set_order_id( $this->get_id() );
+		$item->set_props( $args );
+		$item->save();
+
+		do_action( 'woocommerce_order_update_coupon', $this->get_id(), $item->get_id(), $args );
+
+		return $item->get_id();
+	}
+
+	/**
+	 * Update shipping method for order.
+	 *
+	 * Note this does not update the order total.
+	 *
+	 * @param object|int $item
+	 * @param array $args
+	 * @return int updated order item ID
+	 * @throws WC_Data_Exception
+	 */
+	public function update_shipping( $item, $args ) {
+		wc_deprecated_function( 'WC_Order::update_shipping', '3.0', 'an interaction with the WC_Order_Item_Shipping class' );
+		if ( is_numeric( $item ) ) {
+			$item = $this->get_item( $item );
+		}
+		if ( ! is_object( $item ) || ! $item->is_type( 'shipping' ) ) {
+			return false;
+		}
+		if ( ! $this->get_id() ) {
+			$this->save(); // Order must exist
+		}
+
+		// BW compatibility for old args
+		if ( isset( $args['cost'] ) ) {
+			$args['total'] = $args['cost'];
+		}
+
+		$item->set_order_id( $this->get_id() );
+		$item->set_props( $args );
+		$item->save();
+		$this->calculate_shipping();
+
+		do_action( 'woocommerce_order_update_shipping', $this->get_id(), $item->get_id(), $args );
+
+		return $item->get_id();
+	}
+
+	/**
+	 * Update fee for order.
+	 *
+	 * Note this does not update order totals.
+	 *
+	 * @param object|int $item
+	 * @param array $args
+	 * @return int updated order item ID
+	 * @throws WC_Data_Exception
+	 */
+	public function update_fee( $item, $args ) {
+		wc_deprecated_function( 'WC_Order::update_fee', '3.0', 'an interaction with the WC_Order_Item_Fee class' );
+		if ( is_numeric( $item ) ) {
+			$item = $this->get_item( $item );
+		}
+		if ( ! is_object( $item ) || ! $item->is_type( 'fee' ) ) {
+			return false;
+		}
+		if ( ! $this->get_id() ) {
+			$this->save(); // Order must exist
+		}
+
+		$item->set_order_id( $this->get_id() );
+		$item->set_props( $args );
+		$item->save();
+
+		do_action( 'woocommerce_order_update_fee', $this->get_id(), $item->get_id(), $args );
+
+		return $item->get_id();
+	}
+
+	/**
+	 * Update tax line on order.
+	 * Note this does not update order totals.
+	 *
+	 * @since 3.0
+	 * @param object|int $item
+	 * @param array $args
+	 * @return int updated order item ID
+	 * @throws WC_Data_Exception
+	 */
+	public function update_tax( $item, $args ) {
+		wc_deprecated_function( 'WC_Order::update_tax', '3.0', 'an interaction with the WC_Order_Item_Tax class' );
+		if ( is_numeric( $item ) ) {
+			$item = $this->get_item( $item );
+		}
+		if ( ! is_object( $item ) || ! $item->is_type( 'tax' ) ) {
+			return false;
+		}
+		if ( ! $this->get_id() ) {
+			$this->save(); // Order must exist
+		}
+
+		$item->set_order_id( $this->get_id() );
+		$item->set_props( $args );
+		$item->save();
+
+		do_action( 'woocommerce_order_update_tax', $this->get_id(), $item->get_id(), $args );
+
+		return $item->get_id();
+	}
+
+	/**
+	 * Get a product (either product or variation).
+	 * @deprecated Add deprecation notices in future release. Replaced with $item->get_product()
+	 * @param object $item
+	 * @return WC_Product|bool
+	 */
+	public function get_product_from_item( $item ) {
+		if ( is_callable( array( $item, 'get_product' ) ) ) {
+			$product = $item->get_product();
+		} else {
+			$product = false;
+		}
+		return apply_filters( 'woocommerce_get_product_from_item', $product, $item, $this );
+	}
+
+	/**
+	 * Set the customer address.
+	 * @param array $address Address data.
+	 * @param string $type billing or shipping.
+	 */
+	public function set_address( $address, $type = 'billing' ) {
+		foreach ( $address as $key => $value ) {
+			update_post_meta( $this->get_id(), "_{$type}_" . $key, $value );
+			if ( is_callable( array( $this, "set_{$type}_{$key}" ) ) ) {
+				$this->{"set_{$type}_{$key}"}( $value );
+			}
+		}
+	}
+
+	/**
+	 * Set an order total.
+	 * @param float $amount
+	 * @param string $total_type
+	 * @return bool
+	 */
+	public function legacy_set_total( $amount, $total_type = 'total' ) {
+		if ( ! in_array( $total_type, array( 'shipping', 'tax', 'shipping_tax', 'total', 'cart_discount', 'cart_discount_tax' ) ) ) {
+			return false;
+		}
+
+		switch ( $total_type ) {
+			case 'total' :
+				$amount = wc_format_decimal( $amount, wc_get_price_decimals() );
+				$this->set_total( $amount );
+				update_post_meta( $this->get_id(), '_order_total', $amount );
+				break;
+			case 'cart_discount' :
+				$amount = wc_format_decimal( $amount );
+				$this->set_discount_total( $amount );
+				update_post_meta( $this->get_id(), '_cart_discount', $amount );
+				break;
+			case 'cart_discount_tax' :
+				$amount = wc_format_decimal( $amount );
+				$this->set_discount_tax( $amount );
+				update_post_meta( $this->get_id(), '_cart_discount_tax', $amount );
+				break;
+			case 'shipping' :
+				$amount = wc_format_decimal( $amount );
+				$this->set_shipping_total( $amount );
+				update_post_meta( $this->get_id(), '_order_shipping', $amount );
+				break;
+			case 'shipping_tax' :
+				$amount = wc_format_decimal( $amount );
+				$this->set_shipping_tax( $amount );
+				update_post_meta( $this->get_id(), '_order_shipping_tax', $amount );
+				break;
+			case 'tax' :
+				$amount = wc_format_decimal( $amount );
+				$this->set_cart_tax( $amount );
+				update_post_meta( $this->get_id(), '_order_tax', $amount );
+				break;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Magic __isset method for backwards compatibility. Handles legacy properties which could be accessed directly in the past.
+	 *
+	 * @param string $key
+	 * @return bool
+	 */
+	public function __isset( $key ) {
+		$legacy_props = array( 'completed_date', 'id', 'order_type', 'post', 'status', 'post_status', 'customer_note', 'customer_message', 'user_id', 'customer_user', 'prices_include_tax', 'tax_display_cart', 'display_totals_ex_tax', 'display_cart_ex_tax', 'order_date', 'modified_date', 'cart_discount', 'cart_discount_tax', 'order_shipping', 'order_shipping_tax', 'order_total', 'order_tax', 'billing_first_name', 'billing_last_name', 'billing_company', 'billing_address_1', 'billing_address_2', 'billing_city', 'billing_state', 'billing_postcode', 'billing_country', 'billing_phone', 'billing_email', 'shipping_first_name', 'shipping_last_name', 'shipping_company', 'shipping_address_1', 'shipping_address_2', 'shipping_city', 'shipping_state', 'shipping_postcode', 'shipping_country', 'customer_ip_address', 'customer_user_agent', 'payment_method_title', 'payment_method', 'order_currency' );
+		return $this->get_id() ? ( in_array( $key, $legacy_props ) || metadata_exists( 'post', $this->get_id(), '_' . $key ) ) : false;
+	}
+
+	/**
+	 * Magic __get method for backwards compatibility.
+	 *
+	 * @param string $key
+	 * @return mixed
+	 */
+	public function __get( $key ) {
+		wc_doing_it_wrong( $key, 'Order properties should not be accessed directly.', '3.0' );
+
+		if ( 'completed_date' === $key ) {
+			return $this->get_date_completed() ? gmdate( 'Y-m-d H:i:s', $this->get_date_completed()->getOffsetTimestamp() ) : '';
+		} elseif ( 'paid_date' === $key ) {
+			return $this->get_date_paid() ? gmdate( 'Y-m-d H:i:s', $this->get_date_paid()->getOffsetTimestamp() ) : '';
+		} elseif ( 'modified_date' === $key ) {
+			return $this->get_date_modified() ? gmdate( 'Y-m-d H:i:s', $this->get_date_modified()->getOffsetTimestamp() ) : '';
+		} elseif ( 'order_date' === $key ) {
+			return $this->get_date_created() ? gmdate( 'Y-m-d H:i:s', $this->get_date_created()->getOffsetTimestamp() ) : '';
+		} elseif ( 'id' === $key ) {
+			return $this->get_id();
+		} elseif ( 'post' === $key ) {
+			return get_post( $this->get_id() );
+		} elseif ( 'status' === $key ) {
+			return $this->get_status();
+		} elseif ( 'post_status' === $key ) {
+			return get_post_status( $this->get_id() );
+		} elseif ( 'customer_message' === $key || 'customer_note' === $key ) {
+			return $this->get_customer_note();
+		} elseif ( in_array( $key, array( 'user_id', 'customer_user' ) ) ) {
+			return $this->get_customer_id();
+		} elseif ( 'tax_display_cart' === $key ) {
+			return get_option( 'woocommerce_tax_display_cart' );
+		} elseif ( 'display_totals_ex_tax' === $key ) {
+			return 'excl' === get_option( 'woocommerce_tax_display_cart' );
+		} elseif ( 'display_cart_ex_tax' === $key ) {
+			return 'excl' === get_option( 'woocommerce_tax_display_cart' );
+		} elseif ( 'cart_discount' === $key ) {
+			return $this->get_total_discount();
+		} elseif ( 'cart_discount_tax' === $key ) {
+			return $this->get_discount_tax();
+		} elseif ( 'order_tax' === $key ) {
+			return $this->get_cart_tax();
+		} elseif ( 'order_shipping_tax' === $key ) {
+			return $this->get_shipping_tax();
+		} elseif ( 'order_shipping' === $key ) {
+			return $this->get_shipping_total();
+		} elseif ( 'order_total' === $key ) {
+			return $this->get_total();
+		} elseif ( 'order_type' === $key ) {
+			return $this->get_type();
+		} elseif ( 'order_currency' === $key ) {
+			return $this->get_currency();
+		} elseif ( 'order_version' === $key ) {
+			return $this->get_version();
+	 	} elseif ( is_callable( array( $this, "get_{$key}" ) ) ) {
+			return $this->{"get_{$key}"}();
+		} else {
+			return get_post_meta( $this->get_id(), '_' . $key, true );
+		}
+	}
+
+	/**
+	 * has_meta function for order items. This is different to the WC_Data
+	 * version and should be removed in future versions.
+	 *
+	 * @deprecated
+	 * @return array of meta data.
+	 */
+	public function has_meta( $order_item_id ) {
+		global $wpdb;
+
+		wc_deprecated_function( 'WC_Order::has_meta( $order_item_id )', '3.0', 'WC_Order_item::get_meta_data' );
+
+		return $wpdb->get_results( $wpdb->prepare( "SELECT meta_key, meta_value, meta_id, order_item_id
+			FROM {$wpdb->prefix}woocommerce_order_itemmeta WHERE order_item_id = %d
+			ORDER BY meta_id", absint( $order_item_id ) ), ARRAY_A );
+	}
+
+	/**
+	 * Display meta data belonging to an item.
+	 * @param  array $item
+	 */
+	public function display_item_meta( $item ) {
+		wc_deprecated_function( 'WC_Order::display_item_meta', '3.0', 'wc_display_item_meta' );
+		$product   = $item->get_product();
+		$item_meta = new WC_Order_Item_Meta( $item, $product );
+		$item_meta->display();
+	}
+
+	/**
+	 * Display download links for an order item.
+	 * @param  array $item
+	 */
+	public function display_item_downloads( $item ) {
+		wc_deprecated_function( 'WC_Order::display_item_downloads', '3.0', 'wc_display_item_downloads' );
+		$product   = $item->get_product();
+
+		if ( $product && $product->exists() && $product->is_downloadable() && $this->is_download_permitted() ) {
+			$download_files = $this->get_item_downloads( $item );
+			$i			  = 0;
+			$links		  = array();
+
+			foreach ( $download_files as $download_id => $file ) {
+				$i++;
+				/* translators: 1: current item count */
+				$prefix  = count( $download_files ) > 1 ? sprintf( __( 'Download %d', 'woocommerce' ), $i ) : __( 'Download', 'woocommerce' );
+				$links[] = '<small class="download-url">' . $prefix . ': <a href="' . esc_url( $file['download_url'] ) . '" target="_blank">' . esc_html( $file['name'] ) . '</a></small>' . "\n";
+			}
+
+			echo '<br/>' . implode( '<br/>', $links );
+		}
+	}
+
+	/**
+	 * Get the Download URL.
+	 *
+	 * @param  int $product_id
+	 * @param  int $download_id
+	 * @return string
+	 */
+	public function get_download_url( $product_id, $download_id ) {
+		wc_deprecated_function( 'WC_Order::get_download_url', '3.0', 'WC_Order_Item_Product::get_item_download_url' );
+		return add_query_arg( array(
+			'download_file' => $product_id,
+			'order'         => $this->get_order_key(),
+			'email'         => urlencode( $this->get_billing_email() ),
+			'key'           => $download_id,
+		), trailingslashit( home_url() ) );
+	}
+
+	/**
+	 * Get the downloadable files for an item in this order.
+	 *
+	 * @param  array $item
+	 * @return array
+	 */
+	public function get_item_downloads( $item ) {
+		wc_deprecated_function( 'WC_Order::get_item_downloads', '3.0', 'WC_Order_Item_Product::get_item_downloads' );
+
+		if ( ! $item instanceof WC_Order_Item ) {
+			if ( ! empty( $item['variation_id'] ) ) {
+				$product_id = $item['variation_id'];
+			} elseif ( ! empty( $item['product_id'] ) ) {
+				$product_id = $item['product_id'];
+			} else {
+				return array();
+			}
+
+			// Create a 'virtual' order item to allow retrieving item downloads when
+			// an array of product_id is passed instead of actual order item.
+			$item = new WC_Order_Item_Product();
+			$item->set_product( wc_get_product( $product_id ) );
+			$item->set_order_id( $this->get_id() );
+		}
+
+		return $item->get_item_downloads();
+	}
+
+	/**
+	 * Gets shipping total. Alias of WC_Order::get_shipping_total().
+	 * @deprecated 3.0.0 since this is an alias only.
+	 * @return float
+	 */
+	public function get_total_shipping() {
+		return $this->get_shipping_total();
+	}
+
+	/**
+	 * Get order item meta.
+	 * @deprecated 3.0.0
+	 * @param mixed $order_item_id
+	 * @param string $key (default: '')
+	 * @param bool $single (default: false)
+	 * @return array|string
+	 */
+	public function get_item_meta( $order_item_id, $key = '', $single = false ) {
+		wc_deprecated_function( 'WC_Order::get_item_meta', '3.0', 'wc_get_order_item_meta' );
+		return get_metadata( 'order_item', $order_item_id, $key, $single );
+	}
+
+	/**
+	 * Get all item meta data in array format in the order it was saved. Does not group meta by key like get_item_meta().
+	 *
+	 * @param mixed $order_item_id
+	 * @return array of objects
+	 */
+	public function get_item_meta_array( $order_item_id ) {
+		wc_deprecated_function( 'WC_Order::get_item_meta_array', '3.0', 'WC_Order_Item::get_meta_data() (note the format has changed)' );
+		$item            = $this->get_item( $order_item_id );
+		$meta_data       = $item->get_meta_data();
+		$item_meta_array = array();
+
+		foreach ( $meta_data as $meta ) {
+			$item_meta_array[ $meta->id ] = $meta;
+		}
+
+		return $item_meta_array;
+	}
+
+	/**
+	 * Expand item meta into the $item array.
+	 * @deprecated 3.0.0 Item meta no longer expanded due to new order item
+	 *		classes. This function now does nothing to avoid data breakage.
+	 * @param array $item before expansion.
+	 * @return array
+	 */
+	public function expand_item_meta( $item ) {
+		wc_deprecated_function( 'WC_Order::expand_item_meta', '3.0' );
+		return $item;
+	}
+
+	/**
+	 * Load the order object. Called from the constructor.
+	 * @deprecated 3.0.0 Logic moved to constructor
+	 * @param int|object|WC_Order $order Order to init.
+	 */
+	protected function init( $order ) {
+		wc_deprecated_function( 'WC_Order::init', '3.0', 'Logic moved to constructor' );
+		if ( is_numeric( $order ) ) {
+			$this->set_id( $order );
+		} elseif ( $order instanceof WC_Order ) {
+			$this->set_id( absint( $order->get_id() ) );
+		} elseif ( isset( $order->ID ) ) {
+			$this->set_id( absint( $order->ID ) );
+		}
+		$this->set_object_read( false );
+		$this->data_store->read( $this );
+	}
+
+	/**
+	 * Gets an order from the database.
+	 * @deprecated 3.0
+	 * @param int $id (default: 0).
+	 * @return bool
+	 */
+	public function get_order( $id = 0 ) {
+		wc_deprecated_function( 'WC_Order::get_order', '3.0' );
+
+		if ( ! $id ) {
+			return false;
+		}
+
+		$result = get_post( $id );
+
+		if ( $result ) {
+			$this->populate( $result );
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Populates an order from the loaded post data.
+	 * @deprecated 3.0
+	 * @param mixed $result
+	 */
+	public function populate( $result ) {
+		wc_deprecated_function( 'WC_Order::populate', '3.0' );
+		$this->set_id( $result->ID );
+		$this->set_object_read( false );
+		$this->data_store->read( $this );
+	}
+
+	/**
+	 * Cancel the order and restore the cart (before payment).
+	 * @deprecated 3.0.0 Moved to event handler.
+	 * @param string $note (default: '') Optional note to add.
+	 */
+	public function cancel_order( $note = '' ) {
+		wc_deprecated_function( 'WC_Order::cancel_order', '3.0', 'WC_Order::update_status' );
+		WC()->session->set( 'order_awaiting_payment', false );
+		$this->update_status( 'cancelled', $note );
+	}
+
+	/**
+	 * Record sales.
+	 * @deprecated 3.0.0
+	 */
+	public function record_product_sales() {
+		wc_deprecated_function( 'WC_Order::record_product_sales', '3.0', 'wc_update_total_sales_counts' );
+		wc_update_total_sales_counts( $this->get_id() );
+	}
+
+	/**
+	 * Increase applied coupon counts.
+	 * @deprecated 3.0.0
+	 */
+	public function increase_coupon_usage_counts() {
+		wc_deprecated_function( 'WC_Order::increase_coupon_usage_counts', '3.0', 'wc_update_coupon_usage_counts' );
+		wc_update_coupon_usage_counts( $this->get_id() );
+	}
+
+	/**
+	 * Decrease applied coupon counts.
+	 * @deprecated 3.0.0
+	 */
+	public function decrease_coupon_usage_counts() {
+		wc_deprecated_function( 'WC_Order::decrease_coupon_usage_counts', '3.0', 'wc_update_coupon_usage_counts' );
+		wc_update_coupon_usage_counts( $this->get_id() );
+	}
+
+	/**
+	 * Reduce stock levels for all line items in the order.
+	 * @deprecated 3.0.0
+	 */
+	public function reduce_order_stock() {
+		wc_deprecated_function( 'WC_Order::reduce_order_stock', '3.0', 'wc_reduce_stock_levels' );
+		wc_reduce_stock_levels( $this->get_id() );
+	}
+
+	/**
+	 * Send the stock notifications.
+	 * @deprecated 3.0.0 No longer needs to be called directly.
+	 */
+	public function send_stock_notifications( $product, $new_stock, $qty_ordered ) {
+		wc_deprecated_function( 'WC_Order::send_stock_notifications', '3.0' );
+	}
+
+	/**
+	 * Output items for display in html emails.
+	 * @deprecated 3.0.0 Moved to template functions.
+	 * @param array $args Items args.
+	 * @return string
+	 */
+	public function email_order_items_table( $args = array() ) {
+		wc_deprecated_function( 'WC_Order::email_order_items_table', '3.0', 'wc_get_email_order_items' );
+		return wc_get_email_order_items( $this, $args );
+	}
+
+	/**
+	 * Get currency.
+	 * @deprecated 3.0.0
+	 */
+	public function get_order_currency() {
+		wc_deprecated_function( 'WC_Order::get_order_currency', '3.0', 'WC_Order::get_currency' );
+		return apply_filters( 'woocommerce_get_order_currency', $this->get_currency(), $this );
+	}
+}
diff --git a/includes/legacy/abstract-wc-legacy-payment-token.php b/includes/legacy/abstract-wc-legacy-payment-token.php
new file mode 100644
index 00000000000..034bcba2bb2
--- /dev/null
+++ b/includes/legacy/abstract-wc-legacy-payment-token.php
@@ -0,0 +1,68 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Legacy Payment Tokens.
+ * Payment Tokens were introduced in 2.6.0 with create and update as methods.
+ * Major CRUD changes occurred in 3.0, so these were deprecated (save and delete still work).
+ * This legacy class is for backwards compatibility in case any code called ->read, ->update or ->create
+ * directly on the object.
+ *
+ * @version  3.0.0
+ * @package  WooCommerce/Classes
+ * @category Class
+ * @author   WooCommerce
+ */
+abstract class WC_Legacy_Payment_Token extends WC_Data {
+
+	/**
+	 * Sets the type of this payment token (CC, eCheck, or something else).
+	 *
+	 * @param string Payment Token Type (CC, eCheck)
+	 */
+	public function set_type( $type ) {
+		wc_deprecated_function( 'WC_Payment_Token::set_type', '3.0.0', 'Type cannot be overwritten.' );
+	}
+
+	/**
+	 * Read a token by ID.
+	 * @deprecated 3.0.0 - Init a token class with an ID.
+	 */
+	public function read( $token_id ) {
+		wc_deprecated_function( 'WC_Payment_Token::read', '3.0.0', 'a new token class initialized with an ID.' );
+		$this->set_id( $token_id );
+		$data_store = WC_Data_Store::load( 'payment-token' );
+		$data_store->read( $this );
+	}
+
+	/**
+	 * Update a token.
+	 * @deprecated 3.0.0 - Use ::save instead.
+	 */
+	public function update() {
+		wc_deprecated_function( 'WC_Payment_Token::update', '3.0.0', 'WC_Payment_Token::save instead.' );
+		$data_store = WC_Data_Store::load( 'payment-token' );
+		try {
+			$data_store->update( $this );
+		} catch ( Exception $e ) {
+			return false;
+		}
+	}
+
+	/**
+	 * Create a token.
+	 * @deprecated 3.0.0 - Use ::save instead.
+	 */
+	public function create() {
+		wc_deprecated_function( 'WC_Payment_Token::create', '3.0.0', 'WC_Payment_Token::save instead.' );
+		$data_store = WC_Data_Store::load( 'payment-token' );
+		try {
+			$data_store->create( $this );
+		} catch ( Exception $e ) {
+			return false;
+		}
+	}
+
+}
diff --git a/includes/legacy/abstract-wc-legacy-product.php b/includes/legacy/abstract-wc-legacy-product.php
new file mode 100644
index 00000000000..dc5a1a1e8c8
--- /dev/null
+++ b/includes/legacy/abstract-wc-legacy-product.php
@@ -0,0 +1,661 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Legacy Abstract Product
+ *
+ * Legacy and deprecated functions are here to keep the WC_Abstract_Product
+ * clean.
+ * This class will be removed in future versions.
+ *
+ * @version  3.0.0
+ * @package  WooCommerce/Abstracts
+ * @category Abstract Class
+ * @author   WooThemes
+ */
+abstract class WC_Abstract_Legacy_Product extends WC_Data {
+
+	/**
+	 * Magic __isset method for backwards compatibility. Legacy properties which could be accessed directly in the past.
+	 *
+	 * @param  string $key Key name.
+	 * @return bool
+	 */
+	public function __isset( $key ) {
+		$valid = array(
+			'id',
+			'product_attributes',
+			'visibility',
+			'sale_price_dates_from',
+			'sale_price_dates_to',
+			'post',
+			'download_type',
+			'product_image_gallery',
+			'variation_shipping_class',
+			'shipping_class',
+			'total_stock',
+			'crosssell_ids',
+			'parent',
+		);
+		if ( $this->is_type( 'variation' ) ) {
+			$valid = array_merge( $valid, array(
+				'variation_id',
+				'variation_data',
+				'variation_has_stock',
+				'variation_shipping_class_id',
+				'variation_has_sku',
+				'variation_has_length',
+				'variation_has_width',
+				'variation_has_height',
+				'variation_has_weight',
+				'variation_has_tax_class',
+				'variation_has_downloadable_files',
+			) );
+		}
+		return in_array( $key, array_merge( $valid, array_keys( $this->data ) ) ) || metadata_exists( 'post', $this->get_id(), '_' . $key ) || metadata_exists( 'post', $this->get_parent_id(), '_' . $key );
+	}
+
+	/**
+	 * Magic __get method for backwards compatibility. Maps legacy vars to new getters.
+	 *
+	 * @param  string $key Key name.
+	 * @return mixed
+	 */
+	public function __get( $key ) {
+
+		if ( 'post_type' === $key ) {
+			return $this->post_type;
+		}
+
+		wc_doing_it_wrong( $key, __( 'Product properties should not be accessed directly.', 'woocommerce' ), '3.0' );
+
+		switch ( $key ) {
+			case 'id' :
+				$value = $this->is_type( 'variation' ) ? $this->get_parent_id() : $this->get_id();
+				break;
+			case 'product_type' :
+				$value = $this->get_type();
+				break;
+			case 'product_attributes' :
+				$value = isset( $this->data['attributes'] ) ? $this->data['attributes'] : '';
+				break;
+			case 'visibility' :
+				$value = $this->get_catalog_visibility();
+				break;
+			case 'sale_price_dates_from' :
+				return $this->get_date_on_sale_from() ? $this->get_date_on_sale_from()->getTimestamp() : '';
+				break;
+			case 'sale_price_dates_to' :
+				return $this->get_date_on_sale_to() ? $this->get_date_on_sale_to()->getTimestamp() : '';
+				break;
+			case 'post' :
+				$value = get_post( $this->get_id() );
+				break;
+			case 'download_type' :
+				return 'standard';
+				break;
+			case 'product_image_gallery' :
+				$value = $this->get_gallery_image_ids();
+				break;
+			case 'variation_shipping_class' :
+			case 'shipping_class' :
+				$value = $this->get_shipping_class();
+				break;
+			case 'total_stock' :
+				$value = $this->get_total_stock();
+				break;
+			case 'downloadable' :
+			case 'virtual' :
+			case 'manage_stock' :
+			case 'featured' :
+			case 'sold_individually' :
+				$value = $this->{"get_$key"}() ? 'yes' : 'no';
+				break;
+			case 'crosssell_ids' :
+				$value = $this->get_cross_sell_ids();
+				break;
+			case 'upsell_ids' :
+				$value = $this->get_upsell_ids();
+				break;
+			case 'parent' :
+				$value = wc_get_product( $this->get_parent_id() );
+				break;
+			case 'variation_id' :
+				$value = $this->is_type( 'variation' ) ? $this->get_id() : '';
+				break;
+			case 'variation_data' :
+				$value = $this->is_type( 'variation' ) ? wc_get_product_variation_attributes( $this->get_id() ) : '';
+				break;
+			case 'variation_has_stock' :
+				$value = $this->is_type( 'variation' ) ? $this->managing_stock() : '';
+				break;
+			case 'variation_shipping_class_id' :
+				$value = $this->is_type( 'variation' ) ? $this->get_shipping_class_id() : '';
+				break;
+			case 'variation_has_sku' :
+			case 'variation_has_length' :
+			case 'variation_has_width' :
+			case 'variation_has_height' :
+			case 'variation_has_weight' :
+			case 'variation_has_tax_class' :
+			case 'variation_has_downloadable_files' :
+				$value = true; // These were deprecated in 2.2 and simply returned true in 2.6.x.
+				break;
+			default :
+				if ( in_array( $key, array_keys( $this->data ) ) ) {
+					$value = $this->{"get_$key"}();
+				} else {
+					$value = get_post_meta( $this->id, '_' . $key, true );
+				}
+				break;
+		}
+		return $value;
+	}
+
+	/**
+	 * If set, get the default attributes for a variable product.
+	 *
+	 * @deprecated 3.0.0
+	 * @return array
+	 */
+	public function get_variation_default_attributes() {
+		wc_deprecated_function( 'WC_Product_Variable::get_variation_default_attributes', '3.0', 'WC_Product::get_default_attributes' );
+		return apply_filters( 'woocommerce_product_default_attributes', $this->get_default_attributes(), $this );
+	}
+
+	/**
+	 * Returns the gallery attachment ids.
+	 *
+	 * @deprecated 3.0.0
+	 * @return array
+	 */
+	public function get_gallery_attachment_ids() {
+		wc_deprecated_function( 'WC_Product::get_gallery_attachment_ids', '3.0', 'WC_Product::get_gallery_image_ids' );
+		return $this->get_gallery_image_ids();
+	}
+
+	/**
+	 * Set stock level of the product.
+	 *
+	 * @deprecated 3.0.0
+	 */
+	public function set_stock( $amount = null, $mode = 'set' ) {
+		wc_deprecated_function( 'WC_Product::set_stock', '3.0', 'wc_update_product_stock' );
+		return wc_update_product_stock( $this, $amount, $mode );
+	}
+
+	/**
+	 * Reduce stock level of the product.
+	 *
+	 * @deprecated 3.0.0
+	 * @param int $amount Amount to reduce by. Default: 1
+	 * @return int new stock level
+	 */
+	public function reduce_stock( $amount = 1 ) {
+		wc_deprecated_function( 'WC_Product::reduce_stock', '3.0', 'wc_update_product_stock' );
+		return wc_update_product_stock( $this, $amount, 'decrease' );
+	}
+
+	/**
+	 * Increase stock level of the product.
+	 *
+	 * @deprecated 3.0.0
+	 * @param int $amount Amount to increase by. Default 1.
+	 * @return int new stock level
+	 */
+	public function increase_stock( $amount = 1 ) {
+		wc_deprecated_function( 'WC_Product::increase_stock', '3.0', 'wc_update_product_stock' );
+		return wc_update_product_stock( $this, $amount, 'increase' );
+	}
+
+	/**
+	 * Check if the stock status needs changing.
+	 *
+	 * @deprecated 3.0.0 Sync is done automatically on read/save, so calling this should not be needed any more.
+	 */
+	public function check_stock_status() {
+		wc_deprecated_function( 'WC_Product::check_stock_status', '3.0' );
+	}
+
+	/**
+	 * Get and return related products.
+	 * @deprecated 3.0.0 Use wc_get_related_products instead.
+	 */
+	public function get_related( $limit = 5 ) {
+		wc_deprecated_function( 'WC_Product::get_related', '3.0', 'wc_get_related_products' );
+		return wc_get_related_products( $this->get_id(), $limit );
+	}
+
+	/**
+	 * Retrieves related product terms.
+	 * @deprecated 3.0.0 Use wc_get_product_term_ids instead.
+	 */
+	protected function get_related_terms( $term ) {
+		wc_deprecated_function( 'WC_Product::get_related_terms', '3.0', 'wc_get_product_term_ids' );
+		return array_merge( array( 0 ), wc_get_product_term_ids( $this->get_id(), $term ) );
+	}
+
+	/**
+	 * Builds the related posts query.
+	 * @deprecated 3.0.0 Use Product Data Store get_related_products_query instead.
+	 */
+	protected function build_related_query( $cats_array, $tags_array, $exclude_ids, $limit ) {
+		wc_deprecated_function( 'WC_Product::build_related_query', '3.0', 'Product Data Store get_related_products_query' );
+		$data_store = WC_Data_Store::load( 'product' );
+		return $data_store->get_related_products_query( $cats_array, $tags_array, $exclude_ids, $limit );
+	}
+
+	/**
+	 * Returns the child product.
+	 * @deprecated 3.0.0 Use wc_get_product instead.
+	 * @param mixed $child_id
+	 * @return WC_Product|WC_Product|WC_Product_variation
+	 */
+	public function get_child( $child_id ) {
+		wc_deprecated_function( 'WC_Product::get_child', '3.0', 'wc_get_product' );
+		return wc_get_product( $child_id );
+	}
+
+	/**
+	 * Functions for getting parts of a price, in html, used by get_price_html.
+	 *
+	 * @deprecated 3.0.0
+	 * @return string
+	 */
+	public function get_price_html_from_text() {
+		wc_deprecated_function( 'WC_Product::get_price_html_from_text', '3.0', 'wc_get_price_html_from_text' );
+		return wc_get_price_html_from_text();
+	}
+
+	/**
+	 * Functions for getting parts of a price, in html, used by get_price_html.
+	 *
+	 * @deprecated 3.0.0 Use wc_format_sale_price instead.
+	 * @param  string $from String or float to wrap with 'from' text
+	 * @param  mixed $to String or float to wrap with 'to' text
+	 * @return string
+	 */
+	public function get_price_html_from_to( $from, $to ) {
+		wc_deprecated_function( 'WC_Product::get_price_html_from_to', '3.0', 'wc_format_sale_price' );
+		return apply_filters( 'woocommerce_get_price_html_from_to', wc_format_sale_price( $from, $to ), $from, $to, $this );
+	}
+
+	/**
+	 * Lists a table of attributes for the product page.
+	 * @deprecated 3.0.0 Use wc_display_product_attributes instead.
+	 */
+	public function list_attributes() {
+		wc_deprecated_function( 'WC_Product::list_attributes', '3.0', 'wc_display_product_attributes' );
+		wc_display_product_attributes( $this );
+	}
+
+	/**
+	 * Returns the price (including tax). Uses customer tax rates. Can work for a specific $qty for more accurate taxes.
+	 *
+	 * @deprecated 3.0.0 Use wc_get_price_including_tax instead.
+	 * @param  int $qty
+	 * @param  string $price to calculate, left blank to just use get_price()
+	 * @return string
+	 */
+	public function get_price_including_tax( $qty = 1, $price = '' ) {
+		wc_deprecated_function( 'WC_Product::get_price_including_tax', '3.0', 'wc_get_price_including_tax' );
+		return wc_get_price_including_tax( $this, array( 'qty' => $qty, 'price' => $price ) );
+	}
+
+	/**
+	 * Returns the price including or excluding tax, based on the 'woocommerce_tax_display_shop' setting.
+	 *
+	 * @deprecated 3.0.0 Use wc_get_price_to_display instead.
+	 * @param  string  $price to calculate, left blank to just use get_price()
+	 * @param  integer $qty   passed on to get_price_including_tax() or get_price_excluding_tax()
+	 * @return string
+	 */
+	public function get_display_price( $price = '', $qty = 1 ) {
+		wc_deprecated_function( 'WC_Product::get_display_price', '3.0', 'wc_get_price_to_display' );
+		return wc_get_price_to_display( $this, array( 'qty' => $qty, 'price' => $price ) );
+	}
+
+	/**
+	 * Returns the price (excluding tax) - ignores tax_class filters since the price may *include* tax and thus needs subtracting.
+	 * Uses store base tax rates. Can work for a specific $qty for more accurate taxes.
+	 *
+	 * @deprecated 3.0.0 Use wc_get_price_excluding_tax instead.
+	 * @param  int $qty
+	 * @param  string $price to calculate, left blank to just use get_price()
+	 * @return string
+	 */
+	public function get_price_excluding_tax( $qty = 1, $price = '' ) {
+		wc_deprecated_function( 'WC_Product::get_price_excluding_tax', '3.0', 'wc_get_price_excluding_tax' );
+		return wc_get_price_excluding_tax( $this, array( 'qty' => $qty, 'price' => $price ) );
+	}
+
+	/**
+	 * Adjust a products price dynamically.
+	 *
+	 * @deprecated 3.0.0
+	 * @param mixed $price
+	 */
+	public function adjust_price( $price ) {
+		wc_deprecated_function( 'WC_Product::adjust_price', '3.0', 'WC_Product::set_price / WC_Product::get_price' );
+		$this->data['price'] = $this->data['price'] + $price;
+	}
+
+	/**
+	 * Returns the product categories.
+	 *
+	 * @deprecated 3.0.0
+	 * @param string $sep (default: ', ').
+	 * @param string $before (default: '').
+	 * @param string $after (default: '').
+	 * @return string
+	 */
+	public function get_categories( $sep = ', ', $before = '', $after = '' ) {
+		wc_deprecated_function( 'WC_Product::get_categories', '3.0', 'wc_get_product_category_list' );
+		return wc_get_product_category_list( $this->get_id(), $sep, $before, $after );
+	}
+
+	/**
+	 * Returns the product tags.
+	 *
+	 * @deprecated 3.0.0
+	 * @param string $sep (default: ', ').
+	 * @param string $before (default: '').
+	 * @param string $after (default: '').
+	 * @return array
+	 */
+	public function get_tags( $sep = ', ', $before = '', $after = '' ) {
+		wc_deprecated_function( 'WC_Product::get_tags', '3.0', 'wc_get_product_tag_list' );
+		return wc_get_product_tag_list( $this->get_id(), $sep, $before, $after );
+	}
+
+	/**
+	 * Get the product's post data.
+	 *
+	 * @deprecated 3.0.0
+	 * @return WP_Post
+	 */
+	public function get_post_data() {
+		wc_deprecated_function( 'WC_Product::get_post_data', '3.0', 'get_post' );
+
+		// In order to keep backwards compatibility it's required to use the parent data for variations.
+		if ( $this->is_type( 'variation' ) ) {
+			$post_data = get_post( $this->get_parent_id() );
+		} else {
+			$post_data = get_post( $this->get_id() );
+		}
+
+		return $post_data;
+	}
+
+	/**
+	 * Get the parent of the post.
+	 *
+	 * @deprecated 3.0.0
+	 * @return int
+	 */
+	public function get_parent() {
+		wc_deprecated_function( 'WC_Product::get_parent', '3.0', 'WC_Product::get_parent_id' );
+		return apply_filters( 'woocommerce_product_parent', absint( $this->get_post_data()->post_parent ), $this );
+	}
+
+	/**
+	 * Returns the upsell product ids.
+	 *
+	 * @deprecated 3.0.0
+	 * @return array
+	 */
+	public function get_upsells() {
+		wc_deprecated_function( 'WC_Product::get_upsells', '3.0', 'WC_Product::get_upsell_ids' );
+		return apply_filters( 'woocommerce_product_upsell_ids', $this->get_upsell_ids(), $this );
+	}
+
+	/**
+	 * Returns the cross sell product ids.
+	 *
+	 * @deprecated 3.0.0
+	 * @return array
+	 */
+	public function get_cross_sells() {
+		wc_deprecated_function( 'WC_Product::get_cross_sells', '3.0', 'WC_Product::get_cross_sell_ids' );
+		return apply_filters( 'woocommerce_product_crosssell_ids', $this->get_cross_sell_ids(), $this );
+	}
+
+	/**
+	 * Check if variable product has default attributes set.
+	 *
+	 * @deprecated 3.0.0
+	 * @return bool
+	 */
+	public function has_default_attributes() {
+		wc_deprecated_function( 'WC_Product_Variable::has_default_attributes', '3.0', 'a check against WC_Product::get_default_attributes directly' );
+		if ( ! $this->get_default_attributes() ) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Get variation ID.
+	 *
+	 * @deprecated 3.0.0
+	 * @return int
+	 */
+	public function get_variation_id() {
+		wc_deprecated_function( 'WC_Product::get_variation_id', '3.0', 'WC_Product::get_id(). It will always be the variation ID if this is a variation.' );
+		return $this->get_id();
+	}
+
+	/**
+	 * Get product variation description.
+	 *
+	 * @deprecated 3.0.0
+	 * @return string
+	 */
+	public function get_variation_description() {
+		wc_deprecated_function( 'WC_Product::get_variation_description', '3.0', 'WC_Product::get_description()' );
+		return $this->get_description();
+	}
+
+	/**
+	 * Check if all variation's attributes are set.
+	 *
+	 * @deprecated 3.0.0
+	 * @return boolean
+	 */
+	public function has_all_attributes_set() {
+		wc_deprecated_function( 'WC_Product::has_all_attributes_set', '3.0', 'an array filter on get_variation_attributes for a quick solution.' );
+		$set = true;
+
+		// undefined attributes have null strings as array values
+		foreach ( $this->get_variation_attributes() as $att ) {
+			if ( ! $att ) {
+				$set = false;
+				break;
+			}
+		}
+		return $set;
+	}
+
+	/**
+	 * Returns whether or not the variations parent is visible.
+	 *
+	 * @deprecated 3.0.0
+	 * @return bool
+	 */
+	public function parent_is_visible() {
+		wc_deprecated_function( 'WC_Product::parent_is_visible', '3.0' );
+		return $this->is_visible();
+	}
+
+	/**
+	 * Get total stock - This is the stock of parent and children combined.
+	 *
+	 * @deprecated 3.0.0
+	 * @return int
+	 */
+	public function get_total_stock() {
+		wc_deprecated_function( 'WC_Product::get_total_stock', '3.0', 'get_stock_quantity on each child. Beware of performance issues in doing so.' );
+		if ( sizeof( $this->get_children() ) > 0 ) {
+			$total_stock = max( 0, $this->get_stock_quantity() );
+
+			foreach ( $this->get_children() as $child_id ) {
+				if ( 'yes' === get_post_meta( $child_id, '_manage_stock', true ) ) {
+					$stock = get_post_meta( $child_id, '_stock', true );
+					$total_stock += max( 0, wc_stock_amount( $stock ) );
+				}
+			}
+		} else {
+			$total_stock = $this->get_stock_quantity();
+		}
+		return wc_stock_amount( $total_stock );
+	}
+
+	/**
+	 * Get formatted variation data with WC < 2.4 back compat and proper formatting of text-based attribute names.
+	 *
+	 * @deprecated 3.0.0
+	 * @return string
+	 */
+	public function get_formatted_variation_attributes( $flat = false ) {
+		wc_deprecated_function( 'WC_Product::get_formatted_variation_attributes', '3.0', 'wc_get_formatted_variation' );
+		return wc_get_formatted_variation( $this, $flat );
+	}
+
+	/**
+	 * Sync variable product prices with the children lowest/highest prices.
+	 *
+	 * @deprecated 3.0.0 not used in core.
+	 */
+	public function variable_product_sync( $product_id = '' ) {
+		wc_deprecated_function( 'WC_Product::variable_product_sync', '3.0' );
+		if ( empty( $product_id ) ) {
+			$product_id = $this->get_id();
+		}
+
+		// Sync prices with children
+		if ( is_callable( array( __CLASS__, 'sync' ) ) ) {
+			self::sync( $product_id );
+		}
+	}
+
+	/**
+	 * Sync the variable product's attributes with the variations.
+	 */
+	public static function sync_attributes( $product, $children = false ) {
+		if ( ! is_a( $product, 'WC_Product' ) ) {
+			$product = wc_get_product( $product );
+		}
+
+		/**
+		 * Pre 2.4 handling where 'slugs' were saved instead of the full text attribute.
+		 * Attempt to get full version of the text attribute from the parent and UPDATE meta.
+		 */
+		if ( version_compare( get_post_meta( $product->get_id(), '_product_version', true ), '2.4.0', '<' ) ) {
+			$parent_attributes = array_filter( (array) get_post_meta( $product->get_id(), '_product_attributes', true ) );
+
+			if ( ! $children ) {
+				$children = $product->get_children( 'edit' );
+			}
+
+			foreach ( $children as $child_id ) {
+				$all_meta = get_post_meta( $child_id );
+
+				foreach ( $all_meta as $name => $value ) {
+					if ( 0 !== strpos( $name, 'attribute_' ) ) {
+						continue;
+					}
+					if ( sanitize_title( $value[0] ) === $value[0] ) {
+						foreach ( $parent_attributes as $attribute ) {
+							if ( 'attribute_' . sanitize_title( $attribute['name'] ) !== $name ) {
+								continue;
+							}
+							$text_attributes = wc_get_text_attributes( $attribute['value'] );
+							foreach ( $text_attributes as $text_attribute ) {
+								if ( sanitize_title( $text_attribute ) === $value[0] ) {
+									update_post_meta( $child_id, $name, $text_attribute );
+									break;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Match a variation to a given set of attributes using a WP_Query.
+	 * @deprecated 3.0.0 in favour of Product data store's find_matching_product_variation.
+	 */
+	public function get_matching_variation( $match_attributes = array() ) {
+		wc_deprecated_function( 'WC_Product::get_matching_variation', '3.0', 'Product data store find_matching_product_variation' );
+		$data_store = WC_Data_Store::load( 'product' );
+		return $data_store->find_matching_product_variation( $this, $match_attributes );
+	}
+
+	/**
+	 * Returns whether or not we are showing dimensions on the product page.
+	 * @deprecated 3.0.0 Unused.
+	 * @return bool
+	 */
+	public function enable_dimensions_display() {
+		wc_deprecated_function( 'WC_Product::enable_dimensions_display', '3.0' );
+		return apply_filters( 'wc_product_enable_dimensions_display', true ) && ( $this->has_dimensions() || $this->has_weight() || $this->child_has_weight() || $this->child_has_dimensions() );
+	}
+
+	/**
+	 * Returns the product rating in html format.
+	 *
+	 * @deprecated 3.0.0
+	 * @param string $rating (default: '')
+	 * @return string
+	 */
+	public function get_rating_html( $rating = null ) {
+		wc_deprecated_function( 'WC_Product::get_rating_html', '3.0', 'wc_get_rating_html' );
+		return wc_get_rating_html( $rating );
+	}
+
+	/**
+	 * Sync product rating. Can be called statically.
+	 *
+	 * @deprecated 3.0.0
+	 * @param  int $post_id
+	 */
+	public static function sync_average_rating( $post_id ) {
+		wc_deprecated_function( 'WC_Product::sync_average_rating', '3.0', 'WC_Comments::get_average_rating_for_product or leave to CRUD.' );
+		$average = WC_Comments::get_average_rating_for_product( wc_get_product( $post_id ) );
+		update_post_meta( $post_id, '_wc_average_rating', $average );
+	}
+
+	/**
+	 * Sync product rating count. Can be called statically.
+	 *
+	 * @deprecated 3.0.0
+	 * @param  int $post_id
+	 */
+	public static function sync_rating_count( $post_id ) {
+		wc_deprecated_function( 'WC_Product::sync_rating_count', '3.0', 'WC_Comments::get_rating_counts_for_product or leave to CRUD.' );
+		$counts     = WC_Comments::get_rating_counts_for_product( wc_get_product( $post_id ) );
+		update_post_meta( $post_id, '_wc_rating_count', $counts );
+	}
+
+	/**
+	 * Same as get_downloads in CRUD.
+	 *
+	 * @deprecated 3.0.0
+	 * @return array
+	 */
+	public function get_files() {
+		wc_deprecated_function( 'WC_Product::get_files', '3.0', 'WC_Product::get_downloads' );
+		return $this->get_downloads();
+	}
+
+	/**
+	 * @deprected 3.0.0 Sync is taken care of during save - no need to call this directly.
+	 */
+	public function grouped_product_sync() {
+		wc_deprecated_function( 'WC_Product::grouped_product_sync', '3.0' );
+	}
+}
diff --git a/includes/legacy/class-wc-legacy-coupon.php b/includes/legacy/class-wc-legacy-coupon.php
new file mode 100644
index 00000000000..91c5fd893ee
--- /dev/null
+++ b/includes/legacy/class-wc-legacy-coupon.php
@@ -0,0 +1,204 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Legacy Coupon.
+ *
+ * Legacy and deprecated functions are here to keep the WC_Legacy_Coupon class clean.
+ * This class will be removed in future versions.
+ *
+ * @class       WC_Legacy_Coupon
+ * @version     3.0.0
+ * @package     WooCommerce/Classes
+ * @category    Class
+ * @author      WooThemes
+ */
+abstract class WC_Legacy_Coupon extends WC_Data {
+
+	/**
+	 * Magic __isset method for backwards compatibility. Legacy properties which could be accessed directly in the past.
+	 * @param  string $key
+	 * @return bool
+	 */
+	public function __isset( $key ) {
+		$legacy_keys = array(
+			'id',
+			'exists',
+			'coupon_custom_fields',
+			'type',
+			'discount_type',
+			'amount',
+			'coupon_amount',
+			'code',
+			'individual_use',
+			'product_ids',
+			'exclude_product_ids',
+			'usage_limit',
+			'usage_limit_per_user',
+			'limit_usage_to_x_items',
+			'usage_count',
+			'expiry_date',
+			'product_categories',
+			'exclude_product_categories',
+			'minimum_amount',
+			'maximum_amount',
+			'customer_email',
+		);
+		if ( in_array( $key, $legacy_keys ) ) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Magic __get method for backwards compatibility. Maps legacy vars to new getters.
+	 * @param  string $key
+	 * @return mixed
+	 */
+	public function __get( $key ) {
+		wc_doing_it_wrong( $key, 'Coupon properties should not be accessed directly.', '3.0' );
+
+		switch ( $key ) {
+			case 'id' :
+				$value = $this->get_id();
+			break;
+			case 'exists' :
+				$value = ( $this->get_id() > 0 ) ? true : false;
+			break;
+			case 'coupon_custom_fields' :
+				$legacy_custom_fields = array();
+				$custom_fields = $this->get_id() ? $this->get_meta_data() : array();
+				if ( ! empty( $custom_fields ) ) {
+					foreach ( $custom_fields as  $cf_value ) {
+						// legacy only supports 1 key
+						$legacy_custom_fields[ $cf_value->key ][0] = $cf_value->value;
+					}
+				}
+				$value = $legacy_custom_fields;
+			break;
+			case 'type' :
+			case 'discount_type' :
+				$value = $this->get_discount_type();
+			break;
+			case 'amount' :
+			case 'coupon_amount' :
+				$value = $this->get_amount();
+			break;
+			case 'code' :
+				$value = $this->get_code();
+			break;
+			case 'individual_use' :
+				$value = ( true === $this->get_individual_use() ) ? 'yes' : 'no';
+			break;
+			case 'product_ids' :
+				$value = $this->get_product_ids();
+			break;
+			case 'exclude_product_ids' :
+				$value = $this->get_excluded_product_ids();
+			break;
+			case 'usage_limit' :
+				$value = $this->get_usage_limit();
+			break;
+			case 'usage_limit_per_user' :
+				$value = $this->get_usage_limit_per_user();
+			break;
+			case 'limit_usage_to_x_items' :
+				$value = $this->get_limit_usage_to_x_items();
+			break;
+			case 'usage_count' :
+				$value = $this->get_usage_count();
+			break;
+			case 'expiry_date' :
+				$value = ( $this->get_date_expires() ? $this->get_date_expires()->date( 'Y-m-d' ) : '' );
+			break;
+			case 'product_categories' :
+				$value = $this->get_product_categories();
+			break;
+			case 'exclude_product_categories' :
+				$value = $this->get_excluded_product_categories();
+			break;
+			case 'minimum_amount' :
+				$value = $this->get_minimum_amount();
+			break;
+			case 'maximum_amount' :
+				$value = $this->get_maximum_amount();
+			break;
+			case 'customer_email' :
+				$value = $this->get_email_restrictions();
+			break;
+			default :
+				$value = '';
+			break;
+		}
+
+		return $value;
+	}
+
+	/**
+	 * Format loaded data as array.
+	 * @param  string|array $array
+	 * @return array
+	 */
+	public function format_array( $array ) {
+		wc_deprecated_function( 'WC_Coupon::format_array', '3.0' );
+		if ( ! is_array( $array ) ) {
+			if ( is_serialized( $array ) ) {
+				$array = maybe_unserialize( $array );
+			} else {
+				$array = explode( ',', $array );
+			}
+		}
+		return array_filter( array_map( 'trim', array_map( 'strtolower', $array ) ) );
+	}
+
+
+	/**
+	 * Check if coupon needs applying before tax.
+	 *
+	 * @return bool
+	 */
+	public function apply_before_tax() {
+		wc_deprecated_function( 'WC_Coupon::apply_before_tax', '3.0' );
+		return true;
+	}
+
+	/**
+	 * Check if a coupon enables free shipping.
+	 *
+	 * @return bool
+	 */
+	public function enable_free_shipping() {
+		wc_deprecated_function( 'WC_Coupon::enable_free_shipping', '3.0', 'WC_Coupon::get_free_shipping' );
+		return $this->get_free_shipping();
+	}
+
+	/**
+	 * Check if a coupon excludes sale items.
+	 *
+	 * @return bool
+	 */
+	public function exclude_sale_items() {
+		wc_deprecated_function( 'WC_Coupon::exclude_sale_items', '3.0', 'WC_Coupon::get_exclude_sale_items' );
+		return $this->get_exclude_sale_items();
+	}
+
+	/**
+	 * Increase usage count for current coupon.
+	 *
+	 * @param string $used_by Either user ID or billing email
+	 */
+	public function inc_usage_count( $used_by = '' ) {
+		$this->increase_usage_count( $used_by );
+	}
+
+	/**
+	 * Decrease usage count for current coupon.
+	 *
+	 * @param string $used_by Either user ID or billing email
+	 */
+	public function dcr_usage_count( $used_by = '' ) {
+		$this->decrease_usage_count( $used_by );
+	}
+}
diff --git a/includes/legacy/class-wc-legacy-customer.php b/includes/legacy/class-wc-legacy-customer.php
new file mode 100644
index 00000000000..a6209855f96
--- /dev/null
+++ b/includes/legacy/class-wc-legacy-customer.php
@@ -0,0 +1,270 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Legacy Customer.
+ *
+ * @version  3.0.0
+ * @package  WooCommerce/Classes
+ * @category Class
+ * @author   WooThemes
+ */
+abstract class WC_Legacy_Customer extends WC_Data {
+
+	/**
+	 * __isset legacy.
+	 * @param mixed $key
+	 * @return bool
+	 */
+	public function __isset( $key ) {
+		$legacy_keys = array(
+			'id',
+			'country',
+			'state',
+			'postcode',
+			'city',
+			'address_1',
+			'address',
+			'address_2',
+			'shipping_country',
+			'shipping_state',
+			'shipping_postcode',
+			'shipping_city',
+			'shipping_address_1',
+			'shipping_address',
+			'shipping_address_2',
+			'is_vat_exempt',
+			'calculated_shipping',
+		);
+		$key = $this->filter_legacy_key( $key );
+		return in_array( $key, $legacy_keys );
+	}
+
+	/**
+	 * __get function.
+	 * @param string $key
+	 * @return string
+	 */
+	public function __get( $key ) {
+		wc_doing_it_wrong( $key, 'Customer properties should not be accessed directly.', '3.0' );
+		$key = $this->filter_legacy_key( $key );
+		if ( in_array( $key, array( 'country', 'state', 'postcode', 'city', 'address_1', 'address', 'address_2' ) ) ) {
+			$key = 'billing_' . $key;
+		}
+		return is_callable( array( $this, "get_{$key}" ) ) ? $this->{"get_{$key}"}() : '';
+	}
+
+	/**
+	 * __set function.
+	 * @param mixed $property
+	 * @param mixed $key
+	 */
+	public function __set( $key, $value ) {
+		wc_doing_it_wrong( $key, 'Customer properties should not be set directly.', '3.0' );
+		$key = $this->filter_legacy_key( $key );
+
+		if ( is_callable( array( $this, "set_{$key}" ) ) ) {
+			$this->{"set_{$key}"}( $value );
+		}
+	}
+
+	/**
+	 * Address and shipping_address are aliased, so we want to get the 'real' key name.
+	 * For all other keys, we can just return it.
+	 * @since 3.0.0
+	 * @param  string $key
+	 * @return string
+	 */
+	private function filter_legacy_key( $key ) {
+		if ( 'address' === $key ) {
+			$key = 'address_1';
+		}
+		if ( 'shipping_address' === $key ) {
+			$key = 'shipping_address_1';
+		}
+
+		return $key;
+	}
+
+	/**
+	 * Sets session data for the location.
+	 *
+	 * @param string $country
+	 * @param string $state
+	 * @param string $postcode (default: '')
+	 * @param string $city (default: '')
+	 */
+	public function set_location( $country, $state, $postcode = '', $city = '' ) {
+		$this->set_billing_location( $country, $state, $postcode, $city );
+		$this->set_shipping_location( $country, $state, $postcode, $city );
+	}
+
+	/**
+	 * Get default country for a customer.
+	 * @return string
+	 */
+	public function get_default_country() {
+		wc_deprecated_function( 'WC_Customer::get_default_country', '3.0', 'wc_get_customer_default_location' );
+		$default = wc_get_customer_default_location();
+		return $default['country'];
+	}
+
+	/**
+	 * Get default state for a customer.
+	 * @return string
+	 */
+	public function get_default_state() {
+		wc_deprecated_function( 'WC_Customer::get_default_state', '3.0', 'wc_get_customer_default_location' );
+		$default = wc_get_customer_default_location();
+		return $default['state'];
+	}
+
+	/**
+	 * Set customer address to match shop base address.
+	 */
+	public function set_to_base() {
+		wc_deprecated_function( 'WC_Customer::set_to_base', '3.0', 'WC_Customer::set_billing_address_to_base' );
+		$this->set_billing_address_to_base();
+	}
+
+	/**
+	 * Set customer shipping address to base address.
+	 */
+	public function set_shipping_to_base() {
+		wc_deprecated_function( 'WC_Customer::set_shipping_to_base', '3.0', 'WC_Customer::set_shipping_address_to_base' );
+		$this->set_shipping_address_to_base();
+	}
+
+	/**
+	 * Calculated shipping.
+	 * @param boolean $calculated
+	 */
+	public function calculated_shipping( $calculated = true ) {
+		wc_deprecated_function( 'WC_Customer::calculated_shipping', '3.0', 'WC_Customer::set_calculated_shipping' );
+		$this->set_calculated_shipping( $calculated );
+	}
+
+	/**
+	 * Set default data for a customer.
+	 */
+	public function set_default_data() {
+		wc_deprecated_function( 'WC_Customer::set_default_data', '3.0' );
+	}
+
+	/**
+	 * Save data function.
+	 */
+	public function save_data() {
+		$this->save();
+	}
+
+	/**
+	 * Is the user a paying customer?
+	 * @return bool
+	 */
+	function is_paying_customer( $user_id = '' ) {
+		wc_deprecated_function( 'WC_Customer::is_paying_customer', '3.0', 'WC_Customer::get_is_paying_customer' );
+		if ( ! empty( $user_id ) ) {
+			$user_id = get_current_user_id();
+		}
+		return '1' === get_user_meta( $user_id, 'paying_customer', true );
+	}
+
+	/**
+	 * Legacy get address.
+	 */
+	function get_address() {
+		wc_deprecated_function( 'WC_Customer::get_address', '3.0', 'WC_Customer::get_billing_address_1' );
+		return $this->get_billing_address_1();
+	}
+
+	/**
+	 * Legacy get address 2.
+	 */
+	function get_address_2() {
+		wc_deprecated_function( 'WC_Customer::get_address_2', '3.0', 'WC_Customer::get_billing_address_2' );
+		return $this->get_billing_address_2();
+	}
+
+	/**
+	 * Legacy get country.
+	 */
+	function get_country() {
+		wc_deprecated_function( 'WC_Customer::get_country', '3.0', 'WC_Customer::get_billing_country' );
+		return $this->get_billing_country();
+	}
+
+	/**
+	 * Legacy get state.
+	 */
+	function get_state() {
+		wc_deprecated_function( 'WC_Customer::get_state', '3.0', 'WC_Customer::get_billing_state' );
+		return $this->get_billing_state();
+	}
+
+	/**
+	 * Legacy get postcode.
+	 */
+	function get_postcode() {
+		wc_deprecated_function( 'WC_Customer::get_postcode', '3.0', 'WC_Customer::get_billing_postcode' );
+		return $this->get_billing_postcode();
+	}
+
+	/**
+	 * Legacy get city.
+	 */
+	function get_city() {
+		wc_deprecated_function( 'WC_Customer::get_city', '3.0', 'WC_Customer::get_billing_city' );
+		return $this->get_billing_city();
+	}
+
+	/**
+	 * Legacy set country.
+	 */
+	function set_country( $country ) {
+		wc_deprecated_function( 'WC_Customer::set_country', '3.0', 'WC_Customer::set_billing_country' );
+		$this->set_billing_country( $country );
+	}
+
+	/**
+	 * Legacy set state.
+	 */
+	function set_state( $state ) {
+		wc_deprecated_function( 'WC_Customer::set_state', '3.0', 'WC_Customer::set_billing_state' );
+		$this->set_billing_state( $state );
+	}
+
+	/**
+	 * Legacy set postcode.
+	 */
+	function set_postcode( $postcode ) {
+		wc_deprecated_function( 'WC_Customer::set_postcode', '3.0', 'WC_Customer::set_billing_postcode' );
+		$this->set_billing_postcode( $postcode );
+	}
+
+	/**
+	 * Legacy set city.
+	 */
+	function set_city( $city ) {
+		wc_deprecated_function( 'WC_Customer::set_city', '3.0', 'WC_Customer::set_billing_city' );
+		$this->set_billing_city( $city );
+	}
+
+	/**
+	 * Legacy set address.
+	 */
+	function set_address( $address ) {
+		wc_deprecated_function( 'WC_Customer::set_address', '3.0', 'WC_Customer::set_billing_address' );
+		$this->set_billing_address( $address );
+	}
+
+	/**
+	 * Legacy set address.
+	 */
+	function set_address_2( $address ) {
+		wc_deprecated_function( 'WC_Customer::set_address_2', '3.0', 'WC_Customer::set_billing_address_2' );
+		$this->set_billing_address_2( $address );
+	}
+}
diff --git a/includes/legacy/class-wc-legacy-shipping-zone.php b/includes/legacy/class-wc-legacy-shipping-zone.php
new file mode 100644
index 00000000000..da94015b3db
--- /dev/null
+++ b/includes/legacy/class-wc-legacy-shipping-zone.php
@@ -0,0 +1,66 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Legacy Shipping Zone.
+ *
+ * @version  3.0.0
+ * @package  WooCommerce/Classes
+ * @category Class
+ * @author   WooThemes
+ */
+abstract class WC_Legacy_Shipping_Zone extends WC_Data {
+
+	/**
+	 * Get zone ID
+	 * @return int|null Null if the zone does not exist. 0 is the default zone.
+	 * @deprecated 3.0
+	 */
+	public function get_zone_id() {
+		wc_deprecated_function( 'WC_Shipping_Zone::get_zone_id', '3.0', 'WC_Shipping_Zone::get_id' );
+		return $this->get_id();
+	}
+
+	/**
+	 * Read a shipping zone by ID.
+	 * @deprecated 3.0.0 - Init a shipping zone with an ID.
+	 */
+	public function read( $zone_id ) {
+		wc_deprecated_function( 'WC_Shipping_Zone::read', '3.0', 'a shipping zone initialized with an ID.' );
+		$this->set_id( $zone_id );
+		$data_store = WC_Data_Store::load( 'shipping-zone' );
+		$data_store->read( $this );
+	}
+
+	/**
+	 * Update a zone.
+	 * @deprecated 3.0.0 - Use ::save instead.
+	 */
+	public function update() {
+		wc_deprecated_function( 'WC_Shipping_Zone::update', '3.0', 'WC_Shipping_Zone::save instead.' );
+		$data_store = WC_Data_Store::load( 'shipping-zone' );
+		try {
+			$data_store->update( $this );
+		} catch ( Exception $e ) {
+			return false;
+		}
+	}
+
+	/**
+	 * Create a zone.
+	 * @deprecated 3.0.0 - Use ::save instead.
+	 */
+	public function create() {
+		wc_deprecated_function( 'WC_Shipping_Zone::create', '3.0', 'WC_Shipping_Zone::save instead.' );
+		$data_store = WC_Data_Store::load( 'shipping-zone' );
+		try {
+			$data_store->create( $this );
+		} catch ( Exception $e ) {
+			return false;
+		}
+	}
+
+
+}
diff --git a/includes/libraries/class-emogrifier.php b/includes/libraries/class-emogrifier.php
index e25407dfcef..d995bf3d9c6 100644
--- a/includes/libraries/class-emogrifier.php
+++ b/includes/libraries/class-emogrifier.php
@@ -1,50 +1,56 @@
 <?php
 /**
- * This class provides functions for converting CSS styles into inline style attributes in your HTML code
+ * This class provides functions for converting CSS styles into inline style attributes in your HTML code.
  *
  * For more information, please see the README.md file.
  *
+ * @version 1.2.0
+ *
  * @author Cameron Brooks
  * @author Jaime Prado
+ * @author Oliver Klee <typo3-coding@oliverklee.de>
  * @author Roman Ožana <ozana@omdesign.cz>
+ * @author Sander Kruger <s.kruger@invessel.com>
  */
-class Emogrifier {
+// @codingStandardsIgnoreFile
+class Emogrifier
+{
 	/**
-	 * @var string
-	 */
-	const ENCODING = 'UTF-8';
-
-	/**
-	 * @var integer
+	 * @var int
 	 */
 	const CACHE_KEY_CSS = 0;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	const CACHE_KEY_SELECTOR = 1;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	const CACHE_KEY_XPATH = 2;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
-	const CACHE_KEY_CSS_DECLARATION_BLOCK = 3;
+	const CACHE_KEY_CSS_DECLARATIONS_BLOCK = 3;
 
 	/**
-	 * for calculating nth-of-type and nth-child selectors.
+	 * @var int
+	 */
+	const CACHE_KEY_COMBINED_STYLES = 4;
+
+	/**
+	 * for calculating nth-of-type and nth-child selectors
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	const INDEX = 0;
 
 	/**
-	 * for calculating nth-of-type and nth-child selectors.
+	 * for calculating nth-of-type and nth-child selectors
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	const MULTIPLIER = 1;
 
@@ -58,6 +64,16 @@ class Emogrifier {
 	 */
 	const CLASS_ATTRIBUTE_MATCHER = '/(\\w+|[\\*\\]])?((\\.[\\w\\-]+)+)/';
 
+	/**
+	 * @var string
+	 */
+	const CONTENT_TYPE_META_TAG = '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">';
+
+	/**
+	 * @var string
+	 */
+	const DEFAULT_DOCUMENT_TYPE = '<!DOCTYPE html>';
+
 	/**
 	 * @var string
 	 */
@@ -69,49 +85,144 @@ class Emogrifier {
 	private $css = '';
 
 	/**
-	 * @var array<string>
+	 * @var bool[]
 	 */
-	private $unprocessableHtmlTags = array('wbr');
+	private $excludedSelectors = array();
 
 	/**
-	 * @var array<array>
+	 * @var string[]
+	 */
+	private $unprocessableHtmlTags = array( 'wbr' );
+
+	/**
+	 * @var bool[]
+	 */
+	private $allowedMediaTypes = array( 'all' => true, 'screen' => true, 'print' => true );
+
+	/**
+	 * @var mixed[]
 	 */
 	private $caches = array(
 		self::CACHE_KEY_CSS => array(),
 		self::CACHE_KEY_SELECTOR => array(),
 		self::CACHE_KEY_XPATH => array(),
-		self::CACHE_KEY_CSS_DECLARATION_BLOCK => array(),
+		self::CACHE_KEY_CSS_DECLARATIONS_BLOCK => array(),
+		self::CACHE_KEY_COMBINED_STYLES => array(),
 	);
 
 	/**
-	 * the visited nodes with the XPath paths as array keys.
+	 * the visited nodes with the XPath paths as array keys
 	 *
-	 * @var array<\DOMNode>
+	 * @var \DOMElement[]
 	 */
 	private $visitedNodes = array();
 
 	/**
-	 * the styles to apply to the nodes with the XPath paths as array keys for the outer array and the attribute names/values.
-	 * as key/value pairs for the inner array.
+	 * the styles to apply to the nodes with the XPath paths as array keys for the outer array
+	 * and the attribute names/values as key/value pairs for the inner array
 	 *
-	 * @var array<array><string>
+	 * @var string[][]
 	 */
 	private $styleAttributesForNodes = array();
 
 	/**
-	 * This attribute applies to the case where you want to preserve your original text encoding.
+	 * Determines whether the "style" attributes of tags in the the HTML passed to this class should be preserved.
+	 * If set to false, the value of the style attributes will be discarded.
 	 *
-	 * By default, emogrifier translates your text into HTML entities for two reasons:
-	 *
-	 * 1. Because of client incompatibilities, it is better practice to send out HTML entities rather than unicode over email.
-	 *
-	 * 2. It translates any illegal XML characters that DOMDocument cannot work with.
-	 *
-	 * If you would like to preserve your original encoding, set this attribute to TRUE.
-	 *
-	 * @var boolean
+	 * @var bool
 	 */
-	public $preserveEncoding = false;
+	private $isInlineStyleAttributesParsingEnabled = true;
+
+	/**
+	 * Determines whether the <style> blocks in the HTML passed to this class should be parsed.
+	 *
+	 * If set to true, the <style> blocks will be removed from the HTML and their contents will be applied to the HTML
+	 * via inline styles.
+	 *
+	 * If set to false, the <style> blocks will be left as they are in the HTML.
+	 *
+	 * @var bool
+	 */
+	private $isStyleBlocksParsingEnabled = true;
+
+	/**
+	 * Determines whether elements with the `display: none` property are
+	 * removed from the DOM.
+	 *
+	 * @var bool
+	 */
+	private $shouldKeepInvisibleNodes = true;
+
+	/**
+	 * @var string[]
+	 */
+	private $xPathRules = array(
+		// child
+		'/\\s*>\\s*/'                              => '/',
+		// adjacent sibling
+		'/\\s+\\+\\s+/'                            => '/following-sibling::*[1]/self::',
+		// descendant
+		'/\\s+(?=.*[^\\]]{1}$)/'                   => '//',
+		// :first-child
+		'/([^\\/]+):first-child/i'                 => '*[1]/self::\\1',
+		// :last-child
+		'/([^\\/]+):last-child/i'                  => '*[last()]/self::\\1',
+		// attribute only
+		'/^\\[(\\w+|\\w+\\=[\'"]?\\w+[\'"]?)\\]/'  => '*[@\\1]',
+		// attribute
+		'/(\\w)\\[(\\w+)\\]/'                      => '\\1[@\\2]',
+		// exact attribute
+		'/(\\w)\\[(\\w+)\\=[\'"]?([\\w\\s]+)[\'"]?\\]/' => '\\1[@\\2="\\3"]',
+		// element attribute~=
+		'/([\\w\\*]+)\\[(\\w+)[\\s]*\\~\\=[\\s]*[\'"]?([\\w-_\\/]+)[\'"]?\\]/'
+			=> '\\1[contains(concat(" ", @\\2, " "), concat(" ", "\\3", " "))]',
+		// element attribute^=
+		'/([\\w\\*]+)\\[(\\w+)[\\s]*\\^\\=[\\s]*[\'"]?([\\w-_\\/]+)[\'"]?\\]/' => '\\1[starts-with(@\\2, "\\3")]',
+		// element attribute*=
+		'/([\\w\\*]+)\\[(\\w+)[\\s]*\\*\\=[\\s]*[\'"]?([\\w-_\\s\\/:;]+)[\'"]?\\]/' => '\\1[contains(@\\2, "\\3")]',
+		// element attribute$=
+		'/([\\w\\*]+)\\[(\\w+)[\\s]*\\$\\=[\\s]*[\'"]?([\\w-_\\s\\/]+)[\'"]?\\]/'
+			=> '\\1[substring(@\\2, string-length(@\\2) - string-length("\\3") + 1) = "\\3"]',
+		// element attribute|=
+		'/([\\w\\*]+)\\[(\\w+)[\\s]*\\|\\=[\\s]*[\'"]?([\\w-_\\s\\/]+)[\'"]?\\]/'
+			=> '\\1[@\\2="\\3" or starts-with(@\\2, concat("\\3", "-"))]',
+	);
+
+	/**
+	 * Determines whether CSS styles that have an equivalent HTML attribute
+	 * should be mapped and attached to those elements.
+	 *
+	 * @var bool
+	 */
+	private $shouldMapCssToHtml = false;
+
+	/**
+	 * This multi-level array contains simple mappings of CSS properties to
+	 * HTML attributes. If a mapping only applies to certain HTML nodes or
+	 * only for certain values, the mapping is an object with a whitelist
+	 * of nodes and values.
+	 *
+	 * @var mixed[][]
+	 */
+	private $cssToHtmlMap = array(
+		'background-color' => array(
+			'attribute' => 'bgcolor',
+		),
+		'text-align' => array(
+			'attribute' => 'align',
+			'nodes' => array('p', 'div', 'td'),
+			'values' => array('left', 'right', 'center', 'justify'),
+		),
+		'float' => array(
+			'attribute' => 'align',
+			'nodes' => array('table', 'img'),
+			'values' => array('left', 'right'),
+		),
+		'border-spacing' => array(
+			'attribute' => 'cellspacing',
+			'nodes' => array('table'),
+		),
+	);
 
 	public static $_media = '';
 
@@ -121,7 +232,8 @@ class Emogrifier {
 	 * @param string $html the HTML to emogrify, must be UTF-8-encoded
 	 * @param string $css the CSS to merge, must be UTF-8-encoded
 	 */
-	public function __construct($html = '', $css = '') {
+	public function __construct($html = '', $css = '')
+	{
 		$this->setHtml($html);
 		$this->setCss($css);
 	}
@@ -129,7 +241,8 @@ class Emogrifier {
 	/**
 	 * The destructor.
 	 */
-	public function __destruct() {
+	public function __destruct()
+	{
 		$this->purgeVisitedNodes();
 	}
 
@@ -137,8 +250,11 @@ class Emogrifier {
 	 * Sets the HTML to emogrify.
 	 *
 	 * @param string $html the HTML to emogrify, must be UTF-8-encoded
+	 *
+	 * @return void
 	 */
-	public function setHtml($html = '') {
+	public function setHtml($html)
+	{
 		$this->html = $html;
 	}
 
@@ -146,30 +262,428 @@ class Emogrifier {
 	 * Sets the CSS to merge with the HTML.
 	 *
 	 * @param string $css the CSS to merge, must be UTF-8-encoded
+	 *
+	 * @return void
 	 */
-	public function setCss($css = '') {
+	public function setCss($css)
+	{
 		$this->css = $css;
 	}
 
 	/**
-	 * Clears all caches.
+	 * Applies $this->css to $this->html and returns the HTML with the CSS
+	 * applied.
+	 *
+	 * This method places the CSS inline.
+	 *
+	 * @return string
+	 *
+	 * @throws \BadMethodCallException
 	 */
-	private function clearAllCaches() {
+	public function emogrify()
+	{
+		if ($this->html === '') {
+			throw new BadMethodCallException('Please set some HTML first before calling emogrify.', 1390393096);
+		}
+
+		self::$_media = ''; // reset.
+
+		$xmlDocument = $this->createXmlDocument();
+		$this->process($xmlDocument);
+
+		return $xmlDocument->saveHTML();
+	}
+
+	/**
+	 * Applies $this->css to $this->html and returns only the HTML content
+	 * within the <body> tag.
+	 *
+	 * This method places the CSS inline.
+	 *
+	 * @return string
+	 *
+	 * @throws \BadMethodCallException
+	 */
+	public function emogrifyBodyContent()
+	{
+		if ($this->html === '') {
+			throw new BadMethodCallException('Please set some HTML first before calling emogrify.', 1390393096);
+		}
+
+		$xmlDocument = $this->createXmlDocument();
+		$this->process($xmlDocument);
+
+		$innerDocument = new DOMDocument();
+		foreach ($xmlDocument->documentElement->getElementsByTagName('body')->item(0)->childNodes as $childNode) {
+			$innerDocument->appendChild($innerDocument->importNode($childNode, true));
+		}
+
+		return html_entity_decode($innerDocument->saveHTML());
+	}
+
+	/**
+	 * Applies $this->css to $xmlDocument.
+	 *
+	 * This method places the CSS inline.
+	 *
+	 * @param \DOMDocument $xmlDocument
+	 *
+	 * @return void
+	 *
+	 * @throws \InvalidArgumentException
+	 */
+	protected function process(DOMDocument $xmlDocument)
+	{
+		$xPath = new DOMXPath($xmlDocument);
+		$this->clearAllCaches();
+
+		// Before be begin processing the CSS file, parse the document and normalize all existing CSS attributes.
+		// This changes 'DISPLAY: none' to 'display: none'.
+		// We wouldn't have to do this if DOMXPath supported XPath 2.0.
+		// Also store a reference of nodes with existing inline styles so we don't overwrite them.
+		$this->purgeVisitedNodes();
+
+		set_error_handler(array($this, 'handleXpathError'), E_WARNING);
+
+		$nodesWithStyleAttributes = $xPath->query('//*[@style]');
+		if ($nodesWithStyleAttributes !== false) {
+			/** @var \DOMElement $node */
+			foreach ($nodesWithStyleAttributes as $node) {
+				if ($this->isInlineStyleAttributesParsingEnabled) {
+					$this->normalizeStyleAttributes($node);
+				} else {
+					$node->removeAttribute('style');
+				}
+			}
+		}
+
+		// grab any existing style blocks from the html and append them to the existing CSS
+		// (these blocks should be appended so as to have precedence over conflicting styles in the existing CSS)
+		$allCss = $this->css;
+
+		if ($this->isStyleBlocksParsingEnabled) {
+			$allCss .= $this->getCssFromAllStyleNodes($xPath);
+		}
+
+		$cssParts = $this->splitCssAndMediaQuery($allCss);
+		$excludedNodes = $this->getNodesToExclude($xPath);
+		$cssRules = $this->parseCssRules($cssParts['css']);
+		foreach ($cssRules as $cssRule) {
+			// query the body for the xpath selector
+			$nodesMatchingCssSelectors = $xPath->query($this->translateCssToXpath($cssRule['selector']));
+			// ignore invalid selectors
+			if ($nodesMatchingCssSelectors === false) {
+				continue;
+			}
+
+			/** @var \DOMElement $node */
+			foreach ($nodesMatchingCssSelectors as $node) {
+				if (in_array($node, $excludedNodes, true)) {
+					continue;
+				}
+
+				// if it has a style attribute, get it, process it, and append (overwrite) new stuff
+				if ($node->hasAttribute('style')) {
+					// break it up into an associative array
+					$oldStyleDeclarations = $this->parseCssDeclarationsBlock($node->getAttribute('style'));
+				} else {
+					$oldStyleDeclarations = array();
+				}
+				$newStyleDeclarations = $this->parseCssDeclarationsBlock($cssRule['declarationsBlock']);
+				if ($this->shouldMapCssToHtml) {
+					$this->mapCssToHtmlAttributes($newStyleDeclarations, $node);
+				}
+				$node->setAttribute(
+					'style',
+					$this->generateStyleStringFromDeclarationsArrays($oldStyleDeclarations, $newStyleDeclarations)
+				);
+			}
+		}
+
+		restore_error_handler();
+
+		if ($this->isInlineStyleAttributesParsingEnabled) {
+			$this->fillStyleAttributesWithMergedStyles();
+		}
+
+		if ($this->shouldKeepInvisibleNodes) {
+			$this->removeInvisibleNodes($xPath);
+		}
+
+		$this->copyCssWithMediaToStyleNode($xmlDocument, $xPath, $cssParts['media']);
+	}
+
+	/**
+	 * Applies $styles to $node.
+	 *
+	 * This method maps CSS styles to HTML attributes and adds those to the
+	 * node.
+	 *
+	 * @param string[] $styles the new CSS styles taken from the global styles to be applied to this node
+	 * @param \DOMNode $node   node to apply styles to
+	 *
+	 * @return void
+	 */
+	private function mapCssToHtmlAttributes(array $styles, DOMNode $node)
+	{
+		foreach ($styles as $property => $value) {
+			// Strip !important indicator
+			$value = trim(str_replace('!important', '', $value));
+			$this->mapCssToHtmlAttribute($property, $value, $node);
+		}
+	}
+
+	/**
+	 * Tries to apply the CSS style to $node as an attribute.
+	 *
+	 * This method maps a CSS rule to HTML attributes and adds those to the node.
+	 *
+	 * @param string $property the name of the CSS property to map
+	 * @param string $value    the value of the style rule to map
+	 * @param \DOMNode $node   node to apply styles to
+	 *
+	 * @return void
+	 */
+	private function mapCssToHtmlAttribute($property, $value, DOMNode $node)
+	{
+		if (!$this->mapSimpleCssProperty($property, $value, $node)) {
+			$this->mapComplexCssProperty($property, $value, $node);
+		}
+	}
+
+	/**
+	 * Looks up the CSS property in the mapping table and maps it if it matches the conditions.
+	 *
+	 * @param string $property the name of the CSS property to map
+	 * @param string $value    the value of the style rule to map
+	 * @param \DOMNode $node   node to apply styles to
+	 *
+	 * @return bool true if the property cab be mapped using the simple mapping table
+	 */
+	private function mapSimpleCssProperty($property, $value, DOMNode $node)
+	{
+		if (!isset($this->cssToHtmlMap[$property])) {
+			return false;
+		}
+
+		$mapping = $this->cssToHtmlMap[$property];
+		$nodesMatch = !isset($mapping['nodes']) || in_array($node->nodeName, $mapping['nodes'], true);
+		$valuesMatch = !isset($mapping['values']) || in_array($value, $mapping['values'], true);
+		if (!$nodesMatch || !$valuesMatch) {
+			return false;
+		}
+
+		$node->setAttribute($mapping['attribute'], $value);
+
+		return true;
+	}
+
+	/**
+	 * Maps CSS properties that need special transformation to an HTML attribute.
+	 *
+	 * @param string $property the name of the CSS property to map
+	 * @param string $value    the value of the style rule to map
+	 * @param \DOMNode $node   node to apply styles to
+	 *
+	 * @return void
+	 */
+	private function mapComplexCssProperty($property, $value, DOMNode $node)
+	{
+		$nodeName = $node->nodeName;
+		$isTable = $nodeName === 'table';
+		$isImage = $nodeName === 'img';
+		$isTableOrImage = $isTable || $isImage;
+
+		switch ($property) {
+			case 'background':
+				// Parse out the color, if any
+				$styles = explode(' ', $value);
+				$first = $styles[0];
+				if (!is_numeric(substr($first, 0, 1)) && substr($first, 0, 3) !== 'url') {
+					// This is not a position or image, assume it's a color
+					$node->setAttribute('bgcolor', $first);
+				}
+				break;
+			case 'width':
+				// intentional fall-through
+			case 'height':
+				// Only parse values in px and %, but not values like "auto".
+				if (preg_match('/^\d+(px|%)$/', $value)) {
+					// Remove 'px'. This regex only conserves numbers and %
+					$number = preg_replace('/[^0-9.%]/', '', $value);
+					$node->setAttribute($property, $number);
+				}
+				break;
+			case 'margin':
+				if ($isTableOrImage) {
+					$margins = $this->parseCssShorthandValue($value);
+					if ($margins['left'] === 'auto' && $margins['right'] === 'auto') {
+						$node->setAttribute('align', 'center');
+					}
+				}
+				break;
+			case 'border':
+				if ($isTableOrImage) {
+					if ($value === 'none' || $value === '0') {
+						$node->setAttribute('border', '0');
+					}
+				}
+				break;
+			default:
+		}
+	}
+
+	/**
+	 * Parses a shorthand CSS value and splits it into individual values
+	 *
+	 * @param string $value a string of CSS value with 1, 2, 3 or 4 sizes
+	 *                      For example: padding: 0 auto;
+	 *                      '0 auto' is split into top: 0, left: auto, bottom: 0,
+	 *                      right: auto.
+	 *
+	 * @return string[] an array of values for top, right, bottom and left (using these as associative array keys)
+	 */
+	private function parseCssShorthandValue($value)
+	{
+		$values = preg_split('/\\s+/', $value);
+
+		$css = array();
+		$css['top'] = $values[0];
+		$css['right'] = (count($values) > 1) ? $values[1] : $css['top'];
+		$css['bottom'] = (count($values) > 2) ? $values[2] : $css['top'];
+		$css['left'] = (count($values) > 3) ? $values[3] : $css['right'];
+
+		return $css;
+	}
+
+	/**
+	 * Extracts and parses the individual rules from a CSS string.
+	 *
+	 * @param string $css a string of raw CSS code
+	 *
+	 * @return string[][] an array of string sub-arrays with the keys
+	 *         "selector" (the CSS selector(s), e.g., "*" or "h1"),
+	 *         "declarationsBLock" (the semicolon-separated CSS declarations for that selector(s),
+	 *         e.g., "color: red; height: 4px;"),
+	 *         and "line" (the line number e.g. 42)
+	 */
+	private function parseCssRules($css)
+	{
+		$cssKey = md5($css);
+		if (!isset($this->caches[self::CACHE_KEY_CSS][$cssKey])) {
+			// process the CSS file for selectors and definitions
+			preg_match_all('/(?:^|[\\s^{}]*)([^{]+){([^}]*)}/mis', $css, $matches, PREG_SET_ORDER);
+
+			$cssRules = array();
+			/** @var string[] $cssRule */
+			foreach ($matches as $key => $cssRule) {
+				$cssDeclaration = trim($cssRule[2]);
+				if ($cssDeclaration === '') {
+					continue;
+				}
+
+				$selectors = explode(',', $cssRule[1]);
+				foreach ($selectors as $selector) {
+					// don't process pseudo-elements and behavioral (dynamic) pseudo-classes;
+					// only allow structural pseudo-classes
+					$hasPseudoElement = strpos($selector, '::') !== false;
+					$hasAnyPseudoClass = (bool) preg_match('/:[a-zA-Z]/', $selector);
+					$hasSupportedPseudoClass = (bool) preg_match('/:\\S+\\-(child|type\\()/i', $selector);
+					if ($hasPseudoElement || ($hasAnyPseudoClass && !$hasSupportedPseudoClass)) {
+						continue;
+					}
+
+					$cssRules[] = array(
+						'selector' => trim($selector),
+						'declarationsBlock' => $cssDeclaration,
+						// keep track of where it appears in the file, since order is important
+						'line' => $key,
+					);
+				}
+			}
+
+			usort($cssRules, array($this, 'sortBySelectorPrecedence'));
+
+			$this->caches[self::CACHE_KEY_CSS][$cssKey] = $cssRules;
+		}
+
+		return $this->caches[self::CACHE_KEY_CSS][$cssKey];
+	}
+
+	/**
+	 * Disables the parsing of inline styles.
+	 *
+	 * @return void
+	 */
+	public function disableInlineStyleAttributesParsing()
+	{
+		$this->isInlineStyleAttributesParsingEnabled = false;
+	}
+
+	/**
+	 * Disables the parsing of <style> blocks.
+	 *
+	 * @return void
+	 */
+	public function disableStyleBlocksParsing()
+	{
+		$this->isStyleBlocksParsingEnabled = false;
+	}
+
+	/**
+	 * Disables the removal of elements with `display: none` properties.
+	 *
+	 * @return void
+	 */
+	public function disableInvisibleNodeRemoval()
+	{
+		$this->shouldKeepInvisibleNodes = false;
+	}
+
+	/**
+	 * Enables the attachment/override of HTML attributes for which a
+	 * corresponding CSS property has been set.
+	 *
+	 * @return void
+	 */
+	public function enableCssToHtmlMapping()
+	{
+		$this->shouldMapCssToHtml = true;
+	}
+
+	/**
+	 * Clears all caches.
+	 *
+	 * @return void
+	 */
+	private function clearAllCaches()
+	{
 		$this->clearCache(self::CACHE_KEY_CSS);
 		$this->clearCache(self::CACHE_KEY_SELECTOR);
 		$this->clearCache(self::CACHE_KEY_XPATH);
-		$this->clearCache(self::CACHE_KEY_CSS_DECLARATION_BLOCK);
+		$this->clearCache(self::CACHE_KEY_CSS_DECLARATIONS_BLOCK);
+		$this->clearCache(self::CACHE_KEY_COMBINED_STYLES);
 	}
 
 	/**
 	 * Clears a single cache by key.
 	 *
-	 * @param integer $key the cache key, must be CACHE_KEY_CSS, CACHE_KEY_SELECTOR, CACHE_KEY_XPATH or CACHE_KEY_CSS_DECLARATION_BLOCK
+	 * @param int $key the cache key, must be CACHE_KEY_CSS, CACHE_KEY_SELECTOR, CACHE_KEY_XPATH
+	 *                 or CACHE_KEY_CSS_DECLARATION_BLOCK
 	 *
-	 * @throws InvalidArgumentException
+	 * @return void
+	 *
+	 * @throws \InvalidArgumentException
 	 */
-	private function clearCache($key) {
-		$allowedCacheKeys = array(self::CACHE_KEY_CSS, self::CACHE_KEY_SELECTOR, self::CACHE_KEY_XPATH, self::CACHE_KEY_CSS_DECLARATION_BLOCK);
+	private function clearCache($key)
+	{
+		$allowedCacheKeys = array(
+			self::CACHE_KEY_CSS,
+			self::CACHE_KEY_SELECTOR,
+			self::CACHE_KEY_XPATH,
+			self::CACHE_KEY_CSS_DECLARATIONS_BLOCK,
+			self::CACHE_KEY_COMBINED_STYLES,
+		);
 		if (!in_array($key, $allowedCacheKeys, true)) {
 			throw new InvalidArgumentException('Invalid cache key: ' . $key, 1391822035);
 		}
@@ -179,8 +693,11 @@ class Emogrifier {
 
 	/**
 	 * Purges the visited nodes.
+	 *
+	 * @return void
 	 */
-	private function purgeVisitedNodes() {
+	private function purgeVisitedNodes()
+	{
 		$this->visitedNodes = array();
 		$this->styleAttributesForNodes = array();
 	}
@@ -194,8 +711,11 @@ class Emogrifier {
 	 * Note: The tags will not be removed if they have any content.
 	 *
 	 * @param string $tagName the tag name, e.g., "p"
+	 *
+	 * @return void
 	 */
-	public function addUnprocessableHtmlTag($tagName) {
+	public function addUnprocessableHtmlTag($tagName)
+	{
 		$this->unprocessableHtmlTags[] = $tagName;
 	}
 
@@ -203,8 +723,11 @@ class Emogrifier {
 	 * Drops a tag from the removal list.
 	 *
 	 * @param string $tagName the tag name, e.g., "p"
+	 *
+	 * @return void
 	 */
-	public function removeUnprocessableHtmlTag($tagName) {
+	public function removeUnprocessableHtmlTag($tagName)
+	{
 		$key = array_search($tagName, $this->unprocessableHtmlTags, true);
 		if ($key !== false) {
 			unset($this->unprocessableHtmlTags[$key]);
@@ -212,193 +735,279 @@ class Emogrifier {
 	}
 
 	/**
-	 * Applies the CSS you submit to the HTML you submit.
+	 * Marks a media query type to keep.
 	 *
-	 * This method places the CSS inline.
+	 * @param string $mediaName the media type name, e.g., "braille"
 	 *
-	 * @return string
-	 *
-	 * @throws BadMethodCallException
+	 * @return void
 	 */
-	public function emogrify() {
-		if ($this->html === '') {
-			throw new BadMethodCallException('Please set some HTML first before calling emogrify.', 1390393096);
+	public function addAllowedMediaType($mediaName)
+	{
+		$this->allowedMediaTypes[$mediaName] = true;
+	}
+
+	/**
+	 * Drops a media query type from the allowed list.
+	 *
+	 * @param string $mediaName the tag name, e.g., "braille"
+	 *
+	 * @return void
+	 */
+	public function removeAllowedMediaType($mediaName)
+	{
+		if (isset($this->allowedMediaTypes[$mediaName])) {
+			unset($this->allowedMediaTypes[$mediaName]);
+		}
+	}
+
+	/**
+	 * Adds a selector to exclude nodes from emogrification.
+	 *
+	 * Any nodes that match the selector will not have their style altered.
+	 *
+	 * @param string $selector the selector to exclude, e.g., ".editor"
+	 *
+	 * @return void
+	 */
+	public function addExcludedSelector($selector)
+	{
+		$this->excludedSelectors[$selector] = true;
+	}
+
+	/**
+	 * No longer excludes the nodes matching this selector from emogrification.
+	 *
+	 * @param string $selector the selector to no longer exclude, e.g., ".editor"
+	 *
+	 * @return void
+	 */
+	public function removeExcludedSelector($selector)
+	{
+		if (isset($this->excludedSelectors[$selector])) {
+			unset($this->excludedSelectors[$selector]);
+		}
+	}
+
+	/**
+	 * This removes styles from your email that contain display:none.
+	 * We need to look for display:none, but we need to do a case-insensitive search. Since DOMDocument only
+	 * supports XPath 1.0, lower-case() isn't available to us. We've thus far only set attributes to lowercase,
+	 * not attribute values. Consequently, we need to translate() the letters that would be in 'NONE' ("NOE")
+	 * to lowercase.
+	 *
+	 * @param \DOMXPath $xPath
+	 *
+	 * @return void
+	 */
+	private function removeInvisibleNodes(DOMXPath $xPath)
+	{
+		$nodesWithStyleDisplayNone = $xPath->query(
+			'//*[contains(translate(translate(@style," ",""),"NOE","noe"),"display:none")]'
+		);
+		if ($nodesWithStyleDisplayNone->length === 0) {
+			return;
 		}
 
-		$xmlDocument = $this->createXmlDocument();
-		$xpath = new DOMXPath($xmlDocument);
-		$this->clearAllCaches();
-
-		// before be begin processing the CSS file, parse the document and normalize all existing CSS attributes (changes 'DISPLAY: none' to 'display: none');
-		// we wouldn't have to do this if DOMXPath supported XPath 2.0.
-		// also store a reference of nodes with existing inline styles so we don't overwrite them
-		$this->purgeVisitedNodes();
-
-		$nodesWithStyleAttributes = $xpath->query('//*[@style]');
-		if ($nodesWithStyleAttributes !== false) {
-			/** @var $nodeWithStyleAttribute DOMNode */
-			foreach ($nodesWithStyleAttributes as $node) {
-				$normalizedOriginalStyle = preg_replace_callback( '/[A-z\\-]+(?=\\:)/S', array( $this, 'strtolower' ), $node->getAttribute('style') );
-
-				// in order to not overwrite existing style attributes in the HTML, we have to save the original HTML styles
-				$nodePath = $node->getNodePath();
-				if (!isset($this->styleAttributesForNodes[$nodePath])) {
-					$this->styleAttributesForNodes[$nodePath] = $this->parseCssDeclarationBlock($normalizedOriginalStyle);
-					$this->visitedNodes[$nodePath] = $node;
-				}
-
-				$node->setAttribute('style', $normalizedOriginalStyle);
-			}
-		}
-
-		// grab any existing style blocks from the html and append them to the existing CSS
-		// (these blocks should be appended so as to have precedence over conflicting styles in the existing CSS)
-		$allCss = $this->css;
-
-		$allCss .= $this->getCssFromAllStyleNodes($xpath);
-
-		$cssParts = $this->splitCssAndMediaQuery($allCss);
-		self::$_media = ''; // reset
-
-		$cssKey = md5($cssParts['css']);
-		if (!isset($this->caches[self::CACHE_KEY_CSS][$cssKey])) {
-			// process the CSS file for selectors and definitions
-			preg_match_all('/(?:^|[\\s^{}]*)([^{]+){([^}]*)}/mis', $cssParts['css'], $matches, PREG_SET_ORDER);
-
-			$allSelectors = array();
-			foreach ($matches as $key => $selectorString) {
-				// if there is a blank definition, skip
-				if (!strlen(trim($selectorString[2]))) {
-					continue;
-				}
-
-				// else split by commas and duplicate attributes so we can sort by selector precedence
-				$selectors = explode(',', $selectorString[1]);
-				foreach ($selectors as $selector) {
-					// don't process pseudo-elements and behavioral (dynamic) pseudo-classes; ONLY allow structural pseudo-classes
-					if (strpos($selector, ':') !== false && !preg_match('/:\\S+\\-(child|type)\\(/i', $selector)) {
-						continue;
-					}
-
-					$allSelectors[] = array('selector' => trim($selector),
-											 'attributes' => trim($selectorString[2]),
-											 // keep track of where it appears in the file, since order is important
-											 'line' => $key,
-					);
-				}
-			}
-
-			// now sort the selectors by precedence
-			usort($allSelectors, array($this,'sortBySelectorPrecedence'));
-
-			$this->caches[self::CACHE_KEY_CSS][$cssKey] = $allSelectors;
-		}
-
-		foreach ($this->caches[self::CACHE_KEY_CSS][$cssKey] as $value) {
-			// query the body for the xpath selector
-			$nodesMatchingCssSelectors = $xpath->query($this->translateCssToXpath($value['selector']));
-
-			/** @var $node \DOMNode */
-			foreach ($nodesMatchingCssSelectors as $node) {
-				// if it has a style attribute, get it, process it, and append (overwrite) new stuff
-				if ($node->hasAttribute('style')) {
-					// break it up into an associative array
-					$oldStyleDeclarations = $this->parseCssDeclarationBlock($node->getAttribute('style'));
-				} else {
-					$oldStyleDeclarations = array();
-				}
-				$newStyleDeclarations = $this->parseCssDeclarationBlock($value['attributes']);
-				$node->setAttribute('style', $this->generateStyleStringFromDeclarationsArrays($oldStyleDeclarations, $newStyleDeclarations));
-			}
-		}
-
-		// now iterate through the nodes that contained inline styles in the original HTML
-		foreach ($this->styleAttributesForNodes as $nodePath => $styleAttributesForNode) {
-			$node = $this->visitedNodes[$nodePath];
-			$currentStyleAttributes = $this->parseCssDeclarationBlock($node->getAttribute('style'));
-			$node->setAttribute('style', $this->generateStyleStringFromDeclarationsArrays($currentStyleAttributes, $styleAttributesForNode));
-		}
-
-		// This removes styles from your email that contain display:none.
-		// We need to look for display:none, but we need to do a case-insensitive search. Since DOMDocument only supports XPath 1.0,
-		// lower-case() isn't available to us. We've thus far only set attributes to lowercase, not attribute values. Consequently, we need
-		// to translate() the letters that would be in 'NONE' ("NOE") to lowercase.
-		$nodesWithStyleDisplayNone = $xpath->query('//*[contains(translate(translate(@style," ",""),"NOE","noe"),"display:none")]');
 		// The checks on parentNode and is_callable below ensure that if we've deleted the parent node,
 		// we don't try to call removeChild on a nonexistent child node
-		if ($nodesWithStyleDisplayNone->length > 0) {
-			/** @var $node \DOMNode */
-			foreach ($nodesWithStyleDisplayNone as $node) {
-				if ($node->parentNode && is_callable(array($node->parentNode,'removeChild'))) {
-					$node->parentNode->removeChild($node);
+		/** @var \DOMNode $node */
+		foreach ($nodesWithStyleDisplayNone as $node) {
+			if ($node->parentNode && is_callable(array($node->parentNode, 'removeChild'))) {
+				$node->parentNode->removeChild($node);
+			}
+		}
+	}
+
+	private function normalizeStyleAttributes_callback( $m ) {
+		return strtolower( $m[0] );
+	}
+
+	/**
+	 * Normalizes the value of the "style" attribute and saves it.
+	 *
+	 * @param \DOMElement $node
+	 *
+	 * @return void
+	 */
+	private function normalizeStyleAttributes(DOMElement $node)
+	{
+		$normalizedOriginalStyle = preg_replace_callback(
+			'/[A-z\\-]+(?=\\:)/S',
+			array( $this, 'normalizeStyleAttributes_callback' ),
+			$node->getAttribute('style')
+		);
+
+		// in order to not overwrite existing style attributes in the HTML, we
+		// have to save the original HTML styles
+		$nodePath = $node->getNodePath();
+		if (!isset($this->styleAttributesForNodes[$nodePath])) {
+			$this->styleAttributesForNodes[$nodePath] = $this->parseCssDeclarationsBlock($normalizedOriginalStyle);
+			$this->visitedNodes[$nodePath] = $node;
+		}
+
+		$node->setAttribute('style', $normalizedOriginalStyle);
+	}
+
+	/**
+	 * Merges styles from styles attributes and style nodes and applies them to the attribute nodes
+	 *
+	 * @return void
+	 */
+	private function fillStyleAttributesWithMergedStyles()
+	{
+		foreach ($this->styleAttributesForNodes as $nodePath => $styleAttributesForNode) {
+			$node = $this->visitedNodes[$nodePath];
+			$currentStyleAttributes = $this->parseCssDeclarationsBlock($node->getAttribute('style'));
+			$node->setAttribute(
+				'style',
+				$this->generateStyleStringFromDeclarationsArrays(
+					$currentStyleAttributes,
+					$styleAttributesForNode
+				)
+			);
+		}
+	}
+
+	/**
+	 * This method merges old or existing name/value array with new name/value array
+	 * and then generates a string of the combined style suitable for placing inline.
+	 * This becomes the single point for CSS string generation allowing for consistent
+	 * CSS output no matter where the CSS originally came from.
+	 *
+	 * @param string[] $oldStyles
+	 * @param string[] $newStyles
+	 *
+	 * @return string
+	 */
+	private function generateStyleStringFromDeclarationsArrays(array $oldStyles, array $newStyles)
+	{
+		$combinedStyles = array_merge($oldStyles, $newStyles);
+		$cacheKey = serialize($combinedStyles);
+		if (isset($this->caches[self::CACHE_KEY_COMBINED_STYLES][$cacheKey])) {
+			return $this->caches[self::CACHE_KEY_COMBINED_STYLES][$cacheKey];
+		}
+
+		foreach ($oldStyles as $attributeName => $attributeValue) {
+			if (!isset($newStyles[$attributeName])) {
+				continue;
+			}
+
+			$newAttributeValue = $newStyles[$attributeName];
+			if ($this->attributeValueIsImportant($attributeValue)
+				&& !$this->attributeValueIsImportant($newAttributeValue)
+			) {
+				$combinedStyles[$attributeName] = $attributeValue;
+			}
+		}
+
+		$style = '';
+		foreach ($combinedStyles as $attributeName => $attributeValue) {
+			$style .= strtolower(trim($attributeName)) . ': ' . trim($attributeValue) . '; ';
+		}
+		$trimmedStyle = rtrim($style);
+
+		$this->caches[self::CACHE_KEY_COMBINED_STYLES][$cacheKey] = $trimmedStyle;
+
+		return $trimmedStyle;
+	}
+
+	/**
+	 * Checks whether $attributeValue is marked as !important.
+	 *
+	 * @param string $attributeValue
+	 *
+	 * @return bool
+	 */
+	private function attributeValueIsImportant($attributeValue)
+	{
+		return strtolower(substr(trim($attributeValue), -10)) === '!important';
+	}
+
+	/**
+	 * Applies $css to $xmlDocument, limited to the media queries that actually apply to the document.
+	 *
+	 * @param \DOMDocument $xmlDocument the document to match against
+	 * @param \DOMXPath $xPath
+	 * @param string $css a string of CSS
+	 *
+	 * @return void
+	 */
+	private function copyCssWithMediaToStyleNode(DOMDocument $xmlDocument, DOMXPath $xPath, $css)
+	{
+		if ($css === '') {
+			return;
+		}
+
+		$mediaQueriesRelevantForDocument = array();
+
+		foreach ($this->extractMediaQueriesFromCss($css) as $mediaQuery) {
+			foreach ($this->parseCssRules($mediaQuery['css']) as $selector) {
+				if ($this->existsMatchForCssSelector($xPath, $selector['selector'])) {
+					$mediaQueriesRelevantForDocument[] = $mediaQuery['query'];
+					break;
 				}
 			}
 		}
 
-		$this->copyCssWithMediaToStyleNode($cssParts, $xmlDocument);
-
-		if ($this->preserveEncoding) {
-			if ( function_exists( 'mb_convert_encoding' ) ) {
-				return mb_convert_encoding( $xmlDocument->saveHTML(), self::ENCODING, 'HTML-ENTITIES' );
-			} else {
-				return htmlspecialchars_decode( utf8_encode( html_entity_decode( $xmlDocument->saveHTML(), ENT_COMPAT, self::ENCODING ) ) );
-			}
-		} else {
-			return $xmlDocument->saveHTML();
-		}
+		$this->addStyleElementToDocument($xmlDocument, implode($mediaQueriesRelevantForDocument));
 	}
 
-	public function strtolower(array $m) {
-		return strtolower($m[0]);
-	}
-
-
 	/**
-	 * This method merges old or existing name/value array with new name/value array.
-	 * and then generates a string of the combined style suitable for placing inline.
-	 * This becomes the single point for CSS string generation allowing for consistent.
-	 * CSS output no matter where the CSS originally came from.
-	 * @param array $oldStyles
-	 * @param array $newStyles
-	 * @return string
-	 */
-	private function generateStyleStringFromDeclarationsArrays(array $oldStyles, array $newStyles) {
-		$combinedStyles = array_merge($oldStyles, $newStyles);
-		$style = '';
-		foreach ($combinedStyles as $attributeName => $attributeValue) {
-			$style .= (strtolower(trim($attributeName)) . ': ' . trim($attributeValue) . '; ');
-		}
-		return trim($style);
-	}
-
-
-	/**
-	 * Copies the media part from CSS array parts to $xmlDocument.
+	 * Extracts the media queries from $css while skipping empty media queries.
 	 *
-	 * @param array $cssParts
-	 * @param DOMDocument $xmlDocument
+	 * @param string $css
+	 *
+	 * @return string[][] numeric array with string sub-arrays with the keys "css" and "query"
 	 */
-	public function copyCssWithMediaToStyleNode(array $cssParts, DOMDocument $xmlDocument) {
-		if (isset($cssParts['media']) && $cssParts['media'] !== '') {
-			$this->addStyleElementToDocument($xmlDocument, $cssParts['media']);
+	private function extractMediaQueriesFromCss($css)
+	{
+		preg_match_all('/@media\\b[^{]*({((?:[^{}]+|(?1))*)})/', $css, $rawMediaQueries, PREG_SET_ORDER);
+		$parsedQueries = array();
+
+		foreach ($rawMediaQueries as $mediaQuery) {
+			if ($mediaQuery[2] !== '') {
+				$parsedQueries[] = array(
+					'css'   => $mediaQuery[2],
+					'query' => $mediaQuery[0],
+				);
+			}
 		}
+
+		return $parsedQueries;
+	}
+
+	/**
+	 * Checks whether there is at least one matching element for $cssSelector.
+	 *
+	 * @param \DOMXPath $xPath
+	 * @param string $cssSelector
+	 *
+	 * @return bool
+	 */
+	private function existsMatchForCssSelector(DOMXPath $xPath, $cssSelector)
+	{
+		$nodesMatchingSelector = $xPath->query($this->translateCssToXpath($cssSelector));
+
+		return $nodesMatchingSelector !== false && $nodesMatchingSelector->length !== 0;
 	}
 
 	/**
 	 * Returns CSS content.
 	 *
-	 * @param DOMXPath $xpath
+	 * @param \DOMXPath $xPath
+	 *
 	 * @return string
 	 */
-	private function getCssFromAllStyleNodes(DOMXPath $xpath) {
-		$styleNodes = $xpath->query('//style');
+	private function getCssFromAllStyleNodes(DOMXPath $xPath)
+	{
+		$styleNodes = $xPath->query('//style');
 
 		if ($styleNodes === false) {
 			return '';
 		}
 
 		$css = '';
-		/** @var $styleNode DOMNode */
+		/** @var \DOMNode $styleNode */
 		foreach ($styleNodes as $styleNode) {
 			$css .= "\n\n" . $styleNode->nodeValue;
 			$styleNode->parentNode->removeChild($styleNode);
@@ -410,10 +1019,17 @@ class Emogrifier {
 	/**
 	 * Adds a style element with $css to $document.
 	 *
-	 * @param DOMDocument $document
+	 * This method is protected to allow overriding.
+	 *
+	 * @see https://github.com/jjriv/emogrifier/issues/103
+	 *
+	 * @param \DOMDocument $document
 	 * @param string $css
+	 *
+	 * @return void
 	 */
-	private function addStyleElementToDocument(DOMDocument $document, $css) {
+	protected function addStyleElementToDocument(DOMDocument $document, $css)
+	{
 		$styleElement = $document->createElement('style', $css);
 		$styleAttribute = $document->createAttribute('type');
 		$styleAttribute->value = 'text/css';
@@ -426,10 +1042,12 @@ class Emogrifier {
 	/**
 	 * Returns the existing or creates a new head element in $document.
 	 *
-	 * @param DOMDocument $document
-	 * @return DOMNode the head element
+	 * @param \DOMDocument $document
+	 *
+	 * @return \DOMNode the head element
 	 */
-	private function getOrCreateHeadElement(DOMDocument $document) {
+	private function getOrCreateHeadElement(DOMDocument $document)
+	{
 		$head = $document->getElementsByTagName('head')->item(0);
 
 		if ($head === null) {
@@ -444,12 +1062,12 @@ class Emogrifier {
 	/**
 	 * Splits input CSS code to an array where:
 	 *
-	 * - key "css" will be contains clean CSS code.
-	 * - key "media" will be contains all valuable media queries.
+	 * - key "css" will be contains clean CSS code
+	 * - key "media" will be contains all valuable media queries
 	 *
 	 * Example:
 	 *
-	 * The CSS code.
+	 * The CSS code
 	 *
 	 *   "@import "file.css"; h1 { color:red; } @media { h1 {}} @media tv { h1 {}}"
 	 *
@@ -459,31 +1077,34 @@ class Emogrifier {
 	 *   "media" => "@media { h1 {}}"
 	 *
 	 * @param string $css
-	 * @return array
+	 *
+	 * @return string[]
 	 */
-	private function splitCssAndMediaQuery($css) {
-		$css = preg_replace_callback( '#@media\\s+(?:only\\s)?(?:[\\s{\(]|screen|all)\\s?[^{]+{.*}\\s*}\\s*#misU', array( $this, '_media_concat' ), $css );
+	private function splitCssAndMediaQuery($css)
+	{
+		$cssWithoutComments = preg_replace('/\\/\\*.*\\*\\//sU', '', $css);
+
+		$mediaTypesExpression = '';
+		if (!empty($this->allowedMediaTypes)) {
+			$mediaTypesExpression = '|' . implode('|', array_keys($this->allowedMediaTypes));
+		}
+
+		$media = '';
+		$cssForAllowedMediaTypes = preg_replace_callback(
+			'#@media\\s+(?:only\\s)?(?:[\\s{\\(]' . $mediaTypesExpression . ')\\s?[^{]+{.*}\\s*}\\s*#misU',
+			array( $this, '_media_concat' ),
+			$cssWithoutComments
+		);
 
 		// filter the CSS
 		$search = array(
-			// get rid of css comment code
-			'/\\/\\*.*\\*\\//sU',
-			// strip out any import directives
-			'/^\\s*@import\\s[^;]+;/misU',
-			// strip remains media enclosures
-			'/^\\s*@media\\s[^{]+{(.*)}\\s*}\\s/misU',
+			'import directives' => '/^\\s*@import\\s[^;]+;/misU',
+			'remaining media enclosures' => '/^\\s*@media\\s[^{]+{(.*)}\\s*}\\s/misU',
 		);
 
-		$replace = array(
-			'',
-			'',
-			'',
-		);
+		$cleanedCss = preg_replace($search, '', $cssForAllowedMediaTypes);
 
-		// clean CSS before output
-		$css = preg_replace($search, $replace, $css);
-
-		return array('css' => $css, 'media' => self::$_media);
+		return array('css' => $cleanedCss, 'media' => self::$_media);
 	}
 
 	private function _media_concat( $matches ) {
@@ -493,11 +1114,12 @@ class Emogrifier {
 	/**
 	 * Creates a DOMDocument instance with the current HTML.
 	 *
-	 * @return DOMDocument
+	 * @return \DOMDocument
 	 */
-	private function createXmlDocument() {
+	private function createXmlDocument()
+	{
 		$xmlDocument = new DOMDocument;
-		$xmlDocument->encoding = self::ENCODING;
+		$xmlDocument->encoding = 'UTF-8';
 		$xmlDocument->strictErrorChecking = false;
 		$xmlDocument->formatOutput = true;
 		$libXmlState = libxml_use_internal_errors(true);
@@ -510,53 +1132,119 @@ class Emogrifier {
 	}
 
 	/**
-	 * Returns the HTML with the non-ASCII characters converts into HTML entities and the unprocessable HTML tags removed.
+	 * Returns the HTML with the unprocessable HTML tags removed and
+	 * with added document type and Content-Type meta tag if needed.
 	 *
 	 * @return string the unified HTML
 	 *
-	 * @throws BadMethodCallException
+	 * @throws \BadMethodCallException
 	 */
-	private function getUnifiedHtml() {
-		if (!empty($this->unprocessableHtmlTags)) {
-			$unprocessableHtmlTags = implode('|', $this->unprocessableHtmlTags);
-			$bodyWithoutUnprocessableTags = preg_replace('/<\\/?(' . $unprocessableHtmlTags . ')[^>]*>/i', '', $this->html);
-		} else {
-			$bodyWithoutUnprocessableTags = $this->html;
-		}
+	private function getUnifiedHtml()
+	{
+		$htmlWithoutUnprocessableTags = $this->removeUnprocessableTags($this->html);
+		$htmlWithDocumentType = $this->ensureDocumentType($htmlWithoutUnprocessableTags);
 
-		if ( function_exists( 'mb_convert_encoding' ) ) {
-			return mb_convert_encoding( $bodyWithoutUnprocessableTags, 'HTML-ENTITIES', self::ENCODING );
-		} else {
-			return htmlspecialchars_decode( utf8_decode( htmlentities( $bodyWithoutUnprocessableTags, ENT_COMPAT, self::ENCODING, false ) ) );
-		}
+		return $this->addContentTypeMetaTag($htmlWithDocumentType);
 	}
 
 	/**
-	 * @param array $a
-	 * @param array $b
+	 * Removes the unprocessable tags from $html (if this feature is enabled).
 	 *
-	 * @return integer
+	 * @param string $html
+	 *
+	 * @return string the reworked HTML with the unprocessable tags removed
 	 */
-	private function sortBySelectorPrecedence(array $a, array $b) {
+	private function removeUnprocessableTags($html)
+	{
+		if (empty($this->unprocessableHtmlTags)) {
+			return $html;
+		}
+
+		$unprocessableHtmlTags = implode('|', $this->unprocessableHtmlTags);
+
+		return preg_replace(
+			'/<\\/?(' . $unprocessableHtmlTags . ')[^>]*>/i',
+			'',
+			$html
+		);
+	}
+
+	/**
+	 * Makes sure that the passed HTML has a document type.
+	 *
+	 * @param string $html
+	 *
+	 * @return string HTML with document type
+	 */
+	private function ensureDocumentType($html)
+	{
+		$hasDocumentType = stripos($html, '<!DOCTYPE') !== false;
+		if ($hasDocumentType) {
+			return $html;
+		}
+
+		return self::DEFAULT_DOCUMENT_TYPE . $html;
+	}
+
+	/**
+	 * Adds a Content-Type meta tag for the charset.
+	 *
+	 * @param string $html
+	 *
+	 * @return string the HTML with the meta tag added
+	 */
+	private function addContentTypeMetaTag($html)
+	{
+		$hasContentTypeMetaTag = stristr($html, 'Content-Type') !== false;
+		if ($hasContentTypeMetaTag) {
+			return $html;
+		}
+
+		// We are trying to insert the meta tag to the right spot in the DOM.
+		// If we just prepended it to the HTML, we would lose attributes set to the HTML tag.
+		$hasHeadTag = stripos($html, '<head') !== false;
+		$hasHtmlTag = stripos($html, '<html') !== false;
+
+		if ($hasHeadTag) {
+			$reworkedHtml = preg_replace('/<head(.*?)>/i', '<head$1>' . self::CONTENT_TYPE_META_TAG, $html);
+		} elseif ($hasHtmlTag) {
+			$reworkedHtml = preg_replace(
+				'/<html(.*?)>/i',
+				'<html$1><head>' . self::CONTENT_TYPE_META_TAG . '</head>',
+				$html
+			);
+		} else {
+			$reworkedHtml = self::CONTENT_TYPE_META_TAG . $html;
+		}
+
+		return $reworkedHtml;
+	}
+
+	/**
+	 * @param string[] $a
+	 * @param string[] $b
+	 *
+	 * @return int
+	 */
+	private function sortBySelectorPrecedence(array $a, array $b)
+	{
 		$precedenceA = $this->getCssSelectorPrecedence($a['selector']);
 		$precedenceB = $this->getCssSelectorPrecedence($b['selector']);
 
 		// We want these sorted in ascending order so selectors with lesser precedence get processed first and
 		// selectors with greater precedence get sorted last.
-		// The parenthesis around the -1 are necessary to avoid a PHP_CodeSniffer warning about missing spaces around
-		// arithmetic operators.
-		// @see http://forge.typo3.org/issues/55605
-		$precedenceForEquals = ($a['line'] < $b['line'] ? (-1) : 1);
-		$precedenceForNotEquals = ($precedenceA < $precedenceB ? (-1) : 1);
+		$precedenceForEquals = ($a['line'] < $b['line'] ? -1 : 1);
+		$precedenceForNotEquals = ($precedenceA < $precedenceB ? -1 : 1);
 		return ($precedenceA === $precedenceB) ? $precedenceForEquals : $precedenceForNotEquals;
 	}
 
 	/**
 	 * @param string $selector
 	 *
-	 * @return integer
+	 * @return int
 	 */
-	private function getCssSelectorPrecedence($selector) {
+	private function getCssSelectorPrecedence($selector)
+	{
 		$selectorKey = md5($selector);
 		if (!isset($this->caches[self::CACHE_KEY_SELECTOR][$selectorKey])) {
 			$precedence = 0;
@@ -565,7 +1253,7 @@ class Emogrifier {
 			$search = array('\\#','\\.','');
 
 			foreach ($search as $s) {
-				if (trim($selector == '')) {
+				if (trim($selector) === '') {
 					break;
 				}
 				$number = 0;
@@ -579,88 +1267,83 @@ class Emogrifier {
 		return $this->caches[self::CACHE_KEY_SELECTOR][$selectorKey];
 	}
 
+	private function translateCssToXpath_callback( $matches ) {
+		return strtolower($matches[0]);
+	}
+
 	/**
-	 * Right now, we support all CSS 1 selectors and most CSS2/3 selectors.
+	 * Maps a CSS selector to an XPath query string.
 	 *
 	 * @see http://plasmasturm.org/log/444/
 	 *
-	 * @param string $paramCssSelector
+	 * @param string $cssSelector a CSS selector
 	 *
-	 * @return string
+	 * @return string the corresponding XPath selector
 	 */
-	private function translateCssToXpath($paramCssSelector) {
-		$cssSelector = ' ' . $paramCssSelector . ' ';
-		$cssSelector = preg_replace_callback( '/\s+\w+\s+/', array( $this, 'strtolower' ), $cssSelector );
-		$cssSelector = trim($cssSelector);
-		$xpathKey = md5($cssSelector);
-		if (!isset($this->caches[self::CACHE_KEY_XPATH][$xpathKey])) {
-			// returns an Xpath selector
-			$search = array(
-				// Matches any element that is a child of parent.
-				'/\\s+>\\s+/',
-				// Matches any element that is an adjacent sibling.
-				'/\\s+\\+\\s+/',
-				// Matches any element that is a descendant of an parent element element.
-				'/\\s+/',
-				// first-child pseudo-selector
-				'/([^\\/]+):first-child/i',
-				// last-child pseudo-selector
-				'/([^\\/]+):last-child/i',
-				// Matches attribute only selector
-				'/^\\[(\\w+)\\]/',
-				// Matches element with attribute
-				'/(\\w)\\[(\\w+)\\]/',
-				// Matches element with EXACT attribute
-				'/(\\w)\\[(\\w+)\\=[\'"]?(\\w+)[\'"]?\\]/',
-			);
-			$replace = array(
-				'/',
-				'/following-sibling::*[1]/self::',
-				'//',
-				'*[1]/self::\\1',
-				'*[last()]/self::\\1',
-				'*[@\\1]',
-				'\\1[@\\2]',
-				'\\1[@\\2="\\3"]',
-			);
+	private function translateCssToXpath($cssSelector)
+	{
+		$paddedSelector = ' ' . $cssSelector . ' ';
+		$lowercasePaddedSelector = preg_replace_callback(
+			'/\\s+\\w+\\s+/',
+			array( $this, 'translateCssToXpath_callback' ),
+			$paddedSelector
+		);
 
-			$cssSelector = '//' . preg_replace($search, $replace, $cssSelector);
-
-			$cssSelector = preg_replace_callback(self::ID_ATTRIBUTE_MATCHER, array($this, 'matchIdAttributes'), $cssSelector);
-			$cssSelector = preg_replace_callback(self::CLASS_ATTRIBUTE_MATCHER, array($this, 'matchClassAttributes'), $cssSelector);
+		$trimmedLowercaseSelector = trim($lowercasePaddedSelector);
+		$xPathKey = md5($trimmedLowercaseSelector);
+		if (!isset($this->caches[self::CACHE_KEY_XPATH][$xPathKey])) {
+			$roughXpath = '//' . preg_replace(
+				array_keys($this->xPathRules),
+				$this->xPathRules,
+				$trimmedLowercaseSelector
+			);
+			$xPathWithIdAttributeMatchers = preg_replace_callback(
+				self::ID_ATTRIBUTE_MATCHER,
+				array($this, 'matchIdAttributes'),
+				$roughXpath
+			);
+			$xPathWithIdAttributeAndClassMatchers = preg_replace_callback(
+				self::CLASS_ATTRIBUTE_MATCHER,
+				array($this, 'matchClassAttributes'),
+				$xPathWithIdAttributeMatchers
+			);
 
 			// Advanced selectors are going to require a bit more advanced emogrification.
 			// When we required PHP 5.3, we could do this with closures.
-			$cssSelector = preg_replace_callback(
-				'/([^\\/]+):nth-child\\(\s*(odd|even|[+\-]?\\d|[+\\-]?\\d?n(\\s*[+\\-]\\s*\\d)?)\\s*\\)/i',
-				array($this, 'translateNthChild'), $cssSelector
+			$xPathWithIdAttributeAndClassMatchers = preg_replace_callback(
+				'/([^\\/]+):nth-child\\(\\s*(odd|even|[+\\-]?\\d|[+\\-]?\\d?n(\\s*[+\\-]\\s*\\d)?)\\s*\\)/i',
+				array($this, 'translateNthChild'),
+				$xPathWithIdAttributeAndClassMatchers
 			);
-			$cssSelector = preg_replace_callback(
-				'/([^\\/]+):nth-of-type\\(\s*(odd|even|[+\-]?\\d|[+\\-]?\\d?n(\\s*[+\\-]\\s*\\d)?)\\s*\\)/i',
-				array($this, 'translateNthOfType'), $cssSelector
+			$finalXpath = preg_replace_callback(
+				'/([^\\/]+):nth-of-type\\(\s*(odd|even|[+\\-]?\\d|[+\\-]?\\d?n(\\s*[+\\-]\\s*\\d)?)\\s*\\)/i',
+				array($this, 'translateNthOfType'),
+				$xPathWithIdAttributeAndClassMatchers
 			);
 
-			$this->caches[self::CACHE_KEY_SELECTOR][$xpathKey] = $cssSelector;
+			$this->caches[self::CACHE_KEY_SELECTOR][$xPathKey] = $finalXpath;
 		}
-		return $this->caches[self::CACHE_KEY_SELECTOR][$xpathKey];
+		return $this->caches[self::CACHE_KEY_SELECTOR][$xPathKey];
 	}
 
 	/**
-	 * @param array $match
+	 * @param string[] $match
 	 *
 	 * @return string
 	 */
-	private function matchIdAttributes(array $match) {
-		return (strlen($match[1]) ? $match[1] : '*') . '[@id="' . $match[2] . '"]';
+	private function matchIdAttributes(array $match)
+	{
+		return ($match[1] !== '' ? $match[1] : '*') . '[@id="' . $match[2] . '"]';
 	}
 
 	/**
-	 * @param array $match
+	 * @param string[] $match
 	 *
 	 * @return string
 	 */
-	private function matchClassAttributes(array $match) {
-		return (strlen($match[1]) ? $match[1] : '*') . '[contains(concat(" ",@class," "),concat(" ","' .
+	private function matchClassAttributes(array $match)
+	{
+		return ($match[1] !== '' ? $match[1] : '*') . '[contains(concat(" ",@class," "),concat(" ","' .
 			implode(
 				'"," "))][contains(concat(" ",@class," "),concat(" ","',
 				explode('.', substr($match[2], 1))
@@ -668,83 +1351,112 @@ class Emogrifier {
 	}
 
 	/**
-	 * @param array $match
+	 * @param string[] $match
 	 *
 	 * @return string
 	 */
-	private function translateNthChild(array $match) {
-		$result = $this->parseNth($match);
+	private function translateNthChild(array $match)
+	{
+		$parseResult = $this->parseNth($match);
 
-		if (isset($result[self::MULTIPLIER])) {
-			if ($result[self::MULTIPLIER] < 0) {
-				$result[self::MULTIPLIER] = abs($result[self::MULTIPLIER]);
-				return sprintf('*[(last() - position()) mod %u = %u]/self::%s', $result[self::MULTIPLIER], $result[self::INDEX], $match[1]);
+		if (isset($parseResult[self::MULTIPLIER])) {
+			if ($parseResult[self::MULTIPLIER] < 0) {
+				$parseResult[self::MULTIPLIER] = abs($parseResult[self::MULTIPLIER]);
+				$xPathExpression = sprintf(
+					'*[(last() - position()) mod %u = %u]/self::%s',
+					$parseResult[self::MULTIPLIER],
+					$parseResult[self::INDEX],
+					$match[1]
+				);
 			} else {
-				return sprintf('*[position() mod %u = %u]/self::%s', $result[self::MULTIPLIER], $result[self::INDEX], $match[1]);
+				$xPathExpression = sprintf(
+					'*[position() mod %u = %u]/self::%s',
+					$parseResult[self::MULTIPLIER],
+					$parseResult[self::INDEX],
+					$match[1]
+				);
 			}
 		} else {
-			return sprintf('*[%u]/self::%s', $result[self::INDEX], $match[1]);
+			$xPathExpression = sprintf('*[%u]/self::%s', $parseResult[self::INDEX], $match[1]);
 		}
+
+		return $xPathExpression;
 	}
 
 	/**
-	 * @param array $match
+	 * @param string[] $match
 	 *
 	 * @return string
 	 */
-	private function translateNthOfType(array $match) {
-		$result = $this->parseNth($match);
+	private function translateNthOfType(array $match)
+	{
+		$parseResult = $this->parseNth($match);
 
-		if (isset($result[self::MULTIPLIER])) {
-			if ($result[self::MULTIPLIER] < 0) {
-				$result[self::MULTIPLIER] = abs($result[self::MULTIPLIER]);
-				return sprintf('%s[(last() - position()) mod %u = %u]', $match[1], $result[self::MULTIPLIER], $result[self::INDEX]);
+		if (isset($parseResult[self::MULTIPLIER])) {
+			if ($parseResult[self::MULTIPLIER] < 0) {
+				$parseResult[self::MULTIPLIER] = abs($parseResult[self::MULTIPLIER]);
+				$xPathExpression = sprintf(
+					'%s[(last() - position()) mod %u = %u]',
+					$match[1],
+					$parseResult[self::MULTIPLIER],
+					$parseResult[self::INDEX]
+				);
 			} else {
-				return sprintf('%s[position() mod %u = %u]', $match[1], $result[self::MULTIPLIER], $result[self::INDEX]);
+				$xPathExpression = sprintf(
+					'%s[position() mod %u = %u]',
+					$match[1],
+					$parseResult[self::MULTIPLIER],
+					$parseResult[self::INDEX]
+				);
 			}
 		} else {
-			return sprintf('%s[%u]', $match[1], $result[self::INDEX]);
+			$xPathExpression = sprintf('%s[%u]', $match[1], $parseResult[self::INDEX]);
 		}
+
+		return $xPathExpression;
 	}
 
 	/**
-	 * @param array $match
+	 * @param string[] $match
 	 *
-	 * @return array
+	 * @return int[]
 	 */
-	private function parseNth(array $match) {
-		if (in_array(strtolower($match[2]), array('even','odd'))) {
-			$index = strtolower($match[2]) == 'even' ? 0 : 1;
+	private function parseNth(array $match)
+	{
+		if (in_array(strtolower($match[2]), array('even', 'odd'), true)) {
+			// we have "even" or "odd"
+			$index = strtolower($match[2]) === 'even' ? 0 : 1;
 			return array(self::MULTIPLIER => 2, self::INDEX => $index);
-		} elseif (stripos($match[2], 'n') === false) {
+		}
+		if (stripos($match[2], 'n') === false) {
 			// if there is a multiplier
-			$index = intval(str_replace(' ', '', $match[2]));
+			$index = (int) str_replace(' ', '', $match[2]);
+			return array(self::INDEX => $index);
+		}
+
+		if (isset($match[3])) {
+			$multipleTerm = str_replace($match[3], '', $match[2]);
+			$index = (int) str_replace(' ', '', $match[3]);
+		} else {
+			$multipleTerm = $match[2];
+			$index = 0;
+		}
+
+		$multiplier = str_ireplace('n', '', $multipleTerm);
+
+		if ($multiplier === '') {
+			$multiplier = 1;
+		} elseif ($multiplier === '0') {
 			return array(self::INDEX => $index);
 		} else {
-			if (isset($match[3])) {
-				$multipleTerm = str_replace($match[3], '', $match[2]);
-				$index = intval(str_replace(' ', '', $match[3]));
-			} else {
-				$multipleTerm = $match[2];
-				$index = 0;
-			}
-
-			$multiplier = str_ireplace('n', '', $multipleTerm);
-
-			if (!strlen($multiplier)) {
-				$multiplier = 1;
-			} elseif ($multiplier == 0) {
-				return array(self::INDEX => $index);
-			} else {
-				$multiplier = intval($multiplier);
-			}
-
-			while ($index < 0) {
-				$index += abs($multiplier);
-			}
-
-			return array(self::MULTIPLIER => $multiplier, self::INDEX => $index);
+			$multiplier = (int) $multiplier;
 		}
+
+		while ($index < 0) {
+			$index += abs($multiplier);
+		}
+
+		return array(self::MULTIPLIER => $multiplier, self::INDEX => $index);
 	}
 
 	/**
@@ -752,37 +1464,93 @@ class Emogrifier {
 	 *
 	 * Example:
 	 *
-	 * The declaration block.
+	 * The declaration block
 	 *
-	 *   "color: #000; font-weight: bold;".
+	 *   "color: #000; font-weight: bold;"
 	 *
 	 * will be parsed into the following array:
 	 *
 	 *   "color" => "#000"
 	 *   "font-weight" => "bold"
 	 *
-	 * @param string $cssDeclarationBlock the CSS declaration block without the curly braces, may be empty
+	 * @param string $cssDeclarationsBlock the CSS declarations block without the curly braces, may be empty
 	 *
-	 * @return array the CSS declarations with the property names as array keys and the property values as array values
+	 * @return string[]
+	 *         the CSS declarations with the property names as array keys and the property values as array values
 	 */
-	private function parseCssDeclarationBlock($cssDeclarationBlock) {
-		if (isset($this->caches[self::CACHE_KEY_CSS_DECLARATION_BLOCK][$cssDeclarationBlock])) {
-			return $this->caches[self::CACHE_KEY_CSS_DECLARATION_BLOCK][$cssDeclarationBlock];
+	private function parseCssDeclarationsBlock($cssDeclarationsBlock)
+	{
+		if (isset($this->caches[self::CACHE_KEY_CSS_DECLARATIONS_BLOCK][$cssDeclarationsBlock])) {
+			return $this->caches[self::CACHE_KEY_CSS_DECLARATIONS_BLOCK][$cssDeclarationsBlock];
 		}
 
 		$properties = array();
-		$declarations = explode(';', $cssDeclarationBlock);
+		$declarations = preg_split('/;(?!base64|charset)/', $cssDeclarationsBlock);
+
 		foreach ($declarations as $declaration) {
 			$matches = array();
-			if (!preg_match('/ *([A-Za-z\\-]+) *: *([^;]+) */', $declaration, $matches)) {
+			if (!preg_match('/^([A-Za-z\\-]+)\\s*:\\s*(.+)$/', trim($declaration), $matches)) {
 				continue;
 			}
+
 			$propertyName = strtolower($matches[1]);
 			$propertyValue = $matches[2];
 			$properties[$propertyName] = $propertyValue;
 		}
-		$this->caches[self::CACHE_KEY_CSS_DECLARATION_BLOCK][$cssDeclarationBlock] = $properties;
+		$this->caches[self::CACHE_KEY_CSS_DECLARATIONS_BLOCK][$cssDeclarationsBlock] = $properties;
 
 		return $properties;
 	}
+
+	/**
+	 * Find the nodes that are not to be emogrified.
+	 *
+	 * @param \DOMXPath $xPath
+	 *
+	 * @return \DOMElement[]
+	 */
+	private function getNodesToExclude(DOMXPath $xPath)
+	{
+		$excludedNodes = array();
+		foreach (array_keys($this->excludedSelectors) as $selectorToExclude) {
+			foreach ($xPath->query($this->translateCssToXpath($selectorToExclude)) as $node) {
+				$excludedNodes[] = $node;
+			}
+		}
+
+		return $excludedNodes;
+	}
+
+	/**
+	 * Handles invalid xPath expression warnings, generated by process() method,
+	 * during querying \DOMDocument and trigger \InvalidArgumentException
+	 * with invalid selector.
+	 *
+	 * @param int $type
+	 * @param string $message
+	 * @param string $file
+	 * @param int $line
+	 * @param array $context
+	 *
+	 * @return bool always false
+	 *
+	 * @throws \InvalidArgumentException
+	 */
+	public function handleXpathError($type, $message, $file, $line, array $context)
+	{
+		if ($type === E_WARNING && isset($context['cssRule']['selector'])) {
+			throw new InvalidArgumentException(
+				sprintf(
+					'%s in selector >> %s << in %s on line %s',
+					$message,
+					$context['cssRule']['selector'],
+					$file,
+					$line
+				)
+			);
+		}
+
+		// the normal error handling continues when handler return false
+		return false;
+	}
 }
diff --git a/includes/libraries/class-wc-eval-math.php b/includes/libraries/class-wc-eval-math.php
new file mode 100644
index 00000000000..99e8a96857c
--- /dev/null
+++ b/includes/libraries/class-wc-eval-math.php
@@ -0,0 +1,401 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+if ( ! class_exists( 'WC_Eval_Math', false ) ) {
+	/**
+	 * Class WC_Eval_Math. Supports basic math only (removed eval function).
+	 *
+	 * Based on EvalMath by Miles Kaufman Copyright (C) 2005 Miles Kaufmann http://www.twmagic.com/.
+	 */
+	class WC_Eval_Math {
+
+		/**
+		 * Last error.
+		 *
+		 * @var string
+		 */
+		public static $last_error = null;
+
+		/**
+		 * Variables (and constants).
+		 *
+		 * @var array
+		 */
+		public static $v = array( 'e' => 2.71, 'pi' => 3.14 );
+
+		/**
+		 * User-defined functions.
+		 *
+		 * @var array
+		 */
+		public static $f = array();
+
+		/**
+		 * Constants.
+		 *
+		 * @var array
+		 */
+		public static $vb = array( 'e', 'pi' );
+
+		/**
+		 * Built-in functions.
+		 *
+		 * @var array
+		 */
+		public static $fb = array();
+
+		/**
+		 * Evaluate maths string.
+		 *
+		 * @param string  $expr
+		 * @return mixed
+		 */
+		public static function evaluate( $expr ) {
+			self::$last_error = null;
+			$expr = trim( $expr );
+			if ( substr( $expr, -1, 1 ) == ';' ) {
+				$expr = substr( $expr, 0, strlen( $expr ) -1 ); // strip semicolons at the end
+			}
+			// ===============
+			// is it a variable assignment?
+			if ( preg_match( '/^\s*([a-z]\w*)\s*=\s*(.+)$/', $expr, $matches ) ) {
+				if ( in_array( $matches[1], self::$vb ) ) { // make sure we're not assigning to a constant
+					return self::trigger( "cannot assign to constant '$matches[1]'" );
+				}
+				if ( ( $tmp = self::pfx( self::nfx( $matches[2] ) ) ) === false ) {
+					return false; // get the result and make sure it's good
+				}
+				self::$v[ $matches[1] ] = $tmp; // if so, stick it in the variable array
+				return self::$v[ $matches[1] ]; // and return the resulting value
+				// ===============
+				// is it a function assignment?
+			} elseif ( preg_match( '/^\s*([a-z]\w*)\s*\(\s*([a-z]\w*(?:\s*,\s*[a-z]\w*)*)\s*\)\s*=\s*(.+)$/', $expr, $matches ) ) {
+				$fnn = $matches[1]; // get the function name
+				if ( in_array( $matches[1], self::$fb ) ) { // make sure it isn't built in
+					return self::trigger( "cannot redefine built-in function '$matches[1]()'" );
+				}
+				$args = explode( ",", preg_replace( "/\s+/", "", $matches[2] ) ); // get the arguments
+				if ( ( $stack = self::nfx( $matches[3] ) ) === false ) {
+					return false; // see if it can be converted to postfix
+				}
+				$stack_size = count( $stack );
+				for ( $i = 0; $i < $stack_size; $i++ ) { // freeze the state of the non-argument variables
+					$token = $stack[ $i ];
+					if ( preg_match( '/^[a-z]\w*$/', $token ) and ! in_array( $token, $args ) ) {
+						if ( array_key_exists( $token, self::$v ) ) {
+							$stack[ $i ] = self::$v[ $token ];
+						} else {
+							return self::trigger( "undefined variable '$token' in function definition" );
+						}
+					}
+				}
+				self::$f[ $fnn ] = array( 'args' => $args, 'func' => $stack );
+				return true;
+				// ===============
+			} else {
+				return self::pfx( self::nfx( $expr ) ); // straight up evaluation, woo
+			}
+		}
+
+		/**
+		 * Convert infix to postfix notation.
+		 *
+		 * @param  string $expr
+		 * @return string
+		 */
+		private static function nfx( $expr ) {
+
+			$index = 0;
+			$stack = new WC_Eval_Math_Stack;
+			$output = array(); // postfix form of expression, to be passed to pfx()
+			$expr = trim( $expr );
+
+			$ops   = array( '+', '-', '*', '/', '^', '_' );
+			$ops_r = array( '+' => 0, '-' => 0, '*' => 0, '/' => 0, '^' => 1 ); // right-associative operator?
+			$ops_p = array( '+' => 0, '-' => 0, '*' => 1, '/' => 1, '_' => 1, '^' => 2 ); // operator precedence
+
+			$expecting_op = false; // we use this in syntax-checking the expression
+			// and determining when a - is a negation
+			if ( preg_match( "/[^\w\s+*^\/()\.,-]/", $expr, $matches ) ) { // make sure the characters are all good
+				return self::trigger( "illegal character '{$matches[0]}'" );
+			}
+
+			while ( 1 ) { // 1 Infinite Loop ;)
+				$op = substr( $expr, $index, 1 ); // get the first character at the current index
+				// find out if we're currently at the beginning of a number/variable/function/parenthesis/operand
+				$ex = preg_match( '/^([A-Za-z]\w*\(?|\d+(?:\.\d*)?|\.\d+|\()/', substr( $expr, $index ), $match );
+				// ===============
+				if ( '-' === $op and ! $expecting_op ) { // is it a negation instead of a minus?
+					$stack->push( '_' ); // put a negation on the stack
+					$index++;
+				} elseif ( '_' === $op ) { // we have to explicitly deny this, because it's legal on the stack
+					return self::trigger( "illegal character '_'" ); // but not in the input expression
+					// ===============
+				} elseif ( ( in_array( $op, $ops ) or $ex ) and $expecting_op ) { // are we putting an operator on the stack?
+					if ( $ex ) { // are we expecting an operator but have a number/variable/function/opening parethesis?
+						$op = '*';
+						$index--; // it's an implicit multiplication
+					}
+					// heart of the algorithm:
+					while ( $stack->count > 0 and ( $o2 = $stack->last() ) and in_array( $o2, $ops ) and ( $ops_r[ $op ] ? $ops_p[ $op ] < $ops_p[ $o2 ] : $ops_p[ $op ] <= $ops_p[ $o2 ] ) ) {
+						$output[] = $stack->pop(); // pop stuff off the stack into the output
+					}
+					// many thanks: https://en.wikipedia.org/wiki/Reverse_Polish_notation#The_algorithm_in_detail
+					$stack->push( $op ); // finally put OUR operator onto the stack
+					$index++;
+					$expecting_op = false;
+					// ===============
+				} elseif ( ')' === $op && $expecting_op ) { // ready to close a parenthesis?
+					while ( ( $o2 = $stack->pop() ) != '(' ) { // pop off the stack back to the last (
+						if ( is_null( $o2 ) ) {
+							return self::trigger( "unexpected ')'" );
+						} else {
+							$output[] = $o2;
+						}
+					}
+					if ( preg_match( "/^([A-Za-z]\w*)\($/", $stack->last( 2 ), $matches ) ) { // did we just close a function?
+						$fnn = $matches[1]; // get the function name
+						$arg_count = $stack->pop(); // see how many arguments there were (cleverly stored on the stack, thank you)
+						$output[] = $stack->pop(); // pop the function and push onto the output
+						if ( in_array( $fnn, self::$fb ) ) { // check the argument count
+							if ( $arg_count > 1 ) {
+								return self::trigger( "too many arguments ($arg_count given, 1 expected)" );
+							}
+						} elseif ( array_key_exists( $fnn, self::$f ) ) {
+							if ( count( self::$f[ $fnn ]['args'] ) != $arg_count ) {
+								return self::trigger( "wrong number of arguments ($arg_count given, " . count( self::$f[ $fnn ]['args'] ) . " expected)" );
+							}
+						} else { // did we somehow push a non-function on the stack? this should never happen
+							return self::trigger( "internal error" );
+						}
+					}
+					$index++;
+					// ===============
+				} elseif ( ',' === $op and $expecting_op ) { // did we just finish a function argument?
+					while ( ( $o2 = $stack->pop() ) != '(' ) {
+						if ( is_null( $o2 ) ) {
+							return self::trigger( "unexpected ','" ); // oops, never had a (
+						} else {
+							$output[] = $o2; // pop the argument expression stuff and push onto the output
+						}
+					}
+					// make sure there was a function
+					if ( ! preg_match( "/^([A-Za-z]\w*)\($/", $stack->last( 2 ), $matches ) ) {
+						return self::trigger( "unexpected ','" );
+					}
+					$stack->push( $stack->pop() + 1 ); // increment the argument count
+					$stack->push( '(' ); // put the ( back on, we'll need to pop back to it again
+					$index++;
+					$expecting_op = false;
+					// ===============
+				} elseif ( '(' === $op and ! $expecting_op ) {
+					$stack->push( '(' ); // that was easy
+					$index++;
+					// ===============
+				} elseif ( $ex and ! $expecting_op ) { // do we now have a function/variable/number?
+					$expecting_op = true;
+					$val = $match[1];
+					if ( preg_match( "/^([A-Za-z]\w*)\($/", $val, $matches ) ) { // may be func, or variable w/ implicit multiplication against parentheses...
+						if ( in_array( $matches[1], self::$fb ) or array_key_exists( $matches[1], self::$f ) ) { // it's a func
+							$stack->push( $val );
+							$stack->push( 1 );
+							$stack->push( '(' );
+							$expecting_op = false;
+						} else { // it's a var w/ implicit multiplication
+							$val = $matches[1];
+							$output[] = $val;
+						}
+					} else { // it's a plain old var or num
+						$output[] = $val;
+					}
+					$index += strlen( $val );
+					// ===============
+				} elseif ( ')' === $op ) { // miscellaneous error checking
+					return self::trigger( "unexpected ')'" );
+				} elseif ( in_array( $op, $ops ) and ! $expecting_op ) {
+					return self::trigger( "unexpected operator '$op'" );
+				} else { // I don't even want to know what you did to get here
+					return self::trigger( "an unexpected error occurred" );
+				}
+				if ( strlen( $expr ) == $index ) {
+					if ( in_array( $op, $ops ) ) { // did we end with an operator? bad.
+						return self::trigger( "operator '$op' lacks operand" );
+					} else {
+						break;
+					}
+				}
+				while ( substr( $expr, $index, 1 ) == ' ' ) { // step the index past whitespace (pretty much turns whitespace
+					$index++;                             // into implicit multiplication if no operator is there)
+				}
+			}
+			while ( ! is_null( $op = $stack->pop() ) ) { // pop everything off the stack and push onto output
+				if ( '(' === $op ) {
+					return self::trigger( "expecting ')'" ); // if there are (s on the stack, ()s were unbalanced
+				}
+				$output[] = $op;
+			}
+			return $output;
+		}
+
+		/**
+		 * Evaluate postfix notation.
+		 *
+		 * @param  mixed $tokens
+		 * @param  array $vars
+		 *
+		 * @return mixed
+		 */
+		private static function pfx( $tokens, $vars = array() ) {
+			if ( false == $tokens ) {
+				return false;
+			}
+			$stack = new WC_Eval_Math_Stack;
+
+			foreach ( $tokens as $token ) { // nice and easy
+				// if the token is a binary operator, pop two values off the stack, do the operation, and push the result back on
+				if ( in_array( $token, array( '+', '-', '*', '/', '^' ) ) ) {
+					if ( is_null( $op2 = $stack->pop() ) ) {
+						return self::trigger( "internal error" );
+					}
+					if ( is_null( $op1 = $stack->pop() ) ) {
+						return self::trigger( "internal error" );
+					}
+					switch ( $token ) {
+						case '+':
+							$stack->push( $op1 + $op2 );
+							break;
+						case '-':
+							$stack->push( $op1 - $op2 );
+							break;
+						case '*':
+							$stack->push( $op1 * $op2 );
+							break;
+						case '/':
+							if ( 0 == $op2 ) {
+								return self::trigger( 'division by zero' );
+							}
+							$stack->push( $op1 / $op2 );
+							break;
+						case '^':
+							$stack->push( pow( $op1, $op2 ) );
+							break;
+					}
+					// if the token is a unary operator, pop one value off the stack, do the operation, and push it back on
+				} elseif ( '_' === $token ) {
+					$stack->push( -1 * $stack->pop() );
+					// if the token is a function, pop arguments off the stack, hand them to the function, and push the result back on
+				} elseif ( ! preg_match( "/^([a-z]\w*)\($/", $token, $matches ) ) {
+					if ( is_numeric( $token ) ) {
+						$stack->push( $token );
+					} elseif ( array_key_exists( $token, self::$v ) ) {
+						$stack->push( self::$v[ $token ] );
+					} elseif ( array_key_exists( $token, $vars ) ) {
+						$stack->push( $vars[ $token ] );
+					} else {
+						return self::trigger( "undefined variable '$token'" );
+					}
+				}
+			}
+			// when we're out of tokens, the stack should have a single element, the final result
+			if ( 1 != $stack->count ) {
+				return self::trigger( "internal error" );
+			}
+			return $stack->pop();
+		}
+
+		/**
+		 * Trigger an error, but nicely, if need be.
+		 *
+		 * @param  string $msg
+		 *
+		 * @return bool
+		 */
+		private static function trigger( $msg ) {
+			self::$last_error = $msg;
+			if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+				echo "\nError found in:";
+				self::debugPrintCallingFunction();
+				trigger_error( $msg, E_USER_WARNING );
+			}
+			return false;
+		}
+
+		/**
+		 * Prints the file name, function name, and
+		 * line number which called your function
+		 * (not this function, then one that  called
+		 * it to begin with)
+		 */
+		private static function debugPrintCallingFunction() {
+			$file = 'n/a';
+			$func = 'n/a';
+			$line = 'n/a';
+			$debugTrace = debug_backtrace();
+			if ( isset( $debugTrace[1] ) ) {
+				$file = $debugTrace[1]['file'] ? $debugTrace[1]['file'] : 'n/a';
+				$line = $debugTrace[1]['line'] ? $debugTrace[1]['line'] : 'n/a';
+			}
+			if ( isset( $debugTrace[2] ) ) {
+				$func = $debugTrace[2]['function'] ? $debugTrace[2]['function'] : 'n/a';
+			}
+			echo "\n$file, $func, $line\n";
+		}
+	}
+
+	/**
+	 * Class WC_Eval_Math_Stack.
+	 */
+	class WC_Eval_Math_Stack {
+
+		/**
+		 * Stack array.
+		 *
+		 * @var array
+		 */
+		public $stack = array();
+
+		/**
+		 * Stack counter.
+		 *
+		 * @var integer
+		 */
+		public $count = 0;
+
+		/**
+		 * Push value into stack.
+		 *
+		 * @param  mixed $val
+		 */
+		public function push( $val ) {
+			$this->stack[ $this->count ] = $val;
+			$this->count++;
+		}
+
+		/**
+		 * Pop value from stack.
+		 *
+		 * @return mixed
+		 */
+		public function pop() {
+			if ( $this->count > 0 ) {
+				$this->count--;
+				return $this->stack[ $this->count ];
+			}
+			return null;
+		}
+
+		/**
+		 * Get last value from stack.
+		 *
+		 * @param  int $n
+		 *
+		 * @return mixed
+		 */
+		public function last( $n=1 ) {
+			$key = $this->count - $n;
+			return array_key_exists( $key, $this->stack ) ? $this->stack[ $key ] : null;
+		}
+	}
+}
diff --git a/includes/libraries/wp-async-request.php b/includes/libraries/wp-async-request.php
new file mode 100644
index 00000000000..a49a5a26c83
--- /dev/null
+++ b/includes/libraries/wp-async-request.php
@@ -0,0 +1,158 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Abstract WP_Async_Request class.
+ *
+ * @package WP-Background-Processing
+ * @abstract
+ */
+abstract class WP_Async_Request {
+
+	/**
+	 * Prefix
+	 *
+	 * (default value: 'wp')
+	 *
+	 * @var string
+	 * @access protected
+	 */
+	protected $prefix = 'wp';
+
+	/**
+	 * Action
+	 *
+	 * (default value: 'async_request')
+	 *
+	 * @var string
+	 * @access protected
+	 */
+	protected $action = 'async_request';
+
+	/**
+	 * Identifier
+	 *
+	 * @var mixed
+	 * @access protected
+	 */
+	protected $identifier;
+
+	/**
+	 * Data
+	 *
+	 * (default value: array())
+	 *
+	 * @var array
+	 * @access protected
+	 */
+	protected $data = array();
+
+	/**
+	 * Initiate new async request
+	 */
+	public function __construct() {
+		$this->identifier = $this->prefix . '_' . $this->action;
+
+		add_action( 'wp_ajax_' . $this->identifier, array( $this, 'maybe_handle' ) );
+		add_action( 'wp_ajax_nopriv_' . $this->identifier, array( $this, 'maybe_handle' ) );
+	}
+
+	/**
+	 * Set data used during the request
+	 *
+	 * @param array $data Data.
+	 *
+	 * @return $this
+	 */
+	public function data( $data ) {
+		$this->data = $data;
+
+		return $this;
+	}
+
+	/**
+	 * Dispatch the async request
+	 *
+	 * @return array|WP_Error
+	 */
+	public function dispatch() {
+		$url  = add_query_arg( $this->get_query_args(), $this->get_query_url() );
+		$args = $this->get_post_args();
+
+		return wp_remote_post( esc_url_raw( $url ), $args );
+	}
+
+	/**
+	 * Get query args
+	 *
+	 * @return array
+	 */
+	protected function get_query_args() {
+		if ( property_exists( $this, 'query_args' ) ) {
+			return $this->query_args;
+		}
+
+		return array(
+			'action' => $this->identifier,
+			'nonce'  => wp_create_nonce( $this->identifier ),
+		);
+	}
+
+	/**
+	 * Get query URL
+	 *
+	 * @return string
+	 */
+	protected function get_query_url() {
+		if ( property_exists( $this, 'query_url' ) ) {
+			return $this->query_url;
+		}
+
+		return admin_url( 'admin-ajax.php' );
+	}
+
+	/**
+	 * Get post args
+	 *
+	 * @return array
+	 */
+	protected function get_post_args() {
+		if ( property_exists( $this, 'post_args' ) ) {
+			return $this->post_args;
+		}
+
+		return array(
+			'timeout'   => 0.01,
+			'blocking'  => false,
+			'body'      => $this->data,
+			'cookies'   => $_COOKIE,
+			'sslverify' => apply_filters( 'https_local_ssl_verify', false ),
+		);
+	}
+
+	/**
+	 * Maybe handle
+	 *
+	 * Check for correct nonce and pass to handler.
+	 */
+	public function maybe_handle() {
+		// Don't lock up other requests while processing
+		session_write_close();
+
+		check_ajax_referer( $this->identifier, 'nonce' );
+
+		$this->handle();
+
+		wp_die();
+	}
+
+	/**
+	 * Handle
+	 *
+	 * Override this method to perform any actions required
+	 * during the async request.
+	 */
+	abstract protected function handle();
+}
diff --git a/includes/libraries/wp-background-process.php b/includes/libraries/wp-background-process.php
new file mode 100644
index 00000000000..7756c278136
--- /dev/null
+++ b/includes/libraries/wp-background-process.php
@@ -0,0 +1,500 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Abstract WP_Background_Process class.
+ *
+ * @abstract
+ * @package WP-Background-Processing
+ * @extends WP_Async_Request
+ */
+abstract class WP_Background_Process extends WP_Async_Request {
+
+	/**
+	 * Action
+	 *
+	 * (default value: 'background_process')
+	 *
+	 * @var string
+	 * @access protected
+	 */
+	protected $action = 'background_process';
+
+	/**
+	 * Start time of current process.
+	 *
+	 * (default value: 0)
+	 *
+	 * @var int
+	 * @access protected
+	 */
+	protected $start_time = 0;
+
+	/**
+	 * Cron_hook_identifier
+	 *
+	 * @var mixed
+	 * @access protected
+	 */
+	protected $cron_hook_identifier;
+
+	/**
+	 * Cron_interval_identifier
+	 *
+	 * @var mixed
+	 * @access protected
+	 */
+	protected $cron_interval_identifier;
+
+	/**
+	 * Initiate new background process
+	 */
+	public function __construct() {
+		parent::__construct();
+
+		$this->cron_hook_identifier     = $this->identifier . '_cron';
+		$this->cron_interval_identifier = $this->identifier . '_cron_interval';
+
+		add_action( $this->cron_hook_identifier, array( $this, 'handle_cron_healthcheck' ) );
+		add_filter( 'cron_schedules', array( $this, 'schedule_cron_healthcheck' ) );
+	}
+
+	/**
+	 * Dispatch
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function dispatch() {
+		// Schedule the cron healthcheck.
+		$this->schedule_event();
+
+		// Perform remote post.
+		return parent::dispatch();
+	}
+
+	/**
+	 * Push to queue
+	 *
+	 * @param mixed $data Data.
+	 *
+	 * @return $this
+	 */
+	public function push_to_queue( $data ) {
+		$this->data[] = $data;
+
+		return $this;
+	}
+
+	/**
+	 * Save queue
+	 *
+	 * @return $this
+	 */
+	public function save() {
+		$key = $this->generate_key();
+
+		if ( ! empty( $this->data ) ) {
+			update_site_option( $key, $this->data );
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Update queue
+	 *
+	 * @param string $key Key.
+	 * @param array  $data Data.
+	 *
+	 * @return $this
+	 */
+	public function update( $key, $data ) {
+		if ( ! empty( $data ) ) {
+			update_site_option( $key, $data );
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Delete queue
+	 *
+	 * @param string $key Key.
+	 *
+	 * @return $this
+	 */
+	public function delete( $key ) {
+		delete_site_option( $key );
+
+		return $this;
+	}
+
+	/**
+	 * Generate key
+	 *
+	 * Generates a unique key based on microtime. Queue items are
+	 * given a unique key so that they can be merged upon save.
+	 *
+	 * @param int $length Length.
+	 *
+	 * @return string
+	 */
+	protected function generate_key( $length = 64 ) {
+		$unique  = md5( microtime() . rand() );
+		$prepend = $this->identifier . '_batch_';
+
+		return substr( $prepend . $unique, 0, $length );
+	}
+
+	/**
+	 * Maybe process queue
+	 *
+	 * Checks whether data exists within the queue and that
+	 * the process is not already running.
+	 */
+	public function maybe_handle() {
+		// Don't lock up other requests while processing
+		session_write_close();
+
+		if ( $this->is_process_running() ) {
+			// Background process already running.
+			wp_die();
+		}
+
+		if ( $this->is_queue_empty() ) {
+			// No data to process.
+			wp_die();
+		}
+
+		check_ajax_referer( $this->identifier, 'nonce' );
+
+		$this->handle();
+
+		wp_die();
+	}
+
+	/**
+	 * Is queue empty
+	 *
+	 * @return bool
+	 */
+	protected function is_queue_empty() {
+		global $wpdb;
+
+		$table  = $wpdb->options;
+		$column = 'option_name';
+
+		if ( is_multisite() ) {
+			$table  = $wpdb->sitemeta;
+			$column = 'meta_key';
+		}
+
+		$key = $this->identifier . '_batch_%';
+
+		$count = $wpdb->get_var( $wpdb->prepare( "
+		SELECT COUNT(*)
+		FROM {$table}
+		WHERE {$column} LIKE %s
+	", $key ) );
+
+		return ( $count > 0 ) ? false : true;
+	}
+
+	/**
+	 * Is process running
+	 *
+	 * Check whether the current process is already running
+	 * in a background process.
+	 */
+	protected function is_process_running() {
+		if ( get_site_transient( $this->identifier . '_process_lock' ) ) {
+			// Process already running.
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Lock process
+	 *
+	 * Lock the process so that multiple instances can't run simultaneously.
+	 * Override if applicable, but the duration should be greater than that
+	 * defined in the time_exceeded() method.
+	 */
+	protected function lock_process() {
+		$this->start_time = time(); // Set start time of current process.
+
+		$lock_duration = ( property_exists( $this, 'queue_lock_time' ) ) ? $this->queue_lock_time : 60; // 1 minute
+		$lock_duration = apply_filters( $this->identifier . '_queue_lock_time', $lock_duration );
+
+		set_site_transient( $this->identifier . '_process_lock', microtime(), $lock_duration );
+	}
+
+	/**
+	 * Unlock process
+	 *
+	 * Unlock the process so that other instances can spawn.
+	 *
+	 * @return $this
+	 */
+	protected function unlock_process() {
+		delete_site_transient( $this->identifier . '_process_lock' );
+
+		return $this;
+	}
+
+	/**
+	 * Get batch
+	 *
+	 * @return stdClass Return the first batch from the queue
+	 */
+	protected function get_batch() {
+		global $wpdb;
+
+		$table        = $wpdb->options;
+		$column       = 'option_name';
+		$key_column   = 'option_id';
+		$value_column = 'option_value';
+
+		if ( is_multisite() ) {
+			$table        = $wpdb->sitemeta;
+			$column       = 'meta_key';
+			$key_column   = 'meta_id';
+			$value_column = 'meta_value';
+		}
+
+		$key = $this->identifier . '_batch_%';
+
+		$query = $wpdb->get_row( $wpdb->prepare( "
+		SELECT *
+		FROM {$table}
+		WHERE {$column} LIKE %s
+		ORDER BY {$key_column} ASC
+		LIMIT 1
+		", $key ) );
+
+		$batch       = new stdClass();
+		$batch->key  = $query->$column;
+		$batch->data = maybe_unserialize( $query->$value_column );
+
+		return $batch;
+	}
+
+	/**
+	 * Handle
+	 *
+	 * Pass each queue item to the task handler, while remaining
+	 * within server memory and time limit constraints.
+	 */
+	protected function handle() {
+		$this->lock_process();
+
+		do {
+			$batch = $this->get_batch();
+
+			foreach ( $batch->data as $key => $value ) {
+				$task = $this->task( $value );
+
+				if ( false !== $task ) {
+					$batch->data[ $key ] = $task;
+				} else {
+					unset( $batch->data[ $key ] );
+				}
+
+				if ( $this->time_exceeded() || $this->memory_exceeded() ) {
+					// Batch limits reached.
+					break;
+				}
+			}
+
+			// Update or delete current batch.
+			if ( ! empty( $batch->data ) ) {
+				$this->update( $batch->key, $batch->data );
+			} else {
+				$this->delete( $batch->key );
+			}
+		} while ( ! $this->time_exceeded() && ! $this->memory_exceeded() && ! $this->is_queue_empty() );
+
+		$this->unlock_process();
+
+		// Start next batch or complete process.
+		if ( ! $this->is_queue_empty() ) {
+			$this->dispatch();
+		} else {
+			$this->complete();
+		}
+	}
+
+	/**
+	 * Memory exceeded
+	 *
+	 * Ensures the batch process never exceeds 90%
+	 * of the maximum WordPress memory.
+	 *
+	 * @return bool
+	 */
+	protected function memory_exceeded() {
+		$memory_limit   = $this->get_memory_limit() * 0.9; // 90% of max memory
+		$current_memory = memory_get_usage( true );
+		$return         = false;
+
+		if ( $current_memory >= $memory_limit ) {
+			$return = true;
+		}
+
+		return apply_filters( $this->identifier . '_memory_exceeded', $return );
+	}
+
+	/**
+	 * Get memory limit
+	 *
+	 * @return int
+	 */
+	protected function get_memory_limit() {
+		if ( function_exists( 'ini_get' ) ) {
+			$memory_limit = ini_get( 'memory_limit' );
+		} else {
+			// Sensible default.
+			$memory_limit = '128M';
+		}
+
+		if ( ! $memory_limit || -1 === $memory_limit ) {
+			// Unlimited, set to 32GB.
+			$memory_limit = '32000M';
+		}
+
+		return intval( $memory_limit ) * 1024 * 1024;
+	}
+
+	/**
+	 * Time exceeded.
+	 *
+	 * Ensures the batch never exceeds a sensible time limit.
+	 * A timeout limit of 30s is common on shared hosting.
+	 *
+	 * @return bool
+	 */
+	protected function time_exceeded() {
+		$finish = $this->start_time + apply_filters( $this->identifier . '_default_time_limit', 20 ); // 20 seconds
+		$return = false;
+
+		if ( time() >= $finish ) {
+			$return = true;
+		}
+
+		return apply_filters( $this->identifier . '_time_exceeded', $return );
+	}
+
+	/**
+	 * Complete.
+	 *
+	 * Override if applicable, but ensure that the below actions are
+	 * performed, or, call parent::complete().
+	 */
+	protected function complete() {
+		// Unschedule the cron healthcheck.
+		$this->clear_scheduled_event();
+	}
+
+	/**
+	 * Schedule cron healthcheck
+	 *
+	 * @access public
+	 * @param mixed $schedules Schedules.
+	 * @return mixed
+	 */
+	public function schedule_cron_healthcheck( $schedules ) {
+		$interval = apply_filters( $this->identifier . '_cron_interval', 5 );
+
+		if ( property_exists( $this, 'cron_interval' ) ) {
+			$interval = apply_filters( $this->identifier . '_cron_interval', $this->cron_interval_identifier );
+		}
+
+		// Adds every 5 minutes to the existing schedules.
+		$schedules[ $this->identifier . '_cron_interval' ] = array(
+			'interval' => MINUTE_IN_SECONDS * $interval,
+			'display'  => sprintf( __( 'Every %d minutes', 'woocommerce' ), $interval ),
+		);
+
+		return $schedules;
+	}
+
+	/**
+	 * Handle cron healthcheck
+	 *
+	 * Restart the background process if not already running
+	 * and data exists in the queue.
+	 */
+	public function handle_cron_healthcheck() {
+		if ( $this->is_process_running() ) {
+			// Background process already running.
+			exit;
+		}
+
+		if ( $this->is_queue_empty() ) {
+			// No data to process.
+			$this->clear_scheduled_event();
+			exit;
+		}
+
+		$this->handle();
+
+		exit;
+	}
+
+	/**
+	 * Schedule event
+	 */
+	protected function schedule_event() {
+		if ( ! wp_next_scheduled( $this->cron_hook_identifier ) ) {
+			wp_schedule_event( time(), $this->cron_interval_identifier, $this->cron_hook_identifier );
+		}
+	}
+
+	/**
+	 * Clear scheduled event
+	 */
+	protected function clear_scheduled_event() {
+		$timestamp = wp_next_scheduled( $this->cron_hook_identifier );
+
+		if ( $timestamp ) {
+			wp_unschedule_event( $timestamp, $this->cron_hook_identifier );
+		}
+	}
+
+	/**
+	 * Cancel Process
+	 *
+	 * Stop processing queue items, clear cronjob and delete batch.
+	 *
+	 */
+	public function cancel_process() {
+		if ( ! $this->is_queue_empty() ) {
+			$batch = $this->get_batch();
+
+			$this->delete( $batch->key );
+
+			wp_clear_scheduled_hook( $this->cron_hook_identifier );
+		}
+
+	}
+
+	/**
+	 * Task
+	 *
+	 * Override this method to perform any actions required on each
+	 * queue item. Return the modified item for further processing
+	 * in the next pass through. Or, return false to remove the
+	 * item from the queue.
+	 *
+	 * @param mixed $item Queue item to iterate over.
+	 *
+	 * @return mixed
+	 */
+	abstract protected function task( $item );
+
+}
diff --git a/includes/log-handlers/class-wc-log-handler-db.php b/includes/log-handlers/class-wc-log-handler-db.php
new file mode 100644
index 00000000000..ef17fde9b3a
--- /dev/null
+++ b/includes/log-handlers/class-wc-log-handler-db.php
@@ -0,0 +1,153 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+
+/**
+ * Handles log entries by writing to database.
+ *
+ * @class          WC_Log_Handler_DB
+ * @version        1.0.0
+ * @package        WooCommerce/Classes/Log_Handlers
+ * @category       Class
+ * @author         WooThemes
+ */
+class WC_Log_Handler_DB extends WC_Log_Handler {
+
+	/**
+	 * Handle a log entry.
+	 *
+	 * @param int $timestamp Log timestamp.
+	 * @param string $level emergency|alert|critical|error|warning|notice|info|debug
+	 * @param string $message Log message.
+	 * @param array $context {
+	 *     Additional information for log handlers.
+	 *
+	 *     @type string $source Optional. Source will be available in log table.
+	 *                  If no source is provided, attempt to provide sensible default.
+	 * }
+	 *
+	 * @see WC_Log_Handler_DB::get_log_source() for default source.
+	 *
+	 * @return bool False if value was not handled and true if value was handled.
+	 */
+	public function handle( $timestamp, $level, $message, $context ) {
+
+		if ( isset( $context['source'] ) && $context['source'] ) {
+			$source = $context['source'];
+		} else {
+			$source = $this->get_log_source();
+		}
+
+		return $this->add( $timestamp, $level, $message, $source, $context );
+	}
+
+	/**
+	 * Add a log entry to chosen file.
+	 *
+	 * @param int $timestamp Log timestamp.
+	 * @param string $level emergency|alert|critical|error|warning|notice|info|debug
+	 * @param string $message Log message.
+	 * @param string $source Log source. Useful for filtering and sorting.
+	 * @param array $context {
+	 *     Context will be serialized and stored in database.
+	 * }
+	 *
+	 * @return bool True if write was successful.
+	 */
+	protected static function add( $timestamp, $level, $message, $source, $context ) {
+		global $wpdb;
+
+		$insert = array(
+			'timestamp' => date( 'Y-m-d H:i:s', $timestamp ),
+			'level' => WC_Log_Levels::get_level_severity( $level ),
+			'message' => $message,
+			'source' => $source,
+		);
+
+		$format = array(
+			'%s',
+			'%d',
+			'%s',
+			'%s',
+			'%s', // possible serialized context
+		);
+
+		if ( ! empty( $context ) ) {
+			$insert['context'] = serialize( $context );
+		}
+
+		return false !== $wpdb->insert( "{$wpdb->prefix}woocommerce_log", $insert, $format );
+	}
+
+	/**
+	 * Clear all logs from the DB.
+	 *
+	 * @return bool True if flush was successful.
+	 */
+	public static function flush() {
+		global $wpdb;
+
+		return $wpdb->query( "TRUNCATE TABLE {$wpdb->prefix}woocommerce_log" );
+	}
+
+	/**
+	 * Delete selected logs from DB.
+	 *
+	 * @param int|string|array Log ID or array of Log IDs to be deleted.
+	 *
+	 * @return bool
+	 */
+	public static function delete( $log_ids ) {
+		global $wpdb;
+
+		if ( ! is_array( $log_ids ) ) {
+			$log_ids = array( $log_ids );
+		}
+
+		$format = array_fill( 0, count( $log_ids ), '%d' );
+
+		$query_in = '(' . implode( ',', $format ) . ')';
+
+		$query = $wpdb->prepare(
+			"DELETE FROM {$wpdb->prefix}woocommerce_log WHERE log_id IN {$query_in}",
+			$log_ids
+		);
+
+		return $wpdb->query( $query );
+	}
+
+	/**
+	 * Get appropriate source based on file name.
+	 *
+	 * Try to provide an appropriate source in case none is provided.
+	 *
+	 * @return string Text to use as log source. "" (empty string) if none is found.
+	 */
+	protected static function get_log_source() {
+		static $ignore_files = array( 'class-wc-log-handler-db', 'class-wc-logger' );
+
+		/**
+		 * PHP < 5.3.6 correct behavior
+		 * @see http://php.net/manual/en/function.debug-backtrace.php#refsect1-function.debug-backtrace-parameters
+		 */
+		if ( defined( 'DEBUG_BACKTRACE_IGNORE_ARGS' ) ) {
+			$debug_backtrace_arg = DEBUG_BACKTRACE_IGNORE_ARGS;
+		} else {
+			$debug_backtrace_arg = false;
+		}
+
+		$trace = debug_backtrace( $debug_backtrace_arg );
+		foreach ( $trace as $t ) {
+			if ( isset( $t['file'] ) ) {
+				$filename = pathinfo( $t['file'], PATHINFO_FILENAME );
+				if ( ! in_array( $filename, $ignore_files ) ) {
+					return $filename;
+				}
+			}
+		}
+
+		return '';
+	}
+
+}
diff --git a/includes/log-handlers/class-wc-log-handler-email.php b/includes/log-handlers/class-wc-log-handler-email.php
new file mode 100644
index 00000000000..cc7bfd8a16b
--- /dev/null
+++ b/includes/log-handlers/class-wc-log-handler-email.php
@@ -0,0 +1,216 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+
+/**
+ * Handles log entries by sending an email.
+ *
+ * WARNING!
+ * This log handler has known limitations.
+ *
+ * Log messages are aggregated and sent once per request (if necessary). If the site experiences a
+ * problem, the log email may never be sent. This handler should be used with another handler which
+ * stores logs in order to prevent loss.
+ *
+ * It is not recommended to use this handler on a high traffic site. There will be a maximum of 1
+ * email sent per request per handler, but that could still be a dangerous amount of emails under
+ * heavy traffic. Do not confuse this handler with an appropriate monitoring solution!
+ *
+ * If you understand these limitations, feel free to use this handler or borrow parts of the design
+ * to implement your own!
+ *
+ * @class          WC_Log_Handler_Email
+ * @version        1.0.0
+ * @package        WooCommerce/Classes/Log_Handlers
+ * @category       Class
+ * @author         WooThemes
+ */
+class WC_Log_Handler_Email extends WC_Log_Handler {
+
+	/**
+	 * Minimum log level this handler will process.
+	 *
+	 * @var int Integer representation of minimum log level to handle.
+	 */
+	protected $threshold;
+
+	/**
+	 * Stores email recipients.
+	 *
+	 * @var array
+	 */
+	protected $recipients = array();
+
+	/**
+	 * Stores log messages.
+	 *
+	 * @var array
+	 */
+	protected $logs = array();
+
+	/**
+	 * Stores integer representation of maximum logged level.
+	 *
+	 * @var int
+	 */
+	protected $max_severity = null;
+
+	/**
+	 * Constructor for log handler.
+	 *
+	 * @param string|array $recipients Optional. Email(s) to receive log messages. Defaults to site admin email.
+	 * @param string $threshold Optional. Minimum level that should receive log messages.
+	 *     Default 'alert'. One of: emergency|alert|critical|error|warning|notice|info|debug
+	 */
+	public function __construct( $recipients = null, $threshold = 'alert' ) {
+		if ( null === $recipients ) {
+			$recipients = get_option( 'admin_email' );
+		}
+
+		if ( is_array( $recipients ) ) {
+			foreach ( $recipients as $recipient ) {
+				$this->add_email( $recipient );
+			}
+		} else {
+			$this->add_email( $recipients );
+		}
+
+		$this->set_threshold( $threshold );
+		add_action( 'shutdown', array( $this, 'send_log_email' ) );
+	}
+
+	/**
+	 * Set handler severity threshold.
+	 *
+	 * @param string $level emergency|alert|critical|error|warning|notice|info|debug
+	 */
+	public function set_threshold( $level ) {
+		$this->threshold = WC_Log_Levels::get_level_severity( $level );
+	}
+
+	/**
+	 * Determine whether handler should handle log.
+	 *
+	 * @param string $level emergency|alert|critical|error|warning|notice|info|debug
+	 * @return bool True if the log should be handled.
+	 */
+	protected function should_handle( $level ) {
+		return $this->threshold <= WC_Log_Levels::get_level_severity( $level );
+	}
+
+	/**
+	 * Handle a log entry.
+	 *
+	 * @param int $timestamp Log timestamp.
+	 * @param string $level emergency|alert|critical|error|warning|notice|info|debug
+	 * @param string $message Log message.
+	 * @param array $context Optional. Additional information for log handlers.
+	 *
+	 * @return bool False if value was not handled and true if value was handled.
+	 */
+	public function handle( $timestamp, $level, $message, $context ) {
+
+		if ( $this->should_handle( $level ) ) {
+			$this->add_log( $timestamp, $level, $message, $context );
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Send log email.
+	 *
+	 * @return bool True if email is successfully sent otherwise false.
+	 */
+	public function send_log_email() {
+		$result = false;
+
+		if ( ! empty( $this->logs ) ) {
+			$subject = $this->get_subject();
+			$body = $this->get_body();
+			$result = wp_mail( $this->recipients, $subject, $body );
+			$this->clear_logs();
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Build subject for log email.
+	 *
+	 * @return string subject
+	 */
+	protected function get_subject() {
+		$site_name = get_bloginfo( 'name' );
+		$max_level = strtoupper( WC_Log_Levels::get_severity_level( $this->max_severity ) );
+		$log_count = count( $this->logs );
+
+		return sprintf(
+			_n(
+				'[%1$s] %2$s: %3$s WooCommerce log message',
+				'[%1$s] %2$s: %3$s WooCommerce log messages',
+				$log_count,
+				'woocommerce'
+			),
+			$site_name,
+			$max_level,
+			$log_count
+		);
+	}
+
+	/**
+	 * Build body for log email.
+	 *
+	 * @return string body
+	 */
+	protected function get_body() {
+		$site_name = get_bloginfo( 'name' );
+		$entries = implode( PHP_EOL, $this->logs );
+		$log_count = count( $this->logs );
+		return _n(
+				'You have received the following WooCommerce log message:',
+				'You have received the following WooCommerce log messages:',
+				$log_count,
+				'woocommerce'
+			)
+			. PHP_EOL
+			. PHP_EOL
+			. $entries
+			. PHP_EOL
+			. PHP_EOL
+			. sprintf( __( 'Visit %s admin area:', 'woocommerce' ), $site_name )
+			. PHP_EOL
+			. admin_url();
+	}
+
+	/**
+	 * Adds an email to the list of recipients.
+	 *
+	 * @param string email Email address to add
+	 */
+	public function add_email( $email ) {
+		array_push( $this->recipients, $email );
+	}
+
+	/**
+	 * Add log message.
+	 */
+	protected function add_log( $timestamp, $level, $message, $context ) {
+		$this->logs[] = $this->format_entry( $timestamp, $level, $message, $context );
+
+		$log_severity = WC_Log_Levels::get_level_severity( $level );
+		if ( $this->max_severity < $log_severity ) {
+			$this->max_severity = $log_severity;
+		}
+	}
+
+	/**
+	 * Clear log messages.
+	 */
+	protected function clear_logs() {
+		$this->logs = array();
+	}
+
+}
diff --git a/includes/log-handlers/class-wc-log-handler-file.php b/includes/log-handlers/class-wc-log-handler-file.php
new file mode 100644
index 00000000000..c13afb4eca7
--- /dev/null
+++ b/includes/log-handlers/class-wc-log-handler-file.php
@@ -0,0 +1,372 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+
+/**
+ * Handles log entries by writing to a file.
+ *
+ * @class          WC_Log_Handler_File
+ * @version        1.0.0
+ * @package        WooCommerce/Classes/Log_Handlers
+ * @category       Class
+ * @author         WooThemes
+ */
+class WC_Log_Handler_File extends WC_Log_Handler {
+
+	/**
+	 * Stores open file handles.
+	 *
+	 * @var array
+	 */
+	protected $handles = array();
+
+	/**
+	 * File size limit for log files in bytes.
+	 *
+	 * @var int
+	 */
+	protected $log_size_limit;
+
+	/**
+	 * Cache logs that could not be written.
+	 *
+	 * If a log is written too early in the request, pluggable functions may be unavailable. These
+	 * logs will be cached and written on 'plugins_loaded' action.
+	 *
+	 * @var array
+	 */
+	protected $cached_logs = array();
+
+	/**
+	 * Constructor for the logger.
+	 *
+	 * @param int $log_size_limit Optional. Size limit for log files. Default 5mb.
+	 */
+	public function __construct( $log_size_limit = null ) {
+
+		if ( null === $log_size_limit ) {
+			$log_size_limit = 5 * 1024 * 1024;
+		}
+
+		$this->log_size_limit = $log_size_limit;
+
+		add_action( 'plugins_loaded', array( $this, 'write_cached_logs' ) );
+	}
+
+	/**
+	 * Destructor.
+	 *
+	 * Cleans up open file handles.
+	 */
+	public function __destruct() {
+		foreach ( $this->handles as $handle ) {
+			if ( is_resource( $handle ) ) {
+				fclose( $handle );
+			}
+		}
+	}
+
+	/**
+	 * Handle a log entry.
+	 *
+	 * @param int $timestamp Log timestamp.
+	 * @param string $level emergency|alert|critical|error|warning|notice|info|debug
+	 * @param string $message Log message.
+	 * @param array $context {
+	 *     Additional information for log handlers.
+	 *
+	 *     @type string $source Optional. Determines log file to write to. Default 'log'.
+	 *     @type bool $_legacy Optional. Default false. True to use outdated log format
+	 *         originally used in deprecated WC_Logger::add calls.
+	 * }
+	 *
+	 * @return bool False if value was not handled and true if value was handled.
+	 */
+	public function handle( $timestamp, $level, $message, $context ) {
+
+		if ( isset( $context['source'] ) && $context['source'] ) {
+			$handle = $context['source'];
+		} else {
+			$handle = 'log';
+		}
+
+		$entry = self::format_entry( $timestamp, $level, $message, $context );
+
+		return $this->add( $entry, $handle );
+	}
+
+	/**
+	 * Builds a log entry text from timestamp, level and message.
+	 *
+	 * @param int $timestamp Log timestamp.
+	 * @param string $level emergency|alert|critical|error|warning|notice|info|debug
+	 * @param string $message Log message.
+	 * @param array $context Additional information for log handlers.
+	 *
+	 * @return string Formatted log entry.
+	 */
+	protected static function format_entry( $timestamp, $level, $message, $context ) {
+
+		if ( isset( $context['_legacy'] ) && true === $context['_legacy'] ) {
+			if ( isset( $context['source'] ) && $context['source'] ) {
+				$handle = $context['source'];
+			} else {
+				$handle = 'log';
+			}
+			$message = apply_filters( 'woocommerce_logger_add_message', $message, $handle );
+			$time = date_i18n( 'm-d-Y @ H:i:s' );
+			$entry = "{$time} - {$message}";
+		} else {
+			$entry = parent::format_entry( $timestamp, $level, $message, $context );
+		}
+
+		return $entry;
+	}
+
+	/**
+	 * Open log file for writing.
+	 *
+	 * @param string $handle Log handle.
+	 * @param string $mode Optional. File mode. Default 'a'.
+	 * @return bool Success.
+	 */
+	protected function open( $handle, $mode = 'a' ) {
+		if ( $this->is_open( $handle ) ) {
+			return true;
+		}
+
+		$file = self::get_log_file_path( $handle );
+
+		if ( $file ) {
+			if ( ! file_exists( $file ) ) {
+				$temphandle = @fopen( $file, 'w+' );
+				@fclose( $temphandle );
+
+				if ( defined( 'FS_CHMOD_FILE' ) ) {
+					@chmod( $file, FS_CHMOD_FILE );
+				}
+			}
+
+			if ( $resource = @fopen( $file, $mode ) ) {
+				$this->handles[ $handle ] = $resource;
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Check if a handle is open.
+	 *
+	 * @param string $handle Log handle.
+	 * @return bool True if $handle is open.
+	 */
+	protected function is_open( $handle ) {
+		return array_key_exists( $handle, $this->handles ) && is_resource( $this->handles[ $handle ] );
+	}
+
+	/**
+	 * Close a handle.
+	 *
+	 * @param string $handle
+	 * @return bool success
+	 */
+	protected function close( $handle ) {
+		$result = false;
+
+		if ( $this->is_open( $handle ) ) {
+			$result = fclose( $this->handles[ $handle ] );
+			unset( $this->handles[ $handle ] );
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Add a log entry to chosen file.
+	 *
+	 * @param string $entry Log entry text
+	 * @param string $handle Log entry handle
+	 *
+	 * @return bool True if write was successful.
+	 */
+	protected function add( $entry, $handle ) {
+		$result = false;
+
+		if ( $this->should_rotate( $handle ) ) {
+			$this->log_rotate( $handle );
+		}
+
+		if ( $this->open( $handle ) && is_resource( $this->handles[ $handle ] ) ) {
+			$result = fwrite( $this->handles[ $handle ], $entry . PHP_EOL );
+		} else {
+			$this->cache_log( $entry, $handle );
+		}
+
+		return false !== $result;
+	}
+
+	/**
+	 * Clear entries from chosen file.
+	 *
+	 * @param string $handle
+	 *
+	 * @return bool
+	 */
+	public function clear( $handle ) {
+		$result = false;
+
+		// Close the file if it's already open.
+		$this->close( $handle );
+
+		/**
+		 * $this->open( $handle, 'w' ) == Open the file for writing only. Place the file pointer at
+		 * the beginning of the file, and truncate the file to zero length.
+		 */
+		if ( $this->open( $handle, 'w' ) && is_resource( $this->handles[ $handle ] ) ) {
+			$result = true;
+		}
+
+		do_action( 'woocommerce_log_clear', $handle );
+
+		return $result;
+	}
+
+	/**
+	 * Remove/delete the chosen file.
+	 *
+	 * @param string $handle
+	 *
+	 * @return bool
+	 */
+	public function remove( $handle ) {
+		$removed = false;
+		$file    = self::get_log_file_path( $handle );
+
+		if ( $file ) {
+			if ( is_file( $file ) && is_writable( $file ) ) {
+				$this->close( $handle ); // Close first to be certain no processes keep it alive after it is unlinked.
+				$removed = unlink( $file );
+			}
+			do_action( 'woocommerce_log_remove', $handle, $removed );
+		}
+
+		return $removed;
+	}
+
+	/**
+	 * Check if log file should be rotated.
+	 *
+	 * Compares the size of the log file to determine whether it is over the size limit.
+	 *
+	 * @param string $handle Log handle
+	 * @return bool True if if should be rotated.
+	 */
+	protected function should_rotate( $handle ) {
+		$file = self::get_log_file_path( $handle );
+		if ( $file ) {
+			if ( $this->is_open( $handle ) ) {
+				$file_stat = fstat( $this->handles[ $handle ] );
+				return $file_stat['size'] > $this->log_size_limit;
+			} elseif ( file_exists( $file ) ) {
+				return filesize( $file ) > $this->log_size_limit;
+			} else {
+				return false;
+			}
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Rotate log files.
+	 *
+	 * Logs are rotatated by prepending '.x' to the '.log' suffix.
+	 * The current log plus 10 historical logs are maintained.
+	 * For example:
+	 *     base.9.log -> [ REMOVED ]
+	 *     base.8.log -> base.9.log
+	 *     ...
+	 *     base.0.log -> base.1.log
+	 *     base.log   -> base.0.log
+	 *
+	 * @param string $handle Log handle
+	 */
+	protected function log_rotate( $handle ) {
+		for ( $i = 8; $i >= 0; $i-- ) {
+			$this->increment_log_infix( $handle, $i );
+		}
+		$this->increment_log_infix( $handle );
+	}
+
+	/**
+	 * Increment a log file suffix.
+	 *
+	 * @param string $handle Log handle
+	 * @param null|int $number Optional. Default null. Log suffix number to be incremented.
+	 * @return bool True if increment was successful, otherwise false.
+	 */
+	protected function increment_log_infix( $handle, $number = null ) {
+		if ( null === $number ) {
+			$suffix = '';
+			$next_suffix = '.0';
+		} else {
+			$suffix = '.' . $number;
+			$next_suffix = '.' . ($number + 1);
+		}
+
+		$rename_from = self::get_log_file_path( "{$handle}{$suffix}" );
+		$rename_to = self::get_log_file_path( "{$handle}{$next_suffix}" );
+
+		if ( $this->is_open( $rename_from ) ) {
+			$this->close( $rename_from );
+		}
+
+		if ( is_writable( $rename_from ) ) {
+			return rename( $rename_from, $rename_to );
+		} else {
+			return false;
+		}
+
+	}
+
+	/**
+	 * Get a log file path.
+	 *
+	 * @param string $handle Log name.
+	 * @return bool|string The log file path or false if path cannot be determined.
+	 */
+	public static function get_log_file_path( $handle ) {
+		if ( function_exists( 'wp_hash' ) ) {
+			return trailingslashit( WC_LOG_DIR ) . sanitize_file_name( $handle . '-' . wp_hash( $handle ) . '.log' );
+		} else {
+			wc_doing_it_wrong( __METHOD__, __( 'This method should not be called before plugins_loaded.', 'woocommerce' ), '3.0' );
+			return false;
+		}
+	}
+
+	/**
+	 * Cache log to write later.
+	 *
+	 * @param string $entry Log entry text
+	 * @param string $handle Log entry handle
+	 */
+	protected function cache_log( $entry, $handle ) {
+		$this->cached_logs[] = array(
+			'entry' => $entry,
+			'handle' => $handle,
+		);
+	}
+
+	/**
+	 * Write cached logs.
+	 */
+	public function write_cached_logs() {
+		foreach ( $this->cached_logs as $log ) {
+			$this->add( $log['entry'], $log['handle'] );
+		}
+	}
+
+}
diff --git a/includes/payment-tokens/class-wc-payment-token-cc.php b/includes/payment-tokens/class-wc-payment-token-cc.php
new file mode 100644
index 00000000000..e4f503e0cb7
--- /dev/null
+++ b/includes/payment-tokens/class-wc-payment-token-cc.php
@@ -0,0 +1,186 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+
+/**
+ * WooCommerce Credit Card Payment Token.
+ *
+ * Representation of a payment token for credit cards.
+ *
+ * @class 		WC_Payment_Token_CC
+ * @version     3.0.0
+ * @since		2.6.0
+ * @category 	PaymentTokens
+ * @package 	WooCommerce/PaymentTokens
+ * @author		WooThemes
+ */
+class WC_Payment_Token_CC extends WC_Payment_Token {
+
+	/** @protected string Token Type String. */
+	protected $type = 'CC';
+
+	/**
+	 * Stores Credit Card payment token data.
+	 *
+	 * @var array
+	 */
+	protected $extra_data = array(
+		'last4'        => '',
+		'expiry_year'  => '',
+		'expiry_month' => '',
+		'card_type'    => '',
+	);
+
+	/**
+	 * Get type to display to user.
+	 *
+	 * @since  2.6.0
+	 * @param  string $deprecated Deprecated since WooCommerce 3.0
+	 * @return string
+	 */
+	public function get_display_name( $deprecated = '' ) {
+		/* translators: 1: credit card type 2: last 4 digits 3: expiry month 4: expiry year */
+		$display = sprintf(
+			__( '%1$s ending in %2$s (expires %3$s/%4$s)', 'woocommerce' ),
+			wc_get_credit_card_type_label( $this->get_card_type() ),
+			$this->get_last4(),
+			$this->get_expiry_month(),
+			substr( $this->get_expiry_year(), 2 )
+		);
+		return $display;
+	}
+
+	/**
+	 * Hook prefix
+	 *
+	 * @since 3.0.0
+	 */
+	protected function get_hook_prefix() {
+		return 'woocommerce_payment_token_cc_get_';
+	}
+
+	/**
+	 * Validate credit card payment tokens.
+	 *
+	 * These fields are required by all credit card payment tokens:
+	 * expiry_month  - string Expiration date (MM) for the card
+	 * expiry_year   - string Expiration date (YYYY) for the card
+	 * last4         - string Last 4 digits of the card
+	 * card_type     - string Card type (visa, mastercard, etc)
+	 *
+	 * @since 2.6.0
+	 * @return boolean True if the passed data is valid
+	 */
+	public function validate() {
+		if ( false === parent::validate() ) {
+			return false;
+		}
+
+		if ( ! $this->get_last4( 'edit' ) ) {
+			return false;
+		}
+
+		if ( ! $this->get_expiry_year( 'edit' ) ) {
+			return false;
+		}
+
+		if ( ! $this->get_expiry_month( 'edit' ) ) {
+			return false;
+		}
+
+		if ( ! $this->get_card_type( 'edit' ) ) {
+			return false;
+		}
+
+		if ( 4 !== strlen( $this->get_expiry_year( 'edit' ) ) ) {
+			return false;
+		}
+
+		if ( 2 !== strlen( $this->get_expiry_month( 'edit' ) ) ) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Returns the card type (mastercard, visa, ...).
+	 *
+	 * @since  2.6.0
+	 * @param  string $context
+	 * @return string Card type
+	 */
+	public function get_card_type( $context = 'view' ) {
+		return $this->get_prop( 'card_type', $context );
+	}
+
+	/**
+	 * Set the card type (mastercard, visa, ...).
+	 * @since 2.6.0
+	 * @param string $type
+	 */
+	public function set_card_type( $type ) {
+		$this->set_prop( 'card_type', $type );
+	}
+
+	/**
+	 * Returns the card expiration year (YYYY).
+	 *
+	 * @since  2.6.0
+	 * @param  string $context
+	 * @return string Expiration year
+	 */
+	public function get_expiry_year( $context = 'view' ) {
+		return $this->get_prop( 'expiry_year', $context );
+	}
+
+	/**
+	 * Set the expiration year for the card (YYYY format).
+	 * @since 2.6.0
+	 * @param string $year
+	 */
+	public function set_expiry_year( $year ) {
+		$this->set_prop( 'expiry_year', $year );
+	}
+
+	/**
+	 * Returns the card expiration month (MM).
+	 *
+	 * @since  2.6.0
+	 * @param  string $context
+	 * @return string Expiration month
+	 */
+	public function get_expiry_month( $context = 'view' ) {
+		return $this->get_prop( 'expiry_month', $context );
+	}
+
+	/**
+	 * Set the expiration month for the card (formats into MM format).
+	 * @since 2.6.0
+	 * @param string $month
+	 */
+	public function set_expiry_month( $month ) {
+		$this->set_prop( 'expiry_month', str_pad( $month, 2, '0', STR_PAD_LEFT ) );
+	}
+
+	/**
+	 * Returns the last four digits.
+	 *
+	 * @since  2.6.0
+	 * @param  string $context
+	 * @return string Last 4 digits
+	 */
+	public function get_last4( $context = 'view' ) {
+		return $this->get_prop( 'last4', $context );
+	}
+
+	/**
+	 * Set the last four digits.
+	 * @since 2.6.0
+	 * @param string $last4
+	 */
+	public function set_last4( $last4 ) {
+		$this->set_prop( 'last4', $last4 );
+	}
+}
diff --git a/includes/payment-tokens/class-wc-payment-token-echeck.php b/includes/payment-tokens/class-wc-payment-token-echeck.php
new file mode 100644
index 00000000000..24dae5955ef
--- /dev/null
+++ b/includes/payment-tokens/class-wc-payment-token-echeck.php
@@ -0,0 +1,92 @@
+<?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+
+/**
+ * WooCommerce eCheck Payment Token.
+ *
+ * Representation of a payment token for eChecks.
+ *
+ * @class 		WC_Payment_Token_eCheck
+ * @version     3.0.0
+ * @since		2.6.0
+ * @category 	PaymentTokens
+ * @package 	WooCommerce/PaymentTokens
+ * @author		WooThemes
+ */
+class WC_Payment_Token_eCheck extends WC_Payment_Token {
+
+	/** @protected string Token Type String. */
+	protected $type = 'eCheck';
+
+	/**
+	 * Stores eCheck payment token data.
+	 *
+	 * @var array
+	 */
+	protected $extra_data = array(
+		'last4' => '',
+	);
+
+	/**
+	 * Get type to display to user.
+	 *
+	 * @since  2.6.0
+	 * @param  string $deprecated Deprecated since WooCommerce 3.0
+	 * @return string
+	 */
+	public function get_display_name( $deprecated = '' ) {
+		return __( 'eCheck', 'woocommerce' );
+	}
+
+	/**
+	 * Hook prefix
+	 *
+	 * @since 3.0.0
+	 */
+	protected function get_hook_prefix() {
+		return 'woocommerce_payment_token_echeck_get_';
+	}
+
+	/**
+	 * Validate eCheck payment tokens.
+	 *
+	 * These fields are required by all eCheck payment tokens:
+	 * last4  - string Last 4 digits of the check
+	 *
+	 * @since 2.6.0
+	 * @return boolean True if the passed data is valid
+	 */
+	public function validate() {
+		if ( false === parent::validate() ) {
+			return false;
+		}
+
+		if ( ! $this->get_last4( 'edit' ) ) {
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Returns the last four digits.
+	 *
+	 * @since  2.6.0
+	 * @param  string $context
+	 * @return string Last 4 digits
+	 */
+	public function get_last4( $context = 'view' ) {
+		return $this->get_prop( 'last4', $context );
+	}
+
+	/**
+	 * Set the last four digits.
+	 * @since 2.6.0
+	 * @param string $last4
+	 */
+	public function set_last4( $last4 ) {
+		$this->set_prop( 'last4', $last4 );
+	}
+}
diff --git a/includes/shipping/flat-rate/class-wc-shipping-flat-rate.php b/includes/shipping/flat-rate/class-wc-shipping-flat-rate.php
index df24f82cff4..ba7394aeb58 100644
--- a/includes/shipping/flat-rate/class-wc-shipping-flat-rate.php
+++ b/includes/shipping/flat-rate/class-wc-shipping-flat-rate.php
@@ -7,7 +7,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  * Flat Rate Shipping Method.
  *
  * @class 		WC_Shipping_Flat_Rate
- * @version		2.4.0
+ * @version		2.6.0
  * @package		WooCommerce/Classes/Shipping
  * @author 		WooThemes
  */
@@ -19,39 +19,30 @@ class WC_Shipping_Flat_Rate extends WC_Shipping_Method {
 	/**
 	 * Constructor.
 	 */
-	public function __construct() {
-		$this->id                 = 'flat_rate';
-		$this->method_title       = __( 'Flat Rate', 'woocommerce' );
-		$this->method_description = __( 'Flat Rate Shipping lets you charge a fixed rate for shipping.', 'woocommerce' );
+	public function __construct( $instance_id = 0 ) {
+		$this->id                    = 'flat_rate';
+		$this->instance_id 			 = absint( $instance_id );
+		$this->method_title          = __( 'Flat rate', 'woocommerce' );
+		$this->method_description    = __( 'Lets you charge a fixed rate for shipping.', 'woocommerce' );
+		$this->supports              = array(
+			'shipping-zones',
+			'instance-settings',
+			'instance-settings-modal',
+		);
 		$this->init();
 
 		add_action( 'woocommerce_update_options_shipping_' . $this->id, array( $this, 'process_admin_options' ) );
-		add_action( 'woocommerce_flat_rate_shipping_add_rate', array( $this, 'calculate_extra_shipping' ), 10, 3 );
 	}
 
 	/**
-	 * init function.
+	 * init user set variables.
 	 */
 	public function init() {
-		// Load the settings.
-		$this->init_form_fields();
-		$this->init_settings();
-
-		// Define user set variables
-		$this->title        = $this->get_option( 'title' );
-		$this->availability = $this->get_option( 'availability' );
-		$this->countries    = $this->get_option( 'countries' );
-		$this->tax_status   = $this->get_option( 'tax_status' );
-		$this->cost         = $this->get_option( 'cost' );
-		$this->type         = $this->get_option( 'type', 'class' );
-		$this->options      = $this->get_option( 'options', false ); // @deprecated in 2.4.0
-	}
-
-	/**
-	 * Initialise Settings Form Fields.
-	 */
-	public function init_form_fields() {
-		$this->form_fields = include( 'includes/settings-flat-rate.php' );
+		$this->instance_form_fields = include( 'includes/settings-flat-rate.php' );
+		$this->title                = $this->get_option( 'title' );
+		$this->tax_status           = $this->get_option( 'tax_status' );
+		$this->cost                 = $this->get_option( 'cost' );
+		$this->type                 = $this->get_option( 'type', 'class' );
 	}
 
 	/**
@@ -61,11 +52,12 @@ class WC_Shipping_Flat_Rate extends WC_Shipping_Method {
 	 * @return string
 	 */
 	protected function evaluate_cost( $sum, $args = array() ) {
-		include_once( 'includes/class-wc-eval-math.php' );
-
-		$locale   = localeconv();
-		$decimals = array( wc_get_price_decimal_separator(), $locale['decimal_point'], $locale['mon_decimal_point'] );
+		include_once( WC()->plugin_path() . '/includes/libraries/class-wc-eval-math.php' );
 
+		// Allow 3rd parties to process shipping cost arguments
+		$args           = apply_filters( 'woocommerce_evaluate_shipping_cost_args', $args, $sum, $this );
+		$locale         = localeconv();
+		$decimals       = array( wc_get_price_decimal_separator(), $locale['decimal_point'], $locale['mon_decimal_point'], ',' );
 		$this->fee_cost = $args['cost'];
 
 		// Expand shortcodes
@@ -74,11 +66,11 @@ class WC_Shipping_Flat_Rate extends WC_Shipping_Method {
 		$sum = do_shortcode( str_replace(
 			array(
 				'[qty]',
-				'[cost]'
+				'[cost]',
 			),
 			array(
 				$args['qty'],
-				$args['cost']
+				$args['cost'],
 			),
 			$sum
 		) );
@@ -106,8 +98,9 @@ class WC_Shipping_Flat_Rate extends WC_Shipping_Method {
 	public function fee( $atts ) {
 		$atts = shortcode_atts( array(
 			'percent' => '',
-			'min_fee' => ''
-		), $atts );
+			'min_fee' => '',
+			'max_fee' => '',
+		), $atts, 'fee' );
 
 		$calculated_fee = 0;
 
@@ -119,6 +112,10 @@ class WC_Shipping_Flat_Rate extends WC_Shipping_Method {
 			$calculated_fee = $atts['min_fee'];
 		}
 
+		if ( $atts['max_fee'] && $calculated_fee > $atts['max_fee'] ) {
+			$calculated_fee = $atts['max_fee'];
+		}
+
 		return $calculated_fee;
 	}
 
@@ -129,53 +126,58 @@ class WC_Shipping_Flat_Rate extends WC_Shipping_Method {
 	 */
 	public function calculate_shipping( $package = array() ) {
 		$rate = array(
-			'id'    => $this->id,
-			'label' => $this->title,
-			'cost'  => 0,
+			'id'      => $this->get_rate_id(),
+			'label'   => $this->title,
+			'cost'    => 0,
+			'package' => $package,
 		);
 
 		// Calculate the costs
 		$has_costs = false; // True when a cost is set. False if all costs are blank strings.
 		$cost      = $this->get_option( 'cost' );
 
-		if ( $cost !== '' ) {
+		if ( '' !== $cost ) {
 			$has_costs    = true;
 			$rate['cost'] = $this->evaluate_cost( $cost, array(
 				'qty'  => $this->get_package_item_qty( $package ),
-				'cost' => $package['contents_cost']
+				'cost' => $package['contents_cost'],
 			) );
 		}
 
-		// Add shipping class costs
-		$found_shipping_classes = $this->find_shipping_classes( $package );
-		$highest_class_cost     = 0;
+		// Add shipping class costs.
+		$shipping_classes = WC()->shipping->get_shipping_classes();
 
-		foreach ( $found_shipping_classes as $shipping_class => $products ) {
-			// Also handles BW compatibility when slugs were used instead of ids
-			$shipping_class_term = get_term_by( 'slug', $shipping_class, 'product_shipping_class' );
-			$class_cost_string   = $shipping_class_term && $shipping_class_term->term_id ? $this->get_option( 'class_cost_' . $shipping_class_term->term_id, $this->get_option( 'class_cost_' . $shipping_class, '' ) ) : $this->get_option( 'no_class_cost', '' );
+		if ( ! empty( $shipping_classes ) ) {
+			$found_shipping_classes = $this->find_shipping_classes( $package );
+			$highest_class_cost     = 0;
 
-			if ( $class_cost_string === '' ) {
-				continue;
+			foreach ( $found_shipping_classes as $shipping_class => $products ) {
+				// Also handles BW compatibility when slugs were used instead of ids
+				$shipping_class_term = get_term_by( 'slug', $shipping_class, 'product_shipping_class' );
+				$class_cost_string   = $shipping_class_term && $shipping_class_term->term_id ? $this->get_option( 'class_cost_' . $shipping_class_term->term_id, $this->get_option( 'class_cost_' . $shipping_class, '' ) ) : $this->get_option( 'no_class_cost', '' );
+
+				if ( '' === $class_cost_string ) {
+					continue;
+				}
+
+				$has_costs  = true;
+				$class_cost = $this->evaluate_cost( $class_cost_string, array(
+					'qty'  => array_sum( wp_list_pluck( $products, 'quantity' ) ),
+					'cost' => array_sum( wp_list_pluck( $products, 'line_total' ) ),
+				) );
+
+				if ( 'class' === $this->type ) {
+					$rate['cost'] += $class_cost;
+				} else {
+					$highest_class_cost = $class_cost > $highest_class_cost ? $class_cost : $highest_class_cost;
+				}
 			}
 
-			$has_costs  = true;
-			$class_cost = $this->evaluate_cost( $class_cost_string, array(
-				'qty'  => array_sum( wp_list_pluck( $products, 'quantity' ) ),
-				'cost' => array_sum( wp_list_pluck( $products, 'line_total' ) )
-			) );
-
-			if ( $this->type === 'class' ) {
-				$rate['cost'] += $class_cost;
-			} else {
-				$highest_class_cost = $class_cost > $highest_class_cost ? $class_cost : $highest_class_cost;
+			if ( 'order' === $this->type && $highest_class_cost ) {
+				$rate['cost'] += $highest_class_cost;
 			}
 		}
 
-		if ( $this->type === 'order' && $highest_class_cost ) {
-			$rate['cost'] += $highest_class_cost;
-		}
-
 		// Add the rate
 		if ( $has_costs ) {
 			$this->add_rate( $rate );
@@ -201,7 +203,7 @@ class WC_Shipping_Flat_Rate extends WC_Shipping_Method {
 		 * 			$method->add_rate( $new_rate );
 		 * 		}.
 		 */
-		do_action( 'woocommerce_' . $this->id . '_shipping_add_rate', $this, $rate, $package );
+		do_action( 'woocommerce_' . $this->id . '_shipping_add_rate', $this, $rate );
 	}
 
 	/**
@@ -241,112 +243,4 @@ class WC_Shipping_Flat_Rate extends WC_Shipping_Method {
 
 		return $found_shipping_classes;
 	}
-
-	/**
-	 * Adds extra calculated flat rates.
-	 *
-	 * @deprecated 2.4.0
-	 *
-	 * Additonal rates defined like this:
-	 * 	Option Name | Additional Cost [+- Percents%] | Per Cost Type (order, class, or item).
-	 */
-	public function calculate_extra_shipping( $method, $rate, $package ) {
-		if ( $this->options ) {
-			$options = array_filter( (array) explode( "\n", $this->options ) );
-
-			foreach ( $options as $option ) {
-				$this_option = array_map( 'trim', explode( WC_DELIMITER, $option ) );
-				if ( sizeof( $this_option ) !== 3 ) {
-					continue;
-				}
-				$extra_rate          = $rate;
-				$extra_rate['id']    = $this->id . ':' . urldecode( sanitize_title( $this_option[0] ) );
-				$extra_rate['label'] = $this_option[0];
-				$extra_cost          = $this->get_extra_cost( $this_option[1], $this_option[2], $package );
-				if ( is_array( $extra_rate['cost'] ) ) {
-					$extra_rate['cost']['order'] = $extra_rate['cost']['order'] + $extra_cost;
-				} else {
-					$extra_rate['cost'] += $extra_cost;
-				}
-				$this->add_rate( $extra_rate );
-			}
-		}
-	}
-
-	/**
-	 * Calculate the percentage adjustment for each shipping rate.
-	 *
-	 * @deprecated 2.4.0
-	 * @param  float  $cost
-	 * @param  float  $percent_adjustment
-	 * @param  string $percent_operator
-	 * @param  float  $base_price
-	 * @return float
-	 */
-	public function calc_percentage_adjustment( $cost, $percent_adjustment, $percent_operator, $base_price ) {
-		if ( '+' == $percent_operator ) {
-			$cost += $percent_adjustment * $base_price;
-		} else {
-			$cost -= $percent_adjustment * $base_price;
-		}
-		return $cost;
-	}
-
-	/**
-	 * Get extra cost.
-	 *
-	 * @deprecated 2.4.0
-	 * @param  string $cost_string
-	 * @param  string $type
-	 * @param  array $package
-	 * @return float
-	 */
-	public function get_extra_cost( $cost_string, $type, $package ) {
-		$cost         = $cost_string;
-		$cost_percent = false;
-		$pattern      =
-			'/' .           // start regex
-			'(\d+\.?\d*)' . // capture digits, optionally capture a `.` and more digits
-			'\s*' .         // match whitespace
-			'(\+|-)' .      // capture the operand
-			'\s*'.          // match whitespace
-			'(\d+\.?\d*)'.  // capture digits, optionally capture a `.` and more digits
-			'\%/';          // match the percent sign & end regex
-		if ( preg_match( $pattern, $cost_string, $this_cost_matches ) ) {
-			$cost_operator = $this_cost_matches[2];
-			$cost_percent  = $this_cost_matches[3] / 100;
-			$cost          = $this_cost_matches[1];
-		}
-		switch ( $type ) {
-			case 'class' :
-				$cost = $cost * sizeof( $this->find_shipping_classes( $package ) );
-			break;
-			case 'item' :
-				$cost = $cost * $this->get_package_item_qty( $package );
-			break;
-		}
-		if ( $cost_percent ) {
-			switch ( $type ) {
-				case 'class' :
-					$shipping_classes = $this->find_shipping_classes( $package );
-					foreach ( $shipping_classes as $shipping_class => $items ){
-						foreach ( $items as $item_id => $values ) {
-							$cost = $this->calc_percentage_adjustment( $cost, $cost_percent, $cost_operator, $values['line_total'] );
-						}
-					}
-				break;
-				case 'item' :
-					foreach ( $package['contents'] as $item_id => $values ) {
-						if ( $values['data']->needs_shipping() ) {
-							$cost = $this->calc_percentage_adjustment( $cost, $cost_percent, $cost_operator, $values['line_total'] );
-						}
-					}
-				break;
-				case  'order' :
-					$cost = $this->calc_percentage_adjustment( $cost, $cost_percent, $cost_operator, $package['contents_cost'] );
-				break;
-			}
-		}
-		return $cost;
-	}
 }
diff --git a/includes/shipping/flat-rate/includes/class-wc-eval-math.php b/includes/shipping/flat-rate/includes/class-wc-eval-math.php
deleted file mode 100644
index 18af3290209..00000000000
--- a/includes/shipping/flat-rate/includes/class-wc-eval-math.php
+++ /dev/null
@@ -1,306 +0,0 @@
-<?php
-if ( ! defined( 'ABSPATH' ) ) {
-	exit;
-}
-
-/**
- * Class WC_Eval_Math. Supports basic math only (removed eval function).
- *
- * Based on EvalMath by Miles Kaufman Copyright (C) 2005 Miles Kaufmann http://www.twmagic.com/.
- */
-class WC_Eval_Math {
-	/** @var string */
-	public static $last_error = null;
-
-	/** @var array */
-	public static $v = array( 'e' => 2.71, 'pi' => 3.14 ); // variables (and constants)
-
-	/** @var array */
-	public static $f = array(); // user-defined functions
-
-	/** @var array */
-	public static $vb = array( 'e', 'pi' ); // constants
-
-	/** @var array */
-	public static $fb = array(); // built-in functions
-
-	/**
-	 * Evaluate maths string.
-	 *
-	 * @param string  $expr
-	 * @return mixed
-	 */
-	public static function evaluate( $expr ) {
-		self::$last_error = null;
-		$expr = trim( $expr );
-		if ( substr( $expr, -1, 1 ) == ';' ) $expr = substr( $expr, 0, strlen( $expr )-1 ); // strip semicolons at the end
-		//===============
-		// is it a variable assignment?
-		if ( preg_match( '/^\s*([a-z]\w*)\s*=\s*(.+)$/', $expr, $matches ) ) {
-			if ( in_array( $matches[1], self::$vb ) ) { // make sure we're not assigning to a constant
-				return self::trigger( "cannot assign to constant '$matches[1]'" );
-			}
-			if ( ( $tmp = self::pfx( self::nfx( $matches[2] ) ) ) === false ) return false; // get the result and make sure it's good
-			self::$v[$matches[1]] = $tmp; // if so, stick it in the variable array
-			return self::$v[$matches[1]]; // and return the resulting value
-			//===============
-			// is it a function assignment?
-		} elseif ( preg_match( '/^\s*([a-z]\w*)\s*\(\s*([a-z]\w*(?:\s*,\s*[a-z]\w*)*)\s*\)\s*=\s*(.+)$/', $expr, $matches ) ) {
-			$fnn = $matches[1]; // get the function name
-			if ( in_array( $matches[1], self::$fb ) ) { // make sure it isn't built in
-				return self::trigger( "cannot redefine built-in function '$matches[1]()'" );
-			}
-			$args = explode( ",", preg_replace( "/\s+/", "", $matches[2] ) ); // get the arguments
-			if ( ( $stack = self::nfx( $matches[3] ) ) === false ) return false; // see if it can be converted to postfix
-			for ( $i = 0; $i<count( $stack ); $i++ ) { // freeze the state of the non-argument variables
-				$token = $stack[$i];
-				if ( preg_match( '/^[a-z]\w*$/', $token ) and !in_array( $token, $args ) ) {
-					if ( array_key_exists( $token, self::$v ) ) {
-						$stack[$i] = self::$v[$token];
-					} else {
-						return self::trigger( "undefined variable '$token' in function definition" );
-					}
-				}
-			}
-			self::$f[$fnn] = array( 'args'=>$args, 'func'=>$stack );
-			return true;
-			//===============
-		} else {
-			return self::pfx( self::nfx( $expr ) ); // straight up evaluation, woo
-		}
-	}
-
-	/**
-	 * Convert infix to postfix notation.
-	 *
-	 * @param  string $expr
-	 * @return string
-	 */
-	private static function nfx( $expr ) {
-
-		$index = 0;
-		$stack = new WC_Eval_Math_Stack;
-		$output = array(); // postfix form of expression, to be passed to pfx()
-		// $expr = trim(strtolower($expr));
-		$expr = trim( $expr );
-
-		$ops   = array( '+', '-', '*', '/', '^', '_' );
-		$ops_r = array( '+'=>0, '-'=>0, '*'=>0, '/'=>0, '^'=>1 ); // right-associative operator?
-		$ops_p = array( '+'=>0, '-'=>0, '*'=>1, '/'=>1, '_'=>1, '^'=>2 ); // operator precedence
-
-		$expecting_op = false; // we use this in syntax-checking the expression
-		// and determining when a - is a negation
-
-		if ( preg_match( "/[^\w\s+*^\/()\.,-]/", $expr, $matches ) ) { // make sure the characters are all good
-			return self::trigger( "illegal character '{$matches[0]}'" );
-		}
-
-		while ( 1 ) { // 1 Infinite Loop ;)
-			$op = substr( $expr, $index, 1 ); // get the first character at the current index
-			// find out if we're currently at the beginning of a number/variable/function/parenthesis/operand
-			$ex = preg_match( '/^([A-Za-z]\w*\(?|\d+(?:\.\d*)?|\.\d+|\()/', substr( $expr, $index ), $match );
-			//===============
-			if ( $op == '-' and !$expecting_op ) { // is it a negation instead of a minus?
-				$stack->push( '_' ); // put a negation on the stack
-				$index++;
-			} elseif ( $op == '_' ) { // we have to explicitly deny this, because it's legal on the stack
-				return self::trigger( "illegal character '_'" ); // but not in the input expression
-				//===============
-			} elseif ( ( in_array( $op, $ops ) or $ex ) and $expecting_op ) { // are we putting an operator on the stack?
-				if ( $ex ) { // are we expecting an operator but have a number/variable/function/opening parethesis?
-					$op = '*'; $index--; // it's an implicit multiplication
-				}
-				// heart of the algorithm:
-				while ( $stack->count > 0 and ( $o2 = $stack->last() ) and in_array( $o2, $ops ) and ( $ops_r[$op] ? $ops_p[$op] < $ops_p[$o2] : $ops_p[$op] <= $ops_p[$o2] ) ) {
-					$output[] = $stack->pop(); // pop stuff off the stack into the output
-				}
-				// many thanks: http://en.wikipedia.org/wiki/Reverse_Polish_notation#The_algorithm_in_detail
-				$stack->push( $op ); // finally put OUR operator onto the stack
-				$index++;
-				$expecting_op = false;
-				//===============
-			} elseif ( $op == ')' and $expecting_op ) { // ready to close a parenthesis?
-				while ( ( $o2 = $stack->pop() ) != '(' ) { // pop off the stack back to the last (
-					if ( is_null( $o2 ) ) return self::trigger( "unexpected ')'" );
-					else $output[] = $o2;
-				}
-				if ( preg_match( "/^([A-Za-z]\w*)\($/", $stack->last( 2 ), $matches ) ) { // did we just close a function?
-					$fnn = $matches[1]; // get the function name
-					$arg_count = $stack->pop(); // see how many arguments there were (cleverly stored on the stack, thank you)
-					$output[] = $stack->pop(); // pop the function and push onto the output
-					if ( in_array( $fnn, self::$fb ) ) { // check the argument count
-						if ( $arg_count > 1 )
-							return self::trigger( "too many arguments ($arg_count given, 1 expected)" );
-					} elseif ( array_key_exists( $fnn, self::$f ) ) {
-						if ( $arg_count != count( self::$f[$fnn]['args'] ) )
-							return self::trigger( "wrong number of arguments ($arg_count given, " . count( self::$f[$fnn]['args'] ) . " expected)" );
-					} else { // did we somehow push a non-function on the stack? this should never happen
-						return self::trigger( "internal error" );
-					}
-				}
-				$index++;
-				//===============
-			} elseif ( $op == ',' and $expecting_op ) { // did we just finish a function argument?
-				while ( ( $o2 = $stack->pop() ) != '(' ) {
-					if ( is_null( $o2 ) ) return self::trigger( "unexpected ','" ); // oops, never had a (
-					else $output[] = $o2; // pop the argument expression stuff and push onto the output
-				}
-				// make sure there was a function
-				if ( !preg_match( "/^([A-Za-z]\w*)\($/", $stack->last( 2 ), $matches ) )
-					return self::trigger( "unexpected ','" );
-				$stack->push( $stack->pop()+1 ); // increment the argument count
-				$stack->push( '(' ); // put the ( back on, we'll need to pop back to it again
-				$index++;
-				$expecting_op = false;
-				//===============
-			} elseif ( $op == '(' and !$expecting_op ) {
-				$stack->push( '(' ); // that was easy
-				$index++;
-				//===============
-			} elseif ( $ex and !$expecting_op ) { // do we now have a function/variable/number?
-				$expecting_op = true;
-				$val = $match[1];
-				if ( preg_match( "/^([A-Za-z]\w*)\($/", $val, $matches ) ) { // may be func, or variable w/ implicit multiplication against parentheses...
-					if ( in_array( $matches[1], self::$fb ) or array_key_exists( $matches[1], self::$f ) ) { // it's a func
-						$stack->push( $val );
-						$stack->push( 1 );
-						$stack->push( '(' );
-						$expecting_op = false;
-					} else { // it's a var w/ implicit multiplication
-						$val = $matches[1];
-						$output[] = $val;
-					}
-				} else { // it's a plain old var or num
-					$output[] = $val;
-				}
-				$index += strlen( $val );
-				//===============
-			} elseif ( $op == ')' ) { // miscellaneous error checking
-				return self::trigger( "unexpected ')'" );
-			} elseif ( in_array( $op, $ops ) and !$expecting_op ) {
-				return self::trigger( "unexpected operator '$op'" );
-			} else { // I don't even want to know what you did to get here
-				return self::trigger( "an unexpected error occured" );
-			}
-			if ( $index == strlen( $expr ) ) {
-				if ( in_array( $op, $ops ) ) { // did we end with an operator? bad.
-					return self::trigger( "operator '$op' lacks operand" );
-				} else {
-					break;
-				}
-			}
-			while ( substr( $expr, $index, 1 ) == ' ' ) { // step the index past whitespace (pretty much turns whitespace
-				$index++;                             // into implicit multiplication if no operator is there)
-			}
-
-		}
-		while ( !is_null( $op = $stack->pop() ) ) { // pop everything off the stack and push onto output
-			if ( $op == '(' ) return self::trigger( "expecting ')'" ); // if there are (s on the stack, ()s were unbalanced
-			$output[] = $op;
-		}
-		return $output;
-	}
-
-	// evaluate postfix notation
-	private static function pfx( $tokens, $vars = array() ) {
-		if ( $tokens == false ) return false;
-
-		$stack = new WC_Eval_Math_Stack;
-
-		foreach ( $tokens as $token ) { // nice and easy
-			// if the token is a binary operator, pop two values off the stack, do the operation, and push the result back on
-			if ( in_array( $token, array( '+', '-', '*', '/', '^' ) ) ) {
-				if ( is_null( $op2 = $stack->pop() ) ) return self::trigger( "internal error" );
-				if ( is_null( $op1 = $stack->pop() ) ) return self::trigger( "internal error" );
-				switch ( $token ) {
-				case '+':
-					$stack->push( $op1+$op2 ); break;
-				case '-':
-					$stack->push( $op1-$op2 ); break;
-				case '*':
-					$stack->push( $op1*$op2 ); break;
-				case '/':
-					if ( $op2 == 0 ) return self::trigger( "division by zero" );
-					$stack->push( $op1/$op2 ); break;
-				case '^':
-					$stack->push( pow( $op1, $op2 ) ); break;
-				}
-				// if the token is a unary operator, pop one value off the stack, do the operation, and push it back on
-			} elseif ( $token == "_" ) {
-				$stack->push( -1*$stack->pop() );
-				// if the token is a function, pop arguments off the stack, hand them to the function, and push the result back on
-			} elseif ( ! preg_match( "/^([a-z]\w*)\($/", $token, $matches ) ) {
-				if ( is_numeric( $token ) ) {
-					$stack->push( $token );
-				} elseif ( array_key_exists( $token, self::$v ) ) {
-					$stack->push( self::$v[$token] );
-				} elseif ( array_key_exists( $token, $vars ) ) {
-					$stack->push( $vars[$token] );
-				} else {
-					return self::trigger( "undefined variable '$token'" );
-				}
-			}
-		}
-		// when we're out of tokens, the stack should have a single element, the final result
-		if ( $stack->count != 1 ) return self::trigger( "internal error" );
-		return $stack->pop();
-	}
-
-	// trigger an error, but nicely, if need be
-	private static function trigger( $msg ) {
-		self::$last_error = $msg;
-		if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-			echo "\nError found in:";
-			self::debugPrintCallingFunction();
-			trigger_error( $msg, E_USER_WARNING );
-		}
-		return false;
-	}
-
-	// Prints the file name, function name, and
-	// line number which called your function
-	// (not this function, then one that  called
-	// it to begin with)
-	private static function debugPrintCallingFunction() {
-		$file = 'n/a';
-		$func = 'n/a';
-		$line = 'n/a';
-		$debugTrace = debug_backtrace();
-		if ( isset( $debugTrace[1] ) ) {
-			$file = $debugTrace[1]['file'] ? $debugTrace[1]['file'] : 'n/a';
-			$line = $debugTrace[1]['line'] ? $debugTrace[1]['line'] : 'n/a';
-		}
-		if ( isset( $debugTrace[2] ) ) $func = $debugTrace[2]['function'] ? $debugTrace[2]['function'] : 'n/a';
-		echo "\n$file, $func, $line\n";
-	}
-}
-
-/**
- * Class WC_Eval_Math_Stack.
- */
-class WC_Eval_Math_Stack {
-
-	/** @var array */
-	public $stack = array();
-
-	/** @var integer */
-	public $count = 0;
-
-	public function push( $val ) {
-		$this->stack[ $this->count ] = $val;
-		$this->count++;
-	}
-
-	public function pop() {
-		if ( $this->count > 0 ) {
-			$this->count--;
-			return $this->stack[ $this->count ];
-		}
-		return null;
-	}
-
-	public function last( $n=1 ) {
-		$key = $this->count - $n;
-		return array_key_exists( $key, $this->stack ) ? $this->stack[ $key ] : null;
-	}
-}
diff --git a/includes/shipping/flat-rate/includes/settings-flat-rate.php b/includes/shipping/flat-rate/includes/settings-flat-rate.php
index 601c7e538fb..68a8bbd1a7f 100644
--- a/includes/shipping/flat-rate/includes/settings-flat-rate.php
+++ b/includes/shipping/flat-rate/includes/settings-flat-rate.php
@@ -4,121 +4,80 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
-$cost_desc = __( 'Enter a cost (excl. tax) or sum, e.g. <code>10.00 * [qty]</code>.', 'woocommerce' ) . '<br/>' . __( 'Supports the following placeholders: <code>[qty]</code> = number of items, <code>[cost]</code> = cost of items, <code>[fee percent="10" min_fee="20"]</code> = Percentage based fee.', 'woocommerce' );
+$cost_desc = __( 'Enter a cost (excl. tax) or sum, e.g. <code>10.00 * [qty]</code>.', 'woocommerce' ) . '<br/><br/>' . __( 'Use <code>[qty]</code> for the number of items, <br/><code>[cost]</code> for the total cost of items, and <code>[fee percent="10" min_fee="20" max_fee=""]</code> for percentage based fees.', 'woocommerce' );
 
 /**
  * Settings for flat rate shipping.
  */
 $settings = array(
-	'enabled' => array(
-		'title' 		=> __( 'Enable/Disable', 'woocommerce' ),
-		'type' 			=> 'checkbox',
-		'label' 		=> __( 'Enable this shipping method', 'woocommerce' ),
-		'default' 		=> 'no',
-	),
 	'title' => array(
-		'title' 		=> __( 'Method Title', 'woocommerce' ),
+		'title' 		=> __( 'Method title', 'woocommerce' ),
 		'type' 			=> 'text',
 		'description' 	=> __( 'This controls the title which the user sees during checkout.', 'woocommerce' ),
-		'default'		=> __( 'Flat Rate', 'woocommerce' ),
-		'desc_tip'		=> true
-	),
-	'availability' => array(
-		'title' 		=> __( 'Availability', 'woocommerce' ),
-		'type' 			=> 'select',
-		'default' 		=> 'all',
-		'class'			=> 'availability wc-enhanced-select',
-		'options'		=> array(
-			'all' 		=> __( 'All allowed countries', 'woocommerce' ),
-			'specific' 	=> __( 'Specific Countries', 'woocommerce' ),
-		),
-	),
-	'countries' => array(
-		'title' 		=> __( 'Specific Countries', 'woocommerce' ),
-		'type' 			=> 'multiselect',
-		'class'			=> 'wc-enhanced-select',
-		'css'			=> 'width: 450px;',
-		'default' 		=> '',
-		'options'		=> WC()->countries->get_shipping_countries(),
-		'custom_attributes' => array(
-			'data-placeholder' => __( 'Select some countries', 'woocommerce' )
-		)
+		'default'		=> __( 'Flat rate', 'woocommerce' ),
+		'desc_tip'		=> true,
 	),
 	'tax_status' => array(
-		'title' 		=> __( 'Tax Status', 'woocommerce' ),
+		'title' 		=> __( 'Tax status', 'woocommerce' ),
 		'type' 			=> 'select',
 		'class'         => 'wc-enhanced-select',
 		'default' 		=> 'taxable',
 		'options'		=> array(
 			'taxable' 	=> __( 'Taxable', 'woocommerce' ),
-			'none' 		=> _x( 'None', 'Tax status', 'woocommerce' )
-		)
+			'none' 		=> _x( 'None', 'Tax status', 'woocommerce' ),
+		),
 	),
 	'cost' => array(
 		'title' 		=> __( 'Cost', 'woocommerce' ),
 		'type' 			=> 'text',
 		'placeholder'	=> '',
 		'description'	=> $cost_desc,
-		'default'		=> '',
-		'desc_tip'		=> true
-	)
+		'default'		=> '0',
+		'desc_tip'		=> true,
+	),
 );
 
 $shipping_classes = WC()->shipping->get_shipping_classes();
 
 if ( ! empty( $shipping_classes ) ) {
-	$settings[ 'class_costs' ] = array(
-		'title'			=> __( 'Shipping Class Costs', 'woocommerce' ),
-		'type'			=> 'title',
-		'description'   => sprintf( __( 'These costs can optionally be added based on the %sproduct shipping class%s.', 'woocommerce' ), '<a href="' . admin_url( 'edit-tags.php?taxonomy=product_shipping_class&post_type=product' ) . '">', '</a>' )
+	$settings['class_costs'] = array(
+		'title'			 => __( 'Shipping class costs', 'woocommerce' ),
+		'type'			 => 'title',
+		'default'        => '',
+		'description'    => sprintf( __( 'These costs can optionally be added based on the <a href="%s">product shipping class</a>.', 'woocommerce' ), admin_url( 'admin.php?page=wc-settings&tab=shipping&section=classes' ) ),
 	);
 	foreach ( $shipping_classes as $shipping_class ) {
 		if ( ! isset( $shipping_class->term_id ) ) {
 			continue;
 		}
 		$settings[ 'class_cost_' . $shipping_class->term_id ] = array(
-			'title'       => sprintf( __( '"%s" Shipping Class Cost', 'woocommerce' ), esc_html( $shipping_class->name ) ),
+			/* translators: %s: shipping class name */
+			'title'       => sprintf( __( '"%s" shipping class cost', 'woocommerce' ), esc_html( $shipping_class->name ) ),
 			'type'        => 'text',
 			'placeholder' => __( 'N/A', 'woocommerce' ),
 			'description' => $cost_desc,
 			'default'     => $this->get_option( 'class_cost_' . $shipping_class->slug ), // Before 2.5.0, we used slug here which caused issues with long setting names
-			'desc_tip'    => true
+			'desc_tip'    => true,
 		);
 	}
-	$settings[ 'no_class_cost' ] = array(
-		'title'       => __( 'No Shipping Class Cost', 'woocommerce' ),
+	$settings['no_class_cost'] = array(
+		'title'       => __( 'No shipping class cost', 'woocommerce' ),
 		'type'        => 'text',
 		'placeholder' => __( 'N/A', 'woocommerce' ),
 		'description' => $cost_desc,
 		'default'     => '',
-		'desc_tip'    => true
+		'desc_tip'    => true,
 	);
-	$settings[ 'type' ] = array(
-		'title' 		=> __( 'Calculation Type', 'woocommerce' ),
+	$settings['type'] = array(
+		'title' 		=> __( 'Calculation type', 'woocommerce' ),
 		'type' 			=> 'select',
 		'class'         => 'wc-enhanced-select',
 		'default' 		=> 'class',
 		'options' 		=> array(
-			'class' 	=> __( 'Per Class: Charge shipping for each shipping class individually', 'woocommerce' ),
-			'order' 	=> __( 'Per Order: Charge shipping for the most expensive shipping class', 'woocommerce' ),
+			'class' 	=> __( 'Per class: Charge shipping for each shipping class individually', 'woocommerce' ),
+			'order' 	=> __( 'Per order: Charge shipping for the most expensive shipping class', 'woocommerce' ),
 		),
 	);
 }
 
-if ( apply_filters( 'woocommerce_enable_deprecated_additional_flat_rates', $this->get_option( 'options', false ) ) ) {
-	$settings[ 'additional_rates' ] = array(
-		'title'			=> __( 'Additional Rates', 'woocommerce' ),
-		'type'			=> 'title',
-		'description'   => __( 'These rates are extra shipping options with additional costs (based on the flat rate).', 'woocommerce' ),
-	);
-	$settings['options'] = array(
-		'title' 		=> __( 'Additional Rates', 'woocommerce' ),
-		'type' 			=> 'textarea',
-		'description'	=> __( 'One per line: Option Name | Additional Cost [+- Percents] | Per Cost Type (order, class, or item) Example: <code>Priority Mail | 6.95 [+ 0.2%] | order</code>.', 'woocommerce' ),
-		'default'		=> '',
-		'desc_tip'		=> true,
-		'placeholder'	=> __( 'Option Name | Additional Cost [+- Percents%] | Per Cost Type (order, class, or item)', 'woocommerce' )
-	);
-}
-
 return $settings;
diff --git a/includes/shipping/free-shipping/class-wc-shipping-free-shipping.php b/includes/shipping/free-shipping/class-wc-shipping-free-shipping.php
index 66af25fa380..bc8741f0e1d 100644
--- a/includes/shipping/free-shipping/class-wc-shipping-free-shipping.php
+++ b/includes/shipping/free-shipping/class-wc-shipping-free-shipping.php
@@ -1,7 +1,6 @@
 <?php
-
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
 /**
@@ -10,152 +9,163 @@ if ( ! defined( 'ABSPATH' ) ) {
  * A simple shipping method for free shipping.
  *
  * @class   WC_Shipping_Free_Shipping
- * @version 2.4.0
+ * @version 2.6.0
  * @package WooCommerce/Classes/Shipping
  * @author  WooThemes
  */
 class WC_Shipping_Free_Shipping extends WC_Shipping_Method {
 
-	/** @var float Min amount to be valid */
-	public $min_amount;
+	/**
+	 * Min amount to be valid.
+	 *
+	 * @var integer
+	 */
+	public $min_amount = 0;
 
-	/** @var string Requires option */
-	public $requires;
+	/**
+	 * Requires option.
+	 *
+	 * @var string
+	 */
+	public $requires = '';
 
 	/**
 	 * Constructor.
+	 *
+	 * @param int $instance_id Shipping method instance.
 	 */
-	public function __construct() {
-		$this->id 			= 'free_shipping';
-		$this->method_title = __( 'Free Shipping', 'woocommerce' );
+	public function __construct( $instance_id = 0 ) {
+		$this->id                 = 'free_shipping';
+		$this->instance_id        = absint( $instance_id );
+		$this->method_title       = __( 'Free shipping', 'woocommerce' );
+		$this->method_description = __( 'Free shipping is a special method which can be triggered with coupons and minimum spends.', 'woocommerce' );
+		$this->supports           = array(
+			'shipping-zones',
+			'instance-settings',
+			'instance-settings-modal',
+		);
+
 		$this->init();
 	}
 
 	/**
-	 * init function.
+	 * Initialize free shipping.
 	 */
 	public function init() {
-
 		// Load the settings.
 		$this->init_form_fields();
 		$this->init_settings();
 
-		// Define user set variables
-		$this->enabled		= $this->get_option( 'enabled' );
-		$this->title 		= $this->get_option( 'title' );
-		$this->min_amount 	= $this->get_option( 'min_amount', 0 );
-		$this->availability = $this->get_option( 'availability' );
-		$this->countries 	= $this->get_option( 'countries' );
-		$this->requires		= $this->get_option( 'requires' );
+		// Define user set variables.
+		$this->title      = $this->get_option( 'title' );
+		$this->min_amount = $this->get_option( 'min_amount', 0 );
+		$this->requires   = $this->get_option( 'requires' );
 
-		// Actions
+		// Actions.
 		add_action( 'woocommerce_update_options_shipping_' . $this->id, array( $this, 'process_admin_options' ) );
 	}
 
 	/**
-	 * Initialise Gateway Settings Form Fields.
+	 * Init form fields.
 	 */
 	public function init_form_fields() {
-		$this->form_fields = array(
-			'enabled' => array(
-				'title' 		=> __( 'Enable/Disable', 'woocommerce' ),
-				'type' 			=> 'checkbox',
-				'label' 		=> __( 'Enable Free Shipping', 'woocommerce' ),
-				'default' 		=> 'no'
-			),
+		$this->instance_form_fields = array(
 			'title' => array(
-				'title' 		=> __( 'Method Title', 'woocommerce' ),
-				'type' 			=> 'text',
-				'description' 	=> __( 'This controls the title which the user sees during checkout.', 'woocommerce' ),
-				'default'		=> __( 'Free Shipping', 'woocommerce' ),
-				'desc_tip'		=> true,
-			),
-			'availability' => array(
-				'title' 		=> __( 'Method availability', 'woocommerce' ),
-				'type' 			=> 'select',
-				'default' 		=> 'all',
-				'class'			=> 'availability wc-enhanced-select',
-				'options'		=> array(
-					'all' 		=> __( 'All allowed countries', 'woocommerce' ),
-					'specific' 	=> __( 'Specific Countries', 'woocommerce' )
-				)
-			),
-			'countries' => array(
-				'title' 		=> __( 'Specific Countries', 'woocommerce' ),
-				'type' 			=> 'multiselect',
-				'class'			=> 'wc-enhanced-select',
-				'css'			=> 'width: 450px;',
-				'default' 		=> '',
-				'options'		=> WC()->countries->get_shipping_countries(),
-				'custom_attributes' => array(
-					'data-placeholder' => __( 'Select some countries', 'woocommerce' )
-				)
+				'title'       => __( 'Title', 'woocommerce' ),
+				'type'        => 'text',
+				'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce' ),
+				'default'     => $this->method_title,
+				'desc_tip'    => true,
 			),
 			'requires' => array(
-				'title' 		=> __( 'Free Shipping Requires...', 'woocommerce' ),
-				'type' 			=> 'select',
-				'class'         => 'wc-enhanced-select',
-				'default' 		=> '',
-				'options'		=> array(
-					'' 				=> __( 'N/A', 'woocommerce' ),
-					'coupon'		=> __( 'A valid free shipping coupon', 'woocommerce' ),
-					'min_amount' 	=> __( 'A minimum order amount (defined below)', 'woocommerce' ),
-					'either' 		=> __( 'A minimum order amount OR a coupon', 'woocommerce' ),
-					'both' 			=> __( 'A minimum order amount AND a coupon', 'woocommerce' ),
-				)
+				'title'   => __( 'Free shipping requires...', 'woocommerce' ),
+				'type'    => 'select',
+				'class'   => 'wc-enhanced-select',
+				'default' => '',
+				'options' => array(
+					''           => __( 'N/A', 'woocommerce' ),
+					'coupon'     => __( 'A valid free shipping coupon', 'woocommerce' ),
+					'min_amount' => __( 'A minimum order amount', 'woocommerce' ),
+					'either'     => __( 'A minimum order amount OR a coupon', 'woocommerce' ),
+					'both'       => __( 'A minimum order amount AND a coupon', 'woocommerce' ),
+				),
 			),
 			'min_amount' => array(
-				'title' 		=> __( 'Minimum Order Amount', 'woocommerce' ),
-				'type' 			=> 'price',
-				'placeholder'	=> wc_format_localized_price( 0 ),
-				'description' 	=> __( 'Users will need to spend this amount to get free shipping (if enabled above).', 'woocommerce' ),
-				'default' 		=> '0',
-				'desc_tip'		=> true
-			)
+				'title'       => __( 'Minimum order amount', 'woocommerce' ),
+				'type'        => 'price',
+				'placeholder' => wc_format_localized_price( 0 ),
+				'description' => __( 'Users will need to spend this amount to get free shipping (if enabled above).', 'woocommerce' ),
+				'default'     => '0',
+				'desc_tip'    => true,
+			),
 		);
 	}
 
 	/**
-	 * is_available function.
-	 * @param array $package
+	 * Get setting form fields for instances of this shipping method within zones.
+	 *
+	 * @return array
+	 */
+	public function get_instance_form_fields() {
+		if ( is_admin() ) {
+			wc_enqueue_js( "
+				jQuery( function( $ ) {
+					function wcFreeShippingShowHideMinAmountField( el ) {
+						var form = $( el ).closest( 'form' );
+						var minAmountField = $( '#woocommerce_free_shipping_min_amount', form ).closest( 'tr' );
+						if ( 'coupon' === $( el ).val() || '' === $( el ).val() ) {
+							minAmountField.hide();
+						} else {
+							minAmountField.show();
+						}
+					}
+
+					$( document.body ).on( 'change', '#woocommerce_free_shipping_requires', function() {
+						wcFreeShippingShowHideMinAmountField( this );
+					});
+
+					// Change while load.
+					$( '#woocommerce_free_shipping_requires' ).change();
+					$( document.body ).on( 'wc_backbone_modal_loaded', function( evt, target ) {
+						if ( 'wc-modal-shipping-method-settings' === target ) {
+							wcFreeShippingShowHideMinAmountField( $( '#wc-backbone-modal-dialog #woocommerce_free_shipping_requires', evt.currentTarget ) );
+						}
+					} );
+				});
+			" );
+		}
+
+		return parent::get_instance_form_fields();
+	}
+
+	/**
+	 * See if free shipping is available based on the package and cart.
+	 *
+	 * @param array $package Shipping package.
 	 * @return bool
 	 */
 	public function is_available( $package ) {
-		if ( 'no' == $this->enabled ) {
-			return false;
-		}
-
-		if ( 'specific' == $this->availability ) {
-			$ship_to_countries = $this->countries;
-		} else {
-			$ship_to_countries = array_keys( WC()->countries->get_shipping_countries() );
-		}
-
-		if ( is_array( $ship_to_countries ) && ! in_array( $package['destination']['country'], $ship_to_countries ) ) {
-			return false;
-		}
-
-		// Enabled logic
-		$is_available       = false;
 		$has_coupon         = false;
 		$has_met_min_amount = false;
 
 		if ( in_array( $this->requires, array( 'coupon', 'either', 'both' ) ) ) {
-
 			if ( $coupons = WC()->cart->get_coupons() ) {
 				foreach ( $coupons as $code => $coupon ) {
-					if ( $coupon->is_valid() && $coupon->enable_free_shipping() ) {
+					if ( $coupon->is_valid() && $coupon->get_free_shipping() ) {
 						$has_coupon = true;
+						break;
 					}
 				}
 			}
 		}
 
 		if ( in_array( $this->requires, array( 'min_amount', 'either', 'both' ) ) && isset( WC()->cart->cart_contents_total ) ) {
-			if ( WC()->cart->prices_include_tax ) {
-				$total = WC()->cart->cart_contents_total + array_sum( WC()->cart->taxes );
+			$total = WC()->cart->get_displayed_subtotal();
+
+			if ( 'incl' === WC()->cart->tax_display_cart ) {
+				$total = round( $total - ( WC()->cart->get_cart_discount_total() + WC()->cart->get_cart_discount_tax_total() ), wc_get_price_decimals() );
 			} else {
-				$total = WC()->cart->cart_contents_total;
+				$total = round( $total - WC()->cart->get_cart_discount_total(), wc_get_price_decimals() );
 			}
 
 			if ( $total >= $this->min_amount ) {
@@ -165,44 +175,38 @@ class WC_Shipping_Free_Shipping extends WC_Shipping_Method {
 
 		switch ( $this->requires ) {
 			case 'min_amount' :
-				if ( $has_met_min_amount ) {
-					$is_available = true;
-				}
-			break;
+				$is_available = $has_met_min_amount;
+				break;
 			case 'coupon' :
-				if ( $has_coupon ) {
-					$is_available = true;
-				}
-			break;
+				$is_available = $has_coupon;
+				break;
 			case 'both' :
-				if ( $has_met_min_amount && $has_coupon ) {
-					$is_available = true;
-				}
-			break;
+				$is_available = $has_met_min_amount && $has_coupon;
+				break;
 			case 'either' :
-				if ( $has_met_min_amount || $has_coupon ) {
-					$is_available = true;
-				}
-			break;
+				$is_available = $has_met_min_amount || $has_coupon;
+				break;
 			default :
 				$is_available = true;
-			break;
+				break;
 		}
 
 		return apply_filters( 'woocommerce_shipping_' . $this->id . '_is_available', $is_available, $package );
 	}
 
 	/**
-	 * calculate_shipping function.
-	 * @return array
+	 * Called to calculate shipping rates for this method. Rates can be added using the add_rate() method.
+	 *
+	 * @uses WC_Shipping_Method::add_rate()
+	 *
+	 * @param array $package Shipping package.
 	 */
-	public function calculate_shipping() {
-		$args = array(
-			'id' 	=> $this->id,
-			'label' => $this->title,
-			'cost' 	=> 0,
-			'taxes' => false
-		);
-		$this->add_rate( $args );
+	public function calculate_shipping( $package = array() ) {
+		$this->add_rate( array(
+			'label'   => $this->title,
+			'cost'    => 0,
+			'taxes'   => false,
+			'package' => $package,
+		) );
 	}
 }
diff --git a/includes/shipping/legacy-flat-rate/class-wc-shipping-legacy-flat-rate.php b/includes/shipping/legacy-flat-rate/class-wc-shipping-legacy-flat-rate.php
new file mode 100644
index 00000000000..18838c25358
--- /dev/null
+++ b/includes/shipping/legacy-flat-rate/class-wc-shipping-legacy-flat-rate.php
@@ -0,0 +1,381 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Flat Rate Shipping Method.
+ *
+ * This class is here for backwards commpatility for methods existing before zones existed.
+ *
+ * @deprecated  2.6.0
+ * @version		2.4.0
+ * @package		WooCommerce/Classes/Shipping
+ * @author 		WooThemes
+ */
+class WC_Shipping_Legacy_Flat_Rate extends WC_Shipping_Method {
+
+	/** @var string cost passed to [fee] shortcode */
+	protected $fee_cost = '';
+
+	/**
+	 * Constructor.
+	 */
+	public function __construct() {
+		$this->id                 = 'legacy_flat_rate';
+		$this->method_title       = __( 'Flat rate (legacy)', 'woocommerce' );
+		$this->method_description = '<strong>' . sprintf( __( 'This method is deprecated in 2.6.0 and will be removed in future versions - we recommend disabling it and instead setting up a new rate within your <a href="%s">Shipping zones</a>.', 'woocommerce' ), admin_url( 'admin.php?page=wc-settings&tab=shipping' ) ) . '</strong>';
+		$this->init();
+
+		add_action( 'woocommerce_update_options_shipping_' . $this->id, array( $this, 'process_admin_options' ) );
+		add_action( 'woocommerce_flat_rate_shipping_add_rate', array( $this, 'calculate_extra_shipping' ), 10, 2 );
+	}
+
+	/**
+	 * Process and redirect if disabled.
+	 */
+	public function process_admin_options() {
+		parent::process_admin_options();
+
+		if ( 'no' === $this->settings['enabled'] ) {
+			wp_redirect( admin_url( 'admin.php?page=wc-settings&tab=shipping&section=options' ) );
+			exit;
+		}
+	}
+
+	/**
+	 * Return the name of the option in the WP DB.
+	 * @since 2.6.0
+	 * @return string
+	 */
+	public function get_option_key() {
+		return $this->plugin_id . 'flat_rate' . '_settings';
+	}
+
+	/**
+	 * init function.
+	 */
+	public function init() {
+		// Load the settings.
+		$this->init_form_fields();
+		$this->init_settings();
+
+		// Define user set variables
+		$this->title        = $this->get_option( 'title' );
+		$this->availability = $this->get_option( 'availability' );
+		$this->countries    = $this->get_option( 'countries' );
+		$this->tax_status   = $this->get_option( 'tax_status' );
+		$this->cost         = $this->get_option( 'cost' );
+		$this->type         = $this->get_option( 'type', 'class' );
+		$this->options      = $this->get_option( 'options', false ); // @deprecated in 2.4.0
+	}
+
+	/**
+	 * Initialise Settings Form Fields.
+	 */
+	public function init_form_fields() {
+		$this->form_fields = include( 'includes/settings-flat-rate.php' );
+	}
+
+	/**
+	 * Evaluate a cost from a sum/string.
+	 * @param  string $sum
+	 * @param  array  $args
+	 * @return string
+	 */
+	protected function evaluate_cost( $sum, $args = array() ) {
+		include_once( WC()->plugin_path() . '/includes/libraries/class-wc-eval-math.php' );
+
+		$locale   = localeconv();
+		$decimals = array( wc_get_price_decimal_separator(), $locale['decimal_point'], $locale['mon_decimal_point'] );
+
+		$this->fee_cost = $args['cost'];
+
+		// Expand shortcodes
+		add_shortcode( 'fee', array( $this, 'fee' ) );
+
+		$sum = do_shortcode( str_replace(
+			array(
+				'[qty]',
+				'[cost]',
+			),
+			array(
+				$args['qty'],
+				$args['cost'],
+			),
+			$sum
+		) );
+
+		remove_shortcode( 'fee', array( $this, 'fee' ) );
+
+		// Remove whitespace from string
+		$sum = preg_replace( '/\s+/', '', $sum );
+
+		// Remove locale from string
+		$sum = str_replace( $decimals, '.', $sum );
+
+		// Trim invalid start/end characters
+		$sum = rtrim( ltrim( $sum, "\t\n\r\0\x0B+*/" ), "\t\n\r\0\x0B+-*/" );
+
+		// Do the math
+		return $sum ? WC_Eval_Math::evaluate( $sum ) : 0;
+	}
+
+	/**
+	 * Work out fee (shortcode).
+	 * @param  array $atts
+	 * @return string
+	 */
+	public function fee( $atts ) {
+		$atts = shortcode_atts( array(
+			'percent' => '',
+			'min_fee' => '',
+		), $atts, 'fee' );
+
+		$calculated_fee = 0;
+
+		if ( $atts['percent'] ) {
+			$calculated_fee = $this->fee_cost * ( floatval( $atts['percent'] ) / 100 );
+		}
+
+		if ( $atts['min_fee'] && $calculated_fee < $atts['min_fee'] ) {
+			$calculated_fee = $atts['min_fee'];
+		}
+
+		return $calculated_fee;
+	}
+
+	/**
+	 * calculate_shipping function.
+	 *
+	 * @param array $package (default: array())
+	 */
+	public function calculate_shipping( $package = array() ) {
+		$rate = array(
+			'id'      => $this->id,
+			'label'   => $this->title,
+			'cost'    => 0,
+			'package' => $package,
+		);
+
+		// Calculate the costs
+		$has_costs = false; // True when a cost is set. False if all costs are blank strings.
+		$cost      = $this->get_option( 'cost' );
+
+		if ( '' !== $cost ) {
+			$has_costs    = true;
+			$rate['cost'] = $this->evaluate_cost( $cost, array(
+				'qty'  => $this->get_package_item_qty( $package ),
+				'cost' => $package['contents_cost'],
+			) );
+		}
+
+		// Add shipping class costs
+		$found_shipping_classes = $this->find_shipping_classes( $package );
+		$highest_class_cost     = 0;
+
+		foreach ( $found_shipping_classes as $shipping_class => $products ) {
+			// Also handles BW compatibility when slugs were used instead of ids
+			$shipping_class_term = get_term_by( 'slug', $shipping_class, 'product_shipping_class' );
+			$class_cost_string   = $shipping_class_term && $shipping_class_term->term_id ? $this->get_option( 'class_cost_' . $shipping_class_term->term_id, $this->get_option( 'class_cost_' . $shipping_class, '' ) ) : $this->get_option( 'no_class_cost', '' );
+
+			if ( '' === $class_cost_string ) {
+				continue;
+			}
+
+			$has_costs  = true;
+			$class_cost = $this->evaluate_cost( $class_cost_string, array(
+				'qty'  => array_sum( wp_list_pluck( $products, 'quantity' ) ),
+				'cost' => array_sum( wp_list_pluck( $products, 'line_total' ) ),
+			) );
+
+			if ( 'class' === $this->type ) {
+				$rate['cost'] += $class_cost;
+			} else {
+				$highest_class_cost = $class_cost > $highest_class_cost ? $class_cost : $highest_class_cost;
+			}
+		}
+
+		if ( 'order' === $this->type && $highest_class_cost ) {
+			$rate['cost'] += $highest_class_cost;
+		}
+
+		$rate['package'] = $package;
+
+		// Add the rate
+		if ( $has_costs ) {
+			$this->add_rate( $rate );
+		}
+
+		/**
+		 * Developers can add additional flat rates based on this one via this action since @version 2.4.
+		 *
+		 * Previously there were (overly complex) options to add additional rates however this was not user.
+		 * friendly and goes against what Flat Rate Shipping was originally intended for.
+		 *
+		 * This example shows how you can add an extra rate based on this flat rate via custom function:
+		 *
+		 * 		add_action( 'woocommerce_flat_rate_shipping_add_rate', 'add_another_custom_flat_rate', 10, 2 );
+		 *
+		 * 		function add_another_custom_flat_rate( $method, $rate ) {
+		 * 			$new_rate          = $rate;
+		 * 			$new_rate['id']    .= ':' . 'custom_rate_name'; // Append a custom ID.
+		 * 			$new_rate['label'] = 'Rushed Shipping'; // Rename to 'Rushed Shipping'.
+		 * 			$new_rate['cost']  += 2; // Add $2 to the cost.
+		 *
+		 * 			// Add it to WC.
+		 * 			$method->add_rate( $new_rate );
+		 * 		}.
+		 */
+		do_action( 'woocommerce_flat_rate_shipping_add_rate', $this, $rate );
+	}
+
+	/**
+	 * Get items in package.
+	 * @param  array $package
+	 * @return int
+	 */
+	public function get_package_item_qty( $package ) {
+		$total_quantity = 0;
+		foreach ( $package['contents'] as $item_id => $values ) {
+			if ( $values['quantity'] > 0 && $values['data']->needs_shipping() ) {
+				$total_quantity += $values['quantity'];
+			}
+		}
+		return $total_quantity;
+	}
+
+	/**
+	 * Finds and returns shipping classes and the products with said class.
+	 * @param mixed $package
+	 * @return array
+	 */
+	public function find_shipping_classes( $package ) {
+		$found_shipping_classes = array();
+
+		foreach ( $package['contents'] as $item_id => $values ) {
+			if ( $values['data']->needs_shipping() ) {
+				$found_class = $values['data']->get_shipping_class();
+
+				if ( ! isset( $found_shipping_classes[ $found_class ] ) ) {
+					$found_shipping_classes[ $found_class ] = array();
+				}
+
+				$found_shipping_classes[ $found_class ][ $item_id ] = $values;
+			}
+		}
+
+		return $found_shipping_classes;
+	}
+
+	/**
+	 * Adds extra calculated flat rates.
+	 *
+	 * @deprecated 2.4.0
+	 *
+	 * Additional rates defined like this:
+	 * 	Option Name | Additional Cost [+- Percents%] | Per Cost Type (order, class, or item).
+	 */
+	public function calculate_extra_shipping( $method, $rate ) {
+		if ( $this->options ) {
+			$options = array_filter( (array) explode( "\n", $this->options ) );
+
+			foreach ( $options as $option ) {
+				$this_option = array_map( 'trim', explode( WC_DELIMITER, $option ) );
+				if ( sizeof( $this_option ) !== 3 ) {
+					continue;
+				}
+				$extra_rate          = $rate;
+				$extra_rate['id']    = $this->id . ':' . urldecode( sanitize_title( $this_option[0] ) );
+				$extra_rate['label'] = $this_option[0];
+				$extra_cost          = $this->get_extra_cost( $this_option[1], $this_option[2], $rate['package'] );
+				if ( is_array( $extra_rate['cost'] ) ) {
+					$extra_rate['cost']['order'] = $extra_rate['cost']['order'] + $extra_cost;
+				} else {
+					$extra_rate['cost'] += $extra_cost;
+				}
+
+				$this->add_rate( $extra_rate );
+			}
+		}
+	}
+
+	/**
+	 * Calculate the percentage adjustment for each shipping rate.
+	 *
+	 * @deprecated 2.4.0
+	 * @param  float  $cost
+	 * @param  float  $percent_adjustment
+	 * @param  string $percent_operator
+	 * @param  float  $base_price
+	 * @return float
+	 */
+	public function calc_percentage_adjustment( $cost, $percent_adjustment, $percent_operator, $base_price ) {
+		if ( '+' == $percent_operator ) {
+			$cost += $percent_adjustment * $base_price;
+		} else {
+			$cost -= $percent_adjustment * $base_price;
+		}
+		return $cost;
+	}
+
+	/**
+	 * Get extra cost.
+	 *
+	 * @deprecated 2.4.0
+	 * @param  string $cost_string
+	 * @param  string $type
+	 * @param  array $package
+	 * @return float
+	 */
+	public function get_extra_cost( $cost_string, $type, $package ) {
+		$cost         = $cost_string;
+		$cost_percent = false;
+		// @codingStandardsIgnoreStart
+		$pattern      =
+			'/' .           // Start regex.
+			'(\d+\.?\d*)' . // Capture digits, optionally capture a `.` and more digits.
+			'\s*' .         // Match whitespace.
+			'(\+|-)' .      // Capture the operand.
+			'\s*' .         // Match whitespace.
+			'(\d+\.?\d*)' . // Capture digits, optionally capture a `.` and more digits.
+			'\%/';          // Match the percent sign & end regex.
+		// @codingStandardsIgnoreEnd
+		if ( preg_match( $pattern, $cost_string, $this_cost_matches ) ) {
+			$cost_operator = $this_cost_matches[2];
+			$cost_percent  = $this_cost_matches[3] / 100;
+			$cost          = $this_cost_matches[1];
+		}
+		switch ( $type ) {
+			case 'class' :
+				$cost = $cost * sizeof( $this->find_shipping_classes( $package ) );
+			break;
+			case 'item' :
+				$cost = $cost * $this->get_package_item_qty( $package );
+			break;
+		}
+		if ( $cost_percent ) {
+			switch ( $type ) {
+				case 'class' :
+					$shipping_classes = $this->find_shipping_classes( $package );
+					foreach ( $shipping_classes as $shipping_class => $items ) {
+						foreach ( $items as $item_id => $values ) {
+							$cost = $this->calc_percentage_adjustment( $cost, $cost_percent, $cost_operator, $values['line_total'] );
+						}
+					}
+				break;
+				case 'item' :
+					foreach ( $package['contents'] as $item_id => $values ) {
+						if ( $values['data']->needs_shipping() ) {
+							$cost = $this->calc_percentage_adjustment( $cost, $cost_percent, $cost_operator, $values['line_total'] );
+						}
+					}
+				break;
+				case  'order' :
+					$cost = $this->calc_percentage_adjustment( $cost, $cost_percent, $cost_operator, $package['contents_cost'] );
+				break;
+			}
+		}
+		return $cost;
+	}
+}
diff --git a/includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php b/includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php
new file mode 100644
index 00000000000..24f7ce29781
--- /dev/null
+++ b/includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php
@@ -0,0 +1,127 @@
+<?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+$cost_desc = __( 'Enter a cost (excl. tax) or sum, e.g. <code>10.00 * [qty]</code>.', 'woocommerce' ) . '<br/>' . __( 'Supports the following placeholders: <code>[qty]</code> = number of items, <code>[cost]</code> = cost of items, <code>[fee percent="10" min_fee="20"]</code> = Percentage based fee.', 'woocommerce' );
+
+/**
+ * Settings for flat rate shipping.
+ */
+$settings = array(
+	'enabled' => array(
+		'title' 		=> __( 'Enable/Disable', 'woocommerce' ),
+		'type' 			=> 'checkbox',
+		'label' 		=> __( 'Once disabled, this legacy method will no longer be available.', 'woocommerce' ),
+		'default' 		=> 'no',
+	),
+	'title' => array(
+		'title' 		=> __( 'Method title', 'woocommerce' ),
+		'type' 			=> 'text',
+		'description' 	=> __( 'This controls the title which the user sees during checkout.', 'woocommerce' ),
+		'default'		=> __( 'Flat rate', 'woocommerce' ),
+		'desc_tip'		=> true,
+	),
+	'availability' => array(
+		'title' 		=> __( 'Availability', 'woocommerce' ),
+		'type' 			=> 'select',
+		'default' 		=> 'all',
+		'class'			=> 'availability wc-enhanced-select',
+		'options'		=> array(
+			'all' 		=> __( 'All allowed countries', 'woocommerce' ),
+			'specific' 	=> __( 'Specific Countries', 'woocommerce' ),
+		),
+	),
+	'countries' => array(
+		'title' 		=> __( 'Specific countries', 'woocommerce' ),
+		'type' 			=> 'multiselect',
+		'class'			=> 'wc-enhanced-select',
+		'css'			=> 'width: 400px;',
+		'default' 		=> '',
+		'options'		=> WC()->countries->get_shipping_countries(),
+		'custom_attributes' => array(
+			'data-placeholder' => __( 'Select some countries', 'woocommerce' ),
+		),
+	),
+	'tax_status' => array(
+		'title' 		=> __( 'Tax status', 'woocommerce' ),
+		'type' 			=> 'select',
+		'class'         => 'wc-enhanced-select',
+		'default' 		=> 'taxable',
+		'options'		=> array(
+			'taxable' 	=> __( 'Taxable', 'woocommerce' ),
+			'none' 		=> _x( 'None', 'Tax status', 'woocommerce' ),
+		),
+	),
+	'cost' => array(
+		'title' 		=> __( 'Cost', 'woocommerce' ),
+		'type' 			=> 'text',
+		'placeholder'	=> '',
+		'description'	=> $cost_desc,
+		'default'		=> '',
+		'desc_tip'		=> true,
+	),
+);
+
+$shipping_classes = WC()->shipping->get_shipping_classes();
+
+if ( ! empty( $shipping_classes ) ) {
+	$settings['class_costs'] = array(
+		'title'			=> __( 'Shipping class costs', 'woocommerce' ),
+		'type'			=> 'title',
+		'default'       => '',
+		'description'   => sprintf( __( 'These costs can optionally be added based on the <a href="%s">product shipping class</a>.', 'woocommerce' ), admin_url( 'admin.php?page=wc-settings&tab=shipping&section=classes' ) ),
+	);
+	foreach ( $shipping_classes as $shipping_class ) {
+		if ( ! isset( $shipping_class->term_id ) ) {
+			continue;
+		}
+		$settings[ 'class_cost_' . $shipping_class->term_id ] = array(
+			/* translators: %s: shipping class name */
+			'title'       => sprintf( __( '"%s" shipping class cost', 'woocommerce' ), esc_html( $shipping_class->name ) ),
+			'type'        => 'text',
+			'placeholder' => __( 'N/A', 'woocommerce' ),
+			'description' => $cost_desc,
+			'default'     => $this->get_option( 'class_cost_' . $shipping_class->slug ), // Before 2.5.0, we used slug here which caused issues with long setting names
+			'desc_tip'    => true,
+		);
+	}
+	$settings['no_class_cost'] = array(
+		'title'       => __( 'No shipping class cost', 'woocommerce' ),
+		'type'        => 'text',
+		'placeholder' => __( 'N/A', 'woocommerce' ),
+		'description' => $cost_desc,
+		'default'     => '',
+		'desc_tip'    => true,
+	);
+	$settings['type'] = array(
+		'title' 		=> __( 'Calculation type', 'woocommerce' ),
+		'type' 			=> 'select',
+		'class'         => 'wc-enhanced-select',
+		'default' 		=> 'class',
+		'options' 		=> array(
+			'class' 	=> __( 'Per class: Charge shipping for each shipping class individually', 'woocommerce' ),
+			'order' 	=> __( 'Per order: Charge shipping for the most expensive shipping class', 'woocommerce' ),
+		),
+	);
+}
+
+if ( apply_filters( 'woocommerce_enable_deprecated_additional_flat_rates', $this->get_option( 'options', false ) ) ) {
+	$settings['additional_rates'] = array(
+		'title'			 => __( 'Additional rates', 'woocommerce' ),
+		'type'			 => 'title',
+		'default'        => '',
+		'description'    => __( 'These rates are extra shipping options with additional costs (based on the flat rate).', 'woocommerce' ),
+	);
+	$settings['options'] = array(
+		'title' 		=> __( 'Additional rates', 'woocommerce' ),
+		'type' 			=> 'textarea',
+		'description'	=> __( 'One per line: Option name | Additional cost [+- Percents] | Per cost type (order, class, or item) Example: <code>Priority mail | 6.95 [+ 0.2%] | order</code>.', 'woocommerce' ),
+		'default'		=> '',
+		'desc_tip'		=> true,
+		'placeholder'	=> __( 'Option name | Additional cost [+- Percents%] | Per cost type (order, class, or item)', 'woocommerce' ),
+	);
+}
+
+return $settings;
diff --git a/includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php b/includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php
new file mode 100644
index 00000000000..9564f385e5e
--- /dev/null
+++ b/includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php
@@ -0,0 +1,231 @@
+<?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+
+/**
+ * Free Shipping Method.
+ *
+ * This class is here for backwards commpatility for methods existing before zones existed.
+ *
+ * @deprecated  2.6.0
+ * @version 2.4.0
+ * @package WooCommerce/Classes/Shipping
+ * @author  WooThemes
+ */
+class WC_Shipping_Legacy_Free_Shipping extends WC_Shipping_Method {
+
+	/** @var float Min amount to be valid */
+	public $min_amount;
+
+	/** @var string Requires option */
+	public $requires;
+
+	/**
+	 * Constructor.
+	 */
+	public function __construct() {
+		$this->id 			= 'legacy_free_shipping';
+		$this->method_title = __( 'Free shipping (legacy)', 'woocommerce' );
+		$this->method_description = '<strong>' . sprintf( __( 'This method is deprecated in 2.6.0 and will be removed in future versions - we recommend disabling it and instead setting up a new rate within your <a href="%s">Shipping zones</a>.', 'woocommerce' ), admin_url( 'admin.php?page=wc-settings&tab=shipping' ) ) . '</strong>';
+		$this->init();
+	}
+
+	/**
+	 * Process and redirect if disabled.
+	 */
+	public function process_admin_options() {
+		parent::process_admin_options();
+
+		if ( 'no' === $this->settings['enabled'] ) {
+			wp_redirect( admin_url( 'admin.php?page=wc-settings&tab=shipping&section=options' ) );
+			exit;
+		}
+	}
+
+	/**
+	 * Return the name of the option in the WP DB.
+	 * @since 2.6.0
+	 * @return string
+	 */
+	public function get_option_key() {
+		return $this->plugin_id . 'free_shipping' . '_settings';
+	}
+
+	/**
+	 * init function.
+	 */
+	public function init() {
+
+		// Load the settings.
+		$this->init_form_fields();
+		$this->init_settings();
+
+		// Define user set variables
+		$this->enabled		= $this->get_option( 'enabled' );
+		$this->title 		= $this->get_option( 'title' );
+		$this->min_amount 	= $this->get_option( 'min_amount', 0 );
+		$this->availability = $this->get_option( 'availability' );
+		$this->countries 	= $this->get_option( 'countries' );
+		$this->requires		= $this->get_option( 'requires' );
+
+		// Actions
+		add_action( 'woocommerce_update_options_shipping_' . $this->id, array( $this, 'process_admin_options' ) );
+	}
+
+	/**
+	 * Initialise Gateway Settings Form Fields.
+	 */
+	public function init_form_fields() {
+		$this->form_fields = array(
+			'enabled' => array(
+				'title' 		=> __( 'Enable/Disable', 'woocommerce' ),
+				'type' 			=> 'checkbox',
+				'label' 		=> __( 'Once disabled, this legacy method will no longer be available.', 'woocommerce' ),
+				'default' 		=> 'no',
+			),
+			'title' => array(
+				'title' 		=> __( 'Method title', 'woocommerce' ),
+				'type' 			=> 'text',
+				'description' 	=> __( 'This controls the title which the user sees during checkout.', 'woocommerce' ),
+				'default'		=> __( 'Free Shipping', 'woocommerce' ),
+				'desc_tip'		=> true,
+			),
+			'availability' => array(
+				'title' 		=> __( 'Method availability', 'woocommerce' ),
+				'type' 			=> 'select',
+				'default' 		=> 'all',
+				'class'			=> 'availability wc-enhanced-select',
+				'options'		=> array(
+					'all' 		=> __( 'All allowed countries', 'woocommerce' ),
+					'specific' 	=> __( 'Specific Countries', 'woocommerce' ),
+				),
+			),
+			'countries' => array(
+				'title' 		=> __( 'Specific countries', 'woocommerce' ),
+				'type' 			=> 'multiselect',
+				'class'			=> 'wc-enhanced-select',
+				'css'			=> 'width: 400px;',
+				'default' 		=> '',
+				'options'		=> WC()->countries->get_shipping_countries(),
+				'custom_attributes' => array(
+					'data-placeholder' => __( 'Select some countries', 'woocommerce' ),
+				),
+			),
+			'requires' => array(
+				'title' 		=> __( 'Free shipping requires...', 'woocommerce' ),
+				'type' 			=> 'select',
+				'class'         => 'wc-enhanced-select',
+				'default' 		=> '',
+				'options'		=> array(
+					'' 				=> __( 'N/A', 'woocommerce' ),
+					'coupon'		=> __( 'A valid free shipping coupon', 'woocommerce' ),
+					'min_amount' 	=> __( 'A minimum order amount', 'woocommerce' ),
+					'either' 		=> __( 'A minimum order amount OR a coupon', 'woocommerce' ),
+					'both' 			=> __( 'A minimum order amount AND a coupon', 'woocommerce' ),
+				),
+			),
+			'min_amount' => array(
+				'title' 		=> __( 'Minimum order amount', 'woocommerce' ),
+				'type' 			=> 'price',
+				'placeholder'	=> wc_format_localized_price( 0 ),
+				'description' 	=> __( 'Users will need to spend this amount to get free shipping (if enabled above).', 'woocommerce' ),
+				'default' 		=> '0',
+				'desc_tip'		=> true,
+			),
+		);
+	}
+
+	/**
+	 * is_available function.
+	 * @param array $package
+	 * @return bool
+	 */
+	public function is_available( $package ) {
+		if ( 'no' == $this->enabled ) {
+			return false;
+		}
+
+		if ( 'specific' == $this->availability ) {
+			$ship_to_countries = $this->countries;
+		} else {
+			$ship_to_countries = array_keys( WC()->countries->get_shipping_countries() );
+		}
+
+		if ( is_array( $ship_to_countries ) && ! in_array( $package['destination']['country'], $ship_to_countries ) ) {
+			return false;
+		}
+
+		// Enabled logic
+		$is_available       = false;
+		$has_coupon         = false;
+		$has_met_min_amount = false;
+
+		if ( in_array( $this->requires, array( 'coupon', 'either', 'both' ) ) ) {
+
+			if ( $coupons = WC()->cart->get_coupons() ) {
+				foreach ( $coupons as $code => $coupon ) {
+					if ( $coupon->is_valid() && $coupon->get_free_shipping() ) {
+						$has_coupon = true;
+					}
+				}
+			}
+		}
+
+		if ( in_array( $this->requires, array( 'min_amount', 'either', 'both' ) ) && isset( WC()->cart->cart_contents_total ) ) {
+			if ( WC()->cart->prices_include_tax ) {
+				$total = WC()->cart->cart_contents_total + array_sum( WC()->cart->taxes );
+			} else {
+				$total = WC()->cart->cart_contents_total;
+			}
+
+			if ( $total >= $this->min_amount ) {
+				$has_met_min_amount = true;
+			}
+		}
+
+		switch ( $this->requires ) {
+			case 'min_amount' :
+				if ( $has_met_min_amount ) {
+					$is_available = true;
+				}
+			break;
+			case 'coupon' :
+				if ( $has_coupon ) {
+					$is_available = true;
+				}
+			break;
+			case 'both' :
+				if ( $has_met_min_amount && $has_coupon ) {
+					$is_available = true;
+				}
+			break;
+			case 'either' :
+				if ( $has_met_min_amount || $has_coupon ) {
+					$is_available = true;
+				}
+			break;
+			default :
+				$is_available = true;
+			break;
+		}
+
+		return apply_filters( 'woocommerce_shipping_' . $this->id . '_is_available', $is_available, $package );
+	}
+
+	/**
+	 * calculate_shipping function.
+	 * @return array
+	 */
+	public function calculate_shipping( $package = array() ) {
+		$args = array(
+			'id' 	  => $this->id,
+			'label'   => $this->title,
+			'cost' 	  => 0,
+			'taxes'   => false,
+			'package' => $package,
+		);
+		$this->add_rate( $args );
+	}
+}
diff --git a/includes/shipping/international-delivery/class-wc-shipping-international-delivery.php b/includes/shipping/legacy-international-delivery/class-wc-shipping-legacy-international-delivery.php
similarity index 63%
rename from includes/shipping/international-delivery/class-wc-shipping-international-delivery.php
rename to includes/shipping/legacy-international-delivery/class-wc-shipping-legacy-international-delivery.php
index 92c195df745..e6a76557c2e 100644
--- a/includes/shipping/international-delivery/class-wc-shipping-international-delivery.php
+++ b/includes/shipping/legacy-international-delivery/class-wc-shipping-legacy-international-delivery.php
@@ -6,25 +6,36 @@ if ( ! defined( 'ABSPATH' ) ) {
 /**
  * International Delivery - Based on the Flat Rate Shipping Method.
  *
- * @class 		WC_Shipping_Flat_Rate
+ * This class is here for backwards commpatility for methods existing before zones existed.
+ *
+ * @deprecated  2.6.0
  * @version		2.4.0
  * @package		WooCommerce/Classes/Shipping
  * @author 		WooThemes
  */
-class WC_Shipping_International_Delivery extends WC_Shipping_Flat_Rate {
+class WC_Shipping_Legacy_International_Delivery extends WC_Shipping_Legacy_Flat_Rate {
 
 	/**
 	 * Constructor.
 	 */
 	public function __construct() {
-		$this->id                 = 'international_delivery';
-		$this->method_title       = __( 'International Flat Rate', 'woocommerce' );
-		$this->method_description = __( 'International Flat Rate Shipping lets you charge a fixed rate for shipping.', 'woocommerce' );
+		$this->id                 = 'legacy_international_delivery';
+		$this->method_title       = __( 'International flat rate (legacy)', 'woocommerce' );
+		$this->method_description = '<strong>' . sprintf( __( 'This method is deprecated in 2.6.0 and will be removed in future versions - we recommend disabling it and instead setting up a new rate within your <a href="%s">Shipping zones</a>.', 'woocommerce' ), admin_url( 'admin.php?page=wc-settings&tab=shipping' ) ) . '</strong>';
 		$this->init();
 
 		add_action( 'woocommerce_update_options_shipping_' . $this->id, array( $this, 'process_admin_options' ) );
 	}
 
+	/**
+	 * Return the name of the option in the WP DB.
+	 * @since 2.6.0
+	 * @return string
+	 */
+	public function get_option_key() {
+		return $this->plugin_id . 'international_delivery' . '_settings';
+	}
+
 	/**
 	 * Initialise settings form fields.
 	 */
@@ -39,7 +50,7 @@ class WC_Shipping_International_Delivery extends WC_Shipping_Flat_Rate {
 			'options'		=> array(
 				'including' => __( 'Selected countries', 'woocommerce' ),
 				'excluding' => __( 'Excluding selected countries', 'woocommerce' ),
-			)
+			),
 		);
 	}
 
diff --git a/includes/shipping/local-delivery/class-wc-shipping-local-delivery.php b/includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php
similarity index 66%
rename from includes/shipping/local-delivery/class-wc-shipping-local-delivery.php
rename to includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php
index bf03401f232..643aa6ac064 100644
--- a/includes/shipping/local-delivery/class-wc-shipping-local-delivery.php
+++ b/includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php
@@ -7,25 +7,46 @@ if ( ! defined( 'ABSPATH' ) ) {
 /**
  * Local Delivery Shipping Method.
  *
- * A simple shipping method allowing local delivery as a shipping method.
+ * This class is here for backwards commpatility for methods existing before zones existed.
  *
- * @class 		WC_Shipping_Local_Delivery
+ * @deprecated  2.6.0
  * @version		2.3.0
  * @package		WooCommerce/Classes/Shipping
  * @author 		WooThemes
  */
-class WC_Shipping_Local_Delivery extends WC_Shipping_Local_Pickup {
+class WC_Shipping_Legacy_Local_Delivery extends WC_Shipping_Local_Pickup {
 
 	/**
 	 * Constructor.
 	 */
 	public function __construct() {
-		$this->id                 = 'local_delivery';
-		$this->method_title       = __( 'Local Delivery', 'woocommerce' );
-		$this->method_description = __( 'Local delivery is a simple shipping method for delivering orders locally.', 'woocommerce' );
+		$this->id                 = 'legacy_local_delivery';
+		$this->method_title       = __( 'Local delivery (legacy)', 'woocommerce' );
+		$this->method_description = '<strong>' . sprintf( __( 'This method is deprecated in 2.6.0 and will be removed in future versions - we recommend disabling it and instead setting up a new rate within your <a href="%s">Shipping zones</a>.', 'woocommerce' ), admin_url( 'admin.php?page=wc-settings&tab=shipping' ) ) . '</strong>';
 		$this->init();
 	}
 
+	/**
+	 * Process and redirect if disabled.
+	 */
+	public function process_admin_options() {
+		parent::process_admin_options();
+
+		if ( 'no' === $this->settings['enabled'] ) {
+			wp_redirect( admin_url( 'admin.php?page=wc-settings&tab=shipping&section=options' ) );
+			exit;
+		}
+	}
+
+	/**
+	 * Return the name of the option in the WP DB.
+	 * @since 2.6.0
+	 * @return string
+	 */
+	public function get_option_key() {
+		return $this->plugin_id . 'local_delivery' . '_settings';
+	}
+
 	/**
 	 * init function.
 	 */
@@ -66,15 +87,16 @@ class WC_Shipping_Local_Delivery extends WC_Shipping_Local_Pickup {
 				foreach ( $package['contents'] as $item_id => $values ) {
 					if ( $values['quantity'] > 0 && $values['data']->needs_shipping() ) {
 						$shipping_total += $this->fee * $values['quantity'];
-	                }
+					}
 				}
 			break;
 		}
 
 		$rate = array(
-			'id'    => $this->id,
-			'label' => $this->title,
-			'cost'  => $shipping_total
+			'id'      => $this->id,
+			'label'   => $this->title,
+			'cost'    => $shipping_total,
+			'package' => $package,
 		);
 
 		$this->add_rate( $rate );
@@ -88,18 +110,18 @@ class WC_Shipping_Local_Delivery extends WC_Shipping_Local_Pickup {
 			'enabled' => array(
 				'title'   => __( 'Enable', 'woocommerce' ),
 				'type'    => 'checkbox',
-				'label'   => __( 'Enable local delivery', 'woocommerce' ),
-				'default' => 'no'
+				'label'   => __( 'Once disabled, this legacy method will no longer be available.', 'woocommerce' ),
+				'default' => 'no',
 			),
 			'title' => array(
 				'title'       => __( 'Title', 'woocommerce' ),
 				'type'        => 'text',
 				'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce' ),
-				'default'     => __( 'Local Delivery', 'woocommerce' ),
+				'default'     => __( 'Local delivery', 'woocommerce' ),
 				'desc_tip'    => true,
 			),
 			'type' => array(
-				'title'       => __( 'Fee Type', 'woocommerce' ),
+				'title'       => __( 'Fee type', 'woocommerce' ),
 				'type'        => 'select',
 				'class'       => 'wc-enhanced-select',
 				'description' => __( 'How to calculate delivery charges', 'woocommerce' ),
@@ -112,20 +134,20 @@ class WC_Shipping_Local_Delivery extends WC_Shipping_Local_Pickup {
 				'desc_tip'    => true,
 			),
 			'fee' => array(
-				'title'       => __( 'Delivery Fee', 'woocommerce' ),
+				'title'       => __( 'Delivery fee', 'woocommerce' ),
 				'type'        => 'price',
 				'description' => __( 'What fee do you want to charge for local delivery, disregarded if you choose free. Leave blank to disable.', 'woocommerce' ),
 				'default'     => '',
 				'desc_tip'    => true,
-				'placeholder' => wc_format_localized_price( 0 )
+				'placeholder' => wc_format_localized_price( 0 ),
 			),
 			'codes' => array(
-				'title'       => __( 'Allowed ZIP/Post Codes', 'woocommerce' ),
+				'title'       => __( 'Allowed ZIP/post codes', 'woocommerce' ),
 				'type'        => 'text',
 				'desc_tip'    => __( 'What ZIP/post codes are available for local delivery?', 'woocommerce' ),
 				'default'     => '',
 				'description' => __( 'Separate codes with a comma. Accepts wildcards, e.g. <code>P*</code> will match a postcode of PE30. Also accepts a pattern, e.g. <code>NG1___</code> would match NG1 1AA but not NG10 1AA', 'woocommerce' ),
-				'placeholder' => 'e.g. 12345, 56789'
+				'placeholder' => 'e.g. 12345, 56789',
 			),
 			'availability' => array(
 				'title'       => __( 'Method availability', 'woocommerce' ),
@@ -134,20 +156,20 @@ class WC_Shipping_Local_Delivery extends WC_Shipping_Local_Pickup {
 				'class'       => 'availability wc-enhanced-select',
 				'options'     => array(
 					'all'         => __( 'All allowed countries', 'woocommerce' ),
-					'specific'    => __( 'Specific Countries', 'woocommerce' )
-				)
+					'specific'    => __( 'Specific Countries', 'woocommerce' ),
+				),
 			),
 			'countries' => array(
-				'title'       => __( 'Specific Countries', 'woocommerce' ),
+				'title'       => __( 'Specific countries', 'woocommerce' ),
 				'type'        => 'multiselect',
 				'class'       => 'wc-enhanced-select',
-				'css'         => 'width: 450px;',
+				'css'         => 'width: 400px;',
 				'default'     => '',
 				'options'     => WC()->countries->get_shipping_countries(),
 				'custom_attributes' => array(
-					'data-placeholder' => __( 'Select some countries', 'woocommerce' )
-				)
-			)
+					'data-placeholder' => __( 'Select some countries', 'woocommerce' ),
+				),
+			),
 		);
 	}
 }
diff --git a/includes/shipping/legacy-local-pickup/class-wc-shipping-legacy-local-pickup.php b/includes/shipping/legacy-local-pickup/class-wc-shipping-legacy-local-pickup.php
new file mode 100644
index 00000000000..c0f9697b9cf
--- /dev/null
+++ b/includes/shipping/legacy-local-pickup/class-wc-shipping-legacy-local-pickup.php
@@ -0,0 +1,222 @@
+<?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+
+/**
+ * Local Pickup Shipping Method.
+ *
+ * This class is here for backwards commpatility for methods existing before zones existed.
+ *
+ * @deprecated  2.6.0
+ * @version		2.3.0
+ * @package		WooCommerce/Classes/Shipping
+ * @author 		WooThemes
+ */
+class WC_Shipping_Legacy_Local_Pickup extends WC_Shipping_Method {
+
+	/**
+	 * Constructor.
+	 */
+	public function __construct() {
+		$this->id                 = 'legacy_local_pickup';
+		$this->method_title       = __( 'Local pickup (legacy)', 'woocommerce' );
+		$this->method_description = '<strong>' . sprintf( __( 'This method is deprecated in 2.6.0 and will be removed in future versions - we recommend disabling it and instead setting up a new rate within your <a href="%s">Shipping zones</a>.', 'woocommerce' ), admin_url( 'admin.php?page=wc-settings&tab=shipping' ) ) . '</strong>';
+		$this->init();
+	}
+
+	/**
+	 * Process and redirect if disabled.
+	 */
+	public function process_admin_options() {
+		parent::process_admin_options();
+
+		if ( 'no' === $this->settings['enabled'] ) {
+			wp_redirect( admin_url( 'admin.php?page=wc-settings&tab=shipping&section=options' ) );
+			exit;
+		}
+	}
+
+	/**
+	 * Return the name of the option in the WP DB.
+	 * @since 2.6.0
+	 * @return string
+	 */
+	public function get_option_key() {
+		return $this->plugin_id . 'local_pickup' . '_settings';
+	}
+
+	/**
+	 * init function.
+	 */
+	public function init() {
+
+		// Load the settings.
+		$this->init_form_fields();
+		$this->init_settings();
+
+		// Define user set variables
+		$this->enabled		= $this->get_option( 'enabled' );
+		$this->title		= $this->get_option( 'title' );
+		$this->codes		= $this->get_option( 'codes' );
+		$this->availability	= $this->get_option( 'availability' );
+		$this->countries	= $this->get_option( 'countries' );
+
+		// Actions
+		add_action( 'woocommerce_update_options_shipping_' . $this->id, array( $this, 'process_admin_options' ) );
+	}
+
+	/**
+	 * calculate_shipping function.
+	 */
+	public function calculate_shipping( $package = array() ) {
+		$rate = array(
+			'id' 		 => $this->id,
+			'label' 	 => $this->title,
+			'package'    => $package,
+		);
+		$this->add_rate( $rate );
+	}
+
+	/**
+	 * init_form_fields function.
+	 */
+	public function init_form_fields() {
+		$this->form_fields = array(
+			'enabled' => array(
+				'title'   => __( 'Enable', 'woocommerce' ),
+				'type'    => 'checkbox',
+				'label'   => __( 'Once disabled, this legacy method will no longer be available.', 'woocommerce' ),
+				'default' => 'no',
+			),
+			'title' => array(
+				'title'       => __( 'Title', 'woocommerce' ),
+				'type'        => 'text',
+				'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce' ),
+				'default'     => __( 'Local pickup', 'woocommerce' ),
+				'desc_tip'    => true,
+			),
+			'codes' => array(
+				'title'       => __( 'Allowed ZIP/post codes', 'woocommerce' ),
+				'type'        => 'text',
+				'desc_tip'    => __( 'What ZIP/post codes are available for local pickup?', 'woocommerce' ),
+				'default'     => '',
+				'description' => __( 'Separate codes with a comma. Accepts wildcards, e.g. <code>P*</code> will match a postcode of PE30. Also accepts a pattern, e.g. <code>NG1___</code> would match NG1 1AA but not NG10 1AA', 'woocommerce' ),
+				'placeholder' => 'e.g. 12345, 56789',
+			),
+			'availability' => array(
+				'title'    => __( 'Method availability', 'woocommerce' ),
+				'type'     => 'select',
+				'default'  => 'all',
+				'class'    => 'availability wc-enhanced-select',
+				'options'  => array(
+					'all'      => __( 'All allowed countries', 'woocommerce' ),
+					'specific' => __( 'Specific countries', 'woocommerce' ),
+				),
+			),
+			'countries' => array(
+				'title'             => __( 'Specific countries', 'woocommerce' ),
+				'type'              => 'multiselect',
+				'class'             => 'wc-enhanced-select',
+				'css'               => 'width: 400px;',
+				'default'           => '',
+				'options'           => WC()->countries->get_shipping_countries(),
+				'custom_attributes' => array(
+					'data-placeholder'  => __( 'Select some countries', 'woocommerce' ),
+				),
+			),
+		);
+	}
+
+	/**
+	 * Get postcodes for this method.
+	 * @return array
+	 */
+	public function get_valid_postcodes() {
+		$codes = array();
+
+		if ( '' !== $this->codes ) {
+			foreach ( explode( ',', $this->codes ) as $code ) {
+				$codes[] = strtoupper( trim( $code ) );
+			}
+		}
+
+		return $codes;
+	}
+
+	/**
+	 * See if a given postcode matches valid postcodes.
+	 * @param  string postcode
+	 * @param  string country code
+	 * @return boolean
+	 */
+	public function is_valid_postcode( $postcode, $country ) {
+		$codes              = $this->get_valid_postcodes();
+		$postcode           = $this->clean( $postcode );
+		$formatted_postcode = wc_format_postcode( $postcode, $country );
+
+		if ( in_array( $postcode, $codes ) || in_array( $formatted_postcode, $codes ) ) {
+			return true;
+		}
+
+		// Pattern matching
+		foreach ( $codes as $c ) {
+			$pattern = '/^' . str_replace( '_', '[0-9a-zA-Z]', preg_quote( $c ) ) . '$/i';
+			if ( preg_match( $pattern, $postcode ) ) {
+				return true;
+			}
+		}
+
+		// Wildcard search
+		$wildcard_postcode = $formatted_postcode . '*';
+		$postcode_length   = strlen( $formatted_postcode );
+
+		for ( $i = 0; $i < $postcode_length; $i++ ) {
+			if ( in_array( $wildcard_postcode, $codes ) ) {
+				return true;
+			}
+			$wildcard_postcode = substr( $wildcard_postcode, 0, -2 ) . '*';
+		}
+
+		return false;
+	}
+
+	/**
+	 * See if the method is available.
+	 *
+	 * @param array $package
+	 * @return bool
+	 */
+	public function is_available( $package ) {
+		$is_available = "yes" === $this->enabled;
+
+		if ( $is_available && $this->get_valid_postcodes() ) {
+			$is_available = $this->is_valid_postcode( $package['destination']['postcode'], $package['destination']['country'] );
+		}
+
+		if ( $is_available ) {
+			if ( 'specific' === $this->availability ) {
+				$ship_to_countries = $this->countries;
+			} else {
+				$ship_to_countries = array_keys( WC()->countries->get_shipping_countries() );
+			}
+			if ( is_array( $ship_to_countries ) && ! in_array( $package['destination']['country'], $ship_to_countries ) ) {
+				$is_available = false;
+			}
+		}
+
+		return apply_filters( 'woocommerce_shipping_' . $this->id . '_is_available', $is_available, $package );
+	}
+
+	/**
+	 * clean function.
+	 *
+	 * @access public
+	 * @param mixed $code
+	 * @return string
+	 */
+	public function clean( $code ) {
+		return str_replace( '-', '', sanitize_title( $code ) ) . ( strstr( $code, '*' ) ? '*' : '' );
+	}
+}
diff --git a/includes/shipping/local-pickup/class-wc-shipping-local-pickup.php b/includes/shipping/local-pickup/class-wc-shipping-local-pickup.php
index 937b3792e1b..fa50aab0b78 100644
--- a/includes/shipping/local-pickup/class-wc-shipping-local-pickup.php
+++ b/includes/shipping/local-pickup/class-wc-shipping-local-pickup.php
@@ -1,7 +1,6 @@
 <?php
-
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
 /**
@@ -10,7 +9,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  * A simple shipping method allowing free pickup as a shipping method.
  *
  * @class 		WC_Shipping_Local_Pickup
- * @version		2.3.0
+ * @version		2.6.0
  * @package		WooCommerce/Classes/Shipping
  * @author 		WooThemes
  */
@@ -19,15 +18,21 @@ class WC_Shipping_Local_Pickup extends WC_Shipping_Method {
 	/**
 	 * Constructor.
 	 */
-	public function __construct() {
-		$this->id                 = 'local_pickup';
-		$this->method_title       = __( 'Local Pickup', 'woocommerce' );
-		$this->method_description = __( 'Local pickup is a simple method which allows customers to pick up orders themselves.', 'woocommerce' );
+	public function __construct( $instance_id = 0 ) {
+		$this->id                    = 'local_pickup';
+		$this->instance_id 			 = absint( $instance_id );
+		$this->method_title          = __( 'Local pickup', 'woocommerce' );
+		$this->method_description    = __( 'Allow customers to pick up orders themselves. By default, when using local pickup store base taxes will apply regardless of customer address.', 'woocommerce' );
+		$this->supports              = array(
+			'shipping-zones',
+			'instance-settings',
+			'instance-settings-modal',
+		);
 		$this->init();
 	}
 
 	/**
-	 * init function.
+	 * Initialize local pickup.
 	 */
 	public function init() {
 
@@ -36,11 +41,9 @@ class WC_Shipping_Local_Pickup extends WC_Shipping_Method {
 		$this->init_settings();
 
 		// Define user set variables
-		$this->enabled		= $this->get_option( 'enabled' );
-		$this->title		= $this->get_option( 'title' );
-		$this->codes		= $this->get_option( 'codes' );
-		$this->availability	= $this->get_option( 'availability' );
-		$this->countries	= $this->get_option( 'countries' );
+		$this->title		     = $this->get_option( 'title' );
+		$this->tax_status	     = $this->get_option( 'tax_status' );
+		$this->cost	             = $this->get_option( 'cost' );
 
 		// Actions
 		add_action( 'woocommerce_update_options_shipping_' . $this->id, array( $this, 'process_admin_options' ) );
@@ -48,153 +51,46 @@ class WC_Shipping_Local_Pickup extends WC_Shipping_Method {
 
 	/**
 	 * calculate_shipping function.
+	 * Calculate local pickup shipping.
 	 */
-	public function calculate_shipping() {
-		$rate = array(
-			'id' 		=> $this->id,
-			'label' 	=> $this->title,
-		);
-		$this->add_rate( $rate );
+	public function calculate_shipping( $package = array() ) {
+		$this->add_rate( array(
+			'label' 	 => $this->title,
+			'package'    => $package,
+			'cost'       => $this->cost,
+		) );
 	}
 
 	/**
-	 * init_form_fields function.
+	 * Init form fields.
 	 */
 	public function init_form_fields() {
-		$this->form_fields = array(
-			'enabled' => array(
-				'title'   => __( 'Enable', 'woocommerce' ),
-				'type'    => 'checkbox',
-				'label'   => __( 'Enable local pickup', 'woocommerce' ),
-				'default' => 'no'
-			),
+		$this->instance_form_fields = array(
 			'title' => array(
 				'title'       => __( 'Title', 'woocommerce' ),
 				'type'        => 'text',
 				'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce' ),
-				'default'     => __( 'Local Pickup', 'woocommerce' ),
+				'default'     => __( 'Local pickup', 'woocommerce' ),
 				'desc_tip'    => true,
 			),
-			'codes' => array(
-				'title'       => __( 'Allowed ZIP/Post Codes', 'woocommerce' ),
-				'type'        => 'text',
-				'desc_tip'    => __( 'What ZIP/post codes are available for local pickup?', 'woocommerce' ),
-				'default'     => '',
-				'description' => __( 'Separate codes with a comma. Accepts wildcards, e.g. <code>P*</code> will match a postcode of PE30. Also accepts a pattern, e.g. <code>NG1___</code> would match NG1 1AA but not NG10 1AA', 'woocommerce' ),
-				'placeholder' => 'e.g. 12345, 56789'
+			'tax_status' => array(
+				'title' 		=> __( 'Tax status', 'woocommerce' ),
+				'type' 			=> 'select',
+				'class'         => 'wc-enhanced-select',
+				'default' 		=> 'taxable',
+				'options'		=> array(
+					'taxable' 	=> __( 'Taxable', 'woocommerce' ),
+					'none' 		=> _x( 'None', 'Tax status', 'woocommerce' ),
+				),
 			),
-			'availability' => array(
-				'title'    => __( 'Method availability', 'woocommerce' ),
-				'type'     => 'select',
-				'default'  => 'all',
-				'class'    => 'availability wc-enhanced-select',
-				'options'  => array(
-					'all'      => __( 'All allowed countries', 'woocommerce' ),
-					'specific' => __( 'Specific Countries', 'woocommerce' )
-				)
+			'cost' => array(
+				'title' 		=> __( 'Cost', 'woocommerce' ),
+				'type' 			=> 'text',
+				'placeholder'	=> '0',
+				'description'	=> __( 'Optional cost for local pickup.', 'woocommerce' ),
+				'default'		=> '',
+				'desc_tip'		=> true,
 			),
-			'countries' => array(
-				'title'             => __( 'Specific Countries', 'woocommerce' ),
-				'type'              => 'multiselect',
-				'class'             => 'wc-enhanced-select',
-				'css'               => 'width: 450px;',
-				'default'           => '',
-				'options'           => WC()->countries->get_shipping_countries(),
-				'custom_attributes' => array(
-					'data-placeholder'  => __( 'Select some countries', 'woocommerce' )
-				)
-			)
 		);
 	}
-
-	/**
-	 * Get postcodes for this method.
-	 * @return array
-	 */
-	public function get_valid_postcodes() {
-		$codes = array();
-
-		if ( $this->codes != '' ) {
-			foreach( explode( ',', $this->codes ) as $code ) {
-				$codes[] = strtoupper( trim( $code ) );
-			}
-		}
-
-		return $codes;
-	}
-
-	/**
-	 * See if a given postcode matches valid postcodes.
-	 * @param  string postcode
-	 * @param  string country code
-	 * @return boolean
-	 */
-	public function is_valid_postcode( $postcode, $country ) {
-		$codes              = $this->get_valid_postcodes();
-		$postcode           = $this->clean( $postcode );
-		$formatted_postcode = wc_format_postcode( $postcode, $country );
-
-		if ( in_array( $postcode, $codes ) || in_array( $formatted_postcode, $codes ) ) {
-			return true;
-		}
-
-		// Pattern matching
-		foreach ( $codes as $c ) {
-			$pattern = '/^' . str_replace( '_', '[0-9a-zA-Z]', preg_quote( $c ) ) . '$/i';
-			if ( preg_match( $pattern, $postcode ) ) {
-				return true;
-			}
-		}
-
-		// Wildcard search
-		$wildcard_postcode = $formatted_postcode . '*';
-		$postcode_length   = strlen( $formatted_postcode );
-
-		for ( $i = 0; $i < $postcode_length; $i++ ) {
-			if ( in_array( $wildcard_postcode, $codes ) ) {
-				return true;
-			}
-			$wildcard_postcode = substr( $wildcard_postcode, 0, -2 ) . '*';
-		}
-
-		return false;
-	}
-
-	/**
-	 * See if the method is available.
-	 *
-	 * @param array $package
-	 * @return bool
-	 */
-	public function is_available( $package ) {
-		$is_available = "yes" === $this->enabled;
-
-		if ( $is_available && $this->get_valid_postcodes() ) {
-			$is_available = $this->is_valid_postcode( $package['destination']['postcode'], $package['destination']['country'] );
-		}
-
-		if ( $is_available ) {
-			if ( $this->availability === 'specific' ) {
-				$ship_to_countries = $this->countries;
-			} else {
-				$ship_to_countries = array_keys( WC()->countries->get_shipping_countries() );
-			}
-			if ( is_array( $ship_to_countries ) && ! in_array( $package['destination']['country'], $ship_to_countries ) ) {
-				$is_available = false;
-			}
-		}
-
-		return apply_filters( 'woocommerce_shipping_' . $this->id . '_is_available', $is_available, $package );
-	}
-
-	/**
-	 * clean function.
-	 *
-	 * @access public
-	 * @param mixed $code
-	 * @return string
-	 */
-	public function clean( $code ) {
-		return str_replace( '-', '', sanitize_title( $code ) ) . ( strstr( $code, '*' ) ? '*' : '' );
-	}
 }
diff --git a/includes/shortcodes/class-wc-shortcode-cart.php b/includes/shortcodes/class-wc-shortcode-cart.php
index c64213c6c74..e799c269924 100644
--- a/includes/shortcodes/class-wc-shortcode-cart.php
+++ b/includes/shortcodes/class-wc-shortcode-cart.php
@@ -24,7 +24,7 @@ class WC_Shortcode_Cart {
 			$city     = apply_filters( 'woocommerce_shipping_calculator_enable_city', false ) ? wc_clean( $_POST['calc_shipping_city'] ) : '';
 
 			if ( $postcode && ! WC_Validation::is_postcode( $postcode, $country ) ) {
-				throw new Exception( __( 'Please enter a valid postcode/ZIP.', 'woocommerce' ) );
+				throw new Exception( __( 'Please enter a valid postcode / ZIP.', 'woocommerce' ) );
 			} elseif ( $postcode ) {
 				$postcode = wc_format_postcode( $postcode, $country );
 			}
@@ -37,7 +37,8 @@ class WC_Shortcode_Cart {
 				WC()->customer->set_shipping_to_base();
 			}
 
-			WC()->customer->calculated_shipping( true );
+			WC()->customer->set_calculated_shipping( true );
+			WC()->customer->save();
 
 			wc_add_notice( __( 'Shipping costs updated.', 'woocommerce' ), 'notice' );
 
@@ -52,16 +53,23 @@ class WC_Shortcode_Cart {
 
 	/**
 	 * Output the cart shortcode.
+	 *
+	 * @param array $atts
 	 */
-	public static function output() {
+	public static function output( $atts ) {
 		// Constants
 		if ( ! defined( 'WOOCOMMERCE_CART' ) ) {
 			define( 'WOOCOMMERCE_CART', true );
 		}
 
+		$atts = shortcode_atts( array(), $atts, 'woocommerce_cart' );
+
 		// Update Shipping
 		if ( ! empty( $_POST['calc_shipping'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'woocommerce-cart' ) ) {
 			self::calculate_shipping();
+
+			// Also calc totals before we check items so subtotals etc are up to date
+			WC()->cart->calculate_totals();
 		}
 
 		// Check cart items are valid
diff --git a/includes/shortcodes/class-wc-shortcode-checkout.php b/includes/shortcodes/class-wc-shortcode-checkout.php
index 1259c8e2d33..5779737862f 100644
--- a/includes/shortcodes/class-wc-shortcode-checkout.php
+++ b/includes/shortcodes/class-wc-shortcode-checkout.php
@@ -34,9 +34,11 @@ class WC_Shortcode_Checkout {
 			return;
 		}
 
+		$atts = shortcode_atts( array(), $atts, 'woocommerce_checkout' );
+
 		// Backwards compat with old pay and thanks link arguments
 		if ( isset( $_GET['order'] ) && isset( $_GET['key'] ) ) {
-			_deprecated_argument( __CLASS__ . '->' . __FUNCTION__, '2.1', '"order" is no longer used to pass an order ID. Use the order-pay or order-received endpoint instead.' );
+			wc_deprecated_argument( __CLASS__ . '->' . __FUNCTION__, '2.1', '"order" is no longer used to pass an order ID. Use the order-pay or order-received endpoint instead.' );
 
 			// Get the order to work out what we are showing
 			$order_id = absint( $_GET['order'] );
@@ -82,28 +84,23 @@ class WC_Shortcode_Checkout {
 		if ( isset( $_GET['pay_for_order'] ) && isset( $_GET['key'] ) && $order_id ) {
 
 			// Pay for existing order
-			$order_key            = $_GET[ 'key' ];
+			$order_key            = $_GET['key'];
 			$order                = wc_get_order( $order_id );
 
 			if ( ! current_user_can( 'pay_for_order', $order_id ) ) {
-				echo '<div class="woocommerce-error">' . __( 'Invalid order. If you have an account please log in and try again.', 'woocommerce' ) . ' <a href="' . wc_get_page_permalink( 'myaccount' ) . '" class="wc-forward">' . __( 'My Account', 'woocommerce' ) . '</a>' . '</div>';
+				echo '<div class="woocommerce-error">' . __( 'Invalid order. If you have an account please log in and try again.', 'woocommerce' ) . ' <a href="' . wc_get_page_permalink( 'myaccount' ) . '" class="wc-forward">' . __( 'My account', 'woocommerce' ) . '</a>' . '</div>';
 				return;
 			}
 
-			if ( $order->id == $order_id && $order->order_key == $order_key ) {
+			if ( $order->get_id() == $order_id && $order->get_order_key() == $order_key ) {
 
 				if ( $order->needs_payment() ) {
-
-					// Set customer location to order location
-					if ( $order->billing_country ) {
-						WC()->customer->set_country( $order->billing_country );
-					}
-					if ( $order->billing_state ) {
-						WC()->customer->set_state( $order->billing_state );
-					}
-					if ( $order->billing_postcode ) {
-						WC()->customer->set_postcode( $order->billing_postcode );
-					}
+					WC()->customer->set_props( array(
+						'billing_country'  => $order->get_billing_country() ? $order->get_billing_country()   : null,
+						'billing_state'    => $order->get_billing_state() ? $order->get_billing_state()       : null,
+						'billing_postcode' => $order->get_billing_postcode() ? $order->get_billing_postcode() : null,
+					) );
+					WC()->customer->save();
 
 					$available_gateways = WC()->payment_gateways->get_available_payment_gateways();
 
@@ -114,52 +111,50 @@ class WC_Shortcode_Checkout {
 					wc_get_template( 'checkout/form-pay.php', array(
 						'order'              => $order,
 						'available_gateways' => $available_gateways,
-						'order_button_text'  => apply_filters( 'woocommerce_pay_order_button_text', __( 'Pay for order', 'woocommerce' ) )
+						'order_button_text'  => apply_filters( 'woocommerce_pay_order_button_text', __( 'Pay for order', 'woocommerce' ) ),
 					) );
 
 				} else {
 					wc_add_notice( sprintf( __( 'This order&rsquo;s status is &ldquo;%s&rdquo;&mdash;it cannot be paid for. Please contact us if you need assistance.', 'woocommerce' ), wc_get_order_status_name( $order->get_status() ) ), 'error' );
 				}
-
 			} else {
 				wc_add_notice( __( 'Sorry, this order is invalid and cannot be paid for.', 'woocommerce' ), 'error' );
 			}
-
 		} elseif ( $order_id ) {
 
 			// Pay for order after checkout step
 			$order_key            = isset( $_GET['key'] ) ? wc_clean( $_GET['key'] ) : '';
 			$order                = wc_get_order( $order_id );
 
-			if ( $order->id == $order_id && $order->order_key == $order_key ) {
+			if ( $order->get_id() == $order_id && $order->get_order_key() == $order_key ) {
 
 				if ( $order->needs_payment() ) {
 
 					?>
 					<ul class="order_details">
 						<li class="order">
-							<?php _e( 'Order Number:', 'woocommerce' ); ?>
+							<?php _e( 'Order number:', 'woocommerce' ); ?>
 							<strong><?php echo $order->get_order_number(); ?></strong>
 						</li>
 						<li class="date">
 							<?php _e( 'Date:', 'woocommerce' ); ?>
-							<strong><?php echo date_i18n(get_option('date_format'), strtotime($order->order_date)); ?></strong>
+							<strong><?php echo wc_format_datetime( $order->get_date_created() ); ?></strong>
 						</li>
 						<li class="total">
 							<?php _e( 'Total:', 'woocommerce' ); ?>
 							<strong><?php echo $order->get_formatted_order_total(); ?></strong>
 						</li>
-						<?php if ($order->payment_method_title) : ?>
+						<?php if ( $order->get_payment_method_title() ) : ?>
 						<li class="method">
-							<?php _e( 'Payment Method:', 'woocommerce' ); ?>
+							<?php _e( 'Payment method:', 'woocommerce' ); ?>
 							<strong><?php
-								echo $order->payment_method_title;
+								echo wp_kses_post( $order->get_payment_method_title() );
 							?></strong>
 						</li>
 						<?php endif; ?>
 					</ul>
 
-					<?php do_action( 'woocommerce_receipt_' . $order->payment_method, $order_id ); ?>
+					<?php do_action( 'woocommerce_receipt_' . $order->get_payment_method(), $order_id ); ?>
 
 					<div class="clear"></div>
 					<?php
@@ -167,11 +162,9 @@ class WC_Shortcode_Checkout {
 				} else {
 					wc_add_notice( sprintf( __( 'This order&rsquo;s status is &ldquo;%s&rdquo;&mdash;it cannot be paid for. Please contact us if you need assistance.', 'woocommerce' ), wc_get_order_status_name( $order->get_status() ) ), 'error' );
 				}
-
 			} else {
 				wc_add_notice( __( 'Sorry, this order is invalid and cannot be paid for.', 'woocommerce' ), 'error' );
 			}
-
 		} else {
 			wc_add_notice( __( 'Invalid order.', 'woocommerce' ), 'error' );
 		}
@@ -198,13 +191,17 @@ class WC_Shortcode_Checkout {
 
 		if ( $order_id > 0 ) {
 			$order = wc_get_order( $order_id );
-			if ( $order->order_key != $order_key )
-				unset( $order );
+			if ( ! $order || $order->get_order_key() !== $order_key ) {
+				$order = false;
+			}
 		}
 
 		// Empty awaiting payment session
 		unset( WC()->session->order_awaiting_payment );
 
+		// Empty current cart
+		wc_empty_cart();
+
 		wc_get_template( 'checkout/thankyou.php', array( 'order' => $order ) );
 	}
 
@@ -238,8 +235,9 @@ class WC_Shortcode_Checkout {
 
 			$non_js_checkout = ! empty( $_POST['woocommerce_checkout_update_totals'] ) ? true : false;
 
-			if ( wc_notice_count( 'error' ) == 0 && $non_js_checkout )
-				wc_add_notice( __( 'The order totals have been updated. Please confirm your order by pressing the Place Order button at the bottom of the page.', 'woocommerce' ) );
+			if ( wc_notice_count( 'error' ) == 0 && $non_js_checkout ) {
+				wc_add_notice( __( 'The order totals have been updated. Please confirm your order by pressing the "Place order" button at the bottom of the page.', 'woocommerce' ) );
+			}
 
 			wc_get_template( 'checkout/form-checkout.php', array( 'checkout' => $checkout ) );
 
diff --git a/includes/shortcodes/class-wc-shortcode-my-account.php b/includes/shortcodes/class-wc-shortcode-my-account.php
index bc725a25faf..037b5a95415 100644
--- a/includes/shortcodes/class-wc-shortcode-my-account.php
+++ b/includes/shortcodes/class-wc-shortcode-my-account.php
@@ -35,77 +35,87 @@ class WC_Shortcode_My_Account {
 		}
 
 		if ( ! is_user_logged_in() ) {
-
 			$message = apply_filters( 'woocommerce_my_account_message', '' );
 
 			if ( ! empty( $message ) ) {
 				wc_add_notice( $message );
 			}
 
+			// After password reset, add confirmation message.
+			if ( ! empty( $_GET['password-reset'] ) ) {
+				wc_add_notice( __( 'Your password has been reset successfully.', 'woocommerce' ) );
+			}
+
 			if ( isset( $wp->query_vars['lost-password'] ) ) {
-
 				self::lost_password();
-
 			} else {
-
 				wc_get_template( 'myaccount/form-login.php' );
+			}
+		 } else {
+			// Start output buffer since the html may need discarding for BW compatibility
+			ob_start();
 
+			// Collect notices before output
+			$notices = wc_get_notices();
+
+			// Output the new account page
+			self::my_account( $atts );
+
+			/**
+			 * Deprecated my-account.php template handling. This code should be
+			 * removed in a future release.
+			 *
+			 * If woocommerce_account_content did not run, this is an old template
+			 * so we need to render the endpoint content again.
+			 */
+			if ( ! did_action( 'woocommerce_account_content' ) ) {
+				foreach ( $wp->query_vars as $key => $value ) {
+					if ( 'pagename' === $key ) {
+						continue;
+					}
+					if ( has_action( 'woocommerce_account_' . $key . '_endpoint' ) ) {
+						ob_clean(); // Clear previous buffer
+						wc_set_notices( $notices );
+						wc_print_notices();
+						do_action( 'woocommerce_account_' . $key . '_endpoint', $value );
+						break;
+					}
+	 			}
+
+				wc_deprecated_function( 'Your theme version of my-account.php template', '2.6', 'the latest version, which supports multiple account pages and navigation, from WC 2.6.0' );
 			}
 
-		} else {
-
-			if ( ! empty( $wp->query_vars['view-order'] ) ) {
-
-				self::view_order( absint( $wp->query_vars['view-order'] ) );
-
-			} elseif ( isset( $wp->query_vars['edit-account'] ) ) {
-
-				self::edit_account();
-
-			} elseif ( isset( $wp->query_vars['edit-address'] ) ) {
-
-				self::edit_address( wc_edit_address_i18n( sanitize_title( $wp->query_vars['edit-address'] ), true ) );
-
-			} elseif ( isset( $wp->query_vars['add-payment-method'] ) ) {
-
-				self::add_payment_method();
-
-			} else {
-
-				self::my_account( $atts );
-
-			}
+			// Send output buffer
+			ob_end_flush();
 		}
 	}
 
 	/**
 	 * My account page.
 	 *
-	 * @param  array $atts
+	 * @param array $atts
 	 */
 	private static function my_account( $atts ) {
 		extract( shortcode_atts( array(
-	    	'order_count' => 15
-		), $atts ) );
+			'order_count' => 15, // @deprecated 2.6.0. Keep for backward compatibility.
+		), $atts, 'woocommerce_my_account' ) );
 
 		wc_get_template( 'myaccount/my-account.php', array(
-			'current_user' 	=> get_user_by( 'id', get_current_user_id() ),
-			'order_count' 	=> 'all' == $order_count ? -1 : $order_count
+			'current_user' => get_user_by( 'id', get_current_user_id() ),
+			'order_count'  => 'all' == $order_count ? -1 : $order_count,
 		) );
 	}
 
 	/**
 	 * View order page.
 	 *
-	 * @param  int $order_id
+	 * @param int $order_id
 	 */
-	private static function view_order( $order_id ) {
-
-		$user_id      	= get_current_user_id();
-		$order 			= wc_get_order( $order_id );
+	public static function view_order( $order_id ) {
+		$order   = wc_get_order( $order_id );
 
 		if ( ! current_user_can( 'view_order', $order_id ) ) {
-			echo '<div class="woocommerce-error">' . __( 'Invalid order.', 'woocommerce' ) . ' <a href="' . wc_get_page_permalink( 'myaccount' ).'" class="wc-forward">'. __( 'My Account', 'woocommerce' ) .'</a>' . '</div>';
+			echo '<div class="woocommerce-error">' . __( 'Invalid order.', 'woocommerce' ) . ' <a href="' . wc_get_page_permalink( 'myaccount' ) . '" class="wc-forward">' . __( 'My account', 'woocommerce' ) . '</a>' . '</div>';
 			return;
 		}
 
@@ -114,31 +124,26 @@ class WC_Shortcode_My_Account {
 		$status->name = wc_get_order_status_name( $order->get_status() );
 
 		wc_get_template( 'myaccount/view-order.php', array(
-	        'status'    => $status, // @deprecated 2.2
-	        'order'     => wc_get_order( $order_id ),
-	        'order_id'  => $order_id
-	    ) );
+			'status'    => $status, // @deprecated 2.2
+			'order'     => wc_get_order( $order_id ),
+			'order_id'  => $order_id,
+		) );
 	}
 
 	/**
 	 * Edit account details page.
 	 */
-	private static function edit_account() {
+	public static function edit_account() {
 		wc_get_template( 'myaccount/form-edit-account.php', array( 'user' => get_user_by( 'id', get_current_user_id() ) ) );
 	}
 
 	/**
 	 * Edit address page.
 	 *
-	 * @access public
 	 * @param string $load_address
 	 */
-	private static function edit_address( $load_address = 'billing' ) {
-
-		// Current user
-		global $current_user;
-		get_currentuserinfo();
-
+	public static function edit_address( $load_address = 'billing' ) {
+		$current_user = wp_get_current_user();
 		$load_address = sanitize_key( $load_address );
 
 		$address = WC()->countries->get_address_fields( get_user_meta( get_current_user_id(), $load_address . '_country', true ), $load_address . '_' );
@@ -153,7 +158,7 @@ class WC_Shortcode_My_Account {
 			$value = get_user_meta( get_current_user_id(), $key, true );
 
 			if ( ! $value ) {
-				switch( $key ) {
+				switch ( $key ) {
 					case 'billing_email' :
 					case 'shipping_email' :
 						$value = $current_user->user_email;
@@ -174,33 +179,44 @@ class WC_Shortcode_My_Account {
 
 		wc_get_template( 'myaccount/form-edit-address.php', array(
 			'load_address' 	=> $load_address,
-			'address'		=> apply_filters( 'woocommerce_address_to_edit', $address )
+			'address'		=> apply_filters( 'woocommerce_address_to_edit', $address, $load_address ),
 		) );
 	}
 
 	/**
-	 * Lost password page.
+	 * Lost password page handling.
 	 */
 	public static function lost_password() {
-		// arguments to pass to template
-		$args = array( 'form' => 'lost_password' );
+		/**
+		 * After sending the reset link, don't show the form again.
+		 */
+		if ( ! empty( $_GET['reset-link-sent'] ) ) {
+			return wc_get_template( 'myaccount/lost-password-confirmation.php' );
 
-		// process reset key / login from email confirmation link
-		if ( isset( $_GET['key'] ) && isset( $_GET['login'] ) ) {
+		/**
+		 * Process reset key / login from email confirmation link
+		 */
+		} elseif ( ! empty( $_GET['show-reset-form'] ) ) {
+			if ( isset( $_COOKIE[ 'wp-resetpass-' . COOKIEHASH ] ) && 0 < strpos( $_COOKIE[ 'wp-resetpass-' . COOKIEHASH ], ':' ) ) {
+				list( $rp_login, $rp_key ) = array_map( 'wc_clean', explode( ':', wp_unslash( $_COOKIE[ 'wp-resetpass-' . COOKIEHASH ] ), 2 ) );
+				$user = self::check_password_reset_key( $rp_key, $rp_login );
 
-			$user = self::check_password_reset_key( $_GET['key'], $_GET['login'] );
-
-			// reset key / login is correct, display reset password form with hidden key / login values
-			if( is_object( $user ) ) {
-				$args['form'] = 'reset_password';
-				$args['key'] = esc_attr( $_GET['key'] );
-				$args['login'] = esc_attr( $_GET['login'] );
+				// reset key / login is correct, display reset password form with hidden key / login values
+				if ( is_object( $user ) ) {
+					return wc_get_template( 'myaccount/form-reset-password.php', array(
+						'key'   => $rp_key,
+						'login' => $rp_login,
+					) );
+				} else {
+					self::set_reset_password_cookie();
+				}
 			}
-		} elseif ( isset( $_GET['reset'] ) ) {
-			wc_add_notice( __( 'Your password has been reset.', 'woocommerce' ) . ' <a href="' . wc_get_page_permalink( 'myaccount' ) . '">' . __( 'Log in', 'woocommerce' ) . '</a>' );
 		}
 
-		wc_get_template( 'myaccount/form-lost-password.php', $args );
+		// Show lost password form by default
+		wc_get_template( 'myaccount/form-lost-password.php', array(
+			'form'  => 'lost_password',
+		) );
 	}
 
 	/**
@@ -208,7 +224,6 @@ class WC_Shortcode_My_Account {
 	 *
 	 * Based on retrieve_password() in core wp-login.php.
 	 *
-	 * @access public
 	 * @uses $wpdb WordPress Database object
 	 * @return bool True: when finish. False: on error
 	 */
@@ -219,7 +234,7 @@ class WC_Shortcode_My_Account {
 
 		if ( empty( $login ) ) {
 
-			wc_add_notice( __( 'Enter a username or e-mail address.', 'woocommerce' ), 'error' );
+			wc_add_notice( __( 'Enter a username or email address.', 'woocommerce' ), 'error' );
 			return false;
 
 		} else {
@@ -232,15 +247,22 @@ class WC_Shortcode_My_Account {
 			$user_data = get_user_by( 'email', $login );
 		}
 
-		do_action( 'lostpassword_post' );
+		$errors = new WP_Error();
+
+		do_action( 'lostpassword_post', $errors );
+
+		if ( $errors->get_error_code() ) {
+			wc_add_notice( $errors->get_error_message(), 'error' );
+			return false;
+		}
 
 		if ( ! $user_data ) {
-			wc_add_notice( __( 'Invalid username or e-mail.', 'woocommerce' ), 'error' );
+			wc_add_notice( __( 'Invalid username or email.', 'woocommerce' ), 'error' );
 			return false;
 		}
 
 		if ( is_multisite() && ! is_user_member_of_blog( $user_data->ID, get_current_blog_id() ) ) {
-			wc_add_notice( __( 'Invalid username or e-mail.', 'woocommerce' ), 'error' );
+			wc_add_notice( __( 'Invalid username or email.', 'woocommerce' ), 'error' );
 			return false;
 		}
 
@@ -262,25 +284,13 @@ class WC_Shortcode_My_Account {
 			return false;
 		}
 
-		$key = wp_generate_password( 20, false );
-
-		do_action( 'retrieve_password_key', $user_login, $key );
-
-		// Now insert the key, hashed, into the DB.
-		if ( empty( $wp_hasher ) ) {
-			require_once ABSPATH . 'wp-includes/class-phpass.php';
-			$wp_hasher = new PasswordHash( 8, true );
-		}
-
-		$hashed = $wp_hasher->HashPassword( $key );
-
-		$wpdb->update( $wpdb->users, array( 'user_activation_key' => $hashed ), array( 'user_login' => $user_login ) );
+		// Get password reset key (function introduced in WordPress 4.4).
+		$key = get_password_reset_key( $user_data );
 
 		// Send email notification
 		WC()->mailer(); // load email classes
 		do_action( 'woocommerce_reset_password_notification', $user_login, $key );
 
-		wc_add_notice( __( 'Check your e-mail for the confirmation link.', 'woocommerce' ) );
 		return true;
 	}
 
@@ -291,40 +301,19 @@ class WC_Shortcode_My_Account {
 	 *
 	 * @param string $key Hash to validate sending user's password
 	 * @param string $login The user login
-	 * @return WP_USER|bool User's database row on success, false for invalid keys
+	 * @return WP_User|bool User's database row on success, false for invalid keys
 	 */
 	public static function check_password_reset_key( $key, $login ) {
-		global $wpdb, $wp_hasher;
+		// Check for the password reset key.
+		// Get user data or an error message in case of invalid or expired key.
+		$user = check_password_reset_key( $key, $login );
 
-		$key = preg_replace( '/[^a-z0-9]/i', '', $key );
-
-		if ( empty( $key ) || ! is_string( $key ) ) {
-			wc_add_notice( __( 'Invalid key', 'woocommerce' ), 'error' );
+		if ( is_wp_error( $user ) ) {
+			wc_add_notice( $user->get_error_message(), 'error' );
 			return false;
 		}
 
-		if ( empty( $login ) || ! is_string( $login ) ) {
-			wc_add_notice( __( 'Invalid key', 'woocommerce' ), 'error' );
-			return false;
-		}
-
-		$user = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE user_login = %s", $login ) );
-
-		if ( ! empty( $user ) ) {
-			if ( empty( $wp_hasher ) ) {
-				require_once ABSPATH . 'wp-includes/class-phpass.php';
-				$wp_hasher = new PasswordHash( 8, true );
-			}
-
-			$valid = $wp_hasher->CheckPassword( $key, $user->user_activation_key );
-		}
-
-		if ( empty( $user ) || empty( $valid ) ) {
-			wc_add_notice( __( 'Invalid key', 'woocommerce' ), 'error' );
-			return false;
-		}
-
-		return get_userdata( $user->ID );
+		return $user;
 	}
 
 	/**
@@ -337,14 +326,29 @@ class WC_Shortcode_My_Account {
 		do_action( 'password_reset', $user, $new_pass );
 
 		wp_set_password( $new_pass, $user->ID );
+		self::set_reset_password_cookie();
 
 		wp_password_change_notification( $user );
 	}
 
+	/**
+	 * Set or unset the cookie.
+	 */
+	public static function set_reset_password_cookie( $value = '' ) {
+		$rp_cookie = 'wp-resetpass-' . COOKIEHASH;
+		$rp_path   = current( explode( '?', wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
+
+		if ( $value ) {
+			setcookie( $rp_cookie, $value, 0, $rp_path, COOKIE_DOMAIN, is_ssl(), true );
+		} else {
+			setcookie( $rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true );
+		}
+	}
+
 	/**
 	 * Show the add payment method page.
 	 */
-	private static function add_payment_method() {
+	public static function add_payment_method() {
 
 		if ( ! is_user_logged_in() ) {
 
@@ -355,18 +359,12 @@ class WC_Shortcode_My_Account {
 
 			do_action( 'before_woocommerce_add_payment_method' );
 
-			wc_add_notice( __( 'Add a new payment method.', 'woocommerce' ), 'notice'  );
-
 			wc_print_notices();
 
-			// Add payment method form
 			wc_get_template( 'myaccount/form-add-payment-method.php' );
 
-			wc_print_notices();
-
 			do_action( 'after_woocommerce_add_payment_method' );
 
 		}
-
 	}
 }
diff --git a/includes/shortcodes/class-wc-shortcode-order-tracking.php b/includes/shortcodes/class-wc-shortcode-order-tracking.php
index a69ab0b0d8e..4de44940bd9 100644
--- a/includes/shortcodes/class-wc-shortcode-order-tracking.php
+++ b/includes/shortcodes/class-wc-shortcode-order-tracking.php
@@ -4,10 +4,10 @@
  *
  * Lets a user see the status of an order by entering their order details.
  *
- * @author 		WooThemes
- * @category 	Shortcodes
- * @package 	WooCommerce/Shortcodes/Order_Tracking
- * @version     2.3.0
+ * @author   WooThemes
+ * @category Shortcodes
+ * @package  WooCommerce/Shortcodes/Order_Tracking
+ * @version  3.0.0
  */
 class WC_Shortcode_Order_Tracking {
 
@@ -33,49 +33,39 @@ class WC_Shortcode_Order_Tracking {
 			return;
 		}
 
-		extract(shortcode_atts(array(
-		), $atts));
+		extract( shortcode_atts( array(), $atts, 'woocommerce_order_tracking' ) );
 
 		global $post;
 
 		if ( ! empty( $_REQUEST['orderid'] ) && isset( $_POST['_wpnonce'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'woocommerce-order_tracking' ) ) {
 
-			$order_id 		= empty( $_REQUEST['orderid'] ) ? 0 : esc_attr( $_REQUEST['orderid'] );
-			$order_email	= empty( $_REQUEST['order_email'] ) ? '' : esc_attr( $_REQUEST['order_email']) ;
+			$order_id    = empty( $_REQUEST['orderid'] ) ? 0 : esc_attr( $_REQUEST['orderid'] );
+			$order_email = empty( $_REQUEST['order_email'] ) ? '' : esc_attr( $_REQUEST['order_email'] );
 
 			if ( ! $order_id ) {
-
-				echo '<p class="woocommerce-error">' . __( 'Please enter a valid order ID', 'woocommerce' ) . '</p>';
-
+				wc_add_notice( __( 'Please enter a valid order ID', 'woocommerce' ), 'error' );
 			} elseif ( ! $order_email ) {
-
-				echo '<p class="woocommerce-error">' . __( 'Please enter a valid order email', 'woocommerce' ) . '</p>';
-
+				wc_add_notice( __( 'Please enter a valid order email', 'woocommerce' ), 'error' );
 			} else {
-
 				$order = wc_get_order( apply_filters( 'woocommerce_shortcode_order_tracking_order_id', $order_id ) );
 
-				if ( $order && $order->id && $order_email ) {
-
-					if ( strtolower( $order->billing_email ) == strtolower( $order_email ) ) {
-						do_action( 'woocommerce_track_order', $order->id );
+				if ( $order && $order->get_id() && $order_email ) {
+					if ( strtolower( $order->get_billing_email() ) == strtolower( $order_email ) ) {
+						do_action( 'woocommerce_track_order', $order->get_id() );
 						wc_get_template( 'order/tracking.php', array(
-							'order' => $order
+							'order' => $order,
 						) );
 
 						return;
 					}
-
 				} else {
-
-					echo '<p class="woocommerce-error">' . sprintf( __( 'Sorry, we could not find that order ID in our database.', 'woocommerce' ), get_permalink($post->ID ) ) . '</p>';
-
+					wc_add_notice( __( 'Sorry, we could not find that order ID in our database.', 'woocommerce' ), 'error' );
 				}
-
 			}
-
 		}
 
+		wc_print_notices();
+
 		wc_get_template( 'order/form-tracking.php' );
 	}
 }
diff --git a/includes/theme-support/class-wc-twenty-seventeen.php b/includes/theme-support/class-wc-twenty-seventeen.php
new file mode 100644
index 00000000000..29aa6373d4c
--- /dev/null
+++ b/includes/theme-support/class-wc-twenty-seventeen.php
@@ -0,0 +1,69 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Twenty Seventeen suport.
+ *
+ * @class   WC_Twenty_Seventeen
+ * @since   2.6.9
+ * @version 2.6.9
+ * @package WooCommerce/Classes
+ */
+class WC_Twenty_Seventeen {
+
+	/**
+	 * Theme init.
+	 */
+	public static function init() {
+		remove_action( 'woocommerce_before_main_content', 'woocommerce_output_content_wrapper', 10 );
+		remove_action( 'woocommerce_after_main_content', 'woocommerce_output_content_wrapper_end', 10 );
+
+		add_action( 'woocommerce_before_main_content', array( __CLASS__, 'output_content_wrapper' ), 10 );
+		add_action( 'woocommerce_after_main_content', array( __CLASS__, 'output_content_wrapper_end' ), 10 );
+		add_filter( 'woocommerce_enqueue_styles', array( __CLASS__, 'enqueue_styles' ) );
+	}
+
+	/**
+	 * Enqueue CSS for this theme.
+	 *
+	 * @param  array $styles
+	 * @return array
+	 */
+	public static function enqueue_styles( $styles ) {
+		unset( $styles['woocommerce-general'] );
+
+		$styles['woocommerce-twenty-seventeen'] = array(
+			'src'     => str_replace( array( 'http:', 'https:' ), '', WC()->plugin_url() ) . '/assets/css/twenty-seventeen.css',
+			'deps'    => '',
+			'version' => WC_VERSION,
+			'media'   => 'all',
+		);
+
+		return apply_filters( 'woocommerce_twenty_seventeen_styles', $styles );
+	}
+
+	/**
+	 * Open the Twenty Seventeen wrapper.
+	 */
+	public static function output_content_wrapper() { ?>
+		<div class="wrap">
+			<div id="primary" class="content-area twentyseventeen">
+				<main id="main" class="site-main" role="main">
+		<?php
+	}
+
+	/**
+	 * Close the Twenty Seventeen wrapper.
+	 */
+	public static function output_content_wrapper_end() { ?>
+				</main>
+			</div>
+			<?php get_sidebar(); ?>
+		</div>
+		<?php
+	}
+}
+
+WC_Twenty_Seventeen::init();
diff --git a/includes/updates/woocommerce-update-2.0.9.php b/includes/updates/woocommerce-update-2.0.9.php
deleted file mode 100644
index 413ed8e6743..00000000000
--- a/includes/updates/woocommerce-update-2.0.9.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Update WC to 2.0.9
- *
- * @author 		WooThemes
- * @category 	Admin
- * @package 	WooCommerce/Admin/Updates
- * @version     2.0.9
- */
-
-if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
-}
-
-global $wpdb, $woocommerce;
-
-// Update brazillian state codes
-$wpdb->update(
-	$wpdb->postmeta,
-	array(
-		'meta_value' => 'BA'
-	),
-	array(
-		'meta_key'   => '_billing_state',
-		'meta_value' => 'BH'
-	)
-);
-$wpdb->update(
-	$wpdb->postmeta,
-	array(
-		'meta_value' => 'BA'
-	),
-	array(
-		'meta_key'   => '_shipping_state',
-		'meta_value' => 'BH'
-	)
-);
-$wpdb->update(
-	$wpdb->usermeta,
-	array(
-		'meta_value' => 'BA'
-	),
-	array(
-		'meta_key'   => 'billing_state',
-		'meta_value' => 'BH'
-	)
-);
-$wpdb->update(
-	$wpdb->usermeta,
-	array(
-		'meta_value' => 'BA'
-	),
-	array(
-		'meta_key'   => 'shipping_state',
-		'meta_value' => 'BH'
-	)
-);
diff --git a/includes/updates/woocommerce-update-2.0.php b/includes/updates/woocommerce-update-2.0.php
deleted file mode 100644
index 32c4f55bd60..00000000000
--- a/includes/updates/woocommerce-update-2.0.php
+++ /dev/null
@@ -1,312 +0,0 @@
-<?php
-/**
- * Update WC to 2.0
- *
- * @author 		WooThemes
- * @category 	Admin
- * @package 	WooCommerce/Admin/Updates
- * @version     2.0.0
- */
-
-if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
-}
-
-global $wpdb, $woocommerce;
-
-// Upgrade old style files paths to support multiple file paths
-$existing_file_paths = $wpdb->get_results( "SELECT * FROM {$wpdb->postmeta} WHERE meta_key = '_file_path' AND meta_value != '';" );
-
-if ( $existing_file_paths ) {
-
-	foreach( $existing_file_paths as $existing_file_path ) {
-
-		$old_file_path = trim( $existing_file_path->meta_value );
-
-		if ( ! empty( $old_file_path ) ) {
-			$file_paths = serialize( array( md5( $old_file_path ) => $old_file_path ) );
-
-			$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->postmeta} SET meta_key = '_file_paths', meta_value = %s WHERE meta_id = %d", $file_paths, $existing_file_path->meta_id ) );
-
-			$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->prefix}woocommerce_downloadable_product_permissions SET download_id = %s WHERE product_id = %d", md5( $old_file_path ), $existing_file_path->post_id ) );
-
-		}
-	}
-}
-
-// Setup default permalinks if shop page is defined
-$permalinks 	= get_option( 'woocommerce_permalinks' );
-$shop_page_id 	= wc_get_page_id( 'shop' );
-
-if ( empty( $permalinks ) && $shop_page_id > 0 ) {
-
-	$base_slug 		= $shop_page_id > 0 && get_post( $shop_page_id ) ? get_page_uri( $shop_page_id ) : 'shop';
-
-	$category_base 	= get_option('woocommerce_prepend_shop_page_to_urls') == "yes" ? trailingslashit( $base_slug ) : '';
-	$category_slug 	= get_option('woocommerce_product_category_slug') ? get_option('woocommerce_product_category_slug') : _x( 'product-category', 'slug', 'woocommerce' );
-	$tag_slug 		= get_option('woocommerce_product_tag_slug') ? get_option('woocommerce_product_tag_slug') : _x( 'product-tag', 'slug', 'woocommerce' );
-
-	if ( 'yes' == get_option('woocommerce_prepend_shop_page_to_products') ) {
-		$product_base = trailingslashit( $base_slug );
-	} else {
-		if ( ( $product_slug = get_option('woocommerce_product_slug') ) !== false && ! empty( $product_slug ) ) {
-			$product_base = trailingslashit( $product_slug );
-		} else {
-			$product_base = trailingslashit( _x('product', 'slug', 'woocommerce') );
-		}
-	}
-
-	if ( get_option('woocommerce_prepend_category_to_products') == 'yes' )
-		$product_base .= trailingslashit('%product_cat%');
-
-	$permalinks = array(
-		'product_base' 		=> untrailingslashit( $product_base ),
-		'category_base' 	=> untrailingslashit( $category_base . $category_slug ),
-		'attribute_base' 	=> untrailingslashit( $category_base ),
-		'tag_base' 			=> untrailingslashit( $category_base . $tag_slug )
-	);
-
-	update_option( 'woocommerce_permalinks', $permalinks );
-}
-
-// Update subcat display settings
-if ( get_option( 'woocommerce_shop_show_subcategories' ) == 'yes' ) {
-	if ( get_option( 'woocommerce_hide_products_when_showing_subcategories' ) == 'yes' ) {
-		update_option( 'woocommerce_shop_page_display', 'subcategories' );
-	} else {
-		update_option( 'woocommerce_shop_page_display', 'both' );
-	}
-}
-
-if ( get_option( 'woocommerce_show_subcategories' ) == 'yes' ) {
-	if ( get_option( 'woocommerce_hide_products_when_showing_subcategories' ) == 'yes' ) {
-		update_option( 'woocommerce_category_archive_display', 'subcategories' );
-	} else {
-		update_option( 'woocommerce_category_archive_display', 'both' );
-	}
-}
-
-// Update tax rates
-$loop = 0;
-$tax_rates = get_option( 'woocommerce_tax_rates' );
-
-if ( $tax_rates )
-	foreach ( $tax_rates as $tax_rate ) {
-
-		foreach ( $tax_rate['countries'] as $country => $states ) {
-
-			$states = array_reverse( $states );
-
-			foreach ( $states as $state ) {
-
-				if ( $state == '*' )
-					$state = '';
-
-				$wpdb->insert(
-					$wpdb->prefix . "woocommerce_tax_rates",
-					array(
-						'tax_rate_country'  => $country,
-						'tax_rate_state'    => $state,
-						'tax_rate'          => $tax_rate['rate'],
-						'tax_rate_name'     => $tax_rate['label'],
-						'tax_rate_priority' => 1,
-						'tax_rate_compound' => $tax_rate['compound'] == 'yes' ? 1 : 0,
-						'tax_rate_shipping' => $tax_rate['shipping'] == 'yes' ? 1 : 0,
-						'tax_rate_order'    => $loop,
-						'tax_rate_class'    => $tax_rate['class']
-					)
-				);
-
-				$loop++;
-			}
-		}
-	}
-
-$local_tax_rates = get_option( 'woocommerce_local_tax_rates' );
-
-if ( $local_tax_rates )
-	foreach ( $local_tax_rates as $tax_rate ) {
-
-		$location_type = $tax_rate['location_type'] == 'postcode' ? 'postcode' : 'city';
-
-		if ( $tax_rate['state'] == '*' )
-			$tax_rate['state'] = '';
-
-		$wpdb->insert(
-			$wpdb->prefix . "woocommerce_tax_rates",
-			array(
-				'tax_rate_country'  => $tax_rate['country'],
-				'tax_rate_state'    => $tax_rate['state'],
-				'tax_rate'          => $tax_rate['rate'],
-				'tax_rate_name'     => $tax_rate['label'],
-				'tax_rate_priority' => 2,
-				'tax_rate_compound' => $tax_rate['compound'] == 'yes' ? 1 : 0,
-				'tax_rate_shipping' => $tax_rate['shipping'] == 'yes' ? 1 : 0,
-				'tax_rate_order'    => $loop,
-				'tax_rate_class'    => $tax_rate['class']
-			)
-		);
-
-		$tax_rate_id = $wpdb->insert_id;
-
-		if ( $tax_rate['locations'] ) {
-			foreach ( $tax_rate['locations'] as $location ) {
-
-				$wpdb->insert(
-					$wpdb->prefix . "woocommerce_tax_rate_locations",
-					array(
-						'location_code' => $location,
-						'tax_rate_id'   => $tax_rate_id,
-						'location_type' => $location_type,
-					)
-				);
-
-			}
-		}
-
-		$loop++;
-	}
-
-update_option( 'woocommerce_tax_rates_backup', $tax_rates );
-update_option( 'woocommerce_local_tax_rates_backup', $local_tax_rates );
-delete_option( 'woocommerce_tax_rates' );
-delete_option( 'woocommerce_local_tax_rates' );
-
-
-// Now its time for the massive update to line items - move them to the new DB tables
-// Reverse with UPDATE `wpwc_postmeta` SET meta_key = '_order_items' WHERE meta_key = '_order_items_old'
-$order_item_rows = $wpdb->get_results( "
-	SELECT * FROM {$wpdb->postmeta}
-	WHERE meta_key = '_order_items'
-" );
-
-foreach ( $order_item_rows as $order_item_row ) {
-
-	$order_items = (array) maybe_unserialize( $order_item_row->meta_value );
-
-	foreach ( $order_items as $order_item ) {
-
-		if ( ! isset( $order_item['line_total'] ) && isset( $order_item['taxrate'] ) && isset( $order_item['cost'] ) ) {
-			$order_item['line_tax'] 			= number_format( ( $order_item['cost'] * $order_item['qty'] ) * ( $order_item['taxrate'] / 100 ), 2, '.', '' );
-			$order_item['line_total'] 			= $order_item['cost'] * $order_item['qty'];
-			$order_item['line_subtotal_tax'] 	= $order_item['line_tax'];
-			$order_item['line_subtotal'] 		= $order_item['line_total'];
-		}
-
-		$order_item['line_tax'] 			= isset( $order_item['line_tax'] ) ? $order_item['line_tax'] : 0;
-		$order_item['line_total']			= isset( $order_item['line_total'] ) ? $order_item['line_total'] : 0;
-		$order_item['line_subtotal_tax'] 	= isset( $order_item['line_subtotal_tax'] ) ? $order_item['line_subtotal_tax'] : 0;
-		$order_item['line_subtotal'] 		= isset( $order_item['line_subtotal'] ) ? $order_item['line_subtotal'] : 0;
-
-		$item_id = wc_add_order_item( $order_item_row->post_id, array(
-	 		'order_item_name' 		=> $order_item['name'],
-	 		'order_item_type' 		=> 'line_item'
-	 	) );
-
-	 	// Add line item meta
-	 	if ( $item_id ) {
-		 	wc_add_order_item_meta( $item_id, '_qty', absint( $order_item['qty'] ) );
-		 	wc_add_order_item_meta( $item_id, '_tax_class', $order_item['tax_class'] );
-		 	wc_add_order_item_meta( $item_id, '_product_id', $order_item['id'] );
-		 	wc_add_order_item_meta( $item_id, '_variation_id', $order_item['variation_id'] );
-		 	wc_add_order_item_meta( $item_id, '_line_subtotal', wc_format_decimal( $order_item['line_subtotal'] ) );
-		 	wc_add_order_item_meta( $item_id, '_line_subtotal_tax', wc_format_decimal( $order_item['line_subtotal_tax'] ) );
-		 	wc_add_order_item_meta( $item_id, '_line_total', wc_format_decimal( $order_item['line_total'] ) );
-		 	wc_add_order_item_meta( $item_id, '_line_tax', wc_format_decimal( $order_item['line_tax'] ) );
-
-		 	$meta_rows = array();
-
-			// Insert meta
-			if ( ! empty( $order_item['item_meta'] ) ) {
-				foreach ( $order_item['item_meta'] as $key => $meta ) {
-					// Backwards compatibility
-					if ( is_array( $meta ) && isset( $meta['meta_name'] ) ) {
-						$meta_rows[] = '(' . $item_id . ',"' . esc_sql( $meta['meta_name'] ) . '","' . esc_sql( $meta['meta_value'] ) . '")';
-					} else {
-						$meta_rows[] = '(' . $item_id . ',"' . esc_sql( $key ) . '","' . esc_sql( $meta ) . '")';
-					}
-				}
-			}
-
-			// Insert meta rows at once
-			if ( sizeof( $meta_rows ) > 0 ) {
-				$wpdb->query( $wpdb->prepare( "
-					INSERT INTO {$wpdb->prefix}woocommerce_order_itemmeta ( order_item_id, meta_key, meta_value )
-					VALUES " . implode( ',', $meta_rows ) . ";
-				", $order_item_row->post_id ) );
-			}
-
-			// Delete from DB (rename)
-			$wpdb->query( $wpdb->prepare( "
-				UPDATE {$wpdb->postmeta}
-				SET meta_key = '_order_items_old'
-				WHERE meta_key = '_order_items'
-				AND post_id = %d
-			", $order_item_row->post_id ) );
-	 	}
-
-		unset( $meta_rows, $item_id, $order_item );
-	}
-}
-
-// Do the same kind of update for order_taxes - move to lines
-// Reverse with UPDATE `wpwc_postmeta` SET meta_key = '_order_taxes' WHERE meta_key = '_order_taxes_old'
-$order_tax_rows = $wpdb->get_results( "
-	SELECT * FROM {$wpdb->postmeta}
-	WHERE meta_key = '_order_taxes'
-" );
-
-foreach ( $order_tax_rows as $order_tax_row ) {
-
-	$order_taxes = (array) maybe_unserialize( $order_tax_row->meta_value );
-
-	if ( $order_taxes ) {
-		foreach( $order_taxes as $order_tax ) {
-
-			if ( ! isset( $order_tax['label'] ) || ! isset( $order_tax['cart_tax'] ) || ! isset( $order_tax['shipping_tax'] ) )
-				continue;
-
-			$item_id = wc_add_order_item( $order_tax_row->post_id, array(
-		 		'order_item_name' 		=> $order_tax['label'],
-		 		'order_item_type' 		=> 'tax'
-		 	) );
-
-		 	// Add line item meta
-		 	if ( $item_id ) {
-			 	wc_add_order_item_meta( $item_id, 'compound', absint( isset( $order_tax['compound'] ) ? $order_tax['compound'] : 0 ) );
-			 	wc_add_order_item_meta( $item_id, 'tax_amount', wc_clean( $order_tax['cart_tax'] ) );
-			 	wc_add_order_item_meta( $item_id, 'shipping_tax_amount', wc_clean( $order_tax['shipping_tax'] ) );
-			}
-
-			// Delete from DB (rename)
-			$wpdb->query( $wpdb->prepare( "
-				UPDATE {$wpdb->postmeta}
-				SET meta_key = '_order_taxes_old'
-				WHERE meta_key = '_order_taxes'
-				AND post_id = %d
-			", $order_tax_row->post_id ) );
-
-			unset( $tax_amount );
-		}
-	}
-}
-
-// Grab the pre 2.0 Image options and use to populate the new image options settings,
-// cleaning up afterwards like nice people do
-
-foreach ( array( 'catalog', 'single', 'thumbnail' ) as $value ) {
-
-	$old_settings = array_filter( array(
-		'width' => get_option( 'woocommerce_' . $value . '_image_width' ),
-		'height' => get_option( 'woocommerce_' . $value . '_image_height' ),
-		'crop' => get_option( 'woocommerce_' . $value . '_image_crop' )
-	) );
-
-	if ( ! empty(  $old_settings  ) && update_option( 'shop_' . $value . '_image_size', $old_settings ) ){
-
-		delete_option( 'woocommerce_' . $value . '_image_width' );
-		delete_option( 'woocommerce_' . $value . '_image_height' );
-		delete_option( 'woocommerce_' . $value . '_image_crop' );
-
-	}
-}
diff --git a/includes/updates/woocommerce-update-2.1.php b/includes/updates/woocommerce-update-2.1.php
deleted file mode 100644
index 6abbce54186..00000000000
--- a/includes/updates/woocommerce-update-2.1.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Update WC to 2.1.0
- *
- * @author 		WooThemes
- * @category 	Admin
- * @package 	WooCommerce/Admin/Updates
- * @version     2.1.0
- */
-
-if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
-}
-
-global $wpdb, $woocommerce;
-
-// Pages no longer used
-wp_trash_post( get_option('woocommerce_pay_page_id') );
-wp_trash_post( get_option('woocommerce_thanks_page_id') );
-wp_trash_post( get_option('woocommerce_view_order_page_id') );
-wp_trash_post( get_option('woocommerce_change_password_page_id') );
-wp_trash_post( get_option('woocommerce_edit_address_page_id') );
-wp_trash_post( get_option('woocommerce_lost_password_page_id') );
-
-// Upgrade file paths to support multiple file paths + names etc
-$existing_file_paths = $wpdb->get_results( "SELECT * FROM {$wpdb->postmeta} WHERE meta_key = '_file_paths' AND meta_value != '';" );
-
-if ( $existing_file_paths ) {
-
-	foreach( $existing_file_paths as $existing_file_path ) {
-
-		$needs_update = false;
-		$new_value    = array();
-		$value        = maybe_unserialize( trim( $existing_file_path->meta_value ) );
-
-		if ( $value ) {
-			foreach ( $value as $key => $file ) {
-				if ( ! is_array( $file ) ) {
-					$needs_update      = true;
-					$new_value[ $key ] = array(
-						'file' => $file,
-						'name' => wc_get_filename_from_url( $file )
-					);
-				} else {
-					$new_value[ $key ] = $file;
-				}
-			}
-			if ( $needs_update ) {
-				$new_value = serialize( $new_value );
-
-				$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->postmeta} SET meta_key = %s, meta_value = %s WHERE meta_id = %d", '_downloadable_files', $new_value, $existing_file_path->meta_id ) );
-			}
-		}
-	}
-}
diff --git a/includes/updates/woocommerce-update-2.2.php b/includes/updates/woocommerce-update-2.2.php
deleted file mode 100644
index 882a6860a1a..00000000000
--- a/includes/updates/woocommerce-update-2.2.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-/**
- * Update WC to 2.2.0
- *
- * @author 		WooThemes
- * @category 	Admin
- * @package 	WooCommerce/Admin/Updates
- * @version     2.2.0
- */
-
-if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
-}
-
-global $wpdb;
-
-// Update options
-$woocommerce_ship_to_destination = 'shipping';
-
-if ( get_option( 'woocommerce_ship_to_billing_address_only' ) === 'yes' ) {
-	$woocommerce_ship_to_destination = 'billing_only';
-} elseif ( get_option( 'woocommerce_ship_to_billing' ) === 'yes' ) {
-	$woocommerce_ship_to_destination = 'billing';
-}
-
-add_option( 'woocommerce_ship_to_destination', $woocommerce_ship_to_destination, '', 'no' );
-
-// Update order statuses
-$wpdb->query( "
-	UPDATE {$wpdb->posts} as posts
-	LEFT JOIN {$wpdb->term_relationships} AS rel ON posts.ID = rel.object_ID
-	LEFT JOIN {$wpdb->term_taxonomy} AS tax USING( term_taxonomy_id )
-	LEFT JOIN {$wpdb->terms} AS term USING( term_id )
-	SET posts.post_status = 'wc-pending'
-	WHERE posts.post_type = 'shop_order'
-	AND posts.post_status = 'publish'
-	AND tax.taxonomy = 'shop_order_status'
-	AND	term.slug LIKE 'pending%';
-	"
-);
-$wpdb->query( "
-	UPDATE {$wpdb->posts} as posts
-	LEFT JOIN {$wpdb->term_relationships} AS rel ON posts.ID = rel.object_ID
-	LEFT JOIN {$wpdb->term_taxonomy} AS tax USING( term_taxonomy_id )
-	LEFT JOIN {$wpdb->terms} AS term USING( term_id )
-	SET posts.post_status = 'wc-processing'
-	WHERE posts.post_type = 'shop_order'
-	AND posts.post_status = 'publish'
-	AND tax.taxonomy = 'shop_order_status'
-	AND	term.slug LIKE 'processing%';
-	"
-);
-$wpdb->query( "
-	UPDATE {$wpdb->posts} as posts
-	LEFT JOIN {$wpdb->term_relationships} AS rel ON posts.ID = rel.object_ID
-	LEFT JOIN {$wpdb->term_taxonomy} AS tax USING( term_taxonomy_id )
-	LEFT JOIN {$wpdb->terms} AS term USING( term_id )
-	SET posts.post_status = 'wc-on-hold'
-	WHERE posts.post_type = 'shop_order'
-	AND posts.post_status = 'publish'
-	AND tax.taxonomy = 'shop_order_status'
-	AND	term.slug LIKE 'on-hold%';
-	"
-);
-$wpdb->query( "
-	UPDATE {$wpdb->posts} as posts
-	LEFT JOIN {$wpdb->term_relationships} AS rel ON posts.ID = rel.object_ID
-	LEFT JOIN {$wpdb->term_taxonomy} AS tax USING( term_taxonomy_id )
-	LEFT JOIN {$wpdb->terms} AS term USING( term_id )
-	SET posts.post_status = 'wc-completed'
-	WHERE posts.post_type = 'shop_order'
-	AND posts.post_status = 'publish'
-	AND tax.taxonomy = 'shop_order_status'
-	AND	term.slug LIKE 'completed%';
-	"
-);
-$wpdb->query( "
-	UPDATE {$wpdb->posts} as posts
-	LEFT JOIN {$wpdb->term_relationships} AS rel ON posts.ID = rel.object_ID
-	LEFT JOIN {$wpdb->term_taxonomy} AS tax USING( term_taxonomy_id )
-	LEFT JOIN {$wpdb->terms} AS term USING( term_id )
-	SET posts.post_status = 'wc-cancelled'
-	WHERE posts.post_type = 'shop_order'
-	AND posts.post_status = 'publish'
-	AND tax.taxonomy = 'shop_order_status'
-	AND	term.slug LIKE 'cancelled%';
-	"
-);
-$wpdb->query( "
-	UPDATE {$wpdb->posts} as posts
-	LEFT JOIN {$wpdb->term_relationships} AS rel ON posts.ID = rel.object_ID
-	LEFT JOIN {$wpdb->term_taxonomy} AS tax USING( term_taxonomy_id )
-	LEFT JOIN {$wpdb->terms} AS term USING( term_id )
-	SET posts.post_status = 'wc-refunded'
-	WHERE posts.post_type = 'shop_order'
-	AND posts.post_status = 'publish'
-	AND tax.taxonomy = 'shop_order_status'
-	AND	term.slug LIKE 'refunded%';
-	"
-);
-$wpdb->query( "
-	UPDATE {$wpdb->posts} as posts
-	LEFT JOIN {$wpdb->term_relationships} AS rel ON posts.ID = rel.object_ID
-	LEFT JOIN {$wpdb->term_taxonomy} AS tax USING( term_taxonomy_id )
-	LEFT JOIN {$wpdb->terms} AS term USING( term_id )
-	SET posts.post_status = 'wc-failed'
-	WHERE posts.post_type = 'shop_order'
-	AND posts.post_status = 'publish'
-	AND tax.taxonomy = 'shop_order_status'
-	AND	term.slug LIKE 'failed%';
-	"
-);
-
-// Update variations which manage stock
-$update_variations = $wpdb->get_results( "
-	SELECT DISTINCT posts.ID AS variation_id, posts.post_parent AS variation_parent FROM {$wpdb->posts} as posts
-	LEFT OUTER JOIN {$wpdb->postmeta} AS postmeta ON posts.ID = postmeta.post_id AND postmeta.meta_key = '_stock'
-	LEFT OUTER JOIN {$wpdb->postmeta} as postmeta2 ON posts.ID = postmeta2.post_id AND postmeta2.meta_key = '_manage_stock'
-	WHERE posts.post_type = 'product_variation'
-	AND postmeta.meta_value IS NOT NULL
-	AND postmeta.meta_value != ''
-	AND postmeta2.meta_value IS NULL
-" );
-
-foreach ( $update_variations as $variation ) {
-	$parent_backorders = get_post_meta( $variation->variation_parent, '_backorders', true );
-	add_post_meta( $variation->variation_id, '_manage_stock', 'yes', true );
-	add_post_meta( $variation->variation_id, '_backorders', $parent_backorders ? $parent_backorders : 'no', true );
-}
-
-// Update taxonomy names with correct sanitized names
-$attribute_taxonomies = $wpdb->get_results( "SELECT * FROM " . $wpdb->prefix . "woocommerce_attribute_taxonomies" );
-
-foreach ( $attribute_taxonomies as $attribute_taxonomy ) {
-	$sanitized_attribute_name = wc_sanitize_taxonomy_name( $attribute_taxonomy->attribute_name );
-	if ( $sanitized_attribute_name !== $attribute_taxonomy->attribute_name ) {
-		if ( ! $wpdb->get_var( $wpdb->prepare( "SELECT 1=1 FROM {$wpdb->prefix}woocommerce_attribute_taxonomies WHERE attribute_name = %s;", $sanitized_attribute_name ) ) ) {
-			// Update attribute
-			$wpdb->update(
-				"{$wpdb->prefix}woocommerce_attribute_taxonomies",
-				array(
-					'attribute_name' => $sanitized_attribute_name
-				),
-				array(
-					'attribute_id' => $attribute_taxonomy->attribute_id
-				)
-			);
-
-			// Update terms
-			$wpdb->update(
-				$wpdb->term_taxonomy,
-				array( 'taxonomy' => wc_attribute_taxonomy_name( $sanitized_attribute_name ) ),
-				array( 'taxonomy' => 'pa_' . $attribute_taxonomy->attribute_name )
-			);
-		}
-	}
-}
-
-// add webhook capabilities to shop_manager/administrator role
-global $wp_roles;
-
-if ( class_exists( 'WP_Roles' ) ) {
-	if ( ! isset( $wp_roles ) ) {
-		$wp_roles = new WP_Roles();
-	}
-}
-
-if ( is_object( $wp_roles ) ) {
-	$webhook_capabilities = array(
-		// post type
-		'edit_shop_webhook',
-		'read_shop_webhook',
-		'delete_shop_webhook',
-		'edit_shop_webhooks',
-		'edit_others_shop_webhooks',
-		'publish_shop_webhooks',
-		'read_private_shop_webhooks',
-		'delete_shop_webhooks',
-		'delete_private_shop_webhooks',
-		'delete_published_shop_webhooks',
-		'delete_others_shop_webhooks',
-		'edit_private_shop_webhooks',
-		'edit_published_shop_webhooks',
-
-		// terms
-		'manage_shop_webhook_terms',
-		'edit_shop_webhook_terms',
-		'delete_shop_webhook_terms',
-		'assign_shop_webhook_terms'
-	);
-
-	foreach ( $webhook_capabilities as $cap ) {
-		$wp_roles->add_cap( 'shop_manager', $cap );
-		$wp_roles->add_cap( 'administrator', $cap );
-	}
-}
diff --git a/includes/updates/woocommerce-update-2.3.php b/includes/updates/woocommerce-update-2.3.php
deleted file mode 100644
index 3bca7ee3b5c..00000000000
--- a/includes/updates/woocommerce-update-2.3.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Update WC to 2.3.0
- *
- * @author 		WooThemes
- * @category 	Admin
- * @package 	WooCommerce/Admin/Updates
- * @version     2.3.0
- */
-
-if ( ! defined( 'ABSPATH' ) ) {
-	exit;
-}
-
-// _money_spent and _order_count may be out of sync - clear them
-delete_metadata( 'user', 0, '_money_spent', '', true );
-delete_metadata( 'user', 0, '_order_count', '', true );
-
-// To prevent taxes being hidden when using a default 'no address' in a store with tax inc prices, set the woocommerce_default_customer_address to use the store base address by default
-if ( '' === get_option( 'woocommerce_default_customer_address', false ) && wc_prices_include_tax() ) {
-	update_option( 'woocommerce_default_customer_address', 'base' );
-}
diff --git a/includes/updates/woocommerce-update-2.4.1.php b/includes/updates/woocommerce-update-2.4.1.php
deleted file mode 100644
index 1ec4125ac58..00000000000
--- a/includes/updates/woocommerce-update-2.4.1.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Update WC to 2.4.1
- *
- * @author   WooThemes
- * @category Admin
- * @package  WooCommerce/Admin/Updates
- * @version  2.4.1
- */
-
-if ( ! defined( 'ABSPATH' ) ) {
-	exit;
-}
-
-global $wpdb;
-
-// Select variations that don't have any _stock_status implemented on WooCommerce 2.2
-$update_variations = $wpdb->get_results( "
-	SELECT DISTINCT posts.ID AS variation_id, posts.post_parent AS variation_parent
-	FROM {$wpdb->posts} as posts
-	LEFT OUTER JOIN {$wpdb->postmeta} AS postmeta ON posts.ID = postmeta.post_id AND postmeta.meta_key = '_stock_status'
-	WHERE posts.post_type = 'product_variation'
-	AND postmeta.meta_value IS NULL
-" );
-
-foreach ( $update_variations as $variation ) {
-	// Get the parent _stock_status
-	$parent_stock_status = get_post_meta( $variation->variation_parent, '_stock_status', true );
-
-	// Set the _stock_status
-	add_post_meta( $variation->variation_id, '_stock_status', $parent_stock_status ? $parent_stock_status : 'instock', true );
-
-	// Delete old product children array
-	delete_transient( 'wc_product_children_' . $variation->variation_parent );
-}
-
-// Invalidate old transients such as wc_var_price
-WC_Cache_Helper::get_transient_version( 'product', true );
diff --git a/includes/updates/woocommerce-update-2.4.php b/includes/updates/woocommerce-update-2.4.php
deleted file mode 100644
index 8939f031a30..00000000000
--- a/includes/updates/woocommerce-update-2.4.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-/**
- * Update WC to 2.4.0
- *
- * @author   WooThemes
- * @category Admin
- * @package  WooCommerce/Admin/Updates
- * @version  2.4.0
- */
-
-if ( ! defined( 'ABSPATH' ) ) {
-	exit;
-}
-
-global $wpdb;
-
-/**
- * Coupon discount calculations.
- * Maintain the old coupon logic for upgrades.
- */
-update_option( 'woocommerce_calc_discounts_sequentially', 'yes' );
-
-/**
- * Flat Rate Shipping.
- * Update legacy options to new math based options.
- */
-$shipping_methods = array(
-	'woocommerce_flat_rates'                        => new WC_Shipping_Flat_Rate(),
-	'woocommerce_international_delivery_flat_rates' => new WC_Shipping_International_Delivery()
-);
-foreach ( $shipping_methods as $flat_rate_option_key => $shipping_method ) {
-	// Stop this running more than once if routine is repeated
-	if ( version_compare( $shipping_method->get_option( 'version', 0 ), '2.4.0', '<' ) ) {
-		$has_classes                      = sizeof( WC()->shipping->get_shipping_classes() ) > 0;
-		$cost_key                         = $has_classes ? 'no_class_cost' : 'cost';
-		$min_fee                          = $shipping_method->get_option( 'minimum_fee' );
-		$math_cost_strings                = array( 'cost' => array(), 'no_class_cost' => array() );
-		$math_cost_strings[ $cost_key ][] = $shipping_method->get_option( 'cost' );
-
-		if ( $fee = $shipping_method->get_option( 'fee' ) ) {
-			$math_cost_strings[ $cost_key ][] = strstr( $fee, '%' ) ? '[fee percent="' . str_replace( '%', '', $fee ) . '" min="' . esc_attr( $min_fee ) . '"]' : $fee;
-		}
-
-		foreach ( WC()->shipping->get_shipping_classes() as $shipping_class ) {
-			$rate_key                       = 'class_cost_' . $shipping_class->slug;
-			$math_cost_strings[ $rate_key ] = $math_cost_strings[ 'no_class_cost' ];
-		}
-
-		if ( $flat_rates = array_filter( (array) get_option( $flat_rate_option_key, array() ) ) ) {
-			foreach ( $flat_rates as $shipping_class => $rate ) {
-				$rate_key = 'class_cost_' . $shipping_class;
-				if ( $rate['cost'] || $rate['fee'] ) {
-					$math_cost_strings[ $rate_key ][] = $rate['cost'];
-					$math_cost_strings[ $rate_key ][] = strstr( $rate['fee'], '%' ) ? '[fee percent="' . str_replace( '%', '', $rate['fee'] ) . '" min="' . esc_attr( $min_fee ) . '"]' : $rate['fee'];
-				}
-			}
-		}
-
-		if ( 'item' === $shipping_method->type ) {
-			foreach ( $math_cost_strings as $key => $math_cost_string ) {
-				$math_cost_strings[ $key ] = array_filter( array_map( 'trim', $math_cost_strings[ $key ] ) );
-				if ( ! empty( $math_cost_strings[ $key ] ) ) {
-					$last_key                                = max( 0, sizeof( $math_cost_strings[ $key ] ) - 1 );
-					$math_cost_strings[ $key ][0]            = '( ' . $math_cost_strings[ $key ][0];
-					$math_cost_strings[ $key ][ $last_key ] .= ' ) * [qty]';
-				}
-			}
-		}
-
-		$math_cost_strings[ 'cost' ][] = $shipping_method->get_option( 'cost_per_order' );
-
-		// Save settings
-		foreach ( $math_cost_strings as $option_id => $math_cost_string ) {
-			$shipping_method->settings[ $option_id ] = implode( ' + ', array_filter( $math_cost_string ) );
-		}
-
-		$shipping_method->settings['version'] = '2.4.0';
-		$shipping_method->settings['type']    = 'item' === $shipping_method->settings['type'] ? 'class' : $shipping_method->settings['type'];
-
-		update_option( $shipping_method->plugin_id . $shipping_method->id . '_settings', $shipping_method->settings );
-	}
-}
-
-/**
- * Update the old user API keys to the new Apps keys.
- */
-$api_users = $wpdb->get_results( "SELECT user_id FROM $wpdb->usermeta WHERE meta_key = 'woocommerce_api_consumer_key'" );
-$apps_keys = array();
-
-// Get user data
-foreach ( $api_users as $_user ) {
-	$user = get_userdata( $_user->user_id );
-	$apps_keys[] = array(
-		'user_id'         => $user->ID,
-		'permissions'     => $user->woocommerce_api_key_permissions,
-		'consumer_key'    => wc_api_hash( $user->woocommerce_api_consumer_key ),
-		'consumer_secret' => $user->woocommerce_api_consumer_secret,
-		'truncated_key'   => substr( $user->woocommerce_api_consumer_secret, -7 )
-	);
-}
-
-if ( ! empty( $apps_keys ) ) {
-	// Create new apps
-	foreach ( $apps_keys as $app ) {
-		$wpdb->insert(
-			$wpdb->prefix . 'woocommerce_api_keys',
-			$app,
-			array(
-				'%d',
-				'%s',
-				'%s',
-				'%s',
-				'%s'
-			)
-		);
-	}
-
-	// Delete old user keys from usermeta
-	foreach ( $api_users as $_user ) {
-		$user_id = intval( $_user->user_id );
-		delete_user_meta( $user_id, 'woocommerce_api_consumer_key' );
-		delete_user_meta( $user_id, 'woocommerce_api_consumer_secret' );
-		delete_user_meta( $user_id, 'woocommerce_api_key_permissions' );
-	}
-}
-
-/**
- * Webhooks.
- * Make sure order.update webhooks get the woocommerce_order_edit_status hook.
- */
-$order_update_webhooks = get_posts( array(
-	'posts_per_page' => -1,
-	'post_type'      => 'shop_webhook',
-	'meta_key'       => '_topic',
-	'meta_value'     => 'order.updated'
-) );
-foreach ( $order_update_webhooks as $order_update_webhook ) {
-	$webhook = new WC_Webhook( $order_update_webhook->ID );
-	$webhook->set_topic( 'order.updated' );
-}
-
-/**
- * Refunds for full refunded orders.
- * Update fully refunded orders to ensure they have a refund line item so reports add up.
- */
-$refunded_orders = get_posts( array(
-	'posts_per_page' => -1,
-	'post_type'      => 'shop_order',
-	'post_status'    => array( 'wc-refunded' )
-) );
-
-// Ensure emails are disabled during this update routine
-remove_all_actions( 'woocommerce_order_status_refunded_notification' );
-remove_all_actions( 'woocommerce_order_partially_refunded_notification' );
-remove_action( 'woocommerce_order_status_refunded', array( 'WC_Emails', 'send_transactional_email' ) );
-remove_action( 'woocommerce_order_partially_refunded', array( 'WC_Emails', 'send_transactional_email' ) );
-
-foreach ( $refunded_orders as $refunded_order ) {
-	$order_total    = get_post_meta( $refunded_order->ID, '_order_total', true );
-	$refunded_total = $wpdb->get_var( $wpdb->prepare( "
-		SELECT SUM( postmeta.meta_value )
-		FROM $wpdb->postmeta AS postmeta
-		INNER JOIN $wpdb->posts AS posts ON ( posts.post_type = 'shop_order_refund' AND posts.post_parent = %d )
-		WHERE postmeta.meta_key = '_refund_amount'
-		AND postmeta.post_id = posts.ID
-	", $refunded_order->ID ) );
-
-	if ( $order_total > $refunded_total ) {
-		$refund = wc_create_refund( array(
-			'amount'     => $order_total - $refunded_total,
-			'reason'     => __( 'Order Fully Refunded', 'woocommerce' ),
-			'order_id'   => $refunded_order->ID,
-			'line_items' => array(),
-			'date'       => $refunded_order->post_modified
-		) );
-	}
-}
-
-wc_delete_shop_order_transients();
diff --git a/includes/updates/woocommerce-update-2.5.php b/includes/updates/woocommerce-update-2.5.php
deleted file mode 100644
index 94a60136453..00000000000
--- a/includes/updates/woocommerce-update-2.5.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Update WC to 2.5.0
- *
- * @author   WooThemes
- * @category Admin
- * @package  WooCommerce/Admin/Updates
- * @version  2.5.0
- */
-
-if ( ! defined( 'ABSPATH' ) ) {
-	exit;
-}
-
-global $wpdb;
-
-// Fix currency settings for LAK currency.
-$current_currency = get_option( 'woocommerce_currency' );
-
-if ( 'KIP' === $current_currency ) {
-	update_option( 'woocommerce_currency', 'LAK' );
-}
-
-// Update LAK currency code.
-$wpdb->update(
-	$wpdb->postmeta,
-	array(
-		'meta_value' => 'LAK'
-	),
-	array(
-		'meta_key'   => '_order_currency',
-		'meta_value' => 'KIP'
-	)
-);
diff --git a/includes/vendor/abstract-wp-rest-controller.php b/includes/vendor/abstract-wp-rest-controller.php
new file mode 100644
index 00000000000..97b377318bf
--- /dev/null
+++ b/includes/vendor/abstract-wp-rest-controller.php
@@ -0,0 +1,490 @@
+<?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * @version 2.0-beta13.1
+ */
+abstract class WP_REST_Controller {
+
+	/**
+	 * The namespace of this controller's route.
+	 *
+	 * @var string
+	 */
+	protected $namespace;
+
+	/**
+	 * The base of this controller's route.
+	 *
+	 * @var string
+	 */
+	protected $rest_base;
+
+	/**
+	 * Register the routes for the objects of the controller.
+	 */
+	public function register_routes() {
+		wc_doing_it_wrong( 'WP_REST_Controller::register_routes', __( 'The register_routes() method must be overriden', 'woocommerce' ), 'WPAPI-2.0' );
+	}
+
+	/**
+	 * Check if a given request has access to get items.
+	 *
+	 * @param WP_REST_Request $request Full data about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_items_permissions_check( $request ) {
+		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be over-ridden in subclass.", 'woocommerce' ), __METHOD__ ), array( 'status' => 405 ) );
+	}
+
+	/**
+	 * Get a collection of items.
+	 *
+	 * @param WP_REST_Request $request Full data about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function get_items( $request ) {
+		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be over-ridden in subclass.", 'woocommerce' ), __METHOD__ ), array( 'status' => 405 ) );
+	}
+
+	/**
+	 * Check if a given request has access to get a specific item.
+	 *
+	 * @param WP_REST_Request $request Full data about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function get_item_permissions_check( $request ) {
+		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be over-ridden in subclass.", 'woocommerce' ), __METHOD__ ), array( 'status' => 405 ) );
+	}
+
+	/**
+	 * Get one item from the collection.
+	 *
+	 * @param WP_REST_Request $request Full data about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function get_item( $request ) {
+		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be over-ridden in subclass.", 'woocommerce' ), __METHOD__ ), array( 'status' => 405 ) );
+	}
+
+	/**
+	 * Check if a given request has access to create items.
+	 *
+	 * @param WP_REST_Request $request Full data about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function create_item_permissions_check( $request ) {
+		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be over-ridden in subclass.", 'woocommerce' ), __METHOD__ ), array( 'status' => 405 ) );
+	}
+
+	/**
+	 * Create one item from the collection.
+	 *
+	 * @param WP_REST_Request $request Full data about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function create_item( $request ) {
+		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be over-ridden in subclass.", 'woocommerce' ), __METHOD__ ), array( 'status' => 405 ) );
+	}
+
+	/**
+	 * Check if a given request has access to update a specific item.
+	 *
+	 * @param WP_REST_Request $request Full data about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function update_item_permissions_check( $request ) {
+		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be over-ridden in subclass.", 'woocommerce' ), __METHOD__ ), array( 'status' => 405 ) );
+	}
+
+	/**
+	 * Update one item from the collection.
+	 *
+	 * @param WP_REST_Request $request Full data about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function update_item( $request ) {
+		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be over-ridden in subclass.", 'woocommerce' ), __METHOD__ ), array( 'status' => 405 ) );
+	}
+
+	/**
+	 * Check if a given request has access to delete a specific item.
+	 *
+	 * @param WP_REST_Request $request Full data about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function delete_item_permissions_check( $request ) {
+		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be over-ridden in subclass.", 'woocommerce' ), __METHOD__ ), array( 'status' => 405 ) );
+	}
+
+	/**
+	 * Delete one item from the collection.
+	 *
+	 * @param WP_REST_Request $request Full data about the request.
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public function delete_item( $request ) {
+		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be over-ridden in subclass.", 'woocommerce' ), __METHOD__ ), array( 'status' => 405 ) );
+	}
+
+	/**
+	 * Prepare the item for create or update operation.
+	 *
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_Error|object $prepared_item
+	 */
+	protected function prepare_item_for_database( $request ) {
+		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be over-ridden in subclass.", 'woocommerce' ), __METHOD__ ), array( 'status' => 405 ) );
+	}
+
+	/**
+	 * Prepare the item for the REST response.
+	 *
+	 * @param mixed $item WordPress representation of the item.
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response $response
+	 */
+	public function prepare_item_for_response( $item, $request ) {
+		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be over-ridden in subclass.", 'woocommerce' ), __METHOD__ ), array( 'status' => 405 ) );
+	}
+
+	/**
+	 * Prepare a response for inserting into a collection.
+	 *
+	 * @param WP_REST_Response $response Response object.
+	 * @return array Response data, ready for insertion into collection data.
+	 */
+	public function prepare_response_for_collection( $response ) {
+		if ( ! ( $response instanceof WP_REST_Response ) ) {
+			return $response;
+		}
+
+		$data = (array) $response->get_data();
+		$server = rest_get_server();
+
+		if ( method_exists( $server, 'get_compact_response_links' ) ) {
+			$links = call_user_func( array( $server, 'get_compact_response_links' ), $response );
+		} else {
+			$links = call_user_func( array( $server, 'get_response_links' ), $response );
+		}
+
+		if ( ! empty( $links ) ) {
+			$data['_links'] = $links;
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Filter a response based on the context defined in the schema.
+	 *
+	 * @param array $data
+	 * @param string $context
+	 * @return array
+	 */
+	public function filter_response_by_context( $data, $context ) {
+
+		$schema = $this->get_item_schema();
+		foreach ( $data as $key => $value ) {
+			if ( empty( $schema['properties'][ $key ] ) || empty( $schema['properties'][ $key ]['context'] ) ) {
+				continue;
+			}
+
+			if ( ! in_array( $context, $schema['properties'][ $key ]['context'] ) ) {
+				unset( $data[ $key ] );
+			}
+
+			if ( 'object' === $schema['properties'][ $key ]['type'] && ! empty( $schema['properties'][ $key ]['properties'] ) ) {
+				foreach ( $schema['properties'][ $key ]['properties'] as $attribute => $details ) {
+					if ( empty( $details['context'] ) ) {
+						continue;
+					}
+					if ( ! in_array( $context, $details['context'] ) ) {
+						if ( isset( $data[ $key ][ $attribute ] ) ) {
+							unset( $data[ $key ][ $attribute ] );
+						}
+					}
+				}
+			}
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Get the item's schema, conforming to JSON Schema.
+	 *
+	 * @return array
+	 */
+	public function get_item_schema() {
+		return $this->add_additional_fields_schema( array() );
+	}
+
+	/**
+	 * Get the item's schema for display / public consumption purposes.
+	 *
+	 * @return array
+	 */
+	public function get_public_item_schema() {
+
+		$schema = $this->get_item_schema();
+
+		foreach ( $schema['properties'] as &$property ) {
+			if ( isset( $property['arg_options'] ) ) {
+				unset( $property['arg_options'] );
+			}
+		}
+
+		return $schema;
+	}
+
+	/**
+	 * Get the query params for collections.
+	 *
+	 * @return array
+	 */
+	public function get_collection_params() {
+		return array(
+			'context'                => $this->get_context_param(),
+			'page'                   => array(
+				'description'        => __( 'Current page of the collection.', 'woocommerce' ),
+				'type'               => 'integer',
+				'default'            => 1,
+				'sanitize_callback'  => 'absint',
+				'validate_callback'  => 'rest_validate_request_arg',
+				'minimum'            => 1,
+			),
+			'per_page'               => array(
+				'description'        => __( 'Maximum number of items to be returned in result set.', 'woocommerce' ),
+				'type'               => 'integer',
+				'default'            => 10,
+				'minimum'            => 1,
+				'maximum'            => 100,
+				'sanitize_callback'  => 'absint',
+				'validate_callback'  => 'rest_validate_request_arg',
+			),
+			'search'                 => array(
+				'description'        => __( 'Limit results to those matching a string.', 'woocommerce' ),
+				'type'               => 'string',
+				'sanitize_callback'  => 'sanitize_text_field',
+				'validate_callback'  => 'rest_validate_request_arg',
+			),
+		);
+	}
+
+	/**
+	 * Get the magical context param.
+	 *
+	 * Ensures consistent description between endpoints, and populates enum from schema.
+	 *
+	 * @param array     $args
+	 * @return array
+	 */
+	public function get_context_param( $args = array() ) {
+		$param_details = array(
+			'description'        => __( 'Scope under which the request is made; determines fields present in response.', 'woocommerce' ),
+			'type'               => 'string',
+			'sanitize_callback'  => 'sanitize_key',
+			'validate_callback'  => 'rest_validate_request_arg',
+		);
+		$schema = $this->get_item_schema();
+		if ( empty( $schema['properties'] ) ) {
+			return array_merge( $param_details, $args );
+		}
+		$contexts = array();
+		foreach ( $schema['properties'] as $key => $attributes ) {
+			if ( ! empty( $attributes['context'] ) ) {
+				$contexts = array_merge( $contexts, $attributes['context'] );
+			}
+		}
+		if ( ! empty( $contexts ) ) {
+			$param_details['enum'] = array_unique( $contexts );
+			rsort( $param_details['enum'] );
+		}
+		return array_merge( $param_details, $args );
+	}
+
+	/**
+	 * Add the values from additional fields to a data object.
+	 *
+	 * @param array  $object
+	 * @param WP_REST_Request $request
+	 * @return array modified object with additional fields.
+	 */
+	protected function add_additional_fields_to_object( $object, $request ) {
+
+		$additional_fields = $this->get_additional_fields();
+
+		foreach ( $additional_fields as $field_name => $field_options ) {
+
+			if ( ! $field_options['get_callback'] ) {
+				continue;
+			}
+
+			$object[ $field_name ] = call_user_func( $field_options['get_callback'], $object, $field_name, $request, $this->get_object_type() );
+		}
+
+		return $object;
+	}
+
+	/**
+	 * Update the values of additional fields added to a data object.
+	 *
+	 * @param array  $object
+	 * @param WP_REST_Request $request
+	 */
+	protected function update_additional_fields_for_object( $object, $request ) {
+
+		$additional_fields = $this->get_additional_fields();
+
+		foreach ( $additional_fields as $field_name => $field_options ) {
+
+			if ( ! $field_options['update_callback'] ) {
+				continue;
+			}
+
+			// Don't run the update callbacks if the data wasn't passed in the request.
+			if ( ! isset( $request[ $field_name ] ) ) {
+				continue;
+			}
+
+			call_user_func( $field_options['update_callback'], $request[ $field_name ], $object, $field_name, $request, $this->get_object_type() );
+		}
+	}
+
+	/**
+	 * Add the schema from additional fields to an schema array.
+	 *
+	 * The type of object is inferred from the passed schema.
+	 *
+	 * @param array $schema Schema array.
+	 *
+	 * @return array $schema Schema array.
+	 */
+	protected function add_additional_fields_schema( $schema ) {
+		if ( empty( $schema['title'] ) ) {
+			return $schema;
+		}
+
+		/**
+		 * Can't use $this->get_object_type otherwise we cause an inf loop.
+		 */
+		$object_type = $schema['title'];
+
+		$additional_fields = $this->get_additional_fields( $object_type );
+
+		foreach ( $additional_fields as $field_name => $field_options ) {
+			if ( ! $field_options['schema'] ) {
+				continue;
+			}
+
+			$schema['properties'][ $field_name ] = $field_options['schema'];
+		}
+
+		return $schema;
+	}
+
+	/**
+	 * Get all the registered additional fields for a given object-type.
+	 *
+	 * @param  string $object_type
+	 * @return array
+	 */
+	protected function get_additional_fields( $object_type = null ) {
+
+		if ( ! $object_type ) {
+			$object_type = $this->get_object_type();
+		}
+
+		if ( ! $object_type ) {
+			return array();
+		}
+
+		global $wp_rest_additional_fields;
+
+		if ( ! $wp_rest_additional_fields || ! isset( $wp_rest_additional_fields[ $object_type ] ) ) {
+			return array();
+		}
+
+		return $wp_rest_additional_fields[ $object_type ];
+	}
+
+	/**
+	 * Get the object type this controller is responsible for managing.
+	 *
+	 * @return string
+	 */
+	protected function get_object_type() {
+		$schema = $this->get_item_schema();
+
+		if ( ! $schema || ! isset( $schema['title'] ) ) {
+			return null;
+		}
+
+		return $schema['title'];
+	}
+
+	/**
+	 * Get an array of endpoint arguments from the item schema for the controller.
+	 *
+	 * @param string $method HTTP method of the request. The arguments
+	 *                       for `CREATABLE` requests are checked for required
+	 *                       values and may fall-back to a given default, this
+	 *                       is not done on `EDITABLE` requests. Default is
+	 *                       WP_REST_Server::CREATABLE.
+	 * @return array $endpoint_args
+	 */
+	public function get_endpoint_args_for_item_schema( $method = WP_REST_Server::CREATABLE ) {
+
+		$schema                = $this->get_item_schema();
+		$schema_properties     = ! empty( $schema['properties'] ) ? $schema['properties'] : array();
+		$endpoint_args = array();
+
+		foreach ( $schema_properties as $field_id => $params ) {
+
+			// Arguments specified as `readonly` are not allowed to be set.
+			if ( ! empty( $params['readonly'] ) ) {
+				continue;
+			}
+
+			$endpoint_args[ $field_id ] = array(
+				'validate_callback' => 'rest_validate_request_arg',
+				'sanitize_callback' => 'rest_sanitize_request_arg',
+			);
+
+			if ( isset( $params['description'] ) ) {
+				$endpoint_args[ $field_id ]['description'] = $params['description'];
+			}
+
+			if ( WP_REST_Server::CREATABLE === $method && isset( $params['default'] ) ) {
+				$endpoint_args[ $field_id ]['default'] = $params['default'];
+			}
+
+			if ( WP_REST_Server::CREATABLE === $method && ! empty( $params['required'] ) ) {
+				$endpoint_args[ $field_id ]['required'] = true;
+			}
+
+			foreach ( array( 'type', 'format', 'enum' ) as $schema_prop ) {
+				if ( isset( $params[ $schema_prop ] ) ) {
+					$endpoint_args[ $field_id ][ $schema_prop ] = $params[ $schema_prop ];
+				}
+			}
+
+			// Merge in any options provided by the schema property.
+			if ( isset( $params['arg_options'] ) ) {
+
+				// Only use required / default from arg_options on CREATABLE endpoints.
+				if ( WP_REST_Server::CREATABLE !== $method ) {
+					$params['arg_options'] = array_diff_key( $params['arg_options'], array( 'required' => '', 'default' => '' ) );
+				}
+
+				$endpoint_args[ $field_id ] = array_merge( $endpoint_args[ $field_id ], $params['arg_options'] );
+			}
+		}
+
+		return $endpoint_args;
+	}
+}
diff --git a/includes/vendor/wp-rest-functions.php b/includes/vendor/wp-rest-functions.php
new file mode 100644
index 00000000000..1c8c8b6f315
--- /dev/null
+++ b/includes/vendor/wp-rest-functions.php
@@ -0,0 +1,396 @@
+<?php
+/**
+ * @version 2.0-beta15
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * core-integration.php
+ */
+
+if ( ! function_exists( 'wp_parse_slug_list' ) ) {
+	/**
+	 * Clean up an array, comma- or space-separated list of slugs.
+	 *
+	 * @since
+	 *
+	 * @param  array|string $list List of slugs.
+	 * @return array Sanitized array of slugs.
+	 */
+	function wp_parse_slug_list( $list ) {
+		if ( ! is_array( $list ) ) {
+			$list = preg_split( '/[\s,]+/', $list );
+		}
+
+		foreach ( $list as $key => $value ) {
+			$list[ $key ] = sanitize_title( $value );
+		}
+
+		return array_unique( $list );
+	}
+}
+
+if ( ! function_exists( 'rest_get_server' ) ) {
+	/**
+	 * Retrieves the current REST server instance.
+	 *
+	 * Instantiates a new instance if none exists already.
+	 *
+	 * @since 4.5.0
+	 *
+	 * @global WP_REST_Server $wp_rest_server REST server instance.
+	 *
+	 * @return WP_REST_Server REST server instance.
+	 */
+	function rest_get_server() {
+		/* @var WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+
+		if ( empty( $wp_rest_server ) ) {
+			/**
+			 * Filter the REST Server Class.
+			 *
+			 * This filter allows you to adjust the server class used by the API, using a
+			 * different class to handle requests.
+			 *
+			 * @since 4.4.0
+			 *
+			 * @param string $class_name The name of the server class. Default 'WP_REST_Server'.
+			 */
+			$wp_rest_server_class = apply_filters( 'wp_rest_server_class', 'WP_REST_Server' );
+			$wp_rest_server = new $wp_rest_server_class;
+
+			/**
+			 * Fires when preparing to serve an API request.
+			 *
+			 * Endpoint objects should be created and register their hooks on this action rather
+			 * than another action to ensure they're only loaded when needed.
+			 *
+			 * @since 4.4.0
+			 *
+			 * @param WP_REST_Server $wp_rest_server Server object.
+			 */
+			do_action( 'rest_api_init', $wp_rest_server );
+		}
+
+		return $wp_rest_server;
+	}
+}
+
+/**
+ * plugin.php
+ */
+
+if ( ! function_exists( 'rest_authorization_required_code' ) ) {
+	/**
+	 * Returns a contextual HTTP error code for authorization failure.
+	 *
+	 * @return integer
+	 */
+	function rest_authorization_required_code() {
+		return is_user_logged_in() ? 403 : 401;
+	}
+}
+
+if ( ! function_exists( 'register_rest_field' ) ) {
+	/**
+	 * Registers a new field on an existing WordPress object type.
+	 *
+	 * @global array $wp_rest_additional_fields Holds registered fields, organized
+	 *                                          by object type.
+	 *
+	 * @param string|array $object_type Object(s) the field is being registered
+	 *                                  to, "post"|"term"|"comment" etc.
+	 * @param string $attribute         The attribute name.
+	 * @param array  $args {
+	 *     Optional. An array of arguments used to handle the registered field.
+	 *
+	 *     @type string|array|null $get_callback    Optional. The callback function used to retrieve the field
+	 *                                              value. Default is 'null', the field will not be returned in
+	 *                                              the response.
+	 *     @type string|array|null $update_callback Optional. The callback function used to set and update the
+	 *                                              field value. Default is 'null', the value cannot be set or
+	 *                                              updated.
+	 *     @type string|array|null $schema          Optional. The callback function used to create the schema for
+	 *                                              this field. Default is 'null', no schema entry will be returned.
+	 * }
+	 */
+	function register_rest_field( $object_type, $attribute, $args = array() ) {
+		$defaults = array(
+			'get_callback'    => null,
+			'update_callback' => null,
+			'schema'          => null,
+		);
+
+		$args = wp_parse_args( $args, $defaults );
+
+		global $wp_rest_additional_fields;
+
+		$object_types = (array) $object_type;
+
+		foreach ( $object_types as $object_type ) {
+			$wp_rest_additional_fields[ $object_type ][ $attribute ] = $args;
+		}
+	}
+}
+
+if ( ! function_exists( 'register_api_field' ) ) {
+	/**
+	 * Backwards compat shim
+	 */
+	function register_api_field( $object_type, $attributes, $args = array() ) {
+		wc_deprecated_function( 'register_api_field', 'WPAPI-2.0', 'register_rest_field' );
+		register_rest_field( $object_type, $attributes, $args );
+	}
+}
+
+if ( ! function_exists( 'rest_validate_request_arg' ) ) {
+	/**
+	 * Validate a request argument based on details registered to the route.
+	 *
+	 * @param  mixed            $value
+	 * @param  WP_REST_Request  $request
+	 * @param  string           $param
+	 * @return WP_Error|boolean
+	 */
+	function rest_validate_request_arg( $value, $request, $param ) {
+
+		$attributes = $request->get_attributes();
+		if ( ! isset( $attributes['args'][ $param ] ) || ! is_array( $attributes['args'][ $param ] ) ) {
+			return true;
+		}
+		$args = $attributes['args'][ $param ];
+
+		if ( ! empty( $args['enum'] ) ) {
+			if ( ! in_array( $value, $args['enum'] ) ) {
+				/* translators: 1: parameter 2: arguments */
+				return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s is not one of %2$s', 'woocommerce' ), $param, implode( ', ', $args['enum'] ) ) );
+			}
+		}
+
+		if ( 'integer' === $args['type'] && ! is_numeric( $value ) ) {
+			/* translators: 1: parameter 2: integer type */
+			return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s is not of type %2$s', 'woocommerce' ), $param, 'integer' ) );
+		}
+
+		if ( 'boolean' === $args['type'] && ! rest_is_boolean( $value ) ) {
+			/* translators: 1: parameter 2: boolean type */
+			return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s is not of type %2$s', 'woocommerce' ), $value, 'boolean' ) );
+		}
+
+		if ( 'string' === $args['type'] && ! is_string( $value ) ) {
+			/* translators: 1: parameter 2: string type */
+			return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s is not of type %2$s', 'woocommerce' ), $param, 'string' ) );
+		}
+
+		if ( isset( $args['format'] ) ) {
+			switch ( $args['format'] ) {
+				case 'date-time' :
+					if ( ! rest_parse_date( $value ) ) {
+						return new WP_Error( 'rest_invalid_date', __( 'The date you provided is invalid.', 'woocommerce' ) );
+					}
+					break;
+
+				case 'email' :
+					if ( ! is_email( $value ) ) {
+						return new WP_Error( 'rest_invalid_email', __( 'The email address you provided is invalid.', 'woocommerce' ) );
+					}
+					break;
+				case 'ipv4' :
+					if ( ! rest_is_ip_address( $value ) ) {
+						/* translators: %s: IP address */
+						return new WP_Error( 'rest_invalid_param', sprintf( __( '%s is not a valid IP address.', 'woocommerce' ), $value ) );
+					}
+					break;
+			}
+		}
+
+		if ( in_array( $args['type'], array( 'numeric', 'integer' ) ) && ( isset( $args['minimum'] ) || isset( $args['maximum'] ) ) ) {
+			if ( isset( $args['minimum'] ) && ! isset( $args['maximum'] ) ) {
+				if ( ! empty( $args['exclusiveMinimum'] ) && $value <= $args['minimum'] ) {
+					return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be greater than %2$d (exclusive)', 'woocommerce' ), $param, $args['minimum'] ) );
+				} elseif ( empty( $args['exclusiveMinimum'] ) && $value < $args['minimum'] ) {
+					return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be greater than %2$d (inclusive)', 'woocommerce' ), $param, $args['minimum'] ) );
+				}
+			} elseif ( isset( $args['maximum'] ) && ! isset( $args['minimum'] ) ) {
+				if ( ! empty( $args['exclusiveMaximum'] ) && $value >= $args['maximum'] ) {
+					return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be less than %2$d (exclusive)', 'woocommerce' ), $param, $args['maximum'] ) );
+				} elseif ( empty( $args['exclusiveMaximum'] ) && $value > $args['maximum'] ) {
+					return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be less than %2$d (inclusive)', 'woocommerce' ), $param, $args['maximum'] ) );
+				}
+			} elseif ( isset( $args['maximum'] ) && isset( $args['minimum'] ) ) {
+				if ( ! empty( $args['exclusiveMinimum'] ) && ! empty( $args['exclusiveMaximum'] ) ) {
+					if ( $value >= $args['maximum'] || $value <= $args['minimum'] ) {
+						return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be between %2$d (exclusive) and %3$d (exclusive)', 'woocommerce' ), $param, $args['minimum'], $args['maximum'] ) );
+					}
+				} elseif ( empty( $args['exclusiveMinimum'] ) && ! empty( $args['exclusiveMaximum'] ) ) {
+					if ( $value >= $args['maximum'] || $value < $args['minimum'] ) {
+						return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be between %2$d (inclusive) and %3$d (exclusive)', 'woocommerce' ), $param, $args['minimum'], $args['maximum'] ) );
+					}
+				} elseif ( ! empty( $args['exclusiveMinimum'] ) && empty( $args['exclusiveMaximum'] ) ) {
+					if ( $value > $args['maximum'] || $value <= $args['minimum'] ) {
+						return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be between %2$d (exclusive) and %3$d (inclusive)', 'woocommerce' ), $param, $args['minimum'], $args['maximum'] ) );
+					}
+				} elseif ( empty( $args['exclusiveMinimum'] ) && empty( $args['exclusiveMaximum'] ) ) {
+					if ( $value > $args['maximum'] || $value < $args['minimum'] ) {
+						return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be between %2$d (inclusive) and %3$d (inclusive)', 'woocommerce' ), $param, $args['minimum'], $args['maximum'] ) );
+					}
+				}
+			}
+		}
+
+		return true;
+	}
+}
+
+if ( ! function_exists( 'rest_sanitize_request_arg' ) ) {
+	/**
+	 * Sanitize a request argument based on details registered to the route.
+	 *
+	 * @param  mixed            $value
+	 * @param  WP_REST_Request  $request
+	 * @param  string           $param
+	 * @return mixed
+	 */
+	function rest_sanitize_request_arg( $value, $request, $param ) {
+
+		$attributes = $request->get_attributes();
+		if ( ! isset( $attributes['args'][ $param ] ) || ! is_array( $attributes['args'][ $param ] ) ) {
+			return $value;
+		}
+		$args = $attributes['args'][ $param ];
+
+		if ( 'integer' === $args['type'] ) {
+			return (int) $value;
+		}
+
+		if ( 'boolean' === $args['type'] ) {
+			return rest_sanitize_boolean( $value );
+		}
+
+		if ( isset( $args['format'] ) ) {
+			switch ( $args['format'] ) {
+				case 'date-time' :
+					return sanitize_text_field( $value );
+
+				case 'email' :
+					/*
+					 * sanitize_email() validates, which would be unexpected
+					 */
+					return sanitize_text_field( $value );
+
+				case 'uri' :
+					return esc_url_raw( $value );
+
+				case 'ipv4' :
+					return sanitize_text_field( $value );
+			}
+		}
+
+		return $value;
+	}
+}
+
+
+if ( ! function_exists( 'rest_parse_request_arg' ) ) {
+	/**
+	 * Parse a request argument based on details registered to the route.
+	 *
+	 * Runs a validation check and sanitizes the value, primarily to be used via
+	 * the `sanitize_callback` arguments in the endpoint args registration.
+	 *
+	 * @param  mixed            $value
+	 * @param  WP_REST_Request  $request
+	 * @param  string           $param
+	 * @return mixed
+	 */
+	function rest_parse_request_arg( $value, $request, $param ) {
+
+		$is_valid = rest_validate_request_arg( $value, $request, $param );
+
+		if ( is_wp_error( $is_valid ) ) {
+			return $is_valid;
+		}
+
+		$value = rest_sanitize_request_arg( $value, $request, $param );
+
+		return $value;
+	}
+}
+
+if ( ! function_exists( 'rest_is_ip_address' ) ) {
+	/**
+	 * Determines if a IPv4 address is valid.
+	 *
+	 * Does not handle IPv6 addresses.
+	 *
+	 * @param  string $ipv4 IP 32-bit address.
+	 * @return string|false The valid IPv4 address, otherwise false.
+	 */
+	function rest_is_ip_address( $ipv4 ) {
+		$pattern = '/^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/';
+
+		if ( ! preg_match( $pattern, $ipv4 ) ) {
+			return false;
+		}
+
+		return $ipv4;
+	}
+}
+
+/**
+ * Changes a boolean-like value into the proper boolean value.
+ *
+ * @param bool|string|int $value The value being evaluated.
+ * @return boolean Returns the proper associated boolean value.
+ */
+if ( ! function_exists( 'rest_sanitize_boolean' ) ) {
+	function rest_sanitize_boolean( $value ) {
+		// String values are translated to `true`; make sure 'false' is false.
+		if ( is_string( $value )  ) {
+			$value = strtolower( $value );
+			if ( in_array( $value, array( 'false', '0' ), true ) ) {
+				$value = false;
+			}
+		}
+
+		// Everything else will map nicely to boolean.
+		return (boolean) $value;
+	}
+}
+
+/**
+ * Determines if a given value is boolean-like.
+ *
+ * @param bool|string $maybe_bool The value being evaluated.
+ * @return boolean True if a boolean, otherwise false.
+ */
+if ( ! function_exists( 'rest_is_boolean' ) ) {
+	function rest_is_boolean( $maybe_bool ) {
+		if ( is_bool( $maybe_bool ) ) {
+			return true;
+		}
+
+		if ( is_string( $maybe_bool ) ) {
+			$maybe_bool = strtolower( $maybe_bool );
+
+			$valid_boolean_values = array(
+				'false',
+				'true',
+				'0',
+				'1',
+			);
+
+			return in_array( $maybe_bool, $valid_boolean_values, true );
+		}
+
+		if ( is_int( $maybe_bool ) ) {
+			return in_array( $maybe_bool, array( 0, 1 ), true );
+		}
+
+		return false;
+	}
+}
diff --git a/includes/walkers/class-product-cat-dropdown-walker.php b/includes/walkers/class-product-cat-dropdown-walker.php
index 384f9e4cc4f..5b43118a792 100644
--- a/includes/walkers/class-product-cat-dropdown-walker.php
+++ b/includes/walkers/class-product-cat-dropdown-walker.php
@@ -13,14 +13,31 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
 
-if ( ! class_exists( 'WC_Product_Cat_Dropdown_Walker' ) ) :
+if ( ! class_exists( 'WC_Product_Cat_Dropdown_Walker', false ) ) :
 
 class WC_Product_Cat_Dropdown_Walker extends Walker {
 
+	/**
+	 * What the class handles.
+	 *
+	 * @var string
+	 */
 	public $tree_type = 'category';
-	public $db_fields = array ('parent' => 'parent', 'id' => 'term_id', 'slug' => 'slug' );
 
 	/**
+	 * DB fields to use.
+	 *
+	 * @var array
+	 */
+	public $db_fields = array(
+		'parent' => 'parent',
+		'id'     => 'term_id',
+		'slug'   => 'slug',
+	);
+
+	/**
+	 * Starts the list before the elements are added.
+	 *
 	 * @see Walker::start_el()
 	 * @since 2.1.0
 	 *
@@ -30,26 +47,26 @@ class WC_Product_Cat_Dropdown_Walker extends Walker {
 	 */
 	public function start_el( &$output, $cat, $depth = 0, $args = array(), $current_object_id = 0 ) {
 
-		if ( ! empty( $args['hierarchical'] ) )
-			$pad = str_repeat('&nbsp;', $depth * 3);
-		else
+		if ( ! empty( $args['hierarchical'] ) ) {
+			$pad = str_repeat( '&nbsp;', $depth * 3 );
+		} else {
 			$pad = '';
+		}
 
 		$cat_name = apply_filters( 'list_product_cats', $cat->name, $cat );
+		$value    = ( isset( $args['value'] ) && 'id' === $args['value'] ) ? $cat->term_id : $cat->slug;
+		$output  .= "\t<option class=\"level-$depth\" value=\"" . esc_attr( $value ) . "\"";
 
-		$value = isset( $args['value'] ) && $args['value'] == 'id' ? $cat->term_id : $cat->slug;
-
-		$output .= "\t<option class=\"level-$depth\" value=\"" . $value . "\"";
-
-		if ( $value == $args['selected'] || ( is_array( $args['selected'] ) && in_array( $value, $args['selected'] ) ) )
+		if ( $value === $args['selected'] || ( is_array( $args['selected'] ) && in_array( $value, $args['selected'] ) ) ) {
 			$output .= ' selected="selected"';
+		}
 
 		$output .= '>';
+		$output .= esc_html( $pad . _x( $cat_name, 'product category name', 'woocommerce' ) );
 
-		$output .= $pad . __( $cat_name, 'woocommerce' );
-
-		if ( ! empty( $args['show_count'] ) )
-			$output .= '&nbsp;(' . $cat->count . ')';
+		if ( ! empty( $args['show_count'] ) ) {
+			$output .= '&nbsp;(' . absint( $cat->count ) . ')';
+		}
 
 		$output .= "</option>\n";
 	}
@@ -75,7 +92,7 @@ class WC_Product_Cat_Dropdown_Walker extends Walker {
 	 * @return null Null on failure with no changes to parameters.
 	 */
 	public function display_element( $element, &$children_elements, $max_depth, $depth = 0, $args, &$output ) {
-		if ( ! $element || 0 === $element->count ) {
+		if ( ! $element || ( 0 === $element->count && ! empty( $args[0]['hide_empty'] ) ) ) {
 			return;
 		}
 		parent::display_element( $element, $children_elements, $max_depth, $depth, $args, $output );
diff --git a/includes/walkers/class-product-cat-list-walker.php b/includes/walkers/class-product-cat-list-walker.php
index 78c0aae9e57..c148aed2c77 100644
--- a/includes/walkers/class-product-cat-list-walker.php
+++ b/includes/walkers/class-product-cat-list-walker.php
@@ -13,14 +13,31 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
 
-if ( ! class_exists( 'WC_Product_Cat_List_Walker' ) ) :
+if ( ! class_exists( 'WC_Product_Cat_List_Walker', false ) ) :
 
 class WC_Product_Cat_List_Walker extends Walker {
 
+	/**
+	 * What the class handles.
+	 *
+	 * @var string
+	 */
 	public $tree_type = 'product_cat';
-	public $db_fields = array ( 'parent' => 'parent', 'id' => 'term_id', 'slug' => 'slug' );
 
 	/**
+	 * DB fields to use.
+	 *
+	 * @var array
+	 */
+	public $db_fields = array(
+		'parent' => 'parent',
+		'id'     => 'term_id',
+		'slug'   => 'slug',
+	);
+
+	/**
+	 * Starts the list before the elements are added.
+	 *
 	 * @see Walker::start_lvl()
 	 * @since 2.1.0
 	 *
@@ -29,14 +46,17 @@ class WC_Product_Cat_List_Walker extends Walker {
 	 * @param array $args Will only append content if style argument value is 'list'.
 	 */
 	public function start_lvl( &$output, $depth = 0, $args = array() ) {
-		if ( 'list' != $args['style'] )
+		if ( 'list' != $args['style'] ) {
 			return;
+		}
 
-		$indent = str_repeat("\t", $depth);
+		$indent = str_repeat( "\t", $depth );
 		$output .= "$indent<ul class='children'>\n";
 	}
 
 	/**
+	 * Ends the list of after the elements are added.
+	 *
 	 * @see Walker::end_lvl()
 	 * @since 2.1.0
 	 *
@@ -45,14 +65,17 @@ class WC_Product_Cat_List_Walker extends Walker {
 	 * @param array $args Will only append content if style argument value is 'list'.
 	 */
 	public function end_lvl( &$output, $depth = 0, $args = array() ) {
-		if ( 'list' != $args['style'] )
+		if ( 'list' != $args['style'] ) {
 			return;
+		}
 
-		$indent = str_repeat("\t", $depth);
+		$indent = str_repeat( "\t", $depth );
 		$output .= "$indent</ul>\n";
 	}
 
 	/**
+	 * Start the element output.
+	 *
 	 * @see Walker::start_el()
 	 * @since 2.1.0
 	 *
@@ -75,7 +98,7 @@ class WC_Product_Cat_List_Walker extends Walker {
 			$output .= ' current-cat-parent';
 		}
 
-		$output .=  '"><a href="' . get_term_link( (int) $cat->term_id, $this->tree_type ) . '">' . __( $cat->name, 'woocommerce' ) . '</a>';
+		$output .= '"><a href="' . get_term_link( (int) $cat->term_id, $this->tree_type ) . '">' . _x( $cat->name, 'product category name', 'woocommerce' ) . '</a>';
 
 		if ( $args['show_count'] ) {
 			$output .= ' <span class="count">(' . $cat->count . ')</span>';
@@ -83,6 +106,8 @@ class WC_Product_Cat_List_Walker extends Walker {
 	}
 
 	/**
+	 * Ends the element output, if needed.
+	 *
 	 * @see Walker::end_el()
 	 * @since 2.1.0
 	 *
@@ -115,7 +140,7 @@ class WC_Product_Cat_List_Walker extends Walker {
 	 * @return null Null on failure with no changes to parameters.
 	 */
 	public function display_element( $element, &$children_elements, $max_depth, $depth = 0, $args, &$output ) {
-		if ( ! $element || 0 === $element->count ) {
+		if ( ! $element || ( 0 === $element->count && ! empty( $args[0]['hide_empty'] ) ) ) {
 			return;
 		}
 		parent::display_element( $element, $children_elements, $max_depth, $depth, $args, $output );
diff --git a/includes/wc-account-functions.php b/includes/wc-account-functions.php
new file mode 100644
index 00000000000..c2ce32a6d72
--- /dev/null
+++ b/includes/wc-account-functions.php
@@ -0,0 +1,331 @@
+<?php
+/**
+ * WooCommerce Account Functions
+ *
+ * Functions for account specific things.
+ *
+ * @author   WooThemes
+ * @category Core
+ * @package  WooCommerce/Functions
+ * @version  2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Returns the url to the lost password endpoint url.
+ *
+ * @access public
+ * @param  string $default_url
+ * @return string
+ */
+function wc_lostpassword_url( $default_url = '' ) {
+	// Don't redirect to the woocommerce endpoint on global network admin lost passwords.
+	if ( is_multisite() && isset( $_GET['redirect_to'] ) && false !== strpos( $_GET['redirect_to'], network_admin_url() ) ) {
+		return $default_url;
+	}
+
+	$wc_account_page_url    = wc_get_page_permalink( 'myaccount' );
+	$wc_account_page_exists = wc_get_page_id( 'myaccount' ) > 0;
+	$lost_password_endpoint = get_option( 'woocommerce_myaccount_lost_password_endpoint' );
+
+	if ( $wc_account_page_exists && ! empty( $lost_password_endpoint ) ) {
+		return wc_get_endpoint_url( $lost_password_endpoint, '', $wc_account_page_url );
+	} else {
+		return $default_url;
+	}
+}
+
+add_filter( 'lostpassword_url', 'wc_lostpassword_url', 10, 1 );
+
+/**
+ * Get the link to the edit account details page.
+ *
+ * @return string
+ */
+function wc_customer_edit_account_url() {
+	$edit_account_url = wc_get_endpoint_url( 'edit-account', '', wc_get_page_permalink( 'myaccount' ) );
+
+	return apply_filters( 'woocommerce_customer_edit_account_url', $edit_account_url );
+}
+
+/**
+ * Get the edit address slug translation.
+ *
+ * @param  string  $id   Address ID.
+ * @param  bool    $flip Flip the array to make it possible to retrieve the values ​​from both sides.
+ *
+ * @return string        Address slug i18n.
+ */
+function wc_edit_address_i18n( $id, $flip = false ) {
+	$slugs = apply_filters( 'woocommerce_edit_address_slugs', array(
+		'billing'  => sanitize_title( _x( 'billing', 'edit-address-slug', 'woocommerce' ) ),
+		'shipping' => sanitize_title( _x( 'shipping', 'edit-address-slug', 'woocommerce' ) ),
+	) );
+
+	if ( $flip ) {
+		$slugs = array_flip( $slugs );
+	}
+
+	if ( ! isset( $slugs[ $id ] ) ) {
+		return $id;
+	}
+
+	return $slugs[ $id ];
+}
+
+/**
+ * Get My Account menu items.
+ *
+ * @since 2.6.0
+ * @return array
+ */
+function wc_get_account_menu_items() {
+	$endpoints = array(
+		'orders'          => get_option( 'woocommerce_myaccount_orders_endpoint', 'orders' ),
+		'downloads'       => get_option( 'woocommerce_myaccount_downloads_endpoint', 'downloads' ),
+		'edit-address'    => get_option( 'woocommerce_myaccount_edit_address_endpoint', 'edit-address' ),
+		'payment-methods' => get_option( 'woocommerce_myaccount_payment_methods_endpoint', 'payment-methods' ),
+		'edit-account'    => get_option( 'woocommerce_myaccount_edit_account_endpoint', 'edit-account' ),
+		'customer-logout' => get_option( 'woocommerce_logout_endpoint', 'customer-logout' ),
+	);
+
+	$items = array(
+		'dashboard'       => __( 'Dashboard', 'woocommerce' ),
+		'orders'          => __( 'Orders', 'woocommerce' ),
+		'downloads'       => __( 'Downloads', 'woocommerce' ),
+		'edit-address'    => __( 'Addresses', 'woocommerce' ),
+		'payment-methods' => __( 'Payment methods', 'woocommerce' ),
+		'edit-account'    => __( 'Account details', 'woocommerce' ),
+		'customer-logout' => __( 'Logout', 'woocommerce' ),
+	);
+
+	// Remove missing endpoints.
+	foreach ( $endpoints as $endpoint_id => $endpoint ) {
+		if ( empty( $endpoint ) ) {
+			unset( $items[ $endpoint_id ] );
+		}
+	}
+
+	// Check if payment gateways support add new payment methods.
+	if ( isset( $items['payment-methods'] ) ) {
+		$support_payment_methods = false;
+		foreach ( WC()->payment_gateways->get_available_payment_gateways() as $gateway ) {
+			if ( $gateway->supports( 'add_payment_method' ) || $gateway->supports( 'tokenization' ) ) {
+				$support_payment_methods = true;
+				break;
+			}
+		}
+
+		if ( ! $support_payment_methods ) {
+			unset( $items['payment-methods'] );
+		}
+	}
+
+	return apply_filters( 'woocommerce_account_menu_items', $items );
+}
+
+/**
+ * Get account menu item classes.
+ *
+ * @since 2.6.0
+ * @param string $endpoint
+ * @return string
+ */
+function wc_get_account_menu_item_classes( $endpoint ) {
+	global $wp;
+
+	$classes = array(
+		'woocommerce-MyAccount-navigation-link',
+		'woocommerce-MyAccount-navigation-link--' . $endpoint,
+	);
+
+	// Set current item class.
+	$current = isset( $wp->query_vars[ $endpoint ] );
+	if ( 'dashboard' === $endpoint && ( isset( $wp->query_vars['page'] ) || empty( $wp->query_vars ) ) ) {
+		$current = true; // Dashboard is not an endpoint, so needs a custom check.
+	}
+
+	if ( $current ) {
+		$classes[] = 'is-active';
+	}
+
+	$classes = apply_filters( 'woocommerce_account_menu_item_classes', $classes, $endpoint );
+
+	return implode( ' ', array_map( 'sanitize_html_class', $classes ) );
+}
+
+/**
+ * Get account endpoint URL.
+ *
+ * @since 2.6.0
+ * @param string $endpoint
+ * @return string
+ */
+function wc_get_account_endpoint_url( $endpoint ) {
+	if ( 'dashboard' === $endpoint ) {
+		return wc_get_page_permalink( 'myaccount' );
+	}
+
+	return wc_get_endpoint_url( $endpoint, '', wc_get_page_permalink( 'myaccount' ) );
+}
+
+/**
+ * Get My Account > Orders columns.
+ *
+ * @since 2.6.0
+ * @return array
+ */
+function wc_get_account_orders_columns() {
+	$columns = apply_filters( 'woocommerce_account_orders_columns', array(
+		'order-number'  => __( 'Order', 'woocommerce' ),
+		'order-date'    => __( 'Date', 'woocommerce' ),
+		'order-status'  => __( 'Status', 'woocommerce' ),
+		'order-total'   => __( 'Total', 'woocommerce' ),
+		'order-actions' => __( 'Actions', 'woocommerce' ),
+	) );
+
+	// Deprecated filter since 2.6.0.
+	return apply_filters( 'woocommerce_my_account_my_orders_columns', $columns );
+}
+
+/**
+ * Get My Account > Downloads columns.
+ *
+ * @since 2.6.0
+ * @return array
+ */
+function wc_get_account_downloads_columns() {
+	$columns = apply_filters( 'woocommerce_account_downloads_columns', array(
+		'download-product'   => __( 'Product', 'woocommerce' ),
+		'download-remaining' => __( 'Downloads remaining', 'woocommerce' ),
+		'download-expires'   => __( 'Expires', 'woocommerce' ),
+		'download-file'      => __( 'File', 'woocommerce' ),
+		'download-actions'   => '&nbsp;',
+	) );
+
+	if ( ! has_filter( 'woocommerce_account_download_actions' ) ) {
+		unset( $columns['download-actions'] );
+	}
+
+	return $columns;
+}
+
+/**
+ * Get My Account > Payment methods columns.
+ *
+ * @since 2.6.0
+ * @return array
+ */
+function wc_get_account_payment_methods_columns() {
+	return apply_filters( 'woocommerce_account_payment_methods_columns', array(
+		'method'  => __( 'Method', 'woocommerce' ),
+		'expires' => __( 'Expires', 'woocommerce' ),
+		'actions' => '&nbsp;',
+	) );
+}
+
+/**
+ * Get My Account > Payment methods types
+ *
+ * @since 2.6.0
+ * @return array
+ */
+function wc_get_account_payment_methods_types() {
+	return apply_filters( 'woocommerce_payment_methods_types', array(
+		'cc'     => __( 'Credit card', 'woocommerce' ),
+		'echeck' => __( 'eCheck', 'woocommerce' ),
+	) );
+}
+
+/**
+ * Returns an array of a user's saved payments list for output on the account tab.
+ *
+ * @since  2.6
+ * @param  array $list         List of payment methods passed from wc_get_customer_saved_methods_list()
+ * @param  int   $customer_id  The customer to fetch payment methods for
+ * @return array               Filtered list of customers payment methods
+ */
+function wc_get_account_saved_payment_methods_list( $list, $customer_id ) {
+	$payment_tokens = WC_Payment_Tokens::get_customer_tokens( $customer_id );
+	foreach ( $payment_tokens as $payment_token ) {
+		$delete_url      = wc_get_endpoint_url( 'delete-payment-method', $payment_token->get_id() );
+		$delete_url      = wp_nonce_url( $delete_url, 'delete-payment-method-' . $payment_token->get_id() );
+		$set_default_url = wc_get_endpoint_url( 'set-default-payment-method', $payment_token->get_id() );
+		$set_default_url = wp_nonce_url( $set_default_url, 'set-default-payment-method-' . $payment_token->get_id() );
+
+		$type            = strtolower( $payment_token->get_type() );
+		$list[ $type ][] = array(
+			'method' => array(
+				'gateway' => $payment_token->get_gateway_id(),
+			),
+			'expires'    => esc_html__( 'N/A', 'woocommerce' ),
+			'is_default' => $payment_token->is_default(),
+			'actions'    => array(
+				'delete' => array(
+					'url'  => $delete_url,
+					'name' => esc_html__( 'Delete', 'woocommerce' ),
+				),
+			),
+		);
+		$key = key( array_slice( $list[ $type ], -1, 1, true ) );
+
+		if ( ! $payment_token->is_default() ) {
+			$list[ $type ][ $key ]['actions']['default'] = array(
+				'url' => $set_default_url,
+				'name' => esc_html__( 'Make default', 'woocommerce' ),
+			);
+		}
+
+		$list[ $type ][ $key ] = apply_filters( 'woocommerce_payment_methods_list_item', $list[ $type ][ $key ], $payment_token );
+	}
+	return $list;
+}
+
+add_filter( 'woocommerce_saved_payment_methods_list', 'wc_get_account_saved_payment_methods_list', 10, 2 );
+
+/**
+ * Controls the output for credit cards on the my account page.
+ *
+ * @since 2.6
+ * @param  array             $item         Individual list item from woocommerce_saved_payment_methods_list
+ * @param  WC_Payment_Token $payment_token The payment token associated with this method entry
+ * @return array                           Filtered item
+ */
+function wc_get_account_saved_payment_methods_list_item_cc( $item, $payment_token ) {
+	if ( 'cc' !== strtolower( $payment_token->get_type() ) ) {
+		return $item;
+	}
+
+	$card_type               = $payment_token->get_card_type();
+	$item['method']['last4'] = $payment_token->get_last4();
+	$item['method']['brand'] = ( ! empty( $card_type ) ? ucfirst( $card_type ) : esc_html__( 'Credit card', 'woocommerce' ) );
+	$item['expires']         = $payment_token->get_expiry_month() . '/' . substr( $payment_token->get_expiry_year(), -2 );
+
+	return $item;
+}
+
+add_filter( 'woocommerce_payment_methods_list_item', 'wc_get_account_saved_payment_methods_list_item_cc', 10, 2 );
+
+/**
+ * Controls the output for eChecks on the my account page.
+ *
+ * @since 2.6
+ * @param  array             $item         Individual list item from woocommerce_saved_payment_methods_list
+ * @param  WC_Payment_Token $payment_token The payment token associated with this method entry
+ * @return array                           Filtered item
+ */
+function wc_get_account_saved_payment_methods_list_item_echeck( $item, $payment_token ) {
+	if ( 'echeck' !== strtolower( $payment_token->get_type() ) ) {
+		return $item;
+	}
+
+	$item['method']['last4'] = $payment_token->get_last4();
+	$item['method']['brand'] = esc_html__( 'eCheck', 'woocommerce' );
+
+	return $item;
+}
+
+add_filter( 'woocommerce_payment_methods_list_item', 'wc_get_account_saved_payment_methods_list_item_echeck', 10, 2 );
diff --git a/includes/wc-attribute-functions.php b/includes/wc-attribute-functions.php
index 4bc58c5eb80..7a2e9c72a83 100644
--- a/includes/wc-attribute-functions.php
+++ b/includes/wc-attribute-functions.php
@@ -19,7 +19,27 @@ if ( ! defined( 'ABSPATH' ) ) {
  * @return array
  */
 function wc_get_text_attributes( $raw_attributes ) {
-	return array_map( 'trim', explode( WC_DELIMITER, html_entity_decode( $raw_attributes, ENT_QUOTES, get_bloginfo( 'charset' ) ) ) );
+	return array_filter( array_map( 'trim', explode( WC_DELIMITER, html_entity_decode( $raw_attributes, ENT_QUOTES, get_bloginfo( 'charset' ) ) ) ), 'wc_get_text_attributes_filter_callback' );
+}
+
+/**
+ * See if an attribute is actually valid.
+ * @since  3.0.0
+ * @param  string $value
+ * @return bool
+ */
+function wc_get_text_attributes_filter_callback( $value ) {
+	return '' !== $value;
+}
+
+/**
+ * Implode an array of attributes using WC_DELIMITER.
+ * @since  3.0.0
+ * @param  array $attributes
+ * @return string
+ */
+function wc_implode_text_attributes( $attributes ) {
+	return implode( ' ' . WC_DELIMITER . ' ', $attributes );
 }
 
 /**
@@ -49,6 +69,17 @@ function wc_attribute_taxonomy_name( $attribute_name ) {
 	return 'pa_' . wc_sanitize_taxonomy_name( $attribute_name );
 }
 
+/**
+ * Get the attribute name used when storing values in post meta.
+ *
+ * @since 2.6.0
+ * @param string $attribute_name Attribute name.
+ * @return string
+ */
+function wc_variation_attribute_name( $attribute_name ) {
+	return 'attribute_' . sanitize_title( $attribute_name );
+}
+
 /**
  * Get a product attribute name by ID.
  *
@@ -72,29 +103,46 @@ function wc_attribute_taxonomy_name_by_id( $attribute_id ) {
 	return '';
 }
 
+/**
+ * Get a product attribute ID by name.
+ *
+ * @since  2.6.0
+ * @param string $name Attribute name.
+ * @return int
+ */
+function wc_attribute_taxonomy_id_by_name( $name ) {
+	$name       = str_replace( 'pa_', '', sanitize_title( $name ) );
+	$taxonomies = wp_list_pluck( wc_get_attribute_taxonomies(), 'attribute_id', 'attribute_name' );
+
+	return isset( $taxonomies[ $name ] ) ? (int) $taxonomies[ $name ] : 0;
+}
+
 /**
  * Get a product attributes label.
  *
  * @param string $name
- * @param  object $product object Optional
+ * @param object $product object Optional
  * @return string
  */
 function wc_attribute_label( $name, $product = '' ) {
 	global $wpdb;
 
 	if ( taxonomy_is_product_attribute( $name ) ) {
-		$name = wc_sanitize_taxonomy_name( str_replace( 'pa_', '', $name ) );
-
-		$label = $wpdb->get_var( $wpdb->prepare( "SELECT attribute_label FROM {$wpdb->prefix}woocommerce_attribute_taxonomies WHERE attribute_name = %s;", $name ) );
-
-		if ( ! $label ) {
+		$name       = wc_sanitize_taxonomy_name( str_replace( 'pa_', '', $name ) );
+		$all_labels = wp_list_pluck( wc_get_attribute_taxonomies(), 'attribute_label', 'attribute_name' );
+		$label      = isset( $all_labels[ $name ] ) ? $all_labels[ $name ] : $name;
+	} elseif ( $product ) {
+		if ( $product->is_type( 'variation' ) ) {
+			$product = wc_get_product( $product->get_parent_id() );
+		}
+		// Attempt to get label from product, as entered by the user.
+		if ( ( $attributes = $product->get_attributes() ) && isset( $attributes[ sanitize_title( $name ) ] ) ) {
+			$label = $attributes[ sanitize_title( $name ) ]->get_name();
+		} else {
 			$label = $name;
 		}
-	} elseif ( $product && ( $attributes = $product->get_attributes() ) && isset( $attributes[ sanitize_title( $name ) ]['name'] ) ) {
-		// Attempt to get label from product, as entered by the user
-		$label = $attributes[ sanitize_title( $name ) ]['name'];
 	} else {
-		$label = str_replace( '-', ' ', $name );
+		$label = $name;
 	}
 
 	return apply_filters( 'woocommerce_attribute_label', $label, $name, $product );
@@ -107,11 +155,15 @@ function wc_attribute_label( $name, $product = '' ) {
  * @return string
  */
 function wc_attribute_orderby( $name ) {
-	global $wpdb;
+	global $wc_product_attributes, $wpdb;
 
 	$name = str_replace( 'pa_', '', sanitize_title( $name ) );
 
-	$orderby = $wpdb->get_var( $wpdb->prepare( "SELECT attribute_orderby FROM " . $wpdb->prefix . "woocommerce_attribute_taxonomies WHERE attribute_name = %s;", $name ) );
+	if ( isset( $wc_product_attributes[ 'pa_' . $name ] ) ) {
+		$orderby = $wc_product_attributes[ 'pa_' . $name ]->attribute_orderby;
+	} else {
+		$orderby = $wpdb->get_var( $wpdb->prepare( "SELECT attribute_orderby FROM " . $wpdb->prefix . "woocommerce_attribute_taxonomies WHERE attribute_name = %s;", $name ) );
+	}
 
 	return apply_filters( 'woocommerce_attribute_orderby', $orderby, $name );
 }
@@ -124,7 +176,7 @@ function wc_attribute_orderby( $name ) {
 function wc_get_attribute_taxonomy_names() {
 	$taxonomy_names = array();
 	$attribute_taxonomies = wc_get_attribute_taxonomies();
-	if ( $attribute_taxonomies ) {
+	if ( ! empty( $attribute_taxonomies ) ) {
 		foreach ( $attribute_taxonomies as $tax ) {
 			$taxonomy_names[] = wc_attribute_taxonomy_name( $tax->attribute_name );
 		}
@@ -141,13 +193,26 @@ function wc_get_attribute_taxonomy_names() {
 function wc_get_attribute_types() {
 	return (array) apply_filters( 'product_attributes_type_selector', array(
 		'select' => __( 'Select', 'woocommerce' ),
-		'text'   => __( 'Text', 'woocommerce' )
+		'text'   => __( 'Text', 'woocommerce' ),
 	) );
 }
 
+/**
+ * Get attribute type label.
+ *
+ * @since  3.0.0
+ * @param  string $type Attribute type slug.
+ * @return string
+ */
+function wc_get_attribute_type_label( $type ) {
+	$types = wc_get_attribute_types();
+
+	return isset( $types[ $type ] ) ? $types[ $type ] : ucfirst( $type );
+}
+
 /**
  * Check if attribute name is reserved.
- * http://codex.wordpress.org/Function_Reference/register_taxonomy#Reserved_Terms.
+ * https://codex.wordpress.org/Function_Reference/register_taxonomy#Reserved_Terms.
  *
  * @since  2.4.0
  * @param  string $attribute_name
@@ -156,15 +221,116 @@ function wc_get_attribute_types() {
 function wc_check_if_attribute_name_is_reserved( $attribute_name ) {
 	// Forbidden attribute names
 	$reserved_terms = array(
-		'attachment', 'attachment_id', 'author', 'author_name', 'calendar', 'cat', 'category', 'category__and',
-		'category__in', 'category__not_in', 'category_name', 'comments_per_page', 'comments_popup', 'cpage', 'day',
-		'debug', 'error', 'exact', 'feed', 'hour', 'link_category', 'm', 'minute', 'monthnum', 'more', 'name',
-		'nav_menu', 'nopaging', 'offset', 'order', 'orderby', 'p', 'page', 'page_id', 'paged', 'pagename', 'pb', 'perm',
-		'post', 'post__in', 'post__not_in', 'post_format', 'post_mime_type', 'post_status', 'post_tag', 'post_type',
-		'posts', 'posts_per_archive_page', 'posts_per_page', 'preview', 'robots', 's', 'search', 'second', 'sentence',
-		'showposts', 'static', 'subpost', 'subpost_id', 'tag', 'tag__and', 'tag__in', 'tag__not_in', 'tag_id',
-		'tag_slug__and', 'tag_slug__in', 'taxonomy', 'tb', 'term', 'type', 'w', 'withcomments', 'withoutcomments', 'year',
+		'attachment',
+		'attachment_id',
+		'author',
+		'author_name',
+		'calendar',
+		'cat',
+		'category',
+		'category__and',
+		'category__in',
+		'category__not_in',
+		'category_name',
+		'comments_per_page',
+		'comments_popup',
+		'cpage',
+		'day',
+		'debug',
+		'error',
+		'exact',
+		'feed',
+		'hour',
+		'link_category',
+		'm',
+		'minute',
+		'monthnum',
+		'more',
+		'name',
+		'nav_menu',
+		'nopaging',
+		'offset',
+		'order',
+		'orderby',
+		'p',
+		'page',
+		'page_id',
+		'paged',
+		'pagename',
+		'pb',
+		'perm',
+		'post',
+		'post__in',
+		'post__not_in',
+		'post_format',
+		'post_mime_type',
+		'post_status',
+		'post_tag',
+		'post_type',
+		'posts',
+		'posts_per_archive_page',
+		'posts_per_page',
+		'preview',
+		'robots',
+		's',
+		'search',
+		'second',
+		'sentence',
+		'showposts',
+		'static',
+		'subpost',
+		'subpost_id',
+		'tag',
+		'tag__and',
+		'tag__in',
+		'tag__not_in',
+		'tag_id',
+		'tag_slug__and',
+		'tag_slug__in',
+		'taxonomy',
+		'tb',
+		'term',
+		'type',
+		'w',
+		'withcomments',
+		'withoutcomments',
+		'year',
 	);
 
 	return in_array( $attribute_name, $reserved_terms );
 }
+
+/**
+ * Callback for array filter to get visible only.
+ *
+ * @since  3.0.0
+ * @param  WC_Product_Attribute $attribute
+ * @return bool
+ */
+function wc_attributes_array_filter_visible( $attribute ) {
+	return $attribute && is_a( $attribute, 'WC_Product_Attribute' ) && $attribute->get_visible() && ( ! $attribute->is_taxonomy() || taxonomy_exists( $attribute->get_name() ) );
+}
+
+/**
+ * Callback for array filter to get variation attributes only.
+ *
+ * @since  3.0.0
+ * @param  WC_Product_Attribute $attribute
+ * @return bool
+ */
+function wc_attributes_array_filter_variation( $attribute ) {
+	return $attribute && is_a( $attribute, 'WC_Product_Attribute' ) && $attribute->get_variation();
+}
+
+/**
+ * Check if an attribute is included in the attributes area of a variation name.
+ *
+ * @since  3.0.2
+ * @param  string $attribute Attribute value to check for
+ * @param  string $name      Product name to check in
+ * @return bool
+ */
+function wc_is_attribute_in_product_name( $attribute, $name ) {
+	$is_in_name = stristr( $name, ' ' . $attribute . ',' ) || 0 === stripos( strrev( $name ), strrev( ' ' . $attribute ) );
+	return apply_filters( 'woocommerce_is_attribute_in_product_name', $is_in_name, $attribute, $name );
+}
diff --git a/includes/wc-cart-functions.php b/includes/wc-cart-functions.php
index 6e2646e637b..2c3478cd034 100644
--- a/includes/wc-cart-functions.php
+++ b/includes/wc-cart-functions.php
@@ -57,35 +57,76 @@ function wc_load_persistent_cart( $user_login, $user ) {
 	}
 }
 
+/**
+ * Retrieves unvalidated referer from '_wp_http_referer' or HTTP referer.
+ *
+ * Do not use for redirects, use {@see wp_get_referer()} instead.
+ *
+ * @since 2.6.1
+ * @return string|false Referer URL on success, false on failure.
+ */
+function wc_get_raw_referer() {
+	if ( function_exists( 'wp_get_raw_referer' ) ) {
+		return wp_get_raw_referer();
+	}
+
+	if ( ! empty( $_REQUEST['_wp_http_referer'] ) ) {
+		return wp_unslash( $_REQUEST['_wp_http_referer'] );
+	} elseif ( ! empty( $_SERVER['HTTP_REFERER'] ) ) {
+		return wp_unslash( $_SERVER['HTTP_REFERER'] );
+	}
+
+	return false;
+}
+
 /**
  * Add to cart messages.
  *
- * @access public
- * @param int|array $product_id
+ * @param int|array $products
+ * @param bool $show_qty Should qty's be shown? Added in 2.6.0
+ * @param bool $return Return message rather than add it.
  */
-function wc_add_to_cart_message( $product_id ) {
+function wc_add_to_cart_message( $products, $show_qty = false, $return = false ) {
 	$titles = array();
+	$count  = 0;
 
-	if ( is_array( $product_id ) ) {
-		foreach ( $product_id as $id ) {
-			$titles[] = get_the_title( $id );
-		}
-	} else {
-		$titles[] = get_the_title( $product_id );
+	if ( ! is_array( $products ) ) {
+		$products = array( $products => 1 );
+		$show_qty = false;
+	}
+
+	if ( ! $show_qty ) {
+		$products = array_fill_keys( array_keys( $products ), 1 );
+	}
+
+	foreach ( $products as $product_id => $qty ) {
+		$titles[] = ( $qty > 1 ? absint( $qty ) . ' &times; ' : '' ) . sprintf( _x( '&ldquo;%s&rdquo;', 'Item name in quotes', 'woocommerce' ), strip_tags( get_the_title( $product_id ) ) );
+		$count += $qty;
 	}
 
 	$titles     = array_filter( $titles );
-	$added_text = sprintf( _n( '%s has been added to your cart.', '%s have been added to your cart.', sizeof( $titles ), 'woocommerce' ), wc_format_list_of_items( $titles ) );
+	$added_text = sprintf( _n( '%s has been added to your cart.', '%s have been added to your cart.', $count, 'woocommerce' ), wc_format_list_of_items( $titles ) );
 
 	// Output success messages
 	if ( 'yes' === get_option( 'woocommerce_cart_redirect_after_add' ) ) {
-		$return_to = apply_filters( 'woocommerce_continue_shopping_redirect', wp_get_referer() ? wp_get_referer() : home_url() );
-		$message   = sprintf( '<a href="%s" class="button wc-forward">%s</a> %s', esc_url( $return_to ), esc_html__( 'Continue Shopping', 'woocommerce' ), esc_html( $added_text ) );
+		$return_to = apply_filters( 'woocommerce_continue_shopping_redirect', wc_get_raw_referer() ? wp_validate_redirect( wc_get_raw_referer(), false ) : wc_get_page_permalink( 'shop' ) );
+		$message   = sprintf( '<a href="%s" class="button wc-forward">%s</a> %s', esc_url( $return_to ), esc_html__( 'Continue shopping', 'woocommerce' ), esc_html( $added_text ) );
 	} else {
-		$message   = sprintf( '<a href="%s" class="button wc-forward">%s</a> %s', esc_url( wc_get_page_permalink( 'cart' ) ), esc_html__( 'View Cart', 'woocommerce' ), esc_html( $added_text ) );
+		$message   = sprintf( '<a href="%s" class="button wc-forward">%s</a> %s', esc_url( wc_get_page_permalink( 'cart' ) ), esc_html__( 'View cart', 'woocommerce' ), esc_html( $added_text ) );
 	}
 
-	wc_add_notice( apply_filters( 'wc_add_to_cart_message', $message, $product_id ) );
+	if ( has_filter( 'wc_add_to_cart_message' ) ) {
+		wc_deprecated_function( 'The wc_add_to_cart_message filter', '3.0', 'wc_add_to_cart_message_html' );
+		$message = apply_filters( 'wc_add_to_cart_message', $message, $product_id );
+	}
+
+	$message = apply_filters( 'wc_add_to_cart_message_html', $message, $products );
+
+	if ( $return ) {
+		return $message;
+	} else {
+		wc_add_notice( $message );
+	}
 }
 
 /**
@@ -97,11 +138,11 @@ function wc_format_list_of_items( $items ) {
 	$item_string = '';
 
 	foreach ( $items as $key => $item ) {
-		$item_string .= sprintf( _x( '&ldquo;%s&rdquo;', 'Item name in quotes', 'woocommerce' ), $item );
+		$item_string .= $item;
 
-		if ( $key + 2 === sizeof( $items ) ) {
+		if ( sizeof( $items ) === $key + 2 ) {
 			$item_string .= ' ' . __( 'and', 'woocommerce' ) . ' ';
-		} elseif ( $key + 1 !== sizeof( $items ) ) {
+		} elseif ( sizeof( $items ) !== $key + 1 ) {
 			$item_string .= ', ';
 		}
 	}
@@ -125,7 +166,7 @@ function wc_clear_cart_after_payment() {
 		if ( $order_id > 0 ) {
 			$order = wc_get_order( $order_id );
 
-			if ( $order->order_key === $order_key ) {
+			if ( $order && $order->get_order_key() === $order_key ) {
 				WC()->cart->empty_cart();
 			}
 		}
@@ -134,7 +175,7 @@ function wc_clear_cart_after_payment() {
 	if ( WC()->session->order_awaiting_payment > 0 ) {
 		$order = wc_get_order( WC()->session->order_awaiting_payment );
 
-		if ( $order && $order->id > 0 ) {
+		if ( $order && $order->get_id() > 0 ) {
 			// If the order has not failed, or is not pending, the order must have gone through
 			if ( ! $order->has_status( array( 'failed', 'pending', 'cancelled' ) ) ) {
 				WC()->cart->empty_cart();
@@ -161,6 +202,7 @@ function wc_cart_totals_subtotal_html() {
  */
 function wc_cart_totals_shipping_html() {
 	$packages = WC()->shipping->get_packages();
+	$first    = true;
 
 	foreach ( $packages as $i => $package ) {
 		$chosen_method = isset( WC()->session->chosen_shipping_methods[ $i ] ) ? WC()->session->chosen_shipping_methods[ $i ] : '';
@@ -168,19 +210,25 @@ function wc_cart_totals_shipping_html() {
 
 		if ( sizeof( $packages ) > 1 ) {
 			foreach ( $package['contents'] as $item_id => $values ) {
-				$product_names[] = $values['data']->get_title() . ' &times;' . $values['quantity'];
+				$product_names[ $item_id ] = $values['data']->get_name() . ' &times;' . $values['quantity'];
 			}
+			$product_names = apply_filters( 'woocommerce_shipping_package_details_array', $product_names, $package );
 		}
 
 		wc_get_template( 'cart/cart-shipping.php', array(
-			'package'              => $package,
-			'available_methods'    => $package['rates'],
-			'show_package_details' => sizeof( $packages ) > 1,
-			'package_details'      => implode( ', ', $product_names ),
-			'package_name'         => apply_filters( 'woocommerce_shipping_package_name', sprintf( _n( 'Shipping', 'Shipping %d', ( $i + 1 ), 'woocommerce' ), ( $i + 1 ) ), $i, $package ),
-			'index'                => $i,
-			'chosen_method'        => $chosen_method
+			'package'                  => $package,
+			'available_methods'        => $package['rates'],
+			'show_package_details'     => sizeof( $packages ) > 1,
+			'show_shipping_calculator' => $first,
+			'package_details'          => implode( ', ', $product_names ),
+			// @codingStandardsIgnoreStart
+			'package_name'             => apply_filters( 'woocommerce_shipping_package_name', sprintf( _nx( 'Shipping', 'Shipping %d', ( $i + 1 ), 'shipping packages', 'woocommerce' ), ( $i + 1 ) ), $i, $package ),
+			// @codingStandardsIgnoreEnd
+			'index'                    => $i,
+			'chosen_method'            => $chosen_method,
 		) );
+
+		$first = false;
 	}
 }
 
@@ -198,18 +246,25 @@ function wc_cart_totals_taxes_total_html() {
  *
  * @access public
  * @param string $coupon
+ * @param bool $echo or return
  */
-function wc_cart_totals_coupon_label( $coupon ) {
-	if ( is_string( $coupon ) )
+function wc_cart_totals_coupon_label( $coupon, $echo = true ) {
+	if ( is_string( $coupon ) ) {
 		$coupon = new WC_Coupon( $coupon );
+	}
 
-	echo apply_filters( 'woocommerce_cart_totals_coupon_label', esc_html( __( 'Coupon:', 'woocommerce' ) . ' ' . $coupon->code ), $coupon );
+	$label = apply_filters( 'woocommerce_cart_totals_coupon_label', sprintf( esc_html__( 'Coupon: %s', 'woocommerce' ), $coupon->get_code() ), $coupon );
+
+	if ( $echo ) {
+		echo $label;
+	} else {
+		return $label;
+	}
 }
 
 /**
- * Get a coupon value.
+ * Get coupon display HTML.
  *
- * @access public
  * @param string $coupon
  */
 function wc_cart_totals_coupon_html( $coupon ) {
@@ -217,25 +272,18 @@ function wc_cart_totals_coupon_html( $coupon ) {
 		$coupon = new WC_Coupon( $coupon );
 	}
 
-	$value  = array();
+	$discount_amount_html = '';
 
-	if ( $amount = WC()->cart->get_coupon_discount_amount( $coupon->code, WC()->cart->display_cart_ex_tax ) ) {
-		$discount_html = '-' . wc_price( $amount );
-	} else {
-		$discount_html = '';
+	if ( $amount = WC()->cart->get_coupon_discount_amount( $coupon->get_code(), WC()->cart->display_cart_ex_tax ) ) {
+		$discount_amount_html = '-' . wc_price( $amount );
+	} elseif ( $coupon->get_free_shipping() ) {
+		$discount_amount_html = __( 'Free shipping coupon', 'woocommerce' );
 	}
 
-	$value[] = apply_filters( 'woocommerce_coupon_discount_amount_html', $discount_html, $coupon );
+	$discount_amount_html = apply_filters( 'woocommerce_coupon_discount_amount_html', $discount_amount_html, $coupon );
+	$coupon_html          = $discount_amount_html . ' <a href="' . esc_url( add_query_arg( 'remove_coupon', urlencode( $coupon->get_code() ), defined( 'WOOCOMMERCE_CHECKOUT' ) ? wc_get_checkout_url() : wc_get_cart_url() ) ) . '" class="woocommerce-remove-coupon" data-coupon="' . esc_attr( $coupon->get_code() ) . '">' . __( '[Remove]', 'woocommerce' ) . '</a>';
 
-	if ( $coupon->enable_free_shipping() ) {
-		$value[] = __( 'Free shipping coupon', 'woocommerce' );
-	}
-
-	// get rid of empty array elements
-	$value = array_filter( $value );
-	$value = implode( ', ', $value ) . ' <a href="' . esc_url( add_query_arg( 'remove_coupon', urlencode( $coupon->code ), defined( 'WOOCOMMERCE_CHECKOUT' ) ? wc_get_checkout_url() : wc_get_cart_url() ) ) . '" class="woocommerce-remove-coupon" data-coupon="' . esc_attr( $coupon->code ) . '">' . __( '[Remove]', 'woocommerce' ) . '</a>';
-
-	echo apply_filters( 'woocommerce_cart_totals_coupon_html', $value, $coupon );
+	echo wp_kses( apply_filters( 'woocommerce_cart_totals_coupon_html', $coupon_html, $coupon, $discount_amount_html ), array_replace_recursive( wp_kses_allowed_html( 'post' ), array( 'a' => array( 'data-coupon' => true ) ) ) );
 }
 
 /**
@@ -251,17 +299,19 @@ function wc_cart_totals_order_total_html() {
 		$tax_string_array = array();
 
 		if ( get_option( 'woocommerce_tax_total_display' ) == 'itemized' ) {
-			foreach ( WC()->cart->get_tax_totals() as $code => $tax )
+			foreach ( WC()->cart->get_tax_totals() as $code => $tax ) {
 				$tax_string_array[] = sprintf( '%s %s', $tax->formatted_amount, $tax->label );
+			}
 		} else {
 			$tax_string_array[] = sprintf( '%s %s', wc_price( WC()->cart->get_taxes_total( true, true ) ), WC()->countries->tax_or_vat() );
 		}
 
 		if ( ! empty( $tax_string_array ) ) {
-			$estimated_text = WC()->customer->is_customer_outside_base() && ! WC()->customer->has_calculated_shipping()
-				? sprintf( ' ' . __( 'estimated for %s', 'woocommerce' ), WC()->countries->estimated_for_prefix() . __( WC()->countries->countries[ WC()->countries->get_base_country() ], 'woocommerce' ) )
+			$taxable_address = WC()->customer->get_taxable_address();
+			$estimated_text  = WC()->customer->is_customer_outside_base() && ! WC()->customer->has_calculated_shipping()
+				? sprintf( ' ' . __( 'estimated for %s', 'woocommerce' ), WC()->countries->estimated_for_prefix( $taxable_address[0] ) . WC()->countries->countries[ $taxable_address[0] ] )
 				: '';
-			$value .= '<small class="includes_tax">' . sprintf( __( '(includes %s%s)', 'woocommerce' ), implode( ', ', $tax_string_array ), $estimated_text ) . '</small>';
+			$value .= '<small class="includes_tax">' . sprintf( __( '(includes %s)', 'woocommerce' ), implode( ', ', $tax_string_array ) . $estimated_text ) . '</small>';
 		}
 	}
 
@@ -299,8 +349,6 @@ function wc_cart_totals_shipping_method_label( $method ) {
 				$label .= ' <small class="tax_label">' . WC()->countries->inc_tax_or_vat() . '</small>';
 			}
 		}
-	} elseif ( $method->id !== 'free_shipping' ) {
-		$label .= ' (' . __( 'Free', 'woocommerce' ) . ')';
 	}
 
 	return apply_filters( 'woocommerce_cart_shipping_method_full_label', $label, $method );
@@ -322,31 +370,16 @@ function wc_cart_round_discount( $value, $precision ) {
 }
 
 /**
- * Gets the url to the cart page.
- *
- * @since  2.5.0
- *
- * @return string Url to cart page
+ * Gets chosen shipping method IDs from chosen_shipping_methods session, without instance IDs.
+ * @since  2.6.2
+ * @return string[]
  */
-function wc_get_cart_url() {
-	return apply_filters( 'woocommerce_get_cart_url', wc_get_page_permalink( 'cart' ) );
-}
-
-/**
- * Gets the url to the checkout page.
- *
- * @since  2.5.0
- *
- * @return string Url to checkout page
- */
-function wc_get_checkout_url() {
-	$checkout_url = wc_get_page_permalink( 'checkout' );
-	if ( $checkout_url ) {
-		// Force SSL if needed
-		if ( is_ssl() || 'yes' === get_option( 'woocommerce_force_ssl_checkout' ) ) {
-			$checkout_url = str_replace( 'http:', 'https:', $checkout_url );
-		}
+function wc_get_chosen_shipping_method_ids() {
+	$method_ids     = array();
+	$chosen_methods = WC()->session->get( 'chosen_shipping_methods', array() );
+	foreach ( $chosen_methods as $chosen_method ) {
+		$chosen_method = explode( ':', $chosen_method );
+		$method_ids[]  = current( $chosen_method );
 	}
-
-	return apply_filters( 'woocommerce_get_checkout_url', $checkout_url );
+	return $method_ids;
 }
diff --git a/includes/wc-conditional-functions.php b/includes/wc-conditional-functions.php
index ed62a6ca496..682c0aa0252 100644
--- a/includes/wc-conditional-functions.php
+++ b/includes/wc-conditional-functions.php
@@ -86,7 +86,7 @@ if ( ! function_exists( 'is_cart' ) ) {
 	 * @return bool
 	 */
 	function is_cart() {
-		return is_page( wc_get_page_id( 'cart' ) ) || defined( 'WOOCOMMERCE_CART' );
+		return is_page( wc_get_page_id( 'cart' ) ) || defined( 'WOOCOMMERCE_CART' ) || wc_post_content_has_shortcode( 'woocommerce_cart' );
 	}
 }
 
@@ -97,7 +97,7 @@ if ( ! function_exists( 'is_checkout' ) ) {
 	 * @return bool
 	 */
 	function is_checkout() {
-		return is_page( wc_get_page_id( 'checkout' ) ) || apply_filters( 'woocommerce_is_checkout', false );
+		return is_page( wc_get_page_id( 'checkout' ) ) || wc_post_content_has_shortcode( 'woocommerce_checkout' ) || apply_filters( 'woocommerce_is_checkout', false );
 	}
 }
 
@@ -126,7 +126,7 @@ if ( ! function_exists( 'is_wc_endpoint_url' ) ) {
 
 		$wc_endpoints = WC()->query->get_query_vars();
 
-		if ( $endpoint !== false ) {
+		if ( false !== $endpoint ) {
 			if ( ! isset( $wc_endpoints[ $endpoint ] ) ) {
 				return false;
 			} else {
@@ -153,16 +153,16 @@ if ( ! function_exists( 'is_account_page' ) ) {
 	 * @return bool
 	 */
 	function is_account_page() {
-		return is_page( wc_get_page_id( 'myaccount' ) ) || apply_filters( 'woocommerce_is_account_page', false );
+		return is_page( wc_get_page_id( 'myaccount' ) ) || wc_post_content_has_shortcode( 'woocommerce_my_account' ) || apply_filters( 'woocommerce_is_account_page', false );
 	}
 }
 
 if ( ! function_exists( 'is_view_order_page' ) ) {
 
 	/**
-	* is_view_order_page - Returns true when on the view order page.
-	* @return bool
-	*/
+	 * is_view_order_page - Returns true when on the view order page.
+	 * @return bool
+	 */
 	function is_view_order_page() {
 		global $wp;
 
@@ -170,25 +170,41 @@ if ( ! function_exists( 'is_view_order_page' ) ) {
 	}
 }
 
+if ( ! function_exists( 'is_edit_account_page' ) ) {
+
+	/**
+	 * Check for edit account page.
+	 * Returns true when viewing the edit account page.
+	 *
+	 * @since 2.5.1
+	 * @return bool
+	 */
+	function is_edit_account_page() {
+		global $wp;
+
+		return ( is_page( wc_get_page_id( 'myaccount' ) ) && isset( $wp->query_vars['edit-account'] ) );
+	}
+}
+
 if ( ! function_exists( 'is_order_received_page' ) ) {
 
 	/**
-	* is_order_received_page - Returns true when viewing the order received page.
-	* @return bool
-	*/
+	 * is_order_received_page - Returns true when viewing the order received page.
+	 * @return bool
+	 */
 	function is_order_received_page() {
 		global $wp;
 
-		return ( is_page( wc_get_page_id( 'checkout' ) ) && isset( $wp->query_vars['order-received'] ) );
+		return apply_filters( 'woocommerce_is_order_received_page', ( is_page( wc_get_page_id( 'checkout' ) ) && isset( $wp->query_vars['order-received'] ) ) );
 	}
 }
 
 if ( ! function_exists( 'is_add_payment_method_page' ) ) {
 
 	/**
-	* is_add_payment_method_page - Returns true when viewing the add payment method page.
-	* @return bool
-	*/
+	 * is_add_payment_method_page - Returns true when viewing the add payment method page.
+	 * @return bool
+	 */
 	function is_add_payment_method_page() {
 		global $wp;
 
@@ -199,9 +215,9 @@ if ( ! function_exists( 'is_add_payment_method_page' ) ) {
 if ( ! function_exists( 'is_lost_password_page' ) ) {
 
 	/**
-	* is_lost_password_page - Returns true when viewing the lost password page.
-	* @return bool
-	*/
+	 * is_lost_password_page - Returns true when viewing the lost password page.
+	 * @return bool
+	 */
 	function is_lost_password_page() {
 		global $wp;
 
@@ -238,9 +254,7 @@ if ( ! function_exists( 'is_filtered' ) ) {
 	 * @return bool
 	 */
 	function is_filtered() {
-		global $_chosen_attributes;
-
-		return apply_filters( 'woocommerce_is_filtered', ( sizeof( $_chosen_attributes ) > 0 || isset( $_GET['max_price'] ) || isset( $_GET['min_price'] ) ) );
+		return apply_filters( 'woocommerce_is_filtered', ( sizeof( WC_Query::get_layered_nav_chosen_attributes() ) > 0 || isset( $_GET['max_price'] ) || isset( $_GET['min_price'] ) || isset( $_GET['rating_filter'] ) ) );
 	}
 }
 
@@ -292,6 +306,17 @@ if ( ! function_exists( 'wc_tax_enabled' ) ) {
 	}
 }
 
+if ( ! function_exists( 'wc_shipping_enabled' ) ) {
+
+	/**
+	 * Is shipping enabled?
+	 * @return bool
+	 */
+	function wc_shipping_enabled() {
+		return apply_filters( 'wc_shipping_enabled', get_option( 'woocommerce_ship_to_countries' ) !== 'disabled' );
+	}
+}
+
 if ( ! function_exists( 'wc_prices_include_tax' ) ) {
 
 	/**
@@ -326,7 +351,7 @@ function wc_is_webhook_valid_topic( $topic ) {
 	}
 
 	$valid_resources = apply_filters( 'woocommerce_valid_webhook_resources', array( 'coupon', 'customer', 'order', 'product' ) );
-	$valid_events    = apply_filters( 'woocommerce_valid_webhook_events', array( 'created', 'updated', 'deleted' ) );
+	$valid_events    = apply_filters( 'woocommerce_valid_webhook_events', array( 'created', 'updated', 'deleted', 'restored' ) );
 
 	if ( in_array( $resource, $valid_resources ) && in_array( $event, $valid_events ) ) {
 		return true;
@@ -335,7 +360,6 @@ function wc_is_webhook_valid_topic( $topic ) {
 	return false;
 }
 
-
 /**
  * Simple check for validating a URL, it must start with http:// or https://.
  * and pass FILTER_VALIDATE_URL validation.
@@ -357,13 +381,34 @@ function wc_is_valid_url( $url ) {
 	return true;
 }
 
+/**
+ * Check if the home URL is https. If it is, we don't need to do things such as 'force ssl'.
+ *
+ * @since  2.4.13
+ * @return bool
+ */
+function wc_site_is_https() {
+	return false !== strstr( get_option( 'home' ), 'https:' );
+}
+
 /**
  * Check if the checkout is configured for https. Look at options, WP HTTPS plugin, or the permalink itself.
  *
  * @since  2.5.0
- *
  * @return bool
  */
 function wc_checkout_is_https() {
-	return 'yes' === get_option( 'woocommerce_force_ssl_checkout' ) || class_exists( 'WordPressHTTPS' ) || strstr( wc_get_page_permalink( 'checkout' ), 'https:' );
+	return wc_site_is_https() || 'yes' === get_option( 'woocommerce_force_ssl_checkout' ) || class_exists( 'WordPressHTTPS' ) || strstr( wc_get_page_permalink( 'checkout' ), 'https:' );
+}
+
+/**
+ * Checks whether the content passed contains a specific short code.
+ *
+ * @param  string $tag Shortcode tag to check.
+ * @return bool
+ */
+function wc_post_content_has_shortcode( $tag = '' ) {
+	global $post;
+
+	return is_singular() && is_a( $post, 'WP_Post' ) && has_shortcode( $post->post_content, $tag );
 }
diff --git a/includes/wc-core-functions.php b/includes/wc-core-functions.php
index 598f1bbf53e..cb3c1b8e605 100644
--- a/includes/wc-core-functions.php
+++ b/includes/wc-core-functions.php
@@ -21,10 +21,16 @@ include( 'wc-user-functions.php' );
 include( 'wc-deprecated-functions.php' );
 include( 'wc-formatting-functions.php' );
 include( 'wc-order-functions.php' );
+include( 'wc-order-item-functions.php' );
 include( 'wc-page-functions.php' );
 include( 'wc-product-functions.php' );
+include( 'wc-stock-functions.php' );
+include( 'wc-account-functions.php' );
 include( 'wc-term-functions.php' );
 include( 'wc-attribute-functions.php' );
+include( 'wc-rest-functions.php' );
+include( 'wc-widget-functions.php' );
+include( 'wc-webhook-functions.php' );
 
 /**
  * Filters on data used in admin and frontend.
@@ -45,79 +51,81 @@ add_filter( 'woocommerce_short_description', 'wpautop' );
 add_filter( 'woocommerce_short_description', 'shortcode_unautop' );
 add_filter( 'woocommerce_short_description', 'prepend_attachment' );
 add_filter( 'woocommerce_short_description', 'do_shortcode', 11 ); // AFTER wpautop()
+add_filter( 'woocommerce_short_description', 'wc_format_product_short_description', 9999999 );
+add_filter( 'woocommerce_short_description', 'wc_do_oembeds' );
+
+/**
+ * Define a constant if it is not already defined.
+ *
+ * @since  3.0.0
+ * @param  string $name
+ * @param  string $value
+ */
+function wc_maybe_define_constant( $name, $value ) {
+	if ( ! defined( $name ) ) {
+		define( $name, $value );
+	}
+}
 
 /**
  * Create a new order programmatically.
  *
  * Returns a new order object on success which can then be used to add additional data.
  *
- * @return WC_Order on success, WP_Error on failure.
+ * @param  array $args
+ * @return WC_Order|WP_Error
  */
 function wc_create_order( $args = array() ) {
 	$default_args = array(
-		'status'        => '',
+		'status'        => null,
 		'customer_id'   => null,
 		'customer_note' => null,
+		'parent'        => null,
+		'created_via'   => null,
+		'cart_hash'     => null,
 		'order_id'      => 0,
-		'created_via'   => '',
-		'parent'        => 0
 	);
 
-	$args       = wp_parse_args( $args, $default_args );
-	$order_data = array();
+	try {
+		$args  = wp_parse_args( $args, $default_args );
+		$order = new WC_Order( $args['order_id'] );
 
-	if ( $args['order_id'] > 0 ) {
-		$updating         = true;
-		$order_data['ID'] = $args['order_id'];
-	} else {
-		$updating                    = false;
-		$order_data['post_type']     = 'shop_order';
-		$order_data['post_status']   = 'wc-' . apply_filters( 'woocommerce_default_order_status', 'pending' );
-		$order_data['ping_status']   = 'closed';
-		$order_data['post_author']   = 1;
-		$order_data['post_password'] = uniqid( 'order_' );
-		$order_data['post_title']    = sprintf( __( 'Order &ndash; %s', 'woocommerce' ), strftime( _x( '%b %d, %Y @ %I:%M %p', 'Order date parsed by strftime', 'woocommerce' ) ) );
-		$order_data['post_parent']   = absint( $args['parent'] );
-	}
-
-	if ( $args['status'] ) {
-		if ( ! in_array( 'wc-' . $args['status'], array_keys( wc_get_order_statuses() ) ) ) {
-			return new WP_Error( 'woocommerce_invalid_order_status', __( 'Invalid order status', 'woocommerce' ) );
+		// Update props that were set (not null)
+		if ( ! is_null( $args['parent'] ) ) {
+			$order->set_parent_id( absint( $args['parent'] ) );
 		}
-		$order_data['post_status']  = 'wc-' . $args['status'];
+
+		if ( ! is_null( $args['status'] ) ) {
+			$order->set_status( $args['status'] );
+		}
+
+		if ( ! is_null( $args['customer_note'] ) ) {
+			$order->set_customer_note( $args['customer_note'] );
+		}
+
+		if ( ! is_null( $args['customer_id'] ) ) {
+			$order->set_customer_id( is_numeric( $args['customer_id'] ) ? absint( $args['customer_id'] ) : 0 );
+		}
+
+		if ( ! is_null( $args['created_via'] ) ) {
+			$order->set_created_via( sanitize_text_field( $args['created_via'] ) );
+		}
+
+		if ( ! is_null( $args['cart_hash'] ) ) {
+			$order->set_cart_hash( sanitize_text_field( $args['cart_hash'] ) );
+		}
+
+		// Update other order props set automatically
+		$order->set_currency( get_woocommerce_currency() );
+		$order->set_prices_include_tax( 'yes' === get_option( 'woocommerce_prices_include_tax' ) );
+		$order->set_customer_ip_address( WC_Geolocation::get_ip_address() );
+		$order->set_customer_user_agent( wc_get_user_agent() );
+		$order->save();
+	} catch ( Exception $e ) {
+		return new WP_Error( 'error', $e->getMessage() );
 	}
 
-	if ( ! is_null( $args['customer_note'] ) ) {
-		$order_data['post_excerpt'] = $args['customer_note'];
-	}
-
-	if ( $updating ) {
-		$order_id = wp_update_post( $order_data );
-	} else {
-		$order_id = wp_insert_post( apply_filters( 'woocommerce_new_order_data', $order_data ), true );
-	}
-
-	if ( is_wp_error( $order_id ) ) {
-		return $order_id;
-	}
-
-	if ( ! $updating ) {
-		update_post_meta( $order_id, '_order_key', 'wc_' . apply_filters( 'woocommerce_generate_order_key', uniqid( 'order_' ) ) );
-		update_post_meta( $order_id, '_order_currency', get_woocommerce_currency() );
-		update_post_meta( $order_id, '_prices_include_tax', get_option( 'woocommerce_prices_include_tax' ) );
-		update_post_meta( $order_id, '_customer_ip_address', WC_Geolocation::get_ip_address() );
-		update_post_meta( $order_id, '_customer_user_agent', isset( $_SERVER['HTTP_USER_AGENT'] ) ? $_SERVER['HTTP_USER_AGENT'] : '' );
-		update_post_meta( $order_id, '_customer_user', 0 );
-		update_post_meta( $order_id, '_created_via', sanitize_text_field( $args['created_via'] ) );
-	}
-
-	if ( is_numeric( $args['customer_id'] ) ) {
-		update_post_meta( $order_id, '_customer_user', $args['customer_id'] );
-	}
-
-	update_post_meta( $order_id, '_order_version', WC_VERSION );
-
-	return wc_get_order( $order_id );
+	return $order;
 }
 
 /**
@@ -128,7 +136,7 @@ function wc_create_order( $args = array() ) {
  */
 function wc_update_order( $args ) {
 	if ( ! $args['order_id'] ) {
-		return new WP_Error( __( 'Invalid order ID', 'woocommerce' ) );
+		return new WP_Error( __( 'Invalid order ID.', 'woocommerce' ) );
 	}
 	return wc_create_order( $args );
 }
@@ -178,14 +186,14 @@ function wc_get_template_part( $slug, $name = '' ) {
  * @param string $default_path (default: '')
  */
 function wc_get_template( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
-	if ( $args && is_array( $args ) ) {
+	if ( ! empty( $args ) && is_array( $args ) ) {
 		extract( $args );
 	}
 
 	$located = wc_locate_template( $template_name, $template_path, $default_path );
 
 	if ( ! file_exists( $located ) ) {
-		_doing_it_wrong( __FUNCTION__, sprintf( '<code>%s</code> does not exist.', $located ), '2.1' );
+		wc_doing_it_wrong( __FUNCTION__, sprintf( __( '%s does not exist.', 'woocommerce' ), '<code>' . $located . '</code>' ), '2.1' );
 		return;
 	}
 
@@ -203,6 +211,7 @@ function wc_get_template( $template_name, $args = array(), $template_path = '',
  * Like wc_get_template, but returns the HTML instead of outputting.
  * @see wc_get_template
  * @since 2.5.0
+ * @param string $template_name
  */
 function wc_get_template_html( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
 	ob_start();
@@ -238,7 +247,7 @@ function wc_locate_template( $template_name, $template_path = '', $default_path
 	$template = locate_template(
 		array(
 			trailingslashit( $template_path ) . $template_name,
-			$template_name
+			$template_name,
 		)
 	);
 
@@ -257,7 +266,7 @@ function wc_locate_template( $template_name, $template_path = '', $default_path
  * @return string
  */
 function get_woocommerce_currency() {
-	return apply_filters( 'woocommerce_currency', get_option('woocommerce_currency') );
+	return apply_filters( 'woocommerce_currency', get_option( 'woocommerce_currency' ) );
 }
 
 /**
@@ -269,55 +278,167 @@ function get_woocommerce_currencies() {
 	return array_unique(
 		apply_filters( 'woocommerce_currencies',
 			array(
-				'AED' => __( 'United Arab Emirates Dirham', 'woocommerce' ),
-				'ARS' => __( 'Argentine Peso', 'woocommerce' ),
-				'AUD' => __( 'Australian Dollars', 'woocommerce' ),
-				'BDT' => __( 'Bangladeshi Taka', 'woocommerce' ),
-				'BGN' => __( 'Bulgarian Lev', 'woocommerce' ),
-				'BRL' => __( 'Brazilian Real', 'woocommerce' ),
-				'CAD' => __( 'Canadian Dollars', 'woocommerce' ),
-				'CHF' => __( 'Swiss Franc', 'woocommerce' ),
-				'CLP' => __( 'Chilean Peso', 'woocommerce' ),
-				'CNY' => __( 'Chinese Yuan', 'woocommerce' ),
-				'COP' => __( 'Colombian Peso', 'woocommerce' ),
-				'CZK' => __( 'Czech Koruna', 'woocommerce' ),
-				'DKK' => __( 'Danish Krone', 'woocommerce' ),
-				'DOP' => __( 'Dominican Peso', 'woocommerce' ),
-				'EGP' => __( 'Egyptian Pound', 'woocommerce' ),
-				'EUR' => __( 'Euros', 'woocommerce' ),
-				'GBP' => __( 'Pounds Sterling', 'woocommerce' ),
-				'HKD' => __( 'Hong Kong Dollar', 'woocommerce' ),
-				'HRK' => __( 'Croatia kuna', 'woocommerce' ),
-				'HUF' => __( 'Hungarian Forint', 'woocommerce' ),
-				'IDR' => __( 'Indonesia Rupiah', 'woocommerce' ),
-				'ILS' => __( 'Israeli Shekel', 'woocommerce' ),
-				'INR' => __( 'Indian Rupee', 'woocommerce' ),
-				'ISK' => __( 'Icelandic krona', 'woocommerce' ),
-				'JPY' => __( 'Japanese Yen', 'woocommerce' ),
+				'AED' => __( 'United Arab Emirates dirham', 'woocommerce' ),
+				'AFN' => __( 'Afghan afghani', 'woocommerce' ),
+				'ALL' => __( 'Albanian lek', 'woocommerce' ),
+				'AMD' => __( 'Armenian dram', 'woocommerce' ),
+				'ANG' => __( 'Netherlands Antillean guilder', 'woocommerce' ),
+				'AOA' => __( 'Angolan kwanza', 'woocommerce' ),
+				'ARS' => __( 'Argentine peso', 'woocommerce' ),
+				'AUD' => __( 'Australian dollar', 'woocommerce' ),
+				'AWG' => __( 'Aruban florin', 'woocommerce' ),
+				'AZN' => __( 'Azerbaijani manat', 'woocommerce' ),
+				'BAM' => __( 'Bosnia and Herzegovina convertible mark', 'woocommerce' ),
+				'BBD' => __( 'Barbadian dollar', 'woocommerce' ),
+				'BDT' => __( 'Bangladeshi taka', 'woocommerce' ),
+				'BGN' => __( 'Bulgarian lev', 'woocommerce' ),
+				'BHD' => __( 'Bahraini dinar', 'woocommerce' ),
+				'BIF' => __( 'Burundian franc', 'woocommerce' ),
+				'BMD' => __( 'Bermudian dollar', 'woocommerce' ),
+				'BND' => __( 'Brunei dollar', 'woocommerce' ),
+				'BOB' => __( 'Bolivian boliviano', 'woocommerce' ),
+				'BRL' => __( 'Brazilian real', 'woocommerce' ),
+				'BSD' => __( 'Bahamian dollar', 'woocommerce' ),
+				'BTC' => __( 'Bitcoin', 'woocommerce' ),
+				'BTN' => __( 'Bhutanese ngultrum', 'woocommerce' ),
+				'BWP' => __( 'Botswana pula', 'woocommerce' ),
+				'BYR' => __( 'Belarusian ruble', 'woocommerce' ),
+				'BZD' => __( 'Belize dollar', 'woocommerce' ),
+				'CAD' => __( 'Canadian dollar', 'woocommerce' ),
+				'CDF' => __( 'Congolese franc', 'woocommerce' ),
+				'CHF' => __( 'Swiss franc', 'woocommerce' ),
+				'CLP' => __( 'Chilean peso', 'woocommerce' ),
+				'CNY' => __( 'Chinese yuan', 'woocommerce' ),
+				'COP' => __( 'Colombian peso', 'woocommerce' ),
+				'CRC' => __( 'Costa Rican col&oacute;n', 'woocommerce' ),
+				'CUC' => __( 'Cuban convertible peso', 'woocommerce' ),
+				'CUP' => __( 'Cuban peso', 'woocommerce' ),
+				'CVE' => __( 'Cape Verdean escudo', 'woocommerce' ),
+				'CZK' => __( 'Czech koruna', 'woocommerce' ),
+				'DJF' => __( 'Djiboutian franc', 'woocommerce' ),
+				'DKK' => __( 'Danish krone', 'woocommerce' ),
+				'DOP' => __( 'Dominican peso', 'woocommerce' ),
+				'DZD' => __( 'Algerian dinar', 'woocommerce' ),
+				'EGP' => __( 'Egyptian pound', 'woocommerce' ),
+				'ERN' => __( 'Eritrean nakfa', 'woocommerce' ),
+				'ETB' => __( 'Ethiopian birr', 'woocommerce' ),
+				'EUR' => __( 'Euro', 'woocommerce' ),
+				'FJD' => __( 'Fijian dollar', 'woocommerce' ),
+				'FKP' => __( 'Falkland Islands pound', 'woocommerce' ),
+				'GBP' => __( 'Pound sterling', 'woocommerce' ),
+				'GEL' => __( 'Georgian lari', 'woocommerce' ),
+				'GGP' => __( 'Guernsey pound', 'woocommerce' ),
+				'GHS' => __( 'Ghana cedi', 'woocommerce' ),
+				'GIP' => __( 'Gibraltar pound', 'woocommerce' ),
+				'GMD' => __( 'Gambian dalasi', 'woocommerce' ),
+				'GNF' => __( 'Guinean franc', 'woocommerce' ),
+				'GTQ' => __( 'Guatemalan quetzal', 'woocommerce' ),
+				'GYD' => __( 'Guyanese dollar', 'woocommerce' ),
+				'HKD' => __( 'Hong Kong dollar', 'woocommerce' ),
+				'HNL' => __( 'Honduran lempira', 'woocommerce' ),
+				'HRK' => __( 'Croatian kuna', 'woocommerce' ),
+				'HTG' => __( 'Haitian gourde', 'woocommerce' ),
+				'HUF' => __( 'Hungarian forint', 'woocommerce' ),
+				'IDR' => __( 'Indonesian rupiah', 'woocommerce' ),
+				'ILS' => __( 'Israeli new shekel', 'woocommerce' ),
+				'IMP' => __( 'Manx pound', 'woocommerce' ),
+				'INR' => __( 'Indian rupee', 'woocommerce' ),
+				'IQD' => __( 'Iraqi dinar', 'woocommerce' ),
+				'IRR' => __( 'Iranian rial', 'woocommerce' ),
+				'IRT' => __( 'Iranian toman', 'woocommerce' ),
+				'ISK' => __( 'Icelandic kr&oacute;na', 'woocommerce' ),
+				'JEP' => __( 'Jersey pound', 'woocommerce' ),
+				'JMD' => __( 'Jamaican dollar', 'woocommerce' ),
+				'JOD' => __( 'Jordanian dinar', 'woocommerce' ),
+				'JPY' => __( 'Japanese yen', 'woocommerce' ),
 				'KES' => __( 'Kenyan shilling', 'woocommerce' ),
-				'LAK' => __( 'Lao Kip', 'woocommerce' ),
-				'KRW' => __( 'South Korean Won', 'woocommerce' ),
-				'MXN' => __( 'Mexican Peso', 'woocommerce' ),
-				'MYR' => __( 'Malaysian Ringgits', 'woocommerce' ),
-				'NGN' => __( 'Nigerian Naira', 'woocommerce' ),
-				'NOK' => __( 'Norwegian Krone', 'woocommerce' ),
-				'NPR' => __( 'Nepali Rupee', 'woocommerce' ),
-				'NZD' => __( 'New Zealand Dollar', 'woocommerce' ),
-				'PHP' => __( 'Philippine Pesos', 'woocommerce' ),
-				'PKR' => __( 'Pakistani Rupee', 'woocommerce' ),
-				'PLN' => __( 'Polish Zloty', 'woocommerce' ),
-				'PYG' => __( 'Paraguayan Guaraní', 'woocommerce' ),
-				'RON' => __( 'Romanian Leu', 'woocommerce' ),
-				'RUB' => __( 'Russian Ruble', 'woocommerce' ),
-				'SEK' => __( 'Swedish Krona', 'woocommerce' ),
-				'SGD' => __( 'Singapore Dollar', 'woocommerce' ),
-				'THB' => __( 'Thai Baht', 'woocommerce' ),
-				'TRY' => __( 'Turkish Lira', 'woocommerce' ),
-				'TWD' => __( 'Taiwan New Dollars', 'woocommerce' ),
-				'UAH' => __( 'Ukrainian Hryvnia', 'woocommerce' ),
-				'USD' => __( 'US Dollars', 'woocommerce' ),
-				'VND' => __( 'Vietnamese Dong', 'woocommerce' ),
+				'KGS' => __( 'Kyrgyzstani som', 'woocommerce' ),
+				'KHR' => __( 'Cambodian riel', 'woocommerce' ),
+				'KMF' => __( 'Comorian franc', 'woocommerce' ),
+				'KPW' => __( 'North Korean won', 'woocommerce' ),
+				'KRW' => __( 'South Korean won', 'woocommerce' ),
+				'KWD' => __( 'Kuwaiti dinar', 'woocommerce' ),
+				'KYD' => __( 'Cayman Islands dollar', 'woocommerce' ),
+				'KZT' => __( 'Kazakhstani tenge', 'woocommerce' ),
+				'LAK' => __( 'Lao kip', 'woocommerce' ),
+				'LBP' => __( 'Lebanese pound', 'woocommerce' ),
+				'LKR' => __( 'Sri Lankan rupee', 'woocommerce' ),
+				'LRD' => __( 'Liberian dollar', 'woocommerce' ),
+				'LSL' => __( 'Lesotho loti', 'woocommerce' ),
+				'LYD' => __( 'Libyan dinar', 'woocommerce' ),
+				'MAD' => __( 'Moroccan dirham', 'woocommerce' ),
+				'MDL' => __( 'Moldovan leu', 'woocommerce' ),
+				'MGA' => __( 'Malagasy ariary', 'woocommerce' ),
+				'MKD' => __( 'Macedonian denar', 'woocommerce' ),
+				'MMK' => __( 'Burmese kyat', 'woocommerce' ),
+				'MNT' => __( 'Mongolian t&ouml;gr&ouml;g', 'woocommerce' ),
+				'MOP' => __( 'Macanese pataca', 'woocommerce' ),
+				'MRO' => __( 'Mauritanian ouguiya', 'woocommerce' ),
+				'MUR' => __( 'Mauritian rupee', 'woocommerce' ),
+				'MVR' => __( 'Maldivian rufiyaa', 'woocommerce' ),
+				'MWK' => __( 'Malawian kwacha', 'woocommerce' ),
+				'MXN' => __( 'Mexican peso', 'woocommerce' ),
+				'MYR' => __( 'Malaysian ringgit', 'woocommerce' ),
+				'MZN' => __( 'Mozambican metical', 'woocommerce' ),
+				'NAD' => __( 'Namibian dollar', 'woocommerce' ),
+				'NGN' => __( 'Nigerian naira', 'woocommerce' ),
+				'NIO' => __( 'Nicaraguan c&oacute;rdoba', 'woocommerce' ),
+				'NOK' => __( 'Norwegian krone', 'woocommerce' ),
+				'NPR' => __( 'Nepalese rupee', 'woocommerce' ),
+				'NZD' => __( 'New Zealand dollar', 'woocommerce' ),
+				'OMR' => __( 'Omani rial', 'woocommerce' ),
+				'PAB' => __( 'Panamanian balboa', 'woocommerce' ),
+				'PEN' => __( 'Peruvian nuevo sol', 'woocommerce' ),
+				'PGK' => __( 'Papua New Guinean kina', 'woocommerce' ),
+				'PHP' => __( 'Philippine peso', 'woocommerce' ),
+				'PKR' => __( 'Pakistani rupee', 'woocommerce' ),
+				'PLN' => __( 'Polish z&#x142;oty', 'woocommerce' ),
+				'PRB' => __( 'Transnistrian ruble', 'woocommerce' ),
+				'PYG' => __( 'Paraguayan guaran&iacute;', 'woocommerce' ),
+				'QAR' => __( 'Qatari riyal', 'woocommerce' ),
+				'RON' => __( 'Romanian leu', 'woocommerce' ),
+				'RSD' => __( 'Serbian dinar', 'woocommerce' ),
+				'RUB' => __( 'Russian ruble', 'woocommerce' ),
+				'RWF' => __( 'Rwandan franc', 'woocommerce' ),
+				'SAR' => __( 'Saudi riyal', 'woocommerce' ),
+				'SBD' => __( 'Solomon Islands dollar', 'woocommerce' ),
+				'SCR' => __( 'Seychellois rupee', 'woocommerce' ),
+				'SDG' => __( 'Sudanese pound', 'woocommerce' ),
+				'SEK' => __( 'Swedish krona', 'woocommerce' ),
+				'SGD' => __( 'Singapore dollar', 'woocommerce' ),
+				'SHP' => __( 'Saint Helena pound', 'woocommerce' ),
+				'SLL' => __( 'Sierra Leonean leone', 'woocommerce' ),
+				'SOS' => __( 'Somali shilling', 'woocommerce' ),
+				'SRD' => __( 'Surinamese dollar', 'woocommerce' ),
+				'SSP' => __( 'South Sudanese pound', 'woocommerce' ),
+				'STD' => __( 'S&atilde;o Tom&eacute; and Pr&iacute;ncipe dobra', 'woocommerce' ),
+				'SYP' => __( 'Syrian pound', 'woocommerce' ),
+				'SZL' => __( 'Swazi lilangeni', 'woocommerce' ),
+				'THB' => __( 'Thai baht', 'woocommerce' ),
+				'TJS' => __( 'Tajikistani somoni', 'woocommerce' ),
+				'TMT' => __( 'Turkmenistan manat', 'woocommerce' ),
+				'TND' => __( 'Tunisian dinar', 'woocommerce' ),
+				'TOP' => __( 'Tongan pa&#x2bb;anga', 'woocommerce' ),
+				'TRY' => __( 'Turkish lira', 'woocommerce' ),
+				'TTD' => __( 'Trinidad and Tobago dollar', 'woocommerce' ),
+				'TWD' => __( 'New Taiwan dollar', 'woocommerce' ),
+				'TZS' => __( 'Tanzanian shilling', 'woocommerce' ),
+				'UAH' => __( 'Ukrainian hryvnia', 'woocommerce' ),
+				'UGX' => __( 'Ugandan shilling', 'woocommerce' ),
+				'USD' => __( 'United States dollar', 'woocommerce' ),
+				'UYU' => __( 'Uruguayan peso', 'woocommerce' ),
+				'UZS' => __( 'Uzbekistani som', 'woocommerce' ),
+				'VEF' => __( 'Venezuelan bol&iacute;var', 'woocommerce' ),
+				'VND' => __( 'Vietnamese &#x111;&#x1ed3;ng', 'woocommerce' ),
+				'VUV' => __( 'Vanuatu vatu', 'woocommerce' ),
+				'WST' => __( 'Samoan t&#x101;l&#x101;', 'woocommerce' ),
+				'XAF' => __( 'Central African CFA franc', 'woocommerce' ),
+				'XCD' => __( 'East Caribbean dollar', 'woocommerce' ),
+				'XOF' => __( 'West African CFA franc', 'woocommerce' ),
+				'XPF' => __( 'CFP franc', 'woocommerce' ),
+				'YER' => __( 'Yemeni rial', 'woocommerce' ),
 				'ZAR' => __( 'South African rand', 'woocommerce' ),
+				'ZMW' => __( 'Zambian kwacha', 'woocommerce' ),
 			)
 		)
 	);
@@ -335,56 +456,168 @@ function get_woocommerce_currency_symbol( $currency = '' ) {
 	}
 
 	$symbols = apply_filters( 'woocommerce_currency_symbols', array(
-		'AED' => 'د.إ',
+		'AED' => '&#x62f;.&#x625;',
+		'AFN' => '&#x60b;',
+		'ALL' => 'L',
+		'AMD' => 'AMD',
+		'ANG' => '&fnof;',
+		'AOA' => 'Kz',
 		'ARS' => '&#36;',
 		'AUD' => '&#36;',
+		'AWG' => '&fnof;',
+		'AZN' => 'AZN',
+		'BAM' => 'KM',
+		'BBD' => '&#36;',
 		'BDT' => '&#2547;&nbsp;',
 		'BGN' => '&#1083;&#1074;.',
+		'BHD' => '.&#x62f;.&#x628;',
+		'BIF' => 'Fr',
+		'BMD' => '&#36;',
+		'BND' => '&#36;',
+		'BOB' => 'Bs.',
 		'BRL' => '&#82;&#36;',
+		'BSD' => '&#36;',
+		'BTC' => '&#3647;',
+		'BTN' => 'Nu.',
+		'BWP' => 'P',
+		'BYR' => 'Br',
+		'BZD' => '&#36;',
 		'CAD' => '&#36;',
+		'CDF' => 'Fr',
 		'CHF' => '&#67;&#72;&#70;',
 		'CLP' => '&#36;',
 		'CNY' => '&yen;',
 		'COP' => '&#36;',
+		'CRC' => '&#x20a1;',
+		'CUC' => '&#36;',
+		'CUP' => '&#36;',
+		'CVE' => '&#36;',
 		'CZK' => '&#75;&#269;',
+		'DJF' => 'Fr',
 		'DKK' => 'DKK',
 		'DOP' => 'RD&#36;',
+		'DZD' => '&#x62f;.&#x62c;',
 		'EGP' => 'EGP',
+		'ERN' => 'Nfk',
+		'ETB' => 'Br',
 		'EUR' => '&euro;',
+		'FJD' => '&#36;',
+		'FKP' => '&pound;',
 		'GBP' => '&pound;',
+		'GEL' => '&#x10da;',
+		'GGP' => '&pound;',
+		'GHS' => '&#x20b5;',
+		'GIP' => '&pound;',
+		'GMD' => 'D',
+		'GNF' => 'Fr',
+		'GTQ' => 'Q',
+		'GYD' => '&#36;',
 		'HKD' => '&#36;',
+		'HNL' => 'L',
 		'HRK' => 'Kn',
+		'HTG' => 'G',
 		'HUF' => '&#70;&#116;',
 		'IDR' => 'Rp',
 		'ILS' => '&#8362;',
+		'IMP' => '&pound;',
 		'INR' => '&#8377;',
-		'ISK' => 'Kr.',
+		'IQD' => '&#x639;.&#x62f;',
+		'IRR' => '&#xfdfc;',
+		'IRT' => '&#x062A;&#x0648;&#x0645;&#x0627;&#x0646;',
+		'ISK' => 'kr.',
+		'JEP' => '&pound;',
+		'JMD' => '&#36;',
+		'JOD' => '&#x62f;.&#x627;',
 		'JPY' => '&yen;',
 		'KES' => 'KSh',
-		'LAK' => '&#8365;',
+		'KGS' => '&#x441;&#x43e;&#x43c;',
+		'KHR' => '&#x17db;',
+		'KMF' => 'Fr',
+		'KPW' => '&#x20a9;',
 		'KRW' => '&#8361;',
+		'KWD' => '&#x62f;.&#x643;',
+		'KYD' => '&#36;',
+		'KZT' => 'KZT',
+		'LAK' => '&#8365;',
+		'LBP' => '&#x644;.&#x644;',
+		'LKR' => '&#xdbb;&#xdd4;',
+		'LRD' => '&#36;',
+		'LSL' => 'L',
+		'LYD' => '&#x644;.&#x62f;',
+		'MAD' => '&#x62f;.&#x645;.',
+		'MDL' => 'MDL',
+		'MGA' => 'Ar',
+		'MKD' => '&#x434;&#x435;&#x43d;',
+		'MMK' => 'Ks',
+		'MNT' => '&#x20ae;',
+		'MOP' => 'P',
+		'MRO' => 'UM',
+		'MUR' => '&#x20a8;',
+		'MVR' => '.&#x783;',
+		'MWK' => 'MK',
 		'MXN' => '&#36;',
 		'MYR' => '&#82;&#77;',
+		'MZN' => 'MT',
+		'NAD' => '&#36;',
 		'NGN' => '&#8358;',
+		'NIO' => 'C&#36;',
 		'NOK' => '&#107;&#114;',
 		'NPR' => '&#8360;',
 		'NZD' => '&#36;',
+		'OMR' => '&#x631;.&#x639;.',
+		'PAB' => 'B/.',
+		'PEN' => 'S/.',
+		'PGK' => 'K',
 		'PHP' => '&#8369;',
 		'PKR' => '&#8360;',
 		'PLN' => '&#122;&#322;',
+		'PRB' => '&#x440;.',
 		'PYG' => '&#8370;',
+		'QAR' => '&#x631;.&#x642;',
 		'RMB' => '&yen;',
 		'RON' => 'lei',
-		'RUB' => '&#1088;&#1091;&#1073;.',
+		'RSD' => '&#x434;&#x438;&#x43d;.',
+		'RUB' => '&#8381;',
+		'RWF' => 'Fr',
+		'SAR' => '&#x631;.&#x633;',
+		'SBD' => '&#36;',
+		'SCR' => '&#x20a8;',
+		'SDG' => '&#x62c;.&#x633;.',
 		'SEK' => '&#107;&#114;',
 		'SGD' => '&#36;',
+		'SHP' => '&pound;',
+		'SLL' => 'Le',
+		'SOS' => 'Sh',
+		'SRD' => '&#36;',
+		'SSP' => '&pound;',
+		'STD' => 'Db',
+		'SYP' => '&#x644;.&#x633;',
+		'SZL' => 'L',
 		'THB' => '&#3647;',
+		'TJS' => '&#x405;&#x41c;',
+		'TMT' => 'm',
+		'TND' => '&#x62f;.&#x62a;',
+		'TOP' => 'T&#36;',
 		'TRY' => '&#8378;',
+		'TTD' => '&#36;',
 		'TWD' => '&#78;&#84;&#36;',
+		'TZS' => 'Sh',
 		'UAH' => '&#8372;',
+		'UGX' => 'UGX',
 		'USD' => '&#36;',
+		'UYU' => '&#36;',
+		'UZS' => 'UZS',
+		'VEF' => 'Bs F',
 		'VND' => '&#8363;',
+		'VUV' => 'Vt',
+		'WST' => 'T',
+		'XAF' => 'Fr',
+		'XCD' => '&#36;',
+		'XOF' => 'Fr',
+		'XPF' => 'Fr',
+		'YER' => '&#xfdfc;',
 		'ZAR' => '&#82;',
+		'ZMW' => 'ZK',
 	) );
 
 	$currency_symbol = isset( $symbols[ $currency ] ) ? $symbols[ $currency ] : '';
@@ -424,7 +657,7 @@ function wc_get_image_size( $image_size ) {
 		$size = array(
 			'width'  => $width,
 			'height' => $height,
-			'crop'   => $crop
+			'crop'   => $crop,
 		);
 
 		$image_size = $width . '_' . $height;
@@ -439,7 +672,7 @@ function wc_get_image_size( $image_size ) {
 		$size = array(
 			'width'  => '300',
 			'height' => '300',
-			'crop'   => 1
+			'crop'   => 1,
 		);
 	}
 
@@ -468,15 +701,20 @@ function wc_print_js() {
 	global $wc_queued_js;
 
 	if ( ! empty( $wc_queued_js ) ) {
-
-		echo "<!-- WooCommerce JavaScript -->\n<script type=\"text/javascript\">\njQuery(function($) {";
-
-		// Sanitize
+		// Sanitize.
 		$wc_queued_js = wp_check_invalid_utf8( $wc_queued_js );
 		$wc_queued_js = preg_replace( '/&#(x)?0*(?(1)27|39);?/i', "'", $wc_queued_js );
 		$wc_queued_js = str_replace( "\r", '', $wc_queued_js );
 
-		echo $wc_queued_js . "});\n</script>\n";
+		$js = "<!-- WooCommerce JavaScript -->\n<script type=\"text/javascript\">\njQuery(function($) { $wc_queued_js });\n</script>\n";
+
+		/**
+		 * woocommerce_queued_js filter.
+		 *
+		 * @since 2.6.0
+		 * @param string $js JavaScript code.
+		 */
+		echo apply_filters( 'woocommerce_queued_js', $js );
 
 		unset( $wc_queued_js );
 	}
@@ -492,7 +730,7 @@ function wc_print_js() {
  */
 function wc_setcookie( $name, $value, $expire = 0, $secure = false ) {
 	if ( ! headers_sent() ) {
-		setcookie( $name, $value, $expire, COOKIEPATH, COOKIE_DOMAIN, $secure );
+		setcookie( $name, $value, $expire, COOKIEPATH ? COOKIEPATH : '/', COOKIE_DOMAIN, $secure );
 	} elseif ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
 		headers_sent( $file, $line );
 		trigger_error( "{$name} cookie cannot be set - headers already sent by {$file} on line {$line}", E_USER_NOTICE );
@@ -507,9 +745,7 @@ function wc_setcookie( $name, $value, $expire = 0, $secure = false ) {
  * @return string the URL.
  */
 function get_woocommerce_api_url( $path ) {
-
-	$_version = substr( WC_API::VERSION, 0, 1 );
-	$version  = defined( 'WC_API_REQUEST_VERSION' ) ? WC_API_REQUEST_VERSION : $_version;
+	$version  = defined( 'WC_API_REQUEST_VERSION' ) ? WC_API_REQUEST_VERSION : substr( WC_API::VERSION, 0, 1 );
 
 	$url = get_home_url( null, "wc-api/v{$version}/", is_ssl() ? 'https' : 'http' );
 
@@ -524,24 +760,62 @@ function get_woocommerce_api_url( $path ) {
  * Get a log file path.
  *
  * @since 2.2
+ *
  * @param string $handle name.
  * @return string the log file path.
  */
 function wc_get_log_file_path( $handle ) {
-	return trailingslashit( WC_LOG_DIR ) . $handle . '-' . sanitize_file_name( wp_hash( $handle ) ) . '.log';
+	return WC_Log_Handler_File::get_log_file_path( $handle );
 }
 
 /**
- * Init for our rewrite rule fixes.
+ * Recursively get page children.
+ * @param  int $page_id
+ * @return int[]
  */
-function wc_fix_rewrite_rules_init() {
-	$permalinks = get_option( 'woocommerce_permalinks' );
+function wc_get_page_children( $page_id ) {
+	$page_ids = get_posts( array(
+		'post_parent' => $page_id,
+		'post_type'   => 'page',
+		'numberposts' => -1,
+		'post_status' => 'any',
+		'fields'      => 'ids',
+	) );
 
-	if ( ! empty( $permalinks['use_verbose_page_rules'] ) ) {
-		$GLOBALS['wp_rewrite']->use_verbose_page_rules = true;
+	if ( ! empty( $page_ids ) ) {
+		foreach ( $page_ids as $page_id ) {
+			$page_ids = array_merge( $page_ids, wc_get_page_children( $page_id ) );
+		}
+	}
+
+	return $page_ids;
+}
+
+/**
+ * Flushes rewrite rules when the shop page (or it's children) gets saved.
+ */
+function flush_rewrite_rules_on_shop_page_save() {
+	$screen    = get_current_screen();
+	$screen_id = $screen ? $screen->id : '';
+
+	// Check if this is the edit page.
+	if ( 'page' !== $screen_id ) {
+		return;
+	}
+
+	// Check if page is edited.
+	if ( empty( $_GET['post'] ) || empty( $_GET['action'] ) || ( isset( $_GET['action'] ) && 'edit' !== $_GET['action'] ) ) {
+		return;
+	}
+
+	$post_id      = intval( $_GET['post'] );
+	$shop_page_id = wc_get_page_id( 'shop' );
+
+	if ( $shop_page_id === $post_id || in_array( $post_id, wc_get_page_children( $shop_page_id ) ) ) {
+		do_action( 'woocommerce_flush_rewrite_rules' );
 	}
 }
-add_action( 'init', 'wc_fix_rewrite_rules_init' );
+add_action( 'admin_footer', 'flush_rewrite_rules_on_shop_page_save' );
 
 /**
  * Various rewrite rule fixes.
@@ -553,23 +827,35 @@ add_action( 'init', 'wc_fix_rewrite_rules_init' );
 function wc_fix_rewrite_rules( $rules ) {
 	global $wp_rewrite;
 
-	$permalinks        = get_option( 'woocommerce_permalinks' );
-	$product_permalink = empty( $permalinks['product_base'] ) ? _x( 'product', 'slug', 'woocommerce' ) : $permalinks['product_base'];
+	$permalinks = wc_get_permalink_structure();
 
 	// Fix the rewrite rules when the product permalink have %product_cat% flag.
-	if ( preg_match( '`/(.+)(/%product_cat%)`' , $product_permalink, $matches ) ) {
+	if ( preg_match( '`/(.+)(/%product_cat%)`' , $permalinks['product_rewrite_slug'], $matches ) ) {
 		foreach ( $rules as $rule => $rewrite ) {
-
 			if ( preg_match( '`^' . preg_quote( $matches[1], '`' ) . '/\(`', $rule ) && preg_match( '/^(index\.php\?product_cat)(?!(.*product))/', $rewrite ) ) {
 				unset( $rules[ $rule ] );
 			}
 		}
 	}
 
-	// If the shop page is used as the base, we need to enable verbose rewrite rules or sub pages will 404.
-	if ( ! empty( $permalinks['use_verbose_page_rules'] ) ) {
-		$page_rewrite_rules = $wp_rewrite->page_rewrite_rules();
-		$rules              = array_merge( $page_rewrite_rules, $rules );
+	// If the shop page is used as the base, we need to handle shop page subpages to avoid 404s.
+	if ( $permalinks['use_verbose_page_rules'] && ( $shop_page_id = wc_get_page_id( 'shop' ) ) ) {
+		$page_rewrite_rules = array();
+		$subpages           = wc_get_page_children( $shop_page_id );
+
+		// Subpage rules
+		foreach ( $subpages as $subpage ) {
+			$uri = get_page_uri( $subpage );
+			$page_rewrite_rules[ $uri . '/?$' ] = 'index.php?pagename=' . $uri;
+			$wp_generated_rewrite_rules         = $wp_rewrite->generate_rewrite_rules( $uri, EP_PAGES, true, true, false, false );
+			foreach ( $wp_generated_rewrite_rules as $key => $value ) {
+				$wp_generated_rewrite_rules[ $key ] = $value . '&pagename=' . $uri;
+			}
+			$page_rewrite_rules = array_merge( $page_rewrite_rules, $wp_generated_rewrite_rules );
+		}
+
+		// Merge with rules
+		$rules = array_merge( $page_rewrite_rules, $rules );
 	}
 
 	return $rules;
@@ -588,9 +874,8 @@ function wc_fix_product_attachment_link( $link, $post_id ) {
 
 	$post = get_post( $post_id );
 	if ( 'product' === get_post_type( $post->post_parent ) ) {
-		$permalinks        = get_option( 'woocommerce_permalinks' );
-		$product_permalink = empty( $permalinks['product_base'] ) ? _x( 'product', 'slug', 'woocommerce' ) : $permalinks['product_base'];
-		if ( preg_match( '/\/(.+)(\/%product_cat%)$/' , $product_permalink, $matches ) ) {
+		$permalinks = wc_get_permalink_structure();
+		if ( preg_match( '/\/(.+)(\/%product_cat%)$/', $permalinks['product_rewrite_slug'], $matches ) ) {
 			$link = home_url( '/?attachment_id=' . $post->ID );
 		}
 	}
@@ -627,7 +912,7 @@ add_filter( 'mod_rewrite_rules', 'wc_ms_protect_download_rewite_rules' );
  * @return string[]
  */
 function wc_get_core_supported_themes() {
-	return array( 'twentysixteen', 'twentyfifteen', 'twentyfourteen', 'twentythirteen', 'twentyeleven', 'twentytwelve', 'twentyten' );
+	return array( 'twentyseventeen', 'twentysixteen', 'twentyfifteen', 'twentyfourteen', 'twentythirteen', 'twentyeleven', 'twentytwelve', 'twentyten' );
 }
 
 /**
@@ -646,21 +931,6 @@ function wc_deliver_webhook_async( $webhook_id, $arg ) {
 }
 add_action( 'woocommerce_deliver_webhook_async', 'wc_deliver_webhook_async', 10, 2 );
 
-/**
- * Enables template debug mode.
- */
-function wc_template_debug_mode() {
-	if ( ! defined( 'WC_TEMPLATE_DEBUG_MODE' ) ) {
-		$status_options = get_option( 'woocommerce_status_options', array() );
-		if ( ! empty( $status_options['template_debug_mode'] ) && current_user_can( 'manage_options' ) ) {
-			define( 'WC_TEMPLATE_DEBUG_MODE', true );
-		} else {
-			define( 'WC_TEMPLATE_DEBUG_MODE', false );
-		}
-	}
-}
-add_action( 'after_setup_theme', 'wc_template_debug_mode', 20 );
-
 /**
  * Formats a string in the format COUNTRY:STATE into an array.
  *
@@ -677,14 +947,13 @@ function wc_format_country_state_string( $country_string ) {
 	}
 	return array(
 		'country' => $country,
-		'state'   => $state
+		'state'   => $state,
 	);
 }
 
 /**
  * Get the store's base location.
  *
- * @todo should the woocommerce_default_country option be renamed to contain 'base'?
  * @since 2.3.0
  * @return array
  */
@@ -695,20 +964,26 @@ function wc_get_base_location() {
 }
 
 /**
- * Get the customer's default location. .
+ * Get the customer's default location.
  *
  * Filtered, and set to base location or left blank. If cache-busting,
  * this should only be used when 'location' is set in the querystring.
  *
- * @todo should the woocommerce_default_country option be renamed to contain 'base'?
  * @since 2.3.0
  * @return array
  */
 function wc_get_customer_default_location() {
+	$location = array();
+
 	switch ( get_option( 'woocommerce_default_customer_address' ) ) {
 		case 'geolocation_ajax' :
 		case 'geolocation' :
-			$location = WC_Geolocation::geolocate_ip();
+			// Exclude common bots from geolocation by user agent.
+			$ua = wc_get_user_agent();
+
+			if ( ! strstr( $ua, 'bot' ) && ! strstr( $ua, 'spider' ) && ! strstr( $ua, 'crawl' ) ) {
+				$location = WC_Geolocation::geolocate_ip( '', true, false );
+			}
 
 			// Base fallback.
 			if ( empty( $location['country'] ) ) {
@@ -723,7 +998,16 @@ function wc_get_customer_default_location() {
 		break;
 	}
 
-	return $location;
+	return apply_filters( 'woocommerce_customer_default_location_array', $location );
+}
+
+/**
+ * Get user agent string.
+ * @since  3.0.0
+ * @return string
+ */
+function wc_get_user_agent() {
+	return isset( $_SERVER['HTTP_USER_AGENT'] ) ? strtolower( $_SERVER['HTTP_USER_AGENT'] ) : '';
 }
 
 // This function can be removed when WP 3.9.2 or greater is required.
@@ -742,7 +1026,7 @@ if ( ! function_exists( 'hash_equals' ) ) :
 	 */
 	function hash_equals( $a, $b ) {
 		$a_length = strlen( $a );
-		if ( $a_length !== strlen( $b ) ) {
+		if ( strlen( $b ) !== $a_length ) {
 			return false;
 		}
 		$result = 0;
@@ -752,7 +1036,7 @@ if ( ! function_exists( 'hash_equals' ) ) :
 			$result |= ord( $a[ $i ] ) ^ ord( $b[ $i ] );
 		}
 
-		return $result === 0;
+		return 0 === $result;
 	}
 endif;
 
@@ -796,7 +1080,7 @@ function wc_array_cartesian( $input ) {
 	// Generate indexes from keys and values so we have a logical sort order
 	foreach ( $input as $key => $values ) {
 		foreach ( $values as $value ) {
-			$indexes[ $key ][ $value ] = $index ++;
+			$indexes[ $key ][ $value ] = $index++;
 		}
 	}
 
@@ -855,16 +1139,10 @@ function wc_array_cartesian( $input ) {
 function wc_transaction_query( $type = 'start' ) {
 	global $wpdb;
 
-	if ( ! defined( 'WC_USE_TRANSACTIONS' ) ) {
-		// Try to set isolation level to support dirty reads - if this is unsupported, do not use transactions
-		$wpdb->hide_errors();
-		$result = $wpdb->query( 'SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;' );
+	$wpdb->hide_errors();
 
-		if ( false === $result ) {
-			define( 'WC_USE_TRANSACTIONS', false );
-		} else {
-			define( 'WC_USE_TRANSACTIONS', true );
-		}
+	if ( ! defined( 'WC_USE_TRANSACTIONS' ) ) {
+		define( 'WC_USE_TRANSACTIONS', true );
 	}
 
 	if ( WC_USE_TRANSACTIONS ) {
@@ -881,3 +1159,454 @@ function wc_transaction_query( $type = 'start' ) {
 		}
 	}
 }
+
+/**
+ * Gets the url to the cart page.
+ *
+ * @since  2.5.0
+ *
+ * @return string Url to cart page
+ */
+function wc_get_cart_url() {
+	return apply_filters( 'woocommerce_get_cart_url', wc_get_page_permalink( 'cart' ) );
+}
+
+/**
+ * Gets the url to the checkout page.
+ *
+ * @since  2.5.0
+ *
+ * @return string Url to checkout page
+ */
+function wc_get_checkout_url() {
+	$checkout_url = wc_get_page_permalink( 'checkout' );
+	if ( $checkout_url ) {
+		// Force SSL if needed
+		if ( is_ssl() || 'yes' === get_option( 'woocommerce_force_ssl_checkout' ) ) {
+			$checkout_url = str_replace( 'http:', 'https:', $checkout_url );
+		}
+	}
+
+	return apply_filters( 'woocommerce_get_checkout_url', $checkout_url );
+}
+
+/**
+ * Register a shipping method.
+ *
+ * @since 1.5.7
+ * @param string|object $shipping_method class name (string) or a class object.
+ */
+function woocommerce_register_shipping_method( $shipping_method ) {
+	WC()->shipping->register_shipping_method( $shipping_method );
+}
+
+if ( ! function_exists( 'wc_get_shipping_zone' ) ) {
+	/**
+	 * Get the shipping zone matching a given package from the cart.
+	 *
+	 * @since  2.6.0
+	 * @uses   WC_Shipping_Zones::get_zone_matching_package
+	 * @param  array $package
+	 * @return WC_Shipping_Zone
+	 */
+	function wc_get_shipping_zone( $package ) {
+		return WC_Shipping_Zones::get_zone_matching_package( $package );
+	}
+}
+
+/**
+ * Get a nice name for credit card providers.
+ *
+ * @since  2.6.0
+ * @param  string $type Provider Slug/Type
+ * @return string
+ */
+function wc_get_credit_card_type_label( $type ) {
+	// Normalize
+	$type = strtolower( $type );
+	$type = str_replace( '-', ' ', $type );
+	$type = str_replace( '_', ' ', $type );
+
+	$labels = apply_filters( 'wocommerce_credit_card_type_labels', array(
+		'mastercard'       => __( 'MasterCard', 'woocommerce' ),
+		'visa'             => __( 'Visa', 'woocommerce' ),
+		'discover'         => __( 'Discover', 'woocommerce' ),
+		'american express' => __( 'American Express', 'woocommerce' ),
+		'diners'           => __( 'Diners', 'woocommerce' ),
+		'jcb'              => __( 'JCB', 'woocommerce' ),
+	) );
+
+	return apply_filters( 'woocommerce_get_credit_card_type_label', ( array_key_exists( $type, $labels ) ? $labels[ $type ] : ucfirst( $type ) ) );
+}
+
+/**
+ * Outputs a "back" link so admin screens can easily jump back a page.
+ *
+ * @param string $label Title of the page to return to.
+ * @param string $url   URL of the page to return to.
+ */
+function wc_back_link( $label, $url ) {
+	echo '<small class="wc-admin-breadcrumb"><a href="' . esc_url( $url ) . '" aria-label="' . esc_attr( $label ) . '">&#x2934;</a></small>';
+}
+
+/**
+ * Display a WooCommerce help tip.
+ *
+ * @since  2.5.0
+ *
+ * @param  string $tip        Help tip text
+ * @param  bool   $allow_html Allow sanitized HTML if true or escape
+ * @return string
+ */
+function wc_help_tip( $tip, $allow_html = false ) {
+	if ( $allow_html ) {
+		$tip = wc_sanitize_tooltip( $tip );
+	} else {
+		$tip = esc_attr( $tip );
+	}
+
+	return '<span class="woocommerce-help-tip" data-tip="' . $tip . '"></span>';
+}
+
+/**
+ * Return a list of potential postcodes for wildcard searching.
+ * @since 2.6.0
+ * @param  string $postcode
+ * @param  string $country to format postcode for matching.
+ * @return string[]
+ */
+function wc_get_wildcard_postcodes( $postcode, $country = '' ) {
+	$formatted_postcode = wc_format_postcode( $postcode, $country );
+	$length             = function_exists( 'mb_strlen' ) ? mb_strlen( $formatted_postcode ) : strlen( $formatted_postcode );
+	$postcodes          = array(
+		$postcode,
+		$formatted_postcode,
+		$formatted_postcode . '*',
+	);
+
+	for ( $i = 0; $i < $length; $i ++ ) {
+		$postcodes[] = ( function_exists( 'mb_substr' ) ? mb_substr( $formatted_postcode, 0, ( $i + 1 ) * -1 ) : substr( $formatted_postcode, 0, ( $i + 1 ) * -1 ) ) . '*';
+	}
+
+	return $postcodes;
+}
+
+/**
+ * Used by shipping zones and taxes to compare a given $postcode to stored
+ * postcodes to find matches for numerical ranges, and wildcards.
+ * @since 2.6.0
+ * @param string $postcode Postcode you want to match against stored postcodes
+ * @param array  $objects Array of postcode objects from Database
+ * @param string $object_id_key DB column name for the ID.
+ * @param string $object_compare_key DB column name for the value.
+ * @param string $country Country from which this postcode belongs. Allows for formatting.
+ * @return array Array of matching object ID and matching values.
+ */
+function wc_postcode_location_matcher( $postcode, $objects, $object_id_key, $object_compare_key, $country = '' ) {
+	$postcode           = wc_normalize_postcode( $postcode );
+	$wildcard_postcodes = array_map( 'wc_clean', wc_get_wildcard_postcodes( $postcode, $country ) );
+	$matches            = array();
+
+	foreach ( $objects as $object ) {
+		$object_id       = $object->$object_id_key;
+		$compare_against = $object->$object_compare_key;
+
+		// Handle postcodes containing ranges.
+		if ( strstr( $compare_against, '...' ) ) {
+			$range = array_map( 'trim', explode( '...', $compare_against ) );
+
+			if ( 2 !== sizeof( $range ) ) {
+				continue;
+			}
+
+			list( $min, $max ) = $range;
+
+			// If the postcode is non-numeric, make it numeric.
+			if ( ! is_numeric( $min ) || ! is_numeric( $max ) ) {
+				$compare = wc_make_numeric_postcode( $postcode );
+				$min     = str_pad( wc_make_numeric_postcode( $min ), strlen( $compare ), '0' );
+				$max     = str_pad( wc_make_numeric_postcode( $max ), strlen( $compare ), '0' );
+			} else {
+				$compare = $postcode;
+			}
+
+			if ( $compare >= $min && $compare <= $max ) {
+				$matches[ $object_id ]   = isset( $matches[ $object_id ] ) ? $matches[ $object_id ]: array();
+				$matches[ $object_id ][] = $compare_against;
+			}
+
+		// Wildcard and standard comparison.
+		} elseif ( in_array( $compare_against, $wildcard_postcodes ) ) {
+			$matches[ $object_id ]   = isset( $matches[ $object_id ] ) ? $matches[ $object_id ]: array();
+			$matches[ $object_id ][] = $compare_against;
+		}
+	}
+
+	return $matches;
+}
+
+/**
+ * Gets number of shipping methods currently enabled. Used to identify if
+ * shipping is configured.
+ *
+ * @since  2.6.0
+ * @param  bool $include_legacy Count legacy shipping methods too.
+ * @return int
+ */
+function wc_get_shipping_method_count( $include_legacy = false ) {
+	global $wpdb;
+
+	$transient_name = 'wc_shipping_method_count_' . ( $include_legacy ? 1 : 0 ) . '_' . WC_Cache_Helper::get_transient_version( 'shipping' );
+	$method_count   = get_transient( $transient_name );
+
+	if ( false === $method_count ) {
+		$method_count = absint( $wpdb->get_var( "SELECT COUNT(*) FROM {$wpdb->prefix}woocommerce_shipping_zone_methods" ) );
+
+		if ( $include_legacy ) {
+			// Count activated methods that don't support shipping zones.
+			$methods = WC()->shipping->get_shipping_methods();
+
+			foreach ( $methods as $method ) {
+				if ( isset( $method->enabled ) && 'yes' === $method->enabled && ! $method->supports( 'shipping-zones' ) ) {
+					$method_count++;
+				}
+			}
+		}
+
+		set_transient( $transient_name, $method_count, DAY_IN_SECONDS * 30 );
+	}
+
+	return absint( $method_count );
+}
+
+/**
+ * Wrapper for set_time_limit to see if it is enabled.
+ * @since 2.6.0
+ */
+function wc_set_time_limit( $limit = 0 ) {
+	if ( function_exists( 'set_time_limit' ) && false === strpos( ini_get( 'disable_functions' ), 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
+		@set_time_limit( $limit );
+	}
+}
+
+/**
+ * Used to sort products attributes with uasort.
+ * @since 2.6.0
+ */
+function wc_product_attribute_uasort_comparison( $a, $b ) {
+	if ( $a['position'] === $b['position'] ) {
+		return 0;
+	}
+	return ( $a['position'] < $b['position'] ) ? -1 : 1;
+}
+
+/**
+ * Used to sort shipping zone methods with uasort.
+ * @since 3.0.0
+ */
+function wc_shipping_zone_method_order_uasort_comparison( $a, $b ) {
+	if ( $a->method_order === $b->method_order ) {
+		return 0;
+	}
+	return ( $a->method_order < $b->method_order ) ? -1 : 1;
+}
+
+
+/**
+ * Get rounding precision for internal WC calculations.
+ * Will increase the precision of wc_get_price_decimals by 2 decimals, unless WC_ROUNDING_PRECISION is set to a higher number.
+ *
+ * @since 2.6.3
+ * @return int
+ */
+function wc_get_rounding_precision() {
+	$precision = wc_get_price_decimals() + 2;
+	if ( absint( WC_ROUNDING_PRECISION ) > $precision ) {
+		$precision = absint( WC_ROUNDING_PRECISION );
+	}
+	return $precision;
+}
+
+/**
+ * Get a shared logger instance.
+ *
+ * Use the woocommerce_logging_class filter to change the logging class. You may provide one of the following:
+ *     - a class name which will be instantiated as `new $class` with no arguments
+ *     - an instance which will be used directly as the logger
+ * In either case, the class or instance *must* implement WC_Logger_Interface.
+ *
+ * @see WC_Logger_Interface
+ *
+ * @return WC_Logger
+ */
+function wc_get_logger() {
+	static $logger = null;
+	if ( null === $logger ) {
+		$class = apply_filters( 'woocommerce_logging_class', 'WC_Logger' );
+		$implements = class_implements( $class );
+		if ( is_array( $implements ) && in_array( 'WC_Logger_Interface', $implements ) ) {
+			if ( is_object( $class ) ) {
+				$logger = $class;
+			} else {
+				$logger = new $class;
+			}
+		} else {
+			wc_doing_it_wrong(
+				__FUNCTION__,
+				sprintf(
+					__( 'The class <code>%s</code> provided by woocommerce_logging_class filter must implement <code>WC_Logger_Interface</code>.', 'woocommerce' ),
+					esc_html( is_object( $class ) ? get_class( $class ) : $class )
+				),
+				'3.0'
+			);
+			$logger = new WC_Logger();
+		}
+	}
+	return $logger;
+}
+
+/**
+ * Prints human-readable information about a variable.
+ *
+ * Some server environments blacklist some debugging functions. This function provides a safe way to
+ * turn an expression into a printable, readable form without calling blacklisted functions.
+ *
+ * @since 3.0
+ *
+ * @param mixed $expression The expression to be printed.
+ * @param bool $return Optional. Default false. Set to true to return the human-readable string.
+ * @return string|bool False if expression could not be printed. True if the expression was printed.
+ *     If $return is true, a string representation will be returned.
+ */
+function wc_print_r( $expression, $return = false ) {
+	$alternatives = array(
+		array( 'func' => 'print_r', 'args' => array( $expression, true ) ),
+		array( 'func' => 'var_export', 'args' => array( $expression, true ) ),
+		array( 'func' => 'json_encode', 'args' => array( $expression ) ),
+		array( 'func' => 'serialize', 'args' => array( $expression ) ),
+	);
+
+	$alternatives = apply_filters( 'woocommerce_print_r_alternatives', $alternatives, $expression );
+
+	foreach ( $alternatives as $alternative ) {
+		if ( function_exists( $alternative['func'] ) ) {
+			$res = call_user_func_array( $alternative['func'], $alternative['args'] );
+			if ( $return ) {
+				return $res;
+			} else {
+				echo $res;
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+/**
+ * Registers the default log handler.
+ *
+ * @since 3.0
+ * @param array $handlers
+ * @return array
+ */
+function wc_register_default_log_handler( $handlers ) {
+
+	if ( defined( 'WC_LOG_HANDLER' ) && class_exists( WC_LOG_HANDLER ) ) {
+		$handler_class = WC_LOG_HANDLER;
+		$default_handler = new $handler_class();
+	} else {
+		$default_handler = new WC_Log_Handler_File();
+	}
+
+	array_push( $handlers, $default_handler );
+
+	return $handlers;
+}
+add_filter( 'woocommerce_register_log_handlers', 'wc_register_default_log_handler' );
+
+/**
+ * Store user agents. Used for tracker.
+ * @since 3.0.0
+ */
+function wc_maybe_store_user_agent( $user_login, $user ) {
+	if ( 'yes' === get_option( 'woocommerce_allow_tracking', 'no' ) && user_can( $user, 'manage_woocommerce' ) ) {
+		$admin_user_agents   = array_filter( (array) get_option( 'woocommerce_tracker_ua', array() ) );
+		$admin_user_agents[] = wc_get_user_agent();
+		update_option( 'woocommerce_tracker_ua', array_unique( $admin_user_agents ) );
+	}
+}
+add_action( 'wp_login', 'wc_maybe_store_user_agent', 10, 2 );
+
+/**
+ * Based on wp_list_pluck, this calls a method instead of returning a property.
+ *
+ * @since 3.0.0
+ * @param array      $list      List of objects or arrays
+ * @param int|string $callback_or_field     Callback method from the object to place instead of the entire object
+ * @param int|string $index_key Optional. Field from the object to use as keys for the new array.
+ *                              Default null.
+ * @return array Array of values.
+ */
+function wc_list_pluck( $list, $callback_or_field, $index_key = null ) {
+	// Use wp_list_pluck if this isn't a callback
+	$first_el = current( $list );
+	if ( ! is_object( $first_el ) || ! is_callable( array( $first_el, $callback_or_field ) ) ) {
+		return wp_list_pluck( $list, $callback_or_field, $index_key );
+	}
+	if ( ! $index_key ) {
+		/*
+		 * This is simple. Could at some point wrap array_column()
+		 * if we knew we had an array of arrays.
+		 */
+		foreach ( $list as $key => $value ) {
+			$list[ $key ] = $value->{$callback_or_field}();
+		}
+		return $list;
+	}
+
+	/*
+	 * When index_key is not set for a particular item, push the value
+	 * to the end of the stack. This is how array_column() behaves.
+	 */
+	$newlist = array();
+	foreach ( $list as $value ) {
+		if ( isset( $value->$index_key ) ) {
+			$newlist[ $value->$index_key ] = $value->{$callback_or_field}();
+		} else {
+			$newlist[] = $value->{$callback_or_field}();
+		}
+	}
+	return $newlist;
+}
+
+/**
+ * Get permalink settings for WooCommerce independent of the user locale.
+ *
+ * @since  3.0.0
+ * @return array
+ */
+function wc_get_permalink_structure() {
+	if ( function_exists( 'switch_to_locale' ) && did_action( 'admin_init' ) ) {
+		switch_to_locale( get_locale() );
+	}
+
+	$permalinks = wp_parse_args( (array) get_option( 'woocommerce_permalinks', array() ), array(
+		'product_base'           => '',
+		'category_base'          => '',
+		'tag_base'               => '',
+		'attribute_base'         => '',
+		'use_verbose_page_rules' => false,
+	) );
+
+	// Ensure rewrite slugs are set.
+	$permalinks['product_rewrite_slug']   = untrailingslashit( empty( $permalinks['product_base'] ) ? _x( 'product', 'slug', 'woocommerce' )             : $permalinks['product_base'] );
+	$permalinks['category_rewrite_slug']  = untrailingslashit( empty( $permalinks['category_base'] ) ? _x( 'product-category', 'slug', 'woocommerce' )   : $permalinks['category_base'] );
+	$permalinks['tag_rewrite_slug']       = untrailingslashit( empty( $permalinks['tag_base'] ) ? _x( 'product-tag', 'slug', 'woocommerce' )             : $permalinks['tag_base'] );
+	$permalinks['attribute_rewrite_slug'] = untrailingslashit( empty( $permalinks['attribute_base'] ) ? '' : $permalinks['attribute_base'] );
+
+	if ( function_exists( 'restore_current_locale' ) && did_action( 'admin_init' ) ) {
+		restore_current_locale();
+	}
+	return $permalinks;
+}
diff --git a/includes/wc-coupon-functions.php b/includes/wc-coupon-functions.php
index 3a7bf840857..bc07372ea13 100644
--- a/includes/wc-coupon-functions.php
+++ b/includes/wc-coupon-functions.php
@@ -1,4 +1,8 @@
 <?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
 /**
  * WooCommerce Coupons Functions
  *
@@ -7,13 +11,9 @@
  * @author 		WooThemes
  * @category 	Core
  * @package 	WooCommerce/Functions
- * @version     2.1.0
+ * @version     3.0.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
-}
-
 /**
  * Get coupon types.
  *
@@ -21,10 +21,9 @@ if ( ! defined( 'ABSPATH' ) ) {
  */
 function wc_get_coupon_types() {
 	return (array) apply_filters( 'woocommerce_coupon_discount_types', array(
-		'fixed_cart'      => __( 'Cart Discount', 'woocommerce' ),
-		'percent'         => __( 'Cart % Discount', 'woocommerce' ),
-		'fixed_product'   => __( 'Product Discount', 'woocommerce' ),
-		'percent_product' => __( 'Product % Discount', 'woocommerce' )
+		'percent'         => __( 'Percentage discount', 'woocommerce' ),
+		'fixed_cart'      => __( 'Fixed cart discount', 'woocommerce' ),
+		'fixed_product'   => __( 'Fixed product discount', 'woocommerce' ),
 	) );
 }
 
@@ -43,20 +42,20 @@ function wc_get_coupon_type( $type = '' ) {
  * Coupon types that apply to individual products. Controls which validation rules will apply.
  *
  * @since  2.5.0
- * @return bool
+ * @return array
  */
 function wc_get_product_coupon_types() {
-	return (array) apply_filters( 'woocommerce_product_coupon_types', array( 'fixed_product', 'percent_product' ) );
+	return (array) apply_filters( 'woocommerce_product_coupon_types', array( 'fixed_product', 'percent' ) );
 }
 
 /**
  * Coupon types that apply to the cart as a whole. Controls which validation rules will apply.
  *
  * @since  2.5.0
- * @return bool
+ * @return array
  */
 function wc_get_cart_coupon_types() {
-	return (array) apply_filters( 'woocommerce_cart_coupon_types', array( 'fixed_cart', 'percent' ) );
+	return (array) apply_filters( 'woocommerce_cart_coupon_types', array( 'fixed_cart' ) );
 }
 
 /**
@@ -65,8 +64,44 @@ function wc_get_cart_coupon_types() {
  *
  * @since  2.5.0
  *
- * @return bool
+ * @return array
  */
 function wc_coupons_enabled() {
 	return apply_filters( 'woocommerce_coupons_enabled', 'yes' === get_option( 'woocommerce_enable_coupons' ) );
 }
+
+/**
+ * Get coupon code by ID.
+ *
+ * @since 3.0.0
+ * @param int $id Coupon ID.
+ * @return string
+ */
+function wc_get_coupon_code_by_id( $id ) {
+	$data_store = WC_Data_Store::load( 'coupon' );
+	return (string) $data_store->get_code_by_id( $id );
+}
+
+/**
+ * Get coupon code by ID.
+ *
+ * @since 3.0.0
+ * @param string $code
+ * @param int $exclude Used to exclude an ID from the check if you're checking existence.
+ * @return int
+ */
+function wc_get_coupon_id_by_code( $code, $exclude = 0 ) {
+	$data_store = WC_Data_Store::load( 'coupon' );
+	$ids        = wp_cache_get( WC_Cache_Helper::get_cache_prefix( 'coupons' ) . 'coupon_id_from_code_' . $code, 'coupons' );
+
+	if ( false === $ids ) {
+		$ids = $data_store->get_ids_by_code( $code );
+		if ( $ids ) {
+			wp_cache_set( WC_Cache_Helper::get_cache_prefix( 'coupons' ) . 'coupon_id_from_code_' . $code, $ids, 'coupons' );
+		}
+	}
+
+	$ids = array_diff( array_filter( array_map( 'absint', (array) $ids ) ), array( $exclude ) );
+
+	return apply_filters( 'woocommerce_get_coupon_id_from_code', absint( current( $ids ) ), $code, $exclude );
+}
diff --git a/includes/wc-deprecated-functions.php b/includes/wc-deprecated-functions.php
index b6c9e0e18a6..d9406f7c4e1 100644
--- a/includes/wc-deprecated-functions.php
+++ b/includes/wc-deprecated-functions.php
@@ -11,52 +11,130 @@
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
 /**
- * @deprecated
+ * Runs a deprecated action with notice only if used.
+ *
+ * @since  3.0.0
+ * @param  string $action
+ * @param  array $args
+ * @param  string $deprecated_in
+ * @param  string $replacement
+ */
+function wc_do_deprecated_action( $action, $args, $deprecated_in, $replacement ) {
+	if ( has_action( $action ) ) {
+		wc_deprecated_function( 'Action: ' . $action, $deprecated_in, $replacement );
+		do_action_ref_array( $action, $args );
+	}
+}
+
+/**
+ * Wrapper for deprecated functions so we can apply some extra logic.
+ *
+ * @since  3.0.0
+ * @param  string $function
+ * @param  string $version
+ * @param  string $replacement
+ */
+function wc_deprecated_function( $function, $version, $replacement = null ) {
+	if ( is_ajax() ) {
+		do_action( 'deprecated_function_run', $function, $replacement, $version );
+		$log_string  = "The {$function} function is deprecated since version {$version}.";
+		$log_string .= $replacement ? " Replace with {$replacement}." : '';
+		error_log( $log_string );
+	} else {
+		_deprecated_function( $function, $version, $replacement );
+	}
+}
+
+
+/**
+ * Wrapper for wc_doing_it_wrong.
+ *
+ * @since  3.0.0
+ * @param  string $function
+ * @param  string $version
+ * @param  string $replacement
+ */
+function wc_doing_it_wrong( $function, $message, $version ) {
+	$message .= ' Backtrace: ' . wp_debug_backtrace_summary();
+
+	if ( is_ajax() ) {
+		do_action( 'doing_it_wrong_run', $function, $message, $version );
+		error_log( "{$function} was called incorrectly. {$message}. This message was added in version {$version}." );
+	} else {
+		_doing_it_wrong( $function, $message, $version );
+	}
+}
+
+/**
+ * Wrapper for deprecated arguments so we can apply some extra logic.
+ *
+ * @since  3.0.0
+ * @param  string $argument
+ * @param  string $version
+ * @param  string $replacement
+ */
+function wc_deprecated_argument( $argument, $version, $message = null ) {
+	if ( is_ajax() ) {
+		do_action( 'deprecated_argument_run', $argument, $message, $version );
+		error_log( "The {$argument} argument is deprecated since version {$version}. {$message}" );
+	} else {
+		_deprecated_argument( $argument, $version, $message );
+	}
+}
+
+/**
+ * @deprecated 2.1
  */
 function woocommerce_show_messages() {
-	_deprecated_function( 'woocommerce_show_messages', '2.1', 'wc_print_notices' );
+	wc_deprecated_function( 'woocommerce_show_messages', '2.1', 'wc_print_notices' );
 	wc_print_notices();
 }
+
 /**
- * @deprecated
+ * @deprecated 2.1
  */
 function woocommerce_weekend_area_js() {
-	_deprecated_function( 'woocommerce_weekend_area_js', '2.1', '' );
+	wc_deprecated_function( 'woocommerce_weekend_area_js', '2.1' );
 }
+
 /**
- * @deprecated
+ * @deprecated 2.1
  */
 function woocommerce_tooltip_js() {
-	_deprecated_function( 'woocommerce_tooltip_js', '2.1', '' );
+	wc_deprecated_function( 'woocommerce_tooltip_js', '2.1' );
 }
+
 /**
- * @deprecated
+ * @deprecated 2.1
  */
 function woocommerce_datepicker_js() {
-	_deprecated_function( 'woocommerce_datepicker_js', '2.1', '' );
+	wc_deprecated_function( 'woocommerce_datepicker_js', '2.1' );
 }
+
 /**
- * @deprecated
+ * @deprecated 2.1
  */
 function woocommerce_admin_scripts() {
-	_deprecated_function( 'woocommerce_admin_scripts', '2.1', '' );
+	wc_deprecated_function( 'woocommerce_admin_scripts', '2.1' );
 }
+
 /**
- * @deprecated
+ * @deprecated 2.1
  */
 function woocommerce_create_page( $slug, $option = '', $page_title = '', $page_content = '', $post_parent = 0 ) {
-	_deprecated_function( 'woocommerce_create_page', '2.1', 'wc_create_page' );
+	wc_deprecated_function( 'woocommerce_create_page', '2.1', 'wc_create_page' );
 	return wc_create_page( $slug, $option, $page_title, $page_content, $post_parent );
 }
+
 /**
- * @deprecated
+ * @deprecated 2.1
  */
 function woocommerce_readfile_chunked( $file, $retbytes = true ) {
-	_deprecated_function( 'woocommerce_readfile_chunked', '2.1', 'WC_Download_Handler::readfile_chunked()' );
+	wc_deprecated_function( 'woocommerce_readfile_chunked', '2.1', 'WC_Download_Handler::readfile_chunked()' );
 	return WC_Download_Handler::readfile_chunked( $file );
 }
 
@@ -69,7 +147,7 @@ function woocommerce_readfile_chunked( $file, $retbytes = true ) {
  * @return string
  */
 function woocommerce_format_total( $number ) {
-	_deprecated_function( __FUNCTION__, '2.1', 'wc_format_decimal()' );
+	wc_deprecated_function( __FUNCTION__, '2.1', 'wc_format_decimal()' );
 	return wc_format_decimal( $number, wc_get_price_decimals(), false );
 }
 
@@ -82,7 +160,7 @@ function woocommerce_format_total( $number ) {
  * @return string
  */
 function woocommerce_get_formatted_product_name( $product ) {
-	_deprecated_function( __FUNCTION__, '2.1', 'WC_Product::get_formatted_name()' );
+	wc_deprecated_function( __FUNCTION__, '2.1', 'WC_Product::get_formatted_name()' );
 	return $product->get_formatted_name();
 }
 
@@ -92,632 +170,769 @@ function woocommerce_get_formatted_product_name( $product ) {
  * @access public
  */
 function woocommerce_legacy_paypal_ipn() {
-	if ( ! empty( $_GET['paypalListener'] ) && $_GET['paypalListener'] == 'paypal_standard_IPN' ) {
-
+	if ( ! empty( $_GET['paypalListener'] ) && 'paypal_standard_IPN' === $_GET['paypalListener'] ) {
 		WC()->payment_gateways();
-
 		do_action( 'woocommerce_api_wc_gateway_paypal' );
 	}
 }
 add_action( 'init', 'woocommerce_legacy_paypal_ipn' );
 
 /**
- * get_product soft deprecated for wc_get_product.
- *
- * @deprecated
+ * @deprecated 3.0
  */
 function get_product( $the_product = false, $args = array() ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_get_product' );
 	return wc_get_product( $the_product, $args );
 }
 
 /**
- * Cart functions (soft deprecated).
- */
-/**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_protected_product_add_to_cart( $passed, $product_id ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_protected_product_add_to_cart' );
 	return wc_protected_product_add_to_cart( $passed, $product_id );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_empty_cart() {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_empty_cart' );
 	wc_empty_cart();
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_load_persistent_cart( $user_login, $user = 0 ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_load_persistent_cart' );
 	return wc_load_persistent_cart( $user_login, $user );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_add_to_cart_message( $product_id ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_add_to_cart_message' );
 	wc_add_to_cart_message( $product_id );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_clear_cart_after_payment() {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_clear_cart_after_payment' );
 	wc_clear_cart_after_payment();
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_cart_totals_subtotal_html() {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_cart_totals_subtotal_html' );
 	wc_cart_totals_subtotal_html();
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_cart_totals_shipping_html() {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_cart_totals_shipping_html' );
 	wc_cart_totals_shipping_html();
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_cart_totals_coupon_html( $coupon ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_cart_totals_coupon_html' );
 	wc_cart_totals_coupon_html( $coupon );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_cart_totals_order_total_html() {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_cart_totals_order_total_html' );
 	wc_cart_totals_order_total_html();
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_cart_totals_fee_html( $fee ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_cart_totals_fee_html' );
 	wc_cart_totals_fee_html( $fee );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_cart_totals_shipping_method_label( $method ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_cart_totals_shipping_method_label' );
 	return wc_cart_totals_shipping_method_label( $method );
 }
 
 /**
- * Core functions (soft deprecated).
- */
-/**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_get_template_part( $slug, $name = '' ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_get_template_part' );
 	wc_get_template_part( $slug, $name );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_get_template( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_get_template' );
 	wc_get_template( $template_name, $args, $template_path, $default_path );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_locate_template( $template_name, $template_path = '', $default_path = '' ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_locate_template' );
 	return wc_locate_template( $template_name, $template_path, $default_path );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_mail( $to, $subject, $message, $headers = "Content-Type: text/html\r\n", $attachments = "" ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_mail' );
 	wc_mail( $to, $subject, $message, $headers, $attachments );
 }
 
 /**
- * Customer functions (soft deprecated).
- */
-/**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_disable_admin_bar( $show_admin_bar ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_disable_admin_bar' );
 	return wc_disable_admin_bar( $show_admin_bar );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_create_new_customer( $email, $username = '', $password = '' ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_create_new_customer' );
 	return wc_create_new_customer( $email, $username, $password );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_set_customer_auth_cookie( $customer_id ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_set_customer_auth_cookie' );
 	wc_set_customer_auth_cookie( $customer_id );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_update_new_customer_past_orders( $customer_id ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_update_new_customer_past_orders' );
 	return wc_update_new_customer_past_orders( $customer_id );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_paying_customer( $order_id ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_paying_customer' );
 	wc_paying_customer( $order_id );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_customer_bought_product( $customer_email, $user_id, $product_id ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_customer_bought_product' );
 	return wc_customer_bought_product( $customer_email, $user_id, $product_id );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_customer_has_capability( $allcaps, $caps, $args ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_customer_has_capability' );
 	return wc_customer_has_capability( $allcaps, $caps, $args );
 }
 
 /**
- * Formatting functions (soft deprecated).
- */
-/**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_sanitize_taxonomy_name( $taxonomy ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_sanitize_taxonomy_name' );
 	return wc_sanitize_taxonomy_name( $taxonomy );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_get_filename_from_url( $file_url ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_get_filename_from_url' );
 	return wc_get_filename_from_url( $file_url );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_get_dimension( $dim, $to_unit ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_get_dimension' );
 	return wc_get_dimension( $dim, $to_unit );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_get_weight( $weight, $to_unit ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_get_weight' );
 	return wc_get_weight( $weight, $to_unit );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_trim_zeros( $price ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_trim_zeros' );
 	return wc_trim_zeros( $price );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_round_tax_total( $tax ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_round_tax_total' );
 	return wc_round_tax_total( $tax );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_format_decimal( $number, $dp = false, $trim_zeros = false ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_format_decimal' );
 	return wc_format_decimal( $number, $dp, $trim_zeros );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_clean( $var ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_clean' );
 	return wc_clean( $var );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_array_overlay( $a1, $a2 ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_array_overlay' );
 	return wc_array_overlay( $a1, $a2 );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_price( $price, $args = array() ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_price' );
 	return wc_price( $price, $args );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_let_to_num( $size ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_let_to_num' );
 	return wc_let_to_num( $size );
 }
 
 /**
- * @return string
- */
-/**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_date_format() {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_date_format' );
 	return wc_date_format();
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_time_format() {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_time_format' );
 	return wc_time_format();
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_timezone_string() {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_timezone_string' );
 	return wc_timezone_string();
 }
+
 if ( ! function_exists( 'woocommerce_rgb_from_hex' ) ) {
 	/**
-	 * @deprecated
+	 * @deprecated 3.0
 	 */
 	function woocommerce_rgb_from_hex( $color ) {
+		wc_deprecated_function( __FUNCTION__, '3.0', 'wc_rgb_from_hex' );
 		return wc_rgb_from_hex( $color );
 	}
 }
+
 if ( ! function_exists( 'woocommerce_hex_darker' ) ) {
 	/**
-	 * @deprecated
+	 * @deprecated 3.0
 	 */
 	function woocommerce_hex_darker( $color, $factor = 30 ) {
+		wc_deprecated_function( __FUNCTION__, '3.0', 'wc_hex_darker' );
 		return wc_hex_darker( $color, $factor );
 	}
 }
+
 if ( ! function_exists( 'woocommerce_hex_lighter' ) ) {
 	/**
-	 * @deprecated
+	 * @deprecated 3.0
 	 */
 	function woocommerce_hex_lighter( $color, $factor = 30 ) {
+		wc_deprecated_function( __FUNCTION__, '3.0', 'wc_hex_lighter' );
 		return wc_hex_lighter( $color, $factor );
 	}
 }
+
 if ( ! function_exists( 'woocommerce_light_or_dark' ) ) {
 	/**
-	 * @deprecated
+	 * @deprecated 3.0
 	 */
 	function woocommerce_light_or_dark( $color, $dark = '#000000', $light = '#FFFFFF' ) {
+		wc_deprecated_function( __FUNCTION__, '3.0', 'wc_light_or_dark' );
 		return wc_light_or_dark( $color, $dark, $light );
 	}
 }
+
 if ( ! function_exists( 'woocommerce_format_hex' ) ) {
 	/**
-	 * @deprecated
+	 * @deprecated 3.0
 	 */
 	function woocommerce_format_hex( $hex ) {
+		wc_deprecated_function( __FUNCTION__, '3.0', 'wc_format_hex' );
 		return wc_format_hex( $hex );
 	}
 }
 
 /**
- * Order functions (soft deprecated).
- */
-/**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_get_order_id_by_order_key( $order_key ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_get_order_id_by_order_key' );
 	return wc_get_order_id_by_order_key( $order_key );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_downloadable_file_permission( $download_id, $product_id, $order ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_downloadable_file_permission' );
 	return wc_downloadable_file_permission( $download_id, $product_id, $order );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_downloadable_product_permissions( $order_id ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_downloadable_product_permissions' );
 	wc_downloadable_product_permissions( $order_id );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_add_order_item( $order_id, $item ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_add_order_item' );
 	return wc_add_order_item( $order_id, $item );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_delete_order_item( $item_id ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_delete_order_item' );
 	return wc_delete_order_item( $item_id );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_update_order_item_meta( $item_id, $meta_key, $meta_value, $prev_value = '' ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_update_order_item_meta' );
 	return wc_update_order_item_meta( $item_id, $meta_key, $meta_value, $prev_value );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_add_order_item_meta( $item_id, $meta_key, $meta_value, $unique = false ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_add_order_item_meta' );
 	return wc_add_order_item_meta( $item_id, $meta_key, $meta_value, $unique );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_delete_order_item_meta( $item_id, $meta_key, $meta_value = '', $delete_all = false ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_delete_order_item_meta' );
 	return wc_delete_order_item_meta( $item_id, $meta_key, $meta_value, $delete_all );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_get_order_item_meta( $item_id, $key, $single = true ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_get_order_item_meta' );
 	return wc_get_order_item_meta( $item_id, $key, $single );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_cancel_unpaid_orders() {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_cancel_unpaid_orders' );
 	wc_cancel_unpaid_orders();
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_processing_order_count() {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_processing_order_count' );
 	return wc_processing_order_count();
 }
 
 /**
- * Page functions (soft deprecated).
- */
-/**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_get_page_id( $page ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_get_page_id' );
 	return wc_get_page_id( $page );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_get_endpoint_url( $endpoint, $value = '', $permalink = '' ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_get_endpoint_url' );
 	return wc_get_endpoint_url( $endpoint, $value, $permalink );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_lostpassword_url( $url ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_lostpassword_url' );
 	return wc_lostpassword_url( $url );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_customer_edit_account_url() {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_customer_edit_account_url' );
 	return wc_customer_edit_account_url();
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_nav_menu_items( $items, $args ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_nav_menu_items' );
 	return wc_nav_menu_items( $items );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_nav_menu_item_classes( $menu_items, $args ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_nav_menu_item_classes' );
 	return wc_nav_menu_item_classes( $menu_items );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_list_pages( $pages ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_list_pages' );
 	return wc_list_pages( $pages );
 }
 
 /**
- * Handle renamed filters.
- */
-global $wc_map_deprecated_filters;
-
-$wc_map_deprecated_filters = array(
-	'woocommerce_add_to_cart_fragments' => 'add_to_cart_fragments',
-	'woocommerce_add_to_cart_redirect'  => 'add_to_cart_redirect'
-);
-
-foreach ( $wc_map_deprecated_filters as $new => $old ) {
-	add_filter( $new, 'woocommerce_deprecated_filter_mapping' );
-}
-
-function woocommerce_deprecated_filter_mapping( $data, $arg_1 = '', $arg_2 = '', $arg_3 = '' ) {
-	global $wc_map_deprecated_filters;
-
-	$filter = current_filter();
-
-	if ( isset( $wc_map_deprecated_filters[ $filter ] ) ) {
-		if ( has_filter( $wc_map_deprecated_filters[ $filter ] ) ) {
-			$data = apply_filters( $wc_map_deprecated_filters[ $filter ], $data, $arg_1, $arg_2, $arg_3 );
-			if ( ! is_ajax() ) {
-				_deprecated_function( 'The ' . $wc_map_deprecated_filters[ $filter ] . ' filter', '', $filter );
-			}
-		}
-	}
-
-	return $data;
-}
-
-/**
- * Alias functions/soft-deprecated function names (moving from woocommerce_ to wc_). These will be deprecated with notices in future updates.
- */
-
-/**
- * Attribute functions - soft deprecated.
- */
-/**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_product_dropdown_categories( $args = array(), $deprecated_hierarchical = 1, $deprecated_show_uncategorized = 1, $deprecated_orderby = '' ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_product_dropdown_categories' );
 	return wc_product_dropdown_categories( $args, $deprecated_hierarchical, $deprecated_show_uncategorized, $deprecated_orderby );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_walk_category_dropdown_tree( $a1 = '', $a2 = '', $a3 = '' ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_walk_category_dropdown_tree' );
 	return wc_walk_category_dropdown_tree( $a1, $a2, $a3 );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_taxonomy_metadata_wpdbfix() {
-	return wc_taxonomy_metadata_wpdbfix();
+	wc_deprecated_function( __FUNCTION__, '3.0' );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
+ */
+function wc_taxonomy_metadata_wpdbfix() {
+	wc_deprecated_function( __FUNCTION__, '3.0' );
+}
+
+/**
+ * @deprecated 3.0
  */
 function woocommerce_order_terms( $the_term, $next_id, $taxonomy, $index = 0, $terms = null ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_reorder_terms' );
 	return wc_reorder_terms( $the_term, $next_id, $taxonomy, $index, $terms );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_set_term_order( $term_id, $index, $taxonomy, $recursive = false ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_set_term_order' );
 	return wc_set_term_order( $term_id, $index, $taxonomy, $recursive );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_terms_clauses( $clauses, $taxonomies, $args ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_terms_clauses' );
 	return wc_terms_clauses( $clauses, $taxonomies, $args );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function _woocommerce_term_recount( $terms, $taxonomy, $callback, $terms_are_term_taxonomy_ids ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', '_wc_term_recount' );
 	return _wc_term_recount( $terms, $taxonomy, $callback, $terms_are_term_taxonomy_ids );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_recount_after_stock_change( $product_id ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_recount_after_stock_change' );
 	return wc_recount_after_stock_change( $product_id );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_change_term_counts( $terms, $taxonomies, $args ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_change_term_counts' );
 	return wc_change_term_counts( $terms, $taxonomies );
 }
 
 /**
- * Product functions - soft deprecated.
- */
-/**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_get_product_ids_on_sale() {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_get_product_ids_on_sale' );
 	return wc_get_product_ids_on_sale();
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_get_featured_product_ids() {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_get_featured_product_ids' );
 	return wc_get_featured_product_ids();
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_get_product_terms( $object_id, $taxonomy, $fields = 'all' ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_get_product_terms' );
 	return wc_get_product_terms( $object_id, $taxonomy, array( 'fields' => $fields ) );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_product_post_type_link( $permalink, $post ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_product_post_type_link' );
 	return wc_product_post_type_link( $permalink, $post );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_placeholder_img_src() {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_placeholder_img_src' );
 	return wc_placeholder_img_src();
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_placeholder_img( $size = 'shop_thumbnail' ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_placeholder_img' );
 	return wc_placeholder_img( $size );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_get_formatted_variation( $variation = '', $flat = false ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_get_formatted_variation' );
 	return wc_get_formatted_variation( $variation, $flat );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_scheduled_sales() {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_scheduled_sales' );
 	return wc_scheduled_sales();
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_get_attachment_image_attributes( $attr ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_get_attachment_image_attributes' );
 	return wc_get_attachment_image_attributes( $attr );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_prepare_attachment_for_js( $response ) {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_prepare_attachment_for_js' );
 	return wc_prepare_attachment_for_js( $response );
 }
+
 /**
- * @deprecated
+ * @deprecated 3.0
  */
 function woocommerce_track_product_view() {
+	wc_deprecated_function( __FUNCTION__, '3.0', 'wc_track_product_view' );
 	return wc_track_product_view();
 }
 
-/**
- * Shop order status.
- *
- * @since 2.2
- * @param WP_Query $q
- */
-function wc_shop_order_status_backwards_compatibility( $q ) {
-	if ( $q->is_main_query() ) {
-		return;
-	}
-
-	if (
-		isset( $q->query_vars['post_type'] ) && 'shop_order' == $q->query_vars['post_type']
-		&& isset( $q->query_vars['post_status'] ) && 'publish' == $q->query_vars['post_status']
-	) {
-		$tax_query    = isset( $q->query_vars['tax_query'] ) ? $q->query_vars['tax_query'] : array();
-		$order_status = array();
-		$tax_key      = '';
-
-		// Look for shop_order_status taxonomy and get the terms
-		foreach ( $tax_query as $key => $tax ) {
-			if ( 'shop_order_status' == $tax['taxonomy'] ) {
-				$tax_key = $key;
-				$order_status = $tax['terms'];
-				break;
-			}
-		}
-
-		if ( $order_status ) {
-			// Remove old tax_query
-			unset( $tax_query[ $tax_key ] );
-
-			// Set the new order status
-			$order_status = is_array( $order_status ) ? 'wc-' . implode( ',wc-', $order_status ) : 'wc-' . $order_status;
-
-			$q->set( 'post_status', $order_status );
-			$q->set( 'tax_query', $tax_query );
-
-			_doing_it_wrong( 'WP_Query', sprintf( __( 'The shop_order_status taxonomy is no more in WooCommerce 2.2! You should use the new WooCommerce post_status instead, <a href="%s">read more...</a>', 'woocommerce' ), 'https://woocommerce.wordpress.com/2014/08/wc-2-2-order-statuses-plugin-compatibility/' ), 'WooCommerce 2.2' );
-		} else {
-			$q->set( 'post_status', array_keys( wc_get_order_statuses() ) );
-
-			_doing_it_wrong( 'WP_Query', sprintf( __( 'The "publish" order status is no more in WooCommerce 2.2! You should use the new WooCommerce post_status instead, <a href="%s">read more...</a>', 'woocommerce' ), 'https://woocommerce.wordpress.com/2014/08/wc-2-2-order-statuses-plugin-compatibility/' ), 'WooCommerce 2.2' );
-		}
-	}
-}
-
-add_action( 'pre_get_posts', 'wc_shop_order_status_backwards_compatibility' );
-
 /**
  * @since 2.3
  * @deprecated has no replacement
  */
 function woocommerce_compile_less_styles() {
-	_deprecated_function( 'woocommerce_compile_less_styles', '2.3' );
+	wc_deprecated_function( 'woocommerce_compile_less_styles', '2.3' );
+}
+
+/**
+ * woocommerce_calc_shipping was an option used to determine if shipping was enabled prior to version 2.6.0. This has since been replaced with wc_shipping_enabled() function and
+ * the woocommerce_ship_to_countries setting.
+ * @since 2.6.0
+ * @return string
+ */
+function woocommerce_calc_shipping_backwards_compatibility( $value ) {
+	if ( defined( 'WC_UPDATING' ) ) {
+		return $value;
+	}
+	return 'disabled' === get_option( 'woocommerce_ship_to_countries' ) ? 'no' : 'yes';
+}
+add_filter( 'pre_option_woocommerce_calc_shipping', 'woocommerce_calc_shipping_backwards_compatibility' );
+
+/**
+ * @deprecated 3.0.0
+ * @see WC_Structured_Data class
+ *
+ * @return string
+ */
+function woocommerce_get_product_schema() {
+	wc_deprecated_function( 'woocommerce_get_product_schema', '3.0' );
+
+	global $product;
+
+	$schema = "Product";
+
+	// Downloadable product schema handling
+	if ( $product->is_downloadable() ) {
+		switch ( $product->download_type ) {
+			case 'application' :
+				$schema = "SoftwareApplication";
+				break;
+			case 'music' :
+				$schema = "MusicAlbum";
+				break;
+			default :
+				$schema = "Product";
+				break;
+		}
+	}
+
+	return 'http://schema.org/' . $schema;
+}
+
+/**
+ * Save product price.
+ *
+ * This is a private function (internal use ONLY) used until a data manipulation api is built.
+ *
+ * @deprecated 3.0.0
+ * @param int $product_id
+ * @param float $regular_price
+ * @param float $sale_price
+ * @param string $date_from
+ * @param string $date_to
+ */
+function _wc_save_product_price( $product_id, $regular_price, $sale_price = '', $date_from = '', $date_to = '' ) {
+	wc_doing_it_wrong( '_wc_save_product_price()', 'This function is not for developer use and is deprecated.', '3.0' );
+
+	$product_id    = absint( $product_id );
+	$regular_price = wc_format_decimal( $regular_price );
+	$sale_price    = '' === $sale_price ? '' : wc_format_decimal( $sale_price );
+	$date_from     = wc_clean( $date_from );
+	$date_to       = wc_clean( $date_to );
+
+	update_post_meta( $product_id, '_regular_price', $regular_price );
+	update_post_meta( $product_id, '_sale_price', $sale_price );
+
+	// Save Dates
+	update_post_meta( $product_id, '_sale_price_dates_from', $date_from ? strtotime( $date_from ) : '' );
+	update_post_meta( $product_id, '_sale_price_dates_to', $date_to ? strtotime( $date_to ) : '' );
+
+	if ( $date_to && ! $date_from ) {
+		$date_from = strtotime( 'NOW', current_time( 'timestamp' ) );
+		update_post_meta( $product_id, '_sale_price_dates_from', $date_from );
+	}
+
+	// Update price if on sale
+	if ( '' !== $sale_price && '' === $date_to && '' === $date_from ) {
+		update_post_meta( $product_id, '_price', $sale_price );
+	} else {
+		update_post_meta( $product_id, '_price', $regular_price );
+	}
+
+	if ( '' !== $sale_price && $date_from && strtotime( $date_from ) < strtotime( 'NOW', current_time( 'timestamp' ) ) ) {
+		update_post_meta( $product_id, '_price', $sale_price );
+	}
+
+	if ( $date_to && strtotime( $date_to ) < strtotime( 'NOW', current_time( 'timestamp' ) ) ) {
+		update_post_meta( $product_id, '_price', $regular_price );
+		update_post_meta( $product_id, '_sale_price_dates_from', '' );
+		update_post_meta( $product_id, '_sale_price_dates_to', '' );
+	}
 }
diff --git a/includes/wc-formatting-functions.php b/includes/wc-formatting-functions.php
index 43bebc601bc..25e9266f550 100644
--- a/includes/wc-formatting-functions.php
+++ b/includes/wc-formatting-functions.php
@@ -14,6 +14,40 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
 
+/**
+ * Converts a string (e.g. yes or no) to a bool.
+ * @since 3.0.0
+ * @param string $string
+ * @return bool
+ */
+function wc_string_to_bool( $string ) {
+	return is_bool( $string ) ? $string : ( 'yes' === $string || 1 === $string || 'true' === $string || '1' === $string );
+}
+
+/**
+ * Converts a bool to a string.
+ * @since 3.0.0
+ * @param bool $bool
+ * @return string yes or no
+ */
+function wc_bool_to_string( $bool ) {
+	if ( ! is_bool( $bool ) ) {
+		$bool = wc_string_to_bool( $bool );
+	}
+	return true === $bool ? 'yes' : 'no';
+}
+
+/**
+ * Explode a string into an array by $delimiter and remove empty values.
+ * @since 3.0.0
+ * @param string $string
+ * @param string $delimiter
+ * @return array
+ */
+function wc_string_to_array( $string, $delimiter = ',' ) {
+	return is_array( $string ) ? $string : array_filter( explode( $delimiter, $string ) );
+}
+
 /**
  * Sanitize taxonomy names. Slug format (no spaces, lowercase).
  *
@@ -23,7 +57,30 @@ if ( ! defined( 'ABSPATH' ) ) {
  * @return string
  */
 function wc_sanitize_taxonomy_name( $taxonomy ) {
-	return apply_filters( 'sanitize_taxonomy_name', urldecode( sanitize_title( $taxonomy ) ), $taxonomy );
+	return apply_filters( 'sanitize_taxonomy_name', urldecode( sanitize_title( urldecode( $taxonomy ) ) ), $taxonomy );
+}
+
+/**
+ * Sanitize permalink values before insertion into DB.
+ *
+ * Cannot use wc_clean because it sometimes strips % chars and breaks the user's setting.
+ *
+ * @since  2.6.0
+ * @param  string $value
+ * @return string
+ */
+function wc_sanitize_permalink( $value ) {
+	global $wpdb;
+
+	$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
+
+	if ( is_wp_error( $value ) ) {
+		$value = '';
+	}
+
+	$value = esc_url_raw( $value );
+	$value = str_replace( 'http://', '', $value );
+	return untrailingslashit( $value );
 }
 
 /**
@@ -42,96 +99,107 @@ function wc_get_filename_from_url( $file_url ) {
 /**
  * Normalise dimensions, unify to cm then convert to wanted unit value.
  *
- * Usage: wc_get_dimension(55, 'in');
+ * Usage:
+ * wc_get_dimension(55, 'in');
+ * wc_get_dimension(55, 'in', 'm');
  *
- * @param mixed $dim
- * @param mixed $to_unit 'in', 'm', 'cm', 'm'
+ * @param int|float $dimension
+ * @param string $to_unit 'in', 'm', 'cm', 'm'
+ * @param string $from_unit (optional) 'in', 'm', 'cm', 'm'
  * @return float
  */
-function wc_get_dimension( $dim, $to_unit ) {
+function wc_get_dimension( $dimension, $to_unit, $from_unit = '' ) {
+	$to_unit = strtolower( $to_unit );
 
-	$from_unit 	= strtolower( get_option( 'woocommerce_dimension_unit' ) );
-	$to_unit	= strtolower( $to_unit );
+	if ( empty( $from_unit ) ) {
+		$from_unit = strtolower( get_option( 'woocommerce_dimension_unit' ) );
+	}
 
-	// Unify all units to cm first
+	// Unify all units to cm first.
 	if ( $from_unit !== $to_unit ) {
-
 		switch ( $from_unit ) {
-			case 'in':
-				$dim *= 2.54;
-			break;
-			case 'm':
-				$dim *= 100;
-			break;
-			case 'mm':
-				$dim *= 0.1;
-			break;
-			case 'yd':
-				$dim *= 91.44;
-			break;
+			case 'in' :
+				$dimension *= 2.54;
+				break;
+			case 'm' :
+				$dimension *= 100;
+				break;
+			case 'mm' :
+				$dimension *= 0.1;
+				break;
+			case 'yd' :
+				$dimension *= 91.44;
+				break;
 		}
 
-		// Output desired unit
+		// Output desired unit.
 		switch ( $to_unit ) {
-			case 'in':
-				$dim *= 0.3937;
-			break;
-			case 'm':
-				$dim *= 0.01;
-			break;
-			case 'mm':
-				$dim *= 10;
-			break;
-			case 'yd':
-				$dim *= 0.010936133;
-			break;
+			case 'in' :
+				$dimension *= 0.3937;
+				break;
+			case 'm' :
+				$dimension *= 0.01;
+				break;
+			case 'mm' :
+				$dimension *= 10;
+				break;
+			case 'yd' :
+				$dimension *= 0.010936133;
+				break;
 		}
 	}
-	return ( $dim < 0 ) ? 0 : $dim;
+
+	return ( $dimension < 0 ) ? 0 : $dimension;
 }
 
 /**
  * Normalise weights, unify to kg then convert to wanted unit value.
  *
- * Usage: wc_get_weight(55, 'kg');
+ * Usage:
+ * wc_get_weight(55, 'kg');
+ * wc_get_weight(55, 'kg', 'lbs');
  *
- * @param mixed $weight
- * @param mixed $to_unit 'g', 'kg', 'lbs'
+ * @param int|float $weight
+ * @param string $to_unit 'g', 'kg', 'lbs', 'oz'
+ * @param string $from_unit (optional) 'g', 'kg', 'lbs', 'oz'
  * @return float
  */
-function wc_get_weight( $weight, $to_unit ) {
+function wc_get_weight( $weight, $to_unit, $from_unit = '' ) {
+	$weight  = (float) $weight;
+	$to_unit = strtolower( $to_unit );
 
-	$from_unit 	= strtolower( get_option('woocommerce_weight_unit') );
-	$to_unit	= strtolower( $to_unit );
+	if ( empty( $from_unit ) ) {
+		$from_unit = strtolower( get_option( 'woocommerce_weight_unit' ) );
+	}
 
-	//Unify all units to kg first
+	// Unify all units to kg first.
 	if ( $from_unit !== $to_unit ) {
-
 		switch ( $from_unit ) {
-			case 'g':
+			case 'g' :
 				$weight *= 0.001;
-			break;
-			case 'lbs':
+				break;
+			case 'lbs' :
 				$weight *= 0.453592;
-			break;
-			case 'oz':
+				break;
+			case 'oz' :
 				$weight *= 0.0283495;
-			break;
+				break;
 		}
 
-		// Output desired unit
+		// Output desired unit.
 		switch ( $to_unit ) {
-			case 'g':
+			case 'g' :
 				$weight *= 1000;
-			break;
-			case 'lbs':
+				break;
+			case 'lbs' :
 				$weight *= 2.20462;
-			break;
-			case 'oz':
+				break;
+			case 'oz' :
 				$weight *= 35.274;
-			break;
+				break;
 		}
 	}
+
 	return ( $weight < 0 ) ? 0 : $weight;
 }
 
@@ -156,12 +224,12 @@ function wc_round_tax_total( $tax ) {
 
 	// @codeCoverageIgnoreStart
 	if ( version_compare( phpversion(), '5.3', '<' ) ) {
-		$tax = round( $tax, $dp );
+		$rounded_tax = round( $tax, $dp );
 	} else {
 		// @codeCoverageIgnoreEnd
-		$tax = round( $tax, $dp, WC_TAX_ROUNDING_MODE );
+		$rounded_tax = round( $tax, $dp, WC_TAX_ROUNDING_MODE );
 	}
-	return $tax;
+	return apply_filters( 'wc_round_tax_total', $rounded_tax, $tax, $dp, WC_TAX_ROUNDING_MODE );
 }
 
 /**
@@ -179,20 +247,21 @@ function wc_format_refund_total( $amount ) {
  *
  * @param  float|string $number Expects either a float or a string with a decimal separator only (no thousands)
  * @param  mixed $dp number of decimal points to use, blank to use woocommerce_price_num_decimals, or false to avoid all rounding.
- * @param  boolean $trim_zeros from end of string
+ * @param  bool $trim_zeros from end of string
  * @return string
  */
 function wc_format_decimal( $number, $dp = false, $trim_zeros = false ) {
 	$locale   = localeconv();
 	$decimals = array( wc_get_price_decimal_separator(), $locale['decimal_point'], $locale['mon_decimal_point'] );
 
-	// Remove locale from string
+	// Remove locale from string.
 	if ( ! is_float( $number ) ) {
 		$number = wc_clean( str_replace( $decimals, '.', $number ) );
+		$number = preg_replace( '/[^0-9\.,-]/', '', $number );
 	}
 
-	if ( $dp !== false ) {
-		$dp     = intval( $dp == "" ? wc_get_price_decimals() : $dp );
+	if ( false !== $dp ) {
+		$dp     = intval( '' == $dp ? wc_get_price_decimals() : $dp );
 		$number = number_format( floatval( $number ), $dp, '.', '' );
 
 	// DP is false - don't use number format, just return a string in our format
@@ -244,12 +313,38 @@ function wc_format_localized_decimal( $value ) {
 }
 
 /**
- * Clean variables using sanitize_text_field.
+ * Format a coupon code.
+ *
+ * @since  3.0.0
+ * @param  string $value
+ * @return string
+ */
+function wc_format_coupon_code( $value ) {
+	return apply_filters( 'woocommerce_coupon_code', $value );
+}
+
+/**
+ * Clean variables using sanitize_text_field. Arrays are cleaned recursively.
+ * Non-scalar values are ignored.
  * @param string|array $var
  * @return string|array
  */
 function wc_clean( $var ) {
-	return is_array( $var ) ? array_map( 'wc_clean', $var ) : sanitize_text_field( $var );
+	if ( is_array( $var ) ) {
+		return array_map( 'wc_clean', $var );
+	} else {
+		return is_scalar( $var ) ? sanitize_text_field( $var ) : $var;
+	}
+}
+
+/**
+ * Run wc_clean over posted textarea but maintain line breaks.
+ * @since  3.0.0
+ * @param string $var
+ * @return string
+ */
+function wc_sanitize_textarea( $var ) {
+	return implode( "\n", array_map( 'wc_clean', explode( "\n", $var ) ) );
 }
 
 /**
@@ -270,7 +365,7 @@ function wc_sanitize_tooltip( $var ) {
 		'li'     => array(),
 		'ol'     => array(),
 		'p'      => array(),
-    ) ) );
+	) ) );
 }
 
 /**
@@ -336,8 +431,8 @@ function get_woocommerce_price_format() {
  * @return string
  */
 function wc_get_price_thousand_separator() {
-	$separator = stripslashes( get_option( 'woocommerce_price_thousand_sep' ) );
-	return $separator;
+	$separator = apply_filters( 'wc_get_price_thousand_separator', get_option( 'woocommerce_price_thousand_sep' ) );
+	return stripslashes( $separator );
 }
 
 /**
@@ -346,8 +441,8 @@ function wc_get_price_thousand_separator() {
  * @return string
  */
 function wc_get_price_decimal_separator() {
-	$separator = stripslashes( get_option( 'woocommerce_price_decimal_sep' ) );
-	return $separator ? $separator : '.';
+	$separator = apply_filters( 'wc_get_price_decimal_separator', get_option( 'woocommerce_price_decimal_sep' ) );
+	return $separator ? stripslashes( $separator ) : '.';
 }
 
 /**
@@ -356,7 +451,8 @@ function wc_get_price_decimal_separator() {
  * @return int
  */
 function wc_get_price_decimals() {
-	return absint( get_option( 'woocommerce_price_num_decimals', 2 ) );
+	$decimals = apply_filters( 'wc_get_price_decimals', get_option( 'woocommerce_price_num_decimals', 2 ) );
+	return absint( $decimals );
 }
 
 /**
@@ -373,7 +469,7 @@ function wc_price( $price, $args = array() ) {
 		'decimal_separator'  => wc_get_price_decimal_separator(),
 		'thousand_separator' => wc_get_price_thousand_separator(),
 		'decimals'           => wc_get_price_decimals(),
-		'price_format'       => get_woocommerce_price_format()
+		'price_format'       => get_woocommerce_price_format(),
 	) ) ) );
 
 	$negative        = $price < 0;
@@ -384,11 +480,11 @@ function wc_price( $price, $args = array() ) {
 		$price = wc_trim_zeros( $price );
 	}
 
-	$formatted_price = ( $negative ? '-' : '' ) . sprintf( $price_format, get_woocommerce_currency_symbol( $currency ), $price );
-	$return          = '<span class="amount">' . $formatted_price . '</span>';
+	$formatted_price = ( $negative ? '-' : '' ) . sprintf( $price_format, '<span class="woocommerce-Price-currencySymbol">' . get_woocommerce_currency_symbol( $currency ) . '</span>', $price );
+	$return          = '<span class="woocommerce-Price-amount amount">' . $formatted_price . '</span>';
 
 	if ( $ex_tax_label && wc_tax_enabled() ) {
-		$return .= ' <small class="tax_label">' . WC()->countries->ex_tax_or_vat() . '</small>';
+		$return .= ' <small class="woocommerce-Price-taxLabel tax_label">' . WC()->countries->ex_tax_or_vat() . '</small>';
 	}
 
 	return apply_filters( 'wc_price', $return, $price, $args );
@@ -439,13 +535,39 @@ function wc_time_format() {
 }
 
 /**
- * WooCommerce Timezone - helper to retrieve the timezone string for a site until.
- * a WP core method exists (see http://core.trac.wordpress.org/ticket/24730).
+ * Convert mysql datetime to PHP timestamp, forcing UTC. Wrapper for strtotime.
  *
- * Adapted from http://www.php.net/manual/en/function.timezone-name-from-abbr.php#89155.
+ * Based on wcs_strtotime_dark_knight() from WC Subscriptions by Prospress.
+ *
+ * @since  3.0.0
+ * @return int
+ */
+function wc_string_to_timestamp( $time_string, $from_timestamp = null ) {
+	$original_timezone = date_default_timezone_get();
+
+	// @codingStandardsIgnoreStart
+	date_default_timezone_set( 'UTC' );
+
+	if ( null === $from_timestamp ) {
+		$next_timestamp = strtotime( $time_string );
+	} else {
+		$next_timestamp = strtotime( $time_string, $from_timestamp );
+	}
+
+	date_default_timezone_set( $original_timezone );
+	// @codingStandardsIgnoreEnd
+
+	return $next_timestamp;
+}
+
+/**
+ * WooCommerce Timezone - helper to retrieve the timezone string for a site until.
+ * a WP core method exists (see https://core.trac.wordpress.org/ticket/24730).
+ *
+ * Adapted from https://secure.php.net/manual/en/function.timezone-name-from-abbr.php#89155.
  *
  * @since 2.1
- * @return string a valid PHP timezone string for the site
+ * @return string PHP timezone string for the site
  */
 function wc_timezone_string() {
 
@@ -455,7 +577,7 @@ function wc_timezone_string() {
 	}
 
 	// get UTC offset, if it isn't set then return UTC
-	if ( 0 === ( $utc_offset = get_option( 'gmt_offset', 0 ) ) ) {
+	if ( 0 === ( $utc_offset = intval( get_option( 'gmt_offset', 0 ) ) ) ) {
 		return 'UTC';
 	}
 
@@ -463,31 +585,53 @@ function wc_timezone_string() {
 	$utc_offset *= 3600;
 
 	// attempt to guess the timezone string from the UTC offset
-	$timezone = timezone_name_from_abbr( '', $utc_offset, 0 );
-
-	// last try, guess timezone string manually
-	if ( false === $timezone ) {
-		$is_dst = date( 'I' );
-
-		foreach ( timezone_abbreviations_list() as $abbr ) {
-			foreach ( $abbr as $city ) {
-				if ( $city['dst'] == $is_dst && $city['offset'] == $utc_offset ) {
-					return $city['timezone_id'];
-				}
-			}
-		}
-
-		// fallback to UTC
-		return 'UTC';
+	if ( $timezone = timezone_name_from_abbr( '', $utc_offset ) ) {
+		return $timezone;
 	}
 
-	return $timezone;
+	// last try, guess timezone string manually
+	foreach ( timezone_abbreviations_list() as $abbr ) {
+		foreach ( $abbr as $city ) {
+			if ( (bool) date( 'I' ) === (bool) $city['dst'] && $city['timezone_id'] && intval( $city['offset'] ) === $utc_offset ) {
+				return $city['timezone_id'];
+			}
+		}
+	}
+
+	// fallback to UTC
+	return 'UTC';
+}
+
+/**
+ * Get timezone offset in seconds.
+ *
+ * @since  3.0.0
+ * @return float
+ */
+function wc_timezone_offset() {
+	if ( $timezone = get_option( 'timezone_string' ) ) {
+		$timezone_object = new DateTimeZone( $timezone );
+		return $timezone_object->getOffset( new DateTime( 'now' ) );
+	} else {
+		return floatval( get_option( 'gmt_offset', 0 ) ) * HOUR_IN_SECONDS;
+	}
+}
+
+/**
+ * Callback which can flatten post meta (gets the first value if it's an array).
+ *
+ * @since  3.0.0
+ * @param  array $value
+ * @return mixed
+ */
+function wc_flatten_meta_callback( $value ) {
+	return is_array( $value ) ? current( $value ) : $value;
 }
 
 if ( ! function_exists( 'wc_rgb_from_hex' ) ) {
 
 	/**
-	 * Hex darker/lighter/contrast functions for colours.
+	 * Hex darker/lighter/contrast functions for colors.
 	 *
 	 * @param mixed $color
 	 * @return string
@@ -498,9 +642,9 @@ if ( ! function_exists( 'wc_rgb_from_hex' ) ) {
 		$color = preg_replace( '~^(.)(.)(.)$~', '$1$1$2$2$3$3', $color );
 
 		$rgb      = array();
-		$rgb['R'] = hexdec( $color{0}.$color{1} );
-		$rgb['G'] = hexdec( $color{2}.$color{3} );
-		$rgb['B'] = hexdec( $color{4}.$color{5} );
+		$rgb['R'] = hexdec( $color{0} . $color{1} );
+		$rgb['G'] = hexdec( $color{2} . $color{3} );
+		$rgb['B'] = hexdec( $color{4} . $color{5} );
 
 		return $rgb;
 	}
@@ -509,7 +653,7 @@ if ( ! function_exists( 'wc_rgb_from_hex' ) ) {
 if ( ! function_exists( 'wc_hex_darker' ) ) {
 
 	/**
-	 * Hex darker/lighter/contrast functions for colours.
+	 * Hex darker/lighter/contrast functions for colors.
 	 *
 	 * @param mixed $color
 	 * @param int $factor (default: 30)
@@ -538,7 +682,7 @@ if ( ! function_exists( 'wc_hex_darker' ) ) {
 if ( ! function_exists( 'wc_hex_lighter' ) ) {
 
 	/**
-	 * Hex darker/lighter/contrast functions for colours.
+	 * Hex darker/lighter/contrast functions for colors.
 	 *
 	 * @param mixed $color
 	 * @param int $factor (default: 30)
@@ -568,7 +712,7 @@ if ( ! function_exists( 'wc_hex_lighter' ) ) {
 if ( ! function_exists( 'wc_light_or_dark' ) ) {
 
 	/**
-	 * Detect if we should use a light or dark colour on a background colour.
+	 * Detect if we should use a light or dark color on a background color.
 	 *
 	 * @param mixed $color
 	 * @param string $dark (default: '#000000')
@@ -612,19 +756,48 @@ if ( ! function_exists( 'wc_format_hex' ) ) {
 /**
  * Format the postcode according to the country and length of the postcode.
  *
- * @param string postcode
- * @param string country
- * @return string formatted postcode
+ * @param string $postcode
+ * @param string $country
+ * @return string Formatted postcode.
  */
 function wc_format_postcode( $postcode, $country ) {
-	$postcode = strtoupper( trim( $postcode ) );
-	$postcode = trim( preg_replace( '/[\s]/', '', $postcode ) );
+	$postcode = wc_normalize_postcode( $postcode );
 
-	if ( in_array( $country, array( 'GB', 'CA' ) ) ) {
-		$postcode = trim( substr_replace( $postcode, ' ', -3, 0 ) );
+	switch ( $country ) {
+		case 'CA' :
+		case 'GB' :
+			$postcode = trim( substr_replace( $postcode, ' ', -3, 0 ) );
+			break;
+		case 'BR' :
+		case 'PL' :
+			$postcode = substr_replace( $postcode, '-', -3, 0 );
+			break;
+		case 'JP' :
+			$postcode = substr_replace( $postcode, '-', 3, 0 );
+			break;
+		case 'PT' :
+			$postcode = substr_replace( $postcode, '-', 4, 0 );
+			break;
+		case 'US' :
+			$postcode = rtrim( substr_replace( $postcode, '-', 5, 0 ), '-' );
+			break;
 	}
 
-	return $postcode;
+	return apply_filters( 'woocommerce_format_postcode', $postcode, $country );
+}
+
+/**
+ * Normalize postcodes.
+ *
+ * Remove spaces and convert characters to uppercase.
+ *
+ * @since 2.6.0
+ * @param string $postcode
+ * @return string Sanitized postcode.
+ */
+function wc_normalize_postcode( $postcode ) {
+	$postcode = function_exists( 'mb_strtoupper' ) ? mb_strtoupper( $postcode ) : strtoupper( $postcode );
+	return preg_replace( '/[\s\-]/', '', trim( $postcode ) );
 }
 
 /**
@@ -634,8 +807,7 @@ function wc_format_postcode( $postcode, $country ) {
  * @return string
  */
 function wc_format_phone_number( $tel ) {
-	$tel = str_replace( '.', '-', $tel );
-	return $tel;
+	return str_replace( '.', '-', $tel );
 }
 
 /**
@@ -659,7 +831,11 @@ function wc_strtolower( $string ) {
  */
 function wc_trim_string( $string, $chars = 200, $suffix = '...' ) {
 	if ( strlen( $string ) > $chars ) {
-		$string = substr( $string, 0, ( $chars - strlen( $suffix ) ) ) . $suffix;
+		if ( function_exists( 'mb_substr' ) ) {
+			$string = mb_substr( $string, 0, ( $chars - mb_strlen( $suffix ) ) ) . $suffix;
+		} else {
+			$string = substr( $string, 0, ( $chars - strlen( $suffix ) ) ) . $suffix;
+		}
 	}
 	return $string;
 }
@@ -672,7 +848,7 @@ function wc_trim_string( $string, $chars = 200, $suffix = '...' ) {
  * @return string
  */
 function wc_format_content( $raw_string ) {
-	return apply_filters( 'woocommerce_format_content', do_shortcode( shortcode_unautop( wpautop( $raw_string ) ) ), $raw_string );
+	return apply_filters( 'woocommerce_format_content', apply_filters( 'woocommerce_short_description', $raw_string ), $raw_string );
 }
 
 /**
@@ -694,8 +870,6 @@ function wc_format_product_short_description( $content ) {
 	return $content;
 }
 
-add_filter( 'woocommerce_short_description', 'wc_format_product_short_description', 9999999 );
-
 /**
  * Formats curency symbols when saved in settings.
  * @param  string $value
@@ -751,3 +925,170 @@ add_filter( 'woocommerce_admin_settings_sanitize_option_woocommerce_hold_stock_m
 function wc_sanitize_term_text_based( $term ) {
 	return trim( wp_unslash( strip_tags( $term ) ) );
 }
+
+if ( ! function_exists( 'wc_make_numeric_postcode' ) ) {
+	/**
+	 * Make numeric postcode.
+	 *
+	 * Converts letters to numbers so we can do a simple range check on postcodes.
+	 * E.g. PE30 becomes 16050300 (P = 16, E = 05, 3 = 03, 0 = 00)
+	 *
+	 * @since 2.6.0
+	 * @param string $postcode Regular postcode
+	 * @return string
+	 */
+	function wc_make_numeric_postcode( $postcode ) {
+		$postcode           = str_replace( array( ' ', '-' ), '', $postcode );
+		$postcode_length    = strlen( $postcode );
+		$letters_to_numbers = array_merge( array( 0 ), range( 'A', 'Z' ) );
+		$letters_to_numbers = array_flip( $letters_to_numbers );
+		$numeric_postcode   = '';
+
+		for ( $i = 0; $i < $postcode_length; $i ++ ) {
+			if ( is_numeric( $postcode[ $i ] ) ) {
+				$numeric_postcode .= str_pad( $postcode[ $i ], 2, '0', STR_PAD_LEFT );
+			} elseif ( isset( $letters_to_numbers[ $postcode[ $i ] ] ) ) {
+				$numeric_postcode .= str_pad( $letters_to_numbers[ $postcode[ $i ] ], 2, '0', STR_PAD_LEFT );
+			} else {
+				$numeric_postcode .= '00';
+			}
+		}
+
+		return $numeric_postcode;
+	}
+}
+
+/**
+ * Format the stock amount ready for display based on settings.
+ *
+ * @since  3.0.0
+ * @param  WC_Product $product Product object for which the stock you need to format.
+ * @return string
+ */
+function wc_format_stock_for_display( $product ) {
+	$display      = __( 'In stock', 'woocommerce' );
+	$stock_amount = $product->get_stock_quantity();
+
+	switch ( get_option( 'woocommerce_stock_format' ) ) {
+		case 'low_amount' :
+			if ( $stock_amount <= get_option( 'woocommerce_notify_low_stock_amount' ) ) {
+				$display = sprintf( __( 'Only %s left in stock', 'woocommerce' ), wc_format_stock_quantity_for_display( $stock_amount, $product ) );
+			}
+		break;
+		case '' :
+			$display = sprintf( __( '%s in stock', 'woocommerce' ), wc_format_stock_quantity_for_display( $stock_amount, $product ) );
+		break;
+	}
+
+	if ( $product->backorders_allowed() && $product->backorders_require_notification() ) {
+		$display .= ' ' . __( '(can be backordered)', 'woocommerce' );
+	}
+
+	return $display;
+}
+
+/**
+ * Format the stock quantity ready for display.
+ *
+ * @since  3.0.0
+ * @param  int  $stock_quantity
+ * @param  WC_Product $product so that we can pass through the filters.
+ * @return string
+ */
+function wc_format_stock_quantity_for_display( $stock_quantity, $product ) {
+	return apply_filters( 'woocommerce_format_stock_quantity', $stock_quantity, $product );
+}
+
+/**
+ * Format a sale price for display.
+ * @since  3.0.0
+ * @param  string $regular_price
+ * @param  string $sale_price
+ * @return string
+ */
+function wc_format_sale_price( $regular_price, $sale_price ) {
+	$price = '<del>' . ( is_numeric( $regular_price ) ? wc_price( $regular_price ) : $regular_price ) . '</del> <ins>' . ( is_numeric( $sale_price ) ? wc_price( $sale_price ) : $sale_price ) . '</ins>';
+	return apply_filters( 'woocommerce_format_sale_price', $price, $regular_price, $sale_price );
+}
+
+/**
+ * Format a price range for display.
+ * @param  string $from
+ * @param  string $to
+ * @return string
+ */
+function wc_format_price_range( $from, $to ) {
+	$price = sprintf( _x( '%1$s &ndash; %2$s', 'Price range: from-to', 'woocommerce' ), is_numeric( $from ) ? wc_price( $from ) : $from, is_numeric( $to ) ? wc_price( $to ) : $to );
+	return apply_filters( 'woocommerce_format_price_range', $price, $from, $to );
+}
+
+/**
+ * Format a weight for display.
+ *
+ * @since  3.0.0
+ * @param  float $weight Weight.
+ * @return string
+ */
+function wc_format_weight( $weight ) {
+	$weight_string = wc_format_localized_decimal( $weight );
+
+	if ( ! empty( $weight_string ) ) {
+		$weight_string .= ' ' . get_option( 'woocommerce_weight_unit' );
+	} else {
+		$weight_string = __( 'N/A', 'woocommerce' );
+	}
+
+	return apply_filters( 'woocommerce_format_weight', $weight_string, $weight );
+}
+
+/**
+ * Format dimensions for display.
+ *
+ * @since  3.0.0
+ * @param  array $dimensions Array of dimensions.
+ * @return string
+ */
+function wc_format_dimensions( $dimensions ) {
+	$dimension_string = implode( ' x ', array_filter( array_map( 'wc_format_localized_decimal', $dimensions ) ) );
+
+	if ( ! empty( $dimension_string ) ) {
+		$dimension_string .= ' ' . get_option( 'woocommerce_dimension_unit' );
+	} else {
+		$dimension_string = __( 'N/A', 'woocommerce' );
+	}
+
+	return apply_filters( 'woocommerce_format_dimensions', $dimension_string, $dimensions );
+}
+
+/**
+ * Format a date for output.
+ *
+ * @since  3.0.0
+ * @param  WC_DateTime $date
+ * @param  string $format Defaults to the wc_date_format function if not set.
+ * @return string
+ */
+function wc_format_datetime( $date, $format = '' ) {
+	if ( ! $format ) {
+		$format = wc_date_format();
+	}
+	if ( ! is_a( $date, 'WC_DateTime' ) ) {
+		return '';
+	}
+	return $date->date_i18n( $format );
+}
+
+/**
+ * Process oEmbeds.
+ *
+ * @since  3.1.0
+ * @param string $content
+ * @return string
+ */
+function wc_do_oembeds( $content ) {
+	global $wp_embed;
+
+	$content = $wp_embed->autoembed( $content );
+
+	return $content;
+}
diff --git a/includes/wc-notice-functions.php b/includes/wc-notice-functions.php
index 3e687bee52e..1712e0b682a 100644
--- a/includes/wc-notice-functions.php
+++ b/includes/wc-notice-functions.php
@@ -24,23 +24,22 @@ if ( ! defined( 'ABSPATH' ) ) {
  */
 function wc_notice_count( $notice_type = '' ) {
 	if ( ! did_action( 'woocommerce_init' ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'This function should not be called before woocommerce_init.', 'woocommerce' ), '2.3' );
+		wc_doing_it_wrong( __FUNCTION__, __( 'This function should not be called before woocommerce_init.', 'woocommerce' ), '2.3' );
 		return;
 	}
 
 	$notice_count = 0;
 	$all_notices  = WC()->session->get( 'wc_notices', array() );
 
-	if ( isset( $all_notices[$notice_type] ) ) {
+	if ( isset( $all_notices[ $notice_type ] ) ) {
 
-		$notice_count = absint( sizeof( $all_notices[$notice_type] ) );
+		$notice_count = absint( sizeof( $all_notices[ $notice_type ] ) );
 
 	} elseif ( empty( $notice_type ) ) {
 
 		foreach ( $all_notices as $notices ) {
 			$notice_count += absint( sizeof( $all_notices ) );
 		}
-
 	}
 
 	return $notice_count;
@@ -56,7 +55,7 @@ function wc_notice_count( $notice_type = '' ) {
  */
 function wc_has_notice( $message, $notice_type = 'success' ) {
 	if ( ! did_action( 'woocommerce_init' ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'This function should not be called before woocommerce_init.', 'woocommerce' ), '2.3' );
+		wc_doing_it_wrong( __FUNCTION__, __( 'This function should not be called before woocommerce_init.', 'woocommerce' ), '2.3' );
 		return false;
 	}
 
@@ -74,7 +73,7 @@ function wc_has_notice( $message, $notice_type = 'success' ) {
  */
 function wc_add_notice( $message, $notice_type = 'success' ) {
 	if ( ! did_action( 'woocommerce_init' ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'This function should not be called before woocommerce_init.', 'woocommerce' ), '2.3' );
+		wc_doing_it_wrong( __FUNCTION__, __( 'This function should not be called before woocommerce_init.', 'woocommerce' ), '2.3' );
 		return;
 	}
 
@@ -85,11 +84,24 @@ function wc_add_notice( $message, $notice_type = 'success' ) {
 		$message = apply_filters( 'woocommerce_add_message', $message );
 	}
 
-	$notices[$notice_type][] = apply_filters( 'woocommerce_add_' . $notice_type, $message );
+	$notices[ $notice_type ][] = apply_filters( 'woocommerce_add_' . $notice_type, $message );
 
 	WC()->session->set( 'wc_notices', $notices );
 }
 
+/**
+ * Set all notices at once.
+ * @since 2.6.0
+ */
+function wc_set_notices( $notices ) {
+	if ( ! did_action( 'woocommerce_init' ) ) {
+		wc_doing_it_wrong( __FUNCTION__, __( 'This function should not be called before woocommerce_init.', 'woocommerce' ), '2.6' );
+		return;
+	}
+	WC()->session->set( 'wc_notices', $notices );
+}
+
+
 /**
  * Unset all notices.
  *
@@ -97,7 +109,7 @@ function wc_add_notice( $message, $notice_type = 'success' ) {
  */
 function wc_clear_notices() {
 	if ( ! did_action( 'woocommerce_init' ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'This function should not be called before woocommerce_init.', 'woocommerce' ), '2.3' );
+		wc_doing_it_wrong( __FUNCTION__, __( 'This function should not be called before woocommerce_init.', 'woocommerce' ), '2.3' );
 		return;
 	}
 	WC()->session->set( 'wc_notices', null );
@@ -110,7 +122,7 @@ function wc_clear_notices() {
  */
 function wc_print_notices() {
 	if ( ! did_action( 'woocommerce_init' ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'This function should not be called before woocommerce_init.', 'woocommerce' ), '2.3' );
+		wc_doing_it_wrong( __FUNCTION__, __( 'This function should not be called before woocommerce_init.', 'woocommerce' ), '2.3' );
 		return;
 	}
 
@@ -120,7 +132,7 @@ function wc_print_notices() {
 	foreach ( $notice_types as $notice_type ) {
 		if ( wc_notice_count( $notice_type ) > 0 ) {
 			wc_get_template( "notices/{$notice_type}.php", array(
-				'messages' => $all_notices[$notice_type]
+				'messages' => array_filter( $all_notices[ $notice_type ] ),
 			) );
 		}
 	}
@@ -144,7 +156,7 @@ function wc_print_notice( $message, $notice_type = 'success' ) {
 	}
 
 	wc_get_template( "notices/{$notice_type}.php", array(
-		'messages' => array( apply_filters( 'woocommerce_add_' . $notice_type, $message ) )
+		'messages' => array( apply_filters( 'woocommerce_add_' . $notice_type, $message ) ),
 	) );
 }
 
@@ -157,16 +169,16 @@ function wc_print_notice( $message, $notice_type = 'success' ) {
  */
 function wc_get_notices( $notice_type = '' ) {
 	if ( ! did_action( 'woocommerce_init' ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'This function should not be called before woocommerce_init.', 'woocommerce' ), '2.3' );
+		wc_doing_it_wrong( __FUNCTION__, __( 'This function should not be called before woocommerce_init.', 'woocommerce' ), '2.3' );
 		return;
 	}
 
 	$all_notices = WC()->session->get( 'wc_notices', array() );
 
-	if ( empty ( $notice_type ) ) {
+	if ( empty( $notice_type ) ) {
 		$notices = $all_notices;
-	} elseif ( isset( $all_notices[$notice_type] ) ) {
-		$notices = $all_notices[$notice_type];
+	} elseif ( isset( $all_notices[ $notice_type ] ) ) {
+		$notices = $all_notices[ $notice_type ];
 	} else {
 		$notices = array();
 	}
@@ -181,7 +193,7 @@ function wc_get_notices( $notice_type = '' ) {
 function wc_add_wp_error_notices( $errors ) {
 	if ( is_wp_error( $errors ) && $errors->get_error_messages() ) {
 		foreach ( $errors->get_error_messages() as $error ) {
-			wc_add_notice( $error, 'error');
+			wc_add_notice( $error, 'error' );
 		}
 	}
 }
diff --git a/includes/wc-order-functions.php b/includes/wc-order-functions.php
index 9f4516f7d23..f00534164fd 100644
--- a/includes/wc-order-functions.php
+++ b/includes/wc-order-functions.php
@@ -4,27 +4,114 @@
  *
  * Functions for order specific things.
  *
- * @author 		WooThemes
- * @category 	Core
- * @package 	WooCommerce/Functions
- * @version     2.1.0
+ * @author      WooThemes
+ * @category    Core
+ * @package     WooCommerce/Functions
  */
-
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
+}
+
+/**
+ * Wrapper for get_posts specific to orders.
+ *
+ * This function should be used for order retrieval so that when we move to
+ * custom tables, functions still work.
+ *
+ * Args:
+ *      status array|string List of order statuses to find
+ *      type array|string Order type, e.g. shop_order or shop_order_refund
+ *      parent int post/order parent
+ *      customer int|string|array User ID or billing email to limit orders to a
+ *          particular user. Accepts array of values. Array of values is OR'ed. If array of array is passed, each array will be AND'ed.
+ *          e.g. test@test.com, 1, array( 1, 2, 3 ), array( array( 1, 'test@test.com' ), 2, 3 )
+ *      limit int Maximum of orders to retrieve.
+ *      offset int Offset of orders to retrieve.
+ *      page int Page of orders to retrieve. Ignored when using the 'offset' arg.
+ *      date_before string Get orders before a certain date ( strtotime() compatibile string )
+ *      date_after string Get orders after a certain date ( strtotime() compatibile string )
+ *      exclude array Order IDs to exclude from the query.
+ *      orderby string Order by date, title, id, modified, rand etc
+ *      order string ASC or DESC
+ *      return string Type of data to return. Allowed values:
+ *          ids array of order ids
+ *          objects array of order objects (default)
+ *      paginate bool If true, the return value will be an array with values:
+ *          'orders'        => array of data (return value above),
+ *          'total'         => total number of orders matching the query
+ *          'max_num_pages' => max number of pages found
+ *
+ * @since  2.6.0
+ * @param  array $args Array of args (above)
+ * @return array|stdClass Number of pages and an array of order objects if
+ *                             paginate is true, or just an array of values.
+ */
+function wc_get_orders( $args ) {
+	$args = wp_parse_args( $args, array(
+		'status'      => array_keys( wc_get_order_statuses() ),
+		'type'        => wc_get_order_types( 'view-orders' ),
+		'parent'      => null,
+		'customer'    => null,
+		'email'       => '',
+		'limit'       => get_option( 'posts_per_page' ),
+		'offset'      => null,
+		'page'        => 1,
+		'exclude'     => array(),
+		'orderby'     => 'date',
+		'order'       => 'DESC',
+		'return'      => 'objects',
+		'paginate'    => false,
+		'date_before' => '',
+		'date_after'  => '',
+	) );
+
+	// Handle some BW compatibility arg names where wp_query args differ in naming.
+	$map_legacy = array(
+		'numberposts'    => 'limit',
+		'post_type'      => 'type',
+		'post_status'    => 'status',
+		'post_parent'    => 'parent',
+		'author'         => 'customer',
+		'posts_per_page' => 'limit',
+		'paged'          => 'page',
+	);
+
+	foreach ( $map_legacy as $from => $to ) {
+		if ( isset( $args[ $from ] ) ) {
+			$args[ $to ] = $args[ $from ];
+		}
+	}
+
+	return WC_Data_Store::load( 'order' )->get_orders( $args );
+}
+
+/**
+ * Main function for returning orders, uses the WC_Order_Factory class.
+ *
+ * @since  2.2
+ * @param  mixed $the_order Post object or post ID of the order.
+ * @return WC_Order|WC_Refund
+ */
+function wc_get_order( $the_order = false ) {
+	if ( ! did_action( 'woocommerce_after_register_post_type' ) ) {
+		wc_doing_it_wrong( __FUNCTION__, __( 'wc_get_order should not be called before post types are registered (woocommerce_after_register_post_type action).', 'woocommerce' ), '2.5' );
+		return false;
+	}
+	return WC()->order_factory->get_order( $the_order );
 }
 
 /**
  * Get all order statuses.
  *
  * @since 2.2
+ * @used-by WC_Order::set_status
  * @return array
  */
 function wc_get_order_statuses() {
 	$order_statuses = array(
-		'wc-pending'    => _x( 'Pending Payment', 'Order status', 'woocommerce' ),
+		'wc-pending'    => _x( 'Pending payment', 'Order status', 'woocommerce' ),
 		'wc-processing' => _x( 'Processing', 'Order status', 'woocommerce' ),
-		'wc-on-hold'    => _x( 'On Hold', 'Order status', 'woocommerce' ),
+		'wc-on-hold'    => _x( 'On hold', 'Order status', 'woocommerce' ),
 		'wc-completed'  => _x( 'Completed', 'Order status', 'woocommerce' ),
 		'wc-cancelled'  => _x( 'Cancelled', 'Order status', 'woocommerce' ),
 		'wc-refunded'   => _x( 'Refunded', 'Order status', 'woocommerce' ),
@@ -44,14 +131,12 @@ function wc_is_order_status( $maybe_status ) {
 }
 
 /**
- * Main function for returning orders, uses the WC_Order_Factory class.
- *
- * @since  2.2
- * @param  mixed $the_order Post object or post ID of the order.
- * @return WC_Order
+ * Get list of statuses which are consider 'paid'.
+ * @since  3.0.0
+ * @return array
  */
-function wc_get_order( $the_order = false ) {
-	return WC()->order_factory->get_order( $the_order );
+function wc_get_is_paid_statuses() {
+	return apply_filters( 'woocommerce_order_is_paid_statuses', array( 'processing', 'completed' ) );
 }
 
 /**
@@ -65,30 +150,24 @@ function wc_get_order_status_name( $status ) {
 	$statuses = wc_get_order_statuses();
 	$status   = 'wc-' === substr( $status, 0, 3 ) ? substr( $status, 3 ) : $status;
 	$status   = isset( $statuses[ 'wc-' . $status ] ) ? $statuses[ 'wc-' . $status ] : $status;
-
 	return $status;
 }
 
 /**
  * Finds an Order ID based on an order key.
  *
- * @access public
  * @param string $order_key An order key has generated by
  * @return int The ID of an order, or 0 if the order could not be found
  */
 function wc_get_order_id_by_order_key( $order_key ) {
-	global $wpdb;
-
-	// Faster than get_posts()
-	$order_id = $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM {$wpdb->prefix}postmeta WHERE meta_key = '_order_key' AND meta_value = %s", $order_key ) );
-
-	return $order_id;
+	$data_store = WC_Data_Store::load( 'order' );
+	return $data_store->get_order_id_by_order_key( $order_key );
 }
 
 /**
  * Get all registered order types.
  *
- * $for optionally define what you are getting order types for so only relevent types are returned.
+ * $for optionally define what you are getting order types for so only relevant types are returned.
  *
  * e.g. for 'order-meta-boxes', 'order-count'
  *
@@ -178,14 +257,14 @@ function wc_get_order_type( $type ) {
  * post types are types of orders, and having them treated as such.
  *
  * $args are passed to register_post_type, but there are a few specific to this function:
- * 		- exclude_from_orders_screen (bool) Whether or not this order type also get shown in the main.
- * 		orders screen.
- * 		- add_order_meta_boxes (bool) Whether or not the order type gets shop_order meta boxes.
- * 		- exclude_from_order_count (bool) Whether or not this order type is excluded from counts.
- * 		- exclude_from_order_views (bool) Whether or not this order type is visible by customers when.
- * 		viewing orders e.g. on the my account page.
- * 		- exclude_from_order_reports (bool) Whether or not to exclude this type from core reports.
- * 		- exclude_from_order_sales_reports (bool) Whether or not to exclude this type from core sales reports.
+ *      - exclude_from_orders_screen (bool) Whether or not this order type also get shown in the main.
+ *      orders screen.
+ *      - add_order_meta_boxes (bool) Whether or not the order type gets shop_order meta boxes.
+ *      - exclude_from_order_count (bool) Whether or not this order type is excluded from counts.
+ *      - exclude_from_order_views (bool) Whether or not this order type is visible by customers when.
+ *      viewing orders e.g. on the my account page.
+ *      - exclude_from_order_reports (bool) Whether or not to exclude this type from core reports.
+ *      - exclude_from_order_sales_reports (bool) Whether or not to exclude this type from core sales reports.
  *
  * @since  2.2
  * @see    register_post_type for $args used in that function
@@ -218,7 +297,7 @@ function wc_register_order_type( $type, $args = array() ) {
 		'exclude_from_order_webhooks'      => false,
 		'exclude_from_order_reports'       => false,
 		'exclude_from_order_sales_reports' => false,
-		'class_name'                       => 'WC_Order'
+		'class_name'                       => 'WC_Order',
 	);
 
 	$args                    = array_intersect_key( $args, $order_type_args );
@@ -228,293 +307,6 @@ function wc_register_order_type( $type, $args = array() ) {
 	return true;
 }
 
-/**
- * Grant downloadable product access to the file identified by $download_id.
- *
- * @access public
- * @param string $download_id file identifier
- * @param int $product_id product identifier
- * @param WC_Order $order the order
- * @param  int $qty purchased
- * @return int|bool insert id or false on failure
- */
-function wc_downloadable_file_permission( $download_id, $product_id, $order, $qty = 1 ) {
-	global $wpdb;
-
-	$user_email = sanitize_email( $order->billing_email );
-	$limit      = trim( get_post_meta( $product_id, '_download_limit', true ) );
-	$expiry     = trim( get_post_meta( $product_id, '_download_expiry', true ) );
-
-	$limit      = empty( $limit ) ? '' : absint( $limit ) * $qty;
-
-	// Default value is NULL in the table schema
-	$expiry     = empty( $expiry ) ? null : absint( $expiry );
-
-	if ( $expiry ) {
-		$order_completed_date = date_i18n( "Y-m-d", strtotime( $order->completed_date ) );
-		$expiry = date_i18n( "Y-m-d", strtotime( $order_completed_date . ' + ' . $expiry . ' DAY' ) );
-	}
-
-	$data = apply_filters( 'woocommerce_downloadable_file_permission_data', array(
-		'download_id'			=> $download_id,
-		'product_id' 			=> $product_id,
-		'user_id' 				=> absint( $order->user_id ),
-		'user_email' 			=> $user_email,
-		'order_id' 				=> $order->id,
-		'order_key' 			=> $order->order_key,
-		'downloads_remaining' 	=> $limit,
-		'access_granted'		=> current_time( 'mysql' ),
-		'download_count'		=> 0
-	));
-
-	$format = apply_filters( 'woocommerce_downloadable_file_permission_format', array(
-		'%s',
-		'%s',
-		'%s',
-		'%s',
-		'%s',
-		'%s',
-		'%s',
-		'%s',
-		'%d'
-	), $data);
-
-	if ( ! is_null( $expiry ) ) {
-			$data['access_expires'] = $expiry;
-			$format[] = '%s';
-	}
-
-	// Downloadable product - give access to the customer
-	$result = $wpdb->insert( $wpdb->prefix . 'woocommerce_downloadable_product_permissions',
-		$data,
-		$format
-	);
-
-	do_action( 'woocommerce_grant_product_download_access', $data );
-
-	return $result ? $wpdb->insert_id : false;
-}
-
-/**
- * Order Status completed - GIVE DOWNLOADABLE PRODUCT ACCESS TO CUSTOMER.
- *
- * @access public
- * @param int $order_id
- */
-function wc_downloadable_product_permissions( $order_id ) {
-	if ( get_post_meta( $order_id, '_download_permissions_granted', true ) == 1 ) {
-		return; // Only do this once
-	}
-
-	$order = wc_get_order( $order_id );
-
-	if ( $order && $order->has_status( 'processing' ) && get_option( 'woocommerce_downloads_grant_access_after_payment' ) == 'no' ) {
-		return;
-	}
-
-	if ( sizeof( $order->get_items() ) > 0 ) {
-		foreach ( $order->get_items() as $item ) {
-			$_product = $order->get_product_from_item( $item );
-
-			if ( $_product && $_product->exists() && $_product->is_downloadable() ) {
-				$downloads = $_product->get_files();
-
-				foreach ( array_keys( $downloads ) as $download_id ) {
-					wc_downloadable_file_permission( $download_id, $item['variation_id'] > 0 ? $item['variation_id'] : $item['product_id'], $order, $item['qty'] );
-				}
-			}
-		}
-	}
-
-	update_post_meta( $order_id, '_download_permissions_granted', 1 );
-
-	do_action( 'woocommerce_grant_product_download_permissions', $order_id );
-}
-add_action( 'woocommerce_order_status_completed', 'wc_downloadable_product_permissions' );
-add_action( 'woocommerce_order_status_processing', 'wc_downloadable_product_permissions' );
-
-
-/**
- * Add a item to an order (for example a line item).
- *
- * @access public
- * @param int $order_id
- * @return mixed
- */
-function wc_add_order_item( $order_id, $item ) {
-	global $wpdb;
-
-	$order_id = absint( $order_id );
-
-	if ( ! $order_id )
-		return false;
-
-	$defaults = array(
-		'order_item_name' 		=> '',
-		'order_item_type' 		=> 'line_item',
-	);
-
-	$item = wp_parse_args( $item, $defaults );
-
-	$wpdb->insert(
-		$wpdb->prefix . "woocommerce_order_items",
-		array(
-			'order_item_name' 		=> $item['order_item_name'],
-			'order_item_type' 		=> $item['order_item_type'],
-			'order_id'				=> $order_id
-		),
-		array(
-			'%s', '%s', '%d'
-		)
-	);
-
-	$item_id = absint( $wpdb->insert_id );
-
-	do_action( 'woocommerce_new_order_item', $item_id, $item, $order_id );
-
-	return $item_id;
-}
-
-/**
- * Update an item for an order.
- *
- * @since 2.2
- * @param int $item_id
- * @param array $args either `order_item_type` or `order_item_name`
- * @return bool true if successfully updated, false otherwise
- */
-function wc_update_order_item( $item_id, $args ) {
-	global $wpdb;
-
-	$update = $wpdb->update( $wpdb->prefix . 'woocommerce_order_items', $args, array( 'order_item_id' => $item_id ) );
-
-	if ( false === $update ) {
-		return false;
-	}
-
-	do_action( 'woocommerce_update_order_item', $item_id, $args );
-
-	return true;
-}
-
-/**
- * Delete an item from the order it belongs to based on item id.
- *
- * @access public
- * @param int $item_id
- * @return bool
- */
-function wc_delete_order_item( $item_id ) {
-	global $wpdb;
-
-	$item_id = absint( $item_id );
-
-	if ( ! $item_id )
-		return false;
-
-	do_action( 'woocommerce_before_delete_order_item', $item_id );
-
-	$wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->prefix}woocommerce_order_items WHERE order_item_id = %d", $item_id ) );
-	$wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->prefix}woocommerce_order_itemmeta WHERE order_item_id = %d", $item_id ) );
-
-	do_action( 'woocommerce_delete_order_item', $item_id );
-
-	return true;
-}
-
-/**
- * WooCommerce Order Item Meta API - Update term meta.
- *
- * @access public
- * @param mixed $item_id
- * @param mixed $meta_key
- * @param mixed $meta_value
- * @param string $prev_value (default: '')
- * @return bool
- */
-function wc_update_order_item_meta( $item_id, $meta_key, $meta_value, $prev_value = '' ) {
-	return update_metadata( 'order_item', $item_id, $meta_key, $meta_value, $prev_value );
-}
-
-/**
- * WooCommerce Order Item Meta API - Add term meta.
- *
- * @access public
- * @param mixed $item_id
- * @param mixed $meta_key
- * @param mixed $meta_value
- * @param bool $unique (default: false)
- * @return bool
- */
-function wc_add_order_item_meta( $item_id, $meta_key, $meta_value, $unique = false ) {
-	return add_metadata( 'order_item', $item_id, $meta_key, $meta_value, $unique );
-}
-
-/**
- * WooCommerce Order Item Meta API - Delete term meta.
- *
- * @access public
- * @param mixed $item_id
- * @param mixed $meta_key
- * @param string $meta_value (default: '')
- * @param bool $delete_all (default: false)
- * @return bool
- */
-function wc_delete_order_item_meta( $item_id, $meta_key, $meta_value = '', $delete_all = false ) {
-	return delete_metadata( 'order_item', $item_id, $meta_key, $meta_value, $delete_all );
-}
-
-/**
- * WooCommerce Order Item Meta API - Get term meta.
- *
- * @access public
- * @param mixed $item_id
- * @param mixed $key
- * @param bool $single (default: true)
- * @return mixed
- */
-function wc_get_order_item_meta( $item_id, $key, $single = true ) {
-	return get_metadata( 'order_item', $item_id, $key, $single );
-}
-
-/**
- * Cancel all unpaid orders after held duration to prevent stock lock for those products.
- *
- * @access public
- */
-function wc_cancel_unpaid_orders() {
-	global $wpdb;
-
-	$held_duration = get_option( 'woocommerce_hold_stock_minutes' );
-
-	if ( $held_duration < 1 || get_option( 'woocommerce_manage_stock' ) != 'yes' )
-		return;
-
-	$date = date( "Y-m-d H:i:s", strtotime( '-' . absint( $held_duration ) . ' MINUTES', current_time( 'timestamp' ) ) );
-
-	$unpaid_orders = $wpdb->get_col( $wpdb->prepare( "
-		SELECT posts.ID
-		FROM {$wpdb->posts} AS posts
-		WHERE 	posts.post_type   IN ('" . implode( "','", wc_get_order_types() ) . "')
-		AND 	posts.post_status = 'wc-pending'
-		AND 	posts.post_modified < %s
-	", $date ) );
-
-	if ( $unpaid_orders ) {
-		foreach ( $unpaid_orders as $unpaid_order ) {
-			$order = wc_get_order( $unpaid_order );
-
-			if ( apply_filters( 'woocommerce_cancel_unpaid_order', 'checkout' === get_post_meta( $unpaid_order, '_created_via', true ), $order ) ) {
-				$order->update_status( 'cancelled', __( 'Unpaid order cancelled - time limit reached.', 'woocommerce' ) );
-			}
-		}
-	}
-
-	wp_clear_scheduled_hook( 'woocommerce_cancel_unpaid_orders' );
-	wp_schedule_single_event( time() + ( absint( $held_duration ) * 60 ), 'woocommerce_cancel_unpaid_orders' );
-}
-add_action( 'woocommerce_cancel_unpaid_orders', 'wc_cancel_unpaid_orders' );
-
 /**
  * Return the count of processing orders.
  *
@@ -528,38 +320,120 @@ function wc_processing_order_count() {
 /**
  * Return the orders count of a specific order status.
  *
- * @access public
  * @param string $status
  * @return int
  */
 function wc_orders_count( $status ) {
-	$count = 0;
-
+	$count          = 0;
+	$status         = 'wc-' . $status;
 	$order_statuses = array_keys( wc_get_order_statuses() );
 
-	if ( ! in_array( 'wc-' . $status, $order_statuses ) ) {
+	if ( ! in_array( $status, $order_statuses ) ) {
 		return 0;
 	}
 
-	foreach ( wc_get_order_types( 'order-count' ) as $type ) {
-		$this_count  = wp_count_posts( $type, 'readable' );
-		$count      += isset( $this_count->{'wc-' . $status} ) ? $this_count->{'wc-' . $status} : 0;
+	$cache_key = WC_Cache_Helper::get_cache_prefix( 'orders' ) . $status;
+	$cached_count = wp_cache_get( $cache_key, 'counts' );
+
+	if ( false !== $cached_count ) {
+		return $cached_count;
 	}
 
+	foreach ( wc_get_order_types( 'order-count' ) as $type ) {
+		$data_store = WC_Data_Store::load( 'shop_order' === $type ? 'order' : $type );
+		if ( $data_store ) {
+			$count += $data_store->get_order_count( $status );
+		}
+	}
+
+	wp_cache_set( $cache_key, $count, 'counts' );
+
 	return $count;
 }
 
+/**
+ * Grant downloadable product access to the file identified by $download_id.
+ *
+ * @param  string $download_id file identifier
+ * @param  int|WC_Product $product
+ * @param  WC_Order $order the order
+ * @param  int $qty purchased
+ * @return int|bool insert id or false on failure
+ */
+function wc_downloadable_file_permission( $download_id, $product, $order, $qty = 1 ) {
+	if ( is_numeric( $product ) ) {
+		$product = wc_get_product( $product );
+	}
+	$download = new WC_Customer_Download();
+	$download->set_download_id( $download_id );
+	$download->set_product_id( $product->get_id() );
+	$download->set_user_id( $order->get_customer_id() );
+	$download->set_order_id( $order->get_id() );
+	$download->set_user_email( $order->get_billing_email() );
+	$download->set_order_key( $order->get_order_key() );
+	$download->set_downloads_remaining( 0 > $product->get_download_limit() ? '' : $product->get_download_limit() * $qty );
+	$download->set_access_granted( current_time( 'timestamp', true ) );
+	$download->set_download_count( 0 );
+
+	$expiry = $product->get_download_expiry();
+
+	if ( $expiry > 0 ) {
+		$from_date = $order->get_date_completed() ? $order->get_date_completed()->format( 'Y-m-d' ) : current_time( 'mysql', true );
+		$download->set_access_expires( strtotime( $from_date . ' + ' . $expiry . ' DAY' ) );
+	}
+
+	return $download->save();
+}
+
+/**
+ * Order Status completed - GIVE DOWNLOADABLE PRODUCT ACCESS TO CUSTOMER.
+ *
+ * @param int $order_id
+ */
+function wc_downloadable_product_permissions( $order_id, $force = false ) {
+	$order = wc_get_order( $order_id );
+
+	if ( ! $order || ( $order->get_data_store()->get_download_permissions_granted( $order ) && ! $force ) ) {
+		return;
+	}
+
+	if ( $order->has_status( 'processing' ) && 'no' === get_option( 'woocommerce_downloads_grant_access_after_payment' ) ) {
+		return;
+	}
+
+	if ( sizeof( $order->get_items() ) > 0 ) {
+		foreach ( $order->get_items() as $item ) {
+			$product = $item->get_product();
+
+			if ( $product && $product->exists() && $product->is_downloadable() ) {
+				$downloads = $product->get_downloads();
+
+				foreach ( array_keys( $downloads ) as $download_id ) {
+					wc_downloadable_file_permission( $download_id, $product, $order, $item->get_quantity() );
+				}
+			}
+		}
+	}
+
+	$order->get_data_store()->set_download_permissions_granted( $order, true );
+	do_action( 'woocommerce_grant_product_download_permissions', $order_id );
+}
+add_action( 'woocommerce_order_status_completed', 'wc_downloadable_product_permissions' );
+add_action( 'woocommerce_order_status_processing', 'wc_downloadable_product_permissions' );
+
 /**
  * Clear all transients cache for order data.
  *
- * @param int $post_id (default: 0)
+ * @param int|WC_Order $order
  */
-function wc_delete_shop_order_transients( $post_id = 0 ) {
-	$post_id             = absint( $post_id );
-	$transients_to_clear = array();
-
-	// Clear report transients
-	$reports = WC_Admin_Reports::get_reports();
+function wc_delete_shop_order_transients( $order = 0 ) {
+	if ( is_numeric( $order ) ) {
+		$order = wc_get_order( $order );
+	}
+	$reports             = WC_Admin_Reports::get_reports();
+	$transients_to_clear = array(
+		'wc_admin_report'
+	);
 
 	foreach ( $reports as $report_group ) {
 		foreach ( $report_group['reports'] as $report_key => $report ) {
@@ -567,21 +441,26 @@ function wc_delete_shop_order_transients( $post_id = 0 ) {
 		}
 	}
 
-	// clear API report transient
-	$transients_to_clear[] = 'wc_admin_report';
-
-	// Clear transients where we have names
-	foreach( $transients_to_clear as $transient ) {
+	foreach ( $transients_to_clear as $transient ) {
 		delete_transient( $transient );
 	}
 
+	// Clear money spent for user associated with order
+	if ( is_a( $order, 'WC_Order' ) ) {
+		$order_id = $order->get_id();
+		delete_user_meta( $order->get_customer_id(), '_money_spent' );
+		delete_user_meta( $order->get_customer_id(), '_order_count' );
+	} else {
+		$order_id = 0;
+	}
+
 	// Increments the transient version to invalidate cache
 	WC_Cache_Helper::get_transient_version( 'orders', true );
 
 	// Do the same for regular cache
 	WC_Cache_Helper::incr_cache_prefix( 'orders' );
 
-	do_action( 'woocommerce_delete_shop_order_transients', $post_id );
+	do_action( 'woocommerce_delete_shop_order_transients', $order_id );
 }
 
 /**
@@ -603,131 +482,195 @@ function wc_ship_to_billing_address_only() {
  */
 function wc_create_refund( $args = array() ) {
 	$default_args = array(
-		'amount'     => '',
-		'reason'     => null,
-		'order_id'   => 0,
-		'refund_id'  => 0,
-		'line_items' => array(),
-		'date'       => current_time( 'mysql', 0 )
+		'amount'         => 0,
+		'reason'         => null,
+		'order_id'       => 0,
+		'refund_id'      => 0,
+		'line_items'     => array(),
+		'refund_payment' => false,
+		'restock_items'  => false,
 	);
 
-	$args        = wp_parse_args( $args, $default_args );
-	$refund_data = array();
+	try {
+		$args = wp_parse_args( $args, $default_args );
 
-	// prevent negative refunds
-	if ( 0 > $args['amount'] ) {
-		$args['amount'] = 0;
-	}
+		if ( ! $order = wc_get_order( $args['order_id'] ) ) {
+			throw new Exception( __( 'Invalid order ID.', 'woocommerce' ) );
+		}
 
-	if ( $args['refund_id'] > 0 ) {
-		$updating          = true;
-		$refund_data['ID'] = $args['refund_id'];
-	} else {
-		$updating                     = false;
-		$refund_data['post_type']     = 'shop_order_refund';
-		$refund_data['post_status']   = 'wc-completed';
-		$refund_data['ping_status']   = 'closed';
-		$refund_data['post_author']   = get_current_user_id() ? get_current_user_id() : 1;
-		$refund_data['post_password'] = uniqid( 'refund_' );
-		$refund_data['post_parent']   = absint( $args['order_id'] );
-		$refund_data['post_title']    = sprintf( __( 'Refund &ndash; %s', 'woocommerce' ), strftime( _x( '%b %d, %Y @ %I:%M %p', 'Order date parsed by strftime', 'woocommerce' ) ) );
-		$refund_data['post_date']     = $args['date'];
-	}
+		$remaining_refund_amount = $order->get_remaining_refund_amount();
+		$remaining_refund_items  = $order->get_remaining_refund_items();
+		$refund_item_count       = 0;
+		$refund                  = new WC_Order_Refund( $args['refund_id'] );
 
-	if ( ! is_null( $args['reason'] ) ) {
-		$refund_data['post_excerpt'] = $args['reason'];
-	}
+		if ( 0 > $args['amount'] || $args['amount'] > $remaining_refund_amount ) {
+			throw new Exception( __( 'Invalid refund amount.', 'woocommerce' ) );
+		}
 
-	if ( $updating ) {
-		$refund_id = wp_update_post( $refund_data );
-	} else {
-		$refund_id = wp_insert_post( apply_filters( 'woocommerce_new_refund_data', $refund_data ), true );
-	}
+		$refund->set_currency( $order->get_currency() );
+		$refund->set_amount( $args['amount'] );
+		$refund->set_parent_id( absint( $args['order_id'] ) );
+		$refund->set_refunded_by( get_current_user_id() ? get_current_user_id() : 1 );
 
-	if ( is_wp_error( $refund_id ) ) {
-		return $refund_id;
-	}
-
-	if ( ! $updating ) {
-		// Default refund meta data
-		update_post_meta( $refund_id, '_refund_amount', wc_format_decimal( $args['amount'] ) );
-
-		// Get refund object
-		$refund = wc_get_order( $refund_id );
-		$order  = wc_get_order( $args['order_id'] );
-
-		// Refund currency is the same used for the parent order
-		update_post_meta( $refund_id, '_order_currency', $order->get_order_currency() );
+		if ( ! is_null( $args['reason'] ) ) {
+			$refund->set_reason( $args['reason'] );
+		}
 
 		// Negative line items
 		if ( sizeof( $args['line_items'] ) > 0 ) {
-			$order_items = $order->get_items( array( 'line_item', 'fee', 'shipping' ) );
+			$items = $order->get_items( array( 'line_item', 'fee', 'shipping' ) );
 
-			foreach ( $args['line_items'] as $refund_item_id => $refund_item ) {
-				if ( isset( $order_items[ $refund_item_id ] ) ) {
-					if ( empty( $refund_item['qty'] ) && empty( $refund_item['refund_total'] ) && empty( $refund_item['refund_tax'] ) ) {
-						continue;
-					}
-
-					// Prevents errors when the order has no taxes
-					if ( ! isset( $refund_item['refund_tax'] ) ) {
-						$refund_item['refund_tax'] = array();
-					}
-
-					switch ( $order_items[ $refund_item_id ]['type'] ) {
-						case 'line_item' :
-							$line_item_args = array(
-								'totals' => array(
-									'subtotal'     => wc_format_refund_total( $refund_item['refund_total'] ),
-									'total'        => wc_format_refund_total( $refund_item['refund_total'] ),
-									'subtotal_tax' => wc_format_refund_total( array_sum( $refund_item['refund_tax'] ) ),
-									'tax'          => wc_format_refund_total( array_sum( $refund_item['refund_tax'] ) ),
-									'tax_data'     => array( 'total' => array_map( 'wc_format_refund_total', $refund_item['refund_tax'] ), 'subtotal' => array_map( 'wc_format_refund_total', $refund_item['refund_tax'] ) )
-								)
-							);
-							$new_item_id = $refund->add_product( $order->get_product_from_item( $order_items[ $refund_item_id ] ), isset( $refund_item['qty'] ) ? $refund_item['qty'] : 0, $line_item_args );
-							wc_add_order_item_meta( $new_item_id, '_refunded_item_id', $refund_item_id );
-						break;
-						case 'shipping' :
-							$shipping        = new stdClass();
-							$shipping->label = $order_items[ $refund_item_id ]['name'];
-							$shipping->id    = $order_items[ $refund_item_id ]['method_id'];
-							$shipping->cost  = wc_format_refund_total( $refund_item['refund_total'] );
-							$shipping->taxes = array_map( 'wc_format_refund_total', $refund_item['refund_tax'] );
-
-							$new_item_id = $refund->add_shipping( $shipping );
-							wc_add_order_item_meta( $new_item_id, '_refunded_item_id', $refund_item_id );
-						break;
-						case 'fee' :
-							$fee            = new stdClass();
-							$fee->name      = $order_items[ $refund_item_id ]['name'];
-							$fee->tax_class = $order_items[ $refund_item_id ]['tax_class'];
-							$fee->taxable   = $fee->tax_class !== '0';
-							$fee->amount    = wc_format_refund_total( $refund_item['refund_total'] );
-							$fee->tax       = wc_format_refund_total( array_sum( $refund_item['refund_tax'] ) );
-							$fee->tax_data  = array_map( 'wc_format_refund_total', $refund_item['refund_tax'] );
-
-							$new_item_id = $refund->add_fee( $fee );
-							wc_add_order_item_meta( $new_item_id, '_refunded_item_id', $refund_item_id );
-						break;
-					}
+			foreach ( $items as $item_id => $item ) {
+				if ( ! isset( $args['line_items'][ $item_id ] ) ) {
+					continue;
 				}
+
+				$qty          = isset( $args['line_items'][ $item_id ]['qty'] ) ? $args['line_items'][ $item_id ]['qty'] : 0;
+				$refund_total = $args['line_items'][ $item_id ]['refund_total'];
+				$refund_tax   = isset( $args['line_items'][ $item_id ]['refund_tax'] ) ? array_filter( (array) $args['line_items'][ $item_id ]['refund_tax'] ) : array();
+
+				if ( empty( $qty ) && empty( $refund_total ) && empty( $args['line_items'][ $item_id ]['refund_tax'] ) ) {
+					continue;
+				}
+
+				$class         = get_class( $item );
+				$refunded_item = new $class( $item );
+				$refunded_item->set_id( 0 );
+				$refunded_item->add_meta_data( '_refunded_item_id', $item_id, true );
+				$refunded_item->set_total( wc_format_refund_total( $refund_total ) );
+				$refunded_item->set_taxes( array( 'total' => array_map( 'wc_format_refund_total', $refund_tax ), 'subtotal' => array_map( 'wc_format_refund_total', $refund_tax ) ) );
+
+				if ( is_callable( array( $refunded_item, 'set_subtotal' ) ) ) {
+					$refunded_item->set_subtotal( wc_format_refund_total( $refund_total ) );
+				}
+
+				if ( is_callable( array( $refunded_item, 'set_quantity' ) ) ) {
+					$refunded_item->set_quantity( $qty * -1 );
+				}
+
+				$refund->add_item( $refunded_item );
+				$refund_item_count += $qty;
 			}
-			$refund->update_taxes();
 		}
 
+		$refund->update_taxes();
 		$refund->calculate_totals( false );
+		$refund->set_total( $args['amount'] * -1 );
 
-		// Set total to total refunded which may vary from order items
-		$refund->set_total( wc_format_decimal( $args['amount'] ) * -1, 'total' );
+		/**
+		 * Action hook to adjust refund before save.
+		 * @since 3.0.0
+		 */
+		do_action( 'woocommerce_create_refund', $refund, $args );
 
-		do_action( 'woocommerce_refund_created', $refund_id, $args );
+		if ( $refund->save() ) {
+			if ( $args['refund_payment'] ) {
+				$result = wc_refund_payment( $order, $refund->get_amount(), $refund->get_reason() );
+
+				if ( is_wp_error( $result ) ) {
+					$refund->delete();
+					return $result;
+				}
+			}
+
+			if ( $args['restock_items'] ) {
+				wc_restock_refunded_items( $order, $args['line_items'] );
+			}
+
+			// Trigger notification emails
+			if ( ( $remaining_refund_amount - $args['amount'] ) > 0 || ( $order->has_free_item() && ( $remaining_refund_items - $refund_item_count ) > 0 ) ) {
+				do_action( 'woocommerce_order_partially_refunded', $order->get_id(), $refund->get_id() );
+			} else {
+				do_action( 'woocommerce_order_fully_refunded', $order->get_id(), $refund->get_id() );
+
+				$parent_status = apply_filters( 'woocommerce_order_fully_refunded_status', 'refunded', $order->get_id(), $refund->get_id() );
+
+				if ( $parent_status ) {
+					$order->update_status( $parent_status );
+				}
+			}
+		}
+
+		do_action( 'woocommerce_refund_created', $refund->get_id(), $args );
+		do_action( 'woocommerce_order_refunded', $order->get_id(), $refund->get_id() );
+
+	} catch ( Exception $e ) {
+		return new WP_Error( 'error', $e->getMessage() );
 	}
 
-	// Clear transients
-	wc_delete_shop_order_transients( $args['order_id'] );
+	return $refund;
+}
 
-	return new WC_Order_Refund( $refund_id );
+/**
+ * Try to refund the payment for an order via the gateway.
+ *
+ * @since 3.0.0
+ * @param WC_Order $order
+ * @param string $amount
+ * @param string $reason
+ * @return bool|WP_Error
+ */
+function wc_refund_payment( $order, $amount, $reason = '' ) {
+	try {
+		if ( ! is_a( $order, 'WC_Order' ) ) {
+			throw new Exception( __( 'Invalid order.', 'woocommerce' ) );
+		}
+
+		$gateway_controller = WC_Payment_Gateways::instance();
+		$all_gateways       = $gateway_controller->payment_gateways();
+		$payment_method     = $order->get_payment_method();
+		$gateway            = isset( $all_gateways[ $payment_method ] ) ? $all_gateways[ $payment_method ] : false;
+
+		if ( ! $gateway ) {
+			throw new Exception( __( 'The payment gateway for this order does not exist.', 'woocommerce' ) );
+		}
+
+		if ( ! $gateway->supports( 'refunds' ) ) {
+			throw new Exception( __( 'The payment gateway for this order does not support automatic refunds.', 'woocommerce' ) );
+		}
+
+		$result = $gateway->process_refund( $order->get_id(), $amount, $reason );
+
+		if ( ! $result ) {
+			throw new Exception( __( 'An error occurred while attempting to create the refund using the payment gateway API.', 'woocommerce' ) );
+		}
+
+		if ( is_wp_error( $result ) ) {
+			throw new Exception( $result->get_error_message() );
+		}
+
+		return true;
+
+	} catch ( Exception $e ) {
+		return new WP_Error( 'error', $e->getMessage() );
+	}
+}
+
+/**
+ * Restock items during refund.
+ *
+ * @since  3.0.0
+ * @param  WC_Order $order
+ * @param  array $refunded_line_items
+ */
+function wc_restock_refunded_items( $order, $refunded_line_items ) {
+	$line_items = $order->get_items();
+
+	foreach ( $line_items as $item_id => $item ) {
+		if ( ! isset( $refunded_line_items[ $item_id ], $refunded_line_items[ $item_id ]['qty'] ) ) {
+			continue;
+		}
+		$product = $item->get_product();
+
+		if ( $product && $product->managing_stock() ) {
+			$old_stock = $product->get_stock_quantity();
+			$new_stock = wc_update_product_stock( $product, $refunded_line_items[ $item_id ]['qty'], 'increase' );
+
+			$order->add_order_note( sprintf( __( 'Item #%1$s stock increased from %2$s to %3$s.', 'woocommerce' ), $product->get_id(), $old_stock, $new_stock ) );
+
+			do_action( 'woocommerce_restock_refunded_item', $product->get_id(), $old_stock, $new_stock, $order, $product );
+		}
+	}
 }
 
 /**
@@ -739,10 +682,7 @@ function wc_create_refund( $args = array() ) {
  */
 function wc_get_tax_class_by_tax_id( $tax_id ) {
 	global $wpdb;
-
-	$tax_class = $wpdb->get_var( $wpdb->prepare( "SELECT tax_rate_class FROM {$wpdb->prefix}woocommerce_tax_rates WHERE tax_rate_id = %d", $tax_id ) );
-
-	return wc_clean( $tax_class );
+	return $wpdb->get_var( $wpdb->prepare( "SELECT tax_rate_class FROM {$wpdb->prefix}woocommerce_tax_rates WHERE tax_rate_id = %d", $tax_id ) );
 }
 
 /**
@@ -764,7 +704,7 @@ function wc_get_payment_gateway_by_order( $order ) {
 		$order    = wc_get_order( $order_id );
 	}
 
-	return isset( $payment_gateways[ $order->payment_method ] ) ? $payment_gateways[ $order->payment_method ] : false;
+	return isset( $payment_gateways[ $order->get_payment_method() ] ) ? $payment_gateways[ $order->get_payment_method() ] : false;
 }
 
 /**
@@ -784,13 +724,137 @@ function wc_order_fully_refunded( $order_id ) {
 	}
 
 	// Create the refund object
-	$refund = wc_create_refund( array(
+	wc_create_refund( array(
 		'amount'     => $max_refund,
-		'reason'     => __( 'Order Fully Refunded', 'woocommerce' ),
+		'reason'     => __( 'Order fully refunded', 'woocommerce' ),
 		'order_id'   => $order_id,
-		'line_items' => array()
+		'line_items' => array(),
 	) );
-
-	wc_delete_shop_order_transients( $order_id );
 }
 add_action( 'woocommerce_order_status_refunded', 'wc_order_fully_refunded' );
+
+/**
+ * Search orders.
+ *
+ * @since  2.6.0
+ * @param  string $term Term to search.
+ * @return array List of orders ID.
+ */
+function wc_order_search( $term ) {
+	$data_store = WC_Data_Store::load( 'order' );
+	return $data_store->search_orders( str_replace( 'Order #', '', wc_clean( $term ) ) );
+}
+
+/**
+ * Update total sales amount for each product within a paid order.
+ *
+ * @since 3.0.0
+ * @param int $order_id
+ */
+function wc_update_total_sales_counts( $order_id ) {
+	$order = wc_get_order( $order_id );
+
+	if ( ! $order || $order->get_data_store()->get_recorded_sales( $order ) ) {
+		return;
+	}
+
+	if ( sizeof( $order->get_items() ) > 0 ) {
+		foreach ( $order->get_items() as $item ) {
+			if ( $product_id = $item->get_product_id() ) {
+				$data_store = WC_Data_Store::load( 'product' );
+				$data_store->update_product_sales( $product_id, absint( $item['qty'] ), 'increase' );
+			}
+		}
+	}
+
+	$order->get_data_store()->set_recorded_sales( $order, true );
+
+	/**
+	 * Called when sales for an order are recorded
+	 *
+	 * @param int $order_id order id
+	 */
+	do_action( 'woocommerce_recorded_sales', $order_id );
+}
+add_action( 'woocommerce_order_status_completed', 'wc_update_total_sales_counts' );
+add_action( 'woocommerce_order_status_processing', 'wc_update_total_sales_counts' );
+add_action( 'woocommerce_order_status_on-hold', 'wc_update_total_sales_counts' );
+
+/**
+ * Update used coupon amount for each coupon within an order.
+ *
+ * @since 3.0.0
+ * @param int $order_id
+ */
+function wc_update_coupon_usage_counts( $order_id ) {
+	if ( ! $order = wc_get_order( $order_id ) ) {
+		return;
+	}
+
+	$has_recorded = $order->get_data_store()->get_recorded_coupon_usage_counts( $order );
+
+	if ( $order->has_status( 'cancelled' ) && $has_recorded ) {
+		$action = 'reduce';
+		$order->get_data_store()->set_recorded_coupon_usage_counts( $order, false );
+	} elseif ( ! $order->has_status( 'cancelled' ) && ! $has_recorded ) {
+		$action = 'increase';
+		$order->get_data_store()->set_recorded_coupon_usage_counts( $order, true );
+	} else {
+		return;
+	}
+
+	if ( sizeof( $order->get_used_coupons() ) > 0 ) {
+		foreach ( $order->get_used_coupons() as $code ) {
+			if ( ! $code ) {
+				continue;
+			}
+
+			$coupon = new WC_Coupon( $code );
+
+			if ( ! $used_by = $order->get_user_id() ) {
+				$used_by = $order->get_billing_email();
+			}
+
+			switch ( $action ) {
+				case 'reduce' :
+					$coupon->decrease_usage_count( $used_by );
+				break;
+				case 'increase' :
+					$coupon->increase_usage_count( $used_by );
+				break;
+			}
+		}
+	}
+}
+add_action( 'woocommerce_order_status_pending', 'wc_update_coupon_usage_counts' );
+add_action( 'woocommerce_order_status_completed', 'wc_update_coupon_usage_counts' );
+add_action( 'woocommerce_order_status_processing', 'wc_update_coupon_usage_counts' );
+add_action( 'woocommerce_order_status_on-hold', 'wc_update_coupon_usage_counts' );
+add_action( 'woocommerce_order_status_cancelled', 'wc_update_coupon_usage_counts' );
+
+/**
+ * Cancel all unpaid orders after held duration to prevent stock lock for those products.
+ */
+function wc_cancel_unpaid_orders() {
+	$held_duration = get_option( 'woocommerce_hold_stock_minutes' );
+
+	if ( $held_duration < 1 || 'yes' !== get_option( 'woocommerce_manage_stock' ) ) {
+		return;
+	}
+
+	$data_store    = WC_Data_Store::load( 'order' );
+	$unpaid_orders = $data_store->get_unpaid_orders( strtotime( '-' . absint( $held_duration ) . ' MINUTES', current_time( 'timestamp' ) ) );
+
+	if ( $unpaid_orders ) {
+		foreach ( $unpaid_orders as $unpaid_order ) {
+			$order = wc_get_order( $unpaid_order );
+
+			if ( apply_filters( 'woocommerce_cancel_unpaid_order', 'checkout' === $order->get_created_via(), $order ) ) {
+				$order->update_status( 'cancelled', __( 'Unpaid order cancelled - time limit reached.', 'woocommerce' ) );
+			}
+		}
+	}
+	wp_clear_scheduled_hook( 'woocommerce_cancel_unpaid_orders' );
+	wp_schedule_single_event( time() + ( absint( $held_duration ) * 60 ), 'woocommerce_cancel_unpaid_orders' );
+}
+add_action( 'woocommerce_cancel_unpaid_orders', 'wc_cancel_unpaid_orders' );
diff --git a/includes/wc-order-item-functions.php b/includes/wc-order-item-functions.php
new file mode 100644
index 00000000000..01677b81f28
--- /dev/null
+++ b/includes/wc-order-item-functions.php
@@ -0,0 +1,172 @@
+<?php
+/**
+ * WooCommerce Order Item Functions
+ *
+ * Functions for order specific things.
+ *
+ * @author      WooThemes
+ * @category    Core
+ * @package     WooCommerce/Functions
+ */
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Add a item to an order (for example a line item).
+ *
+ * @param int $order_id
+ * @param array $item_array
+ * @return int|bool Item ID or false
+ */
+function wc_add_order_item( $order_id, $item_array ) {
+	$order_id = absint( $order_id );
+
+	if ( ! $order_id ) {
+		return false;
+	}
+
+	$defaults = array(
+		'order_item_name' => '',
+		'order_item_type' => 'line_item',
+	);
+
+	$item_array = wp_parse_args( $item_array, $defaults );
+	$data_store = WC_Data_Store::load( 'order-item' );
+	$item_id    = $data_store->add_order_item( $order_id, $item_array );
+	$item       = WC_Order_Factory::get_order_item( $item_id );
+
+	do_action( 'woocommerce_new_order_item', $item_id, $item, $order_id );
+
+	return $item_id;
+}
+
+/**
+ * Update an item for an order.
+ *
+ * @since 2.2
+ * @param int $item_id
+ * @param array $args either `order_item_type` or `order_item_name`
+ * @return bool true if successfully updated, false otherwise
+ */
+function wc_update_order_item( $item_id, $args ) {
+	$data_store = WC_Data_Store::load( 'order-item' );
+	$update     = $data_store->update_order_item( $item_id, $args );
+
+	if ( false === $update ) {
+		return false;
+	}
+
+	do_action( 'woocommerce_update_order_item', $item_id, $args );
+
+	return true;
+}
+
+/**
+ * Delete an item from the order it belongs to based on item id.
+ *
+ * @access public
+ * @param int $item_id
+ * @return bool
+ */
+function wc_delete_order_item( $item_id ) {
+
+	if ( ! $item_id = absint( $item_id ) ) {
+		return false;
+	}
+
+	$data_store = WC_Data_Store::load( 'order-item' );
+
+	do_action( 'woocommerce_before_delete_order_item', $item_id );
+
+	$data_store->delete_order_item( $item_id );
+
+	do_action( 'woocommerce_delete_order_item', $item_id );
+
+	return true;
+}
+
+/**
+ * WooCommerce Order Item Meta API - Update term meta.
+ *
+ * @access public
+ * @param mixed $item_id
+ * @param mixed $meta_key
+ * @param mixed $meta_value
+ * @param string $prev_value (default: '')
+ * @return bool
+ */
+function wc_update_order_item_meta( $item_id, $meta_key, $meta_value, $prev_value = '' ) {
+	$data_store = WC_Data_Store::load( 'order-item' );
+	if ( $data_store->update_metadata( $item_id, $meta_key, $meta_value, $prev_value ) ) {
+		$cache_key = WC_Cache_Helper::get_cache_prefix( 'order-items' ) . 'object_meta_' . $item_id;
+		wp_cache_delete( $cache_key, 'order-items' );
+		return true;
+	}
+	return false;
+}
+
+/**
+ * WooCommerce Order Item Meta API - Add term meta.
+ *
+ * @access public
+ * @param mixed $item_id
+ * @param mixed $meta_key
+ * @param mixed $meta_value
+ * @param bool $unique (default: false)
+ * @return int New row ID or 0
+ */
+function wc_add_order_item_meta( $item_id, $meta_key, $meta_value, $unique = false ) {
+	$data_store = WC_Data_Store::load( 'order-item' );
+	if ( $meta_id = $data_store->add_metadata( $item_id, $meta_key, $meta_value, $unique ) ) {
+		$cache_key = WC_Cache_Helper::get_cache_prefix( 'order-items' ) . 'object_meta_' . $item_id;
+		wp_cache_delete( $cache_key, 'order-items' );
+		return $meta_id;
+	}
+	return 0;
+}
+
+/**
+ * WooCommerce Order Item Meta API - Delete term meta.
+ *
+ * @access public
+ * @param mixed $item_id
+ * @param mixed $meta_key
+ * @param string $meta_value (default: '')
+ * @param bool $delete_all (default: false)
+ * @return bool
+ */
+function wc_delete_order_item_meta( $item_id, $meta_key, $meta_value = '', $delete_all = false ) {
+	$data_store = WC_Data_Store::load( 'order-item' );
+	if ( $data_store->delete_metadata( $item_id, $meta_key, $meta_value, $delete_all ) ) {
+		$cache_key = WC_Cache_Helper::get_cache_prefix( 'order-items' ) . 'object_meta_' . $item_id;
+		wp_cache_delete( $cache_key, 'order-items' );
+		return true;
+	}
+	return false;
+}
+
+/**
+ * WooCommerce Order Item Meta API - Get term meta.
+ *
+ * @access public
+ * @param mixed $item_id
+ * @param mixed $key
+ * @param bool $single (default: true)
+ * @return mixed
+ */
+function wc_get_order_item_meta( $item_id, $key, $single = true ) {
+	$data_store = WC_Data_Store::load( 'order-item' );
+	return $data_store->get_metadata( $item_id, $key, $single );
+}
+
+/**
+ * Get order ID by order item ID.
+ *
+ * @param  int $item_id
+ * @return int
+ */
+function wc_get_order_id_by_order_item_id( $item_id ) {
+	$data_store = WC_Data_Store::load( 'order-item' );
+	return $data_store->get_order_id_by_order_item_id( $item_id );
+}
diff --git a/includes/wc-page-functions.php b/includes/wc-page-functions.php
index f7584641c21..4a8109eb201 100644
--- a/includes/wc-page-functions.php
+++ b/includes/wc-page-functions.php
@@ -4,10 +4,10 @@
  *
  * Functions related to pages and menus.
  *
- * @author 		WooThemes
- * @category 	Core
- * @package 	WooCommerce/Functions
- * @version     2.1.0
+ * @author   WooThemes
+ * @category Core
+ * @package  WooCommerce/Functions
+ * @version  2.6.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -45,18 +45,18 @@ add_filter( 'the_title', 'wc_page_endpoint_title' );
  */
 function wc_get_page_id( $page ) {
 
-	if ( $page == 'pay' || $page == 'thanks' ) {
-		_deprecated_argument( __FUNCTION__, '2.1', 'The "pay" and "thanks" pages are no-longer used - an endpoint is added to the checkout instead. To get a valid link use the WC_Order::get_checkout_payment_url() or WC_Order::get_checkout_order_received_url() methods instead.' );
+	if ( 'pay' == $page || 'thanks' == $page ) {
+		wc_deprecated_argument( __FUNCTION__, '2.1', 'The "pay" and "thanks" pages are no-longer used - an endpoint is added to the checkout instead. To get a valid link use the WC_Order::get_checkout_payment_url() or WC_Order::get_checkout_order_received_url() methods instead.' );
 
 		$page = 'checkout';
 	}
-	if ( $page == 'change_password' || $page == 'edit_address' || $page == 'lost_password' ) {
-		_deprecated_argument( __FUNCTION__, '2.1', 'The "change_password", "edit_address" and "lost_password" pages are no-longer used - an endpoint is added to the my-account instead. To get a valid link use the wc_customer_edit_account_url() function instead.' );
+	if ( 'change_password' === $page || 'edit_address' === $page || 'lost_password' === $page ) {
+		wc_deprecated_argument( __FUNCTION__, '2.1', 'The "change_password", "edit_address" and "lost_password" pages are no-longer used - an endpoint is added to the my-account instead. To get a valid link use the wc_customer_edit_account_url() function instead.' );
 
 		$page = 'myaccount';
 	}
 
-	$page = apply_filters( 'woocommerce_get_' . $page . '_page_id', get_option('woocommerce_' . $page . '_page_id' ) );
+	$page = apply_filters( 'woocommerce_get_' . $page . '_page_id', get_option( 'woocommerce_' . $page . '_page_id' ) );
 
 	return $page ? absint( $page ) : -1;
 }
@@ -69,7 +69,7 @@ function wc_get_page_id( $page ) {
  */
 function wc_get_page_permalink( $page ) {
 	$page_id   = wc_get_page_id( $page );
-	$permalink = $page_id ? get_permalink( $page_id ) : '';
+	$permalink = 0 < $page_id ? get_permalink( $page_id ) : get_home_url();
 	return apply_filters( 'woocommerce_get_' . $page . '_page_permalink', $permalink );
 }
 
@@ -78,15 +78,20 @@ function wc_get_page_permalink( $page ) {
  *
  * Gets the URL for an endpoint, which varies depending on permalink settings.
  *
+ * @param  string $endpoint
+ * @param  string $value
+ * @param  string $permalink
+ *
  * @return string
  */
 function wc_get_endpoint_url( $endpoint, $value = '', $permalink = '' ) {
-	if ( ! $permalink )
+	if ( ! $permalink ) {
 		$permalink = get_permalink();
+	}
 
 	// Map endpoint to options
 	$endpoint = ! empty( WC()->query->query_vars[ $endpoint ] ) ? WC()->query->query_vars[ $endpoint ] : $endpoint;
-	$value    = ( 'edit-address' == $endpoint ) ? wc_edit_address_i18n( $value ) : $value;
+	$value    = ( get_option( 'woocommerce_myaccount_edit_address_endpoint', 'edit-address' ) === $endpoint ) ? wc_edit_address_i18n( $value ) : $value;
 
 	if ( get_option( 'permalink_structure' ) ) {
 		if ( strstr( $permalink, '?' ) ) {
@@ -103,60 +108,6 @@ function wc_get_endpoint_url( $endpoint, $value = '', $permalink = '' ) {
 	return apply_filters( 'woocommerce_get_endpoint_url', $url, $endpoint, $value, $permalink );
 }
 
-/**
- * Get the edit address slug translation.
- *
- * @param  string  $id   Address ID.
- * @param  bool    $flip Flip the array to make it possible to retrieve the values ​​from both sides.
- *
- * @return string        Address slug i18n.
- */
-function wc_edit_address_i18n( $id, $flip = false ) {
-	$slugs = apply_filters( 'woocommerce_edit_address_slugs', array(
-		'billing'  => sanitize_title( _x( 'billing', 'edit-address-slug', 'woocommerce' ) ),
-		'shipping' => sanitize_title( _x( 'shipping', 'edit-address-slug', 'woocommerce' ) )
-	) );
-
-	if ( $flip ) {
-		$slugs = array_flip( $slugs );
-	}
-
-	if ( ! isset( $slugs[ $id ] ) ) {
-		return $id;
-	}
-
-	return $slugs[ $id ];
-}
-
-/**
- * Returns the url to the lost password endpoint url.
- *
- * @access public
- * @param  string $default_url
- * @return string
- */
-function wc_lostpassword_url( $default_url = '' ) {
-	$wc_password_reset_url = wc_get_page_permalink( 'myaccount' );
-
-	if ( false !== $wc_password_reset_url ) {
-    	return wc_get_endpoint_url( 'lost-password', '', $wc_password_reset_url );
-	} else {
-		return $default_url;
-	}
-}
-add_filter( 'lostpassword_url',  'wc_lostpassword_url', 10, 1 );
-
-/**
- * Get the link to the edit account details page.
- *
- * @return string
- */
-function wc_customer_edit_account_url() {
-	$edit_account_url = wc_get_endpoint_url( 'edit-account', '', wc_get_page_permalink( 'myaccount' ) );
-
-	return apply_filters( 'woocommerce_customer_edit_account_url', $edit_account_url );
-}
-
 /**
  * Hide menu items conditionally.
  *
@@ -169,14 +120,16 @@ function wc_nav_menu_items( $items ) {
 
 		if ( ! empty( $customer_logout ) ) {
 			foreach ( $items as $key => $item ) {
-				if ( strstr( $item->url, $customer_logout ) ) {
+				$path = parse_url( $item->url, PHP_URL_PATH );
+				$query = parse_url( $item->url, PHP_URL_QUERY );
+				if ( strstr( $path, $customer_logout ) || strstr( $query, $customer_logout ) ) {
 					unset( $items[ $key ] );
 				}
 			}
 		}
 	}
 
-    return $items;
+	return $items;
 }
 add_filter( 'wp_nav_menu_objects', 'wc_nav_menu_items', 10 );
 
@@ -193,7 +146,7 @@ function wc_nav_menu_item_classes( $menu_items ) {
 		return $menu_items;
 	}
 
-	$shop_page 		= (int) wc_get_page_id('shop');
+	$shop_page 		= (int) wc_get_page_id( 'shop' );
 	$page_for_posts = (int) get_option( 'page_for_posts' );
 
 	foreach ( (array) $menu_items as $key => $menu_item ) {
@@ -202,14 +155,14 @@ function wc_nav_menu_item_classes( $menu_items ) {
 
 		// Unset active class for blog page
 		if ( $page_for_posts == $menu_item->object_id ) {
-			$menu_items[$key]->current = false;
+			$menu_items[ $key ]->current = false;
 
 			if ( in_array( 'current_page_parent', $classes ) ) {
-				unset( $classes[ array_search('current_page_parent', $classes) ] );
+				unset( $classes[ array_search( 'current_page_parent', $classes ) ] );
 			}
 
 			if ( in_array( 'current-menu-item', $classes ) ) {
-				unset( $classes[ array_search('current-menu-item', $classes) ] );
+				unset( $classes[ array_search( 'current-menu-item', $classes ) ] );
 			}
 
 		// Set active state if this is the shop page link
@@ -235,23 +188,28 @@ add_filter( 'wp_nav_menu_objects', 'wc_nav_menu_item_classes', 2 );
 /**
  * Fix active class in wp_list_pages for shop page.
  *
- * https://github.com/woothemes/woocommerce/issues/177.
+ * https://github.com/woocommerce/woocommerce/issues/177.
  *
  * @author Jessor, Peter Sterling
  * @param string $pages
  * @return string
  */
 function wc_list_pages( $pages ) {
-    if (is_woocommerce()) {
-        $pages = str_replace( 'current_page_parent', '', $pages); // remove current_page_parent class from any item
-        $shop_page = 'page-item-' . wc_get_page_id('shop'); // find shop_page_id through woocommerce options
+	if ( is_woocommerce() ) {
+		// Remove current_page_parent class from any item.
+		$pages = str_replace( 'current_page_parent', '', $pages );
+		// Find shop_page_id through woocommerce options.
+		$shop_page = 'page-item-' . wc_get_page_id( 'shop' );
 
-        if (is_shop()) :
-        	$pages = str_replace($shop_page, $shop_page . ' current_page_item', $pages); // add current_page_item class to shop page
-    	else :
-    		$pages = str_replace($shop_page, $shop_page . ' current_page_parent', $pages); // add current_page_parent class to shop page
-    	endif;
-    }
-    return $pages;
+		if ( is_shop() ) {
+			// Add current_page_item class to shop page.
+			$pages = str_replace( $shop_page, $shop_page . ' current_page_item', $pages );
+		} else {
+			// Add current_page_parent class to shop page.
+			$pages = str_replace( $shop_page, $shop_page . ' current_page_parent', $pages );
+		}
+	}
+
+	return $pages;
 }
 add_filter( 'wp_list_pages', 'wc_list_pages' );
diff --git a/includes/wc-product-functions.php b/includes/wc-product-functions.php
index ef3a332a0f3..cc80ebc06c9 100644
--- a/includes/wc-product-functions.php
+++ b/includes/wc-product-functions.php
@@ -1,4 +1,8 @@
 <?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
 /**
  * WooCommerce Product Functions
  *
@@ -7,47 +11,101 @@
  * @author   WooThemes
  * @category Core
  * @package  WooCommerce/Functions
- * @version  2.3.0
+ * @version  3.0.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+/**
+ * Products wrapper for get_posts.
+ *
+ * This function should be used for product retrieval so that we have a data agnostic
+ * way to get a list of products.
+ *
+ * Args:
+ *      status array|string List of statuses to find. Default: any. Options: any, draft, pending, private and publish.
+ *      type array|string Product type, e.g. Default: all. Options: all, simple, external, variable, variation, grouped.
+ *      parent int post/product parent
+ *      sku string Limit result set to products with specific SKU.
+ *      category array Limit result set to products assigned to specific categories by slug
+ *                     e.g. array('hoodie', 'cap', 't-shirt').
+ *      tag array Limit result set to products assigned to specific tags (by slug)
+ *                e.g. array('funky', 'retro', 'designer')
+ *      shipping_class array Limit results set to products in specific shipping classes (by slug)
+ *                           e.g. array('standard', 'next-day')
+ *      limit int Maximum of products to retrieve.
+ *      offset int Offset of products to retrieve.
+ *      page int Page of products to retrieve. Ignored when using the 'offset' arg.
+ *      exclude array Product IDs to exclude from the query.
+ *      orderby string Order by date, title, id, modified, rand etc
+ *      order string ASC or DESC
+ *      return string Type of data to return. Allowed values:
+ *          ids array of Product ids
+ *          objects array of product objects (default)
+ *      paginate bool If true, the return value will be an array with values:
+ *          'products'      => array of data (return value above),
+ *          'total'         => total number of products matching the query
+ *          'max_num_pages' => max number of pages found
+ *
+ * @since  3.0.0
+ * @param  array $args Array of args (above)
+ * @return array|stdClass Number of pages and an array of product objects if
+ *                             paginate is true, or just an array of values.
+ */
+function wc_get_products( $args ) {
+	$args = wp_parse_args( $args, array(
+		'status'         => array( 'draft', 'pending', 'private', 'publish' ),
+		'type'           => array_merge( array_keys( wc_get_product_types() ) ),
+		'parent'         => null,
+		'sku'            => '',
+		'category'       => array(),
+		'tag'            => array(),
+		'limit'          => get_option( 'posts_per_page' ),
+		'offset'         => null,
+		'page'           => 1,
+		'include'        => array(),
+		'exclude'        => array(),
+		'orderby'        => 'date',
+		'order'          => 'DESC',
+		'return'         => 'objects',
+		'paginate'       => false,
+		'shipping_class' => array(),
+	) );
+
+	// Handle some BW compatibility arg names where wp_query args differ in naming.
+	$map_legacy = array(
+		'numberposts'    => 'limit',
+		'post_status'    => 'status',
+		'post_parent'    => 'parent',
+		'posts_per_page' => 'limit',
+		'paged'          => 'page',
+	);
+
+	foreach ( $map_legacy as $from => $to ) {
+		if ( isset( $args[ $from ] ) ) {
+			$args[ $to ] = $args[ $from ];
+		}
+	}
+
+	return WC_Data_Store::load( 'product' )->get_products( $args );
 }
 
 /**
  * Main function for returning products, uses the WC_Product_Factory class.
  *
+ * @since 2.2.0
+ *
  * @param mixed $the_product Post object or post ID of the product.
- * @param array $args (default: array()) Contains all arguments to be used to get this product.
- * @return WC_Product
+ * @param array $deprecated Previously used to pass arguments to the factory, e.g. to force a type.
+ * @return WC_Product|null
  */
-function wc_get_product( $the_product = false, $args = array() ) {
-	return WC()->product_factory->get_product( $the_product, $args );
-}
-
-/**
- * Update a product's stock amount.
- *
- * @param  int $product_id
- * @param  int $new_stock_level
- */
-function wc_update_product_stock( $product_id, $new_stock_level ) {
-	$product = wc_get_product( $product_id );
-
-	if ( ! metadata_exists( 'post', $product_id, '_stock' ) || $product->get_stock_quantity() !== $new_stock_level ) {
-		$product->set_stock( $new_stock_level );
+function wc_get_product( $the_product = false, $deprecated = array() ) {
+	if ( ! did_action( 'woocommerce_init' ) ) {
+		wc_doing_it_wrong( __FUNCTION__, __( 'wc_get_product should not be called before the woocommerce_init action.', 'woocommerce' ), '2.5' );
+		return false;
 	}
-}
-
-/**
- * Update a product's stock status.
- *
- * @param  int $product_id
- * @param  int $status
- */
-function wc_update_product_stock_status( $product_id, $status ) {
-	$product = wc_get_product( $product_id );
-	$product->set_stock_status( $status );
+	if ( ! empty( $deprecated ) ) {
+		wc_deprecated_argument( 'args', '3.0', 'Passing args to wc_get_product is deprecated. If you need to force a type, construct the product class directly.' );
+	}
+	return WC()->product_factory->get_product( $the_product, $deprecated );
 }
 
 /**
@@ -85,25 +143,33 @@ function wc_delete_product_transients( $post_id = 0 ) {
 		'wc_products_onsale',
 		'wc_featured_products',
 		'wc_outofstock_count',
-		'wc_low_stock_count'
+		'wc_low_stock_count',
 	);
 
 	// Transient names that include an ID
 	$post_transient_names = array(
 		'wc_product_children_',
-		'wc_product_total_stock_',
 		'wc_var_prices_',
-		'wc_related_'
+		'wc_related_',
+		'wc_child_has_weight_',
+		'wc_child_has_dimensions_',
 	);
 
 	if ( $post_id > 0 ) {
-		foreach( $post_transient_names as $transient ) {
+		foreach ( $post_transient_names as $transient ) {
 			$transients_to_clear[] = $transient . $post_id;
 		}
+
+		// Does this product have a parent?
+		$product = wc_get_product( $post_id );
+
+		if ( $product && $product->get_parent_id() > 0 ) {
+			wc_delete_product_transients( $product->get_parent_id() );
+		}
 	}
 
 	// Delete transients
-	foreach( $transients_to_clear as $transient ) {
+	foreach ( $transients_to_clear as $transient ) {
 		delete_transient( $transient );
 	}
 
@@ -117,12 +183,9 @@ function wc_delete_product_transients( $post_id = 0 ) {
  * Function that returns an array containing the IDs of the products that are on sale.
  *
  * @since 2.0
- * @access public
  * @return array
  */
 function wc_get_product_ids_on_sale() {
-	global $wpdb;
-
 	// Load from cache
 	$product_ids_on_sale = get_transient( 'wc_products_onsale' );
 
@@ -131,21 +194,9 @@ function wc_get_product_ids_on_sale() {
 		return $product_ids_on_sale;
 	}
 
-	$on_sale_posts = $wpdb->get_results( "
-		SELECT post.ID, post.post_parent FROM `$wpdb->posts` AS post
-		LEFT JOIN `$wpdb->postmeta` AS meta ON post.ID = meta.post_id
-		LEFT JOIN `$wpdb->postmeta` AS meta2 ON post.ID = meta2.post_id
-		WHERE post.post_type IN ( 'product', 'product_variation' )
-			AND post.post_status = 'publish'
-			AND meta.meta_key = '_sale_price'
-			AND meta2.meta_key = '_price'
-			AND CAST( meta.meta_value AS DECIMAL ) >= 0
-			AND CAST( meta.meta_value AS CHAR ) != ''
-			AND CAST( meta.meta_value AS DECIMAL ) = CAST( meta2.meta_value AS DECIMAL )
-		GROUP BY post.ID;
-	" );
-
-	$product_ids_on_sale = array_unique( array_map( 'absint', array_merge( wp_list_pluck( $on_sale_posts, 'ID' ), array_diff( wp_list_pluck( $on_sale_posts, 'post_parent' ), array( 0 ) ) ) ) );
+	$data_store          = WC_Data_Store::load( 'product' );
+	$on_sale_products    = $data_store->get_on_sale_products();
+	$product_ids_on_sale = wp_parse_id_list( array_merge( wp_list_pluck( $on_sale_products, 'id' ), array_diff( wp_list_pluck( $on_sale_products, 'parent_id' ), array( 0 ) ) ) );
 
 	set_transient( 'wc_products_onsale', $product_ids_on_sale, DAY_IN_SECONDS * 30 );
 
@@ -156,36 +207,19 @@ function wc_get_product_ids_on_sale() {
  * Function that returns an array containing the IDs of the featured products.
  *
  * @since 2.1
- * @access public
  * @return array
  */
 function wc_get_featured_product_ids() {
-
 	// Load from cache
 	$featured_product_ids = get_transient( 'wc_featured_products' );
 
 	// Valid cache found
-	if ( false !== $featured_product_ids )
+	if ( false !== $featured_product_ids ) {
 		return $featured_product_ids;
+	}
 
-	$featured = get_posts( array(
-		'post_type'      => array( 'product', 'product_variation' ),
-		'posts_per_page' => -1,
-		'post_status'    => 'publish',
-		'meta_query'     => array(
-			array(
-				'key' 		=> '_visibility',
-				'value' 	=> array('catalog', 'visible'),
-				'compare' 	=> 'IN'
-			),
-			array(
-				'key' 	=> '_featured',
-				'value' => 'yes'
-			)
-		),
-		'fields' => 'id=>parent'
-	) );
-
+	$data_store           = WC_Data_Store::load( 'product' );
+	$featured             = $data_store->get_featured_product_ids();
 	$product_ids          = array_keys( $featured );
 	$parent_ids           = array_values( array_filter( $featured ) );
 	$featured_product_ids = array_unique( array_merge( $product_ids, $parent_ids ) );
@@ -198,33 +232,35 @@ function wc_get_featured_product_ids() {
 /**
  * Filter to allow product_cat in the permalinks for products.
  *
- * @access public
- * @param string $permalink The existing permalink URL.
- * @param WP_Post $post
+ * @param  string  $permalink The existing permalink URL.
+ * @param  WP_Post $post
  * @return string
  */
 function wc_product_post_type_link( $permalink, $post ) {
-	// Abort if post is not a product
-	if ( $post->post_type !== 'product' ) {
+	// Abort if post is not a product.
+	if ( 'product' !== $post->post_type ) {
 		return $permalink;
 	}
 
-	// Abort early if the placeholder rewrite tag isn't in the generated URL
+	// Abort early if the placeholder rewrite tag isn't in the generated URL.
 	if ( false === strpos( $permalink, '%' ) ) {
 		return $permalink;
 	}
 
-	// Get the custom taxonomy terms in use by this post
+	// Get the custom taxonomy terms in use by this post.
 	$terms = get_the_terms( $post->ID, 'product_cat' );
 
 	if ( ! empty( $terms ) ) {
-		usort( $terms, '_usort_terms_by_ID' ); // order by ID
-
+		if ( function_exists( 'wp_list_sort' ) ) {
+			$terms = wp_list_sort( $terms, 'term_id', 'ASC' );
+		} else {
+			usort( $terms, '_usort_terms_by_ID' );
+		}
 		$category_object = apply_filters( 'wc_product_post_type_link_product_cat', $terms[0], $terms, $post );
 		$category_object = get_term( $category_object, 'product_cat' );
 		$product_cat     = $category_object->slug;
 
-		if ( $parent = $category_object->parent ) {
+		if ( $category_object->parent ) {
 			$ancestors = get_ancestors( $category_object->term_id, 'product_cat' );
 			foreach ( $ancestors as $ancestor ) {
 				$ancestor_object = get_term( $ancestor, 'product_cat' );
@@ -245,7 +281,7 @@ function wc_product_post_type_link( $permalink, $post ) {
 		'%second%',
 		'%post_id%',
 		'%category%',
-		'%product_cat%'
+		'%product_cat%',
 	);
 
 	$replace = array(
@@ -257,7 +293,7 @@ function wc_product_post_type_link( $permalink, $post ) {
 		date_i18n( 's', strtotime( $post->post_date ) ),
 		$post->ID,
 		$product_cat,
-		$product_cat
+		$product_cat,
 	);
 
 	$permalink = str_replace( $find, $replace, $permalink );
@@ -286,7 +322,7 @@ function wc_placeholder_img_src() {
 function wc_placeholder_img( $size = 'shop_thumbnail' ) {
 	$dimensions = wc_get_image_size( $size );
 
-	return apply_filters('woocommerce_placeholder_img', '<img src="' . wc_placeholder_img_src() . '" alt="' . esc_attr__( 'Placeholder', 'woocommerce' ) . '" width="' . esc_attr( $dimensions['width'] ) . '" class="woocommerce-placeholder wp-post-image" height="' . esc_attr( $dimensions['height'] ) . '" />', $size, $dimensions );
+	return apply_filters( 'woocommerce_placeholder_img', '<img src="' . wc_placeholder_img_src() . '" alt="' . esc_attr__( 'Placeholder', 'woocommerce' ) . '" width="' . esc_attr( $dimensions['width'] ) . '" class="woocommerce-placeholder wp-post-image" height="' . esc_attr( $dimensions['height'] ) . '" />', $size, $dimensions );
 }
 
 /**
@@ -294,29 +330,46 @@ function wc_placeholder_img( $size = 'shop_thumbnail' ) {
  *
  * Gets a formatted version of variation data or item meta.
  *
- * @access public
- * @param string $variation
+ * @param array|WC_Product_Variation $variation
  * @param bool $flat (default: false)
+ * @param bool $include_names include attribute names/labels
  * @return string
  */
-function wc_get_formatted_variation( $variation, $flat = false ) {
+function wc_get_formatted_variation( $variation, $flat = false, $include_names = true ) {
 	$return = '';
-	if ( is_array( $variation ) ) {
+
+	if ( is_a( $variation, 'WC_Product_Variation' ) ) {
+		$variation_attributes = $variation->get_attributes();
+		$product              = $variation;
+	} else {
+		$product              = false;
+		// Remove attribute_ prefix from names.
+		$variation_attributes = array();
+		if ( is_array( $variation ) ) {
+			foreach ( $variation as $key => $value ) {
+				$variation_attributes[ str_replace( 'attribute_', '', $key ) ] = $value;
+			}
+		}
+	}
+
+	$list_type = $include_names ? 'dl' : 'ul';
+
+	if ( is_array( $variation_attributes ) ) {
 
 		if ( ! $flat ) {
-			$return = '<dl class="variation">';
+			$return = '<' . $list_type . ' class="variation">';
 		}
 
 		$variation_list = array();
 
-		foreach ( $variation as $name => $value ) {
+		foreach ( $variation_attributes as $name => $value ) {
 			if ( ! $value ) {
 				continue;
 			}
 
 			// If this is a term slug, get the term's nice name
-			if ( taxonomy_exists( esc_attr( str_replace( 'attribute_', '', $name ) ) ) ) {
-				$term = get_term_by( 'slug', $value, esc_attr( str_replace( 'attribute_', '', $name ) ) );
+			if ( taxonomy_exists( $name ) ) {
+				$term = get_term_by( 'slug', $value, $name );
 				if ( ! is_wp_error( $term ) && ! empty( $term->name ) ) {
 					$value = $term->name;
 				}
@@ -324,10 +377,18 @@ function wc_get_formatted_variation( $variation, $flat = false ) {
 				$value = ucwords( str_replace( '-', ' ', $value ) );
 			}
 
-			if ( $flat ) {
-				$variation_list[] = wc_attribute_label( str_replace( 'attribute_', '', $name ) ) . ': ' . rawurldecode( $value );
+			if ( $include_names ) {
+				if ( $flat ) {
+					$variation_list[] = wc_attribute_label( $name, $product ) . ': ' . rawurldecode( $value );
+				} else {
+					$variation_list[] = '<dt>' . wc_attribute_label( $name, $product ) . ':</dt><dd>' . rawurldecode( $value ) . '</dd>';
+				}
 			} else {
-				$variation_list[] = '<dt>' . wc_attribute_label( str_replace( 'attribute_', '', $name ) ) . ':</dt><dd>' . rawurldecode( $value ) . '</dd>';
+				if ( $flat ) {
+					$variation_list[] = rawurldecode( $value );
+				} else {
+					$variation_list[] = '<li>' . rawurldecode( $value ) . '</li>';
+				}
 			}
 		}
 
@@ -338,7 +399,7 @@ function wc_get_formatted_variation( $variation, $flat = false ) {
 		}
 
 		if ( ! $flat ) {
-			$return .= '</dl>';
+			$return .= '</' . $list_type . '>';
 		}
 	}
 	return $return;
@@ -346,88 +407,42 @@ function wc_get_formatted_variation( $variation, $flat = false ) {
 
 /**
  * Function which handles the start and end of scheduled sales via cron.
- *
- * @access public
  */
 function wc_scheduled_sales() {
-	global $wpdb;
+	$data_store = WC_Data_Store::load( 'product' );
 
 	// Sales which are due to start
-	$product_ids = $wpdb->get_col( $wpdb->prepare( "
-		SELECT postmeta.post_id FROM {$wpdb->postmeta} as postmeta
-		LEFT JOIN {$wpdb->postmeta} as postmeta_2 ON postmeta.post_id = postmeta_2.post_id
-		LEFT JOIN {$wpdb->postmeta} as postmeta_3 ON postmeta.post_id = postmeta_3.post_id
-		WHERE postmeta.meta_key = '_sale_price_dates_from'
-		AND postmeta_2.meta_key = '_price'
-		AND postmeta_3.meta_key = '_sale_price'
-		AND postmeta.meta_value > 0
-		AND postmeta.meta_value < %s
-		AND postmeta_2.meta_value != postmeta_3.meta_value
-	", current_time( 'timestamp' ) ) );
-
+	$product_ids = $data_store->get_starting_sales();
 	if ( $product_ids ) {
 		foreach ( $product_ids as $product_id ) {
-			$sale_price = get_post_meta( $product_id, '_sale_price', true );
+			$product = wc_get_product( $product_id );
+			$sale_price = $product->get_sale_price();
 
 			if ( $sale_price ) {
-				update_post_meta( $product_id, '_price', $sale_price );
+				$product->set_price( $sale_price );
+				$product->set_date_on_sale_from( '' );
 			} else {
-				// No sale price!
-				update_post_meta( $product_id, '_sale_price_dates_from', '' );
-				update_post_meta( $product_id, '_sale_price_dates_to', '' );
+				$product->set_date_on_sale_to( '' );
+				$product->set_date_on_sale_from( '' );
 			}
 
-			$parent = wp_get_post_parent_id( $product_id );
-
-			// Sync parent
-			if ( $parent ) {
-				// We can force variable product prices to sync up by removing their min price meta
-				delete_post_meta( $parent, '_min_price_variation_id' );
-
-				// Grouped products need syncing via a function
-				$this_product = wc_get_product( $product_id );
-
-				if ( $this_product->is_type( 'simple' ) ) {
-					$this_product->grouped_product_sync();
-				}
-			}
+			$product->save();
 		}
 
 		delete_transient( 'wc_products_onsale' );
 	}
 
 	// Sales which are due to end
-	$product_ids = $wpdb->get_col( $wpdb->prepare( "
-		SELECT postmeta.post_id FROM {$wpdb->postmeta} as postmeta
-		LEFT JOIN {$wpdb->postmeta} as postmeta_2 ON postmeta.post_id = postmeta_2.post_id
-		LEFT JOIN {$wpdb->postmeta} as postmeta_3 ON postmeta.post_id = postmeta_3.post_id
-		WHERE postmeta.meta_key = '_sale_price_dates_to'
-		AND postmeta_2.meta_key = '_price'
-		AND postmeta_3.meta_key = '_regular_price'
-		AND postmeta.meta_value > 0
-		AND postmeta.meta_value < %s
-		AND postmeta_2.meta_value != postmeta_3.meta_value
-	", current_time( 'timestamp' ) ) );
-
+	$product_ids = $data_store->get_ending_sales();
 	if ( $product_ids ) {
 		foreach ( $product_ids as $product_id ) {
-			$regular_price = get_post_meta( $product_id, '_regular_price', true );
-
-			update_post_meta( $product_id, '_price', $regular_price );
-			update_post_meta( $product_id, '_sale_price', '' );
-			update_post_meta( $product_id, '_sale_price_dates_from', '' );
-			update_post_meta( $product_id, '_sale_price_dates_to', '' );
-
-			$parent = wp_get_post_parent_id( $product_id );
-
-			// Sync parent
-			if ( $parent ) {
-				// Grouped products need syncing via a function
-				$this_product = wc_get_product( $product_id );
-				if ( $this_product->is_type( 'simple' ) ) {
-					$this_product->grouped_product_sync();
-				}
-			}
+			$product       = wc_get_product( $product_id );
+			$regular_price = $product->get_regular_price();
+			$product->set_price( $regular_price );
+			$product->set_sale_price( '' );
+			$product->set_date_on_sale_to( '' );
+			$product->set_date_on_sale_from( '' );
+			$product->save();
 		}
 
 		WC_Cache_Helper::get_transient_version( 'product', true );
@@ -437,24 +452,23 @@ function wc_scheduled_sales() {
 add_action( 'woocommerce_scheduled_sales', 'wc_scheduled_sales' );
 
 /**
- * wc_get_attachment_image_attributes function.
+ * Get attachment image attributes.
  *
  * @access public
  * @param array $attr
  * @return array
  */
 function wc_get_attachment_image_attributes( $attr ) {
-	if ( strstr( $attr['src'], 'woocommerce_uploads/' ) ) {
-		$attr['src'] = wc_placeholder_img_src();
+	if ( strstr( $attr['src'][0], 'woocommerce_uploads/' ) ) {
+		$attr['src'][0] = wc_placeholder_img_src();
 	}
-
 	return $attr;
 }
 add_filter( 'wp_get_attachment_image_attributes', 'wc_get_attachment_image_attributes' );
 
 
 /**
- * wc_prepare_attachment_for_js function.
+ * Prepare attachment for JavaScript.
  *
  * @access public
  * @param array $response
@@ -465,7 +479,7 @@ function wc_prepare_attachment_for_js( $response ) {
 	if ( isset( $response['url'] ) && strstr( $response['url'], 'woocommerce_uploads/' ) ) {
 		$response['full']['url'] = wc_placeholder_img_src();
 		if ( isset( $response['sizes'] ) ) {
-			foreach( $response['sizes'] as $size => $value ) {
+			foreach ( $response['sizes'] as $size => $value ) {
 				$response['sizes'][ $size ]['url'] = wc_placeholder_img_src();
 			}
 		}
@@ -485,10 +499,11 @@ function wc_track_product_view() {
 
 	global $post;
 
-	if ( empty( $_COOKIE['woocommerce_recently_viewed'] ) )
+	if ( empty( $_COOKIE['woocommerce_recently_viewed'] ) ) {
 		$viewed_products = array();
-	else
+	} else {
 		$viewed_products = (array) explode( '|', $_COOKIE['woocommerce_recently_viewed'] );
+	}
 
 	if ( ! in_array( $post->ID, $viewed_products ) ) {
 		$viewed_products[] = $post->ID;
@@ -515,7 +530,7 @@ function wc_get_product_types() {
 		'simple'   => __( 'Simple product', 'woocommerce' ),
 		'grouped'  => __( 'Grouped product', 'woocommerce' ),
 		'external' => __( 'External/Affiliate product', 'woocommerce' ),
-		'variable' => __( 'Variable product', 'woocommerce' )
+		'variable' => __( 'Variable product', 'woocommerce' ),
 	) );
 }
 
@@ -524,21 +539,12 @@ function wc_get_product_types() {
  *
  * @since 2.2
  * @param int $product_id
- * @param string $sku Will be slashed to work around https://core.trac.wordpress.org/ticket/27421
+ * @param string $sku
  * @return bool
  */
 function wc_product_has_unique_sku( $product_id, $sku ) {
-	global $wpdb;
-
-	$sku_found = $wpdb->get_var( $wpdb->prepare( "
-		SELECT $wpdb->posts.ID
-		FROM $wpdb->posts
-		LEFT JOIN $wpdb->postmeta ON ( $wpdb->posts.ID = $wpdb->postmeta.post_id )
-		WHERE $wpdb->posts.post_type IN ( 'product', 'product_variation' )
-		AND $wpdb->posts.post_status = 'publish'
-		AND $wpdb->postmeta.meta_key = '_sku' AND $wpdb->postmeta.meta_value = '%s'
-		AND $wpdb->postmeta.post_id <> %d LIMIT 1
-	 ", wp_slash( $sku ), $product_id ) );
+	$data_store = WC_Data_Store::load( 'product' );
+	$sku_found  = $data_store->is_existing_sku( $product_id, $sku );
 
 	if ( apply_filters( 'wc_product_has_unique_sku', $sku_found, $product_id, $sku ) ) {
 		return false;
@@ -547,6 +553,46 @@ function wc_product_has_unique_sku( $product_id, $sku ) {
 	}
 }
 
+/**
+ * Force a unique SKU.
+ *
+ * @since  3.0.0
+ * @param  integer $product_id
+ */
+function wc_product_force_unique_sku( $product_id ) {
+	$product = wc_get_product( $product_id );
+
+	if ( $product && ( $current_sku = $product->get_sku( 'edit' ) ) ) {
+		try {
+			$new_sku = wc_product_generate_unique_sku( $product_id, $current_sku );
+
+			if ( $current_sku !== $new_sku ) {
+				$product->set_sku( $new_sku );
+				$product->save();
+			}
+		} catch ( Exception $e ) {}
+	}
+}
+
+/**
+ * Recursively appends a suffix until a unique SKU is found.
+ *
+ * @since  3.0.0
+ * @param  integer $product_id
+ * @param  string  $sku
+ * @param  integer $index
+ * @return string
+ */
+function wc_product_generate_unique_sku( $product_id, $sku, $index = 0 ) {
+	$generated_sku = 0 < $index ? $sku . '-' . $index : $sku;
+
+	if ( ! wc_product_has_unique_sku( $product_id, $generated_sku ) ) {
+		$generated_sku = wc_product_generate_unique_sku( $product_id, $sku, ( $index + 1 ) );
+	}
+
+	return $generated_sku;
+}
+
 /**
  * Get product ID by SKU.
  *
@@ -557,70 +603,15 @@ function wc_product_has_unique_sku( $product_id, $sku ) {
 function wc_get_product_id_by_sku( $sku ) {
 	global $wpdb;
 
-	$product_id = $wpdb->get_var( $wpdb->prepare( "
-		SELECT posts.ID
-		FROM $wpdb->posts AS posts
-		LEFT JOIN $wpdb->postmeta AS postmeta ON ( posts.ID = postmeta.post_id )
-		WHERE posts.post_type IN ( 'product', 'product_variation' )
-		AND postmeta.meta_key = '_sku' AND postmeta.meta_value = '%s'
-		LIMIT 1
-	 ", $sku ) );
+	$data_store = WC_Data_Store::load( 'product' );
+	$product_id = $data_store->get_product_id_by_sku( $sku );
 
 	return ( $product_id ) ? intval( $product_id ) : 0;
 }
 
-/**
- * Save product price.
- *
- * This is a private function (internal use ONLY) used until a data manipulation api is built.
- *
- * @since 2.4.0
- * @todo  look into Data manipulation API
- *
- * @param int $product_id
- * @param float $regular_price
- * @param float $sale_price
- * @param string $date_from
- * @param string $date_to
- */
-function _wc_save_product_price( $product_id, $regular_price, $sale_price = '', $date_from = '', $date_to = '' ) {
-	$product_id  = absint( $product_id );
-	$regular_price = wc_format_decimal( $regular_price );
-	$sale_price    = $sale_price === '' ? '' : wc_format_decimal( $sale_price );
-	$date_from     = wc_clean( $date_from );
-	$date_to       = wc_clean( $date_to );
-
-	update_post_meta( $product_id, '_regular_price', $regular_price );
-	update_post_meta( $product_id, '_sale_price', $sale_price );
-
-	// Save Dates
-	update_post_meta( $product_id, '_sale_price_dates_from', $date_from ? strtotime( $date_from ) : '' );
-	update_post_meta( $product_id, '_sale_price_dates_to', $date_to ? strtotime( $date_to ) : '' );
-
-	if ( $date_to && ! $date_from ) {
-		update_post_meta( $product_id, '_sale_price_dates_from', strtotime( 'NOW', current_time( 'timestamp' ) ) );
-	}
-
-	// Update price if on sale
-	if ( '' !== $sale_price && '' === $date_to && '' === $date_from ) {
-		update_post_meta( $product_id, '_price', $sale_price );
-	} else {
-		update_post_meta( $product_id, '_price', $regular_price );
-	}
-
-	if ( '' !== $sale_price && $date_from && strtotime( $date_from ) < strtotime( 'NOW', current_time( 'timestamp' ) ) ) {
-		update_post_meta( $product_id, '_price', $sale_price );
-	}
-
-	if ( $date_to && strtotime( $date_to ) < strtotime( 'NOW', current_time( 'timestamp' ) ) ) {
-		update_post_meta( $product_id, '_price', $regular_price );
-		update_post_meta( $product_id, '_sale_price_dates_from', '' );
-		update_post_meta( $product_id, '_sale_price_dates_to', '' );
-	}
-}
-
 /**
  * Get attibutes/data for an individual variation from the database and maintain it's integrity.
+ * @param revisit?
  * @since  2.4.0
  * @param  int $variation_id
  * @return array
@@ -635,10 +626,12 @@ function wc_get_product_variation_attributes( $variation_id ) {
 
 	// Compare to parent variable product attributes and ensure they match
 	foreach ( $parent_attributes as $attribute_name => $options ) {
-		$attribute                 = 'attribute_' . sanitize_title( $attribute_name );
-		$found_parent_attributes[] = $attribute;
-		if ( ! empty( $options['is_variation'] ) && ! array_key_exists( $attribute, $variation_attributes ) ) {
-			$variation_attributes[ $attribute ] = ''; // Add it - 'any' will be asumed
+		if ( ! empty( $options['is_variation'] ) ) {
+			$attribute                 = 'attribute_' . sanitize_title( $attribute_name );
+			$found_parent_attributes[] = $attribute;
+			if ( ! array_key_exists( $attribute, $variation_attributes ) ) {
+				$variation_attributes[ $attribute ] = ''; // Add it - 'any' will be asumed
+			}
 		}
 	}
 
@@ -655,7 +648,7 @@ function wc_get_product_variation_attributes( $variation_id ) {
 		 */
 		if ( sanitize_title( $value[0] ) === $value[0] && version_compare( get_post_meta( $parent_id, '_product_version', true ), '2.4.0', '<' ) ) {
 			foreach ( $parent_attributes as $attribute ) {
-				if ( $name !== 'attribute_' . sanitize_title( $attribute['name'] ) ) {
+				if ( 'attribute_' . sanitize_title( $attribute['name'] ) !== $name ) {
 					continue;
 				}
 				$text_attributes = wc_get_text_attributes( $attribute['value'] );
@@ -682,7 +675,7 @@ function wc_get_product_variation_attributes( $variation_id ) {
  * @return array
  */
 function wc_get_product_cat_ids( $product_id ) {
-	$product_cats = wp_get_post_terms( $product_id, 'product_cat', array( "fields" => "ids" ) );
+	$product_cats = wc_get_product_term_ids( $product_id, 'product_cat' );
 
 	foreach ( $product_cats as $product_cat ) {
 		$product_cats = array_merge( $product_cats, get_ancestors( $product_cat, 'product_cat' ) );
@@ -690,3 +683,486 @@ function wc_get_product_cat_ids( $product_id ) {
 
 	return $product_cats;
 }
+
+/**
+ * Gets data about an attachment, such as alt text and captions.
+ * @since 2.6.0
+ * @param object|bool $product
+ * @return array
+ */
+function wc_get_product_attachment_props( $attachment_id = null, $product = false ) {
+	$props = array(
+		'title'   => '',
+		'caption' => '',
+		'url'     => '',
+		'alt'     => '',
+		'src'     => '',
+		'srcset'  => false,
+		'sizes'   => false,
+	);
+	if ( $attachment = get_post( $attachment_id ) ) {
+		$props['title']   = trim( strip_tags( $attachment->post_title ) );
+		$props['caption'] = trim( strip_tags( $attachment->post_excerpt ) );
+		$props['url']     = wp_get_attachment_url( $attachment_id );
+		$props['alt']     = trim( strip_tags( get_post_meta( $attachment_id, '_wp_attachment_image_alt', true ) ) );
+
+		// Large version.
+		$src                 = wp_get_attachment_image_src( $attachment_id, 'large' );
+		$props['full_src']   = $src[0];
+		$props['full_src_w'] = $src[1];
+		$props['full_src_h'] = $src[2];
+
+		// Thumbnail version.
+		$src                 = wp_get_attachment_image_src( $attachment_id, 'shop_thumbnail' );
+		$props['thumb_src']   = $src[0];
+		$props['thumb_src_w'] = $src[1];
+		$props['thumb_src_h'] = $src[2];
+
+		// Image source.
+		$src             = wp_get_attachment_image_src( $attachment_id, 'shop_single' );
+		$props['src']    = $src[0];
+		$props['src_w']  = $src[1];
+		$props['src_h']  = $src[2];
+		$props['srcset'] = function_exists( 'wp_get_attachment_image_srcset' ) ? wp_get_attachment_image_srcset( $attachment_id, 'shop_single' ) : false;
+		$props['sizes']  = function_exists( 'wp_get_attachment_image_sizes' ) ? wp_get_attachment_image_sizes( $attachment_id, 'shop_single' ) : false;
+
+		// Alt text fallbacks
+		$props['alt'] = empty( $props['alt'] ) ? $props['caption']                                               : $props['alt'];
+		$props['alt'] = empty( $props['alt'] ) ? trim( strip_tags( $attachment->post_title ) )                   : $props['alt'];
+		$props['alt'] = empty( $props['alt'] ) && $product ? trim( strip_tags( get_the_title( $product->ID ) ) ) : $props['alt'];
+	}
+	return $props;
+}
+
+/**
+ * Get product visibility options.
+ *
+ * @since 3.0.0
+ * @return array
+ */
+function wc_get_product_visibility_options() {
+	return apply_filters( 'woocommerce_product_visibility_options', array(
+		'visible' => __( 'Visible', 'woocommerce' ),
+		'catalog' => __( 'Catalog', 'woocommerce' ),
+		'search'  => __( 'Search', 'woocommerce' ),
+		'hidden'  => __( 'Hidden', 'woocommerce' ),
+	) );
+}
+
+/**
+ * Get min/max price meta query args.
+ *
+ * @since 3.0.0
+ * @param array $args Min price and max price arguments.
+ * @return array
+ */
+function wc_get_min_max_price_meta_query( $args ) {
+	$min = isset( $args['min_price'] ) ? floatval( $args['min_price'] ) : 0;
+	$max = isset( $args['max_price'] ) ? floatval( $args['max_price'] ) : 9999999999;
+
+	/**
+	 * Adjust if the store taxes are not displayed how they are stored.
+	 * Max is left alone because the filter was already increased.
+	 * Kicks in when prices excluding tax are displayed including tax.
+	 */
+	if ( wc_tax_enabled() && 'incl' === get_option( 'woocommerce_tax_display_shop' ) && ! wc_prices_include_tax() ) {
+		$tax_classes = array_merge( array( '' ), WC_Tax::get_tax_classes() );
+		$class_min   = $min;
+
+		foreach ( $tax_classes as $tax_class ) {
+			if ( $tax_rates = WC_Tax::get_rates( $tax_class ) ) {
+				$class_min = $min - WC_Tax::get_tax_total( WC_Tax::calc_exclusive_tax( $min, $tax_rates ) );
+			}
+		}
+
+		$min = $class_min;
+	}
+
+	return array(
+		'key'     => '_price',
+		'value'   => array( $min, $max ),
+		'compare' => 'BETWEEN',
+		'type'    => 'DECIMAL',
+	);
+}
+
+/**
+ * Get product tax class options.
+ *
+ * @since 3.0.0
+ * @return array
+ */
+function wc_get_product_tax_class_options() {
+	$tax_classes           = WC_Tax::get_tax_classes();
+	$tax_class_options     = array();
+	$tax_class_options[''] = __( 'Standard', 'woocommerce' );
+
+	if ( ! empty( $tax_classes ) ) {
+		foreach ( $tax_classes as $class ) {
+			$tax_class_options[ sanitize_title( $class ) ] = $class;
+		}
+	}
+	return $tax_class_options;
+}
+
+/**
+ * Get stock status options.
+ *
+ * @since 3.0.0
+ * @return array
+ */
+function wc_get_product_stock_status_options() {
+	return array(
+		'instock'    => __( 'In stock', 'woocommerce' ),
+		'outofstock' => __( 'Out of stock', 'woocommerce' ),
+	);
+}
+
+/**
+ * Get backorder options.
+ *
+ * @since 3.0.0
+ * @return array
+ */
+function wc_get_product_backorder_options() {
+	return array(
+		'no'     => __( 'Do not allow', 'woocommerce' ),
+		'notify' => __( 'Allow, but notify customer', 'woocommerce' ),
+		'yes'    => __( 'Allow', 'woocommerce' ),
+	);
+}
+
+/**
+ * Get related products based on product category and tags.
+ *
+ * @since  3.0.0
+ * @param  int   $product_id  Product ID.
+ * @param  int   $limit       Limit of results.
+ * @param  array $exclude_ids Exclude IDs from the results.
+ * @return array
+ */
+function wc_get_related_products( $product_id, $limit = 5, $exclude_ids = array() ) {
+	global $wpdb;
+
+	$product_id     = absint( $product_id );
+	$exclude_ids    = array_merge( array( 0, $product_id ), $exclude_ids );
+	$transient_name = 'wc_related_' . $product_id;
+	$related_posts  = get_transient( $transient_name );
+	$limit          = $limit > 0 ? $limit : 5;
+
+	// We want to query related posts if they are not cached, or we don't have enough.
+	if ( false === $related_posts || count( $related_posts ) < $limit ) {
+		$cats_array = apply_filters( 'woocommerce_product_related_posts_relate_by_category', true, $product_id ) ? apply_filters( 'woocommerce_get_related_product_cat_terms', wc_get_product_term_ids( $product_id, 'product_cat' ), $product_id ) : array();
+		$tags_array = apply_filters( 'woocommerce_product_related_posts_relate_by_tag', true, $product_id ) ? apply_filters( 'woocommerce_get_related_product_tag_terms', wc_get_product_term_ids( $product_id, 'product_tag' ), $product_id ) : array();
+
+		// Don't bother if none are set, unless woocommerce_product_related_posts_force_display is set to true in which case all products are related.
+		if ( empty( $cats_array ) && empty( $tags_array ) && ! apply_filters( 'woocommerce_product_related_posts_force_display', false, $product_id ) ) {
+			$related_posts = array();
+		} else {
+			$data_store    = WC_Data_Store::load( 'product' );
+			$related_posts = $data_store->get_related_products( $cats_array, $tags_array, $exclude_ids, $limit + 10, $product_id );
+		}
+
+		set_transient( $transient_name, $related_posts, DAY_IN_SECONDS );
+	}
+
+	shuffle( $related_posts );
+
+	return array_slice( $related_posts, 0, $limit );
+}
+
+/**
+ * Retrieves product term ids for a taxonomy.
+ *
+ * @since  3.0.0
+ * @param  int    $product_id Product ID.
+ * @param  string $taxonomy   Taxonomy slug.
+ * @return array
+ */
+function wc_get_product_term_ids( $product_id, $taxonomy ) {
+	$terms = get_the_terms( $product_id, $taxonomy );
+	return ! empty( $terms ) ? wp_list_pluck( $terms, 'term_id' ) : array();
+}
+
+/**
+ * For a given product, and optionally price/qty, work out the price with tax included, based on store settings.
+ * @since  3.0.0
+ * @param  WC_Product $product
+ * @param  array $args
+ * @return float
+ */
+function wc_get_price_including_tax( $product, $args = array() ) {
+	$args = wp_parse_args( $args, array(
+		'qty'   => '',
+		'price' => '',
+	) );
+
+	$price = '' !== $args['price'] ? max( 0.0, (float) $args['price'] ) : $product->get_price();
+	$qty   = '' !== $args['qty'] ? max( 0.0, (float) $args['qty'] ) : 1;
+
+	if ( '' === $price ) {
+		return '';
+	} elseif ( empty( $qty ) ) {
+		return 0.0;
+	}
+
+	$line_price   = $price * $qty;
+	$return_price = $line_price;
+
+	if ( $product->is_taxable() ) {
+		if ( ! wc_prices_include_tax() ) {
+			$tax_rates    = WC_Tax::get_rates( $product->get_tax_class() );
+			$taxes        = WC_Tax::calc_tax( $line_price, $tax_rates, false );
+			$tax_amount   = WC_Tax::get_tax_total( $taxes );
+			$return_price = round( $line_price + $tax_amount, wc_get_price_decimals() );
+		} else {
+			$tax_rates      = WC_Tax::get_rates( $product->get_tax_class() );
+			$base_tax_rates = WC_Tax::get_base_tax_rates( $product->get_tax_class( 'unfiltered' ) );
+
+			/**
+			 * If the customer is excempt from VAT, remove the taxes here.
+			 * Either remove the base or the user taxes depending on woocommerce_adjust_non_base_location_prices setting.
+			 */
+			if ( ! empty( WC()->customer ) && WC()->customer->get_is_vat_exempt() ) {
+				$remove_taxes = apply_filters( 'woocommerce_adjust_non_base_location_prices', true ) ? WC_Tax::calc_tax( $line_price, $base_tax_rates, true ) : WC_Tax::calc_tax( $line_price, $tax_rates, true );
+				$remove_tax   = array_sum( $remove_taxes );
+				$return_price = round( $line_price - $remove_tax, wc_get_price_decimals() );
+
+			/**
+			 * The woocommerce_adjust_non_base_location_prices filter can stop base taxes being taken off when dealing with out of base locations.
+			 * e.g. If a product costs 10 including tax, all users will pay 10 regardless of location and taxes.
+			 * This feature is experimental @since 2.4.7 and may change in the future. Use at your risk.
+			 */
+			} elseif ( $tax_rates !== $base_tax_rates && apply_filters( 'woocommerce_adjust_non_base_location_prices', true ) ) {
+				$base_taxes   = WC_Tax::calc_tax( $line_price, $base_tax_rates, true );
+				$modded_taxes = WC_Tax::calc_tax( $line_price - array_sum( $base_taxes ), $tax_rates, false );
+				$return_price = round( $line_price - array_sum( $base_taxes ) + array_sum( $modded_taxes ), wc_get_price_decimals() );
+			}
+		}
+	}
+	return apply_filters( 'woocommerce_get_price_including_tax', $return_price, $qty, $product );
+}
+
+/**
+ * For a given product, and optionally price/qty, work out the price with tax excluded, based on store settings.
+ * @since  3.0.0
+ * @param  WC_Product $product
+ * @param  array $args
+ * @return float
+ */
+function wc_get_price_excluding_tax( $product, $args = array() ) {
+	$args = wp_parse_args( $args, array(
+		'qty'   => '',
+		'price' => '',
+	) );
+
+	$price = '' !== $args['price'] ? max( 0.0, (float) $args['price'] ) : $product->get_price();
+	$qty   = '' !== $args['qty'] ? max( 0.0, (float) $args['qty'] ) : 1;
+
+	if ( '' === $price ) {
+		return '';
+	} elseif ( empty( $qty ) ) {
+		return 0.0;
+	}
+
+	if ( $product->is_taxable() && wc_prices_include_tax() ) {
+		$tax_rates  = WC_Tax::get_base_tax_rates( $product->get_tax_class( 'unfiltered' ) );
+		$taxes      = WC_Tax::calc_tax( $price * $qty, $tax_rates, true );
+		$price      = WC_Tax::round( $price * $qty - array_sum( $taxes ) );
+	} else {
+		$price = $price * $qty;
+	}
+
+	return apply_filters( 'woocommerce_get_price_excluding_tax', $price, $qty, $product );
+}
+
+/**
+ * Returns the price including or excluding tax, based on the 'woocommerce_tax_display_shop' setting.
+ * @since  3.0.0
+ * @param  WC_Product $product
+ * @param  array $args
+ * @return float
+ */
+function wc_get_price_to_display( $product, $args = array() ) {
+	$args = wp_parse_args( $args, array(
+		'qty'   => 1,
+		'price' => $product->get_price(),
+	) );
+
+	$price = $args['price'];
+	$qty   = $args['qty'];
+
+	return 'incl' === get_option( 'woocommerce_tax_display_shop' ) ? wc_get_price_including_tax( $product, array( 'qty' => $qty, 'price' => $price ) ) : wc_get_price_excluding_tax( $product, array( 'qty' => $qty, 'price' => $price ) );
+}
+
+/**
+ * Returns the product categories in a list.
+ *
+ * @param int $product_id
+ * @param string $sep (default: ', ').
+ * @param string $before (default: '').
+ * @param string $after (default: '').
+ * @return string
+ */
+function wc_get_product_category_list( $product_id, $sep = ', ', $before = '', $after = '' ) {
+	return get_the_term_list( $product_id, 'product_cat', $before, $sep, $after );
+}
+
+/**
+ * Returns the product tags in a list.
+ *
+ * @param int $product_id
+ * @param string $sep (default: ', ').
+ * @param string $before (default: '').
+ * @param string $after (default: '').
+ * @return string
+ */
+function wc_get_product_tag_list( $product_id, $sep = ', ', $before = '', $after = '' ) {
+	return get_the_term_list( $product_id, 'product_tag', $before, $sep, $after );
+}
+
+/**
+ * Callback for array filter to get visible only.
+ * @since  3.0.0
+ * @param  WC_Product $product
+ * @return bool
+ */
+function wc_products_array_filter_visible( $product ) {
+	return $product && is_a( $product, 'WC_Product' ) && $product->is_visible();
+}
+
+/**
+ * Callback for array filter to get products the user can edit only.
+ *
+ * @since  3.0.0
+ * @param  WC_Product $product
+ * @return bool
+ */
+function wc_products_array_filter_editable( $product ) {
+	return $product && is_a( $product, 'WC_Product' ) && current_user_can( 'edit_product', $product->get_id() );
+}
+
+/**
+ * Sort an array of products by a value.
+ * @since  3.0.0
+ * @param  array $products
+ * @param  string $orderby
+ * @return array
+ */
+function wc_products_array_orderby( $products, $orderby = 'date', $order = 'desc' ) {
+	$orderby = strtolower( $orderby );
+	$order   = strtolower( $order );
+	switch ( $orderby ) {
+		case 'title' :
+		case 'id' :
+		case 'date' :
+		case 'modified' :
+		case 'menu_order' :
+		case 'price' :
+			usort( $products, 'wc_products_array_orderby_' . $orderby );
+			break;
+		default :
+			shuffle( $products );
+			break;
+	}
+	if ( 'desc' === $order ) {
+		$products = array_reverse( $products );
+	}
+	return $products;
+}
+
+/**
+ * Sort by title.
+ * @since  3.0.0
+ * @param  WC_Product object $a
+ * @param  WC_Product object $b
+ * @return int
+ */
+function wc_products_array_orderby_title( $a, $b ) {
+	return strcasecmp( $a->get_name(), $b->get_name() );
+}
+
+/**
+ * Sort by id.
+ * @since  3.0.0
+ * @param  WC_Product object $a
+ * @param  WC_Product object $b
+ * @return int
+ */
+function wc_products_array_orderby_id( $a, $b ) {
+	if ( $a->get_id() === $b->get_id() ) {
+		return 0;
+	}
+	return ( $a->get_id() < $b->get_id() ) ? -1 : 1;
+}
+
+/**
+ * Sort by date.
+ * @since  3.0.0
+ * @param  WC_Product object $a
+ * @param  WC_Product object $b
+ * @return int
+ */
+function wc_products_array_orderby_date( $a, $b ) {
+	if ( $a->get_date_created() === $b->get_date_created() ) {
+		return 0;
+	}
+	return ( $a->get_date_created() < $b->get_date_created() ) ? -1 : 1;
+}
+
+/**
+ * Sort by modified.
+ * @since  3.0.0
+ * @param  WC_Product object $a
+ * @param  WC_Product object $b
+ * @return int
+ */
+function wc_products_array_orderby_modified( $a, $b ) {
+	if ( $a->get_date_modified() === $b->get_date_modified() ) {
+		return 0;
+	}
+	return ( $a->get_date_modified() < $b->get_date_modified() ) ? -1 : 1;
+}
+
+/**
+ * Sort by menu order.
+ * @since  3.0.0
+ * @param  WC_Product object $a
+ * @param  WC_Product object $b
+ * @return int
+ */
+function wc_products_array_orderby_menu_order( $a, $b ) {
+	if ( $a->get_menu_order() === $b->get_menu_order() ) {
+		return 0;
+	}
+	return ( $a->get_menu_order() < $b->get_menu_order() ) ? -1 : 1;
+}
+
+/**
+ * Sort by price low to high.
+ * @since  3.0.0
+ * @param  WC_Product object $a
+ * @param  WC_Product object $b
+ * @return int
+ */
+function wc_products_array_orderby_price( $a, $b ) {
+	if ( $a->get_price() === $b->get_price() ) {
+		return 0;
+	}
+	return ( $a->get_price() < $b->get_price() ) ? -1 : 1;
+}
+
+/**
+ * Queue a product for syncing at the end of the request.
+ *
+ * @param  int $product_id
+ */
+function wc_deferred_product_sync( $product_id ) {
+	global $wc_deferred_product_sync;
+
+	if ( empty( $wc_deferred_product_sync ) ) {
+		$wc_deferred_product_sync = array();
+	}
+
+	$wc_deferred_product_sync[] = $product_id;
+}
diff --git a/includes/wc-rest-functions.php b/includes/wc-rest-functions.php
new file mode 100644
index 00000000000..b4cb02f4875
--- /dev/null
+++ b/includes/wc-rest-functions.php
@@ -0,0 +1,323 @@
+<?php
+/**
+ * WooCommerce REST Functions
+ *
+ * Functions for REST specific things.
+ *
+ * @author   WooThemes
+ * @category Core
+ * @package  WooCommerce/Functions
+ * @version  2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Parses and formats a date for ISO8601/RFC3339.
+ *
+ * Required WP 4.4 or later.
+ * See https://developer.wordpress.org/reference/functions/mysql_to_rfc3339/
+ *
+ * @since  2.6.0
+ * @param  string|null|WC_DateTime $date
+ * @param  bool Send false to get local/offset time.
+ * @return string|null ISO8601/RFC3339 formatted datetime.
+ */
+function wc_rest_prepare_date_response( $date, $utc = true ) {
+	if ( is_numeric( $date ) ) {
+		$date = new WC_DateTime( "@$date", new DateTimeZone( 'UTC' ) );
+		$date->setTimezone( new DateTimeZone( wc_timezone_string() ) );
+	} elseif ( is_string( $date ) ) {
+		$date = new WC_DateTime( $date, new DateTimeZone( 'UTC' ) );
+		$date->setTimezone( new DateTimeZone( wc_timezone_string() ) );
+	}
+
+	if ( ! is_a( $date, 'WC_DateTime' ) ) {
+		return null;
+	}
+
+	// Get timestamp before changing timezone to UTC.
+	return gmdate( 'Y-m-d\TH:i:s', $utc ? $date->getTimestamp() : $date->getOffsetTimestamp() );
+}
+
+/**
+ * Returns image mime types users are allowed to upload via the API.
+ * @since  2.6.4
+ * @return array
+ */
+function wc_rest_allowed_image_mime_types() {
+	return apply_filters( 'woocommerce_rest_allowed_image_mime_types', array(
+		'jpg|jpeg|jpe' => 'image/jpeg',
+		'gif'          => 'image/gif',
+		'png'          => 'image/png',
+		'bmp'          => 'image/bmp',
+		'tiff|tif'     => 'image/tiff',
+		'ico'          => 'image/x-icon',
+	) );
+}
+
+/**
+ * Upload image from URL.
+ *
+ * @since 2.6.0
+ * @param string $image_url
+ * @return array|WP_Error Attachment data or error message.
+ */
+function wc_rest_upload_image_from_url( $image_url ) {
+	$file_name  = basename( current( explode( '?', $image_url ) ) );
+	$parsed_url = @parse_url( $image_url );
+
+	// Check parsed URL.
+	if ( ! $parsed_url || ! is_array( $parsed_url ) ) {
+		return new WP_Error( 'woocommerce_rest_invalid_image_url', sprintf( __( 'Invalid URL %s.', 'woocommerce' ), $image_url ), array( 'status' => 400 ) );
+	}
+
+	// Ensure url is valid.
+	$image_url = esc_url_raw( $image_url );
+
+	// Get the file.
+	$response = wp_safe_remote_get( $image_url, array(
+		'timeout' => 10,
+	) );
+
+	if ( is_wp_error( $response ) ) {
+		return new WP_Error( 'woocommerce_rest_invalid_remote_image_url', sprintf( __( 'Error getting remote image %s.', 'woocommerce' ), $image_url ) . ' ' . sprintf( __( 'Error: %s.', 'woocommerce' ), $response->get_error_message() ), array( 'status' => 400 ) );
+	} elseif ( 200 !== wp_remote_retrieve_response_code( $response ) ) {
+		return new WP_Error( 'woocommerce_rest_invalid_remote_image_url', sprintf( __( 'Error getting remote image %s.', 'woocommerce' ), $image_url ), array( 'status' => 400 ) );
+	}
+
+	// Ensure we have a file name and type.
+	$wp_filetype = wp_check_filetype( $file_name, wc_rest_allowed_image_mime_types() );
+
+	if ( ! $wp_filetype['type'] ) {
+		$headers = wp_remote_retrieve_headers( $response );
+		if ( isset( $headers['content-disposition'] ) && strstr( $headers['content-disposition'], 'filename=' ) ) {
+			$disposition = end( explode( 'filename=', $headers['content-disposition'] ) );
+			$disposition = sanitize_file_name( $disposition );
+			$file_name   = $disposition;
+		} elseif ( isset( $headers['content-type'] ) && strstr( $headers['content-type'], 'image/' ) ) {
+			$file_name = 'image.' . str_replace( 'image/', '', $headers['content-type'] );
+		}
+		unset( $headers );
+
+		// Recheck filetype
+		$wp_filetype = wp_check_filetype( $file_name, wc_rest_allowed_image_mime_types() );
+
+		if ( ! $wp_filetype['type'] ) {
+			return new WP_Error( 'woocommerce_rest_invalid_image_type', __( 'Invalid image type.', 'woocommerce' ), array( 'status' => 400 ) );
+		}
+	}
+
+	// Upload the file.
+	$upload = wp_upload_bits( $file_name, '', wp_remote_retrieve_body( $response ) );
+
+	if ( $upload['error'] ) {
+		return new WP_Error( 'woocommerce_rest_image_upload_error', $upload['error'], array( 'status' => 400 ) );
+	}
+
+	// Get filesize.
+	$filesize = filesize( $upload['file'] );
+
+	if ( 0 == $filesize ) {
+		@unlink( $upload['file'] );
+		unset( $upload );
+
+		return new WP_Error( 'woocommerce_rest_image_upload_file_error', __( 'Zero size file downloaded.', 'woocommerce' ), array( 'status' => 400 ) );
+	}
+
+	do_action( 'woocommerce_rest_api_uploaded_image_from_url', $upload, $image_url );
+
+	return $upload;
+}
+
+/**
+ * Set uploaded image as attachment.
+ *
+ * @since 2.6.0
+ * @param array $upload Upload information from wp_upload_bits.
+ * @param int $id Post ID. Default to 0.
+ * @return int Attachment ID
+ */
+function wc_rest_set_uploaded_image_as_attachment( $upload, $id = 0 ) {
+	$info    = wp_check_filetype( $upload['file'] );
+	$title   = '';
+	$content = '';
+
+	if ( ! function_exists( 'wp_generate_attachment_metadata' ) ) {
+		include_once( ABSPATH . 'wp-admin/includes/image.php' );
+	}
+
+	if ( $image_meta = wp_read_image_metadata( $upload['file'] ) ) {
+		if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
+			$title = wc_clean( $image_meta['title'] );
+		}
+		if ( trim( $image_meta['caption'] ) ) {
+			$content = wc_clean( $image_meta['caption'] );
+		}
+	}
+
+	$attachment = array(
+		'post_mime_type' => $info['type'],
+		'guid'           => $upload['url'],
+		'post_parent'    => $id,
+		'post_title'     => $title,
+		'post_content'   => $content,
+	);
+
+	$attachment_id = wp_insert_attachment( $attachment, $upload['file'], $id );
+	if ( ! is_wp_error( $attachment_id ) ) {
+		wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $upload['file'] ) );
+	}
+
+	return $attachment_id;
+}
+
+/**
+ * Validate reports request arguments.
+ *
+ * @since 2.6.0
+ * @param mixed $value
+ * @param WP_REST_Request $request
+ * @param string $param
+ * @return WP_Error|boolean
+ */
+function wc_rest_validate_reports_request_arg( $value, $request, $param ) {
+
+	$attributes = $request->get_attributes();
+	if ( ! isset( $attributes['args'][ $param ] ) || ! is_array( $attributes['args'][ $param ] ) ) {
+		return true;
+	}
+	$args = $attributes['args'][ $param ];
+
+	if ( 'string' === $args['type'] && ! is_string( $value ) ) {
+		return new WP_Error( 'woocommerce_rest_invalid_param', sprintf( __( '%1$s is not of type %2$s', 'woocommerce' ), $param, 'string' ) );
+	}
+
+	if ( 'date' === $args['format'] ) {
+		$regex = '#^\d{4}-\d{2}-\d{2}$#';
+
+		if ( ! preg_match( $regex, $value, $matches ) ) {
+			return new WP_Error( 'woocommerce_rest_invalid_date', __( 'The date you provided is invalid.', 'woocommerce' ) );
+		}
+	}
+
+	return true;
+}
+
+/**
+ * Encodes a value according to RFC 3986.
+ * Supports multidimensional arrays.
+ *
+ * @since 2.6.0
+ * @param string|array $value The value to encode.
+ * @return string|array       Encoded values.
+ */
+function wc_rest_urlencode_rfc3986( $value ) {
+	if ( is_array( $value ) ) {
+		return array_map( 'wc_rest_urlencode_rfc3986', $value );
+	} else {
+		// Percent symbols (%) must be double-encoded.
+		return str_replace( '%', '%25', rawurlencode( rawurldecode( $value ) ) );
+	}
+}
+
+/**
+ * Check permissions of posts on REST API.
+ *
+ * @since 2.6.0
+ * @param string $post_type Post type.
+ * @param string $context   Request context.
+ * @param int    $object_id Post ID.
+ * @return bool
+ */
+function wc_rest_check_post_permissions( $post_type, $context = 'read', $object_id = 0 ) {
+	$contexts = array(
+		'read'   => 'read_private_posts',
+		'create' => 'publish_posts',
+		'edit'   => 'edit_post',
+		'delete' => 'delete_post',
+		'batch'  => 'edit_others_posts',
+	);
+
+	if ( 'revision' === $post_type ) {
+		$permission = false;
+	} else {
+		$cap = $contexts[ $context ];
+		$post_type_object = get_post_type_object( $post_type );
+		$permission = current_user_can( $post_type_object->cap->$cap, $object_id );
+	}
+
+	return apply_filters( 'woocommerce_rest_check_permissions', $permission, $context, $object_id, $post_type );
+}
+
+/**
+ * Check permissions of users on REST API.
+ *
+ * @since 2.6.0
+ * @param string $context   Request context.
+ * @param int    $object_id Post ID.
+ * @return bool
+ */
+function wc_rest_check_user_permissions( $context = 'read', $object_id = 0 ) {
+	$contexts = array(
+		'read'   => 'list_users',
+		'create' => 'edit_users',
+		'edit'   => 'edit_users',
+		'delete' => 'delete_users',
+		'batch'  => 'edit_users',
+	);
+
+	$permission = current_user_can( $contexts[ $context ], $object_id );
+
+	return apply_filters( 'woocommerce_rest_check_permissions', $permission, $context, $object_id, 'user' );
+}
+
+/**
+ * Check permissions of product terms on REST API.
+ *
+ * @since 2.6.0
+ * @param string $taxonomy  Taxonomy.
+ * @param string $context   Request context.
+ * @param int    $object_id Post ID.
+ * @return bool
+ */
+function wc_rest_check_product_term_permissions( $taxonomy, $context = 'read', $object_id = 0 ) {
+	$contexts = array(
+		'read'   => 'manage_terms',
+		'create' => 'edit_terms',
+		'edit'   => 'edit_terms',
+		'delete' => 'delete_terms',
+		'batch'  => 'edit_terms',
+	);
+
+	$cap = $contexts[ $context ];
+	$taxonomy_object = get_taxonomy( $taxonomy );
+	$permission = current_user_can( $taxonomy_object->cap->$cap, $object_id );
+
+	return apply_filters( 'woocommerce_rest_check_permissions', $permission, $context, $object_id, $taxonomy );
+}
+
+/**
+ * Check manager permissions on REST API.
+ *
+ * @since 2.6.0
+ * @param string $object  Object.
+ * @param string $context Request context.
+ * @return bool
+ */
+function wc_rest_check_manager_permissions( $object, $context = 'read' ) {
+	$objects = array(
+		'reports'          => 'view_woocommerce_reports',
+		'settings'         => 'manage_woocommerce',
+		'system_status'    => 'manage_woocommerce',
+		'attributes'       => 'manage_product_terms',
+		'shipping_methods' => 'manage_woocommerce',
+		'payment_gateways' => 'manage_woocommerce',
+	);
+
+	$permission = current_user_can( $objects[ $object ] );
+
+	return apply_filters( 'woocommerce_rest_check_permissions', $permission, $context, 0, $object );
+}
diff --git a/includes/wc-stock-functions.php b/includes/wc-stock-functions.php
new file mode 100644
index 00000000000..216fc25a86f
--- /dev/null
+++ b/includes/wc-stock-functions.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * WooCommerce Stock Functions
+ *
+ * Functions used to manage product stock levels.
+ *
+ * @author 		WooThemes
+ * @category 	Core
+ * @package 	WooCommerce/Functions
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Update a product's stock amount.
+ *
+ * Uses queries rather than update_post_meta so we can do this in one query (to avoid stock issues).
+ *
+ * @since  3.0.0 this supports set, increase and decrease.
+ * @param  int|WC_Product $product
+ * @param  int|null $stock_quantity
+ * @param  string $operation set, increase and decrease.
+ */
+function wc_update_product_stock( $product, $stock_quantity = null, $operation = 'set' ) {
+	if ( ! $product = wc_get_product( $product ) ) {
+		return false;
+	}
+	if ( ! is_null( $stock_quantity ) && $product->managing_stock() ) {
+		// Some products (variations) can have their stock managed by their parent. Get the correct ID to reduce here.
+		$product_id_with_stock = $product->get_stock_managed_by_id();
+		$data_store            = WC_Data_Store::load( 'product' );
+		$data_store->update_product_stock( $product_id_with_stock, $stock_quantity, $operation );
+		delete_transient( 'wc_low_stock_count' );
+		delete_transient( 'wc_outofstock_count' );
+		delete_transient( 'wc_product_children_' . ( $product->is_type( 'variation' ) ? $product->get_parent_id() : $product->get_id() ) );
+		wp_cache_delete( 'product-' . $product_id_with_stock, 'products' );
+
+		// Re-read product data after updating stock, then have stock status calculated and saved.
+		$product_with_stock = wc_get_product( $product_id_with_stock );
+		$product_with_stock->set_stock_status();
+		$product_with_stock->save();
+
+		do_action( $product_with_stock->is_type( 'variation' ) ? 'woocommerce_variation_set_stock' : 'woocommerce_product_set_stock', $product_with_stock );
+
+		return $product_with_stock->get_stock_quantity();
+	}
+	return $product->get_stock_quantity();
+}
+
+/**
+ * Update a product's stock status.
+ *
+ * @param  int $product_id
+ * @param  int $status
+ */
+function wc_update_product_stock_status( $product_id, $status ) {
+	$product = wc_get_product( $product_id );
+	if ( $product ) {
+		$product->set_stock_status( $status );
+		$product->save();
+	}
+}
+
+/**
+ * When a payment is complete, we can reduce stock levels for items within an order.
+ * @since 3.0.0
+ * @param int $order_id
+ */
+function wc_maybe_reduce_stock_levels( $order_id ) {
+	$data_store = WC_Data_Store::load( 'order' );
+	if ( apply_filters( 'woocommerce_payment_complete_reduce_order_stock', ! $data_store->get_stock_reduced( $order_id ), $order_id ) ) {
+		wc_reduce_stock_levels( $order_id );
+		$data_store->set_stock_reduced( $order_id, true );
+	}
+}
+add_action( 'woocommerce_payment_complete', 'wc_maybe_reduce_stock_levels' );
+
+/**
+ * Reduce stock levels for items within an order.
+ * @since 3.0.0
+ * @param int $order_id
+ */
+function wc_reduce_stock_levels( $order_id ) {
+	$order = wc_get_order( $order_id );
+
+	if ( 'yes' === get_option( 'woocommerce_manage_stock' ) && $order && apply_filters( 'woocommerce_can_reduce_order_stock', true, $order ) && sizeof( $order->get_items() ) > 0 ) {
+		foreach ( $order->get_items() as $item ) {
+			if ( $item->is_type( 'line_item' ) && ( $product = $item->get_product() ) && $product->managing_stock() ) {
+				$qty       = apply_filters( 'woocommerce_order_item_quantity', $item->get_quantity(), $order, $item );
+				$item_name = $product->get_formatted_name();
+				$new_stock = wc_update_product_stock( $product, $qty, 'decrease' );
+
+				if ( ! is_wp_error( $new_stock ) ) {
+					/* translators: 1: item name 2: old stock quantity 3: new stock quantity */
+					$order->add_order_note( sprintf( __( '%1$s stock reduced from %2$s to %3$s.', 'woocommerce' ), $item_name, $new_stock + $qty, $new_stock ) );
+
+					// Get the latest product data.
+					$product = wc_get_product( $product->get_id() );
+
+					if ( '' !== get_option( 'woocommerce_notify_no_stock_amount' ) && $new_stock <= get_option( 'woocommerce_notify_no_stock_amount' ) ) {
+						do_action( 'woocommerce_no_stock', $product );
+					} elseif ( '' !== get_option( 'woocommerce_notify_low_stock_amount' ) && $new_stock <= get_option( 'woocommerce_notify_low_stock_amount' ) ) {
+						do_action( 'woocommerce_low_stock', $product );
+					}
+
+					if ( $new_stock < 0 ) {
+						do_action( 'woocommerce_product_on_backorder', array( 'product' => $product, 'order_id' => $order_id, 'quantity' => $qty ) );
+					}
+				}
+			}
+		}
+
+		do_action( 'woocommerce_reduce_order_stock', $order );
+	}
+}
diff --git a/includes/wc-template-functions.php b/includes/wc-template-functions.php
index dba6cdb09a6..5855238a17a 100644
--- a/includes/wc-template-functions.php
+++ b/includes/wc-template-functions.php
@@ -20,49 +20,49 @@ if ( ! defined( 'ABSPATH' ) ) {
 function wc_template_redirect() {
 	global $wp_query, $wp;
 
-	// When default permalinks are enabled, redirect shop page to post type archive url
-	if ( ! empty( $_GET['page_id'] ) && '' === get_option( 'permalink_structure' ) && $_GET['page_id'] == wc_get_page_id( 'shop' ) ) {
-		wp_safe_redirect( get_post_type_archive_link('product') );
-		exit;
-	}
+	if ( ! empty( $_GET['page_id'] ) && '' === get_option( 'permalink_structure' ) && wc_get_page_id( 'shop' ) == $_GET['page_id'] ) {
 
-	// When on the checkout with an empty cart, redirect to cart page
-	elseif ( is_page( wc_get_page_id( 'checkout' ) ) && WC()->cart->is_empty() && empty( $wp->query_vars['order-pay'] ) && ! isset( $wp->query_vars['order-received'] ) ) {
+		// When default permalinks are enabled, redirect shop page to post type archive url
+		wp_safe_redirect( get_post_type_archive_link( 'product' ) );
+		exit;
+
+	} elseif ( is_page( wc_get_page_id( 'checkout' ) ) && wc_get_page_id( 'checkout' ) !== wc_get_page_id( 'cart' ) && WC()->cart->is_empty() && empty( $wp->query_vars['order-pay'] ) && ! isset( $wp->query_vars['order-received'] ) ) {
+
+		// When on the checkout with an empty cart, redirect to cart page
+		wc_add_notice( __( 'Checkout is not available whilst your cart is empty.', 'woocommerce' ), 'notice' );
 		wp_redirect( wc_get_page_permalink( 'cart' ) );
 		exit;
-	}
 
-	// Logout
-	elseif ( isset( $wp->query_vars['customer-logout'] ) ) {
+	} elseif ( isset( $wp->query_vars['customer-logout'] ) ) {
+
+		// Logout
 		wp_redirect( str_replace( '&amp;', '&', wp_logout_url( wc_get_page_permalink( 'myaccount' ) ) ) );
 		exit;
-	}
 
-	// Redirect to the product page if we have a single product
-	elseif ( is_search() && is_post_type_archive( 'product' ) && apply_filters( 'woocommerce_redirect_single_search_result', true ) && 1 === $wp_query->found_posts ) {
+	} elseif ( is_search() && is_post_type_archive( 'product' ) && apply_filters( 'woocommerce_redirect_single_search_result', true ) && 1 === absint( $wp_query->found_posts ) ) {
+
+		// Redirect to the product page if we have a single product
 		$product = wc_get_product( $wp_query->post );
 
 		if ( $product && $product->is_visible() ) {
-			wp_safe_redirect( get_permalink( $product->id ), 302 );
+			wp_safe_redirect( get_permalink( $product->get_id() ), 302 );
 			exit;
 		}
-	}
-
-	// Ensure payment gateways are loaded early
-	elseif ( is_add_payment_method_page() ) {
+	} elseif ( is_add_payment_method_page() ) {
 
+		// Ensure payment gateways are loaded early
 		WC()->payment_gateways();
 
-	}
+	} elseif ( is_checkout() ) {
 
-	// Checkout pages handling
-	elseif ( is_checkout() ) {
+		// Checkout pages handling
 		// Buffer the checkout page
 		ob_start();
 
 		// Ensure gateways and shipping methods are loaded early
 		WC()->payment_gateways();
 		WC()->shipping();
+
 	}
 }
 add_action( 'template_redirect', 'wc_template_redirect' );
@@ -81,6 +81,31 @@ function wc_send_frame_options_header() {
 }
 add_action( 'template_redirect', 'wc_send_frame_options_header' );
 
+/**
+ * No index our endpoints.
+ * Prevent indexing pages like order-received.
+ *
+ * @since 2.5.3
+ */
+function wc_prevent_endpoint_indexing() {
+	if ( is_wc_endpoint_url() || isset( $_GET['download_file'] ) ) {
+		@header( 'X-Robots-Tag: noindex' );
+	}
+}
+add_action( 'template_redirect', 'wc_prevent_endpoint_indexing' );
+
+/**
+ * Remove adjacent_posts_rel_link_wp_head - pointless for products.
+ *
+ * @since 3.0.0
+ */
+function wc_prevent_adjacent_posts_rel_link_wp_head() {
+	if ( is_singular( 'product' ) ) {
+		remove_action( 'wp_head', 'adjacent_posts_rel_link_wp_head', 10, 0 );
+	}
+}
+add_action( 'template_redirect', 'wc_prevent_adjacent_posts_rel_link_wp_head' );
+
 /**
  * When the_post is called, put product data into a global.
  *
@@ -90,11 +115,13 @@ add_action( 'template_redirect', 'wc_send_frame_options_header' );
 function wc_setup_product_data( $post ) {
 	unset( $GLOBALS['product'] );
 
-	if ( is_int( $post ) )
+	if ( is_int( $post ) ) {
 		$post = get_post( $post );
+	}
 
-	if ( empty( $post->post_type ) || ! in_array( $post->post_type, array( 'product', 'product_variation' ) ) )
+	if ( empty( $post->post_type ) || ! in_array( $post->post_type, array( 'product', 'product_variation' ) ) ) {
 		return;
+	}
 
 	$GLOBALS['product'] = wc_get_product( $post );
 
@@ -106,20 +133,21 @@ if ( ! function_exists( 'woocommerce_reset_loop' ) ) {
 
 	/**
 	 * Reset the loop's index and columns when we're done outputting a product loop.
-	 *
 	 * @subpackage	Loop
 	 */
 	function woocommerce_reset_loop() {
-		global $woocommerce_loop;
-		// Reset loop/columns globals when starting a new loop
-		$woocommerce_loop['loop'] = $woocommerce_loop['columns'] = '';
+		$GLOBALS['woocommerce_loop'] = array(
+			'loop'    => '',
+			'columns' => '',
+			'name'    => '',
+		);
 	}
 }
 add_filter( 'loop_end', 'woocommerce_reset_loop' );
 
 /**
  * Products RSS Feed.
- *
+ * @deprecated 2.6
  * @access public
  */
 function wc_products_rss_feed() {
@@ -132,20 +160,20 @@ function wc_products_rss_feed() {
 
 	} elseif ( is_tax( 'product_cat' ) ) {
 
-		$term = get_term_by('slug', esc_attr( get_query_var('product_cat') ), 'product_cat');
-
-		$feed = add_query_arg('product_cat', $term->slug, get_post_type_archive_feed_link( 'product' ));
-
-		echo '<link rel="alternate" type="application/rss+xml"  title="' . esc_attr( sprintf( __( 'New products added to %s', 'woocommerce' ), $term->name ) ) . '" href="' . esc_url( $feed ) . '" />';
+		$term = get_term_by( 'slug', esc_attr( get_query_var( 'product_cat' ) ), 'product_cat' );
 
+		if ( $term ) {
+			$feed = add_query_arg( 'product_cat', $term->slug, get_post_type_archive_feed_link( 'product' ) );
+			echo '<link rel="alternate" type="application/rss+xml"  title="' . sprintf( esc_attr__( 'New products added to %s', 'woocommerce' ), $term->name ) . '" href="' . esc_url( $feed ) . '" />';
+		}
 	} elseif ( is_tax( 'product_tag' ) ) {
 
-		$term = get_term_by('slug', esc_attr( get_query_var('product_tag') ), 'product_tag');
-
-		$feed = add_query_arg('product_tag', $term->slug, get_post_type_archive_feed_link( 'product' ));
-
-		echo '<link rel="alternate" type="application/rss+xml"  title="' . sprintf(__( 'New products tagged %s', 'woocommerce' ), urlencode($term->name)) . '" href="' . esc_url( $feed ) . '" />';
+		$term = get_term_by( 'slug', esc_attr( get_query_var( 'product_tag' ) ), 'product_tag' );
 
+		if ( $term ) {
+			$feed = add_query_arg( 'product_tag', $term->slug, get_post_type_archive_feed_link( 'product' ) );
+			echo '<link rel="alternate" type="application/rss+xml"  title="' . sprintf( esc_attr__( 'New products tagged %s', 'woocommerce' ), urlencode( $term->name ) ) . '" href="' . esc_url( $feed ) . '" />';
+		}
 	}
 }
 
@@ -176,23 +204,25 @@ function wc_body_class( $classes ) {
 	$classes = (array) $classes;
 
 	if ( is_woocommerce() ) {
+
 		$classes[] = 'woocommerce';
 		$classes[] = 'woocommerce-page';
-	}
 
-	elseif ( is_checkout() ) {
+	} elseif ( is_checkout() ) {
+
 		$classes[] = 'woocommerce-checkout';
 		$classes[] = 'woocommerce-page';
-	}
 
-	elseif ( is_cart() ) {
+	} elseif ( is_cart() ) {
+
 		$classes[] = 'woocommerce-cart';
 		$classes[] = 'woocommerce-page';
-	}
 
-	elseif ( is_account_page() ) {
+	} elseif ( is_account_page() ) {
+
 		$classes[] = 'woocommerce-account';
 		$classes[] = 'woocommerce-page';
+
 	}
 
 	if ( is_store_notice_showing() ) {
@@ -220,6 +250,26 @@ function wc_product_cat_class( $class = '', $category = null ) {
 	echo 'class="' . esc_attr( join( ' ', wc_get_product_cat_class( $class, $category ) ) ) . '"';
 }
 
+/**
+ * Get classname for loops based on $woocommerce_loop global.
+ * @since 2.6.0
+ * @return string
+ */
+function wc_get_loop_class() {
+	global $woocommerce_loop;
+
+	$woocommerce_loop['loop']    = ! empty( $woocommerce_loop['loop'] ) ? $woocommerce_loop['loop'] + 1   : 1;
+	$woocommerce_loop['columns'] = max( 1, ! empty( $woocommerce_loop['columns'] ) ? $woocommerce_loop['columns'] : apply_filters( 'loop_shop_columns', 4 ) );
+
+	if ( 0 === ( $woocommerce_loop['loop'] - 1 ) % $woocommerce_loop['columns'] || 1 === $woocommerce_loop['columns'] ) {
+		return 'first';
+	} elseif ( 0 === $woocommerce_loop['loop'] % $woocommerce_loop['columns'] ) {
+		return 'last';
+	} else {
+		return '';
+	}
+}
+
 /**
  * Get the classes for the product cat div.
  *
@@ -228,21 +278,11 @@ function wc_product_cat_class( $class = '', $category = null ) {
  * @param object $category object Optional.
  */
 function wc_get_product_cat_class( $class = '', $category = null ) {
-	global $woocommerce_loop;
-
 	$classes   = is_array( $class ) ? $class : array_map( 'trim', explode( ' ', $class ) );
 	$classes[] = 'product-category';
 	$classes[] = 'product';
-
-	if ( 0 === ( $woocommerce_loop['loop'] - 1 ) % $woocommerce_loop['columns'] || 1 === $woocommerce_loop['columns'] ) {
-		$classes[] = 'first';
-	}
-
-	if ( 0 === $woocommerce_loop['loop'] % $woocommerce_loop['columns'] ) {
-		$classes[] = 'last';
-	}
-
-	$classes = apply_filters( 'product_cat_class', $classes, $class, $category );
+	$classes[] = wc_get_loop_class();
+	$classes   = apply_filters( 'product_cat_class', $classes, $class, $category );
 
 	return array_unique( array_filter( $classes ) );
 }
@@ -257,13 +297,17 @@ function wc_get_product_cat_class( $class = '', $category = null ) {
  * @return array
  */
 function wc_product_post_class( $classes, $class = '', $post_id = '' ) {
-	if ( ! $post_id || 'product' !== get_post_type( $post_id ) ) {
+	if ( ! $post_id || ! in_array( get_post_type( $post_id ), array( 'product', 'product_variation' ) ) ) {
 		return $classes;
 	}
 
 	$product = wc_get_product( $post_id );
 
 	if ( $product ) {
+		$classes[] = 'product';
+		$classes[] = wc_get_loop_class();
+		$classes[] = $product->get_stock_status();
+
 		if ( $product->is_on_sale() ) {
 			$classes[] = 'sale';
 		}
@@ -291,32 +335,14 @@ function wc_product_post_class( $classes, $class = '', $post_id = '' ) {
 		if ( $product->get_type() ) {
 			$classes[] = "product-type-" . $product->get_type();
 		}
-
-		// add category slugs
-		$categories = get_the_terms( $product->id, 'product_cat' );
-		if ( ! empty( $categories ) ) {
-			foreach ( $categories as $key => $value ) {
-				$classes[] = 'product-cat-' . $value->slug;
+		if ( $product->is_type( 'variable' ) ) {
+			if ( ! $product->get_default_attributes() ) {
+				$classes[] = 'has-default-attributes';
+			}
+			if ( $product->has_child() ) {
+				$classes[] = 'has-children';
 			}
 		}
-
-		// add tag slugs
-		$tags = get_the_terms( $product->id, 'product_tag' );
-		if ( ! empty( $tags ) ) {
-			foreach ( $tags as $key => $value ) {
-				$classes[] = 'product-tag-' . $value->slug;
-			}
-		}
-
-		if ('variable' === $product->product_type && $product->has_default_attributes() ) {
-			$classes[] = 'has-default-attributes';
-		}
-
-		if ( 'variable' === $product->product_type && $product->has_child() ) {
-			$classes[] = 'has-children';
-		}
-
-		$classes[] = $product->stock_status;
 	}
 
 	if ( false !== ( $key = array_search( 'hentry', $classes ) ) ) {
@@ -326,6 +352,40 @@ function wc_product_post_class( $classes, $class = '', $post_id = '' ) {
 	return $classes;
 }
 
+/**
+ * Outputs hidden form inputs for each query string variable.
+ * @since 3.0.0
+ * @param array $values Name value pairs.
+ * @param array $exclude Keys to exclude.
+ * @param string $current_key Current key we are outputting.
+ */
+function wc_query_string_form_fields( $values = null, $exclude = array(), $current_key = '', $return = false ) {
+	if ( is_null( $values ) ) {
+		$values = $_GET;
+	}
+	$html = '';
+
+	foreach ( $values as $key => $value ) {
+		if ( in_array( $key, $exclude, true ) ) {
+			continue;
+		}
+		if ( $current_key ) {
+			$key = $current_key . '[' . $key . ']';
+		}
+		if ( is_array( $value ) ) {
+			$html .= wc_query_string_form_fields( $value, $exclude, $key, true );
+		} else {
+			$html .= '<input type="hidden" name="' . esc_attr( $key ) . '" value="' . esc_attr( $value ) . '" />';
+		}
+	}
+
+	if ( $return ) {
+		return $html;
+	} else {
+		echo $html;
+	}
+}
+
 /** Template pages ********************************************************/
 
 if ( ! function_exists( 'woocommerce_content' ) ) {
@@ -360,7 +420,7 @@ if ( ! function_exists( 'woocommerce_content' ) ) {
 
 			<?php if ( have_posts() ) : ?>
 
-				<?php do_action('woocommerce_before_shop_loop'); ?>
+				<?php do_action( 'woocommerce_before_shop_loop' ); ?>
 
 				<?php woocommerce_product_loop_start(); ?>
 
@@ -374,11 +434,11 @@ if ( ! function_exists( 'woocommerce_content' ) ) {
 
 				<?php woocommerce_product_loop_end(); ?>
 
-				<?php do_action('woocommerce_after_shop_loop'); ?>
+				<?php do_action( 'woocommerce_after_shop_loop' ); ?>
 
 			<?php elseif ( ! woocommerce_product_subcategories( array( 'before' => woocommerce_product_loop_start( false ), 'after' => woocommerce_product_loop_end( false ) ) ) ) : ?>
 
-				<?php wc_get_template( 'loop/no-products-found.php' ); ?>
+				<?php do_action( 'woocommerce_no_products_found' ); ?>
 
 			<?php endif;
 
@@ -437,7 +497,7 @@ if ( ! function_exists( 'woocommerce_demo_store' ) ) {
 			$notice = __( 'This is a demo store for testing purposes &mdash; no orders shall be fulfilled.', 'woocommerce' );
 		}
 
-		echo apply_filters( 'woocommerce_demo_store', '<p class="demo_store">' . wp_kses_post( $notice ) . '</p>'  );
+		echo apply_filters( 'woocommerce_demo_store', '<p class="woocommerce-store-notice demo_store">' . wp_kses_post( $notice ) . ' <a href="#" class="woocommerce-store-notice__dismiss-link">' . esc_html__( 'Dismiss', 'woocommerce' ) . '</a></p>', $notice );
 	}
 }
 
@@ -448,17 +508,17 @@ if ( ! function_exists( 'woocommerce_page_title' ) ) {
 	/**
 	 * woocommerce_page_title function.
 	 *
-	 * @param  boolean $echo
+	 * @param  bool $echo
 	 * @return string
 	 */
 	function woocommerce_page_title( $echo = true ) {
 
 		if ( is_search() ) {
-			$page_title = sprintf( __( 'Search Results: &ldquo;%s&rdquo;', 'woocommerce' ), get_search_query() );
+			$page_title = sprintf( __( 'Search results: &ldquo;%s&rdquo;', 'woocommerce' ), get_search_query() );
 
-			if ( get_query_var( 'paged' ) )
+			if ( get_query_var( 'paged' ) ) {
 				$page_title .= sprintf( __( '&nbsp;&ndash; Page %s', 'woocommerce' ), get_query_var( 'paged' ) );
-
+			}
 		} elseif ( is_tax() ) {
 
 			$page_title = single_term_title( "", false );
@@ -472,10 +532,11 @@ if ( ! function_exists( 'woocommerce_page_title' ) ) {
 
 		$page_title = apply_filters( 'woocommerce_page_title', $page_title );
 
-		if ( $echo )
-	    	echo $page_title;
-	    else
-	    	return $page_title;
+		if ( $echo ) {
+			echo $page_title;
+		} else {
+			return $page_title;
+		}
 	}
 }
 
@@ -489,11 +550,13 @@ if ( ! function_exists( 'woocommerce_product_loop_start' ) ) {
 	 */
 	function woocommerce_product_loop_start( $echo = true ) {
 		ob_start();
+		$GLOBALS['woocommerce_loop']['loop'] = 0;
 		wc_get_template( 'loop/loop-start.php' );
-		if ( $echo )
+		if ( $echo ) {
 			echo ob_get_clean();
-		else
+		} else {
 			return ob_get_clean();
+		}
 	}
 }
 if ( ! function_exists( 'woocommerce_product_loop_end' ) ) {
@@ -509,36 +572,38 @@ if ( ! function_exists( 'woocommerce_product_loop_end' ) ) {
 
 		wc_get_template( 'loop/loop-end.php' );
 
-		if ( $echo )
+		if ( $echo ) {
 			echo ob_get_clean();
-		else
+		} else {
 			return ob_get_clean();
+		}
 	}
 }
-if (  ! function_exists( 'woocommerce_template_loop_product_title' ) ) {
+if ( ! function_exists( 'woocommerce_template_loop_product_title' ) ) {
 
 	/**
-	 * Show the product title in the product loop. By default this is an H3.
+	 * Show the product title in the product loop. By default this is an H2.
 	 */
 	function woocommerce_template_loop_product_title() {
-		echo '<h3>' . get_the_title() . '</h3>';
+		echo '<h2 class="woocommerce-loop-product__title">' . get_the_title() . '</h2>';
 	}
 }
-if (  ! function_exists( 'woocommerce_template_loop_subcategory_title' ) ) {
+if ( ! function_exists( 'woocommerce_template_loop_category_title' ) ) {
 
 	/**
 	 * Show the subcategory title in the product loop.
 	 */
 	function woocommerce_template_loop_category_title( $category ) {
 		?>
-		<h3>
+		<h2 class="woocommerce-loop-category__title">
 			<?php
 				echo $category->name;
 
-				if ( $category->count > 0 )
+				if ( $category->count > 0 ) {
 					echo apply_filters( 'woocommerce_subcategory_count_html', ' <mark class="count">(' . $category->count . ')</mark>', $category );
+				}
 			?>
-		</h3>
+		</h2>
 		<?php
 	}
 }
@@ -546,7 +611,7 @@ if (  ! function_exists( 'woocommerce_template_loop_subcategory_title' ) ) {
  * Insert the opening anchor tag for products in the loop.
  */
 function woocommerce_template_loop_product_link_open() {
-	echo '<a href="' . get_the_permalink() . '">';
+	echo '<a href="' . get_the_permalink() . '" class="woocommerce-LoopProduct-link woocommerce-loop-product__link">';
 }
 /**
  * Insert the opening anchor tag for products in the loop.
@@ -558,10 +623,10 @@ function woocommerce_template_loop_product_link_close() {
  * Insert the opening anchor tag for categories in the loop.
  */
 function woocommerce_template_loop_category_link_open( $category ) {
-	echo '<a href="' . get_term_link( $category->slug, 'product_cat' ) . '">';
+	echo '<a href="' . get_term_link( $category, 'product_cat' ) . '">';
 }
 /**
- * Insert the opening anchor tag for categories in the loop.
+ * Insert the closing anchor tag for categories in the loop.
  */
 function woocommerce_template_loop_category_link_close() {
 	echo '</a>';
@@ -574,7 +639,7 @@ if ( ! function_exists( 'woocommerce_taxonomy_archive_description' ) ) {
 	 * @subpackage	Archives
 	 */
 	function woocommerce_taxonomy_archive_description() {
-		if ( is_tax( array( 'product_cat', 'product_tag' ) ) && 0 === absint( get_query_var( 'paged' ) ) ) {
+		if ( is_product_taxonomy() && 0 === absint( get_query_var( 'paged' ) ) ) {
 			$description = wc_format_content( term_description() );
 			if ( $description ) {
 				echo '<div class="term-description">' . $description . '</div>';
@@ -590,6 +655,11 @@ if ( ! function_exists( 'woocommerce_product_archive_description' ) ) {
 	 * @subpackage	Archives
 	 */
 	function woocommerce_product_archive_description() {
+		// Don't display the description on search results page
+		if ( is_search() ) {
+			return;
+		}
+
 		if ( is_post_type_archive( 'product' ) && 0 === absint( get_query_var( 'paged' ) ) ) {
 			$shop_page   = get_post( wc_get_page_id( 'shop' ) );
 			if ( $shop_page ) {
@@ -617,10 +687,10 @@ if ( ! function_exists( 'woocommerce_template_loop_add_to_cart' ) ) {
 				'quantity' => 1,
 				'class'    => implode( ' ', array_filter( array(
 						'button',
-						'product_type_' . $product->product_type,
+						'product_type_' . $product->get_type(),
 						$product->is_purchasable() && $product->is_in_stock() ? 'add_to_cart_button' : '',
-						$product->supports( 'ajax_add_to_cart' ) ? 'ajax_add_to_cart' : ''
-				) ) )
+						$product->supports( 'ajax_add_to_cart' ) ? 'ajax_add_to_cart' : '',
+				) ) ),
 			);
 
 			$args = apply_filters( 'woocommerce_loop_add_to_cart_args', wp_parse_args( $args, $defaults ), $product );
@@ -674,36 +744,6 @@ if ( ! function_exists( 'woocommerce_show_product_loop_sale_flash' ) ) {
 	}
 }
 
-if ( ! function_exists( 'woocommerce_get_product_schema' ) ) {
-
-	/**
-	 * Get a products Schema.
-	 * @return string
-	 */
-	function woocommerce_get_product_schema() {
-		global $product;
-
-		$schema = "Product";
-
-		// Downloadable product schema handling
-		if ( $product->is_downloadable() ) {
-			switch ( $product->download_type ) {
-				case 'application' :
-					$schema = "SoftwareApplication";
-				break;
-				case 'music' :
-					$schema = "MusicAlbum";
-				break;
-				default :
-					$schema = "Product";
-				break;
-			}
-		}
-
-		return 'http://schema.org/' . $schema;
-	}
-}
-
 if ( ! function_exists( 'woocommerce_get_product_thumbnail' ) ) {
 
 	/**
@@ -717,11 +757,16 @@ if ( ! function_exists( 'woocommerce_get_product_thumbnail' ) ) {
 	 */
 	function woocommerce_get_product_thumbnail( $size = 'shop_catalog', $deprecated1 = 0, $deprecated2 = 0 ) {
 		global $post;
+		$image_size = apply_filters( 'single_product_archive_thumbnail_size', $size );
 
 		if ( has_post_thumbnail() ) {
-			return get_the_post_thumbnail( $post->ID, $size );
+			$props = wc_get_product_attachment_props( get_post_thumbnail_id(), $post );
+			return get_the_post_thumbnail( $post->ID, $image_size, array(
+				'title'	 => $props['title'],
+				'alt'    => $props['alt'],
+			) );
 		} elseif ( wc_placeholder_img_src() ) {
-			return wc_placeholder_img( $size );
+			return wc_placeholder_img( $image_size );
 		}
 	}
 }
@@ -748,7 +793,7 @@ if ( ! function_exists( 'woocommerce_catalog_ordering' ) ) {
 	function woocommerce_catalog_ordering() {
 		global $wp_query;
 
-		if ( 1 === $wp_query->found_posts || ! woocommerce_products_will_display() ) {
+		if ( 1 === (int) $wp_query->found_posts || ! woocommerce_products_will_display() ) {
 			return;
 		}
 
@@ -760,7 +805,7 @@ if ( ! function_exists( 'woocommerce_catalog_ordering' ) ) {
 			'rating'     => __( 'Sort by average rating', 'woocommerce' ),
 			'date'       => __( 'Sort by newness', 'woocommerce' ),
 			'price'      => __( 'Sort by price: low to high', 'woocommerce' ),
-			'price-desc' => __( 'Sort by price: high to low', 'woocommerce' )
+			'price-desc' => __( 'Sort by price: high to low', 'woocommerce' ),
 		) );
 
 		if ( ! $show_default_orderby ) {
@@ -909,7 +954,7 @@ if ( ! function_exists( 'woocommerce_template_single_add_to_cart' ) ) {
 	 */
 	function woocommerce_template_single_add_to_cart() {
 		global $product;
-		do_action( 'woocommerce_' . $product->product_type . '_add_to_cart'  );
+		do_action( 'woocommerce_' . $product->get_type() . '_add_to_cart' );
 	}
 }
 if ( ! function_exists( 'woocommerce_simple_add_to_cart' ) ) {
@@ -933,11 +978,17 @@ if ( ! function_exists( 'woocommerce_grouped_add_to_cart' ) ) {
 	function woocommerce_grouped_add_to_cart() {
 		global $product;
 
-		wc_get_template( 'single-product/add-to-cart/grouped.php', array(
-			'grouped_product'    => $product,
-			'grouped_products'   => $product->get_children(),
-			'quantites_required' => false
-		) );
+		$products = array_filter( array_map( 'wc_get_product', $product->get_children() ) );
+
+		if ( $products ) {
+			usort( $products, 'wc_products_array_orderby_menu_order' );
+
+			wc_get_template( 'single-product/add-to-cart/grouped.php', array(
+				'grouped_product'    => $product,
+				'grouped_products'   => $products,
+				'quantites_required' => false,
+			) );
+		}
 	}
 }
 if ( ! function_exists( 'woocommerce_variable_add_to_cart' ) ) {
@@ -960,7 +1011,7 @@ if ( ! function_exists( 'woocommerce_variable_add_to_cart' ) ) {
 		wc_get_template( 'single-product/add-to-cart/variable.php', array(
 			'available_variations' => $get_variations ? $product->get_available_variations() : false,
 			'attributes'           => $product->get_variation_attributes(),
-			'selected_attributes'  => $product->get_variation_default_attributes()
+			'selected_attributes'  => $product->get_default_attributes(),
 		) );
 	}
 }
@@ -980,7 +1031,7 @@ if ( ! function_exists( 'woocommerce_external_add_to_cart' ) ) {
 
 		wc_get_template( 'single-product/add-to-cart/external.php', array(
 			'product_url' => $product->add_to_cart_url(),
-			'button_text' => $product->single_add_to_cart_text()
+			'button_text' => $product->single_add_to_cart_text(),
 		) );
 	}
 }
@@ -1000,24 +1051,24 @@ if ( ! function_exists( 'woocommerce_quantity_input' ) ) {
 		}
 
 		$defaults = array(
-			'input_name'  	=> 'quantity',
-			'input_value'  	=> '1',
-			'max_value'  	=> apply_filters( 'woocommerce_quantity_input_max', '', $product ),
-			'min_value'  	=> apply_filters( 'woocommerce_quantity_input_min', '', $product ),
-			'step' 			=> apply_filters( 'woocommerce_quantity_input_step', '1', $product )
+			'input_name'  => 'quantity',
+			'input_value' => '1',
+			'max_value'   => apply_filters( 'woocommerce_quantity_input_max', -1, $product ),
+			'min_value'   => apply_filters( 'woocommerce_quantity_input_min', 0, $product ),
+			'step'        => apply_filters( 'woocommerce_quantity_input_step', 1, $product ),
+			'pattern'     => apply_filters( 'woocommerce_quantity_input_pattern', has_filter( 'woocommerce_stock_amount', 'intval' ) ? '[0-9]*' : '' ),
+			'inputmode'   => apply_filters( 'woocommerce_quantity_input_inputmode', has_filter( 'woocommerce_stock_amount', 'intval' ) ? 'numeric' : '' ),
 		);
 
 		$args = apply_filters( 'woocommerce_quantity_input_args', wp_parse_args( $args, $defaults ), $product );
 
-		// Apply sanity to min/max args - min cannot be lower than 0
-		if ( '' !== $args['min_value'] && is_numeric( $args['min_value'] ) && $args['min_value'] < 0 ) {
-			$args['min_value'] = 0; // Cannot be lower than 0
-		}
+		// Apply sanity to min/max args - min cannot be lower than 0.
+		$args['min_value'] = max( $args['min_value'], 0 );
+		$args['max_value'] = 0 < $args['max_value'] ? $args['max_value'] : '';
 
-		// Max cannot be lower than 0 or min
-		if ( '' !== $args['max_value'] && is_numeric( $args['max_value'] ) ) {
-			$args['max_value'] = $args['max_value'] < 0 ? 0 : $args['max_value'];
-			$args['max_value'] = $args['max_value'] < $args['min_value'] ? $args['min_value'] : $args['max_value'];
+		// Max cannot be lower than min if defined.
+		if ( '' !== $args['max_value'] && $args['max_value'] < $args['min_value'] ) {
+			$args['max_value'] = $args['min_value'];
 		}
 
 		ob_start();
@@ -1062,7 +1113,7 @@ if ( ! function_exists( 'woocommerce_product_reviews_tab' ) ) {
 	 * @subpackage	Product/Tabs
 	 */
 	function woocommerce_product_reviews_tab() {
-		_deprecated_function( 'woocommerce_product_reviews_tab', '2.4', '' );
+		wc_deprecated_function( 'woocommerce_product_reviews_tab', '2.4' );
 	}
 }
 
@@ -1082,16 +1133,16 @@ if ( ! function_exists( 'woocommerce_default_product_tabs' ) ) {
 			$tabs['description'] = array(
 				'title'    => __( 'Description', 'woocommerce' ),
 				'priority' => 10,
-				'callback' => 'woocommerce_product_description_tab'
+				'callback' => 'woocommerce_product_description_tab',
 			);
 		}
 
 		// Additional information tab - shows attributes
-		if ( $product && ( $product->has_attributes() || ( $product->enable_dimensions_display() && ( $product->has_dimensions() || $product->has_weight() ) ) ) ) {
+		if ( $product && ( $product->has_attributes() || apply_filters( 'wc_product_enable_dimensions_display', $product->has_weight() || $product->has_dimensions() ) ) ) {
 			$tabs['additional_information'] = array(
-				'title'    => __( 'Additional Information', 'woocommerce' ),
+				'title'    => __( 'Additional information', 'woocommerce' ),
 				'priority' => 20,
-				'callback' => 'woocommerce_product_additional_information_tab'
+				'callback' => 'woocommerce_product_additional_information_tab',
 			);
 		}
 
@@ -1100,7 +1151,7 @@ if ( ! function_exists( 'woocommerce_default_product_tabs' ) ) {
 			$tabs['reviews'] = array(
 				'title'    => sprintf( __( 'Reviews (%d)', 'woocommerce' ), $product->get_review_count() ),
 				'priority' => 30,
-				'callback' => 'comments_template'
+				'callback' => 'comments_template',
 			);
 		}
 
@@ -1121,15 +1172,16 @@ if ( ! function_exists( 'woocommerce_sort_product_tabs' ) ) {
 		// Make sure the $tabs parameter is an array
 		if ( ! is_array( $tabs ) ) {
 			trigger_error( "Function woocommerce_sort_product_tabs() expects an array as the first parameter. Defaulting to empty array." );
-			$tabs = array( );
+			$tabs = array();
 		}
 
 		// Re-order tabs by priority
 		if ( ! function_exists( '_sort_priority_callback' ) ) {
 			function _sort_priority_callback( $a, $b ) {
-				if ( $a['priority'] === $b['priority'] )
-			        return 0;
-			    return ( $a['priority'] < $b['priority'] ) ? -1 : 1;
+				if ( $a['priority'] === $b['priority'] ) {
+					return 0;
+				}
+				return ( $a['priority'] < $b['priority'] ) ? -1 : 1;
 			}
 		}
 
@@ -1145,6 +1197,9 @@ if ( ! function_exists( 'woocommerce_comments' ) ) {
 	 * Output the Review comments template.
 	 *
 	 * @subpackage	Product
+	 * @param WP_Comment $comment
+	 * @param array $args
+	 * @param int $depth
 	 */
 	function woocommerce_comments( $comment, $args, $depth ) {
 		$GLOBALS['comment'] = $comment;
@@ -1152,6 +1207,52 @@ if ( ! function_exists( 'woocommerce_comments' ) ) {
 	}
 }
 
+if ( ! function_exists( 'woocommerce_review_display_gravatar' ) ) {
+	/**
+	 * Display the review authors gravatar
+	 *
+	 * @param array $comment WP_Comment.
+	 * @return void
+	 */
+	function woocommerce_review_display_gravatar( $comment ) {
+		echo get_avatar( $comment, apply_filters( 'woocommerce_review_gravatar_size', '60' ), '' );
+	}
+}
+
+if ( ! function_exists( 'woocommerce_review_display_rating' ) ) {
+	/**
+	 * Display the reviewers star rating
+	 *
+	 * @return void
+	 */
+	function woocommerce_review_display_rating() {
+		wc_get_template( 'single-product/review-rating.php' );
+	}
+}
+
+if ( ! function_exists( 'woocommerce_review_display_meta' ) ) {
+	/**
+	 * Display the review authors meta (name, verified owner, review date)
+	 *
+	 * @return void
+	 */
+	function woocommerce_review_display_meta() {
+		wc_get_template( 'single-product/review-meta.php' );
+	}
+}
+
+if ( ! function_exists( 'woocommerce_review_display_comment_text' ) ) {
+
+	/**
+	 * Display the review content.
+	 */
+	function woocommerce_review_display_comment_text() {
+		echo '<div class="description">';
+		comment_text();
+		echo '</div>';
+	}
+}
+
 if ( ! function_exists( 'woocommerce_output_related_products' ) ) {
 
 	/**
@@ -1164,7 +1265,7 @@ if ( ! function_exists( 'woocommerce_output_related_products' ) ) {
 		$args = array(
 			'posts_per_page' 	=> 4,
 			'columns' 			=> 4,
-			'orderby' 			=> 'rand'
+			'orderby' 			=> 'rand',
 		);
 
 		woocommerce_related_products( apply_filters( 'woocommerce_output_related_products_args', $args ) );
@@ -1177,30 +1278,33 @@ if ( ! function_exists( 'woocommerce_related_products' ) ) {
 	 * Output the related products.
 	 *
 	 * @param array Provided arguments
-	 * @param bool Columns argument for backwards compat
-	 * @param bool Order by argument for backwards compat
 	 */
-	function woocommerce_related_products( $args = array(), $columns = false, $orderby = false ) {
-		if ( ! is_array( $args ) ) {
-			_deprecated_argument( __FUNCTION__, '2.1', __( 'Use $args argument as an array instead. Deprecated argument will be removed in WC 2.2.', 'woocommerce' ) );
+	function woocommerce_related_products( $args = array() ) {
+		global $product, $woocommerce_loop;
 
-			$argsvalue = $args;
-
-			$args = array(
-				'posts_per_page' => $argsvalue,
-				'columns'        => $columns,
-				'orderby'        => $orderby,
-			);
+		if ( ! $product ) {
+			return;
 		}
 
 		$defaults = array(
 			'posts_per_page' => 2,
 			'columns'        => 2,
-			'orderby'        => 'rand'
+			'orderby'        => 'rand',
+			'order'          => 'desc',
 		);
 
 		$args = wp_parse_args( $args, $defaults );
 
+		// Get visble related products then sort them at random.
+		$args['related_products'] = array_filter( array_map( 'wc_get_product', wc_get_related_products( $product->get_id(), $args['posts_per_page'], $product->get_upsell_ids() ) ), 'wc_products_array_filter_visible' );
+
+		// Handle orderby.
+		$args['related_products'] = wc_products_array_orderby( $args['related_products'], $args['orderby'], $args['order'] );
+
+		// Set global loop values.
+		$woocommerce_loop['name']    = 'related';
+		$woocommerce_loop['columns'] = apply_filters( 'woocommerce_related_products_columns', $args['columns'] );
+
 		wc_get_template( 'single-product/related.php', $args );
 	}
 }
@@ -1210,18 +1314,41 @@ if ( ! function_exists( 'woocommerce_upsell_display' ) ) {
 	/**
 	 * Output product up sells.
 	 *
-	 * @param int $posts_per_page (default: -1)
+	 * @param int $limit (default: -1)
 	 * @param int $columns (default: 4)
-	 * @param string $orderby (default: 'rand')
+	 * @param string $orderby Supported values - rand, title, ID, date, modified, menu_order, price.
+	 * @param string $order Sort direction.
 	 */
-	function woocommerce_upsell_display( $posts_per_page = '-1', $columns = 4, $orderby = 'rand' ) {
-		$args = apply_filters( 'woocommerce_upsell_display_args', array(
-			'posts_per_page'	=> $posts_per_page,
-			'orderby'			=> apply_filters( 'woocommerce_upsells_orderby', $orderby ),
-			'columns'			=> $columns
-		) );
+	function woocommerce_upsell_display( $limit = '-1', $columns = 4, $orderby = 'rand', $order = 'desc' ) {
+		global $product, $woocommerce_loop;
 
-		wc_get_template( 'single-product/up-sells.php', $args );
+		if ( ! $product ) {
+			return;
+		}
+
+		// Handle the legacy filter which controlled posts per page etc.
+		$args = apply_filters( 'woocommerce_upsell_display_args', array(
+			'posts_per_page' => $limit,
+			'orderby'        => $orderby,
+			'columns'        => $columns,
+		) );
+		$woocommerce_loop['name']    = 'up-sells';
+		$woocommerce_loop['columns'] = apply_filters( 'woocommerce_upsells_columns', isset( $args['columns'] ) ? $args['columns'] : $columns );
+		$orderby                     = apply_filters( 'woocommerce_upsells_orderby', isset( $args['orderby'] ) ? $args['orderby'] : $orderby );
+		$limit                       = apply_filters( 'woocommerce_upsells_total', isset( $args['posts_per_page'] ) ? $args['posts_per_page'] : $limit );
+
+		// Get visble upsells then sort them at random, then limit result set.
+		$upsells = wc_products_array_orderby( array_filter( array_map( 'wc_get_product', $product->get_upsell_ids() ), 'wc_products_array_filter_visible' ), $orderby, $order );
+		$upsells = $limit > 0 ? array_slice( $upsells, 0, $limit ) : $upsells;
+
+		wc_get_template( 'single-product/up-sells.php', array(
+			'upsells' => $upsells,
+
+			// Not used now, but used in previous version of up-sells.php.
+			'posts_per_page' => $limit,
+			'orderby'        => $orderby,
+			'columns'        => $columns,
+		) );
 	}
 }
 
@@ -1247,6 +1374,9 @@ if ( ! function_exists( 'woocommerce_cart_totals' ) ) {
 	 * @subpackage	Cart
 	 */
 	function woocommerce_cart_totals() {
+		if ( is_checkout() ) {
+			return;
+		}
 		wc_get_template( 'cart/cart-totals.php' );
 	}
 }
@@ -1256,16 +1386,36 @@ if ( ! function_exists( 'woocommerce_cross_sell_display' ) ) {
 	/**
 	 * Output the cart cross-sells.
 	 *
-	 * @param  integer $posts_per_page
-	 * @param  integer $columns
-	 * @param  string $orderby
+	 * @param  int $limit (default: 2)
+	 * @param  int $columns (default: 2)
+	 * @param  string $orderby (default: 'rand')
+	 * @param  string $order (default: 'desc')
 	 */
-	function woocommerce_cross_sell_display( $posts_per_page = 2, $columns = 2, $orderby = 'rand' ) {
+	function woocommerce_cross_sell_display( $limit = 2, $columns = 2, $orderby = 'rand', $order = 'desc' ) {
+		global $woocommerce_loop;
+
+		if ( is_checkout() ) {
+			return;
+		}
+		// Get visble cross sells then sort them at random.
+		$cross_sells                 = array_filter( array_map( 'wc_get_product', WC()->cart->get_cross_sells() ), 'wc_products_array_filter_visible' );
+		$woocommerce_loop['name']    = 'cross-sells';
+		$woocommerce_loop['columns'] = apply_filters( 'woocommerce_cross_sells_columns', $columns );
+
+		// Handle orderby and limit results.
+		$orderby     = apply_filters( 'woocommerce_cross_sells_orderby', $orderby );
+		$cross_sells = wc_products_array_orderby( $cross_sells, $orderby, $order );
+		$limit       = apply_filters( 'woocommerce_cross_sells_total', $limit );
+		$cross_sells = $limit > 0 ? array_slice( $cross_sells, 0, $limit ) : $cross_sells;
+
 		wc_get_template( 'cart/cross-sells.php', array(
-				'posts_per_page' => $posts_per_page,
-				'orderby'        => $orderby,
-				'columns'        => $columns
-			) );
+			'cross_sells'        => $cross_sells,
+
+			// Not used now, but used in previous version of up-sells.php.
+			'posts_per_page'	 => $limit,
+			'orderby'			 => $orderby,
+			'columns'			 => $columns,
+		) );
 	}
 }
 
@@ -1281,7 +1431,29 @@ if ( ! function_exists( 'woocommerce_button_proceed_to_checkout' ) ) {
 	}
 }
 
+if ( ! function_exists( 'woocommerce_widget_shopping_cart_button_view_cart' ) ) {
 
+	/**
+	 * Output the proceed to checkout button.
+	 *
+	 * @subpackage	Cart
+	 */
+	function woocommerce_widget_shopping_cart_button_view_cart() {
+		echo '<a href="' . esc_url( wc_get_cart_url() ) . '" class="button wc-forward">' . esc_html__( 'View cart', 'woocommerce' ) . '</a>';
+	}
+}
+
+if ( ! function_exists( 'woocommerce_widget_shopping_cart_proceed_to_checkout' ) ) {
+
+	/**
+	 * Output the proceed to checkout button.
+	 *
+	 * @subpackage	Cart
+	 */
+	function woocommerce_widget_shopping_cart_proceed_to_checkout() {
+		echo '<a href="' . esc_url( wc_get_checkout_url() ) . '" class="button checkout wc-forward">' . esc_html__( 'Checkout', 'woocommerce' ) . '</a>';
+	}
+}
 
 /** Mini-Cart *************************************************************/
 
@@ -1290,11 +1462,12 @@ if ( ! function_exists( 'woocommerce_mini_cart' ) ) {
 	/**
 	 * Output the Mini-cart - used by cart widget.
 	 *
+	 * @param array $args
 	 */
 	function woocommerce_mini_cart( $args = array() ) {
 
 		$defaults = array(
-			'list_class' => ''
+			'list_class' => '',
 		);
 
 		$args = wp_parse_args( $args, $defaults );
@@ -1311,16 +1484,17 @@ if ( ! function_exists( 'woocommerce_login_form' ) ) {
 	 * Output the WooCommerce Login Form.
 	 *
 	 * @subpackage	Forms
+	 * @param array $args
 	 */
 	function woocommerce_login_form( $args = array() ) {
 
 		$defaults = array(
 			'message'  => '',
 			'redirect' => '',
-			'hidden'   => false
+			'hidden'   => false,
 		);
 
-		$args = wp_parse_args( $args, $defaults  );
+		$args = wp_parse_args( $args, $defaults );
 
 		wc_get_template( 'global/form-login.php', $args );
 	}
@@ -1342,25 +1516,32 @@ if ( ! function_exists( 'woocommerce_breadcrumb' ) ) {
 
 	/**
 	 * Output the WooCommerce Breadcrumb.
+	 *
+	 * @param array $args
 	 */
 	function woocommerce_breadcrumb( $args = array() ) {
 		$args = wp_parse_args( $args, apply_filters( 'woocommerce_breadcrumb_defaults', array(
 			'delimiter'   => '&nbsp;&#47;&nbsp;',
-			'wrap_before' => '<nav class="woocommerce-breadcrumb" ' . ( is_single() ? 'itemprop="breadcrumb"' : '' ) . '>',
+			'wrap_before' => '<nav class="woocommerce-breadcrumb">',
 			'wrap_after'  => '</nav>',
 			'before'      => '',
 			'after'       => '',
-			'home'        => _x( 'Home', 'breadcrumb', 'woocommerce' )
+			'home'        => _x( 'Home', 'breadcrumb', 'woocommerce' ),
 		) ) );
 
 		$breadcrumbs = new WC_Breadcrumb();
 
-		if ( $args['home'] ) {
+		if ( ! empty( $args['home'] ) ) {
 			$breadcrumbs->add_crumb( $args['home'], apply_filters( 'woocommerce_breadcrumb_home_url', home_url() ) );
 		}
 
 		$args['breadcrumb'] = $breadcrumbs->generate();
 
+		/**
+		 * @hooked WC_Structured_Data::generate_breadcrumblist_data() - 10
+		 */
+		do_action( 'woocommerce_breadcrumb', $breadcrumbs, $args );
+
 		wc_get_template( 'global/breadcrumb.php', $args );
 	}
 }
@@ -1394,8 +1575,8 @@ if ( ! function_exists( 'woocommerce_checkout_payment' ) ) {
 
 		wc_get_template( 'checkout/payment.php', array(
 			'checkout'           => WC()->checkout(),
-			'available_gateways' => WC()->payment_gateways()->get_available_payment_gateways(),
-			'order_button_text'  => apply_filters( 'woocommerce_order_button_text', __( 'Place order', 'woocommerce' ) )
+			'available_gateways' => $available_gateways,
+			'order_button_text'  => apply_filters( 'woocommerce_order_button_text', __( 'Place order', 'woocommerce' ) ),
 		) );
 	}
 }
@@ -1470,8 +1651,8 @@ if ( ! function_exists( 'woocommerce_products_will_display' ) ) {
 					$products_will_display = false;
 				} else {
 					// If we get here, the parents were empty so we're forced to check children
-					foreach ( $has_children as $term ) {
-						$children = get_term_children( $term, $term->taxonomy );
+					foreach ( $has_children as $term_id ) {
+						$children = get_term_children( $term_id, $term->taxonomy );
 
 						if ( sizeof( get_objects_in_term( $children, $term->taxonomy ) ) > 0 ) {
 							$products_will_display = false;
@@ -1505,7 +1686,7 @@ if ( ! function_exists( 'woocommerce_product_subcategories' ) ) {
 		$defaults = array(
 			'before'        => '',
 			'after'         => '',
-			'force_display' => false
+			'force_display' => false,
 		);
 
 		$args = wp_parse_args( $args, $defaults );
@@ -1546,17 +1727,17 @@ if ( ! function_exists( 'woocommerce_product_subcategories' ) ) {
 			}
 		}
 
-		// NOTE: using child_of instead of parent - this is not ideal but due to a WP bug ( http://core.trac.wordpress.org/ticket/15626 ) pad_counts won't work
+		// NOTE: using child_of instead of parent - this is not ideal but due to a WP bug ( https://core.trac.wordpress.org/ticket/15626 ) pad_counts won't work
 		$product_categories = get_categories( apply_filters( 'woocommerce_product_subcategories_args', array(
 			'parent'       => $parent_id,
 			'menu_order'   => 'ASC',
 			'hide_empty'   => 0,
 			'hierarchical' => 1,
 			'taxonomy'     => 'product_cat',
-			'pad_counts'   => 1
+			'pad_counts'   => 1,
 		) ) );
 
-		if ( ! apply_filters( 'woocommerce_product_subcategories_hide_empty', false ) ) {
+		if ( apply_filters( 'woocommerce_product_subcategories_hide_empty', true ) ) {
 			$product_categories = wp_list_filter( $product_categories, array( 'count' => 0 ), 'NOT' );
 		}
 
@@ -1565,7 +1746,7 @@ if ( ! function_exists( 'woocommerce_product_subcategories' ) ) {
 
 			foreach ( $product_categories as $category ) {
 				wc_get_template( 'content-product_cat.php', array(
-					'category' => $category
+					'category' => $category,
 				) );
 			}
 
@@ -1608,23 +1789,31 @@ if ( ! function_exists( 'woocommerce_subcategory_thumbnail' ) ) {
 	 * @subpackage	Loop
 	 */
 	function woocommerce_subcategory_thumbnail( $category ) {
-		$small_thumbnail_size  	= apply_filters( 'single_product_small_thumbnail_size', 'shop_catalog' );
+		$small_thumbnail_size  	= apply_filters( 'subcategory_archive_thumbnail_size', 'shop_catalog' );
 		$dimensions    			= wc_get_image_size( $small_thumbnail_size );
-		$thumbnail_id  			= get_woocommerce_term_meta( $category->term_id, 'thumbnail_id', true  );
+		$thumbnail_id  			= get_woocommerce_term_meta( $category->term_id, 'thumbnail_id', true );
 
 		if ( $thumbnail_id ) {
-			$image = wp_get_attachment_image_src( $thumbnail_id, $small_thumbnail_size  );
-			$image = $image[0];
+			$image        = wp_get_attachment_image_src( $thumbnail_id, $small_thumbnail_size );
+			$image        = $image[0];
+			$image_srcset = function_exists( 'wp_get_attachment_image_srcset' ) ? wp_get_attachment_image_srcset( $thumbnail_id, $small_thumbnail_size ) : false;
+			$image_sizes  = function_exists( 'wp_get_attachment_image_sizes' ) ? wp_get_attachment_image_sizes( $thumbnail_id, $small_thumbnail_size ) : false;
 		} else {
-			$image = wc_placeholder_img_src();
+			$image        = wc_placeholder_img_src();
+			$image_srcset = $image_sizes = false;
 		}
 
 		if ( $image ) {
 			// Prevent esc_url from breaking spaces in urls for image embeds
-			// Ref: http://core.trac.wordpress.org/ticket/23605
+			// Ref: https://core.trac.wordpress.org/ticket/23605
 			$image = str_replace( ' ', '%20', $image );
 
-			echo '<img src="' . esc_url( $image ) . '" alt="' . esc_attr( $category->name ) . '" width="' . esc_attr( $dimensions['width'] ) . '" height="' . esc_attr( $dimensions['height'] ) . '" />';
+			// Add responsive image markup if available
+			if ( $image_srcset && $image_sizes ) {
+				echo '<img src="' . esc_url( $image ) . '" alt="' . esc_attr( $category->name ) . '" width="' . esc_attr( $dimensions['width'] ) . '" height="' . esc_attr( $dimensions['height'] ) . '" srcset="' . esc_attr( $image_srcset ) . '" sizes="' . esc_attr( $image_sizes ) . '" />';
+			} else {
+				echo '<img src="' . esc_url( $image ) . '" alt="' . esc_attr( $category->name ) . '" width="' . esc_attr( $dimensions['width'] ) . '" height="' . esc_attr( $dimensions['height'] ) . '" />';
+			}
 		}
 	}
 }
@@ -1638,10 +1827,12 @@ if ( ! function_exists( 'woocommerce_order_details_table' ) ) {
 	 * @subpackage	Orders
 	 */
 	function woocommerce_order_details_table( $order_id ) {
-		if ( ! $order_id ) return;
+		if ( ! $order_id ) {
+			return;
+		}
 
 		wc_get_template( 'order/order-details.php', array(
-			'order_id' => $order_id
+			'order_id' => $order_id,
 		) );
 	}
 }
@@ -1661,7 +1852,7 @@ if ( ! function_exists( 'woocommerce_order_again_button' ) ) {
 		}
 
 		wc_get_template( 'order/order-again.php', array(
-			'order' => $order
+			'order' => $order,
 		) );
 	}
 }
@@ -1677,7 +1868,6 @@ if ( ! function_exists( 'woocommerce_form_field' ) ) {
 	 * @param string $key
 	 * @param mixed $args
 	 * @param string $value (default: null)
-	 * @todo This function needs to be broken up in smaller pieces
 	 */
 	function woocommerce_form_field( $key, $args, $value = null ) {
 		$defaults = array(
@@ -1687,6 +1877,7 @@ if ( ! function_exists( 'woocommerce_form_field' ) ) {
 			'placeholder'       => '',
 			'maxlength'         => false,
 			'required'          => false,
+			'autocomplete'      => false,
 			'id'                => $key,
 			'class'             => array(),
 			'label_class'       => array(),
@@ -1696,6 +1887,8 @@ if ( ! function_exists( 'woocommerce_form_field' ) ) {
 			'custom_attributes' => array(),
 			'validate'          => array(),
 			'default'           => '',
+			'autofocus'         => '',
+			'priority'          => '',
 		);
 
 		$args = wp_parse_args( $args, $defaults );
@@ -1703,13 +1896,11 @@ if ( ! function_exists( 'woocommerce_form_field' ) ) {
 
 		if ( $args['required'] ) {
 			$args['class'][] = 'validate-required';
-			$required = ' <abbr class="required" title="' . esc_attr__( 'required', 'woocommerce'  ) . '">*</abbr>';
+			$required = ' <abbr class="required" title="' . esc_attr__( 'required', 'woocommerce' ) . '">*</abbr>';
 		} else {
 			$required = '';
 		}
 
-		$args['maxlength'] = ( $args['maxlength'] ) ? 'maxlength="' . absint( $args['maxlength'] ) . '"' : '';
-
 		if ( is_string( $args['label_class'] ) ) {
 			$args['label_class'] = array( $args['label_class'] );
 		}
@@ -1719,7 +1910,20 @@ if ( ! function_exists( 'woocommerce_form_field' ) ) {
 		}
 
 		// Custom attribute handling
-		$custom_attributes = array();
+		$custom_attributes         = array();
+		$args['custom_attributes'] = array_filter( (array) $args['custom_attributes'] );
+
+		if ( $args['maxlength'] ) {
+			$args['custom_attributes']['maxlength'] = absint( $args['maxlength'] );
+		}
+
+		if ( ! empty( $args['autocomplete'] ) ) {
+			$args['custom_attributes']['autocomplete'] = $args['autocomplete'];
+		}
+
+		if ( true === $args['autofocus'] ) {
+			$args['custom_attributes']['autofocus'] = 'autofocus';
+		}
 
 		if ( ! empty( $args['custom_attributes'] ) && is_array( $args['custom_attributes'] ) ) {
 			foreach ( $args['custom_attributes'] as $attribute => $attribute_value ) {
@@ -1728,14 +1932,15 @@ if ( ! function_exists( 'woocommerce_form_field' ) ) {
 		}
 
 		if ( ! empty( $args['validate'] ) ) {
-			foreach( $args['validate'] as $validate ) {
+			foreach ( $args['validate'] as $validate ) {
 				$args['class'][] = 'validate-' . $validate;
 			}
 		}
 
-		$field = '';
-		$label_id = $args['id'];
-		$field_container = '<p class="form-row %1$s" id="%2$s">%3$s</p>';
+		$field           = '';
+		$label_id        = $args['id'];
+		$sort            = $args['priority'] ? $args['priority'] : '';
+		$field_container = '<p class="form-row %1$s" id="%2$s" data-priority="' . esc_attr( $sort ) . '">%3$s</p>';
 
 		switch ( $args['type'] ) {
 			case 'country' :
@@ -1746,15 +1951,14 @@ if ( ! function_exists( 'woocommerce_form_field' ) ) {
 
 					$field .= '<strong>' . current( array_values( $countries ) ) . '</strong>';
 
-					$field .= '<input type="hidden" name="' . esc_attr( $key ) . '" id="' . esc_attr( $args['id'] ) . '" value="' . current( array_keys($countries ) ) . '" ' . implode( ' ', $custom_attributes ) . ' class="country_to_state" />';
+					$field .= '<input type="hidden" name="' . esc_attr( $key ) . '" id="' . esc_attr( $args['id'] ) . '" value="' . current( array_keys( $countries ) ) . '" ' . implode( ' ', $custom_attributes ) . ' class="country_to_state" />';
 
 				} else {
 
-					$field = '<select name="' . esc_attr( $key ) . '" id="' . esc_attr( $args['id'] ) . '" class="country_to_state country_select ' . esc_attr( implode( ' ', $args['input_class'] ) ) .'" ' . implode( ' ', $custom_attributes ) . '>'
-							. '<option value="">'.__( 'Select a country&hellip;', 'woocommerce' ) .'</option>';
+					$field = '<select name="' . esc_attr( $key ) . '" id="' . esc_attr( $args['id'] ) . '" class="country_to_state country_select ' . esc_attr( implode( ' ', $args['input_class'] ) ) . '" ' . implode( ' ', $custom_attributes ) . '>' . '<option value="">' . esc_html__( 'Select a country&hellip;', 'woocommerce' ) . '</option>';
 
 					foreach ( $countries as $ckey => $cvalue ) {
-						$field .= '<option value="' . esc_attr( $ckey ) . '" '.selected( $value, $ckey, false ) .'>'.__( $cvalue, 'woocommerce' ) .'</option>';
+						$field .= '<option value="' . esc_attr( $ckey ) . '" ' . selected( $value, $ckey, false ) . '>' . $cvalue . '</option>';
 					}
 
 					$field .= '</select>';
@@ -1775,35 +1979,35 @@ if ( ! function_exists( 'woocommerce_form_field' ) ) {
 
 					$field_container = '<p class="form-row %1$s" id="%2$s" style="display: none">%3$s</p>';
 
-					$field .= '<input type="hidden" class="hidden" name="' . esc_attr( $key )  . '" id="' . esc_attr( $args['id'] ) . '" value="" ' . implode( ' ', $custom_attributes ) . ' placeholder="' . esc_attr( $args['placeholder'] ) . '" />';
+					$field .= '<input type="hidden" class="hidden" name="' . esc_attr( $key ) . '" id="' . esc_attr( $args['id'] ) . '" value="" ' . implode( ' ', $custom_attributes ) . ' placeholder="' . esc_attr( $args['placeholder'] ) . '" />';
 
 				} elseif ( is_array( $states ) ) {
 
-					$field .= '<select name="' . esc_attr( $key ) . '" id="' . esc_attr( $args['id'] ) . '" class="state_select ' . esc_attr( implode( ' ', $args['input_class'] ) ) .'" ' . implode( ' ', $custom_attributes ) . ' placeholder="' . esc_attr( $args['placeholder'] ) . '">
-						<option value="">'.__( 'Select a state&hellip;', 'woocommerce' ) .'</option>';
+					$field .= '<select name="' . esc_attr( $key ) . '" id="' . esc_attr( $args['id'] ) . '" class="state_select ' . esc_attr( implode( ' ', $args['input_class'] ) ) . '" ' . implode( ' ', $custom_attributes ) . ' data-placeholder="' . esc_attr( $args['placeholder'] ) . '">
+						<option value="">' . esc_html__( 'Select a state&hellip;', 'woocommerce' ) . '</option>';
 
 					foreach ( $states as $ckey => $cvalue ) {
-						$field .= '<option value="' . esc_attr( $ckey ) . '" '.selected( $value, $ckey, false ) .'>'.__( $cvalue, 'woocommerce' ) .'</option>';
+						$field .= '<option value="' . esc_attr( $ckey ) . '" ' . selected( $value, $ckey, false ) . '>' . $cvalue . '</option>';
 					}
 
 					$field .= '</select>';
 
 				} else {
 
-					$field .= '<input type="text" class="input-text ' . esc_attr( implode( ' ', $args['input_class'] ) ) .'" value="' . esc_attr( $value ) . '"  placeholder="' . esc_attr( $args['placeholder'] ) . '" name="' . esc_attr( $key ) . '" id="' . esc_attr( $args['id'] ) . '" ' . implode( ' ', $custom_attributes ) . ' />';
+					$field .= '<input type="text" class="input-text ' . esc_attr( implode( ' ', $args['input_class'] ) ) . '" value="' . esc_attr( $value ) . '"  placeholder="' . esc_attr( $args['placeholder'] ) . '" name="' . esc_attr( $key ) . '" id="' . esc_attr( $args['id'] ) . '" ' . implode( ' ', $custom_attributes ) . ' />';
 
 				}
 
 				break;
 			case 'textarea' :
 
-				$field .= '<textarea name="' . esc_attr( $key ) . '" class="input-text ' . esc_attr( implode( ' ', $args['input_class'] ) ) .'" id="' . esc_attr( $args['id'] ) . '" placeholder="' . esc_attr( $args['placeholder'] ) . '" ' . $args['maxlength'] . ' ' . ( empty( $args['custom_attributes']['rows'] ) ? ' rows="2"' : '' ) . ( empty( $args['custom_attributes']['cols'] ) ? ' cols="5"' : '' ) . implode( ' ', $custom_attributes ) . '>'. esc_textarea( $value  ) .'</textarea>';
+				$field .= '<textarea name="' . esc_attr( $key ) . '" class="input-text ' . esc_attr( implode( ' ', $args['input_class'] ) ) . '" id="' . esc_attr( $args['id'] ) . '" placeholder="' . esc_attr( $args['placeholder'] ) . '" ' . ( empty( $args['custom_attributes']['rows'] ) ? ' rows="2"' : '' ) . ( empty( $args['custom_attributes']['cols'] ) ? ' cols="5"' : '' ) . implode( ' ', $custom_attributes ) . '>' . esc_textarea( $value ) . '</textarea>';
 
 				break;
 			case 'checkbox' :
 
-				$field = '<label class="checkbox ' . implode( ' ', $args['label_class'] ) .'" ' . implode( ' ', $custom_attributes ) . '>
-						<input type="' . esc_attr( $args['type'] ) . '" class="input-checkbox ' . esc_attr( implode( ' ', $args['input_class'] ) ) .'" name="' . esc_attr( $key ) . '" id="' . esc_attr( $args['id'] ) . '" value="1" '.checked( $value, 1, false ) .' /> '
+				$field = '<label class="checkbox ' . implode( ' ', $args['label_class'] ) . '" ' . implode( ' ', $custom_attributes ) . '>
+						<input type="' . esc_attr( $args['type'] ) . '" class="input-checkbox ' . esc_attr( implode( ' ', $args['input_class'] ) ) . '" name="' . esc_attr( $key ) . '" id="' . esc_attr( $args['id'] ) . '" value="1" ' . checked( $value, 1, false ) . ' /> '
 						 . $args['label'] . $required . '</label>';
 
 				break;
@@ -1813,7 +2017,7 @@ if ( ! function_exists( 'woocommerce_form_field' ) ) {
 			case 'tel' :
 			case 'number' :
 
-				$field .= '<input type="' . esc_attr( $args['type'] ) . '" class="input-text ' . esc_attr( implode( ' ', $args['input_class'] ) ) .'" name="' . esc_attr( $key ) . '" id="' . esc_attr( $args['id'] ) . '" placeholder="' . esc_attr( $args['placeholder'] ) . '" ' . $args['maxlength'] . ' value="' . esc_attr( $value ) . '" ' . implode( ' ', $custom_attributes ) . ' />';
+				$field .= '<input type="' . esc_attr( $args['type'] ) . '" class="input-text ' . esc_attr( implode( ' ', $args['input_class'] ) ) . '" name="' . esc_attr( $key ) . '" id="' . esc_attr( $args['id'] ) . '" placeholder="' . esc_attr( $args['placeholder'] ) . '"  value="' . esc_attr( $value ) . '" ' . implode( ' ', $custom_attributes ) . ' />';
 
 				break;
 			case 'select' :
@@ -1829,10 +2033,10 @@ if ( ! function_exists( 'woocommerce_form_field' ) ) {
 							}
 							$custom_attributes[] = 'data-allow_clear="true"';
 						}
-						$options .= '<option value="' . esc_attr( $option_key ) . '" '. selected( $value, $option_key, false ) . '>' . esc_attr( $option_text ) .'</option>';
+						$options .= '<option value="' . esc_attr( $option_key ) . '" ' . selected( $value, $option_key, false ) . '>' . esc_attr( $option_text ) . '</option>';
 					}
 
-					$field .= '<select name="' . esc_attr( $key ) . '" id="' . esc_attr( $args['id'] ) . '" class="select '.esc_attr( implode( ' ', $args['input_class'] ) ) .'" ' . implode( ' ', $custom_attributes ) . ' placeholder="' . esc_attr( $args['placeholder'] ) . '">
+					$field .= '<select name="' . esc_attr( $key ) . '" id="' . esc_attr( $args['id'] ) . '" class="select ' . esc_attr( implode( ' ', $args['input_class'] ) ) . '" ' . implode( ' ', $custom_attributes ) . ' data-placeholder="' . esc_attr( $args['placeholder'] ) . '">
 							' . $options . '
 						</select>';
 				}
@@ -1844,8 +2048,8 @@ if ( ! function_exists( 'woocommerce_form_field' ) ) {
 
 				if ( ! empty( $args['options'] ) ) {
 					foreach ( $args['options'] as $option_key => $option_text ) {
-						$field .= '<input type="radio" class="input-radio ' . esc_attr( implode( ' ', $args['input_class'] ) ) .'" value="' . esc_attr( $option_key ) . '" name="' . esc_attr( $key ) . '" id="' . esc_attr( $args['id'] ) . '_' . esc_attr( $option_key ) . '"' . checked( $value, $option_key, false ) . ' />';
-						$field .= '<label for="' . esc_attr( $args['id'] ) . '_' . esc_attr( $option_key ) . '" class="radio ' . implode( ' ', $args['label_class'] ) .'">' . $option_text . '</label>';
+						$field .= '<input type="radio" class="input-radio ' . esc_attr( implode( ' ', $args['input_class'] ) ) . '" value="' . esc_attr( $option_key ) . '" name="' . esc_attr( $key ) . '" id="' . esc_attr( $args['id'] ) . '_' . esc_attr( $option_key ) . '"' . checked( $value, $option_key, false ) . ' />';
+						$field .= '<label for="' . esc_attr( $args['id'] ) . '_' . esc_attr( $option_key ) . '" class="radio ' . implode( ' ', $args['label_class'] ) . '">' . $option_text . '</label>';
 					}
 				}
 
@@ -1856,7 +2060,7 @@ if ( ! function_exists( 'woocommerce_form_field' ) ) {
 			$field_html = '';
 
 			if ( $args['label'] && 'checkbox' != $args['type'] ) {
-				$field_html .= '<label for="' . esc_attr( $label_id ) . '" class="' . esc_attr( implode( ' ', $args['label_class'] ) ) .'">' . $args['label'] . $required . '</label>';
+				$field_html .= '<label for="' . esc_attr( $label_id ) . '" class="' . esc_attr( implode( ' ', $args['label_class'] ) ) . '">' . $args['label'] . $required . '</label>';
 			}
 
 			$field_html .= $field;
@@ -1865,12 +2069,9 @@ if ( ! function_exists( 'woocommerce_form_field' ) ) {
 				$field_html .= '<span class="description">' . esc_html( $args['description'] ) . '</span>';
 			}
 
-			$container_class = 'form-row ' . esc_attr( implode( ' ', $args['class'] ) );
-			$container_id = esc_attr( $args['id'] ) . '_field';
-
-			$after = ! empty( $args['clear'] ) ? '<div class="clear"></div>' : '';
-
-			$field = sprintf( $field_container, $container_class, $container_id, $field_html ) . $after;
+			$container_class = esc_attr( implode( ' ', $args['class'] ) );
+			$container_id    = esc_attr( $args['id'] ) . '_field';
+			$field           = sprintf( $field_container, $container_class, $container_id, $field_html );
 		}
 
 		$field = apply_filters( 'woocommerce_form_field_' . $args['type'], $field, $key, $args, $value );
@@ -1899,11 +2100,19 @@ if ( ! function_exists( 'get_product_search_form' ) ) {
 	 * @return string
 	 */
 	function get_product_search_form( $echo = true  ) {
+		global $product_search_form_index;
+
 		ob_start();
 
-		do_action( 'pre_get_product_search_form'  );
+		if ( empty( $product_search_form_index ) ) {
+			$product_search_form_index = 0;
+		}
 
-		wc_get_template( 'product-searchform.php' );
+		do_action( 'pre_get_product_search_form' );
+
+		wc_get_template( 'product-searchform.php', array(
+			'index' => $product_search_form_index++,
+		) );
 
 		$form = apply_filters( 'get_product_search_form', ob_get_clean() );
 
@@ -1972,46 +2181,416 @@ if ( ! function_exists( 'wc_dropdown_variation_attribute_options' ) ) {
 			'name'             => '',
 			'id'               => '',
 			'class'            => '',
-			'show_option_none' => __( 'Choose an option', 'woocommerce' )
+			'show_option_none' => __( 'Choose an option', 'woocommerce' ),
 		) );
 
-		$options   = $args['options'];
-		$product   = $args['product'];
-		$attribute = $args['attribute'];
-		$name      = $args['name'] ? $args['name'] : 'attribute_' . sanitize_title( $attribute );
-		$id        = $args['id'] ? $args['id'] : sanitize_title( $attribute );
-		$class     = $args['class'];
+		$options               = $args['options'];
+		$product               = $args['product'];
+		$attribute             = $args['attribute'];
+		$name                  = $args['name'] ? $args['name'] : 'attribute_' . sanitize_title( $attribute );
+		$id                    = $args['id'] ? $args['id'] : sanitize_title( $attribute );
+		$class                 = $args['class'];
+		$show_option_none      = $args['show_option_none'] ? true : false;
+		$show_option_none_text = $args['show_option_none'] ? $args['show_option_none'] : __( 'Choose an option', 'woocommerce' ); // We'll do our best to hide the placeholder, but we'll need to show something when resetting options.
 
 		if ( empty( $options ) && ! empty( $product ) && ! empty( $attribute ) ) {
 			$attributes = $product->get_variation_attributes();
 			$options    = $attributes[ $attribute ];
 		}
 
-		echo '<select id="' . esc_attr( $id ) . '" class="' . esc_attr( $class ) . '" name="' . esc_attr( $name ) . '" data-attribute_name="attribute_' . esc_attr( sanitize_title( $attribute ) ) . '">';
-
-		if ( $args['show_option_none'] ) {
-			echo '<option value="">' . esc_html( $args['show_option_none'] ) . '</option>';
-		}
+		$html = '<select id="' . esc_attr( $id ) . '" class="' . esc_attr( $class ) . '" name="' . esc_attr( $name ) . '" data-attribute_name="attribute_' . esc_attr( sanitize_title( $attribute ) ) . '" data-show_option_none="' . ( $show_option_none ? 'yes' : 'no' ) . '">';
+		$html .= '<option value="">' . esc_html( $show_option_none_text ) . '</option>';
 
 		if ( ! empty( $options ) ) {
 			if ( $product && taxonomy_exists( $attribute ) ) {
 				// Get terms if this is a taxonomy - ordered. We need the names too.
-				$terms = wc_get_product_terms( $product->id, $attribute, array( 'fields' => 'all' ) );
+				$terms = wc_get_product_terms( $product->get_id(), $attribute, array( 'fields' => 'all' ) );
 
 				foreach ( $terms as $term ) {
 					if ( in_array( $term->slug, $options ) ) {
-						echo '<option value="' . esc_attr( $term->slug ) . '" ' . selected( sanitize_title( $args['selected'] ), $term->slug, false ) . '>' . esc_html( apply_filters( 'woocommerce_variation_option_name', $term->name ) ) . '</option>';
+						$html .= '<option value="' . esc_attr( $term->slug ) . '" ' . selected( sanitize_title( $args['selected'] ), $term->slug, false ) . '>' . esc_html( apply_filters( 'woocommerce_variation_option_name', $term->name ) ) . '</option>';
 					}
 				}
 			} else {
 				foreach ( $options as $option ) {
 					// This handles < 2.4.0 bw compatibility where text attributes were not sanitized.
 					$selected = sanitize_title( $args['selected'] ) === $args['selected'] ? selected( $args['selected'], sanitize_title( $option ), false ) : selected( $args['selected'], $option, false );
-					echo '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( apply_filters( 'woocommerce_variation_option_name', $option ) ) . '</option>';
+					$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( apply_filters( 'woocommerce_variation_option_name', $option ) ) . '</option>';
 				}
 			}
 		}
 
-		echo '</select>';
+		$html .= '</select>';
+
+		echo apply_filters( 'woocommerce_dropdown_variation_attribute_options_html', $html, $args );
 	}
 }
+
+if ( ! function_exists( 'woocommerce_account_content' ) ) {
+
+	/**
+	 * My Account content output.
+	 */
+	function woocommerce_account_content() {
+		global $wp;
+
+		foreach ( $wp->query_vars as $key => $value ) {
+			// Ignore pagename param.
+			if ( 'pagename' === $key ) {
+				continue;
+			}
+
+			if ( has_action( 'woocommerce_account_' . $key . '_endpoint' ) ) {
+				do_action( 'woocommerce_account_' . $key . '_endpoint', $value );
+				return;
+			}
+		}
+
+		// No endpoint found? Default to dashboard.
+		wc_get_template( 'myaccount/dashboard.php', array(
+			'current_user' => get_user_by( 'id', get_current_user_id() ),
+		) );
+	}
+}
+
+if ( ! function_exists( 'woocommerce_account_navigation' ) ) {
+
+	/**
+	 * My Account navigation template.
+	 */
+	function woocommerce_account_navigation() {
+		wc_get_template( 'myaccount/navigation.php' );
+	}
+}
+
+if ( ! function_exists( 'woocommerce_account_orders' ) ) {
+
+	/**
+	 * My Account > Orders template.
+	 *
+	 * @param int $current_page Current page number.
+	 */
+	function woocommerce_account_orders( $current_page ) {
+		$current_page    = empty( $current_page ) ? 1 : absint( $current_page );
+		$customer_orders = wc_get_orders( apply_filters( 'woocommerce_my_account_my_orders_query', array( 'customer' => get_current_user_id(), 'page' => $current_page, 'paginate' => true ) ) );
+
+		wc_get_template(
+			'myaccount/orders.php',
+			array(
+				'current_page' => absint( $current_page ),
+				'customer_orders' => $customer_orders,
+				'has_orders' => 0 < $customer_orders->total,
+			)
+		);
+	}
+}
+
+if ( ! function_exists( 'woocommerce_account_view_order' ) ) {
+
+	/**
+	 * My Account > View order template.
+	 *
+	 * @param int $order_id Order ID.
+	 */
+	function woocommerce_account_view_order( $order_id ) {
+		WC_Shortcode_My_Account::view_order( absint( $order_id ) );
+	}
+}
+
+if ( ! function_exists( 'woocommerce_account_downloads' ) ) {
+
+	/**
+	 * My Account > Downloads template.
+	 */
+	function woocommerce_account_downloads() {
+		wc_get_template( 'myaccount/downloads.php' );
+	}
+}
+
+if ( ! function_exists( 'woocommerce_account_edit_address' ) ) {
+
+	/**
+	 * My Account > Edit address template.
+	 *
+	 * @param string $type Address type.
+	 */
+	function woocommerce_account_edit_address( $type ) {
+		$type = wc_edit_address_i18n( sanitize_title( $type ), true );
+
+		WC_Shortcode_My_Account::edit_address( $type );
+	}
+}
+
+if ( ! function_exists( 'woocommerce_account_payment_methods' ) ) {
+
+	/**
+	 * My Account > Downloads template.
+	 */
+	function woocommerce_account_payment_methods() {
+		wc_get_template( 'myaccount/payment-methods.php' );
+	}
+}
+
+if ( ! function_exists( 'woocommerce_account_add_payment_method' ) ) {
+
+	/**
+	 * My Account > Add payment method template.
+	 */
+	function woocommerce_account_add_payment_method() {
+		WC_Shortcode_My_Account::add_payment_method();
+	}
+}
+
+if ( ! function_exists( 'woocommerce_account_edit_account' ) ) {
+
+	/**
+	 * My Account > Edit account template.
+	 */
+	function woocommerce_account_edit_account() {
+		WC_Shortcode_My_Account::edit_account();
+	}
+}
+
+if ( ! function_exists( 'wc_no_products_found' ) ) {
+
+	/**
+	 * Show no products found message.
+	 */
+	function wc_no_products_found() {
+		wc_get_template( 'loop/no-products-found.php' );
+	}
+}
+
+
+if ( ! function_exists( 'wc_get_email_order_items' ) ) {
+	/**
+	 * Get HTML for the order items to be shown in emails.
+	 * @param WC_Order $order
+	 * @param array $args
+	 * @since 3.0.0
+	 */
+	function wc_get_email_order_items( $order, $args = array() ) {
+		ob_start();
+
+		$defaults = array(
+			'show_sku'      => false,
+			'show_image'    => false,
+			'image_size'    => array( 32, 32 ),
+			'plain_text'    => false,
+			'sent_to_admin' => false,
+		);
+
+		$args     = wp_parse_args( $args, $defaults );
+		$template = $args['plain_text'] ? 'emails/plain/email-order-items.php' : 'emails/email-order-items.php';
+
+		wc_get_template( $template, apply_filters( 'woocommerce_email_order_items_args', array(
+			'order'               => $order,
+			'items'               => $order->get_items(),
+			'show_download_links' => $order->is_download_permitted() && ! $args['sent_to_admin'],
+			'show_sku'            => $args['show_sku'],
+			'show_purchase_note'  => $order->is_paid() && ! $args['sent_to_admin'],
+			'show_image'          => $args['show_image'],
+			'image_size'          => $args['image_size'],
+			'plain_text'          => $args['plain_text'],
+			'sent_to_admin'       => $args['sent_to_admin'],
+		) ) );
+
+		return apply_filters( 'woocommerce_email_order_items_table', ob_get_clean(), $order );
+	}
+}
+
+if ( ! function_exists( 'wc_display_item_meta' ) ) {
+	/**
+	 * Display item meta data.
+	 * @since  3.0.0
+	 * @param  WC_Item $item
+	 * @param  array   $args
+	 * @return string|void
+	 */
+	function wc_display_item_meta( $item, $args = array() ) {
+		$strings = array();
+		$html    = '';
+		$args    = wp_parse_args( $args, array(
+			'before'    => '<ul class="wc-item-meta"><li>',
+			'after'		=> '</li></ul>',
+			'separator'	=> '</li><li>',
+			'echo'		=> true,
+			'autop'		=> false,
+		) );
+
+		foreach ( $item->get_formatted_meta_data() as $meta_id => $meta ) {
+			$value = $args['autop'] ? wp_kses_post( wpautop( make_clickable( $meta->display_value ) ) ) : wp_kses_post( make_clickable( $meta->display_value ) );
+			$strings[] = '<strong class="wc-item-meta-label">' . wp_kses_post( $meta->display_key ) . ':</strong> ' . $value;
+		}
+
+		if ( $strings ) {
+			$html = $args['before'] . implode( $args['separator'], $strings ) . $args['after'];
+		}
+
+		$html = apply_filters( 'woocommerce_display_item_meta', $html, $item, $args );
+
+		if ( $args['echo'] ) {
+			echo $html;
+		} else {
+			return $html;
+		}
+	}
+}
+
+if ( ! function_exists( 'wc_display_item_downloads' ) ) {
+	/**
+	 * Display item download links.
+	 * @since  3.0.0
+	 * @param  WC_Item $item
+	 * @param  array   $args
+	 * @return string|void
+	 */
+	function wc_display_item_downloads( $item, $args = array() ) {
+		$strings = array();
+		$html    = '';
+		$args    = wp_parse_args( $args, array(
+			'before'    => '<ul class ="wc-item-downloads"><li>',
+			'after'     => '</li></ul>',
+			'separator' => '</li><li>',
+			'echo'      => true,
+			'show_url'  => false,
+		) );
+
+		if ( is_object( $item ) && $item->is_type( 'line_item' ) && ( $downloads = $item->get_item_downloads() ) ) {
+			$i = 0;
+			foreach ( $downloads as $file ) {
+				$i ++;
+
+				if ( $args['show_url'] ) {
+					$strings[] = '<strong class="wc-item-download-label">' . esc_html( $file['name'] ) . ':</strong> ' . esc_html( $file['download_url'] );
+				} else {
+					$prefix = sizeof( $downloads ) > 1 ? sprintf( __( 'Download %d', 'woocommerce' ), $i ) : __( 'Download', 'woocommerce' );
+					$strings[] = '<strong class="wc-item-download-label">' . $prefix . ':</strong> <a href="' . esc_url( $file['download_url'] ) . '" target="_blank">' . esc_html( $file['name'] ) . '</a>';
+				}
+			}
+		}
+
+		if ( $strings ) {
+			$html = $args['before'] . implode( $args['separator'], $strings ) . $args['after'];
+		}
+
+		$html = apply_filters( 'woocommerce_display_item_downloads', $html, $item, $args );
+
+		if ( $args['echo'] ) {
+			echo $html;
+		} else {
+			return $html;
+		}
+	}
+}
+
+if ( ! function_exists( 'woocommerce_photoswipe' ) ) {
+
+	/**
+	 * Get the shop sidebar template.
+	 *
+	 */
+	function woocommerce_photoswipe() {
+		if ( current_theme_supports( 'wc-product-gallery-lightbox' ) ) {
+			wc_get_template( 'single-product/photoswipe.php' );
+		}
+	}
+}
+
+/**
+ * Outputs a list of product attributes for a product.
+ * @since  3.0.0
+ * @param  WC_Product $product
+ */
+function wc_display_product_attributes( $product ) {
+	wc_get_template( 'single-product/product-attributes.php', array(
+		'product'            => $product,
+		'attributes'         => array_filter( $product->get_attributes(), 'wc_attributes_array_filter_visible' ),
+		'display_dimensions' => apply_filters( 'wc_product_enable_dimensions_display', $product->has_weight() || $product->has_dimensions() ),
+	) );
+}
+
+/**
+ * Get HTML to show product stock.
+ * @since  3.0.0
+ * @param  WC_Product $product
+ * @return string
+ */
+function wc_get_stock_html( $product ) {
+
+	$html = '';
+	$availability = $product->get_availability();
+
+	if ( ! empty( $availability['availability'] ) ) {
+		ob_start();
+
+		wc_get_template( 'single-product/stock.php', array(
+			'product'      => $product,
+			'class'        => $availability['class'],
+			'availability' => $availability['availability'],
+		) );
+
+		$html = ob_get_clean();
+	}
+
+	if ( has_filter( 'woocommerce_stock_html' ) ) {
+		wc_deprecated_function( 'The woocommerce_stock_html filter', '', 'woocommerce_get_stock_html' );
+		$html = apply_filters( 'woocommerce_stock_html', $html, $availability['availability'], $product );
+	}
+
+	return apply_filters( 'woocommerce_get_stock_html', $html, $product );
+}
+
+/**
+ * Get HTML for ratings.
+ *
+ * @since  3.0.0
+ * @param  float $rating Rating being shown.
+ * @return string
+ */
+function wc_get_rating_html( $rating ) {
+	if ( $rating > 0 ) {
+		$rating_html  = '<div class="star-rating" title="' . sprintf( esc_attr__( 'Rated %s out of 5', 'woocommerce' ), $rating ) . '">';
+		$rating_html .= '<span style="width:' . ( ( $rating / 5 ) * 100 ) . '%"><strong class="rating">' . $rating . '</strong> ' . esc_html__( 'out of 5', 'woocommerce' ) . '</span>';
+		$rating_html .= '</div>';
+	} else {
+		$rating_html  = '';
+	}
+	return apply_filters( 'woocommerce_product_get_rating_html', $rating_html, $rating );
+}
+
+/**
+ * Returns a 'from' prefix if you want to show where prices start at.
+ *
+ * @since  3.0.0
+ * @return string
+ */
+function wc_get_price_html_from_text() {
+	return apply_filters( 'woocommerce_get_price_html_from_text', '<span class="from">' . _x( 'From:', 'min_price', 'woocommerce' ) . ' </span>' );
+}
+
+/**
+ * Get logout endpoint.
+ *
+ * @since  2.6.9
+ * @return string
+ */
+function wc_logout_url( $redirect = '' ) {
+	$logout_endpoint = get_option( 'woocommerce_logout_endpoint' );
+	$redirect        = $redirect ? $redirect : wc_get_page_permalink( 'myaccount' );
+
+	if ( $logout_endpoint ) {
+		return wc_get_endpoint_url( 'customer-logout', '', $redirect );
+	} else {
+		return wp_logout_url( $redirect );
+	}
+}
+
+/**
+ * Show notice if cart is empty.
+ *
+ * @since 3.1.0
+ */
+function wc_empty_cart_message() {
+	echo '<p class="cart-empty">' . apply_filters( 'wc_empty_cart_message', __( 'Your cart is currently empty.', 'woocommerce' ) ) . '</p>';
+}
diff --git a/includes/wc-template-hooks.php b/includes/wc-template-hooks.php
index bae53333e05..6ef4c801061 100644
--- a/includes/wc-template-hooks.php
+++ b/includes/wc-template-hooks.php
@@ -20,10 +20,8 @@ add_filter( 'post_class', 'wc_product_post_class', 20, 3 );
 /**
  * WP Header.
  *
- * @see  wc_products_rss_feed()
  * @see  wc_generator_tag()
  */
-add_action( 'wp_head', 'wc_products_rss_feed' );
 add_action( 'get_the_generator_html', 'wc_generator_tag', 10, 2 );
 add_action( 'get_the_generator_xhtml', 'wc_generator_tag', 10, 2 );
 
@@ -76,6 +74,7 @@ add_action( 'woocommerce_archive_description', 'woocommerce_product_archive_desc
  */
 add_action( 'woocommerce_before_shop_loop', 'woocommerce_result_count', 20 );
 add_action( 'woocommerce_before_shop_loop', 'woocommerce_catalog_ordering', 30 );
+add_action( 'woocommerce_no_products_found', 'wc_no_products_found' );
 
 /**
  * Product Loop Items.
@@ -148,6 +147,19 @@ add_action( 'woocommerce_single_product_summary', 'woocommerce_template_single_e
 add_action( 'woocommerce_single_product_summary', 'woocommerce_template_single_meta', 40 );
 add_action( 'woocommerce_single_product_summary', 'woocommerce_template_single_sharing', 50 );
 
+/**
+ * Reviews
+ *
+ * @see woocommerce_review_display_gravatar()
+ * @see woocommerce_review_display_rating()
+ * @see woocommerce_review_display_meta()
+ * @see woocommerce_review_display_comment_text()
+ */
+add_action( 'woocommerce_review_before', 'woocommerce_review_display_gravatar', 10 );
+add_action( 'woocommerce_review_before_comment_meta', 'woocommerce_review_display_rating', 10 );
+add_action( 'woocommerce_review_meta', 'woocommerce_review_display_meta', 10 );
+add_action( 'woocommerce_review_comment_text', 'woocommerce_review_display_comment_text', 10 );
+
 /**
  * Product Add to cart.
  *
@@ -180,6 +192,13 @@ add_action( 'woocommerce_after_shop_loop', 'woocommerce_pagination', 10 );
 add_filter( 'woocommerce_product_tabs', 'woocommerce_default_product_tabs' );
 add_filter( 'woocommerce_product_tabs', 'woocommerce_sort_product_tabs', 99 );
 
+/**
+ * Additional Information tab.
+ *
+ * @see wc_display_product_attributes()
+ */
+add_action( 'woocommerce_product_additional_information', 'wc_display_product_attributes', 10 );
+
 /**
  * Checkout.
  *
@@ -193,6 +212,11 @@ add_action( 'woocommerce_before_checkout_form', 'woocommerce_checkout_coupon_for
 add_action( 'woocommerce_checkout_order_review', 'woocommerce_order_review', 10 );
 add_action( 'woocommerce_checkout_order_review', 'woocommerce_checkout_payment', 20 );
 
+/**
+ * Cart widget
+ */
+add_action( 'woocommerce_widget_shopping_cart_buttons', 'woocommerce_widget_shopping_cart_button_view_cart', 10 );
+add_action( 'woocommerce_widget_shopping_cart_buttons', 'woocommerce_widget_shopping_cart_proceed_to_checkout', 20 );
 
 /**
  * Cart.
@@ -204,6 +228,7 @@ add_action( 'woocommerce_checkout_order_review', 'woocommerce_checkout_payment',
 add_action( 'woocommerce_cart_collaterals', 'woocommerce_cross_sell_display' );
 add_action( 'woocommerce_cart_collaterals', 'woocommerce_cart_totals', 10 );
 add_action( 'woocommerce_proceed_to_checkout', 'woocommerce_button_proceed_to_checkout', 20 );
+add_action( 'woocommerce_cart_is_empty', 'wc_empty_cart_message', 10 );
 
 /**
  * Footer.
@@ -239,3 +264,16 @@ add_action( 'woocommerce_auth_page_footer', 'woocommerce_output_auth_footer', 10
  * Disable Jetpack comments.
  */
 add_filter( 'jetpack_comment_form_enabled_for_product', '__return_false' );
+
+/**
+ * My Account.
+ */
+add_action( 'woocommerce_account_navigation', 'woocommerce_account_navigation' );
+add_action( 'woocommerce_account_content', 'woocommerce_account_content' );
+add_action( 'woocommerce_account_orders_endpoint', 'woocommerce_account_orders' );
+add_action( 'woocommerce_account_view-order_endpoint', 'woocommerce_account_view_order' );
+add_action( 'woocommerce_account_downloads_endpoint', 'woocommerce_account_downloads' );
+add_action( 'woocommerce_account_edit-address_endpoint', 'woocommerce_account_edit_address' );
+add_action( 'woocommerce_account_payment-methods_endpoint', 'woocommerce_account_payment_methods' );
+add_action( 'woocommerce_account_add-payment-method_endpoint', 'woocommerce_account_add_payment_method' );
+add_action( 'woocommerce_account_edit-account_endpoint', 'woocommerce_account_edit_account' );
diff --git a/includes/wc-term-functions.php b/includes/wc-term-functions.php
index d36ff54b6a0..48e2d62f6c9 100644
--- a/includes/wc-term-functions.php
+++ b/includes/wc-term-functions.php
@@ -14,15 +14,68 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
 
+/**
+ * Helper to get cached object terms and filter by field using wp_list_pluck().
+ * Works as a cached alternative for wp_get_post_terms() and wp_get_object_terms().
+ *
+ * @since  3.0.0
+ * @param  int    $object_id Object ID.
+ * @param  string $taxonomy  Taxonomy slug.
+ * @param  string $field     Field name.
+ * @param  string $index_key Index key name.
+ * @return array
+ */
+function wc_get_object_terms( $object_id, $taxonomy, $field = null, $index_key = null ) {
+	// Test if terms exists. get_the_terms() return false when it finds no terms.
+	$terms = get_the_terms( $object_id, $taxonomy );
+
+	if ( $terms && ! is_wp_error( $terms ) ) {
+		if ( ! is_null( $field ) ) {
+			$terms = wp_list_pluck( $terms, $field, $index_key );
+		}
+	} else {
+		$terms = array();
+	}
+
+	return $terms;
+}
+
+/**
+ * Cached version of wp_get_post_terms().
+ * This is a private function (internal use ONLY).
+ *
+ * @since  3.0.0
+ * @param  int    $product_id Product ID.
+ * @param  string $taxonomy   Taxonomy slug.
+ * @param  array  $args       Query arguments.
+ * @return array
+ */
+function _wc_get_cached_product_terms( $product_id, $taxonomy, $args = array() ) {
+	$cache_key = 'wc_' . $taxonomy . md5( json_encode( $args ) );
+	$terms     = wp_cache_get( $product_id, $cache_key );
+
+	if ( false !== $terms ) {
+		return $terms;
+	}
+
+	// @codingStandardsIgnoreStart
+	$terms = wp_get_post_terms( $product_id, $taxonomy, $args );
+	// @codingStandardsIgnoreEnd
+
+	wp_cache_add( $product_id, $terms, $cache_key );
+
+	return $terms;
+}
+
 /**
  * Wrapper for wp_get_post_terms which supports ordering by parent.
  *
  * NOTE: At this point in time, ordering by menu_order for example isn't possible with this function. wp_get_post_terms has no.
  *   filters which we can utilise to modify it's query. https://core.trac.wordpress.org/ticket/19094.
  *
- * @param  int $product_id
- * @param  string $taxonomy
- * @param  array  $args
+ * @param  int    $product_id Product ID.
+ * @param  string $taxonomy   Taxonomy slug.
+ * @param  array  $args       Query arguments.
  * @return array
  */
 function wc_get_product_terms( $product_id, $taxonomy, $args = array() ) {
@@ -34,16 +87,16 @@ function wc_get_product_terms( $product_id, $taxonomy, $args = array() ) {
 		$args['orderby'] = wc_attribute_orderby( $taxonomy );
 	}
 
-	// Support ordering by parent
+	// Support ordering by parent.
 	if ( ! empty( $args['orderby'] ) && in_array( $args['orderby'], array( 'name_num', 'parent' ) ) ) {
 		$fields  = isset( $args['fields'] ) ? $args['fields'] : 'all';
 		$orderby = $args['orderby'];
 
-		// Unset for wp_get_post_terms
+		// Unset for wp_get_post_terms.
 		unset( $args['orderby'] );
 		unset( $args['fields'] );
 
-		$terms = wp_get_post_terms( $product_id, $taxonomy, $args );
+		$terms = _wc_get_cached_product_terms( $product_id, $taxonomy, $args );
 
 		switch ( $orderby ) {
 			case 'name_num' :
@@ -65,33 +118,32 @@ function wc_get_product_terms( $product_id, $taxonomy, $args = array() ) {
 				$terms = wp_list_pluck( $terms, 'slug' );
 				break;
 		}
-	} elseif ( ! empty( $args['orderby'] ) && $args['orderby'] === 'menu_order' ) {
-		// wp_get_post_terms doesn't let us use custom sort order
-		$args['include'] = wp_get_post_terms( $product_id, $taxonomy, array( 'fields' => 'ids' ) );
+	} elseif ( ! empty( $args['orderby'] ) && 'menu_order' === $args['orderby'] ) {
+		// wp_get_post_terms doesn't let us use custom sort order.
+		$args['include'] = wc_get_object_terms( $product_id, $taxonomy, 'term_id' );
 
 		if ( empty( $args['include'] ) ) {
 			$terms = array();
 		} else {
-			// This isn't needed for get_terms
+			// This isn't needed for get_terms.
 			unset( $args['orderby'] );
 
-			// Set args for get_terms
+			// Set args for get_terms.
 			$args['menu_order'] = isset( $args['order'] ) ? $args['order'] : 'ASC';
 			$args['hide_empty'] = isset( $args['hide_empty'] ) ? $args['hide_empty'] : 0;
 			$args['fields']     = isset( $args['fields'] ) ? $args['fields'] : 'names';
 
-			// Ensure slugs is valid for get_terms - slugs isn't supported
-			$args['fields']     = $args['fields'] === 'slugs' ? 'id=>slug' : $args['fields'];
+			// Ensure slugs is valid for get_terms - slugs isn't supported.
+			$args['fields']     = ( 'slugs' === $args['fields'] ) ? 'id=>slug' : $args['fields'];
 			$terms              = get_terms( $taxonomy, $args );
 		}
 	} else {
-		$terms = wp_get_post_terms( $product_id, $taxonomy, $args );
+		$terms = _wc_get_cached_product_terms( $product_id, $taxonomy, $args );
 	}
 
 	return apply_filters( 'woocommerce_get_product_terms' , $terms, $product_id, $taxonomy, $args );
 }
 
-
 /**
  * Sort by name (numeric).
  * @param  WP_POST object $a
@@ -99,11 +151,15 @@ function wc_get_product_terms( $product_id, $taxonomy, $args = array() ) {
  * @return int
  */
 function _wc_get_product_terms_name_num_usort_callback( $a, $b ) {
-	if ( $a->name + 0 === $b->name + 0 ) {
+    $a_name = (int) $a->name;
+    $b_name = (int) $b->name;
+
+	if ( $a_name === $b_name ) {
 		return 0;
 	}
-	return ( $a->name + 0 < $b->name + 0 ) ? -1 : 1;
+	return ( $a_name < $b_name ) ? -1 : 1;
 }
+
 /**
  * Sort by parent.
  * @param  WP_POST object $a
@@ -120,7 +176,7 @@ function _wc_get_product_terms_parent_usort_callback( $a, $b ) {
 /**
  * WooCommerce Dropdown categories.
  *
- * Stuck with this until a fix for http://core.trac.wordpress.org/ticket/13258.
+ * Stuck with this until a fix for https://core.trac.wordpress.org/ticket/13258.
  * We use a custom walker, just like WordPress does.
  *
  * @param int $deprecated_show_uncategorized (default: 1)
@@ -130,7 +186,7 @@ function wc_product_dropdown_categories( $args = array(), $deprecated_hierarchic
 	global $wp_query;
 
 	if ( ! is_array( $args ) ) {
-		_deprecated_argument( 'wc_product_dropdown_categories()', '2.1', 'show_counts, hierarchical, show_uncategorized and orderby arguments are invalid - pass a single array of values instead.' );
+		wc_deprecated_argument( 'wc_product_dropdown_categories()', '2.1', 'show_counts, hierarchical, show_uncategorized and orderby arguments are invalid - pass a single array of values instead.' );
 
 		$args['show_count']         = $args;
 		$args['hierarchical']       = $deprecated_hierarchical;
@@ -138,7 +194,7 @@ function wc_product_dropdown_categories( $args = array(), $deprecated_hierarchic
 		$args['orderby']            = $deprecated_orderby;
 	}
 
-	$current_product_cat = isset( $wp_query->query['product_cat'] ) ? $wp_query->query['product_cat'] : '';
+	$current_product_cat = isset( $wp_query->query_vars['product_cat'] ) ? $wp_query->query_vars['product_cat'] : '';
 	$defaults            = array(
 		'pad_counts'         => 1,
 		'show_count'         => 1,
@@ -147,27 +203,27 @@ function wc_product_dropdown_categories( $args = array(), $deprecated_hierarchic
 		'show_uncategorized' => 1,
 		'orderby'            => 'name',
 		'selected'           => $current_product_cat,
-		'menu_order'         => false
+		'menu_order'         => false,
 	);
 
 	$args = wp_parse_args( $args, $defaults );
 
-	if ( $args['orderby'] == 'order' ) {
+	if ( 'order' === $args['orderby'] ) {
 		$args['menu_order'] = 'asc';
 		$args['orderby']    = 'name';
 	}
 
 	$terms = get_terms( 'product_cat', apply_filters( 'wc_product_dropdown_categories_get_terms_args', $args ) );
 
-	if ( ! $terms ) {
+	if ( empty( $terms ) ) {
 		return;
 	}
 
 	$output  = "<select name='product_cat' class='dropdown_product_cat'>";
-	$output .= '<option value="" ' .  selected( $current_product_cat, '', false ) . '>' . __( 'Select a category', 'woocommerce' ) . '</option>';
+	$output .= '<option value="" ' . selected( $current_product_cat, '', false ) . '>' . esc_html__( 'Select a category', 'woocommerce' ) . '</option>';
 	$output .= wc_walk_category_dropdown_tree( $terms, 0, $args );
 	if ( $args['show_uncategorized'] ) {
-		$output .= '<option value="0" ' . selected( $current_product_cat, '0', false ) . '>' . __( 'Uncategorized', 'woocommerce' ) . '</option>';
+		$output .= '<option value="0" ' . selected( $current_product_cat, '0', false ) . '>' . esc_html__( 'Uncategorized', 'woocommerce' ) . '</option>';
 	}
 	$output .= "</select>";
 
@@ -180,14 +236,14 @@ function wc_product_dropdown_categories( $args = array(), $deprecated_hierarchic
  * @return mixed
  */
 function wc_walk_category_dropdown_tree() {
-	if ( ! class_exists( 'WC_Product_Cat_Dropdown_Walker' ) ) {
+	$args = func_get_args();
+
+	if ( ! class_exists( 'WC_Product_Cat_Dropdown_Walker', false ) ) {
 		include_once( WC()->plugin_path() . '/includes/walkers/class-product-cat-dropdown-walker.php' );
 	}
 
-	$args = func_get_args();
-
 	// the user's options are the third parameter
-	if ( empty( $args[2]['walker']) || !is_a($args[2]['walker'], 'Walker' ) ) {
+	if ( empty( $args[2]['walker'] ) || ! is_a( $args[2]['walker'], 'Walker' ) ) {
 		$walker = new WC_Product_Cat_Dropdown_Walker;
 	} else {
 		$walker = $args[2]['walker'];
@@ -196,23 +252,6 @@ function wc_walk_category_dropdown_tree() {
 	return call_user_func_array( array( &$walker, 'walk' ), $args );
 }
 
-/**
- * WooCommerce Term/Order item Meta API - set table name.
- */
-function wc_taxonomy_metadata_wpdbfix() {
-	global $wpdb;
-	$termmeta_name = 'woocommerce_termmeta';
-	$itemmeta_name = 'woocommerce_order_itemmeta';
-
-	$wpdb->woocommerce_termmeta = $wpdb->prefix . $termmeta_name;
-	$wpdb->order_itemmeta = $wpdb->prefix . $itemmeta_name;
-
-	$wpdb->tables[] = 'woocommerce_termmeta';
-	$wpdb->tables[] = 'woocommerce_order_itemmeta';
-}
-add_action( 'init', 'wc_taxonomy_metadata_wpdbfix', 0 );
-add_action( 'switch_blog', 'wc_taxonomy_metadata_wpdbfix', 0 );
-
 /**
  * When a term is split, ensure meta data maintained.
  * @param  int $old_term_id
@@ -223,20 +262,22 @@ add_action( 'switch_blog', 'wc_taxonomy_metadata_wpdbfix', 0 );
 function wc_taxonomy_metadata_update_content_for_split_terms( $old_term_id, $new_term_id, $term_taxonomy_id, $taxonomy ) {
 	global $wpdb;
 
-	if ( 'product_cat' === $taxonomy || taxonomy_is_product_attribute( $taxonomy ) ) {
-		$old_meta_data = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$wpdb->prefix}woocommerce_termmeta WHERE woocommerce_term_id = %d;", $old_term_id ) );
+	if ( get_option( 'db_version' ) < 34370 ) {
+		if ( 'product_cat' === $taxonomy || taxonomy_is_product_attribute( $taxonomy ) ) {
+			$old_meta_data = $wpdb->get_results( $wpdb->prepare( "SELECT meta_key, meta_value FROM {$wpdb->prefix}woocommerce_termmeta WHERE woocommerce_term_id = %d;", $old_term_id ) );
 
-		// Copy across to split term
-		if ( $old_meta_data ) {
-			foreach ( $old_meta_data as $meta_data ) {
-				$wpdb->insert(
-					"{$wpdb->prefix}woocommerce_termmeta",
-					array(
-						'woocommerce_term_id' => $new_term_id,
-						'meta_key'            => $meta_data->meta_key,
-						'meta_value'          => $meta_data->meta_value
-					)
-				);
+			// Copy across to split term
+			if ( $old_meta_data ) {
+				foreach ( $old_meta_data as $meta_data ) {
+					$wpdb->insert(
+						"{$wpdb->prefix}woocommerce_termmeta",
+						array(
+							'woocommerce_term_id' => $new_term_id,
+							'meta_key'            => $meta_data->meta_key,
+							'meta_value'          => $meta_data->meta_value,
+						)
+					);
+				}
 			}
 		}
 	}
@@ -244,7 +285,29 @@ function wc_taxonomy_metadata_update_content_for_split_terms( $old_term_id, $new
 add_action( 'split_shared_term', 'wc_taxonomy_metadata_update_content_for_split_terms', 10, 4 );
 
 /**
- * WooCommerce Term Meta API - Update term meta.
+ * Migrate data from WC term meta to WP term meta
+ *
+ * When the database is updated to support term meta, migrate WC term meta data across.
+ * We do this when the new version is >= 34370, and the old version is < 34370 (34370 is when term meta table was added).
+ *
+ * @param  string $wp_db_version The new $wp_db_version.
+ * @param  string $wp_current_db_version The old (current) $wp_db_version.
+ */
+function wc_taxonomy_metadata_migrate_data( $wp_db_version, $wp_current_db_version ) {
+	if ( $wp_db_version >= 34370 && $wp_current_db_version < 34370 ) {
+		global $wpdb;
+		if ( $wpdb->query( "INSERT INTO {$wpdb->termmeta} ( term_id, meta_key, meta_value ) SELECT woocommerce_term_id, meta_key, meta_value FROM {$wpdb->prefix}woocommerce_termmeta;" ) ) {
+			$wpdb->query( "DROP TABLE IF EXISTS {$wpdb->prefix}woocommerce_termmeta" );
+		}
+	}
+}
+add_action( 'wp_upgrade', 'wc_taxonomy_metadata_migrate_data', 10, 2 );
+
+/**
+ * WooCommerce Term Meta API
+ *
+ * WC tables for storing term meta are @deprecated from WordPress 4.4 since 4.4 has its own table.
+ * This function serves as a wrapper, using the new table if present, or falling back to the WC table.
  *
  * @param mixed $term_id
  * @param string $meta_key
@@ -253,11 +316,14 @@ add_action( 'split_shared_term', 'wc_taxonomy_metadata_update_content_for_split_
  * @return bool
  */
 function update_woocommerce_term_meta( $term_id, $meta_key, $meta_value, $prev_value = '' ) {
-	return update_metadata( 'woocommerce_term', $term_id, $meta_key, $meta_value, $prev_value );
+	return function_exists( 'update_term_meta' ) ? update_term_meta( $term_id, $meta_key, $meta_value, $prev_value ) : update_metadata( 'woocommerce_term', $term_id, $meta_key, $meta_value, $prev_value );
 }
 
 /**
- * WooCommerce Term Meta API - Add term meta.
+ * WooCommerce Term Meta API
+ *
+ * WC tables for storing term meta are @deprecated from WordPress 4.4 since 4.4 has its own table.
+ * This function serves as a wrapper, using the new table if present, or falling back to the WC table.
  *
  * @param mixed $term_id
  * @param mixed $meta_key
@@ -265,25 +331,31 @@ function update_woocommerce_term_meta( $term_id, $meta_key, $meta_value, $prev_v
  * @param bool $unique (default: false)
  * @return bool
  */
-function add_woocommerce_term_meta( $term_id, $meta_key, $meta_value, $unique = false ){
-	return add_metadata( 'woocommerce_term', $term_id, $meta_key, $meta_value, $unique );
+function add_woocommerce_term_meta( $term_id, $meta_key, $meta_value, $unique = false ) {
+	return function_exists( 'add_term_meta' ) ? add_term_meta( $term_id, $meta_key, $meta_value, $unique ) : add_metadata( 'woocommerce_term', $term_id, $meta_key, $meta_value, $unique );
 }
 
 /**
- * WooCommerce Term Meta API - Delete term meta.
+ * WooCommerce Term Meta API
+ *
+ * WC tables for storing term meta are @deprecated from WordPress 4.4 since 4.4 has its own table.
+ * This function serves as a wrapper, using the new table if present, or falling back to the WC table.
  *
  * @param mixed $term_id
- * @param mixed $meta_key
+ * @param string $meta_key
  * @param string $meta_value (default: '')
- * @param bool $delete_all (default: false)
+ * @param bool $deprecated (default: false)
  * @return bool
  */
-function delete_woocommerce_term_meta( $term_id, $meta_key, $meta_value = '', $delete_all = false ) {
-	return delete_metadata( 'woocommerce_term', $term_id, $meta_key, $meta_value, $delete_all );
+function delete_woocommerce_term_meta( $term_id, $meta_key, $meta_value = '', $deprecated = false ) {
+	return function_exists( 'delete_term_meta' ) ? delete_term_meta( $term_id, $meta_key, $meta_value ) : delete_metadata( 'woocommerce_term', $term_id, $meta_key, $meta_value );
 }
 
 /**
- * WooCommerce Term Meta API - Get term meta.
+ * WooCommerce Term Meta API
+ *
+ * WC tables for storing term meta are @deprecated from WordPress 4.4 since 4.4 has its own table.
+ * This function serves as a wrapper, using the new table if present, or falling back to the WC table.
  *
  * @param mixed $term_id
  * @param string $key
@@ -291,7 +363,7 @@ function delete_woocommerce_term_meta( $term_id, $meta_key, $meta_value = '', $d
  * @return mixed
  */
 function get_woocommerce_term_meta( $term_id, $key, $single = true ) {
-	return get_metadata( 'woocommerce_term', $term_id, $key, $single );
+	return function_exists( 'get_term_meta' ) ? get_term_meta( $term_id, $key, $single ) : get_metadata( 'woocommerce_term', $term_id, $key, $single );
 }
 
 /**
@@ -305,40 +377,49 @@ function get_woocommerce_term_meta( $term_id, $key, $single = true ) {
  * @return int
  */
 function wc_reorder_terms( $the_term, $next_id, $taxonomy, $index = 0, $terms = null ) {
-
-	if( ! $terms ) $terms = get_terms($taxonomy, 'menu_order=ASC&hide_empty=0&parent=0' );
-	if( empty( $terms ) ) return $index;
+	if ( ! $terms ) {
+		$terms = get_terms( $taxonomy, 'menu_order=ASC&hide_empty=0&parent=0' );
+	}
+	if ( empty( $terms ) ) {
+		return $index;
+	}
 
 	$id	= $the_term->term_id;
 
 	$term_in_level = false; // flag: is our term to order in this level of terms
 
-	foreach ($terms as $term) {
+	foreach ( $terms as $term ) {
 
-		if( $term->term_id == $id ) { // our term to order, we skip
+		if ( $term->term_id == $id ) { // our term to order, we skip
 			$term_in_level = true;
 			continue; // our term to order, we skip
 		}
 		// the nextid of our term to order, lets move our term here
-		if(null !== $next_id && $term->term_id == $next_id) {
+		if ( null !== $next_id && $term->term_id == $next_id ) {
 			$index++;
-			$index = wc_set_term_order($id, $index, $taxonomy, true);
+			$index = wc_set_term_order( $id, $index, $taxonomy, true );
 		}
 
 		// set order
 		$index++;
-		$index = wc_set_term_order($term->term_id, $index, $taxonomy);
+		$index = wc_set_term_order( $term->term_id, $index, $taxonomy );
+
+		/**
+		 * After a term has had it's order set.
+		*/
+		do_action( 'woocommerce_after_set_term_order', $term, $index, $taxonomy );
 
 		// if that term has children we walk through them
-		$children = get_terms($taxonomy, "parent={$term->term_id}&menu_order=ASC&hide_empty=0");
-		if( !empty($children) ) {
+		$children = get_terms( $taxonomy, "parent={$term->term_id}&menu_order=ASC&hide_empty=0" );
+		if ( ! empty( $children ) ) {
 			$index = wc_reorder_terms( $the_term, $next_id, $taxonomy, $index, $children );
 		}
 	}
 
 	// no nextid meaning our term is in last position
-	if( $term_in_level && null === $next_id )
-		$index = wc_set_term_order($id, $index+1, $taxonomy, true);
+	if ( $term_in_level && null === $next_id ) {
+		$index = wc_set_term_order( $id, $index + 1, $taxonomy, true );
+	}
 
 	return $index;
 }
@@ -358,20 +439,23 @@ function wc_set_term_order( $term_id, $index, $taxonomy, $recursive = false ) {
 	$index 		= (int) $index;
 
 	// Meta name
-	if ( taxonomy_is_product_attribute( $taxonomy ) )
-		$meta_name =  'order_' . esc_attr( $taxonomy );
-	else
+	if ( taxonomy_is_product_attribute( $taxonomy ) ) {
+		$meta_name = 'order_' . esc_attr( $taxonomy );
+	} else {
 		$meta_name = 'order';
+	}
 
 	update_woocommerce_term_meta( $term_id, $meta_name, $index );
 
-	if( ! $recursive ) return $index;
+	if ( ! $recursive ) {
+		return $index;
+	}
 
-	$children = get_terms($taxonomy, "parent=$term_id&menu_order=ASC&hide_empty=0");
+	$children = get_terms( $taxonomy, "parent=$term_id&menu_order=ASC&hide_empty=0" );
 
 	foreach ( $children as $term ) {
-		$index ++;
-		$index = wc_set_term_order($term->term_id, $index, $taxonomy, true);
+		$index++;
+		$index = wc_set_term_order( $term->term_id, $index, $taxonomy, true );
 	}
 
 	clean_term_cache( $term_id, $taxonomy );
@@ -395,22 +479,27 @@ function wc_set_term_order( $term_id, $index, $taxonomy, $recursive = false ) {
 function wc_terms_clauses( $clauses, $taxonomies, $args ) {
 	global $wpdb;
 
-	// No sorting when menu_order is false
-	if ( isset( $args['menu_order'] ) && $args['menu_order'] == false ) {
+	// No sorting when menu_order is false.
+	if ( isset( $args['menu_order'] ) && ( false === $args['menu_order'] || 'false' === $args['menu_order'] ) ) {
 		return $clauses;
 	}
 
-	// No sorting when orderby is non default
-	if ( isset( $args['orderby'] ) && $args['orderby'] != 'name' ) {
+	// No sorting when orderby is non default.
+	if ( isset( $args['orderby'] ) && 'name' !== $args['orderby'] ) {
 		return $clauses;
 	}
 
-	// No sorting in admin when sorting by a column
+	// No sorting in admin when sorting by a column.
 	if ( is_admin() && isset( $_GET['orderby'] ) ) {
 		return $clauses;
 	}
 
-	// wordpress should give us the taxonomies asked when calling the get_terms function. Only apply to categories and pa_ attributes
+	// No need to filter counts
+	if ( strpos( 'COUNT(*)', $clauses['fields'] ) !== false ) {
+		return $clauses;
+	}
+
+	// WordPress should give us the taxonomies asked when calling the get_terms function. Only apply to categories and pa_ attributes.
 	$found = false;
 	foreach ( (array) $taxonomies as $taxonomy ) {
 		if ( taxonomy_is_product_attribute( $taxonomy ) || in_array( $taxonomy, apply_filters( 'woocommerce_sortable_taxonomies', array( 'product_cat' ) ) ) ) {
@@ -422,87 +511,85 @@ function wc_terms_clauses( $clauses, $taxonomies, $args ) {
 		return $clauses;
 	}
 
-	// Meta name
+	// Meta name.
 	if ( ! empty( $taxonomies[0] ) && taxonomy_is_product_attribute( $taxonomies[0] ) ) {
-		$meta_name =  'order_' . esc_attr( $taxonomies[0] );
+		$meta_name = 'order_' . esc_attr( $taxonomies[0] );
 	} else {
 		$meta_name = 'order';
 	}
 
-	// query fields
-	if ( strpos( 'COUNT(*)', $clauses['fields'] ) === false )  {
-		$clauses['fields']  .= ', tm.* ';
+	// Query fields.
+	$clauses['fields'] = 'DISTINCT ' . $clauses['fields'] . ', tm.meta_value';
+
+	// Query join.
+	if ( get_option( 'db_version' ) < 34370 ) {
+		$clauses['join'] .= " LEFT JOIN {$wpdb->woocommerce_termmeta} AS tm ON (t.term_id = tm.woocommerce_term_id AND tm.meta_key = '" . esc_sql( $meta_name ) . "') ";
+	} else {
+		$clauses['join'] .= " LEFT JOIN {$wpdb->termmeta} AS tm ON (t.term_id = tm.term_id AND tm.meta_key = '" . esc_sql( $meta_name ) . "') ";
 	}
 
-	//query join
-	$clauses['join'] .= " LEFT JOIN {$wpdb->woocommerce_termmeta} AS tm ON (t.term_id = tm.woocommerce_term_id AND tm.meta_key = '". $meta_name ."') ";
-
-	// default to ASC
-	if ( ! isset( $args['menu_order'] ) || ! in_array( strtoupper($args['menu_order']), array('ASC', 'DESC')) ) {
+	// Default to ASC.
+	if ( ! isset( $args['menu_order'] ) || ! in_array( strtoupper( $args['menu_order'] ), array( 'ASC', 'DESC' ) ) ) {
 		$args['menu_order'] = 'ASC';
 	}
 
 	$order = "ORDER BY tm.meta_value+0 " . $args['menu_order'];
 
-	if ( $clauses['orderby'] ):
-		$clauses['orderby'] = str_replace('ORDER BY', $order . ',', $clauses['orderby'] );
-	else:
+	if ( $clauses['orderby'] ) {
+		$clauses['orderby'] = str_replace( 'ORDER BY', $order . ',', $clauses['orderby'] );
+	} else {
 		$clauses['orderby'] = $order;
-	endif;
+	}
 
 	return $clauses;
 }
+
 add_filter( 'terms_clauses', 'wc_terms_clauses', 10, 3 );
 
 /**
  * Function for recounting product terms, ignoring hidden products.
  *
- * @param  array  $terms
- * @param  string  $taxonomy
- * @param  boolean $callback
- * @param  boolean $terms_are_term_taxonomy_ids
+ * @param array $terms
+ * @param string $taxonomy
+ * @param bool $callback
+ * @param bool $terms_are_term_taxonomy_ids
  */
 function _wc_term_recount( $terms, $taxonomy, $callback = true, $terms_are_term_taxonomy_ids = true ) {
 	global $wpdb;
 
-	// Standard callback
+	// Standard callback.
 	if ( $callback ) {
 		_update_post_term_count( $terms, $taxonomy );
 	}
 
-	// Stock query
-	if ( get_option( 'woocommerce_hide_out_of_stock_items' ) == 'yes' ) {
-		$stock_join  = "LEFT JOIN {$wpdb->postmeta} AS meta_stock ON posts.ID = meta_stock.post_id";
-		$stock_query = "
-		AND meta_stock.meta_key = '_stock_status'
-		AND meta_stock.meta_value = 'instock'
-		";
-	} else {
-		$stock_query = $stock_join = '';
-	}
-
-	// Main query
+	// Main query.
 	$count_query = "
-		SELECT COUNT( DISTINCT posts.ID ) FROM {$wpdb->posts} as posts
-		LEFT JOIN {$wpdb->postmeta} AS meta_visibility ON posts.ID = meta_visibility.post_id
-		LEFT JOIN {$wpdb->term_relationships} AS rel ON posts.ID=rel.object_ID
-		LEFT JOIN {$wpdb->term_taxonomy} AS tax USING( term_taxonomy_id )
-		LEFT JOIN {$wpdb->terms} AS term USING( term_id )
-		LEFT JOIN {$wpdb->postmeta} AS postmeta ON posts.ID = postmeta.post_id
-		$stock_join
-		WHERE 	post_status = 'publish'
-		AND 	post_type 	= 'product'
-		AND 	meta_visibility.meta_key = '_visibility'
-		AND 	meta_visibility.meta_value IN ( 'visible', 'catalog' )
-		$stock_query
+		SELECT COUNT( DISTINCT ID ) FROM {$wpdb->posts}
+		WHERE post_status = 'publish'
+		AND post_type = 'product'
 	";
 
-	// Pre-process term taxonomy ids
+	$product_visibility_term_ids = wc_get_product_visibility_term_ids();
+	$exclude_term_ids            = array();
+
+	if ( $product_visibility_term_ids['exclude-from-catalog'] ) {
+		$exclude_term_ids[] = $product_visibility_term_ids['exclude-from-catalog'];
+	}
+
+	if ( 'yes' === get_option( 'woocommerce_hide_out_of_stock_items' ) && $product_visibility_term_ids['outofstock'] ) {
+		$exclude_term_ids[] = $product_visibility_term_ids['outofstock'];
+	}
+
+	if ( $exclude_term_ids ) {
+		$count_query .= " AND ID NOT IN ( SELECT object_ID FROM {$wpdb->term_relationships} WHERE term_taxonomy_id IN (" . implode( ',', array_map( 'absint', $exclude_term_ids ) ) . " ) ) ";
+	}
+
+	// Pre-process term taxonomy ids.
 	if ( ! $terms_are_term_taxonomy_ids ) {
-		// We passed in an array of TERMS in format id=>parent
+		// We passed in an array of TERMS in format id=>parent.
 		$terms = array_filter( (array) array_keys( $terms ) );
 	} else {
-		// If we have term taxonomy IDs we need to get the term ID
+		// If we have term taxonomy IDs we need to get the term ID.
 		$term_taxonomy_ids = $terms;
 		$terms             = array();
 		foreach ( $term_taxonomy_ids as $term_taxonomy_id ) {
@@ -511,22 +598,22 @@ function _wc_term_recount( $terms, $taxonomy, $callback = true, $terms_are_term_
 		}
 	}
 
-	// Exit if we have no terms to count
-	if ( ! $terms ) {
+	// Exit if we have no terms to count.
+	if ( empty( $terms ) ) {
 		return;
 	}
 
-	// Ancestors need counting
+	// Ancestors need counting.
 	if ( is_taxonomy_hierarchical( $taxonomy->name ) ) {
 		foreach ( $terms as $term_id ) {
 			$terms = array_merge( $terms, get_ancestors( $term_id, $taxonomy->name ) );
 		}
 	}
 
-	// Unique terms only
+	// Unique terms only.
 	$terms = array_unique( $terms );
 
-	// Count the terms
+	// Count the terms.
 	foreach ( $terms as $term_id ) {
 		$terms_to_count = array( absint( $term_id ) );
 
@@ -538,7 +625,7 @@ function _wc_term_recount( $terms, $taxonomy, $callback = true, $terms_are_term_
 		}
 
 		// Generate term query
-		$term_query = 'AND term_id IN ( ' . implode( ',', $terms_to_count ) . ' )';
+		$term_query = " AND ID IN ( SELECT object_ID FROM {$wpdb->term_relationships} LEFT JOIN {$wpdb->term_taxonomy} AS tax USING( term_taxonomy_id ) WHERE term_id IN (" . implode( ',', array_map( 'absint', $terms_to_count ) ) . " ) ) ";
 
 		// Get the count
 		$count = $wpdb->get_var( $count_query . $term_query );
@@ -556,8 +643,9 @@ function _wc_term_recount( $terms, $taxonomy, $callback = true, $terms_are_term_
  * @param int $product_id
  */
 function wc_recount_after_stock_change( $product_id ) {
-	if ( get_option( 'woocommerce_hide_out_of_stock_items' ) != 'yes' )
+	if ( 'yes' !== get_option( 'woocommerce_hide_out_of_stock_items' ) ) {
 		return;
+	}
 
 	$product_terms = get_the_terms( $product_id, 'product_cat' );
 
@@ -609,7 +697,7 @@ function wc_change_term_counts( $terms, $taxonomies ) {
 		if ( is_object( $term ) ) {
 			$term_counts[ $term->term_id ] = isset( $term_counts[ $term->term_id ] ) ? $term_counts[ $term->term_id ] : get_woocommerce_term_meta( $term->term_id, 'product_count_' . $taxonomies[0] , true );
 
-			if ( $term_counts[ $term->term_id ] !== '' ) {
+			if ( '' !== $term_counts[ $term->term_id ] ) {
 				$term->count = absint( $term_counts[ $term->term_id ] );
 			}
 		}
@@ -646,7 +734,6 @@ function wc_get_term_product_ids( $term_id, $taxonomy ) {
 
 /**
  * When a post is updated and terms recounted (called by _update_post_term_count), clear the ids.
- * @param int $term_id
  * @param int    $object_id  Object ID.
  * @param array  $terms      An array of object terms.
  * @param array  $tt_ids     An array of term taxonomy IDs.
@@ -663,3 +750,33 @@ function wc_clear_term_product_ids( $object_id, $terms, $tt_ids, $taxonomy, $app
 	}
 }
 add_action( 'set_object_terms', 'wc_clear_term_product_ids', 10, 6 );
+
+/**
+ * Get full list of product visibilty term ids.
+ *
+ * @since  3.0.0
+ * @return int[]
+ */
+function wc_get_product_visibility_term_ids() {
+	return array_map( 'absint', wp_parse_args(
+		wp_list_pluck(
+			get_terms( array(
+				'taxonomy' => 'product_visibility',
+				'hide_empty' => false,
+			) ),
+			'term_taxonomy_id',
+			'name'
+		),
+		array(
+			'exclude-from-catalog' => 0,
+			'exclude-from-search'  => 0,
+			'featured'             => 0,
+			'outofstock'           => 0,
+			'rated-1'              => 0,
+			'rated-2'              => 0,
+			'rated-3'              => 0,
+			'rated-4'              => 0,
+			'rated-5'              => 0,
+		)
+	) );
+}
diff --git a/includes/wc-update-functions.php b/includes/wc-update-functions.php
new file mode 100644
index 00000000000..398960890b7
--- /dev/null
+++ b/includes/wc-update-functions.php
@@ -0,0 +1,1102 @@
+<?php
+/**
+ * WooCommerce Updates
+ *
+ * Functions for updating data, used by the background updater.
+ *
+ * @author   WooThemes
+ * @category Core
+ * @package  WooCommerce/Functions
+ * @version  2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+function wc_update_200_file_paths() {
+	global $wpdb;
+
+	// Upgrade old style files paths to support multiple file paths
+	$existing_file_paths = $wpdb->get_results( "SELECT meta_value, meta_id, post_id FROM {$wpdb->postmeta} WHERE meta_key = '_file_path' AND meta_value != '';" );
+
+	if ( $existing_file_paths ) {
+
+		foreach ( $existing_file_paths as $existing_file_path ) {
+
+			$old_file_path = trim( $existing_file_path->meta_value );
+
+			if ( ! empty( $old_file_path ) ) {
+				$file_paths = serialize( array( md5( $old_file_path ) => $old_file_path ) );
+
+				$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->postmeta} SET meta_key = '_file_paths', meta_value = %s WHERE meta_id = %d", $file_paths, $existing_file_path->meta_id ) );
+
+				$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->prefix}woocommerce_downloadable_product_permissions SET download_id = %s WHERE product_id = %d", md5( $old_file_path ), $existing_file_path->post_id ) );
+
+			}
+		}
+	}
+}
+
+function wc_update_200_permalinks() {
+	// Setup default permalinks if shop page is defined
+	$permalinks 	= get_option( 'woocommerce_permalinks' );
+	$shop_page_id 	= wc_get_page_id( 'shop' );
+
+	if ( empty( $permalinks ) && $shop_page_id > 0 ) {
+
+		$base_slug 		= $shop_page_id > 0 && get_post( $shop_page_id ) ? get_page_uri( $shop_page_id ) : 'shop';
+
+		$category_base 	= get_option( 'woocommerce_prepend_shop_page_to_urls' ) == "yes" ? trailingslashit( $base_slug ) : '';
+		$category_slug 	= get_option( 'woocommerce_product_category_slug' ) ? get_option( 'woocommerce_product_category_slug' ) : _x( 'product-category', 'slug', 'woocommerce' );
+		$tag_slug 		= get_option( 'woocommerce_product_tag_slug' ) ? get_option( 'woocommerce_product_tag_slug' ) : _x( 'product-tag', 'slug', 'woocommerce' );
+
+		if ( 'yes' == get_option( 'woocommerce_prepend_shop_page_to_products' ) ) {
+			$product_base = trailingslashit( $base_slug );
+		} else {
+			if ( ( $product_slug = get_option( 'woocommerce_product_slug' ) ) !== false && ! empty( $product_slug ) ) {
+				$product_base = trailingslashit( $product_slug );
+			} else {
+				$product_base = trailingslashit( _x( 'product', 'slug', 'woocommerce' ) );
+			}
+		}
+
+		if ( get_option( 'woocommerce_prepend_category_to_products' ) == 'yes' ) {
+			$product_base .= trailingslashit( '%product_cat%' );
+		}
+
+		$permalinks = array(
+			'product_base' 		=> untrailingslashit( $product_base ),
+			'category_base' 	=> untrailingslashit( $category_base . $category_slug ),
+			'attribute_base' 	=> untrailingslashit( $category_base ),
+			'tag_base' 			=> untrailingslashit( $category_base . $tag_slug ),
+		);
+
+		update_option( 'woocommerce_permalinks', $permalinks );
+	}
+}
+
+function wc_update_200_subcat_display() {
+	// Update subcat display settings
+	if ( get_option( 'woocommerce_shop_show_subcategories' ) == 'yes' ) {
+		if ( get_option( 'woocommerce_hide_products_when_showing_subcategories' ) == 'yes' ) {
+			update_option( 'woocommerce_shop_page_display', 'subcategories' );
+		} else {
+			update_option( 'woocommerce_shop_page_display', 'both' );
+		}
+	}
+
+	if ( get_option( 'woocommerce_show_subcategories' ) == 'yes' ) {
+		if ( get_option( 'woocommerce_hide_products_when_showing_subcategories' ) == 'yes' ) {
+			update_option( 'woocommerce_category_archive_display', 'subcategories' );
+		} else {
+			update_option( 'woocommerce_category_archive_display', 'both' );
+		}
+	}
+}
+
+function wc_update_200_taxrates() {
+	global $wpdb;
+
+	// Update tax rates
+	$loop = 0;
+	$tax_rates = get_option( 'woocommerce_tax_rates' );
+
+	if ( $tax_rates ) {
+		foreach ( $tax_rates as $tax_rate ) {
+
+			foreach ( $tax_rate['countries'] as $country => $states ) {
+
+				$states = array_reverse( $states );
+
+				foreach ( $states as $state ) {
+
+					if ( '*' == $state ) {
+						$state = '';
+					}
+
+					$wpdb->insert(
+						$wpdb->prefix . "woocommerce_tax_rates",
+						array(
+							'tax_rate_country'  => $country,
+							'tax_rate_state'    => $state,
+							'tax_rate'          => $tax_rate['rate'],
+							'tax_rate_name'     => $tax_rate['label'],
+							'tax_rate_priority' => 1,
+							'tax_rate_compound' => ( 'yes' === $tax_rate['compound'] ) ? 1 : 0,
+							'tax_rate_shipping' => ( 'yes' === $tax_rate['shipping'] ) ? 1 : 0,
+							'tax_rate_order'    => $loop,
+							'tax_rate_class'    => $tax_rate['class'],
+						)
+					);
+
+					$loop++;
+				}
+			}
+		}
+	}
+
+	$local_tax_rates = get_option( 'woocommerce_local_tax_rates' );
+
+	if ( $local_tax_rates ) {
+		foreach ( $local_tax_rates as $tax_rate ) {
+
+			$location_type = ( 'postcode' === $tax_rate['location_type'] ) ? 'postcode' : 'city';
+
+			if ( '*' == $tax_rate['state'] ) {
+				$tax_rate['state'] = '';
+			}
+
+			$wpdb->insert(
+				$wpdb->prefix . "woocommerce_tax_rates",
+				array(
+					'tax_rate_country'  => $tax_rate['country'],
+					'tax_rate_state'    => $tax_rate['state'],
+					'tax_rate'          => $tax_rate['rate'],
+					'tax_rate_name'     => $tax_rate['label'],
+					'tax_rate_priority' => 2,
+					'tax_rate_compound' => ( 'yes' === $tax_rate['compound'] ) ? 1 : 0,
+					'tax_rate_shipping' => ( 'yes' === $tax_rate['shipping'] ) ? 1 : 0,
+					'tax_rate_order'    => $loop,
+					'tax_rate_class'    => $tax_rate['class'],
+				)
+			);
+
+			$tax_rate_id = $wpdb->insert_id;
+
+			if ( $tax_rate['locations'] ) {
+				foreach ( $tax_rate['locations'] as $location ) {
+
+					$wpdb->insert(
+						$wpdb->prefix . "woocommerce_tax_rate_locations",
+						array(
+							'location_code' => $location,
+							'tax_rate_id'   => $tax_rate_id,
+							'location_type' => $location_type,
+						)
+					);
+
+				}
+			}
+
+			$loop++;
+		}
+	}
+
+	update_option( 'woocommerce_tax_rates_backup', $tax_rates );
+	update_option( 'woocommerce_local_tax_rates_backup', $local_tax_rates );
+	delete_option( 'woocommerce_tax_rates' );
+	delete_option( 'woocommerce_local_tax_rates' );
+}
+
+function wc_update_200_line_items() {
+	global $wpdb;
+
+	// Now its time for the massive update to line items - move them to the new DB tables
+	// Reverse with UPDATE `wpwc_postmeta` SET meta_key = '_order_items' WHERE meta_key = '_order_items_old'
+	$order_item_rows = $wpdb->get_results( "
+		SELECT meta_value, post_id FROM {$wpdb->postmeta}
+		WHERE meta_key = '_order_items'
+	" );
+
+	foreach ( $order_item_rows as $order_item_row ) {
+
+		$order_items = (array) maybe_unserialize( $order_item_row->meta_value );
+
+		foreach ( $order_items as $order_item ) {
+
+			if ( ! isset( $order_item['line_total'] ) && isset( $order_item['taxrate'] ) && isset( $order_item['cost'] ) ) {
+				$order_item['line_tax'] 			= number_format( ( $order_item['cost'] * $order_item['qty'] ) * ( $order_item['taxrate'] / 100 ), 2, '.', '' );
+				$order_item['line_total'] 			= $order_item['cost'] * $order_item['qty'];
+				$order_item['line_subtotal_tax'] 	= $order_item['line_tax'];
+				$order_item['line_subtotal'] 		= $order_item['line_total'];
+			}
+
+			$order_item['line_tax'] 			= isset( $order_item['line_tax'] ) ? $order_item['line_tax'] : 0;
+			$order_item['line_total']			= isset( $order_item['line_total'] ) ? $order_item['line_total'] : 0;
+			$order_item['line_subtotal_tax'] 	= isset( $order_item['line_subtotal_tax'] ) ? $order_item['line_subtotal_tax'] : 0;
+			$order_item['line_subtotal'] 		= isset( $order_item['line_subtotal'] ) ? $order_item['line_subtotal'] : 0;
+
+			$item_id = wc_add_order_item( $order_item_row->post_id, array(
+		 		'order_item_name' 		=> $order_item['name'],
+		 		'order_item_type' 		=> 'line_item',
+		 	) );
+
+		 	// Add line item meta
+		 	if ( $item_id ) {
+			 	wc_add_order_item_meta( $item_id, '_qty', absint( $order_item['qty'] ) );
+			 	wc_add_order_item_meta( $item_id, '_tax_class', $order_item['tax_class'] );
+			 	wc_add_order_item_meta( $item_id, '_product_id', $order_item['id'] );
+			 	wc_add_order_item_meta( $item_id, '_variation_id', $order_item['variation_id'] );
+			 	wc_add_order_item_meta( $item_id, '_line_subtotal', wc_format_decimal( $order_item['line_subtotal'] ) );
+			 	wc_add_order_item_meta( $item_id, '_line_subtotal_tax', wc_format_decimal( $order_item['line_subtotal_tax'] ) );
+			 	wc_add_order_item_meta( $item_id, '_line_total', wc_format_decimal( $order_item['line_total'] ) );
+			 	wc_add_order_item_meta( $item_id, '_line_tax', wc_format_decimal( $order_item['line_tax'] ) );
+
+			 	$meta_rows = array();
+
+				// Insert meta
+				if ( ! empty( $order_item['item_meta'] ) ) {
+					foreach ( $order_item['item_meta'] as $key => $meta ) {
+						// Backwards compatibility
+						if ( is_array( $meta ) && isset( $meta['meta_name'] ) ) {
+							$meta_rows[] = '(' . $item_id . ',"' . esc_sql( $meta['meta_name'] ) . '","' . esc_sql( $meta['meta_value'] ) . '")';
+						} else {
+							$meta_rows[] = '(' . $item_id . ',"' . esc_sql( $key ) . '","' . esc_sql( $meta ) . '")';
+						}
+					}
+				}
+
+				// Insert meta rows at once
+				if ( sizeof( $meta_rows ) > 0 ) {
+					$wpdb->query( $wpdb->prepare( "
+						INSERT INTO {$wpdb->prefix}woocommerce_order_itemmeta ( order_item_id, meta_key, meta_value )
+						VALUES " . implode( ',', $meta_rows ) . ";
+					", $order_item_row->post_id ) );
+				}
+
+				// Delete from DB (rename)
+				$wpdb->query( $wpdb->prepare( "
+					UPDATE {$wpdb->postmeta}
+					SET meta_key = '_order_items_old'
+					WHERE meta_key = '_order_items'
+					AND post_id = %d
+				", $order_item_row->post_id ) );
+		 	}
+
+			unset( $meta_rows, $item_id, $order_item );
+		}
+	}
+
+	// Do the same kind of update for order_taxes - move to lines
+	// Reverse with UPDATE `wpwc_postmeta` SET meta_key = '_order_taxes' WHERE meta_key = '_order_taxes_old'
+	$order_tax_rows = $wpdb->get_results( "
+		SELECT meta_value, post_id FROM {$wpdb->postmeta}
+		WHERE meta_key = '_order_taxes'
+	" );
+
+	foreach ( $order_tax_rows as $order_tax_row ) {
+
+		$order_taxes = (array) maybe_unserialize( $order_tax_row->meta_value );
+
+		if ( ! empty( $order_taxes ) ) {
+			foreach ( $order_taxes as $order_tax ) {
+
+				if ( ! isset( $order_tax['label'] ) || ! isset( $order_tax['cart_tax'] ) || ! isset( $order_tax['shipping_tax'] ) ) {
+					continue;
+				}
+
+				$item_id = wc_add_order_item( $order_tax_row->post_id, array(
+			 		'order_item_name' 		=> $order_tax['label'],
+			 		'order_item_type' 		=> 'tax',
+			 	) );
+
+			 	// Add line item meta
+			 	if ( $item_id ) {
+				 	wc_add_order_item_meta( $item_id, 'compound', absint( isset( $order_tax['compound'] ) ? $order_tax['compound'] : 0 ) );
+				 	wc_add_order_item_meta( $item_id, 'tax_amount', wc_clean( $order_tax['cart_tax'] ) );
+				 	wc_add_order_item_meta( $item_id, 'shipping_tax_amount', wc_clean( $order_tax['shipping_tax'] ) );
+				}
+
+				// Delete from DB (rename)
+				$wpdb->query( $wpdb->prepare( "
+					UPDATE {$wpdb->postmeta}
+					SET meta_key = '_order_taxes_old'
+					WHERE meta_key = '_order_taxes'
+					AND post_id = %d
+				", $order_tax_row->post_id ) );
+
+				unset( $tax_amount );
+			}
+		}
+	}
+}
+
+function wc_update_200_images() {
+	// Grab the pre 2.0 Image options and use to populate the new image options settings,
+	// cleaning up afterwards like nice people do
+	foreach ( array( 'catalog', 'single', 'thumbnail' ) as $value ) {
+
+		$old_settings = array_filter( array(
+			'width' => get_option( 'woocommerce_' . $value . '_image_width' ),
+			'height' => get_option( 'woocommerce_' . $value . '_image_height' ),
+			'crop' => get_option( 'woocommerce_' . $value . '_image_crop' ),
+		) );
+
+		if ( ! empty( $old_settings ) && update_option( 'shop_' . $value . '_image_size', $old_settings ) ) {
+
+			delete_option( 'woocommerce_' . $value . '_image_width' );
+			delete_option( 'woocommerce_' . $value . '_image_height' );
+			delete_option( 'woocommerce_' . $value . '_image_crop' );
+
+		}
+	}
+}
+
+function wc_update_200_db_version() {
+	WC_Install::update_db_version( '2.0.0' );
+}
+
+function wc_update_209_brazillian_state() {
+	global $wpdb;
+
+	// Update brazillian state codes
+	$wpdb->update(
+		$wpdb->postmeta,
+		array(
+			'meta_value' => 'BA',
+		),
+		array(
+			'meta_key'   => '_billing_state',
+			'meta_value' => 'BH',
+		)
+	);
+	$wpdb->update(
+		$wpdb->postmeta,
+		array(
+			'meta_value' => 'BA',
+		),
+		array(
+			'meta_key'   => '_shipping_state',
+			'meta_value' => 'BH',
+		)
+	);
+	$wpdb->update(
+		$wpdb->usermeta,
+		array(
+			'meta_value' => 'BA',
+		),
+		array(
+			'meta_key'   => 'billing_state',
+			'meta_value' => 'BH',
+		)
+	);
+	$wpdb->update(
+		$wpdb->usermeta,
+		array(
+			'meta_value' => 'BA',
+		),
+		array(
+			'meta_key'   => 'shipping_state',
+			'meta_value' => 'BH',
+		)
+	);
+}
+
+function wc_update_209_db_version() {
+	WC_Install::update_db_version( '2.0.9' );
+}
+
+function wc_update_210_remove_pages() {
+	// Pages no longer used
+	wp_trash_post( get_option( 'woocommerce_pay_page_id' ) );
+	wp_trash_post( get_option( 'woocommerce_thanks_page_id' ) );
+	wp_trash_post( get_option( 'woocommerce_view_order_page_id' ) );
+	wp_trash_post( get_option( 'woocommerce_change_password_page_id' ) );
+	wp_trash_post( get_option( 'woocommerce_edit_address_page_id' ) );
+	wp_trash_post( get_option( 'woocommerce_lost_password_page_id' ) );
+}
+
+function wc_update_210_file_paths() {
+	global $wpdb;
+
+	// Upgrade file paths to support multiple file paths + names etc
+	$existing_file_paths = $wpdb->get_results( "SELECT meta_value, meta_id FROM {$wpdb->postmeta} WHERE meta_key = '_file_paths' AND meta_value != '';" );
+
+	if ( $existing_file_paths ) {
+
+		foreach ( $existing_file_paths as $existing_file_path ) {
+
+			$needs_update = false;
+			$new_value    = array();
+			$value        = maybe_unserialize( trim( $existing_file_path->meta_value ) );
+
+			if ( $value ) {
+				foreach ( $value as $key => $file ) {
+					if ( ! is_array( $file ) ) {
+						$needs_update      = true;
+						$new_value[ $key ] = array(
+							'file' => $file,
+							'name' => wc_get_filename_from_url( $file ),
+						);
+					} else {
+						$new_value[ $key ] = $file;
+					}
+				}
+				if ( $needs_update ) {
+					$new_value = serialize( $new_value );
+
+					$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->postmeta} SET meta_key = %s, meta_value = %s WHERE meta_id = %d", '_downloadable_files', $new_value, $existing_file_path->meta_id ) );
+				}
+			}
+		}
+	}
+}
+
+function wc_update_210_db_version() {
+	WC_Install::update_db_version( '2.1.0' );
+}
+
+function wc_update_220_shipping() {
+	$woocommerce_ship_to_destination = 'shipping';
+
+	if ( get_option( 'woocommerce_ship_to_billing_address_only' ) === 'yes' ) {
+		$woocommerce_ship_to_destination = 'billing_only';
+	} elseif ( get_option( 'woocommerce_ship_to_billing' ) === 'yes' ) {
+		$woocommerce_ship_to_destination = 'billing';
+	}
+
+	add_option( 'woocommerce_ship_to_destination', $woocommerce_ship_to_destination, '', 'no' );
+}
+
+function wc_update_220_order_status() {
+	global $wpdb;
+	$wpdb->query( "
+		UPDATE {$wpdb->posts} as posts
+		LEFT JOIN {$wpdb->term_relationships} AS rel ON posts.ID = rel.object_id
+		LEFT JOIN {$wpdb->term_taxonomy} AS tax USING( term_taxonomy_id )
+		LEFT JOIN {$wpdb->terms} AS term USING( term_id )
+		SET posts.post_status = 'wc-pending'
+		WHERE posts.post_type = 'shop_order'
+		AND posts.post_status = 'publish'
+		AND tax.taxonomy = 'shop_order_status'
+		AND	term.slug LIKE 'pending%';
+		"
+	);
+	$wpdb->query( "
+		UPDATE {$wpdb->posts} as posts
+		LEFT JOIN {$wpdb->term_relationships} AS rel ON posts.ID = rel.object_id
+		LEFT JOIN {$wpdb->term_taxonomy} AS tax USING( term_taxonomy_id )
+		LEFT JOIN {$wpdb->terms} AS term USING( term_id )
+		SET posts.post_status = 'wc-processing'
+		WHERE posts.post_type = 'shop_order'
+		AND posts.post_status = 'publish'
+		AND tax.taxonomy = 'shop_order_status'
+		AND	term.slug LIKE 'processing%';
+		"
+	);
+	$wpdb->query( "
+		UPDATE {$wpdb->posts} as posts
+		LEFT JOIN {$wpdb->term_relationships} AS rel ON posts.ID = rel.object_id
+		LEFT JOIN {$wpdb->term_taxonomy} AS tax USING( term_taxonomy_id )
+		LEFT JOIN {$wpdb->terms} AS term USING( term_id )
+		SET posts.post_status = 'wc-on-hold'
+		WHERE posts.post_type = 'shop_order'
+		AND posts.post_status = 'publish'
+		AND tax.taxonomy = 'shop_order_status'
+		AND	term.slug LIKE 'on-hold%';
+		"
+	);
+	$wpdb->query( "
+		UPDATE {$wpdb->posts} as posts
+		LEFT JOIN {$wpdb->term_relationships} AS rel ON posts.ID = rel.object_id
+		LEFT JOIN {$wpdb->term_taxonomy} AS tax USING( term_taxonomy_id )
+		LEFT JOIN {$wpdb->terms} AS term USING( term_id )
+		SET posts.post_status = 'wc-completed'
+		WHERE posts.post_type = 'shop_order'
+		AND posts.post_status = 'publish'
+		AND tax.taxonomy = 'shop_order_status'
+		AND	term.slug LIKE 'completed%';
+		"
+	);
+	$wpdb->query( "
+		UPDATE {$wpdb->posts} as posts
+		LEFT JOIN {$wpdb->term_relationships} AS rel ON posts.ID = rel.object_id
+		LEFT JOIN {$wpdb->term_taxonomy} AS tax USING( term_taxonomy_id )
+		LEFT JOIN {$wpdb->terms} AS term USING( term_id )
+		SET posts.post_status = 'wc-cancelled'
+		WHERE posts.post_type = 'shop_order'
+		AND posts.post_status = 'publish'
+		AND tax.taxonomy = 'shop_order_status'
+		AND	term.slug LIKE 'cancelled%';
+		"
+	);
+	$wpdb->query( "
+		UPDATE {$wpdb->posts} as posts
+		LEFT JOIN {$wpdb->term_relationships} AS rel ON posts.ID = rel.object_id
+		LEFT JOIN {$wpdb->term_taxonomy} AS tax USING( term_taxonomy_id )
+		LEFT JOIN {$wpdb->terms} AS term USING( term_id )
+		SET posts.post_status = 'wc-refunded'
+		WHERE posts.post_type = 'shop_order'
+		AND posts.post_status = 'publish'
+		AND tax.taxonomy = 'shop_order_status'
+		AND	term.slug LIKE 'refunded%';
+		"
+	);
+	$wpdb->query( "
+		UPDATE {$wpdb->posts} as posts
+		LEFT JOIN {$wpdb->term_relationships} AS rel ON posts.ID = rel.object_id
+		LEFT JOIN {$wpdb->term_taxonomy} AS tax USING( term_taxonomy_id )
+		LEFT JOIN {$wpdb->terms} AS term USING( term_id )
+		SET posts.post_status = 'wc-failed'
+		WHERE posts.post_type = 'shop_order'
+		AND posts.post_status = 'publish'
+		AND tax.taxonomy = 'shop_order_status'
+		AND	term.slug LIKE 'failed%';
+		"
+	);
+}
+
+function wc_update_220_variations() {
+	global $wpdb;
+	// Update variations which manage stock
+	$update_variations = $wpdb->get_results( "
+		SELECT DISTINCT posts.ID AS variation_id, posts.post_parent AS variation_parent FROM {$wpdb->posts} as posts
+		LEFT OUTER JOIN {$wpdb->postmeta} AS postmeta ON posts.ID = postmeta.post_id AND postmeta.meta_key = '_stock'
+		LEFT OUTER JOIN {$wpdb->postmeta} as postmeta2 ON posts.ID = postmeta2.post_id AND postmeta2.meta_key = '_manage_stock'
+		WHERE posts.post_type = 'product_variation'
+		AND postmeta.meta_value IS NOT NULL
+		AND postmeta.meta_value != ''
+		AND postmeta2.meta_value IS NULL
+	" );
+
+	foreach ( $update_variations as $variation ) {
+		$parent_backorders = get_post_meta( $variation->variation_parent, '_backorders', true );
+		add_post_meta( $variation->variation_id, '_manage_stock', 'yes', true );
+		add_post_meta( $variation->variation_id, '_backorders', $parent_backorders ? $parent_backorders : 'no', true );
+	}
+}
+
+function wc_update_220_attributes() {
+	global $wpdb;
+	// Update taxonomy names with correct sanitized names
+	$attribute_taxonomies = $wpdb->get_results( "SELECT attribute_name, attribute_id FROM " . $wpdb->prefix . "woocommerce_attribute_taxonomies" );
+
+	foreach ( $attribute_taxonomies as $attribute_taxonomy ) {
+		$sanitized_attribute_name = wc_sanitize_taxonomy_name( $attribute_taxonomy->attribute_name );
+		if ( $sanitized_attribute_name !== $attribute_taxonomy->attribute_name ) {
+			if ( ! $wpdb->get_var( $wpdb->prepare( "SELECT 1=1 FROM {$wpdb->prefix}woocommerce_attribute_taxonomies WHERE attribute_name = %s;", $sanitized_attribute_name ) ) ) {
+				// Update attribute
+				$wpdb->update(
+					"{$wpdb->prefix}woocommerce_attribute_taxonomies",
+					array(
+						'attribute_name' => $sanitized_attribute_name,
+					),
+					array(
+						'attribute_id' => $attribute_taxonomy->attribute_id,
+					)
+				);
+
+				// Update terms
+				$wpdb->update(
+					$wpdb->term_taxonomy,
+					array( 'taxonomy' => wc_attribute_taxonomy_name( $sanitized_attribute_name ) ),
+					array( 'taxonomy' => 'pa_' . $attribute_taxonomy->attribute_name )
+				);
+			}
+		}
+	}
+}
+
+function wc_update_220_db_version() {
+	WC_Install::update_db_version( '2.2.0' );
+}
+
+function wc_update_230_options() {
+	// _money_spent and _order_count may be out of sync - clear them
+	delete_metadata( 'user', 0, '_money_spent', '', true );
+	delete_metadata( 'user', 0, '_order_count', '', true );
+
+	// To prevent taxes being hidden when using a default 'no address' in a store with tax inc prices, set the woocommerce_default_customer_address to use the store base address by default
+	if ( '' === get_option( 'woocommerce_default_customer_address', false ) && wc_prices_include_tax() ) {
+		update_option( 'woocommerce_default_customer_address', 'base' );
+	}
+}
+
+function wc_update_230_db_version() {
+	WC_Install::update_db_version( '2.3.0' );
+}
+
+function wc_update_240_options() {
+	/**
+	 * Coupon discount calculations.
+	 * Maintain the old coupon logic for upgrades.
+	 */
+	update_option( 'woocommerce_calc_discounts_sequentially', 'yes' );
+}
+
+function wc_update_240_shipping_methods() {
+	global $wpdb;
+	/**
+	 * Flat Rate Shipping.
+	 * Update legacy options to new math based options.
+	 */
+	$shipping_methods = array(
+		'woocommerce_flat_rates'                        => new WC_Shipping_Legacy_Flat_Rate(),
+		'woocommerce_international_delivery_flat_rates' => new WC_Shipping_Legacy_International_Delivery(),
+	);
+	foreach ( $shipping_methods as $flat_rate_option_key => $shipping_method ) {
+		// Stop this running more than once if routine is repeated
+		if ( version_compare( $shipping_method->get_option( 'version', 0 ), '2.4.0', '<' ) ) {
+			$has_classes                      = sizeof( WC()->shipping->get_shipping_classes() ) > 0;
+			$cost_key                         = $has_classes ? 'no_class_cost' : 'cost';
+			$min_fee                          = $shipping_method->get_option( 'minimum_fee' );
+			$math_cost_strings                = array( 'cost' => array(), 'no_class_cost' => array() );
+			$math_cost_strings[ $cost_key ][] = $shipping_method->get_option( 'cost' );
+
+			if ( $fee = $shipping_method->get_option( 'fee' ) ) {
+				$math_cost_strings[ $cost_key ][] = strstr( $fee, '%' ) ? '[fee percent="' . str_replace( '%', '', $fee ) . '" min="' . esc_attr( $min_fee ) . '"]' : $fee;
+			}
+
+			foreach ( WC()->shipping->get_shipping_classes() as $shipping_class ) {
+				$rate_key                       = 'class_cost_' . $shipping_class->slug;
+				$math_cost_strings[ $rate_key ] = $math_cost_strings['no_class_cost'];
+			}
+
+			if ( $flat_rates = array_filter( (array) get_option( $flat_rate_option_key, array() ) ) ) {
+				foreach ( $flat_rates as $shipping_class => $rate ) {
+					$rate_key = 'class_cost_' . $shipping_class;
+					if ( $rate['cost'] || $rate['fee'] ) {
+						$math_cost_strings[ $rate_key ][] = $rate['cost'];
+						$math_cost_strings[ $rate_key ][] = strstr( $rate['fee'], '%' ) ? '[fee percent="' . str_replace( '%', '', $rate['fee'] ) . '" min="' . esc_attr( $min_fee ) . '"]' : $rate['fee'];
+					}
+				}
+			}
+
+			if ( 'item' === $shipping_method->type ) {
+				foreach ( $math_cost_strings as $key => $math_cost_string ) {
+					$math_cost_strings[ $key ] = array_filter( array_map( 'trim', $math_cost_strings[ $key ] ) );
+					if ( ! empty( $math_cost_strings[ $key ] ) ) {
+						$last_key                                = max( 0, sizeof( $math_cost_strings[ $key ] ) - 1 );
+						$math_cost_strings[ $key ][0]            = '( ' . $math_cost_strings[ $key ][0];
+						$math_cost_strings[ $key ][ $last_key ] .= ' ) * [qty]';
+					}
+				}
+			}
+
+			$math_cost_strings['cost'][] = $shipping_method->get_option( 'cost_per_order' );
+
+			// Save settings
+			foreach ( $math_cost_strings as $option_id => $math_cost_string ) {
+				$shipping_method->settings[ $option_id ] = implode( ' + ', array_filter( $math_cost_string ) );
+			}
+
+			$shipping_method->settings['version'] = '2.4.0';
+			$shipping_method->settings['type']    = 'item' === $shipping_method->settings['type'] ? 'class' : $shipping_method->settings['type'];
+
+			update_option( $shipping_method->plugin_id . $shipping_method->id . '_settings', $shipping_method->settings );
+		}
+	}
+}
+
+function wc_update_240_api_keys() {
+	global $wpdb;
+	/**
+	 * Update the old user API keys to the new Apps keys.
+	 */
+	$api_users = $wpdb->get_results( "SELECT user_id FROM $wpdb->usermeta WHERE meta_key = 'woocommerce_api_consumer_key'" );
+	$apps_keys = array();
+
+	// Get user data
+	foreach ( $api_users as $_user ) {
+		$user = get_userdata( $_user->user_id );
+		$apps_keys[] = array(
+			'user_id'         => $user->ID,
+			'permissions'     => $user->woocommerce_api_key_permissions,
+			'consumer_key'    => wc_api_hash( $user->woocommerce_api_consumer_key ),
+			'consumer_secret' => $user->woocommerce_api_consumer_secret,
+			'truncated_key'   => substr( $user->woocommerce_api_consumer_secret, -7 ),
+		);
+	}
+
+	if ( ! empty( $apps_keys ) ) {
+		// Create new apps
+		foreach ( $apps_keys as $app ) {
+			$wpdb->insert(
+				$wpdb->prefix . 'woocommerce_api_keys',
+				$app,
+				array(
+					'%d',
+					'%s',
+					'%s',
+					'%s',
+					'%s',
+				)
+			);
+		}
+
+		// Delete old user keys from usermeta
+		foreach ( $api_users as $_user ) {
+			$user_id = intval( $_user->user_id );
+			delete_user_meta( $user_id, 'woocommerce_api_consumer_key' );
+			delete_user_meta( $user_id, 'woocommerce_api_consumer_secret' );
+			delete_user_meta( $user_id, 'woocommerce_api_key_permissions' );
+		}
+	}
+}
+
+function wc_update_240_webhooks() {
+	global $wpdb;
+	/**
+	 * Webhooks.
+	 * Make sure order.update webhooks get the woocommerce_order_edit_status hook.
+	 */
+	$order_update_webhooks = get_posts( array(
+		'posts_per_page' => -1,
+		'post_type'      => 'shop_webhook',
+		'meta_key'       => '_topic',
+		'meta_value'     => 'order.updated',
+	) );
+	foreach ( $order_update_webhooks as $order_update_webhook ) {
+		$webhook = new WC_Webhook( $order_update_webhook->ID );
+		$webhook->set_topic( 'order.updated' );
+	}
+}
+
+function wc_update_240_refunds() {
+	global $wpdb;
+	/**
+	 * Refunds for full refunded orders.
+	 * Update fully refunded orders to ensure they have a refund line item so reports add up.
+	 */
+	$refunded_orders = get_posts( array(
+		'posts_per_page' => -1,
+		'post_type'      => 'shop_order',
+		'post_status'    => array( 'wc-refunded' ),
+	) );
+
+	// Ensure emails are disabled during this update routine
+	remove_all_actions( 'woocommerce_order_status_refunded_notification' );
+	remove_all_actions( 'woocommerce_order_partially_refunded_notification' );
+	remove_action( 'woocommerce_order_status_refunded', array( 'WC_Emails', 'send_transactional_email' ) );
+	remove_action( 'woocommerce_order_partially_refunded', array( 'WC_Emails', 'send_transactional_email' ) );
+
+	foreach ( $refunded_orders as $refunded_order ) {
+		$order_total    = get_post_meta( $refunded_order->ID, '_order_total', true );
+		$refunded_total = $wpdb->get_var( $wpdb->prepare( "
+			SELECT SUM( postmeta.meta_value )
+			FROM $wpdb->postmeta AS postmeta
+			INNER JOIN $wpdb->posts AS posts ON ( posts.post_type = 'shop_order_refund' AND posts.post_parent = %d )
+			WHERE postmeta.meta_key = '_refund_amount'
+			AND postmeta.post_id = posts.ID
+		", $refunded_order->ID ) );
+
+		if ( $order_total > $refunded_total ) {
+			wc_create_refund( array(
+				'amount'     => $order_total - $refunded_total,
+				'reason'     => __( 'Order fully refunded', 'woocommerce' ),
+				'order_id'   => $refunded_order->ID,
+				'line_items' => array(),
+				'date'       => $refunded_order->post_modified,
+			) );
+		}
+	}
+
+	wc_delete_shop_order_transients();
+}
+
+function wc_update_240_db_version() {
+	WC_Install::update_db_version( '2.4.0' );
+}
+
+function wc_update_241_variations() {
+	global $wpdb;
+
+	// Select variations that don't have any _stock_status implemented on WooCommerce 2.2
+	$update_variations = $wpdb->get_results( "
+		SELECT DISTINCT posts.ID AS variation_id, posts.post_parent AS variation_parent
+		FROM {$wpdb->posts} as posts
+		LEFT OUTER JOIN {$wpdb->postmeta} AS postmeta ON posts.ID = postmeta.post_id AND postmeta.meta_key = '_stock_status'
+		WHERE posts.post_type = 'product_variation'
+		AND postmeta.meta_value IS NULL
+	" );
+
+	foreach ( $update_variations as $variation ) {
+		// Get the parent _stock_status
+		$parent_stock_status = get_post_meta( $variation->variation_parent, '_stock_status', true );
+
+		// Set the _stock_status
+		add_post_meta( $variation->variation_id, '_stock_status', $parent_stock_status ? $parent_stock_status : 'instock', true );
+
+		// Delete old product children array
+		delete_transient( 'wc_product_children_' . $variation->variation_parent );
+	}
+
+	// Invalidate old transients such as wc_var_price
+	WC_Cache_Helper::get_transient_version( 'product', true );
+}
+
+function wc_update_241_db_version() {
+	WC_Install::update_db_version( '2.4.1' );
+}
+
+function wc_update_250_currency() {
+	global $wpdb;
+	// Fix currency settings for LAK currency.
+	$current_currency = get_option( 'woocommerce_currency' );
+
+	if ( 'KIP' === $current_currency ) {
+		update_option( 'woocommerce_currency', 'LAK' );
+	}
+
+	// Update LAK currency code.
+	$wpdb->update(
+		$wpdb->postmeta,
+		array(
+			'meta_value' => 'LAK',
+		),
+		array(
+			'meta_key'   => '_order_currency',
+			'meta_value' => 'KIP',
+		)
+	);
+}
+
+function wc_update_250_db_version() {
+	WC_Install::update_db_version( '2.5.0' );
+}
+
+function wc_update_260_options() {
+	/**
+	 * woocommerce_calc_shipping option has been removed in 2.6
+	 */
+	if ( 'no' === get_option( 'woocommerce_calc_shipping' ) ) {
+		update_option( 'woocommerce_ship_to_countries', 'disabled' );
+	}
+
+	WC_Admin_Notices::add_notice( 'legacy_shipping' );
+}
+
+function wc_update_260_termmeta() {
+	global $wpdb;
+	/**
+	 * Migrate term meta to WordPress tables
+	 */
+	if ( get_option( 'db_version' ) >= 34370 && $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}woocommerce_termmeta';" ) ) {
+		if ( $wpdb->query( "INSERT INTO {$wpdb->termmeta} ( term_id, meta_key, meta_value ) SELECT woocommerce_term_id, meta_key, meta_value FROM {$wpdb->prefix}woocommerce_termmeta;" ) ) {
+			$wpdb->query( "DROP TABLE IF EXISTS {$wpdb->prefix}woocommerce_termmeta" );
+			wp_cache_flush();
+		}
+	}
+}
+
+function wc_update_260_zones() {
+	global $wpdb;
+	/**
+	 * Old (table rate) shipping zones to new core shipping zones migration.
+	 * zone_enabled and zone_type are no longer used, but it's safe to leave them be.
+	 */
+	if ( $wpdb->get_var( "SHOW COLUMNS FROM `{$wpdb->prefix}woocommerce_shipping_zones` LIKE 'zone_enabled';" ) ) {
+		$wpdb->query( "ALTER TABLE {$wpdb->prefix}woocommerce_shipping_zones CHANGE `zone_type` `zone_type` VARCHAR(40) NOT NULL DEFAULT '';" );
+		$wpdb->query( "ALTER TABLE {$wpdb->prefix}woocommerce_shipping_zones CHANGE `zone_enabled` `zone_enabled` INT(1) NOT NULL DEFAULT 1;" );
+	}
+}
+
+function wc_update_260_zone_methods() {
+	global $wpdb;
+
+	/**
+	 * Shipping zones in WC 2.6.0 use a table named woocommerce_shipping_zone_methods.
+	 * Migrate the old data out of woocommerce_shipping_zone_shipping_methods into the new table and port over any known options (used by table rates and flat rate boxes).
+	 */
+	if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}woocommerce_shipping_zone_shipping_methods';" ) ) {
+		$old_methods = $wpdb->get_results( "SELECT zone_id, shipping_method_type, shipping_method_order, shipping_method_id FROM {$wpdb->prefix}woocommerce_shipping_zone_shipping_methods;" );
+
+		if ( $old_methods ) {
+			$max_new_id = $wpdb->get_var( "SELECT MAX(instance_id) FROM {$wpdb->prefix}woocommerce_shipping_zone_methods" );
+			$max_old_id = $wpdb->get_var( "SELECT MAX(shipping_method_id) FROM {$wpdb->prefix}woocommerce_shipping_zone_shipping_methods" );
+
+			// Avoid ID conflicts
+			$wpdb->query( $wpdb->prepare( "ALTER TABLE {$wpdb->prefix}woocommerce_shipping_zone_methods AUTO_INCREMENT = %d;", max( $max_new_id, $max_old_id ) + 1 ) );
+
+			// Store changes
+			$changes = array();
+
+			// Move data
+			foreach ( $old_methods as $old_method ) {
+				$wpdb->insert( $wpdb->prefix . 'woocommerce_shipping_zone_methods', array(
+					'zone_id'      => $old_method->zone_id,
+					'method_id'    => $old_method->shipping_method_type,
+					'method_order' => $old_method->shipping_method_order,
+				) );
+
+				$new_instance_id = $wpdb->insert_id;
+
+				// Move main settings
+				$older_settings_key = 'woocommerce_' . $old_method->shipping_method_type . '-' . $old_method->shipping_method_id . '_settings';
+				$old_settings_key   = 'woocommerce_' . $old_method->shipping_method_type . '_' . $old_method->shipping_method_id . '_settings';
+				add_option( 'woocommerce_' . $old_method->shipping_method_type . '_' . $new_instance_id . '_settings', get_option( $old_settings_key, get_option( $older_settings_key ) ) );
+
+				// Handling for table rate and flat rate box shipping.
+				if ( 'table_rate' === $old_method->shipping_method_type ) {
+					// Move priority settings
+					add_option( 'woocommerce_table_rate_default_priority_' . $new_instance_id, get_option( 'woocommerce_table_rate_default_priority_' . $old_method->shipping_method_id ) );
+					add_option( 'woocommerce_table_rate_priorities_' . $new_instance_id, get_option( 'woocommerce_table_rate_priorities_' . $old_method->shipping_method_id ) );
+
+					// Move rates
+					$wpdb->update(
+						$wpdb->prefix . 'woocommerce_shipping_table_rates',
+						array(
+							'shipping_method_id' => $new_instance_id,
+						),
+						array(
+							'shipping_method_id' => $old_method->shipping_method_id,
+						)
+					);
+				} elseif ( 'flat_rate_boxes' === $old_method->shipping_method_type ) {
+					$wpdb->update(
+						$wpdb->prefix . 'woocommerce_shipping_flat_rate_boxes',
+						array(
+							'shipping_method_id' => $new_instance_id,
+						),
+						array(
+							'shipping_method_id' => $old_method->shipping_method_id,
+						)
+					);
+				}
+
+				$changes[ $old_method->shipping_method_id ] = $new_instance_id;
+			}
+
+			// $changes contains keys (old method ids) and values (new instance ids) if extra processing is needed in plugins.
+			// Store this to an option so extensions can pick it up later, then fire an action.
+			update_option( 'woocommerce_updated_instance_ids', $changes );
+			do_action( 'woocommerce_updated_instance_ids', $changes );
+		}
+	}
+
+	// Change ranges used to ...
+	$wpdb->query( "UPDATE {$wpdb->prefix}woocommerce_shipping_zone_locations SET location_code = REPLACE( location_code, '-', '...' );" );
+}
+
+function wc_update_260_refunds() {
+	global $wpdb;
+	/**
+	 * Refund item qty should be negative
+	 */
+	$wpdb->query( "
+	UPDATE {$wpdb->prefix}woocommerce_order_itemmeta as item_meta
+	LEFT JOIN {$wpdb->prefix}woocommerce_order_items as items ON item_meta.order_item_id = items.order_item_id
+	LEFT JOIN {$wpdb->posts} as posts ON items.order_id = posts.ID
+	SET item_meta.meta_value = item_meta.meta_value * -1
+	WHERE item_meta.meta_value > 0 AND item_meta.meta_key = '_qty' AND posts.post_type = 'shop_order_refund'
+	" );
+}
+
+function wc_update_260_db_version() {
+	WC_Install::update_db_version( '2.6.0' );
+}
+
+function wc_update_300_webhooks() {
+	/**
+	 * Make sure product.update webhooks get the woocommerce_product_quick_edit_save
+	 * and woocommerce_product_bulk_edit_save hooks.
+	 */
+	$product_update_webhooks = get_posts( array(
+		'posts_per_page' => -1,
+		'post_type'      => 'shop_webhook',
+		'meta_key'       => '_topic',
+		'meta_value'     => 'product.updated',
+	) );
+	foreach ( $product_update_webhooks as $product_update_webhook ) {
+		$webhook = new WC_Webhook( $product_update_webhook->ID );
+		$webhook->set_topic( 'product.updated' );
+	}
+}
+
+/**
+ * Add an index to the field comment_type to improve the response time of the query
+ * used by WC_Comments::wp_count_comments() to get the number of comments by type.
+ *
+ * @return null
+ */
+function wc_update_300_comment_type_index() {
+	global $wpdb;
+
+	$index_exists = $wpdb->get_row( "SHOW INDEX FROM {$wpdb->comments} WHERE column_name = 'comment_type' and key_name = 'woo_idx_comment_type'" );
+
+	if ( is_null( $index_exists ) ) {
+		// Add an index to the field comment_type to improve the response time of the query
+		// used by WC_Comments::wp_count_comments() to get the number of comments by type.
+		$wpdb->query( "ALTER TABLE {$wpdb->comments} ADD INDEX woo_idx_comment_type (comment_type)" );
+	}
+}
+
+function wc_update_300_grouped_products() {
+	global $wpdb;
+	$parents = $wpdb->get_col( "SELECT DISTINCT( post_parent ) FROM {$wpdb->posts} WHERE post_parent > 0 AND post_type = 'product';" );
+	foreach ( $parents as $parent_id ) {
+		$parent = wc_get_product( $parent_id );
+		if ( $parent && $parent->is_type( 'grouped' ) ) {
+			$children_ids = get_posts( array(
+				'post_parent'    => $parent_id,
+				'posts_per_page' => -1,
+				'post_type'      => 'product',
+				'fields'         => 'ids',
+			) );
+			update_post_meta( $parent_id, '_children', $children_ids );
+
+			// Update children to remove the parent.
+			$wpdb->update(
+				$wpdb->posts,
+				array(
+					'post_parent' => 0,
+				),
+				array(
+					'post_parent' => $parent_id,
+				)
+			);
+		}
+	}
+}
+
+function wc_update_300_settings() {
+	$woocommerce_shipping_tax_class = get_option( 'woocommerce_shipping_tax_class' );
+	if ( '' === $woocommerce_shipping_tax_class ) {
+		update_option( 'woocommerce_shipping_tax_class', 'inherit' );
+	} elseif ( 'standard' === $woocommerce_shipping_tax_class ) {
+		update_option( 'woocommerce_shipping_tax_class', '' );
+	}
+}
+
+/**
+ * Convert meta values into term for product visibility.
+ */
+function wc_update_300_product_visibility() {
+	global $wpdb;
+
+	WC_Install::create_terms();
+
+	if ( $featured_term = get_term_by( 'name', 'featured', 'product_visibility' ) ) {
+		$wpdb->query( $wpdb->prepare( "INSERT IGNORE INTO {$wpdb->term_relationships} SELECT post_id, %d, 0 FROM {$wpdb->postmeta} WHERE meta_key = '_featured' AND meta_value = 'yes';", $featured_term->term_taxonomy_id ) );
+	}
+
+	if ( $exclude_search_term = get_term_by( 'name', 'exclude-from-search', 'product_visibility' ) ) {
+		$wpdb->query( $wpdb->prepare( "INSERT IGNORE INTO {$wpdb->term_relationships} SELECT post_id, %d, 0 FROM {$wpdb->postmeta} WHERE meta_key = '_visibility' AND meta_value IN ('hidden', 'catalog');", $exclude_search_term->term_taxonomy_id ) );
+	}
+
+	if ( $exclude_catalog_term = get_term_by( 'name', 'exclude-from-catalog', 'product_visibility' ) ) {
+		$wpdb->query( $wpdb->prepare( "INSERT IGNORE INTO {$wpdb->term_relationships} SELECT post_id, %d, 0 FROM {$wpdb->postmeta} WHERE meta_key = '_visibility' AND meta_value IN ('hidden', 'search');", $exclude_catalog_term->term_taxonomy_id ) );
+	}
+
+	if ( $outofstock_term = get_term_by( 'name', 'outofstock', 'product_visibility' ) ) {
+		$wpdb->query( $wpdb->prepare( "INSERT IGNORE INTO {$wpdb->term_relationships} SELECT post_id, %d, 0 FROM {$wpdb->postmeta} WHERE meta_key = '_stock_status' AND meta_value = 'outofstock';", $outofstock_term->term_taxonomy_id ) );
+	}
+
+	if ( $rating_term = get_term_by( 'name', 'rated-1', 'product_visibility' ) ) {
+		$wpdb->query( $wpdb->prepare( "INSERT IGNORE INTO {$wpdb->term_relationships} SELECT post_id, %d, 0 FROM {$wpdb->postmeta} WHERE meta_key = '_wc_average_rating' AND ROUND( meta_value ) = 1;", $rating_term->term_taxonomy_id ) );
+	}
+
+	if ( $rating_term = get_term_by( 'name', 'rated-2', 'product_visibility' ) ) {
+		$wpdb->query( $wpdb->prepare( "INSERT IGNORE INTO {$wpdb->term_relationships} SELECT post_id, %d, 0 FROM {$wpdb->postmeta} WHERE meta_key = '_wc_average_rating' AND ROUND( meta_value ) = 2;", $rating_term->term_taxonomy_id ) );
+	}
+
+	if ( $rating_term = get_term_by( 'name', 'rated-3', 'product_visibility' ) ) {
+		$wpdb->query( $wpdb->prepare( "INSERT IGNORE INTO {$wpdb->term_relationships} SELECT post_id, %d, 0 FROM {$wpdb->postmeta} WHERE meta_key = '_wc_average_rating' AND ROUND( meta_value ) = 3;", $rating_term->term_taxonomy_id ) );
+	}
+
+	if ( $rating_term = get_term_by( 'name', 'rated-4', 'product_visibility' ) ) {
+		$wpdb->query( $wpdb->prepare( "INSERT IGNORE INTO {$wpdb->term_relationships} SELECT post_id, %d, 0 FROM {$wpdb->postmeta} WHERE meta_key = '_wc_average_rating' AND ROUND( meta_value ) = 4;", $rating_term->term_taxonomy_id ) );
+	}
+
+	if ( $rating_term = get_term_by( 'name', 'rated-5', 'product_visibility' ) ) {
+		$wpdb->query( $wpdb->prepare( "INSERT IGNORE INTO {$wpdb->term_relationships} SELECT post_id, %d, 0 FROM {$wpdb->postmeta} WHERE meta_key = '_wc_average_rating' AND ROUND( meta_value ) = 5;", $rating_term->term_taxonomy_id ) );
+	}
+}
+
+/**
+ * Update DB Version.
+ */
+function wc_update_300_db_version() {
+	WC_Install::update_db_version( '3.0.0' );
+}
diff --git a/includes/wc-user-functions.php b/includes/wc-user-functions.php
index 448b24aebb3..b4f7cc84a89 100644
--- a/includes/wc-user-functions.php
+++ b/includes/wc-user-functions.php
@@ -32,89 +32,89 @@ function wc_disable_admin_bar( $show_admin_bar ) {
 }
 add_filter( 'show_admin_bar', 'wc_disable_admin_bar', 10, 1 );
 
+if ( ! function_exists( 'wc_create_new_customer' ) ) {
 
-/**
- * Create a new customer.
- *
- * @param  string $email
- * @param  string $username
- * @param  string $password
- * @return int|WP_Error on failure, Int (user ID) on success
- */
-function wc_create_new_customer( $email, $username = '', $password = '' ) {
+	/**
+	 * Create a new customer.
+	 *
+	 * @param  string $email Customer email.
+	 * @param  string $username Customer username.
+	 * @param  string $password Customer password.
+	 * @return int|WP_Error Returns WP_Error on failure, Int (user ID) on success.
+	 */
+	function wc_create_new_customer( $email, $username = '', $password = '' ) {
 
-	// Check the e-mail address
-	if ( empty( $email ) || ! is_email( $email ) ) {
-		return new WP_Error( 'registration-error-invalid-email', __( 'Please provide a valid email address.', 'woocommerce' ) );
-	}
-
-	if ( email_exists( $email ) ) {
-		return new WP_Error( 'registration-error-email-exists', __( 'An account is already registered with your email address. Please login.', 'woocommerce' ) );
-	}
-
-	// Handle username creation
-	if ( 'no' === get_option( 'woocommerce_registration_generate_username' ) || ! empty( $username ) ) {
-
-		$username = sanitize_user( $username );
-
-		if ( empty( $username ) || ! validate_username( $username ) ) {
-			return new WP_Error( 'registration-error-invalid-username', __( 'Please enter a valid account username.', 'woocommerce' ) );
+		// Check the email address.
+		if ( empty( $email ) || ! is_email( $email ) ) {
+			return new WP_Error( 'registration-error-invalid-email', __( 'Please provide a valid email address.', 'woocommerce' ) );
 		}
 
-		if ( username_exists( $username ) )
-			return new WP_Error( 'registration-error-username-exists', __( 'An account is already registered with that username. Please choose another.', 'woocommerce' ) );
-	} else {
-
-		$username = sanitize_user( current( explode( '@', $email ) ), true );
-
-		// Ensure username is unique
-		$append     = 1;
-		$o_username = $username;
-
-		while ( username_exists( $username ) ) {
-			$username = $o_username . $append;
-			$append ++;
+		if ( email_exists( $email ) ) {
+			return new WP_Error( 'registration-error-email-exists', __( 'An account is already registered with your email address. Please login.', 'woocommerce' ) );
 		}
+
+		// Handle username creation.
+		if ( 'no' === get_option( 'woocommerce_registration_generate_username' ) || ! empty( $username ) ) {
+			$username = sanitize_user( $username );
+
+			if ( empty( $username ) || ! validate_username( $username ) ) {
+				return new WP_Error( 'registration-error-invalid-username', __( 'Please enter a valid account username.', 'woocommerce' ) );
+			}
+
+			if ( username_exists( $username ) ) {
+				return new WP_Error( 'registration-error-username-exists', __( 'An account is already registered with that username. Please choose another.', 'woocommerce' ) );
+			}
+		} else {
+			$username = sanitize_user( current( explode( '@', $email ) ), true );
+
+			// Ensure username is unique.
+			$append     = 1;
+			$o_username = $username;
+
+			while ( username_exists( $username ) ) {
+				$username = $o_username . $append;
+				$append++;
+			}
+		}
+
+		// Handle password creation.
+		if ( 'yes' === get_option( 'woocommerce_registration_generate_password' ) && empty( $password ) ) {
+			$password           = wp_generate_password();
+			$password_generated = true;
+		} elseif ( empty( $password ) ) {
+			return new WP_Error( 'registration-error-missing-password', __( 'Please enter an account password.', 'woocommerce' ) );
+		} else {
+			$password_generated = false;
+		}
+
+		// Use WP_Error to handle registration errors.
+		$errors = new WP_Error();
+
+		do_action( 'woocommerce_register_post', $username, $email, $errors );
+
+		$errors = apply_filters( 'woocommerce_registration_errors', $errors, $username, $email );
+
+		if ( $errors->get_error_code() ) {
+			return $errors;
+		}
+
+		$new_customer_data = apply_filters( 'woocommerce_new_customer_data', array(
+			'user_login' => $username,
+			'user_pass'  => $password,
+			'user_email' => $email,
+			'role'       => 'customer',
+		) );
+
+		$customer_id = wp_insert_user( $new_customer_data );
+
+		if ( is_wp_error( $customer_id ) ) {
+			return new WP_Error( 'registration-error', '<strong>' . __( 'Error:', 'woocommerce' ) . '</strong> ' . __( 'Couldn&#8217;t register you&hellip; please contact us if you continue to have problems.', 'woocommerce' ) );
+		}
+
+		do_action( 'woocommerce_created_customer', $customer_id, $new_customer_data, $password_generated );
+
+		return $customer_id;
 	}
-
-	// Handle password creation
-	if ( 'yes' === get_option( 'woocommerce_registration_generate_password' ) && empty( $password ) ) {
-		$password = wp_generate_password();
-		$password_generated = true;
-
-	} elseif ( empty( $password ) ) {
-		return new WP_Error( 'registration-error-missing-password', __( 'Please enter an account password.', 'woocommerce' ) );
-
-	} else {
-		$password_generated = false;
-	}
-
-	// WP Validation
-	$validation_errors = new WP_Error();
-
-	do_action( 'woocommerce_register_post', $username, $email, $validation_errors );
-
-	$validation_errors = apply_filters( 'woocommerce_registration_errors', $validation_errors, $username, $email );
-
-	if ( $validation_errors->get_error_code() )
-		return $validation_errors;
-
-	$new_customer_data = apply_filters( 'woocommerce_new_customer_data', array(
-		'user_login' => $username,
-		'user_pass'  => $password,
-		'user_email' => $email,
-		'role'       => 'customer'
-	) );
-
-	$customer_id = wp_insert_user( $new_customer_data );
-
-	if ( is_wp_error( $customer_id ) ) {
-		return new WP_Error( 'registration-error', '<strong>' . __( 'ERROR', 'woocommerce' ) . '</strong>: ' . __( 'Couldn&#8217;t register you&hellip; please contact us if you continue to have problems.', 'woocommerce' ) );
-	}
-
-	do_action( 'woocommerce_created_customer', $customer_id, $new_customer_data, $password_generated );
-
-	return $customer_id;
 }
 
 /**
@@ -137,31 +137,16 @@ function wc_set_customer_auth_cookie( $customer_id ) {
  * @return int
  */
 function wc_update_new_customer_past_orders( $customer_id ) {
-
-	$customer = get_user_by( 'id', absint( $customer_id ) );
-
-	$customer_orders = get_posts( array(
-		'numberposts' => -1,
-		'post_type'   => wc_get_order_types(),
-		'post_status' => array_keys( wc_get_order_statuses() ),
-		'fields'      => 'ids',
-		'meta_query' => array(
-			array(
-				'key'     => '_customer_user',
-				'value'   => array( 0, '' ),
-				'compare' => 'IN'
-			),
-			array(
-				'key'     => '_billing_email',
-				'value'   => $customer->user_email,
-			)
-		),
+	$linked          = 0;
+	$complete        = 0;
+	$customer        = get_user_by( 'id', absint( $customer_id ) );
+	$customer_orders = wc_get_orders( array(
+		'limit'    => -1,
+		'customer' => array( array( 0, $customer->user_email ) ),
+		'return'   => 'ids',
 	) );
 
-	$linked   = 0;
-	$complete = 0;
-
-	if ( $customer_orders ) {
+	if ( ! empty( $customer_orders ) ) {
 		foreach ( $customer_orders as $order_id ) {
 			update_post_meta( $order_id, '_customer_user', $customer->ID );
 
@@ -191,17 +176,13 @@ function wc_update_new_customer_past_orders( $customer_id ) {
  * @param int $order_id
  */
 function wc_paying_customer( $order_id ) {
-	$order = wc_get_order( $order_id );
+	$order       = wc_get_order( $order_id );
+	$customer_id = $order->get_customer_id();
 
-	if ( $order->user_id > 0 && 'refund' !== $order->order_type ) {
-		update_user_meta( $order->user_id, 'paying_customer', 1 );
-
-		$old_spent = absint( get_user_meta( $order->user_id, '_money_spent', true ) );
-		update_user_meta( $order->user_id, '_money_spent', $old_spent + $order->order_total );
-	}
-	if ( $order->user_id > 0 && 'simple' === $order->order_type ) {
-		$old_count = absint( get_user_meta( $order->user_id, '_order_count', true ) );
-		update_user_meta( $order->user_id, '_order_count', $old_count + 1 );
+	if ( $customer_id > 0 && 'shop_order_refund' !== $order->get_type() ) {
+		$customer = new WC_Customer( $customer_id );
+		$customer->set_is_paying_customer( true );
+		$customer->save();
 	}
 }
 add_action( 'woocommerce_order_status_completed', 'wc_paying_customer' );
@@ -234,6 +215,7 @@ function wc_customer_bought_product( $customer_email, $user_id, $product_id ) {
 		}
 
 		$customer_data = array_map( 'esc_sql', array_filter( array_unique( $customer_data ) ) );
+		$statuses      = array_map( 'esc_sql', wc_get_is_paid_statuses() );
 
 		if ( sizeof( $customer_data ) == 0 ) {
 			return false;
@@ -244,7 +226,7 @@ function wc_customer_bought_product( $customer_email, $user_id, $product_id ) {
 			INNER JOIN {$wpdb->postmeta} AS pm ON p.ID = pm.post_id
 			INNER JOIN {$wpdb->prefix}woocommerce_order_items AS i ON p.ID = i.order_id
 			INNER JOIN {$wpdb->prefix}woocommerce_order_itemmeta AS im ON i.order_item_id = im.order_item_id
-			WHERE p.post_status IN ( 'wc-completed', 'wc-processing' )
+			WHERE p.post_status IN ( 'wc-" . implode( "','wc-", $statuses ) . "' )
 			AND pm.meta_key IN ( '_billing_email', '_customer_user' )
 			AND im.meta_key IN ( '_product_id', '_variation_id' )
 			AND im.meta_value != 0
@@ -273,7 +255,7 @@ function wc_customer_has_capability( $allcaps, $caps, $args ) {
 				$user_id = $args[1];
 				$order   = wc_get_order( $args[2] );
 
-				if ( $order && $user_id == $order->user_id ) {
+				if ( $order && $user_id == $order->get_user_id() ) {
 					$allcaps['view_order'] = true;
 				}
 			break;
@@ -289,7 +271,8 @@ function wc_customer_has_capability( $allcaps, $caps, $args ) {
 				}
 
 				$order = wc_get_order( $order_id );
-				if ( $user_id == $order->user_id || empty( $order->user_id ) ) {
+
+				if ( $order && ( $user_id == $order->get_user_id() || ! $order->get_user_id() ) ) {
 					$allcaps['pay_for_order'] = true;
 				}
 			break;
@@ -297,7 +280,7 @@ function wc_customer_has_capability( $allcaps, $caps, $args ) {
 				$user_id = $args[1];
 				$order   = wc_get_order( $args[2] );
 
-				if ( $user_id == $order->user_id ) {
+				if ( $order && $user_id == $order->get_user_id() ) {
 					$allcaps['order_again'] = true;
 				}
 			break;
@@ -305,7 +288,7 @@ function wc_customer_has_capability( $allcaps, $caps, $args ) {
 				$user_id = $args[1];
 				$order   = wc_get_order( $args[2] );
 
-				if ( $user_id == $order->user_id ) {
+				if ( $order && $user_id == $order->get_user_id() ) {
 					$allcaps['cancel_order'] = true;
 				}
 			break;
@@ -313,7 +296,7 @@ function wc_customer_has_capability( $allcaps, $caps, $args ) {
 				$user_id  = $args[1];
 				$download = $args[2];
 
-				if ( $user_id == $download->user_id ) {
+				if ( $download && $user_id == $download->get_user_id() ) {
 					$allcaps['download_file'] = true;
 				}
 			break;
@@ -328,11 +311,11 @@ add_filter( 'user_has_cap', 'wc_customer_has_capability', 10, 3 );
  * @param  array $roles
  * @return array
  */
-function wc_modify_editable_roles( $roles ){
+function wc_modify_editable_roles( $roles ) {
 	if ( ! current_user_can( 'administrator' ) ) {
-		unset( $roles[ 'administrator' ] );
+		unset( $roles['administrator'] );
 	}
-    return $roles;
+	return $roles;
 }
 add_filter( 'editable_roles', 'wc_modify_editable_roles' );
 
@@ -366,6 +349,17 @@ function wc_modify_map_meta_cap( $caps, $cap, $user_id, $args ) {
 }
 add_filter( 'map_meta_cap', 'wc_modify_map_meta_cap', 10, 4 );
 
+/**
+ * Get customer download permissions from the database.
+ *
+ * @param int $customer_id Customer/User ID
+ * @return array
+ */
+function wc_get_customer_download_permissions( $customer_id ) {
+	$data_store = WC_Data_Store::load( 'customer-download' );
+	return apply_filters( 'woocommerce_permission_list', $data_store->get_downloads_for_customer( $customer_id ), $customer_id );
+}
+
 /**
  * Get customer available downloads.
  *
@@ -373,41 +367,17 @@ add_filter( 'map_meta_cap', 'wc_modify_map_meta_cap', 10, 4 );
  * @return array
  */
 function wc_get_customer_available_downloads( $customer_id ) {
-	global $wpdb;
-
 	$downloads   = array();
 	$_product    = null;
 	$order       = null;
 	$file_number = 0;
 
 	// Get results from valid orders only
-	$results = apply_filters( 'woocommerce_permission_list', $wpdb->get_results( $wpdb->prepare( "
-		SELECT permissions.*
-		FROM {$wpdb->prefix}woocommerce_downloadable_product_permissions as permissions
-		WHERE user_id = %d
-		AND permissions.order_id > 0
-		AND
-			(
-				permissions.downloads_remaining > 0
-				OR
-				permissions.downloads_remaining = ''
-			)
-		AND
-			(
-				permissions.access_expires IS NULL
-				OR
-				permissions.access_expires >= %s
-				OR
-				permissions.access_expires = '0000-00-00 00:00:00'
-			)
-		ORDER BY permissions.order_id, permissions.product_id, permissions.permission_id;
-		", $customer_id, date( 'Y-m-d', current_time( 'timestamp' ) ) ) ), $customer_id );
+	$results = wc_get_customer_download_permissions( $customer_id );
 
 	if ( $results ) {
-
-		$looped_downloads = array();
 		foreach ( $results as $result ) {
-			if ( ! $order || $order->id != $result->order_id ) {
+			if ( ! $order || $order->get_id() != $result->order_id ) {
 				// new order
 				$order    = wc_get_order( $result->order_id );
 				$_product = null;
@@ -425,7 +395,7 @@ function wc_get_customer_available_downloads( $customer_id ) {
 
 			$product_id = intval( $result->product_id );
 
-			if ( ! $_product || $_product->id != $product_id ) {
+			if ( ! $_product || $_product->get_id() != $product_id ) {
 				// new product
 				$file_number = 0;
 				$_product    = wc_get_product( $product_id );
@@ -438,47 +408,44 @@ function wc_get_customer_available_downloads( $customer_id ) {
 
 			$download_file = $_product->get_file( $result->download_id );
 
-			// Check if the file has been already added to the downloads list
-			if ( in_array( $download_file, $looped_downloads ) ) {
-				continue;
-			}
-
-			array_push( $looped_downloads, $download_file );
-
-			// Download name will be 'Product Name' for products with a single downloadable file, and 'Product Name - File X' for products with multiple files
+			// Download name will be 'Product Name' for products with a single downloadable file, and 'Product Name - File X' for products with multiple files.
 			$download_name = apply_filters(
 				'woocommerce_downloadable_product_name',
-				$_product->get_title() . ' &ndash; ' . $download_file['name'],
+				$_product->get_name() . ' &ndash; ' . $download_file['name'],
 				$_product,
 				$result->download_id,
 				$file_number
 			);
 
 			$downloads[] = array(
-				'download_url'        => add_query_arg(
+				'download_url'          => add_query_arg(
 					array(
 						'download_file' => $product_id,
 						'order'         => $result->order_key,
-						'email'         => $result->user_email,
-						'key'           => $result->download_id
+						'email'         => urlencode( $result->user_email ),
+						'key'           => $result->download_id,
 					),
 					home_url( '/' )
 				),
-				'download_id'         => $result->download_id,
-				'product_id'          => $product_id,
-				'download_name'       => $download_name,
-				'order_id'            => $order->id,
-				'order_key'           => $order->order_key,
-				'downloads_remaining' => $result->downloads_remaining,
-				'access_expires' 	  => $result->access_expires,
-				'file'                => $download_file
+				'download_id'           => $result->download_id,
+				'product_id'            => $_product->get_id(),
+				'product_name'          => $_product->get_name(),
+				'download_name'         => $download_name,
+				'order_id'              => $order->get_id(),
+				'order_key'             => $order->get_order_key(),
+				'downloads_remaining'   => $result->downloads_remaining,
+				'access_expires'        => $result->access_expires,
+				'file'                  => array(
+					'name' => $download_file->get_name(),
+					'file' => $download_file->get_file(),
+				),
 			);
 
 			$file_number++;
 		}
 	}
 
-	return $downloads;
+	return apply_filters( 'woocommerce_customer_available_downloads', $downloads, $customer_id );
 }
 
 /**
@@ -487,26 +454,8 @@ function wc_get_customer_available_downloads( $customer_id ) {
  * @return string
  */
 function wc_get_customer_total_spent( $user_id ) {
-	if ( ! $spent = get_user_meta( $user_id, '_money_spent', true ) ) {
-		global $wpdb;
-
-		$spent = $wpdb->get_var( "SELECT SUM(meta2.meta_value)
-			FROM $wpdb->posts as posts
-
-			LEFT JOIN {$wpdb->postmeta} AS meta ON posts.ID = meta.post_id
-			LEFT JOIN {$wpdb->postmeta} AS meta2 ON posts.ID = meta2.post_id
-
-			WHERE   meta.meta_key       = '_customer_user'
-			AND     meta.meta_value     = $user_id
-			AND     posts.post_type     IN ('" . implode( "','", wc_get_order_types( 'reports' ) ) . "')
-			AND     posts.post_status   IN ( 'wc-completed', 'wc-processing' )
-			AND     meta2.meta_key      = '_order_total'
-		" );
-
-		update_user_meta( $user_id, '_money_spent', $spent );
-	}
-
-	return $spent;
+	$customer = new WC_Customer( $user_id );
+	return $customer->get_total_spent();
 }
 
 /**
@@ -515,24 +464,8 @@ function wc_get_customer_total_spent( $user_id ) {
  * @return int
  */
 function wc_get_customer_order_count( $user_id ) {
-	if ( ! $count = get_user_meta( $user_id, '_order_count', true ) ) {
-		global $wpdb;
-
-		$count = $wpdb->get_var( "SELECT COUNT(*)
-			FROM $wpdb->posts as posts
-
-			LEFT JOIN {$wpdb->postmeta} AS meta ON posts.ID = meta.post_id
-
-			WHERE   meta.meta_key       = '_customer_user'
-			AND     posts.post_type     IN ('" . implode( "','", wc_get_order_types( 'order-count' ) ) . "')
-			AND     posts.post_status   IN ('" . implode( "','", array_keys( wc_get_order_statuses() ) )  . "')
-			AND     meta_value          = $user_id
-		" );
-
-		update_user_meta( $user_id, '_order_count', absint( $count ) );
-	}
-
-	return absint( $count );
+	$customer = new WC_Customer( $user_id );
+	return $customer->get_order_count();
 }
 
 /**
@@ -542,7 +475,7 @@ function wc_get_customer_order_count( $user_id ) {
 function wc_reset_order_customer_id_on_deleted_user( $user_id ) {
 	global $wpdb;
 
-	$wpdb->update( $wpdb->postmeta, array( '_customer_user' => 0 ), array( '_customer_user' => $user_id ) );
+	$wpdb->update( $wpdb->postmeta, array( 'meta_value' => 0 ), array( 'meta_key' => '_customer_user', 'meta_value' => $user_id ) );
 }
 
 add_action( 'deleted_user', 'wc_reset_order_customer_id_on_deleted_user' );
@@ -581,3 +514,114 @@ function wc_disable_author_archives_for_customers() {
 }
 
 add_action( 'template_redirect', 'wc_disable_author_archives_for_customers' );
+
+/**
+ * Hooks into the `profile_update` hook to set the user last updated timestamp.
+ *
+ * @since 2.6.0
+ * @param int   $user_id The user that was updated.
+ * @param array $old     The profile fields pre-change.
+ */
+function wc_update_profile_last_update_time( $user_id, $old ) {
+	wc_set_user_last_update_time( $user_id );
+}
+
+add_action( 'profile_update', 'wc_update_profile_last_update_time', 10, 2 );
+
+/**
+ * Hooks into the update user meta function to set the user last updated timestamp.
+ *
+ * @since 2.6.0
+ * @param int    $meta_id     ID of the meta object that was changed.
+ * @param int    $user_id     The user that was updated.
+ * @param string $meta_key    Name of the meta key that was changed.
+ * @param string $_meta_value Value of the meta that was changed.
+ */
+function wc_meta_update_last_update_time( $meta_id, $user_id, $meta_key, $_meta_value ) {
+	$keys_to_track = apply_filters( 'woocommerce_user_last_update_fields', array( 'first_name', 'last_name' ) );
+	$update_time   = false;
+	if ( in_array( $meta_key, $keys_to_track ) ) {
+		$update_time = true;
+	}
+	if ( 'billing_' === substr( $meta_key, 0, 8 ) ) {
+		$update_time = true;
+	}
+	if ( 'shipping_' === substr( $meta_key, 0, 9 ) ) {
+		$update_time = true;
+	}
+
+	if ( $update_time ) {
+		wc_set_user_last_update_time( $user_id );
+	}
+}
+
+add_action( 'update_user_meta', 'wc_meta_update_last_update_time', 10, 4 );
+
+/**
+ * Sets a user's "last update" time to the current timestamp.
+ *
+ * @since 2.6.0
+ * @param int $user_id The user to set a timestamp for.
+ */
+function wc_set_user_last_update_time( $user_id ) {
+	update_user_meta( $user_id, 'last_update', gmdate( 'U' ) );
+}
+
+/**
+ * Get customer saved payment methods list.
+ *
+ * @since 2.6.0
+ * @param int $customer_id
+ * @return array
+ */
+function wc_get_customer_saved_methods_list( $customer_id ) {
+	return apply_filters( 'woocommerce_saved_payment_methods_list', array(), $customer_id );
+}
+
+/**
+ * Get info about customer's last order.
+ *
+ * @since 2.6.0
+ * @param int $customer_id Customer ID.
+ * @return WC_Order Order object if successful or false.
+ */
+function wc_get_customer_last_order( $customer_id ) {
+	global $wpdb;
+
+	$customer_id = absint( $customer_id );
+
+	$id = $wpdb->get_var( "SELECT id
+		FROM $wpdb->posts AS posts
+		LEFT JOIN {$wpdb->postmeta} AS meta on posts.ID = meta.post_id
+		WHERE meta.meta_key = '_customer_user'
+		AND   meta.meta_value = {$customer_id}
+		AND   posts.post_type = 'shop_order'
+		AND   posts.post_status IN ( '" . implode( "','", array_keys( wc_get_order_statuses() ) ) . "' )
+		ORDER BY posts.ID DESC
+	" );
+
+	return wc_get_order( $id );
+}
+
+/**
+ * Wrapper for @see get_avatar() which doesn't simply return
+ * the URL so we need to pluck it from the HTML img tag.
+ *
+ * Kudos to https://github.com/WP-API/WP-API for offering a better solution.
+ *
+ * @since 2.6.0
+ * @param string $email the customer's email.
+ * @return string the URL to the customer's avatar.
+ */
+function wc_get_customer_avatar_url( $email ) {
+	$avatar_html = get_avatar( $email );
+
+	// Get the URL of the avatar from the provided HTML.
+	preg_match( '/src=["|\'](.+)[\&|"|\']/U', $avatar_html, $matches );
+
+	if ( isset( $matches[1] ) && ! empty( $matches[1] ) ) {
+		return esc_url_raw( $matches[1] );
+	}
+
+	return null;
+}
diff --git a/includes/wc-widget-functions.php b/includes/wc-widget-functions.php
index e70f2f8531b..0fb6459c34f 100644
--- a/includes/wc-widget-functions.php
+++ b/includes/wc-widget-functions.php
@@ -15,18 +15,19 @@ if ( ! defined( 'ABSPATH' ) ) {
 }
 
 // Include widget classes.
-include_once( 'abstracts/abstract-wc-widget.php' );
-include_once( 'widgets/class-wc-widget-cart.php' );
-include_once( 'widgets/class-wc-widget-layered-nav-filters.php' );
-include_once( 'widgets/class-wc-widget-layered-nav.php' );
-include_once( 'widgets/class-wc-widget-price-filter.php' );
-include_once( 'widgets/class-wc-widget-product-categories.php' );
-include_once( 'widgets/class-wc-widget-product-search.php' );
-include_once( 'widgets/class-wc-widget-product-tag-cloud.php' );
-include_once( 'widgets/class-wc-widget-products.php' );
-include_once( 'widgets/class-wc-widget-recent-reviews.php' );
-include_once( 'widgets/class-wc-widget-recently-viewed.php' );
-include_once( 'widgets/class-wc-widget-top-rated-products.php' );
+include_once( dirname( __FILE__ ) . '/abstracts/abstract-wc-widget.php' );
+include_once( dirname( __FILE__ ) . '/widgets/class-wc-widget-cart.php' );
+include_once( dirname( __FILE__ ) . '/widgets/class-wc-widget-layered-nav-filters.php' );
+include_once( dirname( __FILE__ ) . '/widgets/class-wc-widget-layered-nav.php' );
+include_once( dirname( __FILE__ ) . '/widgets/class-wc-widget-price-filter.php' );
+include_once( dirname( __FILE__ ) . '/widgets/class-wc-widget-product-categories.php' );
+include_once( dirname( __FILE__ ) . '/widgets/class-wc-widget-product-search.php' );
+include_once( dirname( __FILE__ ) . '/widgets/class-wc-widget-product-tag-cloud.php' );
+include_once( dirname( __FILE__ ) . '/widgets/class-wc-widget-products.php' );
+include_once( dirname( __FILE__ ) . '/widgets/class-wc-widget-rating-filter.php' );
+include_once( dirname( __FILE__ ) . '/widgets/class-wc-widget-recent-reviews.php' );
+include_once( dirname( __FILE__ ) . '/widgets/class-wc-widget-recently-viewed.php' );
+include_once( dirname( __FILE__ ) . '/widgets/class-wc-widget-top-rated-products.php' );
 
 /**
  * Register Widgets.
@@ -42,6 +43,7 @@ function wc_register_widgets() {
 	register_widget( 'WC_Widget_Product_Search' );
 	register_widget( 'WC_Widget_Product_Tag_Cloud' );
 	register_widget( 'WC_Widget_Products' );
+	register_widget( 'WC_Widget_Rating_Filter' );
 	register_widget( 'WC_Widget_Recent_Reviews' );
 	register_widget( 'WC_Widget_Recently_Viewed' );
 	register_widget( 'WC_Widget_Top_Rated_Products' );
diff --git a/includes/widgets/class-wc-widget-cart.php b/includes/widgets/class-wc-widget-cart.php
index 517648a637a..f7f359b8891 100644
--- a/includes/widgets/class-wc-widget-cart.php
+++ b/includes/widgets/class-wc-widget-cart.php
@@ -22,27 +22,27 @@ class WC_Widget_Cart extends WC_Widget {
 	 */
 	public function __construct() {
 		$this->widget_cssclass    = 'woocommerce widget_shopping_cart';
-		$this->widget_description = __( "Display the user's Cart in the sidebar.", 'woocommerce' );
+		$this->widget_description = __( "Display the user's cart in the sidebar.", 'woocommerce' );
 		$this->widget_id          = 'woocommerce_widget_cart';
-		$this->widget_name        = __( 'WooCommerce Cart', 'woocommerce' );
+		$this->widget_name        = __( 'WooCommerce cart', 'woocommerce' );
 		$this->settings           = array(
 			'title'  => array(
 				'type'  => 'text',
 				'std'   => __( 'Cart', 'woocommerce' ),
-				'label' => __( 'Title', 'woocommerce' )
+				'label' => __( 'Title', 'woocommerce' ),
 			),
 			'hide_if_empty' => array(
 				'type'  => 'checkbox',
 				'std'   => 0,
-				'label' => __( 'Hide if cart is empty', 'woocommerce' )
-			)
+				'label' => __( 'Hide if cart is empty', 'woocommerce' ),
+			),
 		);
 
 		parent::__construct();
 	}
 
 	/**
-	 * widget function.
+	 * Output widget.
 	 *
 	 * @see WP_Widget
 	 *
diff --git a/includes/widgets/class-wc-widget-layered-nav-filters.php b/includes/widgets/class-wc-widget-layered-nav-filters.php
index 8e23bd571a2..1d85c6e7404 100644
--- a/includes/widgets/class-wc-widget-layered-nav-filters.php
+++ b/includes/widgets/class-wc-widget-layered-nav-filters.php
@@ -22,78 +22,149 @@ class WC_Widget_Layered_Nav_Filters extends WC_Widget {
 		$this->widget_cssclass    = 'woocommerce widget_layered_nav_filters';
 		$this->widget_description = __( 'Shows active layered nav filters so users can see and deactivate them.', 'woocommerce' );
 		$this->widget_id          = 'woocommerce_layered_nav_filters';
-		$this->widget_name        = __( 'WooCommerce Layered Nav Filters', 'woocommerce' );
+		$this->widget_name        = __( 'WooCommerce layered nav filters', 'woocommerce' );
 		$this->settings           = array(
 			'title'  => array(
 				'type'  => 'text',
-				'std'   => __( 'Active Filters', 'woocommerce' ),
-				'label' => __( 'Title', 'woocommerce' )
-			)
+				'std'   => __( 'Active filters', 'woocommerce' ),
+				'label' => __( 'Title', 'woocommerce' ),
+			),
 		);
 
 		parent::__construct();
 	}
 
 	/**
-	 * widget function.
+	 * Get current page URL for layered nav items.
+	 *
+	 * @return string
+	 */
+	protected function get_page_base_url() {
+		if ( defined( 'SHOP_IS_ON_FRONT' ) ) {
+			$link = home_url();
+		} elseif ( is_post_type_archive( 'product' ) || is_page( wc_get_page_id( 'shop' ) ) ) {
+			$link = get_post_type_archive_link( 'product' );
+		} elseif ( is_product_category() ) {
+			$link = get_term_link( get_query_var( 'product_cat' ), 'product_cat' );
+		} elseif ( is_product_tag() ) {
+			$link = get_term_link( get_query_var( 'product_tag' ), 'product_tag' );
+		} else {
+			$queried_object = get_queried_object();
+			$link = get_term_link( $queried_object->slug, $queried_object->taxonomy );
+		}
+
+		// Min/Max
+		if ( isset( $_GET['min_price'] ) ) {
+			$link = add_query_arg( 'min_price', wc_clean( $_GET['min_price'] ), $link );
+		}
+
+		if ( isset( $_GET['max_price'] ) ) {
+			$link = add_query_arg( 'max_price', wc_clean( $_GET['max_price'] ), $link );
+		}
+
+		// Orderby
+		if ( isset( $_GET['orderby'] ) ) {
+			$link = add_query_arg( 'orderby', wc_clean( $_GET['orderby'] ), $link );
+		}
+
+		/**
+		 * Search Arg.
+		 * To support quote characters, first they are decoded from &quot; entities, then URL encoded.
+		 */
+		if ( get_search_query() ) {
+			$link = add_query_arg( 's', rawurlencode( htmlspecialchars_decode( get_search_query() ) ), $link );
+		}
+
+		// Post Type Arg
+		if ( isset( $_GET['post_type'] ) ) {
+			$link = add_query_arg( 'post_type', wc_clean( $_GET['post_type'] ), $link );
+		}
+
+		// Min Rating Arg
+		if ( isset( $_GET['rating_filter'] ) ) {
+			$link = add_query_arg( 'rating_filter', wc_clean( $_GET['rating_filter'] ), $link );
+		}
+
+		// All current filters
+		if ( $_chosen_attributes = WC_Query::get_layered_nav_chosen_attributes() ) {
+			foreach ( $_chosen_attributes as $name => $data ) {
+				$filter_name = sanitize_title( str_replace( 'pa_', '', $name ) );
+				if ( ! empty( $data['terms'] ) ) {
+					$link = add_query_arg( 'filter_' . $filter_name, implode( ',', $data['terms'] ), $link );
+				}
+				if ( 'or' == $data['query_type'] ) {
+					$link = add_query_arg( 'query_type_' . $filter_name, 'or', $link );
+				}
+			}
+		}
+
+		return $link;
+	}
+
+	/**
+	 * Output widget.
 	 *
 	 * @see WP_Widget
-	 *
 	 * @param array $args
 	 * @param array $instance
 	 */
 	public function widget( $args, $instance ) {
-		global $_chosen_attributes;
-
 		if ( ! is_post_type_archive( 'product' ) && ! is_tax( get_object_taxonomies( 'product' ) ) ) {
 			return;
 		}
 
-		// Price
-		$min_price = isset( $_GET['min_price'] ) ? esc_attr( $_GET['min_price'] ) : 0;
-		$max_price = isset( $_GET['max_price'] ) ? esc_attr( $_GET['max_price'] ) : 0;
+		$_chosen_attributes = WC_Query::get_layered_nav_chosen_attributes();
+		$min_price          = isset( $_GET['min_price'] ) ? wc_clean( $_GET['min_price'] ) : 0;
+		$max_price          = isset( $_GET['max_price'] ) ? wc_clean( $_GET['max_price'] ) : 0;
+		$rating_filter      = isset( $_GET['rating_filter'] ) ? array_filter( array_map( 'absint', explode( ',', $_GET['rating_filter'] ) ) ) : array();
+		$base_link          = $this->get_page_base_url();
 
-		if ( 0 < count( $_chosen_attributes ) || 0 < $min_price || 0 < $max_price ) {
+		if ( 0 < count( $_chosen_attributes ) || 0 < $min_price || 0 < $max_price || ! empty( $rating_filter ) ) {
 
 			$this->widget_start( $args, $instance );
 
 			echo '<ul>';
 
 			// Attributes
-			if ( ! is_null( $_chosen_attributes ) ) {
+			if ( ! empty( $_chosen_attributes ) ) {
 				foreach ( $_chosen_attributes as $taxonomy => $data ) {
-
-					foreach ( $data['terms'] as $term_id ) {
-						$term = get_term( $term_id, $taxonomy );
-
-						if ( ! isset( $term->name ) ) {
+					foreach ( $data['terms'] as $term_slug ) {
+						if ( ! $term = get_term_by( 'slug', $term_slug, $taxonomy ) ) {
 							continue;
 						}
 
-						$taxonomy_filter = str_replace( 'pa_', '', $taxonomy );
-						$current_filter  = ! empty( $_GET[ 'filter_' . $taxonomy_filter ] ) ? $_GET[ 'filter_' . $taxonomy_filter ] : '';
-						$new_filter      = array_map( 'absint', explode( ',', $current_filter ) );
-						$new_filter      = array_diff( $new_filter, array( $term_id ) );
+						$filter_name    = 'filter_' . sanitize_title( str_replace( 'pa_', '', $taxonomy ) );
+						$current_filter = isset( $_GET[ $filter_name ] ) ? explode( ',', wc_clean( $_GET[ $filter_name ] ) ) : array();
+						$current_filter = array_map( 'sanitize_title', $current_filter );
+						$new_filter      = array_diff( $current_filter, array( $term_slug ) );
 
-						$link = remove_query_arg( array( 'add-to-cart', 'filter_' . $taxonomy_filter ) );
+						$link = remove_query_arg( array( 'add-to-cart', $filter_name ), $base_link );
 
 						if ( sizeof( $new_filter ) > 0 ) {
-							$link = add_query_arg( 'filter_' . $taxonomy_filter, implode( ',', $new_filter ), $link );
+							$link = add_query_arg( $filter_name, implode( ',', $new_filter ), $link );
 						}
 
-						echo '<li class="chosen"><a title="' . esc_attr__( 'Remove filter', 'woocommerce' ) . '" href="' . esc_url( $link ) . '">' . $term->name . '</a></li>';
+						echo '<li class="chosen"><a aria-label="' . esc_attr__( 'Remove filter', 'woocommerce' ) . '" href="' . esc_url( $link ) . '">' . esc_html( $term->name ) . '</a></li>';
 					}
 				}
 			}
 
 			if ( $min_price ) {
-				$link = remove_query_arg( 'min_price' );
-				echo '<li class="chosen"><a title="' . esc_attr__( 'Remove filter', 'woocommerce' ) . '" href="' . esc_url( $link ) . '">' . __( 'Min', 'woocommerce' ) . ' ' . wc_price( $min_price ) . '</a></li>';
+				$link = remove_query_arg( 'min_price', $base_link );
+				echo '<li class="chosen"><a aria-label="' . esc_attr__( 'Remove filter', 'woocommerce' ) . '" href="' . esc_url( $link ) . '">' . sprintf( __( 'Min %s', 'woocommerce' ), wc_price( $min_price ) ) . '</a></li>';
 			}
 
 			if ( $max_price ) {
-				$link = remove_query_arg( 'max_price' );
-				echo '<li class="chosen"><a title="' . esc_attr__( 'Remove filter', 'woocommerce' ) . '" href="' . esc_url( $link ) . '">' . __( 'Max', 'woocommerce' ) . ' ' . wc_price( $max_price ) . '</a></li>';
+				$link = remove_query_arg( 'max_price', $base_link );
+				echo '<li class="chosen"><a aria-label="' . esc_attr__( 'Remove filter', 'woocommerce' ) . '" href="' . esc_url( $link ) . '">' . sprintf( __( 'Max %s', 'woocommerce' ), wc_price( $max_price ) ) . '</a></li>';
+			}
+
+			if ( ! empty( $rating_filter ) ) {
+				foreach ( $rating_filter as $rating ) {
+					$link_ratings = implode( ',', array_diff( $rating_filter, array( $rating ) ) );
+					$link         = $link_ratings ? add_query_arg( 'rating_filter', $link_ratings ) : remove_query_arg( 'rating_filter', $base_link );
+					echo '<li class="chosen"><a aria-label="' . esc_attr__( 'Remove filter', 'woocommerce' ) . '" href="' . esc_url( $link ) . '">' . sprintf( esc_html__( 'Rated %s out of 5', 'woocommerce' ), esc_html( $rating ) ) . '</a></li>';
+				}
 			}
 
 			echo '</ul>';
diff --git a/includes/widgets/class-wc-widget-layered-nav.php b/includes/widgets/class-wc-widget-layered-nav.php
index 26abf96bad3..5781aca66c2 100644
--- a/includes/widgets/class-wc-widget-layered-nav.php
+++ b/includes/widgets/class-wc-widget-layered-nav.php
@@ -10,7 +10,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  * @author   WooThemes
  * @category Widgets
  * @package  WooCommerce/Widgets
- * @version  2.3.0
+ * @version  2.6.0
  * @extends  WC_Widget
  */
 class WC_Widget_Layered_Nav extends WC_Widget {
@@ -22,13 +22,12 @@ class WC_Widget_Layered_Nav extends WC_Widget {
 		$this->widget_cssclass    = 'woocommerce widget_layered_nav';
 		$this->widget_description = __( 'Shows a custom attribute in a widget which lets you narrow down the list of products when viewing product categories.', 'woocommerce' );
 		$this->widget_id          = 'woocommerce_layered_nav';
-		$this->widget_name        = __( 'WooCommerce Layered Nav', 'woocommerce' );
-
+		$this->widget_name        = __( 'WooCommerce layered nav', 'woocommerce' );
 		parent::__construct();
 	}
 
 	/**
-	 * update function.
+	 * Updates a particular instance of a widget.
 	 *
 	 * @see WP_Widget->update
 	 *
@@ -39,12 +38,11 @@ class WC_Widget_Layered_Nav extends WC_Widget {
 	 */
 	public function update( $new_instance, $old_instance ) {
 		$this->init_settings();
-
 		return parent::update( $new_instance, $old_instance );
 	}
 
 	/**
-	 * form function.
+	 * Outputs the settings update form.
 	 *
 	 * @see WP_Widget->form
 	 *
@@ -52,7 +50,6 @@ class WC_Widget_Layered_Nav extends WC_Widget {
 	 */
 	public function form( $instance ) {
 		$this->init_settings();
-
 		parent::form( $instance );
 	}
 
@@ -63,7 +60,7 @@ class WC_Widget_Layered_Nav extends WC_Widget {
 		$attribute_array      = array();
 		$attribute_taxonomies = wc_get_attribute_taxonomies();
 
-		if ( $attribute_taxonomies ) {
+		if ( ! empty( $attribute_taxonomies ) ) {
 			foreach ( $attribute_taxonomies as $tax ) {
 				if ( taxonomy_exists( wc_attribute_taxonomy_name( $tax->attribute_name ) ) ) {
 					$attribute_array[ $tax->attribute_name ] = $tax->attribute_name;
@@ -75,13 +72,13 @@ class WC_Widget_Layered_Nav extends WC_Widget {
 			'title' => array(
 				'type'  => 'text',
 				'std'   => __( 'Filter by', 'woocommerce' ),
-				'label' => __( 'Title', 'woocommerce' )
+				'label' => __( 'Title', 'woocommerce' ),
 			),
 			'attribute' => array(
 				'type'    => 'select',
 				'std'     => '',
 				'label'   => __( 'Attribute', 'woocommerce' ),
-				'options' => $attribute_array
+				'options' => $attribute_array,
 			),
 			'display_type' => array(
 				'type'    => 'select',
@@ -89,8 +86,8 @@ class WC_Widget_Layered_Nav extends WC_Widget {
 				'label'   => __( 'Display type', 'woocommerce' ),
 				'options' => array(
 					'list'     => __( 'List', 'woocommerce' ),
-					'dropdown' => __( 'Dropdown', 'woocommerce' )
-				)
+					'dropdown' => __( 'Dropdown', 'woocommerce' ),
+				),
 			),
 			'query_type' => array(
 				'type'    => 'select',
@@ -98,14 +95,14 @@ class WC_Widget_Layered_Nav extends WC_Widget {
 				'label'   => __( 'Query type', 'woocommerce' ),
 				'options' => array(
 					'and' => __( 'AND', 'woocommerce' ),
-					'or'  => __( 'OR', 'woocommerce' )
-				)
+					'or'  => __( 'OR', 'woocommerce' ),
+				),
 			),
 		);
 	}
 
 	/**
-	 * widget function.
+	 * Output widget.
 	 *
 	 * @see WP_Widget
 	 *
@@ -113,17 +110,14 @@ class WC_Widget_Layered_Nav extends WC_Widget {
 	 * @param array $instance
 	 */
 	public function widget( $args, $instance ) {
-		global $_chosen_attributes;
-
 		if ( ! is_post_type_archive( 'product' ) && ! is_tax( get_object_taxonomies( 'product' ) ) ) {
 			return;
 		}
 
-		$current_term = is_tax() ? get_queried_object()->term_id : '';
-		$current_tax  = is_tax() ? get_queried_object()->taxonomy : '';
-		$taxonomy     = isset( $instance['attribute'] ) ? wc_attribute_taxonomy_name( $instance['attribute'] ) : $this->settings['attribute']['std'];
-		$query_type   = isset( $instance['query_type'] ) ? $instance['query_type'] : $this->settings['query_type']['std'];
-		$display_type = isset( $instance['display_type'] ) ? $instance['display_type'] : $this->settings['display_type']['std'];
+		$_chosen_attributes = WC_Query::get_layered_nav_chosen_attributes();
+		$taxonomy           = isset( $instance['attribute'] ) ? wc_attribute_taxonomy_name( $instance['attribute'] ) : $this->settings['attribute']['std'];
+		$query_type         = isset( $instance['query_type'] ) ? $instance['query_type'] : $this->settings['query_type']['std'];
+		$display_type       = isset( $instance['display_type'] ) ? $instance['display_type'] : $this->settings['display_type']['std'];
 
 		if ( ! taxonomy_exists( $taxonomy ) ) {
 			return;
@@ -150,242 +144,329 @@ class WC_Widget_Layered_Nav extends WC_Widget {
 
 		$terms = get_terms( $taxonomy, $get_terms_args );
 
-		if ( 0 < count( $terms ) ) {
-
-			ob_start();
-
-			$found = false;
-
-			$this->widget_start( $args, $instance );
-
-			// Force found when option is selected - do not force found on taxonomy attributes
-			if ( ! is_tax() && is_array( $_chosen_attributes ) && array_key_exists( $taxonomy, $_chosen_attributes ) ) {
-				$found = true;
-			}
-
-			if ( 'dropdown' == $display_type ) {
-
-				// skip when viewing the taxonomy
-				if ( $current_tax && $taxonomy == $current_tax ) {
-
-					$found = false;
-
-				} else {
-
-					$taxonomy_filter = str_replace( 'pa_', '', $taxonomy );
-
-					$found = false;
-
-					echo '<select class="dropdown_layered_nav_' . $taxonomy_filter . '">';
-
-					echo '<option value="">' . sprintf( __( 'Any %s', 'woocommerce' ), wc_attribute_label( $taxonomy ) ) . '</option>';
-
-					foreach ( $terms as $term ) {
-
-						// If on a term page, skip that term in widget list
-						if ( $term->term_id == $current_term ) {
-							continue;
-						}
-
-						// Get count based on current view
-						$_products_in_term = wc_get_term_product_ids( $term->term_id, $taxonomy );
-						$option_is_set     = ( isset( $_chosen_attributes[ $taxonomy ] ) && in_array( $term->term_id, $_chosen_attributes[ $taxonomy ]['terms'] ) );
-
-						// If this is an AND query, only show options with count > 0
-						if ( 'and' == $query_type ) {
-
-							$count = sizeof( array_intersect( $_products_in_term, WC()->query->filtered_product_ids ) );
-
-							if ( 0 < $count ) {
-								$found = true;
-							}
-
-							if ( 0 == $count && ! $option_is_set ) {
-								continue;
-							}
-
-						// If this is an OR query, show all options so search can be expanded
-						} else {
-
-							$count = sizeof( array_intersect( $_products_in_term, WC()->query->unfiltered_product_ids ) );
-
-							if ( 0 < $count ) {
-								$found = true;
-							}
-
-						}
-
-						echo '<option value="' . esc_attr( $term->term_id ) . '" ' . selected( isset( $_GET[ 'filter_' . $taxonomy_filter ] ) ? $_GET[ 'filter_' . $taxonomy_filter ] : '' , $term->term_id, false ) . '>' . esc_html( $term->name ) . '</option>';
-					}
-
-					echo '</select>';
-
-					wc_enqueue_js( "
-						jQuery( '.dropdown_layered_nav_$taxonomy_filter' ).change( function() {
-							var term_id = parseInt( jQuery( this ).val(), 10 );
-							location.href = '" . preg_replace( '%\/page\/[0-9]+%', '', str_replace( array( '&amp;', '%2C' ), array( '&', ',' ), esc_js( add_query_arg( 'filtering', '1', remove_query_arg( array( 'page', 'filter_' . $taxonomy_filter ) ) ) ) ) ) . "&filter_$taxonomy_filter=' + ( isNaN( term_id ) ? '' : term_id );
-						});
-					" );
-
-				}
-
-			} else {
-
-				// List display
-				echo '<ul>';
-
-				foreach ( $terms as $term ) {
-
-					// Get count based on current view - uses transients
-					$_products_in_term = wc_get_term_product_ids( $term->term_id, $taxonomy );
-					$option_is_set     = ( isset( $_chosen_attributes[ $taxonomy ] ) && in_array( $term->term_id, $_chosen_attributes[ $taxonomy ]['terms'] ) );
-
-					// skip the term for the current archive
-					if ( $current_term == $term->term_id ) {
-						continue;
-					}
-
-					// If this is an AND query, only show options with count > 0
-					if ( 'and' == $query_type ) {
-
-						$count = sizeof( array_intersect( $_products_in_term, WC()->query->filtered_product_ids ) );
-
-						if ( 0 < $count && $current_term !== $term->term_id ) {
-							$found = true;
-						}
-
-						if ( 0 == $count && ! $option_is_set ) {
-							continue;
-						}
-
-					// If this is an OR query, show all options so search can be expanded
-					} else {
-
-						$count = sizeof( array_intersect( $_products_in_term, WC()->query->unfiltered_product_ids ) );
-
-						if ( 0 < $count ) {
-							$found = true;
-						}
-					}
-
-					$arg = 'filter_' . sanitize_title( $instance['attribute'] );
-
-					$current_filter = ( isset( $_GET[ $arg ] ) ) ? explode( ',', $_GET[ $arg ] ) : array();
-
-					if ( ! is_array( $current_filter ) ) {
-						$current_filter = array();
-					}
-
-					$current_filter = array_map( 'esc_attr', $current_filter );
-
-					if ( ! in_array( $term->term_id, $current_filter ) ) {
-						$current_filter[] = $term->term_id;
-					}
-
-					// Base Link decided by current page
-					if ( defined( 'SHOP_IS_ON_FRONT' ) ) {
-						$link = home_url();
-					} elseif ( is_post_type_archive( 'product' ) || is_page( wc_get_page_id('shop') ) ) {
-						$link = get_post_type_archive_link( 'product' );
-					} else {
-						$link = get_term_link( get_query_var('term'), get_query_var('taxonomy') );
-					}
-
-					// All current filters
-					if ( $_chosen_attributes ) {
-						foreach ( $_chosen_attributes as $name => $data ) {
-							if ( $name !== $taxonomy ) {
-
-								// Exclude query arg for current term archive term
-								while ( in_array( $current_term, $data['terms'] ) ) {
-									$key = array_search( $current_term, $data );
-									unset( $data['terms'][$key] );
-								}
-
-								// Remove pa_ and sanitize
-								$filter_name = sanitize_title( str_replace( 'pa_', '', $name ) );
-
-								if ( ! empty( $data['terms'] ) ) {
-									$link = add_query_arg( 'filter_' . $filter_name, implode( ',', $data['terms'] ), $link );
-								}
-
-								if ( 'or' == $data['query_type'] ) {
-									$link = add_query_arg( 'query_type_' . $filter_name, 'or', $link );
-								}
-							}
-						}
-					}
-
-					// Min/Max
-					if ( isset( $_GET['min_price'] ) ) {
-						$link = add_query_arg( 'min_price', $_GET['min_price'], $link );
-					}
-
-					if ( isset( $_GET['max_price'] ) ) {
-						$link = add_query_arg( 'max_price', $_GET['max_price'], $link );
-					}
-
-					// Orderby
-					if ( isset( $_GET['orderby'] ) ) {
-						$link = add_query_arg( 'orderby', $_GET['orderby'], $link );
-					}
-
-					// Current Filter = this widget
-					if ( isset( $_chosen_attributes[ $taxonomy ] ) && is_array( $_chosen_attributes[ $taxonomy ]['terms'] ) && in_array( $term->term_id, $_chosen_attributes[ $taxonomy ]['terms'] ) ) {
-
-						$class = 'class="chosen"';
-
-						// Remove this term is $current_filter has more than 1 term filtered
-						if ( sizeof( $current_filter ) > 1 ) {
-							$current_filter_without_this = array_diff( $current_filter, array( $term->term_id ) );
-							$link = add_query_arg( $arg, implode( ',', $current_filter_without_this ), $link );
-						}
-
-					} else {
-
-						$class = '';
-						$link = add_query_arg( $arg, implode( ',', $current_filter ), $link );
-
-					}
-
-					// Search Arg
-					if ( get_search_query() ) {
-						$link = add_query_arg( 's', get_search_query(), $link );
-					}
-
-					// Post Type Arg
-					if ( isset( $_GET['post_type'] ) ) {
-						$link = add_query_arg( 'post_type', $_GET['post_type'], $link );
-					}
-
-					// Query type Arg
-					if ( $query_type == 'or' && ! ( sizeof( $current_filter ) == 1 && isset( $_chosen_attributes[ $taxonomy ]['terms'] ) && is_array( $_chosen_attributes[ $taxonomy ]['terms'] ) && in_array( $term->term_id, $_chosen_attributes[ $taxonomy ]['terms'] ) ) ) {
-						$link = add_query_arg( 'query_type_' . sanitize_title( $instance['attribute'] ), 'or', $link );
-					}
-
-					echo '<li ' . $class . '>';
-
-					echo ( $count > 0 || $option_is_set ) ? '<a href="' . esc_url( apply_filters( 'woocommerce_layered_nav_link', $link ) ) . '">' : '<span>';
-
-					echo $term->name;
-
-					echo ( $count > 0 || $option_is_set ) ? '</a>' : '</span>';
-
-					echo ' <span class="count">(' . $count . ')</span></li>';
-
-				}
-
-				echo '</ul>';
-
-			} // End display type conditional
-
-			$this->widget_end( $args );
-			
-			if ( ! $found ) {
-				ob_end_clean();
-			} else {
-				echo ob_get_clean();
-			}
+		if ( 0 === sizeof( $terms ) ) {
+			return;
+		}
+
+		switch ( $orderby ) {
+			case 'name_num' :
+				usort( $terms, '_wc_get_product_terms_name_num_usort_callback' );
+			break;
+			case 'parent' :
+				usort( $terms, '_wc_get_product_terms_parent_usort_callback' );
+			break;
+		}
+
+		ob_start();
+
+		$this->widget_start( $args, $instance );
+
+		if ( 'dropdown' === $display_type ) {
+			$found = $this->layered_nav_dropdown( $terms, $taxonomy, $query_type );
+		} else {
+			$found = $this->layered_nav_list( $terms, $taxonomy, $query_type );
+		}
+
+		$this->widget_end( $args );
+
+		// Force found when option is selected - do not force found on taxonomy attributes
+		if ( ! is_tax() && is_array( $_chosen_attributes ) && array_key_exists( $taxonomy, $_chosen_attributes ) ) {
+			$found = true;
+		}
+
+		if ( ! $found ) {
+			ob_end_clean();
+		} else {
+			echo ob_get_clean();
 		}
 	}
+
+	/**
+	 * Return the currently viewed taxonomy name.
+	 * @return string
+	 */
+	protected function get_current_taxonomy() {
+		return is_tax() ? get_queried_object()->taxonomy : '';
+	}
+
+	/**
+	 * Return the currently viewed term ID.
+	 * @return int
+	 */
+	protected function get_current_term_id() {
+		return absint( is_tax() ? get_queried_object()->term_id : 0 );
+	}
+
+	/**
+	 * Return the currently viewed term slug.
+	 * @return int
+	 */
+	protected function get_current_term_slug() {
+		return absint( is_tax() ? get_queried_object()->slug : 0 );
+	}
+
+	/**
+	 * Show dropdown layered nav.
+	 * @param  array $terms
+	 * @param  string $taxonomy
+	 * @param  string $query_type
+	 * @return bool Will nav display?
+	 */
+	protected function layered_nav_dropdown( $terms, $taxonomy, $query_type ) {
+		$found = false;
+
+		if ( $taxonomy !== $this->get_current_taxonomy() ) {
+			$term_counts          = $this->get_filtered_term_product_counts( wp_list_pluck( $terms, 'term_id' ), $taxonomy, $query_type );
+			$_chosen_attributes   = WC_Query::get_layered_nav_chosen_attributes();
+			$taxonomy_filter_name = str_replace( 'pa_', '', $taxonomy );
+			$taxonomy_label       = wc_attribute_label( $taxonomy );
+			$any_label            = apply_filters( 'woocommerce_layered_nav_any_label', sprintf( __( 'Any %s', 'woocommerce' ), $taxonomy_label ), $taxonomy_label, $taxonomy );
+
+			echo '<select class="dropdown_layered_nav_' . esc_attr( $taxonomy_filter_name ) . '">';
+			echo '<option value="">' . esc_html( $any_label ) . '</option>';
+
+			foreach ( $terms as $term ) {
+
+				// If on a term page, skip that term in widget list
+				if ( $term->term_id === $this->get_current_term_id() ) {
+					continue;
+				}
+
+				// Get count based on current view
+				$current_values = isset( $_chosen_attributes[ $taxonomy ]['terms'] ) ? $_chosen_attributes[ $taxonomy ]['terms'] : array();
+				$option_is_set  = in_array( $term->slug, $current_values );
+				$count          = isset( $term_counts[ $term->term_id ] ) ? $term_counts[ $term->term_id ] : 0;
+
+				// Only show options with count > 0
+				if ( 0 < $count ) {
+					$found = true;
+				} elseif ( 0 === $count && ! $option_is_set ) {
+					continue;
+				}
+
+				echo '<option value="' . esc_attr( $term->slug ) . '" ' . selected( $option_is_set, true, false ) . '>' . esc_html( $term->name ) . '</option>';
+			}
+
+			echo '</select>';
+
+			wc_enqueue_js( "
+				jQuery( '.dropdown_layered_nav_" . esc_js( $taxonomy_filter_name ) . "' ).change( function() {
+					var slug = jQuery( this ).val();
+					location.href = '" . preg_replace( '%\/page\/[0-9]+%', '', str_replace( array( '&amp;', '%2C' ), array( '&', ',' ), esc_js( add_query_arg( 'filtering', '1', remove_query_arg( array( 'page', 'filter_' . $taxonomy_filter_name ) ) ) ) ) ) . "&filter_" . esc_js( $taxonomy_filter_name ) . "=' + slug;
+				});
+			" );
+		}
+
+		return $found;
+	}
+
+	/**
+	 * Get current page URL for layered nav items.
+	 * @return string
+	 */
+	protected function get_page_base_url( $taxonomy ) {
+		if ( defined( 'SHOP_IS_ON_FRONT' ) ) {
+			$link = home_url();
+		} elseif ( is_post_type_archive( 'product' ) || is_page( wc_get_page_id( 'shop' ) ) ) {
+			$link = get_post_type_archive_link( 'product' );
+		} elseif ( is_product_category() ) {
+			$link = get_term_link( get_query_var( 'product_cat' ), 'product_cat' );
+		} elseif ( is_product_tag() ) {
+			$link = get_term_link( get_query_var( 'product_tag' ), 'product_tag' );
+		} else {
+			$queried_object = get_queried_object();
+			$link = get_term_link( $queried_object->slug, $queried_object->taxonomy );
+		}
+
+		// Min/Max
+		if ( isset( $_GET['min_price'] ) ) {
+			$link = add_query_arg( 'min_price', wc_clean( $_GET['min_price'] ), $link );
+		}
+
+		if ( isset( $_GET['max_price'] ) ) {
+			$link = add_query_arg( 'max_price', wc_clean( $_GET['max_price'] ), $link );
+		}
+
+		// Orderby
+		if ( isset( $_GET['orderby'] ) ) {
+			$link = add_query_arg( 'orderby', wc_clean( $_GET['orderby'] ), $link );
+		}
+
+		/**
+		 * Search Arg.
+		 * To support quote characters, first they are decoded from &quot; entities, then URL encoded.
+		 */
+		if ( get_search_query() ) {
+			$link = add_query_arg( 's', rawurlencode( htmlspecialchars_decode( get_search_query() ) ), $link );
+		}
+
+		// Post Type Arg
+		if ( isset( $_GET['post_type'] ) ) {
+			$link = add_query_arg( 'post_type', wc_clean( $_GET['post_type'] ), $link );
+		}
+
+		// Min Rating Arg
+		if ( isset( $_GET['rating_filter'] ) ) {
+			$link = add_query_arg( 'rating_filter', wc_clean( $_GET['rating_filter'] ), $link );
+		}
+
+		// All current filters
+		if ( $_chosen_attributes = WC_Query::get_layered_nav_chosen_attributes() ) {
+			foreach ( $_chosen_attributes as $name => $data ) {
+				if ( $name === $taxonomy ) {
+					continue;
+				}
+				$filter_name = sanitize_title( str_replace( 'pa_', '', $name ) );
+				if ( ! empty( $data['terms'] ) ) {
+					$link = add_query_arg( 'filter_' . $filter_name, implode( ',', $data['terms'] ), $link );
+				}
+				if ( 'or' == $data['query_type'] ) {
+					$link = add_query_arg( 'query_type_' . $filter_name, 'or', $link );
+				}
+			}
+		}
+
+		return $link;
+	}
+
+	/**
+	 * Count products within certain terms, taking the main WP query into consideration.
+	 *
+	 * @param  array  $term_ids
+	 * @param  string $taxonomy
+	 * @param  string $query_type
+	 * @return array
+	 */
+	protected function get_filtered_term_product_counts( $term_ids, $taxonomy, $query_type ) {
+		global $wpdb;
+
+		$tax_query  = WC_Query::get_main_tax_query();
+		$meta_query = WC_Query::get_main_meta_query();
+
+		if ( 'or' === $query_type ) {
+			foreach ( $tax_query as $key => $query ) {
+				if ( is_array( $query ) && $taxonomy === $query['taxonomy'] ) {
+					unset( $tax_query[ $key ] );
+				}
+			}
+		}
+
+		$meta_query      = new WP_Meta_Query( $meta_query );
+		$tax_query       = new WP_Tax_Query( $tax_query );
+		$meta_query_sql  = $meta_query->get_sql( 'post', $wpdb->posts, 'ID' );
+		$tax_query_sql   = $tax_query->get_sql( $wpdb->posts, 'ID' );
+
+		// Generate query
+		$query           = array();
+		$query['select'] = "SELECT COUNT( DISTINCT {$wpdb->posts}.ID ) as term_count, terms.term_id as term_count_id";
+		$query['from']   = "FROM {$wpdb->posts}";
+		$query['join']   = "
+			INNER JOIN {$wpdb->term_relationships} AS term_relationships ON {$wpdb->posts}.ID = term_relationships.object_id
+			INNER JOIN {$wpdb->term_taxonomy} AS term_taxonomy USING( term_taxonomy_id )
+			INNER JOIN {$wpdb->terms} AS terms USING( term_id )
+			" . $tax_query_sql['join'] . $meta_query_sql['join'];
+
+		$query['where']   = "
+			WHERE {$wpdb->posts}.post_type IN ( 'product' )
+			AND {$wpdb->posts}.post_status = 'publish'
+			" . $tax_query_sql['where'] . $meta_query_sql['where'] . "
+			AND terms.term_id IN (" . implode( ',', array_map( 'absint', $term_ids ) ) . ")
+		";
+
+		if ( $search = WC_Query::get_main_search_query_sql() ) {
+			$query['where'] .= ' AND ' . $search;
+		}
+
+		$query['group_by'] = "GROUP BY terms.term_id";
+		$query             = apply_filters( 'woocommerce_get_filtered_term_product_counts_query', $query );
+		$query             = implode( ' ', $query );
+		$results           = $wpdb->get_results( $query );
+
+		return wp_list_pluck( $results, 'term_count', 'term_count_id' );
+	}
+
+	/**
+	 * Show list based layered nav.
+	 *
+	 * @param  array  $terms
+	 * @param  string $taxonomy
+	 * @param  string $query_type
+	 * @return bool   Will nav display?
+	 */
+	protected function layered_nav_list( $terms, $taxonomy, $query_type ) {
+		// List display
+		echo '<ul>';
+
+		$term_counts        = $this->get_filtered_term_product_counts( wp_list_pluck( $terms, 'term_id' ), $taxonomy, $query_type );
+		$_chosen_attributes = WC_Query::get_layered_nav_chosen_attributes();
+		$found              = false;
+
+		foreach ( $terms as $term ) {
+			$current_values = isset( $_chosen_attributes[ $taxonomy ]['terms'] ) ? $_chosen_attributes[ $taxonomy ]['terms'] : array();
+			$option_is_set  = in_array( $term->slug, $current_values );
+			$count          = isset( $term_counts[ $term->term_id ] ) ? $term_counts[ $term->term_id ] : 0;
+
+			// Skip the term for the current archive
+			if ( $this->get_current_term_id() === $term->term_id ) {
+				continue;
+			}
+
+			// Only show options with count > 0
+			if ( 0 < $count ) {
+				$found = true;
+			} elseif ( 0 === $count && ! $option_is_set ) {
+				continue;
+			}
+
+			$filter_name    = 'filter_' . sanitize_title( str_replace( 'pa_', '', $taxonomy ) );
+			$current_filter = isset( $_GET[ $filter_name ] ) ? explode( ',', wc_clean( $_GET[ $filter_name ] ) ) : array();
+			$current_filter = array_map( 'sanitize_title', $current_filter );
+
+			if ( ! in_array( $term->slug, $current_filter ) ) {
+				$current_filter[] = $term->slug;
+			}
+
+			$link = $this->get_page_base_url( $taxonomy );
+
+			// Add current filters to URL.
+			foreach ( $current_filter as $key => $value ) {
+				// Exclude query arg for current term archive term
+				if ( $value === $this->get_current_term_slug() ) {
+					unset( $current_filter[ $key ] );
+				}
+
+				// Exclude self so filter can be unset on click.
+				if ( $option_is_set && $value === $term->slug ) {
+					unset( $current_filter[ $key ] );
+				}
+			}
+
+			if ( ! empty( $current_filter ) ) {
+				$link = add_query_arg( $filter_name, implode( ',', $current_filter ), $link );
+
+				// Add Query type Arg to URL
+				if ( 'or' === $query_type && ! ( 1 === sizeof( $current_filter ) && $option_is_set ) ) {
+					$link = add_query_arg( 'query_type_' . sanitize_title( str_replace( 'pa_', '', $taxonomy ) ), 'or', $link );
+				}
+			}
+
+			if ( $count > 0 || $option_is_set ) {
+				$link      = esc_url( apply_filters( 'woocommerce_layered_nav_link', $link, $term, $taxonomy ) );
+				$term_html = '<a href="' . $link . '">' . esc_html( $term->name ) . '</a>';
+			} else {
+				$link      = false;
+				$term_html = '<span>' . esc_html( $term->name ) . '</span>';
+			}
+
+			$term_html .= ' ' . apply_filters( 'woocommerce_layered_nav_count', '<span class="count">(' . absint( $count ) . ')</span>', $count, $term );
+
+			echo '<li class="wc-layered-nav-term ' . ( $option_is_set ? 'chosen' : '' ) . '">';
+			echo wp_kses_post( apply_filters( 'woocommerce_layered_nav_term_html', $term_html, $term, $link, $count ) );
+			echo '</li>';
+		}
+
+		echo '</ul>';
+
+		return $found;
+	}
 }
diff --git a/includes/widgets/class-wc-widget-price-filter.php b/includes/widgets/class-wc-widget-price-filter.php
index d04364c61a2..1c49cf0cd6c 100644
--- a/includes/widgets/class-wc-widget-price-filter.php
+++ b/includes/widgets/class-wc-widget-price-filter.php
@@ -24,20 +24,32 @@ class WC_Widget_Price_Filter extends WC_Widget {
 		$this->widget_cssclass    = 'woocommerce widget_price_filter';
 		$this->widget_description = __( 'Shows a price filter slider in a widget which lets you narrow down the list of shown products when viewing product categories.', 'woocommerce' );
 		$this->widget_id          = 'woocommerce_price_filter';
-		$this->widget_name        = __( 'WooCommerce Price Filter', 'woocommerce' );
+		$this->widget_name        = __( 'WooCommerce price filter', 'woocommerce' );
 		$this->settings           = array(
 			'title'  => array(
 				'type'  => 'text',
 				'std'   => __( 'Filter by price', 'woocommerce' ),
-				'label' => __( 'Title', 'woocommerce' )
-			)
+				'label' => __( 'Title', 'woocommerce' ),
+			),
 		);
-
+		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		wp_register_script( 'accounting', WC()->plugin_url() . '/assets/js/accounting/accounting' . $suffix . '.js', array( 'jquery' ), '0.4.2' );
+		wp_register_script( 'wc-jquery-ui-touchpunch', WC()->plugin_url() . '/assets/js/jquery-ui-touch-punch/jquery-ui-touch-punch' . $suffix . '.js', array( 'jquery-ui-slider' ), WC_VERSION, true );
+		wp_register_script( 'wc-price-slider', WC()->plugin_url() . '/assets/js/frontend/price-slider' . $suffix . '.js', array( 'jquery-ui-slider', 'wc-jquery-ui-touchpunch', 'accounting' ), WC_VERSION, true );
+		wp_localize_script( 'wc-price-slider', 'woocommerce_price_slider_params', array(
+			'min_price'			           => isset( $_GET['min_price'] ) ? esc_attr( $_GET['min_price'] ) : '',
+			'max_price'			           => isset( $_GET['max_price'] ) ? esc_attr( $_GET['max_price'] ) : '',
+			'currency_format_num_decimals' => 0,
+			'currency_format_symbol'       => get_woocommerce_currency_symbol(),
+			'currency_format_decimal_sep'  => esc_attr( wc_get_price_decimal_separator() ),
+			'currency_format_thousand_sep' => esc_attr( wc_get_price_thousand_separator() ),
+			'currency_format'              => esc_attr( str_replace( array( '%1$s', '%2$s' ), array( '%s', '%v' ), get_woocommerce_price_format() ) ),
+		) );
 		parent::__construct();
 	}
 
 	/**
-	 * widget function.
+	 * Output widget.
 	 *
 	 * @see WP_Widget
 	 *
@@ -45,14 +57,14 @@ class WC_Widget_Price_Filter extends WC_Widget {
 	 * @param array $instance
 	 */
 	public function widget( $args, $instance ) {
-		global $_chosen_attributes, $wpdb, $wp;
+		global $wp, $wp_the_query;
 
 		if ( ! is_post_type_archive( 'product' ) && ! is_tax( get_object_taxonomies( 'product' ) ) ) {
 			return;
 		}
 
-		if ( sizeof( WC()->query->unfiltered_product_ids ) == 0 ) {
-			return; // None shown - return
+		if ( ! $wp_the_query->post_count ) {
+			return;
 		}
 
 		$min_price = isset( $_GET['min_price'] ) ? esc_attr( $_GET['min_price'] ) : '';
@@ -60,126 +72,52 @@ class WC_Widget_Price_Filter extends WC_Widget {
 
 		wp_enqueue_script( 'wc-price-slider' );
 
-		// Remember current filters/search
-		$fields = '';
+		// Find min and max price in current result set
+		$prices = $this->get_filtered_price();
+		$min    = floor( $prices->min_price );
+		$max    = ceil( $prices->max_price );
 
-		if ( get_search_query() ) {
-			$fields .= '<input type="hidden" name="s" value="' . get_search_query() . '" />';
-		}
-
-		if ( ! empty( $_GET['post_type'] ) ) {
-			$fields .= '<input type="hidden" name="post_type" value="' . esc_attr( $_GET['post_type'] ) . '" />';
-		}
-
-		if ( ! empty ( $_GET['product_cat'] ) ) {
-			$fields .= '<input type="hidden" name="product_cat" value="' . esc_attr( $_GET['product_cat'] ) . '" />';
-		}
-
-		if ( ! empty( $_GET['product_tag'] ) ) {
-			$fields .= '<input type="hidden" name="product_tag" value="' . esc_attr( $_GET['product_tag'] ) . '" />';
-		}
-
-		if ( ! empty( $_GET['orderby'] ) ) {
-			$fields .= '<input type="hidden" name="orderby" value="' . esc_attr( $_GET['orderby'] ) . '" />';
-		}
-
-		if ( $_chosen_attributes ) {
-			foreach ( $_chosen_attributes as $attribute => $data ) {
-				$taxonomy_filter = 'filter_' . str_replace( 'pa_', '', $attribute );
-
-				$fields .= '<input type="hidden" name="' . esc_attr( $taxonomy_filter ) . '" value="' . esc_attr( implode( ',', $data['terms'] ) ) . '" />';
-
-				if ( 'or' == $data['query_type'] ) {
-					$fields .= '<input type="hidden" name="' . esc_attr( str_replace( 'pa_', 'query_type_', $attribute ) ) . '" value="or" />';
-				}
-			}
-		}
-
-		if ( 0 === sizeof( WC()->query->layered_nav_product_ids ) ) {
-			$min = floor( $wpdb->get_var( "
-				SELECT min(meta_value + 0)
-				FROM {$wpdb->posts} as posts
-				LEFT JOIN {$wpdb->postmeta} as postmeta ON posts.ID = postmeta.post_id
-				WHERE meta_key IN ('" . implode( "','", array_map( 'esc_sql', apply_filters( 'woocommerce_price_filter_meta_keys', array( '_price', '_min_variation_price' ) ) ) ) . "')
-				AND meta_value != ''
-			" ) );
-			$max = ceil( $wpdb->get_var( "
-				SELECT max(meta_value + 0)
-				FROM {$wpdb->posts} as posts
-				LEFT JOIN {$wpdb->postmeta} as postmeta ON posts.ID = postmeta.post_id
-				WHERE meta_key IN ('" . implode( "','", array_map( 'esc_sql', apply_filters( 'woocommerce_price_filter_meta_keys', array( '_price' ) ) ) ) . "')
-			" ) );
-		} else {
-			$min = floor( $wpdb->get_var( "
-				SELECT min(meta_value + 0)
-				FROM {$wpdb->posts} as posts
-				LEFT JOIN {$wpdb->postmeta} as postmeta ON posts.ID = postmeta.post_id
-				WHERE meta_key IN ('" . implode( "','", array_map( 'esc_sql', apply_filters( 'woocommerce_price_filter_meta_keys', array( '_price', '_min_variation_price' ) ) ) ) . "')
-				AND meta_value != ''
-				AND (
-					posts.ID IN (" . implode( ',', array_map( 'absint', WC()->query->layered_nav_product_ids ) ) . ")
-					OR (
-						posts.post_parent IN (" . implode( ',', array_map( 'absint', WC()->query->layered_nav_product_ids ) ) . ")
-						AND posts.post_parent != 0
-					)
-				)
-			" ) );
-			$max = ceil( $wpdb->get_var( "
-				SELECT max(meta_value + 0)
-				FROM {$wpdb->posts} as posts
-				LEFT JOIN {$wpdb->postmeta} as postmeta ON posts.ID = postmeta.post_id
-				WHERE meta_key IN ('" . implode( "','", array_map( 'esc_sql', apply_filters( 'woocommerce_price_filter_meta_keys', array( '_price' ) ) ) ) . "')
-				AND (
-					posts.ID IN (" . implode( ',', array_map( 'absint', WC()->query->layered_nav_product_ids ) ) . ")
-					OR (
-						posts.post_parent IN (" . implode( ',', array_map( 'absint', WC()->query->layered_nav_product_ids ) ) . ")
-						AND posts.post_parent != 0
-					)
-				)
-			" ) );
-		}
-
-		if ( $min == $max ) {
+		if ( $min === $max ) {
 			return;
 		}
 
 		$this->widget_start( $args, $instance );
 
-		if ( '' == get_option( 'permalink_structure' ) ) {
+		if ( '' === get_option( 'permalink_structure' ) ) {
 			$form_action = remove_query_arg( array( 'page', 'paged' ), add_query_arg( $wp->query_string, '', home_url( $wp->request ) ) );
 		} else {
 			$form_action = preg_replace( '%\/page/[0-9]+%', '', home_url( trailingslashit( $wp->request ) ) );
 		}
 
+		/**
+		 * Adjust max if the store taxes are not displayed how they are stored.
+		 * Min is left alone because the product may not be taxable.
+		 * Kicks in when prices excluding tax are displayed including tax.
+		 */
 		if ( wc_tax_enabled() && 'incl' === get_option( 'woocommerce_tax_display_shop' ) && ! wc_prices_include_tax() ) {
 			$tax_classes = array_merge( array( '' ), WC_Tax::get_tax_classes() );
-			$min         = 0;
+			$class_max   = $max;
 
 			foreach ( $tax_classes as $tax_class ) {
-				$tax_rates = WC_Tax::get_rates( $tax_class );
-				$class_min = $min + WC_Tax::get_tax_total( WC_Tax::calc_exclusive_tax( $min, $tax_rates ) );
-				$class_max = $max + WC_Tax::get_tax_total( WC_Tax::calc_exclusive_tax( $max, $tax_rates ) );
-
-				if ( $min === 0 || $class_min < $min ) {
-					$min = $class_min;
-				}
-				if ( $class_max > $max ) {
-					$max = $class_max;
+				if ( $tax_rates = WC_Tax::get_rates( $tax_class ) ) {
+					$class_max = $max + WC_Tax::get_tax_total( WC_Tax::calc_exclusive_tax( $max, $tax_rates ) );
 				}
 			}
+
+			$max = $class_max;
 		}
 
 		echo '<form method="get" action="' . esc_url( $form_action ) . '">
 			<div class="price_slider_wrapper">
 				<div class="price_slider" style="display:none;"></div>
 				<div class="price_slider_amount">
-					<input type="text" id="min_price" name="min_price" value="' . esc_attr( $min_price ) . '" data-min="' . esc_attr( apply_filters( 'woocommerce_price_filter_widget_min_amount', $min ) ) . '" placeholder="' . esc_attr__('Min price', 'woocommerce' ) . '" />
+					<input type="text" id="min_price" name="min_price" value="' . esc_attr( $min_price ) . '" data-min="' . esc_attr( apply_filters( 'woocommerce_price_filter_widget_min_amount', $min ) ) . '" placeholder="' . esc_attr__( 'Min price', 'woocommerce' ) . '" />
 					<input type="text" id="max_price" name="max_price" value="' . esc_attr( $max_price ) . '" data-max="' . esc_attr( apply_filters( 'woocommerce_price_filter_widget_max_amount', $max ) ) . '" placeholder="' . esc_attr__( 'Max price', 'woocommerce' ) . '" />
-					<button type="submit" class="button">' . __( 'Filter', 'woocommerce' ) . '</button>
+					<button type="submit" class="button">' . esc_html__( 'Filter', 'woocommerce' ) . '</button>
 					<div class="price_label" style="display:none;">
-						' . __( 'Price:', 'woocommerce' ) . ' <span class="from"></span> &mdash; <span class="to"></span>
+						' . esc_html__( 'Price:', 'woocommerce' ) . ' <span class="from"></span> &mdash; <span class="to"></span>
 					</div>
-					' . $fields . '
+					' . wc_query_string_form_fields( null, array( 'min_price', 'max_price' ), '', true ) . '
 					<div class="clear"></div>
 				</div>
 			</div>
@@ -187,4 +125,50 @@ class WC_Widget_Price_Filter extends WC_Widget {
 
 		$this->widget_end( $args );
 	}
+
+	/**
+	 * Get filtered min price for current products.
+	 * @return int
+	 */
+	protected function get_filtered_price() {
+		global $wpdb, $wp_the_query;
+
+		$args       = $wp_the_query->query_vars;
+		$tax_query  = isset( $args['tax_query'] ) ? $args['tax_query'] : array();
+		$meta_query = isset( $args['meta_query'] ) ? $args['meta_query'] : array();
+
+		if ( ! empty( $args['taxonomy'] ) && ! empty( $args['term'] ) ) {
+			$tax_query[] = array(
+				'taxonomy' => $args['taxonomy'],
+				'terms'    => array( $args['term'] ),
+				'field'    => 'slug',
+			);
+		}
+
+		foreach ( $meta_query + $tax_query as $key => $query ) {
+			if ( ! empty( $query['price_filter'] ) || ! empty( $query['rating_filter'] ) ) {
+				unset( $meta_query[ $key ] );
+			}
+		}
+
+		$meta_query = new WP_Meta_Query( $meta_query );
+		$tax_query  = new WP_Tax_Query( $tax_query );
+
+		$meta_query_sql = $meta_query->get_sql( 'post', $wpdb->posts, 'ID' );
+		$tax_query_sql  = $tax_query->get_sql( $wpdb->posts, 'ID' );
+
+		$sql  = "SELECT min( FLOOR( price_meta.meta_value ) ) as min_price, max( CEILING( price_meta.meta_value ) ) as max_price FROM {$wpdb->posts} ";
+		$sql .= " LEFT JOIN {$wpdb->postmeta} as price_meta ON {$wpdb->posts}.ID = price_meta.post_id " . $tax_query_sql['join'] . $meta_query_sql['join'];
+		$sql .= " 	WHERE {$wpdb->posts}.post_type IN ('" . implode( "','", array_map( 'esc_sql', apply_filters( 'woocommerce_price_filter_post_type', array( 'product' ) ) ) ) . "')
+					AND {$wpdb->posts}.post_status = 'publish'
+					AND price_meta.meta_key IN ('" . implode( "','", array_map( 'esc_sql', apply_filters( 'woocommerce_price_filter_meta_keys', array( '_price' ) ) ) ) . "')
+					AND price_meta.meta_value > '' ";
+		$sql .= $tax_query_sql['where'] . $meta_query_sql['where'];
+
+		if ( $search = WC_Query::get_main_search_query_sql() ) {
+			$sql .= ' AND ' . $search;
+		}
+
+		return $wpdb->get_row( $sql );
+	}
 }
diff --git a/includes/widgets/class-wc-widget-product-categories.php b/includes/widgets/class-wc-widget-product-categories.php
index dd3259bde5a..6ba8d22c3f3 100644
--- a/includes/widgets/class-wc-widget-product-categories.php
+++ b/includes/widgets/class-wc-widget-product-categories.php
@@ -36,54 +36,54 @@ class WC_Widget_Product_Categories extends WC_Widget {
 		$this->widget_cssclass    = 'woocommerce widget_product_categories';
 		$this->widget_description = __( 'A list or dropdown of product categories.', 'woocommerce' );
 		$this->widget_id          = 'woocommerce_product_categories';
-		$this->widget_name        = __( 'WooCommerce Product Categories', 'woocommerce' );
+		$this->widget_name        = __( 'WooCommerce product categories', 'woocommerce' );
 		$this->settings           = array(
 			'title'  => array(
 				'type'  => 'text',
-				'std'   => __( 'Product Categories', 'woocommerce' ),
-				'label' => __( 'Title', 'woocommerce' )
+				'std'   => __( 'Product categories', 'woocommerce' ),
+				'label' => __( 'Title', 'woocommerce' ),
 			),
 			'orderby' => array(
 				'type'  => 'select',
 				'std'   => 'name',
 				'label' => __( 'Order by', 'woocommerce' ),
 				'options' => array(
-					'order' => __( 'Category Order', 'woocommerce' ),
-					'name'  => __( 'Name', 'woocommerce' )
-				)
+					'order' => __( 'Category order', 'woocommerce' ),
+					'name'  => __( 'Name', 'woocommerce' ),
+				),
 			),
 			'dropdown' => array(
 				'type'  => 'checkbox',
 				'std'   => 0,
-				'label' => __( 'Show as dropdown', 'woocommerce' )
+				'label' => __( 'Show as dropdown', 'woocommerce' ),
 			),
 			'count' => array(
 				'type'  => 'checkbox',
 				'std'   => 0,
-				'label' => __( 'Show product counts', 'woocommerce' )
+				'label' => __( 'Show product counts', 'woocommerce' ),
 			),
 			'hierarchical' => array(
 				'type'  => 'checkbox',
 				'std'   => 1,
-				'label' => __( 'Show hierarchy', 'woocommerce' )
+				'label' => __( 'Show hierarchy', 'woocommerce' ),
 			),
 			'show_children_only' => array(
 				'type'  => 'checkbox',
 				'std'   => 0,
-				'label' => __( 'Only show children of the current category', 'woocommerce' )
+				'label' => __( 'Only show children of the current category', 'woocommerce' ),
 			),
 			'hide_empty' => array(
 				'type'  => 'checkbox',
 				'std'   => 0,
-				'label' => __( 'Hide empty categories', 'woocommerce' )
-			)
+				'label' => __( 'Hide empty categories', 'woocommerce' ),
+			),
 		);
 
 		parent::__construct();
 	}
 
 	/**
-	 * widget function.
+	 * Output widget.
 	 *
 	 * @see WP_Widget
 	 *
@@ -104,7 +104,7 @@ class WC_Widget_Product_Categories extends WC_Widget {
 
 		// Menu Order
 		$list_args['menu_order'] = false;
-		if ( $orderby == 'order' ) {
+		if ( 'order' === $orderby ) {
 			$list_args['menu_order'] = 'asc';
 		} else {
 			$list_args['orderby']    = 'title';
@@ -121,13 +121,12 @@ class WC_Widget_Product_Categories extends WC_Widget {
 
 		} elseif ( is_singular( 'product' ) ) {
 
-			$product_category = wc_get_product_terms( $post->ID, 'product_cat', array( 'orderby' => 'parent' ) );
+			$product_category = wc_get_product_terms( $post->ID, 'product_cat', apply_filters( 'woocommerce_product_categories_widget_product_terms_args', array( 'orderby' => 'parent' ) ) );
 
-			if ( $product_category ) {
+			if ( ! empty( $product_category ) ) {
 				$this->current_cat   = end( $product_category );
 				$this->cat_ancestors = get_ancestors( $this->current_cat->term_id, 'product_cat' );
 			}
-
 		}
 
 		// Show Siblings and Children Only
@@ -140,7 +139,7 @@ class WC_Widget_Product_Categories extends WC_Widget {
 					'fields'       => 'ids',
 					'parent'       => 0,
 					'hierarchical' => true,
-					'hide_empty'   => false
+					'hide_empty'   => false,
 				)
 			);
 
@@ -151,7 +150,7 @@ class WC_Widget_Product_Categories extends WC_Widget {
 					'fields'       => 'ids',
 					'parent'       => $this->current_cat->term_id,
 					'hierarchical' => true,
-					'hide_empty'   => false
+					'hide_empty'   => false,
 				)
 			);
 
@@ -165,7 +164,7 @@ class WC_Widget_Product_Categories extends WC_Widget {
 							'fields'       => 'ids',
 							'parent'       => $ancestor,
 							'hierarchical' => false,
-							'hide_empty'   => false
+							'hide_empty'   => false,
 						)
 					);
 					$siblings = array_merge( $siblings, $ancestor_siblings );
@@ -184,7 +183,6 @@ class WC_Widget_Product_Categories extends WC_Widget {
 			if ( empty( $include ) ) {
 				return;
 			}
-
 		} elseif ( $show_children_only ) {
 			$dropdown_args['depth']        = 1;
 			$dropdown_args['child_of']     = 0;
@@ -203,11 +201,11 @@ class WC_Widget_Product_Categories extends WC_Widget {
 				'hierarchical'       => $hierarchical,
 				'show_uncategorized' => 0,
 				'orderby'            => $orderby,
-				'selected'           => $this->current_cat ? $this->current_cat->slug : ''
+				'selected'           => $this->current_cat ? $this->current_cat->slug : '',
 			);
 			$dropdown_args = wp_parse_args( $dropdown_args, $dropdown_defaults );
 
-			// Stuck with this until a fix for http://core.trac.wordpress.org/ticket/13258
+			// Stuck with this until a fix for https://core.trac.wordpress.org/ticket/13258
 			wc_product_dropdown_categories( apply_filters( 'woocommerce_product_categories_widget_dropdown_args', $dropdown_args ) );
 
 			wc_enqueue_js( "
@@ -233,7 +231,7 @@ class WC_Widget_Product_Categories extends WC_Widget {
 			$list_args['walker']                     = new WC_Product_Cat_List_Walker;
 			$list_args['title_li']                   = '';
 			$list_args['pad_counts']                 = 1;
-			$list_args['show_option_none']           = __('No product categories exist.', 'woocommerce' );
+			$list_args['show_option_none']           = __( 'No product categories exist.', 'woocommerce' );
 			$list_args['current_category']           = ( $this->current_cat ) ? $this->current_cat->term_id : '';
 			$list_args['current_category_ancestors'] = $this->cat_ancestors;
 
diff --git a/includes/widgets/class-wc-widget-product-search.php b/includes/widgets/class-wc-widget-product-search.php
index bde7ca2b7f5..ed3d0053e2c 100644
--- a/includes/widgets/class-wc-widget-product-search.php
+++ b/includes/widgets/class-wc-widget-product-search.php
@@ -22,27 +22,27 @@ class WC_Widget_Product_Search extends WC_Widget {
 		$this->widget_cssclass    = 'woocommerce widget_product_search';
 		$this->widget_description = __( 'A Search box for products only.', 'woocommerce' );
 		$this->widget_id          = 'woocommerce_product_search';
-		$this->widget_name        = __( 'WooCommerce Product Search', 'woocommerce' );
+		$this->widget_name        = __( 'WooCommerce product search', 'woocommerce' );
 		$this->settings           = array(
 			'title'  => array(
 				'type'  => 'text',
 				'std'   => '',
-				'label' => __( 'Title', 'woocommerce' )
-			)
+				'label' => __( 'Title', 'woocommerce' ),
+			),
 		);
 
 		parent::__construct();
 	}
 
 	/**
-	 * widget function.
+	 * Output widget.
 	 *
 	 * @see WP_Widget
 	 *
 	 * @param array $args
 	 * @param array $instance
 	 */
-	function widget( $args, $instance ) {
+	public function widget( $args, $instance ) {
 		$this->widget_start( $args, $instance );
 
 		get_product_search_form();
diff --git a/includes/widgets/class-wc-widget-product-tag-cloud.php b/includes/widgets/class-wc-widget-product-tag-cloud.php
index 9401ed63e44..a680aec2d72 100644
--- a/includes/widgets/class-wc-widget-product-tag-cloud.php
+++ b/includes/widgets/class-wc-widget-product-tag-cloud.php
@@ -22,20 +22,20 @@ class WC_Widget_Product_Tag_Cloud extends WC_Widget {
 		$this->widget_cssclass    = 'woocommerce widget_product_tag_cloud';
 		$this->widget_description = __( 'Your most used product tags in cloud format.', 'woocommerce' );
 		$this->widget_id          = 'woocommerce_product_tag_cloud';
-		$this->widget_name        = __( 'WooCommerce Product Tags', 'woocommerce' );
+		$this->widget_name        = __( 'WooCommerce product tags', 'woocommerce' );
 		$this->settings           = array(
 			'title'  => array(
 				'type'  => 'text',
-				'std'   => __( 'Product Tags', 'woocommerce' ),
-				'label' => __( 'Title', 'woocommerce' )
-			)
+				'std'   => __( 'Product tags', 'woocommerce' ),
+				'label' => __( 'Title', 'woocommerce' ),
+			),
 		);
 
 		parent::__construct();
 	}
 
 	/**
-	 * widget function.
+	 * Output widget.
 	 *
 	 * @see WP_Widget
 	 *
@@ -54,7 +54,10 @@ class WC_Widget_Product_Tag_Cloud extends WC_Widget {
 
 		echo '<div class="tagcloud">';
 
-		wp_tag_cloud( apply_filters( 'woocommerce_product_tag_cloud_widget_args', array( 'taxonomy' => $current_taxonomy ) ) );
+		wp_tag_cloud( apply_filters( 'woocommerce_product_tag_cloud_widget_args', array(
+			'taxonomy' => $current_taxonomy,
+			'topic_count_text_callback' => array( $this, '_topic_count_text' ),
+		) ) );
 
 		echo '</div>';
 
@@ -70,4 +73,16 @@ class WC_Widget_Product_Tag_Cloud extends WC_Widget {
 	public function _get_current_taxonomy( $instance ) {
 		return 'product_tag';
 	}
+
+	/**
+	 * Returns topic count text.
+	 *
+	 * @since 2.6.0
+	 * @param int $count
+	 * @return string
+	 */
+	public function _topic_count_text( $count ) {
+		/* translators: %s: product count */
+		return sprintf( _n( '%s product', '%s products', $count, 'woocommerce' ), number_format_i18n( $count ) );
+	}
 }
diff --git a/includes/widgets/class-wc-widget-products.php b/includes/widgets/class-wc-widget-products.php
index 4340e168b90..4d5195a9298 100644
--- a/includes/widgets/class-wc-widget-products.php
+++ b/includes/widgets/class-wc-widget-products.php
@@ -22,12 +22,12 @@ class WC_Widget_Products extends WC_Widget {
 		$this->widget_cssclass    = 'woocommerce widget_products';
 		$this->widget_description = __( 'Display a list of your products on your site.', 'woocommerce' );
 		$this->widget_id          = 'woocommerce_products';
-		$this->widget_name        = __( 'WooCommerce Products', 'woocommerce' );
+		$this->widget_name        = __( 'WooCommerce products', 'woocommerce' );
 		$this->settings           = array(
 			'title'  => array(
 				'type'  => 'text',
 				'std'   => __( 'Products', 'woocommerce' ),
-				'label' => __( 'Title', 'woocommerce' )
+				'label' => __( 'Title', 'woocommerce' ),
 			),
 			'number' => array(
 				'type'  => 'number',
@@ -35,17 +35,17 @@ class WC_Widget_Products extends WC_Widget {
 				'min'   => 1,
 				'max'   => '',
 				'std'   => 5,
-				'label' => __( 'Number of products to show', 'woocommerce' )
+				'label' => __( 'Number of products to show', 'woocommerce' ),
 			),
 			'show' => array(
 				'type'  => 'select',
 				'std'   => '',
 				'label' => __( 'Show', 'woocommerce' ),
 				'options' => array(
-					''         => __( 'All Products', 'woocommerce' ),
-					'featured' => __( 'Featured Products', 'woocommerce' ),
-					'onsale'   => __( 'On-sale Products', 'woocommerce' ),
-				)
+					''         => __( 'All products', 'woocommerce' ),
+					'featured' => __( 'Featured products', 'woocommerce' ),
+					'onsale'   => __( 'On-sale products', 'woocommerce' ),
+				),
 			),
 			'orderby' => array(
 				'type'  => 'select',
@@ -56,7 +56,7 @@ class WC_Widget_Products extends WC_Widget {
 					'price'  => __( 'Price', 'woocommerce' ),
 					'rand'   => __( 'Random', 'woocommerce' ),
 					'sales'  => __( 'Sales', 'woocommerce' ),
-				)
+				),
 			),
 			'order' => array(
 				'type'  => 'select',
@@ -65,18 +65,18 @@ class WC_Widget_Products extends WC_Widget {
 				'options' => array(
 					'asc'  => __( 'ASC', 'woocommerce' ),
 					'desc' => __( 'DESC', 'woocommerce' ),
-				)
+				),
 			),
 			'hide_free' => array(
 				'type'  => 'checkbox',
 				'std'   => 0,
-				'label' => __( 'Hide free products', 'woocommerce' )
+				'label' => __( 'Hide free products', 'woocommerce' ),
 			),
 			'show_hidden' => array(
 				'type'  => 'checkbox',
 				'std'   => 0,
-				'label' => __( 'Show hidden products', 'woocommerce' )
-			)
+				'label' => __( 'Show hidden products', 'woocommerce' ),
+			),
 		);
 
 		parent::__construct();
@@ -89,10 +89,11 @@ class WC_Widget_Products extends WC_Widget {
 	 * @return WP_Query
 	 */
 	public function get_products( $args, $instance ) {
-		$number  = ! empty( $instance['number'] ) ? absint( $instance['number'] ) : $this->settings['number']['std'];
-		$show    = ! empty( $instance['show'] ) ? sanitize_title( $instance['show'] ) : $this->settings['show']['std'];
-		$orderby = ! empty( $instance['orderby'] ) ? sanitize_title( $instance['orderby'] ) : $this->settings['orderby']['std'];
-		$order   = ! empty( $instance['order'] ) ? sanitize_title( $instance['order'] ) : $this->settings['order']['std'];
+		$number                      = ! empty( $instance['number'] ) ? absint( $instance['number'] )           : $this->settings['number']['std'];
+		$show                        = ! empty( $instance['show'] ) ? sanitize_title( $instance['show'] )       : $this->settings['show']['std'];
+		$orderby                     = ! empty( $instance['orderby'] ) ? sanitize_title( $instance['orderby'] ) : $this->settings['orderby']['std'];
+		$order                       = ! empty( $instance['order'] ) ? sanitize_title( $instance['order'] )     : $this->settings['order']['std'];
+		$product_visibility_term_ids = wc_get_product_visibility_term_ids();
 
 		$query_args = array(
 			'posts_per_page' => $number,
@@ -100,11 +101,19 @@ class WC_Widget_Products extends WC_Widget {
 			'post_type'      => 'product',
 			'no_found_rows'  => 1,
 			'order'          => $order,
-			'meta_query'     => array()
+			'meta_query'     => array(),
+			'tax_query'      => array(
+				'relation' => 'AND',
+			),
 		);
 
 		if ( empty( $instance['show_hidden'] ) ) {
-			$query_args['meta_query'][] = WC()->query->visibility_meta_query();
+			$query_args['tax_query'][] = array(
+				'taxonomy' => 'product_visibility',
+				'field'    => 'term_taxonomy_id',
+				'terms'    => is_search() ? $product_visibility_term_ids['exclude-from-search'] : $product_visibility_term_ids['exclude-from-catalog'],
+				'operator' => 'NOT IN',
+			);
 			$query_args['post_parent']  = 0;
 		}
 
@@ -117,14 +126,23 @@ class WC_Widget_Products extends WC_Widget {
 			);
 		}
 
-		$query_args['meta_query'][] = WC()->query->stock_status_meta_query();
-		$query_args['meta_query']   = array_filter( $query_args['meta_query'] );
+		if ( 'yes' === get_option( 'woocommerce_hide_out_of_stock_items' ) ) {
+			$query_args['tax_query'] = array(
+				array(
+					'taxonomy' => 'product_visibility',
+					'field'    => 'term_taxonomy_id',
+					'terms'    => $product_visibility_term_ids['outofstock'],
+					'operator' => 'NOT IN',
+				),
+			);
+		}
 
 		switch ( $show ) {
 			case 'featured' :
-				$query_args['meta_query'][] = array(
-					'key'   => '_featured',
-					'value' => 'yes'
+				$query_args['tax_query'][] = array(
+					'taxonomy' => 'product_visibility',
+					'field'    => 'term_taxonomy_id',
+					'terms'    => $product_visibility_term_ids['featured'],
 				);
 				break;
 			case 'onsale' :
@@ -154,7 +172,7 @@ class WC_Widget_Products extends WC_Widget {
 	}
 
 	/**
-	 * widget function.
+	 * Output widget.
 	 *
 	 * @see WP_Widget
 	 *
diff --git a/includes/widgets/class-wc-widget-rating-filter.php b/includes/widgets/class-wc-widget-rating-filter.php
new file mode 100644
index 00000000000..79f86b2f166
--- /dev/null
+++ b/includes/widgets/class-wc-widget-rating-filter.php
@@ -0,0 +1,206 @@
+<?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Rating Filter Widget and related functions.
+ *
+ *
+ * @author   WooThemes
+ * @category Widgets
+ * @package  WooCommerce/Widgets
+ * @version  2.6.0
+ * @extends  WC_Widget
+ */
+class WC_Widget_Rating_Filter extends WC_Widget {
+
+	/**
+	 * Constructor.
+	 */
+	public function __construct() {
+		$this->widget_cssclass    = 'woocommerce widget_rating_filter';
+		$this->widget_description = __( 'Filter products by rating when viewing product archives and categories.', 'woocommerce' );
+		$this->widget_id          = 'woocommerce_rating_filter';
+		$this->widget_name        = __( 'WooCommerce average rating filter', 'woocommerce' );
+		$this->settings           = array(
+			'title'  => array(
+				'type'  => 'text',
+				'std'   => __( 'Average rating', 'woocommerce' ),
+				'label' => __( 'Title', 'woocommerce' ),
+			),
+		);
+		parent::__construct();
+	}
+
+	/**
+	 * Get current page URL for layered nav items.
+	 * @return string
+	 */
+	protected function get_page_base_url() {
+		if ( defined( 'SHOP_IS_ON_FRONT' ) ) {
+			$link = home_url();
+		} elseif ( is_post_type_archive( 'product' ) || is_page( wc_get_page_id( 'shop' ) ) ) {
+			$link = get_post_type_archive_link( 'product' );
+		} else {
+			$link = get_term_link( get_query_var( 'term' ), get_query_var( 'taxonomy' ) );
+		}
+
+		// Min/Max
+		if ( isset( $_GET['min_price'] ) ) {
+			$link = add_query_arg( 'min_price', wc_clean( $_GET['min_price'] ), $link );
+		}
+
+		if ( isset( $_GET['max_price'] ) ) {
+			$link = add_query_arg( 'max_price', wc_clean( $_GET['max_price'] ), $link );
+		}
+
+		// Orderby
+		if ( isset( $_GET['orderby'] ) ) {
+			$link = add_query_arg( 'orderby', wc_clean( $_GET['orderby'] ), $link );
+		}
+
+		/**
+		 * Search Arg.
+		 * To support quote characters, first they are decoded from &quot; entities, then URL encoded.
+		 */
+		if ( get_search_query() ) {
+			$link = add_query_arg( 's', rawurlencode( htmlspecialchars_decode( get_search_query() ) ), $link );
+		}
+
+		// Post Type Arg
+		if ( isset( $_GET['post_type'] ) ) {
+			$link = add_query_arg( 'post_type', wc_clean( $_GET['post_type'] ), $link );
+		}
+
+		// All current filters
+		if ( $_chosen_attributes = WC_Query::get_layered_nav_chosen_attributes() ) {
+			foreach ( $_chosen_attributes as $name => $data ) {
+				$filter_name = sanitize_title( str_replace( 'pa_', '', $name ) );
+				if ( ! empty( $data['terms'] ) ) {
+					$link = add_query_arg( 'filter_' . $filter_name, implode( ',', $data['terms'] ), $link );
+				}
+				if ( 'or' == $data['query_type'] ) {
+					$link = add_query_arg( 'query_type_' . $filter_name, 'or', $link );
+				}
+			}
+		}
+
+		return $link;
+	}
+
+	/**
+	 * Count products after other filters have occurred by adjusting the main query.
+	 * @param  int $rating
+	 * @return int
+	 */
+	protected function get_filtered_product_count( $rating ) {
+		global $wpdb;
+
+		$tax_query  = WC_Query::get_main_tax_query();
+		$meta_query = WC_Query::get_main_meta_query();
+
+		// Unset current rating filter.
+		foreach ( $tax_query as $key => $query ) {
+			if ( ! empty( $query['rating_filter'] ) ) {
+				unset( $tax_query[ $key ] );
+				break;
+			}
+		}
+
+		// Set new rating filter.
+		$product_visibility_terms = wc_get_product_visibility_term_ids();
+		$tax_query[]             = array(
+			'taxonomy'      => 'product_visibility',
+			'field'         => 'term_taxonomy_id',
+			'terms'         => $product_visibility_terms[ 'rated-' . $rating ],
+			'operator'      => 'IN',
+			'rating_filter' => true,
+		);
+
+		$meta_query     = new WP_Meta_Query( $meta_query );
+		$tax_query      = new WP_Tax_Query( $tax_query );
+		$meta_query_sql = $meta_query->get_sql( 'post', $wpdb->posts, 'ID' );
+		$tax_query_sql  = $tax_query->get_sql( $wpdb->posts, 'ID' );
+
+		$sql  = "SELECT COUNT( DISTINCT {$wpdb->posts}.ID ) FROM {$wpdb->posts} ";
+		$sql .= $tax_query_sql['join'] . $meta_query_sql['join'];
+		$sql .= " WHERE {$wpdb->posts}.post_type = 'product' AND {$wpdb->posts}.post_status = 'publish' ";
+		$sql .= $tax_query_sql['where'] . $meta_query_sql['where'];
+
+		if ( $search = WC_Query::get_main_search_query_sql() ) {
+			$sql .= ' AND ' . $search;
+		}
+
+		return absint( $wpdb->get_var( $sql ) );
+	}
+
+	/**
+	 * widget function.
+	 *
+	 * @see WP_Widget
+	 *
+	 * @param array $args
+	 * @param array $instance
+	 */
+	public function widget( $args, $instance ) {
+		global $wp_the_query;
+
+		if ( ! is_post_type_archive( 'product' ) && ! is_tax( get_object_taxonomies( 'product' ) ) ) {
+			return;
+		}
+
+		if ( ! $wp_the_query->post_count ) {
+			return;
+		}
+
+		ob_start();
+
+		$found         = false;
+		$rating_filter = isset( $_GET['rating_filter'] ) ? array_filter( array_map( 'absint', explode( ',', $_GET['rating_filter'] ) ) ) : array();
+
+		$this->widget_start( $args, $instance );
+
+		echo '<ul>';
+
+		for ( $rating = 5; $rating >= 1; $rating-- ) {
+			$count = $this->get_filtered_product_count( $rating );
+			if ( empty( $count ) ) {
+				continue;
+			}
+			$found = true;
+			$link  = $this->get_page_base_url();
+
+			if ( in_array( $rating, $rating_filter ) ) {
+				$link_ratings = implode( ',', array_diff( $rating_filter, array( $rating ) ) );
+			} else {
+				$link_ratings = implode( ',', array_merge( $rating_filter, array( $rating ) ) );
+			}
+
+			$link  = $link_ratings ? add_query_arg( 'rating_filter', $link_ratings ) : remove_query_arg( 'rating_filter' );
+
+			echo '<li class="wc-layered-nav-rating ' . ( in_array( $rating, $rating_filter ) ? 'chosen' : '' ) . '">';
+
+			echo '<a href="' . esc_url( apply_filters( 'woocommerce_rating_filter_link', $link ) ) . '">';
+
+			echo '<span class="star-rating">
+					<span style="width:' . esc_attr( ( $rating / 5 ) * 100 ) . '%">' . sprintf( esc_html__( 'Rated %s out of 5', 'woocommerce' ), $rating ) . '</span>
+				</span> (' . esc_html( $count ) . ')';
+
+			echo '</a>';
+
+			echo '</li>';
+		}
+
+		echo '</ul>';
+
+		$this->widget_end( $args );
+
+		if ( ! $found ) {
+			ob_end_clean();
+		} else {
+			echo ob_get_clean();
+		}
+	}
+}
diff --git a/includes/widgets/class-wc-widget-recent-reviews.php b/includes/widgets/class-wc-widget-recent-reviews.php
index 3c2d388e46f..9001580cb18 100644
--- a/includes/widgets/class-wc-widget-recent-reviews.php
+++ b/includes/widgets/class-wc-widget-recent-reviews.php
@@ -22,12 +22,12 @@ class WC_Widget_Recent_Reviews extends WC_Widget {
 		$this->widget_cssclass    = 'woocommerce widget_recent_reviews';
 		$this->widget_description = __( 'Display a list of your most recent reviews on your site.', 'woocommerce' );
 		$this->widget_id          = 'woocommerce_recent_reviews';
-		$this->widget_name        = __( 'WooCommerce Recent Reviews', 'woocommerce' );
+		$this->widget_name        = __( 'WooCommerce recent reviews', 'woocommerce' );
 		$this->settings           = array(
 			'title'  => array(
 				'type'  => 'text',
-				'std'   => __( 'Recent Reviews', 'woocommerce' ),
-				'label' => __( 'Title', 'woocommerce' )
+				'std'   => __( 'Recent reviews', 'woocommerce' ),
+				'label' => __( 'Title', 'woocommerce' ),
 			),
 			'number' => array(
 				'type'  => 'number',
@@ -35,15 +35,15 @@ class WC_Widget_Recent_Reviews extends WC_Widget {
 				'min'   => 1,
 				'max'   => '',
 				'std'   => 10,
-				'label' => __( 'Number of reviews to show', 'woocommerce' )
-			)
+				'label' => __( 'Number of reviews to show', 'woocommerce' ),
+			),
 		);
 
 		parent::__construct();
 	}
 
 	/**
-	 * widget function.
+	 * Output widget.
 	 *
 	 * @see WP_Widget
 	 *
@@ -73,17 +73,16 @@ class WC_Widget_Recent_Reviews extends WC_Widget {
 
 				$rating = intval( get_comment_meta( $comment->comment_ID, 'rating', true ) );
 
-				$rating_html = $_product->get_rating_html( $rating );
+				$rating_html = wc_get_rating_html( $rating );
 
 				echo '<li><a href="' . esc_url( get_comment_link( $comment->comment_ID ) ) . '">';
 
-				echo $_product->get_image();
-
-				echo $_product->get_title() . '</a>';
+				echo $_product->get_image() . wp_kses_post( $_product->get_name() ) . '</a>';
 
 				echo $rating_html;
 
-				printf( '<span class="reviewer">' . _x( 'by %1$s', 'by comment author', 'woocommerce' ) . '</span>', get_comment_author() );
+				/* translators: %s: review author */
+				echo '<span class="reviewer">' . sprintf( esc_html__( 'by %s', 'woocommerce' ), get_comment_author() ) . '</span>';
 
 				echo '</li>';
 			}
diff --git a/includes/widgets/class-wc-widget-recently-viewed.php b/includes/widgets/class-wc-widget-recently-viewed.php
index 1edd266f52f..69939da1b60 100644
--- a/includes/widgets/class-wc-widget-recently-viewed.php
+++ b/includes/widgets/class-wc-widget-recently-viewed.php
@@ -22,12 +22,12 @@ class WC_Widget_Recently_Viewed extends WC_Widget {
 		$this->widget_cssclass    = 'woocommerce widget_recently_viewed_products';
 		$this->widget_description = __( 'Display a list of recently viewed products.', 'woocommerce' );
 		$this->widget_id          = 'woocommerce_recently_viewed_products';
-		$this->widget_name        = __( 'WooCommerce Recently Viewed', 'woocommerce' );
+		$this->widget_name        = __( 'WooCommerce recently viewed', 'woocommerce' );
 		$this->settings           = array(
 			'title'  => array(
 				'type'  => 'text',
-				'std'   => __( 'Recently Viewed Products', 'woocommerce' ),
-				'label' => __( 'Title', 'woocommerce' )
+				'std'   => __( 'Recently viewed products', 'woocommerce' ),
+				'label' => __( 'Title', 'woocommerce' ),
 			),
 			'number' => array(
 				'type'  => 'number',
@@ -35,25 +35,25 @@ class WC_Widget_Recently_Viewed extends WC_Widget {
 				'min'   => 1,
 				'max'   => '',
 				'std'   => 10,
-				'label' => __( 'Number of products to show', 'woocommerce' )
-			)
+				'label' => __( 'Number of products to show', 'woocommerce' ),
+			),
 		);
 
 		parent::__construct();
 	}
 
 	/**
-	 * widget function.
+	 * Output widget.
 	 *
 	 * @see WP_Widget
 	 *
 	 * @param array $args
 	 * @param array $instance
 	 */
-	function widget( $args, $instance ) {
+	public function widget( $args, $instance ) {
 
 		$viewed_products = ! empty( $_COOKIE['woocommerce_recently_viewed'] ) ? (array) explode( '|', $_COOKIE['woocommerce_recently_viewed'] ) : array();
-		$viewed_products = array_filter( array_map( 'absint', $viewed_products ) );
+		$viewed_products = array_reverse( array_filter( array_map( 'absint', $viewed_products ) ) );
 
 		if ( empty( $viewed_products ) ) {
 			return;
@@ -63,11 +63,25 @@ class WC_Widget_Recently_Viewed extends WC_Widget {
 
 		$number = ! empty( $instance['number'] ) ? absint( $instance['number'] ) : $this->settings['number']['std'];
 
-	    $query_args = array( 'posts_per_page' => $number, 'no_found_rows' => 1, 'post_status' => 'publish', 'post_type' => 'product', 'post__in' => $viewed_products, 'orderby' => 'rand' );
+		$query_args = array(
+			'posts_per_page' => $number,
+			'no_found_rows'  => 1,
+			'post_status'    => 'publish',
+			'post_type'      => 'product',
+			'post__in'       => $viewed_products,
+			'orderby'        => 'post__in',
+		);
 
-		$query_args['meta_query']   = array();
-	    $query_args['meta_query'][] = WC()->query->stock_status_meta_query();
-	    $query_args['meta_query']   = array_filter( $query_args['meta_query'] );
+		if ( 'yes' === get_option( 'woocommerce_hide_out_of_stock_items' ) ) {
+			$query_args['tax_query'] = array(
+				array(
+					'taxonomy' => 'product_visibility',
+					'field'    => 'name',
+					'terms'    => 'outofstock',
+					'operator' => 'NOT IN',
+				),
+			);
+		}
 
 		$r = new WP_Query( $query_args );
 
@@ -75,14 +89,14 @@ class WC_Widget_Recently_Viewed extends WC_Widget {
 
 			$this->widget_start( $args, $instance );
 
-			echo '<ul class="product_list_widget">';
+			echo apply_filters( 'woocommerce_before_widget_product_list', '<ul class="product_list_widget">' );
 
 			while ( $r->have_posts() ) {
 				$r->the_post();
 				wc_get_template( 'content-widget-product.php' );
 			}
 
-			echo '</ul>';
+			echo apply_filters( 'woocommerce_after_widget_product_list', '</ul>' );
 
 			$this->widget_end( $args );
 		}
diff --git a/includes/widgets/class-wc-widget-top-rated-products.php b/includes/widgets/class-wc-widget-top-rated-products.php
index b69d6bd39f8..70ee5671023 100644
--- a/includes/widgets/class-wc-widget-top-rated-products.php
+++ b/includes/widgets/class-wc-widget-top-rated-products.php
@@ -12,7 +12,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  * @author   WooThemes
  * @category Widgets
  * @package  WooCommerce/Widgets
- * @version  2.3.0
+ * @version  3.0.0
  * @extends  WC_Widget
  */
 class WC_Widget_Top_Rated_Products extends WC_Widget {
@@ -24,12 +24,12 @@ class WC_Widget_Top_Rated_Products extends WC_Widget {
 		$this->widget_cssclass    = 'woocommerce widget_top_rated_products';
 		$this->widget_description = __( 'Display a list of your top rated products on your site.', 'woocommerce' );
 		$this->widget_id          = 'woocommerce_top_rated_products';
-		$this->widget_name        = __( 'WooCommerce Top Rated Products', 'woocommerce' );
+		$this->widget_name        = __( 'WooCommerce top rated products', 'woocommerce' );
 		$this->settings           = array(
 			'title'  => array(
 				'type'  => 'text',
-				'std'   => __( 'Top Rated Products', 'woocommerce' ),
-				'label' => __( 'Title', 'woocommerce' )
+				'std'   => __( 'Top rated products', 'woocommerce' ),
+				'label' => __( 'Title', 'woocommerce' ),
 			),
 			'number' => array(
 				'type'  => 'number',
@@ -37,15 +37,15 @@ class WC_Widget_Top_Rated_Products extends WC_Widget {
 				'min'   => 1,
 				'max'   => '',
 				'std'   => 5,
-				'label' => __( 'Number of products to show', 'woocommerce' )
-			)
+				'label' => __( 'Number of products to show', 'woocommerce' ),
+			),
 		);
 
 		parent::__construct();
 	}
 
 	/**
-	 * widget function.
+	 * Output widget.
 	 *
 	 * @see WP_Widget
 	 *
@@ -62,11 +62,17 @@ class WC_Widget_Top_Rated_Products extends WC_Widget {
 
 		$number = ! empty( $instance['number'] ) ? absint( $instance['number'] ) : $this->settings['number']['std'];
 
-		add_filter( 'posts_clauses',  array( WC()->query, 'order_by_rating_post_clauses' ) );
-
-		$query_args = array( 'posts_per_page' => $number, 'no_found_rows' => 1, 'post_status' => 'publish', 'post_type' => 'product' );
-
-		$query_args['meta_query'] = WC()->query->get_meta_query();
+		$query_args = array(
+			'posts_per_page' => $number,
+			'no_found_rows'  => 1,
+			'post_status'    => 'publish',
+			'post_type'      => 'product',
+			'meta_key'       => '_wc_average_rating',
+			'orderby'        => 'meta_value_num',
+			'order'          => 'DESC',
+			'meta_query'     => WC()->query->get_meta_query(),
+			'tax_query'      => WC()->query->get_tax_query(),
+		);
 
 		$r = new WP_Query( $query_args );
 
@@ -74,20 +80,18 @@ class WC_Widget_Top_Rated_Products extends WC_Widget {
 
 			$this->widget_start( $args, $instance );
 
-			echo '<ul class="product_list_widget">';
+			echo apply_filters( 'woocommerce_before_widget_product_list', '<ul class="product_list_widget">' );
 
 			while ( $r->have_posts() ) {
 				$r->the_post();
 				wc_get_template( 'content-widget-product.php', array( 'show_rating' => true ) );
 			}
 
-			echo '</ul>';
+			echo apply_filters( 'woocommerce_after_widget_product_list', '</ul>' );
 
 			$this->widget_end( $args );
 		}
 
-		remove_filter( 'posts_clauses', array( WC()->query, 'order_by_rating_post_clauses' ) );
-
 		wp_reset_postdata();
 
 		$content = ob_get_clean();
diff --git a/package.json b/package.json
index 3496ec45eb7..bab75cb3fa6 100644
--- a/package.json
+++ b/package.json
@@ -1,29 +1,53 @@
 {
   "name": "woocommerce",
   "title": "WooCommerce",
-  "version": "2.4.4",
-  "homepage": "http://www.woothemes.com/woocommerce/",
+  "version": "3.0.0",
+  "homepage": "https://woocommerce.com/",
   "repository": {
     "type": "git",
-    "url": "https://github.com/woothemes/woocommerce.git"
+    "url": "https://github.com/woocommerce/woocommerce.git"
   },
   "license": "GPL-3.0+",
   "main": "Gruntfile.js",
+  "scripts": {
+    "test": "cross-env NODE_CONFIG_DIR='./tests/e2e-tests/config' BABEL_ENV=commonjs mocha \"tests/e2e-tests\" --compilers js:babel-register --recursive",
+    "test:single": "cross-env NODE_CONFIG_DIR='./tests/e2e-tests/config' BABEL_ENV=commonjs mocha --compilers js:babel-register"
+  },
   "devDependencies": {
-    "grunt": "~0.4.5",
+    "autoprefixer": "^6.7.7",
+    "babel": "^6.5.2",
+    "babel-cli": "^6.14.0",
+    "babel-eslint": "^7.0.0",
+    "babel-plugin-add-module-exports": "^0.2.1",
+    "babel-preset-es2015": "^6.14.0",
+    "babel-preset-stage-2": "^6.13.0",
+    "chai": "^3.5.0",
+    "chai-as-promised": "^6.0.0",
+    "chromedriver": "^2.25.0",
+    "config": "^1.24.0",
+    "cross-env": "^3.0.0",
+    "grunt": "~1.0.1",
     "grunt-checktextdomain": "~1.0.0",
-    "grunt-contrib-clean": "~0.6.0",
-    "grunt-contrib-cssmin": "~0.13.0",
-    "grunt-contrib-jshint": "~0.11.2",
-    "grunt-contrib-sass": "~0.9.2",
-    "grunt-contrib-uglify": "~0.9.1",
-    "grunt-contrib-watch": "~0.6.1",
-    "grunt-shell": "~1.1.2",
-    "grunt-wp-i18n": "~0.5.3",
-    "node-bourbon": "~4.2.3"
+    "grunt-contrib-clean": "~1.0.0",
+    "grunt-contrib-concat": "1.0.1",
+    "grunt-contrib-cssmin": "~1.0.0",
+    "grunt-contrib-jshint": "~1.1.0",
+    "grunt-contrib-sass": "~1.0.0",
+    "grunt-contrib-uglify": "~2.0.0",
+    "grunt-contrib-watch": "~1.0.0",
+    "grunt-phpcs": "^0.4.0",
+    "grunt-postcss": "^0.8.0",
+    "grunt-rtlcss": "2.0.1",
+    "grunt-shell": "~2.1.0",
+    "grunt-stylelint": "^0.6.0",
+    "grunt-wp-i18n": "~0.5.4",
+    "istanbul": "^1.0.0-alpha",
+    "mocha": "^3.0.2",
+    "node-bourbon": "~4.2.3",
+    "wc-e2e-page-objects": "0.2.2"
   },
   "engines": {
-    "node": ">=0.8.0",
+    "node": ">=6.9.4",
     "npm": ">=1.1.0"
   }
 }
diff --git a/phpcs.ruleset.xml b/phpcs.ruleset.xml
new file mode 100644
index 00000000000..1cb68a2b0b0
--- /dev/null
+++ b/phpcs.ruleset.xml
@@ -0,0 +1,194 @@
+<?xml version="1.0"?>
+<ruleset name="WordPress Coding Standards">
+	<!-- See https://github.com/squizlabs/PHP_CodeSniffer/wiki/Annotated-ruleset.xml -->
+	<!-- See https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/blob/develop/WordPress-Core/ruleset.xml -->
+
+	<!-- Set a description for this ruleset. -->
+	<description>A custom set of code standard rules to check for WordPress themes and plugins.</description>
+
+	<!-- Include the WordPress ruleset, with exclusions. -->
+	<rule ref="WordPress">
+		<exclude name="Generic.CodeAnalysis.EmptyStatement.DetectedCATCH" />
+		<exclude name="Generic.CodeAnalysis.EmptyStatement.DetectedIF" />
+		<exclude name="Generic.CodeAnalysis.EmptyStatement.DetectedELSE" />
+		<exclude name="Generic.CodeAnalysis.ForLoopWithTestFunctionalCall.NotAllowed" />
+		<exclude name="Generic.Commenting.DocComment.LongNotCapital" />
+		<exclude name="Generic.Commenting.DocComment.MissingShort" />
+		<exclude name="Generic.Commenting.DocComment.ShortNotCapital" />
+		<exclude name="Generic.Commenting.DocComment.SpacingAfter" />
+		<exclude name="Generic.Commenting.DocComment.SpacingBeforeTags" />
+		<!-- <exclude name="Generic.ControlStructures.InlineControlStructure.NotAllowed" /> -->
+		<!-- <exclude name="Generic.Files.EndFileNewline.NotFound" /> -->
+		<exclude name="Generic.Files.LineEndings.InvalidEOLChar" />
+		<exclude name="Generic.Files.LowercasedFilename.NotFound" />
+		<!-- <exclude name="Generic.Formatting.DisallowMultipleStatements.SameLine" /> -->
+		<!-- <exclude name="Generic.Formatting.SpaceAfterCast.NoSpace" /> -->
+		<exclude name="Generic.Functions.OpeningFunctionBraceKernighanRitchie.BraceOnNewLine" />
+		<exclude name="Generic.Functions.OpeningFunctionBraceKernighanRitchie.ContentAfterBrace" />
+		<exclude name="Generic.Functions.OpeningFunctionBraceKernighanRitchie.SpaceBeforeBrace" />
+		<exclude name="Generic.PHP.DeprecatedFunctions.Deprecated" />
+		<exclude name="Generic.PHP.ForbiddenFunctions.FoundWithAlternative" />
+		<exclude name="Generic.PHP.LowerCaseKeyword.Found" />
+		<exclude name="Generic.PHP.NoSilencedErrors.Discouraged" />
+		<exclude name="Generic.Strings.UnnecessaryStringConcat.Found" />
+		<exclude name="Generic.WhiteSpace.DisallowSpaceIndent.SpacesUsed" />
+		<exclude name="Generic.WhiteSpace.ScopeIndent.Incorrect" />
+		<exclude name="Generic.WhiteSpace.ScopeIndent.IncorrectExact" />
+		<exclude name="PEAR.Functions.FunctionCallSignature.Indent" />
+		<!-- <exclude name="PEAR.Functions.FunctionCallSignature.SpaceAfterCloseBracket" /> -->
+		<!-- <exclude name="PEAR.Functions.FunctionCallSignature.SpaceAfterOpenBracket" /> -->
+		<!-- <exclude name="PEAR.Functions.FunctionCallSignature.SpaceBeforeCloseBracket" /> -->
+		<!-- <exclude name="PEAR.Functions.FunctionCallSignature.SpaceBeforeOpenBracket" /> -->
+		<!-- <exclude name="Squiz.Commenting.BlockComment.NoEmptyLineBefore" /> -->
+		<!-- <exclude name="Squiz.Commenting.BlockComment.NoNewLine" /> -->
+		<exclude name="Squiz.Commenting.BlockComment.WrongEnd" />
+		<exclude name="Squiz.Commenting.ClassComment.SpacingAfter" />
+		<exclude name="Squiz.Commenting.ClassComment.Missing" />
+		<exclude name="Squiz.Commenting.ClosingDeclarationComment.Abstract" />
+		<!-- <exclude name="Squiz.Commenting.DocCommentAlignment.SpaceBeforeStar" /> -->
+		<exclude name="Squiz.Commenting.EmptyCatchComment.Missing" />
+		<exclude name="Squiz.Commenting.FileComment.Missing" />
+		<exclude name="Squiz.Commenting.FileComment.MissingPackageTag" />
+		<exclude name="Squiz.Commenting.FileComment.SpacingAfterComment" />
+		<exclude name="Squiz.Commenting.FileComment.SpacingAfterOpen" />
+		<exclude name="Squiz.Commenting.FileComment.WrongStyle" />
+		<exclude name="Squiz.Commenting.FunctionComment.EmptyThrows" />
+		<exclude name="Squiz.Commenting.FunctionComment.ExtraParamComment" />
+		<exclude name="Squiz.Commenting.FunctionComment.InvalidNoReturn" />
+		<exclude name="Squiz.Commenting.FunctionComment.InvalidReturnVoid" />
+		<exclude name="Squiz.Commenting.FunctionComment.Missing" />
+		<exclude name="Squiz.Commenting.FunctionComment.MissingParamComment" />
+		<exclude name="Squiz.Commenting.FunctionComment.MissingParamName" />
+		<exclude name="Squiz.Commenting.FunctionComment.MissingParamTag" />
+		<exclude name="Squiz.Commenting.FunctionComment.ParamCommentFullStop" />
+		<exclude name="Squiz.Commenting.FunctionComment.ParamNameNoCaseMatch" />
+		<exclude name="Squiz.Commenting.FunctionComment.ParamNameNoMatch" />
+		<exclude name="Squiz.Commenting.FunctionComment.ScalarTypeHintMissing" />
+		<!-- <exclude name="Squiz.Commenting.FunctionComment.SpacingAfter" /> -->
+		<exclude name="Squiz.Commenting.FunctionComment.SpacingAfterParamType" />
+		<exclude name="Squiz.Commenting.FunctionComment.ThrowsNoFullStop" />
+		<exclude name="Squiz.Commenting.FunctionComment.ThrowsNotCapital" />
+		<exclude name="Squiz.Commenting.FunctionCommentThrowTag.Missing" />
+		<exclude name="Squiz.Commenting.FunctionCommentThrowTag.WrongNumber" />
+		<exclude name="Squiz.Commenting.FunctionComment.WrongStyle" />
+		<exclude name="Squiz.Commenting.InlineComment.Empty" />
+		<exclude name="Squiz.Commenting.InlineComment.InvalidEndChar" />
+		<!-- <exclude name="Squiz.Commenting.InlineComment.NoSpaceBefore" /> -->
+		<exclude name="Squiz.Commenting.InlineComment.NotCapital" />
+		<!-- <exclude name="Squiz.Commenting.InlineComment.SpacingAfter" /> -->
+		<!-- <exclude name="Squiz.Commenting.InlineComment.SpacingBefore" /> -->
+		<exclude name="Squiz.Commenting.InlineComment.WrongStyle" />
+		<exclude name="Squiz.Commenting.VariableComment.Missing" />
+		<exclude name="Squiz.Commenting.VariableComment.MissingVar" />
+		<exclude name="Squiz.Commenting.VariableComment.WrongStyle" />
+		<!-- <exclude name="Squiz.ControlStructures.ControlSignature.SpaceAfterCloseBrace" /> -->
+		<!-- <exclude name="Squiz.ControlStructures.ControlSignature.SpaceAfterCloseParenthesis" /> -->
+		<exclude name="Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword" />
+		<exclude name="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpaceAfterDefault" />
+		<exclude name="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingAfterOpen" />
+		<exclude name="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingAfterOpenHint" />
+		<exclude name="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpaceBeforeEquals" />
+		<exclude name="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingBeforeClose" />
+		<exclude name="Squiz.PHP.CommentedOutCode.Found" />
+		<exclude name="Squiz.Strings.DoubleQuoteUsage.NotRequired" />
+		<!-- <exclude name="Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines" /> -->
+		<!-- <exclude name="Squiz.WhiteSpace.SuperfluousWhitespace.EndLine" /> -->
+		<!-- <exclude name="WordPress.Arrays.ArrayDeclaration.CloseBraceNewLine" /> -->
+		<!-- <exclude name="WordPress.Arrays.ArrayDeclaration.FirstIndexNoNewline" /> -->
+		<!-- <exclude name="WordPress.Arrays.ArrayDeclaration.FirstValueNoNewline" /> -->
+		<!-- <exclude name="WordPress.Arrays.ArrayDeclaration.IndexNoNewline" /> -->
+		<!-- <exclude name="WordPress.Arrays.ArrayDeclaration.NoComma" /> -->
+		<!-- <exclude name="WordPress.Arrays.ArrayDeclaration.NoCommaAfterLast" /> -->
+		<!-- <exclude name="WordPress.Arrays.ArrayDeclaration.NoSpaceAfterComma" /> -->
+		<!-- <exclude name="WordPress.Arrays.ArrayDeclaration.NoSpaceAfterDoubleArrow" /> -->
+		<!-- <exclude name="WordPress.Arrays.ArrayDeclaration.NoSpaceAfterOpenParenthesis" /> -->
+		<!-- <exclude name="WordPress.Arrays.ArrayDeclaration.NoSpaceBeforeDoubleArrow" /> -->
+		<!-- <exclude name="WordPress.Arrays.ArrayDeclaration.SpaceAfterArrayOpener" /> -->
+		<!-- <exclude name="WordPress.Arrays.ArrayDeclaration.SpaceAfterDoubleArrow" /> -->
+		<!-- <exclude name="WordPress.Arrays.ArrayDeclaration.SpaceAfterKeyword" /> -->
+		<!-- <exclude name="WordPress.Arrays.ArrayDeclaration.SpaceBeforeComma" /> -->
+		<!-- <exclude name="WordPress.Arrays.ArrayDeclaration.SpaceInEmptyArray" /> -->
+		<!-- <exclude name="WordPress.Arrays.ArrayDeclaration.ValueNoNewline" /> -->
+		<!-- <exclude name="WordPress.Arrays.ArrayKeySpacingRestrictions.NoSpacesAroundArrayKeys" /> -->
+		<!-- <exclude name="WordPress.Arrays.ArrayKeySpacingRestrictions.SpacesAroundArrayKeys" /> -->
+		<exclude name="WordPress.Classes.ClassOpeningStatement.BraceOnNewLine" />
+		<exclude name="WordPress.CSRF.NonceVerification.NoNonceVerification" />
+		<exclude name="WordPress.DB.RestrictedFunctions.mysql" />
+		<exclude name="WordPress.Files.FileName.UnderscoresNotAllowed" />
+		<exclude name="WordPress.Functions.DontExtract.extract" />
+		<exclude name="WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid" />
+		<exclude name="WordPress.NamingConventions.ValidFunctionName.MethodNameInvalid" />
+		<exclude name="WordPress.NamingConventions.ValidHookName.UseUnderscores" />
+		<exclude name="WordPress.NamingConventions.ValidVariableName.MemberNotSnakeCase" />
+		<exclude name="WordPress.NamingConventions.ValidVariableName.NotSnakeCase" />
+		<exclude name="WordPress.NamingConventions.ValidVariableName.NotSnakeCaseMemberVar" />
+		<exclude name="WordPress.NamingConventions.ValidVariableName.StringNotSnakeCase" />
+		<exclude name="WordPress.PHP.DiscouragedFunctions.Discouraged" />
+		<exclude name="WordPress.PHP.DiscouragedFunctions.DiscouragedWithAlternative" />
+		<exclude name="WordPress.PHP.StrictComparisons.LooseComparison" />
+		<exclude name="WordPress.PHP.StrictInArray.MissingTrueStrict" />
+		<!-- <exclude name="WordPress.PHP.YodaConditions.NotYoda" /> -->
+		<exclude name="WordPress.VIP.AdminBarRemoval.RemovalDetected" />
+		<exclude name="WordPress.VIP.CronInterval.ChangeDetected" />
+		<exclude name="WordPress.VIP.DirectDatabaseQuery.DirectQuery" />
+		<exclude name="WordPress.VIP.DirectDatabaseQuery.NoCaching" />
+		<exclude name="WordPress.VIP.DirectDatabaseQuery.SchemaChange" />
+		<exclude name="WordPress.VIP.FileSystemWritesDisallow.FileWriteDetected" />
+		<exclude name="WordPress.VIP.OrderByRand.orderby" />
+		<exclude name="WordPress.VIP.PostsPerPage.posts_per_page" />
+		<exclude name="WordPress.VIP.RestrictedFunctions.count_user_posts" />
+		<exclude name="WordPress.VIP.RestrictedFunctions.custom_role" />
+		<exclude name="WordPress.VIP.RestrictedFunctions.cookies" />
+		<exclude name="WordPress.VIP.RestrictedFunctions.curl" />
+		<exclude name="WordPress.VIP.RestrictedFunctions.error_log" />
+		<exclude name="WordPress.VIP.RestrictedFunctions.extract" />
+		<exclude name="WordPress.VIP.RestrictedFunctions.file_get_contents" />
+		<exclude name="WordPress.VIP.RestrictedFunctions.get_pages" />
+		<exclude name="WordPress.VIP.RestrictedFunctions.get_posts" />
+		<exclude name="WordPress.VIP.RestrictedFunctions.get_term_by" />
+		<exclude name="WordPress.VIP.RestrictedFunctions.get_term_link" />
+		<exclude name="WordPress.VIP.RestrictedFunctions.parse_url" />
+		<exclude name="WordPress.VIP.RestrictedFunctions.prevent_path_disclosure" />
+		<exclude name="WordPress.VIP.RestrictedFunctions.runtime_configuration" />
+		<exclude name="WordPress.VIP.RestrictedFunctions.serialize" />
+		<exclude name="WordPress.VIP.RestrictedFunctions.urlencode" />
+		<exclude name="WordPress.VIP.RestrictedFunctions.url_to_postid" />
+		<exclude name="WordPress.VIP.RestrictedFunctions.user_meta" />
+		<!-- <exclude name="WordPress.VIP.RestrictedFunctions.wp_get_post_terms" /> -->
+		<exclude name="WordPress.VIP.RestrictedFunctions.wp_redirect" />
+		<exclude name="WordPress.VIP.RestrictedFunctions.wp_remote_get" />
+		<exclude name="WordPress.VIP.RestrictedVariables.user_meta" />
+		<exclude name="WordPress.VIP.RestrictedVariables.cache_constraints" />
+		<exclude name="WordPress.VIP.SessionFunctionsUsage.session_write_close" />
+		<exclude name="WordPress.VIP.SlowDBQuery.slow_db_query" />
+		<exclude name="WordPress.VIP.SuperGlobalInputUsage.AccessDetected" />
+		<exclude name="WordPress.VIP.ValidatedSanitizedInput.InputNotSanitized" />
+		<exclude name="WordPress.VIP.ValidatedSanitizedInput.InputNotValidated" />
+		<exclude name="WordPress.VIP.ValidatedSanitizedInput.MissingUnslash" />
+		<exclude name="WordPress.Variables.GlobalVariables.OverrideProhibited" />
+		<exclude name="WordPress.WP.EnqueuedResources.NonEnqueuedScript" />
+		<exclude name="WordPress.WP.I18n.MissingSingularPlaceholder" />
+		<exclude name="WordPress.WP.I18n.MismatchedPlaceholders" />
+		<exclude name="WordPress.WP.I18n.NonSingularStringLiteralPlural" />
+		<exclude name="WordPress.WP.I18n.NonSingularStringLiteralText" />
+		<exclude name="WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet" />
+		<exclude name="WordPress.WP.PreparedSQL.NotPrepared" />
+		<!-- <exclude name="WordPress.WhiteSpace.ControlStructureSpacing.BlankLineAfterEnd" /> -->
+		<!-- <exclude name="WordPress.WhiteSpace.ControlStructureSpacing.ExtraSpaceAfterCloseParenthesis" /> -->
+		<!-- <exclude name="WordPress.WhiteSpace.ControlStructureSpacing.NoSpaceAfterCloseParenthesis" /> -->
+		<!-- <exclude name="WordPress.WhiteSpace.ControlStructureSpacing.NoSpaceAfterOpenParenthesis" /> -->
+		<!-- <exclude name="WordPress.WhiteSpace.ControlStructureSpacing.NoSpaceAfterStructureOpen" /> -->
+		<!-- <exclude name="WordPress.WhiteSpace.ControlStructureSpacing.NoSpaceBetweenStructureColon" /> -->
+		<!-- <exclude name="WordPress.WhiteSpace.ControlStructureSpacing.NoSpaceBeforeCloseParenthesis" /> -->
+		<!-- <exclude name="WordPress.WhiteSpace.ControlStructureSpacing.NoSpaceBeforeOpenParenthesis" /> -->
+		<!-- <exclude name="WordPress.WhiteSpace.ControlStructureSpacing.OpenBraceNotSameLine" /> -->
+		<!-- <exclude name="WordPress.WhiteSpace.ControlStructureSpacing.SpaceBeforeFunctionOpenParenthesis" /> -->
+		<!-- <exclude name="WordPress.WhiteSpace.OperatorSpacing.NoSpaceAfter" /> -->
+		<!-- <exclude name="WordPress.WhiteSpace.OperatorSpacing.NoSpaceBefore" /> -->
+		<!-- <exclude name="WordPress.WhiteSpace.OperatorSpacing.SpacingAfter" /> -->
+		<!-- <exclude name="WordPress.WhiteSpace.OperatorSpacing.SpacingBefore" /> -->
+		<exclude name="WordPress.XSS.EscapeOutput.OutputNotEscaped" />
+		<exclude name="WordPress.XSS.EscapeOutput.UnsafePrintingFunction" />
+		<exclude name="WordPress.Files.FileName.InvalidClassFileName" />
+	</rule>
+</ruleset>
diff --git a/phpunit.xml b/phpunit.xml
index 79304e9ba99..0a829bc9242 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -7,6 +7,7 @@
 	convertNoticesToExceptions="true"
 	convertWarningsToExceptions="true"
 	verbose="true"
+	syntaxCheck="true"
 	>
 	<testsuites>
 		<testsuite name="WooCommerce Test Suite">
@@ -14,13 +15,27 @@
 		</testsuite>
 	</testsuites>
 	<filter>
-		<blacklist>
-			<directory suffix=".php">./apigen/</directory>
-			<directory suffix=".php">./i18n/</directory>
-			<directory suffix=".php">./templates/</directory>
-			<directory suffix=".php">./tests/</directory>
-			<directory suffix=".php">./tmp/</directory>
-		</blacklist>
+		<whitelist addUncoveredFilesFromWhitelist="true">
+			<directory suffix=".php">.</directory>
+			<exclude>
+				<directory suffix=".php">./apigen/</directory>
+				<directory suffix=".php">./i18n/</directory>
+				<directory suffix=".php">./includes/api/legacy/</directory>
+				<directory suffix=".php">./includes/gateways/simplify-commerce-deprecated/</directory>
+				<directory suffix=".php">./includes/gateways/simplify-commerce/includes/</directory>
+				<directory suffix=".php">./includes/libraries/</directory>
+				<directory suffix=".php">./includes/shipping/legacy-flat-rate/</directory>
+				<directory suffix=".php">./includes/shipping/legacy-free-shipping/</directory>
+				<directory suffix=".php">./includes/shipping/legacy-international-delivery/</directory>
+				<directory suffix=".php">./includes/shipping/legacy-local-delivery/</directory>
+				<directory suffix=".php">./includes/shipping/legacy-local-pickup/</directory>
+				<directory suffix=".php">./includes/updates/</directory>
+				<directory suffix=".php">./includes/widgets/</directory>
+				<directory suffix=".php">./templates/</directory>
+				<directory>./tests/</directory>
+				<directory suffix=".php">./tmp/</directory>
+			</exclude>
+		</whitelist>
 	</filter>
 	<logging>
 		<log type="coverage-html" target="./tmp/coverage" charset="UTF-8" />
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index b6e6e951839..0ae53994749 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -7,6 +7,7 @@
 	convertNoticesToExceptions="true"
 	convertWarningsToExceptions="true"
 	verbose="true"
+	syntaxCheck="true"
 	>
 	<testsuites>
 		<testsuite name="WooCommerce Test Suite">
@@ -14,15 +15,26 @@
 		</testsuite>
 	</testsuites>
 	<filter>
-		<blacklist>
-			<directory suffix=".php">./apigen/</directory>
-			<directory suffix=".php">./i18n/</directory>
-			<directory suffix=".php">./templates/</directory>
-			<directory suffix=".php">./tests/</directory>
-			<directory suffix=".php">./tmp/</directory>
-		</blacklist>
+		<whitelist addUncoveredFilesFromWhitelist="true">
+			<directory suffix=".php">.</directory>
+			<exclude>
+				<directory suffix=".php">./apigen/</directory>
+				<directory suffix=".php">./i18n/</directory>
+				<directory suffix=".php">./includes/api/legacy/</directory>
+				<directory suffix=".php">./includes/gateways/simplify-commerce-deprecated/</directory>
+				<directory suffix=".php">./includes/gateways/simplify-commerce/includes/</directory>
+				<directory suffix=".php">./includes/libraries/</directory>
+				<directory suffix=".php">./includes/shipping/legacy-flat-rate/</directory>
+				<directory suffix=".php">./includes/shipping/legacy-free-shipping/</directory>
+				<directory suffix=".php">./includes/shipping/legacy-international-delivery/</directory>
+				<directory suffix=".php">./includes/shipping/legacy-local-delivery/</directory>
+				<directory suffix=".php">./includes/shipping/legacy-local-pickup/</directory>
+				<directory suffix=".php">./includes/updates/</directory>
+				<directory suffix=".php">./includes/widgets/</directory>
+				<directory suffix=".php">./templates/</directory>
+				<directory>./tests/</directory>
+				<directory suffix=".php">./tmp/</directory>
+			</exclude>
+		</whitelist>
 	</filter>
-	<logging>
-		<log type="coverage-clover" target="./tmp/clover.xml" charset="UTF-8" />
-	</logging>
 </phpunit>
diff --git a/readme.txt b/readme.txt
index 23b3f6f1528..7d0ec08e7eb 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,11 +1,11 @@
-=== WooCommerce - excelling eCommerce ===
-Contributors: automattic, mikejolley, jameskoster, claudiosanches, royho, woothemes
-Tags: ecommerce, e-commerce, commerce, woothemes, wordpress ecommerce, affiliate, store, sales, sell, shop, shopping, cart, checkout, configurable, variable, widgets, reports, download, downloadable, digital, inventory, stock, reports, shipping, tax
-Requires at least: 4.1
-Tested up to: 4.4
-Stable tag: 2.4.12
+=== WooCommerce ===
+Contributors: automattic, mikejolley, jameskoster, claudiosanches, jshreve, coderkevin, claudiulodro, woothemes, iCaleb
+Tags: ecommerce, e-commerce, store, sales, sell, shop, cart, checkout, downloadable, downloads, paypal, storefront, woo commerce
+Requires at least: 4.4
+Tested up to: 4.7
+Stable tag: 3.0.0
 License: GPLv3
-License URI: http://www.gnu.org/licenses/gpl-3.0.html
+License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
 WooCommerce is a powerful, extendable eCommerce plugin that helps you sell anything. Beautifully.
 
@@ -37,7 +37,7 @@ One of the biggest risks of using a hosted eCommerce platform is what happens to
 
 [Storefront](https://wordpress.org/themes/storefront/) is a free WordPress theme available to any WooCommerce store. Along with deep WooCommerce integration, Storefront prioritizes speed and uptime while eliminating theme and plugin conflicts during major updates.
 
-Define your style even further by customizing Storefront to your liking or choosing from one of our several [Storefront child themes](http://www.woothemes.com/product-category/themes/storefront-child-theme-themes/). It’s all up to you, and all open source.
+Define your style even further by customizing Storefront to your liking or choosing from one of our several [Storefront child themes](https://woocommerce.com/product-category/themes/storefront-child-theme-themes/). It’s all up to you, and all open source.
 
 = Built with developers in mind =
 
@@ -55,43 +55,46 @@ We also support WooCommerce and all its extensions with comprehensive, easily-ac
 
 WordPress.org is home to some amazing extensions for WooCommerce, including:
 
-[Google Analytics](https://wordpress.org/plugins/woocommerce-google-analytics-integration/)
-[Delivery Notes](https://wordpress.org/plugins/woocommerce-delivery-notes/)
-[PDF Invoices and Packing Slips](https://wordpress.org/plugins/woocommerce-pdf-invoices-packing-slips/)
-[Affiliates Integration Light](https://wordpress.org/plugins/affiliates-woocommerce-light/)
-[New Product Badges](https://wordpress.org/plugins/woocommerce-new-product-badge/)
+- [Google Analytics](https://wordpress.org/plugins/woocommerce-google-analytics-integration/)
+- [Delivery Notes](https://wordpress.org/plugins/woocommerce-delivery-notes/)
+- [PDF Invoices and Packing Slips](https://wordpress.org/plugins/woocommerce-pdf-invoices-packing-slips/)
+- [Affiliates Integration Light](https://wordpress.org/plugins/affiliates-woocommerce-light/)
+- [New Product Badges](https://wordpress.org/plugins/woocommerce-new-product-badge/)
 
 Keen to see them all? Search WordPress.org for ‘WooCommerce’ to dive in.
 
 If you’re looking for something endorsed and maintained by the developers who built WooCommerce, there are a plethora of premium eCommerce extensions, the most popular of which include:
 
-[WooCommerce Subscriptions](http://www.woothemes.com/products/woocommerce-subscriptions/)
-[WooCommerce Memberships](http://www.woothemes.com/products/woocommerce-memberships/)
-[WooCommerce Bookings](http://www.woothemes.com/products/woocommerce-bookings/)
-[Dynamic Pricing](http://www.woothemes.com/products/dynamic-pricing/)
-[Table Rate Shipping](http://www.woothemes.com/products/table-rate-shipping/)
-[Product CSV Import Suite](http://www.woothemes.com/products/product-csv-import-suite/)
+- [WooCommerce Subscriptions](https://woocommerce.com/products/woocommerce-subscriptions/)
+- [WooCommerce Memberships](https://woocommerce.com/products/woocommerce-memberships/)
+- [WooCommerce Bookings](https://woocommerce.com/products/woocommerce-bookings/)
+- [Dynamic Pricing](https://woocommerce.com/products/dynamic-pricing/)
+- [Table Rate Shipping](https://woocommerce.com/products/table-rate-shipping/)
+- [Product CSV Import Suite](https://woocommerce.com/products/product-csv-import-suite/)
 
-And there’s plenty more where they came from. Visit our [extensions page](http://www.woothemes.com/product-category/woocommerce-extensions/) to find out everything you’re capable of and all that's possible with premium WooCommerce extensions.
+And there’s plenty more where they came from. Visit our [extensions page](https://woocommerce.com/product-category/woocommerce-extensions/) to find out everything you’re capable of and all that's possible with premium WooCommerce extensions.
 
 = Join our growing community =
 
 When you download WooCommerce, you join a community of more than a million store owners, developers, and WordPress enthusiasts. We’re one of the fastest-growing open source communities online, and whether you’re a n00b or a Ninja, we’d love to have you!
 
-If you’re interested in contributing to WooCommerce we’ve got more than 350 contributors, and there’s always room for more. Head over to the [WooCommerce GitHub Repository](https://github.com/woothemes/woocommerce) to find out how you can pitch in.
+If you’re interested in contributing to WooCommerce we’ve got more than 350 contributors, and there’s always room for more. Head over to the [WooCommerce GitHub Repository](https://github.com/woocommerce/woocommerce) to find out how you can pitch in.
 
 Want to add a new language to WooCommerce? Swell! You can contribute via [translate.wordpress.org](https://translate.wordpress.org/projects/wp-plugins/woocommerce).
 
-And, finally, consider joining or spearheading a WooCommerce Meetup locally, more about those [here](http://www.woothemes.com/woocommerce/meetups/).
+And, finally, consider joining or spearheading a WooCommerce Meetup locally, more about those [here](https://woocommerce.com/woocommerce/meetups/).
 
 == Installation ==
 
 = Minimum Requirements =
 
-* WordPress 3.8 or greater
-* PHP version 5.2.4 or greater
-* MySQL version 5.0 or greater
+* PHP version 5.2.4 or greater (PHP 5.6 or greater is recommended)
+* MySQL version 5.0 or greater (MySQL 5.6 or greater is recommended)
 * Some payment gateways require fsockopen support (for IPN access)
+* WooCommerce 2.5 requires WordPress 4.1+
+* WooCommerce 2.6 requires WordPress 4.4+
+
+Visit the [WooCommerce server requirements documentation](https://docs.woocommerce.com/document/server-requirements/) for a detailed list of server requirements.
 
 = Automatic installation =
 
@@ -101,7 +104,7 @@ In the search field type “WooCommerce” and click Search Plugins. Once you’
 
 = Manual installation =
 
-The manual installation method involves downloading our eCommerce plugin and uploading it to your webserver via your favourite FTP application. The WordPress codex contains [instructions on how to do this here](http://codex.wordpress.org/Managing_Plugins#Manual_Plugin_Installation).
+The manual installation method involves downloading our eCommerce plugin and uploading it to your webserver via your favourite FTP application. The WordPress codex contains [instructions on how to do this here](https://codex.wordpress.org/Managing_Plugins#Manual_Plugin_Installation).
 
 = Updating =
 
@@ -111,25 +114,25 @@ If on the off-chance you do encounter issues with the shop/category pages after
 
 = Dummy data =
 
-WooCommerce comes with some dummy data you can use to see how products look; either import dummy_data.xml via the [WordPress importer](http://wordpress.org/extend/plugins/wordpress-importer/) or use our [CSV Import Suite plugin](http://www.woothemes.com/products/product-csv-import-suite/) to import dummy_data.csv and dummy_data_variations.csv.
+WooCommerce comes with some dummy data you can use to see how products look; either import dummy_data.xml via the [WordPress importer](https://wordpress.org/plugins/wordpress-importer/) or use our [CSV Import Suite plugin](https://woocommerce.com/products/product-csv-import-suite/) to import dummy_data.csv and dummy_data_variations.csv.
 
 == Frequently Asked Questions ==
 
 = Where can I find WooCommerce documentation and user guides? =
 
-For help setting up and configuring WooCommerce please refer to our [user guide](http://docs.woothemes.com/documentation/plugins/woocommerce/getting-started/)
+For help setting up and configuring WooCommerce please refer to our [user guide](https://docs.woocommerce.com/documentation/plugins/woocommerce/getting-started/)
 
-For extending or theming WooCommerce, see our [codex](http://docs.woothemes.com/documentation/plugins/woocommerce/woocommerce-codex/).
+For extending or theming WooCommerce, see our [codex](https://docs.woocommerce.com/documentation/plugins/woocommerce/woocommerce-codex/).
 
 = Where can I get support or talk to other users? =
 
 If you get stuck, you can ask for help in the [WooCommerce Plugin Forum](https://wordpress.org/support/plugin/woocommerce).
 
-For help with premium add-ons from WooThemes, use [our helpdesk](http://support.woothemes.com/).
+For help with premium extensions from WooThemes, use [our helpdesk](https://support.woothemes.com/).
 
 = Will WooCommerce work with my theme? =
 
-Yes; WooCommerce will work with any theme, but may require some styling to make it match nicely. Please see our [codex](http://docs.woothemes.com/documentation/plugins/woocommerce/woocommerce-codex/) for help. If you're looking for a theme with built in WooCommerce integration we recommend [Storefront](http://www.woothemes.com/storefront/).
+Yes; WooCommerce will work with any theme, but may require some styling to make it match nicely. Please see our [codex](https://docs.woocommerce.com/documentation/plugins/woocommerce/woocommerce-codex/) for help. If you're looking for a theme with built in WooCommerce integration we recommend [Storefront](https://woocommerce.com/storefront/).
 
 = Where can I request new features, eCommerce themes and extensions? =
 
@@ -137,15 +140,15 @@ You can vote on and request new features and extensions in our [WooIdeas board](
 
 = Where can I report bugs or contribute to the project? =
 
-Bugs can be reported either in our support forum or preferably on the [WooCommerce GitHub repository](https://github.com/woothemes/woocommerce/issues).
+Bugs can be reported either in our support forum or preferably on the [WooCommerce GitHub repository](https://github.com/woocommerce/woocommerce/issues).
 
 = Where can I find the REST API documentation? =
 
-You can find the documentation of our REST API on the [WooCommerce REST API Docs](http://woothemes.github.io/woocommerce-rest-api-docs/).
+You can find the documentation of our REST API on the [WooCommerce REST API Docs](https://woocommerce.github.io/woocommerce-rest-api-docs/).
 
 = WooCommerce is awesome! Can I contribute? =
 
-Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/woocommerce/) :)
+Yes you can! Join in on our [GitHub repository](http://github.com/woocommerce/woocommerce/) :)
 
 == Screenshots ==
 
@@ -158,62 +161,14 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc
 
 == Changelog ==
 
-= 2.5.0 - TBD =
-* Feature - New default session handler. Uses custom table to store data rather than the options table for performance and scalability reasons. https://woocommerce.wordpress.com/2015/10/07/new-session-handler-in-2-5/
-* Feature - New tax settings UI - faster, enhanced with ajax, searchable.
-* Feature - WP CLI Support. https://woocommerce.wordpress.com/2015/10/01/sneak-peek-wp-cli-support-in-woocommerce/
-* Feature - Added terms and conditions checkbox to pay page.
-* Feature - Password strength indicators.
-* Feature - Added 'pay' link to order screen.
-* Feature - Added admin order/payment failed notification.
-* Fix - Check for existence of global attribute when you get_attributes() for a product.
-* Fix - Show order by template on product search.
-* Fix - Search variation skus in backend search.
-* Tweak - For coupons with category restrictions, respect the category hierarchy.
-* Tweak - Added wc_array_cartesian function to generate variations in a logical order.
-* Tweak - Revised email settings screens to show emails in a table and avoid a long sub-nav.
-* Tweak - Default customer role capabilities.
-* Tweak - Expire mini-cart cache after 24 hours.
-* Tweak - Improved refund error messages in PayPal standard.
-* Tweak - Removed language pack downloader in favour of translate.wordpress.org.
-* Tweak - Added onboarding wizard button to the contextual help so it can be accessed again.
-* Tweak - When a WordPress user is deleted, turn any orders they have into Guest orders.
-* Tweak - When calculating order taxes, respect tax settings and default to base country.
-* Tweak - Fade in variation images to avoid flicker during load.
-* Tweak - Display 2 averages on report (net and gross).
-* Tweak - Improve product search and use WPDB instead of several get_posts queries for performance.
-* Tweak - Use SKU for stock order notes.
-* Tweak - Added order notes for manual email sends.
-* Tweak - Sanitize shipping method labels/titles.
-* Tweak - Only display the coupon form on the checkout if a coupon hasn't been applied.
-* Tweak - Added billing address column to order screen (off for new users).
-* Tweak - Created function to disable author archives for customers.
-* Tweak - When updating cart hash, refresh all open tabs.
-* Tweak - Use new "question" mark icon font for help tips.
-* Tweak - Improved review verification status retrieval.
-* Tweak - Improve appearance when only 1 gateway is active.
-* Tweak - Aligned terms box left and added required asterisk.
-* Tweak - Removed dropdown display mode for cart shipping methods - radios are more flexible.
-* Dev - API - Added /products/shipping_classes endpoint.
-* Dev - API - Added support to POST, PUT, and DELETE categories and tags.
-* Dev - API - Added support to filter products by tag, category, shipping class, and attribute.
-* Dev - API - Added tax and tax_class endpoints.
-* Dev - Template - New star ratings. The old one was 5 separate buttons. This new one consolidates the 5 options into one element making it leaner visually and more intuitive. Works in IE9+ with a graceful degradation for IE8.
-* Dev - Template - Added `data-title` attribute to cart table.
-* Dev - Template - Product archive anchors are now hooked into templates rather than hard coded.
-* Dev - Template - Added template files for the customer details list in emails. emails/email-customer-details.php
-* Dev - Template - Revised single variation cart template. Template files now exist for variations, and the cart button will display (disabled) when no selections are made.
-* Dev - Template - Made "my orders" columns fully customizable with filters.
-* Dev - Template - Unified email template order details tables to use a single template.
-* Dev - Allow wc_clean to support arrays.
-* Dev - Added a manual update trigger for checkout.
-* Dev - Added woocommerce_is_price_filter_active filter to Query class.
-* Dev - Replaced some cart methods with dedicated functions. e.g. wc_ship_to_billing_address_only().
-* Localisation - Add Kenyan currency and symbol.
+= 3.1.0 - 2017-xx-xx =
+* Included WooCommerce endpoints as options nav menu settings on Customize.
+* Dev - Updated Emogrifier to version 1.2.
+* Dev - Sort product data tabs by priority in admin screen.
 
-[See changelog for all versions](https://raw.githubusercontent.com/woothemes/woocommerce/master/CHANGELOG.txt).
+[See changelog for all versions](https://raw.githubusercontent.com/woocommerce/woocommerce/master/CHANGELOG.txt).
 
 == Upgrade Notice ==
 
-= 2.4.0 =
-2.4.0 is a major update so it is important that you make backups, and ensure themes and extensions are 2.4 compatible. Developers should catch up with [the development blog](https://woocommerce.wordpress.com/) to see what has been happening in core.
+= 3.0.2 =
+3.0 is a major update. [Make a full site backup](https://docs.woocommerce.com/document/backup-wordpress-content), update your theme and extensions, and [review update best practices](https://docs.woocommerce.com/document/how-to-update-your-site) before upgrading.
diff --git a/templates/archive-product.php b/templates/archive-product.php
index c4eb131acc5..ada4a8fbc5b 100644
--- a/templates/archive-product.php
+++ b/templates/archive-product.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/archive-product.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     2.0.0
@@ -27,13 +28,16 @@ get_header( 'shop' ); ?>
 		 *
 		 * @hooked woocommerce_output_content_wrapper - 10 (outputs opening divs for the content)
 		 * @hooked woocommerce_breadcrumb - 20
+		 * @hooked WC_Structured_Data::generate_website_data() - 30
 		 */
 		do_action( 'woocommerce_before_main_content' );
 	?>
 
+    <header class="woocommerce-products-header">
+
 		<?php if ( apply_filters( 'woocommerce_show_page_title', true ) ) : ?>
 
-			<h1 class="page-title"><?php woocommerce_page_title(); ?></h1>
+			<h1 class="woocommerce-products-header__title page-title"><?php woocommerce_page_title(); ?></h1>
 
 		<?php endif; ?>
 
@@ -47,12 +51,15 @@ get_header( 'shop' ); ?>
 			do_action( 'woocommerce_archive_description' );
 		?>
 
+    </header>
+
 		<?php if ( have_posts() ) : ?>
 
 			<?php
 				/**
 				 * woocommerce_before_shop_loop hook.
 				 *
+				 * @hooked wc_print_notices - 10
 				 * @hooked woocommerce_result_count - 20
 				 * @hooked woocommerce_catalog_ordering - 30
 				 */
@@ -65,6 +72,15 @@ get_header( 'shop' ); ?>
 
 				<?php while ( have_posts() ) : the_post(); ?>
 
+					<?php
+						/**
+						 * woocommerce_shop_loop hook.
+						 *
+						 * @hooked WC_Structured_Data::generate_product_data() - 10
+						 */
+						do_action( 'woocommerce_shop_loop' );
+					?>
+
 					<?php wc_get_template_part( 'content', 'product' ); ?>
 
 				<?php endwhile; // end of the loop. ?>
@@ -82,7 +98,14 @@ get_header( 'shop' ); ?>
 
 		<?php elseif ( ! woocommerce_product_subcategories( array( 'before' => woocommerce_product_loop_start( false ), 'after' => woocommerce_product_loop_end( false ) ) ) ) : ?>
 
-			<?php wc_get_template( 'loop/no-products-found.php' ); ?>
+			<?php
+				/**
+				 * woocommerce_no_products_found hook.
+				 *
+				 * @hooked wc_no_products_found - 10
+				 */
+				do_action( 'woocommerce_no_products_found' );
+			?>
 
 		<?php endif; ?>
 
diff --git a/templates/auth/footer.php b/templates/auth/footer.php
index 2ea2e9072ed..c54810cbe2b 100644
--- a/templates/auth/footer.php
+++ b/templates/auth/footer.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/auth/footer.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates/Auth
  * @version 2.4.0
diff --git a/templates/auth/form-grant-access.php b/templates/auth/form-grant-access.php
index 736769e3164..c7338d7e816 100644
--- a/templates/auth/form-grant-access.php
+++ b/templates/auth/form-grant-access.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/auth/form-grant-access.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates/Auth
  * @version 2.4.0
@@ -25,7 +26,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 <?php wc_print_notices(); ?>
 
-<p><?php printf( __( 'This will give "%s" <strong>%s</strong> access which will allow it to:' , 'woocommerce' ), esc_html( $app_name ), esc_html( $scope ) ); ?></p>
+<p><?php printf( __( 'This will give "%1$s" %2$s access which will allow it to:' , 'woocommerce' ), '<strong>' . esc_html( $app_name ) . '</strong>', '<strong>' . esc_html( $scope ) . '</strong>' ); ?></p>
 
 <ul class="wc-auth-permissions">
 	<?php foreach ( $permissions as $permission ) : ?>
diff --git a/templates/auth/form-login.php b/templates/auth/form-login.php
index dfcf173aaa2..13b292fd132 100644
--- a/templates/auth/form-login.php
+++ b/templates/auth/form-login.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/auth/form-login.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates/Auth
  * @version 2.4.0
@@ -27,7 +28,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 <?php wc_print_notices(); ?>
 
-<p><?php printf( __( 'To connect to %1$s you need to be logged in. Log in to your store below, or %2$scancel and return to %1$s%3$s', 'woocommerce' ), wc_clean( $app_name ), '<a href="' . esc_url( $return_url ) . '">', '</a>' ); ?></p>
+	<p><?php printf( __( 'To connect to %1$s you need to be logged in. Log in to your store below, or <a href="%2$s">cancel and return to %1$s</a>', 'woocommerce' ), wc_clean( $app_name ), esc_url( $return_url ) ); ?></p>
 
 <form method="post" class="wc-auth-login">
 	<p class="form-row form-row-wide">
diff --git a/templates/auth/header.php b/templates/auth/header.php
index edb51fb6927..fdbc6483364 100644
--- a/templates/auth/header.php
+++ b/templates/auth/header.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/auth/header.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates/Auth
  * @version 2.4.0
@@ -20,12 +21,12 @@ if ( ! defined( 'ABSPATH' ) ) {
 }
 
 ?><!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
+<html <?php language_attributes(); ?>>
 <head>
 	<meta name="viewport" content="width=device-width" />
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta name="robots" content="noindex, nofollow" />
-	<title><?php _e( 'Application Authentication Request', 'woocommerce' ); ?></title>
+	<title><?php _e( 'Application authentication request', 'woocommerce' ); ?></title>
 	<?php wp_admin_css( 'install', true ); ?>
 	<link rel="stylesheet" href="<?php echo esc_url( str_replace( array( 'http:', 'https:' ), '', WC()->plugin_url() ) . '/assets/css/auth.css' ); ?>" type="text/css" />
 </head>
diff --git a/templates/cart/cart-empty.php b/templates/cart/cart-empty.php
index c29585e4a76..d0a37915d66 100644
--- a/templates/cart/cart-empty.php
+++ b/templates/cart/cart-empty.php
@@ -4,15 +4,16 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/cart/cart-empty.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
- * @version 2.0.0
+ * @version 3.1.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -21,16 +22,15 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 wc_print_notices();
 
-?>
+/**
+ * @hooked wc_empty_cart_message - 10
+ */
+do_action( 'woocommerce_cart_is_empty' );
 
-<p class="cart-empty">
-	<?php _e( 'Your cart is currently empty.', 'woocommerce' ) ?>
-</p>
-
-<?php do_action( 'woocommerce_cart_is_empty' ); ?>
-
-<p class="return-to-shop">
-	<a class="button wc-backward" href="<?php echo esc_url( apply_filters( 'woocommerce_return_to_shop_redirect', wc_get_page_permalink( 'shop' ) ) ); ?>">
-		<?php _e( 'Return To Shop', 'woocommerce' ) ?>
-	</a>
-</p>
+if ( wc_get_page_id( 'shop' ) > 0 ) : ?>
+	<p class="return-to-shop">
+		<a class="button wc-backward" href="<?php echo esc_url( apply_filters( 'woocommerce_return_to_shop_redirect', wc_get_page_permalink( 'shop' ) ) ); ?>">
+			<?php _e( 'Return to shop', 'woocommerce' ) ?>
+		</a>
+	</p>
+<?php endif; ?>
diff --git a/templates/cart/cart-item-data.php b/templates/cart/cart-item-data.php
index 778d02ee38e..a65242c8626 100644
--- a/templates/cart/cart-item-data.php
+++ b/templates/cart/cart-item-data.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/cart/cart-item-data.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version 	2.4.0
diff --git a/templates/cart/cart-shipping.php b/templates/cart/cart-shipping.php
index 95096dbe6c0..bc8c05d4c33 100644
--- a/templates/cart/cart-shipping.php
+++ b/templates/cart/cart-shipping.php
@@ -6,15 +6,16 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/cart/cart-shipping.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
- * @version     2.5.0
+ * @version     3.1.0
  */
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
@@ -53,7 +54,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 			<?php echo '<p class="woocommerce-shipping-contents"><small>' . esc_html( $package_details ) . '</small></p>'; ?>
 		<?php endif; ?>
 
-		<?php if ( is_cart() && ! $index ) : ?>
+		<?php if ( ! empty( $show_shipping_calculator ) ) : ?>
 			<?php woocommerce_shipping_calculator(); ?>
 		<?php endif; ?>
 	</td>
diff --git a/templates/cart/cart-totals.php b/templates/cart/cart-totals.php
index 51bc22c8530..3084cee5215 100644
--- a/templates/cart/cart-totals.php
+++ b/templates/cart/cart-totals.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/cart/cart-totals.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     2.3.6
@@ -20,23 +21,23 @@ if ( ! defined( 'ABSPATH' ) ) {
 }
 
 ?>
-<div class="cart_totals <?php if ( WC()->customer->has_calculated_shipping() ) echo 'calculated_shipping'; ?>">
+<div class="cart_totals <?php echo ( WC()->customer->has_calculated_shipping() ) ? 'calculated_shipping' : ''; ?>">
 
 	<?php do_action( 'woocommerce_before_cart_totals' ); ?>
 
-	<h2><?php _e( 'Cart Totals', 'woocommerce' ); ?></h2>
+	<h2><?php _e( 'Cart totals', 'woocommerce' ); ?></h2>
 
 	<table cellspacing="0" class="shop_table shop_table_responsive">
 
 		<tr class="cart-subtotal">
 			<th><?php _e( 'Subtotal', 'woocommerce' ); ?></th>
-			<td data-title="<?php _e( 'Subtotal', 'woocommerce' ); ?>"><?php wc_cart_totals_subtotal_html(); ?></td>
+			<td data-title="<?php esc_attr_e( 'Subtotal', 'woocommerce' ); ?>"><?php wc_cart_totals_subtotal_html(); ?></td>
 		</tr>
 
 		<?php foreach ( WC()->cart->get_coupons() as $code => $coupon ) : ?>
 			<tr class="cart-discount coupon-<?php echo esc_attr( sanitize_title( $code ) ); ?>">
 				<th><?php wc_cart_totals_coupon_label( $coupon ); ?></th>
-				<td data-title="<?php wc_cart_totals_coupon_label( $coupon ); ?>"><?php wc_cart_totals_coupon_html( $coupon ); ?></td>
+				<td data-title="<?php echo esc_attr( wc_cart_totals_coupon_label( $coupon, false ) ); ?>"><?php wc_cart_totals_coupon_html( $coupon ); ?></td>
 			</tr>
 		<?php endforeach; ?>
 
@@ -48,11 +49,11 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 			<?php do_action( 'woocommerce_cart_totals_after_shipping' ); ?>
 
-		<?php elseif ( WC()->cart->needs_shipping() ) : ?>
+		<?php elseif ( WC()->cart->needs_shipping() && 'yes' === get_option( 'woocommerce_enable_shipping_calc' ) ) : ?>
 
 			<tr class="shipping">
 				<th><?php _e( 'Shipping', 'woocommerce' ); ?></th>
-				<td data-title="<?php _e( 'Shipping', 'woocommerce' ); ?>"><?php woocommerce_shipping_calculator(); ?></td>
+				<td data-title="<?php esc_attr_e( 'Shipping', 'woocommerce' ); ?>"><?php woocommerce_shipping_calculator(); ?></td>
 			</tr>
 
 		<?php endif; ?>
@@ -60,26 +61,27 @@ if ( ! defined( 'ABSPATH' ) ) {
 		<?php foreach ( WC()->cart->get_fees() as $fee ) : ?>
 			<tr class="fee">
 				<th><?php echo esc_html( $fee->name ); ?></th>
-				<td data-title="<?php echo esc_html( $fee->name ); ?>"><?php wc_cart_totals_fee_html( $fee ); ?></td>
+				<td data-title="<?php echo esc_attr( $fee->name ); ?>"><?php wc_cart_totals_fee_html( $fee ); ?></td>
 			</tr>
 		<?php endforeach; ?>
 
 		<?php if ( wc_tax_enabled() && 'excl' === WC()->cart->tax_display_cart ) :
-			$estimated_text = 1||WC()->customer->is_customer_outside_base() && ! WC()->customer->has_calculated_shipping()
-				? sprintf( ' <small>(' . __( 'estimated for %s', 'woocommerce' ) . ')</small>', WC()->countries->estimated_for_prefix() . __( WC()->countries->countries[ WC()->countries->get_base_country() ], 'woocommerce' ) )
-				: '';
+			$taxable_address = WC()->customer->get_taxable_address();
+			$estimated_text  = WC()->customer->is_customer_outside_base() && ! WC()->customer->has_calculated_shipping()
+					? sprintf( ' <small>' . __( '(estimated for %s)', 'woocommerce' ) . '</small>', WC()->countries->estimated_for_prefix( $taxable_address[0] ) . WC()->countries->countries[ $taxable_address[0] ] )
+					: '';
 
 			if ( 'itemized' === get_option( 'woocommerce_tax_total_display' ) ) : ?>
 				<?php foreach ( WC()->cart->get_tax_totals() as $code => $tax ) : ?>
 					<tr class="tax-rate tax-rate-<?php echo sanitize_title( $code ); ?>">
 						<th><?php echo esc_html( $tax->label ) . $estimated_text; ?></th>
-						<td data-title="<?php echo esc_html( $tax->label ); ?>"><?php echo wp_kses_post( $tax->formatted_amount ); ?></td>
+						<td data-title="<?php echo esc_attr( $tax->label ); ?>"><?php echo wp_kses_post( $tax->formatted_amount ); ?></td>
 					</tr>
 				<?php endforeach; ?>
 			<?php else : ?>
 				<tr class="tax-total">
 					<th><?php echo esc_html( WC()->countries->tax_or_vat() ) . $estimated_text; ?></th>
-					<td data-title="<?php echo esc_html( WC()->countries->tax_or_vat() ); ?>"><?php wc_cart_totals_taxes_total_html(); ?></td>
+					<td data-title="<?php echo esc_attr( WC()->countries->tax_or_vat() ); ?>"><?php wc_cart_totals_taxes_total_html(); ?></td>
 				</tr>
 			<?php endif; ?>
 		<?php endif; ?>
@@ -88,7 +90,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 		<tr class="order-total">
 			<th><?php _e( 'Total', 'woocommerce' ); ?></th>
-			<td data-title="<?php _e( 'Total', 'woocommerce' ); ?>"><?php wc_cart_totals_order_total_html(); ?></td>
+			<td data-title="<?php esc_attr_e( 'Total', 'woocommerce' ); ?>"><?php wc_cart_totals_order_total_html(); ?></td>
 		</tr>
 
 		<?php do_action( 'woocommerce_cart_totals_after_order_total' ); ?>
diff --git a/templates/cart/cart.php b/templates/cart/cart.php
index 2d335e76242..68e73a0552e 100644
--- a/templates/cart/cart.php
+++ b/templates/cart/cart.php
@@ -4,161 +4,165 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/cart/cart.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see     http://docs.woothemes.com/document/template-structure/
+ * @see     https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
- * @version 2.3.8
+ * @version 3.0.3
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
 wc_print_notices();
 
 do_action( 'woocommerce_before_cart' ); ?>
 
-<form action="<?php echo esc_url( wc_get_cart_url() ); ?>" method="post">
+<form class="woocommerce-cart-form" action="<?php echo esc_url( wc_get_cart_url() ); ?>" method="post">
+	<?php do_action( 'woocommerce_before_cart_table' ); ?>
 
-<?php do_action( 'woocommerce_before_cart_table' ); ?>
+	<table class="shop_table shop_table_responsive cart woocommerce-cart-form__contents" cellspacing="0">
+		<thead>
+			<tr>
+				<th class="product-remove">&nbsp;</th>
+				<th class="product-thumbnail">&nbsp;</th>
+				<th class="product-name"><?php _e( 'Product', 'woocommerce' ); ?></th>
+				<th class="product-price"><?php _e( 'Price', 'woocommerce' ); ?></th>
+				<th class="product-quantity"><?php _e( 'Quantity', 'woocommerce' ); ?></th>
+				<th class="product-subtotal"><?php _e( 'Total', 'woocommerce' ); ?></th>
+			</tr>
+		</thead>
+		<tbody>
+			<?php do_action( 'woocommerce_before_cart_contents' ); ?>
 
-<table class="shop_table shop_table_responsive cart" cellspacing="0">
-	<thead>
-		<tr>
-			<th class="product-remove">&nbsp;</th>
-			<th class="product-thumbnail">&nbsp;</th>
-			<th class="product-name"><?php _e( 'Product', 'woocommerce' ); ?></th>
-			<th class="product-price"><?php _e( 'Price', 'woocommerce' ); ?></th>
-			<th class="product-quantity"><?php _e( 'Quantity', 'woocommerce' ); ?></th>
-			<th class="product-subtotal"><?php _e( 'Total', 'woocommerce' ); ?></th>
-		</tr>
-	</thead>
-	<tbody>
-		<?php do_action( 'woocommerce_before_cart_contents' ); ?>
+			<?php
+			foreach ( WC()->cart->get_cart() as $cart_item_key => $cart_item ) {
+				$_product   = apply_filters( 'woocommerce_cart_item_product', $cart_item['data'], $cart_item, $cart_item_key );
+				$product_id = apply_filters( 'woocommerce_cart_item_product_id', $cart_item['product_id'], $cart_item, $cart_item_key );
 
-		<?php
-		foreach ( WC()->cart->get_cart() as $cart_item_key => $cart_item ) {
-			$_product     = apply_filters( 'woocommerce_cart_item_product', $cart_item['data'], $cart_item, $cart_item_key );
-			$product_id   = apply_filters( 'woocommerce_cart_item_product_id', $cart_item['product_id'], $cart_item, $cart_item_key );
+				if ( $_product && $_product->exists() && $cart_item['quantity'] > 0 && apply_filters( 'woocommerce_cart_item_visible', true, $cart_item, $cart_item_key ) ) {
+					$product_permalink = apply_filters( 'woocommerce_cart_item_permalink', $_product->is_visible() ? $_product->get_permalink( $cart_item ) : '', $cart_item, $cart_item_key );
+					?>
+					<tr class="woocommerce-cart-form__cart-item <?php echo esc_attr( apply_filters( 'woocommerce_cart_item_class', 'cart_item', $cart_item, $cart_item_key ) ); ?>">
 
-			if ( $_product && $_product->exists() && $cart_item['quantity'] > 0 && apply_filters( 'woocommerce_cart_item_visible', true, $cart_item, $cart_item_key ) ) {
-				?>
-				<tr class="<?php echo esc_attr( apply_filters( 'woocommerce_cart_item_class', 'cart_item', $cart_item, $cart_item_key ) ); ?>">
+						<td class="product-remove">
+							<?php
+								echo apply_filters( 'woocommerce_cart_item_remove_link', sprintf(
+									'<a href="%s" class="remove" aria-label="%s" data-product_id="%s" data-product_sku="%s">&times;</a>',
+									esc_url( WC()->cart->get_remove_url( $cart_item_key ) ),
+									__( 'Remove this item', 'woocommerce' ),
+									esc_attr( $product_id ),
+									esc_attr( $_product->get_sku() )
+								), $cart_item_key );
+							?>
+						</td>
 
-					<td class="product-remove">
-						<?php
-							echo apply_filters( 'woocommerce_cart_item_remove_link', sprintf(
-								'<a href="%s" class="remove" title="%s" data-product_id="%s" data-product_sku="%s">&times;</a>',
-								esc_url( WC()->cart->get_remove_url( $cart_item_key ) ),
-								__( 'Remove this item', 'woocommerce' ),
-								esc_attr( $product_id ),
-								esc_attr( $_product->get_sku() )
-							), $cart_item_key );
-						?>
-					</td>
+						<td class="product-thumbnail">
+							<?php
+								$thumbnail = apply_filters( 'woocommerce_cart_item_thumbnail', $_product->get_image(), $cart_item, $cart_item_key );
 
-					<td class="product-thumbnail">
-						<?php
-							$thumbnail = apply_filters( 'woocommerce_cart_item_thumbnail', $_product->get_image(), $cart_item, $cart_item_key );
+								if ( ! $product_permalink ) {
+									echo $thumbnail;
+								} else {
+									printf( '<a href="%s">%s</a>', esc_url( $product_permalink ), $thumbnail );
+								}
+							?>
+						</td>
 
-							if ( ! $_product->is_visible() ) {
-								echo $thumbnail;
-							} else {
-								printf( '<a href="%s">%s</a>', esc_url( $_product->get_permalink( $cart_item ) ), $thumbnail );
-							}
-						?>
-					</td>
+						<td class="product-name" data-title="<?php esc_attr_e( 'Product', 'woocommerce' ); ?>">
+							<?php
+								if ( ! $product_permalink ) {
+									echo apply_filters( 'woocommerce_cart_item_name', $_product->get_name(), $cart_item, $cart_item_key ) . '&nbsp;';
+								} else {
+									echo apply_filters( 'woocommerce_cart_item_name', sprintf( '<a href="%s">%s</a>', esc_url( $product_permalink ), $_product->get_name() ), $cart_item, $cart_item_key );
+								}
 
-					<td class="product-name" data-title="<?php _e( 'Product', 'woocommerce' ); ?>">
-						<?php
-							if ( ! $_product->is_visible() ) {
-								echo apply_filters( 'woocommerce_cart_item_name', $_product->get_title(), $cart_item, $cart_item_key ) . '&nbsp;';
-							} else {
-								echo apply_filters( 'woocommerce_cart_item_name', sprintf( '<a href="%s">%s </a>', esc_url( $_product->get_permalink( $cart_item ) ), $_product->get_title() ), $cart_item, $cart_item_key );
-							}
+								// Meta data
+								echo WC()->cart->get_item_data( $cart_item );
 
-							// Meta data
-							echo WC()->cart->get_item_data( $cart_item );
+								// Backorder notification
+								if ( $_product->backorders_require_notification() && $_product->is_on_backorder( $cart_item['quantity'] ) ) {
+									echo '<p class="backorder_notification">' . esc_html__( 'Available on backorder', 'woocommerce' ) . '</p>';
+								}
+							?>
+						</td>
 
-							// Backorder notification
-							if ( $_product->backorders_require_notification() && $_product->is_on_backorder( $cart_item['quantity'] ) ) {
-								echo '<p class="backorder_notification">' . esc_html__( 'Available on backorder', 'woocommerce' ) . '</p>';
-							}
-						?>
-					</td>
+						<td class="product-price" data-title="<?php esc_attr_e( 'Price', 'woocommerce' ); ?>">
+							<?php
+								echo apply_filters( 'woocommerce_cart_item_price', WC()->cart->get_product_price( $_product ), $cart_item, $cart_item_key );
+							?>
+						</td>
 
-					<td class="product-price" data-title="<?php _e( 'Price', 'woocommerce' ); ?>">
-						<?php
-							echo apply_filters( 'woocommerce_cart_item_price', WC()->cart->get_product_price( $_product ), $cart_item, $cart_item_key );
-						?>
-					</td>
+						<td class="product-quantity" data-title="<?php esc_attr_e( 'Quantity', 'woocommerce' ); ?>">
+							<?php
+								if ( $_product->is_sold_individually() ) {
+									$product_quantity = sprintf( '1 <input type="hidden" name="cart[%s][qty]" value="1" />', $cart_item_key );
+								} else {
+									$product_quantity = woocommerce_quantity_input( array(
+										'input_name'  => "cart[{$cart_item_key}][qty]",
+										'input_value' => $cart_item['quantity'],
+										'max_value'   => $_product->backorders_allowed() ? '' : $_product->get_stock_quantity(),
+										'min_value'   => '0',
+									), $_product, false );
+								}
 
-					<td class="product-quantity" data-title="<?php _e( 'Quantity', 'woocommerce' ); ?>">
-						<?php
-							if ( $_product->is_sold_individually() ) {
-								$product_quantity = sprintf( '1 <input type="hidden" name="cart[%s][qty]" value="1" />', $cart_item_key );
-							} else {
-								$product_quantity = woocommerce_quantity_input( array(
-									'input_name'  => "cart[{$cart_item_key}][qty]",
-									'input_value' => $cart_item['quantity'],
-									'max_value'   => $_product->backorders_allowed() ? '' : $_product->get_stock_quantity(),
-									'min_value'   => '0'
-								), $_product, false );
-							}
+								echo apply_filters( 'woocommerce_cart_item_quantity', $product_quantity, $cart_item_key, $cart_item );
+							?>
+						</td>
 
-							echo apply_filters( 'woocommerce_cart_item_quantity', $product_quantity, $cart_item_key, $cart_item );
-						?>
-					</td>
-
-					<td class="product-subtotal" data-title="<?php _e( 'Total', 'woocommerce' ); ?>">
-						<?php
-							echo apply_filters( 'woocommerce_cart_item_subtotal', WC()->cart->get_product_subtotal( $_product, $cart_item['quantity'] ), $cart_item, $cart_item_key );
-						?>
-					</td>
-				</tr>
-				<?php
+						<td class="product-subtotal" data-title="<?php esc_attr_e( 'Total', 'woocommerce' ); ?>">
+							<?php
+								echo apply_filters( 'woocommerce_cart_item_subtotal', WC()->cart->get_product_subtotal( $_product, $cart_item['quantity'] ), $cart_item, $cart_item_key );
+							?>
+						</td>
+					</tr>
+					<?php
+				}
 			}
-		}
+			?>
 
-		do_action( 'woocommerce_cart_contents' );
-		?>
-		<tr>
-			<td colspan="6" class="actions">
+			<?php do_action( 'woocommerce_cart_contents' ); ?>
 
-				<?php if ( wc_coupons_enabled() ) { ?>
-					<div class="coupon">
+			<tr>
+				<td colspan="6" class="actions">
 
-						<label for="coupon_code"><?php _e( 'Coupon', 'woocommerce' ); ?>:</label> <input type="text" name="coupon_code" class="input-text" id="coupon_code" value="" placeholder="<?php esc_attr_e( 'Coupon code', 'woocommerce' ); ?>" /> <input type="submit" class="button" name="apply_coupon" value="<?php esc_attr_e( 'Apply Coupon', 'woocommerce' ); ?>" />
+					<?php if ( wc_coupons_enabled() ) { ?>
+						<div class="coupon">
+							<label for="coupon_code"><?php _e( 'Coupon:', 'woocommerce' ); ?></label> <input type="text" name="coupon_code" class="input-text" id="coupon_code" value="" placeholder="<?php esc_attr_e( 'Coupon code', 'woocommerce' ); ?>" /> <input type="submit" class="button" name="apply_coupon" value="<?php esc_attr_e( 'Apply coupon', 'woocommerce' ); ?>" />
+							<?php do_action( 'woocommerce_cart_coupon' ); ?>
+						</div>
+					<?php } ?>
 
-						<?php do_action( 'woocommerce_cart_coupon' ); ?>
-					</div>
-				<?php } ?>
+					<input type="submit" class="button" name="update_cart" value="<?php esc_attr_e( 'Update cart', 'woocommerce' ); ?>" />
 
-				<input type="submit" class="button" name="update_cart" value="<?php esc_attr_e( 'Update Cart', 'woocommerce' ); ?>" />
+					<?php do_action( 'woocommerce_cart_actions' ); ?>
 
-				<?php do_action( 'woocommerce_cart_actions' ); ?>
-
-				<?php wp_nonce_field( 'woocommerce-cart' ); ?>
-			</td>
-		</tr>
-
-		<?php do_action( 'woocommerce_after_cart_contents' ); ?>
-	</tbody>
-</table>
-
-<?php do_action( 'woocommerce_after_cart_table' ); ?>
+					<?php wp_nonce_field( 'woocommerce-cart' ); ?>
+				</td>
+			</tr>
 
+			<?php do_action( 'woocommerce_after_cart_contents' ); ?>
+		</tbody>
+	</table>
+	<?php do_action( 'woocommerce_after_cart_table' ); ?>
 </form>
 
 <div class="cart-collaterals">
-
-	<?php do_action( 'woocommerce_cart_collaterals' ); ?>
-
+	<?php
+		/**
+		 * woocommerce_cart_collaterals hook.
+		 *
+		 * @hooked woocommerce_cross_sell_display
+		 * @hooked woocommerce_cart_totals - 10
+		 */
+	 	do_action( 'woocommerce_cart_collaterals' );
+	?>
 </div>
 
 <?php do_action( 'woocommerce_after_cart' ); ?>
diff --git a/templates/cart/cross-sells.php b/templates/cart/cross-sells.php
index 05438fccb80..8a0376add89 100644
--- a/templates/cart/cross-sells.php
+++ b/templates/cart/cross-sells.php
@@ -4,44 +4,23 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/cart/cross-sells.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
- * @version     1.6.4
+ * @version     3.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
-global $product, $woocommerce_loop;
-
-$crosssells = WC()->cart->get_cross_sells();
-
-if ( 0 === sizeof( $crosssells ) ) return;
-
-$meta_query = WC()->query->get_meta_query();
-
-$args = array(
-	'post_type'           => 'product',
-	'ignore_sticky_posts' => 1,
-	'no_found_rows'       => 1,
-	'posts_per_page'      => apply_filters( 'woocommerce_cross_sells_total', $posts_per_page ),
-	'orderby'             => $orderby,
-	'post__in'            => $crosssells,
-	'meta_query'          => $meta_query
-);
-
-$products = new WP_Query( $args );
-
-$woocommerce_loop['columns'] = apply_filters( 'woocommerce_cross_sells_columns', $columns );
-
-if ( $products->have_posts() ) : ?>
+if ( $cross_sells ) : ?>
 
 	<div class="cross-sells">
 
@@ -49,11 +28,16 @@ if ( $products->have_posts() ) : ?>
 
 		<?php woocommerce_product_loop_start(); ?>
 
-			<?php while ( $products->have_posts() ) : $products->the_post(); ?>
+			<?php foreach ( $cross_sells as $cross_sell ) : ?>
 
-				<?php wc_get_template_part( 'content', 'product' ); ?>
+				<?php
+				 	$post_object = get_post( $cross_sell->get_id() );
 
-			<?php endwhile; // end of the loop. ?>
+					setup_postdata( $GLOBALS['post'] =& $post_object );
+
+					wc_get_template_part( 'content', 'product' ); ?>
+
+			<?php endforeach; ?>
 
 		<?php woocommerce_product_loop_end(); ?>
 
@@ -61,4 +45,4 @@ if ( $products->have_posts() ) : ?>
 
 <?php endif;
 
-wp_reset_query();
+wp_reset_postdata();
diff --git a/templates/cart/mini-cart.php b/templates/cart/mini-cart.php
index a91eb191f07..f1dd6e1a4a7 100644
--- a/templates/cart/mini-cart.php
+++ b/templates/cart/mini-cart.php
@@ -6,44 +6,43 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/cart/mini-cart.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see     http://docs.woothemes.com/document/template-structure/
+ * @see     https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
- * @version 2.5.0
+ * @version 3.1.0
  */
-
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
-?>
+do_action( 'woocommerce_before_mini_cart' ); ?>
 
-<?php do_action( 'woocommerce_before_mini_cart' ); ?>
-
-<ul class="cart_list product_list_widget <?php echo $args['list_class']; ?>">
-
-	<?php if ( ! WC()->cart->is_empty() ) : ?>
+<?php if ( ! WC()->cart->is_empty() ) : ?>
 
+	<ul class="woocommerce-mini-cart cart_list product_list_widget <?php echo esc_attr( $args['list_class'] ); ?>">
 		<?php
+			do_action( 'woocommerce_before_mini_cart_contents' );
+
 			foreach ( WC()->cart->get_cart() as $cart_item_key => $cart_item ) {
 				$_product     = apply_filters( 'woocommerce_cart_item_product', $cart_item['data'], $cart_item, $cart_item_key );
 				$product_id   = apply_filters( 'woocommerce_cart_item_product_id', $cart_item['product_id'], $cart_item, $cart_item_key );
 
 				if ( $_product && $_product->exists() && $cart_item['quantity'] > 0 && apply_filters( 'woocommerce_widget_cart_item_visible', true, $cart_item, $cart_item_key ) ) {
-
-					$product_name  = apply_filters( 'woocommerce_cart_item_name', $_product->get_title(), $cart_item, $cart_item_key );
-					$thumbnail     = apply_filters( 'woocommerce_cart_item_thumbnail', $_product->get_image(), $cart_item, $cart_item_key );
-					$product_price = apply_filters( 'woocommerce_cart_item_price', WC()->cart->get_product_price( $_product ), $cart_item, $cart_item_key );
+					$product_name      = apply_filters( 'woocommerce_cart_item_name', $_product->get_name(), $cart_item, $cart_item_key );
+					$thumbnail         = apply_filters( 'woocommerce_cart_item_thumbnail', $_product->get_image(), $cart_item, $cart_item_key );
+					$product_price     = apply_filters( 'woocommerce_cart_item_price', WC()->cart->get_product_price( $_product ), $cart_item, $cart_item_key );
+					$product_permalink = apply_filters( 'woocommerce_cart_item_permalink', $_product->is_visible() ? $_product->get_permalink( $cart_item ) : '', $cart_item, $cart_item_key );
 					?>
-					<li class="<?php echo esc_attr( apply_filters( 'woocommerce_mini_cart_item_class', 'mini_cart_item', $cart_item, $cart_item_key ) ); ?>">
+					<li class="woocommerce-mini-cart-item <?php echo esc_attr( apply_filters( 'woocommerce_mini_cart_item_class', 'mini_cart_item', $cart_item, $cart_item_key ) ); ?>">
 						<?php
 						echo apply_filters( 'woocommerce_cart_item_remove_link', sprintf(
-							'<a href="%s" class="remove" title="%s" data-product_id="%s" data-product_sku="%s">&times;</a>',
+							'<a href="%s" class="remove" aria-label="%s" data-product_id="%s" data-product_sku="%s">&times;</a>',
 							esc_url( WC()->cart->get_remove_url( $cart_item_key ) ),
 							__( 'Remove this item', 'woocommerce' ),
 							esc_attr( $product_id ),
@@ -53,7 +52,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 						<?php if ( ! $_product->is_visible() ) : ?>
 							<?php echo str_replace( array( 'http:', 'https:' ), '', $thumbnail ) . $product_name . '&nbsp;'; ?>
 						<?php else : ?>
-							<a href="<?php echo esc_url( $_product->get_permalink( $cart_item ) ); ?>">
+							<a href="<?php echo esc_url( $product_permalink ); ?>">
 								<?php echo str_replace( array( 'http:', 'https:' ), '', $thumbnail ) . $product_name . '&nbsp;'; ?>
 							</a>
 						<?php endif; ?>
@@ -64,26 +63,20 @@ if ( ! defined( 'ABSPATH' ) ) {
 					<?php
 				}
 			}
+
+			do_action( 'woocommerce_mini_cart_contents' );
 		?>
+	</ul>
 
-	<?php else : ?>
-
-		<li class="empty"><?php _e( 'No products in the cart.', 'woocommerce' ); ?></li>
-
-	<?php endif; ?>
-
-</ul><!-- end product list -->
-
-<?php if ( ! WC()->cart->is_empty() ) : ?>
-
-	<p class="total"><strong><?php _e( 'Subtotal', 'woocommerce' ); ?>:</strong> <?php echo WC()->cart->get_cart_subtotal(); ?></p>
+	<p class="woocommerce-mini-cart__total total"><strong><?php _e( 'Subtotal', 'woocommerce' ); ?>:</strong> <?php echo WC()->cart->get_cart_subtotal(); ?></p>
 
 	<?php do_action( 'woocommerce_widget_shopping_cart_before_buttons' ); ?>
 
-	<p class="buttons">
-		<a href="<?php echo esc_url( wc_get_cart_url() ); ?>" class="button wc-forward"><?php _e( 'View Cart', 'woocommerce' ); ?></a>
-		<a href="<?php echo esc_url( wc_get_checkout_url() ); ?>" class="button checkout wc-forward"><?php _e( 'Checkout', 'woocommerce' ); ?></a>
-	</p>
+	<p class="woocommerce-mini-cart__buttons buttons"><?php do_action( 'woocommerce_widget_shopping_cart_buttons' ); ?></p>
+
+<?php else : ?>
+
+	<p class="woocommerce-mini-cart__empty-message"><?php _e( 'No products in the cart.', 'woocommerce' ); ?></p>
 
 <?php endif; ?>
 
diff --git a/templates/cart/proceed-to-checkout-button.php b/templates/cart/proceed-to-checkout-button.php
index 9a9a765eaa5..33069918b9b 100644
--- a/templates/cart/proceed-to-checkout-button.php
+++ b/templates/cart/proceed-to-checkout-button.php
@@ -6,22 +6,23 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/cart/proceed-to-checkout-button.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see     http://docs.woothemes.com/document/template-structure/
+ * @see     https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
  * @version 2.4.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit; // Exit if accessed directly.
 }
 ?>
 
-<a href="<?php echo esc_url( wc_get_checkout_url() ) ;?>" class="checkout-button button alt wc-forward">
-	<?php echo __( 'Proceed to Checkout', 'woocommerce' ); ?>
+<a href="<?php echo esc_url( wc_get_checkout_url() );?>" class="checkout-button button alt wc-forward">
+	<?php esc_html_e( 'Proceed to checkout', 'woocommerce' ); ?>
 </a>
diff --git a/templates/cart/shipping-calculator.php b/templates/cart/shipping-calculator.php
index cad352770af..08e7cf2aef8 100644
--- a/templates/cart/shipping-calculator.php
+++ b/templates/cart/shipping-calculator.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/cart/shipping-calculator.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     2.0.8
@@ -29,7 +30,7 @@ if ( 'no' === get_option( 'woocommerce_enable_shipping_calc' ) || ! WC()->cart->
 
 <form class="woocommerce-shipping-calculator" action="<?php echo esc_url( wc_get_cart_url() ); ?>" method="post">
 
-	<p><a href="#" class="shipping-calculator-button"><?php _e( 'Calculate Shipping', 'woocommerce' ); ?></a></p>
+	<p><a href="#" class="shipping-calculator-button"><?php _e( 'Calculate shipping', 'woocommerce' ); ?></a></p>
 
 	<section class="shipping-calculator-form" style="display:none;">
 
@@ -37,8 +38,9 @@ if ( 'no' === get_option( 'woocommerce_enable_shipping_calc' ) || ! WC()->cart->
 			<select name="calc_shipping_country" id="calc_shipping_country" class="country_to_state" rel="calc_shipping_state">
 				<option value=""><?php _e( 'Select a country&hellip;', 'woocommerce' ); ?></option>
 				<?php
-					foreach( WC()->countries->get_shipping_countries() as $key => $value )
+					foreach ( WC()->countries->get_shipping_countries() as $key => $value ) {
 						echo '<option value="' . esc_attr( $key ) . '"' . selected( WC()->customer->get_shipping_country(), esc_attr( $key ), false ) . '>' . esc_html( $value ) . '</option>';
+					}
 				?>
 			</select>
 		</p>
@@ -52,17 +54,18 @@ if ( 'no' === get_option( 'woocommerce_enable_shipping_calc' ) || ! WC()->cart->
 				// Hidden Input
 				if ( is_array( $states ) && empty( $states ) ) {
 
-					?><input type="hidden" name="calc_shipping_state" id="calc_shipping_state" placeholder="<?php esc_attr_e( 'State / county', 'woocommerce' ); ?>" /><?php
+					?><input type="hidden" name="calc_shipping_state" id="calc_shipping_state" placeholder="<?php esc_attr_e( 'State / County', 'woocommerce' ); ?>" /><?php
 
 				// Dropdown Input
 				} elseif ( is_array( $states ) ) {
 
 					?><span>
-						<select name="calc_shipping_state" id="calc_shipping_state" placeholder="<?php esc_attr_e( 'State / county', 'woocommerce' ); ?>">
-							<option value=""><?php _e( 'Select a state&hellip;', 'woocommerce' ); ?></option>
+						<select name="calc_shipping_state" id="calc_shipping_state" placeholder="<?php esc_attr_e( 'State / County', 'woocommerce' ); ?>">
+							<option value=""><?php esc_html_e( 'Select a state&hellip;', 'woocommerce' ); ?></option>
 							<?php
-								foreach ( $states as $ckey => $cvalue )
-									echo '<option value="' . esc_attr( $ckey ) . '" ' . selected( $current_r, $ckey, false ) . '>' . __( esc_html( $cvalue ), 'woocommerce' ) .'</option>';
+								foreach ( $states as $ckey => $cvalue ) {
+									echo '<option value="' . esc_attr( $ckey ) . '" ' . selected( $current_r, $ckey, false ) . '>' . esc_html( $cvalue ) . '</option>';
+								}
 							?>
 						</select>
 					</span><?php
@@ -70,7 +73,7 @@ if ( 'no' === get_option( 'woocommerce_enable_shipping_calc' ) || ! WC()->cart->
 				// Standard Input
 				} else {
 
-					?><input type="text" class="input-text" value="<?php echo esc_attr( $current_r ); ?>" placeholder="<?php esc_attr_e( 'State / county', 'woocommerce' ); ?>" name="calc_shipping_state" id="calc_shipping_state" /><?php
+					?><input type="text" class="input-text" value="<?php echo esc_attr( $current_r ); ?>" placeholder="<?php esc_attr_e( 'State / County', 'woocommerce' ); ?>" name="calc_shipping_state" id="calc_shipping_state" /><?php
 
 				}
 			?>
@@ -92,7 +95,7 @@ if ( 'no' === get_option( 'woocommerce_enable_shipping_calc' ) || ! WC()->cart->
 
 		<?php endif; ?>
 
-		<p><button type="submit" name="calc_shipping" value="1" class="button"><?php _e( 'Update Totals', 'woocommerce' ); ?></button></p>
+		<p><button type="submit" name="calc_shipping" value="1" class="button"><?php _e( 'Update totals', 'woocommerce' ); ?></button></p>
 
 		<?php wp_nonce_field( 'woocommerce-cart' ); ?>
 	</section>
diff --git a/templates/checkout/cart-errors.php b/templates/checkout/cart-errors.php
index 9a70a30435a..a50eef6e0a5 100644
--- a/templates/checkout/cart-errors.php
+++ b/templates/checkout/cart-errors.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/checkout/cart-errors.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
  * @version 2.4.0
@@ -27,4 +28,4 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 <?php do_action( 'woocommerce_cart_has_errors' ); ?>
 
-<p><a class="button wc-backward" href="<?php echo esc_url( wc_get_page_permalink( 'cart' ) ); ?>"><?php _e( 'Return To Cart', 'woocommerce' ) ?></a></p>
+<p><a class="button wc-backward" href="<?php echo esc_url( wc_get_page_permalink( 'cart' ) ); ?>"><?php _e( 'Return to cart', 'woocommerce' ) ?></a></p>
diff --git a/templates/checkout/form-billing.php b/templates/checkout/form-billing.php
index 0b660896fe5..3efcf3a1c03 100644
--- a/templates/checkout/form-billing.php
+++ b/templates/checkout/form-billing.php
@@ -4,15 +4,16 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/checkout/form-billing.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see     http://docs.woothemes.com/document/template-structure/
+ * @see     https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
- * @version 2.1.2
+ * @version 3.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -29,51 +30,46 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 	<?php else : ?>
 
-		<h3><?php _e( 'Billing Details', 'woocommerce' ); ?></h3>
+		<h3><?php _e( 'Billing details', 'woocommerce' ); ?></h3>
 
 	<?php endif; ?>
 
 	<?php do_action( 'woocommerce_before_checkout_billing_form', $checkout ); ?>
 
-	<?php foreach ( $checkout->checkout_fields['billing'] as $key => $field ) : ?>
+	<div class="woocommerce-billing-fields__field-wrapper">
+		<?php foreach ( $checkout->get_checkout_fields( 'billing' ) as $key => $field ) : ?>
+			<?php woocommerce_form_field( $key, $field, $checkout->get_value( $key ) ); ?>
+		<?php endforeach; ?>
+	</div>
 
-		<?php woocommerce_form_field( $key, $field, $checkout->get_value( $key ) ); ?>
+	<?php do_action( 'woocommerce_after_checkout_billing_form', $checkout ); ?>
+</div>
 
-	<?php endforeach; ?>
-
-	<?php do_action('woocommerce_after_checkout_billing_form', $checkout ); ?>
-
-	<?php if ( ! is_user_logged_in() && $checkout->enable_signup ) : ?>
-
-		<?php if ( $checkout->enable_guest_checkout ) : ?>
+<?php if ( ! is_user_logged_in() && $checkout->is_registration_enabled() ) : ?>
+	<div class="woocommerce-account-fields">
+		<?php if ( ! $checkout->is_registration_required() ) : ?>
 
 			<p class="form-row form-row-wide create-account">
-				<input class="input-checkbox" id="createaccount" <?php checked( ( true === $checkout->get_value( 'createaccount' ) || ( true === apply_filters( 'woocommerce_create_account_default_checked', false ) ) ), true) ?> type="checkbox" name="createaccount" value="1" /> <label for="createaccount" class="checkbox"><?php _e( 'Create an account?', 'woocommerce' ); ?></label>
+				<label class="woocommerce-form__label woocommerce-form__label-for-checkbox checkbox">
+					<input class="woocommerce-form__input woocommerce-form__input-checkbox input-checkbox" id="createaccount" <?php checked( ( true === $checkout->get_value( 'createaccount' ) || ( true === apply_filters( 'woocommerce_create_account_default_checked', false ) ) ), true ) ?> type="checkbox" name="createaccount" value="1" /> <span><?php _e( 'Create an account?', 'woocommerce' ); ?></span>
+				</label>
 			</p>
 
 		<?php endif; ?>
 
 		<?php do_action( 'woocommerce_before_checkout_registration_form', $checkout ); ?>
 
-		<?php if ( ! empty( $checkout->checkout_fields['account'] ) ) : ?>
+		<?php if ( $checkout->get_checkout_fields( 'account' ) ) : ?>
 
 			<div class="create-account">
-
-				<p><?php _e( 'Create an account by entering the information below. If you are a returning customer please login at the top of the page.', 'woocommerce' ); ?></p>
-
-				<?php foreach ( $checkout->checkout_fields['account'] as $key => $field ) : ?>
-
+				<?php foreach ( $checkout->get_checkout_fields( 'account' ) as $key => $field ) : ?>
 					<?php woocommerce_form_field( $key, $field, $checkout->get_value( $key ) ); ?>
-
 				<?php endforeach; ?>
-
 				<div class="clear"></div>
-
 			</div>
 
 		<?php endif; ?>
 
 		<?php do_action( 'woocommerce_after_checkout_registration_form', $checkout ); ?>
-
-	<?php endif; ?>
-</div>
+	</div>
+<?php endif; ?>
diff --git a/templates/checkout/form-checkout.php b/templates/checkout/form-checkout.php
index 31f1e18e91c..1249303e042 100644
--- a/templates/checkout/form-checkout.php
+++ b/templates/checkout/form-checkout.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/checkout/form-checkout.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     2.3.0
@@ -24,7 +25,7 @@ wc_print_notices();
 do_action( 'woocommerce_before_checkout_form', $checkout );
 
 // If checkout registration is disabled and not logged in, the user cannot checkout
-if ( ! $checkout->enable_signup && ! $checkout->enable_guest_checkout && ! is_user_logged_in() ) {
+if ( ! $checkout->is_registration_enabled() && $checkout->is_registration_required() && ! is_user_logged_in() ) {
 	echo apply_filters( 'woocommerce_checkout_must_be_logged_in_message', __( 'You must be logged in to checkout.', 'woocommerce' ) );
 	return;
 }
@@ -33,7 +34,7 @@ if ( ! $checkout->enable_signup && ! $checkout->enable_guest_checkout && ! is_us
 
 <form name="checkout" method="post" class="checkout woocommerce-checkout" action="<?php echo esc_url( wc_get_checkout_url() ); ?>" enctype="multipart/form-data">
 
-	<?php if ( sizeof( $checkout->checkout_fields ) > 0 ) : ?>
+	<?php if ( $checkout->get_checkout_fields() ) : ?>
 
 		<?php do_action( 'woocommerce_checkout_before_customer_details' ); ?>
 
diff --git a/templates/checkout/form-coupon.php b/templates/checkout/form-coupon.php
index 3f3b486945c..d9c71293937 100644
--- a/templates/checkout/form-coupon.php
+++ b/templates/checkout/form-coupon.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/checkout/form-coupon.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see     http://docs.woothemes.com/document/template-structure/
+ * @see     https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
  * @version 2.2
@@ -23,9 +24,9 @@ if ( ! wc_coupons_enabled() ) {
 	return;
 }
 
-if ( ! WC()->cart->applied_coupons ) {
-    $info_message = apply_filters( 'woocommerce_checkout_coupon_message', __( 'Have a coupon?', 'woocommerce' ) . ' <a href="#" class="showcoupon">' . __( 'Click here to enter your code', 'woocommerce' ) . '</a>' );
-    wc_print_notice( $info_message, 'notice' );
+if ( empty( WC()->cart->applied_coupons ) ) {
+	$info_message = apply_filters( 'woocommerce_checkout_coupon_message', __( 'Have a coupon?', 'woocommerce' ) . ' <a href="#" class="showcoupon">' . __( 'Click here to enter your code', 'woocommerce' ) . '</a>' );
+	wc_print_notice( $info_message, 'notice' );
 }
 ?>
 
@@ -36,7 +37,7 @@ if ( ! WC()->cart->applied_coupons ) {
 	</p>
 
 	<p class="form-row form-row-last">
-		<input type="submit" class="button" name="apply_coupon" value="<?php esc_attr_e( 'Apply Coupon', 'woocommerce' ); ?>" />
+		<input type="submit" class="button" name="apply_coupon" value="<?php esc_attr_e( 'Apply coupon', 'woocommerce' ); ?>" />
 	</p>
 
 	<div class="clear"></div>
diff --git a/templates/checkout/form-login.php b/templates/checkout/form-login.php
index ab2aabfd742..15ff3937401 100644
--- a/templates/checkout/form-login.php
+++ b/templates/checkout/form-login.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/checkout/form-login.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     2.0.0
@@ -26,14 +27,13 @@ if ( is_user_logged_in() || 'no' === get_option( 'woocommerce_enable_checkout_lo
 $info_message  = apply_filters( 'woocommerce_checkout_login_message', __( 'Returning customer?', 'woocommerce' ) );
 $info_message .= ' <a href="#" class="showlogin">' . __( 'Click here to login', 'woocommerce' ) . '</a>';
 wc_print_notice( $info_message, 'notice' );
-?>
 
-<?php
-	woocommerce_login_form(
-		array(
-			'message'  => __( 'If you have shopped with us before, please enter your details in the boxes below. If you are a new customer, please proceed to the Billing &amp; Shipping section.', 'woocommerce' ),
-			'redirect' => wc_get_page_permalink( 'checkout' ),
-			'hidden'   => true
-		)
-	);
-?>
+woocommerce_login_form(
+	array(
+		'message'  => __( 'If you have shopped with us before, please enter your details in the boxes below. If you are a new customer, please proceed to the Billing &amp; Shipping section.', 'woocommerce' ),
+		'redirect' => wc_get_page_permalink( 'checkout' ),
+		'hidden'   => true,
+	)
+);
+
+/* Omit closing PHP tag at the end of PHP files to avoid "headers already sent" issues. */
diff --git a/templates/checkout/form-pay.php b/templates/checkout/form-pay.php
index abc18a752e5..66a5437ec51 100644
--- a/templates/checkout/form-pay.php
+++ b/templates/checkout/form-pay.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/checkout/form-pay.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see      https://docs.woocommerce.com/document/template-structure/
  * @author   WooThemes
  * @package  WooCommerce/Templates
  * @version  2.5.0
@@ -32,13 +33,25 @@ if ( ! defined( 'ABSPATH' ) ) {
 		</thead>
 		<tbody>
 			<?php if ( sizeof( $order->get_items() ) > 0 ) : ?>
-				<?php foreach ( $order->get_items() as $item ) : ?>
-					<tr>
+				<?php foreach ( $order->get_items() as $item_id => $item ) : ?>
+					<?php
+						if ( ! apply_filters( 'woocommerce_order_item_visible', true, $item ) ) {
+							continue;
+						}
+					?>
+					<tr class="<?php echo esc_attr( apply_filters( 'woocommerce_order_item_class', 'order_item', $item, $order ) ); ?>">
 						<td class="product-name">
-							<?php echo esc_html( $item['name'] ); ?>
-							<?php $order->display_item_meta( $item ); ?>
+							<?php
+								echo apply_filters( 'woocommerce_order_item_name', esc_html( $item->get_name() ), $item, false );
+
+								do_action( 'woocommerce_order_item_meta_start', $item_id, $item, $order );
+
+								wc_display_item_meta( $item );
+
+								do_action( 'woocommerce_order_item_meta_end', $item_id, $item, $order );
+							?>
 						</td>
-						<td class="product-quantity"><?php echo esc_html( $item['qty'] ); ?></td>
+						<td class="product-quantity"><?php echo apply_filters( 'woocommerce_order_item_quantity_html', ' <strong class="product-quantity">' . sprintf( '&times; %s', esc_html( $item->get_quantity() ) ) . '</strong>', $item ); ?></td>
 						<td class="product-subtotal"><?php echo $order->get_formatted_line_subtotal( $item ); ?></td>
 					</tr>
 				<?php endforeach; ?>
@@ -65,7 +78,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 							wc_get_template( 'checkout/payment-method.php', array( 'gateway' => $gateway ) );
 						}
 					} else {
-						echo '<li>' . apply_filters( 'woocommerce_no_available_payment_methods_message', __( 'Sorry, it seems that there are no available payment methods for your location. Please contact us if you require assistance or wish to make alternate arrangements.', 'woocommerce' ) ) . '</li>';
+						echo '<li class="woocommerce-notice woocommerce-notice--info woocommerce-info">' . apply_filters( 'woocommerce_no_available_payment_methods_message', __( 'Sorry, it seems that there are no available payment methods for your location. Please contact us if you require assistance or wish to make alternate arrangements.', 'woocommerce' ) ) . '</li>';
 					}
 				?>
 			</ul>
diff --git a/templates/checkout/form-shipping.php b/templates/checkout/form-shipping.php
index a9c4b2269fa..5c3f1d6ee45 100644
--- a/templates/checkout/form-shipping.php
+++ b/templates/checkout/form-shipping.php
@@ -4,15 +4,16 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/checkout/form-shipping.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see     http://docs.woothemes.com/document/template-structure/
+ * @see     https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
- * @version 2.2.0
+ * @version 3.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -23,55 +24,44 @@ if ( ! defined( 'ABSPATH' ) ) {
 <div class="woocommerce-shipping-fields">
 	<?php if ( true === WC()->cart->needs_shipping_address() ) : ?>
 
-		<?php
-			if ( empty( $_POST ) ) {
-
-				$ship_to_different_address = get_option( 'woocommerce_ship_to_destination' ) === 'shipping' ? 1 : 0;
-				$ship_to_different_address = apply_filters( 'woocommerce_ship_to_different_address_checked', $ship_to_different_address );
-
-			} else {
-
-				$ship_to_different_address = $checkout->get_value( 'ship_to_different_address' );
-
-			}
-		?>
-
 		<h3 id="ship-to-different-address">
-			<label for="ship-to-different-address-checkbox" class="checkbox"><?php _e( 'Ship to a different address?', 'woocommerce' ); ?></label>
-			<input id="ship-to-different-address-checkbox" class="input-checkbox" <?php checked( $ship_to_different_address, 1 ); ?> type="checkbox" name="ship_to_different_address" value="1" />
+			<label class="woocommerce-form__label woocommerce-form__label-for-checkbox checkbox">
+				<input id="ship-to-different-address-checkbox" class="woocommerce-form__input woocommerce-form__input-checkbox input-checkbox" <?php checked( apply_filters( 'woocommerce_ship_to_different_address_checked', 'shipping' === get_option( 'woocommerce_ship_to_destination' ) ? 1 : 0 ), 1 ); ?> type="checkbox" name="ship_to_different_address" value="1" /> <span><?php _e( 'Ship to a different address?', 'woocommerce' ); ?></span>
+			</label>
 		</h3>
 
 		<div class="shipping_address">
 
 			<?php do_action( 'woocommerce_before_checkout_shipping_form', $checkout ); ?>
 
-			<?php foreach ( $checkout->checkout_fields['shipping'] as $key => $field ) : ?>
-
-				<?php woocommerce_form_field( $key, $field, $checkout->get_value( $key ) ); ?>
-
-			<?php endforeach; ?>
+			<div class="woocommerce-shipping-fields__field-wrapper">
+				<?php foreach ( $checkout->get_checkout_fields( 'shipping' )  as $key => $field ) : ?>
+					<?php woocommerce_form_field( $key, $field, $checkout->get_value( $key ) ); ?>
+				<?php endforeach; ?>
+			</div>
 
 			<?php do_action( 'woocommerce_after_checkout_shipping_form', $checkout ); ?>
 
 		</div>
 
 	<?php endif; ?>
-
+</div>
+<div class="woocommerce-additional-fields">
 	<?php do_action( 'woocommerce_before_order_notes', $checkout ); ?>
 
-	<?php if ( apply_filters( 'woocommerce_enable_order_notes_field', get_option( 'woocommerce_enable_order_comments', 'yes' ) === 'yes' ) ) : ?>
+	<?php if ( apply_filters( 'woocommerce_enable_order_notes_field', 'yes' === get_option( 'woocommerce_enable_order_comments', 'yes' ) ) ) : ?>
 
 		<?php if ( ! WC()->cart->needs_shipping() || wc_ship_to_billing_address_only() ) : ?>
 
-			<h3><?php _e( 'Additional Information', 'woocommerce' ); ?></h3>
+			<h3><?php _e( 'Additional information', 'woocommerce' ); ?></h3>
 
 		<?php endif; ?>
 
-		<?php foreach ( $checkout->checkout_fields['order'] as $key => $field ) : ?>
-
-			<?php woocommerce_form_field( $key, $field, $checkout->get_value( $key ) ); ?>
-
-		<?php endforeach; ?>
+		<div class="woocommerce-additional-fields__field-wrapper">
+			<?php foreach ( $checkout->get_checkout_fields( 'order' )  as $key => $field ) : ?>
+				<?php woocommerce_form_field( $key, $field, $checkout->get_value( $key ) ); ?>
+			<?php endforeach; ?>
+		</div>
 
 	<?php endif; ?>
 
diff --git a/templates/checkout/payment-method.php b/templates/checkout/payment-method.php
index 39325beccb1..dead8df7953 100644
--- a/templates/checkout/payment-method.php
+++ b/templates/checkout/payment-method.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/checkout/payment-method.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     2.3.0
diff --git a/templates/checkout/payment.php b/templates/checkout/payment.php
index 3b3a8e195e4..656e011d689 100644
--- a/templates/checkout/payment.php
+++ b/templates/checkout/payment.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/checkout/payment.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     2.5.0
@@ -31,7 +32,7 @@ if ( ! is_ajax() ) {
 						wc_get_template( 'checkout/payment-method.php', array( 'gateway' => $gateway ) );
 					}
 				} else {
-					echo '<li>' . apply_filters( 'woocommerce_no_available_payment_methods_message', WC()->customer->get_country() ? __( 'Sorry, it seems that there are no available payment methods for your state. Please contact us if you require assistance or wish to make alternate arrangements.', 'woocommerce' ) : __( 'Please fill in your details above to see available payment methods.', 'woocommerce' ) ) . '</li>';
+					echo '<li class="woocommerce-notice woocommerce-notice--info woocommerce-info">' . apply_filters( 'woocommerce_no_available_payment_methods_message', WC()->customer->get_billing_country() ? __( 'Sorry, it seems that there are no available payment methods for your state. Please contact us if you require assistance or wish to make alternate arrangements.', 'woocommerce' ) : __( 'Please fill in your details above to see available payment methods.', 'woocommerce' ) ) . '</li>';
 				}
 			?>
 		</ul>
diff --git a/templates/checkout/review-order.php b/templates/checkout/review-order.php
index 48717398c05..ac08631f08b 100644
--- a/templates/checkout/review-order.php
+++ b/templates/checkout/review-order.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/checkout/review-order.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     2.3.0
@@ -37,7 +38,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 					?>
 					<tr class="<?php echo esc_attr( apply_filters( 'woocommerce_cart_item_class', 'cart_item', $cart_item, $cart_item_key ) ); ?>">
 						<td class="product-name">
-							<?php echo apply_filters( 'woocommerce_cart_item_name', $_product->get_title(), $cart_item, $cart_item_key ) . '&nbsp;'; ?>
+							<?php echo apply_filters( 'woocommerce_cart_item_name', $_product->get_name(), $cart_item, $cart_item_key ) . '&nbsp;'; ?>
 							<?php echo apply_filters( 'woocommerce_checkout_cart_item_quantity', ' <strong class="product-quantity">' . sprintf( '&times; %s', $cart_item['quantity'] ) . '</strong>', $cart_item, $cart_item_key ); ?>
 							<?php echo WC()->cart->get_item_data( $cart_item ); ?>
 						</td>
diff --git a/templates/checkout/terms.php b/templates/checkout/terms.php
index 6a86d4dc341..2dca4d900e0 100644
--- a/templates/checkout/terms.php
+++ b/templates/checkout/terms.php
@@ -4,16 +4,27 @@
  *
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
- * @version     2.5.0
+ * @version     3.1.0
  */
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
-if ( wc_get_page_id( 'terms' ) > 0 && apply_filters( 'woocommerce_checkout_show_terms', true ) ) : ?>
-    <p class="form-row terms wc-terms-and-conditions">
-		<input type="checkbox" class="input-checkbox" name="terms" <?php checked( apply_filters( 'woocommerce_terms_is_checked_default', isset( $_POST['terms'] ) ), true ); ?> id="terms" />
-        <label for="terms" class="checkbox"><?php printf( __( 'I&rsquo;ve read and accept the <a href="%s" target="_blank">terms &amp; conditions</a>', 'woocommerce' ), esc_url( wc_get_page_permalink( 'terms' ) ) ); ?> <span class="required">*</span></label>
-        <input type="hidden" name="terms-field" value="1" />
-    </p>
+$terms_page_id = wc_get_page_id( 'terms' );
+
+if ( $terms_page_id > 0 && apply_filters( 'woocommerce_checkout_show_terms', true ) ) :
+	$terms         = get_post( $terms_page_id );
+	$terms_content = wc_format_content( $terms->post_content );
+	?>
+	<?php
+		do_action( 'woocommerce_checkout_before_terms_and_conditions' );
+		echo '<div class="woocommerce-terms-and-conditions" style="display: none; max-height: 200px; overflow: auto;">' . $terms_content . '</div>';
+	?>
+	<p class="form-row terms wc-terms-and-conditions">
+		<label class="woocommerce-form__label woocommerce-form__label-for-checkbox checkbox">
+			<input type="checkbox" class="woocommerce-form__input woocommerce-form__input-checkbox input-checkbox" name="terms" <?php checked( apply_filters( 'woocommerce_terms_is_checked_default', isset( $_POST['terms'] ) ), true ); ?> id="terms" /> <span><?php printf( __( 'I&rsquo;ve read and accept the <a href="%s" class="woocommerce-terms-and-conditions-link">terms &amp; conditions</a>', 'woocommerce' ), esc_url( wc_get_page_permalink( 'terms' ) ) ); ?></span> <span class="required">*</span>
+		</label>
+		<input type="hidden" name="terms-field" value="1" />
+	</p>
+	<?php do_action( 'woocommerce_checkout_after_terms_and_conditions' ); ?>
 <?php endif; ?>
diff --git a/templates/checkout/thankyou.php b/templates/checkout/thankyou.php
index 0f5a40ec7b9..1eea4e92672 100644
--- a/templates/checkout/thankyou.php
+++ b/templates/checkout/thankyou.php
@@ -4,67 +4,79 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/checkout/thankyou.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
- * @version     2.2.0
+ * @version     3.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
+?>
 
-if ( $order ) : ?>
+<div class="woocommerce-order">
 
-	<?php if ( $order->has_status( 'failed' ) ) : ?>
+	<?php if ( $order ) : ?>
 
-		<p class="woocommerce-thankyou-order-failed"><?php _e( 'Unfortunately your order cannot be processed as the originating bank/merchant has declined your transaction. Please attempt your purchase again.', 'woocommerce' ); ?></p>
+		<?php if ( $order->has_status( 'failed' ) ) : ?>
 
-		<p class="woocommerce-thankyou-order-failed-actions">
-			<a href="<?php echo esc_url( $order->get_checkout_payment_url() ); ?>" class="button pay"><?php _e( 'Pay', 'woocommerce' ) ?></a>
-			<?php if ( is_user_logged_in() ) : ?>
-				<a href="<?php echo esc_url( wc_get_page_permalink( 'myaccount' ) ); ?>" class="button pay"><?php _e( 'My Account', 'woocommerce' ); ?></a>
-			<?php endif; ?>
-		</p>
+			<p class="woocommerce-notice woocommerce-notice--error woocommerce-thankyou-order-failed"><?php _e( 'Unfortunately your order cannot be processed as the originating bank/merchant has declined your transaction. Please attempt your purchase again.', 'woocommerce' ); ?></p>
+
+			<p class="woocommerce-notice woocommerce-notice--error woocommerce-thankyou-order-failed-actions">
+				<a href="<?php echo esc_url( $order->get_checkout_payment_url() ); ?>" class="button pay"><?php _e( 'Pay', 'woocommerce' ) ?></a>
+				<?php if ( is_user_logged_in() ) : ?>
+					<a href="<?php echo esc_url( wc_get_page_permalink( 'myaccount' ) ); ?>" class="button pay"><?php _e( 'My account', 'woocommerce' ); ?></a>
+				<?php endif; ?>
+			</p>
+
+		<?php else : ?>
+
+			<p class="woocommerce-notice woocommerce-notice--success woocommerce-thankyou-order-received"><?php echo apply_filters( 'woocommerce_thankyou_order_received_text', __( 'Thank you. Your order has been received.', 'woocommerce' ), $order ); ?></p>
+
+			<ul class="woocommerce-order-overview woocommerce-thankyou-order-details order_details">
+
+				<li class="woocommerce-order-overview__order order">
+					<?php _e( 'Order number:', 'woocommerce' ); ?>
+					<strong><?php echo $order->get_order_number(); ?></strong>
+				</li>
+
+				<li class="woocommerce-order-overview__date date">
+					<?php _e( 'Date:', 'woocommerce' ); ?>
+					<strong><?php echo wc_format_datetime( $order->get_date_created() ); ?></strong>
+				</li>
+
+				<li class="woocommerce-order-overview__total total">
+					<?php _e( 'Total:', 'woocommerce' ); ?>
+					<strong><?php echo $order->get_formatted_order_total(); ?></strong>
+				</li>
+
+				<?php if ( $order->get_payment_method_title() ) : ?>
+
+				<li class="woocommerce-order-overview__payment-method method">
+					<?php _e( 'Payment method:', 'woocommerce' ); ?>
+					<strong><?php echo wp_kses_post( $order->get_payment_method_title() ); ?></strong>
+				</li>
+
+				<?php endif; ?>
+
+			</ul>
+
+		<?php endif; ?>
+
+		<?php do_action( 'woocommerce_thankyou_' . $order->get_payment_method(), $order->get_id() ); ?>
+		<?php do_action( 'woocommerce_thankyou', $order->get_id() ); ?>
 
 	<?php else : ?>
 
-		<p class="woocommerce-thankyou-order-received"><?php echo apply_filters( 'woocommerce_thankyou_order_received_text', __( 'Thank you. Your order has been received.', 'woocommerce' ), $order ); ?></p>
-
-		<ul class="woocommerce-thankyou-order-details order_details">
-			<li class="order">
-				<?php _e( 'Order Number:', 'woocommerce' ); ?>
-				<strong><?php echo $order->get_order_number(); ?></strong>
-			</li>
-			<li class="date">
-				<?php _e( 'Date:', 'woocommerce' ); ?>
-				<strong><?php echo date_i18n( get_option( 'date_format' ), strtotime( $order->order_date ) ); ?></strong>
-			</li>
-			<li class="total">
-				<?php _e( 'Total:', 'woocommerce' ); ?>
-				<strong><?php echo $order->get_formatted_order_total(); ?></strong>
-			</li>
-			<?php if ( $order->payment_method_title ) : ?>
-			<li class="method">
-				<?php _e( 'Payment Method:', 'woocommerce' ); ?>
-				<strong><?php echo $order->payment_method_title; ?></strong>
-			</li>
-			<?php endif; ?>
-		</ul>
-		<div class="clear"></div>
+		<p class="woocommerce-notice woocommerce-notice--success woocommerce-thankyou-order-received"><?php echo apply_filters( 'woocommerce_thankyou_order_received_text', __( 'Thank you. Your order has been received.', 'woocommerce' ), null ); ?></p>
 
 	<?php endif; ?>
 
-	<?php do_action( 'woocommerce_thankyou_' . $order->payment_method, $order->id ); ?>
-	<?php do_action( 'woocommerce_thankyou', $order->id ); ?>
-
-<?php else : ?>
-
-	<p class="woocommerce-thankyou-order-received"><?php echo apply_filters( 'woocommerce_thankyou_order_received_text', __( 'Thank you. Your order has been received.', 'woocommerce' ), null ); ?></p>
-
-<?php endif; ?>
+</div>
diff --git a/templates/content-product.php b/templates/content-product.php
index 43093ebfecf..bc8204642b8 100644
--- a/templates/content-product.php
+++ b/templates/content-product.php
@@ -4,52 +4,30 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/content-product.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see     http://docs.woothemes.com/document/template-structure/
+ * @see     https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
- * @version 2.5.0
+ * @version 3.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
 
-global $product, $woocommerce_loop;
-
-// Store loop count we're currently on
-if ( empty( $woocommerce_loop['loop'] ) ) {
-	$woocommerce_loop['loop'] = 0;
-}
-
-// Store column count for displaying the grid
-if ( empty( $woocommerce_loop['columns'] ) ) {
-	$woocommerce_loop['columns'] = apply_filters( 'loop_shop_columns', 4 );
-}
+global $product;
 
 // Ensure visibility
-if ( ! $product || ! $product->is_visible() ) {
+if ( empty( $product ) || ! $product->is_visible() ) {
 	return;
 }
-
-// Increase loop count
-$woocommerce_loop['loop']++;
-
-// Extra post classes
-$classes = array();
-if ( 0 === ( $woocommerce_loop['loop'] - 1 ) % $woocommerce_loop['columns'] || 1 === $woocommerce_loop['columns'] ) {
-	$classes[] = 'first';
-}
-if ( 0 === $woocommerce_loop['loop'] % $woocommerce_loop['columns'] ) {
-	$classes[] = 'last';
-}
 ?>
-<li <?php post_class( $classes ); ?>>
-
+<li <?php post_class(); ?>>
 	<?php
 	/**
 	 * woocommerce_before_shop_loop_item hook.
@@ -89,5 +67,4 @@ if ( 0 === $woocommerce_loop['loop'] % $woocommerce_loop['columns'] ) {
 	 */
 	do_action( 'woocommerce_after_shop_loop_item' );
 	?>
-
 </li>
diff --git a/templates/content-product_cat.php b/templates/content-product_cat.php
index afe8a09f553..c4e3d9afaac 100644
--- a/templates/content-product_cat.php
+++ b/templates/content-product_cat.php
@@ -4,37 +4,23 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/content-product_cat.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
- * @author 		WooThemes
- * @package 	WooCommerce/Templates
- * @version     2.5.0
+ * @see     https://docs.woocommerce.com/document/template-structure/
+ * @author  WooThemes
+ * @package WooCommerce/Templates
+ * @version 2.6.1
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
-
-global $woocommerce_loop;
-
-// Store loop count we're currently on
-if ( empty( $woocommerce_loop['loop'] ) ) {
-	$woocommerce_loop['loop'] = 0;
-}
-
-// Store column count for displaying the grid
-if ( empty( $woocommerce_loop['columns'] ) ) {
-	$woocommerce_loop['columns'] = apply_filters( 'loop_shop_columns', 4 );
-}
-
-// Increase loop count
-$woocommerce_loop['loop'] ++;
 ?>
-<li <?php wc_product_cat_class(); ?>>
+<li <?php wc_product_cat_class( '', $category ); ?>>
 	<?php
 	/**
 	 * woocommerce_before_subcategory hook.
diff --git a/templates/content-single-product.php b/templates/content-single-product.php
index cf94b16c495..31404e7bda4 100644
--- a/templates/content-single-product.php
+++ b/templates/content-single-product.php
@@ -4,15 +4,16 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/content-single-product.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
- * @version     1.6.4
+ * @version     3.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -35,7 +36,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	 }
 ?>
 
-<div itemscope itemtype="<?php echo woocommerce_get_product_schema(); ?>" id="product-<?php the_ID(); ?>" <?php post_class(); ?>>
+<div id="product-<?php the_ID(); ?>" <?php post_class(); ?>>
 
 	<?php
 		/**
@@ -60,6 +61,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 			 * @hooked woocommerce_template_single_add_to_cart - 30
 			 * @hooked woocommerce_template_single_meta - 40
 			 * @hooked woocommerce_template_single_sharing - 50
+			 * @hooked WC_Structured_Data::generate_product_data() - 60
 			 */
 			do_action( 'woocommerce_single_product_summary' );
 		?>
@@ -77,8 +79,6 @@ if ( ! defined( 'ABSPATH' ) ) {
 		do_action( 'woocommerce_after_single_product_summary' );
 	?>
 
-	<meta itemprop="url" content="<?php the_permalink(); ?>" />
-
 </div><!-- #product-<?php the_ID(); ?> -->
 
 <?php do_action( 'woocommerce_after_single_product' ); ?>
diff --git a/templates/content-widget-product.php b/templates/content-widget-product.php
index b77b75cee9f..136547bcdb8 100644
--- a/templates/content-widget-product.php
+++ b/templates/content-widget-product.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/content-widget-product.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	http://docs.woothemes.com/document/template-structure/
+ * @see 	https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
  * @version 2.5.0
@@ -23,12 +24,12 @@ if ( ! defined( 'ABSPATH' ) ) {
 global $product; ?>
 
 <li>
-	<a href="<?php echo esc_url( get_permalink( $product->id ) ); ?>" title="<?php echo esc_attr( $product->get_title() ); ?>">
+	<a href="<?php echo esc_url( $product->get_permalink() ); ?>">
 		<?php echo $product->get_image(); ?>
-		<span class="product-title"><?php echo $product->get_title(); ?></span>
+		<span class="product-title"><?php echo $product->get_name(); ?></span>
 	</a>
 	<?php if ( ! empty( $show_rating ) ) : ?>
-		<?php echo $product->get_rating_html(); ?>
+		<?php echo wc_get_rating_html( $product->get_average_rating() ); ?>
 	<?php endif; ?>
 	<?php echo $product->get_price_html(); ?>
 </li>
diff --git a/templates/emails/admin-cancelled-order.php b/templates/emails/admin-cancelled-order.php
index 6f9d16ce32c..1e97814dd12 100644
--- a/templates/emails/admin-cancelled-order.php
+++ b/templates/emails/admin-cancelled-order.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/emails/admin-cancelled-order.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates/Emails
  * @version 2.5.0
@@ -24,12 +25,14 @@
   */
  do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
 
- <p><?php printf( __( 'The order #%d from %s has been cancelled. The order was as follows:', 'woocommerce' ), $order->get_order_number(), $order->get_formatted_billing_full_name() ); ?></p>
+ <p><?php printf( __( 'The order #%1$d from %2$s has been cancelled. The order was as follows:', 'woocommerce' ), $order->get_order_number(), $order->get_formatted_billing_full_name() ); ?></p>
 
  <?php
 
  /**
   * @hooked WC_Emails::order_details() Shows the order details table.
+  * @hooked WC_Structured_Data::generate_order_data() Generates structured data.
+  * @hooked WC_Structured_Data::output_structured_data() Outputs structured data.
   * @since 2.5.0
   */
  do_action( 'woocommerce_email_order_details', $order, $sent_to_admin, $plain_text, $email );
diff --git a/templates/emails/admin-failed-order.php b/templates/emails/admin-failed-order.php
index af12ba3a61f..15042edff81 100644
--- a/templates/emails/admin-failed-order.php
+++ b/templates/emails/admin-failed-order.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/emails/admin-failed-order.php
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer)
- * will need to copy the new files to your theme to maintain compatibility. We try to do this
- * as little as possible, but it does happen. When this occurs the version of the template file will
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates/Emails
  * @version 2.5.0
@@ -24,12 +25,14 @@
   */
  do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
 
- <p><?php printf( __( 'Payment for order #%d from %s has failed. The order was as follows:', 'woocommerce' ), $order->get_order_number(), $order->get_formatted_billing_full_name() ); ?></p>
+ <p><?php printf( __( 'Payment for order #%1$d from %2$s has failed. The order was as follows:', 'woocommerce' ), $order->get_order_number(), $order->get_formatted_billing_full_name() ); ?></p>
 
  <?php
 
  /**
   * @hooked WC_Emails::order_details() Shows the order details table.
+  * @hooked WC_Structured_Data::generate_order_data() Generates structured data.
+  * @hooked WC_Structured_Data::output_structured_data() Outputs structured data.
   * @since 2.5.0
   */
  do_action( 'woocommerce_email_order_details', $order, $sent_to_admin, $plain_text, $email );
diff --git a/templates/emails/admin-new-order.php b/templates/emails/admin-new-order.php
index 117ff1b6c23..152700d8231 100644
--- a/templates/emails/admin-new-order.php
+++ b/templates/emails/admin-new-order.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/emails/admin-new-order.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author WooThemes
  * @package WooCommerce/Templates/Emails/HTML
  * @version 2.5.0
@@ -30,6 +31,8 @@
 
  /**
   * @hooked WC_Emails::order_details() Shows the order details table.
+  * @hooked WC_Structured_Data::generate_order_data() Generates structured data.
+  * @hooked WC_Structured_Data::output_structured_data() Outputs structured data.
   * @since 2.5.0
   */
  do_action( 'woocommerce_email_order_details', $order, $sent_to_admin, $plain_text, $email );
diff --git a/templates/emails/customer-completed-order.php b/templates/emails/customer-completed-order.php
index 04cbe96d7c9..ea658526f43 100644
--- a/templates/emails/customer-completed-order.php
+++ b/templates/emails/customer-completed-order.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/emails/customer-completed-order.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates/Emails
  * @version     2.5.0
@@ -30,6 +31,8 @@ do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
 
 /**
  * @hooked WC_Emails::order_details() Shows the order details table.
+ * @hooked WC_Structured_Data::generate_order_data() Generates structured data.
+ * @hooked WC_Structured_Data::output_structured_data() Outputs structured data.
  * @since 2.5.0
  */
 do_action( 'woocommerce_email_order_details', $order, $sent_to_admin, $plain_text, $email );
diff --git a/templates/emails/customer-invoice.php b/templates/emails/customer-invoice.php
index b11d7224e14..c3b28eebf0e 100644
--- a/templates/emails/customer-invoice.php
+++ b/templates/emails/customer-invoice.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/emails/customer-invoice.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates/Emails
  * @version     2.5.0
@@ -25,13 +26,15 @@ if ( ! defined( 'ABSPATH' ) ) {
 do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
 
 <?php if ( $order->has_status( 'pending' ) ) : ?>
-	<p><?php printf( __( 'An order has been created for you on %s. To pay for this order please use the following link: %s', 'woocommerce' ), get_bloginfo( 'name', 'display' ), '<a href="' . esc_url( $order->get_checkout_payment_url() ) . '">' . __( 'pay', 'woocommerce' ) . '</a>' ); ?></p>
+	<p><?php printf( __( 'An order has been created for you on %1$s. To pay for this order please use the following link: %2$s', 'woocommerce' ), get_bloginfo( 'name', 'display' ), '<a href="' . esc_url( $order->get_checkout_payment_url() ) . '">' . __( 'pay', 'woocommerce' ) . '</a>' ); ?></p>
 <?php endif; ?>
 
 <?php
 
 /**
  * @hooked WC_Emails::order_details() Shows the order details table.
+ * @hooked WC_Structured_Data::generate_order_data() Generates structured data.
+ * @hooked WC_Structured_Data::output_structured_data() Outputs structured data.
  * @since 2.5.0
  */
 do_action( 'woocommerce_email_order_details', $order, $sent_to_admin, $plain_text, $email );
diff --git a/templates/emails/customer-new-account.php b/templates/emails/customer-new-account.php
index 6292709fd32..7736b12833c 100644
--- a/templates/emails/customer-new-account.php
+++ b/templates/emails/customer-new-account.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/emails/customer-new-account.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates/Emails
  * @version     1.6.4
@@ -23,14 +24,14 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 <?php do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
 
-<p><?php printf( __( "Thanks for creating an account on %s. Your username is <strong>%s</strong>.", 'woocommerce' ), esc_html( $blogname ), esc_html( $user_login ) ); ?></p>
+	<p><?php printf( __( 'Thanks for creating an account on %1$s. Your username is %2$s', 'woocommerce' ), esc_html( $blogname ), '<strong>' . esc_html( $user_login ) . '</strong>' ); ?></p>
 
 <?php if ( 'yes' === get_option( 'woocommerce_registration_generate_password' ) && $password_generated ) : ?>
 
-	<p><?php printf( __( "Your password has been automatically generated: <strong>%s</strong>", 'woocommerce' ), esc_html( $user_pass ) ); ?></p>
+	<p><?php printf( __( 'Your password has been automatically generated: %s', 'woocommerce' ), '<strong>' . esc_html( $user_pass ) . '</strong>' ); ?></p>
 
 <?php endif; ?>
 
-<p><?php printf( __( 'You can access your account area to view your orders and change your password here: %s.', 'woocommerce' ), wc_get_page_permalink( 'myaccount' ) ); ?></p>
+	<p><?php printf( __( 'You can access your account area to view your orders and change your password here: %s.', 'woocommerce' ), make_clickable( esc_url( wc_get_page_permalink( 'myaccount' ) ) ) ); ?></p>
 
-<?php do_action( 'woocommerce_email_footer', $email ); ?>
+<?php do_action( 'woocommerce_email_footer', $email );
diff --git a/templates/emails/customer-note.php b/templates/emails/customer-note.php
index 172a6e68a72..f0230c5ad88 100644
--- a/templates/emails/customer-note.php
+++ b/templates/emails/customer-note.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/emails/customer-note.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates/Emails
  * @version     2.5.0
@@ -34,6 +35,8 @@ do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
 
 /**
  * @hooked WC_Emails::order_details() Shows the order details table.
+ * @hooked WC_Structured_Data::generate_order_data() Generates structured data.
+ * @hooked WC_Structured_Data::output_structured_data() Outputs structured data.
  * @since 2.5.0
  */
 do_action( 'woocommerce_email_order_details', $order, $sent_to_admin, $plain_text, $email );
diff --git a/templates/emails/customer-on-hold-order.php b/templates/emails/customer-on-hold-order.php
new file mode 100644
index 00000000000..c766ab1b2f5
--- /dev/null
+++ b/templates/emails/customer-on-hold-order.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Customer on-hold order email
+ *
+ * This template can be overridden by copying it to yourtheme/woocommerce/emails/customer-on-hold-order.php.
+ *
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
+ *
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates/Emails
+ * @version     2.5.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * @hooked WC_Emails::email_header() Output the email header
+ */
+do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
+
+<p><?php _e( "Your order is on-hold until we confirm payment has been received. Your order details are shown below for your reference:", 'woocommerce' ); ?></p>
+
+<?php
+
+/**
+ * @hooked WC_Emails::order_details() Shows the order details table.
+ * @hooked WC_Structured_Data::generate_order_data() Generates structured data.
+ * @hooked WC_Structured_Data::output_structured_data() Outputs structured data.
+ * @since 2.5.0
+ */
+do_action( 'woocommerce_email_order_details', $order, $sent_to_admin, $plain_text, $email );
+
+/**
+ * @hooked WC_Emails::order_meta() Shows order meta data.
+ */
+do_action( 'woocommerce_email_order_meta', $order, $sent_to_admin, $plain_text, $email );
+
+/**
+ * @hooked WC_Emails::customer_details() Shows customer details
+ * @hooked WC_Emails::email_address() Shows email address
+ */
+do_action( 'woocommerce_email_customer_details', $order, $sent_to_admin, $plain_text, $email );
+
+/**
+ * @hooked WC_Emails::email_footer() Output the email footer
+ */
+do_action( 'woocommerce_email_footer', $email );
diff --git a/templates/emails/customer-processing-order.php b/templates/emails/customer-processing-order.php
index b4f6a39a55e..42f2f4f9ab5 100644
--- a/templates/emails/customer-processing-order.php
+++ b/templates/emails/customer-processing-order.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/emails/customer-processing-order.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates/Emails
  * @version     2.5.0
@@ -30,6 +31,8 @@ do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
 
 /**
  * @hooked WC_Emails::order_details() Shows the order details table.
+ * @hooked WC_Structured_Data::generate_order_data() Generates structured data.
+ * @hooked WC_Structured_Data::output_structured_data() Outputs structured data.
  * @since 2.5.0
  */
 do_action( 'woocommerce_email_order_details', $order, $sent_to_admin, $plain_text, $email );
diff --git a/templates/emails/customer-refunded-order.php b/templates/emails/customer-refunded-order.php
index 56e6a0d4400..e236acbb9de 100644
--- a/templates/emails/customer-refunded-order.php
+++ b/templates/emails/customer-refunded-order.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/emails/customer-refunded-order.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see      http://docs.woothemes.com/document/template-structure/
+ * @see      https://docs.woocommerce.com/document/template-structure/
  * @author   WooThemes
  * @package  WooCommerce/Templates/Emails
  * @version  2.5.0
@@ -27,8 +28,7 @@ do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
 <p><?php
 	if ( $partial_refund ) {
 		printf( __( 'Hi there. Your order on %s has been partially refunded.', 'woocommerce' ), get_option( 'blogname' ) );
-	}
-	else {
+	} else {
 		printf( __( 'Hi there. Your order on %s has been refunded.', 'woocommerce' ), get_option( 'blogname' ) );
 	}
 ?></p>
@@ -37,6 +37,8 @@ do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
 
 /**
  * @hooked WC_Emails::order_details() Shows the order details table.
+ * @hooked WC_Structured_Data::generate_order_data() Generates structured data.
+ * @hooked WC_Structured_Data::output_structured_data() Outputs structured data.
  * @since 2.5.0
  */
 do_action( 'woocommerce_email_order_details', $order, $sent_to_admin, $plain_text, $email );
diff --git a/templates/emails/customer-reset-password.php b/templates/emails/customer-reset-password.php
index bd9877a0586..0d5718ff849 100644
--- a/templates/emails/customer-reset-password.php
+++ b/templates/emails/customer-reset-password.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/emails/customer-reset-password.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates/Emails
  * @version     2.0.0
@@ -28,7 +29,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 <p><?php _e( 'If this was a mistake, just ignore this email and nothing will happen.', 'woocommerce' ); ?></p>
 <p><?php _e( 'To reset your password, visit the following address:', 'woocommerce' ); ?></p>
 <p>
-    <a class="link" href="<?php echo esc_url( add_query_arg( array( 'key' => $reset_key, 'login' => rawurlencode( $user_login ) ), wc_get_endpoint_url( 'lost-password', '', wc_get_page_permalink( 'myaccount' ) ) ) ); ?>">
+	<a class="link" href="<?php echo esc_url( add_query_arg( array( 'key' => $reset_key, 'login' => rawurlencode( $user_login ) ), wc_get_endpoint_url( 'lost-password', '', wc_get_page_permalink( 'myaccount' ) ) ) ); ?>">
 			<?php _e( 'Click here to reset your password', 'woocommerce' ); ?></a>
 </p>
 <p></p>
diff --git a/templates/emails/email-addresses.php b/templates/emails/email-addresses.php
index 84e8ce2ee67..879123c9822 100644
--- a/templates/emails/email-addresses.php
+++ b/templates/emails/email-addresses.php
@@ -4,30 +4,33 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/emails/email-addresses.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates/Emails
- * @version     2.4.0
+ * @version     3.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
+$text_align = is_rtl() ? 'right' : 'left';
+
 ?><table id="addresses" cellspacing="0" cellpadding="0" style="width: 100%; vertical-align: top;" border="0">
 	<tr>
-		<td class="td" style="text-align:left; font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif;" valign="top" width="50%">
+		<td class="td" style="text-align:<?php echo $text_align; ?>; font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif;" valign="top" width="50%">
 			<h3><?php _e( 'Billing address', 'woocommerce' ); ?></h3>
 
 			<p class="text"><?php echo $order->get_formatted_billing_address(); ?></p>
 		</td>
 		<?php if ( ! wc_ship_to_billing_address_only() && $order->needs_shipping_address() && ( $shipping = $order->get_formatted_shipping_address() ) ) : ?>
-			<td class="td" style="text-align:left; font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif;" valign="top" width="50%">
+			<td class="td" style="text-align:<?php echo $text_align; ?>; font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif;" valign="top" width="50%">
 				<h3><?php _e( 'Shipping address', 'woocommerce' ); ?></h3>
 
 				<p class="text"><?php echo $shipping; ?></p>
diff --git a/templates/emails/email-customer-details.php b/templates/emails/email-customer-details.php
index a1a1acb94b5..548dc75ff0f 100644
--- a/templates/emails/email-customer-details.php
+++ b/templates/emails/email-customer-details.php
@@ -4,17 +4,18 @@
  *
  * This is extra customer data which can be filtered by plugins. It outputs below the order item table.
  *
- * This template can be overridden by copying it to yourtheme/woocommerce/emails/email-addresses.php.
+ * This template can be overridden by copying it to yourtheme/woocommerce/emails/email-customer-details.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
- * @author 		WooThemes
- * @package 	WooCommerce/Templates/Emails
- * @version     2.5.0
+ * @see     https://docs.woocommerce.com/document/template-structure/
+ * @author  WooThemes
+ * @package WooCommerce/Templates/Emails
+ * @version 2.5.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -22,9 +23,11 @@ if ( ! defined( 'ABSPATH' ) ) {
 }
 
 ?>
-<h2><?php _e( 'Customer details', 'woocommerce' ); ?></h2>
-<ul>
-    <?php foreach ( $fields as $field ) : ?>
-        <li><strong><?php echo wp_kses_post( $field['label'] ); ?>:</strong> <span class="text"><?php echo wp_kses_post( $field['value'] ); ?></span></li>
-    <?php endforeach; ?>
-</ul>
+<?php if ( ! empty( $fields ) ) : ?>
+	<h2><?php _e( 'Customer details', 'woocommerce' ); ?></h2>
+	<ul>
+		<?php foreach ( $fields as $field ) : ?>
+			<li><strong><?php echo wp_kses_post( $field['label'] ); ?>:</strong> <span class="text"><?php echo wp_kses_post( $field['value'] ); ?></span></li>
+		<?php endforeach; ?>
+	</ul>
+<?php endif; ?>
diff --git a/templates/emails/email-footer.php b/templates/emails/email-footer.php
index bd025124409..5266ddd2e41 100644
--- a/templates/emails/email-footer.php
+++ b/templates/emails/email-footer.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/emails/email-footer.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates/Emails
  * @version     2.3.0
@@ -22,38 +23,38 @@ if ( ! defined( 'ABSPATH' ) ) {
 ?>
 															</div>
 														</td>
-                                                    </tr>
-                                                </table>
-                                                <!-- End Content -->
-                                            </td>
-                                        </tr>
-                                    </table>
-                                    <!-- End Body -->
-                                </td>
-                            </tr>
-                        	<tr>
-                            	<td align="center" valign="top">
-                                    <!-- Footer -->
-                                	<table border="0" cellpadding="10" cellspacing="0" width="600" id="template_footer">
-                                    	<tr>
-                                        	<td valign="top">
-                                                <table border="0" cellpadding="10" cellspacing="0" width="100%">
-                                                    <tr>
-                                                        <td colspan="2" valign="middle" id="credit">
-                                                        	<?php echo wpautop( wp_kses_post( wptexturize( apply_filters( 'woocommerce_email_footer_text', get_option( 'woocommerce_email_footer_text' ) ) ) ) ); ?>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                    <!-- End Footer -->
-                                </td>
-                            </tr>
-                        </table>
-                    </td>
-                </tr>
-            </table>
-        </div>
-    </body>
+													</tr>
+												</table>
+												<!-- End Content -->
+											</td>
+										</tr>
+									</table>
+									<!-- End Body -->
+								</td>
+							</tr>
+							<tr>
+								<td align="center" valign="top">
+									<!-- Footer -->
+									<table border="0" cellpadding="10" cellspacing="0" width="600" id="template_footer">
+										<tr>
+											<td valign="top">
+												<table border="0" cellpadding="10" cellspacing="0" width="100%">
+													<tr>
+														<td colspan="2" valign="middle" id="credit">
+															<?php echo wpautop( wp_kses_post( wptexturize( apply_filters( 'woocommerce_email_footer_text', get_option( 'woocommerce_email_footer_text' ) ) ) ) ); ?>
+														</td>
+													</tr>
+												</table>
+											</td>
+										</tr>
+									</table>
+									<!-- End Footer -->
+								</td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+			</table>
+		</div>
+	</body>
 </html>
diff --git a/templates/emails/email-header.php b/templates/emails/email-header.php
index 90a8d6c34a6..78984b50b54 100644
--- a/templates/emails/email-header.php
+++ b/templates/emails/email-header.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/emails/email-header.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates/Emails
  * @version 2.4.0
@@ -21,45 +22,45 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 ?>
 <!DOCTYPE html>
-<html dir="<?php echo is_rtl() ? 'rtl' : 'ltr'?>">
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title><?php echo get_bloginfo( 'name', 'display' ); ?></title>
+<html <?php language_attributes(); ?>>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=<?php bloginfo( 'charset' ); ?>" />
+		<title><?php echo get_bloginfo( 'name', 'display' ); ?></title>
 	</head>
-    <body <?php echo is_rtl() ? 'rightmargin' : 'leftmargin'; ?>="0" marginwidth="0" topmargin="0" marginheight="0" offset="0">
-    	<div id="wrapper" dir="<?php echo is_rtl() ? 'rtl' : 'ltr'?>">
-        	<table border="0" cellpadding="0" cellspacing="0" height="100%" width="100%">
-            	<tr>
-                	<td align="center" valign="top">
+	<body <?php echo is_rtl() ? 'rightmargin' : 'leftmargin'; ?>="0" marginwidth="0" topmargin="0" marginheight="0" offset="0">
+		<div id="wrapper" dir="<?php echo is_rtl() ? 'rtl' : 'ltr'?>">
+			<table border="0" cellpadding="0" cellspacing="0" height="100%" width="100%">
+				<tr>
+					<td align="center" valign="top">
 						<div id="template_header_image">
-	                		<?php
-	                			if ( $img = get_option( 'woocommerce_email_header_image' ) ) {
-	                				echo '<p style="margin-top:0;"><img src="' . esc_url( $img ) . '" alt="' . get_bloginfo( 'name', 'display' ) . '" /></p>';
-	                			}
-	                		?>
+							<?php
+								if ( $img = get_option( 'woocommerce_email_header_image' ) ) {
+									echo '<p style="margin-top:0;"><img src="' . esc_url( $img ) . '" alt="' . get_bloginfo( 'name', 'display' ) . '" /></p>';
+								}
+							?>
 						</div>
-                    	<table border="0" cellpadding="0" cellspacing="0" width="600" id="template_container">
-                        	<tr>
-                            	<td align="center" valign="top">
-                                    <!-- Header -->
-                                	<table border="0" cellpadding="0" cellspacing="0" width="600" id="template_header">
-                                        <tr>
-                                            <td id="header_wrapper">
-                                            	<h1><?php echo $email_heading; ?></h1>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                    <!-- End Header -->
-                                </td>
-                            </tr>
-                        	<tr>
-                            	<td align="center" valign="top">
-                                    <!-- Body -->
-                                	<table border="0" cellpadding="0" cellspacing="0" width="600" id="template_body">
-                                    	<tr>
-                                            <td valign="top" id="body_content">
-                                                <!-- Content -->
-                                                <table border="0" cellpadding="20" cellspacing="0" width="100%">
-                                                    <tr>
-                                                        <td valign="top">
-                                                            <div id="body_content_inner">
+						<table border="0" cellpadding="0" cellspacing="0" width="600" id="template_container">
+							<tr>
+								<td align="center" valign="top">
+									<!-- Header -->
+									<table border="0" cellpadding="0" cellspacing="0" width="600" id="template_header">
+										<tr>
+											<td id="header_wrapper">
+												<h1><?php echo $email_heading; ?></h1>
+											</td>
+										</tr>
+									</table>
+									<!-- End Header -->
+								</td>
+							</tr>
+							<tr>
+								<td align="center" valign="top">
+									<!-- Body -->
+									<table border="0" cellpadding="0" cellspacing="0" width="600" id="template_body">
+										<tr>
+											<td valign="top" id="body_content">
+												<!-- Content -->
+												<table border="0" cellpadding="20" cellspacing="0" width="100%">
+													<tr>
+														<td valign="top">
+															<div id="body_content_inner">
diff --git a/templates/emails/email-order-details.php b/templates/emails/email-order-details.php
index a178b824a58..29085ff34b7 100644
--- a/templates/emails/email-order-details.php
+++ b/templates/emails/email-order-details.php
@@ -4,43 +4,47 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/emails/email-order-details.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates/Emails
- * @version     2.5.0
+ * @version     3.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
+$text_align = is_rtl() ? 'right' : 'left';
+
 do_action( 'woocommerce_email_before_order_table', $order, $sent_to_admin, $plain_text, $email ); ?>
 
 <?php if ( ! $sent_to_admin ) : ?>
 	<h2><?php printf( __( 'Order #%s', 'woocommerce' ), $order->get_order_number() ); ?></h2>
 <?php else : ?>
-	<h2><a class="link" href="<?php echo esc_url( admin_url( 'post.php?post=' . $order->id . '&action=edit' ) ); ?>"><?php printf( __( 'Order #%s', 'woocommerce'), $order->get_order_number() ); ?></a> (<?php printf( '<time datetime="%s">%s</time>', date_i18n( 'c', strtotime( $order->order_date ) ), date_i18n( wc_date_format(), strtotime( $order->order_date ) ) ); ?>)</h2>
+	<h2><a class="link" href="<?php echo esc_url( admin_url( 'post.php?post=' . $order->get_id() . '&action=edit' ) ); ?>"><?php printf( __( 'Order #%s', 'woocommerce' ), $order->get_order_number() ); ?></a> (<?php printf( '<time datetime="%s">%s</time>', $order->get_date_created()->format( 'c' ), wc_format_datetime( $order->get_date_created() ) ); ?>)</h2>
 <?php endif; ?>
 
 <table class="td" cellspacing="0" cellpadding="6" style="width: 100%; font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif;" border="1">
 	<thead>
 		<tr>
-			<th class="td" scope="col" style="text-align:left;"><?php _e( 'Product', 'woocommerce' ); ?></th>
-			<th class="td" scope="col" style="text-align:left;"><?php _e( 'Quantity', 'woocommerce' ); ?></th>
-			<th class="td" scope="col" style="text-align:left;"><?php _e( 'Price', 'woocommerce' ); ?></th>
+			<th class="td" scope="col" style="text-align:<?php echo $text_align; ?>;"><?php _e( 'Product', 'woocommerce' ); ?></th>
+			<th class="td" scope="col" style="text-align:<?php echo $text_align; ?>;"><?php _e( 'Quantity', 'woocommerce' ); ?></th>
+			<th class="td" scope="col" style="text-align:<?php echo $text_align; ?>;"><?php _e( 'Price', 'woocommerce' ); ?></th>
 		</tr>
 	</thead>
 	<tbody>
-		<?php echo $order->email_order_items_table( array(
-			'show_sku'    => false,
-			'show_image'  => false,
-			'$image_size' => array( 32, 32 ),
-			'plain_text'  => $plain_text
+		<?php echo wc_get_email_order_items( $order, array(
+			'show_sku'      => $sent_to_admin,
+			'show_image'    => false,
+			'image_size'    => array( 32, 32 ),
+			'plain_text'    => $plain_text,
+			'sent_to_admin' => $sent_to_admin,
 		) ); ?>
 	</tbody>
 	<tfoot>
@@ -50,8 +54,8 @@ do_action( 'woocommerce_email_before_order_table', $order, $sent_to_admin, $plai
 				foreach ( $totals as $total ) {
 					$i++;
 					?><tr>
-						<th class="td" scope="row" colspan="2" style="text-align:left; <?php if ( $i === 1 ) echo 'border-top-width: 4px;'; ?>"><?php echo $total['label']; ?></th>
-						<td class="td" style="text-align:left; <?php if ( $i === 1 ) echo 'border-top-width: 4px;'; ?>"><?php echo $total['value']; ?></td>
+						<th class="td" scope="row" colspan="2" style="text-align:<?php echo $text_align; ?>; <?php echo ( 1 === $i ) ? 'border-top-width: 4px;' : ''; ?>"><?php echo $total['label']; ?></th>
+						<td class="td" style="text-align:<?php echo $text_align; ?>; <?php echo ( 1 === $i ) ? 'border-top-width: 4px;' : ''; ?>"><?php echo $total['value']; ?></td>
 					</tr><?php
 				}
 			}
diff --git a/templates/emails/email-order-items.php b/templates/emails/email-order-items.php
index 97b0d40b0e6..07b98c70bb5 100644
--- a/templates/emails/email-order-items.php
+++ b/templates/emails/email-order-items.php
@@ -4,69 +4,66 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/emails/email-order-items.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates/Emails
- * @version     2.1.2
+ * @version     3.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
-foreach ( $items as $item_id => $item ) :
-	$_product     = apply_filters( 'woocommerce_order_item_product', $order->get_product_from_item( $item ), $item );
-	$item_meta    = new WC_Order_Item_Meta( $item, $_product );
+$text_align = is_rtl() ? 'right' : 'left';
 
+foreach ( $items as $item_id => $item ) :
 	if ( apply_filters( 'woocommerce_order_item_visible', true, $item ) ) {
+		$product = $item->get_product();
 		?>
 		<tr class="<?php echo esc_attr( apply_filters( 'woocommerce_order_item_class', 'order_item', $item, $order ) ); ?>">
-			<td class="td" style="text-align:left; vertical-align:middle; border: 1px solid #eee; font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif; word-wrap:break-word;"><?php
+			<td class="td" style="text-align:<?php echo $text_align; ?>; vertical-align:middle; border: 1px solid #eee; font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif; word-wrap:break-word;"><?php
 
 				// Show title/image etc
 				if ( $show_image ) {
-					echo apply_filters( 'woocommerce_order_item_thumbnail', '<div style="margin-bottom: 5px"><img src="' . ( $_product->get_image_id() ? current( wp_get_attachment_image_src( $_product->get_image_id(), 'thumbnail') ) : wc_placeholder_img_src() ) .'" alt="' . esc_attr__( 'Product Image', 'woocommerce' ) . '" height="' . esc_attr( $image_size[1] ) . '" width="' . esc_attr( $image_size[0] ) . '" style="vertical-align:middle; margin-right: 10px;" /></div>', $item );
+					echo apply_filters( 'woocommerce_order_item_thumbnail', '<div style="margin-bottom: 5px"><img src="' . ( $product->get_image_id() ? current( wp_get_attachment_image_src( $product->get_image_id(), 'thumbnail' ) ) : wc_placeholder_img_src() ) . '" alt="' . esc_attr__( 'Product image', 'woocommerce' ) . '" height="' . esc_attr( $image_size[1] ) . '" width="' . esc_attr( $image_size[0] ) . '" style="vertical-align:middle; margin-' . ( is_rtl() ? 'left' : 'right' ) . ': 10px;" /></div>', $item );
 				}
 
 				// Product name
-				echo apply_filters( 'woocommerce_order_item_name', $item['name'], $item, false );
+				echo apply_filters( 'woocommerce_order_item_name', $item->get_name(), $item, false );
 
 				// SKU
-				if ( $show_sku && is_object( $_product ) && $_product->get_sku() ) {
-					echo ' (#' . $_product->get_sku() . ')';
+				if ( $show_sku && is_object( $product ) && $product->get_sku() ) {
+					echo ' (#' . $product->get_sku() . ')';
 				}
 
 				// allow other plugins to add additional product information here
-				do_action( 'woocommerce_order_item_meta_start', $item_id, $item, $order );
+				do_action( 'woocommerce_order_item_meta_start', $item_id, $item, $order, $plain_text );
 
-				// Variation
-				if ( ! empty( $item_meta->meta ) ) {
-					echo '<br/><small>' . nl2br( $item_meta->display( true, true, '_', "\n" ) ) . '</small>';
-				}
+				wc_display_item_meta( $item );
 
-				// File URLs
 				if ( $show_download_links ) {
-					$order->display_item_downloads( $item );
+					wc_display_item_downloads( $item );
 				}
 
 				// allow other plugins to add additional product information here
-				do_action( 'woocommerce_order_item_meta_end', $item_id, $item, $order );
+				do_action( 'woocommerce_order_item_meta_end', $item_id, $item, $order, $plain_text );
 
 			?></td>
-			<td class="td" style="text-align:left; vertical-align:middle; border: 1px solid #eee; font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif;"><?php echo apply_filters( 'woocommerce_email_order_item_quantity', $item['qty'], $item ); ?></td>
-			<td class="td" style="text-align:left; vertical-align:middle; border: 1px solid #eee; font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif;"><?php echo $order->get_formatted_line_subtotal( $item ); ?></td>
+			<td class="td" style="text-align:<?php echo $text_align; ?>; vertical-align:middle; border: 1px solid #eee; font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif;"><?php echo apply_filters( 'woocommerce_email_order_item_quantity', $item->get_quantity(), $item ); ?></td>
+			<td class="td" style="text-align:<?php echo $text_align; ?>; vertical-align:middle; border: 1px solid #eee; font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif;"><?php echo $order->get_formatted_line_subtotal( $item ); ?></td>
 		</tr>
 		<?php
 	}
 
-	if ( $show_purchase_note && is_object( $_product ) && ( $purchase_note = get_post_meta( $_product->id, '_purchase_note', true ) ) ) : ?>
+	if ( $show_purchase_note && is_object( $product ) && ( $purchase_note = $product->get_purchase_note() ) ) : ?>
 		<tr>
-			<td colspan="3" style="text-align:left; vertical-align:middle; border: 1px solid #eee; font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif;"><?php echo wpautop( do_shortcode( wp_kses_post( $purchase_note ) ) ); ?></td>
+			<td colspan="3" style="text-align:<?php echo $text_align; ?>; vertical-align:middle; border: 1px solid #eee; font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif;"><?php echo wpautop( do_shortcode( wp_kses_post( $purchase_note ) ) ); ?></td>
 		</tr>
 	<?php endif; ?>
 
diff --git a/templates/emails/email-styles.php b/templates/emails/email-styles.php
index 78e60d617e0..703d629e0d4 100644
--- a/templates/emails/email-styles.php
+++ b/templates/emails/email-styles.php
@@ -4,20 +4,23 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/emails/email-styles.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see     https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates/Emails
  * @version 2.3.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
-// Load colours
+// Load colors
 $bg              = get_option( 'woocommerce_email_background_color' );
 $body            = get_option( 'woocommerce_email_body_background_color' );
 $base            = get_option( 'woocommerce_email_base_color' );
@@ -33,146 +36,163 @@ $text_lighter_20 = wc_hex_lighter( $text, 20 );
 // !important; is a gmail hack to prevent styles being stripped if it doesn't like something.
 ?>
 #wrapper {
-    background-color: <?php echo esc_attr( $bg ); ?>;
-    margin: 0;
-    padding: 70px 0 70px 0;
-    -webkit-text-size-adjust: none !important;
-    width: 100%;
+	background-color: <?php echo esc_attr( $bg ); ?>;
+	margin: 0;
+	padding: 70px 0 70px 0;
+	-webkit-text-size-adjust: none !important;
+	width: 100%;
 }
 
 #template_container {
-    box-shadow: 0 1px 4px rgba(0,0,0,0.1) !important;
-    background-color: <?php echo esc_attr( $body ); ?>;
-    border: 1px solid <?php echo esc_attr( $bg_darker_10 ); ?>;
-    border-radius: 3px !important;
+	box-shadow: 0 1px 4px rgba(0,0,0,0.1) !important;
+	background-color: <?php echo esc_attr( $body ); ?>;
+	border: 1px solid <?php echo esc_attr( $bg_darker_10 ); ?>;
+	border-radius: 3px !important;
 }
 
 #template_header {
-    background-color: <?php echo esc_attr( $base ); ?>;
-    border-radius: 3px 3px 0 0 !important;
-    color: <?php echo esc_attr( $base_text ); ?>;
-    border-bottom: 0;
-    font-weight: bold;
-    line-height: 100%;
-    vertical-align: middle;
-    font-family: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;
+	background-color: <?php echo esc_attr( $base ); ?>;
+	border-radius: 3px 3px 0 0 !important;
+	color: <?php echo esc_attr( $base_text ); ?>;
+	border-bottom: 0;
+	font-weight: bold;
+	line-height: 100%;
+	vertical-align: middle;
+	font-family: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;
 }
 
-#template_header h1 {
-    color: <?php echo esc_attr( $base_text ); ?>;
+#template_header h1,
+#template_header h1 a {
+	color: <?php echo esc_attr( $base_text ); ?>;
 }
 
 #template_footer td {
-    padding: 0;
-    -webkit-border-radius: 6px;
+	padding: 0;
+	-webkit-border-radius: 6px;
 }
 
 #template_footer #credit {
-    border:0;
-    color: <?php echo esc_attr( $base_lighter_40 ); ?>;
-    font-family: Arial;
-    font-size:12px;
-    line-height:125%;
-    text-align:center;
-    padding: 0 48px 48px 48px;
+	border:0;
+	color: <?php echo esc_attr( $base_lighter_40 ); ?>;
+	font-family: Arial;
+	font-size:12px;
+	line-height:125%;
+	text-align:center;
+	padding: 0 48px 48px 48px;
 }
 
 #body_content {
-    background-color: <?php echo esc_attr( $body ); ?>;
+	background-color: <?php echo esc_attr( $body ); ?>;
 }
 
 #body_content table td {
-    padding: 48px;
+	padding: 48px;
 }
 
 #body_content table td td {
-    padding: 12px;
+	padding: 12px;
 }
 
 #body_content table td th {
-    padding: 12px;
+	padding: 12px;
+}
+
+#body_content td ul.wc-item-meta {
+	font-size: small;
+	margin: 1em 0 0;
+	padding: 0;
+	list-style: none;
+}
+
+#body_content td ul.wc-item-meta li {
+	margin: 0.5em 0 0;
+	padding: 0;
+}
+
+#body_content td ul.wc-item-meta li p {
+	margin: 0;
 }
 
 #body_content p {
-    margin: 0 0 16px;
+	margin: 0 0 16px;
 }
 
 #body_content_inner {
-    color: <?php echo esc_attr( $text_lighter_20 ); ?>;
-    font-family: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;
-    font-size: 14px;
-    line-height: 150%;
-    text-align: <?php echo is_rtl() ? 'right' : 'left'; ?>;
+	color: <?php echo esc_attr( $text_lighter_20 ); ?>;
+	font-family: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;
+	font-size: 14px;
+	line-height: 150%;
+	text-align: <?php echo is_rtl() ? 'right' : 'left'; ?>;
 }
 
 .td {
-    color: <?php echo esc_attr( $text_lighter_20 ); ?>;
-    border: 1px solid <?php echo esc_attr( $body_darker_10 ); ?>;
+	color: <?php echo esc_attr( $text_lighter_20 ); ?>;
+	border: 1px solid <?php echo esc_attr( $body_darker_10 ); ?>;
 }
 
 .text {
-    color: <?php echo esc_attr( $text ); ?>;
-    font-family: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;
+	color: <?php echo esc_attr( $text ); ?>;
+	font-family: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;
 }
 
 .link {
-    color: <?php echo esc_attr( $base ); ?>;
+	color: <?php echo esc_attr( $base ); ?>;
 }
 
 #header_wrapper {
-    padding: 36px 48px;
-    display: block;
+	padding: 36px 48px;
+	display: block;
 }
 
 h1 {
-    color: <?php echo esc_attr( $base ); ?>;
-    font-family: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;
-    font-size: 30px;
-    font-weight: 300;
-    line-height: 150%;
-    margin: 0;
-    text-align: <?php echo is_rtl() ? 'right' : 'left'; ?>;
-    text-shadow: 0 1px 0 <?php echo esc_attr( $base_lighter_20 ); ?>;
-    -webkit-font-smoothing: antialiased;
+	color: <?php echo esc_attr( $base ); ?>;
+	font-family: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;
+	font-size: 30px;
+	font-weight: 300;
+	line-height: 150%;
+	margin: 0;
+	text-align: <?php echo is_rtl() ? 'right' : 'left'; ?>;
+	text-shadow: 0 1px 0 <?php echo esc_attr( $base_lighter_20 ); ?>;
+	-webkit-font-smoothing: antialiased;
 }
 
 h2 {
-    color: <?php echo esc_attr( $base ); ?>;
-    display: block;
-    font-family: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;
-    font-size: 18px;
-    font-weight: bold;
-    line-height: 130%;
-    margin: 16px 0 8px;
-    text-align: <?php echo is_rtl() ? 'right' : 'left'; ?>;
+	color: <?php echo esc_attr( $base ); ?>;
+	display: block;
+	font-family: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;
+	font-size: 18px;
+	font-weight: bold;
+	line-height: 130%;
+	margin: 16px 0 8px;
+	text-align: <?php echo is_rtl() ? 'right' : 'left'; ?>;
 }
 
 h3 {
-    color: <?php echo esc_attr( $base ); ?>;
-    display: block;
-    font-family: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;
-    font-size: 16px;
-    font-weight: bold;
-    line-height: 130%;
-    margin: 16px 0 8px;
-    text-align: <?php echo is_rtl() ? 'right' : 'left'; ?>;
+	color: <?php echo esc_attr( $base ); ?>;
+	display: block;
+	font-family: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;
+	font-size: 16px;
+	font-weight: bold;
+	line-height: 130%;
+	margin: 16px 0 8px;
+	text-align: <?php echo is_rtl() ? 'right' : 'left'; ?>;
 }
 
 a {
-    color: <?php echo esc_attr( $base ); ?>;
-    font-weight: normal;
-    text-decoration: underline;
+	color: <?php echo esc_attr( $base ); ?>;
+	font-weight: normal;
+	text-decoration: underline;
 }
 
 img {
-    border: none;
-    display: inline;
-    font-size: 14px;
-    font-weight: bold;
-    height: auto;
-    line-height: 100%;
-    outline: none;
-    text-decoration: none;
-    text-transform: capitalize;
+	border: none;
+	display: inline;
+	font-size: 14px;
+	font-weight: bold;
+	height: auto;
+	line-height: 100%;
+	outline: none;
+	text-decoration: none;
+	text-transform: capitalize;
 }
 <?php
diff --git a/templates/emails/plain/admin-cancelled-order.php b/templates/emails/plain/admin-cancelled-order.php
index 48fda877317..80a0ef7fd4c 100644
--- a/templates/emails/plain/admin-cancelled-order.php
+++ b/templates/emails/plain/admin-cancelled-order.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/emails/plain/admin-cancelled-order.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author  	WooThemes
  * @package 	WooCommerce/Templates/Emails/Plain
  * @version 	2.5.0
@@ -21,12 +22,14 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 echo "= " . $email_heading . " =\n\n";
 
-echo sprintf( __( 'The order #%d from %s has been cancelled. The order was as follows:', 'woocommerce' ), $order->id, $order->get_formatted_billing_full_name() ) . "\n\n";
+echo sprintf( __( 'The order #%1$d from %2$s has been cancelled. The order was as follows:', 'woocommerce' ), $order->get_id(), $order->get_formatted_billing_full_name() ) . "\n\n";
 
 echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n";
 
 /**
  * @hooked WC_Emails::order_details() Shows the order details table.
+ * @hooked WC_Structured_Data::generate_order_data() Generates structured data.
+ * @hooked WC_Structured_Data::output_structured_data() Outputs structured data.
  * @since 2.5.0
  */
 do_action( 'woocommerce_email_order_details', $order, $sent_to_admin, $plain_text, $email );
diff --git a/templates/emails/plain/admin-failed-order.php b/templates/emails/plain/admin-failed-order.php
index 7ed5684ea28..26f63648a32 100644
--- a/templates/emails/plain/admin-failed-order.php
+++ b/templates/emails/plain/admin-failed-order.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/emails/plain/admin-failed-order.php
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer)
- * will need to copy the new files to your theme to maintain compatibility. We try to do this
- * as little as possible, but it does happen. When this occurs the version of the template file will
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author		WooThemes
  * @package 	WooCommerce/Templates/Emails/Plain
  * @version		2.5.0
@@ -21,12 +22,14 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 echo "= " . $email_heading . " =\n\n";
 
-echo sprintf( __( 'Payment for order #%d from %s has failed. The order was as follows:', 'woocommerce' ), $order->id, $order->get_formatted_billing_full_name() ) . "\n\n";
+echo sprintf( __( 'Payment for order #%1$d from %2$s has failed. The order was as follows:', 'woocommerce' ), $order->get_id(), $order->get_formatted_billing_full_name() ) . "\n\n";
 
 echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n";
 
 /**
  * @hooked WC_Emails::order_details() Shows the order details table.
+ * @hooked WC_Structured_Data::generate_order_data() Generates structured data.
+ * @hooked WC_Structured_Data::output_structured_data() Outputs structured data.
  * @since 2.5.0
  */
 do_action( 'woocommerce_email_order_details', $order, $sent_to_admin, $plain_text, $email );
diff --git a/templates/emails/plain/admin-new-order.php b/templates/emails/plain/admin-new-order.php
index 48da363afec..cc920b80450 100644
--- a/templates/emails/plain/admin-new-order.php
+++ b/templates/emails/plain/admin-new-order.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/emails/plain/admin-new-order.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author		WooThemes
  * @package 	WooCommerce/Templates/Emails/Plain
  * @version		2.5.0
@@ -27,6 +28,8 @@ echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n"
 
 /**
  * @hooked WC_Emails::order_details() Shows the order details table.
+ * @hooked WC_Structured_Data::generate_order_data() Generates structured data.
+ * @hooked WC_Structured_Data::output_structured_data() Outputs structured data.
  * @since 2.5.0
  */
 do_action( 'woocommerce_email_order_details', $order, $sent_to_admin, $plain_text, $email );
diff --git a/templates/emails/plain/customer-completed-order.php b/templates/emails/plain/customer-completed-order.php
index 5c74bfee4d0..e6b5abe03dc 100644
--- a/templates/emails/plain/customer-completed-order.php
+++ b/templates/emails/plain/customer-completed-order.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/emails/plain/customer-completed-order.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author		WooThemes
  * @package 	WooCommerce/Templates/Emails/Plain
  * @version		2.5.0
@@ -27,6 +28,8 @@ echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n"
 
 /**
  * @hooked WC_Emails::order_details() Shows the order details table.
+ * @hooked WC_Structured_Data::generate_order_data() Generates structured data.
+ * @hooked WC_Structured_Data::output_structured_data() Outputs structured data.
  * @since 2.5.0
  */
 do_action( 'woocommerce_email_order_details', $order, $sent_to_admin, $plain_text, $email );
diff --git a/templates/emails/plain/customer-invoice.php b/templates/emails/plain/customer-invoice.php
index 1f12966ada5..41d5c6f8520 100644
--- a/templates/emails/plain/customer-invoice.php
+++ b/templates/emails/plain/customer-invoice.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/emails/plain/customer-invoice.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author		WooThemes
  * @package 	WooCommerce/Templates/Emails/Plain
  * @version		2.5.0
@@ -22,13 +23,15 @@ if ( ! defined( 'ABSPATH' ) ) {
 echo "= " . $email_heading . " =\n\n";
 
 if ( $order->has_status( 'pending' ) ) {
-	echo sprintf( __( 'An order has been created for you on %s. To pay for this order please use the following link: %s', 'woocommerce' ), get_bloginfo( 'name', 'display' ), $order->get_checkout_payment_url() ) . "\n\n";
+	echo sprintf( __( 'An order has been created for you on %1$s. To pay for this order please use the following link: %2$s', 'woocommerce' ), get_bloginfo( 'name', 'display' ), $order->get_checkout_payment_url() ) . "\n\n";
 }
 
 echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n";
 
 /**
  * @hooked WC_Emails::order_details() Shows the order details table.
+ * @hooked WC_Structured_Data::generate_order_data() Generates structured data.
+ * @hooked WC_Structured_Data::output_structured_data() Outputs structured data.
  * @since 2.5.0
  */
 do_action( 'woocommerce_email_order_details', $order, $sent_to_admin, $plain_text, $email );
diff --git a/templates/emails/plain/customer-new-account.php b/templates/emails/plain/customer-new-account.php
index 97417a99079..82180ab4454 100644
--- a/templates/emails/plain/customer-new-account.php
+++ b/templates/emails/plain/customer-new-account.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/emails/plain/customer-new-account.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates/Emails/Plain
  * @version     2.0.0
@@ -21,10 +22,11 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 echo "= " . $email_heading . " =\n\n";
 
-echo sprintf( __( "Thanks for creating an account on %s. Your username is <strong>%s</strong>.", 'woocommerce' ), $blogname, $user_login ) . "\n\n";
+echo sprintf( __( 'Thanks for creating an account on %1$s. Your username is %2$s', 'woocommerce' ), $blogname, '<strong>' . $user_login . '</strong>' ) . "\n\n";
 
-if ( 'yes' === get_option( 'woocommerce_registration_generate_password' ) && $password_generated )
-	echo sprintf( __( "Your password is <strong>%s</strong>.", 'woocommerce' ), $user_pass ) . "\n\n";
+if ( 'yes' === get_option( 'woocommerce_registration_generate_password' ) && $password_generated ) {
+	echo sprintf( __( 'Your password is %s.', 'woocommerce' ), '<strong>' . $user_pass . '</strong>' ) . "\n\n";
+}
 
 echo sprintf( __( 'You can access your account area to view your orders and change your password here: %s.', 'woocommerce' ), wc_get_page_permalink( 'myaccount' ) ) . "\n\n";
 
diff --git a/templates/emails/plain/customer-note.php b/templates/emails/plain/customer-note.php
index f62d70126f3..e4b2affe443 100644
--- a/templates/emails/plain/customer-note.php
+++ b/templates/emails/plain/customer-note.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/emails/plain/customer-note.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author		WooThemes
  * @package 	WooCommerce/Templates/Emails/Plain
  * @version		2.5.0
@@ -35,6 +36,8 @@ echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n"
 
 /**
  * @hooked WC_Emails::order_details() Shows the order details table.
+ * @hooked WC_Structured_Data::generate_order_data() Generates structured data.
+ * @hooked WC_Structured_Data::output_structured_data() Outputs structured data.
  * @since 2.5.0
  */
 do_action( 'woocommerce_email_order_details', $order, $sent_to_admin, $plain_text, $email );
diff --git a/templates/emails/plain/customer-on-hold-order.php b/templates/emails/plain/customer-on-hold-order.php
new file mode 100644
index 00000000000..04bec34671a
--- /dev/null
+++ b/templates/emails/plain/customer-on-hold-order.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Customer on-hold order email
+ *
+ * This template can be overridden by copying it to yourtheme/woocommerce/emails/plain/customer-on-hold-order.php.
+ *
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
+ *
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
+ * @author		WooThemes
+ * @package 	WooCommerce/Templates/Emails/Plain
+ * @version		2.5.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+echo "= " . $email_heading . " =\n\n";
+
+echo __( "Your order is on-hold until we confirm payment has been received. Your order details are shown below for your reference:", 'woocommerce' ) . "\n\n";
+
+echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n";
+
+/**
+ * @hooked WC_Emails::order_details() Shows the order details table.
+ * @hooked WC_Structured_Data::generate_order_data() Generates structured data.
+ * @hooked WC_Structured_Data::output_structured_data() Outputs structured data.
+ * @since 2.5.0
+ */
+do_action( 'woocommerce_email_order_details', $order, $sent_to_admin, $plain_text, $email );
+
+echo "\n=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n";
+
+/**
+ * @hooked WC_Emails::order_meta() Shows order meta data.
+ */
+do_action( 'woocommerce_email_order_meta', $order, $sent_to_admin, $plain_text, $email );
+
+/**
+ * @hooked WC_Emails::customer_details() Shows customer details
+ * @hooked WC_Emails::email_address() Shows email address
+ */
+do_action( 'woocommerce_email_customer_details', $order, $sent_to_admin, $plain_text, $email );
+
+echo "\n=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n";
+
+echo apply_filters( 'woocommerce_email_footer_text', get_option( 'woocommerce_email_footer_text' ) );
diff --git a/templates/emails/plain/customer-processing-order.php b/templates/emails/plain/customer-processing-order.php
index d83b5355e90..43d251b1a39 100644
--- a/templates/emails/plain/customer-processing-order.php
+++ b/templates/emails/plain/customer-processing-order.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/emails/plain/customer-processing-order.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author		WooThemes
  * @package 	WooCommerce/Templates/Emails/Plain
  * @version		2.5.0
@@ -27,6 +28,8 @@ echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n"
 
 /**
  * @hooked WC_Emails::order_details() Shows the order details table.
+ * @hooked WC_Structured_Data::generate_order_data() Generates structured data.
+ * @hooked WC_Structured_Data::output_structured_data() Outputs structured data.
  * @since 2.5.0
  */
 do_action( 'woocommerce_email_order_details', $order, $sent_to_admin, $plain_text, $email );
diff --git a/templates/emails/plain/customer-refunded-order.php b/templates/emails/plain/customer-refunded-order.php
index 18d12a5dc54..d87d65d42b0 100644
--- a/templates/emails/plain/customer-refunded-order.php
+++ b/templates/emails/plain/customer-refunded-order.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/emails/plain/customer-refunded-order.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author		WooThemes
  * @package 	WooCommerce/Templates/Emails/Plain
  * @version		2.5.0
@@ -27,6 +28,8 @@ echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n"
 
 /**
  * @hooked WC_Emails::order_details() Shows the order details table.
+ * @hooked WC_Structured_Data::generate_order_data() Generates structured data.
+ * @hooked WC_Structured_Data::output_structured_data() Outputs structured data.
  * @since 2.5.0
  */
 do_action( 'woocommerce_email_order_details', $order, $sent_to_admin, $plain_text, $email );
diff --git a/templates/emails/plain/customer-reset-password.php b/templates/emails/plain/customer-reset-password.php
index ff343253456..ad36cb3e48e 100644
--- a/templates/emails/plain/customer-reset-password.php
+++ b/templates/emails/plain/customer-reset-password.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/emails/plain/customer-reset-password.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates/Emails/Plain
  * @version 2.3.0
diff --git a/templates/emails/plain/email-addresses.php b/templates/emails/plain/email-addresses.php
index 822b71b2176..681c1e61670 100644
--- a/templates/emails/plain/email-addresses.php
+++ b/templates/emails/plain/email-addresses.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/emails/plain/email-addresses.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates/Emails/Plain
  * @version     2.2.0
@@ -24,5 +25,5 @@ echo preg_replace( '#<br\s*/?>#i', "\n", $order->get_formatted_billing_address()
 
 if ( ! wc_ship_to_billing_address_only() && $order->needs_shipping_address() && ( $shipping = $order->get_formatted_shipping_address() ) ) {
 	echo "\n" . strtoupper( __( 'Shipping address', 'woocommerce' ) ) . "\n\n";
-	echo preg_replace( '#<br\s*/?>#i', "\n\t", $shipping ) . "\n";
+	echo preg_replace( '#<br\s*/?>#i', "\n", $shipping ) . "\n";
 }
diff --git a/templates/emails/plain/email-customer-details.php b/templates/emails/plain/email-customer-details.php
index 2d1b540d56e..55e3b48e632 100644
--- a/templates/emails/plain/email-customer-details.php
+++ b/templates/emails/plain/email-customer-details.php
@@ -6,14 +6,15 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/emails/plain/email-addresses.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
- * @author 		WooThemes
- * @package 	WooCommerce/Templates/Emails/Plain
+ * @see         https://docs.woocommerce.com/document/template-structure/
+ * @author      WooThemes
+ * @package     WooCommerce/Templates/Emails/Plain
  * @version     2.5.0
  */
 
@@ -24,5 +25,5 @@ if ( ! defined( 'ABSPATH' ) ) {
 echo strtoupper( __( 'Customer details', 'woocommerce' ) ) . "\n\n";
 
 foreach ( $fields as $field ) {
-    echo wp_kses_post( $field['label'] ) . ': ' . wp_kses_post( $field['value'] ) . "\n";
+	echo wp_kses_post( $field['label'] ) . ': ' . wp_kses_post( $field['value'] ) . "\n";
 }
diff --git a/templates/emails/plain/email-order-details.php b/templates/emails/plain/email-order-details.php
index 6577872542a..6f68f83241d 100644
--- a/templates/emails/plain/email-order-details.php
+++ b/templates/emails/plain/email-order-details.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/emails/plain/email-order-details.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates/Emails
  * @version     2.5.0
@@ -22,12 +23,13 @@ if ( ! defined( 'ABSPATH' ) ) {
 do_action( 'woocommerce_email_before_order_table', $order, $sent_to_admin, $plain_text, $email );
 
 echo strtoupper( sprintf( __( 'Order number: %s', 'woocommerce' ), $order->get_order_number() ) ) . "\n";
-echo date_i18n( __( 'jS F Y', 'woocommerce' ), strtotime( $order->order_date ) ) . "\n";
-echo "\n" . $order->email_order_items_table( array(
-	'show_sku'    => false,
-	'show_image'  => false,
-	'$image_size' => array( 32, 32 ),
-	'plain_text'  => true
+echo wc_format_datetime( $order->get_date_created() ) . "\n";
+echo "\n" . wc_get_email_order_items( $order, array(
+	'show_sku'      => $sent_to_admin,
+	'show_image'    => false,
+	'image_size'    => array( 32, 32 ),
+	'plain_text'    => true,
+	'sent_to_admin' => $sent_to_admin,
 ) );
 
 echo "==========\n\n";
@@ -39,7 +41,7 @@ if ( $totals = $order->get_order_item_totals() ) {
 }
 
 if ( $sent_to_admin ) {
-    echo "\n" . sprintf( __( 'View order: %s', 'woocommerce'), admin_url( 'post.php?post=' . $order->id . '&action=edit' ) ) . "\n";
+	echo "\n" . sprintf( __( 'View order: %s', 'woocommerce' ), admin_url( 'post.php?post=' . $order->get_id() . '&action=edit' ) ) . "\n";
 }
 
 do_action( 'woocommerce_email_after_order_table', $order, $sent_to_admin, $plain_text, $email );
diff --git a/templates/emails/plain/email-order-items.php b/templates/emails/plain/email-order-items.php
index 17225d449a8..517387420b6 100644
--- a/templates/emails/plain/email-order-items.php
+++ b/templates/emails/plain/email-order-items.php
@@ -4,15 +4,16 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/emails/plain/email-order-items.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates/Emails/Plain
- * @version     2.1.2
+ * @version     3.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -20,59 +21,38 @@ if ( ! defined( 'ABSPATH' ) ) {
 }
 
 foreach ( $items as $item_id => $item ) :
-	$_product     = apply_filters( 'woocommerce_order_item_product', $order->get_product_from_item( $item ), $item );
-	$item_meta    = new WC_Order_Item_Meta( $item, $_product );
-
 	if ( apply_filters( 'woocommerce_order_item_visible', true, $item ) ) {
-
-		// Title
-		echo apply_filters( 'woocommerce_order_item_name', $item['name'], $item, false );
-
-		// SKU
-		if ( $show_sku && $_product->get_sku() ) {
-			echo ' (#' . $_product->get_sku() . ')';
+		$product = $item->get_product();
+		echo apply_filters( 'woocommerce_order_item_name', $item->get_name(), $item, false );
+		if ( $show_sku && $product->get_sku() ) {
+			echo ' (#' . $product->get_sku() . ')';
 		}
-
+		echo ' X ' . apply_filters( 'woocommerce_email_order_item_quantity', $item->get_quantity(), $item );
+		echo ' = ' . $order->get_formatted_line_subtotal( $item ) . "\n";
 		// allow other plugins to add additional product information here
-		do_action( 'woocommerce_order_item_meta_start', $item_id, $item, $order );
-
-		// Variation
-		echo ( $item_meta_content = $item_meta->display( true, true ) ) ? "\n" . $item_meta_content : '';
-
-		// Quantity
-		echo "\n" . sprintf( __( 'Quantity: %s', 'woocommerce' ), apply_filters( 'woocommerce_email_order_item_quantity', $item['qty'], $item ) );
-
-		// Cost
-		echo "\n" . sprintf( __( 'Cost: %s', 'woocommerce' ), $order->get_formatted_line_subtotal( $item ) );
-
-		// Download URLs
-		if ( $show_download_links && $_product->exists() && $_product->is_downloadable() ) {
-			$download_files = $order->get_item_downloads( $item );
-			$i              = 0;
-
-			foreach ( $download_files as $download_id => $file ) {
-				$i++;
-
-				if ( count( $download_files ) > 1 ) {
-					$prefix = sprintf( __( 'Download %d', 'woocommerce' ), $i );
-				} elseif ( $i == 1 ) {
-					$prefix = __( 'Download', 'woocommerce' );
-				}
-
-				echo "\n" . $prefix . '(' . esc_html( $file['name'] ) . '): ' . esc_url( $file['download_url'] );
-			}
+		do_action( 'woocommerce_order_item_meta_start', $item_id, $item, $order, $plain_text );
+		echo strip_tags( wc_display_item_meta( $item, array(
+			'before'    => "\n- ",
+			'separator' => "\n- ",
+			'after'     => "",
+			'echo'      => false,
+			'autop'     => false,
+		) ) );
+		if ( $show_download_links ) {
+			echo strip_tags( wc_display_item_downloads( $item, array(
+				'before'    => "\n- ",
+				'separator' => "\n- ",
+				'after'     => "",
+				'echo'      => false,
+				'show_url'  => true,
+			) ) );
 		}
-
 		// allow other plugins to add additional product information here
-		do_action( 'woocommerce_order_item_meta_end', $item_id, $item, $order );
-
+		do_action( 'woocommerce_order_item_meta_end', $item_id, $item, $order, $plain_text );
 	}
-
 	// Note
-	if ( $show_purchase_note && ( $purchase_note = get_post_meta( $_product->id, '_purchase_note', true ) ) ) {
+	if ( $show_purchase_note && is_object( $product ) && ( $purchase_note = $product->get_purchase_note() ) ) {
 		echo "\n" . do_shortcode( wp_kses_post( $purchase_note ) );
 	}
-
 	echo "\n\n";
-
 endforeach;
diff --git a/templates/global/breadcrumb.php b/templates/global/breadcrumb.php
index 27536b53fc6..ab98be1fff0 100644
--- a/templates/global/breadcrumb.php
+++ b/templates/global/breadcrumb.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/global/breadcrumb.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     2.3.0
@@ -39,7 +40,6 @@ if ( ! empty( $breadcrumb ) ) {
 		if ( sizeof( $breadcrumb ) !== $key + 1 ) {
 			echo $delimiter;
 		}
-
 	}
 
 	echo $wrap_after;
diff --git a/templates/global/form-login.php b/templates/global/form-login.php
index 1a0a1bacc22..82793796c48 100644
--- a/templates/global/form-login.php
+++ b/templates/global/form-login.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/global/form-login.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     2.1.0
@@ -24,11 +25,11 @@ if ( is_user_logged_in() ) {
 }
 
 ?>
-<form method="post" class="login" <?php if ( $hidden ) echo 'style="display:none;"'; ?>>
+<form class="woocomerce-form woocommerce-form-login login" method="post" <?php echo ( $hidden ) ? 'style="display:none;"' : ''; ?>>
 
 	<?php do_action( 'woocommerce_login_form_start' ); ?>
 
-	<?php if ( $message ) echo wpautop( wptexturize( $message ) ); ?>
+	<?php echo ( $message ) ? wpautop( wptexturize( $message ) ) : ''; ?>
 
 	<p class="form-row form-row-first">
 		<label for="username"><?php _e( 'Username or email', 'woocommerce' ); ?> <span class="required">*</span></label>
@@ -46,8 +47,8 @@ if ( is_user_logged_in() ) {
 		<?php wp_nonce_field( 'woocommerce-login' ); ?>
 		<input type="submit" class="button" name="login" value="<?php esc_attr_e( 'Login', 'woocommerce' ); ?>" />
 		<input type="hidden" name="redirect" value="<?php echo esc_url( $redirect ) ?>" />
-		<label for="rememberme" class="inline">
-			<input name="rememberme" type="checkbox" id="rememberme" value="forever" /> <?php _e( 'Remember me', 'woocommerce' ); ?>
+		<label class="woocommerce-form__label woocommerce-form__label-for-checkbox inline">
+			<input class="woocommerce-form__input woocommerce-form__input-checkbox" name="rememberme" type="checkbox" id="rememberme" value="forever" /> <span><?php _e( 'Remember me', 'woocommerce' ); ?></span>
 		</label>
 	</p>
 	<p class="lost_password">
diff --git a/templates/global/quantity-input.php b/templates/global/quantity-input.php
index 9f1adfc8904..cd691556e53 100644
--- a/templates/global/quantity-input.php
+++ b/templates/global/quantity-input.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/global/quantity-input.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     2.5.0
@@ -18,7 +19,17 @@
 if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
-?>
-<div class="quantity">
-	<input type="number" step="<?php echo esc_attr( $step ); ?>" min="<?php echo esc_attr( $min_value ); ?>" max="<?php echo esc_attr( $max_value ); ?>" name="<?php echo esc_attr( $input_name ); ?>" value="<?php echo esc_attr( $input_value ); ?>" title="<?php echo esc_attr_x( 'Qty', 'Product quantity input tooltip', 'woocommerce' ) ?>" class="input-text qty text" size="4" />
-</div>
+
+if ( $max_value && $min_value === $max_value ) {
+	?>
+	<div class="quantity hidden">
+		<input type="hidden" class="qty" name="<?php echo esc_attr( $input_name ); ?>" value="<?php echo esc_attr( $min_value ); ?>" />
+	</div>
+	<?php
+} else {
+	?>
+	<div class="quantity">
+		<input type="number" class="input-text qty text" step="<?php echo esc_attr( $step ); ?>" min="<?php echo esc_attr( $min_value ); ?>" max="<?php echo esc_attr( 0 < $max_value ? $max_value : '' ); ?>" name="<?php echo esc_attr( $input_name ); ?>" value="<?php echo esc_attr( $input_value ); ?>" title="<?php echo esc_attr_x( 'Qty', 'Product quantity input tooltip', 'woocommerce' ) ?>" size="4" pattern="<?php echo esc_attr( $pattern ); ?>" inputmode="<?php echo esc_attr( $inputmode ); ?>" />
+	</div>
+	<?php
+}
diff --git a/templates/global/sidebar.php b/templates/global/sidebar.php
index e84735966ae..09baaaac92e 100644
--- a/templates/global/sidebar.php
+++ b/templates/global/sidebar.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/global/sidebar.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     1.6.4
@@ -19,4 +20,6 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
 
-get_sidebar( 'shop' ); ?>
+get_sidebar( 'shop' );
+
+/* Omit closing PHP tag at the end of PHP files to avoid "headers already sent" issues. */
diff --git a/templates/global/wrapper-end.php b/templates/global/wrapper-end.php
index be4d28e8296..572b667c333 100644
--- a/templates/global/wrapper-end.php
+++ b/templates/global/wrapper-end.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/global/wrapper-end.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     1.6.4
@@ -21,9 +22,11 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 $template = get_option( 'template' );
 
-switch( $template ) {
+switch ( $template ) {
 	case 'twentyeleven' :
-		echo '</div></div>';
+		echo '</div>';
+		get_sidebar( 'shop' );
+		echo '</div>';
 		break;
 	case 'twentytwelve' :
 		echo '</div></div>';
@@ -39,7 +42,7 @@ switch( $template ) {
 		echo '</div></div>';
 		break;
 	case 'twentysixteen' :
-		echo '</div></main>';
+		echo '</main></div>';
 		break;
 	default :
 		echo '</div></div>';
diff --git a/templates/global/wrapper-start.php b/templates/global/wrapper-start.php
index c5131098f37..55117b0ce15 100644
--- a/templates/global/wrapper-start.php
+++ b/templates/global/wrapper-start.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/global/wrapper-start.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     1.6.4
@@ -21,7 +22,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 $template = get_option( 'template' );
 
-switch( $template ) {
+switch ( $template ) {
 	case 'twentyeleven' :
 		echo '<div id="primary"><div id="content" role="main" class="twentyeleven">';
 		break;
diff --git a/templates/loop/add-to-cart.php b/templates/loop/add-to-cart.php
index f0407b61458..5a20a0cdb31 100644
--- a/templates/loop/add-to-cart.php
+++ b/templates/loop/add-to-cart.php
@@ -4,15 +4,16 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/loop/add-to-cart.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
- * @version     2.5.0
+ * @version     3.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -24,10 +25,10 @@ global $product;
 echo apply_filters( 'woocommerce_loop_add_to_cart_link',
 	sprintf( '<a rel="nofollow" href="%s" data-quantity="%s" data-product_id="%s" data-product_sku="%s" class="%s">%s</a>',
 		esc_url( $product->add_to_cart_url() ),
-		esc_attr( $quantity ),
-		esc_attr( $product->id ),
+		esc_attr( isset( $quantity ) ? $quantity : 1 ),
+		esc_attr( $product->get_id() ),
 		esc_attr( $product->get_sku() ),
-		esc_attr( $class ),
+		esc_attr( isset( $class ) ? $class : 'button' ),
 		esc_html( $product->add_to_cart_text() )
 	),
 $product );
diff --git a/templates/loop/loop-end.php b/templates/loop/loop-end.php
index fd64951a4d2..93faec1bd02 100644
--- a/templates/loop/loop-end.php
+++ b/templates/loop/loop-end.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/loop/loop-end.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     2.0.0
diff --git a/templates/loop/loop-start.php b/templates/loop/loop-start.php
index 21d7c872a3a..2d9c5f53fd0 100644
--- a/templates/loop/loop-start.php
+++ b/templates/loop/loop-start.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/loop/loop-start.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     2.0.0
diff --git a/templates/loop/no-products-found.php b/templates/loop/no-products-found.php
index f460b8f1634..5f64034dc72 100644
--- a/templates/loop/no-products-found.php
+++ b/templates/loop/no-products-found.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/loop/no-products-found.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     2.0.0
diff --git a/templates/loop/orderby.php b/templates/loop/orderby.php
index 9f4f4de55fc..f262297d35d 100644
--- a/templates/loop/orderby.php
+++ b/templates/loop/orderby.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/loop/orderby.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     2.2.0
@@ -26,19 +27,5 @@ if ( ! defined( 'ABSPATH' ) ) {
 			<option value="<?php echo esc_attr( $id ); ?>" <?php selected( $orderby, $id ); ?>><?php echo esc_html( $name ); ?></option>
 		<?php endforeach; ?>
 	</select>
-	<?php
-		// Keep query string vars intact
-		foreach ( $_GET as $key => $val ) {
-			if ( 'orderby' === $key || 'submit' === $key ) {
-				continue;
-			}
-			if ( is_array( $val ) ) {
-				foreach( $val as $innerVal ) {
-					echo '<input type="hidden" name="' . esc_attr( $key ) . '[]" value="' . esc_attr( $innerVal ) . '" />';
-				}
-			} else {
-				echo '<input type="hidden" name="' . esc_attr( $key ) . '" value="' . esc_attr( $val ) . '" />';
-			}
-		}
-	?>
+	<?php wc_query_string_form_fields( null, array( 'orderby', 'submit' ) ); ?>
 </form>
diff --git a/templates/loop/pagination.php b/templates/loop/pagination.php
index 0c7a5e4905a..cf394db03b2 100644
--- a/templates/loop/pagination.php
+++ b/templates/loop/pagination.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/loop/pagination.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     2.2.2
@@ -30,14 +31,14 @@ if ( $wp_query->max_num_pages <= 1 ) {
 		echo paginate_links( apply_filters( 'woocommerce_pagination_args', array(
 			'base'         => esc_url_raw( str_replace( 999999999, '%#%', remove_query_arg( 'add-to-cart', get_pagenum_link( 999999999, false ) ) ) ),
 			'format'       => '',
-			'add_args'     => '',
+			'add_args'     => false,
 			'current'      => max( 1, get_query_var( 'paged' ) ),
 			'total'        => $wp_query->max_num_pages,
 			'prev_text'    => '&larr;',
 			'next_text'    => '&rarr;',
 			'type'         => 'list',
 			'end_size'     => 3,
-			'mid_size'     => 3
+			'mid_size'     => 3,
 		) ) );
 	?>
 </nav>
diff --git a/templates/loop/price.php b/templates/loop/price.php
index 86427ec52b1..9b498eb83dc 100644
--- a/templates/loop/price.php
+++ b/templates/loop/price.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/loop/price.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     1.6.4
diff --git a/templates/loop/rating.php b/templates/loop/rating.php
index 58cb0fb5a5b..2e34f0647d6 100644
--- a/templates/loop/rating.php
+++ b/templates/loop/rating.php
@@ -4,27 +4,26 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/loop/rating.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
- * @version     2.0.0
+ * @version     3.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
 global $product;
 
-if ( get_option( 'woocommerce_enable_review_rating' ) === 'no' )
+if ( get_option( 'woocommerce_enable_review_rating' ) === 'no' ) {
 	return;
-?>
+}
 
-<?php if ( $rating_html = $product->get_rating_html() ) : ?>
-	<?php echo $rating_html; ?>
-<?php endif; ?>
+echo wc_get_rating_html( $product->get_average_rating() );
diff --git a/templates/loop/result-count.php b/templates/loop/result-count.php
index fae7957b769..1f91d208c22 100644
--- a/templates/loop/result-count.php
+++ b/templates/loop/result-count.php
@@ -6,15 +6,16 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/loop/result-count.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
- * @version     2.0.0
+ * @version     3.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -23,8 +24,9 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 global $wp_query;
 
-if ( ! woocommerce_products_will_display() )
+if ( ! woocommerce_products_will_display() ) {
 	return;
+}
 ?>
 <p class="woocommerce-result-count">
 	<?php
@@ -34,12 +36,12 @@ if ( ! woocommerce_products_will_display() )
 	$first    = ( $per_page * $paged ) - $per_page + 1;
 	$last     = min( $total, $wp_query->get( 'posts_per_page' ) * $paged );
 
-	if ( 1 === $total ) {
-		_e( 'Showing the single result', 'woocommerce' );
-	} elseif ( $total <= $per_page || -1 === $per_page ) {
-		printf( __( 'Showing all %d results', 'woocommerce' ), $total );
+	if ( $total <= $per_page || -1 === $per_page ) {
+		/* translators: %d: total results */
+		printf( _n( 'Showing the single result', 'Showing all %d results', $total, 'woocommerce' ), $total );
 	} else {
-		printf( _x( 'Showing %1$d&ndash;%2$d of %3$d results', '%1$d = first, %2$d = last, %3$d = total', 'woocommerce' ), $first, $last, $total );
+		/* translators: 1: first result 2: last result 3: total results */
+		printf( _nx( 'Showing the single result', 'Showing %1$d&ndash;%2$d of %3$d results', $total, 'with first and last result', 'woocommerce' ), $first, $last, $total );
 	}
 	?>
 </p>
diff --git a/templates/loop/sale-flash.php b/templates/loop/sale-flash.php
index ca45cb1575e..ff812e6ec52 100644
--- a/templates/loop/sale-flash.php
+++ b/templates/loop/sale-flash.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/loop/sale-flash.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     1.6.4
@@ -24,6 +25,8 @@ global $post, $product;
 ?>
 <?php if ( $product->is_on_sale() ) : ?>
 
-	<?php echo apply_filters( 'woocommerce_sale_flash', '<span class="onsale">' . __( 'Sale!', 'woocommerce' ) . '</span>', $post, $product ); ?>
+	<?php echo apply_filters( 'woocommerce_sale_flash', '<span class="onsale">' . esc_html__( 'Sale!', 'woocommerce' ) . '</span>', $post, $product ); ?>
 
-<?php endif; ?>
+<?php endif;
+
+/* Omit closing PHP tag at the end of PHP files to avoid "headers already sent" issues. */
diff --git a/templates/myaccount/dashboard.php b/templates/myaccount/dashboard.php
new file mode 100644
index 00000000000..7762cd83d06
--- /dev/null
+++ b/templates/myaccount/dashboard.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * My Account Dashboard
+ *
+ * Shows the first intro screen on the account dashboard.
+ *
+ * This template can be overridden by copying it to yourtheme/woocommerce/myaccount/dashboard.php.
+ *
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
+ *
+ * @see         https://docs.woocommerce.com/document/template-structure/
+ * @author      WooThemes
+ * @package     WooCommerce/Templates
+ * @version     2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+?>
+
+<p><?php
+	/* translators: 1: user display name 2: logout url */
+	printf(
+		__( 'Hello %1$s (not %1$s? <a href="%2$s">Sign out</a>)', 'woocommerce' ),
+		'<strong>' . esc_html( $current_user->display_name ) . '</strong>',
+		esc_url( wc_logout_url( wc_get_page_permalink( 'myaccount' ) ) )
+	);
+?></p>
+
+<p><?php
+	printf(
+		__( 'From your account dashboard you can view your <a href="%1$s">recent orders</a>, manage your <a href="%2$s">shipping and billing addresses</a> and <a href="%3$s">edit your password and account details</a>.', 'woocommerce' ),
+		esc_url( wc_get_endpoint_url( 'orders' ) ),
+		esc_url( wc_get_endpoint_url( 'edit-address' ) ),
+		esc_url( wc_get_endpoint_url( 'edit-account' ) )
+	);
+?></p>
+
+<?php
+	/**
+	 * My Account dashboard.
+	 *
+	 * @since 2.6.0
+	 */
+	do_action( 'woocommerce_account_dashboard' );
+
+	/**
+	 * Deprecated woocommerce_before_my_account action.
+	 *
+	 * @deprecated 2.6.0
+	 */
+	do_action( 'woocommerce_before_my_account' );
+
+	/**
+	 * Deprecated woocommerce_after_my_account action.
+	 *
+	 * @deprecated 2.6.0
+	 */
+	do_action( 'woocommerce_after_my_account' );
+
+/* Omit closing PHP tag at the end of PHP files to avoid "headers already sent" issues. */
diff --git a/templates/myaccount/downloads.php b/templates/myaccount/downloads.php
new file mode 100644
index 00000000000..8ce6d54a9da
--- /dev/null
+++ b/templates/myaccount/downloads.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Downloads
+ *
+ * Shows downloads on the account page.
+ *
+ * This template can be overridden by copying it to yourtheme/woocommerce/myaccount/downloads.php.
+ *
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
+ *
+ * @see 	https://docs.woocommerce.com/document/template-structure/
+ * @author  WooThemes
+ * @package WooCommerce/Templates
+ * @version 3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+$downloads     = WC()->customer->get_downloadable_products();
+$has_downloads = (bool) $downloads;
+
+do_action( 'woocommerce_before_account_downloads', $has_downloads ); ?>
+
+<?php if ( $has_downloads ) : ?>
+
+	<?php do_action( 'woocommerce_before_available_downloads' ); ?>
+
+	<table class="woocommerce-MyAccount-downloads shop_table shop_table_responsive">
+		<thead>
+			<tr>
+				<?php foreach ( wc_get_account_downloads_columns() as $column_id => $column_name ) : ?>
+					<th class="<?php echo esc_attr( $column_id ); ?>"><span class="nobr"><?php echo esc_html( $column_name ); ?></span></th>
+				<?php endforeach; ?>
+			</tr>
+		</thead>
+		<?php foreach ( $downloads as $download ) : ?>
+			<tr>
+				<?php foreach ( wc_get_account_downloads_columns() as $column_id => $column_name ) : ?>
+					<td class="<?php echo esc_attr( $column_id ); ?>" data-title="<?php echo esc_attr( $column_name ); ?>">
+						<?php
+							if ( has_action( 'woocommerce_account_downloads_column_' . $column_id ) ) {
+								do_action( 'woocommerce_account_downloads_column_' . $column_id, $download );
+							} else {
+								switch ( $column_id ) {
+									case 'download-product' : ?>
+										<a href="<?php echo esc_url( get_permalink( $download['product_id'] ) ); ?>">
+											<?php echo esc_html( $download['product_name'] ); ?>
+										</a>
+										<?php break;
+									case 'download-file' : ?>
+										<a href="<?php echo esc_url( $download['download_url'] ); ?>" class="woocommerce-MyAccount-downloads-file">
+											<?php echo esc_html( $download['file']['name'] ); ?>
+										</a>
+										<?php break;
+									case 'download-remaining' :
+										echo is_numeric( $download['downloads_remaining'] ) ? esc_html( $download['downloads_remaining'] ) : __( '&infin;', 'woocommerce' );
+										break;
+									case 'download-expires' : ?>
+										<?php if ( ! empty( $download['access_expires'] ) ) : ?>
+											<time datetime="<?php echo date( 'Y-m-d', strtotime( $download['access_expires'] ) ); ?>" title="<?php echo esc_attr( strtotime( $download['access_expires'] ) ); ?>"><?php echo date_i18n( get_option( 'date_format' ), strtotime( $download['access_expires'] ) ); ?></time>
+										<?php else : ?>
+											<?php _e( 'Never', 'woocommerce' ); ?>
+										<?php endif; ?>
+										<?php break;
+									case 'download-actions' : ?>
+										<?php
+											$actions = array(
+												'download'  => array(
+													'url'  => $download['download_url'],
+													'name' => __( 'Download', 'woocommerce' ),
+												),
+											);
+											if ( $actions = apply_filters( 'woocommerce_account_download_actions', $actions, $download ) ) {
+												foreach ( $actions as $key => $action ) {
+													echo '<a href="' . esc_url( $action['url'] ) . '" class="button woocommerce-Button ' . sanitize_html_class( $key ) . '">' . esc_html( $action['name'] ) . '</a>';
+												}
+											}
+										?>
+										<?php break;
+								}
+							}
+						?>
+					</td>
+				<?php endforeach; ?>
+			</tr>
+		<?php endforeach; ?>
+	</table>
+	<?php do_action( 'woocommerce_after_available_downloads' ); ?>
+<?php else : ?>
+	<div class="woocommerce-Message woocommerce-Message--info woocommerce-info">
+		<a class="woocommerce-Button button" href="<?php echo esc_url( apply_filters( 'woocommerce_return_to_shop_redirect', wc_get_page_permalink( 'shop' ) ) ); ?>">
+			<?php esc_html_e( 'Go shop', 'woocommerce' ) ?>
+		</a>
+		<?php esc_html_e( 'No downloads available yet.', 'woocommerce' ); ?>
+	</div>
+<?php endif; ?>
+
+<?php do_action( 'woocommerce_after_account_downloads', $has_downloads ); ?>
diff --git a/templates/myaccount/form-add-payment-method.php b/templates/myaccount/form-add-payment-method.php
index e1a9813ec2b..473e3ec9deb 100644
--- a/templates/myaccount/form-add-payment-method.php
+++ b/templates/myaccount/form-add-payment-method.php
@@ -4,39 +4,40 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/myaccount/form-add-payment-method.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
- * @author 		WooThemes
- * @package 	WooCommerce/Templates
- * @version     2.1
+ * @see     https://docs.woocommerce.com/document/template-structure/
+ * @author  WooThemes
+ * @package WooCommerce/Templates
+ * @version 3.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
-?>
-<form id="add_payment_method" method="post">
-	<div id="payment">
-		<ul class="payment_methods methods">
-			<?php
-				if ( $available_gateways = WC()->payment_gateways->get_available_payment_gateways() ) {
-					// Chosen Method
-					if ( sizeof( $available_gateways ) )
+if ( $available_gateways = WC()->payment_gateways->get_available_payment_gateways() ) : ?>
+	<form id="add_payment_method" method="post">
+		<div id="payment" class="woocommerce-Payment">
+			<ul class="woocommerce-PaymentMethods payment_methods methods">
+				<?php
+					// Chosen Method.
+					if ( count( $available_gateways ) ) {
 						current( $available_gateways )->set_current();
+					}
 
 					foreach ( $available_gateways as $gateway ) {
 						?>
-						<li class="payment_method_<?php echo $gateway->id; ?>">
+						<li class="woocommerce-PaymentMethod woocommerce-PaymentMethod--<?php echo $gateway->id; ?> payment_method_<?php echo $gateway->id; ?>">
 							<input id="payment_method_<?php echo $gateway->id; ?>" type="radio" class="input-radio" name="payment_method" value="<?php echo esc_attr( $gateway->id ); ?>" <?php checked( $gateway->chosen, true ); ?> />
 							<label for="payment_method_<?php echo $gateway->id; ?>"><?php echo $gateway->get_title(); ?> <?php echo $gateway->get_icon(); ?></label>
 							<?php
 								if ( $gateway->has_fields() || $gateway->get_description() ) {
-									echo '<div class="payment_box payment_method_' . $gateway->id . '" style="display:none;">';
+									echo '<div class="woocommerce-PaymentBox woocommerce-PaymentBox--' . $gateway->id . ' payment_box payment_method_' . $gateway->id . '" style="display: none;">';
 									$gateway->payment_fields();
 									echo '</div>';
 								}
@@ -44,20 +45,16 @@ if ( ! defined( 'ABSPATH' ) ) {
 						</li>
 						<?php
 					}
-				} else {
+				?>
+			</ul>
 
-					echo '<p>' . __( 'Sorry, it seems that there are no payment methods which support adding a new payment method. Please contact us if you require assistance or wish to make alternate arrangements.', 'woocommerce' ) . '</p>';
-
-				}
-			?>
-		</ul>
-
-		<div class="form-row">
-			<?php wp_nonce_field( 'woocommerce-add-payment-method' ); ?>
-			<input type="submit" class="button alt" id="place_order" value="<?php esc_attr_e( 'Add Payment Method', 'woocommerce' ); ?>" />
-			<input type="hidden" name="woocommerce_add_payment_method" value="1" />
+			<div class="form-row">
+				<?php wp_nonce_field( 'woocommerce-add-payment-method' ); ?>
+				<input type="submit" class="woocommerce-Button woocommerce-Button--alt button alt" id="place_order" value="<?php esc_attr_e( 'Add payment method', 'woocommerce' ); ?>" />
+				<input type="hidden" name="woocommerce_add_payment_method" id="woocommerce_add_payment_method" value="1" />
+			</div>
 		</div>
-
-	</div>
-
-</form>
+	</form>
+<?php else : ?>
+	<p class="woocommerce-notice woocommerce-notice--info woocommerce-info"><?php esc_html_e( 'Sorry, it seems that there are no payment methods which support adding a new payment method. Please contact us if you require assistance or wish to make alternate arrangements.', 'woocommerce' ); ?></p>
+<?php endif; ?>
diff --git a/templates/myaccount/form-edit-account.php b/templates/myaccount/form-edit-account.php
index be085c403cc..e76c6a0f6c7 100644
--- a/templates/myaccount/form-edit-account.php
+++ b/templates/myaccount/form-edit-account.php
@@ -4,57 +4,57 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/myaccount/form-edit-account.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
- * @author 		WooThemes
- * @package 	WooCommerce/Templates
- * @version     2.2.7
+ * @see     https://docs.woocommerce.com/document/template-structure/
+ * @author  WooThemes
+ * @package WooCommerce/Templates
+ * @version 2.6.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
-?>
 
-<?php wc_print_notices(); ?>
+do_action( 'woocommerce_before_edit_account_form' ); ?>
 
-<form action="" method="post">
+<form class="woocommerce-EditAccountForm edit-account" action="" method="post">
 
 	<?php do_action( 'woocommerce_edit_account_form_start' ); ?>
 
-	<p class="form-row form-row-first">
+	<p class="woocommerce-form-row woocommerce-form-row--first form-row form-row-first">
 		<label for="account_first_name"><?php _e( 'First name', 'woocommerce' ); ?> <span class="required">*</span></label>
-		<input type="text" class="input-text" name="account_first_name" id="account_first_name" value="<?php echo esc_attr( $user->first_name ); ?>" />
+		<input type="text" class="woocommerce-Input woocommerce-Input--text input-text" name="account_first_name" id="account_first_name" value="<?php echo esc_attr( $user->first_name ); ?>" />
 	</p>
-	<p class="form-row form-row-last">
+	<p class="woocommerce-form-row woocommerce-form-row--last form-row form-row-last">
 		<label for="account_last_name"><?php _e( 'Last name', 'woocommerce' ); ?> <span class="required">*</span></label>
-		<input type="text" class="input-text" name="account_last_name" id="account_last_name" value="<?php echo esc_attr( $user->last_name ); ?>" />
+		<input type="text" class="woocommerce-Input woocommerce-Input--text input-text" name="account_last_name" id="account_last_name" value="<?php echo esc_attr( $user->last_name ); ?>" />
 	</p>
 	<div class="clear"></div>
 
-	<p class="form-row form-row-wide">
+	<p class="woocommerce-form-row woocommerce-form-row--wide form-row form-row-wide">
 		<label for="account_email"><?php _e( 'Email address', 'woocommerce' ); ?> <span class="required">*</span></label>
-		<input type="email" class="input-text" name="account_email" id="account_email" value="<?php echo esc_attr( $user->user_email ); ?>" />
+		<input type="email" class="woocommerce-Input woocommerce-Input--email input-text" name="account_email" id="account_email" value="<?php echo esc_attr( $user->user_email ); ?>" />
 	</p>
 
 	<fieldset>
-		<legend><?php _e( 'Password Change', 'woocommerce' ); ?></legend>
+		<legend><?php _e( 'Password change', 'woocommerce' ); ?></legend>
 
-		<p class="form-row form-row-wide">
-			<label for="password_current"><?php _e( 'Current Password (leave blank to leave unchanged)', 'woocommerce' ); ?></label>
-			<input type="password" class="input-text" name="password_current" id="password_current" />
+		<p class="woocommerce-form-row woocommerce-form-row--wide form-row form-row-wide">
+			<label for="password_current"><?php _e( 'Current password (leave blank to leave unchanged)', 'woocommerce' ); ?></label>
+			<input type="password" class="woocommerce-Input woocommerce-Input--password input-text" name="password_current" id="password_current" />
 		</p>
-		<p class="form-row form-row-wide">
-			<label for="password_1"><?php _e( 'New Password (leave blank to leave unchanged)', 'woocommerce' ); ?></label>
-			<input type="password" class="input-text" name="password_1" id="password_1" />
+		<p class="woocommerce-form-row woocommerce-form-row--wide form-row form-row-wide">
+			<label for="password_1"><?php _e( 'New password (leave blank to leave unchanged)', 'woocommerce' ); ?></label>
+			<input type="password" class="woocommerce-Input woocommerce-Input--password input-text" name="password_1" id="password_1" />
 		</p>
-		<p class="form-row form-row-wide">
-			<label for="password_2"><?php _e( 'Confirm New Password', 'woocommerce' ); ?></label>
-			<input type="password" class="input-text" name="password_2" id="password_2" />
+		<p class="woocommerce-form-row woocommerce-form-row--wide form-row form-row-wide">
+			<label for="password_2"><?php _e( 'Confirm new password', 'woocommerce' ); ?></label>
+			<input type="password" class="woocommerce-Input woocommerce-Input--password input-text" name="password_2" id="password_2" />
 		</p>
 	</fieldset>
 	<div class="clear"></div>
@@ -63,10 +63,11 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 	<p>
 		<?php wp_nonce_field( 'save_account_details' ); ?>
-		<input type="submit" class="button" name="save_account_details" value="<?php esc_attr_e( 'Save changes', 'woocommerce' ); ?>" />
+		<input type="submit" class="woocommerce-Button button" name="save_account_details" value="<?php esc_attr_e( 'Save changes', 'woocommerce' ); ?>" />
 		<input type="hidden" name="action" value="save_account_details" />
 	</p>
 
 	<?php do_action( 'woocommerce_edit_account_form_end' ); ?>
-
 </form>
+
+<?php do_action( 'woocommerce_after_edit_account_form' ); ?>
diff --git a/templates/myaccount/form-edit-address.php b/templates/myaccount/form-edit-address.php
index b1362090689..d62f4892259 100644
--- a/templates/myaccount/form-edit-address.php
+++ b/templates/myaccount/form-edit-address.php
@@ -4,57 +4,54 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/myaccount/form-edit-address.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
- * @author      WooThemes
- * @package     WooCommerce/Templates
- * @version     2.1.0
+ * @see     https://docs.woocommerce.com/document/template-structure/
+ * @author  WooThemes
+ * @package WooCommerce/Templates
+ * @version 3.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
-global $current_user;
+$page_title = ( 'billing' === $load_address ) ? __( 'Billing address', 'woocommerce' ) : __( 'Shipping address', 'woocommerce' );
 
-$page_title = ( $load_address === 'billing' ) ? __( 'Billing Address', 'woocommerce' ) : __( 'Shipping Address', 'woocommerce' );
-
-get_currentuserinfo();
-
-?>
-
-<?php wc_print_notices(); ?>
+do_action( 'woocommerce_before_edit_account_address_form' ); ?>
 
 <?php if ( ! $load_address ) : ?>
-
 	<?php wc_get_template( 'myaccount/my-address.php' ); ?>
-
 <?php else : ?>
 
 	<form method="post">
 
-		<h3><?php echo apply_filters( 'woocommerce_my_account_edit_address_title', $page_title ); ?></h3>
+		<h3><?php echo apply_filters( 'woocommerce_my_account_edit_address_title', $page_title, $load_address ); ?></h3>
 
-		<?php do_action( "woocommerce_before_edit_address_form_{$load_address}" ); ?>
+		<div class="woocommerce-address-fields">
+			<?php do_action( "woocommerce_before_edit_address_form_{$load_address}" ); ?>
 
-		<?php foreach ( $address as $key => $field ) : ?>
+			<div class="woocommerce-address-fields__field-wrapper">
+				<?php foreach ( $address as $key => $field ) : ?>
+					<?php woocommerce_form_field( $key, $field, ! empty( $_POST[ $key ] ) ? wc_clean( $_POST[ $key ] ) : $field['value'] ); ?>
+				<?php endforeach; ?>
+			</div>
 
-			<?php woocommerce_form_field( $key, $field, ! empty( $_POST[ $key ] ) ? wc_clean( $_POST[ $key ] ) : $field['value'] ); ?>
+			<?php do_action( "woocommerce_after_edit_address_form_{$load_address}" ); ?>
 
-		<?php endforeach; ?>
-
-		<?php do_action( "woocommerce_after_edit_address_form_{$load_address}" ); ?>
-
-		<p>
-			<input type="submit" class="button" name="save_address" value="<?php esc_attr_e( 'Save Address', 'woocommerce' ); ?>" />
-			<?php wp_nonce_field( 'woocommerce-edit_address' ); ?>
-			<input type="hidden" name="action" value="edit_address" />
-		</p>
+			<p>
+				<input type="submit" class="button" name="save_address" value="<?php esc_attr_e( 'Save address', 'woocommerce' ); ?>" />
+				<?php wp_nonce_field( 'woocommerce-edit_address' ); ?>
+				<input type="hidden" name="action" value="edit_address" />
+			</p>
+		</div>
 
 	</form>
 
 <?php endif; ?>
+
+<?php do_action( 'woocommerce_after_edit_account_address_form' ); ?>
diff --git a/templates/myaccount/form-login.php b/templates/myaccount/form-login.php
index d35b3076900..c916fdd48f1 100644
--- a/templates/myaccount/form-login.php
+++ b/templates/myaccount/form-login.php
@@ -4,15 +4,16 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/myaccount/form-login.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
- * @author 		WooThemes
- * @package 	WooCommerce/Templates
- * @version     2.2.6
+ * @see     https://docs.woocommerce.com/document/template-structure/
+ * @author  WooThemes
+ * @package WooCommerce/Templates
+ * @version 2.6.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -27,37 +28,37 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 <?php if ( get_option( 'woocommerce_enable_myaccount_registration' ) === 'yes' ) : ?>
 
-<div class="col2-set" id="customer_login">
+<div class="u-columns col2-set" id="customer_login">
 
-	<div class="col-1">
+	<div class="u-column1 col-1">
 
 <?php endif; ?>
 
 		<h2><?php _e( 'Login', 'woocommerce' ); ?></h2>
 
-		<form method="post" class="login">
+		<form class="woocomerce-form woocommerce-form-login login" method="post">
 
 			<?php do_action( 'woocommerce_login_form_start' ); ?>
 
-			<p class="form-row form-row-wide">
+			<p class="woocommerce-form-row woocommerce-form-row--wide form-row form-row-wide">
 				<label for="username"><?php _e( 'Username or email address', 'woocommerce' ); ?> <span class="required">*</span></label>
-				<input type="text" class="input-text" name="username" id="username" value="<?php if ( ! empty( $_POST['username'] ) ) echo esc_attr( $_POST['username'] ); ?>" />
+				<input type="text" class="woocommerce-Input woocommerce-Input--text input-text" name="username" id="username" value="<?php echo ( ! empty( $_POST['username'] ) ) ? esc_attr( $_POST['username'] ) : ''; ?>" />
 			</p>
-			<p class="form-row form-row-wide">
+			<p class="woocommerce-form-row woocommerce-form-row--wide form-row form-row-wide">
 				<label for="password"><?php _e( 'Password', 'woocommerce' ); ?> <span class="required">*</span></label>
-				<input class="input-text" type="password" name="password" id="password" />
+				<input class="woocommerce-Input woocommerce-Input--text input-text" type="password" name="password" id="password" />
 			</p>
 
 			<?php do_action( 'woocommerce_login_form' ); ?>
 
 			<p class="form-row">
-				<?php wp_nonce_field( 'woocommerce-login' ); ?>
-				<input type="submit" class="button" name="login" value="<?php esc_attr_e( 'Login', 'woocommerce' ); ?>" />
-				<label for="rememberme" class="inline">
-					<input name="rememberme" type="checkbox" id="rememberme" value="forever" /> <?php _e( 'Remember me', 'woocommerce' ); ?>
+				<?php wp_nonce_field( 'woocommerce-login', 'woocommerce-login-nonce' ); ?>
+				<input type="submit" class="woocommerce-Button button" name="login" value="<?php esc_attr_e( 'Login', 'woocommerce' ); ?>" />
+				<label class="woocommerce-form__label woocommerce-form__label-for-checkbox inline">
+					<input class="woocommerce-form__input woocommerce-form__input-checkbox" name="rememberme" type="checkbox" id="rememberme" value="forever" /> <span><?php _e( 'Remember me', 'woocommerce' ); ?></span>
 				</label>
 			</p>
-			<p class="lost_password">
+			<p class="woocommerce-LostPassword lost_password">
 				<a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?', 'woocommerce' ); ?></a>
 			</p>
 
@@ -69,7 +70,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 	</div>
 
-	<div class="col-2">
+	<div class="u-column2 col-2">
 
 		<h2><?php _e( 'Register', 'woocommerce' ); ?></h2>
 
@@ -79,36 +80,35 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 			<?php if ( 'no' === get_option( 'woocommerce_registration_generate_username' ) ) : ?>
 
-				<p class="form-row form-row-wide">
+				<p class="woocommerce-form-row woocommerce-form-row--wide form-row form-row-wide">
 					<label for="reg_username"><?php _e( 'Username', 'woocommerce' ); ?> <span class="required">*</span></label>
-					<input type="text" class="input-text" name="username" id="reg_username" value="<?php if ( ! empty( $_POST['username'] ) ) echo esc_attr( $_POST['username'] ); ?>" />
+					<input type="text" class="woocommerce-Input woocommerce-Input--text input-text" name="username" id="reg_username" value="<?php echo ( ! empty( $_POST['username'] ) ) ? esc_attr( $_POST['username'] ) : ''; ?>" />
 				</p>
 
 			<?php endif; ?>
 
-			<p class="form-row form-row-wide">
+			<p class="woocommerce-form-row woocommerce-form-row--wide form-row form-row-wide">
 				<label for="reg_email"><?php _e( 'Email address', 'woocommerce' ); ?> <span class="required">*</span></label>
-				<input type="email" class="input-text" name="email" id="reg_email" value="<?php if ( ! empty( $_POST['email'] ) ) echo esc_attr( $_POST['email'] ); ?>" />
+				<input type="email" class="woocommerce-Input woocommerce-Input--text input-text" name="email" id="reg_email" value="<?php echo ( ! empty( $_POST['email'] ) ) ? esc_attr( $_POST['email'] ) : ''; ?>" />
 			</p>
 
 			<?php if ( 'no' === get_option( 'woocommerce_registration_generate_password' ) ) : ?>
 
-				<p class="form-row form-row-wide">
+				<p class="woocommerce-form-row woocommerce-form-row--wide form-row form-row-wide">
 					<label for="reg_password"><?php _e( 'Password', 'woocommerce' ); ?> <span class="required">*</span></label>
-					<input type="password" class="input-text" name="password" id="reg_password" />
+					<input type="password" class="woocommerce-Input woocommerce-Input--text input-text" name="password" id="reg_password" />
 				</p>
 
 			<?php endif; ?>
 
 			<!-- Spam Trap -->
-			<div style="<?php echo ( ( is_rtl() ) ? 'right' : 'left' ); ?>: -999em; position: absolute;"><label for="trap"><?php _e( 'Anti-spam', 'woocommerce' ); ?></label><input type="text" name="email_2" id="trap" tabindex="-1" /></div>
+			<div style="<?php echo ( ( is_rtl() ) ? 'right' : 'left' ); ?>: -999em; position: absolute;"><label for="trap"><?php _e( 'Anti-spam', 'woocommerce' ); ?></label><input type="text" name="email_2" id="trap" tabindex="-1" autocomplete="off" /></div>
 
 			<?php do_action( 'woocommerce_register_form' ); ?>
-			<?php do_action( 'register_form' ); ?>
 
-			<p class="form-row">
-				<?php wp_nonce_field( 'woocommerce-register' ); ?>
-				<input type="submit" class="button" name="register" value="<?php esc_attr_e( 'Register', 'woocommerce' ); ?>" />
+			<p class="woocomerce-FormRow form-row">
+				<?php wp_nonce_field( 'woocommerce-register', 'woocommerce-register-nonce' ); ?>
+				<input type="submit" class="woocommerce-Button button" name="register" value="<?php esc_attr_e( 'Register', 'woocommerce' ); ?>" />
 			</p>
 
 			<?php do_action( 'woocommerce_register_form_end' ); ?>
diff --git a/templates/myaccount/form-lost-password.php b/templates/myaccount/form-lost-password.php
index ad5016e4dc0..dc95c5dfeaf 100644
--- a/templates/myaccount/form-lost-password.php
+++ b/templates/myaccount/form-lost-password.php
@@ -4,60 +4,42 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/myaccount/form-lost-password.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see     https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
- * @version 2.3.0
+ * @version 3.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
-?>
+wc_print_notices(); ?>
 
-<?php wc_print_notices(); ?>
+<form method="post" class="woocommerce-ResetPassword lost_reset_password">
 
-<form method="post" class="lost_reset_password">
+	<p><?php echo apply_filters( 'woocommerce_lost_password_message', __( 'Lost your password? Please enter your username or email address. You will receive a link to create a new password via email.', 'woocommerce' ) ); ?></p>
 
-	<?php if( 'lost_password' === $args['form'] ) : ?>
-
-		<p><?php echo apply_filters( 'woocommerce_lost_password_message', __( 'Lost your password? Please enter your username or email address. You will receive a link to create a new password via email.', 'woocommerce' ) ); ?></p>
-
-		<p class="form-row form-row-first"><label for="user_login"><?php _e( 'Username or email', 'woocommerce' ); ?></label> <input class="input-text" type="text" name="user_login" id="user_login" /></p>
-
-	<?php else : ?>
-
-		<p><?php echo apply_filters( 'woocommerce_reset_password_message', __( 'Enter a new password below.', 'woocommerce') ); ?></p>
-
-		<p class="form-row form-row-first">
-			<label for="password_1"><?php _e( 'New password', 'woocommerce' ); ?> <span class="required">*</span></label>
-			<input type="password" class="input-text" name="password_1" id="password_1" />
-		</p>
-		<p class="form-row form-row-last">
-			<label for="password_2"><?php _e( 'Re-enter new password', 'woocommerce' ); ?> <span class="required">*</span></label>
-			<input type="password" class="input-text" name="password_2" id="password_2" />
-		</p>
-
-		<input type="hidden" name="reset_key" value="<?php echo isset( $args['key'] ) ? $args['key'] : ''; ?>" />
-		<input type="hidden" name="reset_login" value="<?php echo isset( $args['login'] ) ? $args['login'] : ''; ?>" />
-
-	<?php endif; ?>
+	<p class="woocommerce-form-row woocommerce-form-row--first form-row form-row-first">
+		<label for="user_login"><?php _e( 'Username or email', 'woocommerce' ); ?></label>
+		<input class="woocommerce-Input woocommerce-Input--text input-text" type="text" name="user_login" id="user_login" />
+	</p>
 
 	<div class="clear"></div>
 
 	<?php do_action( 'woocommerce_lostpassword_form' ); ?>
 
-	<p class="form-row">
+	<p class="woocommerce-form-row form-row">
 		<input type="hidden" name="wc_reset_password" value="true" />
-		<input type="submit" class="button" value="<?php echo 'lost_password' === $args['form'] ? __( 'Reset Password', 'woocommerce' ) : __( 'Save', 'woocommerce' ); ?>" />
+		<input type="submit" class="woocommerce-Button button" value="<?php esc_attr_e( 'Reset password', 'woocommerce' ); ?>" />
 	</p>
 
-	<?php wp_nonce_field( $args['form'] ); ?>
+	<?php wp_nonce_field( 'lost_password' ); ?>
 
 </form>
diff --git a/templates/myaccount/form-reset-password.php b/templates/myaccount/form-reset-password.php
new file mode 100644
index 00000000000..b578fb49b1e
--- /dev/null
+++ b/templates/myaccount/form-reset-password.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Lost password reset form.
+ *
+ * This template can be overridden by copying it to yourtheme/woocommerce/myaccount/form-reset-password.php.
+ *
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
+ *
+ * @see     https://docs.woocommerce.com/document/template-structure/
+ * @author  WooThemes
+ * @package WooCommerce/Templates
+ * @version 3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+wc_print_notices(); ?>
+
+<form method="post" class="woocommerce-ResetPassword lost_reset_password">
+
+	<p><?php echo apply_filters( 'woocommerce_reset_password_message', __( 'Enter a new password below.', 'woocommerce' ) ); ?></p>
+
+	<p class="woocommerce-form-row woocommerce-form-row--first form-row form-row-first">
+		<label for="password_1"><?php _e( 'New password', 'woocommerce' ); ?> <span class="required">*</span></label>
+		<input type="password" class="woocommerce-Input woocommerce-Input--text input-text" name="password_1" id="password_1" />
+	</p>
+	<p class="woocommerce-form-row woocommerce-form-row--last form-row form-row-last">
+		<label for="password_2"><?php _e( 'Re-enter new password', 'woocommerce' ); ?> <span class="required">*</span></label>
+		<input type="password" class="woocommerce-Input woocommerce-Input--text input-text" name="password_2" id="password_2" />
+	</p>
+
+	<input type="hidden" name="reset_key" value="<?php echo esc_attr( $args['key'] ); ?>" />
+	<input type="hidden" name="reset_login" value="<?php echo esc_attr( $args['login'] ); ?>" />
+
+	<div class="clear"></div>
+
+	<?php do_action( 'woocommerce_resetpassword_form' ); ?>
+
+	<p class="woocommerce-form-row form-row">
+		<input type="hidden" name="wc_reset_password" value="true" />
+		<input type="submit" class="woocommerce-Button button" value="<?php esc_attr_e( 'Save', 'woocommerce' ); ?>" />
+	</p>
+
+	<?php wp_nonce_field( 'reset_password' ); ?>
+
+</form>
diff --git a/templates/myaccount/lost-password-confirmation.php b/templates/myaccount/lost-password-confirmation.php
new file mode 100644
index 00000000000..ed39bf851de
--- /dev/null
+++ b/templates/myaccount/lost-password-confirmation.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Lost password confirmation text.
+ *
+ * This template can be overridden by copying it to yourtheme/woocommerce/myaccount/lost-password-confirmation.php.
+ *
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
+ *
+ * @see     https://docs.woocommerce.com/document/template-structure/
+ * @author  WooThemes
+ * @package WooCommerce/Templates
+ * @version 2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+wc_print_notices();
+wc_print_notice( __( 'Password reset email has been sent.', 'woocommerce' ) );
+?>
+
+<p><?php echo apply_filters( 'woocommerce_lost_password_message', __( 'A password reset email has been sent to the email address on file for your account, but may take several minutes to show up in your inbox. Please wait at least 10 minutes before attempting another reset.', 'woocommerce' ) ); ?></p>
diff --git a/templates/myaccount/my-account.php b/templates/myaccount/my-account.php
index ff2bff67704..ec4097776f1 100644
--- a/templates/myaccount/my-account.php
+++ b/templates/myaccount/my-account.php
@@ -4,43 +4,36 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/myaccount/my-account.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
- * @author 		WooThemes
- * @package 	WooCommerce/Templates
- * @version     2.0.0
+ * @see     https://docs.woocommerce.com/document/template-structure/
+ * @author  WooThemes
+ * @package WooCommerce/Templates
+ * @version 2.6.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
-wc_print_notices(); ?>
+wc_print_notices();
 
-<p class="myaccount_user">
+/**
+ * My Account navigation.
+ * @since 2.6.0
+ */
+do_action( 'woocommerce_account_navigation' ); ?>
+
+<div class="woocommerce-MyAccount-content">
 	<?php
-	printf(
-		__( 'Hello <strong>%1$s</strong> (not %1$s? <a href="%2$s">Sign out</a>).', 'woocommerce' ) . ' ',
-		$current_user->display_name,
-		wc_get_endpoint_url( 'customer-logout', '', wc_get_page_permalink( 'myaccount' ) )
-	);
-
-	printf( __( 'From your account dashboard you can view your recent orders, manage your shipping and billing addresses and <a href="%s">edit your password and account details</a>.', 'woocommerce' ),
-		wc_customer_edit_account_url()
-	);
+		/**
+		 * My Account content.
+		 * @since 2.6.0
+		 */
+		do_action( 'woocommerce_account_content' );
 	?>
-</p>
-
-<?php do_action( 'woocommerce_before_my_account' ); ?>
-
-<?php wc_get_template( 'myaccount/my-downloads.php' ); ?>
-
-<?php wc_get_template( 'myaccount/my-orders.php', array( 'order_count' => $order_count ) ); ?>
-
-<?php wc_get_template( 'myaccount/my-address.php' ); ?>
-
-<?php do_action( 'woocommerce_after_my_account' ); ?>
+</div>
diff --git a/templates/myaccount/my-address.php b/templates/myaccount/my-address.php
index eb3b68839ed..db51bc2aa41 100644
--- a/templates/myaccount/my-address.php
+++ b/templates/myaccount/my-address.php
@@ -4,15 +4,16 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/myaccount/my-address.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
- * @author 		WooThemes
- * @package 	WooCommerce/Templates
- * @version     2.2.0
+ * @see     https://docs.woocommerce.com/document/template-structure/
+ * @author  WooThemes
+ * @package WooCommerce/Templates
+ * @version 2.6.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -21,36 +22,35 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 $customer_id = get_current_user_id();
 
-if ( ! wc_ship_to_billing_address_only() && get_option( 'woocommerce_calc_shipping' ) !== 'no' ) {
-	$page_title = apply_filters( 'woocommerce_my_account_my_address_title', __( 'My Addresses', 'woocommerce' ) );
-	$get_addresses    = apply_filters( 'woocommerce_my_account_get_addresses', array(
-		'billing' => __( 'Billing Address', 'woocommerce' ),
-		'shipping' => __( 'Shipping Address', 'woocommerce' )
+if ( ! wc_ship_to_billing_address_only() && wc_shipping_enabled() ) {
+	$get_addresses = apply_filters( 'woocommerce_my_account_get_addresses', array(
+		'billing' => __( 'Billing address', 'woocommerce' ),
+		'shipping' => __( 'Shipping address', 'woocommerce' ),
 	), $customer_id );
 } else {
-	$page_title = apply_filters( 'woocommerce_my_account_my_address_title', __( 'My Address', 'woocommerce' ) );
-	$get_addresses    = apply_filters( 'woocommerce_my_account_get_addresses', array(
-		'billing' =>  __( 'Billing Address', 'woocommerce' )
+	$get_addresses = apply_filters( 'woocommerce_my_account_get_addresses', array(
+		'billing' => __( 'Billing address', 'woocommerce' ),
 	), $customer_id );
 }
 
-$col = 1;
+$oldcol = 1;
+$col    = 1;
 ?>
 
-<h2><?php echo $page_title; ?></h2>
-
-<p class="myaccount_address">
+<p>
 	<?php echo apply_filters( 'woocommerce_my_account_my_address_description', __( 'The following addresses will be used on the checkout page by default.', 'woocommerce' ) ); ?>
 </p>
 
-<?php if ( ! wc_ship_to_billing_address_only() && get_option( 'woocommerce_calc_shipping' ) !== 'no' ) echo '<div class="col2-set addresses">'; ?>
+<?php if ( ! wc_ship_to_billing_address_only() && wc_shipping_enabled() ) : ?>
+	<div class="u-columns woocommerce-Addresses col2-set addresses">
+<?php endif; ?>
 
 <?php foreach ( $get_addresses as $name => $title ) : ?>
 
-	<div class="col-<?php echo ( ( $col = $col * -1 ) < 0 ) ? 1 : 2; ?> address">
-		<header class="title">
+	<div class="u-column<?php echo ( ( $col = $col * -1 ) < 0 ) ? 1 : 2; ?> col-<?php echo ( ( $oldcol = $oldcol * -1 ) < 0 ) ? 1 : 2; ?> woocommerce-Address">
+		<header class="woocommerce-Address-title title">
 			<h3><?php echo $title; ?></h3>
-			<a href="<?php echo wc_get_endpoint_url( 'edit-address', $name ); ?>" class="edit"><?php _e( 'Edit', 'woocommerce' ); ?></a>
+			<a href="<?php echo esc_url( wc_get_endpoint_url( 'edit-address', $name ) ); ?>" class="edit"><?php _e( 'Edit', 'woocommerce' ); ?></a>
 		</header>
 		<address>
 			<?php
@@ -63,19 +63,22 @@ $col = 1;
 					'city'        => get_user_meta( $customer_id, $name . '_city', true ),
 					'state'       => get_user_meta( $customer_id, $name . '_state', true ),
 					'postcode'    => get_user_meta( $customer_id, $name . '_postcode', true ),
-					'country'     => get_user_meta( $customer_id, $name . '_country', true )
+					'country'     => get_user_meta( $customer_id, $name . '_country', true ),
 				), $customer_id, $name );
 
 				$formatted_address = WC()->countries->get_formatted_address( $address );
 
-				if ( ! $formatted_address )
+				if ( ! $formatted_address ) {
 					_e( 'You have not set up this type of address yet.', 'woocommerce' );
-				else
+				} else {
 					echo $formatted_address;
+				}
 			?>
 		</address>
 	</div>
 
 <?php endforeach; ?>
 
-<?php if ( ! wc_ship_to_billing_address_only() && get_option( 'woocommerce_calc_shipping' ) !== 'no' ) echo '</div>'; ?>
+<?php if ( ! wc_ship_to_billing_address_only() && wc_shipping_enabled() ) : ?>
+	</div>
+<?php endif;
diff --git a/templates/myaccount/my-downloads.php b/templates/myaccount/my-downloads.php
index 97bb056a699..3e1254f92d1 100644
--- a/templates/myaccount/my-downloads.php
+++ b/templates/myaccount/my-downloads.php
@@ -1,20 +1,22 @@
 <?php
 /**
- * My Orders
+ * My Downloads
  *
- * Shows recent orders on the account page.
+ * Shows downloads on the account page.
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/myaccount/my-downloads.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
- * @author 		WooThemes
- * @package 	WooCommerce/Templates
+ * @see         https://docs.woocommerce.com/document/template-structure/
+ * @author      WooThemes
+ * @package     WooCommerce/Templates
  * @version     2.0.0
+ * @depreacated 2.6.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -25,16 +27,17 @@ if ( $downloads = WC()->customer->get_downloadable_products() ) : ?>
 
 	<?php do_action( 'woocommerce_before_available_downloads' ); ?>
 
-	<h2><?php echo apply_filters( 'woocommerce_my_account_my_downloads_title', __( 'Available Downloads', 'woocommerce' ) ); ?></h2>
+	<h2><?php echo apply_filters( 'woocommerce_my_account_my_downloads_title', __( 'Available downloads', 'woocommerce' ) ); ?></h2>
 
-	<ul class="digital-downloads">
+	<ul class="woocommerce-Downloads digital-downloads">
 		<?php foreach ( $downloads as $download ) : ?>
 			<li>
 				<?php
 					do_action( 'woocommerce_available_download_start', $download );
 
-					if ( is_numeric( $download['downloads_remaining'] ) )
-						echo apply_filters( 'woocommerce_available_download_count', '<span class="count">' . sprintf( _n( '%s download remaining', '%s downloads remaining', $download['downloads_remaining'], 'woocommerce' ), $download['downloads_remaining'] ) . '</span> ', $download );
+					if ( is_numeric( $download['downloads_remaining'] ) ) {
+						echo apply_filters( 'woocommerce_available_download_count', '<span class="woocommerce-Count count">' . sprintf( _n( '%s download remaining', '%s downloads remaining', $download['downloads_remaining'], 'woocommerce' ), $download['downloads_remaining'] ) . '</span> ', $download );
+					}
 
 					echo apply_filters( 'woocommerce_available_download_link', '<a href="' . esc_url( $download['download_url'] ) . '">' . $download['download_name'] . '</a>', $download );
 
diff --git a/templates/myaccount/my-orders.php b/templates/myaccount/my-orders.php
index 963108634ae..b46d75aaf66 100644
--- a/templates/myaccount/my-orders.php
+++ b/templates/myaccount/my-orders.php
@@ -2,19 +2,7 @@
 /**
  * My Orders
  *
- * Shows recent orders on the account page.
- *
- * This template can be overridden by copying it to yourtheme/woocommerce/myaccount/my-orders.php.
- *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
- *
- * @see 	http://docs.woothemes.com/document/template-structure/
- * @author  WooThemes
- * @package WooCommerce/Templates
- * @version 2.5.0
+ * @deprecated  2.6.0 this template file is no longer used. My Account shortcode uses orders.php.
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -34,12 +22,12 @@ $customer_orders = get_posts( apply_filters( 'woocommerce_my_account_my_orders_q
 	'meta_key'    => '_customer_user',
 	'meta_value'  => get_current_user_id(),
 	'post_type'   => wc_get_order_types( 'view-orders' ),
-	'post_status' => array_keys( wc_get_order_statuses() )
+	'post_status' => array_keys( wc_get_order_statuses() ),
 ) ) );
 
 if ( $customer_orders ) : ?>
 
-	<h2><?php echo apply_filters( 'woocommerce_my_account_my_orders_title', __( 'Recent Orders', 'woocommerce' ) ); ?></h2>
+	<h2><?php echo apply_filters( 'woocommerce_my_account_my_orders_title', __( 'Recent orders', 'woocommerce' ) ); ?></h2>
 
 	<table class="shop_table shop_table_responsive my_account_orders">
 
@@ -68,29 +56,32 @@ if ( $customer_orders ) : ?>
 								</a>
 
 							<?php elseif ( 'order-date' === $column_id ) : ?>
-								<time datetime="<?php echo date( 'Y-m-d', strtotime( $order->order_date ) ); ?>" title="<?php echo esc_attr( strtotime( $order->order_date ) ); ?>"><?php echo date_i18n( get_option( 'date_format' ), strtotime( $order->order_date ) ); ?></time>
+								<time datetime="<?php echo esc_attr( $order->get_date_created()->date( 'c' ) ); ?>"><?php echo esc_html( wc_format_datetime( $order->get_date_created() ) ); ?></time>
 
 							<?php elseif ( 'order-status' === $column_id ) : ?>
-								<?php echo wc_get_order_status_name( $order->get_status() ); ?>
+								<?php echo esc_html( wc_get_order_status_name( $order->get_status() ) ); ?>
 
 							<?php elseif ( 'order-total' === $column_id ) : ?>
-								<?php echo sprintf( _n( '%s for %s item', '%s for %s items', $item_count, 'woocommerce' ), $order->get_formatted_order_total(), $item_count ); ?>
+								<?php
+								/* translators: 1: formatted order total 2: total order items */
+								printf( _n( '%1$s for %2$s item', '%1$s for %2$s items', $item_count, 'woocommerce' ), $order->get_formatted_order_total(), $item_count );
+								?>
 
 							<?php elseif ( 'order-actions' === $column_id ) : ?>
 								<?php
 									$actions = array(
 										'pay'    => array(
 											'url'  => $order->get_checkout_payment_url(),
-											'name' => __( 'Pay', 'woocommerce' )
+											'name' => __( 'Pay', 'woocommerce' ),
 										),
 										'view'   => array(
 											'url'  => $order->get_view_order_url(),
-											'name' => __( 'View', 'woocommerce' )
+											'name' => __( 'View', 'woocommerce' ),
 										),
 										'cancel' => array(
 											'url'  => $order->get_cancel_order_url( wc_get_page_permalink( 'myaccount' ) ),
-											'name' => __( 'Cancel', 'woocommerce' )
-										)
+											'name' => __( 'Cancel', 'woocommerce' ),
+										),
 									);
 
 									if ( ! $order->needs_payment() ) {
diff --git a/templates/myaccount/navigation.php b/templates/myaccount/navigation.php
new file mode 100644
index 00000000000..72e91b2d8c0
--- /dev/null
+++ b/templates/myaccount/navigation.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * My Account navigation
+ *
+ * This template can be overridden by copying it to yourtheme/woocommerce/myaccount/navigation.php.
+ *
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
+ *
+ * @see     https://docs.woocommerce.com/document/template-structure/
+ * @author  WooThemes
+ * @package WooCommerce/Templates
+ * @version 2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+do_action( 'woocommerce_before_account_navigation' );
+?>
+
+<nav class="woocommerce-MyAccount-navigation">
+	<ul>
+		<?php foreach ( wc_get_account_menu_items() as $endpoint => $label ) : ?>
+			<li class="<?php echo wc_get_account_menu_item_classes( $endpoint ); ?>">
+				<a href="<?php echo esc_url( wc_get_account_endpoint_url( $endpoint ) ); ?>"><?php echo esc_html( $label ); ?></a>
+			</li>
+		<?php endforeach; ?>
+	</ul>
+</nav>
+
+<?php do_action( 'woocommerce_after_account_navigation' ); ?>
diff --git a/templates/myaccount/orders.php b/templates/myaccount/orders.php
new file mode 100644
index 00000000000..528ac40adae
--- /dev/null
+++ b/templates/myaccount/orders.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * Orders
+ *
+ * Shows orders on the account page.
+ *
+ * This template can be overridden by copying it to yourtheme/woocommerce/myaccount/orders.php.
+ *
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
+ *
+ * @see 	https://docs.woocommerce.com/document/template-structure/
+ * @author  WooThemes
+ * @package WooCommerce/Templates
+ * @version 3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+do_action( 'woocommerce_before_account_orders', $has_orders ); ?>
+
+<?php if ( $has_orders ) : ?>
+
+	<table class="woocommerce-orders-table woocommerce-MyAccount-orders shop_table shop_table_responsive my_account_orders account-orders-table">
+		<thead>
+			<tr>
+				<?php foreach ( wc_get_account_orders_columns() as $column_id => $column_name ) : ?>
+					<th class="woocommerce-orders-table__header woocommerce-orders-table__header-<?php echo esc_attr( $column_id ); ?>"><span class="nobr"><?php echo esc_html( $column_name ); ?></span></th>
+				<?php endforeach; ?>
+			</tr>
+		</thead>
+
+		<tbody>
+			<?php foreach ( $customer_orders->orders as $customer_order ) :
+				$order      = wc_get_order( $customer_order );
+				$item_count = $order->get_item_count();
+				?>
+				<tr class="woocommerce-orders-table__row woocommerce-orders-table__row--status-<?php echo esc_attr( $order->get_status() ); ?> order">
+					<?php foreach ( wc_get_account_orders_columns() as $column_id => $column_name ) : ?>
+						<td class="woocommerce-orders-table__cell woocommerce-orders-table__cell-<?php echo esc_attr( $column_id ); ?>" data-title="<?php echo esc_attr( $column_name ); ?>">
+							<?php if ( has_action( 'woocommerce_my_account_my_orders_column_' . $column_id ) ) : ?>
+								<?php do_action( 'woocommerce_my_account_my_orders_column_' . $column_id, $order ); ?>
+
+							<?php elseif ( 'order-number' === $column_id ) : ?>
+								<a href="<?php echo esc_url( $order->get_view_order_url() ); ?>">
+									<?php echo _x( '#', 'hash before order number', 'woocommerce' ) . $order->get_order_number(); ?>
+								</a>
+
+							<?php elseif ( 'order-date' === $column_id ) : ?>
+								<time datetime="<?php echo esc_attr( $order->get_date_created()->date( 'c' ) ); ?>"><?php echo esc_html( wc_format_datetime( $order->get_date_created() ) ); ?></time>
+
+							<?php elseif ( 'order-status' === $column_id ) : ?>
+								<?php echo esc_html( wc_get_order_status_name( $order->get_status() ) ); ?>
+
+							<?php elseif ( 'order-total' === $column_id ) : ?>
+								<?php
+								/* translators: 1: formatted order total 2: total order items */
+								printf( _n( '%1$s for %2$s item', '%1$s for %2$s items', $item_count, 'woocommerce' ), $order->get_formatted_order_total(), $item_count );
+								?>
+
+							<?php elseif ( 'order-actions' === $column_id ) : ?>
+								<?php
+									$actions = array(
+										'pay'    => array(
+											'url'  => $order->get_checkout_payment_url(),
+											'name' => __( 'Pay', 'woocommerce' ),
+										),
+										'view'   => array(
+											'url'  => $order->get_view_order_url(),
+											'name' => __( 'View', 'woocommerce' ),
+										),
+										'cancel' => array(
+											'url'  => $order->get_cancel_order_url( wc_get_page_permalink( 'myaccount' ) ),
+											'name' => __( 'Cancel', 'woocommerce' ),
+										),
+									);
+
+									if ( ! $order->needs_payment() ) {
+										unset( $actions['pay'] );
+									}
+
+									if ( ! in_array( $order->get_status(), apply_filters( 'woocommerce_valid_order_statuses_for_cancel', array( 'pending', 'failed' ), $order ) ) ) {
+										unset( $actions['cancel'] );
+									}
+
+									if ( $actions = apply_filters( 'woocommerce_my_account_my_orders_actions', $actions, $order ) ) {
+										foreach ( $actions as $key => $action ) {
+											echo '<a href="' . esc_url( $action['url'] ) . '" class="woocommerce-button button ' . sanitize_html_class( $key ) . '">' . esc_html( $action['name'] ) . '</a>';
+										}
+									}
+								?>
+							<?php endif; ?>
+						</td>
+					<?php endforeach; ?>
+				</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+	<?php do_action( 'woocommerce_before_account_orders_pagination' ); ?>
+
+	<?php if ( 1 < $customer_orders->max_num_pages ) : ?>
+		<div class="woocommerce-pagination woocommerce-pagination--without-numbers woocommerce-Pagination">
+			<?php if ( 1 !== $current_page ) : ?>
+				<a class="woocommerce-button woocommerce-button--previous woocommerce-Button woocommerce-Button--previous button" href="<?php echo esc_url( wc_get_endpoint_url( 'orders', $current_page - 1 ) ); ?>"><?php _e( 'Previous', 'woocommerce' ); ?></a>
+			<?php endif; ?>
+
+			<?php if ( intval( $customer_orders->max_num_pages ) !== $current_page ) : ?>
+				<a class="woocommerce-button woocommerce-button--next woocommerce-Button woocommerce-Button--next button" href="<?php echo esc_url( wc_get_endpoint_url( 'orders', $current_page + 1 ) ); ?>"><?php _e( 'Next', 'woocommerce' ); ?></a>
+			<?php endif; ?>
+		</div>
+	<?php endif; ?>
+
+<?php else : ?>
+	<div class="woocommerce-message woocommerce-message--info woocommerce-Message woocommerce-Message--info woocommerce-info">
+		<a class="woocommerce-Button button" href="<?php echo esc_url( apply_filters( 'woocommerce_return_to_shop_redirect', wc_get_page_permalink( 'shop' ) ) ); ?>">
+			<?php _e( 'Go shop', 'woocommerce' ) ?>
+		</a>
+		<?php _e( 'No order has been made yet.', 'woocommerce' ); ?>
+	</div>
+<?php endif; ?>
+
+<?php do_action( 'woocommerce_after_account_orders', $has_orders ); ?>
diff --git a/templates/myaccount/payment-methods.php b/templates/myaccount/payment-methods.php
new file mode 100644
index 00000000000..fb11fe6c187
--- /dev/null
+++ b/templates/myaccount/payment-methods.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Payment methods
+ *
+ * Shows customer payment methods on the account page.
+ *
+ * This template can be overridden by copying it to yourtheme/woocommerce/myaccount/payment-methods.php.
+ *
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
+ *
+ * @see 	https://docs.woocommerce.com/document/template-structure/
+ * @author  WooThemes
+ * @package WooCommerce/Templates
+ * @version 2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+$saved_methods = wc_get_customer_saved_methods_list( get_current_user_id() );
+$has_methods   = (bool) $saved_methods;
+$types         = wc_get_account_payment_methods_types();
+
+do_action( 'woocommerce_before_account_payment_methods', $has_methods ); ?>
+
+<?php if ( $has_methods ) : ?>
+
+	<table class="woocommerce-MyAccount-paymentMethods shop_table shop_table_responsive account-payment-methods-table">
+		<thead>
+			<tr>
+				<?php foreach ( wc_get_account_payment_methods_columns() as $column_id => $column_name ) : ?>
+					<th class="woocommerce-PaymentMethod woocommerce-PaymentMethod--<?php echo esc_attr( $column_id ); ?> payment-method-<?php echo esc_attr( $column_id ); ?>"><span class="nobr"><?php echo esc_html( $column_name ); ?></span></th>
+				<?php endforeach; ?>
+			</tr>
+		</thead>
+		<?php foreach ( $saved_methods as $type => $methods ) : ?>
+			<?php foreach ( $methods as $method ) : ?>
+				<tr class="payment-method<?php echo ! empty( $method['is_default'] ) ? ' default-payment-method' : '' ?>">
+					<?php foreach ( wc_get_account_payment_methods_columns() as $column_id => $column_name ) : ?>
+						<td class="woocommerce-PaymentMethod woocommerce-PaymentMethod--<?php echo esc_attr( $column_id ); ?> payment-method-<?php echo esc_attr( $column_id ); ?>" data-title="<?php echo esc_attr( $column_name ); ?>">
+							<?php
+							if ( has_action( 'woocommerce_account_payment_methods_column_' . $column_id ) ) {
+								do_action( 'woocommerce_account_payment_methods_column_' . $column_id, $method );
+							} elseif ( 'method' === $column_id ) {
+								if ( ! empty( $method['method']['last4'] ) ) {
+									/* translators: 1: credit card type 2: last 4 digits */
+									echo sprintf( __( '%1$s ending in %2$s', 'woocommerce' ), esc_html( wc_get_credit_card_type_label( $method['method']['brand'] ) ), esc_html( $method['method']['last4'] ) );
+								} else {
+									echo esc_html( wc_get_credit_card_type_label( $method['method']['brand'] ) );
+								}
+							} elseif ( 'expires' === $column_id ) {
+								echo esc_html( $method['expires'] );
+							} elseif ( 'actions' === $column_id ) {
+								foreach ( $method['actions'] as $key => $action ) {
+									echo '<a href="' . esc_url( $action['url'] ) . '" class="button ' . sanitize_html_class( $key ) . '">' . esc_html( $action['name'] ) . '</a>&nbsp;';
+								}
+							}
+							?>
+						</td>
+					<?php endforeach; ?>
+				</tr>
+			<?php endforeach; ?>
+		<?php endforeach; ?>
+	</table>
+
+<?php else : ?>
+
+	<p class="woocommerce-Message woocommerce-Message--info woocommerce-info"><?php esc_html_e( 'No saved methods found.', 'woocommerce' ); ?></p>
+
+<?php endif; ?>
+
+<?php do_action( 'woocommerce_after_account_payment_methods', $has_methods ); ?>
+
+<a class="button" href="<?php echo esc_url( wc_get_endpoint_url( 'add-payment-method' ) ); ?>"><?php esc_html_e( 'Add payment method', 'woocommerce' ); ?></a>
diff --git a/templates/myaccount/view-order.php b/templates/myaccount/view-order.php
index 6973ba18728..aeacc9e3b3b 100644
--- a/templates/myaccount/view-order.php
+++ b/templates/myaccount/view-order.php
@@ -6,37 +6,42 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/myaccount/view-order.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
- * @author    WooThemes
- * @package   WooCommerce/Templates
- * @version   2.2.0
+ * @see     https://docs.woocommerce.com/document/template-structure/
+ * @author  WooThemes
+ * @package WooCommerce/Templates
+ * @version 3.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
 ?>
+<p><?php
+	/* translators: 1: order number 2: order date 3: order status */
+	printf(
+		__( 'Order #%1$s was placed on %2$s and is currently %3$s.', 'woocommerce' ),
+		'<mark class="order-number">' . $order->get_order_number() . '</mark>',
+		'<mark class="order-date">' . wc_format_datetime( $order->get_date_created() ) . '</mark>',
+		'<mark class="order-status">' . wc_get_order_status_name( $order->get_status() ) . '</mark>'
+	);
+?></p>
 
-<?php wc_print_notices(); ?>
-
-<p class="order-info"><?php printf( __( 'Order #<mark class="order-number">%s</mark> was placed on <mark class="order-date">%s</mark> and is currently <mark class="order-status">%s</mark>.', 'woocommerce' ), $order->get_order_number(), date_i18n( get_option( 'date_format' ), strtotime( $order->order_date ) ), wc_get_order_status_name( $order->get_status() ) ); ?></p>
-
-<?php if ( $notes = $order->get_customer_order_notes() ) :
-	?>
-	<h2><?php _e( 'Order Updates', 'woocommerce' ); ?></h2>
-	<ol class="commentlist notes">
+<?php if ( $notes = $order->get_customer_order_notes() ) : ?>
+	<h2><?php _e( 'Order updates', 'woocommerce' ); ?></h2>
+	<ol class="woocommerce-OrderUpdates commentlist notes">
 		<?php foreach ( $notes as $note ) : ?>
-		<li class="comment note">
-			<div class="comment_container">
-				<div class="comment-text">
-					<p class="meta"><?php echo date_i18n( __( 'l jS \o\f F Y, h:ia', 'woocommerce' ), strtotime( $note->comment_date ) ); ?></p>
-					<div class="description">
+		<li class="woocommerce-OrderUpdate comment note">
+			<div class="woocommerce-OrderUpdate-inner comment_container">
+				<div class="woocommerce-OrderUpdate-text comment-text">
+					<p class="woocommerce-OrderUpdate-meta meta"><?php echo date_i18n( __( 'l jS \o\f F Y, h:ia', 'woocommerce' ), strtotime( $note->comment_date ) ); ?></p>
+					<div class="woocommerce-OrderUpdate-description description">
 						<?php echo wpautop( wptexturize( $note->comment_content ) ); ?>
 					</div>
 	  				<div class="clear"></div>
@@ -46,7 +51,6 @@ if ( ! defined( 'ABSPATH' ) ) {
 		</li>
 		<?php endforeach; ?>
 	</ol>
-	<?php
-endif;
+<?php endif; ?>
 
-do_action( 'woocommerce_view_order', $order_id );
+<?php do_action( 'woocommerce_view_order', $order_id ); ?>
diff --git a/templates/notices/error.php b/templates/notices/error.php
index de4485d074b..0322ae3bd87 100644
--- a/templates/notices/error.php
+++ b/templates/notices/error.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/notices/error.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     1.6.4
@@ -19,7 +20,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
 
-if ( ! $messages ){
+if ( ! $messages ) {
 	return;
 }
 
diff --git a/templates/notices/notice.php b/templates/notices/notice.php
index 2f6feb4c788..fe92bbe9b11 100644
--- a/templates/notices/notice.php
+++ b/templates/notices/notice.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/notices/notice.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     1.6.4
@@ -19,7 +20,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
 
-if ( ! $messages ){
+if ( ! $messages ) {
 	return;
 }
 
diff --git a/templates/notices/success.php b/templates/notices/success.php
index 7bb7d7bc96a..c3940e511b0 100644
--- a/templates/notices/success.php
+++ b/templates/notices/success.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/notices/success.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     1.6.4
@@ -19,7 +20,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
 
-if ( ! $messages ){
+if ( ! $messages ) {
 	return;
 }
 
diff --git a/templates/order/form-tracking.php b/templates/order/form-tracking.php
index 98d684b5577..a390c6e537b 100644
--- a/templates/order/form-tracking.php
+++ b/templates/order/form-tracking.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/order/form-tracking.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
  * @version 1.6.4
@@ -28,7 +29,7 @@ global $post;
 	<p><?php _e( 'To track your order please enter your Order ID in the box below and press the "Track" button. This was given to you on your receipt and in the confirmation email you should have received.', 'woocommerce' ); ?></p>
 
 	<p class="form-row form-row-first"><label for="orderid"><?php _e( 'Order ID', 'woocommerce' ); ?></label> <input class="input-text" type="text" name="orderid" id="orderid" placeholder="<?php esc_attr_e( 'Found in your order confirmation email.', 'woocommerce' ); ?>" /></p>
-	<p class="form-row form-row-last"><label for="order_email"><?php _e( 'Billing Email', 'woocommerce' ); ?></label> <input class="input-text" type="text" name="order_email" id="order_email" placeholder="<?php esc_attr_e( 'Email you used during checkout.', 'woocommerce' ); ?>" /></p>
+	<p class="form-row form-row-last"><label for="order_email"><?php _e( 'Billing email', 'woocommerce' ); ?></label> <input class="input-text" type="text" name="order_email" id="order_email" placeholder="<?php esc_attr_e( 'Email you used during checkout.', 'woocommerce' ); ?>" /></p>
 	<div class="clear"></div>
 
 	<p class="form-row"><input type="submit" class="button" name="track" value="<?php esc_attr_e( 'Track', 'woocommerce' ); ?>" /></p>
diff --git a/templates/order/order-again.php b/templates/order/order-again.php
index 1b54e928265..a7ba7a703cf 100644
--- a/templates/order/order-again.php
+++ b/templates/order/order-again.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/order/order-again.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
  * @version 2.3.0
@@ -21,5 +22,5 @@ if ( ! defined( 'ABSPATH' ) ) {
 ?>
 
 <p class="order-again">
-	<a href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'order_again', $order->id ) , 'woocommerce-order_again' ) ); ?>" class="button"><?php _e( 'Order Again', 'woocommerce' ); ?></a>
+	<a href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'order_again', $order->get_id() ) , 'woocommerce-order_again' ) ); ?>" class="button"><?php _e( 'Order again', 'woocommerce' ); ?></a>
 </p>
diff --git a/templates/order/order-details-customer.php b/templates/order/order-details-customer.php
index 8d814a23e3e..2cc1b5e9477 100644
--- a/templates/order/order-details-customer.php
+++ b/templates/order/order-details-customer.php
@@ -4,73 +4,84 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/order/order-details-customer.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
- * @version 2.4.0
+ * @version 3.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 ?>
-<header><h2><?php _e( 'Customer Details', 'woocommerce' ); ?></h2></header>
 
-<table class="shop_table customer_details">
-	<?php if ( $order->customer_note ) : ?>
-		<tr>
-			<th><?php _e( 'Note:', 'woocommerce' ); ?></th>
-			<td><?php echo wptexturize( $order->customer_note ); ?></td>
-		</tr>
+<section class="woocommerce-customer-details">
+
+	<h2><?php _e( 'Customer details', 'woocommerce' ); ?></h2>
+
+	<table class="woocommerce-table woocommerce-table--customer-details shop_table customer_details">
+
+		<?php if ( $order->get_customer_note() ) : ?>
+			<tr>
+				<th><?php _e( 'Note:', 'woocommerce' ); ?></th>
+				<td><?php echo wptexturize( $order->get_customer_note() ); ?></td>
+			</tr>
+		<?php endif; ?>
+
+		<?php if ( $order->get_billing_email() ) : ?>
+			<tr>
+				<th><?php _e( 'Email:', 'woocommerce' ); ?></th>
+				<td><?php echo esc_html( $order->get_billing_email() ); ?></td>
+			</tr>
+		<?php endif; ?>
+
+		<?php if ( $order->get_billing_phone() ) : ?>
+			<tr>
+				<th><?php _e( 'Phone:', 'woocommerce' ); ?></th>
+				<td><?php echo esc_html( $order->get_billing_phone() ); ?></td>
+			</tr>
+		<?php endif; ?>
+
+		<?php do_action( 'woocommerce_order_details_after_customer_details', $order ); ?>
+
+	</table>
+
+	<?php if ( ! wc_ship_to_billing_address_only() && $order->needs_shipping_address() ) : ?>
+
+	<section class="woocommerce-columns woocommerce-columns--2 woocommerce-columns--addresses col2-set addresses">
+
+		<div class="woocommerce-column woocommerce-column--1 woocommerce-column--billing-address col-1">
+
+			<?php endif; ?>
+
+			<h3 class="woocommerce-column__title"><?php _e( 'Billing address', 'woocommerce' ); ?></h3>
+
+			<address>
+				<?php echo ( $address = $order->get_formatted_billing_address() ) ? $address : __( 'N/A', 'woocommerce' ); ?>
+			</address>
+
+			<?php if ( ! wc_ship_to_billing_address_only() && $order->needs_shipping_address() ) : ?>
+
+		</div><!-- /.col-1 -->
+
+		<div class="woocommerce-column woocommerce-column--2 woocommerce-column--shipping-address col-2">
+
+			<h3 class="woocommerce-column__title"><?php _e( 'Shipping address', 'woocommerce' ); ?></h3>
+
+			<address>
+				<?php echo ( $address = $order->get_formatted_shipping_address() ) ? $address : __( 'N/A', 'woocommerce' ); ?>
+			</address>
+
+		</div><!-- /.col-2 -->
+
+	</section><!-- /.col2-set -->
+
 	<?php endif; ?>
 
-	<?php if ( $order->billing_email ) : ?>
-		<tr>
-			<th><?php _e( 'Email:', 'woocommerce' ); ?></th>
-			<td><?php echo esc_html( $order->billing_email ); ?></td>
-		</tr>
-	<?php endif; ?>
-
-	<?php if ( $order->billing_phone ) : ?>
-		<tr>
-			<th><?php _e( 'Telephone:', 'woocommerce' ); ?></th>
-			<td><?php echo esc_html( $order->billing_phone ); ?></td>
-		</tr>
-	<?php endif; ?>
-
-	<?php do_action( 'woocommerce_order_details_after_customer_details', $order ); ?>
-</table>
-
-<?php if ( ! wc_ship_to_billing_address_only() && $order->needs_shipping_address() ) : ?>
-
-<div class="col2-set addresses">
-	<div class="col-1">
-
-<?php endif; ?>
-
-<header class="title">
-	<h3><?php _e( 'Billing Address', 'woocommerce' ); ?></h3>
-</header>
-<address>
-	<?php echo ( $address = $order->get_formatted_billing_address() ) ? $address : __( 'N/A', 'woocommerce' ); ?>
-</address>
-
-<?php if ( ! wc_ship_to_billing_address_only() && $order->needs_shipping_address() ) : ?>
-
-	</div><!-- /.col-1 -->
-	<div class="col-2">
-		<header class="title">
-			<h3><?php _e( 'Shipping Address', 'woocommerce' ); ?></h3>
-		</header>
-		<address>
-			<?php echo ( $address = $order->get_formatted_shipping_address() ) ? $address : __( 'N/A', 'woocommerce' ); ?>
-		</address>
-	</div><!-- /.col-2 -->
-</div><!-- /.col2-set -->
-
-<?php endif; ?>
+</section>
diff --git a/templates/order/order-details-item.php b/templates/order/order-details-item.php
index a347a619f61..d4bb621b90f 100644
--- a/templates/order/order-details-item.php
+++ b/templates/order/order-details-item.php
@@ -4,15 +4,16 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/order/order-details-item.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
- * @version 2.5.0
+ * @version 3.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -23,28 +24,37 @@ if ( ! apply_filters( 'woocommerce_order_item_visible', true, $item ) ) {
 	return;
 }
 ?>
-<tr class="<?php echo esc_attr( apply_filters( 'woocommerce_order_item_class', 'order_item', $item, $order ) ); ?>">
-	<td class="product-name">
-		<?php
-			$is_visible = $product && $product->is_visible();
+<tr class="<?php echo esc_attr( apply_filters( 'woocommerce_order_item_class', 'woocommerce-table__line-item order_item', $item, $order ) ); ?>">
 
-			echo apply_filters( 'woocommerce_order_item_name', $is_visible ? sprintf( '<a href="%s">%s</a>', get_permalink( $item['product_id'] ), $item['name'] ) : $item['name'], $item, $is_visible );
-			echo apply_filters( 'woocommerce_order_item_quantity_html', ' <strong class="product-quantity">' . sprintf( '&times; %s', $item['qty'] ) . '</strong>', $item );
+	<td class="woocommerce-table__product-name product-name">
+		<?php
+			$is_visible        = $product && $product->is_visible();
+			$product_permalink = apply_filters( 'woocommerce_order_item_permalink', $is_visible ? $product->get_permalink( $item ) : '', $item, $order );
+
+			echo apply_filters( 'woocommerce_order_item_name', $product_permalink ? sprintf( '<a href="%s">%s</a>', $product_permalink, $item->get_name() ) : $item->get_name(), $item, $is_visible );
+			echo apply_filters( 'woocommerce_order_item_quantity_html', ' <strong class="product-quantity">' . sprintf( '&times; %s', $item->get_quantity() ) . '</strong>', $item );
 
 			do_action( 'woocommerce_order_item_meta_start', $item_id, $item, $order );
 
-			$order->display_item_meta( $item );
-			$order->display_item_downloads( $item );
+			wc_display_item_meta( $item );
+			wc_display_item_downloads( $item );
 
 			do_action( 'woocommerce_order_item_meta_end', $item_id, $item, $order );
 		?>
 	</td>
-	<td class="product-total">
+
+	<td class="woocommerce-table__product-total product-total">
 		<?php echo $order->get_formatted_line_subtotal( $item ); ?>
 	</td>
+
 </tr>
+
 <?php if ( $show_purchase_note && $purchase_note ) : ?>
-<tr class="product-purchase-note">
+
+<tr class="woocommerce-table__product-purchase-note product-purchase-note">
+
 	<td colspan="3"><?php echo wpautop( do_shortcode( wp_kses_post( $purchase_note ) ) ); ?></td>
+
 </tr>
+
 <?php endif; ?>
diff --git a/templates/order/order-details.php b/templates/order/order-details.php
index b6f2c72eab6..2ff14e248a9 100644
--- a/templates/order/order-details.php
+++ b/templates/order/order-details.php
@@ -4,15 +4,16 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/order/order-details.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
- * @version 2.5.0
+ * @version 3.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -21,48 +22,60 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 $order = wc_get_order( $order_id );
 
-$show_purchase_note = $order->has_status( apply_filters( 'woocommerce_purchase_note_order_statuses', array( 'completed', 'processing' ) ) );
+$show_purchase_note    = $order->has_status( apply_filters( 'woocommerce_purchase_note_order_statuses', array( 'completed', 'processing' ) ) );
+$show_customer_details = is_user_logged_in() && $order->get_user_id() === get_current_user_id();
 ?>
-<h2><?php _e( 'Order Details', 'woocommerce' ); ?></h2>
-<table class="shop_table order_details">
-	<thead>
-		<tr>
-			<th class="product-name"><?php _e( 'Product', 'woocommerce' ); ?></th>
-			<th class="product-total"><?php _e( 'Total', 'woocommerce' ); ?></th>
-		</tr>
-	</thead>
-	<tbody>
-		<?php
-			foreach( $order->get_items() as $item_id => $item ) {
-				$product = apply_filters( 'woocommerce_order_item_product', $order->get_product_from_item( $item ), $item );
-				$purchase_note = get_post_meta( $product->id, '_purchase_note', true );
 
-				wc_get_template( 'order/order-details-item.php', array(
-					'order'					=> $order,
-					'item_id'				=> $item_id,
-					'item'					=> $item,
-					'show_purchase_note'	=> $show_purchase_note,
-					'purchase_note'			=> $purchase_note,
-					'product'				=> $product,
-				) );
-			}
-		?>
-		<?php do_action( 'woocommerce_order_items_table', $order ); ?>
-	</tbody>
-	<tfoot>
-		<?php
-			foreach ( $order->get_order_item_totals() as $key => $total ) {
-				?>
-				<tr>
-					<th scope="row"><?php echo $total['label']; ?></th>
-					<td><?php echo $total['value']; ?></td>
-				</tr>
-				<?php
-			}
-		?>
-	</tfoot>
-</table>
+<section class="woocommerce-order-details">
 
-<?php do_action( 'woocommerce_order_details_after_order_table', $order ); ?>
+	<h2 class="woocommerce-order-details__title"><?php _e( 'Order details', 'woocommerce' ); ?></h2>
 
-<?php wc_get_template( 'order/order-details-customer.php', array( 'order' =>  $order ) ); ?>
+	<table class="woocommerce-table woocommerce-table--order-details shop_table order_details">
+
+		<thead>
+			<tr>
+				<th class="woocommerce-table__product-name product-name"><?php _e( 'Product', 'woocommerce' ); ?></th>
+				<th class="woocommerce-table__product-table product-total"><?php _e( 'Total', 'woocommerce' ); ?></th>
+			</tr>
+		</thead>
+
+		<tbody>
+			<?php
+				foreach ( $order->get_items() as $item_id => $item ) {
+					$product = apply_filters( 'woocommerce_order_item_product', $item->get_product(), $item );
+
+					wc_get_template( 'order/order-details-item.php', array(
+						'order'			     => $order,
+						'item_id'		     => $item_id,
+						'item'			     => $item,
+						'show_purchase_note' => $show_purchase_note,
+						'purchase_note'	     => $product ? $product->get_purchase_note() : '',
+						'product'	         => $product,
+					) );
+				}
+			?>
+			<?php do_action( 'woocommerce_order_items_table', $order ); ?>
+		</tbody>
+
+		<tfoot>
+			<?php
+				foreach ( $order->get_order_item_totals() as $key => $total ) {
+					?>
+					<tr>
+						<th scope="row"><?php echo $total['label']; ?></th>
+						<td><?php echo $total['value']; ?></td>
+					</tr>
+					<?php
+				}
+			?>
+		</tfoot>
+
+	</table>
+
+	<?php do_action( 'woocommerce_order_details_after_order_table', $order ); ?>
+
+	<?php if ( $show_customer_details ) : ?>
+		<?php wc_get_template( 'order/order-details-customer.php', array( 'order' => $order ) ); ?>
+	<?php endif; ?>
+
+</section>
diff --git a/templates/order/tracking.php b/templates/order/tracking.php
index 413aed6d7a2..cba04eaa7f4 100644
--- a/templates/order/tracking.php
+++ b/templates/order/tracking.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/order/tracking.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
  * @version 2.2.0
@@ -18,19 +19,20 @@
 if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
+?>
 
-$order_status_text = sprintf( __( 'Order #%s which was made %s has the status &ldquo;%s&rdquo;', 'woocommerce' ), $order->get_order_number(), human_time_diff( strtotime( $order->order_date ), current_time( 'timestamp' ) ) . ' ' . __( 'ago', 'woocommerce' ), wc_get_order_status_name( $order->get_status() ) );
+<p class="order-info"><?php
+	/* translators: 1: order number 2: order date 3: order status */
+	echo wp_kses_post( apply_filters( 'woocommerce_order_tracking_status', sprintf(
+		__( 'Order #%1$s was placed on %2$s and is currently %3$s.', 'woocommerce' ),
+		'<mark class="order-number">' . $order->get_order_number() . '</mark>',
+		'<mark class="order-date">' . wc_format_datetime( $order->get_date_created() ) . '</mark>',
+		'<mark class="order-status">' . wc_get_order_status_name( $order->get_status() ) . '</mark>'
+	) ) );
+?></p>
 
-if ( $order->has_status( 'completed' ) ) $order_status_text .= ' ' . __( 'and was completed', 'woocommerce' ) . ' ' . human_time_diff( strtotime( $order->completed_date ), current_time( 'timestamp' ) ) . __( ' ago', 'woocommerce' );
-
-$order_status_text .= '.';
-
-echo wpautop( esc_attr( apply_filters( 'woocommerce_order_tracking_status', $order_status_text, $order ) ) );
-
-$notes = $order->get_customer_order_notes();
-
-if ( $notes ) : ?>
-	<h2><?php _e( 'Order Updates', 'woocommerce' ); ?></h2>
+<?php if ( $notes = $order->get_customer_order_notes() ) : ?>
+	<h2><?php _e( 'Order updates', 'woocommerce' ); ?></h2>
 	<ol class="commentlist notes">
 		<?php foreach ( $notes as $note ) : ?>
 		<li class="comment note">
@@ -38,10 +40,10 @@ if ( $notes ) : ?>
 				<div class="comment-text">
 					<p class="meta"><?php echo date_i18n( __( 'l jS \o\f F Y, h:ia', 'woocommerce' ), strtotime( $note->comment_date ) ); ?></p>
 					<div class="description">
-						<?php echo wpautop( wptexturize( wp_kses_post( $note->comment_content ) ) ); ?>
+						<?php echo wpautop( wptexturize( $note->comment_content ) ); ?>
 					</div>
-	  				<div class="clear"></div>
-	  			</div>
+					<div class="clear"></div>
+				</div>
 				<div class="clear"></div>
 			</div>
 		</li>
@@ -49,4 +51,4 @@ if ( $notes ) : ?>
 	</ol>
 <?php endif; ?>
 
-<?php do_action( 'woocommerce_view_order', $order->id ); ?>
+<?php do_action( 'woocommerce_view_order', $order->get_id() ); ?>
diff --git a/templates/product-searchform.php b/templates/product-searchform.php
index a31d8e0c3a8..16e96a33abc 100644
--- a/templates/product-searchform.php
+++ b/templates/product-searchform.php
@@ -4,27 +4,26 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/product-searchform.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see     http://docs.woothemes.com/document/template-structure/
+ * @see     https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
  * @version 2.5.0
  */
 
-// Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
 ?>
-
-<form role="search" method="get" class="woocommerce-product-search" action="<?php echo esc_url( home_url( '/'  ) ); ?>">
-	<label class="screen-reader-text" for="s"><?php _e( 'Search for:', 'woocommerce' ); ?></label>
-	<input type="search" class="search-field" placeholder="<?php echo esc_attr_x( 'Search Products&hellip;', 'placeholder', 'woocommerce' ); ?>" value="<?php echo get_search_query(); ?>" name="s" title="<?php echo esc_attr_x( 'Search for:', 'label', 'woocommerce' ); ?>" />
+<form role="search" method="get" class="woocommerce-product-search" action="<?php echo esc_url( home_url( '/' ) ); ?>">
+	<label class="screen-reader-text" for="woocommerce-product-search-field-<?php echo isset( $index ) ? absint( $index ) : 0; ?>"><?php _e( 'Search for:', 'woocommerce' ); ?></label>
+	<input type="search" id="woocommerce-product-search-field-<?php echo isset( $index ) ? absint( $index ) : 0; ?>" class="search-field" placeholder="<?php echo esc_attr__( 'Search products&hellip;', 'woocommerce' ); ?>" value="<?php echo get_search_query(); ?>" name="s" />
 	<input type="submit" value="<?php echo esc_attr_x( 'Search', 'submit button', 'woocommerce' ); ?>" />
 	<input type="hidden" name="post_type" value="product" />
 </form>
diff --git a/templates/single-product-reviews.php b/templates/single-product-reviews.php
index 7258895aec0..50d182d2ec1 100644
--- a/templates/single-product-reviews.php
+++ b/templates/single-product-reviews.php
@@ -4,34 +4,37 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/single-product-reviews.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     2.3.2
  */
-global $product;
-
 if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
 
+global $product;
+
 if ( ! comments_open() ) {
 	return;
 }
 
 ?>
-<div id="reviews">
+<div id="reviews" class="woocommerce-Reviews">
 	<div id="comments">
-		<h2><?php
-			if ( get_option( 'woocommerce_enable_review_rating' ) === 'yes' && ( $count = $product->get_review_count() ) )
-				printf( _n( '%s review for %s', '%s reviews for %s', $count, 'woocommerce' ), $count, get_the_title() );
-			else
+		<h2 class="woocommerce-Reviews-title"><?php
+			if ( get_option( 'woocommerce_enable_review_rating' ) === 'yes' && ( $count = $product->get_review_count() ) ) {
+				/* translators: 1: reviews count 2: product name */
+				printf( esc_html( _n( '%1$s review for %2$s', '%1$s reviews for %2$s', $count, 'woocommerce' ) ), esc_html( $count ), '<span>' . get_the_title() . '</span>' );
+			} else {
 				_e( 'Reviews', 'woocommerce' );
+			}
 		?></h2>
 
 		<?php if ( have_comments() ) : ?>
@@ -57,7 +60,7 @@ if ( ! comments_open() ) {
 		<?php endif; ?>
 	</div>
 
-	<?php if ( get_option( 'woocommerce_review_rating_verification_required' ) === 'no' || wc_customer_bought_product( '', get_current_user_id(), $product->id ) ) : ?>
+	<?php if ( get_option( 'woocommerce_review_rating_verification_required' ) === 'no' || wc_customer_bought_product( '', get_current_user_id(), $product->get_id() ) ) : ?>
 
 		<div id="review_form_wrapper">
 			<div id="review_form">
@@ -67,35 +70,36 @@ if ( ! comments_open() ) {
 					$comment_form = array(
 						'title_reply'          => have_comments() ? __( 'Add a review', 'woocommerce' ) : sprintf( __( 'Be the first to review &ldquo;%s&rdquo;', 'woocommerce' ), get_the_title() ),
 						'title_reply_to'       => __( 'Leave a Reply to %s', 'woocommerce' ),
-						'comment_notes_before' => '',
+						'title_reply_before'   => '<span id="reply-title" class="comment-reply-title">',
+						'title_reply_after'    => '</span>',
 						'comment_notes_after'  => '',
 						'fields'               => array(
-							'author' => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name', 'woocommerce' ) . ' <span class="required">*</span></label> ' .
-							            '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" aria-required="true" /></p>',
-							'email'  => '<p class="comment-form-email"><label for="email">' . __( 'Email', 'woocommerce' ) . ' <span class="required">*</span></label> ' .
-							            '<input id="email" name="email" type="text" value="' . esc_attr(  $commenter['comment_author_email'] ) . '" size="30" aria-required="true" /></p>',
+							'author' => '<p class="comment-form-author">' . '<label for="author">' . esc_html__( 'Name', 'woocommerce' ) . ' <span class="required">*</span></label> ' .
+										'<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" aria-required="true" required /></p>',
+							'email'  => '<p class="comment-form-email"><label for="email">' . esc_html__( 'Email', 'woocommerce' ) . ' <span class="required">*</span></label> ' .
+										'<input id="email" name="email" type="email" value="' . esc_attr( $commenter['comment_author_email'] ) . '" size="30" aria-required="true" required /></p>',
 						),
 						'label_submit'  => __( 'Submit', 'woocommerce' ),
 						'logged_in_as'  => '',
-						'comment_field' => ''
+						'comment_field' => '',
 					);
 
 					if ( $account_page_url = wc_get_page_permalink( 'myaccount' ) ) {
-						$comment_form['must_log_in'] = '<p class="must-log-in">' .  sprintf( __( 'You must be <a href="%s">logged in</a> to post a review.', 'woocommerce' ), esc_url( $account_page_url ) ) . '</p>';
+						$comment_form['must_log_in'] = '<p class="must-log-in">' . sprintf( __( 'You must be <a href="%s">logged in</a> to post a review.', 'woocommerce' ), esc_url( $account_page_url ) ) . '</p>';
 					}
 
 					if ( get_option( 'woocommerce_enable_review_rating' ) === 'yes' ) {
-						$comment_form['comment_field'] = '<p class="comment-form-rating"><label for="rating">' . __( 'Your Rating', 'woocommerce' ) .'</label><select name="rating" id="rating">
-							<option value="">' . __( 'Rate&hellip;', 'woocommerce' ) . '</option>
-							<option value="5">' . __( 'Perfect', 'woocommerce' ) . '</option>
-							<option value="4">' . __( 'Good', 'woocommerce' ) . '</option>
-							<option value="3">' . __( 'Average', 'woocommerce' ) . '</option>
-							<option value="2">' . __( 'Not that bad', 'woocommerce' ) . '</option>
-							<option value="1">' . __( 'Very Poor', 'woocommerce' ) . '</option>
-						</select></p>';
+						$comment_form['comment_field'] = '<div class="comment-form-rating"><label for="rating">' . esc_html__( 'Your rating', 'woocommerce' ) . '</label><select name="rating" id="rating" aria-required="true" required>
+							<option value="">' . esc_html__( 'Rate&hellip;', 'woocommerce' ) . '</option>
+							<option value="5">' . esc_html__( 'Perfect', 'woocommerce' ) . '</option>
+							<option value="4">' . esc_html__( 'Good', 'woocommerce' ) . '</option>
+							<option value="3">' . esc_html__( 'Average', 'woocommerce' ) . '</option>
+							<option value="2">' . esc_html__( 'Not that bad', 'woocommerce' ) . '</option>
+							<option value="1">' . esc_html__( 'Very poor', 'woocommerce' ) . '</option>
+						</select></div>';
 					}
 
-					$comment_form['comment_field'] .= '<p class="comment-form-comment"><label for="comment">' . __( 'Your Review', 'woocommerce' ) . '</label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea></p>';
+					$comment_form['comment_field'] .= '<p class="comment-form-comment"><label for="comment">' . esc_html__( 'Your review', 'woocommerce' ) . ' <span class="required">*</span></label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true" required></textarea></p>';
 
 					comment_form( apply_filters( 'woocommerce_product_review_comment_form_args', $comment_form ) );
 				?>
diff --git a/templates/single-product.php b/templates/single-product.php
index 7c7990a8ee3..f8b35dad8af 100644
--- a/templates/single-product.php
+++ b/templates/single-product.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/single-product.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     1.6.4
@@ -55,4 +56,6 @@ get_header( 'shop' ); ?>
 		do_action( 'woocommerce_sidebar' );
 	?>
 
-<?php get_footer( 'shop' ); ?>
+<?php get_footer( 'shop' );
+
+/* Omit closing PHP tag at the end of PHP files to avoid "headers already sent" issues. */
diff --git a/templates/single-product/add-to-cart/external.php b/templates/single-product/add-to-cart/external.php
index 4ed4da70b8e..fd5e03cb2fe 100644
--- a/templates/single-product/add-to-cart/external.php
+++ b/templates/single-product/add-to-cart/external.php
@@ -4,24 +4,22 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/single-product/add-to-cart/external.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     2.1.0
  */
-
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
-?>
-
-<?php do_action( 'woocommerce_before_add_to_cart_button' ); ?>
+do_action( 'woocommerce_before_add_to_cart_button' ); ?>
 
 <p class="cart">
 	<a href="<?php echo esc_url( $product_url ); ?>" rel="nofollow" class="single_add_to_cart_button button alt"><?php echo esc_html( $button_text ); ?></a>
diff --git a/templates/single-product/add-to-cart/grouped.php b/templates/single-product/add-to-cart/grouped.php
index 4060e6f6e90..acecf0ab88e 100644
--- a/templates/single-product/add-to-cart/grouped.php
+++ b/templates/single-product/add-to-cart/grouped.php
@@ -4,97 +4,93 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/single-product/add-to-cart/grouped.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
- * @version     2.1.7
+ * @version     3.0.3
  */
-
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
 global $product, $post;
 
-$parent_product_post = $post;
-
 do_action( 'woocommerce_before_add_to_cart_form' ); ?>
 
 <form class="cart" method="post" enctype='multipart/form-data'>
 	<table cellspacing="0" class="group_table">
 		<tbody>
 			<?php
-				foreach ( $grouped_products as $product_id ) :
-					if ( ! $product = wc_get_product( $product_id ) ) {
-						continue;
-					}
+				$quantites_required = false;
 
-					if ( 'yes' === get_option( 'woocommerce_hide_out_of_stock_items' ) && ! $product->is_in_stock() ) {
-						continue;
-					}
+				foreach ( $grouped_products as $grouped_product ) {
+					$post_object        = get_post( $grouped_product->get_id() );
+					$quantites_required = $quantites_required || ( $grouped_product->is_purchasable() && ! $grouped_product->has_options() );
 
-					$post    = $product->post;
-					setup_postdata( $post );
+					setup_postdata( $GLOBALS['post'] =& $post_object );
 					?>
-					<tr>
+					<tr id="product-<?php the_ID(); ?>" <?php post_class(); ?>>
 						<td>
-							<?php if ( $product->is_sold_individually() || ! $product->is_purchasable() ) : ?>
+							<?php if ( ! $grouped_product->is_purchasable() || $grouped_product->has_options() ) : ?>
 								<?php woocommerce_template_loop_add_to_cart(); ?>
+
+							<?php elseif ( $grouped_product->is_sold_individually() ) : ?>
+								<input type="checkbox" name="<?php echo esc_attr( 'quantity[' . $grouped_product->get_id() . ']' ); ?>" value="1" class="wc-grouped-product-add-to-cart-checkbox" />
+
 							<?php else : ?>
 								<?php
-									$quantites_required = true;
+									/**
+									 * @since 3.0.0.
+									 */
+									do_action( 'woocommerce_before_add_to_cart_quantity' );
+
 									woocommerce_quantity_input( array(
-										'input_name'  => 'quantity[' . $product_id . ']',
-										'input_value' => ( isset( $_POST['quantity'][$product_id] ) ? wc_stock_amount( $_POST['quantity'][$product_id] ) : 0 ),
-										'min_value'   => apply_filters( 'woocommerce_quantity_input_min', 0, $product ),
-										'max_value'   => apply_filters( 'woocommerce_quantity_input_max', $product->backorders_allowed() ? '' : $product->get_stock_quantity(), $product )
+										'input_name'  => 'quantity[' . $grouped_product->get_id() . ']',
+										'input_value' => isset( $_POST['quantity'][ $grouped_product->get_id() ] ) ? wc_stock_amount( $_POST['quantity'][ $grouped_product->get_id() ] ) : 0,
+										'min_value'   => apply_filters( 'woocommerce_quantity_input_min', 0, $grouped_product ),
+										'max_value'   => apply_filters( 'woocommerce_quantity_input_max', $grouped_product->get_max_purchase_quantity(), $grouped_product ),
 									) );
+
+									/**
+									 * @since 3.0.0.
+									 */
+									do_action( 'woocommerce_after_add_to_cart_quantity' );
 								?>
 							<?php endif; ?>
 						</td>
-
 						<td class="label">
-							<label for="product-<?php echo $product_id; ?>">
-								<?php echo $product->is_visible() ? '<a href="' . esc_url( apply_filters( 'woocommerce_grouped_product_list_link', get_permalink(), $product_id ) ) . '">' . esc_html( get_the_title() ) . '</a>' : esc_html( get_the_title() ); ?>
+							<label for="product-<?php echo $grouped_product->get_id(); ?>">
+								<?php echo $grouped_product->is_visible() ? '<a href="' . esc_url( apply_filters( 'woocommerce_grouped_product_list_link', get_permalink(), $grouped_product->get_id() ) ) . '">' . get_the_title() . '</a>' : get_the_title(); ?>
 							</label>
 						</td>
-
-						<?php do_action ( 'woocommerce_grouped_product_list_before_price', $product ); ?>
-
+						<?php do_action( 'woocommerce_grouped_product_list_before_price', $grouped_product ); ?>
 						<td class="price">
 							<?php
-								echo $product->get_price_html();
-
-								if ( $availability = $product->get_availability() ) {
-									$availability_html = empty( $availability['availability'] ) ? '' : '<p class="stock ' . esc_attr( $availability['class'] ) . '">' . esc_html( $availability['availability'] ) . '</p>';
-									echo apply_filters( 'woocommerce_stock_html', $availability_html, $availability['availability'], $product );
-								}
+								echo $grouped_product->get_price_html();
+								echo wc_get_stock_html( $grouped_product );
 							?>
 						</td>
 					</tr>
 					<?php
-				endforeach;
-
-				// Reset to parent grouped product
-				$post    = $parent_product_post;
-				$product = wc_get_product( $parent_product_post->ID );
-				setup_postdata( $parent_product_post );
+				}
+				wp_reset_postdata();
 			?>
 		</tbody>
 	</table>
 
-	<input type="hidden" name="add-to-cart" value="<?php echo esc_attr( $product->id ); ?>" />
+	<input type="hidden" name="add-to-cart" value="<?php echo esc_attr( $product->get_id() ); ?>" />
 
 	<?php if ( $quantites_required ) : ?>
 
 		<?php do_action( 'woocommerce_before_add_to_cart_button' ); ?>
 
-		<button type="submit" class="single_add_to_cart_button button alt"><?php echo $product->single_add_to_cart_text(); ?></button>
+		<button type="submit" class="single_add_to_cart_button button alt"><?php echo esc_html( $product->single_add_to_cart_text() ); ?></button>
 
 		<?php do_action( 'woocommerce_after_add_to_cart_button' ); ?>
 
diff --git a/templates/single-product/add-to-cart/simple.php b/templates/single-product/add-to-cart/simple.php
index 8a7b50ecdcc..d4e542b0635 100644
--- a/templates/single-product/add-to-cart/simple.php
+++ b/templates/single-product/add-to-cart/simple.php
@@ -4,19 +4,19 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/single-product/add-to-cart/simple.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
- * @version     2.1.0
+ * @version     3.0.0
  */
-
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
 global $product;
@@ -25,38 +25,44 @@ if ( ! $product->is_purchasable() ) {
 	return;
 }
 
-?>
+echo wc_get_stock_html( $product );
 
-<?php
-	// Availability
-	$availability      = $product->get_availability();
-	$availability_html = empty( $availability['availability'] ) ? '' : '<p class="stock ' . esc_attr( $availability['class'] ) . '">' . esc_html( $availability['availability'] ) . '</p>';
-
-	echo apply_filters( 'woocommerce_stock_html', $availability_html, $availability['availability'], $product );
-?>
-
-<?php if ( $product->is_in_stock() ) : ?>
+if ( $product->is_in_stock() ) : ?>
 
 	<?php do_action( 'woocommerce_before_add_to_cart_form' ); ?>
 
 	<form class="cart" method="post" enctype='multipart/form-data'>
-	 	<?php do_action( 'woocommerce_before_add_to_cart_button' ); ?>
+		<?php
+			/**
+			 * @since 2.1.0.
+			 */
+			do_action( 'woocommerce_before_add_to_cart_button' );
 
-	 	<?php
-	 		if ( ! $product->is_sold_individually() ) {
-	 			woocommerce_quantity_input( array(
-	 				'min_value'   => apply_filters( 'woocommerce_quantity_input_min', 1, $product ),
-	 				'max_value'   => apply_filters( 'woocommerce_quantity_input_max', $product->backorders_allowed() ? '' : $product->get_stock_quantity(), $product ),
-	 				'input_value' => ( isset( $_POST['quantity'] ) ? wc_stock_amount( $_POST['quantity'] ) : 1 )
-	 			) );
-	 		}
-	 	?>
+			/**
+			 * @since 3.0.0.
+			 */
+			do_action( 'woocommerce_before_add_to_cart_quantity' );
 
-	 	<input type="hidden" name="add-to-cart" value="<?php echo esc_attr( $product->id ); ?>" />
+			woocommerce_quantity_input( array(
+				'min_value'   => apply_filters( 'woocommerce_quantity_input_min', $product->get_min_purchase_quantity(), $product ),
+				'max_value'   => apply_filters( 'woocommerce_quantity_input_max', $product->get_max_purchase_quantity(), $product ),
+				'input_value' => isset( $_POST['quantity'] ) ? wc_stock_amount( $_POST['quantity'] ) : $product->get_min_purchase_quantity(),
+			) );
 
-	 	<button type="submit" class="single_add_to_cart_button button alt"><?php echo esc_html( $product->single_add_to_cart_text() ); ?></button>
+			/**
+			 * @since 3.0.0.
+			 */
+			do_action( 'woocommerce_after_add_to_cart_quantity' );
+		?>
 
-		<?php do_action( 'woocommerce_after_add_to_cart_button' ); ?>
+		<button type="submit" name="add-to-cart" value="<?php echo esc_attr( $product->get_id() ); ?>" class="single_add_to_cart_button button alt"><?php echo esc_html( $product->single_add_to_cart_text() ); ?></button>
+
+		<?php
+			/**
+			 * @since 2.1.0.
+			 */
+			do_action( 'woocommerce_after_add_to_cart_button' );
+		?>
 	</form>
 
 	<?php do_action( 'woocommerce_after_add_to_cart_form' ); ?>
diff --git a/templates/single-product/add-to-cart/variable.php b/templates/single-product/add-to-cart/variable.php
index 679124b82cc..ac325c0770a 100644
--- a/templates/single-product/add-to-cart/variable.php
+++ b/templates/single-product/add-to-cart/variable.php
@@ -4,15 +4,16 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/single-product/add-to-cart/variable.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	http://docs.woothemes.com/document/template-structure/
+ * @see 	https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
- * @version 2.5.0
+ * @version 3.0.0
  */
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
@@ -24,7 +25,7 @@ $attribute_keys = array_keys( $attributes );
 
 do_action( 'woocommerce_before_add_to_cart_form' ); ?>
 
-<form class="variations_form cart" method="post" enctype='multipart/form-data' data-product_id="<?php echo absint( $product->id ); ?>" data-product_variations="<?php echo htmlspecialchars( json_encode( $available_variations ) ) ?>">
+<form class="variations_form cart" method="post" enctype='multipart/form-data' data-product_id="<?php echo absint( $product->get_id() ); ?>" data-product_variations="<?php echo htmlspecialchars( wp_json_encode( $available_variations ) ) ?>">
 	<?php do_action( 'woocommerce_before_variations_form' ); ?>
 
 	<?php if ( empty( $available_variations ) && false !== $available_variations ) : ?>
@@ -37,13 +38,13 @@ do_action( 'woocommerce_before_add_to_cart_form' ); ?>
 						<td class="label"><label for="<?php echo sanitize_title( $attribute_name ); ?>"><?php echo wc_attribute_label( $attribute_name ); ?></label></td>
 						<td class="value">
 							<?php
-								$selected = isset( $_REQUEST[ 'attribute_' . sanitize_title( $attribute_name ) ] ) ? wc_clean( $_REQUEST[ 'attribute_' . sanitize_title( $attribute_name ) ] ) : $product->get_variation_default_attribute( $attribute_name );
+								$selected = isset( $_REQUEST[ 'attribute_' . sanitize_title( $attribute_name ) ] ) ? wc_clean( stripslashes( urldecode( $_REQUEST[ 'attribute_' . sanitize_title( $attribute_name ) ] ) ) ) : $product->get_variation_default_attribute( $attribute_name );
 								wc_dropdown_variation_attribute_options( array( 'options' => $options, 'attribute' => $attribute_name, 'product' => $product, 'selected' => $selected ) );
-								echo end( $attribute_keys ) === $attribute_name ? '<a class="reset_variations" href="#">' . __( 'Clear', 'woocommerce' ) . '</a>' : '';
+								echo end( $attribute_keys ) === $attribute_name ? apply_filters( 'woocommerce_reset_variations_link', '<a class="reset_variations" href="#">' . esc_html__( 'Clear', 'woocommerce' ) . '</a>' ) : '';
 							?>
 						</td>
 					</tr>
-		        <?php endforeach;?>
+				<?php endforeach;?>
 			</tbody>
 		</table>
 
@@ -77,4 +78,5 @@ do_action( 'woocommerce_before_add_to_cart_form' ); ?>
 	<?php do_action( 'woocommerce_after_variations_form' ); ?>
 </form>
 
-<?php do_action( 'woocommerce_after_add_to_cart_form' ); ?>
+<?php
+do_action( 'woocommerce_after_add_to_cart_form' );
diff --git a/templates/single-product/add-to-cart/variation-add-to-cart-button.php b/templates/single-product/add-to-cart/variation-add-to-cart-button.php
index 51f1a100514..1aa8ace21e8 100644
--- a/templates/single-product/add-to-cart/variation-add-to-cart-button.php
+++ b/templates/single-product/add-to-cart/variation-add-to-cart-button.php
@@ -2,10 +2,10 @@
 /**
  * Single variation cart button
  *
- * @see 	http://docs.woothemes.com/document/template-structure/
+ * @see 	https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
- * @version 2.5.0
+ * @version 3.0.0
  */
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
@@ -14,9 +14,25 @@ if ( ! defined( 'ABSPATH' ) ) {
 global $product;
 ?>
 <div class="woocommerce-variation-add-to-cart variations_button">
-	<?php woocommerce_quantity_input( array( 'input_value' => isset( $_POST['quantity'] ) ? wc_stock_amount( $_POST['quantity'] ) : 1 ) ); ?>
+	<?php
+		/**
+		 * @since 3.0.0.
+		 */
+		do_action( 'woocommerce_before_add_to_cart_quantity' );
+
+		woocommerce_quantity_input( array(
+			'min_value'   => apply_filters( 'woocommerce_quantity_input_min', $product->get_min_purchase_quantity(), $product ),
+			'max_value'   => apply_filters( 'woocommerce_quantity_input_max', $product->get_max_purchase_quantity(), $product ),
+			'input_value' => isset( $_POST['quantity'] ) ? wc_stock_amount( $_POST['quantity'] ) : $product->get_min_purchase_quantity(),
+		) );
+
+		/**
+		 * @since 3.0.0.
+		 */
+		do_action( 'woocommerce_after_add_to_cart_quantity' );
+	?>
 	<button type="submit" class="single_add_to_cart_button button alt"><?php echo esc_html( $product->single_add_to_cart_text() ); ?></button>
-	<input type="hidden" name="add-to-cart" value="<?php echo absint( $product->id ); ?>" />
-	<input type="hidden" name="product_id" value="<?php echo absint( $product->id ); ?>" />
+	<input type="hidden" name="add-to-cart" value="<?php echo absint( $product->get_id() ); ?>" />
+	<input type="hidden" name="product_id" value="<?php echo absint( $product->get_id() ); ?>" />
 	<input type="hidden" name="variation_id" class="variation_id" value="0" />
 </div>
diff --git a/templates/single-product/add-to-cart/variation.php b/templates/single-product/add-to-cart/variation.php
index 92fc1bc0504..dd27206ed0a 100644
--- a/templates/single-product/add-to-cart/variation.php
+++ b/templates/single-product/add-to-cart/variation.php
@@ -5,7 +5,7 @@
  * This is a javascript-based template for single variations (see https://codex.wordpress.org/Javascript_Reference/wp.template).
  * The values will be dynamically replaced after selecting attributes.
  *
- * @see 	http://docs.woothemes.com/document/template-structure/
+ * @see 	https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
  * @version 2.5.0
@@ -15,18 +15,18 @@ if ( ! defined( 'ABSPATH' ) ) {
 }
 ?>
 <script type="text/template" id="tmpl-variation-template">
-    <div class="woocommerce-variation-description">
-        {{{ data.variation.variation_description }}}
-    </div>
+	<div class="woocommerce-variation-description">
+		{{{ data.variation.variation_description }}}
+	</div>
 
-    <div class="woocommerce-variation-price">
-        {{{ data.variation.price_html }}}
-    </div>
+	<div class="woocommerce-variation-price">
+		{{{ data.variation.price_html }}}
+	</div>
 
-    <div class="woocommerce-variation-availability">
-        {{{ data.variation.availability_html }}}
-    </div>
+	<div class="woocommerce-variation-availability">
+		{{{ data.variation.availability_html }}}
+	</div>
 </script>
 <script type="text/template" id="tmpl-unavailable-variation-template">
-    <p><?php _e( 'Sorry, this product is unavailable. Please choose a different combination.', 'woocommerce' ); ?></p>
+	<p><?php _e( 'Sorry, this product is unavailable. Please choose a different combination.', 'woocommerce' ); ?></p>
 </script>
diff --git a/templates/single-product/meta.php b/templates/single-product/meta.php
index f239eac21c5..a12ab1f7f22 100644
--- a/templates/single-product/meta.php
+++ b/templates/single-product/meta.php
@@ -4,26 +4,23 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/single-product/meta.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
- * @version     1.6.4
+ * @version     3.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
-global $post, $product;
-
-$cat_count = sizeof( get_the_terms( $post->ID, 'product_cat' ) );
-$tag_count = sizeof( get_the_terms( $post->ID, 'product_tag' ) );
-
+global $product;
 ?>
 <div class="product_meta">
 
@@ -31,13 +28,13 @@ $tag_count = sizeof( get_the_terms( $post->ID, 'product_tag' ) );
 
 	<?php if ( wc_product_sku_enabled() && ( $product->get_sku() || $product->is_type( 'variable' ) ) ) : ?>
 
-		<span class="sku_wrapper"><?php _e( 'SKU:', 'woocommerce' ); ?> <span class="sku" itemprop="sku"><?php echo ( $sku = $product->get_sku() ) ? $sku : __( 'N/A', 'woocommerce' ); ?></span></span>
+		<span class="sku_wrapper"><?php esc_html_e( 'SKU:', 'woocommerce' ); ?> <span class="sku"><?php echo ( $sku = $product->get_sku() ) ? $sku : esc_html__( 'N/A', 'woocommerce' ); ?></span></span>
 
 	<?php endif; ?>
 
-	<?php echo $product->get_categories( ', ', '<span class="posted_in">' . _n( 'Category:', 'Categories:', $cat_count, 'woocommerce' ) . ' ', '</span>' ); ?>
+	<?php echo wc_get_product_category_list( $product->get_id(), ', ', '<span class="posted_in">' . _n( 'Category:', 'Categories:', count( $product->get_category_ids() ), 'woocommerce' ) . ' ', '</span>' ); ?>
 
-	<?php echo $product->get_tags( ', ', '<span class="tagged_as">' . _n( 'Tag:', 'Tags:', $tag_count, 'woocommerce' ) . ' ', '</span>' ); ?>
+	<?php echo wc_get_product_tag_list( $product->get_id(), ', ', '<span class="tagged_as">' . _n( 'Tag:', 'Tags:', count( $product->get_tag_ids() ), 'woocommerce' ) . ' ', '</span>' ); ?>
 
 	<?php do_action( 'woocommerce_product_meta_end' ); ?>
 
diff --git a/templates/single-product/photoswipe.php b/templates/single-product/photoswipe.php
new file mode 100644
index 00000000000..5dc663942ec
--- /dev/null
+++ b/templates/single-product/photoswipe.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Photoswipe markup
+ *
+ * This template can be overridden by copying it to yourtheme/woocommerce/single-product/photoswipe.php.
+ *
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
+ *
+ * @see     https://docs.woocommerce.com/document/template-structure/
+ * @author  WooThemes
+ * @package WooCommerce/Templates
+ * @version 3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly.
+}
+?>
+
+<!-- Root element of PhotoSwipe. Must have class pswp. -->
+<div class="pswp" tabindex="-1" role="dialog" aria-hidden="true">
+
+	<!-- Background of PhotoSwipe. It's a separate element as animating opacity is faster than rgba(). -->
+	<div class="pswp__bg"></div>
+
+	<!-- Slides wrapper with overflow:hidden. -->
+	<div class="pswp__scroll-wrap">
+
+		<!-- Container that holds slides.
+		PhotoSwipe keeps only 3 of them in the DOM to save memory.
+		Don't modify these 3 pswp__item elements, data is added later on. -->
+		<div class="pswp__container">
+			<div class="pswp__item"></div>
+			<div class="pswp__item"></div>
+			<div class="pswp__item"></div>
+		</div>
+
+		<!-- Default (PhotoSwipeUI_Default) interface on top of sliding area. Can be changed. -->
+		<div class="pswp__ui pswp__ui--hidden">
+
+			<div class="pswp__top-bar">
+
+				<!--  Controls are self-explanatory. Order can be changed. -->
+
+				<div class="pswp__counter"></div>
+
+				<button class="pswp__button pswp__button--close" aria-label="<?php esc_attr_e( 'Close (Esc)', 'woocommerce' ); ?>"></button>
+
+				<button class="pswp__button pswp__button--share" aria-label="<?php esc_attr_e( 'Share', 'woocommerce' ); ?>"></button>
+
+				<button class="pswp__button pswp__button--fs" aria-label="<?php esc_attr_e( 'Toggle fullscreen', 'woocommerce' ); ?>"></button>
+
+				<button class="pswp__button pswp__button--zoom" aria-label="<?php esc_attr_e( 'Zoom in/out', 'woocommerce' ); ?>"></button>
+
+				<!-- Preloader demo http://codepen.io/dimsemenov/pen/yyBWoR -->
+				<!-- element will get class pswp__preloader--active when preloader is running -->
+				<div class="pswp__preloader">
+					<div class="pswp__preloader__icn">
+						<div class="pswp__preloader__cut">
+							<div class="pswp__preloader__donut"></div>
+						</div>
+					</div>
+				</div>
+			</div>
+
+			<div class="pswp__share-modal pswp__share-modal--hidden pswp__single-tap">
+				<div class="pswp__share-tooltip"></div>
+			</div>
+
+			<button class="pswp__button pswp__button--arrow--left" aria-label="<?php esc_attr_e( 'Previous (arrow left)', 'woocommerce' ); ?>"></button>
+
+			<button class="pswp__button pswp__button--arrow--right" aria-label="<?php esc_attr_e( 'Next (arrow right)', 'woocommerce' ); ?>"></button>
+
+			<div class="pswp__caption">
+				<div class="pswp__caption__center"></div>
+			</div>
+
+		</div>
+
+	</div>
+
+</div>
diff --git a/templates/single-product/price.php b/templates/single-product/price.php
index a93deb66203..e01c6afced0 100644
--- a/templates/single-product/price.php
+++ b/templates/single-product/price.php
@@ -4,15 +4,16 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/single-product/price.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see     http://docs.woothemes.com/document/template-structure/
+ * @see     https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
- * @version 2.4.9
+ * @version 3.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -22,12 +23,4 @@ if ( ! defined( 'ABSPATH' ) ) {
 global $product;
 
 ?>
-<div itemprop="offers" itemscope itemtype="http://schema.org/Offer">
-
-	<p class="price"><?php echo $product->get_price_html(); ?></p>
-
-	<meta itemprop="price" content="<?php echo esc_attr( $product->get_price() ); ?>" />
-	<meta itemprop="priceCurrency" content="<?php echo esc_attr( get_woocommerce_currency() ); ?>" />
-	<link itemprop="availability" href="http://schema.org/<?php echo $product->is_in_stock() ? 'InStock' : 'OutOfStock'; ?>" />
-
-</div>
+<p class="price"><?php echo $product->get_price_html(); ?></p>
diff --git a/templates/single-product/product-attributes.php b/templates/single-product/product-attributes.php
index 09a51d89487..f84f872b732 100644
--- a/templates/single-product/product-attributes.php
+++ b/templates/single-product/product-attributes.php
@@ -6,78 +6,66 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/single-product/product-attributes.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
- * @version     2.1.3
+ * @version     3.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
-
-$has_row    = false;
-$alt        = 1;
-$attributes = $product->get_attributes();
-
-ob_start();
-
 ?>
 <table class="shop_attributes">
-
-	<?php if ( $product->enable_dimensions_display() ) : ?>
-
-		<?php if ( $product->has_weight() ) : $has_row = true; ?>
-			<tr class="<?php if ( ( $alt = $alt * -1 ) === 1 ) echo 'alt'; ?>">
-				<th><?php _e( 'Weight', 'woocommerce' ) ?></th>
-				<td class="product_weight"><?php echo $product->get_weight() . ' ' . esc_attr( get_option( 'woocommerce_weight_unit' ) ); ?></td>
-			</tr>
-		<?php endif; ?>
-
-		<?php if ( $product->has_dimensions() ) : $has_row = true; ?>
-			<tr class="<?php if ( ( $alt = $alt * -1 ) === 1 ) echo 'alt'; ?>">
-				<th><?php _e( 'Dimensions', 'woocommerce' ) ?></th>
-				<td class="product_dimensions"><?php echo $product->get_dimensions(); ?></td>
-			</tr>
-		<?php endif; ?>
-
+	<?php if ( $display_dimensions && $product->has_weight() ) : ?>
+		<tr>
+			<th><?php _e( 'Weight', 'woocommerce' ) ?></th>
+			<td class="product_weight"><?php echo esc_html( wc_format_weight( $product->get_weight() ) ); ?></td>
+		</tr>
 	<?php endif; ?>
 
-	<?php foreach ( $attributes as $attribute ) :
-		if ( empty( $attribute['is_visible'] ) || ( $attribute['is_taxonomy'] && ! taxonomy_exists( $attribute['name'] ) ) ) {
-			continue;
-		} else {
-			$has_row = true;
-		}
-		?>
-		<tr class="<?php if ( ( $alt = $alt * -1 ) == 1 ) echo 'alt'; ?>">
-			<th><?php echo wc_attribute_label( $attribute['name'] ); ?></th>
+	<?php if ( $display_dimensions && $product->has_dimensions() ) : ?>
+		<tr>
+			<th><?php _e( 'Dimensions', 'woocommerce' ) ?></th>
+			<td class="product_dimensions"><?php echo esc_html( wc_format_dimensions( $product->get_dimensions( false ) ) ); ?></td>
+		</tr>
+	<?php endif; ?>
+
+	<?php foreach ( $attributes as $attribute ) : ?>
+		<tr>
+			<th><?php echo wc_attribute_label( $attribute->get_name() ); ?></th>
 			<td><?php
-				if ( $attribute['is_taxonomy'] ) {
+				$values = array();
 
-					$values = wc_get_product_terms( $product->id, $attribute['name'], array( 'fields' => 'names' ) );
-					echo apply_filters( 'woocommerce_attribute', wpautop( wptexturize( implode( ', ', $values ) ) ), $attribute, $values );
+				if ( $attribute->is_taxonomy() ) {
+					$attribute_taxonomy = $attribute->get_taxonomy_object();
+					$attribute_values = wc_get_product_terms( $product->get_id(), $attribute->get_name(), array( 'fields' => 'all' ) );
 
+					foreach ( $attribute_values as $attribute_value ) {
+						$value_name = esc_html( $attribute_value->name );
+
+						if ( $attribute_taxonomy->attribute_public ) {
+							$values[] = '<a href="' . esc_url( get_term_link( $attribute_value->term_id, $attribute->get_name() ) ) . '" rel="tag">' . $value_name . '</a>';
+						} else {
+							$values[] = $value_name;
+						}
+					}
 				} else {
+					$values = $attribute->get_options();
 
-					// Convert pipes to commas and display values
-					$values = array_map( 'trim', explode( WC_DELIMITER, $attribute['value'] ) );
-					echo apply_filters( 'woocommerce_attribute', wpautop( wptexturize( implode( ', ', $values ) ) ), $attribute, $values );
-
+					foreach ( $values as &$value ) {
+						$value = esc_html( $value );
+					}
 				}
+
+				echo apply_filters( 'woocommerce_attribute', wpautop( wptexturize( implode( ', ', $values ) ) ), $attribute, $values );
 			?></td>
 		</tr>
 	<?php endforeach; ?>
-
 </table>
-<?php
-if ( $has_row ) {
-	echo ob_get_clean();
-} else {
-	ob_end_clean();
-}
diff --git a/templates/single-product/product-image.php b/templates/single-product/product-image.php
index 7e4fed98d7f..1fe188f78ac 100644
--- a/templates/single-product/product-image.php
+++ b/templates/single-product/product-image.php
@@ -4,54 +4,60 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/single-product/product-image.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
- * @author 		WooThemes
- * @package 	WooCommerce/Templates
- * @version     2.0.14
+ * @see     https://docs.woocommerce.com/document/template-structure/
+ * @author  WooThemes
+ * @package WooCommerce/Templates
+ * @version 3.0.2
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
-global $post, $woocommerce, $product;
-
+global $post, $product;
+$columns           = apply_filters( 'woocommerce_product_thumbnails_columns', 4 );
+$thumbnail_size    = apply_filters( 'woocommerce_product_thumbnails_large_size', 'full' );
+$post_thumbnail_id = get_post_thumbnail_id( $post->ID );
+$full_size_image   = wp_get_attachment_image_src( $post_thumbnail_id, $thumbnail_size );
+$image_title       = get_post_field( 'post_excerpt', $post_thumbnail_id );
+$placeholder       = has_post_thumbnail() ? 'with-images' : 'without-images';
+$wrapper_classes   = apply_filters( 'woocommerce_single_product_image_gallery_classes', array(
+	'woocommerce-product-gallery',
+	'woocommerce-product-gallery--' . $placeholder,
+	'woocommerce-product-gallery--columns-' . absint( $columns ),
+	'images',
+) );
 ?>
-<div class="images">
+<div class="<?php echo esc_attr( implode( ' ', array_map( 'sanitize_html_class', $wrapper_classes ) ) ); ?>" data-columns="<?php echo esc_attr( $columns ); ?>" style="opacity: 0; transition: opacity .25s ease-in-out;">
+	<figure class="woocommerce-product-gallery__wrapper">
+		<?php
+		$attributes = array(
+			'title'                   => $image_title,
+			'data-src'                => $full_size_image[0],
+			'data-large_image'        => $full_size_image[0],
+			'data-large_image_width'  => $full_size_image[1],
+			'data-large_image_height' => $full_size_image[2],
+		);
 
-	<?php
 		if ( has_post_thumbnail() ) {
-
-			$image_title 	= esc_attr( get_the_title( get_post_thumbnail_id() ) );
-			$image_caption 	= get_post( get_post_thumbnail_id() )->post_excerpt;
-			$image_link  	= wp_get_attachment_url( get_post_thumbnail_id() );
-			$image       	= get_the_post_thumbnail( $post->ID, apply_filters( 'single_product_large_thumbnail_size', 'shop_single' ), array(
-				'title'	=> $image_title,
-				'alt'	=> $image_title
-				) );
-
-			$attachment_count = count( $product->get_gallery_attachment_ids() );
-
-			if ( $attachment_count > 0 ) {
-				$gallery = '[product-gallery]';
-			} else {
-				$gallery = '';
-			}
-
-			echo apply_filters( 'woocommerce_single_product_image_html', sprintf( '<a href="%s" itemprop="image" class="woocommerce-main-image zoom" title="%s" data-rel="prettyPhoto' . $gallery . '">%s</a>', $image_link, $image_caption, $image ), $post->ID );
-
+			$html  = '<div data-thumb="' . get_the_post_thumbnail_url( $post->ID, 'shop_thumbnail' ) . '" class="woocommerce-product-gallery__image"><a href="' . esc_url( $full_size_image[0] ) . '">';
+			$html .= get_the_post_thumbnail( $post->ID, 'shop_single', $attributes );
+			$html .= '</a></div>';
 		} else {
-
-			echo apply_filters( 'woocommerce_single_product_image_html', sprintf( '<img src="%s" alt="%s" />', wc_placeholder_img_src(), __( 'Placeholder', 'woocommerce' ) ), $post->ID );
-
+			$html  = '<div class="woocommerce-product-gallery__image--placeholder">';
+			$html .= sprintf( '<img src="%s" alt="%s" class="wp-post-image" />', esc_url( wc_placeholder_img_src() ), esc_html__( 'Awaiting product image', 'woocommerce' ) );
+			$html .= '</div>';
 		}
-	?>
 
-	<?php do_action( 'woocommerce_product_thumbnails' ); ?>
+		echo apply_filters( 'woocommerce_single_product_image_thumbnail_html', $html, get_post_thumbnail_id( $post->ID ) );
 
+		do_action( 'woocommerce_product_thumbnails' );
+		?>
+	</figure>
 </div>
diff --git a/templates/single-product/product-thumbnails.php b/templates/single-product/product-thumbnails.php
old mode 100644
new mode 100755
index b0ee8b5b541..67e15ec6ba8
--- a/templates/single-product/product-thumbnails.php
+++ b/templates/single-product/product-thumbnails.php
@@ -4,61 +4,44 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/single-product/product-thumbnails.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
- * @version     2.3.0
+ * @version     3.0.2
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
-global $post, $product, $woocommerce;
+global $post, $product;
 
-$attachment_ids = $product->get_gallery_attachment_ids();
+$attachment_ids = $product->get_gallery_image_ids();
 
-if ( $attachment_ids ) {
-	$loop 		= 0;
-	$columns 	= apply_filters( 'woocommerce_product_thumbnails_columns', 3 );
-	?>
-	<div class="thumbnails <?php echo 'columns-' . $columns; ?>"><?php
+if ( $attachment_ids && has_post_thumbnail() ) {
+	foreach ( $attachment_ids as $attachment_id ) {
+		$full_size_image = wp_get_attachment_image_src( $attachment_id, 'full' );
+		$thumbnail       = wp_get_attachment_image_src( $attachment_id, 'shop_thumbnail' );
+		$image_title     = get_post_field( 'post_excerpt', $attachment_id );
 
-		foreach ( $attachment_ids as $attachment_id ) {
+		$attributes = array(
+			'title'                   => $image_title,
+			'data-src'                => $full_size_image[0],
+			'data-large_image'        => $full_size_image[0],
+			'data-large_image_width'  => $full_size_image[1],
+			'data-large_image_height' => $full_size_image[2],
+		);
 
-			$classes = array( 'zoom' );
+		$html  = '<div data-thumb="' . esc_url( $thumbnail[0] ) . '" class="woocommerce-product-gallery__image"><a href="' . esc_url( $full_size_image[0] ) . '">';
+		$html .= wp_get_attachment_image( $attachment_id, 'shop_single', false, $attributes );
+ 		$html .= '</a></div>';
 
-			if ( $loop === 0 || $loop % $columns === 0 )
-				$classes[] = 'first';
-
-			if ( ( $loop + 1 ) % $columns === 0 )
-				$classes[] = 'last';
-
-			$image_link = wp_get_attachment_url( $attachment_id );
-
-			if ( ! $image_link )
-				continue;
-
-			$image_title 	= esc_attr( get_the_title( $attachment_id ) );
-			$image_caption 	= esc_attr( get_post_field( 'post_excerpt', $attachment_id ) );
-
-			$image       = wp_get_attachment_image( $attachment_id, apply_filters( 'single_product_small_thumbnail_size', 'shop_thumbnail' ), 0, $attr = array(
-				'title'	=> $image_title,
-				'alt'	=> $image_title
-				) );
-
-			$image_class = esc_attr( implode( ' ', $classes ) );
-
-			echo apply_filters( 'woocommerce_single_product_image_thumbnail_html', sprintf( '<a href="%s" class="%s" title="%s" data-rel="prettyPhoto[product-gallery]">%s</a>', $image_link, $image_class, $image_caption, $image ), $attachment_id, $post->ID, $image_class );
-
-			$loop++;
-		}
-
-	?></div>
-	<?php
+		echo apply_filters( 'woocommerce_single_product_image_thumbnail_html', $html, $attachment_id );
+	}
 }
diff --git a/templates/single-product/rating.php b/templates/single-product/rating.php
index eee651c0c9f..446b9d2b76a 100644
--- a/templates/single-product/rating.php
+++ b/templates/single-product/rating.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/single-product/rating.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author      WooThemes
  * @package     WooCommerce/Templates
  * @version     2.3.2
@@ -31,14 +32,27 @@ $average      = $product->get_average_rating();
 
 if ( $rating_count > 0 ) : ?>
 
-	<div class="woocommerce-product-rating" itemprop="aggregateRating" itemscope itemtype="http://schema.org/AggregateRating">
-		<div class="star-rating" title="<?php printf( __( 'Rated %s out of 5', 'woocommerce' ), $average ); ?>">
+	<div class="woocommerce-product-rating">
+		<div class="star-rating">
 			<span style="width:<?php echo ( ( $average / 5 ) * 100 ); ?>%">
-				<strong itemprop="ratingValue" class="rating"><?php echo esc_html( $average ); ?></strong> <?php printf( __( 'out of %s5%s', 'woocommerce' ), '<span itemprop="bestRating">', '</span>' ); ?>
-				<?php printf( _n( 'based on %s customer rating', 'based on %s customer ratings', $rating_count, 'woocommerce' ), '<span itemprop="ratingCount" class="rating">' . $rating_count . '</span>' ); ?>
+				<?php
+				/* translators: 1: average rating 2: max rating (i.e. 5) */
+				printf(
+					__( '%1$s out of %2$s', 'woocommerce' ),
+					'<strong class="rating">' . esc_html( $average ) . '</strong>',
+					'<span>5</span>'
+				);
+				?>
+				<?php
+				/* translators: %s: rating count */
+				printf(
+					_n( 'based on %s customer rating', 'based on %s customer ratings', $rating_count, 'woocommerce' ),
+					'<span class="rating">' . esc_html( $rating_count ) . '</span>'
+				);
+				?>
 			</span>
 		</div>
-		<?php if ( comments_open() ) : ?><a href="#reviews" class="woocommerce-review-link" rel="nofollow">(<?php printf( _n( '%s customer review', '%s customer reviews', $review_count, 'woocommerce' ), '<span itemprop="reviewCount" class="count">' . $review_count . '</span>' ); ?>)</a><?php endif ?>
+		<?php if ( comments_open() ) : ?><a href="#reviews" class="woocommerce-review-link" rel="nofollow">(<?php printf( _n( '%s customer review', '%s customer reviews', $review_count, 'woocommerce' ), '<span class="count">' . esc_html( $review_count ) . '</span>' ); ?>)</a><?php endif ?>
 	</div>
 
 <?php endif; ?>
diff --git a/templates/single-product/related.php b/templates/single-product/related.php
index fb35f0700cf..aa0992fd36e 100644
--- a/templates/single-product/related.php
+++ b/templates/single-product/related.php
@@ -4,62 +4,44 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/single-product/related.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
- * @version     1.6.4
+ * @version     3.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
-global $product, $woocommerce_loop;
+if ( $related_products ) : ?>
 
-if ( empty( $product ) || ! $product->exists() ) {
-	return;
-}
+	<section class="related products">
 
-$related = $product->get_related( $posts_per_page );
-
-if ( sizeof( $related ) === 0 ) return;
-
-$args = apply_filters( 'woocommerce_related_products_args', array(
-	'post_type'            => 'product',
-	'ignore_sticky_posts'  => 1,
-	'no_found_rows'        => 1,
-	'posts_per_page'       => $posts_per_page,
-	'orderby'              => $orderby,
-	'post__in'             => $related,
-	'post__not_in'         => array( $product->id )
-) );
-
-$products = new WP_Query( $args );
-
-$woocommerce_loop['columns'] = $columns;
-
-if ( $products->have_posts() ) : ?>
-
-	<div class="related products">
-
-		<h2><?php _e( 'Related Products', 'woocommerce' ); ?></h2>
+		<h2><?php esc_html_e( 'Related products', 'woocommerce' ); ?></h2>
 
 		<?php woocommerce_product_loop_start(); ?>
 
-			<?php while ( $products->have_posts() ) : $products->the_post(); ?>
+			<?php foreach ( $related_products as $related_product ) : ?>
 
-				<?php wc_get_template_part( 'content', 'product' ); ?>
+				<?php
+				 	$post_object = get_post( $related_product->get_id() );
 
-			<?php endwhile; // end of the loop. ?>
+					setup_postdata( $GLOBALS['post'] =& $post_object );
+
+					wc_get_template_part( 'content', 'product' ); ?>
+
+			<?php endforeach; ?>
 
 		<?php woocommerce_product_loop_end(); ?>
 
-	</div>
+	</section>
 
 <?php endif;
 
diff --git a/templates/single-product/review-meta.php b/templates/single-product/review-meta.php
new file mode 100644
index 00000000000..9c8a1ae6511
--- /dev/null
+++ b/templates/single-product/review-meta.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * The template to display the reviewers meta data (name, verified owner, review date)
+ *
+ * This template can be overridden by copying it to yourtheme/woocommerce/content-product.php.
+ *
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
+ *
+ * @see     https://docs.woocommerce.com/document/template-structure/
+ * @author  WooThemes
+ * @package WooCommerce/Templates
+ * @version 3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly.
+}
+
+global $comment;
+$verified = wc_review_is_from_verified_owner( $comment->comment_ID );
+
+if ( '0' === $comment->comment_approved ) { ?>
+
+	<p class="meta"><em class="woocommerce-review__awaiting-approval"><?php esc_attr_e( 'Your review is awaiting approval', 'woocommerce' ); ?></em></p>
+
+<?php } else { ?>
+
+	<p class="meta">
+		<strong class="woocommerce-review__author" itemprop="author"><?php comment_author(); ?></strong> <?php
+
+		if ( 'yes' === get_option( 'woocommerce_review_rating_verification_label' ) && $verified ) {
+			echo '<em class="woocommerce-review__verified verified">(' . esc_attr__( 'verified owner', 'woocommerce' ) . ')</em> ';
+		}
+
+		?><span class="woocommerce-review__dash">&ndash;</span> <time class="woocommerce-review__published-date" itemprop="datePublished" datetime="<?php echo get_comment_date( 'c' ); ?>"><?php echo get_comment_date( wc_date_format() ); ?></time>
+	</p>
+
+<?php }
diff --git a/templates/single-product/review-rating.php b/templates/single-product/review-rating.php
new file mode 100644
index 00000000000..d3bafe5d01a
--- /dev/null
+++ b/templates/single-product/review-rating.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * The template to display the reviewers star rating in reviews
+ *
+ * This template can be overridden by copying it to yourtheme/woocommerce/content-product.php.
+ *
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
+ *
+ * @see     https://docs.woocommerce.com/document/template-structure/
+ * @author  WooThemes
+ * @package WooCommerce/Templates
+ * @version 3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+
+global $comment;
+$rating = intval( get_comment_meta( $comment->comment_ID, 'rating', true ) );
+
+if ( $rating && get_option( 'woocommerce_enable_review_rating' ) === 'yes' ) { ?>
+
+	<div class="star-rating">
+		<span style="width:<?php echo ( esc_attr( $rating ) / 5 ) * 100; ?>%"><?php
+			/* translators: %s: rating */
+			printf( esc_html__( '%s out of 5', 'woocommerce' ), '<strong>' . $rating . '</strong>' );
+		?></span>
+	</div>
+
+<?php }
diff --git a/templates/single-product/review.php b/templates/single-product/review.php
index 536e2880d87..596b92dde35 100644
--- a/templates/single-product/review.php
+++ b/templates/single-product/review.php
@@ -6,66 +6,63 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/single-product/review.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see     http://docs.woothemes.com/document/template-structure/
+ * @see     https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
- * @version 2.5.0
+ * @version 2.6.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
-
-$rating   = intval( get_comment_meta( $comment->comment_ID, 'rating', true ) );
-$verified = wc_review_is_from_verified_owner( $comment->comment_ID );
-
 ?>
-<li itemprop="review" itemscope itemtype="http://schema.org/Review" <?php comment_class(); ?> id="li-comment-<?php comment_ID() ?>">
+<li <?php comment_class(); ?> id="li-comment-<?php comment_ID() ?>">
 
 	<div id="comment-<?php comment_ID(); ?>" class="comment_container">
 
-		<?php echo get_avatar( $comment, apply_filters( 'woocommerce_review_gravatar_size', '60' ), '' ); ?>
+		<?php
+		/**
+		 * The woocommerce_review_before hook
+		 *
+		 * @hooked woocommerce_review_display_gravatar - 10
+		 */
+		do_action( 'woocommerce_review_before', $comment );
+		?>
 
 		<div class="comment-text">
 
-			<?php if ( $rating && get_option( 'woocommerce_enable_review_rating' ) === 'yes' ) : ?>
+			<?php
+			/**
+			 * The woocommerce_review_before_comment_meta hook.
+			 *
+			 * @hooked woocommerce_review_display_rating - 10
+			 */
+			do_action( 'woocommerce_review_before_comment_meta', $comment );
 
-				<div itemprop="reviewRating" itemscope itemtype="http://schema.org/Rating" class="star-rating" title="<?php echo sprintf( __( 'Rated %d out of 5', 'woocommerce' ), $rating ) ?>">
-					<span style="width:<?php echo ( $rating / 5 ) * 100; ?>%"><strong itemprop="ratingValue"><?php echo $rating; ?></strong> <?php _e( 'out of 5', 'woocommerce' ); ?></span>
-				</div>
+			/**
+			 * The woocommerce_review_meta hook.
+			 *
+			 * @hooked woocommerce_review_display_meta - 10
+			 * @hooked WC_Structured_Data::generate_review_data() - 20
+			 */
+			do_action( 'woocommerce_review_meta', $comment );
 
-			<?php endif; ?>
+			do_action( 'woocommerce_review_before_comment_text', $comment );
 
-			<?php do_action( 'woocommerce_review_before_comment_meta', $comment ); ?>
+			/**
+			 * The woocommerce_review_comment_text hook
+			 *
+			 * @hooked woocommerce_review_display_comment_text - 10
+			 */
+			do_action( 'woocommerce_review_comment_text', $comment );
 
-			<?php if ( $comment->comment_approved == '0' ) : ?>
-
-				<p class="meta"><em><?php _e( 'Your comment is awaiting approval', 'woocommerce' ); ?></em></p>
-
-			<?php else : ?>
-
-				<p class="meta">
-					<strong itemprop="author"><?php comment_author(); ?></strong> <?php
-
-						if ( get_option( 'woocommerce_review_rating_verification_label' ) === 'yes' )
-							if ( $verified )
-								echo '<em class="verified">(' . __( 'verified owner', 'woocommerce' ) . ')</em> ';
-
-					?>&ndash; <time itemprop="datePublished" datetime="<?php echo get_comment_date( 'c' ); ?>"><?php echo get_comment_date( wc_date_format() ); ?></time>:
-				</p>
-
-			<?php endif; ?>
-
-			<?php do_action( 'woocommerce_review_before_comment_text', $comment ); ?>
-
-			<div itemprop="description" class="description"><?php comment_text(); ?></div>
-
-			<?php do_action( 'woocommerce_review_after_comment_text', $comment ); ?>
+			do_action( 'woocommerce_review_after_comment_text', $comment ); ?>
 
 		</div>
 	</div>
diff --git a/templates/single-product/sale-flash.php b/templates/single-product/sale-flash.php
index df7c98f34a2..2ca8ae8bfdf 100644
--- a/templates/single-product/sale-flash.php
+++ b/templates/single-product/sale-flash.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/single-product/sale-flash.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     1.6.4
@@ -24,6 +25,8 @@ global $post, $product;
 ?>
 <?php if ( $product->is_on_sale() ) : ?>
 
-	<?php echo apply_filters( 'woocommerce_sale_flash', '<span class="onsale">' . __( 'Sale!', 'woocommerce' ) . '</span>', $post, $product ); ?>
+	<?php echo apply_filters( 'woocommerce_sale_flash', '<span class="onsale">' . esc_html__( 'Sale!', 'woocommerce' ) . '</span>', $post, $product ); ?>
 
-<?php endif; ?>
+<?php endif;
+
+/* Omit closing PHP tag at the end of PHP files to avoid "headers already sent" issues. */
diff --git a/templates/single-product/share.php b/templates/single-product/share.php
index 0c3ee0d024a..6119fc46f80 100644
--- a/templates/single-product/share.php
+++ b/templates/single-product/share.php
@@ -6,12 +6,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/single-product/share.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     1.6.4
@@ -23,4 +24,6 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 ?>
 
-<?php do_action( 'woocommerce_share' ); // Sharing plugins can hook into here ?>
+<?php do_action( 'woocommerce_share' ); // Sharing plugins can hook into here
+
+/* Omit closing PHP tag at the end of PHP files to avoid "headers already sent" issues. */
diff --git a/templates/single-product/short-description.php b/templates/single-product/short-description.php
index cd4b767796b..441f7baa3e2 100644
--- a/templates/single-product/short-description.php
+++ b/templates/single-product/short-description.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/single-product/short-description.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     1.6.4
@@ -26,6 +27,6 @@ if ( ! $post->post_excerpt ) {
 }
 
 ?>
-<div itemprop="description">
-	<?php echo apply_filters( 'woocommerce_short_description', $post->post_excerpt ) ?>
+<div class="woocommerce-product-details__short-description">
+    <?php echo apply_filters( 'woocommerce_short_description', $post->post_excerpt ); ?>
 </div>
diff --git a/templates/single-product/stock.php b/templates/single-product/stock.php
new file mode 100644
index 00000000000..4a45929d8d3
--- /dev/null
+++ b/templates/single-product/stock.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Single Product stock.
+ *
+ * This template can be overridden by copying it to yourtheme/woocommerce/single-product/stock.php.
+ *
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
+ *
+ * @see     https://docs.woocommerce.com/document/template-structure/
+ * @author  WooThemes
+ * @package WooCommerce/Templates
+ * @version 3.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+?>
+<p class="stock <?php echo esc_attr( $class ); ?>"><?php echo wp_kses_post( $availability ); ?></p>
diff --git a/templates/single-product/tabs/additional-information.php b/templates/single-product/tabs/additional-information.php
index 01260ded57f..e682eeae93b 100644
--- a/templates/single-product/tabs/additional-information.php
+++ b/templates/single-product/tabs/additional-information.php
@@ -4,15 +4,16 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/single-product/tabs/additional-information.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author        WooThemes
  * @package       WooCommerce/Templates
- * @version       2.0.0
+ * @version       3.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -21,12 +22,12 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 global $product;
 
-$heading = apply_filters( 'woocommerce_product_additional_information_heading', __( 'Additional Information', 'woocommerce' ) );
+$heading = esc_html( apply_filters( 'woocommerce_product_additional_information_heading', __( 'Additional information', 'woocommerce' ) ) );
 
 ?>
 
-<?php if ( $heading ): ?>
+<?php if ( $heading ) : ?>
 	<h2><?php echo $heading; ?></h2>
 <?php endif; ?>
 
-<?php $product->list_attributes(); ?>
+<?php do_action( 'woocommerce_product_additional_information', $product ); ?>
diff --git a/templates/single-product/tabs/description.php b/templates/single-product/tabs/description.php
index 5ebb6352255..08bb56d31af 100644
--- a/templates/single-product/tabs/description.php
+++ b/templates/single-product/tabs/description.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/single-product/tabs/description.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     2.0.0
@@ -21,11 +22,11 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 global $post;
 
-$heading = esc_html( apply_filters( 'woocommerce_product_description_heading', __( 'Product Description', 'woocommerce' ) ) );
+$heading = esc_html( apply_filters( 'woocommerce_product_description_heading', __( 'Description', 'woocommerce' ) ) );
 
 ?>
 
-<?php if ( $heading ): ?>
+<?php if ( $heading ) : ?>
   <h2><?php echo $heading; ?></h2>
 <?php endif; ?>
 
diff --git a/templates/single-product/tabs/tabs.php b/templates/single-product/tabs/tabs.php
index 9c323daa3ad..43dc9270031 100644
--- a/templates/single-product/tabs/tabs.php
+++ b/templates/single-product/tabs/tabs.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/single-product/tabs/tabs.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
  * @version 2.4.0
@@ -30,15 +31,15 @@ $tabs = apply_filters( 'woocommerce_product_tabs', array() );
 if ( ! empty( $tabs ) ) : ?>
 
 	<div class="woocommerce-tabs wc-tabs-wrapper">
-		<ul class="tabs wc-tabs">
+		<ul class="tabs wc-tabs" role="tablist">
 			<?php foreach ( $tabs as $key => $tab ) : ?>
-				<li class="<?php echo esc_attr( $key ); ?>_tab">
+				<li class="<?php echo esc_attr( $key ); ?>_tab" id="tab-title-<?php echo esc_attr( $key ); ?>" role="tab" aria-controls="tab-<?php echo esc_attr( $key ); ?>">
 					<a href="#tab-<?php echo esc_attr( $key ); ?>"><?php echo apply_filters( 'woocommerce_product_' . $key . '_tab_title', esc_html( $tab['title'] ), $key ); ?></a>
 				</li>
 			<?php endforeach; ?>
 		</ul>
 		<?php foreach ( $tabs as $key => $tab ) : ?>
-			<div class="panel entry-content wc-tab" id="tab-<?php echo esc_attr( $key ); ?>">
+			<div class="woocommerce-Tabs-panel woocommerce-Tabs-panel--<?php echo esc_attr( $key ); ?> panel entry-content wc-tab" id="tab-<?php echo esc_attr( $key ); ?>" role="tabpanel" aria-labelledby="tab-title-<?php echo esc_attr( $key ); ?>">
 				<?php call_user_func( $tab['callback'], $key, $tab ); ?>
 			</div>
 		<?php endforeach; ?>
diff --git a/templates/single-product/title.php b/templates/single-product/title.php
index 72c38145d8f..93e51506220 100644
--- a/templates/single-product/title.php
+++ b/templates/single-product/title.php
@@ -4,20 +4,20 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/single-product/title.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
- * @author  WooThemes
- * @package WooCommerce/Templates
- * @version 1.6.4
+ * @see        https://docs.woocommerce.com/document/template-structure/
+ * @author     WooThemes
+ * @package    WooCommerce/Templates
+ * @version    1.6.4
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit; // Exit if accessed directly.
 }
 
-?>
-<h1 itemprop="name" class="product_title entry-title"><?php the_title(); ?></h1>
+the_title( '<h1 class="product_title entry-title">', '</h1>' );
diff --git a/templates/single-product/up-sells.php b/templates/single-product/up-sells.php
index 7946e53f1e1..75ca4e40c22 100644
--- a/templates/single-product/up-sells.php
+++ b/templates/single-product/up-sells.php
@@ -4,63 +4,44 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/single-product/up-sells.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
- * @version     1.6.4
+ * @version     3.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
-global $product, $woocommerce_loop;
+if ( $upsells ) : ?>
 
-$upsells = $product->get_upsells();
+	<section class="up-sells upsells products">
 
-if ( sizeof( $upsells ) === 0 ) {
-	return;
-}
-
-$meta_query = WC()->query->get_meta_query();
-
-$args = array(
-	'post_type'           => 'product',
-	'ignore_sticky_posts' => 1,
-	'no_found_rows'       => 1,
-	'posts_per_page'      => $posts_per_page,
-	'orderby'             => $orderby,
-	'post__in'            => $upsells,
-	'post__not_in'        => array( $product->id ),
-	'meta_query'          => $meta_query
-);
-
-$products = new WP_Query( $args );
-
-$woocommerce_loop['columns'] = $columns;
-
-if ( $products->have_posts() ) : ?>
-
-	<div class="upsells products">
-
-		<h2><?php _e( 'You may also like&hellip;', 'woocommerce' ) ?></h2>
+		<h2><?php esc_html_e( 'You may also like&hellip;', 'woocommerce' ) ?></h2>
 
 		<?php woocommerce_product_loop_start(); ?>
 
-			<?php while ( $products->have_posts() ) : $products->the_post(); ?>
+			<?php foreach ( $upsells as $upsell ) : ?>
 
-				<?php wc_get_template_part( 'content', 'product' ); ?>
+				<?php
+				 	$post_object = get_post( $upsell->get_id() );
 
-			<?php endwhile; // end of the loop. ?>
+					setup_postdata( $GLOBALS['post'] =& $post_object );
+
+					wc_get_template_part( 'content', 'product' ); ?>
+
+			<?php endforeach; ?>
 
 		<?php woocommerce_product_loop_end(); ?>
 
-	</div>
+	</section>
 
 <?php endif;
 
diff --git a/templates/taxonomy-product_cat.php b/templates/taxonomy-product_cat.php
index 71b5fb93b50..06e2ff93ddf 100644
--- a/templates/taxonomy-product_cat.php
+++ b/templates/taxonomy-product_cat.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/taxonomy-product_cat.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @package 	WooCommerce/Templates
  * @version     1.6.4
  */
diff --git a/templates/taxonomy-product_tag.php b/templates/taxonomy-product_tag.php
index e8290664c0c..a1ce7981bd6 100644
--- a/templates/taxonomy-product_tag.php
+++ b/templates/taxonomy-product_tag.php
@@ -4,12 +4,13 @@
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/taxonomy-product_tag.php.
  *
- * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
- * will need to copy the new files to your theme to maintain compatibility. We try to do this.
- * as little as possible, but it does happen. When this occurs the version of the template file will.
- * be bumped and the readme will list any important changes.
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
  *
- * @see 	    http://docs.woothemes.com/document/template-structure/
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @package 	WooCommerce/Templates
  * @version     1.6.4
  */
diff --git a/tests/README.md b/tests/README.md
index d82c4f74a9a..edb801cb6c5 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -38,7 +38,7 @@ A text code coverage summary can be displayed using the `--coverage-text` option
 * Each test method should cover a single method or function with one or more assertions
 * A single method or function can have multiple associated test methods if it's a large or complex method
 * Use the test coverage HTML report (under `tmp/coverage/index.html`) to examine which lines your tests are covering and aim for 100% coverage
-* For code that cannot be tested (e.g. they require a certain PHP version), you can exclude them from coverage using a comment: `// @codeCoverageIgnoreStart` and `// @codeCoverageIgnoreEnd`. For example, see [`wc_round_tax_total()`](https://github.com/woothemes/woocommerce/blob/master/includes/wc-formatting-functions.php#L155-155)
+* For code that cannot be tested (e.g. they require a certain PHP version), you can exclude them from coverage using a comment: `// @codeCoverageIgnoreStart` and `// @codeCoverageIgnoreEnd`. For example, see [`wc_round_tax_total()`](https://github.com/woocommerce/woocommerce/blob/35f83867736713955fa2c4f463a024578bb88795/includes/wc-formatting-functions.php#L208-L219)
 * In addition to covering each line of a method/function, make sure to test common input and edge cases.
 * Prefer `assertsEquals()` where possible as it tests both type & equality
 * Remember that only methods prefixed with `test` will be run so use helper methods liberally to keep test methods small and reduce code duplication. If there is a common helper method used in multiple test files, consider adding it to the `WC_Unit_Test_Case` class so it can be shared by all test cases
diff --git a/tests/bin/install.sh b/tests/bin/install.sh
index 7fa5ae5f023..dcea51f3708 100755
--- a/tests/bin/install.sh
+++ b/tests/bin/install.sh
@@ -16,11 +16,11 @@ WP_TESTS_DIR=${WP_TESTS_DIR-/tmp/wordpress-tests-lib}
 WP_CORE_DIR=${WP_CORE_DIR-/tmp/wordpress/}
 
 download() {
-    if [ `which curl` ]; then
-        curl -s "$1" > "$2";
-    elif [ `which wget` ]; then
-        wget -nv -O "$2" "$1"
-    fi
+	if [ `which curl` ]; then
+		curl -s "$1" > "$2";
+	elif [ `which wget` ]; then
+		wget -nv -O "$2" "$1"
+	fi
 }
 
 if [[ $WP_VERSION =~ [0-9]+\.[0-9]+(\.[0-9]+)? ]]; then
@@ -110,4 +110,4 @@ install_db() {
 
 install_wp
 install_test_suite
-install_db
\ No newline at end of file
+install_db
diff --git a/tests/bin/phpunit.sh b/tests/bin/phpunit.sh
new file mode 100755
index 00000000000..bb7a731ab40
--- /dev/null
+++ b/tests/bin/phpunit.sh
@@ -0,0 +1,5 @@
+if [[ ${TRAVIS_BRANCH} == 'master' ]] && [[ ${TRAVIS_EVENT_TYPE} != 'pull_request' ]] && [[ ${TRAVIS_PHP_VERSION} == ${PHP_LATEST_STABLE} ]]; then
+	phpunit -c phpunit.xml.dist --coverage-clover ./tmp/clover.xml
+else
+	phpunit -c phpunit.xml.dist
+fi
diff --git a/tests/bin/travis.sh b/tests/bin/travis.sh
old mode 100644
new mode 100755
index 7a8a931368b..03fbd24c565
--- a/tests/bin/travis.sh
+++ b/tests/bin/travis.sh
@@ -3,32 +3,48 @@
 
 if [ $1 == 'before' ]; then
 
-	# Lint files
-	for file in $(find . -name "*.php" -and -not -path "./tmp/*" -and -not -path "./tests/*" -and -not -path "./apigen/*"); do
-		output=$( php -l $file )
-		if [[ $output == *"Errors parsing"* ]]; then
-			echo "Build stopped because of a syntax error: $output";
-			exit 1;
-		fi
-	done
+	# Composer install fails in PHP 5.2
+	[[ ${TRAVIS_PHP_VERSION} == '5.2' ]] && exit;
 
-	# composer install fails in PHP 5.2
-	[ $TRAVIS_PHP_VERSION == '5.2' ] && exit;
+	# No Xdebug and therefore no coverage in PHP 5.3
+	[[ ${TRAVIS_PHP_VERSION} == '5.3' ]] && exit;
 
-	# install php-coveralls to send coverage info
-	composer init --require=satooshi/php-coveralls:0.7.0 -n
+	if [[ ${TRAVIS_PHP_VERSION:0:2} == "7." ]]; then
+		composer global require "phpunit/phpunit=5.7.*"
+	else
+		composer global require "phpunit/phpunit=4.8.*"
+	fi
+
+	composer self-update
 	composer install --no-interaction
 
+elif [ $1 == 'during' ]; then
+
+	## Only run on latest stable PHP box (defined in .travis.yml).
+	if [[ ${TRAVIS_PHP_VERSION} == ${PHP_LATEST_STABLE} ]]; then
+		# WordPress Coding Standards.
+		# @link https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards
+		# @link http://pear.php.net/package/PHP_CodeSniffer/
+		# -p flag: Show progress of the run.
+		# -s flag: Show sniff codes in all reports.
+		# -v flag: Print verbose output.
+		# -n flag: Do not print warnings. (shortcut for --warning-severity=0)
+		# --standard: Use WordPress as the standard.
+		# --extensions: Only sniff PHP files.
+		./vendor/bin/phpcs -p -s -n ./*.php --standard=./phpcs.ruleset.xml --extensions=php
+		./vendor/bin/phpcs -p -s -n ./**/*.php --standard=./phpcs.ruleset.xml --extensions=php --ignore=./vendor/*.php --ignore=./tests/*.php
+		./vendor/bin/phpcs -p -s -n ./**/**/*.php --standard=./phpcs.ruleset.xml --extensions=php --ignore=./vendor/**/*.php --ignore=./tests/**/*.php
+		./vendor/bin/phpcs -p -s -n ./**/**/**/*.php --standard=./phpcs.ruleset.xml --extensions=php --ignore=./vendor/**/**/*.php --ignore=./tests/**/**/*.php
+		./vendor/bin/phpcs -p -s -n ./**/**/**/**/*.php --standard=./phpcs.ruleset.xml --extensions=php --ignore=./vendor/**/**/*.php --ignore=./tests/**/**/*.php
+	fi
+
 elif [ $1 == 'after' ]; then
 
-	# no Xdebug and therefore no coverage in PHP 5.2
-	[ $TRAVIS_PHP_VERSION == '5.2' ] && exit;
-
-	# send coverage data to coveralls
-	php vendor/bin/coveralls --verbose --exclude-no-stmt
-
-	# get scrutinizer ocular and run it
-	wget https://scrutinizer-ci.com/ocular.phar
-	ocular.phar code-coverage:upload --format=php-clover ./tmp/clover.xml
+	## Only run on master, not pull requests, latest stable PHP box (defined in .travis.yml).
+	if [[ ${TRAVIS_BRANCH} == 'master' ]] && [[ ${TRAVIS_EVENT_TYPE} != 'pull_request' ]] && [[ ${TRAVIS_PHP_VERSION} == ${PHP_LATEST_STABLE} ]]; then
+		wget https://scrutinizer-ci.com/ocular.phar
+		chmod +x ocular.phar
+		php ocular.phar code-coverage:upload --format=php-clover ./tmp/clover.xml
+	fi
 
 fi
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 963ee71fdc1..78156064c22 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -6,7 +6,7 @@
  */
 class WC_Unit_Tests_Bootstrap {
 
-	/** @var \WC_Unit_Tests_Bootstrap instance */
+	/** @var WC_Unit_Tests_Bootstrap instance */
 	protected static $instance = null;
 
 	/** @var string directory where wordpress-tests-lib is installed */
@@ -28,6 +28,11 @@ class WC_Unit_Tests_Bootstrap {
 		ini_set( 'display_errors','on' );
 		error_reporting( E_ALL );
 
+		// Ensure server variable is set for WP email functions.
+		if ( ! isset( $_SERVER['SERVER_NAME'] ) ) {
+			$_SERVER['SERVER_NAME'] = 'localhost';
+		}
+
 		$this->tests_dir    = dirname( __FILE__ );
 		$this->plugin_dir   = dirname( $this->tests_dir );
 		$this->wp_tests_dir = getenv( 'WP_TESTS_DIR' ) ? getenv( 'WP_TESTS_DIR' ) : '/tmp/wordpress-tests-lib';
@@ -64,17 +69,22 @@ class WC_Unit_Tests_Bootstrap {
 	 */
 	public function install_wc() {
 
-		// clean existing install first
+		// Clean existing install first.
 		define( 'WP_UNINSTALL_PLUGIN', true );
+		define( 'WC_REMOVE_ALL_DATA', true );
 		include( $this->plugin_dir . '/uninstall.php' );
 
 		WC_Install::install();
-		update_option( 'woocommerce_calc_shipping', 'yes' ); // Needed for tests cart and shipping methods
 
-		// reload capabilities after install, see https://core.trac.wordpress.org/ticket/28374
-		$GLOBALS['wp_roles']->reinit();
+		// Reload capabilities after install, see https://core.trac.wordpress.org/ticket/28374
+		if ( version_compare( $GLOBALS['wp_version'], '4.7', '<' ) ) {
+			$GLOBALS['wp_roles']->reinit();
+		} else {
+			$GLOBALS['wp_roles'] = null;
+			wp_roles();
+		}
 
-		echo "Installing WooCommerce..." . PHP_EOL;
+		echo 'Installing WooCommerce...' . PHP_EOL;
 	}
 
 	/**
@@ -91,10 +101,14 @@ class WC_Unit_Tests_Bootstrap {
 		// framework
 		require_once( $this->tests_dir . '/framework/class-wc-unit-test-factory.php' );
 		require_once( $this->tests_dir . '/framework/class-wc-mock-session-handler.php' );
+		require_once( $this->tests_dir . '/framework/class-wc-mock-wc-data.php' );
+		require_once( $this->tests_dir . '/framework/class-wc-payment-token-stub.php' );
+		require_once( $this->tests_dir . '/framework/vendor/class-wp-test-spy-rest-server.php' );
 
 		// test cases
 		require_once( $this->tests_dir . '/framework/class-wc-unit-test-case.php' );
 		require_once( $this->tests_dir . '/framework/class-wc-api-unit-test-case.php' );
+		require_once( $this->tests_dir . '/framework/class-wc-rest-unit-test-case.php' );
 
 		// Helpers
 		require_once( $this->tests_dir . '/framework/helpers/class-wc-helper-product.php' );
@@ -103,6 +117,9 @@ class WC_Unit_Tests_Bootstrap {
 		require_once( $this->tests_dir . '/framework/helpers/class-wc-helper-shipping.php' );
 		require_once( $this->tests_dir . '/framework/helpers/class-wc-helper-customer.php' );
 		require_once( $this->tests_dir . '/framework/helpers/class-wc-helper-order.php' );
+		require_once( $this->tests_dir . '/framework/helpers/class-wc-helper-shipping-zones.php' );
+		require_once( $this->tests_dir . '/framework/helpers/class-wc-helper-payment-token.php' );
+		require_once( $this->tests_dir . '/framework/helpers/class-wc-helper-settings.php' );
 	}
 
 	/**
@@ -118,7 +135,6 @@ class WC_Unit_Tests_Bootstrap {
 
 		return self::$instance;
 	}
-
 }
 
 WC_Unit_Tests_Bootstrap::instance();
diff --git a/tests/cli/bin/install-package-tests.sh b/tests/cli/bin/install-package-tests.sh
new file mode 100644
index 00000000000..e7e5979ac9a
--- /dev/null
+++ b/tests/cli/bin/install-package-tests.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+
+set -ex
+
+PACKAGE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../ && pwd )"
+
+download() {
+    if [ `which curl` ]; then
+        curl -s "$1" > "$2";
+    elif [ `which wget` ]; then
+        wget -nv -O "$2" "$1"
+    fi
+}
+
+install_wp_cli() {
+
+	# the Behat test suite will pick up the executable found in $WP_CLI_BIN_DIR
+	mkdir -p $WP_CLI_BIN_DIR
+	download https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli-nightly.phar $WP_CLI_BIN_DIR/wp
+	chmod +x $WP_CLI_BIN_DIR/wp
+
+}
+
+download_behat() {
+
+	cd $PACKAGE_DIR
+	download https://getcomposer.org/installer installer
+	php installer
+	php composer.phar require --dev behat/behat='~2.5'
+
+}
+
+install_db() {
+	mysql -e 'CREATE DATABASE IF NOT EXISTS wp_cli_test;' -uroot
+	mysql -e 'GRANT ALL PRIVILEGES ON wp_cli_test.* TO "wp_cli_test"@"localhost" IDENTIFIED BY "password1"' -uroot
+}
+
+install_wp_cli
+download_behat
+install_db
diff --git a/tests/cli/credits.txt b/tests/cli/credits.txt
new file mode 100644
index 00000000000..d44e07ce6f2
--- /dev/null
+++ b/tests/cli/credits.txt
@@ -0,0 +1,2 @@
+WC-CLI and the related testing code is based on wp-cli/restful (which was released under the MIT license https://opensource.org/licenses/MIT) by Daniel Bachhuber
+https://github.com/wp-cli/restful
diff --git a/tests/cli/features/bootstrap/FeatureContext.php b/tests/cli/features/bootstrap/FeatureContext.php
new file mode 100644
index 00000000000..06187134756
--- /dev/null
+++ b/tests/cli/features/bootstrap/FeatureContext.php
@@ -0,0 +1,330 @@
+<?php
+
+use Behat\Behat\Context\ClosuredContextInterface,
+    Behat\Behat\Context\TranslatedContextInterface,
+    Behat\Behat\Context\BehatContext,
+    Behat\Behat\Event\SuiteEvent;
+
+use \WP_CLI\Process;
+use \WP_CLI\Utils;
+
+// Inside a community package
+if ( file_exists( __DIR__ . '/utils.php' ) ) {
+	require_once __DIR__ . '/utils.php';
+	require_once __DIR__ . '/Process.php';
+	$project_composer = dirname( dirname( dirname( __FILE__ ) ) ) . '/composer.json';
+	if ( file_exists( $project_composer ) ) {
+		$composer = json_decode( file_get_contents( $project_composer ) );
+		if ( ! empty( $composer->autoload->files ) ) {
+			$contents = 'require:' . PHP_EOL;
+			foreach( $composer->autoload->files as $file ) {
+				$contents .= '  - ' . dirname( dirname( dirname( __FILE__ ) ) ) . '/' . $file;
+			}
+			@mkdir( sys_get_temp_dir() . '/wp-cli-package-test/' );
+			$project_config = sys_get_temp_dir() . '/wp-cli-package-test/config.yml';
+			file_put_contents( $project_config, $contents );
+			putenv( 'WP_CLI_CONFIG_PATH=' . $project_config );
+		}
+	}
+// Inside WP-CLI
+} else {
+	require_once __DIR__ . '/../../php/utils.php';
+	require_once __DIR__ . '/../../php/WP_CLI/Process.php';
+	require_once __DIR__ . '/../../vendor/autoload.php';
+}
+
+/**
+ * Features context.
+ */
+class FeatureContext extends BehatContext implements ClosuredContextInterface {
+
+	private static $cache_dir, $suite_cache_dir;
+
+	private static $db_settings = array(
+		'dbname' => 'wp_cli_test',
+		'dbuser' => 'wp_cli_test',
+		'dbpass' => 'password1',
+		'dbhost' => '127.0.0.1',
+	);
+
+	private $running_procs = array();
+
+	public $variables = array();
+
+	/**
+	 * Get the environment variables required for launched `wp` processes
+	 * @beforeSuite
+	 */
+	private static function get_process_env_variables() {
+		// Ensure we're using the expected `wp` binary
+		$bin_dir = getenv( 'WP_CLI_BIN_DIR' ) ?: realpath( __DIR__ . "/../../bin" );
+		$env = array(
+			'PATH' =>  $bin_dir . ':' . getenv( 'PATH' ),
+			'BEHAT_RUN' => 1,
+			'HOME' => '/tmp/wp-cli-home',
+		);
+		if ( $config_path = getenv( 'WP_CLI_CONFIG_PATH' ) ) {
+			$env['WP_CLI_CONFIG_PATH'] = $config_path;
+		}
+		return $env;
+	}
+
+	// We cache the results of `wp core download` to improve test performance
+	// Ideally, we'd cache at the HTTP layer for more reliable tests
+	private static function cache_wp_files() {
+		self::$cache_dir = sys_get_temp_dir() . '/wp-cli-test core-download-cache';
+
+		if ( is_readable( self::$cache_dir . '/wp-config-sample.php' ) )
+			return;
+
+		$cmd = Utils\esc_cmd( 'wp core download --force --path=%s', self::$cache_dir );
+		Process::create( $cmd, null, self::get_process_env_variables() )->run_check();
+	}
+
+	/**
+	 * @BeforeSuite
+	 */
+	public static function prepare( SuiteEvent $event ) {
+		$result = Process::create( 'wp cli info', null, self::get_process_env_variables() )->run_check();
+		echo PHP_EOL;
+		echo $result->stdout;
+		echo PHP_EOL;
+		self::cache_wp_files();
+	}
+
+	/**
+	 * @AfterSuite
+	 */
+	public static function afterSuite( SuiteEvent $event ) {
+		if ( self::$suite_cache_dir ) {
+			Process::create( Utils\esc_cmd( 'rm -r %s', self::$suite_cache_dir ), null, self::get_process_env_variables() )->run();
+		}
+	}
+
+	/**
+	 * @BeforeScenario
+	 */
+	public function beforeScenario( $event ) {
+		$this->variables['SRC_DIR'] = realpath( __DIR__ . '/../..' );
+	}
+
+	/**
+	 * @AfterScenario
+	 */
+	public function afterScenario( $event ) {
+		if ( isset( $this->variables['RUN_DIR'] ) ) {
+			// remove altered WP install, unless there's an error
+			if ( $event->getResult() < 4 ) {
+				$this->proc( Utils\esc_cmd( 'rm -r %s', $this->variables['RUN_DIR'] ) )->run();
+			}
+		}
+
+		foreach ( $this->running_procs as $proc ) {
+			self::terminate_proc( $proc );
+		}
+	}
+
+	/**
+	 * Terminate a process and any of its children.
+	 */
+	private static function terminate_proc( $proc ) {
+		$status = proc_get_status( $proc );
+
+		$master_pid = $status['pid'];
+
+		$output = `ps -o ppid,pid,command | grep $master_pid`;
+
+		foreach ( explode( PHP_EOL, $output ) as $line ) {
+			if ( preg_match( '/^\s*(\d+)\s+(\d+)/', $line, $matches ) ) {
+				$parent = $matches[1];
+				$child = $matches[2];
+
+				if ( $parent == $master_pid ) {
+					if ( ! posix_kill( (int) $child, 9 ) ) {
+						throw new RuntimeException( posix_strerror( posix_get_last_error() ) );
+					}
+				}
+			}
+		}
+
+		if ( ! posix_kill( (int) $master_pid, 9 ) ) {
+			throw new RuntimeException( posix_strerror( posix_get_last_error() ) );
+		}
+	}
+
+	public static function create_cache_dir() {
+		self::$suite_cache_dir = sys_get_temp_dir() . '/' . uniqid( "wp-cli-test-suite-cache-", TRUE );
+		mkdir( self::$suite_cache_dir );
+		return self::$suite_cache_dir;
+	}
+
+	/**
+	 * Initializes context.
+	 * Every scenario gets it's own context object.
+	 *
+	 * @param array $parameters context parameters (set them up through behat.yml)
+	 */
+	public function __construct( array $parameters ) {
+		$this->drop_db();
+		$this->set_cache_dir();
+		$this->variables['CORE_CONFIG_SETTINGS'] = Utils\assoc_args_to_str( self::$db_settings );
+	}
+
+	public function getStepDefinitionResources() {
+		return glob( __DIR__ . '/../steps/*.php' );
+	}
+
+	public function getHookDefinitionResources() {
+		return array();
+	}
+
+	public function replace_variables( $str ) {
+		return preg_replace_callback( '/\{([A-Z_]+)\}/', array( $this, '_replace_var' ), $str );
+	}
+
+	private function _replace_var( $matches ) {
+		$cmd = $matches[0];
+
+		foreach ( array_slice( $matches, 1 ) as $key ) {
+			$cmd = str_replace( '{' . $key . '}', $this->variables[ $key ], $cmd );
+		}
+
+		return $cmd;
+	}
+
+	public function create_run_dir() {
+		if ( !isset( $this->variables['RUN_DIR'] ) ) {
+			$this->variables['RUN_DIR'] = sys_get_temp_dir() . '/' . uniqid( "wp-cli-test-run-", TRUE );
+			mkdir( $this->variables['RUN_DIR'] );
+		}
+	}
+
+	public function build_phar( $version = 'same' ) {
+		$this->variables['PHAR_PATH'] = $this->variables['RUN_DIR'] . '/' . uniqid( "wp-cli-build-", TRUE ) . '.phar';
+
+		$this->proc( Utils\esc_cmd(
+			'php -dphar.readonly=0 %1$s %2$s --version=%3$s && chmod +x %2$s',
+			__DIR__ . '/../../utils/make-phar.php',
+			$this->variables['PHAR_PATH'],
+			$version
+		) )->run_check();
+	}
+
+	private function set_cache_dir() {
+		$path = sys_get_temp_dir() . '/wp-cli-test-cache';
+		$this->proc( Utils\esc_cmd( 'mkdir -p %s', $path ) )->run_check();
+		$this->variables['CACHE_DIR'] = $path;
+	}
+
+	private static function run_sql( $sql ) {
+		Utils\run_mysql_command( 'mysql --no-defaults', array(
+			'execute' => $sql,
+			'host' => self::$db_settings['dbhost'],
+			'user' => self::$db_settings['dbuser'],
+			'pass' => self::$db_settings['dbpass'],
+		) );
+	}
+
+	public function create_db() {
+		$dbname = self::$db_settings['dbname'];
+		self::run_sql( "CREATE DATABASE IF NOT EXISTS $dbname" );
+	}
+
+	public function drop_db() {
+		$dbname = self::$db_settings['dbname'];
+		self::run_sql( "DROP DATABASE IF EXISTS $dbname" );
+	}
+
+	public function proc( $command, $assoc_args = array(), $path = '' ) {
+		if ( !empty( $assoc_args ) )
+			$command .= Utils\assoc_args_to_str( $assoc_args );
+
+		$env = self::get_process_env_variables();
+		if ( isset( $this->variables['SUITE_CACHE_DIR'] ) ) {
+			$env['WP_CLI_CACHE_DIR'] = $this->variables['SUITE_CACHE_DIR'];
+		}
+
+		if ( isset( $this->variables['RUN_DIR'] ) ) {
+			$cwd = "{$this->variables['RUN_DIR']}/{$path}";
+		} else {
+			$cwd = null;
+		}
+
+		return Process::create( $command, $cwd, $env );
+	}
+
+	/**
+	 * Start a background process. Will automatically be closed when the tests finish.
+	 */
+	public function background_proc( $cmd ) {
+		$descriptors = array(
+			0 => STDIN,
+			1 => array( 'pipe', 'w' ),
+			2 => array( 'pipe', 'w' ),
+		);
+
+		$proc = proc_open( $cmd, $descriptors, $pipes, $this->variables['RUN_DIR'], self::get_process_env_variables() );
+
+		sleep(1);
+
+		$status = proc_get_status( $proc );
+
+		if ( !$status['running'] ) {
+			throw new RuntimeException( stream_get_contents( $pipes[2] ) );
+		} else {
+			$this->running_procs[] = $proc;
+		}
+	}
+
+	public function move_files( $src, $dest ) {
+		rename( $this->variables['RUN_DIR'] . "/$src", $this->variables['RUN_DIR'] . "/$dest" );
+	}
+
+	public function add_line_to_wp_config( &$wp_config_code, $line ) {
+		$token = "/* That's all, stop editing!";
+
+		$wp_config_code = str_replace( $token, "$line\n\n$token", $wp_config_code );
+	}
+
+	public function download_wp( $subdir = '' ) {
+		$dest_dir = $this->variables['RUN_DIR'] . "/$subdir";
+
+		if ( $subdir ) {
+			mkdir( $dest_dir );
+		}
+
+		$this->proc( Utils\esc_cmd( "cp -r %s/* %s", self::$cache_dir, $dest_dir ) )->run_check();
+
+		// disable emailing
+		mkdir( $dest_dir . '/wp-content/mu-plugins' );
+		copy( __DIR__ . '/../extra/no-mail.php', $dest_dir . '/wp-content/mu-plugins/no-mail.php' );
+		symlink( dirname( dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) ),  $dest_dir . '/wp-content/plugins/woocommerce' );
+	}
+
+	public function create_config( $subdir = '' ) {
+		$params = self::$db_settings;
+		$params['dbprefix'] = $subdir ?: 'wp_';
+
+		$params['skip-salts'] = true;
+		$this->proc( 'wp core config', $params, $subdir )->run_check();
+	}
+
+	public function install_wp( $subdir = '' ) {
+		$this->create_db();
+		$this->create_run_dir();
+		$this->download_wp( $subdir );
+
+		$this->create_config( $subdir );
+
+		$install_args = array(
+			'url' => 'http://example.com',
+			'title' => 'WP CLI Site',
+			'admin_user' => 'admin',
+			'admin_email' => 'admin@example.com',
+			'admin_password' => 'password1'
+		);
+
+		$this->proc( 'wp core install', $install_args, $subdir )->run_check();
+		$this->proc( 'wp plugin activate woocommerce', array(), $subdir )->run_check();
+	}
+}
diff --git a/tests/cli/features/bootstrap/Process.php b/tests/cli/features/bootstrap/Process.php
new file mode 100644
index 00000000000..5be6a0d36da
--- /dev/null
+++ b/tests/cli/features/bootstrap/Process.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace WP_CLI;
+
+/**
+ * Run a system process, and learn what happened.
+ */
+class Process {
+
+	/**
+	 * @param string $command Command to execute.
+	 * @param string $cwd Directory to execute the command in.
+	 * @param array $env Environment variables to set when running the command.
+	 */
+	public static function create( $command, $cwd = null, $env = array() ) {
+		$proc = new self;
+
+		$proc->command = $command;
+		$proc->cwd = $cwd;
+		$proc->env = $env;
+
+		return $proc;
+	}
+
+	private $command, $cwd, $env;
+
+	private function __construct() {}
+
+	/**
+	 * Run the command.
+	 *
+	 * @return ProcessRun
+	 */
+	public function run() {
+		$cwd = $this->cwd;
+
+		$descriptors = array(
+			0 => STDIN,
+			1 => array( 'pipe', 'w' ),
+			2 => array( 'pipe', 'w' ),
+		);
+
+		$proc = proc_open( $this->command, $descriptors, $pipes, $cwd, $this->env );
+
+		$stdout = stream_get_contents( $pipes[1] );
+		fclose( $pipes[1] );
+
+		$stderr = stream_get_contents( $pipes[2] );
+		fclose( $pipes[2] );
+
+		return new ProcessRun( array(
+			'stdout' => $stdout,
+			'stderr' => $stderr,
+			'return_code' => proc_close( $proc ),
+			'command' => $this->command,
+			'cwd' => $cwd,
+			'env' => $this->env
+		) );
+	}
+
+	/**
+	 * Run the command, but throw an Exception on error.
+	 *
+	 * @return ProcessRun
+	 */
+	public function run_check() {
+		$r = $this->run();
+
+		if ( $r->return_code || !empty( $r->STDERR ) ) {
+			throw new \RuntimeException( $r );
+		}
+
+		return $r;
+	}
+}
+
+/**
+ * Results of an executed command.
+ */
+class ProcessRun {
+
+	/**
+	 * @var array $props Properties of executed command.
+	 */
+	public function __construct( $props ) {
+		foreach ( $props as $key => $value ) {
+			$this->$key = $value;
+		}
+	}
+
+	/**
+	 * Return properties of executed command as a string.
+	 *
+	 * @return string
+	 */
+	public function __toString() {
+		$out  = "$ $this->command\n";
+		$out .= "$this->stdout\n$this->stderr";
+		$out .= "cwd: $this->cwd\n";
+		$out .= "exit status: $this->return_code";
+
+		return $out;
+	}
+
+}
diff --git a/tests/cli/features/bootstrap/support.php b/tests/cli/features/bootstrap/support.php
new file mode 100644
index 00000000000..d5cc221e4aa
--- /dev/null
+++ b/tests/cli/features/bootstrap/support.php
@@ -0,0 +1,188 @@
+<?php
+
+// Utility functions used by Behat steps
+
+function assertEquals( $expected, $actual ) {
+	if ( $expected != $actual ) {
+		throw new Exception( "Actual value: " . var_export( $actual, true ) );
+	}
+}
+
+function assertNumeric( $actual ) {
+	if ( !is_numeric( $actual ) ) {
+		throw new Exception( "Actual value: " . var_export( $actual, true ) );
+	}
+}
+
+function assertNotNumeric( $actual ) {
+	if ( is_numeric( $actual ) ) {
+		throw new Exception( "Actual value: " . var_export( $actual, true ) );
+	}
+}
+
+function checkString( $output, $expected, $action, $message = false ) {
+	switch ( $action ) {
+
+	case 'be':
+		$r = $expected === rtrim( $output, "\n" );
+		break;
+
+	case 'contain':
+		$r = false !== strpos( $output, $expected );
+		break;
+
+	case 'not contain':
+		$r = false === strpos( $output, $expected );
+		break;
+
+	default:
+		throw new Behat\Behat\Exception\PendingException();
+	}
+
+	if ( !$r ) {
+		if ( false === $message )
+			$message = $output;
+		throw new Exception( $message );
+	}
+}
+
+function compareTables( $expected_rows, $actual_rows, $output ) {
+	// the first row is the header and must be present
+	if ( $expected_rows[0] != $actual_rows[0] ) {
+		throw new \Exception( $output );
+	}
+
+	unset( $actual_rows[0] );
+	unset( $expected_rows[0] );
+
+	$missing_rows = array_diff( $expected_rows, $actual_rows );
+	if ( !empty( $missing_rows ) ) {
+		throw new \Exception( $output );
+	}
+}
+
+function compareContents( $expected, $actual ) {
+	if ( gettype( $expected ) != gettype( $actual ) ) {
+		return false;
+	}
+
+	if ( is_object( $expected ) ) {
+		foreach ( get_object_vars( $expected ) as $name => $value ) {
+			if ( ! compareContents( $value, $actual->$name ) )
+				return false;
+		}
+	} else if ( is_array( $expected ) ) {
+		foreach ( $expected as $key => $value ) {
+			if ( ! compareContents( $value, $actual[$key] ) )
+				return false;
+		}
+	} else {
+		return $expected === $actual;
+	}
+
+	return true;
+}
+
+/**
+ * Compare two strings containing JSON to ensure that @a $actualJson contains at
+ * least what the JSON string @a $expectedJson contains.
+ *
+ * @return whether or not @a $actualJson contains @a $expectedJson
+ *     @retval true  @a $actualJson contains @a $expectedJson
+ *     @retval false @a $actualJson does not contain @a $expectedJson
+ *
+ * @param[in] $actualJson   the JSON string to be tested
+ * @param[in] $expectedJson the expected JSON string
+ *
+ * Examples:
+ *   expected: {'a':1,'array':[1,3,5]}
+ *
+ *   1 )
+ *   actual: {'a':1,'b':2,'c':3,'array':[1,2,3,4,5]}
+ *   return: true
+ *
+ *   2 )
+ *   actual: {'b':2,'c':3,'array':[1,2,3,4,5]}
+ *   return: false
+ *     element 'a' is missing from the root object
+ *
+ *   3 )
+ *   actual: {'a':0,'b':2,'c':3,'array':[1,2,3,4,5]}
+ *   return: false
+ *     the value of element 'a' is not 1
+ *
+ *   4 )
+ *   actual: {'a':1,'b':2,'c':3,'array':[1,2,4,5]}
+ *   return: false
+ *     the contents of 'array' does not include 3
+ */
+function checkThatJsonStringContainsJsonString( $actualJson, $expectedJson ) {
+	$actualValue   = json_decode( $actualJson );
+	$expectedValue = json_decode( $expectedJson );
+
+	if ( !$actualValue ) {
+		return false;
+	}
+
+	return compareContents( $expectedValue, $actualValue );
+}
+
+/**
+ * Compare two strings to confirm $actualCSV contains $expectedCSV
+ * Both strings are expected to have headers for their CSVs.
+ * $actualCSV must match all data rows in $expectedCSV
+ *
+ * @param  string   A CSV string
+ * @param  array    A nested array of values
+ * @return bool     Whether $actualCSV contains $expectedCSV
+ */
+function checkThatCsvStringContainsValues( $actualCSV, $expectedCSV ) {
+	$actualCSV = array_map( 'str_getcsv', explode( PHP_EOL, $actualCSV ) );
+
+	if ( empty( $actualCSV ) )
+		return false;
+
+	// Each sample must have headers
+	$actualHeaders = array_values( array_shift( $actualCSV ) );
+	$expectedHeaders = array_values( array_shift( $expectedCSV ) );
+
+	// Each expectedCSV must exist somewhere in actualCSV in the proper column
+	$expectedResult = 0;
+	foreach ( $expectedCSV as $expected_row ) {
+		$expected_row = array_combine( $expectedHeaders, $expected_row );
+		foreach ( $actualCSV as $actual_row ) {
+
+			if ( count( $actualHeaders ) != count( $actual_row ) )
+				continue;
+
+			$actual_row = array_intersect_key( array_combine( $actualHeaders, $actual_row ), $expected_row );
+			if ( $actual_row == $expected_row )
+				$expectedResult++;
+		}
+	}
+
+	return $expectedResult >= count( $expectedCSV );
+}
+
+/**
+ * Compare two strings containing YAML to ensure that @a $actualYaml contains at
+ * least what the YAML string @a $expectedYaml contains.
+ *
+ * @return whether or not @a $actualYaml contains @a $expectedJson
+ *     @retval true  @a $actualYaml contains @a $expectedJson
+ *     @retval false @a $actualYaml does not contain @a $expectedJson
+ *
+ * @param[in] $actualYaml   the YAML string to be tested
+ * @param[in] $expectedYaml the expected YAML string
+ */
+function checkThatYamlStringContainsYamlString( $actualYaml, $expectedYaml ) {
+	$actualValue   = spyc_load( $actualYaml );
+	$expectedValue = spyc_load( $expectedYaml );
+
+	if ( !$actualValue ) {
+		return false;
+	}
+
+	return compareContents( $expectedValue, $actualValue );
+}
+
diff --git a/tests/cli/features/bootstrap/utils.php b/tests/cli/features/bootstrap/utils.php
new file mode 100644
index 00000000000..d2499de33de
--- /dev/null
+++ b/tests/cli/features/bootstrap/utils.php
@@ -0,0 +1,757 @@
+<?php
+
+// Utilities that do NOT depend on WordPress code.
+
+namespace WP_CLI\Utils;
+
+use \Composer\Semver\Comparator;
+use \Composer\Semver\Semver;
+use \WP_CLI\Dispatcher;
+use \WP_CLI\Iterators\Transform;
+
+function inside_phar() {
+	return 0 === strpos( WP_CLI_ROOT, 'phar://' );
+}
+
+// Files that need to be read by external programs have to be extracted from the Phar archive.
+function extract_from_phar( $path ) {
+	if ( ! inside_phar() ) {
+		return $path;
+	}
+
+	$fname = basename( $path );
+
+	$tmp_path = get_temp_dir() . "wp-cli-$fname";
+
+	copy( $path, $tmp_path );
+
+	register_shutdown_function( function() use ( $tmp_path ) {
+		@unlink( $tmp_path );
+	} );
+
+	return $tmp_path;
+}
+
+function load_dependencies() {
+	if ( inside_phar() ) {
+		require WP_CLI_ROOT . '/vendor/autoload.php';
+		return;
+	}
+
+	$has_autoload = false;
+
+	foreach ( get_vendor_paths() as $vendor_path ) {
+		if ( file_exists( $vendor_path . '/autoload.php' ) ) {
+			require $vendor_path . '/autoload.php';
+			$has_autoload = true;
+			break;
+		}
+	}
+
+	if ( !$has_autoload ) {
+		fputs( STDERR, "Internal error: Can't find Composer autoloader.\nTry running: composer install\n" );
+		exit(3);
+	}
+}
+
+function get_vendor_paths() {
+	$vendor_paths = array(
+		WP_CLI_ROOT . '/../../../vendor',  // part of a larger project / installed via Composer (preferred)
+		WP_CLI_ROOT . '/vendor',           // top-level project / installed as Git clone
+	);
+	$maybe_composer_json = WP_CLI_ROOT . '/../../../composer.json';
+	if ( file_exists( $maybe_composer_json ) && is_readable( $maybe_composer_json ) ) {
+		$composer = json_decode( file_get_contents( $maybe_composer_json ) );
+		if ( ! empty( $composer->config ) && ! empty( $composer->config->{'vendor-dir'} ) ) {
+			array_unshift( $vendor_paths, WP_CLI_ROOT . '/../../../' . $composer->config->{'vendor-dir'} );
+		}
+	}
+	return $vendor_paths;
+}
+
+// Using require() directly inside a class grants access to private methods to the loaded code
+function load_file( $path ) {
+	require_once $path;
+}
+
+function load_command( $name ) {
+	$path = WP_CLI_ROOT . "/php/commands/$name.php";
+
+	if ( is_readable( $path ) ) {
+		include_once $path;
+	}
+}
+
+function load_all_commands() {
+	$cmd_dir = WP_CLI_ROOT . '/php/commands';
+
+	$iterator = new \DirectoryIterator( $cmd_dir );
+
+	foreach ( $iterator as $filename ) {
+		if ( '.php' != substr( $filename, -4 ) )
+			continue;
+
+		include_once "$cmd_dir/$filename";
+	}
+}
+
+/**
+ * Like array_map(), except it returns a new iterator, instead of a modified array.
+ *
+ * Example:
+ *
+ *     $arr = array('Football', 'Socker');
+ *
+ *     $it = iterator_map($arr, 'strtolower', function($val) {
+ *       return str_replace('foo', 'bar', $val);
+ *     });
+ *
+ *     foreach ( $it as $val ) {
+ *       var_dump($val);
+ *     }
+ *
+ * @param array|object Either a plain array or another iterator
+ * @param callback The function to apply to an element
+ * @return object An iterator that applies the given callback(s)
+ */
+function iterator_map( $it, $fn ) {
+	if ( is_array( $it ) ) {
+		$it = new \ArrayIterator( $it );
+	}
+
+	if ( !method_exists( $it, 'add_transform' ) ) {
+		$it = new Transform( $it );
+	}
+
+	foreach ( array_slice( func_get_args(), 1 ) as $fn ) {
+		$it->add_transform( $fn );
+	}
+
+	return $it;
+}
+
+/**
+ * Search for file by walking up the directory tree until the first file is found or until $stop_check($dir) returns true
+ * @param string|array The files (or file) to search for
+ * @param string|null The directory to start searching from; defaults to CWD
+ * @param callable Function which is passed the current dir each time a directory level is traversed
+ * @return null|string Null if the file was not found
+ */
+function find_file_upward( $files, $dir = null, $stop_check = null ) {
+	$files = (array) $files;
+	if ( is_null( $dir ) ) {
+		$dir = getcwd();
+	}
+	while ( @is_readable( $dir ) ) {
+		// Stop walking up when the supplied callable returns true being passed the $dir
+		if ( is_callable( $stop_check ) && call_user_func( $stop_check, $dir ) ) {
+			return null;
+		}
+
+		foreach ( $files as $file ) {
+			$path = $dir . DIRECTORY_SEPARATOR . $file;
+			if ( file_exists( $path ) ) {
+				return $path;
+			}
+		}
+
+		$parent_dir = dirname( $dir );
+		if ( empty($parent_dir) || $parent_dir === $dir ) {
+			break;
+		}
+		$dir = $parent_dir;
+	}
+	return null;
+}
+
+function is_path_absolute( $path ) {
+	// Windows
+	if ( isset($path[1]) && ':' === $path[1] )
+		return true;
+
+	return $path[0] === '/';
+}
+
+/**
+ * Composes positional arguments into a command string.
+ *
+ * @param array
+ * @return string
+ */
+function args_to_str( $args ) {
+	return ' ' . implode( ' ', array_map( 'escapeshellarg', $args ) );
+}
+
+/**
+ * Composes associative arguments into a command string.
+ *
+ * @param array
+ * @return string
+ */
+function assoc_args_to_str( $assoc_args ) {
+	$str = '';
+
+	foreach ( $assoc_args as $key => $value ) {
+		if ( true === $value )
+			$str .= " --$key";
+		else
+			$str .= " --$key=" . escapeshellarg( $value );
+	}
+
+	return $str;
+}
+
+/**
+ * Given a template string and an arbitrary number of arguments,
+ * returns the final command, with the parameters escaped.
+ */
+function esc_cmd( $cmd ) {
+	if ( func_num_args() < 2 )
+		trigger_error( 'esc_cmd() requires at least two arguments.', E_USER_WARNING );
+
+	$args = func_get_args();
+
+	$cmd = array_shift( $args );
+
+	return vsprintf( $cmd, array_map( 'escapeshellarg', $args ) );
+}
+
+function locate_wp_config() {
+	static $path;
+
+	if ( null === $path ) {
+		if ( file_exists( ABSPATH . 'wp-config.php' ) )
+			$path = ABSPATH . 'wp-config.php';
+		elseif ( file_exists( ABSPATH . '../wp-config.php' ) && ! file_exists( ABSPATH . '/../wp-settings.php' ) )
+			$path = ABSPATH . '../wp-config.php';
+		else
+			$path = false;
+
+		if ( $path )
+			$path = realpath( $path );
+	}
+
+	return $path;
+}
+
+function wp_version_compare( $since, $operator ) {
+	return version_compare( str_replace( array( '-src' ), '', $GLOBALS['wp_version'] ), $since, $operator );
+}
+
+/**
+ * Render a collection of items as an ASCII table, JSON, CSV, YAML, list of ids, or count.
+ *
+ * Given a collection of items with a consistent data structure:
+ *
+ * ```
+ * $items = array(
+ *     array(
+ *         'key'   => 'foo',
+ *         'value'  => 'bar',
+ *     )
+ * );
+ * ```
+ *
+ * Render `$items` as an ASCII table:
+ *
+ * ```
+ * WP_CLI\Utils\format_items( 'table', $items, array( 'key', 'value' ) );
+ *
+ * # +-----+-------+
+ * # | key | value |
+ * # +-----+-------+
+ * # | foo | bar   |
+ * # +-----+-------+
+ * ```
+ *
+ * Or render `$items` as YAML:
+ *
+ * ```
+ * WP_CLI\Utils\format_items( 'yaml', $items, array( 'key', 'value' ) );
+ *
+ * # ---
+ * # -
+ * #   key: foo
+ * #   value: bar
+ * ```
+ *
+ * @access public
+ * @category Output
+ *
+ * @param string        $format     Format to use: 'table', 'json', 'csv', 'yaml', 'ids', 'count'
+ * @param array         $items      An array of items to output.
+ * @param array|string  $fields     Named fields for each item of data. Can be array or comma-separated list.
+ * @return null
+ */
+function format_items( $format, $items, $fields ) {
+	$assoc_args = compact( 'format', 'fields' );
+	$formatter = new \WP_CLI\Formatter( $assoc_args );
+	$formatter->display_items( $items );
+}
+
+/**
+ * Write data as CSV to a given file.
+ *
+ * @access public
+ *
+ * @param resource $fd         File descriptor
+ * @param array    $rows       Array of rows to output
+ * @param array    $headers    List of CSV columns (optional)
+ */
+function write_csv( $fd, $rows, $headers = array() ) {
+	if ( ! empty( $headers ) ) {
+		fputcsv( $fd, $headers );
+	}
+
+	foreach ( $rows as $row ) {
+		if ( ! empty( $headers ) ) {
+			$row = pick_fields( $row, $headers );
+		}
+
+		fputcsv( $fd, array_values( $row ) );
+	}
+}
+
+/**
+ * Pick fields from an associative array or object.
+ *
+ * @param array|object Associative array or object to pick fields from
+ * @param array List of fields to pick
+ * @return array
+ */
+function pick_fields( $item, $fields ) {
+	$item = (object) $item;
+
+	$values = array();
+
+	foreach ( $fields as $field ) {
+		$values[ $field ] = isset( $item->$field ) ? $item->$field : null;
+	}
+
+	return $values;
+}
+
+/**
+ * Launch system's $EDITOR for the user to edit some text.
+ *
+ * @access public
+ * @category Input
+ *
+ * @param  string  $content  Some form of text to edit (e.g. post content)
+ * @return string|bool       Edited text, if file is saved from editor; false, if no change to file.
+ */
+function launch_editor_for_input( $input, $filename = 'WP-CLI' ) {
+
+	$tmpdir = get_temp_dir();
+
+	do {
+		$tmpfile = basename( $filename );
+		$tmpfile = preg_replace( '|\.[^.]*$|', '', $tmpfile );
+		$tmpfile .= '-' . substr( md5( rand() ), 0, 6 );
+		$tmpfile = $tmpdir . $tmpfile . '.tmp';
+		$fp = @fopen( $tmpfile, 'x' );
+		if ( ! $fp && is_writable( $tmpdir ) && file_exists( $tmpfile ) ) {
+			$tmpfile = '';
+			continue;
+		}
+		if ( $fp ) {
+			fclose( $fp );
+		}
+	} while( ! $tmpfile );
+
+	if ( ! $tmpfile ) {
+		\WP_CLI::error( 'Error creating temporary file.' );
+	}
+
+	$output = '';
+	file_put_contents( $tmpfile, $input );
+
+	$editor = getenv( 'EDITOR' );
+	if ( !$editor ) {
+		if ( isset( $_SERVER['OS'] ) && false !== strpos( $_SERVER['OS'], 'indows' ) )
+			$editor = 'notepad';
+		else
+			$editor = 'vi';
+	}
+
+	$descriptorspec = array( STDIN, STDOUT, STDERR );
+	$process = proc_open( "$editor " . escapeshellarg( $tmpfile ), $descriptorspec, $pipes );
+	$r = proc_close( $process );
+	if ( $r ) {
+		exit( $r );
+	}
+
+	$output = file_get_contents( $tmpfile );
+
+	unlink( $tmpfile );
+
+	if ( $output === $input )
+		return false;
+
+	return $output;
+}
+
+/**
+ * @param string MySQL host string, as defined in wp-config.php
+ * @return array
+ */
+function mysql_host_to_cli_args( $raw_host ) {
+	$assoc_args = array();
+
+	$host_parts = explode( ':',  $raw_host );
+	if ( count( $host_parts ) == 2 ) {
+		list( $assoc_args['host'], $extra ) = $host_parts;
+		$extra = trim( $extra );
+		if ( is_numeric( $extra ) ) {
+			$assoc_args['port'] = intval( $extra );
+			$assoc_args['protocol'] = 'tcp';
+		} else if ( $extra !== '' ) {
+			$assoc_args['socket'] = $extra;
+		}
+	} else {
+		$assoc_args['host'] = $raw_host;
+	}
+
+	return $assoc_args;
+}
+
+function run_mysql_command( $cmd, $assoc_args, $descriptors = null ) {
+	if ( !$descriptors )
+		$descriptors = array( STDIN, STDOUT, STDERR );
+
+	if ( isset( $assoc_args['host'] ) ) {
+		$assoc_args = array_merge( $assoc_args, mysql_host_to_cli_args( $assoc_args['host'] ) );
+	}
+
+	$pass = $assoc_args['pass'];
+	unset( $assoc_args['pass'] );
+
+	$old_pass = getenv( 'MYSQL_PWD' );
+	putenv( 'MYSQL_PWD=' . $pass );
+
+	$final_cmd = $cmd . assoc_args_to_str( $assoc_args );
+
+	$proc = proc_open( $final_cmd, $descriptors, $pipes );
+	if ( !$proc )
+		exit(1);
+
+	$r = proc_close( $proc );
+
+	putenv( 'MYSQL_PWD=' . $old_pass );
+
+	if ( $r ) exit( $r );
+}
+
+/**
+ * Render PHP or other types of files using Mustache templates.
+ *
+ * IMPORTANT: Automatic HTML escaping is disabled!
+ */
+function mustache_render( $template_name, $data = array() ) {
+	if ( ! file_exists( $template_name ) )
+		$template_name = WP_CLI_ROOT . "/templates/$template_name";
+
+	$template = file_get_contents( $template_name );
+
+	$m = new \Mustache_Engine( array(
+		'escape' => function ( $val ) { return $val; }
+	) );
+
+	return $m->render( $template, $data );
+}
+
+/**
+ * Create a progress bar to display percent completion of a given operation.
+ *
+ * Progress bar is written to STDOUT, and disabled when command is piped. Progress
+ * advances with `$progress->tick()`, and completes with `$progress->finish()`.
+ * Process bar also indicates elapsed time and expected total time.
+ *
+ * ```
+ * # `wp user generate` ticks progress bar each time a new user is created.
+ * #
+ * # $ wp user generate --count=500
+ * # Generating users  22 % [=======>                             ] 0:05 / 0:23
+ *
+ * $progress = \WP_CLI\Utils\make_progress_bar( 'Generating users', $count );
+ * for ( $i = 0; $i < $count; $i++ ) {
+ *     // uses wp_insert_user() to insert the user
+ *     $progress->tick();
+ * }
+ * $progress->finish();
+ * ```
+ *
+ * @access public
+ * @category Output
+ *
+ * @param string  $message  Text to display before the progress bar.
+ * @param integer $count    Total number of ticks to be performed.
+ * @return cli\progress\Bar|WP_CLI\NoOp
+ */
+function make_progress_bar( $message, $count ) {
+	if ( \cli\Shell::isPiped() )
+		return new \WP_CLI\NoOp;
+
+	return new \cli\progress\Bar( $message, $count );
+}
+
+function parse_url( $url ) {
+	$url_parts = \parse_url( $url );
+
+	if ( !isset( $url_parts['scheme'] ) ) {
+		$url_parts = parse_url( 'http://' . $url );
+	}
+
+	return $url_parts;
+}
+
+/**
+ * Check if we're running in a Windows environment (cmd.exe).
+ */
+function is_windows() {
+	return strtoupper(substr(PHP_OS, 0, 3)) === 'WIN';
+}
+
+/**
+ * Replace magic constants in some PHP source code.
+ *
+ * @param string $source The PHP code to manipulate.
+ * @param string $path The path to use instead of the magic constants
+ */
+function replace_path_consts( $source, $path ) {
+	$replacements = array(
+		'__FILE__' => "'$path'",
+		'__DIR__'  => "'" . dirname( $path ) . "'"
+	);
+
+	$old = array_keys( $replacements );
+	$new = array_values( $replacements );
+
+	return str_replace( $old, $new, $source );
+}
+
+/**
+ * Make a HTTP request to a remote URL.
+ *
+ * Wraps the Requests HTTP library to ensure every request includes a cert.
+ *
+ * ```
+ * # `wp core download` verifies the hash for a downloaded WordPress archive
+ *
+ * $md5_response = Utils\http_request( 'GET', $download_url . '.md5' );
+ * if ( 20 != substr( $md5_response->status_code, 0, 2 ) ) {
+ *      WP_CLI::error( "Couldn't access md5 hash for release (HTTP code {$response->status_code})" );
+ * }
+ * ```
+ *
+ * @access public
+ *
+ * @param string $method    HTTP method (GET, POST, DELETE, etc.)
+ * @param string $url       URL to make the HTTP request to.
+ * @param array $headers    Add specific headers to the request.
+ * @param array $options
+ * @return object
+ */
+function http_request( $method, $url, $data = null, $headers = array(), $options = array() ) {
+
+	$cert_path = '/rmccue/requests/library/Requests/Transport/cacert.pem';
+	if ( inside_phar() ) {
+		// cURL can't read Phar archives
+		$options['verify'] = extract_from_phar(
+		WP_CLI_ROOT . '/vendor' . $cert_path );
+	} else {
+		foreach( get_vendor_paths() as $vendor_path ) {
+			if ( file_exists( $vendor_path . $cert_path ) ) {
+				$options['verify'] = $vendor_path . $cert_path;
+				break;
+			}
+		}
+		if ( empty( $options['verify'] ) ){
+			WP_CLI::error_log( "Cannot find SSL certificate." );
+		}
+	}
+
+	try {
+		$request = \Requests::request( $url, $headers, $data, $method, $options );
+		return $request;
+	} catch( \Requests_Exception $ex ) {
+		// Handle SSL certificate issues gracefully
+		\WP_CLI::warning( $ex->getMessage() );
+		$options['verify'] = false;
+		try {
+			return \Requests::request( $url, $headers, $data, $method, $options );
+		} catch( \Requests_Exception $ex ) {
+			\WP_CLI::error( $ex->getMessage() );
+		}
+	}
+}
+
+/**
+ * Increments a version string using the "x.y.z-pre" format
+ *
+ * Can increment the major, minor or patch number by one
+ * If $new_version == "same" the version string is not changed
+ * If $new_version is not a known keyword, it will be used as the new version string directly
+ *
+ * @param  string $current_version
+ * @param  string $new_version
+ * @return string
+ */
+function increment_version( $current_version, $new_version ) {
+	// split version assuming the format is x.y.z-pre
+	$current_version    = explode( '-', $current_version, 2 );
+	$current_version[0] = explode( '.', $current_version[0] );
+
+	switch ( $new_version ) {
+		case 'same':
+			// do nothing
+		break;
+
+		case 'patch':
+			$current_version[0][2]++;
+
+			$current_version = array( $current_version[0] ); // drop possible pre-release info
+		break;
+
+		case 'minor':
+			$current_version[0][1]++;
+			$current_version[0][2] = 0;
+
+			$current_version = array( $current_version[0] ); // drop possible pre-release info
+		break;
+
+		case 'major':
+			$current_version[0][0]++;
+			$current_version[0][1] = 0;
+			$current_version[0][2] = 0;
+
+			$current_version = array( $current_version[0] ); // drop possible pre-release info
+		break;
+
+		default: // not a keyword
+			$current_version = array( array( $new_version ) );
+		break;
+	}
+
+	// reconstruct version string
+	$current_version[0] = implode( '.', $current_version[0] );
+	$current_version    = implode( '-', $current_version );
+
+	return $current_version;
+}
+
+/**
+ * Compare two version strings to get the named semantic version.
+ *
+ * @access public
+ *
+ * @param string $new_version
+ * @param string $original_version
+ * @return string $name 'major', 'minor', 'patch'
+ */
+function get_named_sem_ver( $new_version, $original_version ) {
+
+	if ( ! Comparator::greaterThan( $new_version, $original_version ) ) {
+		return '';
+	}
+
+	$parts = explode( '-', $original_version );
+	list( $major, $minor, $patch ) = explode( '.', $parts[0] );
+
+	if ( Semver::satisfies( $new_version, "{$major}.{$minor}.x" ) ) {
+		return 'patch';
+	} else if ( Semver::satisfies( $new_version, "{$major}.x.x" ) ) {
+		return 'minor';
+	} else {
+		return 'major';
+	}
+}
+
+/**
+ * Return the flag value or, if it's not set, the $default value.
+ *
+ * Because flags can be negated (e.g. --no-quiet to negate --quiet), this
+ * function provides a safer alternative to using
+ * `isset( $assoc_args['quiet'] )` or similar.
+ *
+ * @access public
+ * @category Input
+ *
+ * @param array  $assoc_args  Arguments array.
+ * @param string $flag        Flag to get the value.
+ * @param mixed  $default     Default value for the flag. Default: NULL
+ * @return mixed
+ */
+function get_flag_value( $assoc_args, $flag, $default = null ) {
+	return isset( $assoc_args[ $flag ] ) ? $assoc_args[ $flag ] : $default;
+}
+
+/**
+ * Get the system's temp directory. Warns user if it isn't writable.
+ *
+ * @access public
+ * @category System
+ *
+ * @return string
+ */
+function get_temp_dir() {
+	static $temp = '';
+
+	$trailingslashit = function( $path ) {
+		return rtrim( $path ) . '/';
+	};
+
+	if ( $temp )
+		return $trailingslashit( $temp );
+
+	if ( function_exists( 'sys_get_temp_dir' ) ) {
+		$temp = sys_get_temp_dir();
+	} else if ( ini_get( 'upload_tmp_dir' ) ) {
+		$temp = ini_get( 'upload_tmp_dir' );
+	} else {
+		$temp = '/tmp/';
+	}
+
+	if ( ! @is_writable( $temp ) ) {
+		WP_CLI::warning( "Temp directory isn't writable: {$temp}" );
+	}
+
+	return $trailingslashit( $temp );
+}
+
+/**
+ * Parse a SSH url for its host, port, and path.
+ *
+ * Similar to parse_url(), but adds support for defined SSH aliases.
+ *
+ * ```
+ * host OR host/path/to/wordpress OR host:port/path/to/wordpress
+ * ```
+ *
+ * @access public
+ *
+ * @return mixed
+ */
+function parse_ssh_url( $url, $component = -1 ) {
+	preg_match( '#^([^:/~]+)(:([\d]+))?((/|~)(.+))?$#', $url, $matches );
+	$bits = array();
+	foreach( array(
+		1 => 'host',
+		3 => 'port',
+		4 => 'path',
+	) as $i => $key ) {
+		if ( ! empty( $matches[ $i ] ) ) {
+			$bits[ $key ] = $matches[ $i ];
+		}
+	}
+	switch ( $component ) {
+		case PHP_URL_HOST:
+			return isset( $bits['host'] ) ? $bits['host'] : null;
+		case PHP_URL_PATH:
+			return isset( $bits['path'] ) ? $bits['path'] : null;
+		case PHP_URL_PORT:
+			return isset( $bits['port'] ) ? $bits['port'] : null;
+		default:
+			return $bits;
+	}
+}
diff --git a/tests/cli/features/customer.feature b/tests/cli/features/customer.feature
new file mode 100644
index 00000000000..ff9cbe63de7
--- /dev/null
+++ b/tests/cli/features/customer.feature
@@ -0,0 +1,63 @@
+Feature: Manage WooCommerce customers
+
+Background:
+
+	Given a WP install
+
+Scenario: Help for all available commands
+
+	When I run `wp wc customer --help`
+	Then STDOUT should contain:
+		"""
+		wp wc customer <command>
+		"""
+	And STDOUT should contain:
+		"""
+		create
+		"""
+	And STDOUT should contain:
+		"""
+		delete
+		"""
+	And STDOUT should contain:
+		"""
+		get
+		"""
+	And STDOUT should contain:
+		"""
+		list
+		"""
+	And STDOUT should contain:
+		"""
+		update
+		"""
+
+Scenario: Get the value of an individual post field
+
+ 	When I run `wp wc customer get 1 --field=username --user=1`
+	Then STDOUT should contain:
+		"""
+		admin
+		"""
+
+Scenario: CRUD a post
+
+	When I run `wp wc customer create --user=admin --username="testuser" --password="hunter2" --email="woo@woo.local"  --porcelain`
+	Then STDOUT should be a number
+	And save STDOUT as {CUSTOMER_ID}
+
+	When I run `wp wc customer update {CUSTOMER_ID} --user=admin --first_name="Test" --billing='{"city":"Portland","state":"OR"}' --porcelain`
+	Then STDOUT should be a number
+
+	When I run `wp wc customer get {CUSTOMER_ID} --user=admin`
+	Then STDOUT should contain:
+		"""
+		Portland
+		"""
+	And STDOUT should contain:
+		"""
+		woo@woo.local
+		"""
+
+	When I run `wp wc customer delete {CUSTOMER_ID} --force=true --user=admin --porcelain`
+	Then STDOUT should be a number
diff --git a/tests/cli/features/customer_download.feature b/tests/cli/features/customer_download.feature
new file mode 100644
index 00000000000..16ba8fdfc2e
--- /dev/null
+++ b/tests/cli/features/customer_download.feature
@@ -0,0 +1,25 @@
+Feature: List WooCommerce customer downloads
+
+Background:
+
+	Given a WP install
+
+Scenario: Help for all available commands
+
+	When I run `wp wc customer_download --help`
+	Then STDOUT should contain:
+		"""
+		wp wc customer_download <command>
+		"""
+	And STDOUT should contain:
+		"""
+		list
+		"""
+
+Scenario: List a specific customer's downloads
+
+	When I run `wp wc customer_download list 1 --user=1`
+	Then STDOUT should contain:
+		"""
+		download_url
+		"""
diff --git a/tests/cli/features/extra/no-mail.php b/tests/cli/features/extra/no-mail.php
new file mode 100644
index 00000000000..ba222ad595b
--- /dev/null
+++ b/tests/cli/features/extra/no-mail.php
@@ -0,0 +1,6 @@
+<?php
+
+function wp_mail() {
+	// do nothing
+}
+
diff --git a/tests/cli/features/payment_gateway.feature b/tests/cli/features/payment_gateway.feature
new file mode 100644
index 00000000000..8078dadd92d
--- /dev/null
+++ b/tests/cli/features/payment_gateway.feature
@@ -0,0 +1,71 @@
+Feature: Manage WooCommerce Payment Gateways
+
+Background:
+
+	Given a WP install
+
+Scenario: Help for all available commands
+
+	When I run `wp wc payment_gateway --help`
+	Then STDOUT should contain:
+		"""
+		wp wc payment_gateway <command>
+		"""
+	And STDOUT should contain:
+		"""
+		get
+		"""
+	And STDOUT should contain:
+		"""
+		list
+		"""
+	And STDOUT should contain:
+		"""
+		update
+		"""
+
+Scenario: List Payment Gateways
+
+	When I run `wp wc payment_gateway list --user=admin`
+	Then STDOUT should contain:
+		"""
+		cod
+		"""
+	And STDOUT should contain:
+		"""
+		BACS
+		"""
+	And STDOUT should contain:
+		"""
+		id
+		"""
+	And STDOUT should contain:
+		"""
+		method_title
+		"""
+
+Scenario: Read & Update Payment Gateways
+
+	When I run `wp wc payment_gateway update bacs --user=admin --title="Updated Direct Bank Transfer" --settings='{"instructions":"These are test instructions"}' --porcelain`
+	Then STDOUT should contain:
+		"""
+		bacs
+		"""
+
+	When I run `wp wc payment_gateway get bacs --user=admin`
+	Then STDOUT should contain:
+		"""
+		BACS
+		"""
+	And STDOUT should contain:
+		"""
+		Updated Direct Bank Transfer
+		"""
+	And STDOUT should contain:
+		"""
+		Updated Direct Bank Transfer
+		"""
+	And STDOUT should contain:
+		"""
+		These are test instructions
+		"""
diff --git a/tests/cli/features/product.feature b/tests/cli/features/product.feature
new file mode 100644
index 00000000000..9327a8641e9
--- /dev/null
+++ b/tests/cli/features/product.feature
@@ -0,0 +1,89 @@
+Feature: Manage WooCommerce Products
+
+Background:
+
+	Given a WP install
+
+Scenario: Help for all available commands
+
+	When I run `wp wc product --help`
+	Then STDOUT should contain:
+		"""
+		wp wc product <command>
+		"""
+	And STDOUT should contain:
+		"""
+		create
+		"""
+	And STDOUT should contain:
+		"""
+		delete
+		"""
+	And STDOUT should contain:
+		"""
+		get
+		"""
+	And STDOUT should contain:
+		"""
+		list
+		"""
+	And STDOUT should contain:
+		"""
+		update
+		"""
+
+Scenario: CRUD a product
+
+	When I run `wp wc product create --user=admin --name='Test Simple Product' --type='simple' --regular_price='10.00' --sale_price='7.99' --porcelain`
+	Then save STDOUT as {PRODUCT_ID}
+
+	When I run `wp wc product update {PRODUCT_ID} --user=admin --description="Test product description" --sku='TEST SKU' --attributes='[{ "id": 0, "name": "Color", "position": 0, "visible": true, "variation": false, "options": ["Red", "Blue", "Green", "Yellow"]}]' --porcelain`
+	Then STDOUT should be a number
+
+	When I run `wp wc product get {PRODUCT_ID} --user=admin`
+	Then STDOUT should contain:
+		"""
+		10.00
+		"""
+	And STDOUT should contain:
+		"""
+		7.99
+		"""
+	And STDOUT should contain:
+		"""
+		TEST SKU
+		"""
+	And STDOUT should contain:
+		"""
+		Test product description
+		"""
+	And STDOUT should contain:
+		"""
+		Color
+		"""
+	And STDOUT should contain:
+		"""
+		Yellow
+		"""
+
+	When I run `wp wc product get {PRODUCT_ID} --user=admin --field=price`
+	Then STDOUT should contain:
+		"""
+		7.99
+		"""
+
+	When I run `wp wc product list --user=admin`
+	Then STDOUT should contain:
+		"""
+		date_created
+		"""
+	And STDOUT should contain:
+		"""
+		Test Simple Product
+		"""
+
+	When I run `wp wc product delete {PRODUCT_ID} --force=true --user=admin`
+ 	Then STDOUT should contain:
+		"""
+		Success
+		"""
diff --git a/tests/cli/features/product_review.feature b/tests/cli/features/product_review.feature
new file mode 100644
index 00000000000..48f7976742c
--- /dev/null
+++ b/tests/cli/features/product_review.feature
@@ -0,0 +1,75 @@
+Feature: Manage WooCommerce Product Reviews
+
+Background:
+
+	Given a WP install
+
+Scenario: Help for all available commands
+
+	When I run `wp wc product_review --help`
+	Then STDOUT should contain:
+		"""
+		wp wc product_review <command>
+		"""
+	And STDOUT should contain:
+		"""
+		create
+		"""
+	And STDOUT should contain:
+		"""
+		delete
+		"""
+	And STDOUT should contain:
+		"""
+		get
+		"""
+	And STDOUT should contain:
+		"""
+		list
+		"""
+	And STDOUT should contain:
+		"""
+		update
+		"""
+
+Scenario: CRUD a product review
+
+	When I run `wp wc product create --user=admin --name='Test Simple Product'  --porcelain`
+	Then save STDOUT as {PRODUCT_ID}
+
+	When I run `wp wc product_review create {PRODUCT_ID} --user=admin --review='Testing' --name='Mr. Test' --email='woo@woo.local' --porcelain`
+	Then STDOUT should be a number
+	And save STDOUT as {PRODUCT_REVIEW_ID}
+
+	When I run `wp wc product_review update {PRODUCT_ID} {PRODUCT_REVIEW_ID} --user=admin --review="Updated" --porcelain`
+	Then STDOUT should be a number
+
+	When I run `wp wc product_review get {PRODUCT_ID} {PRODUCT_REVIEW_ID} --user=admin`
+	Then STDOUT should contain:
+		"""
+		Updated
+		"""
+	And STDOUT should contain:
+		"""
+		woo@woo.local
+		"""
+	And STDOUT should contain:
+		"""
+		Mr. Test
+		"""
+
+	When I run `wp wc product_review list {PRODUCT_ID} --user=admin`
+	Then STDOUT should contain:
+		"""
+		date_created
+		"""
+	And STDOUT should contain:
+		"""
+		Updated
+		"""
+
+	When I run `wp wc product_review delete {PRODUCT_ID} {PRODUCT_REVIEW_ID} --force=true --user=admin`
+ 	Then STDOUT should contain:
+		"""
+		Success
+		"""
diff --git a/tests/cli/features/shop_coupon.feature b/tests/cli/features/shop_coupon.feature
new file mode 100644
index 00000000000..94a25c0e724
--- /dev/null
+++ b/tests/cli/features/shop_coupon.feature
@@ -0,0 +1,81 @@
+Feature: Manage WooCommerce Coupons
+
+Background:
+
+	Given a WP install
+
+Scenario: Help for all available commands
+
+	When I run `wp wc shop_coupon --help`
+	Then STDOUT should contain:
+		"""
+		wp wc shop_coupon <command>
+		"""
+	And STDOUT should contain:
+		"""
+		create
+		"""
+	And STDOUT should contain:
+		"""
+		delete
+		"""
+	And STDOUT should contain:
+		"""
+		get
+		"""
+	And STDOUT should contain:
+		"""
+		list
+		"""
+	And STDOUT should contain:
+		"""
+		update
+		"""
+
+Scenario: CRUD a coupon
+
+	When I run `wp wc shop_coupon create --user=admin --code='coupon code' --discount_type='fixed_product' --amount='5.00'  --porcelain`
+	Then save STDOUT as {COUPON_ID}
+
+	When I run `wp wc shop_coupon update {COUPON_ID} --user=admin --discount_type="percent" --amount='2' --porcelain`
+	Then STDOUT should be a number
+
+	When I run `wp wc shop_coupon get {COUPON_ID} --user=admin`
+	Then STDOUT should contain:
+		"""
+		coupon code
+		"""
+	And STDOUT should contain:
+		"""
+		percent
+		"""
+
+	When I run `wp wc shop_coupon get {COUPON_ID} --user=admin --field=amount`
+	Then STDOUT should contain:
+		"""
+		2.00
+		"""
+
+	When I run `wp wc shop_coupon list --user=admin`
+	Then STDOUT should contain:
+		"""
+		id
+		"""
+	And STDOUT should contain:
+		"""
+		code
+		"""
+	And STDOUT should contain:
+		"""
+		date_created
+		"""
+	And STDOUT should contain:
+		"""
+		coupon code
+		"""
+
+	When I run `wp wc shop_coupon delete {COUPON_ID} --force=true --user=admin`
+ 	Then STDOUT should contain:
+		"""
+		Success
+		"""
diff --git a/tests/cli/features/steps/given.php b/tests/cli/features/steps/given.php
new file mode 100644
index 00000000000..017d1a5d82a
--- /dev/null
+++ b/tests/cli/features/steps/given.php
@@ -0,0 +1,157 @@
+<?php
+
+use Behat\Gherkin\Node\PyStringNode,
+    Behat\Gherkin\Node\TableNode,
+    WP_CLI\Process;
+
+$steps->Given( '/^an empty directory$/',
+	function ( $world ) {
+		$world->create_run_dir();
+	}
+);
+
+$steps->Given( '/^an empty cache/',
+	function ( $world ) {
+		$world->variables['SUITE_CACHE_DIR'] = FeatureContext::create_cache_dir();
+	}
+);
+
+$steps->Given( '/^an? ([^\s]+) file:$/',
+	function ( $world, $path, PyStringNode $content ) {
+		$content = (string) $content . "\n";
+		$full_path = $world->variables['RUN_DIR'] . "/$path";
+		Process::create( \WP_CLI\utils\esc_cmd( 'mkdir -p %s', dirname( $full_path ) ) )->run_check();
+		file_put_contents( $full_path, $content );
+	}
+);
+
+$steps->Given( '/^WP files$/',
+	function ( $world ) {
+		$world->download_wp();
+	}
+);
+
+$steps->Given( '/^wp-config\.php$/',
+	function ( $world ) {
+		$world->create_config();
+	}
+);
+
+$steps->Given( '/^a database$/',
+	function ( $world ) {
+		$world->create_db();
+	}
+);
+
+$steps->Given( '/^a WP install$/',
+	function ( $world ) {
+		$world->install_wp();
+	}
+);
+
+$steps->Given( "/^a WP install in '([^\s]+)'$/",
+	function ( $world, $subdir ) {
+		$world->install_wp( $subdir );
+	}
+);
+
+$steps->Given( '/^a WP multisite (subdirectory|subdomain)?\s?install$/',
+	function ( $world, $type = 'subdirectory' ) {
+		$world->install_wp();
+		$subdomains = ! empty( $type ) && 'subdomain' === $type ? 1 : 0;
+		$world->proc( 'wp core install-network', array( 'title' => 'WP CLI Network', 'subdomains' => $subdomains ) )->run_check();
+	}
+);
+
+$steps->Given( '/^these installed and active plugins:$/',
+	function( $world, $stream ) {
+		$plugins = implode( ' ', array_map( 'trim', explode( PHP_EOL, (string)$stream ) ) );
+		$world->proc( "wp plugin install $plugins --activate" )->run_check();
+	}
+);
+
+$steps->Given( '/^a custom wp-content directory$/',
+	function ( $world ) {
+		$wp_config_path = $world->variables['RUN_DIR'] . "/wp-config.php";
+
+		$wp_config_code = file_get_contents( $wp_config_path );
+
+		$world->move_files( 'wp-content', 'my-content' );
+		$world->add_line_to_wp_config( $wp_config_code,
+			"define( 'WP_CONTENT_DIR', dirname(__FILE__) . '/my-content' );" );
+
+		$world->move_files( 'my-content/plugins', 'my-plugins' );
+		$world->add_line_to_wp_config( $wp_config_code,
+			"define( 'WP_PLUGIN_DIR', __DIR__ . '/my-plugins' );" );
+
+		file_put_contents( $wp_config_path, $wp_config_code );
+	}
+);
+
+$steps->Given( '/^download:$/',
+	function ( $world, TableNode $table ) {
+		foreach ( $table->getHash() as $row ) {
+			$path = $world->replace_variables( $row['path'] );
+			if ( file_exists( $path ) ) {
+				// assume it's the same file and skip re-download
+				continue;
+			}
+
+			Process::create( \WP_CLI\Utils\esc_cmd( 'curl -sSL %s > %s', $row['url'], $path ) )->run_check();
+		}
+	}
+);
+
+$steps->Given( '/^save (STDOUT|STDERR) ([\'].+[^\'])?as \{(\w+)\}$/',
+	function ( $world, $stream, $output_filter, $key ) {
+
+		$stream = strtolower( $stream );
+
+		if ( $output_filter ) {
+			$output_filter = '/' . trim( str_replace( '%s', '(.+[^\b])', $output_filter ), "' " ) . '/';
+			if ( false !== preg_match( $output_filter, $world->result->$stream, $matches ) )
+				$output = array_pop( $matches );
+			else
+				$output = '';
+		} else {
+			$output = $world->result->$stream;
+		}
+		$world->variables[ $key ] = trim( $output, "\n" );
+	}
+);
+
+$steps->Given( '/^a new Phar(?: with version "([^"]+)")$/',
+	function ( $world, $version ) {
+		$world->build_phar( $version );
+	}
+);
+
+$steps->Given( '/^save the (.+) file ([\'].+[^\'])?as \{(\w+)\}$/',
+	function ( $world, $filepath, $output_filter, $key ) {
+		$full_file = file_get_contents( $world->replace_variables( $filepath ) );
+
+		if ( $output_filter ) {
+			$output_filter = '/' . trim( str_replace( '%s', '(.+[^\b])', $output_filter ), "' " ) . '/';
+			if ( false !== preg_match( $output_filter, $full_file, $matches ) )
+				$output = array_pop( $matches );
+			else
+				$output = '';
+		} else {
+			$output = $full_file;
+		}
+		$world->variables[ $key ] = trim( $output, "\n" );
+	}
+);
+
+$steps->Given('/^a misconfigured WP_CONTENT_DIR constant directory$/',
+	function($world) {
+		$wp_config_path = $world->variables['RUN_DIR'] . "/wp-config.php";
+
+		$wp_config_code = file_get_contents( $wp_config_path );
+
+		$world->add_line_to_wp_config( $wp_config_code,
+			"define( 'WP_CONTENT_DIR', '' );" );
+
+		file_put_contents( $wp_config_path, $wp_config_code );
+	}
+);
\ No newline at end of file
diff --git a/tests/cli/features/steps/then.php b/tests/cli/features/steps/then.php
new file mode 100644
index 00000000000..f2889f5bf97
--- /dev/null
+++ b/tests/cli/features/steps/then.php
@@ -0,0 +1,192 @@
+<?php
+
+use Behat\Gherkin\Node\PyStringNode,
+    Behat\Gherkin\Node\TableNode;
+
+$steps->Then( '/^the return code should be (\d+)$/',
+	function ( $world, $return_code ) {
+		if ( $return_code != $world->result->return_code ) {
+			throw new RuntimeException( $world->result );
+		}
+	}
+);
+
+$steps->Then( '/^(STDOUT|STDERR) should (be|contain|not contain):$/',
+	function ( $world, $stream, $action, PyStringNode $expected ) {
+
+		$stream = strtolower( $stream );
+
+		$expected = $world->replace_variables( (string) $expected );
+
+		checkString( $world->result->$stream, $expected, $action, $world->result );
+	}
+);
+
+$steps->Then( '/^(STDOUT|STDERR) should be a number$/',
+	function ( $world, $stream ) {
+
+		$stream = strtolower( $stream );
+
+		assertNumeric( trim( $world->result->$stream, "\n" ) );
+	}
+);
+
+$steps->Then( '/^(STDOUT|STDERR) should not be a number$/',
+	function ( $world, $stream ) {
+
+		$stream = strtolower( $stream );
+
+		assertNotNumeric( trim( $world->result->$stream, "\n" ) );
+	}
+);
+
+$steps->Then( '/^STDOUT should be a table containing rows:$/',
+	function ( $world, TableNode $expected ) {
+		$output      = $world->result->stdout;
+		$actual_rows = explode( "\n", rtrim( $output, "\n" ) );
+
+		$expected_rows = array();
+		foreach ( $expected->getRows() as $row ) {
+			$expected_rows[] = $world->replace_variables( implode( "\t", $row ) );
+		}
+
+		compareTables( $expected_rows, $actual_rows, $output );
+	}
+);
+
+$steps->Then( '/^STDOUT should end with a table containing rows:$/',
+	function ( $world, TableNode $expected ) {
+		$output      = $world->result->stdout;
+		$actual_rows = explode( "\n", rtrim( $output, "\n" ) );
+
+		$expected_rows = array();
+		foreach ( $expected->getRows() as $row ) {
+			$expected_rows[] = $world->replace_variables( implode( "\t", $row ) );
+		}
+
+		$start = array_search( $expected_rows[0], $actual_rows );
+
+		if ( false === $start )
+			throw new \Exception( $world->result );
+
+		compareTables( $expected_rows, array_slice( $actual_rows, $start ), $output );
+	}
+);
+
+$steps->Then( '/^STDOUT should be JSON containing:$/',
+	function ( $world, PyStringNode $expected ) {
+		$output = $world->result->stdout;
+		$expected = $world->replace_variables( (string) $expected );
+
+		if ( !checkThatJsonStringContainsJsonString( $output, $expected ) ) {
+			throw new \Exception( $world->result );
+		}
+});
+
+$steps->Then( '/^STDOUT should be a JSON array containing:$/',
+	function ( $world, PyStringNode $expected ) {
+		$output = $world->result->stdout;
+		$expected = $world->replace_variables( (string) $expected );
+
+		$actualValues = json_decode( $output );
+		$expectedValues = json_decode( $expected );
+
+		$missing = array_diff( $expectedValues, $actualValues );
+		if ( !empty( $missing ) ) {
+			throw new \Exception( $world->result );
+		}
+});
+
+$steps->Then( '/^STDOUT should be CSV containing:$/',
+	function ( $world, TableNode $expected ) {
+		$output = $world->result->stdout;
+
+		$expected_rows = $expected->getRows();
+		foreach ( $expected as &$row ) {
+			foreach ( $row as &$value ) {
+				$value = $world->replace_variables( $value );
+			}
+		}
+
+		if ( ! checkThatCsvStringContainsValues( $output, $expected_rows ) )
+			throw new \Exception( $world->result );
+	}
+);
+
+$steps->Then( '/^STDOUT should be YAML containing:$/',
+	function ( $world, PyStringNode $expected ) {
+		$output = $world->result->stdout;
+		$expected = $world->replace_variables( (string) $expected );
+
+		if ( !checkThatYamlStringContainsYamlString( $output, $expected ) ) {
+			throw new \Exception( $world->result );
+		}
+});
+
+$steps->Then( '/^(STDOUT|STDERR) should be empty$/',
+	function ( $world, $stream ) {
+
+		$stream = strtolower( $stream );
+
+		if ( !empty( $world->result->$stream ) ) {
+			throw new \Exception( $world->result );
+		}
+	}
+);
+
+$steps->Then( '/^(STDOUT|STDERR) should not be empty$/',
+	function ( $world, $stream ) {
+
+		$stream = strtolower( $stream );
+
+		if ( '' === rtrim( $world->result->$stream, "\n" ) ) {
+			throw new Exception( $world->result );
+		}
+	}
+);
+
+$steps->Then( '/^the (.+) (file|directory) should (exist|not exist|be:|contain:|not contain:)$/',
+	function ( $world, $path, $type, $action, $expected = null ) {
+		$path = $world->replace_variables( $path );
+
+		// If it's a relative path, make it relative to the current test dir
+		if ( '/' !== $path[0] )
+			$path = $world->variables['RUN_DIR'] . "/$path";
+
+		if ( 'file' == $type ) {
+			$test = 'file_exists';
+		} else if ( 'directory' == $type ) {
+			$test = 'is_dir';
+		}
+
+		switch ( $action ) {
+		case 'exist':
+			if ( ! $test( $path ) ) {
+				throw new Exception( $world->result );
+			}
+			break;
+		case 'not exist':
+			if ( $test( $path ) ) {
+				throw new Exception( $world->result );
+			}
+			break;
+		default:
+			if ( ! $test( $path ) ) {
+				throw new Exception( "$path doesn't exist." );
+			}
+			$action = substr( $action, 0, -1 );
+			$expected = $world->replace_variables( (string) $expected );
+			if ( 'file' == $type ) {
+				$contents = file_get_contents( $path );
+			} else if ( 'directory' == $type ) {
+				$files = glob( rtrim( $path, '/' ) . '/*' );
+				foreach( $files as &$file ) {
+					$file = str_replace( $path . '/', '', $file );
+				}
+				$contents = implode( PHP_EOL, $files );
+			}
+			checkString( $contents, $expected, $action );
+		}
+	}
+);
+
diff --git a/tests/cli/features/steps/when.php b/tests/cli/features/steps/when.php
new file mode 100644
index 00000000000..b0832493ed0
--- /dev/null
+++ b/tests/cli/features/steps/when.php
@@ -0,0 +1,46 @@
+<?php
+
+use Behat\Gherkin\Node\PyStringNode,
+    Behat\Gherkin\Node\TableNode,
+    WP_CLI\Process;
+
+function invoke_proc( $proc, $mode ) {
+	$map = array(
+		'run' => 'run_check',
+		'try' => 'run'
+	);
+	$method = $map[ $mode ];
+
+	return $proc->$method();
+}
+
+$steps->When( '/^I launch in the background `([^`]+)`$/',
+	function ( $world, $cmd ) {
+		$world->background_proc( $cmd );
+	}
+);
+
+$steps->When( '/^I (run|try) `([^`]+)`$/',
+	function ( $world, $mode, $cmd ) {
+		$cmd = $world->replace_variables( $cmd );
+		$world->result = invoke_proc( $world->proc( $cmd ), $mode );
+	}
+);
+
+$steps->When( "/^I (run|try) `([^`]+)` from '([^\s]+)'$/",
+	function ( $world, $mode, $cmd, $subdir ) {
+		$cmd = $world->replace_variables( $cmd );
+		$world->result = invoke_proc( $world->proc( $cmd, array(), $subdir ), $mode );
+	}
+);
+
+$steps->When( '/^I (run|try) the previous command again$/',
+	function ( $world, $mode ) {
+		if ( !isset( $world->result ) )
+			throw new \Exception( 'No previous command.' );
+
+		$proc = Process::create( $world->result->command, $world->result->cwd, $world->result->env );
+		$world->result = invoke_proc( $proc, $mode );
+	}
+);
+
diff --git a/tests/cli/features/tool.feature b/tests/cli/features/tool.feature
new file mode 100644
index 00000000000..c295aa7930b
--- /dev/null
+++ b/tests/cli/features/tool.feature
@@ -0,0 +1,60 @@
+Feature: Running system status tools
+
+Background:
+
+	Given a WP install
+
+Scenario: Help for all available commands
+
+	When I run `wp wc tool --help`
+	Then STDOUT should contain:
+		"""
+		wp wc tool <command>
+		"""
+	And STDOUT should contain:
+		"""
+		list
+		"""
+	And STDOUT should contain:
+		"""
+		run
+		"""
+
+	When I run `wp wc tool list --help`
+	Then STDOUT should contain:
+		"""
+		wp wc tool list [--fields=<fields>] [--field=<field>]
+		"""
+
+	When I run `wp wc tool run --help`
+	Then STDOUT should contain:
+		"""
+		wp wc tool run <id>
+		"""
+
+Scenario: List all available tools
+
+	When I run `wp wc tool list --user=1`
+	Then STDOUT should be a table containing rows:
+	| id                | name          | action           | description                                             |
+	| clear_transients  | WC transients | Clear transients | This tool will clear the product/shop transients cache. |
+
+	When I run `wp wc tool list --format=ids --user=1`
+	Then STDOUT should contain:
+		"""
+		install_pages delete_taxes reset_tracking
+		"""
+
+	When I run `wp wc tool list --format=body --user=1`
+	Then STDOUT should be JSON containing:
+		"""
+		[{"id":"clear_transients"}]
+		"""
+
+Scenario: Run a specific tool
+
+	When I run `wp wc tool run clear_transients --user=1`
+	Then STDOUT should contain:
+		"""
+		Success: Updated system_status_tool clear_transients.
+		"""
diff --git a/tests/cli/utils/behat-tags.php b/tests/cli/utils/behat-tags.php
new file mode 100644
index 00000000000..14e52e3e811
--- /dev/null
+++ b/tests/cli/utils/behat-tags.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Generate a list of tags to skip during the test run.
+ *
+ * Require a minimum version of WordPress:
+ *
+ *   @require-wp-4.0
+ *   Scenario: Core translation CRUD
+ *
+ * Then use in bash script:
+ *
+ *   BEHAT_TAGS=$(php behat-tags.php)
+ *   vendor/bin/behat --format progress $BEHAT_TAGS
+ */
+
+function version_tags( $prefix, $current, $operator = '<' ) {
+	if ( ! $current )
+		return;
+
+	exec( "grep '@{$prefix}-[0-9\.]*' -h -o features/*.feature | uniq", $existing_tags );
+
+	$skip_tags = array();
+
+	foreach ( $existing_tags as $tag ) {
+		$compare = str_replace( "@{$prefix}-", '', $tag );
+		if ( version_compare( $current, $compare, $operator ) ) {
+			$skip_tags[] = $tag;
+		}
+	}
+
+	return $skip_tags;
+}
+
+$skip_tags = array_merge(
+	version_tags( 'require-wp', getenv( 'WP_VERSION' ), '<' ),
+	version_tags( 'require-php', PHP_VERSION, '<' ),
+	version_tags( 'less-than-php', PHP_VERSION, '>' )
+);
+
+# Skip Github API tests by default because of rate limiting. See https://github.com/wp-cli/wp-cli/issues/1612
+$skip_tags[] = '@github-api';
+
+if ( !empty( $skip_tags ) ) {
+	echo '--tags=~' . implode( '&&~', $skip_tags );
+}
+
diff --git a/tests/e2e-tests/cart-page.js b/tests/e2e-tests/cart-page.js
new file mode 100644
index 00000000000..e3f5718ebec
--- /dev/null
+++ b/tests/e2e-tests/cart-page.js
@@ -0,0 +1,110 @@
+import config from 'config';
+import chai from 'chai';
+import chaiAsPromised from 'chai-as-promised';
+import test from 'selenium-webdriver/testing';
+import { WebDriverManager, WebDriverHelper as helper } from 'wp-e2e-webdriver';
+import { ShopPage, CartPage } from 'wc-e2e-page-objects';
+
+chai.use( chaiAsPromised );
+const assert = chai.assert;
+
+let manager;
+let driver;
+
+test.describe( 'Cart page', function() {
+	test.before( 'open browser', function() {
+		this.timeout( config.get( 'startBrowserTimeoutMs' ) );
+
+		manager = new WebDriverManager( 'chrome', { baseUrl: config.get( 'url' ) } );
+		driver = manager.getDriver();
+
+		helper.clearCookiesAndDeleteLocalStorage( driver );
+	} );
+
+	this.timeout( config.get( 'mochaTimeoutMs' ) );
+
+	test.it( 'should displays no item in the cart', () => {
+		const cartPage = new CartPage( driver, { url: manager.getPageUrl( '/cart' ) } );
+		assert.eventually.equal( cartPage.hasNoItem(), true );
+	} );
+
+	test.it( 'should adds the product to the cart when "Add to cart" is clicked', () => {
+		const shopPage = new ShopPage( driver, { url: manager.getPageUrl( '/shop' ) } );
+		assert.eventually.equal( shopPage.addProductToCart( 'Flying Ninja' ), true );
+		assert.eventually.equal( shopPage.addProductToCart( 'Happy Ninja' ), true );
+
+		const cartPage = new CartPage( driver, { url: manager.getPageUrl( '/cart' ) } );
+		assert.eventually.equal( cartPage.hasItem( 'Flying Ninja' ), true );
+		assert.eventually.equal( cartPage.hasItem( 'Happy Ninja' ), true );
+	} );
+
+	test.it( 'should increases item qty when "Add to cart" of the same product is clicked', () => {
+		const shopPage = new ShopPage( driver, { url: manager.getPageUrl( '/shop' ) } );
+		assert.eventually.equal( shopPage.addProductToCart( 'Flying Ninja' ), true );
+
+		const cartPage = new CartPage( driver, { url: manager.getPageUrl( '/cart' ) } );
+		assert.eventually.equal( cartPage.hasItem( 'Flying Ninja', { qty: 2 } ), true );
+		assert.eventually.equal( cartPage.hasItem( 'Happy Ninja', { qty: 1 } ), true );
+	} );
+
+	test.it( 'should updates qty when updated via qty input', () => {
+		const cartPage = new CartPage( driver, { url: manager.getPageUrl( '/cart' ) } );
+		cartPage.getItem( 'Flying Ninja', { qty: 2 } ).setQty( 4 );
+		cartPage.update();
+		cartPage.getItem( 'Happy Ninja', { qty: 1 } ).setQty( 3 );
+		cartPage.update();
+
+		assert.eventually.equal( cartPage.hasItem( 'Flying Ninja', { qty: 4 } ), true );
+		assert.eventually.equal( cartPage.hasItem( 'Happy Ninja', { qty: 3 } ), true );
+	} );
+
+	test.it( 'should remove the item from the cart when remove is clicked', () => {
+		const cartPage = new CartPage( driver, { url: manager.getPageUrl( '/cart' ) } );
+		cartPage.getItem( 'Flying Ninja', { qty: 4 } ).remove();
+		cartPage.getItem( 'Happy Ninja', { qty: 3 } ).remove();
+
+		assert.eventually.equal( cartPage.hasNoItem(), true );
+	} );
+
+	test.it( 'should update subtotal in cart totals when adding product to the cart', () => {
+		const shopPage = new ShopPage( driver, { url: manager.getPageUrl( '/shop' ) } );
+		assert.eventually.equal( shopPage.addProductToCart( 'Flying Ninja' ), true );
+
+		const cartPage = new CartPage( driver, { url: manager.getPageUrl( '/cart' ) } );
+		assert.eventually.equal(
+			cartPage.hasItem( 'Flying Ninja', { qty: 1 } ),
+			true,
+			'Cart item "Flying Ninja" with qty 1 is not displayed'
+		);
+
+		assert.eventually.equal(
+			cartPage.hasSubtotal( '12.00' ),
+			true,
+			'Cart totals does not display subtotal of 12.00'
+		);
+
+		cartPage.getItem( 'Flying Ninja', { qty: 1 } ).setQty( 2 );
+		cartPage.update();
+
+		assert.eventually.equal(
+			cartPage.hasSubtotal( '24.00' ),
+			true,
+			'Cart totals does not display subtotal of 24.00'
+		);
+	} );
+
+	test.it( 'should go to the checkout page when "Proceed to Chcekout" is clicked', () => {
+		const cartPage = new CartPage( driver, { url: manager.getPageUrl( '/cart' ) } );
+		const checkoutPage = cartPage.checkout();
+
+		assert.eventually.equal(
+			checkoutPage.components.orderReview.displayed(),
+			true,
+			'Order review in checkout page is not displayed'
+		);
+	} );
+
+	test.after( 'quit browser', () => {
+		manager.quitBrowser();
+	} );
+} );
diff --git a/tests/e2e-tests/checkout-page.js b/tests/e2e-tests/checkout-page.js
new file mode 100644
index 00000000000..0b688dc0e77
--- /dev/null
+++ b/tests/e2e-tests/checkout-page.js
@@ -0,0 +1,154 @@
+import config from 'config';
+import chai from 'chai';
+import chaiAsPromised from 'chai-as-promised';
+import test from 'selenium-webdriver/testing';
+import { WebDriverManager, WebDriverHelper as helper } from 'wp-e2e-webdriver';
+import { Helper, PageMap, CheckoutOrderReceivedPage, StoreOwnerFlow, GuestCustomerFlow } from 'wc-e2e-page-objects';
+
+chai.use( chaiAsPromised );
+
+const assert = chai.assert;
+const PAGE = PageMap.PAGE;
+const storeOwnerFlowArgs = {
+	baseUrl: config.get( 'url' ),
+	username: config.get( 'users.admin.username' ),
+	password: config.get( 'users.admin.password' )
+};
+
+const assertOrderItem = ( orderReview, itemName, attrs ) => {
+	assert.eventually.ok(
+		orderReview.hasItem( itemName, attrs ),
+		`Could not find order item "${ itemName }" with qty ${ attrs.qty } and total ${ attrs.total }`
+	);
+};
+
+let manager;
+let driver;
+
+test.describe( 'Checkout Page', function() {
+	test.before( 'open browser', function() {
+		this.timeout( config.get( 'startBrowserTimeoutMs' ) );
+
+		manager = new WebDriverManager( 'chrome', { baseUrl: config.get( 'url' ) } );
+		driver = manager.getDriver();
+
+		helper.clearCookiesAndDeleteLocalStorage( driver );
+
+		const storeOwner = new StoreOwnerFlow( driver, storeOwnerFlowArgs );
+
+		// General settings for this test.
+		storeOwner.setGeneralSettings( {
+			baseLocation: [ 'United States', 'United States (US) — California' ],
+			sellingLocation: 'Sell to all countries',
+			enableTaxes: true,
+			currency: [ 'United States', 'United States dollar ($)' ],
+		} );
+
+		// Make sure payment method is set in setting.
+		storeOwner.enableBACS();
+		storeOwner.enableCOD();
+		storeOwner.enablePayPal();
+
+		storeOwner.logout();
+	} );
+
+	this.timeout( config.get( 'mochaTimeoutMs' ) );
+
+	test.it( 'should displays cart items in order review', () => {
+		const guest = new GuestCustomerFlow( driver, { baseUrl: config.get( 'url' ) } );
+		guest.fromShopAddProductsToCart( 'Flying Ninja', 'Happy Ninja' );
+
+		const checkoutPage = guest.openCheckout();
+		assert.eventually.ok( Helper.waitTillUIBlockNotPresent( driver ) );
+
+		const orderReview = checkoutPage.components.orderReview;
+		assertOrderItem( orderReview, 'Flying Ninja', { qty: '1', total: '$12.00' } );
+		assertOrderItem( orderReview, 'Happy Ninja', { qty: '1', total: '$18.00' } );
+		assert.eventually.ok( orderReview.hasSubtotal( '$30.00' ), 'Could not find subtotal $30.00' );
+	} );
+
+	test.it( 'allows customer to choose available payment methods', () => {
+		const guest = new GuestCustomerFlow( driver, { baseUrl: config.get( 'url' ) } );
+		guest.fromShopAddProductsToCart( 'Flying Ninja', 'Happy Ninja' );
+
+		const checkoutPage = guest.openCheckout();
+		assert.eventually.ok( Helper.waitTillUIBlockNotPresent( driver ) );
+		assert.eventually.ok( checkoutPage.selectPaymentMethod( 'PayPal' ) );
+		assert.eventually.ok( checkoutPage.selectPaymentMethod( 'Direct bank transfer' ) );
+		assert.eventually.ok( checkoutPage.selectPaymentMethod( 'Cash on delivery' ) );
+	} );
+
+	test.it( 'allows customer to fill billing details', () => {
+		const guest = new GuestCustomerFlow( driver, { baseUrl: config.get( 'url' ) } );
+		guest.fromShopAddProductsToCart( 'Flying Ninja', 'Happy Ninja' );
+
+		const checkoutPage = guest.open( PAGE.CHECKOUT );
+		assert.eventually.ok( Helper.waitTillUIBlockNotPresent( driver ) );
+
+		const billingDetails = checkoutPage.components.billingDetails;
+		assert.eventually.ok( billingDetails.setFirstName( 'John' ) );
+		assert.eventually.ok( billingDetails.setLastName( 'Doe' ) );
+		assert.eventually.ok( billingDetails.setCompany( 'Automattic' ) );
+		assert.eventually.ok( billingDetails.setEmail( 'john.doe@example.com' ) );
+		assert.eventually.ok( billingDetails.setPhone( '123456789' ) );
+		assert.eventually.ok( billingDetails.selectCountry( 'united states', 'United States (US)' ) );
+		assert.eventually.ok( billingDetails.setAddress1( 'addr 1' ) );
+		assert.eventually.ok( billingDetails.setAddress2( 'addr 2' ) );
+		assert.eventually.ok( billingDetails.setCity( 'San Francisco' ) );
+		assert.eventually.ok( billingDetails.selectState( 'cali', 'California' ) );
+		assert.eventually.ok( billingDetails.setZip( '94107' ) );
+	} );
+
+	test.it( 'allows customer to fill shipping details', () => {
+		const guest = new GuestCustomerFlow( driver, { baseUrl: config.get( 'url' ) } );
+		guest.fromShopAddProductsToCart( 'Flying Ninja', 'Happy Ninja' );
+
+		const checkoutPage = guest.open( PAGE.CHECKOUT );
+		assert.eventually.ok( Helper.waitTillUIBlockNotPresent( driver ) );
+		assert.eventually.ok( checkoutPage.checkShipToDifferentAddress() );
+
+		const shippingDetails = checkoutPage.components.shippingDetails;
+		assert.eventually.ok( shippingDetails.setFirstName( 'John' ) );
+		assert.eventually.ok( shippingDetails.setLastName( 'Doe' ) );
+		assert.eventually.ok( shippingDetails.setCompany( 'Automattic' ) );
+		assert.eventually.ok( shippingDetails.selectCountry( 'united states', 'United States (US)' ) );
+		assert.eventually.ok( shippingDetails.setAddress1( 'addr 1' ) );
+		assert.eventually.ok( shippingDetails.setAddress2( 'addr 2' ) );
+		assert.eventually.ok( shippingDetails.setCity( 'San Francisco' ) );
+		assert.eventually.ok( shippingDetails.selectState( 'cali', 'California' ) );
+		assert.eventually.ok( shippingDetails.setZip( '94107' ) );
+	} );
+
+	test.it( 'allows guest customer to place order', () => {
+		const guest = new GuestCustomerFlow( driver, { baseUrl: config.get( 'url' ) } );
+		guest.fromShopAddProductsToCart( 'Flying Ninja', 'Happy Ninja' );
+
+		const checkoutPage = guest.open( PAGE.CHECKOUT );
+		const billingDetails = checkoutPage.components.billingDetails;
+		Helper.waitTillUIBlockNotPresent( driver );
+		billingDetails.setFirstName( 'John' );
+		billingDetails.setLastName( 'Doe' );
+		billingDetails.setCompany( 'Automattic' );
+		billingDetails.setEmail( 'john.doe@example.com' );
+		billingDetails.setPhone( '123456789' );
+		billingDetails.selectCountry( 'united states', 'United States (US)' );
+		billingDetails.setAddress1( 'addr 1' );
+		billingDetails.setAddress2( 'addr 2' );
+		billingDetails.setCity( 'San Francisco' );
+		billingDetails.selectState( 'cali', 'California' );
+		billingDetails.setZip( '94107' );
+		checkoutPage.selectPaymentMethod( 'Cash on delivery' );
+		checkoutPage.placeOrder();
+		Helper.waitTillUIBlockNotPresent( driver );
+
+		const orderReceivedPage = new CheckoutOrderReceivedPage( driver, { visit: false } );
+
+		assert.eventually.ok(
+			orderReceivedPage.hasText( 'Order received' )
+		);
+	} );
+
+	test.after( 'quit browser', () => {
+		manager.quitBrowser();
+	} );
+} );
diff --git a/tests/e2e-tests/config/default.json b/tests/e2e-tests/config/default.json
new file mode 100644
index 00000000000..5478685bf17
--- /dev/null
+++ b/tests/e2e-tests/config/default.json
@@ -0,0 +1,15 @@
+{
+	"url": "http://example.com",
+	"users": {
+		"admin": {
+			"username": "",
+			"password": ""
+		},
+		"customer": {
+			"username": "",
+			"password": ""
+		}
+	},
+	"startBrowserTimeoutMs": 30000,
+	"mochaTimeoutMs": 120000
+}
diff --git a/tests/e2e-tests/config/local-sample.json b/tests/e2e-tests/config/local-sample.json
new file mode 100644
index 00000000000..ead94e6ac34
--- /dev/null
+++ b/tests/e2e-tests/config/local-sample.json
@@ -0,0 +1,9 @@
+{
+  "url": "http://local.wordpress.dev/",
+  "users": {
+    "admin": {
+      "username": "admin",
+      "password": "password"
+    }
+  }
+}
diff --git a/tests/e2e-tests/wp-admin/wp-admin-coupon-new.js b/tests/e2e-tests/wp-admin/wp-admin-coupon-new.js
new file mode 100644
index 00000000000..672ea64d8ea
--- /dev/null
+++ b/tests/e2e-tests/wp-admin/wp-admin-coupon-new.js
@@ -0,0 +1,51 @@
+import config from 'config';
+import chai from 'chai';
+import chaiAsPromised from 'chai-as-promised';
+import test from 'selenium-webdriver/testing';
+import { WebDriverManager, WebDriverHelper as helper } from 'wp-e2e-webdriver';
+import { StoreOwnerFlow } from 'wc-e2e-page-objects';
+
+chai.use( chaiAsPromised );
+const assert = chai.assert;
+
+let manager;
+let driver;
+
+test.describe( 'Add New Coupon Page', function() {
+	test.before( 'open browser', function() {
+		this.timeout( config.get( 'startBrowserTimeoutMs' ) );
+
+		manager = new WebDriverManager( 'chrome', { baseUrl: config.get( 'url' ) } );
+		driver = manager.getDriver();
+
+		helper.clearCookiesAndDeleteLocalStorage( driver );
+	} );
+
+	this.timeout( config.get( 'mochaTimeoutMs' ) );
+
+	test.it( 'can create new coupon', () => {
+		const flowArgs = {
+			baseUrl: config.get( 'url' ),
+			username: config.get( 'users.admin.username' ),
+			password: config.get( 'users.admin.password' )
+		};
+		const storeOwner = new StoreOwnerFlow( driver, flowArgs );
+
+		const couponPage = storeOwner.openNewCoupon();
+		couponPage.setTitle( 'code-' + new Date().getTime().toString() );
+		couponPage.setDescription( 'test coupon' );
+
+		const couponData = couponPage.components.metaBoxCouponData;
+		const generalPanel = couponData.clickTab( 'General' );
+		generalPanel.selectDiscountType( 'Cart Discount' );
+		generalPanel.setCouponAmount( '100' );
+
+		couponPage.publish();
+
+		assert.eventually.ok( couponPage.hasNotice( 'Coupon updated.' ) );
+	} );
+
+	test.after( 'quit browser', () => {
+		manager.quitBrowser();
+	} );
+} );
diff --git a/tests/e2e-tests/wp-admin/wp-admin-order-new.js b/tests/e2e-tests/wp-admin/wp-admin-order-new.js
new file mode 100644
index 00000000000..462eaa870b2
--- /dev/null
+++ b/tests/e2e-tests/wp-admin/wp-admin-order-new.js
@@ -0,0 +1,52 @@
+import config from 'config';
+import chai from 'chai';
+import chaiAsPromised from 'chai-as-promised';
+import test from 'selenium-webdriver/testing';
+import { WebDriverManager, WebDriverHelper as helper } from 'wp-e2e-webdriver';
+import { StoreOwnerFlow } from 'wc-e2e-page-objects';
+
+chai.use( chaiAsPromised );
+const assert = chai.assert;
+
+let manager;
+let driver;
+
+test.describe( 'Add New Order Page', function() {
+	test.before( 'open browser', function() {
+		this.timeout( config.get( 'startBrowserTimeoutMs' ) );
+
+		manager = new WebDriverManager( 'chrome', { baseUrl: config.get( 'url' ) } );
+		driver = manager.getDriver();
+
+		helper.clearCookiesAndDeleteLocalStorage( driver );
+	} );
+
+	this.timeout( config.get( 'mochaTimeoutMs' ) );
+
+	test.it( 'can create new order', () => {
+		const flowArgs = {
+			baseUrl: config.get( 'url' ),
+			username: config.get( 'users.admin.username' ),
+			password: config.get( 'users.admin.password' )
+		};
+		const storeOwner = new StoreOwnerFlow( driver, flowArgs );
+
+		const orderPage = storeOwner.openNewOrder();
+		const orderData = orderPage.components.metaBoxOrderData;
+		orderData.selectOrderStatus( 'Processing' );
+		orderData.setOrderDate( '2016-12-13' );
+		orderData.setOrderDateHour( '18' );
+		orderData.setOrderDateMinute( '55' );
+
+		orderPage.components.metaBoxOrderActions.saveOrder();
+
+		assert.eventually.ok( orderData.hasOrderStatus( 'Processing' ) );
+
+		const orderNotes = orderPage.components.metaBoxOrderNotes;
+		assert.eventually.ok( orderNotes.hasNote( 'Order status changed from Pending payment to Processing.' ) );
+	} );
+
+	test.after( 'quit browser', () => {
+		manager.quitBrowser();
+	} );
+} );
diff --git a/tests/e2e-tests/wp-admin/wp-admin-product-new.js b/tests/e2e-tests/wp-admin/wp-admin-product-new.js
new file mode 100644
index 00000000000..89d38616e32
--- /dev/null
+++ b/tests/e2e-tests/wp-admin/wp-admin-product-new.js
@@ -0,0 +1,127 @@
+import config from 'config';
+import chai from 'chai';
+import chaiAsPromised from 'chai-as-promised';
+import test from 'selenium-webdriver/testing';
+import { WebDriverManager, WebDriverHelper as helper } from 'wp-e2e-webdriver';
+import { WPLogin } from 'wp-e2e-page-objects';
+import { WPAdminProductNew } from 'wc-e2e-page-objects';
+
+chai.use( chaiAsPromised );
+const assert = chai.assert;
+
+let manager;
+let driver;
+
+test.describe( 'Add New Product Page', function() {
+	test.before( 'open browser', function() {
+		this.timeout( config.get( 'startBrowserTimeoutMs' ) );
+
+		manager = new WebDriverManager( 'chrome', { baseUrl: config.get( 'url' ) } );
+		driver = manager.getDriver();
+
+		helper.clearCookiesAndDeleteLocalStorage( driver );
+	} );
+
+	this.timeout( config.get( 'mochaTimeoutMs' ) );
+
+	test.before( 'login', () => {
+		const wpLogin = new WPLogin( driver, { url: manager.getPageUrl( '/wp-login.php' ) } );
+		wpLogin.login( config.get( 'users.admin.username' ), config.get( 'users.admin.password' ) );
+	} );
+
+	test.it( 'can create simple virtual product titled "Simple Product" with regular price $9.99', () => {
+		const product = new WPAdminProductNew( driver, { url: manager.getPageUrl( '/wp-admin/post-new.php?post_type=product' ) } );
+		product.setTitle( 'Simple Product' );
+
+		const productData = product.components.metaBoxProductData;
+		productData.selectProductType( 'Simple product' );
+		productData.checkVirtual();
+
+		const panelGeneral = productData.clickTab( 'General' );
+		panelGeneral.setRegularPrice( '9.99' );
+
+		product.publish();
+		assert.eventually.ok( product.hasNotice( 'Product published.' ) );
+
+		product.moveToTrash();
+		assert.eventually.ok( product.hasNotice( '1 product moved to the Trash.' ) );
+	} );
+
+	test.it( 'can create product with variations', () => {
+		const product = new WPAdminProductNew( driver, { url: manager.getPageUrl( '/wp-admin/post-new.php?post_type=product' ) } );
+		product.setTitle( 'Variable Product with Two Variations' );
+
+		const productData = product.components.metaBoxProductData;
+		productData.selectProductType( 'Variable product' );
+
+		const panelAttributes = productData.clickTab( 'Attributes' );
+		panelAttributes.selectAttribute( 'Custom product attribute' );
+
+		const attr1 = panelAttributes.add();
+		assert.eventually.ok( attr1.displayed() );
+		attr1.setName( 'attr #1' );
+		attr1.checkVisibleOnTheProductPage();
+		attr1.checkUsedForVariations();
+		attr1.setValue( 'val1 | val2' );
+		attr1.toggle();
+
+		const attr2 = panelAttributes.add();
+		assert.eventually.ok( attr1.displayed() );
+		attr2.setName( 'attr #2' );
+		attr2.checkVisibleOnTheProductPage();
+		attr2.checkUsedForVariations();
+		attr2.setValue( 'val1 | val2' );
+
+		const attr3 = panelAttributes.add();
+		assert.eventually.ok( attr1.displayed() );
+		attr3.setName( 'attr #3' );
+		attr3.checkVisibleOnTheProductPage();
+		attr3.checkUsedForVariations();
+		attr3.setValue( 'val1 | val2' );
+		attr3.toggle();	attr2.toggle();
+
+		panelAttributes.saveAttributes();
+
+		const panelVaritions = productData.clickTab( 'Variations' );
+		panelVaritions.selectAction( 'Create variations from all attributes' );
+		panelVaritions.go();
+
+		const var1 = panelVaritions.getRow( 1 );
+		var1.toggle();
+		var1.checkEnabled();
+		var1.checkVirtual();
+		var1.setRegularPrice( '9.99' );
+
+		const var2 = panelVaritions.getRow( 2 );
+		var2.toggle();
+		var2.checkEnabled();
+		var2.checkVirtual();
+		var2.setRegularPrice( '11.99' );
+
+		const var3 = panelVaritions.getRow( 3 );
+		var3.toggle();
+		var3.checkEnabled();
+		var3.checkManageStock();
+		var3.setRegularPrice( '20' );
+		var3.setWeight( '200' );
+		var3.setDimensionLength( '10' );
+		var3.setDimensionWidth( '20' );
+		var3.setDimensionHeight( '15' );
+
+		panelVaritions.saveChanges();
+
+		helper.scrollUp( driver );
+		helper.scrollUp( driver );
+		helper.scrollUp( driver );
+
+		product.publish();
+		assert.eventually.ok( product.hasNotice( 'Product published.' ) );
+
+		product.moveToTrash();
+		assert.eventually.ok( product.hasNotice( '1 product moved to the Trash.' ) );
+	} );
+
+	test.after( 'quit browser', () => {
+		manager.quitBrowser();
+	} );
+} );
diff --git a/tests/e2e-tests/wp-admin/wp-admin-wc-settings-general.js b/tests/e2e-tests/wp-admin/wp-admin-wc-settings-general.js
new file mode 100644
index 00000000000..15b9821ef79
--- /dev/null
+++ b/tests/e2e-tests/wp-admin/wp-admin-wc-settings-general.js
@@ -0,0 +1,70 @@
+import config from 'config';
+import chai from 'chai';
+import chaiAsPromised from 'chai-as-promised';
+import test from 'selenium-webdriver/testing';
+import { WebDriverManager, WebDriverHelper as helper } from 'wp-e2e-webdriver';
+import { WPLogin } from 'wp-e2e-page-objects';
+import { WPAdminWCSettingsGeneral } from 'wc-e2e-page-objects';
+
+chai.use( chaiAsPromised );
+const assert = chai.assert;
+
+let manager;
+let driver;
+
+test.describe( 'WooCommerce General Settings', function() {
+	test.before( 'open browser', function() {
+		this.timeout( config.get( 'startBrowserTimeoutMs' ) );
+
+		manager = new WebDriverManager( 'chrome', { baseUrl: config.get( 'url' ) } );
+		driver = manager.getDriver();
+
+		helper.clearCookiesAndDeleteLocalStorage( driver );
+	} );
+
+	this.timeout( config.get( 'mochaTimeoutMs' ) );
+
+	test.before( 'login', () => {
+		const wpLogin = new WPLogin( driver, { url: manager.getPageUrl( '/wp-login.php' ) } );
+		wpLogin.login( config.get( 'users.admin.username' ), config.get( 'users.admin.password' ) );
+	} );
+
+	test.it( 'can update settings', () => {
+		const settingsArgs = { url: manager.getPageUrl( '/wp-admin/admin.php?page=wc-settings&tab=general' ) };
+		const settings = new WPAdminWCSettingsGeneral( driver, settingsArgs );
+
+		assert.eventually.ok( settings.hasActiveTab( 'General' ) );
+
+		// Set selling location to all countries first, so we can choose california
+		// as base location.
+		settings.selectSellingLocation( 'Sell to all countries' );
+		settings.saveChanges();
+		assert.eventually.ok( settings.hasNotice( 'Your settings have been saved.' ) );
+
+		// Set base location with state CA.
+		settings.selectBaseLocation( 'california', 'United States (US) — California' );
+		settings.saveChanges();
+		assert.eventually.ok( settings.hasNotice( 'Your settings have been saved.' ) );
+
+		// Set selling location to specific countries first, so we can choose
+		// U.S as base location (without state). This will makes specific
+		// countries option appears.
+		settings.selectSellingLocation( 'Sell to specific countries' );
+		settings.removeChoiceInSellToSpecificCountries( 'United States (US)' );
+		settings.setSellToSpecificCountries( 'united states', 'United States (US)' );
+		settings.saveChanges();
+		assert.eventually.ok( settings.hasNotice( 'Your settings have been saved.' ) );
+
+		// Set currency options.
+		settings.setThousandSeparator( ',' );
+		settings.setDecimalSeparator( '.' );
+		settings.setNumberOfDecimals( '2' );
+
+		settings.saveChanges();
+		assert.eventually.ok( settings.hasNotice( 'Your settings have been saved.' ) );
+	} );
+
+	test.after( 'quit browser', () => {
+		manager.quitBrowser();
+	} );
+} );
diff --git a/tests/e2e-tests/wp-admin/wp-admin-wc-settings-products-downloadable.js b/tests/e2e-tests/wp-admin/wp-admin-wc-settings-products-downloadable.js
new file mode 100644
index 00000000000..bb710b489ff
--- /dev/null
+++ b/tests/e2e-tests/wp-admin/wp-admin-wc-settings-products-downloadable.js
@@ -0,0 +1,55 @@
+import config from 'config';
+import chai from 'chai';
+import chaiAsPromised from 'chai-as-promised';
+import test from 'selenium-webdriver/testing';
+import { WebDriverManager, WebDriverHelper as helper } from 'wp-e2e-webdriver';
+import { WPLogin } from 'wp-e2e-page-objects';
+import { WPAdminWCSettingsProductsDownloadable } from 'wc-e2e-page-objects';
+
+chai.use( chaiAsPromised );
+const assert = chai.assert;
+
+let manager;
+let driver;
+
+test.describe( 'WooCommerce Products > Downloadable Products Settings', function() {
+	test.before( 'open browser', function() {
+		this.timeout( config.get( 'startBrowserTimeoutMs' ) );
+
+		manager = new WebDriverManager( 'chrome', { baseUrl: config.get( 'url' ) } );
+		driver = manager.getDriver();
+
+		helper.clearCookiesAndDeleteLocalStorage( driver );
+	} );
+
+	this.timeout( config.get( 'mochaTimeoutMs' ) );
+
+	test.before( 'login', () => {
+		const wpLogin = new WPLogin( driver, { url: manager.getPageUrl( '/wp-login.php' ) } );
+		wpLogin.login( config.get( 'users.admin.username' ), config.get( 'users.admin.password' ) );
+	} );
+
+	test.it( 'can update settings', () => {
+		const settingsArgs = { url: manager.getPageUrl( '/wp-admin/admin.php?page=wc-settings&tab=products&section=downloadable' ) };
+		const settings = new WPAdminWCSettingsProductsDownloadable( driver, settingsArgs );
+
+		assert.eventually.ok( settings.hasActiveTab( 'Products' ) );
+		assert.eventually.ok( settings.hasActiveSubTab( 'Downloadable products' ) );
+
+		settings.selectFileDownloadMethod( 'Redirect only' );
+		settings.checkDownloadsRequireLogin();
+		settings.checkGrantAccessAfterPayment();
+		settings.saveChanges();
+		assert.eventually.ok( settings.hasNotice( 'Your settings have been saved.' ) );
+
+		settings.selectFileDownloadMethod( 'Force downloads' );
+		settings.uncheckDownloadsRequireLogin();
+		settings.uncheckGrantAccessAfterPayment();
+		settings.saveChanges();
+		assert.eventually.ok( settings.hasNotice( 'Your settings have been saved.' ) );
+	} );
+
+	test.after( 'quit browser', () => {
+		manager.quitBrowser();
+	} );
+} );
diff --git a/tests/framework/class-wc-api-unit-test-case.php b/tests/framework/class-wc-api-unit-test-case.php
index 7de6af421f3..cd820fe9ece 100644
--- a/tests/framework/class-wc-api-unit-test-case.php
+++ b/tests/framework/class-wc-api-unit-test-case.php
@@ -30,7 +30,8 @@ class WC_API_Unit_Test_Case extends WC_Unit_Test_Case {
 		$_SERVER['REQUEST_METHOD'] = null;
 
 		// mock the API server to prevent headers from being sent
-		$this->mock_server = $this->getMock( 'WC_API_Server', array ('header' ), array( '/' ) );
+		// $this->mock_server = $this->getMock( 'WC_API_Server', array( 'header' ), array( '/' ) );
+		$this->mock_server = $this->getMockBuilder( 'WC_API_Server' )->setMethods( array( 'header' ) )->disableOriginalConstructor()->getMock();
 
 		WC()->api->register_resources( $this->mock_server );
 	}
@@ -75,5 +76,4 @@ class WC_API_Unit_Test_Case extends WC_Unit_Test_Case {
 		$user->get_role_caps();
 		$user->update_user_level_from_caps();
 	}
-
 }
diff --git a/tests/framework/class-wc-dummy-data-store.php b/tests/framework/class-wc-dummy-data-store.php
new file mode 100644
index 00000000000..306fa62289f
--- /dev/null
+++ b/tests/framework/class-wc-dummy-data-store.php
@@ -0,0 +1,44 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC Dummy Data Store: CPT.
+ *
+ * Used to test swapping out data stores.
+ *
+ * @version  3.0.0
+ * @category Class
+ * @author   WooThemes
+ */
+class WC_Dummy_Data_Store_CPT implements WC_Object_Data_Store_Interface {
+	public function create( &$data ) { }
+	public function read( &$data ) { }
+	public function update( &$data ) { }
+	public function delete( &$data, $args = array() ) { }
+	public function read_meta( &$data ) { }
+	public function delete_meta( &$data, $meta ) { }
+	public function add_meta( &$data, $meta ) { }
+	public function update_meta( &$data, $meta ) { }
+}
+
+/**
+ * WC Dummy Data Store: Custom Table.
+ *
+ * Used to test swapping out data stores.
+ *
+ * @version  3.0.0
+ * @category Class
+ * @author   WooThemes
+ */
+class WC_Dummy_Data_Store_Custom_Table implements WC_Object_Data_Store_Interface {
+	public function create( &$data ) { }
+	public function read( &$data ) { }
+	public function update( &$data ) { }
+	public function delete( &$data, $args = array() ) { }
+	public function read_meta( &$data ) { }
+	public function delete_meta( &$data, $meta ) { }
+	public function add_meta( &$data, $meta ) { }
+	public function update_meta( &$data, $meta ) { }
+}
diff --git a/tests/framework/class-wc-mock-wc-data.php b/tests/framework/class-wc-mock-wc-data.php
new file mode 100644
index 00000000000..7dd26e05bb6
--- /dev/null
+++ b/tests/framework/class-wc-mock-wc-data.php
@@ -0,0 +1,226 @@
+<?php
+class WC_Mock_WC_Data_Store extends WC_Data_Store_WP implements WC_Object_Data_Store_Interface {
+
+	protected $meta_type = 'post';
+	protected $object_id_field_for_meta = '';
+	protected $internal_meta_keys = array();
+
+	/*
+	|--------------------------------------------------------------------------
+	| Setters for internal properties.
+	|--------------------------------------------------------------------------
+	| Normally we wouldn't want to be able to change this once the class is defined,
+	| but to make testing different types of meta/storage, we should be able to
+	| switch out our class settings.
+	| These functions just change the properties set above.
+	*/
+
+	/**
+	 * Set meta type (user or post).
+	 * @param string $meta_type
+	 */
+	function set_meta_type( $meta_type ) {
+		$this->meta_type = $meta_type;
+	}
+
+	/**
+	 * Set object ID field dynamically for testing.
+	 * @param string $object_id_field
+	 */
+	function set_object_id_field( $object_id_field ) {
+		$this->object_id_field_for_meta = $object_id_field;
+	}
+
+	public function create( &$object ) {
+		if ( 'user' === $this->meta_type ) {
+			$content_id = wc_create_new_customer( $object->get_content(), 'username-' . time(), 'hunter2' );
+		} else {
+			$content_id = wp_insert_post( array( 'post_title' => $object->get_content() ) );
+		}
+		if ( $content_id ) {
+			$object->set_id( $content_id );
+		}
+
+		$object->apply_changes();
+	}
+
+	/**
+	 * Simple read.
+	 */
+	public function read( &$object ) {
+		$object->set_defaults();
+		$id = $object->get_id();
+
+		if ( 'user' === $this->meta_type ) {
+			if ( empty( $id ) || ! ( $user_object = get_userdata( $id ) ) ) {
+				return;
+			}
+			$object->set_content( $user_object->user_email );
+		} else {
+			if ( empty( $id ) || ! ( $post_object = get_post( $id ) ) ) {
+				return;
+			}
+			$object->set_content( $post_object->post_title );
+		}
+
+		$object->read_meta_data();
+		$object->set_object_read( true );
+	}
+
+	/**
+	 * Simple update.
+	 */
+	public function update( &$object ) {
+		global $wpdb;
+		$content_id = $object->get_id();
+
+		if ( 'user' === $this->meta_type ) {
+			wp_update_user( array( 'ID' => $customer_id, 'user_email' => $object->get_content() ) );
+		} else {
+			wp_update_post( array( 'ID' => $content_id, 'post_title' => $object->get_content() ) );
+		}
+	}
+
+	/**
+	 * Simple delete.
+	 */
+	public function delete( &$object, $args = array() ) {
+		if ( 'user' === $this->meta_type ) {
+			wp_delete_user( $object->get_id() );
+		} else {
+			wp_delete_post( $object->get_id() );
+		}
+
+		$object->set_id( 0 );
+	}
+
+}
+
+/**
+ * Used for exposing and testing the various Abstract WC_Data methods.
+ */
+class WC_Mock_WC_Data extends WC_Data {
+
+	/**
+	 * Data array
+	 */
+	protected $data = array(
+		'content'    => '',
+		'bool_value' => false,
+	);
+
+	// see WC_Data
+	protected $cache_group = '';
+	public $data_store;
+
+	/*
+	|--------------------------------------------------------------------------
+	| Abstract methods.
+	|--------------------------------------------------------------------------
+	| Define the abstract methods WC_Data classes expect, so we can go on to
+	| testing the good bits.
+	*/
+
+	/**
+	 * Simple read.
+	 */
+	public function __construct( $id = '' ) {
+		parent::__construct();
+		if ( ! empty( $id ) ) {
+			$this->set_id( $id );
+		} else {
+			$this->set_object_read( true );
+		}
+
+		$this->data_store = new WC_Mock_WC_Data_Store;
+
+		if ( $this->get_id() > 0 ) {
+			$this->data_store->read( $this );
+		}
+	}
+
+	/**
+	 * Simple get content.
+	 *
+	 * @param  string $context
+	 * @return string
+	 */
+	public function get_content( $context = 'view' ) {
+		return $this->get_prop( 'content', $context );
+	}
+
+	/**
+	 * Simple set content.
+	 *
+	 * @param string $content
+	 */
+	public function set_content( $content ) {
+		$this->set_prop( 'content', $content );
+	}
+
+	/**
+	 * Simple get bool value.
+	 *
+	 * @param  string $context
+	 * @return bool
+	 */
+	public function get_bool_value( $context = 'view' ) {
+		return $this->get_prop( 'bool_value', $context );
+	}
+
+	/**
+	 * Simple set bool value.
+	 *
+	 * @return bool
+	 */
+	public function set_bool_value( $value ) {
+		if ( ! is_bool( $value ) ) {
+			$this->error( 'invalid_bool_value', 'O noes' );
+		}
+		$this->set_prop( 'bool_value', $value );
+	}
+
+	/**
+	 * Simple get data as array.
+	 * @return array
+	 */
+	public function get_data() {
+		return array_merge(
+			$this->data,
+			array(
+				'meta_data' => $this->get_meta_data(),
+			)
+		);
+	}
+
+	/**
+	 * Set the data to any arbitrary data.
+	 * @param array $data
+	 */
+	public function set_data( $data ) {
+		$this->data = $data;
+	}
+
+	/**
+	 * Set the changes to any arbitrary changes.
+	 * @param array $changes
+	 */
+	public function set_changes( $changes ) {
+		$this->changes = $changes;
+	}
+
+	/**
+	 * Simple save.
+	 */
+	public function save() {
+		if ( $this->data_store ) {
+			if ( $this->get_id() ) {
+				$this->data_store->update( $this );
+			} else {
+				$this->data_store->create( $this );
+			}
+		}
+		$this->save_meta_data();
+		return $this->get_id();
+	}
+}
diff --git a/tests/framework/class-wc-payment-token-stub.php b/tests/framework/class-wc-payment-token-stub.php
new file mode 100644
index 00000000000..669f7745d96
--- /dev/null
+++ b/tests/framework/class-wc-payment-token-stub.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Stub/Dummy class to test WC_Payment_Token methods only
+ *
+ * @since 2.6.0
+ */
+class WC_Payment_Token_Stub extends WC_Payment_Token {
+
+	/** @protected string Token Type String */
+	protected $type = 'stub';
+
+	/**
+	 * Returns meta.
+	 * @since 2.6.0
+	 * @return string
+	 */
+	public function get_extra() {
+		return $this->get_meta( 'extra' );
+	}
+
+	/**
+	 * Set meta.
+	 * @since 2.6.0
+	 * @param string $extra
+	 */
+	public function set_extra( $extra ) {
+		$this->add_meta_data( 'extra', $extra, true );
+	}
+}
diff --git a/tests/framework/class-wc-rest-unit-test-case.php b/tests/framework/class-wc-rest-unit-test-case.php
new file mode 100644
index 00000000000..6e0e884b6c5
--- /dev/null
+++ b/tests/framework/class-wc-rest-unit-test-case.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * WC REST API Unit Test Case (for WP-API Endpoints).
+ *
+ * Provides REST API specific methods and setup/teardown.
+ *
+ * @since 3.0
+ */
+
+ class WC_REST_Unit_Test_Case extends WC_Unit_Test_Case {
+
+     protected $server;
+
+    /**
+     * Setup our test server.
+     */
+    public function setUp() {
+        parent::setUp();
+        global $wp_rest_server;
+        $this->server = $wp_rest_server = new WP_Test_Spy_REST_Server;
+        do_action( 'rest_api_init' );
+    }
+
+    /**
+     * Unset the server.
+     */
+    public function tearDown() {
+        parent::tearDown();
+        global $wp_rest_server;
+        $wp_rest_server = null;
+    }
+}
diff --git a/tests/framework/class-wc-unit-test-case.php b/tests/framework/class-wc-unit-test-case.php
index beb0031c876..85048e4bb74 100644
--- a/tests/framework/class-wc-unit-test-case.php
+++ b/tests/framework/class-wc-unit-test-case.php
@@ -9,7 +9,7 @@
  */
 class WC_Unit_Test_Case extends WP_UnitTestCase {
 
-	/** @var \WC_Unit_Test_Factory instance */
+	/** @var WC_Unit_Test_Factory instance */
 	protected $factory;
 
 	/**
@@ -100,5 +100,4 @@ class WC_Unit_Test_Case extends WP_UnitTestCase {
 			parent::assertNotFalse( $condition, $message );
 		}
 	}
-
 }
diff --git a/tests/framework/class-wc-unit-test-factory.php b/tests/framework/class-wc-unit-test-factory.php
index d4b72dc45ab..3e483d1f36b 100644
--- a/tests/framework/class-wc-unit-test-factory.php
+++ b/tests/framework/class-wc-unit-test-factory.php
@@ -8,10 +8,10 @@
  */
 class WC_Unit_Test_Factory extends WP_UnitTest_Factory {
 
-	/** @var \WC_Unit_Test_Factory_For_Webhook */
+	/** @var WC_Unit_Test_Factory_For_Webhook */
 	public $webhook;
 
-	/** @var \WC_Unit_Test_Factory_For_Webhook_Delivery */
+	/** @var WC_Unit_Test_Factory_For_Webhook_Delivery */
 	public $webhook_delivery;
 
 	/**
@@ -24,5 +24,4 @@ class WC_Unit_Test_Factory extends WP_UnitTest_Factory {
 		$this->webhook = new WC_Unit_Test_Factory_For_Webhook( $this );
 		$this->webhook_delivery = new WC_Unit_Test_Factory_For_Webhook_Delivery( $this );
 	}
-
 }
diff --git a/tests/framework/factories/class-wc-unit-test-factory-for-webhook-delivery.php b/tests/framework/factories/class-wc-unit-test-factory-for-webhook-delivery.php
index e93839718d9..977e853fb80 100644
--- a/tests/framework/factories/class-wc-unit-test-factory-for-webhook-delivery.php
+++ b/tests/framework/factories/class-wc-unit-test-factory-for-webhook-delivery.php
@@ -19,7 +19,7 @@ class WC_Unit_Test_Factory_For_Webhook_Delivery extends WP_UnitTest_Factory_For_
 
 		// set defaults
 		$this->default_generation_definitions = array(
-			'comment_author'       => __( 'WooCommerce', 'woocommerce' ),
+			'comment_author'       => 'WooCommerce',
 			'comment_author_email' => 'woocommerce@noreply.com',
 			'comment_agent'        => 'WooCommerce Hookshot',
 			'comment_type'         => 'webhook_delivery',
@@ -58,5 +58,4 @@ class WC_Unit_Test_Factory_For_Webhook_Delivery extends WP_UnitTest_Factory_For_
 
 		return $id;
 	}
-
 }
diff --git a/tests/framework/factories/class-wc-unit-test-factory-for-webhook.php b/tests/framework/factories/class-wc-unit-test-factory-for-webhook.php
index 56908f6496d..c26799dbe35 100644
--- a/tests/framework/factories/class-wc-unit-test-factory-for-webhook.php
+++ b/tests/framework/factories/class-wc-unit-test-factory-for-webhook.php
@@ -61,11 +61,10 @@ class WC_Unit_Test_Factory_For_Webhook extends WP_UnitTest_Factory_For_Post {
 	 * @since 2.2
 	 * @see WP_UnitTest_Factory_For_Post::get_object_by_id()
 	 * @param int $id webhook ID
-	 * @return \WC_Webhook webhook instance
+	 * @return WC_Webhook webhook instance
 	 */
 	public function get_object_by_id( $id ) {
 
 		return new WC_Webhook( $id );
 	}
-
 }
diff --git a/tests/framework/helpers/class-wc-helper-coupon.php b/tests/framework/helpers/class-wc-helper-coupon.php
index bef29fb4097..1f4ab4e01a7 100644
--- a/tests/framework/helpers/class-wc-helper-coupon.php
+++ b/tests/framework/helpers/class-wc-helper-coupon.php
@@ -12,17 +12,13 @@ class WC_Helper_Coupon {
 	 *
 	 * @return WC_Coupon
 	 */
-	public static function create_coupon() {
-
-		// Coupon code
-		$coupon_code = 'dummycoupon';
-
+	public static function create_coupon( $coupon_code = 'dummycoupon' ) {
 		// Insert post
 		$coupon_id = wp_insert_post( array(
 			'post_title'   => $coupon_code,
 			'post_type'    => 'shop_coupon',
 			'post_status'  => 'publish',
-			'post_excerpt' => 'This is a dummy coupon'
+			'post_excerpt' => 'This is a dummy coupon',
 		) );
 
 		// Update meta
@@ -58,5 +54,4 @@ class WC_Helper_Coupon {
 		wp_delete_post( $coupon_id, true );
 		return true;
 	}
-
 }
diff --git a/tests/framework/helpers/class-wc-helper-customer.php b/tests/framework/helpers/class-wc-helper-customer.php
index 0867fe55973..82ec13afa3d 100644
--- a/tests/framework/helpers/class-wc-helper-customer.php
+++ b/tests/framework/helpers/class-wc-helper-customer.php
@@ -12,7 +12,6 @@ class WC_Helper_Customer {
 	 *
 	 * @return WC_Customer
 	 */
-
 	public static function create_mock_customer() {
 
 		$customer_data = array(
@@ -29,12 +28,38 @@ class WC_Helper_Customer {
 			'shipping_address'		=> '123 South Street',
 			'shipping_address_2'	=> 'Apt 1',
 			'is_vat_exempt' 		=> false,
-			'calculated_shipping'	=> false
+			'calculated_shipping'	=> false,
 		);
 
 		WC_Helper_Customer::set_customer_details( $customer_data );
 
-		return new WC_Customer();
+		$customer = new WC_Customer( 0, true );
+		return $customer;
+	}
+
+	/**
+	 * Creates a customer in the tests DB.
+	 */
+	public static function create_customer( $username = 'testcustomer', $password = 'hunter2', $email = 'test@woo.local' ) {
+		$customer = new WC_Customer();
+		$customer->set_billing_country( 'US' );
+		$customer->set_first_name( 'Justin' );
+		$customer->set_billing_state( 'PA' );
+		$customer->set_billing_postcode( '19123' );
+		$customer->set_billing_city( 'Philadelphia' );
+		$customer->set_billing_address( '123 South Street' );
+		$customer->set_billing_address_2( 'Apt 1' );
+		$customer->set_shipping_country( 'US' );
+		$customer->set_shipping_state( 'PA' );
+		$customer->set_shipping_postcode( '19123' );
+		$customer->set_shipping_city( 'Philadelphia' );
+		$customer->set_shipping_address( '123 South Street' );
+		$customer->set_shipping_address_2( 'Apt 1' );
+		$customer->set_username( $username );
+		$customer->set_password( $password );
+		$customer->set_email( $email );
+		$customer->save();
+		return $customer;
 	}
 
 	/**
@@ -42,7 +67,6 @@ class WC_Helper_Customer {
 	 *
 	 * @return array
 	 */
-
 	public static function get_expected_store_location() {
 		return array( "GB", "", "", "" );
 	}
@@ -52,7 +76,6 @@ class WC_Helper_Customer {
 	 *
 	 * @return array
 	 */
-
 	public static function get_customer_details() {
 		return WC()->session->get( 'customer' );
 	}
@@ -62,7 +85,6 @@ class WC_Helper_Customer {
 	 *
 	 * @return array
 	 */
-
 	public static function get_chosen_shipping_methods() {
 		return WC()->session->get( 'chosen_shipping_methods' );
 	}
@@ -72,7 +94,6 @@ class WC_Helper_Customer {
 	 *
 	 * @return string base or billing
 	 */
-
 	public static function get_tax_based_on() {
 		return get_option( 'woocommerce_tax_based_on' );
 	}
@@ -82,7 +103,6 @@ class WC_Helper_Customer {
 	 *
 	 * @param string $default_shipping_method Shipping Method slug
 	 */
-
 	public static function set_customer_details( $customer_details ) {
 		WC()->session->set( 'customer', $customer_details );
 	}
@@ -92,7 +112,6 @@ class WC_Helper_Customer {
 	 *
 	 * @param string $chosen_shipping_method Shipping Method slug
 	 */
-
 	public static function set_chosen_shipping_methods( $chosen_shipping_methods ) {
 		WC()->session->set( 'chosen_shipping_methods', $chosen_shipping_methods );
 	}
@@ -102,7 +121,6 @@ class WC_Helper_Customer {
 	 *
 	 * @param string $default_shipping_method Shipping Method slug
 	 */
-
 	public static function set_tax_based_on( $default_shipping_method ) {
 		update_option( 'woocommerce_tax_based_on', $default_shipping_method );
 	}
diff --git a/tests/framework/helpers/class-wc-helper-order.php b/tests/framework/helpers/class-wc-helper-order.php
index 480f03e03a3..b0ab1d97b5b 100644
--- a/tests/framework/helpers/class-wc-helper-order.php
+++ b/tests/framework/helpers/class-wc-helper-order.php
@@ -30,19 +30,25 @@ class WC_Helper_Order {
 	/**
 	 * Create a order.
 	 *
-	 * @since 2.4
+	 * @since   2.4
+	 * @version 3.0 New parameter $product.
 	 *
-	 * @return WC_Order Order object.
+	 * @param int        $customer_id
+	 * @param WC_Product $product
+	 *
+	 * @return WC_Order
 	 */
-	public static function create_order() {
+	public static function create_order( $customer_id = 1, $product = null ) {
+
+		if ( ! is_a( $product, 'WC_Product' ) ) {
+			$product = WC_Helper_Product::create_simple_product();
+		}
 
-		// Create product
-		$product = WC_Helper_Product::create_simple_product();
 		WC_Helper_Shipping::create_simple_flat_rate();
 
 		$order_data = array(
 			'status'        => 'pending',
-			'customer_id'   => 1,
+			'customer_id'   => $customer_id,
 			'customer_note' => '',
 			'total'         => '',
 		);
@@ -51,40 +57,57 @@ class WC_Helper_Order {
 		$order 					= wc_create_order( $order_data );
 
 		// Add order products
-		$item_id = $order->add_product( $product, 4 );
+		$item = new WC_Order_Item_Product();
+		$item->set_props( array(
+			'product'  => $product,
+			'quantity' => 4,
+			'subtotal' => wc_get_price_excluding_tax( $product, array( 'qty' => 4 ) ),
+			'total' => wc_get_price_excluding_tax( $product, array( 'qty' => 4 ) ),
+		) );
+		$item->save();
+		$order->add_item( $item );
 
 		// Set billing address
-		$billing_address = array(
-			'country'    => 'US',
-			'first_name' => 'Jeroen',
-			'last_name'  => 'Sormani',
-			'company'    => 'WooCompany',
-			'address_1'  => 'WooAddress',
-			'address_2'  => '',
-			'postcode'   => '123456',
-			'city'       => 'WooCity',
-			'state'      => 'NY',
-			'email'      => 'admin@example.org',
-			'phone'      => '555-32123',
-		);
-		$order->set_address( $billing_address, 'billing' );
+		$order->set_billing_first_name( 'Jeroen' );
+		$order->set_billing_last_name( 'Sormani' );
+		$order->set_billing_company( 'WooCompany' );
+		$order->set_billing_address_1( 'WooAddress' );
+		$order->set_billing_address_2( '' );
+		$order->set_billing_city( 'WooCity' );
+		$order->set_billing_state( 'NY' );
+		$order->set_billing_postcode( '123456' );
+		$order->set_billing_country( 'US' );
+		$order->set_billing_email( 'admin@example.org' );
+		$order->set_billing_phone( '555-32123' );
 
 		// Add shipping costs
 		$shipping_taxes = WC_Tax::calc_shipping_tax( '10', WC_Tax::get_shipping_tax_rates() );
-		$order->add_shipping( new WC_Shipping_Rate( 'flat_rate_shipping', 'Flat rate shipping', '10', $shipping_taxes, 'flat_rate' ) );
+		$rate   = new WC_Shipping_Rate( 'flat_rate_shipping', 'Flat rate shipping', '10', $shipping_taxes, 'flat_rate' );
+		$item   = new WC_Order_Item_Shipping();
+		$item->set_props( array(
+			'method_title' => $rate->label,
+			'method_id'    => $rate->id,
+			'total'        => wc_format_decimal( $rate->cost ),
+			'taxes'        => $rate->taxes,
+		) );
+		foreach ( $rate->get_meta_data() as $key => $value ) {
+			$item->add_meta_data( $key, $value, true );
+		}
+		$order->add_item( $item );
 
 		// Set payment gateway
 		$payment_gateways = WC()->payment_gateways->payment_gateways();
 		$order->set_payment_method( $payment_gateways['bacs'] );
 
 		// Set totals
-		$order->set_total( 10, 'shipping' );
-		$order->set_total( 0, 'cart_discount' );
-		$order->set_total( 0, 'cart_discount_tax' );
-		$order->set_total( 0, 'tax' );
-		$order->set_total( 0, 'shipping_tax' );
-		$order->set_total( 40, 'total' ); // 4 x $10 simple helper product
+		$order->set_shipping_total( 10 );
+		$order->set_discount_total( 0 );
+		$order->set_discount_tax( 0 );
+		$order->set_cart_tax( 0 );
+		$order->set_shipping_tax( 0 );
+		$order->set_total( 40 ); // 4 x $10 simple helper product
+		$order->save();
 
-		return wc_get_order( $order->id );
+		return $order;
 	}
 }
diff --git a/tests/framework/helpers/class-wc-helper-payment-token.php b/tests/framework/helpers/class-wc-helper-payment-token.php
new file mode 100644
index 00000000000..e0168d42322
--- /dev/null
+++ b/tests/framework/helpers/class-wc-helper-payment-token.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Class WC_Helper_Payment_Token
+ *
+ * This helper class should ONLY be used for unit tests!
+ */
+class WC_Helper_Payment_Token {
+
+	/**
+	 * Create a new credit card payment token
+	 *
+	 * @since 2.6
+	 * @return WC_Payment_Token_CC object
+	 */
+	public static function create_cc_token( $user_id = '' ) {
+		$token = new WC_Payment_Token_CC();
+		$token->set_last4( 1234 );
+		$token->set_expiry_month( '08' );
+		$token->set_expiry_year( '2016' );
+		$token->set_card_type( 'visa' );
+		$token->set_token( time() );
+		if ( ! empty( $user_id ) ) {
+			$token->set_user_id( $user_id );
+		}
+		$token->save();
+		return $token;
+	}
+
+	/**
+	 * Create a new eCheck payment token
+	 *
+	 * @since 2.6
+	 * @return WC_Payment_Token_eCheck object
+	 */
+	public static function create_eCheck_token() {
+		$token = new WC_Payment_Token_eCheck();
+		$token->set_last4( 1234 );
+		$token->set_token( time() );
+		$token->save();
+		return $token;
+	}
+
+	/**
+	 * Create a new 'stub' payment token
+	 *
+	 * @since 2.6
+	 * @param  string $extra A string to insert and get to test the metadata functionality of a token
+	 * @return WC_Payment_Token_Stub object
+	 */
+	public static function create_stub_token( $extra ) {
+		$token = new WC_Payment_Token_Stub();
+		$token->set_extra( $extra );
+		$token->set_token( time() );
+		$token->save();
+		return $token;
+	}
+}
diff --git a/tests/framework/helpers/class-wc-helper-product.php b/tests/framework/helpers/class-wc-helper-product.php
index bd7362544d8..b62c2c19832 100644
--- a/tests/framework/helpers/class-wc-helper-product.php
+++ b/tests/framework/helpers/class-wc-helper-product.php
@@ -11,18 +11,10 @@ class WC_Helper_Product {
 	 * Delete a product.
 	 *
 	 * @param $product_id
-	 *
-	 * @todo check for variations, attributes, etc.
 	 */
 	public static function delete_product( $product_id ) {
-
-		/**
-		 * @todo check for variations, attributes, etc.
-		 */
-
 		// Delete the psot
 		wp_delete_post( $product_id, true );
-
 	}
 
 	/**
@@ -33,12 +25,11 @@ class WC_Helper_Product {
 	 * @return WC_Product_Simple
 	 */
 	public static function create_simple_product() {
-
 		// Create the product
 		$product = wp_insert_post( array(
 			'post_title'  => 'Dummy Product',
 			'post_type'   => 'product',
-			'post_status' => 'publish'
+			'post_status' => 'publish',
 		) );
 		update_post_meta( $product, '_price', '10' );
 		update_post_meta( $product, '_regular_price', '10' );
@@ -47,15 +38,68 @@ class WC_Helper_Product {
 		update_post_meta( $product, '_manage_stock', 'no' );
 		update_post_meta( $product, '_tax_status', 'taxable' );
 		update_post_meta( $product, '_downloadable', 'no' );
-		update_post_meta( $product, '_virtual', 'taxable' );
-		update_post_meta( $product, '_visibility', 'visible' );
+		update_post_meta( $product, '_virtual', 'no' );
 		update_post_meta( $product, '_stock_status', 'instock' );
+		wp_set_object_terms( $product, 'simple', 'product_type' );
 
 		return new WC_Product_Simple( $product );
 	}
 
 	/**
-	 * Create a dummy simple product.
+	 * Create external product.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @return WC_Product_External
+	 */
+	public static function create_external_product() {
+		// Create the product
+		$product = wp_insert_post( array(
+			'post_title'  => 'Dummy External Product',
+			'post_type'   => 'product',
+			'post_status' => 'publish',
+		) );
+		update_post_meta( $product, '_price', '10' );
+		update_post_meta( $product, '_regular_price', '10' );
+		update_post_meta( $product, '_sale_price', '' );
+		update_post_meta( $product, '_sku', 'DUMMY EXTERNAL SKU' );
+		update_post_meta( $product, '_product_url', 'http://woocommerce.com' );
+		update_post_meta( $product, '_button_text', 'Buy external product' );
+		wp_set_object_terms( $product, 'external', 'product_type' );
+
+		return new WC_Product_External( $product );
+	}
+
+	/**
+	 * Create grouped product.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @return WC_Product_Grouped
+	 */
+	public static function create_grouped_product() {
+		// Create the product
+		$product = wp_insert_post( array(
+			'post_title'  => 'Dummy Grouped Product',
+			'post_type'   => 'product',
+			'post_status' => 'publish',
+		) );
+		$simple_product_1 = self::create_simple_product( $product );
+		$simple_product_2 = self::create_simple_product( $product );
+		update_post_meta( $product, '_children', array( $simple_product_1->get_id(), $simple_product_2->get_id() ) );
+		update_post_meta( $product, '_sku', 'DUMMY GROUPED SKU' );
+		update_post_meta( $product, '_manage_stock', 'no' );
+		update_post_meta( $product, '_tax_status', 'taxable' );
+		update_post_meta( $product, '_downloadable', 'no' );
+		update_post_meta( $product, '_virtual', 'no' );
+		update_post_meta( $product, '_stock_status', 'instock' );
+		wp_set_object_terms( $product, 'grouped', 'product_type' );
+
+		return new WC_Product_Grouped( $product );
+	}
+
+	/**
+	 * Create a dummy variation product.
 	 *
 	 * @since 2.3
 	 *
@@ -71,9 +115,12 @@ class WC_Helper_Product {
 		$product_id = wp_insert_post( array(
 			'post_title'  => 'Dummy Product',
 			'post_type'   => 'product',
-			'post_status' => 'publish'
+			'post_status' => 'publish',
 		) );
 
+		// Set it as variable.
+		wp_set_object_terms( $product_id, 'variable', 'product_type' );
+
 		// Price related meta
 		update_post_meta( $product_id, '_price', '10' );
 		update_post_meta( $product_id, '_min_variation_price', '10' );
@@ -86,8 +133,7 @@ class WC_Helper_Product {
 		update_post_meta( $product_id, '_manage_stock', 'no' );
 		update_post_meta( $product_id, '_tax_status', 'taxable' );
 		update_post_meta( $product_id, '_downloadable', 'no' );
-		update_post_meta( $product_id, '_virtual', 'taxable' );
-		update_post_meta( $product_id, '_visibility', 'visible' );
+		update_post_meta( $product_id, '_virtual', 'no' );
 		update_post_meta( $product_id, '_stock_status', 'instock' );
 
 		// Attributes
@@ -99,15 +145,17 @@ class WC_Helper_Product {
 				'position'     => '1',
 				'is_visible'   => 0,
 				'is_variation' => 1,
-				'is_taxonomy'  => 1
-			)
+				'is_taxonomy'  => 1,
+			),
 		) );
 
+		wp_set_object_terms( $product_id, 'variable', 'product_type' );
+
 		// Link the product to the attribute
 		$wpdb->insert( $wpdb->prefix . 'term_relationships', array(
 			'object_id'        => $product_id,
 			'term_taxonomy_id' => $attribute_data['term_taxonomy_id'],
-			'term_order'       => 0
+			'term_order'       => 0,
 		) );
 		$return['term_taxonomy_id'] = $wpdb->insert_id;
 
@@ -116,7 +164,9 @@ class WC_Helper_Product {
 			'post_title'  => 'Variation #' . ( $product_id + 1 ) . ' of Dummy Product',
 			'post_type'   => 'product_variation',
 			'post_parent' => $product_id,
-			'post_status' => 'publish'
+			'post_status' => 'publish',
+			'menu_order'  => 1,
+			'post_date'   => date( 'Y-m-d H:i:s', time() - 30 ), // Makes sure post dates differ if super quick.
 		) );
 
 		// Price related meta
@@ -127,21 +177,21 @@ class WC_Helper_Product {
 		update_post_meta( $variation_id, '_sku', 'DUMMY SKU VARIABLE SMALL' );
 		update_post_meta( $variation_id, '_manage_stock', 'no' );
 		update_post_meta( $variation_id, '_downloadable', 'no' );
-		update_post_meta( $variation_id, '_virtual', 'taxable' );
+		update_post_meta( $variation_id, '_virtual', 'no' );
 		update_post_meta( $variation_id, '_stock_status', 'instock' );
 
+		wp_set_object_terms( $variation_id, 'variation', 'product_type' );
+
 		// Attribute meta
 		update_post_meta( $variation_id, 'attribute_pa_size', 'small' );
 
-		// Add the variation meta to the main product
-		update_post_meta( $product_id, '_min_price_variation_id', $variation_id );
-
 		// Create the variation
 		$variation_id = wp_insert_post( array(
 			'post_title'  => 'Variation #' . ( $product_id + 2 ) . ' of Dummy Product',
 			'post_type'   => 'product_variation',
 			'post_parent' => $product_id,
-			'post_status' => 'publish'
+			'post_status' => 'publish',
+			'menu_order'  => 2,
 		) );
 
 		// Price related meta
@@ -149,19 +199,20 @@ class WC_Helper_Product {
 		update_post_meta( $variation_id, '_regular_price', '15' );
 
 		// General meta
-		update_post_meta( $variation_id, '_sku', 'DUMMY SKU VARIABLE SMALL' );
+		update_post_meta( $variation_id, '_sku', 'DUMMY SKU VARIABLE LARGE' );
 		update_post_meta( $variation_id, '_manage_stock', 'no' );
 		update_post_meta( $variation_id, '_downloadable', 'no' );
-		update_post_meta( $variation_id, '_virtual', 'taxable' );
+		update_post_meta( $variation_id, '_virtual', 'no' );
 		update_post_meta( $variation_id, '_stock_status', 'instock' );
 
 		// Attribute meta
 		update_post_meta( $variation_id, 'attribute_pa_size', 'large' );
 
 		// Add the variation meta to the main product
-
 		update_post_meta( $product_id, '_max_price_variation_id', $variation_id );
 
+		wp_set_object_terms( $variation_id, 'variation', 'product_type' );
+
 		return new WC_Product_Variable( $product_id );
 	}
 
@@ -177,7 +228,7 @@ class WC_Helper_Product {
 
 		$return = array();
 
-		$attribute_name = 'dummyattribute';
+		$attribute_name = 'size';
 
 		// Create attribute
 		$attribute = array(
@@ -198,27 +249,43 @@ class WC_Helper_Product {
 		$wpdb->insert( $wpdb->prefix . 'terms', array(
 			'name'       => 'small',
 			'slug'       => 'small',
-			'term_group' => 0
+			'term_group' => 0,
 		), array(
 			'%s',
 			'%s',
-			'%d'
+			'%d',
 		) );
 		$return['term_id'] = $wpdb->insert_id;
 
 		// Add the term_taxonomy
 		$wpdb->insert( $wpdb->prefix . 'term_taxonomy', array(
 			'term_id'     => $return['term_id'],
-			'taxonomy'    => 'pa_dummyattribute',
+			'taxonomy'    => 'pa_size',
 			'description' => '',
 			'parent'      => 0,
-			'count'       => 1
+			'count'       => 1,
 		) );
 		$return['term_taxonomy_id'] = $wpdb->insert_id;
 
 		// Delete transient
 		delete_transient( 'wc_attribute_taxonomies' );
 
+		$taxonomy_data = array(
+			'labels' => array(
+				'name' => 'size',
+			),
+		);
+		register_taxonomy( 'pa_size', array( 'product' ), $taxonomy_data );
+
+		// Set product attributes global.
+		global $wc_product_attributes;
+		$wc_product_attributes = array();
+		foreach ( wc_get_attribute_taxonomies() as $tax ) {
+			if ( $name = wc_attribute_taxonomy_name( $tax->attribute_name ) ) {
+				$wc_product_attributes[ $name ] = $tax;
+			}
+		}
+
 		return $return;
 	}
 
@@ -228,8 +295,6 @@ class WC_Helper_Product {
 	 * @param $attribute_id
 	 *
 	 * @since 2.3
-	 *
-	 * @todo clean up all term/taxonomy/etc data
 	 */
 	public static function delete_attribute( $attribute_id ) {
 		global $wpdb;
@@ -239,4 +304,34 @@ class WC_Helper_Product {
 		$wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_attribute_taxonomies WHERE attribute_id = $attribute_id" );
 	}
 
+	/**
+	 * Creates a new product review on a specific product.
+	 *
+	 * @since 3.0
+	 * @param $product_id integer Product ID that the review is for
+	 * @param $revieww_content string Content to use for the product review
+	 * @return integer Product Review ID
+	 */
+	public static function create_product_review( $product_id, $review_content = 'Review content here' ) {
+		$data = array(
+			'comment_post_ID'      => $product_id,
+			'comment_author'       => 'admin',
+			'comment_author_email' => 'woo@woo.local',
+			'comment_author_url'   => '',
+			'comment_date'         => '2016-01-01T11:11:11',
+			'comment_content'      => $review_content,
+			'comment_approved'     => 1,
+			'comment_type'         => 'review',
+		);
+
+		return wp_insert_comment( $data );
+	}
+
+	/**
+	 * A helper function for hooking into save_post during the test_product_meta_save_post test.
+	 * @since 3.0.1
+	 */
+	public static function save_post_test_update_meta_data_direct( $id ) {
+		update_post_meta( $id, '_test2', 'world' );
+	}
 }
diff --git a/tests/framework/helpers/class-wc-helper-settings.php b/tests/framework/helpers/class-wc-helper-settings.php
new file mode 100644
index 00000000000..765c5f78ab5
--- /dev/null
+++ b/tests/framework/helpers/class-wc-helper-settings.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * Class WC_Helper_Settings.
+ *
+ * This helper class should ONLY be used for unit tests!
+ */
+class WC_Helper_Settings {
+
+	/**
+	 * Hooks in some dummy data for testing the settings REST API.
+	 *
+	 * @since 3.0.0
+	 */
+	public static function register() {
+		add_filter( 'woocommerce_settings_groups', array( 'WC_Helper_Settings', 'register_groups' ) );
+		add_filter( 'woocommerce_settings-test', array( 'WC_Helper_Settings', 'register_test_settings' ) );
+	}
+
+	/**
+	 * Registers some example setting groups, including invalid ones that should not show up in JSON responses.
+	 *
+	 * @since 3.0.0
+	 * @param  array $groups
+	 * @return array
+	 */
+	public static function register_groups( $groups ) {
+		$groups[] = array(
+			'id'          => 'test',
+			'bad'         => 'value',
+			'label'       => 'Test extension',
+			'description' => 'My awesome test settings.',
+			'option_key'  => '',
+		);
+		$groups[] = array(
+			'id'          => 'sub-test',
+			'parent_id'   => 'test',
+			'label'       => 'Sub test',
+			'description' => '',
+			'option_key'  => '',
+		);
+		$groups[] = array(
+			'id'    => 'coupon-data',
+			'label' => 'Coupon data',
+			'option_key'  => '',
+		);
+		$groups[] = array(
+			'id' => 'invalid',
+			'option_key'  => '',
+		);
+		return $groups;
+	}
+
+	/**
+	 * Registers some example settings.
+	 *
+	 * @since 3.0.0
+	 * @param  array $settings
+	 * @return array
+	 */
+	public static function register_test_settings( $settings ) {
+		$settings[] = array(
+			'id'          => 'woocommerce_shop_page_display',
+			'label'       => 'Shop page display',
+			'description' => 'This controls what is shown on the product archive.',
+			'default'     => '',
+			'type'        => 'select',
+			'options'     => array(
+				''              => 'Show products',
+				'subcategories' => 'Show categories &amp; subcategories',
+				'both'          => 'Show both',
+			),
+			'option_key'  => 'woocommerce_shop_page_display',
+		);
+		return $settings;
+	}
+}
diff --git a/tests/framework/helpers/class-wc-helper-shipping-zones.php b/tests/framework/helpers/class-wc-helper-shipping-zones.php
new file mode 100644
index 00000000000..ca44c1d9b57
--- /dev/null
+++ b/tests/framework/helpers/class-wc-helper-shipping-zones.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Class WC_Helper_Shipping_Zones.
+ *
+ * This helper class should ONLY be used for unit tests!.
+ */
+class WC_Helper_Shipping_Zones {
+
+	/**
+	 * Create some mock shipping zones to test against
+	 */
+	public static function create_mock_zones() {
+		self::remove_mock_zones();
+
+		// Local zone
+		$zone = new WC_Shipping_Zone();
+		$zone->set_zone_name( 'Local' );
+		$zone->set_zone_order( 1 );
+		$zone->add_location( 'GB', 'country' );
+		$zone->add_location( 'CB*', 'postcode' );
+		$zone->save();
+
+		// Europe zone
+		$zone = new WC_Shipping_Zone();
+		$zone->set_zone_name( 'Europe' );
+		$zone->set_zone_order( 2 );
+		$zone->add_location( 'EU', 'continent' );
+		$zone->save();
+
+		// US california zone
+		$zone = new WC_Shipping_Zone();
+		$zone->set_zone_name( 'California' );
+		$zone->set_zone_order( 3 );
+		$zone->add_location( 'US:CA', 'state' );
+		$zone->save();
+
+		// US zone
+		$zone = new WC_Shipping_Zone();
+		$zone->set_zone_name( 'US' );
+		$zone->set_zone_order( 4 );
+		$zone->add_location( 'US', 'country' );
+		$zone->save();
+	}
+
+	/**
+	 * Remove all zones
+	 */
+	public static function remove_mock_zones() {
+		global $wpdb;
+		$wpdb->query( "TRUNCATE TABLE {$wpdb->prefix}woocommerce_shipping_zone_methods;" );
+		$wpdb->query( "TRUNCATE TABLE {$wpdb->prefix}woocommerce_shipping_zone_locations;" );
+		$wpdb->query( "TRUNCATE TABLE {$wpdb->prefix}woocommerce_shipping_zones;" );
+		WC_Cache_Helper::incr_cache_prefix( 'shipping_zones' );
+	}
+}
diff --git a/tests/framework/helpers/class-wc-helper-shipping.php b/tests/framework/helpers/class-wc-helper-shipping.php
index 8678ff7ebcc..510ad2d3786 100644
--- a/tests/framework/helpers/class-wc-helper-shipping.php
+++ b/tests/framework/helpers/class-wc-helper-shipping.php
@@ -15,15 +15,17 @@ class WC_Helper_Shipping {
 	public static function create_simple_flat_rate() {
 		$flat_rate_settings = array(
 			'enabled'      => 'yes',
-			'title'        => 'Flat Rate',
+			'title'        => 'Flat rate',
 			'availability' => 'all',
 			'countries'    => '',
 			'tax_status'   => 'taxable',
-			'cost'         => '10'
+			'cost'         => '10',
 		);
 
 		update_option( 'woocommerce_flat_rate_settings', $flat_rate_settings );
 		update_option( 'woocommerce_flat_rate', array() );
+		WC_Cache_Helper::get_transient_version( 'shipping', true );
+		WC()->shipping->unregister_shipping_methods();
 	}
 
 	/**
@@ -34,5 +36,7 @@ class WC_Helper_Shipping {
 	public static function delete_simple_flat_rate() {
 		delete_option( 'woocommerce_flat_rate_settings' );
 		delete_option( 'woocommerce_flat_rate' );
+		WC_Cache_Helper::get_transient_version( 'shipping', true );
+		WC()->shipping->unregister_shipping_methods();
 	}
 }
diff --git a/tests/framework/vendor/class-wp-test-spy-rest-server.php b/tests/framework/vendor/class-wp-test-spy-rest-server.php
new file mode 100644
index 00000000000..c7afcb6cb06
--- /dev/null
+++ b/tests/framework/vendor/class-wp-test-spy-rest-server.php
@@ -0,0 +1,42 @@
+<?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * @version 2.0-beta13.1
+ */
+class WP_Test_Spy_REST_Server extends WP_REST_Server {
+	/**
+	 * Get the raw $endpoints data from the server
+	 *
+	 * @return array
+	 */
+	public function get_raw_endpoint_data() {
+		return $this->endpoints;
+	}
+
+	/**
+	 * Allow calling protected methods from tests
+	 *
+	 * @param string $method Method to call
+	 * @param array $args Arguments to pass to the method
+	 * @return mixed
+	 */
+	public function __call( $method, $args ) {
+		return call_user_func_array( array( $this, $method ), $args );
+	}
+
+	/**
+	 * Call dispatch() with the rest_post_dispatch filter
+	 */
+	public function dispatch( $request ) {
+		$result = parent::dispatch( $request );
+		$result = rest_ensure_response( $result );
+		if ( is_wp_error( $result ) ) {
+			$result = $this->error_to_response( $result );
+		}
+		return apply_filters( 'rest_post_dispatch', rest_ensure_response( $result ), $this, $request );
+	}
+}
diff --git a/tests/unit-tests/account/functions.php b/tests/unit-tests/account/functions.php
new file mode 100644
index 00000000000..6a78bd8b3cc
--- /dev/null
+++ b/tests/unit-tests/account/functions.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * Class Functions.
+ * @package WooCommerce\Tests\Account
+ */
+class WC_Tests_Account_Functions extends WC_Unit_Test_Case {
+
+	/**
+	 * Test wc_get_account_menu_items().
+	 *
+	 * @since 2.6.0
+	 */
+	public function test_wc_get_account_menu_items() {
+		$this->assertEquals( array(
+			'dashboard'       => 'Dashboard',
+			'orders'          => 'Orders',
+			'downloads'       => 'Downloads',
+			'edit-address'    => 'Addresses',
+			'edit-account'    => 'Account details',
+			'customer-logout' => 'Logout',
+		), wc_get_account_menu_items() );
+	}
+
+	/**
+	 * Test wc_get_account_orders_columns().
+	 *
+	 * @since 2.6.0
+	 */
+	public function test_wc_get_account_orders_columns() {
+		$this->assertEquals( array(
+			'order-number'  => 'Order',
+			'order-date'    => 'Date',
+			'order-status'  => 'Status',
+			'order-total'   => 'Total',
+			'order-actions' => 'Actions',
+		), wc_get_account_orders_columns() );
+	}
+
+	/**
+	 * Test wc_get_account_downloads_columns().
+	 *
+	 * @since 2.6.0
+	 */
+	public function test_wc_get_account_downloads_columns() {
+		$this->assertEquals( array(
+			'download-file'      => 'File',
+			'download-remaining' => 'Downloads remaining',
+			'download-expires'   => 'Expires',
+			'download-product'   => 'Product',
+		), wc_get_account_downloads_columns() );
+	}
+}
diff --git a/tests/unit-tests/api/coupons.php b/tests/unit-tests/api/coupons.php
new file mode 100644
index 00000000000..aa449d33054
--- /dev/null
+++ b/tests/unit-tests/api/coupons.php
@@ -0,0 +1,446 @@
+<?php
+/**
+ * Coupon API Tests
+ * @package WooCommerce\Tests\API
+ * @since 3.0.0
+ */
+class WC_Tests_API_Coupons extends WC_REST_Unit_Test_Case {
+
+	protected $endpoint;
+
+	/**
+	 * Setup test coupon data.
+	 * @since 3.0.0
+	 */
+	 public function setUp() {
+		parent::setUp();
+		$this->endpoint = new WC_REST_Coupons_Controller();
+		$this->user = $this->factory->user->create( array(
+			'role' => 'administrator',
+		) );
+	}
+
+	/**
+	 * Test route registration.
+	 * @since 3.0.0
+	 */
+	public function test_register_routes() {
+		$routes = $this->server->get_routes();
+		$this->assertArrayHasKey( '/wc/v2/coupons', $routes );
+		$this->assertArrayHasKey( '/wc/v2/coupons/(?P<id>[\d]+)', $routes );
+		$this->assertArrayHasKey( '/wc/v2/coupons/batch', $routes );
+	}
+
+	/**
+	 * Test getting coupons.
+	 * @since 3.0.0
+	 */
+	public function test_get_coupons() {
+		wp_set_current_user( $this->user );
+
+		$coupon_1 = WC_Helper_Coupon::create_coupon( 'dummycoupon-1' );
+		$post_1   = get_post( $coupon_1->get_id() );
+		$coupon_2 = WC_Helper_Coupon::create_coupon( 'dummycoupon-2' );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/coupons' ) );
+		$coupons = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertEquals( 2, count( $coupons ) );
+		$this->assertContains( array(
+			'id'             => $coupon_1->get_id(),
+			'code'           => 'dummycoupon-1',
+			'amount'         => '1.00',
+			'date_created'   => wc_rest_prepare_date_response( $post_1->post_date_gmt, false ),
+			'date_created_gmt'   => wc_rest_prepare_date_response( $post_1->post_date_gmt ),
+			'date_modified'  => wc_rest_prepare_date_response( $post_1->post_modified_gmt, false ),
+			'date_modified_gmt'  => wc_rest_prepare_date_response( $post_1->post_modified_gmt ),
+			'discount_type'  => 'fixed_cart',
+			'description'    => 'This is a dummy coupon',
+			'date_expires'   => '',
+			'date_expires_gmt'   => '',
+			'usage_count'    => 0,
+			'individual_use' => false,
+			'product_ids'    => array(),
+			'excluded_product_ids' => array(),
+			'usage_limit'    => '',
+			'usage_limit_per_user' => '',
+			'limit_usage_to_x_items' => null,
+			'free_shipping' => false,
+			'product_categories' => array(),
+			'excluded_product_categories' => array(),
+			'exclude_sale_items' => false,
+			'minimum_amount' => '0.00',
+			'maximum_amount' => '0.00',
+			'email_restrictions' => array(),
+			'used_by' => array(),
+			'meta_data' => array(),
+			'_links' => array(
+				'self'       => array(
+					array(
+						'href' => rest_url( '/wc/v2/coupons/' . $coupon_1->get_id() ),
+					),
+				),
+				'collection' => array(
+					array(
+						'href' => rest_url( '/wc/v2/coupons' ),
+					),
+				),
+			),
+		), $coupons );
+	}
+
+	/**
+	 * Test getting coupons without valid permissions.
+	 * @since 3.0.0
+	 */
+	public function test_get_coupons_without_permission() {
+		wp_set_current_user( 0 );
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/coupons' ) );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Test getting a single coupon.
+	 * @since 3.0.0
+	 */
+	public function test_get_coupon() {
+		wp_set_current_user( $this->user );
+		$coupon   = WC_Helper_Coupon::create_coupon( 'dummycoupon-1' );
+		$post     = get_post( $coupon->get_id() );
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/coupons/' . $coupon->get_id() ) );
+		$data     = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertEquals( array(
+			'id'             => $coupon->get_id(),
+			'code'           => 'dummycoupon-1',
+			'amount'         => '1.00',
+			'date_created'   => wc_rest_prepare_date_response( $post->post_date_gmt, false ),
+			'date_created_gmt' => wc_rest_prepare_date_response( $post->post_date_gmt ),
+			'date_modified'  => wc_rest_prepare_date_response( $post->post_modified_gmt, false ),
+			'date_modified_gmt' => wc_rest_prepare_date_response( $post->post_modified_gmt ),
+			'discount_type'  => 'fixed_cart',
+			'description'    => 'This is a dummy coupon',
+			'date_expires'    => null,
+			'date_expires_gmt' => null,
+			'usage_count'    => 0,
+			'individual_use' => false,
+			'product_ids'    => array(),
+			'excluded_product_ids' => array(),
+			'usage_limit'    => null,
+			'usage_limit_per_user' => null,
+			'limit_usage_to_x_items' => null,
+			'free_shipping' => false,
+			'product_categories' => array(),
+			'excluded_product_categories' => array(),
+			'exclude_sale_items' => false,
+			'minimum_amount' => '0.00',
+			'maximum_amount' => '0.00',
+			'email_restrictions' => array(),
+			'used_by' => array(),
+			'meta_data' => array(),
+		), $data );
+	}
+
+	/**
+	 * Test getting a single coupon with an invalid ID.
+	 * @since 3.0.0
+	 */
+	public function test_get_coupon_invalid_id() {
+		wp_set_current_user( $this->user );
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/coupons/0' ) );
+		$this->assertEquals( 404, $response->get_status() );
+	}
+
+	/**
+	 * Test getting a single coupon without valid permissions.
+	 * @since 3.0.0
+	 */
+	public function test_get_coupon_without_permission() {
+		wp_set_current_user( 0 );
+		$coupon   = WC_Helper_Coupon::create_coupon( 'dummycoupon-1' );
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/coupons/' . $coupon->get_id() ) );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Test creating a single coupon.
+	 * @since 3.0.0
+	 */
+	public function test_create_coupon() {
+		wp_set_current_user( $this->user );
+		$request = new WP_REST_Request( 'POST', '/wc/v2/coupons' );
+		$request->set_body_params( array(
+			'code'          => 'test',
+			'amount'        => '5.00',
+			'discount_type' => 'fixed_product',
+			'description'   => 'Test',
+			'usage_limit'   => 10,
+		) );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertEquals( 201, $response->get_status() );
+		$this->assertEquals( array(
+			'id'             => $data['id'],
+			'code'           => 'test',
+			'amount'         => '5.00',
+			'date_created'   => $data['date_created'],
+			'date_created_gmt'   => $data['date_created_gmt'],
+			'date_modified'  => $data['date_modified'],
+			'date_modified_gmt'  => $data['date_modified_gmt'],
+			'discount_type'  => 'fixed_product',
+			'description'    => 'Test',
+			'date_expires'    => null,
+			'date_expires_gmt'    => null,
+			'usage_count'    => 0,
+			'individual_use' => false,
+			'product_ids'    => array(),
+			'excluded_product_ids' => array(),
+			'usage_limit'    => 10,
+			'usage_limit_per_user' => null,
+			'limit_usage_to_x_items' => null,
+			'free_shipping' => false,
+			'product_categories' => array(),
+			'excluded_product_categories' => array(),
+			'exclude_sale_items' => false,
+			'minimum_amount' => '0.00',
+			'maximum_amount' => '0.00',
+			'email_restrictions' => array(),
+			'used_by' => array(),
+			'meta_data' => array(),
+		), $data );
+	}
+
+	/**
+	 * Test creating a single coupon with invalid fields.
+	 * @since 3.0.0
+	 */
+	public function test_create_coupon_invalid_fields() {
+		wp_set_current_user( $this->user );
+
+		// test no code...
+		$request = new WP_REST_Request( 'POST', '/wc/v2/coupons' );
+		$request->set_body_params( array(
+			'amount'        => '5.00',
+			'discount_type' => 'fixed_product',
+		) );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertEquals( 400, $response->get_status() );
+	}
+
+	/**
+	 * Test creating a single coupon without valid permissions.
+	 * @since 3.0.0
+	 */
+	public function test_create_coupon_without_permission() {
+		wp_set_current_user( 0 );
+
+		// test no code...
+		$request = new WP_REST_Request( 'POST', '/wc/v2/coupons' );
+		$request->set_body_params( array(
+			'code'          => 'fail',
+			'amount'        => '5.00',
+			'discount_type' => 'fixed_product',
+		) );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Test updating a single coupon.
+	 * @since 3.0.0
+	 */
+	public function test_update_coupon() {
+		wp_set_current_user( $this->user );
+		$coupon   = WC_Helper_Coupon::create_coupon( 'dummycoupon-1' );
+		$post     = get_post( $coupon->get_id() );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/coupons/' . $coupon->get_id() ) );
+		$data     = $response->get_data();
+		$this->assertEquals( 'This is a dummy coupon', $data['description'] );
+		$this->assertEquals( 'fixed_cart', $data['discount_type'] );
+		$this->assertEquals( '1.00', $data['amount'] );
+
+		$request = new WP_REST_Request( 'PUT', '/wc/v2/coupons/' . $coupon->get_id() );
+		$request->set_body_params( array(
+			'amount' => '10.00',
+			'description' => 'New description',
+		) );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertEquals( '10.00', $data['amount'] );
+		$this->assertEquals( 'New description', $data['description'] );
+		$this->assertEquals( 'fixed_cart', $data['discount_type'] );
+	}
+
+	/**
+	 * Test updating a single coupon with an invalid ID.
+	 * @since 3.0.0
+	 */
+	public function test_update_coupon_invalid_id() {
+		wp_set_current_user( $this->user );
+
+		$request = new WP_REST_Request( 'PUT', '/wc/v2/coupons/0' );
+		$request->set_body_params( array(
+			'code'   => 'tester',
+			'amount' => '10.00',
+			'description' => 'New description',
+		) );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertEquals( 400, $response->get_status() );
+	}
+
+	/**
+	 * Test updating a single coupon without valid permissions.
+	 * @since 3.0.0
+	 */
+	public function test_update_coupon_without_permission() {
+		wp_set_current_user( 0 );
+		$coupon   = WC_Helper_Coupon::create_coupon( 'dummycoupon-1' );
+		$post     = get_post( $coupon->get_id() );
+
+		$request = new WP_REST_Request( 'PUT', '/wc/v2/coupons/' . $coupon->get_id() );
+		$request->set_body_params( array(
+			'amount' => '10.00',
+			'description' => 'New description',
+		) );
+		$response = $this->server->dispatch( $request );
+
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Test deleting a single coupon.
+	 * @since 3.0.0
+	 */
+	public function test_delete_coupon() {
+		wp_set_current_user( $this->user );
+		$coupon   = WC_Helper_Coupon::create_coupon( 'dummycoupon-1' );
+		$request = new WP_REST_Request( 'DELETE', '/wc/v2/coupons/' . $coupon->get_id() );
+		$request->set_param( 'force', true );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 200, $response->get_status() );
+	}
+
+	/**
+	 * Test deleting a single coupon with an invalid ID.
+	 * @since 3.0.0
+	 */
+	public function test_delete_coupon_invalid_id() {
+		wp_set_current_user( $this->user );
+		$request = new WP_REST_Request( 'DELETE', '/wc/v2/coupons/0' );
+		$request->set_param( 'force', true );
+		$response = $this->server->dispatch( $request );
+
+		$this->assertEquals( 404, $response->get_status() );
+	}
+
+	/**
+	 * Test deleting a single coupon without valid permissions.
+	 * @since 3.0.0
+	 */
+	public function test_delete_coupon_without_permission() {
+		wp_set_current_user( 0 );
+		$coupon   = WC_Helper_Coupon::create_coupon( 'dummycoupon-1' );
+		$request  = new WP_REST_Request( 'DELETE', '/wc/v2/coupons/' . $coupon->get_id() );
+		$response = $this->server->dispatch( $request );
+
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Test batch operations on coupons.
+	 * @since 3.0.0
+	 */
+	public function test_batch_coupon() {
+		wp_set_current_user( $this->user );
+
+		$coupon_1   = WC_Helper_Coupon::create_coupon( 'dummycoupon-1' );
+		$coupon_2   = WC_Helper_Coupon::create_coupon( 'dummycoupon-2' );
+		$coupon_3   = WC_Helper_Coupon::create_coupon( 'dummycoupon-3' );
+		$coupon_4   = WC_Helper_Coupon::create_coupon( 'dummycoupon-4' );
+
+		$request = new WP_REST_Request( 'POST', '/wc/v2/coupons/batch' );
+		$request->set_body_params( array(
+			'update' => array(
+				array(
+					'id'     => $coupon_1->get_id(),
+					'amount' => '5.15',
+				),
+			),
+			'delete' => array(
+				$coupon_2->get_id(),
+				$coupon_3->get_id(),
+			),
+			'create' => array(
+				array(
+					'code'   => 'new-coupon',
+					'amount' => '11.00',
+				),
+			),
+		) );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertEquals( '5.15', $data['update'][0]['amount'] );
+		$this->assertEquals( '11.00', $data['create'][0]['amount'] );
+		$this->assertEquals( 'new-coupon', $data['create'][0]['code'] );
+		$this->assertEquals( $coupon_2->get_id(), $data['delete'][0]['id'] );
+		$this->assertEquals( $coupon_3->get_id(), $data['delete'][1]['id'] );
+
+		$request = new WP_REST_Request( 'GET', '/wc/v2/coupons' );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertEquals( 3, count( $data ) );
+	}
+
+	/**
+	 * Test coupon schema.
+	 * @since 3.0.0
+	 */
+	public function test_coupon_schema() {
+		wp_set_current_user( $this->user );
+		$request = new WP_REST_Request( 'OPTIONS', '/wc/v2/coupons' );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+		$properties = $data['schema']['properties'];
+
+		$this->assertEquals( 27, count( $properties ) );
+		$this->assertArrayHasKey( 'id', $properties );
+		$this->assertArrayHasKey( 'code', $properties );
+		$this->assertArrayHasKey( 'date_created', $properties );
+		$this->assertArrayHasKey( 'date_created_gmt', $properties );
+		$this->assertArrayHasKey( 'date_modified', $properties );
+		$this->assertArrayHasKey( 'date_modified_gmt', $properties );
+		$this->assertArrayHasKey( 'description', $properties );
+		$this->assertArrayHasKey( 'discount_type', $properties );
+		$this->assertArrayHasKey( 'amount', $properties );
+		$this->assertArrayHasKey( 'date_expires', $properties );
+		$this->assertArrayHasKey( 'date_expires_gmt', $properties );
+		$this->assertArrayHasKey( 'usage_count', $properties );
+		$this->assertArrayHasKey( 'individual_use', $properties );
+		$this->assertArrayHasKey( 'product_ids', $properties );
+		$this->assertArrayHasKey( 'excluded_product_ids', $properties );
+		$this->assertArrayHasKey( 'usage_limit', $properties );
+		$this->assertArrayHasKey( 'usage_limit_per_user', $properties );
+		$this->assertArrayHasKey( 'limit_usage_to_x_items', $properties );
+		$this->assertArrayHasKey( 'free_shipping', $properties );
+		$this->assertArrayHasKey( 'product_categories', $properties );
+		$this->assertArrayHasKey( 'excluded_product_categories', $properties );
+		$this->assertArrayHasKey( 'exclude_sale_items', $properties );
+		$this->assertArrayHasKey( 'minimum_amount', $properties );
+		$this->assertArrayHasKey( 'maximum_amount', $properties );
+		$this->assertArrayHasKey( 'email_restrictions', $properties );
+		$this->assertArrayHasKey( 'used_by', $properties );
+	}
+}
diff --git a/tests/unit-tests/api/customers.php b/tests/unit-tests/api/customers.php
new file mode 100644
index 00000000000..3ad3fab903e
--- /dev/null
+++ b/tests/unit-tests/api/customers.php
@@ -0,0 +1,540 @@
+<?php
+/**
+ * Tests for the Customers REST API.
+ *
+ * @package WooCommerce\Tests\API
+ * @since 3.0.0
+ */
+
+class Customers extends WC_REST_Unit_Test_Case {
+
+	/**
+	 * Setup our test server, endpoints, and user info.
+	 */
+	public function setUp() {
+		parent::setUp();
+		$this->endpoint = new WC_REST_Customers_Controller();
+	}
+
+	/**
+	 * Test route registration.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_register_routes() {
+		$routes = $this->server->get_routes();
+
+		$this->assertArrayHasKey( '/wc/v2/customers', $routes );
+		$this->assertArrayHasKey( '/wc/v2/customers/(?P<id>[\d]+)', $routes );
+		$this->assertArrayHasKey( '/wc/v2/customers/batch', $routes );
+	}
+
+	/**
+	 * Test getting customers.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_customers() {
+		wp_set_current_user( 1 );
+
+		$customer_1 = WC_Helper_Customer::create_customer();
+		WC_Helper_Customer::create_customer( 'test2', 'test2', 'test2@woo.local' );
+
+		$request = new WP_REST_Request( 'GET', '/wc/v2/customers' );
+		$request->set_query_params( array(
+			'orderby' => 'id',
+		) );
+		$response  = $this->server->dispatch( $request );
+		$customers = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertEquals( 2, count( $customers ) );
+
+		$this->assertContains( array(
+			'id'                 => $customer_1->get_id(),
+			'date_created'       => wc_rest_prepare_date_response( $customer_1->get_date_created(), false ),
+			'date_created_gmt'   => wc_rest_prepare_date_response( $customer_1->get_date_created() ),
+			'date_modified'      => wc_rest_prepare_date_response( $customer_1->get_date_modified(), false ),
+			'date_modified_gmt'  => wc_rest_prepare_date_response( $customer_1->get_date_modified() ),
+			'email'              => 'test@woo.local',
+			'first_name'         => 'Justin',
+			'last_name'          => '',
+			'role'               => 'customer',
+			'username'           => 'testcustomer',
+			'billing'            => array(
+				'first_name' => '',
+				'last_name'  => '',
+				'company'    => '',
+				'address_1'  => '123 South Street',
+				'address_2'  => 'Apt 1',
+				'city'       => 'Philadelphia',
+				'state'      => 'PA',
+				'postcode'   => '19123',
+				'country'    => 'US',
+				'email'      => '',
+				'phone'      => '',
+			),
+			'shipping'           => array(
+				'first_name' => '',
+				'last_name'  => '',
+				'company'    => '',
+				'address_1'  => '123 South Street',
+				'address_2'  => 'Apt 1',
+				'city'       => 'Philadelphia',
+				'state'      => 'PA',
+				'postcode'   => '19123',
+				'country'    => 'US',
+			),
+			'is_paying_customer' => false,
+			'orders_count'       => 0,
+			'total_spent'        => '0.00',
+			'avatar_url'         => $customer_1->get_avatar_url(),
+			'meta_data'          => array(),
+			'_links'             => array(
+				'self'       => array(
+					array(
+						'href' => rest_url( '/wc/v2/customers/' . $customer_1->get_id() . '' ),
+					),
+				),
+				'collection' => array(
+					array(
+						'href' => rest_url( '/wc/v2/customers' ),
+					),
+				),
+			),
+		), $customers );
+	}
+
+	/**
+	 * Test getting customers without valid permissions.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_customers_without_permission() {
+		wp_set_current_user( 0 );
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/customers' ) );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Test creating a new customer.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_create_customer() {
+		wp_set_current_user( 1 );
+
+		// Test just the basics first..
+		$request = new WP_REST_Request( 'POST', '/wc/v2/customers' );
+		$request->set_body_params( array(
+			'username' => 'create_customer_test',
+			'password' => 'test123',
+			'email'    => 'create_customer_test@woo.local',
+		) );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertEquals( 201, $response->get_status() );
+		$this->assertEquals( array(
+			'id'                 => $data['id'],
+			'date_created'       => $data['date_created'],
+			'date_created_gmt'   => $data['date_created_gmt'],
+			'date_modified'      => $data['date_modified'],
+			'date_modified_gmt'  => $data['date_modified_gmt'],
+			'email'              => 'create_customer_test@woo.local',
+			'first_name'         => '',
+			'last_name'          => '',
+			'role'               => 'customer',
+			'username'           => 'create_customer_test',
+			'billing'            => array(
+				'first_name' => '',
+				'last_name'  => '',
+				'company'    => '',
+				'address_1'  => '',
+				'address_2'  => '',
+				'city'       => '',
+				'state'      => '',
+				'postcode'   => '',
+				'country'    => '',
+				'email'      => '',
+				'phone'      => '',
+			),
+			'shipping'           => array(
+				'first_name' => '',
+				'last_name'  => '',
+				'company'    => '',
+				'address_1'  => '',
+				'address_2'  => '',
+				'city'       => '',
+				'state'      => '',
+				'postcode'   => '',
+				'country'    => '',
+			),
+			'is_paying_customer' => false,
+			'meta_data'          => array(),
+			'orders_count'       => 0,
+			'total_spent'        => '0.00',
+			'avatar_url'         => $data['avatar_url'],
+		), $data );
+
+		// Test extra data
+		$request = new WP_REST_Request( 'POST', '/wc/v2/customers' );
+		$request->set_body_params( array(
+			'username' => 'create_customer_test2',
+			'password' => 'test123',
+			'email'    => 'create_customer_test2@woo.local',
+			'first_name' => 'Test',
+			'last_name' => 'McTestFace',
+			'billing' => array(
+				'country' => 'US',
+				'state'   => 'WA',
+			),
+			'shipping' => array(
+				'state'   => 'CA',
+				'country' => 'US',
+			),
+		) );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertEquals( 201, $response->get_status() );
+		$this->assertEquals( array(
+			'id'                 => $data['id'],
+			'date_created'       => $data['date_created'],
+			'date_created_gmt'   => $data['date_created_gmt'],
+			'date_modified'      => $data['date_modified'],
+			'date_modified_gmt'  => $data['date_modified_gmt'],
+			'email'              => 'create_customer_test2@woo.local',
+			'first_name'         => 'Test',
+			'last_name'          => 'McTestFace',
+			'role'               => 'customer',
+			'username'           => 'create_customer_test2',
+			'billing'            => array(
+				'first_name' => '',
+				'last_name'  => '',
+				'company'    => '',
+				'address_1'  => '',
+				'address_2'  => '',
+				'city'       => '',
+				'state'      => 'WA',
+				'postcode'   => '',
+				'country'    => 'US',
+				'email'      => '',
+				'phone'      => '',
+			),
+			'shipping'           => array(
+				'first_name' => '',
+				'last_name'  => '',
+				'company'    => '',
+				'address_1'  => '',
+				'address_2'  => '',
+				'city'       => '',
+				'state'      => 'CA',
+				'postcode'   => '',
+				'country'    => 'US',
+			),
+			'is_paying_customer' => false,
+			'meta_data'          => array(),
+			'orders_count'       => 0,
+			'total_spent'        => '0.00',
+			'avatar_url'         => $data['avatar_url'],
+		), $data );
+
+		// Test without required field
+		$request = new WP_REST_Request( 'POST', '/wc/v2/customers' );
+		$request->set_body_params( array(
+			'username' => 'create_customer_test3',
+			'first_name' => 'Test',
+			'last_name' => 'McTestFace',
+		) );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertEquals( 400, $response->get_status() );
+	}
+
+	/**
+	 * Test creating customers without valid permissions.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_create_customer_without_permission() {
+		wp_set_current_user( 0 );
+		$request = new WP_REST_Request( 'POST', '/wc/v2/customers' );
+		$request->set_body_params( array(
+			'username' => 'create_customer_test_without_permission',
+			'password' => 'test123',
+			'email'    => 'create_customer_test_without_permission@woo.local',
+		) );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Test getting a single customer.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_customer() {
+		wp_set_current_user( 1 );
+		$customer = WC_Helper_Customer::create_customer( 'get_customer_test', 'test123', 'get_customer_test@woo.local' );
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/customers/' . $customer->get_id() ) );
+		$data = $response->get_data();
+
+		$this->assertEquals( array(
+			'id'                 => $data['id'],
+			'date_created'       => $data['date_created'],
+			'date_created_gmt'   => $data['date_created_gmt'],
+			'date_modified'      => $data['date_modified'],
+			'date_modified_gmt'  => $data['date_modified_gmt'],
+			'email'              => 'get_customer_test@woo.local',
+			'first_name'         => 'Justin',
+			'billing'            => array(
+				'first_name' => '',
+				'last_name'  => '',
+				'company'    => '',
+				'address_1'  => '123 South Street',
+				'address_2'  => 'Apt 1',
+				'city'       => 'Philadelphia',
+				'state'      => 'PA',
+				'postcode'   => '19123',
+				'country'    => 'US',
+				'email'      => '',
+				'phone'      => '',
+			),
+			'shipping'           => array(
+				'first_name' => '',
+				'last_name'  => '',
+				'company'    => '',
+				'address_1'  => '123 South Street',
+				'address_2'  => 'Apt 1',
+				'city'       => 'Philadelphia',
+				'state'      => 'PA',
+				'postcode'   => '19123',
+				'country'    => 'US',
+			),
+			'is_paying_customer' => false,
+			'meta_data'          => array(),
+			'last_name'          => '',
+			'role'               => 'customer',
+			'username'           => 'get_customer_test',
+			'orders_count'       => 0,
+			'total_spent'        => '0.00',
+			'avatar_url'         => $data['avatar_url'],
+		), $data );
+	}
+
+	/**
+	 * Test getting a single customer without valid permissions.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_customer_without_permission() {
+		wp_set_current_user( 0 );
+		$customer = WC_Helper_Customer::create_customer( 'get_customer_test_without_permission', 'test123', 'get_customer_test_without_permission@woo.local' );
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/customers/' . $customer->get_id() ) );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Test getting a single customer with an invalid ID.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_customer_invalid_id() {
+		wp_set_current_user( 1 );
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/customers/0' ) );
+		$this->assertEquals( 404, $response->get_status() );
+	}
+
+	/**
+	 * Test updating a customer.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_update_customer() {
+		wp_set_current_user( 1 );
+		$customer = WC_Helper_Customer::create_customer( 'update_customer_test', 'test123', 'update_customer_test@woo.local' );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/customers/' . $customer->get_id() ) );
+		$data     = $response->get_data();
+		$this->assertEquals( 'update_customer_test', $data['username'] );
+		$this->assertEquals( 'update_customer_test@woo.local', $data['email'] );
+
+		$request = new WP_REST_Request( 'PUT', '/wc/v2/customers/' . $customer->get_id() );
+		$request->set_body_params( array(
+			'email'      => 'updated_email@woo.local',
+			'first_name' => 'UpdatedTest',
+		) );
+		$response = $this->server->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertEquals( 'updated_email@woo.local', $data['email'] );
+		$this->assertEquals( 'UpdatedTest', $data['first_name'] );
+	}
+
+	/**
+	 * Test updating a customer without valid permissions.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_update_customer_without_permission() {
+		wp_set_current_user( 0 );
+		$customer = WC_Helper_Customer::create_customer( 'update_customer_test_without_permission', 'test123', 'update_customer_test_without_permission@woo.local' );
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/customers/' . $customer->get_id() ) );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Test updating a customer with an invalid ID.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_update_customer_invalid_id() {
+		wp_set_current_user( 1 );
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/customers/0' ) );
+		$this->assertEquals( 404, $response->get_status() );
+	}
+
+
+	/**
+	 * Test deleting a customer.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_delete_customer() {
+		wp_set_current_user( 1 );
+		$customer = WC_Helper_Customer::create_customer( 'delete_customer_test', 'test123', 'delete_customer_test@woo.local' );
+		$request  = new WP_REST_Request( 'DELETE', '/wc/v2/customers/' . $customer->get_id() );
+		$request->set_param( 'force', true );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 200, $response->get_status() );
+	}
+
+	/**
+	 * Test deleting a customer with an invalid ID.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_delete_customer_invalid_id() {
+		wp_set_current_user( 1 );
+		$request  = new WP_REST_Request( 'DELETE', '/wc/v2/customers/0' );
+		$request->set_param( 'force', true );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 400, $response->get_status() );
+	}
+
+	/**
+	 * Test deleting a customer without valid permissions.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_delete_customer_without_permission() {
+		wp_set_current_user( 0 );
+		$customer = WC_Helper_Customer::create_customer( 'delete_customer_test_without_permission', 'test123', 'delete_customer_test_without_permission@woo.local' );
+		$request  = new WP_REST_Request( 'DELETE', '/wc/v2/customers/' . $customer->get_id() );
+		$request->set_param( 'force', true );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Test customer batch endpoint.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_batch_customer() {
+		wp_set_current_user( 1 );
+
+		$customer_1 = WC_Helper_Customer::create_customer( 'test_batch_customer', 'test123', 'test_batch_customer@woo.local' );
+		$customer_2 = WC_Helper_Customer::create_customer( 'test_batch_customer2', 'test123', 'test_batch_customer2@woo.local' );
+		$customer_3 = WC_Helper_Customer::create_customer( 'test_batch_customer3', 'test123', 'test_batch_customer3@woo.local' );
+		$customer_4 = WC_Helper_Customer::create_customer( 'test_batch_customer4', 'test123', 'test_batch_customer4@woo.local' );
+
+		$request = new WP_REST_Request( 'POST', '/wc/v2/customers/batch' );
+		$request->set_body_params( array(
+			'update' => array(
+				array(
+					'id'        => $customer_1->get_id(),
+					'last_name' => 'McTest',
+				),
+			),
+			'delete' => array(
+				$customer_2->get_id(),
+				$customer_3->get_id(),
+			),
+			'create' => array(
+				array(
+					'username' => 'newuser',
+					'password'   => 'test123',
+					'email'  => 'newuser@woo.local',
+				),
+			),
+		) );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertEquals( 'McTest', $data['update'][0]['last_name'] );
+		$this->assertEquals( 'newuser', $data['create'][0]['username'] );
+		$this->assertEmpty( $data['create'][0]['last_name'] );
+		$this->assertEquals( $customer_2->get_id(), $data['delete'][0]['id'] );
+		$this->assertEquals( $customer_3->get_id(), $data['delete'][1]['id'] );
+
+		$request = new WP_REST_Request( 'GET', '/wc/v2/customers' );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertEquals( 3, count( $data ) );
+	}
+
+	/**
+	 * Test customer schema.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_customer_schema() {
+		wp_set_current_user( 1 );
+		$request = new WP_REST_Request( 'OPTIONS', '/wc/v2/customers' );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+		$properties = $data['schema']['properties'];
+
+		$this->assertEquals( 18, count( $properties ) );
+		$this->assertArrayHasKey( 'id', $properties );
+		$this->assertArrayHasKey( 'date_created', $properties );
+		$this->assertArrayHasKey( 'date_created_gmt', $properties );
+		$this->assertArrayHasKey( 'date_modified', $properties );
+		$this->assertArrayHasKey( 'date_modified_gmt', $properties );
+		$this->assertArrayHasKey( 'email', $properties );
+		$this->assertArrayHasKey( 'first_name', $properties );
+		$this->assertArrayHasKey( 'last_name', $properties );
+		$this->assertArrayHasKey( 'role', $properties );
+		$this->assertArrayHasKey( 'username', $properties );
+		$this->assertArrayHasKey( 'password', $properties );
+		$this->assertArrayHasKey( 'orders_count', $properties );
+		$this->assertArrayHasKey( 'total_spent', $properties );
+		$this->assertArrayHasKey( 'avatar_url', $properties );
+		$this->assertArrayHasKey( 'billing', $properties );
+		$this->assertArrayHasKey( 'first_name', $properties['billing']['properties'] );
+		$this->assertArrayHasKey( 'last_name', $properties['billing']['properties'] );
+		$this->assertArrayHasKey( 'company', $properties['billing']['properties'] );
+		$this->assertArrayHasKey( 'address_1', $properties['billing']['properties'] );
+		$this->assertArrayHasKey( 'address_2', $properties['billing']['properties'] );
+		$this->assertArrayHasKey( 'city', $properties['billing']['properties'] );
+		$this->assertArrayHasKey( 'state', $properties['billing']['properties'] );
+		$this->assertArrayHasKey( 'postcode', $properties['billing']['properties'] );
+		$this->assertArrayHasKey( 'country', $properties['billing']['properties'] );
+		$this->assertArrayHasKey( 'email', $properties['billing']['properties'] );
+		$this->assertArrayHasKey( 'phone', $properties['billing']['properties'] );
+		$this->assertArrayHasKey( 'shipping', $properties );
+		$this->assertArrayHasKey( 'first_name', $properties['shipping']['properties'] );
+		$this->assertArrayHasKey( 'last_name', $properties['shipping']['properties'] );
+		$this->assertArrayHasKey( 'company', $properties['shipping']['properties'] );
+		$this->assertArrayHasKey( 'address_1', $properties['shipping']['properties'] );
+		$this->assertArrayHasKey( 'address_2', $properties['shipping']['properties'] );
+		$this->assertArrayHasKey( 'city', $properties['shipping']['properties'] );
+		$this->assertArrayHasKey( 'state', $properties['shipping']['properties'] );
+		$this->assertArrayHasKey( 'postcode', $properties['shipping']['properties'] );
+		$this->assertArrayHasKey( 'country', $properties['shipping']['properties'] );
+	}
+}
diff --git a/tests/unit-tests/api/functions.php b/tests/unit-tests/api/functions.php
new file mode 100644
index 00000000000..b44d8c2177c
--- /dev/null
+++ b/tests/unit-tests/api/functions.php
@@ -0,0 +1,105 @@
+<?php
+
+/**
+ * REST API Functions.
+ * @package WooCommerce\Tests\API
+ * @since 2.6.0
+ */
+class WC_Tests_API_Functions extends WC_Unit_Test_Case {
+
+	/**
+	 * Test wc_rest_prepare_date_response().
+	 *
+	 * @since 2.6.0
+	 */
+	public function test_wc_rest_prepare_date_response() {
+		$this->assertEquals( '2016-06-06T06:06:06', wc_rest_prepare_date_response( '2016-06-06 06:06:06' ) );
+	}
+
+	/**
+	 * Test wc_rest_upload_image_from_url().
+	 *
+	 * @since 2.6.0
+	 */
+	public function test_wc_rest_upload_image_from_url() {
+		// Only test the error, no need to upload images.
+		$this->assertIsWPError( wc_rest_upload_image_from_url( 'thing' ) );
+	}
+
+	/**
+	 * Test wc_rest_set_uploaded_image_as_attachment().
+	 *
+	 * @since 2.6.0
+	 */
+	public function test_wc_rest_set_uploaded_image_as_attachment() {
+		$this->assertInternalType( 'int', wc_rest_set_uploaded_image_as_attachment( array( 'file' => '', 'url' => '' ) ) );
+	}
+
+	/**
+	 * Test wc_rest_validate_reports_request_arg().
+	 *
+	 * @since 2.6.0
+	 */
+	public function test_wc_rest_validate_reports_request_arg() {
+		$request = new WP_REST_Request( 'GET', '/wc/v2/foo', array(
+			'args' => array(
+				'date' => array(
+					'type'   => 'string',
+					'format' => 'date',
+				),
+			),
+		) );
+
+		// Success.
+		$this->assertTrue( wc_rest_validate_reports_request_arg( '2016-06-06', $request, 'date' ) );
+
+		// Error.
+		$error = wc_rest_validate_reports_request_arg( 'foo', $request, 'date' );
+		$this->assertEquals( 'The date you provided is invalid.', $error->get_error_message() );
+	}
+
+	/**
+	 * Test wc_rest_urlencode_rfc3986().
+	 *
+	 * @since 2.6.0
+	 */
+	public function test_wc_rest_urlencode_rfc3986() {
+		$this->assertEquals( 'https%253A%252F%252Fwoocommerce.com%252F', wc_rest_urlencode_rfc3986( 'https://woocommerce.com/' ) );
+	}
+
+	/**
+	 * Test wc_rest_check_post_permissions().
+	 *
+	 * @since 2.6.0
+	 */
+	public function test_wc_rest_check_post_permissions() {
+		$this->isFalse( wc_rest_check_post_permissions( 'shop_order' ) );
+	}
+
+	/**
+	 * Test wc_rest_check_user_permissions().
+	 *
+	 * @since 2.6.0
+	 */
+	public function test_wc_rest_check_user_permissions() {
+		$this->isFalse( wc_rest_check_user_permissions() );
+	}
+
+	/**
+	 * Test wc_rest_check_product_term_permissions().
+	 *
+	 * @since 2.6.0
+	 */
+	public function test_wc_rest_check_product_term_permissions() {
+		$this->isFalse( wc_rest_check_product_term_permissions( 'product_cat' ) );
+	}
+
+	/**
+	 * Test wc_rest_check_manager_permissions().
+	 *
+	 * @since 2.6.0
+	 */
+	public function test_wc_rest_check_manager_permissions() {
+		$this->isFalse( wc_rest_check_manager_permissions( 'reports' ) );
+	}
+}
diff --git a/tests/unit-tests/api/legacy/coupons.php b/tests/unit-tests/api/legacy/coupons.php
new file mode 100644
index 00000000000..beebd3c5a5f
--- /dev/null
+++ b/tests/unit-tests/api/legacy/coupons.php
@@ -0,0 +1,320 @@
+<?php
+/**
+ * Legacy Coupon API Tests
+ * @package WooCommerce\Tests\API
+ * @since 3.0.0
+ */
+class WC_Tests_API_Legacy_Coupons extends WC_API_Unit_Test_Case {
+
+	/** @var WC_API_Coupons instance */
+	protected $endpoint;
+
+	/**
+	 * Setup test coupon data.
+	 * @see WC_API_UnitTestCase::setup()
+	 * @since 3.0.0
+	 */
+	public function setUp() {
+		parent::setUp();
+		$this->endpoint = WC()->api->WC_API_Coupons;
+		$this->coupon   = WC_Helper_Coupon::create_coupon();
+	}
+
+	/**
+	 * Ensure valid coupon data response.
+	 * @since 3.0.0
+	 * @param array $response
+	 * @param WC_Coupon $coupon
+	 */
+	protected function check_get_coupon_response( $response, $coupon ) {
+		$this->assertEquals( (int) $coupon->get_id(), $response['id'] );
+		$this->assertEquals( $coupon->get_code(), $response['code'] );
+		$this->assertEquals( $coupon->get_discount_type(), $response['type'] );
+		$this->assertEquals( $coupon->get_amount(), $response['amount'] );
+		$this->assertEquals( $coupon->get_individual_use(), $response['individual_use'] );
+		$this->assertEquals( $coupon->get_product_ids(), $response['product_ids'] );
+		$this->assertEquals( $coupon->get_excluded_product_ids(), $response['exclude_product_ids'] );
+		$this->assertEquals( (int) $coupon->get_usage_limit(), $response['usage_limit'] );
+		$this->assertEquals( (int) $coupon->get_usage_limit_per_user(), $response['usage_limit_per_user'] );
+		$this->assertEquals( (int) $coupon->get_limit_usage_to_x_items(), $response['limit_usage_to_x_items'] );
+		$this->assertEquals( (int) $coupon->get_usage_count(), $response['usage_count'] );
+		$this->assertEquals( $coupon->get_date_expires(), $response['expiry_date'] );
+		$this->assertEquals( $coupon->get_free_shipping(), $response['enable_free_shipping'] );
+		$this->assertEquals( $coupon->get_product_categories(), $response['product_category_ids'] );
+		$this->assertEquals( $coupon->get_excluded_product_categories(), $response['exclude_product_category_ids'] );
+		$this->assertEquals( $coupon->get_exclude_sale_items(), $response['exclude_sale_items'] );
+		$this->assertEquals( wc_format_decimal( $coupon->get_minimum_amount(), 2 ), $response['minimum_amount'] );
+		$this->assertEquals( wc_format_decimal( $coupon->get_maximum_amount(), 2 ), $response['maximum_amount'] );
+		$this->assertEquals( $coupon->get_email_restrictions(), $response['customer_emails'] );
+		$this->assertEquals( $coupon->get_description(), $response['description'] );
+		$this->assertArrayHasKey( 'created_at', $response );
+		$this->assertArrayHasKey( 'updated_at', $response );
+	}
+
+	/**
+	 * Get default arguments for creating/editing a coupon.
+	 * @since 3.0.0
+	 * @param  array $args
+	 * @return array
+	 */
+	protected function get_defaults( $args = array() ) {
+		$defaults = array(
+			'code'        => 'api-dummycoupon',
+			'description' => 'Test API Coupon',
+			'amount'      => '5',
+			'type'        => 'percent',
+		);
+		return array( 'coupon' => wp_parse_args( $args, $defaults ) );
+	}
+
+	/**
+	 * Clears out the post title from our post data before inserting the coupon into the database.
+	 * @since 3.0.0
+	 * @param  array $data
+	 * @return array
+	 */
+	public function clear_code_from_post_data( $data ) {
+		$data['post_title'] = '';
+		return $data;
+	}
+
+	/**
+	 * Test route registration.
+	 * @since 3.0.0
+	 */
+	public function test_register_routes() {
+		$routes = $this->endpoint->register_routes( array() );
+		$this->assertArrayHasKey( '/coupons', $routes );
+		$this->assertArrayHasKey( '/coupons/count', $routes );
+		$this->assertArrayHasKey( '/coupons/(?P<id>\d+)', $routes );
+		$this->assertArrayHasKey( '/coupons/code/(?P<code>\w[\w\s\-]*)', $routes );
+		$this->assertArrayHasKey( '/coupons/bulk', $routes );
+	}
+
+	/**
+	 * Test GET /coupons/{id}.
+	 * @since 3.0.0
+	 */
+	public function test_get_coupon() {
+		// invalid ID
+		$response = $this->endpoint->get_coupon( 0 );
+		$this->assertHasAPIError( 'woocommerce_api_invalid_coupon_id', 404, $response );
+
+		// valid request
+		$response = $this->endpoint->get_coupon( $this->coupon->get_id() );
+		$this->assertNotWPError( $response );
+		$this->assertArrayHasKey( 'coupon', $response );
+		$this->check_get_coupon_response( $response['coupon'], $this->coupon );
+	}
+
+	/**
+	 * Test GET /coupons/{id} without valid permissions.
+	 * @since 3.0.0
+	 */
+	public function test_get_coupon_without_permission() {
+		$this->disable_capability( 'read_private_shop_coupons' );
+		$response = $this->endpoint->get_coupon( $this->coupon->get_id() );
+		$this->assertHasAPIError( 'woocommerce_api_user_cannot_read_coupon', 401, $response );
+	}
+
+	/**
+	 * Test GET /coupons/code/{code}.
+	 * @since 3.0.0
+	 */
+	public function test_get_get_coupon_by_code() {
+		// invalid ID
+		$response = $this->endpoint->get_coupon_by_code( 'bogus' );
+		$this->assertHasAPIError( 'woocommerce_api_invalid_coupon_code', 404, $response );
+
+		// valid request
+		$response = $this->endpoint->get_coupon_by_code( 'dummycoupon' );
+		$this->assertNotWPError( $response );
+		$this->assertArrayHasKey( 'coupon', $response );
+		$this->check_get_coupon_response( $response['coupon'], $this->coupon );
+	}
+
+	/**
+	 * Test GET /coupons/code/{code} without valid permissions.
+	 * @since 3.0.0
+	 */
+	public function test_get_coupon_by_code_without_permission() {
+		$this->disable_capability( 'read_private_shop_coupons' );
+		$response = $this->endpoint->get_coupon( $this->coupon->get_id() );
+		$this->assertHasAPIError( 'woocommerce_api_user_cannot_read_coupon', 401, $response );
+	}
+
+	/**
+	 * Test GET /coupons.
+	 * @since 3.0.0
+	 */
+	public function test_get_coupons() {
+		$response = $this->endpoint->get_coupons();
+		$this->assertNotWPError( $response );
+		$this->assertArrayHasKey( 'coupons', $response );
+		$this->assertCount( 1, $response['coupons'] );
+		$this->check_get_coupon_response( $response['coupons'][0], $this->coupon );
+	}
+
+	/**
+	 * Test GET /coupons without valid permissions.
+	 * @since 3.0.0
+	 */
+	public function test_get_coupons_without_permission() {
+		$this->disable_capability( 'read_private_shop_coupons' );
+		$response = $this->endpoint->get_coupons();
+		$this->assertArrayHasKey( 'coupons', $response );
+		$this->assertEmpty( $response['coupons'] );
+	}
+
+	/**
+	 * Test GET /coupons/count.
+	 * @since 3.0.0
+	 */
+	public function test_get_coupons_count() {
+		$response = $this->endpoint->get_coupons_count();
+		$this->assertArrayHasKey( 'count', $response );
+		$this->assertEquals( 1, $response['count'] );
+	}
+
+	/**
+	 * Test GET /coupons/count without valid permissions.
+	 * @since 3.0.0
+	 */
+	public function test_get_coupons_count_without_permission() {
+		$this->disable_capability( 'read_private_shop_coupons' );
+		$response = $this->endpoint->get_coupons_count();
+		$this->assertHasAPIError( 'woocommerce_api_user_cannot_read_coupons_count', 401, $response );
+	}
+
+	/**
+	 * Test POST /coupons.
+	 * @since 3.0.0
+	 */
+	public function test_create_coupon() {
+		$response = $this->endpoint->create_coupon( $this->get_defaults() );
+		$this->assertNotWPError( $response );
+		$this->assertArrayHasKey( 'coupon', $response );
+		$this->check_get_coupon_response( $response['coupon'], new WC_Coupon( $response['coupon']['code'] ) );
+	}
+
+	/**
+	 * Test POST /coupons without valid permissions.
+	 * @since 3.0.0
+	 */
+	public function test_create_coupon_without_permission() {
+		$this->disable_capability( 'publish_shop_coupons' );
+		$response = $this->endpoint->create_coupon( $this->get_defaults() );
+		$this->assertHasAPIError( 'woocommerce_api_user_cannot_create_coupon', 401, $response );
+	}
+
+	/**
+	 * Test an empty coupon code for POST /coupons.
+	 * @since 3.0.0
+	 */
+	public function test_create_coupon_empty_code() {
+		$response = $this->endpoint->create_coupon( $this->get_defaults( array( 'code' => null ) ) );
+		$this->assertHasAPIError( 'woocommerce_api_missing_coupon_code', 400, $response );
+	}
+
+	/**
+	 * Test an empty or invalid discount type for POST /coupons.
+	 * @since 3.0.0
+	 */
+	public function test_create_coupon_invalid_discount_type() {
+		// empty
+		$response = $this->endpoint->create_coupon( $this->get_defaults( array( 'type' => null ) ) );
+		$this->assertHasAPIError( 'woocommerce_api_invalid_coupon_type', 400, $response );
+		// invalid
+		$response = $this->endpoint->create_coupon( $this->get_defaults( array( 'type' => 'bogus' ) ) );
+		$this->assertHasAPIError( 'woocommerce_api_invalid_coupon_type', 400, $response );
+	}
+
+	/**
+	 * Test wp_insert_post() failure for POST /coupons.
+	 * @since 3.0.0
+	 */
+	public function test_create_coupon_insert_post_failure() {
+		add_filter( 'wp_insert_post_empty_content', '__return_true' );
+		add_filter( 'wp_insert_post_data', array( $this, 'clear_code_from_post_data' ) );
+		$response = $this->endpoint->create_coupon( $this->get_defaults( array( 'description' => null, 'code' => '' ) ) );
+		$this->assertHasAPIError( 'woocommerce_api_cannot_create_coupon', 400, $response );
+	}
+
+	/**
+	 * Test PUT /coupons/{id}.
+	 * @since 3.0.0
+	 */
+	public function test_edit_coupon() {
+		// invalid ID
+		$response = $this->endpoint->edit_coupon( 0, $this->get_defaults() );
+		$this->assertHasAPIError( 'woocommerce_api_invalid_coupon_id', 404, $response );
+
+		$args = array(
+			'description' => rand_str(),
+			'code'        => rand_str(),
+		);
+
+		// valid request
+		$response = $this->endpoint->edit_coupon( $this->coupon->get_id(), $this->get_defaults( $args ) );
+
+		$this->assertNotWPError( $response );
+		$this->assertArrayHasKey( 'coupon', $response );
+		$this->check_get_coupon_response( $response['coupon'], new WC_Coupon( $response['coupon']['code'] ) );
+	}
+
+	/**
+	 * Test PUT /coupons/{id} without valid permissions.
+	 *
+	 * @since 2.2
+	 */
+	public function test_edit_coupon_without_permission() {
+		$this->disable_capability( 'edit_published_shop_coupons' );
+		$response = $this->endpoint->edit_coupon( $this->coupon->get_id(), $this->get_defaults() );
+		$this->assertHasAPIError( 'woocommerce_api_user_cannot_edit_coupon', 401, $response );
+	}
+
+	/**
+	 * Test DELETE /coupons/{id}.
+	 *
+	 * @since 2.2
+	 */
+	public function test_delete_coupon() {
+		$response = $this->endpoint->delete_coupon( 0 );
+		$this->assertHasAPIError( 'woocommerce_api_invalid_coupon_id', 404, $response );
+
+		$response = $this->endpoint->delete_coupon( $this->coupon->get_id() );
+		$this->assertArrayHasKey( 'message', $response );
+		$this->assertEquals( 'Deleted coupon', $response['message'] );
+	}
+
+	/**
+	 * Test POST /coupons/bulk.
+	 * @since 3.0.0
+	 */
+	public function test_create_coupon_bulk() {
+		$test_coupon_data = $this->get_defaults();
+		$test_coupon_data_2 = $this->get_defaults( array( 'code' => time() ) );
+		$coupons = array( 'coupons' => array( $test_coupon_data['coupon'], $test_coupon_data_2['coupon'] ) );
+		$response = $this->endpoint->bulk( $coupons );
+		$this->assertNotWPError( $response );
+		$this->assertArrayHasKey( 'coupons', $response );
+		$this->assertCount( 2, $response['coupons'] );
+		$this->check_get_coupon_response( $response['coupons'][0], new WC_Coupon( $response['coupons'][0]['code'] ) );
+		$this->check_get_coupon_response( $response['coupons'][1], new WC_Coupon( $response['coupons'][1]['code'] ) );
+	}
+
+	/**
+	 * Test PUT /coupons/bulk.
+	 * @since 3.0.0
+	 */
+	public function test_edit_coupon_bulk() {
+		$coupon_1 = WC_Helper_Coupon::create_coupon( 'dummycoupon-1-' . time() );
+		$test_coupon_data = $this->get_defaults( array( 'description' => rand_str() ) );
+		$test_coupon_data['coupon']['id'] = $coupon_1->get_id();
+		$coupons = array( 'coupons' => array( $test_coupon_data['coupon'] ) );
+		$response = $this->endpoint->bulk( $coupons );
+		$this->assertNotWPError( $response );
+		$this->assertArrayHasKey( 'coupons', $response );
+		$this->check_get_coupon_response( $response['coupons'][0], new WC_Coupon( $response['coupons'][0]['code'] ) );
+	}
+}
diff --git a/tests/unit-tests/api/webhooks.php b/tests/unit-tests/api/legacy/webhooks.php
similarity index 96%
rename from tests/unit-tests/api/webhooks.php
rename to tests/unit-tests/api/legacy/webhooks.php
index d1e2ce1620d..6b7308daaca 100644
--- a/tests/unit-tests/api/webhooks.php
+++ b/tests/unit-tests/api/legacy/webhooks.php
@@ -1,18 +1,16 @@
 <?php
 
-namespace WooCommerce\Tests\API;
-
 /**
  * Class Webhooks.
  * @package WooCommerce\Tests\API
  * @since 2.2
  */
-class Webhooks extends \WC_API_Unit_Test_Case {
+class WC_Tests_API_Webhooks extends WC_API_Unit_Test_Case {
 
-	/** @var \WC_API_Webhooks instance */
+	/** @var WC_API_Webhooks instance */
 	protected $endpoint;
 
-	/** @var \WC_Webhook instance */
+	/** @var WC_Webhook instance */
 	protected $webhook;
 
 	/** @var int webhook delivery (comment) ID */
@@ -441,12 +439,12 @@ class Webhooks extends \WC_API_Unit_Test_Case {
 	 * @since 2.2
 	 * @param $response
 	 */
-	protected function check_create_webhook_response( $response )  {
+	protected function check_create_webhook_response( $response ) {
 
 		$this->assertNotWPError( $response );
 		$this->assertArrayHasKey( 'webhook', $response );
 
-		$this->check_get_webhook_response( $response['webhook'], new \WC_Webhook( $response['webhook']['id'] ) );
+		$this->check_get_webhook_response( $response['webhook'], new WC_Webhook( $response['webhook']['id'] ) );
 	}
 
 	/**
@@ -460,7 +458,7 @@ class Webhooks extends \WC_API_Unit_Test_Case {
 		$this->assertNotWPError( $response );
 		$this->assertArrayHasKey( 'webhook', $response );
 
-		$this->check_get_webhook_response( $response['webhook'], new \WC_Webhook( $response['webhook']['id'] ) );
+		$this->check_get_webhook_response( $response['webhook'], new WC_Webhook( $response['webhook']['id'] ) );
 	}
 
 	/**
@@ -499,5 +497,4 @@ class Webhooks extends \WC_API_Unit_Test_Case {
 
 		$this->assertEquals( $delivery, $response );
 	}
-
 }
diff --git a/tests/unit-tests/api/orders.php b/tests/unit-tests/api/orders.php
index e46d13ee723..b952050930c 100644
--- a/tests/unit-tests/api/orders.php
+++ b/tests/unit-tests/api/orders.php
@@ -1,30 +1,418 @@
 <?php
-
-namespace WooCommerce\Tests\API;
-
 /**
- * Class Functions.
+ * Tests for the orders REST API.
+ *
  * @package WooCommerce\Tests\API
- * @since 2.4
+ * @since 3.0.0
  */
-class Orders extends \WC_API_Unit_Test_Case {
+class WC_Tests_API_Orders extends WC_REST_Unit_Test_Case {
 
 	/**
-	 * Test test_wc_api_order_get_variation_id_returns_correct_id.
-	 *
-	 * @since 2.4
+	 * Array of order to track
+	 * @var array
 	 */
-	public function test_wc_api_order_get_variation_id_returns_correct_id() {
+	protected $orders = array();
+
+	/**
+	 * Setup our test server.
+	 */
+	public function setUp() {
 		parent::setUp();
-		$product    = \WC_Helper_Product::create_variation_product();
-		$orders_api = WC()->api->WC_API_Orders;
-
-		$variation_id = $orders_api->get_variation_id( $product, array( 'size' => 'small' ) );
-		$this->assertSame( ( $product->id + 1 ), $variation_id );
-
-		$variation_id = $orders_api->get_variation_id( $product, array( 'size' => 'large' ) );
-		$this->assertSame( ( $product->id + 2 ), $variation_id );
+		$this->endpoint = new WC_REST_Orders_Controller();
+		$this->user = $this->factory->user->create( array(
+			'role' => 'administrator',
+		) );
 	}
 
+	/**
+	 * Test route registration.
+	 * @since 3.0.0
+	 */
+	public function test_register_routes() {
+		$routes = $this->server->get_routes();
+		$this->assertArrayHasKey( '/wc/v2/orders', $routes );
+		$this->assertArrayHasKey( '/wc/v2/orders/batch', $routes );
+		$this->assertArrayHasKey( '/wc/v2/orders/(?P<id>[\d]+)', $routes );
+	}
 
+	/**
+	 * Cleanup.
+	 */
+	public function stoppit_and_tidyup() {
+		foreach ( $this->orders as $order ) {
+			wp_delete_post( $order->get_id(), true );
+		}
+		$this->orders = array();
+	}
+
+	/**
+	 * Test getting all orders.
+	 * @since 3.0.0
+	 */
+	public function test_get_items() {
+		wp_set_current_user( $this->user );
+
+		// Create 10 orders.
+		for ( $i = 0; $i < 10; $i++ ) {
+			$this->orders[] = WC_Helper_Order::create_order( $this->user );
+		}
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/orders' ) );
+		$orders   = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertEquals( 10, count( $orders ) );
+		$this->stoppit_and_tidyup();
+	}
+
+	/**
+	 * Tests to make sure orders cannot be viewed without valid permissions.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_items_without_permission() {
+		wp_set_current_user( 0 );
+		$this->orders[] = WC_Helper_Order::create_order();
+		$response       = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/orders' ) );
+		$this->assertEquals( 401, $response->get_status() );
+		$this->stoppit_and_tidyup();
+	}
+
+	/**
+	 * Tests getting a single order.
+	 * @since 3.0.0
+	 */
+	public function test_get_item() {
+		wp_set_current_user( $this->user );
+		$order          = WC_Helper_Order::create_order();
+		$this->orders[] = $order;
+		$response       = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/orders/' . $order->get_id() ) );
+		$data           = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertEquals( $order->get_id(), $data['id'] );
+		$this->stoppit_and_tidyup();
+	}
+
+	/**
+	 * Tests getting a single order without the correct permissions.
+	 * @since 3.0.0
+	 */
+	public function test_get_item_without_permission() {
+		wp_set_current_user( 0 );
+		$order          = WC_Helper_Order::create_order();
+		$this->orders[] = $order;
+		$response       = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/orders/' . $order->get_id() ) );
+		$this->assertEquals( 401, $response->get_status() );
+		$this->stoppit_and_tidyup();
+	}
+
+	/**
+	 * Tests getting an order with an invalid ID.
+	 * @since 3.0.0
+	 */
+	public function test_get_item_invalid_id() {
+		wp_set_current_user( $this->user );
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/orders/99999999' ) );
+		$this->assertEquals( 404, $response->get_status() );
+	}
+
+	/**
+	 * Tests creating an order.
+	 * @since 3.0.0
+	 */
+	public function test_create_order() {
+		wp_set_current_user( $this->user );
+		$product = WC_Helper_Product::create_simple_product();
+		$request = new WP_REST_Request( 'POST', '/wc/v2/orders' );
+		$request->set_body_params( array(
+			'payment_method' => 'bacs',
+			'payment_method_title' => 'Direct Bank Transfer',
+			'set_paid' => true,
+			'billing' => array(
+				'first_name' => 'John',
+				'last_name'  => 'Doe',
+				'address_1'  => '969 Market',
+				'address_2'  => '',
+				'city'       => 'San Francisco',
+				'state'      => 'CA',
+				'postcode'   => '94103',
+				'country'    => 'US',
+				'email'      => 'john.doe@example.com',
+				'phone'      => '(555) 555-5555',
+			),
+			'shipping' => array(
+				'first_name' => 'John',
+				'last_name'  => 'Doe',
+				'address_1'  => '969 Market',
+				'address_2'  => '',
+				'city'       => 'San Francisco',
+				'state'      => 'CA',
+				'postcode'   => '94103',
+				'country'    => 'US',
+			),
+			'line_items' => array(
+				array(
+					'product_id' => $product->get_id(),
+					'quantity'   => 2,
+				),
+			),
+			'shipping_lines' => array(
+				array(
+					'method_id'    => 'flat_rate',
+					'method_title' => 'Flat rate',
+					'total'        => 10,
+				),
+			),
+		) );
+		$response = $this->server->dispatch( $request );
+		$data     = $response->get_data();
+		$order    = wc_get_order( $data['id'] );
+		$this->assertEquals( 201, $response->get_status() );
+		$this->assertEquals( $order->get_payment_method(), $data['payment_method'] );
+		$this->assertEquals( $order->get_payment_method_title(), $data['payment_method_title'] );
+		$this->assertEquals( $order->get_billing_first_name(), $data['billing']['first_name'] );
+		$this->assertEquals( $order->get_billing_last_name(), $data['billing']['last_name'] );
+		$this->assertEquals( '', $data['billing']['company'] );
+		$this->assertEquals( $order->get_billing_address_1(), $data['billing']['address_1'] );
+		$this->assertEquals( $order->get_billing_address_2(), $data['billing']['address_2'] );
+		$this->assertEquals( $order->get_billing_city(), $data['billing']['city'] );
+		$this->assertEquals( $order->get_billing_state(), $data['billing']['state'] );
+		$this->assertEquals( $order->get_billing_postcode(), $data['billing']['postcode'] );
+		$this->assertEquals( $order->get_billing_country(), $data['billing']['country'] );
+		$this->assertEquals( $order->get_billing_email(), $data['billing']['email'] );
+		$this->assertEquals( $order->get_billing_phone(), $data['billing']['phone'] );
+		$this->assertEquals( $order->get_shipping_first_name(), $data['shipping']['first_name'] );
+		$this->assertEquals( $order->get_shipping_last_name(), $data['shipping']['last_name'] );
+		$this->assertEquals( '', $data['shipping']['company'] );
+		$this->assertEquals( $order->get_shipping_address_1(), $data['shipping']['address_1'] );
+		$this->assertEquals( $order->get_shipping_address_2(), $data['shipping']['address_2'] );
+		$this->assertEquals( $order->get_shipping_city(), $data['shipping']['city'] );
+		$this->assertEquals( $order->get_shipping_state(), $data['shipping']['state'] );
+		$this->assertEquals( $order->get_shipping_postcode(), $data['shipping']['postcode'] );
+		$this->assertEquals( $order->get_shipping_country(), $data['shipping']['country'] );
+		$this->assertEquals( 1, count( $data['line_items'] ) );
+		$this->assertEquals( 1, count( $data['shipping_lines'] ) );
+
+		wp_delete_post( $product->get_id(), true );
+		wp_delete_post( $data['id'], true );
+	}
+
+	/**
+	 * Tests creating an order without required fields.
+	 * @since 3.0.0
+	 */
+	public function test_create_order_invalid_fields() {
+		wp_set_current_user( $this->user );
+		$product = WC_Helper_Product::create_simple_product();
+
+		// non-existant customer
+		$request = new WP_REST_Request( 'POST', '/wc/v2/orders' );
+		$request->set_body_params( array(
+			'payment_method'       => 'bacs',
+			'payment_method_title' => 'Direct Bank Transfer',
+			'set_paid'             => true,
+			'customer_id'          => 99999,
+			'billing'              => array(
+				'first_name' => 'John',
+				'last_name'  => 'Doe',
+				'address_1'  => '969 Market',
+				'address_2'  => '',
+				'city'       => 'San Francisco',
+				'state'      => 'CA',
+				'postcode'   => '94103',
+				'country'    => 'US',
+				'email'      => 'john.doe@example.com',
+				'phone'      => '(555) 555-5555',
+			),
+			'shipping' => array(
+				'first_name' => 'John',
+				'last_name'  => 'Doe',
+				'address_1'  => '969 Market',
+				'address_2'  => '',
+				'city'       => 'San Francisco',
+				'state'      => 'CA',
+				'postcode'   => '94103',
+				'country'    => 'US',
+			),
+			'line_items' => array(
+				array(
+					'product_id' => $product->get_id(),
+					'quantity'   => 2,
+				),
+			),
+			'shipping_lines' => array(
+				array(
+					'method_id'    => 'flat_rate',
+					'method_title' => 'Flat rate',
+					'total'        => 10,
+				),
+			),
+		) );
+		$response = $this->server->dispatch( $request );
+		$data     = $response->get_data();
+		$this->assertEquals( 400, $response->get_status() );
+		wp_delete_post( $product->get_id(), true );
+	}
+
+	/**
+	 * Tests updating an order.
+	 * @since 3.0.0
+	 */
+	public function test_update_order() {
+		wp_set_current_user( $this->user );
+		$order = WC_Helper_Order::create_order();
+		$request = new WP_REST_Request( 'POST', '/wc/v2/orders/' . $order->get_id() );
+		$request->set_body_params( array(
+			'payment_method' => 'test-update',
+			'billing' => array(
+				'first_name' => 'Fish',
+				'last_name'  => 'Face',
+			),
+		) );
+		$response = $this->server->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertEquals( 'test-update', $data['payment_method'] );
+		$this->assertEquals( 'Fish', $data['billing']['first_name'] );
+		$this->assertEquals( 'Face', $data['billing']['last_name'] );
+
+		wp_delete_post( $order->get_id(), true );
+	}
+
+	/**
+	 * Tests updating an order without the correct permissions.
+	 * @since 3.0.0
+	 */
+	public function test_update_order_without_permission() {
+		wp_set_current_user( 0 );
+		$order = WC_Helper_Order::create_order();
+		$request = new WP_REST_Request( 'POST', '/wc/v2/orders/' . $order->get_id() );
+		$request->set_body_params( array(
+			'payment_method' => 'test-update',
+			'billing' => array(
+				'first_name' => 'Fish',
+				'last_name'  => 'Face',
+			),
+		) );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Tests that updating an order with an invalid id fails.
+	 * @since 3.0.0
+	 */
+	public function test_update_order_invalid_id() {
+		wp_set_current_user( $this->user );
+		$request = new WP_REST_Request( 'POST', '/wc/v2/orders/999999' );
+		$request->set_body_params( array(
+			'payment_method' => 'test-update',
+			'billing' => array(
+				'first_name' => 'Fish',
+				'last_name'  => 'Face',
+			),
+		) );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 400, $response->get_status() );
+	}
+
+	/**
+	 * Test deleting an order.
+	 * @since 3.0.0
+	 */
+	public function test_delete_order() {
+		wp_set_current_user( $this->user );
+		$order    = WC_Helper_Order::create_order();
+		$request  = new WP_REST_Request( 'DELETE', '/wc/v2/orders/' . $order->get_id() );
+		$request->set_param( 'force', true );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertEquals( null, get_post( $order->get_id() ) );
+	}
+
+	/**
+	 * Test deleting an order without permission/creds.
+	 * @since 3.0.0
+	 */
+	public function test_delete_order_without_permission() {
+		wp_set_current_user( 0 );
+		$order    = WC_Helper_Order::create_order();
+		$request  = new WP_REST_Request( 'DELETE', '/wc/v2/orders/' . $order->get_id() );
+		$request->set_param( 'force', true );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 401, $response->get_status() );
+		wp_delete_post( $order->get_id(), true );
+	}
+
+	/**
+	 * Test deleting an order with an invalid id.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_delete_order_invalid_id() {
+		wp_set_current_user( $this->user );
+		$request  = new WP_REST_Request( 'DELETE', '/wc/v2/orders/9999999' );
+		$request->set_param( 'force', true );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 404, $response->get_status() );
+	}
+
+	/**
+	 * Test batch managing product reviews.
+	 */
+	public function test_orders_batch() {
+		wp_set_current_user( $this->user );
+
+		$order1 = WC_Helper_Order::create_order();
+		$order2 = WC_Helper_Order::create_order();
+		$order3 = WC_Helper_Order::create_order();
+
+		$request = new WP_REST_Request( 'POST', '/wc/v2/orders/batch' );
+		$request->set_body_params( array(
+			'update' => array(
+				array(
+					'id'             => $order1->get_id(),
+					'payment_method' => 'updated',
+				),
+			),
+			'delete' => array(
+				$order2->get_id(),
+				$order3->get_id(),
+			),
+		) );
+		$response = $this->server->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertEquals( 'updated', $data['update'][0]['payment_method'] );
+		$this->assertEquals( $order2->get_id(), $data['delete'][0]['id'] );
+		$this->assertEquals( $order3->get_id(), $data['delete'][1]['id'] );
+
+		$request  = new WP_REST_Request( 'GET', '/wc/v2/orders' );
+		$response = $this->server->dispatch( $request );
+		$data     = $response->get_data();
+		$this->assertEquals( 1, count( $data ) );
+
+		wp_delete_post( $order1->get_id(), true );
+		wp_delete_post( $order2->get_id(), true );
+		wp_delete_post( $order3->get_id(), true );
+	}
+
+	/**
+	 * Test the order schema.
+	 * @since 3.0.0
+	 */
+	public function test_order_schema() {
+		wp_set_current_user( $this->user );
+		$order      = WC_Helper_Order::create_order();
+		$request    = new WP_REST_Request( 'OPTIONS', '/wc/v2/orders/' . $order->get_id() );
+		$response   = $this->server->dispatch( $request );
+		$data       = $response->get_data();
+		$properties = $data['schema']['properties'];
+
+		$this->assertEquals( 42, count( $properties ) );
+		$this->assertArrayHasKey( 'id', $properties );
+		wp_delete_post( $order->get_id(), true );
+	}
 }
diff --git a/tests/unit-tests/api/payment-gateways.php b/tests/unit-tests/api/payment-gateways.php
new file mode 100644
index 00000000000..0e21bd8fe14
--- /dev/null
+++ b/tests/unit-tests/api/payment-gateways.php
@@ -0,0 +1,303 @@
+<?php
+/**
+ * Tests for the Payment Gateways REST API.
+ *
+ * @package WooCommerce\Tests\API
+ * @since 3.0.0
+ */
+
+class Payment_Gateways extends WC_REST_Unit_Test_Case {
+
+	/**
+	 * Setup our test server, endpoints, and user info.
+	 */
+	public function setUp() {
+		parent::setUp();
+		$this->endpoint = new WC_REST_Payment_Gateways_Controller();
+		$this->user = $this->factory->user->create( array(
+			'role' => 'administrator',
+		) );
+	}
+
+	/**
+	 * Test route registration.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_register_routes() {
+		$routes = $this->server->get_routes();
+		$this->assertArrayHasKey( '/wc/v2/payment_gateways', $routes );
+		$this->assertArrayHasKey( '/wc/v2/payment_gateways/(?P<id>[\w-]+)', $routes );
+	}
+
+	/**
+	 * Test getting all payment gateways.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_payment_gateways() {
+		wp_set_current_user( $this->user );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/payment_gateways' ) );
+		$gateways = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertContains( array(
+			'id'                 => 'cheque',
+			'title'              => 'Check payments',
+			'description'        => 'Please send a check to Store Name, Store Street, Store Town, Store State / County, Store Postcode.',
+			'order'              => '',
+			'enabled'            => true,
+			'method_title'       => 'Check payments',
+			'method_description' => 'Allows check payments. Why would you take checks in this day and age? Well you probably would not, but it does allow you to make test purchases for testing order emails and the success pages.',
+			'settings'           => array_diff_key( $this->get_settings( 'WC_Gateway_Cheque' ), array( 'enabled' => false, 'description' => false ) ),
+			'_links' => array(
+				'self'       => array(
+					array(
+						'href' => rest_url( '/wc/v2/payment_gateways/cheque' ),
+					),
+				),
+				'collection' => array(
+					array(
+						'href' => rest_url( '/wc/v2/payment_gateways' ),
+					),
+				),
+			),
+		), $gateways );
+	}
+
+	/**
+	 * Tests to make sure payment gateways cannot viewed without valid permissions.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_payment_gateways_without_permission() {
+		wp_set_current_user( 0 );
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/payment_gateways' ) );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Test getting a single payment gateway.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_payment_gateway() {
+		wp_set_current_user( $this->user );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/payment_gateways/paypal' ) );
+		$paypal   = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertEquals( array(
+			'id'                 => 'paypal',
+			'title'              => 'PayPal',
+			'description'        => "Pay via PayPal; you can pay with your credit card if you don't have a PayPal account.",
+			'order'              => '',
+			'enabled'            => true,
+			'method_title'       => 'PayPal',
+			'method_description' => 'PayPal Standard sends customers to PayPal to enter their payment information. PayPal IPN requires fsockopen/cURL support to update order statuses after payment. Check the <a href="http://example.org/wp-admin/admin.php?page=wc-status">system status</a> page for more details.',
+			'settings'           => array_diff_key( $this->get_settings( 'WC_Gateway_Paypal' ), array( 'enabled' => false, 'description' => false ) ),
+		), $paypal );
+	}
+
+	/**
+	 * Test getting a payment gateway without valid permissions.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_payment_gateway_without_permission() {
+		wp_set_current_user( 0 );
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/payment_gateways/paypal' ) );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Test getting a payment gateway with an invalid id.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_payment_gateway_invalid_id() {
+		wp_set_current_user( $this->user );
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/payment_gateways/totally_fake_method' ) );
+		$this->assertEquals( 404, $response->get_status() );
+	}
+
+	/**
+	 * Test updating a single payment gateway.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_update_payment_gateway() {
+		wp_set_current_user( $this->user );
+
+		// Test defaults
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/payment_gateways/paypal' ) );
+		$paypal   = $response->get_data();
+
+		$this->assertEquals( 'PayPal', $paypal['settings']['title']['value'] );
+		$this->assertEquals( 'admin@example.org', $paypal['settings']['email']['value'] );
+		$this->assertEquals( 'no', $paypal['settings']['testmode']['value'] );
+
+		// test updating single setting
+		$request = new WP_REST_Request( 'POST', '/wc/v2/payment_gateways/paypal' );
+		$request->set_body_params( array(
+			'settings' => array(
+				'email' => 'woo@woo.local',
+			),
+		) );
+		$response = $this->server->dispatch( $request );
+		$paypal   = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertEquals( 'PayPal', $paypal['settings']['title']['value'] );
+		$this->assertEquals( 'woo@woo.local', $paypal['settings']['email']['value'] );
+		$this->assertEquals( 'no', $paypal['settings']['testmode']['value'] );
+
+		// test updating multiple settings
+		$request = new WP_REST_Request( 'POST', '/wc/v2/payment_gateways/paypal' );
+		$request->set_body_params( array(
+			'settings' => array(
+				'testmode' => 'yes',
+				'title'    => 'PayPal - New Title',
+			),
+		) );
+		$response = $this->server->dispatch( $request );
+		$paypal   = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertEquals( 'PayPal - New Title', $paypal['settings']['title']['value'] );
+		$this->assertEquals( 'woo@woo.local', $paypal['settings']['email']['value'] );
+		$this->assertEquals( 'yes', $paypal['settings']['testmode']['value'] );
+
+		// Test other parameters, and recheck settings
+		$request = new WP_REST_Request( 'POST', '/wc/v2/payment_gateways/paypal' );
+		$request->set_body_params( array(
+			'enabled' => false,
+			'order'   => 2,
+		) );
+		$response = $this->server->dispatch( $request );
+		$paypal   = $response->get_data();
+
+		$this->assertFalse( $paypal['enabled'] );
+		$this->assertEquals( 2, $paypal['order'] );
+		$this->assertEquals( 'PayPal - New Title', $paypal['settings']['title']['value'] );
+		$this->assertEquals( 'woo@woo.local', $paypal['settings']['email']['value'] );
+		$this->assertEquals( 'yes', $paypal['settings']['testmode']['value'] );
+
+		// test bogus
+		$request = new WP_REST_Request( 'POST', '/wc/v2/payment_gateways/paypal' );
+		$request->set_body_params( array(
+			'settings' => array(
+				'paymentaction' => 'afasfasf',
+			),
+		) );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 400, $response->get_status() );
+
+		$request = new WP_REST_Request( 'POST', '/wc/v2/payment_gateways/paypal' );
+		$request->set_body_params( array(
+			'settings' => array(
+				'paymentaction' => 'authorization',
+			),
+		) );
+		$response = $this->server->dispatch( $request );
+		$paypal   = $response->get_data();
+		$this->assertEquals( 'authorization', $paypal['settings']['paymentaction']['value'] );
+	}
+
+	/**
+	 * Test updating a payment gateway without valid permissions.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_update_payment_gateway_without_permission() {
+		wp_set_current_user( 0 );
+		$request = new WP_REST_Request( 'POST', '/wc/v2/payment_gateways/paypal' );
+		$request->set_body_params( array(
+			'settings' => array(
+				'testmode' => 'yes',
+				'title'    => 'PayPal - New Title',
+			),
+		) );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Test updating a payment gateway with an invalid id.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_update_payment_gateway_invalid_id() {
+		wp_set_current_user( $this->user );
+		$request  = new WP_REST_Request( 'POST', '/wc/v2/payment_gateways/totally_fake_method' );
+		$request->set_body_params( array(
+			'enabled' => true,
+		) );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 404, $response->get_status() );
+	}
+
+	/**
+	 * Test the payment gateway schema.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_payment_gateway_schema() {
+		wp_set_current_user( $this->user );
+
+		$request = new WP_REST_Request( 'OPTIONS', '/wc/v2/payment_gateways' );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+		$properties = $data['schema']['properties'];
+
+		$this->assertEquals( 8, count( $properties ) );
+		$this->assertArrayHasKey( 'id', $properties );
+		$this->assertArrayHasKey( 'title', $properties );
+		$this->assertArrayHasKey( 'description', $properties );
+		$this->assertArrayHasKey( 'order', $properties );
+		$this->assertArrayHasKey( 'enabled', $properties );
+		$this->assertArrayHasKey( 'method_title', $properties );
+		$this->assertArrayHasKey( 'method_description', $properties );
+		$this->assertArrayHasKey( 'settings', $properties );
+	}
+
+	/**
+	 * Loads a particular gateway's settings so we can correctly test API output.
+	 *
+	 * @since 3.0.0
+	 * @param string $gateway_class Name of WC_Payment_Gateway class.
+	 */
+	private function get_settings( $gateway_class ) {
+		$gateway = new $gateway_class;
+		$settings = array();
+		$gateway->init_form_fields();
+		foreach ( $gateway->form_fields as $id => $field ) {
+			// Make sure we at least have a title and type
+			if ( empty( $field['title'] ) || empty( $field['type'] ) ) {
+				continue;
+			}
+			// Ignore 'title' settings/fields -- they are UI only
+			if ( 'title' === $field['type'] ) {
+				continue;
+			}
+			$data = array(
+				'id'          => $id,
+				'label'       => empty( $field['label'] ) ? $field['title'] : $field['label'],
+				'description' => empty( $field['description'] ) ? '' : $field['description'],
+				'type'        => $field['type'],
+				'value'       => $gateway->settings[ $id ],
+				'default'     => empty( $field['default'] ) ? '' : $field['default'],
+				'tip'         => empty( $field['description'] ) ? '' : $field['description'],
+				'placeholder' => empty( $field['placeholder'] ) ? '' : $field['placeholder'],
+			);
+			if ( ! empty( $field['options'] ) ) {
+				$data['options'] = $field['options'];
+			}
+			$settings[ $id ] = $data;
+		}
+		return $settings;
+	}
+
+}
diff --git a/tests/unit-tests/api/product-reviews.php b/tests/unit-tests/api/product-reviews.php
new file mode 100644
index 00000000000..e30d54db6ad
--- /dev/null
+++ b/tests/unit-tests/api/product-reviews.php
@@ -0,0 +1,422 @@
+<?php
+/**
+ * Tests for the product reviews REST API.
+ *
+ * @package WooCommerce\Tests\API
+ * @since 3.0.0
+ */
+
+class Product_Reviews extends WC_REST_Unit_Test_Case {
+
+	/**
+	 * Setup our test server, endpoints, and user info.
+	 */
+	public function setUp() {
+		parent::setUp();
+		$this->endpoint = new WC_REST_Product_Reviews_Controller();
+		$this->user = $this->factory->user->create( array(
+			'role' => 'administrator',
+		) );
+	}
+
+	/**
+	 * Test route registration.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_register_routes() {
+		$routes = $this->server->get_routes();
+		$this->assertArrayHasKey( '/wc/v2/products/(?P<product_id>[\d]+)/reviews', $routes );
+		$this->assertArrayHasKey( '/wc/v2/products/(?P<product_id>[\d]+)/reviews/(?P<id>[\d]+)', $routes );
+	}
+
+	/**
+	 * Test getting all product reviews.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_product_reviews() {
+		wp_set_current_user( $this->user );
+		$product = WC_Helper_Product::create_simple_product();
+		// Create 10 products reviews for the product
+		for ( $i = 0; $i < 10; $i++ ) {
+			$review_id = WC_Helper_Product::create_product_review( $product->get_id() );
+		}
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/products/' . $product->get_id() . '/reviews' ) );
+		$product_reviews = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertEquals( 10, count( $product_reviews ) );
+		$this->assertContains( array(
+			'id'               => $review_id,
+			'date_created'     => $product_reviews[0]['date_created'],
+			'date_created_gmt' => $product_reviews[0]['date_created_gmt'],
+			'review'           => 'Review content here',
+			'rating'           => 0,
+			'name'             => 'admin',
+			'email'            => 'woo@woo.local',
+			'verified'         => false,
+			'_links' => array(
+				'self'       => array(
+					array(
+						'href' => rest_url( '/wc/v2/products/' . $product->get_id() . '/reviews/' . $review_id ),
+					),
+				),
+				'collection' => array(
+					array(
+						'href' => rest_url( '/wc/v2/products/' . $product->get_id() . '/reviews' ),
+					),
+				),
+				'up' => array(
+					array(
+						'href' => rest_url( '/wc/v2/products/' . $product->get_id() ),
+					),
+				),
+			),
+		), $product_reviews );
+	}
+
+	/**
+	 * Tests to make sure product reviews cannot be viewed without valid permissions.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_product_reviews_without_permission() {
+		wp_set_current_user( 0 );
+		$product = WC_Helper_Product::create_simple_product();
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/products/' . $product->get_id() . '/reviews' ) );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Tests to make sure an error is returned when an invalid product is loaded.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_product_reviews_invalid_product() {
+		wp_set_current_user( $this->user );
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/products/0/reviews' ) );
+		$this->assertEquals( 404, $response->get_status() );
+	}
+
+	/**
+	 * Tests getting a single product review.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_product_review() {
+		wp_set_current_user( $this->user );
+		$product = WC_Helper_Product::create_simple_product();
+		$product_review_id = WC_Helper_Product::create_product_review( $product->get_id() );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/products/' . $product->get_id() . '/reviews/' . $product_review_id ) );
+		$data     = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertEquals( array(
+			'id'               => $product_review_id,
+			'date_created'     => $data['date_created'],
+			'date_created_gmt' => $data['date_created_gmt'],
+			'review'           => 'Review content here',
+			'rating'           => 0,
+			'name'             => 'admin',
+			'email'            => 'woo@woo.local',
+			'verified'         => false,
+		), $data );
+	}
+
+	/**
+	 * Tests getting a single product review without the correct permissions.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_product_review_without_permission() {
+		wp_set_current_user( 0 );
+		$product = WC_Helper_Product::create_simple_product();
+		$product_review_id = WC_Helper_Product::create_product_review( $product->get_id() );
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/products/' . $product->get_id() . '/reviews/' . $product_review_id ) );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Tests getting a product review with an invalid ID.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_product_review_invalid_id() {
+		wp_set_current_user( $this->user );
+		$product = WC_Helper_Product::create_simple_product();
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/products/' . $product->get_id() . '/reviews/0' ) );
+		$this->assertEquals( 404, $response->get_status() );
+	}
+
+	/**
+	 * Tests creating a product review.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_create_product_review() {
+		wp_set_current_user( $this->user );
+		$product = WC_Helper_Product::create_simple_product();
+		$request = new WP_REST_Request( 'POST', '/wc/v2/products/' . $product->get_id() . '/reviews' );
+		$request->set_body_params( array(
+			'review' => 'Hello world.',
+			'name'   => 'Admin',
+			'email'  => 'woo@woo.local',
+			'rating' => '5',
+		) );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertEquals( 201, $response->get_status() );
+		$this->assertEquals( array(
+			'id'               => $data['id'],
+			'date_created'     => $data['date_created'],
+			'date_created_gmt' => $data['date_created_gmt'],
+			'review'           => 'Hello world.',
+			'rating'           => 5,
+			'name'             => 'Admin',
+			'email'            => 'woo@woo.local',
+			'verified'         => false,
+		), $data );
+	}
+
+	/**
+	 * Tests creating a product review without required fields.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_create_product_review_invalid_fields() {
+		wp_set_current_user( $this->user );
+		$product = WC_Helper_Product::create_simple_product();
+
+		// missing review
+		$request = new WP_REST_Request( 'POST', '/wc/v2/products/' . $product->get_id() . '/reviews' );
+		$request->set_body_params( array(
+			'name'   => 'Admin',
+			'email'  => 'woo@woo.local',
+		) );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertEquals( 400, $response->get_status() );
+
+		// missing name
+		$request = new WP_REST_Request( 'POST', '/wc/v2/products/' . $product->get_id() . '/reviews' );
+		$request->set_body_params( array(
+			'review' => 'Hello world.',
+			'email'  => 'woo@woo.local',
+		) );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertEquals( 400, $response->get_status() );
+
+		// missing email
+		$request = new WP_REST_Request( 'POST', '/wc/v2/products/' . $product->get_id() . '/reviews' );
+		$request->set_body_params( array(
+			'review' => 'Hello world.',
+			'name'   => 'Admin',
+		) );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertEquals( 400, $response->get_status() );
+	}
+
+	/**
+	 * Tests updating a product review.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_update_product_review() {
+		wp_set_current_user( $this->user );
+		$product = WC_Helper_Product::create_simple_product();
+		$product_review_id = WC_Helper_Product::create_product_review( $product->get_id() );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/products/' . $product->get_id() . '/reviews/' . $product_review_id ) );
+		$data     = $response->get_data();
+		$this->assertEquals( 'Review content here', $data['review'] );
+		$this->assertEquals( 'admin', $data['name'] );
+		$this->assertEquals( 'woo@woo.local', $data['email'] );
+		$this->assertEquals( 0, $data['rating'] );
+
+		$request = new WP_REST_Request( 'PUT', '/wc/v2/products/' . $product->get_id() . '/reviews/' . $product_review_id );
+		$request->set_body_params( array(
+			'review' => 'Hello world - updated.',
+			'name'   => 'Justin',
+			'email'  => 'woo2@woo.local',
+			'rating' => 3,
+		) );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+		$this->assertEquals( 'Hello world - updated.', $data['review'] );
+		$this->assertEquals( 'Justin', $data['name'] );
+		$this->assertEquals( 'woo2@woo.local', $data['email'] );
+		$this->assertEquals( 3, $data['rating'] );
+	}
+
+	/**
+	 * Tests updating a product review without the correct permissions.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_update_product_review_without_permission() {
+		wp_set_current_user( 0 );
+		$product = WC_Helper_Product::create_simple_product();
+		$product_review_id = WC_Helper_Product::create_product_review( $product->get_id() );
+
+		$request = new WP_REST_Request( 'PUT', '/wc/v2/products/' . $product->get_id() . '/reviews/' . $product_review_id );
+		$request->set_body_params( array(
+			'review' => 'Hello world.',
+			'name'   => 'Admin',
+			'email'  => 'woo@woo.dev',
+		) );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Tests that updating a product review with an invalid id fails.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_update_product_review_invalid_id() {
+		wp_set_current_user( $this->user );
+		$product = WC_Helper_Product::create_simple_product();
+
+		$request = new WP_REST_Request( 'PUT', '/wc/v2/products/' . $product->get_id() . '/reviews/0' );
+		$request->set_body_params( array(
+			'review' => 'Hello world.',
+			'name'   => 'Admin',
+			'email'  => 'woo@woo.dev',
+		) );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertEquals( 404, $response->get_status() );
+	}
+
+	/**
+	 * Test deleting a product review.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_delete_product_review() {
+		wp_set_current_user( $this->user );
+		$product = WC_Helper_Product::create_simple_product();
+		$product_review_id = WC_Helper_Product::create_product_review( $product->get_id() );
+
+		$request = new WP_REST_Request( 'DELETE', '/wc/v2/products/' . $product->get_id() . '/reviews/' . $product_review_id );
+		$request->set_param( 'force', true );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 200, $response->get_status() );
+	}
+
+	/**
+	 * Test deleting a product review without permission/creds.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_delete_product_without_permission() {
+		wp_set_current_user( 0 );
+		$product = WC_Helper_Product::create_simple_product();
+		$product_review_id = WC_Helper_Product::create_product_review( $product->get_id() );
+
+		$request = new WP_REST_Request( 'DELETE', '/wc/v2/products/' . $product->get_id() . '/reviews/' . $product_review_id );
+		$response = $this->server->dispatch( $request );
+
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Test deleting a product review with an invalid id.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_delete_product_review_invalid_id() {
+		wp_set_current_user( $this->user );
+		$product = WC_Helper_Product::create_simple_product();
+		$product_review_id = WC_Helper_Product::create_product_review( $product->get_id() );
+
+		$request = new WP_REST_Request( 'DELETE', '/wc/v2/products/' . $product->get_id() . '/reviews/0' );
+		$request->set_param( 'force', true );
+		$response = $this->server->dispatch( $request );
+
+		$this->assertEquals( 404, $response->get_status() );
+	}
+
+	/**
+	 * Test batch managing product reviews.
+	 */
+	public function test_product_reviews_batch() {
+		wp_set_current_user( $this->user );
+		$product = WC_Helper_Product::create_simple_product();
+
+		$review_1_id = WC_Helper_Product::create_product_review( $product->get_id() );
+		$review_2_id = WC_Helper_Product::create_product_review( $product->get_id() );
+		$review_3_id = WC_Helper_Product::create_product_review( $product->get_id() );
+		$review_4_id = WC_Helper_Product::create_product_review( $product->get_id() );
+
+		$request = new WP_REST_Request( 'POST', '/wc/v2/products/' . $product->get_id() . '/reviews/batch' );
+		$request->set_body_params( array(
+			'update' => array(
+				array(
+					'id'     => $review_1_id,
+					'review' => 'Updated review.',
+				),
+			),
+			'delete' => array(
+				$review_2_id,
+				$review_3_id,
+			),
+			'create' => array(
+				array(
+					'review' => 'New review.',
+					'name'   => 'Justin',
+					'email'  => 'woo3@woo.local',
+				),
+			),
+		) );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertEquals( 'Updated review.', $data['update'][0]['review'] );
+		$this->assertEquals( 'New review.', $data['create'][0]['review'] );
+		$this->assertEquals( $review_2_id, $data['delete'][0]['id'] );
+		$this->assertEquals( $review_3_id, $data['delete'][1]['id'] );
+
+		$request = new WP_REST_Request( 'GET', '/wc/v2/products/' . $product->get_id() . '/reviews' );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertEquals( 3, count( $data ) );
+	}
+
+	/**
+	 * Test the product review schema.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_product_review_schema() {
+		wp_set_current_user( $this->user );
+		$product = WC_Helper_Product::create_simple_product();
+		$request = new WP_REST_Request( 'OPTIONS', '/wc/v2/products/' . $product->get_id() . '/reviews' );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+		$properties = $data['schema']['properties'];
+
+		$this->assertEquals( 8, count( $properties ) );
+		$this->assertArrayHasKey( 'id', $properties );
+		$this->assertArrayHasKey( 'review', $properties );
+		$this->assertArrayHasKey( 'date_created', $properties );
+		$this->assertArrayHasKey( 'date_created_gmt', $properties );
+		$this->assertArrayHasKey( 'rating', $properties );
+		$this->assertArrayHasKey( 'name', $properties );
+		$this->assertArrayHasKey( 'email', $properties );
+		$this->assertArrayHasKey( 'verified', $properties );
+	}
+}
diff --git a/tests/unit-tests/api/product-variations.php b/tests/unit-tests/api/product-variations.php
new file mode 100644
index 00000000000..579f6f0aa92
--- /dev/null
+++ b/tests/unit-tests/api/product-variations.php
@@ -0,0 +1,385 @@
+<?php
+/**
+ * Tests for Variations API.
+ *
+ * @package WooCommerce\Tests\API
+ * @since 3.0.0
+ */
+
+class Product_Variations_API extends WC_REST_Unit_Test_Case {
+
+	/**
+	 * Setup our test server, endpoints, and user info.
+	 */
+	public function setUp() {
+		parent::setUp();
+		$this->endpoint = new WC_REST_Product_Variations_Controller();
+		$this->user = $this->factory->user->create( array(
+			'role' => 'administrator',
+		) );
+	}
+
+	/**
+	 * Test route registration.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_register_routes() {
+		$routes = $this->server->get_routes();
+		$this->assertArrayHasKey( '/wc/v2/products/(?P<product_id>[\d]+)/variations', $routes );
+		$this->assertArrayHasKey( '/wc/v2/products/(?P<product_id>[\d]+)/variations/(?P<id>[\d]+)', $routes );
+		$this->assertArrayHasKey( '/wc/v2/products/(?P<product_id>[\d]+)/variations/batch', $routes );
+	}
+
+	/**
+	 * Test getting variations.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_variations() {
+		wp_set_current_user( $this->user );
+		$product    = WC_Helper_Product::create_variation_product();
+		$response   = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/products/' . $product->get_id() . '/variations' ) );
+		$variations = $response->get_data();
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertEquals( 2, count( $variations ) );
+		$this->assertEquals( 'DUMMY SKU VARIABLE LARGE', $variations[0]['sku'] );
+		$this->assertEquals( 'size', $variations[0]['attributes'][0]['name'] );
+		$product->delete( true );
+	}
+
+	/**
+	 * Test getting variations without permission.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_variations_without_permission() {
+		wp_set_current_user( 0 );
+		$product    = WC_Helper_Product::create_variation_product();
+		$response   = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/products/' . $product->get_id() . '/variations' ) );
+		$this->assertEquals( 401, $response->get_status() );
+		$product->delete( true );
+	}
+
+	/**
+	 * Test getting a single variation.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_variation() {
+		wp_set_current_user( $this->user );
+		$product      = WC_Helper_Product::create_variation_product();
+		$children     = $product->get_children();
+		$variation_id = $children[0];
+
+		$response   = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/products/' . $product->get_id() . '/variations/' . $variation_id ) );
+		$variation  = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertEquals( $variation_id, $variation['id'] );
+		$this->assertEquals( 'size', $variation['attributes'][0]['name'] );
+		$product->delete( true );
+	}
+
+	/**
+	 * Test getting single variation without permission.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_variation_without_permission() {
+		wp_set_current_user( 0 );
+		$product      = WC_Helper_Product::create_variation_product();
+		$children     = $product->get_children();
+		$variation_id = $children[0];
+		$response   = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/products/' . $product->get_id() . '/variations/' . $variation_id ) );
+		$this->assertEquals( 401, $response->get_status() );
+		$product->delete( true );
+	}
+
+	/**
+	 * Test deleting a single variation.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_delete_variation() {
+		wp_set_current_user( $this->user );
+		$product      = WC_Helper_Product::create_variation_product();
+		$children     = $product->get_children();
+		$variation_id = $children[0];
+
+		$request = new WP_REST_Request( 'DELETE', '/wc/v2/products/' . $product->get_id() . '/variations/' . $variation_id );
+		$request->set_param( 'force', true );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 200, $response->get_status() );
+
+		$response   = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/products/' . $product->get_id() . '/variations' ) );
+		$variations = $response->get_data();
+		$this->assertEquals( 1, count( $variations ) );
+		$product->delete( true );
+	}
+
+	/**
+	 * Test deleting a single variation without permission.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_delete_variation_without_permission() {
+		wp_set_current_user( 0 );
+		$product      = WC_Helper_Product::create_variation_product();
+		$children     = $product->get_children();
+		$variation_id = $children[0];
+
+		$request = new WP_REST_Request( 'DELETE', '/wc/v2/products/' . $product->get_id() . '/variations/' . $variation_id );
+		$request->set_param( 'force', true );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 401, $response->get_status() );
+		$product->delete( true );
+	}
+
+	/**
+	 * Test deleting a single variation with an invalid ID.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_delete_variation_with_invalid_id() {
+		wp_set_current_user( 0 );
+		$product = WC_Helper_Product::create_variation_product();
+		$request = new WP_REST_Request( 'DELETE', '/wc/v2/products/' . $product->get_id() . '/variations/0' );
+		$request->set_param( 'force', true );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 404, $response->get_status() );
+		$product->delete( true );
+	}
+
+	/**
+	 * Test editing a single variation.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_update_variation() {
+		wp_set_current_user( $this->user );
+		$product      = WC_Helper_Product::create_variation_product();
+		$children     = $product->get_children();
+		$variation_id = $children[0];
+
+		$response  = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/products/' . $product->get_id() . '/variations/' . $variation_id ) );
+		$variation = $response->get_data();
+
+		$this->assertEquals( 'DUMMY SKU VARIABLE SMALL', $variation['sku'] );
+		$this->assertEquals( 10, $variation['regular_price'] );
+		$this->assertEmpty( $variation['sale_price'] );
+		$this->assertEquals( 'small', $variation['attributes'][0]['option'] );
+
+		$request = new WP_REST_Request( 'PUT', '/wc/v2/products/' . $product->get_id() . '/variations/' . $variation_id );
+		$request->set_body_params( array(
+			'sku'         => 'FIXED-SKU',
+			'sale_price'  => '8',
+			'description' => 'O_O',
+			'image'       => array( 'position' => 0, 'src' => 'https://cldup.com/Dr1Bczxq4q.png', 'alt' => 'test upload image' ),
+			'attributes'  => array( array( 'name' => 'pa_size', 'option' => 'medium' ) ),
+		) );
+		$response  = $this->server->dispatch( $request );
+		$variation = $response->get_data();
+
+		$this->assertContains( 'O_O', $variation['description'] );
+		$this->assertEquals( '8', $variation['price'] );
+		$this->assertEquals( '8', $variation['sale_price'] );
+		$this->assertEquals( '10', $variation['regular_price'] );
+		$this->assertEquals( 'FIXED-SKU', $variation['sku'] );
+		$this->assertEquals( 'medium', $variation['attributes'][0]['option'] );
+		$this->assertContains( 'Dr1Bczxq4q', $variation['image']['src'] );
+		$this->assertContains( 'test upload image', $variation['image']['alt'] );
+		$product->delete( true );
+	}
+
+	/**
+	 * Test updating a single variation without permission.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_update_variation_without_permission() {
+		wp_set_current_user( 0 );
+		$product      = WC_Helper_Product::create_variation_product();
+		$children     = $product->get_children();
+		$variation_id = $children[0];
+
+		$request = new WP_REST_Request( 'PUT', '/wc/v2/products/' . $product->get_id() . '/variations/' . $variation_id );
+		$request->set_body_params( array(
+			'sku'         => 'FIXED-SKU-NO-PERMISSION',
+		) );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 401, $response->get_status() );
+		$product->delete( true );
+	}
+
+	/**
+	 * Test updating a single variation with an invalid ID.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_update_variation_with_invalid_id() {
+		wp_set_current_user( $this->user );
+		$product = WC_Helper_Product::create_variation_product();
+		$request = new WP_REST_Request( 'PUT', '/wc/v2/products/' . $product->get_id() . '/variations/0' );
+		$request->set_body_params( array(
+			'sku'         => 'FIXED-SKU-NO-PERMISSION',
+		) );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 400, $response->get_status() );
+		$product->delete( true );
+	}
+
+	/**
+	 * Test creating a single variation.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_create_variation() {
+		wp_set_current_user( $this->user );
+		$product = WC_Helper_Product::create_variation_product();
+
+		$response   = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/products/' . $product->get_id() . '/variations' ) );
+		$variations = $response->get_data();
+		$this->assertEquals( 2, count( $variations ) );
+
+		$request = new WP_REST_Request( 'POST', '/wc/v2/products/' . $product->get_id() . '/variations' );
+		$request->set_body_params( array(
+			'sku'            => 'DUMMY SKU VARIABLE MEDIUM',
+			'regular_price'  => '12',
+			'description'    => 'A medium size.',
+			'attributes'     => array( array( 'name' => 'pa_size', 'option' => 'medium' ) ),
+		) );
+		$response  = $this->server->dispatch( $request );
+		$variation = $response->get_data();
+
+		$this->assertContains( 'A medium size.', $variation['description'] );
+		$this->assertEquals( '12', $variation['price'] );
+		$this->assertEquals( '12', $variation['regular_price'] );
+		$this->assertTrue( $variation['purchasable'] );
+		$this->assertEquals( 'DUMMY SKU VARIABLE MEDIUM', $variation['sku'] );
+		$this->assertEquals( 'medium', $variation['attributes'][0]['option'] );
+
+		$response   = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/products/' . $product->get_id() . '/variations' ) );
+		$variations = $response->get_data();
+		$this->assertEquals( 3, count( $variations ) );
+		$product->delete( true );
+	}
+
+	/**
+	 * Test creating a single variation without permission.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_create_variation_without_permission() {
+		wp_set_current_user( 0 );
+		$product      = WC_Helper_Product::create_variation_product();
+
+		$request = new WP_REST_Request( 'POST', '/wc/v2/products/' . $product->get_id() . '/variations' );
+		$request->set_body_params( array(
+			'sku'            => 'DUMMY SKU VARIABLE MEDIUM',
+			'regular_price'  => '12',
+			'description'    => 'A medium size.',
+			'attributes'     => array( array( 'name' => 'pa_size', 'option' => 'medium' ) ),
+		) );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 401, $response->get_status() );
+		$product->delete( true );
+	}
+
+	/**
+	 * Test batch managing product variations.
+	 */
+	public function test_product_variations_batch() {
+		wp_set_current_user( $this->user );
+		$product  = WC_Helper_Product::create_variation_product();
+		$children = $product->get_children();
+		$request  = new WP_REST_Request( 'POST', '/wc/v2/products/' . $product->get_id() . '/variations/batch' );
+		$request->set_body_params( array(
+			'update' => array(
+				array(
+					'id'          => $children[0],
+					'description' => 'Updated description.',
+					'image'       => array( 'position' => 0, 'src' => 'https://cldup.com/Dr1Bczxq4q.png', 'alt' => 'test upload image' ),
+				),
+			),
+			'delete' => array(
+				$children[1],
+			),
+			'create' => array(
+				array(
+					'sku'            => 'DUMMY SKU VARIABLE MEDIUM',
+					'regular_price'  => '12',
+					'description'    => 'A medium size.',
+					'attributes'     => array( array( 'name' => 'pa_size', 'option' => 'medium' ) ),
+				),
+			),
+		) );
+		$response = $this->server->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertContains( 'Updated description.', $data['update'][0]['description'] );
+		$this->assertEquals( 'DUMMY SKU VARIABLE MEDIUM', $data['create'][0]['sku'] );
+		$this->assertEquals( 'medium', $data['create'][0]['attributes'][0]['option'] );
+		$this->assertEquals( $children[1], $data['delete'][0]['id'] );
+
+		$request = new WP_REST_Request( 'GET', '/wc/v2/products/' . $product->get_id() . '/variations' );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertEquals( 2, count( $data ) );
+		$product->delete( true );
+	}
+
+	/**
+	 * Test variation schema.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_variation_schema() {
+		wp_set_current_user( $this->user );
+		$product = WC_Helper_Product::create_simple_product();
+		$request = new WP_REST_Request( 'OPTIONS', '/wc/v2/products/' . $product->get_id() . '/variations' );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+		$properties = $data['schema']['properties'];
+
+		$this->assertEquals( 37, count( $properties ) );
+		$this->assertArrayHasKey( 'id', $properties );
+		$this->assertArrayHasKey( 'date_created', $properties );
+		$this->assertArrayHasKey( 'date_modified', $properties );
+		$this->assertArrayHasKey( 'description', $properties );
+		$this->assertArrayHasKey( 'permalink', $properties );
+		$this->assertArrayHasKey( 'sku', $properties );
+		$this->assertArrayHasKey( 'price', $properties );
+		$this->assertArrayHasKey( 'regular_price', $properties );
+		$this->assertArrayHasKey( 'sale_price', $properties );
+		$this->assertArrayHasKey( 'date_on_sale_from', $properties );
+		$this->assertArrayHasKey( 'date_on_sale_to', $properties );
+		$this->assertArrayHasKey( 'on_sale', $properties );
+		$this->assertArrayHasKey( 'visible', $properties );
+		$this->assertArrayHasKey( 'purchasable', $properties );
+		$this->assertArrayHasKey( 'virtual', $properties );
+		$this->assertArrayHasKey( 'downloadable', $properties );
+		$this->assertArrayHasKey( 'downloads', $properties );
+		$this->assertArrayHasKey( 'download_limit', $properties );
+		$this->assertArrayHasKey( 'download_expiry', $properties );
+		$this->assertArrayHasKey( 'tax_status', $properties );
+		$this->assertArrayHasKey( 'tax_class', $properties );
+		$this->assertArrayHasKey( 'manage_stock', $properties );
+		$this->assertArrayHasKey( 'stock_quantity', $properties );
+		$this->assertArrayHasKey( 'in_stock', $properties );
+		$this->assertArrayHasKey( 'backorders', $properties );
+		$this->assertArrayHasKey( 'backorders_allowed', $properties );
+		$this->assertArrayHasKey( 'backordered', $properties );
+		$this->assertArrayHasKey( 'weight', $properties );
+		$this->assertArrayHasKey( 'dimensions', $properties );
+		$this->assertArrayHasKey( 'shipping_class', $properties );
+		$this->assertArrayHasKey( 'shipping_class_id', $properties );
+		$this->assertArrayHasKey( 'image', $properties );
+		$this->assertArrayHasKey( 'attributes', $properties );
+		$this->assertArrayHasKey( 'menu_order', $properties );
+		$this->assertArrayHasKey( 'meta_data', $properties );
+		$product->delete( true );
+	}
+
+}
diff --git a/tests/unit-tests/api/products.php b/tests/unit-tests/api/products.php
new file mode 100644
index 00000000000..8c55e333db0
--- /dev/null
+++ b/tests/unit-tests/api/products.php
@@ -0,0 +1,484 @@
+<?php
+/**
+ * Tests for Products API.
+ *
+ * @package WooCommerce\Tests\API
+ * @since 3.0.0
+ */
+
+class Products_API extends WC_REST_Unit_Test_Case {
+
+	/**
+	 * Setup our test server, endpoints, and user info.
+	 */
+	public function setUp() {
+		parent::setUp();
+		$this->endpoint = new WC_REST_Products_Controller();
+		$this->user     = $this->factory->user->create( array(
+			'role' => 'administrator',
+		) );
+	}
+
+	/**
+	 * Test route registration.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_register_routes() {
+		$routes = $this->server->get_routes();
+		$this->assertArrayHasKey( '/wc/v2/products', $routes );
+		$this->assertArrayHasKey( '/wc/v2/products/(?P<id>[\d]+)', $routes );
+		$this->assertArrayHasKey( '/wc/v2/products/batch', $routes );
+	}
+
+	/**
+	 * Test getting products.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_products() {
+		wp_set_current_user( $this->user );
+		WC_Helper_Product::create_external_product();
+		sleep( 1 ); // So both proudcts have different timestamps.
+		WC_Helper_Product::create_simple_product();
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/products' ) );
+		$products = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status() );
+
+		$this->assertEquals( 2, count( $products ) );
+		$this->assertEquals( 'Dummy Product', $products[0]['name'] );
+		$this->assertEquals( 'DUMMY SKU', $products[0]['sku'] );
+		$this->assertEquals( 'Dummy External Product', $products[1]['name'] );
+		$this->assertEquals( 'DUMMY EXTERNAL SKU', $products[1]['sku'] );
+	}
+
+	/**
+	 * Test getting products without permission.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_products_without_permission() {
+		wp_set_current_user( 0 );
+		WC_Helper_Product::create_simple_product();
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/products' ) );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Test getting a single product.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_product() {
+		wp_set_current_user( $this->user );
+		$simple   = WC_Helper_Product::create_external_product();
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/products/' . $simple->get_id() ) );
+		$product  = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertContains( array(
+			'id'            => $simple->get_id(),
+			'name'          => 'Dummy External Product',
+			'type'          => 'simple',
+			'status'        => 'publish',
+			'sku'           => 'DUMMY EXTERNAL SKU',
+			'regular_price' => 10,
+		), $product );
+	}
+
+	/**
+	 * Test getting single product without permission.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_product_without_permission() {
+		wp_set_current_user( 0 );
+		$product  = WC_Helper_Product::create_simple_product();
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/products/' . $product->get_id() ) );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Test deleting a single product.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_delete_product() {
+		wp_set_current_user( $this->user );
+		$product = WC_Helper_Product::create_simple_product();
+
+		$request = new WP_REST_Request( 'DELETE', '/wc/v2/products/' . $product->get_id() );
+		$request->set_param( 'force', true );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 200, $response->get_status() );
+
+		$response   = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/products' ) );
+		$variations = $response->get_data();
+		$this->assertEquals( 0, count( $variations ) );
+	}
+
+	/**
+	 * Test deleting a single product without permission.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_delete_product_without_permission() {
+		wp_set_current_user( 0 );
+		$product = WC_Helper_Product::create_simple_product();
+		$request = new WP_REST_Request( 'DELETE', '/wc/v2/products/' . $product->get_id() );
+		$request->set_param( 'force', true );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Test deleting a single product with an invalid ID.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_delete_product_with_invalid_id() {
+		wp_set_current_user( 0 );
+		$request = new WP_REST_Request( 'DELETE', '/wc/v2/products/0' );
+		$request->set_param( 'force', true );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 404, $response->get_status() );
+	}
+
+	/**
+	 * Test editing a single product. Tests multiple product types.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_update_product() {
+		wp_set_current_user( $this->user );
+
+		// test simple products
+		$product  = WC_Helper_Product::create_simple_product();
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/products/' . $product->get_id() ) );
+		$data     = $response->get_data();
+
+		$this->assertEquals( 'DUMMY SKU', $data['sku'] );
+		$this->assertEquals( 10, $data['regular_price'] );
+		$this->assertEmpty( $data['sale_price'] );
+
+		$request = new WP_REST_Request( 'PUT', '/wc/v2/products/' . $product->get_id() );
+		$request->set_body_params( array(
+			'sku'         => 'FIXED-SKU',
+			'sale_price'  => '8',
+			'description' => 'Testing',
+			'images'      => array( array( 'position' => 0, 'src' => 'https://cldup.com/Dr1Bczxq4q.png', 'alt' => 'test upload image' ) ),
+		) );
+		$response = $this->server->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertContains( 'Testing', $data['description'] );
+		$this->assertEquals( '8', $data['price'] );
+		$this->assertEquals( '8', $data['sale_price'] );
+		$this->assertEquals( '10', $data['regular_price'] );
+		$this->assertEquals( 'FIXED-SKU', $data['sku'] );
+		$this->assertContains( 'Dr1Bczxq4q', $data['images'][0]['src'] );
+		$this->assertContains( 'test upload image', $data['images'][0]['alt'] );
+
+		// test variable product (variations are tested in product-variations.php)
+		$product  = WC_Helper_Product::create_variation_product();
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/products/' . $product->get_id() ) );
+		$data     = $response->get_data();
+
+		$this->assertEquals( array( 'small' ), $data['attributes'][0]['options'] );
+
+		$request = new WP_REST_Request( 'PUT', '/wc/v2/products/' . $product->get_id() );
+		$request->set_body_params( array(
+			'attributes'  => array(
+				array( 'id' => 0, 'name' => 'pa_color', 'options' => array( 'red', 'yellow' ), 'visible' => false, 'variation' => 1 ),
+				array( 'name' => 'pa_size', 'options' => array( 'small' ), 'visible' => false, 'variation' => 1 ),
+			),
+		) );
+		$response = $this->server->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertEquals( array( 'small' ), $data['attributes'][0]['options'] );
+		$this->assertEquals( array( 'red', 'yellow' ), $data['attributes'][1]['options'] );
+		$product->delete( true );
+
+		// test external product
+		$product  = WC_Helper_Product::create_external_product();
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/products/' . $product->get_id() ) );
+		$data     = $response->get_data();
+
+		$this->assertEquals( 'Buy external product', $data['button_text'] );
+		$this->assertEquals( 'http://woocommerce.com', $data['external_url'] );
+
+		$request = new WP_REST_Request( 'PUT', '/wc/v2/products/' . $product->get_id() );
+		$request->set_body_params( array(
+			'button_text'  => 'Test API Update',
+			'external_url' => 'http://automattic.com',
+		) );
+		$response = $this->server->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertEquals( 'Test API Update', $data['button_text'] );
+		$this->assertEquals( 'http://automattic.com', $data['external_url'] );
+		$product->delete( true );
+	}
+
+	/**
+	 * Test updating a single product without permission.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_update_product_without_permission() {
+		wp_set_current_user( 0 );
+		$product = WC_Helper_Product::create_simple_product();
+		$request = new WP_REST_Request( 'PUT', '/wc/v2/products/' . $product->get_id() );
+		$request->set_body_params( array(
+			'sku' => 'FIXED-SKU-NO-PERMISSION',
+		) );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 401, $response->get_status() );
+		$product->delete( true );
+	}
+
+	/**
+	 * Test updating a single product with an invalid ID.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_update_product_with_invalid_id() {
+		wp_set_current_user( $this->user );
+		$product = WC_Helper_Product::create_simple_product();
+		$request = new WP_REST_Request( 'PUT', '/wc/v2/products/0' );
+		$request->set_body_params( array(
+			'sku' => 'FIXED-SKU-INVALID-ID',
+		) );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 400, $response->get_status() );
+		$product->delete( true );
+	}
+
+	/**
+	 * Test creating a single product.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_create_product() {
+		wp_set_current_user( $this->user );
+
+		$request = new WP_REST_Request( 'POST', '/wc/v2/products/shipping_classes' );
+		$request->set_body_params( array(
+			'name' => 'Test',
+		) );
+		$response          = $this->server->dispatch( $request );
+		$data              = $response->get_data();
+		$shipping_class_id = $data['id'];
+
+		// Create simple
+		$request = new WP_REST_Request( 'POST', '/wc/v2/products' );
+		$request->set_body_params( array(
+			'type'           => 'simple',
+			'name'           => 'Test Simple Product',
+			'sku'            => 'DUMMY SKU SIMPLE API',
+			'regular_price'  => '10',
+			'shipping_class' => 'test',
+		) );
+		$response = $this->server->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertEquals( '10', $data['price'] );
+		$this->assertEquals( '10', $data['regular_price'] );
+		$this->assertTrue( $data['purchasable'] );
+		$this->assertEquals( 'DUMMY SKU SIMPLE API', $data['sku'] );
+		$this->assertEquals( 'Test Simple Product', $data['name'] );
+		$this->assertEquals( 'simple', $data['type'] );
+		$this->assertEquals( $shipping_class_id, $data['shipping_class_id'] );
+
+		// Create external
+		$request = new WP_REST_Request( 'POST', '/wc/v2/products' );
+		$request->set_body_params( array(
+			'type'           => 'external',
+			'name'           => 'Test External Product',
+			'sku'            => 'DUMMY SKU EXTERNAL API',
+			'regular_price'  => '10',
+			'button_text'    => 'Test Button',
+			'external_url'   => 'http://wordpress.org',
+		) );
+		$response = $this->server->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertEquals( '10', $data['price'] );
+		$this->assertEquals( '10', $data['regular_price'] );
+		$this->assertFalse( $data['purchasable'] );
+		$this->assertEquals( 'DUMMY SKU EXTERNAL API', $data['sku'] );
+		$this->assertEquals( 'Test External Product', $data['name'] );
+		$this->assertEquals( 'external', $data['type'] );
+		$this->assertEquals( 'Test Button', $data['button_text'] );
+		$this->assertEquals( 'http://wordpress.org', $data['external_url'] );
+
+		// Create variable
+		$request = new WP_REST_Request( 'POST', '/wc/v2/products' );
+		$request->set_body_params( array(
+			'type'           => 'variable',
+			'name'           => 'Test Variable Product',
+			'sku'            => 'DUMMY SKU VARIABLE API',
+			'attributes'     => array(
+				array(
+					'id'        => 0,
+					'name'      => 'pa_size',
+					'options'   => array(
+						'small',
+						'medium',
+					),
+					'visible'   => false,
+					'variation' => 1,
+				),
+			),
+		) );
+		$response = $this->server->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertEquals( 'DUMMY SKU VARIABLE API', $data['sku'] );
+		$this->assertEquals( 'Test Variable Product', $data['name'] );
+		$this->assertEquals( 'variable', $data['type'] );
+		$this->assertEquals( array( 'small', 'medium' ), $data['attributes'][0]['options'] );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/products' ) );
+		$products = $response->get_data();
+		$this->assertEquals( 3, count( $products ) );
+	}
+
+	/**
+	 * Test creating a single product without permission.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_create_product_without_permission() {
+		wp_set_current_user( 0 );
+
+		$request = new WP_REST_Request( 'POST', '/wc/v2/products' );
+		$request->set_body_params( array(
+			'name'           => 'Test Product',
+			'regular_price'  => '12',
+		) );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Test batch managing products.
+	 */
+	public function test_products_batch() {
+		wp_set_current_user( $this->user );
+		$product   = WC_Helper_Product::create_simple_product();
+		$product_2 = WC_Helper_Product::create_simple_product();
+		$request   = new WP_REST_Request( 'POST', '/wc/v2/products/batch' );
+		$request->set_body_params( array(
+			'update' => array(
+				array(
+					'id'          => $product->get_id(),
+					'description' => 'Updated description.',
+				),
+			),
+			'delete' => array(
+				$product_2->get_id(),
+			),
+			'create' => array(
+				array(
+					'sku'            => 'DUMMY SKU BATCH TEST 1',
+					'regular_price'  => '10',
+					'name'           => 'Test Batch Create 1',
+					'type'           => 'external',
+					'button_text'    => 'Test Button',
+				),
+				array(
+					'sku'            => 'DUMMY SKU BATCH TEST 2',
+					'regular_price'  => '20',
+					'name'           => 'Test Batch Create 2',
+					'type'           => 'simple',
+				),
+			),
+		) );
+		$response = $this->server->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertContains( 'Updated description.', $data['update'][0]['description'] );
+		$this->assertEquals( 'DUMMY SKU BATCH TEST 1', $data['create'][0]['sku'] );
+		$this->assertEquals( 'DUMMY SKU BATCH TEST 2', $data['create'][1]['sku'] );
+		$this->assertEquals( 'Test Button', $data['create'][0]['button_text'] );
+		$this->assertEquals( 'external', $data['create'][0]['type'] );
+		$this->assertEquals( 'simple', $data['create'][1]['type'] );
+		$this->assertEquals( $product_2->get_id(), $data['delete'][0]['id'] );
+
+		$request  = new WP_REST_Request( 'GET', '/wc/v2/products' );
+		$response = $this->server->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertEquals( 3, count( $data ) );
+		$product->delete( true );
+		$product_2->delete( true );
+	}
+
+	/*
+	 * Tests to make sure you can filter products post statuses by both
+	 * the status query arg and WP_Query.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_products_filter_post_status() {
+		wp_set_current_user( $this->user );
+		for ( $i = 0; $i < 8; $i++ ) {
+			$product = WC_Helper_Product::create_simple_product();
+			if ( 0 === $i % 2 ) {
+				wp_update_post( array(
+					'ID'		  => $product->get_id(),
+					'post_status' => 'draft',
+				) );
+			}
+		}
+
+		// Test filtering with status=publish
+		$request = new WP_REST_Request( 'GET', '/wc/v2/products' );
+		$request->set_param( 'status', 'publish' );
+		$response = $this->server->dispatch( $request );
+		$products = $response->get_data();
+
+		$this->assertEquals( 4, count( $products ) );
+		foreach ( $products as $product ) {
+			$this->assertEquals( 'publish', $product['status'] );
+		}
+
+		// Test filtering with status=draft
+		$request = new WP_REST_Request( 'GET', '/wc/v2/products' );
+		$request->set_param( 'status', 'draft' );
+		$response = $this->server->dispatch( $request );
+		$products = $response->get_data();
+
+		$this->assertEquals( 4, count( $products ) );
+		foreach ( $products as $product ) {
+			$this->assertEquals( 'draft', $product['status'] );
+		}
+
+		// Test filtering with no filters - which should return 'any' (all 8)
+		$request  = new WP_REST_Request( 'GET', '/wc/v2/products' );
+		$response = $this->server->dispatch( $request );
+		$products = $response->get_data();
+
+		$this->assertEquals( 8, count( $products ) );
+	}
+
+	/**
+	 * Test product schema.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_product_schema() {
+		wp_set_current_user( $this->user );
+		$product    = WC_Helper_Product::create_simple_product();
+		$request    = new WP_REST_Request( 'OPTIONS', '/wc/v2/products/' . $product->get_id() );
+		$response   = $this->server->dispatch( $request );
+		$data       = $response->get_data();
+		$properties = $data['schema']['properties'];
+		$this->assertEquals( 65, count( $properties ) );
+		$product->delete( true );
+	}
+
+}
diff --git a/tests/unit-tests/api/settings.php b/tests/unit-tests/api/settings.php
new file mode 100644
index 00000000000..2b103ae0148
--- /dev/null
+++ b/tests/unit-tests/api/settings.php
@@ -0,0 +1,738 @@
+<?php
+/**
+ * Settings API Tests.
+ *
+ * @package WooCommerce\Tests\API
+ * @since 3.0.0
+ */
+
+class Settings extends WC_REST_Unit_Test_Case {
+
+	/**
+	 * Setup our test server, endpoints, and user info.
+	 */
+	public function setUp() {
+		parent::setUp();
+		$this->endpoint = new WC_REST_Setting_Options_Controller();
+		WC_Helper_Settings::register();
+		$this->user = $this->factory->user->create( array(
+			'role' => 'administrator',
+		) );
+	}
+
+	/**
+	 * Test route registration.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_register_routes() {
+		$routes = $this->server->get_routes();
+		$this->assertArrayHasKey( '/wc/v2/settings', $routes );
+		$this->assertArrayHasKey( '/wc/v2/settings/(?P<group_id>[\w-]+)', $routes );
+		$this->assertArrayHasKey( '/wc/v2/settings/(?P<group_id>[\w-]+)/(?P<id>[\w-]+)', $routes );
+	}
+
+	/**
+	 * Test getting all groups.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_groups() {
+		wp_set_current_user( $this->user );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/settings' ) );
+		$data = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status() );
+
+		$this->assertContains( array(
+			'id'          => 'test',
+			'label'       => 'Test extension',
+			'parent_id'   => '',
+			'description' => 'My awesome test settings.',
+			'sub_groups'  => array( 'sub-test' ),
+			'_links'      => array(
+				'options' => array(
+					array(
+						'href' => rest_url( '/wc/v2/settings/test' ),
+					),
+				),
+			),
+		), $data );
+
+		$this->assertContains( array(
+			'id'          => 'sub-test',
+			'label'       => 'Sub test',
+			'parent_id'   => 'test',
+			'description' => '',
+			'sub_groups'  => array(),
+			'_links'      => array(
+				'options' => array(
+					array(
+						'href' => rest_url( '/wc/v2/settings/sub-test' ),
+					),
+				),
+			),
+		), $data );
+	}
+
+	/**
+	 * Test /settings without valid permissions/creds.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_groups_without_permission() {
+		wp_set_current_user( 0 );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/settings' ) );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Test /settings without valid permissions/creds.
+	 *
+	 * @since 3.0.0
+	 * @covers WC_Rest_Settings_Controller::get_items
+	 */
+	public function test_get_groups_none_registered() {
+		wp_set_current_user( $this->user );
+
+		remove_all_filters( 'woocommerce_settings_groups' );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/settings' ) );
+		$this->assertEquals( 500, $response->get_status() );
+
+		WC_Helper_Settings::register();
+	}
+
+	/**
+	 * Test groups schema.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_group_schema() {
+		$request = new WP_REST_Request( 'OPTIONS', '/wc/v2/settings' );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+		$properties = $data['schema']['properties'];
+		$this->assertEquals( 5, count( $properties ) );
+		$this->assertArrayHasKey( 'id', $properties );
+		$this->assertArrayHasKey( 'parent_id', $properties );
+		$this->assertArrayHasKey( 'label', $properties );
+		$this->assertArrayHasKey( 'description', $properties );
+		$this->assertArrayHasKey( 'sub_groups', $properties );
+	}
+
+	/**
+	 * Test settings schema.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_setting_schema() {
+		$request = new WP_REST_Request( 'OPTIONS', '/wc/v2/settings/test/woocommerce_shop_page_display' );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+		$properties = $data['schema']['properties'];
+		$this->assertEquals( 9, count( $properties ) );
+		$this->assertArrayHasKey( 'id', $properties );
+		$this->assertArrayHasKey( 'label', $properties );
+		$this->assertArrayHasKey( 'description', $properties );
+		$this->assertArrayHasKey( 'value', $properties );
+		$this->assertArrayHasKey( 'default', $properties );
+		$this->assertArrayHasKey( 'tip', $properties );
+		$this->assertArrayHasKey( 'placeholder', $properties );
+		$this->assertArrayHasKey( 'type', $properties );
+		$this->assertArrayHasKey( 'options', $properties );
+	}
+
+	/**
+	 * Test getting a single group.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_group() {
+		wp_set_current_user( $this->user );
+
+		// test route callback receiving an empty group id
+		$result = $this->endpoint->get_group_settings( '' );
+		$this->assertIsWPError( $result );
+
+		// test getting a group that does not exist
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/settings/not-real' ) );
+		$this->assertEquals( 404, $response->get_status() );
+
+		// test getting the 'invalid' group
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/settings/invalid' ) );
+		$this->assertEquals( 404, $response->get_status() );
+
+		// test getting a valid group
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/settings/general' ) );
+		$data = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertContains( array(
+    		'id' => 'woocommerce_demo_store',
+			'label' => 'Store notice',
+			'description' => 'Enable site-wide store notice text',
+			'type' => 'checkbox',
+			'default' => 'no',
+			'value' => 'no',
+			'_links' => array(
+				'self' => array(
+					array(
+						'href' => rest_url( '/wc/v2/settings/general/woocommerce_demo_store' ),
+					),
+				),
+				'collection' => array(
+					array(
+						'href' => rest_url( '/wc/v2/settings/general' ),
+					),
+				),
+			),
+		), $data );
+
+		// test getting a valid group with settings attached to it
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/settings/test' ) );
+		$data = $response->get_data();
+		$this->assertEquals( 1, count( $data ) );
+		$this->assertEquals( 'woocommerce_shop_page_display', $data[0]['id'] );
+		$this->assertEmpty( $data[0]['value'] );
+	}
+
+	/**
+	 * Test getting a single group without permission.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_group_without_permission() {
+		wp_set_current_user( 0 );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/settings/coupon-data' ) );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Test updating a single setting.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_update_setting() {
+		wp_set_current_user( $this->user );
+
+		// test defaults first
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/settings/test/woocommerce_shop_page_display' ) );
+		$data = $response->get_data();
+		$this->assertEquals( '', $data['value'] );
+
+		// test updating shop display setting
+		$request = new WP_REST_Request( 'PUT', sprintf( '/wc/v2/settings/%s/%s', 'test', 'woocommerce_shop_page_display' ) );
+		$request->set_body_params( array(
+			'value' => 'both',
+		) );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertEquals( 'both', $data['value'] );
+		$this->assertEquals( 'both', get_option( 'woocommerce_shop_page_display' ) );
+
+		$request = new WP_REST_Request( 'PUT', sprintf( '/wc/v2/settings/%s/%s', 'test', 'woocommerce_shop_page_display' ) );
+		$request->set_body_params( array(
+			'value' => 'subcategories',
+		) );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertEquals( 'subcategories', $data['value'] );
+		$this->assertEquals( 'subcategories', get_option( 'woocommerce_shop_page_display' ) );
+
+		$request = new WP_REST_Request( 'PUT', sprintf( '/wc/v2/settings/%s/%s', 'test', 'woocommerce_shop_page_display' ) );
+		$request->set_body_params( array(
+			'value' => '',
+		) );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertEquals( '', $data['value'] );
+		$this->assertEquals( '', get_option( 'woocommerce_shop_page_display' ) );
+	}
+
+	/**
+	 * Test updating multiple settings at once.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_update_settings() {
+		wp_set_current_user( $this->user );
+
+		// test defaults first
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/settings/test' ) );
+		$data = $response->get_data();
+		$this->assertEquals( '', $data[0]['value'] );
+
+		// test setting both at once
+		$request = new WP_REST_Request( 'POST', '/wc/v2/settings/test/batch' );
+		$request->set_body_params( array(
+			'update' => array(
+				array(
+					'id'    => 'woocommerce_shop_page_display',
+					'value' => 'both',
+				),
+			),
+		) );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertEquals( 'both', $data['update'][0]['value'] );
+		$this->assertEquals( 'both', get_option( 'woocommerce_shop_page_display' ) );
+
+		// test updating one, but making sure the other value stays the same
+		$request = new WP_REST_Request( 'POST', '/wc/v2/settings/test/batch' );
+		$request->set_body_params( array(
+			'update' => array(
+				array(
+					'id'    => 'woocommerce_shop_page_display',
+					'value' => 'subcategories',
+				),
+			),
+		) );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+		$this->assertEquals( 'subcategories', $data['update'][0]['value'] );
+		$this->assertEquals( 'subcategories', get_option( 'woocommerce_shop_page_display' ) );
+	}
+
+	/**
+	 * Test getting a single setting.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_setting() {
+		wp_set_current_user( $this->user );
+
+		// test getting an invalid setting from a group that does not exist
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/settings/not-real/woocommerce_shop_page_display' ) );
+		$data = $response->get_data();
+		$this->assertEquals( 404, $response->get_status() );
+
+		// test getting an invalid setting from a group that does exist
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/settings/invalid/invalid' ) );
+		$data = $response->get_data();
+		$this->assertEquals( 404, $response->get_status() );
+
+		// test getting a valid setting
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/settings/test/woocommerce_shop_page_display' ) );
+		$data = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status() );
+
+		$this->assertEquals( 'woocommerce_shop_page_display', $data['id'] );
+		$this->assertEquals( 'Shop page display', $data['label'] );
+		$this->assertEquals( '', $data['default'] );
+		$this->assertEquals( 'select', $data['type'] );
+		$this->assertEquals( '', $data['value'] );
+	}
+
+	/**
+	 * Test getting a single setting without valid user permissions.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_setting_without_permission() {
+		wp_set_current_user( 0 );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/settings/test/woocommerce_shop_page_display' ) );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Tests the GET single setting route handler receiving an empty setting ID.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_setting_empty_setting_id() {
+		$result = $this->endpoint->get_setting( 'test', '' );
+
+		$this->assertIsWPError( $result );
+	}
+
+	/**
+	 * Tests the GET single setting route handler receiving an invalid setting ID.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_setting_invalid_setting_id() {
+		$result = $this->endpoint->get_setting( 'test', 'invalid' );
+
+		$this->assertIsWPError( $result );
+	}
+
+	/**
+	 * Tests the GET single setting route handler encountering an invalid setting type.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_setting_invalid_setting_type() {
+		// $controller = $this->getMock( 'WC_Rest_Setting_Options_Controller', array( 'get_group_settings', 'is_setting_type_valid' ) );
+		$controller = $this->getMockBuilder( 'WC_Rest_Setting_Options_Controller' )->setMethods( array( 'get_group_settings', 'is_setting_type_valid' ) )->getMock();
+
+		$controller
+			->expects( $this->any() )
+			->method( 'get_group_settings' )
+			->will( $this->returnValue( WC_Helper_Settings::register_test_settings( array() ) ) );
+
+		$controller
+			->expects( $this->any() )
+			->method( 'is_setting_type_valid' )
+			->will( $this->returnValue( false ) );
+
+		$result = $controller->get_setting( 'test', 'woocommerce_shop_page_display' );
+
+		$this->assertIsWPError( $result );
+	}
+
+	/**
+	 * Test updating a single setting without valid user permissions.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_update_setting_without_permission() {
+		wp_set_current_user( 0 );
+
+		$request = new WP_REST_Request( 'PUT', sprintf( '/wc/v2/settings/%s/%s', 'test', 'woocommerce_shop_page_display' ) );
+		$request->set_body_params( array(
+			'value' => 'subcategories',
+		) );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+
+	/**
+	 * Test updating multiple settings without valid user permissions.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_update_settings_without_permission() {
+		wp_set_current_user( 0 );
+
+		$request = new WP_REST_Request( 'POST', '/wc/v2/settings/test/batch' );
+		$request->set_body_params( array(
+			'update' => array(
+				array(
+					'id'    => 'woocommerce_shop_page_display',
+					'value' => 'subcategories',
+				),
+			),
+		) );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Test updating a bad setting ID.
+	 *
+	 * @since 3.0.0
+	 * @covers WC_Rest_Setting_Options_Controller::update_item
+	 */
+	public function test_update_setting_bad_setting_id() {
+		wp_set_current_user( $this->user );
+
+		$request = new WP_REST_Request( 'PUT', '/wc/v2/settings/test/invalid' );
+		$request->set_body_params( array(
+			'value' => 'test',
+		) );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 404, $response->get_status() );
+	}
+
+	/**
+	 * Tests our classic setting registration to make sure settings added for WP-Admin are available over the API.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_classic_settings() {
+		wp_set_current_user( $this->user );
+
+		// Make sure the group is properly registered
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/settings/products' ) );
+		$data = $response->get_data();
+		$this->assertTrue( is_array( $data ) );
+		$this->assertContains( array(
+			'id'          => 'woocommerce_downloads_require_login',
+			'label'       => 'Access restriction',
+			'description' => 'Downloads require login',
+			'type'        => 'checkbox',
+			'default'     => 'no',
+			'tip'         => 'This setting does not apply to guest purchases.',
+			'value'       => 'no',
+			'_links'      => array(
+				'self' => array(
+					array(
+						'href' => rest_url( '/wc/v2/settings/products/woocommerce_downloads_require_login' ),
+					),
+				),
+				'collection' => array(
+					array(
+						'href' => rest_url( '/wc/v2/settings/products' ),
+					),
+				),
+			),
+	), $data );
+
+		// test get single
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/settings/products/woocommerce_dimension_unit' ) );
+		$data = $response->get_data();
+
+		$this->assertEquals( 'cm', $data['default'] );
+
+		// test update
+		$request = new WP_REST_Request( 'PUT', sprintf( '/wc/v2/settings/%s/%s', 'products', 'woocommerce_dimension_unit' ) );
+		$request->set_body_params( array(
+			'value' => 'yd',
+		) );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertEquals( 'yd', $data['value'] );
+		$this->assertEquals( 'yd', get_option( 'woocommerce_dimension_unit' ) );
+	}
+
+	/**
+	 * Tests our email etting registration to make sure settings added for WP-Admin are available over the API.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_email_settings() {
+		wp_set_current_user( $this->user );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/settings/email_new_order' ) );
+		$settings = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status() );
+
+		$this->assertContains( array(
+			'id'          => 'recipient',
+			'label'       => 'Recipient(s)',
+			'description' => 'Enter recipients (comma separated) for this email. Defaults to <code>admin@example.org</code>.',
+			'type'        => 'text',
+			'default'     => '',
+			'tip'         => 'Enter recipients (comma separated) for this email. Defaults to <code>admin@example.org</code>.',
+			'value'       => '',
+			'_links'      => array(
+				'self' => array(
+					array(
+						'href' => rest_url( '/wc/v2/settings/email_new_order/recipient' ),
+					),
+				),
+				'collection' => array(
+					array(
+						'href' => rest_url( '/wc/v2/settings/email_new_order' ),
+					),
+				),
+			),
+		), $settings );
+
+		// test get single
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/settings/email_new_order/subject' ) );
+		$setting  = $response->get_data();
+
+		$this->assertEquals( array(
+			'id'          => 'subject',
+			'label'       => 'Subject',
+			'description' => 'This controls the email subject line. Leave blank to use the default subject: <code>[{site_title}] New customer order ({order_number}) - {order_date}</code>.',
+			'type'        => 'text',
+			'default'     => '',
+			'tip'         => 'This controls the email subject line. Leave blank to use the default subject: <code>[{site_title}] New customer order ({order_number}) - {order_date}</code>.',
+			'value'       => '',
+		), $setting );
+
+		// test update
+		$request = new WP_REST_Request( 'PUT', sprintf( '/wc/v2/settings/%s/%s', 'email_new_order', 'subject' ) );
+		$request->set_body_params( array(
+			'value' => 'This is my subject',
+		) );
+		$response = $this->server->dispatch( $request );
+		$setting  = $response->get_data();
+
+		$this->assertEquals( array(
+			'id'          => 'subject',
+			'label'       => 'Subject',
+			'description' => 'This controls the email subject line. Leave blank to use the default subject: <code>[{site_title}] New customer order ({order_number}) - {order_date}</code>.',
+			'type'        => 'text',
+			'default'     => '',
+			'tip'         => 'This controls the email subject line. Leave blank to use the default subject: <code>[{site_title}] New customer order ({order_number}) - {order_date}</code>.',
+			'value'       => 'This is my subject',
+		), $setting );
+
+		// test updating another subject and making sure it works with a "similar" id
+		$request = new WP_REST_Request( 'GET', sprintf( '/wc/v2/settings/%s/%s', 'email_customer_new_account', 'subject' ) );
+		$response = $this->server->dispatch( $request );
+		$setting  = $response->get_data();
+
+		$this->assertEmpty( $setting['value'] );
+
+		// test update
+		$request = new WP_REST_Request( 'PUT', sprintf( '/wc/v2/settings/%s/%s', 'email_customer_new_account', 'subject' ) );
+		$request->set_body_params( array(
+			'value' => 'This is my new subject',
+		) );
+		$response = $this->server->dispatch( $request );
+		$setting  = $response->get_data();
+
+		$this->assertEquals( 'This is my new subject', $setting['value'] );
+
+		// make sure the other is what we left it
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/settings/email_new_order/subject' ) );
+		$setting  = $response->get_data();
+
+		$this->assertEquals( 'This is my subject', $setting['value'] );
+	}
+
+	/**
+	 * Test validation of checkbox settings.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_validation_checkbox() {
+		wp_set_current_user( $this->user );
+
+		// test bogus value
+		$request = new WP_REST_Request( 'PUT', sprintf( '/wc/v2/settings/%s/%s', 'email_cancelled_order', 'enabled' ) );
+		$request->set_body_params( array(
+			'value' => 'not_yes_or_no',
+		) );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 400, $response->get_status() );
+
+		// test yes
+		$request = new WP_REST_Request( 'PUT', sprintf( '/wc/v2/settings/%s/%s', 'email_cancelled_order', 'enabled' ) );
+		$request->set_body_params( array(
+			'value' => 'yes',
+		) );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 200, $response->get_status() );
+
+		// test no
+		$request = new WP_REST_Request( 'PUT', sprintf( '/wc/v2/settings/%s/%s', 'email_cancelled_order', 'enabled' ) );
+		$request->set_body_params( array(
+			'value' => 'no',
+		) );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 200, $response->get_status() );
+	}
+
+	/**
+	 * Test validation of radio settings.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_validation_radio() {
+		wp_set_current_user( $this->user );
+
+		// not a valid option
+		$request = new WP_REST_Request( 'PUT', sprintf( '/wc/v2/settings/%s/%s', 'shipping', 'woocommerce_ship_to_destination' ) );
+		$request->set_body_params( array(
+			'value' => 'billing2',
+		) );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 400, $response->get_status() );
+
+		// valid
+		$request = new WP_REST_Request( 'PUT', sprintf( '/wc/v2/settings/%s/%s', 'shipping', 'woocommerce_ship_to_destination' ) );
+		$request->set_body_params( array(
+			'value' => 'billing',
+		) );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 200, $response->get_status() );
+	}
+
+	/**
+	 * Test validation of multiselect.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_validation_multiselect() {
+		wp_set_current_user( $this->user );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', sprintf( '/wc/v2/settings/%s/%s', 'general', 'woocommerce_specific_allowed_countries' ) ) );
+		$setting  = $response->get_data();
+		$this->assertEmpty( $setting['value'] );
+
+		$request = new WP_REST_Request( 'PUT', sprintf( '/wc/v2/settings/%s/%s', 'general', 'woocommerce_specific_allowed_countries' ) );
+		$request->set_body_params( array(
+			'value' => array( 'AX', 'DZ', 'MMM' ),
+		) );
+		$response = $this->server->dispatch( $request );
+		$setting  = $response->get_data();
+		$this->assertEquals( array( 'AX', 'DZ' ), $setting['value'] );
+	}
+
+	/**
+	 * Test validation of select.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_validation_select() {
+		wp_set_current_user( $this->user );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', sprintf( '/wc/v2/settings/%s/%s', 'products', 'woocommerce_weight_unit' ) ) );
+		$setting  = $response->get_data();
+		$this->assertEquals( 'kg', $setting['value'] );
+
+		// invalid
+		$request = new WP_REST_Request( 'PUT', sprintf( '/wc/v2/settings/%s/%s', 'products', 'woocommerce_weight_unit' ) );
+		$request->set_body_params( array(
+			'value' => 'pounds', // invalid, should be lbs
+		) );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 400, $response->get_status() );
+
+		// valid
+		$request = new WP_REST_Request( 'PUT', sprintf( '/wc/v2/settings/%s/%s', 'products', 'woocommerce_weight_unit' ) );
+		$request->set_body_params( array(
+			'value' => 'lbs', // invalid, should be lbs
+		) );
+		$response = $this->server->dispatch( $request );
+		$setting  = $response->get_data();
+		$this->assertEquals( 'lbs', $setting['value'] );
+	}
+
+	/**
+	 * Test validation of image_width.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_validation_image_width() {
+		wp_set_current_user( $this->user );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', sprintf( '/wc/v2/settings/%s/%s', 'products', 'shop_thumbnail_image_size' ) ) );
+		$setting  = $response->get_data();
+		$this->assertEquals( array( 'width' => 180, 'height' => 180, 'crop' => true ), $setting['value'] );
+
+		// test bogus
+		$request = new WP_REST_Request( 'PUT', sprintf( '/wc/v2/settings/%s/%s', 'products', 'shop_thumbnail_image_size' ) );
+		$request->set_body_params( array(
+			'value' => array(
+				'width'  => 400,
+				'height' => 200,
+				'crop'   => 'asdasdasd',
+			),
+		) );
+		$response = $this->server->dispatch( $request );
+		$setting  = $response->get_data();
+		$this->assertEquals( array( 'width' => 400, 'height' => 200, 'crop' => true ), $setting['value'] );
+
+		$request = new WP_REST_Request( 'PUT', sprintf( '/wc/v2/settings/%s/%s', 'products', 'shop_thumbnail_image_size' ) );
+		$request->set_body_params( array(
+			'value' => array(
+				'width'  => 200,
+				'height' => 100,
+				'crop'   => false,
+			),
+		) );
+		$response = $this->server->dispatch( $request );
+		$setting  = $response->get_data();
+		$this->assertEquals( array( 'width' => 200, 'height' => 100, 'crop' => false ), $setting['value'] );
+	}
+
+}
diff --git a/tests/unit-tests/api/shipping-methods.php b/tests/unit-tests/api/shipping-methods.php
new file mode 100644
index 00000000000..febce187d32
--- /dev/null
+++ b/tests/unit-tests/api/shipping-methods.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * Tests for the Shipping Methods REST API.
+ *
+ * @package WooCommerce\Tests\API
+ * @since 3.0.0
+ */
+
+class Shipping_Methods extends WC_REST_Unit_Test_Case {
+
+	/**
+	 * Setup our test server, endpoints, and user info.
+	 */
+	public function setUp() {
+		parent::setUp();
+		$this->endpoint = new WC_REST_Shipping_Methods_Controller();
+		$this->user = $this->factory->user->create( array(
+			'role' => 'administrator',
+		) );
+	}
+
+	/**
+	 * Test route registration.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_register_routes() {
+		$routes = $this->server->get_routes();
+        $this->assertArrayHasKey( '/wc/v2/shipping_methods', $routes );
+		$this->assertArrayHasKey( '/wc/v2/shipping_methods/(?P<id>[\w-]+)', $routes );
+	}
+
+	/**
+	 * Test getting all shipping methods.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_shipping_methods() {
+		wp_set_current_user( $this->user );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/shipping_methods' ) );
+		$methods = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status() );
+        $this->assertContains( array(
+			'id'          => 'free_shipping',
+			'title'       => 'Free shipping',
+			'description' => 'Free shipping is a special method which can be triggered with coupons and minimum spends.',
+			'_links' => array(
+				'self'       => array(
+					array(
+						'href' => rest_url( '/wc/v2/shipping_methods/free_shipping' ),
+					),
+				),
+				'collection' => array(
+					array(
+						'href' => rest_url( '/wc/v2/shipping_methods' ),
+					),
+				),
+			),
+		), $methods );
+	}
+
+	/**
+	 * Tests to make sure shipping methods cannot viewed without valid permissions.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_shipping_methods_without_permission() {
+		wp_set_current_user( 0 );
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/shipping_methods' ) );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Tests getting a single shipping method.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_shipping_method() {
+		wp_set_current_user( $this->user );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/shipping_methods/local_pickup' ) );
+		$method   = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status() );
+        $this->assertEquals( array(
+            'id'          => 'local_pickup',
+            'title'       => 'Local pickup',
+            'description' => 'Allow customers to pick up orders themselves. By default, when using local pickup store base taxes will apply regardless of customer address.',
+        ), $method );
+	}
+
+	/**
+	 * Tests getting a single shipping method without the correct permissions.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_shipping_method_without_permission() {
+		wp_set_current_user( 0 );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/shipping_methods/local_pickup' ) );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Tests getting a shipping method with an invalid ID.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_shipping_method_invalid_id() {
+		wp_set_current_user( $this->user );
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/shipping_methods/fake_method' ) );
+		$this->assertEquals( 404, $response->get_status() );
+	}
+
+	/**
+	 * Test the shipping method schema.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_shipping_method_schema() {
+		wp_set_current_user( $this->user );
+
+		$request = new WP_REST_Request( 'OPTIONS', '/wc/v2/shipping_methods' );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+		$properties = $data['schema']['properties'];
+
+		$this->assertEquals( 3, count( $properties ) );
+		$this->assertArrayHasKey( 'id', $properties );
+		$this->assertArrayHasKey( 'title', $properties );
+		$this->assertArrayHasKey( 'description', $properties );
+	}
+}
diff --git a/tests/unit-tests/api/shipping-zones.php b/tests/unit-tests/api/shipping-zones.php
new file mode 100644
index 00000000000..48bbcb0b073
--- /dev/null
+++ b/tests/unit-tests/api/shipping-zones.php
@@ -0,0 +1,761 @@
+<?php
+
+/**
+ * Shipping Zones API Tests
+ * @package WooCommerce\Tests\API
+ * @since 3.0.0
+ */
+class WC_Tests_API_Shipping_Zones extends WC_REST_Unit_Test_Case {
+
+	protected $server;
+
+	protected $endpoint;
+
+	protected $user;
+
+	protected $zones;
+
+	/**
+	 * Setup our test server, endpoints, and user info.
+	 */
+	public function setUp() {
+		parent::setUp();
+		$this->endpoint = new WC_REST_Shipping_Zones_Controller();
+		$this->user = $this->factory->user->create( array(
+			'role' => 'administrator',
+		) );
+		$this->zones = array();
+	}
+
+	/**
+	 * Delete zones.
+	 */
+	public function tearDown() {
+		parent::tearDown();
+		foreach ( $this->zones as $zone ) {
+			$zone->delete();
+		}
+	}
+
+	/**
+	 * Helper method to create a Shipping Zone.
+	 *
+	 * @param string $name Zone name.
+	 * @param int    $order Optional. Zone sort order.
+	 * @return WC_Shipping_Zone
+	 */
+	protected function create_shipping_zone( $name, $order = 0, $locations = array() ) {
+		$zone = new WC_Shipping_Zone( null );
+		$zone->set_zone_name( $name );
+		$zone->set_zone_order( $order );
+		$zone->set_locations( $locations );
+		$zone->save();
+
+		$this->zones[] = $zone;
+
+		return $zone;
+	}
+
+	/**
+	 * Test route registration.
+	 * @since 3.0.0
+	 */
+	public function test_register_routes() {
+		$routes = $this->server->get_routes();
+		$this->assertArrayHasKey( '/wc/v2/shipping/zones', $routes );
+		$this->assertArrayHasKey( '/wc/v2/shipping/zones/(?P<id>[\d-]+)', $routes );
+		$this->assertArrayHasKey( '/wc/v2/shipping/zones/(?P<id>[\d]+)/locations', $routes );
+		$this->assertArrayHasKey( '/wc/v2/shipping/zones/(?P<zone_id>[\d]+)/methods', $routes );
+		$this->assertArrayHasKey( '/wc/v2/shipping/zones/(?P<zone_id>[\d]+)/methods/(?P<instance_id>[\d]+)', $routes );
+	}
+
+	/**
+	 * Test getting all Shipping Zones.
+	 * @since 3.0.0
+	 */
+	public function test_get_zones() {
+		wp_set_current_user( $this->user );
+
+		// "Rest of the World" zone exists by default
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/shipping/zones' ) );
+		$data = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertEquals( count( $data ), 1 );
+		$this->assertContains( array(
+			'id'     => 0,
+			'name'   => 'Rest of the World',
+			'order'  => 0,
+			'_links' => array(
+				'self'       => array(
+					array(
+						'href' => rest_url( '/wc/v2/shipping/zones/0' ),
+					),
+				),
+				'collection' => array(
+					array(
+						'href' => rest_url( '/wc/v2/shipping/zones' ),
+					),
+				),
+				'describedby' => array(
+					array(
+						'href' => rest_url( '/wc/v2/shipping/zones/0/locations' ),
+					),
+				),
+			),
+		), $data );
+
+		// Create a zone and make sure it's in the response
+		$this->create_shipping_zone( 'Zone 1' );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/shipping/zones' ) );
+		$data = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertEquals( count( $data ), 2 );
+		$this->assertContains( array(
+			'id'     => 1,
+			'name'   => 'Zone 1',
+			'order'  => 0,
+			'_links' => array(
+				'self'       => array(
+					array(
+						'href' => rest_url( '/wc/v2/shipping/zones/1' ),
+					),
+				),
+				'collection' => array(
+					array(
+						'href' => rest_url( '/wc/v2/shipping/zones' ),
+					),
+				),
+				'describedby' => array(
+					array(
+						'href' => rest_url( '/wc/v2/shipping/zones/1/locations' ),
+					),
+				),
+			),
+		), $data );
+	}
+
+	/**
+	 * Test /shipping/zones without valid permissions/creds.
+	 * @since 3.0.0
+	 */
+	public function test_get_shipping_zones_without_permission() {
+		wp_set_current_user( 0 );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/shipping/zones' ) );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Test /shipping/zones while Shipping is disabled in WooCommerce.
+	 * @since 3.0.0
+	 */
+	public function test_get_shipping_zones_disabled_shipping() {
+		wp_set_current_user( $this->user );
+
+		add_filter( 'wc_shipping_enabled', '__return_false' );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/shipping/zones' ) );
+		$this->assertEquals( 404, $response->get_status() );
+
+		remove_filter( 'wc_shipping_enabled', '__return_false' );
+	}
+
+	/**
+	 * Test Shipping Zone schema.
+	 * @since 3.0.0
+	 */
+	public function test_get_shipping_zone_schema() {
+		$request = new WP_REST_Request( 'OPTIONS', '/wc/v2/shipping/zones' );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+		$properties = $data['schema']['properties'];
+		$this->assertEquals( 3, count( $properties ) );
+		$this->assertArrayHasKey( 'id', $properties );
+		$this->assertTrue( $properties['id']['readonly'] );
+		$this->assertArrayHasKey( 'name', $properties );
+		$this->assertArrayHasKey( 'order', $properties );
+	}
+
+	/**
+	 * Test Shipping Zone create endpoint.
+	 * @since 3.0.0
+	 */
+	public function test_create_shipping_zone() {
+		wp_set_current_user( $this->user );
+
+		$request = new WP_REST_Request( 'POST', '/wc/v2/shipping/zones' );
+		$request->set_body_params( array(
+			'name'  => 'Test Zone',
+			'order' => 1,
+		) );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertEquals( 201, $response->get_status() );
+		$this->assertEquals( array(
+			'id'     => $data['id'],
+			'name'   => 'Test Zone',
+			'order'  => 1,
+			'_links' => array(
+				'self'       => array(
+					array(
+						'href' => rest_url( '/wc/v2/shipping/zones/' . $data['id'] ),
+					),
+				),
+				'collection' => array(
+					array(
+						'href' => rest_url( '/wc/v2/shipping/zones' ),
+					),
+				),
+				'describedby' => array(
+					array(
+						'href' => rest_url( '/wc/v2/shipping/zones/' . $data['id'] . '/locations' ),
+					),
+				),
+			),
+		), $data );
+	}
+
+	/**
+	 * Test Shipping Zone create endpoint.
+	 * @since 3.0.0
+	 */
+	public function test_create_shipping_zone_without_permission() {
+		wp_set_current_user( 0 );
+
+		$request = new WP_REST_Request( 'POST', '/wc/v2/shipping/zones' );
+		$request->set_body_params( array(
+			'name'  => 'Test Zone',
+			'order' => 1,
+		) );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Test Shipping Zone update endpoint.
+	 * @since 3.0.0
+	 */
+	public function test_update_shipping_zone() {
+		wp_set_current_user( $this->user );
+
+		$zone = $this->create_shipping_zone( 'Test Zone' );
+
+		$request = new WP_REST_Request( 'PUT', '/wc/v2/shipping/zones/' . $zone->get_id() );
+		$request->set_body_params( array(
+			'name'  => 'Zone Test',
+			'order' => 2,
+		) );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertEquals( array(
+			'id'     => $zone->get_id(),
+			'name'   => 'Zone Test',
+			'order'  => 2,
+			'_links' => array(
+				'self'       => array(
+					array(
+						'href' => rest_url( '/wc/v2/shipping/zones/' . $zone->get_id() ),
+					),
+				),
+				'collection' => array(
+					array(
+						'href' => rest_url( '/wc/v2/shipping/zones' ),
+					),
+				),
+				'describedby' => array(
+					array(
+						'href' => rest_url( '/wc/v2/shipping/zones/' . $zone->get_id() . '/locations' ),
+					),
+				),
+			),
+		), $data );
+	}
+
+	/**
+	 * Test Shipping Zone update endpoint with a bad zone ID.
+	 * @since 3.0.0
+	 */
+	public function test_update_shipping_zone_invalid_id() {
+		wp_set_current_user( $this->user );
+
+		$request = new WP_REST_Request( 'PUT', '/wc/v2/shipping/zones/555555' );
+		$request->set_body_params( array(
+			'name'  => 'Zone Test',
+			'order' => 2,
+		) );
+		$response = $this->server->dispatch( $request );
+
+		$this->assertEquals( 404, $response->get_status() );
+	}
+
+	/**
+	 * Test Shipping Zone delete endpoint.
+	 * @since 3.0.0
+	 */
+	public function test_delete_shipping_zone() {
+		wp_set_current_user( $this->user );
+		$zone = $this->create_shipping_zone( 'Zone 1' );
+
+		$request  = new WP_REST_Request( 'DELETE', '/wc/v2/shipping/zones/' . $zone->get_id() );
+		$request->set_param( 'force', true );
+		$response = $this->server->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status() );
+	}
+
+	/**
+	 * Test Shipping Zone delete endpoint without permissions.
+	 * @since 3.0.0
+	 */
+	public function test_delete_shipping_zone_without_permission() {
+		wp_set_current_user( 0 );
+		$zone = $this->create_shipping_zone( 'Zone 1' );
+
+		$request = new WP_REST_Request( 'DELETE', '/wc/v2/shipping/zones/' . $zone->get_id() );
+		$request->set_param( 'force', true );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Test Shipping Zone delete endpoint with a bad zone ID.
+	 * @since 3.0.0
+	 */
+	public function test_delete_shipping_zone_invalid_id() {
+		wp_set_current_user( $this->user );
+		$request  = new WP_REST_Request( 'DELETE', '/wc/v2/shipping/zones/555555' );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 404, $response->get_status() );
+	}
+
+	/**
+	 * Test getting a single Shipping Zone.
+	 * @since 3.0.0
+	 */
+	public function test_get_single_shipping_zone() {
+		wp_set_current_user( $this->user );
+
+		$zone     = $this->create_shipping_zone( 'Test Zone' );
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/shipping/zones/' . $zone->get_id() ) );
+		$data     = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertEquals( array(
+			'id'     => $zone->get_id(),
+			'name'   => 'Test Zone',
+			'order'  => 0,
+			'_links' => array(
+				'self'       => array(
+					array(
+						'href' => rest_url( '/wc/v2/shipping/zones/' . $zone->get_id() ),
+					),
+				),
+				'collection' => array(
+					array(
+						'href' => rest_url( '/wc/v2/shipping/zones' ),
+					),
+				),
+				'describedby' => array(
+					array(
+						'href' => rest_url( '/wc/v2/shipping/zones/' . $zone->get_id() . '/locations' ),
+					),
+				),
+			),
+		), $data );
+	}
+
+	/**
+	 * Test getting a single Shipping Zone with a bad zone ID.
+	 * @since 3.0.0
+	 */
+	public function test_get_single_shipping_zone_invalid_id() {
+		wp_set_current_user( $this->user );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/shipping/zones/1' ) );
+
+		$this->assertEquals( 404, $response->get_status() );
+	}
+
+	/**
+	 * Test getting Shipping Zone Locations.
+	 * @since 3.0.0
+	 */
+	public function test_get_locations() {
+		wp_set_current_user( $this->user );
+
+		// Create a zone
+		$zone = $this->create_shipping_zone( 'Zone 1', 0, array(
+			array(
+				'code' => 'US',
+				'type' => 'country',
+			),
+		) );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/shipping/zones/' . $zone->get_id() . '/locations' ) );
+		$data = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertEquals( count( $data ), 1 );
+		$this->assertEquals( array(
+			array(
+				'code'   => 'US',
+				'type'   => 'country',
+				'_links' => array(
+					'collection' => array(
+						array(
+							'href' => rest_url( '/wc/v2/shipping/zones/' . $zone->get_id() . '/locations' ),
+						),
+					),
+					'describes' => array(
+						array(
+							'href' => rest_url( '/wc/v2/shipping/zones/' . $zone->get_id() ),
+						),
+					),
+				),
+			),
+		), $data );
+	}
+
+	/**
+	 * Test getting Shipping Zone Locations with a bad zone ID.
+	 * @since 3.0.0
+	 */
+	public function test_get_locations_invalid_id() {
+		wp_set_current_user( $this->user );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/shipping/zones/1/locations' ) );
+
+		$this->assertEquals( 404, $response->get_status() );
+	}
+
+	/**
+	 * Test Shipping Zone Locations update endpoint.
+	 * @since 3.0.0
+	 */
+	public function test_update_locations() {
+		wp_set_current_user( $this->user );
+
+		$zone = $this->create_shipping_zone( 'Test Zone' );
+
+		$request = new WP_REST_Request( 'PUT', '/wc/v2/shipping/zones/' . $zone->get_id() . '/locations' );
+		$request->add_header( 'Content-Type', 'application/json' );
+		$request->set_body( json_encode( array(
+			array(
+				'code' => 'UK',
+				'type' => 'country',
+			),
+			array(
+				'code' => 'US', // test that locations missing "type" treated as country.
+			),
+			array(
+				'code' => 'SW1A0AA',
+				'type' => 'postcode',
+			),
+			array(
+				'type' => 'continent', // test that locations missing "code" aren't saved
+			),
+		) ) );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertEquals( 3, count( $data ) );
+		$this->assertEquals( array(
+			array(
+				'code'   => 'UK',
+				'type'   => 'country',
+				'_links' => array(
+					'collection' => array(
+						array(
+							'href' => rest_url( '/wc/v2/shipping/zones/' . $zone->get_id() . '/locations' ),
+						),
+					),
+					'describes' => array(
+						array(
+							'href' => rest_url( '/wc/v2/shipping/zones/' . $zone->get_id() ),
+						),
+					),
+				),
+			),
+			array(
+				'code' => 'US',
+				'type'   => 'country',
+				'_links' => array(
+					'collection' => array(
+						array(
+							'href' => rest_url( '/wc/v2/shipping/zones/' . $zone->get_id() . '/locations' ),
+						),
+					),
+					'describes' => array(
+						array(
+							'href' => rest_url( '/wc/v2/shipping/zones/' . $zone->get_id() ),
+						),
+					),
+				),
+			),
+			array(
+				'code'   => 'SW1A0AA',
+				'type'   => 'postcode',
+				'_links' => array(
+					'collection' => array(
+						array(
+							'href' => rest_url( '/wc/v2/shipping/zones/' . $zone->get_id() . '/locations' ),
+						),
+					),
+					'describes' => array(
+						array(
+							'href' => rest_url( '/wc/v2/shipping/zones/' . $zone->get_id() ),
+						),
+					),
+				),
+			),
+		), $data );
+	}
+
+	/**
+	 * Test updating Shipping Zone Locations with a bad zone ID.
+	 * @since 3.0.0
+	 */
+	public function test_update_locations_invalid_id() {
+		wp_set_current_user( $this->user );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'PUT', '/wc/v2/shipping/zones/1/locations' ) );
+
+		$this->assertEquals( 404, $response->get_status() );
+	}
+
+	/**
+	 * Test getting all Shipping Zone Methods and getting a single Shipping Zone Method.
+	 * @since 3.0.0
+	 */
+	public function test_get_methods() {
+		wp_set_current_user( $this->user );
+
+		// Create a shipping method and make sure it's in the response
+		$zone        = $this->create_shipping_zone( 'Zone 1' );
+		$instance_id = $zone->add_shipping_method( 'flat_rate' );
+		$methods     = $zone->get_shipping_methods();
+		$method      = $methods[ $instance_id ];
+
+		$settings = array();
+		$method->init_instance_settings();
+		foreach ( $method->get_instance_form_fields() as $id => $field ) {
+			$data = array(
+				'id'          => $id,
+				'label'       => $field['title'],
+				'description' => ( empty( $field['description'] ) ? '' : $field['description'] ),
+				'type'        => $field['type'],
+				'value'       => $method->instance_settings[ $id ],
+				'default'     => ( empty( $field['default'] ) ? '' : $field['default'] ),
+				'tip'         => ( empty( $field['description'] ) ? '' : $field['description'] ),
+				'placeholder' => ( empty( $field['placeholder'] ) ? '' : $field['placeholder'] ),
+			);
+			if ( ! empty( $field['options'] ) ) {
+				$data['options'] = $field['options'];
+			}
+			$settings[ $id ] = $data;
+		}
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/shipping/zones/' . $zone->get_id() . '/methods' ) );
+		$data     = $response->get_data();
+		$expected = array(
+			'id'                 => $instance_id,
+			'instance_id'        => $instance_id,
+			'title'              => $method->instance_settings['title'],
+			'order'              => $method->method_order,
+			'enabled'            => ( 'yes' === $method->enabled ),
+			'method_id'          => $method->id,
+			'method_title'       => $method->method_title,
+			'method_description' => $method->method_description,
+			'settings'           => $settings,
+			'_links'             => array(
+				'self'       => array(
+					array(
+						'href' => rest_url( '/wc/v2/shipping/zones/' . $zone->get_id() . '/methods/' . $instance_id ),
+					),
+				),
+				'collection' => array(
+					array(
+						'href' => rest_url( '/wc/v2/shipping/zones/' . $zone->get_id() . '/methods' ),
+					),
+				),
+				'describes' => array(
+					array(
+						'href' => rest_url( '/wc/v2/shipping/zones/' . $zone->get_id() ),
+					),
+				),
+			),
+		);
+
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertEquals( count( $data ), 1 );
+		$this->assertContains( $expected, $data );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/shipping/zones/' . $zone->get_id() . '/methods/' . $instance_id ) );
+		$data     = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertEquals( $expected, $data );
+	}
+
+	/**
+	 * Test getting all Shipping Zone Methods with a bad zone ID.
+	 * @since 3.0.0
+	 */
+	public function test_get_methods_invalid_zone_id() {
+		wp_set_current_user( $this->user );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/shipping/zones/1/methods' ) );
+
+		$this->assertEquals( 404, $response->get_status() );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/shipping/zones/1/methods/1' ) );
+
+		$this->assertEquals( 404, $response->get_status() );
+	}
+
+	/**
+	 * Test getting a single Shipping Zone Method with a bad ID.
+	 * @since 3.0.0
+	 */
+	public function test_get_methods_invalid_method_id() {
+		wp_set_current_user( $this->user );
+
+		$zone     = $this->create_shipping_zone( 'Zone 1' );
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/shipping/zones/' . $zone->get_id() . '/methods/1' ) );
+
+		$this->assertEquals( 404, $response->get_status() );
+	}
+
+	/**
+	 * Test updating a Shipping Zone Method.
+	 * @since 3.0.0
+	 */
+	public function test_update_methods() {
+		wp_set_current_user( $this->user );
+
+		$zone        = $this->create_shipping_zone( 'Zone 1' );
+		$instance_id = $zone->add_shipping_method( 'flat_rate' );
+		$methods     = $zone->get_shipping_methods();
+		$method      = $methods[ $instance_id ];
+
+		// Test defaults
+		$request = new WP_REST_Request( 'GET', '/wc/v2/shipping/zones/' . $zone->get_id() . '/methods/' . $instance_id );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertArrayHasKey( 'title', $data['settings'] );
+		$this->assertEquals( 'Flat rate', $data['settings']['title']['value'] );
+		$this->assertArrayHasKey( 'tax_status', $data['settings'] );
+		$this->assertEquals( 'taxable', $data['settings']['tax_status']['value'] );
+		$this->assertArrayHasKey( 'cost', $data['settings'] );
+		$this->assertEquals( '0', $data['settings']['cost']['value'] );
+
+		// Update a single value
+		$request = new WP_REST_Request( 'POST', '/wc/v2/shipping/zones/' . $zone->get_id() . '/methods/' . $instance_id );
+		$request->set_body_params( array(
+			'settings' => array(
+				'cost' => 5,
+			),
+		) );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertArrayHasKey( 'title', $data['settings'] );
+		$this->assertEquals( 'Flat rate', $data['settings']['title']['value'] );
+		$this->assertArrayHasKey( 'tax_status', $data['settings'] );
+		$this->assertEquals( 'taxable', $data['settings']['tax_status']['value'] );
+		$this->assertArrayHasKey( 'cost', $data['settings'] );
+		$this->assertEquals( '5', $data['settings']['cost']['value'] );
+
+		// Test multiple settings
+		$request = new WP_REST_Request( 'POST', '/wc/v2/shipping/zones/' . $zone->get_id() . '/methods/' . $instance_id );
+		$request->set_body_params( array(
+			'settings' => array(
+				'cost'       => 10,
+				'tax_status' => 'none',
+			),
+		) );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertArrayHasKey( 'title', $data['settings'] );
+		$this->assertEquals( 'Flat rate', $data['settings']['title']['value'] );
+		$this->assertArrayHasKey( 'tax_status', $data['settings'] );
+		$this->assertEquals( 'none', $data['settings']['tax_status']['value'] );
+		$this->assertArrayHasKey( 'cost', $data['settings'] );
+		$this->assertEquals( '10', $data['settings']['cost']['value'] );
+
+		// Test bogus
+		$request = new WP_REST_Request( 'POST', '/wc/v2/shipping/zones/' . $zone->get_id() . '/methods/' . $instance_id );
+		$request->set_body_params( array(
+			'settings' => array(
+				'cost'       => 10,
+				'tax_status' => 'this_is_not_a_valid_option',
+			),
+		) );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 400, $response->get_status() );
+
+		// Test other parameters
+		$this->assertTrue( $data['enabled'] );
+		$this->assertEquals( 1, $data['order'] );
+
+		$request = new WP_REST_Request( 'POST', '/wc/v2/shipping/zones/' . $zone->get_id() . '/methods/' . $instance_id );
+		$request->set_body_params( array(
+			'enabled' => false,
+			'order'   => 2,
+		) );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+
+		$this->assertFalse( $data['enabled'] );
+		$this->assertEquals( 2, $data['order'] );
+		$this->assertArrayHasKey( 'cost', $data['settings'] );
+		$this->assertEquals( '10', $data['settings']['cost']['value'] );
+	}
+
+	/**
+	 * Test creating a Shipping Zone Method.
+	 * @since 3.0.0
+	 */
+	public function test_create_method() {
+		wp_set_current_user( $this->user );
+		$zone    = $this->create_shipping_zone( 'Zone 1' );
+		$request = new WP_REST_Request( 'POST', '/wc/v2/shipping/zones/' . $zone->get_id() . '/methods' );
+		$request->set_body_params( array(
+			'method_id' => 'flat_rate',
+			'enabled' => false,
+			'order' => 2,
+		) );
+		$response = $this->server->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertFalse( $data['enabled'] );
+		$this->assertEquals( 2, $data['order'] );
+		$this->assertArrayHasKey( 'cost', $data['settings'] );
+		$this->assertEquals( '0', $data['settings']['cost']['value'] );
+	}
+
+	/**
+	 * Test deleting a Shipping Zone Method.
+	 * @since 3.0.0
+	 */
+	public function test_delete_method() {
+		wp_set_current_user( $this->user );
+		$zone        = $this->create_shipping_zone( 'Zone 1' );
+		$instance_id = $zone->add_shipping_method( 'flat_rate' );
+		$methods     = $zone->get_shipping_methods();
+		$method      = $methods[ $instance_id ];
+		$request     = new WP_REST_Request( 'DELETE', '/wc/v2/shipping/zones/' . $zone->get_id() . '/methods/' . $instance_id );
+		$request->set_param( 'force', true );
+		$response    = $this->server->dispatch( $request );
+		$this->assertEquals( 200, $response->get_status() );
+	}
+}
diff --git a/tests/unit-tests/api/system-status.php b/tests/unit-tests/api/system-status.php
new file mode 100644
index 00000000000..279a760ff72
--- /dev/null
+++ b/tests/unit-tests/api/system-status.php
@@ -0,0 +1,342 @@
+<?php
+/**
+ * System Status REST Tests
+ * @package WooCommerce\Tests\API
+ * @since 3.0
+ */
+class WC_Tests_REST_System_Status extends WC_REST_Unit_Test_Case {
+
+	/**
+	 * Setup our test server.
+	 */
+	public function setUp() {
+		parent::setUp();
+		$this->endpoint = new WC_REST_System_Status_Controller();
+		$this->user = $this->factory->user->create( array(
+			'role' => 'administrator',
+		) );
+	}
+
+	/**
+	 * Test route registration.
+	 */
+	public function test_register_routes() {
+		$routes = $this->server->get_routes();
+		$this->assertArrayHasKey( '/wc/v2/system_status', $routes );
+		$this->assertArrayHasKey( '/wc/v2/system_status/tools', $routes );
+		$this->assertArrayHasKey( '/wc/v2/system_status/tools/(?P<id>[\w-]+)', $routes );
+	}
+
+	/**
+	 * Test to make sure system status cannot be accessed without valid creds
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_system_status_info_without_permission() {
+		wp_set_current_user( 0 );
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/system_status' ) );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Test to make sure root properties are present.
+	 * (environment, theme, database, etc).
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_system_status_info_returns_root_properties() {
+		wp_set_current_user( $this->user );
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/system_status' ) );
+		$data = $response->get_data();
+
+		$this->assertArrayHasKey( 'environment', $data );
+		$this->assertArrayHasKey( 'database', $data );
+		$this->assertArrayHasKey( 'active_plugins', $data );
+		$this->assertArrayHasKey( 'theme', $data );
+		$this->assertArrayHasKey( 'settings', $data );
+		$this->assertArrayHasKey( 'security', $data );
+		$this->assertArrayHasKey( 'pages', $data );
+	}
+
+	/**
+	 * Test to make sure environment response is correct.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_system_status_info_environment() {
+		wp_set_current_user( $this->user );
+		$response    = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/system_status' ) );
+		$data        = $response->get_data();
+		$environment = (array) $data['environment'];
+
+		// Make sure all expected data is present
+		$this->assertEquals( 30, count( $environment ) );
+
+		// Test some responses to make sure they match up
+		$this->assertEquals( get_option( 'home' ), $environment['home_url'] );
+		$this->assertEquals( get_option( 'siteurl' ), $environment['site_url'] );
+		$this->assertEquals( WC()->version, $environment['version'] );
+	}
+
+	/**
+	 * Test to make sure database response is correct.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_system_status_info_database() {
+		global $wpdb;
+		wp_set_current_user( $this->user );
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/system_status' ) );
+		$data     = $response->get_data();
+		$database = (array) $data['database'];
+
+		$this->assertEquals( get_option( 'woocommerce_db_version' ), $database['wc_database_version'] );
+		$this->assertEquals( $wpdb->prefix, $database['database_prefix'] );
+		$this->assertEquals( WC_Geolocation::get_local_database_path(), $database['maxmind_geoip_database'] );
+		$this->assertArrayHasKey( 'woocommerce_payment_tokens', $database['database_tables'] );
+	}
+
+	/**
+	 * Test to make sure active plugins response is correct.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_system_status_info_active_plugins() {
+		wp_set_current_user( $this->user );
+
+		$actual_plugins = array( 'hello.php' );
+		update_option( 'active_plugins', $actual_plugins );
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/system_status' ) );
+		update_option( 'active_plugins', array() );
+
+		$data    = $response->get_data();
+		$plugins = (array) $data['active_plugins'];
+
+		$this->assertEquals( 1, count( $plugins ) );
+		$this->assertEquals( 'Hello Dolly', $plugins[0]['name'] );
+	}
+
+	/**
+	 * Test to make sure theme response is correct.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_system_status_info_theme() {
+		wp_set_current_user( $this->user );
+		$active_theme = wp_get_theme();
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/system_status' ) );
+		$data     = $response->get_data();
+		$theme    = (array) $data['theme'];
+
+		$this->assertEquals( 13, count( $theme ) );
+		$this->assertEquals( $active_theme->Name, $theme['name'] );
+	}
+
+	/**
+	 * Test to make sure settings response is correct.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_system_status_info_settings() {
+		wp_set_current_user( $this->user );
+
+		$term_response = array();
+		$terms         = get_terms( 'product_type', array( 'hide_empty' => 0 ) );
+		foreach ( $terms as $term ) {
+			$term_response[ $term->slug ] = strtolower( $term->name );
+		}
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/system_status' ) );
+		$data     = $response->get_data();
+		$settings = (array) $data['settings'];
+
+		$this->assertEquals( 11, count( $settings ) );
+		$this->assertEquals( ( 'yes' === get_option( 'woocommerce_api_enabled' ) ), $settings['api_enabled'] );
+		$this->assertEquals( get_woocommerce_currency(), $settings['currency'] );
+		$this->assertEquals( $term_response, $settings['taxonomies'] );
+	}
+
+	/**
+	 * Test to make sure security response is correct.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_system_status_info_security() {
+		wp_set_current_user( $this->user );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/system_status' ) );
+		$data     = $response->get_data();
+		$settings = (array) $data['security'];
+
+		$this->assertEquals( 2, count( $settings ) );
+		$this->assertEquals( 'https' === substr( get_permalink( wc_get_page_id( 'shop' ) ), 0, 5 ), $settings['secure_connection'] );
+		$this->assertEquals( ! ( defined( 'WP_DEBUG' ) && defined( 'WP_DEBUG_DISPLAY' ) && WP_DEBUG && WP_DEBUG_DISPLAY ) || 0 === intval( ini_get( 'display_errors' ) ), $settings['hide_errors'] );
+	}
+
+	/**
+	 * Test to make sure pages response is correct.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_system_status_info_pages() {
+		wp_set_current_user( $this->user );
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/system_status' ) );
+		$data     = $response->get_data();
+		$pages    = $data['pages'];
+		$this->assertEquals( 4, count( $pages ) );
+	}
+
+	/**
+	 * Test system status schema.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_system_status_schema() {
+		$request = new WP_REST_Request( 'OPTIONS', '/wc/v2/system_status' );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+		$properties = $data['schema']['properties'];
+		$this->assertEquals( 7, count( $properties ) );
+		$this->assertArrayHasKey( 'environment', $properties );
+		$this->assertArrayHasKey( 'database', $properties );
+		$this->assertArrayHasKey( 'active_plugins', $properties );
+		$this->assertArrayHasKey( 'theme', $properties );
+		$this->assertArrayHasKey( 'settings', $properties );
+		$this->assertArrayHasKey( 'security', $properties );
+		$this->assertArrayHasKey( 'pages', $properties );
+	}
+
+	/**
+	 * Test to make sure get_items (all tools) response is correct.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_system_tools() {
+		wp_set_current_user( $this->user );
+
+		$tools_controller = new WC_REST_System_Status_Tools_Controller;
+		$raw_tools        = $tools_controller->get_tools();
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/system_status/tools' ) );
+		$data     = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertEquals( count( $raw_tools ), count( $data ) );
+
+		$this->assertContains( array(
+			'id'          => 'reset_tracking',
+			'name'        => 'Reset usage tracking settings',
+			'action'      => 'Reset usage tracking settings',
+			'description' => 'This will reset your usage tracking settings, causing it to show the opt-in banner again and not sending any data.',
+			'_links'      => array(
+				'item' => array(
+					array(
+						'href'       => rest_url( '/wc/v2/system_status/tools/reset_tracking' ),
+						'embeddable' => true,
+					),
+				),
+			),
+		), $data );
+	}
+
+	/**
+	 * Test to make sure system status tools cannot be accessed without valid creds
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_system_status_tools_without_permission() {
+		wp_set_current_user( 0 );
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/system_status/tools' ) );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Test to make sure we can load a single tool correctly.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_system_tool() {
+		wp_set_current_user( $this->user );
+
+		$tools_controller = new WC_REST_System_Status_Tools_Controller;
+		$raw_tools        = $tools_controller->get_tools();
+		$raw_tool         = $raw_tools['recount_terms'];
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/system_status/tools/recount_terms' ) );
+		$data     = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status() );
+
+		$this->assertEquals( 'recount_terms', $data['id'] );
+		$this->assertEquals( 'Term counts', $data['name'] );
+		$this->assertEquals( 'Recount terms', $data['action'] );
+		$this->assertEquals( 'This tool will recount product terms - useful when changing your settings in a way which hides products from the catalog.', $data['description'] );
+	}
+
+	/**
+	 * Test to make sure a single system status toolscannot be accessed without valid creds.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_system_status_tool_without_permission() {
+		wp_set_current_user( 0 );
+		$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/system_status/tools/recount_terms' ) );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Test to make sure we can RUN a tool correctly.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_execute_system_tool() {
+		wp_set_current_user( $this->user );
+
+		$tools_controller = new WC_REST_System_Status_Tools_Controller;
+		$raw_tools        = $tools_controller->get_tools();
+		$raw_tool         = $raw_tools['recount_terms'];
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'POST', '/wc/v2/system_status/tools/recount_terms' ) );
+		$data     = $response->get_data();
+
+		$this->assertEquals( 'recount_terms', $data['id'] );
+		$this->assertEquals( 'Term counts', $data['name'] );
+		$this->assertEquals( 'Recount terms', $data['action'] );
+		$this->assertEquals( 'This tool will recount product terms - useful when changing your settings in a way which hides products from the catalog.', $data['description'] );
+		$this->assertTrue( $data['success'] );
+
+		$response = $this->server->dispatch( new WP_REST_Request( 'POST', '/wc/v2/system_status/tools/not_a_real_tool' ) );
+		$this->assertEquals( 404, $response->get_status() );
+	}
+
+	/**
+	 * Test to make sure a tool cannot be run without valid creds.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_execute_system_status_tool_without_permission() {
+		wp_set_current_user( 0 );
+		$response = $this->server->dispatch( new WP_REST_Request( 'POST', '/wc/v2/system_status/tools/recount_terms' ) );
+		$this->assertEquals( 401, $response->get_status() );
+	}
+
+	/**
+	 * Test system status schema.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_system_status_tool_schema() {
+		$request = new WP_REST_Request( 'OPTIONS', '/wc/v2/system_status/tools' );
+		$response = $this->server->dispatch( $request );
+		$data = $response->get_data();
+		$properties = $data['schema']['properties'];
+		$this->assertEquals( 6, count( $properties ) );
+		$this->assertArrayHasKey( 'id', $properties );
+		$this->assertArrayHasKey( 'name', $properties );
+		$this->assertArrayHasKey( 'action', $properties );
+		$this->assertArrayHasKey( 'description', $properties );
+		$this->assertArrayHasKey( 'success', $properties );
+		$this->assertArrayHasKey( 'message', $properties );
+	}
+}
diff --git a/tests/unit-tests/cart/cart.php b/tests/unit-tests/cart/cart.php
index 58894a75668..e0a1983f6cc 100644
--- a/tests/unit-tests/cart/cart.php
+++ b/tests/unit-tests/cart/cart.php
@@ -1,12 +1,154 @@
 <?php
 
-namespace WooCommerce\Tests\Cart;
-
 /**
  * Class Cart.
  * @package WooCommerce\Tests\Cart
  */
-class Cart extends \WC_Unit_Test_Case {
+class WC_Tests_Cart extends WC_Unit_Test_Case {
+
+	/**
+	 * Test some discount logic which has caused issues in the past.
+	 * Tickets:
+	 * 	https://github.com/woocommerce/woocommerce/issues/10573
+	 *  https://github.com/woocommerce/woocommerce/issues/10963
+	 *
+	 * Due to discounts being split amongst products in cart.
+	 */
+	public function test_cart_get_discounted_price() {
+		global $wpdb;
+
+		// We need this to have the calculate_totals() method calculate totals
+		if ( ! defined( 'WOOCOMMERCE_CHECKOUT' ) ) {
+			define( 'WOOCOMMERCE_CHECKOUT', true );
+		}
+
+		# Test case 1 #10963
+
+		// Create dummy coupon - fixed cart, 1 value
+		$coupon  = WC_Helper_Coupon::create_coupon();
+
+		// Add coupon
+		WC()->cart->add_discount( $coupon->get_code() );
+
+		// Create dummy product - price will be 10
+		$product = WC_Helper_Product::create_simple_product();
+
+		// Add product to cart x1, calc and test
+		WC()->cart->add_to_cart( $product->get_id(), 1 );
+		WC()->cart->calculate_totals();
+		$this->assertEquals( '9.00', number_format( WC()->cart->total, 2, '.', '' ) );
+		$this->assertEquals( '1.00', number_format( WC()->cart->discount_cart, 2, '.', '' ) );
+
+		// Add product to cart x2, calc and test
+		WC()->cart->add_to_cart( $product->get_id(), 1 );
+		WC()->cart->calculate_totals();
+		$this->assertEquals( '19.00', number_format( WC()->cart->total, 2, '.', '' ) );
+		$this->assertEquals( '1.00', number_format( WC()->cart->discount_cart, 2, '.', '' ) );
+
+		// Add product to cart x3, calc and test
+		WC()->cart->add_to_cart( $product->get_id(), 1 );
+		WC()->cart->calculate_totals();
+		$this->assertEquals( '29.00', number_format( WC()->cart->total, 2, '.', '' ) );
+		$this->assertEquals( '1.00', number_format( WC()->cart->discount_cart, 2, '.', '' ) );
+
+		// Clean up the cart
+		WC()->cart->empty_cart();
+		WC()->cart->remove_coupons();
+
+		# Test case 2 #10573
+		update_post_meta( $product->get_id(), '_regular_price', '29.95' );
+		update_post_meta( $product->get_id(), '_price', '29.95' );
+		update_post_meta( $coupon->get_id(), 'discount_type', 'percent' );
+		update_post_meta( $coupon->get_id(), 'coupon_amount', '10' );
+		update_option( 'woocommerce_prices_include_tax', 'yes' );
+		update_option( 'woocommerce_calc_taxes', 'yes' );
+		$tax_rate = array(
+			'tax_rate_country'  => '',
+			'tax_rate_state'    => '',
+			'tax_rate'          => '10.0000',
+			'tax_rate_name'     => 'TAX',
+			'tax_rate_priority' => '1',
+			'tax_rate_compound' => '0',
+			'tax_rate_shipping' => '1',
+			'tax_rate_order'    => '1',
+			'tax_rate_class'    => '',
+		);
+		WC_Tax::_insert_tax_rate( $tax_rate );
+		$product = wc_get_product( $product->get_id() );
+
+		WC()->cart->add_to_cart( $product->get_id(), 1 );
+		WC()->cart->add_discount( $coupon->get_code() );
+
+		WC()->cart->calculate_totals();
+		$cart_item = current( WC()->cart->get_cart() );
+		$this->assertEquals( '24.51', number_format( $cart_item['line_total'], 2, '.', '' ) );
+
+		// Cleanup
+		$wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rates" );
+		$wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rate_locations" );
+		WC()->cart->empty_cart();
+		WC()->cart->remove_coupons();
+		WC_Helper_Product::delete_product( $product->get_id() );
+
+		# Test case 3 #11626
+		update_post_meta( $coupon->get_id(), 'discount_type', 'percent' );
+		update_post_meta( $coupon->get_id(), 'coupon_amount', '50' );
+		update_option( 'woocommerce_prices_include_tax', 'yes' );
+		update_option( 'woocommerce_calc_taxes', 'yes' );
+
+		$tax_rate = array(
+			'tax_rate_country'  => '',
+			'tax_rate_state'    => '',
+			'tax_rate'          => '19.0000',
+			'tax_rate_name'     => 'TAX',
+			'tax_rate_priority' => '1',
+			'tax_rate_compound' => '0',
+			'tax_rate_shipping' => '1',
+			'tax_rate_order'    => '1',
+			'tax_rate_class'    => '',
+		);
+		WC_Tax::_insert_tax_rate( $tax_rate );
+
+		$product_ids   = array();
+		$products_data = array(
+			'5.17',
+			'3.32',
+			'1.25',
+			'3.50',
+			'5.01',
+			'3.34',
+			'5.99',
+			'5.51',
+		);
+		foreach ( $products_data as $price ) {
+			$loop_product  = WC_Helper_Product::create_simple_product();
+			$product_ids[] = $loop_product->get_id();
+			update_post_meta( $loop_product->get_id(), '_regular_price', $price );
+			update_post_meta( $loop_product->get_id(), '_price', $price );
+			WC()->cart->add_to_cart( $loop_product->get_id(), 1 );
+		}
+
+		WC()->cart->add_discount( $coupon->get_code() );
+		WC()->cart->calculate_totals();
+		$cart_item = current( WC()->cart->get_cart() );
+		$this->assertEquals( '16.55', WC()->cart->total );
+
+		// Cleanup
+		WC()->cart->empty_cart();
+		WC()->cart->remove_coupons();
+
+		foreach ( $product_ids as $product_id ) {
+			WC_Helper_Product::delete_product( $product_id );
+		}
+
+		$wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rates" );
+		$wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rate_locations" );
+		update_option( 'woocommerce_prices_include_tax', 'no' );
+		update_option( 'woocommerce_calc_taxes', 'no' );
+
+		// Delete coupon
+		WC_Helper_Coupon::delete_coupon( $coupon->get_id() );
+	}
 
 	/**
 	 * Test get_remove_url.
@@ -32,10 +174,12 @@ class Cart extends \WC_Unit_Test_Case {
 	public function test_add_to_cart_simple() {
 
 		// Create dummy product
-		$product = \WC_Helper_Product::create_simple_product();
+		$product = WC_Helper_Product::create_simple_product();
+
+		WC()->cart->empty_cart();
 
 		// Add the product to the cart. Methods returns boolean on failure, string on success.
-		$this->assertNotFalse( WC()->cart->add_to_cart( $product->id, 1 ) );
+		$this->assertNotFalse( WC()->cart->add_to_cart( $product->get_id(), 1 ) );
 
 		// Check if the item is in the cart
 		$this->assertEquals( 1, WC()->cart->get_cart_contents_count() );
@@ -44,7 +188,7 @@ class Cart extends \WC_Unit_Test_Case {
 		WC()->cart->empty_cart();
 
 		// Clean up product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 
 	/**
@@ -52,22 +196,22 @@ class Cart extends \WC_Unit_Test_Case {
 	 */
 	public function test_add_to_cart_trashed() {
 		// Create dummy product
-		$product = \WC_Helper_Product::create_simple_product();
+		$product = WC_Helper_Product::create_simple_product();
 
 		// Trash product
-		wp_trash_post( $product->id );
+		wp_trash_post( $product->get_id() );
 
 		// Refetch product, to be sure
-		$product = wc_get_product( $product->id );
+		$product = wc_get_product( $product->get_id() );
 
 		// Add product to cart
-		$this->assertFalse( WC()->cart->add_to_cart( $product->id, 1 ) );
+		$this->assertFalse( WC()->cart->add_to_cart( $product->get_id(), 1 ) );
 
 		// Clean up the cart
 		WC()->cart->empty_cart();
 
 		// Clean up product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 
 	/**
@@ -76,20 +220,19 @@ class Cart extends \WC_Unit_Test_Case {
 	 * @since 2.3
 	 */
 	public function test_add_to_cart_variable() {
-		$product    = \WC_Helper_Product::create_variation_product();
+		$product    = WC_Helper_Product::create_variation_product();
 		$variations = $product->get_available_variations();
 		$variation  = array_shift( $variations );
 
 		// Add the product to the cart. Methods returns boolean on failure, string on success.
-		$this->assertNotFalse( WC()->cart->add_to_cart( $product->id, 1, $variation['variation_id'], array( 'Size' => ucfirst( $variation['attributes']['attribute_pa_size'] ) ) ) );
+		$this->assertNotFalse( WC()->cart->add_to_cart( $product->get_id(), 1, $variation['variation_id'], array( 'Size' => ucfirst( $variation['attributes']['attribute_pa_size'] ) ) ) );
 
 		// Check if the item is in the cart
 		$this->assertEquals( 1, WC()->cart->get_cart_contents_count() );
 
 		// Clean up the cart
 		WC()->cart->empty_cart();
-
-		// @todo clean up the variable product
+		$product->delete( true );
 	}
 
 	/**
@@ -99,14 +242,14 @@ class Cart extends \WC_Unit_Test_Case {
 	 */
 	public function test_add_to_cart_sold_individually() {
 		// Create dummy product
-		$product = \WC_Helper_Product::create_simple_product();
+		$product = WC_Helper_Product::create_simple_product();
 
 		// Set sold_individually to yes
 		$product->sold_individually = 'yes';
-		update_post_meta( $product->id, '_sold_individually', 'yes' );
+		update_post_meta( $product->get_id(), '_sold_individually', 'yes' );
 
 		// Add the product twice to cart, should be corrected to 1. Methods returns boolean on failure, string on success.
-		$this->assertNotFalse( WC()->cart->add_to_cart( $product->id, 2 ) );
+		$this->assertNotFalse( WC()->cart->add_to_cart( $product->get_id(), 2 ) );
 
 		// Check if the item is in the cart
 		$this->assertEquals( 1, WC()->cart->get_cart_contents_count() );
@@ -115,7 +258,7 @@ class Cart extends \WC_Unit_Test_Case {
 		WC()->cart->empty_cart();
 
 		// Clean up product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 
 	/**
@@ -126,13 +269,13 @@ class Cart extends \WC_Unit_Test_Case {
 	public function test_find_product_in_cart() {
 
 		// Create dummy product
-		$product = \WC_Helper_Product::create_simple_product();
+		$product = WC_Helper_Product::create_simple_product();
 
 		// Add product to cart
-		WC()->cart->add_to_cart( $product->id, 1 );
+		WC()->cart->add_to_cart( $product->get_id(), 1 );
 
 		// Generate cart id
-		$cart_id = WC()->cart->generate_cart_id( $product->id );
+		$cart_id = WC()->cart->generate_cart_id( $product->get_id() );
 
 		// Get the product from the cart
 		$this->assertNotEquals( '', WC()->cart->find_product_in_cart( $cart_id ) );
@@ -141,7 +284,7 @@ class Cart extends \WC_Unit_Test_Case {
 		WC()->cart->empty_cart();
 
 		// Clean up product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 
 	}
 
@@ -162,8 +305,8 @@ class Cart extends \WC_Unit_Test_Case {
 				'this',
 				'is',
 				'an',
-				'array'
-			)
+				'array',
+			),
 		);
 
 		// Manually generate ID
@@ -208,13 +351,13 @@ class Cart extends \WC_Unit_Test_Case {
 	 */
 	public function test_set_quantity() {
 		// Create dummy product
-		$product = \WC_Helper_Product::create_simple_product();
+		$product = WC_Helper_Product::create_simple_product();
 
 		// Add 1 product to cart
-		WC()->cart->add_to_cart( $product->id, 1 );
+		WC()->cart->add_to_cart( $product->get_id(), 1 );
 
 		// Get cart id
-		$cart_id = WC()->cart->generate_cart_id( $product->id );
+		$cart_id = WC()->cart->generate_cart_id( $product->get_id() );
 
 		// Set quantity of product in cart to 2
 		$this->assertTrue( WC()->cart->set_quantity( $cart_id, 2 ) );
@@ -232,7 +375,7 @@ class Cart extends \WC_Unit_Test_Case {
 		WC()->cart->empty_cart();
 
 		// Clean up product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 
 	/**
@@ -243,10 +386,10 @@ class Cart extends \WC_Unit_Test_Case {
 	public function test_check_cart_item_validity() {
 
 		// Create dummy product
-		$product = \WC_Helper_Product::create_simple_product();
+		$product = WC_Helper_Product::create_simple_product();
 
 		// Add product to cart
-		WC()->cart->add_to_cart( $product->id, 1 );
+		WC()->cart->add_to_cart( $product->get_id(), 1 );
 
 		// Check cart validity, should pass
 		$this->assertTrue( WC()->cart->check_cart_item_validity() );
@@ -255,7 +398,7 @@ class Cart extends \WC_Unit_Test_Case {
 		WC()->cart->empty_cart();
 
 		// Clean up product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 
 	}
 
@@ -267,7 +410,7 @@ class Cart extends \WC_Unit_Test_Case {
 	public function test_get_total() {
 
 		// Create dummy product
-		$product = \WC_Helper_Product::create_simple_product();
+		$product = WC_Helper_Product::create_simple_product();
 
 		// We need this to have the calculate_totals() method calculate totals
 		if ( ! defined( 'WOOCOMMERCE_CHECKOUT' ) ) {
@@ -275,7 +418,7 @@ class Cart extends \WC_Unit_Test_Case {
 		}
 
 		// Add product to cart
-		WC()->cart->add_to_cart( $product->id, 1 );
+		WC()->cart->add_to_cart( $product->get_id(), 1 );
 
 		// Check
 		$this->assertEquals( apply_filters( 'woocommerce_cart_total', wc_price( WC()->cart->total ) ), WC()->cart->get_total() );
@@ -284,7 +427,7 @@ class Cart extends \WC_Unit_Test_Case {
 		WC()->cart->empty_cart();
 
 		// Clean up product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 
 	/**
@@ -298,7 +441,7 @@ class Cart extends \WC_Unit_Test_Case {
 		update_option( 'woocommerce_calc_taxes', 'yes' );
 
 		// Create dummy product
-		$product = \WC_Helper_Product::create_simple_product();
+		$product = WC_Helper_Product::create_simple_product();
 
 		// We need this to have the calculate_totals() method calculate totals
 		if ( ! defined( 'WOOCOMMERCE_CHECKOUT' ) ) {
@@ -306,7 +449,7 @@ class Cart extends \WC_Unit_Test_Case {
 		}
 
 		// Add product to cart
-		WC()->cart->add_to_cart( $product->id, 1 );
+		WC()->cart->add_to_cart( $product->get_id(), 1 );
 
 		// Calc total
 		$total = WC()->cart->total - WC()->cart->tax_total - WC()->cart->shipping_tax_total;
@@ -321,7 +464,7 @@ class Cart extends \WC_Unit_Test_Case {
 		WC()->cart->empty_cart();
 
 		// Clean up product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 
 		// Restore option
 		update_option( 'woocommerce_calc_taxes', 'no' );
@@ -347,12 +490,12 @@ class Cart extends \WC_Unit_Test_Case {
 	 */
 	public function test_shipping_total() {
 		// Create product
-		$product = \WC_Helper_Product::create_simple_product();
-		update_post_meta( $product->id, '_price', '10' );
-		update_post_meta( $product->id, '_regular_price', '10' );
+		$product = WC_Helper_Product::create_simple_product();
+		update_post_meta( $product->get_id(), '_price', '10' );
+		update_post_meta( $product->get_id(), '_regular_price', '10' );
 
 		// Create a flat rate method
-		\WC_Helper_Shipping::create_simple_flat_rate();
+		WC_Helper_Shipping::create_simple_flat_rate();
 
 		// We need this to have the calculate_totals() method calculate totals
 		if ( ! defined( 'WOOCOMMERCE_CHECKOUT' ) ) {
@@ -360,7 +503,7 @@ class Cart extends \WC_Unit_Test_Case {
 		}
 
 		// Add product to cart
-		WC()->cart->add_to_cart( $product->id, 1 );
+		WC()->cart->add_to_cart( $product->get_id(), 1 );
 
 		// Set the flat_rate shipping method
 		WC()->session->set( 'chosen_shipping_methods', array( 'flat_rate' ) );
@@ -377,10 +520,10 @@ class Cart extends \WC_Unit_Test_Case {
 
 		// Delete the flat rate method
 		WC()->session->set( 'chosen_shipping_methods', array() );
-		\WC_Helper_Shipping::delete_simple_flat_rate();
+		WC_Helper_Shipping::delete_simple_flat_rate();
 
 		// Delete product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 
 	/**
@@ -390,9 +533,9 @@ class Cart extends \WC_Unit_Test_Case {
 	 */
 	public function test_cart_fee() {
 		// Create product
-		$product =\WC_Helper_Product::create_simple_product();
-		update_post_meta( $product->id, '_price', '10' );
-		update_post_meta( $product->id, '_regular_price', '10' );
+		$product = WC_Helper_Product::create_simple_product();
+		update_post_meta( $product->get_id(), '_price', '10' );
+		update_post_meta( $product->get_id(), '_regular_price', '10' );
 
 		// We need this to have the calculate_totals() method calculate totals
 		if ( ! defined( 'WOOCOMMERCE_CHECKOUT' ) ) {
@@ -400,10 +543,10 @@ class Cart extends \WC_Unit_Test_Case {
 		}
 
 		// Add fee
-		\WC_Helper_Fee::add_cart_fee();
+		WC_Helper_Fee::add_cart_fee();
 
 		// Add product to cart
-		WC()->cart->add_to_cart( $product->id, 1 );
+		WC()->cart->add_to_cart( $product->get_id(), 1 );
 
 		// Test if the cart total amount is equal 20
 		$this->assertEquals( 20, WC()->cart->total );
@@ -415,22 +558,21 @@ class Cart extends \WC_Unit_Test_Case {
 		WC()->cart->empty_cart();
 
 		// Remove fee
-		\WC_Helper_Fee::remove_cart_fee();
+		WC_Helper_Fee::remove_cart_fee();
 
 		// Delete product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 
 	/**
 	 * Test cart coupons.
 	 */
 	public function test_get_coupons() {
-
 		// Create coupon
-		$coupon = \WC_Helper_Coupon::create_coupon();
+		$coupon = WC_Helper_Coupon::create_coupon();
 
 		// Add coupon
-		WC()->cart->add_discount( $coupon->code );
+		WC()->cart->add_discount( $coupon->get_code() );
 
 		$this->assertEquals( count( WC()->cart->get_coupons() ), 1 );
 
@@ -441,8 +583,74 @@ class Cart extends \WC_Unit_Test_Case {
 		WC()->cart->remove_coupons();
 
 		// Delete coupon
-		\WC_Helper_Coupon::delete_coupon( $coupon->id );
+		WC_Helper_Coupon::delete_coupon( $coupon->get_id() );
 
 	}
 
+	public function test_add_invidual_use_coupon() {
+		$iu_coupon = WC_Helper_Coupon::create_coupon( 'code1' );
+		$iu_coupon->set_individual_use( true );
+		$iu_coupon->save();
+		$coupon = WC_Helper_Coupon::create_coupon();
+
+		WC()->cart->add_discount( $iu_coupon->get_code() );
+		WC()->cart->add_discount( $coupon->get_code() );
+
+		$coupons = WC()->cart->get_coupons();
+
+		$this->assertEquals( count( $coupons ), 1 );
+		$this->assertEquals( 'code1', reset( $coupons )->get_code() );
+
+		// Clean up
+		WC()->cart->empty_cart();
+		WC()->cart->remove_coupons();
+		WC_Helper_Coupon::delete_coupon( $coupon->get_code() );
+		WC_Helper_Coupon::delete_coupon( $iu_coupon->get_code() );
+	}
+
+	public function test_add_individual_use_coupon_removal() {
+		$coupon = WC_Helper_Coupon::create_coupon();
+		$iu_coupon = WC_Helper_Coupon::create_coupon( 'code1' );
+		$iu_coupon->set_individual_use( true );
+		$iu_coupon->save();
+
+		WC()->cart->add_discount( $coupon->get_code() );
+		WC()->cart->add_discount( $iu_coupon->get_code() );
+
+		$coupons = WC()->cart->get_coupons();
+
+		$this->assertEquals( count( $coupons ), 1 );
+		$this->assertEquals( 'code1', reset( $coupons )->get_code() );
+		$this->assertEquals( 1, did_action( 'woocommerce_removed_coupon' ) );
+
+		// Clean up
+		WC()->cart->empty_cart();
+		WC()->cart->remove_coupons();
+		WC_Helper_Coupon::delete_coupon( $coupon->get_code() );
+		WC_Helper_Coupon::delete_coupon( $iu_coupon->get_code() );
+	}
+
+	public function test_add_individual_use_coupon_double_individual() {
+		$iu_coupon1 = WC_Helper_Coupon::create_coupon( 'code1' );
+		$iu_coupon1->set_individual_use( true );
+		$iu_coupon1->save();
+
+		$iu_coupon2 = WC_Helper_Coupon::create_coupon( 'code2' );
+		$iu_coupon2->set_individual_use( true );
+		$iu_coupon2->save();
+
+		WC()->cart->add_discount( $iu_coupon1->get_code() );
+		WC()->cart->add_discount( $iu_coupon2->get_code() );
+
+		$coupons = WC()->cart->get_coupons();
+
+		$this->assertEquals( count( $coupons ), 1 );
+		$this->assertEquals( 'code2', reset( $coupons )->get_code() );
+
+		// Clean up
+		WC()->cart->empty_cart();
+		WC()->cart->remove_coupons();
+		WC_Helper_Coupon::delete_coupon( $iu_coupon1->get_code() );
+		WC_Helper_Coupon::delete_coupon( $iu_coupon2->get_code() );
+	}
 }
diff --git a/tests/unit-tests/cart/functions.php b/tests/unit-tests/cart/functions.php
index 6c494219911..33f68fa8c6d 100644
--- a/tests/unit-tests/cart/functions.php
+++ b/tests/unit-tests/cart/functions.php
@@ -1,12 +1,10 @@
 <?php
 
-namespace WooCommerce\Tests\Cart;
-
 /**
  * Class Functions.
  * @package WooCommerce\Tests\Cart
  */
-class Functions extends \WC_Unit_Test_Case {
+class WC_Tests_Cart_Functions extends WC_Unit_Test_Case {
 
 	/**
 	 * Helper method to get the checkout URL.
@@ -46,6 +44,8 @@ class Functions extends \WC_Unit_Test_Case {
 	 * @since 2.5.0
 	 */
 	public function test_get_checkout_url_regular() {
+		// Make sure pages exist
+		WC_Install::create_pages();
 
 		// Get the original setting
 		$o_setting = get_option( 'woocommerce_force_ssl_checkout' );
@@ -66,6 +66,8 @@ class Functions extends \WC_Unit_Test_Case {
 	 * @since 2.5.0
 	 */
 	public function test_get_checkout_url_ssl() {
+		// Make sure pages exist
+		WC_Install::create_pages();
 
 		// Get the original setting
 		$o_setting = get_option( 'woocommerce_force_ssl_checkout' );
@@ -87,10 +89,10 @@ class Functions extends \WC_Unit_Test_Case {
 	 */
 	public function test_wc_empty_cart() {
 		// Create dummy product
-		$product = \WC_Helper_Product::create_simple_product();
+		$product = WC_Helper_Product::create_simple_product();
 
 		// Add the product to the cart
-		WC()->cart->add_to_cart( $product->id, 1 );
+		WC()->cart->add_to_cart( $product->get_id(), 1 );
 
 		// Empty the cart
 		wc_empty_cart();
@@ -99,7 +101,7 @@ class Functions extends \WC_Unit_Test_Case {
 		$this->assertEquals( 0, WC()->cart->get_cart_contents_count() );
 
 		// Delete the previously created product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 
 	/**
@@ -110,23 +112,22 @@ class Functions extends \WC_Unit_Test_Case {
 	public function test_wc_format_list_of_items() {
 		$items = array( 'Title 1', 'Title 2' );
 
-		$this->assertEquals( "&ldquo;Title 1&rdquo; and &ldquo;Title 2&rdquo;", wc_format_list_of_items( $items ) );
+		$this->assertEquals( 'Title 1 and Title 2', wc_format_list_of_items( $items ) );
 	}
 
 	/**
 	 * Test wc_cart_totals_subtotal_html().
 	 *
-	 * @todo  test with taxes incl./excl.
 	 * @since 2.4
 	 */
 	public function test_wc_cart_totals_subtotal_html() {
-		$product = \WC_Helper_Product::create_simple_product();
+		$product = WC_Helper_Product::create_simple_product();
 
-		WC()->cart->add_to_cart( $product->id, 1 );
+		WC()->cart->add_to_cart( $product->get_id(), 1 );
 
-		$this->expectOutputString( wc_price( $product->price ), wc_cart_totals_subtotal_html() );
+		$this->expectOutputString( wc_price( $product->get_price( 'edit' ) ), wc_cart_totals_subtotal_html() );
 
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 
 	/**
@@ -135,11 +136,11 @@ class Functions extends \WC_Unit_Test_Case {
 	 * @since 2.4
 	 */
 	public function test_wc_cart_totals_coupon_label() {
-		$coupon = \WC_Helper_Coupon::create_coupon();
+		$coupon = WC_Helper_Coupon::create_coupon();
 
-		$this->expectOutputString( apply_filters( 'woocommerce_cart_totals_coupon_label', 'Coupon: ' . $coupon->code ), wc_cart_totals_coupon_label( $coupon ) );
+		$this->expectOutputString( apply_filters( 'woocommerce_cart_totals_coupon_label', 'Coupon: ' . $coupon->get_code() ), wc_cart_totals_coupon_label( $coupon ) );
 
-		\WC_Helper_Coupon::delete_coupon( $coupon->id );
+		WC_Helper_Coupon::delete_coupon( $coupon->get_id() );
 	}
 
 	/**
@@ -152,4 +153,29 @@ class Functions extends \WC_Unit_Test_Case {
 
 		$this->assertEquals( apply_filters( 'woocommerce_get_cart_url', $cart_page_url ? $cart_page_url : '' ), wc_get_cart_url() );
 	}
+
+	/**
+	 * Test wc_add_to_cart_message
+	 */
+	public function test_wc_add_to_cart_message() {
+		$product = WC_Helper_Product::create_simple_product();
+
+		$message = wc_add_to_cart_message( array( $product->get_id() => 1 ), false, true );
+		$this->assertEquals( '<a href="http://example.org" class="button wc-forward">View cart</a> &ldquo;Dummy Product&rdquo; has been added to your cart.', $message );
+
+		$message = wc_add_to_cart_message( array( $product->get_id() => 3 ), false, true );
+		$this->assertEquals( '<a href="http://example.org" class="button wc-forward">View cart</a> &ldquo;Dummy Product&rdquo; has been added to your cart.', $message );
+
+		$message = wc_add_to_cart_message( array( $product->get_id() => 1 ), true, true );
+		$this->assertEquals( '<a href="http://example.org" class="button wc-forward">View cart</a> &ldquo;Dummy Product&rdquo; has been added to your cart.', $message );
+
+		$message = wc_add_to_cart_message( array( $product->get_id() => 3 ), true, true );
+		$this->assertEquals( '<a href="http://example.org" class="button wc-forward">View cart</a> 3 &times; &ldquo;Dummy Product&rdquo; have been added to your cart.', $message );
+
+		$message = wc_add_to_cart_message( $product->get_id(), false, true );
+		$this->assertEquals( '<a href="http://example.org" class="button wc-forward">View cart</a> &ldquo;Dummy Product&rdquo; has been added to your cart.', $message );
+
+		$message = wc_add_to_cart_message( $product->get_id(), true, true );
+		$this->assertEquals( '<a href="http://example.org" class="button wc-forward">View cart</a> &ldquo;Dummy Product&rdquo; has been added to your cart.', $message );
+	}
 }
diff --git a/tests/unit-tests/coupon/coupon.php b/tests/unit-tests/coupon/coupon.php
index 0f121085773..7476c0fa054 100644
--- a/tests/unit-tests/coupon/coupon.php
+++ b/tests/unit-tests/coupon/coupon.php
@@ -1,12 +1,10 @@
 <?php
 
-namespace WooCommerce\Tests\Coupon;
-
 /**
  * Class Coupon.
  * @package WooCommerce\Tests\Coupon
  */
-class Coupon extends \WC_Unit_Test_Case {
+class WC_Tests_Coupon extends WC_Unit_Test_Case {
 
 	/**
 	 * Test add_discount method.
@@ -16,10 +14,10 @@ class Coupon extends \WC_Unit_Test_Case {
 	public function test_add_discount() {
 
 		// Create coupon
-		$coupon = \WC_Helper_Coupon::create_coupon();
+		$coupon = WC_Helper_Coupon::create_coupon();
 
 		// Add coupon, test return statement
-		$this->assertTrue( WC()->cart->add_discount( $coupon->code ) );
+		$this->assertTrue( WC()->cart->add_discount( $coupon->get_code() ) );
 
 		// Test if total amount of coupons is 1
 		$this->assertEquals( 1, count( WC()->cart->get_applied_coupons() ) );
@@ -31,7 +29,7 @@ class Coupon extends \WC_Unit_Test_Case {
 		WC()->cart->remove_coupons();
 
 		// Delete coupon
-		\WC_Helper_Coupon::delete_coupon( $coupon->id );
+		WC_Helper_Coupon::delete_coupon( $coupon->get_id() );
 	}
 
 	/**
@@ -42,13 +40,13 @@ class Coupon extends \WC_Unit_Test_Case {
 	public function test_add_discount_duplicate() {
 
 		// Create coupon
-		$coupon = \WC_Helper_Coupon::create_coupon();
+		$coupon = WC_Helper_Coupon::create_coupon();
 
 		// Add coupon
-		$this->assertTrue( WC()->cart->add_discount( $coupon->code ) );
+		$this->assertTrue( WC()->cart->add_discount( $coupon->get_code() ) );
 
 		// Add coupon again, test return statement
-		$this->assertFalse( WC()->cart->add_discount( $coupon->code ) );
+		$this->assertFalse( WC()->cart->add_discount( $coupon->get_code() ) );
 
 		// Test if total amount of coupons is 1
 		$this->assertEquals( 1, count( WC()->cart->get_applied_coupons() ) );
@@ -63,7 +61,7 @@ class Coupon extends \WC_Unit_Test_Case {
 		WC()->cart->remove_coupons();
 
 		// Delete coupon
-		\WC_Helper_Coupon::delete_coupon( $coupon->id );
+		WC_Helper_Coupon::delete_coupon( $coupon->get_id() );
 	}
 
 	/**
@@ -74,17 +72,17 @@ class Coupon extends \WC_Unit_Test_Case {
 	public function test_fixed_cart_discount() {
 
 		// Create product
-		$product = \WC_Helper_Product::create_simple_product();
-		update_post_meta( $product->id, '_price', '10' );
-		update_post_meta( $product->id, '_regular_price', '10' );
+		$product = WC_Helper_Product::create_simple_product();
+		update_post_meta( $product->get_id(), '_price', '10' );
+		update_post_meta( $product->get_id(), '_regular_price', '10' );
 
 		// Create coupon
-		$coupon = \WC_Helper_Coupon::create_coupon();
-		update_post_meta( $coupon->id, 'discount_type', 'fixed_cart' );
-		update_post_meta( $coupon->id, 'coupon_amount', '5' );
+		$coupon = WC_Helper_Coupon::create_coupon();
+		update_post_meta( $coupon->get_id(), 'discount_type', 'fixed_cart' );
+		update_post_meta( $coupon->get_id(), 'coupon_amount', '5' );
 
 		// Create a flat rate method
-		\WC_Helper_Shipping::create_simple_flat_rate();
+		WC_Helper_Shipping::create_simple_flat_rate();
 
 		// We need this to have the calculate_totals() method calculate totals
 		if ( ! defined( 'WOOCOMMERCE_CHECKOUT' ) ) {
@@ -92,10 +90,10 @@ class Coupon extends \WC_Unit_Test_Case {
 		}
 
 		// Add product to cart
-		WC()->cart->add_to_cart( $product->id, 1 );
+		WC()->cart->add_to_cart( $product->get_id(), 1 );
 
 		// Add coupon
-		WC()->cart->add_discount( $coupon->code );
+		WC()->cart->add_discount( $coupon->get_code() );
 
 		// Set the flat_rate shipping method
 		WC()->session->set( 'chosen_shipping_methods', array( 'flat_rate' ) );
@@ -115,71 +113,13 @@ class Coupon extends \WC_Unit_Test_Case {
 
 		// Delete the flat rate method
 		WC()->session->set( 'chosen_shipping_methods', array() );
-		\WC_Helper_Shipping::delete_simple_flat_rate();
+		WC_Helper_Shipping::delete_simple_flat_rate();
 
 		// Delete coupon
-		\WC_Helper_Coupon::delete_coupon( $coupon->id );
+		WC_Helper_Coupon::delete_coupon( $coupon->get_id() );
 
 		// Delete product
-		\WC_Helper_Product::delete_product( $product->id );
-	}
-
-	/**
-	 * Test percent cart discount method.
-	 *
-	 * @since 2.3
-	 */
-	public function test_percent_cart_discount() {
-
-		// Create product
-		$product = \WC_Helper_Product::create_simple_product();
-		update_post_meta( $product->id, '_price', '10' );
-		update_post_meta( $product->id, '_regular_price', '10' );
-
-		// Create coupon
-		$coupon = \WC_Helper_Coupon::create_coupon();
-		update_post_meta( $coupon->id, 'discount_type', 'percent' );
-		update_post_meta( $coupon->id, 'coupon_amount', '5' );
-
-		// Create a flat rate method
-		\WC_Helper_Shipping::create_simple_flat_rate();
-
-		// We need this to have the calculate_totals() method calculate totals
-		if ( ! defined( 'WOOCOMMERCE_CHECKOUT' ) ) {
-			define( 'WOOCOMMERCE_CHECKOUT', true );
-		}
-
-		// Add product to cart
-		WC()->cart->add_to_cart( $product->id, 1 );
-
-		// Add coupon
-		WC()->cart->add_discount( $coupon->code );
-
-		// Set the flat_rate shipping method
-		WC()->session->set( 'chosen_shipping_methods', array( 'flat_rate' ) );
-		WC()->cart->calculate_totals();
-
-		// Test if the cart total amount is equal 19.5
-		$this->assertEquals( 19.5, WC()->cart->total );
-
-		// Clearing WC notices
-		wc_clear_notices();
-
-		// Clean up the cart
-		WC()->cart->empty_cart();
-
-		// Remove coupons
-		WC()->cart->remove_coupons();
-
-		// Delete the flat rate method
-		WC()->session->set( 'chosen_shipping_methods', array() );
-		\WC_Helper_Shipping::delete_simple_flat_rate();
-
-		// Delete coupon
-		\WC_Helper_Coupon::delete_coupon( $coupon->id );
-
-		// Delete product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 
 	/**
@@ -190,17 +130,17 @@ class Coupon extends \WC_Unit_Test_Case {
 	public function test_fixed_product_discount() {
 
 		// Create product
-		$product = \WC_Helper_Product::create_simple_product();
-		update_post_meta( $product->id, '_price', '10' );
-		update_post_meta( $product->id, '_regular_price', '10' );
+		$product = WC_Helper_Product::create_simple_product();
+		update_post_meta( $product->get_id(), '_price', '10' );
+		update_post_meta( $product->get_id(), '_regular_price', '10' );
 
 		// Create coupon
-		$coupon = \WC_Helper_Coupon::create_coupon();
-		update_post_meta( $coupon->id, 'discount_type', 'fixed_product' );
-		update_post_meta( $coupon->id, 'coupon_amount', '5' );
+		$coupon = WC_Helper_Coupon::create_coupon();
+		update_post_meta( $coupon->get_id(), 'discount_type', 'fixed_product' );
+		update_post_meta( $coupon->get_id(), 'coupon_amount', '5' );
 
 		// Create a flat rate method - $10
-		\WC_Helper_Shipping::create_simple_flat_rate();
+		WC_Helper_Shipping::create_simple_flat_rate();
 
 		// We need this to have the calculate_totals() method calculate totals
 		if ( ! defined( 'WOOCOMMERCE_CHECKOUT' ) ) {
@@ -208,13 +148,13 @@ class Coupon extends \WC_Unit_Test_Case {
 		}
 
 		// Add fee - $10
-		\WC_Helper_Fee::add_cart_fee();
+		WC_Helper_Fee::add_cart_fee();
 
 		// Add product to cart
-		WC()->cart->add_to_cart( $product->id, 1 );
+		WC()->cart->add_to_cart( $product->get_id(), 1 );
 
 		// Add coupon
-		WC()->cart->add_discount( $coupon->code );
+		WC()->cart->add_discount( $coupon->get_code() );
 
 		// Set the flat_rate shipping method
 		WC()->session->set( 'chosen_shipping_methods', array( 'flat_rate' ) );
@@ -233,17 +173,17 @@ class Coupon extends \WC_Unit_Test_Case {
 		WC()->cart->remove_coupons();
 
 		// Remove fee
-		\WC_Helper_Fee::remove_cart_fee();
+		WC_Helper_Fee::remove_cart_fee();
 
 		// Delete the flat rate method
 		WC()->session->set( 'chosen_shipping_methods', array() );
-		\WC_Helper_Shipping::delete_simple_flat_rate();
+		WC_Helper_Shipping::delete_simple_flat_rate();
 
 		// Delete coupon
-		\WC_Helper_Coupon::delete_coupon( $coupon->id );
+		WC_Helper_Coupon::delete_coupon( $coupon->get_id() );
 
 		// Delete product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 
 	/**
@@ -251,20 +191,20 @@ class Coupon extends \WC_Unit_Test_Case {
 	 *
 	 * @since 2.3
 	 */
-	public function test_percent_product_discount() {
+	public function test_percent_discount() {
 
 		// Create product
-		$product = \WC_Helper_Product::create_simple_product();
-		update_post_meta( $product->id, '_price', '10' );
-		update_post_meta( $product->id, '_regular_price', '10' );
+		$product = WC_Helper_Product::create_simple_product();
+		update_post_meta( $product->get_id(), '_price', '10' );
+		update_post_meta( $product->get_id(), '_regular_price', '10' );
 
 		// Create coupon
-		$coupon = \WC_Helper_Coupon::create_coupon();
-		update_post_meta( $coupon->id, 'discount_type', 'percent_product' );
-		update_post_meta( $coupon->id, 'coupon_amount', '5' );
+		$coupon = WC_Helper_Coupon::create_coupon();
+		update_post_meta( $coupon->get_id(), 'discount_type', 'percent' );
+		update_post_meta( $coupon->get_id(), 'coupon_amount', '5' );
 
 		// Create a flat rate method
-		\WC_Helper_Shipping::create_simple_flat_rate();
+		WC_Helper_Shipping::create_simple_flat_rate();
 
 		// We need this to have the calculate_totals() method calculate totals
 		if ( ! defined( 'WOOCOMMERCE_CHECKOUT' ) ) {
@@ -272,13 +212,13 @@ class Coupon extends \WC_Unit_Test_Case {
 		}
 
 		// Add fee
-		\WC_Helper_Fee::add_cart_fee();
+		WC_Helper_Fee::add_cart_fee();
 
 		// Add product to cart
-		WC()->cart->add_to_cart( $product->id, 1 );
+		WC()->cart->add_to_cart( $product->get_id(), 1 );
 
 		// Add coupon
-		WC()->cart->add_discount( $coupon->code );
+		WC()->cart->add_discount( $coupon->get_code() );
 
 		// Set the flat_rate shipping method
 		WC()->session->set( 'chosen_shipping_methods', array( 'flat_rate' ) );
@@ -297,17 +237,38 @@ class Coupon extends \WC_Unit_Test_Case {
 		WC()->cart->remove_coupons();
 
 		// Remove fee
-		\WC_Helper_Fee::remove_cart_fee();
+		WC_Helper_Fee::remove_cart_fee();
 
 		// Delete the flat rate method
 		WC()->session->set( 'chosen_shipping_methods', array() );
-		\WC_Helper_Shipping::delete_simple_flat_rate();
+		WC_Helper_Shipping::delete_simple_flat_rate();
 
 		// Delete coupon
-		\WC_Helper_Coupon::delete_coupon( $coupon->id );
+		WC_Helper_Coupon::delete_coupon( $coupon->get_id() );
 
 		// Delete product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 
+	/**
+	 * Test date setters/getters.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_dates() {
+		$valid_coupon = WC_Helper_Coupon::create_coupon();
+		$valid_coupon->set_date_expires( time() + 1000 );
+		$valid_coupon->set_date_created( time() );
+		$valid_coupon->set_date_modified( time() );
+
+		$expired_coupon = WC_Helper_Coupon::create_coupon();
+		$expired_coupon->set_date_expires( time() - 10 );
+		$expired_coupon->set_date_created( time() - 20 );
+		$expired_coupon->set_date_modified( time() - 20 );
+
+		$this->assertInstanceOf( 'WC_DateTime', $valid_coupon->get_date_created() );
+		$this->assertTrue( $valid_coupon->is_valid() );
+		$this->assertFalse( $expired_coupon->is_valid() );
+		$this->assertEquals( $expired_coupon->get_error_message(), $expired_coupon->get_coupon_error( WC_Coupon::E_WC_COUPON_EXPIRED ) );
+	}
 }
diff --git a/tests/unit-tests/coupon/data-store.php b/tests/unit-tests/coupon/data-store.php
new file mode 100644
index 00000000000..ce1c2881e95
--- /dev/null
+++ b/tests/unit-tests/coupon/data-store.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * Data Store Tests: Tests WC_Coupon's WC_Data_Store.
+ * @package WooCommerce\Tests\Coupon
+ */
+class WC_Tests_Coupon_Data_Store extends WC_Unit_Test_Case {
+
+	/**
+	 * Make sure the coupon store loads.
+	 *
+	 * @since 3.0.0
+	 */
+	function test_coupon_store_loads() {
+		$store = new WC_Data_Store( 'coupon' );
+		$this->assertTrue( is_callable( array( $store, 'read' ) ) );
+		$this->assertEquals( 'WC_Coupon_Data_Store_CPT', $store->get_current_class_name() );
+	}
+
+	/**
+	 * Test coupon create.
+	 * @since 3.0.0
+	 */
+	function test_coupon_create() {
+		$code = 'coupon-' . time();
+		$coupon = new WC_Coupon;
+		$coupon->set_code( $code );
+		$coupon->set_description( 'This is a test comment.' );
+		$coupon->save();
+
+		$this->assertEquals( $code, $coupon->get_code() );
+		$this->assertNotEquals( 0, $coupon->get_id() );
+	}
+
+	/**
+	 * Test coupon deletion.
+	 * @since 3.0.0
+	 */
+	function test_coupon_delete() {
+		$coupon = WC_Helper_Coupon::create_coupon();
+		$coupon_id = $coupon->get_id();
+		$this->assertNotEquals( 0, $coupon_id );
+		$coupon->delete( true );
+		$coupon = new WC_Coupon( $coupon_id );
+		$this->assertEquals( 0, $coupon->get_id() );
+	}
+
+	/**
+	 * Test coupon update.
+	 * @since 3.0.0
+	 */
+	function test_coupon_update() {
+		$coupon = WC_Helper_Coupon::create_coupon();
+		$coupon_id = $coupon->get_id();
+		$this->assertEquals( 'dummycoupon', $coupon->get_code() );
+		$coupon->set_code( 'dummycoupon2' );
+		$coupon->save();
+		$coupon = new WC_Coupon( $coupon->get_id() );
+		$this->assertEquals( 'dummycoupon2', $coupon->get_code() );
+	}
+
+	/**
+	 * Test coupon reading from the DB.
+	 * @since 3.0.0
+	 */
+	function test_coupon_read() {
+		$code = 'coupon-' . time();
+		$coupon = new WC_Coupon;
+		$coupon->set_code( $code );
+		$coupon->set_description( 'This is a test coupon.' );
+		$coupon->set_usage_count( 5 );
+		$coupon->save();
+		$coupon_id = $coupon->get_id();
+
+		$coupon_read = new WC_Coupon( $coupon_id );
+
+		$this->assertEquals( 5, $coupon_read->get_usage_count() );
+		$this->assertEquals( $code, $coupon_read->get_code() );
+		$this->assertEquals( 'This is a test coupon.', $coupon_read->get_description() );
+	}
+
+	/**
+	 * Test coupon saving.
+	 * @since 3.0.0
+	 */
+	function test_coupon_save() {
+		$coupon = WC_Helper_Coupon::create_coupon();
+		$coupon_id = $coupon->get_id();
+		$coupon->set_code( 'dummycoupon2' );
+		$coupon->save();
+		$coupon = new WC_Coupon( $coupon_id ); // Read from DB to retest
+		$this->assertEquals( 'dummycoupon2', $coupon->get_code() );
+		$this->assertEquals( $coupon_id, $coupon->get_id() );
+
+		$new_coupon = new WC_Coupon;
+		$new_coupon->set_code( 'dummycoupon3' );
+		$new_coupon->save();
+		$new_coupon_id = $new_coupon->get_id();
+		$this->assertEquals( 'dummycoupon3', $new_coupon->get_code() );
+		$this->assertNotEquals( 0, $new_coupon_id );
+	}
+
+	/**
+	 * Test coupon date saving/loading.
+	 * @since 3.0.0
+	 */
+	function test_coupon_date_saving() {
+		$expiry_date = time() - 10;
+
+		$coupon = WC_Helper_Coupon::create_coupon( 'coupon-' . time() );
+		$coupon->set_date_expires( $expiry_date );
+		$coupon->save();
+
+		$coupon_read = new WC_Coupon( $coupon->get_id() );
+
+		$this->assertEquals( date( 'Y-m-d', $expiry_date ), date( 'Y-m-d', $coupon_read->get_date_expires()->getTimestamp() ) );
+	}
+
+	/**
+	 * Test coupon increase, decrease, user usage count methods.
+	 * @since 3.0.0
+	 */
+	function test_coupon_usage_magic_methods() {
+		$coupon  = WC_Helper_Coupon::create_coupon();
+		$user_id = 1;
+
+		$this->assertEquals( 0, $coupon->get_usage_count() );
+		$this->assertEmpty( $coupon->get_used_by() );
+
+		$coupon->increase_usage_count( 'woo@woo.local' );
+
+		$this->assertEquals( 1, $coupon->get_usage_count() );
+		$this->assertEquals( array( 'woo@woo.local' ), $coupon->get_used_by() );
+
+		$coupon->increase_usage_count( $user_id );
+		$coupon->increase_usage_count( $user_id );
+
+		$data_store = WC_Data_Store::load( 'coupon' );
+		$this->assertEquals( 2, $data_store->get_usage_by_user_id( $coupon, $user_id ) );
+
+		$coupon->decrease_usage_count( 'woo@woo.local' );
+		$coupon->decrease_usage_count( $user_id );
+		$this->assertEquals( 1, $coupon->get_usage_count() );
+		$this->assertEquals( array( 1 ), $coupon->get_used_by() );
+	}
+
+}
diff --git a/tests/unit-tests/coupon/data.php b/tests/unit-tests/coupon/data.php
new file mode 100644
index 00000000000..f630cb1cfa2
--- /dev/null
+++ b/tests/unit-tests/coupon/data.php
@@ -0,0 +1,221 @@
+<?php
+/**
+ * Data Tests: Tests WC_Coupon's WC_Data Implementation.
+ * @package WooCommerce\Tests\Coupon
+ */
+class WC_Tests_Coupon_Data extends WC_Unit_Test_Case {
+
+	/**
+	 * Some of our get/setters were renamed. This will return the function
+	 * name we want.
+	 * @param string $function
+	 * @return string
+	 * @since 3.0.0
+	 */
+	function get_function_name( $function ) {
+		if ( 'exclude_product_ids' === $function ) {
+			$function = 'excluded_product_ids';
+		} elseif ( 'exclude_product_categories' === $function ) {
+			$function = 'excluded_product_categories';
+		} elseif ( 'customer_email' === $function ) {
+			$function = 'email_restrictions';
+		}
+
+		return $function;
+	}
+
+	/**
+	 * Test that properties can still be accessed directly for backwards
+	 * compat sake. They throw a deprecated notice.
+	 * @since 3.0.0
+	 */
+	public function test_coupon_backwards_compat_props_use_correct_getters() {
+		// Accessing properties directly will throw some wanted deprected notices
+		// So we need to let PHPUnit know we are expecting them and it's fine to continue
+		$legacy_keys = array(
+			'id',
+			'exists',
+			'coupon_custom_fields',
+			'type',
+			'discount_type',
+			'amount',
+			'coupon_amount',
+			'code',
+			'individual_use',
+			'product_ids',
+			'exclude_product_ids',
+			'usage_limit',
+			'usage_limit_per_user',
+			'limit_usage_to_x_items',
+			'usage_count',
+			'expiry_date',
+			'product_categories',
+			'exclude_product_categories',
+			'minimum_amount',
+			'maximum_amount',
+			'customer_email',
+		);
+		$this->expected_doing_it_wrong = array_merge( $this->expected_doing_it_wrong, $legacy_keys );
+
+		$coupon = WC_Helper_Coupon::create_coupon();
+		$coupon->add_meta_data( 'test_coupon_field', 'testing', true );
+		$coupon->save_meta_data();
+		$coupon = new WC_Coupon( $coupon->get_id() );
+
+		$this->assertEquals( $coupon->get_id(), $coupon->id );
+		$this->assertEquals( ( ( $coupon->get_id() > 0 ) ? true : false ), $coupon->exists );
+		$coupon_cf = $coupon->get_meta( 'test_coupon_field' );
+		$this->assertEquals( $coupon_cf, $coupon->coupon_custom_fields['test_coupon_field'][0] );
+		$this->assertEquals( $coupon->get_discount_type(), $coupon->type );
+		$this->assertEquals( $coupon->get_discount_type(), $coupon->discount_type );
+		$this->assertEquals( $coupon->get_amount(), $coupon->amount );
+		$this->assertEquals( $coupon->get_amount(), $coupon->coupon_amount );
+		$this->assertEquals( $coupon->get_code(), $coupon->code );
+		$this->assertEquals( $coupon->get_individual_use(), ( 'yes' === $coupon->individual_use ? true : false ) );
+		$this->assertEquals( $coupon->get_product_ids(), $coupon->product_ids );
+		$this->assertEquals( $coupon->get_excluded_product_ids(), $coupon->exclude_product_ids );
+		$this->assertEquals( $coupon->get_usage_limit(), $coupon->usage_limit );
+		$this->assertEquals( $coupon->get_usage_limit_per_user(), $coupon->usage_limit_per_user );
+		$this->assertEquals( $coupon->get_limit_usage_to_x_items(), $coupon->limit_usage_to_x_items );
+		$this->assertEquals( $coupon->get_usage_count(), $coupon->usage_count );
+		$this->assertEquals( $coupon->get_date_expires(), $coupon->expiry_date );
+		$this->assertEquals( $coupon->get_product_categories(), $coupon->product_categories );
+		$this->assertEquals( $coupon->get_excluded_product_categories(), $coupon->exclude_product_categories );
+		$this->assertEquals( $coupon->get_minimum_amount(), $coupon->minimum_amount );
+		$this->assertEquals( $coupon->get_maximum_amount(), $coupon->maximum_amount );
+		$this->assertEquals( $coupon->get_email_restrictions(), $coupon->customer_email );
+	}
+
+	/**
+	 * Developers can create manual coupons (code only). This test will make sure this works correctly
+	 * and some of our backwards compat handling works correctly as well.
+	 * @since 3.0.0
+	 */
+	public function test_read_manual_coupon() {
+		$code = 'manual_coupon_' . time();
+		$coupon = new WC_Coupon( $code );
+		$coupon->read_manual_coupon( $code, array(
+			'id'                         => true,
+			'type'                       => 'fixed_cart',
+			'amount'                     => 0,
+			'individual_use'             => true,
+			'product_ids'                => array(),
+			'exclude_product_ids'        => array(),
+			'usage_limit'                => '',
+			'usage_count'                => '',
+			'expiry_date'                => '',
+			'free_shipping'              => false,
+			'product_categories'         => array(),
+			'exclude_product_categories' => array(),
+			'exclude_sale_items'         => false,
+			'minimum_amount'             => '',
+			'maximum_amount'             => 100,
+			'customer_email'             => '',
+		) );
+		$this->assertEquals( $code, $coupon->get_code() );
+		$this->assertTrue( $coupon->get_individual_use() );
+		$this->assertEquals( 100, $coupon->get_maximum_amount() );
+
+		/**
+		 * test our back compat logic: passing in product_ids/exclude_product_ids in as strings
+		 * and passing free_shipping, exclude_sale_items, and individual_use in as yes|no strings.
+		 * setting these values this way will also throw a deprecated notice so we will let
+		 * PHPUnit know that its okay to continue.
+		 */
+		$legacy_keys = array( 'product_ids', 'exclude_product_ids', 'individual_use', 'free_shipping', 'exclude_sale_items' );
+		$this->expected_doing_it_wrong = array_merge( $this->expected_doing_it_wrong, $legacy_keys );
+		$code = 'bc_manual_coupon_' . time();
+		$coupon = new WC_Coupon( $code );
+		$coupon->read_manual_coupon( $code, array(
+			'id'                         => true,
+			'type'                       => 'fixed_cart',
+			'amount'                     => 0,
+			'individual_use'             => 'yes',
+			'product_ids'                => '',
+			'exclude_product_ids'        => '5,6',
+			'usage_limit'                => '',
+			'usage_count'                => '',
+			'expiry_date'                => '',
+			'free_shipping'              => 'no',
+			'product_categories'         => array(),
+			'exclude_product_categories' => array(),
+			'exclude_sale_items'         => 'no',
+			'minimum_amount'             => '',
+			'maximum_amount'             => 100,
+			'customer_email'             => '',
+		) );
+		$this->assertEquals( $code, $coupon->get_code() );
+		$this->assertTrue( $coupon->get_individual_use() );
+		$this->assertFalse( $coupon->get_free_shipping() );
+		$this->assertFalse( $coupon->get_exclude_sale_items() );
+		$this->assertEquals( array( 5, 6 ), $coupon->get_excluded_product_ids() );
+		$this->assertEquals( array(), $coupon->get_product_ids() );
+	}
+
+	/**
+	 * Test standard coupon getters & setters.
+	 * @since 3.0.0
+	 */
+	public function test_coupon_getters_and_setters() {
+		$time = time();
+		$standard_getters_and_setters = array(
+			'code' => 'test',
+			'description' => 'hello world',
+			'discount_type' => 'percent',
+			'amount' => 10.50,
+			'usage_count' => 5,
+			'individual_use' => true,
+			'product_ids' => array( 5, 10 ),
+			'exclude_product_ids' => array( 2, 1 ),
+			'usage_limit' => 2,
+			'usage_limit_per_user' => 10,
+			'limit_usage_to_x_items' => 2,
+			'free_shipping' => true,
+			'product_categories' => array( 6 ),
+			'exclude_product_categories' => array( 8 ),
+			'exclude_sale_items' => true,
+			'minimum_amount' => 2,
+			'maximum_amount' => 1000,
+			'customer_email' => array( 'test@woo.local' ),
+			'used_by' => array( 1 ),
+		);
+
+		$coupon = new WC_Coupon;
+		 foreach ( $standard_getters_and_setters as $function => $value ) {
+		 	$function = $this->get_function_name( $function );
+			$coupon->{"set_{$function}"}( $value );
+			$this->assertEquals( $value, $coupon->{"get_{$function}"}(), $function );
+		}
+	}
+
+	/**
+	 * Test getting custom fields.
+	 * @since 3.0.0
+	 */
+	public function test_get_custom_fields() {
+		$coupon     = WC_Helper_Coupon::create_coupon();
+		$coupon_id  = $coupon->get_id();
+		$meta_value = time() . '-custom-value';
+		$coupon->add_meta_data( 'test_coupon_field', $meta_value, true );
+		$coupon->save_meta_data();
+
+		$coupon = new WC_Coupon( $coupon_id );
+		$custom_fields = $coupon->get_meta_data();
+		$this->assertCount( 1, $custom_fields );
+		$this->assertEquals( $meta_value, $coupon->get_meta( 'test_coupon_field' ) );
+	}
+
+	/**
+	 * Test setting custom fields.
+	 * @since 3.0.0
+	 */
+	public function test_set_custom_fields() {
+		$coupon     = WC_Helper_Coupon::create_coupon();
+		$coupon_id  = $coupon->get_id();
+		$meta_value = time() . '-custom-value';
+		$coupon->add_meta_data( 'my-custom-field', $meta_value, true );
+		$coupon->save();
+		$coupon = new WC_Coupon( $coupon_id );
+		$this->assertEquals( $meta_value, $coupon->get_meta( 'my-custom-field' ) );
+	}
+}
diff --git a/tests/unit-tests/coupon/functions.php b/tests/unit-tests/coupon/functions.php
index 6f821ce8097..989f3a159df 100644
--- a/tests/unit-tests/coupon/functions.php
+++ b/tests/unit-tests/coupon/functions.php
@@ -1,13 +1,11 @@
 <?php
 
-namespace WooCommerce\Tests\Coupon;
-
 /**
  * Class Functions.
  * @package WooCommerce\Tests\Coupon
  * @since 2.2
  */
-class Functions extends \WC_Unit_Test_Case {
+class WC_Tests_Functions extends WC_Unit_Test_Case {
 
 	/**
 	 * Test wc_get_coupon_types().
@@ -17,10 +15,9 @@ class Functions extends \WC_Unit_Test_Case {
 	public function test_wc_get_coupon_types() {
 
 		$coupon_types = array(
-			'fixed_cart'      => __( 'Cart Discount', 'woocommerce' ),
-			'percent'         => __( 'Cart % Discount', 'woocommerce' ),
-			'fixed_product'   => __( 'Product Discount', 'woocommerce' ),
-			'percent_product' => __( 'Product % Discount', 'woocommerce' )
+			'percent'       => __( 'Percentage discount', 'woocommerce' ),
+			'fixed_cart'    => __( 'Fixed cart discount', 'woocommerce' ),
+			'fixed_product' => __( 'Fixed product discount', 'woocommerce' ),
 		);
 
 		$this->assertEquals( $coupon_types, wc_get_coupon_types() );
@@ -33,7 +30,7 @@ class Functions extends \WC_Unit_Test_Case {
 	 */
 	public function test_wc_get_coupon_type() {
 
-		$this->assertEquals( 'Cart Discount', wc_get_coupon_type( 'fixed_cart' ) );
+		$this->assertEquals( 'Fixed cart discount', wc_get_coupon_type( 'fixed_cart' ) );
 		$this->assertEmpty( wc_get_coupon_type( 'bogus_type' ) );
 	}
 
@@ -46,4 +43,39 @@ class Functions extends \WC_Unit_Test_Case {
 		$this->assertEquals( apply_filters( 'woocommerce_coupons_enabled', get_option( 'woocommerce_enable_coupons' ) == 'yes' ), wc_coupons_enabled() );
 	}
 
+	/**
+	 * Test wc_get_coupon_code_by_id().
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_wc_get_coupon_code_by_id() {
+		// Create coupon.
+		$code   = 'testcoupon';
+		$coupon = WC_Helper_Coupon::create_coupon( $code );
+
+		$this->assertEquals( $code, wc_get_coupon_code_by_id( $coupon->get_id() ) );
+
+		// Delete coupon.
+		WC_Helper_Coupon::delete_coupon( $coupon->get_id() );
+
+		$this->assertEmpty( wc_get_coupon_code_by_id( 0 ) );
+	}
+
+	/**
+	 * Test wc_get_coupon_id_by_code().
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_wc_get_coupon_id_by_code() {
+		// Create coupon.
+		$code   = 'testcoupon';
+		$coupon = WC_Helper_Coupon::create_coupon( $code );
+
+		$this->assertEquals( $coupon->get_id(), wc_get_coupon_id_by_code( $coupon->get_code() ) );
+
+		// Delete coupon.
+		WC_Helper_Coupon::delete_coupon( $coupon->get_id() );
+
+		$this->assertEmpty( wc_get_coupon_id_by_code( 0 ) );
+	}
 }
diff --git a/tests/unit-tests/crud/data-store.php b/tests/unit-tests/crud/data-store.php
new file mode 100644
index 00000000000..efc923b4ebf
--- /dev/null
+++ b/tests/unit-tests/crud/data-store.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Data Store Tests
+ * @package WooCommerce\Tests\Product
+ * @since 3.0.0
+ */
+class WC_Tests_Data_Store extends WC_Unit_Test_Case {
+
+	/**
+	 * Make sure WC_Data_Store returns an exception if we try to load a data
+	 * store that doesn't exist.
+	 *
+	 * @since 3.0.0
+	 */
+	function test_invalid_store_throws_exception() {
+		try {
+			$product_store = new WC_Data_Store( 'bogus' );
+		} catch ( Exception $e ) {
+			$this->assertEquals( $e->getMessage(), 'Invalid data store.' );
+			return;
+		}
+		$this->fail( 'Invalid data store exception not correctly raised.' );
+	}
+
+	/**
+	 * Make sure ::load throws an exception for invalid data stores
+	 *
+	 * @since 3.0.0
+	 */
+	function test_invalid_store_load_throws_exception() {
+		try {
+			$product_store = WC_Data_Store::load( 'does-not-exist' );
+		} catch ( Exception $e ) {
+			$this->assertEquals( $e->getMessage(), 'Invalid data store.' );
+			return;
+		}
+		$this->fail( 'Invalid data store exception not correctly raised.' );
+	}
+
+	/**
+	 * Make sure we can swap out stores.
+	 *
+	 * @since 3.0.0
+	 */
+	function test_store_swap() {
+		$this->load_dummy_store();
+
+		$store = new WC_Data_Store( 'dummy' );
+		$this->assertEquals( 'WC_Dummy_Data_Store_CPT', $store->get_current_class_name() );
+
+		add_filter( 'woocommerce_dummy_data_store', array( $this, 'set_dummy_store' ) );
+
+		$store = new WC_Data_Store( 'dummy' );
+		$this->assertEquals( 'WC_Dummy_Data_Store_Custom_Table', $store->get_current_class_name() );
+
+		add_filter( 'woocommerce_dummy_data_store', array( $this, 'set_default_dummy_store' ) );
+	}
+
+	/**
+	 * Test to see if `first_second ``-> returns to `first` if unregistered.
+	 *
+	 * @since 3.0.0
+	 */
+	function test_store_sub_type() {
+		$this->load_dummy_store();
+		$store = WC_Data_Store::load( 'dummy-sub' );
+		$this->assertEquals( 'WC_Dummy_Data_Store_CPT', $store->get_current_class_name() );
+	}
+
+	/* Helper Functions. */
+
+	/**
+	 * Loads two dummy data store classes that can be swapped out for each other. Adds to the `woocommerce_data_stores` filter.
+	 *
+	 * @since 3.0.0
+	 */
+	function load_dummy_store() {
+		include_once( dirname( dirname( dirname( __FILE__ ) ) ) . '/framework/class-wc-dummy-data-store.php' );
+		add_filter( 'woocommerce_data_stores', array( $this, 'add_dummy_data_store' ) );
+	}
+
+	/**
+	 * Adds a default class for the 'dummy' data store.
+	 *
+	 * @since 3.0.0
+	 */
+	function add_dummy_data_store( $stores ) {
+		$stores['dummy'] = 'WC_Dummy_Data_Store_CPT';
+		return $stores;
+	}
+
+	/**
+	 * Helper function/filter to swap out the default dummy store for a different one.
+	 *
+	 * @since 3.0.0
+	 */
+	function set_dummy_store( $store ) {
+		return 'WC_Dummy_Data_Store_Custom_Table';
+	}
+
+	/**
+	 * Helper function/filter to swap out the 'dummy' store for the default one.
+	 *
+	 * @since 3.0.0
+	 */
+	function set_default_product_store( $store ) {
+		return 'WC_Dummy_Data_Store_CPT';
+	}
+}
diff --git a/tests/unit-tests/crud/data.php b/tests/unit-tests/crud/data.php
new file mode 100644
index 00000000000..9b38b26c63d
--- /dev/null
+++ b/tests/unit-tests/crud/data.php
@@ -0,0 +1,530 @@
+<?php
+
+/**
+ * Meta
+ * @package WooCommerce\Tests\CRUD
+ */
+class WC_Tests_CRUD_Data extends WC_Unit_Test_Case {
+
+	/**
+	 * Restore UTC on failire.
+	 */
+	 public function tearDown() {
+ 		parent::tearDown();
+		// @codingStandardsIgnoreStart
+		date_default_timezone_set( 'UTC' );
+		// @codingStandardsIgnoreEnd
+		update_option( 'gmt_offset', 0 );
+		update_option( 'timezone_string', '' );
+	}
+
+	public function onNotSuccessfulTest( $e ) {
+		// @codingStandardsIgnoreStart
+		date_default_timezone_set( 'UTC' );
+		// @codingStandardsIgnoreEnd
+		update_option( 'gmt_offset', 0 );
+		update_option( 'timezone_string', '' );
+		parent::onNotSuccessfulTest( $e );
+	}
+
+	/**
+	 * Create a test post we can add/test meta against.
+	 */
+	public function create_test_post() {
+		$object = new WC_Mock_WC_Data();
+		$object->data_store->set_meta_type( 'post' );
+		$object->data_store->set_object_id_field( '' );
+		$object->set_content( 'testing' );
+		$object->save();
+		return $object;
+	}
+
+	/**
+	 * Create a test user we can add/test meta against.
+	 */
+	public function create_test_user() {
+		$object = new WC_Mock_WC_Data();
+		$object->data_store->set_meta_type( 'user' );
+		$object->data_store->set_object_id_field( 'user_id' );
+		$object->set_content( 'testing@woo.dev' );
+		$object->save();
+		return $object;
+	}
+
+	/**
+	 * Test: get_data
+	 */
+	function test_get_data() {
+		$object = new WC_Mock_WC_Data();
+		$this->assertInternalType( 'array', $object->get_data() );
+	}
+
+	/**
+	 * Test: delete_meta_data_by_mid
+	 */
+	function test_delete_meta_data_by_mid() {
+		$object = $this->create_test_post();
+		$object_id = $object->get_id();
+		$meta_id = add_metadata( 'post', $object_id, 'test_meta_key', 'val1', true );
+		$object->delete_meta_data_by_mid( $meta_id );
+		$this->assertEmpty( $object->get_meta( 'test_meta_key' ) );
+	}
+
+	/**
+	 * Test: set_props
+	 */
+	function test_set_props() {
+		$object = new WC_Mock_WC_Data();
+		$data_to_set = array(
+			'content'    => 'I am a fish',
+			'bool_value' => true,
+		);
+		$result = $object->set_props( $data_to_set );
+		$this->assertFalse( is_wp_error( $result ) );
+		$this->assertEquals( 'I am a fish', $object->get_content() );
+		$this->assertTrue( $object->get_bool_value() );
+
+		$data_to_set = array(
+			'content'    => 'I am also a fish',
+			'bool_value' => 'thisisinvalid',
+		);
+		$result = $object->set_props( $data_to_set );
+		$this->assertTrue( is_wp_error( $result ) );
+		$this->assertEquals( 'I am also a fish', $object->get_content() );
+		$this->assertNotEquals( 'thisisinvalid', $object->get_bool_value() );
+	}
+
+	/**
+	 * Tests reading and getting set metadata.
+	 */
+	function test_get_meta_data() {
+		$object    = $this->create_test_post();
+		$object_id = $object->get_id();
+		$object->add_meta_data( 'test_meta_key', 'val1', true );
+		$object->add_meta_data( 'test_multi_meta_key', 'val2' );
+		$object->add_meta_data( 'test_multi_meta_key', 'val3' );
+		$object->save_meta_data();
+
+		$meta_data = $object->get_meta_data();
+		$i         = 1;
+
+		$this->assertNotEmpty( $meta_data );
+		foreach ( $meta_data as $mid => $data ) {
+			$this->assertEquals( "val{$i}", $data->value );
+			$i++;
+		}
+	}
+
+	/**
+	 * Tests that the meta data cache is not shared among instances.
+	 */
+	function test_get_meta_data_shared_bug() {
+		$object  = new WC_Order;
+		$object->add_meta_data( 'test_meta_key', 'val1', true );
+		$object->add_meta_data( 'test_multi_meta_key', 'val2' );
+		$object->add_meta_data( 'test_multi_meta_key', 'val3' );
+		$object->save();
+
+		$order = new WC_Order( $object->get_id() );
+		$metas = $order->get_meta_data();
+		$metas[0]->value = 'wrong value';
+
+		$order = new WC_Order( $object->get_id() );
+		$metas = $order->get_meta_data();
+		$this->assertNotEquals( 'wrong value', $metas[0]->value );
+	}
+
+	/**
+	 * Tests the cache invalidation after an order is saved
+	 */
+	function test_get_meta_data_cache_invalidation() {
+		$object  = new WC_Order;
+		$object->add_meta_data( 'test_meta_key', 'val1', true );
+		$object->add_meta_data( 'test_multi_meta_key', 'val2' );
+		$object->add_meta_data( 'test_multi_meta_key', 'val3' );
+		$object->save();
+
+		$order = new WC_Order( $object->get_id() );
+		$metas = $order->get_meta_data();
+		$metas[0]->value = 'updated value';
+		$order->save();
+
+		$order = new WC_Order( $object->get_id() );
+		$metas = $order->get_meta_data();
+		$this->assertEquals( 'updated value', $metas[0]->value );
+	}
+
+	/**
+	 * Test getting meta by ID.
+	 */
+	function test_get_meta() {
+		$object = $this->create_test_post();
+		$object_id = $object->get_id();
+		$object->add_meta_data( 'test_meta_key', 'val1', true );
+		$object->add_meta_data( 'test_multi_meta_key', 'val2' );
+		$object->add_meta_data( 'test_multi_meta_key', 'val3' );
+		$object->save_meta_data();
+		$object = new WC_Mock_WC_Data( $object_id );
+
+		// test single meta key
+		$single_meta = $object->get_meta( 'test_meta_key' );
+		$this->assertEquals( 'val1', $single_meta );
+
+		// test getting multiple
+		$meta = $object->get_meta( 'test_multi_meta_key', false );
+		$i    = 2;
+		foreach ( $meta as $data ) {
+			$this->assertEquals( 'test_multi_meta_key', $data->key );
+			$this->assertEquals( "val{$i}", $data->value );
+			$i++;
+		}
+	}
+
+	/**
+	 * Test seeing if meta exists.
+	 */
+	function test_has_meta() {
+		$object    = $this->create_test_post();
+		$object_id = $object->get_id();
+		$object->add_meta_data( 'test_meta_key', 'val1', true );
+		$object->add_meta_data( 'test_multi_meta_key', 'val2' );
+		$object->add_meta_data( 'test_multi_meta_key', 'val3' );
+		$object->save_meta_data();
+		$object = new WC_Mock_WC_Data( $object_id );
+
+		$this->assertTrue( $object->meta_exists( 'test_meta_key' ) );
+		$this->assertTrue( $object->meta_exists( 'test_multi_meta_key' ) );
+		$this->assertFalse( $object->meta_exists( 'thiskeyisnothere' ) );
+	}
+
+	/**
+	 * Test getting meta that hasn't been set
+	 */
+	function test_get_meta_no_meta() {
+		$object = $this->create_test_post();
+		$object_id = $object->get_id();
+		$object = new WC_Mock_WC_Data( $object_id );
+
+		$single_on = $object->get_meta( 'doesnt-exist', true );
+		$single_off = $object->get_meta( 'also-doesnt-exist', false );
+
+		$this->assertEquals( '', $single_on );
+		$this->assertEquals( array(), $single_off );
+	}
+
+	/**
+	 * Test setting meta.
+	 */
+	function test_set_meta_data() {
+		global $wpdb;
+		$object = $this->create_test_post();
+		$object_id = $object->get_id();
+		add_metadata( 'post', $object_id, 'test_meta_key', 'val1', true );
+		add_metadata( 'post', $object_id, 'test_meta_key_2', 'val2', true );
+		$object = new WC_Mock_WC_Data( $object_id );
+
+		$metadata     = array();
+		$raw_metadata = $wpdb->get_results( $wpdb->prepare( "
+			SELECT meta_id, meta_key, meta_value
+			FROM {$wpdb->prefix}postmeta
+			WHERE post_id = %d ORDER BY meta_id
+		", $object_id ) );
+
+		foreach ( $raw_metadata as $meta ) {
+			$metadata[] = (object) array(
+				'id'    => $meta->meta_id,
+				'key'   => $meta->meta_key,
+				'value' => $meta->meta_value,
+			);
+		}
+
+		$object = new WC_Mock_WC_Data();
+		$object->set_meta_data( $metadata );
+
+		$this->assertEquals( $metadata, $object->get_meta_data() );
+	}
+
+	/**
+	 * Test adding meta data.
+	 */
+	function test_add_meta_data() {
+		$object = $this->create_test_post();
+		$object_id = $object->get_id();
+		$data = 'add_meta_data_' . time();
+		$object->add_meta_data( 'test_new_field', $data );
+		$meta = $object->get_meta( 'test_new_field' );
+		$this->assertEquals( $data, $meta );
+	}
+
+	/**
+	 * Test updating meta data.
+	 */
+	function test_update_meta_data() {
+		global $wpdb;
+		$object = $this->create_test_post();
+		$object_id = $object->get_id();
+		add_metadata( 'post', $object_id, 'test_meta_key', 'val1', true );
+		$object = new WC_Mock_WC_Data( $object_id );
+
+		$this->assertEquals( 'val1', $object->get_meta( 'test_meta_key' ) );
+
+		$metadata     = array();
+		$meta_id = $wpdb->get_var( $wpdb->prepare( "
+			SELECT meta_id
+			FROM {$wpdb->prefix}postmeta
+			WHERE post_id = %d LIMIT 1
+		", $object_id ) );
+
+		$object->update_meta_data( 'test_meta_key', 'updated_value', $meta_id );
+		$this->assertEquals( 'updated_value', $object->get_meta( 'test_meta_key' ) );
+	}
+
+	/**
+	 * Test deleting meta.
+	 */
+	function test_delete_meta_data() {
+		$object = $this->create_test_post();
+		$object_id = $object->get_id();
+		add_metadata( 'post', $object_id, 'test_meta_key', 'val1', true );
+		$object = new WC_Mock_WC_Data( $object_id );
+
+		$this->assertEquals( 'val1', $object->get_meta( 'test_meta_key' ) );
+
+		$object->delete_meta_data( 'test_meta_key' );
+
+		$this->assertEmpty( $object->get_meta( 'test_meta_key' ) );
+	}
+
+
+	/**
+	 * Test saving metadata.. (Actually making sure changes are written to DB)
+	 */
+	function test_save_meta_data() {
+		global $wpdb;
+		$object = $this->create_test_post();
+		$object_id = $object->get_id();
+		$object->add_meta_data( 'test_meta_key', 'val1', true );
+		$object->add_meta_data( 'test_meta_key_2', 'val2', true );
+		$object->save_meta_data();
+		$object = new WC_Mock_WC_Data( $object_id );
+
+		$raw_metadata = $wpdb->get_results( $wpdb->prepare( "
+			SELECT meta_id, meta_key, meta_value
+			FROM {$wpdb->prefix}postmeta
+			WHERE post_id = %d ORDER BY meta_id
+		", $object_id ) );
+
+		$object->delete_meta_data( 'test_meta_key' );
+		$object->update_meta_data( 'test_meta_key_2', 'updated_value', $raw_metadata[1]->meta_id );
+
+		$object->save();
+		$object = new WC_Mock_WC_Data( $object_id ); // rereads from the DB
+
+		$this->assertEmpty( $object->get_meta( 'test_meta_key' ) );
+		$this->assertEquals( 'updated_value', $object->get_meta( 'test_meta_key_2' ) );
+	}
+
+	/**
+	 * Test reading/getting user meta data too.
+	 */
+	function test_usermeta() {
+		$object = $this->create_test_user();
+		$object_id = $object->get_id();
+		$object->add_meta_data( 'test_meta_key', 'val1', true );
+		$object->add_meta_data( 'test_meta_key_2', 'val2', true );
+		$object->save_meta_data();
+
+		$this->assertEquals( 'val1', $object->get_meta( 'test_meta_key' ) );
+		$this->assertEquals( 'val2', $object->get_meta( 'test_meta_key_2' ) );
+	}
+
+	/**
+	 * Test adding meta data/updating meta data just added without keys colliding when changing
+	 * data before a save.
+	 */
+	function test_add_meta_data_overwrite_before_save() {
+		$object = new WC_Mock_WC_Data;
+		$object->add_meta_data( 'test_field_0', 'another field', true );
+		$object->add_meta_data( 'test_field_1', 'another field', true );
+		$object->add_meta_data( 'test_field_2', 'val1', true );
+		$object->update_meta_data( 'test_field_0', 'another field 2' );
+		$this->assertEquals( 'val1', $object->get_meta( 'test_field_2' ) );
+	}
+
+	/**
+	 * Test protected method set_date_prop by testing a order date setter.
+	 */
+	function set_date_prop_gmt_offset( $timezone = 'UTC' ) {
+		// @codingStandardsIgnoreStart
+		date_default_timezone_set( $timezone );
+
+		$object = new WC_Order();
+
+		// Change timezone in WP.
+		update_option( 'gmt_offset', -4 );
+
+		// Set date to a UTC timestamp and expect a valid UTC timestamp back.
+		$object->set_date_created( 1488979186 );
+		$this->assertEquals( 1488979186, $object->get_date_created()->getTimestamp() );
+
+		// Set date to a string without timezone info. This will be assumed in local timezone and thus should match the offset timestamp.
+		$object->set_date_created( '2017-01-02' );
+		$this->assertEquals( -14400, $object->get_date_created()->getOffset() );
+		$this->assertEquals( '2017-01-02 00:00:00', $object->get_date_created()->date( 'Y-m-d H:i:s' ) );
+		$this->assertEquals( 1483315200 - $object->get_date_created()->getOffset(), $object->get_date_created()->getTimestamp() );
+		$this->assertEquals( 1483315200, $object->get_date_created()->getOffsetTimestamp() );
+
+		// Date time with no timezone.
+		$object->set_date_created( '2017-01-02T00:00' );
+		$this->assertEquals( 1483315200 - $object->get_date_created()->getOffset(), $object->get_date_created()->getTimestamp() );
+		$this->assertEquals( 1483315200, $object->get_date_created()->getOffsetTimestamp() );
+		$this->assertEquals( '2017-01-02 00:00:00', $object->get_date_created()->date( 'Y-m-d H:i:s' ) );
+
+		// ISO 8601 date time with offset.
+		$object->set_date_created( '2017-01-01T20:00:00-04:00' );
+		$this->assertEquals( 1483315200, $object->get_date_created()->getTimestamp() );
+		$this->assertEquals( '2017-01-01 20:00:00', $object->get_date_created()->date( 'Y-m-d H:i:s' ) );
+
+		// ISO 8601 date time different offset to site timezone.
+		$object->set_date_created( '2017-01-01T16:00:00-08:00' );
+		$this->assertEquals( 1483315200, $object->get_date_created()->getTimestamp() );
+		$this->assertEquals( '2017-01-01 20:00:00', $object->get_date_created()->date( 'Y-m-d H:i:s' ) );
+
+		// ISO 8601 date time in UTC.
+		$object->set_date_created( '2017-01-02T00:00:00+00:00' );
+		$this->assertEquals( 1483315200, $object->get_date_created()->getTimestamp() );
+		$this->assertEquals( '2017-01-01 20:00:00', $object->get_date_created()->date( 'Y-m-d H:i:s' ) );
+
+		// Restore default.
+		update_option( 'gmt_offset', 0 );
+
+		date_default_timezone_set( 'UTC' );
+		// @codingStandardsIgnoreEnd
+	}
+
+	/**
+	 * Test protected method set_date_prop by testing a order date setter.
+	 */
+	function set_date_prop_timezone_string( $timezone = 'UTC' ) {
+		// @codingStandardsIgnoreStart
+		date_default_timezone_set( $timezone );
+
+		$object = new WC_Order();
+
+		// Repeat tests with timezone_string. America/New_York is -5 in the winter and -4 in summer.
+		update_option( 'timezone_string', 'America/New_York' );
+
+		// Set date to a UTC timestamp and expect a valid UTC timestamp back.
+		$object->set_date_created( 1488979186 );
+		$this->assertEquals( 1488979186, $object->get_date_created()->getTimestamp() );
+
+		// Set date to a string without timezone info. This will be assumed in local timezone and thus should match the offset timestamp.
+		$object->set_date_created( '2017-01-02' );
+		$this->assertEquals( 1483315200 - $object->get_date_created()->getOffset(), $object->get_date_created()->getTimestamp() );
+		$this->assertEquals( 1483315200, $object->get_date_created()->getOffsetTimestamp() );
+		$this->assertEquals( '2017-01-02 00:00:00', $object->get_date_created()->date( 'Y-m-d H:i:s' ) );
+
+		// Date time with no timezone.
+		$object->set_date_created( '2017-01-02T00:00' );
+		$this->assertEquals( 1483315200 - $object->get_date_created()->getOffset(), $object->get_date_created()->getTimestamp() );
+		$this->assertEquals( 1483315200, $object->get_date_created()->getOffsetTimestamp() );
+		$this->assertEquals( '2017-01-02 00:00:00', $object->get_date_created()->date( 'Y-m-d H:i:s' ) );
+
+		// ISO 8601 date time with offset.
+		$object->set_date_created( '2017-01-01T19:00:00-05:00' );
+		$this->assertEquals( 1483315200, $object->get_date_created()->getTimestamp() );
+		$this->assertEquals( '2017-01-01 19:00:00', $object->get_date_created()->date( 'Y-m-d H:i:s' ) );
+
+		// ISO 8601 date time different offset to site timezone.
+		$object->set_date_created( '2017-01-01T16:00:00-08:00' );
+		$this->assertEquals( 1483315200, $object->get_date_created()->getTimestamp() );
+		$this->assertEquals( '2017-01-01 19:00:00', $object->get_date_created()->date( 'Y-m-d H:i:s' ) );
+
+		// ISO 8601 date time in UTC.
+		$object->set_date_created( '2017-01-02T00:00:00+00:00' );
+		$this->assertEquals( 1483315200, $object->get_date_created()->getTimestamp() );
+		$this->assertEquals( '2017-01-01 19:00:00', $object->get_date_created()->date( 'Y-m-d H:i:s' ) );
+
+		// Restore default.
+		update_option( 'timezone_string', '' );
+
+		date_default_timezone_set( 'UTC' );
+		// @codingStandardsIgnoreEnd
+	}
+
+	/**
+	 * Test protected method set_date_prop by testing a order date setter.
+	 */
+	function test_set_date_prop_server_timezone() {
+		$this->set_date_prop_gmt_offset();
+		$this->set_date_prop_timezone_string();
+
+		// Repeat all tests with different server timezone.
+		$this->set_date_prop_gmt_offset( 'Pacific/Fiji' );
+		$this->set_date_prop_timezone_string( 'Pacific/Fiji' );
+
+		// Repeat all tests with different server timezone.
+		$this->set_date_prop_gmt_offset( 'Pacific/Tahiti' );
+		$this->set_date_prop_timezone_string( 'Pacific/Tahiti' );
+	}
+
+	/**
+	 * Test applying changes
+	 */
+	function test_apply_changes() {
+		$data = array(
+			'prop1' => 'value1',
+			'prop2' => 'value2',
+		);
+
+		$changes = array(
+			'prop1' => 'new_value1',
+			'prop3' => 'value3',
+		);
+
+		$object = new WC_Mock_WC_Data;
+		$object->set_data( $data );
+		$object->set_changes( $changes );
+		$object->apply_changes();
+
+		$new_data = $object->get_data();
+		$new_changes = $object->get_changes();
+
+		$this->assertEquals( 'new_value1', $new_data['prop1'] );
+		$this->assertEquals( 'value2', $new_data['prop2'] );
+		$this->assertEquals( 'value3', $new_data['prop3'] );
+		$this->assertEmpty( $new_changes );
+	}
+
+	/**
+	 * Test applying changes with a nested array
+	 */
+	function test_apply_changes_nested() {
+		$data = array(
+			'prop1' => 'value1',
+			'prop2' => array(
+				'subprop1' => 1,
+				'subprop2' => 2,
+			),
+		);
+
+		$changes = array(
+			'prop2' => array(
+				'subprop1' => 1000,
+				'subprop3' => 3,
+			),
+		);
+
+		$object = new WC_Mock_WC_Data;
+		$object->set_data( $data );
+		$object->set_changes( $changes );
+		$object->apply_changes();
+
+		$new_data = $object->get_data();
+
+		$this->assertEquals( 'value1', $new_data['prop1'] );
+		$this->assertEquals( 1000, $new_data['prop2']['subprop1'] );
+		$this->assertEquals( 2, $new_data['prop2']['subprop2'] );
+		$this->assertEquals( 3, $new_data['prop2']['subprop3'] );
+	}
+}
diff --git a/tests/unit-tests/crud/meta.php b/tests/unit-tests/crud/meta.php
new file mode 100644
index 00000000000..0a9d604d3be
--- /dev/null
+++ b/tests/unit-tests/crud/meta.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * Test meta for https://github.com/woocommerce/woocommerce/issues/13533.
+ *
+ * @package WooCommerce\Tests\CRUD
+ */
+class WC_Tests_CRUD_Meta_Data extends WC_Unit_Test_Case {
+
+	private $item_id  = 0;
+	private $order_id = 0;
+
+	/**
+	 * A callback for the hooks triggered by eg_disappearing_order_meta() and
+	 * eg_disappearing_item_meta() that saves additional meta data on the
+	 * object via by pre-CRUD and CRUD methods.
+	 */
+	function add_different_object_meta( $object_id ) {
+
+		// Get a new instance of the item or order object
+		$object = ( $this->item_id == $object_id ) ? WC_Order_Factory::get_order_item( $object_id ) : wc_get_order( $object_id );
+		$object->add_meta_data( 'random_other', 'This might disappear :cry:.' );
+		$object->save(); // 'random_other' will be saved correctly, 'random' will also be saved
+
+		// Now set some meta data for it using the pre-CRUD approach
+		if ( $this->item_id == $object_id ) {
+			wc_update_order_item_meta( $object_id, 'random_other_pre_crud', 'This might disappear too :sob:.' );
+		} else {
+			update_post_meta( $object_id, 'random_other_pre_crud', 'This might disappear too :sob:.' );
+		}
+	}
+
+	/**
+	 * Instantiate an instance of an order line item, save meta on that item, then trigger a hook which only passes the
+	 * item's ID to callbacks. Afterwards, save the existing item without that other meta here and log the result to
+	 * show that data has been removed.
+	 */
+	function test_disappearing_item_meta() {
+		// Setup for testing by making an item.
+		$item = new WC_Order_Item_Product();
+		$this->item_id = $item->save();
+
+		$item = WC_Order_Factory::get_order_item( $this->item_id );
+
+		// First make sure we're starting from a clean slate
+		$item->delete_meta_data( 'random' );
+		$item->delete_meta_data( 'random_other' );
+		$item->delete_meta_data( 'random_other_pre_crud' );
+		$item->save();
+
+		// Now add one piece of meta
+		$item->add_meta_data( 'random', (string) rand( 0, 0xffffff ) );
+		$item->save(); // 'random' will be saved correctly
+
+		// Run callback that passes just the item's ID to mimic this kind of normal behaviour in WP/WC
+		$this->add_different_object_meta( $this->item_id );
+
+		// Resave our current item that has our meta data, but not the other piece of meta data
+		$item->save();
+
+		// Get a new instance that should have both 'random' and 'random_other' set on it
+		$new_item = WC_Order_Factory::get_order_item( $this->item_id );
+
+		// The original $item should have 1 item of meta - random.
+		$this->assertCount( 1, $item->get_meta_data() );
+		$this->assertTrue( in_array( 'random', wp_list_pluck( $item->get_meta_data(), 'key' ) ) );
+
+		// The new $item should have 3 items of meta since it's freshly loaded.
+		$this->assertCount( 3, $new_item->get_meta_data() );
+		$this->assertTrue( in_array( 'random', wp_list_pluck( $new_item->get_meta_data(), 'key' ) ) );
+		$this->assertTrue( in_array( 'random_other', wp_list_pluck( $new_item->get_meta_data(), 'key' ) ) );
+		$this->assertTrue( in_array( 'random_other_pre_crud', wp_list_pluck( $new_item->get_meta_data(), 'key' ) ) );
+	}
+
+	/**
+	 * Instantiate an instance of an order, save meta on that order, then trigger a hook which only passes the order's ID to
+	 * callbacks. Afterwards, save the existing order without that other meta here and log the result to show that data
+	 * has been removed.
+	 */
+	function test_disappearing_order_meta() {
+		// Setup for testing by making an item.
+		$order = new WC_Order();
+		$this->order_id = $order->save();
+
+		$order = wc_get_order( $this->order_id );
+
+		// First make sure we're starting from a clean slate
+		$order->delete_meta_data( 'random' );
+		$order->delete_meta_data( 'random_other' );
+		$order->delete_meta_data( 'random_other_pre_crud' );
+		$order->save();
+
+		// Now add one piece of meta
+		$order->add_meta_data( 'random', (string) rand( 0, 0xffffff ) );
+		$order->save(); // 'random' will be saved correctly
+
+		// Run callback that passes just the item's ID to mimic this kind of normal behaviour in WP/WC
+		$this->add_different_object_meta( $this->order_id );
+
+		// Resave our current item that has our meta data, but not the other piece of meta data
+		$order->save();
+
+		// Get a new instance of the same order. It should have both 'random' and 'random_other' set on it
+		$new_order = wc_get_order( $this->order_id );
+
+		// The original $order should have 1 item of meta - random.
+		$this->assertCount( 1, $order->get_meta_data() );
+		$this->assertTrue( in_array( 'random', wp_list_pluck( $order->get_meta_data(), 'key' ) ) );
+
+		// The new $order should have 3 items of meta since it's freshly loaded.
+		$this->assertCount( 3, $new_order->get_meta_data() );
+		$this->assertTrue( in_array( 'random', wp_list_pluck( $new_order->get_meta_data(), 'key' ) ) );
+		$this->assertTrue( in_array( 'random_other', wp_list_pluck( $new_order->get_meta_data(), 'key' ) ) );
+		$this->assertTrue( in_array( 'random_other_pre_crud', wp_list_pluck( $new_order->get_meta_data(), 'key' ) ) );
+	}
+}
diff --git a/tests/unit-tests/crud/refunds.php b/tests/unit-tests/crud/refunds.php
new file mode 100644
index 00000000000..5cdbd722ffd
--- /dev/null
+++ b/tests/unit-tests/crud/refunds.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Meta
+ * @package WooCommerce\Tests\CRUD
+ */
+class WC_Tests_CRUD_Refunds extends WC_Unit_Test_Case {
+
+	/**
+	 * Test: get_type
+	 */
+	function test_get_type() {
+		$object = new WC_Order_Refund();
+		$this->assertEquals( 'shop_order_refund', $object->get_type() );
+	}
+
+	/**
+	 * Test: get_refund_amount
+	 */
+	function test_get_refund_amount() {
+		$object = new WC_Order_Refund();
+		$object->set_amount( 20 );
+		$this->assertEquals( '20.00', $object->get_amount() );
+	}
+
+	/**
+	 * Test: get_refund_reason
+	 */
+	function test_get_refund_reason() {
+		$object = new WC_Order_Refund();
+		$object->set_reason( 'Customer is an idiot' );
+		$this->assertEquals( 'Customer is an idiot', $object->get_reason() );
+	}
+
+	/**
+	 * Test: get_refunded_by
+	 */
+	function test_get_refunded_by() {
+		$object = new WC_Order_Refund();
+		$object->set_refunded_by( 1 );
+		$this->assertEquals( 1, $object->get_refunded_by() );
+	}
+}
diff --git a/tests/unit-tests/customer/crud.php b/tests/unit-tests/customer/crud.php
new file mode 100644
index 00000000000..5510dcd7a48
--- /dev/null
+++ b/tests/unit-tests/customer/crud.php
@@ -0,0 +1,491 @@
+<?php
+
+/**
+ * Class CustomerCRUD.
+ * @package WooCommerce\Tests\Customer
+ */
+class WC_Tests_CustomerCRUD extends WC_Unit_Test_Case {
+
+	/**
+	 * Test creating a new customer.
+	 * @since 3.0.0
+	 */
+	public function test_create_customer() {
+		$username = 'testusername-' . time();
+		$customer = new WC_Customer();
+		$customer->set_username( 'testusername-' . time() );
+		$customer->set_password( 'test123' );
+		$customer->set_email( 'test@woo.local' );
+		$customer->save();
+		$wp_user = new WP_User( $customer->get_id() );
+
+		$this->assertEquals( $username, $customer->get_username() );
+		$this->assertNotEquals( 0, $customer->get_id() );
+		$this->assertEquals( strtotime( $wp_user->user_registered ), $customer->get_date_created()->getOffsetTimestamp() );
+	}
+
+	/**
+	 * Test updating a customer.
+	 * @since 3.0.0
+	 */
+	public function test_update_customer() {
+		$customer = WC_Helper_Customer::create_customer();
+		$customer_id = $customer->get_id();
+		$this->assertEquals( 'test@woo.local', $customer->get_email() );
+		$this->assertEquals( 'Apt 1', $customer->get_billing_address_2() );
+		$customer->set_email( 'test@wc.local' );
+		$customer->set_first_name( 'Justin' );
+		$customer->set_billing_address_2( 'Apt 5' );
+		$customer->save();
+
+		$customer = new WC_Customer( $customer_id ); // so we can read fresh copies from the DB
+		$this->assertEquals( 'test@wc.local', $customer->get_email() );
+		$this->assertEquals( 'Justin', $customer->get_first_name() );
+		$this->assertEquals( 'Apt 5', $customer->get_billing_address_2() );
+	}
+
+
+	/**
+	 * Test saving a customer.
+	 * @since 3.0.0
+	 */
+	public function test_save_customer() {
+		// test save() -> Create
+		$customer = new WC_Customer();
+		$customer->set_username( 'testusername-' . time() );
+		$customer->set_password( 'test123' );
+		$customer->set_email( 'test@woo.local' );
+		$this->assertEquals( 0, $customer->get_id() );
+		$customer->save();
+		$customer_id = $customer->get_id();
+		$wp_user = new WP_User( $customer->get_id() );
+
+		$this->assertNotEquals( 0, $customer->get_id() );
+
+		// test save() -> Update
+		$this->assertEquals( 'test@woo.local', $customer->get_email() );
+		$customer->set_email( 'test@wc.local' );
+		$customer->save();
+
+		$customer = new WC_Customer( $customer_id );
+		$this->assertEquals( 'test@wc.local', $customer->get_email() );
+	}
+
+	/**
+	 * Test deleting a customer.
+	 * @since 3.0.0
+	 */
+	public function test_delete_customer() {
+		$customer = WC_Helper_Customer::create_customer();
+		$customer_id = $customer->get_id();
+		$this->assertNotEquals( 0, $customer->get_id() );
+		$customer->delete();
+		$this->assertEquals( 0, $customer->get_id() );
+	}
+
+	/**
+	 * Test reading a customer.
+	 * @since 3.0.0
+	 */
+	public function test_read_customer() {
+		$username = 'user-' . time();
+		$customer = new WC_Customer();
+		$customer->set_username( $username );
+		$customer->set_email( 'test@woo.local' );
+		$customer->set_password( 'hunter2' );
+		$customer->set_first_name( 'Billy' );
+		$customer->set_last_name( 'Bob' );
+		$customer->save();
+		$customer_id = $customer->get_id();
+		$customer_read = new WC_Customer( $customer_id );
+
+		$this->assertEquals( $customer_id, $customer_read->get_id() );
+		$this->assertEquals( 'test@woo.local', $customer_read->get_email() );
+		$this->assertEquals( 'Billy', $customer_read->get_first_name() );
+		$this->assertEquals( 'Bob', $customer_read->get_last_name() );
+		$this->assertEquals( $username, $customer_read->get_username() );
+	}
+
+	/**
+	 * Tests backwards compat / legacy handling.
+	 * @expectedDeprecated WC_Customer::get_default_country
+	 * @expectedDeprecated WC_Customer::get_default_state
+	 * @expectedDeprecated WC_Customer::is_paying_customer
+	 * @expectedDeprecated WC_Customer::calculated_shipping
+	 * @since 3.0.0
+	 */
+	public function test_customer_backwards_compat() {
+		// Properties.
+		// Accessing properties directly will throw some wanted deprected notices
+		// So we need to let PHPUnit know we are expecting them and it's fine to continue
+		$legacy_keys = array(
+			'id',
+			'country',
+			'state',
+			'postcode',
+			'city',
+			'address',
+			'address_1',
+			'address_2',
+			'shipping_country',
+			'shipping_state',
+			'shipping_postcode',
+			'shipping_city',
+			'shipping_address',
+			'shipping_address_1',
+			'shipping_address_2',
+			'is_vat_exempt',
+			'calculated_shipping',
+		);
+
+		$this->expected_doing_it_wrong = array_merge( $this->expected_doing_it_wrong, $legacy_keys );
+
+		$customer = WC_Helper_Customer::create_customer();
+
+		$this->assertEquals( $customer->get_id(), $customer->id );
+		$this->assertEquals( $customer->get_billing_country(), $customer->country );
+		$this->assertEquals( $customer->get_billing_state(), $customer->state );
+		$this->assertEquals( $customer->get_billing_postcode(), $customer->postcode );
+		$this->assertEquals( $customer->get_billing_city(), $customer->city );
+		$this->assertEquals( $customer->get_billing_address(), $customer->address );
+		$this->assertEquals( $customer->get_billing_address(), $customer->address_1 );
+		$this->assertEquals( $customer->get_billing_address_2(), $customer->address_2 );
+		$this->assertEquals( $customer->get_shipping_country(), $customer->shipping_country );
+		$this->assertEquals( $customer->get_shipping_state(), $customer->shipping_state );
+		$this->assertEquals( $customer->get_shipping_postcode(), $customer->shipping_postcode );
+		$this->assertEquals( $customer->get_shipping_city(), $customer->shipping_city );
+		$this->assertEquals( $customer->get_shipping_address(), $customer->shipping_address );
+		$this->assertEquals( $customer->get_shipping_address(), $customer->shipping_address_1 );
+		$this->assertEquals( $customer->get_shipping_address_2(), $customer->shipping_address_2 );
+		$this->assertEquals( $customer->get_is_vat_exempt(), $customer->is_vat_exempt );
+		$this->assertEquals( $customer->has_calculated_shipping(), $customer->calculated_shipping );
+
+		// Functions
+		$this->assertEquals( $customer->get_is_vat_exempt(), $customer->is_vat_exempt() );
+		$this->assertEquals( $customer->has_calculated_shipping(), $customer->has_calculated_shipping() );
+		$default = wc_get_customer_default_location();
+		$this->assertEquals( $default['country'], $customer->get_default_country() );
+		$this->assertEquals( $default['state'], $customer->get_default_state() );
+		$this->assertFalse( $customer->has_calculated_shipping() );
+		$customer->calculated_shipping( true );
+		$this->assertTrue( $customer->has_calculated_shipping() );
+		$this->assertEquals( $customer->get_is_paying_customer(), $customer->is_paying_customer() );
+	}
+
+	/**
+	 * Test generic getters & setters
+	 * @since 3.0.0
+	 */
+	public function test_customer_setters_and_getters() {
+		$time = time();
+		$setters = array(
+			'username' => 'test',
+			'email' => 'test@woo.local',
+			'first_name' => 'Bob',
+			'last_name' => 'tester',
+			'role' => 'customer',
+			'date_created' => $time,
+			'date_modified' => $time,
+			'billing_postcode' => 11010,
+			'billing_city' => 'New York',
+			'billing_address' => '123 Main St.',
+			'billing_address_1' => '123 Main St.',
+			'billing_address_2' => 'Apt 2',
+			'billing_state' => 'NY',
+			'billing_country' => 'US',
+			'shipping_state' => 'NY',
+			'shipping_postcode' => 11011,
+			'shipping_city' => 'New York',
+			'shipping_address' => '123 Main St.',
+			'shipping_address_1' => '123 Main St.',
+			'shipping_address_2' => 'Apt 2',
+			'is_vat_exempt' => true,
+			'calculated_shipping' => true,
+			'is_paying_customer' => true,
+		);
+
+		$customer = new WC_Customer;
+
+		foreach ( $setters as $method => $value ) {
+			$customer->{"set_{$method}"}( $value );
+		}
+
+		$getters = array();
+
+		foreach ( $setters as $method => $value ) {
+			$getters[ $method ] = $customer->{"get_{$method}"}();
+		}
+
+		// Get timestamps from date_created and date_modified.
+		$getters['date_created'] = $getters['date_created']->getOffsetTimestamp();
+		$getters['date_modified'] = $getters['date_modified']->getOffsetTimestamp();
+
+		$this->assertEquals( $setters, $getters );
+	}
+
+	/**
+	 * Test getting a customer's last order ID and date
+	 * @since 3.0.0
+	 */
+	public function test_customer_get_last_order_info() {
+		$customer = WC_Helper_Customer::create_customer();
+		$customer_id = $customer->get_id();
+		$order = WC_Helper_Order::create_order( $customer_id );
+		$customer = new WC_Customer( $customer_id );
+		$last_order = $customer->get_last_order();
+		$this->assertEquals( $order->get_id(), $last_order ? $last_order->get_id() : 0 );
+		$this->assertEquals( $order->get_date_created(), $last_order ? $last_order->get_date_created() : 0 );
+		$order->delete();
+	}
+
+	/**
+	 * Test getting a customer's order count from DB.
+	 * @since 3.0.0
+	 */
+	public function test_customer_get_order_count_read() {
+		$customer = WC_Helper_Customer::create_customer();
+		$customer_id = $customer->get_id();
+		WC_Helper_Order::create_order( $customer_id );
+		WC_Helper_Order::create_order( $customer_id );
+		WC_Helper_Order::create_order( $customer_id );
+		$customer = new WC_Customer( $customer_id );
+		$this->assertEquals( 3, $customer->get_order_count() );
+	}
+
+	/**
+	 * Test getting a customer's total amount spent from DB.
+	 * @since 3.0.0
+	 */
+	public function test_customer_get_total_spent_read() {
+		$customer = WC_Helper_Customer::create_customer();
+		$customer_id = $customer->get_id();
+		$order = WC_Helper_Order::create_order( $customer_id );
+		$customer = new WC_Customer( $customer_id );
+		$this->assertEquals( 0, $customer->get_total_spent() );
+		$order->update_status( 'wc-completed' );
+		$customer = new WC_Customer( $customer_id );
+		$this->assertEquals( 40, $customer->get_total_spent() );
+		$order->delete();
+	}
+
+	/**
+	 * Test getting a customer's avatar URL.
+	 * @since 3.0.0
+	 */
+	public function test_customer_get_avatar_url() {
+		$customer = WC_Helper_Customer::create_customer();
+		$this->assertContains( 'gravatar.com/avatar', $customer->get_avatar_url() );
+		$this->assertContains( md5( 'test@woo.local' ), $customer->get_avatar_url() );
+	}
+
+	/**
+	 * Test getting a customer's creation date from DB.
+	 * @since 3.0.0
+	 */
+	public function test_customer_get_date_created_read() {
+		$customer = WC_Helper_Customer::create_customer();
+		$customer_id = $customer->get_id();
+		$user = new WP_User( $customer_id );
+		$this->assertEquals( strtotime( $user->data->user_registered ), $customer->get_date_created()->getOffsetTimestamp() );
+	}
+
+	/**
+	 * Test getting a customer's modification date from DB.
+	 * @since 3.0.0
+	 */
+	public function test_customer_get_date_modified_read() {
+		$customer = WC_Helper_Customer::create_customer();
+		$customer_id = $customer->get_id();
+		$last = get_user_meta( $customer_id, 'last_update', true );
+		sleep( 1 );
+		$this->assertEquals( $last, $customer->get_date_modified()->getOffsetTimestamp() );
+		$customer->set_billing_address( '1234 Some St.' );
+		$customer->save();
+		$update = get_user_meta( $customer_id, 'last_update', true );
+		$this->assertEquals( $update, $customer->get_date_modified()->getOffsetTimestamp() );
+		$this->assertNotEquals( $update, $last );
+	}
+
+	/**
+	 * Test getting a customer's taxable address.
+	 * @since 3.0.0
+	 */
+	public function test_customer_get_taxable_address() {
+		$customer = WC_Helper_Customer::create_customer();
+		$customer_id = $customer->get_id();
+		$customer->set_shipping_postcode( '11111' );
+		$customer->set_shipping_city( 'Test' );
+		$customer->save();
+		$customer = new WC_Customer( $customer_id );
+
+		update_option( 'woocommerce_tax_based_on', 'shipping' );
+		$taxable = $customer->get_taxable_address();
+		$this->assertEquals( 'US', $taxable[0] );
+		$this->assertEquals( 'PA', $taxable[1] );
+		$this->assertEquals( '11111', $taxable[2] );
+		$this->assertEquals( 'Test', $taxable[3] );
+
+		update_option( 'woocommerce_tax_based_on', 'billing' );
+		$taxable = $customer->get_taxable_address();
+		$this->assertEquals( 'US', $taxable[0] );
+		$this->assertEquals( 'PA', $taxable[1] );
+		$this->assertEquals( '19123', $taxable[2] );
+		$this->assertEquals( 'Philadelphia', $taxable[3] );
+
+		update_option( 'woocommerce_tax_based_on', 'base' );
+		$taxable = $customer->get_taxable_address();
+		$this->assertEquals( WC()->countries->get_base_country(), $taxable[0] );
+		$this->assertEquals( WC()->countries->get_base_state(), $taxable[1] );
+		$this->assertEquals( WC()->countries->get_base_postcode(), $taxable[2] );
+		$this->assertEquals( WC()->countries->get_base_city(), $taxable[3] );
+	}
+
+	/**
+	 * Test getting a customer's downloadable products.
+	 * @since 3.0.0
+	 */
+	public function test_customer_get_downloadable_products() {
+		$customer = WC_Helper_Customer::create_customer();
+		$customer_id = $customer->get_id();
+		$this->assertEquals( wc_get_customer_available_downloads( $customer_id ), $customer->get_downloadable_products() );
+	}
+
+	/**
+	 * Test setting a password on update - making sure it actually changes the users password.
+	 * @since 3.0.0
+	 */
+	public function test_customer_password() {
+		$customer = WC_Helper_Customer::create_customer();
+		$customer_id = $customer->get_id();
+
+		$user = get_user_by( 'id', $customer_id );
+		$this->assertTrue( wp_check_password( 'hunter2', $user->data->user_pass, $user->ID ) );
+
+		$customer->set_password( 'hunter3' );
+		$customer->save();
+
+		$user = get_user_by( 'id', $customer_id );
+		$this->assertTrue( wp_check_password( 'hunter3', $user->data->user_pass, $user->ID ) );
+	}
+
+	/**
+	 * Test setting a customer's address to the base address.
+	 * @since 3.0.0
+	 */
+	public function test_customer_set_address_to_base() {
+		$customer = WC_Helper_Customer::create_customer();
+		$customer->set_billing_address_to_base();
+		$base = wc_get_customer_default_location();
+		$this->assertEquals( $base['country'], $customer->get_billing_country() );
+		$this->assertEquals( $base['state'], $customer->get_billing_state() );
+		$this->assertEmpty( $customer->get_billing_postcode() );
+		$this->assertEmpty( $customer->get_billing_city() );
+	}
+
+	/**
+	 * Test setting a customer's shipping address to the base address.
+	 * @since 3.0.0
+	 */
+	public function test_customer_set_shipping_address_to_base() {
+		$customer = WC_Helper_Customer::create_customer();
+		$customer->set_shipping_address_to_base();
+		$base = wc_get_customer_default_location();
+		$this->assertEquals( $base['country'], $customer->get_shipping_country() );
+		$this->assertEquals( $base['state'], $customer->get_shipping_state() );
+		$this->assertEmpty( $customer->get_shipping_postcode() );
+		$this->assertEmpty( $customer->get_shipping_city() );
+	}
+
+	/**
+	 * Test setting a customer's location (multiple address fields at once)
+	 * @since 3.0.0
+	 */
+	public function test_customer_set_location() {
+		$customer = WC_Helper_Customer::create_customer();
+		$customer->set_billing_location( 'US', 'OH', '12345', 'Cleveland' );
+		$this->assertEquals( 'US', $customer->get_billing_country() );
+		$this->assertEquals( 'OH', $customer->get_billing_state() );
+		$this->assertEquals( '12345', $customer->get_billing_postcode() );
+		$this->assertEquals( 'Cleveland', $customer->get_billing_city() );
+	}
+
+	/**
+	 * Test setting a customer's shipping location (multiple address fields at once)
+	 * @since 3.0.0
+	 */
+	public function test_customer_set_shipping_location() {
+		$customer = WC_Helper_Customer::create_customer();
+		$customer->set_shipping_location( 'US', 'OH', '12345', 'Cleveland' );
+		$this->assertEquals( 'US', $customer->get_shipping_country() );
+		$this->assertEquals( 'OH', $customer->get_shipping_state() );
+		$this->assertEquals( '12345', $customer->get_shipping_postcode() );
+		$this->assertEquals( 'Cleveland', $customer->get_shipping_city() );
+	}
+
+	/**
+	 * Test is_customer_outside_base.
+	 * @since 3.0.0
+	 */
+	public function test_customer_is_customer_outside_base() {
+		$customer = WC_Helper_Customer::create_customer();
+		$this->assertTrue( $customer->is_customer_outside_base() );
+		update_option( 'woocommerce_tax_based_on', 'base' );
+		$customer->set_billing_address_to_base();
+		$this->assertFalse( $customer->is_customer_outside_base() );
+	}
+
+	/**
+	 * Test WC_Customer's session handling code.
+	 * @since 3.0.0
+	 */
+	public function test_customer_sessions() {
+		$customer = WC_Helper_Customer::create_customer();
+		$session  = WC_Helper_Customer::create_mock_customer(); // set into session....
+
+		$this->assertEquals( '19123', $session->get_billing_postcode() );
+		$this->assertEquals( '123 South Street', $session->get_billing_address() );
+		$this->assertEquals( 'Philadelphia', $session->get_billing_city() );
+
+		$session->set_billing_address( '124 South Street' );
+		$session->save();
+
+		$session = new WC_Customer( 0, true );
+		$this->assertEquals( '124 South Street', $session->get_billing_address() );
+
+		$session = new WC_Customer( 0, true );
+		$session->set_billing_postcode( '32191' );
+		$session->save();
+
+		// should still be session ID, not a created row, since we are working with guests/sessions
+		$this->assertFalse( $session->get_id() > 0 );
+		$this->assertEquals( '32191' , $session->get_billing_postcode() );
+	}
+
+	/**
+	 * Test getting meta.
+	 * @since 3.0.0
+	 */
+	public function test_get_meta() {
+		$customer = WC_Helper_Customer::create_customer();
+		$customer_id  = $customer->get_id();
+		$meta_value = time() . '-custom-value';
+		add_user_meta( $customer_id, 'test_field', $meta_value, true );
+		$customer = new WC_Customer( $customer_id );
+		$fields = $customer->get_meta_data();
+		$this->assertEquals( $meta_value, $customer->get_meta( 'test_field' ) );
+	}
+
+	/**
+	 * Test setting meta.
+	 * @since 3.0.0
+	 */
+	public function test_set_meta() {
+		$customer = WC_Helper_Customer::create_customer();
+		$customer_id  = $customer->get_id();
+		$meta_value = time() . '-custom-value';
+		$customer->add_meta_data( 'my-field', $meta_value, true );
+		$customer->save();
+		$customer = new WC_Customer( $customer_id );
+		$this->assertEquals( $meta_value, $customer->get_meta( 'my-field' ) );
+	}
+}
diff --git a/tests/unit-tests/customer/customer.php b/tests/unit-tests/customer/customer.php
index 5d1fe2885dc..b06569b71e6 100644
--- a/tests/unit-tests/customer/customer.php
+++ b/tests/unit-tests/customer/customer.php
@@ -1,66 +1,59 @@
 <?php
-namespace WooCommerce\Tests\Customer;
 
 /**
  * Class Customer.
  * @package WooCommerce\Tests\Customer
  */
-class Customer extends \WC_Unit_Test_Case {
+class WC_Tests_Customer extends WC_Unit_Test_Case {
 
 	/**
 	 * Test the get_taxable_address method.
 	 */
 	public function test_get_taxable_address() {
 
-		$customer           = \WC_Helper_Customer::create_mock_customer();
-		$base_store_address = \WC_Helper_Customer::get_expected_store_location();
+		$customer           = WC_Helper_Customer::create_mock_customer();
+		$base_store_address = WC_Helper_Customer::get_expected_store_location();
 		$customer_address   = $customer->get_taxable_address(); // Default is geolocation!
 
 		// Get the original settings for the session and the WooCommerce options
-		$original_chosen_shipping_methods = \WC_Helper_Customer::get_chosen_shipping_methods();
-		$original_tax_based_on            = \WC_Helper_Customer::get_tax_based_on();
-		$original_customer_details        = \WC_Helper_Customer::get_customer_details();
+		$original_chosen_shipping_methods = WC_Helper_Customer::get_chosen_shipping_methods();
+		$original_tax_based_on            = WC_Helper_Customer::get_tax_based_on();
+		$original_customer_details        = WC_Helper_Customer::get_customer_details();
 
 		// Create dummy product, and add the product to the cart.
-
-		$product = \WC_Helper_Product::create_simple_product();
-		WC()->cart->add_to_cart( $product->id, 1 );
+		$product = WC_Helper_Product::create_simple_product();
+		WC()->cart->add_to_cart( $product->get_id(), 1 );
 
 		// Customer is going with the Local Pickup option, and the store calculates tax based on the store location.
-
-		\WC_Helper_Customer::set_chosen_shipping_methods( array( 'local_pickup' ) );
-		\WC_Helper_Customer::set_tax_based_on( 'base' );
+		WC_Helper_Customer::set_chosen_shipping_methods( array( 'local_pickup' ) );
+		WC_Helper_Customer::set_tax_based_on( 'base' );
 		$this->assertEquals( $customer->get_taxable_address(), $base_store_address );
 
 		// Customer is going with the Local Pickup option, and the store calculates tax based on the customer's billing address.
-
-		\WC_Helper_Customer::set_chosen_shipping_methods( array( 'local_pickup' ) );
-		\WC_Helper_Customer::set_tax_based_on( 'billing' );
+		WC_Helper_Customer::set_chosen_shipping_methods( array( 'local_pickup' ) );
+		WC_Helper_Customer::set_tax_based_on( 'billing' );
 		$this->assertEquals( $customer->get_taxable_address(), $base_store_address );
 
 		// Customer is going with the Free Shipping option, and the store calculates tax based on the customer's billing address.
-
-		\WC_Helper_Customer::set_chosen_shipping_methods( array( 'free_shipping' ) );
-		\WC_Helper_Customer::set_tax_based_on( 'billing' );
+		WC_Helper_Customer::set_chosen_shipping_methods( array( 'free_shipping' ) );
+		WC_Helper_Customer::set_tax_based_on( 'billing' );
 		$this->assertEquals( $customer->get_taxable_address(), $customer_address );
 
 		// Customer is going with the Free Shipping option, and the store calculates tax based on the store base location.
-
-		\WC_Helper_Customer::set_chosen_shipping_methods( array( 'free_shipping' ) );
-		\WC_Helper_Customer::set_tax_based_on( 'base' );
+		WC_Helper_Customer::set_chosen_shipping_methods( array( 'free_shipping' ) );
+		WC_Helper_Customer::set_tax_based_on( 'base' );
 		$this->assertEquals( $customer->get_taxable_address(), $base_store_address );
 
-		//Now reset the settings back to the way they were before this test
-
-		\WC_Helper_Customer::set_chosen_shipping_methods( $original_chosen_shipping_methods );
-		\WC_Helper_Customer::set_tax_based_on( $original_tax_based_on );
-		\WC_Helper_Customer::set_customer_details( $original_customer_details );
+		// Now reset the settings back to the way they were before this test
+		WC_Helper_Customer::set_chosen_shipping_methods( $original_chosen_shipping_methods );
+		WC_Helper_Customer::set_tax_based_on( $original_tax_based_on );
+		WC_Helper_Customer::set_customer_details( $original_customer_details );
 
 		// Clean up the cart
 		WC()->cart->empty_cart();
 
 		// Clean up product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 
 	/**
@@ -69,51 +62,46 @@ class Customer extends \WC_Unit_Test_Case {
 	public function test_is_customer_outside_base() {
 
 		// Get the original settings for the session and the WooCommerce options
-		$original_chosen_shipping_methods = \WC_Helper_Customer::get_chosen_shipping_methods();
-		$original_tax_based_on            = \WC_Helper_Customer::get_tax_based_on();
-		$original_customer_details        = \WC_Helper_Customer::get_customer_details();
+		$original_chosen_shipping_methods = WC_Helper_Customer::get_chosen_shipping_methods();
+		$original_tax_based_on            = WC_Helper_Customer::get_tax_based_on();
+		$original_customer_details        = WC_Helper_Customer::get_customer_details();
 
-		$customer = \WC_Helper_Customer::create_mock_customer();
+		$customer = WC_Helper_Customer::create_mock_customer();
 
 		// Create dummy product, and add the product to the cart.
-		$product = \WC_Helper_Product::create_simple_product();
+		$product = WC_Helper_Product::create_simple_product();
 
-		WC()->cart->add_to_cart( $product->id, 1 );
+		WC()->cart->add_to_cart( $product->get_id(), 1 );
 
 		// Customer is going with the Local Pickup option, and the store calculates tax based on the store location.
-
-		\WC_Helper_Customer::set_chosen_shipping_methods( array( 'local_pickup' ) );
-		\WC_Helper_Customer::set_tax_based_on( 'base' );
+		WC_Helper_Customer::set_chosen_shipping_methods( array( 'local_pickup' ) );
+		WC_Helper_Customer::set_tax_based_on( 'base' );
 		$this->assertEquals( $customer->is_customer_outside_base(), false );
 
 		// Customer is going with the Local Pickup option, and the store calculates tax based on the customer's billing address.
-
-		\WC_Helper_Customer::set_chosen_shipping_methods( array( 'local_pickup' ) );
-		\WC_Helper_Customer::set_tax_based_on( 'billing' );
+		WC_Helper_Customer::set_chosen_shipping_methods( array( 'local_pickup' ) );
+		WC_Helper_Customer::set_tax_based_on( 'billing' );
 		$this->assertEquals( $customer->is_customer_outside_base(), false );
 
 		// Customer is going with the Free Shipping option, and the store calculates tax based on the customer's billing address.
-
-		\WC_Helper_Customer::set_chosen_shipping_methods( array( 'free_shipping' ) );
-		\WC_Helper_Customer::set_tax_based_on( 'billing' );
+		WC_Helper_Customer::set_chosen_shipping_methods( array( 'free_shipping' ) );
+		WC_Helper_Customer::set_tax_based_on( 'billing' );
 		$this->assertEquals( $customer->is_customer_outside_base(), true );
 
 		// Customer is going with the Free Shipping option, and the store calculates tax based on the store base location.
-
-		\WC_Helper_Customer::set_chosen_shipping_methods( array( 'free_shipping' ) );
-		\WC_Helper_Customer::set_tax_based_on( 'base' );
+		WC_Helper_Customer::set_chosen_shipping_methods( array( 'free_shipping' ) );
+		WC_Helper_Customer::set_tax_based_on( 'base' );
 		$this->assertEquals( $customer->is_customer_outside_base(), false );
 
-		//Now reset the settings back to the way they were before this test
-
-		\WC_Helper_Customer::set_chosen_shipping_methods( $original_chosen_shipping_methods );
-		\WC_Helper_Customer::set_tax_based_on( $original_tax_based_on );
-		\WC_Helper_Customer::set_customer_details( $original_customer_details );
+		// Now reset the settings back to the way they were before this test
+		WC_Helper_Customer::set_chosen_shipping_methods( $original_chosen_shipping_methods );
+		WC_Helper_Customer::set_tax_based_on( $original_tax_based_on );
+		WC_Helper_Customer::set_customer_details( $original_customer_details );
 
 		// Clean up the cart
 		WC()->cart->empty_cart();
 
 		// Clean up product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 }
diff --git a/tests/unit-tests/formatting/functions.php b/tests/unit-tests/formatting/functions.php
index 10107b09883..83bb23b36bd 100644
--- a/tests/unit-tests/formatting/functions.php
+++ b/tests/unit-tests/formatting/functions.php
@@ -1,15 +1,11 @@
 <?php
 
-namespace WooCommerce\Tests\Formatting;
-
 /**
  * Class Functions.
  * @package WooCommerce\Tests\Formatting
  * @since 2.2
- *
- * @todo Split formatting class into smaller classes
  */
-class Functions extends \WC_Unit_Test_Case {
+class WC_Tests_Formatting_Functions extends WC_Unit_Test_Case {
 
 	/**
 	 * Test wc_sanitize_taxonomy_name().
@@ -31,10 +27,10 @@ class Functions extends \WC_Unit_Test_Case {
 	 */
 	public function test_wc_get_filename_from_url() {
 
-		$this->assertEquals( 'woocommerce.pdf', wc_get_filename_from_url( 'http://www.woothemes.com/woocommerce.pdf' ) );
+		$this->assertEquals( 'woocommerce.pdf', wc_get_filename_from_url( 'https://woocommerce.com/woocommerce.pdf' ) );
 		$this->assertEmpty( wc_get_filename_from_url( 'ftp://wc' ) );
 		$this->assertEmpty( wc_get_filename_from_url( 'http://www.skyverge.com' ) );
-		$this->assertEquals( 'woocommerce',  wc_get_filename_from_url( 'http://www.woothemes.com/woocommerce' ) );
+		$this->assertEquals( 'woocommerce',  wc_get_filename_from_url( 'https://woocommerce.com/woocommerce' ) );
 	}
 
 	/**
@@ -95,10 +91,17 @@ class Functions extends \WC_Unit_Test_Case {
 			array( 0, wc_get_dimension( -10, 'mm' ) ),
 		);
 
+		$custom = array(
+			array( 25.4, wc_get_dimension( 10, 'cm', 'in' ) ),
+			array( 914.4, wc_get_dimension( 10, 'cm', 'yd' ) ),
+			array( 393.7, wc_get_dimension( 10, 'in', 'm' ) ),
+			array( 0.010936133, wc_get_dimension( 10, 'yd', 'mm' ) ),
+		);
+
 		// restore default
 		update_option( 'woocommerce_dimension_unit', $default_unit );
 
-		return array_merge( $cm, $in, $m, $mm, $yd, $n );
+		return array_merge( $cm, $in, $m, $mm, $yd, $n, $custom );
 
 	}
 
@@ -152,6 +155,12 @@ class Functions extends \WC_Unit_Test_Case {
 		$this->assertEquals( 0.6249987469, wc_get_weight( 10, 'lbs' ) );
 		$this->assertEquals( 10, wc_get_weight( 10, 'oz' ) );
 
+		// custom from unit
+		$this->assertEquals( 0.283495, wc_get_weight( 10, 'kg', 'oz' ) );
+		$this->assertEquals( 0.01, wc_get_weight( 10, 'kg', 'g' ) );
+		$this->assertEquals( 4.53592, wc_get_weight( 10, 'kg', 'lbs' ) );
+		$this->assertEquals( 10, wc_get_weight( 10, 'kg', 'kg' ) );
+
 		// negative
 		$this->assertEquals( 0, wc_get_weight( -10, 'g' ) );
 
@@ -302,7 +311,7 @@ class Functions extends \WC_Unit_Test_Case {
 			'pear'       => 'grape',
 			'vegetables' => array(
 				'cucumber' => 'asparagus',
-			)
+			),
 		);
 
 		$a2 = array(
@@ -436,32 +445,32 @@ class Functions extends \WC_Unit_Test_Case {
 	public function test_wc_price() {
 
 		// common prices
-		$this->assertEquals( '<span class="amount">&pound;1.00</span>', wc_price( 1 ) );
-		$this->assertEquals( '<span class="amount">&pound;1.10</span>', wc_price( 1.1 ) );
-		$this->assertEquals( '<span class="amount">&pound;1.17</span>', wc_price( 1.17 ) );
-		$this->assertEquals( '<span class="amount">&pound;1,111.17</span>', wc_price( 1111.17 ) );
-		$this->assertEquals( '<span class="amount">&pound;0.00</span>', wc_price( 0 ) );
+		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><span class="woocommerce-Price-currencySymbol">&pound;</span>1.00</span>', wc_price( 1 ) );
+		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><span class="woocommerce-Price-currencySymbol">&pound;</span>1.10</span>', wc_price( 1.1 ) );
+		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><span class="woocommerce-Price-currencySymbol">&pound;</span>1.17</span>', wc_price( 1.17 ) );
+		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><span class="woocommerce-Price-currencySymbol">&pound;</span>1,111.17</span>', wc_price( 1111.17 ) );
+		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><span class="woocommerce-Price-currencySymbol">&pound;</span>0.00</span>', wc_price( 0 ) );
 
 		// different currency
-		$this->assertEquals( '<span class="amount">&#36;1,111.17</span>', wc_price( 1111.17, array( 'currency' => 'USD' ) ) );
+		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><span class="woocommerce-Price-currencySymbol">&#36;</span>1,111.17</span>', wc_price( 1111.17, array( 'currency' => 'USD' ) ) );
 
 		// negative price
-		$this->assertEquals( '<span class="amount">-&pound;1.17</span>', wc_price( -1.17 ) );
+		$this->assertEquals( '<span class="woocommerce-Price-amount amount">-<span class="woocommerce-Price-currencySymbol">&pound;</span>1.17</span>', wc_price( -1.17 ) );
 
 		// bogus prices
-		$this->assertEquals( '<span class="amount">&pound;0.00</span>', wc_price( null ) );
-		$this->assertEquals( '<span class="amount">&pound;0.00</span>', wc_price( 'Q' ) );
-		$this->assertEquals( '<span class="amount">&pound;0.00</span>', wc_price( 'ಠ_ಠ' ) );
+		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><span class="woocommerce-Price-currencySymbol">&pound;</span>0.00</span>', wc_price( null ) );
+		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><span class="woocommerce-Price-currencySymbol">&pound;</span>0.00</span>', wc_price( 'Q' ) );
+		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><span class="woocommerce-Price-currencySymbol">&pound;</span>0.00</span>', wc_price( 'ಠ_ಠ' ) );
 
 		// trim zeros
 		add_filter( 'woocommerce_price_trim_zeros', '__return_true' );
-		$this->assertEquals( '<span class="amount">&pound;1</span>', wc_price( 1.00 ) );
+		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><span class="woocommerce-Price-currencySymbol">&pound;</span>1</span>', wc_price( 1.00 ) );
 		remove_filter( 'woocommerce_price_trim_zeros', '__return_true' );
 
 		// ex tax label
 		$calc_taxes = get_option( 'woocommerce_calc_taxes' );
 		update_option( 'woocommerce_calc_taxes', 'yes' );
-		$this->assertEquals( '<span class="amount">&pound;1,111.17</span> <small class="tax_label">(ex. VAT)</small>', wc_price( '1111.17', array( 'ex_tax_label' => true ) ) );
+		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><span class="woocommerce-Price-currencySymbol">&pound;</span>1,111.17</span> <small class="woocommerce-Price-taxLabel tax_label">(ex. VAT)</small>', wc_price( '1111.17', array( 'ex_tax_label' => true ) ) );
 		update_option( 'woocommerce_calc_taxes', $calc_taxes );
 	}
 
@@ -524,7 +533,7 @@ class Functions extends \WC_Unit_Test_Case {
 
 		// test with manually set UTC offset
 		update_option( 'gmt_offset', -4 );
-		$this->assertEquals( 'America/Halifax', wc_timezone_string() );
+		$this->assertNotEquals( 'UTC', wc_timezone_string() );
 
 		// test with invalid offset
 		update_option( 'gmt_offset', 99 );
@@ -604,9 +613,12 @@ class Functions extends \WC_Unit_Test_Case {
 	 */
 	public function test_wc_format_postcode() {
 
-		// generic postcode
+		// Generic postcode
 		$this->assertEquals( '02111', wc_format_postcode( ' 02111	', 'US' ) );
 
+		// US 9-digit postcode
+		$this->assertEquals( '02111-9999', wc_format_postcode( ' 021119999	', 'US' ) );
+
 		// UK postcode
 		$this->assertEquals( 'PCRN 1ZZ', wc_format_postcode( 'pcrn1zz', 'GB' ) );
 	}
@@ -627,10 +639,9 @@ class Functions extends \WC_Unit_Test_Case {
 	 * @since 2.2
 	 */
 	public function test_wc_trim_string() {
-
 		$this->assertEquals( 'string', wc_trim_string( 'string' ) );
 		$this->assertEquals( 's...',   wc_trim_string( 'string', 4 ) );
 		$this->assertEquals( 'st.',    wc_trim_string( 'string', 3, '.' ) );
+		$this->assertEquals( 'string¥', wc_trim_string( 'string¥', 7, '' ) );
 	}
-
 }
diff --git a/tests/unit-tests/log/log-handler-db.php b/tests/unit-tests/log/log-handler-db.php
new file mode 100644
index 00000000000..939d323dff8
--- /dev/null
+++ b/tests/unit-tests/log/log-handler-db.php
@@ -0,0 +1,137 @@
+<?php
+
+/**
+ * Class WC_Tests_Log_Handler_DB
+ * @package WooCommerce\Tests\Log
+ * @since 3.0.0
+ */
+class WC_Tests_Log_Handler_DB extends WC_Unit_Test_Case {
+	public function setUp() {
+		parent::setUp();
+		WC_Log_Handler_DB::flush();
+	}
+
+	public function tearDown() {
+		WC_Log_Handler_DB::flush();
+		parent::tearDown();
+	}
+
+	/**
+	 * Test handle writes to database correctly.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_handle() {
+		global $wpdb;
+
+		$handler = new WC_Log_Handler_DB( array( 'threshold' => 'debug' ) );
+		$time = time();
+		$context = array( 1, 2, 'a', 'b', 'key' => 'value' );
+
+		$handler->handle( $time, 'debug', 'msg_debug', array( 'source' => 'source_debug' ) );
+		$handler->handle( $time, 'info', 'msg_info', array( 'source' => 'source_info' ) );
+		$handler->handle( $time, 'notice', 'msg_notice', array( 'source' => 'source_notice' ) );
+		$handler->handle( $time, 'warning', 'msg_warning', array( 'source' => 'source_warning' ) );
+		$handler->handle( $time, 'error', 'msg_error', array( 'source' => 'source_error' ) );
+		$handler->handle( $time, 'critical', 'msg_critical', array( 'source' => 'source_critical' ) );
+		$handler->handle( $time, 'alert', 'msg_alert', array( 'source' => 'source_alert' ) );
+		$handler->handle( $time, 'emergency', 'msg_emergency', array( 'source' => 'source_emergency' ) );
+
+		$handler->handle( $time, 'debug', 'context_test', $context );
+
+		$log_entries = $wpdb->get_results( "SELECT timestamp, level, message, source, context FROM {$wpdb->prefix}woocommerce_log", ARRAY_A );
+
+		$expected_ts = date( 'Y-m-d H:i:s', $time );
+		$expected = array(
+			array(
+				'timestamp' => $expected_ts,
+				'level' => WC_Log_Levels::get_level_severity( 'debug' ),
+				'message' => 'msg_debug',
+				'source' => 'source_debug',
+				'context' => serialize( array( 'source' => 'source_debug' ) ),
+			),
+			array(
+				'timestamp' => $expected_ts,
+				'level' => WC_Log_Levels::get_level_severity( 'info' ),
+				'message' => 'msg_info',
+				'source' => 'source_info',
+				'context' => serialize( array( 'source' => 'source_info' ) ),
+			),
+			array(
+				'timestamp' => $expected_ts,
+				'level' => WC_Log_Levels::get_level_severity( 'notice' ),
+				'message' => 'msg_notice',
+				'source' => 'source_notice',
+				'context' => serialize( array( 'source' => 'source_notice' ) ),
+			),
+			array(
+				'timestamp' => $expected_ts,
+				'level' => WC_Log_Levels::get_level_severity( 'warning' ),
+				'message' => 'msg_warning',
+				'source' => 'source_warning',
+				'context' => serialize( array( 'source' => 'source_warning' ) ),
+			),
+			array(
+				'timestamp' => $expected_ts,
+				'level' => WC_Log_Levels::get_level_severity( 'error' ),
+				'message' => 'msg_error',
+				'source' => 'source_error',
+				'context' => serialize( array( 'source' => 'source_error' ) ),
+			),
+			array(
+				'timestamp' => $expected_ts,
+				'level' => WC_Log_Levels::get_level_severity( 'critical' ),
+				'message' => 'msg_critical',
+				'source' => 'source_critical',
+				'context' => serialize( array( 'source' => 'source_critical' ) ),
+			),
+			array(
+				'timestamp' => $expected_ts,
+				'level' => WC_Log_Levels::get_level_severity( 'alert' ),
+				'message' => 'msg_alert',
+				'source' => 'source_alert',
+				'context' => serialize( array( 'source' => 'source_alert' ) ),
+			),
+			array(
+				'timestamp' => $expected_ts,
+				'level' => WC_Log_Levels::get_level_severity( 'emergency' ),
+				'message' => 'msg_emergency',
+				'source' => 'source_emergency',
+				'context' => serialize( array( 'source' => 'source_emergency' ) ),
+			),
+			array(
+				'timestamp' => $expected_ts,
+				'level' => WC_Log_Levels::get_level_severity( 'debug' ),
+				'message' => 'context_test',
+				'source' => pathinfo( __FILE__, PATHINFO_FILENAME ),
+				'context' => serialize( $context ),
+			),
+		);
+
+		$this->assertEquals( $log_entries, $expected );
+	}
+
+
+	/**
+	 * Test flush.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_flush() {
+		global $wpdb;
+
+		$handler = new WC_Log_Handler_DB( array( 'threshold' => 'debug' ) );
+		$time = time();
+
+		$handler->handle( $time, 'debug', '', array() );
+
+		$log_entries = $wpdb->get_results( "SELECT timestamp, level, message, source FROM {$wpdb->prefix}woocommerce_log" );
+		$this->assertCount( 1, $log_entries );
+
+		WC_Log_Handler_DB::flush();
+
+		$log_entries = $wpdb->get_results( "SELECT timestamp, level, message, source FROM {$wpdb->prefix}woocommerce_log" );
+		$this->assertCount( 0, $log_entries );
+	}
+
+}
diff --git a/tests/unit-tests/log/log-handler-email.php b/tests/unit-tests/log/log-handler-email.php
new file mode 100644
index 00000000000..fcfb0f8e227
--- /dev/null
+++ b/tests/unit-tests/log/log-handler-email.php
@@ -0,0 +1,245 @@
+<?php
+
+/**
+ * Class WC_Tests_Log_Handler_Email
+ * @package WooCommerce\Tests\Log
+ * @since 3.0.0
+ */
+class WC_Tests_Log_Handler_Email extends WC_Unit_Test_Case {
+
+	function setUp() {
+		parent::setUp();
+		reset_phpmailer_instance();
+	}
+
+	function tearDown() {
+		reset_phpmailer_instance();
+		parent::tearDown();
+	}
+
+	/**
+	 * Test handle sends email correctly.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_handle() {
+		$mailer = tests_retrieve_phpmailer_instance();
+		$time = time();
+		$site_name = get_bloginfo( 'name' );
+
+		$handler = new WC_Log_Handler_Email();
+		$handler->handle( $time, 'emergency', 'msg_emergency', array() );
+		$handler->handle( $time, 'emergency', 'msg_emergency 2', array() );
+		$handler->send_log_email();
+
+		$this->assertEquals(
+			(
+				'You have received the following WooCommerce log messages:'
+				. PHP_EOL
+				. PHP_EOL
+				. date( 'c', $time ) . ' EMERGENCY msg_emergency'
+				. PHP_EOL
+				. date( 'c', $time ) . ' EMERGENCY msg_emergency 2'
+				. PHP_EOL
+				. PHP_EOL
+				. "Visit {$site_name} admin area:"
+				. PHP_EOL
+				. admin_url()
+				. PHP_EOL
+			),
+			$mailer->get_sent( 0 )->body
+		);
+		$this->assertEquals(
+			"[{$site_name}] EMERGENCY: 2 WooCommerce log messages",
+			$mailer->get_sent( 0 )->subject
+		);
+		$this->assertEquals( get_option( 'admin_email' ), $mailer->get_recipient( 'to' )->address );
+
+		$handler->handle( $time, 'emergency', 'msg_emergency', array() );
+		$handler->send_log_email();
+		$this->assertEquals(
+			(
+				'You have received the following WooCommerce log message:'
+				. PHP_EOL
+				. PHP_EOL
+				. date( 'c', $time ) . ' EMERGENCY msg_emergency'
+				. PHP_EOL
+				. PHP_EOL
+				. "Visit {$site_name} admin area:"
+				. PHP_EOL
+				. admin_url()
+				. PHP_EOL
+			),
+			$mailer->get_sent( 1 )->body
+		);
+
+	}
+
+
+	/**
+	 * Test email subject
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_email_subject() {
+		$mailer = tests_retrieve_phpmailer_instance();
+		$time = time();
+		$site_name = get_bloginfo( 'name' );
+
+		$handler = new WC_Log_Handler_Email( null, WC_Log_Levels::DEBUG );
+		$handler->handle( $time, 'debug', '', array() );
+		$handler->send_log_email();
+
+		$handler->handle( $time, 'alert', '', array() );
+		$handler->handle( $time, 'critical', '', array() );
+		$handler->handle( $time, 'debug', '', array() );
+		$handler->send_log_email();
+
+		$this->assertEquals(
+			"[{$site_name}] DEBUG: 1 WooCommerce log message",
+			$mailer->get_sent( 0 )->subject
+		);
+
+		$this->assertEquals(
+			"[{$site_name}] ALERT: 3 WooCommerce log messages",
+			$mailer->get_sent( 1 )->subject
+		);
+	}
+
+	/**
+	 * Test multiple recipients receive emails.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_multiple_recipients() {
+		$mailer = tests_retrieve_phpmailer_instance();
+
+		$handler = new WC_Log_Handler_Email( array(
+			'first@test.com',
+			'Second Recipient <second@test.com>',
+		) );
+		$handler->handle( time(), 'emergency', '', array() );
+		$handler->send_log_email();
+
+		$first_recipient  = $mailer->get_recipient( 'to', 0, 0 );
+		$second_recipient = $mailer->get_recipient( 'to', 0, 1 );
+
+		$this->assertEquals( 'first@test.com', $first_recipient->address );
+		$this->assertEquals( 'second@test.com', $second_recipient->address );
+		$this->assertEquals( 'Second Recipient', $second_recipient->name );
+	}
+
+	/**
+	 * Test single recipient receives emails.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_single_recipient() {
+		$mailer = tests_retrieve_phpmailer_instance();
+
+		$handler = new WC_Log_Handler_Email( 'User <user@test.com>' );
+		$handler->handle( time(), 'emergency', '', array() );
+		$handler->send_log_email();
+
+		$recipient  = $mailer->get_recipient( 'to' );
+		$this->assertEquals( 'user@test.com', $recipient->address );
+		$this->assertEquals( 'User', $recipient->name );
+	}
+
+	/**
+	 * Test threshold.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_threshold() {
+		$mailer = tests_retrieve_phpmailer_instance();
+
+		$handler = new WC_Log_Handler_Email( null, 'notice' );
+		$handler->handle( time(), 'info', '', array() );
+		$handler->send_log_email();
+
+		// Info should not be handled, get_sent is false
+		$this->assertFalse( $mailer->get_sent( 0 ) );
+
+		$handler->handle( time(), 'notice', '', array() );
+		$handler->send_log_email();
+		$this->assertObjectHasAttribute( 'body', $mailer->get_sent( 0 ) );
+	}
+
+	/**
+	 * Test set_threshold().
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_set_threshold() {
+		$mailer = tests_retrieve_phpmailer_instance();
+
+		$handler = new WC_Log_Handler_Email( null, 'notice' );
+		$handler->handle( time(), 'info', '', array() );
+		$handler->send_log_email();
+
+		// Info should not be handled, get_sent is false
+		$this->assertFalse( $mailer->get_sent( 0 ) );
+
+		$handler->set_threshold( 'info' );
+		$handler->handle( time(), 'info', '', array() );
+		$handler->send_log_email();
+
+		$this->assertObjectHasAttribute( 'body', $mailer->get_sent( 0 ) );
+	}
+
+	/**
+	 * Test send_log_email clears logs.
+	 *
+	 * Send log email could be called multiple times during a request. The same log should not be
+	 * sent multiple times.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_multiple_send_log() {
+		$mailer = tests_retrieve_phpmailer_instance();
+
+		$handler = new WC_Log_Handler_Email();
+		$time = time();
+		$handler->handle( $time, 'emergency', 'message 1', array() );
+		$handler->send_log_email();
+		$handler->handle( $time, 'emergency', 'message 2', array() );
+		$handler->send_log_email();
+
+		$site_name = get_bloginfo( 'name' );
+
+		$this->assertEquals(
+			(
+				'You have received the following WooCommerce log message:'
+				. PHP_EOL
+				. PHP_EOL
+				. date( 'c', $time ) . ' EMERGENCY message 1'
+				. PHP_EOL
+				. PHP_EOL
+				. "Visit {$site_name} admin area:"
+				. PHP_EOL
+				. admin_url()
+				. PHP_EOL
+			),
+			$mailer->get_sent( 0 )->body
+		);
+
+		$this->assertEquals(
+			(
+				'You have received the following WooCommerce log message:'
+				. PHP_EOL
+				. PHP_EOL
+				. date( 'c', $time ) . ' EMERGENCY message 2'
+				. PHP_EOL
+				. PHP_EOL
+				. "Visit {$site_name} admin area:"
+				. PHP_EOL
+				. admin_url()
+				. PHP_EOL
+			),
+			$mailer->get_sent( 1 )->body
+		);
+	}
+
+
+}
diff --git a/tests/unit-tests/log/log-handler-file.php b/tests/unit-tests/log/log-handler-file.php
new file mode 100644
index 00000000000..73972188c1a
--- /dev/null
+++ b/tests/unit-tests/log/log-handler-file.php
@@ -0,0 +1,204 @@
+<?php
+
+/**
+ * Class WC_Tests_Log_Handler_File
+ * @package WooCommerce\Tests\Log
+ * @since 3.0.0
+ */
+class WC_Tests_Log_Handler_File extends WC_Unit_Test_Case {
+
+	public function tearDown() {
+		$log_files = array(
+			'unit-tests',
+			'log',
+			 '_test_clear',
+			 '_test_remove',
+			 '_test_log_rotate',
+			 '_test_log_rotate.0',
+			 '_test_log_rotate.1',
+			 '_test_log_rotate.2',
+			 '_test_log_rotate.3',
+			 '_test_log_rotate.4',
+			 '_test_log_rotate.5',
+			 '_test_log_rotate.6',
+			 '_test_log_rotate.7',
+			 '_test_log_rotate.8',
+			 '_test_log_rotate.9',
+		);
+
+		foreach ( $log_files as $file ) {
+			$file_path = WC_Log_Handler_File::get_log_file_path( $file );
+			if ( file_exists( $file_path ) && is_writable( $file_path ) ) {
+				unlink( $file_path );
+			}
+		}
+		parent::tearDown();
+	}
+
+	public function read_content( $handle ) {
+		return file_get_contents( WC_Log_Handler_File::get_log_file_path( $handle ) );
+	}
+
+	/**
+	 * Test _legacy format.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_legacy_format() {
+		$handler = new WC_Log_Handler_File( array( 'threshold' => 'debug' ) );
+
+		$handler->handle( time(), 'info', 'this is a message', array( 'source' => 'unit-tests', '_legacy' => true ) );
+
+		$this->assertStringMatchesFormat( '%d-%d-%d @ %d:%d:%d - %s', $this->read_content( 'unit-tests' ) );
+		$this->assertStringEndsWith( ' - this is a message' . PHP_EOL, $this->read_content( 'unit-tests' ) );
+	}
+
+	/**
+	 * Test clear().
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_clear() {
+		$handler = new WC_Log_Handler_File();
+		$log_name = '_test_clear';
+		$handler->handle( time(), 'debug', 'debug', array( 'source' => $log_name ) );
+		$handler->clear( $log_name );
+		$this->assertEquals( '', $this->read_content( $log_name ) );
+	}
+
+	/**
+	 * Test remove().
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_remove() {
+		$handler = new WC_Log_Handler_File();
+		$log_name = '_test_remove';
+		$handler->handle( time(), 'debug', 'debug', array( 'source' => $log_name ) );
+		$handler->remove( $log_name );
+		$this->assertFileNotExists( WC_Log_Handler_File::get_log_file_path( $log_name ) );
+	}
+
+	/**
+	 * Test handle writes to default file correctly.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_writes_file() {
+		$handler = new WC_Log_Handler_File();
+		$time = time();
+
+		$handler->handle( $time, 'debug', 'debug', array() );
+		$handler->handle( $time, 'info', 'info', array() );
+		$handler->handle( $time, 'notice', 'notice', array() );
+		$handler->handle( $time, 'warning', 'warning', array() );
+		$handler->handle( $time, 'error', 'error', array() );
+		$handler->handle( $time, 'critical', 'critical', array() );
+		$handler->handle( $time, 'alert', 'alert', array() );
+		$handler->handle( $time, 'emergency', 'emergency', array() );
+
+		$log_content = $this->read_content( 'log' );
+		$this->assertStringMatchesFormatFile( dirname( __FILE__ ) . '/test_log_expected.txt', $log_content );
+	}
+
+	/**
+	 * Test 'source' context determines log file.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_log_file_source() {
+		$handler = new WC_Log_Handler_File();
+		$time = time();
+		$context_source = array( 'source' => 'unit-tests' );
+
+		$handler->handle( $time, 'debug', 'debug', $context_source );
+		$handler->handle( $time, 'info', 'info', $context_source );
+		$handler->handle( $time, 'notice', 'notice', $context_source );
+		$handler->handle( $time, 'warning', 'warning', $context_source );
+		$handler->handle( $time, 'error', 'error', $context_source );
+		$handler->handle( $time, 'critical', 'critical', $context_source );
+		$handler->handle( $time, 'alert', 'alert', $context_source );
+		$handler->handle( $time, 'emergency', 'emergency', $context_source );
+
+		$log_content = $this->read_content( 'unit-tests' );
+		$this->assertStringMatchesFormatFile( dirname( __FILE__ ) . '/test_log_expected.txt', $log_content );
+	}
+
+	/**
+	 * Test multiple handlers don't conflict on log writing.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_multiple_handlers() {
+		$handler_a = new WC_Log_Handler_File();
+		$handler_b = new WC_Log_Handler_File();
+		$time = time();
+		$context_source = array( 'source' => 'unit-tests' );
+
+		// Different loggers should not conflict.
+		$handler_a->handle( $time, 'debug', 'debug', $context_source );
+		$handler_b->handle( $time, 'info', 'info', $context_source );
+		$handler_a->handle( $time, 'notice', 'notice', $context_source );
+		$handler_b->handle( $time, 'warning', 'warning', $context_source );
+		$handler_a->handle( $time, 'error', 'error', $context_source );
+		$handler_b->handle( $time, 'critical', 'critical', $context_source );
+		$handler_a->handle( $time, 'alert', 'alert', $context_source );
+		$handler_b->handle( $time, 'emergency', 'emergency', $context_source );
+
+		$log_content = $this->read_content( 'unit-tests' );
+		$this->assertStringMatchesFormatFile( dirname( __FILE__ ) . '/test_log_expected.txt', $log_content );
+	}
+
+	/**
+	 * Test log_rotate()
+	 *
+	 * Ensure logs are rotated correctly when limit is surpassed.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_log_rotate() {
+
+		// Handler with log size limit of 5mb
+		$handler = new WC_Log_Handler_File( 5 * 1024 * 1024 );
+		$time = time();
+		$log_name = '_test_log_rotate';
+		$base_log_file = WC_Log_Handler_File::get_log_file_path( $log_name );
+
+		// Create log file larger than 5mb to ensure log is rotated
+		$handle = fopen( $base_log_file, 'w' );
+		fseek( $handle, 5 * 1024 * 1024 );
+		fwrite( $handle, '_base_log_file_contents_' );
+		fclose( $handle );
+
+		// Write some files to ensure they've rotated correctly
+		for ( $i = 0; $i < 10; $i++ ) {
+			file_put_contents( WC_Log_Handler_File::get_log_file_path( $log_name . ".{$i}" ), $i );
+		}
+
+		$context_source = array( 'source' => $log_name );
+		$handler->handle( $time, 'emergency', 'emergency', $context_source );
+
+		$this->assertFileExists( WC_Log_Handler_File::get_log_file_path( $log_name ) );
+
+		// Ensure the handled log is correct
+		$this->assertStringEndsWith( 'EMERGENCY emergency' . PHP_EOL, $this->read_content( $log_name ) );
+
+		// Ensure other logs have rotated correctly
+		$this->assertEquals( '_base_log_file_contents_', trim( $this->read_content( $log_name . '.0' ) ) );
+		for ( $i = 1; $i < 10; $i++ ) {
+			$this->assertEquals( $i - 1, $this->read_content( $log_name . ".{$i}" ) );
+		}
+	}
+
+	/**
+	 * Test get_log_file_path().
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_log_file_path() {
+		$log_dir   = trailingslashit( WC_LOG_DIR );
+		$hash_name = sanitize_file_name( wp_hash( 'unit-tests' ) );
+		$this->assertEquals( $log_dir . 'unit-tests-' . $hash_name . '.log', WC_Log_Handler_File::get_log_file_path( 'unit-tests' ) );
+	}
+
+}
diff --git a/tests/unit-tests/log/log-levels.php b/tests/unit-tests/log/log-levels.php
new file mode 100644
index 00000000000..da01cadf24a
--- /dev/null
+++ b/tests/unit-tests/log/log-levels.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * Class WC_Tests_Logger
+ * @package WooCommerce\Tests\Log
+ * @since 3.0.0
+ */
+class WC_Tests_Log_Levels extends WC_Unit_Test_Case {
+
+	/**
+	 * Test get_level_severity().
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_level_severity() {
+		$this->assertEquals( 0,   WC_Log_Levels::get_level_severity( 'unrecognized level' ) );
+		$this->assertEquals( 100, WC_Log_Levels::get_level_severity( 'debug' ) );
+		$this->assertEquals( 200, WC_Log_Levels::get_level_severity( 'info' ) );
+		$this->assertEquals( 300, WC_Log_Levels::get_level_severity( 'notice' ) );
+		$this->assertEquals( 400, WC_Log_Levels::get_level_severity( 'warning' ) );
+		$this->assertEquals( 500, WC_Log_Levels::get_level_severity( 'error' ) );
+		$this->assertEquals( 600, WC_Log_Levels::get_level_severity( 'critical' ) );
+		$this->assertEquals( 700, WC_Log_Levels::get_level_severity( 'alert' ) );
+		$this->assertEquals( 800, WC_Log_Levels::get_level_severity( 'emergency' ) );
+	}
+
+	/**
+	 * Test get_severity_level().
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_get_severity_level() {
+		$this->assertFalse( WC_Log_Levels::get_severity_level( 0 ) );
+		$this->assertEquals( 'debug', WC_Log_Levels::get_severity_level( 100 ) );
+		$this->assertEquals( 'info', WC_Log_Levels::get_severity_level( 200 ) );
+		$this->assertEquals( 'notice', WC_Log_Levels::get_severity_level( 300 ) );
+		$this->assertEquals( 'warning', WC_Log_Levels::get_severity_level( 400 ) );
+		$this->assertEquals( 'error', WC_Log_Levels::get_severity_level( 500 ) );
+		$this->assertEquals( 'critical', WC_Log_Levels::get_severity_level( 600 ) );
+		$this->assertEquals( 'alert', WC_Log_Levels::get_severity_level( 700 ) );
+		$this->assertEquals( 'emergency', WC_Log_Levels::get_severity_level( 800 ) );
+	}
+
+
+	/**
+	 * Test is_valid_level().
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_is_valid_level() {
+		$this->assertFalse( WC_Log_Levels::is_valid_level( 'unrecognized level' ) );
+		$this->assertTrue( WC_Log_Levels::is_valid_level( 'debug' ) );
+		$this->assertTrue( WC_Log_Levels::is_valid_level( 'info' ) );
+		$this->assertTrue( WC_Log_Levels::is_valid_level( 'notice' ) );
+		$this->assertTrue( WC_Log_Levels::is_valid_level( 'warning' ) );
+		$this->assertTrue( WC_Log_Levels::is_valid_level( 'error' ) );
+		$this->assertTrue( WC_Log_Levels::is_valid_level( 'critical' ) );
+		$this->assertTrue( WC_Log_Levels::is_valid_level( 'alert' ) );
+		$this->assertTrue( WC_Log_Levels::is_valid_level( 'emergency' ) );
+	}
+
+}
diff --git a/tests/unit-tests/log/logger.php b/tests/unit-tests/log/logger.php
new file mode 100644
index 00000000000..73a0a9100a6
--- /dev/null
+++ b/tests/unit-tests/log/logger.php
@@ -0,0 +1,324 @@
+<?php
+
+/**
+ * Class WC_Tests_Logger
+ * @package WooCommerce\Tests\Log
+ * @since 2.3
+ */
+class WC_Tests_Logger extends WC_Unit_Test_Case {
+
+	/**
+	 * Test add().
+	 *
+	 * @since 2.4
+	 */
+	public function test_add() {
+		$time = time();
+		$handler = $this
+			->getMockBuilder( 'WC_Log_Handler_Interface' )
+			->setMethods( array( 'handle' ) )
+			->getMock();
+		$handler
+			->expects( $this->once() )
+			->method( 'handle' )
+			->with(
+				$this->greaterThanOrEqual( $time ),
+				$this->equalTo( 'notice' ),
+				$this->equalTo( 'this is a message' ),
+				$this->equalTo( array( 'source' => 'unit-tests', '_legacy' => true ) )
+			);
+		$log = new WC_Logger( array( $handler ), 'debug' );
+
+		$log->add( 'unit-tests', 'this is a message' );
+	}
+
+	/**
+	 * Test clear().
+	 *
+	 * @since 2.4
+	 */
+	public function test_clear() {
+		$file = wc_get_log_file_path( 'unit-tests' );
+		file_put_contents( $file, 'Test file content.' );
+		$log = new WC_Logger();
+		$log->clear( 'unit-tests' );
+		$this->assertEquals( '', file_get_contents( $file ) );
+		$this->setExpectedDeprecated( 'WC_Logger::clear' );
+	}
+
+	/**
+	 * Test log() complains for bad levels.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_bad_level() {
+		$log = new WC_Logger( null, 'debug' );
+		$log->log( 'this-is-an-invalid-level', '' );
+		$this->setExpectedIncorrectUsage( 'WC_Logger::log' );
+	}
+
+	/**
+	 * Test log().
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_log() {
+		$handler = $this->create_mock_handler();
+		$log = new WC_Logger( array( $handler ), 'debug' );
+		$log->log( 'debug', 'debug message' );
+		$log->log( 'info', 'info message' );
+		$log->log( 'notice', 'notice message' );
+		$log->log( 'warning', 'warning message' );
+		$log->log( 'error', 'error message' );
+		$log->log( 'critical', 'critical message' );
+		$log->log( 'alert', 'alert message' );
+		$log->log( 'emergency', 'emergency message' );
+	}
+
+	/**
+	 * Test logs passed to all handlers.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_log_handlers() {
+		$false_handler = $this
+			->getMockBuilder( 'WC_Log_Handler_Interface' )
+			->setMethods( array( 'handle' ) )
+			->getMock();
+		$false_handler->expects( $this->exactly( 8 ) )->method( 'handle' )->will( $this->returnValue( false ) );
+
+		$true_handler = $this
+			->getMockBuilder( 'WC_Log_Handler_Interface' )
+			->setMethods( array( 'handle' ) )
+			->getMock();
+		$false_handler->expects( $this->exactly( 8 ) )->method( 'handle' )->will( $this->returnValue( true ) );
+
+		$final_handler = $this
+			->getMockBuilder( 'WC_Log_Handler_Interface' )
+			->setMethods( array( 'handle' ) )
+			->getMock();
+		$final_handler->expects( $this->exactly( 8 ) )->method( 'handle' );
+
+		$log = new WC_Logger( array( $false_handler, $true_handler, $final_handler ), 'debug' );
+
+		$log->debug( 'debug' );
+		$log->info( 'info' );
+		$log->notice( 'notice' );
+		$log->warning( 'warning' );
+		$log->error( 'error' );
+		$log->critical( 'critical' );
+		$log->alert( 'alert' );
+		$log->emergency( 'emergency' );
+	}
+
+	/**
+	 * Test WC_Logger->[debug..emergency] methods
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_level_methods() {
+		$handler = $this->create_mock_handler();
+		$log = new WC_Logger( array( $handler ), 'debug' );
+		$log->debug( 'debug message' );
+		$log->info( 'info message' );
+		$log->notice( 'notice message' );
+		$log->warning( 'warning message' );
+		$log->error( 'error message' );
+		$log->critical( 'critical message' );
+		$log->alert( 'alert message' );
+		$log->emergency( 'emergency message' );
+	}
+
+	/**
+	 * Test 'woocommerce_register_log_handlers' filter.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_woocommerce_register_log_handlers_filter() {
+		add_filter( 'woocommerce_register_log_handlers', array( $this, 'return_assertion_handlers' ) );
+		$log = new WC_Logger( null, 'debug' );
+		$log->debug( 'debug' );
+		$log->info( 'info' );
+		$log->notice( 'notice' );
+		$log->warning( 'warning' );
+		$log->error( 'error' );
+		$log->critical( 'critical' );
+		$log->alert( 'alert' );
+		$log->emergency( 'emergency' );
+		remove_filter( 'woocommerce_register_log_handlers', array( $this, 'return_assertion_handlers' ) );
+	}
+
+	/**
+	 * Test no filtering by default
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_threshold_defaults() {
+		$time = time();
+
+		// Test no filtering by default
+		delete_option( 'woocommerce_log_threshold' );
+		$handler = $this
+			->getMockBuilder( 'WC_Log_Handler_Interface' )
+			->setMethods( array( 'handle' ) )
+			->getMock();
+		$handler
+			->expects( $this->at( 0 ) )
+			->method( 'handle' )
+			->with(
+				$this->greaterThanOrEqual( $time ),
+				$this->equalTo( 'bad-level' ),
+				$this->equalTo( 'bad-level message' ),
+				$this->equalTo( array() )
+			);
+		$handler
+			->expects( $this->at( 1 ) )
+			->method( 'handle' )
+			->with(
+				$this->greaterThanOrEqual( $time ),
+				$this->equalTo( 'debug' ),
+				$this->equalTo( 'debug message' ),
+				$this->equalTo( array() )
+			);
+
+		$log = new WC_Logger( array( $handler ) );
+
+		// An invalid level has the minimum severity, but should not be filtered.
+		$log->log( 'bad-level', 'bad-level message' );
+		// Bad level also complains.
+		$this->setExpectedIncorrectUsage( 'WC_Logger::log' );
+
+		// Debug is lowest recognized level
+		$log->debug( 'debug message' );
+	}
+
+	/**
+	 * Test that the logger validates handlers
+	 *
+	 * If a handler does not implement WC_Log_Handler_Interface, WC_Logger should complain
+	 * (wc_doing_it_wrong) and not register the handler. This handler should receive no messages.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_validate_handler_interface() {
+		$handler = $this
+			->getMockBuilder( 'stdClass' )
+			->setMethods( array( 'handle' ) )
+			->getMock();
+		$handler->expects( $this->never() )->method( 'handle' );
+		new WC_Logger( array( $handler ) );
+		$this->setExpectedIncorrectUsage( 'WC_Logger::__construct' );
+	}
+
+	/**
+	 * Helper for 'woocommerce_register_log_handlers' filter test.
+	 *
+	 * Returns an array of 1 mocked handler.
+	 * The handler expects to receive exactly 8 messages (1 for each level).
+	 *
+	 * @since 3.0.0
+	 *
+	 * @return WC_Log_Handler[] array of mocked handlers.
+	 */
+	public function return_assertion_handlers() {
+		$handler = $this
+			->getMockBuilder( 'WC_Log_Handler_Interface' )
+			->setMethods( array( 'handle' ) )
+			->getMock();
+		$handler->expects( $this->exactly( 8 ) )->method( 'handle' );
+
+		return array( $handler );
+	}
+
+	/**
+	 * Mock handler that expects sequential calls to each level.
+	 *
+	 * Calls should have the message '[level] message'
+	 *
+	 * @since 3.0.0
+	 *
+	 * @return WC_Log_Handler mock object
+	 */
+	public function create_mock_handler() {
+		$time = time();
+		$handler = $this
+			->getMockBuilder( 'WC_Log_Handler_Interface' )
+			->setMethods( array( 'handle' ) )
+			->getMock();
+
+		$handler
+			->expects( $this->at( 0 ) )
+			->method( 'handle' )
+			->with(
+				$this->greaterThanOrEqual( $time ),
+				$this->equalTo( 'debug' ),
+				$this->equalTo( 'debug message' ),
+				$this->equalTo( array() )
+			);
+		$handler
+			->expects( $this->at( 1 ) )
+			->method( 'handle' )
+			->with(
+				$this->greaterThanOrEqual( $time ),
+				$this->equalTo( 'info' ),
+				$this->equalTo( 'info message' ),
+				$this->equalTo( array() )
+			);
+		$handler
+			->expects( $this->at( 2 ) )
+			->method( 'handle' )
+			->with(
+				$this->greaterThanOrEqual( $time ),
+				$this->equalTo( 'notice' ),
+				$this->equalTo( 'notice message' ),
+				$this->equalTo( array() )
+			);
+		$handler
+			->expects( $this->at( 3 ) )
+			->method( 'handle' )
+			->with(
+				$this->greaterThanOrEqual( $time ),
+				$this->equalTo( 'warning' ),
+				$this->equalTo( 'warning message' ),
+				$this->equalTo( array() )
+			);
+		$handler
+			->expects( $this->at( 4 ) )
+			->method( 'handle' )
+			->with(
+				$this->greaterThanOrEqual( $time ),
+				$this->equalTo( 'error' ),
+				$this->equalTo( 'error message' ),
+				$this->equalTo( array() )
+			);
+		$handler
+			->expects( $this->at( 5 ) )
+			->method( 'handle' )
+			->with(
+				$this->greaterThanOrEqual( $time ),
+				$this->equalTo( 'critical' ),
+				$this->equalTo( 'critical message' ),
+				$this->equalTo( array() )
+			);
+		$handler
+			->expects( $this->at( 6 ) )
+			->method( 'handle' )
+			->with(
+				$this->greaterThanOrEqual( $time ),
+				$this->equalTo( 'alert' ),
+				$this->equalTo( 'alert message' ),
+				$this->equalTo( array() )
+			);
+		$handler
+			->expects( $this->at( 7 ) )
+			->method( 'handle' )
+			->with(
+				$this->greaterThanOrEqual( $time ),
+				$this->equalTo( 'emergency' ),
+				$this->equalTo( 'emergency message' ),
+				$this->equalTo( array() )
+			);
+
+		return $handler;
+	}
+}
diff --git a/tests/unit-tests/log/test_log_expected.txt b/tests/unit-tests/log/test_log_expected.txt
new file mode 100644
index 00000000000..0f660d65d76
--- /dev/null
+++ b/tests/unit-tests/log/test_log_expected.txt
@@ -0,0 +1,8 @@
+%d-%d-%dT%d:%d:%d+%d:%d DEBUG debug
+%d-%d-%dT%d:%d:%d+%d:%d INFO info
+%d-%d-%dT%d:%d:%d+%d:%d NOTICE notice
+%d-%d-%dT%d:%d:%d+%d:%d WARNING warning
+%d-%d-%dT%d:%d:%d+%d:%d ERROR error
+%d-%d-%dT%d:%d:%d+%d:%d CRITICAL critical
+%d-%d-%dT%d:%d:%d+%d:%d ALERT alert
+%d-%d-%dT%d:%d:%d+%d:%d EMERGENCY emergency
diff --git a/tests/unit-tests/order-items/functions.php b/tests/unit-tests/order-items/functions.php
new file mode 100644
index 00000000000..1a3ba32f70e
--- /dev/null
+++ b/tests/unit-tests/order-items/functions.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Order Item Function Tests
+ * @package WooCommerce\Tests\Order_Items
+ * @since 3.0.0
+ */
+class WC_Tests_Order_Item_Functions extends WC_Unit_Test_Case {
+
+	/**
+	 * test_wc_order_item_meta_functions
+	 *
+	 * wc_add_order_item_meta, wc_update_order_item_meta, and
+	 * wc_delete_order_item_meta all make direct updates through
+	 * a datastore. These tests make sure cache is properly busted and
+	 * accessing those values via CRUD returns the correct value.
+	 *
+	 * @since 3.0.0
+	 */
+	function test_wc_order_item_meta_functions() {
+		$meta_value  = 'cat';
+		$meta_value2 = 'dog';
+
+		$order  = new WC_Order();
+		$item_1 = new WC_Order_Item_Product();
+		$item_1->set_props( array(
+			'product'  => WC_Helper_Product::create_simple_product(),
+			'quantity' => 4,
+		) );
+		$order->add_item( $item_1 );
+		$order->save();
+
+		$item    = current( $order->get_items() );
+		$item_id = $item->get_id();
+
+		// Test that the initial key doesn't exist.
+		$item = new WC_Order_Item_Product( $item_id );
+		$this->assertEmpty( $item->get_meta( '_test_key' ) );
+		$this->assertEmpty( wc_get_order_item_meta( $item_id, '_test_key' ) );
+
+		// Test making sure cache is properly busted when adding meta.
+		wc_add_order_item_meta( $item_id, '_test_key', $meta_value );
+		$item      = new WC_Order_Item_Product( $item_id );
+		$item_meta = $item->get_meta( '_test_key' );
+		$this->assertEquals( $meta_value, $item_meta );
+		$this->assertEquals( $meta_value, wc_get_order_item_meta( $item_id, '_test_key' ) );
+
+		// Test making sure cache is properly busted when updating meta.
+		wc_update_order_item_meta( $item_id, '_test_key', $meta_value2 );
+		$item      = new WC_Order_Item_Product( $item_id );
+		$item_meta = $item->get_meta( '_test_key' );
+		$this->assertEquals( $meta_value2, $item_meta );
+		$this->assertEquals( $meta_value2, wc_get_order_item_meta( $item_id, '_test_key' ) );
+
+		// Test making sure cache is properly busted when deleting meta.
+		wc_delete_order_item_meta( $item_id, '_test_key' );
+		$item      = new WC_Order_Item_Product( $item_id );
+		$item_meta = $item->get_meta( '_test_key' );
+		$this->assertEmpty( $item->get_meta( '_test_key' ) );
+		$this->assertEmpty( wc_get_order_item_meta( $item_id, '_test_key' ) );
+	}
+
+}
diff --git a/tests/unit-tests/order-items/order-item-tax.php b/tests/unit-tests/order-items/order-item-tax.php
new file mode 100644
index 00000000000..273bd9d1499
--- /dev/null
+++ b/tests/unit-tests/order-items/order-item-tax.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * Order Item Tax Tests.
+ * @package WooCommerce\Tests\Order_Items
+ * @since 3.0.0
+ */
+class WC_Tests_Order_Item_Tax extends WC_Unit_Test_Case {
+
+	/**
+	 * Test set_tax_total/get_tax_total.
+	 *
+	 * @since 3.0.0
+	 */
+	function test_set_get_tax_totals() {
+
+		$item = new WC_Order_Item_Tax;
+		$this->assertEquals( 0, $item->get_tax_total() );
+
+		$item->set_tax_total( "1.50" );
+		$this->assertEquals( "1.50", $item->get_tax_total() );
+
+		$item->set_tax_total( "" );
+		$this->assertEquals( 0, $item->get_tax_total() );
+
+		$item->set_tax_total( 10.99 );
+		$this->assertEquals( "10.99", $item->get_tax_total() );
+	}
+
+	/**
+	 * Test set_tax_total/get_tax_total.
+	 *
+	 * @since 3.0.0
+	 */
+	function test_set_get_shipping_tax_totals() {
+
+		$item = new WC_Order_Item_Tax;
+		$this->assertEquals( 0, $item->get_shipping_tax_total() );
+
+		$item->set_shipping_tax_total( "1.50" );
+		$this->assertEquals( "1.50", $item->get_shipping_tax_total() );
+
+		$item->set_shipping_tax_total( "" );
+		$this->assertEquals( 0, $item->get_shipping_tax_total() );
+
+		$item->set_shipping_tax_total( 10.99 );
+		$this->assertEquals( "10.99", $item->get_shipping_tax_total() );
+	}
+}
diff --git a/tests/unit-tests/order/crud.php b/tests/unit-tests/order/crud.php
new file mode 100644
index 00000000000..97db6b5e4f1
--- /dev/null
+++ b/tests/unit-tests/order/crud.php
@@ -0,0 +1,1499 @@
+<?php
+
+/**
+ * Meta
+ * @package WooCommerce\Tests\CRUD
+ */
+class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
+
+	/**
+	 * Test: get_type
+	 */
+	function test_get_type() {
+		$object = new WC_Order();
+		$this->assertEquals( 'shop_order', $object->get_type() );
+	}
+
+	/**
+	 * Test: get_data
+	 */
+	function test_get_data() {
+		$object = new WC_Order();
+		$this->assertInternalType( 'array', $object->get_data() );
+	}
+
+	/**
+	 * Test: get_id
+	 */
+	function test_get_id() {
+		$object = new WC_Order();
+		$id = $object->save();
+		$this->assertEquals( $id, $object->get_id() );
+	}
+
+	/**
+	 * Test: get_parent_id
+	 */
+	function test_get_parent_id() {
+		$object1   = new WC_Order();
+		$parent_id = $object1->save();
+		$object = new WC_Order();
+		$object->set_parent_id( $parent_id );
+		$this->assertEquals( $parent_id, $object->get_parent_id() );
+	}
+
+	/**
+	 * Test: get_order_number
+	 */
+	function test_get_order_number() {
+		$object = new WC_Order();
+		$id     = $object->save();
+		$this->assertEquals( $id, $object->get_order_number() );
+	}
+
+	/**
+	 * Test: get_order_key
+	 */
+	function test_get_order_key() {
+		$object = new WC_Order();
+		$set_to = 'some_key';
+		$object->set_order_key( $set_to );
+		$this->assertEquals( $set_to, $object->get_order_key() );
+	}
+
+	/**
+	 * Test: get_currency
+	 */
+	function test_get_currency() {
+		$object = new WC_Order();
+		$set_to = 'USD';
+		$object->set_currency( $set_to );
+		$this->assertEquals( $set_to, $object->get_currency() );
+	}
+
+	/**
+	 * Test: get_version
+	 */
+	function test_get_version() {
+		$object = new WC_Order();
+		$set_to = '3.0.0';
+		$object->set_version( $set_to );
+		$this->assertEquals( $set_to, $object->get_version() );
+	}
+
+	/**
+	 * Test: get_prices_include_tax
+	 */
+	function test_get_prices_include_tax() {
+		$object = new WC_Order();
+		$set_to = 'USD';
+		$object->set_prices_include_tax( 1 );
+		$this->assertTrue( $object->get_prices_include_tax() );
+	}
+
+	/**
+	 * Test: get_date_created
+	 */
+	function test_get_date_created() {
+		$object = new WC_Order();
+		$object->set_date_created( '2016-12-12' );
+		$this->assertEquals( '1481500800', $object->get_date_created()->getOffsetTimestamp() );
+
+		$object->set_date_created( '1481500800' );
+		$this->assertEquals( 1481500800, $object->get_date_created()->getTimestamp() );
+	}
+
+	/**
+	 * Test: get_date_modified
+	 */
+	function test_get_date_modified() {
+		$object = new WC_Order();
+		$object->set_date_modified( '2016-12-12' );
+		$this->assertEquals( '1481500800', $object->get_date_modified()->getOffsetTimestamp() );
+
+		$object->set_date_modified( '1481500800' );
+		$this->assertEquals( 1481500800, $object->get_date_modified()->getTimestamp() );
+	}
+
+	/**
+	 * Test: get_customer_id
+	 */
+	function test_get_customer_id() {
+		$object = new WC_Order();
+		$set_to = 10;
+		$object->set_customer_id( $set_to );
+		$this->assertEquals( $set_to, $object->get_customer_id() );
+	}
+
+	/**
+	 * Test: get_user
+	 */
+	function test_get_user() {
+		$object = new WC_Order();
+		$this->assertFalse( $object->get_user() );
+		$set_to = '1';
+		$object->set_customer_id( $set_to );
+		$this->assertInstanceOf( 'WP_User', $object->get_user() );
+	}
+
+	/**
+	 * Test: get_discount_total
+	 */
+	function test_get_discount_total() {
+		$object = new WC_Order();
+		$object->set_discount_total( 50 );
+		$this->assertEquals( 50, $object->get_discount_total() );
+	}
+
+	/**
+	 * Test: get_discount_tax
+	 */
+	function test_get_discount_tax() {
+		$object = new WC_Order();
+		$object->set_discount_tax( 5 );
+		$this->assertEquals( 5, $object->get_discount_tax() );
+	}
+
+	/**
+	 * Test: get_shipping_total
+	 */
+	function test_get_shipping_total() {
+		$object = new WC_Order();
+		$object->set_shipping_total( 5 );
+		$this->assertEquals( 5, $object->get_shipping_total() );
+	}
+
+	/**
+	 * Test: get_shipping_tax
+	 */
+	function test_get_shipping_tax() {
+		$object = new WC_Order();
+		$object->set_shipping_tax( 5 );
+		$this->assertEquals( 5, $object->get_shipping_tax() );
+	}
+
+	/**
+	 * Test: get_cart_tax
+	 */
+	function test_get_cart_tax() {
+		$object = new WC_Order();
+		$object->set_cart_tax( 5 );
+		$this->assertEquals( 5, $object->get_cart_tax() );
+	}
+
+	/**
+	 * Test: get_total
+	 */
+	function test_get_total() {
+		$object = new WC_Order();
+		$object->set_total( 5 );
+		$this->assertEquals( 5, $object->get_total() );
+	}
+
+	/**
+	 * Test: get_total_tax
+	 */
+	function test_get_total_tax() {
+		$object = new WC_Order();
+		$object->set_cart_tax( 5 );
+		$object->set_shipping_tax( 5 );
+		$this->assertEquals( 10, $object->get_total_tax() );
+	}
+
+	/**
+	 * Test: get_total_discount
+	 */
+	function test_get_total_discount() {
+		$object = new WC_Order();
+		$object->set_discount_total( 50 );
+		$object->set_discount_tax( 5 );
+		$this->assertEquals( 50, $object->get_total_discount() );
+		$this->assertEquals( 55, $object->get_total_discount( false ) );
+	}
+
+	/**
+	 * Test: get_subtotal
+	 */
+	function test_get_subtotal() {
+		$object = WC_Helper_Order::create_order();
+		$this->assertEquals( 40, $object->get_subtotal() );
+	}
+
+	/**
+	 * Test: get_tax_totals
+	 */
+	function test_get_tax_totals() {
+		$object = WC_Helper_Order::create_order();
+		$this->assertEquals( array(), $object->get_tax_totals() );
+	}
+
+	/**
+	 * Test: remove_order_items
+	 */
+	function test_remove_order_items() {
+		$product = WC_Helper_Product::create_simple_product();
+		$object  = new WC_Order();
+		$item_1  = new WC_Order_Item_Product();
+		$item_1->set_props( array(
+			'product'  => $product,
+			'quantity' => 4,
+		) );
+		$item_2  = new WC_Order_Item_Product();
+		$item_2->set_props( array(
+			'product'  => $product,
+			'quantity' => 2,
+		) );
+		$object->add_item( $item_1 );
+		$object->add_item( $item_2 );
+		$object->save();
+		$this->assertCount( 2, $object->get_items() );
+		$object->remove_order_items();
+		$this->assertCount( 0, $object->get_items() );
+	}
+
+	/**
+	 * Test: get_items
+	 */
+	function test_get_items() {
+		$object  = new WC_Order();
+		$item_1  = new WC_Order_Item_Product();
+		$item_1->set_props( array(
+			'product'  => WC_Helper_Product::create_simple_product(),
+			'quantity' => 4,
+		) );
+		$item_2  = new WC_Order_Item_Product();
+		$item_2->set_props( array(
+			'product'  => WC_Helper_Product::create_simple_product(),
+			'quantity' => 2,
+		) );
+
+		$object->add_item( $item_1 );
+		$object->add_item( $item_2 );
+		$object->save();
+		$this->assertCount( 2, $object->get_items() );
+	}
+
+	/**
+	 * Test: get_fees
+	 */
+	function test_get_fees() {
+		$object  = new WC_Order();
+		$item    = new WC_Order_Item_Fee();
+		$item->set_props( array(
+			'name'       => 'Some Fee',
+			'tax_status' => 'taxable',
+			'total'      => '100',
+			'tax_class'  => '',
+		) );
+		$object->add_item( $item );
+		$this->assertCount( 1, $object->get_fees() );
+	}
+
+	/**
+	 * Test: get_taxes
+	 */
+	function test_get_taxes() {
+		global $wpdb;
+
+		update_option( 'woocommerce_calc_taxes', 'yes' );
+		$tax_rate = array(
+			'tax_rate_country'  => '',
+			'tax_rate_state'    => '',
+			'tax_rate'          => '10.0000',
+			'tax_rate_name'     => 'TAX',
+			'tax_rate_priority' => '1',
+			'tax_rate_compound' => '0',
+			'tax_rate_shipping' => '1',
+			'tax_rate_order'    => '1',
+			'tax_rate_class'    => '',
+		);
+		WC_Tax::_insert_tax_rate( $tax_rate );
+
+		$object  = new WC_Order();
+		$item_1  = new WC_Order_Item_Product();
+		$item_1->set_props( array(
+			'product'  => WC_Helper_Product::create_simple_product(),
+			'quantity' => 4,
+		) );
+		$object->add_item( $item_1 );
+		$object->calculate_totals();
+		$this->assertCount( 1, $object->get_taxes() );
+
+		$item = new WC_Order_Item_Tax();
+		$item->set_rate( 100 );
+		$item->set_tax_total( 100 );
+		$item->set_shipping_tax_total( 100 );
+		$object->add_item( $item );
+		$object->save();
+
+		$this->assertCount( 2, $object->get_taxes() );
+
+		// Cleanup
+		$wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rates" );
+		$wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rate_locations" );
+		update_option( 'woocommerce_calc_taxes', 'no' );
+	}
+
+	/**
+	 * Test mapping from old tax array keys to CRUD functions.
+	 */
+	function test_tax_legacy_arrayaccess() {
+		$tax = new WC_Order_item_Tax();
+		$tax->set_rate_id( 5 );
+		$tax->set_compound( true );
+		$tax->set_tax_total( 2.00 );
+		$tax->set_shipping_tax_total( 1.50 );
+
+		$this->assertEquals( $tax->get_rate_id(), $tax['rate_id'] );
+		$this->assertEquals( $tax->get_compound(), $tax['compound'] );
+		$this->assertEquals( $tax->get_tax_total(), $tax['tax_total'] );
+		$this->assertEquals( $tax->get_tax_total(), $tax['tax_amount'] );
+		$this->assertEquals( $tax->get_shipping_tax_total(), $tax['shipping_tax_total'] );
+		$this->assertEquals( $tax->get_shipping_tax_total(), $tax['shipping_tax_amount'] );
+	}
+
+	/**
+	 * Test: get_shipping_methods
+	 */
+	function test_get_shipping_methods() {
+		$object = new WC_Order();
+		$rate   = new WC_Shipping_Rate( 'flat_rate_shipping', 'Flat rate shipping', '10', array(), 'flat_rate' );
+		$item   = new WC_Order_Item_Shipping();
+		$item->set_props( array(
+			'method_title' => $rate->label,
+			'method_id'    => $rate->id,
+			'total'        => wc_format_decimal( $rate->cost ),
+			'taxes'        => $rate->taxes,
+		) );
+		foreach ( $rate->get_meta_data() as $key => $value ) {
+			$item->add_meta_data( $key, $value, true );
+		}
+		$object->add_item( $item );
+		$object->save();
+		$this->assertCount( 1, $object->get_shipping_methods() );
+	}
+
+	/**
+	 * Test: get_shipping_method
+	 */
+	function test_get_shipping_method() {
+		$object = new WC_Order();
+		$rate   = new WC_Shipping_Rate( 'flat_rate_shipping', 'Flat rate shipping', '10', array(), 'flat_rate' );
+		$item   = new WC_Order_Item_Shipping();
+		$item->set_props( array(
+			'method_title' => $rate->label,
+			'method_id'    => $rate->id,
+			'total'        => wc_format_decimal( $rate->cost ),
+			'taxes'        => $rate->taxes,
+		) );
+		foreach ( $rate->get_meta_data() as $key => $value ) {
+			$item->add_meta_data( $key, $value, true );
+		}
+		$object->add_item( $item );
+		$object->save();
+		$this->assertEquals( 'Flat rate shipping', $object->get_shipping_method() );
+
+		$rate   = new WC_Shipping_Rate( 'flat_rate_shipping', 'Flat rate shipping 2', '10', array(), 'flat_rate' );
+		$item   = new WC_Order_Item_Shipping();
+		$item->set_props( array(
+			'method_title' => $rate->label,
+			'method_id'    => $rate->id,
+			'total'        => wc_format_decimal( $rate->cost ),
+			'taxes'        => $rate->taxes,
+		) );
+		foreach ( $rate->get_meta_data() as $key => $value ) {
+			$item->add_meta_data( $key, $value, true );
+		}
+		$object->add_item( $item );
+		$object->save();
+		$this->assertEquals( 'Flat rate shipping, Flat rate shipping 2', $object->get_shipping_method() );
+	}
+
+	/**
+	 * Test: get_used_coupons
+	 */
+	function test_get_used_coupons() {
+		$object = new WC_Order();
+		$item   = new WC_Order_Item_Coupon();
+		$item->set_props( array(
+			'code'         => '12345',
+			'discount'     => 10,
+			'discount_tax' => 5,
+		) );
+		$object->add_item( $item );
+		$object->save();
+		$this->assertCount( 1, $object->get_used_coupons() );
+	}
+
+	/**
+	 * Test: get_item_count
+	 */
+	function test_get_item_count() {
+		$object  = new WC_Order();
+		$item_1  = new WC_Order_Item_Product();
+		$item_1->set_props( array(
+			'product'  => WC_Helper_Product::create_simple_product(),
+			'quantity' => 4,
+		) );
+		$item_2  = new WC_Order_Item_Product();
+		$item_2->set_props( array(
+			'product'  => WC_Helper_Product::create_simple_product(),
+			'quantity' => 2,
+		) );
+		$object->add_item( $item_1 );
+		$object->add_item( $item_2 );
+		$object->save();
+		$this->assertEquals( 6, $object->get_item_count() );
+	}
+
+	/**
+	 * Test: get_item
+	 */
+	function test_get_item() {
+		$object = new WC_Order();
+		$item   = new WC_Order_Item_Product();
+		$item->set_props( array(
+			'product'  => WC_Helper_Product::create_simple_product(),
+			'quantity' => 4,
+		) );
+		$item->save();
+		$object->add_item( $item->get_id() );
+		$object->save();
+		$this->assertTrue( $object->get_item( $item->get_id() ) instanceOf WC_Order_Item_Product );
+
+		$object = new WC_Order();
+		$item   = new WC_Order_Item_Coupon();
+		$item->set_props( array(
+			'code'         => '12345',
+			'discount'     => 10,
+			'discount_tax' => 5,
+		) );
+		$item_id = $item->save();
+		$object->add_item( $item );
+		$object->save();
+		$this->assertTrue( $object->get_item( $item_id ) instanceOf WC_Order_Item_Coupon );
+	}
+
+	/**
+	 * Test: add_payment_token
+	 */
+	function test_add_payment_token() {
+		$object  = new WC_Order();
+		$object->save();
+		$this->assertFalse( $object->add_payment_token( 'fish' ) );
+		$token = new WC_Payment_Token_Stub();
+		$token->set_extra( __FUNCTION__ );
+		$token->set_token( time() );
+		$token->save();
+		$this->assertTrue( 0 < $object->add_payment_token( $token ) );
+	}
+
+	/**
+	 * Test: get_payment_tokens
+	 */
+	function test_get_payment_tokens() {
+		$object  = new WC_Order();
+		$object->save();
+		$token = new WC_Payment_Token_Stub();
+		$token->set_extra( __FUNCTION__ );
+		$token->set_token( time() );
+		$token->save();
+		$object->add_payment_token( $token );
+		$this->assertCount( 1, $object->get_payment_tokens() );
+	}
+
+	/**
+	 * Test: calculate_shipping
+	 */
+	function test_calculate_shipping() {
+		$object = new WC_Order();
+		$rate   = new WC_Shipping_Rate( 'flat_rate_shipping', 'Flat rate shipping', '10', array(), 'flat_rate' );
+		$item_1 = new WC_Order_Item_Shipping();
+		$item_1->set_props( array(
+			'method_title' => $rate->label,
+			'method_id'    => $rate->id,
+			'total'        => wc_format_decimal( $rate->cost ),
+			'taxes'        => $rate->taxes,
+		) );
+		foreach ( $rate->get_meta_data() as $key => $value ) {
+			$item_1->add_meta_data( $key, $value, true );
+		}
+		$item_2 = new WC_Order_Item_Shipping();
+		$item_2->set_props( array(
+			'method_title' => $rate->label,
+			'method_id'    => $rate->id,
+			'total'        => wc_format_decimal( $rate->cost ),
+			'taxes'        => $rate->taxes,
+		) );
+		foreach ( $rate->get_meta_data() as $key => $value ) {
+			$item->add_meta_data( $key, $value, true );
+		}
+		$object->add_item( $item_1 );
+		$object->add_item( $item_2 );
+		$object->save();
+		$object->calculate_shipping();
+		$this->assertEquals( 20, $object->get_shipping_total() );
+	}
+
+	/**
+	 * Test: calculate_taxes
+	 */
+	function test_calculate_taxes() {
+		global $wpdb;
+		update_option( 'woocommerce_calc_taxes', 'yes' );
+		$tax_rate = array(
+			'tax_rate_country'  => '',
+			'tax_rate_state'    => '',
+			'tax_rate'          => '10.0000',
+			'tax_rate_name'     => 'TAX',
+			'tax_rate_priority' => '1',
+			'tax_rate_compound' => '0',
+			'tax_rate_shipping' => '1',
+			'tax_rate_order'    => '1',
+			'tax_rate_class'    => '',
+		);
+		WC_Tax::_insert_tax_rate( $tax_rate );
+
+		$object = new WC_Order();
+		$object->add_product( WC_Helper_Product::create_simple_product(), 4 );
+
+		$rate   = new WC_Shipping_Rate( 'flat_rate_shipping', 'Flat rate shipping', '10', array(), 'flat_rate' );
+		$item   = new WC_Order_Item_Shipping();
+		$item->set_props( array(
+			'method_title' => $rate->label,
+			'method_id'    => $rate->id,
+			'total'        => wc_format_decimal( $rate->cost ),
+			'taxes'        => $rate->taxes,
+		)  );
+		foreach ( $rate->get_meta_data() as $key => $value ) {
+			$item->add_meta_data( $key, $value, true );
+		}
+		$object->add_item( $item );
+
+		$object->calculate_taxes();
+		$this->assertEquals( 5, $object->get_total_tax() );
+
+		// Cleanup
+		$wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rates" );
+		$wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rate_locations" );
+		update_option( 'woocommerce_calc_taxes', 'no' );
+	}
+
+	/**
+	 * Test: calculate_totals
+	 */
+	function test_calculate_totals() {
+		global $wpdb;
+		update_option( 'woocommerce_calc_taxes', 'yes' );
+		$tax_rate = array(
+			'tax_rate_country'  => '',
+			'tax_rate_state'    => '',
+			'tax_rate'          => '10.0000',
+			'tax_rate_name'     => 'TAX',
+			'tax_rate_priority' => '1',
+			'tax_rate_compound' => '0',
+			'tax_rate_shipping' => '1',
+			'tax_rate_order'    => '1',
+			'tax_rate_class'    => '',
+		);
+		WC_Tax::_insert_tax_rate( $tax_rate );
+
+		$object  = new WC_Order();
+		$object->add_product( WC_Helper_Product::create_simple_product(), 4 );
+
+		$rate   = new WC_Shipping_Rate( 'flat_rate_shipping', 'Flat rate shipping', '10', array(), 'flat_rate' );
+		$item   = new WC_Order_Item_Shipping();
+		$item->set_props( array(
+			'method_title' => $rate->label,
+			'method_id'    => $rate->id,
+			'total'        => wc_format_decimal( $rate->cost ),
+			'taxes'        => $rate->taxes,
+		) );
+		foreach ( $rate->get_meta_data() as $key => $value ) {
+			$item->add_meta_data( $key, $value, true );
+		}
+		$object->add_item( $item );
+
+		$object->calculate_totals();
+		$this->assertEquals( 55, $object->get_total() );
+
+		// Cleanup
+		$wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rates" );
+		$wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rate_locations" );
+		update_option( 'woocommerce_calc_taxes', 'no' );
+	}
+
+	/**
+	 * Test: has_status
+	 */
+	function test_has_status() {
+		$object = new WC_Order();
+		$this->assertFalse( $object->has_status( 'completed' ) );
+		$this->assertFalse( $object->has_status( array( 'processing', 'completed' ) ) );
+		$this->assertTrue( $object->has_status( 'pending' ) );
+		$this->assertTrue( $object->has_status( array( 'processing', 'pending' ) ) );
+	}
+
+	/**
+	 * Test: has_shipping_method
+	 */
+	function test_has_shipping_method() {
+		$object = new WC_Order();
+		$object->save();
+
+		$this->assertFalse( $object->has_shipping_method( 'flat_rate_shipping' ) );
+
+		$rate   = new WC_Shipping_Rate( 'flat_rate_shipping:1', 'Flat rate shipping', '10', array(), 'flat_rate' );
+		$item   = new WC_Order_Item_Shipping();
+		$item->set_props( array(
+			'method_title' => $rate->label,
+			'method_id'    => $rate->id,
+			'total'        => wc_format_decimal( $rate->cost ),
+			'taxes'        => $rate->taxes,
+		) );
+		foreach ( $rate->get_meta_data() as $key => $value ) {
+			$item->add_meta_data( $key, $value, true );
+		}
+		$object->add_item( $item );
+		$object->save();
+
+		$this->assertTrue( $object->has_shipping_method( 'flat_rate_shipping' ) );
+	}
+
+	/**
+	 * Test: key_is_valid
+	 */
+	function test_key_is_valid() {
+		$object = new WC_Order();
+		$object->save();
+		$this->assertFalse( $object->key_is_valid( '1234' ) );
+		$object->set_order_key( '1234' );
+		$this->assertTrue( $object->key_is_valid( '1234' ) );
+	}
+
+	/**
+	 * Test: has_free_item
+	 */
+	function test_has_free_item() {
+		$object = new WC_Order();
+		$object->add_product( WC_Helper_Product::create_simple_product(), 4 );
+		$this->assertFalse( $object->has_free_item() );
+
+		$free_product = WC_Helper_Product::create_simple_product();
+		$free_product->set_price( 0 );
+		$object->add_product( $free_product, 4 );
+		$this->assertTrue( $object->has_free_item() );
+	}
+
+	/**
+	 * Test: CRUD
+	 */
+	function test_CRUD() {
+		$object = new WC_Order();
+
+		// Save + create
+		$save_id = $object->save();
+		$post    = get_post( $save_id );
+		$this->assertEquals( 'shop_order', $post->post_type );
+		$this->assertEquals( 'shop_order', $post->post_type );
+
+		// Update
+		$update_id = $object->save();
+		$this->assertEquals( $update_id, $save_id );
+
+		// Delete
+		$object->delete( true );
+		$post = get_post( $save_id );
+		$this->assertNull( $post );
+	}
+
+	/**
+	 * Test: payment_complete
+	 */
+	function test_payment_complete() {
+		$object = new WC_Order();
+		$this->assertFalse( $object->payment_complete() );
+		$object->save();
+		$this->assertTrue( $object->payment_complete( '12345' ) );
+		$this->assertEquals( 'completed', $object->get_status() );
+		$this->assertEquals( '12345', $object->get_transaction_id() );
+	}
+
+	/**
+	 * Test: get_formatted_order_total
+	 */
+	function test_get_formatted_order_total() {
+		$object = new WC_Order();
+		$object->set_total( 100 );
+		$object->set_currency( 'USD' );
+		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><span class="woocommerce-Price-currencySymbol">&#36;</span>100.00</span>', $object->get_formatted_order_total() );
+	}
+
+	/**
+	 * Test: set_status
+	 */
+	function test_set_status() {
+		$object = new WC_Order();
+		$object->set_status( 'on-hold' );
+		$this->assertEquals( 'on-hold', $object->get_status() );
+	}
+
+	/**
+	 * Test: update_status
+	 */
+	function test_update_status() {
+		$object = new WC_Order();
+		$this->assertFalse( $object->update_status( 'on-hold' ) );
+		$object->save();
+		$this->assertTrue( $object->update_status( 'on-hold' ) );
+		$this->assertEquals( 'on-hold', $object->get_status() );
+	}
+
+	/**
+	 * Test: get_billing_first_name
+	 */
+	function test_get_billing_first_name() {
+		$object = new WC_Order();
+		$set_to = 'Fred';
+		$object->set_billing_first_name( $set_to );
+		$this->assertEquals( $set_to, $object->get_billing_first_name() );
+	}
+
+	/**
+	 * Test: get_billing_last_name
+	 */
+	function test_get_billing_last_name() {
+		$object = new WC_Order();
+		$set_to = 'Flintstone';
+		$object->set_billing_last_name( $set_to );
+		$this->assertEquals( $set_to, $object->get_billing_last_name() );
+	}
+
+	/**
+	 * Test: get_billing_company
+	 */
+	function test_get_billing_company() {
+		$object = new WC_Order();
+		$set_to = 'Bedrock Ltd.';
+		$object->set_billing_company( $set_to );
+		$this->assertEquals( $set_to, $object->get_billing_company() );
+	}
+
+	/**
+	 * Test: get_billing_address_1
+	 */
+	function test_get_billing_address_1() {
+		$object = new WC_Order();
+		$set_to = '34 Stonepants avenue';
+		$object->set_billing_address_1( $set_to );
+		$this->assertEquals( $set_to, $object->get_billing_address_1() );
+	}
+
+	/**
+	 * Test: get_billing_address_2
+	 */
+	function test_get_billing_address_2() {
+		$object = new WC_Order();
+		$set_to = 'Rockville';
+		$object->set_billing_address_2( $set_to );
+		$this->assertEquals( $set_to, $object->get_billing_address_2() );
+	}
+
+	/**
+	 * Test: get_billing_city
+	 */
+	function test_get_billing_city() {
+		$object = new WC_Order();
+		$set_to = 'Bedrock';
+		$object->set_billing_city( $set_to );
+		$this->assertEquals( $set_to, $object->get_billing_city() );
+	}
+
+	/**
+	 * Test: get_billing_state
+	 */
+	function test_get_billing_state() {
+		$object = new WC_Order();
+		$set_to = 'Oregon';
+		$object->set_billing_state( $set_to );
+		$this->assertEquals( $set_to, $object->get_billing_state() );
+	}
+
+	/**
+	 * Test: get_billing_postcode
+	 */
+	function test_get_billing_postcode() {
+		$object = new WC_Order();
+		$set_to = '00001';
+		$object->set_billing_postcode( $set_to );
+		$this->assertEquals( $set_to, $object->get_billing_postcode() );
+	}
+
+	/**
+	 * Test: get_billing_country
+	 */
+	function test_get_billing_country() {
+		$object = new WC_Order();
+		$set_to = 'US';
+		$object->set_billing_country( $set_to );
+		$this->assertEquals( $set_to, $object->get_billing_country() );
+	}
+
+	/**
+	 * Test: get_billing_email
+	 */
+	function test_get_billing_email() {
+		$object = new WC_Order();
+		$set_to = 'test@test.com';
+		$object->set_billing_email( $set_to );
+		$this->assertEquals( $set_to, $object->get_billing_email() );
+
+		$set_to = 'not an email';
+		$this->setExpectedException( 'WC_Data_Exception' );
+		$object->set_billing_email( $set_to );
+		$this->assertEquals( 'test@test.com', $object->get_billing_email() );
+	}
+
+	/**
+	 * Test: get_billing_phone
+	 */
+	function test_get_billing_phone() {
+		$object = new WC_Order();
+		$set_to = '123456678';
+		$object->set_billing_phone( $set_to );
+		$this->assertEquals( $set_to, $object->get_billing_phone() );
+	}
+
+	/**
+	 * Test: Setting/getting billing settings after an order is saved
+	 */
+	function test_set_billing_after_save() {
+		$object = new WC_Order();
+		$phone = '123456678';
+		$object->set_billing_phone( $phone );
+		$object->save();
+		$state = 'Oregon';
+		$object->set_billing_state( $state );
+
+		$this->assertEquals( $phone, $object->get_billing_phone() );
+		$this->assertEquals( $state, $object->get_billing_state() );
+	}
+
+	/**
+	 * Test: get_shipping_first_name
+	 */
+	function test_get_shipping_first_name() {
+		$object = new WC_Order();
+		$set_to = 'Fred';
+		$object->set_shipping_first_name( $set_to );
+		$this->assertEquals( $set_to, $object->get_shipping_first_name() );
+	}
+
+	/**
+	 * Test: get_shipping_last_name
+	 */
+	function test_get_shipping_last_name() {
+		$object = new WC_Order();
+		$set_to = 'Flintstone';
+		$object->set_shipping_last_name( $set_to );
+		$this->assertEquals( $set_to, $object->get_shipping_last_name() );
+	}
+
+	/**
+	 * Test: get_shipping_company
+	 */
+	function test_get_shipping_company() {
+		$object = new WC_Order();
+		$set_to = 'Bedrock Ltd.';
+		$object->set_shipping_company( $set_to );
+		$this->assertEquals( $set_to, $object->get_shipping_company() );
+	}
+
+	/**
+	 * Test: get_shipping_address_1
+	 */
+	function test_get_shipping_address_1() {
+		$object = new WC_Order();
+		$set_to = '34 Stonepants avenue';
+		$object->set_shipping_address_1( $set_to );
+		$this->assertEquals( $set_to, $object->get_shipping_address_1() );
+	}
+
+	/**
+	 * Test: get_shipping_address_2
+	 */
+	function test_get_shipping_address_2() {
+		$object = new WC_Order();
+		$set_to = 'Rockville';
+		$object->set_shipping_address_2( $set_to );
+		$this->assertEquals( $set_to, $object->get_shipping_address_2() );
+	}
+
+	/**
+	 * Test: get_shipping_city
+	 */
+	function test_get_shipping_city() {
+		$object = new WC_Order();
+		$set_to = 'Bedrock';
+		$object->set_shipping_city( $set_to );
+		$this->assertEquals( $set_to, $object->get_shipping_city() );
+	}
+
+	/**
+	 * Test: get_shipping_state
+	 */
+	function test_get_shipping_state() {
+		$object = new WC_Order();
+		$set_to = 'Oregon';
+		$object->set_shipping_state( $set_to );
+		$this->assertEquals( $set_to, $object->get_shipping_state() );
+	}
+
+	/**
+	 * Test: get_shipping_postcode
+	 */
+	function test_get_shipping_postcode() {
+		$object = new WC_Order();
+		$set_to = '00001';
+		$object->set_shipping_postcode( $set_to );
+		$this->assertEquals( $set_to, $object->get_shipping_postcode() );
+	}
+
+	/**
+	 * Test: get_shipping_country
+	 */
+	function test_get_shipping_country() {
+		$object = new WC_Order();
+		$set_to = 'US';
+		$object->set_shipping_country( $set_to );
+		$this->assertEquals( $set_to, $object->get_shipping_country() );
+	}
+
+	/**
+	 * Test: Setting/getting shipping settings after an order is saved
+	 */
+	function test_set_shipping_after_save() {
+		$object = new WC_Order();
+		$country = 'US';
+		$object->set_shipping_country( $country );
+		$object->save();
+		$state = 'Oregon';
+		$object->set_shipping_state( $state );
+
+		$this->assertEquals( $country, $object->get_shipping_country() );
+		$this->assertEquals( $state, $object->get_shipping_state() );
+	}
+
+	/**
+	 * Test: get_payment_method
+	 */
+	function test_get_payment_method() {
+		$object = new WC_Order();
+		$set_to = 'paypal';
+		$object->set_payment_method( $set_to );
+		$this->assertEquals( $set_to, $object->get_payment_method() );
+	}
+
+	/**
+	 * Test: get_payment_method_title
+	 */
+	function test_get_payment_method_title() {
+		$object = new WC_Order();
+		$set_to = 'PayPal';
+		$object->set_payment_method_title( $set_to );
+		$this->assertEquals( $set_to, $object->get_payment_method_title() );
+	}
+
+	/**
+	 * Test: get_transaction_id
+	 */
+	function test_get_transaction_id() {
+		$object = new WC_Order();
+		$set_to = '12345';
+		$object->set_transaction_id( $set_to );
+		$this->assertEquals( $set_to, $object->get_transaction_id() );
+	}
+
+	/**
+	 * Test: get_customer_ip_address
+	 */
+	function test_get_customer_ip_address() {
+		$object = new WC_Order();
+		$set_to = '192.168.1.1';
+		$object->set_customer_ip_address( $set_to );
+		$this->assertEquals( $set_to, $object->get_customer_ip_address() );
+	}
+
+	/**
+	 * Test: get_customer_user_agent
+	 */
+	function test_get_customer_user_agent() {
+		$object = new WC_Order();
+		$set_to = 'UAstring';
+		$object->set_customer_user_agent( $set_to );
+		$this->assertEquals( $set_to, $object->get_customer_user_agent() );
+	}
+
+	/**
+	 * Test: get_created_via
+	 */
+	function test_get_created_via() {
+		$object = new WC_Order();
+		$set_to = 'WooCommerce';
+		$object->set_created_via( $set_to );
+		$this->assertEquals( $set_to, $object->get_created_via() );
+	}
+
+	/**
+	 * Test: get_customer_note
+	 */
+	function test_get_customer_note() {
+		$object = new WC_Order();
+		$set_to = 'Leave on porch.';
+		$object->set_customer_note( $set_to );
+		$this->assertEquals( $set_to, $object->get_customer_note() );
+	}
+
+	/**
+	 * Test: get_date_completed
+	 */
+	function test_get_date_completed() {
+		$object = new WC_Order();
+		$object->set_date_completed( '2016-12-12' );
+		$this->assertEquals( '1481500800', $object->get_date_completed()->getOffsetTimestamp() );
+
+		$object->set_date_completed( '1481500800' );
+		$this->assertEquals( 1481500800, $object->get_date_completed()->getTimestamp() );
+	}
+
+	/**
+	 * Test: get_date_paid
+	 */
+	function test_get_date_paid() {
+		$object = new WC_Order();
+		$set_to = 'PayPal';
+		$object->set_date_paid( '2016-12-12' );
+		$this->assertEquals( 1481500800, $object->get_date_paid()->getOffsetTimestamp() );
+
+		$object->set_date_paid( '1481500800' );
+		$this->assertEquals( 1481500800, $object->get_date_paid()->getTimestamp() );
+	}
+
+	/**
+	 * Test: get_cart_hash
+	 */
+	function test_get_cart_hash() {
+		$object = new WC_Order();
+		$set_to = '12345';
+		$object->set_cart_hash( $set_to );
+		$this->assertEquals( $set_to, $object->get_cart_hash() );
+	}
+
+	/**
+	 * Test: get_address
+	 */
+	function test_get_address() {
+		$object = new WC_Order();
+
+		$billing = array(
+			'first_name' => 'Fred',
+			'last_name'  => 'Flintstone',
+			'company'    => 'Bedrock Ltd.',
+			'address_1'  => '34 Stonepants avenue',
+			'address_2'  => 'Rockville',
+			'city'       => 'Bedrock',
+			'state'      => 'Boulder',
+			'postcode'   => '00001',
+			'country'    => 'US',
+			'email'      => '',
+			'phone'      => '',
+		);
+
+		$shipping = array(
+			'first_name' => 'Barney',
+			'last_name'  => 'Rubble',
+			'company'    => 'Bedrock Ltd.',
+			'address_1'  => '34 Stonepants avenue',
+			'address_2'  => 'Rockville',
+			'city'       => 'Bedrock',
+			'state'      => 'Boulder',
+			'postcode'   => '00001',
+			'country'    => 'US',
+		);
+
+		$object->set_billing_first_name( 'Fred' );
+		$object->set_billing_last_name( 'Flintstone' );
+		$object->set_billing_company( 'Bedrock Ltd.' );
+		$object->set_billing_address_1( '34 Stonepants avenue' );
+		$object->set_billing_address_2( 'Rockville' );
+		$object->set_billing_city( 'Bedrock' );
+		$object->set_billing_state( 'Boulder' );
+		$object->set_billing_postcode( '00001' );
+		$object->set_billing_country( 'US' );
+
+		$object->set_shipping_first_name( 'Barney' );
+		$object->set_shipping_last_name( 'Rubble' );
+		$object->set_shipping_company( 'Bedrock Ltd.' );
+		$object->set_shipping_address_1( '34 Stonepants avenue' );
+		$object->set_shipping_address_2( 'Rockville' );
+		$object->set_shipping_city( 'Bedrock' );
+		$object->set_shipping_state( 'Boulder' );
+		$object->set_shipping_postcode( '00001' );
+		$object->set_shipping_country( 'US' );
+
+		$this->assertEquals( $billing, $object->get_address() );
+		$this->assertEquals( $shipping, $object->get_address( 'shipping' ) );
+	}
+
+	/**
+	 * Test: get_shipping_address_map_url
+	 */
+	function test_get_shipping_address_map_url() {
+		$object = new WC_Order();
+		$object->set_shipping_first_name( 'Barney' );
+		$object->set_shipping_last_name( 'Rubble' );
+		$object->set_shipping_company( 'Bedrock Ltd.' );
+		$object->set_shipping_address_1( '34 Stonepants avenue' );
+		$object->set_shipping_address_2( 'Rockville' );
+		$object->set_shipping_city( 'Bedrock' );
+		$object->set_shipping_state( 'Boulder' );
+		$object->set_shipping_postcode( '00001' );
+		$object->set_shipping_country( 'US' );
+		$this->assertEquals( 'https://maps.google.com/maps?&q=34+Stonepants+avenue%2C+Rockville%2C+Bedrock%2C+Boulder%2C+00001%2C+US&z=16', $object->get_shipping_address_map_url() );
+	}
+
+	/**
+	 * Test: get_formatted_billing_full_name
+	 */
+	function test_get_formatted_billing_full_name() {
+		$object = new WC_Order();
+		$object->set_billing_first_name( 'Fred' );
+		$object->set_billing_last_name( 'Flintstone' );
+		$this->assertEquals( 'Fred Flintstone', $object->get_formatted_billing_full_name() );
+	}
+
+	/**
+	 * Test: get_formatted_shipping_full_name
+	 */
+	function test_get_formatted_shipping_full_name() {
+		$object = new WC_Order();
+		$object->set_shipping_first_name( 'Barney' );
+		$object->set_shipping_last_name( 'Rubble' );
+		$this->assertEquals( 'Barney Rubble', $object->get_formatted_shipping_full_name() );
+	}
+
+	/**
+	 * Test: get_formatted_billing_address
+	 */
+	function test_get_formatted_billing_address() {
+		$object = new WC_Order();
+		$object->set_billing_first_name( 'Fred' );
+		$object->set_billing_last_name( 'Flintstone' );
+		$object->set_billing_company( 'Bedrock Ltd.' );
+		$object->set_billing_address_1( '34 Stonepants avenue' );
+		$object->set_billing_address_2( 'Rockville' );
+		$object->set_billing_city( 'Bedrock' );
+		$object->set_billing_state( 'Boulder' );
+		$object->set_billing_postcode( '00001' );
+		$object->set_billing_country( 'US' );
+		$this->assertEquals( 'Fred Flintstone<br/>Bedrock Ltd.<br/>34 Stonepants avenue<br/>Rockville<br/>Bedrock, BOULDER 00001<br/>United States (US)', $object->get_formatted_billing_address() );
+	}
+
+	/**
+	 * Test: get_formatted_shipping_address
+	 */
+	function test_get_formatted_shipping_address() {
+		$object = new WC_Order();
+		$object->set_shipping_first_name( 'Barney' );
+		$object->set_shipping_last_name( 'Rubble' );
+		$object->set_shipping_company( 'Bedrock Ltd.' );
+		$object->set_shipping_address_1( '34 Stonepants avenue' );
+		$object->set_shipping_address_2( 'Rockville' );
+		$object->set_shipping_city( 'Bedrock' );
+		$object->set_shipping_state( 'Boulder' );
+		$object->set_shipping_postcode( '00001' );
+		$object->set_shipping_country( 'US' );
+		$this->assertEquals( 'Barney Rubble<br/>Bedrock Ltd.<br/>34 Stonepants avenue<br/>Rockville<br/>Bedrock, BOULDER 00001<br/>United States (US)', $object->get_formatted_shipping_address() );
+	}
+
+	/**
+	 * Test: has_cart_hash
+	 */
+	function test_has_cart_hash() {
+		$object = new WC_Order();
+		$this->assertFalse( $object->has_cart_hash( '12345' ) );
+		$set_to = '12345';
+		$object->set_cart_hash( $set_to );
+		$this->assertTrue( $object->has_cart_hash( '12345' ) );
+	}
+
+	/**
+	 * Test: is_editable
+	 */
+	function test_is_editable() {
+		$object = new WC_Order();
+		$object->set_status( 'pending' );
+		$this->assertTrue( $object->is_editable() );
+		$object->set_status( 'processing' );
+		$this->assertFalse( $object->is_editable() );
+	}
+
+	/**
+	 * Test: is_paid
+	 */
+	function test_is_paid() {
+		$object = new WC_Order();
+		$object->set_status( 'pending' );
+		$this->assertFalse( $object->is_paid() );
+		$object->set_status( 'processing' );
+		$this->assertTrue( $object->is_paid() );
+	}
+
+	/**
+	 * Test: is_download_permitted
+	 */
+	function test_is_download_permitted() {
+		$object = new WC_Order();
+		$object->set_status( 'pending' );
+		$this->assertFalse( $object->is_download_permitted() );
+		$object->set_status( 'completed' );
+		$this->assertTrue( $object->is_download_permitted() );
+	}
+
+	/**
+	 * Test: needs_shipping_address
+	 */
+	function test_needs_shipping_address() {
+		$object = new WC_Order();
+		$this->assertFalse( $object->needs_shipping_address() );
+
+		$object = WC_Helper_Order::create_order();
+		$this->assertTrue( $object->needs_shipping_address() );
+	}
+
+	/**
+	 * Test: has_downloadable_item
+	 */
+	function test_has_downloadable_item() {
+		$object = new WC_Order();
+		$this->assertFalse( $object->has_downloadable_item() );
+
+		$object = WC_Helper_Order::create_order();
+		$this->assertFalse( $object->has_downloadable_item() );
+	}
+
+	/**
+	 * Test: needs_payment
+	 */
+	function test_needs_payment() {
+		$object = new WC_Order();
+
+		$object->set_status( 'pending' );
+		$this->assertFalse( $object->needs_payment() );
+
+		$object->set_total( 100 );
+		$this->assertTrue( $object->needs_payment() );
+
+		$object->set_status( 'processing' );
+		$this->assertFalse( $object->needs_payment() );
+	}
+
+	/**
+	 * Test: get_checkout_payment_url
+	 */
+	function test_get_checkout_payment_url() {
+		$object = new WC_Order();
+		$id     = $object->save();
+		$this->assertEquals( 'http://example.org?order-pay=' . $id . '&pay_for_order=true&key=' . $object->get_order_key(), $object->get_checkout_payment_url() );
+	}
+
+	/**
+	 * Test: get_checkout_order_received_url
+	 */
+	function test_get_checkout_order_received_url() {
+		$object = new WC_Order();
+		$object->set_order_key( 'xxx' );
+		$id     = $object->save();
+		$this->assertEquals( 'http://example.org?order-received=' . $id . '&key=' . $object->get_order_key(), $object->get_checkout_order_received_url() );
+	}
+
+	/**
+	 * Test: get_cancel_order_url
+	 */
+	function test_get_cancel_order_url() {
+		$object = new WC_Order();
+		$this->assertInternalType( 'string', $object->get_cancel_order_url() );
+	}
+
+	/**
+	 * Test: get_cancel_order_url_raw
+	 */
+	function test_get_cancel_order_url_raw() {
+		$object = new WC_Order();
+		$this->assertInternalType( 'string', $object->get_cancel_order_url_raw() );
+	}
+
+	/**
+	 * Test: get_cancel_endpoint
+	 */
+	function test_get_cancel_endpoint() {
+		$object = new WC_Order();
+		$this->assertEquals( 'http://example.org/', $object->get_cancel_endpoint() );
+	}
+
+	/**
+	 * Test: get_view_order_url
+	 */
+	function test_get_view_order_url() {
+		$object = new WC_Order();
+		$id     = $object->save();
+		$this->assertEquals( 'http://example.org?view-order=' . $id, $object->get_view_order_url() );
+	}
+
+	/**
+	 * Test: add_order_note
+	 */
+	function test_add_order_note() {
+		$object     = new WC_Order();
+		$id         = $object->save();
+		$comment_id = $object->add_order_note( "Hello, I am a fish" );
+		$this->assertTrue( $comment_id > 0 );
+
+		$comment = get_comment( $comment_id );
+		$this->assertEquals( "Hello, I am a fish", $comment->comment_content );
+	}
+
+	/**
+	 * Test: get_customer_order_notes
+	 */
+	function test_get_customer_order_notes() {
+		$object     = new WC_Order();
+		$id         = $object->save();
+
+		$this->assertCount( 0, $object->get_customer_order_notes() );
+
+		$object->add_order_note( "Hello, I am a fish", true );
+		$object->add_order_note( "Hello, I am a fish", false );
+		$object->add_order_note( "Hello, I am a fish", true );
+
+		$this->assertCount( 2, $object->get_customer_order_notes() );
+	}
+
+	/**
+	 * Test: get_refunds
+	 */
+	function test_get_refunds() {
+		$object     = new WC_Order();
+		$object->set_total( 100 );
+		$id         = $object->save();
+
+		$this->assertCount( 0, $object->get_refunds() );
+
+		wc_create_refund( array(
+			'order_id'   => $id,
+			'amount'     => '100',
+			'line_items' => array(),
+		) );
+
+		$this->assertCount( 1, $object->get_refunds() );
+	}
+
+	/**
+	 * Test: get_total_refunded
+	 */
+	function test_get_total_refunded() {
+		$object = new WC_Order();
+		$object->set_total( 400 );
+		$id     = $object->save();
+		wc_create_refund( array(
+			'order_id'   => $id,
+			'amount'     => '100',
+			'line_items' => array(),
+		) );
+		wc_create_refund( array(
+			'order_id'   => $id,
+			'amount'     => '100',
+			'line_items' => array(),
+		) );
+		$this->assertEquals( 200, $object->get_total_refunded() );
+	}
+
+	/**
+	 * Test: get_total_tax_refunded
+	 */
+	function test_get_total_tax_refunded() {
+		$object = new WC_Order();
+		$this->assertEquals( 0, $object->get_total_tax_refunded() );
+	}
+
+	/**
+	 * Test: get_total_shipping_refunded
+	 */
+	function test_get_total_shipping_refunded() {
+		$object = new WC_Order();
+		$this->assertEquals( 0, $object->get_total_shipping_refunded() );
+	}
+
+	/**
+	 * Test: get_total_shipping_refunded
+	 */
+	function test_get_total_qty_refunded() {
+		$object = new WC_Order();
+		$this->assertEquals( 0, $object->get_total_shipping_refunded() );
+	}
+
+	/**
+	 * Test: get_qty_refunded_for_item
+	 */
+	function test_get_qty_refunded_for_item() {
+		$object = new WC_Order();
+		$this->assertEquals( 0, $object->get_qty_refunded_for_item( 2 ) );
+	}
+
+	/**
+	 * Test: test_get_total_refunded_for_item
+	 */
+	function test_get_total_refunded_for_item() {
+		$object = new WC_Order();
+		$this->assertEquals( 0, $object->get_total_refunded_for_item( 2 ) );
+	}
+
+	/**
+	 * Test: get_tax_refunded_for_item
+	 */
+	function test_get_tax_refunded_for_item() {
+		$object = new WC_Order();
+		$this->assertEquals( 0, $object->get_tax_refunded_for_item( 1, 1 ) );
+	}
+
+	/**
+	 * Test: get_total_tax_refunded_by_rate_id
+	 */
+	function test_get_total_tax_refunded_by_rate_id() {
+		$object = new WC_Order();
+		$this->assertEquals( 0, $object->get_total_tax_refunded_by_rate_id( 2 ) );
+	}
+
+	/**
+	 * Test: get_remaining_refund_amount
+	 */
+	function test_get_remaining_refund_amount() {
+		$object = new WC_Order();
+		$object->set_total( 400 );
+		$id     = $object->save();
+		wc_create_refund( array(
+			'order_id'   => $id,
+			'amount'     => '100',
+			'line_items' => array(),
+		) );
+		$this->assertEquals( 300, $object->get_remaining_refund_amount() );
+	}
+
+	/**
+	 * Test: get_total_tax_refunded_by_rate_id
+	 */
+	function test_get_remaining_refund_items() {
+		$object = WC_Helper_Order::create_order();
+		$this->assertEquals( 4, $object->get_remaining_refund_items() );
+	}
+}
diff --git a/tests/unit-tests/order/functions.php b/tests/unit-tests/order/functions.php
index 9d62232d0ff..468cec96dda 100644
--- a/tests/unit-tests/order/functions.php
+++ b/tests/unit-tests/order/functions.php
@@ -1,13 +1,11 @@
 <?php
 
-namespace WooCommerce\Tests\Order;
-
 /**
  * Class Functions.
  * @package WooCommerce\Tests\Order
  * @since 2.3
  */
-class Functions extends \WC_Unit_Test_Case {
+class WC_Tests_Order_Functions extends WC_Unit_Test_Case {
 
 	/**
 	 * Test wc_get_order_statuses().
@@ -17,9 +15,9 @@ class Functions extends \WC_Unit_Test_Case {
 	public function test_wc_get_order_statuses() {
 
 		$order_statuses = apply_filters( 'wc_order_statuses', array(
-			'wc-pending'    => _x( 'Pending Payment', 'Order status', 'woocommerce' ),
+			'wc-pending'    => _x( 'Pending payment', 'Order status', 'woocommerce' ),
 			'wc-processing' => _x( 'Processing', 'Order status', 'woocommerce' ),
-			'wc-on-hold'    => _x( 'On Hold', 'Order status', 'woocommerce' ),
+			'wc-on-hold'    => _x( 'On hold', 'Order status', 'woocommerce' ),
 			'wc-completed'  => _x( 'Completed', 'Order status', 'woocommerce' ),
 			'wc-cancelled'  => _x( 'Cancelled', 'Order status', 'woocommerce' ),
 			'wc-refunded'   => _x( 'Refunded', 'Order status', 'woocommerce' ),
@@ -35,9 +33,8 @@ class Functions extends \WC_Unit_Test_Case {
 	 * @since 2.3.0
 	 */
 	public function test_wc_is_order_status() {
-
-		$this->assertEquals( true,  wc_is_order_status( 'wc-pending' ) );
-		$this->assertEquals( false, wc_is_order_status( 'wc-another-status' ) );
+		$this->assertTrue( wc_is_order_status( 'wc-pending' ) );
+		$this->assertFalse( wc_is_order_status( 'wc-another-status' ) );
 	}
 
 	/**
@@ -47,14 +44,12 @@ class Functions extends \WC_Unit_Test_Case {
 	 */
 	public function test_wc_get_order_status_name() {
 
-		$this->assertEquals( _x( 'Pending Payment', 'Order status', 'woocommerce' ), wc_get_order_status_name( 'wc-pending' ) );
-		$this->assertEquals( _x( 'Pending Payment', 'Order status', 'woocommerce' ), wc_get_order_status_name( 'pending' ) );
+		$this->assertEquals( _x( 'Pending payment', 'Order status', 'woocommerce' ), wc_get_order_status_name( 'wc-pending' ) );
+		$this->assertEquals( _x( 'Pending payment', 'Order status', 'woocommerce' ), wc_get_order_status_name( 'pending' ) );
 	}
 
 	/**
 	 * Test wc_processing_order_count().
-	 *
-	 * @todo needs improvement when we have an orders helper
 	 * @since 2.4
 	 */
 	public function test_wc_processing_order_count() {
@@ -63,8 +58,6 @@ class Functions extends \WC_Unit_Test_Case {
 
 	/**
 	 * Test wc_orders_count().
-	 *
-	 * @todo needs improvement when we have an orders helper
 	 * @since 2.4
 	 */
 	public function test_wc_orders_count() {
@@ -86,10 +79,10 @@ class Functions extends \WC_Unit_Test_Case {
 		$default = get_option( 'woocommerce_ship_to_destination' );
 
 		update_option( 'woocommerce_ship_to_destination', 'shipping' );
-		$this->assertEquals( false, wc_ship_to_billing_address_only() );
+		$this->assertFalse( wc_ship_to_billing_address_only() );
 
 		update_option( 'woocommerce_ship_to_destination', 'billing_only' );
-		$this->assertEquals( true, wc_ship_to_billing_address_only() );
+		$this->assertTrue( wc_ship_to_billing_address_only() );
 
 		update_option( 'woocommerce_ship_to_destination', $default );
 	}
@@ -102,7 +95,7 @@ class Functions extends \WC_Unit_Test_Case {
 	 */
 	public function test_wc_get_order() {
 
-		$order = \WC_Helper_Order::create_order();
+		$order = WC_Helper_Order::create_order();
 
 		// Assert that $order is a WC_Order object
 		$this->assertInstanceOf( 'WC_Order', $order );
@@ -111,7 +104,7 @@ class Functions extends \WC_Unit_Test_Case {
 		$this->assertInstanceOf( 'WC_Order', wc_get_order( $order ) );
 
 		// Assert that wc_get_order() accepts a order post id.
-		$this->assertInstanceOf( 'WC_Order', wc_get_order( $order->id ) );
+		$this->assertInstanceOf( 'WC_Order', wc_get_order( $order->get_id() ) );
 
 		// Assert that a non-shop_order post returns false
 		$post = $this->factory->post->create_and_get( array( 'post_type' => 'post' ) );
@@ -123,4 +116,128 @@ class Functions extends \WC_Unit_Test_Case {
 		// Assert the return when $the_order args is a random (incorrect) id.
 		$this->assertFalse( wc_get_order( 123456 ) );
 	}
+
+	/**
+	 * Test getting an orders payment tokens
+	 *
+	 * @since 2.6
+	 */
+	public function test_wc_order_get_payment_tokens() {
+		$order = WC_Helper_Order::create_order();
+		$this->assertEmpty( $order->get_payment_tokens() );
+
+		$token = WC_Helper_Payment_Token::create_cc_token();
+		update_post_meta( $order->get_id(), '_payment_tokens', array( $token->get_id() ) );
+
+		$this->assertCount( 1, $order->get_payment_tokens() );
+	}
+
+
+	/**
+	 * Test adding a payment token to an order
+	 *
+	 * @since 2.6
+	 */
+	public function test_wc_order_add_payment_token() {
+		$order = WC_Helper_Order::create_order();
+		$this->assertEmpty( $order->get_payment_tokens() );
+
+		$token = WC_Helper_Payment_Token::create_cc_token();
+		$order->add_payment_token( $token );
+
+		$this->assertCount( 1, $order->get_payment_tokens() );
+	}
+
+	/**
+	 * Test the before and after date parameters for wc_get_orders.
+	 *
+	 * @since 3.0
+	 */
+	public function test_wc_get_orders_customer_params() {
+		$order1  = WC_Helper_Order::create_order( 0 );
+		$order2  = WC_Helper_Order::create_order( 0 );
+		$order3  = WC_Helper_Order::create_order( 1 );
+		$order4  = WC_Helper_Order::create_order( 1 );
+		$order_1 = $order1->get_id();
+		$order_2 = $order2->get_id();
+		$order_3 = $order3->get_id();
+		$order_4 = $order4->get_id();
+
+		$orders   = wc_get_orders( array( 'customer' => 0, 'return' => 'ids' ) );
+		$expected = array( $order_1, $order_2 );
+		sort( $expected );
+		sort( $orders );
+		$this->assertEquals( $expected, $orders );
+
+		$orders   = wc_get_orders( array( 'customer' => 1, 'return' => 'ids' ) );
+		$expected = array( $order_3, $order_4 );
+		sort( $expected );
+		sort( $orders );
+		$this->assertEquals( $expected, $orders );
+
+		$orders   = wc_get_orders( array( 'customer' => '', 'return' => 'ids' ) );
+		$expected = array( $order_1, $order_2, $order_3, $order_4 );
+		sort( $expected );
+		sort( $orders );
+		$this->assertEquals( $expected, $orders );
+
+		$order1->delete();
+		$order2->delete();
+		$order3->delete();
+		$order4->delete();
+	}
+
+	/**
+	 * Test the before and after date parameters for wc_get_orders.
+	 *
+	 * @since 3.0
+	 */
+	public function test_wc_get_orders_date_params() {
+		$order1 = WC_Helper_Order::create_order();
+		$order1->set_date_created( '2015-01-01 05:20:30' );
+		$order1->save();
+		$order_1 = $order1->get_id();
+		$order2   = WC_Helper_Order::create_order();
+		$order2->set_date_created( '2017-01-01' );
+		$order2->save();
+		$order_2 = $order2->get_id();
+		$order3   = WC_Helper_Order::create_order();
+		$order3->set_date_created( '2017-01-01' );
+		$order3->save();
+		$order_3 = $order3->get_id();
+
+		$orders   = wc_get_orders( array( 'date_before' => '2017-01-15', 'return' => 'ids' ) );
+		$expected = array( $order_1, $order_2, $order_3 );
+		sort( $expected );
+		sort( $orders );
+		$this->assertEquals( $expected, $orders );
+
+		$orders   = wc_get_orders( array( 'date_before' => '2017-01-01', 'return' => 'ids' ) );
+		$expected = array( $order_1 );
+		sort( $expected );
+		sort( $orders );
+		$this->assertEquals( $expected, $orders );
+
+		$orders   = wc_get_orders( array( 'date_before' => '2016-12-31', 'return' => 'ids' ) );
+		$expected = array( $order_1 );
+		sort( $expected );
+		sort( $orders );
+		$this->assertEquals( $expected, $orders );
+
+		$orders   = wc_get_orders( array( 'date_after' => '2015-01-01 00:00:00', 'return' => 'ids' ) );
+		$expected = array( $order_1, $order_2, $order_3 );
+		sort( $expected );
+		sort( $orders );
+		$this->assertEquals( $expected, $orders );
+
+		$orders   = wc_get_orders( array( 'date_after' => '2016-01-01', 'return' => 'ids' ) );
+		$expected = array( $order_2, $order_3 );
+		sort( $expected );
+		sort( $orders );
+		$this->assertEquals( $expected, $orders );
+
+		$order1->delete();
+		$order2->delete();
+		$order3->delete();
+	}
 }
diff --git a/tests/unit-tests/payment-tokens/cc.php b/tests/unit-tests/payment-tokens/cc.php
new file mode 100644
index 00000000000..b8c43390acc
--- /dev/null
+++ b/tests/unit-tests/payment-tokens/cc.php
@@ -0,0 +1,114 @@
+<?php
+
+/**
+ * Class Payment_Token_CC.
+ * @package WooCommerce\Tests\Payment_Tokens
+ */
+class WC_Tests_Payment_Token_CC extends WC_Unit_Test_Case {
+
+	/**
+	 * Test validation for empty/unset values.
+	 * @since 2.6.0
+	 */
+	function test_wc_payment_token_cc_validate_empty() {
+		$token = new WC_Payment_Token_CC();
+		$token->set_token( time() . ' ' . __FUNCTION__ );
+		$this->assertFalse( $token->validate() );
+		$token->set_last4( '1111' );
+		$token->set_expiry_year( '2016' );
+		$token->set_expiry_month( '08' );
+		$token->set_card_type( 'visa' );
+		$this->assertTrue( $token->validate() );
+	}
+
+	/**
+	 * Test validation for expiry length.
+	 * @since 2.6.0
+	 */
+	function test_wc_payment_token_cc_validate_expiry_length() {
+		$token = new WC_Payment_Token_CC();
+		$token->set_token( time() . ' ' . __FUNCTION__ );
+		$this->assertFalse( $token->validate() );
+
+		$token->set_last4( '1111' );
+		$token->set_expiry_year( '16' );
+		$token->set_expiry_month( '08' );
+		$token->set_card_type( 'visa' );
+
+		$this->assertFalse( $token->validate() );
+
+		$token->set_expiry_year( '2016' );
+
+		$this->assertTrue( $token->validate() );
+
+		$token->set_expiry_month( '888' );
+		$this->assertFalse( $token->validate() );
+	}
+
+	/**
+	 * Tes get/set card type.
+	 * @since 2.6.0
+	 */
+	public function test_wc_payment_token_cc_card_type() {
+		$token = new WC_Payment_Token_CC();
+		$token->set_card_type( 'visa' );
+		$this->assertEquals( 'visa', $token->get_card_type() );
+	}
+
+	/**
+	 * Test get/set expiry year.
+	 * @since 2.6.0
+	 */
+	public function test_wc_payment_token_cc_expiry_year() {
+		$token = new WC_Payment_Token_CC();
+		$token->set_expiry_year( '2016' );
+		$this->assertEquals( '2016', $token->get_expiry_year() );
+	}
+
+	/**
+	 * Test get/set expiry month.
+	 * @since 2.6.0
+	 */
+	public function test_wc_payment_token_cc_expiry_month() {
+		$token = new WC_Payment_Token_CC();
+		$token->set_expiry_month( '08' );
+		$this->assertEquals( '08', $token->get_expiry_month() );
+	}
+
+	/**
+	 * Test get/set last4.
+	 * @since 2.6.0
+	 */
+	public function test_wc_payment_token_cc_last4() {
+		$token = new WC_Payment_Token_CC();
+		$token->set_last4( '1111' );
+		$this->assertEquals( '1111', $token->get_last4() );
+	}
+
+	/*
+	 * Test reading/getting a token from DB correctly sets meta.
+	 * @since 2.6.0
+	 */
+	public function test_wc_payment_token_cc_read_pulls_meta() {
+		$token = WC_Helper_Payment_Token::create_cc_token();
+		$token_id = $token->get_id();
+		$token_read = new WC_Payment_Token_CC( $token_id );
+		$this->assertEquals( '1234', $token_read->get_last4() );
+	}
+
+	/*
+	 * Test saving a new value in a token after it has been created.
+	 * @since 3.0.0
+	 */
+	public function test_wc_payment_token_cc_updates_after_create() {
+		$token    = WC_Helper_Payment_Token::create_cc_token();
+		$token_id = $token->get_id();
+		$this->assertEquals( '1234', $token->get_last4() );
+
+		$token->set_last4( '4321' );
+		$token->set_user_id( 3 );
+		$token->save();
+		$this->assertEquals( '4321', $token->get_last4() );
+		$this->assertEquals( 3, $token->get_user_id() );
+	}
+}
diff --git a/tests/unit-tests/payment-tokens/echeck.php b/tests/unit-tests/payment-tokens/echeck.php
new file mode 100644
index 00000000000..4212765678c
--- /dev/null
+++ b/tests/unit-tests/payment-tokens/echeck.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Class Payment_Token_eCheck.
+ * @package WooCommerce\Tests\Payment_Tokens
+ */
+class WC_Tests_Payment_Token_eCheck extends WC_Unit_Test_Case {
+
+	/**
+	 * Test validation for empty/unset values.
+	 * @since 2.6.0
+	 */
+	function test_wc_payment_token_echeck_validate_empty() {
+		$token = new WC_Payment_Token_eCheck();
+		$token->set_token( time() . ' ' . __FUNCTION__ );
+		$this->assertFalse( $token->validate() );
+		$token->set_last4( '1111' );
+		$this->assertTrue( $token->validate() );
+	}
+
+	/**
+	 * Test get/set last4.
+	 * @since 2.6.0
+	 */
+	public function test_wc_payment_token_echeck_last4() {
+		$token = new WC_Payment_Token_eCheck();
+		$token->set_last4( '1111' );
+		$this->assertEquals( '1111', $token->get_last4() );
+	}
+
+	/**
+	 * Test reading/getting a token from DB correctly sets meta.
+	 * @since 2.6.0
+	 */
+	public function test_wc_payment_token_echeck_read_pulls_meta() {
+		$token = WC_Helper_Payment_Token::create_eCheck_token();
+		$token_id = $token->get_id();
+
+		$token_read = new WC_Payment_Token_eCheck( $token_id );
+		$this->assertEquals( '1234', $token_read->get_last4() );
+	}
+}
diff --git a/tests/unit-tests/payment-tokens/payment-token.php b/tests/unit-tests/payment-tokens/payment-token.php
new file mode 100644
index 00000000000..c8daf54f1d8
--- /dev/null
+++ b/tests/unit-tests/payment-tokens/payment-token.php
@@ -0,0 +1,198 @@
+<?php
+/**
+ * Class Payment_Token
+ * @package WooCommerce\Tests\Payment_Tokens
+ */
+class WC_Tests_Payment_Token extends WC_Unit_Test_Case {
+
+	/**
+	 * Test get type returns the class name/type.
+	 * @since 2.6.0
+	 */
+	public function test_wc_payment_token_get_type() {
+		$token = new WC_Payment_Token_Stub();
+		$this->assertEquals( 'stub', $token->get_type() );
+	}
+
+	/**
+	 * Test set/get token to make sure it returns the passed token.
+	 * @since 2.6.0
+	 */
+	public function test_wc_payment_token_token() {
+		$raw_token = time() . ' ' . __FUNCTION__;
+		$token = new WC_Payment_Token_Stub();
+		$token->set_token( $raw_token );
+		$this->assertEquals( $raw_token, $token->get_token() );
+	}
+
+	/**
+	 * Test set/get user ID to make sure it passes the correct ID.
+	 * @since 2.6.0
+	 */
+	public function test_wc_payment_user_id() {
+		$token = new WC_Payment_Token_Stub();
+		$token->set_user_id( 1 );
+		$this->assertEquals( 1, $token->get_user_id() );
+	}
+
+	/**
+	 * Test get user ID to make sure it returns 0 if there is no user ID.
+	 * @since 2.6.0
+	 */
+	public function test_wc_payment_get_user_id_defaults_to_0() {
+		$token = new WC_Payment_Token_Stub();
+		$this->assertEquals( 0, $token->get_user_id() );
+	}
+
+	/**
+	 * Test get/set the gateway ID.
+	 * @since 2.6.0
+	 */
+	public function test_wc_payment_gateway_id() {
+		$token = new WC_Payment_Token_Stub();
+		$token->set_gateway_id( 'paypal' );
+		$this->assertEquals( 'paypal', $token->get_gateway_id() );
+	}
+
+	/**
+	 * Test set/is a token as default.
+	 * @since 2.6.0
+	 */
+	public function test_wc_payment_token_is_default() {
+		$token = new WC_Payment_Token_Stub();
+		$token->set_default( true );
+		$this->assertTrue( $token->is_default() );
+		$token->set_default( false );
+		$this->assertFalse( $token->is_default() );
+	}
+
+
+	/**
+	 * Test that get_data returns the correct internal representation for a token.
+	 * @since 2.6.0
+	 */
+	public function test_wc_payment_token_get_data() {
+		$raw_token = time() . ' ' . __FUNCTION__;
+		$token = new WC_Payment_Token_Stub();
+		$token->set_token( $raw_token );
+		$token->set_gateway_id( 'paypal' );
+		$token->set_extra( 'woocommerce' );
+
+		$this->assertEquals( $raw_token, $token->get_token() );
+		$this->assertEquals( 'paypal', $token->get_gateway_id() );
+		$this->assertEquals( 'stub', $token->get_type() );
+
+		$data = $token->get_data();
+		$this->assertEquals( 'extra', $data['meta_data'][0]->key );
+		$this->assertEquals( 'woocommerce', $data['meta_data'][0]->value );
+	}
+
+	/**
+	 * Test token validation.
+	 * @since 2.6.0
+	 */
+	public function test_wc_payment_token_validation() {
+		$token = new WC_Payment_Token_Stub();
+		$token->set_token( time() . ' ' . __FUNCTION__ );
+		$this->assertTrue( $token->validate() );
+
+		$token = new WC_Payment_Token_Stub();
+		$this->assertFalse( $token->validate() );
+	}
+
+	/**
+	 * Test reading a token from the database.
+	 * @since 2.6.0
+	 */
+	public function test_wc_payment_token_read() {
+		$token = WC_Helper_Payment_Token::create_stub_token( __FUNCTION__ );
+		$token_id = $token->get_id();
+
+		$token_read = new WC_Payment_Token_Stub( $token_id );
+
+		$this->assertEquals( $token->get_token(), $token_read->get_token() );
+		$this->assertEquals( $token->get_extra(), $token_read->get_extra() );
+	}
+
+	/**
+	 * Test updating a token.
+	 * @since 2.6.0
+	 */
+	public function test_wc_payment_token_update() {
+		$token = WC_Helper_Payment_Token::create_stub_token( __FUNCTION__ );
+		$this->assertEquals( __FUNCTION__, $token->get_extra() );
+		$token->set_extra( ':)' );
+		$token->set_user_id( 2 );
+		$token->save();
+
+		$token = new WC_Payment_Token_Stub( $token->get_id() );
+		$this->assertEquals( ':)', $token->get_extra() );
+		$this->assertEquals( 2, $token->get_user_id() );
+	}
+
+	/**
+	 * Test creating a new token.
+	 * @since 2.6.0
+	 */
+	public function test_wc_payment_token_create() {
+		$token = new WC_Payment_Token_Stub();
+		$token->set_extra( __FUNCTION__ );
+		$token->set_token( time() );
+		$token->save();
+		$this->assertNotEmpty( $token->get_id() );
+
+		$token = new WC_Payment_Token_Stub( $token->get_id() );
+		$this->assertEquals( __FUNCTION__, $token->get_extra() );
+	}
+
+	/**
+	 * Test deleting a token.
+	 * @since 2.6.0
+	 */
+	public function test_wc_payment_token_delete() {
+		$token = WC_Helper_Payment_Token::create_stub_token( __FUNCTION__ );
+		$token_id = $token->get_id();
+		$token->delete();
+		$get_token = WC_Payment_Tokens::get( $token_id );
+		$this->assertNull( $get_token );
+	}
+
+	/**
+	 * Test a meta function (like CC's last4) doesn't work on the core abstract class.
+	 * @since 2.6.0
+	 */
+	public function test_wc_payment_token_last4_doesnt_work() {
+		$token = new WC_Payment_Token_Stub();
+		$this->assertFalse( is_callable( array( $token, 'get_last4' ) ) );
+	}
+
+	/**
+	 * Test legacy token functions.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @expectedDeprecated WC_Payment_Token::read
+	 * @expectedDeprecated WC_Payment_Token::create
+	 * @expectedDeprecated WC_Payment_Token::update
+	 */
+	public function test_wc_payment_token_legacy() {
+		$token = WC_Helper_Payment_Token::create_stub_token( __FUNCTION__ );
+		$token_id = $token->get_id();
+
+		$token_read = new WC_Payment_Token_Stub();
+		$token_read->read( $token_id );
+		$this->assertEquals( $token_id, $token_read->get_id() );
+
+		$token = new WC_Payment_Token_Stub();
+		$token->set_token( 'blah' );
+		$token->create();
+
+		$this->assertEquals( 'blah', $token->get_token() );
+		$this->assertNotEmpty( $token->get_id() );
+
+		$token->set_token( 'blah2' );
+		$token->update();
+
+		$this->assertEquals( 'blah2', $token->get_token() );
+	}
+}
diff --git a/tests/unit-tests/payment-tokens/payment-tokens.php b/tests/unit-tests/payment-tokens/payment-tokens.php
new file mode 100644
index 00000000000..850d3f2ebad
--- /dev/null
+++ b/tests/unit-tests/payment-tokens/payment-tokens.php
@@ -0,0 +1,180 @@
+<?php
+
+/**
+ * Class Payment_Tokens
+ * @package WooCommerce\Tests\Payment_Tokens
+ */
+class WC_Tests_Payment_Tokens extends WC_Unit_Test_Case {
+
+	public function setUp() {
+		parent::setUp();
+		$this->user_id = $this->factory->user->create( array( 'role' => 'shop_manager' ) );
+		wp_set_current_user( $this->user_id );
+	}
+
+	/**
+	 * Test getting tokens associated with an order.
+	 * @since 2.6.0
+	 */
+	function test_wc_payment_tokens_get_order_tokens() {
+		$order = WC_Helper_Order::create_order();
+		$this->assertEmpty( WC_Payment_Tokens::get_order_tokens( $order->get_id() ) );
+
+		$token = WC_Helper_Payment_Token::create_cc_token();
+		update_post_meta( $order->get_id(), '_payment_tokens', array( $token->get_id() ) );
+
+		$this->assertCount( 1, WC_Payment_Tokens::get_order_tokens( $order->get_id() ) );
+
+	}
+
+	/**
+	 * Test getting tokens associated with a user and no gateway ID.
+	 * @since 2.6.0
+	 */
+	function test_wc_payment_tokens_get_customer_tokens_no_gateway() {
+		$this->assertEmpty( WC_Payment_Tokens::get_customer_tokens( $this->user_id ) );
+
+		$token = WC_Helper_Payment_Token::create_cc_token();
+		$token->set_user_id( $this->user_id );
+		$token->save();
+
+		$token = WC_Helper_Payment_Token::create_cc_token();
+		$token->set_user_id( $this->user_id );
+		$token->save();
+
+		$this->assertCount( 2, WC_Payment_Tokens::get_customer_tokens( $this->user_id ) );
+	}
+
+	/**
+	 * Test getting tokens associated with a user and for a specific gateway.
+	 * @since 2.6.0
+	 */
+	function test_wc_payment_tokens_get_customer_tokens_with_gateway() {
+		$this->assertEmpty( WC_Payment_Tokens::get_customer_tokens( $this->user_id ) );
+
+		$token = WC_Helper_Payment_Token::create_cc_token();
+		$token->set_user_id( $this->user_id );
+		$token->set_gateway_id( 'bacs' );
+		$token->save();
+
+		$token = WC_Helper_Payment_Token::create_cc_token();
+		$token->set_user_id( $this->user_id );
+		$token->set_gateway_id( 'paypal' );
+		$token->save();
+
+		$this->assertCount( 2, WC_Payment_Tokens::get_customer_tokens( $this->user_id ) );
+		$this->assertCount( 1, WC_Payment_Tokens::get_customer_tokens( $this->user_id, 'bacs' ) );
+
+		foreach ( WC_Payment_Tokens::get_customer_tokens( $this->user_id, 'bacs' ) as $gateway_token ) {
+			$this->assertEquals( 'bacs', $gateway_token->get_gateway_id() );
+		}
+	}
+
+	/**
+	 * Test getting a customers default token.
+	 * @since 2.6.0
+	 */
+	function test_wc_get_customer_default_token() {
+		$token = WC_Helper_Payment_Token::create_cc_token();
+		$token->set_user_id( $this->user_id );
+		$token->set_gateway_id( 'bacs' );
+		$token->save();
+
+		$token = WC_Helper_Payment_Token::create_cc_token();
+		$token->set_user_id( $this->user_id );
+		$token->set_default( true );
+		$token->set_gateway_id( 'paypal' );
+		$token->save();
+
+		$this->assertCount( 2, WC_Payment_Tokens::get_customer_tokens( $this->user_id ) );
+
+		$default_token = WC_Payment_Tokens::get_customer_default_token( $this->user_id );
+		$this->assertEquals( 'paypal', $default_token->get_gateway_id() );
+	}
+
+	/**
+	 * Test getting a customers default token, when there no token is expictly set.
+	 * This should be the "first created".
+	 * @see WC_Payment_Token::create()
+	 * @group failing
+	 * @since 2.6.0
+	 */
+	function test_wc_get_customer_default_token_returns_first_created_when_no_default_token_set() {
+		$token = WC_Helper_Payment_Token::create_cc_token( $this->user_id );
+		$token->set_gateway_id( 'bacs' );
+		$token->save();
+
+		$token = WC_Helper_Payment_Token::create_cc_token( $this->user_id );
+		$token->set_gateway_id( 'paypal' );
+		$token->save();
+
+		$this->assertCount( 2, WC_Payment_Tokens::get_customer_tokens( $this->user_id ) );
+
+		$default_token = WC_Payment_Tokens::get_customer_default_token( $this->user_id );
+		$this->assertEquals( 'bacs', $default_token->get_gateway_id() );
+	}
+
+	/**
+	 * Test getting a token by ID.
+	 * @since 2.6.0
+	 */
+	function test_wc_payment_tokens_get() {
+		$token = WC_Helper_Payment_Token::create_cc_token();
+		$token_id = $token->get_id();
+		$get_token = WC_Payment_Tokens::get( $token_id );
+		$this->assertEquals( $token->get_token(), $get_token->get_token() );
+	}
+
+	/**
+	 * Test deleting a token by ID.
+	 * @since 2.6.0
+	 */
+	function test_wc_payment_tokens_delete() {
+		$token = WC_Helper_Payment_Token::create_cc_token();
+		$token_id = $token->get_id();
+
+		WC_Payment_Tokens::delete( $token_id );
+
+		$get_token = WC_Payment_Tokens::get( $token_id );
+		$this->assertNull( $get_token );
+	}
+
+	/**
+	 * Test getting a token's type by ID.
+	 * @since 2.6.0
+	 */
+	function test_wc_payment_tokens_get_type_by_id() {
+		$token = WC_Helper_Payment_Token::create_cc_token();
+		$token_id = $token->get_id();
+		$this->assertEquals( 'CC', WC_Payment_Tokens::get_token_type_by_id( $token_id ) );
+	}
+
+	/**
+	 * Test setting a users default token.
+	 * @since 2.6.0
+	 */
+	function test_wc_payment_tokens_set_users_default() {
+		$token = WC_Helper_Payment_Token::create_cc_token( $this->user_id );
+		$token_id = $token->get_id();
+		$token->save();
+
+		$token2 = WC_Helper_Payment_Token::create_cc_token( $this->user_id );
+		$token_id_2 = $token2->get_id();
+		$token2->save();
+
+		$this->assertTrue( $token->is_default() ); // first created is default
+		$this->assertFalse( $token2->is_default() );
+
+		WC_Payment_Tokens::set_users_default( $this->user_id, $token_id_2 );
+		$token  = new WC_Payment_Token_CC( $token_id );
+		$token2 = new WC_Payment_Token_CC( $token_id_2 );
+		$this->assertFalse( $token->is_default() );
+		$this->assertTrue( $token2->is_default() );
+
+		WC_Payment_Tokens::set_users_default( $this->user_id, $token_id );
+		$token  = new WC_Payment_Token_CC( $token_id );
+		$token2 = new WC_Payment_Token_CC( $token_id_2 );
+		$this->assertTrue( $token->is_default() );
+		$this->assertFalse( $token2->is_default() );
+	}
+}
diff --git a/tests/unit-tests/product/data-store.php b/tests/unit-tests/product/data-store.php
new file mode 100644
index 00000000000..1de43388f29
--- /dev/null
+++ b/tests/unit-tests/product/data-store.php
@@ -0,0 +1,504 @@
+<?php
+/**
+ * Data Store Tests: Tests WC_Products's WC_Data_Store.
+ * @package WooCommerce\Tests\Product
+ * @since 3.0.0
+ */
+class WC_Tests_Product_Data_Store extends WC_Unit_Test_Case {
+
+	/**
+	 * Make sure the default product store loads.
+	 *
+	 * @since 3.0.0
+	 */
+	function test_product_store_loads() {
+		$product_store = new WC_Data_Store( 'product' );
+		$this->assertTrue( is_callable( array( $product_store, 'read' ) ) );
+		$this->assertEquals( 'WC_Product_Data_Store_CPT', $product_store->get_current_class_name() );
+	}
+
+	/**
+	 * Test creating a new product.
+	 *
+	 * @since 3.0.0
+	 */
+	 function test_product_create() {
+		 $product = new WC_Product;
+		 $product->set_regular_price( 42 );
+		 $product->set_name( 'My Product' );
+		 $product->save();
+
+		 $read_product = new WC_Product( $product->get_id() );
+
+		 $this->assertEquals( '42', $read_product->get_regular_price() );
+		 $this->assertEquals( 'My Product', $read_product->get_name() );
+	 }
+
+	/**
+	 * Test reading a product.
+	 *
+	 * @since 3.0.0
+	 */
+	function test_product_read() {
+		$product = WC_Helper_Product::create_simple_product();
+		$product = new WC_Product( $product->get_id() );
+
+		$this->assertEquals( '10', $product->get_regular_price() );
+	}
+
+	/**
+	 * Test updating a product.
+	 *
+	 * @since 3.0.0
+	 */
+	function test_product_update() {
+		$product = WC_Helper_Product::create_simple_product();
+
+		$this->assertEquals( '10', $product->get_regular_price() );
+
+		$product->set_regular_price( 15 );
+		$product->save();
+
+		// Reread from database
+		$product = new WC_Product( $product->get_id() );
+
+		$this->assertEquals( '15', $product->get_regular_price() );
+	}
+
+	/**
+	 * Test trashing a product.
+	 *
+	 * @since 3.0.0
+	 */
+	function test_product_trash() {
+		$product = WC_Helper_Product::create_simple_product();
+		$product->delete();
+		$this->assertEquals( 'trash', $product->get_status() );
+	}
+
+	/**
+	 * Test deleting a product.
+	 *
+	 * @since 3.0.0
+	 */
+	function test_product_delete() {
+		$product = WC_Helper_Product::create_simple_product();
+		$product->delete( true );
+		$this->assertEquals( 0, $product->get_id() );
+	}
+
+	/**
+	 * Test creating a new grouped product.
+	 *
+	 * @since 3.0.0
+	 */
+	function test_grouped_product_create() {
+		$simple_product = WC_Helper_Product::create_simple_product();
+		$product = new WC_Product_Grouped;
+		$product->set_children( array( $simple_product->get_id() ) );
+		$product->set_name( 'My Grouped Product' );
+		$product->save();
+		$read_product = new WC_Product_Grouped( $product->get_id() );
+		$this->assertEquals( 'My Grouped Product', $read_product->get_name() );
+		$this->assertEquals( array( $simple_product->get_id() ), $read_product->get_children() );
+	 }
+
+	/**
+	 * Test getting / reading an grouped product.
+	 *
+	 * @since 3.0.0
+	 */
+	function test_grouped_product_read() {
+		$product	  = WC_Helper_Product::create_grouped_product();
+		$read_product = new WC_Product_Grouped( $product->get_id() );
+		$this->assertEquals( 'Dummy Grouped Product', $read_product->get_name() );
+		$this->assertEquals( 2, count( $read_product->get_children() ) );
+	}
+	/**
+	 * Test updating an grouped product.
+	 *
+	 * @since 3.0.0
+	 */
+	function test_grouped_product_update() {
+		$product		= WC_Helper_Product::create_grouped_product();
+		$simple_product = WC_Helper_Product::create_simple_product();
+		$this->assertEquals( 'Dummy Grouped Product', $product->get_name() );
+		$this->assertEquals( 2, count( $product->get_children() ) );
+		$children   = $product->get_children();
+		$children[] = $simple_product->get_id();
+		$product->set_children( $children );
+		$product->set_name( 'Dummy Grouped Product 2' );
+		$product->save();
+		// Reread from database
+		$product = new WC_Product_Grouped( $product->get_id() );
+		$this->assertEquals( 3, count( $product->get_children() ) );
+		$this->assertEquals( 'Dummy Grouped Product 2', $product->get_name() );
+	}
+
+	/**
+	 * Test creating a new external product.
+	 *
+	 * @since 3.0.0
+	 */
+	function test_external_product_create() {
+		 $product = new WC_Product_External;
+		 $product->set_regular_price( 42 );
+		 $product->set_button_text( 'Test CRUD' );
+		 $product->set_product_url( 'http://automattic.com' );
+		 $product->set_name( 'My External Product' );
+		 $product->save();
+
+		 $read_product = new WC_Product_External( $product->get_id() );
+
+		 $this->assertEquals( '42', $read_product->get_regular_price() );
+		 $this->assertEquals( 'Test CRUD', $read_product->get_button_text() );
+		 $this->assertEquals( 'http://automattic.com', $read_product->get_product_url() );
+		 $this->assertEquals( 'My External Product', $read_product->get_name() );
+	 }
+
+	/**
+	 * Test getting / reading an external product. Make sure both our external
+	 * product data and the main product data are present.
+	 *
+	 * @since 3.0.0
+	 */
+	function test_external_product_read() {
+		$product = WC_Helper_Product::create_external_product();
+		$product = new WC_Product_External( $product->get_id() );
+
+		$this->assertEquals( 'Buy external product', $product->get_button_text() );
+		$this->assertEquals( '10', $product->get_regular_price() );
+	}
+
+	/**
+	 * Test updating an external product. Make sure both our external
+	 * product data and the main product data are written to and present.
+	 *
+	 * @since 3.0.0
+	 */
+	function test_external_product_update() {
+		$product = WC_Helper_Product::create_external_product();
+
+		$this->assertEquals( 'Buy external product', $product->get_button_text() );
+		$this->assertEquals( '10', $product->get_regular_price() );
+
+		$product->set_button_text( 'Buy my external product' );
+		$product->set_regular_price( 15 );
+		$product->save();
+
+		// Reread from database
+		$product = new WC_Product_External( $product->get_id() );
+
+		$this->assertEquals( 'Buy my external product', $product->get_button_text() );
+		$this->assertEquals( '15', $product->get_regular_price() );
+	}
+
+	/**
+	 * Test reading a variable product.
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_variable_read() {
+		$product = WC_Helper_Product::create_variation_product();
+		$children = $product->get_children();
+
+		// Test sale prices too
+		update_post_meta( $children[0], '_price', '8' );
+		update_post_meta( $children[0], '_sale_price', '8' );
+		delete_transient( 'wc_var_prices_' . $product->get_id() );
+
+		$product = new WC_Product_Variable( $product->get_id() );
+
+		$this->assertEquals( 2, count( $product->get_children() ) );
+
+		$expected_prices['price'][ $children[0] ] = 8.00;
+		$expected_prices['price'][ $children[1] ] = 15.00;
+		$expected_prices['regular_price'][ $children[0] ] = 10.00;
+		$expected_prices['regular_price'][ $children[1] ] = 15.00;
+		$expected_prices['sale_price'][ $children[0] ] = 8.00;
+		$expected_prices['sale_price'][ $children[1] ] = 15.00;
+
+		$this->assertEquals( $expected_prices, $product->get_variation_prices() );
+
+		$expected_attributes = array( 'pa_size' => array( 'small', 'large' ) );
+		$this->assertEquals( $expected_attributes, $product->get_variation_attributes() );
+		$product->delete();
+	}
+
+	/**
+	 * Test variable and variations.
+	 *
+	 * @since 3.0.0
+	 */
+	function test_variables_and_variations() {
+		$product = new WC_Product_Variable;
+		$product->set_name( 'Variable Product' );
+
+		$attribute = new WC_Product_Attribute();
+		$attribute->set_id( 0 );
+		$attribute->set_name( 'pa_color' );
+		$attribute->set_options( explode( WC_DELIMITER, 'green | red' ) );
+		$attribute->set_visible( false );
+		$attribute->set_variation( true );
+
+		$product->set_attributes( array( $attribute ) );
+		$product->save();
+
+		$this->assertEquals( 'Variable Product', $product->get_name() );
+
+		$variation = new WC_Product_Variation;
+		$variation->set_name( 'Variation #1 of Dummy Variable CRUD Product' );
+		$variation->set_parent_id( $product->get_id() );
+		$variation->set_regular_price( 10 );
+		$variation->set_sku( 'CRUD DUMMY SKU VARIABLE GREEN' );
+		$variation->set_manage_stock( 'no' );
+		$variation->set_downloadable( 'no' );
+		$variation->set_virtual( 'no' );
+		$variation->set_stock_status( 'instock' );
+		$variation->set_attributes( array( 'pa_color' => 'green' ) );
+		$variation->save();
+
+		$this->assertEquals( 'Variation #1 of Dummy Variable CRUD Product', $variation->get_name() );
+		$this->assertEquals( 'CRUD DUMMY SKU VARIABLE GREEN', $variation->get_sku() );
+		$this->assertEquals( 10, $variation->get_price() );
+
+		$product = new WC_Product_Variable( $product->get_id() );
+		$children = $product->get_children();
+		$this->assertEquals( $variation->get_id(), $children[0] );
+
+		$expected_attributes = array( 'pa_color' => array( 'green' ) );
+		$this->assertEquals( $expected_attributes, $product->get_variation_attributes() );
+
+		$variation_2 = new WC_Product_Variation;
+		$variation_2->set_name( 'Variation #2 of Dummy Variable CRUD Product' );
+		$variation_2->set_parent_id( $product->get_id() );
+		$variation_2->set_regular_price( 10 );
+		$variation_2->set_sku( 'CRUD DUMMY SKU VARIABLE RED' );
+		$variation_2->set_manage_stock( 'no' );
+		$variation_2->set_downloadable( 'no' );
+		$variation_2->set_virtual( 'no' );
+		$variation_2->set_stock_status( 'instock' );
+		$variation_2->set_attributes( array( 'pa_color' => 'red' ) );
+		$variation_2->save();
+
+		$this->assertEquals( 'Variation #2 of Dummy Variable CRUD Product', $variation_2->get_name() );
+		$this->assertEquals( 'CRUD DUMMY SKU VARIABLE RED', $variation_2->get_sku() );
+		$this->assertEquals( 10, $variation_2->get_price() );
+
+		$product = new WC_Product_Variable( $product->get_id() );
+		$children = $product->get_children();
+		$this->assertEquals( $variation_2->get_id(), $children[1] );
+		$this->assertEquals( 2, count( $children ) );
+
+		$expected_attributes = array( 'pa_color' => array( 'green', 'red' ) );
+		$this->assertEquals( $expected_attributes, $product->get_variation_attributes() );
+
+		$variation_2->set_name( 'UPDATED - Variation #2 of Dummy Variable CRUD Product' );
+		$variation_2->set_regular_price( 15 );
+		$variation_2->set_sale_price( 9.99 );
+		$variation_2->set_date_on_sale_to( '32532537600' );
+		$variation_2->save();
+
+		$product = new WC_Product_Variable( $product->get_id() );
+		$expected_prices['price'][ $children[0] ] = 10.00;
+		$expected_prices['price'][ $children[1] ] = 9.99;
+		$expected_prices['regular_price'][ $children[0] ] = 10.00;
+		$expected_prices['regular_price'][ $children[1] ] = 15.00;
+		$expected_prices['sale_price'][ $children[0] ] = 10.00;
+		$expected_prices['sale_price'][ $children[1] ] = 9.99;
+
+		$this->assertEquals( $expected_prices, $product->get_variation_prices() );
+		$this->assertEquals( 'UPDATED - Variation #2 of Dummy Variable CRUD Product', $variation_2->get_name() );
+
+		$product->set_name( 'Renamed Variable Product' );
+		$product->save();
+		$this->assertEquals( 'Renamed Variable Product', $product->get_name() );
+		$product->delete();
+	}
+
+	function test_varation_save_attributes() {
+		// Create a variable product with a color attribute.
+		$product = new WC_Product_Variable;
+
+		$attribute = new WC_Product_Attribute();
+		$attribute->set_id( 0 );
+		$attribute->set_name( 'color' );
+		$attribute->set_options( explode( WC_DELIMITER, 'green | red' ) );
+		$attribute->set_visible( true );
+		$attribute->set_variation( true );
+
+		$product->set_attributes( array( $attribute ) );
+		$product->save();
+
+		// Create a new variation with the color 'green'.
+		$variation = new WC_Product_Variation;
+		$variation->set_parent_id( $product->get_id() );
+		$variation->set_attributes( array( 'color' => 'green' ) );
+		$variation->set_status( 'private' );
+		$variation->save();
+
+		// Now update some value unrelated to attributes.
+		$variation = wc_get_product( $variation->get_id() );
+		$variation->set_status( 'publish' );
+		$variation->save();
+
+		// Load up the updated variation and verify that the saved state is correct.
+		$loaded_variation = wc_get_product( $variation->get_id() );
+
+		$this->assertEquals( 'publish', $loaded_variation->get_status( 'edit' ) );
+		$_attribute = $loaded_variation->get_attributes( 'edit' );
+		$this->assertEquals( 'green', $_attribute['color'] );
+	}
+
+	function test_variable_child_has_dimensions() {
+		$product = new WC_Product_Variable;
+		$product->save();
+
+		$variation = new WC_Product_variation;
+		$variation->set_parent_id( $product->get_id() );
+		$variation->set_width( 10 );
+		$variation->save();
+
+		$product = wc_get_product( $product->get_id() );
+
+		$store = new WC_Product_Variable_Data_Store_CPT();
+
+		$this->assertTrue( $store->child_has_dimensions( $product ) );
+	}
+
+	function test_variable_child_has_dimensions_no_dimensions() {
+		$product = new WC_Product_Variable;
+		$product->save();
+
+		$variation = new WC_Product_variation;
+		$variation->set_parent_id( $product->get_id() );
+		$variation->save();
+
+		$product = wc_get_product( $product->get_id() );
+
+		$store = new WC_Product_Variable_Data_Store_CPT();
+
+		$this->assertFalse( $store->child_has_dimensions( $product ) );
+	}
+
+	function test_get_on_sale_products() {
+		$product_store = new WC_Product_Data_Store_CPT();
+
+		$sale_product = WC_Helper_Product::create_simple_product();
+		$sale_product->set_sale_price( 3.49 );
+		$sale_product->set_regular_price( 3.99 );
+		$sale_product->set_price( $sale_product->get_sale_price() );
+		$sale_product->save();
+
+		$not_sale_product = WC_Helper_Product::create_simple_product();
+		$not_sale_product->set_regular_price( 4.00 );
+		$not_sale_product->set_price( $not_sale_product->get_regular_price() );
+		$not_sale_product->save();
+
+		$future_sale_product = WC_Helper_Product::create_simple_product();
+		$future_sale_product->set_date_on_sale_from( 'tomorrow' );
+		$future_sale_product->set_regular_price( 6.49 );
+		$future_sale_product->set_sale_price( 5.99 );
+		$future_sale_product->set_price( $future_sale_product->get_regular_price() );
+		$future_sale_product->save();
+
+		$sale_products = $product_store->get_on_sale_products();
+		$sale_product_ids = wp_list_pluck( $sale_products, 'id' );
+
+		$this->assertContains( $sale_product->get_id(), $sale_product_ids );
+		$this->assertNotContains( $not_sale_product->get_id(), $sale_product_ids );
+		$this->assertNotContains( $future_sale_product->get_id(), $sale_product_ids );
+	}
+
+	function test_generate_product_title() {
+		$product = new WC_Product;
+		$product->set_name( 'Test Product' );
+		$product->save();
+
+		$one_attribute_variation = new WC_Product_Variation;
+		$one_attribute_variation->set_parent_id( $product->get_id() );
+		$one_attribute_variation->set_attributes( array( 'color' => 'green' ) );
+		$one_attribute_variation->save();
+
+		$two_attribute_variation = new WC_Product_Variation;
+		$two_attribute_variation->set_parent_id( $product->get_id() );
+		$two_attribute_variation->set_attributes( array( 'color' => 'green', 'size' => 'large' ) );
+		$two_attribute_variation->save();
+
+		$multiword_attribute_variation = new WC_Product_Variation;
+		$multiword_attribute_variation->set_parent_id( $product->get_id() );
+		$multiword_attribute_variation->set_attributes( array( 'color' => 'green', 'mounting-plate' => 'galaxy-s6', 'support' => 'one-year' ) );
+		$multiword_attribute_variation->save();
+
+		// Check the one attribute variation title.
+		$loaded_variation = wc_get_product( $one_attribute_variation->get_id() );
+		$this->assertEquals( "Test Product - Green", $loaded_variation->get_name() );
+
+		// Check the two attribute variation title.
+		$loaded_variation = wc_get_product( $two_attribute_variation->get_id() );
+		$this->assertEquals( "Test Product - Green, Large", $loaded_variation->get_name() );
+
+		// Check the variation with a multiword attribute name.
+		$loaded_variation = wc_get_product( $multiword_attribute_variation->get_id() );
+		$this->assertEquals( "Test Product", $loaded_variation->get_name() );
+	}
+
+	function test_generate_product_title_disable() {
+		add_filter( 'woocommerce_product_variation_title_include_attributes', '__return_false' );
+
+		$product = new WC_Product;
+		$product->set_name( 'Test Product' );
+		$product->save();
+
+		$variation = new WC_Product_Variation;
+		$variation->set_parent_id( $product->get_id() );
+		$variation->set_attributes( array( 'color' => 'green' ) );
+		$variation->save();
+
+		$loaded_variation = wc_get_product( $variation->get_id() );
+		$this->assertEquals( "Test Product", $loaded_variation->get_name() );
+	}
+
+	function test_generate_product_title_no_attributes() {
+		$product = new WC_Product;
+		$product->set_name( 'Test Product' );
+		$product->save();
+
+		$variation = new WC_Product_Variation;
+		$variation->set_parent_id( $product->get_id() );
+		$variation->set_attributes( array() );
+		$variation->save();
+
+		$loaded_variation = wc_get_product( $variation->get_id() );
+		$this->assertEquals( "Test Product", $loaded_variation->get_name() );
+	}
+
+	/**
+	 * Test to make sure meta can still be set while hooked using save_post.
+	 * https://github.com/woocommerce/woocommerce/issues/13960
+	 * @since 3.0.1
+	 */
+	function test_product_meta_save_post() {
+		$product = new WC_Product;
+		$product->set_name( 'Test Product' );
+		$product->save();
+		update_post_meta( $product->get_id(), '_test2', 'default' ); // this is the value we don't want to get back.
+
+		// This takes place of WC_Meta_Box do_action( 'woocommerce_admin_process_product_object ' ) just adding simple meta.
+		$product->update_meta_data( '_test', 'hello' );
+		$product->set_name( 'Test Product_' );
+
+		add_action( 'save_post', array( 'WC_Helper_Product', 'save_post_test_update_meta_data_direct' ), 11 );
+		$product->save();
+
+		$test  = get_post_meta( $product->get_id(), '_test', true );
+		$test2 = get_post_meta( $product->get_id(), '_test2', true );
+
+		$this->assertEquals( 'hello', $test );
+		$this->assertEquals( 'world', $test2 ); // this would be 'default' without the force meta refresh in WC_Product_Data_Store::update();
+		$this->assertEquals( 'world', $product->get_meta( '_test2' ) );
+		$this->assertEquals( 'Test Product_', $product->get_name() );
+
+		remove_action( 'save_post', array( 'WC_Helper_Product', 'save_post_test_update_meta_data_direct' ) );
+	}
+}
diff --git a/tests/unit-tests/product/data.php b/tests/unit-tests/product/data.php
new file mode 100644
index 00000000000..9e6bb0763dc
--- /dev/null
+++ b/tests/unit-tests/product/data.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * Data Functions.
+ * @package WooCommerce\Tests\Product
+ * @since 3.0.0
+ */
+class WC_Tests_Product_Data extends WC_Unit_Test_Case {
+
+	/**
+	 * Test product setters and getters
+	 * @since 3.0.0
+	 */
+	public function test_product_getters_and_setters() {
+		global $wpdb;
+
+		$attributes = array();
+		$attribute = new WC_Product_Attribute();
+		$attribute->set_id( 0 );
+		$attribute->set_name( 'Test Attribute' );
+		$attribute->set_options( array( 'Fish', 'Fingers' ) );
+		$attribute->set_position( 0 );
+		$attribute->set_visible( true );
+		$attribute->set_variation( false );
+		$attributes['test-attribute'] = $attribute;
+
+		$getters_and_setters = array(
+			'name'               => 'Test',
+			'slug'               => 'test',
+			'status'             => 'publish',
+			'catalog_visibility' => 'search',
+			'featured'           => false,
+			'description'        => 'Hello world',
+			'short_description'  => 'hello',
+			'sku'                => 'TEST SKU',
+			'regular_price'      => 15.00,
+			'sale_price'         => 10.00,
+			'total_sales'        => 20,
+			'tax_status'         => 'none',
+			'tax_class'          => '',
+			'manage_stock'       => true,
+			'stock_quantity'     => 10,
+			'stock_status'       => 'instock',
+			'backorders'         => 'notify',
+			'sold_individually'  => false,
+			'weight'             => 100,
+			'length'             => 10,
+			'width'              => 10,
+			'height'             => 10,
+			'upsell_ids'         => array( 2, 3 ),
+			'cross_sell_ids'     => array( 4, 5 ),
+			'parent_id'          => 0,
+			'reviews_allowed'    => true,
+			'default_attributes' => array(),
+			'purchase_note'      => 'A note',
+			'menu_order'         => 2,
+			'gallery_image_ids'  => array(),
+			'download_expiry'    => -1,
+			'download_limit'     => 5,
+			'attributes'         => $attributes,
+		 );
+		$product = new WC_Product();
+		foreach ( $getters_and_setters as $function => $value ) {
+			$product->{"set_{$function}"}( $value );
+		}
+		$product->set_date_on_sale_from( '1475798400' );
+		$product->set_date_on_sale_to( '1477267200' );
+		$product->save();
+		$product = new WC_Product_Simple( $product->get_id() );
+		foreach ( $getters_and_setters as $function => $value ) {
+			$this->assertEquals( $value, $product->{"get_{$function}"}(), $function );
+		}
+		$this->assertEquals( $product->get_date_on_sale_from()->getTimestamp(), 1475798400 );
+		$this->assertEquals( $product->get_date_on_sale_to()->getTimestamp(), 1477267200 );
+
+		$image_url = media_sideload_image( "https://cldup.com/Dr1Bczxq4q.png", $product->get_id(), '', 'src' );
+		$image_id  = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE guid='%s';", $image_url ) );
+		$product->set_image_id( $image_id[0] );
+		$product->save();
+		$this->assertEquals( $image_id[0], $product->get_image_id() );
+	 }
+
+	/**
+	 * Test product term setters and getters
+	 * @since 3.0.0
+	 */
+	public function test_product_term_getters_and_setters() {
+		$test_cat_1 = wp_insert_term( 'Testing 1', 'product_cat' );
+		$test_cat_2 = wp_insert_term( 'Testing 2', 'product_cat' );
+
+		$test_tag_1 = wp_insert_term( 'Tag 1', 'product_tag' );
+		$test_tag_2 = wp_insert_term( 'Tag 2', 'product_tag' );
+
+		$getters_and_setters = array(
+			'tag_ids'      => array( $test_tag_1['term_id'], $test_tag_2['term_id'] ),
+			'category_ids' => array( $test_cat_1['term_id'], $test_cat_2['term_id'] ),
+		);
+		$product = new WC_Product_Simple;
+		foreach ( $getters_and_setters as $function => $value ) {
+			$product->{"set_{$function}"}( $value );
+		}
+		$product->save();
+
+		$this->assertEquals( array( $test_cat_1['term_id'], $test_cat_2['term_id'] ), $product->get_category_ids() );
+		$this->assertEquals( array( $test_tag_1['term_id'], $test_tag_2['term_id'] ), $product->get_tag_ids() );
+	}
+
+	/**
+	 * Test grouped product setters and getters
+	 *
+	 * @since 3.0.0
+	 */
+	 public function test_grouped_product_getters_and_setters() {
+		$getters_and_setters = array(
+			'children' => array( 1, 2, 3 ),
+		);
+		$product = new WC_Product_Grouped;
+		foreach ( $getters_and_setters as $function => $value ) {
+			$product->{"set_{$function}"}( $value );
+			$this->assertEquals( $value, $product->{"get_{$function}"}(), $function );
+		}
+	 }
+
+	/**
+	 * Test external product setters and getters
+	 *
+	 * @since 3.0.0
+	 */
+	 public function test_external_product_getters_and_setters() {
+		 $time = time();
+		 $getters_and_setters = array(
+			 'button_text' => 'Test Button Text',
+			 'product_url' => 'http://wordpress.org',
+		 );
+		 $product = new WC_Product_External;
+		  foreach ( $getters_and_setters as $function => $value ) {
+			 $product->{"set_{$function}"}( $value );
+			 $this->assertEquals( $value, $product->{"get_{$function}"}(), $function );
+		 }
+	 }
+
+}
diff --git a/tests/unit-tests/product/factory.php b/tests/unit-tests/product/factory.php
new file mode 100644
index 00000000000..f273af18995
--- /dev/null
+++ b/tests/unit-tests/product/factory.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Products Factory Tests
+ * @package WooCommerce\Tests\Product
+ * @since 3.0.0
+ */
+class WC_Tests_Product_Factory extends WC_Unit_Test_Case {
+
+	/**
+	 * Test getting product type.
+	 *
+	 * @since 3.0.0
+	 */
+	function test_get_product_type() {
+		$simple = WC_Helper_Product::create_simple_product();
+		$external = WC_Helper_Product::create_external_product();
+		$grouped = WC_Helper_Product::create_grouped_product();
+		$variable = WC_Helper_Product::create_variation_product();
+		$children = $variable->get_children();
+		$child_id = $children[0];
+
+		$this->assertEquals( 'simple', WC()->product_factory->get_product_type( $simple->get_id() ) );
+		$this->assertEquals( 'external', WC()->product_factory->get_product_type( $external->get_id() ) );
+		$this->assertEquals( 'grouped', WC()->product_factory->get_product_type( $grouped->get_id() ) );
+		$this->assertEquals( 'variable', WC()->product_factory->get_product_type( $variable->get_id() ) );
+		$this->assertEquals( 'variation', WC()->product_factory->get_product_type( $child_id ) );
+
+		$simple->delete( true );
+		$external->delete( true );
+		$grouped->delete( true );
+		$variable->delete( true );
+	}
+
+	/**
+	 * Test the helper method that returns a class name for a specific product type.
+	 *
+	 * @since 3.0.0
+	 */
+	function test_get_classname_from_product_type() {
+		$this->assertEquals( 'WC_Product_Grouped', WC()->product_factory->get_classname_from_product_type( 'grouped' ) );
+		$this->assertEquals( 'WC_Product_Simple', WC()->product_factory->get_classname_from_product_type( 'simple' ) );
+		$this->assertEquals( 'WC_Product_Variable', WC()->product_factory->get_classname_from_product_type( 'variable' ) );
+		$this->assertEquals( 'WC_Product_Variation', WC()->product_factory->get_classname_from_product_type( 'variation' ) );
+		$this->assertEquals( 'WC_Product_External', WC()->product_factory->get_classname_from_product_type( 'external' ) );
+	}
+
+	/**
+	 * Tests getting a product using the factory.
+	 *
+	 * @since 3.0.0
+	 */
+	function test_get_product() {
+		$test_product = WC_Helper_Product::create_simple_product();
+ 		$get_product  = WC()->product_factory->get_product( $test_product->get_id() );
+		$this->assertEquals( $test_product->get_data(), $get_product->get_data() );
+	}
+
+	/**
+	 * Tests that an incorrect product returns false.
+	 *
+	 * @since 3.0.0
+	 */
+	function test_get_invalid_product_returns_false() {
+		$product = WC()->product_factory->get_product( 50000 );
+		$this->assertFalse( $product );
+	}
+
+}
diff --git a/tests/unit-tests/product/functions.php b/tests/unit-tests/product/functions.php
index 0adda7d313c..bc2005eaea8 100644
--- a/tests/unit-tests/product/functions.php
+++ b/tests/unit-tests/product/functions.php
@@ -1,13 +1,112 @@
 <?php
 
-namespace WooCommerce\Tests\Product;
-
 /**
  * Class Functions.
  * @package WooCommerce\Tests\Product
  * @since 2.3
  */
-class Functions extends \WC_Unit_Test_Case {
+class WC_Tests_Product_Functions extends WC_Unit_Test_Case {
+
+	/**
+	 * Tests wc_get_products().
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_wc_get_products() {
+		$test_cat_1 = wp_insert_term( 'Testing 1', 'product_cat' );
+		$test_tag_1 = wp_insert_term( 'Tag 1', 'product_tag' );
+		$test_tag_2 = wp_insert_term( 'Tag 2', 'product_tag' );
+		$term_cat_1 = get_term_by( 'id', $test_cat_1['term_id'], 'product_cat' );
+		$term_tag_1 = get_term_by( 'id', $test_tag_1['term_id'], 'product_tag' );
+		$term_tag_2 = get_term_by( 'id', $test_tag_2['term_id'], 'product_tag' );
+
+		$product = WC_Helper_Product::create_simple_product();
+		$product->set_tag_ids( array( $test_tag_1['term_id'] ) );
+		$product->set_category_ids( array( $test_cat_1['term_id'] ) );
+		$product->set_sku( 'GET TEST SKU SIMPLE' );
+		$product->save();
+
+		$product_2 = WC_Helper_Product::create_simple_product();
+		$product_2->set_category_ids( array( $test_cat_1['term_id'] ) );
+		$product_2->save();
+
+		$external = WC_Helper_Product::create_simple_product();
+		$external->set_category_ids( array( $test_cat_1['term_id'] ) );
+		$external->set_sku( 'GET TEST SKU EXTERNAL' );
+		$external->save();
+
+		$external_2 = WC_Helper_Product::create_simple_product();
+		$external_2->set_tag_ids( array( $test_tag_2['term_id'] ) );
+		$external_2->save();
+
+		$grouped = WC_Helper_Product::create_grouped_product();
+
+		$variation = WC_Helper_Product::create_variation_product();
+		$variation->set_tag_ids( array( $test_tag_1['term_id'] ) );
+		$variation->save();
+
+		$draft = WC_Helper_Product::create_simple_product();
+		$draft->set_status( 'draft' );
+		$draft->save();
+
+		$this->assertEquals( 9, count( wc_get_products( array( 'return' => 'ids' ) ) ) );
+
+		// test status
+		$products = wc_get_products( array( 'return' => 'ids', 'status' => 'draft' ) );
+		$this->assertEquals( array( $draft->get_id() ), $products );
+
+		// test type
+		$products = wc_get_products( array( 'return' => 'ids', 'type' => 'variation' ) );
+		$this->assertEquals( 2, count( $products ) );
+
+		// test parent
+		$products = wc_get_products( array( 'return' => 'ids', 'type' => 'variation', 'parent' => $variation->get_id() ) );
+		$this->assertEquals( 2, count( $products ) );
+
+		// test skus
+		$products = wc_get_products( array( 'return' => 'ids', 'sku' => 'GET TEST SKU' ) );
+		$this->assertEquals( 2, count( $products ) );
+		$this->assertContains( $product->get_id(), $products );
+		$this->assertContains( $external->get_id(), $products );
+
+		// test categories
+		$products = wc_get_products( array( 'return' => 'ids', 'category' => array( $term_cat_1->slug ) ) );
+		$this->assertEquals( 3, count( $products ) );
+
+		// test tags
+		$products = wc_get_products( array( 'return' => 'ids', 'tag' => array( $term_tag_1->slug ) ) );
+		$this->assertEquals( 2, count( $products ) );
+
+		$products = wc_get_products( array( 'return' => 'ids', 'tag' => array( $term_tag_2->slug ) ) );
+		$this->assertEquals( 1, count( $products ) );
+
+		$products = wc_get_products( array( 'return' => 'ids', 'tag' => array( $term_tag_1->slug, $term_tag_2->slug ) ) );
+		$this->assertEquals( 3, count( $products ) );
+
+		// test limit
+		$products = wc_get_products( array( 'return' => 'ids', 'limit' => 5 ) );
+		$this->assertEquals( 5, count( $products ) );
+
+		// test offset
+		$products = wc_get_products( array( 'return' => 'ids', 'limit' => 2 ) );
+		$products_offset = wc_get_products( array( 'return' => 'ids', 'limit' => 2, 'offset' => 2 ) );
+		$this->assertEquals( 2, count( $products ) );
+		$this->assertEquals( 2, count( $products_offset ) );
+		$this->assertNotEquals( $products, $products_offset );
+
+		// test page
+		$products_page_1 = wc_get_products( array( 'return' => 'ids', 'limit' => 2 ) );
+		$products_page_2 = wc_get_products( array( 'return' => 'ids', 'limit' => 2, 'page' => 2 ) );
+		$this->assertEquals( 2, count( $products_page_1 ) );
+		$this->assertEquals( 2, count( $products_page_2 ) );
+		$this->assertNotEquals( $products_page_1, $products_page_2 );
+
+		// test exclude
+		$products = wc_get_products( array( 'return' => 'ids', 'limit' => 200, 'exclude' => array( $product->get_id() ) ) );
+		$this->assertNotContains( $product->get_id(), $products );
+
+		$variation->delete( true );
+	}
 
 	/**
 	 * Test wc_get_product().
@@ -17,14 +116,14 @@ class Functions extends \WC_Unit_Test_Case {
 	public function test_wc_get_product() {
 
 		// Create product
-		$product = \WC_Helper_Product::create_simple_product();
+		$product = WC_Helper_Product::create_simple_product();
 
-		$product_copy = wc_get_product( $product->id );
+		$product_copy = wc_get_product( $product->get_id() );
 
-		$this->assertEquals( $product->id, $product_copy->id );
+		$this->assertEquals( $product->get_id(), $product_copy->get_id() );
 
 		// Delete Product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 
 	/**
@@ -34,15 +133,37 @@ class Functions extends \WC_Unit_Test_Case {
 	 */
 	public function test_wc_update_product_stock() {
 		// Create product
-		$product = \WC_Helper_Product::create_simple_product();
+		$product = WC_Helper_Product::create_simple_product();
 
-		update_post_meta( $product->id, '_manage_stock', 'yes' );
+		update_post_meta( $product->get_id(), '_manage_stock', 'yes' );
+		wc_update_product_stock( $product->get_id(), 5 );
 
-		wc_update_product_stock( $product->id, 5 );
-		$this->assertEquals( 5, $product->stock );
+		$product = new WC_Product_Simple( $product->get_id() );
+		$this->assertEquals( 5, $product->get_stock_quantity() );
 
 		// Delete Product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
+	}
+
+	public function test_wc_update_product_stock_increase_decrease() {
+		$product = WC_Helper_Product::create_simple_product();
+
+		update_post_meta( $product->get_id(), '_manage_stock', 'yes' );
+		wc_update_product_stock( $product->get_id(), 5 );
+
+		$new_value = wc_update_product_stock( $product->get_id(), 1, 'increase' );
+
+		$product = new WC_Product_Simple( $product->get_id() );
+		$this->assertEquals( 6, $product->get_stock_quantity() );
+		$this->assertEquals( 6, $new_value );
+
+		$new_value = wc_update_product_stock( $product->get_id(), 1, 'decrease' );
+
+		$product = new WC_Product_Simple( $product->get_id() );
+		$this->assertEquals( 5, $product->get_stock_quantity() );
+		$this->assertEquals( 5, $new_value );
+
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 
 	/**
@@ -52,12 +173,11 @@ class Functions extends \WC_Unit_Test_Case {
 	 */
 	public function test_wc_delete_product_transients() {
 		// Create product
-		$product = \WC_Helper_Product::create_simple_product();
+		$product = WC_Helper_Product::create_simple_product();
 
-		update_post_meta( $product->id, '_regular_price', wc_format_decimal( 10 ) );
-		update_post_meta( $product->id, '_price', wc_format_decimal( 5 ) );
-		update_post_meta( $product->id, '_sale_price', wc_format_decimal( 5 ) );
-		update_post_meta( $product->id, '_featured', 'yes' );
+		update_post_meta( $product->get_id(), '_regular_price', wc_format_decimal( 10 ) );
+		update_post_meta( $product->get_id(), '_price', wc_format_decimal( 5 ) );
+		update_post_meta( $product->get_id(), '_sale_price', wc_format_decimal( 5 ) );
 
 		wc_get_product_ids_on_sale();  // Creates the transient for on sale products
 		wc_get_featured_product_ids(); // Creates the transient for featured products
@@ -67,7 +187,7 @@ class Functions extends \WC_Unit_Test_Case {
 		$this->assertFalse( get_transient( 'wc_products_onsale' ) );
 		$this->assertFalse( get_transient( 'wc_featured_products' ) );
 
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 
 	/**
@@ -81,16 +201,16 @@ class Functions extends \WC_Unit_Test_Case {
 		delete_transient( 'wc_products_onsale' );
 
 		// Create product
-		$product = \WC_Helper_Product::create_simple_product();
+		$product = WC_Helper_Product::create_simple_product();
 
-		update_post_meta( $product->id, '_regular_price', wc_format_decimal( 10 ) );
-		update_post_meta( $product->id, '_price', wc_format_decimal( 5 ) );
-		update_post_meta( $product->id, '_sale_price', wc_format_decimal( 5 ) );
+		update_post_meta( $product->get_id(), '_regular_price', wc_format_decimal( 10 ) );
+		update_post_meta( $product->get_id(), '_price', wc_format_decimal( 5 ) );
+		update_post_meta( $product->get_id(), '_sale_price', wc_format_decimal( 5 ) );
 
-		$this->assertEquals( array( $product->id ), wc_get_product_ids_on_sale() );
+		$this->assertEquals( array( $product->get_id() ), wc_get_product_ids_on_sale() );
 
 		// Delete Product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 
 	/**
@@ -104,14 +224,14 @@ class Functions extends \WC_Unit_Test_Case {
 		delete_transient( 'wc_featured_products' );
 
 		// Create product
-		$product = \WC_Helper_Product::create_simple_product();
+		$product = WC_Helper_Product::create_simple_product();
+		$product->set_featured( true );
+		$product->save();
 
-		update_post_meta( $product->id, '_featured', 'yes' );
-
-		$this->assertEquals( array( $product->id ), wc_get_featured_product_ids() );
+		$this->assertEquals( array( $product->get_id() ), wc_get_featured_product_ids() );
 
 		// Delete Product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 
 	/**
@@ -123,15 +243,15 @@ class Functions extends \WC_Unit_Test_Case {
 		$sizes = array(
 			'shop_thumbnail' => array( 'width' => '180', 'height' => '180' ),
 			'shop_single'    => array( 'width' => '600', 'height' => '600' ),
-			'shop_catalog'   => array( 'width' => '300', 'height' => '300' )
+			'shop_catalog'   => array( 'width' => '300', 'height' => '300' ),
 		);
 
 		foreach ( $sizes as $size => $values ) {
-			$img = '<img src="' . wc_placeholder_img_src() . '" alt="' . esc_attr__( 'Placeholder', 'woocommerce' ) . '" width="' . $values['width'] . '" class="woocommerce-placeholder wp-post-image" height="' . $values['height'] . '" />';
+			$img = '<img src="' . wc_placeholder_img_src() . '" alt="Placeholder" width="' . $values['width'] . '" class="woocommerce-placeholder wp-post-image" height="' . $values['height'] . '" />';
 			$this->assertEquals( apply_filters( 'woocommerce_placeholder_img', $img ), wc_placeholder_img( $size ) );
 		}
 
-		$img = '<img src="' . wc_placeholder_img_src() . '" alt="' . esc_attr__( 'Placeholder', 'woocommerce' ) . '" width="180" class="woocommerce-placeholder wp-post-image" height="180" />';
+		$img = '<img src="' . wc_placeholder_img_src() . '" alt="Placeholder" width="180" class="woocommerce-placeholder wp-post-image" height="180" />';
 		$this->assertEquals( apply_filters( 'woocommerce_placeholder_img', $img ), wc_placeholder_img() );
 	}
 
@@ -142,10 +262,10 @@ class Functions extends \WC_Unit_Test_Case {
 	 */
 	public function test_wc_get_product_types() {
 		$product_types = (array) apply_filters( 'product_type_selector', array(
-			'simple'   => __( 'Simple product', 'woocommerce' ),
-			'grouped'  => __( 'Grouped product', 'woocommerce' ),
-			'external' => __( 'External/Affiliate product', 'woocommerce' ),
-			'variable' => __( 'Variable product', 'woocommerce' )
+			'simple'   => 'Simple product',
+			'grouped'  => 'Grouped product',
+			'external' => 'External/Affiliate product',
+			'variable' => 'Variable product',
 		) );
 
 		$this->assertEquals( $product_types, wc_get_product_types() );
@@ -157,18 +277,22 @@ class Functions extends \WC_Unit_Test_Case {
 	 * @since 2.3
 	 */
 	public function test_wc_product_has_unique_sku() {
-		$product_1 = \WC_Helper_Product::create_simple_product();
+		$product_1 = WC_Helper_Product::create_simple_product();
 
-		$this->assertEquals( true, wc_product_has_unique_sku( $product_1->id, $product_1->sku ) );
+		$this->assertTrue( wc_product_has_unique_sku( $product_1->get_id(), $product_1->get_sku() ) );
 
-		$product_2 = \WC_Helper_Product::create_simple_product();
-		$this->assertEquals( false, wc_product_has_unique_sku( $product_2->id, $product_2->sku ) );
+		$product_2 = WC_Helper_Product::create_simple_product();
+		// we need to manually set a sku, because WC_Product now uses wc_product_has_unique_sku before setting
+		// so we need to manually set it to test the functionality.
+		update_post_meta( $product_2->get_id(), '_sku', $product_1->get_sku() );
 
-		\WC_Helper_Product::delete_product( $product_1->id );
+		$this->assertFalse( wc_product_has_unique_sku( $product_2->get_id(), $product_1->get_sku() ) );
 
-		$this->assertEquals( true, wc_product_has_unique_sku( $product_2->id, $product_2->sku ) );
+		WC_Helper_Product::delete_product( $product_1->get_id() );
 
-		\WC_Helper_Product::delete_product( $product_2->id );
+		$this->assertTrue( wc_product_has_unique_sku( $product_2->get_id(), $product_2->get_sku() ) );
+
+		WC_Helper_Product::delete_product( $product_2->get_id() );
 	}
 
 	/**
@@ -178,11 +302,74 @@ class Functions extends \WC_Unit_Test_Case {
 	 */
 	public function test_wc_get_product_id_by_sku() {
 		// Create product
-		$product = \WC_Helper_Product::create_simple_product();
+		$product = WC_Helper_Product::create_simple_product();
 
-		$this->assertEquals( $product->id, wc_get_product_id_by_sku( $product->sku ) );
+		$this->assertEquals( $product->get_id(), wc_get_product_id_by_sku( $product->get_sku() ) );
 
 		// Delete Product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
+	}
+
+	/**
+	 * Test wc_get_min_max_price_meta_query()
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_wc_get_min_max_price_meta_query() {
+		$meta_query = wc_get_min_max_price_meta_query( array( 'min_price' => 10, 'max_price' => 100 ) );
+
+		$this->assertEquals( array(
+			'key'     => '_price',
+			'value'   => array( 10, 100 ),
+			'compare' => 'BETWEEN',
+			'type'    => 'DECIMAL',
+		), $meta_query );
+	}
+
+	/**
+	 * Test wc_product_force_unique_sku
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_wc_product_force_unique_sku() {
+		$product_1 = WC_Helper_Product::create_simple_product();
+		$product_2 = WC_Helper_Product::create_simple_product();
+		$product_3 = WC_Helper_Product::create_simple_product();
+		$product_4 = WC_Helper_Product::create_simple_product();
+
+		$product_1->set_sku( 'some-custom-sku' );
+		$product_2->set_sku( 'another-custom-sku' );
+		$product_3->set_sku( 'another-custom-sku-1' );
+		$product_4->set_sku( '' );
+
+		$product_1_id = $product_1->save();
+		$product_2_id = $product_2->save();
+		$product_3_id = $product_3->save();
+		$product_4_id = $product_4->save();
+
+		wc_product_force_unique_sku( $product_4_id );
+		$this->assertEquals( get_post_meta( $product_4_id, '_sku', true ), '' );
+
+		update_post_meta( $product_4_id, '_sku', 'some-custom-sku' );
+		wc_product_force_unique_sku( $product_4_id );
+		$this->assertEquals( get_post_meta( $product_4_id, '_sku', true ), 'some-custom-sku-1' );
+
+		update_post_meta( $product_4_id, '_sku', 'another-custom-sku' );
+		wc_product_force_unique_sku( $product_4_id );
+		$this->assertEquals( get_post_meta( $product_4_id, '_sku', true ), 'another-custom-sku-2' );
+	}
+
+	/**
+	 * Test wc_is_attribute_in_product_name
+	 *
+	 * @since 3.0.2
+	 */
+	public function test_wc_is_attribute_in_product_name() {
+		$this->assertTrue( wc_is_attribute_in_product_name( 'L', 'Product &ndash; L' ) );
+		$this->assertTrue( wc_is_attribute_in_product_name( 'Two Words', 'Product &ndash; L, Two Words' ) );
+		$this->assertTrue( wc_is_attribute_in_product_name( 'Blue', 'Product &ndash; The Cool One &ndash; Blue, Large' ) );
+		$this->assertFalse( wc_is_attribute_in_product_name( 'L', 'Product' ) );
+		$this->assertFalse( wc_is_attribute_in_product_name( 'L', 'Product L Thing' ) );
+		$this->assertFalse( wc_is_attribute_in_product_name( 'Blue', 'Product &ndash; Large, Blueish' ) );
 	}
 }
diff --git a/tests/unit-tests/product/product-simple.php b/tests/unit-tests/product/product-simple.php
index d34ede911f3..d9f9fc99288 100644
--- a/tests/unit-tests/product/product-simple.php
+++ b/tests/unit-tests/product/product-simple.php
@@ -1,13 +1,11 @@
 <?php
 
-namespace WooCommerce\Tests\Product;
-
 /**
  * Class Product_Simple.
  * @package WooCommerce\Tests\Product
  * @since 2.3
  */
-class Product_Simple extends \WC_Unit_Test_Case {
+class WC_Tests_Product_Simple extends WC_Unit_Test_Case {
 
 	/**
 	 * Test add_to_cart_text().
@@ -16,15 +14,17 @@ class Product_Simple extends \WC_Unit_Test_Case {
 	 */
 	public function test_add_to_cart_text() {
 		// Create product
-		$product = \WC_Helper_Product::create_simple_product();
+		$product = WC_Helper_Product::create_simple_product();
 
-		$this->assertEquals( __( 'Add to cart', 'woocommerce' ), $product->add_to_cart_text() );
+		$this->assertEquals( 'Add to cart', $product->add_to_cart_text() );
 
-		$product->stock_status = 'outofstock';
-		$this->assertEquals( __( 'Read More', 'woocommerce' ), $product->add_to_cart_text() );
+		$product->set_stock_status( 'outofstock' );
+		$product->save();
+
+		$this->assertEquals( 'Read more', $product->add_to_cart_text() );
 
 		// Delete product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 
 	/**
@@ -34,12 +34,12 @@ class Product_Simple extends \WC_Unit_Test_Case {
 	 */
 	public function test_single_add_to_cart_text() {
 		// Create product
-		$product = \WC_Helper_Product::create_simple_product();
+		$product = WC_Helper_Product::create_simple_product();
 
-		$this->assertEquals( __( 'Add to cart', 'woocommerce' ), $product->single_add_to_cart_text() );
+		$this->assertEquals( 'Add to cart', $product->single_add_to_cart_text() );
 
 		// Delete product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 
 	/**
@@ -49,12 +49,12 @@ class Product_Simple extends \WC_Unit_Test_Case {
 	 */
 	public function test_get_title() {
 		// Create product
-		$product = \WC_Helper_Product::create_simple_product();
+		$product = WC_Helper_Product::create_simple_product();
 
-		$this->assertEquals( 'Dummy Product', $product->get_title() );
+		$this->assertEquals( 'Dummy Product', $product->get_name() );
 
 		// Delete product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 
 	/**
@@ -64,12 +64,12 @@ class Product_Simple extends \WC_Unit_Test_Case {
 	 */
 	public function test_get_permalink() {
 		// Create product
-		$product = \WC_Helper_Product::create_simple_product();
+		$product = WC_Helper_Product::create_simple_product();
 
-		$this->assertEquals( get_permalink( $product->id ), $product->get_permalink() );
+		$this->assertEquals( get_permalink( $product->get_id() ), $product->get_permalink() );
 
 		// Delete product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 
 	/**
@@ -79,12 +79,12 @@ class Product_Simple extends \WC_Unit_Test_Case {
 	 */
 	public function test_get_sku() {
 		// Create product
-		$product = \WC_Helper_Product::create_simple_product();
+		$product = WC_Helper_Product::create_simple_product();
 
-		$this->assertEquals( $product->sku, $product->get_sku() );
+		$this->assertEquals( 'DUMMY SKU', $product->get_sku() );
 
 		// Delete product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 
 	/**
@@ -94,7 +94,7 @@ class Product_Simple extends \WC_Unit_Test_Case {
 	 */
 	public function test_get_stock_quantity() {
 		// Create product
-		$product = \WC_Helper_Product::create_simple_product();
+		$product = WC_Helper_Product::create_simple_product();
 
 		$this->assertEmpty( $product->get_stock_quantity() );
 
@@ -103,77 +103,7 @@ class Product_Simple extends \WC_Unit_Test_Case {
 		$this->assertEquals( 0, $product->get_stock_quantity() );
 
 		// Delete product
-		\WC_Helper_Product::delete_product( $product->id );
-	}
-
-	/**
-	 * Test get_total_stock().
-	 *
-	 * @since 2.3
-	 */
-	public function test_get_total_stock() {
-		// Create product
-		$product = \WC_Helper_Product::create_simple_product();
-
-		$this->assertEmpty( $product->get_total_stock() );
-
-		$product->manage_stock = 'yes';
-		$this->assertEquals( 0, $product->get_total_stock() );
-
-		// Delete product
-		\WC_Helper_Product::delete_product( $product->id );
-	}
-
-	/**
-	 * Test set_stock().
-	 *
-	 * @since 2.3
-	 */
-	public function test_set_stock() {
-		// Create product
-		$product = \WC_Helper_Product::create_simple_product();
-
-		$product->manage_stock = 'yes';
-		$this->assertEquals( 5, $product->set_stock( 5 ) );
-		$this->assertEquals( 2, $product->set_stock( 3, 'subtract' ) );
-		$this->assertEquals( 5, $product->set_stock( 3, 'add' ) );
-
-		// Delete product
-		\WC_Helper_Product::delete_product( $product->id );
-	}
-
-	/**
-	 * Test reduce_stock().
-	 *
-	 * @since 2.3
-	 */
-	public function test_reduce_stock() {
-		// Create product
-		$product = \WC_Helper_Product::create_simple_product();
-
-		$product->manage_stock = 'yes';
-		$product->set_stock( 5 );
-		$this->assertEquals( 2, $product->reduce_stock( 3 ) );
-
-		// Delete product
-		\WC_Helper_Product::delete_product( $product->id );
-	}
-
-	/**
-	 * Test increase_stock().
-	 *
-	 * @since 2.3
-	 */
-	public function test_increase_stock() {
-		// Create product
-		$product = \WC_Helper_Product::create_simple_product();
-
-		$product->manage_stock = 'yes';
-		$product->set_stock( 5 );
-		$this->assertEquals( 8, $product->increase_stock( 3 ) );
-
-		// Delete product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 
 	/**
@@ -183,7 +113,7 @@ class Product_Simple extends \WC_Unit_Test_Case {
 	 */
 	public function test_is_type() {
 		// Create product
-		$product = \WC_Helper_Product::create_simple_product();
+		$product = WC_Helper_Product::create_simple_product();
 
 		$this->assertTrue( $product->is_type( 'simple' ) );
 		$this->assertFalse( $product->is_type( 'grouped' ) );
@@ -191,7 +121,7 @@ class Product_Simple extends \WC_Unit_Test_Case {
 		$this->assertFalse( $product->is_type( 'external' ) );
 
 		// Delete product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 
 	/**
@@ -201,18 +131,18 @@ class Product_Simple extends \WC_Unit_Test_Case {
 	 */
 	public function test_is_downloadable() {
 		// Create product
-		$product = \WC_Helper_Product::create_simple_product();
+		$product = WC_Helper_Product::create_simple_product();
 
 		$this->assertEmpty( $product->is_downloadable() );
 
-		$product->downloadable = 'yes';
+		$product->set_downloadable( 'yes' );
 		$this->assertTrue( $product->is_downloadable() );
 
-		$product->downloadable = 'no';
+		$product->set_downloadable( 'no' );
 		$this->assertFalse( $product->is_downloadable() );
 
 		// Delete product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 
 	/**
@@ -222,18 +152,18 @@ class Product_Simple extends \WC_Unit_Test_Case {
 	 */
 	public function test_is_virtual() {
 		// Create product
-		$product = \WC_Helper_Product::create_simple_product();
+		$product = WC_Helper_Product::create_simple_product();
 
 		$this->assertEmpty( $product->is_virtual() );
 
-		$product->virtual = 'yes';
+		$product->set_virtual( 'yes' );
 		$this->assertTrue( $product->is_virtual() );
 
-		$product->virtual = 'no';
+		$product->set_virtual( 'no' );
 		$this->assertFalse( $product->is_virtual() );
 
 		// Delete product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 
 	/**
@@ -243,16 +173,16 @@ class Product_Simple extends \WC_Unit_Test_Case {
 	 */
 	public function test_needs_shipping() {
 		// Create product
-		$product = \WC_Helper_Product::create_simple_product();
+		$product = WC_Helper_Product::create_simple_product();
 
-		$product->virtual = 'yes';
+		$product->set_virtual( 'yes' );
 		$this->assertFalse( $product->needs_shipping() );
 
-		$product->virtual = 'no';
+		$product->set_virtual( 'no' );
 		$this->assertTrue( $product->needs_shipping() );
 
 		// Delete product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 
 	/**
@@ -262,16 +192,16 @@ class Product_Simple extends \WC_Unit_Test_Case {
 	 */
 	public function test_is_sold_individually() {
 		// Create product
-		$product = \WC_Helper_Product::create_simple_product();
+		$product = WC_Helper_Product::create_simple_product();
 
-		$product->sold_individually = 'yes';
+		$product->set_sold_individually( 'yes' );
 		$this->assertTrue( $product->is_sold_individually() );
 
-		$product->sold_individually = 'no';
+		$product->set_sold_individually( 'no' );
 		$this->assertFalse( $product->is_sold_individually() );
 
 		// Delete product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 
 	/**
@@ -281,19 +211,19 @@ class Product_Simple extends \WC_Unit_Test_Case {
 	 */
 	public function test_backorders_allowed() {
 		// Create product
-		$product = \WC_Helper_Product::create_simple_product();
+		$product = WC_Helper_Product::create_simple_product();
 
-		$product->backorders = 'yes';
+		$product->set_backorders( 'yes' );
 		$this->assertTrue( $product->backorders_allowed() );
 
-		$product->backorders = 'notify';
+		$product->set_backorders( 'notify' );
 		$this->assertTrue( $product->backorders_allowed() );
 
-		$product->backorders = 'no';
+		$product->set_backorders( 'no' );
 		$this->assertFalse( $product->backorders_allowed() );
 
 		// Delete product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 
 	/**
@@ -303,23 +233,23 @@ class Product_Simple extends \WC_Unit_Test_Case {
 	 */
 	public function test_backorders_require_notification() {
 		// Create product
-		$product = \WC_Helper_Product::create_simple_product();
+		$product = WC_Helper_Product::create_simple_product();
 
-		$product->backorders = 'notify';
-		$product->manage_stock = 'yes';
+		$product->set_backorders( 'notify' );
+		$product->set_manage_stock( 'yes' );
 		$this->assertTrue( $product->backorders_require_notification() );
 
-		$product->backorders = 'yes';
+		$product->set_backorders( 'yes' );
 		$this->assertFalse( $product->backorders_require_notification() );
 
-		$product->backorders = 'no';
+		$product->set_backorders( 'no' );
 		$this->assertFalse( $product->backorders_require_notification() );
 
-		$product->backorders = 'yes';
-		$product->manage_stock = 'no';
+		$product->set_backorders( 'yes' );
+		$product->set_manage_stock( 'no' );
 		$this->assertFalse( $product->backorders_require_notification() );
 
 		// Delete product
-		\WC_Helper_Product::delete_product( $product->id );
+		WC_Helper_Product::delete_product( $product->get_id() );
 	}
 }
diff --git a/tests/unit-tests/product/product-variation.php b/tests/unit-tests/product/product-variation.php
new file mode 100644
index 00000000000..1f682226371
--- /dev/null
+++ b/tests/unit-tests/product/product-variation.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Class Product_Variation.
+ * @package WooCommerce\Tests\Product
+ * @since 3.0
+ */
+class WC_Tests_Product_Variation extends WC_Unit_Test_Case {
+
+	/**
+	 * Test is_sold_individually().
+	 *
+	 * @since 2.3
+	 */
+	public function test_is_sold_individually() {
+		// Create a variable product with sold individually.
+		$product = new WC_Product_Variable;
+		$product->set_sold_individually( true );
+		$product->save();
+
+		$variation = new WC_Product_Variation;
+		$variation->set_parent_id( $product->get_id() );
+		$variation->save();
+
+		$variation = wc_get_product( $variation->get_id() );
+		$this->assertTrue( $variation->is_sold_individually() );
+	}
+}
diff --git a/tests/unit-tests/settings/register-wp-admin-settings.php b/tests/unit-tests/settings/register-wp-admin-settings.php
new file mode 100644
index 00000000000..66fc6bd5d1d
--- /dev/null
+++ b/tests/unit-tests/settings/register-wp-admin-settings.php
@@ -0,0 +1,256 @@
+<?php
+
+/**
+ * Settings API: WP-Admin Helper Tests
+ * Tests the helper class that makes settings (currently present in wp-admin)
+ * avaiable to the REST API.
+ *
+ * @package WooCommerce\Tests\Settings
+ * @since 3.0.0
+ */
+class WC_Tests_Register_WP_Admin_Settings extends WC_Unit_Test_Case {
+
+	/**
+	 * @var WC_Settings_Page $page
+	 */
+	protected $page;
+
+	/**
+	 * Initialize a WC_Settings_Page for testing
+	 */
+	public function setUp() {
+		parent::setUp();
+
+		// $mock_page = $this->getMock( 'WC_Settings_General' );
+		$mock_page = $this->getMockBuilder( 'WC_Settings_General' )->getMock();
+
+		$mock_page
+			->expects( $this->any() )
+			->method( 'get_id' )
+			->will( $this->returnValue( 'page-id' ) );
+
+		$mock_page
+			->expects( $this->any() )
+			->method( 'get_label' )
+			->will( $this->returnValue( 'Page Label' ) );
+
+		$this->page = $mock_page;
+	}
+
+	/**
+	 * @since 3.0.0
+	 * @covers WC_Register_WP_Admin_Settings::__construct
+	 */
+	public function test_constructor() {
+		$settings = new WC_Register_WP_Admin_Settings( $this->page, 'page' );
+
+		$this->assertEquals( has_filter( 'woocommerce_settings_groups', array( $settings, 'register_page_group' ) ), 10 );
+		$this->assertEquals( has_filter( 'woocommerce_settings-' . $this->page->get_id(), array( $settings, 'register_page_settings' ) ), 10 );
+	}
+
+	/**
+	 * @since 3.0.0
+	 * @covers WC_Register_WP_Admin_Settings::register_page_group
+	 */
+	public function test_register_group() {
+		$settings = new WC_Register_WP_Admin_Settings( $this->page, 'page' );
+
+		$existing = array(
+			'id'    => 'existing-id',
+			'label' => 'Existing Group',
+		);
+		$initial  = array( $existing );
+		$expected = array(
+			$existing,
+			array(
+				'id'    => $this->page->get_id(),
+				'label' => $this->page->get_label(),
+			),
+		);
+		$actual = $settings->register_page_group( $initial );
+
+		$this->assertEquals( $expected, $actual );
+	}
+
+	/**
+	 * @since 3.0.0
+	 */
+	public function register_setting_provider() {
+		return array(
+			// No "id" case
+			array(
+				array(
+					'type'       => 'some-type-with-no-id',
+					'option_key' => '',
+				),
+				false,
+			),
+			// All optional properties except 'desc_tip'
+			array(
+				array(
+					'id'         => 'setting-id',
+					'type'       => 'select',
+					'title'      => 'Setting Name',
+					'desc'       => 'Setting Description',
+					'default'    => 'one',
+					'options'    => array( 'one', 'two' ),
+					'option_key' => '',
+				),
+				array(
+					'id'          => 'setting-id',
+					'type'        => 'select',
+					'label'       => 'Setting Name',
+					'description' => 'Setting Description',
+					'default'     => 'one',
+					'options'     => array( 'one', 'two' ),
+					'option_key'  => '',
+				),
+			),
+			// Boolean 'desc_tip' defaulting to 'desc' value
+			array(
+				array(
+					'id'        => 'setting-id',
+					'type'      => 'select',
+					'title'     => 'Setting Name',
+					'desc'      => 'Setting Description',
+					'desc_tip'  => true,
+					'option_key' => '',
+				),
+				array(
+					'id'          => 'setting-id',
+					'type'        => 'select',
+					'label'       => 'Setting Name',
+					'description' => 'Setting Description',
+					'tip'         => 'Setting Description',
+					'option_key'  => '',
+				),
+			),
+			// String 'desc_tip'
+			array(
+				array(
+					'id'         => 'setting-id',
+					'type'       => 'select',
+					'title'      => 'Setting Name',
+					'desc'       => 'Setting Description',
+					'desc_tip'   => 'Setting Tip',
+					'option_key' => '',
+				),
+				array(
+					'id'          => 'setting-id',
+					'type'        => 'select',
+					'label'       => 'Setting Name',
+					'description' => 'Setting Description',
+					'tip'         => 'Setting Tip',
+					'option_key'  => '',
+				),
+			),
+			// Empty 'title' and 'desc'
+			array(
+				array(
+					'id'         => 'setting-id',
+					'type'       => 'select',
+					'option_key' => '',
+				),
+				array(
+					'id'          => 'setting-id',
+					'type'        => 'select',
+					'label'       => '',
+					'description' => '',
+					'option_key'  => '',
+				),
+			),
+		);
+	}
+
+	/**
+	 * @since 3.0.0
+	 * @dataProvider register_setting_provider
+	 * @covers WC_Register_WP_Admin_Settings::register_setting
+	 */
+	public function test_register_setting( $input, $expected ) {
+		$settings = new WC_Register_WP_Admin_Settings( $this->page, 'page' );
+
+		$actual = $settings->register_setting( $input );
+
+		$this->assertEquals( $expected, $actual );
+	}
+
+	/**
+	 * @since 3.0.0
+	 * @covers WC_Register_WP_Admin_Settings::register_page_settings
+	 */
+	public function test_register_settings_one_section() {
+		$this->page
+			->expects( $this->any() )
+			->method( 'get_sections' )
+			->will( $this->returnValue( array() ) );
+
+		$this->page
+			->expects( $this->once() )
+			->method( 'get_settings' )
+			->with( $this->equalTo( 0 ) )
+			->will( $this->returnValue( array() ) );
+
+		$settings = new WC_Register_WP_Admin_Settings( $this->page, 'page' );
+
+		$expected = array();
+		$actual   = $settings->register_page_settings( array() );
+
+		$this->assertEquals( $expected, $actual );
+	}
+
+	/**
+	 * @since 3.0.0
+	 * @covers WC_Register_WP_Admin_Settings::register_page_settings
+	 */
+	public function test_register_settings() {
+		$this->page
+			->expects( $this->any() )
+			->method( 'get_sections' )
+			->will( $this->returnValue( array() ) );
+
+		$settings = array(
+			array(
+				'id'          => 'setting-1',
+				'type'        => 'text',
+				'option_key'  => '',
+			),
+			array(
+				'type'        => 'no-id',
+				'option_key'  => '',
+			),
+			array(
+				'id'          => 'setting-2',
+				'type'        => 'textarea',
+				'option_key'  => '',
+			),
+		);
+
+		$this->page
+			->expects( $this->any() )
+			->method( 'get_settings' )
+			->will( $this->returnValue( $settings ) );
+
+		$settings = new WC_Register_WP_Admin_Settings( $this->page, 'page' );
+
+		$expected = array(
+			array(
+				'id'          => 'setting-1',
+				'type'        => 'text',
+				'label'       => '',
+				'description' => '',
+				'option_key'  => 'setting-1',
+			),
+			array(
+				'id'          => 'setting-2',
+				'type'        => 'textarea',
+				'label'       => '',
+				'description' => '',
+				'option_key'  => 'setting-2',
+			),
+		);
+		$actual = $settings->register_page_settings( array() );
+
+		$this->assertEquals( $expected, $actual );
+	}
+}
diff --git a/tests/unit-tests/shipping-zones/shipping-zone.php b/tests/unit-tests/shipping-zones/shipping-zone.php
new file mode 100644
index 00000000000..4dc1a1c2c89
--- /dev/null
+++ b/tests/unit-tests/shipping-zones/shipping-zone.php
@@ -0,0 +1,361 @@
+<?php
+
+/**
+ * Class Shipping_Zone.
+ * @package WooCommerce\Tests\Shipping_Zone
+ */
+class WC_Tests_Shipping_Zone extends WC_Unit_Test_Case {
+
+	/**
+	 * Test: WC_Shipping_Zone::get_data
+	 */
+	public function test_get_data() {
+		// Setup
+		WC_Helper_Shipping_Zones::create_mock_zones();
+
+		// Test
+		$zone = WC_Shipping_Zones::get_zone( 1 );
+		$data = $zone->get_data();
+
+		// Assert
+		$this->assertTrue( is_array( $data ) );
+
+		// Clean
+		WC_Helper_Shipping_Zones::remove_mock_zones();
+	}
+
+	/**
+	 * Test: WC_Shipping_Zones::get_id
+	 */
+	public function test_get_zone_id() {
+		// Setup
+		WC_Helper_Shipping_Zones::create_mock_zones();
+
+		// Test
+		$zone = WC_Shipping_Zones::get_zone( 1 );
+
+		// Assert
+		$this->assertEquals( $zone->get_id(), 1 );
+
+		// Clean
+		WC_Helper_Shipping_Zones::remove_mock_zones();
+	}
+
+	/**
+	 * Test: WC_Shipping_Zones::get_zone_name
+	 */
+	public function test_get_zone_name() {
+		// Setup
+		WC_Helper_Shipping_Zones::create_mock_zones();
+
+		// Test
+		$zone = WC_Shipping_Zones::get_zone( 1 );
+
+		// Assert
+		$this->assertEquals( $zone->get_zone_name(), 'Local' );
+
+		// Clean
+		WC_Helper_Shipping_Zones::remove_mock_zones();
+	}
+
+	/**
+	 * Test: WC_Shipping_Zones::get_zone_order
+	 */
+	public function test_get_zone_order() {
+		// Setup
+		WC_Helper_Shipping_Zones::create_mock_zones();
+
+		// Test
+		$zone = WC_Shipping_Zones::get_zone( 1 );
+
+		// Assert
+		$this->assertEquals( $zone->get_zone_order(), 1 );
+
+		// Clean
+		WC_Helper_Shipping_Zones::remove_mock_zones();
+	}
+
+	/**
+	 * Test: WC_Shipping_Zones::get_zone_locations
+	 */
+	public function test_get_zone_locations() {
+		// Setup
+		WC_Helper_Shipping_Zones::create_mock_zones();
+
+		// Test
+		$zone = WC_Shipping_Zones::get_zone( 1 );
+
+		// Assert
+		$this->assertTrue( is_array( $zone->get_zone_locations() ) );
+		$this->assertTrue( 2 === sizeof( $zone->get_zone_locations() ) );
+
+		// Clean
+		WC_Helper_Shipping_Zones::remove_mock_zones();
+	}
+
+	/**
+	 * Test: WC_Shipping_Zones::get_formatted_location
+	 */
+	public function test_get_formatted_location() {
+		// Setup
+		WC_Helper_Shipping_Zones::create_mock_zones();
+
+		// Test
+		$zone = WC_Shipping_Zones::get_zone( 1 );
+
+		// Assert
+		$this->assertEquals( $zone->get_formatted_location(), 'United Kingdom (UK), CB*' );
+
+		// Test
+		$zone = WC_Shipping_Zones::get_zone( 2 );
+
+		// Assert
+		$this->assertEquals( $zone->get_formatted_location(), 'Europe' );
+
+		// Test
+		$zone = WC_Shipping_Zones::get_zone( 3 );
+
+		// Assert
+		$this->assertEquals( $zone->get_formatted_location(), 'California' );
+
+		// Test
+		$zone = WC_Shipping_Zones::get_zone( 4 );
+
+		// Assert
+		$this->assertEquals( $zone->get_formatted_location(), 'United States (US)' );
+
+		// Clean
+		WC_Helper_Shipping_Zones::remove_mock_zones();
+	}
+
+	/**
+	 * Test: WC_Shipping_Zone::get_shipping_methods
+	 */
+	public function test_get_shipping_methods() {
+		// Setup
+		WC_Helper_Shipping_Zones::create_mock_zones();
+
+		// Test
+		$zone = WC_Shipping_Zones::get_zone( 1 );
+		$zone->add_shipping_method( 'flat_rate' );
+		$methods = $zone->get_shipping_methods();
+
+		// Assert
+		$this->assertTrue( 1 === sizeof( $methods ) );
+		$this->assertInstanceOf( 'WC_Shipping_Method', current( $methods ) );
+
+		// Clean
+		WC_Helper_Shipping_Zones::remove_mock_zones();
+	}
+
+	/**
+	 * Test: WC_Shipping_Zone::set_zone_name
+	 */
+	public function test_set_zone_name() {
+		// Setup
+		WC_Helper_Shipping_Zones::create_mock_zones();
+
+		// Test
+		$zone = WC_Shipping_Zones::get_zone( 1 );
+		$zone->set_zone_name( 'I am a fish' );
+
+		// Assert
+		$this->assertEquals( $zone->get_zone_name(), 'I am a fish' );
+
+		// Clean
+		WC_Helper_Shipping_Zones::remove_mock_zones();
+	}
+
+	/**
+	 * Test: WC_Shipping_Zone::set_zone_order
+	 */
+	public function test_set_zone_order() {
+		// Setup
+		WC_Helper_Shipping_Zones::create_mock_zones();
+
+		// Test
+		$zone = WC_Shipping_Zones::get_zone( 1 );
+		$zone->set_zone_order( 100 );
+
+		// Assert
+		$this->assertEquals( $zone->get_zone_order(), 100 );
+
+		// Clean
+		WC_Helper_Shipping_Zones::remove_mock_zones();
+	}
+
+	/**
+	 * Test: WC_Shipping_Zone::is_valid_location_type
+	 */
+	public function test_is_valid_location_type() {
+		// Setup
+		WC_Helper_Shipping_Zones::create_mock_zones();
+
+		// Test
+		$zone = WC_Shipping_Zones::get_zone( 1 );
+
+		// Assert
+		$this->assertEquals( $zone->get_zone_order(), 1 );
+
+		// Clean
+		WC_Helper_Shipping_Zones::remove_mock_zones();
+	}
+
+	/**
+	 * Test: WC_Shipping_Zone::add_location
+	 */
+	public function test_add_location() {
+		// Setup
+		WC_Helper_Shipping_Zones::create_mock_zones();
+
+		// Test
+		$zone = WC_Shipping_Zones::get_zone( 1 );
+
+		// Assert
+		$this->assertTrue( $zone->is_valid_location_type( 'state' ) );
+		$this->assertTrue( $zone->is_valid_location_type( 'country' ) );
+		$this->assertTrue( $zone->is_valid_location_type( 'continent' ) );
+		$this->assertTrue( $zone->is_valid_location_type( 'postcode' ) );
+		$this->assertFalse( $zone->is_valid_location_type( 'poop' ) );
+
+		// Clean
+		WC_Helper_Shipping_Zones::remove_mock_zones();
+	}
+
+	/**
+	 * Test: WC_Shipping_Zone::clear_locations
+	 */
+	public function test_clear_locations() {
+		// Setup
+		WC_Helper_Shipping_Zones::create_mock_zones();
+
+		// Test
+		$zone = WC_Shipping_Zones::get_zone( 1 );
+		$zone->clear_locations();
+
+		// Assert
+		$zone_locations = $zone->get_zone_locations();
+		$this->assertTrue( empty( $zone_locations ) );
+
+		// Clean
+		WC_Helper_Shipping_Zones::remove_mock_zones();
+	}
+
+	/**
+	 * Test: WC_Shipping_Zone::set_locations
+	 */
+	public function test_set_locations() {
+		// Setup
+		WC_Helper_Shipping_Zones::create_mock_zones();
+
+		// Test
+		$zone = WC_Shipping_Zones::get_zone( 1 );
+		$zone->clear_locations();
+		$zone->set_locations( array(
+			array(
+				'code' => 'US',
+				'type' => 'country',
+			),
+			array(
+				'code' => '90210',
+				'type' => 'postcode',
+			),
+		) );
+
+		// Assert
+		$this->assertEquals( $zone->get_zone_locations(), array(
+			0 => (object) array(
+				'code' => 'US',
+				'type' => 'country',
+			),
+			1 => (object) array(
+				'code' => '90210',
+				'type' => 'postcode',
+			),
+		) );
+
+		// Clean
+		WC_Helper_Shipping_Zones::remove_mock_zones();
+	}
+
+	/**
+	 * Test: WC_Shipping_Zone::save
+	 */
+	public function test_save() {
+		// Setup
+		WC_Helper_Shipping_Zones::create_mock_zones();
+
+		// Test
+		$zone = WC_Shipping_Zones::get_zone( 1 );
+		$zone->set_zone_name( 'I am a fish' );
+		$zone->save();
+		$zone = WC_Shipping_Zones::get_zone( 1 );
+
+		// Assert
+		$this->assertEquals( $zone->get_zone_name(), 'I am a fish' );
+
+		// Clean
+		WC_Helper_Shipping_Zones::remove_mock_zones();
+	}
+
+	/**
+	 * Test: WC_Shipping_Zone::add_shipping_method
+	 */
+	public function test_add_shipping_method() {
+		// Setup
+		WC_Helper_Shipping_Zones::create_mock_zones();
+
+		// Test
+		$zone        = WC_Shipping_Zones::get_zone( 1 );
+		$zone->add_shipping_method( 'flat_rate' );
+		$zone->add_shipping_method( 'free_shipping' );
+
+		// Assert
+		$methods = $zone->get_shipping_methods();
+
+		// Assert
+		$this->assertTrue( 2 === sizeof( $methods ) );
+		$this->assertInstanceOf( 'WC_Shipping_Method', current( $methods ) );
+
+		// Clean
+		WC_Helper_Shipping_Zones::remove_mock_zones();
+	}
+
+	/**
+	 * Test legacy zone functions.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @expectedDeprecated WC_Shipping_Zone::read
+	 * @expectedDeprecated WC_Shipping_Zone::create
+	 * @expectedDeprecated WC_Shipping_Zone::update
+	 */
+	public function test_wc_shipping_zone_legacy() {
+		// Create a single zone.
+		$zone = new WC_Shipping_Zone();
+		$zone->set_zone_name( 'Local' );
+		$zone->set_zone_order( 1 );
+		$zone->add_location( 'GB', 'country' );
+		$zone->add_location( 'CB*', 'postcode' );
+		$zone->save();
+		$zone_id = $zone->get_id();
+
+		$zone_read = new WC_Shipping_Zone();
+		$zone_read->read( $zone_id );
+		$this->assertEquals( $zone_id, $zone_read->get_id() );
+
+		$zone = new WC_Shipping_Zone();
+		$zone->set_zone_name( 'Test' );
+		$zone->set_zone_order( 2 );
+		$zone->create();
+
+		$this->assertEquals( 'Test', $zone->get_zone_name() );
+		$this->assertNotEmpty( $zone->get_id() );
+
+		$zone->set_zone_name( 'Test 2' );
+		$zone->update();
+
+		$this->assertEquals( 'Test 2', $zone->get_zone_name() );
+	}
+
+}
diff --git a/tests/unit-tests/shipping-zones/shipping-zones.php b/tests/unit-tests/shipping-zones/shipping-zones.php
new file mode 100644
index 00000000000..5fd81d1ba14
--- /dev/null
+++ b/tests/unit-tests/shipping-zones/shipping-zones.php
@@ -0,0 +1,155 @@
+<?php
+
+/**
+ * Class Shipping_Zones.
+ * @package WooCommerce\Tests\Shipping_Zones
+ */
+class WC_Tests_Shipping_Zones extends WC_Unit_Test_Case {
+
+	/**
+	 * Test: WC_Shipping_Zones::get_zones
+	 */
+	public function test_get_zones() {
+		// Setup
+		WC_Helper_Shipping_Zones::create_mock_zones();
+
+		// Test
+		$zones = WC_Shipping_Zones::get_zones();
+
+		// Assert
+		$this->assertTrue( is_array( $zones ) );
+		$this->assertTrue( 4 === sizeof( $zones ) );
+
+		// Clean
+		WC_Helper_Shipping_Zones::remove_mock_zones();
+	}
+
+	/**
+	 * Test: WC_Shipping_Zones::get_zone
+	 */
+	public function test_get_zone() {
+		// Setup
+		WC_Helper_Shipping_Zones::create_mock_zones();
+
+		// Test
+		$zone = WC_Shipping_Zones::get_zone( 1 );
+
+		// Assert that the first zone is our local zone
+		$this->assertInstanceOf( 'WC_Shipping_Zone', $zone );
+		$this->assertEquals( $zone->get_zone_name(), 'Local' );
+
+		// Clean
+		WC_Helper_Shipping_Zones::remove_mock_zones();
+	}
+
+	/**
+	 * Test: WC_Shipping_Zones::get_zone_by
+	 */
+	public function test_get_zone_by() {
+		// Setup
+		WC_Helper_Shipping_Zones::create_mock_zones();
+
+		// Test
+		$zone = WC_Shipping_Zones::get_zone_by( 'zone_id', 2 );
+
+		// Assert
+		$this->assertInstanceOf( 'WC_Shipping_Zone', $zone );
+		$this->assertEquals( $zone->get_zone_name(), 'Europe' );
+
+		// Test instance_id
+		$instance_id = $zone->add_shipping_method( 'flat_rate' );
+
+		$zone = WC_Shipping_Zones::get_zone_by( 'instance_id', $instance_id );
+
+		// Assert
+		$this->assertInstanceOf( 'WC_Shipping_Zone', $zone );
+		$this->assertEquals( $zone->get_zone_name(), 'Europe' );
+
+		// Clean
+		WC_Helper_Shipping_Zones::remove_mock_zones();
+	}
+
+	/**
+	 * Test: WC_Shipping_Zones::get_shipping_method
+	 */
+	public function test_get_shipping_method() {
+		// Setup
+		WC_Helper_Shipping_Zones::create_mock_zones();
+
+		// Test
+		$zone            = WC_Shipping_Zones::get_zone_by( 'zone_id', 1 );
+		$instance_id     = $zone->add_shipping_method( 'flat_rate' );
+		$shipping_method = WC_Shipping_Zones::get_shipping_method( $instance_id );
+
+		// Assert
+		$this->assertInstanceOf( 'WC_Shipping_Flat_Rate', $shipping_method );
+
+		// Clean
+		WC_Helper_Shipping_Zones::remove_mock_zones();
+	}
+
+	/**
+	 * Test: WC_Shipping_Zones::delete_zone
+	 */
+	public function test_delete_zone() {
+		// Setup
+		WC_Helper_Shipping_Zones::create_mock_zones();
+
+		// Test
+		WC_Shipping_Zones::delete_zone( 1 );
+		$zones = WC_Shipping_Zones::get_zones();
+
+		// Assert
+		$this->assertTrue( 3 === sizeof( $zones ) );
+
+		// Clean
+		WC_Helper_Shipping_Zones::remove_mock_zones();
+	}
+
+	/**
+	 * Test: WC_Shipping_Zones::get_zone_matching_package
+	 */
+	public function test_get_zone_matching_package() {
+		// Setup
+		WC_Helper_Shipping_Zones::create_mock_zones();
+
+		// Test
+		$zone1 = WC_Shipping_Zones::get_zone_matching_package( array(
+			'destination' => array(
+				'country'  => 'GB',
+				'state'    => 'Cambs',
+				'postcode' => 'CB23 1GG',
+			),
+		) );
+		$zone2 = WC_Shipping_Zones::get_zone_matching_package( array(
+			'destination' => array(
+				'country'  => 'GB',
+				'state'    => 'Cambs',
+				'postcode' => 'PE12 1BG',
+			),
+		) );
+		$zone3 = WC_Shipping_Zones::get_zone_matching_package( array(
+			'destination' => array(
+				'country'  => 'US',
+				'state'    => 'CA',
+				'postcode' => '90210',
+			),
+		) );
+		$zone4 = WC_Shipping_Zones::get_zone_matching_package( array(
+			'destination' => array(
+				'country'  => 'US',
+				'state'    => 'AL',
+				'postcode' => '12345',
+			),
+		) );
+
+		// Assert
+		$this->assertEquals( 'Local', $zone1->get_zone_name() );
+		$this->assertEquals( 'Europe', $zone2->get_zone_name() );
+		$this->assertEquals( 'California', $zone3->get_zone_name() );
+		$this->assertEquals( 'US', $zone4->get_zone_name() );
+
+		// Clean
+		WC_Helper_Shipping_Zones::remove_mock_zones();
+	}
+}
diff --git a/tests/unit-tests/tax/tax.php b/tests/unit-tests/tax/tax.php
index bf6f033f89a..f949570b87f 100644
--- a/tests/unit-tests/tax/tax.php
+++ b/tests/unit-tests/tax/tax.php
@@ -1,11 +1,10 @@
 <?php
-namespace WooCommerce\Tests\Tax;
 
 /**
  * Class Tax.
  * @package WooCommerce\Tests\Tax
  */
-class Tax extends \WC_Unit_Test_Case {
+class WC_Tests_Tax extends WC_Unit_Test_Case {
 
 	/**
 	 * Get rates.
@@ -16,7 +15,7 @@ class Tax extends \WC_Unit_Test_Case {
 		$wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rates" );
 		$wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rate_locations" );
 
-		$customer_location = \WC_Tax::get_tax_location();
+		$customer_location = WC_Tax::get_tax_location();
 		$tax_rate          = array(
 			'tax_rate_country'  => $customer_location[0],
 			'tax_rate_state'    => '',
@@ -26,16 +25,16 @@ class Tax extends \WC_Unit_Test_Case {
 			'tax_rate_compound' => '0',
 			'tax_rate_shipping' => '1',
 			'tax_rate_order'    => '1',
-			'tax_rate_class'    => ''
+			'tax_rate_class'    => '',
 		);
 
-		$tax_rate_id = \WC_Tax::_insert_tax_rate( $tax_rate );
+		$tax_rate_id = WC_Tax::_insert_tax_rate( $tax_rate );
 
-		$tax_rates = \WC_Tax::get_rates();
+		$tax_rates = WC_Tax::get_rates();
 
 		$this->assertEquals( $tax_rates, array( $tax_rate_id => array( 'rate' => '20.0000', 'label' => 'VAT', 'shipping' => 'yes', 'compound' => 'no' ) ) );
 
-		\WC_Tax::_delete_tax_rate( $tax_rate_id );
+		WC_Tax::_delete_tax_rate( $tax_rate_id );
 	}
 
 	/**
@@ -47,7 +46,7 @@ class Tax extends \WC_Unit_Test_Case {
 		$wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rates" );
 		$wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rate_locations" );
 
-		$customer_location = \WC_Tax::get_tax_location();
+		$customer_location = WC_Tax::get_tax_location();
 		$tax_rate = array(
 			'tax_rate_country'  => $customer_location[0],
 			'tax_rate_state'    => '',
@@ -57,16 +56,16 @@ class Tax extends \WC_Unit_Test_Case {
 			'tax_rate_compound' => '0',
 			'tax_rate_shipping' => '1',
 			'tax_rate_order'    => '1',
-			'tax_rate_class'    => ''
+			'tax_rate_class'    => '',
 		);
 
-		$tax_rate_id = \WC_Tax::_insert_tax_rate( $tax_rate );
+		$tax_rate_id = WC_Tax::_insert_tax_rate( $tax_rate );
 
-		$tax_rates = \WC_Tax::get_shipping_tax_rates();
+		$tax_rates = WC_Tax::get_shipping_tax_rates();
 
 		$this->assertEquals( $tax_rates, array( $tax_rate_id => array( 'rate' => '20.0000', 'label' => 'VAT', 'shipping' => 'yes', 'compound' => 'no' ) ) );
 
-		\WC_Tax::_delete_tax_rate( $tax_rate_id );
+		WC_Tax::_delete_tax_rate( $tax_rate_id );
 	}
 
 	/**
@@ -87,16 +86,16 @@ class Tax extends \WC_Unit_Test_Case {
 			'tax_rate_compound' => '0',
 			'tax_rate_shipping' => '1',
 			'tax_rate_order'    => '1',
-			'tax_rate_class'    => ''
+			'tax_rate_class'    => '',
 		);
 
-		$tax_rate_id = \WC_Tax::_insert_tax_rate( $tax_rate );
+		$tax_rate_id = WC_Tax::_insert_tax_rate( $tax_rate );
 
-		$tax_rates = \WC_Tax::get_base_tax_rates();
+		$tax_rates = WC_Tax::get_base_tax_rates();
 
 		$this->assertEquals( $tax_rates, array( $tax_rate_id => array( 'rate' => '20.0000', 'label' => 'VAT', 'shipping' => 'yes', 'compound' => 'no' ) ) );
 
-		\WC_Tax::_delete_tax_rate( $tax_rate_id );
+		WC_Tax::_delete_tax_rate( $tax_rate_id );
 	}
 
 	/**
@@ -117,22 +116,22 @@ class Tax extends \WC_Unit_Test_Case {
 			'tax_rate_compound' => '0',
 			'tax_rate_shipping' => '1',
 			'tax_rate_order'    => '1',
-			'tax_rate_class'    => ''
+			'tax_rate_class'    => '',
 		);
 
-		$tax_rate_id = \WC_Tax::_insert_tax_rate( $tax_rate );
+		$tax_rate_id = WC_Tax::_insert_tax_rate( $tax_rate );
 
-		$tax_rates = \WC_Tax::find_rates( array(
+		$tax_rates = WC_Tax::find_rates( array(
 			'country'   => 'GB',
 			'state'     => 'Cambs',
 			'postcode'  => 'PE14 1XX',
 			'city'      => 'Somewhere',
-			'tax_class' => ''
+			'tax_class' => '',
 		) );
 
 		$this->assertEquals( $tax_rates, array( $tax_rate_id => array( 'rate' => '20.0000', 'label' => 'VAT', 'shipping' => 'yes', 'compound' => 'no' ) ) );
 
-		\WC_Tax::_delete_tax_rate( $tax_rate_id );
+		WC_Tax::_delete_tax_rate( $tax_rate_id );
 	}
 
 	/**
@@ -153,22 +152,22 @@ class Tax extends \WC_Unit_Test_Case {
 			'tax_rate_compound' => '0',
 			'tax_rate_shipping' => '1',
 			'tax_rate_order'    => '1',
-			'tax_rate_class'    => ''
+			'tax_rate_class'    => '',
 		);
 
-		$tax_rate_id = \WC_Tax::_insert_tax_rate( $tax_rate );
+		$tax_rate_id = WC_Tax::_insert_tax_rate( $tax_rate );
 
-		$tax_rates = \WC_Tax::find_shipping_rates( array(
+		$tax_rates = WC_Tax::find_shipping_rates( array(
 			'country'   => 'GB',
 			'state'     => 'Cambs',
 			'postcode'  => 'PE14 1XX',
 			'city'      => 'Somewhere',
-			'tax_class' => ''
+			'tax_class' => '',
 		) );
 
 		$this->assertEquals( $tax_rates, array( $tax_rate_id => array( 'rate' => '20.0000', 'label' => 'VAT', 'shipping' => 'yes', 'compound' => 'no' ) ) );
 
-		\WC_Tax::_delete_tax_rate( $tax_rate_id );
+		WC_Tax::_delete_tax_rate( $tax_rate_id );
 	}
 
 	/**
@@ -189,33 +188,33 @@ class Tax extends \WC_Unit_Test_Case {
 			'tax_rate_compound' => '0',
 			'tax_rate_shipping' => '1',
 			'tax_rate_order'    => '1',
-			'tax_rate_class'    => ''
+			'tax_rate_class'    => '',
 		);
 
-		$tax_rate_id = \WC_Tax::_insert_tax_rate( $tax_rate );
+		$tax_rate_id = WC_Tax::_insert_tax_rate( $tax_rate );
 
-		$tax_rates = \WC_Tax::find_rates( array(
+		$tax_rates = WC_Tax::find_rates( array(
 			'country'   => 'GB',
 			'state'     => 'Cambs',
 			'postcode'  => 'PE14 1XX',
 			'city'      => 'Somewhere',
-			'tax_class' => ''
+			'tax_class' => '',
 		) );
 
-		$calced_tax = \WC_Tax::calc_tax( '9.99', $tax_rates, true, false );
+		$calced_tax = WC_Tax::calc_tax( '9.99', $tax_rates, true, false );
 
 		$this->assertEquals( $calced_tax, array( $tax_rate_id => '1.665' ) );
 
-		$calced_tax = \WC_Tax::calc_tax( '9.99', $tax_rates, false, false );
+		$calced_tax = WC_Tax::calc_tax( '9.99', $tax_rates, false, false );
 
 		$this->assertEquals( $calced_tax, array( $tax_rate_id => '1.998' ) );
 
-		\WC_Tax::_delete_tax_rate( $tax_rate_id );
+		WC_Tax::_delete_tax_rate( $tax_rate_id );
 	}
 
 	/**
-	* Test compound tax amounts
-	*/
+	 * Test compound tax amounts
+	 */
 	public function test_calc_compound_tax() {
 		global $wpdb;
 
@@ -234,7 +233,7 @@ class Tax extends \WC_Unit_Test_Case {
 		  'tax_rate_compound' => '0',
 		  'tax_rate_shipping' => '1',
 		  'tax_rate_order'    => '1',
-		  'tax_rate_class'    => ''
+		  'tax_rate_class'    => '',
 		);
 
 		$tax_rate_2 = array(
@@ -246,26 +245,26 @@ class Tax extends \WC_Unit_Test_Case {
 		  'tax_rate_compound' => '1',
 		  'tax_rate_shipping' => '1',
 		  'tax_rate_order'    => '2',
-		  'tax_rate_class'    => ''
+		  'tax_rate_class'    => '',
 		);
 
-		$tax_rate_1_id = \WC_Tax::_insert_tax_rate( $tax_rate_1 );
-		$tax_rate_2_id = \WC_Tax::_insert_tax_rate( $tax_rate_2 );
+		$tax_rate_1_id = WC_Tax::_insert_tax_rate( $tax_rate_1 );
+		$tax_rate_2_id = WC_Tax::_insert_tax_rate( $tax_rate_2 );
 
-		$tax_rates = \WC_Tax::find_rates( array(
+		$tax_rates = WC_Tax::find_rates( array(
 		  'country'   => 'CA',
 		  'state'     => 'QC',
 		  'postcode'  => '12345',
 		  'city'      => '',
-		  'tax_class' => ''
+		  'tax_class' => '',
 		) );
 
 		// prices exclusive of tax
-		$calced_tax = \WC_Tax::calc_tax( '100', $tax_rates, false, false );
+		$calced_tax = WC_Tax::calc_tax( '100', $tax_rates, false, false );
 		$this->assertEquals( $calced_tax, array( $tax_rate_1_id => '5.0000', $tax_rate_2_id => '8.925' ) );
 
 		// prices inclusive of tax
-		$calced_tax = \WC_Tax::calc_tax( '100', $tax_rates, true, false );
+		$calced_tax = WC_Tax::calc_tax( '100', $tax_rates, true, false );
 		/**
 		 * 100 is inclusive of all taxes.
 		 *
@@ -275,8 +274,8 @@ class Tax extends \WC_Unit_Test_Case {
 		 */
 		$this->assertEquals( $calced_tax, array( $tax_rate_1_id => 4.3889, $tax_rate_2_id => 7.8341 ) );
 
-		\WC_Tax::_delete_tax_rate( $tax_rate_1_id );
-		\WC_Tax::_delete_tax_rate( $tax_rate_2_id );
+		WC_Tax::_delete_tax_rate( $tax_rate_1_id );
+		WC_Tax::_delete_tax_rate( $tax_rate_2_id );
 		update_option( 'woocommerce_default_country', 'GB' );
 		update_option( 'woocommerce_default_state', '' );
 	}
@@ -299,24 +298,24 @@ class Tax extends \WC_Unit_Test_Case {
 			'tax_rate_compound' => '0',
 			'tax_rate_shipping' => '1',
 			'tax_rate_order'    => '1',
-			'tax_rate_class'    => ''
+			'tax_rate_class'    => '',
 		);
 
-		$tax_rate_id = \WC_Tax::_insert_tax_rate( $tax_rate );
+		$tax_rate_id = WC_Tax::_insert_tax_rate( $tax_rate );
 
-		$tax_rates = \WC_Tax::find_rates( array(
+		$tax_rates = WC_Tax::find_rates( array(
 			'country'   => 'GB',
 			'state'     => 'Cambs',
 			'postcode'  => 'PE14 1XX',
 			'city'      => 'Somewhere',
-			'tax_class' => ''
+			'tax_class' => '',
 		) );
 
-		$calced_tax = \WC_Tax::calc_shipping_tax( '10', $tax_rates );
+		$calced_tax = WC_Tax::calc_shipping_tax( '10', $tax_rates );
 
 		$this->assertEquals( $calced_tax, array( $tax_rate_id => '2' ) );
 
-		\WC_Tax::_delete_tax_rate( $tax_rate_id );
+		WC_Tax::_delete_tax_rate( $tax_rate_id );
 	}
 
 	/**
@@ -334,14 +333,14 @@ class Tax extends \WC_Unit_Test_Case {
 			'tax_rate_compound' => '1',
 			'tax_rate_shipping' => '1',
 			'tax_rate_order'    => '1',
-			'tax_rate_class'    => ''
+			'tax_rate_class'    => '',
 		);
 
-		$tax_rate_id = \WC_Tax::_insert_tax_rate( $tax_rate );
+		$tax_rate_id = WC_Tax::_insert_tax_rate( $tax_rate );
 
-		$this->assertEquals(\WC_Tax::get_rate_label( $tax_rate_id ), 'VAT' );
+		$this->assertEquals( WC_Tax::get_rate_label( $tax_rate_id ), 'VAT' );
 
-		\WC_Tax::_delete_tax_rate( $tax_rate_id );
+		WC_Tax::_delete_tax_rate( $tax_rate_id );
 	}
 
 	/**
@@ -359,14 +358,14 @@ class Tax extends \WC_Unit_Test_Case {
 			'tax_rate_compound' => '1',
 			'tax_rate_shipping' => '1',
 			'tax_rate_order'    => '1',
-			'tax_rate_class'    => ''
+			'tax_rate_class'    => '',
 		);
 
-		$tax_rate_id = \WC_Tax::_insert_tax_rate( $tax_rate );
+		$tax_rate_id = WC_Tax::_insert_tax_rate( $tax_rate );
 
-		$this->assertEquals(\WC_Tax::get_rate_percent( $tax_rate_id ), '20%' );
+		$this->assertEquals( WC_Tax::get_rate_percent( $tax_rate_id ), '20%' );
 
-		\WC_Tax::_delete_tax_rate( $tax_rate_id );
+		WC_Tax::_delete_tax_rate( $tax_rate_id );
 	}
 
 	/**
@@ -384,14 +383,14 @@ class Tax extends \WC_Unit_Test_Case {
 			'tax_rate_compound' => '1',
 			'tax_rate_shipping' => '1',
 			'tax_rate_order'    => '1',
-			'tax_rate_class'    => ''
+			'tax_rate_class'    => '',
 		);
 
-		$tax_rate_id = \WC_Tax::_insert_tax_rate( $tax_rate );
+		$tax_rate_id = WC_Tax::_insert_tax_rate( $tax_rate );
 
-		$this->assertEquals(\WC_Tax::get_rate_code( $tax_rate_id ), 'GB-VAT-1' );
+		$this->assertEquals( WC_Tax::get_rate_code( $tax_rate_id ), 'GB-VAT-1' );
 
-		\WC_Tax::_delete_tax_rate( $tax_rate_id );
+		WC_Tax::_delete_tax_rate( $tax_rate_id );
 	}
 
 	/**
@@ -409,21 +408,21 @@ class Tax extends \WC_Unit_Test_Case {
 			'tax_rate_compound' => '1',
 			'tax_rate_shipping' => '1',
 			'tax_rate_order'    => '1',
-			'tax_rate_class'    => ''
+			'tax_rate_class'    => '',
 		);
 
-		$tax_rate_id = \WC_Tax::_insert_tax_rate( $tax_rate );
+		$tax_rate_id = WC_Tax::_insert_tax_rate( $tax_rate );
 
-		$this->assertTrue(\WC_Tax::is_compound( $tax_rate_id ) );
+		$this->assertTrue( WC_Tax::is_compound( $tax_rate_id ) );
 
-		\WC_Tax::_delete_tax_rate( $tax_rate_id );
+		WC_Tax::_delete_tax_rate( $tax_rate_id );
 	}
 
 	/**
 	 * Test the rounding method.
 	 */
 	public function test_round() {
-		$this->assertEquals(\WC_Tax::round( '2.1234567' ), '2.1235' );
+		$this->assertEquals( WC_Tax::round( '2.1234567' ), '2.1235' );
 	}
 
 	/**
@@ -435,16 +434,18 @@ class Tax extends \WC_Unit_Test_Case {
 			'2' => '2',
 		);
 
-		$this->assertEquals(\WC_Tax::get_tax_total( $to_total ), '3.665' );
+		$this->assertEquals( WC_Tax::get_tax_total( $to_total ), '3.665' );
 	}
 
 	/**
 	 * Test getting the tax classes.
 	 */
 	public function test_get_tax_classes() {
-		$tax_classes = \WC_Tax::get_tax_classes();
+		$tax_classes = WC_Tax::get_tax_classes();
+		$this->assertEquals( $tax_classes, array( 'Reduced rate', 'Zero rate' ) );
 
-		$this->assertEquals( $tax_classes, array( 'Reduced Rate', 'Zero Rate' ) );
+		$tax_classes = WC_Tax::get_tax_class_slugs();
+		$this->assertEquals( $tax_classes, array( 'reduced-rate', 'zero-rate' ) );
 	}
 
 	/**
@@ -463,11 +464,11 @@ class Tax extends \WC_Unit_Test_Case {
 			'tax_rate_compound' => '0',
 			'tax_rate_shipping' => '1',
 			'tax_rate_order'    => '1',
-			'tax_rate_class'    => ''
+			'tax_rate_class'    => '',
 		);
 
 		// Run function
-		$tax_rate_id = \WC_Tax::_insert_tax_rate( $tax_rate );
+		$tax_rate_id = WC_Tax::_insert_tax_rate( $tax_rate );
 
 		$this->assertGreaterThan( 0, $tax_rate_id );
 
@@ -483,7 +484,7 @@ class Tax extends \WC_Unit_Test_Case {
 		$this->assertEquals( $new_row->tax_rate_order, '1' );
 		$this->assertEquals( $new_row->tax_rate_class, '' );
 
-		\WC_Tax::_delete_tax_rate( $tax_rate_id );
+		WC_Tax::_delete_tax_rate( $tax_rate_id );
 	}
 
 	/**
@@ -502,23 +503,23 @@ class Tax extends \WC_Unit_Test_Case {
 			'tax_rate_compound' => '0',
 			'tax_rate_shipping' => '1',
 			'tax_rate_order'    => '1',
-			'tax_rate_class'    => ''
+			'tax_rate_class'    => '',
 		);
 
 		// Run function
-		$tax_rate_id = \WC_Tax::_insert_tax_rate( $tax_rate );
+		$tax_rate_id = WC_Tax::_insert_tax_rate( $tax_rate );
 
 		// Update a rate
 		$tax_rate = array(
-			'tax_rate_country'  => 'US'
+			'tax_rate_country'  => 'US',
 		);
 
 		// Run function
-		\WC_Tax::_update_tax_rate( $tax_rate_id, $tax_rate );
+		WC_Tax::_update_tax_rate( $tax_rate_id, $tax_rate );
 
 		$this->assertNotFalse( $wpdb->last_result );
 
-		\WC_Tax::_delete_tax_rate( $tax_rate_id );
+		WC_Tax::_delete_tax_rate( $tax_rate_id );
 	}
 
 	/**
@@ -537,18 +538,18 @@ class Tax extends \WC_Unit_Test_Case {
 			'tax_rate_compound' => '0',
 			'tax_rate_shipping' => '1',
 			'tax_rate_order'    => '1',
-			'tax_rate_class'    => ''
+			'tax_rate_class'    => '',
 		);
 
 		// Run function
-		$tax_rate_id = \WC_Tax::_insert_tax_rate( $tax_rate );
+		$tax_rate_id = WC_Tax::_insert_tax_rate( $tax_rate );
 
 		// Run function
-		\WC_Tax::_delete_tax_rate( $tax_rate_id );
+		WC_Tax::_delete_tax_rate( $tax_rate_id );
 
 		$this->assertNotFalse( $wpdb->last_result );
 
-		\WC_Tax::_delete_tax_rate( $tax_rate_id );
+		WC_Tax::_delete_tax_rate( $tax_rate_id );
 	}
 
 	/**
@@ -557,7 +558,7 @@ class Tax extends \WC_Unit_Test_Case {
 	public function test__update_tax_rate_postcodes() {
 		global $wpdb;
 
-		$to_save = '12345;90210-90215';
+		$to_save = '12345;90210...90215';
 		$tax_rate          = array(
 			'tax_rate_country'  => 'GB',
 			'tax_rate_state'    => '',
@@ -567,19 +568,19 @@ class Tax extends \WC_Unit_Test_Case {
 			'tax_rate_compound' => '0',
 			'tax_rate_shipping' => '1',
 			'tax_rate_order'    => '1',
-			'tax_rate_class'    => ''
+			'tax_rate_class'    => '',
 		);
 
 		// Run function
-		$tax_rate_id = \WC_Tax::_insert_tax_rate( $tax_rate );
+		$tax_rate_id = WC_Tax::_insert_tax_rate( $tax_rate );
 
-		\WC_Tax::_update_tax_rate_postcodes( $tax_rate_id, $to_save );
+		WC_Tax::_update_tax_rate_postcodes( $tax_rate_id, $to_save );
 
 		$results = $wpdb->get_col( $wpdb->prepare( "SELECT location_code FROM {$wpdb->prefix}woocommerce_tax_rate_locations WHERE tax_rate_id = %d ORDER BY location_code ASC", $tax_rate_id ) );
 
-		$this->assertEquals( array( '12345', '90210', '90211', '90212', '90213', '90214', '90215' ), $results );
+		$this->assertEquals( array( '12345', '90210...90215' ), $results );
 
-		\WC_Tax::_delete_tax_rate( $tax_rate_id );
+		WC_Tax::_delete_tax_rate( $tax_rate_id );
 	}
 
 	/**
@@ -598,18 +599,18 @@ class Tax extends \WC_Unit_Test_Case {
 			'tax_rate_compound' => '0',
 			'tax_rate_shipping' => '1',
 			'tax_rate_order'    => '1',
-			'tax_rate_class'    => ''
+			'tax_rate_class'    => '',
 		);
 
 		// Run function
-		$tax_rate_id = \WC_Tax::_insert_tax_rate( $tax_rate );
+		$tax_rate_id = WC_Tax::_insert_tax_rate( $tax_rate );
 
-		\WC_Tax::_update_tax_rate_cities( $tax_rate_id, $to_save );
+		WC_Tax::_update_tax_rate_cities( $tax_rate_id, $to_save );
 
 		$results = $wpdb->get_col( $wpdb->prepare( "SELECT location_code FROM {$wpdb->prefix}woocommerce_tax_rate_locations WHERE tax_rate_id = %d ORDER BY location_code ASC", $tax_rate_id ) );
 
 		$this->assertEquals( array( 'SOMEWHERE', 'SOMEWHERE_ELSE' ), $results );
 
-		\WC_Tax::_delete_tax_rate( $tax_rate_id );
+		WC_Tax::_delete_tax_rate( $tax_rate_id );
 	}
 }
diff --git a/tests/unit-tests/util/conditional-functions.php b/tests/unit-tests/util/conditional-functions.php
index b76ed7e80f1..e79c5cd59e9 100644
--- a/tests/unit-tests/util/conditional-functions.php
+++ b/tests/unit-tests/util/conditional-functions.php
@@ -1,12 +1,11 @@
 <?php
-namespace WooCommerce\Tests\Util;
 
 /**
  * Class Conditional_Functions.
  * @package WooCommerce\Tests\Util
  * @since 2.3.0
  */
-class Conditional_Functions extends \WC_Unit_Test_Case {
+class WC_Tests_Conditional_Functions extends WC_Unit_Test_Case {
 
 	/**
 	 * Test is_store_notice_showing().
@@ -15,7 +14,7 @@ class Conditional_Functions extends \WC_Unit_Test_Case {
 	 */
 	public function test_is_store_notice_showing() {
 
-		$this->assertEquals( false, is_store_notice_showing() );
+		$this->assertFalse( is_store_notice_showing() );
 	}
 
 	/**
@@ -25,7 +24,7 @@ class Conditional_Functions extends \WC_Unit_Test_Case {
 	 */
 	public function test_wc_tax_enabled() {
 
-		$this->assertEquals( false, wc_tax_enabled() );
+		$this->assertFalse( wc_tax_enabled() );
 	}
 
 	/**
@@ -35,7 +34,7 @@ class Conditional_Functions extends \WC_Unit_Test_Case {
 	 */
 	public function test_wc_prices_include_tax() {
 
-		$this->assertEquals( false, wc_prices_include_tax() );
+		$this->assertFalse( wc_prices_include_tax() );
 	}
 
 	/**
@@ -50,19 +49,22 @@ class Conditional_Functions extends \WC_Unit_Test_Case {
 			array( true, wc_is_webhook_valid_topic( 'product.created' ) ),
 			array( true, wc_is_webhook_valid_topic( 'product.updated' ) ),
 			array( true, wc_is_webhook_valid_topic( 'product.deleted' ) ),
+			array( true, wc_is_webhook_valid_topic( 'product.restored' ) ),
 			array( true, wc_is_webhook_valid_topic( 'order.created' ) ),
 			array( true, wc_is_webhook_valid_topic( 'order.updated' ) ),
 			array( true, wc_is_webhook_valid_topic( 'order.deleted' ) ),
+			array( true, wc_is_webhook_valid_topic( 'order.restored' ) ),
 			array( true, wc_is_webhook_valid_topic( 'customer.created' ) ),
 			array( true, wc_is_webhook_valid_topic( 'customer.updated' ) ),
 			array( true, wc_is_webhook_valid_topic( 'customer.deleted' ) ),
 			array( true, wc_is_webhook_valid_topic( 'coupon.created' ) ),
 			array( true, wc_is_webhook_valid_topic( 'coupon.updated' ) ),
 			array( true, wc_is_webhook_valid_topic( 'coupon.deleted' ) ),
+			array( true, wc_is_webhook_valid_topic( 'coupon.restored' ) ),
 			array( false, wc_is_webhook_valid_topic( 'coupon.upgraded' ) ),
 			array( false, wc_is_webhook_valid_topic( 'wc.product.updated' ) ),
 			array( false, wc_is_webhook_valid_topic( 'missingdot' ) ),
-			array( false, wc_is_webhook_valid_topic( 'with space' ) )
+			array( false, wc_is_webhook_valid_topic( 'with space' ) ),
 		);
 	}
 
@@ -94,10 +96,30 @@ class Conditional_Functions extends \WC_Unit_Test_Case {
 			array( true,  wc_is_valid_url( 'https://google.com' ) ),
 			array( true,  wc_is_valid_url( 'https://google.com/test%20valid' ) ),
 			array( true,  wc_is_valid_url( 'https://google.com/test-valid/?query=test' ) ),
-			array( true,  wc_is_valid_url( 'https://google.com/test-valid/#hash' ) )
+			array( true,  wc_is_valid_url( 'https://google.com/test-valid/#hash' ) ),
 		);
 	}
 
+	/**
+	 * Test wc_site_is_https().
+	 */
+	public function test_wc_site_is_https() {
+		$this->assertFalse( wc_site_is_https() );
+
+		add_filter( 'pre_option_home', array( $this, '_https_url' ) );
+
+		$this->assertTrue( wc_site_is_https() );
+	}
+
+	/**
+	 * Callback for chaning home url to https.
+	 *
+	 * @return string
+	 */
+	public function _https_url() {
+		return 'https://example.org';
+	}
+
 	/**
 	 * Test wc_is_valid_url().
 	 *
diff --git a/tests/unit-tests/util/core-functions.php b/tests/unit-tests/util/core-functions.php
index 84f5661ad80..b515fb64fef 100644
--- a/tests/unit-tests/util/core-functions.php
+++ b/tests/unit-tests/util/core-functions.php
@@ -1,13 +1,11 @@
 <?php
 
-namespace WooCommerce\Tests\Util;
-
 /**
  * Class Core_Functions.
  * @package WooCommerce\Tests\Util
  * @since 2.2
  */
-class Core_Functions extends \WC_Unit_Test_Case {
+class WC_Tests_Core_Functions extends WC_Unit_Test_Case {
 
 	/**
 	 * Test get_woocommerce_currency().
@@ -27,58 +25,169 @@ class Core_Functions extends \WC_Unit_Test_Case {
 	public function test_get_woocommerce_currencies() {
 
 		$expected_currencies = array(
-			'AED' => __( 'United Arab Emirates Dirham', 'woocommerce' ),
-			'ARS' => __( 'Argentine Peso', 'woocommerce' ),
-			'AUD' => __( 'Australian Dollars', 'woocommerce' ),
-			'BDT' => __( 'Bangladeshi Taka', 'woocommerce' ),
-			'BGN' => __( 'Bulgarian Lev', 'woocommerce' ),
-			'BRL' => __( 'Brazilian Real', 'woocommerce' ),
-			'CAD' => __( 'Canadian Dollars', 'woocommerce' ),
-			'CHF' => __( 'Swiss Franc', 'woocommerce' ),
-			'CLP' => __( 'Chilean Peso', 'woocommerce' ),
-			'CNY' => __( 'Chinese Yuan', 'woocommerce' ),
-			'COP' => __( 'Colombian Peso', 'woocommerce' ),
-			'CZK' => __( 'Czech Koruna', 'woocommerce' ),
-			'DKK' => __( 'Danish Krone', 'woocommerce' ),
-			'DOP' => __( 'Dominican Peso', 'woocommerce' ),
-			'EGP' => __( 'Egyptian Pound', 'woocommerce' ),
-			'EUR' => __( 'Euros', 'woocommerce' ),
-			'GBP' => __( 'Pounds Sterling', 'woocommerce' ),
-			'HKD' => __( 'Hong Kong Dollar', 'woocommerce' ),
-			'HRK' => __( 'Croatia kuna', 'woocommerce' ),
-			'HUF' => __( 'Hungarian Forint', 'woocommerce' ),
-			'IDR' => __( 'Indonesia Rupiah', 'woocommerce' ),
-			'ILS' => __( 'Israeli Shekel', 'woocommerce' ),
-			'INR' => __( 'Indian Rupee', 'woocommerce' ),
-			'ISK' => __( 'Icelandic krona', 'woocommerce' ),
-			'JPY' => __( 'Japanese Yen', 'woocommerce' ),
-			'KES' => __( 'Kenyan shilling', 'woocommerce' ),
-			'LAK' => __( 'Lao Kip', 'woocommerce' ),
-			'KRW' => __( 'South Korean Won', 'woocommerce' ),
-			'MXN' => __( 'Mexican Peso', 'woocommerce' ),
-			'MYR' => __( 'Malaysian Ringgits', 'woocommerce' ),
-			'NGN' => __( 'Nigerian Naira', 'woocommerce' ),
-			'NOK' => __( 'Norwegian Krone', 'woocommerce' ),
-			'NPR' => __( 'Nepali Rupee', 'woocommerce' ),
-			'NZD' => __( 'New Zealand Dollar', 'woocommerce' ),
-			'PHP' => __( 'Philippine Pesos', 'woocommerce' ),
-			'PKR' => __( 'Pakistani Rupee', 'woocommerce' ),
-			'PLN' => __( 'Polish Zloty', 'woocommerce' ),
-			'PYG' => __( 'Paraguayan Guaraní', 'woocommerce' ),
-			'RON' => __( 'Romanian Leu', 'woocommerce' ),
-			'RUB' => __( 'Russian Ruble', 'woocommerce' ),
-			'SEK' => __( 'Swedish Krona', 'woocommerce' ),
-			'SGD' => __( 'Singapore Dollar', 'woocommerce' ),
-			'THB' => __( 'Thai Baht', 'woocommerce' ),
-			'TRY' => __( 'Turkish Lira', 'woocommerce' ),
-			'TWD' => __( 'Taiwan New Dollars', 'woocommerce' ),
-			'UAH' => __( 'Ukrainian Hryvnia', 'woocommerce' ),
-			'USD' => __( 'US Dollars', 'woocommerce' ),
-			'VND' => __( 'Vietnamese Dong', 'woocommerce' ),
-			'ZAR' => __( 'South African rand', 'woocommerce' ),
+			'AED' => 'United Arab Emirates dirham',
+			'AFN' => 'Afghan afghani',
+			'ALL' => 'Albanian lek',
+			'AMD' => 'Armenian dram',
+			'ANG' => 'Netherlands Antillean guilder',
+			'AOA' => 'Angolan kwanza',
+			'ARS' => 'Argentine peso',
+			'AUD' => 'Australian dollar',
+			'AWG' => 'Aruban florin',
+			'AZN' => 'Azerbaijani manat',
+			'BAM' => 'Bosnia and Herzegovina convertible mark',
+			'BBD' => 'Barbadian dollar',
+			'BDT' => 'Bangladeshi taka',
+			'BGN' => 'Bulgarian lev',
+			'BHD' => 'Bahraini dinar',
+			'BIF' => 'Burundian franc',
+			'BMD' => 'Bermudian dollar',
+			'BND' => 'Brunei dollar',
+			'BOB' => 'Bolivian boliviano',
+			'BRL' => 'Brazilian real',
+			'BSD' => 'Bahamian dollar',
+			'BTC' => 'Bitcoin',
+			'BTN' => 'Bhutanese ngultrum',
+			'BWP' => 'Botswana pula',
+			'BYR' => 'Belarusian ruble',
+			'BZD' => 'Belize dollar',
+			'CAD' => 'Canadian dollar',
+			'CDF' => 'Congolese franc',
+			'CHF' => 'Swiss franc',
+			'CLP' => 'Chilean peso',
+			'CNY' => 'Chinese yuan',
+			'COP' => 'Colombian peso',
+			'CRC' => 'Costa Rican col&oacute;n',
+			'CUC' => 'Cuban convertible peso',
+			'CUP' => 'Cuban peso',
+			'CVE' => 'Cape Verdean escudo',
+			'CZK' => 'Czech koruna',
+			'DJF' => 'Djiboutian franc',
+			'DKK' => 'Danish krone',
+			'DOP' => 'Dominican peso',
+			'DZD' => 'Algerian dinar',
+			'EGP' => 'Egyptian pound',
+			'ERN' => 'Eritrean nakfa',
+			'ETB' => 'Ethiopian birr',
+			'EUR' => 'Euro',
+			'FJD' => 'Fijian dollar',
+			'FKP' => 'Falkland Islands pound',
+			'GBP' => 'Pound sterling',
+			'GEL' => 'Georgian lari',
+			'GGP' => 'Guernsey pound',
+			'GHS' => 'Ghana cedi',
+			'GIP' => 'Gibraltar pound',
+			'GMD' => 'Gambian dalasi',
+			'GNF' => 'Guinean franc',
+			'GTQ' => 'Guatemalan quetzal',
+			'GYD' => 'Guyanese dollar',
+			'HKD' => 'Hong Kong dollar',
+			'HNL' => 'Honduran lempira',
+			'HRK' => 'Croatian kuna',
+			'HTG' => 'Haitian gourde',
+			'HUF' => 'Hungarian forint',
+			'IDR' => 'Indonesian rupiah',
+			'ILS' => 'Israeli new shekel',
+			'IMP' => 'Manx pound',
+			'INR' => 'Indian rupee',
+			'IQD' => 'Iraqi dinar',
+			'IRR' => 'Iranian rial',
+			'IRT' => 'Iranian toman',
+			'ISK' => 'Icelandic kr&oacute;na',
+			'JEP' => 'Jersey pound',
+			'JMD' => 'Jamaican dollar',
+			'JOD' => 'Jordanian dinar',
+			'JPY' => 'Japanese yen',
+			'KES' => 'Kenyan shilling',
+			'KGS' => 'Kyrgyzstani som',
+			'KHR' => 'Cambodian riel',
+			'KMF' => 'Comorian franc',
+			'KPW' => 'North Korean won',
+			'KRW' => 'South Korean won',
+			'KWD' => 'Kuwaiti dinar',
+			'KYD' => 'Cayman Islands dollar',
+			'KZT' => 'Kazakhstani tenge',
+			'LAK' => 'Lao kip',
+			'LBP' => 'Lebanese pound',
+			'LKR' => 'Sri Lankan rupee',
+			'LRD' => 'Liberian dollar',
+			'LSL' => 'Lesotho loti',
+			'LYD' => 'Libyan dinar',
+			'MAD' => 'Moroccan dirham',
+			'MDL' => 'Moldovan leu',
+			'MGA' => 'Malagasy ariary',
+			'MKD' => 'Macedonian denar',
+			'MMK' => 'Burmese kyat',
+			'MNT' => 'Mongolian t&ouml;gr&ouml;g',
+			'MOP' => 'Macanese pataca',
+			'MRO' => 'Mauritanian ouguiya',
+			'MUR' => 'Mauritian rupee',
+			'MVR' => 'Maldivian rufiyaa',
+			'MWK' => 'Malawian kwacha',
+			'MXN' => 'Mexican peso',
+			'MYR' => 'Malaysian ringgit',
+			'MZN' => 'Mozambican metical',
+			'NAD' => 'Namibian dollar',
+			'NGN' => 'Nigerian naira',
+			'NIO' => 'Nicaraguan c&oacute;rdoba',
+			'NOK' => 'Norwegian krone',
+			'NPR' => 'Nepalese rupee',
+			'NZD' => 'New Zealand dollar',
+			'OMR' => 'Omani rial',
+			'PAB' => 'Panamanian balboa',
+			'PEN' => 'Peruvian nuevo sol',
+			'PGK' => 'Papua New Guinean kina',
+			'PHP' => 'Philippine peso',
+			'PKR' => 'Pakistani rupee',
+			'PLN' => 'Polish z&#x142;oty',
+			'PRB' => 'Transnistrian ruble',
+			'PYG' => 'Paraguayan guaran&iacute;',
+			'QAR' => 'Qatari riyal',
+			'RON' => 'Romanian leu',
+			'RSD' => 'Serbian dinar',
+			'RUB' => 'Russian ruble',
+			'RWF' => 'Rwandan franc',
+			'SAR' => 'Saudi riyal',
+			'SBD' => 'Solomon Islands dollar',
+			'SCR' => 'Seychellois rupee',
+			'SDG' => 'Sudanese pound',
+			'SEK' => 'Swedish krona',
+			'SGD' => 'Singapore dollar',
+			'SHP' => 'Saint Helena pound',
+			'SLL' => 'Sierra Leonean leone',
+			'SOS' => 'Somali shilling',
+			'SRD' => 'Surinamese dollar',
+			'SSP' => 'South Sudanese pound',
+			'STD' => 'S&atilde;o Tom&eacute; and Pr&iacute;ncipe dobra',
+			'SYP' => 'Syrian pound',
+			'SZL' => 'Swazi lilangeni',
+			'THB' => 'Thai baht',
+			'TJS' => 'Tajikistani somoni',
+			'TMT' => 'Turkmenistan manat',
+			'TND' => 'Tunisian dinar',
+			'TOP' => 'Tongan pa&#x2bb;anga',
+			'TRY' => 'Turkish lira',
+			'TTD' => 'Trinidad and Tobago dollar',
+			'TWD' => 'New Taiwan dollar',
+			'TZS' => 'Tanzanian shilling',
+			'UAH' => 'Ukrainian hryvnia',
+			'UGX' => 'Ugandan shilling',
+			'USD' => 'United States dollar',
+			'UYU' => 'Uruguayan peso',
+			'UZS' => 'Uzbekistani som',
+			'VEF' => 'Venezuelan bol&iacute;var',
+			'VND' => 'Vietnamese &#x111;&#x1ed3;ng',
+			'VUV' => 'Vanuatu vatu',
+			'WST' => 'Samoan t&#x101;l&#x101;',
+			'XAF' => 'Central African CFA franc',
+			'XCD' => 'East Caribbean dollar',
+			'XOF' => 'West African CFA franc',
+			'XPF' => 'CFP franc',
+			'YER' => 'Yemeni rial',
+			'ZAR' => 'South African rand',
+			'ZMW' => 'Zambian kwacha',
 		);
 
-
 		$this->assertEquals( $expected_currencies, get_woocommerce_currencies() );
 	}
 
@@ -129,6 +238,35 @@ class Core_Functions extends \WC_Unit_Test_Case {
 		$this->assertEquals( $log_dir . 'unit-tests-' . $hash_name . '.log', wc_get_log_file_path( 'unit-tests' ) );
 	}
 
+	/**
+	 * Test wc_get_logger().
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_wc_get_logger() {
+		// This filter should have no effect because the class does not implement WC_Logger_Interface
+		add_filter( 'woocommerce_logging_class', array( $this, 'return_bad_logger' ) );
+
+		$this->setExpectedIncorrectUsage( 'wc_get_logger' );
+		$log_a = wc_get_logger();
+		$log_b = wc_get_logger();
+
+		$this->assertInstanceOf( 'WC_Logger', $log_a );
+		$this->assertInstanceOf( 'WC_Logger', $log_b );
+		$this->assertSame( $log_a, $log_b, '`wc_get_logger()` should return the same instance' );
+	}
+
+	/**
+	 * Return class which does not implement WC_Logger_Interface
+	 *
+	 * This is a helper function to test woocommerce_logging_class filter and wc_get_logger.
+	 *
+	 * @return string Class name
+	 */
+	public function return_bad_logger() {
+		return __CLASS__;
+	}
+
 	/**
 	 * Test wc_get_core_supported_themes().
 	 *
@@ -136,7 +274,7 @@ class Core_Functions extends \WC_Unit_Test_Case {
 	 */
 	public function test_wc_get_core_supported_themes() {
 
-		$expected_themes = array( 'twentysixteen', 'twentyfifteen', 'twentyfourteen', 'twentythirteen', 'twentyeleven', 'twentytwelve', 'twentyten' );
+		$expected_themes = array( 'twentyseventeen', 'twentysixteen', 'twentyfifteen', 'twentyfourteen', 'twentythirteen', 'twentyeleven', 'twentytwelve', 'twentyten' );
 
 		$this->assertEquals( $expected_themes, wc_get_core_supported_themes() );
 	}
@@ -153,5 +291,122 @@ class Core_Functions extends \WC_Unit_Test_Case {
 		$this->assertEquals( '', $default['state'] );
 	}
 
-}
+	/**
+	 * Test wc_format_country_state_string().
+	 *
+	 * @since 2.6.0
+	 */
+	public function test_wc_format_country_state_string() {
+		// Test with correct values.
+		$this->assertEquals( array( 'country' => 'US', 'state' => 'CA' ), wc_format_country_state_string( 'US:CA' ) );
+		// Test what happens when we pass an incorrect value.
+		$this->assertEquals( array( 'country' => 'US-CA', 'state' => '' ), wc_format_country_state_string( 'US-CA' ) );
+	}
 
+	/**
+	 * Test wc_get_shipping_method_count()
+	 *
+	 * @since 2.6.0
+	 */
+	public function test_wc_get_shipping_method_count() {
+		// Without legacy methods.
+		$this->assertEquals( 0, wc_get_shipping_method_count( false ) );
+
+		// With legacy methods.
+		$this->assertEquals( 0, wc_get_shipping_method_count( true ) );
+	}
+
+	/**
+	 * Test wc_print_r()
+	 *
+	 * @since 3.0.0
+	 */
+	public function test_wc_print_r() {
+		$arr = array( 1, 2, 'a', 'b', 'c' => 'd' );
+
+		// This filter will sequentially remove handlers, allowing us to test as though our
+		// functions were accumulatively blacklisted, adding one on each call.
+		add_filter( 'woocommerce_print_r_alternatives', array( $this, 'filter_wc_print_r_alternatives' ) );
+
+		$this->expectOutputString(
+			print_r( $arr, true ),
+			$return_value = wc_print_r( $arr )
+		);
+		$this->assertTrue( $return_value );
+		ob_clean();
+
+		$this->expectOutputString(
+			var_export( $arr, true ),
+			$return_value = wc_print_r( $arr )
+		);
+		$this->assertTrue( $return_value );
+		ob_clean();
+
+		$this->expectOutputString(
+			json_encode( $arr ),
+			$return_value = wc_print_r( $arr )
+		);
+		$this->assertTrue( $return_value );
+		ob_clean();
+
+		$this->expectOutputString(
+			serialize( $arr ),
+			$return_value = wc_print_r( $arr )
+		);
+		$this->assertTrue( $return_value );
+		ob_clean();
+
+		$this->expectOutputString(
+			'',
+			$return_value = wc_print_r( $arr )
+		);
+		$this->assertFalse( $return_value );
+		ob_clean();
+
+		// Reset filter to include all handlers
+		$this->filter_wc_print_r_alternatives( array(), true );
+
+		$this->assertEquals( print_r( $arr, true ), wc_print_r( $arr, true ) );
+		$this->assertEquals( var_export( $arr, true ), wc_print_r( $arr, true ) );
+		$this->assertEquals( json_encode( $arr ), wc_print_r( $arr, true ) );
+		$this->assertEquals( serialize( $arr ), wc_print_r( $arr, true ) );
+		$this->assertFalse( wc_print_r( $arr, true ) );
+
+		remove_filter( 'woocommerce_print_r_alternatives', array( $this, 'filter_wc_print_r_alternatives' ) );
+	}
+
+	/**
+	 * Filter function to help test wc_print_r alternatives via filter.
+	 *
+	 * On the first run, all alternatives are returned.
+	 * On each successive run, an alternative is excluded from the beginning.
+	 * Eventually, no handlers are returned.
+	 *
+	 * @param array $alternatives Input array of alternatives.
+	 * @param bool $reset Optional. Default false. True to reset excluded alternatives.
+	 * @return array|bool Alternatives. True on reset.
+	 */
+	public function filter_wc_print_r_alternatives( $alternatives, $reset = false ) {
+		static $skip = 0;
+		if ( $reset ) {
+			$skip = 0;
+			return true;
+		}
+		return array_slice( $alternatives, $skip++ );
+	}
+
+	/**
+	 * Test wc_get_wildcard_postcodes
+	 */
+	public function test_wc_get_wildcard_postcodes() {
+		$postcode  = 'cb23 6as';
+		$country   = 'GB';
+		$wildcards = array( 'cb23 6as', 'CB23 6AS', 'CB23 6AS*', 'CB23 6A*', 'CB23 6*', 'CB23 *', 'CB23*', 'CB2*', 'CB*', 'C*', '*' );
+		$this->assertEquals( $wildcards, wc_get_wildcard_postcodes( $postcode, $country ) );
+
+		$postcode  = 'GIJóN';
+		$country   = '';
+		$wildcards = array( 'GIJóN', 'GIJÓN', 'GIJÓN*', 'GIJÓ*', 'GIJ*', 'GI*', 'G*', '*' );
+		$this->assertEquals( $wildcards, wc_get_wildcard_postcodes( $postcode, $country ) );
+	}
+}
diff --git a/tests/unit-tests/util/deprecated-hooks.php b/tests/unit-tests/util/deprecated-hooks.php
new file mode 100644
index 00000000000..c60998c228c
--- /dev/null
+++ b/tests/unit-tests/util/deprecated-hooks.php
@@ -0,0 +1,174 @@
+<?php
+
+/**
+ * Classes WC_Deprecated_Filter_Hooks & WC_Deprecated_Action_Hooks.
+ * @package WooCommerce\Tests\Util
+ * @since 3.0
+ */
+class WC_Tests_Deprecated_Hooks extends WC_Unit_Test_Case {
+
+	protected $handlers = array();
+
+	/**
+	 * Generic toggle value function that can be hooked to a filter for testing.
+	 * @param bool/int $value
+	 * @return bool/int
+	 */
+	function toggle_value( $value ) {
+		return ! $value;
+	}
+
+	/**
+	 * Generic toggle value function that can be hooked to an action for testing.
+	 * @param bool/int $value
+	 */
+	function toggle_value_by_ref( &$value ) {
+		$value = ! $value;
+	}
+
+	/**
+	 * Generic meta setting function that can be hooked to an action for testing.
+	 * @param int $item1_id
+	 * @param int $item2_id (default: false)
+	 */
+	function set_meta( $item1_id, $item2_id = false ) {
+		update_post_meta( $item1_id, 'wc_deprecated_hook_test_item1_meta', 1 );
+		if ( $item2_id ) {
+			update_post_meta( $item2_id, 'wc_deprecated_hook_test_item2_meta', 2 );
+		}
+	}
+
+	function setUp() {
+		add_filter( 'deprecated_function_trigger_error', '__return_false' );
+		$this->handlers = WC()->deprecated_hook_handlers;
+	}
+
+	/**
+	 * Test the deprecated hook handlers are initialized.
+	 *
+	 * @since 3.0
+	 */
+	function test_deprecated_hook_handlers_exist() {
+		$this->assertArrayHasKey( 'filters', $this->handlers );
+		$this->assertInstanceOf( 'WC_Deprecated_Filter_Hooks', $this->handlers['filters'] );
+
+		$this->assertArrayHasKey( 'actions', $this->handlers );
+		$this->assertInstanceOf( 'WC_Deprecated_Action_Hooks', $this->handlers['actions'] );
+	}
+
+	/**
+	 * Test the get_old_hooks method.
+	 *
+	 * @since 3.0
+	 */
+	function test_get_old_hooks() {
+		$old_filters = $this->handlers['filters']->get_old_hooks( 'woocommerce_structured_data_order' );
+		$old_actions = $this->handlers['actions']->get_old_hooks( 'woocommerce_new_order_item' );
+
+		$this->assertContains( 'woocommerce_email_order_schema_markup', $old_filters );
+		$this->assertContains( 'woocommerce_order_add_shipping', $old_actions );
+	}
+
+	/**
+	 * Test the hook_in method.
+	 *
+	 * @since 3.0
+	 */
+	function test_hook_in() {
+		$this->assertTrue( (bool) has_filter( 'woocommerce_structured_data_order', array( $this->handlers['filters'], 'maybe_handle_deprecated_hook' ) ) );
+		$this->assertTrue( (bool) has_action( 'woocommerce_new_order_item', array( $this->handlers['actions'], 'maybe_handle_deprecated_hook' ) ) );
+	}
+
+	/**
+	 * Test the handle_deprecated_hook method in the filters handler.
+	 *
+	 * @since 3.0
+	 */
+	function test_handle_deprecated_hook_filter() {
+		$new_hook = 'wc_new_hook';
+		$old_hook = 'wc_old_hook';
+		$args = array( false );
+		$return = -1;
+
+		add_filter( $old_hook, array( $this, 'toggle_value' ) );
+
+		$result = $this->handlers['filters']->handle_deprecated_hook( $new_hook, $old_hook, $args, $return );
+		$this->assertTrue( $result );
+	}
+
+	/**
+	 * Test the handle_deprecated_hook method in the actions handler.
+	 *
+	 * @since 3.0
+	 */
+	function test_handle_deprecated_hook_action() {
+		$new_hook = 'wc_new_hook';
+		$old_hook = 'wc_old_hook';
+		$test_value = false;
+		$args = array( &$test_value );
+		$return = -1;
+
+		add_filter( $old_hook, array( $this, 'toggle_value_by_ref' ) );
+
+		$this->handlers['actions']->handle_deprecated_hook( $new_hook, $old_hook, $args, $return );
+		$this->assertTrue( $test_value );
+	}
+
+	/**
+	 * Test a complete deprecated filter mapping.
+	 *
+	 * @since 3.0
+	 */
+	function test_filter_handler() {
+		$test_width = 1;
+
+		add_filter( 'woocommerce_product_width', array( $this, 'toggle_value' ) );
+
+		$new_width = apply_filters( 'woocommerce_product_get_width', $test_width );
+		$this->assertEquals( 0, $new_width );
+	}
+
+	/**
+	 * Test a complete deprecated action mapping.
+	 *
+	 * @since 3.0
+	 */
+	function test_action_handler() {
+		$test_product = WC_Helper_Product::create_simple_product();
+		$test_order = WC_Helper_Order::create_order( 1, $test_product );
+		$test_order_id = $test_order->get_id();
+		$test_items = $test_order->get_items();
+		$test_item = reset( $test_items );
+		$test_item_id = $test_item->get_id();
+
+		add_action( 'woocommerce_order_edit_product', array( $this, 'set_meta' ), 10, 2 );
+		do_action( 'woocommerce_update_order_item', $test_item_id, $test_item, $test_order_id );
+
+		$order_update_worked = (bool) get_post_meta( $test_order_id, 'wc_deprecated_hook_test_item1_meta', 1 );
+		$item_update_worked = (bool) get_post_meta( $test_item_id, 'wc_deprecated_hook_test_item2_meta', 2 );
+
+		$this->assertTrue( $order_update_worked );
+		$this->assertTrue( $item_update_worked );
+	}
+
+	/**
+	 * Test the mapping of deprecated created_* hooks to new_* hooks.
+	 *
+	 * @since 3.0
+	 */
+	function test_created_actions_deprecation() {
+		add_filter( 'woocommerce_payment_token_created', '__return_true' );
+		add_filter( 'woocommerce_create_product_variation', '__return_true' );
+
+		$token = WC_Helper_Payment_Token::create_stub_token( __FUNCTION__ );
+		$token->save();
+
+		$product = new WC_Product_Variation;
+		$product->save();
+
+		$this->assertEquals( 1, did_action( 'woocommerce_payment_token_created' ) );
+		$this->assertEquals( 1, did_action( 'woocommerce_new_payment_token' ) );
+		$this->assertEquals( 1, did_action( 'woocommerce_create_product_variation' ) );
+		$this->assertEquals( 1, did_action( 'woocommerce_new_product_variation' ) );
+	}
+}
diff --git a/tests/unit-tests/util/install.php b/tests/unit-tests/util/install.php
index 7e063d4c02a..840524f991d 100644
--- a/tests/unit-tests/util/install.php
+++ b/tests/unit-tests/util/install.php
@@ -1,28 +1,24 @@
 <?php
 
-namespace WooCommerce\Tests\Util;
-
 /**
  * Class WC_Tests_Install.
  * @package WooCommerce\Tests\Util
- *
- * @todo determine if this should be in Util or separate namespace
  */
-class WC_Tests_Install extends \WC_Unit_Test_Case {
+class WC_Tests_Install extends WC_Unit_Test_Case {
 
 	/**
 	 * Test check version.
 	 */
 	public function test_check_version() {
-		update_option( 'woocommerce_version', WC()->version - 1 );
+		update_option( 'woocommerce_version', ( (float) WC()->version - 1 ) );
 		update_option( 'woocommerce_db_version', WC()->version );
-		\WC_Install::check_version();
+		WC_Install::check_version();
 
 		$this->assertTrue( did_action( 'woocommerce_updated' ) === 1 );
 
 		update_option( 'woocommerce_version', WC()->version );
 		update_option( 'woocommerce_db_version', WC()->version );
-		\WC_Install::check_version();
+		WC_Install::check_version();
 
 		$this->assertTrue( did_action( 'woocommerce_updated' ) === 1 );
 	}
@@ -34,10 +30,12 @@ class WC_Tests_Install extends \WC_Unit_Test_Case {
 		// clean existing install first
 		if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
 			define( 'WP_UNINSTALL_PLUGIN', true );
+			define( 'WC_REMOVE_ALL_DATA', true );
 		}
+
 		include( dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) . '/uninstall.php' );
 
-		\WC_Install::install();
+		WC_Install::install();
 
 		$this->assertTrue( get_option( 'woocommerce_version' ) === WC()->version );
 	}
@@ -52,7 +50,7 @@ class WC_Tests_Install extends \WC_Unit_Test_Case {
 		delete_option( 'woocommerce_checkout_page_id' );
 		delete_option( 'woocommerce_myaccount_page_id' );
 
-		\WC_Install::create_pages();
+		WC_Install::create_pages();
 
 		$this->assertGreaterThan( 0, get_option( 'woocommerce_shop_page_id' ) );
 		$this->assertGreaterThan( 0, get_option( 'woocommerce_cart_page_id' ) );
@@ -71,7 +69,7 @@ class WC_Tests_Install extends \WC_Unit_Test_Case {
 		delete_option( 'woocommerce_checkout_page_id' );
 		delete_option( 'woocommerce_myaccount_page_id' );
 
-		\WC_Install::create_pages();
+		WC_Install::create_pages();
 
 		$this->assertGreaterThan( 0, get_option( 'woocommerce_shop_page_id' ) );
 		$this->assertGreaterThan( 0, get_option( 'woocommerce_cart_page_id' ) );
@@ -86,10 +84,11 @@ class WC_Tests_Install extends \WC_Unit_Test_Case {
 		// Clean existing install first
 		if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
 			define( 'WP_UNINSTALL_PLUGIN', true );
+			define( 'WC_REMOVE_ALL_DATA', true );
 		}
 		include( dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) . '/uninstall.php' );
 
-		\WC_Install::create_roles();
+		WC_Install::create_roles();
 
 		$this->assertNotNull( get_role( 'customer' ) );
 		$this->assertNotNull( get_role( 'shop_manager' ) );
@@ -99,7 +98,7 @@ class WC_Tests_Install extends \WC_Unit_Test_Case {
 	 * Test - remove roles.
 	 */
 	public function test_remove_roles() {
-		\WC_Install::remove_roles();
+		WC_Install::remove_roles();
 
 		$this->assertNull( get_role( 'customer' ) );
 		$this->assertNull( get_role( 'shop_manager' ) );
@@ -110,9 +109,8 @@ class WC_Tests_Install extends \WC_Unit_Test_Case {
 	 */
 	public function test_in_plugin_update_message() {
 		ob_start();
-		\WC_install::in_plugin_update_message( array( 'Version' => '2.0.0' ) );
+		WC_install::in_plugin_update_message( array( 'Version' => '2.0.0', 'new_version' => '2.0.0' ) );
 		$result = ob_get_clean();
 		$this->assertTrue( is_string( $result ) );
 	}
-
 }
diff --git a/tests/unit-tests/util/log.php b/tests/unit-tests/util/log.php
deleted file mode 100644
index cb81958443a..00000000000
--- a/tests/unit-tests/util/log.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-namespace WooCommerce\Tests\Util;
-
-/**
- * Class Log.
- * @package WooCommerce\Tests\Util
- * @since 2.3
- */
-class Log extends \WC_Unit_Test_Case {
-	public function read_content( $handle ) {
-		return file_get_contents( wc_get_log_file_path( $handle ) );
-	}
-
-	/**
-	 * Test add().
-	 *
-	 * @since 2.4
-	 */
-	public function test_add() {
-		$log = new \WC_Logger();
-
-		$log->add( 'unit-tests', 'this is a message' );
-
-		$this->assertStringMatchesFormat( '%d-%d-%d @ %d:%d:%d - %s', $this->read_content( 'unit-tests' ) );
-		$this->assertStringEndsWith( ' - this is a message' . PHP_EOL, $this->read_content( 'unit-tests' ) );
-	}
-
-	/**
-	 * Test clear().
-	 *
-	 * @since 2.4
-	 */
-	public function test_clear() {
-		$log = new \WC_Logger();
-
-		$log->add( 'unit-tests', 'this is a message' );
-		$log->clear( 'unit-tests' );
-
-		$this->assertEquals( '', $this->read_content( 'unit-tests' ) );
-	}
-}
diff --git a/tests/unit-tests/util/main-class.php b/tests/unit-tests/util/main-class.php
index 273052c03d7..e525c9b9ad4 100644
--- a/tests/unit-tests/util/main-class.php
+++ b/tests/unit-tests/util/main-class.php
@@ -1,12 +1,10 @@
 <?php
 
-namespace WooCommerce\Tests\Util;
-
 /**
  * Class Main_Class.
  * @package WooCommerce\Tests\Util
  */
-class Main_Class extends \WC_Unit_Test_Case {
+class WC_Tests_Main_Class extends WC_Unit_Test_Case {
 
 	/** @var \WooCommerce instance */
 	protected $wc;
@@ -72,4 +70,3 @@ class Main_Class extends \WC_Unit_Test_Case {
 		$this->assertInstanceOf( 'WC_Customer', $this->wc->customer );
 	}
 }
-
diff --git a/tests/unit-tests/util/notice-functions.php b/tests/unit-tests/util/notice-functions.php
index fdaf4363a26..8fced0aa696 100644
--- a/tests/unit-tests/util/notice-functions.php
+++ b/tests/unit-tests/util/notice-functions.php
@@ -1,13 +1,11 @@
 <?php
 
-namespace WooCommerce\Tests\Util;
-
 /**
  * Class Notice_Functions.
  * @package WooCommerce\Tests\Util
  * @since 2.2
  */
-class Notice_Functions extends \WC_Unit_Test_Case {
+class WC_Tests_Notice_Functions extends WC_Unit_Test_Case {
 
 	/**
 	 * Clear out notices after each test.
@@ -183,5 +181,4 @@ class Notice_Functions extends \WC_Unit_Test_Case {
 		$this->assertInternalType( 'array', $notices );
 		$this->assertEmpty( $notices );
 	}
-
 }
diff --git a/tests/unit-tests/util/validation.php b/tests/unit-tests/util/validation.php
index ae9518dbcb6..c4e6127561f 100644
--- a/tests/unit-tests/util/validation.php
+++ b/tests/unit-tests/util/validation.php
@@ -1,21 +1,20 @@
 <?php
-namespace WooCommerce\Tests\Util;
 
 /**
  * Class Validation.
  * @package WooCommerce\Tests\Util
  * @since 2.3
  */
-class Validation extends \WC_Unit_Test_Case {
+class WC_Tests_Validation extends WC_Unit_Test_Case {
 	/**
 	 * Test is_email().
 	 *
 	 * @since 2.3
 	 */
 	public function test_is_email() {
-		$this->assertEquals( 'email@domain.com', \WC_Validation::is_email( 'email@domain.com' ) );
-		$this->assertFalse( \WC_Validation::is_email( 'not a mail' ) );
-		$this->assertFalse( \WC_Validation::is_email( 'http://test.com' ) );
+		$this->assertEquals( 'email@domain.com', WC_Validation::is_email( 'email@domain.com' ) );
+		$this->assertFalse( WC_Validation::is_email( 'not a mail' ) );
+		$this->assertFalse( WC_Validation::is_email( 'http://test.com' ) );
 	}
 
 	/**
@@ -25,11 +24,11 @@ class Validation extends \WC_Unit_Test_Case {
 	 */
 	public function data_provider_test_is_phone() {
 		return array(
-			array( true, \WC_Validation::is_phone( '+00 000 00 00 000' ) ),
-			array( true, \WC_Validation::is_phone( '+00-000-00-00-000' ) ),
-			array( true, \WC_Validation::is_phone( '(000) 00 00 000' ) ),
-			array( false, \WC_Validation::is_phone( '+00.000.00.00.000' ) ),
-			array( false, \WC_Validation::is_phone( '+00 aaa dd ee fff' ) )
+			array( true, WC_Validation::is_phone( '+00 000 00 00 000' ) ),
+			array( true, WC_Validation::is_phone( '+00-000-00-00-000' ) ),
+			array( true, WC_Validation::is_phone( '(000) 00 00 000' ) ),
+			array( false, WC_Validation::is_phone( '+00.000.00.00.000' ) ),
+			array( false, WC_Validation::is_phone( '+00 aaa dd ee fff' ) ),
 		);
 	}
 
@@ -50,40 +49,50 @@ class Validation extends \WC_Unit_Test_Case {
 	 */
 	public function data_provider_test_is_postcode() {
 		$generic = array(
-			array( true, \WC_Validation::is_postcode( '99999', 'IT' ) ),
-			array( true, \WC_Validation::is_postcode( '99999', 'IT' ) ),
-			array( true, \WC_Validation::is_postcode( '9999', 'IT' ) ),
-			array( true, \WC_Validation::is_postcode( 'ABC 999', 'IT' ) ),
-			array( true, \WC_Validation::is_postcode( 'ABC-999', 'IT' ) ),
-			array( false, \WC_Validation::is_postcode( 'ABC_123', 'IT' ) )
+			array( true, WC_Validation::is_postcode( '99999', 'IT' ) ),
+			array( true, WC_Validation::is_postcode( '99999', 'IT' ) ),
+			array( true, WC_Validation::is_postcode( '9999', 'IT' ) ),
+			array( true, WC_Validation::is_postcode( 'ABC 999', 'IT' ) ),
+			array( true, WC_Validation::is_postcode( 'ABC-999', 'IT' ) ),
+			array( false, WC_Validation::is_postcode( 'ABC_123', 'IT' ) ),
 		);
 
 		$gb = array(
-			array( true, \WC_Validation::is_postcode( 'A9 9AA', 'GB' ) ),
-			array( false, \WC_Validation::is_postcode( '99999', 'GB' ) )
+			array( true, WC_Validation::is_postcode( 'A9 9AA', 'GB' ) ),
+			array( false, WC_Validation::is_postcode( '99999', 'GB' ) ),
 		);
 
 		$us = array(
-			array( true, \WC_Validation::is_postcode( '99999', 'US' ) ),
-			array( true, \WC_Validation::is_postcode( '99999-9999', 'US' ) ),
-			array( false, \WC_Validation::is_postcode( 'ABCDE', 'US' ) ),
-			array( false, \WC_Validation::is_postcode( 'ABCDE-9999', 'US' ) )
+			array( true, WC_Validation::is_postcode( '99999', 'US' ) ),
+			array( true, WC_Validation::is_postcode( '99999-9999', 'US' ) ),
+			array( false, WC_Validation::is_postcode( 'ABCDE', 'US' ) ),
+			array( false, WC_Validation::is_postcode( 'ABCDE-9999', 'US' ) ),
 		);
 
 		$ch = array(
-			array( true, \WC_Validation::is_postcode( '9999', 'CH' ) ),
-			array( false, \WC_Validation::is_postcode( '99999', 'CH' ) ),
-			array( false, \WC_Validation::is_postcode( 'ABCDE', 'CH' ) )
+			array( true, WC_Validation::is_postcode( '9999', 'CH' ) ),
+			array( false, WC_Validation::is_postcode( '99999', 'CH' ) ),
+			array( false, WC_Validation::is_postcode( 'ABCDE', 'CH' ) ),
 		);
 
 		$br = array(
-			array( true, \WC_Validation::is_postcode( '99999-999', 'BR' ) ),
-			array( true, \WC_Validation::is_postcode( '99999999', 'BR' ) ),
-			array( false, \WC_Validation::is_postcode( '99999 999', 'BR' ) ),
-			array( false, \WC_Validation::is_postcode( '99999-ABC', 'BR' ) )
+			array( true, WC_Validation::is_postcode( '99999-999', 'BR' ) ),
+			array( true, WC_Validation::is_postcode( '99999999', 'BR' ) ),
+			array( false, WC_Validation::is_postcode( '99999 999', 'BR' ) ),
+			array( false, WC_Validation::is_postcode( '99999-ABC', 'BR' ) ),
 		);
 
-		return array_merge( $generic, $gb, $us, $ch, $br );
+		$ca = array(
+			array( true, WC_Validation::is_postcode( 'A9A 9A9', 'CA' ) ),
+			array( true, WC_Validation::is_postcode( 'A9A9A9', 'CA' ) ),
+			array( true, WC_Validation::is_postcode( 'a9a9a9', 'CA' ) ),
+			array( false, WC_Validation::is_postcode( 'D0A 9A9', 'CA' ) ),
+			array( false, WC_Validation::is_postcode( '99999', 'CA' ) ),
+			array( false, WC_Validation::is_postcode( 'ABC999', 'CA' ) ),
+			array( false, WC_Validation::is_postcode( '0A0A0A', 'CA' ) ),
+		);
+
+		return array_merge( $generic, $gb, $us, $ch, $br, $ca );
 	}
 
 	/**
@@ -103,17 +112,17 @@ class Validation extends \WC_Unit_Test_Case {
 	 */
 	public function data_provider_test_is_GB_postcode() {
 		return array(
-			array( true, \WC_Validation::is_GB_postcode( 'AA9A 9AA' ) ),
-			array( true, \WC_Validation::is_GB_postcode( 'A9A 9AA' ) ),
-			array( true, \WC_Validation::is_GB_postcode( 'A9 9AA' ) ),
-			array( true, \WC_Validation::is_GB_postcode( 'A99 9AA' ) ),
-			array( true, \WC_Validation::is_GB_postcode( 'AA99 9AA' ) ),
-			array( true, \WC_Validation::is_GB_postcode( 'BFPO 801' ) ),
-			array( false, \WC_Validation::is_GB_postcode( '99999' ) ),
-			array( false, \WC_Validation::is_GB_postcode( '9999 999' ) ),
-			array( false, \WC_Validation::is_GB_postcode( '999 999' ) ),
-			array( false, \WC_Validation::is_GB_postcode( '99 999' ) ),
-			array( false, \WC_Validation::is_GB_postcode( '9A A9A' ) )
+			array( true, WC_Validation::is_GB_postcode( 'AA9A 9AA' ) ),
+			array( true, WC_Validation::is_GB_postcode( 'A9A 9AA' ) ),
+			array( true, WC_Validation::is_GB_postcode( 'A9 9AA' ) ),
+			array( true, WC_Validation::is_GB_postcode( 'A99 9AA' ) ),
+			array( true, WC_Validation::is_GB_postcode( 'AA99 9AA' ) ),
+			array( true, WC_Validation::is_GB_postcode( 'BFPO 801' ) ),
+			array( false, WC_Validation::is_GB_postcode( '99999' ) ),
+			array( false, WC_Validation::is_GB_postcode( '9999 999' ) ),
+			array( false, WC_Validation::is_GB_postcode( '999 999' ) ),
+			array( false, WC_Validation::is_GB_postcode( '99 999' ) ),
+			array( false, WC_Validation::is_GB_postcode( '9A A9A' ) ),
 		);
 	}
 
@@ -134,12 +143,12 @@ class Validation extends \WC_Unit_Test_Case {
 	 */
 	public function data_provider_test_format_postcode() {
 		return array(
-			array( '99999', \WC_Validation::format_postcode( '99999', 'IT' ) ),
-			array( '99999', \WC_Validation::format_postcode( ' 99999 ', 'IT' ) ),
-			array( '99999', \WC_Validation::format_postcode( '999 99', 'IT' ) ),
-			array( 'ABCDE', \WC_Validation::format_postcode( 'abcde', 'IT' ) ),
-			array( 'AB CDE', \WC_Validation::format_postcode( 'abcde', 'GB' ) ),
-			array( 'AB CDE', \WC_Validation::format_postcode( 'abcde', 'CA' ) )
+			array( '99999', WC_Validation::format_postcode( '99999', 'IT' ) ),
+			array( '99999', WC_Validation::format_postcode( ' 99999 ', 'IT' ) ),
+			array( '99999', WC_Validation::format_postcode( '999 99', 'IT' ) ),
+			array( 'ABCDE', WC_Validation::format_postcode( 'abcde', 'IT' ) ),
+			array( 'AB CDE', WC_Validation::format_postcode( 'abcde', 'GB' ) ),
+			array( 'AB CDE', WC_Validation::format_postcode( 'abcde', 'CA' ) ),
 		);
 	}
 
@@ -159,7 +168,7 @@ class Validation extends \WC_Unit_Test_Case {
 	 * @since 2.4
 	 */
 	public function test_format_phone() {
-		$this->assertEquals( '+00-000-00-00-000', \WC_Validation::format_phone( '+00.000.00.00.000' ) );
-		$this->assertEquals( '+00 000 00 00 000', \WC_Validation::format_phone( '+00 000 00 00 000' ) );
+		$this->assertEquals( '+00-000-00-00-000', WC_Validation::format_phone( '+00.000.00.00.000' ) );
+		$this->assertEquals( '+00 000 00 00 000', WC_Validation::format_phone( '+00 000 00 00 000' ) );
 	}
 }
diff --git a/uninstall.php b/uninstall.php
index 34e903218a6..d0f1cd09349 100644
--- a/uninstall.php
+++ b/uninstall.php
@@ -4,7 +4,7 @@
  *
  * Uninstalling WooCommerce deletes user roles, pages, tables, and options.
  *
- * @author      WooThemes
+ * @author      WooCommerce
  * @category    Core
  * @package     WooCommerce/Uninstaller
  * @version     2.3.0
@@ -14,14 +14,22 @@ if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
 	exit;
 }
 
-$status_options = get_option( 'woocommerce_status_options', array() );
+global $wpdb, $wp_version;
 
-if ( ! empty( $status_options['uninstall_data'] ) ) {
-
-	global $wpdb;
+wp_clear_scheduled_hook( 'woocommerce_scheduled_sales' );
+wp_clear_scheduled_hook( 'woocommerce_cancel_unpaid_orders' );
+wp_clear_scheduled_hook( 'woocommerce_cleanup_sessions' );
+wp_clear_scheduled_hook( 'woocommerce_geoip_updater' );
+wp_clear_scheduled_hook( 'woocommerce_tracker_send_event' );
 
+/*
+ * Only remove ALL product and page data if WC_REMOVE_ALL_DATA constant is set to true in user's
+ * wp-config.php. This is to prevent data loss when deleting the plugin from the backend
+ * and to ensure only the site owner can perform this action.
+ */
+if ( defined( 'WC_REMOVE_ALL_DATA' ) && true === WC_REMOVE_ALL_DATA ) {
 	// Roles + caps.
-	include_once( 'includes/class-wc-install.php' );
+	include_once( dirname( __FILE__ ) . '/includes/class-wc-install.php' );
 	WC_Install::remove_roles();
 
 	// Pages.
@@ -34,6 +42,12 @@ if ( ! empty( $status_options['uninstall_data'] ) ) {
 	wp_trash_post( get_option( 'woocommerce_change_password_page_id' ) );
 	wp_trash_post( get_option( 'woocommerce_logout_page_id' ) );
 
+	if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}woocommerce_attribute_taxonomies';" ) ) {
+		$wc_attributes = array_filter( (array) $wpdb->get_col( "SELECT attribute_name FROM {$wpdb->prefix}woocommerce_attribute_taxonomies;" ) );
+	} else {
+		$wc_attributes = array();
+	}
+
 	// Tables.
 	$wpdb->query( "DROP TABLE IF EXISTS {$wpdb->prefix}woocommerce_api_keys" );
 	$wpdb->query( "DROP TABLE IF EXISTS {$wpdb->prefix}woocommerce_attribute_taxonomies" );
@@ -41,13 +55,56 @@ if ( ! empty( $status_options['uninstall_data'] ) ) {
 	$wpdb->query( "DROP TABLE IF EXISTS {$wpdb->prefix}woocommerce_termmeta" );
 	$wpdb->query( "DROP TABLE IF EXISTS {$wpdb->prefix}woocommerce_tax_rates" );
 	$wpdb->query( "DROP TABLE IF EXISTS {$wpdb->prefix}woocommerce_tax_rate_locations" );
+	$wpdb->query( "DROP TABLE IF EXISTS {$wpdb->prefix}woocommerce_shipping_zone_methods" );
+	$wpdb->query( "DROP TABLE IF EXISTS {$wpdb->prefix}woocommerce_shipping_zone_locations" );
+	$wpdb->query( "DROP TABLE IF EXISTS {$wpdb->prefix}woocommerce_shipping_zones" );
+	$wpdb->query( "DROP TABLE IF EXISTS {$wpdb->prefix}woocommerce_sessions" );
+	$wpdb->query( "DROP TABLE IF EXISTS {$wpdb->prefix}woocommerce_payment_tokens" );
+	$wpdb->query( "DROP TABLE IF EXISTS {$wpdb->prefix}woocommerce_payment_tokenmeta" );
 
 	// Delete options.
-	$wpdb->query("DELETE FROM $wpdb->options WHERE option_name LIKE 'woocommerce\_%';");
+	$wpdb->query( "DELETE FROM $wpdb->options WHERE option_name LIKE 'woocommerce\_%';" );
 
 	// Delete posts + data.
 	$wpdb->query( "DELETE FROM {$wpdb->posts} WHERE post_type IN ( 'product', 'product_variation', 'shop_coupon', 'shop_order', 'shop_order_refund' );" );
 	$wpdb->query( "DELETE meta FROM {$wpdb->postmeta} meta LEFT JOIN {$wpdb->posts} posts ON posts.ID = meta.post_id WHERE posts.ID IS NULL;" );
 	$wpdb->query( "DROP TABLE IF EXISTS {$wpdb->prefix}woocommerce_order_items" );
 	$wpdb->query( "DROP TABLE IF EXISTS {$wpdb->prefix}woocommerce_order_itemmeta" );
+
+	// Delete terms if > WP 4.2 (term splitting was added in 4.2)
+	if ( version_compare( $wp_version, '4.2', '>=' ) ) {
+		// Delete term taxonomies
+		foreach ( array( 'product_cat', 'product_tag', 'product_shipping_class', 'product_type' ) as $taxonomy ) {
+			$wpdb->delete(
+				$wpdb->term_taxonomy,
+				array(
+					'taxonomy' => $taxonomy,
+				)
+			);
+		}
+
+		// Delete term attributes
+		foreach ( $wc_attributes as $taxonomy ) {
+			$wpdb->delete(
+				$wpdb->term_taxonomy,
+				array(
+					'taxonomy' => 'pa_' . $taxonomy,
+				)
+			);
+		}
+
+		// Delete orphan relationships
+		$wpdb->query( "DELETE tr FROM {$wpdb->term_relationships} tr LEFT JOIN {$wpdb->posts} posts ON posts.ID = tr.object_id WHERE posts.ID IS NULL;" );
+
+		// Delete orphan terms
+		$wpdb->query( "DELETE t FROM {$wpdb->terms} t LEFT JOIN {$wpdb->term_taxonomy} tt ON t.term_id = tt.term_id WHERE tt.term_id IS NULL;" );
+
+		// Delete orphan term meta
+		if ( ! empty( $wpdb->termmeta ) ) {
+			$wpdb->query( "DELETE tm FROM {$wpdb->termmeta} tm LEFT JOIN {$wpdb->term_taxonomy} tt ON tm.term_id = tt.term_id WHERE tt.term_id IS NULL;" );
+		}
+	}
+
+	// Clear any cached data that has been removed
+	wp_cache_flush();
 }
diff --git a/woocommerce.php b/woocommerce.php
index 89c9b1ba5b4..f74c55a931a 100644
--- a/woocommerce.php
+++ b/woocommerce.php
@@ -1,20 +1,20 @@
 <?php
 /**
  * Plugin Name: WooCommerce
- * Plugin URI: http://www.woothemes.com/woocommerce/
+ * Plugin URI: https://woocommerce.com/
  * Description: An e-commerce toolkit that helps you sell anything. Beautifully.
- * Version: 2.5.0-beta-3
- * Author: WooThemes
- * Author URI: http://woothemes.com
- * Requires at least: 4.1
- * Tested up to: 4.3
+ * Version: 3.1.0-alpha
+ * Author: Automattic
+ * Author URI: https://woocommerce.com
+ * Requires at least: 4.4
+ * Tested up to: 4.7
  *
  * Text Domain: woocommerce
  * Domain Path: /i18n/languages/
  *
  * @package WooCommerce
  * @category Core
- * @author WooThemes
+ * @author Automattic
  */
 if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly.
@@ -26,61 +26,95 @@ if ( ! class_exists( 'WooCommerce' ) ) :
  * Main WooCommerce Class.
  *
  * @class WooCommerce
- * @version	2.4.0
+ * @version	3.1.0
  */
 final class WooCommerce {
 
 	/**
+	 * WooCommerce version.
+	 *
 	 * @var string
 	 */
-	public $version = '2.5.0';
+	public $version = '3.1.0';
 
 	/**
-	 * @var WooCommerce The single instance of the class.
+	 * The single instance of the class.
+	 *
+	 * @var WooCommerce
 	 * @since 2.1
 	 */
 	protected static $_instance = null;
 
 	/**
-	 * @var WC_Session session
+	 * Session instance.
+	 *
+	 * @var WC_Session|WC_Session_Handler
 	 */
 	public $session = null;
 
 	/**
-	 * @var WC_Query $query
+	 * Query instance.
+	 *
+	 * @var WC_Query
 	 */
 	public $query = null;
 
 	/**
-	 * @var WC_Product_Factory $product_factory
+	 * Product factory instance.
+	 *
+	 * @var WC_Product_Factory
 	 */
 	public $product_factory = null;
 
 	/**
-	 * @var WC_Countries $countries
+	 * Countries instance.
+	 *
+	 * @var WC_Countries
 	 */
 	public $countries = null;
 
 	/**
-	 * @var WC_Integrations $integrations
+	 * Integrations instance.
+	 *
+	 * @var WC_Integrations
 	 */
 	public $integrations = null;
 
 	/**
-	 * @var WC_Cart $cart
+	 * Cart instance.
+	 *
+	 * @var WC_Cart
 	 */
 	public $cart = null;
 
 	/**
-	 * @var WC_Customer $customer
+	 * Customer instance.
+	 *
+	 * @var WC_Customer
 	 */
 	public $customer = null;
 
 	/**
-	 * @var WC_Order_Factory $order_factory
+	 * Order factory instance.
+	 *
+	 * @var WC_Order_Factory
 	 */
 	public $order_factory = null;
 
+	/**
+	 * Structured data instance.
+	 *
+	 * @var WC_Structured_Data
+	 */
+	public $structured_data = null;
+
+	/**
+	 * Array of deprecated hook handlers.
+	 *
+	 * @var array of WC_Deprecated_Hooks
+	 */
+	public $deprecated_hook_handlers = array();
+
 	/**
 	 * Main WooCommerce Instance.
 	 *
@@ -103,7 +137,7 @@ final class WooCommerce {
 	 * @since 2.1
 	 */
 	public function __clone() {
-		_doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'woocommerce' ), '2.1' );
+		wc_doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'woocommerce' ), '2.1' );
 	}
 
 	/**
@@ -111,7 +145,7 @@ final class WooCommerce {
 	 * @since 2.1
 	 */
 	public function __wakeup() {
-		_doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'woocommerce' ), '2.1' );
+		wc_doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'woocommerce' ), '2.1' );
 	}
 
 	/**
@@ -147,6 +181,8 @@ final class WooCommerce {
 		add_action( 'init', array( $this, 'init' ), 0 );
 		add_action( 'init', array( 'WC_Shortcodes', 'init' ) );
 		add_action( 'init', array( 'WC_Emails', 'init_transactional_emails' ) );
+		add_action( 'init', array( $this, 'wpdb_table_fix' ), 0 );
+		add_action( 'switch_blog', array( $this, 'wpdb_table_fix' ), 0 );
 	}
 
 	/**
@@ -156,6 +192,7 @@ final class WooCommerce {
 		$upload_dir = wp_upload_dir();
 
 		$this->define( 'WC_PLUGIN_FILE', __FILE__ );
+		$this->define( 'WC_ABSPATH', dirname( __FILE__ ) . '/' );
 		$this->define( 'WC_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );
 		$this->define( 'WC_VERSION', $this->version );
 		$this->define( 'WOOCOMMERCE_VERSION', $this->version );
@@ -165,6 +202,7 @@ final class WooCommerce {
 		$this->define( 'WC_DELIMITER', '|' );
 		$this->define( 'WC_LOG_DIR', $upload_dir['basedir'] . '/wc-logs/' );
 		$this->define( 'WC_SESSION_CACHE_GROUP', 'wc_session_id' );
+		$this->define( 'WC_TEMPLATE_DEBUG_MODE', false );
 	}
 
 	/**
@@ -181,8 +219,8 @@ final class WooCommerce {
 
 	/**
 	 * What type of request is this?
-	 * string $type ajax, frontend or admin.
 	 *
+	 * @param  string $type admin, ajax, cron or frontend.
 	 * @return bool
 	 */
 	private function is_request( $type ) {
@@ -198,23 +236,130 @@ final class WooCommerce {
 		}
 	}
 
+	/**
+	 * Check the active theme.
+	 *
+	 * @since  2.6.9
+	 * @param  string $theme Theme slug to check
+	 * @return bool
+	 */
+	private function is_active_theme( $theme ) {
+		return get_template() === $theme;
+	}
+
 	/**
 	 * Include required core files used in admin and on the frontend.
 	 */
 	public function includes() {
-		include_once( 'includes/class-wc-autoloader.php' );
-		include_once( 'includes/wc-core-functions.php' );
-		include_once( 'includes/wc-widget-functions.php' );
-		include_once( 'includes/wc-webhook-functions.php' );
-		include_once( 'includes/class-wc-install.php' );
-		include_once( 'includes/class-wc-geolocation.php' );
-		include_once( 'includes/class-wc-download-handler.php' );
-		include_once( 'includes/class-wc-comments.php' );
-		include_once( 'includes/class-wc-post-data.php' );
-		include_once( 'includes/class-wc-ajax.php' );
+		/**
+		 * Class autoloader.
+		 */
+		include_once( WC_ABSPATH . 'includes/class-wc-autoloader.php' );
+
+		/**
+		 * Interfaces.
+		 */
+		include_once( WC_ABSPATH . 'includes/interfaces/class-wc-abstract-order-data-store-interface.php' );
+		include_once( WC_ABSPATH . 'includes/interfaces/class-wc-coupon-data-store-interface.php' );
+		include_once( WC_ABSPATH . 'includes/interfaces/class-wc-customer-data-store-interface.php' );
+		include_once( WC_ABSPATH . 'includes/interfaces/class-wc-customer-download-data-store-interface.php' );
+		include_once( WC_ABSPATH . 'includes/interfaces/class-wc-object-data-store-interface.php' );
+		include_once( WC_ABSPATH . 'includes/interfaces/class-wc-order-data-store-interface.php' );
+		include_once( WC_ABSPATH . 'includes/interfaces/class-wc-order-item-data-store-interface.php' );
+		include_once( WC_ABSPATH . 'includes/interfaces/class-wc-order-item-product-data-store-interface.php' );
+		include_once( WC_ABSPATH . 'includes/interfaces/class-wc-order-item-type-data-store-interface.php' );
+		include_once( WC_ABSPATH . 'includes/interfaces/class-wc-order-refund-data-store-interface.php' );
+		include_once( WC_ABSPATH . 'includes/interfaces/class-wc-payment-token-data-store-interface.php' );
+		include_once( WC_ABSPATH . 'includes/interfaces/class-wc-product-data-store-interface.php' );
+		include_once( WC_ABSPATH . 'includes/interfaces/class-wc-product-variable-data-store-interface.php' );
+		include_once( WC_ABSPATH . 'includes/interfaces/class-wc-shipping-zone-data-store-interface.php' );
+		include_once( WC_ABSPATH . 'includes/interfaces/class-wc-logger-interface.php' );
+		include_once( WC_ABSPATH . 'includes/interfaces/class-wc-log-handler-interface.php' );
+
+		/**
+		 * Abstract classes.
+		 */
+		include_once( WC_ABSPATH . 'includes/abstracts/abstract-wc-data.php' ); // WC_Data for CRUD
+		include_once( WC_ABSPATH . 'includes/abstracts/abstract-wc-payment-token.php' ); // Payment Tokens
+		include_once( WC_ABSPATH . 'includes/abstracts/abstract-wc-product.php' ); // Products
+		include_once( WC_ABSPATH . 'includes/abstracts/abstract-wc-order.php' ); // Orders
+		include_once( WC_ABSPATH . 'includes/abstracts/abstract-wc-settings-api.php' ); // Settings API (for gateways, shipping, and integrations)
+		include_once( WC_ABSPATH . 'includes/abstracts/abstract-wc-shipping-method.php' ); // A Shipping method
+		include_once( WC_ABSPATH . 'includes/abstracts/abstract-wc-payment-gateway.php' ); // A Payment gateway
+		include_once( WC_ABSPATH . 'includes/abstracts/abstract-wc-integration.php' ); // An integration with a service
+		include_once( WC_ABSPATH . 'includes/abstracts/abstract-wc-log-handler.php' );
+		include_once( WC_ABSPATH . 'includes/abstracts/abstract-wc-deprecated-hooks.php' );
+		include_once( WC_ABSPATH . 'includes/abstracts/abstract-wc-session.php' );
+
+		/**
+		 * Core classes.
+		 */
+		include_once( WC_ABSPATH . 'includes/wc-core-functions.php' );
+		include_once( WC_ABSPATH . 'includes/class-wc-datetime.php' );
+		include_once( WC_ABSPATH . 'includes/class-wc-post-types.php' ); // Registers post types
+		include_once( WC_ABSPATH . 'includes/class-wc-install.php' );
+		include_once( WC_ABSPATH . 'includes/class-wc-geolocation.php' );
+		include_once( WC_ABSPATH . 'includes/class-wc-download-handler.php' );
+		include_once( WC_ABSPATH . 'includes/class-wc-comments.php' );
+		include_once( WC_ABSPATH . 'includes/class-wc-post-data.php' );
+		include_once( WC_ABSPATH . 'includes/class-wc-ajax.php' );
+		include_once( WC_ABSPATH . 'includes/class-wc-emails.php' );
+		include_once( WC_ABSPATH . 'includes/class-wc-data-exception.php' );
+		include_once( WC_ABSPATH . 'includes/class-wc-query.php' );
+		include_once( WC_ABSPATH . 'includes/class-wc-order-factory.php' ); // Order factory
+		include_once( WC_ABSPATH . 'includes/class-wc-product-factory.php' ); // Product factory
+		include_once( WC_ABSPATH . 'includes/class-wc-payment-tokens.php' ); // Payment tokens controller
+		include_once( WC_ABSPATH . 'includes/class-wc-shipping-zone.php' );
+		include_once( WC_ABSPATH . 'includes/gateways/class-wc-payment-gateway-cc.php' ); // CC Payment Gateway
+		include_once( WC_ABSPATH . 'includes/gateways/class-wc-payment-gateway-echeck.php' ); // eCheck Payment Gateway
+		include_once( WC_ABSPATH . 'includes/class-wc-countries.php' ); // Defines countries and states
+		include_once( WC_ABSPATH . 'includes/class-wc-integrations.php' ); // Loads integrations
+		include_once( WC_ABSPATH . 'includes/class-wc-cache-helper.php' ); // Cache Helper
+		include_once( WC_ABSPATH . 'includes/class-wc-https.php' ); // https Helper
+		include_once( WC_ABSPATH . 'includes/class-wc-deprecated-action-hooks.php' );
+		include_once( WC_ABSPATH . 'includes/class-wc-deprecated-filter-hooks.php' );
+		include_once( WC_ABSPATH . 'includes/class-wc-background-emailer.php' );
+
+		/**
+		 * Data stores - used to store and retrieve CRUD object data from the database.
+		 */
+		include_once( WC_ABSPATH . 'includes/class-wc-data-store.php' );
+		include_once( WC_ABSPATH . 'includes/data-stores/class-wc-data-store-wp.php' );
+		include_once( WC_ABSPATH . 'includes/data-stores/class-wc-coupon-data-store-cpt.php' );
+		include_once( WC_ABSPATH . 'includes/data-stores/class-wc-product-data-store-cpt.php' );
+		include_once( WC_ABSPATH . 'includes/data-stores/class-wc-product-grouped-data-store-cpt.php' );
+		include_once( WC_ABSPATH . 'includes/data-stores/class-wc-product-variable-data-store-cpt.php' );
+		include_once( WC_ABSPATH . 'includes/data-stores/class-wc-product-variation-data-store-cpt.php' );
+		include_once( WC_ABSPATH . 'includes/data-stores/abstract-wc-order-item-type-data-store.php' );
+		include_once( WC_ABSPATH . 'includes/data-stores/class-wc-order-item-data-store.php' );
+		include_once( WC_ABSPATH . 'includes/data-stores/class-wc-order-item-coupon-data-store.php' );
+		include_once( WC_ABSPATH . 'includes/data-stores/class-wc-order-item-fee-data-store.php' );
+		include_once( WC_ABSPATH . 'includes/data-stores/class-wc-order-item-product-store.php' );
+		include_once( WC_ABSPATH . 'includes/data-stores/class-wc-order-item-shipping-data-store.php' );
+		include_once( WC_ABSPATH . 'includes/data-stores/class-wc-order-item-tax-data-store.php' );
+		include_once( WC_ABSPATH . 'includes/data-stores/class-wc-payment-token-data-store.php' );
+		include_once( WC_ABSPATH . 'includes/data-stores/class-wc-customer-data-store.php' );
+		include_once( WC_ABSPATH . 'includes/data-stores/class-wc-customer-data-store-session.php' );
+		include_once( WC_ABSPATH . 'includes/data-stores/class-wc-customer-download-data-store.php' );
+		include_once( WC_ABSPATH . 'includes/data-stores/class-wc-shipping-zone-data-store.php' );
+		include_once( WC_ABSPATH . 'includes/data-stores/abstract-wc-order-data-store-cpt.php' );
+		include_once( WC_ABSPATH . 'includes/data-stores/class-wc-order-data-store-cpt.php' );
+		include_once( WC_ABSPATH . 'includes/data-stores/class-wc-order-refund-data-store-cpt.php' );
+
+		/**
+		 * REST API.
+		 */
+		include_once( WC_ABSPATH . 'includes/class-wc-legacy-api.php' );
+ 		include_once( WC_ABSPATH . 'includes/class-wc-api.php' ); // API Class
+ 		include_once( WC_ABSPATH . 'includes/class-wc-auth.php' ); // Auth Class
+ 		include_once( WC_ABSPATH . 'includes/class-wc-register-wp-admin-settings.php' );
+
+		if ( defined( 'WP_CLI' ) && WP_CLI ) {
+ 			include_once( WC_ABSPATH . 'includes/class-wc-cli.php' );
+ 		}
 
 		if ( $this->is_request( 'admin' ) ) {
-			include_once( 'includes/admin/class-wc-admin.php' );
+			include_once( WC_ABSPATH . 'includes/admin/class-wc-admin.php' );
 		}
 
 		if ( $this->is_request( 'frontend' ) ) {
@@ -222,58 +367,45 @@ final class WooCommerce {
 		}
 
 		if ( $this->is_request( 'frontend' ) || $this->is_request( 'cron' ) ) {
-			include_once( 'includes/abstracts/abstract-wc-session.php' );
-			include_once( 'includes/class-wc-session-handler.php' );
+			include_once( WC_ABSPATH . 'includes/class-wc-session-handler.php' );
 		}
 
 		if ( $this->is_request( 'cron' ) && 'yes' === get_option( 'woocommerce_allow_tracking', 'no' ) ) {
-			include_once( 'includes/class-wc-tracker.php' );
+			include_once( WC_ABSPATH . 'includes/class-wc-tracker.php' );
 		}
 
-		$this->query = include( 'includes/class-wc-query.php' );                // The main query class
-		$this->api   = include( 'includes/class-wc-api.php' );                  // API Class
-
-		include_once( 'includes/class-wc-auth.php' );                           // Auth Class
-		include_once( 'includes/class-wc-post-types.php' );                     // Registers post types
-		include_once( 'includes/abstracts/abstract-wc-product.php' );           // Products
-		include_once( 'includes/abstracts/abstract-wc-order.php' );             // Orders
-		include_once( 'includes/abstracts/abstract-wc-settings-api.php' );      // Settings API (for gateways, shipping, and integrations)
-		include_once( 'includes/abstracts/abstract-wc-shipping-method.php' );   // A Shipping method
-		include_once( 'includes/abstracts/abstract-wc-payment-gateway.php' );   // A Payment gateway
-		include_once( 'includes/abstracts/abstract-wc-integration.php' );       // An integration with a service
-		include_once( 'includes/class-wc-product-factory.php' );                // Product factory
-		include_once( 'includes/class-wc-countries.php' );                      // Defines countries and states
-		include_once( 'includes/class-wc-integrations.php' );                   // Loads integrations
-		include_once( 'includes/class-wc-cache-helper.php' );                   // Cache Helper
-
-		if ( defined( 'WP_CLI' ) && WP_CLI ) {
-			include_once( 'includes/class-wc-cli.php' );
-		}
+		$this->query = new WC_Query();
+		$this->api   = new WC_API();
 	}
 
 	/**
 	 * Include required frontend files.
 	 */
 	public function frontend_includes() {
-		include_once( 'includes/wc-cart-functions.php' );
-		include_once( 'includes/wc-notice-functions.php' );
-		include_once( 'includes/wc-template-hooks.php' );
-		include_once( 'includes/class-wc-template-loader.php' );                // Template Loader
-		include_once( 'includes/class-wc-frontend-scripts.php' );               // Frontend Scripts
-		include_once( 'includes/class-wc-form-handler.php' );                   // Form Handlers
-		include_once( 'includes/class-wc-cart.php' );                           // The main cart class
-		include_once( 'includes/class-wc-tax.php' );                            // Tax class
-		include_once( 'includes/class-wc-customer.php' );                       // Customer class
-		include_once( 'includes/class-wc-shortcodes.php' );                     // Shortcodes class
-		include_once( 'includes/class-wc-https.php' );                          // https Helper
-		include_once( 'includes/class-wc-embed.php' );                          // Embeds
+		include_once( WC_ABSPATH . 'includes/wc-cart-functions.php' );
+		include_once( WC_ABSPATH . 'includes/wc-notice-functions.php' );
+		include_once( WC_ABSPATH . 'includes/wc-template-hooks.php' );
+		include_once( WC_ABSPATH . 'includes/class-wc-template-loader.php' );                // Template Loader
+		include_once( WC_ABSPATH . 'includes/class-wc-frontend-scripts.php' );               // Frontend Scripts
+		include_once( WC_ABSPATH . 'includes/class-wc-form-handler.php' );                   // Form Handlers
+		include_once( WC_ABSPATH . 'includes/class-wc-cart.php' );                           // The main cart class
+		include_once( WC_ABSPATH . 'includes/class-wc-tax.php' );                            // Tax class
+		include_once( WC_ABSPATH . 'includes/class-wc-shipping-zones.php' );                 // Shipping Zones class
+		include_once( WC_ABSPATH . 'includes/class-wc-customer.php' );                       // Customer class
+		include_once( WC_ABSPATH . 'includes/class-wc-shortcodes.php' );                     // Shortcodes class
+		include_once( WC_ABSPATH . 'includes/class-wc-embed.php' );                          // Embeds
+		include_once( WC_ABSPATH . 'includes/class-wc-structured-data.php' );                // Structured Data class
+
+		if ( $this->is_active_theme( 'twentyseventeen' ) ) {
+			include_once( WC_ABSPATH . 'includes/theme-support/class-wc-twenty-seventeen.php' );
+		}
 	}
 
 	/**
 	 * Function used to Init WooCommerce Template Functions - This makes them pluggable by plugins and themes.
 	 */
 	public function include_template_functions() {
-		include_once( 'includes/wc-template-functions.php' );
+		include_once( WC_ABSPATH . 'includes/wc-template-functions.php' );
 	}
 
 	/**
@@ -287,10 +419,13 @@ final class WooCommerce {
 		$this->load_plugin_textdomain();
 
 		// Load class instances.
-		$this->product_factory = new WC_Product_Factory();                      // Product Factory to create new product instances
-		$this->order_factory   = new WC_Order_Factory();                        // Order Factory to create new order instances
-		$this->countries       = new WC_Countries();                            // Countries class
-		$this->integrations    = new WC_Integrations();                         // Integrations class
+		$this->product_factory                     = new WC_Product_Factory(); // Product Factory to create new product instances
+		$this->order_factory                       = new WC_Order_Factory(); // Order Factory to create new order instances
+		$this->countries                           = new WC_Countries(); // Countries class
+		$this->integrations                        = new WC_Integrations(); // Integrations class
+		$this->structured_data                     = new WC_Structured_Data(); // Structured Data class, generates and handles structured data
+		$this->deprecated_hook_handlers['actions'] = new WC_Deprecated_Action_Hooks();
+		$this->deprecated_hook_handlers['filters'] = new WC_Deprecated_Filter_Hooks();
 
 		// Session class, handles session data for users - can be overwritten if custom handler is needed.
 		if ( $this->is_request( 'frontend' ) || $this->is_request( 'cron' ) ) {
@@ -300,8 +435,9 @@ final class WooCommerce {
 
 		// Classes/actions loaded for the frontend and for ajax requests.
 		if ( $this->is_request( 'frontend' ) ) {
-			$this->cart     = new WC_Cart();                                    // Cart class, stores the cart contents
-			$this->customer = new WC_Customer();                                // Customer class, handles data such as customer location
+			$this->cart            = new WC_Cart();                                  // Cart class, stores the cart contents
+			$this->customer        = new WC_Customer( get_current_user_id(), true ); // Customer class, handles data such as customer location
+			add_action( 'shutdown', array( $this->customer, 'save' ), 10 );          // Customer should be saved during shutdown.
 		}
 
 		$this->load_webhooks();
@@ -320,7 +456,8 @@ final class WooCommerce {
 	 *      - WP_LANG_DIR/plugins/woocommerce-LOCALE.mo
 	 */
 	public function load_plugin_textdomain() {
-		$locale = apply_filters( 'plugin_locale', get_locale(), 'woocommerce' );
+		$locale = is_admin() && function_exists( 'get_user_locale' ) ? get_user_locale() : get_locale();
+		$locale = apply_filters( 'plugin_locale', $locale, 'woocommerce' );
 
 		load_textdomain( 'woocommerce', WP_LANG_DIR . '/woocommerce/woocommerce-' . $locale . '.mo' );
 		load_plugin_textdomain( 'woocommerce', false, plugin_basename( dirname( __FILE__ ) ) . '/i18n/languages' );
@@ -420,7 +557,7 @@ final class WooCommerce {
 			$api_request_url = add_query_arg( 'wc-api', $request, trailingslashit( home_url( '', $scheme ) ) );
 		}
 
-		return esc_url_raw( $api_request_url );
+		return esc_url_raw( apply_filters( 'woocommerce_api_request_url', $api_request_url, $request, $ssl ) );
 	}
 
 	/**
@@ -429,12 +566,17 @@ final class WooCommerce {
 	 * @since 2.2
 	 */
 	private function load_webhooks() {
+
+		if ( ! is_blog_installed() ) {
+			return;
+		}
+
 		if ( false === ( $webhooks = get_transient( 'woocommerce_webhook_ids' ) ) ) {
 			$webhooks = get_posts( array(
 				'fields'         => 'ids',
 				'post_type'      => 'shop_webhook',
 				'post_status'    => 'publish',
-				'posts_per_page' => -1
+				'posts_per_page' => -1,
 			) );
 			set_transient( 'woocommerce_webhook_ids', $webhooks );
 		}
@@ -444,6 +586,22 @@ final class WooCommerce {
 		}
 	}
 
+	/**
+	 * WooCommerce Payment Token Meta API and Term/Order item Meta - set table names.
+	 */
+	public function wpdb_table_fix() {
+		global $wpdb;
+		$wpdb->payment_tokenmeta    = $wpdb->prefix . 'woocommerce_payment_tokenmeta';
+		$wpdb->order_itemmeta       = $wpdb->prefix . 'woocommerce_order_itemmeta';
+		$wpdb->tables[]             = 'woocommerce_payment_tokenmeta';
+		$wpdb->tables[]             = 'woocommerce_order_itemmeta';
+
+		if ( get_option( 'db_version' ) < 34370 ) {
+			$wpdb->woocommerce_termmeta = $wpdb->prefix . 'woocommerce_termmeta';
+			$wpdb->tables[]             = 'woocommerce_termmeta';
+		}
+	}
+
 	/**
 	 * Get Checkout Class.
 	 * @return WC_Checkout